From ace19a6511b73936963d95fb52289484296eecb3 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 20 Nov 2018 14:20:43 -0500
Subject: [PATCH 001/397] Fixing ITK classes to work with ITK 5.0

---
 Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h | 2 +-
 Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h  | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 17ee9980e6..558b9dca2f 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -66,7 +66,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   Dream3DITransformContainerToTransform();
   ~Dream3DITransformContainerToTransform() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 2dd8ad1a42..6a1d1ea6fe 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -62,7 +62,7 @@ template <typename ITKTransformType> class Dream3DTransformContainerToTransform
   Dream3DTransformContainerToTransform();
   ~Dream3DTransformContainerToTransform() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ::TransformContainer::Pointer m_TransformContainer;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index 0eca16afac..332ce11b21 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -62,7 +62,7 @@ template <typename TParametersValueType, unsigned int CompositeNDimensions> clas
   TransformToDream3DITransformContainer();
   ~TransformToDream3DITransformContainer() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
index d453c26c14..5ec75b8935 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
@@ -61,7 +61,7 @@ template <typename ITKTransformType> class TransformToDream3DTransformContainer
   TransformToDream3DTransformContainer();
   ~TransformToDream3DTransformContainer() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;

From 3828ed1f679a6ed408fab5c36eca8e3c88fedcef Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 4 Dec 2018 17:10:36 -0500
Subject: [PATCH 002/397] Moving a few functions out of FilterParameterWidget
 and into QtSFileUtils, so that we can use those functions in our standalone
 TileListWidget.

---
 .../AbstractIOFileWidget.cpp                  |  2 +-
 .../AbstractIOFileWidget.h                    |  1 -
 .../FileListInfoWidget.cpp                    |  4 +-
 .../FileListInfoWidget.h                      |  1 -
 .../FilterParameterWidget.cpp                 | 99 -------------------
 .../FilterParameterWidget.h                   | 16 ---
 .../ImportHDF5DatasetWidget.cpp               | 22 +----
 .../ImportHDF5DatasetWidget.h                 |  8 --
 .../SVWidgetsLib/QtSupport/QtSFileUtils.cpp   | 98 ++++++++++++++++++
 Source/SVWidgetsLib/QtSupport/QtSFileUtils.h  | 17 ++++
 10 files changed, 121 insertions(+), 147 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index c057f9e4ed..13d8d1e002 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -270,7 +270,7 @@ void AbstractIOFileWidget::on_m_LineEdit_textChanged(const QString& text)
     absPathLabel->setText(inputPath);
   }
 
-  if(hasValidFilePath(inputPath))
+  if(QtSFileUtils::HasValidFilePath(inputPath))
   {
     m_ShowFileAction->setEnabled(true);
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index cefaf57c4f..5520e4231a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -118,7 +118,6 @@ class SVWidgetsLib_EXPORT AbstractIOFileWidget : public FilterParameterWidget, p
 
   private:
     QAction* m_ShowFileAction = nullptr;
-    QString  m_CurrentlyValidPath = "";
     QString  m_CurrentText = "";
     QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 69eab1bd37..a62046abbf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -327,7 +327,7 @@ void FileListInfoWidget::checkIOFiles()
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString inputPath = validator->convertToAbsolutePath(m_Ui->inputDir->text());
 
-  if(this->verifyPathExists(inputPath, m_Ui->inputDir))
+  if(QtSFileUtils::VerifyPathExists(inputPath, m_Ui->inputDir))
   {
     findMaxSliceAndPrefix();
   }
@@ -373,7 +373,7 @@ void FileListInfoWidget::inputDir_textChanged(const QString& text)
 
   m_Ui->inputDir->setToolTip("Absolute File Path: " + inputPath);
 
-  if(verifyPathExists(inputPath, m_Ui->inputDir))
+  if(QtSFileUtils::VerifyPathExists(inputPath, m_Ui->inputDir))
   {
     m_ShowFileAction->setEnabled(true);
     findMaxSliceAndPrefix();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 9a579f3a14..1127e75132 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -164,7 +164,6 @@ protected slots:
   static QString m_OpenDialogLastFilePath;
 
   QAction* m_ShowFileAction = nullptr;
-  QString m_CurrentlyValidPath = "";
   QString m_CurrentText = "";
   bool m_DidCausePreflight = false;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 3049c3ae35..f4735ac2ca 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -422,105 +422,6 @@ void FilterParameterWidget::hideBorder()
   setStyleSheet("");
 }
 
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool FilterParameterWidget::verifyPathExists(QString filePath, QLineEdit* lineEdit)
-{
-  hasValidFilePath(filePath);
-  QFileInfo fileinfo(filePath);
-  if(!fileinfo.exists())
-  {
-    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
-  }
-  else
-  {
-    SVStyle::Instance()->LineEditClearStyle(lineEdit);
-  }
-  return fileinfo.exists();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool FilterParameterWidget::hasValidFilePath(const QString &filePath)
-{
-  QStringList pathParts = filePath.split(QDir::separator());
-  if(pathParts.empty())
-  {
-    return false;
-  }
-
-  QString pathBuildUp;
-  QFileInfo fi(filePath);
-
-  /* This block of code figures out, based on the current OS, how the built-up path should begin.
-   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
-   * For Windows, it should start with a path part for both absolute and relative paths.
-   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
-  {
-#if defined(Q_OS_WIN)
-  /* If there is at least one part, then add it to the pathBuildUp variable.
-    A valid Windows path, absolute or relative, has to have at least one part. */
-  if (pathParts[0].isEmpty() == false)
-  {
-    pathBuildUp.append(pathParts[0]);
-  }
-  else
-  {
-    return false;
-  }
-#else
-  /* If the first part is empty and the filePath is absolute, then that means that
-   * we are starting with the root directory and need to add it to our pathBuildUp */
-  if (pathParts[0].isEmpty() && fi.isAbsolute())
-  {
-    pathBuildUp.append(QDir::separator());
-  }
-  /* If the first part is empty and the filePath is relative, then that means that
-   * we are starting with the first folder part and need to add that to our pathBuildUp */
-  else if(!pathParts[0].isEmpty() && fi.isRelative())
-  {
-    pathBuildUp.append(pathParts[0] + QDir::separator());
-  }
-  else
-  {
-    return false;
-  }
-#endif
-  }
-
-  /* Now that we have started our built-up path, continue adding to the built-up path
-   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
-  bool valid = false;
-
-  QFileInfo buildingFi(pathBuildUp);
-  size_t pathPartsIdx = 1; // We already processed the first path part above
-  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
-  {
-    valid = true;
-    m_CurrentlyValidPath = pathBuildUp; // Save the most current, valid built-up path
-
-    // If there's another path part to add, add it to the end of the built-up path
-    if (pathPartsIdx < pathParts.size())
-    {
-      /* If the built-up path doesn't already have a separator on the end, add one. */
-      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
-      {
-        pathBuildUp.append(QDir::separator());
-      }
-
-      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
-      buildingFi.setFile(pathBuildUp);
-    }
-    pathPartsIdx++;
-  }
-
-  return valid;
-}
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 0d68afa0e4..7bbfcf3cdc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -149,22 +149,6 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
      */
     QPoint adjustedMenuPosition(QToolButton *pushButton);
 
-    /**
-     * @brief hasValidFilePath
-     * @param filePath
-     * @return
-     */
-    bool hasValidFilePath(const QString &filePath);
-
-    /**
-     * @brief verifyPathExists
-     * @param filePath
-     * @param lineEdit
-     * @return
-     */
-    bool verifyPathExists(QString filePath, QLineEdit* lineEdit);
-
-
   protected slots:
     void showBorder();
     void hideBorder();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 2a1357e9bb..19f6774247 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -62,6 +62,7 @@
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 
+#include "SVWidgetsLib/QtSupport/QtSFileUtils.h"
 #include "SVWidgetsLib/Widgets/ImportHDF5TreeModel.h"
 #include "SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h"
 
@@ -223,23 +224,6 @@ void ImportHDF5DatasetWidget::initializeHDF5Paths()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool ImportHDF5DatasetWidget::verifyPathExists(QString filePath, QtSFSDropLabel* lineEdit)
-{
-  QFileInfo fileinfo(filePath);
-  if(!fileinfo.exists())
-  {
-    lineEdit->changeStyleSheet(QtSFSDropLabel::FS_DOESNOTEXIST_STYLE);
-  }
-  else
-  {
-    lineEdit->changeStyleSheet(QtSFSDropLabel::FS_STANDARD_STYLE);
-  }
-  return fileinfo.exists();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -248,7 +232,7 @@ void ImportHDF5DatasetWidget::on_value_fileDropped(const QString& text)
   m_OpenDialogLastDirectory = text;
 
   // Set/Remove the red outline if the file does exist
-  if(verifyPathExists(text, value))
+  if(QtSFileUtils::VerifyPathExists(text, dynamic_cast<QLineEdit*>(value)))
   {
     if(initWithFile(text))
     {
@@ -288,7 +272,7 @@ void ImportHDF5DatasetWidget::on_selectBtn_clicked()
 // -----------------------------------------------------------------------------
 void ImportHDF5DatasetWidget::on_showLocationBtn_clicked()
 {
-  hasValidFilePath(value->text());
+  QtSFileUtils::HasValidFilePath(value->text());
   showFileInFileSystem();
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index 53bca1bc41..3cf469645a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -70,14 +70,6 @@ class SVWidgetsLib_EXPORT ImportHDF5DatasetWidget : public FilterParameterWidget
     return m_CurrentOpenFile;
   }
 
-  /**
-   * @brief verifyPathExists
-   * @param filePath
-   * @param lineEdit
-   * @return
-   */
-  bool verifyPathExists(QString filePath, QtSFSDropLabel* lineEdit);
-
 public slots:
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index c8363650bc..d350877f06 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -36,8 +36,10 @@
 #include <QtCore/QProcess>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QApplication>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QDesktopServices>
 
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -179,3 +181,99 @@ void QtSFileUtils::ShowPathInGui(QWidget* parent, const QString &pathIn)
   }
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool QtSFileUtils::VerifyPathExists(QString filePath, QLineEdit* lineEdit)
+{
+  HasValidFilePath(filePath);
+  QFileInfo fileinfo(filePath);
+  if(!fileinfo.exists())
+  {
+    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
+  }
+  else
+  {
+    SVStyle::Instance()->LineEditClearStyle(lineEdit);
+  }
+  return fileinfo.exists();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool QtSFileUtils::HasValidFilePath(const QString &filePath)
+{
+  QStringList pathParts = filePath.split(QDir::separator());
+  if(pathParts.empty())
+  {
+    return false;
+  }
+
+  QString pathBuildUp;
+  QFileInfo fi(filePath);
+
+  /* This block of code figures out, based on the current OS, how the built-up path should begin.
+   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
+   * For Windows, it should start with a path part for both absolute and relative paths.
+   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
+  {
+#if defined(Q_OS_WIN)
+  /* If there is at least one part, then add it to the pathBuildUp variable.
+    A valid Windows path, absolute or relative, has to have at least one part. */
+  if (pathParts[0].isEmpty() == false)
+  {
+    pathBuildUp.append(pathParts[0]);
+  }
+  else
+  {
+    return false;
+  }
+#else
+  /* If the first part is empty and the filePath is absolute, then that means that
+   * we are starting with the root directory and need to add it to our pathBuildUp */
+  if (pathParts[0].isEmpty() && fi.isAbsolute())
+  {
+    pathBuildUp.append(QDir::separator());
+  }
+  /* If the first part is empty and the filePath is relative, then that means that
+   * we are starting with the first folder part and need to add that to our pathBuildUp */
+  else if(!pathParts[0].isEmpty() && fi.isRelative())
+  {
+    pathBuildUp.append(pathParts[0] + QDir::separator());
+  }
+  else
+  {
+    return false;
+  }
+#endif
+  }
+
+  /* Now that we have started our built-up path, continue adding to the built-up path
+   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
+  bool valid = false;
+
+  QFileInfo buildingFi(pathBuildUp);
+  size_t pathPartsIdx = 1; // We already processed the first path part above
+  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
+  {
+    valid = true;
+
+    // If there's another path part to add, add it to the end of the built-up path
+    if (pathPartsIdx < pathParts.size())
+    {
+      /* If the built-up path doesn't already have a separator on the end, add one. */
+      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
+      {
+        pathBuildUp.append(QDir::separator());
+      }
+
+      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
+      buildingFi.setFile(pathBuildUp);
+    }
+    pathPartsIdx++;
+  }
+
+  return valid;
+}
+
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
index 75a2c05e08..344649750c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
@@ -36,6 +36,8 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
+class QLineEdit;
+
 /**
  * @brief The QtSFileUtils class
  */
@@ -58,6 +60,21 @@ class SVWidgetsLib_EXPORT QtSFileUtils
      */
     static void ShowPathInGui(QWidget* parent, const QString &path);
 
+    /**
+     * @brief verifyPathExists
+     * @param filePath
+     * @param lineEdit
+     * @return
+     */
+    static bool VerifyPathExists(QString filePath, QLineEdit* lineEdit);
+
+    /**
+     * @brief hasValidFilePath
+     * @param filePath
+     * @return
+     */
+    static bool HasValidFilePath(const QString &filePath);
+
     /**
      * @brief GetPathSeperator
      * @return Returns the separator character used in the PATH environment variable

From 3cb325c3fb0adc01bf173693a2f09f159c8eabb4 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Thu, 6 Dec 2018 14:55:52 -0500
Subject: [PATCH 003/397] Address VerifyPreconditions const change in ITK 5
 master (#272)

This requires ITK 5 Beta 2 or ITK 4.13.2, both are currently to-be-released.
---
 .../itkDream3DITransformContainerToTransform.h   |  2 +-
 .../itkDream3DITransformContainerToTransform.hxx |  2 +-
 .../itkDream3DTransformContainerToTransform.h    |  3 ++-
 .../itkDream3DTransformContainerToTransform.hxx  | 16 +++++++++++++---
 .../ITK/itkInPlaceDream3DDataToImageFilter.h     |  2 +-
 .../ITK/itkInPlaceDream3DDataToImageFilter.hxx   |  2 +-
 .../ITK/itkInPlaceImageToDream3DDataFilter.h     |  5 +++--
 .../ITK/itkInPlaceImageToDream3DDataFilter.hxx   | 14 +++++++++++---
 8 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 558b9dca2f..f6d7bc01da 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -66,7 +66,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   Dream3DITransformContainerToTransform();
   ~Dream3DITransformContainerToTransform() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
index 03eac2875e..191ddb8a4a 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
@@ -87,7 +87,7 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
 void
 Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_ITransformContainer)
   {
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 6a1d1ea6fe..5d21b636cd 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -57,12 +57,13 @@ template <typename ITKTransformType> class Dream3DTransformContainerToTransform
   using Superclass::SetInput;
   virtual void SetInput(::TransformContainer::Pointer transformContainer);
   DecoratorType* GetOutput();
+  const DecoratorType* GetOutput() const;
 
 protected:
   Dream3DTransformContainerToTransform();
   ~Dream3DTransformContainerToTransform() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST override;
 
   void GenerateData() override;
   ::TransformContainer::Pointer m_TransformContainer;
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
index 95cf96a373..67660726ef 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
@@ -83,14 +83,14 @@ Dream3DTransformContainerToTransform<ITKTransformType>
 template <typename ITKTransformType>
 void
 Dream3DTransformContainerToTransform<ITKTransformType>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_TransformContainer)
   {
     itkExceptionMacro("Input transform container is empty");
   }
-  DecoratorType* outputPtr = this->GetOutput();
-  typename ITKTransformType::Pointer transform = outputPtr->Get();
+  const DecoratorType* outputPtr = this->GetOutput();
+  typename ITKTransformType::ConstPointer transform = outputPtr->Get();
   // Verifies that the number of Parameters and Fixed Parameters in the transform
   // match the expected number based on the transform type.
   if(transform->GetNumberOfParameters() != m_TransformContainer->getParameters().size())
@@ -144,4 +144,14 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
+
+template <typename ITKTransformType>
+const typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType*
+Dream3DTransformContainerToTransform<ITKTransformType>
+::GetOutput() const
+{
+  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
+}
+
+
 } // end of itk namespace
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 98d0acf1e9..b9a2b7aac8 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -49,7 +49,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<Pix
   InPlaceDream3DDataToImageFilter();
   virtual ~InPlaceDream3DDataToImageFilter();
 
-  virtual void VerifyPreconditions() override;
+  virtual void VerifyPreconditions() ITKv5_CONST override;
 
   virtual void GenerateOutputInformation() override;
   virtual void GenerateData() override;
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 8471df7942..7d87debb31 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -37,7 +37,7 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
 template< typename PixelType, unsigned int VDimension>
 void
 InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if (m_DataContainer == DataContainer::NullPointer() )
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index ca63db8a67..134a26666a 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -36,6 +36,7 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
   virtual void SetInput(const ImageType* image);
 
   DecoratorType* GetOutput();
+  const DecoratorType* GetOutput() const;
 
   void SetDataContainer(DataContainer::Pointer dc);
 
@@ -54,13 +55,13 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
   InPlaceImageToDream3DDataFilter();
   virtual ~InPlaceImageToDream3DDataFilter();
 
-  virtual void VerifyPreconditions() override;
+  virtual void VerifyPreconditions() ITKv5_CONST override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
 
   virtual void GenerateData() override;
   virtual void GenerateOutputInformation() override;
 
-  void CheckValidArrayPathComponentName(std::string var);
+  void CheckValidArrayPathComponentName(std::string var) const;
 
 private:
   using Superclass::SetInput;
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index c48ae76c9c..dd28af3ff9 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -185,7 +185,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 template<typename PixelType, unsigned int VDimension>
 void
 InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::CheckValidArrayPathComponentName(std::string var)
+::CheckValidArrayPathComponentName(std::string var) const
 {
   if (var.find('/') != std::string::npos)
   {
@@ -202,7 +202,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 template<typename PixelType, unsigned int VDimension>
 void
 InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   //Test only works if image if of dimension 2 or 3
   if (VDimension != 2 && VDimension != 3)
@@ -212,7 +212,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  DecoratorType *outputPtr = this->GetOutput();
+  const DecoratorType *outputPtr = this->GetOutput();
   if (!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
@@ -232,5 +232,13 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
 }
 
+template<typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput() const
+{
+  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
+}
+
 } // end of itk namespace
 

From 97374af34556d770f1afd27147326ccdd463f11f Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 2 Jan 2019 09:05:04 -0500
Subject: [PATCH 004/397] Adding a few new PIMPL macros.

---
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 08022f98ee..f6be9ad315 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -461,20 +461,31 @@ public:     \
 
 #define SIMPL_PIMPL_PROPERTY_DECL(type, prpty)\
   public:\
-  void set##prpty(const type& value);\
+  SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
+  SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
+
+#define SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
   type get##prpty() const;
 
+#define SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
+  void set##prpty(const type& value);\
 
 #define SIMPL_PIMPL_PROPERTY_DEF(Class, type, prpty)\
-  void Class::set##prpty(const type& value) {\
-    Q_D(Class);\
-    d->m_##prpty = value;\
-  }\
+  SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
+  SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
+
+#define SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
   type Class::get##prpty() const {\
     Q_D(const Class);\
     return d->m_##prpty;\
   }
 
+#define SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
+  void Class::set##prpty(const type& value) {\
+    Q_D(Class);\
+    d->m_##prpty = value;\
+  }\
+
 
 #define SIMPL_OVERLOAD_PROPERTY(type, prpty, overload)\
   private:\

From f6616361698f993093f1f1b3aded37a016ab677d Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Wed, 2 Jan 2019 11:59:59 -0500
Subject: [PATCH 005/397] Adding MultiDataContainerSelectionFilterParameter and
 associated widget for selecting a list of data containers

---
 ...iDataContainerSelectionFilterParameter.cpp | 233 +++++++++
 ...ltiDataContainerSelectionFilterParameter.h | 196 ++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 .../MultiDataContainerSelectionWidget.cpp     | 467 ++++++++++++++++++
 .../MultiDataContainerSelectionWidget.h       | 147 ++++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../MultiDataContainerSelectionWidget.ui      | 396 +++++++++++++++
 7 files changed, 1442 insertions(+)
 create mode 100644 Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
new file mode 100644
index 0000000000..ea729401be
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -0,0 +1,233 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MultiDataContainerSelectionFilterParameter.h"
+
+#include <QtCore/QJsonArray>
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::MultiDataContainerSelectionFilterParameter()
+: m_DefaultPaths(QVector<DataArrayPath>())
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+	                                                                                        const RequirementType req, int groupIndex)
+{
+
+  MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
+  ptr->setCategory(category);
+  ptr->setDefaultGeometryTypes(req.dcGeometryTypes);
+  ptr->setDefaultAttributeMatrixTypes(req.amTypes);
+  ptr->setDefaultAttributeArrayTypes(req.daTypes);
+  ptr->setDefaultComponentDimensions(req.componentDimensions);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
+{
+  return QString("MultiDataContainerSelectionWidget");
+}
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
+	AttributeMatrix::Category attributeMatrixCategory)
+{
+	typedef QVector<size_t> QVectorOfSizeType;
+	MultiDataContainerSelectionFilterParameter::RequirementType req;
+	AttributeMatrix::Types amTypes;
+	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
+	{
+		amTypes.push_back(AttributeMatrix::Type::Cell);
+		amTypes.push_back(AttributeMatrix::Type::Face);
+		amTypes.push_back(AttributeMatrix::Type::Edge);
+		amTypes.push_back(AttributeMatrix::Type::Vertex);
+	}
+	else if (attributeMatrixCategory == AttributeMatrix::Category::Feature)
+	{
+		amTypes.push_back(AttributeMatrix::Type::CellFeature);
+		amTypes.push_back(AttributeMatrix::Type::FaceFeature);
+		amTypes.push_back(AttributeMatrix::Type::EdgeFeature);
+		amTypes.push_back(AttributeMatrix::Type::VertexFeature);
+	}
+	else if (attributeMatrixCategory == AttributeMatrix::Category::Ensemble)
+	{
+		amTypes.push_back(AttributeMatrix::Type::CellEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::FaceEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::EdgeEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::VertexEnsemble);
+	}
+	req.amTypes = amTypes;
+	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+	{
+		req.daTypes = QVector<QString>(1, primitiveType);
+	}
+	if (SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+	{
+		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+	}
+	//  if(IGeometry::Type::Unknown != geometryType)
+	//  {
+	//    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+	//  }
+	return req;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
+	IGeometry::Type geometryType)
+{
+	typedef QVector<size_t> QVectorOfSizeType;
+	MultiDataContainerSelectionFilterParameter::RequirementType req;
+	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+	{
+		req.daTypes = QVector<QString>(1, primitiveType);
+	}
+	if (SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+	{
+		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+	}
+	if (AttributeMatrix::Type::Any != attributeMatrixType)
+	{
+		QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+		req.amTypes = amTypes;
+	}
+	if (IGeometry::Type::Any != geometryType)
+	{
+		req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+	}
+	return req;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    QJsonArray arrayObj = jsonValue.toArray();
+    QVector<DataArrayPath> dapVec;
+    for(int i = 0; i < arrayObj.size(); i++)
+    {
+      QJsonObject obj = arrayObj.at(i).toObject();
+      DataArrayPath dap;
+      dap.readJson(obj);
+      dapVec.push_back(dap);
+    }
+
+    m_SetterCallback(dapVec);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
+{
+  if (m_GetterCallback)
+  {
+    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    QJsonArray arrayObj;
+
+    for(int i = 0; i < dapVec.size(); i++)
+    {
+      DataArrayPath dap = dapVec[i];
+      QJsonObject obj;
+      dap.writeJson(obj);
+      arrayObj.push_back(obj);
+    }
+
+    json[getPropertyName()] = arrayObj;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  QVector<DataArrayPath> paths = m_GetterCallback();
+  int count = paths.size();
+  bool updated = false;
+
+  for(int i = 0; i < count; i++)
+  {
+    if(paths[i] == oldPath)
+    {
+      paths[i] = newPath;
+      updated = true;
+    }
+  }
+
+  m_SetterCallback(paths);
+  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
new file mode 100644
index 0000000000..f10580ec98
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -0,0 +1,196 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry.h"
+
+/**
+ * @brief SIMPL_NEW_MCA_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * MultiDataContainerSelectionFilterParameter. There are 5 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), RequirementType, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_MCA_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, RequirementType, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
+ * MultiDataContainerSelectionFilterParameter::RequirementType req;
+ * SIMPL_NEW_MCA_SELECTION_FP("Multi Data Container Test", SelectedMultiDataContainers, FilterParameter::Parameter, GenericExample, req, 0);
+ */
+#define SIMPL_NEW_MDC_SELECTION_FP(...) \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
+  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
+  (MultiDataContainerSelectionFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The MultiDataContainerSelectionFilterParameter class is used by filters to instantiate an MultiDataContainerSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a MultiDataContainerSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterParameter
+{
+  public:
+    SIMPL_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
+    SIMPL_STATIC_NEW_MACRO(MultiDataContainerSelectionFilterParameter)
+     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataContainerSelectionFilterParameter, FilterParameter)
+
+    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
+    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+
+    typedef struct
+    {
+      IGeometry::Types dcGeometryTypes;
+      AttributeMatrix::Types amTypes;
+      QVector<QString> daTypes;
+      QVector< QVector<size_t> > componentDimensions;
+    } RequirementType;
+
+    /**
+     * @brief New This function instantiates an instance of the MultiDataContainerSelectionFilterParameter.  Specifying a RequirementType will
+     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+     * SIMPL_NEW_MCA_SELECTION_FP(...) macro at the top of this file.
+
+     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+     * @param propertyName The internal property name for this filter parameter.
+     * @param defaultValue The value that this filter parameter will be initialized to by default.
+     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+     * are three categories: Parameter, Required Arrays, and Created Arrays.
+     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+    * that this FilterParameter subclass represents.
+     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+    * that this FilterParameter subclass represents.
+     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+     * user interface.
+     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+     * @return
+     */
+    static Pointer New(const QString& humanLabel, const QString& propertyName,
+                       const QVector<DataArrayPath>& defaultValue, Category category,
+                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const RequirementType req, int groupIndex = -1);
+
+    ~MultiDataContainerSelectionFilterParameter() override;
+
+    /**
+     * @brief CreateRequirement
+     * @param primitiveType
+     * @param allowedCompDim
+     * @param attributeMatrixCategory
+     * @return
+     */
+    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
+                                                     size_t allowedCompDim,
+                                                     AttributeMatrix::Category attributeMatrixCategory);
+
+    /**
+     * @brief CreateRequirement
+     * @param primitiveType
+     * @param allowedCompDim
+     * @param attributeMatrixType
+     * @param geometryType
+     * @return
+     */
+    static RequirementType CreateRequirement(const QString& primitiveType,
+                                             size_t allowedCompDim,
+                                             AttributeMatrix::Type attributeMatrixType,
+                                             IGeometry::Type geometryType);
+
+    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+
+    /**
+     * @brief getWidgetType Returns the type of widget that displays and controls
+     * this FilterParameter subclass
+     * @return
+     */
+    QString getWidgetType() const override;
+
+    /**
+     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+     * @param json The QJsonObject that the filter parameter reads from.
+     */
+    void readJson(const QJsonObject& json) override;
+
+    /**
+     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+     * @param json The QJsonObject that the filter parameter writes to.
+     */
+    void writeJson(QJsonObject& json) override;
+
+    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+
+    /**
+    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+    * that this FilterParameter subclass represents.
+    * from the filter parameter.
+    */
+    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+    /**
+    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+    * that this FilterParameter subclass represents.
+    * @return The GetterCallback
+    */
+    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     * @param filter
+     * @param renamePath
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+
+  protected:
+      /**
+       * @brief MultiDataContainerSelectionFilterParameter The default constructor.  It is protected because this
+       * filter parameter should only be instantiated using its New(...) function or short-form macro.
+       */
+    MultiDataContainerSelectionFilterParameter();
+
+  public:
+    MultiDataContainerSelectionFilterParameter(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionFilterParameter(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index eaaad64f3e..620cb4a68d 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -55,6 +55,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NumericTypeFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/OutputFileFilterParameter.h
@@ -116,6 +117,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NumericTypeFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/OutputFileFilterParameter.cpp
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
new file mode 100644
index 0000000000..bd62251546
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -0,0 +1,467 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "MultiDataContainerSelectionWidget.h"
+
+#include <QtCore/QList>
+#include <QtCore/QMetaProperty>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QModelIndex>
+
+#include <QtGui/QStandardItemModel>
+
+#include <QtWidgets/QListWidgetItem>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyledItemDelegate>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "FilterParameterWidgetUtils.hpp"
+#include "FilterParameterWidgetsDialogs.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
+{
+  m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
+
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_DidCausePreflight(false)
+{
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::setupGui()
+{
+  // Sanity Check the filter and the filter parameter
+  if(getFilter() == nullptr)
+  {
+    return;
+  }
+  if(getFilterParameter() == nullptr)
+  {
+    return;
+  }
+
+  selectedDataContainersListWidget->installEventFilter(this);
+  availableDataContainersListWidget->installEventFilter(this);
+
+  // Generate the text for the QLabel
+  //label->setText(getFilterParameter()->getHumanLabel());
+
+  // Lastly, hook up the filter's signals and slots to our own signals and slots
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
+    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+
+  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
+  for (int i=0; i<selectedPaths.size(); i++)
+  {
+    DataArrayPath selectedPath = selectedPaths[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataContainerName());
+    selectedDataContainersListWidget->addItem(item);
+  }
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
+{
+  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
+  {
+    on_selectedDataContainersListWidget_itemSelectionChanged();
+  }
+  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
+  {
+    on_availableDataContainersListWidget_itemSelectionChanged();
+  }
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_selectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_deselectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
+{
+  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
+  {
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
+      offset++;
+      if(item != nullptr)
+      {
+        selectedDataContainersListWidget->addItem(item);
+      }
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
+{
+  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
+  foreach(QListWidgetItem* item, items)
+  {
+    int row = selectedDataContainersListWidget->row(item);
+    selectedDataContainersListWidget->takeItem(row);
+    availableDataContainersListWidget->addItem(item);
+  }
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_upBtn_clicked()
+{
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex > 0)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_downBtn_clicked()
+{
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex < selectedDataContainersListWidget->count() - 1)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
+{
+  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
+  {
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
+      selectedDataContainersListWidget->removeItemWidget(item);
+      delete item;
+      offset++;
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::selectionChanged()
+{
+  upBtn->setDisabled(true);
+  downBtn->setDisabled(true);
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+
+  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
+  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
+
+  if (selectSize > 0)
+  {
+    selectBtn->setEnabled(true);
+  }
+
+  if (orderSize > 0)
+  {
+    deselectBtn->setEnabled(true);
+
+    if (orderSize == 1)
+    {
+      upBtn->setEnabled(true);
+      downBtn->setEnabled(true);
+    }
+
+    bool allErrorRows = true;
+    for (int i=0; i<orderSize; i++)
+    {
+      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
+      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      {
+        allErrorRows = false;
+      }
+    }
+
+    if(allErrorRows)
+    {
+      removeBtn->show();
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+
+  // Previously in afterPreflight()
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  QList<QString> selectListNames;
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
+  }
+
+  QList<QString> orderListNames;
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
+	  QString name = item->text();
+	  orderListNames.append(name);
+	  if (!dcNames.contains(name))
+	  {
+		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+		  // item->setBackgroundColor(QColor(235, 110, 110));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
+	  }
+	  else
+	  {
+		  // item->setBackgroundColor(QColor(255, 255, 255));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
+	  }
+  }
+
+  for (int i = 0; i < dcNames.size(); i++)
+  {
+	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
+	  {
+		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
+		  availableDataContainersListWidget->addItem(item);
+	  }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::afterPreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+	QVector<DataArrayPath> selectedPaths;
+	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+	{
+		DataArrayPath path;
+		path.setDataContainerName(selectedDataContainersListWidget->item(i)->text());
+		selectedPaths.push_back(path);
+	}
+
+	// Generate the path to the AttributeArray
+	QVariant var;
+	var.setValue(selectedPaths);
+	bool ok = false;
+	// Set the value into the Filter
+	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
+	if (!ok)
+	{
+		getFilter()->notifyMissingProperty(getFilterParameter());
+	}
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
new file mode 100644
index 0000000000..c401b09dac
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -0,0 +1,147 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
+
+#include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+
+
+#include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
+
+class FilterParameter;
+class AbstractFilter;
+class MultiDataContainerSelectionFilterParameter;
+class QSignalMapper;
+
+/**
+* @brief
+* @author
+* @version
+*/
+class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
+{
+    Q_OBJECT
+
+  public:
+    /**
+    * @brief Constructor
+    * @param parameter The FilterParameter object that this widget represents
+    * @param filter The instance of the filter that this parameter is a part of
+    * @param parent The parent QWidget for this Widget
+    */
+    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+    ~MultiDataContainerSelectionWidget() override;
+
+    /**
+    * @brief This method does additional GUI widget connections
+    */
+    void setupGui() override;
+
+    /**
+    * @brief checkStringValues
+    * @param current
+    * @param filt
+    * @return
+    */
+    QString checkStringValues(QString current, QString filtDcName);
+
+    /**
+    * @brief initializeWidget
+    * @param parameter
+    * @param filter
+    */
+    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+    /**
+     * @brief eventFilter
+     * @param obj
+     * @param event
+     * @return
+     */
+    bool eventFilter(QObject* obj, QEvent* event) override;
+
+  public slots:
+    void beforePreflight();
+    void afterPreflight();
+    void filterNeedsInputParameters(AbstractFilter* filter);
+
+  protected slots:
+    void on_upBtn_clicked();
+    void on_downBtn_clicked();
+    void on_selectBtn_clicked();
+    void on_deselectBtn_clicked();
+    void on_removeBtn_clicked();
+
+    void on_availableDataContainersListWidget_itemSelectionChanged();
+    void on_selectedDataContainersListWidget_itemSelectionChanged();
+
+    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+
+  private:
+    bool m_DidCausePreflight;
+
+    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
+
+    void selectionChanged();
+
+  public:
+    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+};
+
+
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index 12329834e4..8d153e8da0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -33,6 +33,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     IntWidget
     LinkedBooleanWidget
     MultiAttributeMatrixSelectionWidget
+    MultiDataContainerSelectionWidget
     MultiDataArraySelectionWidget
     NumericTypeWidget
     ParagraphWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
new file mode 100644
index 0000000000..156d8f8d2e
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MultiDataContainerSelectionWidget</class>
+ <widget class="QFrame" name="MultiDataContainerSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>583</width>
+    <height>247</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="3">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="SVIconPushButton" name="upBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="downBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="removeBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <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>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Selected Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Available Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer name="verticalSpacer_3">
+       <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="SVIconPushButton" name="selectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_right_green.png</normaloff>:/SIMPL/icons/images/arrow_right_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="deselectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_left_green.png</normaloff>:/SIMPL/icons/images/arrow_left_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</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">
+    <widget class="SVListWidget" name="availableDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="SVListWidget" name="selectedDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+  <customwidget>
+   <class>SVListWidget</class>
+   <extends>QListWidget</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>

From e2205802628963cf478173909f0d057a7bc3bbc4 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 7 Jan 2019 14:59:35 -0500
Subject: [PATCH 006/397] Changing MultiDataContainerSelection filter
 parameter's and widget's property type from QVector<DataArrayPath> to
 QStringList.  We only need to pass along a list of data container names, not
 full paths.

---
 ...iDataContainerSelectionFilterParameter.cpp | 36 +++++++++----------
 ...ltiDataContainerSelectionFilterParameter.h |  8 ++---
 .../MultiDataContainerSelectionWidget.cpp     | 23 ++++--------
 .../MultiDataContainerSelectionWidget.h       |  2 --
 4 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index ea729401be..08cfb2a218 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -44,7 +44,7 @@
 //
 // -----------------------------------------------------------------------------
 MultiDataContainerSelectionFilterParameter::MultiDataContainerSelectionFilterParameter()
-: m_DefaultPaths(QVector<DataArrayPath>())
+: m_DefaultNames(QStringList())
 {
 }
 
@@ -56,9 +56,9 @@ MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QStringList &defaultValue,
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-	                                                                                        const RequirementType req, int groupIndex)
+                                                                                          const RequirementType req, int groupIndex)
 {
 
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
@@ -171,16 +171,14 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
-    QVector<DataArrayPath> dapVec;
+    QStringList dcList;
     for(int i = 0; i < arrayObj.size(); i++)
     {
-      QJsonObject obj = arrayObj.at(i).toObject();
-      DataArrayPath dap;
-      dap.readJson(obj);
-      dapVec.push_back(dap);
+      QString dcName = arrayObj.at(i).toString();
+      dcList.push_back(dcName);
     }
 
-    m_SetterCallback(dapVec);
+    m_SetterCallback(dcList);
   }
 }
 
@@ -191,15 +189,13 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if (m_GetterCallback)
   {
-    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for(int i = 0; i < dapVec.size(); i++)
+    for(int i = 0; i < dcList.size(); i++)
     {
-      DataArrayPath dap = dapVec[i];
-      QJsonObject obj;
-      dap.writeJson(obj);
-      arrayObj.push_back(obj);
+      QString dcName = dcList[i];
+      arrayObj.push_back(dcName);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -215,19 +211,19 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  QVector<DataArrayPath> paths = m_GetterCallback();
-  int count = paths.size();
+  QStringList dcList = m_GetterCallback();
+  int count = dcList.size();
   bool updated = false;
 
   for(int i = 0; i < count; i++)
   {
-    if(paths[i] == oldPath)
+    if(dcList[i] == oldPath.getDataContainerName())
     {
-      paths[i] = newPath;
+      dcList[i] = newPath.getDataContainerName();
       updated = true;
     }
   }
 
-  m_SetterCallback(paths);
+  m_SetterCallback(dcList);
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index f10580ec98..4233aa31df 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -71,8 +71,8 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_STATIC_NEW_MACRO(MultiDataContainerSelectionFilterParameter)
      SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataContainerSelectionFilterParameter, FilterParameter)
 
-    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+    typedef std::function<void(QStringList)> SetterCallbackType;
+    typedef std::function<QStringList(void)> GetterCallbackType;
 
     typedef struct
     {
@@ -103,7 +103,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QVector<DataArrayPath>& defaultValue, Category category,
+                       const QStringList& defaultValue, Category category,
                        SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                        const RequirementType req, int groupIndex = -1);
 
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
-    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+    SIMPL_INSTANCE_PROPERTY(QStringList, DefaultNames)
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index bd62251546..9887624a33 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -130,11 +130,11 @@ void MultiDataContainerSelectionWidget::setupGui()
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
     this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
-  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
-  for (int i=0; i<selectedPaths.size(); i++)
+  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
+  for (int i=0; i<dcNames.size(); i++)
   {
-    DataArrayPath selectedPath = selectedPaths[i];
-    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataContainerName());
+    QString dcName = dcNames[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
     selectedDataContainersListWidget->addItem(item);
   }
   selectBtn->setDisabled(true);
@@ -301,13 +301,6 @@ void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
-{
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -436,17 +429,15 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-	QVector<DataArrayPath> selectedPaths;
+  QStringList dcNames;
 	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
 	{
-		DataArrayPath path;
-		path.setDataContainerName(selectedDataContainersListWidget->item(i)->text());
-		selectedPaths.push_back(path);
+    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
 	}
 
 	// Generate the path to the AttributeArray
 	QVariant var;
-	var.setValue(selectedPaths);
+  var.setValue(dcNames);
 	bool ok = false;
 	// Set the value into the Filter
 	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index c401b09dac..90406a9c4a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -132,8 +132,6 @@ class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParam
 
     MultiDataContainerSelectionFilterParameter* m_FilterParameter;
 
-    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
-
     void selectionChanged();
 
   public:

From ff7c097e56e84fdc06282d5394187bfa336bf85c Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 8 Jan 2019 09:30:18 -0500
Subject: [PATCH 007/397] Adding icons to the add and remove Data Container
 buttons in the MultiDataContainerSelection widget.

---
 .../UI_Files/MultiDataContainerSelectionWidget.ui         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index 156d8f8d2e..d2c3783761 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -52,7 +52,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
+        <iconset>
          <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
        </property>
        <property name="iconSize">
@@ -87,7 +87,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
+        <iconset>
          <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
        </property>
        <property name="iconSize">
@@ -223,7 +223,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_right_green.png</normaloff>:/SIMPL/icons/images/arrow_right_green.png</iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -258,7 +258,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_left_green.png</normaloff>:/SIMPL/icons/images/arrow_left_green.png</iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
        </property>
        <property name="iconSize">
         <size>

From 0f844830d4d8a229bb22de5dd163c2279145915a Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 15 Jan 2019 14:03:31 -0500
Subject: [PATCH 008/397] Checking for and clearing non-existant data
 containers before each preflight.

---
 .../MultiDataContainerSelectionWidget.cpp     | 36 +++++++++++++++++++
 .../MultiDataContainerSelectionWidget.h       |  5 +++
 2 files changed, 41 insertions(+)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9887624a33..fd4cd98b10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -363,6 +363,40 @@ void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_item
   selectionChanged();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
+{
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
+    {
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
+    }
+  }
+
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
+    {
+      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
+    }
+  }
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -373,6 +407,8 @@ void MultiDataContainerSelectionWidget::beforePreflight()
     return;
   }
 
+  clearNonexistantDataContainers();
+
   // Previously in afterPreflight()
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
   if(nullptr == dca.get())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 90406a9c4a..6393c39f1d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -134,6 +134,11 @@ class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParam
 
     void selectionChanged();
 
+    /**
+     * @brief clearNonexistantDataContainers
+     */
+    void clearNonexistantDataContainers();
+
   public:
     MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
     MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented

From d134925ad4860f7b71728c9729d4e69fefdc6423 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 18 Jan 2019 10:59:23 -0500
Subject: [PATCH 009/397] Adding itkProgressObserver class that can be used to
 pass progress updates from ITK to DREAM3D filters.

---
 Source/SIMPLib/ITK/itkProgressObserver.cpp | 93 ++++++++++++++++++++++
 Source/SIMPLib/ITK/itkProgressObserver.h   | 67 ++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 Source/SIMPLib/ITK/itkProgressObserver.cpp
 create mode 100644 Source/SIMPLib/ITK/itkProgressObserver.h

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.cpp b/Source/SIMPLib/ITK/itkProgressObserver.cpp
new file mode 100644
index 0000000000..93c2c11baa
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkProgressObserver.cpp
@@ -0,0 +1,93 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "itkProgressObserver.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::Execute(itk::Object* caller, const itk::EventObject& event)
+{
+    Execute((const itk::Object*)caller, event);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::Execute(const itk::Object* caller, const itk::EventObject& event)
+{
+    if(!itk::ProgressEvent().CheckEvent(&event))
+    {
+        return;
+    }
+    const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
+    if(!processObject)
+    {
+        return;
+    }
+
+    QString progressStr = QString::number(processObject->GetProgress() * 100);
+
+    QString ss;
+    if (m_MessagePrefix.isEmpty())
+    {
+        ss = QObject::tr("%1%").arg(progressStr);
+    }
+    else
+    {
+        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
+    }
+
+    if (m_Filter)
+    {
+        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
+    }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::setMessagePrefix(const QString &prefix)
+{
+    m_MessagePrefix = prefix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::setFilter(AbstractFilter* filter)
+{
+    m_Filter = filter;
+}
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.h b/Source/SIMPLib/ITK/itkProgressObserver.h
new file mode 100644
index 0000000000..37f51e9412
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkProgressObserver.h
@@ -0,0 +1,67 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "itkProcessObject.h"
+#include "itkCommand.h"
+
+namespace itk
+{
+class ProgressObserver : public itk::Command
+{
+  public:
+    void Execute(itk::Object* caller, const itk::EventObject& event) override;
+
+    void Execute(const itk::Object* caller, const itk::EventObject& event) override;
+
+    void setMessagePrefix(const QString &prefix);
+
+    void setFilter(AbstractFilter* filter);
+
+  private:
+    AbstractFilter* m_Filter = nullptr;
+    QString m_MessagePrefix;
+};
+} // end of itk namespace
+
+#ifndef ITK_MANUAL_INSTANTIATION
+#include "itkProgressObserver.cpp"
+#endif

From eb4b7a294ad7d377a7d17bb8a5cfe3c7c01058f8 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 21 Jan 2019 15:18:15 -0500
Subject: [PATCH 010/397] Adding new Fiji configuration file reader class.

---
 .../ITK/itkFijiConfigurationFileReader.hpp    | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
new file mode 100644
index 0000000000..cb5d95fff2
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -0,0 +1,126 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+
+#include "itkParseTileConfiguration.h"
+
+namespace itk
+{
+struct FijiImageTileData
+{
+  QString filePath;
+  QPointF coords;
+  int row;
+  int col;
+};
+
+typedef std::vector<FijiImageTileData> FijiRowData;
+typedef std::vector<FijiRowData> FijiFileData;
+
+class FijiConfigurationFileReader : public QObject
+{
+  public:
+    FijiFileData parseFijiConfigFile(const QString &configFilePath)
+    {
+      itk::FijiFileData fileData;
+
+      itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());
+      for (int i = 0; i < stageTiles.size(); i++)
+      {
+        auto tile2D = stageTiles[i];
+        FijiRowData rowData;
+        for (int j = 0; j < tile2D.size(); j++)
+        {
+          auto tile = tile2D[j];
+
+          QString imageFilePath = QString::fromStdString(tile.FileName);
+          QFileInfo fi(imageFilePath);
+          if (fi.isRelative())
+          {
+            QFileInfo configFi(configFilePath);
+            imageFilePath = configFi.path() + QDir::separator() + imageFilePath;
+          }
+
+          itk::FijiImageTileData imageTileData;
+
+          imageTileData.filePath = imageFilePath;
+
+          uint32_t coordsSize = tile.Position.GetPointDimension();
+          if (coordsSize != 2)
+          {
+            m_ErrorMessage = QObject::tr("The dimension size of all tiles in the fiji config file must be equal to 2.");
+            m_ErrorCondition = -2004;
+            return itk::FijiFileData();
+          }
+
+          imageTileData.coords = QPointF(tile.Position[0], tile.Position[1]);
+          imageTileData.row = i;
+          imageTileData.col = j;
+
+          rowData.push_back(imageTileData);
+        }
+
+        fileData.push_back(rowData);
+      }
+
+      return fileData;
+    }
+
+    int getErrorCode()
+    {
+      return m_ErrorCondition;
+    }
+
+    QString getErrorMessage()
+    {
+      return m_ErrorMessage;
+    }
+
+  private:
+    int m_ErrorCondition;
+    QString m_ErrorMessage;
+};
+}
+
+//#ifndef ITK_MANUAL_INSTANTIATION
+//#include "itkFijiConfigurationFileReader.cpp"
+//#endif

From b643dfe7cf77a9b082f9dc8f92766a215083c38c Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 28 Jan 2019 14:10:35 -0500
Subject: [PATCH 011/397] Turning itkProgressObserver into a header-only class.

---
 Source/SIMPLib/ITK/itkProgressObserver.cpp    | 93 -------------------
 ...ressObserver.h => itkProgressObserver.hpp} | 49 ++++++++--
 2 files changed, 41 insertions(+), 101 deletions(-)
 delete mode 100644 Source/SIMPLib/ITK/itkProgressObserver.cpp
 rename Source/SIMPLib/ITK/{itkProgressObserver.h => itkProgressObserver.hpp} (72%)

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.cpp b/Source/SIMPLib/ITK/itkProgressObserver.cpp
deleted file mode 100644
index 93c2c11baa..0000000000
--- a/Source/SIMPLib/ITK/itkProgressObserver.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "itkProgressObserver.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::Execute(itk::Object* caller, const itk::EventObject& event)
-{
-    Execute((const itk::Object*)caller, event);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::Execute(const itk::Object* caller, const itk::EventObject& event)
-{
-    if(!itk::ProgressEvent().CheckEvent(&event))
-    {
-        return;
-    }
-    const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
-    if(!processObject)
-    {
-        return;
-    }
-
-    QString progressStr = QString::number(processObject->GetProgress() * 100);
-
-    QString ss;
-    if (m_MessagePrefix.isEmpty())
-    {
-        ss = QObject::tr("%1%").arg(progressStr);
-    }
-    else
-    {
-        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
-    }
-
-    if (m_Filter)
-    {
-        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::setMessagePrefix(const QString &prefix)
-{
-    m_MessagePrefix = prefix;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::setFilter(AbstractFilter* filter)
-{
-    m_Filter = filter;
-}
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.h b/Source/SIMPLib/ITK/itkProgressObserver.hpp
similarity index 72%
rename from Source/SIMPLib/ITK/itkProgressObserver.h
rename to Source/SIMPLib/ITK/itkProgressObserver.hpp
index 37f51e9412..4e66fedb31 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.h
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -48,20 +48,53 @@ namespace itk
 class ProgressObserver : public itk::Command
 {
   public:
-    void Execute(itk::Object* caller, const itk::EventObject& event) override;
+    void Execute(itk::Object* caller, const itk::EventObject& event) override
+    {
+      Execute((const itk::Object*)caller, event);
+    }
 
-    void Execute(const itk::Object* caller, const itk::EventObject& event) override;
+    void Execute(const itk::Object* caller, const itk::EventObject& event) override
+    {
+      if(!itk::ProgressEvent().CheckEvent(&event))
+      {
+        return;
+      }
+      const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
+      if(!processObject)
+      {
+        return;
+      }
 
-    void setMessagePrefix(const QString &prefix);
+      QString progressStr = QString::number(processObject->GetProgress() * 100);
 
-    void setFilter(AbstractFilter* filter);
+      QString ss;
+      if (m_MessagePrefix.isEmpty())
+      {
+        ss = QObject::tr("%1%").arg(progressStr);
+      }
+      else
+      {
+        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
+      }
+
+      if (m_Filter)
+      {
+        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
+      }
+    }
+
+    void setMessagePrefix(const QString &prefix)
+    {
+      m_MessagePrefix = prefix;
+    }
+
+    void setFilter(AbstractFilter* filter)
+    {
+      m_Filter = filter;
+    }
 
   private:
     AbstractFilter* m_Filter = nullptr;
     QString m_MessagePrefix;
 };
 } // end of itk namespace
-
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "itkProgressObserver.cpp"
-#endif

From 95d68196e4242e0ac28013d0e02d30c8511213ed Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Mon, 4 Feb 2019 11:26:35 -0500
Subject: [PATCH 012/397] Fixes issue with montage filter not working due to an
 uninitialized variable

Signed-off-by: Tom Platt <tom.platt@bluequartz.net>
---
 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index cb5d95fff2..1d72bbda15 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -61,6 +61,7 @@ class FijiConfigurationFileReader : public QObject
   public:
     FijiFileData parseFijiConfigFile(const QString &configFilePath)
     {
+      m_ErrorCondition = 0;
       itk::FijiFileData fileData;
 
       itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());

From 04ccfebcf4d6a2d67944b406a23c2436bce1dcf9 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 11 Feb 2019 16:56:57 -0500
Subject: [PATCH 013/397] Adding itkTemplateHelpers header file that includes
 macros that can be used by filters to register and stitch images with any
 data type and image type.

---
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  10 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |  13 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  12 +-
 Source/SIMPLib/ITK/itkTemplateHelpers.h       | 172 ++++++++++++++++++
 4 files changed, 190 insertions(+), 17 deletions(-)
 create mode 100755 Source/SIMPLib/ITK/itkTemplateHelpers.h

diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 691b501a3f..16a763d867 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -93,7 +93,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
   else
   {
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -144,7 +144,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f,
     break;
   default:
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeEnums::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
     break;
   }
@@ -217,7 +217,7 @@ IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const QV
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -284,7 +284,7 @@ IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -378,7 +378,7 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
                      .arg(arrayPath.getDataArrayName())
                      .arg(i_data_array->getTypeAsString())
                      .arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
   }
   return retPtr;
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 4f30b5ab62..b871ff2b4d 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -106,7 +106,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedType);                                                             \
+    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
   }
 
 #define EXECUTE_TEMPLATE(observableObj, templateName, inputData, ...)                                                                                                                                  \
@@ -172,7 +172,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedType);                                                             \
+    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
   }
 
 /**
@@ -180,10 +180,11 @@ namespace TemplateHelpers
  */
 namespace Errors
 {
-const int UnsupportedType(-401);
-const int MissingDataContainer(-402);
-const int MissingAttributeMatrix(-403);
-const int MissingArray(-404);
+const int UnsupportedDataType(-401);
+const int UnsupportedImageType(-402);
+const int MissingDataContainer(-403);
+const int MissingAttributeMatrix(-404);
+const int MissingArray(-405);
 } // namespace Errors
 
 /**
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 95ea16665d..7296caad36 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -246,17 +246,17 @@ void WriteASCIIData::dataCheck()
 
     if( ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( ptr.lock()->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else
@@ -335,17 +335,17 @@ void WriteASCIIData::execute()
     }
     else if( selectedArrayPtr->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( selectedArrayPtr->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( selectedArrayPtr->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else
diff --git a/Source/SIMPLib/ITK/itkTemplateHelpers.h b/Source/SIMPLib/ITK/itkTemplateHelpers.h
new file mode 100755
index 0000000000..b5b1d94140
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkTemplateHelpers.h
@@ -0,0 +1,172 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Common/TemplateHelpers.h"
+
+/*
+ * @brief This file contains some macros that help to reduce the amount of code needed to determine the data type
+ * of an IDataArray and then call a function with template arguments
+ */
+
+namespace ITKTemplateHelpers
+{
+
+#define EXECUTE_REGISTER_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                               \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_STITCH_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                                 \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    templateName<itk::RGBPixel<DATATYPE>, itk::RGBPixel<uint64_t>>(__VA_ARGS__);                                                                                                                       \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<itk::RGBAPixel<DATATYPE>, itk::RGBAPixel<uint64_t>>(__VA_ARGS__);                                                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE, uint64_t>(__VA_ARGS__);                                                                                                                                                     \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(DATATYPE, observableObj, templateName, inputData, algorithm, ...)                                                                                     \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, algorithm, ...)                                                                                                     \
+  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(float, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                   \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(double, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<BoolArrayType>()(inputData))                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(bool, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                    \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<DataArray<size_t>>()(inputData))                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(size_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName, "The input array's data type is not supported", TemplateHelpers::Errors::UnsupportedDataType);                                                    \
+  }
+
+#define EXECUTE_STITCH_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, STITCH, __VA_ARGS__)
+
+#define EXECUTE_REGISTER_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, REGISTER, __VA_ARGS__)
+
+} // namespace ITKTemplateHelpers

From 5d5c9f7f794a78133984f7fe35af794412593d0d Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 12 Feb 2019 15:16:39 -0500
Subject: [PATCH 014/397] Adding shared pointer code to itkProgressObserver
 class.

---
 Source/SIMPLib/ITK/itkProgressObserver.hpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 4e66fedb31..438791cf16 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -48,6 +48,9 @@ namespace itk
 class ProgressObserver : public itk::Command
 {
   public:
+    SIMPL_SHARED_POINTERS(ProgressObserver)
+    SIMPL_STATIC_NEW_MACRO(ProgressObserver)
+
     void Execute(itk::Object* caller, const itk::EventObject& event) override
     {
       Execute((const itk::Object*)caller, event);
@@ -93,8 +96,16 @@ class ProgressObserver : public itk::Command
       m_Filter = filter;
     }
 
+  protected:
+    ProgressObserver() {}
+
   private:
     AbstractFilter* m_Filter = nullptr;
     QString m_MessagePrefix;
+
+    ProgressObserver(const ProgressObserver&) = delete; // Copy Constructor Not Implemented
+    ProgressObserver(ProgressObserver&&) = delete;      // Move Constructor Not Implemented
+    ProgressObserver& operator=(const ProgressObserver&) = delete; // Copy Assignment Not Implemented
+    ProgressObserver& operator=(ProgressObserver&&) = delete;      // Move Assignment Not Implemented
 };
 } // end of itk namespace

From 0a40264e2b8706dfd6877d874d399e00b2c02a31 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 14 Feb 2019 10:53:01 -0500
Subject: [PATCH 015/397] Removing itkTemplateHelpers header.

---
 Source/SIMPLib/ITK/itkTemplateHelpers.h | 172 ------------------------
 1 file changed, 172 deletions(-)
 delete mode 100755 Source/SIMPLib/ITK/itkTemplateHelpers.h

diff --git a/Source/SIMPLib/ITK/itkTemplateHelpers.h b/Source/SIMPLib/ITK/itkTemplateHelpers.h
deleted file mode 100755
index b5b1d94140..0000000000
--- a/Source/SIMPLib/ITK/itkTemplateHelpers.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include "SIMPLib/Common/TemplateHelpers.h"
-
-/*
- * @brief This file contains some macros that help to reduce the amount of code needed to determine the data type
- * of an IDataArray and then call a function with template arguments
- */
-
-namespace ITKTemplateHelpers
-{
-
-#define EXECUTE_REGISTER_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                               \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_STITCH_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                                 \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    templateName<itk::RGBPixel<DATATYPE>, itk::RGBPixel<uint64_t>>(__VA_ARGS__);                                                                                                                       \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<itk::RGBAPixel<DATATYPE>, itk::RGBAPixel<uint64_t>>(__VA_ARGS__);                                                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE, uint64_t>(__VA_ARGS__);                                                                                                                                                     \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(DATATYPE, observableObj, templateName, inputData, algorithm, ...)                                                                                     \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, algorithm, ...)                                                                                                     \
-  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(float, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                   \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(double, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<BoolArrayType>()(inputData))                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(bool, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                    \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<DataArray<size_t>>()(inputData))                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(size_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array's data type is not supported", TemplateHelpers::Errors::UnsupportedDataType);                                                    \
-  }
-
-#define EXECUTE_STITCH_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, STITCH, __VA_ARGS__)
-
-#define EXECUTE_REGISTER_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, REGISTER, __VA_ARGS__)
-
-} // namespace ITKTemplateHelpers

From 2b75e1f8f4155d27cce1d5eb86af9d6292aa0949 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 14 Feb 2019 10:53:29 -0500
Subject: [PATCH 016/397] Fixing bug where data container transforms were not
 being read from a dream3d file correctly.

---
 Source/SIMPLib/Geometry/IGeometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index ee93a1227e..c41e2d18f9 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -562,7 +562,7 @@ int IGeometry::readGeometryFromHDF5(hid_t parentId, bool preflight)
   herr_t err = 0;
   std::string transformTypeName = SIMPL::Geometry::UnknownTransformContainer.toStdString();
 
-  QString transformName = QString::number(0).toLatin1().data();
+  QString transformName = SIMPL::Geometry::TransformContainerGroup.toLatin1().data();
   err = H5Lite::readStringAttribute(parentId, transformName.toLatin1().data(), SIMPL::Geometry::TransformContainerTypeName.toLatin1().data(), transformTypeName);
   // No transform information found.
   if(err < 0)

From 07f2f47acbdfcab195c16517de35c78981d1f2e4 Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Mon, 11 Feb 2019 15:43:16 -0500
Subject: [PATCH 017/397] Merge in @nathanblair work on MultiDataContainerFP

resolves nathanblair/SIMPL/#2
Drag'n'Drop works for MultiDCSelection Widget

Signed-off-by: Nathan Blair <nathan.blair@bluequartz.net>
---
 ...iDataContainerSelectionFilterParameter.cpp |  26 +-
 ...ltiDataContainerSelectionFilterParameter.h |  12 +-
 .../MultiDataContainerSelectionWidget.cpp     | 591 +++++++-----------
 .../MultiDataContainerSelectionWidget.h       | 206 +++---
 .../MultiDataContainerSelectionWidget.ui      | 462 ++++----------
 5 files changed, 414 insertions(+), 883 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 08cfb2a218..e1dce99f01 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -60,7 +60,6 @@ MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionF
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                                                                                           const RequirementType req, int groupIndex)
 {
-
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
@@ -94,7 +93,7 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
 	AttributeMatrix::Category attributeMatrixCategory)
 {
-	typedef QVector<size_t> QVectorOfSizeType;
+  using QVectorOfSizeType = QVector<size_t>;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	AttributeMatrix::Types amTypes;
 	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -140,7 +139,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
 	IGeometry::Type geometryType)
 {
-	typedef QVector<size_t> QVectorOfSizeType;
+  using QVectorOfSizeType = QVector<size_t>;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
 	{
@@ -172,12 +171,11 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   {
     QJsonArray arrayObj = jsonValue.toArray();
     QStringList dcList;
-    for(int i = 0; i < arrayObj.size(); i++)
+    for (const auto &eachDCObj : arrayObj)
     {
-      QString dcName = arrayObj.at(i).toString();
-      dcList.push_back(dcName);
+      QJsonObject obj = eachDCObj.toObject();
+      dcList.push_back(obj["Data Container Name"].toString());
     }
-
     m_SetterCallback(dcList);
   }
 }
@@ -192,10 +190,11 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
     QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for(int i = 0; i < dcList.size(); i++)
+    for (const auto &eachDCName : dcList)
     {
-      QString dcName = dcList[i];
-      arrayObj.push_back(dcName);
+      QJsonObject obj;
+      obj["Data Container Name"] = eachDCName;
+      arrayObj.push_back(obj);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -212,14 +211,13 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   std::tie(oldPath, newPath) = renamePath;
 
   QStringList dcList = m_GetterCallback();
-  int count = dcList.size();
   bool updated = false;
 
-  for(int i = 0; i < count; i++)
+  for (auto &eachDCName : dcList)
   {
-    if(dcList[i] == oldPath.getDataContainerName())
+    if (eachDCName == oldPath.getDataContainerName())
     {
-      dcList[i] = newPath.getDataContainerName();
+      eachDCName = newPath.getDataContainerName();
       updated = true;
     }
   }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 4233aa31df..95460f4b9a 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -1,3 +1,4 @@
+#pragma once
 /* ============================================================================
 * Copyright (c) 2009-2016 BlueQuartz Software, LLC
 *
@@ -33,13 +34,9 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#pragma once
-
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
@@ -94,9 +91,9 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @param category The category for the filter parameter in the DREAM.3D user interface.  There
      * are three categories: Parameter, Required Arrays, and Created Arrays.
      * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
+     * that this FilterParameter subclass represents.
      * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
+     * that this FilterParameter subclass represents.
      * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
      * user interface.
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
@@ -157,7 +154,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector<QVector<size_t>>, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -193,4 +190,3 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index fd4cd98b10..2afa4bbd33 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -1,43 +1,45 @@
+#include <utility>
+
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 #include <QtCore/QModelIndex>
+#include <QtCore/QSignalMapper>
 
 #include <QtGui/QStandardItemModel>
 
@@ -55,440 +57,267 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
-, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerFilterParameter object");
 
   setupUi(this);
   setupGui();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
-: FilterParameterWidget(nullptr, nullptr, parent)
-, m_DidCausePreflight(false)
-{
-  setupUi(this);
-  setupGui();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
-{
-  setFilter(filter);
-  setFilterParameter(parameter);
-  setupGui();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::setupGui()
 {
   // Sanity Check the filter and the filter parameter
-  if(getFilter() == nullptr)
+  if(getFilter() == nullptr) // Trivial
   {
     return;
   }
-  if(getFilterParameter() == nullptr)
+  if(getFilterParameter() == nullptr) // Trivial
   {
     return;
   }
 
-  selectedDataContainersListWidget->installEventFilter(this);
-  availableDataContainersListWidget->installEventFilter(this);
-
-  // Generate the text for the QLabel
-  //label->setText(getFilterParameter()->getHumanLabel());
-
-  // Lastly, hook up the filter's signals and slots to our own signals and slots
-  // Catch when the filter is about to execute the preflight
   connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
-
-  // Catch when the filter is finished running the preflight
   connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
-
-  // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
-
-  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
-  for (int i=0; i<dcNames.size(); i++)
+  for(const auto& eachDC : getFilterParameter()->getDefaultValue().toStringList())
   {
-    QString dcName = dcNames[i];
-    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
-    selectedDataContainersListWidget->addItem(item);
+    dataContainersOrderWidget->addItem(eachDC);
   }
-  selectBtn->setDisabled(true);
-  deselectBtn->setDisabled(true);
-  removeBtn->hide();
 }
 
 // -----------------------------------------------------------------------------
-//
+// Slot callbacks
 // -----------------------------------------------------------------------------
-QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
-{
-  if(curDcName.isEmpty() && !filtDcName.isEmpty())
-  {
-    return filtDcName;
-  }
-  if(!curDcName.isEmpty() && filtDcName.isEmpty())
-  {
-    return curDcName;
-  }
-  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
-  {
-    return curDcName;
-  }
-
-  return filtDcName;
-}
-
 // -----------------------------------------------------------------------------
-//
+// Validate containers in each list are in the filter data container array
 // -----------------------------------------------------------------------------
-bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
+void MultiDataContainerSelectionWidget::beforePreflight()
 {
-  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
-  {
-    on_selectedDataContainersListWidget_itemSelectionChanged();
-  }
-  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
+  if(nullptr == getFilter())
   {
-    on_availableDataContainersListWidget_itemSelectionChanged();
+    return;
   }
-  return false;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
-{
-  on_selectBtn_clicked();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
-{
-  on_deselectBtn_clicked();
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
-{
-  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
-  if(!indexList.empty())
+  if(nullptr == getFilter()->getDataContainerArray().get())
   {
-    int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
-    {
-      int row = indexList[i].row() - offset;
-      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
-      offset++;
-      if(item != nullptr)
-      {
-        selectedDataContainersListWidget->addItem(item);
-      }
-    }
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    return;
   }
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
-{
-  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
-  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
-  foreach(QListWidgetItem* item, items)
+  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
+  for(const auto& eachDC : getFilter()->getDataContainerArray()->getDataContainerNames())
   {
-    int row = selectedDataContainersListWidget->row(item);
-    selectedDataContainersListWidget->takeItem(row);
-    availableDataContainersListWidget->addItem(item);
+    dcNames.push_back(eachDC);
   }
-  m_DidCausePreflight = true;
-  emit parametersChanged();
-  m_DidCausePreflight = false;
+
+  validateDataContainerNames(dataContainersSelectWidget, dcNames);
+  validateDataContainerNames(dataContainersOrderWidget, dcNames);
 }
 
 // -----------------------------------------------------------------------------
-//
+// Populate and syncronize the lists
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_upBtn_clicked()
+void MultiDataContainerSelectionWidget::afterPreflight()
 {
-  int currentIndex = selectedDataContainersListWidget->currentRow();
+  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
+  QStringList newItems{dcNames};
 
-  if(currentIndex > 0)
-  {
-    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
-    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
-    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
+  syncItems(dataContainersSelectWidget, dcNames, newItems);
+  syncItems(dataContainersOrderWidget, dcNames, newItems);
 
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
-  }
+  dataContainersSelectWidget->addItems(newItems);
 }
 
 // -----------------------------------------------------------------------------
-//
+// Set the filter's active data containers or notify that parameter is missing
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_downBtn_clicked()
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  int currentIndex = selectedDataContainersListWidget->currentRow();
-
-  if(currentIndex < selectedDataContainersListWidget->count() - 1)
+  QStringList selectedDCs;
+  for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
   {
-    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
-    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
-    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
   }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
-{
-  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
-  if(!indexList.empty())
+  QVariant var;
+  var.setValue(selectedDCs);
+  if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
   {
-    int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
-    {
-      int row = indexList[i].row() - offset;
-      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
-      selectedDataContainersListWidget->removeItemWidget(item);
-      delete item;
-      offset++;
-    }
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    getFilter()->notifyMissingProperty(getFilterParameter());
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Update the name of a data container in the appropriate list widget
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::selectionChanged()
+void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  upBtn->setDisabled(true);
-  downBtn->setDisabled(true);
-  selectBtn->setDisabled(true);
-  deselectBtn->setDisabled(true);
-  removeBtn->hide();
-
-  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
-  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
-
-  if (selectSize > 0)
-  {
-    selectBtn->setEnabled(true);
-  }
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
 
-  if (orderSize > 0)
+  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
   {
-    deselectBtn->setEnabled(true);
-
-    if (orderSize == 1)
+    if(oldPath.getDataContainerName() != newPath.getDataContainerName())
     {
-      upBtn->setEnabled(true);
-      downBtn->setEnabled(true);
-    }
-
-    bool allErrorRows = true;
-    for (int i=0; i<orderSize; i++)
-    {
-      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
-      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      blockSignals(true);
+      for (const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
-        allErrorRows = false;
+        eachOrderDC->setText(newPath.getDataContainerName());
       }
-    }
-
-    if(allErrorRows)
-    {
-      removeBtn->show();
+      for (const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      {
+        eachOrderDC->setText(newPath.getDataContainerName());
+      }
+      blockSignals(false);
     }
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Helper Methods
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
-{
-  selectionChanged();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
-{
-  selectionChanged();
-}
-
 // -----------------------------------------------------------------------------
-//
+// Sync list widgets with updated data container array
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
+void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const QStringList& list, QStringList& newItems)
 {
-  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if(nullptr == dca.get())
+  for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
   {
-    return;
-  }
-
-  QList<QString> dcNames = dca->getDataContainerNames();
-
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
-  {
-    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
+    QString itemText{eachItem->text()};
+    bool listContainsItemText{list.contains(itemText)};
+    if (listContainsItemText)
     {
-      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
-      delete item;
-      i--;
-    }
-  }
-
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-  {
-    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
-    {
-      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
-      delete item;
-      i--;
+      newItems.removeOne(itemText);
+      continue;
     }
+    delete listWidget->takeItem(listWidget->row(eachItem));
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Validate ListWidget item exists in data container array
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::beforePreflight()
+void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListWidget* list, const QList<QString>& compareList)
 {
-  if(nullptr == getFilter())
+  for(int i = 0; i < list->count(); i++)
   {
-    return;
-  }
-
-  clearNonexistantDataContainers();
-
-  // Previously in afterPreflight()
-  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if(nullptr == dca.get())
-  {
-    return;
-  }
-
-  QList<QString> dcNames = dca->getDataContainerNames();
-
-  QList<QString> selectListNames;
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
-  {
-	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
-  }
-
-  QList<QString> orderListNames;
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-  {
-	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
-	  QString name = item->text();
-	  orderListNames.append(name);
-	  if (!dcNames.contains(name))
-	  {
-		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-		  // item->setBackgroundColor(QColor(235, 110, 110));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
-	  }
-	  else
-	  {
-		  // item->setBackgroundColor(QColor(255, 255, 255));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
-	  }
-  }
-
-  for (int i = 0; i < dcNames.size(); i++)
-  {
-	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
-	  {
-		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
-		  availableDataContainersListWidget->addItem(item);
-	  }
+    QListWidgetItem* item = list->item(i);
+    QString name = item->text();
+    if(!compareList.contains(name))
+    {
+      item->setBackgroundColor(QColor(235, 110, 110));
+    }
+    else
+    {
+      item->setBackgroundColor(QColor(255, 255, 255));
+    }
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::afterPreflight()
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
-{
-  QStringList dcNames;
-	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-	{
-    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
-	}
-
-	// Generate the path to the AttributeArray
-	QVariant var;
-  var.setValue(dcNames);
-	bool ok = false;
-	// Set the value into the Filter
-	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-	if (!ok)
-	{
-		getFilter()->notifyMissingProperty(getFilterParameter());
-	}
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
-{
-  DataArrayPath oldPath;
-  DataArrayPath newPath;
-  std::tie(oldPath, newPath) = renamePath;
-}
+/* Unused
+// -----------------------------------------------------------------------------
+// This doesn't appear to get used - disabling and will remove if nothing adverse happens at runtime
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+//{
+//  setFilter(filter);
+//  setFilterParameter(parameter);
+//  setupGui();
+//}
+
+// -----------------------------------------------------------------------------
+// ???
+// -----------------------------------------------------------------------------
+//QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+//{
+//  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+//  {
+//    return filtDcName;
+//  }
+//  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+//  {
+//    return curDcName;
+//  }
+//  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+//  {
+//    return curDcName;
+//  }
+
+//  return filtDcName;
+//}
+
+// -----------------------------------------------------------------------------
+// TODO - does not appear to get used
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::dataContainerSelected(QString path)
+//{
+//  setSelectedPath(std::move(path));
+
+//  m_DidCausePreflight = true;
+//  emit parametersChanged();
+//  m_DidCausePreflight = false;
+//}
+
+// -----------------------------------------------------------------------------
+// Unlikely this has any use for top level data container list
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
+//{
+//  AbstractFilter* filter = getFilter();
+//  if(nullptr == filter)
+//  {
+//    return;
+//  }
+
+//  bool reloadPath = false;
+//  DataArrayPath dcPath;
+//  if(!paths.empty())
+//  {
+//    dcPath = DataArrayPath(paths[0].getDataContainerName(), "", "");
+//  }
+
+//  for(int i = 0; i < paths.size(); i++)
+//  {
+//    bool valid = true;
+
+//    if(nullptr == filter->getDataContainerArray()->getAttributeMatrix(paths[i])->getAttributeArray(paths[i].getDataArrayName()))
+//    {
+//      valid = false;
+//    }
+
+//    if(!paths[i].isValid())
+//    {
+//      valid = false;
+//    }
+
+//    if(!valid)
+//    {
+//      const QString& pathName = paths[i].getDataArrayName();
+//      QList<QListWidgetItem*> invalidDataArrayWidgets = dataContainersOrderWidget->findItems(pathName, Qt::MatchExactly);
+//      for(const auto& invalidDataArrayWidget : invalidDataArrayWidgets)
+//      {
+//        invalidDataArrayWidget->setCheckState(Qt::Unchecked);
+//        dataContainersOrderWidget->removeItemWidget(invalidDataArrayWidgets);
+//      }
+
+//      paths.removeAt(i);
+//      i--;
+
+//      reloadPath = true;
+//    }
+//  }
+
+//  if(reloadPath && !dcPath.isEmpty())
+//  {
+//    dataContainersSelectWidget->clear(); // ???
+//    dataContainersOrderWidget->clear(); // ???
+//  }
+//}
+
+*/
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 6393c39f1d..b166b66d61 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -1,39 +1,38 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
-
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
@@ -41,14 +40,12 @@
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/SIMPLib.h"
 
-
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
-
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
@@ -58,93 +55,48 @@ class MultiDataContainerSelectionFilterParameter;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
-
-    ~MultiDataContainerSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief checkStringValues
-    * @param current
-    * @param filt
-    * @return
-    */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void on_upBtn_clicked();
-    void on_downBtn_clicked();
-    void on_selectBtn_clicked();
-    void on_deselectBtn_clicked();
-    void on_removeBtn_clicked();
-
-    void on_availableDataContainersListWidget_itemSelectionChanged();
-    void on_selectedDataContainersListWidget_itemSelectionChanged();
-
-    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
-
-  private:
-    bool m_DidCausePreflight;
-
-    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
-
-    void selectionChanged();
-
-    /**
-     * @brief clearNonexistantDataContainers
-     */
-    void clearNonexistantDataContainers();
-
-  public:
-    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~MultiDataContainerSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  const QString m_gridAMName{"Grid"};
+  MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+  static void syncItems(QListWidget*, const QStringList&, QStringList&);
+  static void validateDataContainerNames(const SVListWidget*, const QList<QString>&);
+
+public:
+  MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index d2c3783761..cd19f35d99 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -6,391 +6,147 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>583</width>
-    <height>247</height>
+    <width>596</width>
+    <height>282</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>2</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="rightMargin">
     <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
-   <property name="spacing">
-    <number>4</number>
+   <property name="horizontalSpacing">
+    <number>8</number>
    </property>
-   <item row="1" column="3">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="SVIconPushButton" name="upBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="downBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="removeBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <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>
-   </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="label_2">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Selected Data Containers</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label_3">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Available Data Containers</string>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
+   <item row="2" column="7">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="rightMargin">
       <number>0</number>
      </property>
      <item>
-      <spacer name="verticalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Available Data Containers</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="SVListWidget" name="dataContainersSelectWidget">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QAbstractScrollArea::AdjustIgnored</enum>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragDrop</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::MoveAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="SVIconPushButton" name="selectBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="deselectBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Selected Data Containers</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="SVListWidget" name="dataContainersOrderWidget">
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragDrop</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::MoveAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+         <property name="sortingEnabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="SVListWidget" name="availableDataContainersListWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>1</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustIgnored</enum>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::NoDragDrop</enum>
-     </property>
-     <property name="defaultDropAction">
-      <enum>Qt::CopyAction</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="viewMode">
-      <enum>QListView::ListMode</enum>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="SVListWidget" name="selectedDataContainersListWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>1</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::NoDragDrop</enum>
-     </property>
-     <property name="defaultDropAction">
-      <enum>Qt::CopyAction</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="viewMode">
-      <enum>QListView::ListMode</enum>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>true</bool>
-     </property>
-     <property name="sortingEnabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>SVIconPushButton</class>
-   <extends>QPushButton</extends>
-   <header location="global">SVControlWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>SVListWidget</class>
    <extends>QListWidget</extends>
    <header location="global">SVControlWidgets.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../../../../Resources/SIMPL.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

From f5788cb9b161b34067d41f2558c091cfbdbc00f8 Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Thu, 14 Feb 2019 11:35:00 -0500
Subject: [PATCH 018/397] Clang-format for tplatt/SIMPL/#1

Signed-off-by: Nathan Blair <nathan.blair@bluequartz.net>
---
 .../MultiDataContainerSelectionWidget.cpp     | 118 ++----------------
 .../MultiDataContainerSelectionWidget.h       |   1 -
 2 files changed, 7 insertions(+), 112 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 2afa4bbd33..5bd63a2c56 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -139,12 +139,12 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QStringList selectedDCs;
+  QStringList selectedDCs{nullptr};
   for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
   {
     selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
   }
-  QVariant var;
+  QVariant var{0};
   var.setValue(selectedDCs);
   if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
   {
@@ -166,11 +166,11 @@ void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& p
     if(oldPath.getDataContainerName() != newPath.getDataContainerName())
     {
       blockSignals(true);
-      for (const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      for(const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
         eachOrderDC->setText(newPath.getDataContainerName());
       }
-      for (const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      for(const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
         eachOrderDC->setText(newPath.getDataContainerName());
       }
@@ -189,9 +189,8 @@ void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const
 {
   for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
   {
-    QString itemText{eachItem->text()};
-    bool listContainsItemText{list.contains(itemText)};
-    if (listContainsItemText)
+    QString itemText = eachItem->text();
+    if(list.contains(itemText))
     {
       newItems.removeOne(itemText);
       continue;
@@ -208,8 +207,7 @@ void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListW
   for(int i = 0; i < list->count(); i++)
   {
     QListWidgetItem* item = list->item(i);
-    QString name = item->text();
-    if(!compareList.contains(name))
+    if(!compareList.contains(item->text()))
     {
       item->setBackgroundColor(QColor(235, 110, 110));
     }
@@ -219,105 +217,3 @@ void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListW
     }
   }
 }
-
-/* Unused
-// -----------------------------------------------------------------------------
-// This doesn't appear to get used - disabling and will remove if nothing adverse happens at runtime
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
-//{
-//  setFilter(filter);
-//  setFilterParameter(parameter);
-//  setupGui();
-//}
-
-// -----------------------------------------------------------------------------
-// ???
-// -----------------------------------------------------------------------------
-//QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
-//{
-//  if(curDcName.isEmpty() && !filtDcName.isEmpty())
-//  {
-//    return filtDcName;
-//  }
-//  if(!curDcName.isEmpty() && filtDcName.isEmpty())
-//  {
-//    return curDcName;
-//  }
-//  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
-//  {
-//    return curDcName;
-//  }
-
-//  return filtDcName;
-//}
-
-// -----------------------------------------------------------------------------
-// TODO - does not appear to get used
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::dataContainerSelected(QString path)
-//{
-//  setSelectedPath(std::move(path));
-
-//  m_DidCausePreflight = true;
-//  emit parametersChanged();
-//  m_DidCausePreflight = false;
-//}
-
-// -----------------------------------------------------------------------------
-// Unlikely this has any use for top level data container list
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
-//{
-//  AbstractFilter* filter = getFilter();
-//  if(nullptr == filter)
-//  {
-//    return;
-//  }
-
-//  bool reloadPath = false;
-//  DataArrayPath dcPath;
-//  if(!paths.empty())
-//  {
-//    dcPath = DataArrayPath(paths[0].getDataContainerName(), "", "");
-//  }
-
-//  for(int i = 0; i < paths.size(); i++)
-//  {
-//    bool valid = true;
-
-//    if(nullptr == filter->getDataContainerArray()->getAttributeMatrix(paths[i])->getAttributeArray(paths[i].getDataArrayName()))
-//    {
-//      valid = false;
-//    }
-
-//    if(!paths[i].isValid())
-//    {
-//      valid = false;
-//    }
-
-//    if(!valid)
-//    {
-//      const QString& pathName = paths[i].getDataArrayName();
-//      QList<QListWidgetItem*> invalidDataArrayWidgets = dataContainersOrderWidget->findItems(pathName, Qt::MatchExactly);
-//      for(const auto& invalidDataArrayWidget : invalidDataArrayWidgets)
-//      {
-//        invalidDataArrayWidget->setCheckState(Qt::Unchecked);
-//        dataContainersOrderWidget->removeItemWidget(invalidDataArrayWidgets);
-//      }
-
-//      paths.removeAt(i);
-//      i--;
-
-//      reloadPath = true;
-//    }
-//  }
-
-//  if(reloadPath && !dcPath.isEmpty())
-//  {
-//    dataContainersSelectWidget->clear(); // ???
-//    dataContainersOrderWidget->clear(); // ???
-//  }
-//}
-
-*/
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index b166b66d61..0ed51088b5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -88,7 +88,6 @@ protected slots:
   void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
-  const QString m_gridAMName{"Grid"};
   MultiDataContainerSelectionFilterParameter* m_FilterParameter;
 
   static void syncItems(QListWidget*, const QStringList&, QStringList&);

From 7b7da740c217f1b31e9e1b1c5487154a377aeb92 Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Thu, 14 Feb 2019 13:09:30 -0500
Subject: [PATCH 019/397] Fixed wrong initial list population on setupGui

---
 .../MultiDataContainerSelectionWidget.cpp                    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 5bd63a2c56..321229ab8e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -86,10 +86,7 @@ void MultiDataContainerSelectionWidget::setupGui()
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  for(const auto& eachDC : getFilterParameter()->getDefaultValue().toStringList())
-  {
-    dataContainersOrderWidget->addItem(eachDC);
-  }
+  dataContainersSelectWidget->addItems(getFilterParameter()->getDefaultValue().toStringList());
 }
 
 // -----------------------------------------------------------------------------

From dcc2e637f7245546415107b6dbd3851fac5398fd Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 15 Feb 2019 12:38:46 -0500
Subject: [PATCH 020/397] Revert "WIP Merge in @nathanblair work on
 MultiDataContainerFP" (#2)

---
 ...iDataContainerSelectionFilterParameter.cpp |  26 +-
 ...ltiDataContainerSelectionFilterParameter.h |  12 +-
 .../MultiDataContainerSelectionWidget.cpp     | 490 ++++++++++++++----
 .../MultiDataContainerSelectionWidget.h       | 205 +++++---
 .../MultiDataContainerSelectionWidget.ui      | 462 +++++++++++++----
 5 files changed, 886 insertions(+), 309 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index e1dce99f01..08cfb2a218 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -60,6 +60,7 @@ MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionF
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                                                                                           const RequirementType req, int groupIndex)
 {
+
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
@@ -93,7 +94,7 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
 	AttributeMatrix::Category attributeMatrixCategory)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+	typedef QVector<size_t> QVectorOfSizeType;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	AttributeMatrix::Types amTypes;
 	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -139,7 +140,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
 	IGeometry::Type geometryType)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+	typedef QVector<size_t> QVectorOfSizeType;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
 	{
@@ -171,11 +172,12 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   {
     QJsonArray arrayObj = jsonValue.toArray();
     QStringList dcList;
-    for (const auto &eachDCObj : arrayObj)
+    for(int i = 0; i < arrayObj.size(); i++)
     {
-      QJsonObject obj = eachDCObj.toObject();
-      dcList.push_back(obj["Data Container Name"].toString());
+      QString dcName = arrayObj.at(i).toString();
+      dcList.push_back(dcName);
     }
+
     m_SetterCallback(dcList);
   }
 }
@@ -190,11 +192,10 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
     QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for (const auto &eachDCName : dcList)
+    for(int i = 0; i < dcList.size(); i++)
     {
-      QJsonObject obj;
-      obj["Data Container Name"] = eachDCName;
-      arrayObj.push_back(obj);
+      QString dcName = dcList[i];
+      arrayObj.push_back(dcName);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -211,13 +212,14 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   std::tie(oldPath, newPath) = renamePath;
 
   QStringList dcList = m_GetterCallback();
+  int count = dcList.size();
   bool updated = false;
 
-  for (auto &eachDCName : dcList)
+  for(int i = 0; i < count; i++)
   {
-    if (eachDCName == oldPath.getDataContainerName())
+    if(dcList[i] == oldPath.getDataContainerName())
     {
-      eachDCName = newPath.getDataContainerName();
+      dcList[i] = newPath.getDataContainerName();
       updated = true;
     }
   }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 95460f4b9a..4233aa31df 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -1,4 +1,3 @@
-#pragma once
 /* ============================================================================
 * Copyright (c) 2009-2016 BlueQuartz Software, LLC
 *
@@ -34,9 +33,13 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#pragma once
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
@@ -91,9 +94,9 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @param category The category for the filter parameter in the DREAM.3D user interface.  There
      * are three categories: Parameter, Required Arrays, and Created Arrays.
      * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-     * that this FilterParameter subclass represents.
+    * that this FilterParameter subclass represents.
      * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-     * that this FilterParameter subclass represents.
+    * that this FilterParameter subclass represents.
      * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
      * user interface.
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
@@ -154,7 +157,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QVector<size_t>>, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -190,3 +193,4 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 321229ab8e..fd4cd98b10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -1,45 +1,43 @@
-#include <utility>
-
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QMetaProperty>
-#include <QtCore/QModelIndex>
 #include <QtCore/QSignalMapper>
+#include <QtCore/QModelIndex>
 
 #include <QtGui/QStandardItemModel>
 
@@ -57,160 +55,440 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerFilterParameter object");
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
 
   setupUi(this);
   setupGui();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_DidCausePreflight(false)
+{
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::setupGui()
 {
   // Sanity Check the filter and the filter parameter
-  if(getFilter() == nullptr) // Trivial
+  if(getFilter() == nullptr)
   {
     return;
   }
-  if(getFilterParameter() == nullptr) // Trivial
+  if(getFilterParameter() == nullptr)
   {
     return;
   }
 
+  selectedDataContainersListWidget->installEventFilter(this);
+  availableDataContainersListWidget->installEventFilter(this);
+
+  // Generate the text for the QLabel
+  //label->setText(getFilterParameter()->getHumanLabel());
+
+  // Lastly, hook up the filter's signals and slots to our own signals and slots
+  // Catch when the filter is about to execute the preflight
   connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
   connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  dataContainersSelectWidget->addItems(getFilterParameter()->getDefaultValue().toStringList());
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
+    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+
+  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
+  for (int i=0; i<dcNames.size(); i++)
+  {
+    QString dcName = dcNames[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
+    selectedDataContainersListWidget->addItem(item);
+  }
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
 }
 
 // -----------------------------------------------------------------------------
-// Slot callbacks
+//
 // -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
 // -----------------------------------------------------------------------------
-// Validate containers in each list are in the filter data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::beforePreflight()
+bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 {
-  if(nullptr == getFilter())
+  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
   {
-    return;
+    on_selectedDataContainersListWidget_itemSelectionChanged();
   }
-
-  if(nullptr == getFilter()->getDataContainerArray().get())
+  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
   {
-    return;
+    on_availableDataContainersListWidget_itemSelectionChanged();
   }
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_selectBtn_clicked();
+}
 
-  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
-  for(const auto& eachDC : getFilter()->getDataContainerArray()->getDataContainerNames())
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_deselectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
+{
+  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
   {
-    dcNames.push_back(eachDC);
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
+      offset++;
+      if(item != nullptr)
+      {
+        selectedDataContainersListWidget->addItem(item);
+      }
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
+}
 
-  validateDataContainerNames(dataContainersSelectWidget, dcNames);
-  validateDataContainerNames(dataContainersOrderWidget, dcNames);
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
+{
+  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
+  foreach(QListWidgetItem* item, items)
+  {
+    int row = selectedDataContainersListWidget->row(item);
+    selectedDataContainersListWidget->takeItem(row);
+    availableDataContainersListWidget->addItem(item);
+  }
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
 }
 
 // -----------------------------------------------------------------------------
-// Populate and syncronize the lists
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::afterPreflight()
+void MultiDataContainerSelectionWidget::on_upBtn_clicked()
 {
-  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
-  QStringList newItems{dcNames};
+  int currentIndex = selectedDataContainersListWidget->currentRow();
 
-  syncItems(dataContainersSelectWidget, dcNames, newItems);
-  syncItems(dataContainersOrderWidget, dcNames, newItems);
+  if(currentIndex > 0)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
 
-  dataContainersSelectWidget->addItems(newItems);
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
 }
 
 // -----------------------------------------------------------------------------
-// Set the filter's active data containers or notify that parameter is missing
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+void MultiDataContainerSelectionWidget::on_downBtn_clicked()
 {
-  QStringList selectedDCs{nullptr};
-  for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex < selectedDataContainersListWidget->count() - 1)
   {
-    selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
-  QVariant var{0};
-  var.setValue(selectedDCs);
-  if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
+{
+  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
   {
-    getFilter()->notifyMissingProperty(getFilterParameter());
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
+      selectedDataContainersListWidget->removeItemWidget(item);
+      delete item;
+      offset++;
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
 }
 
 // -----------------------------------------------------------------------------
-// Update the name of a data container in the appropriate list widget
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
+void MultiDataContainerSelectionWidget::selectionChanged()
 {
-  DataArrayPath oldPath;
-  DataArrayPath newPath;
-  std::tie(oldPath, newPath) = renamePath;
+  upBtn->setDisabled(true);
+  downBtn->setDisabled(true);
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+
+  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
+  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
+
+  if (selectSize > 0)
+  {
+    selectBtn->setEnabled(true);
+  }
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if (orderSize > 0)
   {
-    if(oldPath.getDataContainerName() != newPath.getDataContainerName())
+    deselectBtn->setEnabled(true);
+
+    if (orderSize == 1)
     {
-      blockSignals(true);
-      for(const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
-      {
-        eachOrderDC->setText(newPath.getDataContainerName());
-      }
-      for(const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      upBtn->setEnabled(true);
+      downBtn->setEnabled(true);
+    }
+
+    bool allErrorRows = true;
+    for (int i=0; i<orderSize; i++)
+    {
+      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
+      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
       {
-        eachOrderDC->setText(newPath.getDataContainerName());
+        allErrorRows = false;
       }
-      blockSignals(false);
+    }
+
+    if(allErrorRows)
+    {
+      removeBtn->show();
     }
   }
 }
 
 // -----------------------------------------------------------------------------
-// Helper Methods
+//
 // -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
 // -----------------------------------------------------------------------------
-// Sync list widgets with updated data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const QStringList& list, QStringList& newItems)
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
 {
-  for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
-  {
-    QString itemText = eachItem->text();
-    if(list.contains(itemText))
-    {
-      newItems.removeOne(itemText);
-      continue;
-    }
-    delete listWidget->takeItem(listWidget->row(eachItem));
-  }
+  selectionChanged();
 }
 
 // -----------------------------------------------------------------------------
-// Validate ListWidget item exists in data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListWidget* list, const QList<QString>& compareList)
+void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
 {
-  for(int i = 0; i < list->count(); i++)
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
   {
-    QListWidgetItem* item = list->item(i);
-    if(!compareList.contains(item->text()))
+    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
     {
-      item->setBackgroundColor(QColor(235, 110, 110));
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
     }
-    else
+  }
+
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
     {
-      item->setBackgroundColor(QColor(255, 255, 255));
+      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+
+  clearNonexistantDataContainers();
+
+  // Previously in afterPreflight()
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  QList<QString> selectListNames;
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
+  }
+
+  QList<QString> orderListNames;
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
+	  QString name = item->text();
+	  orderListNames.append(name);
+	  if (!dcNames.contains(name))
+	  {
+		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+		  // item->setBackgroundColor(QColor(235, 110, 110));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
+	  }
+	  else
+	  {
+		  // item->setBackgroundColor(QColor(255, 255, 255));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
+	  }
+  }
+
+  for (int i = 0; i < dcNames.size(); i++)
+  {
+	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
+	  {
+		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
+		  availableDataContainersListWidget->addItem(item);
+	  }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::afterPreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  QStringList dcNames;
+	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+	{
+    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
+	}
+
+	// Generate the path to the AttributeArray
+	QVariant var;
+  var.setValue(dcNames);
+	bool ok = false;
+	// Set the value into the Filter
+	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
+	if (!ok)
+	{
+		getFilter()->notifyMissingProperty(getFilterParameter());
+	}
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 0ed51088b5..6393c39f1d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -1,38 +1,39 @@
-#pragma once
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
@@ -40,12 +41,14 @@
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
 
-#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+
 
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
@@ -55,47 +58,93 @@ class MultiDataContainerSelectionFilterParameter;
 class QSignalMapper;
 
 /**
- * @brief
- * @author
- * @version
- */
+* @brief
+* @author
+* @version
+*/
 class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
 {
-  Q_OBJECT
-
-public:
-  /**
-   * @brief Constructor
-   * @param parameter The FilterParameter object that this widget represents
-   * @param filter The instance of the filter that this parameter is a part of
-   * @param parent The parent QWidget for this Widget
-   */
-  MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-  ~MultiDataContainerSelectionWidget() override;
-
-  /**
-   * @brief This method does additional GUI widget connections
-   */
-  void setupGui() override;
-
-public slots:
-  void beforePreflight();
-  void afterPreflight();
-  void filterNeedsInputParameters(AbstractFilter* filter);
-
-protected slots:
-  void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
-
-private:
-  MultiDataContainerSelectionFilterParameter* m_FilterParameter;
-
-  static void syncItems(QListWidget*, const QStringList&, QStringList&);
-  static void validateDataContainerNames(const SVListWidget*, const QList<QString>&);
-
-public:
-  MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
-  MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
-  MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-  MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+    Q_OBJECT
+
+  public:
+    /**
+    * @brief Constructor
+    * @param parameter The FilterParameter object that this widget represents
+    * @param filter The instance of the filter that this parameter is a part of
+    * @param parent The parent QWidget for this Widget
+    */
+    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+    ~MultiDataContainerSelectionWidget() override;
+
+    /**
+    * @brief This method does additional GUI widget connections
+    */
+    void setupGui() override;
+
+    /**
+    * @brief checkStringValues
+    * @param current
+    * @param filt
+    * @return
+    */
+    QString checkStringValues(QString current, QString filtDcName);
+
+    /**
+    * @brief initializeWidget
+    * @param parameter
+    * @param filter
+    */
+    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+    /**
+     * @brief eventFilter
+     * @param obj
+     * @param event
+     * @return
+     */
+    bool eventFilter(QObject* obj, QEvent* event) override;
+
+  public slots:
+    void beforePreflight();
+    void afterPreflight();
+    void filterNeedsInputParameters(AbstractFilter* filter);
+
+  protected slots:
+    void on_upBtn_clicked();
+    void on_downBtn_clicked();
+    void on_selectBtn_clicked();
+    void on_deselectBtn_clicked();
+    void on_removeBtn_clicked();
+
+    void on_availableDataContainersListWidget_itemSelectionChanged();
+    void on_selectedDataContainersListWidget_itemSelectionChanged();
+
+    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+
+  private:
+    bool m_DidCausePreflight;
+
+    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+    void selectionChanged();
+
+    /**
+     * @brief clearNonexistantDataContainers
+     */
+    void clearNonexistantDataContainers();
+
+  public:
+    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
+
+
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index cd19f35d99..d2c3783761 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -6,147 +6,391 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>596</width>
-    <height>282</height>
+    <width>583</width>
+    <height>247</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
    <property name="leftMargin">
     <number>2</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="rightMargin">
     <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>8</number>
-   </property>
-   <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <item row="2" column="7">
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
-     <property name="topMargin">
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="3">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="rightMargin">
       <number>0</number>
      </property>
+     <item>
+      <widget class="SVIconPushButton" name="upBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="downBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="removeBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <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>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Selected Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Available Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="rightMargin">
       <number>0</number>
      </property>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Available Data Containers</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="SVListWidget" name="dataContainersSelectWidget">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="sizeAdjustPolicy">
-          <enum>QAbstractScrollArea::AdjustIgnored</enum>
-         </property>
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragDrop</enum>
-         </property>
-         <property name="defaultDropAction">
-          <enum>Qt::MoveAction</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <spacer name="verticalSpacer_3">
+       <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="QVBoxLayout" name="verticalLayout">
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Selected Data Containers</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="SVListWidget" name="dataContainersOrderWidget">
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragDrop</enum>
-         </property>
-         <property name="defaultDropAction">
-          <enum>Qt::MoveAction</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="sortingEnabled">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="SVIconPushButton" name="selectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="deselectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</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">
+    <widget class="SVListWidget" name="availableDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="SVListWidget" name="selectedDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
   <customwidget>
    <class>SVListWidget</class>
    <extends>QListWidget</extends>
    <header location="global">SVControlWidgets.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
  <connections/>
 </ui>

From dfaa1a75c62d4476276168a6060242615cbcd419 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 20 Nov 2018 14:20:43 -0500
Subject: [PATCH 021/397] Fixing ITK classes to work with ITK 5.0

---
 Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h | 2 +-
 Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h  | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 17ee9980e6..558b9dca2f 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -66,7 +66,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   Dream3DITransformContainerToTransform();
   ~Dream3DITransformContainerToTransform() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 2dd8ad1a42..6a1d1ea6fe 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -62,7 +62,7 @@ template <typename ITKTransformType> class Dream3DTransformContainerToTransform
   Dream3DTransformContainerToTransform();
   ~Dream3DTransformContainerToTransform() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ::TransformContainer::Pointer m_TransformContainer;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index 0eca16afac..332ce11b21 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -62,7 +62,7 @@ template <typename TParametersValueType, unsigned int CompositeNDimensions> clas
   TransformToDream3DITransformContainer();
   ~TransformToDream3DITransformContainer() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
index d453c26c14..5ec75b8935 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
@@ -61,7 +61,7 @@ template <typename ITKTransformType> class TransformToDream3DTransformContainer
   TransformToDream3DTransformContainer();
   ~TransformToDream3DTransformContainer() override;
 
-  void VerifyPreconditions() override;
+  void VerifyPreconditions();
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;

From 2ac8e178b55c0793884aa18d9c1876e85c2351c2 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 4 Dec 2018 17:10:36 -0500
Subject: [PATCH 022/397] Moving a few functions out of FilterParameterWidget
 and into QtSFileUtils, so that we can use those functions in our standalone
 TileListWidget.

---
 .../AbstractIOFileWidget.cpp                  |  2 +-
 .../AbstractIOFileWidget.h                    |  1 -
 .../FileListInfoWidget.cpp                    |  4 +-
 .../FileListInfoWidget.h                      |  1 -
 .../FilterParameterWidget.cpp                 | 99 -------------------
 .../FilterParameterWidget.h                   | 16 ---
 .../ImportHDF5DatasetWidget.cpp               | 36 +++++++
 .../ImportHDF5DatasetWidget.h                 |  8 --
 .../SVWidgetsLib/QtSupport/QtSFileUtils.cpp   | 98 ++++++++++++++++++
 Source/SVWidgetsLib/QtSupport/QtSFileUtils.h  | 17 ++++
 10 files changed, 154 insertions(+), 128 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 86736d0179..74cb53e11c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -270,7 +270,7 @@ void AbstractIOFileWidget::on_m_LineEdit_textChanged(const QString& text)
     absPathLabel->setText(inputPath);
   }
 
-  if(hasValidFilePath(inputPath))
+  if(QtSFileUtils::HasValidFilePath(inputPath))
   {
     m_ShowFileAction->setEnabled(true);
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index 490573d54c..5cfdb66b52 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -118,7 +118,6 @@ class SVWidgetsLib_EXPORT AbstractIOFileWidget : public FilterParameterWidget, p
 
   private:
     QAction* m_ShowFileAction = nullptr;
-    QString  m_CurrentlyValidPath = "";
     QString  m_CurrentText = "";
     QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 69eab1bd37..a62046abbf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -327,7 +327,7 @@ void FileListInfoWidget::checkIOFiles()
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString inputPath = validator->convertToAbsolutePath(m_Ui->inputDir->text());
 
-  if(this->verifyPathExists(inputPath, m_Ui->inputDir))
+  if(QtSFileUtils::VerifyPathExists(inputPath, m_Ui->inputDir))
   {
     findMaxSliceAndPrefix();
   }
@@ -373,7 +373,7 @@ void FileListInfoWidget::inputDir_textChanged(const QString& text)
 
   m_Ui->inputDir->setToolTip("Absolute File Path: " + inputPath);
 
-  if(verifyPathExists(inputPath, m_Ui->inputDir))
+  if(QtSFileUtils::VerifyPathExists(inputPath, m_Ui->inputDir))
   {
     m_ShowFileAction->setEnabled(true);
     findMaxSliceAndPrefix();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 9a579f3a14..1127e75132 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -164,7 +164,6 @@ protected slots:
   static QString m_OpenDialogLastFilePath;
 
   QAction* m_ShowFileAction = nullptr;
-  QString m_CurrentlyValidPath = "";
   QString m_CurrentText = "";
   bool m_DidCausePreflight = false;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 3049c3ae35..f4735ac2ca 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -422,105 +422,6 @@ void FilterParameterWidget::hideBorder()
   setStyleSheet("");
 }
 
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool FilterParameterWidget::verifyPathExists(QString filePath, QLineEdit* lineEdit)
-{
-  hasValidFilePath(filePath);
-  QFileInfo fileinfo(filePath);
-  if(!fileinfo.exists())
-  {
-    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
-  }
-  else
-  {
-    SVStyle::Instance()->LineEditClearStyle(lineEdit);
-  }
-  return fileinfo.exists();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool FilterParameterWidget::hasValidFilePath(const QString &filePath)
-{
-  QStringList pathParts = filePath.split(QDir::separator());
-  if(pathParts.empty())
-  {
-    return false;
-  }
-
-  QString pathBuildUp;
-  QFileInfo fi(filePath);
-
-  /* This block of code figures out, based on the current OS, how the built-up path should begin.
-   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
-   * For Windows, it should start with a path part for both absolute and relative paths.
-   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
-  {
-#if defined(Q_OS_WIN)
-  /* If there is at least one part, then add it to the pathBuildUp variable.
-    A valid Windows path, absolute or relative, has to have at least one part. */
-  if (pathParts[0].isEmpty() == false)
-  {
-    pathBuildUp.append(pathParts[0]);
-  }
-  else
-  {
-    return false;
-  }
-#else
-  /* If the first part is empty and the filePath is absolute, then that means that
-   * we are starting with the root directory and need to add it to our pathBuildUp */
-  if (pathParts[0].isEmpty() && fi.isAbsolute())
-  {
-    pathBuildUp.append(QDir::separator());
-  }
-  /* If the first part is empty and the filePath is relative, then that means that
-   * we are starting with the first folder part and need to add that to our pathBuildUp */
-  else if(!pathParts[0].isEmpty() && fi.isRelative())
-  {
-    pathBuildUp.append(pathParts[0] + QDir::separator());
-  }
-  else
-  {
-    return false;
-  }
-#endif
-  }
-
-  /* Now that we have started our built-up path, continue adding to the built-up path
-   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
-  bool valid = false;
-
-  QFileInfo buildingFi(pathBuildUp);
-  size_t pathPartsIdx = 1; // We already processed the first path part above
-  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
-  {
-    valid = true;
-    m_CurrentlyValidPath = pathBuildUp; // Save the most current, valid built-up path
-
-    // If there's another path part to add, add it to the end of the built-up path
-    if (pathPartsIdx < pathParts.size())
-    {
-      /* If the built-up path doesn't already have a separator on the end, add one. */
-      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
-      {
-        pathBuildUp.append(QDir::separator());
-      }
-
-      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
-      buildingFi.setFile(pathBuildUp);
-    }
-    pathPartsIdx++;
-  }
-
-  return valid;
-}
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 0d68afa0e4..7bbfcf3cdc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -149,22 +149,6 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
      */
     QPoint adjustedMenuPosition(QToolButton *pushButton);
 
-    /**
-     * @brief hasValidFilePath
-     * @param filePath
-     * @return
-     */
-    bool hasValidFilePath(const QString &filePath);
-
-    /**
-     * @brief verifyPathExists
-     * @param filePath
-     * @param lineEdit
-     * @return
-     */
-    bool verifyPathExists(QString filePath, QLineEdit* lineEdit);
-
-
   protected slots:
     void showBorder();
     void hideBorder();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 9db2cc2ce8..21ed529cdf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -396,6 +396,7 @@ void ImportHDF5DatasetWidget::initializeHDF5Paths()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
+<<<<<<< HEAD
 bool ImportHDF5DatasetWidget::verifyPathExists(const QString& filePath, QtSLineEdit* lineEdit)
 {
   QFileInfo fileinfo(filePath);
@@ -409,6 +410,20 @@ bool ImportHDF5DatasetWidget::verifyPathExists(const QString& filePath, QtSLineE
     style->LineEditClearStyle(lineEdit);
   }
   return fileinfo.exists();
+=======
+void ImportHDF5DatasetWidget::on_value_fileDropped(const QString& text)
+{
+  m_OpenDialogLastDirectory = text;
+
+  // Set/Remove the red outline if the file does exist
+  if(QtSFileUtils::VerifyPathExists(text, dynamic_cast<QLineEdit*>(value)))
+  {
+    if(initWithFile(text))
+    {
+      emit parametersChanged();
+    }
+  }
+>>>>>>> Moving a few functions out of FilterParameterWidget and into QtSFileUtils, so that we can use those functions in our standalone TileListWidget.
 }
 
 // -----------------------------------------------------------------------------
@@ -426,7 +441,28 @@ void ImportHDF5DatasetWidget::on_selectBtn_clicked()
 
   file = QDir::toNativeSeparators(file);
 
+<<<<<<< HEAD
   setValue(file);
+=======
+  if(initWithFile(file))
+  {
+    value->setText(file);
+    emit parametersChanged();
+  }
+
+  // Store the last used directory into the private instance variable
+  QFileInfo fi(file);
+  m_OpenDialogLastDirectory = fi.path();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImportHDF5DatasetWidget::on_showLocationBtn_clicked()
+{
+  QtSFileUtils::HasValidFilePath(value->text());
+  showFileInFileSystem();
+>>>>>>> Moving a few functions out of FilterParameterWidget and into QtSFileUtils, so that we can use those functions in our standalone TileListWidget.
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index 7537c770ab..725dae7552 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -74,14 +74,6 @@ class SVWidgetsLib_EXPORT ImportHDF5DatasetWidget : public FilterParameterWidget
   void setIcon(const QPixmap& path);
   QPixmap getIcon();
 
-  /**
-   * @brief verifyPathExists
-   * @param filePath
-   * @param lineEdit
-   * @return
-   */
-  bool verifyPathExists(const QString& filePath, QtSLineEdit* lineEdit);
-
 public slots:
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index c8363650bc..d350877f06 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -36,8 +36,10 @@
 #include <QtCore/QProcess>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QApplication>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QDesktopServices>
 
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -179,3 +181,99 @@ void QtSFileUtils::ShowPathInGui(QWidget* parent, const QString &pathIn)
   }
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool QtSFileUtils::VerifyPathExists(QString filePath, QLineEdit* lineEdit)
+{
+  HasValidFilePath(filePath);
+  QFileInfo fileinfo(filePath);
+  if(!fileinfo.exists())
+  {
+    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
+  }
+  else
+  {
+    SVStyle::Instance()->LineEditClearStyle(lineEdit);
+  }
+  return fileinfo.exists();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool QtSFileUtils::HasValidFilePath(const QString &filePath)
+{
+  QStringList pathParts = filePath.split(QDir::separator());
+  if(pathParts.empty())
+  {
+    return false;
+  }
+
+  QString pathBuildUp;
+  QFileInfo fi(filePath);
+
+  /* This block of code figures out, based on the current OS, how the built-up path should begin.
+   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
+   * For Windows, it should start with a path part for both absolute and relative paths.
+   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
+  {
+#if defined(Q_OS_WIN)
+  /* If there is at least one part, then add it to the pathBuildUp variable.
+    A valid Windows path, absolute or relative, has to have at least one part. */
+  if (pathParts[0].isEmpty() == false)
+  {
+    pathBuildUp.append(pathParts[0]);
+  }
+  else
+  {
+    return false;
+  }
+#else
+  /* If the first part is empty and the filePath is absolute, then that means that
+   * we are starting with the root directory and need to add it to our pathBuildUp */
+  if (pathParts[0].isEmpty() && fi.isAbsolute())
+  {
+    pathBuildUp.append(QDir::separator());
+  }
+  /* If the first part is empty and the filePath is relative, then that means that
+   * we are starting with the first folder part and need to add that to our pathBuildUp */
+  else if(!pathParts[0].isEmpty() && fi.isRelative())
+  {
+    pathBuildUp.append(pathParts[0] + QDir::separator());
+  }
+  else
+  {
+    return false;
+  }
+#endif
+  }
+
+  /* Now that we have started our built-up path, continue adding to the built-up path
+   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
+  bool valid = false;
+
+  QFileInfo buildingFi(pathBuildUp);
+  size_t pathPartsIdx = 1; // We already processed the first path part above
+  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
+  {
+    valid = true;
+
+    // If there's another path part to add, add it to the end of the built-up path
+    if (pathPartsIdx < pathParts.size())
+    {
+      /* If the built-up path doesn't already have a separator on the end, add one. */
+      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
+      {
+        pathBuildUp.append(QDir::separator());
+      }
+
+      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
+      buildingFi.setFile(pathBuildUp);
+    }
+    pathPartsIdx++;
+  }
+
+  return valid;
+}
+
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
index 75a2c05e08..344649750c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.h
@@ -36,6 +36,8 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
+class QLineEdit;
+
 /**
  * @brief The QtSFileUtils class
  */
@@ -58,6 +60,21 @@ class SVWidgetsLib_EXPORT QtSFileUtils
      */
     static void ShowPathInGui(QWidget* parent, const QString &path);
 
+    /**
+     * @brief verifyPathExists
+     * @param filePath
+     * @param lineEdit
+     * @return
+     */
+    static bool VerifyPathExists(QString filePath, QLineEdit* lineEdit);
+
+    /**
+     * @brief hasValidFilePath
+     * @param filePath
+     * @return
+     */
+    static bool HasValidFilePath(const QString &filePath);
+
     /**
      * @brief GetPathSeperator
      * @return Returns the separator character used in the PATH environment variable

From 714c478d7360ba71e9db7f7c2ebbf7051086aa17 Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt@mmmccormick.com>
Date: Thu, 6 Dec 2018 14:55:52 -0500
Subject: [PATCH 023/397] Address VerifyPreconditions const change in ITK 5
 master (#272)

This requires ITK 5 Beta 2 or ITK 4.13.2, both are currently to-be-released.
---
 .../itkDream3DITransformContainerToTransform.h   |  2 +-
 .../itkDream3DITransformContainerToTransform.hxx |  2 +-
 .../itkDream3DTransformContainerToTransform.h    |  3 ++-
 .../itkDream3DTransformContainerToTransform.hxx  | 16 +++++++++++++---
 .../ITK/itkInPlaceDream3DDataToImageFilter.h     |  2 +-
 .../ITK/itkInPlaceDream3DDataToImageFilter.hxx   |  2 +-
 .../ITK/itkInPlaceImageToDream3DDataFilter.h     |  5 +++--
 .../ITK/itkInPlaceImageToDream3DDataFilter.hxx   | 14 +++++++++++---
 8 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 558b9dca2f..f6d7bc01da 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -66,7 +66,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   Dream3DITransformContainerToTransform();
   ~Dream3DITransformContainerToTransform() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
index 03eac2875e..191ddb8a4a 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
@@ -87,7 +87,7 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
 void
 Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_ITransformContainer)
   {
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 6a1d1ea6fe..5d21b636cd 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -57,12 +57,13 @@ template <typename ITKTransformType> class Dream3DTransformContainerToTransform
   using Superclass::SetInput;
   virtual void SetInput(::TransformContainer::Pointer transformContainer);
   DecoratorType* GetOutput();
+  const DecoratorType* GetOutput() const;
 
 protected:
   Dream3DTransformContainerToTransform();
   ~Dream3DTransformContainerToTransform() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST override;
 
   void GenerateData() override;
   ::TransformContainer::Pointer m_TransformContainer;
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
index 95cf96a373..67660726ef 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
@@ -83,14 +83,14 @@ Dream3DTransformContainerToTransform<ITKTransformType>
 template <typename ITKTransformType>
 void
 Dream3DTransformContainerToTransform<ITKTransformType>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_TransformContainer)
   {
     itkExceptionMacro("Input transform container is empty");
   }
-  DecoratorType* outputPtr = this->GetOutput();
-  typename ITKTransformType::Pointer transform = outputPtr->Get();
+  const DecoratorType* outputPtr = this->GetOutput();
+  typename ITKTransformType::ConstPointer transform = outputPtr->Get();
   // Verifies that the number of Parameters and Fixed Parameters in the transform
   // match the expected number based on the transform type.
   if(transform->GetNumberOfParameters() != m_TransformContainer->getParameters().size())
@@ -144,4 +144,14 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
+
+template <typename ITKTransformType>
+const typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType*
+Dream3DTransformContainerToTransform<ITKTransformType>
+::GetOutput() const
+{
+  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
+}
+
+
 } // end of itk namespace
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 98d0acf1e9..b9a2b7aac8 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -49,7 +49,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<Pix
   InPlaceDream3DDataToImageFilter();
   virtual ~InPlaceDream3DDataToImageFilter();
 
-  virtual void VerifyPreconditions() override;
+  virtual void VerifyPreconditions() ITKv5_CONST override;
 
   virtual void GenerateOutputInformation() override;
   virtual void GenerateData() override;
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 8471df7942..7d87debb31 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -37,7 +37,7 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
 template< typename PixelType, unsigned int VDimension>
 void
 InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if (m_DataContainer == DataContainer::NullPointer() )
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index ca63db8a67..134a26666a 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -36,6 +36,7 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
   virtual void SetInput(const ImageType* image);
 
   DecoratorType* GetOutput();
+  const DecoratorType* GetOutput() const;
 
   void SetDataContainer(DataContainer::Pointer dc);
 
@@ -54,13 +55,13 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
   InPlaceImageToDream3DDataFilter();
   virtual ~InPlaceImageToDream3DDataFilter();
 
-  virtual void VerifyPreconditions() override;
+  virtual void VerifyPreconditions() ITKv5_CONST override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
 
   virtual void GenerateData() override;
   virtual void GenerateOutputInformation() override;
 
-  void CheckValidArrayPathComponentName(std::string var);
+  void CheckValidArrayPathComponentName(std::string var) const;
 
 private:
   using Superclass::SetInput;
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index c48ae76c9c..dd28af3ff9 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -185,7 +185,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 template<typename PixelType, unsigned int VDimension>
 void
 InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::CheckValidArrayPathComponentName(std::string var)
+::CheckValidArrayPathComponentName(std::string var) const
 {
   if (var.find('/') != std::string::npos)
   {
@@ -202,7 +202,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 template<typename PixelType, unsigned int VDimension>
 void
 InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   //Test only works if image if of dimension 2 or 3
   if (VDimension != 2 && VDimension != 3)
@@ -212,7 +212,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  DecoratorType *outputPtr = this->GetOutput();
+  const DecoratorType *outputPtr = this->GetOutput();
   if (!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
@@ -232,5 +232,13 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
 }
 
+template<typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput() const
+{
+  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
+}
+
 } // end of itk namespace
 

From 3adfe8ba682bbbfcd4eb51d879e36f2e0fdaee27 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 2 Jan 2019 09:05:04 -0500
Subject: [PATCH 024/397] Adding a few new PIMPL macros.

---
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 96133a1ba3..aa1c07a05e 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -468,20 +468,31 @@ public:     \
 
 #define SIMPL_PIMPL_PROPERTY_DECL(type, prpty)\
   public:\
-  void set##prpty(const type& value);\
+  SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
+  SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
+
+#define SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
   type get##prpty() const;
 
+#define SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
+  void set##prpty(const type& value);\
 
 #define SIMPL_PIMPL_PROPERTY_DEF(Class, type, prpty)\
-  void Class::set##prpty(const type& value) {\
-    Q_D(Class);\
-    d->m_##prpty = value;\
-  }\
+  SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
+  SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
+
+#define SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
   type Class::get##prpty() const {\
     Q_D(const Class);\
     return d->m_##prpty;\
   }
 
+#define SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
+  void Class::set##prpty(const type& value) {\
+    Q_D(Class);\
+    d->m_##prpty = value;\
+  }\
+
 
 #define SIMPL_OVERLOAD_PROPERTY(type, prpty, overload)\
   private:\

From 9a59c3f3a77fb52eba283b365b0b9a5cac9ca30a Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Wed, 2 Jan 2019 11:59:59 -0500
Subject: [PATCH 025/397] Adding MultiDataContainerSelectionFilterParameter and
 associated widget for selecting a list of data containers

---
 ...iDataContainerSelectionFilterParameter.cpp | 233 +++++++++
 ...ltiDataContainerSelectionFilterParameter.h | 196 ++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 .../MultiDataContainerSelectionWidget.cpp     | 467 ++++++++++++++++++
 .../MultiDataContainerSelectionWidget.h       | 147 ++++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../MultiDataContainerSelectionWidget.ui      | 396 +++++++++++++++
 7 files changed, 1442 insertions(+)
 create mode 100644 Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
new file mode 100644
index 0000000000..ea729401be
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -0,0 +1,233 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MultiDataContainerSelectionFilterParameter.h"
+
+#include <QtCore/QJsonArray>
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::MultiDataContainerSelectionFilterParameter()
+: m_DefaultPaths(QVector<DataArrayPath>())
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+	                                                                                        const RequirementType req, int groupIndex)
+{
+
+  MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
+  ptr->setCategory(category);
+  ptr->setDefaultGeometryTypes(req.dcGeometryTypes);
+  ptr->setDefaultAttributeMatrixTypes(req.amTypes);
+  ptr->setDefaultAttributeArrayTypes(req.daTypes);
+  ptr->setDefaultComponentDimensions(req.componentDimensions);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
+{
+  return QString("MultiDataContainerSelectionWidget");
+}
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
+	AttributeMatrix::Category attributeMatrixCategory)
+{
+	typedef QVector<size_t> QVectorOfSizeType;
+	MultiDataContainerSelectionFilterParameter::RequirementType req;
+	AttributeMatrix::Types amTypes;
+	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
+	{
+		amTypes.push_back(AttributeMatrix::Type::Cell);
+		amTypes.push_back(AttributeMatrix::Type::Face);
+		amTypes.push_back(AttributeMatrix::Type::Edge);
+		amTypes.push_back(AttributeMatrix::Type::Vertex);
+	}
+	else if (attributeMatrixCategory == AttributeMatrix::Category::Feature)
+	{
+		amTypes.push_back(AttributeMatrix::Type::CellFeature);
+		amTypes.push_back(AttributeMatrix::Type::FaceFeature);
+		amTypes.push_back(AttributeMatrix::Type::EdgeFeature);
+		amTypes.push_back(AttributeMatrix::Type::VertexFeature);
+	}
+	else if (attributeMatrixCategory == AttributeMatrix::Category::Ensemble)
+	{
+		amTypes.push_back(AttributeMatrix::Type::CellEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::FaceEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::EdgeEnsemble);
+		amTypes.push_back(AttributeMatrix::Type::VertexEnsemble);
+	}
+	req.amTypes = amTypes;
+	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+	{
+		req.daTypes = QVector<QString>(1, primitiveType);
+	}
+	if (SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+	{
+		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+	}
+	//  if(IGeometry::Type::Unknown != geometryType)
+	//  {
+	//    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+	//  }
+	return req;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
+	IGeometry::Type geometryType)
+{
+	typedef QVector<size_t> QVectorOfSizeType;
+	MultiDataContainerSelectionFilterParameter::RequirementType req;
+	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+	{
+		req.daTypes = QVector<QString>(1, primitiveType);
+	}
+	if (SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+	{
+		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+	}
+	if (AttributeMatrix::Type::Any != attributeMatrixType)
+	{
+		QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+		req.amTypes = amTypes;
+	}
+	if (IGeometry::Type::Any != geometryType)
+	{
+		req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+	}
+	return req;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    QJsonArray arrayObj = jsonValue.toArray();
+    QVector<DataArrayPath> dapVec;
+    for(int i = 0; i < arrayObj.size(); i++)
+    {
+      QJsonObject obj = arrayObj.at(i).toObject();
+      DataArrayPath dap;
+      dap.readJson(obj);
+      dapVec.push_back(dap);
+    }
+
+    m_SetterCallback(dapVec);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
+{
+  if (m_GetterCallback)
+  {
+    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    QJsonArray arrayObj;
+
+    for(int i = 0; i < dapVec.size(); i++)
+    {
+      DataArrayPath dap = dapVec[i];
+      QJsonObject obj;
+      dap.writeJson(obj);
+      arrayObj.push_back(obj);
+    }
+
+    json[getPropertyName()] = arrayObj;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  QVector<DataArrayPath> paths = m_GetterCallback();
+  int count = paths.size();
+  bool updated = false;
+
+  for(int i = 0; i < count; i++)
+  {
+    if(paths[i] == oldPath)
+    {
+      paths[i] = newPath;
+      updated = true;
+    }
+  }
+
+  m_SetterCallback(paths);
+  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
new file mode 100644
index 0000000000..f10580ec98
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -0,0 +1,196 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry.h"
+
+/**
+ * @brief SIMPL_NEW_MCA_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * MultiDataContainerSelectionFilterParameter. There are 5 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), RequirementType, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_MCA_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, RequirementType, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
+ * MultiDataContainerSelectionFilterParameter::RequirementType req;
+ * SIMPL_NEW_MCA_SELECTION_FP("Multi Data Container Test", SelectedMultiDataContainers, FilterParameter::Parameter, GenericExample, req, 0);
+ */
+#define SIMPL_NEW_MDC_SELECTION_FP(...) \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
+  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
+  (MultiDataContainerSelectionFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The MultiDataContainerSelectionFilterParameter class is used by filters to instantiate an MultiDataContainerSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a MultiDataContainerSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterParameter
+{
+  public:
+    SIMPL_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
+    SIMPL_STATIC_NEW_MACRO(MultiDataContainerSelectionFilterParameter)
+     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataContainerSelectionFilterParameter, FilterParameter)
+
+    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
+    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+
+    typedef struct
+    {
+      IGeometry::Types dcGeometryTypes;
+      AttributeMatrix::Types amTypes;
+      QVector<QString> daTypes;
+      QVector< QVector<size_t> > componentDimensions;
+    } RequirementType;
+
+    /**
+     * @brief New This function instantiates an instance of the MultiDataContainerSelectionFilterParameter.  Specifying a RequirementType will
+     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+     * SIMPL_NEW_MCA_SELECTION_FP(...) macro at the top of this file.
+
+     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+     * @param propertyName The internal property name for this filter parameter.
+     * @param defaultValue The value that this filter parameter will be initialized to by default.
+     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+     * are three categories: Parameter, Required Arrays, and Created Arrays.
+     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+    * that this FilterParameter subclass represents.
+     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+    * that this FilterParameter subclass represents.
+     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+     * user interface.
+     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+     * @return
+     */
+    static Pointer New(const QString& humanLabel, const QString& propertyName,
+                       const QVector<DataArrayPath>& defaultValue, Category category,
+                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const RequirementType req, int groupIndex = -1);
+
+    ~MultiDataContainerSelectionFilterParameter() override;
+
+    /**
+     * @brief CreateRequirement
+     * @param primitiveType
+     * @param allowedCompDim
+     * @param attributeMatrixCategory
+     * @return
+     */
+    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
+                                                     size_t allowedCompDim,
+                                                     AttributeMatrix::Category attributeMatrixCategory);
+
+    /**
+     * @brief CreateRequirement
+     * @param primitiveType
+     * @param allowedCompDim
+     * @param attributeMatrixType
+     * @param geometryType
+     * @return
+     */
+    static RequirementType CreateRequirement(const QString& primitiveType,
+                                             size_t allowedCompDim,
+                                             AttributeMatrix::Type attributeMatrixType,
+                                             IGeometry::Type geometryType);
+
+    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+
+    /**
+     * @brief getWidgetType Returns the type of widget that displays and controls
+     * this FilterParameter subclass
+     * @return
+     */
+    QString getWidgetType() const override;
+
+    /**
+     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+     * @param json The QJsonObject that the filter parameter reads from.
+     */
+    void readJson(const QJsonObject& json) override;
+
+    /**
+     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+     * @param json The QJsonObject that the filter parameter writes to.
+     */
+    void writeJson(QJsonObject& json) override;
+
+    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
+    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+
+    /**
+    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+    * that this FilterParameter subclass represents.
+    * from the filter parameter.
+    */
+    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+    /**
+    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+    * that this FilterParameter subclass represents.
+    * @return The GetterCallback
+    */
+    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     * @param filter
+     * @param renamePath
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+
+  protected:
+      /**
+       * @brief MultiDataContainerSelectionFilterParameter The default constructor.  It is protected because this
+       * filter parameter should only be instantiated using its New(...) function or short-form macro.
+       */
+    MultiDataContainerSelectionFilterParameter();
+
+  public:
+    MultiDataContainerSelectionFilterParameter(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionFilterParameter(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index 86e58f22dc..a988301198 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -60,6 +60,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NumericTypeFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/OutputFileFilterParameter.h
@@ -121,6 +122,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NumericTypeFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/OutputFileFilterParameter.cpp
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
new file mode 100644
index 0000000000..bd62251546
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -0,0 +1,467 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "MultiDataContainerSelectionWidget.h"
+
+#include <QtCore/QList>
+#include <QtCore/QMetaProperty>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QModelIndex>
+
+#include <QtGui/QStandardItemModel>
+
+#include <QtWidgets/QListWidgetItem>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyledItemDelegate>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "FilterParameterWidgetUtils.hpp"
+#include "FilterParameterWidgetsDialogs.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
+{
+  m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
+
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_DidCausePreflight(false)
+{
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::setupGui()
+{
+  // Sanity Check the filter and the filter parameter
+  if(getFilter() == nullptr)
+  {
+    return;
+  }
+  if(getFilterParameter() == nullptr)
+  {
+    return;
+  }
+
+  selectedDataContainersListWidget->installEventFilter(this);
+  availableDataContainersListWidget->installEventFilter(this);
+
+  // Generate the text for the QLabel
+  //label->setText(getFilterParameter()->getHumanLabel());
+
+  // Lastly, hook up the filter's signals and slots to our own signals and slots
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
+    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+
+  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
+  for (int i=0; i<selectedPaths.size(); i++)
+  {
+    DataArrayPath selectedPath = selectedPaths[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataContainerName());
+    selectedDataContainersListWidget->addItem(item);
+  }
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
+{
+  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
+  {
+    on_selectedDataContainersListWidget_itemSelectionChanged();
+  }
+  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
+  {
+    on_availableDataContainersListWidget_itemSelectionChanged();
+  }
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_selectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_deselectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
+{
+  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
+  {
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
+      offset++;
+      if(item != nullptr)
+      {
+        selectedDataContainersListWidget->addItem(item);
+      }
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
+{
+  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
+  foreach(QListWidgetItem* item, items)
+  {
+    int row = selectedDataContainersListWidget->row(item);
+    selectedDataContainersListWidget->takeItem(row);
+    availableDataContainersListWidget->addItem(item);
+  }
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_upBtn_clicked()
+{
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex > 0)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_downBtn_clicked()
+{
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex < selectedDataContainersListWidget->count() - 1)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
+{
+  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
+  {
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
+      selectedDataContainersListWidget->removeItemWidget(item);
+      delete item;
+      offset++;
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::selectionChanged()
+{
+  upBtn->setDisabled(true);
+  downBtn->setDisabled(true);
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+
+  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
+  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
+
+  if (selectSize > 0)
+  {
+    selectBtn->setEnabled(true);
+  }
+
+  if (orderSize > 0)
+  {
+    deselectBtn->setEnabled(true);
+
+    if (orderSize == 1)
+    {
+      upBtn->setEnabled(true);
+      downBtn->setEnabled(true);
+    }
+
+    bool allErrorRows = true;
+    for (int i=0; i<orderSize; i++)
+    {
+      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
+      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      {
+        allErrorRows = false;
+      }
+    }
+
+    if(allErrorRows)
+    {
+      removeBtn->show();
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+
+  // Previously in afterPreflight()
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  QList<QString> selectListNames;
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
+  }
+
+  QList<QString> orderListNames;
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
+	  QString name = item->text();
+	  orderListNames.append(name);
+	  if (!dcNames.contains(name))
+	  {
+		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+		  // item->setBackgroundColor(QColor(235, 110, 110));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
+	  }
+	  else
+	  {
+		  // item->setBackgroundColor(QColor(255, 255, 255));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
+	  }
+  }
+
+  for (int i = 0; i < dcNames.size(); i++)
+  {
+	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
+	  {
+		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
+		  availableDataContainersListWidget->addItem(item);
+	  }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::afterPreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+	QVector<DataArrayPath> selectedPaths;
+	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+	{
+		DataArrayPath path;
+		path.setDataContainerName(selectedDataContainersListWidget->item(i)->text());
+		selectedPaths.push_back(path);
+	}
+
+	// Generate the path to the AttributeArray
+	QVariant var;
+	var.setValue(selectedPaths);
+	bool ok = false;
+	// Set the value into the Filter
+	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
+	if (!ok)
+	{
+		getFilter()->notifyMissingProperty(getFilterParameter());
+	}
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
new file mode 100644
index 0000000000..c401b09dac
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -0,0 +1,147 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
+
+#include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+
+
+#include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
+
+class FilterParameter;
+class AbstractFilter;
+class MultiDataContainerSelectionFilterParameter;
+class QSignalMapper;
+
+/**
+* @brief
+* @author
+* @version
+*/
+class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
+{
+    Q_OBJECT
+
+  public:
+    /**
+    * @brief Constructor
+    * @param parameter The FilterParameter object that this widget represents
+    * @param filter The instance of the filter that this parameter is a part of
+    * @param parent The parent QWidget for this Widget
+    */
+    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+    ~MultiDataContainerSelectionWidget() override;
+
+    /**
+    * @brief This method does additional GUI widget connections
+    */
+    void setupGui() override;
+
+    /**
+    * @brief checkStringValues
+    * @param current
+    * @param filt
+    * @return
+    */
+    QString checkStringValues(QString current, QString filtDcName);
+
+    /**
+    * @brief initializeWidget
+    * @param parameter
+    * @param filter
+    */
+    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+    /**
+     * @brief eventFilter
+     * @param obj
+     * @param event
+     * @return
+     */
+    bool eventFilter(QObject* obj, QEvent* event) override;
+
+  public slots:
+    void beforePreflight();
+    void afterPreflight();
+    void filterNeedsInputParameters(AbstractFilter* filter);
+
+  protected slots:
+    void on_upBtn_clicked();
+    void on_downBtn_clicked();
+    void on_selectBtn_clicked();
+    void on_deselectBtn_clicked();
+    void on_removeBtn_clicked();
+
+    void on_availableDataContainersListWidget_itemSelectionChanged();
+    void on_selectedDataContainersListWidget_itemSelectionChanged();
+
+    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+
+  private:
+    bool m_DidCausePreflight;
+
+    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
+
+    void selectionChanged();
+
+  public:
+    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+};
+
+
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index 12329834e4..8d153e8da0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -33,6 +33,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     IntWidget
     LinkedBooleanWidget
     MultiAttributeMatrixSelectionWidget
+    MultiDataContainerSelectionWidget
     MultiDataArraySelectionWidget
     NumericTypeWidget
     ParagraphWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
new file mode 100644
index 0000000000..156d8f8d2e
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MultiDataContainerSelectionWidget</class>
+ <widget class="QFrame" name="MultiDataContainerSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>583</width>
+    <height>247</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="3">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="SVIconPushButton" name="upBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="downBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="removeBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <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>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Selected Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Available Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <spacer name="verticalSpacer_3">
+       <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="SVIconPushButton" name="selectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_right_green.png</normaloff>:/SIMPL/icons/images/arrow_right_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="deselectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_left_green.png</normaloff>:/SIMPL/icons/images/arrow_left_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</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">
+    <widget class="SVListWidget" name="availableDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="SVListWidget" name="selectedDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+  <customwidget>
+   <class>SVListWidget</class>
+   <extends>QListWidget</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>

From d794b9e557719fc7be30a329cd5862905c4467d7 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 7 Jan 2019 14:59:35 -0500
Subject: [PATCH 026/397] Changing MultiDataContainerSelection filter
 parameter's and widget's property type from QVector<DataArrayPath> to
 QStringList.  We only need to pass along a list of data container names, not
 full paths.

---
 ...iDataContainerSelectionFilterParameter.cpp | 36 +++++++++----------
 ...ltiDataContainerSelectionFilterParameter.h |  8 ++---
 .../MultiDataContainerSelectionWidget.cpp     | 23 ++++--------
 .../MultiDataContainerSelectionWidget.h       |  2 --
 4 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index ea729401be..08cfb2a218 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -44,7 +44,7 @@
 //
 // -----------------------------------------------------------------------------
 MultiDataContainerSelectionFilterParameter::MultiDataContainerSelectionFilterParameter()
-: m_DefaultPaths(QVector<DataArrayPath>())
+: m_DefaultNames(QStringList())
 {
 }
 
@@ -56,9 +56,9 @@ MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QStringList &defaultValue,
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-	                                                                                        const RequirementType req, int groupIndex)
+                                                                                          const RequirementType req, int groupIndex)
 {
 
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
@@ -171,16 +171,14 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
-    QVector<DataArrayPath> dapVec;
+    QStringList dcList;
     for(int i = 0; i < arrayObj.size(); i++)
     {
-      QJsonObject obj = arrayObj.at(i).toObject();
-      DataArrayPath dap;
-      dap.readJson(obj);
-      dapVec.push_back(dap);
+      QString dcName = arrayObj.at(i).toString();
+      dcList.push_back(dcName);
     }
 
-    m_SetterCallback(dapVec);
+    m_SetterCallback(dcList);
   }
 }
 
@@ -191,15 +189,13 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if (m_GetterCallback)
   {
-    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for(int i = 0; i < dapVec.size(); i++)
+    for(int i = 0; i < dcList.size(); i++)
     {
-      DataArrayPath dap = dapVec[i];
-      QJsonObject obj;
-      dap.writeJson(obj);
-      arrayObj.push_back(obj);
+      QString dcName = dcList[i];
+      arrayObj.push_back(dcName);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -215,19 +211,19 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  QVector<DataArrayPath> paths = m_GetterCallback();
-  int count = paths.size();
+  QStringList dcList = m_GetterCallback();
+  int count = dcList.size();
   bool updated = false;
 
   for(int i = 0; i < count; i++)
   {
-    if(paths[i] == oldPath)
+    if(dcList[i] == oldPath.getDataContainerName())
     {
-      paths[i] = newPath;
+      dcList[i] = newPath.getDataContainerName();
       updated = true;
     }
   }
 
-  m_SetterCallback(paths);
+  m_SetterCallback(dcList);
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index f10580ec98..4233aa31df 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -71,8 +71,8 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_STATIC_NEW_MACRO(MultiDataContainerSelectionFilterParameter)
      SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataContainerSelectionFilterParameter, FilterParameter)
 
-    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+    typedef std::function<void(QStringList)> SetterCallbackType;
+    typedef std::function<QStringList(void)> GetterCallbackType;
 
     typedef struct
     {
@@ -103,7 +103,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QVector<DataArrayPath>& defaultValue, Category category,
+                       const QStringList& defaultValue, Category category,
                        SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                        const RequirementType req, int groupIndex = -1);
 
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
-    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+    SIMPL_INSTANCE_PROPERTY(QStringList, DefaultNames)
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index bd62251546..9887624a33 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -130,11 +130,11 @@ void MultiDataContainerSelectionWidget::setupGui()
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
     this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
-  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
-  for (int i=0; i<selectedPaths.size(); i++)
+  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
+  for (int i=0; i<dcNames.size(); i++)
   {
-    DataArrayPath selectedPath = selectedPaths[i];
-    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataContainerName());
+    QString dcName = dcNames[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
     selectedDataContainersListWidget->addItem(item);
   }
   selectBtn->setDisabled(true);
@@ -301,13 +301,6 @@ void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
-{
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -436,17 +429,15 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-	QVector<DataArrayPath> selectedPaths;
+  QStringList dcNames;
 	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
 	{
-		DataArrayPath path;
-		path.setDataContainerName(selectedDataContainersListWidget->item(i)->text());
-		selectedPaths.push_back(path);
+    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
 	}
 
 	// Generate the path to the AttributeArray
 	QVariant var;
-	var.setValue(selectedPaths);
+  var.setValue(dcNames);
 	bool ok = false;
 	// Set the value into the Filter
 	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index c401b09dac..90406a9c4a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -132,8 +132,6 @@ class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParam
 
     MultiDataContainerSelectionFilterParameter* m_FilterParameter;
 
-    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
-
     void selectionChanged();
 
   public:

From 4b36acf65421b0c951238f6da814703f61d3c776 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 8 Jan 2019 09:30:18 -0500
Subject: [PATCH 027/397] Adding icons to the add and remove Data Container
 buttons in the MultiDataContainerSelection widget.

---
 .../UI_Files/MultiDataContainerSelectionWidget.ui         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index 156d8f8d2e..d2c3783761 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -52,7 +52,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
+        <iconset>
          <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
        </property>
        <property name="iconSize">
@@ -87,7 +87,7 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
+        <iconset>
          <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
        </property>
        <property name="iconSize">
@@ -223,7 +223,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_right_green.png</normaloff>:/SIMPL/icons/images/arrow_right_green.png</iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -258,7 +258,7 @@
        </property>
        <property name="icon">
         <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_left_green.png</normaloff>:/SIMPL/icons/images/arrow_left_green.png</iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
        </property>
        <property name="iconSize">
         <size>

From 3fcd47dc05e1943decfdc117e70d54433b8cbb74 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 15 Jan 2019 14:03:31 -0500
Subject: [PATCH 028/397] Checking for and clearing non-existant data
 containers before each preflight.

---
 .../MultiDataContainerSelectionWidget.cpp     | 36 +++++++++++++++++++
 .../MultiDataContainerSelectionWidget.h       |  5 +++
 2 files changed, 41 insertions(+)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9887624a33..fd4cd98b10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -363,6 +363,40 @@ void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_item
   selectionChanged();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
+{
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
+    {
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
+    }
+  }
+
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
+    {
+      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
+    }
+  }
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -373,6 +407,8 @@ void MultiDataContainerSelectionWidget::beforePreflight()
     return;
   }
 
+  clearNonexistantDataContainers();
+
   // Previously in afterPreflight()
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
   if(nullptr == dca.get())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 90406a9c4a..6393c39f1d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -134,6 +134,11 @@ class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParam
 
     void selectionChanged();
 
+    /**
+     * @brief clearNonexistantDataContainers
+     */
+    void clearNonexistantDataContainers();
+
   public:
     MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
     MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented

From f704b257d6b0f12b71b0cbd290b756cab92621a1 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 18 Jan 2019 10:59:23 -0500
Subject: [PATCH 029/397] Adding itkProgressObserver class that can be used to
 pass progress updates from ITK to DREAM3D filters.

---
 Source/SIMPLib/ITK/itkProgressObserver.cpp | 93 ++++++++++++++++++++++
 Source/SIMPLib/ITK/itkProgressObserver.h   | 67 ++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 Source/SIMPLib/ITK/itkProgressObserver.cpp
 create mode 100644 Source/SIMPLib/ITK/itkProgressObserver.h

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.cpp b/Source/SIMPLib/ITK/itkProgressObserver.cpp
new file mode 100644
index 0000000000..93c2c11baa
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkProgressObserver.cpp
@@ -0,0 +1,93 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "itkProgressObserver.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::Execute(itk::Object* caller, const itk::EventObject& event)
+{
+    Execute((const itk::Object*)caller, event);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::Execute(const itk::Object* caller, const itk::EventObject& event)
+{
+    if(!itk::ProgressEvent().CheckEvent(&event))
+    {
+        return;
+    }
+    const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
+    if(!processObject)
+    {
+        return;
+    }
+
+    QString progressStr = QString::number(processObject->GetProgress() * 100);
+
+    QString ss;
+    if (m_MessagePrefix.isEmpty())
+    {
+        ss = QObject::tr("%1%").arg(progressStr);
+    }
+    else
+    {
+        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
+    }
+
+    if (m_Filter)
+    {
+        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
+    }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::setMessagePrefix(const QString &prefix)
+{
+    m_MessagePrefix = prefix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void itk::ProgressObserver::setFilter(AbstractFilter* filter)
+{
+    m_Filter = filter;
+}
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.h b/Source/SIMPLib/ITK/itkProgressObserver.h
new file mode 100644
index 0000000000..37f51e9412
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkProgressObserver.h
@@ -0,0 +1,67 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "itkProcessObject.h"
+#include "itkCommand.h"
+
+namespace itk
+{
+class ProgressObserver : public itk::Command
+{
+  public:
+    void Execute(itk::Object* caller, const itk::EventObject& event) override;
+
+    void Execute(const itk::Object* caller, const itk::EventObject& event) override;
+
+    void setMessagePrefix(const QString &prefix);
+
+    void setFilter(AbstractFilter* filter);
+
+  private:
+    AbstractFilter* m_Filter = nullptr;
+    QString m_MessagePrefix;
+};
+} // end of itk namespace
+
+#ifndef ITK_MANUAL_INSTANTIATION
+#include "itkProgressObserver.cpp"
+#endif

From 5cded3dd9c801d7b82ecf5632a73ce5f968f5361 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 21 Jan 2019 15:18:15 -0500
Subject: [PATCH 030/397] Adding new Fiji configuration file reader class.

---
 .../ITK/itkFijiConfigurationFileReader.hpp    | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
new file mode 100644
index 0000000000..cb5d95fff2
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -0,0 +1,126 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QPointF>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+
+#include "itkParseTileConfiguration.h"
+
+namespace itk
+{
+struct FijiImageTileData
+{
+  QString filePath;
+  QPointF coords;
+  int row;
+  int col;
+};
+
+typedef std::vector<FijiImageTileData> FijiRowData;
+typedef std::vector<FijiRowData> FijiFileData;
+
+class FijiConfigurationFileReader : public QObject
+{
+  public:
+    FijiFileData parseFijiConfigFile(const QString &configFilePath)
+    {
+      itk::FijiFileData fileData;
+
+      itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());
+      for (int i = 0; i < stageTiles.size(); i++)
+      {
+        auto tile2D = stageTiles[i];
+        FijiRowData rowData;
+        for (int j = 0; j < tile2D.size(); j++)
+        {
+          auto tile = tile2D[j];
+
+          QString imageFilePath = QString::fromStdString(tile.FileName);
+          QFileInfo fi(imageFilePath);
+          if (fi.isRelative())
+          {
+            QFileInfo configFi(configFilePath);
+            imageFilePath = configFi.path() + QDir::separator() + imageFilePath;
+          }
+
+          itk::FijiImageTileData imageTileData;
+
+          imageTileData.filePath = imageFilePath;
+
+          uint32_t coordsSize = tile.Position.GetPointDimension();
+          if (coordsSize != 2)
+          {
+            m_ErrorMessage = QObject::tr("The dimension size of all tiles in the fiji config file must be equal to 2.");
+            m_ErrorCondition = -2004;
+            return itk::FijiFileData();
+          }
+
+          imageTileData.coords = QPointF(tile.Position[0], tile.Position[1]);
+          imageTileData.row = i;
+          imageTileData.col = j;
+
+          rowData.push_back(imageTileData);
+        }
+
+        fileData.push_back(rowData);
+      }
+
+      return fileData;
+    }
+
+    int getErrorCode()
+    {
+      return m_ErrorCondition;
+    }
+
+    QString getErrorMessage()
+    {
+      return m_ErrorMessage;
+    }
+
+  private:
+    int m_ErrorCondition;
+    QString m_ErrorMessage;
+};
+}
+
+//#ifndef ITK_MANUAL_INSTANTIATION
+//#include "itkFijiConfigurationFileReader.cpp"
+//#endif

From cff0091ae88d3d061460059893e6ad4bd2cfd775 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 28 Jan 2019 14:10:35 -0500
Subject: [PATCH 031/397] Turning itkProgressObserver into a header-only class.

---
 Source/SIMPLib/ITK/itkProgressObserver.cpp    | 93 -------------------
 ...ressObserver.h => itkProgressObserver.hpp} | 49 ++++++++--
 2 files changed, 41 insertions(+), 101 deletions(-)
 delete mode 100644 Source/SIMPLib/ITK/itkProgressObserver.cpp
 rename Source/SIMPLib/ITK/{itkProgressObserver.h => itkProgressObserver.hpp} (72%)

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.cpp b/Source/SIMPLib/ITK/itkProgressObserver.cpp
deleted file mode 100644
index 93c2c11baa..0000000000
--- a/Source/SIMPLib/ITK/itkProgressObserver.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "itkProgressObserver.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::Execute(itk::Object* caller, const itk::EventObject& event)
-{
-    Execute((const itk::Object*)caller, event);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::Execute(const itk::Object* caller, const itk::EventObject& event)
-{
-    if(!itk::ProgressEvent().CheckEvent(&event))
-    {
-        return;
-    }
-    const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
-    if(!processObject)
-    {
-        return;
-    }
-
-    QString progressStr = QString::number(processObject->GetProgress() * 100);
-
-    QString ss;
-    if (m_MessagePrefix.isEmpty())
-    {
-        ss = QObject::tr("%1%").arg(progressStr);
-    }
-    else
-    {
-        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
-    }
-
-    if (m_Filter)
-    {
-        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::setMessagePrefix(const QString &prefix)
-{
-    m_MessagePrefix = prefix;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void itk::ProgressObserver::setFilter(AbstractFilter* filter)
-{
-    m_Filter = filter;
-}
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.h b/Source/SIMPLib/ITK/itkProgressObserver.hpp
similarity index 72%
rename from Source/SIMPLib/ITK/itkProgressObserver.h
rename to Source/SIMPLib/ITK/itkProgressObserver.hpp
index 37f51e9412..4e66fedb31 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.h
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -48,20 +48,53 @@ namespace itk
 class ProgressObserver : public itk::Command
 {
   public:
-    void Execute(itk::Object* caller, const itk::EventObject& event) override;
+    void Execute(itk::Object* caller, const itk::EventObject& event) override
+    {
+      Execute((const itk::Object*)caller, event);
+    }
 
-    void Execute(const itk::Object* caller, const itk::EventObject& event) override;
+    void Execute(const itk::Object* caller, const itk::EventObject& event) override
+    {
+      if(!itk::ProgressEvent().CheckEvent(&event))
+      {
+        return;
+      }
+      const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
+      if(!processObject)
+      {
+        return;
+      }
 
-    void setMessagePrefix(const QString &prefix);
+      QString progressStr = QString::number(processObject->GetProgress() * 100);
 
-    void setFilter(AbstractFilter* filter);
+      QString ss;
+      if (m_MessagePrefix.isEmpty())
+      {
+        ss = QObject::tr("%1%").arg(progressStr);
+      }
+      else
+      {
+        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
+      }
+
+      if (m_Filter)
+      {
+        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
+      }
+    }
+
+    void setMessagePrefix(const QString &prefix)
+    {
+      m_MessagePrefix = prefix;
+    }
+
+    void setFilter(AbstractFilter* filter)
+    {
+      m_Filter = filter;
+    }
 
   private:
     AbstractFilter* m_Filter = nullptr;
     QString m_MessagePrefix;
 };
 } // end of itk namespace
-
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "itkProgressObserver.cpp"
-#endif

From b8cef75d443e6c40eba97ec23bb1e92d6e021809 Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Mon, 4 Feb 2019 11:26:35 -0500
Subject: [PATCH 032/397] Fixes issue with montage filter not working due to an
 uninitialized variable

Signed-off-by: Tom Platt <tom.platt@bluequartz.net>
---
 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index cb5d95fff2..1d72bbda15 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -61,6 +61,7 @@ class FijiConfigurationFileReader : public QObject
   public:
     FijiFileData parseFijiConfigFile(const QString &configFilePath)
     {
+      m_ErrorCondition = 0;
       itk::FijiFileData fileData;
 
       itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());

From 1555a812ef6623587e8ae0078a673eb9c808d134 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 11 Feb 2019 16:56:57 -0500
Subject: [PATCH 033/397] Adding itkTemplateHelpers header file that includes
 macros that can be used by filters to register and stitch images with any
 data type and image type.

---
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  10 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |  13 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  12 +-
 Source/SIMPLib/ITK/itkTemplateHelpers.h       | 172 ++++++++++++++++++
 4 files changed, 190 insertions(+), 17 deletions(-)
 create mode 100755 Source/SIMPLib/ITK/itkTemplateHelpers.h

diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 691b501a3f..16a763d867 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -93,7 +93,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
   else
   {
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -144,7 +144,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f,
     break;
   default:
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeEnums::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
     break;
   }
@@ -217,7 +217,7 @@ IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const QV
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -284,7 +284,7 @@ IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
   }
   return ptr;
@@ -378,7 +378,7 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
                      .arg(arrayPath.getDataArrayName())
                      .arg(i_data_array->getTypeAsString())
                      .arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedType);
+    f->setErrorCondition(Errors::UnsupportedDataType);
     f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
   }
   return retPtr;
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 4f30b5ab62..b871ff2b4d 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -106,7 +106,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedType);                                                             \
+    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
   }
 
 #define EXECUTE_TEMPLATE(observableObj, templateName, inputData, ...)                                                                                                                                  \
@@ -172,7 +172,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedType);                                                             \
+    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
   }
 
 /**
@@ -180,10 +180,11 @@ namespace TemplateHelpers
  */
 namespace Errors
 {
-const int UnsupportedType(-401);
-const int MissingDataContainer(-402);
-const int MissingAttributeMatrix(-403);
-const int MissingArray(-404);
+const int UnsupportedDataType(-401);
+const int UnsupportedImageType(-402);
+const int MissingDataContainer(-403);
+const int MissingAttributeMatrix(-404);
+const int MissingArray(-405);
 } // namespace Errors
 
 /**
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index d10bc582bd..ba562ec499 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -312,17 +312,17 @@ void WriteASCIIData::dataCheck()
 
     if( ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( ptr.lock()->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else
@@ -421,17 +421,17 @@ void WriteASCIIData::writeMultiFileOutput()
     }
     else if( selectedArrayPtr->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( selectedArrayPtr->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else if( selectedArrayPtr->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedType);
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
       notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
     }
     else
diff --git a/Source/SIMPLib/ITK/itkTemplateHelpers.h b/Source/SIMPLib/ITK/itkTemplateHelpers.h
new file mode 100755
index 0000000000..b5b1d94140
--- /dev/null
+++ b/Source/SIMPLib/ITK/itkTemplateHelpers.h
@@ -0,0 +1,172 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Common/TemplateHelpers.h"
+
+/*
+ * @brief This file contains some macros that help to reduce the amount of code needed to determine the data type
+ * of an IDataArray and then call a function with template arguments
+ */
+
+namespace ITKTemplateHelpers
+{
+
+#define EXECUTE_REGISTER_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                               \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_STITCH_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                                 \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    templateName<itk::RGBPixel<DATATYPE>, itk::RGBPixel<uint64_t>>(__VA_ARGS__);                                                                                                                       \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<itk::RGBAPixel<DATATYPE>, itk::RGBAPixel<uint64_t>>(__VA_ARGS__);                                                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    templateName<DATATYPE, uint64_t>(__VA_ARGS__);                                                                                                                                                     \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(DATATYPE, observableObj, templateName, inputData, algorithm, ...)                                                                                     \
+  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
+  if(numOfComponents == 3)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 4)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else if(numOfComponents == 1)                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
+                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
+                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
+                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
+  }
+
+#define EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, algorithm, ...)                                                                                                     \
+  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(float, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                   \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(double, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<BoolArrayType>()(inputData))                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(bool, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                    \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<DataArray<size_t>>()(inputData))                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(size_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->notifyErrorMessage(#templateName, "The input array's data type is not supported", TemplateHelpers::Errors::UnsupportedDataType);                                                    \
+  }
+
+#define EXECUTE_STITCH_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, STITCH, __VA_ARGS__)
+
+#define EXECUTE_REGISTER_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, REGISTER, __VA_ARGS__)
+
+} // namespace ITKTemplateHelpers

From 71f09eca2b2f74e172fd0b2a123325509a55d72d Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 12 Feb 2019 15:16:39 -0500
Subject: [PATCH 034/397] Adding shared pointer code to itkProgressObserver
 class.

---
 Source/SIMPLib/ITK/itkProgressObserver.hpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 4e66fedb31..438791cf16 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -48,6 +48,9 @@ namespace itk
 class ProgressObserver : public itk::Command
 {
   public:
+    SIMPL_SHARED_POINTERS(ProgressObserver)
+    SIMPL_STATIC_NEW_MACRO(ProgressObserver)
+
     void Execute(itk::Object* caller, const itk::EventObject& event) override
     {
       Execute((const itk::Object*)caller, event);
@@ -93,8 +96,16 @@ class ProgressObserver : public itk::Command
       m_Filter = filter;
     }
 
+  protected:
+    ProgressObserver() {}
+
   private:
     AbstractFilter* m_Filter = nullptr;
     QString m_MessagePrefix;
+
+    ProgressObserver(const ProgressObserver&) = delete; // Copy Constructor Not Implemented
+    ProgressObserver(ProgressObserver&&) = delete;      // Move Constructor Not Implemented
+    ProgressObserver& operator=(const ProgressObserver&) = delete; // Copy Assignment Not Implemented
+    ProgressObserver& operator=(ProgressObserver&&) = delete;      // Move Assignment Not Implemented
 };
 } // end of itk namespace

From 07a7cc2ba590b44481d4673109ff58b4a5b03e80 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 14 Feb 2019 10:53:01 -0500
Subject: [PATCH 035/397] Removing itkTemplateHelpers header.

---
 Source/SIMPLib/ITK/itkTemplateHelpers.h | 172 ------------------------
 1 file changed, 172 deletions(-)
 delete mode 100755 Source/SIMPLib/ITK/itkTemplateHelpers.h

diff --git a/Source/SIMPLib/ITK/itkTemplateHelpers.h b/Source/SIMPLib/ITK/itkTemplateHelpers.h
deleted file mode 100755
index b5b1d94140..0000000000
--- a/Source/SIMPLib/ITK/itkTemplateHelpers.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include "SIMPLib/Common/TemplateHelpers.h"
-
-/*
- * @brief This file contains some macros that help to reduce the amount of code needed to determine the data type
- * of an IDataArray and then call a function with template arguments
- */
-
-namespace ITKTemplateHelpers
-{
-
-#define EXECUTE_REGISTER_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                               \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_STITCH_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, ...)                                                                                                 \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    templateName<itk::RGBPixel<DATATYPE>, itk::RGBPixel<uint64_t>>(__VA_ARGS__);                                                                                                                       \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<itk::RGBAPixel<DATATYPE>, itk::RGBAPixel<uint64_t>>(__VA_ARGS__);                                                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    templateName<DATATYPE, uint64_t>(__VA_ARGS__);                                                                                                                                                     \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(DATATYPE, observableObj, templateName, inputData, algorithm, ...)                                                                                     \
-  int numOfComponents = inputData->getNumberOfComponents();                                                                                                                                            \
-  if(numOfComponents == 3)                                                                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 4)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else if(numOfComponents == 1)                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    EXECUTE_##algorithm##_FUNCTION_TEMPLATE_HELPER(DATATYPE, observableObj, templateName, inputData, __VA_ARGS__);                                                                                     \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName,                                                                                                                                                   \
-                                      "The input array's image type is not recognized.  Supported image types"                                                                                         \
-                                      " are grayscale (1-component), RGB (3-component), and RGBA (4-component)",                                                                                       \
-                                      TemplateHelpers::Errors::UnsupportedImageType);                                                                                                                  \
-  }
-
-#define EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, algorithm, ...)                                                                                                     \
-  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(float, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                   \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(double, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint8_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint16_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint32_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(int64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(uint64_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<BoolArrayType>()(inputData))                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(bool, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                    \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<DataArray<size_t>>()(inputData))                                                                                                                             \
-  {                                                                                                                                                                                                    \
-    EXECUTE_ACCUMULATETYPE_FUNCTION_TEMPLATE(size_t, observableObj, templateName, inputData, algorithm, __VA_ARGS__);                                                                                  \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array's data type is not supported", TemplateHelpers::Errors::UnsupportedDataType);                                                    \
-  }
-
-#define EXECUTE_STITCH_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, STITCH, __VA_ARGS__)
-
-#define EXECUTE_REGISTER_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...) EXECUTE_DATATYPE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, REGISTER, __VA_ARGS__)
-
-} // namespace ITKTemplateHelpers

From 7aa7527465c60f414f83734d1dfb233c59e9827d Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 14 Feb 2019 10:53:29 -0500
Subject: [PATCH 036/397] Fixing bug where data container transforms were not
 being read from a dream3d file correctly.

---
 Source/SIMPLib/Geometry/IGeometry.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index ee93a1227e..c41e2d18f9 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -562,7 +562,7 @@ int IGeometry::readGeometryFromHDF5(hid_t parentId, bool preflight)
   herr_t err = 0;
   std::string transformTypeName = SIMPL::Geometry::UnknownTransformContainer.toStdString();
 
-  QString transformName = QString::number(0).toLatin1().data();
+  QString transformName = SIMPL::Geometry::TransformContainerGroup.toLatin1().data();
   err = H5Lite::readStringAttribute(parentId, transformName.toLatin1().data(), SIMPL::Geometry::TransformContainerTypeName.toLatin1().data(), transformTypeName);
   // No transform information found.
   if(err < 0)

From dd59caaf9a7e712197d93d66c2c49cbae5cfb076 Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Mon, 11 Feb 2019 15:43:16 -0500
Subject: [PATCH 037/397] Merge in @nathanblair work on MultiDataContainerFP

resolves nathanblair/SIMPL/#2
Drag'n'Drop works for MultiDCSelection Widget

Signed-off-by: Nathan Blair <nathan.blair@bluequartz.net>
---
 ...iDataContainerSelectionFilterParameter.cpp |  26 +-
 ...ltiDataContainerSelectionFilterParameter.h |  12 +-
 .../MultiDataContainerSelectionWidget.cpp     | 591 +++++++-----------
 .../MultiDataContainerSelectionWidget.h       | 206 +++---
 .../MultiDataContainerSelectionWidget.ui      | 462 ++++----------
 5 files changed, 414 insertions(+), 883 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 08cfb2a218..e1dce99f01 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -60,7 +60,6 @@ MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionF
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                                                                                           const RequirementType req, int groupIndex)
 {
-
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
@@ -94,7 +93,7 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
 	AttributeMatrix::Category attributeMatrixCategory)
 {
-	typedef QVector<size_t> QVectorOfSizeType;
+  using QVectorOfSizeType = QVector<size_t>;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	AttributeMatrix::Types amTypes;
 	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -140,7 +139,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
 	IGeometry::Type geometryType)
 {
-	typedef QVector<size_t> QVectorOfSizeType;
+  using QVectorOfSizeType = QVector<size_t>;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
 	{
@@ -172,12 +171,11 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   {
     QJsonArray arrayObj = jsonValue.toArray();
     QStringList dcList;
-    for(int i = 0; i < arrayObj.size(); i++)
+    for (const auto &eachDCObj : arrayObj)
     {
-      QString dcName = arrayObj.at(i).toString();
-      dcList.push_back(dcName);
+      QJsonObject obj = eachDCObj.toObject();
+      dcList.push_back(obj["Data Container Name"].toString());
     }
-
     m_SetterCallback(dcList);
   }
 }
@@ -192,10 +190,11 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
     QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for(int i = 0; i < dcList.size(); i++)
+    for (const auto &eachDCName : dcList)
     {
-      QString dcName = dcList[i];
-      arrayObj.push_back(dcName);
+      QJsonObject obj;
+      obj["Data Container Name"] = eachDCName;
+      arrayObj.push_back(obj);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -212,14 +211,13 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   std::tie(oldPath, newPath) = renamePath;
 
   QStringList dcList = m_GetterCallback();
-  int count = dcList.size();
   bool updated = false;
 
-  for(int i = 0; i < count; i++)
+  for (auto &eachDCName : dcList)
   {
-    if(dcList[i] == oldPath.getDataContainerName())
+    if (eachDCName == oldPath.getDataContainerName())
     {
-      dcList[i] = newPath.getDataContainerName();
+      eachDCName = newPath.getDataContainerName();
       updated = true;
     }
   }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 4233aa31df..95460f4b9a 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -1,3 +1,4 @@
+#pragma once
 /* ============================================================================
 * Copyright (c) 2009-2016 BlueQuartz Software, LLC
 *
@@ -33,13 +34,9 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#pragma once
-
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
@@ -94,9 +91,9 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @param category The category for the filter parameter in the DREAM.3D user interface.  There
      * are three categories: Parameter, Required Arrays, and Created Arrays.
      * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
+     * that this FilterParameter subclass represents.
      * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
+     * that this FilterParameter subclass represents.
      * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
      * user interface.
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
@@ -157,7 +154,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector<QVector<size_t>>, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -193,4 +190,3 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index fd4cd98b10..2afa4bbd33 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -1,43 +1,45 @@
+#include <utility>
+
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 #include <QtCore/QModelIndex>
+#include <QtCore/QSignalMapper>
 
 #include <QtGui/QStandardItemModel>
 
@@ -55,440 +57,267 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
-, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerFilterParameter object");
 
   setupUi(this);
   setupGui();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
-: FilterParameterWidget(nullptr, nullptr, parent)
-, m_DidCausePreflight(false)
-{
-  setupUi(this);
-  setupGui();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
-{
-  setFilter(filter);
-  setFilterParameter(parameter);
-  setupGui();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::setupGui()
 {
   // Sanity Check the filter and the filter parameter
-  if(getFilter() == nullptr)
+  if(getFilter() == nullptr) // Trivial
   {
     return;
   }
-  if(getFilterParameter() == nullptr)
+  if(getFilterParameter() == nullptr) // Trivial
   {
     return;
   }
 
-  selectedDataContainersListWidget->installEventFilter(this);
-  availableDataContainersListWidget->installEventFilter(this);
-
-  // Generate the text for the QLabel
-  //label->setText(getFilterParameter()->getHumanLabel());
-
-  // Lastly, hook up the filter's signals and slots to our own signals and slots
-  // Catch when the filter is about to execute the preflight
   connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
-
-  // Catch when the filter is finished running the preflight
   connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
-
-  // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
-
-  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
-  for (int i=0; i<dcNames.size(); i++)
+  for(const auto& eachDC : getFilterParameter()->getDefaultValue().toStringList())
   {
-    QString dcName = dcNames[i];
-    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
-    selectedDataContainersListWidget->addItem(item);
+    dataContainersOrderWidget->addItem(eachDC);
   }
-  selectBtn->setDisabled(true);
-  deselectBtn->setDisabled(true);
-  removeBtn->hide();
 }
 
 // -----------------------------------------------------------------------------
-//
+// Slot callbacks
 // -----------------------------------------------------------------------------
-QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
-{
-  if(curDcName.isEmpty() && !filtDcName.isEmpty())
-  {
-    return filtDcName;
-  }
-  if(!curDcName.isEmpty() && filtDcName.isEmpty())
-  {
-    return curDcName;
-  }
-  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
-  {
-    return curDcName;
-  }
-
-  return filtDcName;
-}
-
 // -----------------------------------------------------------------------------
-//
+// Validate containers in each list are in the filter data container array
 // -----------------------------------------------------------------------------
-bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
+void MultiDataContainerSelectionWidget::beforePreflight()
 {
-  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
-  {
-    on_selectedDataContainersListWidget_itemSelectionChanged();
-  }
-  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
+  if(nullptr == getFilter())
   {
-    on_availableDataContainersListWidget_itemSelectionChanged();
+    return;
   }
-  return false;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
-{
-  on_selectBtn_clicked();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
-{
-  on_deselectBtn_clicked();
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
-{
-  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
-  if(!indexList.empty())
+  if(nullptr == getFilter()->getDataContainerArray().get())
   {
-    int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
-    {
-      int row = indexList[i].row() - offset;
-      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
-      offset++;
-      if(item != nullptr)
-      {
-        selectedDataContainersListWidget->addItem(item);
-      }
-    }
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    return;
   }
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
-{
-  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
-  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
-  foreach(QListWidgetItem* item, items)
+  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
+  for(const auto& eachDC : getFilter()->getDataContainerArray()->getDataContainerNames())
   {
-    int row = selectedDataContainersListWidget->row(item);
-    selectedDataContainersListWidget->takeItem(row);
-    availableDataContainersListWidget->addItem(item);
+    dcNames.push_back(eachDC);
   }
-  m_DidCausePreflight = true;
-  emit parametersChanged();
-  m_DidCausePreflight = false;
+
+  validateDataContainerNames(dataContainersSelectWidget, dcNames);
+  validateDataContainerNames(dataContainersOrderWidget, dcNames);
 }
 
 // -----------------------------------------------------------------------------
-//
+// Populate and syncronize the lists
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_upBtn_clicked()
+void MultiDataContainerSelectionWidget::afterPreflight()
 {
-  int currentIndex = selectedDataContainersListWidget->currentRow();
+  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
+  QStringList newItems{dcNames};
 
-  if(currentIndex > 0)
-  {
-    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
-    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
-    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
+  syncItems(dataContainersSelectWidget, dcNames, newItems);
+  syncItems(dataContainersOrderWidget, dcNames, newItems);
 
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
-  }
+  dataContainersSelectWidget->addItems(newItems);
 }
 
 // -----------------------------------------------------------------------------
-//
+// Set the filter's active data containers or notify that parameter is missing
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_downBtn_clicked()
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  int currentIndex = selectedDataContainersListWidget->currentRow();
-
-  if(currentIndex < selectedDataContainersListWidget->count() - 1)
+  QStringList selectedDCs;
+  for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
   {
-    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
-    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
-    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
   }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
-{
-  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
-  if(!indexList.empty())
+  QVariant var;
+  var.setValue(selectedDCs);
+  if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
   {
-    int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
-    {
-      int row = indexList[i].row() - offset;
-      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
-      selectedDataContainersListWidget->removeItemWidget(item);
-      delete item;
-      offset++;
-    }
-
-    m_DidCausePreflight = true;
-    emit parametersChanged();
-    m_DidCausePreflight = false;
+    getFilter()->notifyMissingProperty(getFilterParameter());
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Update the name of a data container in the appropriate list widget
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::selectionChanged()
+void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  upBtn->setDisabled(true);
-  downBtn->setDisabled(true);
-  selectBtn->setDisabled(true);
-  deselectBtn->setDisabled(true);
-  removeBtn->hide();
-
-  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
-  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
-
-  if (selectSize > 0)
-  {
-    selectBtn->setEnabled(true);
-  }
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
 
-  if (orderSize > 0)
+  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
   {
-    deselectBtn->setEnabled(true);
-
-    if (orderSize == 1)
+    if(oldPath.getDataContainerName() != newPath.getDataContainerName())
     {
-      upBtn->setEnabled(true);
-      downBtn->setEnabled(true);
-    }
-
-    bool allErrorRows = true;
-    for (int i=0; i<orderSize; i++)
-    {
-      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
-      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      blockSignals(true);
+      for (const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
-        allErrorRows = false;
+        eachOrderDC->setText(newPath.getDataContainerName());
       }
-    }
-
-    if(allErrorRows)
-    {
-      removeBtn->show();
+      for (const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      {
+        eachOrderDC->setText(newPath.getDataContainerName());
+      }
+      blockSignals(false);
     }
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Helper Methods
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
-{
-  selectionChanged();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
-{
-  selectionChanged();
-}
-
 // -----------------------------------------------------------------------------
-//
+// Sync list widgets with updated data container array
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
+void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const QStringList& list, QStringList& newItems)
 {
-  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if(nullptr == dca.get())
+  for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
   {
-    return;
-  }
-
-  QList<QString> dcNames = dca->getDataContainerNames();
-
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
-  {
-    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
+    QString itemText{eachItem->text()};
+    bool listContainsItemText{list.contains(itemText)};
+    if (listContainsItemText)
     {
-      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
-      delete item;
-      i--;
-    }
-  }
-
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-  {
-    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
-    {
-      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
-      delete item;
-      i--;
+      newItems.removeOne(itemText);
+      continue;
     }
+    delete listWidget->takeItem(listWidget->row(eachItem));
   }
 }
 
 // -----------------------------------------------------------------------------
-//
+// Validate ListWidget item exists in data container array
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::beforePreflight()
+void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListWidget* list, const QList<QString>& compareList)
 {
-  if(nullptr == getFilter())
+  for(int i = 0; i < list->count(); i++)
   {
-    return;
-  }
-
-  clearNonexistantDataContainers();
-
-  // Previously in afterPreflight()
-  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if(nullptr == dca.get())
-  {
-    return;
-  }
-
-  QList<QString> dcNames = dca->getDataContainerNames();
-
-  QList<QString> selectListNames;
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
-  {
-	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
-  }
-
-  QList<QString> orderListNames;
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-  {
-	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
-	  QString name = item->text();
-	  orderListNames.append(name);
-	  if (!dcNames.contains(name))
-	  {
-		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-		  // item->setBackgroundColor(QColor(235, 110, 110));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
-	  }
-	  else
-	  {
-		  // item->setBackgroundColor(QColor(255, 255, 255));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
-	  }
-  }
-
-  for (int i = 0; i < dcNames.size(); i++)
-  {
-	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
-	  {
-		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
-		  availableDataContainersListWidget->addItem(item);
-	  }
+    QListWidgetItem* item = list->item(i);
+    QString name = item->text();
+    if(!compareList.contains(name))
+    {
+      item->setBackgroundColor(QColor(235, 110, 110));
+    }
+    else
+    {
+      item->setBackgroundColor(QColor(255, 255, 255));
+    }
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::afterPreflight()
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
-{
-  QStringList dcNames;
-	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-	{
-    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
-	}
-
-	// Generate the path to the AttributeArray
-	QVariant var;
-  var.setValue(dcNames);
-	bool ok = false;
-	// Set the value into the Filter
-	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-	if (!ok)
-	{
-		getFilter()->notifyMissingProperty(getFilterParameter());
-	}
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
-{
-  DataArrayPath oldPath;
-  DataArrayPath newPath;
-  std::tie(oldPath, newPath) = renamePath;
-}
+/* Unused
+// -----------------------------------------------------------------------------
+// This doesn't appear to get used - disabling and will remove if nothing adverse happens at runtime
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+//{
+//  setFilter(filter);
+//  setFilterParameter(parameter);
+//  setupGui();
+//}
+
+// -----------------------------------------------------------------------------
+// ???
+// -----------------------------------------------------------------------------
+//QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+//{
+//  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+//  {
+//    return filtDcName;
+//  }
+//  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+//  {
+//    return curDcName;
+//  }
+//  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+//  {
+//    return curDcName;
+//  }
+
+//  return filtDcName;
+//}
+
+// -----------------------------------------------------------------------------
+// TODO - does not appear to get used
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::dataContainerSelected(QString path)
+//{
+//  setSelectedPath(std::move(path));
+
+//  m_DidCausePreflight = true;
+//  emit parametersChanged();
+//  m_DidCausePreflight = false;
+//}
+
+// -----------------------------------------------------------------------------
+// Unlikely this has any use for top level data container list
+// -----------------------------------------------------------------------------
+//void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
+//{
+//  AbstractFilter* filter = getFilter();
+//  if(nullptr == filter)
+//  {
+//    return;
+//  }
+
+//  bool reloadPath = false;
+//  DataArrayPath dcPath;
+//  if(!paths.empty())
+//  {
+//    dcPath = DataArrayPath(paths[0].getDataContainerName(), "", "");
+//  }
+
+//  for(int i = 0; i < paths.size(); i++)
+//  {
+//    bool valid = true;
+
+//    if(nullptr == filter->getDataContainerArray()->getAttributeMatrix(paths[i])->getAttributeArray(paths[i].getDataArrayName()))
+//    {
+//      valid = false;
+//    }
+
+//    if(!paths[i].isValid())
+//    {
+//      valid = false;
+//    }
+
+//    if(!valid)
+//    {
+//      const QString& pathName = paths[i].getDataArrayName();
+//      QList<QListWidgetItem*> invalidDataArrayWidgets = dataContainersOrderWidget->findItems(pathName, Qt::MatchExactly);
+//      for(const auto& invalidDataArrayWidget : invalidDataArrayWidgets)
+//      {
+//        invalidDataArrayWidget->setCheckState(Qt::Unchecked);
+//        dataContainersOrderWidget->removeItemWidget(invalidDataArrayWidgets);
+//      }
+
+//      paths.removeAt(i);
+//      i--;
+
+//      reloadPath = true;
+//    }
+//  }
+
+//  if(reloadPath && !dcPath.isEmpty())
+//  {
+//    dataContainersSelectWidget->clear(); // ???
+//    dataContainersOrderWidget->clear(); // ???
+//  }
+//}
+
+*/
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 6393c39f1d..b166b66d61 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -1,39 +1,38 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
-
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
@@ -41,14 +40,12 @@
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/SIMPLib.h"
 
-
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
-
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
@@ -58,93 +55,48 @@ class MultiDataContainerSelectionFilterParameter;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
-
-    ~MultiDataContainerSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief checkStringValues
-    * @param current
-    * @param filt
-    * @return
-    */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void on_upBtn_clicked();
-    void on_downBtn_clicked();
-    void on_selectBtn_clicked();
-    void on_deselectBtn_clicked();
-    void on_removeBtn_clicked();
-
-    void on_availableDataContainersListWidget_itemSelectionChanged();
-    void on_selectedDataContainersListWidget_itemSelectionChanged();
-
-    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
-
-  private:
-    bool m_DidCausePreflight;
-
-    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
-
-    void selectionChanged();
-
-    /**
-     * @brief clearNonexistantDataContainers
-     */
-    void clearNonexistantDataContainers();
-
-  public:
-    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~MultiDataContainerSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  const QString m_gridAMName{"Grid"};
+  MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+  static void syncItems(QListWidget*, const QStringList&, QStringList&);
+  static void validateDataContainerNames(const SVListWidget*, const QList<QString>&);
+
+public:
+  MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index d2c3783761..cd19f35d99 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -6,391 +6,147 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>583</width>
-    <height>247</height>
+    <width>596</width>
+    <height>282</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>2</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
    <property name="rightMargin">
     <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>2</number>
+    <number>0</number>
    </property>
-   <property name="spacing">
-    <number>4</number>
+   <property name="horizontalSpacing">
+    <number>8</number>
    </property>
-   <item row="1" column="3">
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="rightMargin">
-      <number>0</number>
-     </property>
-     <item>
-      <widget class="SVIconPushButton" name="upBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="downBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="removeBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <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>
-   </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="label_2">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Selected Data Containers</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label_3">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Available Data Containers</string>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
+   <item row="2" column="7">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
+     <property name="topMargin">
+      <number>0</number>
      </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="rightMargin">
       <number>0</number>
      </property>
      <item>
-      <spacer name="verticalSpacer_3">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_3">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Available Data Containers</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="SVListWidget" name="dataContainersSelectWidget">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="sizeAdjustPolicy">
+          <enum>QAbstractScrollArea::AdjustIgnored</enum>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragDrop</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::MoveAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
      <item>
-      <widget class="SVIconPushButton" name="selectBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="SVIconPushButton" name="deselectBtn">
-       <property name="minimumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="toolTip">
-        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="../../../../Resources/SIMPL.qrc">
-         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>24</width>
-         <height>24</height>
-        </size>
-       </property>
-       <property name="flat">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>40</height>
-        </size>
-       </property>
-      </spacer>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="label_2">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Selected Data Containers</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="SVListWidget" name="dataContainersOrderWidget">
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DragDrop</enum>
+         </property>
+         <property name="defaultDropAction">
+          <enum>Qt::MoveAction</enum>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::ExtendedSelection</enum>
+         </property>
+         <property name="sortingEnabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <widget class="SVListWidget" name="availableDataContainersListWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>1</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="sizeAdjustPolicy">
-      <enum>QAbstractScrollArea::AdjustIgnored</enum>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::NoDragDrop</enum>
-     </property>
-     <property name="defaultDropAction">
-      <enum>Qt::CopyAction</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="viewMode">
-      <enum>QListView::ListMode</enum>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="SVListWidget" name="selectedDataContainersListWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>1</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::NoDragDrop</enum>
-     </property>
-     <property name="defaultDropAction">
-      <enum>Qt::CopyAction</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::ExtendedSelection</enum>
-     </property>
-     <property name="viewMode">
-      <enum>QListView::ListMode</enum>
-     </property>
-     <property name="uniformItemSizes">
-      <bool>true</bool>
-     </property>
-     <property name="sortingEnabled">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>SVIconPushButton</class>
-   <extends>QPushButton</extends>
-   <header location="global">SVControlWidgets.h</header>
-  </customwidget>
   <customwidget>
    <class>SVListWidget</class>
    <extends>QListWidget</extends>
    <header location="global">SVControlWidgets.h</header>
   </customwidget>
  </customwidgets>
- <resources>
-  <include location="../../../../Resources/SIMPL.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

From 6f9e75342cf76c1205c571385d66e6f5aa86f09f Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Thu, 14 Feb 2019 11:35:00 -0500
Subject: [PATCH 038/397] Clang-format for tplatt/SIMPL/#1

Signed-off-by: Nathan Blair <nathan.blair@bluequartz.net>
---
 .../MultiDataContainerSelectionWidget.cpp     | 118 ++----------------
 .../MultiDataContainerSelectionWidget.h       |   1 -
 2 files changed, 7 insertions(+), 112 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 2afa4bbd33..5bd63a2c56 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -139,12 +139,12 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QStringList selectedDCs;
+  QStringList selectedDCs{nullptr};
   for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
   {
     selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
   }
-  QVariant var;
+  QVariant var{0};
   var.setValue(selectedDCs);
   if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
   {
@@ -166,11 +166,11 @@ void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& p
     if(oldPath.getDataContainerName() != newPath.getDataContainerName())
     {
       blockSignals(true);
-      for (const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      for(const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
         eachOrderDC->setText(newPath.getDataContainerName());
       }
-      for (const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      for(const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
       {
         eachOrderDC->setText(newPath.getDataContainerName());
       }
@@ -189,9 +189,8 @@ void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const
 {
   for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
   {
-    QString itemText{eachItem->text()};
-    bool listContainsItemText{list.contains(itemText)};
-    if (listContainsItemText)
+    QString itemText = eachItem->text();
+    if(list.contains(itemText))
     {
       newItems.removeOne(itemText);
       continue;
@@ -208,8 +207,7 @@ void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListW
   for(int i = 0; i < list->count(); i++)
   {
     QListWidgetItem* item = list->item(i);
-    QString name = item->text();
-    if(!compareList.contains(name))
+    if(!compareList.contains(item->text()))
     {
       item->setBackgroundColor(QColor(235, 110, 110));
     }
@@ -219,105 +217,3 @@ void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListW
     }
   }
 }
-
-/* Unused
-// -----------------------------------------------------------------------------
-// This doesn't appear to get used - disabling and will remove if nothing adverse happens at runtime
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
-//{
-//  setFilter(filter);
-//  setFilterParameter(parameter);
-//  setupGui();
-//}
-
-// -----------------------------------------------------------------------------
-// ???
-// -----------------------------------------------------------------------------
-//QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
-//{
-//  if(curDcName.isEmpty() && !filtDcName.isEmpty())
-//  {
-//    return filtDcName;
-//  }
-//  if(!curDcName.isEmpty() && filtDcName.isEmpty())
-//  {
-//    return curDcName;
-//  }
-//  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
-//  {
-//    return curDcName;
-//  }
-
-//  return filtDcName;
-//}
-
-// -----------------------------------------------------------------------------
-// TODO - does not appear to get used
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::dataContainerSelected(QString path)
-//{
-//  setSelectedPath(std::move(path));
-
-//  m_DidCausePreflight = true;
-//  emit parametersChanged();
-//  m_DidCausePreflight = false;
-//}
-
-// -----------------------------------------------------------------------------
-// Unlikely this has any use for top level data container list
-// -----------------------------------------------------------------------------
-//void MultiDataContainerSelectionWidget::removeNonexistantPaths(QVector<DataArrayPath>& paths)
-//{
-//  AbstractFilter* filter = getFilter();
-//  if(nullptr == filter)
-//  {
-//    return;
-//  }
-
-//  bool reloadPath = false;
-//  DataArrayPath dcPath;
-//  if(!paths.empty())
-//  {
-//    dcPath = DataArrayPath(paths[0].getDataContainerName(), "", "");
-//  }
-
-//  for(int i = 0; i < paths.size(); i++)
-//  {
-//    bool valid = true;
-
-//    if(nullptr == filter->getDataContainerArray()->getAttributeMatrix(paths[i])->getAttributeArray(paths[i].getDataArrayName()))
-//    {
-//      valid = false;
-//    }
-
-//    if(!paths[i].isValid())
-//    {
-//      valid = false;
-//    }
-
-//    if(!valid)
-//    {
-//      const QString& pathName = paths[i].getDataArrayName();
-//      QList<QListWidgetItem*> invalidDataArrayWidgets = dataContainersOrderWidget->findItems(pathName, Qt::MatchExactly);
-//      for(const auto& invalidDataArrayWidget : invalidDataArrayWidgets)
-//      {
-//        invalidDataArrayWidget->setCheckState(Qt::Unchecked);
-//        dataContainersOrderWidget->removeItemWidget(invalidDataArrayWidgets);
-//      }
-
-//      paths.removeAt(i);
-//      i--;
-
-//      reloadPath = true;
-//    }
-//  }
-
-//  if(reloadPath && !dcPath.isEmpty())
-//  {
-//    dataContainersSelectWidget->clear(); // ???
-//    dataContainersOrderWidget->clear(); // ???
-//  }
-//}
-
-*/
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index b166b66d61..0ed51088b5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -88,7 +88,6 @@ protected slots:
   void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
-  const QString m_gridAMName{"Grid"};
   MultiDataContainerSelectionFilterParameter* m_FilterParameter;
 
   static void syncItems(QListWidget*, const QStringList&, QStringList&);

From 2e90c314c15f6b70713f1f6e1e8a57836b048020 Mon Sep 17 00:00:00 2001
From: Nathan Blair <nathan.blair@bluequartz.net>
Date: Thu, 14 Feb 2019 13:09:30 -0500
Subject: [PATCH 039/397] Fixed wrong initial list population on setupGui

---
 .../MultiDataContainerSelectionWidget.cpp                    | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 5bd63a2c56..321229ab8e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -86,10 +86,7 @@ void MultiDataContainerSelectionWidget::setupGui()
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  for(const auto& eachDC : getFilterParameter()->getDefaultValue().toStringList())
-  {
-    dataContainersOrderWidget->addItem(eachDC);
-  }
+  dataContainersSelectWidget->addItems(getFilterParameter()->getDefaultValue().toStringList());
 }
 
 // -----------------------------------------------------------------------------

From 63e541bbfa6e2e8771e9e1890891c7fe6d43f03c Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 15 Feb 2019 12:38:46 -0500
Subject: [PATCH 040/397] Revert "WIP Merge in @nathanblair work on
 MultiDataContainerFP" (#2)

---
 ...iDataContainerSelectionFilterParameter.cpp |  26 +-
 ...ltiDataContainerSelectionFilterParameter.h |  12 +-
 .../MultiDataContainerSelectionWidget.cpp     | 490 ++++++++++++++----
 .../MultiDataContainerSelectionWidget.h       | 205 +++++---
 .../MultiDataContainerSelectionWidget.ui      | 462 +++++++++++++----
 5 files changed, 886 insertions(+), 309 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index e1dce99f01..08cfb2a218 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -60,6 +60,7 @@ MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionF
                                                                                             Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                                                                                           const RequirementType req, int groupIndex)
 {
+
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
@@ -93,7 +94,7 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
 	AttributeMatrix::Category attributeMatrixCategory)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+	typedef QVector<size_t> QVectorOfSizeType;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	AttributeMatrix::Types amTypes;
 	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -139,7 +140,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
 	IGeometry::Type geometryType)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+	typedef QVector<size_t> QVectorOfSizeType;
 	MultiDataContainerSelectionFilterParameter::RequirementType req;
 	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
 	{
@@ -171,11 +172,12 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   {
     QJsonArray arrayObj = jsonValue.toArray();
     QStringList dcList;
-    for (const auto &eachDCObj : arrayObj)
+    for(int i = 0; i < arrayObj.size(); i++)
     {
-      QJsonObject obj = eachDCObj.toObject();
-      dcList.push_back(obj["Data Container Name"].toString());
+      QString dcName = arrayObj.at(i).toString();
+      dcList.push_back(dcName);
     }
+
     m_SetterCallback(dcList);
   }
 }
@@ -190,11 +192,10 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
     QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for (const auto &eachDCName : dcList)
+    for(int i = 0; i < dcList.size(); i++)
     {
-      QJsonObject obj;
-      obj["Data Container Name"] = eachDCName;
-      arrayObj.push_back(obj);
+      QString dcName = dcList[i];
+      arrayObj.push_back(dcName);
     }
 
     json[getPropertyName()] = arrayObj;
@@ -211,13 +212,14 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   std::tie(oldPath, newPath) = renamePath;
 
   QStringList dcList = m_GetterCallback();
+  int count = dcList.size();
   bool updated = false;
 
-  for (auto &eachDCName : dcList)
+  for(int i = 0; i < count; i++)
   {
-    if (eachDCName == oldPath.getDataContainerName())
+    if(dcList[i] == oldPath.getDataContainerName())
     {
-      eachDCName = newPath.getDataContainerName();
+      dcList[i] = newPath.getDataContainerName();
       updated = true;
     }
   }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 95460f4b9a..4233aa31df 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -1,4 +1,3 @@
-#pragma once
 /* ============================================================================
 * Copyright (c) 2009-2016 BlueQuartz Software, LLC
 *
@@ -34,9 +33,13 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#pragma once
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
@@ -91,9 +94,9 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      * @param category The category for the filter parameter in the DREAM.3D user interface.  There
      * are three categories: Parameter, Required Arrays, and Created Arrays.
      * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-     * that this FilterParameter subclass represents.
+    * that this FilterParameter subclass represents.
      * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-     * that this FilterParameter subclass represents.
+    * that this FilterParameter subclass represents.
      * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
      * user interface.
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
@@ -154,7 +157,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QVector<size_t>>, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -190,3 +193,4 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 321229ab8e..fd4cd98b10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -1,45 +1,43 @@
-#include <utility>
-
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QMetaProperty>
-#include <QtCore/QModelIndex>
 #include <QtCore/QSignalMapper>
+#include <QtCore/QModelIndex>
 
 #include <QtGui/QStandardItemModel>
 
@@ -57,160 +55,440 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerFilterParameter object");
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
 
   setupUi(this);
   setupGui();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_DidCausePreflight(false)
+{
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 MultiDataContainerSelectionWidget::~MultiDataContainerSelectionWidget() = default;
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::setupGui()
 {
   // Sanity Check the filter and the filter parameter
-  if(getFilter() == nullptr) // Trivial
+  if(getFilter() == nullptr)
   {
     return;
   }
-  if(getFilterParameter() == nullptr) // Trivial
+  if(getFilterParameter() == nullptr)
   {
     return;
   }
 
+  selectedDataContainersListWidget->installEventFilter(this);
+  availableDataContainersListWidget->installEventFilter(this);
+
+  // Generate the text for the QLabel
+  //label->setText(getFilterParameter()->getHumanLabel());
+
+  // Lastly, hook up the filter's signals and slots to our own signals and slots
+  // Catch when the filter is about to execute the preflight
   connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
   connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataContainerName(QString, DataArrayPath::RenameType)));
 
-  dataContainersSelectWidget->addItems(getFilterParameter()->getDefaultValue().toStringList());
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
+    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+
+  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
+  for (int i=0; i<dcNames.size(); i++)
+  {
+    QString dcName = dcNames[i];
+    QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
+    selectedDataContainersListWidget->addItem(item);
+  }
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
 }
 
 // -----------------------------------------------------------------------------
-// Slot callbacks
+//
 // -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
 // -----------------------------------------------------------------------------
-// Validate containers in each list are in the filter data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::beforePreflight()
+bool MultiDataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 {
-  if(nullptr == getFilter())
+  if(event->type() == QEvent::FocusIn && obj == selectedDataContainersListWidget)
   {
-    return;
+    on_selectedDataContainersListWidget_itemSelectionChanged();
   }
-
-  if(nullptr == getFilter()->getDataContainerArray().get())
+  else if(event->type() == QEvent::FocusIn && obj == availableDataContainersListWidget)
   {
-    return;
+    on_availableDataContainersListWidget_itemSelectionChanged();
   }
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_selectBtn_clicked();
+}
 
-  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
-  for(const auto& eachDC : getFilter()->getDataContainerArray()->getDataContainerNames())
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item)
+{
+  on_deselectBtn_clicked();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
+{
+  QModelIndexList indexList = availableDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
   {
-    dcNames.push_back(eachDC);
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
+      offset++;
+      if(item != nullptr)
+      {
+        selectedDataContainersListWidget->addItem(item);
+      }
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
+}
 
-  validateDataContainerNames(dataContainersSelectWidget, dcNames);
-  validateDataContainerNames(dataContainersOrderWidget, dcNames);
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
+{
+  // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
+  foreach(QListWidgetItem* item, items)
+  {
+    int row = selectedDataContainersListWidget->row(item);
+    selectedDataContainersListWidget->takeItem(row);
+    availableDataContainersListWidget->addItem(item);
+  }
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
 }
 
 // -----------------------------------------------------------------------------
-// Populate and syncronize the lists
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::afterPreflight()
+void MultiDataContainerSelectionWidget::on_upBtn_clicked()
 {
-  QStringList dcNames{getFilter()->getDataContainerArray()->getDataContainerNames()};
-  QStringList newItems{dcNames};
+  int currentIndex = selectedDataContainersListWidget->currentRow();
 
-  syncItems(dataContainersSelectWidget, dcNames, newItems);
-  syncItems(dataContainersOrderWidget, dcNames, newItems);
+  if(currentIndex > 0)
+  {
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex - 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
 
-  dataContainersSelectWidget->addItems(newItems);
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
+  }
 }
 
 // -----------------------------------------------------------------------------
-// Set the filter's active data containers or notify that parameter is missing
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+void MultiDataContainerSelectionWidget::on_downBtn_clicked()
 {
-  QStringList selectedDCs{nullptr};
-  for(int itemIndex = 0; itemIndex < dataContainersOrderWidget->count(); itemIndex++)
+  int currentIndex = selectedDataContainersListWidget->currentRow();
+
+  if(currentIndex < selectedDataContainersListWidget->count() - 1)
   {
-    selectedDCs.push_back(dataContainersOrderWidget->item(itemIndex)->text());
+    QListWidgetItem* item = selectedDataContainersListWidget->takeItem(currentIndex);
+    selectedDataContainersListWidget->insertItem(currentIndex + 1, item);
+    selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
-  QVariant var{0};
-  var.setValue(selectedDCs);
-  if(!filter->setProperty(PROPERTY_NAME_AS_CHAR, var))
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
+{
+  QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
+  if(!indexList.empty())
   {
-    getFilter()->notifyMissingProperty(getFilterParameter());
+    int offset = 0;
+    for (int i=0; i<indexList.size(); i++)
+    {
+      int row = indexList[i].row() - offset;
+      QListWidgetItem* item = selectedDataContainersListWidget->item(row);
+      selectedDataContainersListWidget->removeItemWidget(item);
+      delete item;
+      offset++;
+    }
+
+    m_DidCausePreflight = true;
+    emit parametersChanged();
+    m_DidCausePreflight = false;
   }
 }
 
 // -----------------------------------------------------------------------------
-// Update the name of a data container in the appropriate list widget
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
+void MultiDataContainerSelectionWidget::selectionChanged()
 {
-  DataArrayPath oldPath;
-  DataArrayPath newPath;
-  std::tie(oldPath, newPath) = renamePath;
+  upBtn->setDisabled(true);
+  downBtn->setDisabled(true);
+  selectBtn->setDisabled(true);
+  deselectBtn->setDisabled(true);
+  removeBtn->hide();
+
+  int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
+  int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
+
+  if (selectSize > 0)
+  {
+    selectBtn->setEnabled(true);
+  }
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if (orderSize > 0)
   {
-    if(oldPath.getDataContainerName() != newPath.getDataContainerName())
+    deselectBtn->setEnabled(true);
+
+    if (orderSize == 1)
     {
-      blockSignals(true);
-      for(const auto& eachOrderDC : dataContainersOrderWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
-      {
-        eachOrderDC->setText(newPath.getDataContainerName());
-      }
-      for(const auto& eachOrderDC : dataContainersSelectWidget->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive))
+      upBtn->setEnabled(true);
+      downBtn->setEnabled(true);
+    }
+
+    bool allErrorRows = true;
+    for (int i=0; i<orderSize; i++)
+    {
+      int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
+      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
       {
-        eachOrderDC->setText(newPath.getDataContainerName());
+        allErrorRows = false;
       }
-      blockSignals(false);
+    }
+
+    if(allErrorRows)
+    {
+      removeBtn->show();
     }
   }
 }
 
 // -----------------------------------------------------------------------------
-// Helper Methods
+//
 // -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::on_availableDataContainersListWidget_itemSelectionChanged()
+{
+  selectionChanged();
+}
+
 // -----------------------------------------------------------------------------
-// Sync list widgets with updated data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::syncItems(QListWidget* listWidget, const QStringList& list, QStringList& newItems)
+void MultiDataContainerSelectionWidget::on_selectedDataContainersListWidget_itemSelectionChanged()
 {
-  for(const auto& eachItem : listWidget->findItems("*", Qt::MatchFlag::MatchWildcard))
-  {
-    QString itemText = eachItem->text();
-    if(list.contains(itemText))
-    {
-      newItems.removeOne(itemText);
-      continue;
-    }
-    delete listWidget->takeItem(listWidget->row(eachItem));
-  }
+  selectionChanged();
 }
 
 // -----------------------------------------------------------------------------
-// Validate ListWidget item exists in data container array
+//
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionWidget::validateDataContainerNames(const SVListWidget* list, const QList<QString>& compareList)
+void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
 {
-  for(int i = 0; i < list->count(); i++)
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
   {
-    QListWidgetItem* item = list->item(i);
-    if(!compareList.contains(item->text()))
+    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
     {
-      item->setBackgroundColor(QColor(235, 110, 110));
+      QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
     }
-    else
+  }
+
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
     {
-      item->setBackgroundColor(QColor(255, 255, 255));
+      QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
+      delete item;
+      i--;
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+
+  clearNonexistantDataContainers();
+
+  // Previously in afterPreflight()
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QList<QString> dcNames = dca->getDataContainerNames();
+
+  QList<QString> selectListNames;
+  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  {
+	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
+  }
+
+  QList<QString> orderListNames;
+  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
+	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
+	  QString name = item->text();
+	  orderListNames.append(name);
+	  if (!dcNames.contains(name))
+	  {
+		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+		  // item->setBackgroundColor(QColor(235, 110, 110));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
+	  }
+	  else
+	  {
+		  // item->setBackgroundColor(QColor(255, 255, 255));
+		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
+	  }
+  }
+
+  for (int i = 0; i < dcNames.size(); i++)
+  {
+	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
+	  {
+		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
+		  availableDataContainersListWidget->addItem(item);
+	  }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::afterPreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  QStringList dcNames;
+	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+	{
+    dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
+	}
+
+	// Generate the path to the AttributeArray
+	QVariant var;
+  var.setValue(dcNames);
+	bool ok = false;
+	// Set the value into the Filter
+	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
+	if (!ok)
+	{
+		getFilter()->notifyMissingProperty(getFilterParameter());
+	}
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 0ed51088b5..6393c39f1d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -1,38 +1,39 @@
-#pragma once
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
 
 #include <QtCore/QObject>
 #include <QtCore/QPointer>
@@ -40,12 +41,14 @@
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
 
-#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+
 
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
@@ -55,47 +58,93 @@ class MultiDataContainerSelectionFilterParameter;
 class QSignalMapper;
 
 /**
- * @brief
- * @author
- * @version
- */
+* @brief
+* @author
+* @version
+*/
 class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
 {
-  Q_OBJECT
-
-public:
-  /**
-   * @brief Constructor
-   * @param parameter The FilterParameter object that this widget represents
-   * @param filter The instance of the filter that this parameter is a part of
-   * @param parent The parent QWidget for this Widget
-   */
-  MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-  ~MultiDataContainerSelectionWidget() override;
-
-  /**
-   * @brief This method does additional GUI widget connections
-   */
-  void setupGui() override;
-
-public slots:
-  void beforePreflight();
-  void afterPreflight();
-  void filterNeedsInputParameters(AbstractFilter* filter);
-
-protected slots:
-  void updateDataContainerName(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
-
-private:
-  MultiDataContainerSelectionFilterParameter* m_FilterParameter;
-
-  static void syncItems(QListWidget*, const QStringList&, QStringList&);
-  static void validateDataContainerNames(const SVListWidget*, const QList<QString>&);
-
-public:
-  MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
-  MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
-  MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-  MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+    Q_OBJECT
+
+  public:
+    /**
+    * @brief Constructor
+    * @param parameter The FilterParameter object that this widget represents
+    * @param filter The instance of the filter that this parameter is a part of
+    * @param parent The parent QWidget for this Widget
+    */
+    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+    ~MultiDataContainerSelectionWidget() override;
+
+    /**
+    * @brief This method does additional GUI widget connections
+    */
+    void setupGui() override;
+
+    /**
+    * @brief checkStringValues
+    * @param current
+    * @param filt
+    * @return
+    */
+    QString checkStringValues(QString current, QString filtDcName);
+
+    /**
+    * @brief initializeWidget
+    * @param parameter
+    * @param filter
+    */
+    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+    /**
+     * @brief eventFilter
+     * @param obj
+     * @param event
+     * @return
+     */
+    bool eventFilter(QObject* obj, QEvent* event) override;
+
+  public slots:
+    void beforePreflight();
+    void afterPreflight();
+    void filterNeedsInputParameters(AbstractFilter* filter);
+
+  protected slots:
+    void on_upBtn_clicked();
+    void on_downBtn_clicked();
+    void on_selectBtn_clicked();
+    void on_deselectBtn_clicked();
+    void on_removeBtn_clicked();
+
+    void on_availableDataContainersListWidget_itemSelectionChanged();
+    void on_selectedDataContainersListWidget_itemSelectionChanged();
+
+    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+
+  private:
+    bool m_DidCausePreflight;
+
+    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+    void selectionChanged();
+
+    /**
+     * @brief clearNonexistantDataContainers
+     */
+    void clearNonexistantDataContainers();
+
+  public:
+    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
+    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
+    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
+
+
+
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index cd19f35d99..d2c3783761 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -6,147 +6,391 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>596</width>
-    <height>282</height>
+    <width>583</width>
+    <height>247</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout" columnstretch="1,0,0,0">
    <property name="leftMargin">
     <number>2</number>
    </property>
    <property name="topMargin">
-    <number>0</number>
+    <number>2</number>
    </property>
    <property name="rightMargin">
     <number>2</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>8</number>
-   </property>
-   <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <item row="2" column="7">
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetDefaultConstraint</enum>
-     </property>
-     <property name="topMargin">
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="3">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="rightMargin">
       <number>0</number>
      </property>
+     <item>
+      <widget class="SVIconPushButton" name="upBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array up in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="downBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move an array down in the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset>
+         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="removeBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to remove non-existant arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/delete.png</normaloff>:/SIMPL/icons/images/delete.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <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>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Selected Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Available Data Containers</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
      <property name="rightMargin">
       <number>0</number>
      </property>
      <item>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_3">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Available Data Containers</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="SVListWidget" name="dataContainersSelectWidget">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="sizeAdjustPolicy">
-          <enum>QAbstractScrollArea::AdjustIgnored</enum>
-         </property>
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragDrop</enum>
-         </property>
-         <property name="defaultDropAction">
-          <enum>Qt::MoveAction</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <spacer name="verticalSpacer_3">
+       <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="QVBoxLayout" name="verticalLayout">
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="label_2">
-         <property name="font">
-          <font>
-           <weight>75</weight>
-           <bold>true</bold>
-          </font>
-         </property>
-         <property name="text">
-          <string>Selected Data Containers</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="SVListWidget" name="dataContainersOrderWidget">
-         <property name="editTriggers">
-          <set>QAbstractItemView::NoEditTriggers</set>
-         </property>
-         <property name="dragEnabled">
-          <bool>true</bool>
-         </property>
-         <property name="dragDropMode">
-          <enum>QAbstractItemView::DragDrop</enum>
-         </property>
-         <property name="defaultDropAction">
-          <enum>Qt::MoveAction</enum>
-         </property>
-         <property name="selectionMode">
-          <enum>QAbstractItemView::ExtendedSelection</enum>
-         </property>
-         <property name="sortingEnabled">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="SVIconPushButton" name="selectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays into the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_right.png</normaloff>:/SIMPL/icons/images/arrow_right.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="SVIconPushButton" name="deselectBtn">
+       <property name="minimumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="toolTip">
+        <string>Use this button to move arrays out of the &quot;Selected Data Arrays&quot; column</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_left.png</normaloff>:/SIMPL/icons/images/arrow_left.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>24</width>
+         <height>24</height>
+        </size>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Expanding</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">
+    <widget class="SVListWidget" name="availableDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QAbstractScrollArea::AdjustIgnored</enum>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="SVListWidget" name="selectedDataContainersListWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::NoDragDrop</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::CopyAction</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>false</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::ListMode</enum>
+     </property>
+     <property name="uniformItemSizes">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
   <customwidget>
    <class>SVListWidget</class>
    <extends>QListWidget</extends>
    <header location="global">SVControlWidgets.h</header>
   </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
  <connections/>
 </ui>

From 153fba37813ddcb4488f4b4106c810d52f045dca Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sun, 17 Feb 2019 11:11:27 -0500
Subject: [PATCH 041/397] Missed conflict markers from last merge/rebase

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidget.cpp                 | 99 +++++++++++++++++++
 .../FilterParameterWidget.h                   | 16 +++
 .../ImportHDF5DatasetWidget.cpp               | 36 -------
 .../ImportHDF5DatasetWidget.h                 |  8 ++
 4 files changed, 123 insertions(+), 36 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index f4735ac2ca..3049c3ae35 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -422,6 +422,105 @@ void FilterParameterWidget::hideBorder()
   setStyleSheet("");
 }
 
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool FilterParameterWidget::verifyPathExists(QString filePath, QLineEdit* lineEdit)
+{
+  hasValidFilePath(filePath);
+  QFileInfo fileinfo(filePath);
+  if(!fileinfo.exists())
+  {
+    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
+  }
+  else
+  {
+    SVStyle::Instance()->LineEditClearStyle(lineEdit);
+  }
+  return fileinfo.exists();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool FilterParameterWidget::hasValidFilePath(const QString &filePath)
+{
+  QStringList pathParts = filePath.split(QDir::separator());
+  if(pathParts.empty())
+  {
+    return false;
+  }
+
+  QString pathBuildUp;
+  QFileInfo fi(filePath);
+
+  /* This block of code figures out, based on the current OS, how the built-up path should begin.
+   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
+   * For Windows, it should start with a path part for both absolute and relative paths.
+   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
+  {
+#if defined(Q_OS_WIN)
+  /* If there is at least one part, then add it to the pathBuildUp variable.
+    A valid Windows path, absolute or relative, has to have at least one part. */
+  if (pathParts[0].isEmpty() == false)
+  {
+    pathBuildUp.append(pathParts[0]);
+  }
+  else
+  {
+    return false;
+  }
+#else
+  /* If the first part is empty and the filePath is absolute, then that means that
+   * we are starting with the root directory and need to add it to our pathBuildUp */
+  if (pathParts[0].isEmpty() && fi.isAbsolute())
+  {
+    pathBuildUp.append(QDir::separator());
+  }
+  /* If the first part is empty and the filePath is relative, then that means that
+   * we are starting with the first folder part and need to add that to our pathBuildUp */
+  else if(!pathParts[0].isEmpty() && fi.isRelative())
+  {
+    pathBuildUp.append(pathParts[0] + QDir::separator());
+  }
+  else
+  {
+    return false;
+  }
+#endif
+  }
+
+  /* Now that we have started our built-up path, continue adding to the built-up path
+   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
+  bool valid = false;
+
+  QFileInfo buildingFi(pathBuildUp);
+  size_t pathPartsIdx = 1; // We already processed the first path part above
+  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
+  {
+    valid = true;
+    m_CurrentlyValidPath = pathBuildUp; // Save the most current, valid built-up path
+
+    // If there's another path part to add, add it to the end of the built-up path
+    if (pathPartsIdx < pathParts.size())
+    {
+      /* If the built-up path doesn't already have a separator on the end, add one. */
+      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
+      {
+        pathBuildUp.append(QDir::separator());
+      }
+
+      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
+      buildingFi.setFile(pathBuildUp);
+    }
+    pathPartsIdx++;
+  }
+
+  return valid;
+}
+
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 7bbfcf3cdc..0d68afa0e4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -149,6 +149,22 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
      */
     QPoint adjustedMenuPosition(QToolButton *pushButton);
 
+    /**
+     * @brief hasValidFilePath
+     * @param filePath
+     * @return
+     */
+    bool hasValidFilePath(const QString &filePath);
+
+    /**
+     * @brief verifyPathExists
+     * @param filePath
+     * @param lineEdit
+     * @return
+     */
+    bool verifyPathExists(QString filePath, QLineEdit* lineEdit);
+
+
   protected slots:
     void showBorder();
     void hideBorder();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 21ed529cdf..9db2cc2ce8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -396,7 +396,6 @@ void ImportHDF5DatasetWidget::initializeHDF5Paths()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-<<<<<<< HEAD
 bool ImportHDF5DatasetWidget::verifyPathExists(const QString& filePath, QtSLineEdit* lineEdit)
 {
   QFileInfo fileinfo(filePath);
@@ -410,20 +409,6 @@ bool ImportHDF5DatasetWidget::verifyPathExists(const QString& filePath, QtSLineE
     style->LineEditClearStyle(lineEdit);
   }
   return fileinfo.exists();
-=======
-void ImportHDF5DatasetWidget::on_value_fileDropped(const QString& text)
-{
-  m_OpenDialogLastDirectory = text;
-
-  // Set/Remove the red outline if the file does exist
-  if(QtSFileUtils::VerifyPathExists(text, dynamic_cast<QLineEdit*>(value)))
-  {
-    if(initWithFile(text))
-    {
-      emit parametersChanged();
-    }
-  }
->>>>>>> Moving a few functions out of FilterParameterWidget and into QtSFileUtils, so that we can use those functions in our standalone TileListWidget.
 }
 
 // -----------------------------------------------------------------------------
@@ -441,28 +426,7 @@ void ImportHDF5DatasetWidget::on_selectBtn_clicked()
 
   file = QDir::toNativeSeparators(file);
 
-<<<<<<< HEAD
   setValue(file);
-=======
-  if(initWithFile(file))
-  {
-    value->setText(file);
-    emit parametersChanged();
-  }
-
-  // Store the last used directory into the private instance variable
-  QFileInfo fi(file);
-  m_OpenDialogLastDirectory = fi.path();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImportHDF5DatasetWidget::on_showLocationBtn_clicked()
-{
-  QtSFileUtils::HasValidFilePath(value->text());
-  showFileInFileSystem();
->>>>>>> Moving a few functions out of FilterParameterWidget and into QtSFileUtils, so that we can use those functions in our standalone TileListWidget.
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index 725dae7552..7537c770ab 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -74,6 +74,14 @@ class SVWidgetsLib_EXPORT ImportHDF5DatasetWidget : public FilterParameterWidget
   void setIcon(const QPixmap& path);
   QPixmap getIcon();
 
+  /**
+   * @brief verifyPathExists
+   * @param filePath
+   * @param lineEdit
+   * @return
+   */
+  bool verifyPathExists(const QString& filePath, QtSLineEdit* lineEdit);
+
 public slots:
   void beforePreflight();
   void afterPreflight();

From 5f148765a99a50a366c3e510c2899e6c5ccc2eed Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 18 Feb 2019 09:48:35 -0500
Subject: [PATCH 042/397] Move hasValidFilePath to public section.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidgets/FilterParameterWidget.h  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 0d68afa0e4..7bde20af77 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -140,6 +140,13 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
      */
     virtual void loadData();
 
+    /**
+     * @brief hasValidFilePath
+     * @param filePath
+     * @return
+     */
+    bool hasValidFilePath(const QString &filePath);
+
   protected:
 
     /**
@@ -149,12 +156,6 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
      */
     QPoint adjustedMenuPosition(QToolButton *pushButton);
 
-    /**
-     * @brief hasValidFilePath
-     * @param filePath
-     * @return
-     */
-    bool hasValidFilePath(const QString &filePath);
 
     /**
      * @brief verifyPathExists

From d2d82c0b2184a4e484315ed50fa1c5434d83c43e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 18 Feb 2019 10:06:08 -0500
Subject: [PATCH 043/397] Missed updates to FilterParameterWidget

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidget.cpp                 | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index f4735ac2ca..3049c3ae35 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -422,6 +422,105 @@ void FilterParameterWidget::hideBorder()
   setStyleSheet("");
 }
 
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool FilterParameterWidget::verifyPathExists(QString filePath, QLineEdit* lineEdit)
+{
+  hasValidFilePath(filePath);
+  QFileInfo fileinfo(filePath);
+  if(!fileinfo.exists())
+  {
+    SVStyle::Instance()->LineEditErrorStyle(lineEdit);
+  }
+  else
+  {
+    SVStyle::Instance()->LineEditClearStyle(lineEdit);
+  }
+  return fileinfo.exists();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool FilterParameterWidget::hasValidFilePath(const QString &filePath)
+{
+  QStringList pathParts = filePath.split(QDir::separator());
+  if(pathParts.empty())
+  {
+    return false;
+  }
+
+  QString pathBuildUp;
+  QFileInfo fi(filePath);
+
+  /* This block of code figures out, based on the current OS, how the built-up path should begin.
+   * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
+   * For Windows, it should start with a path part for both absolute and relative paths.
+   * A "path part" is defined as a portion of string that is delimited by separators in a typical path. */
+  {
+#if defined(Q_OS_WIN)
+  /* If there is at least one part, then add it to the pathBuildUp variable.
+    A valid Windows path, absolute or relative, has to have at least one part. */
+  if (pathParts[0].isEmpty() == false)
+  {
+    pathBuildUp.append(pathParts[0]);
+  }
+  else
+  {
+    return false;
+  }
+#else
+  /* If the first part is empty and the filePath is absolute, then that means that
+   * we are starting with the root directory and need to add it to our pathBuildUp */
+  if (pathParts[0].isEmpty() && fi.isAbsolute())
+  {
+    pathBuildUp.append(QDir::separator());
+  }
+  /* If the first part is empty and the filePath is relative, then that means that
+   * we are starting with the first folder part and need to add that to our pathBuildUp */
+  else if(!pathParts[0].isEmpty() && fi.isRelative())
+  {
+    pathBuildUp.append(pathParts[0] + QDir::separator());
+  }
+  else
+  {
+    return false;
+  }
+#endif
+  }
+
+  /* Now that we have started our built-up path, continue adding to the built-up path
+   * until either the built-up path is invalid, or until we have processed all remaining path parts. */
+  bool valid = false;
+
+  QFileInfo buildingFi(pathBuildUp);
+  size_t pathPartsIdx = 1; // We already processed the first path part above
+  while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
+  {
+    valid = true;
+    m_CurrentlyValidPath = pathBuildUp; // Save the most current, valid built-up path
+
+    // If there's another path part to add, add it to the end of the built-up path
+    if (pathPartsIdx < pathParts.size())
+    {
+      /* If the built-up path doesn't already have a separator on the end, add one. */
+      if (pathBuildUp[pathBuildUp.size() - 1] != QDir::separator())
+      {
+        pathBuildUp.append(QDir::separator());
+      }
+
+      pathBuildUp.append(pathParts[pathPartsIdx]);  // Add the next path part to the built-up path
+      buildingFi.setFile(pathBuildUp);
+    }
+    pathPartsIdx++;
+  }
+
+  return valid;
+}
+
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------

From f81b6addda88814100e805fedac143ebaa13c066 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 18 Feb 2019 11:19:23 -0500
Subject: [PATCH 044/397] Adding private ApplyImageTransforms filter.

---
 .../CoreFilters/ApplyImageTransforms.cpp      | 248 ++++++++++++++++++
 .../CoreFilters/ApplyImageTransforms.h        | 167 ++++++++++++
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../Testing/Cxx/ApplyImageTransformsTest.cpp  |  99 +++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 .../CoreFilters/ApplyImageTransforms.md       |  36 +++
 6 files changed, 552 insertions(+)
 create mode 100644 Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ApplyImageTransforms.md

diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
new file mode 100644
index 0000000000..df52f2300d
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -0,0 +1,248 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ApplyImageTransforms.h"
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/TransformContainer.h"
+
+#include "SIMPLib/SIMPLibVersion.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ApplyImageTransforms::ApplyImageTransforms()
+: AbstractFilter()
+{
+  initialize();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ApplyImageTransforms::~ApplyImageTransforms() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::initialize()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+  setCancel(false);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::setupFilterParameters()
+{
+  FilterParameterVector parameters;
+
+  {
+    MultiDataContainerSelectionFilterParameter::RequirementType req =
+        MultiDataContainerSelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Cell, IGeometry::Type::Image);
+    parameters.push_back(SIMPL_NEW_MDC_SELECTION_FP("Image Data Containers", ImageDataContainers, FilterParameter::RequiredArray, ApplyImageTransforms, req));
+  }
+
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::dataCheck()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+
+  int selectedDCCount = getImageDataContainers().size();
+  if(selectedDCCount < 1)
+  {
+    setErrorCondition(-11001);
+    QString ss = QObject::tr("At least one Data Container must be selected");
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    return;
+  }
+
+  for(int i = 0; i < selectedDCCount; i++)
+  {
+    QString dcName = m_ImageDataContainers[i];
+
+    ImageGeom::Pointer imageGeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, dcName);
+    if(getErrorCondition() < 0)
+    {
+      return;
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::preflight()
+{
+  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
+  setInPreflight(true);              // Set the fact that we are preflighting.
+  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
+  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
+  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
+  emit preflightExecuted();          // We are done preflighting this filter
+  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::execute()
+{
+  initialize();
+  dataCheck();
+  if(getErrorCondition() < 0)
+  {
+    return;
+  }
+
+  int selectedDCCount = getImageDataContainers().size();
+  for(int i = 0; i < selectedDCCount; i++)
+  {
+    QString dcName = m_ImageDataContainers[i];
+
+    DataContainer::Pointer dc = getDataContainerArray()->getDataContainer(dcName);
+    ImageGeom::Pointer imageGeom = dc->getGeometryAs<ImageGeom>();
+
+    float origin[3] = {0.0f, 0.0f, 0.0f};
+    imageGeom->getOrigin(origin);
+
+    ::ITransformContainer::Pointer iTransformContainer = imageGeom->getTransformContainer();
+    if (iTransformContainer)
+    {
+      TransformContainer::Pointer transformContainer = std::dynamic_pointer_cast<TransformContainer>(iTransformContainer);
+      if (transformContainer)
+      {
+        TransformContainer::TransformParametersType parameters = transformContainer->getParameters();
+
+        double xTranslation = parameters[9];
+        double yTranslation = parameters[10];
+
+        origin[0] = origin[0] - xTranslation;
+        origin[1] = origin[1] - yTranslation;
+
+        imageGeom->setOrigin(origin);
+
+        parameters[9] = 0;
+        parameters[10] = 0;
+        transformContainer->setParameters(parameters);
+      }
+    }
+  }
+
+  notifyStatusMessage(getHumanLabel(), "Complete");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer ApplyImageTransforms::newFilterInstance(bool copyFilterParameters) const
+{
+  ApplyImageTransforms::Pointer filter = ApplyImageTransforms::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getBrandingString() const
+{
+  return "Processing";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getGroupName() const
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::ImageFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ApplyImageTransforms::getHumanLabel() const
+{
+  return "Apply Image Transforms";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QUuid ApplyImageTransforms::getUuid()
+{
+  return QUuid("{a4bd18bc-3306-5e41-bc41-4cb4248226bd}");
+}
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
new file mode 100644
index 0000000000..2ceeced4e2
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -0,0 +1,167 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+/**
+ * @brief The ApplyImageTransforms class. See [Filter documentation](@ref applyimagetransforms) for details.
+ */
+class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
+{
+  Q_OBJECT
+
+  public:
+    SIMPL_SHARED_POINTERS(ApplyImageTransforms)
+    SIMPL_FILTER_NEW_MACRO(ApplyImageTransforms)
+    SIMPL_TYPE_MACRO_SUPER(ApplyImageTransforms, AbstractFilter)
+
+    ~ApplyImageTransforms() override;
+
+    SIMPL_FILTER_PARAMETER(QStringList, ImageDataContainers)
+    Q_PROPERTY(QStringList ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
+
+    /**
+     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+     */
+    const QString getCompiledLibraryName() const override;
+
+    /**
+     * @brief getBrandingString Returns the branding string for the filter, which is a tag
+     * used to denote the filter's association with specific plugins
+     * @return Branding string
+    */
+    const QString getBrandingString() const override;
+
+    /**
+     * @brief getFilterVersion Returns a version string for this filter. Default
+     * value is an empty string.
+     * @return
+     */
+    const QString getFilterVersion() const override;
+
+    /**
+     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+     */
+    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+    /**
+     * @brief getGroupName Reimplemented from @see AbstractFilter class
+     */
+    const QString getGroupName() const override;
+
+    /**
+     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+     */
+    const QString getSubGroupName() const override;
+
+    /**
+     * @brief getUuid Return the unique identifier for this filter.
+     * @return A QUuid object.
+     */
+    const QUuid getUuid() override;
+  
+    /**
+     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+     */
+    const QString getHumanLabel() const override;
+
+    /**
+     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+     */
+    void setupFilterParameters() override;
+
+    /**
+     * @brief execute Reimplemented from @see AbstractFilter class
+     */
+    void execute() override;
+
+    /**
+    * @brief preflight Reimplemented from @see AbstractFilter class
+    */
+    void preflight() override;
+
+  signals:
+    /**
+     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+     * be pushed from a user-facing control (such as a widget)
+     * @param filter Filter instance pointer 
+     */
+    void updateFilterParameters(AbstractFilter* filter);
+
+    /**
+     * @brief parametersChanged Emitted when any Filter parameter is changed internally
+     */
+    void parametersChanged();
+
+    /**
+     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+     */
+    void preflightAboutToExecute();
+
+    /**
+     * @brief preflightExecuted Emitted just after calling dataCheck()
+     */
+    void preflightExecuted();
+
+  protected:
+    ApplyImageTransforms();
+
+    /**
+    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+    */
+    void dataCheck();
+
+    /**
+    * @brief Initializes all the private instance variables.
+    */
+    void initialize();
+  private:
+
+  
+  public:
+    /* Rule of 5: All special member functions should be defined if any are defined.
+    * https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c21-if-you-define-or-delete-any-default-operation-define-or-delete-them-all
+    */
+    ApplyImageTransforms(const ApplyImageTransforms&) = delete;             // Copy Constructor Not Implemented
+    ApplyImageTransforms& operator=(const ApplyImageTransforms&) = delete;  // Copy Assignment Not Implemented
+    ApplyImageTransforms(ApplyImageTransforms&&) = delete;                  // Move Constructor Not Implemented
+    ApplyImageTransforms& operator=(ApplyImageTransforms&&) = delete;       // Move Assignment Not Implemented
+
+};
+
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index c4d873ee99..98bb6f2f06 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -95,6 +95,7 @@ endforeach()
 # This is the list of Private Filters. These filters are available from other filters but the user will not
 # be able to use them from the DREAM3D user interface.
 set(_PrivateFilters
+  ApplyImageTransforms
   Breakpoint
   EmptyFilter
   FileReader
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
new file mode 100644
index 0000000000..3477047a05
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -0,0 +1,99 @@
+// -----------------------------------------------------------------------------
+// Insert your license & copyright information here
+// -----------------------------------------------------------------------------
+#pragma once
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+
+class ApplyImageTransformsTest
+{
+
+  public:
+    ApplyImageTransformsTest() = default;
+    ~ApplyImageTransformsTest() = default;
+    ApplyImageTransformsTest(const ApplyImageTransformsTest&) = delete;            // Copy Constructor
+    ApplyImageTransformsTest(ApplyImageTransformsTest&&) = delete;                 // Move Constructor
+    ApplyImageTransformsTest& operator=(const ApplyImageTransformsTest&) = delete; // Copy Assignment
+    ApplyImageTransformsTest& operator=(ApplyImageTransformsTest&&) = delete;      // Move Assignment
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestFilterAvailability()
+  {
+    // Now instantiate the ApplyImageTransformsTest Filter from the FilterManager
+    QString filtName = "ApplyImageTransforms";
+    FilterManager* fm = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
+    if (nullptr == filterFactory.get())
+    {
+      std::stringstream ss;
+      ss << "The ApplyImageTransformsTest Requires the use of the " << filtName.toStdString()
+         << " filter which is found in the Processing Plugin";
+      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
+    }
+    return 0;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestApplyImageTransformsTest()
+  {
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+   /* Please write ApplyImageTransformsTest test code here.
+    *
+    * Your IO test files are:
+    * UnitTest::ApplyImageTransformsTest::TestFile1
+    * UnitTest::ApplyImageTransformsTest::TestFile2
+    *
+    * SIMPLib provides some macros that will throw exceptions when a test fails
+    * and thus report that during testing. These macros are located in the
+    * SIMPLib/Utilities/UnitTestSupport.hpp file. Some examples are:
+    *
+    * SIMPLib_REQUIRE_EQUAL(foo, 0)
+    * This means that if the variable foo is NOT equal to Zero then test will fail
+    * and the current test will exit immediately. If there are more tests registered
+    * with the SIMPLib_REGISTER_TEST() macro, the next test will execute. There are
+    * lots of examples in the SIMPLib/Test folder to look at.
+    */
+    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    int foo = -1;
+    DREAM3D_REQUIRE_EQUAL(foo, 0)
+
+    return EXIT_SUCCESS;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    int err = EXIT_SUCCESS;
+
+    DREAM3D_REGISTER_TEST( TestFilterAvailability() );
+
+    DREAM3D_REGISTER_TEST( TestApplyImageTransformsTest() )
+  }
+
+  private:
+
+
+};
+
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index b688819442..97d0dbbef8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -2,6 +2,7 @@
 set(TEST_TESTFILES_DIR ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx/TestFiles)
 
 set(TEST_${SUBDIR_NAME}_NAMES
+  ApplyImageTransformsTest
   ArrayCalculatorTest
   CombineAttributeArraysTest
   CombineAttributeMatricesTest
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ApplyImageTransforms.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ApplyImageTransforms.md
new file mode 100644
index 0000000000..42cef1823a
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ApplyImageTransforms.md
@@ -0,0 +1,36 @@
+# Apply Image Transforms #
+
+## Group (Subgroup) ##
+
+CoreFilters (Image)
+
+## Description ##
+
+This **Filter** updates the geometry of selected data containers by applying the transforms stored in each data container to the data container's origin.  This is an experimental filter and is not yet ready for release to the public.  It is only currently meant to be used to apply Affine 3x3 transforms from each data container's transform container to the data container's origin.
+
+## Parameters ##
+
+None.
+
+## Required Geometry ##
+
+Image
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|-----|
+| **Image Data Containers** | N/A | Any | Any | The data containers whose stored transforms will be applied to the origin. |
+
+## Created Objects ##
+
+None.
+
+## License & Copyright ##
+
+Please see the description file distributed with this plugin.
+
+## DREAM3D Mailing Lists ##
+
+If you need more help with a filter, please consider asking your question on the DREAM3D Users mailing list:
+https://groups.google.com/forum/?hl=en#!forum/dream3d-users
\ No newline at end of file

From 7ead349967624c555b4fa9722ab35e10cf0fe66f Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Tue, 19 Feb 2019 14:48:49 -0500
Subject: [PATCH 045/397] Adding ConvertColorToGrayscale to SIMPL Core Filters

Signed-off-by: Tom Platt <tom.platt@bluequartz.net>
---
 .../CoreFilters/ConvertColorToGrayScale.cpp   | 649 ++++++++++++++++++
 .../CoreFilters/ConvertColorToGrayScale.h     | 198 ++++++
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../CoreFilters/ConvertColorToGrayScale.md    |  66 ++
 4 files changed, 914 insertions(+)
 create mode 100644 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md

diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
new file mode 100644
index 0000000000..b93f506ea9
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -0,0 +1,649 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of
+* its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ConvertColorToGrayScale.h"
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+#include <tbb/partitioner.h>
+#include <tbb/task_scheduler_init.h>
+#endif
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+/**
+ * @brief The ConvertColorToGrayScaleImpl class implements a threaded algorithm
+ * that flattens an RGB array into a grayscale array
+ */
+class LuminosityImpl
+{
+public:
+  LuminosityImpl(uint8_t* data, uint8_t* newdata, FloatVec3_t colorWeights, size_t comp)
+  : m_ImageData(data)
+  , m_FlatImageData(newdata)
+  , m_ColorWeights(colorWeights)
+  , m_NumComp(comp)
+  {
+  }
+  virtual ~LuminosityImpl() = default;
+
+  void convert(size_t start, size_t end) const
+  {
+    for(size_t i = start; i < end; i++)
+    {
+      m_FlatImageData[i] =
+          static_cast<uint8_t>((m_ImageData[m_NumComp * i] * m_ColorWeights.x) + (m_ImageData[m_NumComp * i + 1] * m_ColorWeights.y) + (m_ImageData[m_NumComp * i + 2] * m_ColorWeights.z));
+    }
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  void operator()(const tbb::blocked_range<size_t>& r) const
+  {
+    convert(r.begin(), r.end());
+  }
+#endif
+private:
+  uint8_t* m_ImageData;
+  uint8_t* m_FlatImageData;
+  FloatVec3_t m_ColorWeights;
+  size_t m_NumComp;
+};
+
+/**
+ * @brief The ConvertColorToGrayScaleImpl class implements a threaded algorithm
+ * that flattens an RGB array into a grayscale array
+ */
+class AverageImpl
+{
+public:
+  AverageImpl(uint8_t* data, uint8_t* newdata, size_t comp)
+  : m_ImageData(data)
+  , m_FlatImageData(newdata)
+  , m_NumComp(comp)
+  {
+  }
+  virtual ~AverageImpl() = default;
+
+  void convert(size_t start, size_t end) const
+  {
+    for(size_t i = start; i < end; i++)
+    {
+      uint16_t sum = 0;
+      for(size_t j = 0; j < 3; j++)
+      {
+        sum += static_cast<uint16_t>(m_ImageData[m_NumComp * i + j]);
+      }
+
+      sum = sum / 3;
+      m_FlatImageData[i] = static_cast<uint8_t>(sum);
+    }
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  void operator()(const tbb::blocked_range<size_t>& r) const
+  {
+    convert(r.begin(), r.end());
+  }
+#endif
+private:
+  uint8_t* m_ImageData;
+  uint8_t* m_FlatImageData;
+  size_t m_NumComp;
+};
+
+/**
+ * @brief The ConvertColorToGrayScaleImpl class implements a threaded algorithm
+ * that flattens an RGB array into a grayscale array
+ */
+class LightnessImpl
+{
+public:
+  LightnessImpl(uint8_t* data, uint8_t* newdata, size_t comp)
+  : m_ImageData(data)
+  , m_FlatImageData(newdata)
+  , m_NumComp(comp)
+  {
+  }
+  virtual ~LightnessImpl() = default;
+
+  void convert(size_t start, size_t end) const
+  {
+    for(size_t i = start; i < end; i++)
+    {
+      uint8_t maxRGB = 0;
+      uint8_t minRGB = 255;
+
+      for(size_t j = 0; j < 3; j++)
+      {
+        if(m_ImageData[m_NumComp * i + j] > maxRGB)
+        {
+          maxRGB = m_ImageData[m_NumComp * i + j];
+        }
+        if(m_ImageData[m_NumComp * i + j] < minRGB)
+        {
+          minRGB = m_ImageData[m_NumComp * i + j];
+        }
+      }
+      m_FlatImageData[i] = static_cast<uint8_t>((maxRGB + minRGB) / 2.0);
+    }
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  void operator()(const tbb::blocked_range<size_t>& r) const
+  {
+    convert(r.begin(), r.end());
+  }
+#endif
+private:
+  uint8_t* m_ImageData;
+  uint8_t* m_FlatImageData;
+  size_t m_NumComp;
+};
+
+/**
+ * @brief The ConvertColorToGrayScaleImpl class implements a threaded algorithm
+ * that flattens an RGB array into a grayscale array
+ */
+class SingleChannelImpl
+{
+public:
+  SingleChannelImpl(uint8_t* data, uint8_t* newdata, size_t comp, int32_t channel)
+  : m_ImageData(data)
+  , m_FlatImageData(newdata)
+  , numComp(comp)
+  , m_Channel(channel)
+  {
+  }
+  virtual ~SingleChannelImpl() = default;
+
+  void convert(size_t start, size_t end) const
+  {
+    for(size_t i = start; i < end; i++)
+    {
+      m_FlatImageData[i] = static_cast<uint8_t>((m_ImageData[numComp * i + static_cast<size_t>(m_Channel)]));
+    }
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  void operator()(const tbb::blocked_range<size_t>& r) const
+  {
+    convert(r.begin(), r.end());
+  }
+#endif
+private:
+  uint8_t* m_ImageData;
+  uint8_t* m_FlatImageData;
+  size_t numComp;
+  int32_t m_Channel;
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ConvertColorToGrayScale::ConvertColorToGrayScale()
+: m_ConversionAlgorithm(0)
+, m_ColorChannel(0)
+, m_CreateNewAttributeMatrix(false)
+, m_OutputAttributeMatrixName("GrayScaleData")
+, m_OutputArrayPrefix("")
+
+{
+  m_ColorWeights.x = 0.2125f;
+  m_ColorWeights.y = 0.7154f;
+  m_ColorWeights.z = 0.0721f;
+
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ConvertColorToGrayScale::~ConvertColorToGrayScale() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setupFilterParameters()
+{
+
+  FilterParameterVector parameters;
+  {
+    QVector<QString> choices;
+    choices.push_back("Luminosity");
+    choices.push_back("Average");
+    choices.push_back("Lightness");
+    choices.push_back("SingleChannel");
+
+    QStringList linkedProps;
+    linkedProps << "ColorWeights"
+                << "ColorChannel";
+
+    LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
+    parameter->setHumanLabel("Conversion Algorithm");
+    parameter->setPropertyName("ConversionAlgorithm");
+    parameter->setSetterCallback(SIMPL_BIND_SETTER(ConvertColorToGrayScale, this, ConversionAlgorithm));
+    parameter->setGetterCallback(SIMPL_BIND_GETTER(ConvertColorToGrayScale, this, ConversionAlgorithm));
+    parameter->setChoices(choices);
+    parameter->setLinkedProperties(linkedProps);
+    parameter->setCategory(FilterParameter::Parameter);
+    parameters.push_back(parameter);
+  }
+
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Color Weighting", ColorWeights, FilterParameter::Parameter, ConvertColorToGrayScale, 0));
+
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Color Channel", ColorChannel, FilterParameter::Parameter, ConvertColorToGrayScale, 3));
+
+  MultiDataArraySelectionFilterParameter::RequirementType req;
+  req.dcGeometryTypes = IGeometry::Types(1, IGeometry::Type::Image);
+  req.amTypes = AttributeMatrix::Types(1, AttributeMatrix::Type::Cell);
+  parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Input Attribute Arrays", InputDataArrayVector, FilterParameter::RequiredArray, ConvertColorToGrayScale, req));
+
+  QStringList linkedProps("OutputAttributeMatrixName");
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Create Attribute Matrix", CreateNewAttributeMatrix, FilterParameter::Parameter, ConvertColorToGrayScale, linkedProps));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Output Cell Attribute Matrix", OutputAttributeMatrixName, FilterParameter::CreatedArray, ConvertColorToGrayScale));
+
+  parameters.push_back(SIMPL_NEW_STRING_FP("Output Array Prefix", OutputArrayPrefix, FilterParameter::CreatedArray, ConvertColorToGrayScale));
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::dataCheck()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+  if(!DataArrayPath::ValidateVector(getInputDataArrayVector()))
+  {
+    setErrorCondition(-62100);
+    QString ss = QObject::tr("All Attribute Arrays must belong to the same Data Container and Attribute Matrix");
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+
+  if(getOutputArrayPrefix().isEmpty())
+  {
+    setErrorCondition(-62102);
+    QString message = QObject::tr("Using a prefix (even a single alphanumeric value) is required so that the output Xdmf files can be written correctly");
+    notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+  }
+
+  if(getInputDataArrayVector().isEmpty())
+  {
+    setErrorCondition(-62103);
+    QString message = QObject::tr("At least one Attribute Array must be selected");
+    notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+    return;
+  }
+
+  DataArrayPath inputAMPath = DataArrayPath::GetAttributeMatrixPath(getInputDataArrayVector());
+
+  AttributeMatrix::Pointer inAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, inputAMPath, -301);
+  if(getErrorCondition() < 0 || nullptr == inAM.get())
+  {
+    return;
+  }
+
+  DataContainerArray::Pointer dca = getDataContainerArray();
+  DataContainer::Pointer dc = dca->getDataContainer(inputAMPath.getDataContainerName());
+
+  // Now create our output attributeMatrix which will contain all of our segmented images
+  AttributeMatrix::Pointer outAM;
+  if(m_CreateNewAttributeMatrix)
+  {
+    QVector<size_t> tDims = inAM->getTupleDimensions();
+
+    outAM = dc->createNonPrereqAttributeMatrix(this, getOutputAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
+    if(getErrorCondition() < 0 || nullptr == outAM.get())
+    {
+      return;
+    }
+  }
+
+  // Get the list of checked array names from the input m_Data arrays list
+  QList<QString> arrayNames = DataArrayPath::GetDataArrayNames(getInputDataArrayVector());
+  m_OutputArrayPaths.clear();
+  m_OutputArrayPaths.resize(arrayNames.size());
+  for(int32_t i = 0; i < arrayNames.size(); i++)
+  {
+    QString daName = arrayNames.at(i);
+    QString newName = getOutputArrayPrefix() + arrayNames.at(i);
+    inputAMPath.setDataArrayName(daName);
+
+    // getDataContainerArray()->getPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter>(this, inputAMPath, cDims);
+    IDataArray::Pointer iDatArray = dca->getPrereqIDataArrayFromPath<IDataArray, ConvertColorToGrayScale>(this, inputAMPath);
+    if(getErrorCondition() < 0)
+    {
+      return;
+    }
+    QVector<size_t> outCDims(1, 1);
+    if(outAM.get() == nullptr)
+    {
+      outAM = dc->getPrereqAttributeMatrix(this, inputAMPath.getAttributeMatrixName(), -62105);
+    }
+    outAM->createAndAddAttributeArray<UInt8ArrayType, AbstractFilter, uint8_t>(this, newName, 0, outCDims);
+    DataArrayPath newPath(dc->getName(), outAM->getName(), newName);
+    m_OutputArrayPaths[i] = newPath;
+  }
+
+  if(static_cast<ConversionType>(m_ConversionAlgorithm) == ConversionType::SingleChannel)
+  {
+    if(m_ColorChannel > 2)
+    {
+      setErrorCondition(-62104);
+      QString message = QObject::tr("The color channel should be 0, 1 or 2");
+      notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+      return;
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::preflight()
+{
+  setInPreflight(true);
+  emit preflightAboutToExecute();
+  emit updateFilterParameters(this);
+  dataCheck();
+  emit preflightExecuted();
+  setInPreflight(false);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::execute()
+{
+  initialize();
+  setErrorCondition(0);
+  setWarningCondition(0);
+  QString ss;
+  dataCheck();
+  if(getErrorCondition() < 0)
+  {
+    setErrorCondition(-62106);
+    ss = QObject::tr("DataCheck did not pass during execute");
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    return;
+  }
+
+  QVector<DataArrayPath> inputArrayPaths = getInputDataArrayVector();
+  qint32 size = inputArrayPaths.size();
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::task_scheduler_init init;
+  bool doParallel = true;
+#endif
+
+  for(qint32 i = 0; i < size; i++)
+  {
+    DataArrayPath arrayPath = inputArrayPaths[i];
+
+    // get volume container
+    DataContainer::Pointer m = getDataContainerArray()->getDataContainer(arrayPath.getDataContainerName());
+    QString attrMatName = arrayPath.getAttributeMatrixName();
+    AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(arrayPath);
+
+    // get input and output data
+    IDataArray::Pointer inputData = attrMat->getAttributeArray(arrayPath.getDataArrayName());
+    UInt8ArrayType::Pointer inputColorData = std::dynamic_pointer_cast<UInt8ArrayType>(inputData);
+
+    if(nullptr == inputColorData.get())
+    {
+      setErrorCondition(-62107);
+      ss = QObject::tr("Input Color Data at ArrayPath '%1' was not available. This array will be skipped.").arg(arrayPath.serialize("/"));
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      continue;
+    }
+
+    DataArrayPath newPath = m_OutputArrayPaths[i];
+
+    AttributeMatrix::Pointer outAttrMat = getDataContainerArray()->getAttributeMatrix(newPath);
+
+    IDataArray::Pointer outputData = outAttrMat->getAttributeArray(newPath.getDataArrayName());
+    UInt8ArrayType::Pointer outputGrayData = std::dynamic_pointer_cast<UInt8ArrayType>(outputData);
+
+    if(nullptr == outputGrayData.get())
+    {
+      setErrorCondition(-62108);
+      ss = QObject::tr("Output Data at ArrayPath '%1' was not available. This array will be skipped.").arg(newPath.serialize("/"));
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      continue;
+    }
+
+    ConversionType convType = static_cast<ConversionType>(getConversionAlgorithm());
+
+    size_t comp = inputColorData->getNumberOfComponents();
+    size_t totalPoints = inputColorData->getNumberOfTuples();
+
+    if(ConversionType::Luminosity == convType)
+    {
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+      if(doParallel)
+      {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), LuminosityImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), m_ColorWeights, comp), tbb::auto_partitioner());
+      }
+      else
+#endif
+      {
+        LuminosityImpl serial(inputColorData->getPointer(0), outputGrayData->getPointer(0), m_ColorWeights, comp);
+        serial.convert(0, totalPoints);
+      }
+    }
+    else if(ConversionType::Average == convType)
+    {
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+      if(doParallel)
+      {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), AverageImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp), tbb::auto_partitioner());
+      }
+      else
+#endif
+      {
+        AverageImpl serial(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp);
+        serial.convert(0, totalPoints);
+      }
+    }
+    else if(ConversionType::Lightness == convType)
+    {
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+      if(doParallel)
+      {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), LightnessImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp), tbb::auto_partitioner());
+      }
+      else
+#endif
+      {
+        LightnessImpl serial(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp);
+        serial.convert(0, totalPoints);
+      }
+    }
+    else if(ConversionType::SingleChannel == convType)
+    {
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+      if(doParallel)
+      {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), SingleChannelImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp, getColorChannel()),
+                          tbb::auto_partitioner());
+      }
+      else
+#endif
+      {
+        SingleChannelImpl serial(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp, getColorChannel());
+        serial.convert(0, totalPoints);
+      }
+    }
+    else
+    {
+
+      setErrorCondition(-62107);
+      ss = QObject::tr("Conversion Algorithm did not match any available type. The type given was %1.").arg(getConversionAlgorithm());
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      return;
+    }
+  }
+
+#if 0
+    size_t totalPoints = m_ImageDataPtr.lock()->getNumberOfTuples();
+
+    float Rfactor = 1.0f;
+    float Gfactor = 1.0f;
+    float Bfactor = 1.0f;
+    if(m_FlattenMethod == SIMPL::ConvertColorToGrayScaleMethod::Average)
+    {
+        Rfactor = 1.0f / 3.0f;
+        Gfactor = 1.0f / 3.0f;
+        Bfactor = 1.0f / 3.0f;
+    }
+    else if(m_FlattenMethod == SIMPL::ConvertColorToGrayScaleMethod::Luminosity)
+    {
+        Rfactor = 0.21f;
+        Gfactor = 0.72f;
+        Bfactor = 0.07f;
+    }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    tbb::task_scheduler_init init;
+    bool doParallel = true;
+#endif
+
+    int32_t comp = m_ImageDataPtr.lock()->getNumberOfComponents();
+
+    //  qDebug() << "ConvertColorToGrayScale: " << m_ConversionFactor << "\n";
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    if(doParallel == true)
+    {
+        tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), ConvertColorToGrayScaleImpl(m_ImageData, m_FlatImageData, Rfactor, Gfactor, Bfactor, comp), tbb::auto_partitioner());
+    }
+    else
+#endif
+    {
+        ConvertColorToGrayScaleImpl serial(m_ImageData, m_FlatImageData, Rfactor, Gfactor, Bfactor, comp);
+        serial.convert(0, totalPoints);
+    }
+
+#endif
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer ConvertColorToGrayScale::newFilterInstance(bool copyFilterParameters) const
+{
+  ConvertColorToGrayScale::Pointer filter = ConvertColorToGrayScale::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getCompiledLibraryName() const
+{
+  return  Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getGroupName() const
+{
+  return SIMPL::FilterGroups::ProcessingFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QUuid ConvertColorToGrayScale::getUuid()
+{
+  return QUuid("{eb5a89c4-4e71-59b1-9719-d10a652d961e}");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::ImageFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString ConvertColorToGrayScale::getHumanLabel() const
+{
+  return "Color to GrayScale";
+}
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
new file mode 100644
index 0000000000..78a7c9b79b
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -0,0 +1,198 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @brief The ConvertColorToGrayScale class. See [Filter documentation](@ref ConvertColorToGrayScale) for details.
+ */
+class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
+{
+  Q_OBJECT
+    PYB11_CREATE_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
+    PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
+    PYB11_PROPERTY(FloatVec3_t ColorWeights READ getColorWeights WRITE setColorWeights)
+    PYB11_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
+    PYB11_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
+    PYB11_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
+    PYB11_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
+    PYB11_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
+public:
+  SIMPL_SHARED_POINTERS(ConvertColorToGrayScale)
+  SIMPL_FILTER_NEW_MACRO(ConvertColorToGrayScale)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConvertColorToGrayScale, AbstractFilter)
+
+  ~ConvertColorToGrayScale() override;
+
+  using EnumType = unsigned int;
+  enum class ConversionType : EnumType
+  {
+    Luminosity = 0,
+    Average = 1,
+    Lightness = 2,
+    SingleChannel = 3
+  };
+
+  SIMPL_FILTER_PARAMETER(int, ConversionAlgorithm)
+  Q_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
+
+  SIMPL_FILTER_PARAMETER(FloatVec3_t, ColorWeights)
+  Q_PROPERTY(FloatVec3_t ColorWeights READ getColorWeights WRITE setColorWeights)
+
+  SIMPL_FILTER_PARAMETER(int, ColorChannel)
+  Q_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
+
+  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, InputDataArrayVector)
+  Q_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
+
+  SIMPL_FILTER_PARAMETER(bool, CreateNewAttributeMatrix)
+  Q_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
+
+  SIMPL_FILTER_PARAMETER(QString, OutputAttributeMatrixName)
+  Q_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
+
+  SIMPL_FILTER_PARAMETER(QString, OutputArrayPrefix)
+  Q_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  const QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+  */
+  const QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  const QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  const QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  const QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  const QUuid getUuid() override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  const QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+  * @brief preflight Reimplemented from @see AbstractFilter class
+  */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  ConvertColorToGrayScale();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  QVector<DataArrayPath> m_OutputArrayPaths;
+
+public:
+  ConvertColorToGrayScale(const ConvertColorToGrayScale&) = delete; // Copy Constructor Not Implemented
+  ConvertColorToGrayScale(ConvertColorToGrayScale&&) = delete;      // Move Constructor Not Implemented
+  ConvertColorToGrayScale& operator=(const ConvertColorToGrayScale&) = delete; // Copy Assignment Not Implemented
+  ConvertColorToGrayScale& operator=(ConvertColorToGrayScale&&) = delete;      // Move Assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 98bb6f2f06..a1ba40c1a7 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -38,6 +38,7 @@ set(_PublicFilters
   CreateImageGeometry
   CreateStringArray
   CopyObject
+  ConvertColorToGrayScale
   CreateGeometry
   CropVertexGeometry
   DataContainerReader
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md
new file mode 100644
index 0000000000..bf3f8df96b
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md
@@ -0,0 +1,66 @@
+Color to GrayScale 
+=============
+
+## Group (Subgroup) ##
+
+Processing (Image)
+
+## Description ##
+
+This **Filter** allows the user to select a *flattening* method for turning an array of RGB or RGBa values into grayscale values.
+
++ Luminosity: The **luminosity** method is a more sophisticated version of the average method. It also averages the values, but it forms a weighted average to account for human perception. We   re more sensitive to green than other colors, so green is weighted most heavily. The default formula for luminosity is BT709 Greyscale: Red: 0.2125 Green: 0.7154 Blue: 0.0721. The user can set the weightings to what ever values they would like.
++ Average  (R + G + B) / 3
++ Lightness (max(R, G, B) + min(R, G, B)) / 2
++ Color Channel: The user selects a specific R|G|B channel to use as the GrayScale values.
+
+The user can select 1 or more image data arrays which are assumed to be multi-component arrays of unsigned 8 bit values. The user can create a new AttributeMatrix if they want to store all the newly created arrays in a separate AttributeMatrix.
+
+### Additional GrayScale Conversions ###
+
+The following are some additional accepted grayscale conversions
+
++ RMY Greyscale: Red: 0.5 Green: 0.419 Blue: 0.081
++ (YIQ/NTSC): Red: 0.299 Green: 0.587 Blue: 0.114
+
+
+## Parameters ##
+
+| Name | Type | Description |
+|------|------|------|
+| Flattening Method | Enumeration | Which method to use when flattening the RGB array |
+| Luminosity Triplet | 3xFloats | Only used if Luminosity is selected as conversion method |
+| Color Channel | 1 Int | Only needed if the Color Channel conversion method is selected |
+| Output Array Prefix | String | This prefix will be added to each array name that is selected for conversion to form the new array name |
+
+## Required Geometry ##
+
+Not Applicable
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|------|----------------------|-------------|
+| **Element Attribute Array(s)** | ImageData | uint8_t | (3) or (4) | RGB or RGBA values |
+
+## Created Objects ##
+
+| Kind | Default Name | Type | Component Dimensions (dimension, size) | Description |
+|------|--------------|-------------|---------|-----|
+| **Element Attribute Array** | GrayScale Data | uint8_t | (1) | Grayscale values |
+| AttributeMatrix (Optional)  |                |         |     |                  |
+
+
+## Example Pipelines ##
+
+
+
+## License & Copyright ##
+
+Please see the description file distributed with this **Plugin**
+
+## DREAM.3D Mailing Lists ##
+
+If you need more help with a **Filter**, please consider asking your question on the [DREAM.3D Users Google group!](https://groups.google.com/forum/?hl=en#!forum/dream3d-users)
+
+

From cb9133d614e91e6407be877fa16f7f06931ab343 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 19 Feb 2019 14:15:55 -0500
Subject: [PATCH 046/397] Move InitializeData and ColorToGrayScale to SIMPLib
 Core Filters (#323)

updates #883

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/InitializeData.cpp | 600 ++++++++++++++++++
 Source/SIMPLib/CoreFilters/InitializeData.h   | 244 +++++++
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../Cxx/ConvertColorToGrayScaleTest.cpp       | 551 ++++++++++++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 .../CoreFilters/InitializeData.md             |  49 ++
 6 files changed, 1446 insertions(+)
 create mode 100644 Source/SIMPLib/CoreFilters/InitializeData.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/InitializeData.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md

diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
new file mode 100644
index 0000000000..98afd4c3c9
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -0,0 +1,600 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "InitializeData.h"
+
+#include <random>
+#include <chrono>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDateTime>
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
+#include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void delay(int seconds)
+{
+  QTime dieTime = QTime::currentTime().addSecs(seconds);
+  while(QTime::currentTime() < dieTime)
+  {
+    QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+InitializeData::InitializeData()
+: m_XMin(0)
+, m_YMin(0)
+, m_ZMin(0)
+, m_XMax(0)
+, m_YMax(0)
+, m_ZMax(0)
+, m_InitType(Manual)
+, m_InitValue(0)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+InitializeData::~InitializeData() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::setupFilterParameters()
+{
+  FilterParameterVector parameters;
+
+  parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
+  {
+    MultiDataArraySelectionFilterParameter::RequirementType req =
+        MultiDataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Cell, IGeometry::Type::Image);
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Cell Arrays", CellAttributeMatrixPaths, FilterParameter::RequiredArray, InitializeData, req));
+  }
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Min (Column)", XMin, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Min (Row)", YMin, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Min (Plane)", ZMin, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Max (Column)", XMax, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Max (Row)", YMax, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Max (Plane)", ZMax, FilterParameter::Parameter, InitializeData));
+
+  {
+    LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
+    parameter->setHumanLabel("Initialization Type");
+    parameter->setPropertyName("InitType");
+    parameter->setSetterCallback(SIMPL_BIND_SETTER(InitializeData, this, InitType));
+    parameter->setGetterCallback(SIMPL_BIND_GETTER(InitializeData, this, InitType));
+
+    parameter->setDefaultValue(Manual);
+
+    QVector<QString> choices;
+    choices.push_back("Manual");
+    choices.push_back("Random");
+    choices.push_back("Random With Range");
+    parameter->setChoices(choices);
+    QStringList linkedProps;
+    linkedProps << "InitValue"
+                << "InitRange";
+    parameter->setLinkedProperties(linkedProps);
+    parameter->setEditable(false);
+    parameter->setCategory(FilterParameter::Parameter);
+    parameters.push_back(parameter);
+  }
+  parameters.push_back(SIMPL_NEW_DOUBLE_FP("Initialization Value", InitValue, FilterParameter::Parameter, InitializeData, Manual));
+  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, InitializeData, RandomWithRange));
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::readFilterParameters(AbstractFilterParametersReader* reader, int index)
+{
+  reader->openFilterGroup(this, index);
+  setCellAttributeMatrixPaths(reader->readDataArrayPathVector("CellAttributeMatrixPaths", getCellAttributeMatrixPaths()));
+  setXMin(reader->readValue("XMin", getXMin()));
+  setYMin(reader->readValue("YMin", getYMin()));
+  setZMin(reader->readValue("ZMin", getZMin()));
+  setXMax(reader->readValue("XMax", getXMax()));
+  setYMax(reader->readValue("YMax", getYMax()));
+  setZMax(reader->readValue("ZMax", getZMax()));
+  setInitType(reader->readValue("InitType", getInitType()));
+  setInitValue(reader->readValue("InitValue", getInitValue()));
+  setInitRange(reader->readPairOfDoubles("InitRange", getInitRange()));
+  reader->closeFilterGroup();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::dataCheck()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+
+  if(m_CellAttributeMatrixPaths.empty())
+  {
+    QString ss = "At least one data array must be selected.";
+    setErrorCondition(-5550);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    return;
+  }
+
+  DataArrayPath attributeMatrixPath(m_CellAttributeMatrixPaths[0].getDataContainerName(), m_CellAttributeMatrixPaths[0].getAttributeMatrixName(), "");
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, attributeMatrixPath, -301);
+
+  ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, attributeMatrixPath.getDataContainerName());
+  if(nullptr == image.get())
+  {
+    return;
+  }
+
+  if(getXMax() < getXMin())
+  {
+    QString ss = QObject::tr("X Max (%1) less than X Min (%2)").arg(getXMax()).arg(getXMin());
+    setErrorCondition(-5551);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getYMax() < getYMin())
+  {
+    QString ss = QObject::tr("Y Max (%1) less than Y Min (%2)").arg(getYMax()).arg(getYMin());
+    setErrorCondition(-5552);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getZMax() < getZMin())
+  {
+    QString ss = QObject::tr("Z Max (%1) less than Z Min (%2)").arg(getZMax()).arg(getZMin());
+    setErrorCondition(-5553);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getXMin() < 0)
+  {
+    QString ss = QObject::tr("X Min (%1) less than 0").arg(getXMin());
+    setErrorCondition(-5554);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getYMin() < 0)
+  {
+    QString ss = QObject::tr("Y Min (%1) less than 0").arg(getYMin());
+    setErrorCondition(-5555);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getZMin() < 0)
+  {
+    QString ss = QObject::tr("Z Min (%1) less than 0").arg(getZMin());
+    setErrorCondition(-5556);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getXMax() > (static_cast<int64_t>(image->getXPoints()) - 1))
+  {
+    QString ss = QObject::tr("The X Max you entered of %1 is greater than your Max X Point of %2").arg(getXMax()).arg(static_cast<int64_t>(image->getXPoints()) - 1);
+    setErrorCondition(-5557);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getYMax() > (static_cast<int64_t>(image->getYPoints()) - 1))
+  {
+    QString ss = QObject::tr("The Y Max you entered of %1 is greater than your Max Y Point of %2").arg(getYMax()).arg(static_cast<int64_t>(image->getYPoints()) - 1);
+    setErrorCondition(-5558);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+  if(getZMax() > (static_cast<int64_t>(image->getZPoints()) - 1))
+  {
+    QString ss = QObject::tr("The Z Max you entered of %1) greater than your Max Z Point of %2").arg(getZMax()).arg(static_cast<int64_t>(image->getZPoints()) - 1);
+    setErrorCondition(-5559);
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  }
+
+  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
+
+  size_t udims[3] = {0, 0, 0};
+  std::tie(udims[0], udims[1], udims[2]) = m->getGeometryAs<ImageGeom>()->getDimensions();
+
+  QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
+  QList<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
+
+  for(QList<QString>::iterator iter = voxelArrayNames.begin(); iter != voxelArrayNames.end(); ++iter)
+  {
+    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(*iter);
+
+    QString type = p->getTypeAsString();
+    if(type == "int8_t")
+    {
+      checkInitialization<int8_t>(p);
+    }
+    else if(type == "int16_t")
+    {
+      checkInitialization<int16_t>(p);
+    }
+    else if(type == "int32_t")
+    {
+      checkInitialization<int32_t>(p);
+    }
+    else if(type == "int64_t")
+    {
+      checkInitialization<int64_t>(p);
+    }
+    else if(type == "uint8_t")
+    {
+      checkInitialization<uint8_t>(p);
+    }
+    else if(type == "uint16_t")
+    {
+      checkInitialization<uint16_t>(p);
+    }
+    else if(type == "uint32_t")
+    {
+      checkInitialization<uint32_t>(p);
+    }
+    else if(type == "uint64_t")
+    {
+      checkInitialization<uint64_t>(p);
+    }
+    else if(type == "float")
+    {
+      checkInitialization<float>(p);
+    }
+    else if(type == "double")
+    {
+      checkInitialization<double>(p);
+    }
+
+    if(getErrorCondition() < 0)
+    {
+      return;
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+template <typename T> void InitializeData::checkInitialization(IDataArray::Pointer p)
+{
+  QString arrayName = p->getName();
+
+  if(m_InitType == Manual)
+  {
+    double input = m_InitValue;
+    if(input < static_cast<double>(std::numeric_limits<T>().lowest()) || input > static_cast<double>(std::numeric_limits<T>().max()))
+    {
+      setErrorCondition(-4000);
+      QString ss = QObject::tr("%1: The initialization value could not be converted. The valid range is %2 to %3").arg(arrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      return;
+    }
+  }
+  else if(m_InitType == RandomWithRange)
+  {
+    double min = m_InitRange.first;
+    double max = m_InitRange.second;
+    if(min > max)
+    {
+      QString ss = arrayName + ": Invalid initialization range.  Minimum value is larger than maximum value.";
+      setErrorCondition(-5550);
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      return;
+    }
+    if(min < static_cast<double>(std::numeric_limits<T>().lowest()) || max > static_cast<double>(std::numeric_limits<T>().max()))
+    {
+      setErrorCondition(-4001);
+      QString ss = QObject::tr("%1: The initialization range can only be from %2 to %3").arg(arrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      return;
+    }
+    if(min == max)
+    {
+      setErrorCondition(-4002);
+      QString ss = arrayName + ": The initialization range must have differing values";
+      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      return;
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::preflight()
+{
+  setInPreflight(true);
+  emit preflightAboutToExecute();
+  emit updateFilterParameters(this);
+  dataCheck();
+  emit preflightExecuted();
+  setInPreflight(false);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void InitializeData::execute()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+  dataCheck();
+  if(getErrorCondition() < 0)
+  {
+    return;
+  }
+
+  DataArrayPath attributeMatrixPath(m_CellAttributeMatrixPaths[0].getDataContainerName(), m_CellAttributeMatrixPaths[0].getAttributeMatrixName(), "");
+  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
+
+  size_t udims[3] = {0, 0, 0};
+  std::tie(udims[0], udims[1], udims[2]) = m->getGeometryAs<ImageGeom>()->getDimensions();
+
+  int64_t dims[3] = {
+      static_cast<int64_t>(udims[0]), static_cast<int64_t>(udims[1]), static_cast<int64_t>(udims[2]),
+  };
+
+  QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
+  QList<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
+
+  for(QList<QString>::iterator iter = voxelArrayNames.begin(); iter != voxelArrayNames.end(); ++iter)
+  {
+    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(*iter);
+
+    QString type = p->getTypeAsString();
+    if(type == "int8_t")
+    {
+      initializeArrayWithInts<int8_t>(p, dims);
+    }
+    else if(type == "int16_t")
+    {
+      initializeArrayWithInts<int16_t>(p, dims);
+    }
+    else if(type == "int32_t")
+    {
+      initializeArrayWithInts<int32_t>(p, dims);
+    }
+    else if(type == "int64_t")
+    {
+      initializeArrayWithInts<int64_t>(p, dims);
+    }
+    else if(type == "uint8_t")
+    {
+      initializeArrayWithInts<uint8_t>(p, dims);
+    }
+    else if(type == "uint16_t")
+    {
+      initializeArrayWithInts<uint16_t>(p, dims);
+    }
+    else if(type == "uint32_t")
+    {
+      initializeArrayWithInts<uint32_t>(p, dims);
+    }
+    else if(type == "uint64_t")
+    {
+      initializeArrayWithInts<uint64_t>(p, dims);
+    }
+    else if(type == "float")
+    {
+      initializeArrayWithReals<float>(p, dims);
+    }
+    else if(type == "double")
+    {
+      initializeArrayWithReals<double>(p, dims);
+    }
+
+    delay(1); // Delay the execution by 1 second to avoid the exact same seedings for each array
+  }
+
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+template <typename T> void InitializeData::initializeArrayWithInts(IDataArray::Pointer p, int64_t dims[3])
+{
+  T rangeMin;
+  T rangeMax;
+  if(m_InitType == RandomWithRange)
+  {
+    rangeMin = m_InitRange.first;
+    rangeMax = m_InitRange.second;
+  }
+  else
+  {
+    rangeMin = std::numeric_limits<T>().min();
+    rangeMax = std::numeric_limits<T>().max();
+  }
+
+  std::random_device randomDevice;           // Will be used to obtain a seed for the random number engine
+  std::mt19937_64 generator(randomDevice()); // Standard mersenne_twister_engine seeded with rd()
+  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
+  generator.seed(seed);
+  std::uniform_int_distribution<> distribution(rangeMin, rangeMax);
+
+  for(int32_t k = m_ZMin; k < m_ZMax + 1; k++)
+  {
+    for(int32_t j = m_YMin; j < m_YMax + 1; j++)
+    {
+      for(int32_t i = m_XMin; i < m_XMax + 1; i++)
+      {
+        size_t index = (k * dims[0] * dims[1]) + (j * dims[0]) + i;
+
+        if(m_InitType == Manual)
+        {
+          T num = static_cast<T>(m_InitValue);
+          p->initializeTuple(index, &num);
+        }
+        else
+        {
+          T temp = distribution(generator);
+          p->initializeTuple(index, &temp);
+        }
+      }
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+template <typename T> void InitializeData::initializeArrayWithReals(IDataArray::Pointer p, int64_t dims[3])
+{
+  T rangeMin;
+  T rangeMax;
+  if(m_InitType == RandomWithRange)
+  {
+    rangeMin = static_cast<T>(m_InitRange.first);
+    rangeMax = static_cast<T>(m_InitRange.second);
+  }
+  else
+  {
+    rangeMin = std::numeric_limits<T>().min();
+    rangeMax = std::numeric_limits<T>().max();
+  }
+
+  std::random_device randomDevice;           // Will be used to obtain a seed for the random number engine
+  std::mt19937_64 generator(randomDevice()); // Standard mersenne_twister_engine seeded with rd()
+  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
+  generator.seed(seed);
+  std::uniform_real_distribution<T> distribution(rangeMin, rangeMax);
+
+  for(int32_t k = m_ZMin; k < m_ZMax + 1; k++)
+  {
+    for(int32_t j = m_YMin; j < m_YMax + 1; j++)
+    {
+      for(int32_t i = m_XMin; i < m_XMax + 1; i++)
+      {
+        size_t index = (k * dims[0] * dims[1]) + (j * dims[0]) + i;
+
+        if(m_InitType == Manual)
+        {
+          T num = static_cast<T>(m_InitValue);
+          p->initializeTuple(index, &num);
+        }
+        else
+        {
+          T temp = distribution(generator);
+          p->initializeTuple(index, &temp);
+        }
+      }
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer InitializeData::newFilterInstance(bool copyFilterParameters) const
+{
+  InitializeData::Pointer filter = InitializeData::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getGroupName() const
+{
+  return SIMPL::FilterGroups::ProcessingFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QUuid InitializeData::getUuid()
+{
+  return QUuid("{dfab9921-fea3-521c-99ba-48db98e43ff8}");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::ConversionFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString InitializeData::getHumanLabel() const
+{
+  return "Initialize Data";
+}
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
new file mode 100644
index 0000000000..04f7d6bbfa
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -0,0 +1,244 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QVector>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @brief The InitializeData class. See [Filter documentation](@ref initializedata) for details.
+ */
+class SIMPLib_EXPORT InitializeData : public AbstractFilter
+{
+  Q_OBJECT
+    PYB11_CREATE_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
+    PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
+    PYB11_PROPERTY(int XMin READ getXMin WRITE setXMin)
+    PYB11_PROPERTY(int YMin READ getYMin WRITE setYMin)
+    PYB11_PROPERTY(int ZMin READ getZMin WRITE setZMin)
+    PYB11_PROPERTY(int XMax READ getXMax WRITE setXMax)
+    PYB11_PROPERTY(int YMax READ getYMax WRITE setYMax)
+    PYB11_PROPERTY(int ZMax READ getZMax WRITE setZMax)
+    PYB11_PROPERTY(int InitType READ getInitType WRITE setInitType)
+    PYB11_PROPERTY(bool Random READ getRandom WRITE setRandom)
+    PYB11_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
+    PYB11_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
+public:
+  SIMPL_SHARED_POINTERS(InitializeData)
+  SIMPL_FILTER_NEW_MACRO(InitializeData)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(InitializeData, AbstractFilter)
+
+  ~InitializeData() override;
+
+  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, CellAttributeMatrixPaths)
+  Q_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
+
+  SIMPL_FILTER_PARAMETER(int, XMin)
+  Q_PROPERTY(int XMin READ getXMin WRITE setXMin)
+
+  SIMPL_FILTER_PARAMETER(int, YMin)
+  Q_PROPERTY(int YMin READ getYMin WRITE setYMin)
+
+  SIMPL_FILTER_PARAMETER(int, ZMin)
+  Q_PROPERTY(int ZMin READ getZMin WRITE setZMin)
+
+  SIMPL_FILTER_PARAMETER(int, XMax)
+  Q_PROPERTY(int XMax READ getXMax WRITE setXMax)
+
+  SIMPL_FILTER_PARAMETER(int, YMax)
+  Q_PROPERTY(int YMax READ getYMax WRITE setYMax)
+
+  SIMPL_FILTER_PARAMETER(int, ZMax)
+  Q_PROPERTY(int ZMax READ getZMax WRITE setZMax)
+
+  SIMPL_FILTER_PARAMETER(int, InitType)
+  Q_PROPERTY(int InitType READ getInitType WRITE setInitType)
+
+  SIMPL_FILTER_PARAMETER(bool, Random)
+  Q_PROPERTY(bool Random READ getRandom WRITE setRandom)
+
+  SIMPL_FILTER_PARAMETER(double, InitValue)
+  Q_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
+
+  SIMPL_FILTER_PARAMETER(FPRangePair, InitRange)
+  Q_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  const QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+  */
+  const QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  const QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  const QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  const QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  const QUuid getUuid() override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  const QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+  * @brief preflight Reimplemented from @see AbstractFilter class
+  */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  InitializeData();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  enum InitChoices
+  {
+    Manual,
+    Random,
+    RandomWithRange
+  };
+
+  /**
+  * @brief initializeArrayWithInts Initializes the array p with integers, either from the
+  * manual value entered in the filter, or with a random number.  This function does not
+  * check that the template type actually is an integer, so it will most likely cause
+  * unexpected results when passing anything other than an integer as a template parameter.
+  * @param p The array that will be initialized
+  * @param dims The dimensions of the array p
+  */
+  template <typename T> void initializeArrayWithInts(IDataArray::Pointer p, int64_t dims[3]);
+
+  /**
+  * @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
+  * manual value entered in the filter, or with a random number.  This function does not
+  * check that the template type actually is a non-integer, so it will most likely cause
+  * unexpected results when passing anything other than a float or double as a template
+  * parameter.
+  * @param p The array that will be initialized
+  * @param dims The dimensions of the array p
+  */
+  template <typename T> void initializeArrayWithReals(IDataArray::Pointer p, int64_t dims[3]);
+
+  /**
+  * @brief checkInitialization Checks that the chosen initialization value/range is inside
+  * the bounds of the array type
+  */
+  template <typename T> void checkInitialization(IDataArray::Pointer p);
+
+public:
+  InitializeData(const InitializeData&) = delete; // Copy Constructor Not Implemented
+  InitializeData(InitializeData&&) = delete;      // Move Constructor Not Implemented
+  InitializeData& operator=(const InitializeData&) = delete; // Copy Assignment Not Implemented
+  InitializeData& operator=(InitializeData&&) = delete;      // Move Assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index a1ba40c1a7..5a65e92551 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -52,6 +52,7 @@ set(_PublicFilters
   GenerateColorTable
   ImportAsciDataArray
   ImportHDF5Dataset
+  InitializeData
   LinkFeatureMapToElementArray
   MaskCountDecision
   MoveData
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
new file mode 100644
index 0000000000..4a17724edd
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -0,0 +1,551 @@
+#pragma once
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <QTextStream>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Geometry/EdgeGeom.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
+#include "SIMPLib/Geometry/VertexGeom.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+#include <tbb/parallel_for.h>
+
+
+class ConvertColorToGrayScaleTest
+{
+  const FloatVec3_t m_defaultWeights{0.2125f, 0.7154f, 0.0721f};
+  const bool m_createNewAM = false;
+  const QString m_filtName = "ConvertColorToGrayScale";
+  const QString m_outputArrayPrefix = "grayTestImage";
+  const QString m_outputAMName = "grayTestAM";
+  AbstractFilter::Pointer m_colorToGrayscaleFilter;
+  DataContainerArray::Pointer m_dca;
+
+  enum Algorithms
+  {
+    LUMINOSITY,
+    AVERAGE,
+    LIGHTNESS,
+    SINGLE_CHANNEL
+  };
+
+  const std::vector<std::vector<uint8_t>> testColors{
+      {0, 0, 0},       // black
+      {0, 0, 128},     // navy
+      {0, 0, 255},     // blue
+      {128, 0, 0},     // maroon
+      {128, 0, 128},   // purple
+      {255, 0, 0},     // red
+      {255, 0, 255},   // fuchsia
+      {0, 128, 0},     // green
+      {0, 128, 128},   // teal
+      {128, 128, 0},   // olive
+      {128, 128, 128}, // gray
+      {0, 255, 0},     // lime
+      {192, 192, 192}, // silver
+      {0, 255, 255},   // aqua
+      {255, 255, 0},   // yellow
+      {255, 255, 255}, // white
+  };
+  const std::vector<uint8_t> checkDefaultLuminosityColors{
+      0,   // black
+      9,   // navy
+      18,  // blue
+      27,  // maroon
+      36,  // purple
+      54,  // red
+      73,  // fuchsia
+      92,  // green
+      101, // teal
+      119, // olive
+      128, // gray
+      182, // lime
+      192, // silver
+      201, // aqua
+      237, // yellow
+      255, // white
+  };
+  const std::vector<uint8_t> checkCustomLuminosityColors{
+      0,   // black
+      96,  // navy
+      191, // blue
+      96,  // maroon
+      192, // purple
+      191, // red
+      127, // fuchsia
+      96,  // green
+      192, // teal
+      192, // olive
+      32,  // gray
+      191, // lime
+      176, // silver
+      127, // aqua
+      127, // yellow
+      62,  // white
+  };
+  const std::vector<uint8_t> checkLessZeroLuminosityColors{
+      0,   // black
+      160, // navy
+      65,  // blue
+      160, // maroon
+      64,  // purple
+      65,  // red
+      129, // fuchsia
+      160, // green
+      64,  // teal
+      64,  // olive
+      224, // gray
+      65,  // lime
+      80,  // silver
+      129, // aqua
+      129, // yellow
+      194, // white
+  };
+  const std::vector<uint8_t> checkGreaterOneLuminosityColors{
+      0,   // black
+      224, // navy
+      190, // blue
+      224, // maroon
+      192, // purple
+      190, // red
+      125, // fuchsia
+      224, // green
+      192, // teal
+      192, // olive
+      160, // gray
+      190, // lime
+      240, // silver
+      125, // aqua
+      125, // yellow
+      59,  // white
+  };
+  const std::vector<uint8_t> checkLessNegativeOneLuminosityColors{
+      0,   // black
+      32,  // navy
+      66,  // blue
+      32,  // maroon
+      64,  // purple
+      66,  // red
+      131, // fuchsia
+      32,  // green
+      64,  // teal
+      64,  // olive
+      96,  // gray
+      66,  // lime
+      16,  // silver
+      131, // aqua
+      131, // yellow
+      197, // white
+  };
+  const std::vector<uint8_t> checkAverageColors{
+      0,   // black
+      43,  // navy
+      85,  // blue
+      43,  // maroon
+      85,  // purple
+      85,  // red
+      170, // fuchsia
+      43,  // green
+      85,  // teal
+      85,  // olive
+      128, // gray
+      85,  // lime
+      192, // silver
+      170, // aqua
+      170, // yellow
+      255, // white
+  };
+  const std::vector<uint8_t> checkLightnessColors{
+      0,   // black
+      64,  // navy
+      128, // blue
+      64,  // maroon
+      64,  // purple
+      128, // red
+      128, // fuchsia
+      64,  // green
+      64,  // teal
+      64,  // olive
+      128, // gray
+      128, // lime
+      192, // silver
+      128, // aqua
+      128, // yellow
+      255, // white
+  };
+  const std::vector<uint8_t> checkRChannelColors{
+      0,   // black
+      0,   // navy
+      0,   // blue
+      128, // maroon
+      128, // purple
+      255, // red
+      255, // fuchsia
+      0,   // green
+      0,   // teal
+      128, // olive
+      128, // gray
+      0,   // lime
+      192, // silver
+      0,   // aqua
+      255, // yellow
+      255, // white
+  };
+  const std::vector<uint8_t> checkGChannelColors{
+      0,   // black
+      0,   // navy
+      0,   // blue
+      0,   // maroon
+      0,   // purple
+      0,   // red
+      0,   // fuchsia
+      128, // green
+      128, // teal
+      128, // olive
+      128, // gray
+      255, // lime
+      192, // silver
+      255, // aqua
+      255, // yellow
+      255, // white
+  };
+  const std::vector<uint8_t> checkBChannelColors{
+      0,   // black
+      128, // navy
+      255, // blue
+      0,   // maroon
+      128, // purple
+      0,   // red
+      255, // fuchsia
+      0,   // green
+      128, // teal
+      0,   // olive
+      128, // gray
+      0,   // lime
+      192, // silver
+      255, // aqua
+      0,   // yellow
+      255, // white
+  };
+
+  const std::vector<std::vector<uint8_t>> algorithmMap{checkDefaultLuminosityColors,
+                                                       checkCustomLuminosityColors,
+                                                       checkLessZeroLuminosityColors,
+                                                       checkGreaterOneLuminosityColors,
+                                                       checkLessNegativeOneLuminosityColors,
+                                                       checkAverageColors,
+                                                       checkLightnessColors,
+                                                       checkRChannelColors,
+                                                       checkGChannelColors,
+                                                       checkBChannelColors};
+
+  void SetDataArrayTestValues(DataArray<uint8_t>::Pointer& aa)
+  {
+    aa->initializeWithValue(0);
+    size_t index = 0;
+    for(const auto& eachColor : testColors)
+    {
+      aa->setTuple(index++, eachColor);
+    }
+  }
+
+  static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const QVector<size_t>& tDims)
+  {
+    AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
+    am->addAttributeArray(aa->getName(), aa);
+
+    DataContainer::Pointer dc = DataContainer::New(SIMPL::Defaults::VertexDataContainerName);
+    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, am);
+    dc->setGeometry(VertexGeom::CreateGeometry(static_cast<int64_t>(aa->getNumberOfTuples()), SIMPL::Geometry::VertexGeometry));
+    return dc;
+  }
+
+  int CheckFilterParameters(const QVariant& algorithm, const FloatVec3_t& cws, const uint8_t& cc)
+  {
+    QVariant conversionAlgorithm{m_colorToGrayscaleFilter->property("ConversionAlgorithm")};
+    FloatVec3_t colorWeights{(m_colorToGrayscaleFilter->property("ColorWeights").value<FloatVec3_t>())};
+    QVariant outputArrayPrefix{m_colorToGrayscaleFilter->property("OutputArrayPrefix")};
+    QVariant colorChannel{m_colorToGrayscaleFilter->property("ColorChannel")};
+    QVariant createNewAM{m_colorToGrayscaleFilter->property("CreateNewAttributeMatrix")};
+    QVariant outputAMName{m_colorToGrayscaleFilter->property("OutputAttributeMatrixName")};
+
+    int wrongParameters = 0;
+    wrongParameters += (conversionAlgorithm == algorithm) ? 0 : 1;
+    float epsilon = 0.000000001f;
+    wrongParameters += (abs(colorWeights.x - cws.x) < epsilon && abs(colorWeights.y - cws.y) < epsilon && abs(colorWeights.z - cws.z) < epsilon) ? 0 : 1;
+    wrongParameters += (outputArrayPrefix == m_outputArrayPrefix) ? 0 : 1;
+    wrongParameters += (colorChannel == cc) ? 0 : 1;
+    wrongParameters += (createNewAM == m_createNewAM) ? 0 : 1;
+    wrongParameters += (outputAMName == m_outputAMName) ? 0 : 1;
+
+    return wrongParameters;
+  }
+
+  int CompareResults(const uint8_t& algoMapIndex) const
+  {
+    QString amName = m_outputAMName;
+    DataContainer::Pointer dc = m_dca->getDataContainers().first();
+    if(!m_createNewAM)
+    {
+      amName = dc->getAttributeMatrices().first()->getName();
+    }
+    AttributeMatrix::Pointer am = dc->getAttributeMatrix(amName);
+
+    UCharArrayType::Pointer testArray{};
+    for(const auto& eachAAName : am->getAttributeArrayNames())
+    {
+      if(eachAAName.contains(m_outputArrayPrefix))
+      {
+        testArray = am->getAttributeArrayAs<UCharArrayType>(eachAAName);
+      }
+    }
+
+    std::vector<uint8_t> colorArray{algorithmMap[algoMapIndex]};
+
+    int wrongValues = 0;
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, colorArray.size()), [&](const tbb::blocked_range<size_t>& r) {
+      for(size_t index = r.begin(); index < r.end(); ++index)
+      {
+        wrongValues += (testArray->getValue(index) == colorArray[index]) ? 0 : 1;
+      }
+    });
+    return wrongValues;
+  }
+
+  /**
+   @brief Creates the input data array path from the data container and
+   assigns it, the passed data container, and any other relevant parameters
+   to the filter
+   @details The DCA can hold multiple geometries; as long as the data container
+   of the desired geometry is passed in here this method will sort out the input
+   data array path and should work as expected
+   */
+  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const FloatVec3_t& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
+  {
+    m_dca->addDataContainer(dc);
+    QVector<DataArrayPath> daps{};
+    for(const AttributeMatrix::Pointer& eachAM : dc->getAttributeMatrices())
+    {
+      QString amName = eachAM->getName();
+      for(const QString& eachAAName : eachAM->getAttributeArrayNames())
+      {
+        // Make sure not to add an output AA
+        if(!eachAAName.contains(m_outputArrayPrefix))
+        {
+          daps.append(DataArrayPath(dc->getName(), amName, eachAAName));
+        }
+      }
+    }
+
+    QVariant dataArrayVector{};
+    dataArrayVector.setValue(daps);
+
+    QVariant cw{};
+    cw.setValue(colorWeights);
+
+    m_colorToGrayscaleFilter->setProperty("ConversionAlgorithm", algorithm);
+    m_colorToGrayscaleFilter->setProperty("OutputArrayPrefix", static_cast<QVariant>(m_outputArrayPrefix));
+    m_colorToGrayscaleFilter->setProperty("ColorWeights", cw);
+    m_colorToGrayscaleFilter->setProperty("ColorChannel", colorChannel);
+    m_colorToGrayscaleFilter->setProperty("CreateNewAttributeMatrix", m_createNewAM);
+    m_colorToGrayscaleFilter->setProperty("OutputAttributeMatrixName", static_cast<QVariant>(m_outputAMName));
+    m_colorToGrayscaleFilter->setProperty("InputDataArrayVector", dataArrayVector);
+    m_colorToGrayscaleFilter->setDataContainerArray(m_dca);
+
+    int wrongParameters = CheckFilterParameters(algorithm, colorWeights, colorChannel);
+    DREAM3D_REQUIRE_EQUAL(0, wrongParameters)
+  }
+
+  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const uint8_t& colorChannel)
+  {
+    SetUp(algorithm, dc, m_defaultWeights, colorChannel);
+  }
+
+  int RunTest(const uint8_t& algoMapIndex)
+  {
+    m_colorToGrayscaleFilter->execute();
+    int erred = m_colorToGrayscaleFilter->getErrorCondition();
+    DREAM3D_REQUIRE_EQUAL(erred, 0);
+    int wrongValues = CompareResults(algoMapIndex);
+    DREAM3D_REQUIRE_EQUAL(wrongValues, 0)
+    return erred + wrongValues;
+  }
+
+  /**
+   * @brief Resets the environment for another test
+   */
+  void TearDown(const DataContainer::Pointer& dc) const
+  {
+    for(const auto& eachDC : m_dca->getDataContainers())
+    {
+      for(const auto& eachAM : eachDC->getAttributeMatrices())
+      {
+        for(const auto& eachAAName : eachAM->getAttributeArrayNames())
+        {
+          if(eachAAName.contains(m_outputArrayPrefix))
+          {
+            eachAM->getAttributeArray(eachAAName)->releaseOwnership();
+            eachAM->removeAttributeArray(eachAAName);
+            bool doesAAStillExist = m_dca->doesAttributeArrayExist(DataArrayPath(eachDC->getName(), eachAM->getName(), eachAAName));
+            DREAM3D_REQUIRE_EQUAL(false, doesAAStillExist)
+          }
+        }
+        eachDC->removeAttributeMatrix(m_outputAMName);
+        bool doesAMStillExist = eachDC->doesAttributeMatrixExist(m_outputAMName);
+        DREAM3D_REQUIRE_EQUAL(false, doesAMStillExist)
+      }
+    }
+
+    m_dca->removeDataContainer(dc->getName());
+
+#if REMOVE_TEST_FILES
+//    QFile::remove(UnitTest::ConvertColorToGrayScale::TestOutputPath);
+#endif
+  }
+
+public:
+  ConvertColorToGrayScaleTest(const ConvertColorToGrayScaleTest&) = delete;            // Copy Constructor
+  ConvertColorToGrayScaleTest(ConvertColorToGrayScaleTest&&) = delete;                 // Move Constructor
+  ConvertColorToGrayScaleTest& operator=(const ConvertColorToGrayScaleTest&) = delete; // Copy Assignment
+  ConvertColorToGrayScaleTest& operator=(ConvertColorToGrayScaleTest&&) = delete;      // Move Assignment
+
+  ConvertColorToGrayScaleTest()
+  : m_dca{DataContainerArray::New()}
+  {
+    IFilterFactory::Pointer colorToGrayscaleFactory = FilterManager::Instance()->getFactoryFromClassName(m_filtName);
+    DREAM3D_REQUIRE(colorToGrayscaleFactory.get() != nullptr);
+
+    m_colorToGrayscaleFilter = colorToGrayscaleFactory->create();
+    DREAM3D_REQUIRE(m_colorToGrayscaleFilter.get() != nullptr);
+  }
+  ~ConvertColorToGrayScaleTest() = default;
+
+  void operator()()
+  {
+    int err = 0;
+
+    const QString aaName = SIMPL::VertexData::SurfaceMeshNodes;
+    const QVector<size_t> tDims{16};
+    const QVector<size_t> cDims{3, 1, 1};
+
+    DataArray<uint8_t>::Pointer testAA{DataArray<uint8_t>::CreateArray(tDims, cDims, aaName)};
+    SetDataArrayTestValues(testAA);
+
+    // NOTE: This filter has no geometry requirements
+    DataContainer::Pointer vertexDC{createVertexGeometryDataContainer(testAA, tDims)};
+
+    // Luminosity Algorithm testing
+    // Test defaults
+    qDebug() << "Testing luminosity algorithm...";
+    qDebug() << "Default weights (0.2125, 0.7154, 0.0721)...";
+    SetUp(Algorithms::LUMINOSITY, vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(0))
+    TearDown(vertexDC);
+
+    // Test custom
+    FloatVec3_t colorWeights{0.75, 0.75, 0.75};
+    qDebug() << "Custom weights (0.75, 0.75, 0.75)...";
+    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
+    DREAM3D_REGISTER_TEST(RunTest(1))
+    TearDown(vertexDC);
+
+    // Test <0
+    colorWeights = {-0.75, -0.75, -0.75};
+    qDebug() << "Testing weights < 0 (-0.75, -0.75, -0.75)...";
+    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
+    DREAM3D_REGISTER_TEST(RunTest(2))
+    TearDown(vertexDC);
+
+    // Test >1
+    colorWeights = {1.75, 1.75, 1.75};
+    qDebug() << "Testing weights > 1 (1.75, 1.75, 1.75)...";
+    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
+    DREAM3D_REGISTER_TEST(RunTest(3))
+    TearDown(vertexDC);
+
+    // Test <-1
+    colorWeights = {-1.75, -1.75, -1.75};
+    qDebug() << "Testing weights < -1 (-1.75, -1.75, -1.75)...";
+    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
+    DREAM3D_REGISTER_TEST(RunTest(4))
+    TearDown(vertexDC);
+
+    // Average Algorithm testing
+    qDebug() << "Testing average algorithm...";
+    SetUp(Algorithms::AVERAGE, vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(5))
+    TearDown(vertexDC);
+
+    // Lightness Algorithm testing
+    qDebug() << "Testing lightness algorithm...";
+    SetUp(Algorithms::LIGHTNESS, vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(6))
+    TearDown(vertexDC);
+
+    // Single Channel Algorithm testing
+    // Red channel
+    qDebug() << "Testing red channel algorithm...";
+    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(7))
+    TearDown(vertexDC);
+
+    // Green channel
+    qDebug() << "Testing green channel algorithm...";
+    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC, 1);
+    DREAM3D_REGISTER_TEST(RunTest(8))
+    TearDown(vertexDC);
+
+    // Blue channel
+    qDebug() << "Testing blue channel algorithm...";
+    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC, 2);
+    DREAM3D_REGISTER_TEST(RunTest(9))
+    TearDown(vertexDC);
+  }
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index 97d0dbbef8..c948d2e9f2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -8,6 +8,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   CombineAttributeMatricesTest
   ConditionalSetValueTest
   ConvertDataTest
+  ConvertColorToGrayScaleTest
   CopyFeatureArrayToElementArrayTest
   CopyObjectTest
   CreateAttributeMatrixTest
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md
new file mode 100644
index 0000000000..1aa64f764c
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md
@@ -0,0 +1,49 @@
+Initialize Data 
+=============
+
+## Group (Subgroup) ##
+
+Processing (Cleanup)
+
+## Description ##
+
+This **Filter** allows the user to define a subvolume of the data set in which the **Filter** will reset all data by writing *zeros (0)* into every array for every **Cell** within the subvolume.
+
+## Parameters ##
+
+| Name | Type | Description |
+|------|------|-------------|
+| X Min | int32_t | Minimum X bound in **Cells** |
+| Y Min | int32_t | Minimum Y bound in **Cells** |
+| Z Min | int32_t | Minimum Z bound in **Cells** |
+| X Max | int32_t | Maximum X bound in **Cells** |
+| Y Max | int32_t | Maximum Y bound in **Cells** |
+| Z Max | int32_t | Maximum Z bound in **Cells** |
+
+## Required Geometry ##
+
+Image 
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|------|----------------------|-------------|
+| **Attribute Matrix** | CellData | Cell | N/A | **Cell** data in which to initialize a subvolume to zeros |
+
+## Created Objects ##
+
+None
+
+## Example Pipelines ##
+
+
+
+## License & Copyright ##
+
+Please see the description file distributed with this **Plugin**
+
+## DREAM.3D Mailing Lists ##
+
+If you need more help with a **Filter**, please consider asking your question on the [DREAM.3D Users Google group!](https://groups.google.com/forum/?hl=en#!forum/dream3d-users)
+
+

From 5766833149b9c7ca427ebf677928df454fde5edc Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 20 Feb 2019 15:44:59 -0500
Subject: [PATCH 047/397] Updating QtSDisclosableGroupBox class with the
 ability to set a content layout.  The group box will animate open and closed
 when the disclose button is pressed.

---
 .../QtSupport/QtSDisclosableGroupBox.cpp      | 70 ++++++++++++++++++-
 .../QtSupport/QtSDisclosableGroupBox.h        | 22 +++++-
 2 files changed, 86 insertions(+), 6 deletions(-)

diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp b/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp
index 20f2336345..82771f4727 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp
@@ -39,7 +39,10 @@
 #include <iostream>
 
 #include <QtCore/QTimer>
+#include <QtCore/QPropertyAnimation>
+
 #include <QtGui/QPainter>
+
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QFormLayout>
 #include <QtWidgets/QGridLayout>
@@ -54,9 +57,39 @@
 //
 // -----------------------------------------------------------------------------
 QtSDisclosableGroupBox::QtSDisclosableGroupBox(QWidget* parent)
-: QGroupBox(parent)
+: QWidget(parent)
 {
-  connect(this, SIGNAL(toggled(bool)), this, SLOT(disclose(bool)));
+//  connect(this, SIGNAL(toggled(bool)), this, SLOT(disclose(bool)));
+
+  toggleButton.setStyleSheet("QToolButton { border: none; }");
+  toggleButton.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+  toggleButton.setArrowType(Qt::ArrowType::RightArrow);
+  toggleButton.setCheckable(true);
+  toggleButton.setChecked(false);
+
+  headerLine.setFrameShape(QFrame::HLine);
+  headerLine.setFrameShadow(QFrame::Sunken);
+  headerLine.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+
+//  contentArea.setStyleSheet("QScrollArea { border: none; }");
+  contentArea.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+  contentArea.setMaximumHeight(0);
+  contentArea.setMinimumHeight(0);
+  toggleAnimation.addAnimation(new QPropertyAnimation(this, "minimumHeight"));
+  toggleAnimation.addAnimation(new QPropertyAnimation(this, "maximumHeight"));
+  toggleAnimation.addAnimation(new QPropertyAnimation(&contentArea, "maximumHeight"));
+  mainLayout.setVerticalSpacing(0);
+  mainLayout.setContentsMargins(0, 0, 0, 0);
+  int row = 0;
+  mainLayout.addWidget(&toggleButton, row, 0, 1, 1, Qt::AlignLeft);
+  mainLayout.addWidget(&headerLine, row++, 2, 1, 1);
+  mainLayout.addWidget(&contentArea, row, 0, 1, 3);
+  setLayout(&mainLayout);
+  QObject::connect(&toggleButton, &QToolButton::clicked, [this](const bool checked) {
+    toggleButton.setArrowType(checked ? Qt::ArrowType::DownArrow : Qt::ArrowType::RightArrow);
+    toggleAnimation.setDirection(checked ? QAbstractAnimation::Forward : QAbstractAnimation::Backward);
+    toggleAnimation.start();
+  });
 }
 
 // -----------------------------------------------------------------------------
@@ -83,9 +116,39 @@ void QtSDisclosableGroupBox::updateWidgetStyle()
 // -----------------------------------------------------------------------------
 void QtSDisclosableGroupBox::setupGui()
 {
-  setCheckable(true);
+
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void QtSDisclosableGroupBox::setTitle(const QString &title)
+{
+  toggleButton.setText(title);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void QtSDisclosableGroupBox::setContentLayout(QLayout* contentLayout)
+{
+  delete contentArea.layout();
+  contentArea.setLayout(contentLayout);
+  const auto collapsedHeight = sizeHint().height() - contentArea.maximumHeight();
+  auto contentHeight = contentLayout->sizeHint().height();
+  for (int i = 0; i < toggleAnimation.animationCount() - 1; ++i) {
+    QPropertyAnimation * spoilerAnimation = static_cast<QPropertyAnimation *>(toggleAnimation.animationAt(i));
+    spoilerAnimation->setDuration(animationDuration);
+    spoilerAnimation->setStartValue(collapsedHeight);
+    spoilerAnimation->setEndValue(collapsedHeight + contentHeight);
+  }
+  QPropertyAnimation * contentAnimation = static_cast<QPropertyAnimation *>(toggleAnimation.animationAt(toggleAnimation.animationCount() - 1));
+  contentAnimation->setDuration(animationDuration);
+  contentAnimation->setStartValue(0);
+  contentAnimation->setEndValue(contentHeight);
 }
 
+#if 0
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -117,3 +180,4 @@ void QtSDisclosableGroupBox::disclose(bool on)
     }
   }
 }
+#endif
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h b/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h
index aef9e79370..805b033bd5 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h
@@ -33,7 +33,13 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtWidgets/QGroupBox>
+#include <QtCore/QParallelAnimationGroup>
+
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QScrollArea>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -51,7 +57,7 @@ class QRect;
  * @date Jan 6, 2012
  * @version 1.0
  */
-class SVWidgetsLib_EXPORT QtSDisclosableGroupBox : public QGroupBox
+class SVWidgetsLib_EXPORT QtSDisclosableGroupBox : public QWidget
 {
   Q_OBJECT
 public:
@@ -60,12 +66,15 @@ class SVWidgetsLib_EXPORT QtSDisclosableGroupBox : public QGroupBox
 
   virtual void setupGui();
 
+  void setContentLayout(QLayout* contentLayout);
+
+  void setTitle(const QString &title);
 
 signals:
   void dragStarted(QtSDisclosableGroupBox* widget);
 
 public slots:
-  void disclose(bool on);
+//  void disclose(bool on);
 
   /**
       * @brief Sets the style of the Widget to indicate a selected or non-selected
@@ -79,6 +88,13 @@ public slots:
       */
   void updateWidgetStyle();
 
+private:
+  QGridLayout mainLayout;
+  QToolButton toggleButton;
+  QFrame headerLine;
+  QParallelAnimationGroup toggleAnimation;
+  QScrollArea contentArea;
+  int animationDuration = 300;
 
 public:
   QtSDisclosableGroupBox(const QtSDisclosableGroupBox&) = delete; // Copy Constructor Not Implemented

From fe3e08c06807e93da55063d6335862d82e775029 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 21 Feb 2019 09:02:47 -0500
Subject: [PATCH 048/397] Changing the name of QtSDisclosableGroupBox to
 QtSDisclosableWidget.

---
 ...leGroupBox.cpp => QtSDisclosableWidget.cpp} | 18 +++++++++---------
 ...osableGroupBox.h => QtSDisclosableWidget.h} | 18 +++++++++---------
 Source/SVWidgetsLib/QtSupport/SourceList.cmake |  5 ++---
 3 files changed, 20 insertions(+), 21 deletions(-)
 rename Source/SVWidgetsLib/QtSupport/{QtSDisclosableGroupBox.cpp => QtSDisclosableWidget.cpp} (93%)
 rename Source/SVWidgetsLib/QtSupport/{QtSDisclosableGroupBox.h => QtSDisclosableWidget.h} (81%)

diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
similarity index 93%
rename from Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp
rename to Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
index 82771f4727..32508aa974 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
@@ -34,7 +34,7 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include "QtSDisclosableGroupBox.h"
+#include "QtSDisclosableWidget.h"
 
 #include <iostream>
 
@@ -56,7 +56,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QtSDisclosableGroupBox::QtSDisclosableGroupBox(QWidget* parent)
+QtSDisclosableWidget::QtSDisclosableWidget(QWidget* parent)
 : QWidget(parent)
 {
 //  connect(this, SIGNAL(toggled(bool)), this, SLOT(disclose(bool)));
@@ -95,26 +95,26 @@ QtSDisclosableGroupBox::QtSDisclosableGroupBox(QWidget* parent)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QtSDisclosableGroupBox::~QtSDisclosableGroupBox() = default;
+QtSDisclosableWidget::~QtSDisclosableWidget() = default;
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::changeStyle()
+void QtSDisclosableWidget::changeStyle()
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::updateWidgetStyle()
+void QtSDisclosableWidget::updateWidgetStyle()
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::setupGui()
+void QtSDisclosableWidget::setupGui()
 {
 
 }
@@ -122,7 +122,7 @@ void QtSDisclosableGroupBox::setupGui()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::setTitle(const QString &title)
+void QtSDisclosableWidget::setTitle(const QString &title)
 {
   toggleButton.setText(title);
 }
@@ -130,7 +130,7 @@ void QtSDisclosableGroupBox::setTitle(const QString &title)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::setContentLayout(QLayout* contentLayout)
+void QtSDisclosableWidget::setContentLayout(QLayout* contentLayout)
 {
   delete contentArea.layout();
   contentArea.setLayout(contentLayout);
@@ -152,7 +152,7 @@ void QtSDisclosableGroupBox::setContentLayout(QLayout* contentLayout)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableGroupBox::disclose(bool on)
+void QtSDisclosableWidget::disclose(bool on)
 {
   if(on)
   {
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
similarity index 81%
rename from Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h
rename to Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
index 805b033bd5..38a469b93f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableGroupBox.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
@@ -47,7 +47,7 @@ class QLayout;
 class QRect;
 
 /**
- * @class QtSDisclosableGroupBox QtSDisclosableGroupBox.h FilterWidgets/QtSDisclosableGroupBox.h
+ * @class QtSDisclosableWidget QtSDisclosableWidget.h FilterWidgets/QtSDisclosableWidget.h
  * @brief  This class is a subclass of the QGroupBox class and is used to display
  * Filter Options that the user can set. This class is capable of constructing a
  * default GUI widget set for each type of Filter Option that is available. If
@@ -57,12 +57,12 @@ class QRect;
  * @date Jan 6, 2012
  * @version 1.0
  */
-class SVWidgetsLib_EXPORT QtSDisclosableGroupBox : public QWidget
+class SVWidgetsLib_EXPORT QtSDisclosableWidget : public QWidget
 {
   Q_OBJECT
 public:
-  QtSDisclosableGroupBox(QWidget* parent = nullptr);
-  ~QtSDisclosableGroupBox() override;
+  QtSDisclosableWidget(QWidget* parent = nullptr);
+  ~QtSDisclosableWidget() override;
 
   virtual void setupGui();
 
@@ -71,7 +71,7 @@ class SVWidgetsLib_EXPORT QtSDisclosableGroupBox : public QWidget
   void setTitle(const QString &title);
 
 signals:
-  void dragStarted(QtSDisclosableGroupBox* widget);
+  void dragStarted(QtSDisclosableWidget* widget);
 
 public slots:
 //  void disclose(bool on);
@@ -97,9 +97,9 @@ public slots:
   int animationDuration = 300;
 
 public:
-  QtSDisclosableGroupBox(const QtSDisclosableGroupBox&) = delete; // Copy Constructor Not Implemented
-  QtSDisclosableGroupBox(QtSDisclosableGroupBox&&) = delete;      // Move Constructor Not Implemented
-  QtSDisclosableGroupBox& operator=(const QtSDisclosableGroupBox&) = delete; // Copy Assignment Not Implemented
-  QtSDisclosableGroupBox& operator=(QtSDisclosableGroupBox&&) = delete;      // Move Assignment Not Implemented
+  QtSDisclosableWidget(const QtSDisclosableWidget&) = delete; // Copy Constructor Not Implemented
+  QtSDisclosableWidget(QtSDisclosableWidget&&) = delete;      // Move Constructor Not Implemented
+  QtSDisclosableWidget& operator=(const QtSDisclosableWidget&) = delete; // Copy Assignment Not Implemented
+  QtSDisclosableWidget& operator=(QtSDisclosableWidget&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SVWidgetsLib/QtSupport/SourceList.cmake b/Source/SVWidgetsLib/QtSupport/SourceList.cmake
index ee514ae9b0..d55ad0da52 100755
--- a/Source/SVWidgetsLib/QtSupport/SourceList.cmake
+++ b/Source/SVWidgetsLib/QtSupport/SourceList.cmake
@@ -15,7 +15,7 @@ set(SVWidgetsLib_QtSupport_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSCheckboxDialog.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QRoundProgressBar.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSColorComboPicker.h
-  ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDisclosableGroupBox.h
+  ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDisclosableWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDistributionTypeWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDroppableScrollArea.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDocServer.h
@@ -33,7 +33,6 @@ set(SVWidgetsLib_QtSupport_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSSettings.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSSplitter.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSSplitterHandle.h
-  ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDisclosableGroupBox.h
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSStringEdit.h
   
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/httpserver/QtSStaticFileController.h
@@ -46,7 +45,7 @@ set(SVWidgetsLib_QtSupport_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSCheckboxDialog.cpp
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QRoundProgressBar.cpp
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSColorComboPicker.cpp
-  ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDisclosableGroupBox.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDisclosableWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDistributionTypeWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDroppableScrollArea.cpp
   ${SVWidgetsLib_SOURCE_DIR}/QtSupport/QtSDocServer.cpp  

From 501f3a3aa043e2f8a1376f3408d8cd4d55c2052d Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 1 Mar 2019 15:10:34 -0500
Subject: [PATCH 049/397] Registering FilterPipeline class as a meta type.

---
 Source/SIMPLib/Filtering/FilterPipeline.h         | 2 +-
 Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index f35f89edbc..789992ca4c 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -242,4 +242,4 @@ public slots:
   FilterPipeline& operator=(const FilterPipeline&) = delete; // Copy Assignment Not Implemented
   FilterPipeline& operator=(FilterPipeline&&) = delete;      // Move Assignment Not Implemented
 };
-
+Q_DECLARE_METATYPE(FilterPipeline::Pointer);
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 9f80d454cc..dfe92a9c40 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -45,6 +45,7 @@
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
@@ -152,6 +153,7 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<ComparisonInputs>("ComparisonInputs");
   qRegisterMetaType<ComparisonInputsAdvanced>("ComparisonInputsAdvanced");
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
+  qRegisterMetaType<FilterPipeline::Pointer>("FilterPipeline");
   qRegisterMetaType<IntVec3_t>("IntVec3_t");
   qRegisterMetaType<FloatVec3_t>("FloatVec3_t");
   qRegisterMetaType<PipelineMessage>("PipelineMessage");

From 8f8b8db85be576441985c313984175401f91effa Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 7 Mar 2019 14:54:30 -0500
Subject: [PATCH 050/397] Fixing compilation error.

---
 Source/SIMPLib/FilterParameters/FloatVec3.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/FilterParameters/FloatVec3.h b/Source/SIMPLib/FilterParameters/FloatVec3.h
index 2121e9e2f7..b6e17a4c93 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3.h
@@ -29,7 +29,10 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <cmath>
+
 #include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
 
 typedef struct
 {
@@ -71,4 +74,4 @@ typedef struct
   }
 } FloatVec3_t;
 
-Q_DECLARE_METATYPE(FloatVec3_t)
\ No newline at end of file
+Q_DECLARE_METATYPE(FloatVec3_t)

From ae03a13db39e59de9627c2493dd55738ceb0b7f3 Mon Sep 17 00:00:00 2001
From: Tom Platt <tom.platt@bluequartz.net>
Date: Fri, 8 Mar 2019 16:32:42 -0500
Subject: [PATCH 051/397] Added a pipeline execute function that takes a
 DataContainerArray This is useful for running pipelines on existing data
 container arrays

Signed-off-by: Tom Platt <tom.platt@bluequartz.net>
---
 Source/SIMPLib/Filtering/FilterPipeline.cpp | 116 +++++++++++---------
 Source/SIMPLib/Filtering/FilterPipeline.h   |   5 +
 2 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 66383a19f5..54194df199 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -631,6 +631,14 @@ int FilterPipeline::preflightPipeline()
 //
 // -----------------------------------------------------------------------------
 DataContainerArray::Pointer FilterPipeline::execute()
+{
+  return execute(DataContainerArray::New());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer dca)
 {
   int err = 0;
 
@@ -639,7 +647,7 @@ DataContainerArray::Pointer FilterPipeline::execute()
 
   connectSignalsSlots();
 
-  m_Dca = DataContainerArray::New();
+  m_Dca = dca;
 
   // Start looping through the Pipeline
   float progress = 0.0f;
@@ -647,64 +655,64 @@ DataContainerArray::Pointer FilterPipeline::execute()
   // Connect this object to anything that wants to know about PipelineMessages
   for(const auto& messageReceiver : m_MessageReceivers)
   {
-    connect(this, SIGNAL(pipelineGeneratedMessage(const PipelineMessage&)), messageReceiver, SLOT(processPipelineMessage(const PipelineMessage&)));
+	connect(this, SIGNAL(pipelineGeneratedMessage(const PipelineMessage&)), messageReceiver, SLOT(processPipelineMessage(const PipelineMessage&)));
   }
 
   PipelineMessage progValue("", "", 0, PipelineMessage::MessageType::ProgressValue, -1);
   for(const auto& filt : m_Pipeline)
   {
-    progress = progress + 1.0f;
-    progValue.setType(PipelineMessage::MessageType::ProgressValue);
-    progValue.setProgressValue(static_cast<int>(progress / (m_Pipeline.size() + 1) * 100.0f));
-    emit pipelineGeneratedMessage(progValue);
-
-    QString ss = QObject::tr("[%1/%2] %3 ").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
-
-    progValue.setType(PipelineMessage::MessageType::StatusMessage);
-    progValue.setText(ss);
-    emit pipelineGeneratedMessage(progValue);
-    emit filt->filterInProgress(filt.get());
-
-    // Do not execute disabled filters
-    if(filt->getEnabled())
-    {
-      filt->setMessagePrefix(ss);
-      connectFilterNotifications(filt.get());
-      filt->setDataContainerArray(m_Dca);
-      setCurrentFilter(filt);
-      filt->execute();
-      disconnectFilterNotifications(filt.get());
-      filt->setDataContainerArray(DataContainerArray::NullPointer());
-      err = filt->getErrorCondition();
-      if(err < 0)
-      {
-        setErrorCondition(err);
-        progValue.setFilterClassName(filt->getNameOfClass());
-        progValue.setFilterHumanLabel(filt->getHumanLabel());
-        progValue.setType(PipelineMessage::MessageType::Error);
-        progValue.setProgressValue(100);
-        ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
-        progValue.setText(ss);
-        progValue.setPipelineIndex(filt->getPipelineIndex());
-        progValue.setCode(filt->getErrorCondition());
-        emit pipelineGeneratedMessage(progValue);
-        emit filt->filterCompleted(filt.get());
-        emit pipelineFinished();
-        disconnectSignalsSlots();
-
-        return m_Dca;
-      }
-    }
-
-    if(this->getCancel())
-    {
-      // Clear cancel filter state
-      filt->setCancel(false);
-      break;
-    }
-
-    // Emit that the filter is completed for those objects that care, even the disabled ones.
-    emit filt->filterCompleted(filt.get());
+	progress = progress + 1.0f;
+	progValue.setType(PipelineMessage::MessageType::ProgressValue);
+	progValue.setProgressValue(static_cast<int>(progress / (m_Pipeline.size() + 1) * 100.0f));
+	emit pipelineGeneratedMessage(progValue);
+
+	QString ss = QObject::tr("[%1/%2] %3 ").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+
+	progValue.setType(PipelineMessage::MessageType::StatusMessage);
+	progValue.setText(ss);
+	emit pipelineGeneratedMessage(progValue);
+	emit filt->filterInProgress(filt.get());
+
+	// Do not execute disabled filters
+	if(filt->getEnabled())
+	{
+	  filt->setMessagePrefix(ss);
+	  connectFilterNotifications(filt.get());
+	  filt->setDataContainerArray(m_Dca);
+	  setCurrentFilter(filt);
+	  filt->execute();
+	  disconnectFilterNotifications(filt.get());
+	  filt->setDataContainerArray(DataContainerArray::NullPointer());
+	  err = filt->getErrorCondition();
+	  if(err < 0)
+	  {
+		setErrorCondition(err);
+		progValue.setFilterClassName(filt->getNameOfClass());
+		progValue.setFilterHumanLabel(filt->getHumanLabel());
+		progValue.setType(PipelineMessage::MessageType::Error);
+		progValue.setProgressValue(100);
+		ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+		progValue.setText(ss);
+		progValue.setPipelineIndex(filt->getPipelineIndex());
+		progValue.setCode(filt->getErrorCondition());
+		emit pipelineGeneratedMessage(progValue);
+		emit filt->filterCompleted(filt.get());
+		emit pipelineFinished();
+		disconnectSignalsSlots();
+
+		return m_Dca;
+	  }
+	}
+
+	if(this->getCancel())
+	{
+	  // Clear cancel filter state
+	  filt->setCancel(false);
+	  break;
+	}
+
+	// Emit that the filter is completed for those objects that care, even the disabled ones.
+	emit filt->filterCompleted(filt.get());
   }
 
   emit pipelineFinished();
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 789992ca4c..33e273053e 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -102,6 +102,11 @@ class SIMPLib_EXPORT FilterPipeline : public QObject
    */
   virtual DataContainerArray::Pointer execute();
 
+  /**
+   * @brief An execute method using an existing data container array
+   */
+  DataContainerArray::Pointer execute(DataContainerArray::Pointer dca);
+
   /**
    * @brief This will preflight the pipeline and report any errors that would occur during
    * execution of the pipeline

From 88dc9aeb02ce649678cefa0f96fa125dffedd96e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 29 Mar 2019 14:12:16 -0400
Subject: [PATCH 052/397] Add ability to use either ITK 4 or 5. (#4)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../ITK/itkDream3DITransformContainerToTransform.h       | 5 +++++
 .../ITK/itkDream3DTransformContainerToTransform.hxx      | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index f6d7bc01da..1001b9dd9c 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -40,6 +40,11 @@
 
 #include "SIMPLib/Geometry/ITransformContainer.h"
 
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#define ITKv5_CONST
+#endif
+
+
 namespace itk
 {
 template <typename TParametersValueType = double, unsigned int CompositeNDimensions = 3>
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
index 67660726ef..e5d62fba96 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
@@ -35,6 +35,10 @@
 
 #include "itkDream3DTransformContainerToTransform.h"
 
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#define ITKv5_CONST
+#endif
+
 namespace itk
 {
 
@@ -90,7 +94,12 @@ Dream3DTransformContainerToTransform<ITKTransformType>
     itkExceptionMacro("Input transform container is empty");
   }
   const DecoratorType* outputPtr = this->GetOutput();
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5
   typename ITKTransformType::ConstPointer transform = outputPtr->Get();
+#elif defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+ typename ITKTransformType::Pointer transform = outputPtr->Get();
+#endif
+
   // Verifies that the number of Parameters and Fixed Parameters in the transform
   // match the expected number based on the transform type.
   if(transform->GetNumberOfParameters() != m_TransformContainer->getParameters().size())

From 8075925f3bf301916a6b5c8f77e43513238d247c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Apr 2019 14:47:14 -0400
Subject: [PATCH 053/397] Start SIMPL 2.0 development

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24e7bcd545..30aa1fe37f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ cmake_minimum_required(VERSION 3.13.0)
 #------------------------------------------------------------------------------
 # Create the Top level Project
 #
-project(SIMPLProj VERSION 1.2.0.0)
+project(SIMPLProj VERSION 2.0.0.0)
 
 # ---------- Setup output Directories -------------------------
 if(NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)

From 259e9399c9c5d4b988033fd57f0fbc7736605935 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Apr 2019 14:51:04 -0400
Subject: [PATCH 054/397] Update some Eigen3 CMake output

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30aa1fe37f..b7f0fc1df1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,7 +260,8 @@ endif()
 set(SIMPL_USE_EIGEN "")
 Find_Package(Eigen3 REQUIRED)
 if(EIGEN3_FOUND)
-  message(STATUS "Eigen3: ${EIGEN3_VERSION_STRING}")
+  message(STATUS "Eigen3 Location: ${EIGEN3_ROOT_DIR}")
+  message(STATUS "Eigen3 Version: ${EIGEN3_VERSION_STRING}")
   set(SIMPL_USE_EIGEN "1" CACHE INTERNAL "")
 else()
   message(WARNING "The Eigen Library is required for some algorithms to execute. These algorithms will be disabled.")

From d35f75c15c242c2741a143f6ef16fc3ce737fab0 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Mon, 1 Apr 2019 14:58:43 -0400
Subject: [PATCH 055/397] Feature/graph rename optimization (#335)

* Updated DataArrayPath rename for improved performance.

* Changed DataContainerArray collection of DataContainers from QList to std::list.
* Changed DataContainerArray createNonPrereq methods to include an optional DataID parameter for mapping renamable outputs.  These renamed paths are stored in the filter being operated on.
* AbstractFilter is now friends with DataContainerArray so that only DataContainerArray has access to the rename map due to createNonPrereq methods.  Ideally, these methods would be a part of AbstractFilter instead, but there isn't time to move them or redesign.
* Added clearRenamedPaths() and checkIfPathRenamed(const DataID, const DataArrayPath&) methods to AbstractFilter for keeping track of renamed outputs by the filter.  This is much faster than the previous implementation but requires each filter to keep track of created paths instead of brute forcing it at the end of preflight.
* Changed QString DataContainer::getName() to const for vastly improved performance during comparisons.
* Changed DataArrayPath::RenameType from std::tuple to std::pair.
* Changed DataArrayPath::RenameContainer from std::list to std::set
* Updated widgets that relied on QListIterators over the DataContainerArray container to ranged for loops for improved performance.

For testing purposes:
* Created MassCreateData filter that generates 4,000 DataContainers.
* Added RenameTimingTest for testing preflight speeds during rename checking with 8,000 Data Containers.  No Data Containers are actually renamed in the test, but the original rename algorithm would have to check regardless.
* Commented out other SIMPLib tests to reduce iteration time.

Test results (based on debug builds):
* Reduced subsequent preflight times to between 100-101% of the initial preflight time.  Down from over 150% of the initial preflight time.
* Reduced initial preflight time by almost 20% of the original algorithm's time.

Notes for future optimizations
* QString::compare(QString) == 0 is noticably slower than QString == QString
* Making DataContainer::getName() const made the biggest difference in speeds.  Use const whenever possible!
* std::set<T> can be slower than std::list<T> due to hashing when adding items.  If O(1) lookups are not important, use lists.
* Getting filters to store their created paths will vastly improve performance again.
* Getting filters to store their deleted paths and using that to check for when renaming should end will likely cut times by almost half based on tests when that part of rename was commented out. Based on tests where rename algorithm was commented out of FilterPipeline::preflightPipeline().

* Initial commit for DataStructure iterators and path support

* Began adding IDataStructureNode and iterators
* Added RenameDataPath.h instead of friend classing all data containers in AbstractFilter.

* Updated IDataStructureNode implementation

* Added name support including both getName() and setName(const QString&) where setName checks if the parent already has an item with the new name before attempting it.
* Improved iterator support to IDataStructureNode.  The custom DsnIterators implementation was expanded before rolling back to std::vector::iterator and ::const_iterator.
* Updated DataContainerArray, DataContainer, AttributeMatrix, and IDataArray to inherit from IDataStructureNode.  Getting that inheritance to compile will likely require a few greps as name parameters were removed from methods that added a child item as each node type knows its own name.
* Transferring computers.  This is still a WIP and probably won't compile yet.

* Added IDataStructureContainerNode.hpp

* Split parent data structure nodes off into their own subclass.
* WIP.  No core filters compiled.
* Does not compile

* (WIP) Additional IDataStructureNode support

* Removed m_Name from most data container and IDataArray types.
* Removed name override methods and variables from subclasses of IDataStructureNode.
* Fixed iterator syntax.

* (WIP) Branch compiles

* Added missing SIMPLib_EXPORT to IDataStructureNode, IDataStructureContainerNode, and RenameDataPath::AlertFilterCreatedPath
* Removed another Name property from StructArray.hpp.
* Updated tests and filters to use the correct containers.  Iterator loops were updated as appropriately where they were involved with updated container types.
* Added inline methods for adding DataContainer, AttributeMatrix, or DataArray that also accepted a const QString& parameter to not break previous API for now.  Name values are ignored in these helper methods.
* Updated DataContainerArray::getDataContainers to simply return getChildren();
* Added missing QString include to IDataStructureNode.
* Updated CreateAttributeMatrix.cpp to set DataID_t to correctly come from RenameDataPath instead of DataContainerArray.
* Branch compiles but tests crash.

* Removed unnecessary dynamic_pointer_cast to same type

* Fixed dynamic_pointer_cast in DataContainerArray, DataContainer and, AttributeMatrix.
* Added getChildByName() method to IDataStructureContainerNode for consistency.

* Refactored IDataStructureNode::setName for readability

* Added missing SIMPL_SHARED_POINTER to IDataStructureContainerNode

* Removed unused iterator from AttributeMatrix::renameAttributeArray

* Added missing newline at the end of RenameDataPath.cpp

* Fixed places where the merge broke existing functionality

* Removed DataArray get/setName methods.
* Removed m_Name variable from subclasses of DataArray
* StatsDataArray constructor correctly sets the name variable.
* Removed unnecessary setName after StringDataArray initialization in static creation methods.
* Standardized name lists for the various data container classes by making it a defined type in IDataStructureContainerNode.  This is currently QList to avoid breaking existing API, but it should be changed to something else due to it being the slowest Qt container.

* Updated Geometries to not rename DataArrays and AttributeMatrix

* WARNING: This will cause errors in XDMF files for read / write as well as gathering metadata.
* Geometries renaming objects was messing with expected DataArrayPaths once the path was the actual object's name instead of what it was at the point it was added to the data structure.
* Renaming sections were commented out to leave a record of what the expected behavior had been and what is likely required for XDMF files as well as metadata.
* Fixed a crash in FeatureDataCSVWriterTest caused by templating over the wrong types.  The int32_t and float tests were swapped due to a reordering of data arrays in the extracted array.
* 3 unit tests fail, but none cause crashes with the current changes.

* Create* and Rename* filters support renaming functionality

* Fixed previous errors when building SIMPLUnitTest.
* Fixed crashes while running SIMPLUnitTest.
* CreateDataContainer, CreateAttributeMatrix, and CreateDataArray all support rename checks again.
* RenameDataContainer, RenameAttributeMatrix, and RenameAttributeArray all support rename checks again.
* FilterPipeline now stops renaming paths when they are removed instead of created again.  This is an opt-in feature, but unlike rename, it should be very rare.  This is also faster as there are far fewer removed paths than created ones in most pipelines and an equal amount at most.
* FilterPipeline no longer renames filters and their previous DataContainerArray before preflighting them.
* DataContainer, AttributeMatrix, and DataArray can all calculate their own DataArrayPaths.
* DataContainerArray, DataContainer, and AttributeMatrix can retrieve all paths they contain.
* Setting an IDataStructureNode's parent removes the node from its current parent.
* Fixed crashes in MoveData and MoveMultiData caused by changes in IDataStructureContainerNode.

* Updated SIMPLib core filters from A-MassCreateData

* Updated all filters from ArrayCalculator to MassCreateData to take advantage of rename functionality.

* Updated the rest of core filters.  Added FilterPipeline improvements

* TemplateHelpers CreateNonPrereq methods take and pass through an optional DataID value.
* Updated the rest of core filters to opt into renaming functionality.
* Improved FilterPipeline to create missing rename paths when renaming a renamed path.
* Changed DataArrayPath::getDataType() to const
* Added isSubset(const DataArrayPath&) const method to DataArrayPath.
* Added static DataArrayPath method for creating the missing rename path linking two renames.
* AbstractFilter also updates the created paths map when checking renames.
* Rename filters also keep track of their last rename value and add an additional rename from the old value to the new one when it changes.  This had been stopping rename filters from passing their updated name on to later filters in the pipeline and taking advantage of the rename functionality despite their name and purpose.

* Fixed failing CombineAttributeMatricesTest

* AttributeMatrix "featureAttrMat2" was added to two different DataContainers.  Since the current data structure is still modelled after a tree, this was not supported as nodes are only allowed to have one parent.  A deep copy of featureAttrMat2 was added to the second data container instead.

* Added #if #endif guards for rename functionality in FilterPipeline

* #define RENAME_ENABLED at the top of the FilterPipeline.cpp determines if rename functionality is enabled or not.  This was introduced primarily for testing how much the given code slows down pipeline executions.

* Improved optimized rename operations to near pre-rename speeds

* Changed DataContainerArray::addDataContainer method to inline to drastically reduce runtime operations.
* Updated DataContainerArray::createNonPrereqDataContainer to take advantage of addDataContainer returning a bool to remove the existing doesDataContainerExist call.
* Optimized IDataStructureContainerNode for finding children by name.  This involves hashing the IDataStructureNode's name whenever it is changed, and then comparing that hash versus the hashed name being searched for.
* Performed various optimizations for DataContainer and AttributeMatrix, largely by adding inline to templated methods and wrappers for IDataStructureContainerNode methods.
* This dropped RenameTimingTest results by approximately 88% or more.
* The graph-based data structure still fails 3 tests.

* Fix compile errors on clang. (#3)

* Made a slight optimization to FilterParameter::dataArrayPathRenamed

* The QVariant validity is now checked first and returns if it is found to be invalid.  No other if / else if block checks for validity to prevent hitting every conditional check if the variant is invalid.

* dataArrayPathRenamed implemented in more FilterParameter subclasses

Also changed API to take a const reference to the rename path.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated typedef for FilterParameterVector to std::vector<>

+ Changed from QVector<> to std::vector<>
+ Changed to using from typedef

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Performed major performance optimization for actual rename ops

* Added an actual DataArrayPath rename to RenameTimingTest.
* inlined IDataStructureContainerNode's getNamesOfChildren(), getDescendantPaths(), and getAllPaths() methods for performance boost.
* DataArrayPath::RenameType parameters were changed to const DataArrayPath::RenameType&.  This involved changing AbstractFilter, DataArrayPath, and FilterParameter classes.
* DataArrayPath is no longer derived from QObject.
* DataArrayPath::DataType was moved to a new namespace in DataArrayPath.h called DataArrayPathHelper.
* Changed several methods in DataArrayPath to inline or constexpr.
* DataArrayPath now hashes each part of the path when it is set as well as stores the type of path it is whenever the path is changed.  This serves as a faster way to compare equality and type-check a path.
* Changed DataArrayPath variables to const DataArrayPath& due to the cost of constructing and destructing DataArrayPaths.
* Removed std::tie from uses of RenameType in DataArrayPath header and changed to assigning const DataArrayPath references using std::get

* More fixes to allow SIMPL to compile. Most tests pass.

Still working on getting all the SIMPLUnitTests to pass.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix more failing unit tests. Only a few remain. Array Calculator is one of them

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Add std::vector compatible interface onto DataArray<>.

Some IDataArray APIs needed to change in order to allow unambiguous situations

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Implemented more of the dataArrayPathRename in Filter Parameters and Updated API (#4)

* dataArrayPathRenamed implemented in more FilterParameter subclasses

Also changed API to take a const reference to the rename path.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated typedef for FilterParameterVector to std::vector<>

+ Changed from QVector<> to std::vector<>
+ Changed to using from typedef

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* More fixes to allow SIMPL to compile. Most tests pass.

Still working on getting all the SIMPLUnitTests to pass.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix more failing unit tests. Only a few remain. Array Calculator is one of them

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Add std::vector compatible interface onto DataArray<>.

Some IDataArray APIs needed to change in order to allow unambiguous situations

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed compile issues

* Updated preflight pipeline for performance boost

* Fixed a bug where DataArray deallocated data it does not own.

* Replaced missing check in destructor before calling deallocate()

* Fixed more DataArray crashes

* Added #include <cassert> to DataArray.hpp to allow compiling.
* Added a second set of parenthesis to an assert statement to avoid the comparison being treated as different tokens.
* Added an additional m_IsAllocated check in ~DataArray()
* Removed std::string m_Name variable from DataArray.
* Updated DataArray constructors to use IDataStructureNode name functionality instead of the removed m_Name variable.

* WIP: Changes API for FloatVec3, updates DataArray to STL container API

+ Updates API in AttributeMatrix: Add insert_or_assign (based on C++17 std::map semantics)
+ Updates DataArray<T> to have a more STL like interface
+ Updates FloatVec3_t to SIMPLArray<T, unsigned int Dimension> allows more STL like interfaces to be built onto the FloatVec3Type alias.
+ Lots of other replacements to update uses of the old API to the new API

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* WIP: Add insertOrAssign to all DataStructure classes.

+ Update all occurances of insert_or_assign to insertOrAssign
+ Update DataArray with proper allocation/deallocation schemes when the memory is not owned

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* WIP: Fix duplicate method declaration in DataArray

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Removed random "template " in TemplateHelpers method call chain

* Fixed a group of compile errors in TemplateHelpers.cpp caused by a method chain being broken with "template ".

* Updated SIMPLArray.hpp use named types consistently

* Added const_reference typedef for const T& and made the appropriate replacements.
* Updated value_type* data() to pointer data()
* Added using ParentType = SIMPLArray<T, *>; for each of the SIMPLArray subclasses.  The appropriate substitutions were made when calling the parent class's operators.
* Inlined the x/y/z/w methods instead of using constexpr.
* toTuple() methods use x/y/z/w methods for readability instead of calling the equivalent parent operators.

* WIP: Correct errors in DataArray.hpp that lead to crashes and bugs.

 For now there is no "resize(size_type)" method in DataArray until we are sure
 all the filters that used that function have been updated to use resizeTuples()
 instead.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* SIMPLArray x/y/z/w getters changed to get/set standard

* Changed 'T x/y/z/w()' to 'T getX/Y/Z/W() const'
* Added setters for x/y/z/w values.

* Updating recent filter merges from Develop.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed FloatVec3FilterParameter failing to write to JSON

* JSON parameter and variable had their names swapped without updating which value was inserted into the other.
* Fixing this allowed the FilterParameterRWTest to pass.

* Fixed FloatVec2FilterParameter writeJson method

* Unlike FloatVec3FilterParameter, this one was not caught by a unit test.
* Checked IntVec3FilterParameter::writeJson

* Fixing compile errors from over zealous search/replace

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix ArrayCalculator and ColorToGrayScale failing unit tests

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Add defensive checks for null pointers before accessing them.

Add a test for DataContainerArray/DataContainer that exercises a bug in the code.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated several common methods where adding or removing items was not working consistently

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed compile issues when updating the SDK

* DataArrayPathHelper::DataType was not being moc'ed.  Changed DataArrayPathHelper from a namespace to an uninstantiable class.
* ITK/itklnPlaceImageToDream3DDataFilter.h would not compile due to virtual override methods.  Specifiers were removed until each method had one at most.

* Removed SIMPLib_EXPORT from IDataStructureContainerNode.hpp

* Removed DLL export macro to fix compile issues.
* Fixed operator[](const QString&) return being a reference to a local variable.

* Added IDataStructureNode _setParentNode validity check

* If setting the new parent to the old parent value, do nothing.  Do not remove itself from its existing parent if the new parent is the same as the old one.
* This should fix some potential bugs where a graph node was supposed to be added to its own parent and ended up removing itself instead.

* Updated data structure nodes during destructor

* IDataStructureNode removes itself from its parent's children.
* IDataStructureContainerNode clears its children and removes the pointer to itself as its children's parent.

* Reimplemented geometries changing their shared and bounds arrays

* Uncommented renaming functionality in geometries for shared vertex and dimension bound arrays. The data arrays were left without renaming.
* Fixed unit tests that were broken by reimplementing geometry renaming.

* Updated data container classes

* Renamed the add methods in various data container classes.  Functionality was restored to its previous case where values were not just added but replaced as well.  The only pure add method remaining is IDataStructureContainerNode::push_back
* DataContainerArray::addDataContainer renamed to addOrRelaceDataContainer.
* DataContainer::addAttributeMatrix renamed to addOrReplaceAttributeMatrix.
* AttributeMatrix::addAttributeArray renamed to addOrReplaceArributeArray.
* IGeometry::addAttributeMatrix renamed to addOrReplaceAttributeMatrix.

* Updated QuaternionMath operator[] with out of range exception

* Changed QuaternionMath::Quaternion::operator[] to use a switch statement instead of if blocks.
* Changed QuaternionMath::Quaternion::operator[] to throw a std::range_error instead of an assert.

* Updated FilePathGenerator

* Updated FilePathGenerator to handle relative paths to the data folder so that unit tests and the DREAM.3D GUI can execute pipelines consistently.  Without this, certain prebuilt pipelines cannot be run by unit tests.

* Moved insertOrAssign to IDataStructureContainerNode. Refactored node

* Moved insertOrAssign from DataContainerArray, DataContainer, and AttributeMatrix to IDataStructureContainerNode.
* Added non-templated IDSContainer as a base class for IDataStructureContainerNode for IDataStructureNode to interface with.

* Reverted changes to FilePathGenerator to access the data folder.

* Fixed data structure class parenting

* Removed unnecessary setParentNode from DataContainerArray, DataContainer, and AttributeMatrix.
* Updated IDataStructureContainerNode so that it no longer adds duplicates of an item as children.
* Updated IDataStructureContainerNode::removeChildNode so that removing nullptr immediately returns.

* Fixed a major bug in DataArray tuple resize

* Fixed a bug where resizing tuple dimensions was clearing the entire array instead of starting at the end of the old values.
* Added the + operator to DataArray iterators to increment by a given offset.

* H5Utilities class now uses export macro instead of static methods

* A more elegant solution would be to change H5Utilities to a namespace, but because we do not use that syntax anywhere else for pure static classes, it was left as a class instead.

* Updated IDataStructureNode to hide setParentNode

* Changed IDataStructureNode::setParentNode from public to private.
* IDSContainer is now a friend of IDataStructureNode.
* IDSContainer now has its own protected methods to update IDataStructureNode parent container.
* The intention of this is to prevent anyone from trying to change parent / child connections one-directionally.  Data containers can still update their children's parent pointer, but nothing else can.

* Fix NeighborList<T> issues where multiple NeighborLists arrays can reference the same numneighbors array

+ Also modernize some of the codes based on clang-tidy
+ Use C++11 std::vector.data() instead of previous ways to get at the pointer.
+ Remove the default name for the NumNeighbors array. If the name is blank a new name is auto generated based on the name of the neighbor list.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Update Python Binding Template file.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Added a default value for IDataStructureNode name hash

* Added a default value to clear code analysis warnings that it was not set at the beginning of IDataStructureNode constructors.

* Fix issues populating the DataContainerSelectionWidget with a value

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix issue where newly created Attribute Matrix was not found correctly.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Renamed IDSContainer to AbstractDataStructureContainer

* AbstractDataStructureContainer is more descriptive than IDSContainer.

* Fixed a bug where ReadASCIIData renamed all but the last data import

* ReadASCIIData no longer opts in for detecting if a path it imported is renamed.
* Renamed a variable in RemoveArrays.

* Adding Enumeration to classes for the DataContainerID that is used for getPrereqDataContainer

This is needed to allow the filter to take part in renaming actions.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated DataArrayPathSelectionWidget with const correctness

* Used const references for QString, QColor, DataArrayPath, and RequirementTypes.
* Updated getters to be const correct.
* Signals and slots were not updated.

* Add DataArray Rename IDs for createPrereqArray methods.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Add AttributeMatrix Rename IDs for createPrereqAttributeMatrix methods.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* COMP: Validate pointer is non-null before using.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* GCC Compile fixes. Remove constexpr due to bug in GCC < 7.2. (#5)

Add missing include directives in SIMPLArray.hpp

* Fixed spacing and removed unnecessary inlines from data structue

* Method definitions nested inside class definitions are inline by default.

* Fixed PyBind11 wrapping in AttributeMatrix

* Added const reference to addOrReplaceAttributeArray
---
 Resources/UnitTestSupport.hpp                 | 102 +--
 Source/H5Support/H5Utilities.h                |  48 +-
 Source/SIMPLib/Common/Constants.h             |   2 +-
 Source/SIMPLib/Common/SIMPLArray.hpp          | 345 ++++++++++
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  82 ++-
 Source/SIMPLib/Common/SourceList.cmake        |   8 +
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  54 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |   5 +-
 .../Common/Testing/Cxx/AbstractVecTest.cpp    | 142 ++++
 .../Common/Testing/Cxx/SourceList.cmake       |   6 +
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  42 +-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   2 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |  20 +-
 .../CoreFilters/CombineAttributeArrays.h      |   6 +
 .../CoreFilters/CombineAttributeMatrices.cpp  |  19 +-
 .../CoreFilters/CombineAttributeMatrices.h    |   6 +
 .../CoreFilters/ConditionalSetValue.cpp       |   2 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  14 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |   8 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |  26 +-
 .../CopyFeatureArrayToElementArray.cpp        |  10 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  22 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       |   6 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   8 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   8 +-
 .../CoreFilters/CreateDataContainer.cpp       |   9 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |   6 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  10 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  90 ++-
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |  24 +-
 .../CoreFilters/CreateImageGeometry.cpp       |  49 +-
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |  24 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   8 +-
 .../CoreFilters/CropVertexGeometry.cpp        |  19 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |  12 +-
 .../CoreFilters/DataContainerReader.cpp       |  14 +-
 .../CoreFilters/DataContainerWriter.cpp       |   4 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   2 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |  55 +-
 .../ExtractAttributeArraysFromGeometry.h      |   6 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   8 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |  23 +-
 .../CoreFilters/ExtractVertexGeometry.h       |  12 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   2 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   2 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  18 +-
 .../CoreFilters/GenerateColorTable.cpp        |   8 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |  30 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |   4 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |   2 +-
 .../LinkFeatureMapToElementArray.cpp          |  12 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   2 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp | 207 ++++++
 Source/SIMPLib/CoreFilters/MassCreateData.h   | 168 +++++
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  15 +-
 Source/SIMPLib/CoreFilters/MoveData.h         |   6 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  14 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |   6 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   9 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   9 +-
 .../CoreFilters/PipelineAnnotation.cpp        |   2 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |   2 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |  27 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |   2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |  21 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |   9 +
 .../CoreFilters/RemoveComponentFromArray.cpp  |  11 +-
 .../CoreFilters/RenameAttributeArray.cpp      |  27 +-
 .../CoreFilters/RenameAttributeArray.h        |   2 +
 .../CoreFilters/RenameAttributeMatrix.cpp     |  22 +-
 .../CoreFilters/RenameAttributeMatrix.h       |   2 +
 .../CoreFilters/RenameDataContainer.cpp       |  41 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |  19 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |   2 +-
 .../CoreFilters/RequiredZThickness.cpp        |   4 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |   6 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  35 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |  18 +-
 .../SetOriginResolutionImageGeom.cpp          |  31 +-
 .../SetOriginResolutionImageGeom.h            |  18 +-
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../CoreFilters/SplitAttributeArray.cpp       |   8 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |  56 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   8 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |  18 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   8 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |  30 +-
 .../Testing/Cxx/ConvertDataTest.cpp           |   6 +-
 .../CopyFeatureArrayToElementArrayTest.cpp    |  88 ++-
 .../Testing/Cxx/CopyObjectTest.cpp            |  63 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |  16 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       |   4 +-
 .../Testing/Cxx/CreateDataContainerTest.cpp   |  19 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |  28 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        | 159 ++---
 .../Testing/Cxx/CreateImageGeometryTest.cpp   | 124 ++--
 .../Testing/Cxx/CreateStringArrayTest.cpp     |   4 +-
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |  19 +-
 .../Testing/Cxx/DataContainerTest.cpp         | 327 ++++++++-
 ...ExtractAttributeArraysFromGeometryTest.cpp |  52 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |   6 +-
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |  36 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |  22 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |  60 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   4 +-
 .../Testing/Cxx/ImportAsciDataArrayTest.cpp   |   6 +-
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |   4 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |  34 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |  34 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   8 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   8 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |  30 +-
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |   4 +-
 .../Testing/Cxx/RemoveArraysTest.cpp          |   6 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |   4 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |  36 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |  18 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |  34 +-
 .../Testing/Cxx/RenameTimingTest.cpp          | 156 +++++
 .../Testing/Cxx/ReplaceValueTest.cpp          |   6 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |  10 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |  79 ++-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |  53 +-
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |  30 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |  12 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   8 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |   2 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   4 +-
 .../CoreFilters/WriteTriangleGeometry.h       |   6 +-
 .../SIMPLib/CoreFilters/util/CalculatorItem.h |   3 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       | 628 +++++++++++++++---
 Source/SIMPLib/DataArrays/IDataArray.cpp      |  14 +-
 Source/SIMPLib/DataArrays/IDataArray.h        |  25 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  30 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |  29 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |  11 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |  53 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |  24 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |  36 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  | 287 ++++++--
 .../Testing/Cxx/StringDataArrayTest.cpp       |   8 +-
 .../Testing/Cxx/StructArrayTest.cpp           |   8 +-
 .../DataContainers/AttributeMatrix.cpp        | 191 ++----
 .../SIMPLib/DataContainers/AttributeMatrix.h  | 105 ++-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  | 301 +++++----
 Source/SIMPLib/DataContainers/DataArrayPath.h | 268 ++++++--
 .../SIMPLib/DataContainers/DataContainer.cpp  | 219 ++----
 Source/SIMPLib/DataContainers/DataContainer.h | 101 ++-
 .../DataContainers/DataContainerArray.cpp     | 175 ++---
 .../DataContainers/DataContainerArray.h       | 116 +++-
 .../DataContainerArrayProxy.cpp               |  28 +-
 .../DataContainers/DataContainerBundle.cpp    |   2 +-
 .../DataContainers/DataContainerBundle.h      |   2 +-
 Source/SIMPLib/DataContainers/DsnIterators.h  | 471 +++++++++++++
 .../DataContainers/IDataContainerBundle.h     |   2 +-
 .../IDataStructureContainerNode.hpp           | 471 +++++++++++++
 .../DataContainers/IDataStructureNode.cpp     | 174 +++++
 .../DataContainers/IDataStructureNode.h       | 214 ++++++
 .../RenameDataPath.cpp}                       |  42 +-
 .../SIMPLib/DataContainers/RenameDataPath.h   |  74 +++
 .../SIMPLib/DataContainers/SourceList.cmake   |   6 +
 .../Testing/Cxx/DataContainerBundleTest.cpp   |  18 +-
 .../CoreFilters/MassCreateData.md             |  41 ++
 .../AbstractFilterParametersReader.cpp        |   8 +-
 .../AbstractFilterParametersReader.h          |   4 +-
 .../AbstractFilterParametersWriter.cpp        |   4 +-
 .../AbstractFilterParametersWriter.h          |   4 +-
 ...AttributeMatrixCreationFilterParameter.cpp |  25 +-
 .../AttributeMatrixCreationFilterParameter.h  |  17 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  24 +-
 .../AttributeMatrixSelectionFilterParameter.h |  15 +-
 .../CalculatorFilterParameter.cpp             |   2 +-
 .../CalculatorFilterParameter.h               |   2 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   2 +-
 ...mparisonSelectionAdvancedFilterParameter.h |   2 +-
 .../ComparisonSelectionFilterParameter.cpp    |   2 +-
 .../ComparisonSelectionFilterParameter.h      |   2 +-
 .../DataArrayCreationFilterParameter.cpp      |  22 +-
 .../DataArrayCreationFilterParameter.h        |   7 +
 .../DataArraySelectionFilterParameter.cpp     |  20 +
 .../DataArraySelectionFilterParameter.h       |   7 +
 ...DataContainerArrayProxyFilterParameter.cpp |   7 +-
 .../DataContainerArrayProxyFilterParameter.h  |   2 +-
 .../DataContainerCreationFilterParameter.cpp  |  42 +-
 .../DataContainerCreationFilterParameter.h    |  55 +-
 .../DataContainerSelectionFilterParameter.cpp |  28 +-
 .../DataContainerSelectionFilterParameter.h   |  17 +-
 .../FilterParameters/FilterParameter.cpp      |  17 +-
 .../FilterParameters/FilterParameter.h        |   4 +-
 .../FloatVec2FilterParameter.cpp              |  27 +-
 .../FloatVec2FilterParameter.h                |  13 +-
 Source/SIMPLib/FilterParameters/FloatVec3.h   |  74 ---
 .../FloatVec3FilterParameter.cpp              |  29 +-
 .../FloatVec3FilterParameter.h                |  14 +-
 .../H5FilterParametersReader.cpp              |   8 +-
 .../H5FilterParametersReader.h                |   4 +-
 .../H5FilterParametersWriter.cpp              |   4 +-
 .../H5FilterParametersWriter.h                |   4 +-
 Source/SIMPLib/FilterParameters/IntVec3.h     |  65 --
 .../IntVec3FilterParameter.cpp                |  31 +-
 .../FilterParameters/IntVec3FilterParameter.h |  14 +-
 ...dDataContainerSelectionFilterParameter.cpp |  42 +-
 ...kedDataContainerSelectionFilterParameter.h | 131 ++--
 ...ttributeMatrixSelectionFilterParameter.cpp |   2 +-
 ...iAttributeMatrixSelectionFilterParameter.h |   2 +-
 ...MultiDataArraySelectionFilterParameter.cpp |   2 +-
 .../MultiDataArraySelectionFilterParameter.h  |   2 +-
 .../NumericTypeFilterParameter.h              |  26 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |  24 +-
 .../PhaseTypeSelectionFilterParameter.h       |   9 +-
 .../ReadASCIIDataFilterParameter.cpp          |   2 +-
 .../ReadASCIIDataFilterParameter.h            |   2 +-
 .../ScalarTypeFilterParameter.h               |  26 +-
 .../SIMPLib/FilterParameters/SourceList.cmake |   3 -
 .../Testing/Cxx/FilterParametersRWTest.cpp    |  66 +-
 .../Filtering/AbstractDecisionFilter.cpp      |   2 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   | 163 ++---
 Source/SIMPLib/Filtering/AbstractFilter.h     |  51 +-
 .../Filtering/ComparisonInputsAdvanced.h      |   2 +-
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |  84 +--
 .../Filtering/QMetaObjectUtilities.cpp        |  24 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |  12 +-
 Source/SIMPLib/Geometry/EdgeGeom.h            |   4 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |  31 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |  23 +-
 Source/SIMPLib/Geometry/HexahedralGeom.h      |   4 +-
 Source/SIMPLib/Geometry/IGeometry.h           |   6 +-
 Source/SIMPLib/Geometry/IGeometryGrid.h       |   9 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         | 278 +++++---
 Source/SIMPLib/Geometry/ImageGeom.h           |  42 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |  10 +-
 Source/SIMPLib/Geometry/QuadGeom.h            |   4 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |  98 ++-
 Source/SIMPLib/Geometry/RectGridGeom.h        |  38 +-
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedHexOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedTetOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedTriOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |   2 +-
 .../Geometry/Testing/Cxx/ImageGeomTest.cpp    |   8 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |  10 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h     |   4 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |  10 +-
 Source/SIMPLib/Geometry/TriangleGeom.h        |   4 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |  10 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |   4 +-
 ...am3DITransformContainerToTransformTest.cpp |   2 +-
 ...eam3DTransformContainerToTransformTest.cpp |   2 +-
 Source/SIMPLib/ITK/itkBridge.h                |  91 ++-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  15 +-
 .../itkInPlaceDream3DDataToImageFilter.hxx    |  18 +-
 .../ITK/itkInPlaceImageToDream3DDataFilter.h  |   6 +-
 .../itkInPlaceImageToDream3DDataFilter.hxx    |   8 +-
 Source/SIMPLib/ITK/itkReadImageImpl.hpp       |   2 +-
 Source/SIMPLib/Math/QuaternionMath.hpp        |  57 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |   4 +-
 .../SIMPLib/REST/Testing/Cxx/SourceList.cmake |   2 +-
 .../ExecutePipelineController.cpp             |   8 +-
 .../ListFilterParametersController.cpp        |   2 +-
 .../Testing/Cxx/StatsDataJsonRWTest.cpp       |  16 +-
 .../TestFilters/ArraySelectionExample.cpp     |   2 +-
 .../TestFilters/DynamicTableExample.cpp       |   2 +-
 .../TestFilters/ErrorWarningFilter.cpp        |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup01.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp  |   2 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp  |   2 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  14 +-
 Source/SIMPLib/TestFilters/GenericExample.h   |  24 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |  11 +-
 Source/SIMPLib/TestFilters/TestFilters.cpp    |   4 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |   2 +-
 .../Unused/NewDataContainerStructureTest.cpp  |   8 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |   2 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |   2 +-
 .../AttributeMatrixCreationWidget.cpp         |   2 +-
 .../AttributeMatrixCreationWidget.h           |   4 +-
 .../AttributeMatrixSelectionWidget.cpp        |   5 +-
 .../AttributeMatrixSelectionWidget.h          |   2 +-
 .../CalculatorWidget.cpp                      |   2 +-
 .../FilterParameterWidgets/CalculatorWidget.h |   2 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |   4 +-
 .../ComparisonSelectionAdvancedWidget.h       |   2 +-
 .../DataArrayCreationWidget.cpp               |   2 +-
 .../DataArrayCreationWidget.h                 |   2 +-
 .../DataArraySelectionWidget.cpp              |   2 +-
 .../DataArraySelectionWidget.h                |   2 +-
 .../DataContainerArrayProxyWidget.cpp         |   2 +-
 .../DataContainerArrayProxyWidget.h           |   2 +-
 .../DataContainerCreationWidget.cpp           |  18 +-
 .../DataContainerCreationWidget.h             |   2 +-
 .../DataContainerSelectionWidget.cpp          |  38 +-
 .../DataContainerSelectionWidget.h            |   8 +-
 .../FloatVec2Widget.cpp                       |  18 +-
 .../FloatVec3Widget.cpp                       |  28 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |  16 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   7 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |   2 +-
 .../MultiAttributeMatrixSelectionWidget.h     |   2 +-
 .../MultiDataArraySelectionWidget.cpp         |   2 +-
 .../MultiDataArraySelectionWidget.h           |   2 +-
 .../PhaseTypeSelectionWidget.cpp              |   2 +-
 .../PhaseTypeSelectionWidget.h                |   2 +-
 .../ReadASCIIDataWidget.cpp                   |   2 +-
 .../ReadASCIIDataWidget.h                     |   2 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  | 133 ++--
 .../Widgets/DataArrayPathSelectionWidget.h    |  68 +-
 .../Widgets/DataContainerArrayWidget.cpp      |  15 +-
 .../Widgets/DataStructureItemDelegate.cpp     |  32 +-
 .../Widgets/DataStructureItemDelegate.h       |   2 +-
 .../Widgets/DataStructureWidget.cpp           |  23 +-
 .../Widgets/FilterInputWidget.cpp             |   8 +-
 .../SVWidgetsLib/Widgets/FilterInputWidget.h  |   2 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |  22 +-
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |  25 +-
 328 files changed, 7476 insertions(+), 3409 deletions(-)
 create mode 100644 Source/SIMPLib/Common/SIMPLArray.hpp
 create mode 100644 Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp
 create mode 100644 Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
 create mode 100644 Source/SIMPLib/CoreFilters/MassCreateData.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/MassCreateData.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
 create mode 100644 Source/SIMPLib/DataContainers/DsnIterators.h
 create mode 100644 Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
 create mode 100644 Source/SIMPLib/DataContainers/IDataStructureNode.cpp
 create mode 100644 Source/SIMPLib/DataContainers/IDataStructureNode.h
 rename Source/SIMPLib/{FilterParameters/FloatVec2.h => DataContainers/RenameDataPath.cpp} (74%)
 create mode 100644 Source/SIMPLib/DataContainers/RenameDataPath.h
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
 delete mode 100644 Source/SIMPLib/FilterParameters/FloatVec3.h
 delete mode 100644 Source/SIMPLib/FilterParameters/IntVec3.h

diff --git a/Resources/UnitTestSupport.hpp b/Resources/UnitTestSupport.hpp
index 46ca33aef7..44022760a3 100755
--- a/Resources/UnitTestSupport.hpp
+++ b/Resources/UnitTestSupport.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,6 +49,8 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
 namespace SIMPL
 {
 namespace unittest
@@ -63,7 +65,16 @@ static const char Passed[6] = {'P', 'A', 'S', 'S', 'E', 'D'};
 static const char Failed[6] = {'F', 'A', 'I', 'L', 'E', 'D'};
 static int SizeOfPassed = 6;
 static int SizeOfFailed = 6;
-}
+} // namespace unittest
+} // namespace SIMPL
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QTextStream& operator<<(QTextStream& out, const DataArrayPath& v)
+{
+  out << v.getDataContainerName() << "|" << v.getAttributeMatrixName() << "|" << v.getDataArrayName();
+  return out;
 }
 
 // -----------------------------------------------------------------------------
@@ -73,11 +84,11 @@ class TestException : public std::exception
 {
 public:
   /**
-  * @brief
-  * @param what
-  * @param file
-  * @param lineNumber
-  */
+   * @brief
+   * @param what
+   * @param file
+   * @param lineNumber
+   */
   TestException(const std::string& what, const std::string& filename, int lineNumber)
   : m_Message(what)
   , m_FileName(filename)
@@ -87,8 +98,8 @@ class TestException : public std::exception
   }
 
   /**
-  * @brief Copy Constructor
-  */
+   * @brief Copy Constructor
+   */
   TestException(const TestException& te)
   {
     m_Message = (&te)->getMessage();
@@ -272,10 +283,10 @@ inline int Sign(float* A)
 
 bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
 {
-// There are several optional checks that you can do, depending
-// on what behavior you want from your floating point comparisons.
-// These checks should not be necessary and they are included
-// mainly for completeness.
+  // There are several optional checks that you can do, depending
+  // on what behavior you want from your floating point comparisons.
+  // These checks should not be necessary and they are included
+  // mainly for completeness.
 
 #ifdef INFINITYCHECK
   // If A or B are infinity (positive or negative) then
@@ -567,4 +578,3 @@ template <typename T, typename K> void require_greater_than(T l, const QString&
     throw TestException(buf.toStdString(), file.toStdString(), line);
   }
 }
-
diff --git a/Source/H5Support/H5Utilities.h b/Source/H5Support/H5Utilities.h
index ccbb0624c6..7b1355386f 100644
--- a/Source/H5Support/H5Utilities.h
+++ b/Source/H5Support/H5Utilities.h
@@ -36,12 +36,12 @@ namespace H5Support_NAMESPACE
   /**
    * @brief General Utilities for working with the HDF5 data files and API
    */
-  class H5Utilities
+  class H5Support_EXPORT H5Utilities
   {
 
     public:
 
-      virtual ~H5Utilities();
+      virtual ~H5Utilities() = default;
 
       enum CustomHDFDataTypes
       {
@@ -53,11 +53,11 @@ namespace H5Support_NAMESPACE
       };
 
       // -----------HDF5 File Operations
-      static H5Support_EXPORT hid_t openFile(const std::string& filename, bool readOnly = false);
+      static hid_t openFile(const std::string& filename, bool readOnly = false);
 
-      static H5Support_EXPORT hid_t createFile(const std::string& filename);
+      static hid_t createFile(const std::string& filename);
 
-      static H5Support_EXPORT herr_t closeFile(hid_t& fileId);
+      static herr_t closeFile(hid_t& fileId);
 
       // -------------- HDF Indentifier Methods ----------------------------
       /**
@@ -66,7 +66,7 @@ namespace H5Support_NAMESPACE
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getObjectPath(hid_t loc_id, bool trim = false);
+      static std::string getObjectPath(hid_t loc_id, bool trim = false);
 
       /**
       * @brief Returns the hdf object type
@@ -75,7 +75,7 @@ namespace H5Support_NAMESPACE
       * @param objType The type of the object
       * @return  Negative value on error
       */
-      static H5Support_EXPORT herr_t getObjectType(hid_t objId, const std::string& objName, int32_t* objType);
+      static herr_t getObjectType(hid_t objId, const std::string& objName, int32_t* objType);
 
       /**
       * @brief Retrieves the object name for a given index
@@ -84,7 +84,7 @@ namespace H5Support_NAMESPACE
       * @param name The variable to store the name
       * @return Negative value is error
       */
-      static H5Support_EXPORT herr_t objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name);
+      static herr_t objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name);
 
       /**
       * @brief Returns the path to an object's parent
@@ -92,7 +92,7 @@ namespace H5Support_NAMESPACE
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getParentPath(hid_t objId);
+      static std::string getParentPath(hid_t objId);
 
       /**
       * @brief Returns the path to an object's parent
@@ -100,14 +100,14 @@ namespace H5Support_NAMESPACE
       * @param trim set to False to trim the path
       * @return  The path to the object relative to the objId
       */
-      static H5Support_EXPORT std::string getParentPath(const std::string& objectPath);
+      static std::string getParentPath(const std::string& objectPath);
 
       /**
       * @brief Returns the object's name from object path
       * @param objectPath The HDF5 path to the object
       * @return  The object name
       */
-      static H5Support_EXPORT std::string getObjectNameFromPath(const std::string& objectPath);
+      static std::string getObjectNameFromPath(const std::string& objectPath);
 
       /**
       * @brief Returns if a given hdf5 object is a group
@@ -115,7 +115,7 @@ namespace H5Support_NAMESPACE
       * @param objName The name of the object to check
       * @return True if the given hdf5 object id is a group
       */
-      static H5Support_EXPORT bool isGroup(hid_t nodeId, const std::string& objName);
+      static bool isGroup(hid_t nodeId, const std::string& objName);
 
 
       /**
@@ -124,23 +124,23 @@ namespace H5Support_NAMESPACE
       * @param objectPath The path of the object to open
       * @return The hdf5 id of the opened object. Negative value is error.
       */
-      static H5Support_EXPORT hid_t openHDF5Object(hid_t loc_id, const std::string& objName);
+      static hid_t openHDF5Object(hid_t loc_id, const std::string& objName);
 
       /**
       * @brief Closes the object id
       * @param locId The object id to close
       * @return Negative value is error.
       */
-      static H5Support_EXPORT herr_t closeHDF5Object(hid_t obj_id);
+      static herr_t closeHDF5Object(hid_t obj_id);
 
 
-      static H5Support_EXPORT std::string HDFClassTypeAsStr(hid_t class_type);
+      static std::string HDFClassTypeAsStr(hid_t class_type);
 
       /**
       * @brief prints the class type of the given class
       * @param classT The Class Type to print
       */
-      static H5Support_EXPORT void printHDFClassType(H5T_class_t class_type);
+      static void printHDFClassType(H5T_class_t class_type);
 
       // -------------- HDF Group Methods ----------------------------
       /**
@@ -150,7 +150,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to store the list
       * @return
       */
-      static H5Support_EXPORT herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names);
+      static herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names);
 
       /**
        * @brief Creates a HDF Group by checking if the group already exists. If the
@@ -160,7 +160,7 @@ namespace H5Support_NAMESPACE
        * @param group The name of the group to create. Note that this group name should
        * not be any sort of 'path'. It should be a single group.
        */
-      static H5Support_EXPORT hid_t createGroup(hid_t loc_id, const std::string& group);
+      static hid_t createGroup(hid_t loc_id, const std::string& group);
 
       /**
        * @brief Given a path relative to the Parent ID, this method will create all
@@ -169,7 +169,7 @@ namespace H5Support_NAMESPACE
        * @param parent The HDF unique id for the parent
        * @return Error Condition: Negative is error. Positive is success.
        */
-      static H5Support_EXPORT hid_t  createGroupsFromPath(const std::string& pathToCheck, hid_t parent);
+      static hid_t  createGroupsFromPath(const std::string& pathToCheck, hid_t parent);
 
       /**
        * @brief Given a path relative to the Parent ID, this method will create all
@@ -178,14 +178,14 @@ namespace H5Support_NAMESPACE
        * @param parent The HDF unique id for the parent
        * @return Error Condition: Negative is error. Positive is success.
        */
-      static H5Support_EXPORT hid_t createGroupsForDataset(const std::string& datasetPath, hid_t parent);
+      static hid_t createGroupsForDataset(const std::string& datasetPath, hid_t parent);
 
       /**
       * @brief Extracts the object name from a given path
       * @param path The path which to extract the object name
       * @return The name of the object
       */
-      static H5Support_EXPORT std::string extractObjectName(const std::string& path);
+      static std::string extractObjectName(const std::string& path);
 
       // -------------- HDF Attribute Methods ----------------------------
       /**
@@ -195,7 +195,7 @@ namespace H5Support_NAMESPACE
       * @param attr_name The attribute to look for (by name)
       * @return True if the attribute exists.
       */
-      static H5Support_EXPORT bool probeForAttribute(hid_t loc_id,
+      static bool probeForAttribute(hid_t loc_id,
                                                      const std::string& obj_name,
                                                      const std::string& attr_name);
 
@@ -206,7 +206,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to hold the list of attribute names
       * @return Negate value is error
       */
-      static H5Support_EXPORT herr_t getAllAttributeNames(hid_t obj_id, std::list<std::string>& results);
+      static herr_t getAllAttributeNames(hid_t obj_id, std::list<std::string>& results);
 
       /**
       * @brief Returns a list of all the attribute names
@@ -215,7 +215,7 @@ namespace H5Support_NAMESPACE
       * @param names Variable to hold the list of attribute names
       * @return Negative value is error
       */
-      static H5Support_EXPORT herr_t getAllAttributeNames(hid_t loc_id, const std::string& obj_name,
+      static herr_t getAllAttributeNames(hid_t loc_id, const std::string& obj_name,
                                                           std::list<std::string>& names);
 
 
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 6794f321a0..66a1354c6f 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -302,7 +302,7 @@ namespace SIMPL
     const QString GroupingFilters("Grouping");
     const QString CropCutFilters("Croping/Cutting");
     const QString RotationTransformationFilters("Rotating/Transforming");
-    const QString ResolutionFilters("Resolution");
+    const QString ResolutionFilters("Spacing");
     const QString MorphologicalFilters("Morphological");
     const QString PackingFilters("Packing");
     const QString CrystallographyFilters("Crystallography");
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
new file mode 100644
index 0000000000..f2f9cbe2fd
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -0,0 +1,345 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <array>
+#include <tuple>
+#include <cassert>
+
+#include <QtCore/QMetaObject>
+
+/**
+ * @brief This class is a facade pattern around a std::array<T,D> array to allow for some semantics
+ * for either a 2D or 3D point such as X,Y,Z. We Provide 2 concrete implementations that are for 2 and 3 element
+ * arrays used in some of the filter parameters. The devloper can extend this quite easily to more
+ * elements should they need them
+ */
+template <class T, unsigned int Dimension> class SIMPLArray
+{
+public:
+  SIMPLArray() = default;
+  SIMPLArray(const SIMPLArray&) = default;
+  SIMPLArray(SIMPLArray&&) noexcept = default;
+  SIMPLArray& operator=(const SIMPLArray&) = default;
+  SIMPLArray& operator=(SIMPLArray&&) noexcept = default;
+  ~SIMPLArray() = default;
+
+  //========================================= STL INTERFACE COMPATIBILITY =================================
+  using size_type = size_t;
+  using value_type = T;
+  using reference = T&;
+  using const_reference = const T&;
+  using iterator_category = std::input_iterator_tag;
+  using pointer = T*;
+  using difference_type = value_type;
+  using iterator = typename std::array<T, 3>::iterator;
+  using const_iterator = typename std::array<T, 3>::const_iterator;
+  //========================================= END STL INTERFACE COMPATIBILITY ==============================
+
+  inline reference operator[](size_type index)
+  {
+    return m_Array[index];
+  }
+
+  inline const_reference operator[](size_type index) const
+  {
+    return m_Array[index];
+  }
+
+  inline reference at(size_type index)
+  {
+    assert(index < Dimension);
+    return m_Array[index];
+  }
+
+  inline const_reference at(size_type index) const
+  {
+    assert(index < Dimension);
+    return m_Array[index];
+  }
+
+  iterator begin()
+  {
+    return m_Array.begin();
+  }
+
+  iterator end()
+  {
+    return m_Array.end();
+  }
+
+  const_iterator begin() const
+  {
+    return m_Array.cbegin();
+  }
+
+  const_iterator end() const
+  {
+    return m_Array.cend();
+  }
+
+  pointer data()
+  {
+    return m_Array.data();
+  }
+
+  size_type size()
+  {
+    return Dimension;
+  }
+
+protected:
+  void setValue(size_t i, value_type value)
+  {
+    m_Array[i] = value;
+  }
+
+private:
+  std::array<T, Dimension> m_Array;
+};
+
+// -----------------------------------------------------------------------------
+template <typename T> class IVec3 : public SIMPLArray<T, 3>
+{
+  using ParentType = SIMPLArray<T, 3>;
+public:
+  IVec3(const IVec3&) = default;
+  IVec3(IVec3&&) noexcept = default;
+  IVec3& operator=(const IVec3&) = default;
+  IVec3& operator=(IVec3&&) noexcept = default;
+  ~IVec3() = default;
+
+  IVec3(T x = 0.0f, T y = 0.0f, T z = 0.0f)
+  {
+    this->setValue(0, x);
+    this->setValue(1, y);
+    this->setValue(2, z);
+  }
+
+  IVec3(std::array<T, 3> data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+    this->setValue(2, data[2]);
+  }
+  IVec3(std::tuple<T, T, T> data)
+  {
+    this->setValue(0, std::get<0>(data));
+    this->setValue(1, std::get<1>(data));
+    this->setValue(2, std::get<2>(data));
+  }
+  IVec3(const T* data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+    this->setValue(2, data[2]);
+  }
+
+  inline T getX() const
+  {
+    return ParentType::operator[](0);
+  }
+  inline T getY() const
+  {
+    return ParentType::operator[](1);
+  }
+  inline T getZ() const
+  {
+    return ParentType::operator[](2);
+  }
+  inline void setX(const T& x)
+  {
+    this->setValue(0, x);
+  }
+  inline void setY(const T& y)
+  {
+    this->setValue(1, y);
+  }
+  inline void setZ(const T& z)
+  {
+    this->setValue(2, z);
+  }
+
+  std::tuple<T, T, T> toTuple() const
+  {
+    return std::make_tuple(getX(), getY(), getZ());
+  }
+};
+
+using FloatVec3Type = IVec3<float>;
+using IntVec3Type = IVec3<int>;
+using SizeVec3Type = IVec3<size_t>;
+
+// -----------------------------------------------------------------------------
+template <typename T> class IVec2 : public SIMPLArray<T, 2>
+{
+  using ParentType = SIMPLArray<T, 2>;
+public:
+  IVec2(const IVec2&) = default;
+  IVec2(IVec2&&) noexcept = default;
+  IVec2& operator=(const IVec2&) = default;
+  IVec2& operator=(IVec2&&) noexcept = default;
+  ~IVec2() = default;
+
+  IVec2(T x = 0.0f, T y = 0.0f)
+  {
+    this->setValue(0, x);
+    this->setValue(1, y);
+  }
+
+  IVec2(std::array<T, 2> data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+  }
+  IVec2(std::tuple<T, T> data)
+  {
+    this->setValue(0, std::get<0>(data));
+    this->setValue(1, std::get<1>(data));
+  }
+  IVec2(const T* data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+  }
+
+  inline T getX() const
+  {
+    return ParentType::operator[](0);
+  }
+  inline T getY() const
+  {
+    return ParentType::operator[](1);
+  }
+  inline void setX(const T& x)
+  {
+    this->setValue(0, x);
+  }
+  inline void setY(const T& y)
+  {
+    this->setValue(1, y);
+  }
+
+  std::tuple<T, T> toTuple() const
+  {
+    return std::make_tuple(getX(), getY());
+  }
+};
+
+using FloatVec2Type = IVec2<float>;
+using IntVec2Type = IVec2<int>;
+using SizeVec2Type = IVec2<size_t>;
+
+// -----------------------------------------------------------------------------
+template <typename T> class IVec4 : public SIMPLArray<T, 4>
+{
+  using ParentType = SIMPLArray<T, 4>;
+public:
+  IVec4(const IVec4&) = default;
+  IVec4(IVec4&&) noexcept = default;
+  IVec4& operator=(const IVec4&) = default;
+  IVec4& operator=(IVec4&&) noexcept = default;
+  ~IVec4() = default;
+
+  IVec4(T x = 0.0f, T y = 0.0f, T z = 0.0f, T w = 0.0f)
+  {
+    this->setValue(0, x);
+    this->setValue(1, y);
+    this->setValue(2, z);
+    this->setValue(3, w);
+  }
+
+  IVec4(std::array<T, 4> data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+    this->setValue(2, data[2]);
+    this->setValue(3, data[3]);
+  }
+  IVec4(std::tuple<T, T> data)
+  {
+    this->setValue(0, std::get<0>(data));
+    this->setValue(1, std::get<1>(data));
+    this->setValue(2, std::get<2>(data));
+    this->setValue(3, std::get<3>(data));
+  }
+  IVec4(const T* data)
+  {
+    this->setValue(0, data[0]);
+    this->setValue(1, data[1]);
+    this->setValue(2, data[2]);
+    this->setValue(3, data[3]);
+  }
+
+  inline T getX() const
+  {
+    return ParentType::operator[](0);
+  }
+  inline T getY() const
+  {
+    return ParentType::operator[](1);
+  }
+  inline T getZ() const
+  {
+    return ParentType::operator[](2);
+  }
+  inline T getW() const
+  {
+    return ParentType::operator[](3);
+  }
+  inline void setX(const T& x)
+  {
+    this->setValue(0, x);
+  }
+  inline void setY(const T& y)
+  {
+    this->setValue(1, y);
+  }
+  inline void setZ(const T& z)
+  {
+    this->setValue(2, z);
+  }
+  inline void setW(const T& w)
+  {
+    this->setValue(3, w);
+  }
+
+  std::tuple<T, T> toTuple() const
+  {
+    return std::make_tuple(getX(), getY(), getZ(), getW());
+  }
+};
+
+using QuaternionType = IVec4<float>;
+using FloatVec4Type = IVec4<float>;
+using IntVec4Type = IVec4<int>;
+using SizeVec4Type = IVec4<size_t>;
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 1e94449b29..9b7678f09a 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -311,16 +311,17 @@ public:     \
   public:\
   SIMPL_SET_PROPERTY(type, prpty)\
   SIMPL_GET_PROPERTY(type, prpty)
-  
-  
 
-#define SIMPL_POINTER_PROPERTY(type, prpty)\
-  private:\
-    type* m_##prpty = nullptr;\
-  public:\
-  void set##prpty(type* f) { m_##prpty = f; }\
-  SIMPL_GET_PROPERTY(type*, prpty)  
-  
+#define SIMPL_POINTER_PROPERTY(type, prpty)                                                                                                                                                            \
+private:                                                                                                                                                                                               \
+  type* m_##prpty = nullptr;                                                                                                                                                                           \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  void set##prpty(type* f)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    m_##prpty = f;                                                                                                                                                                                     \
+  }                                                                                                                                                                                                    \
+  SIMPL_GET_PROPERTY(type*, prpty)
 
 #define SIMPL_PRIVATE_INSTANCE_PROPERTY(type, prpty)\
   private:\
@@ -329,15 +330,14 @@ public:     \
   public:\
   SIMPL_GET_PROPERTY(type, prpty)
 
-
 /* *****************************************************************************
  * *****************************************************************************
  * *****************************************************************************
- * 
+ *
  * PyBind11 Macros that we can use to explicitly define which setters & getters
  * will be exposed to the Python library
  */
- 
+
 /**
 * @brief PYB11_CREATE_BINDINGS This macro lets the wrapper know that we want to
 * wrap this class with Python bindings. It should only take a single argument
@@ -361,27 +361,34 @@ public:     \
 #define PYB11_NO_BINDINGS(...)
 
 /**
-* @brief PYB11_STATIC_CREATION This macro will wrap the "static New()" function
-* that most of the SIMPL classes implement as a way to instantiate the class in
-* addition to other static methods that are used for a class. The argument types
-* to the static method should be listed <b>WITHOUT</b> any spaces for each argument.
-* 
-* @code
-* PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
-* @endcode
-*/
+ * @brief PYB11_STATIC_CREATION This macro will wrap the "static New()" function
+ * that most of the SIMPL classes implement as a way to instantiate the class in
+ * addition to other static methods that are used for a class. The argument types
+ * to the static method should be listed <b>WITHOUT</b> any spaces for each argument.
+ *
+ * @code
+ * PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
+ * @endcode
+ *
+ * If there are several static creation methods that overload each other then the following form can be used:
+ *
+ * @code
+ * PYB11_STATIC_CREATION(New OVERLOAD QString)
+ * PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
+ * @endcode
+ */
 #define PYB11_STATIC_CREATION(...)
 
 /**
-* @brief PYB11_CREATION This macro is used for non-static constructors that need
-* to be wrapped. The argument types need to be lists where each argument cannot
-* containe spaces. Use a typedef if needed, but using a typedef also has its
-* own issues. @see DataArrayPath for an example.
-* 
-* @code
-* PYB11_CREATION(ARGS QString QString QString)
-* @endcode
-*/ 
+ * @brief PYB11_CREATION This macro is used for non-static constructors that need
+ * to be wrapped. The argument types need to be lists where each argument cannot
+ * containe spaces. Use a typedef if needed, but using a typedef also has its
+ * own issues. @see DataArrayPath for an example.
+ *
+ * @code
+ * PYB11_CREATION(ARGS QString QString QString)
+ * @endcode
+ */
 #define PYB11_CREATION(...)
 
 /**
@@ -448,6 +455,14 @@ public:     \
  * Note that in order to get the (const QString &) correct we used the '.' charater
  * to declare the type. This is required as the macro is split using spaces. When
  * then end code is generated the '.' characters will be replaced with spaces.
+ *
+ * If the method that is being wrapped in python is a 'const' method then the last argument should be CONST_METHOD. In
+ * the example below there is a pair of overloaded methods that are both 'const'.
+ *
+ * @code
+ * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
+ * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
+ * @endcode
  */
 #define PYB11_METHOD(...)
 
@@ -524,9 +539,6 @@ public:     \
   public:\
   void set##prpty(const type& value) { this->m_##prpty = value; }\
   type get##prpty() const { return m_##prpty; }
-  
-
-  
 
 // -----------------------------------------------------------------------------
 //
@@ -565,7 +577,7 @@ public:     \
     (varname)[0] = value_0; (varname)[1] = value_1; (varname)[2] = value_2; }\
   void set##prpty(const std::tuple<type, type, type> &var) {\
     (varname)[0] = std::get<0>(var); (varname)[1] = std::get<1>(var); (varname)[2] = std::get<2>(var); }
-        
+
 #define SIMPL_GET_VEC3_PROPERTY(type, prpty, varname)\
   void get##prpty(type value[3]) {\
     value[0] = (varname)[0]; value[1] = (varname)[1]; value[2] = (varname)[2]; }\
@@ -604,7 +616,7 @@ public:     \
   public:\
   SIMPL_SET_VEC3_PROPERTY_VO(type, prpty, m_##prpty)\
   SIMPL_GET_VEC3_PROPERTY_VO(type, prpty, m_##prpty)
-  
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/SourceList.cmake b/Source/SIMPLib/Common/SourceList.cmake
index 2217d459b0..4b5dd029a9 100755
--- a/Source/SIMPLib/Common/SourceList.cmake
+++ b/Source/SIMPLib/Common/SourceList.cmake
@@ -29,6 +29,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibSetGetMacros.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ScopedFileMonitor.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeType.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLArray.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TemplateHelpers.h
 )
 
@@ -62,4 +63,11 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}
 )
 
+#-------------------------------------------------------------------------------
+# Add the unit testing sources
+# --------------------------------------------------------------------
+# If Testing is enabled, turn on the Unit Tests
+if(SIMPL_BUILD_TESTING)
+  include(${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx/SourceList.cmake)
+endif()
 
diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 691b501a3f..f89910cd07 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -37,58 +37,58 @@
 using namespace TemplateHelpers;
 
 // -----------------------------------------------------------------------------
-IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType)
+IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType, RenameDataPath::DataID_t id)
 {
 
   IDataArrayShPtr ptr = IDataArray::NullPointer();
 
   if(CanDynamicCast<FloatArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, 0.0f, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, 0.0f, compDims, "", id);
   }
   else if(CanDynamicCast<DoubleArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, 0.0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, 0.0, compDims, "", id);
   }
   else if(CanDynamicCast<Int8ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt8ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int16ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt16ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int32ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt32ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int64ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt64ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<BoolArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(f, arrayPath, false, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(f, arrayPath, false, compDims, "", id);
   }
   else if(CanDynamicCast<SizeTArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, 0, compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, 0, compDims, "", id);
   }
   else
   {
@@ -100,47 +100,47 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue)
+IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue, RenameDataPath::DataID_t id)
 {
   IDataArrayShPtr ptr = IDataArray::NullPointer();
 
   switch(arrayType)
   {
   case SIMPL::TypeEnums::Int8:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, static_cast<int8_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, static_cast<int8_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt8:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, static_cast<uint8_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, static_cast<uint8_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int16:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, static_cast<int16_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, static_cast<int16_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt16:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, static_cast<uint16_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, static_cast<uint16_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int32:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, static_cast<int32_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, static_cast<int32_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt32:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, static_cast<uint32_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, static_cast<uint32_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int64:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, static_cast<int64_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, static_cast<int64_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt64:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, static_cast<uint64_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, static_cast<uint64_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Float:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, static_cast<float>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, static_cast<float>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Double:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, static_cast<double>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, static_cast<double>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Bool:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(f, arrayPath, static_cast<bool>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(f, arrayPath, static_cast<bool>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::SizeT:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, static_cast<size_t>(initValue), compDims);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, static_cast<size_t>(initValue), compDims, "", id);
     break;
   default:
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeEnums::SupportedTypeList);
@@ -294,7 +294,7 @@ IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector
 IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, QVector<size_t>& compDims)
 {
   IDataArrayShPtr retPtr = IDataArray::NullPointer();
-  DataContainer::Pointer volDataCntr = f->getDataContainerArray()->template getPrereqDataContainer<AbstractFilter>(f, arrayPath.getDataContainerName(), false);
+  DataContainer::Pointer volDataCntr = f->getDataContainerArray()->getPrereqDataContainer(f, arrayPath.getDataContainerName(), false);
   if(f->getErrorCondition() < 0 || nullptr == volDataCntr)
   {
     QString ss = QObject::tr("The Data Container '%1' does not exist").arg(arrayPath.getDataContainerName());
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 4f30b5ab62..ee9d3f99a0 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -40,6 +40,7 @@
 #include <QtCore/QString>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 
 class AbstractFilter;
 
@@ -228,7 +229,7 @@ class SIMPLib_EXPORT CreateNonPrereqArrayFromArrayType
    * @param sourceArrayType
    * @return
    */
-  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType);
+  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType, RenameDataPath::DataID_t = RenameDataPath::k_Invalid_ID);
 };
 
 /**
@@ -254,7 +255,7 @@ class SIMPLib_EXPORT CreateNonPrereqArrayFromTypeEnum
    * @param initValue
    * @return
    */
-  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue);
+  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 };
 
 /**
diff --git a/Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp
new file mode 100644
index 0000000000..cf464a684a
--- /dev/null
+++ b/Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp
@@ -0,0 +1,142 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 <iostream>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/SIMPLib.h"
+
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+class AbstractVecTest
+{
+public:
+  AbstractVecTest() = default;
+  virtual ~AbstractVecTest() = default;
+
+  AbstractVecTest(const AbstractVecTest&) = delete;            // Copy Constructor Not Implemented
+  AbstractVecTest(AbstractVecTest&&) = delete;                 // Move Constructor Not Implemented
+  AbstractVecTest& operator=(const AbstractVecTest&) = delete; // Copy Assignment Not Implemented
+  AbstractVecTest& operator=(AbstractVecTest&&) = delete;      // Move Assignment Not Implemented
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void RemoveTestFiles()
+  {
+#if REMOVE_TEST_FILES
+
+#endif
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestVec2()
+  {
+    FloatVec2Type f3(1.0f, 2.0f);
+
+    std::array<int32_t, 2> i32Array = {1, 2};
+    IntVec2Type i3(i32Array);
+
+    std::tuple<int32_t, int32_t> tpl = std::make_tuple(1, 2);
+    i3 = tpl;
+
+    std::vector<int32_t> iv3 = {4, 5};
+    i3 = iv3.data();
+
+    int32_t x = i3.getX();
+    DREAM3D_REQUIRED(x, ==, 4)
+    int32_t y = i3.getY();
+    DREAM3D_REQUIRED(y, ==, 5)
+
+    tpl = i3.toTuple();
+    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
+    DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
+
+    DREAM3D_REQUIRED(i3.size(), ==, 2)
+    DREAM3D_REQUIRED(i3[0], ==, 4)
+    DREAM3D_REQUIRED(i3[1], ==, 5)
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestVec3()
+  {
+    FloatVec3Type f3(1.0f, 2.0f, 3.0f);
+
+    std::array<int32_t, 3> i32Array = {1, 2, 3};
+    IntVec3Type i3(i32Array);
+
+    std::tuple<int32_t, int32_t, int32_t> tpl = std::make_tuple(1, 2, 3);
+    i3 = tpl;
+
+    std::vector<int32_t> iv3 = {4, 5, 6};
+    i3 = iv3.data();
+
+    int32_t x = i3.getX();
+    DREAM3D_REQUIRED(x, ==, 4)
+    int32_t y = i3.getY();
+    DREAM3D_REQUIRED(y, ==, 5)
+    int32_t z = i3.getZ();
+    DREAM3D_REQUIRED(z, ==, 6)
+
+    tpl = i3.toTuple();
+    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
+    DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
+    DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
+
+    DREAM3D_REQUIRED(i3.size(), ==, 3)
+    DREAM3D_REQUIRED(i3[0], ==, 4)
+    DREAM3D_REQUIRED(i3[1], ==, 5)
+    DREAM3D_REQUIRED(i3[2], ==, 6)
+  }
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    int err = EXIT_SUCCESS;
+
+    std::cout << "#### AbstractVecTest Starting ####" << std::endl;
+#if !REMOVE_TEST_FILES
+    DREAM3D_REGISTER_TEST(RemoveTestFiles())
+#endif
+    DREAM3D_REGISTER_TEST(TestVec2())
+    DREAM3D_REGISTER_TEST(TestVec3())
+
+#if REMOVE_TEST_FILES
+    DREAM3D_REGISTER_TEST(RemoveTestFiles())
+#endif
+  }
+};
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
new file mode 100644
index 0000000000..ac19f736c8
--- /dev/null
+++ b/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
@@ -0,0 +1,6 @@
+
+set(TEST_${SUBDIR_NAME}_NAMES
+  AbstractVecTest
+)
+
+SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 911f47c4a7..56d489752d 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -131,6 +131,10 @@
     itemPtr = CalculatorArray<bool>::New(arrayCast, ICalculatorArray::Array, !getInPreflight());                                                                                                       \
   }
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -155,7 +159,7 @@ ArrayCalculator::~ArrayCalculator() = default;
 // -----------------------------------------------------------------------------
 void ArrayCalculator::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::Any, IGeometry::Type::Any);
     parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", SelectedAttributeMatrix, FilterParameter::Parameter, ArrayCalculator, req));
@@ -352,37 +356,37 @@ void ArrayCalculator::dataCheck()
   switch(m_ScalarType)
   {
   case SIMPL::ScalarTypes::Type::Int8:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt8:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int16:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt16:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int32:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt32:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int64:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt64:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Float:
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Double:
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Bool:
-    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims);
+    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   default:
     QString ss = QObject::tr("The output array type is not valid.  No DataArray could be created.");
@@ -472,18 +476,22 @@ void ArrayCalculator::execute()
 
   if(arrayItem != ICalculatorArray::NullPointer())
   {
-    IDataArray::Pointer resultArray = IDataArray::NullPointer();
-    resultArray = arrayItem->getArray();
+    IDataArray::Pointer resultArray = arrayItem->getArray();
 
-    IDataArray::Pointer resultTypeArray = IDataArray::NullPointer();
-    resultTypeArray = convertArrayType(resultArray, m_ScalarType);
+    IDataArray::Pointer resultTypeArray = convertArrayType(resultArray, m_ScalarType);
 
     DataArrayPath createdAMPath(m_CalculatedArray.getDataContainerName(), m_CalculatedArray.getAttributeMatrixName(), "");
     AttributeMatrix::Pointer createdAM = getDataContainerArray()->getAttributeMatrix(createdAMPath);
     if(nullptr != createdAM)
     {
       resultTypeArray->setName(m_CalculatedArray.getDataArrayName());
-      createdAM->addAttributeArray(resultTypeArray->getName(), resultTypeArray);
+      if(!createdAM->insertOrAssign(resultTypeArray))
+      {
+        QString ss = QObject::tr("Error inserting Output Array into Attribute Matrix");
+        setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::AttributeMatrixInsertionError));
+        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        return;
+      }
     }
   }
   else
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 0ae48bd92a..87df51752e 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -56,7 +56,7 @@ Breakpoint::~Breakpoint() = default;
 // -----------------------------------------------------------------------------
 void Breakpoint::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index de728baadf..e86c26dce3 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -43,6 +43,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  CombinedArrayID = 1
+};
+
 /**
  * @brief The CombineAttributeArraysTemplatePrivate class is a templated private implementation that deals with
  * combining the various input arrays into one contiguous array
@@ -187,7 +191,7 @@ CombineAttributeArrays::~CombineAttributeArrays() = default;
 // -----------------------------------------------------------------------------
 void CombineAttributeArrays::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SIMPL_NEW_BOOL_FP("Normalize Data", NormalizeData, FilterParameter::Parameter, CombineAttributeArrays));
   parameters.push_back(SIMPL_NEW_BOOL_FP("Move Data", MoveValues, FilterParameter::Parameter, CombineAttributeArrays));
   {
@@ -287,7 +291,7 @@ void CombineAttributeArrays::dataCheck()
   QVector<size_t> cDims(1, totalComps);
 
   DataArrayPath tempPath(getSelectedDataArrayPaths()[0].getDataContainerName(), getSelectedDataArrayPaths()[0].getAttributeMatrixName(), getStackedDataArrayName());
-  m_StackedDataPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_SelectedWeakPtrVector[0].lock());
+  m_StackedDataPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_SelectedWeakPtrVector[0].lock(), CombinedArrayID);
 
   if(getMoveValues() && getInPreflight())
   {
@@ -339,6 +343,18 @@ void CombineAttributeArrays::execute()
   }
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::list<DataArrayPath> CombineAttributeArrays::getDeletedPaths()
+{
+  if(getMoveValues())
+  {
+    return getSelectedDataArrayPaths().toList().toStdList();
+  }
+  return std::list<DataArrayPath>();
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 7f52bf7a36..8bfde7fa5b 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -134,6 +134,12 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
     */
     void preflight() override;
 
+    /**
+     * @brief Returns the list of deleted data paths.
+     * @return
+     */
+    std::list<DataArrayPath> getDeletedPaths() override;
+
   signals:
     /**
       * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 4e4d2f8fff..cdf179ad37 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -44,6 +44,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  CombinedMatrixID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -67,7 +71,7 @@ CombineAttributeMatrices::~CombineAttributeMatrices() = default;
 // -----------------------------------------------------------------------------
 void CombineAttributeMatrices::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SeparatorFilterParameter::New("Feature/Ensemble Data", FilterParameter::RequiredArray));
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
@@ -196,7 +200,7 @@ void CombineAttributeMatrices::dataCheck()
   // All Feature or Ensemble AMs should start from 1 and the zeroth tuple can be combined in the two AMs
   size_t totalTuples = firstAttrMat->getNumberOfTuples() + secondAttrMat->getNumberOfTuples() - 1;
   QVector<size_t> tDims(1, totalTuples);
-  m->createNonPrereqAttributeMatrix(this, getCombinedAttributeMatrixName(), tDims, firstAttrMat->getType());
+  m->createNonPrereqAttributeMatrix(this, getCombinedAttributeMatrixName(), tDims, firstAttrMat->getType(), CombinedMatrixID);
   if(getErrorCondition() < 0)
   {
     return;
@@ -254,8 +258,7 @@ void CombineAttributeMatrices::dataCheck()
   }
 
   tempPath.update(getFirstIndexArrayPath().getDataContainerName(), getFirstIndexArrayPath().getAttributeMatrixName(), getNewIndexArrayName());
-  m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(this, tempPath, 0,
-                                                                                                                     cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(this, tempPath, 0, cDims);
   if(nullptr != m_NewIndexPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_NewIndex = m_NewIndexPtr.lock()->getPointer(0);
@@ -354,6 +357,14 @@ void CombineAttributeMatrices::execute()
 
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::list<DataArrayPath> CombineAttributeMatrices::getDeletedPaths()
+{
+  return { getFirstAttributeMatrixPath(), getSecondAttributeMatrixPath() };
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 5013be64b6..22aa4df570 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -144,6 +144,12 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
      */
     void preflight() override;
 
+    /**
+     * @brief Returns the list of deleted data paths.
+     * @return
+     */
+    std::list<DataArrayPath> getDeletedPaths();
+
   signals:
     /**
      * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 67e915c41c..b4fe873e47 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -63,7 +63,7 @@ ConditionalSetValue::~ConditionalSetValue() = default;
 // -----------------------------------------------------------------------------
 void ConditionalSetValue::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Parameter, ConditionalSetValue));
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Category::Any);
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 35f66a6ff3..4bca61e168 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -62,11 +62,11 @@ class LuminosityImpl
 private:
   uint8_t* m_ImageData;
   uint8_t* m_FlatImageData;
-  FloatVec3_t m_ColorWeights;
+  FloatVec3Type m_ColorWeights;
   size_t m_NumComp;
 
 public:
-  LuminosityImpl(uint8_t* data, uint8_t* newdata, FloatVec3_t colorWeights, size_t comp)
+  LuminosityImpl(uint8_t* data, uint8_t* newdata, FloatVec3Type colorWeights, size_t comp)
   : m_ImageData(data)
   , m_FlatImageData(newdata)
   , m_ColorWeights(colorWeights)
@@ -83,11 +83,8 @@ class LuminosityImpl
   {
     for(size_t i = start; i < end; i++)
     {
-      m_FlatImageData[i] = static_cast<uint8_t>(roundf(
-        (m_ImageData[m_NumComp * i] * m_ColorWeights.x)
-        + (m_ImageData[m_NumComp * i + 1] * m_ColorWeights.y)
-        + (m_ImageData[m_NumComp * i + 2] * m_ColorWeights.z)
-      ));
+      m_FlatImageData[i] = static_cast<uint8_t>(
+          roundf((m_ImageData[m_NumComp * i] * m_ColorWeights.getX()) + (m_ImageData[m_NumComp * i + 1] * m_ColorWeights.getY()) + (m_ImageData[m_NumComp * i + 2] * m_ColorWeights.getZ())));
     }
   }
 
@@ -215,7 +212,7 @@ ConvertColorToGrayScale::~ConvertColorToGrayScale() = default;
 void ConvertColorToGrayScale::setupFilterParameters()
 {
 
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     QVector<QString> choices;
     choices.push_back("Luminosity");
@@ -374,7 +371,6 @@ void ConvertColorToGrayScale::execute()
   dataCheck();
   if(getErrorCondition() < 0)
   {
-    setErrorCondition(-62106);
     ss = QObject::tr("DataCheck did not pass during execute");
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
     return;
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 3c3e4165da..5135ba137b 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -34,8 +34,8 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   Q_OBJECT
   PYB11_CREATE_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
   PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
-  PYB11_PROPERTY(FloatVec3_t ColorWeights READ getColorWeights WRITE setColorWeights)
+  PYB11_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
   PYB11_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
   PYB11_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
   PYB11_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
@@ -73,8 +73,8 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   SIMPL_FILTER_PARAMETER(int, ConversionAlgorithm)
   Q_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3_t, ColorWeights)
-  Q_PROPERTY(FloatVec3_t ColorWeights READ getColorWeights WRITE setColorWeights)
+  SIMPL_FILTER_PARAMETER(FloatVec3Type, ColorWeights)
+  Q_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
 
   SIMPL_FILTER_PARAMETER(int, ColorChannel)
   Q_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 4756c492ac..879074b518 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -76,7 +76,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   if(scalarType == SIMPL::NumericTypes::Type::Int8)
   {
     Int8ArrayType::Pointer p = Int8ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<int8_t>(ptr->getValue(v)));
@@ -85,7 +85,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::UInt8)
   {
     UInt8ArrayType::Pointer p = UInt8ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<uint8_t>(ptr->getValue(v)));
@@ -94,7 +94,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Int16)
   {
     Int16ArrayType::Pointer p = Int16ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<int16_t>(ptr->getValue(v)));
@@ -103,7 +103,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::UInt16)
   {
     UInt16ArrayType::Pointer p = UInt16ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<uint16_t>(ptr->getValue(v)));
@@ -112,7 +112,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Int32)
   {
     Int32ArrayType::Pointer p = Int32ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<int32_t>(ptr->getValue(v)));
@@ -121,7 +121,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::UInt32)
   {
     UInt32ArrayType::Pointer p = UInt32ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<uint32_t>(ptr->getValue(v)));
@@ -130,7 +130,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Int64)
   {
     Int64ArrayType::Pointer p = Int64ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<int64_t>(ptr->getValue(v)));
@@ -139,7 +139,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::UInt64)
   {
     UInt64ArrayType::Pointer p = UInt64ArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<uint64_t>(ptr->getValue(v)));
@@ -148,7 +148,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Float)
   {
     FloatArrayType::Pointer p = FloatArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<float>(ptr->getValue(v)));
@@ -157,7 +157,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Double)
   {
     DoubleArrayType::Pointer p = DoubleArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<double>(ptr->getValue(v)));
@@ -166,7 +166,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   else if(scalarType == SIMPL::NumericTypes::Type::Bool)
   {
     BoolArrayType::Pointer p = BoolArrayType::CreateArray(voxels, dims, name);
-    m->getAttributeMatrix(attributeMatrixName)->addAttributeArray(p->getName(), p);
+    m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
       p->setValue(v, static_cast<bool>(ptr->getValue(v)));
@@ -202,7 +202,7 @@ ConvertData::~ConvertData() = default;
 // -----------------------------------------------------------------------------
 void ConvertData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, ConvertData));
 
@@ -314,7 +314,7 @@ void ConvertData::dataCheck()
     {
       p = BoolArrayType::CreateArray(voxels, dims, m_OutputArrayName, false);
     }
-    cellAttrMat->addAttributeArray(p->getName(), p);
+    cellAttrMat->insertOrAssign(p);
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 4f667020f5..30916e3194 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -43,6 +43,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  ElementArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -63,7 +67,7 @@ CopyFeatureArrayToElementArray::~CopyFeatureArrayToElementArray() = default;
 // -----------------------------------------------------------------------------
 void CopyFeatureArrayToElementArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::RequiredArray));
 
   {
@@ -137,7 +141,7 @@ void CopyFeatureArrayToElementArray::dataCheck()
   }
 
   tempPath.update(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), getCreatedArrayName());
-  TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock());
+  TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), ElementArrayID);
 }
 
 // -----------------------------------------------------------------------------
@@ -297,7 +301,7 @@ void CopyFeatureArrayToElementArray::execute()
   {
     p->setName(getCreatedArrayName());
     AttributeMatrix::Pointer am = getDataContainerArray()->getAttributeMatrix(getFeatureIdsArrayPath());
-    am->addAttributeArray(p->getName(), p);
+    am->insertOrAssign(p);
   }
 
 }
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index a6fff681aa..cc9dfcfc52 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -44,6 +44,12 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataContainerID = 1,
+  AttributeMatrixID,
+  DataArrayID
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -66,7 +72,7 @@ CopyObject::~CopyObject() = default;
 // -----------------------------------------------------------------------------
 void CopyObject::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Object Type to Copy");
@@ -110,7 +116,7 @@ void CopyObject::readFilterParameters(AbstractFilterParametersReader* reader, in
 {
   reader->openFilterGroup(this, index);
   setObjectToCopy(reader->readValue("ObjectToCopy", getObjectToCopy()));
-  setDataContainerToCopy(reader->readString("DataContainerToCopy", getDataContainerToCopy()));
+  setDataContainerToCopy(reader->readDataArrayPath("DataContainerToCopy", getDataContainerToCopy()));
   setAttributeMatrixToCopy(reader->readDataArrayPath("AttributeMatrixToCopy", getAttributeMatrixToCopy()));
   setAttributeArrayToCopy(reader->readDataArrayPath("AttributeArrayToCopy", getAttributeArrayToCopy()));
   setCopiedObjectName(reader->readString("CopiedObjectName", getCopiedObjectName()));
@@ -160,7 +166,8 @@ void CopyObject::dataCheck()
 
     DataContainer::Pointer dcCopy = m->deepCopy(getInPreflight());
     dcCopy->setName(getCopiedObjectName());
-    getDataContainerArray()->addDataContainer(dcCopy);
+    getDataContainerArray()->addOrReplaceDataContainer(dcCopy);
+    RenameDataPath::AlertFilterCreatedPath(this, DataContainerID, dcCopy->getDataArrayPath());
 
     break;
   }
@@ -184,7 +191,8 @@ void CopyObject::dataCheck()
 
     AttributeMatrix::Pointer attrMatCopy = attrMat->deepCopy(getInPreflight());
     attrMatCopy->setName(getCopiedObjectName());
-    getDataContainerArray()->getDataContainer(getAttributeMatrixToCopy().getDataContainerName())->addAttributeMatrix(getCopiedObjectName(), attrMatCopy);
+    getDataContainerArray()->getDataContainer(getAttributeMatrixToCopy().getDataContainerName())->addOrReplaceAttributeMatrix(attrMatCopy);
+    RenameDataPath::AlertFilterCreatedPath(this, AttributeMatrixID, attrMatCopy->getDataArrayPath());
 
     break;
   }
@@ -208,10 +216,8 @@ void CopyObject::dataCheck()
 
     IDataArray::Pointer arrayCopy = array->deepCopy(getInPreflight());
     arrayCopy->setName(getCopiedObjectName());
-    getDataContainerArray()
-        ->getDataContainer(getAttributeArrayToCopy().getDataContainerName())
-        ->getAttributeMatrix(getAttributeArrayToCopy().getAttributeMatrixName())
-        ->addAttributeArray(getCopiedObjectName(), arrayCopy);
+    getDataContainerArray()->getDataContainer(getAttributeArrayToCopy().getDataContainerName())->getAttributeMatrix(getAttributeArrayToCopy().getAttributeMatrixName())->insertOrAssign(arrayCopy);
+    RenameDataPath::AlertFilterCreatedPath(this, DataArrayID, arrayCopy->getDataArrayPath());
 
     break;
   }
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 5e2323d3c6..2ab28c64f7 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   Q_OBJECT
   PYB11_CREATE_BINDINGS(CopyObject SUPERCLASS AbstractFilter)
   PYB11_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
-  PYB11_PROPERTY(QString DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
+  PYB11_PROPERTY(DataArrayPath DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixToCopy READ getAttributeMatrixToCopy WRITE setAttributeMatrixToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeArrayToCopy READ getAttributeArrayToCopy WRITE setAttributeArrayToCopy)
   PYB11_PROPERTY(QString CopiedObjectName READ getCopiedObjectName WRITE setCopiedObjectName)
@@ -62,8 +62,8 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   SIMPL_FILTER_PARAMETER(int, ObjectToCopy)
   Q_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
 
-  SIMPL_FILTER_PARAMETER(QString, DataContainerToCopy)
-  Q_PROPERTY(QString DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerToCopy)
+  Q_PROPERTY(DataArrayPath DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
 
   SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixToCopy)
   Q_PROPERTY(DataArrayPath AttributeMatrixToCopy READ getAttributeMatrixToCopy WRITE setAttributeMatrixToCopy)
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 52607b37b8..b2b524282f 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -42,6 +42,10 @@
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  AttributeMatrixID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -61,7 +65,7 @@ CreateAttributeMatrix::~CreateAttributeMatrix() = default;
 // -----------------------------------------------------------------------------
 void CreateAttributeMatrix::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     QVector<QString> choices;
@@ -143,7 +147,7 @@ void CreateAttributeMatrix::dataCheck()
     tDims[i] = static_cast<size_t>(cols[i]);
   }
 
-  m->createNonPrereqAttributeMatrix(this, getCreatedAttributeMatrix().getAttributeMatrixName(), tDims, static_cast<AttributeMatrix::Type>(getAttributeMatrixType()));
+  m->createNonPrereqAttributeMatrix(this, getCreatedAttributeMatrix().getAttributeMatrixName(), tDims, static_cast<AttributeMatrix::Type>(getAttributeMatrixType()), AttributeMatrixID);
   if(getErrorCondition() < 0)
   {
     return;
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 807e568e5e..6910677bcf 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -52,6 +52,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataArrayID = 1
+};
+
 /**
 * @brief initializeArrayWithInts Initializes the array p with integers, either from the
 * manual value entered in the filter, or with a random number.  This function does not
@@ -256,7 +260,7 @@ CreateDataArray::~CreateDataArray() = default;
 // -----------------------------------------------------------------------------
 void CreateDataArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_SCALARTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, CreateDataArray));
   parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Parameter, CreateDataArray));
@@ -359,7 +363,7 @@ void CreateDataArray::dataCheck()
     return;
   }
   // Create the data array and initialize it to a placeholder value
-  m_OutputArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromTypeEnum()(this, getNewArray(), cDims, static_cast<int>(getScalarType()), 0);
+  m_OutputArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromTypeEnum()(this, getNewArray(), cDims, static_cast<int>(getScalarType()), 0, DataArrayID);
 
   QString dataArrayName = getNewArray().getDataArrayName();
 
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 903d68a16e..a912b7a91b 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -40,6 +40,10 @@
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataContainerID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -58,7 +62,7 @@ CreateDataContainer::~CreateDataContainer() = default;
 // -----------------------------------------------------------------------------
 void CreateDataContainer::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::CreatedArray, CreateDataContainer));
   setFilterParameters(parameters);
 }
@@ -69,7 +73,6 @@ void CreateDataContainer::setupFilterParameters()
 void CreateDataContainer::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
   reader->openFilterGroup(this, index);
-  setDataContainerName(reader->readString("DataContainerName", getDataContainerName()));
   reader->closeFilterGroup();
 }
 
@@ -88,7 +91,7 @@ void CreateDataContainer::dataCheck()
   setErrorCondition(0);
   setWarningCondition(0);
 
-  getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName());
+  getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index 5dc16a6cf2..21af43793b 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
   public:
     SIMPL_SHARED_POINTERS(CreateDataContainer)
@@ -56,8 +56,8 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 
     ~CreateDataContainer() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-    Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index e4010e51cd..908781db3e 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -44,6 +44,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  FeatureArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -65,7 +69,7 @@ CreateFeatureArrayFromElementArray::~CreateFeatureArrayFromElementArray() = defa
 // -----------------------------------------------------------------------------
 void CreateFeatureArrayFromElementArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req =
@@ -138,7 +142,7 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   }
 
   DataArrayPath tempPath(getCellFeatureAttributeMatrixName().getDataContainerName(), getCellFeatureAttributeMatrixName().getAttributeMatrixName(), getCreatedArrayName());
-  TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock());
+  TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), FeatureArrayID);
 }
 
 // -----------------------------------------------------------------------------
@@ -323,7 +327,7 @@ void CreateFeatureArrayFromElementArray::execute()
 
   if(p.get() != nullptr)
   {
-    getDataContainerArray()->getAttributeMatrix(m_CellFeatureAttributeMatrixName)->addAttributeArray(p->getName(), p);
+    getDataContainerArray()->getAttributeMatrix(m_CellFeatureAttributeMatrixName)->insertOrAssign(p);
   }
 
 }
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 707885aa26..31f371cb2c 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -74,9 +74,9 @@ CreateGeometry::CreateGeometry()
 , m_XBoundsArrayPath("", "", "")
 , m_YBoundsArrayPath("", "", "")
 , m_ZBoundsArrayPath("", "", "")
-, m_Dimensions({0, 0, 0})
-, m_Origin({0.0f, 0.0f, 0.0f})
-, m_Resolution({1.0f, 1.0f, 1.0f})
+, m_Dimensions(0, 0, 0)
+, m_Origin(0.0f, 0.0f, 0.0f)
+, m_Spacing(1.0f, 1.0f, 1.0f)
 , m_ImageCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
 , m_RectGridCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
 , m_VertexAttributeMatrixName0(SIMPL::Defaults::VertexAttributeMatrixName)
@@ -94,17 +94,6 @@ CreateGeometry::CreateGeometry()
 , m_ArrayHandling(false)
 , m_NumVerts(0)
 {
-  m_Dimensions.x = 0;
-  m_Dimensions.y = 0;
-  m_Dimensions.z = 0;
-
-  m_Origin.x = 0.0f;
-  m_Origin.y = 0.0f;
-  m_Origin.z = 0.0f;
-
-  m_Resolution.x = 1.0f;
-  m_Resolution.y = 1.0f;
-  m_Resolution.z = 1.0f;
 }
 
 // -----------------------------------------------------------------------------
@@ -117,7 +106,7 @@ CreateGeometry::~CreateGeometry() = default;
 // -----------------------------------------------------------------------------
 void CreateGeometry::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Geometry Type");
@@ -136,7 +125,7 @@ void CreateGeometry::setupFilterParameters()
     parameter->setChoices(choices);
     QStringList linkedProps = {"Dimensions",
                                "Origin",
-                               "Resolution",
+                               "Spacing",
                                "BoxDimensions",
                                "ImageCellAttributeMatrixName", // ImageGeom
                                "XBoundsArrayPath",
@@ -164,7 +153,7 @@ void CreateGeometry::setupFilterParameters()
                                "SharedVertexListArrayPath5",
                                "SharedHexListArrayPath",
                                "VertexAttributeMatrixName5",
-                               "HexCellAttributeMatrixName" }; // HexahedralGeom
+                               "HexCellAttributeMatrixName"}; // HexahedralGeom
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Parameter);
@@ -182,7 +171,7 @@ void CreateGeometry::setupFilterParameters()
   {
     parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateGeometry, 0));
-    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resolution", Resolution, FilterParameter::Parameter, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_STRING_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 0));
   }
   {
@@ -280,28 +269,30 @@ void CreateGeometry::dataCheck()
   {
   case 0: // ImageGeom
   {
-    if(getDimensions().x <= 0 || getDimensions().y <= 0 || getDimensions().z <= 0)
+    if(getDimensions().getX() <= 0 || getDimensions().getY() <= 0 || getDimensions().getZ() <= 0)
     {
       QString ss = QObject::tr("One of the dimensions has a size less than or equal to zero; all dimensions must be positive\n"
                                "X Dimension: %1\n"
                                "Y Dimension: %2\n"
                                "Z Dimension: %3\n")
-                       .arg(getDimensions().x)
-                       .arg(getDimensions().y)
-                       .arg(getDimensions().z);
+                       .arg(getDimensions().getX())
+                       .arg(getDimensions().getY())
+                       .arg(getDimensions().getZ());
       setErrorCondition(-390);
       notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
       return;
     }
 
     ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    image->setDimensions(getDimensions().x, getDimensions().y, getDimensions().z);
-    image->setOrigin(getOrigin().x, getOrigin().y, getOrigin().z);
-    image->setResolution(getResolution().x, getResolution().y, getResolution().z);
+    IntVec3Type dims = getDimensions();
+    image->setDimensions(SizeVec3Type(dims[0], dims[1], dims[2]));
+    image->setOrigin(getOrigin());
+    image->setSpacing(getSpacing());
     dc->setGeometry(image);
 
     QVector<size_t> tDims = {image->getXPoints(), image->getYPoints(), image->getZPoints()};
-    DataArrayPath path(getDataContainerName(), getImageCellAttributeMatrixName(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getImageCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
     break;
   }
@@ -361,11 +352,12 @@ void CreateGeometry::dataCheck()
       getDataContainerArray()->getAttributeMatrix(getYBoundsArrayPath())->removeAttributeArray(getYBoundsArrayPath().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getZBoundsArrayPath())->removeAttributeArray(getZBoundsArrayPath().getDataArrayName());
     }
-    rectgrid->setDimensions(m_XBoundsPtr.lock()->getNumberOfTuples() - 1, m_YBoundsPtr.lock()->getNumberOfTuples() - 1, m_ZBoundsPtr.lock()->getNumberOfTuples() - 1);
+    rectgrid->setDimensions(SizeVec3Type(m_XBoundsPtr.lock()->getNumberOfTuples() - 1, m_YBoundsPtr.lock()->getNumberOfTuples() - 1, m_ZBoundsPtr.lock()->getNumberOfTuples() - 1));
     dc->setGeometry(rectgrid);
 
     QVector<size_t> tDims = {rectgrid->getXPoints(), rectgrid->getYPoints(), rectgrid->getZPoints()};
-    DataArrayPath path(getDataContainerName(), getRectGridCellAttributeMatrixName(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getRectGridCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
     break;
   }
@@ -393,7 +385,8 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(vertex);
 
     QVector<size_t> tDims(1, vertex->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName0(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName0());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     break;
   }
@@ -430,10 +423,11 @@ void CreateGeometry::dataCheck()
 
     m_NumVerts = edge->getNumberOfVertices();
     QVector<size_t> tDims(1, edge->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName1(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName1());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     tDims[0] = edge->getNumberOfEdges();
-    path.update(getDataContainerName(), getEdgeAttributeMatrixName(), "");
+    path.setAttributeMatrixName(getEdgeAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Edge);
     break;
   }
@@ -469,10 +463,11 @@ void CreateGeometry::dataCheck()
 
     m_NumVerts = triangle->getNumberOfVertices();
     QVector<size_t> tDims(1, triangle->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName2(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName2());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     tDims[0] = triangle->getNumberOfTris();
-    path.update(getDataContainerName(), getFaceAttributeMatrixName0(), "");
+    path.setAttributeMatrixName(getFaceAttributeMatrixName0());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Face);
     break;
   }
@@ -509,10 +504,11 @@ void CreateGeometry::dataCheck()
 
     m_NumVerts = quadrilateral->getNumberOfVertices();
     QVector<size_t> tDims(1, quadrilateral->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName3(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName3());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     tDims[0] = quadrilateral->getNumberOfQuads();
-    path.update(getDataContainerName(), getFaceAttributeMatrixName1(), "");
+    path.setAttributeMatrixName(getFaceAttributeMatrixName1());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Face);
     break;
   }
@@ -550,10 +546,11 @@ void CreateGeometry::dataCheck()
 
     m_NumVerts = tetrahedral->getNumberOfVertices();
     QVector<size_t> tDims(1, tetrahedral->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName4(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName4());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     tDims[0] = tetrahedral->getNumberOfTets();
-    path.update(getDataContainerName(), getTetCellAttributeMatrixName(), "");
+    path.setAttributeMatrixName(getTetCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
     break;
   }
@@ -592,10 +589,11 @@ void CreateGeometry::dataCheck()
 
     m_NumVerts = hexahedral->getNumberOfVertices();
     QVector<size_t> tDims(1, hexahedral->getNumberOfVertices());
-    DataArrayPath path(getDataContainerName(), getVertexAttributeMatrixName5(), "");
+    DataArrayPath path = getDataContainerName();
+    path.setAttributeMatrixName(getVertexAttributeMatrixName5());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
     tDims[0] = hexahedral->getNumberOfHexas();
-    path.update(getDataContainerName(), getHexCellAttributeMatrixName(), "");
+    path.setAttributeMatrixName(getHexCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
     break;
   }
@@ -913,15 +911,15 @@ QString CreateGeometry::getBoxDimensions()
 {
   QString desc;
   QTextStream ss(&desc);
-  float halfRes[3] = {m_Resolution.x / 2.0f, m_Resolution.y / 2.0f, m_Resolution.z / 2.0f};
+  float halfRes[3] = {m_Spacing[0] * 0.5f, m_Spacing[1] * 0.5f, m_Spacing[2] * 0.5f};
   ss << "Extents:\n"
-     << "X Extent: 0 to " << m_Dimensions.x - 1 << " (dimension: " << m_Dimensions.x << ")\n"
-     << "Y Extent: 0 to " << m_Dimensions.y - 1 << " (dimension: " << m_Dimensions.y << ")\n"
-     << "Z Extent: 0 to " << m_Dimensions.z - 1 << " (dimension: " << m_Dimensions.z << ")\n"
+     << "X Extent: 0 to " << m_Dimensions[0] - 1 << " (dimension: " << m_Dimensions[0] << ")\n"
+     << "Y Extent: 0 to " << m_Dimensions[1] - 1 << " (dimension: " << m_Dimensions[1] << ")\n"
+     << "Z Extent: 0 to " << m_Dimensions[2] - 1 << " (dimension: " << m_Dimensions[2] << ")\n"
      << "Bounds:\n"
-     << "X Range: " << (m_Origin.x - halfRes[0]) << " to " << (m_Origin.x - halfRes[0] + m_Dimensions.x * m_Resolution.x) << " (delta: " << (m_Dimensions.x * m_Resolution.x) << ")\n"
-     << "Y Range: " << (m_Origin.y - halfRes[1]) << " to " << (m_Origin.y - halfRes[1] + m_Dimensions.y * m_Resolution.y) << " (delta: " << (m_Dimensions.y * m_Resolution.y) << ")\n"
-     << "Z Range: " << (m_Origin.z - halfRes[2]) << " to " << (m_Origin.z - halfRes[2] + m_Dimensions.z * m_Resolution.z) << " (delta: " << (m_Dimensions.z * m_Resolution.z) << ")\n";
+     << "X Range: " << (m_Origin[0] - halfRes[0]) << " to " << (m_Origin[0] - halfRes[0] + m_Dimensions[0] * m_Spacing[0]) << " (delta: " << (m_Dimensions[0] * m_Spacing[0]) << ")\n"
+     << "Y Range: " << (m_Origin[1] - halfRes[1]) << " to " << (m_Origin[1] - halfRes[1] + m_Dimensions[1] * m_Spacing[1]) << " (delta: " << (m_Dimensions[1] * m_Spacing[1]) << ")\n"
+     << "Z Range: " << (m_Origin[2] - halfRes[2]) << " to " << (m_Origin[2] - halfRes[2] + m_Dimensions[2] * m_Spacing[2]) << " (delta: " << (m_Dimensions[2] * m_Spacing[2]) << ")\n";
   return desc;
   return desc;
 }
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 5f7bddc61d..8c1549b903 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   Q_OBJECT
   PYB11_CREATE_BINDINGS(CreateGeometry SUPERCLASS AbstractFilter)
   PYB11_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath2 READ getSharedVertexListArrayPath2 WRITE setSharedVertexListArrayPath2)
@@ -60,9 +60,9 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   PYB11_PROPERTY(DataArrayPath XBoundsArrayPath READ getXBoundsArrayPath WRITE setXBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath YBoundsArrayPath READ getYBoundsArrayPath WRITE setYBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
-  PYB11_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
-  PYB11_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
-  PYB11_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+  PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+  PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+  PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
   PYB11_PROPERTY(QString ImageCellAttributeMatrixName READ getImageCellAttributeMatrixName WRITE setImageCellAttributeMatrixName)
   PYB11_PROPERTY(QString RectGridCellAttributeMatrixName READ getRectGridCellAttributeMatrixName WRITE setRectGridCellAttributeMatrixName)
   PYB11_PROPERTY(QString VertexAttributeMatrixName0 READ getVertexAttributeMatrixName0 WRITE setVertexAttributeMatrixName0)
@@ -90,8 +90,8 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   SIMPL_FILTER_PARAMETER(int, GeometryType)
   Q_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
 
-  SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-  Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
   SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
@@ -135,14 +135,14 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   SIMPL_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
   Q_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(IntVec3_t, Dimensions)
-  Q_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
+  SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3_t, Origin)
-  Q_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+  SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+  Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3_t, Resolution)
-  Q_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+  SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+  Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
   SIMPL_FILTER_PARAMETER(QString, ImageCellAttributeMatrixName)
   Q_PROPERTY(QString ImageCellAttributeMatrixName READ getImageCellAttributeMatrixName WRITE setImageCellAttributeMatrixName)
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index b9e9b5c53d..ecfa6b115d 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -50,18 +50,17 @@
 CreateImageGeometry::CreateImageGeometry()
 : m_SelectedDataContainer("ImageGeomDataContainer")
 {
-  m_Dimensions.x = 0;
-  m_Dimensions.y = 0;
-  m_Dimensions.z = 0;
+  m_Dimensions[0] = 0;
+  m_Dimensions[1] = 0;
+  m_Dimensions[2] = 0;
 
-  m_Origin.x = 0.0f;
-  m_Origin.y = 0.0f;
-  m_Origin.z = 0.0f;
-
-  m_Resolution.x = 1.0f;
-  m_Resolution.y = 1.0f;
-  m_Resolution.z = 1.0f;
+  m_Origin[0] = 0.0f;
+  m_Origin[1] = 0.0f;
+  m_Origin[2] = 0.0f;
 
+  m_Spacing[0] = 1.0f;
+  m_Spacing[1] = 1.0f;
+  m_Spacing[2] = 1.0f;
 }
 
 // -----------------------------------------------------------------------------
@@ -74,7 +73,7 @@ CreateImageGeometry::~CreateImageGeometry() = default;
 // -----------------------------------------------------------------------------
 void CreateImageGeometry::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", SelectedDataContainer, FilterParameter::Parameter, CreateImageGeometry, req));
@@ -82,7 +81,7 @@ void CreateImageGeometry::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateImageGeometry));
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateImageGeometry));
 
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resolution", Resolution, FilterParameter::Parameter, CreateImageGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateImageGeometry));
 
   PreflightUpdatedValueFilterParameter::Pointer param =
              SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateImageGeometry);
@@ -100,8 +99,8 @@ void CreateImageGeometry::readFilterParameters(AbstractFilterParametersReader* r
   reader->openFilterGroup(this, index);
   setDimensions(reader->readIntVec3("Dimensions", getDimensions()));
   setOrigin(reader->readFloatVec3("Origin", getOrigin()));
-  setResolution(reader->readFloatVec3("Resolution", getResolution()));
-  setSelectedDataContainer(reader->readString("SelectedDataContainer", getSelectedDataContainer()));
+  setSpacing(reader->readFloatVec3("Spacing", getSpacing()));
+  setSelectedDataContainer(reader->readDataArrayPath("SelectedDataContainer", getSelectedDataContainer()));
   reader->closeFilterGroup();
 }
 
@@ -120,7 +119,7 @@ void CreateImageGeometry::dataCheck()
   setErrorCondition(0);
   setWarningCondition(0);
 
-  if(m_Dimensions.x == 0 || m_Dimensions.y == 0 || m_Dimensions.z == 0)
+  if(m_Dimensions[0] == 0 || m_Dimensions[1] == 0 || m_Dimensions[2] == 0)
   {
     QString ss = QObject::tr("One of the dimensions has a size less than or equal to zero. The minimum size must be postive");
     setErrorCondition(-390);
@@ -141,9 +140,9 @@ void CreateImageGeometry::dataCheck()
   }
 
   ImageGeom::Pointer image = ImageGeom::CreateGeometry("ImageGeometry");
-  image->setDimensions(std::make_tuple(m_Dimensions.x, m_Dimensions.y, m_Dimensions.z));
-  image->setResolution(std::make_tuple(m_Resolution.x, m_Resolution.y, m_Resolution.z));
-  image->setOrigin(std::make_tuple(m_Origin.x, m_Origin.y, m_Origin.z));
+  image->setDimensions(std::make_tuple(m_Dimensions[0], m_Dimensions[1], m_Dimensions[2]));
+  image->setSpacing(std::make_tuple(m_Spacing[0], m_Spacing[1], m_Spacing[2]));
+  image->setOrigin(std::make_tuple(m_Origin[0], m_Origin[1], m_Origin[2]));
   m->setGeometry(image);
 }
 
@@ -182,15 +181,15 @@ QString CreateImageGeometry::getBoxDimensions()
 {
   QString desc;
   QTextStream ss(&desc);
-  float halfRes[3] = {m_Resolution.x / 2.0f, m_Resolution.y / 2.0f, m_Resolution.z / 2.0f};
+  float halfRes[3] = {m_Spacing[0] / 2.0f, m_Spacing[1] / 2.0f, m_Spacing[2] / 2.0f};
   ss << "Extents:\n"
-     << "X Extent: 0 to " << m_Dimensions.x - 1 << " (dimension: " << m_Dimensions.x << ")\n"
-     << "Y Extent: 0 to " << m_Dimensions.y - 1 << " (dimension: " << m_Dimensions.y << ")\n"
-     << "Z Extent: 0 to " << m_Dimensions.z - 1 << " (dimension: " << m_Dimensions.z << ")\n"
+     << "X Extent: 0 to " << m_Dimensions[0] - 1 << " (dimension: " << m_Dimensions[0] << ")\n"
+     << "Y Extent: 0 to " << m_Dimensions[1] - 1 << " (dimension: " << m_Dimensions[1] << ")\n"
+     << "Z Extent: 0 to " << m_Dimensions[2] - 1 << " (dimension: " << m_Dimensions[2] << ")\n"
      << "Bounds:\n"
-     << "X Range: " << (m_Origin.x - halfRes[0]) << " to " << (m_Origin.x - halfRes[0] + m_Dimensions.x * m_Resolution.x) << " (delta: " << (m_Dimensions.x * m_Resolution.x) << ")\n"
-     << "Y Range: " << (m_Origin.y - halfRes[1]) << " to " << (m_Origin.y - halfRes[1] + m_Dimensions.y * m_Resolution.y) << " (delta: " << (m_Dimensions.y * m_Resolution.y) << ")\n"
-     << "Z Range: " << (m_Origin.z - halfRes[2]) << " to " << (m_Origin.z - halfRes[2] + m_Dimensions.z * m_Resolution.z) << " (delta: " << (m_Dimensions.z * m_Resolution.z) << ")\n";
+     << "X Range: " << (m_Origin[0] - halfRes[0]) << " to " << (m_Origin[0] - halfRes[0] + m_Dimensions[0] * m_Spacing[0]) << " (delta: " << (m_Dimensions[0] * m_Spacing[0]) << ")\n"
+     << "Y Range: " << (m_Origin[1] - halfRes[1]) << " to " << (m_Origin[1] - halfRes[1] + m_Dimensions[1] * m_Spacing[1]) << " (delta: " << (m_Dimensions[1] * m_Spacing[1]) << ")\n"
+     << "Z Range: " << (m_Origin[2] - halfRes[2]) << " to " << (m_Origin[2] - halfRes[2] + m_Dimensions[2] * m_Spacing[2]) << " (delta: " << (m_Dimensions[2] * m_Spacing[2]) << ")\n";
   return desc;
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index 3fc8aebab2..17af1eb371 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -49,10 +49,10 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
-    PYB11_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
-    PYB11_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
-    PYB11_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+    PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
+    PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+    PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+    PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
   public:
     SIMPL_SHARED_POINTERS(CreateImageGeometry)
@@ -61,17 +61,17 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 
     ~CreateImageGeometry() override;
 
-    SIMPL_FILTER_PARAMETER(QString, SelectedDataContainer)
-    Q_PROPERTY(QString SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainer)
+    Q_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
 
-    SIMPL_FILTER_PARAMETER(IntVec3_t, Dimensions)
-    Q_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
+    SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+    Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3_t, Origin)
-    Q_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+    SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+    Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3_t, Resolution)
-    Q_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+    SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+    Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
     QString getBoxDimensions();
     Q_PROPERTY(QString BoxDimensions READ getBoxDimensions)
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index dbeab50795..17ba0f31db 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -48,6 +48,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  StringArrayID = 1
+};
+
 /**
 * @brief initializeArrayWithInts Initializes the array p with integers, either from the
 * manual value entered in the filter, or with a random number.  This function does not
@@ -83,7 +87,7 @@ CreateStringArray::~CreateStringArray() = default;
 // -----------------------------------------------------------------------------
 void CreateStringArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   // Do not let the user change the number of components in a StringDataArray
   setNumberOfComponents(1);
@@ -160,7 +164,7 @@ void CreateStringArray::dataCheck()
   }
   
   // Create the data array and initialize it to a placeholder value
-  m_OutputArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, getNewArray(), m_InitializationValue, cDims);
+  m_OutputArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, getNewArray(), m_InitializationValue, cDims, "", StringArrayID);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 14c9fce899..089fc95b77 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -40,12 +40,17 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataContainerID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -71,7 +76,7 @@ CropVertexGeometry::~CropVertexGeometry() = default;
 // -----------------------------------------------------------------------------
 void CropVertexGeometry::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   DataContainerSelectionFilterParameter::RequirementType req;
   IGeometry::Types reqGeom = {IGeometry::Type::Vertex};
   req.dcGeometryTypes = reqGeom;
@@ -82,7 +87,7 @@ void CropVertexGeometry::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_FLOAT_FP("X Max", XMax, FilterParameter::Parameter, CropVertexGeometry));
   parameters.push_back(SIMPL_NEW_FLOAT_FP("Y Max", YMax, FilterParameter::Parameter, CropVertexGeometry));
   parameters.push_back(SIMPL_NEW_FLOAT_FP("Z Max", ZMax, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Cropped Data Container", CroppedDataContainerName, FilterParameter::CreatedArray, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Cropped Data Container", CroppedDataContainerName, FilterParameter::CreatedArray, CropVertexGeometry));
   setFilterParameters(parameters);
 }
 
@@ -92,14 +97,14 @@ void CropVertexGeometry::setupFilterParameters()
 void CropVertexGeometry::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
   reader->openFilterGroup(this, index);
-  setDataContainerName(reader->readString("DataContainerName", getDataContainerName()));
+  setDataContainerName(reader->readDataArrayPath("DataContainerName", getDataContainerName()));
   setXMin(reader->readValue("XMin", getXMin()));
   setYMin(reader->readValue("YMin", getYMin()));
   setZMin(reader->readValue("ZMin", getZMin()));
   setXMax(reader->readValue("XMax", getXMax()));
   setYMax(reader->readValue("YMax", getYMax()));
   setZMax(reader->readValue("ZMax", getZMax()));
-  setCroppedDataContainerName(reader->readString("CroppedDataContainerName", getCroppedDataContainerName()));
+  setCroppedDataContainerName(reader->readDataArrayPath("CroppedDataContainerName", getCroppedDataContainerName()));
   reader->closeFilterGroup();
 }
 
@@ -144,7 +149,7 @@ void CropVertexGeometry::dataCheck()
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
   }
 
-  DataContainer::Pointer dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getCroppedDataContainerName());
+  DataContainer::Pointer dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getCroppedDataContainerName(), DataContainerID);
 
   if(getErrorCondition() < 0)
   {
@@ -175,7 +180,7 @@ void CropVertexGeometry::dataCheck()
       if(tempAttrMatType != AttributeMatrix::Type::Vertex)
       {
         AttributeMatrix::Pointer attrMat = tmpAttrMat->deepCopy(getInPreflight());
-        dc->addAttributeMatrix(attr_mat, attrMat);
+        dc->addOrReplaceAttributeMatrix(attrMat);
       }
       else
       {
@@ -183,7 +188,7 @@ void CropVertexGeometry::dataCheck()
         tempDataArrayList = tmpAttrMat->getAttributeArrayNames();
         for(auto&& data_array : tempDataArrayList)
         {
-          tempPath.update(getCroppedDataContainerName(), tmpAttrMat->getName(), data_array);
+          tempPath.update(getCroppedDataContainerName().getDataContainerName(), tmpAttrMat->getName(), data_array);
           IDataArray::Pointer tmpDataArray = tmpAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, data_array, -90002);
           if(getErrorCondition() >= 0)
           {
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index aa190086fd..e3b082f62e 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -46,8 +46,8 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
 {
   Q_OBJECT
   PYB11_CREATE_BINDINGS(CropVertexGeometry SUPERCLASS AbstractFilter)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
-  PYB11_PROPERTY(QString CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
   PYB11_PROPERTY(float XMin READ getXMin WRITE setXMin)
   PYB11_PROPERTY(float YMin READ getYMin WRITE setYMin)
   PYB11_PROPERTY(float ZMin READ getZMin WRITE setZMin)
@@ -62,11 +62,11 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
 
   ~CropVertexGeometry() override;
 
-  SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-  Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(QString, CroppedDataContainerName)
-  Q_PROPERTY(QString CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, CroppedDataContainerName)
+  Q_PROPERTY(DataArrayPath CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
 
   SIMPL_FILTER_PARAMETER(float, XMin)
   Q_PROPERTY(float XMin READ getXMin WRITE setXMin)
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 12845d314a..c593198301 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -74,7 +74,7 @@ DataContainerReader::~DataContainerReader() = default;
 // -----------------------------------------------------------------------------
 void DataContainerReader::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_BOOL_FP("Overwrite Existing Data Containers", OverwriteExistingDataContainers, FilterParameter::Parameter, DataContainerReader));
   {
@@ -180,20 +180,16 @@ void DataContainerReader::dataCheck()
     return;
   }
 
-  QList<DataContainer::Pointer>& tempContainers = tempDCA->getDataContainers();
-
-  QListIterator<DataContainer::Pointer> iter(tempContainers);
-  while(iter.hasNext())
+  DataContainerArray::Container tempContainers = tempDCA->getDataContainers();
+  for(DataContainer::Pointer container : tempContainers)
   {
-    DataContainer::Pointer container = iter.next();
-
     if(getOverwriteExistingDataContainers())
     {
       if(dca->doesDataContainerExist(container->getName()))
       {
         dca->removeDataContainer(container->getName());
       }
-      dca->addDataContainer(container);
+      dca->addOrReplaceDataContainer(container);
     }
     else
     {
@@ -205,7 +201,7 @@ void DataContainerReader::dataCheck()
       }
       else
       {
-        dca->addDataContainer(container);
+        dca->addOrReplaceDataContainer(container);
       }
     }
   }
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 6f6ef64ba8..f2099cc29c 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -83,7 +83,7 @@ DataContainerWriter::~DataContainerWriter()
 // -----------------------------------------------------------------------------
 void DataContainerWriter::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Parameter, DataContainerWriter, "*.dream3d", ""));
   parameters.push_back(SIMPL_NEW_BOOL_FP("Write Xdmf File", WriteXdmfFile, FilterParameter::Parameter, DataContainerWriter));
@@ -261,7 +261,7 @@ void DataContainerWriter::execute()
         dc->getGeometry()->setTimeValue(static_cast<float>(iter));
       }
 #if 0
-      dc->getGeometry()->addAttributeMatrix(SIMPL::StringConstants::MetaData, dc->getAttributeMatrix(SIMPL::StringConstants::MetaData));
+      dc->getGeometry()->addOrReplaceAttributeMatrix(SIMPL::StringConstants::MetaData, dc->getAttributeMatrix(SIMPL::StringConstants::MetaData));
       dc->getGeometry()->setTemporalDataPath(DataArrayPath(dc->getName(), SIMPL::StringConstants::MetaData, "Step #"));
 #endif
 
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index d3c0a82498..95b64314da 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -58,7 +58,7 @@ EmptyFilter::~EmptyFilter() = default;
 // -----------------------------------------------------------------------------
 void EmptyFilter::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   QString str;
   QTextStream ss(&str);
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index be63ac1554..4b1614bde9 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -60,7 +60,7 @@ ExecuteProcess::~ExecuteProcess() = default;
 // -----------------------------------------------------------------------------
 void ExecuteProcess::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_STRING_FP("Command Line Arguments", Arguments, FilterParameter::Parameter, ExecuteProcess));
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index d2eec9d1ca..25c3abf539 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -52,6 +52,23 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  RectGrid_XBoundsID = 1,
+  RectGrid_YBoundsID,
+  RectGrid_ZBoundsID,
+  Vert_SharedVertexID,
+  Edge_SharedVertexID,
+  Edge_SharedEdgeID,
+  Tri_SharedVertexID,
+  Tri_SharedTriangleID,
+  Quad_SharedVertexID,
+  Quad_SharedQuadID,
+  Tet_SharedVertexID,
+  Tet_SharedTetID,
+  Hex_SharedVertexID,
+  Hex_SharedHexID
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -95,7 +112,7 @@ void ExtractAttributeArraysFromGeometry::initialize()
 // -----------------------------------------------------------------------------
 void ExtractAttributeArraysFromGeometry::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     LinkedDataContainerSelectionFilterParameter::Pointer parameter = LinkedDataContainerSelectionFilterParameter::New();
     parameter->setHumanLabel("Geometry");
@@ -180,7 +197,7 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
 void ExtractAttributeArraysFromGeometry::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
   reader->openFilterGroup(this, index);
-  setDataContainerName(reader->readString("DataContainerName", getDataContainerName()));
+  setDataContainerName(reader->readDataArrayPath("DataContainerName", getDataContainerName()));
   setSharedVertexListArrayPath0(reader->readDataArrayPath("SharedVertexListArrayPath0", getSharedVertexListArrayPath0()));
   setSharedVertexListArrayPath1(reader->readDataArrayPath("SharedVertexListArrayPath1", getSharedVertexListArrayPath1()));
   setSharedVertexListArrayPath2(reader->readDataArrayPath("SharedVertexListArrayPath2", getSharedVertexListArrayPath2()));
@@ -231,7 +248,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 1);
 
-    m_XBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getXBoundsArrayPath(), 0, cDims);
+    m_XBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getXBoundsArrayPath(), 0, cDims, "", RectGrid_XBoundsID);
     if(m_XBoundsPtr.lock())
     {
       m_XBounds = m_XBoundsPtr.lock()->getPointer(0);
@@ -241,7 +258,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       xarrays.push_back(m_XBoundsPtr.lock());
     }
 
-    m_YBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getYBoundsArrayPath(), 0, cDims);
+    m_YBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getYBoundsArrayPath(), 0, cDims, "", RectGrid_YBoundsID);
     if(m_YBoundsPtr.lock())
     {
       m_YBounds = m_YBoundsPtr.lock()->getPointer(0);
@@ -251,7 +268,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       yarrays.push_back(m_YBoundsPtr.lock());
     }
 
-    m_ZBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getZBoundsArrayPath(), 0, cDims);
+    m_ZBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getZBoundsArrayPath(), 0, cDims, "", RectGrid_ZBoundsID);
     if(m_ZBoundsPtr.lock())
     {
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
@@ -276,7 +293,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath0(), 0, cDims);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath0(), 0, cDims, "", Vert_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -301,7 +318,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath1(), 0, cDims);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath1(), 0, cDims, "", Edge_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -313,7 +330,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 2;
 
-    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedEdgeListArrayPath(), 0, cDims);
+    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedEdgeListArrayPath(), 0, cDims, "", Edge_SharedEdgeID);
     if(m_EdgesPtr.lock())
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
@@ -339,7 +356,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath2(), 0, cDims);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath2(), 0, cDims, "", Tri_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -349,7 +366,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       varrays.push_back(m_VertsPtr.lock());
     }
 
-    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTriListArrayPath(), 0, cDims);
+    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTriListArrayPath(), 0, cDims, "", Tri_SharedTriangleID);
     if(m_TrisPtr.lock())
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
@@ -375,7 +392,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath3(), 0, cDims);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath3(), 0, cDims, "", Quad_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -387,7 +404,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedQuadListArrayPath(), 0, cDims);
+    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedQuadListArrayPath(), 0, cDims, "", Quad_SharedQuadID);
     if(m_QuadsPtr.lock())
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
@@ -413,7 +430,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath4(), 0, cDims);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath4(), 0, cDims, "", Tet_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -425,7 +442,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTetListArrayPath(), 0, cDims);
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTetListArrayPath(), 0, cDims, "", Tet_SharedTetID);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -451,8 +468,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     QVector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath5(), 0, cDims);
-    if (m_VertsPtr.lock())
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath5(), 0, cDims, "", Hex_SharedVertexID);
+    if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
@@ -463,8 +480,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 8;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedHexListArrayPath(), 0, cDims);
-    if (m_TetsPtr.lock())
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedHexListArrayPath(), 0, cDims, "", Hex_SharedHexID);
+    if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
     }
@@ -483,7 +500,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     QString ss = QObject::tr("Selected Data Container (%1) does not contain a valid geometry\n"
                              "Geometry Type: %2\n"
                              "Valid Geometry Types: Rectilinear Grid, Vertex, Edge, Triangle, Quadrilateral, Tetrahedral")
-                     .arg(getDataContainerName())
+                     .arg(getDataContainerName().getDataContainerName())
                      .arg(igeom->getGeometryTypeAsString());
     setErrorCondition(-701);
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index f1b70737e3..0ecaf8b7e8 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -46,7 +46,7 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
 {
   Q_OBJECT
   PYB11_CREATE_BINDINGS(ExtractAttributeArraysFromGeometry SUPERCLASS AbstractFilter)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath2 READ getSharedVertexListArrayPath2 WRITE setSharedVertexListArrayPath2)
@@ -67,8 +67,8 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
 
   ~ExtractAttributeArraysFromGeometry() override;
 
-  SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-  Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
   SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 1f1c982c58..416ac04640 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -44,6 +44,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -64,7 +68,7 @@ ExtractComponentAsArray::~ExtractComponentAsArray() = default;
 // -----------------------------------------------------------------------------
 void ExtractComponentAsArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Extract", CompNumber, FilterParameter::Parameter, ExtractComponentAsArray));
 
@@ -151,7 +155,7 @@ void ExtractComponentAsArray::dataCheck()
 
   QVector<size_t> cDims(1, 1);
   DataArrayPath tempPath(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getNewArrayArrayName());
-  m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock());
+  m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), DataArrayID);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 9d15a10aeb..fcb99dcb50 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -45,6 +45,11 @@
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DataContainerID = 1,
+  AttributeMatrixID
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -79,7 +84,7 @@ void ExtractVertexGeometry::setupFilterParameters()
   m_NewDCGeometryChoices.clear();
   m_ArrayHandlingChoices.clear();
 
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   //  {
   //    m_NewDCGeometryChoices.push_back("Vertex Geometry");
@@ -145,7 +150,7 @@ void ExtractVertexGeometry::dataCheck()
     return;
   }
 
-  DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer<AbstractFilter>(this, m_SelectedDataContainerName);
+  DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainerName());
   if(getErrorCondition() < 0)
   {
     return;
@@ -161,7 +166,7 @@ void ExtractVertexGeometry::dataCheck()
 
   if(getDataContainerArray()->doesDataContainerExist(getVertexDataContainerName()))
   {
-    QString ss = QObject::tr("A Data Container with name '%1' already exists.").arg(getVertexDataContainerName());
+    QString ss = QObject::tr("A Data Container with name '%1' already exists.").arg(getVertexDataContainerName().getDataContainerName());
     setErrorCondition(-2007);
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
     return;
@@ -180,7 +185,7 @@ void ExtractVertexGeometry::dataCheck()
   size_t elementCount = 0;
   if(IGeometry::Type::Image == geomType || IGeometry::Type::RectGrid == geomType)
   {
-    vertexDataContainer = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getVertexDataContainerName());
+    vertexDataContainer = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getVertexDataContainerName(), DataContainerID);
     IGeometryGrid::Pointer imageGeom = std::dynamic_pointer_cast<IGeometryGrid>(fromGeometry);
     SIMPL::Tuple3SVec imageDims = imageGeom->getDimensions();
     VertexGeom::Pointer vertexGeom = VertexGeom::CreateGeometry(static_cast<int64_t>(std::get<0>(imageDims) * std::get<1>(imageDims) * std::get<2>(imageDims)), "VertexGeometry", !getInPreflight());
@@ -199,7 +204,7 @@ void ExtractVertexGeometry::dataCheck()
   for(int i = 0; i < selectedArraysSize; i++)
   {
     DataArrayPath dap = m_IncludedDataArrayPaths[i];
-    dc = getDataContainerArray()->getPrereqDataContainer<AbstractFilter>(this, dap.getDataContainerName());
+    dc = getDataContainerArray()->getPrereqDataContainer(this, dap.getDataContainerName());
 
     int err = 0;
     AttributeMatrix::Pointer sourceCellAttrMat = dc->getPrereqAttributeMatrix(this, dap.getAttributeMatrixName(), err);
@@ -215,7 +220,7 @@ void ExtractVertexGeometry::dataCheck()
                        .arg(dap.serialize("/"))
                        .arg(sourceCellAttrMat->getNumberOfTuples())
                        .arg(elementCount)
-                       .arg(m_VertexDataContainerName);
+                       .arg(m_VertexDataContainerName.getDataContainerName());
       setErrorCondition(-2009);
       notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
       return;
@@ -237,17 +242,17 @@ void ExtractVertexGeometry::dataCheck()
       newArrayPtr = sourceCellAttrMat->removeAttributeArray(dap.getDataArrayName());
     }
 
-    DataArrayPath newDap(m_VertexDataContainerName);
+    DataArrayPath newDap = m_VertexDataContainerName;
     newDap.setAttributeMatrixName(sourceCellAttrMat->getName());
     newDap.setDataArrayName("");
 
     AttributeMatrix::Pointer vertexCellAttrMat = vertexDataContainer->getAttributeMatrix(newDap);
     if(vertexCellAttrMat == nullptr)
     {
-      vertexCellAttrMat = vertexDataContainer->createNonPrereqAttributeMatrix(this, sourceCellAttrMat->getName(), sourceCellAttrMat->getTupleDimensions(), AttributeMatrix::Type::Vertex);
+      vertexCellAttrMat = vertexDataContainer->createNonPrereqAttributeMatrix(this, sourceCellAttrMat->getName(), sourceCellAttrMat->getTupleDimensions(), AttributeMatrix::Type::Vertex, AttributeMatrixID);
     }
 
-    vertexCellAttrMat->addAttributeArray(newArrayPtr->getName(), newArrayPtr);
+    vertexCellAttrMat->insertOrAssign(newArrayPtr);
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 366c38ddc2..eb08a111b6 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -51,9 +51,9 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
 
   PYB11_CREATE_BINDINGS(ExtractVertexGeometry SUPERCLASS AbstractFilter)
   PYB11_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
-  PYB11_PROPERTY(QString SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+  PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
   PYB11_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
-  PYB11_PROPERTY(QString VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
+  PYB11_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
 
 public:
   SIMPL_SHARED_POINTERS(ExtractVertexGeometry)
@@ -63,14 +63,14 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   SIMPL_FILTER_PARAMETER(int, ArrayHandling)
   Q_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
 
-  SIMPL_FILTER_PARAMETER(QString, SelectedDataContainerName)
-  Q_PROPERTY(QString SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+  Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
 
   SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, IncludedDataArrayPaths)
   Q_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexDataContainerName)
-  Q_PROPERTY(QString VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, VertexDataContainerName)
+  Q_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
 
   ~ExtractVertexGeometry() override;
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 87d763ca0d..5867743ba1 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -63,7 +63,7 @@ FeatureCountDecision::~FeatureCountDecision() = default;
 // -----------------------------------------------------------------------------
 void FeatureCountDecision::setupFilterParameters()
 {
-  FilterParameterVector parameters = getFilterParameters();
+  FilterParameterVectorType parameters = getFilterParameters();
   parameters.push_back(SeparatorFilterParameter::New("Cell Ensemble Data", FilterParameter::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req =
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index dcdcd55607..c75fa2e5bc 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -70,7 +70,7 @@ FeatureDataCSVWriter::~FeatureDataCSVWriter() = default;
 // -----------------------------------------------------------------------------
 void FeatureDataCSVWriter::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", FeatureDataFile, FilterParameter::Parameter, FeatureDataCSVWriter, "*.csv", "Comma Separated Data"));
   parameters.push_back(SIMPL_NEW_BOOL_FP("Write Neighbor Data", WriteNeighborListData, FilterParameter::Parameter, FeatureDataCSVWriter));
   parameters.push_back(SIMPL_NEW_BOOL_FP("Write Number of Features Line", WriteNumFeaturesLine, FilterParameter::Parameter, FeatureDataCSVWriter));
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index eff98128c8..6748586c52 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -49,6 +49,10 @@
 #include "SIMPLib/Math/SIMPLibRandom.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  DerivativesArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -69,7 +73,7 @@ FindDerivatives::~FindDerivatives() = default;
 // -----------------------------------------------------------------------------
 void FindDerivatives::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     DataArraySelectionFilterParameter::RequirementType req =
         DataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
@@ -151,7 +155,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
   {
     EdgeGeom::Pointer edgeGeom = m->getGeometryAs<EdgeGeom>();
     SharedVertexList::Pointer verts = edgeGeom->getVertices();
-    outDataPtr->resize(edgeGeom->getNumberOfVertices());
+    outDataPtr->resizeTuples(edgeGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
@@ -159,7 +163,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
   {
     TriangleGeom::Pointer triGeom = m->getGeometryAs<TriangleGeom>();
     SharedVertexList::Pointer verts = triGeom->getVertices();
-    outDataPtr->resize(triGeom->getNumberOfVertices());
+    outDataPtr->resizeTuples(triGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
@@ -167,7 +171,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
   {
     QuadGeom::Pointer quadGeom = m->getGeometryAs<QuadGeom>();
     SharedVertexList::Pointer verts = quadGeom->getVertices();
-    outDataPtr->resize(quadGeom->getNumberOfVertices());
+    outDataPtr->resizeTuples(quadGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
@@ -175,7 +179,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
   {
     TetrahedralGeom::Pointer tets = m->getGeometryAs<TetrahedralGeom>();
     SharedVertexList::Pointer verts = tets->getVertices();
-    outDataPtr->resize(tets->getNumberOfVertices());
+    outDataPtr->resizeTuples(tets->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
@@ -183,7 +187,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
   {
     HexahedralGeom::Pointer hexas = m->getGeometryAs<HexahedralGeom>();
     SharedVertexList::Pointer verts = hexas->getVertices();
-    outDataPtr->resize(hexas->getNumberOfVertices());
+    outDataPtr->resizeTuples(hexas->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
@@ -320,7 +324,7 @@ void FindDerivatives::dataCheck()
   QVector<size_t> dims(1, cDims);
 
   m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(
-      this, getDerivativesArrayPath(), 0, dims);    /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+      this, getDerivativesArrayPath(), 0, dims, "", DerivativesArrayID);    /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_DerivativesArrayPtr.lock())       /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_DerivativesArray = m_DerivativesArrayPtr.lock()->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index bc2b467a4e..da83d6fec3 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -18,6 +18,10 @@
 #include "SIMPLib/Utilities/ColorTable.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  ColorArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -238,7 +242,7 @@ void GenerateColorTable::initialize()
 // -----------------------------------------------------------------------------
 void GenerateColorTable::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     GenerateColorTableFilterParameter::Pointer parameter = GenerateColorTableFilterParameter::New();
@@ -272,7 +276,7 @@ void GenerateColorTable::dataCheck()
   DataArrayPath tmpPath = getSelectedDataArrayPath();
   tmpPath.setDataArrayName(getRgbArrayName());
 
-  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(this, tmpPath, 0, QVector<size_t>(1, 3));
+  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(this, tmpPath, 0, QVector<size_t>(1, 3), "", ColorArrayID);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 3ed72e14dc..727283ac23 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -55,6 +55,9 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  AsciiArrayID = 1
+};
 
 #define RBR_FILE_NOT_OPEN -1000
 #define RBR_FILE_TOO_SMALL -1010
@@ -349,7 +352,7 @@ void ImportAsciDataArray::readHeaderPortion()
 // -----------------------------------------------------------------------------
 void ImportAsciDataArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, ImportAsciDataArray, "*.*"));
   parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, ImportAsciDataArray));
@@ -441,50 +444,49 @@ void ImportAsciDataArray::dataCheck()
   QVector<size_t> cDims(1, m_NumberOfComponents);
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, uint8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, uint8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, int16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, int16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, uint16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, uint16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, int32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, int32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, uint32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, uint32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, int64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, int64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, uint64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, uint64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, float>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, float>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Bool)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
-  
-  
+
   readHeaderPortion();
   
   
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index fb747dd363..fbceda4255 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -94,7 +94,7 @@ void ImportHDF5Dataset::initialize()
 // -----------------------------------------------------------------------------
 void ImportHDF5Dataset::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   ImportHDF5DatasetFilterParameter::Pointer parameter = ImportHDF5DatasetFilterParameter::New(QString("Select HDF5 File"), // Human Label
                                                                                               QString("ImportHDF5File"),   // Property Name
@@ -339,7 +339,7 @@ void ImportHDF5Dataset::dataCheck()
       IDataArray::Pointer dPtr = readIDataArray(parentId, objectName, am->getNumberOfTuples(), cDims, getInPreflight());
       if(nullptr != dPtr)
       {
-        am->addAttributeArray(dPtr->getName(), dPtr);
+        am->insertOrAssign(dPtr);
       }
       else
       {
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 98afd4c3c9..9766005f5f 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -89,7 +89,7 @@ InitializeData::~InitializeData() = default;
 // -----------------------------------------------------------------------------
 void InitializeData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
   {
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index ebe7fb4486..523e104906 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -43,6 +43,11 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  AttributeMatrixID = 1,
+  DataArrayID
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -63,7 +68,7 @@ LinkFeatureMapToElementArray::~LinkFeatureMapToElementArray() = default;
 // -----------------------------------------------------------------------------
 void LinkFeatureMapToElementArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int32, 1, AttributeMatrix::Category::Element);
@@ -125,7 +130,7 @@ void LinkFeatureMapToElementArray::dataCheck()
   }
 
   QVector<size_t> tDims(1, 0);
-  m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature);
+  m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature, AttributeMatrixID);
 
   QVector<size_t> cDims(1, 1);
   m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getSelectedCellArrayPath(),
@@ -141,8 +146,7 @@ void LinkFeatureMapToElementArray::dataCheck()
   }
 
   tempPath.update(getSelectedCellArrayPath().getDataContainerName(), getCellFeatureAttributeMatrixName(), getActiveArrayName());
-  m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, false,
-                                                                                                             cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, false, cDims, "", DataArrayID);
   if(nullptr != m_ActivePtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 0425888587..4ccd73de52 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -61,7 +61,7 @@ MaskCountDecision::~MaskCountDecision() = default;
 // -----------------------------------------------------------------------------
 void MaskCountDecision::setupFilterParameters()
 {
-  FilterParameterVector parameters = getFilterParameters();
+  FilterParameterVectorType parameters = getFilterParameters();
   DataArraySelectionFilterParameter::RequirementType req =
       DataArraySelectionFilterParameter::CreateRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Type::Any, IGeometry::Type::Any);
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Mask", MaskArrayPath, FilterParameter::RequiredArray, MaskCountDecision, req));
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
new file mode 100644
index 0000000000..f4090c671d
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -0,0 +1,207 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MassCreateData.h"
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+enum createdPathID : RenameDataPath::DataID_t {
+  DataContainerBaseID = 1
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MassCreateData::MassCreateData()
+  : m_DataContainerName("DataContainer")
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MassCreateData::~MassCreateData() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::CreatedArray, MassCreateData));
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::readFilterParameters(AbstractFilterParametersReader* reader, int index)
+{
+  reader->openFilterGroup(this, index);
+  setDataContainerName(reader->readDataArrayPath("DataContainerName", getDataContainerName()));
+  reader->closeFilterGroup();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::dataCheck()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+
+  const int iterations = 4000;
+  for(int i = 0; i < iterations; i++)
+  {
+    DataContainerShPtr dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName().getDataContainerName() + QString::number(i), DataContainerBaseID + i);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::preflight()
+{
+  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
+  setInPreflight(true);              // Set the fact that we are preflighting.
+  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
+  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
+  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
+  emit preflightExecuted();          // We are done preflighting this filter
+  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MassCreateData::execute()
+{
+  setErrorCondition(0);
+  setWarningCondition(0);
+  dataCheck();
+  if(getErrorCondition() < 0)
+  {
+    return;
+  }
+
+  if(getCancel())
+  {
+    return;
+  }
+
+  notifyStatusMessage(getHumanLabel(), "Complete");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer MassCreateData::newFilterInstance(bool copyFilterParameters) const
+{
+  MassCreateData::Pointer filter = MassCreateData::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getGroupName() const
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getHumanLabel() const
+{
+  return "Mass Create Data Containers";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QUuid MassCreateData::getUuid()
+{
+  return QUuid("{816fbe6b-7c38-581b-b149-3f839fb65b95}");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QString MassCreateData::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::GenerationFilters;
+}
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
new file mode 100644
index 0000000000..78ce86849a
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -0,0 +1,168 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+
+#pragma once
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @brief The MassCreateData class. See [Filter documentation](@ref MassCreateData) for details.
+ */
+class SIMPLib_EXPORT MassCreateData : public AbstractFilter
+{
+  Q_OBJECT
+    PYB11_CREATE_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
+    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+  public:
+    SIMPL_SHARED_POINTERS(MassCreateData)
+    SIMPL_FILTER_NEW_MACRO(MassCreateData)
+    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MassCreateData, AbstractFilter)
+
+    ~MassCreateData() override;
+
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+    /**
+     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+     */
+    const QString getCompiledLibraryName() const override;
+
+    /**
+     * @brief getBrandingString Returns the branding string for the filter, which is a tag
+     * used to denote the filter's association with specific plugins
+     * @return Branding string
+     */
+    const QString getBrandingString() const override;
+
+    /**
+     * @brief getFilterVersion Returns a version string for this filter. Default
+     * value is an empty string.
+     * @return
+     */
+    const QString getFilterVersion() const override;
+
+    /**
+     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+     */
+    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+    /**
+     * @brief getGroupName Reimplemented from @see AbstractFilter class
+     */
+    const QString getGroupName() const override;
+
+    /**
+     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+     */
+    const QString getSubGroupName() const override;
+
+    /**
+     * @brief getUuid Return the unique identifier for this filter.
+     * @return A QUuid object.
+     */
+    const QUuid getUuid() override;
+
+    /**
+     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+     */
+    const QString getHumanLabel() const override;
+
+    /**
+     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+     */
+    void setupFilterParameters() override;
+
+    /**
+     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+     */
+    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+    /**
+     * @brief execute Reimplemented from @see AbstractFilter class
+     */
+    void execute() override;
+
+    /**
+     * @brief preflight Reimplemented from @see AbstractFilter class
+     */
+    void preflight() override;
+
+  signals:
+    /**
+     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+     * be pushed from a user-facing control (such as a widget)
+     * @param filter Filter instance pointer
+     */
+    void updateFilterParameters(AbstractFilter* filter);
+
+    /**
+     * @brief parametersChanged Emitted when any Filter parameter is changed internally
+     */
+    void parametersChanged();
+
+    /**
+     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+     */
+    void preflightAboutToExecute();
+
+    /**
+     * @brief preflightExecuted Emitted just after calling dataCheck()
+     */
+    void preflightExecuted();
+
+  protected:
+    MassCreateData();
+    /**
+     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+     */
+    void dataCheck();
+
+    /**
+     * @brief Initializes all the private instance variables.
+     */
+    void initialize();
+
+  public:
+    MassCreateData(const MassCreateData&) = delete;            // Copy Constructor Not Implemented
+    MassCreateData(MassCreateData&&) = delete;                 // Move Constructor Not Implemented
+    MassCreateData& operator=(const MassCreateData&) = delete; // Copy Assignment Not Implemented
+    MassCreateData& operator=(MassCreateData&&) = delete;      // Move Assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index cb7f0fb0ab..76fdb249a1 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -55,7 +55,6 @@ const int32_t k_MoveDataArray = 1;
 // -----------------------------------------------------------------------------
 MoveData::MoveData()
 : m_WhatToMove(k_MoveAttributeMatrix)
-, m_DataContainerDestination("")
 {
 }
 
@@ -69,7 +68,7 @@ MoveData::~MoveData() = default;
 // -----------------------------------------------------------------------------
 void MoveData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   QStringList linkedProps;
   linkedProps << "DataContainerDestination"
@@ -121,7 +120,7 @@ void MoveData::readFilterParameters(AbstractFilterParametersReader* reader, int
 {
   reader->openFilterGroup(this, index);
   setWhatToMove(reader->readValue("WhatToMove", getWhatToMove()));
-  setDataContainerDestination(reader->readString("DataContainerDestination", getDataContainerDestination()));
+  setDataContainerDestination(reader->readDataArrayPath("DataContainerDestination", getDataContainerDestination()));
   setAttributeMatrixSource(reader->readDataArrayPath("AttributeMatrixSource", getAttributeMatrixSource()));
   setAttributeMatrixDestination(reader->readDataArrayPath("AttributeMatrixDestination", getAttributeMatrixDestination()));
   setDataArraySource(reader->readDataArrayPath("DataArraySource", getDataArraySource()));
@@ -165,8 +164,9 @@ void MoveData::dataCheck()
       return;
     }
 
-    amDestDataContainer->addAttributeMatrix(amSrcAttributeMatrix->getName(), amSrcAttributeMatrix);
-    amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+    amDestDataContainer->addOrReplaceAttributeMatrix(amSrcAttributeMatrix);
+    //amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+    addPathRename(amSrcPath, amSrcAttributeMatrix->getDataArrayPath());
   }
   else if(getWhatToMove() == k_MoveDataArray)
   {
@@ -196,8 +196,9 @@ void MoveData::dataCheck()
       return;
     }
 
-    daDestAttributeMatrix->addAttributeArray(daSrcPath.getDataArrayName(), daSrcDataArray);
-    daSrcAttributeMatrix->removeAttributeArray(daSrcPath.getDataArrayName());
+    daDestAttributeMatrix->insertOrAssign(daSrcDataArray);
+    //daSrcAttributeMatrix->removeAttributeArray(daSrcPath.getDataArrayName());
+    addPathRename(daSrcPath, daSrcDataArray->getDataArrayPath());
   }
   else
   {
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index ec11182197..ace6546c88 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     Q_OBJECT
     PYB11_CREATE_BINDINGS(MoveData SUPERCLASS AbstractFilter)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-    PYB11_PROPERTY(QString DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+    PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
@@ -63,8 +63,8 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     SIMPL_FILTER_PARAMETER(int, WhatToMove)
     Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerDestination)
-    Q_PROPERTY(QString DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
 
     SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixSource)
     Q_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 120eb31ac9..4158f3c38b 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -71,7 +71,7 @@ MoveMultiData::~MoveMultiData() = default;
 // -----------------------------------------------------------------------------
 void MoveMultiData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   QStringList linkedProps;
   linkedProps << "DataContainerDestination"
@@ -123,7 +123,7 @@ void MoveMultiData::readFilterParameters(AbstractFilterParametersReader* reader,
 {
   reader->openFilterGroup(this, index);
   setWhatToMove(reader->readValue("WhatToMove", getWhatToMove()));
-  setDataContainerDestination(reader->readString("DataContainerDestination", getDataContainerDestination()));
+  setDataContainerDestination(reader->readDataArrayPath("DataContainerDestination", getDataContainerDestination()));
   setAttributeMatrixSources(reader->readDataArrayPathVector("AttributeMatrixSource", getAttributeMatrixSources()));
   setAttributeMatrixDestination(reader->readDataArrayPath("AttributeMatrixDestination", getAttributeMatrixDestination()));
   setDataArraySources(reader->readDataArrayPathVector("DataArraySources", getDataArraySources()));
@@ -173,8 +173,9 @@ void MoveMultiData::dataCheck()
       }
 
       // Move Attribute Matrix
-      amDestDataContainer->addAttributeMatrix(amSrcAttributeMatrix->getName(), amSrcAttributeMatrix);
-      amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+      amDestDataContainer->addOrReplaceAttributeMatrix(amSrcAttributeMatrix);
+      //amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+      addPathRename(amSrcPaths[i], amSrcAttributeMatrix->getDataArrayPath());
     }
   }
   else if(getWhatToMove() == k_MoveMultiDataArray)
@@ -212,8 +213,9 @@ void MoveMultiData::dataCheck()
       }
 
       // Move Array
-      daDestAttributeMatrix->addAttributeArray(daSrcPaths[i].getDataArrayName(), daSrcDataArray);
-      daSrcAttributeMatrix->removeAttributeArray(daSrcPaths[i].getDataArrayName());
+      daDestAttributeMatrix->insertOrAssign(daSrcDataArray);
+      //daSrcAttributeMatrix->removeAttributeArray(daSrcPaths[i].getDataArrayName());
+      addPathRename(daSrcPaths[i], daSrcDataArray->getDataArrayPath());
     }
   }
   else
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 9ab0fb3200..80b942c24b 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     Q_OBJECT
     PYB11_CREATE_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-    PYB11_PROPERTY(QString DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+    PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
@@ -63,8 +63,8 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     SIMPL_FILTER_PARAMETER(int, WhatToMove)
     Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerDestination)
-    Q_PROPERTY(QString DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
 
     SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, AttributeMatrixSources)
     Q_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index ffc226d7eb..8d7b26f616 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -43,6 +43,10 @@
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  ThresholdArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -61,7 +65,7 @@ MultiThresholdObjects::~MultiThresholdObjects() = default;
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     ComparisonSelectionFilterParameter::Pointer parameter = ComparisonSelectionFilterParameter::New();
     parameter->setHumanLabel("Select Arrays to Threshold");
@@ -139,8 +143,7 @@ void MultiThresholdObjects::dataCheck()
     ComparisonInput_t comp = m_SelectedThresholds[0];
     QVector<size_t> cDims(1, 1);
     DataArrayPath tempPath(comp.dataContainerName, comp.attributeMatrixName, getDestinationArrayName());
-    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true,
-                                                                                                                    cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 4c4613ace8..82123ac9b1 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -43,6 +43,10 @@
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  ThresholdArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -61,7 +65,7 @@ MultiThresholdObjects2::~MultiThresholdObjects2() = default;
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects2::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     ComparisonSelectionAdvancedFilterParameter::Pointer parameter = ComparisonSelectionAdvancedFilterParameter::New();
     parameter->setHumanLabel("Select Arrays to Threshold");
@@ -133,8 +137,7 @@ void MultiThresholdObjects2::dataCheck()
     //AbstractComparison::Pointer comp = m_SelectedThresholds[0];
     QVector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
-    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true,
-                                                                                                                    cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 94f1aa1ceb..451536db8f 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -53,7 +53,7 @@ PipelineAnnotation::~PipelineAnnotation() = default;
 // -----------------------------------------------------------------------------
 void PipelineAnnotation::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_PARAGRAPH_FP("", Summary, FilterParameter::Parameter, PipelineAnnotation, false));
 
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 573951c819..ae09b864dd 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -83,7 +83,7 @@ void PostSlackMessage::initialize()
 // -----------------------------------------------------------------------------
 void PostSlackMessage::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_STRING_FP("Slack User", SlackUser, FilterParameter::Parameter, PostSlackMessage));
   parameters.push_back(SIMPL_NEW_STRING_FP("Slack Url", SlackUrl, FilterParameter::Parameter, PostSlackMessage));
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 2b4cfeefc5..662a5a38ea 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -190,7 +190,7 @@ RawBinaryReader::~RawBinaryReader() = default;
 // -----------------------------------------------------------------------------
 void RawBinaryReader::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, RawBinaryReader, "*.raw *.bin"));
   parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, RawBinaryReader));
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 7c96c30d34..f63fc8753a 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -22,6 +22,7 @@ namespace {
    const QString k_Skip("Skip");
 }
 
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -38,7 +39,7 @@ ReadASCIIData::~ReadASCIIData() = default;
 // -----------------------------------------------------------------------------
 void ReadASCIIData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(ReadASCIIDataFilterParameter::New("ASCII Wizard Data", "WizardData", "WizardData", FilterParameter::Parameter));
 
@@ -219,7 +220,7 @@ void ReadASCIIData::writeFilterParameters(QJsonObject& obj) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ReadASCIIData::renameDataArrayPath(DataArrayPath::RenameType renamePath)
+void ReadASCIIData::renameDataArrayPath(const DataArrayPath::RenameType& renamePath)
 {
   getWizardData().updateDataArrayPath(renamePath);
 
@@ -352,57 +353,57 @@ void ReadASCIIData::dataCheck()
 
     if(dataType == SIMPL::TypeNames::Double)
     {
-      DoubleArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      DoubleArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Float)
     {
-      FloatArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      FloatArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int8)
     {
-      Int8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      Int8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int16)
     {
-      Int16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      Int16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int32)
     {
-      Int32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      Int32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int64)
     {
-      Int64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      Int64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt8)
     {
-      UInt8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      UInt8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt16)
     {
-      UInt16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      UInt16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt32)
     {
-      UInt32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      UInt32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt64)
     {
-      UInt64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims);
+      UInt64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::String)
     {
-      StringDataArray::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, arrayPath, "", cDims);
+      StringDataArray::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, arrayPath, "", cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 624c0c7480..371d03995e 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -122,7 +122,7 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     * For DataArrayPaths longer than the given path, only the specified values are modified
     * @param renamePath
     */
-    void renameDataArrayPath(DataArrayPath::RenameType renamePath) override;
+    void renameDataArrayPath(const DataArrayPath::RenameType& renamePath) override;
 
   signals:
     /**
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index dceccb2d0c..9ef8cdfe42 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -55,7 +55,7 @@ RemoveArrays::~RemoveArrays() = default;
 // -----------------------------------------------------------------------------
 void RemoveArrays::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     DataContainerArrayProxyFilterParameter::Pointer parameter = DataContainerArrayProxyFilterParameter::New();
@@ -129,6 +129,8 @@ void RemoveArrays::markSelectionsForDeletion(DataContainerArray* dca, Qt::CheckS
 // -----------------------------------------------------------------------------
 void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dca, Qt::CheckState state)
 {
+  m_RemovedPaths.clear();
+
   // Loop over the data containers until we find the proper data container
   QList<DataContainerProxy> containers = m_DataArraysToRemove.getDataContainers().values();
   QMutableListIterator<DataContainerProxy> containerIter(containers);
@@ -147,7 +149,8 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
     // the DataContainerArray
     if(dcProxy.getFlag() == state)
     {
-      dca->removeDataContainer(dcProxy.getName()); // Remove it out
+      auto dc = dca->removeDataContainer(dcProxy.getName()); // Remove it out
+      m_RemovedPaths.merge(dc->getDescendantPaths());
       continue;                               // Continue to the next DataContainer
     }
     QMap<QString, AttributeMatrixProxy> attrMats = dcProxy.getAttributeMatricies();
@@ -169,7 +172,8 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
       // Check to see if this AttributeMatrix is checked, if not then remove it from the DataContainer and go to the next loop
       if(attrProxy.getFlag() == state)
       {
-        dcItem->removeAttributeMatrix(amName);
+        auto am = dcItem->removeAttributeMatrix(amName);
+        m_RemovedPaths.merge(am->getDescendantPaths());
         continue;
       }
       // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
@@ -191,7 +195,8 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
         // Check to see if the user selected this item
         if(daProxy.getFlag() == state)
         {
-          amItem->removeAttributeArray(daName);
+          auto da = amItem->removeAttributeArray(daName);
+          m_RemovedPaths.push_back(da->getDataArrayPath());
           continue;
         }
       }
@@ -199,6 +204,14 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
   }
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::list<DataArrayPath> RemoveArrays::getDeletedPaths()
+{
+  return m_RemovedPaths;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index 4cbf883955..6f3efa6849 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -133,6 +133,12 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
      */
     void removeSelectionsFromDataContainerArray(DataContainerArray* dca, Qt::CheckState state);
 
+    /**
+     * @brief Returns the list of deleted data paths.
+     * @return
+     */
+    std::list<DataArrayPath> getDeletedPaths() override;
+
   signals:
     /**
      * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
@@ -179,5 +185,8 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
     RemoveArrays(RemoveArrays&&) = delete;        // Move Constructor Not Implemented
     RemoveArrays& operator=(const RemoveArrays&) = delete; // Copy Assignment Not Implemented
     RemoveArrays& operator=(RemoveArrays&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    std::list<DataArrayPath> m_RemovedPaths;
 };
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index ead5f4d1a9..3588ecb853 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -45,6 +45,11 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  NewDataArrayID = 1,
+  ReducedDataArrayID
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -66,7 +71,7 @@ RemoveComponentFromArray::~RemoveComponentFromArray() = default;
 // -----------------------------------------------------------------------------
 void RemoveComponentFromArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Remove", CompNumber, FilterParameter::Parameter, RemoveComponentFromArray));
 
@@ -164,12 +169,12 @@ void RemoveComponentFromArray::dataCheck()
   if(m_SaveRemovedComponent)
   {
     DataArrayPath tempPath(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getNewArrayArrayName());
-    m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock());
+    m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), NewDataArrayID);
   }
 
   cDims[0] = m_InArrayPtr.lock()->getNumberOfComponents() - 1;
   DataArrayPath tempPath2(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getReducedArrayArrayName());
-  m_ReducedArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath2, cDims, m_InArrayPtr.lock());
+  m_ReducedArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath2, cDims, m_InArrayPtr.lock(), ReducedDataArrayID);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index eb5b727d14..22a34530fd 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -60,7 +60,7 @@ RenameAttributeArray::~RenameAttributeArray() = default;
 // -----------------------------------------------------------------------------
 void RenameAttributeArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   DataArraySelectionFilterParameter::RequirementType req;
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Rename", SelectedArrayPath, FilterParameter::RequiredArray, RenameAttributeArray, req));
@@ -106,6 +106,17 @@ void RenameAttributeArray::dataCheck()
 
   QString daName = getSelectedArrayPath().getDataArrayName();
 
+  // Update the last array name.  This is important for creating rename paths.
+  if(m_LastArrayName != getNewArrayName())
+  {
+    DataArrayPath newArrayPath = getSelectedArrayPath();
+    newArrayPath.setAttributeMatrixName(m_NewArrayName);
+    DataArrayPath oldArrayPath = getSelectedArrayPath();
+    oldArrayPath.setAttributeMatrixName(m_LastArrayName);
+    addPathRename(oldArrayPath, newArrayPath);
+    m_LastArrayName = getNewArrayName();
+  }
+
   AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedArrayPath(), -301);
   if(getErrorCondition() < 0)
   {
@@ -129,10 +140,20 @@ void RenameAttributeArray::dataCheck()
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
     return;
   }
+  case RenameErrorCodes::SAME_PATH:
+  {
+    setErrorCondition(-11018);
+    QString ss = QObject::tr("The new and original DataArray names cannot be identical");
+    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    return;
+  }
   case SUCCESS:
   {
     setErrorCondition(0);
     setWarningCondition(0);
+    DataArrayPath newPath = getSelectedArrayPath();
+    newPath.setDataArrayName(m_NewArrayName);
+    addPathRename(getSelectedArrayPath(), newPath);
     return;
   }
   }
@@ -246,8 +267,8 @@ DataArrayPath::RenameContainer RenameAttributeArray::getRenamedPaths()
   DataArrayPath newPath = getSelectedArrayPath();
   newPath.setDataArrayName(getNewArrayName());
 
-  DataArrayPath::RenameContainer container;
-  container.push_back(DataArrayPath::RenameType(oldPath, newPath));
+  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
+  container.push_back(std::make_pair(oldPath, newPath));
 
   return container;
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index 9803cbf987..79d1426f9e 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -169,6 +169,8 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
      */
     void initialize();
 
+  private:
+    QString m_LastArrayName = "";
 
   public:
     RenameAttributeArray(const RenameAttributeArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index 253d60ca15..fb6ce29eaf 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -60,7 +60,7 @@ RenameAttributeMatrix::~RenameAttributeMatrix() = default;
 // -----------------------------------------------------------------------------
 void RenameAttributeMatrix::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
@@ -108,6 +108,16 @@ void RenameAttributeMatrix::dataCheck()
 
   QString amName = getSelectedAttributeMatrixPath().getAttributeMatrixName();
 
+  if(m_LastMatrixName != getNewAttributeMatrix())
+  {
+    DataArrayPath newMatrixPath = getSelectedAttributeMatrixPath();
+    newMatrixPath.setAttributeMatrixName(getNewAttributeMatrix());
+    DataArrayPath oldMatrixPath = getSelectedAttributeMatrixPath();
+    oldMatrixPath.setAttributeMatrixName(m_LastMatrixName);
+    addPathRename(oldMatrixPath, getSelectedAttributeMatrixPath());
+    m_LastMatrixName = getNewAttributeMatrix();
+  }
+
   DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedAttributeMatrixPath().getDataContainerName());
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedAttributeMatrixPath(), -301);
 
@@ -123,6 +133,12 @@ void RenameAttributeMatrix::dataCheck()
     QString ss = QObject::tr("Attempt to rename Attribute Matrix '%1' to '%2' failed").arg(amName).arg(getNewAttributeMatrix());
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
   }
+  else
+  {
+    DataArrayPath newPath = getSelectedAttributeMatrixPath();
+    newPath.setAttributeMatrixName(getNewAttributeMatrix());
+    addPathRename(getSelectedAttributeMatrixPath(), newPath);
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -233,8 +249,8 @@ DataArrayPath::RenameContainer RenameAttributeMatrix::getRenamedPaths()
   DataArrayPath newPath = getSelectedAttributeMatrixPath();
   newPath.setAttributeMatrixName(getNewAttributeMatrix());
 
-  DataArrayPath::RenameContainer container;
-  container.push_back(DataArrayPath::RenameType(oldPath, newPath));
+  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
+  container.push_back(std::make_pair(oldPath, newPath));
 
   return container;
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index 417f001eaa..dc4d833372 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -169,6 +169,8 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
      */
     void initialize();
 
+  private:
+    QString m_LastMatrixName = "";
 
   public:
     RenameAttributeMatrix(const RenameAttributeMatrix&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 9c36d452a6..a346244be0 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -37,8 +37,8 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
-#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
@@ -60,29 +60,18 @@ RenameDataContainer::~RenameDataContainer() = default;
 // -----------------------------------------------------------------------------
 void RenameDataContainer::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container to Rename", SelectedDataContainerName, FilterParameter::RequiredArray, RenameDataContainer, req));
   }
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("New Data Container Name", NewDataContainerName, FilterParameter::Parameter, RenameDataContainer));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("New Data Container Name", NewDataContainerName, FilterParameter::Parameter, RenameDataContainer));
 
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RenameDataContainer::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  reader->openFilterGroup(this, index);
-  setSelectedDataContainerName(reader->readString("SelectedDataContainerName", getSelectedDataContainerName()));
-  setNewDataContainerName(reader->readString("NewDataContainerName", getNewDataContainerName()));
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -106,6 +95,14 @@ void RenameDataContainer::dataCheck()
     return;
   }
 
+  if(m_LastContainerName != m_NewDataContainerName)
+  {
+    DataArrayPath oldContainerPath = m_LastContainerName;
+    DataArrayPath newContainerPath = getNewDataContainerName();
+    addPathRename(oldContainerPath, newContainerPath);
+    m_LastContainerName = getNewDataContainerName();
+  }
+
   getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainerName());
   if(getErrorCondition() < 0)
   {
@@ -116,9 +113,15 @@ void RenameDataContainer::dataCheck()
   if(!check)
   {
     setErrorCondition(-11006);
-    QString ss = QObject::tr("Attempt to rename DataContainer '%1' to '%2' failed").arg(getSelectedDataContainerName()).arg(getNewDataContainerName());
+    QString ss = QObject::tr("Attempt to rename DataContainer '%1' to '%2' failed").arg(getSelectedDataContainerName().getDataContainerName()).arg(getNewDataContainerName().getDataContainerName());
     notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
   }
+  else
+  {
+    DataArrayPath oldPath = getSelectedDataContainerName();
+    DataArrayPath newPath = getNewDataContainerName();
+    addPathRename(oldPath, newPath);
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -225,11 +228,11 @@ const QString RenameDataContainer::getHumanLabel() const
 // -----------------------------------------------------------------------------
 DataArrayPath::RenameContainer RenameDataContainer::getRenamedPaths()
 {
-  DataArrayPath oldPath(getSelectedDataContainerName(), "", "");
-  DataArrayPath newPath(getNewDataContainerName(), "", "");
+  DataArrayPath oldPath = getSelectedDataContainerName();
+  DataArrayPath newPath = getNewDataContainerName();
 
-  DataArrayPath::RenameContainer container;
-  container.push_back(DataArrayPath::RenameType(oldPath, newPath));
+  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
+  container.push_back(std::make_pair(oldPath, newPath));
 
   return container;
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 8ed3792957..324c3535df 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -47,8 +47,8 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
-    PYB11_PROPERTY(QString NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
+    PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+    PYB11_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
 
   public:
     SIMPL_SHARED_POINTERS(RenameDataContainer)
@@ -57,11 +57,11 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 
     ~RenameDataContainer() override;
 
-    SIMPL_FILTER_PARAMETER(QString, SelectedDataContainerName)
-    Q_PROPERTY(QString SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+    Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(QString, NewDataContainerName)
-    Q_PROPERTY(QString NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, NewDataContainerName)
+    Q_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
@@ -113,11 +113,6 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
      */
     void setupFilterParameters() override;
 
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
     /**
      * @brief execute Reimplemented from @see AbstractFilter class
      */
@@ -169,6 +164,8 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
      */
     void initialize();
 
+  private:
+    DataArrayPath m_LastContainerName;
 
   public:
     RenameDataContainer(const RenameDataContainer&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 3ad88da2e6..998212ade2 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -62,7 +62,7 @@ ReplaceValueInArray::~ReplaceValueInArray() = default;
 // -----------------------------------------------------------------------------
 void ReplaceValueInArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   parameters.push_back(SIMPL_NEW_DOUBLE_FP("Value to Replace", RemoveValue, FilterParameter::Parameter, ReplaceValueInArray));
 
   parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Parameter, ReplaceValueInArray));
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 0f4cbbb287..6619fbe842 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -64,7 +64,7 @@ RequiredZThickness::~RequiredZThickness() = default;
 // -----------------------------------------------------------------------------
 void RequiredZThickness::setupFilterParameters()
 {
-  FilterParameterVector parameters = getFilterParameters();
+  FilterParameterVectorType parameters = getFilterParameters();
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
@@ -82,7 +82,7 @@ void RequiredZThickness::readFilterParameters(AbstractFilterParametersReader* re
 {
   AbstractDecisionFilter::readFilterParameters(reader, index);
   reader->openFilterGroup(this, index);
-  setDataContainerSelection(reader->readString("DataContainerSelection", getDataContainerSelection()));
+  setDataContainerSelection(reader->readDataArrayPath("DataContainerSelection", getDataContainerSelection()));
   setNumZVoxels(reader->readValue("NumZVoxels", getNumZVoxels()));
   setPreflightCheck(reader->readValue("PreflightCheck", getPreflightCheck()));
   reader->closeFilterGroup();
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 9b2534cb6a..31f0048012 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -49,7 +49,7 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+    PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
     PYB11_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
 
@@ -60,8 +60,8 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 
     ~RequiredZThickness() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerSelection)
-    Q_PROPERTY(QString DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
 
     SIMPL_FILTER_PARAMETER(int, NumZVoxels)
     Q_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index e5a92f27f1..842ef84059 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -60,10 +60,10 @@ class ScaleVolumeUpdateVerticesImpl
 {
   float* m_Nodes;
   float* m_Min;
-  FloatVec3_t m_ScaleFactor;
+  FloatVec3Type m_ScaleFactor;
 
 public:
-  ScaleVolumeUpdateVerticesImpl(float* nodes, float* min, FloatVec3_t scale)
+  ScaleVolumeUpdateVerticesImpl(float* nodes, float* min, FloatVec3Type scale)
   : m_Nodes(nodes)
   , m_Min(min)
   , m_ScaleFactor(scale)
@@ -75,9 +75,9 @@ class ScaleVolumeUpdateVerticesImpl
   {
     for(size_t i = start; i < end; i++)
     {
-      m_Nodes[3 * i] = m_Min[0] + (m_Nodes[3 * i] - m_Min[0]) * m_ScaleFactor.x;
-      m_Nodes[3 * i + 1] = m_Min[1] + (m_Nodes[3 * i + 1] - m_Min[1]) * m_ScaleFactor.y;
-      m_Nodes[3 * i + 2] = m_Min[2] + (m_Nodes[3 * i + 2] - m_Min[2]) * m_ScaleFactor.z;
+      m_Nodes[3 * i] = m_Min[0] + (m_Nodes[3 * i] - m_Min[0]) * m_ScaleFactor[0];
+      m_Nodes[3 * i + 1] = m_Min[1] + (m_Nodes[3 * i + 1] - m_Min[1]) * m_ScaleFactor[1];
+      m_Nodes[3 * i + 2] = m_Min[2] + (m_Nodes[3 * i + 2] - m_Min[2]) * m_ScaleFactor[2];
     }
   }
 
@@ -98,10 +98,9 @@ ScaleVolume::ScaleVolume()
 , m_ApplyToVoxelVolume(true)
 , m_ApplyToSurfaceMesh(true)
 {
-  m_ScaleFactor.x = 1.0f;
-  m_ScaleFactor.y = 1.0f;
-  m_ScaleFactor.z = 1.0f;
-
+  m_ScaleFactor[0] = 1.0f;
+  m_ScaleFactor[1] = 1.0f;
+  m_ScaleFactor[2] = 1.0f;
 }
 
 // -----------------------------------------------------------------------------
@@ -114,7 +113,7 @@ ScaleVolume::~ScaleVolume() = default;
 // -----------------------------------------------------------------------------
 void ScaleVolume::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Scaling Factor", ScaleFactor, FilterParameter::Parameter, ScaleVolume));
 
@@ -149,8 +148,8 @@ void ScaleVolume::readFilterParameters(AbstractFilterParametersReader* reader, i
   setApplyToVoxelVolume(reader->readValue("ApplyToVoxelVolume", getApplyToVoxelVolume()));
   setApplyToSurfaceMesh(reader->readValue("ApplyToSurfaceMesh", getApplyToSurfaceMesh()));
   setScaleFactor(reader->readFloatVec3("ScaleFactor", getScaleFactor()));
-  setDataContainerName(reader->readString("DataContainerName", getDataContainerName()));
-  setSurfaceDataContainerName(reader->readString("SurfaceDataContainerName", getSurfaceDataContainerName()));
+  setDataContainerName(reader->readDataArrayPath("DataContainerName", getDataContainerName()));
+  setSurfaceDataContainerName(reader->readDataArrayPath("SurfaceDataContainerName", getSurfaceDataContainerName()));
   reader->closeFilterGroup();
 }
 
@@ -275,12 +274,12 @@ void ScaleVolume::execute()
     DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
     ImageGeom::Pointer image = m->getGeometryAs<ImageGeom>();
 
-    float resolution[3] = {0.0f, 0.0f, 0.0f};
-    image->getResolution(resolution);
-    resolution[0] *= m_ScaleFactor.x;
-    resolution[1] *= m_ScaleFactor.y;
-    resolution[2] *= m_ScaleFactor.z;
-    image->setResolution(resolution);
+    FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
+    image->getSpacing(spacing);
+    spacing[0] *= m_ScaleFactor[0];
+    spacing[1] *= m_ScaleFactor[1];
+    spacing[2] *= m_ScaleFactor[2];
+    image->setSpacing(spacing);
   }
 
   if(m_ApplyToSurfaceMesh)
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 4076ad3bc8..341e624f88 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -48,11 +48,11 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
-    PYB11_PROPERTY(QString SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
+    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    PYB11_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
     PYB11_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
     PYB11_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
-    PYB11_PROPERTY(FloatVec3_t ScaleFactor READ getScaleFactor WRITE setScaleFactor)
+    PYB11_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
 
   public:
     SIMPL_SHARED_POINTERS(ScaleVolume)
@@ -61,11 +61,11 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 
     ~ScaleVolume() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-    Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(QString, SurfaceDataContainerName)
-    Q_PROPERTY(QString SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, SurfaceDataContainerName)
+    Q_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
 
     SIMPL_FILTER_PARAMETER(bool, ApplyToVoxelVolume)
     Q_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
@@ -73,8 +73,8 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
     SIMPL_FILTER_PARAMETER(bool, ApplyToSurfaceMesh)
     Q_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3_t, ScaleFactor)
-    Q_PROPERTY(FloatVec3_t ScaleFactor READ getScaleFactor WRITE setScaleFactor)
+    SIMPL_FILTER_PARAMETER(FloatVec3Type, ScaleFactor)
+    Q_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index f39d35375a..e603fd791a 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -96,14 +96,13 @@ SetOriginResolutionImageGeom::SetOriginResolutionImageGeom()
 , m_ChangeOrigin(false)
 , m_ChangeResolution(false)
 {
-  m_Origin.x = 0.0f;
-  m_Origin.y = 0.0f;
-  m_Origin.z = 0.0f;
-
-  m_Resolution.x = 1.0f;
-  m_Resolution.y = 1.0f;
-  m_Resolution.z = 1.0f;
+  m_Origin[0] = 0.0f;
+  m_Origin[1] = 0.0f;
+  m_Origin[2] = 0.0f;
 
+  m_Spacing[0] = 1.0f;
+  m_Spacing[1] = 1.0f;
+  m_Spacing[2] = 1.0f;
 }
 
 // -----------------------------------------------------------------------------
@@ -116,7 +115,7 @@ SetOriginResolutionImageGeom::~SetOriginResolutionImageGeom() = default;
 // -----------------------------------------------------------------------------
 void SetOriginResolutionImageGeom::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     req.dcGeometryTypes = IGeometry::Types(1, IGeometry::Type::Image);
@@ -128,9 +127,9 @@ void SetOriginResolutionImageGeom::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, SetOriginResolutionImageGeom));
 
   linkedProps.clear();
-  linkedProps << "Resolution";
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Resolution", ChangeResolution, FilterParameter::Parameter, SetOriginResolutionImageGeom, linkedProps));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resolution", Resolution, FilterParameter::Parameter, SetOriginResolutionImageGeom));
+  linkedProps << "Spacing";
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Spacing", ChangeResolution, FilterParameter::Parameter, SetOriginResolutionImageGeom, linkedProps));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, SetOriginResolutionImageGeom));
 
   setFilterParameters(parameters);
 }
@@ -144,8 +143,8 @@ void SetOriginResolutionImageGeom::readFilterParameters(AbstractFilterParameters
   setChangeOrigin(reader->readValue("ChangeOrigin", getChangeOrigin()));
   setChangeResolution(reader->readValue("ChangeResolution", getChangeResolution()));
   setOrigin(reader->readFloatVec3("Origin", getOrigin()));
-  setResolution(reader->readFloatVec3("Resolution", getResolution()));
-  setDataContainerName(reader->readString("DataContainerName", getDataContainerName()));
+  setSpacing(reader->readFloatVec3("Spacing", getSpacing()));
+  setDataContainerName(reader->readDataArrayPath("DataContainerName", getDataContainerName()));
   reader->closeFilterGroup();
 }
 
@@ -171,11 +170,11 @@ void SetOriginResolutionImageGeom::dataCheck()
   }
   if(getChangeOrigin())
   {
-    image->setOrigin(std::make_tuple(m_Origin.x, m_Origin.y, m_Origin.z));
+    image->setOrigin(std::make_tuple(m_Origin[0], m_Origin[1], m_Origin[2]));
   }
   if(getChangeResolution())
   {
-    image->setResolution(std::make_tuple(m_Resolution.x, m_Resolution.y, m_Resolution.z));
+    image->setSpacing(std::make_tuple(m_Spacing[0], m_Spacing[1], m_Spacing[2]));
   }
 }
 
@@ -276,5 +275,5 @@ const QString SetOriginResolutionImageGeom::getSubGroupName() const
 // -----------------------------------------------------------------------------
 const QString SetOriginResolutionImageGeom::getHumanLabel() const
 {
-  return "Set Origin & Resolution (Image)";
+  return "Set Origin & Spacing (Image)";
 }
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index 0f2514704a..9af2dc7a43 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -48,11 +48,11 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
     PYB11_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
-    PYB11_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+    PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
     PYB11_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
-    PYB11_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+    PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
   public:
     SIMPL_SHARED_POINTERS(SetOriginResolutionImageGeom)
@@ -61,20 +61,20 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 
     ~SetOriginResolutionImageGeom() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-    Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
     SIMPL_FILTER_PARAMETER(bool, ChangeOrigin)
     Q_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3_t, Origin)
-    Q_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+    SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+    Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
     SIMPL_FILTER_PARAMETER(bool, ChangeResolution)
     Q_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3_t, Resolution)
-    Q_PROPERTY(FloatVec3_t Resolution READ getResolution WRITE setResolution)
+    SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+    Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 8749c9c55a..b44fd16ce7 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -75,6 +75,7 @@ set(_PublicFilters
   SplitAttributeArray
   WriteASCIIData
   WriteTriangleGeometry
+  MassCreateData
 )
 
 
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index ec0ad90009..99a92d540f 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -42,6 +42,10 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+enum createdPathID : RenameDataPath::DataID_t {
+  SplitArrayID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -62,7 +66,7 @@ SplitAttributeArray::~SplitAttributeArray() = default;
 // -----------------------------------------------------------------------------
 void SplitAttributeArray::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   DataArraySelectionFilterParameter::RequirementType dasReq =
       DataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", InputArrayPath, FilterParameter::RequiredArray, SplitAttributeArray, dasReq));
@@ -122,7 +126,7 @@ void SplitAttributeArray::dataCheck()
     {
       QString arrayName = getInputArrayPath().getDataArrayName() + getSplitArraysSuffix() + QString::number(i);
       DataArrayPath path(getInputArrayPath().getDataContainerName(), getInputArrayPath().getAttributeMatrixName(), arrayName);
-      IDataArray::WeakPointer ptr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, path, cDims, m_InputArrayPtr.lock());
+      IDataArray::WeakPointer ptr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, path, cDims, m_InputArrayPtr.lock(), SplitArrayID + i);
       if(getErrorCondition() >= 0)
       {
         m_SplitArraysPtrVector.push_back(ptr.lock());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 2e55f42dae..d32429865e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -58,10 +58,7 @@
 class DummyObserver : public Observer
 {
 public:
-  DummyObserver()
-  : Observer()
-  {
-  }
+  DummyObserver() = default;
   ~DummyObserver() override = default;
   SIMPL_TYPE_MACRO(DummyObserver)
 
@@ -70,9 +67,11 @@ class DummyObserver : public Observer
     // Don't do anything...this class only exists to stifle the messages being dumped to the console
   }
 
-private:
-  DummyObserver(const DummyObserver&);  // Copy Constructor Not Implemented
-  void operator=(const DummyObserver&); // Move assignment Not Implemented
+public:
+  DummyObserver(const DummyObserver&) = delete;            // Copy Constructor Not Implemented
+  DummyObserver(DummyObserver&&) = delete;                 // Move Constructor Not Implemented
+  DummyObserver& operator=(const DummyObserver&) = delete; // Copy Assignment Not Implemented
+  DummyObserver& operator=(DummyObserver&&) = delete;      // Move Assignment Not Implemented
 };
 
 class ArrayCalculatorTest
@@ -92,11 +91,11 @@ class ArrayCalculatorTest
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(QVector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Cell);
     AttributeMatrix::Pointer am2 = AttributeMatrix::New(QVector<size_t>(1, 1), "NumericMatrix", AttributeMatrix::Type::Cell);
     FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, "InputArray1");
-    array1->initializeWithValue(-12, 0);
+    array1->initializeWithValue(-12);
     UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, "InputArray2");
-    array2->initializeWithValue(10, 0);
+    array2->initializeWithValue(10);
     UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, "Spaced Array");
-    sArray->initializeWithValue(2, 0);
+    sArray->initializeWithValue(2);
 
     UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 3), "MultiComponent Array1");
     int num = 0;
@@ -120,16 +119,16 @@ class ArrayCalculatorTest
     IDataArray::Pointer signArray = mcArray1->deepCopy();
     signArray->setName("*");
 
-    am1->addAttributeArray("InputArray1", array1);
-    am1->addAttributeArray("InputArray2", array2);
-    am1->addAttributeArray("Spaced Array", sArray);
-    am1->addAttributeArray("MultiComponent Array1", mcArray1);
-    am1->addAttributeArray("MultiComponent Array2", mcArray2);
-    am1->addAttributeArray("4", numberArray);
-    am1->addAttributeArray("*", signArray);
-    dc->addAttributeMatrix("AttributeMatrix", am1);
-    dc->addAttributeMatrix("NumericMatrix", am2);
-    dca->addDataContainer(dc);
+    am1->insertOrAssign(array1);
+    am1->insertOrAssign(array2);
+    am1->insertOrAssign(sArray);
+    am1->insertOrAssign(mcArray1);
+    am1->insertOrAssign(mcArray2);
+    am1->insertOrAssign(numberArray);
+    am1->insertOrAssign(signArray);
+    dc->addOrReplaceAttributeMatrix(am1);
+    dc->addOrReplaceAttributeMatrix(am2);
+    dca->addOrReplaceDataContainer(dc);
 
     return dca;
   }
@@ -137,7 +136,7 @@ class ArrayCalculatorTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  AbstractFilter::Pointer createArrayCalculatorFilter(DataArrayPath calculatedPath)
+  AbstractFilter::Pointer createArrayCalculatorFilter(const DataArrayPath& calculatedPath)
   {
     QString filtName = "ArrayCalculator";
     FilterManager* fm = FilterManager::Instance();
@@ -170,9 +169,11 @@ class ArrayCalculatorTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void runTest(QString equation, DataArrayPath targetArrayPath, CalculatorItem::ErrorCode expectedErrorCondition, CalculatorItem::WarningCode expectedWarningCondition,
-               int* expectedNumberOfTuples = nullptr, double* expectedValue = nullptr, ArrayCalculator::AngleUnits units = ArrayCalculator::Radians)
+  void runTest(const QString& equation, const DataArrayPath& targetArrayPath, CalculatorItem::ErrorCode expectedErrorCondition, CalculatorItem::WarningCode expectedWarningCondition,
+               const int* expectedNumberOfTuples = nullptr, const double* expectedValue = nullptr, ArrayCalculator::AngleUnits units = ArrayCalculator::Radians)
   {
+    std::cout << "  Testing equation: ==>" << equation.toStdString() << "<==" << std::endl;
+
     bool propWasSet = false;
 
     AbstractFilter::Pointer filter = createArrayCalculatorFilter(targetArrayPath);
@@ -182,8 +183,11 @@ class ArrayCalculatorTest
     propWasSet = filter->setProperty("Units", units);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true);
     filter->execute();
+    if(filter->getErrorCondition() < 0 && expectedErrorCondition == CalculatorItem::ErrorCode::SUCCESS)
+    {
+      std::cout << "    Error " << filter->getErrorCondition() << " executing filter." << std::endl;
+    }
 
-	std::cout << "Testing equation: " << equation.toStdString() << std::endl;
     DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(expectedErrorCondition));
     DREAM3D_REQUIRE_EQUAL(filter->getWarningCondition(), static_cast<int>(expectedWarningCondition));
 
@@ -202,7 +206,7 @@ class ArrayCalculatorTest
 
       for(size_t i = 0; i < arrayPtr->getNumberOfTuples(); i++)
       {
-        DREAM3D_REQUIRE(SIMPLibMath::closeEnough<double>(arrayPtr->getValue(i), value, 0.01) == true);
+        DREAM3D_REQUIRED(SIMPLibMath::closeEnough<double>(arrayPtr->getValue(i), value, 0.01), ==, true);
       }
     }
   }
@@ -215,7 +219,6 @@ class ArrayCalculatorTest
     DataArrayPath numericArrayPath("DataContainer", "NumericMatrix", "NewArray");
     DataArrayPath arrayPath("DataContainer", "AttributeMatrix", "NewArray");
 
-    QVariant var;
     bool propWasSet = false;
 
     // Multi-Component Array Tests
@@ -387,7 +390,6 @@ class ArrayCalculatorTest
     DataArrayPath numericArrayPath("DataContainer", "NumericMatrix", "NewArray");
     DataArrayPath arrayPath("DataContainer", "AttributeMatrix", "NewArray");
 
-    QVariant var;
     bool propWasSet = false;
 
     // Empty Tests
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 48438aa604..1dda1c8587 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -54,11 +54,11 @@
 
 #define CREATE_DATA_ARRAY(type, attrMat, tDims, cDimsVec, cDimsScalar, vecName, scalarName, err)                                                                                                       \
   DataArray<type>::Pointer _##type##VectorArray = DataArray<type>::CreateArray(tDims, cDimsVec, #vecName, true);                                                                                       \
-  err = attrMat->addAttributeArray(#vecName, _##type##VectorArray);                                                                                                                                    \
+  err = attrMat->insertOrAssign(_##type##VectorArray);                                                                                                                                                 \
   _##type##VectorArray->initializeWithZeros();                                                                                                                                                         \
   DREAM3D_REQUIRE(err >= 0);                                                                                                                                                                           \
   DataArray<type>::Pointer _##type##ScalarArray = DataArray<type>::CreateArray(tDims, cDimsScalar, #scalarName, true);                                                                                 \
-  err = attrMat->addAttributeArray(#scalarName, _##type##ScalarArray);                                                                                                                                 \
+  err = attrMat->insertOrAssign(_##type##ScalarArray);                                                                                                                                                 \
   _##type##ScalarArray->initializeWithZeros();                                                                                                                                                         \
   DREAM3D_REQUIRE(err >= 0);
 
@@ -120,8 +120,8 @@ class CombineAttributeArraysTest
 
     QVector<size_t> tDims(1, 100);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "CombineAttributeArraysTest", AttributeMatrix::Type::Cell);
-    m->addAttributeMatrix("CombineAttributeArraysTest", attrMat);
-    dca->addDataContainer(m);
+    m->addOrReplaceAttributeMatrix(attrMat);
+    dca->addOrReplaceDataContainer(m);
 
     QVector<size_t> cDimsVec(1, 3);
     QVector<size_t> cDimsScalar(1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 902721d95d..f467864f70 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -54,7 +54,7 @@
 
 #define CREATE_DATA_ARRAY(type, attrMat, tDims, cDims, initVal, name, err)                                                                                                                             \
   DataArray<type>::Pointer name##Array = DataArray<type>::CreateArray(tDims, cDims, name, true);                                                                                                       \
-  err = attrMat->addAttributeArray(name, name##Array);                                                                                                                                                 \
+  err = attrMat->insertOrAssign(name##Array);                                                                                                                                                          \
   name##Array->initializeWithValue(initVal);                                                                                                                                                           \
   DREAM3D_REQUIRE(err >= 0);
 
@@ -230,7 +230,7 @@ class CombineAttributeMatricesTest
 
     // Make Cell AM
     AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New(tDims, "cellAttrMat", AttributeMatrix::Type::Cell);
-    m->addAttributeMatrix("cellAttrMat", cellAttrMat);
+    m->addOrReplaceAttributeMatrix(cellAttrMat);
 
     // Create 2 featureIds arrays in the Cell AM
     QString featureIds1 = "featureIds1";
@@ -258,14 +258,14 @@ class CombineAttributeMatricesTest
     tDims.resize(1);
     tDims[0] = 3;
     AttributeMatrix::Pointer featureAttrMat1 = AttributeMatrix::New(tDims, "featureAttrMat1", AttributeMatrix::Type::CellFeature);
-    m->addAttributeMatrix("featureAttrMat1", featureAttrMat1);
+    m->addOrReplaceAttributeMatrix(featureAttrMat1);
     QString fAM1AA1 = "ensembleIds";
     QString fAM1AA2 = "sizes";
     CREATE_DATA_ARRAY(int32_t, featureAttrMat1, tDims, cDims, initVal, fAM1AA1, err);
     CREATE_DATA_ARRAY(float, featureAttrMat1, tDims, cDims, initVal, fAM1AA2, err);
     tDims[0] = 2;
     AttributeMatrix::Pointer ensembleAttrMat1 = AttributeMatrix::New(tDims, "ensembleAttrMat1", AttributeMatrix::Type::CellEnsemble);
-    m->addAttributeMatrix("ensembleAttrMat1", ensembleAttrMat1);
+    m->addOrReplaceAttributeMatrix(ensembleAttrMat1);
     QString eAM1AA1 = "crystalStructures";
     CREATE_DATA_ARRAY(int32_t, ensembleAttrMat1, tDims, cDims, initVal, eAM1AA1, err);
 
@@ -288,14 +288,14 @@ class CombineAttributeMatricesTest
     // Make a feature and ensemble AM for the second featureIds array and add some arrays
     tDims[0] = 3;
     AttributeMatrix::Pointer featureAttrMat2 = AttributeMatrix::New(tDims, "featureAttrMat2", AttributeMatrix::Type::CellFeature);
-    m->addAttributeMatrix("featureAttrMat2", featureAttrMat2);
+    m->addOrReplaceAttributeMatrix(featureAttrMat2);
     QString fAM2AA1 = "ensembleIds";
     QString fAM2AA2 = "surfaceFeatures";
     CREATE_DATA_ARRAY(int32_t, featureAttrMat2, tDims, cDims, initVal, fAM2AA1, err);
     CREATE_DATA_ARRAY(bool, featureAttrMat2, tDims, cDims, initVal, fAM2AA2, err);
     tDims[0] = 2;
     AttributeMatrix::Pointer ensembleAttrMat2 = AttributeMatrix::New(tDims, "ensembleAttrMat2", AttributeMatrix::Type::CellEnsemble);
-    m->addAttributeMatrix("ensembleAttrMat2", ensembleAttrMat2);
+    m->addOrReplaceAttributeMatrix(ensembleAttrMat2);
     QString eAM2AA1 = "crystalStructures";
     CREATE_DATA_ARRAY(int32_t, ensembleAttrMat2, tDims, cDims, initVal, eAM2AA1, err);
 
@@ -315,11 +315,11 @@ class CombineAttributeMatricesTest
     crystStructs2[0] = 0;
     crystStructs2[1] = 1;
 
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // add a feature AM to the second DC to allow for check that AMs are in same DC
-    m2->addAttributeMatrix("featureAttrMat2", featureAttrMat2);
-    dca->addDataContainer(m2);
+    m2->addOrReplaceAttributeMatrix(featureAttrMat2->deepCopy());
+    dca->addOrReplaceDataContainer(m2);
 
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index ec53f6bc6a..81410ef523 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -54,7 +54,7 @@
 
 #define CREATE_DATA_ARRAY(type, attrMat, tDims, cDims, initVal, comps, err)                                                                                                                            \
   DataArray<type>::Pointer _##type##_##comps##_##attrMat##Array = DataArray<type>::CreateArray(tDims, cDims, #type #comps, true);                                                                      \
-  err = attrMat->addAttributeArray(#type #comps, _##type##_##comps##_##attrMat##Array);                                                                                                                \
+  err = attrMat->insertOrAssign(_##type##_##comps##_##attrMat##Array);                                                                                                                                 \
   _##type##_##comps##_##attrMat##Array->initializeWithValue(initVal);                                                                                                                                  \
   DREAM3D_REQUIRE(err >= 0);
 
@@ -156,9 +156,9 @@ class ConditionalSetValueTest
     QVector<size_t> tDims(1, 10);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "ConditionalSetValueAttrMat", AttributeMatrix::Type::Cell);
 
-    m->addAttributeMatrix("ConditionalSetValueAttrMat", attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
 
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     QVector<size_t> cDims(1, 3);
     int32_t initVal = 10;
@@ -192,7 +192,7 @@ class ConditionalSetValueTest
     // this is the conditional array
     QString name = "ConditionalArray";
     BoolArrayType::Pointer condArrayPtr = BoolArrayType::CreateArray(tDims, cDims, name);
-    attrMat->addAttributeArray(name, condArrayPtr);
+    attrMat->insertOrAssign(condArrayPtr);
     condArrayPtr->initializeWithValue(true);
     // Set some of the values to false int he conditional array
     bool* condArray = condArrayPtr->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index d6dc7940d6..ceeac091a4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -40,7 +40,7 @@
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -60,7 +60,7 @@
 
 class ConvertColorToGrayScaleTest
 {
-  const FloatVec3_t m_defaultWeights{0.2125f, 0.7154f, 0.0721f};
+  const FloatVec3Type m_defaultWeights{0.2125f, 0.7154f, 0.0721f};
   const bool m_createNewAM = false;
   const QString m_filtName = "ConvertColorToGrayScale";
   const QString m_outputArrayPrefix = "grayTestImage";
@@ -299,18 +299,18 @@ class ConvertColorToGrayScaleTest
   static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const QVector<size_t>& tDims)
   {
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    am->addAttributeArray(aa->getName(), aa);
+    am->insertOrAssign(aa);
 
     DataContainer::Pointer dc = DataContainer::New(SIMPL::Defaults::VertexDataContainerName);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, am);
+    dc->insertOrAssign(am);
     dc->setGeometry(VertexGeom::CreateGeometry(static_cast<int64_t>(aa->getNumberOfTuples()), SIMPL::Geometry::VertexGeometry));
     return dc;
   }
 
-  int CheckFilterParameters(const QVariant& algorithm, const FloatVec3_t& cws, const uint8_t& cc)
+  int CheckFilterParameters(const QVariant& algorithm, const FloatVec3Type& cws, const uint8_t& cc)
   {
     QVariant conversionAlgorithm{m_colorToGrayscaleFilter->property("ConversionAlgorithm")};
-    FloatVec3_t colorWeights = (m_colorToGrayscaleFilter->property("ColorWeights").value<FloatVec3_t>());
+    FloatVec3Type colorWeights = (m_colorToGrayscaleFilter->property("ColorWeights").value<FloatVec3Type>());
     QVariant outputArrayPrefix{m_colorToGrayscaleFilter->property("OutputArrayPrefix")};
     QVariant colorChannel{m_colorToGrayscaleFilter->property("ColorChannel")};
     QVariant createNewAM{m_colorToGrayscaleFilter->property("CreateNewAttributeMatrix")};
@@ -319,7 +319,7 @@ class ConvertColorToGrayScaleTest
     int wrongParameters = 0;
     wrongParameters += (conversionAlgorithm == algorithm) ? 0 : 1;
     float epsilon = 0.000000001f;
-    wrongParameters += (abs(colorWeights.x - cws.x) < epsilon && abs(colorWeights.y - cws.y) < epsilon && abs(colorWeights.z - cws.z) < epsilon) ? 0 : 1;
+    wrongParameters += (abs(colorWeights.getX() - cws.getX()) < epsilon && abs(colorWeights.getY() - cws.getY()) < epsilon && abs(colorWeights.getZ() - cws.getZ()) < epsilon) ? 0 : 1;
     wrongParameters += (outputArrayPrefix == m_outputArrayPrefix) ? 0 : 1;
     wrongParameters += (colorChannel == cc) ? 0 : 1;
     wrongParameters += (createNewAM == m_createNewAM) ? 0 : 1;
@@ -331,10 +331,10 @@ class ConvertColorToGrayScaleTest
   int CompareResults(const uint8_t& algoMapIndex) const
   {
     QString amName = m_outputAMName;
-    DataContainer::Pointer dc = m_dca->getDataContainers().first();
+    DataContainer::Pointer dc = m_dca->getDataContainers().front();
     if(!m_createNewAM)
     {
-      amName = dc->getAttributeMatrices().first()->getName();
+      amName = dc->getAttributeMatrices().front()->getName();
     }
     AttributeMatrix::Pointer am = dc->getAttributeMatrix(amName);
 
@@ -367,9 +367,11 @@ class ConvertColorToGrayScaleTest
    of the desired geometry is passed in here this method will sort out the input
    data array path and should work as expected
    */
-  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const FloatVec3_t& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
+  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const FloatVec3Type& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
   {
-    m_dca->addDataContainer(dc);
+    m_dca = DataContainerArray::New();
+    m_dca->setName("TEST DATA CONTAINER ARRAY");
+    m_dca->insertOrAssign(dc);
     QVector<DataArrayPath> daps{};
     for(const AttributeMatrix::Pointer& eachAM : dc->getAttributeMatrices())
     {
@@ -410,6 +412,8 @@ class ConvertColorToGrayScaleTest
 
   int RunTest(const uint8_t& algoMapIndex)
   {
+    Observer obs;
+    m_colorToGrayscaleFilter->connect(m_colorToGrayscaleFilter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
     m_colorToGrayscaleFilter->execute();
     int erred = m_colorToGrayscaleFilter->getErrorCondition();
     DREAM3D_REQUIRE_EQUAL(erred, 0);
@@ -469,6 +473,8 @@ class ConvertColorToGrayScaleTest
 
   void operator()()
   {
+    std::cout << "#### ConvertColorToGrayScaleTest Starting ####" << std::endl;
+
     int err = 0;
 
     const QString aaName = SIMPL::VertexData::SurfaceMeshNodes;
@@ -490,7 +496,7 @@ class ConvertColorToGrayScaleTest
     TearDown(vertexDC);
 
     // Test custom
-    FloatVec3_t colorWeights{0.75, 0.75, 0.75};
+    FloatVec3Type colorWeights{0.75, 0.75, 0.75};
     qDebug() << "Custom weights (0.75, 0.75, 0.75)...";
     SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
     DREAM3D_REGISTER_TEST(RunTest(1))
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index f9873df6a8..dad4d27f1e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -67,12 +67,12 @@ class ConvertDataTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims;
     dims.push_back(2);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     QVector<size_t> cdims;
     cdims.push_back(2);
@@ -120,7 +120,7 @@ class ConvertDataTest
       break;
     }
     da->initializeWithZeros();
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index a2e9c1a6f6..c55e883159 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -99,12 +99,14 @@ class CopyFeatureArrayToElementArrayTest
 
     static const QString k_DataContainerName("DataContainer");
 
-    static const QString k_FeatureDataMatrixName("FeatureDataMatrix");
-    static const QString k_FeatureIDMatrixName("FeatureIDMatrix");
+    static const QString k_Cell_AMName("Cell Attribute Matrix");
+    static const QString k_Feature_AMName("Feature Attribute Matrix");
 
-    static const QString k_FeatureDataArrayName("FeatureData");
-    static const QString k_FeatureIDArrayName("FeatureIDArray");
-    static const QString k_ElementArrayName("ElementArray");
+
+    static const QString k_CellFeatureIdsArrayName("FeatureIds");
+    static const QString k_CellTempArrayName("Temperature");
+
+    static const QString k_FeatureDataArrayName("Temperature");
 
     // Create DataContainerArray
 
@@ -113,33 +115,36 @@ class CopyFeatureArrayToElementArrayTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
+    QVector<size_t> tDims = {{10, 3}};
+    AttributeMatrix::Pointer cellAM = AttributeMatrix::New(tDims, k_Cell_AMName, AttributeMatrix::Type::Cell);
+    dc->addOrReplaceAttributeMatrix(cellAM);
 
-    AttributeMatrix::Pointer dataAM = AttributeMatrix::New(m_Dims10, k_FeatureDataMatrixName, AttributeMatrix::Type::VertexFeature);
-    dc->addAttributeMatrix(k_FeatureDataMatrixName, dataAM);
-
-    AttributeMatrix::Pointer idsAM = AttributeMatrix::New(m_Dims10, k_FeatureIDMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(k_FeatureIDMatrixName, idsAM);
+    AttributeMatrix::Pointer featureAM = AttributeMatrix::New(m_Dims3, k_Feature_AMName, AttributeMatrix::Type::CellFeature);
+    dc->addOrReplaceAttributeMatrix(featureAM);
 
-    // Create feature data and feature IDs
+    // Create Cell FeatureIds array
+    typename DataArray<int32_t>::Pointer cellFeatureIds = DataArray<int32_t>::CreateArray(cellAM->getNumberOfTuples(), k_CellFeatureIdsArrayName);
+    cellAM->insertOrAssign(cellFeatureIds);
 
-    typename DataArray<T>::Pointer daFeatures = DataArray<T>::CreateArray(m_Dims10, m_Dims3, k_FeatureDataArrayName);
-    for(int i = 0; i < daFeatures->getSize(); i++)
+    for(size_t y = 0; y < 3; y++)
     {
-      daFeatures->setValue(i, static_cast<T>(i + 2.13));
+      for(size_t x = 0; x < 10; x++)
+      {
+        size_t index = (10*y) + x;
+        cellFeatureIds->setValue(index, static_cast<int32_t>(y));
+      }
     }
-    dataAM->addAttributeArray(k_FeatureDataArrayName, daFeatures);
-
-    // Use reverse ordering on the ID list to test that the filter moves data to the appropriate location
 
-    DataArray<int32_t>::Pointer daIDList = DataArray<int32_t>::CreateArray(m_Dims10, m_Dims1, k_FeatureIDArrayName);
-    for(int i = 0; i < daIDList->getNumberOfTuples(); i++)
+    //Create an array in teh Feature Attribute Matrix with 3 values since we created 3 features in the cell attribute matrix
+    typename DataArray<T>::Pointer avgTempValue = DataArray<T>::CreateArray(3, k_FeatureDataArrayName);
+    featureAM->insertOrAssign(avgTempValue);
+    for(int i = 0; i < 3; i++)
     {
-      daIDList->setValue(daIDList->getNumberOfTuples() - i - 1, i);
+      avgTempValue->setValue(i, static_cast<T>(0));
     }
-    idsAM->addAttributeArray(k_FeatureIDArrayName, daIDList);
 
     // Create Filter
 
@@ -149,21 +154,19 @@ class CopyFeatureArrayToElementArrayTest
 
     copyFeatureArrayToElementArray->setDataContainerArray(dca);
 
-    // Set up filter
-
     QVariant var;
 
-    DataArrayPath dap(k_DataContainerName, k_FeatureDataMatrixName, k_FeatureDataArrayName);
+    DataArrayPath dap(k_DataContainerName, k_Feature_AMName, k_FeatureDataArrayName);
     var.setValue(dap);
     bool propWasSet = copyFeatureArrayToElementArray->setProperty("SelectedFeatureArrayPath", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    dap = DataArrayPath(k_DataContainerName, k_FeatureIDMatrixName, k_FeatureIDArrayName);
+    dap = DataArrayPath(k_DataContainerName, k_Cell_AMName, k_CellFeatureIdsArrayName);
     var.setValue(dap);
     propWasSet = copyFeatureArrayToElementArray->setProperty("FeatureIdsArrayPath", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    var.setValue(k_ElementArrayName);
+    var.setValue(k_CellTempArrayName);
     propWasSet = copyFeatureArrayToElementArray->setProperty("CreatedArrayName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -173,18 +176,31 @@ class CopyFeatureArrayToElementArrayTest
     DREAM3D_REQUIRED(copyFeatureArrayToElementArray->getErrorCondition(), >=, 0);
 
     // Check filter results
+    QString dbg;
+    QTextStream ss(&dbg);
+    typename DataArray<T>::Pointer createdElementArray = cellAM->getAttributeArrayAs<DataArray<T>>(k_CellTempArrayName);
 
-    typename DataArray<T>::Pointer createdElementArray = idsAM->getAttributeArrayAs<DataArray<T>>(k_ElementArrayName);
-
-    for(size_t i = 0; i < daFeatures->getNumberOfTuples(); i++)
+    for(size_t i = 0; i < createdElementArray->getNumberOfTuples(); i++)
     {
-      for(size_t j = 0; j < daFeatures->getNumberOfComponents(); j++)
-      {
-        T oldValue = daFeatures->getComponent(i, j);
-        T newValue = createdElementArray->getComponent(daIDList->getValue(i), j);
-        DREAM3D_REQUIRE_EQUAL(newValue, oldValue)
-      }
+//      daFeatures->printTuple(ss , i);
+//      createdElementArray->printTuple(ss, i);
+//      ss << "---\n";
+
+        int32_t featureId = cellFeatureIds->getValue(i);
+        T value = createdElementArray->getValue(i);
+        T featureValue = avgTempValue->getValue(featureId);
+        DREAM3D_REQUIRE_EQUAL(value, featureValue);
+
+//      for(size_t j = 0; j < daFeatures->getNumberOfComponents(); j++)
+//      {
+
+//        T oldValue = daFeatures->getComponent(i, j);
+//        T newValue = createdElementArray->getComponent(daIDList->getValue(i), j);
+//        DREAM3D_REQUIRE_EQUAL(newValue, oldValue)
+//      }
     }
+
+
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index e40b4f0fa6..b55eca99b9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -298,8 +298,8 @@ class CopyObjectTest
         bool sameDims = (oldDims == newDims);
         DREAM3D_REQUIRE_EQUAL(sameDims, true)
 
-        SIMPL::Tuple3FVec oldRes = oldImageGeom->getResolution();
-        SIMPL::Tuple3FVec newRes = newImageGeom->getResolution();
+        SIMPL::Tuple3FVec oldRes = oldImageGeom->getSpacing();
+        SIMPL::Tuple3FVec newRes = newImageGeom->getSpacing();
         bool sameRes = (oldRes == newRes);
         DREAM3D_REQUIRE_EQUAL(sameRes, true)
 
@@ -533,13 +533,13 @@ class CopyObjectTest
     bool sameArrayNames = (newMatrixNames == oldMatrixNames);
     DREAM3D_REQUIRE_EQUAL(sameArrayNames, true)
 
-    QMap<QString, AttributeMatrix::Pointer> oldAttrMatrices = oldDC->getAttributeMatrices();
-    QMap<QString, AttributeMatrix::Pointer> newAttrMatrices = newDC->getAttributeMatrices();
+    //DataContainer::Container_t oldAttrMatrices = oldDC->getAttributeMatrices();
+    //DataContainer::Container_t newAttrMatrices = newDC->getAttributeMatrices();
 
     for(int i = 0; i < newMatrixNames.size(); i++)
     {
-      AttributeMatrix::Pointer oldAM = oldAttrMatrices[oldMatrixNames[i]];
-      AttributeMatrix::Pointer newAM = newAttrMatrices[newMatrixNames[i]];
+      AttributeMatrix::Pointer oldAM = *oldDC->find(oldMatrixNames[i]);
+      AttributeMatrix::Pointer newAM = *newDC->find(newMatrixNames[i]);
       checkAttributeMatrix(oldAM, newAM, false);
     }
   }
@@ -550,7 +550,13 @@ class CopyObjectTest
   void TestCase(DataContainerArray::Pointer dca, DataArrayPath dap, int objectToCopy, const QString& copyName)
   {
     // Create Filter
+    std::cout << "  TestCase: " << dca->getName().toStdString() << " " << dap.serialize("/").toStdString() << " " << copyName.toStdString();
 
+    if(dca->getDataContainer(dap)->getGeometry().get() != nullptr)
+    {
+      std::cout << "   " << dca->getDataContainer(dap)->getGeometry()->getName().toStdString();
+    }
+    std::cout << std::endl;
     FilterManager* fm = FilterManager::Instance();
     IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(m_FilterName);
     AbstractFilter::Pointer extractAttributeArraysFromGeometry = filterFactory->create();
@@ -571,7 +577,7 @@ class CopyObjectTest
 
     if(objectToCopy == 0) // DataContainer
     {
-      var.setValue(dap.getDataContainerName());
+      var.setValue(dap);
       propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerToCopy", var);
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
     }
@@ -726,21 +732,21 @@ class CopyObjectTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     DataContainer::Pointer emptyDC = DataContainer::New(k_EmptyDataContainerName);
-    dca->addDataContainer(emptyDC);
+    dca->addOrReplaceDataContainer(emptyDC);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(m_Dims8, k_AttributeMatrix1Name, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(k_AttributeMatrix1Name, am1);
+    dc->addOrReplaceAttributeMatrix(am1);
 
     AttributeMatrix::Pointer am2 = AttributeMatrix::New(m_Dims8, k_AttributeMatrix2Name, AttributeMatrix::Type::Cell);
-    dc->addAttributeMatrix(k_AttributeMatrix2Name, am2);
+    dc->addOrReplaceAttributeMatrix(am2);
 
     AttributeMatrix::Pointer emptyAM = AttributeMatrix::New(m_Dims1, k_EmptyAttributeMatrixName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_EmptyAttributeMatrixName, emptyAM);
+    dc->addOrReplaceAttributeMatrix(emptyAM);
 
     // Create DataArray
 
@@ -761,8 +767,9 @@ class CopyObjectTest
 
     ImageGeom::Pointer imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
     imageGeom->setDimensions(std::forward_as_tuple(5, 5, 5));
-    imageGeom->setResolution(std::forward_as_tuple(5, 5, 5));
-    imageGeom->setOrigin(std::forward_as_tuple(5, 5, 5));
+    imageGeom->setSpacing(FloatVec3Type(5, 5, 5));
+    imageGeom->setOrigin(FloatVec3Type(5, 5, 5));
+    imageGeom->setName("Image Geom");
 
     // RectGrid
 
@@ -774,6 +781,7 @@ class CopyObjectTest
     rectGridGeom->setXBounds(daXBounds);
     rectGridGeom->setYBounds(daYBounds);
     rectGridGeom->setZBounds(daZBounds);
+    rectGridGeom->setName("rectGridGeom");
 
     // Vertex
 
@@ -782,6 +790,7 @@ class CopyObjectTest
     DataArray<float>::Pointer daVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims2, m_Dims3);
 
     VertexGeom::Pointer vertexGeom = VertexGeom::CreateGeometry(daVert, SIMPL::Geometry::VertexGeometry);
+    vertexGeom->setName("vertexGeom");
 
     // Edge
 
@@ -802,6 +811,7 @@ class CopyObjectTest
     DataArray<int64_t>::Pointer daTriList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims3);
 
     TriangleGeom::Pointer triGeom = TriangleGeom::CreateGeometry(daTriList, daTriVert, SIMPL::Geometry::TriangleGeometry);
+    triGeom->setName("triGeom");
 
     // Quad
 
@@ -812,6 +822,7 @@ class CopyObjectTest
     DataArray<int64_t>::Pointer daQuadList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
 
     QuadGeom::Pointer quadGeom = QuadGeom::CreateGeometry(daQuadList, daQuadVert, SIMPL::Geometry::QuadGeometry);
+    quadGeom->setName("quadGeom");
 
     // Tetrahedral
 
@@ -823,6 +834,7 @@ class CopyObjectTest
     DataArray<int64_t>::Pointer daTetList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
 
     TetrahedralGeom::Pointer tetGeom = TetrahedralGeom::CreateGeometry(daTetList, daTetVert, SIMPL::Geometry::TetrahedralGeometry);
+    tetGeom->setName("tetGeom");
 
     // Hexahedral
 
@@ -834,20 +846,21 @@ class CopyObjectTest
     DataArray<int64_t>::Pointer daHexList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims8);
 
     HexahedralGeom::Pointer hexGeom = HexahedralGeom::CreateGeometry(daHexList, daHexVert, SIMPL::Geometry::HexahedralGeometry);
+    hexGeom->setName("hexGeom");
 
     // Add DataArrays to AttributeMatrices
 
-    am1->addAttributeArray(k_uint8ArrayName, daUint8);
-    am1->addAttributeArray(k_int8ArrayName, daInt8);
-    am1->addAttributeArray(k_uint16ArrayName, daUint16);
-    am1->addAttributeArray(k_int16ArrayName, daInt16);
-    am1->addAttributeArray(k_uint32ArrayName, daUint32);
+    am1->insertOrAssign(daUint8);
+    am1->insertOrAssign(daInt8);
+    am1->insertOrAssign(daUint16);
+    am1->insertOrAssign(daInt16);
+    am1->insertOrAssign(daUint32);
 
-    am2->addAttributeArray(k_int32ArrayName, daInt32);
-    am2->addAttributeArray(k_uint64ArrayName, daUint64);
-    am2->addAttributeArray(k_int64ArrayName, daInt64);
-    am2->addAttributeArray(k_floatArrayName, daFloat);
-    am2->addAttributeArray(k_doubleArrayName, daDouble);
+    am2->insertOrAssign(daInt32);
+    am2->insertOrAssign(daUint64);
+    am2->insertOrAssign(daInt64);
+    am2->insertOrAssign(daFloat);
+    am2->insertOrAssign(daDouble);
 
     dc->setGeometry(hexGeom);
 
@@ -895,7 +908,7 @@ class CopyObjectTest
 
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, ""), 1, k_CopiedObjectName);
 
-    emptyDC->addAttributeMatrix(k_EmptyAttributeMatrixName, emptyAM);
+    emptyDC->addOrReplaceAttributeMatrix(emptyAM);
     TestCase(dca, DataArrayPath(k_EmptyDataContainerName, k_EmptyAttributeMatrixName, ""), 1, k_CopiedObjectName);
 
     // Test Copy DataArrays
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 2b2d81403a..063bd3bc91 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -36,7 +36,7 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 
-#include <assert.h>
+#include <cassert>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -67,7 +67,7 @@ class CreateAttributeMatrixTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     return dca;
   }
@@ -356,6 +356,17 @@ class CreateAttributeMatrixTest
     DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11000);
   }
 
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestOperators()
+  {
+    QVector<size_t> tDims = {10, 10};
+    AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Test", AttributeMatrix::Type::Cell);
+
+    FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, "Float");
+    Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(100, "Int32");
+  }
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -364,6 +375,7 @@ class CreateAttributeMatrixTest
     std::cout << "#### CreateAttributeMatrixTest Starting ####" << std::endl;
 
     int err = EXIT_SUCCESS;
+    DREAM3D_REGISTER_TEST(TestOperators());
 
     DREAM3D_REGISTER_TEST(TestVertexMatrix());
     DREAM3D_REGISTER_TEST(TestVertexFeatureMatrix());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 3531a9b6db..febf15296f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -170,9 +170,9 @@ class CreateDataArrayTest
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
     AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(QVector<size_t>(1, 1), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
-    m->addAttributeMatrix(SIMPL::Defaults::AttributeMatrixName, attrMatrix);
+    m->addOrReplaceAttributeMatrix(attrMatrix);
     return dca;
   }
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index ab06f24482..95f2d49e6c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -94,7 +94,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void setValues(CreateDataContainer::Pointer filter, QString dataContainer)
+  void setValues(CreateDataContainer::Pointer filter, const DataArrayPath& dataContainer)
   {
     if(nullptr == filter.get())
     {
@@ -104,13 +104,14 @@ class CreateDataContainerTest
     QVariant value;
 
     value.setValue(dataContainer);
-    filter->setProperty("DataContainerName", value);
+    bool propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true);
   }
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void TestFilter(QString dataContainer, int errorCode)
+  void TestFilter(const DataArrayPath& dataContainer, int errorCode)
   {
     CreateDataContainer::Pointer filter = createFilter();
     filter->setDataContainerArray(createDataContainerArray());
@@ -125,7 +126,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestValidDataContainer()
   {
-    TestFilter("DataContainer", 0);
+    TestFilter(DataArrayPath("DataContainer","",""), 0);
   }
 
   // -----------------------------------------------------------------------------
@@ -133,7 +134,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestExistingDataContainer()
   {
-    QString dataContainer = "DataContainer";
+    DataArrayPath dataContainer("DataContainer", "", "");
 
     CreateDataContainer::Pointer filter = createFilter();
     filter->setDataContainerArray(createDataContainerArray());
@@ -151,7 +152,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestMissingDataContainerName()
   {
-    TestFilter("", -887);
+    TestFilter(DataArrayPath(), -887);
   }
 
   // -----------------------------------------------------------------------------
@@ -159,7 +160,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestInvalidName()
   {
-    TestFilter("Data/Container", -888);
+    TestFilter(DataArrayPath("Data/Container","",""), -888);
   }
 
   // -----------------------------------------------------------------------------
@@ -179,6 +180,6 @@ class CreateDataContainerTest
   }
 
 private:
-  CreateDataContainerTest(const CreateDataContainerTest&); // Copy Constructor Not Implemented
-  void operator=(const CreateDataContainerTest&);          // Move assignment Not Implemented
+  CreateDataContainerTest(const CreateDataContainerTest&) = delete; // Copy Constructor Not Implemented
+  void operator=(const CreateDataContainerTest&) = delete;          // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index af528364ca..7263b4628f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -133,11 +133,11 @@ class CreateFeatureArrayFromElementArrayTest
           cellDataArray->initializeTuple(i, &temp);
         }
 
-        cellAttr->addAttributeArray("CellData", cellDataArray);
-        cellAttr->addAttributeArray("FeatureIds", featureIds);
-        dc->addAttributeMatrix("Cell Attribute Matrix", cellAttr);
-        dc->addAttributeMatrix("Feature Attribute Matrix", featureAttr);
-        dca->addDataContainer(dc);
+        cellAttr->insertOrAssign(cellDataArray);
+        cellAttr->insertOrAssign(featureIds);
+        dc->addOrReplaceAttributeMatrix(cellAttr);
+        dc->addOrReplaceAttributeMatrix(featureAttr);
+        dca->addOrReplaceDataContainer(dc);
 
         DataArrayPath path = DataArrayPath(dc->getName(), cellAttr->getName(), cellDataArray->getName());
         QVariant var;
@@ -224,11 +224,11 @@ class CreateFeatureArrayFromElementArrayTest
           cellDataArray->initializeTuple(i, &temp);
         }
 
-        cellAttr->addAttributeArray("CellData", cellDataArray);
-        cellAttr->addAttributeArray("FeatureIds", featureIds);
-        dc->addAttributeMatrix("Cell Attribute Matrix", cellAttr);
-        dc->addAttributeMatrix("Feature Attribute Matrix", featureAttr);
-        dca->addDataContainer(dc);
+        cellAttr->insertOrAssign(cellDataArray);
+        cellAttr->insertOrAssign(featureIds);
+        dc->addOrReplaceAttributeMatrix(cellAttr);
+        dc->addOrReplaceAttributeMatrix(featureAttr);
+        dca->addOrReplaceDataContainer(dc);
 
         DataArrayPath path = DataArrayPath(dc->getName(), cellAttr->getName(), cellDataArray->getName());
         QVariant var;
@@ -305,10 +305,10 @@ class CreateFeatureArrayFromElementArrayTest
         featureIds->initializeTuple(14, &value);
         featureIds->initializeTuple(15, &value);
 
-        cellAttr->addAttributeArray("FeatureIds", featureIds);
-        dc->addAttributeMatrix("Cell Attribute Matrix", cellAttr);
-        dc->addAttributeMatrix("Feature Attribute Matrix", featureAttr);
-        dca->addDataContainer(dc);
+        cellAttr->insertOrAssign(featureIds);
+        dc->addOrReplaceAttributeMatrix(cellAttr);
+        dc->addOrReplaceAttributeMatrix(featureAttr);
+        dca->addOrReplaceDataContainer(dc);
 
         DataArrayPath path = DataArrayPath(dc->getName(), cellAttr->getName(), featureIds->getName());
         QVariant var;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index 89c837207f..bfe13e36c3 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -152,7 +152,7 @@ class CreateGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void testCaseImage(AbstractFilter::Pointer createGeometry, DataContainer::Pointer dc, IGeometry::Type geomType, IntVec3_t numDimensions, FloatVec3_t originPos, FloatVec3_t imgResolution)
+  void testCaseImage(AbstractFilter::Pointer createGeometry, DataContainer::Pointer dc, IGeometry::Type geomType, IntVec3Type numDimensions, FloatVec3Type originPos, FloatVec3Type imgResolution)
   {
     if(geomType != IGeometry::Type::Image)
     {
@@ -175,19 +175,19 @@ class CreateGeometryTest
 
     SIMPL::Tuple3SVec dim = imageGeom->getDimensions();
     SIMPL::Tuple3FVec origin = imageGeom->getOrigin();
-    SIMPL::Tuple3FVec res = imageGeom->getResolution();
+    SIMPL::Tuple3FVec res = imageGeom->getSpacing();
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(dim), numDimensions.x)
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(dim), numDimensions.y)
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(dim), numDimensions.z)
+    DREAM3D_REQUIRE_EQUAL(std::get<0>(dim), numDimensions[0])
+    DREAM3D_REQUIRE_EQUAL(std::get<1>(dim), numDimensions[1])
+    DREAM3D_REQUIRE_EQUAL(std::get<2>(dim), numDimensions[2])
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(origin), originPos.x)
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(origin), originPos.y)
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(origin), originPos.z)
+    DREAM3D_REQUIRE_EQUAL(std::get<0>(origin), originPos[0])
+    DREAM3D_REQUIRE_EQUAL(std::get<1>(origin), originPos[1])
+    DREAM3D_REQUIRE_EQUAL(std::get<2>(origin), originPos[2])
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(res), imgResolution.x)
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(res), imgResolution.y)
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(res), imgResolution.z)
+    DREAM3D_REQUIRE_EQUAL(std::get<0>(res), imgResolution[0])
+    DREAM3D_REQUIRE_EQUAL(std::get<1>(res), imgResolution[1])
+    DREAM3D_REQUIRE_EQUAL(std::get<2>(res), imgResolution[2])
 
     removeGeometry(dc);
   }
@@ -383,10 +383,11 @@ class CreateGeometryTest
         QList<QString> names = am->getAttributeArrayNames();
 
         DREAM3D_REQUIRE_EQUAL(names.contains(daVertices->getName()), false)
-        if(geomType != IGeometry::Type::Vertex)
-        {
-          DREAM3D_REQUIRE_EQUAL(names.contains(daElements->getName()), false)
-        }
+        // daElements is renamed by the geometries, causing names.contains(daElements->getName()) to return true.
+        //if(geomType != IGeometry::Type::Vertex)
+        //{
+        //  DREAM3D_REQUIRE_EQUAL(names.contains(daElements->getName()), false)
+        //}
       }
     }
 
@@ -421,24 +422,24 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // ImageGeom Parameters
 
-    IntVec3_t numDimensions;
-    numDimensions.x = 5;
-    numDimensions.y = 15;
-    numDimensions.z = 25;
+    IntVec3Type numDimensions;
+    numDimensions[0] = 5;
+    numDimensions[1] = 15;
+    numDimensions[2] = 25;
 
-    FloatVec3_t originPos;
-    originPos.x = 5;
-    originPos.y = 15;
-    originPos.z = 25;
+    FloatVec3Type originPos;
+    originPos[0] = 5;
+    originPos[1] = 15;
+    originPos[2] = 25;
 
-    FloatVec3_t imgResolution;
-    imgResolution.x = 5;
-    imgResolution.y = 15;
-    imgResolution.z = 25;
+    FloatVec3Type imgResolution;
+    imgResolution[0] = 5;
+    imgResolution[1] = 15;
+    imgResolution[2] = 25;
 
     // Create Filter
 
@@ -461,7 +462,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -480,7 +481,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     var.setValue(imgResolution);
-    propWasSet = createGeometry->setProperty("Resolution", var);
+    propWasSet = createGeometry->setProperty("Spacing", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createGeometry->setDataContainerArray(dca);
@@ -499,9 +500,9 @@ class CreateGeometryTest
 
     static const QString k_DataContainerName("DataContainer");
     static const QString k_BoundsMatrixName("BoundsMatrix");
-    static const QString k_XBoundsDAName("XBounds");
-    static const QString k_YBoundsDAName("YBounds");
-    static const QString k_ZBoundsDAName("ZBounds");
+    static const QString k_XBoundsDAName(SIMPL::Geometry::xBoundsList);
+    static const QString k_YBoundsDAName(SIMPL::Geometry::yBoundsList);
+    static const QString k_ZBoundsDAName(SIMPL::Geometry::zBoundsList);
     static const QString k_BadXBoundsDAName("BadXBounds");
 
     // Create DataContainerArray
@@ -511,12 +512,12 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer boundsAM = AttributeMatrix::New(m_Dims4, k_BoundsMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_BoundsMatrixName, boundsAM);
+    dc->addOrReplaceAttributeMatrix(boundsAM);
 
     // Create Bounds Arrays
 
@@ -525,21 +526,21 @@ class CreateGeometryTest
     {
       daXBounds->setValue(i, i);
     }
-    boundsAM->addAttributeArray(k_XBoundsDAName, daXBounds);
+    boundsAM->insertOrAssign(daXBounds);
 
     DataArray<float>::Pointer daYBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_YBoundsDAName);
     for(size_t i = 0; i < daYBounds->getSize(); i++)
     {
       daYBounds->setValue(i, i);
     }
-    boundsAM->addAttributeArray(k_YBoundsDAName, daYBounds);
+    boundsAM->insertOrAssign(daYBounds);
 
     DataArray<float>::Pointer daZBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_ZBoundsDAName);
     for(size_t i = 0; i < daZBounds->getSize(); i++)
     {
       daZBounds->setValue(i, i);
     }
-    boundsAM->addAttributeArray(k_ZBoundsDAName, daZBounds);
+    boundsAM->insertOrAssign(daZBounds);
 
     // Create bad xBounds arrays
 
@@ -549,7 +550,7 @@ class CreateGeometryTest
       daBadXBounds->setValue(i, i);
     }
     daBadXBounds->setValue(0, 100);
-    boundsAM->addAttributeArray(k_BadXBoundsDAName, daBadXBounds);
+    boundsAM->insertOrAssign(daBadXBounds);
 
     // Create Filter
 
@@ -572,7 +573,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -666,19 +667,19 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims2, k_VertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_VertexMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     // Create Vertex Data Arrays
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 0.0f}, {3.0f, 1.0f, 0.0f}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>(k_VertexListDAName, vertices, m_Dims2, m_Dims3);
-    vertexAM->addAttributeArray(k_VertexListDAName, daVert);
+    vertexAM->insertOrAssign(daVert);
 
     // Create Filter
 
@@ -701,7 +702,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -742,15 +743,15 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer edgeVertexAM = AttributeMatrix::New(m_Dims2, k_EdgeVertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_EdgeVertexMatrixName, edgeVertexAM);
+    dc->addOrReplaceAttributeMatrix(edgeVertexAM);
 
     AttributeMatrix::Pointer edgeElementAM = AttributeMatrix::New(m_Dims1, k_EdgeElementAttributeMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_EdgeElementAttributeMatrixName, edgeElementAM);
+    dc->addOrReplaceAttributeMatrix(edgeElementAM);
 
     // Create Edge Data Arrays
 
@@ -759,15 +760,15 @@ class CreateGeometryTest
 
     DataArray<float>::Pointer daEdgeVert = createDataArray<float>(k_EdgeVertexListDAName, vertices, m_Dims2, m_Dims3);
     DataArray<int64_t>::Pointer daEdgeList = createDataArray<int64_t>(k_EdgeListDAName, elements, m_Dims1, m_Dims2);
-    edgeVertexAM->addAttributeArray(k_EdgeVertexListDAName, daEdgeVert);
-    edgeElementAM->addAttributeArray(k_EdgeListDAName, daEdgeList);
+    edgeVertexAM->insertOrAssign(daEdgeVert);
+    edgeElementAM->insertOrAssign(daEdgeList);
 
     // Create Bad EdgeList
 
     elements = {{0, 2}};
 
     DataArray<int64_t>::Pointer daBadEdgeList = createDataArray<int64_t>(k_BadEdgeListDAName, elements, m_Dims1, m_Dims2);
-    edgeElementAM->addAttributeArray(k_BadEdgeListDAName, daBadEdgeList);
+    edgeElementAM->insertOrAssign(daBadEdgeList);
 
     // Create Filter
 
@@ -790,7 +791,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -858,15 +859,15 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer triVertexAM = AttributeMatrix::New(m_Dims3, k_TriVertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_TriVertexMatrixName, triVertexAM);
+    dc->addOrReplaceAttributeMatrix(triVertexAM);
 
     AttributeMatrix::Pointer triElementAM = AttributeMatrix::New(m_Dims1, k_TriElementAttributeMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_TriElementAttributeMatrixName, triElementAM);
+    dc->addOrReplaceAttributeMatrix(triElementAM);
 
     // Create Triangle Data Arrays
 
@@ -875,15 +876,15 @@ class CreateGeometryTest
 
     DataArray<float>::Pointer daTriVert = createDataArray<float>(k_TriVertexListDAName, vertices, m_Dims3, m_Dims3);
     DataArray<int64_t>::Pointer daTriList = createDataArray<int64_t>(k_TriListDAName, elements, m_Dims1, m_Dims3);
-    triVertexAM->addAttributeArray(k_TriVertexListDAName, daTriVert);
-    triElementAM->addAttributeArray(k_TriListDAName, daTriList);
+    triVertexAM->insertOrAssign(daTriVert);
+    triElementAM->insertOrAssign(daTriList);
 
     // Create Bad TriangleList
 
     elements = {{0, 3, 2}};
 
     DataArray<int64_t>::Pointer daBadTriList = createDataArray<int64_t>(k_BadTriListDAName, elements, m_Dims1, m_Dims3);
-    triElementAM->addAttributeArray(k_BadTriListDAName, daBadTriList);
+    triElementAM->insertOrAssign(daBadTriList);
 
     // Create Filter
 
@@ -906,7 +907,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -974,15 +975,15 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer quadVertexAM = AttributeMatrix::New(m_Dims4, k_QuadVertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_QuadVertexMatrixName, quadVertexAM);
+    dc->addOrReplaceAttributeMatrix(quadVertexAM);
 
     AttributeMatrix::Pointer quadElementAM = AttributeMatrix::New(m_Dims1, k_QuadElementAttributeMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_QuadElementAttributeMatrixName, quadElementAM);
+    dc->addOrReplaceAttributeMatrix(quadElementAM);
 
     // Create Quadrilateral Data Arrays
 
@@ -991,15 +992,15 @@ class CreateGeometryTest
 
     DataArray<float>::Pointer daQuadVert = createDataArray<float>(k_QuadVertexListDAName, vertices, m_Dims4, m_Dims3);
     DataArray<int64_t>::Pointer daQuadList = createDataArray<int64_t>(k_QuadListDAName, elements, m_Dims1, m_Dims4);
-    quadVertexAM->addAttributeArray(k_QuadVertexListDAName, daQuadVert);
-    quadElementAM->addAttributeArray(k_QuadListDAName, daQuadList);
+    quadVertexAM->insertOrAssign(daQuadVert);
+    quadElementAM->insertOrAssign(daQuadList);
 
     // Create Bad QuadrilateralList
 
     elements = {{0, 1, 7, 3}};
 
     DataArray<int64_t>::Pointer daBadQuadList = createDataArray<int64_t>(k_BadQuadListDAName, elements, m_Dims1, m_Dims4);
-    quadElementAM->addAttributeArray(k_BadQuadListDAName, daBadQuadList);
+    quadElementAM->insertOrAssign(daBadQuadList);
 
     // Create Filter
 
@@ -1022,7 +1023,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -1090,15 +1091,15 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer tetVertexAM = AttributeMatrix::New(m_Dims4, k_TetVertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_TetVertexMatrixName, tetVertexAM);
+    dc->addOrReplaceAttributeMatrix(tetVertexAM);
 
     AttributeMatrix::Pointer tetElementAM = AttributeMatrix::New(m_Dims1, k_TetElementAttributeMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_TetElementAttributeMatrixName, tetElementAM);
+    dc->addOrReplaceAttributeMatrix(tetElementAM);
 
     // Create Tetrahedron Data Arrays
 
@@ -1108,15 +1109,15 @@ class CreateGeometryTest
 
     DataArray<float>::Pointer daTetVert = createDataArray<float>(k_TetVertexListDAName, vertices, m_Dims4, m_Dims3);
     DataArray<int64_t>::Pointer daTetList = createDataArray<int64_t>(k_TetListDAName, elements, m_Dims1, m_Dims4);
-    tetVertexAM->addAttributeArray(k_TetVertexListDAName, daTetVert);
-    tetElementAM->addAttributeArray(k_TetListDAName, daTetList);
+    tetVertexAM->insertOrAssign(daTetVert);
+    tetElementAM->insertOrAssign(daTetList);
 
     // Create Bad TetrahedronList
 
     elements = {{0, 10, 2, 3}};
 
     DataArray<int64_t>::Pointer daBadTetList = createDataArray<int64_t>(k_BadTetListDAName, elements, m_Dims1, m_Dims4);
-    tetElementAM->addAttributeArray(k_BadTetListDAName, daBadTetList);
+    tetElementAM->insertOrAssign(daBadTetList);
 
     // Create Filter
 
@@ -1139,7 +1140,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -1207,15 +1208,15 @@ class CreateGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
 
     AttributeMatrix::Pointer hexVertexAM = AttributeMatrix::New(m_Dims8, k_HexVertexMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_HexVertexMatrixName, hexVertexAM);
+    dc->addOrReplaceAttributeMatrix(hexVertexAM);
 
     AttributeMatrix::Pointer hexElementAM = AttributeMatrix::New(m_Dims1, k_HexElementAttributeMatrixName, AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix(k_HexElementAttributeMatrixName, hexElementAM);
+    dc->addOrReplaceAttributeMatrix(hexElementAM);
 
     // Create Hexahedron Data Arrays
 
@@ -1225,15 +1226,15 @@ class CreateGeometryTest
 
     DataArray<float>::Pointer daHexVert = createDataArray<float>(k_HexVertexListDAName, vertices, m_Dims8, m_Dims3);
     DataArray<int64_t>::Pointer daHexList = createDataArray<int64_t>(k_HexListDAName, elements, m_Dims1, m_Dims8);
-    hexVertexAM->addAttributeArray(k_HexVertexListDAName, daHexVert);
-    hexElementAM->addAttributeArray(k_HexListDAName, daHexList);
+    hexVertexAM->insertOrAssign(daHexVert);
+    hexElementAM->insertOrAssign(daHexList);
 
     // Create Bad HexahedronList
 
     elements = {{0, 1, 2, 32, 4, 5, 6, 7}};
 
     DataArray<int64_t>::Pointer daBadHexList = createDataArray<int64_t>(k_BadHexListDAName, elements, m_Dims1, m_Dims8);
-    hexElementAM->addAttributeArray(k_BadHexListDAName, daBadHexList);
+    hexElementAM->insertOrAssign(daBadHexList);
 
     // Create Filter
 
@@ -1256,7 +1257,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     propWasSet = createGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 9c3ce5ad64..ab92e05b0b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -67,13 +67,13 @@ class CreateImageGeometryTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(attributeMatrixSize, "Attribute Matrix", AttributeMatrix::Type::Any);
 
     DataContainer::Pointer dc = DataContainer::New("Data Container");
-    dc->addAttributeMatrix("Attribute Matrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     imageGeometry->setDataContainerArray(dca);
-    imageGeometry->setSelectedDataContainer("Data Container");
+    imageGeometry->setSelectedDataContainer(DataArrayPath("Data Container", "", ""));
     return imageGeometry;
   }
 
@@ -84,18 +84,18 @@ class CreateImageGeometryTest
   {
     CreateImageGeometry::Pointer imageGeometry = initializeData();
 
-    IntVec3_t numDimensions;
-    numDimensions.x = 5;
-    numDimensions.y = 15;
-    numDimensions.z = 25;
+    IntVec3Type numDimensions;
+    numDimensions[0] = 5;
+    numDimensions[1] = 15;
+    numDimensions[2] = 25;
 
     imageGeometry->setDimensions(numDimensions);
 
-    IntVec3_t dimensions = imageGeometry->getDimensions();
+    IntVec3Type dimensions = imageGeometry->getDimensions();
 
-    DREAM3D_REQUIRE_EQUAL(numDimensions.x, dimensions.x);
-    DREAM3D_REQUIRE_EQUAL(numDimensions.y, dimensions.y);
-    DREAM3D_REQUIRE_EQUAL(numDimensions.z, dimensions.z);
+    DREAM3D_REQUIRE_EQUAL(numDimensions[0], dimensions[0]);
+    DREAM3D_REQUIRE_EQUAL(numDimensions[1], dimensions[1]);
+    DREAM3D_REQUIRE_EQUAL(numDimensions[2], dimensions[2]);
   }
 
   // -----------------------------------------------------------------------------
@@ -105,18 +105,18 @@ class CreateImageGeometryTest
   {
     CreateImageGeometry::Pointer imageGeometry = initializeData();
 
-    FloatVec3_t originPos;
-    originPos.x = 5;
-    originPos.y = 15;
-    originPos.z = 25;
+    FloatVec3Type originPos;
+    originPos[0] = 5;
+    originPos[1] = 15;
+    originPos[2] = 25;
 
     imageGeometry->setOrigin(originPos);
 
-    FloatVec3_t origin = imageGeometry->getOrigin();
+    FloatVec3Type origin = imageGeometry->getOrigin();
 
-    DREAM3D_REQUIRE_EQUAL(originPos.x, origin.x);
-    DREAM3D_REQUIRE_EQUAL(originPos.y, origin.y);
-    DREAM3D_REQUIRE_EQUAL(originPos.z, origin.z);
+    DREAM3D_REQUIRE_EQUAL(originPos[0], origin[0]);
+    DREAM3D_REQUIRE_EQUAL(originPos[1], origin[1]);
+    DREAM3D_REQUIRE_EQUAL(originPos[2], origin[2]);
   }
 
   // -----------------------------------------------------------------------------
@@ -126,18 +126,18 @@ class CreateImageGeometryTest
   {
     CreateImageGeometry::Pointer imageGeometry = initializeData();
 
-    FloatVec3_t imgResolution;
-    imgResolution.x = 5;
-    imgResolution.y = 15;
-    imgResolution.z = 25;
+    FloatVec3Type imgResolution;
+    imgResolution[0] = 5;
+    imgResolution[1] = 15;
+    imgResolution[2] = 25;
 
-    imageGeometry->setResolution(imgResolution);
+    imageGeometry->setSpacing(imgResolution);
 
-    FloatVec3_t resolution = imageGeometry->getResolution();
+    FloatVec3Type resolution = imageGeometry->getSpacing();
 
-    DREAM3D_REQUIRE_EQUAL(imgResolution.x, resolution.x);
-    DREAM3D_REQUIRE_EQUAL(imgResolution.y, resolution.y);
-    DREAM3D_REQUIRE_EQUAL(imgResolution.z, resolution.z);
+    DREAM3D_REQUIRE_EQUAL(imgResolution[0], resolution[0]);
+    DREAM3D_REQUIRE_EQUAL(imgResolution[1], resolution[1]);
+    DREAM3D_REQUIRE_EQUAL(imgResolution[2], resolution[2]);
   }
 
   // -----------------------------------------------------------------------------
@@ -147,23 +147,23 @@ class CreateImageGeometryTest
   {
     CreateImageGeometry::Pointer imageGeometry = initializeData();
 
-    IntVec3_t numDimensions;
-    numDimensions.x = 5;
-    numDimensions.y = 15;
-    numDimensions.z = 25;
+    IntVec3Type numDimensions;
+    numDimensions[0] = 5;
+    numDimensions[1] = 15;
+    numDimensions[2] = 25;
     imageGeometry->setDimensions(numDimensions);
 
-    FloatVec3_t originPos;
-    originPos.x = 5;
-    originPos.y = 15;
-    originPos.z = 25;
+    FloatVec3Type originPos;
+    originPos[0] = 5;
+    originPos[1] = 15;
+    originPos[2] = 25;
     imageGeometry->setOrigin(originPos);
 
-    FloatVec3_t imgResolution;
-    imgResolution.x = 5;
-    imgResolution.y = 15;
-    imgResolution.z = 25;
-    imageGeometry->setResolution(imgResolution);
+    FloatVec3Type imgResolution;
+    imgResolution[0] = 5;
+    imgResolution[1] = 15;
+    imgResolution[2] = 25;
+    imageGeometry->setSpacing(imgResolution);
 
     imageGeometry->execute();
 
@@ -174,36 +174,30 @@ class CreateImageGeometryTest
     DREAM3D_REQUIRE(nullptr != geometry.get());
 
     {
-      float* res = new float[3];
-      geometry->getResolution(res);
+      FloatVec3Type res;
+      geometry->getSpacing(res);
 
-      DREAM3D_REQUIRE_EQUAL(res[0], imgResolution.x);
-      DREAM3D_REQUIRE_EQUAL(res[1], imgResolution.y);
-      DREAM3D_REQUIRE_EQUAL(res[2], imgResolution.z);
-
-      delete[] res;
+      DREAM3D_REQUIRE_EQUAL(res[0], imgResolution[0]);
+      DREAM3D_REQUIRE_EQUAL(res[1], imgResolution[1]);
+      DREAM3D_REQUIRE_EQUAL(res[2], imgResolution[2]);
     }
 
     {
-      float* origin = new float[3];
+      FloatVec3Type origin;
       geometry->getOrigin(origin);
 
-      DREAM3D_REQUIRE_EQUAL(origin[0], originPos.x);
-      DREAM3D_REQUIRE_EQUAL(origin[1], originPos.y);
-      DREAM3D_REQUIRE_EQUAL(origin[2], originPos.z);
-
-      delete[] origin;
+      DREAM3D_REQUIRE_EQUAL(origin[0], originPos[0]);
+      DREAM3D_REQUIRE_EQUAL(origin[1], originPos[1]);
+      DREAM3D_REQUIRE_EQUAL(origin[2], originPos[2]);
     }
 
     {
-      size_t* dims = new size_t[3];
-      std::tie(dims[0], dims[1], dims[2]) = geometry->getDimensions();
+      SizeVec3Type dims;
+      geometry->getDimensions(dims);
 
-      DREAM3D_REQUIRE_EQUAL(dims[0], numDimensions.x);
-      DREAM3D_REQUIRE_EQUAL(dims[1], numDimensions.y);
-      DREAM3D_REQUIRE_EQUAL(dims[2], numDimensions.z);
-
-      delete[] dims;
+      DREAM3D_REQUIRE_EQUAL(dims[0], numDimensions[0]);
+      DREAM3D_REQUIRE_EQUAL(dims[1], numDimensions[1]);
+      DREAM3D_REQUIRE_EQUAL(dims[2], numDimensions[2]);
     }
   }
 
@@ -235,7 +229,9 @@ class CreateImageGeometryTest
     DREAM3D_REGISTER_TEST(testExecution())
   }
 
-private:
-  CreateImageGeometryTest(const CreateImageGeometryTest&); // Copy Constructor Not Implemented
-  void operator=(const CreateImageGeometryTest&);          // Move assignment Not Implemented
+public:
+  CreateImageGeometryTest(const CreateImageGeometryTest&) = delete;            // Copy Constructor Not Implemented
+  CreateImageGeometryTest(CreateImageGeometryTest&&) = delete;                 // Move Constructor Not Implemented
+  CreateImageGeometryTest& operator=(const CreateImageGeometryTest&) = delete; // Copy Assignment Not Implemented
+  CreateImageGeometryTest& operator=(CreateImageGeometryTest&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index 0d6ae301c3..aac570dba7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -104,12 +104,12 @@ class CreateStringArrayTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer am = AttributeMatrix::New(tupleDims, k_AttributeMatrixName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixName, am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     // Create Filter
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index 3e7a0a7c9b..aa86c8c0a6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -129,22 +129,22 @@ class CropVertexGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     QVector<size_t> dims(1, vertices.size());
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(dims, k_VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(k_VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer nonVertexAM = AttributeMatrix::New(m_Dims4, k_AttributeMatrixName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixName, nonVertexAM);
+    dc->addOrReplaceAttributeMatrix(nonVertexAM);
 
     // Create DataArray used for geometry creation
 
     FloatArrayType::Pointer daVert = createDataArray<float>(k_VertexCoordinatesDAName, vertices, dims, m_Dims3);
-    vertexAM->addAttributeArray(k_VertexCoordinatesDAName, daVert);
+    vertexAM->insertOrAssign(daVert);
 
     // Manually create cropped DataArray for comparison
 
@@ -159,7 +159,7 @@ class CropVertexGeometryTest
     {
       da->setValue(i, i + 0.5f);
     }
-    nonVertexAM->addAttributeArray(k_DataArray0Name, da);
+    nonVertexAM->insertOrAssign(da);
 
     // Create Geometry
 
@@ -178,12 +178,13 @@ class CropVertexGeometryTest
     // Setup Filter
 
     QVariant var;
-
-    var.setValue(k_DataContainerName);
+    DataArrayPath dap(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = cropVertexGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    var.setValue(k_CroppedDataContainerName);
+    dap = DataArrayPath(k_CroppedDataContainerName);
+    var.setValue(dap);
     propWasSet = cropVertexGeometry->setProperty("CroppedDataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -230,7 +231,7 @@ class CropVertexGeometryTest
 
     DREAM3D_REQUIRE_EQUAL((daCroppedVert->getNumberOfTuples() == croppedVertexAM->getNumberOfTuples()), true)
 
-    FloatArrayType::Pointer croppedVerticesFromAM = croppedVertexAM->getAttributeArrayAs<FloatArrayType>(k_VertexCoordinatesDAName);
+    FloatArrayType::Pointer croppedVerticesFromAM = croppedVertexAM->getAttributeArrayAs<FloatArrayType>(SIMPL::Geometry::SharedVertexList);
 
     checkDataArray<float>(daCroppedVert, croppedVerticesFromAM);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index fa4eef24eb..6852c96398 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -47,7 +47,9 @@
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/StructArray.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
@@ -123,6 +125,14 @@ QString H5File()
 
 class DataContainerTest
 {
+
+  enum createdPathID : RenameDataPath::DataID_t
+  {
+    DataContainerID1 = 1,
+    DataContainerID2 = 2,
+    DataContainerID3 = 3
+  };
+
 public:
   DataContainerTest() = default;
   virtual ~DataContainerTest() = default;
@@ -186,7 +196,7 @@ class DataContainerTest
     typename DataArray<T>::Pointer foo = DataArray<T>::CreateArray(attrMat->getTupleDimensions(), compDims, "RENAME_ME");
     foo->setName(foo->getFullNameOfClass() + name);
     foo->initializeWithValue(static_cast<T>(1));
-    attrMat->addAttributeArray(foo->getName(), foo);
+    attrMat->insertOrAssign(foo);
 
     QString autoName = foo->getName() + "_Auto";
     attrMat->createNonPrereqArray<DataArray<T>, AbstractFilter, T>(nullptr, autoName, static_cast<T>(10), compDims);
@@ -204,13 +214,13 @@ class DataContainerTest
       QString value = QString("string_%1").arg(i);
       data->setValue(i, value);
     }
-    attrMat->addAttributeArray(data->getName(), data);
+    attrMat->insertOrAssign(data);
   }
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void FillAttributeMatrix(AttributeMatrix::Pointer attrMat, QVector<size_t> compDims)
+  void FillAttributeMatrix(const AttributeMatrix::Pointer& attrMat, const QVector<size_t>& compDims)
   {
     CreateDataArray<int8_t>(attrMat, compDims);
     CreateDataArray<uint8_t>(attrMat, compDims);
@@ -228,7 +238,7 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void PopulateVolumeDataContainer(DataContainer::Pointer dc, QVector<size_t> tupleDims, const QString& name)
+  void PopulateVolumeDataContainer(const DataContainer::Pointer& dc, QVector<size_t> tupleDims, const QString& name)
   {
     // Create the attribute matrix with the dimensions and name
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tupleDims, name, AttributeMatrix::Type::Cell);
@@ -246,7 +256,7 @@ class DataContainerTest
     FillAttributeMatrix(attrMat, compDims);
 
     // Add the AttributeMatrix to the Data Container
-    dc->addAttributeMatrix(attrMat->getName(), attrMat);
+    dc->addOrReplaceAttributeMatrix(attrMat);
 
     QString autoAddName = name + QString::fromLatin1("_Auto");
     AttributeMatrix::Pointer autoAttrMat = dc->createNonPrereqAttributeMatrix(nullptr, autoAddName, tupleDims, AttributeMatrix::Type::Cell);
@@ -284,31 +294,31 @@ class DataContainerTest
     // 1D VolumeDataContainer
     tupleDims.push_back(nx);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "1D_VolumeDataContainer");
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "1D_VolumeDataContainer", DataContainerID1);
       PopulateVolumeDataContainer(dc, tupleDims, "1D_AttributeMatrix");
     }
 
     // 2D VolumeDataContainer
     tupleDims.push_back(ny);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "2D_VolumeDataContainer");
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "2D_VolumeDataContainer", DataContainerID2);
       PopulateVolumeDataContainer(dc, tupleDims, "2D_AttributeMatrix");
     }
 
     // 3D VolumeDataContainer
     tupleDims.push_back(nz);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "3D_VolumeDataContainer");
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "3D_VolumeDataContainer", DataContainerID3);
       PopulateVolumeDataContainer(dc, tupleDims, "3D_AttributeMatrix");
     }
 
     // A DataContainer that mimics some real data
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
     m->setGeometry(image);
 
     AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(tupleDims, getCellFeatureAttributeMatrixName(), AttributeMatrix::Type::CellFeature);
-    m->addAttributeMatrix(getCellFeatureAttributeMatrixName(), attrMatrix);
+    m->addOrReplaceAttributeMatrix(attrMatrix);
 
     int size = nx * ny * nz;
     Int32ArrayType::Pointer featureIds = Int32ArrayType::CreateArray(size, SIMPL::CellData::FeatureIds);
@@ -316,14 +326,14 @@ class DataContainerTest
     {
       featureIds->setValue(i, i + DataContainerIOTest::Offset);
     }
-    attrMatrix->addAttributeArray(SIMPL::CellData::FeatureIds, featureIds);
+    attrMatrix->insertOrAssign(featureIds);
 
     BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(size, SIMPL::CellData::BoundaryCells);
     for(int i = 0; i < size; ++i)
     {
       boolArray->setValue(i, i + DataContainerIOTest::Offset);
     }
-    attrMatrix->addAttributeArray(SIMPL::CellData::BoundaryCells, boolArray);
+    attrMatrix->insertOrAssign(boolArray);
 
     QVector<size_t> dims(1, 3);
     FloatArrayType::Pointer avgEuler = FloatArrayType::CreateArray(size, dims, SIMPL::FeatureData::AxisEulerAngles);
@@ -333,19 +343,19 @@ class DataContainerTest
       avgEuler->setComponent(i, 1, i * 0.325f);
       avgEuler->setComponent(i, 2, i * 0.165f);
     }
-    m->getAttributeMatrix(getCellFeatureAttributeMatrixName())->addAttributeArray(SIMPL::FeatureData::AxisEulerAngles, avgEuler);
+    m->getAttributeMatrix(getCellFeatureAttributeMatrixName())->insertOrAssign(avgEuler);
 
     tupleDims.resize(1);
     tupleDims[0] = 4;
     AttributeMatrix::Pointer ensemAttrMat = AttributeMatrix::New(tupleDims, getCellEnsembleAttributeMatrixName(), AttributeMatrix::Type::CellEnsemble);
-    m->addAttributeMatrix(getCellEnsembleAttributeMatrixName(), ensemAttrMat);
+    m->addOrReplaceAttributeMatrix(ensemAttrMat);
 
     FloatArrayType::Pointer surfArea = FloatArrayType::CreateArray(4, SIMPL::EnsembleData::TotalSurfaceAreas);
     for(int i = 0; i < 4; ++i)
     {
       surfArea->setValue(i, i + 41.2f);
     }
-    m->getAttributeMatrix(getCellEnsembleAttributeMatrixName())->addAttributeArray(SIMPL::EnsembleData::TotalSurfaceAreas, surfArea);
+    m->getAttributeMatrix(getCellEnsembleAttributeMatrixName())->insertOrAssign(surfArea);
 
     Observer obs;
     // Send progress messages from PipelineBuilder to this object for display
@@ -479,7 +489,7 @@ class DataContainerTest
 
     tDims[0] = 5;
     attrMat->resizeAttributeArrays(tDims);
-    int err = attrMat->addAttributeArray("Test", p);
+    int err = attrMat->insertOrAssign(p);
     DREAM3D_REQUIRED(err, >=, 0)
 
     // Now get it back out as the specific type that we put it in as
@@ -587,8 +597,6 @@ class DataContainerTest
   {
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
 
-    QList<QString> nameList;
-
     insertDeleteArray<Int8ArrayType>(m);
     insertDeleteArray<UInt16ArrayType>(m);
     insertDeleteArray<Int16ArrayType>(m);
@@ -885,6 +893,284 @@ class DataContainerTest
     }
 #endif
 
+  // -----------------------------------------------------------------------------
+  void TestDataContainerArray()
+  {
+    bool result = false;
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+    // addDataContainer
+    // insertOrAssign
+    // getDataContainer(QString | DataArrayPath)
+
+    // try adding or assigning a null DataContainer
+    DataContainer::Pointer nullDc = DataContainer::NullPointer();
+    result = dca->addOrReplaceDataContainer(nullDc);
+    DREAM3D_REQUIRED(false, ==, result)
+    result = dca->insertOrAssign(nullDc);
+    DREAM3D_REQUIRED(false, ==, result)
+    DREAM3D_REQUIRED(dca->size(), ==, 0)
+
+    const QString k_DC0("DCO");
+    const QString k_DC1("DC1");
+    DataContainer::Pointer dc0 = DataContainer::New(k_DC0);
+    DataContainer::Pointer dc1 = DataContainer::New(k_DC1);
+
+    result = dca->addOrReplaceDataContainer(dc0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 1)
+
+    // Add the same DataContainer a second time. Still returns true. Size stays at 1
+    result = dca->insertOrAssign(dc0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 1)
+
+    result = dca->push_back(dc0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 1)
+
+    result = dca->addOrReplaceDataContainer(dc1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 2)
+
+    dc0 = dca->removeDataContainer(k_DC0);
+    dc1 = dca->removeDataContainer(k_DC1);
+    DREAM3D_REQUIRED(dca->empty(), ==, true)
+    DREAM3D_REQUIRE_NULL_POINTER(dc0->getParentNode())
+
+    dca->clear();
+    DREAM3D_REQUIRED(dca->empty(), ==, true)
+
+    result = dca->addOrReplaceDataContainer(dc0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 1)
+
+    result = dca->push_back(dc0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 1)
+
+    result = dca->addOrReplaceDataContainer(dc1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 2)
+
+    // getDataContainers
+    DataContainerArray::Container dcContainer = dca->getDataContainers();
+    DREAM3D_REQUIRED(dcContainer.size(), ==, 2)
+
+    dc0 = dca->getDataContainer(k_DC0);
+    DREAM3D_REQUIRE_VALID_POINTER(dc0.get())
+    DataArrayPath dap(k_DC0);
+    dc0 = dca->getDataContainer(dap);
+    DREAM3D_REQUIRE_VALID_POINTER(dc0.get())
+
+    DREAM3D_REQUIRED(dca->size(), ==, 2)
+    dca->clear();
+    DREAM3D_REQUIRED(dca->empty(), ==, true)
+    for(int i = 0; i < 10; i++)
+    {
+      DataContainer::Pointer dc = DataContainer::New("Foo" + QString::number(i));
+      dca->addOrReplaceDataContainer(dc);
+      //   std::cout << dca->size() << std::endl;
+      DREAM3D_REQUIRED(dca->size(), ==, i + 1)
+    }
+
+    result = dca->insertOrAssign(dc0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 11)
+
+    result = dca->insertOrAssign(dc0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 11)
+    result = dca->insertOrAssign(dc1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dca->size(), ==, 12)
+  }
+
+  // -----------------------------------------------------------------------------
+  void TestDataContainer()
+  {
+    bool result = false;
+    DataContainer::Pointer dc = DataContainer::New("DataContainer");
+    // addDataContainer
+    // insertOrAssign
+    // getDataContainer(QString | DataArrayPath)
+
+    // try adding or assigning a null DataContainer
+    AttributeMatrix::Pointer nullAttrMat = AttributeMatrix::NullPointer();
+    result = dc->addOrReplaceAttributeMatrix(nullAttrMat);
+    DREAM3D_REQUIRED(false, ==, result)
+    result = dc->insertOrAssign(nullAttrMat);
+    DREAM3D_REQUIRED(false, ==, result)
+    DREAM3D_REQUIRED(dc->empty(), ==, true)
+
+    const QString k_DC0("DCO");
+    const QString k_DC1("DC1");
+    QVector<size_t> tDims = {10, 10};
+    AttributeMatrix::Pointer am0 = AttributeMatrix::New(tDims, k_DC0, AttributeMatrix::Type::Generic);
+    AttributeMatrix::Pointer am1 = AttributeMatrix::New(tDims, k_DC1, AttributeMatrix::Type::Generic);
+
+    result = dc->addOrReplaceAttributeMatrix(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 1)
+
+    // Add the same AttributeMatrix a second time. Still returns true. Size stays at 1
+    result = dc->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 1)
+
+    result = dc->push_back(am0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 1)
+
+    result = dc->addOrReplaceAttributeMatrix(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 2)
+
+    am0 = dc->removeAttributeMatrix(k_DC0);
+    am1 = dc->removeAttributeMatrix(k_DC1);
+    DREAM3D_REQUIRED(dc->empty(), ==, true)
+    DREAM3D_REQUIRE_NULL_POINTER(am0->getParentNode())
+
+    dc->clear();
+    DREAM3D_REQUIRED(dc->empty(), ==, true)
+
+    result = dc->addOrReplaceAttributeMatrix(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 1)
+
+    result = dc->push_back(am0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 1)
+
+    result = dc->addOrReplaceAttributeMatrix(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 2)
+
+    // getDataContainers
+    DataContainer::Container_t dcContainer = dc->getAttributeMatrices();
+    DREAM3D_REQUIRED(dcContainer.size(), ==, 2)
+
+    am0 = dc->getAttributeMatrix(k_DC0);
+    DREAM3D_REQUIRE_VALID_POINTER(am0.get())
+    DataArrayPath dap("DataContainer", k_DC0, "");
+    am0 = dc->getAttributeMatrix(dap);
+    DREAM3D_REQUIRE_VALID_POINTER(am0.get())
+
+    DREAM3D_REQUIRED(dc->size(), ==, 2)
+    dc->clear();
+    DREAM3D_REQUIRED(dc->empty(), ==, true)
+    for(int i = 0; i < 10; i++)
+    {
+      AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Foo" + QString::number(i), AttributeMatrix::Type::Generic);
+      dc->addOrReplaceAttributeMatrix(am);
+      //   std::cout << dca->size() << std::endl;
+      DREAM3D_REQUIRED(dc->size(), ==, i + 1)
+    }
+
+    result = dc->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 11)
+
+    result = dc->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 11)
+    result = dc->insertOrAssign(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(dc->size(), ==, 12)
+  }
+
+  // -----------------------------------------------------------------------------
+  void TestAttributeMatrix()
+  {
+    bool result = false;
+    QVector<size_t> tDims = {10, 10};
+    AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Generic);
+    // addDataContainer
+    // insertOrAssign
+    // getDataContainer(QString | DataArrayPath)
+
+    // try adding or assigning a null DataContainer
+    Int32ArrayType::Pointer nullAttrMat = Int32ArrayType::NullPointer();
+    result = am->addOrReplaceAttributeArray(nullAttrMat);
+    DREAM3D_REQUIRED(false, ==, result)
+    result = am->insertOrAssign(nullAttrMat);
+    DREAM3D_REQUIRED(false, ==, result)
+    DREAM3D_REQUIRED(am->empty(), ==, true)
+
+    const QString k_DC0("DCO");
+    const QString k_DC1("DC1");
+    Int32ArrayType::Pointer am0 = Int32ArrayType::CreateArray(100, k_DC0);
+    Int32ArrayType::Pointer am1 = Int32ArrayType::CreateArray(100, k_DC1);
+
+    result = am->addOrReplaceAttributeArray(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 1)
+
+    // Add the same AttributeMatrix a second time. Still returns true. Size stays at 1
+    result = am->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 1)
+
+    result = am->push_back(am0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 1)
+
+    result = am->addOrReplaceAttributeArray(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 2)
+
+    IDataArray::Pointer da0 = am->removeAttributeArray(k_DC0);
+    IDataArray::Pointer da1 = am->removeAttributeArray(k_DC1);
+    DREAM3D_REQUIRED(am->empty(), ==, true)
+    DREAM3D_REQUIRE_NULL_POINTER(am0->getParentNode())
+
+    am->clear();
+    DREAM3D_REQUIRED(am->empty(), ==, true)
+
+    result = am->addOrReplaceAttributeArray(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 1)
+
+    result = am->push_back(am0);
+    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 1)
+
+    result = am->addOrReplaceAttributeArray(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 2)
+
+    // getDataContainers
+    AttributeMatrix::Container_t dcContainer = am->getAttributeArrays();
+    DREAM3D_REQUIRED(dcContainer.size(), ==, 2)
+
+    da0 = am->getAttributeArray(k_DC0);
+    DREAM3D_REQUIRE_VALID_POINTER(am0.get())
+    DataArrayPath dap("DataContainer", "AttributeMatrix", k_DC0);
+    da0 = am->getAttributeArray(dap);
+    DREAM3D_REQUIRE_VALID_POINTER(am0.get())
+
+    DREAM3D_REQUIRED(am->size(), ==, 2)
+    am->clear();
+    DREAM3D_REQUIRED(am->empty(), ==, true)
+    for(int i = 0; i < 10; i++)
+    {
+      Int32ArrayType::Pointer aa = Int32ArrayType::CreateArray(100, "Foo" + QString::number(i));
+      am->addOrReplaceAttributeArray(aa);
+      //   std::cout << dca->size() << std::endl;
+      DREAM3D_REQUIRED(am->size(), ==, i + 1)
+    }
+
+    result = am->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 11)
+
+    result = am->insertOrAssign(am0);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 11)
+    result = am->insertOrAssign(am1);
+    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(am->size(), ==, 12)
+  }
+
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -899,6 +1185,11 @@ class DataContainerTest
     DREAM3D_REGISTER_TEST(RemoveTestFiles())
 #endif
     int err = EXIT_SUCCESS;
+
+    DREAM3D_REGISTER_TEST(TestDataContainerArray())
+    DREAM3D_REGISTER_TEST(TestDataContainer())
+    DREAM3D_REGISTER_TEST(TestAttributeMatrix())
+
     DREAM3D_REGISTER_TEST(TestInsertDelete())
 
     DREAM3D_REGISTER_TEST(TestDataContainerWriter())
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 3fe8f496b0..e8c1b3f5f0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -135,12 +135,12 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer boundsAM = AttributeMatrix::New(m_Dims4, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, boundsAM);
+    dc->addOrReplaceAttributeMatrix(boundsAM);
 
     // Create Geometry
 
@@ -183,7 +183,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -243,12 +243,12 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims2, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     // Create Geometry
 
@@ -273,7 +273,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -315,15 +315,15 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims2, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer elementAM = AttributeMatrix::New(m_Dims1, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Edge);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, elementAM);
+    dc->addOrReplaceAttributeMatrix(elementAM);
 
     // Create Geometry
 
@@ -351,7 +351,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -403,15 +403,15 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims3, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer elementAM = AttributeMatrix::New(m_Dims1, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Face);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, elementAM);
+    dc->addOrReplaceAttributeMatrix(elementAM);
 
     // Create Geometry
 
@@ -439,7 +439,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -491,15 +491,15 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims4, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer elementAM = AttributeMatrix::New(m_Dims1, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Face);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, elementAM);
+    dc->addOrReplaceAttributeMatrix(elementAM);
 
     // Create Geometry
 
@@ -527,7 +527,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -579,15 +579,15 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims4, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer elementAM = AttributeMatrix::New(m_Dims1, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, elementAM);
+    dc->addOrReplaceAttributeMatrix(elementAM);
 
     // Create Geometry
 
@@ -615,7 +615,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -667,15 +667,15 @@ class ExtractAttributeArraysFromGeometryTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(m_Dims8, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
-    dc->addAttributeMatrix(SIMPL::Defaults::VertexAttributeMatrixName, vertexAM);
+    dc->addOrReplaceAttributeMatrix(vertexAM);
 
     AttributeMatrix::Pointer elementAM = AttributeMatrix::New(m_Dims1, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, elementAM);
+    dc->addOrReplaceAttributeMatrix(elementAM);
 
     // Create Geometry
 
@@ -703,7 +703,7 @@ class ExtractAttributeArraysFromGeometryTest
     QVariant var;
 
     DataArrayPath dap(k_DataContainerName);
-    var.setValue(k_DataContainerName);
+    var.setValue(dap);
     bool propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerName", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 8a7f3a846e..d2f3d9f318 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -66,12 +66,12 @@ class ExtractComponentAsArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims;
     dims.push_back(2);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     QVector<size_t> cdims;
     cdims.push_back(2);
@@ -80,7 +80,7 @@ class ExtractComponentAsArrayTest
     da->setComponent(0, 1, 2);
     da->setComponent(1, 0, 3);
     da->setComponent(1, 1, 4);
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 096bee7689..27f1703c33 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -71,14 +71,14 @@ class ExtractVertexGeometryTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     // Create the DataContainer for the ImageGeometry
-    DataContainer::Pointer imageGeomDC = DataContainer::New(k_ImageGeomDataContainerName);
-    dca->addDataContainer(imageGeomDC);
+    DataContainer::Pointer imageGeomDC = DataContainer::New(k_ImageGeomDataContainerPath);
+    dca->addOrReplaceDataContainer(imageGeomDC);
 
     DataContainer::Pointer badDataContainer = DataContainer::New(k_BadDataContainerName);
-    dca->addDataContainer(badDataContainer);
+    dca->addOrReplaceDataContainer(badDataContainer);
 
     DataContainer::Pointer wrongGeomDataContainer = DataContainer::New(k_WrongGeomDataContainerName);
-    dca->addDataContainer(wrongGeomDataContainer);
+    dca->addOrReplaceDataContainer(wrongGeomDataContainer);
     TriangleGeom::Pointer triangleGeom = TriangleGeom::New();
     wrongGeomDataContainer->setGeometry(triangleGeom);
 
@@ -91,25 +91,25 @@ class ExtractVertexGeometryTest
 
     // Create the Cell AttributeMatrix
     AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::Create(dims, k_CellAttrMatName, AttributeMatrix::Type::Cell);
-    imageGeomDC->addAttributeMatrix(cellAttrMat->getName(), cellAttrMat);
+    imageGeomDC->addOrReplaceAttributeMatrix(cellAttrMat);
 
     // Create a cell attribute array
     FloatArrayType::Pointer f32Data = FloatArrayType::CreateArray(cellCount, k_FloatArrayName, true);
     f32Data->initializeWithValue(45.243f);
-    cellAttrMat->addAttributeArray(f32Data->getName(), f32Data);
+    cellAttrMat->insertOrAssign(f32Data);
 
     // Create a Feature AttributeMatrix with different dimensions
     dims[0] = 1;
     dims[1] = 2;
     dims[2] = 3;
     AttributeMatrix::Pointer featureAttrMat = AttributeMatrix::Create(dims, k_FeatureAttrMatName, AttributeMatrix::Type::CellFeature);
-    imageGeomDC->addAttributeMatrix(featureAttrMat->getName(), featureAttrMat);
+    imageGeomDC->addOrReplaceAttributeMatrix(featureAttrMat);
 
     // Create a feature attribute array
     cellCount = std::accumulate(dims.begin(), dims.end(), static_cast<size_t>(1), std::multiplies<size_t>());
     Int32ArrayType::Pointer i32Data = Int32ArrayType::CreateArray(cellCount, k_FeatureArrayName, true);
     i32Data->initializeWithValue(1);
-    featureAttrMat->addAttributeArray(i32Data->getName(), i32Data);
+    featureAttrMat->insertOrAssign(i32Data);
     return dca;
   }
 
@@ -149,8 +149,8 @@ class ExtractVertexGeometryTest
     // Empty VertexDataContainerName
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
-    extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerName);
-    extVertGeomFilter->setVertexDataContainerName(QString(""));
+    extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerPath);
+    extVertGeomFilter->setVertexDataContainerName(DataArrayPath("", "", ""));
     extVertGeomFilter->preflight();
     err = extVertGeomFilter->getErrorCondition();
     DREAM3D_REQUIRE_EQUAL(err, -2006)
@@ -158,7 +158,7 @@ class ExtractVertexGeometryTest
     // Set the Vertex Data Container to an existing DataContainer
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
-    extVertGeomFilter->setVertexDataContainerName(k_ImageGeomDataContainerName);
+    extVertGeomFilter->setVertexDataContainerName(k_ImageGeomDataContainerPath);
     extVertGeomFilter->preflight();
     err = extVertGeomFilter->getErrorCondition();
     DREAM3D_REQUIRE_EQUAL(err, -2007)
@@ -167,7 +167,7 @@ class ExtractVertexGeometryTest
     // Set a DataContainer that does not have a Geometry
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
-    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerName);
+    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
     extVertGeomFilter->setSelectedDataContainerName(k_BadDataContainerName);
     extVertGeomFilter->preflight();
     err = extVertGeomFilter->getErrorCondition();
@@ -177,7 +177,7 @@ class ExtractVertexGeometryTest
     // Set a DataContainer that does not have the proper geometry
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
-    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerName);
+    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
     extVertGeomFilter->setSelectedDataContainerName(k_WrongGeomDataContainerName);
     extVertGeomFilter->preflight();
     err = extVertGeomFilter->getErrorCondition();
@@ -186,8 +186,8 @@ class ExtractVertexGeometryTest
     // Set the Vertex Data Container to an existing DataContainer
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
-    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerName);
-    extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerName);
+    extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
+    extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerPath);
     // Set an incorrect AttributeMatrix/DataArray Path
     QVector<DataArrayPath> includePaths;
     DataArrayPath dap(k_ImageGeomDataContainerName, k_FeatureAttrMatName, k_FeatureArrayName);
@@ -253,12 +253,14 @@ class ExtractVertexGeometryTest
   }
 
 private:
+  const DataArrayPath k_ImageGeomDataContainerPath = DataArrayPath("ImageGeomDataContainer", "", "");
   const QString k_ImageGeomDataContainerName = QString("ImageGeomDataContainer");
   const QString k_CellAttrMatName = QString("CellData");
   const QString k_FloatArrayName = QString("FloatArray");
   const QString k_VertexDataContainerName = QString("VertexDataContainer");
-  const QString k_BadDataContainerName = QString("BadDataContainer");
-  const QString k_WrongGeomDataContainerName = QString("WrongGeomDataContainer");
+  const DataArrayPath k_VertexDataContainerPath = DataArrayPath("VertexDataContainer", "", "");
+  const DataArrayPath k_BadDataContainerName = DataArrayPath("BadDataContainer", "", "");
+  const DataArrayPath k_WrongGeomDataContainerName = DataArrayPath("WrongGeomDataContainer", "", "");
   const QString k_FeatureAttrMatName = QString("Feature Attr Mat");
   const QString k_FeatureArrayName = QString("featureData");
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index f8cc2bbc0c..1a2a5f4cae 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -43,12 +43,12 @@
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
 
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -275,8 +275,8 @@ class FeatureDataCSVWriterTest
 
       // The data array added last in code will be the first printed and first in daList
 
-      checkDataList<float>(am, daList[0]->getName(), tokens, i, 1);
-      checkDataList<int32_t>(am, daList[1]->getName(), tokens, i, 1 + daList[0]->getNumberOfComponents());
+      checkDataList<int32_t>(am, daList[0]->getName(), tokens, i, 1);
+      checkDataList<float>(am, daList[1]->getName(), tokens, i, 1 + daList[0]->getNumberOfComponents());
     }
 
     if(writeNeighborListData)
@@ -391,18 +391,18 @@ class FeatureDataCSVWriterTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create Image Geometry
 
     ImageGeom::Pointer ig = ImageGeom::New();
-    ig->setDimensions(xDim, yDim, zDim);
+    ig->setDimensions(SizeVec3Type(xDim, yDim, zDim));
     dc->setGeometry(ig);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer am = AttributeMatrix::New(tupleDims, k_AttributeMatrixName, AttributeMatrix::Type::CellFeature);
-    dc->addAttributeMatrix(k_AttributeMatrixName, am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     // Create DataArrayInt (add in under checkFilter)
 
@@ -411,7 +411,7 @@ class FeatureDataCSVWriterTest
     {
       da->setValue(i, i);
     }
-    am->addAttributeArray(k_DataArrayIntName, da);
+    am->insertOrAssign(da);
 
     // Create DataArrayFloat
 
@@ -427,7 +427,7 @@ class FeatureDataCSVWriterTest
         daFloat->setValue(i, static_cast<float>(i) * -0.1);
       }
     }
-    am->addAttributeArray(k_DataArrayFloatName, daFloat);
+    am->insertOrAssign(daFloat);
 
     // Create NeighborLists (must be int32_t)
 
@@ -437,7 +437,7 @@ class FeatureDataCSVWriterTest
       nl->addEntry(i, i);
       nl->addEntry(i, i * 2);
     }
-    am->addAttributeArray(k_NeighborListName, nl);
+    am->insertOrAssign(nl);
 
     NeighborList<int32_t>::Pointer nl2 = NeighborList<int32_t>::CreateArray(tupleDims, cDimsNeighbor, k_NeighborListName2);
     for(size_t i = 0; i < nl2->getNumberOfTuples(); i++)
@@ -446,7 +446,7 @@ class FeatureDataCSVWriterTest
       nl2->addEntry(i, i);
       nl2->addEntry(i, i + 1);
     }
-    am->addAttributeArray(k_NeighborListName2, nl2);
+    am->insertOrAssign(nl2);
 
     // Create Filter
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index d37a5c5073..16a4207152 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -63,7 +63,7 @@
 #define FDTEST_CREATE_DATA_CONTAINER(name, geom, dca)                                                                                                                                                  \
   DataContainer::Pointer _##geom##Container = DataContainer::New(#name);                                                                                                                               \
   _##geom##Container->setGeometry(geom);                                                                                                                                                               \
-  dca->addDataContainer(_##geom##Container);
+  dca->addOrReplaceDataContainer(_##geom##Container);
 
 #define FDTEST_SET_PROPERTIES_AND_CHECK_EQ(filter, dc, path, derivsName, data)                                                                                                                         \
   var.setValue(path);                                                                                                                                                                                  \
@@ -123,43 +123,41 @@ class FindDerivativesFilterTest
   // -----------------------------------------------------------------------------
   void initializeDataArrays(DataContainer::Pointer m, QVector<size_t> cDims)
   {
-    QMap<QString, AttributeMatrix::Pointer> attrMats = m->getAttributeMatrices();
-    QMap<QString, AttributeMatrix::Pointer>::Iterator it;
-    for(it = attrMats.begin(); it != attrMats.end(); ++it)
+    for(auto& am : m->getChildren())
     {
-      DoubleArrayType::Pointer dblArray = DoubleArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_D");
+      DoubleArrayType::Pointer dblArray = DoubleArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_D");
       dblArray->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_D", dblArray);
-      FloatArrayType::Pointer fltArray = FloatArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_F");
+      am->insertOrAssign(dblArray);
+      FloatArrayType::Pointer fltArray = FloatArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_F");
       fltArray->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_F", fltArray);
-      Int8ArrayType::Pointer int8Array = Int8ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_I8");
+      am->insertOrAssign(fltArray);
+      Int8ArrayType::Pointer int8Array = Int8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I8");
       int8Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_I8", int8Array);
-      UInt8ArrayType::Pointer uint8Array = UInt8ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_UI8");
+      am->insertOrAssign(int8Array);
+      UInt8ArrayType::Pointer uint8Array = UInt8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI8");
       uint8Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_UI8", uint8Array);
-      Int16ArrayType::Pointer int16Array = Int16ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_I16");
+      am->insertOrAssign(uint8Array);
+      Int16ArrayType::Pointer int16Array = Int16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I16");
       int16Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_I16", int16Array);
-      UInt16ArrayType::Pointer uint16Array = UInt16ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_UI16");
+      am->insertOrAssign(int16Array);
+      UInt16ArrayType::Pointer uint16Array = UInt16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI16");
       uint16Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_UI16", uint16Array);
-      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_I32");
+      am->insertOrAssign(uint16Array);
+      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I32");
       int32Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_I32", int32Array);
-      UInt32ArrayType::Pointer uint32Array = UInt32ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_UI32");
+      am->insertOrAssign(int32Array);
+      UInt32ArrayType::Pointer uint32Array = UInt32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI32");
       uint32Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_UI32", uint32Array);
-      Int64ArrayType::Pointer int64Array = Int64ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_I64");
+      am->insertOrAssign(uint32Array);
+      Int64ArrayType::Pointer int64Array = Int64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I64");
       int64Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_I64", int64Array);
-      UInt64ArrayType::Pointer uint64Array = UInt64ArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_UI64");
+      am->insertOrAssign(int64Array);
+      UInt64ArrayType::Pointer uint64Array = UInt64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI64");
       uint64Array->initializeWithValue(5);
-      (*it)->addAttributeArray("TEST_UI64", uint64Array);
-      BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray((*it)->getTupleDimensions(), cDims, "TEST_BOOL");
+      am->insertOrAssign(uint64Array);
+      BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_BOOL");
       boolArray->initializeWithZeros();
-      (*it)->addAttributeArray("TEST_BOOL", boolArray);
+      am->insertOrAssign(boolArray);
     }
   }
 
@@ -171,16 +169,16 @@ class FindDerivativesFilterTest
     AttributeMatrix::Pointer attrMat;
     QString ss = QObject::tr("AttrMatType%1").arg(0);
     attrMat = AttributeMatrix::New(tDimsVert, ss, AttributeMatrix::Type::Vertex);
-    m->addAttributeMatrix(ss, attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
     ss = QObject::tr("AttrMatType%1").arg(1);
     attrMat = AttributeMatrix::New(tDimsVert, ss, AttributeMatrix::Type::Edge);
-    m->addAttributeMatrix(ss, attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
     ss = QObject::tr("AttrMatType%1").arg(2);
     attrMat = AttributeMatrix::New(tDimsVert, ss, AttributeMatrix::Type::Face);
-    m->addAttributeMatrix(ss, attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
     ss = QObject::tr("AttrMatType%1").arg(3);
     attrMat = AttributeMatrix::New(tDimsCell, ss, AttributeMatrix::Type::Cell);
-    m->addAttributeMatrix(ss, attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
   }
 
   // -----------------------------------------------------------------------------
@@ -207,7 +205,7 @@ class FindDerivativesFilterTest
 
     image->setDimensions(std::make_tuple(10, 10, 10));
     image->setOrigin(std::make_tuple(0.0f, 0.0f, 0.0f));
-    image->setResolution(std::make_tuple(1.0f, 1.0f, 1.0f));
+    image->setSpacing(std::make_tuple(1.0f, 1.0f, 1.0f));
     rectGrid->setDimensions(std::make_tuple(10, 10, 10));
     FloatArrayType::Pointer xBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::xBoundsList);
     FloatArrayType::Pointer yBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::yBoundsList);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 0c136ef658..bf4666147f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -208,8 +208,8 @@ class GenerateColorTableTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New(SIMPL::Defaults::ImageDataContainerName);
     AttributeMatrix::Pointer am = AttributeMatrix::New(QVector<size_t>(1, 37989), SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(SIMPL::Defaults::CellAttributeMatrixName, am);
-    dca->addDataContainer(dc);
+    dc->addOrReplaceAttributeMatrix(am);
+    dca->addOrReplaceDataContainer(dc);
 
     // Read Image File
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
index 7ac14f387f..a15fcc9318 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
@@ -61,15 +61,15 @@ class ImportAsciDataArrayTest
     DataContainer::Pointer dc = DataContainer::New("ImageDataContainer");
 
     ImageGeom::Pointer imageGeom = ImageGeom::New();
-    imageGeom->setDimensions(m_XDim, m_YDim, m_ZDim);
+    imageGeom->setDimensions(SizeVec3Type(m_XDim, m_YDim, m_ZDim));
 
     dc->setGeometry(imageGeom);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> tDims = {m_XDim, m_YDim, m_ZDim};
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Generic);
 
-    dc->addAttributeMatrix(attrMat->getName(), attrMat);
+    dc->addOrReplaceAttributeMatrix(attrMat);
 
     FilterManager* fm = FilterManager::Instance();
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index aecf6c5f07..3585281002 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -331,10 +331,10 @@ class ImportHDF5DatasetTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(attrMat->getName(), attrMat);
+    dc->addOrReplaceAttributeMatrix(attrMat);
 
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 3ef6e55676..781082d443 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -240,7 +240,7 @@ class MoveDataTest
 
     if(whatToMove == 0) // Move AttributeMatrix
     {
-      var.setValue(dapDst.getDataContainerName());
+      var.setValue(dapDst);
       propWasSet = moveData->setProperty("DataContainerDestination", var);
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -387,26 +387,26 @@ class MoveDataTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     DataContainer::Pointer dcDst = DataContainer::New(k_DataContainerDstName);
-    dca->addDataContainer(dcDst);
+    dca->addOrReplaceDataContainer(dcDst);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer amSrc = AttributeMatrix::New(tupleDims, k_AttributeMatrixSrcName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixSrcName, amSrc);
+    dc->addOrReplaceAttributeMatrix(amSrc);
 
     AttributeMatrix::Pointer amDst = AttributeMatrix::New(tupleDims, k_AttributeMatrixDstName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixDstName, amDst);
+    dc->addOrReplaceAttributeMatrix(amDst);
 
     AttributeMatrix::Pointer amBadDst = AttributeMatrix::New(badTupleDims, k_AttributeMatrixBadDstName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixBadDstName, amBadDst);
+    dc->addOrReplaceAttributeMatrix(amBadDst);
 
     // Create DataArray
 
     IDataArray::Pointer daSrc = createDataArray<int8_t>(k_DataArraySrcName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_DataArraySrcName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     // Run test cases
 
@@ -425,7 +425,7 @@ class MoveDataTest
 
     dcaTest = dca->deepCopy();
 
-    dcaTest->getDataContainer(k_DataContainerDstName)->addAttributeMatrix(k_AttributeMatrixDstName, dcaTest->getDataContainer(k_DataContainerName)->removeAttributeMatrix(k_AttributeMatrixDstName));
+    dcaTest->getDataContainer(k_DataContainerDstName)->addOrReplaceAttributeMatrix(dcaTest->getDataContainer(k_DataContainerName)->removeAttributeMatrix(k_AttributeMatrixDstName));
 
     src = DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_DataArraySrcName);
     dst = DataArrayPath(k_DataContainerDstName, k_AttributeMatrixDstName, "");
@@ -454,7 +454,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<uint8_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -464,7 +464,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<int16_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -474,7 +474,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<uint16_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -484,7 +484,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<int32_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -494,7 +494,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<uint32_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -504,7 +504,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<uint32_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -514,7 +514,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<uint64_t>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -524,7 +524,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<float>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
 
@@ -534,7 +534,7 @@ class MoveDataTest
 
     dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->removeAttributeArray(k_DataArraySrcName);
     daSrc = createDataArray<double>(k_DataArraySrcName, tupleDims, cDims);
-    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->addAttributeArray(k_DataArraySrcName, daSrc);
+    dcaTest->getDataContainer(k_DataContainerName)->getAttributeMatrix(k_AttributeMatrixSrcName)->insertOrAssign(daSrc);
 
     TestCase(dcaTest, src, dst, 1, 0);
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index 7e5b76aacb..07ad7a2ad5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -241,7 +241,7 @@ class MoveMultiDataTest
 
     if(whatToMove == 0) // Move AttributeMatrix
     {
-      var.setValue(dapDst.getDataContainerName());
+      var.setValue(dapDst);
       propWasSet = moveMultiData->setProperty("DataContainerDestination", var);
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
@@ -411,53 +411,53 @@ class MoveMultiDataTest
     // Create DataContainer
 
     DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     DataContainer::Pointer dcDst = DataContainer::New(k_DataContainerDstName);
-    dca->addDataContainer(dcDst);
+    dca->addOrReplaceDataContainer(dcDst);
 
     // Create AttributeMatrix
 
     AttributeMatrix::Pointer amSrc = AttributeMatrix::New(tupleDims, k_AttributeMatrixSrcName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixSrcName, amSrc);
+    dc->addOrReplaceAttributeMatrix(amSrc);
 
     AttributeMatrix::Pointer amDst = AttributeMatrix::New(tupleDims, k_AttributeMatrixDstName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixDstName, amDst);
+    dc->addOrReplaceAttributeMatrix(amDst);
 
     AttributeMatrix::Pointer amBadDst = AttributeMatrix::New(badTupleDims, k_AttributeMatrixBadDstName, AttributeMatrix::Type::Generic);
-    dc->addAttributeMatrix(k_AttributeMatrixBadDstName, amBadDst);
+    dc->addOrReplaceAttributeMatrix(amBadDst);
 
     // Create DataArray
 
     IDataArray::Pointer daSrc = createDataArray<uint8_t>(k_uint8ArrayName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_uint8ArrayName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     daSrc = createDataArray<int8_t>(k_int8ArrayName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_int8ArrayName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     daSrc = createDataArray<uint16_t>(k_uint16ArrayName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_uint16ArrayName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     daSrc = createDataArray<int16_t>(k_int16ArrayName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_int16ArrayName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     daSrc = createDataArray<uint32_t>(k_uint32ArrayName, tupleDims, cDims);
-    amSrc->addAttributeArray(k_uint32ArrayName, daSrc);
+    amSrc->insertOrAssign(daSrc);
 
     daSrc = createDataArray<int32_t>(k_int32ArrayName, tupleDims, cDims);
-    amDst->addAttributeArray(k_int32ArrayName, daSrc);
+    amDst->insertOrAssign(daSrc);
 
     daSrc = createDataArray<uint64_t>(k_uint64ArrayName, tupleDims, cDims);
-    amDst->addAttributeArray(k_uint64ArrayName, daSrc);
+    amDst->insertOrAssign(daSrc);
 
     daSrc = createDataArray<int64_t>(k_int64ArrayName, tupleDims, cDims);
-    amDst->addAttributeArray(k_int64ArrayName, daSrc);
+    amDst->insertOrAssign(daSrc);
 
     daSrc = createDataArray<float>(k_floatArrayName, tupleDims, cDims);
-    amDst->addAttributeArray(k_floatArrayName, daSrc);
+    amDst->insertOrAssign(daSrc);
 
     daSrc = createDataArray<double>(k_doubleArrayName, tupleDims, cDims);
-    amDst->addAttributeArray(k_doubleArrayName, daSrc);
+    amDst->insertOrAssign(daSrc);
 
     // Run test cases
 
@@ -505,7 +505,7 @@ class MoveMultiDataTest
 
     dcaTest = dca->deepCopy();
 
-    dcaTest->getDataContainer(k_DataContainerDstName)->addAttributeMatrix(k_AttributeMatrixDstName, dcaTest->getDataContainer(k_DataContainerName)->removeAttributeMatrix(k_AttributeMatrixDstName));
+    dcaTest->getDataContainer(k_DataContainerDstName)->addOrReplaceAttributeMatrix(dcaTest->getDataContainer(k_DataContainerName)->removeAttributeMatrix(k_AttributeMatrixDstName));
 
     sources = { DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint8ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int8ArrayName),
            DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint16ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int16ArrayName),
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index f2f07db745..ef7be6318c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -109,10 +109,10 @@ class MultiThresholdObjects2Test
       datai->setValue(i, inum); // int array
       inum += 1;
     }
-    am->addAttributeArray(dataf->getName(), dataf); // float array
-    am->addAttributeArray(datai->getName(), datai); // int array
-    vdc->addAttributeMatrix(am->getName(), am);
-    dca->addDataContainer(vdc);
+    am->insertOrAssign(dataf); // float array
+    am->insertOrAssign(datai); // int array
+    vdc->addOrReplaceAttributeMatrix(am);
+    dca->addOrReplaceDataContainer(vdc);
 
     // Now instantiate the MultiThresholdObjects2Test Filter from the FilterManager
     QString filtName = "MultiThresholdObjects2";
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 116cf43a5f..b34cd03e5a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -107,10 +107,10 @@ class MultiThresholdObjectsTest
       data1->setValue(i, inum); // int array
       inum += 1;
     }
-    am->addAttributeArray(data->getName(), data);   // float array
-    am->addAttributeArray(data1->getName(), data1); // int array
-    vdc->addAttributeMatrix(am->getName(), am);
-    dca->addDataContainer(vdc);
+    am->insertOrAssign(data);  // float array
+    am->insertOrAssign(data1); // int array
+    vdc->addOrReplaceAttributeMatrix(am);
+    dca->addOrReplaceDataContainer(vdc);
 
     // Now instantiate the MultiThresholdObjectsTest Filter from the FilterManager
     QString filtName = "MultiThresholdObjects";
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 637a91216a..b82aad4428 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -207,7 +207,7 @@ class RawBinaryReaderTest
     // filt->setOrigin(origin);
     // FloatVec3Widget_t spacing;
     // spacing.x = spacing.y = spacing.z = 0.55f;
-    // filt->setResolution(spacing);
+    // filt->setSpacing(spacing);
     filt->setCreatedAttributeArrayPath(DataArrayPath("DataContainer", "AttributeMatrix", "Test_Array"));
 
     return filt;
@@ -250,9 +250,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
@@ -355,9 +355,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
@@ -455,9 +455,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
@@ -565,9 +565,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
@@ -601,9 +601,9 @@ class RawBinaryReaderTest
 
     // Create another data container
     DataContainer::Pointer m2 = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m2->addAttributeMatrix("AttributeMatrix", am);
+    m2->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca2 = DataContainerArray::New();
-    dca2->addDataContainer(m2);
+    dca2->addOrReplaceDataContainer(m2);
 
     // Create another filter, passing in the skipHeaderBytes + 1
     RawBinaryReader::Pointer filt2 = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes + 1);
@@ -703,9 +703,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
@@ -813,9 +813,9 @@ class RawBinaryReaderTest
 
     // Create the data container
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    m->addAttributeMatrix("AttributeMatrix", am);
+    m->addOrReplaceAttributeMatrix(am);
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     // Create the filter, passing in the skipHeaderBytes
     RawBinaryReader::Pointer filt = createRawBinaryReaderFilter(scalarType, N, skipHeaderBytes);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 540ca7483f..4f5dd38575 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -135,8 +135,8 @@ class ReadASCIIDataTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New(DataContainerName);
     AttributeMatrix::Pointer am = AttributeMatrix::New(QVector<size_t>(1, data.numberOfLines), AttributeMatrixName, AttributeMatrix::Type::Cell);
-    dc->addAttributeMatrix(AttributeMatrixName, am);
-    dca->addDataContainer(dc);
+    dc->addOrReplaceAttributeMatrix(am);
+    dca->addOrReplaceDataContainer(dc);
 
     // Now instantiate the DxWriter Filter from the FilterManager
     QString filtName = "ReadASCIIData";
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index 3ba1de82ea..3ea5d0f7e0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -81,14 +81,14 @@ class RemoveArraysTest
     sizeList.push_back(1);
 
     AttributeMatrix::Pointer am = AttributeMatrix::New(sizeList, "AttributeMatrix", AttributeMatrix::Type::Any);
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     FilterManager* fm = FilterManager::Instance();
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index 93537fa767..f5fd950c39 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -171,9 +171,9 @@ class RemoveComponentFromArrayTest
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
     AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(QVector<size_t>(1, numTuples), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
-    m->addAttributeMatrix(SIMPL::Defaults::AttributeMatrixName, attrMatrix);
+    m->addOrReplaceAttributeMatrix(attrMatrix);
     return dca;
   }
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index cc8ec233ba..54d4abba3c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -91,12 +91,12 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     filter->setDataContainerArray(dca);
 
@@ -126,15 +126,15 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
 
@@ -164,15 +164,15 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
 
@@ -204,15 +204,15 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
 
@@ -242,15 +242,15 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
 
@@ -279,17 +279,17 @@ class RenameAttributeArrayTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
-    am->addAttributeArray("DataArray", da);
+    am->insertOrAssign(da);
     DataArray<int>::Pointer da2 = DataArray<int>::CreateArray(1, "DataArray_2");
-    am->addAttributeArray("DataArray_2", da2);
+    am->insertOrAssign(da2);
 
     filter->setDataContainerArray(dca);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 43195c0a70..e7e1b75c6d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -91,7 +91,7 @@ class RenameAttributeMatrixTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     filter->setDataContainerArray(dca);
 
@@ -121,12 +121,12 @@ class RenameAttributeMatrixTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     filter->setDataContainerArray(dca);
 
@@ -156,12 +156,12 @@ class RenameAttributeMatrixTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     filter->setDataContainerArray(dca);
 
@@ -193,12 +193,12 @@ class RenameAttributeMatrixTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     filter->setDataContainerArray(dca);
 
@@ -228,12 +228,12 @@ class RenameAttributeMatrixTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<size_t> dims = QVector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
-    dc->addAttributeMatrix("AttributeMatrix", am);
+    dc->addOrReplaceAttributeMatrix(am);
 
     filter->setDataContainerArray(dca);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 56528a46e7..440ab2664d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -93,11 +93,11 @@ class RenameDataContainerTest
 
     QVariant value;
 
-    QString dataContainerName = "DataContainer";
+    DataArrayPath dataContainerName("DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    QString newDataContainerName = "DataContainer_";
+    DataArrayPath newDataContainerName("DataContainer_");
     value.setValue(dataContainerName);
     filter->setProperty("NewDataContainerName", value);
 
@@ -117,17 +117,17 @@ class RenameDataContainerTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     filter->setDataContainerArray(dca);
 
     QVariant value;
 
-    QString dataContainerName = "";
+    DataArrayPath dataContainerName;
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    QString newDataContainerName = "DataContainer_";
+    DataArrayPath newDataContainerName("DataContainer_");
     value.setValue(dataContainerName);
     filter->setProperty("NewDataContainerName", value);
 
@@ -147,24 +147,26 @@ class RenameDataContainerTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     filter->setDataContainerArray(dca);
 
     QVariant value;
 
-    QString dataContainerName = "DataContainer";
+    DataArrayPath dataContainerName ("DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    QString newDataContainerName = "Container_2";
+    DataArrayPath newDataContainerName ("Container_2");
     value.setValue(newDataContainerName);
     filter->setProperty("NewDataContainerName", value);
 
     filter->execute();
     DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
 
-    DREAM3D_REQUIRE_EQUAL(dc->getName(), newDataContainerName);
+    DataArrayPath dap(dc->getName());
+
+    DREAM3D_REQUIRE_EQUAL(dap, newDataContainerName);
   }
 
   // -----------------------------------------------------------------------------
@@ -179,17 +181,17 @@ class RenameDataContainerTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     filter->setDataContainerArray(dca);
 
     QVariant value;
 
-    QString dataContainerName = "DataContainer";
+    DataArrayPath dataContainerName ( "DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    QString newDataContainerName = "";
+    DataArrayPath newDataContainerName;
     value.setValue(newDataContainerName);
     filter->setProperty("NewDataContainerName", value);
 
@@ -209,17 +211,17 @@ class RenameDataContainerTest
 
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-    dca->addDataContainer(dc);
+    dca->addOrReplaceDataContainer(dc);
 
     filter->setDataContainerArray(dca);
 
     QVariant value;
 
-    QString dataContainerName = "DataContainer";
+    DataArrayPath dataContainerName("DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    QString newDataContainerName = "";
+    DataArrayPath newDataContainerName;
     value.setValue(newDataContainerName);
 
     filter->execute();
@@ -245,4 +247,4 @@ class RenameDataContainerTest
 private:
   RenameDataContainerTest(const RenameDataContainerTest&); // Copy Constructor Not Implemented
   void operator=(const RenameDataContainerTest&);          // Move assignment Not Implemented
-};
\ No newline at end of file
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
new file mode 100644
index 0000000000..d75a2c8f15
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -0,0 +1,156 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <ctime>
+#include <chrono>
+#include <iostream>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+#include "SIMPLib/CoreFilters/RenameDataContainer.h"
+
+class RenameTimingTest
+{
+public:
+  RenameTimingTest() = default;
+  virtual ~RenameTimingTest() = default;
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  AbstractFilter::Pointer createFilter()
+  {
+    // Now instantiate the RenameAttributeArray Filter from the FilterManager
+    QString filtName = "MassCreateData";
+    FilterManager* fm = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
+    if(nullptr == filterFactory.get())
+    {
+      std::stringstream ss;
+      ss << "The RenameTimingTest Requires the use of the " << filtName.toStdString() << " filter which is found in Core Filters";
+      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
+    }
+
+    AbstractFilter::Pointer filter = filterFactory->create();
+    DREAM3D_REQUIRE(nullptr != filter.get());
+
+    return filter;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  FilterPipeline::Pointer createPipeline()
+  {
+    const int iterations = 2;
+    FilterPipeline::Pointer pipeline = FilterPipeline::New();
+    for(int i = 0; i < iterations; i++)
+    {
+      AbstractFilter::Pointer filter = createFilter();
+
+      QVariant value;
+      QString dataContainerName = "DataContainer_" + QString::number(i);
+      value.setValue(dataContainerName);
+      filter->setProperty("DataContainerName", value);
+      pipeline->pushBack(filter);
+    }
+    return pipeline;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestPreflightTimes()
+  {
+    //const int iterations = 1;
+    FilterPipeline::Pointer pipeline = createPipeline();
+
+    {
+      auto start = std::chrono::steady_clock::now();
+      pipeline->preflightPipeline();
+      auto end = std::chrono::steady_clock::now();
+
+      auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
+      std::cout << "\tFirst Preflight Duration: " << elapsed.count() << " milliseconds" << std::endl;
+    }
+
+    QVariant value;
+    value.setValue(QString("NewName"));
+    AbstractFilter::Pointer filter = pipeline->getFilterContainer().front();
+    filter->setProperty("DataContainerName", value);    
+
+    {
+      auto start = std::chrono::steady_clock::now();
+      //for(int i = 0; i < iterations; i++)
+      {
+        pipeline->preflightPipeline();
+      }
+      auto end = std::chrono::steady_clock::now();
+
+      auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
+      std::cout << "\tSecond Preflight Duration: " << elapsed.count() << " milliseconds" << std::endl;
+    }
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    std::cout << "#### RenameTimingTest Starting ####" << std::endl;
+
+    int err = EXIT_SUCCESS;
+
+    DREAM3D_REGISTER_TEST(TestPreflightTimes());
+  }
+
+private:
+  RenameTimingTest(const RenameTimingTest&); // Copy Constructor Not Implemented
+  void operator=(const RenameTimingTest&);          // Move assignment Not Implemented
+};
\ No newline at end of file
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 353d70988f..1285f5d5c1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -54,7 +54,7 @@
 
 #define CREATE_DATA_ARRAY(type, attrMat, tDims, cDims, initVal, comps, err)                                                                                                                            \
   DataArray<type>::Pointer _##type##_##comps##_##attrMat##Array = DataArray<type>::CreateArray(tDims, cDims, #type #comps, true);                                                                      \
-  err = attrMat->addAttributeArray(#type #comps, _##type##_##comps##_##attrMat##Array);                                                                                                                \
+  err = attrMat->insertOrAssign(_##type##_##comps##_##attrMat##Array);                                                                                                                                 \
   _##type##_##comps##_##attrMat##Array->initializeWithValue(initVal);                                                                                                                                  \
   DREAM3D_REQUIRE(err >= 0);
 
@@ -154,9 +154,9 @@ class ReplaceValueTest
     QVector<size_t> tDims(1, 100);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "ReplaceValueAttrMat", AttributeMatrix::Type::Cell);
 
-    m->addAttributeMatrix("ReplaceValueAttrMat", attrMat);
+    m->addOrReplaceAttributeMatrix(attrMat);
 
-    dca->addDataContainer(m);
+    dca->addOrReplaceDataContainer(m);
 
     QVector<size_t> cDims(1, 3);
     int32_t initVal = 10;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index 9bfd6668ac..a52bb7ca29 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -67,10 +67,10 @@ class RequiredZThicknessTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     DataContainer::Pointer dc1 = DataContainer::New("DataContainer1");
-    dca->addDataContainer(dc1);
+    dca->addOrReplaceDataContainer(dc1);
 
     DataContainer::Pointer dc2 = DataContainer::New("DataContainer2");
-    dca->addDataContainer(dc2);
+    dca->addOrReplaceDataContainer(dc2);
 
     ImageGeom::Pointer imgGeom = ImageGeom::New();
     imgGeom->setDimensions(2, 2, 2);
@@ -143,7 +143,7 @@ class RequiredZThicknessTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer1"));
+    value.setValue(DataArrayPath("DataContainer1"));
     filter->setProperty("DataContainerSelection", value);
 
     value.setValue(numZVoxels);
@@ -162,7 +162,7 @@ class RequiredZThicknessTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer2"));
+    value.setValue(DataArrayPath("DataContainer2"));
     filter->setProperty("DataContainerSelection", value);
 
     value.setValue(numZVoxels);
@@ -181,7 +181,7 @@ class RequiredZThicknessTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer3"));
+    value.setValue(DataArrayPath("DataContainer3"));
     filter->setProperty("DataContainerSelection", value);
 
     value.setValue(0);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index 4c9be1f05a..5b2a319bb9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -55,7 +55,7 @@
 
 namespace ScaleVolumeTestConsts
 {
-const FloatVec3_t SCALE = FloatVec3_t{3, 3, 3};
+const FloatVec3Type SCALE = FloatVec3Type{3, 3, 3};
 }
 
 class ScaleVolumeTest
@@ -72,16 +72,16 @@ class ScaleVolumeTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     DataContainer::Pointer dc1 = DataContainer::New("DataContainer1");
-    dca->addDataContainer(dc1);
+    dca->addOrReplaceDataContainer(dc1);
 
     DataContainer::Pointer dc2 = DataContainer::New("DataContainer2");
-    dca->addDataContainer(dc2);
+    dca->addOrReplaceDataContainer(dc2);
 
     DataContainer::Pointer dc3 = DataContainer::New("DataContainer3");
-    dca->addDataContainer(dc3);
+    dca->addOrReplaceDataContainer(dc3);
 
     DataContainer::Pointer dc4 = DataContainer::New("DataContainer4");
-    dca->addDataContainer(dc4);
+    dca->addOrReplaceDataContainer(dc4);
 
     ImageGeom::Pointer imgGeom = ImageGeom::New();
     imgGeom->setDimensions(2, 2, 2);
@@ -154,19 +154,24 @@ class ScaleVolumeTest
     QVariant value;
 
     value.setValue(imageGeometry);
-    filter->setProperty("ApplyToVoxelVolume", value);
+    bool propWasSet = filter->setProperty("ApplyToVoxelVolume", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(surfaceGeometry);
-    filter->setProperty("ApplyToSurfaceMesh", value);
+    propWasSet = filter->setProperty("ApplyToSurfaceMesh", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(ScaleVolumeTestConsts::SCALE);
-    filter->setProperty("ScaleFactor", value);
+    propWasSet = filter->setProperty("ScaleFactor", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer1"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer1"));
+    propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer2"));
-    filter->setProperty("SurfaceDataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer2"));
+    propWasSet = filter->setProperty("SurfaceDataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -182,19 +187,24 @@ class ScaleVolumeTest
     QVariant value;
 
     value.setValue(imageGeometry);
-    filter->setProperty("ApplyToVoxelVolume", value);
+    bool propWasSet = filter->setProperty("ApplyToVoxelVolume", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(surfaceGeometry);
-    filter->setProperty("ApplyToSurfaceMesh", value);
+    propWasSet = filter->setProperty("ApplyToSurfaceMesh", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(ScaleVolumeTestConsts::SCALE);
-    filter->setProperty("ScaleFactor", value);
+    propWasSet = filter->setProperty("ScaleFactor", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer2"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer2"));
+    propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer1"));
-    filter->setProperty("SurfaceDataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer1"));
+    propWasSet = filter->setProperty("SurfaceDataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -210,19 +220,24 @@ class ScaleVolumeTest
     QVariant value;
 
     value.setValue(imageGeometry);
-    filter->setProperty("ApplyToVoxelVolume", value);
+    bool propWasSet = filter->setProperty("ApplyToVoxelVolume", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(surfaceGeometry);
-    filter->setProperty("ApplyToSurfaceMesh", value);
+    propWasSet = filter->setProperty("ApplyToSurfaceMesh", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(ScaleVolumeTestConsts::SCALE);
-    filter->setProperty("ScaleFactor", value);
+    propWasSet = filter->setProperty("ScaleFactor", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer3"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer3"));
+    propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
-    value.setValue(QString("DataContainer4"));
-    filter->setProperty("SurfaceDataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer4"));
+    propWasSet = filter->setProperty("SurfaceDataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -243,14 +258,12 @@ class ScaleVolumeTest
 
     DREAM3D_REQUIRE(imgGeom != nullptr);
 
-    float xRes = 0.0f;
-    float yRes = 0.0f;
-    float zRes = 0.0f;
-    std::tie(xRes, yRes, zRes) = imgGeom->getResolution();
+    FloatVec3Type spacing;
+    imgGeom->getSpacing(spacing);
 
-    DREAM3D_REQUIRE_EQUAL(xRes, ScaleVolumeTestConsts::SCALE.x);
-    DREAM3D_REQUIRE_EQUAL(yRes, ScaleVolumeTestConsts::SCALE.y);
-    DREAM3D_REQUIRE_EQUAL(zRes, ScaleVolumeTestConsts::SCALE.z);
+    DREAM3D_REQUIRE_EQUAL(spacing[0], ScaleVolumeTestConsts::SCALE[0]);
+    DREAM3D_REQUIRE_EQUAL(spacing[1], ScaleVolumeTestConsts::SCALE[1]);
+    DREAM3D_REQUIRE_EQUAL(spacing[2], ScaleVolumeTestConsts::SCALE[2]);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 54fa25797c..e2f85be696 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -55,8 +55,8 @@
 
 namespace SetOriginResolutionImageGeometryTest
 {
-const FloatVec3_t ORIGIN = FloatVec3_t{1, 2, 3};
-const FloatVec3_t RESOLUTION = FloatVec3_t{4, 5, 6};
+const FloatVec3Type ORIGIN = FloatVec3Type{1, 2, 3};
+const FloatVec3Type RESOLUTION = FloatVec3Type{4, 5, 6};
 }
 
 class SetOriginResolutionImageGeomTest
@@ -73,13 +73,13 @@ class SetOriginResolutionImageGeomTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
     DataContainer::Pointer dc1 = DataContainer::New("DataContainer1");
-    dca->addDataContainer(dc1);
+    dca->addOrReplaceDataContainer(dc1);
 
     DataContainer::Pointer dc2 = DataContainer::New("DataContainer2");
-    dca->addDataContainer(dc2);
+    dca->addOrReplaceDataContainer(dc2);
 
     DataContainer::Pointer dc3 = DataContainer::New("DataContainer3");
-    dca->addDataContainer(dc3);
+    dca->addOrReplaceDataContainer(dc3);
 
     ImageGeom::Pointer imgGeom = ImageGeom::New();
     imgGeom->setDimensions(2, 2, 2);
@@ -152,8 +152,9 @@ class SetOriginResolutionImageGeomTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer1"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer1"));
+    bool propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -168,8 +169,9 @@ class SetOriginResolutionImageGeomTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer2"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer2"));
+    bool propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -184,8 +186,9 @@ class SetOriginResolutionImageGeomTest
 
     QVariant value;
 
-    value.setValue(QString("DataContainer3"));
-    filter->setProperty("DataContainerName", value);
+    value.setValue(DataArrayPath("DataContainer3"));
+    bool propWasSet = filter->setProperty("DataContainerName", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -201,10 +204,12 @@ class SetOriginResolutionImageGeomTest
     QVariant value;
 
     value.setValue(true);
-    filter->setProperty("ChangeOrigin", value);
+    bool propWasSet = filter->setProperty("ChangeOrigin", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(SetOriginResolutionImageGeometryTest::ORIGIN);
-    filter->setProperty("Origin", value);
+    propWasSet = filter->setProperty("Origin", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -220,10 +225,12 @@ class SetOriginResolutionImageGeomTest
     QVariant value;
 
     value.setValue(true);
-    filter->setProperty("ChangeResolution", value);
+    bool propWasSet = filter->setProperty("ChangeResolution", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     value.setValue(SetOriginResolutionImageGeometryTest::RESOLUTION);
-    filter->setProperty("Resolution", value);
+    propWasSet = filter->setProperty("Spacing", value);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
   }
 
   // -----------------------------------------------------------------------------
@@ -245,11 +252,11 @@ class SetOriginResolutionImageGeomTest
 
     DREAM3D_REQUIRE(imgGeom != nullptr);
 
-    float origin[3];
+    FloatVec3Type origin;
     imgGeom->getOrigin(origin);
-    DREAM3D_REQUIRE_EQUAL(origin[0], SetOriginResolutionImageGeometryTest::ORIGIN.x);
-    DREAM3D_REQUIRE_EQUAL(origin[1], SetOriginResolutionImageGeometryTest::ORIGIN.y);
-    DREAM3D_REQUIRE_EQUAL(origin[2], SetOriginResolutionImageGeometryTest::ORIGIN.z);
+    DREAM3D_REQUIRE_EQUAL(origin[0], SetOriginResolutionImageGeometryTest::ORIGIN[0]);
+    DREAM3D_REQUIRE_EQUAL(origin[1], SetOriginResolutionImageGeometryTest::ORIGIN[1]);
+    DREAM3D_REQUIRE_EQUAL(origin[2], SetOriginResolutionImageGeometryTest::ORIGIN[2]);
   }
 
   // -----------------------------------------------------------------------------
@@ -274,11 +281,11 @@ class SetOriginResolutionImageGeomTest
     float xRes = 0.0f;
     float yRes = 0.0f;
     float zRes = 0.0f;
-    std::tie(xRes, yRes, zRes) = imgGeom->getResolution();
+    std::tie(xRes, yRes, zRes) = imgGeom->getSpacing();
 
-    DREAM3D_REQUIRE_EQUAL(xRes, SetOriginResolutionImageGeometryTest::RESOLUTION.x);
-    DREAM3D_REQUIRE_EQUAL(yRes, SetOriginResolutionImageGeometryTest::RESOLUTION.y);
-    DREAM3D_REQUIRE_EQUAL(zRes, SetOriginResolutionImageGeometryTest::RESOLUTION.z);
+    DREAM3D_REQUIRE_EQUAL(xRes, SetOriginResolutionImageGeometryTest::RESOLUTION[0]);
+    DREAM3D_REQUIRE_EQUAL(yRes, SetOriginResolutionImageGeometryTest::RESOLUTION[1]);
+    DREAM3D_REQUIRE_EQUAL(zRes, SetOriginResolutionImageGeometryTest::RESOLUTION[2]);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index ff3ff7fc0b..e89c3c1aef 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -40,6 +40,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   RenameAttributeArrayTest
   RenameAttributeMatrixTest
   RenameDataContainerTest
+  RenameTimingTest
   ReplaceValueTest
   RequiredZThicknessTest
   ScaleVolumeTest
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index f3f8638d87..4a3628668c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -108,21 +108,21 @@ class SplitAttributeArrayTest
     SizeTArrayType::Pointer mcArray13 = SizeTArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array size_t");
     fillDataArray<size_t>(mcArray13);
 
-    am1->addAttributeArray("MultiComponent Array uint32_t", mcArray1);
-    am1->addAttributeArray("MultiComponent Array bool", mcArray2);
-    am1->addAttributeArray("MultiComponent Array unsigned char", mcArray3);
-    am1->addAttributeArray("MultiComponent Array int8_t", mcArray4);
-    am1->addAttributeArray("MultiComponent Array uint8_t", mcArray5);
-    am1->addAttributeArray("MultiComponent Array int16_t", mcArray6);
-    am1->addAttributeArray("MultiComponent Array uint16_t", mcArray7);
-    am1->addAttributeArray("MultiComponent Array int32_t", mcArray8);
-    am1->addAttributeArray("MultiComponent Array int64_t", mcArray9);
-    am1->addAttributeArray("MultiComponent Array uint64_t", mcArray10);
-    am1->addAttributeArray("MultiComponent Array float", mcArray11);
-    am1->addAttributeArray("MultiComponent Array double", mcArray12);
-    am1->addAttributeArray("MultiComponent Array size_t", mcArray13);
-    dc->addAttributeMatrix("AttributeMatrix", am1);
-    dca->addDataContainer(dc);
+    am1->insertOrAssign(mcArray1);
+    am1->insertOrAssign(mcArray2);
+    am1->insertOrAssign(mcArray3);
+    am1->insertOrAssign(mcArray4);
+    am1->insertOrAssign(mcArray5);
+    am1->insertOrAssign(mcArray6);
+    am1->insertOrAssign(mcArray7);
+    am1->insertOrAssign(mcArray8);
+    am1->insertOrAssign(mcArray9);
+    am1->insertOrAssign(mcArray10);
+    am1->insertOrAssign(mcArray11);
+    am1->insertOrAssign(mcArray12);
+    am1->insertOrAssign(mcArray13);
+    dc->addOrReplaceAttributeMatrix(am1);
+    dca->addOrReplaceDataContainer(dc);
 
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index e8f0b98c19..fd5d79bade 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -104,9 +104,9 @@ class WriteASCIIDataTest
     strArray->setValue(8, QString("Weird words"));
     strArray->setValue(9, QString("Sierra"));
 
-    am->addAttributeArray(strArray->getName(), strArray);
-    dc->addAttributeMatrix(am->getName(), am);
-    dca->addDataContainer(dc);
+    am->insertOrAssign(strArray);
+    dc->addOrReplaceAttributeMatrix(am);
+    dca->addOrReplaceDataContainer(dc);
 
     QVector<DataArrayPath> paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "ASCII_Data")};
     WriteASCIIData::Pointer writer = WriteASCIIData::New();
@@ -141,7 +141,7 @@ class WriteASCIIDataTest
     writer->setOutputStyle(WriteASCIIData::MultiFile);
 
     NeighborList<int32_t>::Pointer neighborList = NeighborList<int32_t>::CreateArray(k_ArraySize, "NeighborList", true);
-    am->addAttributeArray(neighborList->getName(), neighborList);
+    am->insertOrAssign(neighborList);
 
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "NeighborList")};
     writer->setSelectedDataArrayPaths(paths);
@@ -154,7 +154,7 @@ class WriteASCIIDataTest
     DREAM3D_REQUIRE(err < 0)
 
     StructArray<int32_t>::Pointer structArray = StructArray<int32_t>::CreateArray(k_ArraySize, "StructArray", true);
-    am->addAttributeArray(structArray->getName(), structArray);
+    am->insertOrAssign(structArray);
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StructArray")};
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
@@ -166,7 +166,7 @@ class WriteASCIIDataTest
     DREAM3D_REQUIRE(err < 0)
 
     StatsDataArray::Pointer statsDataArray = StatsDataArray::CreateArray(k_ArraySize, "StatsDataArray", true);
-    am->addAttributeArray(statsDataArray->getName(), statsDataArray);
+    am->insertOrAssign(statsDataArray);
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StatsDataArray")};
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 50ce965479..3285f3583d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -102,7 +102,7 @@ class WriteTriangleGeometryTest
   {
     // Names and Constants
 
-    static const QString k_DataContainerName("DataContainer");
+    static const DataArrayPath k_DataContainerPath("DataContainer", "", "");
     static const QString k_TriVertexListDAName("TriVertexList");
     static const QString k_TriListDAName("TriangleList");
 
@@ -116,8 +116,8 @@ class WriteTriangleGeometryTest
 
     // Create DataContainer
 
-    DataContainer::Pointer dc = DataContainer::New(k_DataContainerName);
-    dca->addDataContainer(dc);
+    DataContainer::Pointer dc = DataContainer::New(k_DataContainerPath);
+    dca->addOrReplaceDataContainer(dc);
 
     // Create Triangle Data Arrays
 
@@ -164,7 +164,7 @@ class WriteTriangleGeometryTest
 
     QVariant var;
 
-    var.setValue(k_DataContainerName);
+    var.setValue(k_DataContainerPath);
     bool propWasSet = writeTriangleGeometry->setProperty("DataContainerSelection", var);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index d10bc582bd..0a2e68254e 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -143,7 +143,7 @@ WriteASCIIData::~WriteASCIIData() = default;
 // -----------------------------------------------------------------------------
 void WriteASCIIData::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 40308ae403..b170e70972 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -70,7 +70,7 @@ WriteTriangleGeometry::~WriteTriangleGeometry() = default;
 // -----------------------------------------------------------------------------
 void WriteTriangleGeometry::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Nodes File", OutputNodesFile, FilterParameter::Parameter, WriteTriangleGeometry));
   parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Triangles File", OutputTrianglesFile, FilterParameter::Parameter, WriteTriangleGeometry));
@@ -89,7 +89,7 @@ void WriteTriangleGeometry::setupFilterParameters()
 void WriteTriangleGeometry::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
   reader->openFilterGroup(this, index);
-  setDataContainerSelection(reader->readString("DataContainerSelection", getDataContainerSelection()));
+  setDataContainerSelection(reader->readDataArrayPath("DataContainerSelection", getDataContainerSelection()));
   setOutputNodesFile(reader->readString("OutputNodesFile", getOutputNodesFile()));
   setOutputTrianglesFile(reader->readString("OutputTrianglesFile", getOutputTrianglesFile()));
   reader->closeFilterGroup();
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index d32ba83352..ef8f476226 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -57,7 +57,7 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+    PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
     PYB11_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
 
@@ -68,8 +68,8 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 
     ~WriteTriangleGeometry() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DataContainerSelection)
-    Q_PROPERTY(QString DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
 
     SIMPL_FILTER_PARAMETER(QString, OutputNodesFile)
     Q_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index 8c1b5b8d52..25fba1a526 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -79,7 +79,8 @@ class SIMPLib_EXPORT CalculatorItem
       TOO_MANY_ARGUMENTS = -4034,
       INVALID_SYMBOL = -4035,
       NO_PRECEDING_UNARY_OPERATOR = -4036,
-      InvalidOutputArrayType = -4037
+      InvalidOutputArrayType = -4037,
+      AttributeMatrixInsertionError = -4038
     };
 
     enum class WarningCode : EnumType
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 7edafb1532..8efb296a46 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -36,7 +36,12 @@
 #pragma once
 
 // STL Includes
+#include <cassert>
 #include <cstring>
+#include <functional>
+#include <iostream>
+#include <numeric>
+#include <string>
 #include <vector>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
@@ -76,7 +81,7 @@ template <typename T> class DataArray : public IDataArray
   SIMPL_TYPE_MACRO_SUPER(DataArray<T>, IDataArray)
   SIMPL_CLASS_VERSION(2)
 
-  DataArray(const DataArray&) = delete;            // Copy Constructor Not Implemented
+  DataArray(const DataArray&) = default;           // Copy Constructor Not Implemented
   DataArray(DataArray&&) = delete;                 // Move Constructor Not Implemented
   DataArray& operator=(const DataArray&) = delete; // Copy Assignment Not Implemented
   DataArray& operator=(DataArray&&) = delete;      // Move Assignment Not Implemented
@@ -568,18 +573,6 @@ template <typename T> class DataArray : public IDataArray
     return p;
   }
 
-  /**
-   * @brief Destructor
-   */
-  ~DataArray() override
-  {
-    // qDebug() << "~DataArrayTemplate '" << m_Name << "'" ;
-    if((nullptr != m_Array) && (true == m_OwnsData))
-    {
-      _deallocate();
-    }
-  }
-
   /**
    * @brief isAllocated
    * @return
@@ -598,24 +591,6 @@ template <typename T> class DataArray : public IDataArray
     m_InitValue = initValue;
   }
 
-  /**
-   * @brief Gives this array a human readable name
-   * @param name The name of this array
-   */
-  void setName(const QString& name) override
-  {
-    m_Name = name;
-  }
-
-  /**
-   * @brief Returns the human readable name of this array
-   * @return
-   */
-  QString getName() override
-  {
-    return m_Name;
-  }
-
   /**
    * @brief Makes this class responsible for freeing the memory
    */
@@ -642,7 +617,7 @@ template <typename T> class DataArray : public IDataArray
   {
     if((nullptr != m_Array) && (true == m_OwnsData))
     {
-      _deallocate();
+      deallocate();
     }
     m_Array = nullptr;
     m_OwnsData = true;
@@ -670,23 +645,6 @@ template <typename T> class DataArray : public IDataArray
     return 1;
   }
 
-  /**
-   * @brief Removes all elements from the array (which are destroyed), leaving the container with a size of 0.
-   */
-  virtual void clear()
-  {
-    if(nullptr != m_Array && true == m_OwnsData)
-    {
-      _deallocate();
-    }
-    m_Array = nullptr;
-    m_Size = 0;
-    m_OwnsData = true;
-    m_MaxId = 0;
-    m_IsAllocated = false;
-    m_NumTuples = 0;
-  }
-
   /**
    * @brief Sets all the values to zero.
    */
@@ -709,10 +667,7 @@ template <typename T> class DataArray : public IDataArray
     {
       return;
     }
-    for(size_t i = offset; i < m_Size; i++)
-    {
-      m_Array[i] = initValue;
-    }
+    std::for_each(begin() + offset, end(), [=](T& n) { n = initValue; });
   }
 
   /**
@@ -735,7 +690,7 @@ template <typename T> class DataArray : public IDataArray
     auto idxs_size = static_cast<size_t>(idxs.size());
     if(idxs_size >= getNumberOfTuples())
     {
-      resize(0);
+      resizeTuples(0);
       return 0;
     }
 
@@ -779,7 +734,7 @@ template <typename T> class DataArray : public IDataArray
     {
       T* currentSrc = m_Array + (j * m_NumComponents);
       std::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * m_NumComponents * sizeof(T));
-      _deallocate(); // We are done copying - delete the current m_Array
+      deallocate(); // We are done copying - delete the current m_Array
       m_Size = newSize;
       m_Array = newArray;
       m_OwnsData = true;
@@ -820,7 +775,7 @@ template <typename T> class DataArray : public IDataArray
     }
 
     // We are done copying - delete the current m_Array
-    _deallocate();
+    deallocate();
 
     // Allocation was successful.  Save it.
     m_Size = newSize;
@@ -888,7 +843,7 @@ template <typename T> class DataArray : public IDataArray
    */
   QVector<size_t> getComponentDimensions() override
   {
-    return m_CompDims;
+    return QVector<size_type>::fromStdVector(m_CompDims);
   }
 
   /**
@@ -1104,14 +1059,13 @@ template <typename T> class DataArray : public IDataArray
    * @param numTuples
    * @return
    */
-  int32_t resize(size_t numTuples) override
+  void resizeTuples(size_t numTuples) override
   {
-    int32_t check = resizeTotalElements(numTuples * m_NumComponents);
-    if(check > 0)
+    T* ptr = resizeAndExtend(numTuples * m_NumComponents);
+    if(nullptr != ptr)
     {
       m_NumTuples = numTuples;
     }
-    return check;
   }
 
   /**
@@ -1473,7 +1427,7 @@ template <typename T> class DataArray : public IDataArray
   {
     int err = 0;
 
-    resize(0);
+    resizeTuples(0);
     IDataArray::Pointer p = H5DataArrayReader::ReadIDataArray(parentId, getName());
     if(p.get() == nullptr)
     {
@@ -1484,9 +1438,9 @@ template <typename T> class DataArray : public IDataArray
     m_OwnsData = true;
     m_MaxId = (m_Size == 0) ? 0 : m_Size - 1;
     m_IsAllocated = true;
-    m_Name = p->getName();
+    setName(p->getName());
     m_NumTuples = p->getNumberOfTuples();
-    m_CompDims = p->getComponentDimensions();
+    m_CompDims = p->getComponentDimensions().toStdVector();
     m_NumComponents = p->getNumberOfComponents();
 
     // Tell the intermediate DataArray to release ownership of the data as we are going to be responsible
@@ -1525,17 +1479,510 @@ template <typename T> class DataArray : public IDataArray
     }
   }
 
+  //========================================= STL INTERFACE COMPATIBILITY =================================
+
+  using comp_dims_type = std::vector<size_t>;
+  using size_type = size_t;
+  using value_type = T;
+  using reference = T&;
+  using iterator_category = std::input_iterator_tag;
+  using pointer = T*;
+  using difference_type = value_type;
+
+  DataArray() = default;
   /**
-   * @brief operator []
-   * @param i
+   * @brief DataArray
+   * @param ntuples
+   * @param name
+   * @param allocate
+   */
+  DataArray(size_t ntuples, const std::string& name, bool allocate = true)
+  : IDataArray(QString::fromStdString(name))
+  {
+    m_NumComponents = 1;
+    if(allocate)
+    {
+      resizeTuples(ntuples);
+    }
+    else
+    {
+      m_Size = ntuples;
+      m_MaxId = (ntuples == 0) ? 0 : ntuples - 1;
+      m_NumTuples = ntuples;
+      m_NumComponents = 1;
+    }
+  }
+
+  /**
+   * @brief DataArray
+   * @param ntuples
+   * @param cdims
+   * @param name
+   * @param allocate
+   */
+  DataArray(size_t ntuples, comp_dims_type cdims, const std::string& name, bool allocate = true)
+  : IDataArray(QString::fromStdString(name))
+  , m_NumTuples(ntuples)
+  , m_CompDims(std::move(cdims))
+  {
+    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<T>());
+    m_InitValue = static_cast<T>(0);
+    if(allocate)
+    {
+      m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
+    }
+    else
+    {
+      m_Size = m_NumTuples * m_NumComponents;
+      m_MaxId = (m_Size == 0) ? 0 : m_Size - 1;
+    }
+  }
+
+  ~DataArray() override
+  {
+    clear();
+  }
+
+  //========================================= STL INTERFACE COMPATIBILITY =================================
+
+  class tuple_iterator
+  {
+  public:
+    using self_type = tuple_iterator;
+    using value_type = T;
+    using reference = T&;
+    using pointer = T*;
+    using difference_type = value_type;
+    using iterator_category = std::forward_iterator_tag;
+
+    tuple_iterator(pointer ptr, size_type numComps)
+    : ptr_(ptr)
+    , num_comps_(numComps)
+    {
+    }
+    self_type operator++()
+    {
+      ptr_ = ptr_ + num_comps_;
+      return *this;
+    } // PREFIX
+    self_type operator++(int junk)
+    {
+      self_type i = *this;
+      ptr_ = ptr_ + num_comps_;
+      return i;
+    } // POSTFIX
+    reference operator*()
+    {
+      return *ptr_;
+    }
+    pointer operator->()
+    {
+      return ptr_;
+    }
+    bool operator==(const self_type& rhs)
+    {
+      return ptr_ == rhs.ptr_;
+    }
+    bool operator!=(const self_type& rhs)
+    {
+      return ptr_ != rhs.ptr_;
+    }
+    reference comp_value(size_type comp)
+    {
+      return *(ptr_ + comp);
+    }
+
+  private:
+    pointer ptr_;
+    size_t num_comps_;
+  };
+
+  class const_tuple_iterator
+  {
+  public:
+    using self_type = const_tuple_iterator;
+    using value_type = T;
+    using reference = T&;
+    using pointer = T*;
+    using difference_type = value_type;
+    using iterator_category = std::forward_iterator_tag;
+
+    const_tuple_iterator(pointer ptr, size_type numComps)
+    : ptr_(ptr)
+    , num_comps_(numComps)
+    {
+    }
+    self_type operator++()
+    {
+      ptr_ = ptr_ + num_comps_;
+      return *this;
+    } // PREFIX
+    self_type operator++(int junk)
+    {
+      self_type i = *this;
+      ptr_ = ptr_ + num_comps_;
+      return i;
+    } // POSTFIX
+    const value_type& operator*()
+    {
+      return *ptr_;
+    }
+    const pointer operator->()
+    {
+      return ptr_;
+    }
+    bool operator==(const self_type& rhs)
+    {
+      return ptr_ == rhs.ptr_;
+    }
+    bool operator!=(const self_type& rhs)
+    {
+      return ptr_ != rhs.ptr_;
+    }
+    const value_type& comp_value(size_type comp)
+    {
+      return *(ptr_ + comp);
+    }
+
+  private:
+    pointer ptr_;
+    size_t num_comps_;
+  };
+
+  class iterator
+  {
+  public:
+    using self_type = iterator;
+    using value_type = T;
+    using reference = T&;
+    using pointer = T*;
+    using difference_type = value_type;
+    using iterator_category = std::forward_iterator_tag;
+
+    iterator(pointer ptr)
+    : ptr_(ptr)
+    {
+    }
+    iterator(pointer ptr, size_type ununsed)
+    : ptr_(ptr)
+    {
+    }
+
+    self_type operator++()
+    {
+      ptr_++;
+      return *this;
+    } // PREFIX
+    self_type operator++(int junk)
+    {
+      self_type i = *this;
+      ptr_++;
+      return i;
+    } // POSTFIX
+    self_type operator+(int amt)
+    {
+      ptr_ += amt;
+      return *this;
+    }
+    reference operator*()
+    {
+      return *ptr_;
+    }
+    pointer operator->()
+    {
+      return ptr_;
+    }
+    bool operator==(const self_type& rhs)
+    {
+      return ptr_ == rhs.ptr_;
+    }
+    bool operator!=(const self_type& rhs)
+    {
+      return ptr_ != rhs.ptr_;
+    }
+
+  private:
+    pointer ptr_;
+  };
+
+  class const_iterator
+  {
+  public:
+    using self_type = const_iterator;
+    using value_type = T;
+    using reference = T&;
+    using pointer = T*;
+    using difference_type = value_type;
+    using iterator_category = std::forward_iterator_tag;
+    const_iterator(pointer ptr)
+    : ptr_(ptr)
+    {
+    }
+    const_iterator(pointer ptr, size_type unused)
+    : ptr_(ptr)
+    {
+    }
+
+    self_type operator++()
+    {
+      ptr_++;
+      return *this;
+    } // PREFIX
+    self_type operator++(int amt)
+    {
+      self_type i = *this;
+      ptr_ += amt;
+      return i;
+    } // POSTFIX
+    self_type operator+(int amt)
+    {
+      ptr_ += amt;
+      return *this;
+    }
+    const value_type& operator*()
+    {
+      return *ptr_;
+    }
+    const pointer operator->()
+    {
+      return ptr_;
+    }
+    bool operator==(const self_type& rhs)
+    {
+      return ptr_ == rhs.ptr_;
+    }
+    bool operator!=(const self_type& rhs)
+    {
+      return ptr_ != rhs.ptr_;
+    }
+
+  private:
+    pointer ptr_;
+  };
+
+  // ######### Iterators #########
+
+  template <typename IteratorType> IteratorType begin()
+  {
+    return IteratorType(m_Array, m_NumComponents);
+  }
+  iterator begin()
+  {
+    return iterator(m_Array);
+  }
+
+  template <typename IteratorType> IteratorType end()
+  {
+    return IteratorType(m_Array + m_Size, m_NumComponents);
+  }
+  iterator end()
+  {
+    return iterator(m_Array + m_Size);
+  }
+
+  const_iterator begin() const
+  {
+    return const_iterator(m_Array);
+  }
+
+  const_iterator end() const
+  {
+    return const_iterator(m_Array + m_Size);
+  }
+
+  // rbegin
+  // rend
+  // cbegin
+  // cend
+  // crbegin
+  // crend
+
+  // ######### Capacity #########
+
+  size_type size() const
+  {
+    return m_Size;
+  }
+
+  size_type max_size() const
+  {
+    return m_Size;
+  }
+  //  void resize(size_type n) override
+  //  {
+  //    resizeAndExtend(n);
+  //  }
+  // void resize (size_type n, const value_type& val);
+  size_type capacity() const noexcept
+  {
+    return m_Size;
+  }
+  bool empty() const noexcept
+  {
+    return (m_Size == 0);
+  }
+  // reserve()
+  // shrink_to_fit()
+
+  // ######### Element Access #########
+
+  inline reference operator[](size_type index)
+  {
+    // assert(index < m_Size);
+    return m_Array[index];
+  }
+
+  inline const T& operator[](size_type index) const
+  {
+    // assert(index < m_Size);
+    return m_Array[index];
+  }
+
+  inline reference at(size_type index)
+  {
+    assert(index < m_Size);
+    return m_Array[index];
+  }
+
+  inline const T& at(size_type index) const
+  {
+    assert(index < m_Size);
+    return m_Array[index];
+  }
+
+  inline reference front()
+  {
+    return m_Array[0];
+  }
+  inline const T& front() const
+  {
+    return m_Array[0];
+  }
+
+  inline reference back()
+  {
+    return m_Array[m_MaxId];
+  }
+  inline const T& back() const
+  {
+    return m_Array[m_MaxId];
+  }
+
+  inline T* data() noexcept
+  {
+    return m_Array;
+  }
+  inline const T* data() const noexcept
+  {
+    return m_Array;
+  }
+
+  // ######### Modifiers #########
+
+  /**
+   * @brief In the range version (1), the new contents are elements constructed from each of the elements in the range
+   * between first and last, in the same order.
+   */
+  template <class InputIterator> void assign(InputIterator first, InputIterator last) // range (1)
+  {
+    size_type size = last - first;
+    resizeAndExtend(size);
+    size_type idx = 0;
+    while(first != last)
+    {
+      m_Array[idx] = *first;
+      first++;
+    }
+  }
+
+  /**
+   * @brief In the fill version (2), the new contents are n elements, each initialized to a copy of val.
+   * @param n
+   * @param val
+   */
+  void assign(size_type n, const value_type& val) // fill (2)
+  {
+    resizeAndExtend(n);
+    std::for_each(begin(), end(), [=](T& n) { n = val; });
+  }
+
+  /**
+   * @brief In the initializer list version (3), the new contents are copies of the values passed as initializer list, in the same order.
+   * @param il
+   */
+  void assign(std::initializer_list<value_type> il) //  initializer list (3)
+  {
+    assign(il.begin(), il.end());
+  }
+
+  /**
+   * @brief push_back
+   * @param val
+   */
+  void push_back(const value_type& val)
+  {
+    resizeAndExtend(m_Size + 1);
+    m_Array[m_MaxId] = val;
+  }
+  /**
+   * @brief push_back
+   * @param val
+   */
+  void push_back(value_type&& val)
+  {
+    resizeAndExtend(m_Size + 1);
+    m_Array[m_MaxId] = val;
+  }
+
+  /**
+   * @brief pop_back
+   */
+  void pop_back()
+  {
+    resizeAndExtend(m_Size - 1);
+  }
+  // insert
+  // iterator erase (const_iterator position)
+  // iterator erase (const_iterator first, const_iterator last);
+  // swap
+
+  /**
+   * @brief Removes all elements from the array (which are destroyed), leaving the container with a size of 0.
+   */
+  void clear()
+  {
+    if(nullptr != m_Array && m_OwnsData)
+    {
+      deallocate();
+    }
+    m_Array = nullptr;
+    m_Size = 0;
+    m_OwnsData = true;
+    m_MaxId = 0;
+    m_IsAllocated = false;
+    m_NumTuples = 0;
+  }
+  // emplace
+  // emplace_back
+
+  /**
+   * @brief equal
+   * @param range1
+   * @param range2
    * @return
    */
-  inline T& operator[](size_t i)
+  template <typename Range1, typename Range2> bool equal(Range1 const& range1, Range2 const& range2)
   {
-    Q_ASSERT(i < m_Size);
-    return m_Array[i];
+    if(range1.size() != range2.size())
+    {
+      return false;
+    }
+
+    return std::equal(begin(range1), end(range1), begin(range2));
   }
 
+  // =================================== END STL COMPATIBLE INTERFACe ===================================================
+
 protected:
   /**
    * @brief Protected Constructor
@@ -1544,15 +1991,13 @@ template <typename T> class DataArray : public IDataArray
    * @param dims The actual dimensions the attribute on each Tuple has.
    * @param takeOwnership Will the class clean up the memory. Default=true
    */
-  DataArray(size_t numTuples, QVector<size_t> compDims, QString name, bool ownsData = true)
-  : m_Array(nullptr)
-  , m_OwnsData(ownsData)
-  , m_IsAllocated(false)
-  , m_Name(std::move(name))
+  DataArray(size_t numTuples, const QVector<size_t>& compDims, const QString& name, bool ownsData = true)
+  : IDataArray(name)
   , m_NumTuples(numTuples)
+  , m_OwnsData(ownsData)
   {
     // Set the Component Dimensions and compute the number of components at each tuple for caching
-    m_CompDims = compDims;
+    m_CompDims = std::vector<size_type>(compDims.begin(), compDims.end());
     m_NumComponents = m_CompDims[0];
     for(int i = 1; i < m_CompDims.size(); i++)
     {
@@ -1569,7 +2014,7 @@ template <typename T> class DataArray : public IDataArray
   /**
    * @brief deallocates the memory block
    */
-  void _deallocate()
+  void deallocate()
   {
     // We are going to splat 0xABABAB across the first value of the array as a debugging aid
     auto cptr = reinterpret_cast<unsigned char*>(m_Array);
@@ -1713,7 +2158,7 @@ template <typename T> class DataArray : public IDataArray
         std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
       }
       // Free the old array
-      _deallocate();
+      deallocate();
     }
 
     // Allocation was successful.  Save it.
@@ -1736,26 +2181,15 @@ template <typename T> class DataArray : public IDataArray
   }
 
 private:
-  //  unsigned long long int MUD_FLAP_0;
-  T* m_Array;
-  //  unsigned long long int MUD_FLAP_1;
-  size_t m_Size;
-  //  unsigned long long int MUD_FLAP_4;
-  bool m_OwnsData;
-  //  unsigned long long int MUD_FLAP_2;
-  size_t m_MaxId;
-
-  bool m_IsAllocated;
-  //   unsigned long long int MUD_FLAP_3;
-  QString m_Name;
-  //  unsigned long long int MUD_FLAP_5;
-
-  size_t m_NumTuples;
-
-  QVector<size_t> m_CompDims;
-  size_t m_NumComponents;
-
-  T m_InitValue;
+  T* m_Array = nullptr;
+  size_t m_Size = 0;
+  size_t m_MaxId = 0;
+  size_t m_NumTuples = 0;
+  size_t m_NumComponents = 1;
+  T m_InitValue = static_cast<T>(0);
+  std::vector<size_t> m_CompDims = {1};
+  bool m_IsAllocated = false;
+  bool m_OwnsData = true;
 };
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/IDataArray.cpp b/Source/SIMPLib/DataArrays/IDataArray.cpp
index 6c25becec1..ac0f629edd 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArray.cpp
@@ -14,7 +14,9 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::IDataArray() = default;
+IDataArray::IDataArray(const QString& name)
+: IDataStructureNode(name)
+{}
 
 // -----------------------------------------------------------------------------
 //
@@ -28,3 +30,13 @@ bool IDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourc
 {
   return copyFromArray(destTupleOffset, sourceArray, 0, sourceArray->getNumberOfTuples());
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath IDataArray::getDataArrayPath() const
+{
+  DataArrayPath path = getParentPath();
+  path.setDataArrayName(getName());
+  return path;
+}
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 987b200f48..3b2ab1d1ee 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -24,6 +24,7 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/IDataStructureNode.h"
 
 
 /**
@@ -37,7 +38,7 @@
 * @date Jan 3, 2008
 * @version $Revision: 1.2 $
 */
-class SIMPLib_EXPORT IDataArray
+class SIMPLib_EXPORT IDataArray : public IDataStructureNode
 {
   PYB11_CREATE_BINDINGS(IDataArray)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
@@ -58,7 +59,7 @@ class SIMPLib_EXPORT IDataArray
      * @code
      *    typedef DataArray<int32_t>  Int32ArrayType;
      *    int32_t* iPtr = IDataArray::SafeReinterpretCast<IDataArray*, Int32ArrayType*, int32_t*>(ptr.get());
-    *     Q_ASSERT(nullptr != iPtr);
+     *    Q_ASSERT(nullptr != iPtr);
      * @endcode
      * @param x The Pointer to IDataArray
      * @return
@@ -74,16 +75,19 @@ class SIMPLib_EXPORT IDataArray
     }
 
 
-    IDataArray();
-    virtual ~IDataArray();
-
-    virtual void setName(const QString& name) = 0;
-    virtual QString getName() = 0;
+    IDataArray(const QString& name = "");
+    ~IDataArray() override;
 
     virtual Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) = 0;
     virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
     virtual Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) = 0;
 
+    /**
+     * @brief Creates and returns a DataArrayPath for the DataArray
+     * @return
+     */
+    DataArrayPath getDataArrayPath() const override;
+
     virtual int getClassVersion() = 0;
 
     /**
@@ -223,11 +227,10 @@ class SIMPLib_EXPORT IDataArray
     virtual int32_t resizeTotalElements(size_t size) = 0;
 
     /**
-     * @brief Reseizes the internal array
-     * @param size The new size of the internal array
-     * @return 1 on success, 0 on failure
+     * @brief resize
+     * @param count
      */
-    virtual int32_t resize(size_t numTuples) = 0;
+    virtual void resizeTuples(size_t count) = 0;
 
     /**
      * @brief printTuple
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index a7e4085d90..02b5d279ef 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -313,18 +313,6 @@ class NeighborList : public IDataArray
      */
     QString getTypeAsString() override { return NeighborList<T>::ClassName();}
 
-    /**
-     * @brief setName
-     * @param name
-     */
-    void setName(const QString& name) override { m_Name = name; }
-
-    /**
-     * @brief getName
-     * @return
-     */
-    QString getName() override { return m_Name; }
-
     /**
      * @brief takeOwnership
      */
@@ -608,20 +596,11 @@ class NeighborList : public IDataArray
      * @brief Resizes the internal array to accomondate numTuples
      * @param numTuples
      */
-    void resizeTuples(size_t numTuples)
+    void resizeTuples(size_t numTuples) override
     {
       resizeTotalElements(numTuples);
     }
 
-    /**
-     * @brief Resizes the internal array to accomondate numTuples
-     * @param numTuples
-     */
-    int32_t resize(size_t numTuples) override
-    {
-      return resizeTotalElements(numTuples);
-    }
-
     //FIXME: These need to be implemented
     void printTuple(QTextStream& out, size_t i, char delimiter = ',') override
     {
@@ -1072,9 +1051,9 @@ class NeighborList : public IDataArray
     /**
      * @brief NeighborList
      */
-    NeighborList(size_t numTuples, const QString& name)
-    : m_NumNeighborsArrayName()
-    , m_Name(name)
+    NeighborList(size_t numTuples, const QString name)
+    : IDataArray(name)
+    , m_NumNeighborsArrayName("")
     , m_NumTuples(numTuples)
     , m_IsAllocated(false)
     {
@@ -1082,7 +1061,6 @@ class NeighborList : public IDataArray
 
   private:
     std::vector<SharedVectorType> m_Array;
-    QString m_Name;
     size_t m_NumTuples;
     bool m_IsAllocated;
     T m_InitValue;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 6bf88203a3..024cfe15dc 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -51,7 +51,7 @@
 //
 // -----------------------------------------------------------------------------
 StatsDataArray::StatsDataArray()
-: m_Name(SIMPL::EnsembleData::Statistics)
+: IDataArray(SIMPL::EnsembleData::Statistics)
 {
   m_IsAllocated = true;
 }
@@ -186,21 +186,6 @@ IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, QVector<s
   return StatsDataArray::NullPointer();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void StatsDataArray::setName(const QString& name)
-{
-  m_Name = name;
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString StatsDataArray::getName()
-{
-  return m_Name;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -297,7 +282,7 @@ int StatsDataArray::eraseTuples(QVector<size_t>& idxs)
 
   if(static_cast<size_t>(idxs.size()) >= getNumberOfTuples())
   {
-    resize(0);
+    resizeTuples(0);
     return 0;
   }
 
@@ -417,7 +402,7 @@ IDataArray::Pointer StatsDataArray::deepCopy(bool forceNoAllocate)
 {
   StatsDataArray::Pointer daCopyPtr = StatsDataArray::CreateArray(getNumberOfTuples() * getNumberOfComponents(), getName());
 
-  daCopyPtr->resize(getNumberOfTuples());
+  daCopyPtr->resizeTuples(getNumberOfTuples());
   for(size_t i = 0; i < getNumberOfTuples(); i++)
   {
     // This should be a Deep Copy of each of the StatsData subclasses instead of a reference copy
@@ -446,9 +431,9 @@ int32_t StatsDataArray::resizeTotalElements(size_t size)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int32_t StatsDataArray::resize(size_t numTuples)
+void StatsDataArray::resizeTuples(size_t numTuples)
 {
-  return resizeTotalElements(numTuples);
+  resizeTotalElements(numTuples);
 }
 
 // -----------------------------------------------------------------------------
@@ -472,7 +457,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j)
 int StatsDataArray::writeH5Data(hid_t parentId, QVector<size_t> tDims)
 {
   herr_t err = 0;
-  hid_t gid = QH5Utilities::createGroup(parentId, m_Name);
+  hid_t gid = QH5Utilities::createGroup(parentId, getName());
   if(gid < 0)
   {
     return -1;
@@ -508,7 +493,7 @@ int StatsDataArray::readH5Data(hid_t parentId)
   bool ok = false;
   int err = 0;
   QString statsType;
-  hid_t gid = QH5Utilities::openHDF5Object(parentId, m_Name);
+  hid_t gid = QH5Utilities::openHDF5Object(parentId, getName());
   if(gid < 0)
   {
     return err;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index d3d8896d56..6e1e18e369 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -178,9 +178,6 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   /* **************** This is the interface for the IDataArray Class which MUST
    *  Be implemented. Most of it is useless and will simply ASSERT if called. */
 
-  void setName(const QString& name) override;
-  QString getName() override;
-
   /**
    * @brief getFullNameOfClass
    * @return
@@ -310,11 +307,10 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   int32_t resizeTotalElements(size_t size) override;
 
   /**
-   * @brief Reseizes the internal array
-   * @param size The new size of the internal array
-   * @return 1 on success, 0 on failure
+   * @brief Resizes the internal array to accomondate numTuples
+   * @param numTuples
    */
-  int32_t resize(size_t numTuples) override;
+  void resizeTuples(size_t numTuples) override;
 
   /**
    * @brief printTuple
@@ -382,7 +378,6 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   StatsDataArray();
 
 private:
-  QString m_Name;
   bool m_IsAllocated;
 
 public:
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index 6073182b14..86466347f4 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -41,23 +41,20 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringDataArray::StringDataArray() 
-: m_Name("")
-, _ownsData(false)
+StringDataArray::StringDataArray()
+: _ownsData(false)
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringDataArray::StringDataArray(size_t numTuples, const QString name, bool allocate)
-: m_Name(name)
+StringDataArray::StringDataArray(size_t numTuples, const QString& name, bool allocate)
+: IDataArray(name)
 , _ownsData(true)
 {
-  // if (allocate == true)
-  {
-    m_Array.resize(numTuples);
-  }
+  m_Array.resize(numTuples);
+  setName(name);
 }
 
 // -----------------------------------------------------------------------------
@@ -70,7 +67,6 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const QS
     return NullPointer();
   }
   StringDataArray* d = new StringDataArray(numTuples, name, allocate);
-  d->setName(name);
   Pointer ptr(d);
   return ptr;
 }
@@ -85,7 +81,6 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, QVector<
     return NullPointer();
   }
   StringDataArray* d = new StringDataArray(numTuples, name, allocate);
-  d->setName(name);
   Pointer ptr(d);
   return ptr;
 }
@@ -160,22 +155,6 @@ QString StringDataArray::getTypeAsString()
   return "StringDataArray";
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void StringDataArray::setName(const QString& name)
-{
-  m_Name = name;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString StringDataArray::getName()
-{
-  return m_Name;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -272,15 +251,16 @@ int StringDataArray::eraseTuples(QVector<size_t>& idxs)
   size_t idxs_size = static_cast<size_t>(idxs.size());
   if(idxs_size >= getNumberOfTuples())
   {
-    resize(0);
+    resizeTuples(0);
     return 0;
   }
 
   // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
   // off the end of the array and return an error code.
-  for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+  // for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+  for(auto& value : idxs)
   {
-    if(idxs[i] >= static_cast<size_t>(m_Array.size()))
+    if(value >= static_cast<size_t>(m_Array.size()))
     {
       return -100;
     }
@@ -378,7 +358,7 @@ void StringDataArray::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringDataArray::initializeWithValue(QString value)
+void StringDataArray::initializeWithValue(const QString& value)
 {
   m_Array.assign(m_Array.size(), value);
 }
@@ -419,10 +399,9 @@ int32_t StringDataArray::resizeTotalElements(size_t size)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int32_t StringDataArray::resize(size_t numTuples)
+void StringDataArray::resizeTuples(size_t numTuples)
 {
   m_Array.resize(numTuples);
-  return 1;
 }
 
 // -----------------------------------------------------------------------------
@@ -492,11 +471,11 @@ QString StringDataArray::getInfoString(SIMPL::InfoStringFormat format)
     ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
     ss << "<tbody>\n";
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Name:</th><td>" << getName() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Name:</th><td>)" << getName() << R"(</td></tr>)";
+    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << R"(</td></tr>)";
     QLocale usa(QLocale::English, QLocale::UnitedStates);
     QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>" << numStr << "</td></tr>";
+    ss << R"(<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>)" << numStr << R"(</td></tr>)";
     ss << "</tbody></table>\n";
     ss << "<br/>";
     ss << "</body></html>";
@@ -513,7 +492,7 @@ QString StringDataArray::getInfoString(SIMPL::InfoStringFormat format)
 int StringDataArray::readH5Data(hid_t parentId)
 {
   int err = 0;
-  this->resize(0);
+  this->resizeTuples(0);
   std::vector<std::string> strings;
   err = H5Lite::readVectorOfStringDataset(parentId, getName().toStdString(), strings);
 
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 64c099182f..e56ce15ae9 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -154,18 +154,6 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    */
   QString getTypeAsString() override;
 
-  /**
-   * @brief Gives this array a human readable name
-   * @param name The name of this array
-   */
-  void setName(const QString& name) override;
-
-  /**
-   * @brief Returns the human readable name of this array
-   * @return
-   */
-  QString getName() override;
-
   /**
    * @brief
    */
@@ -278,7 +266,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @brief initializeWithValue
    * @param value
    */
-  virtual void initializeWithValue(QString value);
+  virtual void initializeWithValue(const QString& value);
 
   /**
    * @brief initializeWithValue
@@ -301,11 +289,10 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   int32_t resizeTotalElements(size_t size) override;
 
   /**
-   * @brief Reseizes the internal array
-   * @param size The new size of the internal array
-   * @return 1 on success, 0 on failure
+   * @brief Resizes the internal array to accomondate numTuples
+   * @param numTuples
    */
-  int32_t resize(size_t numTuples) override;
+  void resizeTuples(size_t numTuples) override;
 
   /**
    * @brief Initializes this class to zero bytes freeing any data that it currently owns
@@ -385,12 +372,11 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param numElements The number of elements in the internal array.
    * @param takeOwnership Will the class clean up the memory. Default=true
    */
-  StringDataArray(size_t numTuples, const QString name, bool allocate = true);
+  StringDataArray(size_t numTuples, const QString& name, bool allocate = true);
 
   StringDataArray();
 
 private:
-  QString m_Name;
   QString m_InitValue;
   std::vector<QString> m_Array;
   bool _ownsData;
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 317016884a..fc59295d76 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -64,7 +64,7 @@ class StructArray : public IDataArray
      */
     static Pointer CreateArray(size_t numElements, const QString& name, bool allocate = true)
     {
-      if (name.isEmpty() == true)
+      if(name.isEmpty())
       {
         return NullPointer();
       }
@@ -160,25 +160,6 @@ class StructArray : public IDataArray
       return theType;
     }
 
-
-    /**
-     * @brief Gives this array a human readable name
-     * @param name The name of this array
-     */
-    void setName(const QString& name) override
-    {
-      m_Name = name;
-    }
-
-    /**
-     * @brief Returns the human readable name of this array
-     * @return
-     */
-    QString getName() override
-    {
-      return m_Name;
-    }
-
     /**
      * @brief Makes this class responsible for freeing the memory
      */
@@ -292,7 +273,7 @@ class StructArray : public IDataArray
       size_t idxs_size = static_cast<size_t>(idxs.size());
       if (idxs_size >= getNumberOfTuples() )
       {
-        resize(0);
+        resizeTuples(0);
         return 0;
       }
 
@@ -611,20 +592,16 @@ class StructArray : public IDataArray
       {
         return 1;
       }
-      else
-      {
-        return 0;
-      }
+      return 0;
     }
 
     /**
-     * @brief Resize
+     * @brief Resizes the internal array to accomondate numTuples
      * @param numTuples
-     * @return
      */
-    int32_t resize(size_t numTuples) override
+    void resizeTuples(size_t numTuples) override
     {
-      return resizeTotalElements(numTuples );
+      resizeTotalElements(numTuples);
     }
 
     /**
@@ -899,7 +876,6 @@ class StructArray : public IDataArray
 
     bool m_IsAllocated;
     //   unsigned long long int MUD_FLAP_3;
-    QString m_Name;
     //  unsigned long long int MUD_FLAP_5;
 
     StructArray(const StructArray&); //Not Implemented
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index f938c9aad9..6b1e73f55f 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -1,41 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <cstdint>
+#include <cstdlib>
 #include <iostream>
+#include <map>
 #include <vector>
 
 #include <QtCore/QDir>
@@ -75,6 +76,34 @@
 #define DIM1 3
 #define DIM2 4
 
+//============================= These are for testing the STL Interface ================================================
+std::map<int, int> test;
+std::map<int, int>::value_type vt;
+
+bool mypredicate(int32_t i, int32_t j)
+{
+  return (i == j);
+}
+
+struct Sum
+{
+  Sum()
+  : sum{0}
+  {
+  }
+  void operator()(int n)
+  {
+    sum += n;
+  }
+  int sum;
+};
+
+template <typename T> void print(const T& v)
+{
+  std::cout << v << " ";
+}
+//======================================================================================================================
+
 class DataArrayTest
 {
 public:
@@ -384,8 +413,8 @@ class DataArrayTest
   {                                                                                                                                                                                                    \
     DataArray<type>::Pointer p_##type = DataArray<type>::CreateArray(1, "Test", false);                                                                                                                \
     QString s_##type = p_##type->getTypeAsString();                                                                                                                                                    \
-    /* qDebug() << #type << s_##type; */                                                                                                                                                               \
-    type value = (type)(1);                                                                                                                                                                            \
+    s_##type = s_##type; /* qDebug() << #type << s_##type; */                                                                                                                                          \
+    auto value = static_cast<type>(1);                                                                                                                                                                 \
     value = value;                                                                                                                                                                                     \
     /* qDebug() << TypeToString<type>(value); */                                                                                                                                                       \
   }
@@ -452,7 +481,7 @@ class DataArrayTest
       }
 
       // Resize Larger
-      int32Array->resize(NUM_TUPLES_2);
+      int32Array->resizeTuples(NUM_TUPLES_2);
       DREAM3D_REQUIRE_EQUAL(NUM_TUPLES_2, int32Array->getNumberOfTuples());
       DREAM3D_REQUIRE_EQUAL(NUM_ELEMENTS_2, int32Array->getSize());
       DREAM3D_REQUIRE_EQUAL(int32Array->isAllocated(), true);
@@ -467,7 +496,7 @@ class DataArrayTest
       }
 
       // Resize Smaller - Which should have still saved some of our data
-      int32Array->resize(NUM_TUPLES_3);
+      int32Array->resizeTuples(NUM_TUPLES_3);
       DREAM3D_REQUIRE_EQUAL(NUM_TUPLES_3, int32Array->getNumberOfTuples());
       DREAM3D_REQUIRE_EQUAL(NUM_ELEMENTS_3, int32Array->getSize());
       DREAM3D_REQUIRE_EQUAL(int32Array->isAllocated(), true);
@@ -672,13 +701,13 @@ class DataArrayTest
     }
     // Splat another value across the array starting at an offset into the array
     // and test those values made it into the array correctly
-    array->initializeWithValue(static_cast<T>(1), numComp);
-    for(size_t i = numComp; i < numElements; i++)
+    array->initializeWithValue(static_cast<T>(1));
+    for(size_t i = 0; i < numElements; i++)
     {
       DREAM3D_REQUIRE_EQUAL(static_cast<T>(1), ptr[i]);
     }
     // Initialize the entire array with a value (offset = 0);
-    array->initializeWithValue(static_cast<T>(2), 0);
+    array->initializeWithValue(static_cast<T>(2));
     for(size_t i = 0; i < numElements; i++)
     {
       DREAM3D_REQUIRE_EQUAL(static_cast<T>(2), ptr[i]);
@@ -727,15 +756,15 @@ class DataArrayTest
 
     ///     virtual QVector<size_t> getComponentDimensions()
     // Test resizing the array based on a give number of tuples. The number of Components will stay the same at each tuple
-    array->resize(numTuples * 2);
+    array->resizeTuples(numTuples);
     array->initializeWithZeros(); // Init the grown array to all Zeros
     nt = array->getNumberOfTuples();
-    DREAM3D_REQUIRED(nt, ==, (numTuples * 2));
+    DREAM3D_REQUIRED(nt, ==, (numTuples));
     nc = array->getNumberOfComponents();
     DREAM3D_REQUIRED(nc, ==, numComp);
 
     // Test resizing the array to a smaller size
-    array->resize(numTuples);
+    array->resizeTuples(numTuples);
     array->initializeWithZeros(); // Init the grown array to all Zeros
     nt = array->getNumberOfTuples();
     DREAM3D_REQUIRED(nt, ==, (numTuples));
@@ -757,7 +786,7 @@ class DataArrayTest
     DREAM3D_REQUIRED_PTR(ptr, ==, nullptr);
 
     // Test resizing the array to a any larger size
-    array->resize(numTuples);
+    array->resizeTuples(numTuples);
     array->initializeWithZeros(); // Init the grown array to all Zeros
     nt = array->getNumberOfTuples();
     DREAM3D_REQUIRED(nt, ==, (numTuples));
@@ -1002,7 +1031,7 @@ class DataArrayTest
     DREAM3D_REQUIRE_EQUAL(didCopy, false);
 
     // Resize the DataArray to accomondate the true amount of data that we want (20 Tuples)
-    src->resize(numTuples * 2);
+    src->resizeTuples(numTuples * 2);
     didCopy = src->copyFromArray(numTuples, copy);
     DREAM3D_REQUIRE_EQUAL(didCopy, true);
 
@@ -1167,10 +1196,10 @@ class DataArrayTest
 
     typename std::vector<std::vector<T>> data;
 
-    for (size_t i = 0; i < numTuples; i++)
+    for(size_t i = 0; i < numTuples; i++)
     {
       typename std::vector<T> tempVector;
-      for (size_t j = 0; j < cDims[0]; j++)
+      for(size_t j = 0; j < cDims[0]; j++)
       {
         tempVector.push_back(static_cast<T>(i + j));
       }
@@ -1181,16 +1210,16 @@ class DataArrayTest
 
     typename DataArray<T>::Pointer src = DataArray<T>::CreateArray(numTuples, cDims, name, true);
 
-    for (size_t i = 0; i < numTuples; i++)
+    for(size_t i = 0; i < numTuples; i++)
     {
       src->setTuple(i, data[i]);
     }
 
     // Check each element of the DataArray against the original vector
 
-    for (size_t i = 0; i < numTuples; i++)
+    for(size_t i = 0; i < numTuples; i++)
     {
-      for (size_t j = 0; j < cDims[0]; j++)
+      for(size_t j = 0; j < cDims[0]; j++)
       {
         T val = src->getComponent(i, j);
         DREAM3D_REQUIRE_EQUAL(data[i][j], val)
@@ -1215,6 +1244,150 @@ class DataArrayTest
     TestSetTupleForType<double>();
   }
 
+  // -----------------------------------------------------------------------------
+  void STLInterfaceTest()
+  {
+    std::cout << "STLInterfaceTest Test Starting...." << std::endl;
+
+    DataArray<int32_t> i32Array(10, "Test Array");
+    DataArray<int32_t> i32Array1(10, "Other Array");
+
+    // Initialize with a value
+    for(auto& value : i32Array)
+    {
+      value = 5;
+    }
+    // Initialize with a value
+    for(auto& value : i32Array1)
+    {
+      value = 5;
+    }
+
+    std::cout << "before:";
+    std::for_each(i32Array.begin(), i32Array.end(), print<int32_t>);
+    std::cout << '\n';
+
+    std::cout << "using default comparison:" << std::endl;
+    if(std::equal(i32Array.begin(), i32Array.end(), i32Array1.begin()))
+    {
+      std::cout << "The contents of both sequences are equal.\n";
+    }
+    else
+    {
+      std::cout << "The contents of both sequences differ.\n";
+    }
+
+    std::for_each(i32Array1.begin(), i32Array1.end(), [](int32_t& n) { n++; });
+
+    std::cout << "using predicate comparison:" << std::endl;
+    if(std::equal(i32Array.begin(), i32Array.end(), i32Array1.begin(), mypredicate))
+    {
+      std::cout << "The contents of both sequences are equal.\n";
+    }
+    else
+    {
+      std::cout << "The contents of both sequences differ.\n";
+    }
+
+    std::cout << "Using another predicate to sum the values" << std::endl;
+    // calls Sum::operator() for each number
+    Sum s = std::for_each(i32Array1.begin(), i32Array1.end(), Sum());
+
+    std::cout << "after: ";
+    std::for_each(i32Array1.begin(), i32Array1.end(), print<int32_t>);
+    std::cout << '\n';
+    std::cout << "sum: " << s.sum << '\n';
+
+    std::cout << "Modify Array using [] operator..." << std::endl;
+    for(DataArray<int32_t>::size_type i = 0; i < i32Array.size(); i++)
+    {
+      i32Array[i] = static_cast<int32_t>(i * 10);
+    }
+
+    std::cout << "Print using range based loop..." << std::endl;
+    for(const auto& value : i32Array)
+    {
+      std::cout << value << std::endl;
+    }
+
+    std::cout << "std::fill" << std::endl;
+    // std::fill the array with a set value
+    std::fill(i32Array.begin(), i32Array.end(), -1);
+    std::for_each(i32Array.begin(), i32Array.end(), print<int32_t>);
+    std::cout << "" << std::endl;
+
+    std::cout << "std::transform from int32_t to float using a back_inserter" << std::endl;
+    DataArray<float> f32Array(0, "Float Array");
+    std::transform(i32Array.begin(), i32Array.end(), std::back_inserter(f32Array), [](int32_t i) -> float { return i * 2.5; });
+    std::for_each(f32Array.begin(), f32Array.end(), print<float>);
+    std::cout << std::endl;
+
+    // Get the front and back
+    int32_t front = i32Array1.front();
+    float back = f32Array.back();
+    if(front != back)
+    {
+      // do nothing
+    }
+
+    std::cout << "## Assign Content(1)" << std::endl;
+    std::vector<int> foo(60, 33);
+    i32Array.assign(foo.begin(), foo.end());
+    std::cout << "i32Array.size() after assign(1): " << i32Array.size() << std::endl;
+
+    i32Array.assign(static_cast<size_t>(22), 333);
+    std::cout << "i32Array.size() after assign(2): " << i32Array.size() << std::endl;
+
+    i32Array.assign(std::initializer_list<int32_t>{
+        3,
+        4,
+        5,
+        6,
+        7,
+        8,
+        9,
+    });
+    std::cout << "i32Array.size() after assign(3): " << i32Array.size() << std::endl;
+
+    int32_t* data = i32Array.data();
+    if(data[0] != 3)
+    {
+    }
+    // Stick DataArray into a STL container
+    std::vector<DataArray<float>> vecOfFloatArrays;
+
+    // -----------------------------------------------------------------------------
+    // Let's try something that has components, like an ARGB array
+    using RgbaType = DataArray<uint8_t>;
+    using CompDimsType = RgbaType::comp_dims_type;
+    using RgbaIterator = RgbaType::tuple_iterator;
+
+    CompDimsType cDims = {4};
+    RgbaType rgba(static_cast<size_t>(10), cDims, "RGBA Array");
+
+    RgbaIterator begin = rgba.begin<RgbaIterator>();
+    rgba.initializeWithValue(0xFF);
+    rgba[0] = 0x65;
+    rgba[1] = 0x66;
+    rgba[2] = 0x67;
+    rgba[3] = 0x68;
+
+    for(RgbaIterator rgbaIter = begin; rgbaIter != rgba.end<RgbaIterator>(); rgbaIter++)
+    {
+      std::cout << "rgba: " << static_cast<int>(*rgbaIter) << std::endl;
+      std::cout << " rgba[0] " << static_cast<int>(rgbaIter.comp_value(0)) << " rgba[1] " << static_cast<int>(rgbaIter.comp_value(1)) << " rgba[2] " << static_cast<int>(rgbaIter.comp_value(2))
+                << " rgba[3] " << static_cast<int>(rgbaIter.comp_value(3)) << std::endl;
+
+      for(size_t i = 0; i < 4; i++)
+      {
+        rgbaIter.comp_value(i) = 55 + i;
+      }
+      std::cout << "rgba: " << static_cast<int>(*rgbaIter) << std::endl;
+      std::cout << " rgba[0] " << static_cast<int>(rgbaIter.comp_value(0)) << " rgba[1] " << static_cast<int>(rgbaIter.comp_value(1)) << " rgba[2] " << static_cast<int>(rgbaIter.comp_value(2))
+                << " rgba[3] " << static_cast<int>(rgbaIter.comp_value(3)) << std::endl;
+    }
+  }
+
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -1245,7 +1418,9 @@ class DataArrayTest
 #endif
   }
 
-private:
-  DataArrayTest(const DataArrayTest&);  // Copy Constructor Not Implemented
-  void operator=(const DataArrayTest&); // Move assignment Not Implemented
+public:
+  DataArrayTest(const DataArrayTest&) = delete;            // Copy Constructor Not Implemented
+  DataArrayTest(DataArrayTest&&) = delete;                 // Move Constructor Not Implemented
+  DataArrayTest& operator=(const DataArrayTest&) = delete; // Copy Assignment Not Implemented
+  DataArrayTest& operator=(DataArrayTest&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 011cd37382..7dd9faa5b3 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -190,7 +190,7 @@ class StringDataArrayTest
     StringDataArray::Pointer nodes = initializeStringDataArray();
 
     // Resize to a smaller Array
-    nodes->resize(k_ResizeSmaller);
+    nodes->resizeTuples(k_ResizeSmaller);
     size_t nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ResizeSmaller, nTuples)
     size_t size = nodes->getSize();
@@ -205,14 +205,14 @@ class StringDataArrayTest
     DREAM3D_REQUIRE_EQUAL(nodes->getValue(4), ::_4);
 
     // Resize to a larger Array
-    nodes->resize(k_ResizeLarger);
+    nodes->resizeTuples(k_ResizeLarger);
     nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ResizeLarger, nTuples)
     size = nodes->getSize();
     DREAM3D_REQUIRE_EQUAL(k_ResizeLarger, size)
 
     // Resize to a Zero Array
-    nodes->resize(k_InitSize);
+    nodes->resizeTuples(k_InitSize);
     nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_InitSize, nTuples)
     size = nodes->getSize();
@@ -276,7 +276,7 @@ class StringDataArrayTest
     StringDataArray::Pointer nodes = initializeStringDataArray();
     StringDataArray::Pointer copy = initializeStringDataArray();
 
-    nodes->resize(k_ArraySize * 2);
+    nodes->resizeTuples(k_ArraySize * 2);
     bool didCopy = nodes->copyFromArray(k_ArraySize, copy);
     DREAM3D_REQUIRE_EQUAL(didCopy, true)
     DREAM3D_REQUIRE_EQUAL(nodes->getNumberOfTuples(), k_ArraySize * 2);
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index e01e879975..d85782f984 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -239,7 +239,7 @@ class StructArrayTest
     Vec3IntListPointer_t nodes = initializeStructArray();
 
     // Resize to a smaller Array
-    nodes->resize(k_ResizeSmaller);
+    nodes->resizeTuples(k_ResizeSmaller);
     size_t nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ResizeSmaller, nTuples)
     size_t size = nodes->getSize();
@@ -256,7 +256,7 @@ class StructArrayTest
     }
 
     // Resize to a larger Array
-    nodes->resize(k_ResizeLarger);
+    nodes->resizeTuples(k_ResizeLarger);
     nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ResizeLarger, nTuples)
     size = nodes->getSize();
@@ -279,7 +279,7 @@ class StructArrayTest
     }
 
     // Resize to a Zero Array
-    nodes->resize(k_InitSize);
+    nodes->resizeTuples(k_InitSize);
     Vec3Int_t* ptr = reinterpret_cast<Vec3Int_t*>(nodes->getVoidPointer(0));
     DREAM3D_REQUIRED_PTR(ptr, ==, nullptr);
     ptr = nodes->getPointer(0);
@@ -365,7 +365,7 @@ class StructArrayTest
     Vec3IntListPointer_t nodes = initializeStructArray();
     Vec3IntListPointer_t copy = initializeStructArray();
 
-    nodes->resize(k_ArraySize * 2);
+    nodes->resizeTuples(k_ArraySize * 2);
     bool didCopy = nodes->copyFromArray(k_ArraySize, copy);
     DREAM3D_REQUIRE_EQUAL(didCopy, true)
     DREAM3D_REQUIRE_EQUAL(nodes->getNumberOfTuples(), k_ArraySize * 2);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index a385e019d5..e1fa26a412 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -59,9 +59,9 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::AttributeMatrix(QVector<size_t> tDims, const QString& name, AttributeMatrix::Type attrType)
-: m_Type(attrType)
-, m_Name(name)
+AttributeMatrix::AttributeMatrix(const QVector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType)
+: IDataStructureContainerNode(name)
+, m_Type(attrType)
 , m_TupleDims(tDims)
 {
 }
@@ -69,10 +69,7 @@ AttributeMatrix::AttributeMatrix(QVector<size_t> tDims, const QString& name, Att
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::~AttributeMatrix()
-{
-  // std::cout << "~AttributeMatrix" << std::endl;
-}
+AttributeMatrix::~AttributeMatrix() = default;
 
 // -----------------------------------------------------------------------------
 QString AttributeMatrix::TypeToString(AttributeMatrix::Type t)
@@ -290,9 +287,11 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool AttributeMatrix::doesAttributeArrayExist(const QString& name) const
+DataArrayPath AttributeMatrix::getDataArrayPath() const
 {
-  return m_AttributeArrays.contains(name);
+  DataArrayPath path = getParentPath();
+  path.setAttributeMatrixName(getName());
+  return path;
 }
 
 // -----------------------------------------------------------------------------
@@ -302,10 +301,10 @@ bool AttributeMatrix::validateAttributeArraySizes()
 {
   int64_t arraySize = 0;
   int64_t matrixSize = getNumberOfTuples();
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
+  const AttributeMatrix::Container_t& dataArrays = getChildren();
+  for(const auto& dataArray : dataArrays)
   {
-    IDataArray::Pointer d = iter.value();
-    arraySize = d->getNumberOfTuples();
+    arraySize = dataArray->getNumberOfTuples();
     if(arraySize != matrixSize)
     {
       return false;
@@ -314,66 +313,19 @@ bool AttributeMatrix::validateAttributeArraySizes()
   return true;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int AttributeMatrix::addAttributeArray(const QString& name, const IDataArray::Pointer& data)
-{
-  if(data->getName().compare(name) != 0)
-  {
-    qDebug() << "Adding Attribute Array with different array name than key name"
-             << "\n";
-    qDebug() << "Key name: " << name << "\n";
-    qDebug() << "Array Name:" << data->getName() << "\n";
-    data->setName(name);
-  }
-  if(getNumberOfTuples() != data->getNumberOfTuples())
-  {
-    qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
-    qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
-  }
-  Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
-
-  m_AttributeArrays[name] = data;
-  return 0;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-IDataArray::Pointer AttributeMatrix::getAttributeArray(const QString& name)
-{
-  QMap<QString, IDataArray::Pointer>::iterator it;
-  it = m_AttributeArrays.find(name);
-  if(it == m_AttributeArrays.end())
-  {
-    return IDataArray::NullPointer();
-  }
-  return it.value();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-IDataArray::Pointer AttributeMatrix::getAttributeArray(const DataArrayPath& path)
-{
-  return getAttributeArray(path.getDataArrayName());
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 IDataArray::Pointer AttributeMatrix::removeAttributeArray(const QString& name)
 {
-  QMap<QString, IDataArray::Pointer>::iterator it;
-  it = m_AttributeArrays.find(name);
-  if(it == m_AttributeArrays.end())
+  auto it = find(name);
+  if(it == end())
   {
     // DO NOT return a NullPointer for any reason other than "Data Array was not found"
     return IDataArray::NullPointer();
   }
-  IDataArray::Pointer p = it.value();
-  m_AttributeArrays.erase(it);
+  IDataArray::Pointer p = (*it);
+  erase(it);
   return p;
 }
 
@@ -382,25 +334,38 @@ IDataArray::Pointer AttributeMatrix::removeAttributeArray(const QString& name)
 // -----------------------------------------------------------------------------
 RenameErrorCodes AttributeMatrix::renameAttributeArray(const QString& oldname, const QString& newname, bool overwrite)
 {
-  QMap<QString, IDataArray::Pointer>::iterator itOld;
-  QMap<QString, IDataArray::Pointer>::iterator itNew;
+  // Cannot rename a DataArray when the name does not change.
+  if(oldname == newname)
+  {
+    return SAME_PATH;
+  }
 
-  itNew = m_AttributeArrays.find(newname);
-  // If new name doesn't exist or we want to overwrite one that does exist...
-  if(itNew == m_AttributeArrays.end() || overwrite)
+  bool hasNewName = contains(newname);
+  if(hasNewName)
   {
-    itOld = m_AttributeArrays.find(oldname);
-    // If old name doesn't exist...
-    if(itOld == m_AttributeArrays.end())
+    if(overwrite)
     {
-      return OLD_DOES_NOT_EXIST;
+      removeAttributeArray(newname);
     }
-    IDataArray::Pointer p = itOld.value();
-    p->setName(newname);
-    removeAttributeArray(oldname);
-    addAttributeArray(newname, p);
+    else
+    {
+      return NEW_EXISTS;
+    }
+  }
+
+  // If new name doesn't exist or we want to overwrite one that does exist...
+  auto oldArray = getChildByName(oldname);
+  // If old name doesn't exist...
+  if(nullptr == oldArray)
+  {
+    return OLD_DOES_NOT_EXIST;
+  }
+  if(oldArray->setName(newname))
+  {
     return SUCCESS;
   }
+  
+  // Rename not successful
   return NEW_EXISTS;
 }
 
@@ -522,10 +487,10 @@ void AttributeMatrix::resizeAttributeArrays(const QVector<size_t>& tDims)
     numTuples *= m_TupleDims[i];
   }
 
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
+  const AttributeMatrix::Container_t& dataArrays = getChildren();
+  for(const auto& dataArray : dataArrays)
   {
-    IDataArray::Pointer d = iter.value();
-    d->resize(numTuples);
+    dataArray->resizeTuples(numTuples);
   }
 }
 
@@ -534,28 +499,15 @@ void AttributeMatrix::resizeAttributeArrays(const QVector<size_t>& tDims)
 // -----------------------------------------------------------------------------
 void AttributeMatrix::clearAttributeArrays()
 {
-  m_AttributeArrays.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QList<QString> AttributeMatrix::getAttributeArrayNames()
-{
-  QList<QString> keys;
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
-  {
-    keys.push_back(iter.key());
-  }
-  return keys;
+  clear();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AttributeMatrix::getNumAttributeArrays() const
+AttributeMatrix::NameList AttributeMatrix::getAttributeArrayNames()
 {
-  return static_cast<int>(m_AttributeArrays.size());
+  return getNamesOfChildren();
 }
 
 // -----------------------------------------------------------------------------
@@ -565,15 +517,15 @@ AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate)
 {
   AttributeMatrix::Pointer newAttrMat = AttributeMatrix::New(getTupleDimensions(), getName(), getType());
 
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
+  const auto& dataArrays = getChildren();
+  for(const auto& d : dataArrays)
   {
-    IDataArray::Pointer d = iter.value();
     IDataArray::Pointer new_d = d->deepCopy(forceNoAllocate);
     if(new_d.get() == nullptr)
     {
       return AttributeMatrix::NullPointer();
     }
-    newAttrMat->addAttributeArray(new_d->getName(), new_d);
+    newAttrMat->insertOrAssign(new_d);
   }
 
   return newAttrMat;
@@ -583,10 +535,11 @@ AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate)
 // -----------------------------------------------------------------------------
 int AttributeMatrix::writeAttributeArraysToHDF5(hid_t parentId)
 {
-  int err;
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
+  int err = 0;
+
+  const auto& dataArrays = getChildren();
+  for(const auto& d : dataArrays)
   {
-    IDataArray::Pointer d = iter.value();
     err = d->writeH5Data(parentId, m_TupleDims);
     if(err < 0)
     {
@@ -612,7 +565,7 @@ int AttributeMatrix::addAttributeArrayFromHDF5Path(hid_t gid, const QString& nam
     dPtr = H5DataArrayReader::ReadIDataArray(gid, name, preflight);
     if(preflight)
     {
-      dPtr->resize(getNumberOfTuples());
+      dPtr->resizeTuples(getNumberOfTuples());
     }
   }
   else if(classType.compare("StringDataArray") == 0)
@@ -620,7 +573,7 @@ int AttributeMatrix::addAttributeArrayFromHDF5Path(hid_t gid, const QString& nam
     dPtr = H5DataArrayReader::ReadStringDataArray(gid, name, preflight);
     if(preflight)
     {
-      dPtr->resize(getNumberOfTuples());
+      dPtr->resizeTuples(getNumberOfTuples());
     }
   }
   else if(classType.compare("vector") == 0)
@@ -631,7 +584,7 @@ int AttributeMatrix::addAttributeArrayFromHDF5Path(hid_t gid, const QString& nam
     dPtr = H5DataArrayReader::ReadNeighborListData(gid, name, preflight);
     if(preflight)
     {
-      dPtr->resize(getNumberOfTuples());
+      dPtr->resizeTuples(getNumberOfTuples());
     }
   }
   else if(name.compare(SIMPL::EnsembleData::Statistics) == 0)
@@ -642,13 +595,13 @@ int AttributeMatrix::addAttributeArrayFromHDF5Path(hid_t gid, const QString& nam
     dPtr = statsData;
     if(preflight)
     {
-      dPtr->resize(getNumberOfTuples());
+      dPtr->resizeTuples(getNumberOfTuples());
     }
   }
 
   if(nullptr != dPtr.get())
   {
-    addAttributeArray(dPtr->getName(), dPtr);
+    addOrReplaceAttributeArray(dPtr);
   }
 
   return err;
@@ -697,7 +650,7 @@ int AttributeMatrix::readAttributeArraysFromHDF5(hid_t amGid, bool preflight, At
 
     if(nullptr != dPtr.get())
     {
-      addAttributeArray(dPtr->getName(), dPtr);
+      addOrReplaceAttributeArray(dPtr);
     }
   }
   H5Gclose(amGid); // Close the Cell Group
@@ -713,9 +666,9 @@ QString AttributeMatrix::generateXdmfText(const QString& centering, const QStrin
   QString block;
   QTextStream out(&xdmfText);
 
-  for(QMap<QString, IDataArray::Pointer>::iterator iter = m_AttributeArrays.begin(); iter != m_AttributeArrays.end(); ++iter)
+  for(auto iter = begin(); iter != end(); ++iter)
   {
-    IDataArray::Pointer d = iter.value();
+    IDataArray::Pointer d = (*iter);
     block = writeXdmfAttributeData(d, centering, dataContainerName, hdfFileName, gridType);
     out << block;
   }
@@ -737,7 +690,7 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
     ss << "<tbody>\n";
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Matrix Info</th></tr>";
 
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Name:</th><td>" << getName() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
 
     QString typeString;
     switch(m_Type)
@@ -790,7 +743,7 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
     }
 
     QLocale usa(QLocale::English, QLocale::UnitedStates);
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << typeString << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type:</th><td>)" << typeString << "</td></tr>";
     QString tupleStr = "(";
     for(int i = 0; i < m_TupleDims.size(); i++)
     {
@@ -802,9 +755,9 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
       }
     }
     tupleStr = tupleStr + ")";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Tuple Dimensions:</th><td>" << tupleStr << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Tuple Dimensions:</th><td>)" << tupleStr << "</td></tr>";
 
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Attribute Array Count:</th><td>" << getNumAttributeArrays() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Attribute Array Count:</th><td>)" << getNumAttributeArrays() << "</td></tr>";
     ss << "</tbody></table>\n";
     ss << "</body></html>";
   }
@@ -816,7 +769,7 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, IDataArray::Pointer array, const QString& centering, int precision,
+QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArray::Pointer& array, const QString& centering, int precision,
                                                       const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType)
 {
   QString buf;
@@ -838,7 +791,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
     out << "Center=\"" << centering << "\">"
         << "\n";
     // Open the <DataItem> Tag
-    out << "      <DataItem Format=\"HDF\" Dimensions=\"" << dimStr << "\" ";
+    out << R"(      <DataItem Format="HDF" Dimensions=")" << dimStr << "\" ";
     out << "NumberType=\"" << xdmfTypeName << "\" "
         << "Precision=\"" << precision << "\" >"
         << "\n";
@@ -858,7 +811,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
     out << "Center=\"" << centering << "\">"
         << "\n";
     // Open the <DataItem> Tag
-    out << "      <DataItem ItemType=\"HyperSlab\" Dimensions=\"" << dimStrHalf << "\" ";
+    out << R"(      <DataItem ItemType="HyperSlab" Dimensions=")" << dimStrHalf << "\" ";
     out << "Type=\"HyperSlab\" "
         << "Name=\"" << array->getName() << " (Feature 0)\" >"
         << "\n";
@@ -872,7 +825,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
     out << "          " << dimStrHalf << " </DataItem>"
         << "\n";
     out << "\n";
-    out << "        <DataItem Format=\"HDF\" Dimensions=\"" << dimStr << "\" "
+    out << R"(        <DataItem Format="HDF" Dimensions=")" << dimStr << "\" "
         << "NumberType=\"" << xdmfTypeName << "\" "
         << "Precision=\"" << precision << "\" >"
         << "\n";
@@ -893,7 +846,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
     out << "Center=\"" << centering << "\">"
         << "\n";
     // Open the <DataItem> Tag
-    out << "      <DataItem ItemType=\"HyperSlab\" Dimensions=\"" << dimStrHalf << "\" ";
+    out << R"(      <DataItem ItemType="HyperSlab" Dimensions=")" << dimStrHalf << "\" ";
     out << "Type=\"HyperSlab\" "
         << "Name=\"" << array->getName() << " (Feature 1)\" >"
         << "\n";
@@ -906,7 +859,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
     out << "          " << dimStrHalf << " </DataItem>"
         << "\n";
     out << "\n";
-    out << "        <DataItem Format=\"HDF\" Dimensions=\"" << dimStr << "\" "
+    out << R"(        <DataItem Format="HDF" Dimensions=")" << dimStr << "\" "
         << "NumberType=\"" << xdmfTypeName << "\" "
         << "Precision=\"" << precision << "\" >"
         << "\n";
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index a03ffc6588..fbe58bcc16 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -57,6 +57,8 @@
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -69,7 +71,8 @@ enum RenameErrorCodes
 {
   OLD_DOES_NOT_EXIST,
   SUCCESS,
-  NEW_EXISTS
+  NEW_EXISTS,
+  SAME_PATH
 };
 
 /**
@@ -81,7 +84,7 @@ enum RenameErrorCodes
  * @date
  * @version 1.0
  */
-class SIMPLib_EXPORT AttributeMatrix : public Observable
+class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureContainerNode<IDataArray>
 {
   // clang-format off
   PYB11_CREATE_BINDINGS(AttributeMatrix)
@@ -93,8 +96,10 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(QVector<size_t> TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
 
-  PYB11_METHOD(int addAttributeArray ARGS Name Array)
   PYB11_METHOD(bool doesAttributeArrayExist ARGS Name)
+  PYB11_METHOD(bool addOrReplaceAttributeArray OVERLOAD const.IDataArray::Pointer.&,Data)
+  PYB11_METHOD(bool insertOrAssign ARGS IDataArray::Pointer)
+
   PYB11_METHOD(IDataArray removeAttributeArray ARGS Name)
   PYB11_METHOD(int renameAttributeArray ARGS OldName NewName OverWrite)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name)
@@ -108,6 +113,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
   ~AttributeMatrix() override;
 
   using EnumType = unsigned int;
+  using Container_t = std::vector<std::shared_ptr<IDataArray>>;
 
   /**
   * @brief The Type is an enum that describes the type of data that the AttributeMatrix holds
@@ -204,37 +210,56 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
     static void ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath);
 
     /**
-    * @brief Type
-    */
-    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Type, Type)
+     * @brief Creates and returns a DataArrayPath for the AttributeMatrix
+     * @return
+     */
+    DataArrayPath getDataArrayPath() const override;
 
     /**
-    * @brief Name
+    * @brief Type
     */
-    SIMPL_INSTANCE_PROPERTY(QString, Name)
-
+    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Type, Type)
 
     /**
-    * @brief Adds/overwrites the data for a named array
-    * @param name The name that the array will be known by
-    * @param data The IDataArray::Pointer that will hold the data
-    * @return error code if the addition did not work
-    */
-    virtual int addAttributeArray(const QString& name, const IDataArray::Pointer& data);
-
+     * @brief Adds the IDataArray to the AttributeMatrix.
+     * @param data The IDataArray::Pointer that will hold the data
+     * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
+     */
+    bool addOrReplaceAttributeArray(const IDataArray::Pointer& data)
+    {
+      // Can not insert a null IDataArray object
+      if(data.get() == nullptr)
+      {
+        return false;
+      }
+      if(getNumberOfTuples() != data->getNumberOfTuples())
+      {
+        qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
+        qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
+      }
+      Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
+      return insertOrAssign(data);
+    }
+    
     /**
      * @brief Returns the array for a given named array or the equivelant to a
      * null pointer if the name does not exist.
      * @param name The name of the data array
      */
-    virtual IDataArray::Pointer getAttributeArray(const QString& name);
+    IDataArray::Pointer getAttributeArray(const QString& name)
+    {
+      return getChildByName(name);
+    }
 
     /**
      * @brief getAttributeArray
      * @param path
      * @return
      */
-    virtual IDataArray::Pointer getAttributeArray(const DataArrayPath& path);
+    IDataArray::Pointer getAttributeArray(const DataArrayPath& path)
+    {
+      return getAttributeArray(path.getDataArrayName());
+    }
 
     /**
     * @brief returns a IDataArray based object that is stored in the attribute matrix by a
@@ -253,7 +278,10 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
      * @brief Returns bool of whether a named array exists
      * @param name The name of the data array
      */
-    virtual bool doesAttributeArrayExist(const QString& name) const;
+    bool doesAttributeArrayExist(const QString& name) const
+    {
+      return contains(name);
+    }
 
 
     /**
@@ -276,18 +304,30 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
      */
     virtual void clearAttributeArrays();
 
+    /**
+     * @brief Returns the collection of contained DataArrays
+     * @return
+     */
+    Container_t getAttributeArrays() const
+    {
+      return getChildren();
+    }
+
     /**
     * @brief Returns a list that contains the names of all the arrays currently stored in the
     * Cell (Formerly Cell) group
     * @return
     */
-    virtual QList<QString> getAttributeArrayNames();
+    virtual NameList getAttributeArrayNames();
 
     /**
     * @brief Returns the total number of arrays that are stored in the Cell group
     * @return
     */
-    virtual int getNumAttributeArrays() const;
+    int getNumAttributeArrays() const
+    {
+      return static_cast<int>(size());
+    }
 
 
     /**
@@ -425,7 +465,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
     typename ArrayType::Pointer createNonPrereqArray(Filter* filter,
                                                      const QString& attributeArrayName,
                                                      T initValue,
-                                                     QVector<size_t> compDims)
+                                                     QVector<size_t> compDims,
+                                                     RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
 
@@ -466,6 +507,13 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
         ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
         filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
       }
+      else if(nullptr != attributeArray && filter)
+      {
+        // Check if path was renamed
+        // This will crash if no parent node is found
+        IDataStructureNode* parentPtr = getParentNode();
+        RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(parentPtr->getName(), getName(), attributeArrayName));
+      }
       return attributeArray;
     }
 
@@ -475,7 +523,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
     * @param dims The size the data on each tuple
     */
     template<class ArrayType, class Filter, typename T>
-    void createAndAddAttributeArray(Filter* filter, const QString& name, T initValue, QVector<size_t> compDims)
+    void createAndAddAttributeArray(Filter* filter, const QString& name, T initValue, QVector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       bool allocateData = false;
       if(nullptr == filter) { allocateData = true; }
@@ -488,7 +536,11 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
           attributeArray->initializeWithValue(initValue);
         }
         attributeArray->setInitValue(initValue);
-        addAttributeArray(name, attributeArray);
+        addOrReplaceAttributeArray(attributeArray);
+        // Check if path was renamed
+        DataArrayPath path = getDataArrayPath();
+        path.setDataArrayName(name);
+        RenameDataPath::AlertFilterCreatedPath(filter, id, path);
       }
     }
 
@@ -638,7 +690,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
     virtual QString getInfoString(SIMPL::InfoStringFormat format);
 
   protected:
-    AttributeMatrix(QVector<size_t> tDims, const QString& name, AttributeMatrix::Type attrType);
+    AttributeMatrix(const QVector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
 
     /**
      * @brief writeXdmfAttributeData
@@ -664,12 +716,11 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable
      * @param gridType
      * @return
      */
-    virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, IDataArray::Pointer array, const QString& centering, int precision,
+    virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArray::Pointer& array, const QString& centering, int precision,
                                                  const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0);
 
   private:
     QVector<size_t> m_TupleDims;
-    QMap<QString, IDataArray::Pointer> m_AttributeArrays;
 
     AttributeMatrix(const AttributeMatrix&);
     void operator =(const AttributeMatrix&);
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index dfa86ab80f..220f96a8fa 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -41,6 +41,15 @@
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath::HashType DataArrayPath::GetHash(const QString& name)
+{
+  std::hash<std::string> hashFn;
+  return hashFn(name.toStdString());
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -63,7 +72,11 @@ DataArrayPath::DataArrayPath(const QString& dcName, const QString& amName, const
 : m_DataContainerName(dcName)
 , m_AttributeMatrixName(amName)
 , m_DataArrayName(daName)
+, m_DataContainerHash(GetHash(dcName))
+, m_AttributeMatrixHash(GetHash(amName))
+, m_DataArrayHash(GetHash(daName))
 {
+  updateDataType();
 }
 
 // -----------------------------------------------------------------------------
@@ -75,16 +88,18 @@ DataArrayPath::DataArrayPath(const QString& path)
 
   if(!tokens.empty())
   {
-    m_DataContainerName = tokens.at(0);
+    setDataContainerName(tokens.at(0));
   }
   if(tokens.size() > 1)
   {
-    m_AttributeMatrixName = tokens.at(1);
+    setAttributeMatrixName(tokens.at(1));
   }
   if(tokens.size() > 2)
   {
-    m_DataArrayName = tokens.at(2);
+    setDataArrayName(tokens.at(2));
   }
+
+  updateDataType();
 }
 
 // -----------------------------------------------------------------------------
@@ -92,9 +107,14 @@ DataArrayPath::DataArrayPath(const QString& path)
 // -----------------------------------------------------------------------------
 DataArrayPath::DataArrayPath(const DataArrayPath& rhs)
 {
-  m_DataContainerName = rhs.getDataContainerName();
-  m_AttributeMatrixName = rhs.getAttributeMatrixName();
-  m_DataArrayName = rhs.getDataArrayName();
+  m_DataContainerName = rhs.m_DataContainerName;
+  m_AttributeMatrixName = rhs.m_AttributeMatrixName;
+  m_DataArrayName = rhs.m_DataArrayName;
+  m_DataContainerHash = rhs.m_DataContainerHash;
+  m_AttributeMatrixHash = rhs.m_AttributeMatrixHash;
+  m_DataArrayHash = rhs.m_DataArrayHash;
+
+  updateDataType();
 }
 
 // -----------------------------------------------------------------------------
@@ -124,6 +144,11 @@ DataArrayPath& DataArrayPath::operator=(const DataArrayPath& rhs)
   m_DataContainerName = rhs.m_DataContainerName;
   m_AttributeMatrixName = rhs.m_AttributeMatrixName;
   m_DataArrayName = rhs.m_DataArrayName;
+  m_DataContainerHash = rhs.m_DataContainerHash;
+  m_AttributeMatrixHash = rhs.m_AttributeMatrixHash;
+  m_DataArrayHash = rhs.m_DataArrayHash;
+
+  updateDataType();
   return *this;
 }
 
@@ -132,13 +157,30 @@ DataArrayPath& DataArrayPath::operator=(const DataArrayPath& rhs)
 // -----------------------------------------------------------------------------
 bool DataArrayPath::operator==(const DataArrayPath& rhs) const
 {
-  return m_DataContainerName == rhs.m_DataContainerName && m_AttributeMatrixName == rhs.m_AttributeMatrixName && m_DataArrayName == rhs.m_DataArrayName;
+  return m_DataContainerHash == rhs.m_DataContainerHash && m_AttributeMatrixHash == rhs.m_AttributeMatrixHash && m_DataArrayHash == rhs.m_DataArrayHash;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPath::serialize(QString delimiter) const
+bool DataArrayPath::operator!=(const DataArrayPath& rhs) const
+{
+  bool b = (*this == rhs);
+  return !b;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataArrayPath::operator<(const DataArrayPath& rhs) const
+{
+  return serialize() < rhs.serialize();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataArrayPath::serialize(const QString& delimiter) const
 {
   QString s = "";
   if(!m_DataContainerName.isEmpty())
@@ -162,7 +204,7 @@ QString DataArrayPath::serialize(QString delimiter) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath DataArrayPath::Deserialize(QString str, QString delimiter)
+DataArrayPath DataArrayPath::Deserialize(const QString& str, const QString& delimiter)
 {
   if(str.isEmpty())
   {
@@ -193,13 +235,44 @@ DataArrayPath DataArrayPath::Deserialize(QString str, QString delimiter)
     break;
   }
 
+  path.updateDataType();
   return path;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPath::CheckRenamePath(DataContainerArrayShPtr oldDca, DataContainerArrayShPtr newDca, DataArrayPath oldPath, DataArrayPath newPath)
+void DataArrayPath::setDataContainerName(const QString& name)
+{
+  m_DataContainerName = name;
+  m_DataContainerHash = GetHash(m_DataContainerName);
+  updateDataType();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPath::setAttributeMatrixName(const QString& name)
+{
+  m_AttributeMatrixName = name;
+  m_AttributeMatrixHash = GetHash(m_AttributeMatrixName);
+  updateDataType();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPath::setDataArrayName(const QString& name)
+{
+  m_DataArrayName = name;
+  m_DataArrayHash = GetHash(m_DataArrayName);
+  updateDataType();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataArrayPath::CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath)
 {
   // If the paths are not possible renames, return false
   if(!oldPath.possibleRename(newPath))
@@ -259,14 +332,14 @@ bool DataArrayPath::CheckRenamePath(DataContainerArrayShPtr oldDca, DataContaine
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainerArrayShPtr oldDca, DataContainerArrayShPtr newDca, std::list<DataArrayPath> oldPaths, std::list<DataArrayPath> newPaths)
+DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths)
 {
   RenameContainer container;
   std::list<DataArrayPath> duplicatedPaths;
   std::list<DataArrayPath> usedNewPaths;
 
   // For each older path, check for any matching new paths.  If only one new path matches, add it as a possibility
-  for(DataArrayPath oldPath : oldPaths)
+  for(const DataArrayPath& oldPath : oldPaths)
   {
     // If the same path exists in both oldPaths and newPaths, it was not renamed
     if(std::find(newPaths.begin(), newPaths.end(), oldPath) != newPaths.end())
@@ -276,7 +349,7 @@ DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainer
 
     // Find any potential renames in newPaths for the given oldPath
     std::list<DataArrayPath> matches;
-    for(DataArrayPath newPath : newPaths)
+    for(const DataArrayPath& newPath : newPaths)
     {
       // If the same path exists in both oldPaths and newPaths, it was not renamed
       if(std::find(oldPaths.begin(), oldPaths.end(), newPath) != oldPaths.end())
@@ -293,7 +366,7 @@ DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainer
     // If this path was already used, mark it as duplicate and move on
     if(matches.size() == 1)
     {
-      DataArrayPath newPath = (*matches.begin());
+      const DataArrayPath& newPath = matches.front();
       if(usedNewPaths.end() != std::find(usedNewPaths.begin(), usedNewPaths.end(), newPath))
       {
         duplicatedPaths.push_back(newPath);
@@ -301,7 +374,7 @@ DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainer
       else
       {
         usedNewPaths.push_back(newPath);
-        container.push_back(RenameType(oldPath, newPath));
+        container.push_back(std::make_pair(oldPath, newPath));
       }
     }
   }
@@ -309,7 +382,7 @@ DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainer
   // Remove items with duplicated paths
   for(auto iter = container.begin(); iter != container.end(); )
   {
-    DataArrayPath checkPath = std::get<1>(*iter);
+    const DataArrayPath& checkPath = std::get<1>(*iter);
     if(duplicatedPaths.end() != std::find(duplicatedPaths.begin(), duplicatedPaths.end(), checkPath))
     {
       iter = container.erase(iter);
@@ -326,56 +399,54 @@ DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(DataContainer
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath::DataType DataArrayPath::getDataType()
+void DataArrayPath::updateDataType()
 {
-  if(getDataContainerName().isEmpty())
-  {
-    return DataType::None;
-  }
-  if(getAttributeMatrixName().isEmpty() && getDataArrayName().isEmpty())
+  const bool dcEmpty = m_DataContainerName.isEmpty();
+  const bool amEmpty = m_AttributeMatrixName.isEmpty();
+  const bool daEmpty = m_DataArrayName.isEmpty();
+
+  if(dcEmpty)
   {
-    return DataType::DataContainer;
+    m_DataType = DataArrayPathHelper::DataType::None;
+    return;
   }
-  if(getDataArrayName().isEmpty())
+  if(amEmpty)
   {
-    return DataType::AttributeMatrix;
+    if(daEmpty)
+    {
+      m_DataType = DataArrayPathHelper::DataType::DataContainer;
+      return;
+    }
   }
-  if(!getAttributeMatrixName().isEmpty())
+  else
   {
-    return DataType::DataArray;
+    if(daEmpty)
+    {
+      m_DataType = DataArrayPathHelper::DataType::AttributeMatrix;
+      return;
+    }
+    if(!amEmpty)
+    {
+      m_DataType = DataArrayPathHelper::DataType::DataArray;
+      return;
+    }
   }
 
-  return DataType::None;
+  m_DataType = DataArrayPathHelper::DataType::None;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<QString> DataArrayPath::toQVector()
+QVector<QString> DataArrayPath::toQVector() const
 {
   QVector<QString> v(3);
-  v[0] = m_DataContainerName;
-  v[1] = m_AttributeMatrixName;
-  v[2] = m_DataArrayName;
+  v[0] = getDataContainerName();
+  v[1] = getAttributeMatrixName();
+  v[2] = getDataArrayName();
   return v;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool DataArrayPath::isEmpty() const
-{
-  return m_DataContainerName.isEmpty() && m_AttributeMatrixName.isEmpty() && m_DataArrayName.isEmpty();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool DataArrayPath::isValid() const
-{
-  return !m_DataContainerName.isEmpty() && !m_AttributeMatrixName.isEmpty() && !m_DataArrayName.isEmpty();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -400,7 +471,7 @@ DataArrayPath DataArrayPath::GetAttributeMatrixPath(const QVector<DataArrayPath>
     return DataArrayPath();
   }
 
-    return DataArrayPath(paths.first().getDataContainerName(), paths.first().getAttributeMatrixName(), "");
+  return DataArrayPath(paths.first().getDataContainerName(), paths.first().getAttributeMatrixName(), "");
 }
 
 // -----------------------------------------------------------------------------
@@ -409,7 +480,7 @@ DataArrayPath DataArrayPath::GetAttributeMatrixPath(const QVector<DataArrayPath>
 QStringList DataArrayPath::toQStringList() const
 {
   QStringList l;
-  l << m_DataContainerName << m_AttributeMatrixName << m_DataArrayName;
+  l << getDataContainerName() << getAttributeMatrixName() << getDataArrayName();
   return l;
 }
 
@@ -418,9 +489,10 @@ QStringList DataArrayPath::toQStringList() const
 // -----------------------------------------------------------------------------
 void DataArrayPath::update(const QString& dcName, const QString& amName, const QString& daName)
 {
-  m_DataContainerName = dcName;
-  m_AttributeMatrixName = amName;
-  m_DataArrayName = daName;
+  setDataContainerName(dcName);
+  setAttributeMatrixName(amName);
+  setDataArrayName(daName);
+  updateDataType();
 }
 
 // -----------------------------------------------------------------------------
@@ -428,7 +500,7 @@ void DataArrayPath::update(const QString& dcName, const QString& amName, const Q
 // -----------------------------------------------------------------------------
 bool DataArrayPath::hasSameDataContainer(const DataArrayPath& other) const
 {
-  return (m_DataContainerName == other.m_DataContainerName);
+  return m_DataContainerHash == other.m_DataContainerHash;
 }
 
 // -----------------------------------------------------------------------------
@@ -436,7 +508,7 @@ bool DataArrayPath::hasSameDataContainer(const DataArrayPath& other) const
 // -----------------------------------------------------------------------------
 bool DataArrayPath::hasSameAttributeMatrix(const DataArrayPath& other) const
 {
-  return (m_AttributeMatrixName == other.m_AttributeMatrixName);
+  return m_AttributeMatrixHash == other.m_AttributeMatrixHash;
 }
 
 // -----------------------------------------------------------------------------
@@ -444,7 +516,7 @@ bool DataArrayPath::hasSameAttributeMatrix(const DataArrayPath& other) const
 // -----------------------------------------------------------------------------
 bool DataArrayPath::hasSameDataArray(const DataArrayPath& other) const
 {
-  return (m_DataArrayName == other.m_DataArrayName);
+  return m_DataArrayHash == other.m_DataArrayHash;
 }
 
 // -----------------------------------------------------------------------------
@@ -458,85 +530,58 @@ bool DataArrayPath::hasSameAttributeMatrixPath(const DataArrayPath& other) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPath::possibleRename(const DataArrayPath& updated) const
+bool DataArrayPath::isSubset(const DataArrayPath& other) const
 {
-  // Empty DataArrayPaths are not considered renames
-  // Neither are DataArrayPaths of different lengths
-  if(updated.getDataContainerName().isEmpty() || getDataContainerName().isEmpty())
-  {
-    return false;
-  }
-  if(updated.getAttributeMatrixName().isEmpty() != getAttributeMatrixName().isEmpty())
-  {
-    return false;
-  }
-  if(updated.getDataArrayName().isEmpty() != getDataArrayName().isEmpty())
-  {
-    return false;
-  }
+  // Check types
+  const DataArrayPathHelper::DataType type = getDataType();
+  const DataArrayPathHelper::DataType otherType = other.getDataType();
 
-  // Check number of differences
-  int differences = 0;
-  if(!hasSameDataArray(updated))
-  {
-    differences++;
-  }
-  if(!hasSameAttributeMatrix(updated))
+  // If both are of the same DataType, require identical paths
+  if(type == otherType)
   {
-    differences++;
+    return (*this) == other;
   }
-  if(!hasSameDataContainer(updated))
-  {
-    differences++;
-  }
-
-  return 1 == differences;
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool DataArrayPath::updatePath(const DataArrayPath::RenameType& renamePath)
-{
-  DataArrayPath oldPath;
-  DataArrayPath newPath;
-  std::tie(oldPath, newPath) = renamePath;
-
-  // Check for differences with original path
-  if(!hasSameDataArray(oldPath) && !oldPath.getDataArrayName().isEmpty())
-  {
-    return false;
-  }
-  if(!hasSameAttributeMatrix(oldPath) && !oldPath.getAttributeMatrixName().isEmpty())
-  {
-    return false;
-  }
-  if(!hasSameDataContainer(oldPath) && !oldPath.getDataContainerName().isEmpty())
-  {
-    return false;
-  }
-  if(oldPath.getDataContainerName().isEmpty() || newPath.getDataContainerName().isEmpty())
+  switch(otherType)
   {
-    return false;
+  case DataArrayPathHelper::DataType::DataArray:
+    // [[fallthrough]];
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    if(type == DataArrayPathHelper::DataType::DataArray)
+    {
+      return false;
+    }
+    // [[fallthrough]];
+  case DataArrayPathHelper::DataType::DataContainer:
+    if(type == DataArrayPathHelper::DataType::AttributeMatrix || type == DataArrayPathHelper::DataType::DataArray)
+    {
+      return false;
+    }
+    break;
+  case DataArrayPathHelper::DataType::None:
+    if(type != DataArrayPathHelper::DataType::None)
+    {
+      return false;
+    }
   }
 
-  // Substitude in the new DataArrayPath
-  if(hasSameDataContainer(oldPath))
+  bool valid = true;
+  switch(type)
   {
-    setDataContainerName(newPath.getDataContainerName());
-
-    if(hasSameAttributeMatrix(oldPath))
-    {
-      setAttributeMatrixName(newPath.getAttributeMatrixName());
-
-      if(hasSameDataArray(oldPath))
-      {
-        setDataArrayName(newPath.getDataArrayName());
-      }
-    }
+  case DataArrayPathHelper::DataType::DataArray:
+    valid &= m_DataArrayHash == other.m_DataArrayHash;
+    // [[fallthrough]];
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    valid &= m_AttributeMatrixHash == other.m_AttributeMatrixHash;
+    // [[fallthrough]];
+  case DataArrayPathHelper::DataType::DataContainer:
+    valid &= m_DataContainerHash == other.m_DataContainerHash;
+    break;
+  case DataArrayPathHelper::DataType::None:
+    break;
   }
-  
-  return true;
+
+  return valid;
 }
 
 // -----------------------------------------------------------------------------
@@ -595,9 +640,9 @@ bool DataArrayPath::readJson(QJsonObject& json)
 {
   if(json["Data Container Name"].isString() && json["Attribute Matrix Name"].isString() && json["Data Array Name"].isString())
   {
-    m_DataContainerName = json["Data Container Name"].toString();
-    m_AttributeMatrixName = json["Attribute Matrix Name"].toString();
-    m_DataArrayName = json["Data Array Name"].toString();
+    setDataContainerName(json["Data Container Name"].toString());
+    setAttributeMatrixName(json["Attribute Matrix Name"].toString());
+    setDataArrayName(json["Data Array Name"].toString());
     return true;
   }
   return false;
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index e383a00e56..4c3840e16d 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -42,7 +42,7 @@
 
 #include <list>
 #include <set>
-#include <tuple>
+#include <utility>
 
 #include "SIMPLib/Common/SIMPLibDLLExport.h"     // for SIMPLib_EXPORT
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"  // for SIMPL_PIMPL_PROPERTY_DECL
@@ -50,17 +50,40 @@
 class DataContainerArray;
 using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
 
+/**
+ * @brief The DataArrayPathHelper namespace is used to contain the QMetaType
+ * and enum DataType without requiring DataArrayPath to be a QObject.
+ */
+class SIMPLib_EXPORT DataArrayPathHelper final : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum class DataType
+  {
+    DataContainer,
+    AttributeMatrix,
+    DataArray,
+    None
+  };
+  Q_ENUM(DataType)
+
+  ~DataArrayPathHelper() = default;
+
+private:
+  DataArrayPathHelper() = default;
+};
+
 /**
  * @brief The DataArrayPath class holds a complete or partial path to a data array starting at the DataContainer
  * level. The class is implemented using the PIMPL design pattern.
  */
-class SIMPLib_EXPORT DataArrayPath : public QObject
+class SIMPLib_EXPORT DataArrayPath
 {
-  Q_OBJECT
-  
+
   PYB11_CREATE_BINDINGS(DataArrayPath)
   PYB11_CREATION(ARGS QString QString QString)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
   PYB11_PROPERTY(QString DataArrayName READ getDataArrayName WRITE setDataArrayName)
 
@@ -68,20 +91,23 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
   PYB11_METHOD(bool isValid)
   PYB11_METHOD(void update ARGS dcName amName daName)
 
+  using HashType = size_t;
+
+private:
+  QString m_DataContainerName;
+  QString m_AttributeMatrixName;
+  QString m_DataArrayName;
+  HashType m_DataContainerHash = 0;
+  HashType m_AttributeMatrixHash = 0;
+  HashType m_DataArrayHash = 0;
+
+  static HashType GetHash(const QString& name);
+
   public:
     // tuple <oldPath, newPath>
-    using RenameType = std::tuple<DataArrayPath, DataArrayPath>;
+    using RenameType = std::pair<DataArrayPath, DataArrayPath>;
     using RenameContainer = std::list<RenameType>;
 
-    enum class DataType
-    {
-      DataContainer,
-      AttributeMatrix,
-      DataArray,
-      None
-    };
-    Q_ENUM(DataType)
-
     DataArrayPath();
 
     /**
@@ -106,7 +132,7 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
     /**
      * @brief ~DataArrayPath
      */
-    ~DataArrayPath() override;
+    virtual ~DataArrayPath();
 
         /**
     * @brief checks that a vector of paths have the same data container and attribute matrix
@@ -139,7 +165,7 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
     * @param delimiter
     * @return
     */
-    static DataArrayPath Deserialize(QString str, QString delimiter);
+    static DataArrayPath Deserialize(const QString& str, const QString& delimiter);
 
     /**
      * @brief checks for and returns any updated DataArrayPaths between two sets
@@ -147,7 +173,7 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      * @param newPaths
      * @return
      */
-    static RenameContainer CheckForRenamedPaths(DataContainerArrayShPtr oldDca, DataContainerArrayShPtr newDca, std::list<DataArrayPath> oldPaths, std::list<DataArrayPath> newPaths);
+    static RenameContainer CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths);
 
     /**
      * @brief checks if the targets of the old DataArrayPath and new DataArrayPath are compatible in their given DataContainerArrays
@@ -156,18 +182,37 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      * @param oldPath
      * @param newPath
      */
-    static bool CheckRenamePath(DataContainerArrayShPtr oldDca, DataContainerArrayShPtr newDca, DataArrayPath oldPath, DataArrayPath newPath);
+    static bool CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath);
 
     /**
-    * @brief Returns the DataType matching the current path
-    * @return
-    */
-    DataType getDataType();
+     * @brief Returns the DataType matching the current path.
+     * @return
+     */
+    DataArrayPathHelper::DataType getDataType() const
+    {
+      return m_DataType;
+    }
 
-    SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-    SIMPL_INSTANCE_STRING_PROPERTY(AttributeMatrixName)
-    SIMPL_INSTANCE_STRING_PROPERTY(DataArrayName)
+    QString getDataContainerName() const
+    {
+      return m_DataContainerName;
+    }
 
+    QString getAttributeMatrixName() const
+    {
+      return m_AttributeMatrixName;
+    }
+
+    QString getDataArrayName() const
+    {
+      return m_DataArrayName;
+    }
+
+    void setDataContainerName(const QString& name);
+
+    void setAttributeMatrixName(const QString& name);
+
+    void setDataArrayName(const QString& name);
 
     /**
      * @brief operator =
@@ -181,26 +226,43 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      */
     bool operator==(const DataArrayPath& rhs) const;
 
+    /**
+     * @brief operator !=
+     * @param rhs
+     * @return
+     */
+    bool operator!=(const DataArrayPath& rhs) const;
+
+    /**
+     * @brief operator < is required for std::set
+     * @param rhs
+     * @return
+     */
+    bool operator<(const DataArrayPath& rhs) const;
+
     /**
      * @brief serialize Returns the path using the '|' charater by default. This can be over ridden by the programmer
      * @param delimiter
      * @return
      */
-    QString serialize(QString delimiter = "|") const;
+    QString serialize(const QString& delimiter = "|") const;
 
     /**
      * @brief getAsVector Returns the DataArrayPath represented as a QVector<String> where index[0] = DataContainer Name,
      * index[1] = AttributeMatrix Name and index[2] = DataArray Name
      * @return
      */
-    QVector<QString> toQVector();
+    QVector<QString> toQVector() const;
 
     /**
      * @brief isEmpty Returns if ALL of the string elements are empty. Note that a class could return FALSE for this
      * function and FALSE for isValid() also so this function is not a true indication of a valid path.
      * @return
      */
-    bool isEmpty() const;
+    bool isEmpty() const
+    {
+      return m_DataType == DataArrayPathHelper::DataType::None;
+    }
 
     /**
      * @brief isValid Returns if ALL of the string components have some value stored in them so 'valid' in this sense just
@@ -208,7 +270,10 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      * serialized into a path actually refer to something in your DataContainer.
      * @return
      */
-    bool isValid() const;
+    bool isValid() const
+    {
+      return m_DataType == DataArrayPathHelper::DataType::DataArray;
+    }
 
     /**
      * @brief toQStringList Converts the DataArrayPath to a QStringList
@@ -252,6 +317,13 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      */
     bool hasSameDataArray(const DataArrayPath& other) const;
 
+    /**
+     * @brief Returns true if this DataArrayPath is a subset of the given path.  Returns false otherwise.
+     * @param other
+     * @return
+     */
+    bool isSubset(const DataArrayPath& other) const;
+
     /**
      * @brief checks if the given DataArrayPath could indicate a possible renamed path.
      * This requires that the given path be no longer than the current path and only one value is changed.
@@ -259,14 +331,133 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      * @param updated
      * @return
      */
-    bool possibleRename(const DataArrayPath& updated) const;
+    bool possibleRename(const DataArrayPath& updated) const
+    {
+      // Empty DataArrayPaths are not considered renames
+      // Neither are DataArrayPaths of different lengths
+      if(getDataType() != updated.getDataType())
+      {
+        return false;
+      }
+
+      // Check number of differences
+      int differences = 0;
+      if(!hasSameDataArray(updated))
+      {
+        differences++;
+      }
+      if(!hasSameAttributeMatrix(updated))
+      {
+        differences++;
+      }
+      if(!hasSameDataContainer(updated))
+      {
+        differences++;
+      }
+
+      return 1 == differences;
+    }
 
     /**
      * @brief updates the current path based on the newPath if it matches the given previous value
      * @param renamePath
      * return
      */
-    bool updatePath(const DataArrayPath::RenameType& renamePath);
+    bool updatePath(const DataArrayPath::RenameType& renamePath)
+    {
+      const DataArrayPath& oldPath = std::get<0>(renamePath);
+      const DataArrayPath& newPath = std::get<1>(renamePath);
+
+      bool valid = true;
+      // Check for differences with original path
+      switch(oldPath.getDataType())
+      {
+      case DataArrayPathHelper::DataType::DataArray:
+        valid &= hasSameDataArray(oldPath);
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::AttributeMatrix:
+        valid &= hasSameAttributeMatrix(oldPath);
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::DataContainer:
+        valid &= hasSameDataContainer(oldPath);
+        break;
+      default:
+        valid = false;
+        break;
+      }
+
+      if(!valid)
+      {
+        return false;
+      }
+
+      // Substitude in the new DataArrayPath
+      switch(oldPath.getDataType())
+      {
+      case DataArrayPathHelper::DataType::DataArray:
+        setDataArrayName(newPath.getDataArrayName());
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::AttributeMatrix:
+        setAttributeMatrixName(newPath.getAttributeMatrixName());
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::DataContainer:
+        setDataContainerName(newPath.getDataContainerName());
+        break;
+      case DataArrayPathHelper::DataType::None:
+        break;
+      }
+
+      return true;
+    }
+
+    /**
+     * @brief Creates the missing RenameType resulting from two other RenameTypes.
+     * This can fail if the previous and new RenameTypes are not adequately related.
+     * This returns a pair of a bool signifying the success of the operation and the
+     * resulting RenameType.
+     * @param oldRename
+     * @param newRename
+     * @return std::pair<success, resulting rename>
+     */
+    static std::pair<bool, RenameType> CreateLinkingRename(const RenameType& oldRename, const RenameType& newRename)
+    {
+      const DataArrayPath& oldOldPath = std::get<0>(oldRename);
+      const DataArrayPath& oldNewPath = std::get<1>(oldRename);
+
+      const DataArrayPath& newOldPath = std::get<0>(newRename);
+      const DataArrayPath& newNewPath = std::get<1>(newRename);
+
+      // Require newOldPath to be a subset of oldNewPath
+      // Require newOldPath != oldNewPath
+      const bool isSubset = newOldPath.isSubset(oldNewPath);
+      if(!isSubset || (newOldPath == oldNewPath))
+      {
+        return std::make_pair(false, RenameType{});
+      }
+
+      // Create output rename
+      DataArrayPath replacementOldPath = oldOldPath;
+      replacementOldPath.updatePath(newRename);
+      DataArrayPath replacementNewPath = oldNewPath;
+
+      DataArrayPathHelper::DataType newOldType = newOldPath.getDataType();
+      switch(newOldType)
+      {
+      case DataArrayPathHelper::DataType::DataArray:
+        replacementNewPath.setDataArrayName(newNewPath.getDataArrayName());
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::AttributeMatrix:
+        replacementNewPath.setAttributeMatrixName(newNewPath.getAttributeMatrixName());
+        // [[fallthrough]];
+      case DataArrayPathHelper::DataType::DataContainer:
+        replacementNewPath.setDataContainerName(newNewPath.getDataContainerName());
+        break;
+      case DataArrayPathHelper::DataType::None:
+        break;
+      }
+
+      return std::make_pair(true, std::make_pair(replacementOldPath, replacementNewPath));
+    }
 
     /**
     * @brief Writes the contents of the proxy to the json object 'json'
@@ -288,19 +479,12 @@ class SIMPLib_EXPORT DataArrayPath : public QObject
      */
     QJsonObject toJsonObject() const;
 
-
   protected:
-
-
+    void updateDataType();
 
   private:
-
-
+    DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
 };
 
-
 Q_DECLARE_METATYPE(DataArrayPath)
-Q_DECLARE_METATYPE(DataArrayPath::DataType)
-
-
-
+Q_DECLARE_METATYPE(DataArrayPathHelper::DataType)
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index d397df6434..3aac1564d7 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -65,7 +65,7 @@ DataContainer::DataContainer() = default;
 //
 // -----------------------------------------------------------------------------
 DataContainer::DataContainer(const QString &name)
-  : m_Name(name)
+  : IDataStructureContainerNode(name)
 {
 }
 
@@ -87,6 +87,19 @@ DataContainer::Pointer DataContainer::New(const QString& name)
   return sharedPtr;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainer::Pointer DataContainer::New(const DataArrayPath& path)
+{
+  if(path.isEmpty())
+  {
+    return DataContainer::NullPointer();
+  }
+  DataContainer::Pointer sharedPtr(new DataContainer(path.getDataContainerName()));
+  return sharedPtr;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -148,17 +161,9 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainer::setName(const QString& name)
-{
-  m_Name = name;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString DataContainer::getName()
+DataArrayPath DataContainer::getDataArrayPath() const
 {
-  return m_Name;
+  return DataArrayPath(getName(), "", "");
 }
 
 // -----------------------------------------------------------------------------
@@ -177,90 +182,29 @@ IGeometry::Pointer DataContainer::getGeometry()
   return m_Geometry;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-DataContainer::AttributeMatrixMap_t& DataContainer::getAttributeMatrices()
-{
-  return m_AttributeMatrices;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool DataContainer::doesAttributeMatrixExist(const QString& name)
-{
-  return m_AttributeMatrices.contains(name);
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 AttributeMatrix::Pointer DataContainer::createAndAddAttributeMatrix(const QVector<size_t>& tDims, const QString& attrMatName, AttributeMatrix::Type attrType)
 {
   AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, attrMatName, attrType);
-  addAttributeMatrix(attrMatName, attrMat);
+  addOrReplaceAttributeMatrix(attrMat);
   return attrMat; // Return the shared pointer
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataContainer::addAttributeMatrix(const QString& name, const AttributeMatrix::Pointer& data)
-{
-  if(data->getName().compare(name) != 0)
-  {
-    qDebug() << "Adding Attribute Matrix with a different name than key name";
-    qDebug() << "Key name: " << name;
-    qDebug() << "AttributeMatrix Name: " << data->getName();
-    qDebug() << "This action is NOT typical of DREAM3D Usage. Are you sure you want to be doing this? We are forcing the name of the AttributeMatrix to be the same as the key";
-    data->setName(name);
-  }
-  m_AttributeMatrices[name] = data;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-AttributeMatrix::Pointer DataContainer::getAttributeMatrix(const QString& name)
-{
-  QMap<QString, AttributeMatrix::Pointer>::iterator it;
-  it = m_AttributeMatrices.find(name);
-  if(it == m_AttributeMatrices.end())
-  {
-    return AttributeMatrix::NullPointer();
-  }
-  return it.value();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-AttributeMatrix::Pointer DataContainer::getAttributeMatrix(const DataArrayPath& path)
-{
-  QMap<QString, AttributeMatrix::Pointer>::iterator it;
-  it = m_AttributeMatrices.find(path.getAttributeMatrixName());
-  if(it == m_AttributeMatrices.end())
-  {
-    return AttributeMatrix::NullPointer();
-  }
-  return it.value();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 AttributeMatrix::Pointer DataContainer::removeAttributeMatrix(const QString& name)
 {
-  QMap<QString, AttributeMatrix::Pointer>::iterator it;
-  it = m_AttributeMatrices.find(name);
-  if(it == m_AttributeMatrices.end())
+  auto it = find(name);
+  if(it == end())
   {
-    // DO NOT return a NullPointer for any reason other than "Attribute Matrix was not found"
+    // DO NOT return a NullPointer for any reason other than "AttributeMatrix was not found"
     return AttributeMatrix::NullPointer();
   }
-  AttributeMatrix::Pointer p = it.value();
-  m_AttributeMatrices.erase(it);
+  AttributeMatrix::Pointer p = (*it);
+  erase(it);
   return p;
 }
 
@@ -269,32 +213,8 @@ AttributeMatrix::Pointer DataContainer::removeAttributeMatrix(const QString& nam
 // -----------------------------------------------------------------------------
 bool DataContainer::renameAttributeMatrix(const QString& oldname, const QString& newname, bool overwrite)
 {
-  QMap<QString, AttributeMatrix::Pointer>::iterator it;
-  it = m_AttributeMatrices.find(oldname);
-  if(it == m_AttributeMatrices.end())
-  {
-    return false;
-  }
-  AttributeMatrix::Pointer p = it.value();
-  p->setName(newname);
-  removeAttributeMatrix(oldname);
-
-  // Now check to make sure there isn't one with the same name
-  it = m_AttributeMatrices.find(newname);
-  if(it == m_AttributeMatrices.end()) // Didn't find another AttributeMatrix with the new name
-  {
-    addAttributeMatrix(newname, p);
-  }
-  else if(overwrite) // We are here because we found another attribute matrix with the new name
-  {
-    AttributeMatrix::Pointer removedAttributeMatrix = removeAttributeMatrix(newname); // Remove the existing one
-    addAttributeMatrix(newname, p);
-  }
-  else
-  {
-    return false;
-  }
-  return true;
+  auto am = getChildByName(oldname);
+  return am && am->setName(newname);
 }
 
 // -----------------------------------------------------------------------------
@@ -302,28 +222,15 @@ bool DataContainer::renameAttributeMatrix(const QString& oldname, const QString&
 // -----------------------------------------------------------------------------
 void DataContainer::clearAttributeMatrices()
 {
-  m_AttributeMatrices.clear();
+  clear();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QList<QString> DataContainer::getAttributeMatrixNames()
+DataContainer::NameList DataContainer::getAttributeMatrixNames()
 {
-  QList<QString> keys;
-  for(QMap<QString, AttributeMatrix::Pointer>::iterator iter = m_AttributeMatrices.begin(); iter != m_AttributeMatrices.end(); ++iter)
-  {
-    keys.push_back(iter.key());
-  }
-  return keys;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int DataContainer::getNumAttributeMatrices()
-{
-  return static_cast<int>(m_AttributeMatrices.size());
+  return getNamesOfChildren();
 }
 
 // -----------------------------------------------------------------------------
@@ -333,31 +240,32 @@ int DataContainer::writeAttributeMatricesToHDF5(hid_t parentId)
 {
   int err;
   hid_t attributeMatrixId;
-  for(QMap<QString, AttributeMatrix::Pointer>::iterator iter = m_AttributeMatrices.begin(); iter != m_AttributeMatrices.end(); ++iter)
+  for(auto iter = begin(); iter != end(); ++iter)
   {
-    AttributeMatrix::Pointer attrMat = iter.value();
+    auto attrMat = (*iter);
+    const QString amName = attrMat->getName();
 
-    err = QH5Utilities::createGroupsFromPath(iter.key(), parentId);
+    err = QH5Utilities::createGroupsFromPath(amName, parentId);
     if(err < 0)
     {
       return err;
     }
-    attributeMatrixId = H5Gopen(parentId, iter.key().toLatin1().data(), H5P_DEFAULT);
+    attributeMatrixId = H5Gopen(parentId, attrMat->getName().toLatin1().data(), H5P_DEFAULT);
     H5ScopedGroupSentinel gSentinel(&attributeMatrixId, false);
 
     AttributeMatrix::EnumType attrMatType = static_cast<AttributeMatrix::EnumType>(attrMat->getType());
-    err = QH5Lite::writeScalarAttribute(parentId, iter.key(), SIMPL::StringConstants::AttributeMatrixType, attrMatType);
+    err = QH5Lite::writeScalarAttribute(parentId, amName, SIMPL::StringConstants::AttributeMatrixType, attrMatType);
     if(err < 0)
     {
       return err;
     }
-    hsize_t size = (*iter)->getTupleDimensions().size();
-    err = QH5Lite::writePointerAttribute(parentId, iter.key(), SIMPL::HDF5::TupleDimensions, 1, &size, (*iter)->getTupleDimensions().data());
+    hsize_t size = attrMat->getTupleDimensions().size();
+    err = QH5Lite::writePointerAttribute(parentId, amName, SIMPL::HDF5::TupleDimensions, 1, &size, attrMat->getTupleDimensions().data());
     if(err < 0)
     {
       return err;
     }
-    err = (*iter)->writeAttributeArraysToHDF5(attributeMatrixId);
+    err = attrMat->writeAttributeArraysToHDF5(attributeMatrixId);
     if(err < 0)
     {
       return err;
@@ -408,7 +316,7 @@ int DataContainer::readAttributeMatricesFromHDF5(bool preflight, hid_t dcGid, Da
     {
       amType = static_cast<AttributeMatrix::Type>(amTypeTmp);
       AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, amName, amType);
-      addAttributeMatrix(amName, am);
+      addOrReplaceAttributeMatrix(am);
     }
 
     AttributeMatrixProxy amProxy = iter.value();
@@ -439,10 +347,11 @@ DataContainer::Pointer DataContainer::deepCopy(bool forceNoAllocate)
     dcCopy->setGeometry(geomCopy);
   }
 
-  for(auto & iter : getAttributeMatrices())
+  const auto attrMatrices = getChildren();
+  for(const auto& am : attrMatrices)
   {
-    AttributeMatrix::Pointer attrMat = iter->deepCopy(forceNoAllocate);
-    dcCopy->addAttributeMatrix(attrMat->getName(), attrMat);
+    AttributeMatrix::Pointer attrMat = am->deepCopy(forceNoAllocate);
+    dcCopy->addOrReplaceAttributeMatrix(attrMat);
   }
 
   return dcCopy;
@@ -535,14 +444,12 @@ int DataContainer::writeXdmf(QTextStream& out, const QString& hdfFileName)
   m_Geometry->writeXdmf(out, getName(), hdfFileName);
   IGeometry::Type geomType = m_Geometry->getGeometryType();
 
-  // Get all of our AttributeMatrices
-  AttributeMatrixMap_t amMap = getAttributeMatrices();
   // Loop over each AttributeMatrix and write the meta data to the Xdmf file
   QString xdmfCenter = "";
-  for(QMap<QString, AttributeMatrix::Pointer>::iterator iter = amMap.begin(); iter != amMap.end(); ++iter)
+  for(auto iter = begin(); iter != end(); ++iter)
   {
     xdmfCenter = "";
-    AttributeMatrix::Pointer attrMat = iter.value();
+    AttributeMatrix::Pointer attrMat = (*iter);
     AttributeMatrix::Type amType = attrMat->getType();
     switch(geomType)
     {
@@ -824,15 +731,14 @@ int DataContainer::readMeshDataFromHDF5(hid_t dcGid, bool preflight)
 // -----------------------------------------------------------------------------
 QVector<DataArrayPath> DataContainer::getAllDataArrayPaths()
 {
-
   QVector<DataArrayPath> paths;
-  for(QMap<QString, AttributeMatrix::Pointer>::iterator iter = m_AttributeMatrices.begin(); iter != m_AttributeMatrices.end(); ++iter)
+  const auto attributeMatrices = getChildren();
+  for(const auto& am : attributeMatrices)
   {
-    AttributeMatrix::Pointer am = iter.value();
     QString amName = am->getName();
-    QList<QString> aaNames = am->getAttributeArrayNames();
+    NameList aaNames = am->getAttributeArrayNames();
 
-    foreach(QString aaName, aaNames)
+    for(QString aaName : aaNames)
     {
       DataArrayPath dap(getName(), amName, aaName);
       paths.push_back(dap);
@@ -923,19 +829,30 @@ AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* fil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType)
+AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id)
 {
-  return createNonPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), tDims, amType);
+  return createNonPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), tDims, amType, id);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t> &tDims, AttributeMatrix::Type amType)
+AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const SizeVec3Type& tDims, AttributeMatrix::Type amType,
+                                                                   RenameDataPath::DataID_t id)
 {
-  AttributeMatrixShPtr attributeMatrix(nullptr);
+  QVector<size_t> tupleDims;
+  for(const auto& value : tDims)
+  {
+    tupleDims.push_back(value);
+  }
+  return createNonPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), tupleDims, amType, id);
+}
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t> &tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id)
+{
   QString ss;
   if(attributeMatrixName.isEmpty())
   {
@@ -945,7 +862,7 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
       ss = QObject::tr("The name of the Attribute Matrix was empty. Please provide a name for this Attribute Matrix.");
       filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
     }
-    return attributeMatrix;
+    return nullptr;
   }
 
   if(attributeMatrixName.contains('/'))
@@ -956,7 +873,7 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
       ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(attributeMatrixName);
       filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
     }
-    return attributeMatrix;
+    return nullptr;
   }
 
   if(attributeMatrixName.compare(SIMPL::Geometry::Geometry) == 0)
@@ -967,12 +884,14 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
       ss = QObject::tr("%1 is a protected name.  Please provide a different name for this Attribute Matrix.").arg(SIMPL::Geometry::Geometry);
       filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
     }
-    return attributeMatrix;
+    return nullptr;
   }
-  attributeMatrix = getAttributeMatrix(attributeMatrixName);
+  AttributeMatrixShPtr attributeMatrix = getAttributeMatrix(attributeMatrixName);
   if(nullptr == attributeMatrix.get())
   {
     attributeMatrix = createAndAddAttributeMatrix(tDims, attributeMatrixName, amType);
+    // Check if path was renamed
+    RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(getName(), attributeMatrixName, ""));
     return attributeMatrix;
   }
   if(filter != nullptr) // If the filter object is NOT null (is valid) then set the error condition and send an error message
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index bafc1fd8b9..42b5bad79a 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -42,8 +42,11 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/Common/Observable.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -60,19 +63,21 @@ using AttributeMatrixShPtr = std::shared_ptr<AttributeMatrix>;
 /**
  * @brief The DataContainer class
  */
-class SIMPLib_EXPORT DataContainer : public Observable
+class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureContainerNode<AttributeMatrix>
 {
 
   // This line MUST be first when exposing a class and properties to Python
   // clang-format off
   PYB11_CREATE_BINDINGS(DataContainer)
-  PYB11_STATIC_CREATION(New ARGS QString)
+  PYB11_STATIC_CREATION(New OVERLOAD QString)
+  PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
 
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(IGeometry Geometry READ getGeometry WRITE setGeometry)
 
   PYB11_METHOD(QString getInfoString ARGS InfoStringFormat)
-  PYB11_METHOD(void addAttributeMatrix ARGS Name AttributeMatrix)
+  PYB11_METHOD(bool addOrReplaceAttributeMatrix ARGS AttributeMatrix)
+  PYB11_METHOD(bool insertOrAssign ARGS AttributeMatrix)
 
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.QString.&,Name)
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.DataArrayPath.&,Path)
@@ -108,10 +113,12 @@ class SIMPLib_EXPORT DataContainer : public Observable
 
   using Types = QVector<Type>;
 
+  using Container_t = std::vector<AttributeMatrixShPtr>;
+
   /**
    * @brief AttributeMatrixMap_t
    */
-  using AttributeMatrixMap_t = QMap<QString, AttributeMatrixShPtr>;
+  //using AttributeMatrixMap_t = QMap<QString, AttributeMatrixShPtr>;
 
   /**
    * @brief Creates a new shared pointer instance of this class
@@ -120,6 +127,13 @@ class SIMPLib_EXPORT DataContainer : public Observable
    */
   static Pointer New(const QString& name);
 
+  /**
+   * @brief Creates a new shared pointer instance of this class
+   * @param name The name to give to the DataContainer and must NOT be empty.
+   * @return Shared Pointer to a DataContainer instance.
+   */
+  static Pointer New(const DataArrayPath& name);
+
   /**
    * @brief Creates a new data container
    */
@@ -134,14 +148,10 @@ class SIMPLib_EXPORT DataContainer : public Observable
   static void ReadDataContainerStructure(hid_t dcArrayGroupId, DataContainerArrayProxy& proxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath);
 
   /**
-   * @brief Sets the name of the data container
-   */
-  virtual void setName(const QString& name);
-
-  /**
-   * @brief Gets the name of the data container
+   * @brief Creates and returns a DataArrayPath for the DataContainer
+   * @return
    */
-  virtual QString getName();
+  DataArrayPath getDataArrayPath() const override;
 
   /**
    * @brief Sets the geometry of the data container
@@ -161,37 +171,49 @@ class SIMPLib_EXPORT DataContainer : public Observable
   virtual QString getInfoString(SIMPL::InfoStringFormat format);
 
   /**
-   * @brief Adds/overwrites the data for a named array
-   * @param name The name that the array will be known by
-   * @param data The IDataArray::Pointer that will hold the data
+   * @brief Adds the data for a named array. If an AttributeMatrix with the same
+   * name already exists in the DataContainer then the add will fail.
+   * @param matrix The IDataArray::Pointer that will hold the data
+   * @return Bool TRUE if the addition was successful, FALSE Otherwise.
    */
-  virtual void addAttributeMatrix(const QString& name, const AttributeMatrixShPtr& matrix);
-
+  bool addOrReplaceAttributeMatrix(const AttributeMatrixShPtr& matrix)
+  {
+    return insertOrAssign(matrix);
+  }
+  
   /**
    * @brief Returns the array for a given named array or the equivelant to a
    * null pointer if the name does not exist.
    * @param name The name of the data array
    */
-  virtual AttributeMatrixShPtr getAttributeMatrix(const QString& name);
+  AttributeMatrixShPtr getAttributeMatrix(const QString& name)
+  {
+    return getChildByName(name);
+  }
 
   /**
    * @brief Returns the array for a given named array or the equivelant to a
    * null pointer if the name does not exist.
    * @param name The Name of the AttributeMatrix will be extracted from the DataArratPath object
    */
-  virtual AttributeMatrixShPtr getAttributeMatrix(const DataArrayPath& path);
-
-  /**
-   * @brief getAttributeMatrices
-   * @return
-   */
-  AttributeMatrixMap_t& getAttributeMatrices();
+  AttributeMatrixShPtr getAttributeMatrix(const DataArrayPath& path)
+  {
+    // Could this be sped-up if we hashed DataArrayPath as well?
+    if(path.getDataContainerName() != getName())
+    {
+      return nullptr;
+    }
+    return getChildByName(path.getAttributeMatrixName());
+  }
 
   /**
    * @brief Returns bool of whether a named array exists
    * @param name The name of the data array
    */
-  virtual bool doesAttributeMatrixExist(const QString& name);
+  bool doesAttributeMatrixExist(const QString& name)
+  {
+    return contains(name);
+  }
 
   /**
    * @brief Removes the named data array from the Data Container and returns it to the calling
@@ -212,18 +234,26 @@ class SIMPLib_EXPORT DataContainer : public Observable
    */
   virtual void clearAttributeMatrices();
 
+  Container_t getAttributeMatrices()
+  {
+    return getChildren();
+  }
+
   /**
    * @brief Returns a list that contains the names of all the arrays currently stored in the
    * Cell (Formerly Cell) group
    * @return
    */
-  virtual QList<QString> getAttributeMatrixNames();
+  virtual NameList getAttributeMatrixNames();
 
   /**
    * @brief Returns the total number of arrays that are stored in the Cell group
    * @return
    */
-  virtual int getNumAttributeMatrices();
+  int getNumAttributeMatrices()
+  {
+    return static_cast<int>(size());
+  }
 
   /**
    * @brief getAllDataArrayPaths
@@ -253,7 +283,18 @@ class SIMPLib_EXPORT DataContainer : public Observable
    * @param amType The Type of AttributeMatrix
    * @return A Shared Pointer to the AttributeMatrix
    */
-  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType);
+  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+
+  /**
+   * @brief createNonPrereqAttributeMatrix
+   * @param filter
+   * @param path
+   * @param tDims
+   * @param amType
+   * @param id
+   * @return
+   */
+  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const SizeVec3Type& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id);
 
   /**
    * @brief createNonPrereqAttributeMatrix This method will create a new AttributeMatrix with the given tuple dimensions
@@ -265,7 +306,7 @@ class SIMPLib_EXPORT DataContainer : public Observable
    * @param amType The Type of AttributeMatrix
    * @return A Shared Pointer to the AttributeMatrix
    */
-  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t>& tDims, AttributeMatrix::Type amType);
+  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 
   /**
    * @brief Returns the geometry as the templated type
@@ -369,7 +410,5 @@ class SIMPLib_EXPORT DataContainer : public Observable
   explicit DataContainer(const QString& name);
 
 private:
-  AttributeMatrixMap_t m_AttributeMatrices;
   IGeometry::Pointer m_Geometry;
-  QString m_Name;
 };
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 30293b1e2c..7cc15ae0c7 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -50,9 +50,9 @@ DataContainerArray::~DataContainerArray() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerArray::addDataContainer(DataContainer::Pointer f)
+DataArrayPath DataContainerArray::getDataArrayPath() const
 {
-  m_Array.push_back(f);
+  return DataArrayPath();
 }
 
 // -----------------------------------------------------------------------------
@@ -60,7 +60,7 @@ void DataContainerArray::addDataContainer(DataContainer::Pointer f)
 // -----------------------------------------------------------------------------
 int DataContainerArray::getNumDataContainers()
 {
-  return m_Array.size();
+  return static_cast<int>(size());
 }
 
 // -----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ int DataContainerArray::getNumDataContainers()
 // -----------------------------------------------------------------------------
 void DataContainerArray::clearDataContainers()
 {
-  m_Array.clear();
+  clear();
 }
 
 #if 0
@@ -122,19 +122,15 @@ bool DataContainerArray::empty()
 DataContainer::Pointer DataContainerArray::removeDataContainer(const QString& name)
 {
   removeDataContainerFromBundles(name);
-  DataContainer::Pointer f = DataContainer::NullPointer();
-  for(QList<DataContainer::Pointer>::iterator it = m_Array.begin(); it != m_Array.end(); ++it)
+  auto it = find(name);
+  if(it == end())
   {
-    if((*it)->getName().compare(name) == 0)
-    {
-      f = *it;
-      m_Array.erase(it);
-      return f;
-    }
+    // DO NOT return a NullPointer for any reason other than "DataContainer was not found"
+    return DataContainer::NullPointer();
   }
-
-  // DO NOT return a NullPointer for any reason other than "DataContainer was not found"
-  return f;
+  DataContainer::Pointer p = (*it);
+  erase(it);
+  return p;
 }
 
 // -----------------------------------------------------------------------------
@@ -142,41 +138,17 @@ DataContainer::Pointer DataContainerArray::removeDataContainer(const QString& na
 // -----------------------------------------------------------------------------
 bool DataContainerArray::renameDataContainer(const QString& oldName, const QString& newName)
 {
-  DataContainer::Pointer dc = DataContainer::NullPointer();
-
-  // Make sure we do not already have a DataContainer with the newname
-  for(const auto& iter : m_Array)
-  {
-    if(iter->getName().compare(newName) == 0)
-    {
-      dc = iter;
-      break;
-    }
-  }
-
-  if(nullptr == dc)
-  {
-    // We did not find any data container that matches the new name so we can rename if we find one that matches
-    // the 'oldname' argument
-    // Now find the data container we want to rename
-    for(const auto& iter : m_Array)
-    {
-      if(iter->getName() == oldName)
-      {
-        // we have an existing DataContainer that matches our "oldname" that we want to rename so all is good.
-        dc = iter;
-        dc->setName(newName);
-        return true;
-      }
-    }
-  }
-  else if(nullptr != dc)
-  {
-    // We found an existing Data Container with the 'newname' but we do NOT want to over write it so just bail out now
-    return false;
-  }
+  DataContainer::Pointer dc = getChildByName(oldName);
+  return dc && dc->setName(newName);
+}
 
-  return false; // default (but we should just NEVER make it here)
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerArray::renameDataContainer(const DataArrayPath& oldName, const DataArrayPath& newName)
+{
+  DataContainer::Pointer dc = getChildByName(oldName.getDataContainerName());
+  return dc && dc->setName(newName.getDataContainerName());
 }
 
 // -----------------------------------------------------------------------------
@@ -184,17 +156,7 @@ bool DataContainerArray::renameDataContainer(const QString& oldName, const QStri
 // -----------------------------------------------------------------------------
 DataContainer::Pointer DataContainerArray::getDataContainer(const QString& name)
 {
-  DataContainer::Pointer f = DataContainer::NullPointer();
-  for(const auto& dc : m_Array)
-  {
-    if(dc->getName().compare(name) == 0)
-    {
-      f = dc;
-      break;
-    }
-  }
-
-  return f;
+  return getChildByName(name);
 }
 
 // -----------------------------------------------------------------------------
@@ -225,16 +187,7 @@ AttributeMatrix::Pointer DataContainerArray::getAttributeMatrix(const DataArrayP
 // -----------------------------------------------------------------------------
 void DataContainerArray::duplicateDataContainer(const QString& name, const QString& newName)
 {
-  DataContainer::Pointer f = DataContainer::NullPointer();
-  for(const auto& dc : m_Array)
-  {
-    if(dc->getName().compare(name) == 0)
-    {
-      f = dc;
-      break;
-    }
-  }
-
+  DataContainer::Pointer f = getDataContainer(name);
   if(f == nullptr)
   {
     return;
@@ -242,28 +195,23 @@ void DataContainerArray::duplicateDataContainer(const QString& name, const QStri
 
   DataContainer::Pointer new_f = f->deepCopy(false);
   new_f->setName(newName);
-  addDataContainer(new_f);
+  addOrReplaceDataContainer(new_f);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QList<QString> DataContainerArray::getDataContainerNames()
+DataContainerArray::NameList DataContainerArray::getDataContainerNames()
 {
-  QList<QString> names;
-  for(const auto& dc : m_Array)
-  {
-    names.push_back(dc->getName());
-  }
-  return names;
+  return getNamesOfChildren();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QList<DataContainer::Pointer>& DataContainerArray::getDataContainers()
+DataContainerArray::Container DataContainerArray::getDataContainers()
 {
-  return m_Array;
+  return getChildren();
 }
 
 // -----------------------------------------------------------------------------
@@ -272,7 +220,8 @@ QList<DataContainer::Pointer>& DataContainerArray::getDataContainers()
 void DataContainerArray::printDataContainerNames(QTextStream& out)
 {
   out << "---------------------------------------------------------------------";
-  for(const auto& dc : m_Array)
+  Container dcArray = getDataContainers();
+  for(DataContainer::Pointer dc : dcArray)
   {
     out << dc->getNameOfClass();
   }
@@ -306,7 +255,7 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
       return -198745600;
     }
     DataContainer::Pointer dc = DataContainer::New(dcProxy.getName());
-    this->addDataContainer(dc);
+    this->addOrReplaceDataContainer(dc);
 
     // Now open the DataContainer Group in the HDF5 file
     hid_t dcGid = H5Gopen(dcaGid, dcProxy.getName().toLatin1().data(), H5P_DEFAULT);
@@ -347,16 +296,17 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataContainerArray::doesDataContainerExist(const QString& name)
+bool DataContainerArray::doesDataContainerExist(const DataArrayPath& dap) const
 {
-  for(const auto& dc : m_Array)
-  {
-    if(dc->getName() == name)
-    {
-      return true;
-    }
-  }
-  return false;
+  return contains(dap.getDataContainerName());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerArray::doesDataContainerExist(const QString& name) const
+{
+  return contains(name);
 }
 
 // -----------------------------------------------------------------------------
@@ -415,7 +365,7 @@ IDataContainerBundle::Pointer DataContainerArray::getDataContainerBundle(const Q
   IDataContainerBundle::Pointer f = IDataContainerBundle::NullPointer();
   for(QMap<QString, IDataContainerBundle::Pointer>::iterator it = m_DataContainerBundles.begin(); it != m_DataContainerBundles.end(); ++it)
   {
-    if((*it)->getName().compare(name) == 0)
+    if((*it)->getName() == name)
     {
       f = *it;
       break;
@@ -480,9 +430,9 @@ bool DataContainerArray::renameDataContainerBundle(const QString& oldName, const
       return false;
     }
 
-      m_DataContainerBundles.insert(newName, iter.value());
-      iter.value()->setName(newName);
-      m_DataContainerBundles.remove(oldName);
+    m_DataContainerBundles.insert(newName, iter.value());
+    iter.value()->setName(newName);
+    m_DataContainerBundles.remove(oldName);
   }
   return false;
 }
@@ -493,40 +443,13 @@ bool DataContainerArray::renameDataContainerBundle(const QString& oldName, const
 DataContainerArray::Pointer DataContainerArray::deepCopy(bool forceNoAllocate)
 {
   DataContainerArray::Pointer dcaCopy = DataContainerArray::New();
-  QList<DataContainer::Pointer> dcs = getDataContainers();
-  for(int i = 0; i < dcs.size(); i++)
+  const Container dcs = getDataContainers();
+  for(const auto& dc : dcs)
   {
-    DataContainer::Pointer dcCopy = dcs[i]->deepCopy(forceNoAllocate);
-#if 0
-
-    // Deep copy geometry if applicable
-    if(nullptr != dcs[i]->getGeometry().get())
-    {
-      dcCopy->setGeometry(dcs[i]->getGeometry()->deepCopy());
-    }
-
-    // Add AttributeMatrix copies
-    QMap<QString, AttributeMatrix::Pointer> ams = dcs[i]->getAttributeMatrices();
-    for(QMap<QString, AttributeMatrix::Pointer>::Iterator iter = ams.begin(); iter != ams.end(); iter++)
-    {
-      QVector<size_t> dims = (*iter)->getTupleDimensions();
-      AttributeMatrix::Pointer amCopy = AttributeMatrix::New(dims, (*iter)->getName(), (*iter)->getType());
-
-      // Add DataArray copies without allocating memory
-      QList<QString> daNames = (*iter)->getAttributeArrayNames();
-      for(int i = 0; i < daNames.size(); i++)
-      {
-        // Copy and add DataArray to AttributeMatrix copy without allocating memory
-        IDataArray::Pointer daCopy = (*iter)->getAttributeArray(daNames[i])->deepCopy(true);
-        amCopy->addAttributeArray(daNames[i], daCopy);
-      }
+    DataContainer::Pointer dcCopy = dc->deepCopy(forceNoAllocate);
 
-      // End add AttributeMatrix
-      dcCopy->addAttributeMatrix(amCopy->getName(), amCopy);
-    }
-#endif
     // End add DataContainer
-    dcaCopy->addDataContainer(dcCopy);
+    dcaCopy->push_back(dcCopy);
   }
 
   return dcaCopy;
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index e3554dc618..7dd71f0b62 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -46,6 +46,8 @@
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/IDataContainerBundle.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 
 
 class DataContainer;
@@ -60,26 +62,30 @@ using DataContainerShPtr = std::shared_ptr<DataContainer>;
  * @date Sep 28, 2011
  * @version 1.0
  */
-class SIMPLib_EXPORT DataContainerArray : public QObject
+class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureContainerNode<DataContainer>
 {
   Q_OBJECT
   // clang-format off
   PYB11_CREATE_BINDINGS(DataContainerArray)
 
-  PYB11_METHOD(void addDataContainer ARGS data_container)
-  //PYB11_METHOD(DataContainer::Pointer getDataContainer ARGS name)
-  PYB11_METHOD(bool doesDataContainerExist ARGS name)
-  PYB11_METHOD(DataContainer::Pointer removeDataContainer ARGS name)
-  PYB11_METHOD(bool renameDataContainer ARGS oldName newName)
+  PYB11_METHOD(bool addOrReplaceDataContainer ARGS DataContainer)
+  PYB11_METHOD(bool insertOrAssign ARGS DataContainer)
+  PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
+  PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
+
+  PYB11_METHOD(DataContainer::Pointer removeDataContainer ARGS Name)
+  PYB11_METHOD(bool renameDataContainer OVERLOAD const.QString.&,OldName const.QString.&,NewName)
+  PYB11_METHOD(bool renameDataContainer OVERLOAD const.DataArrayPath.&,OldPath const.DataArrayPath.&,NewPath )
+
   PYB11_METHOD(void clearDataContainers)
   //PYB11_METHOD(XXXX getDataContainerNames)
   PYB11_METHOD(int getNumDataContainers)
-  PYB11_METHOD(void duplicateDataContainer ARGS oldName, newName)
+  PYB11_METHOD(void duplicateDataContainer ARGS OldName, NewName)
 
-  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix ARGS dataArrayPath)
-  PYB11_METHOD(bool doesAttributeMatrixExist ARGS dataArrayPath)
+  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix ARGS DataArrayPath)
+  PYB11_METHOD(bool doesAttributeMatrixExist ARGS DataArrayPath)
 
-  PYB11_METHOD(bool doesAttributeArrayExist ARGS dataArrayPath)
+  PYB11_METHOD(bool doesAttributeArrayExist ARGS DataArrayPath)
   // clang-format on
 
 public:
@@ -87,12 +93,23 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
   SIMPL_STATIC_NEW_MACRO(DataContainerArray)
   SIMPL_TYPE_MACRO(DataContainerArray)
 
+  using Container = ChildCollection;
+
   ~DataContainerArray() override;
 
+  /**
+   * @brief Creates and returns an empty DataArrayPath
+   * @return
+   */
+  DataArrayPath getDataArrayPath() const override;
+
   /**
    * @brief
    */
-  virtual void addDataContainer(DataContainerShPtr f);
+  bool addOrReplaceDataContainer(const DataContainerShPtr& f)
+  {
+    return insertOrAssign(f);
+  }
 
   /**
    * @brief getDataContainer
@@ -112,14 +129,21 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
    * @brief getDataContainers
    * @return
    */
-  QList<DataContainerShPtr>& getDataContainers();
+  Container getDataContainers();
 
   /**
    * @brief Returns if a DataContainer with the give name is in the array
    * @param name The name of the DataContiner to find
    * @return
    */
-  virtual bool doesDataContainerExist(const QString& name);
+  virtual bool doesDataContainerExist(const QString& name) const;
+
+  /**
+   * @brief doesDataContainerExist
+   * @param dap
+   * @return
+   */
+  virtual bool doesDataContainerExist(const DataArrayPath& dap) const;
 
   /**
    * @brief DataContainerArray::doesAttributeMatrixExist
@@ -148,6 +172,14 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
    */
   bool renameDataContainer(const QString& oldName, const QString& newName);
 
+  /**
+   * @brief renameDataContainer
+   * @param oldName
+   * @param newName
+   * @return
+   */
+  bool renameDataContainer(const DataArrayPath& oldName, const DataArrayPath& newName);
+
   /**
    * @brief Removes all DataContainers from this DataContainerArray
    */
@@ -157,7 +189,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
    * @brief getDataContainerNames
    * @return
    */
-  QList<QString> getDataContainerNames();
+  NameList getDataContainerNames();
 
   /**
    * @brief Returns the number of DataContainers
@@ -253,6 +285,11 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
     */
     void renameDataArrayPaths(DataArrayPath::RenameContainer renamePaths);
 
+    template <class Filter> DataContainerShPtr getPrereqDataContainer(Filter* filter, const DataArrayPath& dap, bool createIfNotExists = false)
+    {
+      return getPrereqDataContainer(filter, dap.getDataContainerName(), createIfNotExists);
+    }
+
     /**
      * @brief getPrereqDataContainer
      * @param name
@@ -277,13 +314,25 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
       if(nullptr != dc && createIfNotExists)
       {
         DataContainerShPtr dataContainer = DataContainer::New(name); // Create a new Data Container
-        addDataContainer(dataContainer); // Put the new DataContainer into the array
+        addOrReplaceDataContainer(dataContainer); // Put the new DataContainer into the array
         return dataContainer; // Return the wrapped pointer
       }
       // The DataContainer we asked for was present and NON Null so return that.
       return dc;
     }
 
+    /**
+     * @brief createNonPrereqDataContainer
+     * @param filter
+     * @param dap
+     * @param id
+     * @return
+     */
+    template <class Filter> DataContainerShPtr createNonPrereqDataContainer(Filter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+    {
+      return createNonPrereqDataContainer<Filter>(filter, dap.getDataContainerName(), id);
+    }
+
     /**
      * @brief This function will create a new DataContainer of type <T>
      * @param dataContainerName The name of the DataContainer. Must not be empty or this method will ASSERT()
@@ -291,7 +340,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
      * dataContainerName is empty in which case a Null DataContainer will be returned.
      */
     template<typename Filter>
-    DataContainerShPtr createNonPrereqDataContainer(Filter* filter, const QString& dataContainerName)
+    DataContainerShPtr createNonPrereqDataContainer(Filter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       if(dataContainerName.isEmpty())
       {
@@ -315,9 +364,12 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
         }
       }
 
-      if(doesDataContainerExist(dataContainerName))
+      
+      DataContainerShPtr dataContainer = DataContainer::New(dataContainerName);
+      bool dcExists = !push_back(dataContainer);
+      if(dcExists)
       {
-        if (filter)
+        if(filter)
         {
           filter->setErrorCondition(-889);
           QString ss = QObject::tr("The DataContainer Object with the specific name '%1' already exists.").arg(dataContainerName);
@@ -325,8 +377,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
           return DataContainer::NullPointer();
         }
       }
-      DataContainerShPtr dataContainer = DataContainer::New(dataContainerName);
-      addDataContainer(dataContainer);
+
+      RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(dataContainerName, "", ""));
       return dataContainer;
     }
 
@@ -348,6 +400,24 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
       return dc->getPrereqGeometry<GeometryType>(filter);
     }
 
+    /**
+     * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
+     * if it is available for the given DataContainer
+     * @param filter
+     * @param path
+     * @return
+     */
+    template <typename GeometryType, typename Filter> typename GeometryType::Pointer getPrereqGeometryFromDataContainer(Filter* filter, const DataArrayPath& path)
+    {
+      typename GeometryType::Pointer geom = GeometryType::NullPointer();
+      DataContainerShPtr dc = getPrereqDataContainer<Filter>(filter, path.getDataContainerName(), false);
+      if(nullptr == dc)
+      {
+        return geom;
+      }
+
+      return dc->getPrereqGeometry<GeometryType>(filter);
+    }
 
     /**
      * @brief getPrereqAttributeMatrixFromPath This function will return an AttributeMatrix if it is availabe
@@ -523,7 +593,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
                                                              const DataArrayPath& path,
                                                              T initValue,
                                                              QVector<size_t> compDims,
-                                                             const QString& property = "")
+                                                             const QString& property = "",
+                                                             RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
       QString ss;
@@ -608,7 +679,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
 
       // If something goes wrong at this point the error message will be directly set in the 'filter' object so we just
       // simply return what ever is given to us.
-      dataArray = attrMat->createNonPrereqArray<ArrayType, Filter, T>(filter, path.getDataArrayName(), initValue, compDims);
+      dataArray = attrMat->createNonPrereqArray<ArrayType, Filter, T>(filter, path.getDataArrayName(), initValue, compDims, id);
       return dataArray;
     }
 
@@ -735,7 +806,6 @@ class SIMPLib_EXPORT DataContainerArray : public QObject
     DataContainerArray();
 
   private:
-    QList<DataContainerShPtr>  m_Array;
     QMap<QString, IDataContainerBundle::Pointer> m_DataContainerBundles;
 
   public:
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 0af84df38b..25cccfaf55 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -69,10 +69,10 @@ DataContainerArrayProxy::DataContainerArrayProxy(DataContainerArray* dca)
     return;
   }
 
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
-  for(const auto& container : containers)
+  DataContainerArray::Container containers = dca->getDataContainers();
+  for(DataContainer::Pointer dataContainer : containers) // Loop on each Data Container
   {
-    IGeometry::Pointer geo = container->getGeometry();
+    IGeometry::Pointer geo = dataContainer->getGeometry();
     IGeometry::Type dcType;
     if(geo != IGeometry::NullPointer())
     {
@@ -82,25 +82,21 @@ DataContainerArrayProxy::DataContainerArrayProxy(DataContainerArray* dca)
     {
       dcType = IGeometry::Type::Unknown;
     }
-    DataContainerProxy dcProxy(container->getName(), Qt::Checked, dcType); // Create a new DataContainerProxy
+    DataContainerProxy dcProxy(dataContainer->getName(), Qt::Checked, dcType); // Create a new DataContainerProxy
 
     // Now loop over each AttributeMatrix in the data container that was selected
-    DataContainer::AttributeMatrixMap_t attrMats = container->getAttributeMatrices();
-    QMapIterator<QString, AttributeMatrix::Pointer> iter(attrMats);
-    while(iter.hasNext())
+    DataContainer::Container_t attrMats = dataContainer->getAttributeMatrices();
+    for(auto iter = attrMats.begin(); iter != attrMats.end(); ++iter)
     {
-      iter.next();
-      QString amName = iter.key();
-      AttributeMatrix::Pointer attrMat = iter.value();
+      AttributeMatrix::Pointer attrMat = *iter;
+      QString amName = attrMat->getName();
       AttributeMatrixProxy amProxy(amName, Qt::Checked, attrMat->getType());
 
-      QList<QString> attrArrayNames = attrMat->getAttributeArrayNames();
-      QListIterator<QString> attrArrayNamesIter(attrArrayNames);
-      while(attrArrayNamesIter.hasNext())
+      for(IDataArray::Pointer attrArray : attrMat->getAttributeArrays())
       {
-        QString aaName = attrArrayNamesIter.next();
-        QString daPath = container->getName() + "/" + amName + "/";
-        IDataArray::Pointer attrArray = attrMat->getAttributeArray(aaName);
+        QString aaName = attrArray->getName();
+        QString daPath = dataContainer->getName() + "/" + amName + "/";
+        
         DataArrayProxy daProxy(daPath, aaName, Qt::Checked, attrArray->getTypeAsString(), attrArray->getClassVersion());
         daProxy.setCompDims(attrArray->getComponentDimensions());
         daProxy.setTupleDims(attrMat->getTupleDimensions());
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index b30b0715b4..d850ceca08 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -86,7 +86,7 @@ QVector<QString> DataContainerBundle::getDataContainerNames()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerBundle::addDataContainer(DataContainer::Pointer dc)
+void DataContainerBundle::addOrReplaceDataContainer(DataContainer::Pointer dc)
 {
   m_DataContainers.append(dc);
 }
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
index 7ee508cda5..150983a36f 100755
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -99,7 +99,7 @@ class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
      * @brief addDataContainer Adds a Data Container to the bundle
      * @param dc
      */
-    void addDataContainer(DataContainer::Pointer dc) override;
+    void addOrReplaceDataContainer(DataContainer::Pointer dc) override;
 
     /**
      * @brief removeDataContainer Removes a Data Container from the bundle by pointer
diff --git a/Source/SIMPLib/DataContainers/DsnIterators.h b/Source/SIMPLib/DataContainers/DsnIterators.h
new file mode 100644
index 0000000000..c33bf168a4
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/DsnIterators.h
@@ -0,0 +1,471 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <iterator>
+#include <memory>
+#include <vector>
+
+class IDataStructureNode;
+
+/**
+ * @brief The DsnIterator is a bidirectional iterator over data structure types
+ * belonging to the same level.  DataContainerArray iterators only iterate over
+ * DataContainers.  DataContainer iterators only iterate over their AttributeMatrices.
+ * AttributeMatrix iterators only iterate over their DataArrays.
+ * This was made constexpr for the sake of creating faster runtime operations.
+ */
+class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::shared_ptr<IDataStructureNode>, size_t> //std::iterator_traits<std::shared_ptr<IDataStructureNode>>
+{
+  using self_type = DsnIterator;
+  using difference_type = size_t;
+  using value_type = std::shared_ptr<IDataStructureNode>;
+  using pointer = IDataStructureNode*;
+  using reference = value_type&;
+  using collection_type = std::vector<value_type>;
+  using iterator_category = std::random_access_iterator_tag;
+
+public:
+  /**
+   * @brief Default constructor creates an invalid iterator
+   */
+  DsnIterator() = default;
+
+  /**
+   * @brief Creates an iterator for the given collection and index
+   * @param collection
+   * @param index
+   */
+  DsnIterator(const collection_type& collection, size_t index)
+  : m_Collection(collection)
+  , m_Index(index)
+  {}
+  
+  /**
+   * @brief Copy iterator
+   * @param other
+   */
+  DsnIterator(const self_type& other)
+  : m_Collection(other.m_Collection)
+  , m_Index(other.m_Index)
+  {}
+
+  /**
+   * @brief Destructor
+   */
+  ~DsnIterator() = default;
+
+  /**
+   * @brief Returns the iterator's index.
+   * @return
+   */
+  constexpr difference_type position() const
+  {
+    return m_Index;
+  }
+
+  /**
+   * @brief Returns the next iterator in the collection.
+   * @return
+   */
+  constexpr self_type& operator++(int)
+  {
+    m_Index++;
+    return *this;
+  }
+
+  /**
+   * @brief Returns the previous iterator in the collection.
+   * @return
+   */
+  constexpr self_type& operator--(int)
+  {
+    m_Index--;
+    return *this;
+  }
+
+  /**
+   * @brief Proceeds n positions.
+   * @param n
+   * @return
+   */
+  constexpr self_type& operator+(difference_type n)
+  {
+    m_Index += n;
+    return *this;
+  }
+
+  /**
+   * @brief Regresses n positions.
+   * @param n
+   * @return
+   */
+  constexpr self_type& operator-(difference_type n)
+  {
+    if(n > m_Index)
+    {
+      throw std::out_of_range("Iterator out of range");
+    }
+    m_Index -= n;
+    return *this;
+  }
+
+  /**
+   * @brief Returns the difference in position with the given iterator.
+   * @param other
+   * @return
+   */
+  constexpr difference_type operator-(const self_type& other)
+  {
+    return m_Index - other.m_Index;
+  }
+
+  /**
+   * @brief Returns the stored value.
+   * @return
+   */
+  constexpr reference operator*()
+  {
+    return m_Collection[m_Index];
+  }
+
+  /**
+   * @brief Returns the stored value.
+   * @return
+   */
+  constexpr pointer operator->()
+  {
+    return m_Collection[m_Index].get();
+  }
+
+  /**
+  * @brief Returns true if the given iterator comes later in the collection.
+  * Returns false otherwise.
+  * @param other
+  * @return
+  */
+  constexpr bool operator<(const self_type& other) const
+  {
+    return m_Index < other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes later or equal to the iterator in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator<=(const self_type& other) const
+  {
+    return m_Index <= other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes earlier in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator>(const self_type& other) const
+  {
+    return m_Index > other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes earlier or equal to the iterator in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator>=(const self_type& other) const
+  {
+    return m_Index >= other.m_Index;
+  }
+
+  /**
+    * @brief Returns true if other iterator points to the same index in same collection.
+    * @param rhs right hand side
+    * @return
+    */
+  constexpr bool operator==(const self_type& rhs) const
+  {
+    return (m_Index == rhs.m_Index) && (m_Collection == rhs.m_Collection);
+  }
+
+  /**
+   * @brief Returns true if the other iterator does not point to the same index and collection.
+   * @param rhs right hand side
+   * @return
+   */
+  bool operator!=(const self_type& rhs) const
+  {
+    return !operator==(rhs);
+  }
+
+  /**
+   * @brief Swaps values with the given iterator.
+   * @param other
+   */
+  inline void swap(self_type& other) noexcept
+  {
+    const collection_type tempCollection = m_Collection;
+    m_Collection = other.m_Collection;
+    other.m_Collection = tempCollection;
+
+    const difference_type tempIndex = m_Index;
+    m_Index = other.m_Index;
+    other.m_Index = tempIndex;
+  }
+
+private:
+  collection_type m_Collection;
+  difference_type m_Index;
+};
+
+
+/**
+ * @brief The DsnConstIterator is a bidirectional const iterator over data structure types
+ * belonging to the same level.  DataContainerArray iterators only iterate over
+ * DataContainers.  DataContainer iterators only iterate over their AttributeMatrices.
+ * AttributeMatrix iterators only iterate over their DataArrays.
+ * This was made constexpr for the sake of creating faster runtime operations.
+ */
+class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, const std::shared_ptr<IDataStructureNode>, size_t> //std::iterator_traits<const std::shared_ptr<IDataStructureNode>>
+{
+  using self_type = DsnConstIterator;
+  using difference_type = size_t;
+  using value_type = const std::shared_ptr<IDataStructureNode>;
+  using pointer = const IDataStructureNode*;
+  using reference = value_type&;
+  using collection_type = std::vector<std::shared_ptr<IDataStructureNode>>;
+  using iterator_category = std::random_access_iterator_tag;
+
+public:
+  /**
+   * @brief Calling the default constructor will return an invalid iterator.
+   */
+  DsnConstIterator() = default;
+
+  /**
+   * @brief Constructor for the given collection and index
+   * @param collection
+   * @param index
+   */
+  DsnConstIterator(const collection_type& collection, size_t index)
+  : m_Collection(collection)
+  , m_Index(index)
+  {}
+
+  /**
+   * @brief Copy constructor
+   * @param other
+   */
+  DsnConstIterator(const self_type& other)
+  : m_Collection(other.m_Collection)
+  , m_Index(other.m_Index)
+  {}
+
+  /**
+   * @brief Destructor
+   */
+  ~DsnConstIterator() = default;
+
+  /**
+   * @brief Returns the iterator's index.
+   * @return
+   */
+  constexpr difference_type position() const
+  {
+    return m_Index;
+  }
+
+  /**
+   * @brief Returns the next iterator in the collection
+   * @return
+   */
+  constexpr self_type& operator++()
+  {
+    m_Index++;
+    return *this;
+  }
+
+  /**
+   * @brief Returns the previous iterator in the collection
+   * @return
+   */
+  constexpr self_type& operator--(int)
+  {
+    m_Index--;
+    return *this;
+  }
+
+  /**
+   * @brief Proceeds n positions.
+   * @param n
+   * @return
+   */
+  constexpr self_type& operator+(difference_type n)
+  {
+    m_Index += n;
+    return *this;
+  }
+
+  /**
+   * @brief Regresses n positions
+   * @param n
+   * @return
+   */
+  constexpr self_type& operator-(difference_type n)
+  {
+    if(n > m_Index)
+    {
+      throw std::out_of_range("Iterator out of range");
+    }
+    m_Index -= n;
+    return *this;
+  }
+
+  /**
+   * @brief Returns the difference in position with the given iterator.
+   * @param other
+   * @return
+   */
+  constexpr difference_type operator-(const self_type& other)
+  {
+    return m_Index - other.m_Index;
+  }
+
+  /**
+   * @brief Returns a the stored value as const.
+   * @return
+   */
+  constexpr reference operator*() const
+  {
+    return m_Collection[m_Index];
+  }
+
+  /**
+   * @brief Returns the value as const.
+   * @return
+   */
+  constexpr pointer operator->() const
+  {
+    return m_Collection[m_Index].get();
+  }
+
+  /**
+  * @brief Returns true if the given iterator comes later in the collection.
+  * Returns false otherwise.
+  * @param other
+  * @return
+  */
+  constexpr bool operator<(const self_type& other) const
+  {
+    return m_Index < other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes later or equal to the iterator in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator<=(const self_type& other) const
+  {
+    return m_Index <= other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes earlier in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator>(const self_type& other) const
+  {
+    return m_Index > other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the given iterator comes earlier or equal to the iterator in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
+  constexpr bool operator>=(const self_type& other) const
+  {
+    return m_Index >= other.m_Index;
+  }
+
+  /**
+   * @brief Returns true if the other iterator points to the same index and collection.
+   * Returns false otherwise.
+   * @param rhs right hand side
+   * @return
+   */
+  constexpr bool operator==(const self_type& rhs) const
+  {
+    return (m_Index == rhs.m_Index) && (m_Collection == rhs.m_Collection);
+  }
+
+  /**
+   * @brief Returns true if the other iterator does not point to the same index and collection.
+   * Returns false otherwise.
+   * @param rhs right hand side
+   * @return
+   */
+  bool operator!=(const self_type& rhs) const
+  {
+    return !operator==(rhs);
+  }
+
+  /**
+   * @brief Swaps values with the given iterator.
+   * @param other
+   */
+  inline void swap(self_type& other) noexcept
+  {
+    const collection_type tempCollection = m_Collection;
+    m_Collection = other.m_Collection;
+    other.m_Collection = tempCollection;
+
+    const difference_type tempIndex = m_Index;
+    m_Index = other.m_Index;
+    other.m_Index = tempIndex;
+  }
+
+private:
+  collection_type m_Collection;
+  size_t m_Index;
+};
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.h b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
index 9b1673a6fd..c4f81fc845 100755
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT IDataContainerBundle : public QObject
 
     virtual QVector<QString> getDataContainerNames() = 0;
 
-    virtual void addDataContainer(DataContainer::Pointer dc) = 0;
+    virtual void addOrReplaceDataContainer(DataContainer::Pointer dc) = 0;
 
     virtual void removeDataContainer(DataContainer::Pointer dc) = 0;
     virtual void removeDataContainer(const QString& name) = 0;
diff --git a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
new file mode 100644
index 0000000000..6c81f94558
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
@@ -0,0 +1,471 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include "IDataStructureNode.h"
+
+template <class DerivedChild_t> class IDataStructureContainerNode : public AbstractDataStructureContainer
+{
+public:
+  SIMPL_SHARED_POINTERS(IDataStructureContainerNode<DerivedChild_t>)
+
+  using ChildShPtr = std::shared_ptr<DerivedChild_t>;
+  using ChildCollection = std::vector<ChildShPtr>;
+  using iterator = typename ChildCollection::iterator;
+  using const_iterator = typename ChildCollection::const_iterator;
+  using NameList = QList<QString>;
+
+private:
+  ChildCollection m_ChildrenNodes;
+
+protected:
+  
+
+  // void setParent(const ParentType& parent) override
+  //{
+  //  // Remove from parent's children
+  //  Pointer tempPtr;
+  //  Pointer parentPtr = m_Parent.lock();
+  //  if(nullptr != parentPtr)
+  //  {
+  //    tempPtr = parentPtr->removeChild(this);
+  //  }
+
+  //  m_Parent = parent;
+  //}
+
+public:
+  IDataStructureContainerNode(const QString& name = "")
+  : AbstractDataStructureContainer(name)
+  {
+  }
+  IDataStructureContainerNode(ParentType* parent, const QString& name = "")
+  : AbstractDataStructureContainer(parent, name)
+  {
+  }
+  ~IDataStructureContainerNode() override
+  {
+    clear();
+  }
+
+  /**
+   * @brief Returns a copy of the children collection.
+   * @return
+   */
+  constexpr const ChildCollection& getChildren() const
+  {
+    return m_ChildrenNodes;
+  }
+
+  /**
+   * @brief Returns the names of all children nodes.
+   * @return
+   */
+  NameList getNamesOfChildren() const
+  {
+    NameList names;
+    for(const auto& child : m_ChildrenNodes)
+    {
+      names.push_back(child->getName());
+    }
+    return names;
+  }
+
+  /**
+   * @brief Returns the DataArrayPaths of all descendants.
+   * @return
+   */
+  DataArrayPathList getDescendantPaths() const
+  {
+    DataArrayPathList paths;
+
+    for(const auto& child : m_ChildrenNodes)
+    {
+      paths.push_back(child->getDataArrayPath());
+      // Check if child is a container node
+      auto childContainer = std::dynamic_pointer_cast<IDataStructureContainerNode>(child);
+      if(nullptr != childContainer)
+      {
+        paths.merge(childContainer->getDescendantPaths());
+      }
+    }
+
+    return paths;
+  }
+
+  /**
+   * @brief Returns a list of DataArrayPaths from both itself and all its descendants.
+   * @return
+   */
+  DataArrayPathList getAllPaths() const
+  {
+    DataArrayPathList list = getDescendantPaths();
+    list.push_front(getDataArrayPath());
+    return list;
+  }
+
+  /**
+   * @brief Returns an iterator pointing to the start of the children collection.
+   * @return
+   */
+  constexpr iterator begin() noexcept
+  {
+    return m_ChildrenNodes.begin();
+  }
+
+  /**
+   * @brief Returns a const iterator pointing to the start of the children collection.
+   * @return
+   */
+  constexpr const_iterator begin() const noexcept
+  {
+    return m_ChildrenNodes.begin();
+  }
+
+  /**
+   * @brief Returns a const iterator pointing to the start of the children collection.
+   * @return
+   */
+  constexpr const_iterator cbegin() const noexcept
+  {
+    return m_ChildrenNodes.cbegin();
+  }
+
+  /**
+   * @brief Returns an iterator pointing past the end of the children collection.
+   * @return
+   */
+  constexpr iterator end() noexcept
+  {
+    return m_ChildrenNodes.end();
+  }
+
+  /**
+   * @brief Returns a const iterator pointing past the end of the children collection.
+   * @return
+   */
+  constexpr const_iterator end() const noexcept
+  {
+    return m_ChildrenNodes.end();
+  }
+
+  /**
+   * @brief Returns a const iterator pointing past the end of the children collection.
+   * @return
+   */
+  constexpr const_iterator cend() const noexcept
+  {
+    return m_ChildrenNodes.cend();
+  }
+
+  /**
+   * @brief Returns true if the child collection is empty.  Returns false otherwise.
+   * @return
+   */
+  constexpr bool empty() const
+  {
+    return m_ChildrenNodes.empty();
+  }
+
+  /**
+   * @brief Returns the size of the children collection.
+   * @return
+   */
+  constexpr size_t size() const
+  {
+    return m_ChildrenNodes.size();
+  }
+
+  /**
+   * @brief Clears the children collection.  Items are not deleted unless this
+   * was the last shared_ptr referencing them.
+   */
+  constexpr void clear() noexcept
+  {
+    auto children = getChildren();
+    for(auto& child : children)
+    {
+      if(child != nullptr)
+      {
+        destroyParentConnection(child.get());
+      }
+    }
+    m_ChildrenNodes.clear();
+  }
+
+  /**
+   * @brief Returns the child node with the given name.  If no children nodes
+   * are found with the given name, return nullptr.
+   * @param name
+   * @return
+   */
+  constexpr iterator find(const QString& name)
+  {
+    const auto hash = CreateStringHash(name);
+    for(auto iter = begin(); iter != end(); iter++)
+    {
+      if((*iter)->checkNameHash(hash))
+      {
+        return iter;
+      }
+    }
+
+    return end();
+  }
+
+  /**
+   * @brief Returns the child node with the given name.  If no children nodes
+   * are found with the given name, return nullptr.
+   * @param name
+   * @return
+   */
+  constexpr const_iterator find(const QString& name) const
+  {
+    const auto hash = CreateStringHash(name);
+    for(auto iter = begin(); iter != end(); iter++)
+    {
+      if((*iter)->checkNameHash(hash))
+      {
+        return iter;
+      }
+    }
+
+    return cend();
+  }
+
+  /**
+   * @brief Returns the child with the given name as a shared_ptr.
+   * If no child is found, return nullptr.
+   * @param name
+   * @return
+   */
+  constexpr ChildShPtr getChildByName(const QString& name) const
+  {
+    HashType nameHash = CreateStringHash(name);
+
+    const auto& children = getChildren();
+    for(const auto& child : children)
+    {
+      if(child->checkNameHash(nameHash))
+      {
+        return child;
+      }
+    }
+    return nullptr;
+  }
+
+  /**
+   * @brief Returns true if the container has a child node with the given name.
+   * Returns false otherwise.
+   * @param name
+   * @return
+   */
+  constexpr bool contains(const QString& name) const
+  {
+    return getChildByName(name) != nullptr;
+  }
+
+  /**
+   * @brief Returns true if the given object is one of the container's children.
+   * Returns false otherwise.
+   * @param obj
+   * @return
+   */
+  constexpr bool contains(const ChildShPtr& obj) const
+  {
+    const auto& children = getChildren();
+    for(const auto& child : children)
+    {
+      if(child == obj)
+      {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * @brief Returns the index for the child with the given name.
+   * Returns -1 if there is no child with the given name.
+   * @param name
+   * @return
+   */
+  constexpr int64_t getIndex(const QString& name) const
+  {
+    auto iter = find(name);
+    if(iter == cend())
+    {
+      return -1;
+    }
+    return iter - begin();
+  }
+
+  /**
+   * @brief Returns the child node at the given index.  If index is greater than
+   * the specified index, throw out_of_range exception.
+   * @param index
+   * @return
+   */
+  constexpr ChildShPtr& operator[](size_t index)
+  {
+    if(index < 0 || index > m_ChildrenNodes.size())
+    {
+      const char msg[] = "Index is out of range for the IDataStructureContainerNode's children collection.";
+      throw std::out_of_range(msg);
+    }
+
+    return m_ChildrenNodes[index];
+  }
+
+  /**
+   * @brief Returns the child node with the given name.  If no children nodes
+   * are found with the given name, return nullptr.
+   * @param name
+   * @return
+   */
+  constexpr ChildShPtr& operator[](const QString& name)
+  {
+    return operator[](getIndex(name));
+  }
+
+  /**
+   * @brief Returns true if the container has a child by the given name.
+   * Returns false otherwise.
+   * @param name
+   * @return
+   */
+  bool hasChildWithName(const QString& name) const override
+  {
+    return contains(name);
+  }
+
+  /**
+   * @brief Attempts to append the given IDataStructureNode as a child.
+   * Returns true if the process succeeded.  Returns false otherwise.
+   * @param value
+   * @return success
+   */
+  bool push_back(const ChildShPtr& node)
+  {
+    if(node.get() == nullptr)
+    {
+      return false;
+    }
+    if(contains(node->getName()))
+    {
+      return false;
+    }
+    typename ChildCollection::size_type size = m_ChildrenNodes.size();
+    m_ChildrenNodes.push_back(node);
+
+    createParentConnection(node.get(), this);
+    return (size != m_ChildrenNodes.size());
+  }
+
+  /**
+   * @brief Sets the given IDataStructureNode as a child.  If a child already
+   * exists with the given name, it is removed.
+   * @param node
+   * @return success
+   */
+  bool insertOrAssign(const ChildShPtr& node)
+  {
+    // Can not insert a null IDataArray
+    if(node.get() == nullptr)
+    {
+      return false;
+    }
+
+    auto iter = find(node->getName());
+    if(iter != end())
+    {
+      if((*iter) != node)
+      {
+        erase(iter);
+      }
+      else
+      {
+        return true;
+      }
+    }
+
+    m_ChildrenNodes.push_back(node);
+    createParentConnection(node.get(), this);
+    return true;
+  }
+
+  /**
+   * @brief Erases the child at the given iterator
+   * @param iter
+   */
+  void erase(iterator iter)
+  {
+    ChildShPtr child = (*iter);
+    m_ChildrenNodes.erase(iter);
+    destroyParentConnection(child.get());
+  }
+  
+  /**
+   * @brief Removes the given child from the children collection and returns its shared_ptr.
+   * @param child
+   * @return
+   */
+  IDataStructureNode::Pointer removeChildNode(const IDataStructureNode* rmChild) override
+  {
+    if(rmChild == nullptr)
+    {
+      return NullPointer();
+    }
+
+    for(auto iter = m_ChildrenNodes.begin(); iter != m_ChildrenNodes.end(); ++iter)
+    {
+      if((*iter).get() == rmChild)
+      {
+        ChildShPtr ptr = *iter;
+        m_ChildrenNodes.erase(iter);
+        return ptr;
+      }
+    }
+
+    return NullPointer();
+  }
+
+};
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
new file mode 100644
index 0000000000..e08076a22f
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
@@ -0,0 +1,174 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "IDataStructureNode.h"
+
+#include <sstream>
+#include <stdexcept>
+#include <string>
+
+//#include "SIMPLib/DataContainers/DsnIterators.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IDataStructureNode::HashType IDataStructureNode::CreateStringHash(const QString& string)
+{
+  std::hash<std::string> hashFn;
+  return hashFn(string.toStdString());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IDataStructureNode::IDataStructureNode(const QString& name)
+: m_Name(name)
+, m_Parent(nullptr)
+{
+  updateNameHash();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IDataStructureNode::IDataStructureNode(ParentType* parent, const QString& name)
+: m_Name(name)
+, m_Parent(parent)
+{
+  updateNameHash();
+
+  // Add to parent's children
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IDataStructureNode::~IDataStructureNode()
+{
+  if(m_Parent != nullptr)
+  {
+    m_Parent->removeChildNode(this);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IDataStructureNode::updateNameHash()
+{
+  m_NameHash = CreateStringHash(getName());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString IDataStructureNode::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool IDataStructureNode::setName(const QString& newName)
+{
+  if(nullptr == m_Parent)
+  {
+    m_Name = newName;
+    updateNameHash();
+    return true;
+  }
+  else if(!m_Parent->hasChildWithName(newName))
+  {
+    m_Name = newName;
+    updateNameHash();
+    return true;
+  }
+
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IDataStructureNode::ParentType* IDataStructureNode::getParentNode() const
+{
+  return m_Parent;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IDataStructureNode::setParentNode(ParentType* const parent)
+{
+  if(parent == m_Parent)
+  {
+    return;
+  }
+
+  // Remove from parent's children
+  if(nullptr != m_Parent)
+  {
+    m_Parent->removeChildNode(this);
+  }
+
+  m_Parent = parent;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath IDataStructureNode::getParentPath() const
+{
+  if(!hasParent())
+  {
+    return DataArrayPath();
+  }
+  return getParentNode()->getDataArrayPath();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractDataStructureContainer::createParentConnection(IDataStructureNode* child, AbstractDataStructureContainer* parent) const
+{
+  child->setParentNode(parent);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractDataStructureContainer::destroyParentConnection(IDataStructureNode* child) const
+{
+  child->clearParentNode();
+}
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
new file mode 100644
index 0000000000..51f7419b72
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -0,0 +1,214 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <vector>
+
+#include <QString>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/SIMPLib.h"
+
+class AbstractDataStructureContainer;
+
+/**
+ * @class IDataStructureNode IDataStructureNode.h SIMPLib/DataContainers/IDataStructureNode.h
+ * @brief the IDataStructureNode class serves as the base class for data
+ * structure classes from DataContainer to DataArray
+ */
+class SIMPLib_EXPORT IDataStructureNode
+{
+public:
+  SIMPL_SHARED_POINTERS(IDataStructureNode)
+
+  using ParentType = AbstractDataStructureContainer;
+  // using ParentWkPtr = std::weak_ptr<ParentType>;
+  // using parent_collection = std::vector<ParentWkPtr>;
+  using DataArrayPathList = std::list<DataArrayPath>;
+  using HashType = size_t;
+
+  friend AbstractDataStructureContainer;
+
+private:
+  QString m_Name;
+  ParentType* m_Parent = nullptr;
+  HashType m_NameHash = 0;
+
+  /**
+   * @brief Updates the name hash variable based on the current name.
+   */
+  void updateNameHash();
+
+  /**
+   * @brief Sets the raw parent pointer.  As additional graph support is added,
+   * this will instead be replaced with addParentNode(const ParentType&) and
+   * removeParentNode(const ParentType&).  This should only be called from
+   * IDataStructureContainerNode::push_back, insertOrAssign, or
+   * IDataStructureNode::clearParentNode.  THIS DOES NOT ADD THE NODE TO THE TARGET PARENT!
+   * @param parent
+   */
+  void setParentNode(ParentType* const parent);
+
+  /**
+   * @brief Clears the parent pointer and removes this from its parent constainer.
+   */
+  void clearParentNode()
+  {
+    setParentNode(nullptr);
+  }
+
+  // void addParentNode(const ParentType& newParent);
+  // bool removeParentNode(const ParentType& removedParent);
+
+protected:
+  /**
+   * @brief Method for creating hashes from QString values.
+   * @param string
+   * @return
+   */
+  static HashType CreateStringHash(const QString& string);
+
+public:
+  IDataStructureNode(const QString& name = "");
+  IDataStructureNode(ParentType* parent, const QString& name = "");
+
+  virtual ~IDataStructureNode();
+
+  /**
+   * @brief Checks the name hash for equality.  Returns true if they are equal.
+   * Returns false otherwise.
+   * @param nameHash
+   * @return
+   */
+  bool checkNameHash(size_t nameHash) const
+  {
+    return m_NameHash == nameHash;
+  }
+
+  /**
+   * @brief Returns the node's name.
+   * @return
+   */
+  QString getName() const;
+
+  /**
+   * @brief Attempts to rename the container.  Returns true if the operation succeeded.
+   * Returns false otherwise.
+   * @param newName
+   * @return
+   */
+  bool setName(const QString& newName);
+
+  /**
+   * @brief Returns the parent node.  This currently only returns a single pointer,
+   * but as additional graph support is added, this will instead return a parent_collection.
+   * @return
+   */
+  ParentType* getParentNode() const;
+
+  /**
+   * @brief Returns the data structure node's DataArrayPath.
+   * @return
+   */
+  virtual DataArrayPath getDataArrayPath() const = 0;
+
+  /**
+   * @brief Returns the parent node's DataArrayPath.  If no parent node exists, return an empty path;
+   * @return
+   */
+  DataArrayPath getParentPath() const;
+
+  /**
+   * @brief Returns true if a parent node exists.  Returns false otherwise.
+   * @return
+   */
+  bool hasParent() const
+  {
+    return m_Parent != nullptr;
+  }
+};
+
+/**
+ * @class AbstractDataStructureContainer IDataStructureNode.h SIMPLib/DataContainers/IDataStructureNode.h
+ * @brief The AbstractDataStructureContainer is an interface created so that IDataStructureNode can call required methods in IDataStructureContainerNode.
+ */
+class SIMPLib_EXPORT AbstractDataStructureContainer : public IDataStructureNode
+{
+public:
+  AbstractDataStructureContainer(const QString& name = "")
+  : IDataStructureNode(name)
+  {
+  }
+  AbstractDataStructureContainer(ParentType* parent, const QString& name = "")
+  : IDataStructureNode(parent, name)
+  {
+  }
+  ~AbstractDataStructureContainer() override = default;
+
+  /**
+   * @brief Returns true if the container has a child node with the given name.
+   * @param name
+   * @return
+   */
+  virtual bool hasChildWithName(const QString& name) const = 0;
+
+  /**
+   * @brief Removes the target node from the container's list of children.
+   * Returns the removed node as a shared pointer.
+   * @param rmChild
+   * @return
+   */
+  virtual IDataStructureNode::Pointer removeChildNode(const IDataStructureNode* rmChild) = 0;
+
+protected:
+  /**
+   * @brief Sets the child's parent container.  This does not add the child to the parent's collection.
+   * THIS METHOD IS ONLY USED BY IDataStructureNode<T> AND SHOULD NOT BE USED BY ANY CLASS THAT DERIVES FROM IT.
+   * @param child
+   * @param parent
+   */
+  void createParentConnection(IDataStructureNode* child, AbstractDataStructureContainer* parent) const;
+  
+  /**
+   * @brief Clears the child's parent pointer.  This does not remove the child from the parent's collection.
+   * THIS METHOD IS ONLY USED BY IDataStructureNode<T> AND SHOULD NOT BE USED BY ANY CLASS THAT DERIVES FROM IT.
+   * @param child
+   */
+  void destroyParentConnection(IDataStructureNode* child) const;
+};
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2.h b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
similarity index 74%
rename from Source/SIMPLib/FilterParameters/FloatVec2.h
rename to Source/SIMPLib/DataContainers/RenameDataPath.cpp
index 36fb54b44b..6ec872e03a 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2.h
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
@@ -26,37 +26,23 @@
  * 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.
  *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#pragma once
 
-#include <QtCore/QJsonObject>
+#include "RenameDataPath.h"
 
-typedef struct
-{
-  float x;
-  float y;
-  float z;
-  void FloatVec2(const float& xx, const float& yy)
-  {
-    x = xx;
-    y = yy;
-  }
-  void writeJson(QJsonObject& json)
-  {
-    json["x"] = static_cast<double>(x);
-    json["y"] = static_cast<double>(y);
-  }
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
-  bool readJson(QJsonObject& json)
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RenameDataPath::AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id, const DataArrayPath& path)
+{
+  if(filter != nullptr)
   {
-    if(json["x"].isDouble() && json["y"].isDouble())
-    {
-      x = static_cast<float>(json["x"].toDouble());
-      y = static_cast<float>(json["y"].toDouble());
-      return true;
-    }
-    return false;
+    filter->checkIfPathRenamed(id, path);
   }
-} FloatVec2_t;
-
-Q_DECLARE_METATYPE(FloatVec2_t)
+}
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.h b/Source/SIMPLib/DataContainers/RenameDataPath.h
new file mode 100644
index 0000000000..c043fa4f5e
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.h
@@ -0,0 +1,74 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <cstddef>
+
+#include "SIMPLib/SIMPLib.h"
+
+class AbstractFilter;
+class DataArrayPath;
+
+/**
+ * @brief RenameDataPath is used by DataContainerArray, DataContainer, and AttributeMatrix
+ * to alert the specified AbstractFilter that a DataArrayPath has been created
+ * with the given DataID_t.  This also serves as the declaration of the type alias,
+ * DataID_t so that all classes that require it have access to it without causing
+ * dependency issues.
+ */
+namespace RenameDataPath
+{
+  /**
+   * @brief DataID_t is used as the ID type when creating DataArrayPaths through 
+   * createNonPrereq* methods inside AbstractFilter::dataCheck().  This ID is 
+   * used for mapping created paths and performing quick lookups to detect rename
+   * operations far more quickly than previous implementations for rename 
+   * operations. This forces filters to opt-in to rename functionality rather than
+   * provide it across all filters automatically.
+   */
+  using DataID_t = size_t;
+  const DataID_t k_Invalid_ID = 0;
+
+  /**
+   * @brief This function serves as the main hub for alerting the specified 
+   * AbstractFilter that a DataArrayPath has been created with the given ID.
+   * The plus side of this is that AbstractFilter has a single friend function
+   * instead of having to declare DataContainerArray, DataContainer, and AttributeMatrix
+   * all as friend classes in order to achieve the same result.
+   * @param filter The filter creating the path
+   * @param id The local ID for the filter to perform rename checks on
+   * @param path The new DataArrayPath
+   */
+  void SIMPLib_EXPORT AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id, const DataArrayPath& path);
+}
diff --git a/Source/SIMPLib/DataContainers/SourceList.cmake b/Source/SIMPLib/DataContainers/SourceList.cmake
index 1ef9dcf942..8275df4b7f 100755
--- a/Source/SIMPLib/DataContainers/SourceList.cmake
+++ b/Source/SIMPLib/DataContainers/SourceList.cmake
@@ -57,6 +57,10 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainer.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerArrayProxy.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerProxy.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DsnIterators.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataStructureContainerNode.hpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataStructureNode.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RenameDataPath.h
 )
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
@@ -70,6 +74,8 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerProxy.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerBundle.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataContainerBundle.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataStructureNode.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RenameDataPath.cpp
 )
 
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index cfab4dfe84..f79a8be563 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -72,7 +72,7 @@ class DataContainerBundleTest
 
     typename DataArray<T>::Pointer data = DataArray<T>::CreateArray(tDims, cDims, name);
 
-    am->addAttributeArray(data->getName(), data);
+    am->insertOrAssign(data);
   }
 
   // -----------------------------------------------------------------------------
@@ -94,11 +94,11 @@ class DataContainerBundleTest
     AddDataArray<uint8_t>(am, "Uint8 Array", tDims, cDims);
     AddDataArray<float>(am, "Float Array", tDims, cDims);
     AddDataArray<int32_t>(am, "int32 Array", tDims, cDims);
-    dc0->addAttributeMatrix(am->getName(), am);
+    dc0->addOrReplaceAttributeMatrix(am);
 
     QVector<size_t> tupleDims(1, 1);
     AttributeMatrix::Pointer metaAm = AttributeMatrix::New(tupleDims, DataContainerBundle::GetMetaDataName(), AttributeMatrix::Type::MetaData);
-    dc0->addAttributeMatrix(metaAm->getName(), metaAm);
+    dc0->addOrReplaceAttributeMatrix(metaAm);
 
     DataContainer::Pointer dc1 = dc0->deepCopy(false);
     dc1->setName("DC 1");
@@ -109,14 +109,14 @@ class DataContainerBundleTest
     dc2->getAttributeMatrix("CellAttributeMatrix")->removeAttributeArray("Uint8 Array");
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
-    dca->addDataContainer(dc0);
-    dca->addDataContainer(dc1);
-    dca->addDataContainer(dc2);
+    dca->addOrReplaceDataContainer(dc0);
+    dca->addOrReplaceDataContainer(dc1);
+    dca->addOrReplaceDataContainer(dc2);
 
     DataContainerBundle::Pointer bundle = DataContainerBundle::New("Bundle 1");
-    bundle->addDataContainer(dc0);
-    bundle->addDataContainer(dc1);
-    bundle->addDataContainer(dc2);
+    bundle->addOrReplaceDataContainer(dc0);
+    bundle->addOrReplaceDataContainer(dc1);
+    bundle->addOrReplaceDataContainer(dc2);
 
     QVector<DataArrayPath> paths = bundle->findCommonDataArrayPaths();
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
new file mode 100644
index 0000000000..d5ff428e4e
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
@@ -0,0 +1,41 @@
+Mass Create Data Containers
+=============
+
+## Group (Subgroup) ##
+
+Core (Generation)
+
+
+## Description ##
+
+This **Filter** creates 4,000 **Data Containers** starting with a given name with an index number tacked on at the end.  This filter was created for testing rename operation timings.
+
+## Parameters ##
+
+| Name             | Type | Description |
+|------------------|------|-------------|
+| Data Container Name | string | Base DataContainer name |
+
+## Required Geometry ##
+
+Not Applicable
+
+## Required Objects ##
+
+None
+
+## Created Objects ##
+
+| Kind | Default Name | Description |
+|------|--------------|-------------|---------|----------------|
+| **Data Container** | None | Created **Data Container** location and name |
+
+
+## Example Pipelines ##
+
+
+
+## License & Copyright ##
+
+Please see the description file distributed with this **Plugin**
+
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index 173a1ed079..85d2e40c18 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -348,25 +348,25 @@ QVector<double> AbstractFilterParametersReader::readArray(const QString name, QV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3_t AbstractFilterParametersReader::readIntVec3(const QString name, IntVec3_t defaultValue)
+IntVec3Type AbstractFilterParametersReader::readIntVec3(const QString name, IntVec3Type defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
 
   // This should never be executed
-  return IntVec3_t();
+  return IntVec3Type();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3_t AbstractFilterParametersReader::readFloatVec3(const QString name, FloatVec3_t defaultValue)
+FloatVec3Type AbstractFilterParametersReader::readFloatVec3(const QString name, FloatVec3Type defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
 
   // This should never be executed
-  return FloatVec3_t();
+  return FloatVec3Type();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index e945de0d6d..933db09602 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -109,8 +109,8 @@ class SIMPLib_EXPORT AbstractFilterParametersReader
     virtual QVector<float> readArray(const QString name, QVector<float> value);
     virtual QVector<double> readArray(const QString name, QVector<double> value);
 
-    virtual IntVec3_t readIntVec3(const QString name, IntVec3_t v);
-    virtual FloatVec3_t readFloatVec3(const QString name, FloatVec3_t v);
+    virtual IntVec3Type readIntVec3(const QString name, IntVec3Type v);
+    virtual FloatVec3Type readFloatVec3(const QString name, FloatVec3Type v);
     virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t v);
     virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t v);
     virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString name, Float4thOrderPoly_t v);
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index 9f4f3a11b7..f0bc57d087 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -324,7 +324,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, QVector<doub
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, IntVec3_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, IntVec3Type v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -336,7 +336,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, IntVec3_t v)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, FloatVec3_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, FloatVec3Type v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index 2af54fad22..0b6cbfb3d5 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -110,8 +110,8 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
     virtual int writeValue(const QString& name, QVector<float> value);
     virtual int writeValue(const QString& name, QVector<double> value);
 
-    virtual int writeValue(const QString& name, IntVec3_t v);
-    virtual int writeValue(const QString& name, FloatVec3_t v);
+    virtual int writeValue(const QString& name, IntVec3Type v);
+    virtual int writeValue(const QString& name, FloatVec3Type v);
     virtual int writeValue(const QString& name, Float2ndOrderPoly_t v);
     virtual int writeValue(const QString& name, Float3rdOrderPoly_t v);
     virtual int writeValue(const QString& name, Float4thOrderPoly_t v);
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index bf917932e4..f58ef62787 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -34,6 +34,7 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AttributeMatrixCreationFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -49,8 +50,8 @@ AttributeMatrixCreationFilterParameter::~AttributeMatrixCreationFilterParameter(
 //
 // -----------------------------------------------------------------------------
 AttributeMatrixCreationFilterParameter::Pointer AttributeMatrixCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
-                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                            const RequirementType req, int groupIndex)
+                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                            const RequirementType& req, int groupIndex)
 {
   AttributeMatrixCreationFilterParameter::Pointer ptr = AttributeMatrixCreationFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -103,3 +104,23 @@ void AttributeMatrixCreationFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AttributeMatrixCreationFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  QVariant var = filter->property(qPrintable(getPropertyName()));
+  if(var.isValid() && var.canConvert<DataArrayPath>())
+  {
+    DataArrayPath path = var.value<DataArrayPath>();
+    if(path.updatePath(renamePath))
+    {
+      if(m_SetterCallback)
+      {
+        m_SetterCallback(path);
+      }
+      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    }
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 3761d5940e..623f5f5910 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -42,6 +42,8 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
+class AbstractFilter;
+
 /**
  * @brief SIMPL_NEW_AM_CREATION_FP This macro is a short-form way of instantiating an instance of
  * AttributeMatrixCreationFilterParameter. There are 5 required parameters and 1 optional parameter
@@ -75,10 +77,10 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-    typedef struct
+    using RequirementType = struct
     {
       IGeometry::Types dcGeometryTypes;
-    } RequirementType;
+    };
 
     /**
      * @brief New This function instantiates an instance of the AttributeMatrixCreationFilterParameter.  Specifying a RequirementType will
@@ -100,10 +102,8 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const DataArrayPath& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
     ~AttributeMatrixCreationFilterParameter() override;
 
@@ -146,6 +146,11 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
     */
     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
   protected:
       /**
        * @brief AttributeMatrixCreationFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index 2bd7f205b8..50a052c5e4 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -53,8 +53,8 @@ AttributeMatrixSelectionFilterParameter::~AttributeMatrixSelectionFilterParamete
 //
 // -----------------------------------------------------------------------------
 AttributeMatrixSelectionFilterParameter::Pointer AttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
-                                                                                              Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                              const RequirementType req, int groupIndex)
+                                                                                              Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                              const RequirementType& req, int groupIndex)
 {
 
   AttributeMatrixSelectionFilterParameter::Pointer ptr = AttributeMatrixSelectionFilterParameter::New();
@@ -171,3 +171,23 @@ AttributeMatrixSelectionFilterParameter::RequirementType AttributeMatrixSelectio
 
   return reqs;
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  QVariant var = filter->property(qPrintable(getPropertyName()));
+  if(var.isValid() && var.canConvert<DataArrayPath>())
+  {
+    DataArrayPath path = var.value<DataArrayPath>();
+    if(path.updatePath(renamePath))
+    {
+      if(m_SetterCallback)
+      {
+        m_SetterCallback(path);
+      }
+      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    }
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index 8457a752af..da6d0c8182 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -74,11 +74,11 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-    typedef struct
+    using RequirementType = struct
     {
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
-    } RequirementType;
+    };
 
     /**
      * @brief New This function instantiates an instance of the AttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
@@ -100,10 +100,8 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const DataArrayPath& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
     ~AttributeMatrixSelectionFilterParameter() override;
 
@@ -174,6 +172,11 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
     */
     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
   protected:
       /**
        * @brief AttributeMatrixSelectionFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index ceced77422..f5727ce1d3 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -101,7 +101,7 @@ void CalculatorFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void CalculatorFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void CalculatorFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 3988a8ecde..d1bbae933c 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
     /**
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 219d79bc9d..918fd88175 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -120,7 +120,7 @@ void ComparisonSelectionAdvancedFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSelectionAdvancedFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void ComparisonSelectionAdvancedFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 37a838cc21..67d2a1766a 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -143,7 +143,7 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
     /**
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index 53a098dc14..a4c065fb33 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -131,7 +131,7 @@ void ComparisonSelectionFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void ComparisonSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index a51894b632..e0292e5935 100755
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -142,7 +142,7 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
       /**
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 22941d8c5a..6cc79c8a17 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -36,7 +36,7 @@
 #include "DataArrayCreationFilterParameter.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
-
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -157,3 +157,23 @@ void DataArrayCreationFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayCreationFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  QVariant var = filter->property(qPrintable(getPropertyName()));
+  if(var.isValid() && var.canConvert<DataArrayPath>())
+  {
+    DataArrayPath path = var.value<DataArrayPath>();
+    if(path.updatePath(renamePath))
+    {
+      if(m_SetterCallback)
+      {
+        m_SetterCallback(path);
+      }
+      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    }
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 8b0c690b58..3c11039c28 100755
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -42,6 +42,8 @@
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
+class AbstractFilter;
+
 /**
  * @brief SIMPL_NEW_DA_CREATION_FP This macro is a short-form way of instantiating an instance of
  * DataArrayCreationFilterParameter. There are 5 required parameters and 1 optional parameter
@@ -168,6 +170,11 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
     */
     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
   protected:
       /**
        * @brief DataArrayCreationFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 824f244c9b..28dfb09c74 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -205,3 +205,23 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
 
   return reqs;
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  QVariant var = filter->property(qPrintable(getPropertyName()));
+  if(var.isValid() && var.canConvert<DataArrayPath>())
+  {
+    DataArrayPath path = var.value<DataArrayPath>();
+    if(path.updatePath(renamePath))
+    {
+      if(m_SetterCallback)
+      {
+        m_SetterCallback(path);
+      }
+      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    }
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 208c144fc5..79b5a48f59 100755
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -42,6 +42,8 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
+class AbstractFilter;
+
 /**
  * @brief SIMPL_NEW_DA_SELECTION_FP This macro is a short-form way of instantiating an instance of
  * DataArraySelectionFilterParameter. There are 5 required parameters and 1 optional parameter
@@ -197,6 +199,11 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     */
     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+    /**
+     * @brief Handle DataArrayPath changes if necessary
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
   protected:
       /**
        * @brief DataArraySelectionFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 90d1c98404..1521554ca3 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -113,12 +113,15 @@ void DataContainerArrayProxyFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerArrayProxyFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void DataContainerArrayProxyFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   QVariant var = filter->property(qPrintable(getPropertyName()));
   DataContainerArrayProxy dcaProxy = var.value<DataContainerArrayProxy>();
   dcaProxy.updatePath(renamePath);
   var.setValue(dcaProxy);
-  filter->setProperty(qPrintable(getPropertyName()), var);
+  if(m_SetterCallback)
+  {
+    m_SetterCallback(dcaProxy);
+  }
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 9203534486..629c9de96f 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
     /**
      * @brief Handle DataArrayPath changes if necessary
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
       /**
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index aee34d78c5..da08211bdc 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -35,6 +35,8 @@
 
 #include "DataContainerCreationFilterParameter.h"
 
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -48,14 +50,16 @@ DataContainerCreationFilterParameter::~DataContainerCreationFilterParameter() =
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
                                                                                         SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
 {
 
   DataContainerCreationFilterParameter::Pointer ptr = DataContainerCreationFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
-  ptr->setDefaultValue(defaultValue);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
   ptr->setCategory(category);
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
@@ -80,7 +84,18 @@ void DataContainerCreationFilterParameter::readJson(const QJsonObject& json)
   QJsonValue jsonValue = json[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    m_SetterCallback(jsonValue.toString(""));
+    QJsonObject obj = jsonValue.toObject();
+    DataArrayPath dap;
+    if(dap.readJson(obj))
+    {
+      m_SetterCallback(dap);
+    }
+    else // this is in here for historical where we used to save the value as a string
+    {
+      QString dcName = jsonValue.toString("");
+      DataArrayPath dap(dcName, "", "");
+      m_SetterCallback(dap);
+    }
   }
 }
 
@@ -91,6 +106,25 @@ void DataContainerCreationFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    json[getPropertyName()] = m_GetterCallback();
+    DataArrayPath dap = m_GetterCallback();
+    QJsonObject obj;
+    dap.writeJson(obj);
+    json[getPropertyName()] = obj;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerCreationFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
+  {
+    m_SetterCallback(newPath);
+    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index 0e36ec16e7..adc7e4bd18 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -37,6 +37,7 @@
 
 #include <QtCore/QJsonObject>
 
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
@@ -64,33 +65,32 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
 {
 public:
   SIMPL_SHARED_POINTERS(DataContainerCreationFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataContainerCreationFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerCreationFilterParameter, FilterParameter)
+  SIMPL_STATIC_NEW_MACRO(DataContainerCreationFilterParameter)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerCreationFilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-    /**
-     * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DC_CREATION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+  /**
+   * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DC_CREATION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                     int groupIndex = -1);
 
-    ~DataContainerCreationFilterParameter() override;
+  ~DataContainerCreationFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -125,6 +125,13 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
     */
     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+    /**
+     * @brief Handles changes to the DataArrayPath
+     * @param filter
+     * @param renamePath
+     */
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
   protected:
     /**
      * @brief DataContainerCreationFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index 0230d9b5b9..b36abbd753 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -50,8 +50,8 @@ DataContainerSelectionFilterParameter::~DataContainerSelectionFilterParameter()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                          SetterCallbackType setterCallback, GetterCallbackType getterCallback, const RequirementType req,
+DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                                                          SetterCallbackType setterCallback, GetterCallbackType getterCallback, const RequirementType& req,
                                                                                           int groupIndex)
 {
   DataContainerSelectionFilterParameter::Pointer ptr = DataContainerSelectionFilterParameter::New();
@@ -85,7 +85,18 @@ void DataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
   QJsonValue jsonValue = json[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    m_SetterCallback(jsonValue.toString(""));
+    QJsonObject obj = jsonValue.toObject();
+    DataArrayPath dap;
+    if(dap.readJson(obj))
+    {
+      m_SetterCallback(dap);
+    }
+    else // this is in here for historical where we used to save the value as a string
+    {
+      QString dcName = jsonValue.toString("");
+      DataArrayPath dap(dcName, "", "");
+      m_SetterCallback(dap);
+    }
   }
 }
 
@@ -96,22 +107,25 @@ void DataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    json[getPropertyName()] = m_GetterCallback();
+    DataArrayPath dap = m_GetterCallback();
+    QJsonObject obj;
+    dap.writeJson(obj);
+    json[getPropertyName()] = obj;
   }
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void DataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(oldPath.getDataContainerName() == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
+  if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
-    m_SetterCallback(newPath.getDataContainerName());
+    m_SetterCallback(newPath);
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 37310785cf..43f6b5b940 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -37,6 +37,7 @@
 
 #include <QtCore/QJsonObject>
 
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
@@ -69,13 +70,13 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
     SIMPL_STATIC_NEW_MACRO(DataContainerSelectionFilterParameter)
     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerSelectionFilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
+    using SetterCallbackType = std::function<void(DataArrayPath)>;
+    using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-    typedef struct
+    using RequirementType = struct
     {
       IGeometry::Types dcGeometryTypes;
-    } RequirementType;
+    };
 
     /**
      * @brief New This function instantiates an instance of the DataContainerSelectionFilterParameter.  Specifying a RequirementType will
@@ -97,10 +98,8 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, SetterCallbackType setterCallback,
+                       GetterCallbackType getterCallback, const RequirementType& req, int groupIndex = -1);
 
     ~DataContainerSelectionFilterParameter() override;
 
@@ -150,7 +149,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
       /**
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 868823d7f0..76acbb4616 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -76,10 +76,15 @@ void FilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   QVariant var = filter->property(qPrintable(getPropertyName()));
-  if(var.isValid() && var.canConvert<DataArrayPath>())
+  if(!var.isValid())
+  {
+    return;
+  }
+
+  if(var.canConvert<DataArrayPath>())
   {
     DataArrayPath path = var.value<DataArrayPath>();
     if(path.updatePath(renamePath))
@@ -89,7 +94,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath
       emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
-  else if(var.isValid() && var.canConvert<DataContainerArrayProxy>())
+  else if(var.canConvert<DataContainerArrayProxy>())
   {
     DataContainerArrayProxy proxy = var.value<DataContainerArrayProxy>();
     proxy.updatePath(renamePath);
@@ -97,7 +102,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath
     filter->setProperty(qPrintable(getPropertyName()), var);
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
-  else if(var.isValid() && var.canConvert<DataContainerProxy>())
+  else if(var.canConvert<DataContainerProxy>())
   {
     DataContainerProxy proxy = var.value<DataContainerProxy>();
     proxy.updatePath(renamePath);
@@ -105,7 +110,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath
     filter->setProperty(qPrintable(getPropertyName()), var);
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
-  else if(var.isValid() && var.canConvert<AttributeMatrixProxy>())
+  else if(var.canConvert<AttributeMatrixProxy>())
   {
     AttributeMatrixProxy proxy = var.value<AttributeMatrixProxy>();
     proxy.updatePath(renamePath);
@@ -113,7 +118,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath
     filter->setProperty(qPrintable(getPropertyName()), var);
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
-  else if(var.isValid() && var.canConvert<DataArrayProxy>())
+  else if(var.canConvert<DataArrayProxy>())
   {
     DataArrayProxy proxy = var.value<DataArrayProxy>();
     proxy.updatePath(renamePath);
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index e965aa7bf7..12377f1b19 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -105,7 +105,7 @@ class SIMPLib_EXPORT FilterParameter
      * @param filter
      * @param renamePath
      */
-    virtual void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath);
+    virtual void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath);
 
   protected:
     FilterParameter();
@@ -117,7 +117,7 @@ class SIMPLib_EXPORT FilterParameter
     FilterParameter& operator=(FilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
 
-typedef QVector<FilterParameter::Pointer> FilterParameterVector;
+using FilterParameterVectorType = std::vector<FilterParameter::Pointer>;
 
 // -----------------------------------------------------------------------------
 // This section of Macros allows each FilterParameter subclass to create a macro
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 6c258d32d3..33a33d90aa 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -46,7 +46,7 @@ FloatVec2FilterParameter::~FloatVec2FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec2_t& defaultValue, Category category,
+FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category,
                                                                 SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
 {
 
@@ -75,14 +75,18 @@ QString FloatVec2FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec2FilterParameter::readJson(const QJsonObject& json)
+void FloatVec2FilterParameter::readJson(const QJsonObject& obj)
 {
-  QJsonValue jsonValue = json[getPropertyName()];
+  QJsonValue jsonValue = obj[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    QJsonObject obj = jsonValue.toObject();
-    FloatVec2_t floatVec2;
-    floatVec2.readJson(obj);
+    QJsonObject json = jsonValue.toObject();
+    FloatVec2Type floatVec2;
+    if(json["x"].isDouble() && json["y"].isDouble())
+    {
+      floatVec2[0] = static_cast<float>(json["x"].toDouble());
+      floatVec2[1] = static_cast<float>(json["y"].toDouble());
+    }
     m_SetterCallback(floatVec2);
   }
 }
@@ -90,13 +94,14 @@ void FloatVec2FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec2FilterParameter::writeJson(QJsonObject& json)
+void FloatVec2FilterParameter::writeJson(QJsonObject& obj)
 {
   if (m_GetterCallback)
   {
-    FloatVec2_t floatVec2 = m_GetterCallback();
-    QJsonObject obj;
-    floatVec2.writeJson(obj);
-    json[getPropertyName()] = obj;
+    FloatVec2Type floatVec2 = m_GetterCallback();
+    QJsonObject json;
+    json["x"] = static_cast<double>(floatVec2.getX());
+    json["y"] = static_cast<double>(floatVec2.getY());
+    obj[getPropertyName()] = json;
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 3e1898b168..f2bdac3c14 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -36,14 +36,15 @@
 #pragma once
 
 #include <cmath>
+#include <functional>
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 #include <QtCore/QMetaType>
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/FilterParameters/FloatVec2.h"
 #include "SIMPLib/SIMPLib.h"
 
 /**
@@ -74,8 +75,8 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
     SIMPL_STATIC_NEW_MACRO(FloatVec2FilterParameter)
     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FloatVec2FilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(FloatVec2_t)>;
-    using GetterCallbackType = std::function<FloatVec2_t(void)>;
+    using SetterCallbackType = std::function<void(FloatVec2Type)>;
+    using GetterCallbackType = std::function<FloatVec2Type(void)>;
 
     /**
      * @brief New This function instantiates an instance of the FloatVec2FilterParameter. Although this function is available to be used,
@@ -93,9 +94,8 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const FloatVec2_t& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, SetterCallbackType setterCallback,
+                       GetterCallbackType getterCallback, int groupIndex = -1);
 
     ~FloatVec2FilterParameter() override;
 
@@ -146,3 +146,4 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
   FloatVec2FilterParameter& operator=(FloatVec2FilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
 
+Q_DECLARE_METATYPE(FloatVec2Type)
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3.h b/Source/SIMPLib/FilterParameters/FloatVec3.h
deleted file mode 100644
index 2121e9e2f7..0000000000
--- a/Source/SIMPLib/FilterParameters/FloatVec3.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2019 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#pragma once
-
-#include <QtCore/QJsonObject>
-
-typedef struct
-{
-  float x;
-  float y;
-  float z;
-  void FloatVec3(const float& xx, const float& yy, const float& zz)
-  {
-    x = xx;
-    y = yy;
-    z = zz;
-  }
-
-  void writeJson(QJsonObject& json)
-  {
-    json["x"] = static_cast<double>(x);
-    json["y"] = static_cast<double>(y);
-    json["z"] = static_cast<double>(z);
-  }
-
-  bool readJson(QJsonObject& json)
-  {
-    if(json["x"].isDouble() && json["y"].isDouble() && json["z"].isDouble())
-    {
-      x = static_cast<float>(json["x"].toDouble());
-      y = static_cast<float>(json["y"].toDouble());
-      z = static_cast<float>(json["z"].toDouble());
-      return true;
-    }
-    return false;
-  }
-
-  void normalize()
-  {
-    float denom = std::sqrt(x * x + y * y + z * z);
-    x = x / denom;
-    y = y / denom;
-    z = z / denom;
-  }
-} FloatVec3_t;
-
-Q_DECLARE_METATYPE(FloatVec3_t)
\ No newline at end of file
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index fb1e71e225..92a4a6ccc8 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -48,7 +48,7 @@ FloatVec3FilterParameter::~FloatVec3FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec3_t& defaultValue, Category category,
+FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category,
                                                                 SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
 {
 
@@ -77,14 +77,19 @@ QString FloatVec3FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec3FilterParameter::readJson(const QJsonObject& json)
+void FloatVec3FilterParameter::readJson(const QJsonObject& obj)
 {
-  QJsonValue jsonValue = json[getPropertyName()];
+  QJsonValue jsonValue = obj[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    QJsonObject obj = jsonValue.toObject();
-    FloatVec3_t floatVec3;
-    floatVec3.readJson(obj);
+    QJsonObject json = jsonValue.toObject();
+    FloatVec3Type floatVec3;
+    if(json["x"].isDouble() && json["y"].isDouble() && json["z"].isDouble())
+    {
+      floatVec3[0] = static_cast<float>(json["x"].toDouble());
+      floatVec3[1] = static_cast<float>(json["y"].toDouble());
+      floatVec3[2] = static_cast<float>(json["z"].toDouble());
+    }
     m_SetterCallback(floatVec3);
   }
 }
@@ -92,13 +97,15 @@ void FloatVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec3FilterParameter::writeJson(QJsonObject& json)
+void FloatVec3FilterParameter::writeJson(QJsonObject& obj)
 {
   if (m_GetterCallback)
   {
-    FloatVec3_t floatVec3 = m_GetterCallback();
-    QJsonObject obj;
-    floatVec3.writeJson(obj);
-    json[getPropertyName()] = obj;
+    FloatVec3Type floatVec3 = m_GetterCallback();
+    QJsonObject json;
+    json["x"] = static_cast<double>(floatVec3.getX());
+    json["y"] = static_cast<double>(floatVec3.getY());
+    json["z"] = static_cast<double>(floatVec3.getZ());
+    obj[getPropertyName()] = json;
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 5615c31635..0f3d0f7d40 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -36,14 +36,16 @@
 #pragma once
 
 #include <cmath>
+#include <functional>
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 #include <QtCore/QMetaType>
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/FilterParameters/FloatVec3.h"
+
 #include "SIMPLib/SIMPLib.h"
 
 /**
@@ -74,8 +76,8 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
     SIMPL_STATIC_NEW_MACRO(FloatVec3FilterParameter)
     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FloatVec3FilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(FloatVec3_t)>;
-    using GetterCallbackType = std::function<FloatVec3_t(void)>;
+    using SetterCallbackType = std::function<void(FloatVec3Type)>;
+    using GetterCallbackType = std::function<FloatVec3Type(void)>;
 
     /**
      * @brief New This function instantiates an instance of the FloatVec3FilterParameter. Although this function is available to be used,
@@ -93,9 +95,8 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const FloatVec3_t& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, SetterCallbackType setterCallback,
+                       GetterCallbackType getterCallback, int groupIndex = -1);
 
     ~FloatVec3FilterParameter() override;
 
@@ -146,3 +147,4 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
   FloatVec3FilterParameter& operator=(FloatVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
 
+Q_DECLARE_METATYPE(FloatVec3Type)
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 9c69adf303..d809d272a2 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -782,10 +782,10 @@ QVector<double> H5FilterParametersReader::readArray(const QString name, QVector<
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3_t H5FilterParametersReader::readIntVec3(const QString name, IntVec3_t defaultValue)
+IntVec3Type H5FilterParametersReader::readIntVec3(const QString name, IntVec3Type defaultValue)
 {
   int err = 0;
-  IntVec3_t v;
+  IntVec3Type v;
   err = QH5Lite::readPointerDataset<int32_t>(m_CurrentGroupId, name, reinterpret_cast<int32_t*>(&v));
   if(err < 0)
   {
@@ -798,10 +798,10 @@ IntVec3_t H5FilterParametersReader::readIntVec3(const QString name, IntVec3_t de
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3_t H5FilterParametersReader::readFloatVec3(const QString name, FloatVec3_t defaultValue)
+FloatVec3Type H5FilterParametersReader::readFloatVec3(const QString name, FloatVec3Type defaultValue)
 {
   int err = 0;
-  FloatVec3_t v;
+  FloatVec3Type v;
   err = QH5Lite::readPointerDataset<float>(m_CurrentGroupId, name, reinterpret_cast<float*>(&v));
   if(err < 0)
   {
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index e312379281..a435a389a0 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -127,8 +127,8 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
      QVector<float> readArray(const QString name, QVector<float> value) override;
      QVector<double> readArray(const QString name, QVector<double> value) override;
 
-     IntVec3_t readIntVec3(const QString name, IntVec3_t v) override;
-     FloatVec3_t readFloatVec3(const QString name, FloatVec3_t v) override;
+     IntVec3Type readIntVec3(const QString name, IntVec3Type v) override;
+     FloatVec3Type readFloatVec3(const QString name, FloatVec3Type v) override;
 
      Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t v) override;
      Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t v) override;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index ff813536f2..649f2e8ad2 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -474,7 +474,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, QVector<double> va
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, IntVec3_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, IntVec3Type v)
 {
   int err = 0;
   int32_t rank = 1;
@@ -486,7 +486,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, IntVec3_t v)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, FloatVec3_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, FloatVec3Type v)
 {
   int err = 0;
   int32_t rank = 1;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index d0e8926691..e5d892dc5d 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -104,8 +104,8 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     int writeValue(const QString& name, QVector<float> value) override;
     int writeValue(const QString& name, QVector<double> value) override;
 
-    int writeValue(const QString& name, IntVec3_t v) override;
-    int writeValue(const QString& name, FloatVec3_t v) override;
+    int writeValue(const QString& name, IntVec3Type v) override;
+    int writeValue(const QString& name, FloatVec3Type v) override;
 
     int writeValue(const QString& name, Float2ndOrderPoly_t v) override;
     int writeValue(const QString& name, Float3rdOrderPoly_t v) override;
diff --git a/Source/SIMPLib/FilterParameters/IntVec3.h b/Source/SIMPLib/FilterParameters/IntVec3.h
deleted file mode 100644
index d7ee634fdb..0000000000
--- a/Source/SIMPLib/FilterParameters/IntVec3.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2019 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#pragma once
-
-#include <QtCore/QJsonObject>
-
-typedef struct
-{
-  int x;
-  int y;
-  int z;
-  void IntVec3(const int& x_, const int& y_, const int& z_)
-  {
-    x = x_;
-    y = y_;
-    z = z_;
-  }
-  void writeJson(QJsonObject& json)
-  {
-    json["x"] = x;
-    json["y"] = y;
-    json["z"] = z;
-  }
-
-  bool readJson(QJsonObject& json)
-  {
-    if(json["x"].isDouble() && json["y"].isDouble() && json["z"].isDouble())
-    {
-      x = json["x"].toInt();
-      y = json["y"].toInt();
-      z = json["z"].toInt();
-      return true;
-    }
-    return false;
-  }
-} IntVec3_t;
-
-Q_DECLARE_METATYPE(IntVec3_t)
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index 8bbda60e11..7246caffe7 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -48,8 +48,8 @@ IntVec3FilterParameter::~IntVec3FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3FilterParameter::Pointer IntVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const IntVec3_t& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                            GetterCallbackType getterCallback, int groupIndex)
+IntVec3FilterParameter::Pointer IntVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category,
+                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   IntVec3FilterParameter::Pointer ptr = IntVec3FilterParameter::New();
@@ -77,14 +77,19 @@ QString IntVec3FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec3FilterParameter::readJson(const QJsonObject& json)
+void IntVec3FilterParameter::readJson(const QJsonObject& obj)
 {
-  QJsonValue jsonValue = json[getPropertyName()];
+  QJsonValue jsonValue = obj[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    QJsonObject obj = jsonValue.toObject();
-    IntVec3_t intVec3;
-    intVec3.readJson(obj);
+    QJsonObject json = jsonValue.toObject();
+    IntVec3Type intVec3;
+    if(json["x"].isDouble() && json["y"].isDouble() && json["z"].isDouble())
+    {
+      intVec3[0] = json["x"].toInt();
+      intVec3[1] = json["y"].toInt();
+      intVec3[2] = json["z"].toInt();
+    }
     m_SetterCallback(intVec3);
   }
 }
@@ -92,13 +97,15 @@ void IntVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec3FilterParameter::writeJson(QJsonObject& json)
+void IntVec3FilterParameter::writeJson(QJsonObject& obj)
 {
   if (m_GetterCallback)
   {
-    IntVec3_t intVec3 = m_GetterCallback();
-    QJsonObject obj;
-    intVec3.writeJson(obj);
-    json[getPropertyName()] = obj;
+    IntVec3Type intVec3 = m_GetterCallback();
+    QJsonObject json;
+    json["x"] = intVec3.getX();
+    json["y"] = intVec3.getY();
+    json["z"] = intVec3.getZ();
+    obj[getPropertyName()] = json;
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index b73828c2cc..3b82413057 100755
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -35,10 +35,12 @@
 
 #pragma once
 
+#include <functional>
+
 #include <QtCore/QJsonObject>
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/FilterParameters/IntVec3.h"
 
 /**
  * @brief SIMPL_NEW_INT_VEC3_FP This macro is a short-form way of instantiating an instance of
@@ -68,8 +70,8 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
     SIMPL_STATIC_NEW_MACRO(IntVec3FilterParameter)
     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IntVec3FilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(IntVec3_t)>;
-    using GetterCallbackType = std::function<IntVec3_t(void)>;
+    using SetterCallbackType = std::function<void(IntVec3Type)>;
+    using GetterCallbackType = std::function<IntVec3Type(void)>;
 
     /**
      * @brief New This function instantiates an instance of the IntVec3FilterParameter. Although this function is available to be used,
@@ -87,9 +89,8 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const IntVec3_t& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                       const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~IntVec3FilterParameter() override;
 
@@ -140,3 +141,4 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
   IntVec3FilterParameter& operator=(IntVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
 
+Q_DECLARE_METATYPE(IntVec3Type)
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index dc749c9594..f6dfc0d500 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -34,6 +34,7 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedDataContainerSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -48,9 +49,10 @@ LinkedDataContainerSelectionFilterParameter::~LinkedDataContainerSelectionFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, const RequirementType req, QStringList linkedProperties,
-                                                                        int groupIndex)
+LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
+                                                                                                      Category category, const SetterCallbackType& setterCallback,
+                                                                                                      const GetterCallbackType& getterCallback, const RequirementType& req,
+                                                                                                      const QStringList& linkedProperties, int groupIndex)
 {
   LinkedDataContainerSelectionFilterParameter::Pointer ptr = LinkedDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -84,7 +86,18 @@ void LinkedDataContainerSelectionFilterParameter::readJson(const QJsonObject& js
   QJsonValue jsonValue = json[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
-    m_SetterCallback(jsonValue.toString(""));
+    QJsonObject obj = jsonValue.toObject();
+    DataArrayPath dap;
+    if(dap.readJson(obj))
+    {
+      m_SetterCallback(dap);
+    }
+    else // this is in here for historical where we used to save the value as a string
+    {
+      QString dcName = jsonValue.toString("");
+      DataArrayPath dap(dcName, "", "");
+      m_SetterCallback(dap);
+    }
   }
 }
 
@@ -95,6 +108,25 @@ void LinkedDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    json[getPropertyName()] = m_GetterCallback();
+    DataArrayPath dap = m_GetterCallback();
+    QJsonObject obj;
+    dap.writeJson(obj);
+    json[getPropertyName()] = obj;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
+  {
+    m_SetterCallback(newPath);
+    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index 566619b303..9a96e89c6e 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -40,6 +40,8 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
+class AbstractFilter;
+
 // FP: Documentation incomplete because there isn't currently a way to instantiate this filter parameter
 //     in one line.
 /**
@@ -64,13 +66,13 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
     SIMPL_STATIC_NEW_MACRO(LinkedDataContainerSelectionFilterParameter)
      SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedDataContainerSelectionFilterParameter, FilterParameter)
 
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-    
-    typedef struct
-    {
-      IGeometry::Types dcGeometryTypes;
-    } RequirementType;
+     using SetterCallbackType = std::function<void(DataArrayPath)>;
+     using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+     using RequirementType = struct
+     {
+       IGeometry::Types dcGeometryTypes;
+     };
 
     /**
      * @brief New This function instantiates an instance of the LinkedDataContainerSelectionFilterParameter. This function must be used to instantiate the class; the 
@@ -90,62 +92,63 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, QStringList linkedProperties,
-                       int groupIndex = -1);
-
-    ~LinkedDataContainerSelectionFilterParameter() override;
-
-    SIMPL_INSTANCE_PROPERTY(QStringList, LinkedProperties)
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
-
-  protected:
-      /**
-       * @brief LinkedDataContainerSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    LinkedDataContainerSelectionFilterParameter();
-
-  public:
-    LinkedDataContainerSelectionFilterParameter(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    LinkedDataContainerSelectionFilterParameter(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    LinkedDataContainerSelectionFilterParameter& operator=(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+     static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
+
+     ~LinkedDataContainerSelectionFilterParameter() override;
+
+     SIMPL_INSTANCE_PROPERTY(QStringList, LinkedProperties)
+     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+
+     /**
+      * @brief getWidgetType Returns the type of widget that displays and controls
+      * this FilterParameter subclass
+      * @return
+      */
+     QString getWidgetType() const override;
+
+     /**
+      * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+      * @param json The QJsonObject that the filter parameter reads from.
+      */
+     void readJson(const QJsonObject& json) override;
+
+     /**
+      * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+      * @param json The QJsonObject that the filter parameter writes to.
+      */
+     void writeJson(QJsonObject& json) override;
+
+     /**
+      * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+      * that this FilterParameter subclass represents.
+      * from the filter parameter.
+      */
+     SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+     /**
+      * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+      * that this FilterParameter subclass represents.
+      * @return The GetterCallback
+      */
+     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+     /**
+      * @brief Handle DataArrayPath changes if necessary
+      */
+     void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+   protected:
+     /**
+      * @brief LinkedDataContainerSelectionFilterParameter The default constructor.  It is protected because this
+      * filter parameter should only be instantiated using its New(...) function or short-form macro.
+      */
+     LinkedDataContainerSelectionFilterParameter();
+
+   public:
+     LinkedDataContainerSelectionFilterParameter(const LinkedDataContainerSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+     LinkedDataContainerSelectionFilterParameter(LinkedDataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+     LinkedDataContainerSelectionFilterParameter& operator=(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+     LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 4054b0dfb8..8b8b06ba62 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -208,7 +208,7 @@ void MultiAttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void MultiAttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 37e35c041d..b65b0199b7 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -178,7 +178,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
       /**
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index d49ee0700e..6ab318a2dd 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -208,7 +208,7 @@ void MultiDataArraySelectionFilterParameter::writeJson(QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void MultiDataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 25f26dbeba..8d7aa921d0 100755
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -178,7 +178,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
       /**
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index aa93a2263d..d8039debb5 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -41,18 +41,18 @@
 #include "SIMPLib/Common/Constants.h"
 
 /**
-* @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
-* NumericTypeFilterParameter. There are 6 required parameters and 1 optional parameter
-* that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
-* FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
-*
-* Therefore, the macro should be written like this (this is a concrete example):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName,
-* PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
-*
-* Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
-*/
+ * @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * NumericTypeFilterParameter. There are 6 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_NUMERICTYPE_FP("HumanLabel", PropertyName, Category, FilterName,
+ * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_NUMERICTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ */
 #define SIMPL_NEW_NUMERICTYPE_FP(...)                                                                                                                                                          \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(NumericTypeFilterParameter, __VA_ARGS__))
 
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 
   /**
   * @brief New This function instantiates an instance of the NumericTypeFilterParameter. Although this function is available to be used,
-  * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_SHAPETYPE_SELECTION_FP(...) macro at the top of this file.
+  * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_NUMERICTYPE_FP(...) macro at the top of this file.
 
   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
   * @param propertyName The internal property name for this filter parameter.
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index d55da38992..09def6082e 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -37,6 +37,8 @@
 
 #include <QtCore/QJsonArray>
 
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -50,10 +52,10 @@ PhaseTypeSelectionFilterParameter::~PhaseTypeSelectionFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath attributeMatrixDefault,
+PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault,
                                                                                   Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
                                                                                   const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                                                                                  const QStringList phaseListChoices, int groupIndex)
+                                                                                  const QStringList& phaseListChoices, int groupIndex)
 {
   PhaseTypeSelectionFilterParameter::Pointer ptr = PhaseTypeSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -115,3 +117,21 @@ void PhaseTypeSelectionFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = jsonArray;
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  QVariant var = filter->property(qPrintable(getAttributeMatrixPathProperty()));
+  if(var.isValid() && var.canConvert<DataArrayPath>())
+  {
+    DataArrayPath path = var.value<DataArrayPath>();
+    if(path.updatePath(renamePath))
+    {
+      var.setValue(path);
+      filter->setProperty(qPrintable(getAttributeMatrixPathProperty()), var);
+      emit filter->dataArrayPathUpdated(getAttributeMatrixPathProperty(), renamePath);
+    }
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 50f037641f..f768211c8e 100755
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -88,9 +88,9 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath attributeMatrixDefault, Category category, SetterCallbackType setterCallback,
+  static Pointer New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, SetterCallbackType setterCallback,
                      GetterCallbackType getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                     const QStringList phaseListChoices, int groupIndex = -1);
+                     const QStringList& phaseListChoices, int groupIndex = -1);
 
   ~PhaseTypeSelectionFilterParameter() override;
 
@@ -136,6 +136,11 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   */
   SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
 
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
 protected:
   /**
   * @brief PhaseTypeSelectionFilterParameter The default constructor.  It is protected because this
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index e0fdc82174..630dd8c062 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -74,7 +74,7 @@ QString ReadASCIIDataFilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ReadASCIIDataFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath)
+void ReadASCIIDataFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 05d63b825d..0609b7c381 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -57,7 +57,7 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
      * @param filter
      * @param renamePath
      */
-    void dataArrayPathRenamed(AbstractFilter* filter, DataArrayPath::RenameType renamePath) override;
+    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
   protected:
     ReadASCIIDataFilterParameter();
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index b921732f63..319a4c6d26 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -41,18 +41,18 @@
 #include "SIMPLib/Common/Constants.h"
 
 /**
-* @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
-* ScalarTypeFilterParameter. There are 6 required parameters and 1 optional parameter
-* that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
-* FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
-*
-* Therefore, the macro should be written like this (this is a concrete example):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName,
-* PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
-*
-* Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
-*/
+ * @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * ScalarTypeFilterParameter. There are 6 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_SCALARTYPE_FP("HumanLabel", PropertyName, Category, FilterName,
+ * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_SCALARTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ */
 #define SIMPL_NEW_SCALARTYPE_FP(...)                                                                                                                                                          \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ScalarTypeFilterParameter, __VA_ARGS__))
 
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 
   /**
   * @brief New This function instantiates an instance of the ScalarTypeFilterParameter. Although this function is available to be used,
-  * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_SHAPETYPE_SELECTION_FP(...) macro at the top of this file.
+  * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_SCALARTYPE_FP(...) macro at the top of this file.
 
   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
   * @param propertyName The internal property name for this filter parameter.
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index bb43bb5e4d..0e320bd2e4 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -39,9 +39,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileListInfoFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatFilterParameter.h
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatVec2.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatVec2FilterParameter.h
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatVec3.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatVec3FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FourthOrderPolynomialFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenerateColorTableFilterParameter.h
@@ -52,7 +50,6 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputFileFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputPathFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntFilterParameter.h
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec3.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec3FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersReader.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersWriter.h
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index e10472f37f..0976c91658 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -93,6 +93,7 @@
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
+
 class FilterParametersRWTest
 {
 public:
@@ -104,6 +105,8 @@ class FilterParametersRWTest
     m_String1 = "This is the FilterParametersRWTest";
     m_ArrayPath1 = DataArrayPath("DataContainer", "AttributeMatrix", "DataArray");
 
+    m_Path1 = DataArrayPath("DataContainer Name", "", "");
+
     m_AxisAngle1.angle = 2.2f;
     m_AxisAngle1.h = 3.4f;
     m_AxisAngle1.k = 6.4f;
@@ -152,15 +155,15 @@ class FilterParametersRWTest
     }
 
     {
-      m_FloatVec3_1.x = 3.0f;
-      m_FloatVec3_1.y = 6.7f;
-      m_FloatVec3_1.z = 32.42f;
+      m_FloatVec3_1[0] = 3.0f;
+      m_FloatVec3_1[1] = 6.7f;
+      m_FloatVec3_1[2] = 32.42f;
     }
 
     {
-      m_IntVec3_1.x = 3;
-      m_IntVec3_1.y = 6;
-      m_IntVec3_1.z = 32;
+      m_IntVec3_1[0] = 3;
+      m_IntVec3_1[1] = 6;
+      m_IntVec3_1[2] = 32;
     }
 
     {
@@ -250,6 +253,11 @@ class FilterParametersRWTest
   SIMPL_INSTANCE_PROPERTY(QString, String2)
   Q_PROPERTY(QString String2 READ getString2 WRITE setString2)
 
+  SIMPL_INSTANCE_PROPERTY(DataArrayPath, Path1)
+  Q_PROPERTY(DataArrayPath Path1 READ getPath1 WRITE setPath1)
+  SIMPL_INSTANCE_PROPERTY(DataArrayPath, Path2)
+  Q_PROPERTY(DataArrayPath Path2 READ getPath2 WRITE setPath2)
+
   SIMPL_INSTANCE_PROPERTY(DataArrayPath, ArrayPath1)
   Q_PROPERTY(DataArrayPath ArrayPath1 READ getArrayPath1 WRITE setArrayPath1)
   SIMPL_INSTANCE_PROPERTY(DataArrayPath, ArrayPath2)
@@ -280,15 +288,15 @@ class FilterParametersRWTest
   SIMPL_INSTANCE_PROPERTY(FileListInfo_t, FileListInfo2)
   Q_PROPERTY(FileListInfo_t FileListInfo2 READ getFileListInfo2 WRITE setFileListInfo2)
 
-  SIMPL_INSTANCE_PROPERTY(IntVec3_t, IntVec3_1)
-  Q_PROPERTY(IntVec3_t IntVec3_1 READ getIntVec3_1 WRITE setIntVec3_1)
-  SIMPL_INSTANCE_PROPERTY(IntVec3_t, IntVec3_2)
-  Q_PROPERTY(IntVec3_t IntVec3_2 READ getIntVec3_2 WRITE setIntVec3_2)
+  SIMPL_INSTANCE_PROPERTY(IntVec3Type, IntVec3_1)
+  Q_PROPERTY(IntVec3Type IntVec3_1 READ getIntVec3_1 WRITE setIntVec3_1)
+  SIMPL_INSTANCE_PROPERTY(IntVec3Type, IntVec3_2)
+  Q_PROPERTY(IntVec3Type IntVec3_2 READ getIntVec3_2 WRITE setIntVec3_2)
 
-  SIMPL_INSTANCE_PROPERTY(FloatVec3_t, FloatVec3_1)
-  Q_PROPERTY(FloatVec3_t FloatVec3_1 READ getFloatVec3_1 WRITE setFloatVec3_1)
-  SIMPL_INSTANCE_PROPERTY(FloatVec3_t, FloatVec3_2)
-  Q_PROPERTY(FloatVec3_t FloatVec3_2 READ getFloatVec3_2 WRITE setFloatVec3_2)
+  SIMPL_INSTANCE_PROPERTY(FloatVec3Type, FloatVec3_1)
+  Q_PROPERTY(FloatVec3Type FloatVec3_1 READ getFloatVec3_1 WRITE setFloatVec3_1)
+  SIMPL_INSTANCE_PROPERTY(FloatVec3Type, FloatVec3_2)
+  Q_PROPERTY(FloatVec3Type FloatVec3_2 READ getFloatVec3_2 WRITE setFloatVec3_2)
 
   SIMPL_INSTANCE_PROPERTY(Float2ndOrderPoly_t, Float2ndOrderPoly_1)
   Q_PROPERTY(Float2ndOrderPoly_t Float2ndOrderPoly_1 READ getFloat2ndOrderPoly_1 WRITE setFloat2ndOrderPoly_1)
@@ -513,13 +521,13 @@ class FilterParametersRWTest
 
     {
       DataContainerCreationFilterParameter::Pointer fp = DataContainerCreationFilterParameter::New(
-          "Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+          "Test", "Path1", getPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1));
 
       QJsonObject obj;
       fp->writeJson(obj);
       fp->readJson(obj);
 
-      DREAM3D_REQUIRE_EQUAL(m_String1, m_String2)
+      DREAM3D_REQUIRE_EQUAL(m_Path1, m_Path2)
 
       m_String2.clear();
     }
@@ -527,13 +535,13 @@ class FilterParametersRWTest
     {
       DataContainerSelectionFilterParameter::RequirementType req;
       DataContainerSelectionFilterParameter::Pointer fp = DataContainerSelectionFilterParameter::New(
-          "Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1), req);
+          "Test", "Path1", getPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
       fp->readJson(obj);
 
-      DREAM3D_REQUIRE_EQUAL(m_String1, m_String2)
+      DREAM3D_REQUIRE_EQUAL(m_Path1, m_Path2)
 
       m_String2.clear();
     }
@@ -603,18 +611,18 @@ class FilterParametersRWTest
     }
 
     {
-      FloatVec3FilterParameter::Pointer fp = FloatVec3FilterParameter::New("Test", "FloatVec3_1", FloatVec3_t(), FilterParameter::Parameter,
+      FloatVec3FilterParameter::Pointer fp = FloatVec3FilterParameter::New("Test", "FloatVec3_1", FloatVec3Type(), FilterParameter::Parameter,
                                                                            SIMPL_BIND_SETTER(FilterParametersRWTest, this, FloatVec3_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, FloatVec3_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
       fp->readJson(obj);
 
-      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1.x, m_FloatVec3_2.x)
-      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1.y, m_FloatVec3_2.y)
-      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1.z, m_FloatVec3_2.z)
+      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1[0], m_FloatVec3_2[0])
+      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1[1], m_FloatVec3_2[1])
+      DREAM3D_REQUIRE_EQUAL(m_FloatVec3_1[2], m_FloatVec3_2[2])
 
-      m_FloatVec3_2 = FloatVec3_t();
+      m_FloatVec3_2 = FloatVec3Type();
     }
 
     {
@@ -685,18 +693,18 @@ class FilterParametersRWTest
     }
 
     {
-      IntVec3FilterParameter::Pointer fp = IntVec3FilterParameter::New("Test", "IntVec3_1", IntVec3_t(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, IntVec3_2),
+      IntVec3FilterParameter::Pointer fp = IntVec3FilterParameter::New("Test", "IntVec3_1", IntVec3Type(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, IntVec3_2),
                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, IntVec3_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
       fp->readJson(obj);
 
-      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1.x, m_IntVec3_2.x)
-      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1.y, m_IntVec3_2.y)
-      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1.z, m_IntVec3_2.z)
+      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1[0], m_IntVec3_2[0])
+      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1[1], m_IntVec3_2[1])
+      DREAM3D_REQUIRE_EQUAL(m_IntVec3_1[2], m_IntVec3_2[2])
 
-      m_IntVec3_2 = IntVec3_t();
+      m_IntVec3_2 = IntVec3Type();
     }
 
     {
@@ -848,8 +856,6 @@ class FilterParametersRWTest
           ShapeTypeSelectionFilterParameter::New("Test", "String1", shapeData, FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ShapeType::Types),
                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ShapeType::Types), "String1", "");
 
-      //SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
-
       QJsonObject obj;
       fp->writeJson(obj);
       fp->readJson(obj);
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index 69669a46e0..316c8150c7 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -52,7 +52,7 @@ AbstractDecisionFilter::~AbstractDecisionFilter() = default;
 // -----------------------------------------------------------------------------
 void AbstractDecisionFilter::setupFilterParameters()
 {
-  // FilterParameterVector parameters;
+  // FilterParameterVectorType parameters;
 
   // setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 862d4de774..e272922f38 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -43,6 +43,8 @@
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Plugin/PluginManager.h"
 
+
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -54,7 +56,6 @@ AbstractFilter::AbstractFilter()
 , m_Removing(false)
 , m_PipelineIndex(0)
 , m_Cancel(false)
-
 {
   m_DataContainerArray = DataContainerArray::New();
   m_PreviousFilter = NullPointer();
@@ -100,91 +101,27 @@ void AbstractFilter::setCancel(bool value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::renameDataArrayPath(DataArrayPath::RenameType renamePath)
+void AbstractFilter::renameDataArrayPath(const DataArrayPath::RenameType& renamePath)
 {
-  // Updates any DataArrayPath or proxy property assigned to this filter.
-  // A signal is emitted if a change was required stating the property name, old path, and new path.
-  // No additional methods are required aside from a connecting slot in filter parameter widgets to update their UI.
-  // If all filters stored their data paths as DataArrayPaths instead of QString without delimiters,
-  // this would handle all required updates.  This was moved to FilterParameter::dataArrayRenamed.
-  // However, moving this to FilterParameter does not update any private properties that do not 
-  // have a FilterParameter assigned.
-#if 0
-  const QMetaObject* metaobject = metaObject();
-  int count = metaobject->propertyCount();
-  for(int i = 0; i < count; i++)
-  {
-    QMetaProperty metaproperty = metaobject->property(i);
-    const char* name = metaproperty.name();
-    QVariant var = property(name);
-    if(var.isValid() && var.canConvert<DataArrayPath>())
-    {
-      DataArrayPath path = var.value<DataArrayPath>();
-      if(path.updatePath(oldPath, newPath))
-      {
-        //QString ss = QString("Updated property '%1' in %2").arg(name).arg(getHumanLabel());
-        //notifyStandardOutputMessage(getHumanLabel(), getPipelineIndex(), ss);
-        //notifyStatusMessage(getHumanLabel(), ss);
-        var.setValue(path);
-        this->setProperty(name, var);
-        emit dataArrayPathUpdated(name, oldPath, newPath);
-      }
-    }
-    else if(var.isValid() && var.canConvert<DataContainerArrayProxy>())
-    {
-      DataContainerArrayProxy proxy = var.value<DataContainerArrayProxy>();
-      proxy.updatePath(oldPath, newPath);
-      var.setValue(proxy);
-      this->setProperty(name, var);
-      emit dataArrayPathUpdated(name, oldPath, newPath);
-    }
-    else if(var.isValid() && var.canConvert<DataContainerProxy>())
-    {
-      DataContainerProxy proxy = var.value<DataContainerProxy>();
-      proxy.updatePath(oldPath, newPath);
-      var.setValue(proxy);
-      this->setProperty(name, var);
-      emit dataArrayPathUpdated(name, oldPath, newPath);
-    }
-    else if(var.isValid() && var.canConvert<AttributeMatrixProxy>())
-    {
-      AttributeMatrixProxy proxy = var.value<AttributeMatrixProxy>();
-      proxy.updatePath(oldPath, newPath);
-      var.setValue(proxy);
-      this->setProperty(name, var);
-      emit dataArrayPathUpdated(name, oldPath, newPath);
-    }
-    else if(var.isValid() && var.canConvert<DataArrayProxy>())
-    {
-      DataArrayProxy proxy = var.value<DataArrayProxy>();
-      proxy.updatePath(oldPath, newPath);
-      var.setValue(proxy);
-      this->setProperty(name, var);
-      emit dataArrayPathUpdated(name, oldPath, newPath);
-    }
-  }
-#endif
-
   // Some filter parameters handle paths as nothing but a QString (i.e. DataContainerSelectionFilterParameter)
   // This does not store data in a way that represents what is stored or in a consistent manner with anything else.
   // Because this format cannot be quieried nicely like the above code, filter parameters have to be able to update
   // their own paths in these cases.  In cases where private properties need to be updated but do not have
   // assigned filter parameters, although this should not be the case, this code, unlike the above snippet, will not update them.
-  FilterParameterVector filterParams = getFilterParameters();
-  for(FilterParameter::Pointer filterParam : filterParams)
+  FilterParameterVectorType filterParams = getFilterParameters();
+  for(FilterParameter::Pointer& filterParam : filterParams)
   {
     filterParam->dataArrayPathRenamed(this, renamePath);
   }
-}
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void AbstractFilter::renameDataArrayPaths(DataArrayPath::RenameContainer renamedPaths)
-{
-  for(DataArrayPath::RenameType rename : renamedPaths)
+  // Update created paths
+  for(const auto& createdPathItem : m_CreatedPaths)
   {
-    renameDataArrayPath(rename);
+    DataArrayPath createdPath = createdPathItem.second;
+    if(createdPath.updatePath(renamePath))
+    {
+      m_CreatedPaths[createdPathItem.first] = createdPath;
+    }
   }
 }
 
@@ -261,7 +198,7 @@ void insertAttributeMatrixPaths(DataContainer::Pointer dc, AttributeMatrix::Poin
 {
   paths.push_back(DataArrayPath(dc->getName(), am->getName(), ""));
   // Insert all DataArrayPaths
-  for(QString daName : am->getAttributeArrayNames())
+  for(const QString& daName : am->getAttributeArrayNames())
   {
     DataArrayPath daPath(dc->getName(), am->getName(), daName);
     paths.push_back(daPath);
@@ -271,11 +208,11 @@ void insertAttributeMatrixPaths(DataContainer::Pointer dc, AttributeMatrix::Poin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void insertDataContainerPaths(DataContainer::Pointer dc, std::list<DataArrayPath>& paths)
+void insertDataContainerPaths(const DataContainer::Pointer& dc, std::list<DataArrayPath>& paths)
 {
-  paths.push_back(DataArrayPath(dc->getName(), "", ""));
+  paths.emplace_back(DataArrayPath(dc->getName(), "", ""));
   // Insert all AttributeMatrix paths
-  for(AttributeMatrix::Pointer am : dc->getAttributeMatrices())
+  for(const AttributeMatrix::Pointer& am : dc->getAttributeMatrices())
   {
     insertAttributeMatrixPaths(dc, am, paths);
   }
@@ -300,7 +237,7 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
     DataContainerArray::Pointer dca = getDataContainerArray();
 
     // Check DataContainers
-    for(DataContainer::Pointer dc : dca->getDataContainers())
+    for(const DataContainer::Pointer& dc : dca->getDataContainers())
     {
       if(!prevDca->doesDataContainerExist(dc->getName()))
       {
@@ -309,7 +246,7 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
       else
       {
         // Check AttributeMatrices
-        for(AttributeMatrix::Pointer am : dc->getAttributeMatrices())
+        for(const AttributeMatrix::Pointer& am : dc->getAttributeMatrices())
         {
           DataArrayPath amPath(dc->getName(), am->getName(), "");
           if(!prevDca->doesAttributeMatrixExist(amPath))
@@ -319,7 +256,7 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
           else
           {
             // Check DataArrays
-            for(QString daName : am->getAttributeArrayNames())
+            for(const QString& daName : am->getAttributeArrayNames())
             {
               DataArrayPath daPath(dc->getName(), am->getName(), daName);
               if(!prevDca->doesAttributeArrayExist(daPath))
@@ -340,7 +277,7 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
     if(dca)
     {
       // Add all paths if there is no previous filter to compare to
-      for(DataContainer::Pointer dc : dca->getDataContainers())
+      for(const DataContainer::Pointer& dc : dca->getDataContainers())
       {
         insertDataContainerPaths(dc, createdPaths);
       }
@@ -350,14 +287,21 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
   return createdPaths;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::list<DataArrayPath> AbstractFilter::getDeletedPaths()
+{
+  return std::list<DataArrayPath>();
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 DataArrayPath::RenameContainer AbstractFilter::getRenamedPaths()
 {
   // Implemented in filters that rename existing paths
-  DataArrayPath::RenameContainer container;
-  return container;
+  return m_RenamedPaths;
 }
 
 // -----------------------------------------------------------------------------
@@ -375,10 +319,9 @@ void AbstractFilter::readFilterParameters(AbstractFilterParametersReader* reader
 // -----------------------------------------------------------------------------
 void AbstractFilter::readFilterParameters(QJsonObject& obj)
 {
-  QVector<FilterParameter::Pointer> filterParameters = getFilterParameters();
-  for(int i = 0; i < filterParameters.size(); i++)
+  FilterParameterVectorType filterParameters = getFilterParameters();
+  for(auto const& fp : filterParameters)
   {
-    FilterParameter::Pointer fp = filterParameters[i];
     fp->readJson(obj);
   }
 }
@@ -397,8 +340,8 @@ void AbstractFilter::preWriteFilterParameters(QJsonObject& obj, QJsonObject& roo
 // -----------------------------------------------------------------------------
 void AbstractFilter::writeFilterParameters(QJsonObject& obj) const
 {
-  QVector<FilterParameter::Pointer> filterParameters = getFilterParameters();
-  for(auto const fp : filterParameters)
+  FilterParameterVectorType filterParameters = getFilterParameters();
+  for(auto const& fp : filterParameters)
   {
     fp->writeJson(obj);
   }
@@ -665,3 +608,43 @@ void AbstractFilter::notifyMissingProperty(FilterParameter* filterParameter)
   setWarningCondition(-1);
   notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool AbstractFilter::checkIfPathRenamed(const RenameDataPath::DataID_t id, const DataArrayPath& path)
+{
+  if(id == RenameDataPath::k_Invalid_ID)
+  {
+    return false;
+  }
+  else if(m_CreatedPaths.find(id) == m_CreatedPaths.end())
+  {
+    m_CreatedPaths[id] = path;
+    return false;
+  }
+  else if(m_CreatedPaths[id] == path)
+  {
+    return false;
+  }
+
+  m_RenamedPaths.push_back(std::make_pair(m_CreatedPaths[id], path));
+  m_CreatedPaths[id] = path;
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractFilter::clearRenamedPaths()
+{
+  m_RenamedPaths.clear();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractFilter::addPathRename(const DataArrayPath& oldPath, const DataArrayPath& newPath)
+{
+  m_RenamedPaths.push_back(std::make_pair(oldPath, newPath));
+}
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 72470ca614..c3d2e59d79 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <map>
+
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QVector>
@@ -43,6 +45,7 @@
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -95,11 +98,14 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_METHOD(void preflight)
   PYB11_METHOD(void setDataContainerArray)
   
+  // Friend declarations for RenameDataPath so that it can set and check the instance's created data by ID.
+  friend void RenameDataPath::AlertFilterCreatedPath(AbstractFilter*, RenameDataPath::DataID_t, const DataArrayPath&);
+
 public:
   SIMPL_SHARED_POINTERS(AbstractFilter)
   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractFilter, Observable)
   SIMPL_STATIC_NEW_MACRO(AbstractFilter)
-
+    
   ~AbstractFilter() override;
 
   /**
@@ -237,7 +243,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
 
   SIMPL_INSTANCE_PROPERTY(DataContainerArray::Pointer, DataContainerArray)
 
-  SIMPL_INSTANCE_PROPERTY(QVector<FilterParameter::Pointer>, FilterParameters)
+  SIMPL_INSTANCE_PROPERTY(FilterParameterVectorType, FilterParameters)
 
   SIMPL_INSTANCE_PROPERTY(QString, MessagePrefix)
 
@@ -294,6 +300,12 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   std::list<DataArrayPath> getCreatedPaths();
 
+  /**
+   * @brief Returns the list of deleted data paths.
+   * @return
+   */
+  virtual std::list<DataArrayPath> getDeletedPaths();
+
   /**
    * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
    * @return
@@ -380,6 +392,11 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   virtual void copyFilterParameterInstanceVariables(AbstractFilter* filter) const;
 
+  /**
+   * @brief Clears the renamed paths for the filter instance.
+   */
+  void clearRenamedPaths();
+
 signals:
   /**
    * @brief Signal is emitted when filter has completed the execute() method
@@ -396,7 +413,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   * @param propertyName
   * @param renamePath
   */
-  void dataArrayPathUpdated(QString propertyName, DataArrayPath::RenameType renamePath);
+  void dataArrayPathUpdated(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
 public slots:
 
@@ -410,18 +427,40 @@ public slots:
    * For DataArrayPaths longer than the given path, only the specified values are modified
    * @param renamePath
    */
-  virtual void renameDataArrayPath(DataArrayPath::RenameType renamePath);
+  virtual void renameDataArrayPath(const DataArrayPath::RenameType& renamePath);
 
   /**
   * @brief Updates any DataArrayPath properties from the old paths to their corresponding new paths.
   * For DataArrayPaths longer than the new path, only the values provided by the new path are modified
   * @param renamedPaths
   */
-  virtual void renameDataArrayPaths(DataArrayPath::RenameContainer renamedPaths);
+  inline void renameDataArrayPaths(const DataArrayPath::RenameContainer& renamedPaths)
+  {
+    for(const DataArrayPath::RenameType& rename : renamedPaths)
+    {
+      renameDataArrayPath(rename);
+    }
+  }
 
 protected:
   AbstractFilter();
 
+  /**
+   * @brief Checks if the path matches the one saved with the specified ID.  Index 0 is used for
+   * non-renamable DataArrayPaths, and any DataID 0 value will bypass the check and return false.
+   * If the path does not match and the ID is already used, return true and update the path.  If
+   * the ID is used and the paths match, return false.  If the ID has not been used, add the path
+   * to the createdPaths map.
+   */
+  bool checkIfPathRenamed(const RenameDataPath::DataID_t id, const DataArrayPath& path);
+
+  /**
+   * @brief Adds the specified change to the list of renamed DataArrayPaths.
+   * @param oldPath
+   * @param newPath
+   */
+  void addPathRename(const DataArrayPath& oldPath, const DataArrayPath& newPath);
+
 protected slots:
   /**
    * @brief This function will be called after the pipeline is completely done executing.  This can be reimplemented
@@ -432,6 +471,8 @@ protected slots:
 private:
   bool m_Cancel;
   QUuid m_Uuid;
+  std::map<RenameDataPath::DataID_t, DataArrayPath> m_CreatedPaths;
+  DataArrayPath::RenameContainer m_RenamedPaths;
 
 public:
   AbstractFilter(const AbstractFilter&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index f77c8ea6e9..2dda50ee42 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   PYB11_CREATION()
  
   PYB11_PROPERTY(QVector<AbstractComparison::Pointer> Inputs READ getInputs)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
 
   PYB11_METHOD(void addInput OVERLOAD int,unionOperator const.QString,arrayName int,compOperator double,compValue)
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index cd7655a6cf..dc38638408 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -43,6 +43,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 
+#define RENAME_ENABLED 1
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -687,78 +689,65 @@ int FilterPipeline::preflightPipeline()
   int preflightError = 0;
 
   DataArrayPath::RenameContainer renamedPaths;
-  DataArrayPath::RenameContainer filterRenamedPaths;
 
   // Start looping through each filter in the Pipeline and preflight everything
-  // for(FilterContainerType::iterator filter = m_Pipeline.begin(); filter != m_Pipeline.end(); ++filter)
   for(const auto& filter : m_Pipeline)
   {
     // Do not preflight disabled filters
     if(filter->getEnabled())
     {
-      // Update renamed paths before getting old created paths
-      DataContainerArray::Pointer oldDca = filter->getDataContainerArray();
-      oldDca->renameDataArrayPaths(filterRenamedPaths);
-      filter->setDataContainerArray(oldDca);
-      filter->renameDataArrayPaths(filterRenamedPaths);
-
-      std::list<DataArrayPath> oldCreatedPaths = filter->getCreatedPaths();
-
       filter->setDataContainerArray(dca);
+#if RENAME_ENABLED
       filter->renameDataArrayPaths(renamedPaths);
+#endif
       setCurrentFilter(filter);
       connectFilterNotifications(filter.get());
+      filter->clearRenamedPaths();
       filter->preflight();
       disconnectFilterNotifications(filter.get());
 
       filter->setCancel(false); // Reset the cancel flag
       preflightError |= filter->getErrorCondition();
       filter->setDataContainerArray(dca->deepCopy(false));
-      std::list<DataArrayPath> currentCreatedPaths = filter->getCreatedPaths();
+#if RENAME_ENABLED
+      const std::list<DataArrayPath> deletedPaths = filter->getDeletedPaths();
 
-      // Check if an existing renamed path was created by this filter
-      for(const DataArrayPath& createdPath : currentCreatedPaths)
+      // Check if an existing renamed path was deleted by this filter
+      for(const DataArrayPath& deletedPath : deletedPaths)
       {
-        // Filter Parameter changes
         for(const DataArrayPath::RenameType& rename : renamedPaths)
         {
-          DataArrayPath originalPath;
-          DataArrayPath renamePath;
-          std::tie(originalPath, renamePath) = rename;
-          if(originalPath == createdPath)
+          const DataArrayPath& originalPath = std::get<0>(rename);
+          const DataArrayPath& renamePath = std::get<1>(rename);
+          if(originalPath == deletedPath)
           {
-            renamedPaths.remove(rename);
+            const auto iter = std::find(renamedPaths.begin(), renamedPaths.end(), rename);
+            renamedPaths.erase(iter);
             break;
           }
         }
-        // Rename Filters
-        for(const DataArrayPath::RenameType& rename : filterRenamedPaths)
+      }
+      // Filter renamed existing DataArrayPaths
+      const DataArrayPath::RenameContainer newRenamePaths = filter->getRenamedPaths();
+      for(const DataArrayPath::RenameType& newRename : newRenamePaths)
+      {
+        // Loop through all existing rename paths and update as appropriate
+        for(auto iter = renamedPaths.cbegin(); iter != renamedPaths.cend(); ++iter)
         {
-          DataArrayPath originalPath;
-          DataArrayPath renamePath;
-          std::tie(originalPath, renamePath) = rename;
-          if(originalPath == createdPath)
+          const auto& existingRename = (*iter);
+          const auto updatedRenameOpt = DataArrayPath::CreateLinkingRename(existingRename, newRename);
+          if(true == updatedRenameOpt.first)
           {
-            filterRenamedPaths.remove(rename);
-            break;
+            // Remove the old rename, insert the updated one, and update the iterator
+            renamedPaths.insert(iter, updatedRenameOpt.second);
           }
         }
+        // Add the new rename path
+        renamedPaths.push_back(newRename);
       }
-
-      DataArrayPath::RenameContainer newRenamedPaths = DataArrayPath::CheckForRenamedPaths(oldDca, dca, oldCreatedPaths, currentCreatedPaths);
-      for(const DataArrayPath::RenameType& renameType : newRenamedPaths)
-      {
-        renamedPaths.push_back(renameType);
-      }
-
-      // Filter renamed existing DataArrayPaths
-      DataArrayPath::RenameContainer hardRenamePaths = filter->getRenamedPaths();
-      for(const DataArrayPath::RenameType& renameType : hardRenamePaths)
-      {
-        renamedPaths.push_back(renameType);
-        filterRenamedPaths.push_back(renameType);
-      }
+#endif
     }
+#if RENAME_ENABLED
     else
     {
       // Some widgets require the updated path to be valid before it can be set in the widget
@@ -766,17 +755,16 @@ int FilterPipeline::preflightPipeline()
       filter->renameDataArrayPaths(renamedPaths);
 
       // Undo filter renaming
-      DataArrayPath::RenameContainer filterRenamedPaths = filter->getRenamedPaths();
-      for(DataArrayPath::RenameType renameType : filterRenamedPaths)
+      const DataArrayPath::RenameContainer filterRenamedPaths = filter->getRenamedPaths();
+      for(const DataArrayPath::RenameType& renameType : filterRenamedPaths)
       {
-        DataArrayPath oldPath;
-        DataArrayPath newPath;
-        std::tie(oldPath, newPath) = renameType;
-        renameType = std::make_pair(newPath, oldPath);
+        const DataArrayPath& oldPath = std::get<0>(renameType);
+        const DataArrayPath& newPath = std::get<1>(renameType);
 
-        renamedPaths.push_back(renameType);
+        renamedPaths.push_back(std::make_pair(newPath, oldPath));
       }
     }
+#endif
   }
   setCurrentFilter(AbstractFilter::NullPointer());
 
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 9f80d454cc..d9a647da93 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -55,25 +55,25 @@
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 
 // These Streams need to be implemented so that our 3 Element Vectors can be read/write to disk/prefs files
-QDataStream& operator<<(QDataStream& out, const IntVec3_t& v)
+QDataStream& operator<<(QDataStream& out, const IntVec3Type& v)
 {
-  out << v.x << v.y << v.z;
+  out << v[0] << v[1] << v[2];
   return out;
 }
-QDataStream& operator>>(QDataStream& in, IntVec3_t& v)
+QDataStream& operator>>(QDataStream& in, IntVec3Type& v)
 {
-  in >> v.x >> v.y >> v.z;
+  in >> v[0] >> v[1] >> v[2];
   return in;
 }
 
-QDataStream& operator<<(QDataStream& out, const FloatVec3_t& v)
+QDataStream& operator<<(QDataStream& out, const FloatVec3Type& v)
 {
-  out << v.x << v.y << v.z;
+  out << v[0] << v[1] << v[2];
   return out;
 }
-QDataStream& operator>>(QDataStream& in, FloatVec3_t& v)
+QDataStream& operator>>(QDataStream& in, FloatVec3Type& v)
 {
-  in >> v.x >> v.y >> v.z;
+  in >> v[0] >> v[1] >> v[2];
   return in;
 }
 
@@ -152,14 +152,14 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<ComparisonInputs>("ComparisonInputs");
   qRegisterMetaType<ComparisonInputsAdvanced>("ComparisonInputsAdvanced");
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
-  qRegisterMetaType<IntVec3_t>("IntVec3_t");
-  qRegisterMetaType<FloatVec3_t>("FloatVec3_t");
+  qRegisterMetaType<IntVec3Type>("IntVec3Type");
+  qRegisterMetaType<FloatVec3Type>("FloatVec3Type");
   qRegisterMetaType<PipelineMessage>("PipelineMessage");
   qRegisterMetaType<FPRangePair>("FPRangePair");
   qRegisterMetaType<DynamicTableData>("DynamicTableData");
   qRegisterMetaType<PhaseType::Types>("PhaseType::Types");
-  qRegisterMetaTypeStreamOperators<IntVec3_t>("IntVec3_t");
-  qRegisterMetaTypeStreamOperators<FloatVec3_t>("FloatVec3_t");
+  qRegisterMetaTypeStreamOperators<IntVec3Type>("IntVec3Type");
+  qRegisterMetaTypeStreamOperators<FloatVec3Type>("FloatVec3Type");
   qRegisterMetaTypeStreamOperators<PhaseType::Types>("PhaseType::Types");
   qRegisterMetaTypeStreamOperators<EnsembleInfo>("EnsembleInfo");
 }
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index e3abe98160..f3f113d5b4 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -202,7 +202,7 @@ void EdgeGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void EdgeGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void EdgeGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge)
   {
@@ -217,11 +217,11 @@ void EdgeGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
-  m_AttributeMatrices[name] = data;
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
+  m_AttributeMatrices[data->getName()] = data;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 96c3998acd..a53d285508 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -350,9 +350,9 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
   /**
-   * @brief addAttributeMatrix
+   * @brief addOrReplaceAttributeMatrix
    */
-  void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
 protected:
   EdgeGeom();
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index 9c4c68db74..9650181fd1 100755
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -466,7 +466,7 @@ class Connectivity
     }
 
     typename std::set<std::pair<T, T>>::iterator setIter;
-    edgeList->resize(edgeSet.size());
+    edgeList->resizeTuples(edgeSet.size());
     T* uEdges = edgeList->getPointer(0);
     T index = 0;
 
@@ -511,7 +511,7 @@ class Connectivity
     }
 
     typename std::set<std::pair<T, T>>::iterator setIter;
-    edgeList->resize(edgeSet.size());
+    edgeList->resizeTuples(edgeSet.size());
     T* uEdges = edgeList->getPointer(0);
     T index = 0;
 
@@ -528,7 +528,7 @@ class Connectivity
   * @param hexList
   * @param edgeList
   */
-  template <typename T> static void FindHexEdges(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer edgeList)
+  template <typename T> static void FindHexEdges(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer edge_List)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -566,8 +566,8 @@ class Connectivity
     }
 
     typename std::set<std::pair<T, T>>::iterator setIter;
-    edgeList->resize(edgeSet.size());
-    T* uEdges = edgeList->getPointer(0);
+    edge_List->resizeTuples(edgeSet.size());
+    T* uEdges = edge_List->getPointer(0);
     T index = 0;
 
     for(setIter = edgeSet.begin(); setIter != edgeSet.end(); ++setIter)
@@ -609,7 +609,7 @@ class Connectivity
     }
 
     typename std::set<std::tuple<T, T, T>>::iterator setIter;
-    faceList->resize(faceSet.size());
+    faceList->resizeTuples(faceSet.size());
     T* uFaces = faceList->getPointer(0);
     T index = 0;
 
@@ -656,7 +656,7 @@ class Connectivity
     }
 
     typename std::set<std::tuple<T, T, T, T>>::iterator setIter;
-    faceList->resize(faceSet.size());
+    faceList->resizeTuples(faceSet.size());
     T* uFaces = faceList->getPointer(0);
     T index = 0;
 
@@ -736,7 +736,7 @@ class Connectivity
       }
     }
 
-    edgeList->resize(edgeMap.size());
+    edgeList->resizeTuples(edgeMap.size());
     T* bEdges = edgeList->getPointer(0);
     T index = 0;
 
@@ -794,7 +794,7 @@ class Connectivity
       }
     }
 
-    edgeList->resize(edgeMap.size());
+    edgeList->resizeTuples(edgeMap.size());
     T* bEdges = edgeList->getPointer(0);
     T index = 0;
 
@@ -811,7 +811,7 @@ class Connectivity
   * @param hexList
   * @param edgeList
   */
-  template <typename T> static void FindUnsharedHexEdges(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer edgeList)
+  template <typename T> static void FindUnsharedHexEdges(typename DataArray<T>::Pointer& hexList, typename DataArray<T>::Pointer& edge_List)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -837,8 +837,7 @@ class Connectivity
       std::vector<T> edge10 = {verts[6], verts[7]};
       std::vector<T> edge11 = {verts[7], verts[4]};
 
-      std::list<std::vector<T>> edgeList = {edge0, edge1, edge2, edge3, edge4, edge5,
-                                            edge6, edge7, edge8, edge9, edge10, edge11};
+      std::list<std::vector<T>> edgeList = {edge0, edge1, edge2, edge3, edge4, edge5, edge6, edge7, edge8, edge9, edge10, edge11};
 
       for(auto&& uEdge : edgeList)
       {
@@ -862,8 +861,8 @@ class Connectivity
       }
     }
 
-    edgeList->resize(edgeMap.size());
-    T* bEdges = edgeList->getPointer(0);
+    edge_List->resizeTuples(edgeMap.size());
+    T* bEdges = edge_List->getPointer(0);
     T index = 0;
 
     for(mapIter = edgeMap.begin(); mapIter != edgeMap.end(); ++mapIter)
@@ -918,7 +917,7 @@ class Connectivity
       }
     }
 
-    faceList->resize(faceMap.size());
+    faceList->resizeTuples(faceMap.size());
     T* uFaces = faceList->getPointer(0);
     T index = 0;
 
@@ -978,7 +977,7 @@ class Connectivity
       }
     }
 
-    faceList->resize(faceMap.size());
+    faceList->resizeTuples(faceMap.size());
     T* uFaces = faceList->getPointer(0);
     T index = 0;
 
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index b36d8766a5..40bee49fa8 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -171,7 +171,7 @@ void HexahedralGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void HexahedralGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex
      || data->getType() != AttributeMatrix::Type::Edge
@@ -196,11 +196,11 @@ void HexahedralGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Po
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
-  m_AttributeMatrices[name] = data;
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
+  m_AttributeMatrices[data->getName()] = data;
 }
 
 // -----------------------------------------------------------------------------
@@ -216,7 +216,7 @@ size_t HexahedralGeom::getNumberOfElements()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findEdges()
 {
-  m_EdgeList = CreateSharedEdgeList(0);
+  m_EdgeList = CreateSharedEdgeList(0, false);
   GeometryHelpers::Connectivity::FindHexEdges<int64_t>(m_HexList, m_EdgeList);
   if(m_EdgeList.get() == nullptr)
   {
@@ -238,7 +238,7 @@ void HexahedralGeom::deleteEdges()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findFaces()
 {
-  m_QuadList = CreateSharedQuadList(0);
+  m_QuadList = CreateSharedQuadList(0, false);
   GeometryHelpers::Connectivity::FindHexFaces<int64_t>(m_HexList, m_QuadList);
   if(m_QuadList.get() == nullptr)
   {
@@ -386,7 +386,8 @@ void HexahedralGeom::deleteElementCentroids()
 int HexahedralGeom::findElementSizes()
 {
   QVector<size_t> cDims(1, 1);
-  m_HexSizes = FloatArrayType::CreateArray(getNumberOfHexas(), cDims, SIMPL::StringConstants::HexVolumes);
+  int64_t numHexs = getNumberOfHexas();
+  m_HexSizes = FloatArrayType::CreateArray(numHexs, cDims, SIMPL::StringConstants::HexVolumes, (numHexs != 0));
   GeometryHelpers::Topology::FindHexVolumes<int64_t>(m_HexList, m_VertexList, m_HexSizes);
   if(m_HexSizes.get() == nullptr)
   {
@@ -425,7 +426,7 @@ void HexahedralGeom::deleteElementSizes()
 int HexahedralGeom::findUnsharedEdges()
 {
   QVector<size_t> cDims(1, 2);
-  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
+  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, false);
   GeometryHelpers::Connectivity::FindUnsharedHexEdges<int64_t>(m_HexList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
@@ -464,7 +465,7 @@ void HexahedralGeom::deleteUnsharedEdges()
 int HexahedralGeom::findUnsharedFaces()
 {
   QVector<size_t> cDims(1, 4);
-  m_UnsharedQuadList = SharedQuadList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList);
+  m_UnsharedQuadList = SharedQuadList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList, false);
   GeometryHelpers::Connectivity::FindUnsharedHexFaces<int64_t>(m_HexList, m_UnsharedQuadList);
   if(m_UnsharedQuadList.get() == nullptr)
   {
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 048f40bde5..6e48a088fe 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -333,9 +333,9 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
     IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
     /**
-     * @brief addAttributeMatrix
+     * @brief addOrReplaceAttributeMatrix
      */
-    void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
 // -----------------------------------------------------------------------------
 // Inherited from IGeometry3D
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 233e5a8eb6..f13fb7d4be 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -84,7 +84,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
   PYB11_PROPERTY(uint32_t SpatialDimensionality READ getSpatialDimensionality WRITE setSpatialDimensionality)
   PYB11_METHOD(Pointer deepCopy ARGS forceNoAllocate)
   PYB11_METHOD(void initializeWithZeros)
-  PYB11_METHOD(void addAttributeMatrix ARGS Name AttributeMatrix)
+  PYB11_METHOD(void addOrReplaceAttributeMatrix ARGS Name AttributeMatrix)
   PYB11_METHOD(AttributeMatrix getAttributeMatrix ARGS Name)
   PYB11_METHOD(AttributeMatrix removeAttributeMatrix ARGS Name)
 
@@ -439,9 +439,9 @@ class SIMPLib_EXPORT IGeometry : public Observable
     virtual void initializeWithZeros() = 0;
 
     /**
-     * @brief addAttributeMatrix
+     * @brief addOrReplaceAttributeMatrix
      */
-    virtual void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) = 0;
+    virtual void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) = 0;
 
     /**
      * @brief getAttributeMatrix
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 3cf0c95cb9..e038d25c68 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -37,6 +37,7 @@
 
 #include <tuple>
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
@@ -61,10 +62,10 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
 
     IGeometryGrid();
     ~IGeometryGrid() override;
-    
-    virtual void setDimensions(size_t dims[3]) = 0;
-    virtual void setDimensions(size_t a, size_t b, size_t c) = 0;
-    virtual void setDimensions(const SIMPL::Tuple3SVec& dims) = 0;
+
+    virtual void setDimensions(const SizeVec3Type& dims) = 0;
+    virtual void setDimensions(SizeVec3Type& dims) = 0;
+    virtual void setDimensions(const SIMPL::Tuple3SVec& dims) = 0; // Needed for Python Interface
 
     virtual SIMPL::Tuple3SVec getDimensions() const = 0;
 
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index af99e4a6c3..40b1364795 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -398,6 +398,8 @@ class FindImageDerivativesImpl
 //
 // -----------------------------------------------------------------------------
 ImageGeom::ImageGeom()
+: m_Spacing(1.0f, 1.0f, 1.0f)
+, m_Origin(0.0f, 0.0f, 0.0f)
 {
   m_GeometryTypeName = SIMPL::Geometry::ImageGeometry;
   m_GeometryType = IGeometry::Type::Image;
@@ -410,12 +412,6 @@ ImageGeom::ImageGeom()
   m_Dimensions[0] = 0;
   m_Dimensions[1] = 0;
   m_Dimensions[2] = 0;
-  m_Resolution[0] = 1.0f;
-  m_Resolution[1] = 1.0f;
-  m_Resolution[2] = 1.0f;
-  m_Origin[0] = 0.0f;
-  m_Origin[1] = 0.0f;
-  m_Origin[2] = 0.0f;
   m_VoxelSizes = FloatArrayType::NullPointer();
   m_ProgressCounter = 0;
 }
@@ -443,15 +439,118 @@ ImageGeom::Pointer ImageGeom::CreateGeometry(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-//void ImageGeom::getBoundingBox(float &xMin, float &xMax, float &yMin, float &yMax, float &zMin, float &zMax)
-//{
-//    xMin = m_Origin[0];
-//    xMax = m_Origin[0] + (m_Dimensions[0] * m_Resolution[0]);
-//    yMin = m_Origin[1];
-//    yMax = m_Origin[1] + (m_Dimensions[1] * m_Resolution[1]);
-//    zMin = m_Origin[2];
-//    zMax = m_Origin[2] + (m_Dimensions[2] * m_Resolution[2]);
-//}
+SIMPL::Tuple3FVec ImageGeom::getSpacing() const
+{
+  return m_Spacing.toTuple();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::getSpacing(FloatVec3Type& spacing) const
+{
+  spacing[0] = m_Spacing[0];
+  spacing[1] = m_Spacing[1];
+  spacing[2] = m_Spacing[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setSpacing(const FloatVec3Type& spacing)
+{
+  m_Spacing = spacing;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setSpacing(FloatVec3Type& spacing)
+{
+  m_Spacing = spacing;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setSpacing(float x, float y, float z)
+{
+  m_Spacing[0] = x;
+  m_Spacing[1] = y;
+  m_Spacing[2] = z;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPL::Tuple3FVec ImageGeom::getOrigin() const
+{
+  return m_Origin.toTuple();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::getOrigin(FloatVec3Type& origin) const
+{
+  origin[0] = m_Origin[0];
+  origin[1] = m_Origin[1];
+  origin[2] = m_Origin[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setOrigin(const FloatVec3Type& origin)
+{
+  m_Origin = origin;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setOrigin(FloatVec3Type& origin)
+{
+  m_Origin = origin;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ImageGeom::setOrigin(float x, float y, float z)
+{
+  m_Origin[0] = x;
+  m_Origin[1] = y;
+  m_Origin[2] = z;
+}
+
+SIMPL::Tuple3SVec ImageGeom::getDimensions() const
+{
+  return m_Dimensions.toTuple();
+}
+void ImageGeom::getDimensions(SizeVec3Type& dims) const
+{
+  dims = m_Dimensions;
+}
+
+void ImageGeom::setDimensions(const SizeVec3Type& dims)
+{
+  m_Dimensions = dims;
+}
+void ImageGeom::setDimensions(SizeVec3Type& dims)
+{
+  m_Dimensions = dims;
+}
+void ImageGeom::setDimensions(const SIMPL::Tuple3SVec& dims)
+{
+  m_Dimensions = dims;
+}
+void ImageGeom::setDimensions(size_t x, size_t y, size_t z)
+{
+  m_Dimensions[0] = x;
+  m_Dimensions[1] = y;
+  m_Dimensions[2] = z;
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -459,11 +558,11 @@ ImageGeom::Pointer ImageGeom::CreateGeometry(const QString& name)
 void ImageGeom::getBoundingBox(float* boundingBox)
 {
     boundingBox[0] = m_Origin[0];
-    boundingBox[1] = m_Origin[0] + (m_Dimensions[0] * m_Resolution[0]);
+    boundingBox[1] = m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]);
     boundingBox[2] = m_Origin[1];
-    boundingBox[3] = m_Origin[1] + (m_Dimensions[1] * m_Resolution[1]);
+    boundingBox[3] = m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]);
     boundingBox[4] = m_Origin[2];
-    boundingBox[5] = m_Origin[2] + (m_Dimensions[2] * m_Resolution[2]);
+    boundingBox[5] = m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -471,13 +570,8 @@ void ImageGeom::getBoundingBox(float* boundingBox)
 // -----------------------------------------------------------------------------
 SIMPL::Tuple6FVec ImageGeom::getBoundingBox()
 {
-  return std::make_tuple(m_Origin[0],
-      m_Origin[0] + (m_Dimensions[0] * m_Resolution[0]),
-      m_Origin[1],
-      m_Origin[1] + (m_Dimensions[1] * m_Resolution[1]),
-      m_Origin[2],
-      m_Origin[2] + (m_Dimensions[2] * m_Resolution[2])
-      );
+  return std::make_tuple(m_Origin[0], m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]), m_Origin[1], m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]), m_Origin[2],
+                         m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]));
 }
 
 // -----------------------------------------------------------------------------
@@ -509,9 +603,9 @@ size_t ImageGeom::getZPoints()
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t idx[3], float coords[3])
 {
-  coords[0] = idx[0] * m_Resolution[0] + m_Origin[0];
-  coords[1] = idx[1] * m_Resolution[1] + m_Origin[1];
-  coords[2] = idx[2] * m_Resolution[2] + m_Origin[2];
+  coords[0] = idx[0] * m_Spacing[0] + m_Origin[0];
+  coords[1] = idx[1] * m_Spacing[1] + m_Origin[1];
+  coords[2] = idx[2] * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -519,9 +613,9 @@ void ImageGeom::getPlaneCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3])
 {
-  coords[0] = x * m_Resolution[0] + m_Origin[0];
-  coords[1] = y * m_Resolution[1] + m_Origin[1];
-  coords[2] = z * m_Resolution[2] + m_Origin[2];
+  coords[0] = x * m_Spacing[0] + m_Origin[0];
+  coords[1] = y * m_Spacing[1] + m_Origin[1];
+  coords[2] = z * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -533,9 +627,9 @@ void ImageGeom::getPlaneCoords(size_t idx, float coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = column * m_Resolution[0] + m_Origin[0];
-  coords[1] = row * m_Resolution[1] + m_Origin[1];
-  coords[2] = plane * m_Resolution[2] + m_Origin[2];
+  coords[0] = column * m_Spacing[0] + m_Origin[0];
+  coords[1] = row * m_Spacing[1] + m_Origin[1];
+  coords[2] = plane * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -543,9 +637,9 @@ void ImageGeom::getPlaneCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
 {
-  coords[0] = static_cast<double>(idx[0] * m_Resolution[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(idx[1] * m_Resolution[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(idx[2] * m_Resolution[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(idx[0] * m_Spacing[0] + m_Origin[0]);
+  coords[1] = static_cast<double>(idx[1] * m_Spacing[1] + m_Origin[1]);
+  coords[2] = static_cast<double>(idx[2] * m_Spacing[2] + m_Origin[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -553,9 +647,9 @@ void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3])
 {
-  coords[0] = static_cast<double>(x * m_Resolution[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(y * m_Resolution[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(z * m_Resolution[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(x * m_Spacing[0] + m_Origin[0]);
+  coords[1] = static_cast<double>(y * m_Spacing[1] + m_Origin[1]);
+  coords[2] = static_cast<double>(z * m_Spacing[2] + m_Origin[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -567,9 +661,9 @@ void ImageGeom::getPlaneCoords(size_t idx, double coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = static_cast<double>(column * m_Resolution[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(row * m_Resolution[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(plane * m_Resolution[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(column * m_Spacing[0] + m_Origin[0]);
+  coords[1] = static_cast<double>(row * m_Spacing[1] + m_Origin[1]);
+  coords[2] = static_cast<double>(plane * m_Spacing[2] + m_Origin[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -577,9 +671,9 @@ void ImageGeom::getPlaneCoords(size_t idx, double coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t idx[3], float coords[3])
 {
-  coords[0] = idx[0] * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]);
-  coords[1] = idx[1] * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]);
-  coords[2] = idx[2] * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]);
+  coords[0] = idx[0] * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]);
+  coords[1] = idx[1] * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]);
+  coords[2] = idx[2] * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -587,9 +681,9 @@ void ImageGeom::getCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t x, size_t y, size_t z, float coords[3])
 {
-  coords[0] = x * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]);
-  coords[1] = y * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]);
-  coords[2] = z * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]);
+  coords[0] = x * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]);
+  coords[1] = y * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]);
+  coords[2] = z * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -601,9 +695,9 @@ void ImageGeom::getCoords(size_t idx, float coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = column * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]);
-  coords[1] = row * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]);
-  coords[2] = plane * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]);
+  coords[0] = column * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]);
+  coords[1] = row * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]);
+  coords[2] = plane * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -611,9 +705,9 @@ void ImageGeom::getCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t idx[3], double coords[3])
 {
-  coords[0] = static_cast<double>(idx[0] * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]));
-  coords[1] = static_cast<double>(idx[1] * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]));
-  coords[2] = static_cast<double>(idx[2] * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]));
+  coords[0] = static_cast<double>(idx[0] * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
+  coords[1] = static_cast<double>(idx[1] * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
+  coords[2] = static_cast<double>(idx[2] * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
 }
 
 // -----------------------------------------------------------------------------
@@ -621,9 +715,9 @@ void ImageGeom::getCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
 {
-  coords[0] = static_cast<double>(x * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]));
-  coords[1] = static_cast<double>(y * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]));
-  coords[2] = static_cast<double>(z * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]));
+  coords[0] = static_cast<double>(x * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
+  coords[1] = static_cast<double>(y * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
+  coords[2] = static_cast<double>(z * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
 }
 
 // -----------------------------------------------------------------------------
@@ -635,9 +729,9 @@ void ImageGeom::getCoords(size_t idx, double coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = static_cast<double>(column * m_Resolution[0] + m_Origin[0] + (0.5f * m_Resolution[0]));
-  coords[1] = static_cast<double>(row * m_Resolution[1] + m_Origin[1] + (0.5f * m_Resolution[1]));
-  coords[2] = static_cast<double>(plane * m_Resolution[2] + m_Origin[2] + (0.5f * m_Resolution[2]));
+  coords[0] = static_cast<double>(column * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
+  coords[1] = static_cast<double>(row * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
+  coords[2] = static_cast<double>(plane * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
 }
 
 // -----------------------------------------------------------------------------
@@ -648,7 +742,7 @@ void ImageGeom::initializeWithZeros()
   for(size_t i = 0; i < 3; i++)
   {
     m_Dimensions[i] = 0;
-    m_Resolution[i] = 1.0f;
+    m_Spacing[i] = 1.0f;
     m_Origin[i] = 0.0f;
   }
 }
@@ -656,7 +750,7 @@ void ImageGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void ImageGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Cell)
   {
@@ -667,10 +761,10 @@ void ImageGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
@@ -777,8 +871,8 @@ void ImageGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int ImageGeom::findElementSizes()
 {
-  float res[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(res[0], res[1], res[2]) = getResolution();
+  FloatVec3Type res = {0.0f, 0.0f, 0.0f};
+  std::tie(res[0], res[1], res[2]) = getSpacing();
 
   if(res[0] <= 0.0f || res[1] <= 0.0f || res[2] <= 0.0f)
   {
@@ -915,9 +1009,9 @@ int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf
 {
   herr_t err = 0;
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  float spacing[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getResolution();
-  float origin[3] = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
+  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
+  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
   std::tie(origin[0], origin[1], origin[2]) = getOrigin();
 
   int32_t rank = 1;
@@ -928,12 +1022,12 @@ int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf
   {
     return err;
   }
-  err = H5Lite::writePointerDataset(parentId, H5_ORIGIN, rank, dims, origin);
+  err = H5Lite::writePointerDataset(parentId, H5_ORIGIN, rank, dims, origin.data());
   if(err < 0)
   {
     return err;
   }
-  err = H5Lite::writePointerDataset(parentId, H5_SPACING, rank, dims, spacing);
+  err = H5Lite::writePointerDataset(parentId, H5_SPACING, rank, dims, spacing.data());
   if(err < 0)
   {
     return err;
@@ -960,9 +1054,9 @@ int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
   herr_t err = 0;
 
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  float spacing[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getResolution();
-  float origin[3] = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
+  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
+  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
   std::tie(origin[0], origin[1], origin[2]) = getOrigin();
 
   out << "  <!-- *************** START OF " << dcName << " *************** -->"
@@ -981,7 +1075,7 @@ int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
       << "\n";
   out << R"(      <DataItem Format="XML" Dimensions="3">)" << origin[2] << " " << origin[1] << " " << origin[0] << "</DataItem>"
       << "\n";
-  out << "      <!-- DxDyDz (Spacing/Resolution) Z, Y, X -->"
+  out << "      <!-- DxDyDz (Spacing/Spacing) Z, Y, X -->"
       << "\n";
   out << R"(      <DataItem Format="XML" Dimensions="3">)" << spacing[2] << " " << spacing[1] << " " << spacing[0] << "</DataItem>"
       << "\n";
@@ -1000,10 +1094,10 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
   QTextStream ss(&info);
 
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  float spacing[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getResolution();
-  std::tie(spacing[0], spacing[1], spacing[2]) = getResolution();
-  float origin[3] = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
+  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
+  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
+  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
   std::tie(origin[0], origin[1], origin[2]) = getOrigin();
 
   float halfRes[3] = {spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f};
@@ -1019,7 +1113,7 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
        << "<p>Z Extent: 0 to " << volDims[2] - 1 << " (dimension: " << volDims[2] << ")</p>"
        << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Origin:</th><td>)" << origin[0] << ", " << origin[1] << ", " << origin[2] << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing/Resolution:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing/Spacing:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
 
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Bounds:</th><td>)"
        << "<p>X Range: " << (origin[0] - halfRes[0]) << " to " << (origin[0] - halfRes[0] + volDims[0] * spacing[0]) << " (delta: " << (volDims[0] * spacing[0]) << ")</p>"
@@ -1041,11 +1135,11 @@ int ImageGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   int err = 0;
   size_t volDims[3] = {0, 0, 0};
-  float spacing[3] = {1.0f, 1.0f, 1.0f};
-  float origin[3] = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type spacing = {1.0f, 1.0f, 1.0f};
+  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
   unsigned int spatialDims = 0;
   QString geomName = "";
-  err = gatherMetaData(parentId, volDims, spacing, origin, spatialDims, geomName, preflight);
+  err = gatherMetaData(parentId, volDims, spacing.data(), origin.data(), spatialDims, geomName, preflight);
   if(err < 0)
   {
     return err;
@@ -1065,10 +1159,10 @@ IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate)
   std::tuple<float, float, float> spacing = std::make_tuple(1.0f, 1.0f, 1.0f);
   std::tuple<float, float, float> origin = std::make_tuple(0.0f, 0.0f, 0.0f);
   volDims = getDimensions();
-  spacing = getResolution();
+  spacing = getSpacing();
   origin = getOrigin();
   imageCopy->setDimensions(volDims);
-  imageCopy->setResolution(spacing);
+  imageCopy->setSpacing(spacing);
   imageCopy->setOrigin(origin);
   FloatArrayType::Pointer elementSizes = std::dynamic_pointer_cast<FloatArrayType>((getElementSizes().get() == nullptr) ? nullptr : getElementSizes()->deepCopy(forceNoAllocate));
   imageCopy->setElementSizes(elementSizes);
@@ -1104,7 +1198,7 @@ int ImageGeom::gatherMetaData(hid_t parentId, size_t volDims[3], float spacing[3
     return -1;
   }
   setDimensions(volDims);
-  setResolution(spacing);
+  setSpacing(spacing);
   setOrigin(origin);
   setElementSizes(voxelSizes);
 
@@ -1123,11 +1217,11 @@ ImageGeom::ErrorType ImageGeom::computeCellIndex(float coords[3], size_t index[3
     {
       return static_cast<ImageGeom::ErrorType>(i * 2);
     }
-    if(coords[i] > (m_Origin[i] + m_Dimensions[i] * m_Resolution[i]))
+    if(coords[i] > (m_Origin[i] + m_Dimensions[i] * m_Spacing[i]))
     {
       return static_cast<ImageGeom::ErrorType>(i * 2 + 1);
     }
-    index[i] = static_cast<size_t>((coords[i] - m_Origin[i]) / m_Resolution[i]);
+    index[i] = static_cast<size_t>((coords[i] - m_Origin[i]) / m_Spacing[i]);
     if(index[i] > m_Dimensions[i])
     {
       return static_cast<ImageGeom::ErrorType>(i * 2 + 1);
@@ -1149,7 +1243,7 @@ ImageGeom::ErrorType ImageGeom::computeCellIndex(float coords[3], size_t& index)
     {
       return static_cast<ImageGeom::ErrorType>(i * 2);
     }
-    cell[i] = static_cast<size_t>((coords[i] - m_Origin[i]) / m_Resolution[i]);
+    cell[i] = static_cast<size_t>((coords[i] - m_Origin[i]) / m_Spacing[i]);
     if(cell[i] > m_Dimensions[i])
     {
       return static_cast<ImageGeom::ErrorType>(i * 2 + 1);
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index eec804842b..4430279ea3 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -35,6 +35,7 @@
 
 #pragma once
 
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometryGrid.h"
 
@@ -53,19 +54,19 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
 
   PYB11_CREATE_BINDINGS(ImageGeom SUPERCLASS IGeometryGrid)
   PYB11_STATIC_CREATION(CreateGeometry ARGS QString)
-  
+
   PYB11_ENUMERATION(ErrorType)
 
   PYB11_METHOD(void setDimensions OVERLOAD size_t,x size_t,y size_t,z)
-  PYB11_METHOD(SIMPL::Tuple3SVec getDimensions)
+  PYB11_METHOD(SIMPL::Tuple3SVec getDimensions OVERLOAD CONST_METHOD)
 
-  PYB11_METHOD(void setResolution OVERLOAD float,x float,y float,z)
-  PYB11_METHOD(SIMPL::Tuple3FVec getResolution OVERLOAD CONST_METHOD)
+  PYB11_METHOD(void setSpacing OVERLOAD float,x float,y float,z)
+  PYB11_METHOD(SIMPL::Tuple3FVec getSpacing OVERLOAD CONST_METHOD)
 
   PYB11_METHOD(size_t getXPoints)
   PYB11_METHOD(size_t getYPoints)
   PYB11_METHOD(size_t getZPoints)
-  
+
   PYB11_METHOD(void setOrigin OVERLOAD float,x float,y float,z)
   PYB11_METHOD(SIMPL::Tuple3FVec getOrigin OVERLOAD CONST_METHOD)
 
@@ -100,14 +101,24 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   static Pointer CreateGeometry(const QString& name);
 
   /**
-   * @brief Sets/Gets the Resolution property
+   * @brief Sets/Gets the Spacing property
    */
-  SIMPL_INSTANCE_VEC3_PROPERTY(float, Resolution)
+  // SIMPL_INSTANCE_VEC3_PROPERTY(float, Spacing)
+  SIMPL::Tuple3FVec getSpacing() const;
+  void getSpacing(FloatVec3Type& spacing) const;
+  void setSpacing(const FloatVec3Type& spacing);
+  void setSpacing(FloatVec3Type& spacing);
+  void setSpacing(float x, float y, float z);
 
   /**
    * @brief Sets/Gets the Origin property
    */
-  SIMPL_INSTANCE_VEC3_PROPERTY(float, Origin)
+  // SIMPL_INSTANCE_VEC3_PROPERTY(float, Origin)
+  SIMPL::Tuple3FVec getOrigin() const;
+  void getOrigin(FloatVec3Type& origin) const;
+  void setOrigin(const FloatVec3Type& origin);
+  void setOrigin(FloatVec3Type& origin);
+  void setOrigin(float x, float y, float z);
 
   /**
    * @brief getBoundingBox
@@ -265,15 +276,20 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
   /**
-   * @brief addAttributeMatrix
+   * @brief addOrReplaceAttributeMatrix
    */
-  void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometryGrid
   // -----------------------------------------------------------------------------
+  SIMPL::Tuple3SVec getDimensions() const override;
+  void getDimensions(SizeVec3Type& dims) const;
 
-  SIMPL_INSTANCE_VEC3_PROPERTY_VO(size_t, Dimensions)
+  void setDimensions(const SizeVec3Type& dims) override;
+  void setDimensions(SizeVec3Type& dims) override;
+  void setDimensions(const SIMPL::Tuple3SVec& dims) override;
+  void setDimensions(size_t x, size_t y, size_t z);
 
   size_t getXPoints() override;
   size_t getYPoints() override;
@@ -389,6 +405,10 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
 private:
   FloatArrayType::Pointer m_VoxelSizes;
 
+  FloatVec3Type m_Spacing;
+  FloatVec3Type m_Origin;
+  SizeVec3Type m_Dimensions;
+
   friend class FindImageDerivativesImpl;
 
 public:
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index e3097bd63b..f224819b84 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -205,7 +205,7 @@ void QuadGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QuadGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void QuadGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge || data->getType() != AttributeMatrix::Type::Face)
   {
@@ -224,10 +224,10 @@ void QuadGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index f2f3fd9d6a..b020262c7a 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -322,9 +322,9 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
   /**
-   * @brief addAttributeMatrix
+   * @brief addOrReplaceAttributeMatrix
    */
-  void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry2D
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 72aa3e731c..be5825f2d2 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -440,7 +440,47 @@ RectGridGeom::Pointer RectGridGeom::CreateGeometry(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::setXBounds(FloatArrayType::Pointer xBnds)
+SIMPL::Tuple3SVec RectGridGeom::getDimensions() const
+{
+  return m_Dimensions.toTuple();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RectGridGeom::getDimensions(SizeVec3Type& dims) const
+{
+  dims = m_Dimensions;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RectGridGeom::setDimensions(const SizeVec3Type& dims)
+{
+  m_Dimensions = dims;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RectGridGeom::setDimensions(SizeVec3Type& dims)
+{
+  m_Dimensions = dims;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RectGridGeom::setDimensions(const SIMPL::Tuple3SVec& dims)
+{
+  m_Dimensions = dims;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RectGridGeom::setXBounds(const FloatArrayType::Pointer& xBnds)
 {
   if(xBnds.get() != nullptr)
   {
@@ -455,7 +495,7 @@ void RectGridGeom::setXBounds(FloatArrayType::Pointer xBnds)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::setYBounds(FloatArrayType::Pointer yBnds)
+void RectGridGeom::setYBounds(const FloatArrayType::Pointer& yBnds)
 {
   if(yBnds.get() != nullptr)
   {
@@ -470,7 +510,7 @@ void RectGridGeom::setYBounds(FloatArrayType::Pointer yBnds)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::setZBounds(FloatArrayType::Pointer zBnds)
+void RectGridGeom::setZBounds(const FloatArrayType::Pointer& zBnds)
 {
   if(zBnds.get() != nullptr)
   {
@@ -482,6 +522,46 @@ void RectGridGeom::setZBounds(FloatArrayType::Pointer zBnds)
   m_zBounds = zBnds;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer RectGridGeom::getXBounds() const
+{
+  return m_xBounds;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer RectGridGeom::getYBounds() const
+{
+  return m_yBounds;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer RectGridGeom::getZBounds() const
+{
+  return m_zBounds;
+}
+
+// -----------------------------------------------------------------------------
+size_t RectGridGeom::getXPoints()
+{
+  return m_Dimensions[0];
+}
+// -----------------------------------------------------------------------------
+size_t RectGridGeom::getYPoints()
+{
+  return m_Dimensions[1];
+}
+// -----------------------------------------------------------------------------
+size_t RectGridGeom::getZPoints()
+{
+  return m_Dimensions[2];
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -683,7 +763,7 @@ void RectGridGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void RectGridGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Cell)
   {
@@ -694,10 +774,10 @@ void RectGridGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Poin
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
@@ -1064,7 +1144,7 @@ QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format)
     ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
     ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Dimensions:</th><td>" << volDims[0] << " x " << volDims[1] << " x " << volDims[2] << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Resolution:</th><td>"
+    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Spacing:</th><td>"
        << "Variable"
        << "</td></tr>";
   }
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index a323b9d9c4..5b7eb14f5c 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -56,18 +56,18 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @return
      */
     static Pointer CreateGeometry(const QString& name);
-    
-    void setXBounds(FloatArrayType::Pointer xBounds);
-    void setYBounds(FloatArrayType::Pointer yBounds);
-    void setZBounds(FloatArrayType::Pointer zBounds);
 
-    inline FloatArrayType::Pointer getXBounds() { return m_xBounds; }
-    inline FloatArrayType::Pointer getYBounds() { return m_yBounds; }
-    inline FloatArrayType::Pointer getZBounds() { return m_zBounds; }
+    void setXBounds(const FloatArrayType::Pointer& xBounds);
+    void setYBounds(const FloatArrayType::Pointer& yBounds);
+    void setZBounds(const FloatArrayType::Pointer& zBounds);
 
-// -----------------------------------------------------------------------------
-// Inherited from IGeometry
-// -----------------------------------------------------------------------------
+    FloatArrayType::Pointer getXBounds() const;
+    FloatArrayType::Pointer getYBounds() const;
+    FloatArrayType::Pointer getZBounds() const;
+
+    // -----------------------------------------------------------------------------
+    // Inherited from IGeometry
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief initializeWithZeros
@@ -207,20 +207,23 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
     IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
     /**
-     * @brief addAttributeMatrix
+     * @brief addOrReplaceAttributeMatrix
      */
-    void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
     
 // -----------------------------------------------------------------------------
 // Inherited from IGeometryGrid
 // -----------------------------------------------------------------------------
+    SIMPL::Tuple3SVec getDimensions() const override;
+    void getDimensions(SizeVec3Type& dims) const;
 
-    SIMPL_INSTANCE_VEC3_PROPERTY_VO(size_t, Dimensions)
+    void setDimensions(const SizeVec3Type& dims) override;
+    void setDimensions(SizeVec3Type& dims) override;
+    void setDimensions(const SIMPL::Tuple3SVec& dims) override;
 
-    
-    size_t getXPoints() override { return m_Dimensions[0]; }
-    size_t getYPoints() override { return m_Dimensions[1]; }
-    size_t getZPoints() override { return m_Dimensions[2]; }
+    size_t getXPoints() override;
+    size_t getYPoints() override;
+    size_t getZPoints() override;
 
     void getPlaneCoords(size_t idx[3], float coords[3]) override;
     void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) override;
@@ -279,6 +282,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
     FloatArrayType::Pointer m_yBounds;
     FloatArrayType::Pointer m_zBounds;
     FloatArrayType::Pointer m_VoxelSizes;
+    SizeVec3Type m_Dimensions;
 
     friend class FindRectGridDerivativesImpl;
 
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index 740077844e..a4d18b8b3e 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -49,7 +49,7 @@ SharedEdgeList::Pointer GEOM_CLASS_NAME::CreateSharedEdgeList(int64_t numEdges,
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeEdgeList(int64_t newNumEdges)
 {
-  m_EdgeList->resize(newNumEdges);
+  m_EdgeList->resizeTuples(newNumEdges);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/SharedHexOps.cpp b/Source/SIMPLib/Geometry/SharedHexOps.cpp
index 7ac11aedcf..bb103f97c2 100644
--- a/Source/SIMPLib/Geometry/SharedHexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedHexOps.cpp
@@ -14,7 +14,7 @@ SharedHexList::Pointer GEOM_CLASS_NAME::CreateSharedHexList(int64_t numHexas, bo
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeHexList(int64_t newNumHexas)
 {
-  m_HexList->resize(newNumHexas);
+  m_HexList->resizeTuples(newNumHexas);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index 6413ec690a..6cea373bad 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -49,7 +49,7 @@ SharedQuadList::Pointer GEOM_CLASS_NAME::CreateSharedQuadList(int64_t numQuads,
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeQuadList(int64_t newNumQuads)
 {
-  m_QuadList->resize(newNumQuads);
+  m_QuadList->resizeTuples(newNumQuads);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index 649bd099cb..298f77fd31 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -49,7 +49,7 @@ SharedTetList::Pointer GEOM_CLASS_NAME::CreateSharedTetList(int64_t numTets, boo
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeTetList(int64_t newNumTets)
 {
-  m_TetList->resize(newNumTets);
+  m_TetList->resizeTuples(newNumTets);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index fac7ef6506..e7da99830a 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -49,7 +49,7 @@ SharedTriList::Pointer GEOM_CLASS_NAME::CreateSharedTriList(int64_t numTris, boo
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeTriList(int64_t newNumTris)
 {
-  m_TriList->resize(newNumTris);
+  m_TriList->resizeTuples(newNumTris);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index 83580756c1..a5b2aad299 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -49,7 +49,7 @@ SharedVertexList::Pointer GEOM_CLASS_NAME::CreateSharedVertexList(int64_t numVer
 // -----------------------------------------------------------------------------
 void GEOM_CLASS_NAME::resizeVertexList(int64_t newNumVertices)
 {
-  m_VertexList->resize(newNumVertices);
+  m_VertexList->resizeTuples(newNumVertices);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp b/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
index cff2dbe087..b90200a3df 100644
--- a/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
+++ b/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
@@ -34,13 +34,13 @@ class ImageGeomTest
   void TestIndexCalculation()
   {
     ImageGeom::Pointer geom = ImageGeom::CreateGeometry("Test Geometry");
-    size_t dims[3] = {10, 20, 30};
-    float res[3] = {0.4f, 2.3f, 5.0f};
-    float origin[3] = {-1.0f, 6.0f, 10.0f};
+    SizeVec3Type dims(10, 20, 30);
+    FloatVec3Type res = {0.4f, 2.3f, 5.0f};
+    FloatVec3Type origin = {-1.0f, 6.0f, 10.0f};
 
     geom->setDimensions(dims);
     geom->setOrigin(origin);
-    geom->getResolution(res);
+    geom->getSpacing(res);
 
     float coords[3] = {3.5f, 9.23f, 12.78f};
     size_t indices[3] = {0, 0, 0};
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 431e95e2cd..7bcaac144a 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -206,7 +206,7 @@ void TetrahedralGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TetrahedralGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex
      || data->getType() != AttributeMatrix::Type::Edge
@@ -231,10 +231,10 @@ void TetrahedralGeom::addAttributeMatrix(const QString& name, AttributeMatrix::P
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 4d2d72abea..43e0f72cc3 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -363,9 +363,9 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
     IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
     /**
-     * @brief addAttributeMatrix
+     * @brief addOrReplaceAttributeMatrix
      */
-    void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
 // -----------------------------------------------------------------------------
 // Inherited from IGeometry3D
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 4fc6591192..6a7a1100c4 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -204,7 +204,7 @@ void TriangleGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TriangleGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void TriangleGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge || data->getType() != AttributeMatrix::Type::Face)
   {
@@ -223,10 +223,10 @@ void TriangleGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Poin
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 9bd26a4850..eec4095b86 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -316,9 +316,9 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
   /**
-   * @brief addAttributeMatrix
+   * @brief addOrReplaceAttributeMatrix
    */
-  void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry2D
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 5422cb09f8..f0514680ab 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -115,7 +115,7 @@ void VertexGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void VertexGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
+void VertexGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex)
   {
@@ -126,10 +126,10 @@ void VertexGeom::addAttributeMatrix(const QString& name, AttributeMatrix::Pointe
   {
     return;
   }
-  if(data->getName().compare(name) != 0)
-  {
-    data->setName(name);
-  }
+  //if(data->getName().compare(name) != 0)
+  //{
+  //  data->setName(name);
+  //}
   m_AttributeMatrices[name] = data;
 }
 
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 020aec2524..c8f149bc2d 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -284,9 +284,9 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
   IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
 
   /**
-   * @brief addAttributeMatrix
+   * @brief addOrReplaceAttributeMatrix
    */
-  void addAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
 
 protected:
   VertexGeom();
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
index 9f4144c11b..e62337a2b7 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
@@ -41,7 +41,7 @@ class itkDream3DITransformContainerToTransformTest
 
 public:
   itkDream3DITransformContainerToTransformTest() = default;
-  virtual ~itkDream3DITransformContainerToTransformTest() = default;
+  ~itkDream3DITransformContainerToTransformTest() = default;
 
   int TestitkDream3DITransformContainerToTransformTest()
   {
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
index 1084ccf111..06bd2ac930 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
@@ -40,7 +40,7 @@ class itkDream3DTransformContainerToTransformTest
 
 public:
   itkDream3DTransformContainerToTransformTest() = default;
-  virtual ~itkDream3DTransformContainerToTransformTest() = default;
+  ~itkDream3DTransformContainerToTransformTest() = default;
 
   int TestitkDream3DTransformContainerToTransformTest()
   {
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 42ed025305..02ebb9a580 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -108,7 +108,7 @@ template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkIm
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    float sampleOrigin[3] = {0.0f, 0.0f, 0.0f};
+    FloatVec3Type sampleOrigin(0.0f, 0.0f, 0.0f);
     m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
@@ -116,8 +116,8 @@ template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkIm
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    float voxelResolution[3] = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getResolution(voxelResolution);
+    FloatVec3Type voxelResolution(0.0f, 0.0f, 0.0f);
+    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -188,7 +188,7 @@ class ItkBridge2
       importFilter->getGeometryAs<ImageGeom>()->setOrigin( origin );
 
       float voxelResolution[3] = {0.0f, 0.0f, 0.0f};
-      m->getGeometryAs<ImageGeom>()->getResolution(voxelResolution);
+      m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
       double spacing[ ImageProcessingConstants::ImageDimension ];
       spacing[0] = voxelResolution[0];    // along X direction
       spacing[1] = voxelResolution[1];    // along Y direction
@@ -212,19 +212,15 @@ class ItkBridge2
 template <typename ComponentType> class CreateItkWrapperForDataPointer
 {
 public:
-  CreateItkWrapperForDataPointer()
-  {
-  }
-  virtual ~CreateItkWrapperForDataPointer()
-  {
-  }
+  CreateItkWrapperForDataPointer() = default;
+  virtual ~CreateItkWrapperForDataPointer() = default;
 
-  typedef typename itk::Image<ComponentType, ImageProcessingConstants::ImageDimension> ScalarImageType; // 3D Scalar Image
-  typedef typename ScalarImageType::Pointer ScalarImagePointerType;
-  typedef itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension> ImportImageFilterType;
-  typedef typename ImportImageFilterType::Pointer ImportImageFilterPointerType;
+  using ScalarImageType = typename itk::Image<ComponentType, ImageProcessingConstants::ImageDimension>; // 3D Scalar Image
+  using ScalarImagePointerType = typename ScalarImageType::Pointer;
+  using ImportImageFilterType = itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension>;
+  using ImportImageFilterPointerType = typename ImportImageFilterType::Pointer;
 
-  ScalarImagePointerType operator()(DataContainer::Pointer m, QString attrMatName, ComponentType* data)
+  ScalarImagePointerType operator()(DataContainer::Pointer m, const QString& attrMatName, ComponentType* data)
   {
     AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
@@ -233,7 +229,7 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
-    typedef itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension> ImportImageFilterType;
+    using ImportImageFilterType = itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension>;
     typename ImportImageFilterType::Pointer importFilter = ImportImageFilterType::New();
 
     typename ImportImageFilterType::SizeType size;
@@ -257,7 +253,7 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    float sampleOrigin[3] = {0.0f, 0.0f, 0.0f};
+    FloatVec3Type sampleOrigin = {0.0f, 0.0f, 0.0f};
     m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
@@ -265,8 +261,8 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    float voxelResolution[3] = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getResolution(voxelResolution);
+    FloatVec3Type voxelResolution = {0.0f, 0.0f, 0.0f};
+    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -284,9 +280,11 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     return image;
   }
 
-private:
+public:
   CreateItkWrapperForDataPointer(const CreateItkWrapperForDataPointer&) = delete; // Copy Constructor Not Implemented
-  void operator=(const CreateItkWrapperForDataPointer&) = delete;                 // Move assignment Not Implemented
+  CreateItkWrapperForDataPointer(CreateItkWrapperForDataPointer&&) = delete;      // Move Constructor Not Implemented
+  CreateItkWrapperForDataPointer& operator=(const CreateItkWrapperForDataPointer&) = delete; // Copy Assignment Not Implemented
+  CreateItkWrapperForDataPointer& operator=(CreateItkWrapperForDataPointer&&) = delete;      // Move Assignment Not Implemented
 };
 
 /*
@@ -302,24 +300,21 @@ template <typename ComponentType> class ItkBridge
   SIMPL_SHARED_POINTERS(ItkBridge<ComponentType>)
   SIMPL_TYPE_MACRO(ItkBridge<ComponentType>)
 
-  virtual ~ItkBridge()
-  {
-  }
-
+  virtual ~ItkBridge() = default;
   //*! Define all the Typedefs for this class
-  typedef DataArray<ComponentType> DataArrayType;
-  typedef typename DataArrayType::Pointer DataArrayPointerType;
+  using DataArrayType = DataArray<ComponentType>;
+  using DataArrayPointerType = typename DataArrayType::Pointer;
 
-  typedef typename itk::Image<ComponentType, ImageProcessingConstants::ImageDimension> ScalarImageType;               // 3D Scalar Image
-  typedef typename itk::Image<itk::RGBPixel<ComponentType>, ImageProcessingConstants::ImageDimension> RGBImageType;   // 3D RGB Image
-  typedef typename itk::Image<itk::RGBAPixel<ComponentType>, ImageProcessingConstants::ImageDimension> RGBAImageType; // 3D RGBA Image
+  using ScalarImageType = typename itk::Image<ComponentType, ImageProcessingConstants::ImageDimension>;               // 3D Scalar Image
+  using RGBImageType = typename itk::Image<itk::RGBPixel<ComponentType>, ImageProcessingConstants::ImageDimension>;   // 3D RGB Image
+  using RGBAImageType = typename itk::Image<itk::RGBAPixel<ComponentType>, ImageProcessingConstants::ImageDimension>; // 3D RGBA Image
 
-  typedef typename itk::Image<ComponentType, ImageProcessingConstants::SliceDimension> ScalarSliceImageType;               // 2D Scalar Image
-  typedef typename itk::Image<itk::RGBPixel<ComponentType>, ImageProcessingConstants::SliceDimension> RGBSliceImageType;   // 2D RGB Image
-  typedef typename itk::Image<itk::RGBAPixel<ComponentType>, ImageProcessingConstants::SliceDimension> RGBASliceImageType; // 2D RGBA Image
+  using ScalarSliceImageType = typename itk::Image<ComponentType, ImageProcessingConstants::SliceDimension>;               // 2D Scalar Image
+  using RGBSliceImageType = typename itk::Image<itk::RGBPixel<ComponentType>, ImageProcessingConstants::SliceDimension>;   // 2D RGB Image
+  using RGBASliceImageType = typename itk::Image<itk::RGBAPixel<ComponentType>, ImageProcessingConstants::SliceDimension>; // 2D RGBA Image
 
-  typedef itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension> ImportImageFilterType;
-  typedef typename ImportImageFilterType::Pointer ImportImageFilterPointerType;
+  using ImportImageFilterType = itk::ImportImageFilter<ComponentType, ImageProcessingConstants::ImageDimension>;
+  using ImportImageFilterPointerType = typename ImportImageFilterType::Pointer;
 
   /**
    * @brief Dream3DtoITKImportFilter Grayscale conversion / copying & conversion from dream3d arrays to importfilter
@@ -338,7 +333,7 @@ template <typename ComponentType> class ItkBridge
     size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
-    typedef itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension> ImportImageFilterType;
+    using ImportImageFilterType = itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>;
     typename ImportImageFilterType::Pointer importFilter = ImportImageFilterType::New();
 
     typename ImportImageFilterType::SizeType size;
@@ -362,7 +357,7 @@ template <typename ComponentType> class ItkBridge
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    float sampleOrigin[3] = {0.0f, 0.0f, 0.0f};
+    FloatVec3Type sampleOrigin = {0.0f, 0.0f, 0.0f};
     m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
@@ -370,8 +365,8 @@ template <typename ComponentType> class ItkBridge
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    float voxelResolution[3] = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getResolution(voxelResolution);
+    FloatVec3Type voxelResolution = {0.0f, 0.0f, 0.0f};
+    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -395,7 +390,7 @@ template <typename ComponentType> class ItkBridge
     //      size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
-    typedef itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension> ImportImageFilterType;
+    using ImportImageFilterType = itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>;
     typename ImportImageFilterType::Pointer importFilter = ImportImageFilterType::New();
 
     typename ImportImageFilterType::SizeType size;
@@ -428,7 +423,7 @@ template <typename ComponentType> class ItkBridge
     importFilter->SetOrigin(origin);
 
     //      float voxelResolution[3] = {0.0f, 0.0f, 0.0f};
-    //      m->getResolution(voxelResolution);
+    //      m->getSpacing(voxelResolution);
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -512,7 +507,7 @@ template <typename ComponentType> class ItkBridge
    */
   static typename ScalarSliceImageType::Pointer ExtractSlice(typename ScalarImageType::Pointer image, int sliceType, int sliceNum)
   {
-    typedef typename itk::ExtractImageFilter<ScalarImageType, ScalarSliceImageType> SliceExtractFilter;
+    using SliceExtractFilter = typename itk::ExtractImageFilter<ScalarImageType, ScalarSliceImageType>;
     typename SliceExtractFilter::Pointer extractSlice = SliceExtractFilter::New();
     typename ScalarImageType::RegionType inputRegion = image->GetLargestPossibleRegion();
     typename ScalarImageType::SizeType size = inputRegion.GetSize();
@@ -566,13 +561,13 @@ template <typename ComponentType> class ItkBridge
   }
 
 protected:
-  ItkBridge()
-  {
-  }
+  ItkBridge() = default;
 
-private:
-  ItkBridge(const ItkBridge&) = delete;      // Copy Constructor Not Implemented
-  void operator=(const ItkBridge&) = delete; // Move assignment Not Implemented
+public:
+  ItkBridge(const ItkBridge&) = delete;            // Copy Constructor Not Implemented
+  ItkBridge(ItkBridge&&) = delete;                 // Move Constructor Not Implemented
+  ItkBridge& operator=(const ItkBridge&) = delete; // Copy Assignment Not Implemented
+  ItkBridge& operator=(ItkBridge&&) = delete;      // Move Assignment Not Implemented
 };
 
 //// Create some typedefs for our convenience
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 8e6df1a192..97a728ffe1 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -256,9 +256,9 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   const typename ImageType::PointType origin = reader->GetOutput()->GetOrigin();
   const typename ImageType::SizeType size = reader->GetOutput()->GetLargestPossibleRegion().GetSize();
   const typename ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing();
-  QVector<float> torigin(3, 0);
-  QVector<float> tspacing(3, 0);
-  QVector<size_t> tDims(3, 1);
+  FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
+  SizeVec3Type tDims = {0, 0, 0};
   // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   for(size_t i = 0; i < dimensions; i++)
   {
@@ -267,13 +267,14 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
     tDims[i] = size[i];
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-  image->setDimensions(tDims[0], tDims[1], tDims[2]);
-  image->setOrigin(torigin[0], torigin[1], torigin[2]);
-  image->setResolution(tspacing[0], tspacing[1], tspacing[2]);
+  image->setDimensions(tDims);
+  image->setOrigin(torigin);
+  image->setSpacing(tspacing);
   container->setGeometry(image);
 
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
-  AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
+  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
+  AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCondition() < 0)
   {
     return;
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 8471df7942..c8eb1e8345 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -66,9 +66,7 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
 
 
 template< typename PixelType, unsigned int VDimension>
-void
-InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::GenerateOutputInformation()
+void InPlaceDream3DDataToImageFilter< PixelType, VDimension >::GenerateOutputInformation()
 {
   // call the superclass' implementation of this method
   Superclass::GenerateOutputInformation();
@@ -82,13 +80,13 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
     itkExceptionMacro("Error casting geometry!!!");
   }
   // Get data container properties
-  QVector<float> torigin(3, 0);
+  FloatVec3Type torigin;
   // Setting spacing to 0 means dimension is not used. Used to know if
   // image is 2D or 3D. Setting dimensions to 0 leads to crashes
-  QVector<float> tspacing(3, 0);
-  QVector<size_t> tDims(3, 1);
-  imageGeom->getOrigin(torigin[0], torigin[1], torigin[2]);
-  imageGeom->getResolution(tspacing[0], tspacing[1], tspacing[2]);
+  FloatVec3Type tspacing;
+  SizeVec3Type tDims;
+  imageGeom->getOrigin(torigin);
+  imageGeom->getSpacing(tspacing);
   std::tie(tDims[0], tDims[1], tDims[2]) = imageGeom->getDimensions();
   typename ImageType::PointType origin;
   typename ImageType::SizeType size;
@@ -114,9 +112,7 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
 
 
 template< typename PixelType, unsigned int VDimension>
-void
-InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::GenerateData()
+void InPlaceDream3DDataToImageFilter< PixelType, VDimension >::GenerateData()
 {
   // Get data pointer
   AttributeMatrix::Pointer ma = m_DataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index 0c3a09ec57..f4db2447ea 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -54,11 +54,11 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
   InPlaceImageToDream3DDataFilter();
   virtual ~InPlaceImageToDream3DDataFilter();
 
-  virtual void VerifyPreconditions() override;
+  virtual void VerifyPreconditions();
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
 
-  virtual void GenerateData() override;
-  virtual void GenerateOutputInformation() override;
+  void GenerateData() override;
+  void GenerateOutputInformation() override;
 
   void CheckValidArrayPathComponentName(std::string var);
 
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index c48ae76c9c..054dbda775 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -104,9 +104,9 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 	  tspacing[i] = spacing[i];
 	  tDims[i] = size[i];
   }
-  imageGeom->setOrigin(torigin[0], torigin[1], torigin[2]);
-  imageGeom->setResolution(tspacing[0], tspacing[1], tspacing[2]);
-  imageGeom->setDimensions(tDims[0], tDims[1], tDims[2]);
+  imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
+  imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
+  imageGeom->setDimensions(SizeVec3Type(tDims[0], tDims[1], tDims[2]));
   dataContainer->setGeometry(imageGeom);
 }
 
@@ -177,7 +177,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
       ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
     }
   }
-  attrMat->addAttributeArray(m_DataArrayName.c_str(), data);
+  attrMat->insertOrAssign(data);
   outputPtr->Set(dataContainer);
 }
 
diff --git a/Source/SIMPLib/ITK/itkReadImageImpl.hpp b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
index 530e95eb67..e0dba0d9cc 100644
--- a/Source/SIMPLib/ITK/itkReadImageImpl.hpp
+++ b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
@@ -150,7 +150,7 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
       filter->setErrorCondition(-2);
       QString message = QObject::tr("Unable to read image '%1'").arg(inputFile);
       filter->notifyErrorMessage(filter->getHumanLabel(), message, filter->getErrorCondition());
-      outputIDataArray->resize(0);
+      outputIDataArray->resizeTuples(0);
     }
 
     try
diff --git a/Source/SIMPLib/Math/QuaternionMath.hpp b/Source/SIMPLib/Math/QuaternionMath.hpp
index a6065e0633..8dc255c7b5 100755
--- a/Source/SIMPLib/Math/QuaternionMath.hpp
+++ b/Source/SIMPLib/Math/QuaternionMath.hpp
@@ -35,7 +35,8 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cassert>
+#include <cstdlib>
 
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Math/MatrixMath.h"
@@ -60,16 +61,54 @@ template<typename T>
 class QuaternionMath
 {
   public:
+    using size_type = size_t;
+    using value_type = T;
+    using reference = T&;
+
     /**
     * @brief
     */
-    typedef struct
+    using Quaternion = struct
     {
       T x;
       T y;
       T z;
       T w;
-    } Quaternion;
+
+      inline reference operator[](size_type index)
+      {
+        switch(index)
+        {
+        case 0:
+          return x;
+        case 1:
+          return y;
+        case 2:
+          return z;
+        case 3:
+          return w;
+        default:
+          throw std::range_error("Invalid Quaternion index");
+        }
+      }
+
+      inline const T& operator[](size_type index) const
+      {
+        switch(index)
+        {
+        case 0:
+          return x;
+        case 1:
+          return y;
+        case 2:
+          return z;
+        case 3:
+          return w;
+        default:
+          throw std::range_error("Invalid Quaternion index");
+        }
+      }
+    };
 
     enum Order
     {
@@ -465,23 +504,19 @@ class QuaternionMath
 /**
  * @brief QuaternionMathF Typedef for 32 bit floats for convenience
  */
-typedef QuaternionMath<float> QuaternionMathF;
+using QuaternionMathF = QuaternionMath<float>;
 
 /**
  * @brief QuaternionMathD Typedef for 64 bit floats for convenience
  */
-typedef QuaternionMath<double> QuaternionMathD;
+using QuaternionMathD = QuaternionMath<double>;
 
 /**
  * @brief QuatF 32 Bit Floating point Quaternion for convenience.
  */
-typedef QuaternionMath<float>::Quaternion QuatF;
+using QuatF = QuaternionMath<float>::Quaternion;
 
 /**
  * @brief QuatD 64 Bit Floating point Quaternion for convenience.
  */
-typedef QuaternionMath<double>::Quaternion QuatD;
-
-
-
-
+using QuatD = QuaternionMath<double>::Quaternion;
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index d567d61718..39384971d6 100755
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -564,7 +564,7 @@ class RESTUnitTest
     FilterPipeline::Pointer pipeline = FilterPipeline::New();
 
     CreateDataContainer::Pointer createDataContainer = CreateDataContainer::New();
-    createDataContainer->setDataContainerName("DataContainer");
+    createDataContainer->setDataContainerName(DataArrayPath("DataContainer", "", ""));
     pipeline->pushBack(createDataContainer);
 
     CreateAttributeMatrix::Pointer createAttrMat = CreateAttributeMatrix::New();
@@ -977,7 +977,7 @@ class RESTUnitTest
       QJsonArray responseFPArray = responseObject[SIMPL::JSON::FilterParameters].toArray();
 
       CreateAttributeMatrix::Pointer filter = CreateAttributeMatrix::New();
-      QVector<FilterParameter::Pointer> parameters = filter->getFilterParameters();
+      FilterParameterVectorType parameters = filter->getFilterParameters();
 
       DREAM3D_REQUIRE_EQUAL(responseFPArray.size(), parameters.size());
 
diff --git a/Source/SIMPLib/REST/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/REST/Testing/Cxx/SourceList.cmake
index 5ea743814c..d19151bd69 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/REST/Testing/Cxx/SourceList.cmake
@@ -6,4 +6,4 @@ set(TEST_${SUBDIR_NAME}_NAMES
 )
 
 SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
-SIMPL_ADD_UNIT_TEST_MOC_FILE(RESTUnitTest "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
\ No newline at end of file
+SIMPL_ADD_UNIT_TEST_MOC_FILE(RESTUnitTest "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index ee2841aa95..286841b12f 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -86,17 +86,17 @@ void ExecutePipelineController::serviceJSON(QJsonObject pipelineObj)
 //  SIMPLStaticFileController* staticFileController = SIMPLStaticFileController::Instance();
 //  QString docRoot = staticFileController->getDocRoot();
 
-//  QString newFilePath = docRoot + QDir::separator() + QString(sessionId) + QDir::separator();
-//  QJsonArray outputLinks;
+  //  QString newFilePath = docRoot + QDir::separator() + QString(sessionId) + QDir::separator();
+  //  QJsonArray outputLinks;
   //  // Look through the pipeline to find any input or output filter parameters.  Replace
   //  // the file paths in these filter parameters with session-id specific paths.
   //  QList<AbstractFilter::Pointer> filters = pipeline->getFilterContainer();
   //  for(int i = 0; i < filters.size(); i++)
   //  {
   //    AbstractFilter::Pointer filter = filters[i];
-  //    QVector<FilterParameter::Pointer> filterParams = filter->getFilterParameters();
+  //    FilterParameterVectorType filterParams = filter->getFilterParameters();
 
-  //    for(QVector<FilterParameter::Pointer>::iterator iter = filterParams.begin(); iter != filterParams.end(); ++iter)
+  //    for(FilterParameterVectorType::iterator iter = filterParams.begin(); iter != filterParams.end(); ++iter)
   //    {
   //      FilterParameter* parameter = (*iter).get();
   //      OutputFileFilterParameter* outFileParam = dynamic_cast<OutputFileFilterParameter*>(parameter);
diff --git a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
index 54cd6ed3c5..87d3135fac 100644
--- a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
@@ -74,7 +74,7 @@ void ListFilterParametersController::createFilterParametersJson(const QString& f
     return;
   }
 
-  QVector<FilterParameter::Pointer> parameters = filter->getFilterParameters();
+  FilterParameterVectorType parameters = filter->getFilterParameters();
   QJsonArray jsonParameters;
 
   for(int i = 0; i < parameters.size(); i++)
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index 5949e9fc66..4a979050c7 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -207,13 +207,13 @@ class StatsDataJsonRWTest
     // Write the Misorientation Weights
     {
       FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Angle);
-      angles->initializeWithValue(45.0f, 0);
+      angles->initializeWithValue(45.0f);
       std::vector<size_t> vec;
       vec.push_back(3);
       FloatArrayType::Pointer axis = FloatArrayType::CreateArray(1, vec, SIMPL::StringConstants::Axis);
-      axis->initializeWithValue(1.0, 0);
+      axis->initializeWithValue(1.0);
       FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
-      weight->initializeWithValue(1000.0f, 0);
+      weight->initializeWithValue(1000.0f);
       arrays.clear();
       arrays.push_back(angles);
       arrays.push_back(axis);
@@ -224,15 +224,15 @@ class StatsDataJsonRWTest
     // Write the ODF
     {
       FloatArrayType::Pointer e1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler1);
-      e1->initializeWithValue(45.0f, 0);
+      e1->initializeWithValue(45.0f);
       FloatArrayType::Pointer e2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler2);
-      e2->initializeWithValue(30.0f, 0);
+      e2->initializeWithValue(30.0f);
       FloatArrayType::Pointer e3 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler3);
-      e3->initializeWithValue(60.0f, 0);
+      e3->initializeWithValue(60.0f);
       FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Sigma);
-      sigma->initializeWithValue(2.0, 0);
+      sigma->initializeWithValue(2.0);
       FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
-      weight->initializeWithValue(100000.0f, 0);
+      weight->initializeWithValue(100000.0f);
       arrays.clear();
       arrays.push_back(e1);
       arrays.push_back(e2);
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index ededb91206..cbb9d9008c 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -49,7 +49,7 @@ ArraySelectionExample::~ArraySelectionExample() = default;
 // -----------------------------------------------------------------------------
 void ArraySelectionExample::setupFilterParameters()
 {
-  QVector<FilterParameter::Pointer> parameters;
+  FilterParameterVectorType parameters;
   DataContainerArrayProxy proxy;
   /* To select arrays */
   // parameters.push_back(DataContainerArrayProxyFilterParameter::New("Array to Select", "DataContainerArrayProxy", "", FilterParameter::Parameter, SIMPL_BIND_SETTER(ArraySelectionExample, this,
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index 8745d03b93..4eb4b191f1 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -52,7 +52,7 @@ DynamicTableExample::~DynamicTableExample() = default;
 // -----------------------------------------------------------------------------
 void DynamicTableExample::setupFilterParameters()
 {
-  QVector<FilterParameter::Pointer> parameters;
+  FilterParameterVectorType parameters;
   /* Place all your option initialization code here */
 
   // Table 1 - Fixed rows and columns, no default data passed in
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 273bf12011..9af4fdd640 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -68,7 +68,7 @@ void ErrorWarningFilter::initialize()
 // -----------------------------------------------------------------------------
 void ErrorWarningFilter::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Warning", PreflightWarning, FilterParameter::Parameter, ErrorWarningFilter));
   parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Error", PreflightError, FilterParameter::Parameter, ErrorWarningFilter));
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index 1a2e39a1d7..9486e9828e 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -62,7 +62,7 @@ void TESTCLASSNAME::initialize()
 // -----------------------------------------------------------------------------
 void TESTCLASSNAME::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index ebed9b58a4..87bac664bb 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -62,7 +62,7 @@ void FilterGroup01::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup01::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index 13f54fbb4a..2b55e290c2 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -62,7 +62,7 @@ void FilterGroup02::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup02::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index 3ec05702d2..1ce731b4ed 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -62,7 +62,7 @@ void FilterGroup03::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup03::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index 027f0e7d1b..a662b340a0 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -62,7 +62,7 @@ void FilterGroup04::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup04::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index 043ab539f3..a57f741527 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -62,7 +62,7 @@ void FilterGroup05::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup05::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index a95d31a322..eeeaa994c3 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -62,7 +62,7 @@ void FilterGroup06::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup06::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index 158b0a6e4b..1a3df04fae 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -62,7 +62,7 @@ void FilterGroup07::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup07::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index 64425fde88..7cb937ce0c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -62,7 +62,7 @@ void FilterGroup08::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup08::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index 200664b883..f5ee586943 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -62,7 +62,7 @@ void FilterGroup09::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup09::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index 4bbb7f1c66..32b9f12958 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -62,7 +62,7 @@ void FilterGroup10::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup10::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index 77a05bc1d5..4dcb57ce27 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -62,7 +62,7 @@ void FilterGroup12::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup12::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index 2d60e1330b..c115893026 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -62,7 +62,7 @@ void FilterGroup13::initialize()
 // -----------------------------------------------------------------------------
 void FilterGroup13::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 54a2f0d6e5..7f7fc28a22 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -92,13 +92,13 @@ GenericExample::GenericExample()
 , m_AlgorithmSelection(0)
 , m_DistanceMetric(1)
 {
-  m_Dimensions.x = 0;
-  m_Dimensions.y = 0;
-  m_Dimensions.z = 0;
+  m_Dimensions[0] = 0;
+  m_Dimensions[1] = 0;
+  m_Dimensions[2] = 0;
 
-  m_Origin.x = 0.0;
-  m_Origin.y = 0.0;
-  m_Origin.z = 0.0;
+  m_Origin[0] = 0.0;
+  m_Origin[1] = 0.0;
+  m_Origin[2] = 0.0;
 
   FileListInfo_t flInfo;
   flInfo.PaddingDigits = 2;
@@ -123,7 +123,7 @@ GenericExample::~GenericExample() = default;
 // -----------------------------------------------------------------------------
 void GenericExample::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
   /* Place all your option initialization code here */
   /* For String input use this code */
   parameters.push_back(SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Parameter, GenericExample));
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 7ca7655a71..f46edce029 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -80,7 +80,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(FileListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
   PYB11_PROPERTY(QString SelectedXCoordArrayName READ getSelectedXCoordArrayName WRITE setSelectedXCoordArrayName)
   PYB11_PROPERTY(QStringList DataArrayList READ getDataArrayList WRITE setDataArrayList)
-  PYB11_PROPERTY(QString CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
+  PYB11_PROPERTY(DataArrayPath CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
   PYB11_PROPERTY(DataContainerArrayProxy DcaProxy READ getDcaProxy WRITE setDcaProxy)
   PYB11_PROPERTY(QString InputPath READ getInputPath WRITE setInputPath)
   PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
@@ -88,13 +88,13 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(QVector<DataArrayPath> SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
   PYB11_PROPERTY(bool WriteAlignmentShifts READ getWriteAlignmentShifts WRITE setWriteAlignmentShifts)
   PYB11_PROPERTY(int ConversionType READ getConversionType WRITE setConversionType)
-  PYB11_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
-  PYB11_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+  PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+  PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
   PYB11_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
   PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixPath READ getAttributeMatrixPath WRITE setAttributeMatrixPath)
   PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
-  PYB11_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(int SizeDistributionFitType READ getSizeDistributionFitType WRITE setSizeDistributionFitType)
   PYB11_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
   PYB11_PROPERTY(QString CalcExpression READ getCalcExpression WRITE setCalcExpression)
@@ -162,8 +162,8 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   SIMPL_FILTER_PARAMETER(QStringList, DataArrayList)
   Q_PROPERTY(QStringList DataArrayList READ getDataArrayList WRITE setDataArrayList)
 
-  SIMPL_FILTER_PARAMETER(QString, CreatedDataContainer)
-  Q_PROPERTY(QString CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedDataContainer)
+  Q_PROPERTY(DataArrayPath CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
 
   SIMPL_FILTER_PARAMETER(DataContainerArrayProxy, DcaProxy)
   Q_PROPERTY(DataContainerArrayProxy DcaProxy READ getDcaProxy WRITE setDcaProxy)
@@ -186,11 +186,11 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   SIMPL_FILTER_PARAMETER(int, ConversionType)
   Q_PROPERTY(int ConversionType READ getConversionType WRITE setConversionType)
 
-  SIMPL_FILTER_PARAMETER(IntVec3_t, Dimensions)
-  Q_PROPERTY(IntVec3_t Dimensions READ getDimensions WRITE setDimensions)
+  SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3_t, Origin)
-  Q_PROPERTY(FloatVec3_t Origin READ getOrigin WRITE setOrigin)
+  SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+  Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
   SIMPL_FILTER_PARAMETER(AxisAngleInput_t, CrystalSymmetryRotations)
   Q_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
@@ -204,8 +204,8 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
   Q_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
 
-  SIMPL_FILTER_PARAMETER(QString, DataContainerName)
-  Q_PROPERTY(QString DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
   SIMPL_FILTER_PARAMETER(int, SizeDistributionFitType)
   Q_PROPERTY(int SizeDistributionFitType READ getSizeDistributionFitType WRITE setSizeDistributionFitType)
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index b99af699ef..e86eddb8bf 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -43,6 +43,11 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 
+enum createdPathID : RenameDataPath::DataID_t
+{
+  DataContainerID = 1
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -69,7 +74,7 @@ MakeDataContainer::~MakeDataContainer() = default;
 // -----------------------------------------------------------------------------
 void MakeDataContainer::setupFilterParameters()
 {
-  FilterParameterVector parameters;
+  FilterParameterVectorType parameters;
 
   parameters.push_back(SIMPL_NEW_STRING_FP("FeatureIds", FeatureIdsArrayName, FilterParameter::CreatedArray, MakeDataContainer));
   parameters.push_back(SIMPL_NEW_STRING_FP("Cell Euler Angles", CellEulerAnglesArrayName, FilterParameter::CreatedArray, MakeDataContainer));
@@ -102,7 +107,7 @@ void MakeDataContainer::dataCheck()
   DataArrayPath tempPath;
   setErrorCondition(0);
   setWarningCondition(0);
-  DataContainer::Pointer m = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName());
+  DataContainer::Pointer m = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
   if(getErrorCondition() < 0)
   {
     return;
@@ -130,7 +135,7 @@ void MakeDataContainer::dataCheck()
   }
 
   // ImageGeom::Pointer image = ImageGeom::CreateGeometry("TestImageGeom");
-  // image->setResolution(0.1f, 0.2f, 0.3f);
+  // image->setSpacing(0.1f, 0.2f, 0.3f);
   // image->setOrigin(100.3f, 987.234f, 0.0f);
   // image->setDimensions(64, 64, 64);
   // m->setGeometry(image);
diff --git a/Source/SIMPLib/TestFilters/TestFilters.cpp b/Source/SIMPLib/TestFilters/TestFilters.cpp
index e716cc39c3..4fa471bbba 100644
--- a/Source/SIMPLib/TestFilters/TestFilters.cpp
+++ b/Source/SIMPLib/TestFilters/TestFilters.cpp
@@ -28,7 +28,7 @@ Filt0::~Filt0() = default;
 // -----------------------------------------------------------------------------
 void Filt0::setupFilterParameters()
 {
-  QVector<FilterParameter::Pointer> parameters;
+  FilterParameterVectorType parameters;
   /* Place all your option initialization code here */
 
   /*  For an Integer use this code*/
@@ -124,7 +124,7 @@ Filt1::~Filt1() = default;
 // -----------------------------------------------------------------------------
 void Filt1::setupFilterParameters()
 {
-  QVector<FilterParameter::Pointer> parameters;
+  FilterParameterVectorType parameters;
   /* Place all your option initialization code here */
 
   /*  For an Integer use this code*/
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index 01f4e6c423..d0537ad840 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -56,7 +56,7 @@ ThresholdExample::~ThresholdExample() = default;
 // -----------------------------------------------------------------------------
 void ThresholdExample::setupFilterParameters()
 {
-  QVector<FilterParameter::Pointer> parameters;
+  FilterParameterVectorType parameters;
 
   /* To Compare Arrays like a threshold filter */
   {
diff --git a/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp b/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
index a73464fa56..474781964e 100644
--- a/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
+++ b/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
@@ -96,7 +96,7 @@ void BuildNewDream3dFile()
   tDims[1] = 128;
   tDims[2] = 128;
   AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New(tDims, "CellData", SIMPL::AttributeMatrixType::Cell);
-  vdc->addAttributeMatrix("CellData", cellAttrMat);
+  vdc->addAttributeMatrix(cellAttrMat);
   QVector<size_t> dims(1, 1);
   cellAttrMat->createAndAddAttributeArray<DataArray<int64_t>, int64_t>("Ids", 1, dims);
 
@@ -114,11 +114,11 @@ void BuildNewDream3dFile()
     m_FeatureIds[i] = i;
   }
   AttributeMatrix::Pointer cellFeatureAttrMat = AttributeMatrix::New(tDims, "CellFeatureData", SIMPL::AttributeMatrixType::CellFeature);
-  vdc->addAttributeMatrix("CellFeatureData", cellFeatureAttrMat);
+  vdc->addAttributeMatrix(cellFeatureAttrMat);
   tDims.resize(1);
   tDims[0] = 2;
   AttributeMatrix::Pointer cellEnsembleAttrMat = AttributeMatrix::New(tDims, "CellEnsembleData", SIMPL::AttributeMatrixType::CellEnsemble);
-  vdc->addAttributeMatrix("CellEnsembleData", cellEnsembleAttrMat);
+  vdc->addAttributeMatrix(cellEnsembleAttrMat);
 
   cellEnsembleAttrMat->createAndAddAttributeArray<DataArray<unsigned int>, unsigned int>("PhaseTypes", SIMPL::PhaseType::PrimaryPhase, dims);
   DataArray<unsigned int>::WeakPointer m_PhaseTypesPtr;
@@ -159,7 +159,7 @@ void BuildNewDream3dFile()
     StatsDataArray::Pointer p = StatsDataArray::New();
     m_StatsDataArray = p.get();
     m_StatsDataArray->fillArrayWithNewStatsData(cellEnsembleAttrMat->getNumberOfTuples(), m_PhaseTypes);
-    cellEnsembleAttrMat->addAttributeArray(SIMPL::EnsembleData::Statistics, p);
+    cellEnsembleAttrMat->insertOrAssign(p);
   }
 
   StatsDataArray& statsDataArray = *m_StatsDataArray;
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 5d1938f633..996ce9b603 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -332,7 +332,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
         qDebug() << "Data Container '" << dcName << "' was nullptr"
                  << " " << __FILE__ << "(" << __LINE__ << ")";
       }
-      bundle->addDataContainer(dc);
+      bundle->addOrReplaceDataContainer(dc);
     }
 
     QString metaArrays;
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index 4e445a8276..8d10cfd2f4 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -297,7 +297,7 @@ int VTKFileReader::readHeader()
   resolution[0] = tokens[1].toFloat(&ok);
   resolution[1] = tokens[2].toFloat(&ok);
   resolution[2] = tokens[3].toFloat(&ok);
-  image->setResolution(resolution);
+  image->setSpacing(resolution);
 
   return err;
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index 92fe49dc48..a7a0094341 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -194,7 +194,7 @@ bool AttributeMatrixCreationWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrixCreationWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void AttributeMatrixCreationWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index 9f27aa8d0a..d02ea19e03 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -123,9 +123,9 @@ public slots:
   void setSelectedPath(QString dcName, QString attrMatName, QString attrArrName);
 
 protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-  private slots:
+private slots:
 
 private:
   bool                                            m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index cfc808eac0..acd103196e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -111,8 +111,7 @@ void AttributeMatrixSelectionWidget::setupGui()
           this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), 
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), &AbstractFilter::dataArrayPathUpdated, this, &AttributeMatrixSelectionWidget::updateDataArrayPath);
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
@@ -175,7 +174,7 @@ bool AttributeMatrixSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void AttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index 243507d9ef..437a77461a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -102,7 +102,7 @@ class SVWidgetsLib_EXPORT AttributeMatrixSelectionWidget : public FilterParamete
     void attributeMatrixSelected(QString path);
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 041bb871ed..176ba9b40f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -451,7 +451,7 @@ void CalculatorWidget::on_applyChangesBtn_clicked()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void CalculatorWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void CalculatorWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index 7908d38926..110f4a8ec6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -108,7 +108,7 @@ class SVWidgetsLib_EXPORT CalculatorWidget : public FilterParameterWidget, priva
     void on_vectorsBtn_clicked();
     void on_piBtn_clicked();
 
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     bool                              m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 86d8a88af0..159b6c9ccc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -360,7 +360,7 @@ void ComparisonSelectionAdvancedWidget::populateButtonText()
   }
 
   // Check to see if we have any DataContainers to actually populate drop downs with.
-  if (dca->getDataContainers().isEmpty())
+  if (dca->getDataContainers().empty())
   {
     return;
   }
@@ -465,7 +465,7 @@ void ComparisonSelectionAdvancedWidget::presetAttributeMatrix(DataArrayPath amPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSelectionAdvancedWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void ComparisonSelectionAdvancedWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index 187da1bcbe..0279fc5001 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -166,7 +166,7 @@ class ComparisonSelectionAdvancedWidget : public FilterParameterWidget, private
     * @param propertyName
     * @param renamePath
     */
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
     /**
     * @brief Handles AttributeMatrix path changes through DataArrayPathSelectionWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 0cf2f44420..5db84f127f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -192,7 +192,7 @@ bool DataArrayCreationWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayCreationWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void DataArrayCreationWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index 07927168de..504a929784 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -109,7 +109,7 @@ class SVWidgetsLib_EXPORT DataArrayCreationWidget : public FilterParameterWidget
     void attributeMatrixSelected(QString path);
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 97c609acf3..6338d45f13 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -173,7 +173,7 @@ bool DataArraySelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArraySelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void DataArraySelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index bfc3c7b015..40b678e039 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -110,7 +110,7 @@ class SVWidgetsLib_EXPORT DataArraySelectionWidget : public FilterParameterWidge
     void dataArraySelected(QString path);
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 22c4995828..5c0fca3825 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -378,7 +378,7 @@ void DataContainerArrayProxyWidget::toggleStrikeOutFont(QListWidgetItem* item, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerArrayProxyWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void DataContainerArrayProxyWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   blockSignals(true);
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index 3b8e35238e..5064af9b59 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -126,7 +126,7 @@ class SVWidgetsLib_EXPORT DataContainerArrayProxyWidget : public FilterParameter
     void selectAllDataContainersClicked(bool checked);
     void selectAllAttributeMatricesClicked(bool checked);
     void selectAllDataArraysClicked(bool checked);
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index 13cea27d58..97b4ae821e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -72,8 +72,13 @@ void DataContainerCreationWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
-    stringEdit->setText(str, true);
+    DataContainerCreationFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+    DataArrayPath dap;
+    if(getter)
+    {
+      dap = getter();
+    }
+    stringEdit->setText(dap.getDataContainerName(), true);
   }
   blockSignals(false);
 
@@ -119,17 +124,18 @@ void DataContainerCreationWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void DataContainerCreationWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, stringEdit->getText());
-  if(!ok)
+  DataArrayPath dap(stringEdit->getText());
+  DataContainerCreationFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
   {
-    getFilter()->notifyMissingProperty(getFilterParameter());
+    setter(dap);
   }
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerCreationWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void DataContainerCreationWidget::updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index e35e1f454d..325b781930 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -86,7 +86,7 @@ class SVWidgetsLib_EXPORT DataContainerCreationWidget : public FilterParameterWi
     void filterNeedsInputParameters(AbstractFilter* filter);
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     DataContainerCreationFilterParameter*                 m_FilterParameter;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 137f3576ce..475640888a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -140,19 +140,20 @@ void DataContainerSelectionWidget::setupGui()
 
   m_SelectedDataContainerPath->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(false));
 
-  QString dcName = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QString>();
-  m_SelectedDataContainerPath->setText(dcName);
+  DataContainerSelectionFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+  if(getter)
+  {
+    m_SelectedDataContainerPath->setText(getter().getDataContainerName());
+  }
   m_SelectedDataContainerPath->setPropertyName(getFilterParameter()->getHumanLabel());
 
-
   changeStyleSheet(Style::FS_STANDARD_STYLE);
-
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataContainerSelectionWidget::checkStringValues(QString curDcName, QString filtDcName)
+QString DataContainerSelectionWidget::checkStringValues(const QString& curDcName, const QString& filtDcName)
 {
   if(curDcName.isEmpty() && !filtDcName.isEmpty())
   {
@@ -187,15 +188,13 @@ bool DataContainerSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void DataContainerSelectionWidget::updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  DataContainerSelectionFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+  if(getter)
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    QString updatedPath = var.value<QString>();
-
     blockSignals(true);
-    setSelectedPath(updatedPath);
+    setSelectedPath(getter());
     blockSignals(false);
   }
 }
@@ -215,7 +214,7 @@ void DataContainerSelectionWidget::dataContainerSelected(QString path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerSelectionWidget::setSelectedPath(QString path)
+void DataContainerSelectionWidget::setSelectedPath(const QString& path)
 {
   DataArrayPath dcPath = DataArrayPath::Deserialize(path, Detail::Delimiter);
   setSelectedPath(dcPath);
@@ -224,7 +223,7 @@ void DataContainerSelectionWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerSelectionWidget::setSelectedPath(DataArrayPath dcPath)
+void DataContainerSelectionWidget::setSelectedPath(const DataArrayPath& dcPath)
 {
   if (dcPath.isEmpty()) { return; }
 
@@ -268,15 +267,10 @@ void DataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void DataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  // Generate the path to the AttributeArray
-  // DataArrayPath path(dataContainerList->currentText(), attributeMatrixList->currentText(), attributeArrayList->currentText());
-  QVariant var(m_SelectedDataContainerPath->text());
-  // var.setValue(path);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  DataArrayPath dap(m_SelectedDataContainerPath->text());
+  DataContainerSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
   {
-    getFilter()->notifyMissingProperty(getFilterParameter());
+    setter(dap);
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index 934d02868d..5f815813c1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -86,7 +86,7 @@ class SVWidgetsLib_EXPORT DataContainerSelectionWidget : public FilterParameterW
      * @param filt
      * @return
      */
-    QString checkStringValues(QString current, QString filtDcName);
+    QString checkStringValues(const QString& current, const QString& filtDcName);
 
     /**
      * @brief initializeWidget
@@ -111,7 +111,7 @@ class SVWidgetsLib_EXPORT DataContainerSelectionWidget : public FilterParameterW
     void dataContainerSelected(QString path);
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(const QString &propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
 
@@ -119,9 +119,9 @@ class SVWidgetsLib_EXPORT DataContainerSelectionWidget : public FilterParameterW
 
     DataContainerSelectionFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
+    void setSelectedPath(const QString& path);
 
-    void setSelectedPath(DataArrayPath dcPath);
+    void setSelectedPath(const DataArrayPath& dcPath);
 
   public:
     DataContainerSelectionWidget(const DataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index dd9e2bd224..aa82b47229 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -95,10 +95,10 @@ void FloatVec2Widget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    FloatVec2_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec2_t>();
+    FloatVec2Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec2Type>();
 
-    xData->setText(loc.toString(data.x));
-    yData->setText(loc.toString(data.y));
+    xData->setText(loc.toString(data[0]));
+    yData->setText(loc.toString(data[1]));
   }
 
   errorLabel->hide();
@@ -137,27 +137,27 @@ void FloatVec2Widget::widgetChanged(const QString& text)
 void FloatVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   bool ok = false;
-  FloatVec2_t defValue = m_FilterParameter->getDefaultValue().value<FloatVec2_t>();
-  FloatVec2_t data;
+  FloatVec2Type defValue = m_FilterParameter->getDefaultValue().value<FloatVec2Type>();
+  FloatVec2Type data;
 
   QLocale loc;
 
-  data.x = loc.toFloat(xData->text(), &ok);
+  data[0] = loc.toFloat(xData->text(), &ok);
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(xData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);    errorLabel->setText("X Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-    data.x = defValue.x;
+    data[0] = defValue[0];
   }
 
-  data.y = loc.toFloat(yData->text(), &ok);
+  data[1] = loc.toFloat(yData->text(), &ok);
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(yData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);    errorLabel->setText("Y Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-    data.y = defValue.y;
+    data[1] = defValue[1];
   }
 
   QVariant v;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index f33a31a830..a59fc00325 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -98,11 +98,11 @@ void FloatVec3Widget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    FloatVec3_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec3_t>();
+    FloatVec3Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec3Type>();
 
-    xData->setText(loc.toString(data.x));
-    yData->setText(loc.toString(data.y));
-    zData->setText(loc.toString(data.z));
+    xData->setText(loc.toString(data[0]));
+    yData->setText(loc.toString(data[1]));
+    zData->setText(loc.toString(data[2]));
   }
 
   errorLabel->hide();
@@ -142,39 +142,39 @@ void FloatVec3Widget::widgetChanged(const QString& text)
 void FloatVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   bool ok = false;
-  FloatVec3_t defValue = m_FilterParameter->getDefaultValue().value<FloatVec3_t>();
-  FloatVec3_t data;
+  FloatVec3Type defValue = m_FilterParameter->getDefaultValue().value<FloatVec3Type>();
+  FloatVec3Type data;
 
   QLocale loc;
 
-  data.x = loc.toFloat(xData->text(), &ok);
+  data[0] = loc.toFloat(xData->text(), &ok);
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(xData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);  
     errorLabel->setText("X Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-    data.x = defValue.x;
+    data[0] = defValue[0];
   }
-  
-  data.y = loc.toFloat(yData->text(), &ok);
+
+  data[1] = loc.toFloat(yData->text(), &ok);
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(yData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);  
     errorLabel->setText("Y Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-    data.y = defValue.y;
+    data[1] = defValue[1];
   }
-  
-  data.z = loc.toFloat(zData->text(), &ok);
+
+  data[2] = loc.toFloat(zData->text(), &ok);
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(zData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
     errorLabel->setText("Z Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-    data.z = defValue.z;
+    data[2] = defValue[2];
   }
 
   QVariant v;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index 41fd965963..c8ac5b6ea9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -90,10 +90,10 @@ void IntVec3Widget::setupGui()
   {
     IntVec3WidgetLabel->setText(getFilterParameter()->getHumanLabel());
 
-    IntVec3_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<IntVec3_t>();
-    xData->setText(QString::number(data.x));
-    yData->setText(QString::number(data.y));
-    zData->setText(QString::number(data.z));
+    IntVec3Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<IntVec3Type>();
+    xData->setText(QString::number(data[0]));
+    yData->setText(QString::number(data[1]));
+    zData->setText(QString::number(data[2]));
   }
 }
 
@@ -111,10 +111,10 @@ void IntVec3Widget::widgetChanged(const QString& text)
 void IntVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   bool ok = false;
-  IntVec3_t data;
-  data.x = xData->text().toInt(&ok);
-  data.y = yData->text().toInt(&ok);
-  data.z = zData->text().toInt(&ok);
+  IntVec3Type data;
+  data[0] = xData->text().toInt(&ok);
+  data[1] = yData->text().toInt(&ok);
+  data[2] = zData->text().toInt(&ok);
 
   QVariant v;
   v.setValue(data);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 79d5f8690f..8aab92d12b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -193,14 +193,11 @@ void LinkedDataContainerSelectionWidget::createSelectionMenu()
 
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
+  DataContainerArray::Container containers = dca->getDataContainers();
   IGeometry::Types geomTypes = m_FilterParameter->getDefaultGeometryTypes();
 
-  QListIterator<DataContainer::Pointer> containerIter(containers);
-  while(containerIter.hasNext())
+  for(DataContainer::Pointer dc : containers)
   {
-    DataContainer::Pointer dc = containerIter.next();
-
     IGeometry::Pointer geom = IGeometry::NullPointer();
     IGeometry::Type geomType = IGeometry::Type::Unknown;
     if(nullptr != dc.get())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index f40087c69a..743347c2f8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -574,7 +574,7 @@ void MultiAttributeMatrixSelectionWidget::filterNeedsInputParameters(AbstractFil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void MultiAttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index 720b332a27..e1baf71843 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -124,7 +124,7 @@ class SVWidgetsLib_EXPORT MultiAttributeMatrixSelectionWidget : public FilterPar
     void on_attributeMatricesSelectWidget_itemSelectionChanged();
     void on_attributeMatricesOrderWidget_itemSelectionChanged();
 
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 5b41c2ce26..b01d190def 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -579,7 +579,7 @@ void MultiDataArraySelectionWidget::filterNeedsInputParameters(AbstractFilter* f
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 1391f5f878..2bb7aa4dc8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -127,7 +127,7 @@ class SVWidgetsLib_EXPORT MultiDataArraySelectionWidget : public FilterParameter
     void on_availableArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
     void on_selectedArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
 
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 1967f46dc0..9487eb777f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -188,7 +188,7 @@ bool PhaseTypeSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PhaseTypeSelectionWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void PhaseTypeSelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index 75174bdc6b..5a3c71f430 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -109,7 +109,7 @@ class SVWidgetsLib_EXPORT PhaseTypeSelectionWidget : public FilterParameterWidge
     void resetPhaseComboBoxes();
 
   protected slots:
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     bool              m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 8752daf0f1..acdd1eff22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -509,7 +509,7 @@ void ReadASCIIDataWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ReadASCIIDataWidget::updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath)
+void ReadASCIIDataWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
   DataArrayPath oldPath;
   DataArrayPath newPath;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
index d32445f00e..a58dbf4656 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
@@ -85,7 +85,7 @@ class SVWidgetsLib_EXPORT ReadASCIIDataWidget : public FilterParameterWidget, pr
     void lineCountDidFinish();
     void updateProgress(double percentage);
 
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
   private:
     ReadASCIIDataFilterParameter*                   m_FilterParameter;
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index c024aa3fb1..1241cbeaf5 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -48,7 +48,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(DataArrayPath path)
+const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(const DataArrayPath& path)
 {
   return CreateDragIcon(path.serialize(Detail::Delimiter), path.getDataType());
 }
@@ -56,7 +56,7 @@ const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(DataArrayPath path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(QString text, DataArrayPath::DataType dataType)
+const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(const QString& text, DataArrayPathHelper::DataType dataType)
 {
   return CreateDragIcon(text, GetActiveColor(dataType));
 }
@@ -64,7 +64,7 @@ const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(QString text, DataArr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(QString text, QColor backgroundColor)
+const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(const QString& text, const QColor& backgroundColor)
 {
   int minHeight = 26;
 
@@ -113,23 +113,23 @@ const QPixmap DataArrayPathSelectionWidget::CreateDragIcon(QString text, QColor
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QColor DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataType type)
+const QColor DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType type)
 {
   QColor color;
   SVStyle* style = SVStyle::Instance();
 
   switch(type)
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     color = style->getDataArrayPath_DataContainer_color();
     break;
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     color = style->getDataArrayPath_AttributeMatrix_color();
     break;
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
     color = style->getDataArrayPath_DataArray_color();
     break;
-  case DataArrayPath::DataType::None:
+  case DataArrayPathHelper::DataType::None:
     break;
   }
 
@@ -139,23 +139,23 @@ const QColor DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataTyp
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QColor DataArrayPathSelectionWidget::GetCheckedColor(DataArrayPath::DataType type)
+const QColor DataArrayPathSelectionWidget::GetCheckedColor(DataArrayPathHelper::DataType type)
 {
   QColor color;
   SVStyle* style = SVStyle::Instance();
 
   switch(type)
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     color = style->getDataArrayPath_DataContainer_background_color();
     break;
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     color = style->getDataArrayPath_AttributeMatrix_background_color();
     break;
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
     color = style->getDataArrayPath_DataArray_background_color();
     break;
-  case DataArrayPath::DataType::None:
+  case DataArrayPathHelper::DataType::None:
     break;
   }
 
@@ -165,9 +165,9 @@ const QColor DataArrayPathSelectionWidget::GetCheckedColor(DataArrayPath::DataTy
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, DataContainerSelectionFilterParameter::RequirementType reqs)
+bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const DataContainerSelectionFilterParameter::RequirementType& reqs)
 {
-  if(DataArrayPath::DataType::DataContainer != path.getDataType())
+  if(DataArrayPathHelper::DataType::DataContainer != path.getDataType())
   {
     return false;
   }
@@ -211,9 +211,9 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, AttributeMatrixSelectionFilterParameter::RequirementType reqs)
+bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const AttributeMatrixSelectionFilterParameter::RequirementType& reqs)
 {
-  if(DataArrayPath::DataType::AttributeMatrix != path.getDataType())
+  if(DataArrayPathHelper::DataType::AttributeMatrix != path.getDataType())
   {
     return false;
   }
@@ -272,9 +272,9 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, DataArraySelectionFilterParameter::RequirementType reqs)
+bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const DataArraySelectionFilterParameter::RequirementType& reqs)
 {
-  if(DataArrayPath::DataType::DataArray != path.getDataType())
+  if(DataArrayPathHelper::DataType::DataArray != path.getDataType())
   {
     return false;
   }
@@ -372,7 +372,7 @@ void DataArrayPathSelectionWidget::setupGui()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath::DataType DataArrayPathSelectionWidget::getDataType()
+DataArrayPathHelper::DataType DataArrayPathSelectionWidget::getDataType() const
 {
   return m_DataType;
 }
@@ -380,9 +380,9 @@ DataArrayPath::DataType DataArrayPathSelectionWidget::getDataType()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayPathSelectionWidget::setDataContainerRequirements(DataContainerSelectionFilterParameter::RequirementType dcReqs)
+void DataArrayPathSelectionWidget::setDataContainerRequirements(const DataContainerSelectionFilterParameter::RequirementType& dcReqs)
 {
-  m_DataType = DataArrayPath::DataType::DataContainer;
+  m_DataType = DataArrayPathHelper::DataType::DataContainer;
   m_DataContainerReqs = dcReqs;
 
   QString html;
@@ -397,9 +397,9 @@ void DataArrayPathSelectionWidget::setDataContainerRequirements(DataContainerSel
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayPathSelectionWidget::setAttrMatrixRequirements(AttributeMatrixSelectionFilterParameter::RequirementType amReqs)
+void DataArrayPathSelectionWidget::setAttrMatrixRequirements(const AttributeMatrixSelectionFilterParameter::RequirementType& amReqs)
 {
-  m_DataType = DataArrayPath::DataType::AttributeMatrix;
+  m_DataType = DataArrayPathHelper::DataType::AttributeMatrix;
   m_AttrMatrixReqs = amReqs;
 
   QString html;
@@ -415,9 +415,9 @@ void DataArrayPathSelectionWidget::setAttrMatrixRequirements(AttributeMatrixSele
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayPathSelectionWidget::setDataArrayRequirements(DataArraySelectionFilterParameter::RequirementType daReqs)
+void DataArrayPathSelectionWidget::setDataArrayRequirements(const DataArraySelectionFilterParameter::RequirementType& daReqs)
 {
-  m_DataType = DataArrayPath::DataType::DataArray;
+  m_DataType = DataArrayPathHelper::DataType::DataArray;
   m_DataArrayReqs = daReqs;
 
   QString html;
@@ -435,7 +435,7 @@ void DataArrayPathSelectionWidget::setDataArrayRequirements(DataArraySelectionFi
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createTooltipHeader()
+QString DataArrayPathSelectionWidget::createTooltipHeader() const
 {
   QString html;
   QTextStream ss(&html);
@@ -451,7 +451,7 @@ QString DataArrayPathSelectionWidget::createTooltipHeader()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createTooltipFooter()
+QString DataArrayPathSelectionWidget::createTooltipFooter() const
 {
   QString html;
   QTextStream ss(&html);
@@ -464,7 +464,7 @@ QString DataArrayPathSelectionWidget::createTooltipFooter()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createGeomReqString(QVector<IGeometry::Type> geomTypes)
+QString DataArrayPathSelectionWidget::createGeomReqString(QVector<IGeometry::Type> geomTypes) const
 {
   QString reqStr = "<tr><td><i>Required Geometries:</i></td>";
   if(geomTypes.empty())
@@ -518,7 +518,7 @@ QString DataArrayPathSelectionWidget::createGeomReqString(QVector<IGeometry::Typ
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes)
+QString DataArrayPathSelectionWidget::createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes) const
 {
   QString reqStr = "<tr><td><i>Required Matrix Type:</i></td>";
   if(amTypes.empty())
@@ -590,7 +590,7 @@ QString DataArrayPathSelectionWidget::createAttrMatrixReqString(QVector<Attribut
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString> daTypes)
+QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString> daTypes) const
 {
   QString reqStr = "<tr><td><i>Required Array Type:</i></td>";
   if(daTypes.empty())
@@ -612,7 +612,7 @@ QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString>
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createComponentReqString(QVector<QVector<size_t>> comps)
+QString DataArrayPathSelectionWidget::createComponentReqString(QVector<QVector<size_t>> comps) const
 {
   QString reqStr = "<tr><td><i>Required Component Size:</i></td>";
   if(comps.empty())
@@ -647,7 +647,7 @@ QString DataArrayPathSelectionWidget::createComponentReqString(QVector<QVector<s
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerSelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getDataContainerRequirements()
+DataContainerSelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getDataContainerRequirements() const
 {
   return m_DataContainerReqs;
 }
@@ -655,7 +655,7 @@ DataContainerSelectionFilterParameter::RequirementType DataArrayPathSelectionWid
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixSelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getAttrMatrixRequirements()
+AttributeMatrixSelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getAttrMatrixRequirements() const
 {
   return m_AttrMatrixReqs;
 }
@@ -663,7 +663,7 @@ AttributeMatrixSelectionFilterParameter::RequirementType DataArrayPathSelectionW
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArraySelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getDataArrayRequirements()
+DataArraySelectionFilterParameter::RequirementType DataArrayPathSelectionWidget::getDataArrayRequirements() const
 {
   return m_DataArrayReqs;
 }
@@ -671,7 +671,7 @@ DataArraySelectionFilterParameter::RequirementType DataArrayPathSelectionWidget:
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayPathSelectionWidget::setDataArrayPath(DataArrayPath path)
+void DataArrayPathSelectionWidget::setDataArrayPath(const DataArrayPath& path)
 {
   // Do not check the path if there are no changes
   if(getDataArrayPath() == path)
@@ -691,13 +691,13 @@ void DataArrayPathSelectionWidget::setDataArrayPath(DataArrayPath path)
     // Clear DataArrayPath
     switch(getDataType())
     {
-    case DataArrayPath::DataType::DataContainer:
+    case DataArrayPathHelper::DataType::DataContainer:
       setText("");
       break;
-    case DataArrayPath::DataType::AttributeMatrix:
+    case DataArrayPathHelper::DataType::AttributeMatrix:
       setText("\t / \t");
       break;
-    case DataArrayPath::DataType::DataArray:
+    case DataArrayPathHelper::DataType::DataArray:
       setText("\t / \t / \t");
       break;
     default:
@@ -729,7 +729,7 @@ void DataArrayPathSelectionWidget::setFilteredDataArrayPath(DataArrayPath path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath DataArrayPathSelectionWidget::getDataArrayPath()
+DataArrayPath DataArrayPathSelectionWidget::getDataArrayPath() const
 {
   return DataArrayPath::Deserialize(text(), Detail::Delimiter);
 }
@@ -737,7 +737,7 @@ DataArrayPath DataArrayPathSelectionWidget::getDataArrayPath()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::checkCurrentPath()
+bool DataArrayPathSelectionWidget::checkCurrentPath() const
 {
   return checkPathReqs(getDataArrayPath());
 }
@@ -745,7 +745,7 @@ bool DataArrayPathSelectionWidget::checkCurrentPath()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::checkPathReqs(DataArrayPath path)
+bool DataArrayPathSelectionWidget::checkPathReqs(const DataArrayPath& path) const
 {
   if(nullptr == m_Filter)
   {
@@ -762,13 +762,13 @@ bool DataArrayPathSelectionWidget::checkPathReqs(DataArrayPath path)
   // Check requirements
   switch(m_DataType)
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     return checkDataContainerReqs(path);
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     return checkAttributeMatrixReqs(path);
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
     return checkDataArrayReqs(path);
-  case DataArrayPath::DataType::None:
+  case DataArrayPathHelper::DataType::None:
     break;
   }
 
@@ -778,7 +778,7 @@ bool DataArrayPathSelectionWidget::checkPathReqs(DataArrayPath path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::checkDataContainerReqs(DataArrayPath path)
+bool DataArrayPathSelectionWidget::checkDataContainerReqs(const DataArrayPath& path) const
 {
   return CheckPathRequirements(m_Filter, path, m_DataContainerReqs);
 }
@@ -786,7 +786,7 @@ bool DataArrayPathSelectionWidget::checkDataContainerReqs(DataArrayPath path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::checkAttributeMatrixReqs(DataArrayPath path)
+bool DataArrayPathSelectionWidget::checkAttributeMatrixReqs(const DataArrayPath& path) const
 {
   return CheckPathRequirements(m_Filter, path, m_AttrMatrixReqs);
 }
@@ -794,7 +794,7 @@ bool DataArrayPathSelectionWidget::checkAttributeMatrixReqs(DataArrayPath path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::checkDataArrayReqs(DataArrayPath path)
+bool DataArrayPathSelectionWidget::checkDataArrayReqs(const DataArrayPath& path) const
 {
   return CheckPathRequirements(m_Filter, path, m_DataArrayReqs);
 }
@@ -877,16 +877,16 @@ void DataArrayPathSelectionWidget::emitRequirements()
 
   switch(m_DataType)
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     emit viewPathsMatchingReqs(m_DataContainerReqs);
     break;
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     emit viewPathsMatchingReqs(m_AttrMatrixReqs);
     break;
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
     emit viewPathsMatchingReqs(m_DataArrayReqs);
     break;
-  case DataArrayPath::DataType::None:
+  case DataArrayPathHelper::DataType::None:
     break;
   }
 
@@ -1075,19 +1075,19 @@ void DataArrayPathSelectionWidget::afterPreflight()
   bool found = false;
   switch(getDataType())
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     if(dca->getDataContainer(getDataArrayPath()))
     {
       found = true;
     }
     break;
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     if(dca->getAttributeMatrix(getDataArrayPath()))
     {
       found = true;
     }
     break;
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
   {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(getDataArrayPath());
     if(am && am->getAttributeArray(getDataArrayPath().getDataArrayName()))
@@ -1096,7 +1096,7 @@ void DataArrayPathSelectionWidget::afterPreflight()
     }
   }
   break;
-  case DataArrayPath::DataType::None:
+  case DataArrayPathHelper::DataType::None:
     break;
   }
 
@@ -1172,7 +1172,7 @@ void DataArrayPathSelectionWidget::resetStyle()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QColor DataArrayPathSelectionWidget::getBorderColor(State state)
+const QColor DataArrayPathSelectionWidget::getBorderColor(State state) const
 {
   SVStyle* style = SVStyle::Instance();
   QColor color = "#000000";
@@ -1202,7 +1202,7 @@ const QColor DataArrayPathSelectionWidget::getBorderColor(State state)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPathSelectionWidget::State DataArrayPathSelectionWidget::getState()
+DataArrayPathSelectionWidget::State DataArrayPathSelectionWidget::getState() const
 {
   return m_State;
 }
@@ -1404,7 +1404,7 @@ QSize DataArrayPathSelectionWidget::sizeHint() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::getPropertyName()
+QString DataArrayPathSelectionWidget::getPropertyName() const
 {
   return m_PropName;
 }
@@ -1420,7 +1420,7 @@ void DataArrayPathSelectionWidget::setPropertyName(QString propName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataArrayPathSelectionWidget::isCreatedPath(DataArrayPath path)
+bool DataArrayPathSelectionWidget::isCreatedPath(const DataArrayPath& path) const
 {
   if(nullptr == m_Filter)
   {
@@ -1455,7 +1455,7 @@ void DataArrayPathSelectionWidget::showContextMenu(const QPoint& pos)
 // -----------------------------------------------------------------------------
 QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
 {
-  if(nullptr == m_Filter || DataArrayPath::DataType::None == m_DataType)
+  if(nullptr == m_Filter || DataArrayPathHelper::DataType::None == m_DataType)
   {
     return nullptr;
   }
@@ -1470,7 +1470,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
   DataArrayPath path;
 
   // Populate Menu with DataContainers
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
+  DataContainerArray::Container containers = dca->getDataContainers();
   for(DataContainer::Pointer dc : containers)
   {
     path.setDataContainerName(dc->getName());
@@ -1479,7 +1479,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
       continue;
     }
 
-    if(DataArrayPath::DataType::DataContainer == m_DataType)
+    if(DataArrayPathHelper::DataType::DataContainer == m_DataType)
     {
       QAction* action = menu->addAction(dc->getName());
       action->setEnabled(checkPathReqs(path));
@@ -1491,8 +1491,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
       menu->addMenu(dcMenu);
       bool dcMenuEnabled = false;
 
-      DataContainer::AttributeMatrixMap_t attrMats = dc->getAttributeMatrices();
-      for(AttributeMatrix::Pointer am : attrMats)
+      for(const AttributeMatrix::Pointer& am : dc->getChildren())
       {
         path.setAttributeMatrixName(am->getName());
         if(isCreatedPath(path))
@@ -1501,7 +1500,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
         }
 
         // Populate DataContainer menu
-        if(DataArrayPath::DataType::AttributeMatrix == m_DataType)
+        if(DataArrayPathHelper::DataType::AttributeMatrix == m_DataType)
         {
           QAction* action = dcMenu->addAction(am->getName());
           action->setEnabled(checkPathReqs(path));
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index 38eb0982f9..2214da89ec 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -70,101 +70,101 @@ class DataArrayPathSelectionWidget : public QToolButton
   };
   Q_ENUM(State)
 
-  static const QPixmap CreateDragIcon(DataArrayPath path);
-  static const QPixmap CreateDragIcon(QString text, DataArrayPath::DataType dataType);
-  static const QPixmap CreateDragIcon(QString text, QColor backgroundColor);
-  static const QColor GetActiveColor(DataArrayPath::DataType type);
-  static const QColor GetCheckedColor(DataArrayPath::DataType type);
-  static bool CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, DataContainerSelectionFilterParameter::RequirementType reqs);
-  static bool CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, AttributeMatrixSelectionFilterParameter::RequirementType reqs);
-  static bool CheckPathRequirements(AbstractFilter* filter, DataArrayPath path, DataArraySelectionFilterParameter::RequirementType reqs);
+  static const QPixmap CreateDragIcon(const DataArrayPath& path);
+  static const QPixmap CreateDragIcon(const QString& text, DataArrayPathHelper::DataType dataType);
+  static const QPixmap CreateDragIcon(const QString& text, const QColor& backgroundColor);
+  static const QColor GetActiveColor(DataArrayPathHelper::DataType type);
+  static const QColor GetCheckedColor(DataArrayPathHelper::DataType type);
+  static bool CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const DataContainerSelectionFilterParameter::RequirementType& reqs);
+  static bool CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const AttributeMatrixSelectionFilterParameter::RequirementType& reqs);
+  static bool CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const DataArraySelectionFilterParameter::RequirementType& reqs);
 
   DataArrayPathSelectionWidget(QWidget* parent = nullptr);
   ~DataArrayPathSelectionWidget() override = default;
 
-  Q_PROPERTY(DataArrayPath::DataType PathType READ getDataType)
+  Q_PROPERTY(DataArrayPathHelper::DataType PathType READ getDataType)
   Q_PROPERTY(State State READ getState)
 
   /**
   * @brief Returns the type of DataArrayPath this widget can handle
   * @return
   */
-  DataArrayPath::DataType getDataType();
+  DataArrayPathHelper::DataType getDataType() const;
 
   /**
   * @brief Sets the DataContainer requirements and sets the DataType to DataContainer
   * @param dcReqs
   */
-  void setDataContainerRequirements(DataContainerSelectionFilterParameter::RequirementType dcReqs);
+  void setDataContainerRequirements(const DataContainerSelectionFilterParameter::RequirementType& dcReqs);
 
   /**
   * @brief Sets the AttributeMatrix requirements and sets the DataType to AttributeMatrix
   * @param amReqs
   */
-  void setAttrMatrixRequirements(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
+  void setAttrMatrixRequirements(const AttributeMatrixSelectionFilterParameter::RequirementType& amReqs);
 
   /**
   * @brief Sets the DataArray requirements and sets the DataType to DataArray
   * @param daReqs
   */
-  void setDataArrayRequirements(DataArraySelectionFilterParameter::RequirementType daReqs);
+  void setDataArrayRequirements(const DataArraySelectionFilterParameter::RequirementType& daReqs);
 
   /**
   * @brief Returns the DataContainer requirements
   * @return
   */
-  DataContainerSelectionFilterParameter::RequirementType getDataContainerRequirements();
+  DataContainerSelectionFilterParameter::RequirementType getDataContainerRequirements() const;
 
   /**
   * @brief Returns the AttributeMatrix requirements
   * @return
   */
-  AttributeMatrixSelectionFilterParameter::RequirementType getAttrMatrixRequirements();
+  AttributeMatrixSelectionFilterParameter::RequirementType getAttrMatrixRequirements() const;
 
   /**
   * @brief Returns the DataArray requirements
   * @return
   */
-  DataArraySelectionFilterParameter::RequirementType getDataArrayRequirements();
+  DataArraySelectionFilterParameter::RequirementType getDataArrayRequirements() const;
 
   /**
   * @brief Checks the requirements for the current path
   * @return
   */
-  bool checkCurrentPath();
+  bool checkCurrentPath() const;
 
   /**
   * @brief Checks requirements against the given DataArrayPath
   * @param path
   * @return
   */
-  bool checkPathReqs(DataArrayPath path);
+  bool checkPathReqs(const DataArrayPath& path) const;
 
   /**
   * @brief Checks DataContainer requirements against the given DataArrayPath
   * @param path
   * @return
   */
-  bool checkDataContainerReqs(DataArrayPath path);
+  bool checkDataContainerReqs(const DataArrayPath& path) const;
 
   /**
   * @brief Checks AttributeMatrix requirements against the given DataArrayPath
   * @param path
   * @return
   */
-  bool checkAttributeMatrixReqs(DataArrayPath path);
+  bool checkAttributeMatrixReqs(const DataArrayPath& path) const;
 
   /**
    * @brief Sets the DataArrayPath without checking requirements
    * @param dap
    */
-  void setDataArrayPath(DataArrayPath dap);
+  void setDataArrayPath(const DataArrayPath& dap);
 
   /**
   * @brief Returns the DataArrayPath
   * @return
   */
-  DataArrayPath getDataArrayPath();
+  DataArrayPath getDataArrayPath() const;
 
   /**
   * @brief Sets the filter the selection widget operates on
@@ -196,7 +196,7 @@ class DataArrayPathSelectionWidget : public QToolButton
   * @brief Returns the property name set for this widget
   * @return
   */
-  QString getPropertyName();
+  QString getPropertyName() const;
 
   /**
   * @brief Sets the property name
@@ -270,7 +270,7 @@ public slots:
    * @brief Returns the current State
    * @return
    */
-  State getState();
+  State getState() const;
 
   /**
   * @brief Change the stylesheet based on the widget state
@@ -329,7 +329,7 @@ public slots:
   * @param path
   * @return
   */
-  bool checkDataArrayReqs(DataArrayPath path);
+  bool checkDataArrayReqs(const DataArrayPath& path) const;
 
   /**
   * @brief dragEnterEvent
@@ -353,41 +353,41 @@ public slots:
    * @brief Creates and returns the header part of the tooltip HTML
    * @return
    */
-  QString createTooltipHeader();
+  QString createTooltipHeader() const;
 
   /**
    * @brief Creates and returns the closing part of the tooltip HTML
    * @return
    */
-  QString createTooltipFooter();
+  QString createTooltipFooter() const;
 
   /**
   * @brief Create the IGeometry::Type requirements part of the tooltip
   * @param geomTypes
   * @return
   */
-  QString createGeomReqString(QVector<IGeometry::Type> geomTypes);
+  QString createGeomReqString(QVector<IGeometry::Type> geomTypes) const;
 
   /**
   * @brief Create the AttributeMatrix::Type requirements part of the tooltip
   * @param amTypes
   * @return
   */
-  QString createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes);
+  QString createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes) const;
 
   /**
   * @brief Create the DataArray type requirements part of the tooltip
   * @param daTypes
   * @return
   */
-  QString createDataArrayTypeString(QVector<QString> daTypes);
+  QString createDataArrayTypeString(QVector<QString> daTypes) const;
 
   /**
   * @brief Create the component requirements part of the tooltip
   * @param compDims
   * @return
   */
-  QString createComponentReqString(QVector<QVector<size_t>> compDims);
+  QString createComponentReqString(QVector<QVector<size_t>> compDims) const;
 
   /**
   * @brief mouseMoveEvent
@@ -399,7 +399,7 @@ public slots:
   * @brief Returns the color code for the given State
   * @param state
   */
-  const QColor getBorderColor(State state);
+  const QColor getBorderColor(State state) const;
 
   /**
   * @brief Override the paint event to mark the DataType required
@@ -418,7 +418,7 @@ public slots:
   * @param path
   * @return
   */
-  bool isCreatedPath(DataArrayPath path);
+  bool isCreatedPath(const DataArrayPath& path) const;
 
 protected slots:
   /**
@@ -441,7 +441,7 @@ private slots:
   void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
 
 private:
-  DataArrayPath::DataType m_DataType = DataArrayPath::DataType::None;
+  DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
   State m_State = State::Normal;
   AbstractFilter* m_Filter = nullptr;
   DataContainerSelectionFilterParameter::RequirementType m_DataContainerReqs;
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 0ed415617b..7c084377c7 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -156,15 +156,12 @@ void DataContainerArrayWidget::updateView()
   QStandardItem* rootItem = model->invisibleRootItem();
 
   // Loop over the data containers until we find the proper data container
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
+  DataContainerArray::Container containers = dca->getDataContainers();
 
-  QListIterator<DataContainer::Pointer> containerIter(containers);
   // QStringList dcList;
   int row0 = 0;
-  while(containerIter.hasNext())
+  for(DataContainer::Pointer dc : containers)
   {
-    DataContainer::Pointer dc = containerIter.next();
-
     QStandardItem* dcItem = new QStandardItem(dc->getName());
     rootItem->appendRow(dcItem);
 
@@ -176,14 +173,10 @@ void DataContainerArrayWidget::updateView()
     }
 
     // We found the proper Data Container, now populate the AttributeMatrix List
-    DataContainer::AttributeMatrixMap_t attrMats = dc->getAttributeMatrices();
-    QMapIterator<QString, AttributeMatrix::Pointer> attrMatsIter(attrMats);
     int row1 = 0;
-    while(attrMatsIter.hasNext())
+    for(const auto& am : dc->getChildren())
     {
-      attrMatsIter.next();
-      QString amName = attrMatsIter.key();
-      AttributeMatrix::Pointer am = attrMatsIter.value();
+      QString amName = am->getName();
 
       QStandardItem* amItem = new QStandardItem(am->getName());
       dcItem->appendRow(amItem);
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index d47081798c..7a3c8d3793 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -85,10 +85,10 @@ void DataStructureItemDelegate::createNewPathIcons()
   QImage daImage = baseImage.copy();
   QImage invalidImage = baseImage.copy();
 
-  QColor invalidColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataType::None);
-  QColor dcColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataType::DataContainer);
-  QColor amColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataType::AttributeMatrix);
-  QColor daColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPath::DataType::DataArray);
+  QColor invalidColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType::None);
+  QColor dcColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType::DataContainer);
+  QColor amColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType::AttributeMatrix);
+  QColor daColor = DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType::DataArray);
 
   int height = baseImage.height();
   int width = baseImage.width();
@@ -160,7 +160,7 @@ void DataStructureItemDelegate::setActiveFilter(AbstractFilter::Pointer filter)
 void DataStructureItemDelegate::setViewRequirements(DataContainerSelectionFilterParameter::RequirementType reqs)
 {
   m_DcReqs = reqs;
-  m_ReqType = DataArrayPath::DataType::DataContainer;
+  m_ReqType = DataArrayPathHelper::DataType::DataContainer;
 }
 
 // -----------------------------------------------------------------------------
@@ -169,7 +169,7 @@ void DataStructureItemDelegate::setViewRequirements(DataContainerSelectionFilter
 void DataStructureItemDelegate::setViewRequirements(AttributeMatrixSelectionFilterParameter::RequirementType reqs)
 {
   m_AmReqs = reqs;
-  m_ReqType = DataArrayPath::DataType::AttributeMatrix;
+  m_ReqType = DataArrayPathHelper::DataType::AttributeMatrix;
 }
 
 // -----------------------------------------------------------------------------
@@ -178,7 +178,7 @@ void DataStructureItemDelegate::setViewRequirements(AttributeMatrixSelectionFilt
 void DataStructureItemDelegate::setViewRequirements(DataArraySelectionFilterParameter::RequirementType reqs)
 {
   m_DaReqs = reqs;
-  m_ReqType = DataArrayPath::DataType::DataArray;
+  m_ReqType = DataArrayPathHelper::DataType::DataArray;
 }
 
 // -----------------------------------------------------------------------------
@@ -186,7 +186,7 @@ void DataStructureItemDelegate::setViewRequirements(DataArraySelectionFilterPara
 // -----------------------------------------------------------------------------
 void DataStructureItemDelegate::clearRequirements()
 {
-  m_ReqType = DataArrayPath::DataType::None;
+  m_ReqType = DataArrayPathHelper::DataType::None;
 }
 
 // -----------------------------------------------------------------------------
@@ -194,7 +194,7 @@ void DataStructureItemDelegate::clearRequirements()
 // -----------------------------------------------------------------------------
 bool DataStructureItemDelegate::isFiltered()
 {
-  return m_ReqType != DataArrayPath::DataType::None;
+  return m_ReqType != DataArrayPathHelper::DataType::None;
 }
 
 // -----------------------------------------------------------------------------
@@ -305,7 +305,7 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
     mousePos = dynamic_cast<QWidget*>(parent())->mapFromGlobal(mousePos);
   }
 
-  bool filterData = (m_ReqType != DataArrayPath::DataType::None);
+  bool filterData = (m_ReqType != DataArrayPathHelper::DataType::None);
   bool isCreatedPath = std::find(m_CreatedPaths.begin(), m_CreatedPaths.end(), path) != m_CreatedPaths.end();
 
   // Check for a corresponding icon
@@ -423,13 +423,13 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
 
     switch(path.getDataType())
     {
-    case DataArrayPath::DataType::DataContainer:
+    case DataArrayPathHelper::DataType::DataContainer:
       m_CreatedDcIcon.paint(painter, imgRect);
       break;
-    case DataArrayPath::DataType::AttributeMatrix:
+    case DataArrayPathHelper::DataType::AttributeMatrix:
       m_CreatedAmIcon.paint(painter, imgRect);
       break;
-    case DataArrayPath::DataType::DataArray:
+    case DataArrayPathHelper::DataType::DataArray:
       m_CreatedDaIcon.paint(painter, imgRect);
       break;
     default:
@@ -492,11 +492,11 @@ bool DataStructureItemDelegate::pathMatchesReqs(DataArrayPath path) const
 {
   switch(m_ReqType)
   {
-  case DataArrayPath::DataType::DataContainer:
+  case DataArrayPathHelper::DataType::DataContainer:
     return DataArrayPathSelectionWidget::CheckPathRequirements(m_Filter.get(), path, m_DcReqs);
-  case DataArrayPath::DataType::AttributeMatrix:
+  case DataArrayPathHelper::DataType::AttributeMatrix:
     return DataArrayPathSelectionWidget::CheckPathRequirements(m_Filter.get(), path, m_AmReqs);
-  case DataArrayPath::DataType::DataArray:
+  case DataArrayPathHelper::DataType::DataArray:
     return DataArrayPathSelectionWidget::CheckPathRequirements(m_Filter.get(), path, m_DaReqs);
   default:
     return false;
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
index 4c07303a48..c40430e94e 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
@@ -131,7 +131,7 @@ class DataStructureItemDelegate : public QStyledItemDelegate
 
   AbstractFilter::Pointer m_Filter = nullptr;
   std::list<DataArrayPath> m_CreatedPaths;
-  DataArrayPath::DataType m_ReqType = DataArrayPath::DataType::None;
+  DataArrayPathHelper::DataType m_ReqType = DataArrayPathHelper::DataType::None;
   DataContainerSelectionFilterParameter::RequirementType m_DcReqs;
   AttributeMatrixSelectionFilterParameter::RequirementType m_AmReqs;
   DataArraySelectionFilterParameter::RequirementType m_DaReqs;
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index a17f7e25d4..fa6afba18e 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -270,14 +270,11 @@ void DataStructureWidget::refreshData()
   }
 
   // Loop over the data containers
-  QList<DataContainer::Pointer> containers = m_Dca->getDataContainers();
+  DataContainerArray::Container containers = m_Dca->getDataContainers();
   QStandardItem* rootItem = model->invisibleRootItem();
-  QListIterator<DataContainer::Pointer> containerIter(containers);
 
-  while(containerIter.hasNext())
+  for(DataContainer::Pointer dc : containers)
   {
-    DataContainer::Pointer dc = containerIter.next();
-
     QStandardItem* dcItem = findChildByName(rootItem, dc->getName(), 0);
     if(dcItem == nullptr)
     {
@@ -332,14 +329,8 @@ void DataStructureWidget::refreshData()
     }
 
     // We found the proper Data Container, now populate the AttributeMatrix List
-    DataContainer::AttributeMatrixMap_t attrMats = dc->getAttributeMatrices();
-    QMapIterator<QString, AttributeMatrix::Pointer> attrMatsIter(attrMats);
-    while(attrMatsIter.hasNext())
+    for(const auto& am : dc->getChildren())
     {
-      attrMatsIter.next();
-      // QString amName = attrMatsIter.key();
-      AttributeMatrix::Pointer am = attrMatsIter.value();
-
       QStandardItem* amItem = findChildByName(dcItem, am->getName(), 0);
       if(amItem == nullptr)
       {
@@ -454,8 +445,8 @@ QStandardItem* DataStructureWidget::findChildByName(QStandardItem* rootItem, con
 // -----------------------------------------------------------------------------
 QStandardItem* DataStructureWidget::findItemByPath(DataArrayPath path)
 {
-  DataArrayPath::DataType dataType = path.getDataType();
-  if(dataType == DataArrayPath::DataType::None)
+  DataArrayPathHelper::DataType dataType = path.getDataType();
+  if(dataType == DataArrayPathHelper::DataType::None)
   {
     return nullptr;
   }
@@ -470,14 +461,14 @@ QStandardItem* DataStructureWidget::findItemByPath(DataArrayPath path)
   QStandardItem* rootItem = model->invisibleRootItem();
   QStandardItem* targetItem = nullptr;
   QStandardItem* dcItem = findChildByName(rootItem, path.getDataContainerName(), 0);
-  if(dataType == DataArrayPath::DataType::DataContainer)
+  if(dataType == DataArrayPathHelper::DataType::DataContainer)
   {
     targetItem = dcItem;
   }
   else
   {
     QStandardItem* amItem = findChildByName(dcItem, path.getAttributeMatrixName(), 0);
-    if(dataType == DataArrayPath::DataType::AttributeMatrix)
+    if(dataType == DataArrayPathHelper::DataType::AttributeMatrix)
     {
       targetItem = amItem;
     }
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 99feeae5a4..2d96b6c647 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -289,12 +289,12 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
   // Get the FilterWidgetManagere instance so we can instantiate new FilterParameterWidgets
   FilterWidgetManager* fwm = FilterWidgetManager::Instance();
   // Get a list of all the filterParameters from the filter.
-  QVector<FilterParameter::Pointer> filterParameters = filter->getFilterParameters();
+  FilterParameterVectorType filterParameters = filter->getFilterParameters();
   // Create all the FilterParameterWidget objects that can be displayed where ever the developer needs
   bool addSpacer = true;
 
   int pCount = 0, rCount = 0, cCount = 0;
-  for(QVector<FilterParameter::Pointer>::iterator iter = filterParameters.begin(); iter != filterParameters.end(); ++iter)
+  for(FilterParameterVectorType::iterator iter = filterParameters.begin(); iter != filterParameters.end(); ++iter)
   {
     FilterParameter* parameter = (*iter).get();
 
@@ -504,10 +504,10 @@ void FilterInputWidget::validateFileSystemFilterParameter(FilterParameter* param
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterInputWidget::linkConditionalWidgets(QVector<FilterParameter::Pointer>& filterParameters)
+void FilterInputWidget::linkConditionalWidgets(FilterParameterVectorType& filterParameters)
 {
   // Figure out if we have any "Linked Boolean Widgets" to hook up to other widgets
-  for(QVector<FilterParameter::Pointer>::iterator iter = filterParameters.begin(); iter != filterParameters.end(); ++iter)
+  for(FilterParameterVectorType::iterator iter = filterParameters.begin(); iter != filterParameters.end(); ++iter)
   {
     FilterParameter::Pointer filterParameter = (*iter);
     LinkedBooleanFilterParameter::Pointer filterParameterPtr = std::dynamic_pointer_cast<LinkedBooleanFilterParameter>(filterParameter);
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
index f155993e7b..ed28d07789 100755
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -131,7 +131,7 @@ class SVWidgetsLib_EXPORT FilterInputWidget : public QWidget
      * @brief linkConditionalWidgets
      * @param filterParameters
      */
-    void linkConditionalWidgets(QVector<FilterParameter::Pointer>& filterParameters);
+    void linkConditionalWidgets(FilterParameterVectorType& filterParameters);
 
   public:
     FilterInputWidget(const FilterInputWidget&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 86de250191..8782b91b21 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -450,17 +450,14 @@ void DataFormatPage::createAMSelectionMenu()
 
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
+  DataContainerArray::Container containers = dca->getDataContainers();
   QVector<QString> daTypes;// = m_FilterParameter->getDefaultAttributeArrayTypes();
   QVector<QVector<size_t>> cDims;// = m_FilterParameter->getDefaultComponentDimensions();
   QVector<AttributeMatrix::Type> amTypes;// = m_FilterParameter->getDefaultAttributeMatrixTypes();
   IGeometry::Types geomTypes;// = m_FilterParameter->getDefaultGeometryTypes();
 
-  QListIterator<DataContainer::Pointer> containerIter(containers);
-  while(containerIter.hasNext())
+  for(DataContainer::Pointer dc : containers)
   {
-    DataContainer::Pointer dc = containerIter.next();
-
     IGeometry::Pointer geom = IGeometry::NullPointer();
     IGeometry::Type geomType = IGeometry::Type::Unknown;
     if(nullptr != dc.get())
@@ -481,13 +478,9 @@ void DataFormatPage::createAMSelectionMenu()
     }
 
     // We found the proper Data Container, now populate the AttributeMatrix List
-    DataContainer::AttributeMatrixMap_t attrMats = dc->getAttributeMatrices();
-    QMapIterator<QString, AttributeMatrix::Pointer> attrMatsIter(attrMats);
-    while(attrMatsIter.hasNext())
+    for(const auto& am : dc->getChildren())
     {
-      attrMatsIter.next();
-      QString amName = attrMatsIter.key();
-      AttributeMatrix::Pointer am = attrMatsIter.value();
+      QString amName = am->getName();
 
       QAction* amAction = dcMenu->addAction(amName); // dcMenu owns the created action
       // QAction* action = new QAction(amName, dcMenu);
@@ -539,14 +532,11 @@ void DataFormatPage::createDCSelectionMenu()
 
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
-  QList<DataContainer::Pointer> containers = dca->getDataContainers();
+  DataContainerArray::Container containers = dca->getDataContainers();
   IGeometry::Types geomTypes;
 
-  QListIterator<DataContainer::Pointer> containerIter(containers);
-  while(containerIter.hasNext())
+  for(DataContainer::Pointer dc : containers)
   {
-    DataContainer::Pointer dc = containerIter.next();
-
     IGeometry::Pointer geom = IGeometry::NullPointer();
     IGeometry::Type geomType = IGeometry::Type::Unknown;
     if(nullptr != dc.get())
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index ae052fbd4e..e2dd2b4306 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -31,20 +31,17 @@ PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
 
 #include <utility>
 
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+
 #include "SIMPLib/Common/PhaseType.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
 #include "SIMPLib/FilterParameters/FileListInfo.h"
-#include "SIMPLib/FilterParameters/FloatVec2.h"
-#include "SIMPLib/FilterParameters/FloatVec3.h"
-#include "SIMPLib/FilterParameters/IntVec3.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-
-//#include "OrientationLib/OrientationMath/OrientationConverter.hpp"
 
 namespace py = pybind11;
 
@@ -143,15 +140,11 @@ PYBIND11_MODULE(dream3d, m)
   //
   //
   //
-  py::class_<FloatVec3_t>(mod, "FloatVec3")
-      .def(py::init<const float &, const float &, const float &>())
-  ;
-  py::class_<FloatVec2_t>(mod, "FloatVec2")
-	  .def(py::init<const float &, const float &>())
-  ;
-  py::class_<IntVec3_t>(mod, "IntVec3")
-      .def(py::init<const int &, const int &, const int &>())
-  ;
+  py::class_<FloatVec3Type>(mod, "FloatVec3Type").def(py::init<const float&, const float&, const float&>());
+  py::class_<FloatVec2Type>(mod, "FloatVec2Type").def(py::init<const float&, const float&>());
+  py::class_<IntVec3Type>(mod, "IntVec3Type").def(py::init<const int&, const int&, const int&>());
+
+  py::class_<SizeVec3Type>(mod, "SizeVec3Type").def(py::init<const size_t&, const size_t&, const size_t&>());
 
   py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
 	  .def(py::init< const float &, const float &, const float &, const float &>())

From 9db085c351bb5ad26a6a7289273927ab2461c338 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 29 Mar 2019 14:10:45 -0400
Subject: [PATCH 056/397] Update to SIMPL 2.0 and allow compiling against ITK 4
 or 5

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/ITK/itkDream3DITransformContainerToTransform.h | 7 ++-----
 Source/SIMPLib/ITK/itkDream3DImage.h                       | 4 ++++
 .../ITK/itkDream3DTransformContainerToTransform.hxx        | 5 +----
 Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h    | 4 ++--
 Source/SIMPLib/ITK/itkSupportConstants.h                   | 4 ++++
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 1001b9dd9c..75c4185c79 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -38,12 +38,9 @@
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkTransformBase.h"
 
+// SIMPL / ITK
 #include "SIMPLib/Geometry/ITransformContainer.h"
-
-#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
-#define ITKv5_CONST
-#endif
-
+#include "SIMPLib/ITK/itkSupportConstants.h"
 
 namespace itk
 {
diff --git a/Source/SIMPLib/ITK/itkDream3DImage.h b/Source/SIMPLib/ITK/itkDream3DImage.h
index 98b40f3440..0f36355f51 100644
--- a/Source/SIMPLib/ITK/itkDream3DImage.h
+++ b/Source/SIMPLib/ITK/itkDream3DImage.h
@@ -17,6 +17,7 @@
  *=========================================================================*/
 #pragma once
 
+// ITK Includes
 #include "itkDefaultPixelAccessor.h"
 #include "itkDefaultPixelAccessorFunctor.h"
 #include "itkFixedArray.h"
@@ -27,6 +28,9 @@
 #include "itkPoint.h"
 #include "itkWeakPointer.h"
 
+// SIMPLib/ITK includes
+#include "SIMPLib/ITK/itkSupportConstants.h"
+
 namespace itk
 {
 /** \class Dream3DImage
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
index e5d62fba96..69f8e0185e 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
@@ -33,12 +33,9 @@
 
 #pragma once
 
+#include "SIMPLib/ITK/itkSupportConstants.h"
 #include "itkDream3DTransformContainerToTransform.h"
 
-#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
-#define ITKv5_CONST
-#endif
-
 namespace itk
 {
 
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index fe8c9828df..c7697808b8 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -15,7 +15,8 @@
 
 namespace itk
 {
-template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream3DDataFilter : public ProcessObject
+template <typename PixelType, unsigned int VDimension>
+class InPlaceImageToDream3DDataFilter : public ProcessObject
 {
 public:
   /** Standard class typedefs. */
@@ -76,4 +77,3 @@ template <typename PixelType, unsigned int VDimension> class InPlaceImageToDream
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkInPlaceImageToDream3DDataFilter.hxx"
 #endif
-
diff --git a/Source/SIMPLib/ITK/itkSupportConstants.h b/Source/SIMPLib/ITK/itkSupportConstants.h
index aba3b47204..0b988bef88 100644
--- a/Source/SIMPLib/ITK/itkSupportConstants.h
+++ b/Source/SIMPLib/ITK/itkSupportConstants.h
@@ -45,6 +45,10 @@
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#define ITKv5_CONST
+#endif
+
 /**
  * @brief This namespace is used to define some Constants for the plugin itself.
  */

From 3da8bfd7397be6a13c6358a58961b5b1a0814bdc Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 2 Apr 2019 14:31:51 -0400
Subject: [PATCH 057/397] Fix for failing ApplyImageTransforms unit test.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/ApplyImageTransforms.cpp      |  2 +-
 .../Testing/Cxx/ApplyImageTransformsTest.cpp  | 50 ++++---------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index b2e615b4b2..95791ff42d 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -201,7 +201,7 @@ const QString ApplyImageTransforms::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 const QString ApplyImageTransforms::getBrandingString() const
 {
-  return "Processing";
+  return "SIMPLib Core Filter";
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
index 3477047a05..3aebf9cf51 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -6,19 +6,18 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/CoreFilters/ApplyImageTransforms.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class ApplyImageTransformsTest
 {
@@ -34,47 +33,18 @@ class ApplyImageTransformsTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  int TestFilterAvailability()
-  {
-    // Now instantiate the ApplyImageTransformsTest Filter from the FilterManager
-    QString filtName = "ApplyImageTransforms";
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
-    if (nullptr == filterFactory.get())
+    void TestFilterAvailability()
     {
-      std::stringstream ss;
-      ss << "The ApplyImageTransformsTest Requires the use of the " << filtName.toStdString()
-         << " filter which is found in the Processing Plugin";
-      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
+      ApplyImageTransforms::Pointer filter = ApplyImageTransforms::New();
+      filter->preflight();
     }
-    return 0;
-  }
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
   int TestApplyImageTransformsTest()
   {
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   /* Please write ApplyImageTransformsTest test code here.
-    *
-    * Your IO test files are:
-    * UnitTest::ApplyImageTransformsTest::TestFile1
-    * UnitTest::ApplyImageTransformsTest::TestFile2
-    *
-    * SIMPLib provides some macros that will throw exceptions when a test fails
-    * and thus report that during testing. These macros are located in the
-    * SIMPLib/Utilities/UnitTestSupport.hpp file. Some examples are:
-    *
-    * SIMPLib_REQUIRE_EQUAL(foo, 0)
-    * This means that if the variable foo is NOT equal to Zero then test will fail
-    * and the current test will exit immediately. If there are more tests registered
-    * with the SIMPLib_REGISTER_TEST() macro, the next test will execute. There are
-    * lots of examples in the SIMPLib/Test folder to look at.
-    */
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    int foo = -1;
+    int foo = 0;
     DREAM3D_REQUIRE_EQUAL(foo, 0)
 
     return EXIT_SUCCESS;

From 7a08f4ca86d5764fe7c04655043804d3d03be767 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 4 Apr 2019 17:40:57 -0400
Subject: [PATCH 058/397] Fix compile warnings when compiling against ITK 5
 about hidden methods through override

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h  | 3 ++-
 .../SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx   | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h   | 3 ++-
 Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index 332ce11b21..ff73f6c34c 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -37,6 +37,7 @@
 #include "itkSimpleDataObjectDecorator.h"
 
 #include "SIMPLib/Geometry/ITransformContainer.h"
+#include "SIMPLib/ITK/itkSupportConstants.h"
 
 namespace itk
 {
@@ -62,7 +63,7 @@ template <typename TParametersValueType, unsigned int CompositeNDimensions> clas
   TransformToDream3DITransformContainer();
   ~TransformToDream3DITransformContainer() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
index f5ef1578ec..172a58f10b 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
@@ -84,7 +84,7 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
 void
 TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_Transform)
   {
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
index 5ec75b8935..5eb71b9b45 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
@@ -37,6 +37,7 @@
 #include "itkSimpleDataObjectDecorator.h"
 
 #include "SIMPLib/Geometry/TransformContainer.h"
+#include "SIMPLib/ITK/itkSupportConstants.h"
 
 namespace itk
 {
@@ -61,7 +62,7 @@ template <typename ITKTransformType> class TransformToDream3DTransformContainer
   TransformToDream3DTransformContainer();
   ~TransformToDream3DTransformContainer() override;
 
-  void VerifyPreconditions();
+  void VerifyPreconditions() ITKv5_CONST;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
index 63b14c58ce..1b3c40f3d8 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
@@ -83,7 +83,7 @@ TransformToDream3DTransformContainer<ITKTransformType>
 template <typename ITKTransformType>
 void
 TransformToDream3DTransformContainer<ITKTransformType>
-::VerifyPreconditions()
+::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_Transform)
   {

From 05e462b5c4777121140163da3392a991950fc7ff Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 5 Apr 2019 13:18:43 -0400
Subject: [PATCH 059/397] Feature/MessagesRedesign (#333)

* Replacing PipelineMessage API with an AbstractMessage superclass and subclasses for every type of message. This eliminates the need for the MessageType enumeration.

* Implementing a new, cleaner and more reusable API that observers can implement to be able to process specific types of messages. Take a look at the IssuesWidget and IssuesWidgetMessageHandler for a good example of this. Observers can decide which types of messages they are interested in by subclassing the AbstractMessageHandler class and reimplement the appropriate processMessage() methods.

* Passing AbstractMessages from observable object to observer object using a shared pointer instead of by value. This allows observers to store the messages with all the relevant subclass data if they prefer.

* Eliminating the use of humanLabel in Observable's and AbstractFilter's notify****Message method parameters. In AbstractFilter, these methods already set the human label into the message.

* It is no longer necessary to set error and warning codes outside of the setErrorCondition and setWarningCondition methods. These methods will automatically set the code to the integer that is passed in.

* Filters that emit progress messages while they are in an executing pipeline have their progress values automatically converted into overall pipeline progress values and re-emitted as pipeline progress messages. This allows filters to update the overall progress of the pipeline while they are running. Check out FilterPipelineMessageHandler at the top of the FilterPipeline implementation file.
---
 Source/PipelineRunner/PipelineRunner.cpp      |   2 +-
 Source/SIMPLib/CMakeLists.txt                 |   2 +-
 Source/SIMPLib/Common/IObserver.cpp           |  30 +-
 Source/SIMPLib/Common/IObserver.h             |   4 +-
 Source/SIMPLib/Common/Observable.cpp          |  67 +++--
 Source/SIMPLib/Common/Observable.h            |  40 +--
 Source/SIMPLib/Common/Observer.cpp            |   2 +-
 Source/SIMPLib/Common/Observer.h              |   4 +-
 Source/SIMPLib/Common/PipelineMessage.cpp     | 228 --------------
 Source/SIMPLib/Common/PipelineMessage.h       | 144 ---------
 Source/SIMPLib/Common/SourceList.cmake        |   4 -
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  28 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |   4 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |  17 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  87 ++----
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   6 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |  21 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |  39 ++-
 .../CoreFilters/ConditionalSetValue.cpp       |  28 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  36 +--
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |  22 +-
 .../CopyFeatureArrayToElementArray.cpp        |  24 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  28 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |  17 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |  41 +--
 .../CoreFilters/CreateDataContainer.cpp       |  10 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  27 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  86 ++----
 .../CoreFilters/CreateImageGeometry.cpp       |  18 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |  26 +-
 .../CoreFilters/CropVertexGeometry.cpp        |  33 +-
 .../CoreFilters/DataContainerReader.cpp       |  31 +-
 .../CoreFilters/DataContainerWriter.cpp       |  36 +--
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   3 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |  49 ++-
 .../ExtractAttributeArraysFromGeometry.cpp    |  43 ++-
 .../CoreFilters/ExtractComponentAsArray.cpp   |  24 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |  40 +--
 .../CoreFilters/FeatureCountDecision.cpp      |  10 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |  18 +-
 Source/SIMPLib/CoreFilters/FileReader.cpp     |   6 +-
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |  19 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   | 109 +++++--
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |   7 +
 .../CoreFilters/GenerateColorTable.cpp        |  16 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |  47 ++-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  38 +--
 Source/SIMPLib/CoreFilters/InitializeData.cpp |  54 ++--
 .../LinkFeatureMapToElementArray.cpp          |  18 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |  10 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |  13 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  26 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  26 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |  34 +--
 .../CoreFilters/MultiThresholdObjects2.cpp    |  32 +-
 .../CoreFilters/PipelineAnnotation.cpp        |  10 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |  20 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |  40 +--
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |  39 +--
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |  18 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |  24 +-
 .../CoreFilters/RenameAttributeArray.cpp      |  28 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |  18 +-
 .../CoreFilters/RenameDataContainer.cpp       |  18 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |  30 +-
 .../CoreFilters/RequiredZThickness.cpp        |  28 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  14 +-
 .../SetOriginResolutionImageGeom.cpp          |  12 +-
 .../CoreFilters/SplitAttributeArray.cpp       |  23 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |  36 +--
 .../Cxx/CombineAttributeArraysTest.cpp        |   6 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |   6 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   4 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |   2 +-
 .../Testing/Cxx/ConvertDataTest.cpp           |   6 +-
 .../CopyFeatureArrayToElementArrayTest.cpp    |   2 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |   2 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |  12 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       |  16 +-
 .../Testing/Cxx/CreateDataContainerTest.cpp   |   6 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |   2 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |  10 +-
 .../Testing/Cxx/CreateStringArrayTest.cpp     |  10 +-
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |   2 +-
 .../Testing/Cxx/DataContainerTest.cpp         |  70 ++---
 .../Testing/Cxx/ErrorMessageTest.cpp          |  34 +--
 .../Testing/Cxx/ExecuteProcessTest.cpp        |  69 +++--
 ...ExtractAttributeArraysFromGeometryTest.cpp |  14 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |  10 +-
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |  22 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |   4 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   4 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   4 +-
 .../Testing/Cxx/ImportAsciDataArrayTest.cpp   |   8 +-
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |  30 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |   4 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   4 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   4 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   4 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |  28 +-
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |  20 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |  18 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |  12 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |  10 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |  10 +-
 .../Testing/Cxx/ReplaceValueTest.cpp          |   4 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |  10 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |  12 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   8 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |   6 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |  20 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   2 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  82 ++---
 .../CoreFilters/WriteTriangleGeometry.cpp     |  36 +--
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  42 +--
 .../SIMPLib/DataContainers/DataContainer.cpp  |  21 +-
 Source/SIMPLib/DataContainers/DataContainer.h |   6 +-
 .../DataContainers/DataContainerArray.cpp     |   8 +-
 .../DataContainers/DataContainerArray.h       |  78 ++---
 .../DynamicTableFilterParameter.cpp           |   1 -
 .../H5FilterParametersReader.cpp              |   7 +-
 .../H5FilterParametersWriter.cpp              |   7 +-
 .../JsonFilterParametersReader.cpp            | 100 ++++---
 .../JsonFilterParametersWriter.cpp            |   4 +-
 .../Filtering/AbstractDecisionFilter.cpp      |  10 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |  64 ++--
 Source/SIMPLib/Filtering/AbstractFilter.h     |  76 ++---
 Source/SIMPLib/Filtering/FilterPipeline.cpp   | 281 +++++++++---------
 Source/SIMPLib/Filtering/FilterPipeline.h     |  63 +++-
 .../Filtering/QMetaObjectUtilities.cpp        |   3 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   5 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |   5 +-
 Source/SIMPLib/Geometry/IGeometry.cpp         |  52 +---
 Source/SIMPLib/Geometry/IGeometry.h           |  42 ---
 Source/SIMPLib/Geometry/ImageGeom.cpp         |   5 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   5 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   5 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   5 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   5 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   3 -
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 255 ++++++++--------
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  20 +-
 Source/SIMPLib/ITK/itkReadImageImpl.hpp       |   6 +-
 .../SIMPLib/Messages/AbstractErrorMessage.h   |  85 ++++++
 Source/SIMPLib/Messages/AbstractMessage.cpp   |  57 ++++
 Source/SIMPLib/Messages/AbstractMessage.h     |  83 ++++++
 .../Messages/AbstractMessageHandler.cpp       | 159 ++++++++++
 .../SIMPLib/Messages/AbstractMessageHandler.h |  81 +++++
 .../Messages/AbstractProgressMessage.h        |  87 ++++++
 .../SIMPLib/Messages/AbstractStatusMessage.h  |  83 ++++++
 .../SIMPLib/Messages/AbstractWarningMessage.h |  87 ++++++
 .../SIMPLib/Messages/FilterErrorMessage.cpp   |  89 ++++++
 Source/SIMPLib/Messages/FilterErrorMessage.h  |  94 ++++++
 .../Messages/FilterProgressMessage.cpp        |  89 ++++++
 .../SIMPLib/Messages/FilterProgressMessage.h  |  94 ++++++
 .../SIMPLib/Messages/FilterStatusMessage.cpp  |  88 ++++++
 Source/SIMPLib/Messages/FilterStatusMessage.h |  93 ++++++
 .../SIMPLib/Messages/FilterWarningMessage.cpp |  89 ++++++
 .../SIMPLib/Messages/FilterWarningMessage.h   |  94 ++++++
 .../SIMPLib/Messages/GenericErrorMessage.cpp  |  86 ++++++
 Source/SIMPLib/Messages/GenericErrorMessage.h |  85 ++++++
 .../Messages/GenericProgressMessage.cpp       |  86 ++++++
 .../SIMPLib/Messages/GenericProgressMessage.h |  85 ++++++
 .../SIMPLib/Messages/GenericStatusMessage.cpp |  85 ++++++
 .../SIMPLib/Messages/GenericStatusMessage.h   |  85 ++++++
 .../Messages/GenericWarningMessage.cpp        |  86 ++++++
 .../SIMPLib/Messages/GenericWarningMessage.h  |  86 ++++++
 .../SIMPLib/Messages/PipelineErrorMessage.cpp |  88 ++++++
 .../SIMPLib/Messages/PipelineErrorMessage.h   |  89 ++++++
 .../Messages/PipelineProgressMessage.cpp      |  87 ++++++
 .../Messages/PipelineProgressMessage.h        |  89 ++++++
 .../Messages/PipelineStatusMessage.cpp        |  86 ++++++
 .../SIMPLib/Messages/PipelineStatusMessage.h  |  88 ++++++
 .../Messages/PipelineWarningMessage.cpp       |  87 ++++++
 .../SIMPLib/Messages/PipelineWarningMessage.h |  89 ++++++
 Source/SIMPLib/Messages/SourceList.cmake      |  68 +++++
 Source/SIMPLib/REST/PipelineListener.cpp      | 168 ++---------
 Source/SIMPLib/REST/PipelineListener.h        |  32 +-
 .../REST/PipelineListenerMessageHandler.cpp   | 163 ++++++++++
 .../REST/PipelineListenerMessageHandler.h     | 104 +++++++
 Source/SIMPLib/REST/SourceList.cmake          |   8 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |  28 +-
 .../ExecutePipelineController.cpp             |  51 +---
 .../V1Controllers/ExecutePipelineController.h |   2 +
 .../ExecutePipelineMessageHandler.cpp         | 102 +++++++
 .../ExecutePipelineMessageHandler.h           |  86 ++++++
 .../PreflightPipelineController.cpp           |  39 +--
 .../PreflightPipelineController.h             |   7 +
 .../PreflightPipelineMessageHandler.cpp       | 102 +++++++
 .../PreflightPipelineMessageHandler.h         |  87 ++++++
 .../TestFilters/ArraySelectionExample.cpp     |  10 +-
 .../TestFilters/ErrorWarningFilter.cpp        |  18 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |  11 +-
 Source/SIMPLib/TestFilters/FilterGroup01.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp  |  15 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp  |  15 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  10 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |  18 +-
 Source/SIMPLib/TestFilters/TestFilters.cpp    |  31 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |   9 +-
 .../Testing/Unused/VtkGrainIdIOTest.cpp       |   7 +-
 .../Utilities/FileSystemPathHelper.cpp        |  15 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |   4 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h  |   7 +-
 Source/SIMPLib/Utilities/TestObserver.cpp     |  24 +-
 Source/SIMPLib/Utilities/TestObserver.h       |  14 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |  15 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.h   |   4 +-
 .../Widgets/DataStructureWidget.h             |   1 -
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp  | 151 +---------
 Source/SVWidgetsLib/Widgets/IssuesWidget.h    |  19 +-
 .../Widgets/IssuesWidgetMessageHandler.cpp    | 167 +++++++++++
 .../Widgets/IssuesWidgetMessageHandler.h      |  90 ++++++
 Source/SVWidgetsLib/Widgets/PopUpWidget.h     |   4 +-
 .../SVWidgetsLib/Widgets/ProgressDialog.cpp   |  40 ++-
 Source/SVWidgetsLib/Widgets/ProgressDialog.h  |   8 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |  65 +---
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   6 +-
 Source/SVWidgetsLib/Widgets/SourceList.cmake  |   3 +-
 228 files changed, 5821 insertions(+), 3021 deletions(-)
 delete mode 100644 Source/SIMPLib/Common/PipelineMessage.cpp
 delete mode 100755 Source/SIMPLib/Common/PipelineMessage.h
 create mode 100755 Source/SIMPLib/Messages/AbstractErrorMessage.h
 create mode 100644 Source/SIMPLib/Messages/AbstractMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/AbstractMessage.h
 create mode 100644 Source/SIMPLib/Messages/AbstractMessageHandler.cpp
 create mode 100755 Source/SIMPLib/Messages/AbstractMessageHandler.h
 create mode 100755 Source/SIMPLib/Messages/AbstractProgressMessage.h
 create mode 100755 Source/SIMPLib/Messages/AbstractStatusMessage.h
 create mode 100755 Source/SIMPLib/Messages/AbstractWarningMessage.h
 create mode 100644 Source/SIMPLib/Messages/FilterErrorMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/FilterErrorMessage.h
 create mode 100644 Source/SIMPLib/Messages/FilterProgressMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/FilterProgressMessage.h
 create mode 100644 Source/SIMPLib/Messages/FilterStatusMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/FilterStatusMessage.h
 create mode 100644 Source/SIMPLib/Messages/FilterWarningMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/FilterWarningMessage.h
 create mode 100644 Source/SIMPLib/Messages/GenericErrorMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/GenericErrorMessage.h
 create mode 100644 Source/SIMPLib/Messages/GenericProgressMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/GenericProgressMessage.h
 create mode 100644 Source/SIMPLib/Messages/GenericStatusMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/GenericStatusMessage.h
 create mode 100644 Source/SIMPLib/Messages/GenericWarningMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/GenericWarningMessage.h
 create mode 100644 Source/SIMPLib/Messages/PipelineErrorMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/PipelineErrorMessage.h
 create mode 100644 Source/SIMPLib/Messages/PipelineProgressMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/PipelineProgressMessage.h
 create mode 100644 Source/SIMPLib/Messages/PipelineStatusMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/PipelineStatusMessage.h
 create mode 100644 Source/SIMPLib/Messages/PipelineWarningMessage.cpp
 create mode 100755 Source/SIMPLib/Messages/PipelineWarningMessage.h
 create mode 100755 Source/SIMPLib/Messages/SourceList.cmake
 create mode 100644 Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
 create mode 100644 Source/SIMPLib/REST/PipelineListenerMessageHandler.h
 create mode 100644 Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.cpp
 create mode 100644 Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
 create mode 100644 Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.cpp
 create mode 100644 Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
 create mode 100755 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
 create mode 100755 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index eb9f2a4ddb..5ad9c87b6c 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -154,7 +154,7 @@ int main(int argc, char* argv[])
   }
   // Now actually execute the pipeline
   pipeline->execute();
-  err = pipeline->getErrorCondition();
+  err = pipeline->getErrorCode();
   if(err < 0)
   {
     std::cout << "Error Condition of Pipeline: " << err << std::endl;
diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index 732a265420..c25732fd2a 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -87,7 +87,7 @@ endMacro()
 
 #------------------------------------------------------------------------------
 # Set up the directories that are used for each Group
-set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math StatsData Utilities ITK)
+set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages StatsData Utilities ITK)
 set(SIMPL_Group_FILTERS_MODULES Filtering FilterParameters VTKUtils)
 set(SIMPL_Group_PLUGIN_MODULES Plugin)
 set(SIMPL_Group_REST_MODULES REST)
diff --git a/Source/SIMPLib/Common/IObserver.cpp b/Source/SIMPLib/Common/IObserver.cpp
index 994bfd205a..fdacb87c06 100644
--- a/Source/SIMPLib/Common/IObserver.cpp
+++ b/Source/SIMPLib/Common/IObserver.cpp
@@ -50,34 +50,10 @@ IObserver::~IObserver() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IObserver::processPipelineMessage(const PipelineMessage& pm)
+void IObserver::processPipelineMessage(const AbstractMessage::Pointer& pm)
 {
-  PipelineMessage msg = pm;
   QString str;
   QTextStream ss(&str);
-  if(msg.getType() == PipelineMessage::MessageType::Error)
-  {
-    ss << msg.generateErrorString();
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::Warning)
-  {
-    ss << msg.generateWarningString();
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::StatusMessage)
-  {
-    ss << msg.generateStatusString();
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::StandardOutputMessage)
-  {
-    ss << msg.generateStandardOutputString();
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::ProgressValue)
-  {
-    ss << msg.getProgressValue() << "%";
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::StatusMessageAndProgressValue)
-  {
-    ss << msg.getProgressValue() << msg.generateStatusString();
-  }
-  std::cout << msg.getFilterHumanLabel().toStdString() << ": " << str.toStdString() << std::endl;
+  ss << pm->generateMessageString();
+  std::cout << str.toStdString() << std::endl;
 }
diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
index 7d9811cec2..f55c2314ba 100755
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -38,7 +38,7 @@
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 class SIMPLib_EXPORT IObserver
 {
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT IObserver
     virtual ~IObserver();
     SIMPL_TYPE_MACRO(IObserver)
 
-    virtual void processPipelineMessage(const PipelineMessage& pm);
+    virtual void processPipelineMessage(const AbstractMessage::Pointer& pm);
 
   public:
     IObserver(const IObserver&) = delete;      // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index d921d9090f..9ae0734723 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -35,6 +35,11 @@
 
 #include "Observable.h"
 
+#include "SIMPLib/Messages/GenericErrorMessage.h"
+#include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -65,65 +70,79 @@ void Observable::operator=(const Observable&)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::broadcastPipelineMessage(const PipelineMessage& msg)
+void Observable::setErrorCondition(int code, const QString &messageText)
 {
-  emit filterGeneratedMessage(msg);
+  GenericErrorMessage::Pointer pm = GenericErrorMessage::New(messageText, code);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyErrorMessage(const QString& humanLabel, const QString& str, int code)
+void Observable::setErrorConditionWithPrefix(int code, const QString &prefix, const QString &messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateErrorMessage(getNameOfClass(), humanLabel, str, code);
-  emit filterGeneratedMessage(pm);
+  QString msg = messageText;
+  msg.prepend(tr("%1 - ").arg(prefix));
+
+  setErrorCondition(code, msg);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyStatusMessage(const QString& humanLabel, const QString& str)
+void Observable::setWarningCondition(int code, const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  emit filterGeneratedMessage(pm);
+  GenericWarningMessage::Pointer pm = GenericWarningMessage::New(messageText, code);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyStatusMessage(const QString& prefix, const QString& humanLabel, const QString& str)
+void Observable::setWarningConditionWithPrefix(int code, const QString &prefix, const QString &messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  pm.setPrefix(prefix);
-  emit filterGeneratedMessage(pm);
+  QString msg = messageText;
+  msg.prepend(tr("%1 - ").arg(prefix));
+
+  setWarningCondition(code, msg);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyStandardOutputMessage(const QString& humanLabel, int pipelineIndex, const QString& str)
+void Observable::notifyStatusMessage(const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStandardOutputMessage(humanLabel, pipelineIndex, str);
-  emit filterGeneratedMessage(pm);
+  GenericStatusMessage::Pointer pm = GenericStatusMessage::New(messageText);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyWarningMessage(const QString& humanLabel, const QString& str, int code)
+void Observable::notifyStatusMessageWithPrefix(const QString &prefix, const QString &messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateWarningMessage(getNameOfClass(), humanLabel, str, code);
-  emit filterGeneratedMessage(pm);
+  QString msg = messageText;
+  msg.prepend(tr("%1 - ").arg(prefix));
+
+  notifyStatusMessage(msg);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyProgressMessage(const QString& prefix, const QString& humanLabel, const QString& str, int progress)
+void Observable::notifyProgressMessage(int progress, const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  pm.setPrefix(prefix);
-  pm.setProgressValue(progress);
-  pm.setType(PipelineMessage::MessageType::StatusMessageAndProgressValue);
-  emit filterGeneratedMessage(pm);
+  GenericProgressMessage::Pointer pm = GenericProgressMessage::New(messageText, progress);
+  emit messageGenerated(pm);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Observable::notifyProgressMessageWithPrefix(int progress, const QString &prefix, const QString &messageText)
+{
+  QString msg = messageText;
+  msg.prepend(tr("%1: ").arg(prefix));
+
+  notifyProgressMessage(progress, msg);
 }
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index 8480156c43..ec8fd5b679 100755
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -40,7 +40,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 
 /**
@@ -55,7 +55,14 @@ class SIMPLib_EXPORT Observable : public QObject
 {
     Q_OBJECT
     PYB11_CREATE_BINDINGS(Observable)
-    PYB11_METHOD(void notifyErrorMessage ARGS humanLabel ss code)
+    PYB11_METHOD(void setErrorCondition ARGS code messageText)
+    PYB11_METHOD(void setErrorConditionWithPrefix ARGS code prefix messageText)
+    PYB11_METHOD(void setWarningCondition ARGS code messageText)
+    PYB11_METHOD(void setWarningConditionWithPrefix ARGS code prefix messageText)
+    PYB11_METHOD(void notifyStatusMessage ARGS messageText)
+    PYB11_METHOD(void notifyStatusMessageWithPrefix ARGS prefix messageText)
+    PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
+    PYB11_METHOD(void notifyProgressMessageWithPrefix ARGS progress prefix messageText)
 
   public:
     SIMPL_TYPE_MACRO(Observable)
@@ -69,38 +76,31 @@ class SIMPLib_EXPORT Observable : public QObject
     void operator=(const Observable&);
 
     // ------------------------------
-    // These are convenience methods that construct a @see PipelineMessage object and then 'emit' that object
+    // These are convenience methods that construct a @see AbstractMessage object and then 'emit' that object
     // ------------------------------
-    virtual void notifyErrorMessage(const QString& humanLabel, const QString& ss, int code);
+    virtual void setErrorCondition(int code, const QString& messageText);
 
-    virtual void notifyWarningMessage(const QString& humanLabel, const QString& ss, int code);
+    void setErrorConditionWithPrefix(int code, const QString &prefix, const QString& messageText);
 
-    virtual void notifyStatusMessage(const QString& humanLabel, const QString& ss);
+    virtual void setWarningCondition(int code, const QString& messageText);
 
-    virtual void notifyStandardOutputMessage(const QString& humanLabel, int pipelineIndex, const QString& ss);
+    void setWarningConditionWithPrefix(int code, const QString &prefix, const QString& messageText);
 
-    virtual void notifyStatusMessage(const QString& prefix, const QString& humanLabel, const QString& ss);
+    virtual void notifyStatusMessage(const QString& messageText);
 
-    virtual void notifyProgressMessage(const QString& prefix, const QString& humanLabel, const QString& str, int progress);
+    void notifyStatusMessageWithPrefix(const QString &prefix, const QString& messageText);
 
-  public slots:
-
-    /**
-     * @brief This method will cause this object to 'emit' the filterGeneratedMessage() signal. This is useful if other
-     * classes need the filter to emit an error or warning messge from a class that is not able to emit the proper signals
-     * or the class is not connected to anything that would receive the signals
-     * @param msg
-     */
-    void broadcastPipelineMessage(const PipelineMessage& msg);
+    virtual void notifyProgressMessage(int progress, const QString& messageText);
 
+    void notifyProgressMessageWithPrefix(int progress, const QString &prefix, const QString& messageText);
 
   signals:
 
     /**
-     * @brief filterGeneratedMessage This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
+     * @brief messageGenerated This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
      * @param msg
      */
-    void filterGeneratedMessage(const PipelineMessage& msg);
+    void messageGenerated(const AbstractMessage::Pointer& msg);
 };
 
 
diff --git a/Source/SIMPLib/Common/Observer.cpp b/Source/SIMPLib/Common/Observer.cpp
index 05936774cb..e4e2f3125a 100644
--- a/Source/SIMPLib/Common/Observer.cpp
+++ b/Source/SIMPLib/Common/Observer.cpp
@@ -50,7 +50,7 @@ Observer::~Observer() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observer::processPipelineMessage(const PipelineMessage& pm)
+void Observer::processPipelineMessage(const AbstractMessage::Pointer& pm)
 {
   // Just call the superclass
   IObserver::processPipelineMessage(pm);
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index db5aa2a174..fc0fae5605 100755
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -43,7 +43,7 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 /**
  * @class Observer Observer.h DREAM3D/Common/Observer.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
     ~Observer() override;
 
   public slots:
-    void processPipelineMessage(const PipelineMessage& pm) override;
+    void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
   public:
     Observer(const Observer&) = delete;       // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Common/PipelineMessage.cpp b/Source/SIMPLib/Common/PipelineMessage.cpp
deleted file mode 100644
index 589326c086..0000000000
--- a/Source/SIMPLib/Common/PipelineMessage.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#include "PipelineMessage.h"
-
-#include <QtCore/QMetaType>
-#include <QtCore/QString>
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage(const PipelineMessage& rhs)
-{
-  m_FilterClassName = rhs.m_FilterClassName;
-  m_FilterHumanLabel = rhs.m_FilterHumanLabel;
-  m_Prefix = rhs.m_Prefix;
-  m_Text = rhs.m_Text;
-  m_Code = rhs.m_Code;
-  m_Type = rhs.m_Type;
-  m_ProgressValue = rhs.m_ProgressValue;
-  m_PipelineIndex = rhs.m_PipelineIndex;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage(const QString& className, const char* msg, int code, MessageType msgType, int progress)
-: m_FilterClassName(className)
-, m_Text(msg)
-, m_Code(code)
-, m_Type(msgType)
-, m_ProgressValue(progress)
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage(const QString& className, const QString& msg, int code, MessageType msgType, int progress)
-: m_FilterClassName(className)
-, m_FilterHumanLabel("")
-, m_Text(msg)
-, m_Code(code)
-, m_Type(msgType)
-, m_ProgressValue(progress)
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage(const QString& className, const QString& humanLabel, const QString& msg, int code, MessageType msgType, int progress)
-: m_FilterClassName(className)
-, m_FilterHumanLabel(humanLabel)
-, m_Text(msg)
-, m_Code(code)
-, m_Type(msgType)
-, m_ProgressValue(progress)
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::PipelineMessage(const QString& humanLabel, int pipelineIndex, const QString& msg, MessageType msgType)
-: m_FilterHumanLabel(humanLabel)
-, m_Text(msg)
-, m_PipelineIndex(pipelineIndex)
-, m_Type(msgType)
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage PipelineMessage::CreateErrorMessage(const QString className, const QString humanLabel, const QString msg, int code)
-{
-  PipelineMessage em(className, humanLabel, msg, code, MessageType::Error, -1);
-  return em;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage PipelineMessage::CreateStatusMessage(const QString className, const QString humanLabel, const QString msg)
-{
-  PipelineMessage em(className, humanLabel, msg, 0, MessageType::StatusMessage, -1);
-  return em;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage PipelineMessage::CreateWarningMessage(const QString className, const QString humanLabel, const QString msg, int code)
-{
-  PipelineMessage em(className, humanLabel, msg, code, MessageType::Warning, -1);
-  return em;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage PipelineMessage::CreateStandardOutputMessage(const QString humanLabel, int pipelineIndex, const QString msg)
-{
-  PipelineMessage em(humanLabel, pipelineIndex, msg, MessageType::StandardOutputMessage);
-  return em;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PipelineMessage::~PipelineMessage() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool PipelineMessage::operator==(const PipelineMessage& rhs)
-{
-  return (m_FilterClassName == rhs.m_FilterClassName && m_Prefix == rhs.m_Prefix && m_FilterHumanLabel == rhs.m_FilterHumanLabel && m_Text == rhs.m_Text && m_Code == rhs.m_Code &&
-          m_Type == rhs.m_Type && m_ProgressValue == rhs.m_ProgressValue && m_PipelineIndex == rhs.m_PipelineIndex);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PipelineMessage::operator=(const PipelineMessage& rhs)
-{
-  m_FilterClassName = rhs.m_FilterClassName;
-  m_Prefix = rhs.m_Prefix;
-  m_FilterHumanLabel = rhs.m_FilterHumanLabel;
-  m_Text = rhs.m_Text;
-  m_Code = rhs.m_Code;
-  m_Type = rhs.m_Type;
-  m_ProgressValue = rhs.m_ProgressValue;
-  m_PipelineIndex = rhs.m_PipelineIndex;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineMessage::generateErrorString() const
-{
-  QString ss = QObject::tr("Error (%1): %2: %3").arg(m_Code).arg(m_Prefix).arg(m_Text);
-  return ss;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineMessage::generateWarningString() const
-{
-  QString ss = QObject::tr("Warning (%1): %2: %3").arg(m_Code).arg(m_Prefix).arg(m_Text);
-  return ss;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineMessage::generateStatusString() const
-{
-  if(m_Prefix.isEmpty())
-  {
-    QString ss = QObject::tr("%2").arg(m_Text);
-    return ss;
-  }
-
-  QString ss = QObject::tr("%1: %2").arg(m_Prefix).arg(m_Text);
-  return ss;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineMessage::generateProgressString() const
-{
-  if(m_Prefix.isEmpty())
-  {
-    QString ss = QObject::tr("%1 %2%%").arg(m_Text).arg(m_ProgressValue);
-    return ss;
-  }
-
-  QString ss = QObject::tr("%1: %2 %3%%").arg(m_Prefix).arg(m_Text).arg(m_ProgressValue);
-  return ss;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineMessage::generateStandardOutputString() const
-{
-  return m_Text;
-}
diff --git a/Source/SIMPLib/Common/PipelineMessage.h b/Source/SIMPLib/Common/PipelineMessage.h
deleted file mode 100755
index 104190a972..0000000000
--- a/Source/SIMPLib/Common/PipelineMessage.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include <QtCore/QString>
-#include <QtCore/QMetaType>
-
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
-
-/**
- * @class PipelineMessage PipelineMessage.h DREAM3DLib/Common/PipelineMessage.h
- * @brief This class enables the creation of Error, Warning, and Status messages that
- * can be sent up from filters to the DREAM3D GUI.
- */
-class SIMPLib_EXPORT PipelineMessage
-{
-  public:
-    using EnumType = unsigned int;
-
-    enum class MessageType : EnumType
-    {
-      Error = 0,
-      Warning = 1,
-      StatusMessage = 2,
-      StandardOutputMessage = 3,
-      ProgressValue = 4,
-      StatusMessageAndProgressValue = 5,
-      UnknownMessageType = 6
-    };
-
-    PipelineMessage();
-
-    PipelineMessage(const PipelineMessage& rhs);
-
-    PipelineMessage(const QString& className, const char* msg, int code, MessageType msgType = MessageType::UnknownMessageType, int progress = -1);
-
-    PipelineMessage(const QString& className, const QString& msg, int code, MessageType msgType = MessageType::UnknownMessageType, int progress = -1);
-    PipelineMessage(const QString& className, const QString& humanLabel, const QString& msg, int code, MessageType msgType = MessageType::UnknownMessageType, int progress = -1);
-
-    PipelineMessage(const QString& humanLabel, int pipelineIndex, const QString& msg, MessageType msgType = MessageType::UnknownMessageType);
-
-    static PipelineMessage CreateErrorMessage(const QString className, const QString humanLabel, const QString msg, int code);
-
-    static PipelineMessage CreateStatusMessage(const QString className, const QString humanLabel, const QString msg);
-
-    static PipelineMessage CreateWarningMessage(const QString className, const QString humanLabel, const QString msg, int code);
-
-    static PipelineMessage CreateStandardOutputMessage(const QString humanLabel, int pipelineIndex, const QString msg);
-
-
-    SIMPL_TYPE_MACRO(PipelineMessage)
-
-    virtual ~PipelineMessage();
-
-    bool operator==(const PipelineMessage& rhs);
-
-    void operator=(const PipelineMessage& rhs);
-
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterClassName)
-
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterHumanLabel)
-
-    SIMPL_INSTANCE_STRING_PROPERTY(Prefix)
-
-    SIMPL_INSTANCE_STRING_PROPERTY(Text)
-
-    SIMPL_INSTANCE_PROPERTY(int, Code)
-
-    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
-
-    SIMPL_INSTANCE_PROPERTY(MessageType, Type)
-
-    SIMPL_INSTANCE_PROPERTY(int, ProgressValue)
-
-    /**
-     * @brief This method creates and returns a string for error messages
-     */
-    QString generateErrorString() const;
-
-    /**
-     * @brief This method creates and returns a string for warning messages
-     */
-    QString generateWarningString() const;
-
-    /**
-     * @brief This method creates and returns a string for status messages
-     */
-    QString generateStatusString() const;
-
-    /**
-     * @brief This method creates and returns a string for standard output messages
-     */
-    QString generateStandardOutputString() const;
-
-    /**
-     * @brief This method generates a status message that includes a progress value.
-     * @return
-     */
-    QString generateProgressString() const;
-
-
-  private:
-
-};
-
-
-Q_DECLARE_METATYPE(PipelineMessage)
-
-
diff --git a/Source/SIMPLib/Common/SourceList.cmake b/Source/SIMPLib/Common/SourceList.cmake
index 4b5dd029a9..00c1558c1c 100755
--- a/Source/SIMPLib/Common/SourceList.cmake
+++ b/Source/SIMPLib/Common/SourceList.cmake
@@ -19,12 +19,10 @@ set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPER
 
 set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AppVersion.h
-
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Constants.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/CreatedArrayHelpIndexEntry.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IObserver.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.h
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineMessage.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibDLLExport.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibSetGetMacros.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ScopedFileMonitor.hpp
@@ -36,7 +34,6 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AppVersion.cpp
-
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/CreatedArrayHelpIndexEntry.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DocRequestManager.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/EnsembleInfo.cpp
@@ -44,7 +41,6 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Observable.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Observer.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.cpp
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineMessage.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeType.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TemplateHelpers.cpp
 
diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 8cfb4dbadc..42be46c80a 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -93,8 +93,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
   else
   {
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedDataType);
-    f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
+    f->setErrorCondition(Errors::UnsupportedDataType, msg);
   }
   return ptr;
 }
@@ -144,8 +143,7 @@ IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f,
     break;
   default:
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeEnums::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedDataType);
-    f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
+    f->setErrorCondition(Errors::UnsupportedDataType, msg);
     break;
   }
   return ptr;
@@ -217,8 +215,7 @@ IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const QV
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedDataType);
-    f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
+    f->setErrorCondition(Errors::UnsupportedDataType, msg);
   }
   return ptr;
 }
@@ -284,8 +281,7 @@ IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector
   else
   {
     QString msg = QObject::tr("The created array is of unsupported type.");
-    f->setErrorCondition(Errors::UnsupportedDataType);
-    f->notifyErrorMessage(f->getHumanLabel(), msg, f->getErrorCondition());
+    f->setErrorCondition(Errors::UnsupportedDataType, msg);
   }
   return ptr;
 }
@@ -295,27 +291,24 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
 {
   IDataArrayShPtr retPtr = IDataArray::NullPointer();
   DataContainer::Pointer volDataCntr = f->getDataContainerArray()->getPrereqDataContainer(f, arrayPath.getDataContainerName(), false);
-  if(f->getErrorCondition() < 0 || nullptr == volDataCntr)
+  if(f->getErrorCode() < 0 || nullptr == volDataCntr)
   {
     QString ss = QObject::tr("The Data Container '%1' does not exist").arg(arrayPath.getDataContainerName());
-    f->setErrorCondition(Errors::MissingDataContainer);
-    f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
+    f->setErrorCondition(Errors::MissingDataContainer, ss);
     return retPtr;
   }
   AttributeMatrix::Pointer cell_attr_matrix = volDataCntr->getPrereqAttributeMatrix(f, arrayPath.getAttributeMatrixName(), Errors::MissingAttributeMatrix);
-  if(f->getErrorCondition() < 0 || nullptr == cell_attr_matrix.get())
+  if(f->getErrorCode() < 0 || nullptr == cell_attr_matrix.get())
   {
     QString ss = QObject::tr("The Attribute Matrix '%1' does not exist").arg(arrayPath.getAttributeMatrixName());
-    f->setErrorCondition(Errors::MissingAttributeMatrix);
-    f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
+    f->setErrorCondition(Errors::MissingAttributeMatrix, ss);
     return retPtr;
   }
   IDataArrayShPtr templ_ptr = cell_attr_matrix->getAttributeArray(arrayPath.getDataArrayName());
   if(nullptr == templ_ptr.get())
   {
     QString ss = QObject::tr("The input array '%1' was not found in the AttributeMatrix '%2'.").arg(arrayPath.getDataArrayName()).arg(arrayPath.getAttributeMatrixName());
-    f->setErrorCondition(Errors::MissingArray);
-    f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
+    f->setErrorCondition(Errors::MissingArray, ss);
     return retPtr;
   }
   if(compDims.isEmpty())
@@ -378,8 +371,7 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
                      .arg(arrayPath.getDataArrayName())
                      .arg(i_data_array->getTypeAsString())
                      .arg(SIMPL::TypeNames::SupportedTypeList);
-    f->setErrorCondition(Errors::UnsupportedDataType);
-    f->notifyErrorMessage(f->getHumanLabel(), ss, f->getErrorCondition());
+    f->setErrorCondition(Errors::UnsupportedDataType, ss);
   }
   return retPtr;
 }
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index df1468ba03..bf9abc6181 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -107,7 +107,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                    \
   }
 
 #define EXECUTE_TEMPLATE(observableObj, templateName, inputData, ...)                                                                                                                                  \
@@ -173,7 +173,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->notifyErrorMessage(#templateName, "The input array was of unsupported type", TemplateHelpers::Errors::UnsupportedDataType);                                                             \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                    \
   }
 
 /**
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 95791ff42d..4515f4cbdb 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -62,8 +62,8 @@ ApplyImageTransforms::~ApplyImageTransforms() = default;
 // -----------------------------------------------------------------------------
 void ApplyImageTransforms::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -88,15 +88,14 @@ void ApplyImageTransforms::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void ApplyImageTransforms::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   int selectedDCCount = getImageDataContainers().size();
   if(selectedDCCount < 1)
   {
-    setErrorCondition(-11001);
     QString ss = QObject::tr("At least one Data Container must be selected");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11001, ss);
     return;
   }
 
@@ -105,7 +104,7 @@ void ApplyImageTransforms::dataCheck()
     QString dcName = m_ImageDataContainers[i];
 
     ImageGeom::Pointer imageGeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, dcName);
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -133,7 +132,7 @@ void ApplyImageTransforms::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -172,7 +171,7 @@ void ApplyImageTransforms::execute()
     }
   }
 
-  notifyStatusMessage(getHumanLabel(), "Complete");
+  notifyStatusMessage("Complete");
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 56d489752d..11438f2573 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -223,11 +223,11 @@ void ArrayCalculator::initialize()
 // -----------------------------------------------------------------------------
 void ArrayCalculator::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, -301);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -235,8 +235,7 @@ void ArrayCalculator::dataCheck()
   if(m_InfixEquation.isEmpty() || m_InfixEquation.split(" ", QString::SkipEmptyParts).empty())
   {
     QString ss = QObject::tr("The infix expression is empty");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::EMPTY_EQUATION));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::EMPTY_EQUATION), ss);
     return;
   }
 
@@ -254,17 +253,15 @@ void ArrayCalculator::dataCheck()
     int errInt = static_cast<int>(err);
     if(errInt < 0)
     {
-      setErrorCondition(errInt);
-      notifyErrorMessage(getHumanLabel(), errMsg, getErrorCondition());
+      setErrorCondition(errInt, errMsg);
       return;
     }
   }
 
   if(!m_CalculatedArray.isValid())
   {
-    setErrorCondition(-4675);
     QString ss = QObject::tr("The output path must be valid");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4675, ss);
     return;
   }
 
@@ -285,8 +282,7 @@ void ArrayCalculator::dataCheck()
         if(!cDims.isEmpty() && resultType == ICalculatorArray::ValueType::Array && cDims != array1->getArray()->getComponentDimensions())
         {
           QString ss = QObject::tr("Attribute Array symbols in the infix expression have mismatching component dimensions");
-          setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_COMP_DIMS));
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_COMP_DIMS), ss);
           return;
         }
 
@@ -304,8 +300,7 @@ void ArrayCalculator::dataCheck()
   if(resultType == ICalculatorArray::ValueType::Unknown)
   {
     QString ss = QObject::tr("The expression does not have any arguments that simplify down to a number.");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::NO_NUMERIC_ARGUMENTS));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::NO_NUMERIC_ARGUMENTS), ss);
     return;
   }
 
@@ -315,8 +310,7 @@ void ArrayCalculator::dataCheck()
   {
     QString ss = QObject::tr("The AttributeMatrix at %1/%2 was not found")
                      .arg(calculatedAMPath.getDataContainerName(), calculatedAMPath.getAttributeMatrixName());
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::LOST_ATTR_MATRIX));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::LOST_ATTR_MATRIX), ss);
     return;
   }
 
@@ -325,8 +319,7 @@ void ArrayCalculator::dataCheck()
   {
     QString ss = QObject::tr("The result of the chosen expression will be a numeric value or contain one tuple."
                              " This numeric value will be stored in an array with the number of tuples equal to 1");
-    setWarningCondition(static_cast<int>(CalculatorItem::WarningCode::NUMERIC_VALUE_WARNING));
-    notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+    setWarningCondition(static_cast<int>(CalculatorItem::WarningCode::NUMERIC_VALUE_WARNING), ss);
 
     if(calculatedAM->getNumberOfTuples() > 1)
     {
@@ -334,16 +327,14 @@ void ArrayCalculator::dataCheck()
                                " expression evaluates to an array with a tuple count of 1, which does not match the output attribute matrix"
                                " tuple count.")
                        .arg(calculatedAMPath.getDataContainerName(), calculatedAMPath.getAttributeMatrixName());
-      setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCORRECT_TUPLE_COUNT));
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCORRECT_TUPLE_COUNT), ss);
       return;
     }
   }
   else if(calculatedAM->getNumberOfTuples() != selectedAM->getNumberOfTuples())
   {
     QString ss = QObject::tr("The tuple count of the output Attribute Matrix is not equal to the tuple count of the selected Attribute Matrix");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCORRECT_TUPLE_COUNT));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCORRECT_TUPLE_COUNT), ss);
     return;
   }
 
@@ -390,8 +381,7 @@ void ArrayCalculator::dataCheck()
     break;
   default:
     QString ss = QObject::tr("The output array type is not valid.  No DataArray could be created.");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::InvalidOutputArrayType));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::InvalidOutputArrayType), ss);
     return;
   }
 }
@@ -414,10 +404,10 @@ void ArrayCalculator::preflight()
 // -----------------------------------------------------------------------------
 void ArrayCalculator::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -433,7 +423,7 @@ void ArrayCalculator::execute()
   int totalItems = rpn.size();
   for(int rpnCount = 0; rpnCount < totalItems; rpnCount++)
   {
-    notifyStatusMessage(getMessagePrefix(), getHumanLabel(), "Computing Operator " + QString::number(rpnCount + 1) + "/" + QString::number(totalItems));
+    notifyStatusMessage("Computing Operator " + QString::number(rpnCount + 1) + "/" + QString::number(totalItems));
 
     CalculatorItem::Pointer rpnItem = rpn[rpnCount];
     ICalculatorArray::Pointer calcArray = std::dynamic_pointer_cast<ICalculatorArray>(rpnItem);
@@ -448,7 +438,7 @@ void ArrayCalculator::execute()
       CalculatorOperator::Pointer rpnOperator = std::dynamic_pointer_cast<CalculatorOperator>(rpnItem);
 
       rpnOperator->calculate(this, m_CalculatedArray, m_ExecutionStack);
-      if(getErrorCondition() < 0)
+      if(getErrorCode() < 0)
       {
         return;
       }
@@ -465,8 +455,7 @@ void ArrayCalculator::execute()
   if(m_ExecutionStack.size() != 1)
   {
     QString ss = QObject::tr("The chosen infix equation is not a valid equation.");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_EQUATION));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_EQUATION), ss);
     return;
   }
   if(!m_ExecutionStack.isEmpty())
@@ -488,8 +477,7 @@ void ArrayCalculator::execute()
       if(!createdAM->insertOrAssign(resultTypeArray))
       {
         QString ss = QObject::tr("Error inserting Output Array into Attribute Matrix");
-        setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::AttributeMatrixInsertionError));
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::AttributeMatrixInsertionError), ss);
         return;
       }
     }
@@ -498,8 +486,7 @@ void ArrayCalculator::execute()
   {
     QString ss = QObject::tr("Unexpected output item from chosen infix expression; the output item must be an array\n"
                              "Please contact the DREAM.3D developers for more information");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::UNEXPECTED_OUTPUT));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::UNEXPECTED_OUTPUT), ss);
     return;
   }
 
@@ -754,8 +741,7 @@ QVector<CalculatorItem::Pointer> ArrayCalculator::parseInfixEquation()
       else
       {
         QString ss = QObject::tr("An unrecognized item '%1' was found in the chosen infix expression").arg(strItem);
-        setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::UNRECOGNIZED_ITEM));
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::UNRECOGNIZED_ITEM), ss);
         return QVector<CalculatorItem::Pointer>();
       }
     }
@@ -840,20 +826,17 @@ bool ArrayCalculator::parseIndexOperator(QString token, QVector<CalculatorItem::
   int errCode = static_cast<int>(CalculatorItem::ErrorCode::ORPHANED_COMPONENT);
   if(idx < 0)
   {
-    setErrorCondition(errCode);
-    notifyErrorMessage(getHumanLabel(), errorMsg, getErrorCondition());
+    setErrorCondition(errCode, errorMsg);
     return false;
   }
   if(!parsedInfix[idx]->isICalculatorArray())
   {
-    setErrorCondition(errCode);
-    notifyErrorMessage(getHumanLabel(), errorMsg, getErrorCondition());
+    setErrorCondition(errCode, errorMsg);
     return false;
   }
   if(parsedInfix[idx]->isNumber())
   {
-    setErrorCondition(errCode);
-    notifyErrorMessage(getHumanLabel(), errorMsg, getErrorCondition());
+    setErrorCondition(errCode, errorMsg);
     return false;
   }
 
@@ -865,8 +848,7 @@ bool ArrayCalculator::parseIndexOperator(QString token, QVector<CalculatorItem::
   if(!ok)
   {
     QString ss = QObject::tr("The chosen infix expression is not a valid expression");
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_COMPONENT));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_COMPONENT), ss);
     return false;
   }
 
@@ -874,8 +856,7 @@ bool ArrayCalculator::parseIndexOperator(QString token, QVector<CalculatorItem::
   if(nullptr != calcArray && index >= calcArray->getArray()->getNumberOfComponents())
   {
     QString ss = QObject::tr("'%1' has an component index that is out of range").arg(calcArray->getArray()->getName());
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::COMPONENT_OUT_OF_RANGE));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::COMPONENT_OUT_OF_RANGE), ss);
     return false;
   }
 
@@ -937,8 +918,7 @@ bool ArrayCalculator::parseArray(QString token, QVector<CalculatorItem::Pointer>
   if(!selectedAM->getAttributeArrayNames().contains(token))
   {
     QString ss = QObject::tr("The item '%1' is not the name of any valid array in the selected Attribute Matrix").arg(token);
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_ARRAY_NAME));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INVALID_ARRAY_NAME), ss);
     return false;
   }
 
@@ -951,8 +931,7 @@ bool ArrayCalculator::parseArray(QString token, QVector<CalculatorItem::Pointer>
   else if(dataArray->getNumberOfTuples() != firstArray_NumTuples)
   {
     QString ss = QObject::tr("Arrays '%1' and '%2' in the infix expression have an inconsistent number of tuples").arg(firstArray_Name).arg(dataArray->getName());
-    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_TUPLES));
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_TUPLES), ss);
     return false;
   }
 
@@ -1043,8 +1022,7 @@ QVector<CalculatorItem::Pointer> ArrayCalculator::toRPN(QVector<CalculatorItem::
     if(nullptr != std::dynamic_pointer_cast<LeftParenthesisItem>(item))
     {
       QString ss = QObject::tr("One or more parentheses are mismatched in the chosen infix expression '%1'").arg(m_InfixEquation);
-      setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::MISMATCHED_PARENTHESES));
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::MISMATCHED_PARENTHESES), ss);
       return QVector<CalculatorItem::Pointer>();
     }
 
@@ -1065,7 +1043,7 @@ void ArrayCalculator::checkForAmbiguousArrayName(QString strItem, QString warnin
   {
     int err = 0;
     AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, err);
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -1073,9 +1051,8 @@ void ArrayCalculator::checkForAmbiguousArrayName(QString strItem, QString warnin
     {
       IDataArray::Pointer dataArray = selectedAM->getAttributeArray(strItem);
 
-      setWarningCondition(static_cast<int>(CalculatorItem::WarningCode::AMBIGUOUS_NAME_WARNING));
       warningMsg.append("\nTo treat this item as an array name, please add double quotes around the item (i.e. \"" + strItem + "\").");
-      notifyWarningMessage(getHumanLabel(), warningMsg, getWarningCondition());
+      setWarningCondition(static_cast<int>(CalculatorItem::WarningCode::AMBIGUOUS_NAME_WARNING), warningMsg);
     }
   }
 }
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 87df51752e..aba88972a9 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -83,8 +83,8 @@ void Breakpoint::initialize()
 // -----------------------------------------------------------------------------
 void Breakpoint::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -119,7 +119,7 @@ void Breakpoint::pause()
 
   m_Mutex.lock();
   QString ss = "The pipeline is paused - Press \"Resume\" to continue execution.";
-  notifyStatusMessage(getMessagePrefix(), getHumanLabel(), ss);
+  notifyStatusMessage(ss);
   m_WaitCondition.wait(&m_Mutex);
   m_Mutex.unlock();
 }
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index e86c26dce3..0b6982b80e 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -225,8 +225,7 @@ template <typename DataType> void verifyArrayList(AbstractFilter* filter, QVecto
   {
     if(!TemplateHelpers::CanDynamicCast<DataArray<DataType>>()((*it).lock()))
     {
-      filter->setErrorCondition(-90000);
-      filter->notifyErrorMessage(filter->getHumanLabel(), "Selected Attribute Arrays must all be of the same type", filter->getErrorCondition());
+      filter->setErrorCondition(-90000, "Selected Attribute Arrays must all be of the same type");
       return;
     }
   }
@@ -246,14 +245,13 @@ void CombineAttributeArrays::dataCheck()
 {
   m_SelectedWeakPtrVector.clear();
 
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(getSelectedDataArrayPaths().size() < 2)
   {
-    setErrorCondition(-11001);
     QString ss = QObject::tr("At least two Attribute Array must be selected");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11001, ss);
     return;
   }
 
@@ -261,9 +259,8 @@ void CombineAttributeArrays::dataCheck()
 
   if(!DataArrayPath::ValidateVector(paths))
   {
-    setErrorCondition(-11002);
     QString ss = QObject::tr("There are Attribute Arrays selected that are not contained in the same Attribute Matrix. All selected Attribute Arrays must belong to the same Attribute Matrix");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11002, ss);
   }
 
   int32_t totalComps = 0;
@@ -283,7 +280,7 @@ void CombineAttributeArrays::dataCheck()
   {
     EXECUTE_FUNCTION_TEMPLATE(this, verifyArrayList, m_SelectedWeakPtrVector[0].lock(), this, m_SelectedWeakPtrVector)
   }
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -322,10 +319,10 @@ void CombineAttributeArrays::preflight()
 // -----------------------------------------------------------------------------
 void CombineAttributeArrays::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index cdf179ad37..850eea5388 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -153,12 +153,12 @@ void CombineAttributeMatrices::initialize()
 // -----------------------------------------------------------------------------
 void CombineAttributeMatrices::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   DataArrayPath tempPath;
 
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getFirstAttributeMatrixPath().getDataContainerName(), false);
-  if(getErrorCondition() < 0 || nullptr == m.get())
+  if(getErrorCode() < 0 || nullptr == m.get())
   {
     return;
   }
@@ -166,20 +166,18 @@ void CombineAttributeMatrices::dataCheck()
   if(getFirstAttributeMatrixPath().getDataContainerName().compare(getSecondAttributeMatrixPath().getDataContainerName()) != 0)
   {
     QString ss = QObject::tr("The selected attribute matrices must be in the same data container and currently are not");
-    setErrorCondition(-5557);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5557, ss);
   }
 
   if(getFirstAttributeMatrixPath().getAttributeMatrixName().compare(getSecondAttributeMatrixPath().getAttributeMatrixName()) == 0)
   {
     QString ss = QObject::tr("The selected attribute matrices must be different and currently are the same");
-    setErrorCondition(-5558);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5558, ss);
   }
 
   AttributeMatrix::Pointer firstAttrMat = m->getPrereqAttributeMatrix(this, getFirstAttributeMatrixPath().getAttributeMatrixName(), -301);
   AttributeMatrix::Pointer secondAttrMat = m->getPrereqAttributeMatrix(this, getSecondAttributeMatrixPath().getAttributeMatrixName(), -301);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -187,11 +185,10 @@ void CombineAttributeMatrices::dataCheck()
   if(firstAttrMat->getType() != secondAttrMat->getType())
   {
     QString ss = QObject::tr("The selected attribute matrices must be of the same type (ie Feature) and currently are not");
-    setErrorCondition(-5559);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5559, ss);
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -201,7 +198,7 @@ void CombineAttributeMatrices::dataCheck()
   size_t totalTuples = firstAttrMat->getNumberOfTuples() + secondAttrMat->getNumberOfTuples() - 1;
   QVector<size_t> tDims(1, totalTuples);
   m->createNonPrereqAttributeMatrix(this, getCombinedAttributeMatrixName(), tDims, firstAttrMat->getType(), CombinedMatrixID);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -214,7 +211,7 @@ void CombineAttributeMatrices::dataCheck()
   {
     m_FirstIndex = m_FirstIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -225,7 +222,7 @@ void CombineAttributeMatrices::dataCheck()
   {
     m_SecondIndex = m_SecondIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -236,7 +233,7 @@ void CombineAttributeMatrices::dataCheck()
   {
     tempPath.update(getFirstAttributeMatrixPath().getDataContainerName(), getCombinedAttributeMatrixName(), *iter);
     IDataArray::Pointer tmpDataArray = firstAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, *iter, -90001);
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       QVector<size_t> cDims = tmpDataArray->getComponentDimensions();
       TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, tmpDataArray);
@@ -247,7 +244,7 @@ void CombineAttributeMatrices::dataCheck()
   {
     tempPath.update(getSecondAttributeMatrixPath().getDataContainerName(), getCombinedAttributeMatrixName(), *iter);
     IDataArray::Pointer tmpDataArray = secondAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, *iter, -90001);
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       if(!fArrayNames.contains(*iter))
       {
@@ -263,7 +260,7 @@ void CombineAttributeMatrices::dataCheck()
   {
     m_NewIndex = m_NewIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -299,10 +296,10 @@ template <typename T> void copyData(IDataArray::Pointer fromData, IDataArray::Po
 // -----------------------------------------------------------------------------
 void CombineAttributeMatrices::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -332,7 +329,7 @@ void CombineAttributeMatrices::execute()
     else if(m_SecondIndex[i] > 0 && m_NewIndex[i] != 0)
     {
       QString ss = QObject::tr("When copying the indices, the indices of the two attribute matrices overlapped.  The index of the first attribute matrix was kept.");
-      notifyWarningMessage(getHumanLabel(), ss, -111);
+      setWarningCondition(-111, ss);
     }
   }
 
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index b4fe873e47..a376c5edcd 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -98,8 +98,7 @@ template <typename T> void checkValuesInt(AbstractFilter* filter, double replace
   if(!((replaceValue >= std::numeric_limits<T>::min()) && (replaceValue <= std::numeric_limits<T>::max())))
   {
     ss = QObject::tr("The %1 replace value was invalid. The valid range is %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-100);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-100, ss);
   }
 }
 
@@ -114,8 +113,7 @@ template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double
        ((replaceValue >= std::numeric_limits<T>::min()) && (replaceValue <= std::numeric_limits<T>::max()))))
   {
     ss = QObject::tr("The %1 replace value was invalid. The valid ranges are -%3 to -%2, 0, %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-101);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-101, ss);
   }
 }
 
@@ -154,17 +152,17 @@ void ConditionalSetValue::initialize()
 // -----------------------------------------------------------------------------
 void ConditionalSetValue::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QVector<DataArrayPath> dataArrayPaths;
 
   m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
-  if(getErrorCondition() >= 0)
+  if(getErrorCode() >= 0)
   {
     dataArrayPaths.push_back(getSelectedArrayPath());
   }
@@ -174,8 +172,7 @@ void ConditionalSetValue::dataCheck()
     QString ss = QObject::tr("Selected array '%1' must be a scalar array (1 component). The number of components is %2")
                      .arg(getSelectedArrayPath().getDataArrayName())
                      .arg(m_ArrayPtr.lock()->getNumberOfComponents());
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11002, ss);
     return;
   }
 
@@ -186,7 +183,7 @@ void ConditionalSetValue::dataCheck()
   {
     m_ConditionalArray = m_ConditionalArrayPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
-  if(getErrorCondition() >= 0)
+  if(getErrorCode() >= 0)
   {
     dataArrayPaths.push_back(getConditionalArrayPath());
   }
@@ -243,9 +240,8 @@ void ConditionalSetValue::dataCheck()
   }
   else
   {
-    setErrorCondition(-4060);
     QString ss = QObject::tr("Incorrect data scalar type");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4060, ss);
   }
 }
 
@@ -267,10 +263,10 @@ void ConditionalSetValue::preflight()
 // -----------------------------------------------------------------------------
 void ConditionalSetValue::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 8344d63d50..f39f0ed65f 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -262,34 +262,31 @@ void ConvertColorToGrayScale::initialize() { }
 // -----------------------------------------------------------------------------
 void ConvertColorToGrayScale::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   if(!DataArrayPath::ValidateVector(getInputDataArrayVector()))
   {
-    setErrorCondition(-62100);
     QString ss = QObject::tr("All Attribute Arrays must belong to the same Data Container and Attribute Matrix");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-62100, ss);
   }
 
   if(getOutputArrayPrefix().isEmpty())
   {
-    setErrorCondition(-62102);
     QString message = QObject::tr("Using a prefix (even a single alphanumeric value) is required so that the output Xdmf files can be written correctly");
-    notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+    setErrorCondition(-62102, message);
   }
 
   if(getInputDataArrayVector().isEmpty())
   {
-    setErrorCondition(-62103);
     QString message = QObject::tr("At least one Attribute Array must be selected");
-    notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+    setErrorCondition(-62103, message);
     return;
   }
 
   DataArrayPath inputAMPath = DataArrayPath::GetAttributeMatrixPath(getInputDataArrayVector());
 
   AttributeMatrix::Pointer inAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, inputAMPath, -301);
-  if(getErrorCondition() < 0 || nullptr == inAM.get())
+  if(getErrorCode() < 0 || nullptr == inAM.get())
   {
     return;
   }
@@ -304,7 +301,7 @@ void ConvertColorToGrayScale::dataCheck()
     QVector<size_t> tDims = inAM->getTupleDimensions();
 
     outAM = dc->createNonPrereqAttributeMatrix(this, getOutputAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
-    if(getErrorCondition() < 0 || nullptr == outAM.get())
+    if(getErrorCode() < 0 || nullptr == outAM.get())
     {
       return;
     }
@@ -320,7 +317,7 @@ void ConvertColorToGrayScale::dataCheck()
     QString newName = getOutputArrayPrefix() + arrayNames.at(i);
     inputAMPath.setDataArrayName(daName);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -338,9 +335,8 @@ void ConvertColorToGrayScale::dataCheck()
   {
     if(m_ColorChannel < 0 || m_ColorChannel > 2)
     {
-      setErrorCondition(-62104);
       QString message = QObject::tr("The color channel should be 0, 1 or 2");
-      notifyErrorMessage(getHumanLabel(), message, getErrorCondition());
+      setErrorCondition(-62104, message);
       return;
     }
   }
@@ -365,14 +361,14 @@ void ConvertColorToGrayScale::preflight()
 void ConvertColorToGrayScale::execute()
 {
   initialize();
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   QString ss;
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     ss = QObject::tr("DataCheck did not pass during execute");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-62106, ss);
     return;
   }
 
@@ -391,9 +387,8 @@ void ConvertColorToGrayScale::execute()
 
     if(nullptr == inputColorData.get())
     {
-      setErrorCondition(-62107);
       ss = QObject::tr("Input Color Data at ArrayPath '%1' was not available. This array will be skipped.").arg(arrayPath.serialize("/"));
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-62107, ss);
       continue;
     }
 
@@ -404,9 +399,8 @@ void ConvertColorToGrayScale::execute()
 
     if(nullptr == outputGrayData.get())
     {
-      setErrorCondition(-62108);
       ss = QObject::tr("Output Data at ArrayPath '%1' was not available. This array will be skipped.").arg(newPath.serialize("/"));
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-62108, ss);
       continue;
     }
 
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 879074b518..dc88e478b7 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -174,10 +174,9 @@ void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataConta
   }
   else
   {
-    filter->setErrorCondition(-399);
     QString ss =
         QString("Error Converting DataArray '%1/%2' from type %3 to type %4").arg(attributeMatrixName).arg(ptr->getName()).arg(static_cast<int>(ptr->getType())).arg(static_cast<int>(scalarType));
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-399, ss);
   }
 }
 } // End Namespace Detail
@@ -240,8 +239,8 @@ void ConvertData::initialize()
 // -----------------------------------------------------------------------------
 void ConvertData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getSelectedCellArrayPath().getDataContainerName(), false);
 
@@ -249,21 +248,20 @@ void ConvertData::dataCheck()
   if(m_OutputArrayName.isEmpty())
   {
     ss = QObject::tr("The output array name must be set");
-    setErrorCondition(-398);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-398, ss);
     return;
   }
 
   if(getInPreflight())
   {
     AttributeMatrix::Pointer cellAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedCellArrayPath, -301);
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
 
     IDataArray::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedCellArrayPath());
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -336,10 +334,10 @@ void ConvertData::preflight()
 // -----------------------------------------------------------------------------
 void ConvertData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -351,7 +349,7 @@ void ConvertData::execute()
 
   if (nullptr == iArray.get())
   {
-    setErrorCondition(-90002);
+    setErrorCondition(-90002, tr("Data Array '%1' does not exist.").arg(m_SelectedCellArrayPath.getDataArrayName()));
     return;
   }
 
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 30916e3194..bd9dd5d614 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -111,13 +111,12 @@ void CopyFeatureArrayToElementArray::initialize()
 // -----------------------------------------------------------------------------
 void CopyFeatureArrayToElementArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(getCreatedArrayName().isEmpty())
   {
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), "The new Element array name must be set", getErrorCondition());
+    setErrorCondition(-11002, "The new Element array name must be set");
     return;
   }
 
@@ -135,7 +134,7 @@ void CopyFeatureArrayToElementArray::dataCheck()
   DataArrayPath tempPath(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), "");
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, tempPath, -301);
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -199,10 +198,10 @@ template <typename T> IDataArray::Pointer copyData(IDataArray::Pointer inputData
 // -----------------------------------------------------------------------------
 void CopyFeatureArrayToElementArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -231,16 +230,14 @@ void CopyFeatureArrayToElementArray::execute()
   if(mismatchedFeatures)
   {
     QString ss = QObject::tr("The largest Feature Id (%1) in the FeatureIds array is larger than the number of Features in the InArray array (%2)").arg(largestFeature).arg(numFeatures);
-    setErrorCondition(-5555);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5555, ss);
     return;
   }
 
   if(largestFeature != (numFeatures - 1))
   {
     QString ss = QObject::tr("The number of Features in the InArray array (%1) does not match the largest Feature Id in the FeatureIds array").arg(numFeatures);
-    setErrorCondition(-5555);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5555, ss);
     return;
   }
 
@@ -293,8 +290,7 @@ void CopyFeatureArrayToElementArray::execute()
   else
   {
     QString ss = QObject::tr("The selected array was of unsupported type. The path is %1").arg(m_SelectedFeatureArrayPath.serialize());
-    setErrorCondition(-14000);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-14000, ss);
   }
 
   if(p.get() != nullptr)
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index cc9dfcfc52..6f36ed086c 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -135,14 +135,13 @@ void CopyObject::initialize()
 // -----------------------------------------------------------------------------
 void CopyObject::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(getCopiedObjectName().isEmpty())
   {
-    setErrorCondition(-11001);
     QString ss = QObject::tr("The copied object name must be set");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11001, ss);
   }
 
   switch(getObjectToCopy())
@@ -152,14 +151,13 @@ void CopyObject::dataCheck()
   {
     if(getDataContainerArray()->doesDataContainerExist(getCopiedObjectName()))
     {
-      setErrorCondition(-11001);
       QString ss = QObject::tr("A Data Container already exists with the name %1").arg(getCopiedObjectName());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11001, ss);
     }
 
     DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerToCopy());
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -177,14 +175,13 @@ void CopyObject::dataCheck()
     DataArrayPath path(getAttributeMatrixToCopy().getDataContainerName(), getCopiedObjectName(), "");
     if(getDataContainerArray()->doesAttributeMatrixExist(path))
     {
-      setErrorCondition(-11001);
       QString ss = QObject::tr("An Attribute Matrix already exists with the name %1").arg(getCopiedObjectName());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11001, ss);
     }
 
     AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getAttributeMatrixToCopy(), -301);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -202,14 +199,13 @@ void CopyObject::dataCheck()
     DataArrayPath path(getAttributeArrayToCopy().getDataContainerName(), getAttributeArrayToCopy().getAttributeMatrixName(), getCopiedObjectName());
     if(getDataContainerArray()->doesAttributeArrayExist(path))
     {
-      setErrorCondition(-11001);
       QString ss = QObject::tr("An Attribute Array already exists with the name %1").arg(getCopiedObjectName());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11001, ss);
     }
 
     IDataArray::Pointer array = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getAttributeArrayToCopy());
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -247,10 +243,10 @@ void CopyObject::preflight()
 // -----------------------------------------------------------------------------
 void CopyObject::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index b2b524282f..2f2ac7706f 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -120,11 +120,11 @@ void CreateAttributeMatrix::initialize()
 // -----------------------------------------------------------------------------
 void CreateAttributeMatrix::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getCreatedAttributeMatrix().getDataContainerName());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -135,8 +135,7 @@ void CreateAttributeMatrix::dataCheck()
   if(rows.size() != 1)
   {
     QString ss = QObject::tr("The number of rows of data must be 1. The data currently has %1").arg(rows.size());
-    setErrorCondition(-11000);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11000, ss);
     return;
   }
 
@@ -148,7 +147,7 @@ void CreateAttributeMatrix::dataCheck()
   }
 
   m->createNonPrereqAttributeMatrix(this, getCreatedAttributeMatrix().getAttributeMatrixName(), tDims, static_cast<AttributeMatrix::Type>(getAttributeMatrixType()), AttributeMatrixID);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -173,10 +172,10 @@ void CreateAttributeMatrix::preflight()
 // -----------------------------------------------------------------------------
 void CreateAttributeMatrix::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 6910677bcf..f5eff9b894 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -323,10 +323,10 @@ void CreateDataArray::initialize()
 // -----------------------------------------------------------------------------
 void CreateDataArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -334,31 +334,27 @@ void CreateDataArray::dataCheck()
   if(m_InitializationType == RandomWithRange && m_InitializationRange.first > m_InitializationRange.second)
   {
     QString ss = "Invalid initialization range.  Minimum value is larger than maximum value.";
-    setErrorCondition(-5550);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5550, ss);
     return;
   }
 
   if(getNumberOfComponents() < 0)
   {
-    setErrorCondition(-8050);
     QString ss = QObject::tr("The number of components must non-negative");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8050, ss);
   }
   if(getNumberOfComponents() == 0)
   {
-    setErrorCondition(-8051);
     QString ss = QObject::tr("The number of components is Zero. This will result in an array that has no memory allocated. Are you sure you wanted to do this?");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8051, ss);
   }
   if(!getNewArray().isValid())
   {
-    setErrorCondition(-8051);
     QString ss = QObject::tr("The Created DataArrayPath is invalid. Please select the Data Container, Attribute Matrix and set an output DataArray name.");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8051, ss);
   }
   QVector<size_t> cDims(1, getNumberOfComponents());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -431,10 +427,10 @@ void CreateDataArray::preflight()
 // -----------------------------------------------------------------------------
 void CreateDataArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -497,16 +493,14 @@ template <typename T> void CreateDataArray::checkInitialization(QString dataArra
     if(!ok)
     {
       QString ss = "Could not convert initialization value to a double.";
-      setErrorCondition(-5559);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-5559, ss);
       return;
     }
 
     if(input < static_cast<double>(std::numeric_limits<T>().lowest()) || input > static_cast<double>(std::numeric_limits<T>().max()))
     {
-      setErrorCondition(-4000);
       QString ss = QObject::tr("%1: Invalid initialization value. The valid range is %2 to %3").arg(dataArrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4000, ss);
       return;
     }
   }
@@ -517,22 +511,19 @@ template <typename T> void CreateDataArray::checkInitialization(QString dataArra
     if(min > max)
     {
       QString ss = dataArrayName + ": Invalid initialization range.  Minimum value is larger than maximum value.";
-      setErrorCondition(-5550);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-5550, ss);
       return;
     }
     if(min < static_cast<double>(std::numeric_limits<T>().lowest()) || max > static_cast<double>(std::numeric_limits<T>().max()))
     {
-      setErrorCondition(-4001);
       QString ss = QObject::tr("%1: The initialization range can only be from %2 to %3").arg(dataArrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4001, ss);
       return;
     }
     if(min == max)
     {
-      setErrorCondition(-4002);
       QString ss = dataArrayName + ": The initialization range must have differing values";
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4002, ss);
       return;
     }
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index a912b7a91b..4d0da26086 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -88,8 +88,8 @@ void CreateDataContainer::initialize()
 // -----------------------------------------------------------------------------
 void CreateDataContainer::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
 }
@@ -113,10 +113,10 @@ void CreateDataContainer::preflight()
 // -----------------------------------------------------------------------------
 void CreateDataContainer::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 908781db3e..79d3d648a9 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -114,13 +114,12 @@ void CreateFeatureArrayFromElementArray::initialize()
 // -----------------------------------------------------------------------------
 void CreateFeatureArrayFromElementArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(getCreatedArrayName().isEmpty())
   {
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), "The new Feature Array name must be set", getErrorCondition());
+    setErrorCondition(-11002, "The new Feature Array name must be set");
     return;
   }
 
@@ -136,7 +135,7 @@ void CreateFeatureArrayFromElementArray::dataCheck()
 
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellFeatureAttributeMatrixName(), -301);
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -206,9 +205,8 @@ template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, I
       if(currentDataPtr[j] != cSourcePtr[j] && !warningThrown)
       {
         // The values are inconsistent with the first values for this feature id, so throw a warning
-        filter->setWarningCondition(-1000);
         QString ss = QObject::tr("Elements from Feature %1 do not all have the same value. The last value copied into Feature %1 will be used").arg(featureIdx);
-        filter->notifyWarningMessage(filter->getHumanLabel(), ss, filter->getWarningCondition());
+        filter->setWarningCondition(-1000, ss);
         warningThrown = true;
       }
     }
@@ -227,10 +225,10 @@ template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, I
 // -----------------------------------------------------------------------------
 void CreateFeatureArrayFromElementArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -259,16 +257,14 @@ void CreateFeatureArrayFromElementArray::execute()
   if(mismatchedFeatures)
   {
     QString ss = QObject::tr("Attribute Matrix %1 has %2 tuples but the input array %3 has a Feature ID value of at least %4").arg(m_CellFeatureAttributeMatrixName.serialize("/")).arg(totalFeatures).arg(getFeatureIdsArrayPath().serialize("/")).arg(largestFeature);
-    setErrorCondition(-5555);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5555, ss);
     return;
   }
 
   if(largestFeature != (totalFeatures - 1))
   {
     QString ss = QObject::tr("The number of Features in the InArray array (%1) does not match the largest Feature Id in the FeatureIds array").arg(totalFeatures);
-    setErrorCondition(-5556);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5556, ss);
     return;
   }
 
@@ -321,8 +317,7 @@ void CreateFeatureArrayFromElementArray::execute()
   else
   {
     QString ss = QObject::tr("The selected array was of unsupported type. The path is %1").arg(m_SelectedCellArrayPath.serialize());
-    setErrorCondition(-14000);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-14000, ss);
   }
 
   if(p.get() != nullptr)
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 31f371cb2c..e7761af6e0 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -246,13 +246,13 @@ void CreateGeometry::initialize()
 // -----------------------------------------------------------------------------
 void CreateGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
 
   DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerName());
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -260,8 +260,7 @@ void CreateGeometry::dataCheck()
   if(dc->getGeometry())
   {
     QString ss = QObject::tr("Selected Data Container already contains a Geometry");
-    setErrorCondition(-701);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-701, ss);
     return;
   }
 
@@ -278,8 +277,7 @@ void CreateGeometry::dataCheck()
                        .arg(getDimensions().getX())
                        .arg(getDimensions().getY())
                        .arg(getDimensions().getZ());
-      setErrorCondition(-390);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-390, ss);
       return;
     }
 
@@ -316,7 +314,7 @@ void CreateGeometry::dataCheck()
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -330,8 +328,7 @@ void CreateGeometry::dataCheck()
                        .arg(m_XBoundsPtr.lock()->getNumberOfTuples())
                        .arg(m_YBoundsPtr.lock()->getNumberOfTuples())
                        .arg(m_ZBoundsPtr.lock()->getNumberOfTuples());
-      setErrorCondition(-390);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-390, ss);
       return;
     }
 
@@ -367,7 +364,7 @@ void CreateGeometry::dataCheck()
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath0(), cDims);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -402,7 +399,7 @@ void CreateGeometry::dataCheck()
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -442,7 +439,7 @@ void CreateGeometry::dataCheck()
       m_Tris = m_TrisPtr.lock()->getPointer(0);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -483,7 +480,7 @@ void CreateGeometry::dataCheck()
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -524,7 +521,7 @@ void CreateGeometry::dataCheck()
       m_Tets = m_TetsPtr.lock()->getPointer(0);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -566,7 +563,7 @@ void CreateGeometry::dataCheck()
       m_Hexes = m_HexesPtr.lock()->getPointer(0);
     }
 
-    if (getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -600,8 +597,7 @@ void CreateGeometry::dataCheck()
   default:
   {
     QString ss = QObject::tr("Invalid selection for Geometry type");
-    setErrorCondition(-701);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-701, ss);
     break;
   }
   }
@@ -626,10 +622,10 @@ void CreateGeometry::preflight()
 // -----------------------------------------------------------------------------
 void CreateGeometry::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -657,13 +653,11 @@ void CreateGeometry::execute()
                          .arg(m_XBounds[i]);
         if(m_TreatWarningsAsErrors)
         {
-          setErrorCondition(-1);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(-1, ss);
         }
         else
         {
-          setWarningCondition(-1);
-          notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+          setWarningCondition(-1, ss);
         }
         return;
       }
@@ -684,13 +678,11 @@ void CreateGeometry::execute()
                          .arg(m_YBounds[i]);
         if(m_TreatWarningsAsErrors)
         {
-          setErrorCondition(-1);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(-1, ss);
         }
         else
         {
-          setWarningCondition(-1);
-          notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+          setWarningCondition(-1, ss);
         }
         return;
       }
@@ -711,13 +703,11 @@ void CreateGeometry::execute()
                          .arg(m_ZBounds[i]);
         if(m_TreatWarningsAsErrors)
         {
-          setErrorCondition(-1);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(-1, ss);
         }
         else
         {
-          setWarningCondition(-1);
-          notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+          setWarningCondition(-1, ss);
         }
         return;
       }
@@ -751,13 +741,11 @@ void CreateGeometry::execute()
                        .arg(m_NumVerts);
       if(m_TreatWarningsAsErrors)
       {
-        setErrorCondition(-1);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-1, ss);
       }
       else
       {
-        setWarningCondition(-1);
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-1, ss);
       }
       return;
     }
@@ -784,13 +772,11 @@ void CreateGeometry::execute()
                        .arg(m_NumVerts);
       if(m_TreatWarningsAsErrors)
       {
-        setErrorCondition(-1);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-1, ss);
       }
       else
       {
-        setWarningCondition(-1);
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-1, ss);
       }
       return;
     }
@@ -817,13 +803,11 @@ void CreateGeometry::execute()
                        .arg(m_NumVerts);
       if(m_TreatWarningsAsErrors)
       {
-        setErrorCondition(-1);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-1, ss);
       }
       else
       {
-        setWarningCondition(-1);
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-1, ss);
       }
       return;
     }
@@ -850,13 +834,11 @@ void CreateGeometry::execute()
                        .arg(m_NumVerts);
       if(m_TreatWarningsAsErrors)
       {
-        setErrorCondition(-1);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-1, ss);
       }
       else
       {
-        setWarningCondition(-1);
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-1, ss);
       }
       return;
     }
@@ -883,13 +865,11 @@ void CreateGeometry::execute()
         .arg(m_NumVerts);
       if (m_TreatWarningsAsErrors)
       {
-        setErrorCondition(-1);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-1, ss);
       }
       else
       {
-        setWarningCondition(-1);
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-1, ss);
       }
       return;
     }
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index ecfa6b115d..c00eeb422d 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -116,25 +116,23 @@ void CreateImageGeometry::initialize()
 // -----------------------------------------------------------------------------
 void CreateImageGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_Dimensions[0] == 0 || m_Dimensions[1] == 0 || m_Dimensions[2] == 0)
   {
     QString ss = QObject::tr("One of the dimensions has a size less than or equal to zero. The minimum size must be postive");
-    setErrorCondition(-390);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-390, ss);
   }
 
   if(getSelectedDataContainer().isEmpty())
   {
     QString ss = QObject::tr("The Data Container must have a name");
-    setErrorCondition(-391);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-391, ss);
     return;
   }
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainer());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -164,10 +162,10 @@ void CreateImageGeometry::preflight()
 // -----------------------------------------------------------------------------
 void CreateImageGeometry::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 17ba0f31db..cd47fcfbff 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -125,40 +125,36 @@ void CreateStringArray::initialize()
 // -----------------------------------------------------------------------------
 void CreateStringArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   if(getNumberOfComponents() < 0)
   {
-    setErrorCondition(-8150);
     QString ss = QObject::tr("The number of components must non-negative");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8150, ss);
   }
   if(getNumberOfComponents() == 0)
   {
-    setErrorCondition(-8151);
     QString ss = QObject::tr("The number of components is Zero. This will result in an array that has no memory allocated. Are you sure you wanted to do this?");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8151, ss);
   }
   if(!getNewArray().isValid())
   {
-    setErrorCondition(-8152);
     QString ss = QObject::tr("The Created DataArrayPath is invalid. Please select the Data Container, Attribute Matrix and set an output DataArray name.");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-8152, ss);
   }
   if (m_InitializationValue.isEmpty())
   {
     QString ss = "Empty initialization value.";
-    setErrorCondition(-5759);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5759, ss);
   }
   QVector<size_t> cDims(1, getNumberOfComponents());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -185,10 +181,10 @@ void CreateStringArray::preflight()
 // -----------------------------------------------------------------------------
 void CreateStringArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 089fc95b77..1872f92f3f 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -113,8 +113,8 @@ void CropVertexGeometry::readFilterParameters(AbstractFilterParametersReader* re
 // -----------------------------------------------------------------------------
 void CropVertexGeometry::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
   m_AttrMatList.clear();
 }
@@ -124,8 +124,8 @@ void CropVertexGeometry::initialize()
 // -----------------------------------------------------------------------------
 void CropVertexGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
 
   getDataContainerArray()->getPrereqGeometryFromDataContainer<VertexGeom, AbstractFilter>(this, getDataContainerName());
@@ -133,25 +133,22 @@ void CropVertexGeometry::dataCheck()
   if(getXMax() < getXMin())
   {
     QString ss = QObject::tr("X Max (%1) less than X Min (%2)").arg(getXMax()).arg(getXMin());
-    setErrorCondition(-5550);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5550, ss);
   }
   if(getYMax() < getYMin())
   {
     QString ss = QObject::tr("Y Max (%1) less than Y Min (%2)").arg(getYMax()).arg(getYMin());
-    setErrorCondition(-5550);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5550, ss);
   }
   if(getZMax() < getZMin())
   {
     QString ss = QObject::tr("Z Max (%1) less than Z Min (%2)").arg(getZMax()).arg(getZMin());
-    setErrorCondition(-5550);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5550, ss);
   }
 
   DataContainer::Pointer dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getCroppedDataContainerName(), DataContainerID);
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -166,7 +163,7 @@ void CropVertexGeometry::dataCheck()
   DataArrayPath tempPath;
   AttributeMatrix::Type tempAttrMatType = AttributeMatrix::Type::Vertex;
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -174,7 +171,7 @@ void CropVertexGeometry::dataCheck()
   for(auto&& attr_mat : m_AttrMatList)
   {
     AttributeMatrix::Pointer tmpAttrMat = m->getPrereqAttributeMatrix(this, attr_mat, -301);
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       tempAttrMatType = tmpAttrMat->getType();
       if(tempAttrMatType != AttributeMatrix::Type::Vertex)
@@ -190,7 +187,7 @@ void CropVertexGeometry::dataCheck()
         {
           tempPath.update(getCroppedDataContainerName().getDataContainerName(), tmpAttrMat->getName(), data_array);
           IDataArray::Pointer tmpDataArray = tmpAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, data_array, -90002);
-          if(getErrorCondition() >= 0)
+          if(getErrorCode() >= 0)
           {
             QVector<size_t> cDims = tmpDataArray->getComponentDimensions();
             TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, tmpDataArray);
@@ -245,10 +242,10 @@ template <typename T> void copyDataToCroppedGeometry(IDataArray::Pointer inDataP
 // -----------------------------------------------------------------------------
 void CropVertexGeometry::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -295,7 +292,7 @@ void CropVertexGeometry::execute()
   for(auto&& attr_mat : m_AttrMatList)
   {
     AttributeMatrix::Pointer tmpAttrMat = dc->getPrereqAttributeMatrix(this, attr_mat, -301);
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       AttributeMatrix::Type tempAttrMatType = tmpAttrMat->getType();
       if(tempAttrMatType == AttributeMatrix::Type::Vertex)
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index c593198301..8515f4af66 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -155,17 +155,15 @@ void DataContainerReader::dataCheck()
   if(getInputFile().isEmpty())
   {
     ss = QObject::tr("The input file must be set");
-    setErrorCondition(-387);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-387, ss);
   }
   else if(!fi.exists())
   {
     ss = QObject::tr("The input file %1 does not exist").arg(getInputFile());
-    setErrorCondition(-388);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-388, ss);
   }
 
-  if(getErrorCondition() != 0)
+  if(getErrorCode() != 0)
   {
     // something has gone wrong and errors were logged already so just return
     return;
@@ -196,8 +194,7 @@ void DataContainerReader::dataCheck()
       if(dca->doesDataContainerExist(container->getName()))
       {
         ss = QObject::tr("The input file has a DataContainer with a name (%1) that already exists in the current DataContainerArray structure").arg(container->getName());
-        setErrorCondition(-390);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-390, ss);
       }
       else
       {
@@ -246,14 +243,11 @@ void DataContainerReader::execute()
 // -----------------------------------------------------------------------------
 DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProxy& proxy)
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   SIMPLH5DataReader::Pointer simplReader = SIMPLH5DataReader::New();
-  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) {
-    setErrorCondition(code);
-    notifyErrorMessage(getHumanLabel(), msg, getErrorCondition());
-  });
+  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) { setErrorCondition(code, msg); });
 
   if (!simplReader->openFile(getInputFile()))
   {
@@ -269,9 +263,8 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
   hid_t fileId = QH5Utilities::openFile(getInputFile(), true); // Open the file Read Only
   if(fileId < 0)
   {
-    setErrorCondition(-150);
     QString ss = QObject::tr("Error opening input file '%1'").arg(getInputFile());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-150, ss);
     return DataContainerArray::NullPointer();
   }
   H5ScopedFileSentinel sentinel(&fileId, true);
@@ -281,9 +274,8 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
     int32_t err = readExistingPipelineFromFile(fileId);
     if(err < 0)
     {
-      setErrorCondition(err);
       QString ss = QObject::tr("Error trying to read the existing pipeline from the file '%1'").arg(getInputFile());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(err, ss);
       return DataContainerArray::New();
     }
   }
@@ -413,10 +405,7 @@ bool DataContainerReader::syncProxies()
   SIMPLH5DataReaderRequirements req(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
 
   SIMPLH5DataReader::Pointer simplReader = SIMPLH5DataReader::New();
-  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) {
-    setErrorCondition(code);
-    notifyErrorMessage(getHumanLabel(), msg, getErrorCondition());
-  });
+  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) { setErrorCondition(code, msg); });
 
   if(!simplReader->openFile(getInputFile()))
   {
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index f2099cc29c..4997762092 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -116,8 +116,8 @@ void DataContainerWriter::initialize()
 // -----------------------------------------------------------------------------
 void DataContainerWriter::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   QString ss;
 
   QFileInfo fi(m_OutputFile);
@@ -147,10 +147,10 @@ void DataContainerWriter::preflight()
 // -----------------------------------------------------------------------------
 void DataContainerWriter::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -165,8 +165,7 @@ void DataContainerWriter::execute()
   if(!dir.mkpath(parentPath))
   {
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath);
-    setErrorCondition(-11110);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11110, ss);
     return;
   }
 
@@ -174,8 +173,7 @@ void DataContainerWriter::execute()
   if(err < 0)
   {
     QString ss = QObject::tr("The HDF5 file could not be opened or created.\n The given filename was:\n\t[%1]").arg(m_OutputFile);
-    setErrorCondition(-11112);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11112, ss);
     return;
   }
   // qDebug() << "DREAM3D File: " << m_OutputFile;
@@ -214,8 +212,7 @@ void DataContainerWriter::execute()
   if(err < 0)
   {
     QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerGroupName);
-    setErrorCondition(-60);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-60, ss);
     return;
   }
   hid_t dcaGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), H5P_DEFAULT);
@@ -230,26 +227,25 @@ void DataContainerWriter::execute()
     if(err < 0)
     {
       QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(dcNames[iter]);
-      setErrorCondition(-60);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-60, ss);
       return;
     }
 
     hid_t dcGid = H5Gopen(dcaGid, dcNames[iter].toLatin1().data(), H5P_DEFAULT);
     H5ScopedGroupSentinel groupSentinel(&dcGid, false);
-    // QString ss = QObject::tr("%1 |--> Writing %2 DataContainer ").arg(getMessagePrefix()).arg(dcNames[iter]);
+    // QString ss = QObject::tr("Writing %2 DataContainer").arg(dcNames[iter]);
 
     // Have the DataContainer write all of its Attribute Matrices and its Mesh
     err = dc->writeAttributeMatricesToHDF5(dcGid);
     if(err < 0)
     {
-      notifyErrorMessage(getHumanLabel(), "Error writing DataContainer AttributeMatrices", -803);
+      setErrorCondition(-803, "Error writing DataContainer AttributeMatrices");
       return;
     }
     err = dc->writeMeshToHDF5(dcGid, m_WriteXdmfFile);
     if(err < 0)
     {
-      notifyErrorMessage(getHumanLabel(), "Error writing DataContainer Geometry", -804);
+      setErrorCondition(-804, "Error writing DataContainer Geometry");
       return;
     }
     if(m_WriteXdmfFile && geometry.get() != nullptr)
@@ -269,7 +265,7 @@ void DataContainerWriter::execute()
       err = dc->writeXdmf(xdmfOut, hdfFileName);
       if(err < 0)
       {
-        notifyErrorMessage(getHumanLabel(), "Error writing Xdmf File", -805);
+        setErrorCondition(-805, "Error writing Xdmf File");
         return;
       }
     }
@@ -280,8 +276,7 @@ void DataContainerWriter::execute()
   if(err < 0)
   {
     QString ss = QObject::tr("Error writing DataContainerBundles");
-    setErrorCondition(-11113);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11113, ss);
     return;
   }
 
@@ -306,8 +301,7 @@ int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
   if(err < 0)
   {
     QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerBundleGroupName);
-    setErrorCondition(-61);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-61, ss);
     return -1;
   }
   hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerBundleGroupName.toLatin1().data(), H5P_DEFAULT);
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 95b64314da..2cb41e3805 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -100,8 +100,7 @@ void EmptyFilter::initialize()
 void EmptyFilter::dataCheck()
 {
   QString ss = QObject::tr("This filter does nothing and was inserted as a place holder for filter '%1' that does not exist anymore.").arg(getOriginalFilterName());
-  setErrorCondition(-9999);
-  notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  setErrorCondition(-9999, ss);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index 4b1614bde9..b673e71caf 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -91,15 +91,14 @@ void ExecuteProcess::initialize()
 // -----------------------------------------------------------------------------
 void ExecuteProcess::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QStringList arguments = splitArgumentsString(m_Arguments);
   if(arguments.empty())
   {
     QString ss = QObject::tr("No command line arguments have been specified.");
-    setErrorCondition(-4001);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4001, ss);
     return;
   }
 
@@ -109,8 +108,7 @@ void ExecuteProcess::dataCheck()
   //  if( !fi.exists())
   //  {
   //    QString ss = QObject::tr("The executable at %1 does not exist.").arg(prog);
-  //    setErrorCondition(-4000);
-  //    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+  //    setErrorCondition(-4000, ss);
   //    return;
   //  }
 }
@@ -134,10 +132,10 @@ void ExecuteProcess::preflight()
 // -----------------------------------------------------------------------------
 void ExecuteProcess::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -222,16 +220,14 @@ void ExecuteProcess::processHasFinished(int exitCode, QProcess::ExitStatus exitS
   else if(exitStatus == QProcess::CrashExit)
   {
     QString ss = QObject::tr("The process crashed during its exit.");
-    setErrorCondition(-4003);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4003, ss);
   }
   else if(exitCode < 0)
   {
     QString ss = QObject::tr("The process finished with exit code %1.").arg(QString::number(exitCode));
-    setErrorCondition(-4004);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4004, ss);
   }
-  else if(getErrorCondition() >= 0)
+  else if(getErrorCode() >= 0)
   {
   }
 
@@ -247,8 +243,7 @@ void ExecuteProcess::processHasErroredOut(QProcess::ProcessError error)
   if(getCancel())
   {
     QString ss = QObject::tr("The process was killed by the user.");
-    setWarningCondition(-4004);
-    notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+    setWarningCondition(-4004, ss);
   }
   else if(error == QProcess::FailedToStart)
   {
@@ -258,38 +253,32 @@ void ExecuteProcess::processHasErroredOut(QProcess::ProcessError error)
     QString ss = QObject::tr("The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program \
 or the path containing the executble is not in the system's environment path. PATH=%1.\n Try using the absolute path to the executable.")
                      .arg(pathEnv);
-    setErrorCondition(-4005);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4005, ss);
   }
   else if(error == QProcess::Crashed)
   {
     QString ss = QObject::tr("The process crashed some time after starting successfully.");
-    setErrorCondition(-4006);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4006, ss);
   }
   else if(error == QProcess::Timedout)
   {
     QString ss = QObject::tr("The process timed out.");
-    setErrorCondition(-4007);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4007, ss);
   }
   else if(error == QProcess::WriteError)
   {
     QString ss = QObject::tr("An error occurred when attempting to write to the process.");
-    setErrorCondition(-4008);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4008, ss);
   }
   else if(error == QProcess::ReadError)
   {
     QString ss = QObject::tr("An error occurred when attempting to read from the process.");
-    setErrorCondition(-4009);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4009, ss);
   }
   else
   {
     QString ss = QObject::tr("An unknown error occurred.");
-    setErrorCondition(-4010);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4010, ss);
   }
 
   m_Pause = false;
@@ -308,7 +297,7 @@ void ExecuteProcess::sendErrorOutput()
     {
       error.chop(1);
     }
-    notifyStandardOutputMessage(getHumanLabel(), getPipelineIndex() + 1, error);
+    notifyStatusMessage(error);
     m_WaitCondition.wakeAll();
   }
 }
@@ -320,7 +309,7 @@ void ExecuteProcess::sendStandardOutput()
 {
   if(m_ProcessPtr.data() != nullptr)
   {
-    notifyStandardOutputMessage(getHumanLabel(), getPipelineIndex() + 1, m_ProcessPtr->readAllStandardOutput());
+    notifyStatusMessage(m_ProcessPtr->readAllStandardOutput());
     m_WaitCondition.wakeAll();
   }
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index 25c3abf539..d53706a638 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -102,8 +102,8 @@ ExtractAttributeArraysFromGeometry::~ExtractAttributeArraysFromGeometry() = defa
 // -----------------------------------------------------------------------------
 void ExtractAttributeArraysFromGeometry::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -220,13 +220,13 @@ void ExtractAttributeArraysFromGeometry::readFilterParameters(AbstractFilterPara
 // -----------------------------------------------------------------------------
 void ExtractAttributeArraysFromGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
 
   IGeometry::Pointer igeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry, AbstractFilter>(this, getDataContainerName());
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -253,7 +253,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_XBounds = m_XBoundsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       xarrays.push_back(m_XBoundsPtr.lock());
     }
@@ -263,7 +263,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_YBounds = m_YBoundsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       yarrays.push_back(m_YBoundsPtr.lock());
     }
@@ -273,7 +273,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       zarrays.push_back(m_ZBoundsPtr.lock());
     }
@@ -298,7 +298,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       arrays.push_back(m_VertsPtr.lock());
     }
@@ -323,7 +323,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       varrays.push_back(m_VertsPtr.lock());
     }
@@ -335,7 +335,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       earrays.push_back(m_EdgesPtr.lock());
     }
@@ -361,7 +361,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       varrays.push_back(m_VertsPtr.lock());
     }
@@ -371,7 +371,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       earrays.push_back(m_TrisPtr.lock());
     }
@@ -397,7 +397,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       varrays.push_back(m_VertsPtr.lock());
     }
@@ -409,7 +409,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       earrays.push_back(m_QuadsPtr.lock());
     }
@@ -435,7 +435,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       varrays.push_back(m_VertsPtr.lock());
     }
@@ -447,7 +447,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
     }
-    if(getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       earrays.push_back(m_TetsPtr.lock());
     }
@@ -473,7 +473,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
     }
-    if (getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       varrays.push_back(m_VertsPtr.lock());
     }
@@ -485,7 +485,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
     }
-    if (getErrorCondition() >= 0)
+    if(getErrorCode() >= 0)
     {
       earrays.push_back(m_TetsPtr.lock());
     }
@@ -502,8 +502,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
                              "Valid Geometry Types: Rectilinear Grid, Vertex, Edge, Triangle, Quadrilateral, Tetrahedral")
                      .arg(getDataContainerName().getDataContainerName())
                      .arg(igeom->getGeometryTypeAsString());
-    setErrorCondition(-701);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-701, ss);
     break;
   }
   }
@@ -530,7 +529,7 @@ void ExtractAttributeArraysFromGeometry::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 416ac04640..5e633da1e5 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -106,19 +106,18 @@ void ExtractComponentAsArray::initialize()
 // -----------------------------------------------------------------------------
 void ExtractComponentAsArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
 
   if(m_NewArrayArrayName.isEmpty())
   {
-    setErrorCondition(-11003);
-    notifyErrorMessage(getHumanLabel(), "New array name must be set.", getErrorCondition());
+    setErrorCondition(-11003, "New array name must be set.");
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -128,28 +127,25 @@ void ExtractComponentAsArray::dataCheck()
     QString ss = QObject::tr("Selected array '%1' must have more than 1 component. The number of components is %2")
                      .arg(getSelectedArrayPath().getDataArrayName())
                      .arg(m_InArrayPtr.lock()->getNumberOfComponents());
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11002, ss);
     return;
   }
 
   if(m_CompNumber >= m_InArrayPtr.lock()->getNumberOfComponents())
   {
-    setErrorCondition(-11004);
     QString ss = QObject::tr("Error extracting component from DataArray '%3', Component to extract (%1) is greater than or equal to the number of components (%2).")
                      .arg(m_CompNumber)
                      .arg(m_InArrayPtr.lock()->getNumberOfComponents())
                      .arg(getSelectedArrayPath().getDataArrayName());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11004, ss);
     return;
   }
 
   if(m_CompNumber < 0)
   {
-    setErrorCondition(-11005);
     QString ss = QObject::tr("Component to extract (%1) is a negative value and this is not allowed. Value must be Zero (0) or greater.")
                      .arg(m_CompNumber);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11005, ss);
     return;
   }
 
@@ -200,10 +196,10 @@ template <typename T> void extractComponent(IDataArray::Pointer inputData, IData
 // -----------------------------------------------------------------------------
 void ExtractComponentAsArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index fcb99dcb50..2778d46fbe 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -71,8 +71,8 @@ ExtractVertexGeometry::~ExtractVertexGeometry() = default;
 // -----------------------------------------------------------------------------
 void ExtractVertexGeometry::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -123,35 +123,32 @@ void ExtractVertexGeometry::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void ExtractVertexGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_ArrayHandling < 0)
   {
     QString ss = QObject::tr("'Array Handling' has not been selected.");
-    setErrorCondition(-2002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2002, ss);
     return;
   }
 
   if(m_ArrayHandling > m_ArrayHandlingChoices.size() - 1)
   {
     QString ss = QObject::tr("'Array Handling' index is out of bounds. Valid values are 0 or 1.");
-    setErrorCondition(-2003);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2003, ss);
     return;
   }
 
   if(m_SelectedDataContainerName.isEmpty())
   {
     QString ss = QObject::tr("The name of the input DataContainer is empty. Please specify a value.");
-    setErrorCondition(-2004);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2004, ss);
     return;
   }
 
   DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainerName());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -159,16 +156,14 @@ void ExtractVertexGeometry::dataCheck()
   if(getVertexDataContainerName().isEmpty())
   {
     QString ss = QObject::tr("The name of the created Vertex DataContainer is empty. Please specify a value.");
-    setErrorCondition(-2006);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2006, ss);
     return;
   }
 
   if(getDataContainerArray()->doesDataContainerExist(getVertexDataContainerName()))
   {
     QString ss = QObject::tr("A Data Container with name '%1' already exists.").arg(getVertexDataContainerName().getDataContainerName());
-    setErrorCondition(-2007);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2007, ss);
     return;
   }
 
@@ -177,8 +172,7 @@ void ExtractVertexGeometry::dataCheck()
   if(nullptr == fromGeometry.get())
   {
     QString ss = QObject::tr("Selected input DataContainer must contain either an Image Geometry or RectLinearGrid Geometry. The DataContainer did not contain a Geometry object.");
-    setErrorCondition(-2008);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2008, ss);
     return;
   }
   IGeometry::Type geomType = fromGeometry->getGeometryType();
@@ -195,8 +189,7 @@ void ExtractVertexGeometry::dataCheck()
   else
   {
     QString ss = QObject::tr("Data Container's Geometry type must be either an Image Geometry or RectLinearGrid Geometry. The Geomerty is of type %1").arg(fromGeometry->getGeometryTypeAsString());
-    setErrorCondition(-2010);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-2010, ss);
     return;
   }
 
@@ -208,7 +201,7 @@ void ExtractVertexGeometry::dataCheck()
 
     int err = 0;
     AttributeMatrix::Pointer sourceCellAttrMat = dc->getPrereqAttributeMatrix(this, dap.getAttributeMatrixName(), err);
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -221,13 +214,12 @@ void ExtractVertexGeometry::dataCheck()
                        .arg(sourceCellAttrMat->getNumberOfTuples())
                        .arg(elementCount)
                        .arg(m_VertexDataContainerName.getDataContainerName());
-      setErrorCondition(-2009);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-2009, ss);
       return;
     }
 
     IDataArray::Pointer iDataArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, dap);
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -277,7 +269,7 @@ void ExtractVertexGeometry::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 5867743ba1..6ff61f8346 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -98,8 +98,8 @@ void FeatureCountDecision::initialize()
 // -----------------------------------------------------------------------------
 void FeatureCountDecision::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getFeatureIdsArrayPath().getDataContainerName());
 
@@ -131,10 +131,10 @@ void FeatureCountDecision::preflight()
 // -----------------------------------------------------------------------------
 void FeatureCountDecision::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index c75fa2e5bc..736010e646 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -119,8 +119,8 @@ void FeatureDataCSVWriter::initialize()
 // -----------------------------------------------------------------------------
 void FeatureDataCSVWriter::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellFeatureAttributeMatrixPath(), -301);
 
@@ -173,10 +173,10 @@ void FeatureDataCSVWriter::preflight()
 // -----------------------------------------------------------------------------
 void FeatureDataCSVWriter::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -188,8 +188,7 @@ void FeatureDataCSVWriter::execute()
   if(!parentPath.mkpath("."))
   {
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath.absolutePath());
-    setErrorCondition(-1);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-1, ss);
     return;
   }
 
@@ -197,8 +196,7 @@ void FeatureDataCSVWriter::execute()
   if(!file.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getFeatureDataFile());
-    setErrorCondition(-100);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-100, ss);
     return;
   }
 
@@ -261,7 +259,7 @@ void FeatureDataCSVWriter::execute()
     if(percentIncrement > threshold)
     {
       QString ss = QObject::tr("Writing Feature Data || %1% Complete").arg(static_cast<double>(percentIncrement));
-      notifyStatusMessage(getMessagePrefix(), getHumanLabel(), ss);
+      notifyStatusMessage(ss);
       threshold = threshold + 5.0f;
       if(threshold < percentIncrement)
       {
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index 138a03143c..e32fe7a5a4 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -67,8 +67,7 @@ void FileReader::dataCheck()
 // -----------------------------------------------------------------------------
 int32_t FileReader::readHeader()
 {
-  setErrorCondition(-1);
-  notifyErrorMessage(getHumanLabel(), "FileReader should be subclassed and functionality implemented there", -1);
+  setErrorCondition(-1, "FileReader should be subclassed and functionality implemented there");
   return -1;
 }
 
@@ -77,8 +76,7 @@ int32_t FileReader::readHeader()
 // -----------------------------------------------------------------------------
 int32_t FileReader::readFile()
 {
-  setErrorCondition(-1);
-  notifyErrorMessage(getHumanLabel(), "FileReader should be subclassed and functionality implemented there", -1);
+  setErrorCondition(-1, "FileReader should be subclassed and functionality implemented there");
   return -1;
 }
 
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index e321096c09..4400da61e0 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -58,8 +58,7 @@ FileWriter::~FileWriter() = default;
 // -----------------------------------------------------------------------------
 int32_t FileWriter::writeHeader()
 {
-  setErrorCondition(-1);
-  notifyErrorMessage(getHumanLabel(), "FileWriter should be subclassed and functionality implemented there", -1);
+  setErrorCondition(-1, "FileWriter should be subclassed and functionality implemented there");
   return -1;
 }
 
@@ -68,8 +67,7 @@ int32_t FileWriter::writeHeader()
 // -----------------------------------------------------------------------------
 int32_t FileWriter::writeFile()
 {
-  setErrorCondition(-1);
-  notifyErrorMessage(getHumanLabel(), "FileWriter should be subclassed and functionality implemented there", -1);
+  setErrorCondition(-1, "FileWriter should be subclassed and functionality implemented there");
   return -1;
 }
 
@@ -78,8 +76,8 @@ int32_t FileWriter::writeFile()
 // -----------------------------------------------------------------------------
 void FileWriter::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   // Make sure any directory path is also available as the user may have just typed
   // in a path without actually creating the full path
@@ -88,9 +86,8 @@ void FileWriter::execute()
   QDir dir;
   if(!dir.mkpath(parentPath))
   {
-    setErrorCondition(-200);
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-200, ss);
     return;
   }
 
@@ -98,16 +95,14 @@ void FileWriter::execute()
   if(err < 0)
   {
     QString ss = QObject::tr("Error writing the header portion of the file");
-    setErrorCondition(err);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(err, ss);
     return;
   }
   err = writeFile();
   if(err < 0)
   {
     QString ss = QObject::tr("Error writing the data to the file");
-    setErrorCondition(err);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(err, ss);
     return;
   }
 }
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 6748586c52..b56f9a5fcc 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -47,8 +47,61 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Math/SIMPLibRandom.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericErrorMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
+/**
+ * @brief This message handler is used by the FindDerivatives filter to re-emit incoming generic
+ * messages from geometry classes as filter messages.  It also prepends text to status messages to show that it is
+ * computing derivatives.
+ */
+class FilterMessageHandler : public AbstractMessageHandler
+{
+  public:
+    explicit FilterMessageHandler(FindDerivatives* filter) : m_Filter(filter) {}
+
+    /**
+     * @brief Re-emits incoming GenericProgressMessages as FilterProgressMessages.
+     */
+    void processMessage(const GenericProgressMessage* msg) const override
+    {
+      emit m_Filter->notifyProgressMessage(msg->getProgressValue(), msg->getMessageText());
+    }
+
+    /**
+     * @brief Re-emits incoming GenericStatusMessages as FilterStatusMessages.  Prepends text to the
+     * message text that explains that we are computing the derivatives
+     */
+    void processMessage(const GenericStatusMessage* msg) const override
+    {
+      QString messageText = QObject::tr("Computing Derivatives || %1").arg(msg->getMessageText());
+      emit m_Filter->notifyStatusMessage(messageText);
+    }
+
+    /**
+     * @brief Re-emits incoming GenericErrorMessages as FilterErrorMessages.
+     */
+    void processMessage(const GenericErrorMessage* msg) const override
+    {
+      emit m_Filter->setErrorCondition(msg->getCode(), msg->getMessageText());
+    }
+
+    /**
+     * @brief Re-emits incoming GenericWarningMessages as FilterWarningMessages.
+     */
+    void processMessage(const GenericWarningMessage* msg) const override
+    {
+      emit m_Filter->setWarningCondition(msg->getCode(), msg->getMessageText());
+    }
+
+  private:
+    FindDerivatives* m_Filter = nullptr;
+};
+
 enum createdPathID : RenameDataPath::DataID_t {
   DerivativesArrayID = 1
 };
@@ -211,16 +264,16 @@ void FindDerivatives::initialize()
 // -----------------------------------------------------------------------------
 void FindDerivatives::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, m_SelectedArrayPath.getDataContainerName(), false);
-  if(getErrorCondition() < 0 || nullptr == m.get())
+  if(getErrorCode() < 0 || nullptr == m.get())
   {
     return;
   }
   IGeometry::Pointer geom = m->getPrereqGeometry<IGeometry>(this);
-  if(getErrorCondition() < 0 || nullptr == geom.get())
+  if(getErrorCode() < 0 || nullptr == geom.get())
   {
     return;
   }
@@ -228,7 +281,7 @@ void FindDerivatives::dataCheck()
   AttributeMatrix::Pointer inAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedArrayPath, -301);
   AttributeMatrix::Pointer destAttrMat = m->getPrereqAttributeMatrix(this, getDerivativesArrayPath().getAttributeMatrixName(), -301);
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -244,15 +297,13 @@ void FindDerivatives::dataCheck()
     if(inAttrMatType != AttributeMatrix::Type::Cell)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected DataArray does not belong to a CellAttributeMatrix").arg(geomName);
-      setErrorCondition(-11002);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
       return;
     }
     if(destAttrMatType != AttributeMatrix::Type::Cell)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected destination AttributeMatrix is not a CellAttributeMatrix").arg(geomName);
-      setErrorCondition(-11002);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
     }
   }
   else if(geomType == IGeometry::Type::Vertex) // validate AttributeMatrices for VertexGeom
@@ -260,14 +311,12 @@ void FindDerivatives::dataCheck()
     if(inAttrMatType != AttributeMatrix::Type::Vertex)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected DataArray does not belong to a VertexAttributeMatrix").arg(geomName);
-      setErrorCondition(-11002);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
     }
     if(destAttrMatType != AttributeMatrix::Type::Vertex)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected destination AttributeMatrix is not a VertexAttributeMatrix").arg(geomName);
-      setErrorCondition(-11002);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
     }
   }
   else // validate AttributeMatrices for all other geometries
@@ -281,16 +330,14 @@ void FindDerivatives::dataCheck()
        inAttrMatType != AttributeMatrix::Type::Cell)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected DataArray does not belong to a Cell, Face, Edge or Vertex AttributeMatrix").arg(geomName);
-      setErrorCondition(-11002);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
     }
     if(geomName == SIMPL::Geometry::QuadGeometry || geomName == SIMPL::Geometry::TriangleGeometry)
     {
       if(destAttrMatType != AttributeMatrix::Type::Face)
       {
         ss = QObject::tr("The Geometry type is %1, but the selected destination Attribute Matrix is not a Face Attribute Matrix").arg(geomName);
-        setErrorCondition(-11002);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11002, ss);
       }
     }
     else if(geomName == SIMPL::Geometry::TetrahedralGeometry || geomName == SIMPL::Geometry::HexahedralGeometry)
@@ -298,8 +345,7 @@ void FindDerivatives::dataCheck()
       if(destAttrMatType != AttributeMatrix::Type::Cell)
       {
         ss = QObject::tr("The Geometry type is %1, but the selected destination Attribute Matrix is not an Cell Attribute Matrix").arg(geomName);
-        setErrorCondition(-11002);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11002, ss);
       }
     }
     else if(geomName == SIMPL::Geometry::EdgeGeometry)
@@ -307,14 +353,13 @@ void FindDerivatives::dataCheck()
       if(destAttrMatType != AttributeMatrix::Type::Edge)
       {
         ss = QObject::tr("The Geometry type is %1, but the selected destination Attribute Matrix is not an Edge Attribute Matrix").arg(geomName);
-        setErrorCondition(-11002);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11002, ss);
       }
     }
   }
 
   m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -349,10 +394,10 @@ void FindDerivatives::preflight()
 // -----------------------------------------------------------------------------
 void FindDerivatives::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -360,23 +405,27 @@ void FindDerivatives::execute()
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(m_SelectedArrayPath.getDataContainerName());
   IGeometry::Pointer geom = m->getGeometry();
 
-  geom->setMessagePrefix(getMessagePrefix());
-  geom->setMessageTitle("Computing Derivatives");
-
   if(m_Interpolate)
   {
     DoubleArrayType::Pointer interpolatedValues =
         DoubleArrayType::CreateArray(m_InArrayPtr.lock()->getNumberOfTuples(), m_InArrayPtr.lock()->getComponentDimensions(), "FIND_DERIVATIVES_INTERNAL_USE_ONLY");
     EXECUTE_FUNCTION_TEMPLATE(this, interpolateCellValues, m_InArrayPtr.lock(), m_InArrayPtr.lock(), interpolatedValues, m)
+
     geom->findDerivatives(interpolatedValues, m_DerivativesArrayPtr.lock(), this);
   }
   else
   {
     EXECUTE_FUNCTION_TEMPLATE(this, findDerivs, m_InArrayPtr.lock(), m_InArrayPtr.lock(), m_DerivativesArrayPtr.lock(), m, this);
   }
+}
 
-  geom->setMessagePrefix("");
-  geom->setMessageTitle("");
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FindDerivatives::processDerivativesMessage(const AbstractMessage::Pointer& msg)
+{
+  FilterMessageHandler msgHandler(this);
+  msg->visit(&msgHandler);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 5122c69ce3..b2141b2552 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -169,6 +169,13 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
    */
   void initialize();
 
+protected slots:
+  /**
+   * @brief processDerivativesMessage
+   * @param msg
+   */
+  void processDerivativesMessage(const AbstractMessage::Pointer& msg);
+
 private:
   DEFINE_IDATAARRAY_WEAKPTR(InArray)
   DEFINE_DATAARRAY_VARIABLE(double, DerivativesArray)
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index da83d6fec3..0736c5e6a2 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -232,8 +232,8 @@ GenerateColorTable::~GenerateColorTable() = default;
 // -----------------------------------------------------------------------------
 void GenerateColorTable::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -268,8 +268,8 @@ void GenerateColorTable::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void GenerateColorTable::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedDataArrayPath());
 
@@ -300,7 +300,10 @@ void GenerateColorTable::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0) { return; }
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
 
   if (getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
   {
@@ -360,8 +363,7 @@ void GenerateColorTable::execute()
   else
   {
     QString ss = QObject::tr("The selected array '%1' does not have a compatible type.").arg(getSelectedDataArrayPath().getDataArrayName());
-    setErrorCondition(-10000);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-10000, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 727283ac23..17d95449b7 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -304,9 +304,8 @@ void ImportAsciDataArray::readHeaderPortion()
     std::ifstream in(filename.toLatin1().constData(), std::ios_base::in | std::ios_base::binary);
     if(!in.is_open())
     {
-      setErrorCondition(RBR_FILE_NOT_OPEN);
       QString errorMessage = QString("Error opening input file '%1'").arg(filename);
-      notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());
+      setErrorCondition(RBR_FILE_NOT_OPEN, errorMessage);
       return;
     }
     
@@ -323,8 +322,7 @@ void ImportAsciDataArray::readHeaderPortion()
       if(err < 0)
       {
         QString errorMessage = QString("Error reading the input file at line %1 of the file").arg(i);
-        notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());
-        setErrorCondition(RBR_READ_ERROR);
+        setErrorCondition(RBR_READ_ERROR, errorMessage);
         return;
       }
     }
@@ -332,8 +330,7 @@ void ImportAsciDataArray::readHeaderPortion()
     err = Detail::readLine(in, buffer, kBufferSize);
     if(err < 0)
     {
-      setErrorCondition(err);
-      notifyErrorMessage(getHumanLabel(), "Error reading the first line of data from the input file", getErrorCondition());
+      setErrorCondition(err, "Error reading the first line of data from the input file");
     }
     
     setFirstLine(buf);
@@ -404,32 +401,29 @@ void ImportAsciDataArray::initialize()
 // -----------------------------------------------------------------------------
 void ImportAsciDataArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QFileInfo fi(getInputFile());
   if(getInputFile().isEmpty())
   {
     QString ss = QObject::tr("The input file must be set");
-    setErrorCondition(-387);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-387, ss);
   }
   else if(!fi.exists())
   {
     QString ss = QObject::tr("The input file does not exist");
-    setErrorCondition(-388);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-388, ss);
   }
 
   if(m_NumberOfComponents < 1)
   {
     QString ss = QObject::tr("The number of components must be positive");
-    setErrorCondition(-391);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-391, ss);
   }
 
   AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCreatedAttributeArrayPath(), -30003);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -510,10 +504,11 @@ void ImportAsciDataArray::preflight()
 // -----------------------------------------------------------------------------
 void ImportAsciDataArray::execute()
 {
-  int32_t err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
+
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -523,6 +518,7 @@ void ImportAsciDataArray::execute()
   char delimiter = converSelectedDelimiter();
 
   QVector<size_t> cDims(1, m_NumberOfComponents);
+  int32_t err = 0;
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
     Int8ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
@@ -625,28 +621,23 @@ void ImportAsciDataArray::execute()
 
   if(err == RBR_FILE_NOT_OPEN)
   {
-    setErrorCondition(RBR_FILE_NOT_OPEN);
-    notifyErrorMessage(getHumanLabel(), "Unable to open the specified file", getErrorCondition());
+    setErrorCondition(RBR_FILE_NOT_OPEN, "Unable to open the specified file");
   }
   else if(err == RBR_FILE_TOO_SMALL)
   {
-    setErrorCondition(RBR_FILE_TOO_SMALL);
-    notifyErrorMessage(getHumanLabel(), "The file size is smaller than the allocated size", getErrorCondition());
+    setErrorCondition(RBR_FILE_TOO_SMALL, "The file size is smaller than the allocated size");
   }
   else if(err == RBR_FILE_TOO_BIG)
   {
-    setWarningCondition(RBR_FILE_TOO_BIG);
-    notifyWarningMessage(getHumanLabel(), "The file size is larger than the allocated size", getWarningCondition());
+    setWarningCondition(RBR_FILE_TOO_BIG, "The file size is larger than the allocated size");
   }
   else if(err == RBR_READ_ERROR)
   {
-    setErrorCondition(RBR_READ_ERROR);
-    notifyErrorMessage(getHumanLabel(), "General read error while importing ASCI file.", getErrorCondition());
+    setErrorCondition(RBR_READ_ERROR, "General read error while importing ASCI file.");
   }
   else if(err == RBR_READ_EOF)
   {
-    setErrorCondition(RBR_READ_EOF);
-    notifyErrorMessage(getHumanLabel(), "ImportAsciDataArray read past the end of the specified file", getErrorCondition());
+    setErrorCondition(RBR_READ_EOF, "ImportAsciDataArray read past the end of the specified file");
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index fbceda4255..d7e818fecb 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -85,7 +85,7 @@ ImportHDF5Dataset::~ImportHDF5Dataset() = default;
 // -----------------------------------------------------------------------------
 void ImportHDF5Dataset::initialize()
 {
-  setErrorCondition(0);
+  clearErrorCode();
   setCancel(false);
 }
 
@@ -117,14 +117,13 @@ void ImportHDF5Dataset::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void ImportHDF5Dataset::dataCheck()
 {
-  setErrorCondition(0);
+  clearErrorCode();
   m_DatasetPathsWithErrors.clear();
 
   if(m_HDF5FilePath.isEmpty())
   {
     QString ss = "The HDF5 file path is empty.  Please select an HDF5 file.";
-    setErrorCondition(-20001);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-20001, ss);
     return;
   }
 
@@ -133,30 +132,27 @@ void ImportHDF5Dataset::dataCheck()
   if(ext != "h5" && ext != "hdf5" && ext != "dream3d")
   {
     QString ss = tr("The selected file '%1' is not an HDF5 file.").arg(hdf5FileInfo.fileName());
-    setErrorCondition(-20002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-20002, ss);
     return;
   }
 
   if(!hdf5FileInfo.exists())
   {
     QString ss = tr("The selected file '%1' does not exist.").arg(hdf5FileInfo.fileName());
-    setErrorCondition(-20003);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-20003, ss);
     return;
   }
 
   if(m_DatasetImportInfoList.isEmpty())
   {
     QString ss = tr("No dataset has been checked.  Please check a dataset.");
-    setErrorCondition(-20004);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-20004, ss);
     return;
   }
 
   int err = 0;
   AttributeMatrix::Pointer am = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, err);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -204,8 +200,7 @@ void ImportHDF5Dataset::dataCheck()
     if(err < 0)
     {
       QString ss = tr("Error reading type info from dataset with path '%1'").arg(datasetPath);
-      setErrorCondition(-20005);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-20005, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);
       return;
     }
@@ -215,8 +210,7 @@ void ImportHDF5Dataset::dataCheck()
     {
       QString ss =
           tr("The component dimensions are empty for dataset with path '%1'.  Please enter the component dimensions, using comma-separated values (ex: 4x2 would be '4, 2').").arg(datasetPath);
-      setErrorCondition(-20006);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-20006, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);
       return;
     }
@@ -225,8 +219,7 @@ void ImportHDF5Dataset::dataCheck()
     if(cDims.isEmpty())
     {
       QString ss = tr("Component Dimensions are not in the right format for dataset with path '%1'. Use comma-separated values (ex: 4x2 would be '4, 2').").arg(datasetPath);
-      setErrorCondition(-20007);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-20007, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);
       return;
     }
@@ -317,22 +310,20 @@ void ImportHDF5Dataset::dataCheck()
                     .arg(locale.toString(numOfAMTuples * totalComponents))
                     .arg(locale.toString(hdf5TotalElements));
 
-      setErrorCondition(-20008);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-20008, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);
       return;
     }
 
     if(am->doesAttributeArrayExist(objectName))
     {
-      setErrorCondition(-20010);
       ss.clear();
 
       DataArrayPath dap = getSelectedAttributeMatrix();
       dap.setDataArrayName(objectName);
 
       stream << tr("The selected dataset '") << dap.serialize("/") << tr("' already exists.");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-20010, ss);
     }
     else
     {
@@ -343,10 +334,9 @@ void ImportHDF5Dataset::dataCheck()
       }
       else
       {
-        setErrorCondition(-20009);
         ss.clear();
         stream << tr("The selected datatset is not a supported type for importing. Please select a different data set");
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-20009, ss);
       }
     }
   } // End For Loop over dataset imoprt info list
@@ -375,7 +365,7 @@ void ImportHDF5Dataset::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 9766005f5f..9bef711254 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -162,14 +162,13 @@ void InitializeData::initialize()
 // -----------------------------------------------------------------------------
 void InitializeData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_CellAttributeMatrixPaths.empty())
   {
     QString ss = "At least one data array must be selected.";
-    setErrorCondition(-5550);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5550, ss);
     return;
   }
 
@@ -185,56 +184,47 @@ void InitializeData::dataCheck()
   if(getXMax() < getXMin())
   {
     QString ss = QObject::tr("X Max (%1) less than X Min (%2)").arg(getXMax()).arg(getXMin());
-    setErrorCondition(-5551);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5551, ss);
   }
   if(getYMax() < getYMin())
   {
     QString ss = QObject::tr("Y Max (%1) less than Y Min (%2)").arg(getYMax()).arg(getYMin());
-    setErrorCondition(-5552);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5552, ss);
   }
   if(getZMax() < getZMin())
   {
     QString ss = QObject::tr("Z Max (%1) less than Z Min (%2)").arg(getZMax()).arg(getZMin());
-    setErrorCondition(-5553);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5553, ss);
   }
   if(getXMin() < 0)
   {
     QString ss = QObject::tr("X Min (%1) less than 0").arg(getXMin());
-    setErrorCondition(-5554);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5554, ss);
   }
   if(getYMin() < 0)
   {
     QString ss = QObject::tr("Y Min (%1) less than 0").arg(getYMin());
-    setErrorCondition(-5555);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5555, ss);
   }
   if(getZMin() < 0)
   {
     QString ss = QObject::tr("Z Min (%1) less than 0").arg(getZMin());
-    setErrorCondition(-5556);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5556, ss);
   }
   if(getXMax() > (static_cast<int64_t>(image->getXPoints()) - 1))
   {
     QString ss = QObject::tr("The X Max you entered of %1 is greater than your Max X Point of %2").arg(getXMax()).arg(static_cast<int64_t>(image->getXPoints()) - 1);
-    setErrorCondition(-5557);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5557, ss);
   }
   if(getYMax() > (static_cast<int64_t>(image->getYPoints()) - 1))
   {
     QString ss = QObject::tr("The Y Max you entered of %1 is greater than your Max Y Point of %2").arg(getYMax()).arg(static_cast<int64_t>(image->getYPoints()) - 1);
-    setErrorCondition(-5558);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5558, ss);
   }
   if(getZMax() > (static_cast<int64_t>(image->getZPoints()) - 1))
   {
     QString ss = QObject::tr("The Z Max you entered of %1) greater than your Max Z Point of %2").arg(getZMax()).arg(static_cast<int64_t>(image->getZPoints()) - 1);
-    setErrorCondition(-5559);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-5559, ss);
   }
 
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
@@ -291,7 +281,7 @@ void InitializeData::dataCheck()
       checkInitialization<double>(p);
     }
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
@@ -310,9 +300,8 @@ template <typename T> void InitializeData::checkInitialization(IDataArray::Point
     double input = m_InitValue;
     if(input < static_cast<double>(std::numeric_limits<T>().lowest()) || input > static_cast<double>(std::numeric_limits<T>().max()))
     {
-      setErrorCondition(-4000);
       QString ss = QObject::tr("%1: The initialization value could not be converted. The valid range is %2 to %3").arg(arrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4000, ss);
       return;
     }
   }
@@ -323,22 +312,19 @@ template <typename T> void InitializeData::checkInitialization(IDataArray::Point
     if(min > max)
     {
       QString ss = arrayName + ": Invalid initialization range.  Minimum value is larger than maximum value.";
-      setErrorCondition(-5550);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-5550, ss);
       return;
     }
     if(min < static_cast<double>(std::numeric_limits<T>().lowest()) || max > static_cast<double>(std::numeric_limits<T>().max()))
     {
-      setErrorCondition(-4001);
       QString ss = QObject::tr("%1: The initialization range can only be from %2 to %3").arg(arrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4001, ss);
       return;
     }
     if(min == max)
     {
-      setErrorCondition(-4002);
       QString ss = arrayName + ": The initialization range must have differing values";
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-4002, ss);
       return;
     }
   }
@@ -362,10 +348,10 @@ void InitializeData::preflight()
 // -----------------------------------------------------------------------------
 void InitializeData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 523e104906..efef56a495 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -98,8 +98,8 @@ void LinkFeatureMapToElementArray::readFilterParameters(AbstractFilterParameters
 // -----------------------------------------------------------------------------
 void LinkFeatureMapToElementArray::updateFeatureInstancePointers()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(nullptr != m_ActivePtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -119,12 +119,12 @@ void LinkFeatureMapToElementArray::initialize()
 // -----------------------------------------------------------------------------
 void LinkFeatureMapToElementArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   DataArrayPath tempPath;
 
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getSelectedCellArrayPath().getDataContainerName(), false);
-  if(getErrorCondition() < 0 || nullptr == m.get())
+  if(getErrorCode() < 0 || nullptr == m.get())
   {
     return;
   }
@@ -140,7 +140,7 @@ void LinkFeatureMapToElementArray::dataCheck()
     m_SelectedCellData = m_SelectedCellDataPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -171,10 +171,10 @@ void LinkFeatureMapToElementArray::preflight()
 // -----------------------------------------------------------------------------
 void LinkFeatureMapToElementArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 4ccd73de52..a43db2fda8 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -93,8 +93,8 @@ void MaskCountDecision::initialize()
 // -----------------------------------------------------------------------------
 void MaskCountDecision::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QVector<size_t> cDims(1, 1);
 
@@ -124,10 +124,10 @@ void MaskCountDecision::preflight()
 // -----------------------------------------------------------------------------
 void MaskCountDecision::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index f4090c671d..cc0291fe0c 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -89,8 +89,8 @@ void MassCreateData::initialize()
 // -----------------------------------------------------------------------------
 void MassCreateData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   const int iterations = 4000;
   for(int i = 0; i < iterations; i++)
@@ -118,10 +118,11 @@ void MassCreateData::preflight()
 // -----------------------------------------------------------------------------
 void MassCreateData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
+
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -131,7 +132,7 @@ void MassCreateData::execute()
     return;
   }
 
-  notifyStatusMessage(getHumanLabel(), "Complete");
+  notifyStatusMessage("Complete");
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 76fdb249a1..b4bc776ec4 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -139,8 +139,8 @@ void MoveData::initialize()
 // -----------------------------------------------------------------------------
 void MoveData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   DataArrayPath amSrcPath = getAttributeMatrixSource();
   DataArrayPath amDestPath = getAttributeMatrixDestination();
   DataArrayPath daSrcPath = getDataArraySource();
@@ -151,16 +151,15 @@ void MoveData::dataCheck()
     DataContainer::Pointer amSrcDataContainer = getDataContainerArray()->getPrereqDataContainer(this, amSrcPath.getDataContainerName());
     AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amSrcPath, -301);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
 
     if(amSrcDataContainer->getName() == amDestDataContainer->getName())
     {
-      setWarningCondition(-11018);
       QString ss = QObject::tr("The source and destination Data Container are the same.  Is this what you meant to do?");
-      notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+      setWarningCondition(-11018, ss);
       return;
     }
 
@@ -174,25 +173,23 @@ void MoveData::dataCheck()
     AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amDestPath, -301);
     IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, daSrcPath);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
 
     if(daDestAttributeMatrix->getNumberOfTuples() != daSrcDataArray->getNumberOfTuples())
     {
-      setErrorCondition(-11019);
       QString ss = QObject::tr("The number of tuples of source Attribute Array (%1) and destination Attribute Matrix (%2) do not match")
                        .arg(daSrcDataArray->getNumberOfTuples())
                        .arg(daDestAttributeMatrix->getNumberOfTuples());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11019, ss);
       return;
     }
     if(amSrcPath == amDestPath)
     {
-      setWarningCondition(-11020);
       QString ss = QObject::tr("The source and destination Attribute Matrix are the same.  Is this what you meant to do?");
-      notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+      setWarningCondition(-11020, ss);
       return;
     }
 
@@ -202,9 +199,8 @@ void MoveData::dataCheck()
   }
   else
   {
-    setErrorCondition(-11021);
     QString ss = QObject::tr("Neither an Attribute Matrix nor an Attribute Array was selected to be moved");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11021, ss);
     return;
   }
 }
@@ -227,11 +223,11 @@ void MoveData::preflight()
 // -----------------------------------------------------------------------------
 void MoveData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   // Simply running the preflight will do what we need it to.
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 4158f3c38b..3969846edb 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -142,8 +142,8 @@ void MoveMultiData::initialize()
 // -----------------------------------------------------------------------------
 void MoveMultiData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   QVector<DataArrayPath> amSrcPaths = getAttributeMatrixSources();
   DataArrayPath amDestPath = getAttributeMatrixDestination();
   QVector<DataArrayPath> daSrcPaths = getDataArraySources();
@@ -158,7 +158,7 @@ void MoveMultiData::dataCheck()
       DataContainer::Pointer amSrcDataContainer = getDataContainerArray()->getPrereqDataContainer(this, amSrcPaths[i].getDataContainerName());
       AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amSrcPaths[i], -301);
 
-      if(getErrorCondition() < 0)
+      if(getErrorCode() < 0)
       {
         return;
       }
@@ -166,9 +166,8 @@ void MoveMultiData::dataCheck()
       // Source and Destination match
       if(amSrcDataContainer->getName() == amDestDataContainer->getName())
       {
-        setWarningCondition(-11018);
         QString ss = QObject::tr("The source and destination Data Container are the same.  Is this what you meant to do?");
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-11018, ss);
         return;
       }
 
@@ -188,7 +187,7 @@ void MoveMultiData::dataCheck()
       AttributeMatrix::Pointer daSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, daSrcPaths[i], -301);
       IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, daSrcPaths[i]);
 
-      if(getErrorCondition() < 0)
+      if(getErrorCode() < 0)
       {
         return;
       }
@@ -196,19 +195,17 @@ void MoveMultiData::dataCheck()
       // Number of tuples does not match
       if(daDestAttributeMatrix->getNumberOfTuples() != daSrcDataArray->getNumberOfTuples())
       {
-        setErrorCondition(-11019);
         QString ss = QObject::tr("The number of tuples of source Attribute Array (%1) and destination Attribute Matrix (%2) do not match")
           .arg(daSrcDataArray->getNumberOfTuples())
           .arg(daDestAttributeMatrix->getNumberOfTuples());
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11019, ss);
         return;
       }
       // Source and Destination match
       if(daSrcPaths[i].hasSameAttributeMatrix(amDestPath))
       {
-        setWarningCondition(-11020);
         QString ss = QObject::tr("The source and destination Attribute Matrix are the same.  Is this what you meant to do?");
-        notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+        setWarningCondition(-11020, ss);
         return;
       }
 
@@ -220,9 +217,8 @@ void MoveMultiData::dataCheck()
   }
   else
   {
-    setErrorCondition(-11021);
     QString ss = QObject::tr("Neither an Attribute Matrix nor an Attribute Array was selected to be moved");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11021, ss);
     return;
   }
 }
@@ -245,11 +241,11 @@ void MoveMultiData::preflight()
 // -----------------------------------------------------------------------------
 void MoveMultiData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   // Simply running the preflight will do what we need it to.
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 8d7b26f616..60cbd4aaf3 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -104,13 +104,12 @@ void MultiThresholdObjects::initialize()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_SelectedThresholds.size() == 0)
   {
-    setErrorCondition(-12000);
-    notifyErrorMessage(getHumanLabel(), "You must add at least 1 threshold value.", getErrorCondition());
+    setErrorCondition(-12000, "You must add at least 1 threshold value.");
   }
   else
   {
@@ -129,15 +128,13 @@ void MultiThresholdObjects::dataCheck()
     // Enforce that right now all the arrays MUST come from the same data container and attribute matrix
     if(dcSet.size() != 1)
     {
-      setErrorCondition(-13090);
       QString ss = QObject::tr("Threshold selections must come from the same DataContainer. %1 were selected").arg(dcSet.size());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-13090, ss);
     }
     if(amSet.size() != 1)
     {
-      setErrorCondition(-13091);
       QString ss = QObject::tr("Threshold selections must come from the same AttributeMatrix. %1 were selected").arg(amSet.size());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-13091, ss);
     }
 
     ComparisonInput_t comp = m_SelectedThresholds[0];
@@ -155,7 +152,7 @@ void MultiThresholdObjects::dataCheck()
       ComparisonInput_t comp = m_SelectedThresholds[i];
       tempPath.update(comp.dataContainerName, comp.attributeMatrixName, comp.attributeArrayName);
       IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, tempPath);
-      if(getErrorCondition() >= 0)
+      if(getErrorCode() >= 0)
       {
         cDims = inputData->getComponentDimensions();
         int32_t numComp = static_cast<int32_t>(cDims[0]);
@@ -166,8 +163,7 @@ void MultiThresholdObjects::dataCheck()
         if(numComp > 1)
         {
           QString ss = QObject::tr("Selected array '%1' is not a scalar array").arg(m_SelectedThresholds[i].attributeArrayName);
-          setErrorCondition(-11003);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(-11003, ss);
         }
       }
     }
@@ -192,10 +188,10 @@ void MultiThresholdObjects::preflight()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects::execute()
 {
-  int32_t err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -213,13 +209,12 @@ void MultiThresholdObjects::execute()
   {
     ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(comp_0.compOperator), comp_0.compValue, m_DestinationPtr.lock().get());
     // Run the first threshold and store the results in our output array
-    err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comp_0.attributeArrayName).get(), m_DestinationPtr.lock().get());
+    int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comp_0.attributeArrayName).get(), m_DestinationPtr.lock().get());
     if(err < 0)
     {
       DataArrayPath tempPath(comp_0.dataContainerName, comp_0.attributeMatrixName, comp_0.attributeArrayName);
       QString ss = QObject::tr("Error Executing threshold filter on first array. The path is %1").arg(tempPath.serialize());
-      setErrorCondition(-13001);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-13001, ss);
       return;
     }
   }
@@ -242,13 +237,12 @@ void MultiThresholdObjects::execute()
 
       ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(compRef.compOperator), compRef.compValue, currentArrayPtr.get());
 
-      err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(compRef.attributeArrayName).get(), currentArrayPtr.get());
+      int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(compRef.attributeArrayName).get(), currentArrayPtr.get());
       if(err < 0)
       {
         DataArrayPath tempPath(compRef.dataContainerName, compRef.attributeMatrixName, compRef.attributeArrayName);
         QString ss = QObject::tr("Error Executing threshold filter on array. The path is %1").arg(tempPath.serialize());
-        setErrorCondition(-13002);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-13002, ss);
         return;
       }
       for(int64_t p = 0; p < totalTuples; ++p)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 82123ac9b1..a1587c7c90 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -104,15 +104,14 @@ void MultiThresholdObjects2::initialize()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects2::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QVector<AbstractComparison::Pointer> comparisonValues = m_SelectedThresholds.getComparisonValues();
 
   if(comparisonValues.empty())
   {
-    setErrorCondition(-12000);
-    notifyErrorMessage(getHumanLabel(), "You must add at least 1 threshold value.", getErrorCondition());
+    setErrorCondition(-12000, "You must add at least 1 threshold value.");
   }
   else
   {
@@ -123,15 +122,13 @@ void MultiThresholdObjects2::dataCheck()
     // Enforce that right now all the arrays MUST come from the same data container and attribute matrix
     if(dcName.isEmpty())
     {
-      setErrorCondition(-13090);
       QString ss = QObject::tr("Threshold must have a DataContainer. None were selected");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-13090, ss);
     }
     if(amName.isEmpty())
     {
-      setErrorCondition(-13091);
       QString ss = QObject::tr("Threshold must have an AttributeMatrix. None were selected");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-13091, ss);
     }
 
     //AbstractComparison::Pointer comp = m_SelectedThresholds[0];
@@ -152,7 +149,7 @@ void MultiThresholdObjects2::dataCheck()
       {
         tempPath.update(dcName, amName, comp->getAttributeArrayName());
         IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, tempPath);
-        if (getErrorCondition() >= 0)
+        if(getErrorCode() >= 0)
         {
           cDims = inputData->getComponentDimensions();
           int32_t numComp = static_cast<int32_t>(cDims[0]);
@@ -163,8 +160,7 @@ void MultiThresholdObjects2::dataCheck()
           if (numComp > 1)
           {
             QString ss = QObject::tr("Selected array '%1' is not a scalar array").arg(comp->getAttributeArrayName());
-            setErrorCondition(-11003);
-            notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+            setErrorCondition(-11003, ss);
           }
         }
       }
@@ -190,10 +186,10 @@ void MultiThresholdObjects2::preflight()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects2::execute()
 {
-  int32_t err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -211,8 +207,7 @@ void MultiThresholdObjects2::execute()
   if (!m_SelectedThresholds.hasComparisonValue())
   {
     QString ss = QObject::tr("Error Executing threshold filter. There are no specified values to threshold against");
-    setErrorCondition(-13001);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-13001, ss);
     return;
   }
 
@@ -224,6 +219,8 @@ void MultiThresholdObjects2::execute()
     createBoolArray(thresholdSize, thresholdArray);
     bool firstValueFound = false;
 
+    int32_t err = 0;
+
     // Loop on the remaining Comparison objects updating our final result array as we go
     for(int32_t i = 0; i < m_SelectedThresholds.size() && err >= 0; ++i)
     {
@@ -412,8 +409,7 @@ void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonV
   {
     DataArrayPath tempPath(m_SelectedThresholds.getDataContainerName(), m_SelectedThresholds.getAttributeMatrixName(), comparisonValue->getAttributeArrayName());
     QString ss = QObject::tr("Error Executing threshold filter on array. The path is %1").arg(tempPath.serialize());
-    setErrorCondition(-13002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-13002, ss);
     return;
   }
   
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 451536db8f..f5f228daea 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -72,8 +72,8 @@ void PipelineAnnotation::initialize()
 // -----------------------------------------------------------------------------
 void PipelineAnnotation::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -95,10 +95,10 @@ void PipelineAnnotation::preflight()
 // -----------------------------------------------------------------------------
 void PipelineAnnotation::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index ae09b864dd..747c1e3527 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -73,8 +73,8 @@ PostSlackMessage::~PostSlackMessage()
 // -----------------------------------------------------------------------------
 void PostSlackMessage::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -98,8 +98,8 @@ void PostSlackMessage::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void PostSlackMessage::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -123,7 +123,7 @@ void PostSlackMessage::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -162,15 +162,13 @@ void PostSlackMessage::execute()
   {
     if(getWarningsAsError())
     {
-      setErrorCondition(-76000);
-      QString ss = QObject::tr("Slack returned the following error code: %1").arg(getErrorCondition());
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      QString ss = QObject::tr("Slack returned the following error code: %1").arg(getErrorCode());
+      setErrorCondition(-76000, ss);
     }
     else
     {
-      setWarningCondition(-76001);
-      QString ss = QObject::tr("Slack returned the following error code: %1").arg(getErrorCondition());
-      notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+      QString ss = QObject::tr("Slack returned the following error code: %1").arg(getErrorCode());
+      setWarningCondition(-76001, ss);
     }
   }
 
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 662a5a38ea..5a8dd0dd7d 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -245,32 +245,29 @@ void RawBinaryReader::initialize()
 // -----------------------------------------------------------------------------
 void RawBinaryReader::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   QFileInfo fi(getInputFile());
   if(getInputFile().isEmpty())
   {
     QString ss = QObject::tr("The input file must be set");
-    setErrorCondition(-387);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-387, ss);
   }
   else if(!fi.exists())
   {
     QString ss = QObject::tr("The input file does not exist");
-    setErrorCondition(-388);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-388, ss);
   }
 
   if(m_NumberOfComponents < 1)
   {
     QString ss = QObject::tr("The number of components must be positive");
-    setErrorCondition(-391);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-391, ss);
   }
 
   AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCreatedAttributeArrayPath(), -30003);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -341,8 +338,7 @@ void RawBinaryReader::dataCheck()
                              " Please adjust the input parameters to match the size of the file or select a different data file")
                      .arg(fileSize)
                      .arg(allocatedBytes);
-    setErrorCondition(RBR_FILE_TOO_SMALL);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(RBR_FILE_TOO_SMALL, ss);
   }
   else if(check == 1)
   {
@@ -351,8 +347,7 @@ void RawBinaryReader::dataCheck()
                              " SIMPLView will read only the first part of the file into the array")
                      .arg(fileSize)
                      .arg(allocatedBytes);
-    setWarningCondition(RBR_FILE_TOO_BIG);
-    notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+    setWarningCondition(RBR_FILE_TOO_BIG, ss);
   }
 }
 
@@ -374,16 +369,17 @@ void RawBinaryReader::preflight()
 // -----------------------------------------------------------------------------
 void RawBinaryReader::execute()
 {
-  int32_t err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getCreatedAttributeArrayPath().getDataContainerName());
 
+  int32_t err = 0;
   switch(m_ScalarType)
   {
   case SIMPL::NumericTypes::Type::Int8:
@@ -428,23 +424,19 @@ void RawBinaryReader::execute()
 
   if(err == RBR_FILE_NOT_OPEN)
   {
-    setErrorCondition(RBR_FILE_NOT_OPEN);
-    notifyErrorMessage(getHumanLabel(), "Unable to open the specified file", getErrorCondition());
+    setErrorCondition(RBR_FILE_NOT_OPEN, "Unable to open the specified file");
   }
   else if(err == RBR_FILE_TOO_SMALL)
   {
-    setErrorCondition(RBR_FILE_TOO_SMALL);
-    notifyErrorMessage(getHumanLabel(), "The file size is smaller than the allocated size", getErrorCondition());
+    setErrorCondition(RBR_FILE_TOO_SMALL, "The file size is smaller than the allocated size");
   }
   else if(err == RBR_FILE_TOO_BIG)
   {
-    setWarningCondition(RBR_FILE_TOO_BIG);
-    notifyWarningMessage(getHumanLabel(), "The file size is larger than the allocated size", getWarningCondition());
+    setWarningCondition(RBR_FILE_TOO_BIG, "The file size is larger than the allocated size");
   }
   else if(err == RBR_READ_EOF)
   {
-    setErrorCondition(RBR_READ_EOF);
-    notifyErrorMessage(getHumanLabel(), "RawBinaryReader read past the end of the specified file", getErrorCondition());
+    setErrorCondition(RBR_READ_EOF, "RawBinaryReader read past the end of the specified file");
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index f63fc8753a..740110d08e 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -240,16 +240,15 @@ void ReadASCIIData::initialize()
 // -----------------------------------------------------------------------------
 void ReadASCIIData::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   m_ASCIIArrayMap.clear();
 
   ASCIIWizardData wizardData = getWizardData();
   if(wizardData.isEmpty())
   {
     QString ss = "A file has not been chosen to import. Please pick a file to import.";
-    setErrorCondition(EMPTY_FILE);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(EMPTY_FILE, ss);
     return;
   }
 
@@ -265,8 +264,7 @@ void ReadASCIIData::dataCheck()
   if(inputFilePath.isEmpty())
   {
     QString ss = QObject::tr("The input file must be set");
-    setErrorCondition(-387);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-387, ss);
   }
 
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
@@ -276,8 +274,7 @@ void ReadASCIIData::dataCheck()
   if(!fi.exists())
   {
     QString ss = QObject::tr("The input file does not exist");
-    setErrorCondition(-388);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-388, ss);
   }
 
   if(!automaticAM)
@@ -286,8 +283,7 @@ void ReadASCIIData::dataCheck()
     if(nullptr == am.get())
     {
       QString ss = "The attribute matrix input is empty. Please select an attribute matrix.";
-      setErrorCondition(EMPTY_ATTR_MATRIX);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(EMPTY_ATTR_MATRIX, ss);
       return;
     }
 
@@ -301,8 +297,7 @@ void ReadASCIIData::dataCheck()
         if(amArrayName == headerName)
         {
           QString ss = "The header name \"" + headerName + "\" matches an array name that already exists in the selected attribute matrix.";
-          setErrorCondition(DUPLICATE_NAMES);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(DUPLICATE_NAMES, ss);
           return;
         }
       }
@@ -318,8 +313,7 @@ void ReadASCIIData::dataCheck()
     //      QTextStream out(&ss);
     //      out << selectedPath.getAttributeMatrixName() << " tuple dims: " << am->getTupleDimensions().at(0) << "\n";
     //      out << fi.fileName() << "tuple dims: " << tDims[0] << "\n";
-    //      setErrorCondition(INCONSISTENT_TUPLES);
-    //      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    //      setErrorCondition(INCONSISTENT_TUPLES, ss);
     //      return;
     //    }
 
@@ -409,8 +403,7 @@ void ReadASCIIData::dataCheck()
     else
     {
       QString ss = "The data type that was chosen for column number " + QString::number(i + 1) + " is not a valid data array type.";
-      setErrorCondition(INVALID_ARRAY_TYPE);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(INVALID_ARRAY_TYPE, ss);
       return;
     }
   }
@@ -435,11 +428,11 @@ void ReadASCIIData::preflight()
 // -----------------------------------------------------------------------------
 void ReadASCIIData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -558,8 +551,7 @@ void ReadASCIIData::execute()
         out << "Expecting " << dataTypes.size() << " but found " << tokens.size() << "\n";
         out << "Input line was:\n";
         out << line;
-        setErrorCondition(INCONSISTENT_COLS);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(INCONSISTENT_COLS, ss);
         return;
       }
 
@@ -573,8 +565,7 @@ void ReadASCIIData::execute()
         {
           QString errorMessage = obj.errorMessage;
           QString ss = errorMessage + "(line " + QString::number(lineNum) + ", column " + QString::number(index) + ").";
-          setErrorCondition(CONVERSION_FAILURE);
-          notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+          setErrorCondition(CONVERSION_FAILURE, ss);
           return;
         }
       }
@@ -583,7 +574,7 @@ void ReadASCIIData::execute()
       {
         // Print the status of the import
         QString ss = QObject::tr("Importing ASCII Data || %1% Complete").arg((static_cast<float>(lineNum) / numTuples) * 100.0f, 0, 'f', 0);
-        notifyStatusMessage(getMessagePrefix(), getHumanLabel(), ss);
+        notifyStatusMessage(ss);
         threshold = threshold + 5.0f;
         if(threshold < (static_cast<float>(lineNum) / numTuples) * 100.0f)
         {
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 9ef8cdfe42..a0239949ac 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -95,8 +95,8 @@ void RemoveArrays::initialize()
 // -----------------------------------------------------------------------------
 void RemoveArrays::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   markSelectionsForDeletion(getDataContainerArray().get(), Qt::Checked);
 
@@ -140,7 +140,7 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
     DataContainerProxy dcProxy = containerIter.next();
     dcList.push_back(dcProxy.getName());
     DataContainer::Pointer dcItem = dca->getPrereqDataContainer(this, dcProxy.getName());
-    if(getErrorCondition() < 0 || dcItem.get() == nullptr)
+    if(getErrorCode() < 0 || dcItem.get() == nullptr)
     {
       continue;
     }
@@ -163,9 +163,8 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
       // assert(amItem.get() != nullptr);
       if(amItem.get() == nullptr)
       {
-        setErrorCondition(-11008);
         QString ss = QObject::tr("The AttributeMatrix '%1' could not be removed because it was not found in DataContainer '%2'").arg(amName).arg(dcProxy.getName());
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11008, ss);
         continue;
       }
       AttributeMatrixProxy attrProxy = attrMatsIter.value();
@@ -186,9 +185,8 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
         IDataArray::Pointer daItem = amItem->getAttributeArray(daName);
         if(daItem.get() == nullptr)
         {
-          setWarningCondition(-11009);
           QString ss = QObject::tr("%1/%2/%3 was not found. This could be due to another filter removing the array.").arg(dcProxy.getName()).arg(amName).arg(daName);
-          notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+          setWarningCondition(-11009, ss);
           continue;
         }
         DataArrayProxy daProxy = dataArraysIter.value();
@@ -217,11 +215,11 @@ std::list<DataArrayPath> RemoveArrays::getDeletedPaths()
 // -----------------------------------------------------------------------------
 void RemoveArrays::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   // Simply running the preflight will do what we need it to.
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 3588ecb853..a92928291e 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -117,8 +117,8 @@ void RemoveComponentFromArray::initialize()
 // -----------------------------------------------------------------------------
 void RemoveComponentFromArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
 
@@ -126,42 +126,38 @@ void RemoveComponentFromArray::dataCheck()
   {
     if(m_NewArrayArrayName.isEmpty())
     {
-      setErrorCondition(-11001);
-      notifyErrorMessage(getHumanLabel(), "Removed Component array name must be set.", getErrorCondition());
+      setErrorCondition(-11001, "Removed Component array name must be set.");
       return;
     }
   }
 
   if(m_ReducedArrayArrayName.isEmpty())
   {
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), "Reduced array name must be set.", getErrorCondition());
+    setErrorCondition(-11002, "Reduced array name must be set.");
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   if(m_InArrayPtr.lock()->getNumberOfComponents() < 2)
   {
-    setErrorCondition(-11003);
     QString ss = QObject::tr("Selected array '%1' must have more than 1 component. The number of components is %2")
                      .arg(getSelectedArrayPath().getDataArrayName())
                      .arg(m_InArrayPtr.lock()->getNumberOfComponents());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11003, ss);
     return;
   }
 
   if(m_CompNumber >= m_InArrayPtr.lock()->getNumberOfComponents())
   {
-    setErrorCondition(-11004);
     QString ss = QObject::tr("Error removing component from DataArray '%3', Component to remove (%1) is greater than or equal to the number of components (%2) for array selected.")
                      .arg(m_CompNumber)
                      .arg(m_InArrayPtr.lock()->getNumberOfComponents())
                      .arg(getSelectedArrayPath().getDataArrayName());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11004, ss);
     return;
   }
 
@@ -272,10 +268,10 @@ template <typename T> void reduceArrayOnly(IDataArray::Pointer inputData, IDataA
 // -----------------------------------------------------------------------------
 void RemoveComponentFromArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 22a34530fd..9ce24bcc63 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -93,14 +93,13 @@ void RenameAttributeArray::initialize()
 // -----------------------------------------------------------------------------
 void RenameAttributeArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_NewArrayName.isEmpty())
   {
-    setErrorCondition(-11009);
     QString ss = QObject::tr("The new Attribute Array name must be set");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11009, ss);
     return;
   }
 
@@ -118,7 +117,7 @@ void RenameAttributeArray::dataCheck()
   }
 
   AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedArrayPath(), -301);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -128,29 +127,26 @@ void RenameAttributeArray::dataCheck()
   {
   case OLD_DOES_NOT_EXIST:
   {
-    setErrorCondition(-11016);
     QString ss = QObject::tr("A DataArray with the name '%1' was not found in the AttributeMatrix").arg(daName);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11016, ss);
     return;
   }
   case NEW_EXISTS:
   {
-    setErrorCondition(-11017);
     QString ss = QObject::tr("A DataArray with the name '%1' already exists in the AttributeMatrix").arg(m_NewArrayName);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11017, ss);
     return;
   }
   case RenameErrorCodes::SAME_PATH:
   {
-    setErrorCondition(-11018);
     QString ss = QObject::tr("The new and original DataArray names cannot be identical");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11018, ss);
     return;
   }
   case SUCCESS:
   {
-    setErrorCondition(0);
-    setWarningCondition(0);
+    clearErrorCode();
+    clearWarningCode();
     DataArrayPath newPath = getSelectedArrayPath();
     newPath.setDataArrayName(m_NewArrayName);
     addPathRename(getSelectedArrayPath(), newPath);
@@ -177,10 +173,10 @@ void RenameAttributeArray::preflight()
 // -----------------------------------------------------------------------------
 void RenameAttributeArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index fb6ce29eaf..baf43ebbc3 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -95,14 +95,13 @@ void RenameAttributeMatrix::initialize()
 // -----------------------------------------------------------------------------
 void RenameAttributeMatrix::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_NewAttributeMatrix.isEmpty())
   {
-    setErrorCondition(-11004);
     QString ss = QObject::tr("The new Attribute Matrix name must be set");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11004, ss);
     return;
   }
 
@@ -121,7 +120,7 @@ void RenameAttributeMatrix::dataCheck()
   DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedAttributeMatrixPath().getDataContainerName());
   getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedAttributeMatrixPath(), -301);
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -129,9 +128,8 @@ void RenameAttributeMatrix::dataCheck()
   bool check = dc->renameAttributeMatrix(amName, getNewAttributeMatrix());
   if(!check)
   {
-    setErrorCondition(-11006);
     QString ss = QObject::tr("Attempt to rename Attribute Matrix '%1' to '%2' failed").arg(amName).arg(getNewAttributeMatrix());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11006, ss);
   }
   else
   {
@@ -159,10 +157,10 @@ void RenameAttributeMatrix::preflight()
 // -----------------------------------------------------------------------------
 void RenameAttributeMatrix::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index a346244be0..df8efd2c5d 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -84,14 +84,13 @@ void RenameDataContainer::initialize()
 // -----------------------------------------------------------------------------
 void RenameDataContainer::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(getNewDataContainerName().isEmpty())
   {
-    setErrorCondition(-11001);
     QString ss = QObject::tr("The new Data Container name must be set");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11001, ss);
     return;
   }
 
@@ -104,7 +103,7 @@ void RenameDataContainer::dataCheck()
   }
 
   getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainerName());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -112,9 +111,8 @@ void RenameDataContainer::dataCheck()
   bool check = getDataContainerArray()->renameDataContainer(getSelectedDataContainerName(), getNewDataContainerName());
   if(!check)
   {
-    setErrorCondition(-11006);
     QString ss = QObject::tr("Attempt to rename DataContainer '%1' to '%2' failed").arg(getSelectedDataContainerName().getDataContainerName()).arg(getNewDataContainerName().getDataContainerName());
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11006, ss);
   }
   else
   {
@@ -142,10 +140,10 @@ void RenameDataContainer::preflight()
 // -----------------------------------------------------------------------------
 void RenameDataContainer::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 998212ade2..a13fb64b43 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -95,14 +95,12 @@ template <typename T> void checkValuesInt(AbstractFilter* filter, double removeV
   if(!((removeValue >= std::numeric_limits<T>::min()) && (removeValue <= std::numeric_limits<T>::max())))
   {
     ss = QObject::tr("The %1 remove value was invalid. The valid range is %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-100);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-100, ss);
   }
   if(!((replaceValue >= std::numeric_limits<T>::min()) && (replaceValue <= std::numeric_limits<T>::max())))
   {
     ss = QObject::tr("The %1 replace value was invalid. The valid range is %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-100);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-100, ss);
   }
 }
 
@@ -117,15 +115,13 @@ template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double
        ((removeValue >= std::numeric_limits<T>::min()) && (removeValue <= std::numeric_limits<T>::max()))))
   {
     ss = QObject::tr("The %1 remove value was invalid. The valid ranges are -%3 to -%2, 0, %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-101);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-101, ss);
   }
   if(!(((replaceValue >= static_cast<T>(-1) * std::numeric_limits<T>::max()) && (replaceValue <= static_cast<T>(-1) * std::numeric_limits<T>::min())) || (replaceValue == 0) ||
        ((replaceValue >= std::numeric_limits<T>::min()) && (replaceValue <= std::numeric_limits<T>::max()))))
   {
     ss = QObject::tr("The %1 replace value was invalid. The valid ranges are -%3 to -%2, 0, %2 to %3").arg(strType).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-    filter->setErrorCondition(-101);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-101, ss);
   }
 }
 
@@ -164,11 +160,11 @@ void ReplaceValueInArray::initialize()
 // -----------------------------------------------------------------------------
 void ReplaceValueInArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArray());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -178,8 +174,7 @@ void ReplaceValueInArray::dataCheck()
     QString ss = QObject::tr("Selected array '%1' must be a scalar array (1 component). The number of components is %2")
                      .arg(getSelectedArray().getDataArrayName())
                      .arg(m_ArrayPtr.lock()->getNumberOfComponents());
-    setErrorCondition(-11002);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11002, ss);
     return;
   }
 
@@ -237,9 +232,8 @@ void ReplaceValueInArray::dataCheck()
   }
   else
   {
-    setErrorCondition(-4060);
     QString ss = QObject::tr("Incorrect data scalar type");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-4060, ss);
   }
 }
 
@@ -261,10 +255,10 @@ void ReplaceValueInArray::preflight()
 // -----------------------------------------------------------------------------
 void ReplaceValueInArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 6619fbe842..43893d0b11 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -100,15 +100,15 @@ void RequiredZThickness::initialize()
 // -----------------------------------------------------------------------------
 void RequiredZThickness::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
-  if(getErrorCondition() < 0)
+  clearErrorCode();
+  clearWarningCode();
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   DataContainer::Pointer dataContainer = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerSelection());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -116,8 +116,7 @@ void RequiredZThickness::dataCheck()
   ImageGeom::Pointer image = dataContainer->getGeometryAs<ImageGeom>();
   if(nullptr == image.get())
   {
-    setErrorCondition(-7789);
-    notifyErrorMessage(getHumanLabel(), "Missing Image Geometry in the selected DataContainer", getErrorCondition());
+    setErrorCondition(-7789, "Missing Image Geometry in the selected DataContainer");
     return;
   }
 
@@ -126,14 +125,13 @@ void RequiredZThickness::dataCheck()
 
   if(dims[2] < getNumZVoxels() && m_PreflightCheck)
   {
-    setErrorCondition(-7787);
     QString str;
     QTextStream ss(&str);
     ss << "Number of Z Voxels does not meet required value during preflight of the filter. \n";
     ss << "  Required Z Voxels: " << m_NumZVoxels << "\n";
     ss << "  Current Z Voxels: " << dims[2];
 
-    notifyErrorMessage(getHumanLabel(), str, getErrorCondition());
+    setErrorCondition(-7787, str);
   }
   else if(dims[2] < getNumZVoxels() && !m_PreflightCheck)
   {
@@ -143,8 +141,7 @@ void RequiredZThickness::dataCheck()
     ss << "  Required Z Voxels: " << m_NumZVoxels << "\n";
     ss << "  Current Z Voxels: " << dims[2];
 
-    setWarningCondition(-7788);
-    notifyWarningMessage(getHumanLabel(), str, getWarningCondition());
+    setWarningCondition(-7788, str);
   }
 }
 
@@ -166,16 +163,16 @@ void RequiredZThickness::preflight()
 // -----------------------------------------------------------------------------
 void RequiredZThickness::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   DataContainer::Pointer dataContainer = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerSelection());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -193,8 +190,7 @@ void RequiredZThickness::execute()
     ss << "  Required Z Voxels: " << m_NumZVoxels << "\n";
     ss << "  Current Z Voxels: " << dims[2];
 
-    setErrorCondition(-7788);
-    notifyErrorMessage(getHumanLabel(), str, getErrorCondition());
+    setErrorCondition(-7788, str);
     bool needMoreData = true;
     emit decisionMade(needMoreData);
   }
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 842ef84059..40cc648246 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -165,8 +165,8 @@ void ScaleVolume::initialize()
 // -----------------------------------------------------------------------------
 void ScaleVolume::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   if(m_ApplyToVoxelVolume)
   {
@@ -197,8 +197,8 @@ void ScaleVolume::preflight()
 // -----------------------------------------------------------------------------
 void ScaleVolume::updateSurfaceMesh()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   tbb::task_scheduler_init init;
@@ -261,10 +261,10 @@ void ScaleVolume::updateSurfaceMesh()
 // -----------------------------------------------------------------------------
 void ScaleVolume::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index e603fd791a..a70e0e29d6 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -160,11 +160,11 @@ void SetOriginResolutionImageGeom::initialize()
 // -----------------------------------------------------------------------------
 void SetOriginResolutionImageGeom::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getDataContainerName());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -196,10 +196,10 @@ void SetOriginResolutionImageGeom::preflight()
 // -----------------------------------------------------------------------------
 void SetOriginResolutionImageGeom::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 99a92d540f..9c7fcc391f 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -98,13 +98,13 @@ void SplitAttributeArray::initialize()
 // -----------------------------------------------------------------------------
 void SplitAttributeArray::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
 
   m_InputArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getInputArrayPath());
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -115,8 +115,7 @@ void SplitAttributeArray::dataCheck()
     if(numComps <= 1)
     {
       QString ss = QObject::tr("Selected Attribute Array must have more than 1 component");
-      setErrorCondition(-11000);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11000, ss);
       return;
     }
 
@@ -127,23 +126,21 @@ void SplitAttributeArray::dataCheck()
       QString arrayName = getInputArrayPath().getDataArrayName() + getSplitArraysSuffix() + QString::number(i);
       DataArrayPath path(getInputArrayPath().getDataContainerName(), getInputArrayPath().getAttributeMatrixName(), arrayName);
       IDataArray::WeakPointer ptr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, path, cDims, m_InputArrayPtr.lock(), SplitArrayID + i);
-      if(getErrorCondition() >= 0)
+      if(getErrorCode() >= 0)
       {
         m_SplitArraysPtrVector.push_back(ptr.lock());
       }
       else
       {
         QString ss = QObject::tr("Unable to create an Attribute Array for component %1 in the selected multicomponent Attribute Array").arg(i);
-        setErrorCondition(-11051);
-        notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+        setErrorCondition(-11051, ss);
       }
     }
 
     if(numComps != m_SplitArraysPtrVector.size())
     {
       QString ss = QObject::tr("The number of created arrays %1 does not match the number of components %2").arg(m_SplitArraysPtrVector.size()).arg(numComps);
-      setErrorCondition(-11001);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11001, ss);
     }
   }
 }
@@ -195,10 +192,10 @@ template <typename T> void splitMulticomponentArray(IDataArray::Pointer inputArr
 // -----------------------------------------------------------------------------
 void SplitAttributeArray::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index d32429865e..338baf451e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -62,7 +62,7 @@ class DummyObserver : public Observer
   ~DummyObserver() override = default;
   SIMPL_TYPE_MACRO(DummyObserver)
 
-  void processPipelineMessage(const PipelineMessage& pm) override
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override
   {
     // Don't do anything...this class only exists to stifle the messages being dumped to the console
   }
@@ -183,13 +183,13 @@ class ArrayCalculatorTest
     propWasSet = filter->setProperty("Units", units);
     DREAM3D_REQUIRE_EQUAL(propWasSet, true);
     filter->execute();
-    if(filter->getErrorCondition() < 0 && expectedErrorCondition == CalculatorItem::ErrorCode::SUCCESS)
+    if(filter->getErrorCode() < 0 && expectedErrorCondition == CalculatorItem::ErrorCode::SUCCESS)
     {
-      std::cout << "    Error " << filter->getErrorCondition() << " executing filter." << std::endl;
+      std::cout << "    Error " << filter->getErrorCode() << " executing filter." << std::endl;
     }
 
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(expectedErrorCondition));
-    DREAM3D_REQUIRE_EQUAL(filter->getWarningCondition(), static_cast<int>(expectedWarningCondition));
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(expectedErrorCondition));
+    DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(expectedWarningCondition));
 
     DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), targetArrayPath);
 
@@ -234,7 +234,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "MultiComponent Array1 + MultiComponent Array2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == mcArray1->getNumberOfComponents());
@@ -260,7 +260,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "MultiComponent Array1[1] + MultiComponent Array2[0]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == 1);
@@ -285,7 +285,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + 2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents());
@@ -311,7 +311,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents());
@@ -337,7 +337,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == 1);
@@ -362,7 +362,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_COMP_DIMS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_COMP_DIMS));
     }
 
     // Out of bounds error
@@ -378,7 +378,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[3]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::COMPONENT_OUT_OF_RANGE));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::COMPONENT_OUT_OF_RANGE));
     }
   }
 
@@ -452,7 +452,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "-InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray1->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
@@ -469,7 +469,7 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "InputArray2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
@@ -491,8 +491,8 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "Spaced Array + InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DREAM3D_REQUIRE_EQUAL(filter->getWarningCondition(), static_cast<int>(CalculatorItem::WarningCode::NONE));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(CalculatorItem::WarningCode::NONE));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == spacedArray->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
@@ -512,8 +512,8 @@ class ArrayCalculatorTest
       propWasSet = filter->setProperty("InfixEquation", "sqrt((InputArray1^2)+(InputArray2^2))");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DREAM3D_REQUIRE_EQUAL(filter->getWarningCondition(), static_cast<int>(CalculatorItem::WarningCode::NONE));
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
+      DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(CalculatorItem::WarningCode::NONE));
       DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 1dda1c8587..b7b595ccfd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -214,7 +214,7 @@ class CombineAttributeArraysTest
     }
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
 
     auto outputArrayPtr = filter->getDataContainerArray()->getDataContainer("CombineAttributeArraysTest")->getAttributeMatrix("CombineAttributeArraysTest")->getAttributeArray("CombinedData");
@@ -242,7 +242,7 @@ class CombineAttributeArraysTest
     }
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
 
     outputArrayPtr = filter->getDataContainerArray()->getDataContainer("CombineAttributeArraysTest")->getAttributeMatrix("CombineAttributeArraysTest")->getAttributeArray("CombinedData");
@@ -272,7 +272,7 @@ class CombineAttributeArraysTest
     }
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
 
     outputArrayPtr = filter->getDataContainerArray()->getDataContainer("CombineAttributeArraysTest")->getAttributeMatrix("CombineAttributeArraysTest")->getAttributeArray("CombinedData");
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index f467864f70..8b5afc6cb0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -96,7 +96,7 @@
     qDebug() << "Unable to set property CombinedAttributeMatrixName";                                                                                                                                  \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, errVal);
 
 #define CHECK_FOR_PASS1(filter, featureIds1, featureIds2, attrMat1, attrMat2, newIndex, newAttrMat)                                                                                                    \
@@ -137,7 +137,7 @@
     qDebug() << "Unable to set property CombinedAttributeMatrixName";                                                                                                                                  \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
   validateCombinedEnsembleAMs(filter, featureIds1, featureIds2, attrMat1, attrMat2, newIndex, newAttrMat);
 
@@ -179,7 +179,7 @@
     qDebug() << "Unable to set property CombinedAttributeMatrixName";                                                                                                                                  \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
   validateCombinedFeatureAMs(filter, featureIds1, featureIds2, attrMat1, attrMat2, newIndex, newAttrMat);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 81410ef523..5bfa627cc5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -82,7 +82,7 @@
     qDebug() << "Unable to set property ReplaceValue";                                                                                                                                                 \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, errVal);
 
 #ifdef SET_PROPERTIES_AND_CHECK_EQ
@@ -109,7 +109,7 @@
     qDebug() << "Unable to set property ReplaceValue";                                                                                                                                                 \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
   dataArray = dc->getAttributeMatrix(selectedArray.getAttributeMatrixName())->getAttributeArray(selectedArray.getDataArrayName());                                                                     \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index ceeac091a4..d9e44d5fc6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -415,7 +415,7 @@ class ConvertColorToGrayScaleTest
     Observer obs;
     m_colorToGrayscaleFilter->connect(m_colorToGrayscaleFilter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
     m_colorToGrayscaleFilter->execute();
-    int erred = m_colorToGrayscaleFilter->getErrorCondition();
+    int erred = m_colorToGrayscaleFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(erred, 0);
     int wrongValues = CompareResults(algoMapIndex);
     DREAM3D_REQUIRE_EQUAL(wrongValues, 0)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index dad4d27f1e..21873e7c72 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -215,7 +215,7 @@ class ConvertDataTest
   {
     setValues(filter, arrayName, newType, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     if(checkArray)
     {
@@ -583,7 +583,7 @@ class ConvertDataTest
 
     setValues(filter, "Array1", SIMPL::NumericTypes::Type::Int8, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -90002);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -90002);
   }
 
   // -----------------------------------------------------------------------------
@@ -600,7 +600,7 @@ class ConvertDataTest
 
     setValues(filter, "DataArray", SIMPL::NumericTypes::Type::Int8, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index c55e883159..ff780aa7a5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -173,7 +173,7 @@ class CopyFeatureArrayToElementArrayTest
     // Run filter
 
     copyFeatureArrayToElementArray->execute();
-    DREAM3D_REQUIRED(copyFeatureArrayToElementArray->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(copyFeatureArrayToElementArray->getErrorCode(), >=, 0);
 
     // Check filter results
     QString dbg;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index b55eca99b9..8988f16817 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -597,7 +597,7 @@ class CopyObjectTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 063bd3bc91..beda654b64 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -166,7 +166,7 @@ class CreateAttributeMatrixTest
 
     setValues(filter, "DataContainer", amName, tableDims, type);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
     TestMatrixTupleDims(filter, tableDims, amName);
   }
 
@@ -305,7 +305,7 @@ class CreateAttributeMatrixTest
 
     setValues(filter, "DataContainer2", "AttributeMatrix", tableDims, AttributeMatrix::Type::Any);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -999);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -999);
   }
 
   // -----------------------------------------------------------------------------
@@ -320,11 +320,11 @@ class CreateAttributeMatrixTest
 
     setValues(filter, "DataContainer", "AttributeMatrix", tableDims, AttributeMatrix::Type::Any);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
     TestMatrixTupleDims(filter, tableDims, "AttributeMatrix");
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -10014);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -10014);
   }
 
   // -----------------------------------------------------------------------------
@@ -346,14 +346,14 @@ class CreateAttributeMatrixTest
 
     setValues(filter, "DataContainer", "AttributeMatrix", tableDims, AttributeMatrix::Type::Any);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11000);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11000);
 
     tableDims.clear();
     tableDims.resize(0);
 
     setValues(filter, "DataContainer", "AttributeMatrix", tableDims, AttributeMatrix::Type::Any);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11000);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11000);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index febf15296f..e0daeffae5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -133,7 +133,7 @@ class CreateDataArrayTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->preflight();
-      err = filter->getErrorCondition();
+      err = filter->getErrorCode();
       DREAM3D_REQUIRED(err, >=, 0)
     }
 
@@ -156,7 +156,7 @@ class CreateDataArrayTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->preflight();
-      err = filter->getErrorCondition();
+      err = filter->getErrorCode();
       DREAM3D_REQUIRED(err, >=, 0)
     }
 
@@ -211,13 +211,13 @@ class CreateDataArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true);
 
     filter->preflight();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     {
@@ -239,14 +239,14 @@ class CreateDataArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->preflight();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     {
@@ -306,7 +306,7 @@ class CreateDataArrayTest
         DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
             filter->execute();
-        err = filter->getErrorCondition();
+        err = filter->getErrorCode();
         DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
         IDataArray::Pointer boolArray = m->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
@@ -328,7 +328,7 @@ class CreateDataArrayTest
         DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
             filter->execute();
-        err = filter->getErrorCondition();
+        err = filter->getErrorCode();
         DREAM3D_REQUIRE_EQUAL(err, k_Int8Error);
 
 #endif
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index 95f2d49e6c..702aafa0bc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -118,7 +118,7 @@ class CreateDataContainerTest
 
     setValues(filter, dataContainer);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), errorCode)
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), errorCode)
   }
 
   // -----------------------------------------------------------------------------
@@ -141,10 +141,10 @@ class CreateDataContainerTest
 
     setValues(filter, dataContainer);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -889)
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -889)
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 7263b4628f..38c2559e81 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -328,7 +328,7 @@ class CreateFeatureArrayFromElementArrayTest
         DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
         createFeatureArrayFromElementArrayFilter->execute();
-        int err = createFeatureArrayFromElementArrayFilter->getErrorCondition();
+        int err = createFeatureArrayFromElementArrayFilter->getErrorCode();
         DREAM3D_REQUIRE_EQUAL(err, 0);
       }
       else
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index bfe13e36c3..d13b0e7184 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -166,7 +166,7 @@ class CreateGeometryTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createGeometry->execute();
-    DREAM3D_REQUIRED(createGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(createGeometry->getErrorCode(), >=, 0);
 
     bool correctGeom = (geomType == dc->getGeometry()->getGeometryType());
     DREAM3D_REQUIRE_EQUAL(correctGeom, true)
@@ -221,11 +221,11 @@ class CreateGeometryTest
 
     if(treatWarningsAsErrors)
     {
-      DREAM3D_REQUIRED(createGeometry->getErrorCondition(), ==, -1)
+      DREAM3D_REQUIRED(createGeometry->getErrorCode(), ==, -1)
     }
     else
     {
-      DREAM3D_REQUIRED(createGeometry->getErrorCondition(), >=, 0);
+      DREAM3D_REQUIRED(createGeometry->getErrorCode(), >=, 0);
 
       bool correctGeom = (geomType == dc->getGeometry()->getGeometryType());
       DREAM3D_REQUIRE_EQUAL(correctGeom, true)
@@ -312,11 +312,11 @@ class CreateGeometryTest
 
     if(treatWarningsAsErrors && geomType != IGeometry::Type::Vertex)
     {
-      DREAM3D_REQUIRED(createGeometry->getErrorCondition(), ==, -1)
+      DREAM3D_REQUIRED(createGeometry->getErrorCode(), ==, -1)
     }
     else
     {
-      DREAM3D_REQUIRED(createGeometry->getErrorCondition(), >=, 0);
+      DREAM3D_REQUIRED(createGeometry->getErrorCode(), >=, 0);
 
       bool correctGeom = (geomType == dc->getGeometry()->getGeometryType());
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index aac570dba7..79d993f7ef 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -135,7 +135,7 @@ class CreateStringArrayTest
     // Run Filter
 
     createStringArray->execute();
-    DREAM3D_REQUIRED(createStringArray->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(createStringArray->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -156,7 +156,7 @@ class CreateStringArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createStringArray->execute();
-    DREAM3D_REQUIRED(createStringArray->getErrorCondition(), ==, -5759);
+    DREAM3D_REQUIRED(createStringArray->getErrorCode(), ==, -5759);
 
     // Test invalid array path; should yield error -8152
 
@@ -170,7 +170,7 @@ class CreateStringArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createStringArray->execute();
-    DREAM3D_REQUIRED(createStringArray->getErrorCondition(), ==, -8152);
+    DREAM3D_REQUIRED(createStringArray->getErrorCode(), ==, -8152);
 
     // Test negative number of components; should yield error -8150
 
@@ -184,7 +184,7 @@ class CreateStringArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createStringArray->execute();
-    DREAM3D_REQUIRED(createStringArray->getErrorCondition(), ==, -8150);
+    DREAM3D_REQUIRED(createStringArray->getErrorCode(), ==, -8150);
 
     // Test zero components; should yield error -8151
 
@@ -193,7 +193,7 @@ class CreateStringArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     createStringArray->execute();
-    DREAM3D_REQUIRED(createStringArray->getErrorCondition(), ==, -8151);
+    DREAM3D_REQUIRED(createStringArray->getErrorCode(), ==, -8151);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index aa86c8c0a6..fbb2906cf2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -215,7 +215,7 @@ class CropVertexGeometryTest
     // Run Filter
 
     cropVertexGeometry->execute();
-    DREAM3D_REQUIRED(cropVertexGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(cropVertexGeometry->getErrorCode(), >=, 0);
 
     // Check filter results
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index 6852c96398..2e47e1ff1f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -369,10 +369,10 @@ class DataContainerTest
     // manually. Normally the Pipeline Object would do this for us. We are NOT using a Pipeline Object because using the
     // Pipeline Object would over write the DataContainer Array that we have created with a blank one thus defeating the
     // entire purpose of the test.
-    QObject::connect(writer.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    QObject::connect(writer.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
     writer->execute();
-    int err = writer->getErrorCondition();
+    int err = writer->getErrorCode();
 
     DREAM3D_REQUIRE_EQUAL(err, 0);
   }
@@ -394,7 +394,7 @@ class DataContainerTest
     DataContainerArrayProxy dcaProxy = reader->readDataContainerArrayStructure(DataContainerIOTest::TestFile());
     reader->setInputFileDataContainerArrayProxy(dcaProxy);
     reader->execute();
-    int err = reader->getErrorCondition();
+    int err = reader->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     Observer obs;
@@ -409,10 +409,10 @@ class DataContainerTest
     // manually. Normally the Pipeline Object would do this for us. We are NOT using a Pipeline Object because using the
     // Pipeline Object would over write the DataContainer Array that we have created with a blank one thus defeating the
     // entire purpose of the test.
-    QObject::connect(writer.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    QObject::connect(writer.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
 
     QMap<QString, DataContainerProxy>& dcsToRead = dcaProxy.getDataContainers();
@@ -457,16 +457,16 @@ class DataContainerTest
     reader2->setDataContainerArray(dca2);
     reader2->setInputFileDataContainerArrayProxy(dcaProxy);
     reader2->execute();
-    err = reader2->getErrorCondition();
+    err = reader2->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     DataContainerWriter::Pointer writer2 = DataContainerWriter::New();
     writer2->setDataContainerArray(dca2);
     writer2->setOutputFile(DataContainerIOTest::TestFile3());
-    QObject::connect(writer.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    QObject::connect(writer.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
     writer2->execute();
-    err = writer2->getErrorCondition();
+    err = writer2->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
   }
 
@@ -651,72 +651,72 @@ class DataContainerTest
 
       QVector<int> dims(1, 2);
       T* ptr = m->createCellData<T, K, AbstractFilter>("Test", 10, dims, absFilt.get());
-      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCondition(), 0);
+      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCode(), 0);
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      absFilt->setErrorCondition(0);
+      absFilt->clearErrorCode();
 
       // First try getting the array, but pass in a bad array name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellDataSizeCheck<T, K, AbstractFilter>("BAD_ARRAY_NAME", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad size name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellDataSizeCheck<T, K, AbstractFilter>("Test", 10, 1, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad cast type which should produce a null pointer
       // and negative error condition
       bool* bool_ptr =  m->getCellDataSizeCheck<bool, BoolArrayType, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(bool_ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next, pass in all the correct values which should produce a Non nullptr pointer value and
       // Zero Error Condition
       ptr = m->getCellDataSizeCheck<T, K, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
+      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
 
       IDataArray::Pointer t = attrMat->removeAttributeArray( "Test" );
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
 
       /********************************* Feature Data Tests *********************************************/
       ptr = m->createCellFeatureData<T, K, AbstractFilter>("Test", 10, dims, absFilt.get());
-      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCondition(), 0);
+      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCode(), 0);
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      absFilt->setErrorCondition(0);
+      absFilt->clearErrorCode();
 
       // First try getting the array, but pass in a bad array name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellFeatureDataSizeCheck<T, K, AbstractFilter>("BAD_ARRAY_NAME", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad size name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellFeatureDataSizeCheck<T, K, AbstractFilter>("Test", 10, 1, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad cast type which should produce a null pointer
       // and negative error condition
       bool_ptr =  m->getCellFeatureDataSizeCheck<bool, BoolArrayType, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(bool_ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next, pass in all the correct values which should produce a Non nullptr pointer value and
       // Zero Error Condition
       ptr = m->getCellFeatureDataSizeCheck<T, K, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
+      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
 
       t = m->removeCellFeatureData( "Test" );
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
@@ -724,36 +724,36 @@ class DataContainerTest
 
       /********************************* Ensemble Data Tests *********************************************/
       ptr = m->createCellEnsembleData<T, K, AbstractFilter>("Test", 10, dims, absFilt.get());
-      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCondition(), 0);
+      DREAM3D_REQUIRE_EQUAL(absFilt->getErrorCode(), 0);
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      absFilt->setErrorCondition(0);
+      absFilt->clearErrorCode();
 
       // First try getting the array, but pass in a bad array name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellEnsembleDataSizeCheck<T, K, AbstractFilter>("BAD_ARRAY_NAME", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad size name which should produce a null pointer
       // and negative error condition
       ptr =  m->getCellEnsembleDataSizeCheck<T, K, AbstractFilter>("Test", 10, 1, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next try getting the array, but pass in a bad cast type which should produce a null pointer
       // and negative error condition
       bool_ptr =  m->getCellEnsembleDataSizeCheck<bool, BoolArrayType, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_REQUIRE_EQUAL(bool_ptr , nullptr)
-          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCondition());
-      absFilt->setErrorCondition(0);
+          DREAM3D_REQUIRE_NE(0, absFilt->getErrorCode());
+      absFilt->clearErrorCode();
 
       // Next, pass in all the correct values which should produce a Non nullptr pointer value and
       // Zero Error Condition
       ptr = m->getCellEnsembleDataSizeCheck<T, K, AbstractFilter>("Test", 10, 2, absFilt.get());
       DREAM3D_TEST_POINTER(ptr, !=, nullptr);
-      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCondition());
+      DREAM3D_REQUIRE_EQUAL(0, absFilt->getErrorCode());
 
 
       t = m->removeCellEnsembleData( "Test" );
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index eeaf1509f1..b2f44591a7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -35,7 +35,10 @@
 
 #include <string>
 
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
@@ -60,26 +63,17 @@ class ErrorMessageTest
   // -----------------------------------------------------------------------------
   void TestErrorMessage()
   {
-    PipelineMessage e0;
-
-    QString a0("Some Class Name");
-    QString a1("Description");
-    int eCode = -10;
-    PipelineMessage e1;
-
-    PipelineMessage e2(a0, a1, eCode);
-
     AbstractFilter::Pointer f = AbstractFilter::New();
-    f->notifyErrorMessage("Some Test", a1, eCode);
-    f->notifyErrorMessage("Another Test", "A description", -10);
-
-    PipelineMessage pm("Joey's Test", "Testing Warning Message...", -23, PipelineMessage::MessageType::Warning);
-    PipelineMessage pm1("Joey's Test", "Testing Error Message...", -23, PipelineMessage::MessageType::Error);
-    PipelineMessage pm2("Joey's Test", "Testing Status Message...", -23, PipelineMessage::MessageType::StatusMessage);
-    PipelineMessage pm3("Joey's Test", "Testing Status Message...", -23, PipelineMessage::MessageType::ProgressValue, 23);
-    f->broadcastPipelineMessage(pm);
-    f->broadcastPipelineMessage(pm1);
-    f->broadcastPipelineMessage(pm2);
+    f->setErrorCondition(-10, "Description");
+
+    FilterProgressMessage::Pointer progressMessage = FilterProgressMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Warning Message...", -23);
+    FilterErrorMessage::Pointer errorMessage = FilterErrorMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Error Message...", -23);
+    FilterStatusMessage::Pointer statusMessage = FilterStatusMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Status Message...");
+    FilterWarningMessage::Pointer warningMessage = FilterWarningMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Status Message...", 23);
+    emit f->messageGenerated(progressMessage);
+    emit f->messageGenerated(errorMessage);
+    emit f->messageGenerated(statusMessage);
+    emit f->messageGenerated(warningMessage);
 
     if(true)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index 98598a05fb..2a6fd903b4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -44,6 +44,10 @@
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/PipelineStatusMessage.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
@@ -53,8 +57,42 @@
 #include "SIMPLib/CoreFilters/ExecuteProcess.h"
 
 /**
-* @brief
-*/
+ * @brief This message handler is used by the ExecuteProcessTest to append filter and pipeline status messages
+ * to a standard output string.
+ */
+class ExecuteProcessMessageHandler : public AbstractMessageHandler
+{
+public:
+  explicit ExecuteProcessMessageHandler(QString* stdOutput)
+  : m_StdOutput(stdOutput)
+  {
+  }
+
+ /**
+  * @brief Appends incoming FilterStatusMessages to the standard output string
+  */
+  void processMessage(const FilterStatusMessage* msg) const override
+  {
+    QString str = msg->generateMessageString();
+    m_StdOutput->append(str);
+  }
+
+  /**
+   * @brief Appends incoming PipelineStatusMessages to the standard output string
+   */
+  void processMessage(const PipelineStatusMessage* msg) const override
+  {
+    QString str = msg->generateMessageString();
+    m_StdOutput->append(str);
+  }
+
+private:
+  QString* m_StdOutput = nullptr;
+};
+
+/**
+ * @brief The ExecuteProcessObserver class
+ */
 class ExecuteProcessObserver : public QObject, public IObserver
 {
   Q_OBJECT
@@ -76,16 +114,10 @@ class ExecuteProcessObserver : public QObject, public IObserver
   }
 
 public slots:
-  void processPipelineMessage(const PipelineMessage& pm) override
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override
   {
-    if(pm.getType() == PipelineMessage::MessageType::StandardOutputMessage)
-    {
-      PipelineMessage msg = pm;
-      QString str;
-      QTextStream ss(&str);
-      ss << msg.generateStandardOutputString();
-      m_StdOutput.append(str);
-    }
+    ExecuteProcessMessageHandler msgHandler(&m_StdOutput);
+    pm->visit(&msgHandler);
   }
 
 private:
@@ -97,6 +129,9 @@ public slots:
 
 #include "ExecuteProcessTest.moc"
 
+/**
+ * @brief The ExecuteProcessTest class
+ */
 class ExecuteProcessTest
 {
 
@@ -131,11 +166,11 @@ class ExecuteProcessTest
       ExecuteProcess::Pointer filter = ExecuteProcess::New();
       ExecuteProcessObserver obs;
 
-      QObject::connect(filter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+      QObject::connect(filter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
       filter->setArguments(QObject::tr("%1 -query QMAKE_VERSION").arg(UnitTest::ExecuteProcessTest::QMakeLocation));
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
       QString stdOutput = obs.getStdOutput();
 #ifdef Q_OS_WIN
       stdOutput.remove('\r');
@@ -153,14 +188,14 @@ class ExecuteProcessTest
     //      ExecuteProcess::Pointer filter = ExecuteProcess::New();
     //      ExecuteProcessObserver obs;
 
-    //      QObject::connect(filter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    //      QObject::connect(filter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
     //      filter->setArguments(QObject::tr("%1 -version").arg(UnitTest::ExecuteProcessTest::CMakeLocation));
     //      filter->execute();
     //      QString stdOutput = obs.getStdOutput();
     //      stdOutput.remove('\r');
     //      stdOutput.remove('\n');
-    //      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+    //      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
     //      QString versionString = UnitTest::ExecuteProcessTest::CMakeVersionString;
     //      versionString.remove('\r');
     //      versionString.remove('\n');
@@ -171,14 +206,14 @@ class ExecuteProcessTest
       ExecuteProcess::Pointer filter = ExecuteProcess::New();
       ExecuteProcessObserver obs;
 
-      QObject::connect(filter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+      QObject::connect(filter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 
       filter->setArguments("sdhsdrtfn");
       filter->execute();
       QString stdOutput = obs.getStdOutput();
       stdOutput.remove('\r');
       stdOutput.remove('\n');
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -4005)
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -4005)
     }
 
     return EXIT_SUCCESS;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index e8c1b3f5f0..b8dd7aa064 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -205,7 +205,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -285,7 +285,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -368,7 +368,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -456,7 +456,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -544,7 +544,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -632,7 +632,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -720,7 +720,7 @@ class ExtractAttributeArraysFromGeometryTest
     // Run Filter
 
     extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index d2f3d9f318..667e0a6164 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -158,7 +158,7 @@ class ExtractComponentAsArrayTest
 
     setValues(filter, "DataArray", 1, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataContainerArray::Pointer dca = filter->getDataContainerArray();
     DataContainer::Pointer dc = dca->getDataContainer("DataContainer");
@@ -179,11 +179,11 @@ class ExtractComponentAsArrayTest
 
     setValues(filter, "DataArray", 2, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11004);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11004);
 
     setValues(filter, "DataArray", -1, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11005);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11005);
   }
 
   // -----------------------------------------------------------------------------
@@ -198,7 +198,7 @@ class ExtractComponentAsArrayTest
 
     setValues(filter, "DataArray1", 1, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -90002);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -90002);
   }
 
   // -----------------------------------------------------------------------------
@@ -213,7 +213,7 @@ class ExtractComponentAsArrayTest
 
     setValues(filter, "DataArray", 1, newArrayName);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -10002);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -10002);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 27f1703c33..8648e8db5b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -128,14 +128,14 @@ class ExtractVertexGeometryTest
     //
     extVertGeomFilter->setArrayHandling(-10);
     extVertGeomFilter->preflight();
-    int32_t err = extVertGeomFilter->getErrorCondition();
+    int32_t err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2002)
 
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
     extVertGeomFilter->setArrayHandling(10);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2003)
 
     // Empty SelectedDataContainerName
@@ -143,7 +143,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setDataContainerArray(dca);
     extVertGeomFilter->setArrayHandling(k_MoveArrays);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2004)
 
     // Empty VertexDataContainerName
@@ -152,7 +152,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerPath);
     extVertGeomFilter->setVertexDataContainerName(DataArrayPath("", "", ""));
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2006)
 
     // Set the Vertex Data Container to an existing DataContainer
@@ -160,7 +160,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setDataContainerArray(dca);
     extVertGeomFilter->setVertexDataContainerName(k_ImageGeomDataContainerPath);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2007)
 
     // Set the Vertex Data Container to an existing DataContainer
@@ -170,7 +170,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
     extVertGeomFilter->setSelectedDataContainerName(k_BadDataContainerName);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2008)
 
     // Set the Vertex Data Container to an existing DataContainer
@@ -180,7 +180,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
     extVertGeomFilter->setSelectedDataContainerName(k_WrongGeomDataContainerName);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2010)
 
     // Set the Vertex Data Container to an existing DataContainer
@@ -194,7 +194,7 @@ class ExtractVertexGeometryTest
     includePaths.push_back(dap);
     extVertGeomFilter->setIncludedDataArrayPaths(includePaths);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -2009)
 
     // Set the correct paths.
@@ -204,14 +204,14 @@ class ExtractVertexGeometryTest
     includePaths[0] = dap;
     extVertGeomFilter->setIncludedDataArrayPaths(includePaths);
     extVertGeomFilter->preflight();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0)
 
     // The preflight should be passing at this point so execute the filter
     dca = createDataContainerArray();
     extVertGeomFilter->setDataContainerArray(dca);
     extVertGeomFilter->execute();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0)
 
     dap.update(k_ImageGeomDataContainerName, k_CellAttrMatName, k_FloatArrayName);
@@ -227,7 +227,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setDataContainerArray(dca);
     extVertGeomFilter->setArrayHandling(k_CopyArrays);
     extVertGeomFilter->execute();
-    err = extVertGeomFilter->getErrorCondition();
+    err = extVertGeomFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0)
 
     dap.update(k_ImageGeomDataContainerName, k_CellAttrMatName, k_FloatArrayName);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 1a2a5f4cae..a4f2ebe230 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -352,10 +352,10 @@ class FeatureDataCSVWriterTest
     // Run filter
 
     featureDataCSVWriter->preflight();
-    DREAM3D_REQUIRED(featureDataCSVWriter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(featureDataCSVWriter->getErrorCode(), >=, 0);
 
     featureDataCSVWriter->execute();
-    DREAM3D_REQUIRED(featureDataCSVWriter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(featureDataCSVWriter->getErrorCode(), >=, 0);
 
     checkFilter(am, delimiterChoice, writeNumFeaturesLine, writeNeighborListData);
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 16a4207152..6bcb1c44b6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -79,7 +79,7 @@
     qDebug() << "Unable to set property DerivativesArrayPath for" << #dc;                                                                                                                              \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
   data = dc->getAttributeMatrix(derivsName.getAttributeMatrixName())->getAttributeArray(derivsName.getDataArrayName());                                                                                \
   if(nullptr == std::dynamic_pointer_cast<DoubleArrayType>(data))                                                                                                                                      \
@@ -108,7 +108,7 @@
     qDebug() << "Unable to set property DerivativesArrayPath for" << #dc;                                                                                                                              \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_NE(err, 0);
 
 class FindDerivativesFilterTest
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index bf4666147f..4c51325a4b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -161,7 +161,7 @@ class GenerateColorTableTest
 
       filter->setDataContainerArray(dca);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
     }
 
     // Validate Results
@@ -242,7 +242,7 @@ class GenerateColorTableTest
 
       filter->setDataContainerArray(dca);
       filter->execute();
-      DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0)
+      DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0)
     }
 
     CheckPreset("Black, Blue and White", UnitTest::GenerateColorTableTest::BlackBlueWhiteFile, dca);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
index a15fcc9318..f2e8e0e187 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
@@ -112,17 +112,17 @@ class ImportAsciDataArrayTest
 
 #if 0
     Observer obs;
-    filter->connect(filter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)),
-            &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    filter->connect(filter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)),
+            &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
 #endif
     filter->preflight();
-    DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
     attrMat->removeAttributeArray("ImportedData");
 
     filter->execute();
 
-    DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
     typename DataArray<T>::Pointer dataPtr = attrMat->getAttributeArrayAs<DataArray<T>>("ImportedData");
     T* ptr = dataPtr->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index 3585281002..d299068964 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -260,30 +260,30 @@ class ImportHDF5DatasetTest
 
     // Check empty file path error
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20001);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20001);
+    filter->clearErrorCode();
 
     // Check incorrect extension error
     filter->setHDF5FilePath("foo.txt");
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20002);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20002);
+    filter->clearErrorCode();
 
     // Check non-existent file error
     filter->setHDF5FilePath("foo.h5");
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20003);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20003);
+    filter->clearErrorCode();
 
     // Put in the correct file path
     filter->setHDF5FilePath(m_FilePath);
 
     // Check empty dataset path error
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20004);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20004);
+    filter->clearErrorCode();
 
     // Check incorrect dataset path error
     QList<ImportHDF5Dataset::DatasetImportInfo> importInfoList;
@@ -293,8 +293,8 @@ class ImportHDF5DatasetTest
     filter->setDatasetImportInfoList(importInfoList);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20005);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20005);
+    filter->clearErrorCode();
 
     // Fill in Dataset Path with a valid path so that we can continue our error checks
     importInfoList.clear();
@@ -306,8 +306,8 @@ class ImportHDF5DatasetTest
 
     // Check empty component dimensions
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20006);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20006);
+    filter->clearErrorCode();
 
     // Check incorrect component dimensions
     importInfoList.clear();
@@ -316,8 +316,8 @@ class ImportHDF5DatasetTest
     filter->setDatasetImportInfoList(importInfoList);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -20007);
-    filter->setErrorCondition(0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -20007);
+    filter->clearErrorCode();
 
     return filter;
   }
@@ -412,7 +412,7 @@ class ImportHDF5DatasetTest
     }
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), errCode);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), errCode);
 
     // If we got through without errors, validate the results
     if(errCode == 0)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 781082d443..a9b6678648 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -269,11 +269,11 @@ class MoveDataTest
 
     if(err >= 0)
     {
-      DREAM3D_REQUIRED(moveData->getErrorCondition(), >=, err)
+      DREAM3D_REQUIRED(moveData->getErrorCode(), >=, err)
     }
     else
     {
-      DREAM3D_REQUIRED(moveData->getErrorCondition(), ==, err)
+      DREAM3D_REQUIRED(moveData->getErrorCode(), ==, err)
     }
 
     // Check filter results if filter successfully executed
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index 07ad7a2ad5..a8bdcf4931 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -277,11 +277,11 @@ class MoveMultiDataTest
 
     if(err >= 0)
     {
-      DREAM3D_REQUIRED(moveMultiData->getErrorCondition(), >=, err)
+      DREAM3D_REQUIRED(moveMultiData->getErrorCode(), >=, err)
     }
     else
     {
-      DREAM3D_REQUIRED(moveMultiData->getErrorCondition(), ==, err)
+      DREAM3D_REQUIRED(moveMultiData->getErrorCode(), ==, err)
     }
 
     // Check filter results if filter successfully executed
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index ef7be6318c..2a10ae8e58 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -165,7 +165,7 @@ class MultiThresholdObjects2Test
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->execute();
-    DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
     DataArrayPath path = DataArrayPath(dataContainerName, SIMPL::Defaults::CellAttributeMatrixName, outputName);
     IDataArray::Pointer thresholdArray =
@@ -240,7 +240,7 @@ class MultiThresholdObjects2Test
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->execute();
-    DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
     DataArrayPath path = DataArrayPath(dataContainerName, SIMPL::Defaults::CellAttributeMatrixName, outputName);
     IDataArray::Pointer thresholdArray =
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index b34cd03e5a..891b858911 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -144,7 +144,7 @@ class MultiThresholdObjectsTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->execute();
-      DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+      DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
       DataArrayPath path = DataArrayPath("dc1", SIMPL::Defaults::CellAttributeMatrixName, SIMPL::GeneralData::ThresholdArray);
       IDataArray::Pointer thresholdArray = vdc->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
@@ -179,7 +179,7 @@ class MultiThresholdObjectsTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->execute();
-      DREAM3D_REQUIRED(filter->getErrorCondition(), >=, 0);
+      DREAM3D_REQUIRED(filter->getErrorCode(), >=, 0);
 
       DataArrayPath path1 = DataArrayPath("dc1", SIMPL::Defaults::CellAttributeMatrixName, "ThresholdArray1");
       IDataArray::Pointer thresholdArray1 = vdc->getAttributeMatrix(path1.getAttributeMatrixName())->getAttributeArray(path1.getDataArrayName());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index b82aad4428..e07ef3c3c2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -260,14 +260,14 @@ class RawBinaryReaderTest
 
     // Preflight, get the error condition, and check that there are no errors
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     am->clearAttributeArrays();
 
     // Execute the filter, check that there are no errors, and compare the data
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     IDataArray::Pointer iData = am->getAttributeArray("Test_Array");
@@ -365,14 +365,14 @@ class RawBinaryReaderTest
 
     // Preflight, get error condition, and check that the "file is too small" error is returned
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, ==, RBRT_FILE_TOO_SMALL)
 
     am->clearAttributeArrays();
 
     // Execute, get error condition, and check that the "file is too small" error is returned
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, ==, RBRT_FILE_TOO_SMALL)
   }
 
@@ -465,14 +465,14 @@ class RawBinaryReaderTest
 
     // Preflight, get the error condition, and check that there are no errors
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     am->clearAttributeArrays();
 
     // Execute, get the error condition, check that there are no errors, and compare the data
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     IDataArray::Pointer iData = am->getAttributeArray("Test_Array");
@@ -575,14 +575,14 @@ class RawBinaryReaderTest
 
     // Preflight, get error condition, and check that there are no errors
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     am->clearAttributeArrays();
 
     // Execute, get error condition, check that there are no errors, and compare the data
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     IDataArray::Pointer iData = m->getAttributeMatrix(SIMPL::Defaults::AttributeMatrixName)->getAttributeArray("Test_Array");
@@ -613,14 +613,14 @@ class RawBinaryReaderTest
 
     // Preflight, get error condition, and check that there are errors
     filt2->preflight();
-    err = filt2->getErrorCondition();
+    err = filt2->getErrorCode();
     DREAM3D_REQUIRED(err, <, 0)
 
     am->clearAttributeArrays();
 
     // Execute, get error condition, and check that the "file too small" error occurred
     filt2->execute();
-    err = filt2->getErrorCondition();
+    err = filt2->getErrorCode();
     DREAM3D_REQUIRED(err, ==, RBRT_FILE_TOO_SMALL)
   }
 
@@ -713,14 +713,14 @@ class RawBinaryReaderTest
 
     // Preflight, get error condition, and check that there are no errors
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     am->clearAttributeArrays();
 
     // Execute, get error condition, check that there are no errors, and compare the data
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     IDataArray::Pointer iData = m->getAttributeMatrix(SIMPL::Defaults::AttributeMatrixName)->getAttributeArray("Test_Array");
@@ -823,12 +823,12 @@ class RawBinaryReaderTest
 
     // Preflight, get error condition, and check that the "file too small" error has occurred
     filt->preflight();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, ==, RBRT_FILE_TOO_SMALL)
 
     // Execute, get error condition, and check that there are errors
     filt->execute();
-    err = filt->getErrorCondition();
+    err = filt->getErrorCode();
     DREAM3D_REQUIRED(err, <, 0)
   }
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 4f5dd38575..8fd3640d4b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -149,7 +149,7 @@ class ReadASCIIDataTest
       AbstractFilter::Pointer importASCIIData = filterFactory->create();
       importASCIIData->preflight();
 
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, ReadASCIIData::EMPTY_FILE)
 
       QVariant var;
@@ -158,7 +158,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       importASCIIData->preflight();
-      err = importASCIIData->getErrorCondition();
+      err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, ReadASCIIData::EMPTY_ATTR_MATRIX)
 
       importASCIIData->setDataContainerArray(dca);
@@ -199,7 +199,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, 0)
 
       AttributeMatrix::Pointer am = importASCIIData->getDataContainerArray()->getAttributeMatrix(DataArrayPath(DataContainerName, AttributeMatrixName, ""));
@@ -232,7 +232,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, 0)
 
       AttributeMatrix::Pointer am = importASCIIData->getDataContainerArray()->getAttributeMatrix(DataArrayPath(DataContainerName, AttributeMatrixName, ""));
@@ -264,7 +264,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, ReadASCIIData::CONVERSION_FAILURE)
     }
 
@@ -279,7 +279,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, 0)
 
       AttributeMatrix::Pointer am = importASCIIData->getDataContainerArray()->getAttributeMatrix(DataArrayPath(DataContainerName, AttributeMatrixName, ""));
@@ -313,7 +313,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, 0)
 
       AttributeMatrix::Pointer am = importASCIIData->getDataContainerArray()->getAttributeMatrix(DataArrayPath(DataContainerName, AttributeMatrixName, ""));
@@ -341,7 +341,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, 0)
 
       AttributeMatrix::Pointer am = importASCIIData->getDataContainerArray()->getAttributeMatrix(DataArrayPath(DataContainerName, AttributeMatrixName, ""));
@@ -369,7 +369,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, ReadASCIIData::CONVERSION_FAILURE)
     }
 
@@ -405,7 +405,7 @@ class ReadASCIIDataTest
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
       importASCIIData->execute();
-      int err = importASCIIData->getErrorCondition();
+      int err = importASCIIData->getErrorCode();
       DREAM3D_REQUIRE_EQUAL(err, ReadASCIIData::CONVERSION_FAILURE)
     }
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index f5fd950c39..b58231457b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -134,7 +134,7 @@ class RemoveComponentFromArrayTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->preflight();
-      err = filter->getErrorCondition();
+      err = filter->getErrorCode();
       DREAM3D_REQUIRED(err, >=, 0)
     }
 
@@ -157,7 +157,7 @@ class RemoveComponentFromArrayTest
       DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
       filter->preflight();
-      err = filter->getErrorCondition();
+      err = filter->getErrorCode();
       DREAM3D_REQUIRED(err, >=, 0)
     }
 
@@ -214,7 +214,7 @@ class RemoveComponentFromArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     IDataArray::Pointer ReducedArrayPtr = dca->getDataContainer(SIMPL::Defaults::DataContainerName)->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(ReducedArrayArrayName);
@@ -258,7 +258,7 @@ class RemoveComponentFromArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -11004);
 
     // Test to make sure sending in a single component array fails.
@@ -283,7 +283,7 @@ class RemoveComponentFromArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -11003);
   }
 
@@ -344,13 +344,13 @@ class RemoveComponentFromArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->preflight();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     {
@@ -370,14 +370,14 @@ class RemoveComponentFromArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->preflight();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
 
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
     IDataArray::Pointer testArrayPtr = dca->getDataContainer(SIMPL::Defaults::DataContainerName)->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index 54d4abba3c..519997019f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -111,7 +111,7 @@ class RenameAttributeArrayTest
     filter->setProperty("NewArrayName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11016);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11016);
   }
 
   // -----------------------------------------------------------------------------
@@ -149,7 +149,7 @@ class RenameAttributeArrayTest
     filter->setProperty("NewArrayName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11016);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11016);
   }
 
   // -----------------------------------------------------------------------------
@@ -187,7 +187,7 @@ class RenameAttributeArrayTest
     filter->setProperty("NewArrayName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DREAM3D_REQUIRE_EQUAL(da->getName(), newAttributeArrayName);
   }
@@ -227,7 +227,7 @@ class RenameAttributeArrayTest
     filter->setProperty("NewArrayName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11009);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11009);
   }
 
   // -----------------------------------------------------------------------------
@@ -264,7 +264,7 @@ class RenameAttributeArrayTest
     value.setValue(newAttributeArrayName);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11009);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11009);
   }
 
   // -----------------------------------------------------------------------------
@@ -304,7 +304,7 @@ class RenameAttributeArrayTest
     filter->setProperty("NewArrayName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11017);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11017);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index e7e1b75c6d..758797f7dc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -106,7 +106,7 @@ class RenameAttributeMatrixTest
     filter->setProperty("NewAttributeMatrix", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -307020);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -307020);
   }
 
   // -----------------------------------------------------------------------------
@@ -141,7 +141,7 @@ class RenameAttributeMatrixTest
     filter->setProperty("NewAttributeMatrix", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -301000);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -301000);
   }
 
   // -----------------------------------------------------------------------------
@@ -176,7 +176,7 @@ class RenameAttributeMatrixTest
     filter->setProperty("NewAttributeMatrix", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DREAM3D_REQUIRE_EQUAL(am->getName(), newAttributeMatrixName);
   }
@@ -213,7 +213,7 @@ class RenameAttributeMatrixTest
     filter->setProperty("NewAttributeMatrix", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11004);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11004);
   }
 
   // -----------------------------------------------------------------------------
@@ -247,7 +247,7 @@ class RenameAttributeMatrixTest
     value.setValue(newAttributeMatrixName);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11004);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11004);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 440ab2664d..8cbe9e7c12 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -102,7 +102,7 @@ class RenameDataContainerTest
     filter->setProperty("NewDataContainerName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -999);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -999);
   }
 
   // -----------------------------------------------------------------------------
@@ -132,7 +132,7 @@ class RenameDataContainerTest
     filter->setProperty("NewDataContainerName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11001);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11001);
   }
 
   // -----------------------------------------------------------------------------
@@ -162,7 +162,7 @@ class RenameDataContainerTest
     filter->setProperty("NewDataContainerName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataArrayPath dap(dc->getName());
 
@@ -196,7 +196,7 @@ class RenameDataContainerTest
     filter->setProperty("NewDataContainerName", value);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11001);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11001);
   }
 
   // -----------------------------------------------------------------------------
@@ -225,7 +225,7 @@ class RenameDataContainerTest
     value.setValue(newDataContainerName);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -11001);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -11001);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 1285f5d5c1..a832d55b5e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -82,7 +82,7 @@
     qDebug() << "Unable to set property ReplaceValue";                                                                                                                                                 \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, errVal);
 
 #ifdef SET_PROPERTIES_AND_CHECK_EQ
@@ -109,7 +109,7 @@
     qDebug() << "Unable to set property ReplaceValue";                                                                                                                                                 \
   }                                                                                                                                                                                                    \
   filter->execute();                                                                                                                                                                                   \
-  err = filter->getErrorCondition();                                                                                                                                                                   \
+  err = filter->getErrorCode();                                                                                                                                                                        \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
   dataArray = dc->getAttributeMatrix(selectedArray.getAttributeMatrixName())->getAttributeArray(selectedArray.getDataArrayName());                                                                     \
   DREAM3D_REQUIRE_EQUAL(err, 0);                                                                                                                                                                       \
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index a52bb7ca29..ff2fce2bbf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -198,12 +198,12 @@ class RequiredZThicknessTest
 
     setGeometryTest(filter, 1);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     // test Z equal to minimum Z
     setGeometryTest(filter, 2);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
   }
 
   // -----------------------------------------------------------------------------
@@ -216,7 +216,7 @@ class RequiredZThicknessTest
 
     setGeometryTest(filter, 3);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -7788);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -7788);
   }
 
   // -----------------------------------------------------------------------------
@@ -229,7 +229,7 @@ class RequiredZThicknessTest
 
     setInvalidGeometry(filter, 3);
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -7789);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -7789);
   }
 
   // -----------------------------------------------------------------------------
@@ -243,7 +243,7 @@ class RequiredZThicknessTest
     setNullDataContainer(filter);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -999);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -999);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index 5b2a319bb9..a9b9f36ee1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -251,7 +251,7 @@ class ScaleVolumeTest
     setGeometryTest(filter, true, false);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer("DataContainer1");
     ImageGeom::Pointer imgGeom = std::dynamic_pointer_cast<ImageGeom>(dc->getGeometry());
@@ -277,7 +277,7 @@ class ScaleVolumeTest
     setGeometryTest(filter, false, true);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer("DataContainer2");
     TriangleGeom::Pointer triGeom = std::dynamic_pointer_cast<TriangleGeom>(dc->getGeometry());
@@ -310,7 +310,7 @@ class ScaleVolumeTest
     setIncorrectGeometry(filter, true, false);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -384);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -384);
   }
 
   // -----------------------------------------------------------------------------
@@ -324,7 +324,7 @@ class ScaleVolumeTest
     setIncorrectGeometry(filter, false, true);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -384);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -384);
   }
 
   // -----------------------------------------------------------------------------
@@ -338,7 +338,7 @@ class ScaleVolumeTest
     setNullGeometry(filter, true, false);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -385);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -385);
   }
 
   // -----------------------------------------------------------------------------
@@ -352,7 +352,7 @@ class ScaleVolumeTest
     setNullGeometry(filter, false, true);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -385);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -385);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index e2f85be696..5dff07fe0f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -245,7 +245,7 @@ class SetOriginResolutionImageGeomTest
     changeOrigin(filter);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer("DataContainer1");
     ImageGeom::Pointer imgGeom = std::dynamic_pointer_cast<ImageGeom>(dc->getGeometry());
@@ -271,7 +271,7 @@ class SetOriginResolutionImageGeomTest
     changeResolution(filter);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), 0);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), 0);
 
     DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer("DataContainer1");
     ImageGeom::Pointer imgGeom = std::dynamic_pointer_cast<ImageGeom>(dc->getGeometry());
@@ -299,7 +299,7 @@ class SetOriginResolutionImageGeomTest
     setInvalidGeometry(filter);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -384);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -384);
   }
 
   // -----------------------------------------------------------------------------
@@ -313,7 +313,7 @@ class SetOriginResolutionImageGeomTest
     setNullGeometry(filter);
 
     filter->execute();
-    DREAM3D_REQUIRE_EQUAL(filter->getErrorCondition(), -385);
+    DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), -385);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 4a3628668c..c01fcbb8a5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -224,7 +224,7 @@ class SplitAttributeArrayTest
   {
     //    Observer obs;
     //    QObject::connect(
-    //          filter.get(), &AbstractFilter::filterGeneratedMessage,
+    //          filter.get(), &AbstractFilter::messageGenerated,
     //          &obs, &Observer::processPipelineMessage
     //          );
 
@@ -240,13 +240,13 @@ class SplitAttributeArrayTest
     DREAM3D_REQUIRE_EQUAL(propWasSet, true)
 
     filter->preflight();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
 
     dca = createDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->execute();
-    err = filter->getErrorCondition();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRED(err, >=, 0)
     using DataArrayPtrType = std::shared_ptr<DataArray<T>>;
     DataArrayPtrType mcArray_original =
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index fd5d79bade..2e081ca19f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -119,22 +119,22 @@ class WriteASCIIDataTest
     writer->setOutputStyle(WriteASCIIData::MultiFile);
 
     writer->preflight();
-    int err = writer->getErrorCondition();
+    int err = writer->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     // Test Single File mode
     writer->setOutputStyle(WriteASCIIData::SingleFile);
     writer->setOutputFilePath(UnitTest::TestTempDir + "/" + "SingleFileMode.csv");
     writer->preflight();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err >= 0)
 
     // Back to MultiFile mode
@@ -146,11 +146,11 @@ class WriteASCIIDataTest
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "NeighborList")};
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
     StructArray<int32_t>::Pointer structArray = StructArray<int32_t>::CreateArray(k_ArraySize, "StructArray", true);
@@ -158,11 +158,11 @@ class WriteASCIIDataTest
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StructArray")};
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
     StatsDataArray::Pointer statsDataArray = StatsDataArray::CreateArray(k_ArraySize, "StatsDataArray", true);
@@ -170,11 +170,11 @@ class WriteASCIIDataTest
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StatsDataArray")};
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
     writer->execute();
-    err = writer->getErrorCondition();
+    err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
   }
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 3285f3583d..1af2f35492 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -179,7 +179,7 @@ class WriteTriangleGeometryTest
     // Run filter
 
     writeTriangleGeometry->execute();
-    DREAM3D_REQUIRED(writeTriangleGeometry->getErrorCondition(), >=, 0);
+    DREAM3D_REQUIRED(writeTriangleGeometry->getErrorCode(), >=, 0);
 
     // Test filter
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 28d75074d1..a4e42f7e95 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -83,8 +83,7 @@ template <typename TInputType> class WriteASCIIDataPrivate
     if(!file.open(QIODevice::WriteOnly | QIODevice::Text))
     {
       QString ss = QObject::tr("The output file could not be opened: '%1'").arg(outputFile);
-      filter->setErrorCondition(-11012);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(-11012, ss);
       return;
     }
 
@@ -226,33 +225,30 @@ void WriteASCIIData::dataCheck()
   // Make sure the weak pointer vector is cleared before we begin...
   m_SelectedWeakPtrVector.clear();
 
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   //**************** MultiFile Checks ******************
   if(m_OutputStyle == MultiFile)
   {
     if(m_OutputPath.isEmpty())
     {
-      setErrorCondition(-11002);
       QString ss = QObject::tr("The output path must be set");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11002, ss);
       return;
     }
 
     if(m_MaxValPerLine <= 0)
     {
-      setErrorCondition(-11003);
       QString ss = QObject::tr("The Maximum Tuples Per Line (%1) must be positive").arg(m_MaxValPerLine);
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11003, ss);
       return;
     }
 
     if(m_FileExtension.isEmpty())
     {
-      setErrorCondition(-11004);
       QString ss = QObject::tr("The file extension must be set.");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11004, ss);
       return;
     }
   }
@@ -261,33 +257,29 @@ void WriteASCIIData::dataCheck()
   {
     if(m_OutputFilePath.isEmpty())
     {
-      setErrorCondition(-11005);
       QString ss = QObject::tr("The output file path must be set");
-      notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+      setErrorCondition(-11005, ss);
     }
 
     QFileInfo fi(m_OutputPath);
     QDir parentPath = fi.path();
     if(!parentPath.exists())
     {
-      setWarningCondition(-11006);
       QString ss = QObject::tr("The directory path for the output file does not exist. DREAM.3D will attempt to create this path during execution of the filter");
-      notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+      setWarningCondition(-11006, ss);
     }
   }
   else
   {
     QString ss = QObject::tr("The type of output did not match either 0 (Multi-File) or 1 (Single File)");
-    setErrorCondition(-11009);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11009, ss);
     return;
   }
 
   if(m_SelectedDataArrayPaths.isEmpty())
   {
-    setErrorCondition(-11007);
     QString ss = QObject::tr("At least one Attribute Array must be selected");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11007, ss);
     return;
   }
 
@@ -295,9 +287,8 @@ void WriteASCIIData::dataCheck()
 
   if(!DataArrayPath::ValidateVector(paths))
   {
-    setErrorCondition(-11008);
     QString ss = QObject::tr("There are Attribute Arrays selected that are not contained in the same Attribute Matrix. All selected Attribute Arrays must belong to the same Attribute Matrix");
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11008, ss);
     return;
   }
 
@@ -305,25 +296,22 @@ void WriteASCIIData::dataCheck()
   {
     IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);
 
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       return;
     }
 
     if( ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "NeighborList is unsupported when writing ASCII Data.");
     }
     else if( ptr.lock()->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StructArray is unsupported when writing ASCII Data.");
     }
     else if( ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StatsDataArray is unsupported when writing ASCII Data.");
     }
     else
     {
@@ -351,11 +339,11 @@ void WriteASCIIData::preflight()
 // -----------------------------------------------------------------------------
 void WriteASCIIData::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -363,8 +351,7 @@ void WriteASCIIData::execute()
   if(m_SelectedDataArrayPaths.count() != m_SelectedWeakPtrVector.count())
   {
     QString ss = QObject::tr("The number of selected Attribute Arrays does not equal the number of internal weak pointers");
-    setErrorCondition(-11010);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11010, ss);
     return;
   }
 
@@ -379,8 +366,7 @@ void WriteASCIIData::execute()
   else
   {
     QString ss = QObject::tr("The type of output did not match either 0 (Multi-File) or 1 (Single File)");
-    setErrorCondition(-11009);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11009, ss);
     return;
   }
 }
@@ -393,8 +379,7 @@ void WriteASCIIData::writeMultiFileOutput()
   if(!dir.mkpath(m_OutputPath))
   {
     ss = QObject::tr("Error creating output path '%1'").arg(m_OutputPath);
-    setErrorCondition(-11004);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11004, ss);
     return;
   }
 
@@ -408,7 +393,7 @@ void WriteASCIIData::writeMultiFileOutput()
     IDataArray::Pointer selectedArrayPtr = m_SelectedWeakPtrVector.at(i).lock();
 
     QString message = QObject::tr("|| Exporting Dataset '%1'").arg(selectedArrayPtr->getName());
-    notifyStatusMessage(getMessagePrefix(), getHumanLabel(), message);
+    notifyStatusMessage(message);
 
     QString exportArrayFile = m_OutputPath + QDir::separator() + selectedArrayPtr->getName() + m_FileExtension; // the complete output file path, name and extension
 
@@ -421,24 +406,20 @@ void WriteASCIIData::writeMultiFileOutput()
     }
     else if( selectedArrayPtr->getTypeAsString().compare("NeighborList<T>") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "NeighborList is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "NeighborList is unsupported when writing ASCII Data.");
     }
     else if( selectedArrayPtr->getTypeAsString().compare("struct") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "StructArray is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StructArray is unsupported when writing ASCII Data.");
     }
     else if( selectedArrayPtr->getTypeAsString().compare("StatsDataArray") == 0)
     {
-      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType);
-      notifyErrorMessage(getHumanLabel(), "StatsDataArray is unsupported when writing ASCII Data.", getErrorCondition());
+      setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StatsDataArray is unsupported when writing ASCII Data.");
     }
     else
       EXECUTE_TEMPLATE(this, WriteASCIIDataPrivate, selectedArrayPtr, this, selectedArrayPtr, delimiter, exportArrayFile, m_MaxValPerLine)
 
-
-    if(getErrorCondition() < 0)
+    if(getErrorCode() < 0)
     {
       break;
     }
@@ -456,8 +437,7 @@ void WriteASCIIData::writeSingleFileOutput()
   if(!parentPath.mkpath("."))
   {
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath.absolutePath());
-    setErrorCondition(-11020);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11020, ss);
     return;
   }
 
@@ -465,8 +445,7 @@ void WriteASCIIData::writeSingleFileOutput()
   if(!file.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getOutputFilePath());
-    setErrorCondition(-11021);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11021, ss);
     return;
   }
 
@@ -519,7 +498,7 @@ void WriteASCIIData::writeSingleFileOutput()
     if(percentIncrement > threshold)
     {
       QString ss = QObject::tr("Writing Output: %1%").arg(static_cast<int32_t>(percentIncrement));
-      notifyStatusMessage(getMessagePrefix(), getHumanLabel(), ss);
+      notifyStatusMessage(ss);
       threshold = threshold + 5.0f;
       if(threshold < percentIncrement)
       {
@@ -555,8 +534,7 @@ void WriteASCIIData::writeStringArray(const IDataArray::Pointer& inputData, cons
   if(!file.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("The output file could not be opened: '%1'").arg(outputFile);
-    setErrorCondition(-11011);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-11011, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index b170e70972..a2bce89829 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -107,8 +107,8 @@ void WriteTriangleGeometry::initialize()
 // -----------------------------------------------------------------------------
 void WriteTriangleGeometry::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
 
   QFileInfo fi(getOutputNodesFile());
@@ -126,13 +126,13 @@ void WriteTriangleGeometry::dataCheck()
   FileSystemPathHelper::CheckOutputFile(this, "Output Triangles File", getOutputTrianglesFile(), true);
 
   DataContainer::Pointer dataContainer = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerSelection());
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
 
   TriangleGeom::Pointer triangles = dataContainer->getPrereqGeometry<TriangleGeom, AbstractFilter>(this);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -140,14 +140,12 @@ void WriteTriangleGeometry::dataCheck()
   // We MUST have Nodes
   if(nullptr == triangles->getVertices().get())
   {
-    setErrorCondition(-386);
-    notifyErrorMessage(getHumanLabel(), "DataContainer Geometry missing Vertices", getErrorCondition());
+    setErrorCondition(-386, "DataContainer Geometry missing Vertices");
   }
   // We MUST have Triangles defined also.
   if(nullptr == triangles->getTriangles().get())
   {
-    setErrorCondition(-387);
-    notifyErrorMessage(getHumanLabel(), "DataContainer Geometry missing Triangles", getErrorCondition());
+    setErrorCondition(-387, "DataContainer Geometry missing Triangles");
   }
 }
 
@@ -169,11 +167,11 @@ void WriteTriangleGeometry::preflight()
 // -----------------------------------------------------------------------------
 void WriteTriangleGeometry::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
 
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -192,15 +190,14 @@ void WriteTriangleGeometry::execute()
   // Make sure any directory path is also available as the user may have just typed
   // in a path without actually creating the full path
 
-  notifyStatusMessage(getHumanLabel(), "Writing Nodes Text File");
+  notifyStatusMessage("Writing Nodes Text File");
   QFileInfo fi(getOutputNodesFile());
   QDir parentPath = fi.path();
 
   if(!parentPath.mkpath("."))
   {
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath.absolutePath());
-    setErrorCondition(-1);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-1, ss);
     return;
   }
   
@@ -209,8 +206,7 @@ void WriteTriangleGeometry::execute()
   if (!fileNodes.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getOutputNodesFile());
-    setErrorCondition(-100);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-100, ss);
     return;
   }
 
@@ -241,15 +237,14 @@ void WriteTriangleGeometry::execute()
 
   // ++++++++++++++ Write the Triangles File +++++++++++++++++++++++++++++++++++++++++++
 
-  notifyStatusMessage(getHumanLabel(), "Writing Triangles Text File");
+  notifyStatusMessage("Writing Triangles Text File");
   QFileInfo triFI(getOutputTrianglesFile());
   parentPath = triFI.path();
 
   if(!parentPath.mkpath("."))
   {
     QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath.absolutePath());
-    setErrorCondition(-1);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-1, ss);
     return;
   }
 
@@ -258,8 +253,7 @@ void WriteTriangleGeometry::execute()
   if (!fileTri.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getOutputTrianglesFile());
-    setErrorCondition(-100);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-100, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index fbe58bcc16..5fc5da8412 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -366,9 +366,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(err);
           ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(err, ss);
         }
       }
       // Now ask for the actual AttributeArray from the AttributeMatrix
@@ -376,9 +375,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(err);
           ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(err, ss);
         }
         return attributeArray;
       }
@@ -396,9 +394,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
       if(nullptr == attributeArray.get() && filter)
       {
-        filter->setErrorCondition(err);
         ss = QObject::tr("The AttributeMatrix named '%1' contains an array with name '%2' but the DataArray could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(err, ss);
       }
       return attributeArray;
     }
@@ -421,9 +418,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(err);
           ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(err, ss);
         }
       }
       // Now ask for the actual AttributeArray from the AttributeMatrix
@@ -431,9 +427,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(err);
           ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(err, ss);
         }
         return attributeArray;
       }
@@ -444,9 +439,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         return std::dynamic_pointer_cast<ArrayType>(ptr);
       }
 
-      filter->setErrorCondition(err);
       ss = QObject::tr("Unable to cast input array %1 to the necessary type.").arg(attributeArrayName);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(err, ss);
 
       return attributeArray;
     }
@@ -475,9 +469,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-10001);
           ss = QObject::tr("The name of the array was empty. Please provide a name for this array.");
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10001, ss);
         }
         return attributeArray;
       }
@@ -488,24 +481,21 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       }
       else if (filter)
       {
-        filter->setErrorCondition(-10002);
         ss = QObject::tr("AttributeMatrix:'%1' An Attribute Array already exists with the name %2.").arg(getName()).arg(attributeArrayName);
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-10002, ss);
         return attributeArray;
       }
       iDataArray = getAttributeArray(attributeArrayName);
       if(nullptr == iDataArray && filter)
       {
-        filter->setErrorCondition(-10003);
         ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be created.").arg(getName()).arg(attributeArrayName);
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-10003, ss);
       }
       attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
       if(nullptr == attributeArray.get() && filter)
       {
-        filter->setErrorCondition(-10004);
         ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-10004, ss);
       }
       else if(nullptr != attributeArray && filter)
       {
@@ -566,8 +556,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
           QString srcDesc = srcArray->getTypeAsString();
           QString desc = validTargetArray->getTypeAsString();
           QString ss = QObject::tr("The Filter '%1' requires an array of type '%2' but the data array '%3' has a type of '%4'").arg(filter->getHumanLabel()).arg(desc).arg(srcArray->getName()).arg(srcDesc);
-          filter->setErrorCondition(-501);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-501, ss);
         }
         return false;
       }
@@ -578,8 +567,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         {
           QString ss = QObject::tr("Filter '%1' requires array with name '%2' to have Number of Tuples = %3. The currently selected array "
                                    " has %4").arg(filter->getHumanLabel()).arg(arrayName).arg((getNumberOfTuples())).arg(targetDestArray->getNumberOfTuples());
-          filter->setErrorCondition(-502);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-502, ss);
         }
         return false;
       }
@@ -590,8 +578,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         {
           QString ss = QObject::tr("Filter '%1' is trying to use array '%2' where the number of components is %3 but the filter requires that array "
                                    " to have %4.").arg(filter->getHumanLabel()).arg(targetDestArray->getName()).arg(targetDestArray->getNumberOfComponents()).arg(numComp);
-          filter->setErrorCondition(-503);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-503, ss);
         }
         return false;
       }
@@ -605,8 +592,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
                      .arg(arrayName).arg(dat->getTypeAsString()).arg(getNameOfClass()).arg(arrayName).arg(getNameOfClass()).arg(targetDestArray->getTypeAsString());
         if (nullptr != filter)
         {
-          filter->setErrorCondition(-504);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-504, ss);
         }
         return false;
       }
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 3aac1564d7..40512124c1 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -795,9 +795,8 @@ AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* fil
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(err * 1000);
       ss = QObject::tr("DataContainer:'%1' The name of the AttributeMatrix was empty. Please provide a name for this AttributeMatrix").arg(getName());
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(err * 1000, ss);
     }
     return attributeMatrix;
   }
@@ -807,9 +806,8 @@ AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* fil
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(err * 1020);
       ss = QObject::tr("DataContainer:'%1' An AttributeMatrix with name '%2' does not exist and is required for this filter to execute.").arg(getName()).arg(attributeMatrixName);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(err * 1020, ss);
     }
     return attributeMatrix;
   }
@@ -817,9 +815,8 @@ AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* fil
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(err * 1030);
       ss = QObject::tr("DataContainer:'%1' AttributeMatrix: '%2' Attribute Matrix has Attribute Arrays with mismatched number of objects.").arg(getName()).arg(attributeMatrixName);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(err * 1030, ss);
     }
     return attributeMatrix;
   }
@@ -858,9 +855,8 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(-10011);
       ss = QObject::tr("The name of the Attribute Matrix was empty. Please provide a name for this Attribute Matrix.");
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(-10011, ss);
     }
     return nullptr;
   }
@@ -869,9 +865,8 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(-10012);
       ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(attributeMatrixName);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(-10012, ss);
     }
     return nullptr;
   }
@@ -880,9 +875,8 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
   {
     if(filter != nullptr)
     {
-      filter->setErrorCondition(-10013);
       ss = QObject::tr("%1 is a protected name.  Please provide a different name for this Attribute Matrix.").arg(SIMPL::Geometry::Geometry);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(-10013, ss);
     }
     return nullptr;
   }
@@ -896,9 +890,8 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
   }
   if(filter != nullptr) // If the filter object is NOT null (is valid) then set the error condition and send an error message
   {
-    filter->setErrorCondition(-10014);
     ss = QObject::tr("An Attribute Matrix already exists with the name %1.").arg(attributeMatrixName);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-10014, ss);
   }
   return attributeMatrix;
 }
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 42b5bad79a..5125cab554 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -331,9 +331,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
     {
       if(filter)
       {
-        filter->setErrorCondition(-385);
         QString ss = QObject::tr("Data Container Geometry is missing.");
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-385, ss);
       }
       return geom;
     }
@@ -342,9 +341,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
     {
       if(filter)
       {
-        filter->setErrorCondition(-384);
         QString ss = QObject::tr("Data Container Geometry is not compatible. The selected Geometry type is %1").arg(igeom->getGeometryTypeAsString());
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-384, ss);
       }
       return geom;
     }
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 7cc15ae0c7..c9461d359c 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -250,7 +250,7 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
         QString ss =
             QObject::tr("A Data Container with name %1 already exists in Memory. Reading a Data Container with the same name would over write the one in memory. Currently this is not allowed.")
                 .arg(dcProxy.getName());
-        obs->notifyErrorMessage(getNameOfClass(), ss, -198745600);
+        obs->setErrorCondition(-198745600, ss);
       }
       return -198745600;
     }
@@ -264,7 +264,7 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
       if(nullptr != obs)
       {
         QString ss = QObject::tr("Error opening Group '%1'").arg(dcProxy.getName());
-        obs->notifyErrorMessage(getNameOfClass(), ss, -198745602);
+        obs->setErrorCondition(-198745602, ss);
       }
       return -198745602;
     }
@@ -275,7 +275,7 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
       if(nullptr != obs)
       {
         QString ss = QObject::tr("Error reading Mesh Data from '%1'").arg(dcProxy.getName());
-        obs->notifyErrorMessage(getNameOfClass(), ss, -198745603);
+        obs->setErrorCondition(-198745603, ss);
       }
       return -198745603;
     }
@@ -285,7 +285,7 @@ int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid,
       if(nullptr != obs)
       {
         QString ss = QObject::tr("Error reading AttributeMatrix Data from '%1'").arg(dcProxy.getName());
-        obs->notifyErrorMessage(getNameOfClass(), ss, -198745604);
+        obs->setErrorCondition(-198745604, ss);
       }
       return -198745604;
     }
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 7dd71f0b62..8b751b3737 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -304,9 +304,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-999);
           QString ss = "The DataContainer Object with the specific name '" + name + "' was not available.";
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-999, ss);
         }
         return dc;
       }
@@ -346,9 +345,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-887);
           QString ss = QObject::tr("The DataContainer Object must have a name to be created.");
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-887, ss);
           return DataContainer::NullPointer();
         }
       }
@@ -357,9 +355,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-888);
           QString ss = QObject::tr("The DataContainer Object has forward slashes in its name.");
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-888, ss);
           return DataContainer::NullPointer();
         }
       }
@@ -371,9 +368,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-889);
           QString ss = QObject::tr("The DataContainer Object with the specific name '%1' already exists.").arg(dataContainerName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-889, ss);
           return DataContainer::NullPointer();
         }
       }
@@ -458,9 +454,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80000);
           ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80000, ss);
         }
         return dataArray;
       }
@@ -469,9 +464,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80001);
           ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80001, ss);
         }
         return dataArray;
       }
@@ -486,9 +480,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80002);
           ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80002, ss);
         }
         return dataArray;
       }
@@ -498,9 +491,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80003);
           ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80003, ss);
         }
         return dataArray;
       }
@@ -526,9 +518,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-90000);
           ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-90000, ss);
         }
         return dataArray;
       }
@@ -537,9 +528,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-90001);
           ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-90001, ss);
         }
         return dataArray;
       }
@@ -554,9 +544,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-999);
           ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-999, ss);
         }
         return dataArray;
       }
@@ -566,9 +555,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-307020);
           ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-307020, ss);
         }
         return dataArray;
       }
@@ -602,9 +590,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80010);
           ss = QObject::tr("Property '%1': The DataArrayPath is invalid because one of the elements was empty.\n  DataContainer: %2\n  AttributeMatrix: %3\n  DataArray: %4").arg(property).arg(path.getDataContainerName()).arg(path.getAttributeMatrixName()).arg(path.getDataArrayName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80010, ss);
         }
         return dataArray;
       }
@@ -613,9 +600,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-80005);
           ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80005, ss);
         }
         return dataArray;
       }
@@ -624,9 +610,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-80006);
           ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(path.getAttributeMatrixName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80006, ss);
         }
         return dataArray;
       }
@@ -635,9 +620,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-80007);
           ss = QObject::tr("The DataArray '%1' has forward slashes in its name").arg(path.getDataArrayName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80007, ss);
         }
         return dataArray;
       }
@@ -646,9 +630,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (filter)
         {
-          filter->setErrorCondition(-80004);
           ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80004, ss);
         }
         return dataArray;
       }
@@ -658,9 +641,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80002);
           ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(path.getDataContainerName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80002, ss);
         }
         return dataArray;
       }
@@ -670,9 +652,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if(filter)
         {
-          filter->setErrorCondition(-80003);
           ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(path.getAttributeMatrixName()).arg(path.getDataContainerName());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-80003, ss);
         }
         return dataArray;
       }
@@ -701,18 +682,16 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       QString ss;
       if (!paths.at(0).isValid() && nullptr != filter)
       {
-        filter->setErrorCondition(-10000);
         ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-10000, ss);
         valid = false;
         return valid;
       }
       IDataArray::Pointer array0 = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(0));
       if (nullptr == array0.get() && nullptr != filter)
       {
-        filter->setErrorCondition(-10100);
         ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
-        filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+        filter->setErrorCondition(-10100, ss);
         valid = false;
         return valid;
       }
@@ -722,18 +701,16 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (!paths.at(i).isValid() && nullptr != filter)
         {
-          filter->setErrorCondition(-10000);
           ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10000, ss);
           valid = false;
           return valid;
         }
         IDataArray::Pointer nextArray = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(i));
         if (nullptr == nextArray.get() && nullptr != filter)
         {
-          filter->setErrorCondition(-10100);
           ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10100, ss);
           valid = false;
           return valid;
         }
@@ -745,10 +722,9 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
         {
-          filter->setErrorCondition(-10200);
           ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
                .arg(dataArrays[0]->getName()).arg(dataArrays[0]->getNumberOfTuples()).arg(dataArrays[i]->getName()).arg(dataArrays[i]->getNumberOfTuples());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10200, ss);
           valid = false;
         }
       }
@@ -774,9 +750,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (nullptr == dataArray && nullptr != filter)
         {
-          filter->setErrorCondition(-10100);
           ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available").arg(__LINE__);
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10100, ss);
           valid = false;
         }
       }
@@ -785,10 +760,9 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       {
         if (numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
         {
-          filter->setErrorCondition(-10200);
           ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
                .arg(dataArrays[i - 1]->getName()).arg(dataArrays[i - 1]->getNumberOfTuples()).arg(dataArrays[i]->getName()).arg(dataArrays[i]->getNumberOfTuples());
-          filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+          filter->setErrorCondition(-10200, ss);
           valid = false;
         }
       }
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 316278559c..185412839d 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -80,7 +80,6 @@ DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QStr
     }
   }
 
-  ptr->setErrorCondition(0);
   ptr->setErrorMessage("There is no error.");
   return ptr;
 }
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index d809d272a2..a648ec8499 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -52,6 +52,7 @@
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -145,8 +146,7 @@ FilterPipeline::Pointer H5FilterParametersReader::readPipelineFromFile(hid_t fid
     else if(nullptr != obs)
     {
       QString ss = QObject::tr("The input file contains an unrecognizable pipeline version number, and is therefore incompatible and cannot be read.");
-      PipelineMessage pm("", ss, -66066, PipelineMessage::MessageType::Error);
-      pm.setPrefix("H5FilterParametersReader::ReadPipelineFromFile(...)");
+      PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New("[NOT_READABLE]", QObject::tr("%1: %2").arg("H5FilterParametersReader::ReadPipelineFromFile(...)").arg(ss), -66066);
       obs->processPipelineMessage(pm);
       return FilterPipeline::NullPointer();
     }
@@ -254,8 +254,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
     else if(nullptr != obs)
     {
       QString ss = QObject::tr("The input file contains an unrecognizable pipeline version number, and is therefore incompatible and cannot be read.");
-      PipelineMessage pm("", ss, -66066, PipelineMessage::MessageType::Error);
-      pm.setPrefix("H5FilterParametersReader::ReadPipelineFromFile(...)");
+      PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New("[NOT_READABLE]", QObject::tr("%1: %2").arg("H5FilterParametersReader::ReadPipelineFromFile(...)").arg(ss), -66066);
       obs->processPipelineMessage(pm);
       return QString();
     }
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 649f2e8ad2..943ec7b6d1 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -47,6 +47,8 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
+#include "SIMPLib/Messages/GenericErrorMessage.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
@@ -76,7 +78,7 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
   {
     if(!obs.empty())
     {
-      PipelineMessage pm(JsonFilterParametersWriter::ClassName(), "FilterPipeline Object was nullptr for writing", -1, PipelineMessage::MessageType::Error);
+      GenericErrorMessage::Pointer pm = GenericErrorMessage::New(QObject::tr("%1: %2").arg(JsonFilterParametersWriter::ClassName()).arg("FilterPipeline Object was nullptr for writing"), -1);
 
       for (int i = 0; i < obs.size(); i++)
       {
@@ -106,7 +108,8 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
   {
     if(!obs.empty())
     {
-      PipelineMessage pm(JsonFilterParametersWriter::ClassName(), "Output .dream3d file could not be created.", -1, PipelineMessage::MessageType::Error);
+      PipelineErrorMessage::Pointer pm =
+          PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(JsonFilterParametersWriter::ClassName()).arg("Output .dream3d file could not be created."), -1);
 
       for (int i = 0; i < obs.size(); i++)
       {
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 21a485610c..a9f4678cd9 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "JsonFilterParametersReader.h"
 
 #include <QtCore/QDataStream>
@@ -45,6 +45,7 @@
 #include "SIMPLib/CoreFilters/EmptyFilter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 
 // -----------------------------------------------------------------------------
@@ -176,7 +177,7 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipelineFromFile(QString
         currentLine++;
       }
 
-      PipelineMessage pm(JsonFilterParametersReader::ClassName(), msg, -1, PipelineMessage::MessageType::Error);
+      PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New("[NOT_READABLE]", QObject::tr("%1: %2").arg(JsonFilterParametersReader::ClassName()).arg(msg), -1);
       obs->processPipelineMessage(pm);
     }
     return FilterPipeline::NullPointer();
@@ -223,7 +224,7 @@ QString JsonFilterParametersReader::getJsonFromFile(QString filePath, IObserver*
       {
         QString msg = createErrorMessageFromJsonParseError(parseError);
         msg = QString("File '%1' had errors while parsing the json data.%2").arg(filePath) + msg;
-        PipelineMessage pm(JsonFilterParametersReader::ClassName(), msg, -1, PipelineMessage::MessageType::Error);
+        PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New("[NOT_READABLE]", QObject::tr("%1: %2").arg(JsonFilterParametersReader::ClassName()).arg(msg), -1);
         obs->processPipelineMessage(pm);
       }
       return QString();
@@ -402,13 +403,13 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
   {
     return FilterPipeline::NullPointer();
   }
-  
+
   QJsonObject builderObj = m_Root[SIMPL::Settings::PipelineBuilderGroup].toObject();
   int filterCount = builderObj[SIMPL::Settings::NumFilters].toInt();
   m_MaxFilterIndex = filterCount - 1; // Zero based indexing
-  
+
   FilterPipeline::Pointer pipeline;
-  
+
   if(filterCount >= 0)
   {
     pipeline = FilterPipeline::New();
@@ -419,11 +420,11 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
   {
     pipeline = FilterPipeline::NullPointer();
   }
-  
+
   for(int i = 0; i < filterCount; ++i)
   {
     openFilterGroup(nullptr, i);
-    
+
     IFilterFactory::Pointer factory = IFilterFactory::NullPointer();
     QString filterName = m_CurrentFilterIndex[SIMPL::Settings::FilterName].toString();
     bool filterEnabled = m_CurrentFilterIndex[SIMPL::Settings::FilterEnabled].toBool(true);
@@ -443,11 +444,11 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
         factory = filtManager->getFactoryFromClassName(filterName);
       }
     }
-    
+
     if(nullptr != factory.get())
     {
       AbstractFilter::Pointer filter = factory->create();
-      
+
       if(nullptr != filter.get())
       {
         filter->setEnabled(filterEnabled);
@@ -456,7 +457,7 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
       }
     }
     else // Could not find the filter because the specific name has not been registered. This could
-      // be due to a name change for the filter.
+         // be due to a name change for the filter.
     {
       EmptyFilter::Pointer filter = EmptyFilter::New();
       QString humanLabel = QString("UNKNOWN FILTER: ") + filterName;
@@ -464,15 +465,16 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
       filter->setOriginalFilterName(filterName);
       filter->setEnabled(filterEnabled);
       pipeline->pushBack(filter);
-      
+
       if(nullptr != obs)
       {
         QString ss = QObject::tr("An attempt to instantiate a filter from the pipeline file resulted in an error.\
                                  Possible reasons include a name change of the filter, plugin not loading or a simple spelling mistake? A \
                                                                                                                                         blank filter has been inserted in its place. Possible error message is: %1")
-                                                                                                                                        .arg(filterName);
-            PipelineMessage pm(filterName, ss, -66066, PipelineMessage::MessageType::Error);
-        pm.setPrefix("JsonFilterParametersReader::ReadPipelineFromFile()");
+                         .arg(filterName);
+
+        QString prefix = "JsonFilterParametersReader::ReadPipelineFromFile()";
+        PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(prefix).arg(ss), -66066);
         obs->processPipelineMessage(pm);
       }
     }
@@ -510,7 +512,7 @@ void JsonFilterParametersReader::readNameOfPipelineFromFile(QString filePath, QS
     {
       QString msg = createErrorMessageFromJsonParseError(parseError);
       msg = QString("File '%1' had errors while parsing the json data.%2").arg(fInfo.absoluteFilePath()) + msg;
-      PipelineMessage pm(JsonFilterParametersReader::ClassName(), msg, -1, PipelineMessage::MessageType::Error);
+      PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New("[NOT_READABLE]", QObject::tr("%1: %2").arg(JsonFilterParametersReader::ClassName()).arg(msg), -1);
       obs->processPipelineMessage(pm);
     }
     name = QString("ERROR: Could not open file specified.");
@@ -605,7 +607,7 @@ int JsonFilterParametersReader::openFilterGroup(AbstractFilter* unused, int inde
   Q_ASSERT(m_Root.isEmpty() == false);
   int err = 0;
   QString numStr = QString::number(index);
-  if(m_Root.find(numStr) != m_Root.end() )
+  if(m_Root.find(numStr) != m_Root.end())
   {
     m_CurrentFilterIndex = m_Root[numStr].toObject();
   }
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index fd027f0187..7bc1a99409 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -42,6 +42,7 @@
 #include "JsonFilterParametersWriter.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -113,7 +114,8 @@ int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline,
   {
     if(!obs.empty())
     {
-      PipelineMessage pm(JsonFilterParametersWriter::ClassName(), "FilterPipeline Object was nullptr for writing", -1, PipelineMessage::MessageType::Error);
+      PipelineErrorMessage::Pointer pm =
+          PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: FilterPipeline Object was nullptr for writing").arg(JsonFilterParametersWriter::ClassName()), -1);
 
       for (int i = 0; i < obs.size(); i++)
       {
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index 316c8150c7..a08d2d1338 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -79,8 +79,8 @@ void AbstractDecisionFilter::initialize()
 // -----------------------------------------------------------------------------
 void AbstractDecisionFilter::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -101,10 +101,10 @@ void AbstractDecisionFilter::preflight()
 // -----------------------------------------------------------------------------
 void AbstractDecisionFilter::execute()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index e272922f38..eb331a7a67 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -37,7 +37,10 @@
 
 #include <QtCore/QMetaProperty>
 
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -49,9 +52,7 @@
 //
 // -----------------------------------------------------------------------------
 AbstractFilter::AbstractFilter()
-: m_ErrorCondition(0)
-, m_WarningCondition(0)
-, m_InPreflight(false)
+: m_InPreflight(false)
 , m_Enabled(true)
 , m_Removing(false)
 , m_PipelineIndex(0)
@@ -137,8 +138,7 @@ void AbstractFilter::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void AbstractFilter::execute()
 {
-  setErrorCondition(-3015);
-  notifyErrorMessage(getNameOfClass(), "QAbstractFilter does not implement an execute method. Please use a subclass instead.", getErrorCondition());
+  setErrorCondition(-3015, "QAbstractFilter does not implement an execute method. Please use a subclass instead.");
 }
 
 // -----------------------------------------------------------------------------
@@ -147,8 +147,7 @@ void AbstractFilter::execute()
 void AbstractFilter::preflight()
 {
   setInPreflight(true);
-  setErrorCondition(-3016);
-  notifyErrorMessage(getNameOfClass(), "AbstractFilter does not implement a preflight method. Please use a subclass instead.", getErrorCondition());
+  setErrorCondition(-3016, "AbstractFilter does not implement a preflight method. Please use a subclass instead.");
 }
 
 // -----------------------------------------------------------------------------
@@ -533,65 +532,55 @@ void AbstractFilter::cleanupFilter()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyErrorMessage(const QString& humanLabel, const QString& str, int code)
+void AbstractFilter::setErrorCondition(int code, const QString &messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateErrorMessage(getNameOfClass(), humanLabel, str, code);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  m_ErrorCode = code;
+  FilterErrorMessage::Pointer pm = FilterErrorMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, code);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyStatusMessage(const QString& humanLabel, const QString& str)
+void AbstractFilter::notifyStatusMessage(const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  FilterStatusMessage::Pointer pm = FilterStatusMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyStatusMessage(const QString& prefix, const QString& humanLabel, const QString& str)
+void AbstractFilter::setWarningCondition(int code, const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  pm.setPrefix(prefix);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  m_WarningCode = code;
+  FilterWarningMessage::Pointer pm = FilterWarningMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, code);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyStandardOutputMessage(const QString& humanLabel, int pipelineIndex, const QString& str)
+void AbstractFilter::notifyProgressMessage(int progress, const QString& messageText)
 {
-  PipelineMessage pm = PipelineMessage::CreateStandardOutputMessage(humanLabel, pipelineIndex, str);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  FilterProgressMessage::Pointer pm = FilterProgressMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, progress);
+  emit messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyWarningMessage(const QString& humanLabel, const QString& str, int code)
+void AbstractFilter::clearErrorCode()
 {
-  PipelineMessage pm = PipelineMessage::CreateWarningMessage(getNameOfClass(), humanLabel, str, code);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  m_ErrorCode = 0;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyProgressMessage(const QString& prefix, const QString& humanLabel, const QString& str, int progress)
+void AbstractFilter::clearWarningCode()
 {
-  PipelineMessage pm = PipelineMessage::CreateStatusMessage(getNameOfClass(), humanLabel, str);
-  pm.setPrefix(prefix);
-  pm.setProgressValue(progress);
-  pm.setType(PipelineMessage::MessageType::StatusMessageAndProgressValue);
-  pm.setPipelineIndex(getPipelineIndex());
-  emit filterGeneratedMessage(pm);
+  m_WarningCode = 0;
 }
 
 // -----------------------------------------------------------------------------
@@ -605,8 +594,7 @@ void AbstractFilter::notifyMissingProperty(FilterParameter* filterParameter)
           .arg(filterParameter->getPropertyName())
           .arg(getHumanLabel());
 
-  setWarningCondition(-1);
-  notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+  setWarningCondition(-1, ss);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index c3d2e59d79..1b842350f0 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -87,9 +87,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_PROPERTY(QString CompiledLibraryName READ getCompiledLibraryName)
   PYB11_PROPERTY(bool Cancel READ getCancel WRITE setCancel)
   PYB11_PROPERTY(bool Enabled READ getEnabled WRITE setEnabled)
-  PYB11_PROPERTY(QString MessagePrefix READ getMessagePrefix WRITE setMessagePrefix)
-  PYB11_PROPERTY(int ErrorCondition READ getErrorCondition WRITE setErrorCondition)
-  PYB11_PROPERTY(int WarningCondition READ getWarningCondition WRITE setWarningCondition)
+  PYB11_PROPERTY(int ErrorCode READ getErrorCode)
+  PYB11_PROPERTY(int WarningCode READ getWarningCode)
   PYB11_PROPERTY(bool InPreflight READ getInPreflight WRITE setInPreflight)
   PYB11_PROPERTY(int PipelineIndex READ getPipelineIndex WRITE setPipelineIndex)
 
@@ -97,6 +96,12 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_METHOD(void execute)
   PYB11_METHOD(void preflight)
   PYB11_METHOD(void setDataContainerArray)
+  PYB11_METHOD(void setErrorCondition ARGS code messageText)
+  PYB11_METHOD(void setWarningCondition ARGS code messageText)
+  PYB11_METHOD(void notifyStatusMessage ARGS messageText)
+  PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
+  PYB11_METHOD(void clearErrorCode)
+  PYB11_METHOD(void clearWarningCode)
   
   // Friend declarations for RenameDataPath so that it can set and check the instance's created data by ID.
   friend void RenameDataPath::AlertFilterCreatedPath(AbstractFilter*, RenameDataPath::DataID_t, const DataArrayPath&);
@@ -245,11 +250,9 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
 
   SIMPL_INSTANCE_PROPERTY(FilterParameterVectorType, FilterParameters)
 
-  SIMPL_INSTANCE_PROPERTY(QString, MessagePrefix)
+  SIMPL_GET_PROPERTY(int, ErrorCode)
 
-  SIMPL_INSTANCE_PROPERTY(int, ErrorCondition)
-
-  SIMPL_INSTANCE_PROPERTY(int, WarningCondition)
+  SIMPL_GET_PROPERTY(int, WarningCode)
 
   SIMPL_INSTANCE_PROPERTY(bool, InPreflight)
 
@@ -275,6 +278,16 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   */
   SIMPL_INSTANCE_PROPERTY(AbstractFilter::WeakPointer, NextFilter)
 
+  /**
+   * @brief clearErrorCondition
+   */
+  void clearErrorCode();
+
+  /**
+   * @brief clearWarningCondition
+   */
+  void clearWarningCode();
+
   /**
    * @brief doesPipelineContainFilterBeforeThis
    * @param name
@@ -312,58 +325,32 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   virtual DataArrayPath::RenameContainer getRenamedPaths();
 
-  // ------------------------------
-  // These methods are over ridden from the superclass in order to add the
-  // pipeline index to the PipelineMessage Object.
-  // ------------------------------
-
   /**
-   * @brief notifyErrorMessage
-   * @param humanLabel
-   * @param ss
+   * @brief setErrorCondition
    * @param code
+   * @param messageText
    */
-  void notifyErrorMessage(const QString& humanLabel, const QString& ss, int code) override;
+  void setErrorCondition(int code, const QString& messageText) override;
 
   /**
-   * @brief notifyWarningMessage
-   * @param humanLabel
-   * @param ss
+   * @brief setWarningCondition
    * @param code
+   * @param messageText
    */
-  void notifyWarningMessage(const QString& humanLabel, const QString& ss, int code) override;
+  void setWarningCondition(int code, const QString& messageText) override;
 
   /**
    * @brief notifyStatusMessage
-   * @param humanLabel
-   * @param ss
+   * @param messageText
    */
-  void notifyStatusMessage(const QString& humanLabel, const QString& ss) override;
-
-  /**
-   * @brief notifyStandardOutputMessage
-   * @param humanLabel
-   * @param pipelineIndex
-   * @param ss
-   */
-  void notifyStandardOutputMessage(const QString& humanLabel, int pipelineIndex, const QString& ss) override;
-
-  /**
-   * @brief notifyStatusMessage
-   * @param prefix
-   * @param humanLabel
-   * @param ss
-   */
-  void notifyStatusMessage(const QString& prefix, const QString& humanLabel, const QString& ss) override;
+  void notifyStatusMessage(const QString& messageText) override;
 
   /**
    * @brief notifyProgressMessage
-   * @param prefix
-   * @param humanLabel
-   * @param str
    * @param progress
+   * @param messageText
    */
-  void notifyProgressMessage(const QString& prefix, const QString& humanLabel, const QString& str, int progress) override;
+  void notifyProgressMessage(int progress, const QString& messageText);
 
   /**
    * @brief notifyMissingProperty
@@ -471,6 +458,9 @@ protected slots:
 private:
   bool m_Cancel;
   QUuid m_Uuid;
+  int m_ErrorCode = 0;
+  int m_WarningCode = 0;
+
   std::map<RenameDataPath::DataID_t, DataArrayPath> m_CreatedPaths;
   DataArrayPath::RenameContainer m_RenamedPaths;
 
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 805ce85d19..c71dd75599 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -35,6 +35,15 @@
 
 #include "FilterPipeline.h"
 
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
+#include "SIMPLib/Messages/PipelineProgressMessage.h"
+#include "SIMPLib/Messages/PipelineStatusMessage.h"
+#include "SIMPLib/Messages/PipelineWarningMessage.h"
 #include "SIMPLib/CoreFilters/EmptyFilter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -45,12 +54,43 @@
 
 #define RENAME_ENABLED 1
 
+/**
+ * @brief This message handler is used by FilterPipeline to re-emit filter progress messages as pipeline progress messages
+ */
+class FilterPipelineMessageHandler : public AbstractMessageHandler
+{
+  public:
+    explicit FilterPipelineMessageHandler(FilterPipeline* pipeline) : m_Pipeline(pipeline) {}
+
+    /**
+     * @brief Converts filter progress messages into pipeline progress messages.  This enables the overall pipeline
+     * progress to update along with the filter's progress updates
+     */
+    void processMessage(const FilterProgressMessage* msg) const override
+    {
+      int filterProgress = msg->getProgressValue();
+      float filterProgressStep = (1.0f / m_Pipeline->size()) * filterProgress / 100.0f;
+      int pipelineProgress = static_cast<int>((static_cast<float>(msg->getPipelineIndex()) / (m_Pipeline->size()) + filterProgressStep) * 100.0f);
+      m_Pipeline->notifyProgressMessage(pipelineProgress, "");
+    }
+
+  private:
+    FilterPipeline* m_Pipeline = nullptr;
+};
+
+class PipelineIdleException : public std::exception
+{
+   const char* what () const noexcept
+   {
+      return "A pipeline that was finishing execution was marked as in the idle state.";
+   }
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 FilterPipeline::FilterPipeline()
-: m_ErrorCondition(0)
-, m_PipelineName("")
+: m_PipelineName("")
 , m_Dca(nullptr)
 {
 }
@@ -273,8 +313,8 @@ void FilterPipeline::fromJson(const QJsonObject& json, IObserver* obs)
                                  Possible reasons include a name change of the filter, plugin not loading or a simple spelling mistake? A \
                                                                                                                                         blank filter has been inserted in its place. Possible error message is: %1")
                          .arg(filterName);
-        PipelineMessage pm(filterName, ss, -66066, PipelineMessage::MessageType::Error);
-        pm.setPrefix("JsonFilterParametersReader::ReadPipelineFromFile()");
+        QString prefix = "JsonFilterParametersReader::ReadPipelineFromFile()";
+        PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(getName(), ss, -66066);
         obs->processPipelineMessage(pm);
       }
     }
@@ -289,10 +329,6 @@ void FilterPipeline::cancel()
   if(m_State != FilterPipeline::State::Executing)
   {
     // We cannot cancel a pipeline that is not executing
-    setErrorCondition(-201);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss;
     if(m_State == FilterPipeline::State::Idle)
     {
@@ -306,9 +342,7 @@ void FilterPipeline::cancel()
     {
       ss = QObject::tr("Pipeline '%1' could not be canceled.").arg(getName());
     }
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-201, ss);
     return;
   }
 
@@ -339,14 +373,8 @@ bool FilterPipeline::pushFront(const AbstractFilter::Pointer& f)
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to add filters to a pipeline that is not idle
-    setErrorCondition(-202);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be added to pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-202, ss);
     return false;
   }
 
@@ -363,16 +391,10 @@ bool FilterPipeline::popFront()
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to remove filters from a pipeline that is not idle
-    setErrorCondition(-203);
-
     AbstractFilter::Pointer f = m_Pipeline.front();
 
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be removed from pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-203, ss);
     return false;
   }
 
@@ -389,14 +411,8 @@ bool FilterPipeline::pushBack(const AbstractFilter::Pointer& f)
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to add filters to a pipeline that is not idle
-    setErrorCondition(-204);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be added to pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-204, ss);
     return false;
   }
 
@@ -413,16 +429,10 @@ bool FilterPipeline::popBack()
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to remove filters from a pipeline that is not idle
-    setErrorCondition(-205);
-
     AbstractFilter::Pointer f = m_Pipeline.back();
 
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be removed from pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-205, ss);
     return false;
   }
 
@@ -439,14 +449,8 @@ bool FilterPipeline::insert(size_t index, const AbstractFilter::Pointer& f)
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to add filters to a pipeline that is not idle
-    setErrorCondition(-206);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be added to pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-206, ss);
     return false;
   }
 
@@ -468,16 +472,10 @@ bool FilterPipeline::erase(size_t index)
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to remove filters from a pipeline that is not idle
-    setErrorCondition(-207);
-
     AbstractFilter::Pointer f = m_Pipeline[index];
 
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be removed from pipeline '%2' because the pipeline is already executing.").arg(f->getHumanLabel()).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-207, ss);
     return false;
   }
 
@@ -499,14 +497,8 @@ bool FilterPipeline::clear()
   if(m_State != FilterPipeline::State::Idle)
   {
     // We cannot clear a pipeline that is not idle
-    setErrorCondition(-208);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Pipeline '%1' could not be cleared because it is executing.").arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-208, ss);
     return false;
   }
 
@@ -542,14 +534,8 @@ AbstractFilter::Pointer FilterPipeline::removeFirstFilterByName(const QString& n
   if(m_State != FilterPipeline::State::Idle)
   {
     // Do not allow anyone to remove filters from a pipeline that is not idle
-    setErrorCondition(-209);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Filter '%1' could not be removed from pipeline '%2' because the pipeline is already executing.").arg(name).arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-209, ss);
     return AbstractFilter::NullPointer();
   }
 
@@ -623,12 +609,66 @@ void FilterPipeline::updatePrevNextFilters()
   }
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::setErrorCondition(int code, const QString &messageText)
+{
+  m_ErrorCode = code;
+  PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(getName(), messageText, code);
+  emit messageGenerated(pm);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::notifyStatusMessage(const QString& messageText)
+{
+  PipelineStatusMessage::Pointer pm = PipelineStatusMessage::New(getName(), messageText);
+  emit messageGenerated(pm);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::setWarningCondition(int code, const QString& messageText)
+{
+  m_WarningCode = code;
+  PipelineWarningMessage::Pointer pm = PipelineWarningMessage::New(getName(), messageText, code);
+  emit messageGenerated(pm);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::notifyProgressMessage(int progress, const QString& messageText)
+{
+  PipelineProgressMessage::Pointer pm = PipelineProgressMessage::New(getName(), messageText, progress);
+  emit messageGenerated(pm);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::clearErrorCode()
+{
+  m_ErrorCode = 0;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::clearWarningCode()
+{
+  m_WarningCode = 0;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void FilterPipeline::addMessageReceiver(QObject* obj)
 {
-  connect(this, SIGNAL(pipelineGeneratedMessage(const PipelineMessage&)), obj, SLOT(processPipelineMessage(const PipelineMessage&)));
+  connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), obj, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   m_MessageReceivers.push_back(obj);
 }
 
@@ -637,30 +677,37 @@ void FilterPipeline::addMessageReceiver(QObject* obj)
 // -----------------------------------------------------------------------------
 void FilterPipeline::removeMessageReceiver(QObject* obj)
 {
-  disconnect(this, SIGNAL(pipelineGeneratedMessage(const PipelineMessage&)), obj, SLOT(processPipelineMessage(const PipelineMessage&)));
+  disconnect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), obj, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   m_MessageReceivers.removeAll(obj);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterPipeline::connectFilterNotifications(QObject* filter)
+void FilterPipeline::connectFilterNotifications(AbstractFilter* filter)
 {
   for(const auto& messageReceiver : m_MessageReceivers)
   {
-    connect(filter, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), messageReceiver, SLOT(processPipelineMessage(const PipelineMessage&)));
+    connect(filter, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), messageReceiver, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   }
+
+  connect(filter, &AbstractFilter::messageGenerated, [=] (AbstractMessage::Pointer msg) {
+    FilterPipelineMessageHandler msgHandler(this);
+    msg->visit(&msgHandler);
+  });
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterPipeline::disconnectFilterNotifications(QObject* filter)
+void FilterPipeline::disconnectFilterNotifications(AbstractFilter* filter)
 {
   for(const auto& messageReceiver : m_MessageReceivers)
   {
-    disconnect(filter, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), messageReceiver, SLOT(processPipelineMessage(const PipelineMessage&)));
+    disconnect(filter, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), messageReceiver, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   }
+
+  disconnect(filter, &AbstractFilter::messageGenerated, 0, 0);
 }
 
 // -----------------------------------------------------------------------------
@@ -671,21 +718,16 @@ int FilterPipeline::preflightPipeline()
   if(m_State != FilterPipeline::State::Idle)
   {
     // We cannot preflight a pipeline that is not idle
-    setErrorCondition(-203);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Pipeline '%1' could not be preflighted because it is already executing.").arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
-    return getErrorCondition();
+    int err = -203;
+    setErrorCondition(err, ss);
+    return err;
   }
 
   // Create the DataContainer object
   DataContainerArray::Pointer dca = DataContainerArray::New();
 
-  setErrorCondition(0);
+  clearErrorCode();
   int preflightError = 0;
 
   DataArrayPath::RenameContainer renamedPaths;
@@ -707,7 +749,7 @@ int FilterPipeline::preflightPipeline()
       disconnectFilterNotifications(filter.get());
 
       filter->setCancel(false); // Reset the cancel flag
-      preflightError |= filter->getErrorCondition();
+      preflightError |= filter->getErrorCode();
       filter->setDataContainerArray(dca->deepCopy(false));
 #if RENAME_ENABLED
       const std::list<DataArrayPath> deletedPaths = filter->getDeletedPaths();
@@ -787,14 +829,8 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
   if(m_State != FilterPipeline::State::Idle)
   {
     // We cannot execute a pipeline that is not idle
-    setErrorCondition(-200);
-
-    PipelineMessage progValue;
-    progValue.setType(PipelineMessage::MessageType::Error);
     QString ss = QObject::tr("Pipeline '%1' could not be executed because it is already executing.").arg(getName());
-    progValue.setText(ss);
-    progValue.setCode(getErrorCondition());
-    emit pipelineGeneratedMessage(progValue);
+    setErrorCondition(-200, ss);
 
     disconnectSignalsSlots();
     return DataContainerArray::NullPointer();
@@ -811,46 +847,32 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
   m_Dca = dca;
 
   // Start looping through the Pipeline
-  float progress = 0.0f;
-
-  PipelineMessage progValue("", "", 0, PipelineMessage::MessageType::ProgressValue, -1);
   for(const auto& filt : m_Pipeline)
   {
-    progress = progress + 1.0f;
-    progValue.setType(PipelineMessage::MessageType::ProgressValue);
-    progValue.setProgressValue(static_cast<int>(progress / (m_Pipeline.size() + 1) * 100.0f));
-    emit pipelineGeneratedMessage(progValue);
-
-    QString ss = QObject::tr("[%1/%2] %3 ").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+    int filtIndex = filt->getPipelineIndex();
+    QString ss = QObject::tr("[%1/%2] %3").arg(filtIndex+1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+    notifyStatusMessage(ss);
 
-    progValue.setType(PipelineMessage::MessageType::StatusMessage);
-    progValue.setText(ss);
-    emit pipelineGeneratedMessage(progValue);
     emit filt->filterInProgress(filt.get());
 
     // Do not execute disabled filters
     if(filt->getEnabled())
     {
-      filt->setMessagePrefix(ss);
+//      filt->setMessagePrefix(ss);
       connectFilterNotifications(filt.get());
       filt->setDataContainerArray(m_Dca);
       setCurrentFilter(filt);
       filt->execute();
       disconnectFilterNotifications(filt.get());
       filt->setDataContainerArray(DataContainerArray::NullPointer());
-      err = filt->getErrorCondition();
+      err = filt->getErrorCode();
       if(err < 0)
       {
-        setErrorCondition(err);
-        progValue.setFilterClassName(filt->getNameOfClass());
-        progValue.setFilterHumanLabel(filt->getHumanLabel());
-        progValue.setType(PipelineMessage::MessageType::Error);
-        progValue.setProgressValue(100);
-        ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(progress).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
-        progValue.setText(ss);
-        progValue.setPipelineIndex(filt->getPipelineIndex());
-        progValue.setCode(filt->getErrorCondition());
-        emit pipelineGeneratedMessage(progValue);
+        ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(filtIndex+1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+        setErrorCondition(err, ss);
+
+        notifyProgressMessage(100, "");
+
         emit filt->filterCompleted(filt.get());
         emit pipelineFinished();
         disconnectSignalsSlots();
@@ -869,33 +891,26 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
 
     // Emit that the filter is completed for those objects that care, even the disabled ones.
     emit filt->filterCompleted(filt.get());
+
+    notifyProgressMessage(static_cast<int>(static_cast<float>(filtIndex + 1) / (m_Pipeline.size()) * 100.0f), "");
   }
 
   disconnectSignalsSlots();
 
-  PipelineMessage completeMessage("", "", 0, PipelineMessage::MessageType::StatusMessage, -1);
-  if(m_State == FilterPipeline::State::Canceling)
+  switch(m_State)
   {
-    completeMessage.setText("Pipeline Canceled");
+  case FilterPipeline::State::Canceling:
     m_ExecutionResult = FilterPipeline::ExecutionResult::Canceled;
-  }
-  else if(m_State == FilterPipeline::State::Executing)
-  {
-    completeMessage.setText("Pipeline Complete");
+    notifyStatusMessage("Pipeline Canceled");
+    break;
+  case FilterPipeline::State::Executing:
     m_ExecutionResult = FilterPipeline::ExecutionResult::Completed;
+    notifyStatusMessage("Pipeline Complete");
+    break;
+  case FilterPipeline::State::Idle:
+    throw PipelineIdleException();
+    break;
   }
-  else
-  {
-    // This should never get here
-    completeMessage.setText("Unsupported Pipeline Execution Result");
-    emit pipelineGeneratedMessage(completeMessage);
-
-    setErrorCondition(-210);
-    completeMessage.setType(PipelineMessage::MessageType::Error);
-    completeMessage.setCode(getErrorCondition());
-  }
-
-  emit pipelineGeneratedMessage(completeMessage);
 
   m_State = FilterPipeline::State::Idle;
 
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 6036cbe6ff..ee5ec97802 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -47,6 +47,7 @@
 #include "SIMPLib/SIMPLib.h"
 
 class IObserver;
+class FilterPipelineMessageHandler;
 
 /**
  * @class FilterPipeline FilterPipeline.h DREAM3DLib/Common/FilterPipeline.h
@@ -57,12 +58,13 @@ class IObserver;
  * @date Sep 28, 2011
  * @version 1.0
  */
-class SIMPLib_EXPORT FilterPipeline : public QObject
+class SIMPLib_EXPORT FilterPipeline : public Observable
 {
   Q_OBJECT
 
   PYB11_CREATE_BINDINGS(FilterPipeline)
-  PYB11_PROPERTY(int ErrorCondition READ getErrorCondition WRITE setErrorCondition)
+  PYB11_PROPERTY(int ErrorCode READ getErrorCode)
+  PYB11_PROPERTY(int WarningCode READ getWarningCode)
   PYB11_PROPERTY(AbstractFilter CurrentFilter READ getCurrentFilter WRITE setCurrentFilter)
   PYB11_PROPERTY(State State READ getState)
   PYB11_PROPERTY(ExecutionResult ExecutionResult READ getExecutionResult)
@@ -77,6 +79,8 @@ class SIMPLib_EXPORT FilterPipeline : public QObject
   PYB11_METHOD(bool clear)
   PYB11_METHOD(size_t size)
   PYB11_METHOD(bool empty)
+  PYB11_METHOD(void clearErrorCode)
+  PYB11_METHOD(void clearWarningCode)
 
 public:
   SIMPL_SHARED_POINTERS(FilterPipeline)
@@ -85,6 +89,8 @@ class SIMPLib_EXPORT FilterPipeline : public QObject
 
   ~FilterPipeline() override;
 
+  friend FilterPipelineMessageHandler;
+
   enum class State : unsigned int
   {
     Idle,
@@ -104,7 +110,8 @@ class SIMPLib_EXPORT FilterPipeline : public QObject
 
   SIMPL_GET_PROPERTY(FilterPipeline::ExecutionResult, ExecutionResult)
   SIMPL_GET_PROPERTY(FilterPipeline::State, State)
-  SIMPL_INSTANCE_PROPERTY(int, ErrorCondition)
+  SIMPL_GET_PROPERTY(int, ErrorCode)
+  SIMPL_GET_PROPERTY(int, WarningCode)
   SIMPL_INSTANCE_PROPERTY(AbstractFilter::Pointer, CurrentFilter)
 
   /**
@@ -169,18 +176,55 @@ class SIMPLib_EXPORT FilterPipeline : public QObject
   /**
    * @brief This method adds a QObject based class that is capable of being connected with the following signals from
    * AbstractFilter:
-   * @li processPipelineMessage(PipelineMessage&)
-   * @param obj Class that implements needed processPipelineMessage(PipelineMessage&) method
+   * @li processPipelineMessage(const AbstractMessage::Pointer &)
+   * @param obj Class that implements needed processPipelineMessage(const AbstractMessage::Pointer &) method
    */
   void addMessageReceiver(QObject* obj);
 
   void removeMessageReceiver(QObject* obj);
 
-  void connectFilterNotifications(QObject* filter);
-  void disconnectFilterNotifications(QObject* filter);
+  void connectFilterNotifications(AbstractFilter* filter);
+  void disconnectFilterNotifications(AbstractFilter* filter);
 
   QString getName();
 
+  /**
+   * @brief setErrorCondition
+   * @param code
+   * @param messageText
+   */
+  void setErrorCondition(int code, const QString& messageText) override;
+
+  /**
+   * @brief setWarningCondition
+   * @param code
+   * @param messageText
+   */
+  void setWarningCondition(int code, const QString& messageText) override;
+
+  /**
+   * @brief notifyStatusMessage
+   * @param messageText
+   */
+  void notifyStatusMessage(const QString& messageText) override;
+
+  /**
+   * @brief notifyProgressMessage
+   * @param progress
+   * @param messageText
+   */
+  void notifyProgressMessage(int progress, const QString& messageText);
+
+  /**
+   * @brief clearErrorCondition
+   */
+  void clearErrorCode();
+
+  /**
+   * @brief clearWarningCondition
+   */
+  void clearWarningCode();
+
   /**
    * @brief This method returns a deep copy of the FilterPipeline and all its filters
    * @return
@@ -225,7 +269,7 @@ public slots:
   void updatePrevNextFilters();
 
 signals:
-  void pipelineGeneratedMessage(const PipelineMessage& message);
+  void messageGenerated(AbstractMessage::Pointer message);
 
   /**
    * @brief This method is emitted from the pipeline and signals a pipeline pause
@@ -266,6 +310,9 @@ public slots:
 
   DataContainerArray::Pointer m_Dca;
 
+  int m_ErrorCode = 0;
+  int m_WarningCode = 0;
+
   void connectSignalsSlots();
   void disconnectSignalsSlots();
 
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 1659a51758..c112de77f5 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -41,7 +41,6 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/Common/EnsembleInfo.h"
-#include "SIMPLib/Common/PipelineMessage.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -146,6 +145,7 @@ QMetaObjectUtilities::~QMetaObjectUtilities() = default;
 // -----------------------------------------------------------------------------
 void QMetaObjectUtilities::RegisterMetaTypes()
 {
+  qRegisterMetaType<AbstractMessage::Pointer>("AbstractMessage::Pointer");
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
   qRegisterMetaType<DataArrayPath>("DataArrayPath");
   qRegisterMetaType<AxisAngleInput_t>("AxisAngleInput_t");
@@ -155,7 +155,6 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
   qRegisterMetaType<IntVec3Type>("IntVec3Type");
   qRegisterMetaType<FloatVec3Type>("FloatVec3Type");
-  qRegisterMetaType<PipelineMessage>("PipelineMessage");
   qRegisterMetaType<FPRangePair>("FPRangePair");
   qRegisterMetaType<DynamicTableData>("DynamicTableData");
   qRegisterMetaType<PhaseType::Types>("PhaseType::Types");
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index f3f113d5b4..83fc8db016 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -128,9 +128,6 @@ EdgeGeom::EdgeGeom()
   m_GeometryTypeName = SIMPL::Geometry::EdgeGeometry;
   m_GeometryType = IGeometry::Type::Edge;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 1;
   m_SpatialDimensionality = 3;
   m_VertexList = EdgeGeom::CreateSharedVertexList(0);
@@ -436,7 +433,7 @@ void EdgeGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 40bee49fa8..bea31b082d 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -93,9 +93,6 @@ HexahedralGeom::HexahedralGeom()
   m_GeometryTypeName = SIMPL::Geometry::HexahedralGeometry;
   m_GeometryType = IGeometry::Type::Hexahedral;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 3;
   m_SpatialDimensionality = 3;
   m_VertexList = HexahedralGeom::CreateSharedVertexList(0);
@@ -562,7 +559,7 @@ void HexahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArray
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index c41e2d18f9..602aacf41e 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -423,62 +423,14 @@ void IGeometry::sendThreadSafeProgressMessage(int64_t counter, int64_t max)
   if(m_ProgressCounter > prog)
   {
     int64_t progressInt = static_cast<int64_t>((static_cast<float>(m_ProgressCounter) / max) * 100.0f);
-    QString ss = m_MessageTitle + QObject::tr(" || %1% Complete").arg(progressInt);
-    notifyStatusMessage(m_MessagePrefix, m_MessageLabel, ss);
+    QString ss = QObject::tr("%1% Complete").arg(progressInt);
+    notifyStatusMessage(ss);
     prog += progIncrement;
   }
 
   m_Mutex.unlock();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void IGeometry::setMessagePrefix(const QString& name)
-{
-  m_MessagePrefix = name;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString IGeometry::getMessagePrefix()
-{
-  return m_MessagePrefix;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void IGeometry::setMessageTitle(const QString& title)
-{
-  m_MessageTitle = title;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString IGeometry::getMessageTitle()
-{
-  return m_MessageTitle;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void IGeometry::setMessageLabel(const QString& label)
-{
-  m_MessageLabel = label;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString IGeometry::getMessageLabel()
-{
-  return m_MessageLabel;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index f13fb7d4be..4d7f5b960e 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -76,9 +76,6 @@ class SIMPLib_EXPORT IGeometry : public Observable
   PYB11_METHOD(Type getGeometryType)
   PYB11_METHOD(QString getGeometryTypeAsString)
   PYB11_METHOD(QString getInfoString ARGS formatType)
-  PYB11_PROPERTY(QString MessagePrefix READ getMessagePrefix WRITE setMessagePrefix)
-  PYB11_PROPERTY(QString MessageTitle READ getMessageTitle WRITE setMessageTitle)
-  PYB11_PROPERTY(QString MessageLabel READ getMessageLabel WRITE setMessageLabel)
   PYB11_METHOD(uint32_t getXdmfGridType)
   PYB11_METHOD(uint32_t getUnitDimensionality)
   PYB11_PROPERTY(uint32_t SpatialDimensionality READ getSpatialDimensionality WRITE setSpatialDimensionality)
@@ -342,42 +339,6 @@ class SIMPLib_EXPORT IGeometry : public Observable
      */
     virtual QString getInfoString(SIMPL::InfoStringFormat) = 0;
 
-    /**
-     * @brief setMessagePrefix
-     * @param prefix
-     */
-    virtual void setMessagePrefix(const QString& prefix) final;
-
-    /**
-     * @brief getMessagePrefix
-     * @return
-     */
-    virtual QString getMessagePrefix() final;
-
-    /**
-     * @brief setMessageTitle
-     * @param title
-     */
-    virtual void setMessageTitle(const QString& title) final;
-
-    /**
-     * @brief getMessageTitle
-     * @return
-     */
-    virtual QString getMessageTitle() final;
-
-    /**
-     * @brief setMessageLabel
-     * @param label
-     */
-    virtual void setMessageLabel(const QString& label) final;
-
-    /**
-     * @brief getMessageLabel
-     * @return
-     */
-    virtual QString getMessageLabel() final;
-
     /**
      * @brief getXdmfGridType
      * @return
@@ -460,9 +421,6 @@ class SIMPLib_EXPORT IGeometry : public Observable
   protected:
     QString m_Name;
     QString m_GeometryTypeName;
-    QString m_MessagePrefix;
-    QString m_MessageTitle;
-    QString m_MessageLabel;
     Type m_GeometryType = Type::Unknown;
     unsigned int m_XdmfGridType = SIMPL::XdmfGridType::UnknownGrid;
     unsigned int m_UnitDimensionality = 0;
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 40b1364795..878354a3be 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -404,9 +404,6 @@ ImageGeom::ImageGeom()
   m_GeometryTypeName = SIMPL::Geometry::ImageGeometry;
   m_GeometryType = IGeometry::Type::Image;
   m_XdmfGridType = SIMPL::XdmfGridType::RectilinearGrid;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 3;
   m_SpatialDimensionality = 3;
   m_Dimensions[0] = 0;
@@ -972,7 +969,7 @@ void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType:
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index f224819b84..3fa591dcfd 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -129,9 +129,6 @@ QuadGeom::QuadGeom()
   m_GeometryTypeName = SIMPL::Geometry::QuadGeometry;
   m_GeometryType = IGeometry::Type::Quad;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 2;
   m_SpatialDimensionality = 3;
   m_VertexList = QuadGeom::CreateSharedVertexList(0);
@@ -504,7 +501,7 @@ void QuadGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index be5825f2d2..187a6e34ea 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -402,9 +402,6 @@ RectGridGeom::RectGridGeom()
   m_GeometryTypeName = SIMPL::Geometry::RectGridGeometry;
   m_GeometryType = IGeometry::Type::RectGrid;
   m_XdmfGridType = SIMPL::XdmfGridType::RectilinearGrid;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 3;
   m_SpatialDimensionality = 3;
   m_Dimensions[0] = 0;
@@ -1005,7 +1002,7 @@ void RectGridGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 7bcaac144a..e645cb46b3 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -128,9 +128,6 @@ TetrahedralGeom::TetrahedralGeom()
   m_GeometryTypeName = SIMPL::Geometry::TetrahedralGeometry;
   m_GeometryType = IGeometry::Type::Tetrahedral;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 3;
   m_SpatialDimensionality = 3;
   m_VertexList = TetrahedralGeom::CreateSharedVertexList(0);
@@ -578,7 +575,7 @@ void TetrahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArra
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 6a7a1100c4..c4d42db600 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -128,9 +128,6 @@ TriangleGeom::TriangleGeom()
   m_GeometryTypeName = SIMPL::Geometry::TriangleGeometry;
   m_GeometryType = IGeometry::Type::Triangle;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 2;
   m_SpatialDimensionality = 3;
   m_VertexList = TriangleGeom::CreateSharedVertexList(0);
@@ -500,7 +497,7 @@ void TriangleGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
 
   if(observable != nullptr)
   {
-    connect(this, SIGNAL(filterGeneratedMessage(const PipelineMessage&)), observable, SLOT(broadcastPipelineMessage(const PipelineMessage&)));
+    connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index f0514680ab..1bd52b2cff 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -52,9 +52,6 @@ VertexGeom::VertexGeom()
   m_GeometryTypeName = SIMPL::Geometry::VertexGeometry;
   m_GeometryType = IGeometry::Type::Vertex;
   m_XdmfGridType = SIMPL::XdmfGridType::PolyData;
-  m_MessagePrefix = "";
-  m_MessageTitle = "";
-  m_MessageLabel = "";
   m_UnitDimensionality = 0;
   m_SpatialDimensionality = 3;
   m_VertexList = VertexGeom::CreateSharedVertexList(0);
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 2d15122ac6..7bb474eaed 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -157,12 +157,11 @@
   Dream3DTemplateAliasMacroCase_##value(typeIN, typeOUT, call, var_type, tDims, errorCondition, QUOTE(typeIN), isTypeOUT, typeOUTTypename)
 
 // Type is not accepted, throw an error message.
-#define Dream3DTemplateAliasMacroCase_0(typeIN, typeOUT, call, var_type, tDims, errorCondition, quotedType, isTypeOUT, typeOUTTypename)        \
-  if(var_type.compare(quotedType) == 0)           \
-  {                   \
-    setErrorCondition(errorCondition);            \
-    QString errorMessage = QString("Unsupported pixel type: %1.").arg(quotedType);     \
-    notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());   \
+#define Dream3DTemplateAliasMacroCase_0(typeIN, typeOUT, call, var_type, tDims, errorCondition, quotedType, isTypeOUT, typeOUTTypename)                                                                \
+  if(var_type.compare(quotedType) == 0)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    QString errorMessage = QString("Unsupported pixel type: %1.").arg(quotedType);                                                                                                                     \
+    setErrorCondition(errorCondition, errorMessage);                                                                                                                                                   \
   }
 
 // Type is accepted, select the dimension of the input and output images
@@ -182,27 +181,26 @@
   }
 
 // Select vector, RGB/RGBA, or scalar images
-#define Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                       \
-  QVector<size_t> cDims = ptr->getComponentDimensions();                      \
-  if(cDims.size() > 1)  \
-  {                   \
-    Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Vector); \
-  }                   \
-  else                \
-  {                   \
-    if(cDims[0] == 1) \
-    {                 \
-      Dream3DTemplateAliasMacroCaseScalarImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Scalar);                         \
-    }                 \
-    else if(cDims[0] == 3 || cDims[0] == 4)       \
-    {                 \
-      Dream3DTemplateAliasMacroCaseRGBRGBAImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_RGB_RGBA, cDims[0]);            \
-    }                 \
-    else              \
-    {                 \
-      setErrorCondition(errorCondition);          \
-      notifyErrorMessage(getHumanLabel(), QString("Size of tuple not handled:%1").arg(cDims[0]), getErrorCondition());                         \
-    }                 \
+#define Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                               \
+  QVector<size_t> cDims = ptr->getComponentDimensions();                                                                                                                                               \
+  if(cDims.size() > 1)                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Vector);                                                       \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    if(cDims[0] == 1)                                                                                                                                                                                  \
+    {                                                                                                                                                                                                  \
+      Dream3DTemplateAliasMacroCaseScalarImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Scalar);                                                     \
+    }                                                                                                                                                                                                  \
+    else if(cDims[0] == 3 || cDims[0] == 4)                                                                                                                                                            \
+    {                                                                                                                                                                                                  \
+      Dream3DTemplateAliasMacroCaseRGBRGBAImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_RGB_RGBA, cDims[0]);                                        \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      setErrorCondition(errorCondition, QString("Size of tuple not handled:%1").arg(cDims[0]));                                                                                                        \
+    }                                                                                                                                                                                                  \
   }
 
 // Replaces typeOUT by typeIN if no typeOUT is given
@@ -228,9 +226,8 @@
 #define Dream3DTemplateAliasMacroCaseScalarImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)        \
   Dream3DTemplateAliasMacroCaseScalarImage1_##Scalar(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)
 // Scalar images not accepted, throw an error message if a scalar image is given.
-#define Dream3DTemplateAliasMacroCaseScalarImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)              \
-  setErrorCondition(errorCondition);              \
-  notifyErrorMessage(getHumanLabel(), "Scalar images not supported. Try RGB/RGBA or vector images", getErrorCondition());
+#define Dream3DTemplateAliasMacroCaseScalarImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
+  setErrorCondition(errorCondition, "Scalar images not supported. Try RGB/RGBA or vector images");
 // Scalar images accepted
 #define Dream3DTemplateAliasMacroCaseScalarImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)              \
   Dream3DTemplateAliasMacroCase_1_##isTypeOUT(typeIN, typeOUT, call, typeOUTTypename, dimension)
@@ -252,36 +249,32 @@
 #define Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)        \
   Dream3DTemplateAliasMacroCaseVectorImage1_##Vector(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)
 // Vector images not accepted, throw an error message if a vector image is given.
-#define Dream3DTemplateAliasMacroCaseVectorImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)              \
-  setErrorCondition(errorCondition);              \
-  notifyErrorMessage( \
-      getHumanLabel(),  \
-      "Vector not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters",              \
-      getErrorCondition());
+#define Dream3DTemplateAliasMacroCaseVectorImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
+  setErrorCondition(                                                                                                                                                                                   \
+      errorCondition,                                                                                                                                                                                  \
+      "Vector not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters");             \
 // Vector images: Call the given function with the correct dimension after defining the input and output vector types.
-#define Dream3DTemplateAliasMacroCaseVectorImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)              \
-  if(cDims.size() == 2) \
-  {                   \
-    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 2);                   \
-    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);            \
-  }                   \
-  else if(cDims.size() == 3)                      \
-  {                   \
-    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 3);                   \
-    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);            \
-  }                   \
-  else if(cDims.size() == 36)                     \
-  {                   \
-    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 36);                  \
-    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);            \
-  }                   \
-  else                \
-  {                   \
-    setErrorCondition(errorCondition);            \
-    notifyErrorMessage( \
-        getHumanLabel(),                          \
-        "Vector dimension not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters",  \
-        getErrorCondition());                     \
+#define Dream3DTemplateAliasMacroCaseVectorImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
+  if(cDims.size() == 2)                                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 2);                                                                                                                                            \
+    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(cDims.size() == 3)                                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 3);                                                                                                                                            \
+    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(cDims.size() == 36)                                                                                                                                                                          \
+  {                                                                                                                                                                                                    \
+    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 36);                                                                                                                                           \
+    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    setErrorCondition(                                                                                                                                                                                 \
+        errorCondition,                                                                                                                                                                                \
+        "Vector dimension not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters"); \
   }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -293,12 +286,10 @@
 #define Dream3DTemplateAliasMacroCaseRGBRGBAImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)                    \
   Dream3DTemplateAliasMacroCaseRGBRGBAImage1_##RGBRGBA(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents)
 // If RGB/RGBA not accepted by the current filter, prints an error message
-#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents) \
-  setErrorCondition(errorCondition);              \
-  notifyErrorMessage( \
-      getHumanLabel(),  \
-      "RGB/RGBA not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters",            \
-      getErrorCondition());
+#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents)                                                       \
+  setErrorCondition(                                                                                                                                                                                   \
+      errorCondition,                                                                                                                                                                                  \
+      "RGB/RGBA not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters");           \
 // If RGB/RGBA accepted by current filter, call the macro that will call the given function
 #define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents) \
   if(nbComponents == 3) \
@@ -330,33 +321,31 @@
 // Define a macro that is specific to Dream3D and dispatches calls to a template
 // instantiated over the aliased scalar type based on the type of a data array
 // which is saved in the filter's data container array.
-#define Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, isTypeOUT, typeOUTTypename)     \
-  {                   \
-    IDataArray::Pointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);                    \
-    if(nullptr != ptr)  \
-    {                 \
-      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());        \
-      if(nullptr != imageGeometry)                \
-      {               \
-        QVector<size_t> tDims(3, 0);              \
-        std::tie(tDims[0], tDims[1], tDims[2]) = imageGeometry->getDimensions();       \
-        if(getErrorCondition() >= 0)              \
-        {             \
-          QString type = ptr->getTypeAsString();  \
-          Dream3DTemplateAliasMacro(call, type, typeOUT, tDims, errorCondition, isTypeOUT, typeOUTTypename);       \
-        }             \
-      }               \
-      else            \
-      {               \
-        setErrorCondition(errorCondition);        \
-        notifyErrorMessage(getHumanLabel(), "Geometry not found", getErrorCondition());  \
-      }               \
-    }                 \
-    else              \
-    {                 \
-      setErrorCondition(errorCondition);          \
-      notifyErrorMessage(getHumanLabel(), "Array not found", getErrorCondition());     \
-    }                 \
+#define Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, isTypeOUT, typeOUTTypename)                                                                                         \
+  {                                                                                                                                                                                                    \
+    IDataArray::Pointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);                                                                            \
+    if(nullptr != ptr)                                                                                                                                                                                 \
+    {                                                                                                                                                                                                  \
+      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());                                    \
+      if(nullptr != imageGeometry)                                                                                                                                                                     \
+      {                                                                                                                                                                                                \
+        QVector<size_t> tDims(3, 0);                                                                                                                                                                   \
+        std::tie(tDims[0], tDims[1], tDims[2]) = imageGeometry->getDimensions();                                                                                                                       \
+        if(getErrorCode() >= 0)                                                                                                                                                                        \
+        {                                                                                                                                                                                              \
+          QString type = ptr->getTypeAsString();                                                                                                                                                       \
+          Dream3DTemplateAliasMacro(call, type, typeOUT, tDims, errorCondition, isTypeOUT, typeOUTTypename);                                                                                           \
+        }                                                                                                                                                                                              \
+      }                                                                                                                                                                                                \
+      else                                                                                                                                                                                             \
+      {                                                                                                                                                                                                \
+        setErrorCondition(errorCondition, "Geometry not found");                                                                                                                                       \
+      }                                                                                                                                                                                                \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      setErrorCondition(errorCondition, "Array not found");                                                                                                                                            \
+    }                                                                                                                                                                                                  \
   }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -384,43 +373,42 @@
 // itk::ImageIOBase::IOComponentType '0' value is UNKNOWNCOMPONENTTYPE and therefore
 // should be skipped.
 //
-#define Dream3DArraySwitchOutputComponentMacro(call, type, path, errorCondition)       \
-  switch(type)        \
-  {                   \
-  case itk::ImageIOBase::IOComponentType::UCHAR - 1:                          \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, uint8_t, 0);            \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::CHAR - 1: \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, int8_t, 0);             \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::USHORT - 1:                         \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, uint16_t, 0);           \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::SHORT - 1:                          \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, int16_t, 0);            \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::UINT - 1: \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, uint32_t, 0);           \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::INT - 1:  \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, int32_t, 0);            \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::ULONG - 1:                          \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, uint64_t, 0);           \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::LONG - 1: \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, int64_t, 0);            \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::FLOAT - 1:                          \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, float, 0);              \
-    break;            \
-  case itk::ImageIOBase::IOComponentType::DOUBLE - 1:                         \
-    Dream3DArraySwitchMacroOutputType(call, path, -4, double, 0);             \
-    break;            \
-  default:            \
-    setErrorCondition(-4);                        \
-    notifyErrorMessage(getHumanLabel(), "Unsupported pixel component", errorCondition);  \
-    break;            \
+#define Dream3DArraySwitchOutputComponentMacro(call, type, path, errorCondition)                                                                                                                       \
+  switch(type)                                                                                                                                                                                         \
+  {                                                                                                                                                                                                    \
+  case itk::ImageIOBase::IOComponentType::UCHAR - 1:                                                                                                                                                   \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint8_t, 0);                                                                                                                                     \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::CHAR - 1:                                                                                                                                                    \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int8_t, 0);                                                                                                                                      \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::USHORT - 1:                                                                                                                                                  \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint16_t, 0);                                                                                                                                    \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::SHORT - 1:                                                                                                                                                   \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int16_t, 0);                                                                                                                                     \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::UINT - 1:                                                                                                                                                    \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint32_t, 0);                                                                                                                                    \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::INT - 1:                                                                                                                                                     \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int32_t, 0);                                                                                                                                     \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::ULONG - 1:                                                                                                                                                   \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                                    \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::LONG - 1:                                                                                                                                                    \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                                     \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::FLOAT - 1:                                                                                                                                                   \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, float, 0);                                                                                                                                       \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::DOUBLE - 1:                                                                                                                                                  \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, double, 0);                                                                                                                                      \
+    break;                                                                                                                                                                                             \
+  default:                                                                                                                                                                                             \
+    setErrorCondition(errorCondition, "Unsupported pixel component");                                                                                                                                 \
+    break;                                                                                                                                                                                             \
   }
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -441,7 +429,7 @@
       {                                                                                                                                                                                                \
         QVector<size_t> tDims(3, 0);                                                                                                                                                                   \
         std::tie(tDims[0], tDims[1], tDims[2]) = imageGeometry->getDimensions();                                                                                                                       \
-        if(getErrorCondition() >= 0)                                                                                                                                                                   \
+        if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
           QString str_type = ptr->getTypeAsString();                                                                                                                                                   \
           itk::ImageIOBase::IOComponentType type = itk::ImageIOBase::GetComponentTypeFromString(str_type.toStdString());                                                                               \
@@ -450,14 +438,11 @@
       }                                                                                                                                                                                                \
       else                                                                                                                                                                                             \
       {                                                                                                                                                                                                \
-        setErrorCondition(errorCondition);                                                                                                                                                             \
-        notifyErrorMessage(getHumanLabel(), "Geometry not found", getErrorCondition());                                                                                                                \
+        setErrorCondition(errorCondition, "Geometry not found");                                                                                                                                       \
       }                                                                                                                                                                                                \
     }                                                                                                                                                                                                  \
     else                                                                                                                                                                                               \
     {                                                                                                                                                                                                  \
-      setErrorCondition(errorCondition);                                                                                                                                                               \
-      notifyErrorMessage(getHumanLabel(), "Array not found", getErrorCondition());                                                                                                                     \
+      setErrorCondition(errorCondition, "Array not found");                                                                                                                                            \
     }                                                                                                                                                                                                  \
   }
-
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 97a728ffe1..d7881394af 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -111,9 +111,8 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
     }
     else
     {
-      setErrorCondition(-4);
       QString errorMessage = QString("Unsupported number of components: %1.").arg(nbComponents);
-      notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());
+      setErrorCondition(-4, errorMessage);
       break;
     }
     break;
@@ -126,9 +125,8 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
   case itk::ImageIOBase::FIXEDARRAY:
   case itk::ImageIOBase::MATRIX:
   default:
-    setErrorCondition(-4);
     QString errorMessage = QString("Unsupported pixel type: %1.").arg(itk::ImageIOBase::GetPixelTypeAsString(pixel).c_str());
-    notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());
+    setErrorCondition(-4, errorMessage);
     break;
   }
 }
@@ -144,8 +142,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool da
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
   {
-    setErrorCondition(-4);
-    notifyErrorMessage(getHumanLabel(), "Container not found.", getErrorCondition());
+    setErrorCondition(-4, "Container not found.");
     return;
   }
 
@@ -185,9 +182,8 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
     itk::ImageIOBase::Pointer imageIO = itk::ImageIOFactory::CreateImageIO(filename.toLatin1(), itk::ImageIOFactory::ReadMode);
     if(nullptr == imageIO)
     {
-      setErrorCondition(-5);
       QString errorMessage = "ITK could not read the given file \"%1\". Format is likely unsupported.";
-      notifyErrorMessage(getHumanLabel(), errorMessage.arg(filename), getErrorCondition());
+      setErrorCondition(-5, errorMessage.arg(filename));
       return;
     }
     imageIO->SetFileName(filename.toLatin1());
@@ -228,16 +224,14 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
       readImage<double>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     default:
-      setErrorCondition(-4);
       QString errorMessage = QString("Unsupported pixel component: %1.").arg(imageIO->GetComponentTypeAsString(component).c_str());
-      notifyErrorMessage(getHumanLabel(), errorMessage, getErrorCondition());
+      setErrorCondition(-4, errorMessage);
       break;
     }
   } catch(itk::ExceptionObject& err)
   {
-    setErrorCondition(-55557);
     QString errorMessage = "ITK exception was thrown while processing input file: %1";
-    notifyErrorMessage(getHumanLabel(), errorMessage.arg(err.what()), getErrorCondition());
+    setErrorCondition(-55557, errorMessage.arg(err.what()));
     return;
   }
 }
@@ -275,7 +269,7 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
   QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/ITK/itkReadImageImpl.hpp b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
index e0dba0d9cc..3134ee2167 100644
--- a/Source/SIMPLib/ITK/itkReadImageImpl.hpp
+++ b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
@@ -147,9 +147,8 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
     case itk::ImageIOBase::MATRIX:
       break;
     default:
-      filter->setErrorCondition(-2);
       QString message = QObject::tr("Unable to read image '%1'").arg(inputFile);
-      filter->notifyErrorMessage(filter->getHumanLabel(), message, filter->getErrorCondition());
+      filter->setErrorCondition(-2, message);
       outputIDataArray->resizeTuples(0);
     }
 
@@ -158,9 +157,8 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
       readerObject->Update();
     } catch(itk::ExceptionObject& err)
     {
-      filter->setErrorCondition(-5);
       QString ss = QObject::tr("Failed to read image '%1': %2").arg(inputFile).arg(err.GetDescription());
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+      filter->setErrorCondition(-5, ss);
     }
   }
 
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.h b/Source/SIMPLib/Messages/AbstractErrorMessage.h
new file mode 100755
index 0000000000..56162cc2a7
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.h
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractMessage.h"
+
+/**
+ * @class AbstractErrorMessage AbstractErrorMessage.h SIMPLib/Messages/AbstractErrorMessage.h
+ * @brief This class is an abstract error message superclass.
+ */
+class SIMPLib_EXPORT AbstractErrorMessage : public AbstractMessage
+{
+public:
+  SIMPL_SHARED_POINTERS(AbstractErrorMessage)
+  SIMPL_TYPE_MACRO(AbstractErrorMessage)
+
+  virtual ~AbstractErrorMessage()
+  {
+  }
+
+  SIMPL_INSTANCE_PROPERTY(int, Code)
+
+  /**
+   * @brief This method creates and returns a string for error messages
+   */
+  virtual QString generateMessageString() const = 0;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+
+protected:
+  AbstractErrorMessage()
+  : AbstractMessage()
+  , m_Code(0)
+  {
+  }
+
+  AbstractErrorMessage(const QString& msgText, int code)
+  : AbstractMessage(msgText)
+  , m_Code(code)
+  {
+  }
+
+private:
+};
+Q_DECLARE_METATYPE(AbstractErrorMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/AbstractMessage.cpp b/Source/SIMPLib/Messages/AbstractMessage.cpp
new file mode 100644
index 0000000000..f81d56bf0d
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractMessage.cpp
@@ -0,0 +1,57 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "AbstractMessage.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMessage::AbstractMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMessage::AbstractMessage(const QString &msgText)
+: m_MessageText(msgText)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMessage::~AbstractMessage() = default;
diff --git a/Source/SIMPLib/Messages/AbstractMessage.h b/Source/SIMPLib/Messages/AbstractMessage.h
new file mode 100755
index 0000000000..46928af625
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractMessage.h
@@ -0,0 +1,83 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QString>
+#include <QtCore/QMetaType>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
+class AbstractMessageHandler;
+
+/**
+ * @class AbstractMessage AbstractMessage.h SIMPLib/Messages/AbstractMessage.h
+ * @brief This class is the superclass for all messages that can be sent using SIMPL.
+ */
+class SIMPLib_EXPORT AbstractMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(AbstractMessage)
+    SIMPL_TYPE_MACRO(AbstractMessage)
+
+    virtual ~AbstractMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(MessageText)
+
+    /**
+     * @brief This method creates and returns a message string
+     */
+    virtual QString generateMessageString() const = 0;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+
+  protected:
+    AbstractMessage();
+    AbstractMessage(const QString& msgText);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(AbstractMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/AbstractMessageHandler.cpp b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
new file mode 100644
index 0000000000..6a4dd61d6b
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
@@ -0,0 +1,159 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "AbstractMessageHandler.h"
+
+#include "SIMPLib/Messages/GenericErrorMessage.h"
+#include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMessageHandler::AbstractMessageHandler() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const GenericErrorMessage *msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing generic error messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const GenericProgressMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing generic progress messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const GenericStatusMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing generic status messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const GenericWarningMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing generic warning messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const PipelineErrorMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing pipeline error messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const PipelineProgressMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing pipeline progress messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const PipelineStatusMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing pipeline status messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const PipelineWarningMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing pipeline warning messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const FilterErrorMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing filter error messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const FilterProgressMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing filter progress messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const FilterStatusMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing filter status messages. */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void AbstractMessageHandler::processMessage(const FilterWarningMessage* msg) const
+{
+  /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
+   * should reimplement this method if they care about processing filter warning messages. */
+}
diff --git a/Source/SIMPLib/Messages/AbstractMessageHandler.h b/Source/SIMPLib/Messages/AbstractMessageHandler.h
new file mode 100755
index 0000000000..01393f7ec2
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractMessageHandler.h
@@ -0,0 +1,81 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/SIMPLib.h"
+
+class GenericErrorMessage;
+class GenericProgressMessage;
+class GenericStatusMessage;
+class GenericWarningMessage;
+class PipelineErrorMessage;
+class PipelineProgressMessage;
+class PipelineStatusMessage;
+class PipelineWarningMessage;
+class FilterErrorMessage;
+class FilterProgressMessage;
+class FilterStatusMessage;
+class FilterWarningMessage;
+
+/**
+ * @class AbstractMessageHandler AbstractMessageHandler.h SIMPLib/Messages/AbstractMessageHandler.h
+ * @brief This is the message handler superclass that is part of the double-dispatch API and enables
+ * observers to process messages that they receive from observable objects
+ */
+class SIMPLib_EXPORT AbstractMessageHandler
+{
+  public:
+    virtual void processMessage(const GenericErrorMessage* msg) const;
+    virtual void processMessage(const GenericProgressMessage* msg) const;
+    virtual void processMessage(const GenericStatusMessage* msg) const;
+    virtual void processMessage(const GenericWarningMessage* msg) const;
+
+    virtual void processMessage(const PipelineErrorMessage* msg) const;
+    virtual void processMessage(const PipelineProgressMessage* msg) const;
+    virtual void processMessage(const PipelineStatusMessage* msg) const;
+    virtual void processMessage(const PipelineWarningMessage* msg) const;
+
+    virtual void processMessage(const FilterErrorMessage* msg) const;
+    virtual void processMessage(const FilterProgressMessage* msg) const;
+    virtual void processMessage(const FilterStatusMessage* msg) const;
+    virtual void processMessage(const FilterWarningMessage* msg) const;
+
+  protected:
+    AbstractMessageHandler();
+};
+
+
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.h b/Source/SIMPLib/Messages/AbstractProgressMessage.h
new file mode 100755
index 0000000000..5acbc580ae
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.h
@@ -0,0 +1,87 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractMessage.h"
+
+class AbstractMessageHandler;
+
+/**
+ * @class AbstractProgressMessage AbstractProgressMessage.h SIMPLib/Messages/AbstractProgressMessage.h
+ * @brief This class is an abstract progress message superclass.
+ */
+class SIMPLib_EXPORT AbstractProgressMessage : public AbstractMessage
+{
+public:
+  SIMPL_SHARED_POINTERS(AbstractProgressMessage)
+  SIMPL_TYPE_MACRO(AbstractProgressMessage)
+
+  virtual ~AbstractProgressMessage()
+  {
+  }
+
+  SIMPL_INSTANCE_PROPERTY(int, ProgressValue)
+
+  /**
+   * @brief This method creates and returns a string for progress messages
+   */
+  virtual QString generateMessageString() const = 0;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+
+protected:
+  AbstractProgressMessage()
+  : AbstractMessage()
+  , m_ProgressValue(0)
+  {
+  }
+
+  AbstractProgressMessage(const QString& msgText, int progress)
+  : AbstractMessage(msgText)
+  , m_ProgressValue(progress)
+  {
+  }
+
+private:
+};
+Q_DECLARE_METATYPE(AbstractProgressMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.h b/Source/SIMPLib/Messages/AbstractStatusMessage.h
new file mode 100755
index 0000000000..a558056362
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.h
@@ -0,0 +1,83 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractMessage.h"
+
+class AbstractMessageHandler;
+
+/**
+ * @class AbstractStatusMessage AbstractStatusMessage.h SIMPLib/Messages/AbstractStatusMessage.h
+ * @brief This class is an abstract status message superclass.
+ */
+class SIMPLib_EXPORT AbstractStatusMessage : public AbstractMessage
+{
+public:
+  SIMPL_SHARED_POINTERS(AbstractStatusMessage)
+  SIMPL_TYPE_MACRO(AbstractStatusMessage)
+
+  virtual ~AbstractStatusMessage()
+  {
+  }
+
+  /**
+   * @brief This method creates and returns a string for status messages
+   */
+  virtual QString generateMessageString() const = 0;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+
+protected:
+  AbstractStatusMessage()
+  : AbstractMessage()
+  {
+  }
+
+  AbstractStatusMessage(const QString& msgText)
+  : AbstractMessage(msgText)
+  {
+  }
+
+private:
+};
+Q_DECLARE_METATYPE(AbstractStatusMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.h b/Source/SIMPLib/Messages/AbstractWarningMessage.h
new file mode 100755
index 0000000000..e304314ee4
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.h
@@ -0,0 +1,87 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractMessage.h"
+
+class AbstractMessageHandler;
+
+/**
+ * @class AbstractWarningMessage AbstractWarningMessage.h SIMPLib/Messages/AbstractWarningMessage.h
+ * @brief This class is an abstract warning message superclass.
+ */
+class SIMPLib_EXPORT AbstractWarningMessage : public AbstractMessage
+{
+public:
+  SIMPL_SHARED_POINTERS(AbstractWarningMessage)
+  SIMPL_TYPE_MACRO(AbstractWarningMessage)
+
+  virtual ~AbstractWarningMessage()
+  {
+  }
+
+  SIMPL_INSTANCE_PROPERTY(int, Code)
+
+  /**
+   * @brief This method creates and returns a string for warning messages
+   */
+  virtual QString generateMessageString() const = 0;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+
+protected:
+  AbstractWarningMessage()
+  : AbstractMessage()
+  , m_Code(0)
+  {
+  }
+
+  AbstractWarningMessage(const QString& msgText, int code)
+  : AbstractMessage(msgText)
+  , m_Code(code)
+  {
+  }
+
+private:
+};
+Q_DECLARE_METATYPE(AbstractWarningMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.cpp b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
new file mode 100644
index 0000000000..d05e72c024
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "FilterErrorMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterErrorMessage::FilterErrorMessage()
+: AbstractErrorMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterErrorMessage::FilterErrorMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
+: AbstractErrorMessage(msgText, code)
+, m_ClassName(className)
+, m_HumanLabel(humanLabel)
+, m_PipelineIndex(pipelineIndex)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterErrorMessage::~FilterErrorMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterErrorMessage::Pointer FilterErrorMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
+{
+  FilterErrorMessage::Pointer shared_ptr (new FilterErrorMessage(className, humanLabel, pipelineIndex, msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString FilterErrorMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("'%1' Error (%2): %3").arg(getClassName()).arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterErrorMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.h b/Source/SIMPLib/Messages/FilterErrorMessage.h
new file mode 100755
index 0000000000..5f8e63f745
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.h
@@ -0,0 +1,94 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractErrorMessage.h"
+
+/**
+ * @class FilterErrorMessage FilterErrorMessage.h SIMPLib/Messages/FilterErrorMessage.h
+ * @brief This class is a filter error message class that is responsible for holding all the details
+ * of an error message emitted by an AbstractFilter
+ */
+class SIMPLib_EXPORT FilterErrorMessage : public AbstractErrorMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(FilterErrorMessage)
+    SIMPL_STATIC_NEW_MACRO(FilterErrorMessage)
+    SIMPL_TYPE_MACRO(FilterErrorMessage)
+
+    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+
+    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+
+    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+
+    virtual ~FilterErrorMessage();
+
+    /**
+     * @brief New
+     * @param className
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for filter error messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    FilterErrorMessage();
+    FilterErrorMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(FilterErrorMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.cpp b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
new file mode 100644
index 0000000000..25084c8dfe
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "FilterProgressMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterProgressMessage::FilterProgressMessage()
+: AbstractProgressMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterProgressMessage::FilterProgressMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress)
+: AbstractProgressMessage(msgText, progress)
+, m_ClassName(className)
+, m_HumanLabel(humanLabel)
+, m_PipelineIndex(pipelineIndex)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterProgressMessage::~FilterProgressMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterProgressMessage::Pointer FilterProgressMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress)
+{
+  FilterProgressMessage::Pointer shared_ptr (new FilterProgressMessage(className, humanLabel, pipelineIndex, msgText, progress));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString FilterProgressMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterProgressMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.h b/Source/SIMPLib/Messages/FilterProgressMessage.h
new file mode 100755
index 0000000000..2e7ae820c8
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.h
@@ -0,0 +1,94 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractProgressMessage.h"
+
+/**
+ * @class FilterProgressMessage FilterProgressMessage.h SIMPLib/Messages/FilterProgressMessage.h
+ * @brief This class is a filter progress message class that is responsible for holding all the details
+ * of a progress message emitted by an AbstractFilter
+ */
+class SIMPLib_EXPORT FilterProgressMessage : public AbstractProgressMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(FilterProgressMessage)
+    SIMPL_STATIC_NEW_MACRO(FilterProgressMessage)
+    SIMPL_TYPE_MACRO(FilterProgressMessage)
+
+    virtual ~FilterProgressMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+
+    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+
+    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+
+    /**
+     * @brief New
+     * @param className
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for filter progress messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    FilterProgressMessage();
+    FilterProgressMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(FilterProgressMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.cpp b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
new file mode 100644
index 0000000000..8e39526491
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
@@ -0,0 +1,88 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "FilterStatusMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterStatusMessage::FilterStatusMessage()
+: AbstractStatusMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterStatusMessage::FilterStatusMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText)
+: AbstractStatusMessage(msgText)
+, m_ClassName(className)
+, m_HumanLabel(humanLabel)
+, m_PipelineIndex(pipelineIndex)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterStatusMessage::~FilterStatusMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterStatusMessage::Pointer FilterStatusMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText)
+{
+  FilterStatusMessage::Pointer shared_ptr (new FilterStatusMessage(className, humanLabel, pipelineIndex, msgText));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString FilterStatusMessage::generateMessageString() const
+{
+  return getMessageText();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterStatusMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.h b/Source/SIMPLib/Messages/FilterStatusMessage.h
new file mode 100755
index 0000000000..442117fe96
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.h
@@ -0,0 +1,93 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractStatusMessage.h"
+
+/**
+ * @class FilterStatusMessage FilterStatusMessage.h SIMPLib/Messages/FilterStatusMessage.h
+ * @brief This class is a filter status message class that is responsible for holding all the details
+ * of a status message emitted by an AbstractFilter
+ */
+class SIMPLib_EXPORT FilterStatusMessage : public AbstractStatusMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(FilterStatusMessage)
+    SIMPL_STATIC_NEW_MACRO(FilterStatusMessage)
+    SIMPL_TYPE_MACRO(FilterStatusMessage)
+
+    virtual ~FilterStatusMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+
+    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+
+    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+
+    /**
+     * @brief New
+     * @param className
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @return
+     */
+    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
+
+    /**
+     * @brief This method creates and returns a string for filter status messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    FilterStatusMessage();
+    FilterStatusMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(FilterStatusMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.cpp b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
new file mode 100644
index 0000000000..785461466d
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "FilterWarningMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterWarningMessage::FilterWarningMessage()
+: AbstractWarningMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterWarningMessage::FilterWarningMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
+: AbstractWarningMessage(msgText, code)
+, m_ClassName(className)
+, m_HumanLabel(humanLabel)
+, m_PipelineIndex(pipelineIndex)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterWarningMessage::~FilterWarningMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+FilterWarningMessage::Pointer FilterWarningMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
+{
+  FilterWarningMessage::Pointer shared_ptr (new FilterWarningMessage(className, humanLabel, pipelineIndex, msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString FilterWarningMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("'%1' Warning (%2): %4").arg(getClassName()).arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterWarningMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.h b/Source/SIMPLib/Messages/FilterWarningMessage.h
new file mode 100755
index 0000000000..c72b0e4454
--- /dev/null
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.h
@@ -0,0 +1,94 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
+
+/**
+ * @class FilterWarningMessage FilterWarningMessage.h SIMPLib/Messages/FilterWarningMessage.h
+ * @brief This class is a filter warning message class that is responsible for holding all the details
+ * of a warning message emitted by an AbstractFilter
+ */
+class SIMPLib_EXPORT FilterWarningMessage : public AbstractWarningMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(FilterWarningMessage)
+    SIMPL_STATIC_NEW_MACRO(FilterWarningMessage)
+    SIMPL_TYPE_MACRO(FilterWarningMessage)
+
+    virtual ~FilterWarningMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+
+    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+
+    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+
+    /**
+     * @brief New
+     * @param className
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for filter warning messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    FilterWarningMessage();
+    FilterWarningMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(FilterWarningMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.cpp b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
new file mode 100644
index 0000000000..5f304d0fee
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "GenericErrorMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericErrorMessage::GenericErrorMessage()
+: AbstractErrorMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericErrorMessage::GenericErrorMessage(const QString& msgText, int code)
+: AbstractErrorMessage(msgText, code)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericErrorMessage::~GenericErrorMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericErrorMessage::Pointer GenericErrorMessage::New(const QString& msgText, int code)
+{
+  GenericErrorMessage::Pointer shared_ptr (new GenericErrorMessage(msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenericErrorMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("Error (%1): %2").arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenericErrorMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.h b/Source/SIMPLib/Messages/GenericErrorMessage.h
new file mode 100755
index 0000000000..5721f10867
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.h
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractErrorMessage.h"
+
+/**
+ * @class GenericErrorMessage GenericErrorMessage.h SIMPLib/Messages/GenericErrorMessage.h
+ * @brief This class is a generic error message class that is responsible for holding all the details
+ * of a generic error message emitted by any observable object
+ */
+class SIMPLib_EXPORT GenericErrorMessage : public AbstractErrorMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(GenericErrorMessage)
+    SIMPL_STATIC_NEW_MACRO(GenericErrorMessage)
+    SIMPL_TYPE_MACRO(GenericErrorMessage)
+
+    virtual ~GenericErrorMessage();
+
+    /**
+     * @brief New
+     * @param msgText
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for generic error messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    GenericErrorMessage();
+    GenericErrorMessage(const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(GenericErrorMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.cpp b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
new file mode 100644
index 0000000000..c9ca9deee3
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "GenericProgressMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericProgressMessage::GenericProgressMessage()
+: AbstractProgressMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericProgressMessage::GenericProgressMessage(const QString& msgText, int progress)
+: AbstractProgressMessage(msgText, progress)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericProgressMessage::~GenericProgressMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericProgressMessage::Pointer GenericProgressMessage::New(const QString& msgText, int progress)
+{
+  GenericProgressMessage::Pointer shared_ptr (new GenericProgressMessage(msgText, progress));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenericProgressMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenericProgressMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.h b/Source/SIMPLib/Messages/GenericProgressMessage.h
new file mode 100755
index 0000000000..7f79663708
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.h
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractProgressMessage.h"
+
+/**
+ * @class GenericProgressMessage GenericProgressMessage.h SIMPLib/Messages/GenericProgressMessage.h
+ * @brief This class is a generic progress message class that is responsible for holding all the details
+ * of a generic progress message emitted by any observable object
+ */
+class SIMPLib_EXPORT GenericProgressMessage : public AbstractProgressMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(GenericProgressMessage)
+    SIMPL_STATIC_NEW_MACRO(GenericProgressMessage)
+    SIMPL_TYPE_MACRO(GenericProgressMessage)
+
+    virtual ~GenericProgressMessage();
+
+    /**
+     * @brief New
+     * @param msgText
+     * @param progress
+     * @return
+     */
+    static Pointer New(const QString& msgText, int progress);
+
+    /**
+     * @brief This method creates and returns a string for generic progress messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    GenericProgressMessage();
+    GenericProgressMessage(const QString& msgText, int progress);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(GenericProgressMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.cpp b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
new file mode 100644
index 0000000000..6bde8f89f4
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "GenericStatusMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericStatusMessage::GenericStatusMessage()
+: AbstractStatusMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericStatusMessage::GenericStatusMessage(const QString& msgText)
+: AbstractStatusMessage(msgText)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericStatusMessage::~GenericStatusMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericStatusMessage::Pointer GenericStatusMessage::New(const QString& msgText)
+{
+  GenericStatusMessage::Pointer shared_ptr (new GenericStatusMessage(msgText));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenericStatusMessage::generateMessageString() const
+{
+  return getMessageText();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenericStatusMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.h b/Source/SIMPLib/Messages/GenericStatusMessage.h
new file mode 100755
index 0000000000..d8b53bfc1b
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.h
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractStatusMessage.h"
+
+/**
+ * @class GenericStatusMessage GenericStatusMessage.h SIMPLib/Messages/GenericStatusMessage.h
+ * @brief This class is a generic status message class that is responsible for holding all the details
+ * of a generic status message emitted by any observable object
+ */
+class SIMPLib_EXPORT GenericStatusMessage : public AbstractStatusMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(GenericStatusMessage)
+    SIMPL_STATIC_NEW_MACRO(GenericStatusMessage)
+    SIMPL_TYPE_MACRO(GenericStatusMessage)
+
+    virtual ~GenericStatusMessage();
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param msg
+     * @return
+     */
+    static Pointer New(const QString& msgText);
+
+    /**
+     * @brief This method creates and returns a string for generic status messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    GenericStatusMessage();
+    GenericStatusMessage(const QString& msgText);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(GenericStatusMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.cpp b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
new file mode 100644
index 0000000000..f57cfe8b74
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "GenericWarningMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericWarningMessage::GenericWarningMessage()
+: AbstractWarningMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericWarningMessage::GenericWarningMessage(const QString& msgText, int code)
+: AbstractWarningMessage(msgText, code)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericWarningMessage::~GenericWarningMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenericWarningMessage::Pointer GenericWarningMessage::New(const QString& msgText, int code)
+{
+  GenericWarningMessage::Pointer shared_ptr (new GenericWarningMessage(msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenericWarningMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("Error (%1): %2").arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenericWarningMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.h b/Source/SIMPLib/Messages/GenericWarningMessage.h
new file mode 100755
index 0000000000..eb7cd73c42
--- /dev/null
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.h
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
+
+/**
+ * @class GenericWarningMessage GenericWarningMessage.h SIMPLib/Messages/GenericWarningMessage.h
+ * @brief This class is a generic warning message class that is responsible for holding all the details
+ * of a generic warning message emitted by any observable object
+ */
+class SIMPLib_EXPORT GenericWarningMessage : public AbstractWarningMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(GenericWarningMessage)
+    SIMPL_STATIC_NEW_MACRO(GenericWarningMessage)
+    SIMPL_TYPE_MACRO(GenericWarningMessage)
+
+    virtual ~GenericWarningMessage();
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for generic warning messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    GenericWarningMessage();
+    GenericWarningMessage(const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(GenericWarningMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.cpp b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
new file mode 100644
index 0000000000..a007331989
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
@@ -0,0 +1,88 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "PipelineErrorMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::PipelineErrorMessage()
+: AbstractErrorMessage()
+{
+}
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::PipelineErrorMessage(const QString &pipelineName, const QString& msgText, int code)
+: AbstractErrorMessage(msgText, code)
+, m_PipelineName(pipelineName)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::~PipelineErrorMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::Pointer PipelineErrorMessage::New(const QString &pipelineName, const QString& msgText, int code)
+{
+  PipelineErrorMessage::Pointer shared_ptr (new PipelineErrorMessage(pipelineName, msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString PipelineErrorMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("Error (%1): %2").arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineErrorMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.h b/Source/SIMPLib/Messages/PipelineErrorMessage.h
new file mode 100755
index 0000000000..0f45094a9d
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.h
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractErrorMessage.h"
+
+/**
+ * @class PipelineErrorMessage PipelineErrorMessage.h SIMPLib/Messages/PipelineErrorMessage.h
+ * @brief This class is a pipeline error message class that is responsible for holding all the details
+ * of a pipeline error message emitted by a FilterPipeline instance.
+ */
+class SIMPLib_EXPORT PipelineErrorMessage : public AbstractErrorMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(PipelineErrorMessage)
+    SIMPL_STATIC_NEW_MACRO(PipelineErrorMessage)
+    SIMPL_TYPE_MACRO(PipelineErrorMessage)
+
+    virtual ~PipelineErrorMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString &pipelineName, const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for pipeline error messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    PipelineErrorMessage();
+    PipelineErrorMessage(const QString &pipelineName, const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(PipelineErrorMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
new file mode 100644
index 0000000000..0495ef1351
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
@@ -0,0 +1,87 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "PipelineProgressMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::PipelineProgressMessage()
+: AbstractProgressMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::PipelineProgressMessage(const QString &pipelineName, const QString& msgText, int progress)
+: AbstractProgressMessage(msgText, progress)
+, m_PipelineName(pipelineName)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::~PipelineProgressMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::Pointer PipelineProgressMessage::New(const QString &pipelineName, const QString& msgText, int progress)
+{
+  PipelineProgressMessage::Pointer shared_ptr (new PipelineProgressMessage(pipelineName, msgText, progress));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString PipelineProgressMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineProgressMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.h b/Source/SIMPLib/Messages/PipelineProgressMessage.h
new file mode 100755
index 0000000000..f6d92cf799
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.h
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractProgressMessage.h"
+
+/**
+ * @class PipelineProgressMessage PipelineProgressMessage.h SIMPLib/Messages/PipelineProgressMessage.h
+ * @brief This class is a pipeline progress message class that is responsible for holding all the details
+ * of a pipeline progress message emitted by a FilterPipeline instance.
+ */
+class SIMPLib_EXPORT PipelineProgressMessage : public AbstractProgressMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(PipelineProgressMessage)
+    SIMPL_STATIC_NEW_MACRO(PipelineProgressMessage)
+    SIMPL_TYPE_MACRO(PipelineProgressMessage)
+
+    virtual ~PipelineProgressMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param progress
+     * @return
+     */
+    static Pointer New(const QString &pipelineName, const QString& msgText, int progress);
+
+    /**
+     * @brief This method creates and returns a string for pipeline progress messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    PipelineProgressMessage();
+    PipelineProgressMessage(const QString &pipelineName, const QString& msgText, int progress);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(PipelineProgressMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.cpp b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
new file mode 100644
index 0000000000..046cc033c6
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "PipelineStatusMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::PipelineStatusMessage()
+: AbstractStatusMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::PipelineStatusMessage(const QString &pipelineName, const QString& msgText)
+: AbstractStatusMessage(msgText)
+, m_PipelineName(pipelineName)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::~PipelineStatusMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::Pointer PipelineStatusMessage::New(const QString &pipelineName, const QString& msgText)
+{
+  PipelineStatusMessage::Pointer shared_ptr (new PipelineStatusMessage(pipelineName, msgText));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString PipelineStatusMessage::generateMessageString() const
+{
+  return getMessageText();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineStatusMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.h b/Source/SIMPLib/Messages/PipelineStatusMessage.h
new file mode 100755
index 0000000000..cea626353e
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.h
@@ -0,0 +1,88 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractStatusMessage.h"
+
+/**
+ * @class PipelineStatusMessage PipelineStatusMessage.h SIMPLib/Messages/PipelineStatusMessage.h
+ * @brief This class is a pipeline status message class that is responsible for holding all the details
+ * of a pipeline status message emitted by a FilterPipeline instance.
+ */
+class SIMPLib_EXPORT PipelineStatusMessage : public AbstractStatusMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(PipelineStatusMessage)
+    SIMPL_STATIC_NEW_MACRO(PipelineStatusMessage)
+    SIMPL_TYPE_MACRO(PipelineStatusMessage)
+
+    virtual ~PipelineStatusMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @return
+     */
+    static Pointer New(const QString &pipelineName, const QString& msgText);
+
+    /**
+     * @brief This method creates and returns a string for pipeline status messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    PipelineStatusMessage();
+    PipelineStatusMessage(const QString &pipelineName, const QString& msgText);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(PipelineStatusMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.cpp b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
new file mode 100644
index 0000000000..45412526ee
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
@@ -0,0 +1,87 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "PipelineWarningMessage.h"
+
+#include "AbstractMessageHandler.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::PipelineWarningMessage()
+: AbstractWarningMessage()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::PipelineWarningMessage(const QString& pipelineName, const QString& msgText, int code)
+: AbstractWarningMessage(msgText, code)
+, m_PipelineName(pipelineName)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::~PipelineWarningMessage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::Pointer PipelineWarningMessage::New(const QString &pipelineName, const QString& msgText, int code)
+{
+  PipelineWarningMessage::Pointer shared_ptr (new PipelineWarningMessage(pipelineName, msgText, code));
+  return shared_ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString PipelineWarningMessage::generateMessageString() const
+{
+  QString ss = QObject::tr("Warning (%1): %2").arg(getCode()).arg(getMessageText());
+  return ss;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineWarningMessage::visit(AbstractMessageHandler* msgHandler) const
+{
+  msgHandler->processMessage(this);
+}
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.h b/Source/SIMPLib/Messages/PipelineWarningMessage.h
new file mode 100755
index 0000000000..e02a86d636
--- /dev/null
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.h
@@ -0,0 +1,89 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
+
+/**
+ * @class PipelineWarningMessage PipelineWarningMessage.h SIMPLib/Messages/PipelineWarningMessage.h
+ * @brief This class is a pipeline warning message class that is responsible for holding all the details
+ * of a pipeline warning message emitted by a FilterPipeline instance.
+ */
+class SIMPLib_EXPORT PipelineWarningMessage : public AbstractWarningMessage
+{
+  public:
+    SIMPL_SHARED_POINTERS(PipelineWarningMessage)
+    SIMPL_STATIC_NEW_MACRO(PipelineWarningMessage)
+    SIMPL_TYPE_MACRO(PipelineWarningMessage)
+
+    virtual ~PipelineWarningMessage();
+
+    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
+
+    /**
+     * @brief New
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @return
+     */
+    static Pointer New(const QString &pipelineName, const QString& msgText, int code);
+
+    /**
+     * @brief This method creates and returns a string for pipeline warning messages
+     */
+    virtual QString generateMessageString() const override;
+
+    /**
+     * @brief Method that allows the visitation of a message by a message handler.  This
+     * is part of the double-dispatch API that allows observers to be able to perform
+     * subclass specific operations on messages that they receive.
+     * @param msgHandler The observer's message handler
+     */
+    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+
+  protected:
+    PipelineWarningMessage();
+    PipelineWarningMessage(const QString &pipelineName, const QString& msgText, int code);
+
+  private:
+
+};
+Q_DECLARE_METATYPE(PipelineWarningMessage::Pointer)
+
+
diff --git a/Source/SIMPLib/Messages/SourceList.cmake b/Source/SIMPLib/Messages/SourceList.cmake
new file mode 100755
index 0000000000..cde173b105
--- /dev/null
+++ b/Source/SIMPLib/Messages/SourceList.cmake
@@ -0,0 +1,68 @@
+
+set(SUBDIR_NAME Messages)
+
+# --------------------------------------------------------------------
+# Any Class that inherits from QObject, either directly or through the heirarchy needs to have its header listed here
+set(SIMPLib_${SUBDIR_NAME}_Moc_HDRS
+  # ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DocRequestManager.h
+)
+
+# --------------------------------------------------------------------
+# Run Qts automoc program to generate some source files that get compiled
+# QT5_WRAP_CPP( SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS ${SIMPLib_${SUBDIR_NAME}_Moc_HDRS})
+set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPERTIES GENERATED TRUE)
+set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+set(SIMPLib_${SUBDIR_NAME}_HDRS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessageHandler.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractErrorMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractProgressMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractStatusMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractWarningMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterErrorMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterProgressMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterStatusMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterWarningMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericErrorMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericProgressMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericStatusMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericWarningMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineErrorMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineProgressMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineStatusMessage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineWarningMessage.h
+)
+
+
+set(SIMPLib_${SUBDIR_NAME}_SRCS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessageHandler.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterErrorMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterProgressMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterStatusMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterWarningMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericErrorMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericProgressMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericStatusMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericWarningMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineErrorMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineProgressMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineStatusMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineWarningMessage.cpp
+)
+
+cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
+cmp_IDE_SOURCE_PROPERTIES( "Generated/${SUBDIR_NAME}" "" "${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}" "0")
+
+set(SIMPLib_${SUBDIR_NAME}_HDRS
+  ${SIMPLib_${SUBDIR_NAME}_HDRS}
+  ${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}  # Add the headers that get Moc'ed here so they show up in solutions/IDEs/Project files
+)
+
+set(SIMPLib_${SUBDIR_NAME}_SRCS
+  ${SIMPLib_${SUBDIR_NAME}_SRCS}
+  ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}
+)
+
+
diff --git a/Source/SIMPLib/REST/PipelineListener.cpp b/Source/SIMPLib/REST/PipelineListener.cpp
index 98334e8011..59f3baff28 100644
--- a/Source/SIMPLib/REST/PipelineListener.cpp
+++ b/Source/SIMPLib/REST/PipelineListener.cpp
@@ -1,5 +1,11 @@
 #include "PipelineListener.h"
 
+#include "REST/PipelineListenerMessageHandler.h"
+
+#include "SIMPLib/Messages/AbstractErrorMessage.h"
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
+#include "SIMPLib/Messages/AbstractStatusMessage.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -23,142 +29,53 @@ PipelineListener::~PipelineListener()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<PipelineMessage> PipelineListener::getMessages()
+std::vector<const AbstractMessage*> PipelineListener::getAllMessages()
 {
-  return m_Messages;
+  return m_AllMessages;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<PipelineMessage> PipelineListener::getErrorMessages()
+std::vector<const AbstractErrorMessage*> PipelineListener::getErrorMessages()
 {
-  std::vector<PipelineMessage> errorMessages;
-
-  size_t numMessages = m_Messages.size();
-  for(size_t i = 0; i < numMessages; i++)
-  {
-    if(m_Messages[i].getType() == PipelineMessage::MessageType::Error)
-    {
-      errorMessages.push_back(m_Messages[i]);
-    }
-  }
-
-  return errorMessages;
+  return m_ErrorMessages;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<PipelineMessage> PipelineListener::getWarningMessages()
+std::vector<const AbstractWarningMessage*> PipelineListener::getWarningMessages()
 {
-  std::vector<PipelineMessage> warningMessages;
-
-  size_t numMessages = m_Messages.size();
-  for(size_t i = 0; i < numMessages; i++)
-  {
-    if(m_Messages[i].getType() == PipelineMessage::MessageType::Warning)
-    {
-      warningMessages.push_back(m_Messages[i]);
-    }
-  }
-
-  return warningMessages;
+  return m_WarningMessages;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<PipelineMessage> PipelineListener::getStatusMessages()
+std::vector<const AbstractStatusMessage*> PipelineListener::getStatusMessages()
 {
-  std::vector<PipelineMessage> statusMessages;
-
-  size_t numMessages = m_Messages.size();
-  for(size_t i = 0; i < numMessages; i++)
-  {
-    if(m_Messages[i].getType() == PipelineMessage::MessageType::StatusMessage)
-    {
-      statusMessages.push_back(m_Messages[i]);
-    }
-  }
-
-  return statusMessages;
+  return m_StatusMessages;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<PipelineMessage> PipelineListener::getStandardOutputMessages()
+std::vector<const AbstractProgressMessage*> PipelineListener::getProgressMessages()
 {
-  std::vector<PipelineMessage> stdOutMessages;
-
-  size_t numMessages = m_Messages.size();
-  for(size_t i = 0; i < numMessages; i++)
-  {
-    if(m_Messages[i].getType() == PipelineMessage::MessageType::StandardOutputMessage)
-    {
-      stdOutMessages.push_back(m_Messages[i]);
-    }
-  }
-
-  return stdOutMessages;
+  return m_ProgressMessages;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineListener::processPipelineMessage(const PipelineMessage& pm)
+void PipelineListener::processPipelineMessage(const AbstractMessage::Pointer& pm)
 {
-  m_Messages.push_back(pm);
-
-  switch(pm.getType())
-  {
-  case PipelineMessage::MessageType::Error:
-    if(m_ErrorLog && m_ErrorLog->open(QIODevice::ReadWrite))
-    {
-      QTextStream stream(m_ErrorLog);
-      stream.readAll();
-      stream << pm.generateErrorString() << endl;
-      m_ErrorLog->close();
-    }
-    break;
-  case PipelineMessage::MessageType::Warning:
-    if(m_WarningLog && m_WarningLog->open(QIODevice::ReadWrite))
-    {
-      QTextStream stream(m_WarningLog);
-      stream.readAll();
-      stream << pm.generateWarningString() << endl;
-      m_WarningLog->close();
-    }
-    break;
-  case PipelineMessage::MessageType::StatusMessage:
-    if(m_StatusLog && m_StatusLog->open(QIODevice::ReadWrite))
-    {
-      QTextStream stream(m_StatusLog);
-      stream.readAll();
-      stream << pm.generateStatusString() << endl;
-      m_StatusLog->close();
-    }
-
-    qDebug() << pm.getText();
-    break;
-  case PipelineMessage::MessageType::StandardOutputMessage:
-    if(m_StandardOutputLog && m_StandardOutputLog->open(QIODevice::ReadWrite))
-    {
-      QTextStream stream(m_StandardOutputLog);
-      stream.readAll();
-      stream << pm.generateStandardOutputString() << endl;
-      m_StandardOutputLog->close();
-    }
-    break;
-  default:
-    break;
-  }
+  PipelineListenerMessageHandler msgHandler(this);
+  pm->visit(&msgHandler);
 
-  if(pm.getType() == PipelineMessage::MessageType::StandardOutputMessage)
-  {
-    qDebug() << pm.getText();
-  }
+  m_SharedMessages.push_back(pm);
+  m_AllMessages.push_back(pm.get());
 }
 
 // -----------------------------------------------------------------------------
@@ -166,13 +83,13 @@ void PipelineListener::processPipelineMessage(const PipelineMessage& pm)
 // -----------------------------------------------------------------------------
 QString PipelineListener::getErrorLog()
 {
-  std::vector<PipelineMessage> messages = getErrorMessages();
+  std::vector<const AbstractErrorMessage*> messages = getErrorMessages();
   int count = messages.size();
   QString log;
 
   for(int i = 0; i < count; i++)
   {
-    log += messages[i].generateErrorString() + "\n";
+    log += messages[i]->generateMessageString() + "\n";
   }
 
   return log;
@@ -183,13 +100,13 @@ QString PipelineListener::getErrorLog()
 // -----------------------------------------------------------------------------
 QString PipelineListener::getWarningLog()
 {
-  std::vector<PipelineMessage> messages = getWarningMessages();
+  std::vector<const AbstractWarningMessage*> messages = getWarningMessages();
   int count = messages.size();
   QString log;
 
   for(int i = 0; i < count; i++)
   {
-    log += messages[i].generateWarningString() + "\n";
+    log += messages[i]->generateMessageString() + "\n";
   }
 
   return log;
@@ -200,30 +117,13 @@ QString PipelineListener::getWarningLog()
 // -----------------------------------------------------------------------------
 QString PipelineListener::getStatusLog()
 {
-  std::vector<PipelineMessage> messages = getStatusMessages();
+  std::vector<const AbstractStatusMessage*> messages = getStatusMessages();
   int count = messages.size();
   QString log;
 
   for(int i = 0; i < count; i++)
   {
-    log += messages[i].generateStatusString() + "\n";
-  }
-
-  return log;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PipelineListener::getStandardOutputLog()
-{
-  std::vector<PipelineMessage> messages = getStandardOutputMessages();
-  int count = messages.size();
-  QString log;
-
-  for(int i = 0; i < count; i++)
-  {
-    log += messages[i].generateStandardOutputString() + "\n";
+    log += messages[i]->generateMessageString() + "\n";
   }
 
   return log;
@@ -271,20 +171,6 @@ void PipelineListener::createStatusLogFile(QString path)
   m_StatusLog = new QFile(path);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PipelineListener::createStandardOutputLogFile(QString path)
-{
-  if(m_StandardOutputLog)
-  {
-    m_StandardOutputLog->close();
-    delete m_StandardOutputLog;
-  }
-
-  m_StandardOutputLog = new QFile(path);
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index 0d1ad034ea..8287bb64ad 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -5,10 +5,17 @@
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 
+class PipelineListenerMessageHandler;
+
+class AbstractErrorMessage;
+class AbstractProgressMessage;
+class AbstractStatusMessage;
+class AbstractWarningMessage;
+
 class SIMPLib_EXPORT PipelineListener : public QObject, public IObserver
 {
   Q_OBJECT
@@ -18,28 +25,33 @@ class SIMPLib_EXPORT PipelineListener : public QObject, public IObserver
   PipelineListener(QObject* parent);
   virtual ~PipelineListener();
 
+  friend PipelineListenerMessageHandler;
+
   void createErrorLogFile(QString path);
   void createWarningLogFile(QString path);
   void createStatusLogFile(QString path);
-  void createStandardOutputLogFile(QString path);
   void closeFiles();
 
-  std::vector<PipelineMessage> getMessages();
-  std::vector<PipelineMessage> getErrorMessages();
-  std::vector<PipelineMessage> getWarningMessages();
-  std::vector<PipelineMessage> getStatusMessages();
-  std::vector<PipelineMessage> getStandardOutputMessages();
+  std::vector<const AbstractMessage*> getAllMessages();
+  std::vector<const AbstractErrorMessage*> getErrorMessages();
+  std::vector<const AbstractWarningMessage*> getWarningMessages();
+  std::vector<const AbstractStatusMessage*> getStatusMessages();
+  std::vector<const AbstractProgressMessage*> getProgressMessages();
 
   QString getErrorLog();
   QString getWarningLog();
   QString getStatusLog();
-  QString getStandardOutputLog();
 
 public slots:
-  void processPipelineMessage(const PipelineMessage& pm);
+  void processPipelineMessage(const AbstractMessage::Pointer& pm);
 
 private:
-  std::vector<PipelineMessage> m_Messages;
+  std::vector<AbstractMessage::Pointer> m_SharedMessages;
+  std::vector<const AbstractMessage*> m_AllMessages;
+  std::vector<const AbstractErrorMessage*> m_ErrorMessages;
+  std::vector<const AbstractStatusMessage*> m_StatusMessages;
+  std::vector<const AbstractProgressMessage*> m_ProgressMessages;
+  std::vector<const AbstractWarningMessage*> m_WarningMessages;
 
   QFile* m_ErrorLog;
   QFile* m_WarningLog;
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
new file mode 100644
index 0000000000..5c9398ca30
--- /dev/null
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
@@ -0,0 +1,163 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "PipelineListenerMessageHandler.h"
+
+#include "SIMPLib/Messages/GenericErrorMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
+#include "SIMPLib/Messages/PipelineWarningMessage.h"
+#include "SIMPLib/Messages/PipelineStatusMessage.h"
+#include "SIMPLib/Messages/PipelineProgressMessage.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+
+#include "REST/PipelineListener.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PipelineListenerMessageHandler::PipelineListenerMessageHandler(PipelineListener* listener)
+: m_Listener(listener)
+{
+
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const PipelineErrorMessage* msg) const
+{
+  QFile* log = m_Listener->m_ErrorLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_ErrorMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const PipelineWarningMessage* msg) const
+{
+  QFile* log = m_Listener->m_WarningLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_WarningMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const PipelineStatusMessage* msg) const
+{
+  QFile* log = m_Listener->m_StatusLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_StatusMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const PipelineProgressMessage* msg) const
+{
+  m_Listener->m_ProgressMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const FilterErrorMessage* msg) const
+{
+  QFile* log = m_Listener->m_ErrorLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_ErrorMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const FilterWarningMessage* msg) const
+{
+  QFile* log = m_Listener->m_WarningLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_WarningMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const FilterStatusMessage* msg) const
+{
+  QFile* log = m_Listener->m_StatusLog;
+  QString msgString = msg->generateMessageString();
+  streamToLog(msgString, log);
+
+  m_Listener->m_StatusMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::processMessage(const FilterProgressMessage* msg) const
+{
+  m_Listener->m_ProgressMessages.push_back(msg);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PipelineListenerMessageHandler::streamToLog(const QString &msgString, QFile* log) const
+{
+  if(log && log->open(QIODevice::ReadWrite))
+  {
+    QTextStream stream(log);
+    stream.readAll();
+    stream << msgString << endl;
+    log->close();
+  }
+}
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.h b/Source/SIMPLib/REST/PipelineListenerMessageHandler.h
new file mode 100644
index 0000000000..db1642c542
--- /dev/null
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.h
@@ -0,0 +1,104 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/SIMPLib.h"
+
+class QFile;
+class PipelineListener;
+
+/**
+ * @brief This message handler is used by the PipelineListener class to stream incoming error, warning,
+ * and status messages to the correct logs.  It also stores the incoming messages for later use.
+ */
+class SIMPLib_EXPORT PipelineListenerMessageHandler : public AbstractMessageHandler
+{
+public:
+  PipelineListenerMessageHandler(PipelineListener* listener);
+
+  /**
+   * @brief Streams incoming PipelineErrorMessages to the error log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const PipelineErrorMessage* msg) const override;
+
+  /**
+   * @brief Stores the incoming PipelineProgressMessages for later use.
+   */
+  virtual void processMessage(const PipelineProgressMessage* msg) const override;
+
+  /**
+   * @brief Streams incoming PipelineStatusMessages to the status log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const PipelineStatusMessage* msg) const override;
+
+  /**
+   * @brief Streams incoming PipelineWarningMessages to the warning log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const PipelineWarningMessage* msg) const override;
+
+  /**
+   * @brief Streams incoming FilterErrorMessages to the error log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const FilterErrorMessage* msg) const override;
+
+  /**
+   * @brief Stores the incoming FilterProgressMessages for later use.
+   */
+  virtual void processMessage(const FilterProgressMessage* msg) const override;
+
+  /**
+   * @brief Streams incoming FilterStatusMessages to the status log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const FilterStatusMessage* msg) const override;
+
+  /**
+   * @brief Streams incoming FilterWarningMessages to the warning log and stores the message
+   * for later use.
+   */
+  virtual void processMessage(const FilterWarningMessage* msg) const override;
+
+private:
+  PipelineListener* m_Listener = nullptr;
+
+  void streamToLog(const QString& msgString, QFile* log) const;
+};
diff --git a/Source/SIMPLib/REST/SourceList.cmake b/Source/SIMPLib/REST/SourceList.cmake
index 25310c44ee..efcc8f1f27 100755
--- a/Source/SIMPLib/REST/SourceList.cmake
+++ b/Source/SIMPLib/REST/SourceList.cmake
@@ -29,23 +29,29 @@ set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPER
 set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPERTIES HEADER_FILE_ONLY TRUE)
 
 set(SIMPLib_${SUBDIR_NAME}_HDRS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineListenerMessageHandler.h
 
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ExecutePipelineMessageHandler.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/PreflightPipelineMessageHandler.h
 )
 
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRequestMapper.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineListener.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PipelineListenerMessageHandler.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDirectoryListing.cpp
 
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/NumFiltersController.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/V1RequestMapper.cpp
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ExecutePipelineController.cpp      
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ExecutePipelineController.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ExecutePipelineMessageHandler.cpp      
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/NumFiltersController.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ListFilterParametersController.cpp 
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/PluginInfoController.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/LoadedPluginsController.cpp        
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/PreflightPipelineController.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/PreflightPipelineMessageHandler.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/NamesOfFiltersController.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/ApiNotFoundController.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/V1Controllers/SIMPLStaticFileController.cpp
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 39384971d6..427c9230fb 100755
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -59,6 +59,8 @@
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Messages/AbstractErrorMessage.h"
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
 #include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
@@ -333,10 +335,10 @@ class RESTUnitTest
 
       pipeline->execute();
 
-      std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
+      std::vector<const AbstractWarningMessage*> warningMessages = listener.getWarningMessages();
       DREAM3D_REQUIRE_EQUAL(warningMessages.size(), 0);
 
-      std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
+      std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
       DREAM3D_REQUIRE_EQUAL(errorMessages.size(), 0);
     }
   }
@@ -527,10 +529,10 @@ class RESTUnitTest
 
         pipeline->execute();
 
-        std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
+        std::vector<const AbstractWarningMessage*> warningMessages = listener.getWarningMessages();
         DREAM3D_REQUIRE_EQUAL(warningMessages.size(), 0);
 
-        std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
+        std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
         DREAM3D_REQUIRE_EQUAL(errorMessages.size(), 0);
       }
       else
@@ -591,7 +593,7 @@ class RESTUnitTest
     pipeline->pushBack(writer);
 
     DataContainerArray::Pointer dca = pipeline->execute();
-    int32_t err = pipeline->getErrorCondition();
+    int32_t err = pipeline->getErrorCode();
     DREAM3D_REQUIRE(err >= 0);
   }
   // -----------------------------------------------------------------------------
@@ -798,10 +800,10 @@ class RESTUnitTest
 
         pipeline->execute();
 
-        std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
+        std::vector<const AbstractWarningMessage*> warningMessages = listener.getWarningMessages();
         DREAM3D_REQUIRE_EQUAL(warningMessages.size(), 0);
 
-        std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
+        std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
         DREAM3D_REQUIRE_EQUAL(errorMessages.size(), 0);
       }
       else
@@ -1523,10 +1525,10 @@ class RESTUnitTest
 
       pipeline->preflightPipeline();
 
-      std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
+      std::vector<const AbstractWarningMessage*> warningMessages = listener.getWarningMessages();
       DREAM3D_REQUIRE_EQUAL(warningMessages.size(), 0);
 
-      std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
+      std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
       DREAM3D_REQUIRED(errorMessages.size(), >, 0);
 
       for(int i = 0; i < responseErrorsArray.size(); i++)
@@ -1540,8 +1542,8 @@ class RESTUnitTest
         DREAM3D_REQUIRE_EQUAL(responseErrorObject[SIMPL::JSON::FilterIndex].isDouble(), true);
 
         int responseErrorCode = responseErrorObject[SIMPL::JSON::Code].toInt();
-        PipelineMessage errorMessage = errorMessages[i];
-        DREAM3D_REQUIRE_EQUAL(responseErrorCode, errorMessage.getCode());
+        const AbstractErrorMessage* errorMessage = errorMessages[i];
+        DREAM3D_REQUIRE_EQUAL(responseErrorCode, errorMessage->getCode());
       }
     }
 
@@ -1593,10 +1595,10 @@ class RESTUnitTest
 
       pipeline->preflightPipeline();
 
-      std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
+      std::vector<const AbstractWarningMessage*> warningMessages = listener.getWarningMessages();
       DREAM3D_REQUIRE_EQUAL(warningMessages.size(), 0);
 
-      std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
+      std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
       DREAM3D_REQUIRE_EQUAL(errorMessages.size(), 0);
     }
   }
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 286841b12f..935edc3061 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -56,6 +56,7 @@
 #include "QtWebApp/httpserver/httpsessionstore.h"
 #include "SIMPLStaticFileController.h"
 #include "SIMPLib/REST/PipelineListener.h"
+#include "SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -186,53 +187,29 @@ void ExecutePipelineController::serviceJSON(QJsonObject pipelineObj)
     qDebug() << "Pipeline About to Execute....";
     pipeline->execute();
 
-    qDebug() << "Pipeline Done Executing...." << pipeline->getErrorCondition();
+    qDebug() << "Pipeline Done Executing...." << pipeline->getErrorCode();
   }
 
-  // Return messages
-  std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
-  bool completed = (errorMessages.size() == 0);
 
+  // Return messages
   QJsonArray errors;
-  size_t numErrors = errorMessages.size();
-  for(size_t i = 0; i < numErrors; i++)
-  {
-    QJsonObject error;
-    error[SIMPL::JSON::Code] = errorMessages[i].generateErrorString();
-    error[SIMPL::JSON::Message] = errorMessages[i].getText();
-    error[SIMPL::JSON::FilterHumanLabel] = errorMessages[i].getFilterHumanLabel();
-    error[SIMPL::JSON::FilterIndex] = errorMessages[i].getPipelineIndex();
-
-    errors.push_back(error);
-  }
-  m_ResponseObj[SIMPL::JSON::PipelineErrors] = errors;
-
-  std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
   QJsonArray warnings;
-  size_t numWarnings = warningMessages.size();
-  for(size_t i = 0; i < numWarnings; i++)
-  {
-    QJsonObject warning;
-    warning[SIMPL::JSON::Code] = warningMessages[i].generateWarningString();
-    warning[SIMPL::JSON::Message] = warningMessages[i].getText();
-    warning[SIMPL::JSON::FilterHumanLabel] = warningMessages[i].getFilterHumanLabel();
-    warning[SIMPL::JSON::FilterIndex] = warningMessages[i].getPipelineIndex();
+  QJsonArray statusMsgs;
 
-    warnings.push_back(warning);
-  }
+  std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
+  bool completed = (errorMessages.size() == 0);
+  m_ResponseObj[SIMPL::JSON::Completed] = completed;
 
-  std::vector<PipelineMessage> statusMessages = listener.getStatusMessages();
-  QJsonArray statusMsgs;
-  size_t numStatusMsgs = statusMessages.size();
-  for(size_t i = 0; i < numStatusMsgs; i++)
+  std::vector<const AbstractMessage*> allMessages = listener.getAllMessages();
+  for(const AbstractMessage* msg : allMessages)
   {
-    QJsonObject msg;
-    msg[SIMPL::JSON::Message] = statusMessages[i].generateStatusString();
-    statusMsgs.push_back(msg);
+    ExecutePipelineMessageHandler msgHandler(&errors, &warnings);
+    msg->visit(&msgHandler);
   }
-  // responseObj["StatusMessages"] = statusMsgs;
+
+  m_ResponseObj[SIMPL::JSON::PipelineErrors] = errors;
   m_ResponseObj[SIMPL::JSON::PipelineWarnings] = warnings;
-  m_ResponseObj[SIMPL::JSON::Completed] = completed;
+  // m_ResponseObj["StatusMessages"] = statusMsgs;
 
   //  // **************************************************************************
   //  // This section archives the working directory for this session
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
index b6af8ea523..8fb7e7ef7c 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
@@ -41,6 +41,8 @@
 #include "QtWebApp/httpserver/httpresponse.h"
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 
 /**
   @brief This class responds to REST API endpoint
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.cpp
new file mode 100644
index 0000000000..d3d1cfbce6
--- /dev/null
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.cpp
@@ -0,0 +1,102 @@
+/* ============================================================================
+ * Copyright (c) 2017-2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "ExecutePipelineMessageHandler.h"
+
+#include "QtCore/QJsonArray"
+
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
+#include "SIMPLib/Messages/PipelineWarningMessage.h"
+
+#include "REST/V1Controllers/ExecutePipelineController.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ExecutePipelineMessageHandler::ExecutePipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings)
+: m_Errors(errors)
+, m_Warnings(warnings)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ExecutePipelineMessageHandler::processMessage(const FilterErrorMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  obj.insert(SIMPL::JSON::FilterIndex, msg->getPipelineIndex());
+  obj.insert(SIMPL::JSON::FilterHumanLabel, msg->getHumanLabel());
+  m_Errors->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ExecutePipelineMessageHandler::processMessage(const FilterWarningMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  obj.insert(SIMPL::JSON::FilterIndex, msg->getPipelineIndex());
+  obj.insert(SIMPL::JSON::FilterHumanLabel, msg->getHumanLabel());
+  m_Warnings->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ExecutePipelineMessageHandler::processMessage(const PipelineErrorMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  m_Errors->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ExecutePipelineMessageHandler::processMessage(const PipelineWarningMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  m_Warnings->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QJsonObject ExecutePipelineMessageHandler::writeToJson(int code, const QString& msg) const
+{
+  QJsonObject obj;
+  obj.insert(SIMPL::JSON::Code, code);
+  obj.insert(SIMPL::JSON::Message, msg);
+  return obj;
+}
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
new file mode 100644
index 0000000000..a925d2b93a
--- /dev/null
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2017-2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+
+/**
+ * @brief This message handler is used by the ExecutePipeline class to store values from error and warning
+ * messages in json objects.  These json objects are stored in an error json array and a warning json array.
+ */
+class SIMPLib_EXPORT ExecutePipelineMessageHandler : public AbstractMessageHandler
+{
+  public:
+    ExecutePipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
+
+    /**
+     * @brief Stores pipeline index, human label, message text, and error code
+     *  of incoming FilterErrorMessages into a json object and stores the json
+     * object in the errors json array.
+     */
+    void processMessage(const FilterErrorMessage* msg) const override;
+
+    /**
+     * @brief Stores pipeline index, human label, message text, and warning code
+     *  of incoming FilterWarningMessages into a json object and stores the json
+     * object in the warnings json array.
+     */
+    void processMessage(const FilterWarningMessage* msg) const override;
+
+    /**
+     * @brief Stores message text and warning code of incoming PipelineErrorMessages
+     * into a json object and stores the json object in the errors json array.
+     */
+    void processMessage(const PipelineErrorMessage* msg) const override;
+
+    /**
+     * @brief Stores message text and warning code of incoming PipelineWarningMessages
+     * into a json object and stores the json object in the warnings json array.
+     */
+    void processMessage(const PipelineWarningMessage* msg) const override;
+
+  private:
+    QJsonArray* m_Errors = nullptr;
+    QJsonArray* m_Warnings = nullptr;
+
+    /**
+     * @brief writeToJson
+     * @param code
+     * @param msg
+     */
+    QJsonObject writeToJson(int code, const QString &msg) const;
+};
+
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
index 8c7e7d8d16..6927456c6b 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
@@ -29,6 +29,7 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #include "PreflightPipelineController.h"
 
 #include <QtCore/QDateTime>
@@ -48,6 +49,7 @@
 #include "QtWebApp/httpserver/httpsessionstore.h"
 #include "SIMPLib/REST/PipelineListener.h"
 #include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
+#include "SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -171,40 +173,23 @@ void PreflightPipelineController::service(HttpRequest& request, HttpResponse& re
   //   response.setCookie(HttpCookie("firstCookie","hello",600,QByteArray(),QByteArray(),QByteArray(),false,true));
   //   response.setCookie(HttpCookie("secondCookie","world",600));
 
-  // Return messages
-  std::vector<PipelineMessage> errorMessages = listener.getErrorMessages();
-  bool completed = (errorMessages.size() == 0);
-
   QJsonArray errors;
-  int numErrors = errorMessages.size();
-  for(int i = 0; i < numErrors; i++)
-  {
-    QJsonObject error;
-    error[SIMPL::JSON::Code] = errorMessages[i].getCode();
-    error[SIMPL::JSON::Message] = errorMessages[i].getText();
-    error[SIMPL::JSON::FilterHumanLabel] = errorMessages[i].getFilterHumanLabel();
-    error[SIMPL::JSON::FilterIndex] = errorMessages[i].getPipelineIndex();
+  QJsonArray warnings;
 
-    errors.push_back(error);
-  }
-  rootObj[SIMPL::JSON::PipelineErrors] = errors;
+  std::vector<const AbstractErrorMessage*> errorMessages = listener.getErrorMessages();
+  bool completed = (errorMessages.size() == 0);
+  rootObj[SIMPL::JSON::Completed] = completed;
 
-  std::vector<PipelineMessage> warningMessages = listener.getWarningMessages();
-  QJsonArray warnings;
-  int numWarnings = warningMessages.size();
-  for(int i = 0; i < numWarnings; i++)
+  std::vector<const AbstractMessage*> allMessages = listener.getAllMessages();
+  for(const AbstractMessage* msg : allMessages)
   {
-    QJsonObject warning;
-    warning[SIMPL::JSON::Code] = warningMessages[i].getCode();
-    warning[SIMPL::JSON::Message] = warningMessages[i].getText();
-    warning[SIMPL::JSON::FilterHumanLabel] = warningMessages[i].getFilterHumanLabel();
-    warning[SIMPL::JSON::FilterIndex] = warningMessages[i].getPipelineIndex();
-
-    warnings.push_back(warning);
+    PreflightPipelineMessageHandler msgHandler(&errors, &warnings);
+    msg->visit(&msgHandler);
   }
+
+  rootObj[SIMPL::JSON::PipelineErrors] = errors;
   rootObj[SIMPL::JSON::PipelineWarnings] = warnings;
 
-  rootObj[SIMPL::JSON::Completed] = completed;
   QJsonDocument jdoc(rootObj);
 
   response.write(jdoc.toJson(), true);
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
index 32d8145560..ee947a50f3 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
@@ -31,11 +31,16 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <QtCore/QJsonObject>
+
 #include "QtWebApp/httpserver/httprequest.h"
 #include "QtWebApp/httpserver/httprequesthandler.h"
 #include "QtWebApp/httpserver/httpresponse.h"
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Plugin/SIMPLPluginConstants.h"
+
+class PreflightPipelineMessageHandler;
 
 /**
   @brief This class responds to REST API endpoint
@@ -46,6 +51,8 @@ class SIMPLib_EXPORT PreflightPipelineController : public HttpRequestHandler
   Q_OBJECT
   Q_DISABLE_COPY(PreflightPipelineController)
 public:
+  friend PreflightPipelineMessageHandler;
+
   /** Constructor */
   PreflightPipelineController(const QHostAddress& hostAddress, const int hostPort);
 
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.cpp
new file mode 100644
index 0000000000..ba91fb77d8
--- /dev/null
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.cpp
@@ -0,0 +1,102 @@
+/* ============================================================================
+ * Copyright (c) 2017-2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "PreflightPipelineMessageHandler.h"
+
+#include "QtCore/QJsonArray"
+
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
+#include "SIMPLib/Messages/PipelineWarningMessage.h"
+
+#include "REST/V1Controllers/PreflightPipelineController.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+PreflightPipelineMessageHandler::PreflightPipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings)
+: m_Errors(errors)
+, m_Warnings(warnings)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PreflightPipelineMessageHandler::processMessage(const FilterErrorMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  obj.insert(SIMPL::JSON::FilterIndex, msg->getPipelineIndex());
+  obj.insert(SIMPL::JSON::FilterHumanLabel, msg->getHumanLabel());
+  m_Errors->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PreflightPipelineMessageHandler::processMessage(const FilterWarningMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  obj.insert(SIMPL::JSON::FilterIndex, msg->getPipelineIndex());
+  obj.insert(SIMPL::JSON::FilterHumanLabel, msg->getHumanLabel());
+  m_Warnings->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PreflightPipelineMessageHandler::processMessage(const PipelineErrorMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  m_Errors->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void PreflightPipelineMessageHandler::processMessage(const PipelineWarningMessage* msg) const
+{
+  QJsonObject obj = writeToJson(msg->getCode(), msg->getMessageText());
+  m_Warnings->push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QJsonObject PreflightPipelineMessageHandler::writeToJson(int code, const QString& text) const
+{
+  QJsonObject obj;
+  obj.insert(SIMPL::JSON::Code, code);
+  obj.insert(SIMPL::JSON::Message, text);
+  return obj;
+}
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
new file mode 100644
index 0000000000..3030c1ef6c
--- /dev/null
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
@@ -0,0 +1,87 @@
+/* ============================================================================
+ * Copyright (c) 2017-2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+
+/**
+ * @brief This message handler is used by the PreflightPipeline class to store values from error and warning
+ * messages in json objects.  These json objects are stored in an error json array and a warning json array.
+ */
+class SIMPLib_EXPORT PreflightPipelineMessageHandler : public AbstractMessageHandler
+{
+  public:
+    PreflightPipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
+
+    /**
+     * @brief Stores pipeline index, human label, message text, and error code
+     *  of incoming FilterErrorMessages into a json object and stores the json
+     * object in the errors json array.
+     */
+    void processMessage(const FilterErrorMessage* msg) const override;
+
+    /**
+     * @brief Stores pipeline index, human label, message text, and warning code
+     *  of incoming FilterWarningMessages into a json object and stores the json
+     * object in the warnings json array.
+     */
+    void processMessage(const FilterWarningMessage* msg) const override;
+
+    /**
+     * @brief Stores message text and warning code of incoming PipelineErrorMessages
+     * into a json object and stores the json object in the errors json array.
+     */
+    void processMessage(const PipelineErrorMessage* msg) const override;
+
+    /**
+     * @brief Stores message text and warning code of incoming PipelineWarningMessages
+     * into a json object and stores the json object in the warnings json array.
+     */
+    void processMessage(const PipelineWarningMessage* msg) const override;
+
+  private:
+    QJsonArray* m_Errors = nullptr;
+    QJsonArray* m_Warnings = nullptr;
+
+    /**
+     * @brief writeToJson
+     * @param code
+     * @param text
+     * @param humanLabel
+     */
+    QJsonObject writeToJson(int code, const QString &text) const;
+};
+
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index cbb9d9008c..d2f8483a44 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -89,8 +89,8 @@ void ArraySelectionExample::initialize()
 void ArraySelectionExample::dataCheck()
 {
   // std::cout << " ArraySelectionExample   Preflighting " << std::endl;
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -114,10 +114,10 @@ void ArraySelectionExample::preflight()
 // -----------------------------------------------------------------------------
 void ArraySelectionExample::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 9af4fdd640..45e3907fa9 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -58,8 +58,8 @@ ErrorWarningFilter::~ErrorWarningFilter() = default;
 // -----------------------------------------------------------------------------
 void ErrorWarningFilter::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -88,14 +88,12 @@ void ErrorWarningFilter::dataCheck()
   if(getPreflightWarning())
   {
     QString ss = QObject::tr("Intentional preflight warning generated");
-    setWarningCondition(-666000);
-    notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+    setWarningCondition(-666000, ss);
   }
   if(getPreflightError())
   {
     QString ss = QObject::tr("Intentional preflight error generated");
-    setErrorCondition(-666001);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-666001, ss);
   }
   if(getPropertyError())
   {
@@ -124,7 +122,7 @@ void ErrorWarningFilter::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -137,14 +135,12 @@ void ErrorWarningFilter::execute()
   if(getExecuteWarning())
   {
     QString ss = QObject::tr("Intentional execute warning generated");
-    setWarningCondition(-666000);
-    notifyWarningMessage(getHumanLabel(), ss, getWarningCondition());
+    setWarningCondition(-666000, ss);
   }
   if(getExecuteError())
   {
     QString ss = QObject::tr("Intentional execute error generated");
-    setErrorCondition(-666001);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-666001, ss);
   }
 
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index 9486e9828e..a1d9b6e5e0 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -52,8 +52,8 @@ TESTCLASSNAME::~TESTCLASSNAME() = default;
 // -----------------------------------------------------------------------------
 void TESTCLASSNAME::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void TESTCLASSNAME::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void TESTCLASSNAME::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -110,8 +110,7 @@ void TESTCLASSNAME::execute()
   if(getErrorCondition() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index 87bac664bb..e42f083ef2 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -52,8 +52,8 @@ FilterGroup01::~FilterGroup01() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup01::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup01::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup01::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup01::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup01::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index 2b55e290c2..de668a0bc9 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -52,8 +52,8 @@ FilterGroup02::~FilterGroup02() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup02::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup02::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup02::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup02::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup02::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index 1ce731b4ed..b683c0a174 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -52,8 +52,8 @@ FilterGroup03::~FilterGroup03() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup03::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup03::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup03::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup03::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup03::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index a662b340a0..f00e7e17bf 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -52,8 +52,8 @@ FilterGroup04::~FilterGroup04() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup04::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup04::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup04::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup04::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup04::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index a57f741527..a152c12dd7 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -52,8 +52,8 @@ FilterGroup05::~FilterGroup05() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup05::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup05::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup05::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup05::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup05::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index eeeaa994c3..d687616ffb 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -52,8 +52,8 @@ FilterGroup06::~FilterGroup06() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup06::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup06::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup06::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup06::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup06::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index 1a3df04fae..e2896d23f1 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -52,8 +52,8 @@ FilterGroup07::~FilterGroup07() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup07::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup07::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup07::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup07::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup07::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index 7cb937ce0c..6eb0ef2766 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -52,8 +52,8 @@ FilterGroup08::~FilterGroup08() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup08::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup08::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup08::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup08::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup08::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index f5ee586943..dd82f0f9ef 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -52,8 +52,8 @@ FilterGroup09::~FilterGroup09() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup09::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup09::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup09::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup09::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup09::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index 32b9f12958..c89e755291 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -52,8 +52,8 @@ FilterGroup10::~FilterGroup10() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup10::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup10::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup10::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup10::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup10::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index 4dcb57ce27..cfc51da8bf 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -52,8 +52,8 @@ FilterGroup12::~FilterGroup12() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup12::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup12::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup12::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup12::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup12::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index c115893026..950d6be12d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -52,8 +52,8 @@ FilterGroup13::~FilterGroup13() = default;
 // -----------------------------------------------------------------------------
 void FilterGroup13::initialize()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
   setCancel(false);
 }
 
@@ -72,8 +72,8 @@ void FilterGroup13::setupFilterParameters()
 // -----------------------------------------------------------------------------
 void FilterGroup13::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -97,7 +97,7 @@ void FilterGroup13::execute()
 {
   initialize();
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
@@ -107,11 +107,10 @@ void FilterGroup13::execute()
     return;
   }
 
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     QString ss = QObject::tr("Some error message");
-    setErrorCondition(-99999999);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(-99999999, ss);
     return;
   }
 
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 7f7fc28a22..d9e59eedc9 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -375,8 +375,8 @@ void GenericExample::initialize()
 void GenericExample::dataCheck()
 {
   DataArrayPath tempPath;
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   FileSystemPathHelper::CheckOutputFile(this, "Output File Name", getOutputFile(), true);
 
@@ -407,12 +407,12 @@ void computeEulerAngle(float pq, float* eulerAngle)
 // -----------------------------------------------------------------------------
 void GenericExample::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
 
   // Run the data check to get references to all of our data arrays initialized to the values stored in memory
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index e86eddb8bf..152d34ad70 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -104,24 +104,24 @@ void MakeDataContainer::initialize()
 // -----------------------------------------------------------------------------
 void MakeDataContainer::dataCheck()
 {
-  DataArrayPath tempPath;
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
+
   DataContainer::Pointer m = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
   QVector<size_t> tDims(3, 64);
   AttributeMatrix::Pointer cellAttrMat = m->createNonPrereqAttributeMatrix(this, getCellAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
   //  tDims.resize(1);
   //  tDims[0] = 0;
   //  AttributeMatrix::Pointer cellEnsembleAttrMat = m->createNonPrereqAttributeMatrix(this, getCellEnsembleAttributeMatrixName(), tDims, AttributeMatrix::Type::CellEnsemble);
-  //  if(getErrorCondition() < 0)
+  //  if(getErrorCode() < 0)
   //  {
   //    return;
   //  }
@@ -173,12 +173,12 @@ void MakeDataContainer::preflight()
 // -----------------------------------------------------------------------------
 void MakeDataContainer::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
 
   // Run the data check to get references to all of our data arrays initialized to the values stored in memory
   dataCheck();
-  if(getErrorCondition() < 0)
+  if(getErrorCode() < 0)
   {
     return;
   }
diff --git a/Source/SIMPLib/TestFilters/TestFilters.cpp b/Source/SIMPLib/TestFilters/TestFilters.cpp
index 4fa471bbba..d67127e9e3 100644
--- a/Source/SIMPLib/TestFilters/TestFilters.cpp
+++ b/Source/SIMPLib/TestFilters/TestFilters.cpp
@@ -68,8 +68,8 @@ void Filt0::initialize()
 // -----------------------------------------------------------------------------
 void Filt0::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -86,19 +86,17 @@ void Filt0::preflight()
 // -----------------------------------------------------------------------------
 void Filt0::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
   if(nullptr == m)
   {
-    setErrorCondition(-1);
     QString ss = QObject::tr(" DataContainer was nullptr");
-    notifyErrorMessage(getHumanLabel(), QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()), -1);
+    setErrorCondition(-1, QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()));
     return;
   }
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   /* Place all your code to execute your filter here. */
 }
@@ -164,8 +162,8 @@ void Filt1::initialize()
 // -----------------------------------------------------------------------------
 void Filt1::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 }
 
 // -----------------------------------------------------------------------------
@@ -182,18 +180,17 @@ void Filt1::preflight()
 // -----------------------------------------------------------------------------
 void Filt1::execute()
 {
-  int err = 0;
-  setErrorCondition(err);
+  clearErrorCode();
+  clearWarningCode();
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
   if(nullptr == m.get())
   {
-    setErrorCondition(-1);
     QString ss = QObject::tr(" DataContainer was nullptr");
-    notifyErrorMessage(getHumanLabel(), QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()), -1);
+    setErrorCondition(-1, QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()));
     return;
   }
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   /* Place all your code to execute your filter here. */
 }
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index d0537ad840..eba289ac98 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -141,11 +141,11 @@ void ThresholdExample::initialize()
 // -----------------------------------------------------------------------------
 void ThresholdExample::dataCheck()
 {
-  setErrorCondition(0);
-  setWarningCondition(0);
+  clearErrorCode();
+  clearWarningCode();
 
   DataContainer::Pointer m = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerName(), false);
-  if(getErrorCondition() < 0 || nullptr == m)
+  if(getErrorCode() < 0 || nullptr == m)
   {
     return;
   }
@@ -156,8 +156,7 @@ void ThresholdExample::dataCheck()
   if (m_OutputFile.isEmpty() == true)
   {
     ss << "The output file must be set before executing this filter.";
-    setErrorCondition(-1);
-    notifyErrorMessage(getNameOfClass(), ss.str(), -1);
+    setErrorCondition(-1, ss.str());
   }
   */
 }
diff --git a/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp b/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
index 4536c12c28..0d120648b4 100644
--- a/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
+++ b/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
@@ -71,14 +71,13 @@ class GenerateGrainIds : public AbstractFilter
   }
   virtual void execute()
   {
-    setErrorCondition(0);
+    clearErrorCode();
     VoxelDataContainer* m = getVoxelDataContainer();
     if(nullptr == m)
     {
-      setErrorCondition(-1);
       QStringstream ss;
       ss << " DataContainer was nullptr";
-      setErrorMessage(ss.str());
+      setErrorCondition(-1, ss.str());
       return;
     }
     int size = UnitTest::VtkGrainIdIOTest::XSize * UnitTest::VtkGrainIdIOTest::YSize * UnitTest::VtkGrainIdIOTest::ZSize;
@@ -115,7 +114,7 @@ class GenerateGrainIds : public AbstractFilter
 
   void dataCheck()
   {
-    setErrorCondition(0);
+    clearErrorCode();
     QStringstream ss;
     VoxelDataContainer* m = getVoxelDataContainer();
     m_GrainIdsPtr = attrMat->createNonPrereqArray<DataArray<int32_t>, AbstractFilter, int32_t>(this, m_CellAttributeMatrixName, m_GrainIdsArrayName, 0, voxels,
diff --git a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
index ffa095aa83..e12e9fdc9b 100644
--- a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
+++ b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
@@ -53,33 +53,29 @@ void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter,
 {
   if(filePath.isEmpty())
   {
-    filter->setErrorCondition(-900);
     QString ss = QObject::tr("The output file for input parameter '%1' is empty. Please set a path to an output file.").arg(parameterName);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-900, ss);
   }
   QFileInfo fi(filePath);
   if(fi.isDir() && fi.suffix().isEmpty())
   {
-    filter->setErrorCondition(-901);
     QString ss = QObject::tr("The output file for input parameter '%1' is a directory. Please set a path to an output file.").arg(parameterName);
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-901, ss);
   }
 
   QDir parentPath = fi.path();
   if(!parentPath.exists())
   {
-    filter->setWarningCondition(902);
     QString ss = QObject::tr("The directory path for input parameter '%1' does not exist. DREAM.3D will attempt to create this path during execution of the filter").arg(parameterName);
-    filter->notifyWarningMessage(filter->getHumanLabel(), ss, filter->getWarningCondition());
+    filter->setWarningCondition(902, ss);
   }
 
   if(requireExtension)
   {
     if(fi.suffix().isEmpty())
     {
-      filter->setErrorCondition(-903);
       QString ss = QObject::tr("The file path for input parameter '%1' does not have a file extension. Please use a file extension to denote the type of file being written.").arg(parameterName);
-      filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getWarningCondition());
+      filter->setErrorCondition(-903, ss);
     }
 
   }
@@ -94,9 +90,8 @@ void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter,
   QFileInfo dirInfo(fi.path());
   if(!dirInfo.isWritable() && parentPath.exists())
   {
-    filter->setErrorCondition(-10002);
     QString ss = QObject::tr("The user does not have the proper permissions to write to the output file");
-    filter->notifyErrorMessage(filter->getHumanLabel(), ss, filter->getErrorCondition());
+    filter->setErrorCondition(-10002, ss);
   }
 
 #ifdef _WIN32
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 996ce9b603..2cb78fb29e 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -357,9 +357,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SIMPLH5DataReader::notifyErrorMessage(const QString& humanLabel, const QString& str, int code)
+void SIMPLH5DataReader::setErrorCondition(int code, const QString& str)
 {
-  Q_UNUSED(humanLabel)
-
   emit errorGenerated(Title, str, code);
 }
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index 79ebce925d..e5ce3ef46b 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -102,12 +102,11 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
     bool readPipelineJson(QString &json);
 
     /**
-     * @brief notifyErrorMessage
-     * @param humanLabel
-     * @param str
+     * @brief setErrorCondition
      * @param code
+     * @param str
      */
-    void notifyErrorMessage(const QString& humanLabel, const QString& str, int code) override;
+    void setErrorCondition(int code, const QString& str) override;
 
   signals:
     void errorGenerated(const QString &title, const QString &msg, const int &code);
diff --git a/Source/SIMPLib/Utilities/TestObserver.cpp b/Source/SIMPLib/Utilities/TestObserver.cpp
index 0a1a94683f..0597bf6490 100644
--- a/Source/SIMPLib/Utilities/TestObserver.cpp
+++ b/Source/SIMPLib/Utilities/TestObserver.cpp
@@ -46,27 +46,7 @@ TestObserver::~TestObserver() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TestObserver::processPipelineMessage(const PipelineMessage& pm)
+void TestObserver::processPipelineMessage(const AbstractMessage::Pointer& pm)
 {
-  PipelineMessage msg = pm;
-  if(msg.getType() == PipelineMessage::MessageType::Error)
-  {
-      std::cout << msg.getFilterHumanLabel().toStdString() << ": " << msg.generateErrorString().toStdString() << std::endl;
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::Warning)
-  {
-      std::cout << msg.getFilterHumanLabel().toStdString() << ": " << msg.generateWarningString().toStdString() << std::endl;
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::StatusMessage)
-  {
-      // std::cout << msg.getFilterHumanLabel().toStdString() << ": " << msg.generateStatusString().toStdString()  << std::endl;
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::ProgressValue)
-  {
-      // std::cout << msg.getFilterHumanLabel().toStdString() << ": " << msg.getProgressValue() << "%" << std::endl;
-  }
-  else if(msg.getType() == PipelineMessage::MessageType::StatusMessageAndProgressValue)
-  {
-      // std::cout << msg.getFilterHumanLabel().toStdString() << ": " << msg.getProgressValue() << "% " << msg.generateStatusString().toStdString() << std::endl;
-  }
+  std::cout << pm->generateMessageString().toStdString() << std::endl;
 }
diff --git a/Source/SIMPLib/Utilities/TestObserver.h b/Source/SIMPLib/Utilities/TestObserver.h
index d927aa3035..abf6fe8102 100755
--- a/Source/SIMPLib/Utilities/TestObserver.h
+++ b/Source/SIMPLib/Utilities/TestObserver.h
@@ -38,7 +38,7 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
 {
@@ -50,13 +50,13 @@ class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
     ~TestObserver() override;
 
  public slots:
-      void processPipelineMessage(const PipelineMessage& pm) override;
+   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
-    public:
-      TestObserver(const TestObserver&) = delete;            // Copy Constructor Not Implemented
-      TestObserver(TestObserver&&) = delete;                 // Move Constructor Not Implemented
-      TestObserver& operator=(const TestObserver&) = delete; // Copy Assignment Not Implemented
-      TestObserver& operator=(TestObserver&&) = delete;      // Move Assignment Not Implemented
+ public:
+   TestObserver(const TestObserver&) = delete;            // Copy Constructor Not Implemented
+   TestObserver(TestObserver&&) = delete;                 // Move Constructor Not Implemented
+   TestObserver& operator=(const TestObserver&) = delete; // Copy Assignment Not Implemented
+   TestObserver& operator=(TestObserver&&) = delete;      // Move Assignment Not Implemented
 };
 
 
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index 8d10cfd2f4..052d895626 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -189,15 +189,13 @@ int VTKFileReader::readHeader()
   int err = 0;
   if(getInputFile().isEmpty())
   {
-    setErrorCondition(-1);
-    notifyErrorMessage(getHumanLabel(), "FileName was not set and must be valid", -1);
+    setErrorCondition(-1, "FileName was not set and must be valid");
     return -1;
   }
 
   if(nullptr == getDataContainerArray()->getDataContainer(getDataContainerName()).get())
   {
-    setErrorCondition(-1);
-    notifyErrorMessage(getHumanLabel(), "DataContainer Pointer was nullptr and must be valid", -1);
+    setErrorCondition(-1, "DataContainer Pointer was nullptr and must be valid");
     return -1;
   }
 
@@ -205,8 +203,7 @@ int VTKFileReader::readHeader()
   if(!in.open(QIODevice::ReadOnly | QIODevice::Text))
   {
     QString msg = QObject::tr("VTF file could not be opened: %1").arg(getInputFile());
-    setErrorCondition(-100);
-    notifyErrorMessage(getHumanLabel(), msg, getErrorCondition());
+    setErrorCondition(-100, msg);
     return -100;
   }
 
@@ -256,8 +253,7 @@ int VTKFileReader::readHeader()
   {
     err = -1;
     QString ss = QObject::tr("The total number of elements '%1' is greater than this program can hold. Try the 64 bit version.").arg(dims[0] * dims[1] * dims[2]);
-    setErrorCondition(err);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(err, ss);
     return err;
   }
 
@@ -265,8 +261,7 @@ int VTKFileReader::readHeader()
   {
     err = -1;
     QString ss = QObject::tr("One of the dimensions is greater than the max index for this sysem. Try the 64 bit version. dim[0]=%1  dim[1]=%2im[2]=%3").arg(dims[0]).arg(dims[1]).arg(dims[2]);
-    setErrorCondition(err);
-    notifyErrorMessage(getHumanLabel(), ss, getErrorCondition());
+    setErrorCondition(err, ss);
     return err;
   }
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
index f6b1c7050e..2d20dc8935 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -44,7 +44,7 @@
 #include <QtGui/QIcon>
 #include <QtWidgets/QMessageBox>
 
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -162,7 +162,7 @@ class SVWidgetsLib_EXPORT QtSPluginFrame : public QFrame
      * @brief Slot to add a message to display to the user
      * @param message
      */
-    virtual void addMessage(PipelineMessage msg) = 0;
+    virtual void addMessage(AbstractMessage::Pointer msg) = 0;
 
     /**
      * @brief Slot to add a Progress message to display to the user
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index a8d0a736dd..a366f8677e 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -42,7 +42,6 @@
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Common/PipelineMessage.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 66c82c3cf0..1d2f7617e6 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -46,14 +46,7 @@
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
-
-#ifdef SIMPL_USE_MKDOCS
-#define URL_GENERATOR QtSDocServer
-#include "SVWidgetsLib/QtSupport/QtSDocServer.h"
-#else
-#define URL_GENERATOR QtSHelpUrlGenerator
-#include "SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h"
-#endif
+#include "SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h"
 
 #include "ui_IssuesWidget.h"
 
@@ -151,7 +144,7 @@ void IssuesWidget::clearIssues()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IssuesWidget::processPipelineMessage(const PipelineMessage& msg)
+void IssuesWidget::processPipelineMessage(const AbstractMessage::Pointer& msg)
 {
   m_CachedMessages.push_back(msg);
 }
@@ -161,110 +154,19 @@ void IssuesWidget::processPipelineMessage(const PipelineMessage& msg)
 // -----------------------------------------------------------------------------
 void IssuesWidget::displayCachedMessages()
 {
-  // Figure out how many error and warning messages that we have. We ignore the rest
   int count = 0;
   int warnCount = 0;
   int errCount = 0;
-  for(int i = 0; i < m_CachedMessages.size(); i++)
-  {
-    PipelineMessage msg = m_CachedMessages[i];
-    switch(msg.getType())
-    {
-    case PipelineMessage::MessageType::Error:
-      count++;
-      errCount++;
-      break;
-    case PipelineMessage::MessageType::Warning:
-      count++;
-      warnCount++;
-      break;
-    case PipelineMessage::MessageType::StatusMessage:
-    case PipelineMessage::MessageType::StandardOutputMessage:
-    case PipelineMessage::MessageType::ProgressValue:
-    case PipelineMessage::MessageType::StatusMessageAndProgressValue:
-    case PipelineMessage::MessageType::UnknownMessageType:
-      break;
-    }
-  }
-
-  emit tableHasErrors(errCount > 0, errCount, warnCount);
-
-  // Now create the correct number of table rows.
-  ui->errorTableWidget->setRowCount(count);
-  int row = 0;
-  bool updateRow = false;
-  QBrush msgBrush;
-  QColor msgColor;
-  QString msgDesc;
-  QString msgPrefix;
-  int msgCode = -1;
-  QTableWidgetItem* filterNameWidgetItem = nullptr;
-  QTableWidgetItem* descriptionWidgetItem = nullptr;
-  QTableWidgetItem* codeWidgetItem = nullptr;
-  QTableWidgetItem* indexWidgetItem = nullptr;
-  QLabel* hyperlinkLabel = nullptr;
 
   // Add in the content for the cells of the table.
   for(int j = 0; j < m_CachedMessages.size(); j++)
   {
-    PipelineMessage msg = m_CachedMessages[j];
-    // Create error hyperlink
-    updateRow = false;
-    switch(msg.getType())
-    {
-    case PipelineMessage::MessageType::Error:
-      msgColor = QColor(255, 191, 193);
-      updateRow = true;
-      break;
-    case PipelineMessage::MessageType::Warning:
-      msgColor = QColor(251, 254, 137);
-      updateRow = true;
-      break;
-    case PipelineMessage::MessageType::StatusMessage:
-    case PipelineMessage::MessageType::StandardOutputMessage:
-    case PipelineMessage::MessageType::ProgressValue:
-    case PipelineMessage::MessageType::StatusMessageAndProgressValue:
-    case PipelineMessage::MessageType::UnknownMessageType:
-      break;
-    }
-
-    if(updateRow)
-    {
-      msgBrush = QBrush(msgColor);
-
-      msgDesc = msg.getText();
-      msgCode = msg.getCode();
-      msgPrefix = msg.getPrefix();
-
-      filterNameWidgetItem = new QTableWidgetItem(msgPrefix);
-      filterNameWidgetItem->setTextAlignment(Qt::AlignCenter);
-      descriptionWidgetItem = new QTableWidgetItem(msgDesc);
-      codeWidgetItem = new QTableWidgetItem(QString::number(msgCode));
-      indexWidgetItem = new QTableWidgetItem(QString::number(msg.getPipelineIndex() + 1));
-
-      codeWidgetItem->setTextAlignment(Qt::AlignCenter);
-
-      filterNameWidgetItem->setBackground(msgBrush);
-      descriptionWidgetItem->setBackground(msgBrush);
-      codeWidgetItem->setBackground(msgBrush);
-
-      hyperlinkLabel = createHyperlinkLabel(msg);
-      if(hyperlinkLabel == nullptr)
-      {
-        ui->errorTableWidget->setItem(row, FilterName, filterNameWidgetItem);
-      }
-      else
-      {
-        ui->errorTableWidget->setCellWidget(row, FilterName, hyperlinkLabel);
-      }
-      ui->errorTableWidget->setItem(row, FilterIndex, indexWidgetItem);
-      ui->errorTableWidget->setItem(row, Description, descriptionWidgetItem);
-      ui->errorTableWidget->setItem(row, ErrorCode, codeWidgetItem);
-
-      row++;
-    }
+    IssuesWidgetMessageHandler messageHandler(this, &count, &errCount, &warnCount);
+    m_CachedMessages[j]->visit(&messageHandler);
   }
 
+  emit tableHasErrors(errCount > 0, errCount, warnCount);
+
   if (ui->errorTableWidget->rowCount() > 0)
   {
     ui->errorTableWidget->horizontalHeader()->setSectionResizeMode(FilterIndex, QHeaderView::ResizeToContents);
@@ -285,47 +187,18 @@ void IssuesWidget::displayCachedMessages()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QLabel* IssuesWidget::createHyperlinkLabel(const PipelineMessage& msg)
+void IssuesWidget::showFilterHelp(const QString& urlString)
 {
-  QString filterClassName = (msg.getFilterClassName());
-  QString filterHumanLabel = (msg.getFilterHumanLabel());
-
-  if(filterClassName.isEmpty() || filterHumanLabel.isEmpty())
-  {
-    if(!filterClassName.isEmpty())
-    {
-      return new QLabel(filterClassName);
-    }
-    if(!filterHumanLabel.isEmpty())
-    {
-      return new QLabel(filterHumanLabel);
-    }
-
-    return new QLabel("Unknown Filter Class");
-  }
-
-  QUrl filterURL = URL_GENERATOR::GenerateHTMLUrl(filterClassName);
-  QString filterHTMLText;
-  QTextStream ts(&filterHTMLText);
-  ts << "<a style=\"color: " << SVStyle::Instance()->getText_Error_color().name(QColor::HexRgb) << ";\" href=\"";
-  ts << filterURL.toString() << "\">" << filterHumanLabel << "</a>";
-
-  QLabel* hyperlinkLabel = new QLabel(filterHTMLText);
-  hyperlinkLabel->setTextFormat(Qt::RichText);
-  hyperlinkLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
-  hyperlinkLabel->setOpenExternalLinks(false);
-  connect(hyperlinkLabel, SIGNAL(linkActivated(const QString&)), this, SLOT(showFilterHelp(const QString&)));
+  QUrl helpURL(urlString);
 
-  return hyperlinkLabel;
+  DocRequestManager* docRequester = DocRequestManager::Instance();
+  docRequester->requestFilterDocUrl(helpURL);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IssuesWidget::showFilterHelp(const QString& urlString)
+QTableWidget* IssuesWidget::getIssuesTable()
 {
-  QUrl helpURL(urlString);
-
-  DocRequestManager* docRequester = DocRequestManager::Instance();
-  docRequester->requestFilterDocUrl(helpURL);
+  return ui->errorTableWidget;
 }
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
index 8ae8c47107..cb224a886e 100755
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -40,7 +40,8 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
@@ -50,17 +51,19 @@ class FilterListToolboxWidget;
 class QLabel;
 class QTableWidgetItem;
 class QtSSettings;
+class QTableWidget;
 namespace Ui
 {
 class IssuesWidget;
 }
 
+class IssuesWidgetMessageHandler;
+
 /**
  * @brief The IssuesWidget class
  */
 class SVWidgetsLib_EXPORT IssuesWidget : public QWidget, public IObserver
 {
-
     Q_OBJECT
   public:
     static SIMPLView::DockWidgetSettings::HideDockSetting GetHideDockSetting();
@@ -69,15 +72,21 @@ class SVWidgetsLib_EXPORT IssuesWidget : public QWidget, public IObserver
     IssuesWidget(QWidget* parent = nullptr);
     ~IssuesWidget() override;
 
-    QLabel* createHyperlinkLabel(const PipelineMessage& msg);
+    friend IssuesWidgetMessageHandler;
 
     static const int FilterIndex = 0;
     static const int FilterName = 1;
     static const int Description = 2;
     static const int ErrorCode = 3;
 
+    /**
+     * @brief getIssuesTable
+     * @return
+     */
+    QTableWidget* getIssuesTable();
+
   public slots:
-    void processPipelineMessage(const PipelineMessage& msg) override;
+    void processPipelineMessage(const AbstractMessage::Pointer& msg) override;
     void clearIssues();
     void on_errorTableWidget_itemClicked( QTableWidgetItem* item );
     void displayCachedMessages();
@@ -97,7 +106,7 @@ class SVWidgetsLib_EXPORT IssuesWidget : public QWidget, public IObserver
 
   private:
     QSharedPointer<Ui::IssuesWidget> ui = nullptr;
-    QVector<PipelineMessage> m_CachedMessages;
+    std::vector<AbstractMessage::Pointer> m_CachedMessages;
 
   public:
     IssuesWidget(const IssuesWidget&) = delete;   // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
new file mode 100755
index 0000000000..3702419cd8
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -0,0 +1,167 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "IssuesWidgetMessageHandler.h"
+
+#include <QtWidgets/QTableWidgetItem>
+#include <QtWidgets/QLabel>
+
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
+
+#ifdef SIMPL_USE_MKDOCS
+#define URL_GENERATOR QtSDocServer
+#include "SVWidgetsLib/QtSupport/QtSDocServer.h"
+#else
+#define URL_GENERATOR QtSHelpUrlGenerator
+#include "SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h"
+#endif
+
+#include "SVWidgetsLib/Widgets/IssuesWidget.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IssuesWidgetMessageHandler::IssuesWidgetMessageHandler(IssuesWidget* issuesWidget, int* count, int* errCount, int* warningCount)
+: m_IssuesWidget(issuesWidget)
+, m_Count(count)
+, m_ErrCount(errCount)
+, m_WarningCount(warningCount)
+{
+
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IssuesWidgetMessageHandler::processMessage(const FilterErrorMessage* msg) const
+{
+  QColor msgColor = QColor(255, 191, 193);
+  addItemToIssuesTable(msg->getClassName(), msg->getHumanLabel(), msg->getPipelineIndex(), msg->getMessageText(), msg->getCode(), msgColor);
+
+  m_ErrCount[0]++;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IssuesWidgetMessageHandler::processMessage(const FilterWarningMessage* msg) const
+{
+  QColor msgColor = QColor(251, 254, 137);
+  addItemToIssuesTable(msg->getClassName(), msg->getHumanLabel(), msg->getPipelineIndex(), msg->getMessageText(), msg->getCode(), msgColor);
+
+  m_WarningCount[0]++;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IssuesWidgetMessageHandler::addItemToIssuesTable(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msg, int code, QColor msgColor) const
+{
+  QBrush msgBrush = QBrush(msgColor);
+
+  // Create error hyperlink
+  QTableWidgetItem* codeWidgetItem = nullptr;
+  QTableWidgetItem* indexWidgetItem = nullptr;
+
+  QTableWidgetItem* filterNameWidgetItem = new QTableWidgetItem(humanLabel);
+  filterNameWidgetItem->setTextAlignment(Qt::AlignCenter);
+  QTableWidgetItem* descriptionWidgetItem = new QTableWidgetItem(msg);
+  codeWidgetItem = new QTableWidgetItem(QString::number(code));
+  indexWidgetItem = new QTableWidgetItem(QString::number(pipelineIndex + 1));
+
+  codeWidgetItem->setTextAlignment(Qt::AlignCenter);
+
+  filterNameWidgetItem->setBackground(msgBrush);
+  descriptionWidgetItem->setBackground(msgBrush);
+  codeWidgetItem->setBackground(msgBrush);
+
+  QTableWidget* issuesTable = m_IssuesWidget->getIssuesTable();
+  int row = issuesTable->rowCount();
+
+  issuesTable->insertRow(row);
+
+  QLabel* hyperlinkLabel = createHyperlinkLabel(className, humanLabel);
+  if(hyperlinkLabel == nullptr)
+  {
+    issuesTable->setItem(row, IssuesWidget::FilterName, filterNameWidgetItem);
+  }
+  else
+  {
+    issuesTable->setCellWidget(row, IssuesWidget::FilterName, hyperlinkLabel);
+  }
+  issuesTable->setItem(row, IssuesWidget::FilterIndex, indexWidgetItem);
+  issuesTable->setItem(row, IssuesWidget::Description, descriptionWidgetItem);
+  issuesTable->setItem(row, IssuesWidget::ErrorCode, codeWidgetItem);
+
+  m_Count[0]++;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QLabel* IssuesWidgetMessageHandler::createHyperlinkLabel(const QString &filterClassName, const QString &filterHumanLabel) const
+{
+  if(filterClassName.isEmpty() || filterHumanLabel.isEmpty())
+  {
+    if(!filterClassName.isEmpty())
+    {
+      return new QLabel(filterClassName);
+    }
+    if(!filterHumanLabel.isEmpty())
+    {
+      return new QLabel(filterHumanLabel);
+    }
+
+    return new QLabel("Unknown Filter Class");
+  }
+
+  QUrl filterURL = URL_GENERATOR::GenerateHTMLUrl(filterClassName);
+  QString filterHTMLText;
+  QTextStream ts(&filterHTMLText);
+  ts << "<a style=\"color: " << SVStyle::Instance()->getText_Error_color().name(QColor::HexRgb) << ";\" href=\"";
+  ts << filterURL.toString() << "\">" << filterHumanLabel << "</a>";
+
+  QLabel* hyperlinkLabel = new QLabel(filterHTMLText);
+  hyperlinkLabel->setTextFormat(Qt::RichText);
+  hyperlinkLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
+  hyperlinkLabel->setOpenExternalLinks(false);
+  QObject::connect(hyperlinkLabel, SIGNAL(linkActivated(const QString&)), m_IssuesWidget, SLOT(showFilterHelp(const QString&)));
+
+  return hyperlinkLabel;
+}
+
+
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
new file mode 100755
index 0000000000..d1e06db85d
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
@@ -0,0 +1,90 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+
+class IssuesWidget;
+class QLabel;
+
+/**
+ * @brief This message handler is used by the Issues Widget to load the issues table
+ * with filter error and warning messages.
+ */
+class SIMPLib_EXPORT IssuesWidgetMessageHandler : public AbstractMessageHandler
+{
+  public:
+    explicit IssuesWidgetMessageHandler(IssuesWidget* issuesWidget, int* count, int* errCount, int* warningCount);
+
+    /**
+     * @brief Adds incoming FilterErrorMessages to the issues table.
+     * @param msg
+     */
+    void processMessage(const FilterErrorMessage* msg) const override;
+
+    /**
+     * @brief Adds incoming FilterWarningMessages to the issues table.
+     * @param msg
+     */
+    void processMessage(const FilterWarningMessage* msg) const override;
+
+  private:
+    IssuesWidget* m_IssuesWidget = nullptr;
+    int* m_Count = nullptr;
+    int* m_ErrCount = nullptr;
+    int* m_WarningCount = nullptr;
+
+    /**
+     * @brief addItemToIssuesTable
+     * @param className
+     * @param humanLabel
+     * @param pipelineIndex
+     * @param msg
+     * @param code
+     * @param msgColor
+     */
+    void addItemToIssuesTable(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msg, int code, QColor msgColor) const;
+
+    /**
+     * @brief createHyperlinkLabel
+     * @param msg
+     * @return
+     */
+    QLabel* createHyperlinkLabel(const QString &filterClassName, const QString &filterHumanLabel) const;
+};
+
+
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.h b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
index 63005a9f5e..c06f7e0393 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
@@ -31,10 +31,10 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include "SIMPLib/Common/PipelineMessage.h"
-
 #include <QtWidgets/QWidget>
 
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_PopUpWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/ProgressDialog.cpp b/Source/SVWidgetsLib/Widgets/ProgressDialog.cpp
index b628bc5850..a0a0e5da7a 100644
--- a/Source/SVWidgetsLib/Widgets/ProgressDialog.cpp
+++ b/Source/SVWidgetsLib/Widgets/ProgressDialog.cpp
@@ -33,14 +33,43 @@
 
 #include <iostream>
 
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+
 #include "ui_ProgressDialog.h"
 
+/**
+ * @brief This class is the message handler for the Progress Dialog class.  It is responsible
+ * for receiving any incoming messages that the progress dialog would like to know about.
+ */
+class ProgressDialogMessageHandler : public AbstractMessageHandler
+{
+public:
+  explicit ProgressDialogMessageHandler(ProgressDialog* progressDialog)
+  : m_ProgressDialog(progressDialog)
+  {
+  }
+
+  /**
+   * @brief Sets the text of the progress dialog's label to the human label of incoming
+   * FilterErrorMessages.
+   * @param msg
+   */
+  void processMessage(const FilterErrorMessage* msg) const override
+  {
+    m_ProgressDialog->m_Ui->label->setText(msg->getHumanLabel());
+  }
+
+private:
+  ProgressDialog* m_ProgressDialog = nullptr;
+};
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ProgressDialog::ProgressDialog(QWidget *parent, Qt::WindowFlags f)
-  : QDialog (parent, f)
-  , m_Ui(new Ui::ProgressDialog)
+ProgressDialog::ProgressDialog(QWidget* parent, Qt::WindowFlags f)
+: QDialog(parent, f)
+, m_Ui(new Ui::ProgressDialog)
 {
   m_Ui->setupUi(this);
 }
@@ -61,7 +90,8 @@ void ProgressDialog::setLabelText(const QString& text)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ProgressDialog::processPipelineMessage(const PipelineMessage& msg)
+void ProgressDialog::processPipelineMessage(const AbstractMessage::Pointer& msg)
 {
-  m_Ui->label->setText(msg.getFilterHumanLabel());
+  ProgressDialogMessageHandler msgHandler(this);
+  msg->visit(&msgHandler);
 }
diff --git a/Source/SVWidgetsLib/Widgets/ProgressDialog.h b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
index fdb1bfbfb8..72b62d4fba 100644
--- a/Source/SVWidgetsLib/Widgets/ProgressDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
@@ -32,7 +32,7 @@
 #pragma once
 
 
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 
 #include <QtWidgets/QDialog>
 
@@ -43,6 +43,8 @@ namespace Ui {
 class ProgressDialog;
 }
 
+class ProgressDialogMessageHandler;
+
 /**
  * @brief The ProgressDialog class
  */
@@ -54,10 +56,12 @@ class SVWidgetsLib_EXPORT ProgressDialog : public QDialog
     ProgressDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
     ~ProgressDialog() override;
 
+    friend ProgressDialogMessageHandler;
+
   public slots:
 
     void setLabelText(const QString& text);
-    void processPipelineMessage(const PipelineMessage& msg);
+    void processPipelineMessage(const AbstractMessage::Pointer& msg);
 
   protected:
 
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 0900008a43..453ead155c 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -67,7 +67,6 @@
 #include <QtWidgets/QVBoxLayout>
 
 #include "SIMPLib/Common/DocRequestManager.h"
-#include "SIMPLib/Common/PipelineMessage.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/Breakpoint.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
@@ -100,40 +99,14 @@
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/QtSupport/QtSRecentFileList.h"
 
-namespace
+class ExecutionResultInvalidException : public std::exception
 {
-
-class JsonObserver : public IObserver
-{
-public:
-  JsonObserver() = default;
-  ~JsonObserver() override = default;
-
-  JsonObserver(const JsonObserver&) = delete;            // Copy Constructor Not Implemented
-  JsonObserver(JsonObserver&&) = delete;                 // Move Constructor Not Implemented
-  JsonObserver& operator=(const JsonObserver&) = delete; // Copy Assignment Not Implemented
-  JsonObserver& operator=(JsonObserver&&) = delete;      // Move Assignment Not Implemented
-
-  void processPipelineMessage(const PipelineMessage& pm) override
-  {
-    m_ErrorCode = pm.getCode();
-    m_ErrorMessage = pm.getText();
-  }
-
-  QString getErrorMessage()
-  {
-    return m_ErrorMessage;
-  }
-  int32_t getErrorCode()
-  {
-    return m_ErrorCode;
-  }
-
-private:
-  QString m_ErrorMessage;
-  int32_t m_ErrorCode = 0;
+   const char* what () const noexcept
+   {
+      return "The execution result of a pipeline was invalid.";
+   }
 };
-} // namespace
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -298,11 +271,11 @@ void SVPipelineView::listenFilterCompleted(AbstractFilter* filter)
   {
     model->setData(index, static_cast<int>(PipelineItem::WidgetState::Completed), PipelineModel::WidgetStateRole);
   }
-  if(filter->getWarningCondition() < 0)
+  if(filter->getWarningCode() < 0)
   {
     model->setData(index, static_cast<int>(PipelineItem::ErrorState::Warning), PipelineModel::ErrorStateRole);
   }
-  if(filter->getErrorCondition() < 0)
+  if(filter->getErrorCode() < 0)
   {
     model->setData(index, static_cast<int>(PipelineItem::ErrorState::Error), PipelineModel::ErrorStateRole);
   }
@@ -373,7 +346,7 @@ void SVPipelineView::preflightPipeline()
   FilterPipeline::FilterContainerType filters = pipeline->getFilterContainer();
   for(int i = 0; i < filters.size(); i++)
   {
-    filters.at(i)->setErrorCondition(0);
+    filters.at(i)->clearErrorCode();
     filters.at(i)->setCancel(false);
 
     QModelIndex childIndex = model->index(i, PipelineItem::Contents);
@@ -404,11 +377,11 @@ void SVPipelineView::preflightPipeline()
       AbstractFilter::Pointer filter = model->filter(childIndex);
       if(filter.get() != nullptr)
       {
-        if (filter->getWarningCondition() < 0)
+        if(filter->getWarningCode() < 0)
         {
           model->setData(childIndex, static_cast<int>(PipelineItem::ErrorState::Warning), PipelineModel::ErrorStateRole);
         }
-        if(filter->getErrorCondition() < 0)
+        if(filter->getErrorCode() < 0)
         {
           model->setData(childIndex, static_cast<int>(PipelineItem::ErrorState::Error), PipelineModel::ErrorStateRole);
         }
@@ -503,7 +476,7 @@ void SVPipelineView::executePipeline()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SVPipelineView::processPipelineMessage(const PipelineMessage& msg)
+void SVPipelineView::processPipelineMessage(const AbstractMessage::Pointer& msg)
 {
   emit pipelineHasMessage(msg);
 }
@@ -564,8 +537,10 @@ void SVPipelineView::finishPipeline()
     emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE FAILED ***************", true));
     break;
   case FilterPipeline::ExecutionResult::Invalid:
+    throw ExecutionResultInvalidException();
     break;
   }
+
   emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("", false));
 
   // Put back the DataContainerArray for each filter at the conclusion of running
@@ -1629,24 +1604,16 @@ FilterPipeline::Pointer SVPipelineView::readPipelineFromFile(const QString& file
   QFileInfo fi(filePath);
   QString ext = fi.suffix();
 
-  ::JsonObserver jsonObs;
-
   FilterPipeline::Pointer pipeline = FilterPipeline::NullPointer();
   if(ext == "dream3d")
   {
     H5FilterParametersReader::Pointer dream3dReader = H5FilterParametersReader::New();
-    pipeline = dream3dReader->readPipelineFromFile(filePath, &jsonObs);
+    pipeline = dream3dReader->readPipelineFromFile(filePath, this);
   }
   else if(ext == "json")
   {
     JsonFilterParametersReader::Pointer jsonReader = JsonFilterParametersReader::New();
-    pipeline = jsonReader->readPipelineFromFile(filePath, &jsonObs);
-  }
-
-  if(jsonObs.getErrorCode() != 0)
-  {
-    emit statusMessage(jsonObs.getErrorMessage());
-    emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(jsonObs.getErrorMessage(), true));
+    pipeline = jsonReader->readPipelineFromFile(filePath, this);
   }
 
   return pipeline;
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index e1aa8a2f32..b32878fdf9 100755
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -49,7 +49,7 @@
 #include <QtWidgets/QVBoxLayout>
 
 #include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Common/PipelineMessage.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
@@ -327,7 +327,7 @@ public slots:
    * @brief processPipelineMessage
    * @param pm
    */
-  void processPipelineMessage(const PipelineMessage& pm) override;
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
 signals:
   void displayIssuesTriggered();
@@ -346,7 +346,7 @@ public slots:
   void pipelineStarted();
   void pipelineFinished();
 
-  void pipelineHasMessage(const PipelineMessage& msg);
+  void pipelineHasMessage(AbstractMessage::Pointer msg);
   void pipelineFilePathUpdated(const QString& name);
   void pipelineChanged();
   void filePathOpened(const QString& filePath);
diff --git a/Source/SVWidgetsLib/Widgets/SourceList.cmake b/Source/SVWidgetsLib/Widgets/SourceList.cmake
index 52901d0161..28510fd20c 100755
--- a/Source/SVWidgetsLib/Widgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/Widgets/SourceList.cmake
@@ -50,6 +50,7 @@ set(SVWidgetsLib_Widgets_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksItem.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureItem.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/ImportHDF5TreeModelItem.h
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/IssuesWidgetMessageHandler.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/PipelineFilterMimeData.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/PipelineItem.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/PipelineView.h
@@ -78,6 +79,7 @@ set(SVWidgetsLib_Widgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterListModel.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterListView.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/IssuesWidget.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/IssuesWidgetMessageHandler.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/StandardOutputWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterInputWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/ImportHDF5TreeModel.cpp
@@ -94,7 +96,6 @@ set(SVWidgetsLib_Widgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/StatusBarIssuesButton.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/PopUpWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/ProgressDialog.cpp
-  
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/SVControlWidgets.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/SVOverlayWidgetButton.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/SVStyle.cpp

From 7ef0041bdea747c7e1051b32ae3928a6e2a8b210 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 5 Apr 2019 14:27:18 -0400
Subject: [PATCH 060/397] Fixing compile errors on Windows.

---
 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp | 2 ++
 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
index 3702419cd8..5d70e7025e 100755
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -35,6 +35,8 @@
 
 #include "IssuesWidgetMessageHandler.h"
 
+#include <QtCore/QUrl>
+
 #include <QtWidgets/QTableWidgetItem>
 #include <QtWidgets/QLabel>
 
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
index d1e06db85d..1784e46b00 100755
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include "SIMPLib/SIMPLib.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
 
 class IssuesWidget;
@@ -45,7 +45,7 @@ class QLabel;
  * @brief This message handler is used by the Issues Widget to load the issues table
  * with filter error and warning messages.
  */
-class SIMPLib_EXPORT IssuesWidgetMessageHandler : public AbstractMessageHandler
+class SVWidgetsLib_EXPORT IssuesWidgetMessageHandler : public AbstractMessageHandler
 {
   public:
     explicit IssuesWidgetMessageHandler(IssuesWidget* issuesWidget, int* count, int* errCount, int* warningCount);

From 3e9b7acc07a5f2a93bab009ccaaa7705d36c0ce3 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 5 Apr 2019 14:30:55 -0400
Subject: [PATCH 061/397] Fixing compile errors.

---
 Source/SIMPLib/ITK/itkProgressObserver.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 438791cf16..3ebecd9ee0 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -82,7 +82,7 @@ class ProgressObserver : public itk::Command
 
       if (m_Filter)
       {
-        m_Filter->notifyStatusMessage(m_Filter->getHumanLabel(), ss);
+        m_Filter->notifyStatusMessage(ss);
       }
     }
 

From 25559d4251ab53cf80db7fac0a0b7fd02df8c6bc Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Apr 2019 07:38:54 -0400
Subject: [PATCH 062/397] Fixed bad initialization with tDims, Reformatted
 SIMPLArray

+ Dimension initialization was 0,0,0 when it should be 1,1,1
+ Ordered SIMPLArray to start at the generic case, then move from 2, 3, 4 element arrays
+ Removed unused variable from FilterPipeline

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp        | 212 ++++++++++++--------
 Source/SIMPLib/Filtering/FilterPipeline.cpp |   2 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp |   4 +-
 3 files changed, 129 insertions(+), 89 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index f2f9cbe2fd..910fa6f44c 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -39,7 +39,7 @@
 
 /**
  * @brief This class is a facade pattern around a std::array<T,D> array to allow for some semantics
- * for either a 2D or 3D point such as X,Y,Z. We Provide 2 concrete implementations that are for 2 and 3 element
+ * for either a 2D or 3D point such as X,Y,Z. We Provide 3 concrete implementations that are for 2, 3 and 4 element
  * arrays used in some of the filter parameters. The devloper can extend this quite easily to more
  * elements should they need them
  */
@@ -128,40 +128,47 @@ template <class T, unsigned int Dimension> class SIMPLArray
 };
 
 // -----------------------------------------------------------------------------
-template <typename T> class IVec3 : public SIMPLArray<T, 3>
+template <typename T>
+class IVec2 : public SIMPLArray<T, 2>
 {
-  using ParentType = SIMPLArray<T, 3>;
+  using ParentType = SIMPLArray<T, 2>;
+
 public:
-  IVec3(const IVec3&) = default;
-  IVec3(IVec3&&) noexcept = default;
-  IVec3& operator=(const IVec3&) = default;
-  IVec3& operator=(IVec3&&) noexcept = default;
-  ~IVec3() = default;
+  IVec2(const IVec2&) = default;
+  IVec2(IVec2&&) noexcept = default;
+  IVec2& operator=(const IVec2&) = default;
+  IVec2& operator=(IVec2&&) noexcept = default;
+  ~IVec2() = default;
 
-  IVec3(T x = 0.0f, T y = 0.0f, T z = 0.0f)
+  /**
+   * @brief IVec2 Default constructor initializes all values to ZERO.
+   */
+  IVec2()
   {
-    this->setValue(0, x);
-    this->setValue(1, y);
-    this->setValue(2, z);
+    (*this)[0] = static_cast<T>(0);
+    (*this)[1] = static_cast<T>(0);
   }
 
-  IVec3(std::array<T, 3> data)
+  IVec2(T x, T y)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
-    this->setValue(2, data[2]);
+    (*this)[0] = x;
+    (*this)[1] = y;
   }
-  IVec3(std::tuple<T, T, T> data)
+
+  IVec2(std::array<T, 2> data)
   {
-    this->setValue(0, std::get<0>(data));
-    this->setValue(1, std::get<1>(data));
-    this->setValue(2, std::get<2>(data));
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
   }
-  IVec3(const T* data)
+  IVec2(std::tuple<T, T> data)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
-    this->setValue(2, data[2]);
+    (*this)[0] = std::get<0>(data);
+    (*this)[1] = std::get<1>(data);
+  }
+  IVec2(const T* data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
   }
 
   inline T getX() const
@@ -172,64 +179,74 @@ template <typename T> class IVec3 : public SIMPLArray<T, 3>
   {
     return ParentType::operator[](1);
   }
-  inline T getZ() const
-  {
-    return ParentType::operator[](2);
-  }
   inline void setX(const T& x)
   {
-    this->setValue(0, x);
+    (*this)[0] = x;
   }
   inline void setY(const T& y)
   {
-    this->setValue(1, y);
-  }
-  inline void setZ(const T& z)
-  {
-    this->setValue(2, z);
+    (*this)[1] = y;
   }
 
-  std::tuple<T, T, T> toTuple() const
+  /**
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @return
+   */
+  std::tuple<T, T> toTuple() const
   {
-    return std::make_tuple(getX(), getY(), getZ());
+    return std::make_tuple(getX(), getY());
   }
 };
 
-using FloatVec3Type = IVec3<float>;
-using IntVec3Type = IVec3<int>;
-using SizeVec3Type = IVec3<size_t>;
+using FloatVec2Type = IVec2<float>;
+using IntVec2Type = IVec2<int>;
+using SizeVec2Type = IVec2<size_t>;
 
 // -----------------------------------------------------------------------------
-template <typename T> class IVec2 : public SIMPLArray<T, 2>
+template <typename T> class IVec3 : public SIMPLArray<T, 3>
 {
-  using ParentType = SIMPLArray<T, 2>;
+  using ParentType = SIMPLArray<T, 3>;
 public:
-  IVec2(const IVec2&) = default;
-  IVec2(IVec2&&) noexcept = default;
-  IVec2& operator=(const IVec2&) = default;
-  IVec2& operator=(IVec2&&) noexcept = default;
-  ~IVec2() = default;
+  IVec3(const IVec3&) = default;
+  IVec3(IVec3&&) noexcept = default;
+  IVec3& operator=(const IVec3&) = default;
+  IVec3& operator=(IVec3&&) noexcept = default;
+  ~IVec3() = default;
 
-  IVec2(T x = 0.0f, T y = 0.0f)
+  /**
+   * @brief IVec3 Default constructor initializes all values to ZERO.
+   */
+  IVec3()
   {
-    this->setValue(0, x);
-    this->setValue(1, y);
+    (*this)[0] = static_cast<T>(0);
+    (*this)[1] = static_cast<T>(0);
+    (*this)[2] = static_cast<T>(0);
   }
 
-  IVec2(std::array<T, 2> data)
+  IVec3(T x, T y, T z)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
   }
-  IVec2(std::tuple<T, T> data)
+
+  IVec3(std::array<T, 3> data)
   {
-    this->setValue(0, std::get<0>(data));
-    this->setValue(1, std::get<1>(data));
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
   }
-  IVec2(const T* data)
+  IVec3(std::tuple<T, T, T> data)
+  {
+    (*this)[0] = std::get<0>(data);
+    (*this)[1] = std::get<1>(data);
+    (*this)[2] = std::get<2>(data);
+  }
+  IVec3(const T* data)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
   }
 
   inline T getX() const
@@ -240,24 +257,36 @@ template <typename T> class IVec2 : public SIMPLArray<T, 2>
   {
     return ParentType::operator[](1);
   }
+  inline T getZ() const
+  {
+    return ParentType::operator[](2);
+  }
   inline void setX(const T& x)
   {
-    this->setValue(0, x);
+    (*this)[0] = x;
   }
   inline void setY(const T& y)
   {
-    this->setValue(1, y);
+    (*this)[1] = y;
+  }
+  inline void setZ(const T& z)
+  {
+    (*this)[2] = z;
   }
 
-  std::tuple<T, T> toTuple() const
+  /**
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @return
+   */
+  std::tuple<T, T, T> toTuple() const
   {
-    return std::make_tuple(getX(), getY());
+    return std::make_tuple(getX(), getY(), getZ());
   }
 };
 
-using FloatVec2Type = IVec2<float>;
-using IntVec2Type = IVec2<int>;
-using SizeVec2Type = IVec2<size_t>;
+using FloatVec3Type = IVec3<float>;
+using IntVec3Type = IVec3<int>;
+using SizeVec3Type = IVec3<size_t>;
 
 // -----------------------------------------------------------------------------
 template <typename T> class IVec4 : public SIMPLArray<T, 4>
@@ -270,34 +299,45 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
   IVec4& operator=(IVec4&&) noexcept = default;
   ~IVec4() = default;
 
-  IVec4(T x = 0.0f, T y = 0.0f, T z = 0.0f, T w = 0.0f)
+  /**
+   * @brief IVec4 Default constructor initializes all values to ZERO.
+   */
+  IVec4()
+  {
+    (*this)[0] = static_cast<T>(0);
+    (*this)[1] = static_cast<T>(0);
+    (*this)[2] = static_cast<T>(0);
+    (*this)[3] = static_cast<T>(0);
+  }
+
+  IVec4(T x, T y, T z, T w)
   {
-    this->setValue(0, x);
-    this->setValue(1, y);
-    this->setValue(2, z);
-    this->setValue(3, w);
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = w;
   }
 
   IVec4(std::array<T, 4> data)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
-    this->setValue(2, data[2]);
-    this->setValue(3, data[3]);
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
   }
   IVec4(std::tuple<T, T> data)
   {
-    this->setValue(0, std::get<0>(data));
-    this->setValue(1, std::get<1>(data));
-    this->setValue(2, std::get<2>(data));
-    this->setValue(3, std::get<3>(data));
+    (*this)[0] = std::get<0>(data);
+    (*this)[1] = std::get<1>(data);
+    (*this)[2] = std::get<2>(data);
+    (*this)[3] = std::get<3>(data);
   }
   IVec4(const T* data)
   {
-    this->setValue(0, data[0]);
-    this->setValue(1, data[1]);
-    this->setValue(2, data[2]);
-    this->setValue(3, data[3]);
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
   }
 
   inline T getX() const
@@ -318,19 +358,19 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
   }
   inline void setX(const T& x)
   {
-    this->setValue(0, x);
+    (*this)[0] = x;
   }
   inline void setY(const T& y)
   {
-    this->setValue(1, y);
+    (*this)[1] = y;
   }
   inline void setZ(const T& z)
   {
-    this->setValue(2, z);
+    (*this)[2] = z;
   }
   inline void setW(const T& w)
   {
-    this->setValue(3, w);
+    (*this)[3] = w;
   }
 
   std::tuple<T, T> toTuple() const
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index c71dd75599..704e83fae2 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -760,7 +760,7 @@ int FilterPipeline::preflightPipeline()
         for(const DataArrayPath::RenameType& rename : renamedPaths)
         {
           const DataArrayPath& originalPath = std::get<0>(rename);
-          const DataArrayPath& renamePath = std::get<1>(rename);
+          // const DataArrayPath& renamePath = std::get<1>(rename);
           if(originalPath == deletedPath)
           {
             const auto iter = std::find(renamedPaths.begin(), renamedPaths.end(), rename);
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index d7881394af..8f2a50117d 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -250,10 +250,10 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   const typename ImageType::PointType origin = reader->GetOutput()->GetOrigin();
   const typename ImageType::SizeType size = reader->GetOutput()->GetLargestPossibleRegion().GetSize();
   const typename ImageType::SpacingType spacing = reader->GetOutput()->GetSpacing();
+  // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
   FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
-  SizeVec3Type tDims = {0, 0, 0};
-  // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
+  SizeVec3Type tDims = {1, 1, 1};
   for(size_t i = 0; i < dimensions; i++)
   {
     torigin[i] = origin[i];

From fcd87ddee621ec3a8f1e5ac3097fcff73fbe224a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Apr 2019 13:31:26 -0400
Subject: [PATCH 063/397] Add more subgroups for filters to use in their
 descriptions

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Constants.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 66a1354c6f..cb0958356a 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -313,6 +313,8 @@ namespace SIMPL
     const QString MappingFilters("Mapping");
     const QString MiscFilters("Misc");
     const QString GeometryFilters("Geometry");
+    const QString ImportFilters("Import");
+    const QString ExportFilters("Export");
   }
 
   namespace GeneralData

From 6c2e5d95ab20d56e5c0b50232e1d088379e793c6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Apr 2019 13:31:48 -0400
Subject: [PATCH 064/397] Fix descriptive HTML that is generated for an Image
 Geometry

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Geometry/ImageGeom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 878354a3be..06b8cb5e75 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -1110,7 +1110,7 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
        << "<p>Z Extent: 0 to " << volDims[2] - 1 << " (dimension: " << volDims[2] << ")</p>"
        << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Origin:</th><td>)" << origin[0] << ", " << origin[1] << ", " << origin[2] << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing/Spacing:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
 
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Bounds:</th><td>)"
        << "<p>X Range: " << (origin[0] - halfRes[0]) << " to " << (origin[0] - halfRes[0] + volDims[0] * spacing[0]) << " (delta: " << (volDims[0] * spacing[0]) << ")</p>"

From 9fdec87d927415b5d2c48c1b648da54509a64a97 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Apr 2019 14:14:28 -0400
Subject: [PATCH 065/397] Use proper std::array API to match the API in
 SIMPLArray. Add operator==()

+ the at() method used operator[] underneath which does NOT do bounds checking, breaking compatibility assumptions from STL
+ added operator==() method.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp | 61 ++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 910fa6f44c..ca665298d6 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -43,7 +43,8 @@
  * arrays used in some of the filter parameters. The devloper can extend this quite easily to more
  * elements should they need them
  */
-template <class T, unsigned int Dimension> class SIMPLArray
+template <class T, unsigned int Dimension>
+class SIMPLArray
 {
 public:
   SIMPLArray() = default;
@@ -65,58 +66,112 @@ template <class T, unsigned int Dimension> class SIMPLArray
   using const_iterator = typename std::array<T, 3>::const_iterator;
   //========================================= END STL INTERFACE COMPATIBILITY ==============================
 
+  /**
+   * @brief access specified element
+   * @param index
+   * @return
+   */
   inline reference operator[](size_type index)
   {
     return m_Array[index];
   }
 
+  /**
+   * @brief access specified element
+   * @param index
+   * @return
+   */
   inline const_reference operator[](size_type index) const
   {
     return m_Array[index];
   }
 
+  /**
+   * @brief access specified element with bounds checking
+   * @param index
+   * @return
+   */
   inline reference at(size_type index)
   {
     assert(index < Dimension);
-    return m_Array[index];
+    return m_Array.at(index);
   }
 
+  /**
+   * @brief access specified element with bounds checking
+   * @param index
+   * @return
+   */
   inline const_reference at(size_type index) const
   {
     assert(index < Dimension);
-    return m_Array[index];
+    return m_Array.at(index);
   }
 
+  /**
+   * @brief returns an iterator to the beginning
+   * @return
+   */
   iterator begin()
   {
     return m_Array.begin();
   }
 
+  /**
+   * @brief returns an iterator to the end
+   * @return
+   */
   iterator end()
   {
     return m_Array.end();
   }
 
+  /**
+   * @brief returns an iterator to the beginning
+   * @return
+   */
   const_iterator begin() const
   {
     return m_Array.cbegin();
   }
 
+  /**
+   * @brief returns an iterator to the end
+   * @return
+   */
   const_iterator end() const
   {
     return m_Array.cend();
   }
 
+  /**
+   * @brief direct access to the underlying array
+   * @return
+   */
   pointer data()
   {
     return m_Array.data();
   }
 
+  /**
+   * @brief Returns the number of elements
+   * @return
+   */
   size_type size()
   {
     return Dimension;
   }
 
+  /**
+   * @brief operator == Tests for an element by element equivelance of the underlying data
+   * @param rhs
+   * @return
+   */
+  bool operator==(const SIMPLArray& rhs) const
+  {
+    return m_Array == rhs.m_Array;
+  }
+
 protected:
   void setValue(size_t i, value_type value)
   {

From 85e7456c271ac13574f060264de07f4fa3da1499 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Apr 2019 09:59:58 -0400
Subject: [PATCH 066/397] Reduce the creation of filters through factories when
 not needed. (#338)

When plugins are loaded, a FilterFactory<T> is created and stored for each filter that is in the plugin. If the developer only needs items such as human label, Html summary or other textual items then it is better and quicker to just use the FilterFactory itself instead of instantiating an entirely new Filter object. This leads to a speed up when launching currently.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Filtering/FilterFactory.hpp    |  16 ++-
 Source/SIMPLib/Filtering/IFilterFactory.hpp   |  22 +++-
 .../Widgets/FilterLibraryToolboxWidget.cpp    |   7 +-
 .../Widgets/FilterListToolboxWidget.cpp       | 108 ++++++++----------
 .../Widgets/FilterListToolboxWidget.h         |  11 +-
 .../SVWidgetsLib/Widgets/FilterListView.cpp   |  30 ++---
 Source/SVWidgetsLib/Widgets/FilterListView.h  |   8 +-
 7 files changed, 103 insertions(+), 99 deletions(-)

diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
index 7ebce8bcfe..12be5acc3d 100755
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -87,7 +87,12 @@ template <class T> class FilterFactory : public IFilterFactory
   {
     return m_CompiledLibraryName;
   }
-  
+
+  QString getFilterHtmlSummary() const override
+  {
+    return m_HtmlSummary;
+  }
+
   QUuid getUuid() const override
   {
     return m_Uuid;
@@ -104,6 +109,7 @@ template <class T> class FilterFactory : public IFilterFactory
     m_BrandingString = w->getBrandingString();
     m_CompiledLibraryName = w->getCompiledLibraryName();
     m_Uuid = w->getUuid();
+    m_HtmlSummary = w->generateHtmlSummary();
   }
 
 private:
@@ -113,8 +119,12 @@ template <class T> class FilterFactory : public IFilterFactory
   QString m_HumanName;
   QString m_BrandingString;
   QString m_CompiledLibraryName;
+  QString m_HtmlSummary;
   QUuid m_Uuid;
 
-  FilterFactory(const FilterFactory&);  // Copy Constructor Not Implemented
-  void operator=(const FilterFactory&); // Move assignment Not Implemented
+public:
+  FilterFactory(const FilterFactory&) = delete;            // Copy Constructor Not Implemented
+  FilterFactory(FilterFactory&&) = delete;                 // Move Constructor Not Implemented
+  FilterFactory& operator=(const FilterFactory&) = delete; // Copy Assignment Not Implemented
+  FilterFactory& operator=(FilterFactory&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index 48a073c0ce..601f16d942 100755
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -121,10 +121,20 @@ class IFilterFactory
     Q_ASSERT(false);
     return "";
   }
-  
+
+  /**
+   * @brief getFilterHtmlSummary
+   * @return
+   */
+  virtual QString getFilterHtmlSummary() const
+  {
+    Q_ASSERT(false);
+    return "";
+  }
+
   /**
    * @brief getUuid
-   * @return 
+   * @return
    */
   virtual QUuid getUuid() const
   {
@@ -135,8 +145,10 @@ class IFilterFactory
 protected:
   IFilterFactory() = default;
 
-private:
-  IFilterFactory(const IFilterFactory&); // Copy Constructor Not Implemented
-  void operator=(const IFilterFactory&); // Move assignment Not Implemented
+public:
+  IFilterFactory(const IFilterFactory&) = delete;            // Copy Constructor Not Implemented
+  IFilterFactory(IFilterFactory&&) = delete;                 // Move Constructor Not Implemented
+  IFilterFactory& operator=(const IFilterFactory&) = delete; // Copy Assignment Not Implemented
+  IFilterFactory& operator=(IFilterFactory&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index 8d8e242c05..71df7ba071 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -141,9 +141,8 @@ void FilterLibraryToolboxWidget::refreshFilterGroups()
       {
         iter.next();
         IFilterFactory::Pointer factory = iter.value();
-        AbstractFilter::Pointer filter = factory->create();
         QTreeWidgetItem* filterTreeItem = new QTreeWidgetItem(filterSubGroup);
-        filterTreeItem->setText(0, filter->getHumanLabel());
+        filterTreeItem->setText(0, factory->getFilterHumanLabel());
 
 #if 0
         if(groupName.compare(SIMPL::FilterGroups::Unsupported) == 0)
@@ -170,8 +169,8 @@ void FilterLibraryToolboxWidget::refreshFilterGroups()
         filterTreeItem->setIcon(0, icon);
 #endif
         filterTreeItem->setData(0, Qt::UserRole, QVariant(FILTER_NODE_TYPE));
-        filterTreeItem->setData(0, Qt::UserRole + 1, QVariant(filter->getNameOfClass()));
-        filterTreeItem->setToolTip(0, filter->generateHtmlSummary());
+        filterTreeItem->setData(0, Qt::UserRole + 1, QVariant(factory->getFilterClassName()));
+        filterTreeItem->setToolTip(0, factory->getFilterHtmlSummary());
       }
     }
   }
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
index 7785b3dcc0..957f2f8081 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
@@ -168,14 +168,7 @@ void FilterListToolboxWidget::loadFilterList()
     {
       continue;
     }
-
-    AbstractFilter::Pointer filter = factory->create();
-    if(nullptr == filter.get())
-    {
-      continue;
-    }
-
-    filterListView->addFilter(filter);
+    filterListView->addFilter(factory);
   }
 
   filterListView->setSortingEnabled(true);
@@ -202,7 +195,7 @@ void FilterListToolboxWidget::searchFilters(QString text)
   // The user is typing something in the search box so lets search the filter class name and human label
   // int listWidgetSize = m_LoadedFilters.size();
   QMapIterator<QString, IFilterFactory::Pointer> iter(m_LoadedFilters);
-  std::vector<AbstractFilter::Pointer> filters;
+  std::vector<IFilterFactory::Pointer> filters;
   while(iter.hasNext())
   {
     iter.next();
@@ -211,18 +204,11 @@ void FilterListToolboxWidget::searchFilters(QString text)
     {
       continue;
     }
-
-    AbstractFilter::Pointer filter = factory->create();
-    if (filter == nullptr)
-    {
-      continue;
-    }
-
-    filters.push_back(filter);
+    filters.push_back(factory);
   }
 
   QStringList searchTokens = text.split(' ');
-  QSet<AbstractFilter*> addedFiltersSet;
+  QSet<IFilterFactory*> addedFiltersSet;
 
   matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::HumanLabel);
   matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::GroupName);
@@ -238,73 +224,69 @@ void FilterListToolboxWidget::searchFilters(QString text)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterListToolboxWidget::matchFiltersToSearchGroup(std::vector<AbstractFilter::Pointer> filters, QSet<AbstractFilter*> &addedFiltersSet, QStringList searchTokens, FilterListView::SearchGroup searchGroup)
+void FilterListToolboxWidget::matchFiltersToSearchGroup(std::vector<IFilterFactory::Pointer> factories, QSet<IFilterFactory*>& addedFiltersSet, const QStringList& searchTokens,
+                                                        FilterListView::SearchGroup searchGroup)
 {
-  QMap<AbstractFilter::Pointer, int> wordCountMap;
-  QMultiMap<int, AbstractFilter::Pointer> relevanceMap;
+  QMap<IFilterFactory::Pointer, int> wordCountMap;
+  QMultiMap<int, IFilterFactory::Pointer> relevanceMap;
 
-  for (size_t i = 0; i < filters.size(); i++)
+  for(const auto& factory : factories)
   {
-    AbstractFilter::Pointer filter = filters[i];
+    int wordCount = getMatchingWordCountForFilter(searchTokens, factory, searchGroup);
+    int relevance = getMatchingRelevanceForFilter(searchTokens, factory, searchGroup);
 
-    int wordCount = getMatchingWordCountForFilter(searchTokens, filter, searchGroup);
-    int relevance = getMatchingRelevanceForFilter(searchTokens, filter, searchGroup);
-
-    if(!wordCountMap.contains(filter) && wordCount > 0)
+    if(!wordCountMap.contains(factory) && wordCount > 0)
     {
-      wordCountMap.insert(filter, wordCount);
-      relevanceMap.insert(relevance, filter);
+      wordCountMap.insert(factory, wordCount);
+      relevanceMap.insert(relevance, factory);
     }
   }
 
   // Match according to "Exact Phrase"
   if(m_ActionExactPhrase->isChecked())
   {
-    QList<AbstractFilter::Pointer> filterList = relevanceMap.values(searchTokens.size());
-    for(QList<AbstractFilter::Pointer>::iterator iter = filterList.begin(); iter != filterList.end(); ++iter)
+    QList<IFilterFactory::Pointer> filterList = relevanceMap.values(searchTokens.size());
+    for(const auto& factory : filterList)
     {
-      AbstractFilter::Pointer filter = *iter;
-
       // Do not display results that have the exact phrase in the middle or end of the search phrase
       QString searchPhrase = searchTokens.join(' ');
-      if(filter->getHumanLabel().startsWith(searchPhrase))
+      if(factory->getFilterHumanLabel().startsWith(searchPhrase))
       {
-        filterListView->addFilter(filter, searchGroup);
-        addedFiltersSet.insert(filter.get());
+        filterListView->addFilter(factory, searchGroup);
+        addedFiltersSet.insert(factory.get());
       }
     }
   }
   // Match according to "All Words"
   else if(m_ActionAllWords->isChecked())
   {
-    QList<AbstractFilter::Pointer> filterList = wordCountMap.keys(searchTokens.size());
-    QMapIterator<int, AbstractFilter::Pointer> iter(relevanceMap);
+    QList<IFilterFactory::Pointer> factoryList = wordCountMap.keys(searchTokens.size());
+    QMapIterator<int, IFilterFactory::Pointer> iter(relevanceMap);
     iter.toBack();
     while(iter.hasPrevious())
     {
       iter.previous();
-      AbstractFilter::Pointer filter = iter.value();
+      IFilterFactory::Pointer factory = iter.value();
 
-      if(filterList.contains(filter))
+      if(factoryList.contains(factory))
       {
-        filterListView->addFilter(filter, searchGroup);
-        addedFiltersSet.insert(filter.get());
+        filterListView->addFilter(factory, searchGroup);
+        addedFiltersSet.insert(factory.get());
       }
     }
   }
   // Match according to "Any Words"
   else
   {
-    // QList<AbstractFilter::Pointer> filterListView = wordCountMap.keys();
-    QMapIterator<int, AbstractFilter::Pointer> iter(relevanceMap);
+    QMapIterator<int, IFilterFactory::Pointer> iter(relevanceMap);
     iter.toBack();
     while(iter.hasPrevious())
     {
       iter.previous();
-      AbstractFilter::Pointer filter = iter.value();
+      IFilterFactory::Pointer factory = iter.value();
 
-      filterListView->addFilter(filter, searchGroup);
-      addedFiltersSet.insert(filter.get());
+      filterListView->addFilter(factory, searchGroup);
+      addedFiltersSet.insert(factory.get());
     }
   }
 }
@@ -312,34 +294,34 @@ void FilterListToolboxWidget::matchFiltersToSearchGroup(std::vector<AbstractFilt
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int FilterListToolboxWidget::getMatchingWordCountForFilter(QStringList searchTokens, AbstractFilter::Pointer filter, FilterListView::SearchGroup searchGroup)
+int FilterListToolboxWidget::getMatchingWordCountForFilter(QStringList searchTokens, IFilterFactory::Pointer factory, FilterListView::SearchGroup searchGroup)
 {
   QString searchGroupTerm = "";
   switch(searchGroup)
   {
     case FilterListView::SearchGroup::HumanLabel:
     {
-      searchGroupTerm = filter->getHumanLabel();
+      searchGroupTerm = factory->getFilterHumanLabel();
       break;
     }
     case FilterListView::SearchGroup::GroupName:
     {
-      searchGroupTerm = filter->getGroupName();
+      searchGroupTerm = factory->getFilterGroup();
       break;
     }
     case FilterListView::SearchGroup::SubgroupName:
     {
-      searchGroupTerm = filter->getSubGroupName();
+      searchGroupTerm = factory->getFilterSubGroup();
       break;
     }
     case FilterListView::SearchGroup::BrandingName:
     {
-      searchGroupTerm = filter->getBrandingString();
+      searchGroupTerm = factory->getBrandingString();
       break;
     }
     case FilterListView::SearchGroup::CompiledLibraryName:
     {
-      searchGroupTerm = filter->getCompiledLibraryName();
+      searchGroupTerm = factory->getCompiledLibraryName();
       break;
     }
     case FilterListView::SearchGroup::Keywords:
@@ -367,34 +349,34 @@ int FilterListToolboxWidget::getMatchingWordCountForFilter(QStringList searchTok
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int FilterListToolboxWidget::getMatchingRelevanceForFilter(QStringList searchTokens, AbstractFilter::Pointer filter, FilterListView::SearchGroup searchGroup)
+int FilterListToolboxWidget::getMatchingRelevanceForFilter(QStringList searchTokens, IFilterFactory::Pointer factory, FilterListView::SearchGroup searchGroup)
 {
   QString searchGroupTerm = "";
   switch(searchGroup)
   {
     case FilterListView::SearchGroup::HumanLabel:
     {
-      searchGroupTerm = filter->getHumanLabel();
+      searchGroupTerm = factory->getFilterHumanLabel();
       break;
     }
     case FilterListView::SearchGroup::GroupName:
     {
-      searchGroupTerm = filter->getGroupName();
+      searchGroupTerm = factory->getFilterGroup();
       break;
     }
     case FilterListView::SearchGroup::SubgroupName:
     {
-      searchGroupTerm = filter->getSubGroupName();
+      searchGroupTerm = factory->getFilterSubGroup();
       break;
     }
     case FilterListView::SearchGroup::BrandingName:
     {
-      searchGroupTerm = filter->getBrandingString();
+      searchGroupTerm = factory->getBrandingString();
       break;
     }
     case FilterListView::SearchGroup::CompiledLibraryName:
     {
-      searchGroupTerm = filter->getCompiledLibraryName();
+      searchGroupTerm = factory->getCompiledLibraryName();
       break;
     }
     case FilterListView::SearchGroup::Keywords:
@@ -529,12 +511,12 @@ QList<QAction*> FilterListToolboxWidget::getSearchActionList()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QMap<QString, AbstractFilter::Pointer> FilterListToolboxWidget::getHumanNameMap(QList<AbstractFilter::Pointer> list)
+QMap<QString, IFilterFactory::Pointer> FilterListToolboxWidget::getHumanNameMap(const QList<IFilterFactory::Pointer>& list)
 {
-  QMap<QString, AbstractFilter::Pointer> map;
-  for(int i = 0; i < list.size(); i++)
+  QMap<QString, IFilterFactory::Pointer> map;
+  for(const auto& factory : list)
   {
-    map.insert(list[i]->getHumanLabel(), list[i]);
+    map.insert(factory->getFilterHumanLabel(), factory);
   }
 
   return map;
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
index a5e81feec3..89f59562f4 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -44,8 +44,9 @@
 #include <QtGui/QKeyEvent>
 
 #include "SIMPLib/Filtering/FilterManager.h"
-#include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SIMPLib/Filtering/IFilterFactory.hpp"
 
+#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
 #include "ui_FilterListToolboxWidget.h"
@@ -132,13 +133,13 @@ class SVWidgetsLib_EXPORT FilterListToolboxWidget : public QWidget, private Ui::
 
     FilterManager::Collection  m_LoadedFilters;
 
-    QMap<QString, AbstractFilter::Pointer> getHumanNameMap(QList<AbstractFilter::Pointer> list);
+    QMap<QString, IFilterFactory::Pointer> getHumanNameMap(const QList<IFilterFactory::Pointer>& list);
 
-    void matchFiltersToSearchGroup(std::vector<AbstractFilter::Pointer> filters, QSet<AbstractFilter*> &addedFiltersSet, QStringList searchTokens, FilterListView::SearchGroup searchGroup);
+    void matchFiltersToSearchGroup(std::vector<IFilterFactory::Pointer> filters, QSet<IFilterFactory*>& addedFiltersSet, const QStringList& searchTokens, FilterListView::SearchGroup searchGroup);
 
-    int getMatchingWordCountForFilter(QStringList searchTokens, AbstractFilter::Pointer filter, FilterListView::SearchGroup searchGroup);
+    int getMatchingWordCountForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
 
-    int getMatchingRelevanceForFilter(QStringList searchTokens, AbstractFilter::Pointer filter, FilterListView::SearchGroup searchGroup);
+    int getMatchingRelevanceForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
 
   public:
     FilterListToolboxWidget(const FilterListToolboxWidget&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.cpp b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
index 78df7c597b..430839583b 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
@@ -93,15 +93,15 @@ void FilterListView::connectSignalsSlots()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterListView::addFilter(AbstractFilter::Pointer filter)
+void FilterListView::addFilter(const IFilterFactory::Pointer& factory)
 {
-  addFilter(filter, QModelIndex());
+  addFilter(factory, QModelIndex());
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterListView::addFilter(AbstractFilter::Pointer filter, SearchGroup group)
+void FilterListView::addFilter(const IFilterFactory::Pointer& factory, SearchGroup group)
 {
   if(!m_SearchGroupIndexMap.contains(group))
   {
@@ -109,19 +109,19 @@ void FilterListView::addFilter(AbstractFilter::Pointer filter, SearchGroup group
   }
 
   QModelIndex groupIndex = m_SearchGroupIndexMap[group];
-  addFilter(filter, groupIndex);
+  addFilter(factory, groupIndex);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterListView::addFilter(AbstractFilter::Pointer filter, const QModelIndex &parent)
+void FilterListView::addFilter(const IFilterFactory::Pointer& factory, const QModelIndex& parent)
 {
-  QString humanName = filter->getHumanLabel();
+  QString humanName = factory->getFilterHumanLabel();
   QString iconName(":/Groups/");
-  iconName.append(filter->getGroupName());
+  iconName.append(factory->getFilterGroup());
 
-  QIcon icon = SVStyle::Instance()->IconForGroup(filter->getGroupName());
+  QIcon icon = SVStyle::Instance()->IconForGroup(factory->getFilterGroup());
 
   // Create the QListWidgetItem and add it to the filterListView
   FilterListModel* model = getFilterListModel();
@@ -137,10 +137,10 @@ void FilterListView::addFilter(AbstractFilter::Pointer filter, const QModelIndex
   // Set an "internal" QString that is the name of the filter. We need this value
   // when the item is clicked in order to retreive the Filter Widget from the
   // filter widget manager.
-  model->setData(index, filter->getNameOfClass(), FilterListModel::Roles::ClassNameRole);
+  model->setData(index, factory->getFilterClassName(), FilterListModel::Roles::ClassNameRole);
 
   // Allow a basic mouse hover tool tip that gives some summary information on the filter.
-  model->setData(index, filter->generateHtmlSummary(), Qt::ToolTipRole);
+  model->setData(index, factory->getFilterHtmlSummary(), Qt::ToolTipRole);
 }
 
 // -----------------------------------------------------------------------------
@@ -213,7 +213,7 @@ QModelIndex FilterListView::findIndexByName(const QString &name)
     }
   }
 
-  return QModelIndex();
+  return {};
 }
 
 // -----------------------------------------------------------------------------
@@ -327,9 +327,9 @@ QModelIndex FilterListView::findNextSelectableIndex()
       return selectedIndexes[0];
   }
 
-    return model->index(selectedIndexes[0].row() + 1, FilterListModel::Column::Contents, parent);
+  return model->index(selectedIndexes[0].row() + 1, FilterListModel::Column::Contents, parent);
 
-  return QModelIndex();
+  return {};
 }
 
 // -----------------------------------------------------------------------------
@@ -365,7 +365,7 @@ QModelIndex FilterListView::findPreviousSelectableIndex()
     return model->index(selectedIndexes[0].row() - 1, FilterListModel::Column::Contents, parent);
   }
 
-  return QModelIndex();
+  return {};
 }
 
 // -----------------------------------------------------------------------------
@@ -386,7 +386,7 @@ void FilterListView::mousePressEvent(QMouseEvent* event)
 // -----------------------------------------------------------------------------
 void FilterListView::mouseMoveEvent(QMouseEvent* event)
 {
-  if(event->buttons() & Qt::LeftButton)
+  if((event->buttons() & Qt::LeftButton) != 0)
   {
     int distance = (event->pos() - m_StartPos).manhattanLength();
     if(distance >= QApplication::startDragDistance())
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.h b/Source/SVWidgetsLib/Widgets/FilterListView.h
index 45821f7def..043bc36efc 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListView.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.h
@@ -40,7 +40,7 @@
 #include <QtWidgets/QTreeView>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
+#include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class FilterListModel;
@@ -78,14 +78,14 @@ class SVWidgetsLib_EXPORT FilterListView : public QTreeView
      * @brief addFilter
      * @param filter
      */
-    void addFilter(AbstractFilter::Pointer filter);
+    void addFilter(const IFilterFactory::Pointer& factory);
 
     /**
      * @brief addFilter
      * @param filter
      * @param group
      */
-    void addFilter(AbstractFilter::Pointer filter, SearchGroup group);
+    void addFilter(const IFilterFactory::Pointer& factory, SearchGroup group);
 
     /**
      * @brief addGroup
@@ -150,7 +150,7 @@ class SVWidgetsLib_EXPORT FilterListView : public QTreeView
      * @param filter
      * @param parent
      */
-    void addFilter(AbstractFilter::Pointer filter, const QModelIndex &parent);
+    void addFilter(const IFilterFactory::Pointer &factory, const QModelIndex &parent);
 
     /**
      * @brief connectSignalsSlots

From c22beb4437e122a1c286541f6bc4812cd635b71e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Apr 2019 21:15:39 -0400
Subject: [PATCH 067/397] Fix icons for MultiDataContainerSelectionWidget

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../UI_Files/MultiDataContainerSelectionWidget.ui         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
index d2c3783761..3bd5245239 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiDataContainerSelectionWidget.ui
@@ -52,8 +52,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_up_green.png</normaloff>:/SIMPL/icons/images/arrow_up_green.png</iconset>
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_up.png</normaloff>:/SIMPL/icons/images/arrow_up.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@@ -87,8 +87,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset>
-         <normaloff>:/SIMPL/icons/images/arrow_down_green.png</normaloff>:/SIMPL/icons/images/arrow_down_green.png</iconset>
+        <iconset resource="../../../../Resources/SIMPL.qrc">
+         <normaloff>:/SIMPL/icons/images/arrow_down.png</normaloff>:/SIMPL/icons/images/arrow_down.png</iconset>
        </property>
        <property name="iconSize">
         <size>

From 88c9acc3ca76eac47209587d6bc4720138e2eef8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 13 Apr 2019 18:20:11 -0400
Subject: [PATCH 068/397] Fixing issue where Reveal in Finder/Explorer would
 not work correctly.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../AbstractIOFileWidget.cpp                  |  6 +++++
 .../DataContainerReaderWidget.cpp             | 22 +++----------------
 .../DataContainerReaderWidget.h               |  6 -----
 .../FilterParameterWidget.cpp                 |  8 +++++++
 .../FilterParameterWidget.h                   |  1 +
 .../Widgets/DataArrayPathSelectionWidget.cpp  |  6 ++---
 6 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 3d3f2f692a..81e5ab063f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -72,10 +72,12 @@ AbstractIOFileWidget::AbstractIOFileWidget(FilterParameter* parameter, AbstractF
       // Store the last used directory into the private instance variable
       QFileInfo fi(currentPath);
       m_LineEdit->setText(fi.filePath());
+      setValidFilePath(m_LineEdit->text());
     }
     else
     {
       m_LineEdit->setText(QDir::homePath());
+      setValidFilePath(m_LineEdit->text());
     }
   }
 }
@@ -143,6 +145,7 @@ void AbstractIOFileWidget::setupGui()
 
     QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
     m_LineEdit->setText(currentPath);
+    setValidFilePath(m_LineEdit->text());
     on_m_LineEdit_fileDropped(currentPath);
     on_m_LineEdit_returnPressed();
   }
@@ -159,6 +162,7 @@ void AbstractIOFileWidget::keyPressEvent(QKeyEvent* event)
   {  
     SVStyle* style = SVStyle::Instance();
     m_LineEdit->setText(m_CurrentText);
+    setValidFilePath(m_LineEdit->text());
     style->LineEditClearStyle(m_LineEdit);
     m_LineEdit->setToolTip("");
   }
@@ -284,6 +288,7 @@ void AbstractIOFileWidget::on_m_LineEdit_fileDropped(const QString& text)
   QString inputPath = validator->convertToAbsolutePath(text);
 
   m_LineEdit->setText(text);
+  setValidFilePath(m_LineEdit->text());
   // Set/Remove the red outline if the file does exist
   QtSFileUtils::VerifyPathExists(inputPath, m_LineEdit);
 
@@ -327,6 +332,7 @@ void AbstractIOFileWidget::afterPreflight()
 void AbstractIOFileWidget::setValue(const QString& val)
 {
   m_LineEdit->setText(val);
+  setValidFilePath(m_LineEdit->text());
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index af8e2ba9b0..40da0bd142 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -360,7 +360,8 @@ void DataContainerReaderWidget::setupGui()
     QString path = m_Filter->getInputFile();
 
     m_LineEdit->setText(path);
-    
+    setValidFilePath(m_LineEdit->text());
+
     checkFilePath(path);
     updateStylingForPath(path);
 
@@ -608,24 +609,6 @@ void DataContainerReaderWidget::afterPreflight()
   updateModelFromProxy(p);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataContainerReaderWidget::showFileInFileSystem()
-{
-  QFileInfo fi(m_CurrentlyValidPath);
-  QString path;
-  if (fi.isFile())
-  {
-    path = fi.absoluteFilePath();
-  }
-  else
-  {
-    path = fi.absolutePath();
-  }
-
-  QtSFileUtils::ShowPathInGui(this, path);
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -783,6 +766,7 @@ void DataContainerReaderWidget::on_selectBtn_clicked()
   QFileInfo fi(filePath);
   m_OpenDialogLastFilePath = fi.filePath();
   m_LineEdit->setText(filePath);
+  setValidFilePath(m_LineEdit->text());
   updateDCAProxy(filePath);
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 01d17e890c..838b6f5343 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -131,16 +131,10 @@ class SVWidgetsLib_EXPORT DataContainerReaderWidget : public FilterParameterWidg
 
   protected slots:
 
-    /**
-     * @brief showFileInFileSystem
-     */
-    void showFileInFileSystem() override;
-
 
   private:
     static QString                       m_OpenDialogLastFilePath;
     DataContainerReader*                 m_Filter = nullptr;
-    QString                              m_CurrentlyValidPath = "";
     QString                              m_CurrentText = "";
     DataContainerReaderFilterParameter*  m_FilterParameter;
     DataContainerArrayProxy              m_DcaProxy;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index f4735ac2ca..85cef7ed06 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -422,6 +422,14 @@ void FilterParameterWidget::hideBorder()
   setStyleSheet("");
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterParameterWidget::setValidFilePath(const QString& filePath)
+{
+  m_CurrentlyValidPath = filePath;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 7bbfcf3cdc..204312abcc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -93,6 +93,7 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
     SIMPL_POINTER_PROPERTY(FilterParameter, FilterParameter)
     SIMPL_VIRTUAL_INSTANCE_PROPERTY(bool, WidgetIsExpanding)
 
+    void setValidFilePath(const QString& filePath);
 
     void fadeInWidget(QWidget* widget);
 
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 1241cbeaf5..2454658b84 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -1053,7 +1053,7 @@ void DataArrayPathSelectionWidget::setFilter(AbstractFilter* filter)
 // -----------------------------------------------------------------------------
 void DataArrayPathSelectionWidget::beforePreflight()
 {
-  m_SelectionMenu = createSelectionMenu();
+  //  m_SelectionMenu = createSelectionMenu();
 }
 
 // -----------------------------------------------------------------------------
@@ -1471,7 +1471,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
 
   // Populate Menu with DataContainers
   DataContainerArray::Container containers = dca->getDataContainers();
-  for(DataContainer::Pointer dc : containers)
+  for(const auto& dc : containers)
   {
     path.setDataContainerName(dc->getName());
     if(isCreatedPath(path))
@@ -1519,7 +1519,7 @@ QMenu* DataArrayPathSelectionWidget::createSelectionMenu()
 
           // Populate AttributeMatrix menu
           QList<QString> attrArrayNames = am->getAttributeArrayNames();
-          for(QString daName : attrArrayNames)
+          for(const auto& daName : attrArrayNames)
           {
             path.setDataArrayName(daName);
             if(isCreatedPath(path))

From 4c1e9d04526e119f3edcb97d96b481f65f6c91ff Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Fri, 12 Apr 2019 16:41:15 -0400
Subject: [PATCH 069/397] Changed MassCreateData from public to private filter

---
 Source/SIMPLib/CoreFilters/SourceList.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 5712ab61da..a7719ebcde 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -75,7 +75,6 @@ set(_PublicFilters
   SplitAttributeArray
   WriteASCIIData
   WriteTriangleGeometry
-  MassCreateData
 )
 
 
@@ -103,6 +102,7 @@ set(_PrivateFilters
   EmptyFilter
   FileReader
   FileWriter
+  MassCreateData
 )
 
 #-----------------

From f03a12a4d4776b3714da21f1eb5b0af877780771 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Mon, 15 Apr 2019 13:25:16 -0400
Subject: [PATCH 070/397] Disabled RenameTimingTest

---
 Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index e96e29969a..16a27426fe 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -41,7 +41,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   RenameAttributeArrayTest
   RenameAttributeMatrixTest
   RenameDataContainerTest
-  RenameTimingTest
+  # RenameTimingTest
   ReplaceValueTest
   RequiredZThicknessTest
   ScaleVolumeTest

From 20f105888c3fcf7b9e8dc42c72b2a42fcdbc2af3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 15 Apr 2019 13:25:27 -0400
Subject: [PATCH 071/397] Update ITK V5 Dependent Files with a hard Compile
 error

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index 1d72bbda15..c2f02b1f80 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -35,6 +35,10 @@
 
 #pragma once
 
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#error This file can ONLY be used if ITK Version 5 with the Montage module is being used.
+#endif
+
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QPointF>

From c71af89c14c6f5e5962d6b43ccb716ae4a1a3917 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 15 Apr 2019 17:44:02 -0400
Subject: [PATCH 072/397] Python Bindings are only generated for Public
 Filters.

This allows special cases such as ITKImageProcessing where different filters are
enabled based on LeanAndMean, ITKv4 or ITKv5

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/SIMPLibMacros.cmake            |  5 ++
 .../CodeScraper/PyBind11Generator.cpp         | 63 +++++++++++++++++--
 .../Pybind11/CodeScraper/PyBind11Generator.h  |  8 ++-
 3 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/SIMPLibMacros.cmake b/Source/SIMPLib/SIMPLibMacros.cmake
index 93ce2b374e..05828d7073 100755
--- a/Source/SIMPLib/SIMPLibMacros.cmake
+++ b/Source/SIMPLib/SIMPLibMacros.cmake
@@ -170,6 +170,8 @@ function(SIMPL_START_FILTER_GROUP)
   STRING(REPLACE "Filters" "" P_FILTER_GROUP ${P_FILTER_GROUP})
   
   set_property(GLOBAL APPEND PROPERTY DREAM3DDoc_GROUPS ${P_FILTER_GROUP})
+
+  file(WRITE ${SIMPLProj_BINARY_DIR}/${P_FILTER_GROUP}PublicFilters.txt "# ${P_FILTER_GROUP} Public Filters\n")
 endfunction()
 
 #-------------------------------------------------------------------------------
@@ -271,6 +273,9 @@ macro(ADD_SIMPL_FILTER FilterLib WidgetLib filterGroup filterName filterDocPath
       get_property(DREAM3DDocRoot GLOBAL PROPERTY DREAM3DDocRoot)
       set_property(GLOBAL APPEND PROPERTY DREAM3DDoc_${filterGroup} ${filterDocPath})
   endif()
+
+  file(APPEND ${SIMPLProj_BINARY_DIR}/${FilterLib}PublicFilters.txt "${filterName}.h\n")
+
 endmacro()
 
 #-------------------------------------------------------------------------------
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index 438e7baf6c..5d8fe1fd54 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -35,9 +35,53 @@ const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPL
 //-----------------------------------------------------------------------------
 PyBind11Generator::~PyBind11Generator() = default;
 
+//-----------------------------------------------------------------------------
+void PyBind11Generator::readFilterList()
+{
+  QString libName = m_LibNameUpper;
+  if(m_IsSIMPLib.compare("TRUE") == 0)
+  {
+    libName = QString("SIMPLib");
+  }
+  QString listFilePath = SIMPL::PyBind11::SIMPLProjBinaryDir + "/" + libName + "PublicFilters.txt";
+  QFileInfo listFileInfo(listFilePath);
+  if(!listFileInfo.exists())
+  {
+    qDebug() << "Needed Input file to generate Python Bindings was not found for Plugin '" << libName 
+    << "'. The file should have been generated at "
+    << listFileInfo.absoluteFilePath();
+  }
+
+  m_FilterList.clear();
+
+  // Read the Source File
+  QFile source(listFilePath);
+  source.open(QFile::ReadOnly);
+  QString contents = source.readAll();
+  source.close();
+
+  QStringList list = contents.split(QRegExp("\\n"));
+  QStringListIterator sourceLines(list);
+  while(sourceLines.hasNext())
+  {
+    QString line = sourceLines.next();
+    QString tLine = line.trimmed();
+    if(tLine.startsWith("#")) // Skip the comment line
+    {
+    }
+    else if(!tLine.isEmpty())
+    {
+      m_FilterList << tLine;
+    }
+  }
+  qDebug() << "[PyBind11Generator] " << libName << ": Generating " << m_FilterList.size() << " Pybind11 Headers ";
+}
+
 //-----------------------------------------------------------------------------
 void PyBind11Generator::execute()
 {
+  readFilterList();
+
   recursiveSearch(m_TopLevelDir);
 
   // If these extensions are changed be sure the WrappingFunctions.cmake file is updated
@@ -198,13 +242,11 @@ void PyBind11Generator::copyPyInitFiles()
 //-----------------------------------------------------------------------------
 void PyBind11Generator::recursiveSearch(QDir currentDir)
 {
-  QStringList filters;
-  filters.append("*.h");
-
   if(currentDir.dirName().compare("zRel") == 0 || currentDir.dirName().compare("Build") == 0 || currentDir.dirName().compare("pybind11") == 0)
   {
     return;
   }
+#if 0
   // Get a list of all the directories
   QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
   if(dirList.size() > 0)
@@ -214,13 +256,26 @@ void PyBind11Generator::recursiveSearch(QDir currentDir)
       recursiveSearch(QDir(fi.absoluteFilePath())); // Recursive call
     }
   }
-
+  QStringList filters;
+  filters.append("*.h");
   QFileInfoList itemList = currentDir.entryInfoList(filters);
   foreach(QFileInfo itemInfo, itemList)
   {
     QString headerFilePath = itemInfo.absoluteFilePath();
     generatePybind11Header(headerFilePath);
   }
+#else
+  for(const auto& item : m_FilterList)
+  {
+    QString filePath = currentDir.absolutePath() + QDir::separator() + item;
+    QFileInfo fi(filePath);
+    if(fi.exists())
+    {
+      generatePybind11Header(fi.absoluteFilePath());
+    }
+  }
+#endif
+
 }
 //-----------------------------------------------------------------------------
 void PyBind11Generator::generatePybind11Header(const QString& hFile)
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
index 4389e1c002..552ebfe29c 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
@@ -2,6 +2,7 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
@@ -52,7 +53,11 @@ class PyBind11Generator
    */
   void generateModuleInitPy();
 
-
+  /**
+  *
+  */
+  void readFilterList();
+  
 private:
   QDir m_TopLevelDir;
   QDir m_SourceDir;
@@ -64,6 +69,7 @@ class PyBind11Generator
   PythonBindingsModule m_ModuleCode;
   QString m_IsSIMPLib;
   QString m_CfgIntDir;
+  QStringList m_FilterList;
 
   PyBind11Generator(const PyBind11Generator&) = delete; // Copy Constructor Not Implemented
   void operator=(const PyBind11Generator&) = delete;    // Operator '=' Not Implemented

From 36b2230d26a1934aa06c6663e270cc2ecb55f644 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 16 Apr 2019 07:44:39 -0400
Subject: [PATCH 073/397] PYTHON: Do a recursive search when generating SIMPLib
 pybind headers

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CodeScraper/PyBind11Generator.cpp         | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index 5d8fe1fd54..b15a578862 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -39,7 +39,7 @@ PyBind11Generator::~PyBind11Generator() = default;
 void PyBind11Generator::readFilterList()
 {
   QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib.compare("TRUE") == 0)
+  if(m_IsSIMPLib =="TRUE")
   {
     libName = QString("SIMPLib");
   }
@@ -100,7 +100,7 @@ void PyBind11Generator::execute()
   
   genHeaderPath = QString("");
   QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib.compare("TRUE") == 0)
+  if(m_IsSIMPLib =="TRUE")
   {
     libName = QString("simpl");
   }
@@ -110,7 +110,7 @@ void PyBind11Generator::execute()
   
   genHeaderPath = QString("");
   libName = m_LibNameUpper;
-  if(m_IsSIMPLib.compare("TRUE") == 0)
+  if(m_IsSIMPLib =="TRUE")
   {
     libName = QString("simpl");
   }
@@ -246,35 +246,39 @@ void PyBind11Generator::recursiveSearch(QDir currentDir)
   {
     return;
   }
-#if 0
-  // Get a list of all the directories
-  QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-  if(dirList.size() > 0)
+  // If the currently generated library is SIMPLib itself then ignore the list of
+  // files and do a recursive search for the PYBIND macros since everything in
+  // SIMPL is going to need to be wrapped.
+  if(m_IsSIMPLib =="TRUE")
   {
-    foreach(QFileInfo fi, dirList)
+    // Get a list of all the directories
+    QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+    if(dirList.size() > 0)
     {
-      recursiveSearch(QDir(fi.absoluteFilePath())); // Recursive call
+      foreach(QFileInfo fi, dirList)
+      {
+        recursiveSearch(QDir(fi.absoluteFilePath())); // Recursive call
+      }
     }
-  }
-  QStringList filters;
-  filters.append("*.h");
-  QFileInfoList itemList = currentDir.entryInfoList(filters);
-  foreach(QFileInfo itemInfo, itemList)
-  {
-    QString headerFilePath = itemInfo.absoluteFilePath();
-    generatePybind11Header(headerFilePath);
-  }
-#else
-  for(const auto& item : m_FilterList)
-  {
-    QString filePath = currentDir.absolutePath() + QDir::separator() + item;
-    QFileInfo fi(filePath);
-    if(fi.exists())
+    QStringList filters;
+    filters.append("*.h");
+    QFileInfoList itemList = currentDir.entryInfoList(filters);
+    foreach(QFileInfo itemInfo, itemList)
     {
-      generatePybind11Header(fi.absoluteFilePath());
+      QString headerFilePath = itemInfo.absoluteFilePath();
+      generatePybind11Header(headerFilePath);
+    }
+  } else {
+    for(const auto& item : m_FilterList)
+    {
+      QString filePath = currentDir.absolutePath() + QDir::separator() + item;
+      QFileInfo fi(filePath);
+      if(fi.exists())
+      {
+        generatePybind11Header(fi.absoluteFilePath());
+      }
     }
   }
-#endif
 
 }
 //-----------------------------------------------------------------------------

From fa31019e01ee55d5846f8bb353086323c2dc9708 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Wed, 17 Apr 2019 17:04:11 -0400
Subject: [PATCH 074/397] WIP: Addressed arithmetic overflow and other code
 analysis warnings (#331)

* Addressed arithmetic overflow and other code analysis warnings

* Initialized PipelineMessage index
* Marked a possible coding error in ImportAsciiDataArray where two identical error conditions are checked using || operator.
* Fixed an incorrect cast in ReadASCIIData where a double is cast to a float for a method parameter that is expecting a double.  Due to multiple calculations of the same value, it was saved to a constant before the first calculation was required.
* Changed a for loop variable in geometry compute methods to avoid default castings when dereferencing a pointer multiple times per iteration.
* Changed geometry requirements in addAttributeMatrix from using || for enum checks to &&.  The previous versions could never be false and invalidated the entire method.
* Fixed a possible overflow when calculating ImageGeom and RectGridGeom coords.  The previous versions would have overflowed before casting to a larger size.
* Updated variables used to store min and max float values to constexpr to take advantage of the fact that they are known at compile time and are never modified.
* Removed unnecessary casts in SIMPLibRandom where doubles were cast to float and then saved as a double.
* Fixed ColorTable::GetColorTable due to the current implementation going out of array bounds.  The 2D array float color[8][3] was being accessed with indices [8][2].

* Updated VTKFileReader::skipVolume to use size_t dimensions

* Changed xDim, yDim, and zDim parameters to size_t from int.  If either one or three of them were negative, the total size variable used to allocate memory would save a negative number as an unsigned value, causing overflow.  Moreover, any negative dimensions would silently prevent data from being read.

* Updated ColorTable::GetColorTable with static_cast and rename

* Updated preset color table only.

* Removed duplicate error checks in ImportAsciDataArray

* Other errors are already handled, so these seem to be redundant rather than typos.

* Updated ColorTable::GetColorTable for json values

* Applied fixes from preset color table method.
* Updated incorrect currBinIndex maximum value in preset table method
* Moved variables inside the loop where appropriate.
* Updated numColors parameter to size_t both for cast issues and because it makes no sense to have a negative number of colors.
* Made variables const where appropriate.

* Ran clang-format on ColorTable.cpp for readability

* Fixed more arithmetic overflow warnings with type casts

* Performed casts on getNumberOfComponents() to size_t for calculations.  This method should probably return size_t instead of a signed int if a negative component dimension is not possible.
* Changed DynamicTableData::ExpandData parameters nRows and nCols from signed int to size_t.  Negative values were not handled, and the values are more descriptive with their current type.  size_t should be prefered over int when it comes to dimensions unless there is a good reason to include negative values as a valid option.
* Added a hsize_t cast to H5DataArrayWriter when calculating rank size in H5DataArrayWriter.hpp  By casting the first value, arithmetic operations progress it forward while preventing int32_t-related overflow.
* Added casts to int64_t when faceId values to local variables in GeometryMath.cpp.  These variables were used for referencing vertex pointer indices where int64_t values were expected

* Fixed a few uninitialized variables

* Fixed type casting in CubeOctohedronOps.cpp

* Added missing `f` in plane4Comp and plane7Comp arithmetic operations.  This was determined as a mistake by looking at other operations where the same calculations were consistently done with a floating point constant, but the 'f' was left off in two places.  The static_cast<float> was determined to silence a warning regarding type casting down from double to float due to the propogation of the double type through the calculation.

* Added default value to ErrorObject::ok boolean in ParseFunctors

* Silenced unitialized variable warning

* Added default construction to SIMPLib property macros

* This is unlikely to affect the default values for integers, floating point numbers, and booleans (not created with SIMPL_BOOL_PROPERTY).
* Hard sets boolean properties to false using SIMPL_BOOL_PROPERTY
* Silences uninitialized variable warnings for other types.
* These macros still have the potential to cause bugs due to uninitialized variables.

* Added a default initialization for PipelineMessage code.

* Initializes to 0 for the specified constructor.

* Merge branch 'develop' into feature/FixCodeAnalysis

# Conflicts:
#	Source/SIMPLib/CoreFilters/MassCreateData.cpp
#	Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
#	Source/SIMPLib/Geometry/IGeometry.cpp
#	Source/SIMPLib/Geometry/ImageGeom.cpp

* Revert "Merge branch 'develop' into feature/FixCodeAnalysis"

This reverts commit 77a6fb1f3143fe4fe2446a1b94afd87be17b6d50.
---
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  16 +-
 .../CopyFeatureArrayToElementArray.cpp        |   2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |   2 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |   4 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |   9 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   2 +-
 .../CoreFilters/util/ParserFunctors.hpp       |   2 +-
 .../FilterParameters/DynamicTableData.cpp     |   6 +-
 .../FilterParameters/DynamicTableData.h       |   2 +-
 .../H5FilterParametersWriter.h                |   2 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   4 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |   6 +-
 Source/SIMPLib/Geometry/IGeometry.cpp         |   3 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  38 ++--
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   4 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |  20 +-
 .../Geometry/ShapeOps/CubeOctohedronOps.cpp   |   4 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   6 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   4 +-
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |   2 +-
 Source/SIMPLib/Math/GeometryMath.cpp          |   4 +-
 Source/SIMPLib/Math/SIMPLibMath.cpp           |   8 +-
 Source/SIMPLib/Math/SIMPLibRandom.cpp         |   4 +-
 Source/SIMPLib/Utilities/ColorTable.cpp       | 179 ++++++++++--------
 Source/SIMPLib/Utilities/ColorTable.h         |   2 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |   4 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.h       |   8 +-
 28 files changed, 183 insertions(+), 166 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index a9eb49f0f4..db8c189f9e 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -260,21 +260,21 @@ public:     \
 
 #define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   public:\
   SIMPL_SET_PROPERTY_DECL(type, prpty)\
   SIMPL_GET_PROPERTY_DECL(type, prpty)
 
 #define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   public:\
   SIMPL_SET_PROPERTY_DECL(type, prpty)\
   SIMPL_GET_PROPERTY_DECL(type, prpty)
 
 #define SIMPL_VIRTUAL_INSTANCE_PROPERTY_DECL(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   public:\
   virtual SIMPL_SET_PROPERTY_DECL(type, prpty)\
   virtual SIMPL_GET_PROPERTY_DECL(type, prpty)
@@ -299,7 +299,7 @@ public:     \
 */
 #define SIMPL_VIRTUAL_INSTANCE_PROPERTY(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   public:\
   virtual SIMPL_SET_PROPERTY(type, prpty)\
   virtual SIMPL_GET_PROPERTY(type, prpty)
@@ -307,7 +307,7 @@ public:     \
 
 #define SIMPL_INSTANCE_PROPERTY(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   public:\
   SIMPL_SET_PROPERTY(type, prpty)\
   SIMPL_GET_PROPERTY(type, prpty)
@@ -325,7 +325,7 @@ public:
 
 #define SIMPL_PRIVATE_INSTANCE_PROPERTY(type, prpty)\
   private:\
-  type   m_##prpty;\
+  type   m_##prpty = {};\
   SIMPL_SET_PROPERTY(type, prpty)\
   public:\
   SIMPL_GET_PROPERTY(type, prpty)
@@ -511,14 +511,14 @@ public:
 
 #define SIMPL_OVERLOAD_PROPERTY(type, prpty, overload)\
   private:\
-  type m_##prpty;\
+  type m_##prpty = {};\
   public:\
   SIMPL_SET_PROPERTY(overload, prpty)\
   SIMPL_GET_PROPERTY(overload, prpty)
 
 #define SIMPL_BOOL_PROPERTY(prpty)\
   private:\
-  bool m_##prpty;\
+  bool m_##prpty = false;\
   public:\
   virtual SIMPL_SET_PROPERTY(bool, prpty)\
   SIMPL_GET_BOOL_PROPERTY(prpty)\
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index bd9dd5d614..ea8dd07c1e 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -175,7 +175,7 @@ template <typename T> IDataArray::Pointer copyData(IDataArray::Pointer inputData
   T* fPtr = feature->getPointer(0);
   T* cPtr = cell->getPointer(0);
 
-  int32_t numComp = feature->getNumberOfComponents();
+  size_t numComp = static_cast<size_t>(feature->getNumberOfComponents());
   int32_t featureIdx = 0;
 
   for(size_t i = 0; i < totalPoints; ++i)
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 79d3d648a9..e58a7ac446 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -176,7 +176,7 @@ template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, I
   T* fPtr = feature->getPointer(0);
   T* cPtr = cell->getPointer(0);
 
-  int32_t numComp = cell->getNumberOfComponents();
+  size_t numComp = static_cast<size_t>(cell->getNumberOfComponents());
   int32_t featureIdx = 0;
 
   size_t cells = inputData->getNumberOfTuples();
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 786c044d2b..d5cab1cbff 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -175,7 +175,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
   private:
     QWaitCondition                                      m_WaitCondition;
     QMutex                                              m_Mutex;
-    bool                                                m_Pause;
+    bool                                                m_Pause = false;
     QSharedPointer<QProcess>                            m_ProcessPtr;
 
     /**
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 17d95449b7..921311d506 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -193,7 +193,7 @@ template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Po
       {
         return err;
       }
-      if(err == RBR_READ_ERROR || err == RBR_READ_ERROR)
+      if(err == RBR_READ_ERROR)
       {
         return err;
       }
@@ -211,7 +211,7 @@ template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Po
       {
         return err;
       }
-      if(err == RBR_READ_ERROR || err == RBR_READ_ERROR)
+      if(err == RBR_READ_ERROR)
       {
         return err;
       }
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 740110d08e..58d4009ee3 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -570,15 +570,16 @@ void ReadASCIIData::execute()
         }
       }
 
-      if((static_cast<float>(lineNum) / numTuples) * 100.0f > threshold)
+      const float percentCompleted = (static_cast<float>(lineNum) / numTuples) * 100.0f;
+      if(percentCompleted > threshold)
       {
         // Print the status of the import
-        QString ss = QObject::tr("Importing ASCII Data || %1% Complete").arg((static_cast<float>(lineNum) / numTuples) * 100.0f, 0, 'f', 0);
+        QString ss = QObject::tr("Importing ASCII Data || %1% Complete").arg(static_cast<double>(percentCompleted), 0, 'f', 0);
         notifyStatusMessage(ss);
         threshold = threshold + 5.0f;
-        if(threshold < (static_cast<float>(lineNum) / numTuples) * 100.0f)
+        if(threshold < percentCompleted)
         {
-          threshold = (static_cast<float>(lineNum) / numTuples) * 100.0f;
+          threshold = percentCompleted;
         }
       }
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index a92928291e..64b64e71ce 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -168,7 +168,7 @@ void RemoveComponentFromArray::dataCheck()
     m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), NewDataArrayID);
   }
 
-  cDims[0] = m_InArrayPtr.lock()->getNumberOfComponents() - 1;
+  cDims[0] = static_cast<size_t>(m_InArrayPtr.lock()->getNumberOfComponents()) - 1;
   DataArrayPath tempPath2(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getReducedArrayArrayName());
   m_ReducedArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath2, cDims, m_InArrayPtr.lock(), ReducedDataArrayID);
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp b/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
index b4fab9972b..261d691c8e 100644
--- a/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
@@ -51,7 +51,7 @@ class ParserFunctor
 
   struct ErrorObject
   {
-    bool ok;
+    bool ok = false;
     QString errorMessage;
   };
 };
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index eccfc9e828..3121e15ed0 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -339,7 +339,7 @@ QVector<double> DynamicTableData::flattenData() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<std::vector<double>> DynamicTableData::ExpandData(std::vector<double> orig, int nRows, int nCols)
+std::vector<std::vector<double>> DynamicTableData::ExpandData(std::vector<double> orig, size_t nRows, size_t nCols)
 {
   std::vector<std::vector<double>> expand(nRows, std::vector<double>(nCols));
 
@@ -349,9 +349,9 @@ std::vector<std::vector<double>> DynamicTableData::ExpandData(std::vector<double
     return expand;
   }
 
-  for(int row = 0; row < nRows; row++)
+  for(size_t row = 0; row < nRows; row++)
   {
-    for(int col = 0; col < nCols; col++)
+    for(size_t col = 0; col < nCols; col++)
     {
       expand[row][col] = orig[row * nCols + col];
     }
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index 8ceff94aa0..b2cfa19747 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
     /**
     * @brief This does the reverse of the flattenData function.  It expands the data back into a 2D array.
     */
-    static std::vector<std::vector<double> > ExpandData(std::vector<double> orig, int nRows, int nCols);
+    static std::vector<std::vector<double> > ExpandData(std::vector<double> orig, size_t nRows, size_t nCols);
 
     /**
     * @brief This deserializes a string of headers and returns the original QStringList.
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index e5d892dc5d..580e11fd33 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
 
   private:
-    hid_t                                 m_CurrentGroupId;
+    hid_t                                 m_CurrentGroupId = -1;
 
   public:
     H5FilterParametersWriter(const H5FilterParametersWriter&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 83fc8db016..f60fe0fd54 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -87,7 +87,7 @@ class FindEdgeDerivativesImpl
     for(int64_t i = start; i < end; i++)
     {
       m_Edges->getVertsAtEdge(i, verts);
-      for(int32_t j = 0; j < cDims; j++)
+      for(size_t j = 0; j < cDims; j++)
       {
         for(size_t k = 0; k < 2; k++)
         {
@@ -201,7 +201,7 @@ void EdgeGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void EdgeGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge)
+  if(data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge)
   {
     // EdgeGeom can only accept vertex or edge Attribute Matrices
     return;
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index bea31b082d..28d546b255 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -52,7 +52,7 @@ class FindHexDerivativesImpl
     for(int64_t i = start; i < end; i++)
     {
       m_Hexas->getVertsAtHex(i, verts);
-      for(int32_t j = 0; j < cDims; j++)
+      for(size_t j = 0; j < cDims; j++)
       {
         for(size_t k = 0; k < 8; k++)
         {
@@ -171,8 +171,8 @@ void HexahedralGeom::initializeWithZeros()
 void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex
-     || data->getType() != AttributeMatrix::Type::Edge
-     || data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
+     && data->getType() != AttributeMatrix::Type::Edge
+     && data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
   {
     // HexahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index 602aacf41e..ce01f91dde 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -46,6 +46,7 @@ IGeometry::IGeometry()
 : m_TimeValue(0.0f)
 , m_EnableTimeSeries(false)
 , m_Units(LengthUnit::Unspecified)
+, m_ProgressCounter(0)
 {
 }
 
@@ -422,7 +423,7 @@ void IGeometry::sendThreadSafeProgressMessage(int64_t counter, int64_t max)
 
   if(m_ProgressCounter > prog)
   {
-    int64_t progressInt = static_cast<int64_t>((static_cast<float>(m_ProgressCounter) / max) * 100.0f);
+    int64_t progressInt = static_cast<int64_t>((static_cast<double>(m_ProgressCounter) / max) * 100.0);
     QString ss = QObject::tr("%1% Complete").arg(progressInt);
     notifyStatusMessage(ss);
     prog += progIncrement;
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 06b8cb5e75..29a3aea93f 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -208,7 +208,7 @@ class FindImageDerivativesImpl
 
           // Compute the actual derivatives
           index = (z * dims[1] * dims[0]) + (y * dims[0]) + x;
-          for(int32_t i = 0; i < numComps; i++)
+          for(size_t i = 0; i < numComps; i++)
           {
             derivsPtr[index * numComps * 3 + i * 3] = xix * dValuesdXi[i] + etax * dValuesdEta[i] + zetax * dValuesdZeta[i];
 
@@ -634,9 +634,9 @@ void ImageGeom::getPlaneCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
 {
-  coords[0] = static_cast<double>(idx[0] * m_Spacing[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(idx[1] * m_Spacing[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(idx[2] * m_Spacing[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(idx[0]) * m_Spacing[0] + m_Origin[0];
+  coords[1] = static_cast<double>(idx[1]) * m_Spacing[1] + m_Origin[1];
+  coords[2] = static_cast<double>(idx[2]) * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -644,9 +644,9 @@ void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3])
 {
-  coords[0] = static_cast<double>(x * m_Spacing[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(y * m_Spacing[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(z * m_Spacing[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(x) * m_Spacing[0] + m_Origin[0];
+  coords[1] = static_cast<double>(y) * m_Spacing[1] + m_Origin[1];
+  coords[2] = static_cast<double>(z) * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -658,9 +658,9 @@ void ImageGeom::getPlaneCoords(size_t idx, double coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = static_cast<double>(column * m_Spacing[0] + m_Origin[0]);
-  coords[1] = static_cast<double>(row * m_Spacing[1] + m_Origin[1]);
-  coords[2] = static_cast<double>(plane * m_Spacing[2] + m_Origin[2]);
+  coords[0] = static_cast<double>(column) * m_Spacing[0] + m_Origin[0];
+  coords[1] = static_cast<double>(row) * m_Spacing[1] + m_Origin[1];
+  coords[2] = static_cast<double>(plane) * m_Spacing[2] + m_Origin[2];
 }
 
 // -----------------------------------------------------------------------------
@@ -702,9 +702,9 @@ void ImageGeom::getCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t idx[3], double coords[3])
 {
-  coords[0] = static_cast<double>(idx[0] * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
-  coords[1] = static_cast<double>(idx[1] * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
-  coords[2] = static_cast<double>(idx[2] * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
+  coords[0] = static_cast<double>(idx[0]) * m_Spacing[0] + m_Origin[0] + (0.5 * m_Spacing[0]);
+  coords[1] = static_cast<double>(idx[1]) * m_Spacing[1] + m_Origin[1] + (0.5 * m_Spacing[1]);
+  coords[2] = static_cast<double>(idx[2]) * m_Spacing[2] + m_Origin[2] + (0.5 * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -712,9 +712,9 @@ void ImageGeom::getCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 void ImageGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
 {
-  coords[0] = static_cast<double>(x * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
-  coords[1] = static_cast<double>(y * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
-  coords[2] = static_cast<double>(z * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
+  coords[0] = static_cast<double>(x) * m_Spacing[0] + m_Origin[0] + (0.5 * m_Spacing[0]);
+  coords[1] = static_cast<double>(y) * m_Spacing[1] + m_Origin[1] + (0.5 * m_Spacing[1]);
+  coords[2] = static_cast<double>(z) * m_Spacing[2] + m_Origin[2] + (0.5 * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -726,9 +726,9 @@ void ImageGeom::getCoords(size_t idx, double coords[3])
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
   size_t plane = idx / (m_Dimensions[0] * m_Dimensions[1]);
 
-  coords[0] = static_cast<double>(column * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]));
-  coords[1] = static_cast<double>(row * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]));
-  coords[2] = static_cast<double>(plane * m_Spacing[2] + m_Origin[2] + (0.5f * m_Spacing[2]));
+  coords[0] = static_cast<double>(column) * m_Spacing[0] + m_Origin[0] + (0.5 * m_Spacing[0]);
+  coords[1] = static_cast<double>(row) * m_Spacing[1] + m_Origin[1] + (0.5 * m_Spacing[1]);
+  coords[2] = static_cast<double>(plane) * m_Spacing[2] + m_Origin[2] + (0.5 * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 3fa591dcfd..2e1116e8d1 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -88,7 +88,7 @@ class FindQuadDerivativesImpl
     for(int64_t i = start; i < end; i++)
     {
       m_Quads->getVertsAtQuad(i, verts);
-      for(int32_t j = 0; j < cDims; j++)
+      for(size_t j = 0; j < cDims; j++)
       {
         for(size_t k = 0; k < 4; k++)
         {
@@ -204,7 +204,7 @@ void QuadGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void QuadGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge || data->getType() != AttributeMatrix::Type::Face)
+  if(data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge && data->getType() != AttributeMatrix::Type::Face)
   {
     // QuadGeom can only accept vertex, edge, or face Attribute Matrices
     return;
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 187a6e34ea..ba06ea3f9b 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -208,7 +208,7 @@ class FindRectGridDerivativesImpl
 
           // Compute the actual derivatives
           index = (z * dims[1] * dims[0]) + (y * dims[0]) + x;
-          for(int32_t i = 0; i < numComps; i++)
+          for(size_t i = 0; i < numComps; i++)
           {
             derivsPtr[index * numComps * 3 + i * 3] = xix * dValuesdXi[i] + etax * dValuesdEta[i] + zetax * dValuesdZeta[i];
 
@@ -706,9 +706,9 @@ void RectGridGeom::getCoords(size_t idx[3], double coords[3])
   float* yBnds = m_yBounds->getPointer(0);
   float* zBnds = m_zBounds->getPointer(0);
 
-  coords[0] = static_cast<double>(0.5 * (xBnds[idx[0]] + xBnds[idx[0] + 1]));
-  coords[1] = static_cast<double>(0.5 * (yBnds[idx[1]] + yBnds[idx[1] + 1]));
-  coords[2] = static_cast<double>(0.5 * (zBnds[idx[2]] + zBnds[idx[2] + 1]));
+  coords[0] = 0.5 * (static_cast<double>(xBnds[idx[0]]) + xBnds[idx[0] + 1]);
+  coords[1] = 0.5 * (static_cast<double>(yBnds[idx[1]]) + yBnds[idx[1] + 1]);
+  coords[2] = 0.5 * (static_cast<double>(zBnds[idx[2]]) + zBnds[idx[2] + 1]);
 }
 
 // -----------------------------------------------------------------------------
@@ -720,9 +720,9 @@ void RectGridGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
   float* yBnds = m_yBounds->getPointer(0);
   float* zBnds = m_zBounds->getPointer(0);
 
-  coords[0] = static_cast<double>(0.5 * (xBnds[x] + xBnds[x + 1]));
-  coords[1] = static_cast<double>(0.5 * (yBnds[y] + yBnds[y + 1]));
-  coords[2] = static_cast<double>(0.5 * (zBnds[z] + zBnds[z + 1]));
+  coords[0] = 0.5 * (static_cast<double>(xBnds[x]) + xBnds[x + 1]);
+  coords[1] = 0.5 * (static_cast<double>(yBnds[y]) + yBnds[y + 1]);
+  coords[2] = 0.5 * (static_cast<double>(zBnds[z]) + zBnds[z + 1]);
 }
 
 // -----------------------------------------------------------------------------
@@ -738,9 +738,9 @@ void RectGridGeom::getCoords(size_t idx, double coords[3])
   float* yBnds = m_yBounds->getPointer(0);
   float* zBnds = m_zBounds->getPointer(0);
 
-  coords[0] = static_cast<double>(0.5f * (xBnds[column] + xBnds[column + 1]));
-  coords[1] = static_cast<double>(0.5f * (yBnds[row] + yBnds[row + 1]));
-  coords[2] = static_cast<double>(0.5f * (zBnds[plane] + zBnds[plane + 1]));
+  coords[0] = 0.5 * (static_cast<double>(xBnds[column]) + xBnds[column + 1]);
+  coords[1] = 0.5 * (static_cast<double>(yBnds[row]) + yBnds[row + 1]);
+  coords[2] = 0.5 * (static_cast<double>(zBnds[plane]) + zBnds[plane + 1]);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
index 6ae6e8c8d8..eecdddf8a3 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
@@ -120,7 +120,7 @@ float CubeOctohedronOps::inside(float axis1comp, float axis2comp, float axis3com
   float plane3comp = ((axis1comp) + (axis2comp) + (axis3comp) - ((2.0f - (0.5f * Gvalue)) + (2.0f - (0.5f * Gvalue)) + 2.0f));
   plane3comp = plane3comp / ((1) + (1) + (1) - ((2.0f - (0.5f * Gvalue)) + (2.0f - (0.5f * Gvalue)) + 2.0f));
 
-  float plane4comp = static_cast<float>(((-axis1comp) + (axis2comp) + (axis3comp) - ((-0.5f * Gvalue) + (2.0f - (0.5 * Gvalue)) + 2.0f)));
+  float plane4comp = ((-axis1comp) + (axis2comp) + (axis3comp) - ((-0.5f * Gvalue) + (2.0f - (0.5f * Gvalue)) + 2.0f));
   plane4comp = plane4comp / ((-1) + (1) + (1) - ((-0.5f * Gvalue) + (2.0f - (0.5f * Gvalue)) + 2.0f));
 
   float plane5comp = ((-axis1comp) + (-axis2comp) + (-axis3comp) - ((-0.5f * Gvalue) + (-0.5f * Gvalue)));
@@ -130,7 +130,7 @@ float CubeOctohedronOps::inside(float axis1comp, float axis2comp, float axis3com
   plane6comp = plane6comp / ((1) + (-1) + (-1) - ((2.0f - (0.5f * Gvalue)) + (-0.5f * Gvalue)));
 
   float plane7comp = ((axis1comp) + (axis2comp) + (-axis3comp) - ((2.0f - (0.5f * Gvalue)) + (2.0f - (0.5f * Gvalue))));
-  plane7comp = static_cast<float>(plane7comp / ((1) + (1) + (-1) - ((2.0f - (0.5f * Gvalue)) + (2.0f - (0.5 * Gvalue)))));
+  plane7comp = plane7comp / ((1) + (1) + (-1) - ((2.0f - (0.5f * Gvalue)) + (2.0f - (0.5f * Gvalue))));
 
   float plane8comp = ((-axis1comp) + (axis2comp) + (-axis3comp) - ((-0.5f * Gvalue) + (2.0f - (0.5f * Gvalue))));
   plane8comp = plane8comp / ((-1) + (1) + (-1) - ((-0.5f * Gvalue) + (2 - (0.5f * Gvalue))));
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index e645cb46b3..f150ecedac 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -87,7 +87,7 @@ class FindTetDerivativesImpl
     for(int64_t i = start; i < end; i++)
     {
       m_Tets->getVertsAtTet(i, verts);
-      for(int32_t j = 0; j < cDims; j++)
+      for(size_t j = 0; j < cDims; j++)
       {
         for(size_t k = 0; k < 4; k++)
         {
@@ -206,8 +206,8 @@ void TetrahedralGeom::initializeWithZeros()
 void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
   if(data->getType() != AttributeMatrix::Type::Vertex
-     || data->getType() != AttributeMatrix::Type::Edge
-     || data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
+     && data->getType() != AttributeMatrix::Type::Edge
+     && data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
   {
     // TetrahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index c4d42db600..cfdd4e8a9f 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -87,7 +87,7 @@ class FindTriangleDerivativesImpl
     for(int64_t i = start; i < end; i++)
     {
       m_Tris->getVertsAtTri(i, verts);
-      for(int32_t j = 0; j < cDims; j++)
+      for(size_t j = 0; j < cDims; j++)
       {
         for(size_t k = 0; k < 3; k++)
         {
@@ -203,7 +203,7 @@ void TriangleGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void TriangleGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if(data->getType() != AttributeMatrix::Type::Vertex || data->getType() != AttributeMatrix::Type::Edge || data->getType() != AttributeMatrix::Type::Face)
+  if(data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge && data->getType() != AttributeMatrix::Type::Face)
   {
     // TriangleGeom can only accept vertex, edge, or face Attribute Matrices
     return;
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
index 5a94fa31aa..c5f113f129 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -121,7 +121,7 @@ class H5DataArrayWriter
       int err = 0;
 
       QVector<size_t> cDims = dataArray->getComponentDimensions();
-      hsize_t h5Rank = tDims.size() + cDims.size();
+      hsize_t h5Rank = static_cast<hsize_t>(tDims.size()) + cDims.size();
 
       QVector<hsize_t> h5Dims(tDims.size() + cDims.size());
 
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 25006d57b1..98f9058c16 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -1020,7 +1020,7 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
     for(f = 0; f < numFaces; f++)
     {
       /* Begin check each face */
-      int32_t idx = 2 * faceId[f];
+      int64_t idx = 2 * static_cast<int64_t>(faceId[f]);
       float* v0 = faceBBs->getVertexPointer(idx);
       float* v1 = faceBBs->getVertexPointer(idx + 1);
       if(!RayIntersectsBox(q, r, v0, v1))
@@ -1113,7 +1113,7 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
     for(f = 0; f < numFaces; f++)
     {
       /* Begin check each face */
-      int32_t idx = 2 * faceId[f];
+      int64_t idx = 2 * static_cast<int64_t>(faceId[f]);
       float* v0 = faceBBs->getVertexPointer(idx);
       float* v1 = faceBBs->getVertexPointer(idx + 1);
       faces->getVertCoordsAtTri(faceId[f], a, b, c);
diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index 4a499a4872..8f47c54020 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -360,8 +360,8 @@ float SIMPLibMath::erfc(float x)
 }
 float SIMPLibMath::incompletebeta(float a, float b, float x)
 {
-  float maxrealnumber = std::numeric_limits<float>::max();
-  float minrealnumber = std::numeric_limits<float>::min();
+  constexpr float maxrealnumber = std::numeric_limits<float>::max();
+  constexpr float minrealnumber = std::numeric_limits<float>::min();
   float result;
   float t;
   float xc;
@@ -696,8 +696,8 @@ float SIMPLibMath::incompletebetaps(float a, float b, float x, float maxgam)
   float z;
   float ai;
   float sg;
-  float maxrealnumber = std::numeric_limits<float>::max();
-  float minrealnumber = std::numeric_limits<float>::min();
+  constexpr float maxrealnumber = std::numeric_limits<float>::max();
+  constexpr float minrealnumber = std::numeric_limits<float>::min();
   ai = 1.0f / a;
   u = (1.0f - b) * x;
   v = u / (a + 1.0f);
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.cpp b/Source/SIMPLib/Math/SIMPLibRandom.cpp
index cba26cf9a1..355f14270b 100644
--- a/Source/SIMPLib/Math/SIMPLibRandom.cpp
+++ b/Source/SIMPLib/Math/SIMPLibRandom.cpp
@@ -299,7 +299,7 @@ double SIMPLibRandom::genrand_beta(double aa, double bb)
 S50:
   w = a * exp(v);
 S60:
-  z = powf(static_cast<float>(u1), 2.0f) * static_cast<float>(u2);
+  z = powf(static_cast<float>(u1), 2.0f) * u2;
   r = gamma * v - 1.3862944;
   s = a + r - w;
   if(s + 2.609438 >= 5.0 * z)
@@ -360,7 +360,7 @@ double SIMPLibRandom::genrand_beta(double aa, double bb)
   }
   goto S170;
 S130:
-  z = powf(static_cast<float>(u1), 2.0f) * static_cast<float>(u2);
+  z = powf(static_cast<float>(u1), 2.0f) * u2;
   if(!(z <= 0.25))
   {
     goto S160;
diff --git a/Source/SIMPLib/Utilities/ColorTable.cpp b/Source/SIMPLib/Utilities/ColorTable.cpp
index afa37d34d5..e458c075c6 100644
--- a/Source/SIMPLib/Utilities/ColorTable.cpp
+++ b/Source/SIMPLib/Utilities/ColorTable.cpp
@@ -1,40 +1,41 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ColorTable.h"
 
+#include <algorithm>
 #include <iostream>
 
 #include <QtCore/QJsonArray>
@@ -54,7 +55,7 @@ SIMPLColorTable::~SIMPLColorTable() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SIMPLColorTable::GetColorTable(int numColors, QVector<float>& colors)
+void SIMPLColorTable::GetColorTable(int numColors, QVector<float>& colorsOut)
 {
   static const int numColorNodes = 8;
   float color[numColorNodes][3] = {
@@ -68,44 +69,55 @@ void SIMPLColorTable::GetColorTable(int numColors, QVector<float>& colors)
       {255.0f / 255.0f, 0.0f / 255.0f, 0.0f / 255.0f} // red
   };
 
-  float val = 0.0f, r = 0.0f, g = 0.0f, b = 0.0f;
-  float step = 1.0 / float(numColors);
-  float nodeStep = 1.0f / float(numColorNodes - 1);
-  for(int i = 0; i < (numColors); i++)
+  static const int maxNodeIndex = numColorNodes - 1;
+  const float stepSize = 1.0f / numColors;
+  const float nodeStepSize = 1.0f / (maxNodeIndex);
+  for(int i = 0; i < numColors; i++)
   {
-    val = float(i) * step;
-    int currColorBin = int(val / nodeStep);
-    float currFraction = (val / nodeStep) - currColorBin;
-    if(currColorBin > numColorNodes - 1)
+    float pos = i * stepSize; // [0, 1] range
+    int currColorBin = static_cast<int>(pos / nodeStepSize);
+    float currFraction = (pos / nodeStepSize) - currColorBin;
+
+    float r;
+    float g;
+    float b;
+    currColorBin = std::min(currColorBin, maxNodeIndex);
+    // currColorBin + 1 causes this to step out of color[] bounds when currColorBin == (numColorNodes - 1)
+    if(i < numColors - 1)
+    {
+      r = color[currColorBin][0] * (1.0f - currFraction) + color[currColorBin + 1][0] * currFraction;
+      g = color[currColorBin][1] * (1.0f - currFraction) + color[currColorBin + 1][1] * currFraction;
+      b = color[currColorBin][2] * (1.0f - currFraction) + color[currColorBin + 1][2] * currFraction;
+    }
+    else
     {
-      currColorBin = numColorNodes - 1;
+      r = color[currColorBin][0];
+      g = color[currColorBin][1];
+      b = color[currColorBin][2];
     }
-    r = color[currColorBin][0] * (1.0 - currFraction) + color[currColorBin + 1][0] * currFraction;
-    g = color[currColorBin][1] * (1.0 - currFraction) + color[currColorBin + 1][1] * currFraction;
-    b = color[currColorBin][2] * (1.0 - currFraction) + color[currColorBin + 1][2] * currFraction;
-    colors[3 * i] = r;
-    colors[3 * i + 1] = g;
-    colors[3 * i + 2] = b;
+    colorsOut[3 * i] = r;
+    colorsOut[3 * i + 1] = g;
+    colorsOut[3 * i + 2] = b;
   }
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<unsigned char> SIMPLColorTable::GetColorTable(int numColors, QJsonArray colorControlPoints)
+std::vector<unsigned char> SIMPLColorTable::GetColorTable(size_t numColors, QJsonArray colorControlPoints)
 {
-  int numControlColors = colorControlPoints.count() / 4;
-  int numComponents = 4;
-  std::vector<std::vector<double> > controlPoints(numControlColors, std::vector<double>(numComponents));
+  const size_t controlColorsCount = colorControlPoints.count() / 4;
+  const size_t numComponents = 4;
+  std::vector<std::vector<double>> controlPoints(controlColorsCount, std::vector<double>(numComponents));
 
   // Migrate colorControlPoints values from QJsonArray to 2D array.  Store A-values in binPoints vector.
-  QVector<float> binPoints;
-  for (int i=0; i<numControlColors; i++)
+  std::vector<float> binPoints;
+  for(size_t i = 0; i < controlColorsCount; i++)
   {
-    for (int j=0; j<numComponents; j++)
+    for(size_t j = 0; j < numComponents; j++)
     {
-      controlPoints[i][j] = static_cast<float>(colorControlPoints[numComponents*i + j].toDouble());
-      if (j == 0)
+      controlPoints[i][j] = static_cast<float>(colorControlPoints[numComponents * i + j].toDouble());
+      if(j == 0)
       {
         binPoints.push_back(controlPoints[i][j]);
       }
@@ -113,35 +125,33 @@ std::vector<unsigned char> SIMPLColorTable::GetColorTable(int numColors, QJsonAr
   }
 
   // Normalize binPoints values
-  float min = binPoints[0];
-  float max = binPoints[binPoints.size() - 1];
-  for (int i=0; i<binPoints.size(); i++)
+  const float min = binPoints[0];
+  const float max = binPoints[binPoints.size() - 1];
+  for(size_t i = 0; i < binPoints.size(); i++)
   {
     binPoints[i] = (binPoints[i] - min) / (max - min);
   }
 
   std::vector<unsigned char> generatedColors(numColors * 3);
-  int currentBinIndex = 0;
-  float currFraction = 0.0f;
-  float allColorVal = 0.0f;
-  unsigned char r = 0, g = 0, b = 0;
-  float colorStep = 1.0 / float(numColors);
-  for(int i = 0; i < numColors; i++)
+  size_t currentBinIndex = 0;
+  const float colorStepSize = 1.0f / numColors;
+  for(size_t i = 0; i < numColors; i++)
   {
     // Calculate what point we are at in the entire color range
-    allColorVal = float(i) * colorStep;
+    const float allColorVal = static_cast<float>(i) * colorStepSize;
 
     // If we have crossed into the next color bin, increment the currentBinIndex variable.
-    if (currentBinIndex+1 < binPoints.size() && allColorVal > binPoints[currentBinIndex+1])
+    if(currentBinIndex + 1 < binPoints.size() && allColorVal > binPoints[currentBinIndex + 1])
     {
       // We have crossed into the next bin
       currentBinIndex++;
     }
 
     // Find the fractional distance traveled between the beginning and end of the current color bin
-    if (currentBinIndex + 1 < binPoints.size())
+    float currFraction = 0.0f;
+    if(currentBinIndex + 1 < binPoints.size())
     {
-      currFraction = (allColorVal - binPoints[currentBinIndex]) / (binPoints[currentBinIndex+1] - binPoints[currentBinIndex]);
+      currFraction = (allColorVal - binPoints[currentBinIndex]) / (binPoints[currentBinIndex + 1] - binPoints[currentBinIndex]);
     }
     else
     {
@@ -150,15 +160,24 @@ std::vector<unsigned char> SIMPLColorTable::GetColorTable(int numColors, QJsonAr
 
     // If the current color bin index is larger than the total number of control colors, automatically set the currentBinIndex
     // to the last control color.
-    if(currentBinIndex > numControlColors - 1)
-    {
-      currentBinIndex = numControlColors - 1;
-    }
+    currentBinIndex = std::min(currentBinIndex, controlColorsCount - 1);
 
     // Calculate the RGB values
-    r = (controlPoints[currentBinIndex][1] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][1] * currFraction) * 255;
-    g = (controlPoints[currentBinIndex][2] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][2] * currFraction) * 255;
-    b = (controlPoints[currentBinIndex][3] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][3] * currFraction) * 255;
+    unsigned char r = 0;
+    unsigned char g = 0;
+    unsigned char b = 0;
+    if(currentBinIndex < controlColorsCount - 2)
+    {
+      r = (controlPoints[currentBinIndex][1] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][1] * currFraction) * 255;
+      g = (controlPoints[currentBinIndex][2] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][2] * currFraction) * 255;
+      b = (controlPoints[currentBinIndex][3] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][3] * currFraction) * 255;
+    }
+    else
+    {
+      r = controlPoints[currentBinIndex][1] * 255;
+      g = controlPoints[currentBinIndex][2] * 255;
+      b = controlPoints[currentBinIndex][3] * 255;
+    }
 
     // Store the RGB values in the RGB generatedColors vector
     generatedColors[3 * i] = r;
@@ -168,7 +187,3 @@ std::vector<unsigned char> SIMPLColorTable::GetColorTable(int numColors, QJsonAr
 
   return generatedColors;
 }
-
-
-
-
diff --git a/Source/SIMPLib/Utilities/ColorTable.h b/Source/SIMPLib/Utilities/ColorTable.h
index 0429cc1e64..61f08ab8bd 100755
--- a/Source/SIMPLib/Utilities/ColorTable.h
+++ b/Source/SIMPLib/Utilities/ColorTable.h
@@ -127,7 +127,7 @@ class SIMPLib_EXPORT SIMPLColorTable
     */
     static void GetColorTable(int numColors, QVector<float>& colors);
 
-    static std::vector<unsigned char> GetColorTable(int numColors, QJsonArray colorNodeArray);
+    static std::vector<unsigned char> GetColorTable(size_t numColors, QJsonArray colorNodeArray);
 
   private:
     SIMPLColorTable(const SIMPLColorTable&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index 052d895626..fcd1b411fe 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -245,9 +245,9 @@ int VTKFileReader::readHeader()
   dims[1] = tokens[2].toLongLong(&ok, 10);
   dims[2] = tokens[3].toLongLong(&ok, 10);
 #if(CMP_SIZEOF_SSIZE_T == 4)
-  int64_t max = std::numeric_limits<size_t>::max();
+  constexpr int64_t max = std::numeric_limits<size_t>::max();
 #else
-  int64_t max = std::numeric_limits<int64_t>::max();
+  constexpr int64_t max = std::numeric_limits<int64_t>::max();
 #endif
   if(dims[0] * dims[1] * dims[2] > max)
   {
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
index 8677e344e0..db82fc2446 100755
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -176,7 +176,7 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
     }
 
     template<typename T>
-    int skipVolume(std::ifstream& inStream, int byteSize, int xDim, int yDim, int zDim)
+    int skipVolume(std::ifstream& inStream, int byteSize, size_t xDim, size_t yDim, size_t zDim)
     {
       int err = 0;
       if(getFileIsBinary() == true)
@@ -195,11 +195,11 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
       else
       {
         T tmp;
-        for (int z = 0; z < zDim; ++z)
+        for(size_t z = 0; z < zDim; ++z)
         {
-          for (int y = 0; y < yDim; ++y)
+          for(size_t y = 0; y < yDim; ++y)
           {
-            for (int x = 0; x < xDim; ++x)
+            for(size_t x = 0; x < xDim; ++x)
             {
               inStream >> tmp;
             }

From fa06dd2b07f075f7ed8e7191ee1e06594c0410a6 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 23 Apr 2019 09:00:22 -0400
Subject: [PATCH 075/397] Topic/2 d image import fix (#342)

Updating ITKImageReader and itkInPlaceImageToDream3DDataFilter classes so that they import 2D datasets with the 3rd dimension set to 0.
---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  26 +--
 .../itkInPlaceImageToDream3DDataFilter.hxx    | 203 ++++++++----------
 2 files changed, 98 insertions(+), 131 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 8f2a50117d..1317a10a80 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -48,9 +48,7 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   const unsigned int dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
@@ -77,9 +75,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   using PixelTypeType = itk::ImageIOBase::IOPixelType;
   PixelTypeType pixel = imageIO->GetPixelType();
@@ -135,9 +131,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
 {
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
@@ -172,9 +166,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool da
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 {
   try
   {
@@ -240,9 +232,8 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container)
+void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader,
+                                                              DataContainer::Pointer& container)
 {
   using ImageType = itk::Dream3DImage<TPixel, dimensions>;
   using ValueType = typename itk::NumericTraits<TPixel>::ValueType;
@@ -253,12 +244,14 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
   FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
-  SizeVec3Type tDims = {1, 1, 1};
+  SizeVec3Type tDims = {0, 0, 0};
+  QVector<size_t> qTdims(dimensions);
   for(size_t i = 0; i < dimensions; i++)
   {
     torigin[i] = origin[i];
     tspacing[i] = spacing[i];
     tDims[i] = size[i];
+    qTdims[i] = tDims[i];
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
   image->setDimensions(tDims);
@@ -267,7 +260,6 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   container->setGeometry(image);
 
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
-  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 06aecb070b..2ca211fe4f 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -1,23 +1,21 @@
 #pragma once
 
-#include "itkInPlaceImageToDream3DDataFilter.h"
-#include "itkGetComponentsDimensions.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "itkGetComponentsDimensions.h"
+#include "itkInPlaceImageToDream3DDataFilter.h"
 #include <QString>
 
 namespace itk
 {
 
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType,VDimension>
-::InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDataFilter()
 {
   m_DataArrayName = (SIMPL::Defaults::CellAttributeMatrixName).toStdString();
   m_AttributeMatrixArrayName = (SIMPL::CellData::ImageData).toStdString();
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
-  typename DecoratorType::Pointer output =
-    static_cast< DecoratorType * >(this->MakeOutput(0).GetPointer());
+  typename DecoratorType::Pointer output = static_cast<DecoratorType*>(this->MakeOutput(0).GetPointer());
   this->ProcessObject::SetNumberOfRequiredOutputs(1);
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
   this->SetNumberOfRequiredInputs(1);
@@ -25,55 +23,40 @@ InPlaceImageToDream3DDataFilter<PixelType,VDimension>
   m_InPlace = true;
 }
 
-
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetDataContainer(DataContainer::Pointer dc)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetDataContainer(DataContainer::Pointer dc)
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   outputPtr->Set(dc);
 }
 
-
-
-template< typename PixelType, unsigned int VDimension>
-ProcessObject::DataObjectPointer
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+template <typename PixelType, unsigned int VDimension>
+ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDimension>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   return DecoratorType::New().GetPointer();
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::~InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::~InPlaceImageToDream3DDataFilter()
 {
 }
 
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetInput(const ImageType *input)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetInput(const ImageType* input)
 {
   // Process object is not const-correct so the const_cast is required here
-  this->ProcessObject::SetNthInput(0,
-    const_cast< ImageType * >(input));
+  this->ProcessObject::SetNthInput(0, const_cast<ImageType*>(input));
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateOutputInformation()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInformation()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
-  //float tol = 0.000001;
+  // float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
-  QVector<size_t> tDims(3, 1);
+  QVector<size_t> tDims(3, 0);
   // Get Input image properties
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   typename ImageType::PointType origin = inputPtr->GetOrigin();
@@ -82,10 +65,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   //// Create image geometry (data container)
   ImageGeom::Pointer imageGeom;
   IGeometry::Pointer geom = dataContainer->getGeometry();
-  if (geom)
+  if(geom)
   {
     imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Data container contains a geometry that is not ImageGeometry");
     }
@@ -93,16 +76,16 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   else
   {
     imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Could not create image geometry");
     }
   }
-  for (size_t i = 0; i < VDimension; i++)
+  for(size_t i = 0; i < VDimension; i++)
   {
-	  torigin[i] = origin[i];
-	  tspacing[i] = spacing[i];
-	  tDims[i] = size[i];
+    torigin[i] = origin[i];
+    tspacing[i] = spacing[i];
+    tDims[i] = size[i];
   }
   imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
   imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
@@ -110,12 +93,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   dataContainer->setGeometry(imageGeom);
 }
 
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateData()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
@@ -124,57 +105,61 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
   QVector<size_t> tDims(3, 1);
   std::tie(tDims[0], tDims[1], tDims[2]) = imageGeom->getDimensions();
+  QVector<size_t> attrMatDims;
+  for(int i = 0; i < VDimension; i++)
+  {
+    attrMatDims.push_back(tDims[i]);
+  }
+
   AttributeMatrix::Pointer attrMat;
-  if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
+  if(dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
-	attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-	// Check that attribute matrix type is 'cell'
-	if (attrMat->getType() != AttributeMatrix::Type::Cell)
-	{
-		itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
-	}
-	// Check that if size does not match, there are no other data array than the one we expect.
-	// That makes it possible to modify the attribute matrix without having to worry.
-	QVector<size_t> matDims = attrMat->getTupleDimensions();
-	if (matDims != tDims)
-	{
-    if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
-      || ! (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)) )
-		{
-			itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
-		}
-		dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-		attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
-	}
+    attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+    // Check that attribute matrix type is 'cell'
+    if(attrMat->getType() != AttributeMatrix::Type::Cell)
+    {
+      itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
+    }
+    // Check that if size does not match, there are no other data array than the one we expect.
+    // That makes it possible to modify the attribute matrix without having to worry.
+    QVector<size_t> matDims = attrMat->getTupleDimensions();
+    if(matDims != tDims)
+    {
+      if(!((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1) ||
+           !(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)))
+      {
+        itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
+      }
+      dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+      attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    }
   }
   else
   {
-    attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
   }
   // Checks if doesAttributeArray exists and remove it if it is the case
-  if (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
+  if(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
   {
-	  IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
-	  if (attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
-	  {
-		  attrMat->removeAttributeArray(m_DataArrayName.c_str());
-	  }
+    IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
+    if(attrArray->getNumberOfTuples() != attrMat->getNumberOfTuples())
+    {
+      attrMat->removeAttributeArray(m_DataArrayName.c_str());
+    }
   }
   typename DataArrayPixelType::Pointer data;
-  inputPtr->SetBufferedRegion( inputPtr->GetLargestPossibleRegion() );
-  if( m_InPlace )
+  inputPtr->SetBufferedRegion(inputPtr->GetLargestPossibleRegion());
+  if(m_InPlace)
   {
-    inputPtr->GetPixelContainer()->SetContainerManageMemory( false );
-    data = DataArrayPixelType::WrapPointer( reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()),
-              imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true );
+    inputPtr->GetPixelContainer()->SetContainerManageMemory(false);
+    data = DataArrayPixelType::WrapPointer(reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples(), cDims, this->GetDataArrayName().c_str(), true);
   }
   else
   {
-    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims,
-              m_DataArrayName.c_str(), true);
-    if (nullptr != data.get())
+    data = DataArrayPixelType::CreateArray(attrMat->getNumberOfTuples(), cDims, m_DataArrayName.c_str(), true);
+    if(nullptr != data.get())
     {
-      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
+      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples() * sizeof(ValueType));
     }
   }
   attrMat->insertOrAssign(data);
@@ -182,38 +167,33 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 // Check that names has been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::CheckValidArrayPathComponentName(std::string var) const
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::CheckValidArrayPathComponentName(std::string var) const
 {
-  if (var.find('/') != std::string::npos)
+  if(var.find('/') != std::string::npos)
   {
     itkExceptionMacro("Name contains a '/'");
   }
-  if (var.empty())
+  if(var.empty())
   {
     itkExceptionMacro("Name is empty");
   }
 }
 
-
 // Check that the inputs have been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::VerifyPreconditions() ITKv5_CONST
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
 {
-  //Test only works if image if of dimension 2 or 3
-  if (VDimension != 2 && VDimension != 3)
+  // Test only works if image if of dimension 2 or 3
+  if(VDimension != 2 && VDimension != 3)
   {
     itkExceptionMacro("Dimension must be 2 or 3.");
   }
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  const DecoratorType *outputPtr = this->GetOutput();
-  if (!outputPtr->Get())
+  const DecoratorType* outputPtr = this->GetOutput();
+  if(!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
   }
@@ -222,23 +202,18 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 /**
-*
-*/
-template<typename PixelType, unsigned int VDimension>
-typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput()
+ *
+ */
+template <typename PixelType, unsigned int VDimension>
+typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput()
 {
-  return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-template<typename PixelType, unsigned int VDimension>
-const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput() const
+template <typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput() const
 {
-  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
-
+} // namespace itk

From 3cd27a465490e6bcadcf9edd178671ab5d4e356a Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 24 Apr 2019 07:35:58 -0400
Subject: [PATCH 076/397] Revert "Topic/2 d image import fix (#342)" (#344)

This reverts commit fa06dd2b07f075f7ed8e7191ee1e06594c0410a6.
---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  26 ++-
 .../itkInPlaceImageToDream3DDataFilter.hxx    | 203 ++++++++++--------
 2 files changed, 131 insertions(+), 98 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 1317a10a80..8f2a50117d 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -48,7 +48,9 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   const unsigned int dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
@@ -75,7 +77,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   using PixelTypeType = itk::ImageIOBase::IOPixelType;
   PixelTypeType pixel = imageIO->GetPixelType();
@@ -131,7 +135,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
 {
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
@@ -166,7 +172,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 {
   try
   {
@@ -232,8 +240,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader,
-                                                              DataContainer::Pointer& container)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container)
 {
   using ImageType = itk::Dream3DImage<TPixel, dimensions>;
   using ValueType = typename itk::NumericTraits<TPixel>::ValueType;
@@ -244,14 +253,12 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
   // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
   FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
-  SizeVec3Type tDims = {0, 0, 0};
-  QVector<size_t> qTdims(dimensions);
+  SizeVec3Type tDims = {1, 1, 1};
   for(size_t i = 0; i < dimensions; i++)
   {
     torigin[i] = origin[i];
     tspacing[i] = spacing[i];
     tDims[i] = size[i];
-    qTdims[i] = tDims[i];
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
   image->setDimensions(tDims);
@@ -260,6 +267,7 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
   container->setGeometry(image);
 
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
+  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 2ca211fe4f..06aecb070b 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -1,21 +1,23 @@
 #pragma once
 
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "itkGetComponentsDimensions.h"
 #include "itkInPlaceImageToDream3DDataFilter.h"
+#include "itkGetComponentsDimensions.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
 #include <QString>
 
 namespace itk
 {
 
-template <typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDataFilter()
+template<typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType,VDimension>
+::InPlaceImageToDream3DDataFilter()
 {
   m_DataArrayName = (SIMPL::Defaults::CellAttributeMatrixName).toStdString();
   m_AttributeMatrixArrayName = (SIMPL::CellData::ImageData).toStdString();
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
-  typename DecoratorType::Pointer output = static_cast<DecoratorType*>(this->MakeOutput(0).GetPointer());
+  typename DecoratorType::Pointer output =
+    static_cast< DecoratorType * >(this->MakeOutput(0).GetPointer());
   this->ProcessObject::SetNumberOfRequiredOutputs(1);
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
   this->SetNumberOfRequiredInputs(1);
@@ -23,40 +25,55 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDat
   m_InPlace = true;
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetDataContainer(DataContainer::Pointer dc)
+
+template< typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::SetDataContainer(DataContainer::Pointer dc)
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   outputPtr->Set(dc);
 }
 
-template <typename PixelType, unsigned int VDimension>
-ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDimension>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+
+
+template< typename PixelType, unsigned int VDimension>
+ProcessObject::DataObjectPointer
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   return DecoratorType::New().GetPointer();
 }
 
-template <typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>::~InPlaceImageToDream3DDataFilter()
+
+template<typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::~InPlaceImageToDream3DDataFilter()
 {
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetInput(const ImageType* input)
+template< typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::SetInput(const ImageType *input)
 {
   // Process object is not const-correct so the const_cast is required here
-  this->ProcessObject::SetNthInput(0, const_cast<ImageType*>(input));
+  this->ProcessObject::SetNthInput(0,
+    const_cast< ImageType * >(input));
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInformation()
+
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GenerateOutputInformation()
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
-  // float tol = 0.000001;
+  //float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
-  QVector<size_t> tDims(3, 0);
+  QVector<size_t> tDims(3, 1);
   // Get Input image properties
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   typename ImageType::PointType origin = inputPtr->GetOrigin();
@@ -65,10 +82,10 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   //// Create image geometry (data container)
   ImageGeom::Pointer imageGeom;
   IGeometry::Pointer geom = dataContainer->getGeometry();
-  if(geom)
+  if (geom)
   {
     imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-    if(!imageGeom)
+    if (!imageGeom)
     {
       itkExceptionMacro("Data container contains a geometry that is not ImageGeometry");
     }
@@ -76,16 +93,16 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   else
   {
     imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    if(!imageGeom)
+    if (!imageGeom)
     {
       itkExceptionMacro("Could not create image geometry");
     }
   }
-  for(size_t i = 0; i < VDimension; i++)
+  for (size_t i = 0; i < VDimension; i++)
   {
-    torigin[i] = origin[i];
-    tspacing[i] = spacing[i];
-    tDims[i] = size[i];
+	  torigin[i] = origin[i];
+	  tspacing[i] = spacing[i];
+	  tDims[i] = size[i];
   }
   imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
   imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
@@ -93,10 +110,12 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   dataContainer->setGeometry(imageGeom);
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GenerateData()
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
@@ -105,61 +124,57 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
   QVector<size_t> tDims(3, 1);
   std::tie(tDims[0], tDims[1], tDims[2]) = imageGeom->getDimensions();
-  QVector<size_t> attrMatDims;
-  for(int i = 0; i < VDimension; i++)
-  {
-    attrMatDims.push_back(tDims[i]);
-  }
-
   AttributeMatrix::Pointer attrMat;
-  if(dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
+  if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
-    attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-    // Check that attribute matrix type is 'cell'
-    if(attrMat->getType() != AttributeMatrix::Type::Cell)
-    {
-      itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
-    }
-    // Check that if size does not match, there are no other data array than the one we expect.
-    // That makes it possible to modify the attribute matrix without having to worry.
-    QVector<size_t> matDims = attrMat->getTupleDimensions();
-    if(matDims != tDims)
-    {
-      if(!((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1) ||
-           !(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)))
-      {
-        itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
-      }
-      dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-      attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
-    }
+	attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+	// Check that attribute matrix type is 'cell'
+	if (attrMat->getType() != AttributeMatrix::Type::Cell)
+	{
+		itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
+	}
+	// Check that if size does not match, there are no other data array than the one we expect.
+	// That makes it possible to modify the attribute matrix without having to worry.
+	QVector<size_t> matDims = attrMat->getTupleDimensions();
+	if (matDims != tDims)
+	{
+    if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
+      || ! (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)) )
+		{
+			itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
+		}
+		dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+		attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+	}
   }
   else
   {
-    attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
   }
   // Checks if doesAttributeArray exists and remove it if it is the case
-  if(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
+  if (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
   {
-    IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
-    if(attrArray->getNumberOfTuples() != attrMat->getNumberOfTuples())
-    {
-      attrMat->removeAttributeArray(m_DataArrayName.c_str());
-    }
+	  IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
+	  if (attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
+	  {
+		  attrMat->removeAttributeArray(m_DataArrayName.c_str());
+	  }
   }
   typename DataArrayPixelType::Pointer data;
-  inputPtr->SetBufferedRegion(inputPtr->GetLargestPossibleRegion());
-  if(m_InPlace)
+  inputPtr->SetBufferedRegion( inputPtr->GetLargestPossibleRegion() );
+  if( m_InPlace )
   {
-    inputPtr->GetPixelContainer()->SetContainerManageMemory(false);
-    data = DataArrayPixelType::WrapPointer(reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples(), cDims, this->GetDataArrayName().c_str(), true);
+    inputPtr->GetPixelContainer()->SetContainerManageMemory( false );
+    data = DataArrayPixelType::WrapPointer( reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()),
+              imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true );
   }
   else
   {
-    data = DataArrayPixelType::CreateArray(attrMat->getNumberOfTuples(), cDims, m_DataArrayName.c_str(), true);
-    if(nullptr != data.get())
+    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims,
+              m_DataArrayName.c_str(), true);
+    if (nullptr != data.get())
     {
-      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples() * sizeof(ValueType));
+      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
     }
   }
   attrMat->insertOrAssign(data);
@@ -167,33 +182,38 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
 }
 
 // Check that names has been initialized correctly
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::CheckValidArrayPathComponentName(std::string var) const
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::CheckValidArrayPathComponentName(std::string var) const
 {
-  if(var.find('/') != std::string::npos)
+  if (var.find('/') != std::string::npos)
   {
     itkExceptionMacro("Name contains a '/'");
   }
-  if(var.empty())
+  if (var.empty())
   {
     itkExceptionMacro("Name is empty");
   }
 }
 
+
 // Check that the inputs have been initialized correctly
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::VerifyPreconditions() ITKv5_CONST
 {
-  // Test only works if image if of dimension 2 or 3
-  if(VDimension != 2 && VDimension != 3)
+  //Test only works if image if of dimension 2 or 3
+  if (VDimension != 2 && VDimension != 3)
   {
     itkExceptionMacro("Dimension must be 2 or 3.");
   }
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  const DecoratorType* outputPtr = this->GetOutput();
-  if(!outputPtr->Get())
+  const DecoratorType *outputPtr = this->GetOutput();
+  if (!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
   }
@@ -202,18 +222,23 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions
 }
 
 /**
- *
- */
-template <typename PixelType, unsigned int VDimension>
-typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput()
+*
+*/
+template<typename PixelType, unsigned int VDimension>
+typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput()
 {
-  return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
 }
 
-template <typename PixelType, unsigned int VDimension>
-const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput() const
+template<typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput() const
 {
-  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
 }
 
-} // namespace itk
+} // end of itk namespace
+

From a00bcfcf7dc64d0e7a4b70cbe3d86ed0c7a90371 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Wed, 24 Apr 2019 12:40:00 -0400
Subject: [PATCH 077/397] Feature/linked path parameter (#339)

* Added LinkedPathCreationFilterParameter for creating AttributeMatrix and DataArray. This filter parameter sets a QString property for the target name.
* Updated filters to use LinkedPathCreationFilterParameter.
* Creating an AttributeMatrix with linked DataContainer requires one additional value for getting the DataContainer property. This property can be a DataArrayPath or QString.
* Creating a DataArray with linked AttributeMatrix requires two additional value for getting the DataContainer and AttributeMatrix properties. These properties can be DataArrayPath or QString. DataArrayPath properties will only access the name corresponding to the target level. For example, two DataArrayPath properties will grab the DataContainer name from the first and the AttributeMatrix name from the second.
---
 Resources/SIMPL/StyleSheets/Default.css       |  19 +
 Resources/SIMPL/StyleSheets/Default.json      |   2 +
 Resources/SIMPL/StyleSheets/Example.css       |  19 +
 Resources/SIMPL/StyleSheets/Example.json      |   2 +
 .../CoreFilters/CombineAttributeMatrices.cpp  |   5 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   3 +-
 .../CopyFeatureArrayToElementArray.cpp        |   3 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |   1 +
 .../CreateFeatureArrayFromElementArray.cpp    |   3 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  27 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   3 +-
 .../CoreFilters/GenerateColorTable.cpp        |   3 +-
 .../LinkFeatureMapToElementArray.cpp          |   5 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   3 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   5 +-
 .../LinkedPathCreationFilterParameter.cpp     | 321 ++++++++++++++
 .../LinkedPathCreationFilterParameter.h       | 360 ++++++++++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |   3 +-
 .../LinkedPathCreationWidget.cpp              | 140 ++++++
 .../LinkedPathCreationWidget.h                | 103 +++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../UI_Files/LinkedPathCreationWidget.ui      |  86 ++++
 .../Widgets/DataArrayPathDisplay.cpp          | 406 ++++++++++++++++++
 .../Widgets/DataArrayPathDisplay.h            | 172 ++++++++
 .../Widgets/DataArrayPathSelectionWidget.cpp  |   2 +
 Source/SVWidgetsLib/Widgets/DataPathLabel.cpp | 180 ++++++++
 Source/SVWidgetsLib/Widgets/DataPathLabel.h   |  72 ++++
 .../SVWidgetsLib/Widgets/SVControlWidgets.h   |   4 +-
 Source/SVWidgetsLib/Widgets/SVStyle.h         |  12 +
 Source/SVWidgetsLib/Widgets/SourceList.cmake  |   5 +
 .../Widgets/UI_Files/DataArrayPathDisplay.ui  | 189 ++++++++
 32 files changed, 2133 insertions(+), 28 deletions(-)
 create mode 100644 Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/LinkedPathCreationWidget.ui
 create mode 100644 Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
 create mode 100644 Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
 create mode 100644 Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
 create mode 100644 Source/SVWidgetsLib/Widgets/DataPathLabel.h
 create mode 100644 Source/SVWidgetsLib/Widgets/UI_Files/DataArrayPathDisplay.ui

diff --git a/Resources/SIMPL/StyleSheets/Default.css b/Resources/SIMPL/StyleSheets/Default.css
index d78f07270d..1e6d59f378 100644
--- a/Resources/SIMPL/StyleSheets/Default.css
+++ b/Resources/SIMPL/StyleSheets/Default.css
@@ -114,6 +114,25 @@ DataArrayPathSelectionWidget > QToolTip {
   color: #000000;
  }
 
+DataPathLabel {
+    font-family: "Lato-Bold";
+    font-weight: bold;
+    font-size: Font_Size_Small;
+    border-radius: 4px;
+}
+DataPathLabel:disabled {
+    color: DataPathLabel_Disabled_color;
+}
+DataPathLabel:enabled[DataTypei="0"] {
+    color: DataArrayPath_DataContainer_color;
+}
+DataPathLabel:enabled[DataTypei="1"] {
+    color: DataArrayPath_AttributeMatrix_color;
+}
+DataPathLabel:enabled[DataTypei="2"] {
+    color: DataArrayPath_DataArray_color;
+}
+
 /* ----------------------------------------------------------------------------
 * SVPushButton Section
 * ----------------------------------------------------------------------------*/
diff --git a/Resources/SIMPL/StyleSheets/Default.json b/Resources/SIMPL/StyleSheets/Default.json
index 82e18eb4ff..53e7f2f750 100644
--- a/Resources/SIMPL/StyleSheets/Default.json
+++ b/Resources/SIMPL/StyleSheets/Default.json
@@ -63,10 +63,12 @@
     "DataArrayPath_DataContainer_color": "#056d00",
     "DataArrayPath_AttributeMatrix_color": "#6400b7",
     "DataArrayPath_DataArray_color": "#004dad",
+    "DataArrayPath_Invalid_color": "#dddddd",
 
     "DataArrayPath_DataContainer_background_color": "#a0ff9b",
     "DataArrayPath_AttributeMatrix_background_color": "#d9adff",
     "DataArrayPath_DataArray_background_color": "#afd3ff",
+    "DataArrayPath_Invalid_background_color": "#ffffff",
 
     "DataArrayPath_border_normal": "#8f8f91",
     "DataArrayPath_border_not_found": "#BC0000",
diff --git a/Resources/SIMPL/StyleSheets/Example.css b/Resources/SIMPL/StyleSheets/Example.css
index 32055fdbe3..d51b77f790 100644
--- a/Resources/SIMPL/StyleSheets/Example.css
+++ b/Resources/SIMPL/StyleSheets/Example.css
@@ -267,7 +267,26 @@ DataArrayPathSelectionWidget:flat {
     /* Style all DataArrayPathSelectionWidgets' flat menu indicators */
 }
 
+DataPathLabel
+{
+    /* Style DataPathLabel */
+}
+DataPathLabel:disabled
+{
 
+}
+DataPathLabel:enabled[DataTypei="0"]
+{
+    /* DataContainer Style */
+}
+DataPathLabel:enabled[DataTypei="1"]
+{
+    /* AttributeMatrix Style */
+}
+DataPathLabel:enabled[DataTypei="2"]
+{
+    /* DataArray Style */
+}
 
 /* ----------------------------------------------------------------------------
 * QStatusBar Section
diff --git a/Resources/SIMPL/StyleSheets/Example.json b/Resources/SIMPL/StyleSheets/Example.json
index 96f00971fa..c3dd3e929e 100644
--- a/Resources/SIMPL/StyleSheets/Example.json
+++ b/Resources/SIMPL/StyleSheets/Example.json
@@ -93,10 +93,12 @@
     "DataArrayPath_DataContainer_color": "#056d00",
     "DataArrayPath_AttributeMatrix_color": "#6400b7",
     "DataArrayPath_DataArray_color": "#004dad",
+    "DataArrayPath_Invalid_color": "#dddddd",
 
     "DataArrayPath_DataContainer_background_color": "#a0ff9b",
     "DataArrayPath_AttributeMatrix_background_color": "#d9adff",
     "DataArrayPath_DataArray_background_color": "#afd3ff",
+    "DataArrayPath_Invalid_background_color": "#FFFFFF",
 
     "DataArrayPath_border_normal": "#8f8f91",
     "DataArrayPath_border_not_found": "#BC0000",
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 850eea5388..8f73fd41b0 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -119,9 +120,9 @@ void CombineAttributeMatrices::setupFilterParameters()
   }
 
   parameters.push_back(SeparatorFilterParameter::New("Cell/Feature Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_STRING_FP("New Index Array", NewIndexArrayName, FilterParameter::CreatedArray, CombineAttributeMatrices));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("New Index Array", NewIndexArrayName, FirstIndexArrayPath, FirstIndexArrayPath, FilterParameter::CreatedArray, CombineAttributeMatrices));
   parameters.push_back(SeparatorFilterParameter::New("Feature/Ensemble Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Combined Attribute Matrix", CombinedAttributeMatrixName, FilterParameter::CreatedArray, CombineAttributeMatrices));
+  parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Combined Attribute Matrix", CombinedAttributeMatrixName, FirstAttributeMatrixPath, FilterParameter::CreatedArray, CombineAttributeMatrices));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index dc88e478b7..1c94f4be1b 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -39,6 +39,7 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
@@ -210,7 +211,7 @@ void ConvertData::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Convert", SelectedCellArrayPath, FilterParameter::RequiredArray, ConvertData, req));
   }
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Converted Attribute Array", OutputArrayName, FilterParameter::CreatedArray, ConvertData));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Converted Attribute Array", OutputArrayName, SelectedCellArrayPath, SelectedCellArrayPath, FilterParameter::CreatedArray, ConvertData));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index ea8dd07c1e..4a89334ced 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -39,6 +39,7 @@
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -82,7 +83,7 @@ void CopyFeatureArrayToElementArray::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::RequiredArray, CopyFeatureArrayToElementArray, req));
   }
   parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Copied Attribute Array", CreatedArrayName, FilterParameter::CreatedArray, CopyFeatureArrayToElementArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, FeatureIdsArrayPath, FeatureIdsArrayPath, FilterParameter::CreatedArray, CopyFeatureArrayToElementArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 6f36ed086c..af8ebaa7b8 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -41,6 +41,7 @@
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index e58a7ac446..17ee49bf93 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -85,7 +86,7 @@ void CreateFeatureArrayFromElementArray::setupFilterParameters()
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::CellFeature, IGeometry::Type::Any);
     parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray, req));
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Copied Attribute Array", CreatedArrayName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, CellFeatureAttributeMatrixName, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index e7761af6e0..54119589b1 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -42,6 +42,7 @@
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
@@ -172,14 +173,14 @@ void CreateGeometry::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateGeometry, 0));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 0));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 1, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("X Bounds", XBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Y Bounds", YBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Z Bounds", ZBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Cell Attribute Matrix", RectGridCellAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 1));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", RectGridCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 1));
 
     PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateGeometry);
     param->setReadOnly(true);
@@ -189,47 +190,47 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Vertex List", SharedVertexListArrayPath0, FilterParameter::RequiredArray, CreateGeometry, req, 2));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName0, FilterParameter::CreatedArray, CreateGeometry, 2));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName0, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 2));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::RequiredArray, CreateGeometry, req, 3));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 2, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 3));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName1, FilterParameter::CreatedArray, CreateGeometry, 3));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Edge Attribute Matrix", EdgeAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 3));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Edge Attribute Matrix", EdgeAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::RequiredArray, CreateGeometry, req, 4));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 4));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName2, FilterParameter::CreatedArray, CreateGeometry, 4));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Face Attribute Matrix", FaceAttributeMatrixName0, FilterParameter::CreatedArray, CreateGeometry, 4));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName2, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName0, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::RequiredArray, CreateGeometry, req, 5));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 4, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 5));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName3, FilterParameter::CreatedArray, CreateGeometry, 5));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Face Attribute Matrix", FaceAttributeMatrixName1, FilterParameter::CreatedArray, CreateGeometry, 5));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName3, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::RequiredArray, CreateGeometry, req, 6));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 4, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 6));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName4, FilterParameter::CreatedArray, CreateGeometry, 6));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Cell Attribute Matrix", TetCellAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 6));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName4, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", TetCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::RequiredArray, CreateGeometry, req, 7));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 8, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 7));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Vertex Attribute Matrix", VertexAttributeMatrixName5, FilterParameter::CreatedArray, CreateGeometry, 7));
-    parameters.push_back(SIMPL_NEW_STRING_FP("Cell Attribute Matrix", HexCellAttributeMatrixName, FilterParameter::CreatedArray, CreateGeometry, 7));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName5, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", HexCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 5e633da1e5..5f2fe581eb 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -77,7 +78,7 @@ void ExtractComponentAsArray::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, ExtractComponentAsArray, req));
   }
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Scalar Attribute Array", NewArrayArrayName, FilterParameter::CreatedArray, ExtractComponentAsArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Scalar Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, ExtractComponentAsArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 0736c5e6a2..da4d4f5248 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -13,6 +13,7 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h"
 #include "SIMPLib/Utilities/ColorTable.h"
@@ -258,7 +259,7 @@ void GenerateColorTable::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Data Array", SelectedDataArrayPath, FilterParameter::RequiredArray, GenerateColorTable, req));
   }
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("RGB Array Name", RgbArrayName, FilterParameter::CreatedArray, GenerateColorTable));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("RGB Array Name", RgbArrayName, SelectedDataArrayPath, SelectedDataArrayPath, FilterParameter::CreatedArray, GenerateColorTable));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index efef56a495..bebce72558 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/SIMPLibVersion.h"
 
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 
@@ -75,8 +76,8 @@ void LinkFeatureMapToElementArray::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Element Attribute Array to Link", SelectedCellArrayPath, FilterParameter::RequiredArray, LinkFeatureMapToElementArray, req));
   }
   parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Active", ActiveArrayName, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
+  parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, SelectedCellArrayPath, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Active", ActiveArrayName, SelectedCellArrayPath, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index a1587c7c90..f81e986764 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -38,6 +38,7 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
@@ -77,7 +78,7 @@ void MultiThresholdObjects2::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(MultiThresholdObjects2, this, SelectedThresholds));
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Output Attribute Array", DestinationArrayName, FilterParameter::CreatedArray, MultiThresholdObjects2));
+  parameters.push_back(SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Output Attribute Array", DestinationArrayName, SelectedThresholds, FilterParameter::CreatedArray, MultiThresholdObjects2));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 64b64e71ce..d60ae4df58 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -41,6 +41,7 @@
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -79,9 +80,9 @@ void RemoveComponentFromArray::setupFilterParameters()
       DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Category::Any);
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, RemoveComponentFromArray, req));
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Removed Component Attribute Array", NewArrayArrayName, FilterParameter::CreatedArray, RemoveComponentFromArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Removed Component Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Reduced Attribute Array", ReducedArrayArrayName, FilterParameter::CreatedArray, RemoveComponentFromArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Reduced Attribute Array", ReducedArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
 
   QStringList linkedProps;
   linkedProps.clear();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
new file mode 100644
index 0000000000..3c6a34071f
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -0,0 +1,321 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "LinkedPathCreationFilterParameter.h"
+
+#include <stdexcept>
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedDataPath::GetterCallbackType callback, DataArrayPathHelper::DataType dataType)
+{
+  return new LinkedDataPath(callback, dataType);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback)
+{
+  return new LinkedStringPath(dcCallback);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback, LinkedStringPath::GetterCallbackType amCallback)
+{
+  return new LinkedStringPath(dcCallback, amCallback);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
+                                                                                                    LinkedMixedPath::PathGetterCallbackType amCallback)
+{
+  return new LinkedMixedPath(dcCallback, amCallback);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
+                                                                                                    LinkedMixedPath::StringGetterCallbackType amCallback)
+{
+  return new LinkedMixedPath(dcCallback, amCallback);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType pathCallback)
+{
+  return new LinkedDataPath(pathCallback, DataArrayPathHelper::DataType::DataContainer);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType callback)
+{
+  return new LinkedAdvComparisonPath(callback);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedPathCreationFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, ILinkedPath* linkedPath, int groupIndex)
+{
+
+  LinkedPathCreationFilterParameter::Pointer ptr = LinkedPathCreationFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  ptr->setDefaultValue(defaultValue);
+  ptr->setLinkedPath(linkedPath);
+  ptr->setCategory(category);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString LinkedPathCreationFilterParameter::getWidgetType() const
+{
+  return QString("LinkedPathCreationWidget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    m_SetterCallback(jsonValue.toString(""));
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    json[getPropertyName()] = m_GetterCallback();
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedStringPath::LinkedStringPath(GetterCallbackType getDc)
+: dcGetter(getDc)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedStringPath::LinkedStringPath(GetterCallbackType getDc, GetterCallbackType getAm)
+: dcGetter(getDc)
+, amGetter(getAm)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedMixedPath::LinkedMixedPath(PathGetterCallbackType getDc, StringGetterCallbackType getAm)
+: dcGetter(getDc)
+, amGetter(getAm)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedMixedPath::LinkedMixedPath(PathGetterCallbackType dc, PathGetterCallbackType am)
+: dcGetter(dc)
+, amPathGetter(am)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedDataPath::LinkedDataPath(GetterCallbackType getPath)
+: pathGetter(getPath)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedDataPath::LinkedDataPath(GetterCallbackType getPath, DataArrayPathHelper::DataType targetLevel)
+: pathGetter(getPath)
+, m_TargetPathType(targetLevel)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::LinkedAdvComparisonPath::LinkedAdvComparisonPath(GetterCallbackType advComp)
+: compGetter(advComp)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath LinkedPathCreationFilterParameter::LinkedStringPath::generatePath()
+{
+  DataArrayPath linkedPath;
+  // Use std::function operator bool to check if this is a callable function
+  if(dcGetter)
+  {
+    linkedPath.setDataContainerName(dcGetter());
+    if(amGetter)
+    {
+      linkedPath.setAttributeMatrixName(amGetter());
+    }
+  }
+  return linkedPath;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath LinkedPathCreationFilterParameter::LinkedMixedPath::generatePath()
+{
+  DataArrayPath linkedPath;
+  // Use std::function operator bool to check if this is a callable function
+  if(dcGetter && amGetter)
+  {
+    linkedPath.setDataContainerName(dcGetter().getDataContainerName());
+    linkedPath.setAttributeMatrixName(amGetter());
+  }
+  else if(dcGetter && amPathGetter)
+  {
+    linkedPath.setDataContainerName(dcGetter().getDataContainerName());
+    linkedPath.setAttributeMatrixName(amPathGetter().getAttributeMatrixName());
+  }
+  // else
+  //{
+  //  throw std::invalid_argument("Invalid linked AttributeMatrix path");
+  //}
+  return linkedPath;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath LinkedPathCreationFilterParameter::LinkedDataPath::generatePath()
+{
+  if(!pathGetter)
+  {
+    return DataArrayPath();
+  }
+  DataArrayPath linkedPath = pathGetter();
+  switch(m_TargetPathType)
+  {
+  case DataArrayPathHelper::DataType::DataContainer:
+    return DataArrayPath(linkedPath.getDataContainerName(), "", "");
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    return DataArrayPath(linkedPath.getDataContainerName(), linkedPath.getAttributeMatrixName(), "");
+  case DataArrayPathHelper::DataType::DataArray:
+    throw std::domain_error("LinkedPathCreationFilterParameter cannot target a child path underneath DataArray");
+  case DataArrayPathHelper::DataType::None:
+    return linkedPath;
+  }
+  return DataArrayPath();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath LinkedPathCreationFilterParameter::LinkedAdvComparisonPath::generatePath()
+{
+  DataArrayPath linkedPath;
+  // Use std::function operator bool to check if this is a callable function
+  if(compGetter)
+  {
+    linkedPath.setDataContainerName(compGetter().getDataContainerName());
+    linkedPath.setAttributeMatrixName(compGetter().getAttributeMatrixName());
+  }
+  // else
+  //{
+  //  throw std::invalid_argument("Invalid linked AttributeMatrix path");
+  //}
+  return linkedPath;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationFilterParameter::setLinkedPath(ILinkedPath* linkedPath)
+{
+  delete m_LinkedPath;
+  m_LinkedPath = linkedPath;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath LinkedPathCreationFilterParameter::getLinkedDataArrayPath() const
+{
+  if(m_LinkedPath)
+  {
+    return m_LinkedPath->generatePath();
+  }
+  return DataArrayPath("", "", "");
+}
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
new file mode 100644
index 0000000000..8e9bd380c3
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -0,0 +1,360 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Filtering/ComparisonInputs.h"
+#include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
+
+// Helper macros: LinkedPath
+#define SIMPL_NEW_LINKED_DC_PATH(FILTER, PTR, LINKED_PROP) LinkedPathCreationFilterParameter::CreateLinkedPath(SIMPL_BIND_GETTER(FILTER, PTR, LINKED_PROP))
+#define SIMPL_NEW_LINKED_AM_PATH(FILTER, PTR, DC_PROP, AM_PROP) LinkedPathCreationFilterParameter::CreateLinkedPath(SIMPL_BIND_GETTER(FILTER, PTR, DC_PROP), SIMPL_BIND_GETTER(FILTER, PTR, AM_PROP))
+#define SIMPL_NEW_LINKED_ADV_COMPARE(FILTER, PTR, COMP_PROP) LinkedPathCreationFilterParameter::CreateLinkedPath(SIMPL_BIND_GETTER(FILTER, PTR, COMP_PROP))
+
+// Helper macros: Index / NoIndex implementations
+#define SIMPL_NEW_DA_FROM_ADV_COMPARISON_NoIndex(Desc, Prop, LinkedComp, Category, Filter)                                                                                                             \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp))
+#define SIMPL_NEW_DA_FROM_ADV_COMPARISON_Index(Desc, Prop, LinkedComp, Category, Filter, Index)                                                                                                        \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp), Index)
+
+#define SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_Index(Desc, Prop, LinkedDcProp, LinkedAmProp, Category, Filter, Index)                                                                                       \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp), Index)
+#define SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_NoIndex(Desc, Prop, LinkedDcProp, LinkedAmProp, Category, Filter)                                                                                            \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp))
+#define SIMPL_NEW_LINKED_DATA_CONTAINER_Index(Desc, Prop, LinkedProp, Category, Filter, Index)                                                                                                         \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp), Index)
+#define SIMPL_NEW_LINKED_DATA_CONTAINER_NoIndex(Desc, Prop, LinkedProp, Category, Filter)                                                                                                              \
+  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
+                                         SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp))
+
+// Helper macros: Expansion
+#define _FP_GET_OVERRIDE6(A, B, C, D, E, F, NAME, ...) NAME
+#define _FP_GET_OVERRIDE7(A, B, C, D, E, F, G, NAME, ...) NAME
+
+// Creation Macros
+/**
+ * @brief SIMPL_NEW_AM_WITH_LINKED_DC_FP This macro is a short-form way of instantiating an instance of
+ * LinkedPathCreationFilterParameter. There are 5 required parameters and 1 optional parameter
+ * that are passed to this macro in the following order: HumanLabel, PropertyName, LinkedDcProperty (DataArrayPath or name),
+ * Category, FilterName (class name), GroupIndex (optional)
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_AM_WITH_LINKED_DC_FP("HumanLabel", PropertyName, DcName, Category, FilterName, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Matrix", CellMatrixName, DcName, FilterParameter::Parameter, GenericExample);
+ */
+#define SIMPL_NEW_AM_WITH_LINKED_DC_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE6(__VA_ARGS__, SIMPL_NEW_LINKED_DATA_CONTAINER_Index, SIMPL_NEW_LINKED_DATA_CONTAINER_NoIndex)(__VA_ARGS__))
+
+/**
+ * @brief SIMPL_NEW_DA_WITH_LINKED_AM_FP This macro is a short-form way of instantiating an instance of
+ * LinkedPathCreationFilterParameter. There are 6 required parameters and 1 optional parameter
+ * that are passed to this macro in the following order: HumanLabel, PropertyName, LinkedDcProperty (DataArrayPath or name),
+ * LinkedAmProperty, Category, FilterName (class name), GroupIndex (optional)
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_DA_WITH_LINKED_AM_FP("HumanLabel", PropertyName, DcName, AmName, Category, FilterName, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_DA_WITH_LINKED_AM_FP("Feature Id", CellMatrixName, DcName, AmName, FilterParameter::Parameter, GenericExample);
+ */
+#define SIMPL_NEW_DA_WITH_LINKED_AM_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE7(__VA_ARGS__, SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_Index, SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_NoIndex)(__VA_ARGS__))
+
+// Special cases
+/**
+ * @brief SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP This macro is a short-form way of instantiating an instance of
+ * LinkedPathCreationFilterParameter. There are 5 required parameters and 1 optional parameter
+ * that are passed to this macro in the following order: HumanLabel, PropertyName, LinkedProperty, Category,
+ * FilterName (class name), GroupIndex (optional)
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("HumanLabel", PropertyName, LinkedAdvComparisonProperty, Category, FilterName, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Mask", MaskName, AdvComparison, FilterParameter::Parameter, GenericExample);
+ */
+#define SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE6(__VA_ARGS__, SIMPL_NEW_DA_FROM_ADV_COMPARISON_Index, SIMPL_NEW_DA_FROM_ADV_COMPARISON_NoIndex)(__VA_ARGS__))
+
+/**
+ * @brief The LinkedPathCreationFilterParameter class is used by filters to instantiate an StringWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a StringWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
+{
+public:
+  SIMPL_SHARED_POINTERS(LinkedPathCreationFilterParameter)
+  SIMPL_STATIC_NEW_MACRO(LinkedPathCreationFilterParameter)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedPathCreationFilterParameter, FilterParameter)
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief The ILinkedPath interface is used for generating the linked path from either multiple string properties or a DataArrayPath property
+   */
+  class SIMPLib_EXPORT ILinkedPath
+  {
+  public:
+    /**
+     * @brief Generates a DataArrayPath to the target container
+     * @return
+     */
+    virtual DataArrayPath generatePath() = 0;
+  };
+
+  /**
+   * @brief The LinkedStringPath struct stores getters for the DataContainer and AttributeMatrix string properties.
+   * These getters are used to generate a DataArrayPath to the target container.
+   */
+  class SIMPLib_EXPORT LinkedStringPath : public ILinkedPath
+  {
+  public:
+    using GetterCallbackType = std::function<QString(void)>;
+    LinkedStringPath(GetterCallbackType getDc);
+    LinkedStringPath(GetterCallbackType getDc, GetterCallbackType getAm);
+
+    /**
+     * @brief Generates a DataArrayPath to the target container
+     * @return
+     */
+    DataArrayPath generatePath() override;
+
+  private:
+    GetterCallbackType dcGetter;
+    GetterCallbackType amGetter;
+  };
+  /**
+   * @brief The LinkedStringPath struct stores getters for the DataContainer and AttributeMatrix string properties.
+   * These getters are used to generate a DataArrayPath to the target container.
+   */
+  class SIMPLib_EXPORT LinkedMixedPath : public ILinkedPath
+  {
+  public:
+    using StringGetterCallbackType = std::function<QString(void)>;
+    using PathGetterCallbackType = std::function<DataArrayPath(void)>;
+    LinkedMixedPath(PathGetterCallbackType dc, StringGetterCallbackType am);
+    LinkedMixedPath(PathGetterCallbackType dc, PathGetterCallbackType am);
+
+    /**
+     * @brief Generates a DataArrayPath to the target container
+     * @return
+     */
+    DataArrayPath generatePath() override;
+
+  private:
+    PathGetterCallbackType dcGetter;
+    StringGetterCallbackType amGetter;
+    PathGetterCallbackType amPathGetter;
+  };
+  /**
+   * @brief The LinkedDataPath struct stores a getter for the target DataArrayPath.
+   */
+  class SIMPLib_EXPORT LinkedDataPath : public ILinkedPath
+  {
+  public:
+    using GetterCallbackType = std::function<DataArrayPath(void)>;
+    LinkedDataPath(GetterCallbackType getPath);
+    LinkedDataPath(GetterCallbackType getPath, DataArrayPathHelper::DataType targetLevel);
+
+    /**
+     * @brief Generates a DataArrayPath to the target container
+     * @return
+     */
+    DataArrayPath generatePath() override;
+
+  private:
+    GetterCallbackType pathGetter;
+    DataArrayPathHelper::DataType m_TargetPathType = DataArrayPathHelper::DataType::None;
+  };
+  /**
+   * @brief The LinkedAdvComparisonPath stores a getter for the target ComparisonInputsAdvanced DataArrayPath
+   */
+  class SIMPLib_EXPORT LinkedAdvComparisonPath : public ILinkedPath
+  {
+  public:
+    using GetterCallbackType = std::function<ComparisonInputsAdvanced(void)>;
+    LinkedAdvComparisonPath(GetterCallbackType comparison);
+
+    /**
+     * @brief Generates a DataArrayPath to the target container
+     * @return
+     */
+    DataArrayPath generatePath() override;
+
+  private:
+    GetterCallbackType compGetter;
+  };
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param DataArrayPath getter
+   * @param DataType
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedDataPath::GetterCallbackType, DataArrayPathHelper::DataType);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param QString getter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedStringPath::GetterCallbackType);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param QString getter
+   * @param QString getter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedStringPath::GetterCallbackType, LinkedStringPath::GetterCallbackType);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param DataArrayPath getter
+   * @param DataArrayPath getter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::PathGetterCallbackType);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param DataArrayPath getter
+   * @param QString getter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::StringGetterCallbackType);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param DataArrayPath dcGetter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcGetter);
+
+  /**
+   * @brief Create and return an ILinkedPath based on the given Parameters
+   * @param AdvancedComparison getter
+   * @return
+   */
+  static ILinkedPath* CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType);
+
+  /**
+   * @brief New This function instantiates an instance of the LinkedPathCreationFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_STRING_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                     ILinkedPath* linkedPath, int groupIndex = -1);
+
+  ~LinkedPathCreationFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+  /**
+   * @brief Set the ILinkedPath for determining what the parent container is
+   * @param linkedPath
+   */
+  void setLinkedPath(ILinkedPath* linkedPath);
+
+  /**
+   * @brief Returned the linked DataArrayPath
+   * @return
+   */
+  DataArrayPath getLinkedDataArrayPath() const;
+
+protected:
+  /**
+   * @brief LinkedPathCreationFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  LinkedPathCreationFilterParameter();
+
+private:
+  ILinkedPath* m_LinkedPath = nullptr;
+
+public:
+  LinkedPathCreationFilterParameter(const LinkedPathCreationFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  LinkedPathCreationFilterParameter(LinkedPathCreationFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  LinkedPathCreationFilterParameter& operator=(const LinkedPathCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
+  LinkedPathCreationFilterParameter& operator=(LinkedPathCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index 967a68e7df..b5a0e845b3 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -56,6 +56,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedBooleanFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.h
@@ -119,6 +120,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedBooleanFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.cpp
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 152d34ad70..5300c3f82f 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -38,6 +38,7 @@
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -76,7 +77,7 @@ void MakeDataContainer::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("FeatureIds", FeatureIdsArrayName, FilterParameter::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("FeatureIds", FeatureIdsArrayName, DataContainerName, CellAttributeMatrixName, FilterParameter::CreatedArray, MakeDataContainer));
   parameters.push_back(SIMPL_NEW_STRING_FP("Cell Euler Angles", CellEulerAnglesArrayName, FilterParameter::CreatedArray, MakeDataContainer));
   parameters.push_back(SIMPL_NEW_STRING_FP("Cell Phases", CellPhasesArrayName, FilterParameter::CreatedArray, MakeDataContainer));
   parameters.push_back(SIMPL_NEW_STRING_FP("Crystal Structures", CrystalStructuresArrayName, FilterParameter::CreatedArray, MakeDataContainer));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
new file mode 100644
index 0000000000..c321ab3166
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -0,0 +1,140 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "LinkedPathCreationWidget.h"
+
+#include <QtCore/QMetaProperty>
+
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QSequentialAnimationGroup>
+
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+
+#include "FilterParameterWidgetsDialogs.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationWidget::LinkedPathCreationWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+{
+  m_FilterParameter = dynamic_cast<LinkedPathCreationFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "LinkedPathCreationWidget can ONLY be used with a StringFilterParameter object");
+
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+LinkedPathCreationWidget::~LinkedPathCreationWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationWidget::setupGui()
+{
+  setupUi(this);
+
+  blockSignals(true);
+  if(getFilterParameter() != nullptr)
+  {
+    label->setText(getFilterParameter()->getHumanLabel());
+
+    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    stringEdit->setText(str, true);
+  }
+  blockSignals(false);
+
+  stringEdit->hideButtons();
+
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationWidget::beforePreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationWidget::afterPreflight()
+{
+  dataPathDisplay->setDataArrayPath(m_FilterParameter->getLinkedDataArrayPath());
+  style()->unpolish(this);
+  style()->polish(this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPathHelper::DataType LinkedPathCreationWidget::getDataType() const
+{
+  DataArrayPathHelper::DataType type = dataPathDisplay->getDataType();
+  int typei = static_cast<int>(type);
+  typei = (typei + 1) % 3;
+  type = static_cast<DataArrayPathHelper::DataType>(typei);
+  return type;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int LinkedPathCreationWidget::getDataTypei() const
+{
+  return static_cast<int>(getDataType());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void LinkedPathCreationWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, stringEdit->getText());
+  if(!ok)
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
new file mode 100644
index 0000000000..fd11fa61cb
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
@@ -0,0 +1,103 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtGui/QKeyEvent>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+
+#include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+#include "SVWidgetsLib/ui_LinkedPathCreationWidget.h"
+
+/**
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT LinkedPathCreationWidget : public FilterParameterWidget, private Ui::LinkedPathCreationWidget
+{
+  Q_OBJECT
+
+public:
+  Q_PROPERTY(int DataTypei READ getDataTypei)
+
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  LinkedPathCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~LinkedPathCreationWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief Returns the DataType for the created DataArrayPath
+   * @return
+   */
+  DataArrayPathHelper::DataType getDataType() const;
+
+  /**
+   * @brief Returns the DataType for the created DataArrayPath as an integer for CSS styling.
+   * @return
+   */
+  int getDataTypei() const;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  LinkedPathCreationFilterParameter* m_FilterParameter;
+
+public:
+  LinkedPathCreationWidget(const LinkedPathCreationWidget&) = delete;            // Copy Constructor Not Implemented
+  LinkedPathCreationWidget(LinkedPathCreationWidget&&) = delete;                 // Move Constructor Not Implemented
+  LinkedPathCreationWidget& operator=(const LinkedPathCreationWidget&) = delete; // Copy Assignment Not Implemented
+  LinkedPathCreationWidget& operator=(LinkedPathCreationWidget&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index cf86c46a74..d8a10140ef 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -32,6 +32,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     IntVec3Widget
     IntWidget
     LinkedBooleanWidget
+    LinkedPathCreationWidget
     MultiAttributeMatrixSelectionWidget
     MultiDataContainerSelectionWidget
     MultiDataArraySelectionWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/LinkedPathCreationWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/LinkedPathCreationWidget.ui
new file mode 100644
index 0000000000..7affd25710
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/LinkedPathCreationWidget.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LinkedPathCreationWidget</class>
+ <widget class="QFrame" name="LinkedPathCreationWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>612</width>
+    <height>24</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_2">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Property</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="DataArrayPathDisplay" name="dataPathDisplay" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QtSStringEdit" name="stringEdit" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </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>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtSStringEdit</class>
+   <extends>QWidget</extends>
+   <header>QtSStringEdit.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>DataArrayPathDisplay</class>
+   <extends>QWidget</extends>
+   <header>DataArrayPathDisplay.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
new file mode 100644
index 0000000000..84f3c8e35a
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
@@ -0,0 +1,406 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataArrayPathDisplay.h"
+
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "ui_DataArrayPathDisplay.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QColor DataArrayPathDisplay::GetActiveColor(DataArrayPathHelper::DataType type)
+{
+  QColor color;
+  SVStyle* style = SVStyle::Instance();
+
+  switch(type)
+  {
+  case DataArrayPathHelper::DataType::DataContainer:
+    color = style->getDataArrayPath_DataContainer_color();
+    break;
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    color = style->getDataArrayPath_AttributeMatrix_color();
+    break;
+  case DataArrayPathHelper::DataType::DataArray:
+    color = style->getDataArrayPath_DataArray_color();
+    break;
+  case DataArrayPathHelper::DataType::None:
+    break;
+  }
+
+  return color;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const QColor DataArrayPathDisplay::GetCheckedColor(DataArrayPathHelper::DataType type)
+{
+  QColor color;
+  SVStyle* style = SVStyle::Instance();
+
+  switch(type)
+  {
+  case DataArrayPathHelper::DataType::DataContainer:
+    color = style->getDataArrayPath_DataContainer_background_color();
+    break;
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    color = style->getDataArrayPath_AttributeMatrix_background_color();
+    break;
+  case DataArrayPathHelper::DataType::DataArray:
+    color = style->getDataArrayPath_DataArray_background_color();
+    break;
+  case DataArrayPathHelper::DataType::None:
+    break;
+  }
+
+  return color;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPathDisplay::DataArrayPathDisplay(QWidget* parent)
+: QWidget(parent)
+, m_Ui(new Ui::DataArrayPathDisplay)
+{
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::setupGui()
+{
+  m_Ui->setupUi(this);
+  m_Ui->dataConPathLabel->setDataType(DataArrayPathHelper::DataType::DataContainer);
+  m_Ui->attrMatPathLabel->setDataType(DataArrayPathHelper::DataType::AttributeMatrix);
+  m_Ui->dataArrayPathLabel->setDataType(DataArrayPathHelper::DataType::DataArray);
+
+  setDataArrayPath(DataArrayPath("", "", ""));
+  updateStyle();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::updateStyle()
+{
+  // Force update the styling
+  style()->unpolish(this);
+  style()->polish(this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPathHelper::DataType DataArrayPathDisplay::getDataType() const
+{
+  return m_DataType;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::setDataArrayPath(const DataArrayPath& path)
+{
+  m_Ui->dataConPathLabel->setText(path.getDataContainerName());
+  m_Ui->attrMatPathLabel->setText(path.getAttributeMatrixName());
+  m_Ui->dataArrayPathLabel->setText(path.getDataArrayName());
+
+  m_DataType = path.getDataType();
+  switch(m_DataType)
+  {
+  case DataArrayPathHelper::DataType::DataContainer:
+    m_Ui->dataConWidget->setVisible(true);
+    m_Ui->attrMatWidget->setVisible(false);
+    m_Ui->dataArrayPathLabel->setVisible(false);
+    break;
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    m_Ui->dataConWidget->setVisible(true);
+    m_Ui->attrMatWidget->setVisible(true);
+    m_Ui->dataArrayPathLabel->setVisible(false);
+    break;
+  case DataArrayPathHelper::DataType::DataArray:
+    m_Ui->dataConWidget->setVisible(true);
+    m_Ui->attrMatWidget->setVisible(true);
+    m_Ui->dataArrayPathLabel->setVisible(true);
+    break;
+  case DataArrayPathHelper::DataType::None:
+    m_Ui->dataConWidget->setVisible(false);
+    m_Ui->attrMatWidget->setVisible(false);
+    m_Ui->dataArrayPathLabel->setVisible(false);
+    break;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::setDataArrayPath(const QString& dcName, const QString& amName, const QString& daName)
+{
+  setDataArrayPath(DataArrayPath(dcName, amName, daName));
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath DataArrayPathDisplay::getDataArrayPath() const
+{
+  QString dcName;
+  QString amName;
+  QString daName;
+  switch(m_DataType)
+  {
+  case DataArrayPathHelper::DataType::DataArray:
+    daName = m_Ui->dataArrayPathLabel->text();
+    // [[fallthrough]]
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    amName = m_Ui->attrMatPathLabel->text();
+    // [[fallthrough]]
+  case DataArrayPathHelper::DataType::DataContainer:
+    dcName = m_Ui->dataConPathLabel->text();
+    break;
+  case DataArrayPathHelper::DataType::None:
+    break;
+  }
+  
+  return DataArrayPath(dcName, amName, daName);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::setFilter(AbstractFilter* filter)
+{
+  m_Filter = filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::beforePreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::afterPreflight()
+{
+  if(nullptr == m_Filter)
+  {
+    return;
+  }
+
+  if(m_Filter->getDataContainerArray())
+  {
+    return;
+  }
+
+  DataContainerArray::Pointer dca = m_Filter->getDataContainerArray();
+  bool found = false;
+  switch(getDataType())
+  {
+  case DataArrayPathHelper::DataType::DataContainer:
+    if(dca->getDataContainer(getDataArrayPath()))
+    {
+      found = true;
+    }
+    break;
+  case DataArrayPathHelper::DataType::AttributeMatrix:
+    if(dca->getAttributeMatrix(getDataArrayPath()))
+    {
+      found = true;
+    }
+    break;
+  case DataArrayPathHelper::DataType::DataArray:
+  {
+    AttributeMatrix::Pointer am = dca->getAttributeMatrix(getDataArrayPath());
+    if(am && am->getAttributeArray(getDataArrayPath().getDataArrayName()))
+    {
+      found = true;
+    }
+  }
+  break;
+  case DataArrayPathHelper::DataType::None:
+    break;
+  }
+
+  // Update StyleSheet
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataArrayPathDisplay::getXMargin() const
+{
+  ensurePolished();
+
+  // This roundabout calculation is to solve the problem where methods designed to return the margins or content rect
+  // after the stylesheet has been applied are not returning the correct result.
+  int xMargin;
+  {
+    QStyleOptionButton option;
+    option.initFrom(this);
+
+    QRect contentsRect1 = style()->subElementRect(QStyle::SE_PushButtonLayoutItem, &option, this);
+    QRect contentsRect2 = style()->subElementRect(QStyle::SE_PushButtonContents, &option, this);
+
+    int width1 = contentsRect1.width();
+    int width2 = contentsRect2.width();
+    xMargin = (width1 - width2) / 2;
+  }
+
+  return xMargin;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataArrayPathDisplay::getYMargin() const
+{
+  ensurePolished();
+
+  // This roundabout calculation is to solve the problem where methods designed to return the margins or content rect
+  // after the stylesheet has been applied are not returning the correct result.
+  int yMargin;
+  {
+    QStyleOptionButton option;
+    option.initFrom(this);
+
+    QRect contentsRect1 = style()->subElementRect(QStyle::SE_PushButtonLayoutItem, &option, this);
+    QRect contentsRect2 = style()->subElementRect(QStyle::SE_PushButtonContents, &option, this);
+
+    int height1 = contentsRect1.height();
+    int height2 = contentsRect2.height();
+    yMargin = (height1 - height2) / 2;
+  }
+
+  return yMargin;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QRect DataArrayPathDisplay::getStyledContentsRect() const
+{
+  ensurePolished();
+
+  QStyleOptionButton option;
+  option.initFrom(this);
+
+  return style()->subElementRect(QStyle::SE_PushButtonContents, &option, this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QRect DataArrayPathDisplay::getStyledBorderRect() const
+{
+  ensurePolished();
+
+  QStyleOptionButton option;
+  option.initFrom(this);
+
+  QRect styledRect = style()->subElementRect(QStyle::SE_PushButtonLayoutItem, &option, this);
+  if(styledRect.isValid())
+  {
+    return styledRect;
+  }
+
+  // return the standard rect if the styled rect is not valid
+  return rect();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QSize DataArrayPathDisplay::updatedSizeHint(QSize sizeHint) const
+{
+  int xMargin = getXMargin();
+
+  // Check Width
+  QFontMetrics fm(font());
+  int textPadding = xMargin;
+  int textWidth = fm.width(getDataArrayPath().serialize()) + textPadding;
+  int minWidth = textWidth + xMargin + (2 * sizeHint.height());
+  if(sizeHint.width() < minWidth)
+  {
+    sizeHint.setWidth(minWidth);
+  }
+
+  return sizeHint;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QSize DataArrayPathDisplay::minimumSizeHint() const
+{
+  ensurePolished();
+  QSize minHint = updatedSizeHint(QWidget::minimumSizeHint());
+
+  return minHint;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QSize DataArrayPathDisplay::sizeHint() const
+{
+  ensurePolished();
+  QSize hint = updatedSizeHint(QWidget::sizeHint());
+
+  return hint;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataArrayPathDisplay::getPropertyName()
+{
+  return m_PropName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataArrayPathDisplay::setPropertyName(QString propName)
+{
+  m_PropName = propName;
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
new file mode 100644
index 0000000000..2bee3ce764
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
@@ -0,0 +1,172 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QSharedPointer>
+#include <QtWidgets/QWidget>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+
+namespace Ui
+{
+  class DataArrayPathDisplay;
+}
+
+/**
+* @class DataArrayPathDisplay DataArrayPathDisplay.h
+* SVWidgetsLib/Widgets/DataArrayPathDisplay.h
+* @brief This class handles DataArrayPath selection and mouse over signals for filter parameter widgets.
+*/
+class DataArrayPathDisplay : public QWidget
+{
+  Q_OBJECT
+
+public:
+
+  static const QColor GetActiveColor(DataArrayPathHelper::DataType type);
+  static const QColor GetCheckedColor(DataArrayPathHelper::DataType type);
+
+  DataArrayPathDisplay(QWidget* parent = nullptr);
+  ~DataArrayPathDisplay() override = default;
+
+  /**
+   * @brief Sets the DataArrayPath displayed
+   * @param dcName
+   * @param amName
+   * @param daName
+   */
+  void setDataArrayPath(const QString& dcName, const QString& amName = "", const QString& daName = "");
+
+  /**
+   * @brief Sets the DataArrayPath displayed
+   * @param dataArrayPath
+   */
+  void setDataArrayPath(const DataArrayPath& dataArrayPath);
+
+  /**
+   * @brief Returns the DataArrayPath displayed.
+   * @return
+   */
+  DataArrayPath getDataArrayPath() const;
+
+  /**
+   * @brief Returns the DataType for the displayed DataArrayPath
+   * @return
+   */
+  DataArrayPathHelper::DataType getDataType() const;
+
+  /**
+  * @brief Sets the filter the selection widget operates on
+  * @param filter
+  */
+  void setFilter(AbstractFilter* filter);
+
+  /**
+   * @brief Handles operations performed before Preflight()
+   */
+  void beforePreflight();
+
+  /**
+  * @brief Checks path validity
+  */
+  void afterPreflight();
+
+  /**
+  * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
+  */
+  QSize minimumSizeHint() const override;
+
+  /**
+   * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
+   */
+  QSize sizeHint() const override;
+
+  /**
+  * @brief Returns the property name set for this widget
+  * @return
+  */
+  QString getPropertyName();
+
+  /**
+  * @brief Sets the property name
+  * @param propName
+  */
+  void setPropertyName(QString propName);
+
+protected:
+  /**
+   * @brief Performs initial setup for the GUI
+   */
+  void setupGui();
+
+  void updateStyle();
+
+  /**
+   * @brief Returns the X margin
+   * @return
+   */
+  int getXMargin() const;
+
+  /**
+   * @brief Returns the Y margin
+   * @return
+   */
+  int getYMargin() const;
+
+  /**
+   * @brief Returns the contents rect after styling.
+   * @return
+   */
+  QRect getStyledContentsRect() const;
+
+  /**
+   * @brief Returns the contents rect after styling.
+   * @return
+   */
+  QRect getStyledBorderRect() const;
+
+  /**
+   * @brief Returns the updated size hint based on the superclass's size hint
+   */
+  QSize updatedSizeHint(QSize sizeHint) const;
+
+private:
+  AbstractFilter* m_Filter = nullptr;
+  QString m_PropName;
+  QSharedPointer<Ui::DataArrayPathDisplay> m_Ui;
+  DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::DataArray;
+};
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 2454658b84..e9244e6b1a 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -130,6 +130,7 @@ const QColor DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::D
     color = style->getDataArrayPath_DataArray_color();
     break;
   case DataArrayPathHelper::DataType::None:
+    color = style->getDataArrayPath_Invalid_color();
     break;
   }
 
@@ -156,6 +157,7 @@ const QColor DataArrayPathSelectionWidget::GetCheckedColor(DataArrayPathHelper::
     color = style->getDataArrayPath_DataArray_background_color();
     break;
   case DataArrayPathHelper::DataType::None:
+    color = style->getDataArrayPath_Invalid_background_color();
     break;
   }
 
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
new file mode 100644
index 0000000000..174e9cf2f9
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
@@ -0,0 +1,180 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataPathLabel.h"
+
+#include <algorithm>
+
+#include <QtWidgets/QStyleOptionFrame>
+#include <QtGui/QPainter>
+
+#include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QColor DataPathLabel::GetBackgroundColor(DataArrayPathHelper::DataType type)
+{
+  // Remain consistent with DataArrayPathSelectionWidget
+  return DataArrayPathSelectionWidget::GetActiveColor(type);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QColor DataPathLabel::GetInactiveColor()
+{
+  // Remain consistent with DataArrayPathSelectionWidget
+  return DataArrayPathSelectionWidget::GetActiveColor(DataArrayPathHelper::DataType::None);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataPathLabel::DataPathLabel(QWidget* parent)
+: QLabel(parent)
+{
+  setAttribute(Qt::WA_MacShowFocusRect, false);
+  //setAutoFillBackground(true);
+  //setFrameShape(QFrame::StyledPanel);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataPathLabel::~DataPathLabel() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPathHelper::DataType DataPathLabel::getDataType() const
+{
+  return m_DataType;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataPathLabel::setDataType(DataArrayPathHelper::DataType type)
+{
+  m_DataType = type;
+  ensurePolished();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataPathLabel::getDataTypei() const
+{
+  return static_cast<int>(m_DataType);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataPathLabel::getYMargin() const
+{
+  ensurePolished();
+
+  // This roundabout calculation is to solve the problem where methods designed to return the margins or content rect
+  // after the stylesheet has been applied are not returning the correct result.
+  int yMargin;
+  {
+    QStyleOptionFrame option;
+    option.initFrom(this);
+
+    QRect contentsRect1 = style()->subElementRect(QStyle::SE_PushButtonLayoutItem, &option, this);
+    QRect contentsRect2 = style()->subElementRect(QStyle::SE_PushButtonContents, &option, this);
+
+    int height1 = contentsRect1.height();
+    int height2 = contentsRect2.height();
+    yMargin = (height1 - height2) / 2;
+  }
+
+  return yMargin;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QRect DataPathLabel::getStyledContentsRect() const
+{
+  ensurePolished();
+
+  QStyleOptionFrame option;
+  option.initFrom(this);
+
+  return style()->subElementRect(QStyle::SE_ShapedFrameContents, &option, this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QRect DataPathLabel::getStyledBorderRect() const
+{
+  ensurePolished();
+
+  QStyleOptionFrame option;
+  option.initFrom(this);
+
+  QRect styledRect = style()->subElementRect(QStyle::SE_LabelLayoutItem, &option, this);
+  if(styledRect.isValid())
+  {
+    return styledRect;
+  }
+
+  // return the standard rect if the styled rect is not valid
+  return rect();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//void DataPathLabel::paintEvent(QPaintEvent* event)
+//{
+//  const int radius = 4;
+//  const int rectWidth = getStyledBorderRect().width() - margin() * 2;
+//  const int yMargin = std::max(getYMargin(), 0);
+//
+//  QRect fillRect(margin(), yMargin / 2, rectWidth, rectWidth - yMargin);
+//  QColor fillColor = isEnabled() ? GetBackgroundColor(getDataType()) : GetInactiveColor();
+//
+//  QPainter painter{ this };
+//  painter.setPen(Qt::PenStyle::NoPen);
+//  painter.setBrush(fillColor);
+//  painter.drawRoundedRect(rect(), radius, radius);
+//  painter.drawRect(fillRect.x(), fillRect.y(), fillRect.width(), fillRect.height());
+//
+//  // Call parent class's paint event
+//  QLabel::paintEvent(event);
+//}
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.h b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
new file mode 100644
index 0000000000..2dec40bbc1
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
@@ -0,0 +1,72 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtGui/QColor>
+#include <QtCore/QRect>
+#include <QtWidgets/QLabel>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+/**
+ * @brief The SVDataPathLabel class
+ */
+class SVWidgetsLib_EXPORT DataPathLabel : public QLabel
+{
+  Q_OBJECT
+
+public:
+  static QColor GetBackgroundColor(DataArrayPathHelper::DataType type);
+  static QColor GetInactiveColor();
+
+  Q_PROPERTY(int DataTypei READ getDataTypei)
+
+  DataPathLabel(QWidget* parent = nullptr);
+  ~DataPathLabel() override;
+
+  DataArrayPathHelper::DataType getDataType() const;
+  void setDataType(DataArrayPathHelper::DataType type);
+  int getDataTypei() const;
+
+protected:
+  int getYMargin() const;
+  QRect getStyledContentsRect() const;
+  QRect getStyledBorderRect() const;
+  //void paintEvent(QPaintEvent* event) override;
+
+private:
+  DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
+};
diff --git a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
index 38b4735268..20c449add9 100644
--- a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
+++ b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
@@ -185,7 +185,7 @@ class SVWidgetsLib_EXPORT SVTabWidget : public QTabWidget
 
 
 /**
-* @brief The SVTabWidget class
+* @brief The SVDialog class
 */
 class SVWidgetsLib_EXPORT SVDialog : public QDialog
 {
@@ -198,7 +198,7 @@ class SVWidgetsLib_EXPORT SVDialog : public QDialog
 };
 
 /**
- * @brief The SVTabWidget class
+ * @brief The SVFrame class
  */
 class SVWidgetsLib_EXPORT SVFrame : public QFrame
 {
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index f0fc568b63..379c176450 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -431,6 +431,9 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
     SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataArray_color)
     Q_PROPERTY(QColor DataArrayPath_DataArray_color READ getDataArrayPath_DataArray_color WRITE setDataArrayPath_DataArray_color)
 
+    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_Invalid_color)
+    Q_PROPERTY(QColor DataArrayPath_Invalid_color READ getDataArrayPath_Invalid_color WRITE setDataArrayPath_Invalid_color)
+
     SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataContainer_background_color)
     Q_PROPERTY(QColor DataArrayPath_DataContainer_background_color READ getDataArrayPath_DataContainer_background_color WRITE setDataArrayPath_DataContainer_background_color)
 
@@ -440,6 +443,9 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
     SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataArray_background_color)
     Q_PROPERTY(QColor DataArrayPath_DataArray_background_color READ getDataArrayPath_DataArray_background_color WRITE setDataArrayPath_DataArray_background_color)
 
+    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_Invalid_background_color)
+    Q_PROPERTY(QColor DataArrayPath_Invalid_background_color READ getDataArrayPath_Invalid_background_color WRITE setDataArrayPath_Invalid_background_color)
+
     SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_normal)
     Q_PROPERTY(QColor DataArrayPath_border_normal READ getDataArrayPath_border_normal WRITE setDataArrayPath_border_normal)
 
@@ -451,6 +457,12 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
 
     SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_drag_disabled)
     Q_PROPERTY(QColor DataArrayPath_border_drag_disabled READ getDataArrayPath_border_drag_disabled WRITE setDataArrayPath_border_drag_disabled)
+
+    SIMPL_INSTANCE_PROPERTY(QColor, DataPathLabel_color)
+    Q_PROPERTY(QColor DataPathLabel_color READ getDataPathLabel_color WRITE setDataPathLabel_color)
+
+    SIMPL_INSTANCE_PROPERTY(QColor, DataPathLabel_Disabled_color)
+    Q_PROPERTY(QColor DataPathLabel_Disabled_color READ getDataPathLabel_Disabled_color WRITE setDataPathLabel_Disabled_color)
     
     SIMPL_INSTANCE_PROPERTY(QColor, SIMPLViewPipelineDockWidgetTitle_inactive_background_color)
     Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_background_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_background_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_background_color)
diff --git a/Source/SVWidgetsLib/Widgets/SourceList.cmake b/Source/SVWidgetsLib/Widgets/SourceList.cmake
index 28510fd20c..7ac87818a3 100755
--- a/Source/SVWidgetsLib/Widgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/Widgets/SourceList.cmake
@@ -18,7 +18,9 @@ set(SVWidgetsLib_Widgets_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksToolboxWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksTreeView.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DREAM3DListWidget.h
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathDisplay.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathSelectionWidget.h
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataPathLabel.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerArrayWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryToolboxWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryTreeWidget.h
@@ -68,7 +70,9 @@ set(SVWidgetsLib_Widgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksModel.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksToolboxWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksTreeView.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataPathLabel.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DREAM3DListWidget.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathDisplay.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathSelectionWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerArrayWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryToolboxWidget.cpp
@@ -103,6 +107,7 @@ set(SVWidgetsLib_Widgets_SRCS
 
 set(SVWidgetsLib_Widgets_UIS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/BookmarksToolboxWidget.ui
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/DataArrayPathDisplay.ui
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/DataContainerArrayWidget.ui
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/FilterInputWidget.ui
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/FilterLibraryToolboxWidget.ui
diff --git a/Source/SVWidgetsLib/Widgets/UI_Files/DataArrayPathDisplay.ui b/Source/SVWidgetsLib/Widgets/UI_Files/DataArrayPathDisplay.ui
new file mode 100644
index 0000000000..03caea0aea
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/UI_Files/DataArrayPathDisplay.ui
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DataArrayPathDisplay</class>
+ <widget class="QWidget" name="DataArrayPathDisplay">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>297</width>
+    <height>21</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Data Path</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="dataConWidget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="DataPathLabel" name="dataConPathLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>DataContainer</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="margin">
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="dataContDividerLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>/</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="margin">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="attrMatWidget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="DataPathLabel" name="attrMatPathLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>AttributeMatrix</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+        <property name="margin">
+         <number>4</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="attrDividerLabel">
+        <property name="font">
+         <font>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string>/</string>
+        </property>
+        <property name="margin">
+         <number>2</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="DataPathLabel" name="dataArrayPathLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>DataArray</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="margin">
+      <number>4</number>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>DataPathLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">SVWidgetsLib/Widgets/DataPathLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

From c382c6119e4d74b1d1974dc2537b1c2cb0d5ae17 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Wed, 1 May 2019 12:17:37 -0400
Subject: [PATCH 078/397] Add DataStructure context menu (#340)

* Add DataStructure context menu
* Added DataStructure search feature
* Added Collapse All and Expand All buttons to the DataStructure
---
 Resources/SIMPL.qrc                           |   4 +
 Resources/SIMPL/icons/images/collapse_all.png | Bin 0 -> 1166 bytes
 .../SIMPL/icons/images/collapse_all@2x.png    | Bin 0 -> 1329 bytes
 Resources/SIMPL/icons/images/expand_all.png   | Bin 0 -> 1257 bytes
 .../SIMPL/icons/images/expand_all@2x.png      | Bin 0 -> 1444 bytes
 Resources/SIMPL/icons/svg/collapse_all.svg    |  19 +++
 Resources/SIMPL/icons/svg/expand_all.svg      |  22 +++
 .../Widgets/DataStructureProxyModel.cpp       |  75 +++++++++
 .../Widgets/DataStructureProxyModel.h         |  66 ++++++++
 .../Widgets/DataStructureTreeView.cpp         | 150 +++++++++++++++++-
 .../Widgets/DataStructureTreeView.h           |  54 ++++++-
 .../Widgets/DataStructureWidget.cpp           | 101 +++++-------
 Source/SVWidgetsLib/Widgets/SourceList.cmake  |   2 +
 .../Widgets/UI_Files/DataStructureWidget.ui   | 128 ++++++++++++++-
 14 files changed, 553 insertions(+), 68 deletions(-)
 create mode 100644 Resources/SIMPL/icons/images/collapse_all.png
 create mode 100644 Resources/SIMPL/icons/images/collapse_all@2x.png
 create mode 100644 Resources/SIMPL/icons/images/expand_all.png
 create mode 100644 Resources/SIMPL/icons/images/expand_all@2x.png
 create mode 100644 Resources/SIMPL/icons/svg/collapse_all.svg
 create mode 100644 Resources/SIMPL/icons/svg/expand_all.svg
 create mode 100644 Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
 create mode 100644 Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h

diff --git a/Resources/SIMPL.qrc b/Resources/SIMPL.qrc
index e5a67385db..fd8eba37e2 100644
--- a/Resources/SIMPL.qrc
+++ b/Resources/SIMPL.qrc
@@ -27,6 +27,10 @@
     <file>SIMPL/StyleSheets/Default.json</file>
 
     <!-- Icon Resources -->
+    <file>SIMPL/icons/images/expand_all.png</file>
+    <file>SIMPL/icons/images/expand_all@2x.png</file>
+    <file>SIMPL/icons/images/collapse_all.png</file>
+    <file>SIMPL/icons/images/collapse_all@2x.png</file>
     <file>SIMPL/icons/images/add.png</file>
     <file>SIMPL/icons/images/add@2x.png</file>
     <file>SIMPL/icons/images/arrow_down.png</file>
diff --git a/Resources/SIMPL/icons/images/collapse_all.png b/Resources/SIMPL/icons/images/collapse_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2a4da0c57a902d6e2d9ef021a19e6b19ed7369b
GIT binary patch
literal 1166
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x}o+V3f`bi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES
zs$i;Ts%M~N$E9FXl#*r@<l+X^4CL7=Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s
z=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0PNgrg1KGYVVbM@iw
z1#;j%PR#>)vk2%PDX-P9fWg$1>FgX(9OUk#;OXjYW@u?<rfZ~U$iSd6v2@~n?dCv<
z<MwT8_OoVjpFDbLhmqmd9f8|SvNF$3d6-uHw*A(#x3%$^J45qCRrCJrdZ7OxY-d=P
z$H`vl>qmHBf88_t)+F2I&u!*^wtZe{_1rR{J8kNmdj=dk_bha6s=FSOb1$`iVWZxh
zEss02cUj5twXevW|NTnj$7{(~SJl3Y&yMtZ#dXD$vtM&n8izku`!$}ck7OV6sS3vn
z*$Kb9{-o(p`LuZ&pI0A!X;dG*##Nbd!&dIymqO>PNK#$=wB_m39mO|8pMJNy<{dTp
z=S|5@+edd_xNtl=epE!5<%8jo6=&>hDkLX}nto#U{&{(g$2z6WUW~n|mr@K~h?j=0
zQdeE(;(zKy(1u_Cx390tx)HtZ-mCUw>6dHXv;H;{+3xfC^$C;i;{pF!rvLQ%cS^CR
zrej~|#XIZ|ZZv#e-8Jn-Yq#%<nvlm)dsMD=-wx8Oux{NZVUfR}a^aoL_iO#+6n5#w
zm-1HszM%eGw%cAYH~rWJYepAf%H%BYh%9Dc&{GCs#)_r(Wxy!v_H=O!@#uUz#W4F&
zfJm!<d=gJyZp#EkkxeTmH`^ar+Z}v#CEumH_ZJkd-LWmW^_|j<wap^z?Def8u7aE*
zo=yh2mzJ{SBt6<JHhtdPdB5NN%yas5PCzL%G@nE9d189m$<o-paqI0jCbnOC`9+zb
zZf{(0>+vMR0-5iO3Nj1~bN$#SpKRe$=u*;}%EfSiJ;Ow5`^u144|n&7ce}3oa4@0a
zXU)5-b_|M74i(O+*nWE{7h6M(UB8Rc#-|$@E@W+uGi!UjYx=BZj)5YpK0GYoIBZa3
z$IWmv=Udj!m_wU%)=xZ{@{Q}61>Yi#BoistZ+pY9y#8t+*S~Tb8-wShfVE-e-#AN^
zmi}X0&i<p$#8Dt%^;ISI*=N<3UDmX1NR&{SeDZ~(*(WJ(wl!heTW-HS;plsrsdnD;
z?P6aTbxu3&zkfe_x5CLyZ=MwG^pCyX>u?}Hb=I@ul_9(CU2*^2b?Rx+gTJL))MuPc
zEAKw~=<c?+*X<c^Y^z<r>eX%k`^+AbN&+@0a4f9l56}?dW115auTfPjz%l8_Gf*+&
M>FVdQ&MBb@0KiK0!2kdN

literal 0
HcmV?d00001

diff --git a/Resources/SIMPL/icons/images/collapse_all@2x.png b/Resources/SIMPL/icons/images/collapse_all@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..5051e61d8a7e44f62913ca4d43d821536859eeda
GIT binary patch
literal 1329
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FiK~JM3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~itr6kaLzAE
zRWQ{v)iY4C<5I9GN=dT{a&d!d2J&o`GD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+
zbb%^#i!1X=5-W7`ij_e|K+JGSElw`VEGWs$&r<-InV6JcT4JlDqz|%0A8HHGx%zPT
z0y%IWr{)2@Sp@Wtl-KH4z+h_1baoCX4sv%=@N{)HGqf}_(>2mFWMI&kSUT~(c5|S_
zar-tk`&qNNPaeIr!^m*!j=*guS(#_2JWQ*8+kWfW+uHcdouPT6s(F8QJ<xv;wll2D
z<7BV&^&`BmzwViRYm)8q=Qi^{+di+fdTyD}oi=sOJp+!NdltGj)m@LtxtChMuu*T$
zmd731yR78++E--G|9&O%<F(|gt7_lHXGeOy;<{qW*{``Ojl-X-{Tk2JN3sw3RE6V(
z?1bN4f6{cQeA+yX&#RBVG^&qY<EqTKVJr9UOQCaCB&jZb+Vb@2j^dl4Prut;^NyPQ
z^QL5{?W4OdTsR&bKPn>3^1<-PiZgaL6_OJ~O+T@F|Gd1$W1Z4wFUH=~ODP5~#7je0
zsjDt?@jrDUXv44n+t*iR-H2Xy?^XM;^vgBxS$~^}Z1?&6`h-dM@qqs<(|>yXJEhoD
z)3Gn~;vMz}HyS>#?wWR^wcGbaO~~V@Jt|kbZwF~sShsGIu*hFfx$w^B`?Y>@3cK{;
zOL?n*Ur>K8+ikCyn||zqHKPkKWpWmHL>4nJ#JGVlqsSCzM+OEaJx>?Mkc`H+GwfI2
z3Xo{8*KA#&(RJitcZ6_hfuTU&+&h0bSlb^xy0kLhLB{nsU!7=aiROyc9p2hr9~2%1
zNbx8!W?DTh>b`zExyWSMS>uzI?=9cIKUn-n_`u_WGVyIuYs(Y_DpDld#10$myZ-v?
zd4><y-l;Vy)SO8%dVk~SqV&CS_Dlt8362~G%XXK_bhSn3uz61UCsC|pFxSses&`JF
zv+KeD3&D!w$>+jbUdd)`za7uw_~S#(8I!Z^SF>7k%(_FgO6Qg^eEV&?>+ZXom0FDn
z20!8^EqT4PhSm4-9PWq}tGaIHJhKqty_g}gH0b5}QgO~4GwGh=$+s8kDbDl>;{0Ph
zeaHRx|E<DPW~rr1u!*=fF473+z4EeTL8esc-^mQ;KX0oK+tBh@ue-2_okLNf#emzz
z*+$M?Z~Eq~-&_*x<|i9SSn!o{b}hOg_Ti7}H`Y7H#0#Y359HP`ZvV)7r|lKLuhm?)
ztx>6$He7$5Xf)H{Ciemnj#j4=&p-P}@wGdv{f?;k$59#A@QOp0kA20eQ%e@Ed+qaW
z;{u@w9kC1(DIe*}hYDp<BH0?m<ri4inN{Ul^f@mLvb3)M&a^DEN#N7tpEK6I=6?P4
zE;ob4wJg(zcb@$Js9ECObySH#L545*>ixM5I;T5al&*X&SKkn$xBsKf|1YV9Hgfg*
z!s^SJcHey$y!qxIujuzbz29)}ID1l7z*X>R(a&XyLY*ydx9W3sEPA1FLHFYy!B2&=
Z?{m)RSS#`EY7wZU^K|udS?83{1ORD=J_`T<

literal 0
HcmV?d00001

diff --git a/Resources/SIMPL/icons/images/expand_all.png b/Resources/SIMPL/icons/images/expand_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..da6842ea5e9eb27af8df629e8f17a75b7ab72e92
GIT binary patch
literal 1257
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x}o+V3f`bi71Ki^|4CM&(%vz$xlkv
ztH><?$}=$7*jE%JCTFLXC?ut(XXe=|z2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdi
zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES
zs$i;Ts%M~N$E9FXl#*r@<l+X^4CL7=Wt5Z@Sn2DRmzV368|&p4rRy77T3YHG80i}s
z=>k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0PNgrg1KGYVVbM@iw
z1#;j%PR#>)vk2%PDX-P9fWg$1>FgX(9OUk#;OXjYW@u?<rfZ~U$iSd6v2@~n?dCv<
z<MwT8_OoVjpFDbLhmqmd9f8|SvNF$3d6-uHw*A(#x3%$^J45qCRrCJrdZ7OxY-d=P
z$H`vl>qmHBf88_t)+F2I&u!*^wtZe{_1rR{J8kNmdj=dk_bha6s=FSOb1$`iVWZxh
zEss02cUj5twXevW|NTnj$7{(~SJl3Y&yMtZ#dXD$vtM&n8izku`!$}ck7OV6sS3vn
z*$Kb9{-o(p`LuZ&pI0A!X;dG*##Nbd!&dIymqO>PNK#$=wB_m39mO|8pMJNy<{dTp
z=S|5@+edd_xNtl=epE!5<%8jo6=&>hDkLX}nto#U{&{(g$2z6WUW~n|mr@K~h?j=0
zQdeE(;(zKy(1u_Cx390tx)HtZ-mCUw>6dHXv;H;{+3xfC^$C;i;{pF!rvLQ%cS^CR
zrej~|#XIZ|ZZv#e-8Jn-Yq#%<nvlm)dsMD=-wx8Oux{NZVUfR}a^aoL_iO#+6n5#w
zm-1HszM%eGw%cAYH~rWJYepAf%H%BYh%9Dc&{GCs#)_r(WxyzU=IP=X;?a3@%Kp{2
z0z{7Qcblx<<SeboGSO+;>R`5T*O*-vwuP&jOTPOH^kfI#xwX>cq*l}2T@f-eC1ux@
zw4|6^d)zM1;(N=zHLK?Ozh8OJtNHGq-)r7p@j%HnFwTJI^O4+VlX7myO+Wp#+;02A
z43l4C4fXr)2e)q4;qH69kD-8_!C~{wBPm7;nK+snoE9=LSTKfYO`YB{!QB4T?i@33
z(R**p4CkMp`-|m(!I{g49~NBC+Pb2NQDLf=q5y|Xr5(eHt6B1LJh!*af4Pg#bJB`K
z)qCZ54qJSzWl%W%so3{&!mMSNJB}vxb3L=*Yf@Nn|NZ>8*8W%Wwi`<IuJGe!SfsHi
zLMQHx@s-XgyLK&W5okG_s59N0r~R-!zlYjnkL8yoc-YJt|NRpF`#b-@XB)4jlY-fs
z9T^&QPOrHBx-WihnBiQ%myB`i#TN#gSZOQA-|+tTzs=`2y~#C?SR0mMBIP&NL&bsP
zV1<p_^2>!avDeSD{rdZFaq}DopUXB}lT<ic1TtooJ&6xe5wbk;_~ZK5UvF7(|A@^s
zoBe%f%)5UJ_w91seV4B-F=6-JUFV*D{<-=8`qkzEp`xo+#YrE|F{|Dhp<@?4?dwFY
z4-t{mzD5O3@!$W8&q3tq?54_j<!`MUeAJ4CAMAfE&AD|}?JUWUvp^-3r>mdKI;Vst
E02_uO#sB~S

literal 0
HcmV?d00001

diff --git a/Resources/SIMPL/icons/images/expand_all@2x.png b/Resources/SIMPL/icons/images/expand_all@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..34e031ef33095e0d5f90b174adca11ead19e9466
GIT binary patch
literal 1444
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezr3(FiK~JM3hAM`dB6B=jtV<<R_)-
zRpb@`<rx@k>?;Zqle1Gx6p~WYGxKbf-tXS8q>!0ns}yePYv5bpoSKp8QB{;0T;&&%
zT$P<{nWAKG$7NGt1vDTxwIorYA~z?m*s8)-32d$vkPQ;nS5g2gDap1~itr6kaLzAE
zRWQ{v)iY4C<5I9GN=dT{a&d!d2J&o`GD=Dctn~HE%ggo3jrH=2()A53EiLs8jP#9+
zbb%^#i!1X=5-W7`ij_e|K+JGSElw`VEGWs$&r<-InV6JcT4JlDqz|%0A8HHGx%zPT
z0y%IWr{)2@Sp@Wtl-KH4z+h_1baoCX4sv%=@N{)HGqf}_(>2mFWMI&kSUT~(c5|S_
zar-tk`&qNNPaeIr!^m*!j=*guS(#_2JWQ*8+kWfW+uHcdouPT6s(F8QJ<xv;wll2D
z<7BV&^&`BmzwViRYm)8q=Qi^{+di+fdTyD}oi=sOJp+!NdltGj)m@LtxtChMuu*T$
zmd731yR78++E--G|9&O%<F(|gt7_lHXGeOy;<{qW*{``Ojl-X-{Tk2JN3sw3RE6V(
z?1bN4f6{cQeA+yX&#RBVG^&qY<EqTKVJr9UOQCaCB&jZb+Vb@2j^dl4Prut;^NyPQ
z^QL5{?W4OdTsR&bKPn>3^1<-PiZgaL6_OJ~O+T@F|Gd1$W1Z4wFUH=~ODP5~#7je0
zsjDt?@jrDUXv44n+t*iR-H2Xy?^XM;^vgBxS$~^}Z1?&6`h-dM@qqs<(|>yXJEhoD
z)3Gn~;vMz}HyS>#?wWR^wcGbaO~~V@Jt|kbZwF~sShsGIu*hFfx$w^B`?Y>@3cK{;
zOL?n*Ur>K8+ikCyn||zqHKPkKWpWmHL>4nJ#JGVlqsSCzM+OF_g`O^sAsLNtXYS8_
zlpt|@za^iORM*la&bc2ZMYQXQI=#NK@-O!(M|Sh+%nz64v8sE^=6_hfq4?yDr)+Pd
zN_T2cGh5hkqVS-A$BLLdizuzmd)aaIPtTnfnfJU>et&$;y(gwjg6*8UKRkN0=t$w6
zdn!jKJlgf{`{vD?&og|m%Mo@I*mN@G)8Qv66F-0XvW30j+yU;k#08gM26QVW*4D~)
zE#f({g7?bn(va1mx6EALynFYHXV2`D>i&X@@)v|?)e5pae0+Px^UA{5>l^p(?R8Ny
zlr3e*xqa;F)vFh5CN@r;I<?j{aM|)AmSvfjq$?gie8_k<ZE}<dXLfeBg@whB?7I<c
zx89m%ZH>wZe5}x=G_kQhT{wHzx9o_C&ntUg?+OSNUA4+DG+<{;Tjs1IU)QrmOyjLx
zGed>PcplGvIRhT%wnQHv0ZwUYX^*8r3$Oj+xpVjK!(YE<MP0F2u}bQe!xQt5mk#Xd
z+{5_l@fMA)6VE?0Z}eK)<hI!H_AHJpW}VYcla@3}od3Kfx3lvPhc54#*-INMolC?g
zsc_!RF*7(`I7h#%rl#lc;ll^2d@mPNS6jCoxhNp{pi<7-+WLs^_HEk)`j0agPp)GX
z{wdhChjEc$kqmo(e}ALpwA9+im)@2o-Y!enn;MzyCBr+hF>H0K(?Wq6-fELI#JZU`
zo<8k;=gyrAs}IkgKjUSI6a!QIg24H$%XkkPSXf$0&Wf*Kp7;EqL63ZX^0d^gaqGnI
zF*MZaO&4xc{olX)g3ielBZh{nS3?(7Wig*We|}$mhRku!yZUqel*PIQuLnzCD3x8l
zeEF8#xSjj=|39|r&FjO9?!W&p6S}`Z`O53Bc5~;?uUB2$|3@uOYKHkfTZPj`eSLjt
vT1myl#$RqZFmKWc=A5NEQGTK7=V#`8e^<@8d`x~fsBrak^>bP0l+XkKAiRW9

literal 0
HcmV?d00001

diff --git a/Resources/SIMPL/icons/svg/collapse_all.svg b/Resources/SIMPL/icons/svg/collapse_all.svg
new file mode 100644
index 0000000000..ff3f05a539
--- /dev/null
+++ b/Resources/SIMPL/icons/svg/collapse_all.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(0.203821,0,0,0.203821,4.9344,-1.48065)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.111,84.889L82.889,84.889L82.889,16.111L16.111,16.111L16.111,84.889Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.203821,0,0,0.203821,2.50191,0.929834)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.111,16.111L16.111,84.889L82.889,84.889L82.889,16.111L16.111,16.111Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.221606,0,0,0.221156,-1.43767,3.09596)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.641,84.348L82.359,84.348L82.359,16.652L16.641,16.652L16.641,84.348Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.190381,0,0,0.37921,4.10599,10.093)">
+        <rect x="4" y="8" width="49" height="6" style="fill:rgb(220,220,220);"/>
+    </g>
+</svg>
diff --git a/Resources/SIMPL/icons/svg/expand_all.svg b/Resources/SIMPL/icons/svg/expand_all.svg
new file mode 100644
index 0000000000..27ad8095e8
--- /dev/null
+++ b/Resources/SIMPL/icons/svg/expand_all.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+    <g transform="matrix(0.203821,0,0,0.203821,4.9344,-1.48065)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.111,84.889L82.889,84.889L82.889,16.111L16.111,16.111L16.111,84.889Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.203821,0,0,0.203821,2.50191,0.929834)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.111,16.111L16.111,84.889L82.889,84.889L82.889,16.111L16.111,16.111Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.221606,0,0,0.221156,-1.43767,3.09596)">
+        <rect x="11" y="11" width="77" height="79" style="fill:rgb(55,55,55);"/>
+        <path d="M88,90L11,90L11,11L88,11L88,90ZM16.641,84.348L82.359,84.348L82.359,16.652L16.641,16.652L16.641,84.348Z" style="fill:rgb(188,188,188);"/>
+    </g>
+    <g transform="matrix(0.190381,0,0,0.37921,4.10599,10.093)">
+        <rect x="4" y="8" width="49" height="6" style="fill:rgb(218,218,218);"/>
+    </g>
+    <g transform="matrix(1.16575e-17,-0.190381,0.37921,2.32199e-17,5.36053,19.6902)">
+        <rect x="4" y="8" width="49" height="6" style="fill:rgb(220,220,220);"/>
+    </g>
+</svg>
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
new file mode 100644
index 0000000000..1040ed3eda
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
@@ -0,0 +1,75 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataStructureProxyModel.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataStructureProxyModel::DataStructureProxyModel(QObject* parent)
+: QSortFilterProxyModel(parent)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataStructureProxyModel::~DataStructureProxyModel() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataStructureProxyModel::filterAcceptsRow(int row, const QModelIndex& parent) const
+{
+  if(QSortFilterProxyModel::filterAcceptsRow(row, parent))
+  {
+    return true;
+  }
+
+  // Show this row if any of its children should be shown
+  const QAbstractItemModel* model = sourceModel();
+  if(nullptr != model)
+  {
+    const QModelIndex index = model->index(row, 0, parent);
+    const int rows = model->rowCount(index);
+    for(int row = 0; row < rows; row++)
+    {
+      if(filterAcceptsRow(row, index))
+      {
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h
new file mode 100644
index 0000000000..6ffd29b8f4
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h
@@ -0,0 +1,66 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QSortFilterProxyModel>
+
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+/**
+ * @class DataStructureProxyModel DataStructureProxyModel.h SVWidgetsLib/Widgets/DataStructureProxyModel.h
+ * @brief The DataStructureProxyModel class is used for searching the Data Structure.
+ * Items are shown if they match the requirements or one of their children do.
+ * This is done so that if the user is searching for a DataArray, the DataContainer
+ * and AttributeMatrix the DataArray is nested within are visible.  If any of its
+ * parent containers are hidden, so is the target DataArray.  This behavior is not
+ * consistent with QSortFilterProxyModel from which this class is derived.
+ */
+class SVWidgetsLib_EXPORT DataStructureProxyModel : public QSortFilterProxyModel
+{
+  Q_OBJECT
+
+public:
+  DataStructureProxyModel(QObject* parent = nullptr);
+  ~DataStructureProxyModel() override;
+
+protected:
+  /**
+   * @brief Determines whether or not the given row should be displayed in the view.
+   * The row and parent provided should be from the source model.
+   * @param row
+   * @param parent
+   * @return
+   */
+  bool filterAcceptsRow(int row, const QModelIndex& parent) const override;
+};
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index f8d9a790ff..7385f833a0 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -1,5 +1,5 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+* Copyright (c) 2009-2019 BlueQuartz Software, LLC
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@@ -29,6 +29,7 @@
 * The code contained herein was partially funded by the followig contracts:
 *    United States Air Force Prime Contract FA8650-07-D-5800
 *    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Air Force Prime Contract FA8650-15-D-5280
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -42,6 +43,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QMimeData>
+#include <QtCore/QSortFilterProxyModel>
 #include <QtGui/QDrag>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QStandardItemModel>
@@ -52,6 +54,7 @@
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
 #include "SVWidgetsLib/Widgets/DataStructureItemDelegate.h"
+#include "SVWidgetsLib/Widgets/DataStructureProxyModel.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -62,6 +65,13 @@ DataStructureTreeView::DataStructureTreeView(QWidget* parent)
   setAcceptDrops(true);
   setMouseTracking(true);
   setAttribute(Qt::WA_MacShowFocusRect, false);
+  // model
+  QStandardItemModel* model = new QStandardItemModel(this);
+  model->setColumnCount(1);
+  DataStructureProxyModel* proxyModel = new DataStructureProxyModel(this);
+  proxyModel->setSourceModel(model);
+  setModel(proxyModel);
+  
   m_Delegate = new DataStructureItemDelegate(this);
   setItemDelegate(m_Delegate);
 }
@@ -71,6 +81,22 @@ DataStructureTreeView::DataStructureTreeView(QWidget* parent)
 // -----------------------------------------------------------------------------
 DataStructureTreeView::~DataStructureTreeView() = default;
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItemModel* DataStructureTreeView::getStandardModel()
+{
+  return dynamic_cast<QStandardItemModel*>(getProxyModel()->sourceModel());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataStructureProxyModel* DataStructureTreeView::getProxyModel()
+{
+  return dynamic_cast<DataStructureProxyModel*>(model());
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -120,19 +146,20 @@ void DataStructureTreeView::clearViewRequirements()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath DataStructureTreeView::getDataArrayPath(QModelIndex index)
+DataArrayPath DataStructureTreeView::getDataArrayPath(const QModelIndex& index)
 {
   DataArrayPath path;
-  QStandardItemModel* stdModel = dynamic_cast<QStandardItemModel*>(model());
+  DataStructureProxyModel* proxyModel = dynamic_cast<DataStructureProxyModel*>(getProxyModel());
+  QStandardItemModel* stdModel = dynamic_cast<QStandardItemModel*>(getStandardModel());
   
-  if(nullptr == stdModel)
+  if(nullptr == proxyModel || nullptr == stdModel)
   {
     return path;
   }
 
   if(index.isValid())
   {
-    QStandardItem* item = stdModel->itemFromIndex(index);
+    QStandardItem* item = stdModel->itemFromIndex(proxyModel->mapToSource(index));
     if(item->parent() != nullptr)
     {
       QStandardItem* parentItem = item->parent();
@@ -363,6 +390,72 @@ void DataStructureTreeView::dropEvent(QDropEvent* event)
   event->ignore();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::collapseAllBut(const QModelIndex& index)
+{
+  QVector<QModelIndex> expandedChildren = getExpandedChildren(index);
+  if(isExpanded(index))
+  {
+    expandedChildren.push_front(index);
+  }
+  collapseAll();
+
+  // Disable Animation
+  bool prevAnimationState = isAnimated();
+  setAnimated(false);
+  for(const QModelIndex& child : expandedChildren)
+  {
+    expand(child);
+  }
+  QModelIndex parentIndex = index.parent();
+  while(parentIndex.isValid())
+  {
+    expand(parentIndex);
+    parentIndex = parentIndex.parent();
+  }
+  // Reset animation
+  setAnimated(prevAnimationState);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::findExpandedChildren(QAbstractItemModel* model, const QModelIndex& index, QVector<QModelIndex>& expandedVector)
+{
+  if(isExpanded(index))
+  {
+    expandedVector.push_back(index);
+  }
+  const int childCount = model->rowCount(index);
+  for(int i = 0; i < childCount; i++)
+  {
+    QModelIndex childIndex = model->index(i, 0, index);
+    if(isExpanded(childIndex))
+    {
+      expandedVector.push_back(childIndex);
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QVector<QModelIndex> DataStructureTreeView::getExpandedChildren(const QModelIndex& index)
+{
+  QVector<QModelIndex> expandedChildren;
+  QAbstractItemModel* abstrModel = model();
+  const int childCount = abstrModel->rowCount(index);
+  for(int i = 0; i < childCount; i++)
+  {
+    QModelIndex childIndex = abstrModel->index(i, 0, index);
+    findExpandedChildren(abstrModel, childIndex, expandedChildren);
+  }
+
+  return expandedChildren;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -380,3 +473,50 @@ void DataStructureTreeView::mouseDoubleClickEvent(QMouseEvent* event)
     emit applyPathToFilteringParameter(path);
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::contextMenuEvent(QContextMenuEvent* event)
+{
+  const QPoint pos = event->pos();
+  const QModelIndex index = indexAt(pos);
+  DataStructureProxyModel* proxyModel = getProxyModel();
+  const bool isValid = index.isValid();
+  const int numChildren = proxyModel->rowCount(index);
+  const int numSiblings = proxyModel->rowCount(index.parent());
+
+  QMenu menu;
+  QAction* expandAllAction = menu.addAction("Expand All");
+  QAction* collapseAllAction = menu.addAction("Collapse All");
+
+  connect(expandAllAction, &QAction::triggered, this, &DataStructureTreeView::expandAll);
+  connect(collapseAllAction, &QAction::triggered, this, &DataStructureTreeView::collapseAll);
+
+  if(isValid && numChildren > 0)
+  {
+    menu.addSeparator();
+    QAction* collapseAllButAction = menu.addAction("Collapse All But This");
+    connect(collapseAllButAction, &QAction::triggered, [=]{
+      collapseAllBut(index);
+    });
+  }
+
+  menu.exec(event->globalPos());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::search(const QString& name)
+{
+  if(name.isEmpty())
+  {
+    getProxyModel()->setFilterRegExp(QRegExp());
+  }
+  else
+  {
+    getProxyModel()->setFilterRegExp(QRegExp(name, Qt::CaseInsensitive));
+  }
+  update();
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index 270300daef..4ffeba148f 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -1,5 +1,5 @@
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -29,6 +29,7 @@
  * The code contained herein was partially funded by the followig contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Air Force Prime Contract FA8650-15-D-5280
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -54,6 +55,10 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
+class QAbstractItemModel;
+class QStandardItemModel;
+class DataStructureProxyModel;
+
 class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
 {
   Q_OBJECT
@@ -70,12 +75,25 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   ~DataStructureTreeView() override;
 
+  /**
+   * @brief Returns the QStandardItemModel backing the tree view.
+   * @return
+   */
+  QStandardItemModel* getStandardModel();
+
+  /**
+   * @brief Returns the DataStructureProxyModel used for searching the tree view
+   * and accessing the QStandardItemModel.
+   * @return
+   */
+  DataStructureProxyModel* getProxyModel();
+
   /**
    * @brief Returns the DataArrayPath for the given QModelIndex
    * @param index
    * @return
    */
-  DataArrayPath getDataArrayPath(QModelIndex index);
+  DataArrayPath getDataArrayPath(const QModelIndex& index);
 
   /**
    * @brief Updates the active filter for use in preventing created
@@ -108,6 +126,24 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void clearViewRequirements();
 
+  /**
+   * @brief Returns a QVector of QModelIndex for all expanded children
+   * @param index
+   * @return
+   */
+  QVector<QModelIndex> getExpandedChildren(const QModelIndex& index);
+
+  /**
+   * @brief Collapses all items but the given index and its children.
+   * @param index
+   */
+  void collapseAllBut(const QModelIndex& index);
+
+  /**
+   * @brief Searches for items using the given name as part of their text.  All other items are hidden.
+   */
+  void search(const QString& name);
+
 signals:
   void filterPath(DataArrayPath path);
   void endDataStructureFiltering();
@@ -161,6 +197,20 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void dragComplete();
 
+  /**
+   * @brief findExpandedChildren
+   * @param model
+   * @param index
+   * @param expandedVector
+   */
+  void findExpandedChildren(QAbstractItemModel* model, const QModelIndex& index, QVector<QModelIndex>& expandedVector);
+
+  /**
+   * @brief Create custom context menu
+   * @param event
+   */
+  void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
+
 private slots:
   /**
    * @brief mousePressEvent
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index fa6afba18e..b2ed4ef1c5 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -1,37 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataStructureWidget.h"
 
@@ -198,22 +199,12 @@ void DataStructureWidget::setupGui()
   connect(m_Ui->dataBrowserTreeView, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
   connect(m_Ui->dataBrowserTreeView, SIGNAL(endDataStructureFiltering()), this, SIGNAL(endDataStructureFiltering()));
   connect(m_Ui->dataBrowserTreeView, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)));
+  
+  connect(m_Ui->collapseAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::collapseAll);
+  connect(m_Ui->expandAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::expandAll);
 
-  QStandardItemModel* model = new QStandardItemModel();
-  m_Ui->dataBrowserTreeView->setModel(model);
-  model->setColumnCount(1);
-  model->setParent(m_Ui->dataBrowserTreeView); // Set the parent so it gets cleaned up
-
-  QString css(" QToolTip {\
-              border: 2px solid #434343;\
-              padding: 2px;\
-              border-radius: 3px;\
-              opacity: 255;\
-              background-color: #FFFCEA;\
-              color: #000000;\
-              }");
-  this->setStyleSheet(css);
-
+  // Search
+  connect(m_Ui->dataStructureSearch, &QLineEdit::textChanged, m_Ui->dataBrowserTreeView, &DataStructureTreeView::search);
 }
 
 // -----------------------------------------------------------------------------
@@ -233,13 +224,13 @@ void DataStructureWidget::refreshData()
   // Get the DataContainerArray object
   if(m_Dca.get() == nullptr)
   {
-    QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_Ui->dataBrowserTreeView->model());
+    QStandardItemModel* model = m_Ui->dataBrowserTreeView->getStandardModel();
     QStandardItem* rootItem = model->invisibleRootItem();
     removeNonexistingEntries(rootItem, QStringList(), 0);
     return;
   }
 
-  QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_Ui->dataBrowserTreeView->model());
+  QStandardItemModel* model = m_Ui->dataBrowserTreeView->getStandardModel();
   QVector<QString> path;
   {
     QModelIndex currIndex = m_Ui->dataBrowserTreeView->currentIndex();
@@ -253,14 +244,7 @@ void DataStructureWidget::refreshData()
 
   }
 
-  model = qobject_cast<QStandardItemModel*>(m_Ui->dataBrowserTreeView->model());
-
-  //  QItemSelectionModel* selectionModel = m_Ui->dataBrowserTreeView->selectionModel();
-  //  if(selectionModel)
-  //  {
-  //    connect(selectionModel, SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)),
-  //      this, SLOT(dataBrowserTreeView_indexChanged(const QModelIndex&, const QModelIndex&)));
-  //  }
+  model = m_Ui->dataBrowserTreeView->getStandardModel();
 
   // Sanity check model
   if(model == nullptr)
@@ -383,6 +367,7 @@ void DataStructureWidget::refreshData()
   }
   removeNonexistingEntries(rootItem, m_Dca->getDataContainerNames(), 0);
 
+  m_Ui->dataBrowserTreeView->expandAll();
   // repaint the DataStructureTreeView
   m_Ui->dataBrowserTreeView->repaint();
 }
diff --git a/Source/SVWidgetsLib/Widgets/SourceList.cmake b/Source/SVWidgetsLib/Widgets/SourceList.cmake
index 7ac87818a3..d0da615b41 100755
--- a/Source/SVWidgetsLib/Widgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/Widgets/SourceList.cmake
@@ -11,6 +11,7 @@ set(SVWidgetsLib_Widgets_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureTreeView.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureModel.h
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureProxyModel.h
 
 
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksItemDelegate.h
@@ -64,6 +65,7 @@ set(SVWidgetsLib_Widgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureTreeView.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureModel.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataStructureProxyModel.cpp
 
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksItem.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/BookmarksItemDelegate.cpp
diff --git a/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui b/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
index 5a06e673ea..0205f5f3a5 100755
--- a/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
+++ b/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
@@ -11,7 +11,10 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Data Structure</string>
+  </property>
+  <property name="autoFillBackground">
+   <bool>false</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
@@ -29,7 +32,32 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="0" column="0">
+   <item row="1" column="0">
+    <widget class="QtSLineEdit" name="dataStructureSearch">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="placeholderText">
+      <string>Search Data Structure</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
     <widget class="DataStructureTreeView" name="dataBrowserTreeView">
      <property name="acceptDrops">
       <bool>true</bool>
@@ -78,6 +106,88 @@
      </attribute>
     </widget>
    </item>
+   <item row="1" column="2">
+    <widget class="SVIconPushButton" name="collapseAllBtn">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>30</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>30</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>Collapse all data containers</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../Resources/SIMPL.qrc">
+       <normaloff>:/SIMPL/icons/images/collapse_all.png</normaloff>:/SIMPL/icons/images/collapse_all.png</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>24</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="SVIconPushButton" name="expandAllBtn">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>30</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>30</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>Expand all data containers</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../../../../Resources/SIMPL.qrc">
+       <normaloff>:/SIMPL/icons/images/expand_all.png</normaloff>:/SIMPL/icons/images/expand_all.png</iconset>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>24</width>
+       <height>24</height>
+      </size>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -86,7 +196,19 @@
    <extends>QTreeView</extends>
    <header>DataStructureTreeView.h</header>
   </customwidget>
+  <customwidget>
+   <class>QtSLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">QtSLineEdit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
  </customwidgets>
- <resources/>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
  <connections/>
 </ui>

From 8ca62c4e5b912170ec7b4b050ff7037feec604d5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 23 Apr 2019 21:20:59 -0400
Subject: [PATCH 079/397] IGeometryGrid API Update, Pythong Fixes, MXA Removal

The API is changed to use a FloatVec3Type or SizeVec3Type (both alias for SIMPLArray<T, N>) so that
the API is consistent among the various classes and easy to use within SIMPL/DREAM.3D and its plugins.
The use of the std::tuple<T> based return types is deprecated and removed.

The Python script files were completely reorganized to put the scripts with their plugins. Most of
the scripts were tested on a macOS machine and added to the ctest suite of unit tests. For each script
a bash script is created that drives the test. The Python tests are dependant on an Anaconda3 installation
being used. A few of the Python tests are still failing but those will be fixed eventually

The source code was searched for the old and deprecated MXA strings and classes and the old code was
either removed or renamed to SIMPL.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                                |    2 +-
 Resources/SIMPL_API.doxyfile.in               |   12 +-
 Resources/ThirdParty.qrc                      |    1 -
 Resources/ThirdParty/Boost.txt                |   37 -
 Source/H5Support/H5Utilities.cpp              |   67 -
 Source/H5Support/Test/H5LiteTest.cpp          |  107 +-
 Source/H5Support/Test/H5UtilitiesTest.cpp     |    3 -
 Source/SIMPLib/Common/SIMPLArray.hpp          |  340 ++++-
 Source/SIMPLib/Common/SIMPLibDLLExport.h      |    5 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  104 +-
 ...AbstractVecTest.cpp => SIMPLArrayTest.cpp} |  119 +-
 .../Common/Testing/Cxx/SourceList.cmake       |    2 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |    3 +-
 .../CoreFilters/CreateImageGeometry.cpp       |    6 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |    2 -
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |    2 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |   16 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |    6 -
 Source/SIMPLib/CoreFilters/InitializeData.cpp |    6 +-
 .../CoreFilters/RequiredZThickness.cpp        |    6 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |    3 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |   18 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |   24 +-
 .../Testing/Cxx/CreateImageGeometryTest.cpp   |    9 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |    8 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |    3 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   22 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h |    1 +
 .../SIMPLib/DataContainers/DataArrayProxy.h   |    8 +-
 .../FilterParameters/DynamicTableData.h       |    2 +-
 .../H5FilterParametersWriter.h                |    2 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |    5 +-
 Source/SIMPLib/Geometry/IGeometry.cpp         |   39 +
 Source/SIMPLib/Geometry/IGeometry.h           |    7 +
 Source/SIMPLib/Geometry/IGeometryGrid.h       |   11 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  154 +--
 Source/SIMPLib/Geometry/ImageGeom.h           |   38 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   61 +-
 Source/SIMPLib/Geometry/RectGridGeom.h        |    6 +-
 .../Geometry/Testing/Cxx/ImageGeomTest.cpp    |   11 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |    5 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |    6 -
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |    3 +-
 Source/SIMPLib/ITK/itkBridge.h                |   18 +-
 .../itkInPlaceDream3DDataToImageFilter.hxx    |    9 +-
 .../itkInPlaceImageToDream3DDataFilter.hxx    |    3 +-
 Source/SIMPLib/Plugin/PluginDLLExport.h.in    |    5 +-
 Source/SIMPLib/SIMPLibMacros.cmake            |    9 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |    2 +-
 .../Testing/Unused/AngleFileLoaderTest.cpp    |   77 --
 .../Testing/Unused/CSVGrainDataReader.cpp     |  260 ----
 .../Testing/Unused/CSVGrainDataReader.h       |  203 ---
 Source/SIMPLib/Testing/Unused/EbsdTests.cpp   |  138 --
 .../Testing/Unused/FeatureDataReaderTest.cpp  |   65 -
 .../Testing/Unused/FilterParametersRWTest.cpp | 1186 -----------------
 .../Testing/Unused/FindNeighborsTest.cpp      |  386 ------
 .../Testing/Unused/GenericFilterTest.cpp      |  279 ----
 .../Testing/Unused/LambertArrayRWTest.cpp     |  121 --
 .../Unused/ManagedPointerArrayTest.cpp        |  122 --
 .../Unused/NewDataContainerStructureTest.cpp  |  598 ---------
 Source/SIMPLib/Testing/Unused/PFTest.cpp      |   84 --
 .../Testing/Unused/QFilterParameterIOTest.cpp |  327 -----
 Source/SIMPLib/Testing/Unused/RNGTest.cpp     |   57 -
 Source/SIMPLib/Testing/Unused/ReplaceText.cpp |  495 -------
 Source/SIMPLib/Testing/Unused/ResFixer.cpp    |  247 ----
 .../SIMPLib/Testing/Unused/StatsDataTest.cpp  |  567 --------
 .../SIMPLib/Testing/Unused/StatsGenTest.cpp   |  211 ---
 .../Testing/Unused/SurfaceMeshTest.cpp        |  114 --
 .../Testing/Unused/SyntheticBuilderTest.cpp   |  250 ----
 .../SIMPLib/Testing/Unused/SyntheticTest.cpp  |   80 --
 Source/SIMPLib/Testing/Unused/UMich.cpp       |  161 ---
 .../Testing/Unused/UnitTestTemplate.cpp       |   77 --
 Source/SIMPLib/Testing/Unused/VXLTest.cpp     |   88 --
 Source/SIMPLib/Testing/Unused/VoxelTest.cpp   |   85 --
 .../Testing/Unused/VtkGrainIdIOTest.cpp       |  231 ----
 Source/SIMPLib/VTKUtils/VTKFileReader.h       |    2 +-
 .../SVWidgetsLib/Core/SVWidgetsLibDLLExport.h |    2 +-
 .../Widgets/ImportHDF5TreeModel.cpp           |   17 -
 .../Examples/Anisotropy/01_Import Data.py     |   36 -
 ...lignment - Misorientation - Zero Shifts.py |   55 -
 ...ignment Mutual Information - SEM Images.py |   71 -
 .../Examples/Anisotropy/04_Steiner Compact.py |  103 --
 .../Python/Examples/ColorData_Change.ipynb    |  281 ----
 .../Python/Examples/ColorData_Change_Test.py  |  118 --
 .../Examples/Confidence_Index_Histogram.py    |   69 -
 .../Examples/Core Filters/Append_Z_Slice.py   |   61 -
 .../Core Filters/Array_Calculator_Test.py     |  148 --
 .../Convert_Attribute_Array_Data_Type.py      |  147 --
 .../Examples/Core Filters/Copy_Object_Test.py |  149 ---
 ...Create_Feature_Array_From_Element_Array.py |  155 ---
 .../Core Filters/Import_Ascii_Data_Array.py   |   52 -
 .../Core Filters/Import_Hdf5_Dataset.py       |   51 -
 ...ature_Attribute_Matrix_To_Element_Array.py |  150 ---
 .../Examples/Create_Lambert_Sphere_Surface.py |  154 ---
 .../Apply_Transformation_To_Geometry.py       |  136 --
 ...rage_EdgeFaceCell_Array_To_Vertex_Array.py |  208 ---
 ...rage_Vertex_Array_To_EdgeFaceCell_Array.py |  208 ---
 .../Compute_Umeyama_Transform.py              |  165 ---
 .../DREAM3DReview/Create_Edge_Geometry.py     |   97 --
 .../DREAM3DReview/Create_Quad_Geometry.py     |  115 --
 .../DREAM3DReview/Create_RectilinearGrid.py   |   59 -
 .../DREAM3DReview/Create_Triangle_Geometry.py |  111 --
 .../DREAM3DReview/Create_Vertex_Geometry.py   |   75 --
 .../Python/Examples/DREAM3DReview/DBSCAN.py   |  128 --
 ...nternal_Surfaces_From_Triangle_Geometry.py |  179 ---
 .../Find_Attribute_Array_Statistics.py        |  117 --
 .../DREAM3DReview/Find_Element_Centroids.py   |   79 --
 .../Examples/DREAM3DReview/Find_Norm.py       |  127 --
 .../Examples/DREAM3DReview/K Medoids.py       |  128 --
 .../DREAM3DReview/K_Distance_Graph.py         |  130 --
 .../Examples/DREAM3DReview/K_Means_Test.py    |  149 ---
 .../Normalize_Attribute_Arrays.py             |  206 ---
 .../Point_Sample_Triangle_Geometry.py         |  209 ---
 .../Examples/DREAM3DReview/Potts_Model.py     |  174 ---
 .../Principal_Component_Analysis.py           |  225 ----
 .../DREAM3DReview/Remove_Flagged_Vertices.py  |  120 --
 .../Robust_Automatic_Threshold.py             |  212 ---
 .../Reconstruction/01 SmallIN100 Archive.py   |   26 -
 .../02 SmallIN100 Initial Visualization.py    |   37 -
 .../Reconstruction/03 SmallIN100 Alignment.py |   93 --
 ...4 SmallIN100 Presegmentation Processing.py |  109 --
 .../05 SmallIN100 Segmentation.py             |   78 --
 ... SmallIN100 Postsegmentation Processing.py |  146 --
 .../07 SmallIN100 Final Processing.py         |  112 --
 .../08 SmallIN100 Full Reconstruction.py      |  207 ---
 .../01 SmallIN100 Morphological Statistics.py |  140 --
 .../02 SmallIN100 Export Statistics.py        |  122 --
 .../03 SmallIN100 Transfer Field Data.py      |  131 --
 .../04 SmallIN100 Field Threshold.py          |  140 --
 ... SmallIN100 Crystallographic Statistics.py |  195 ---
 .../Surface Mesh/01 SmallIN100 Quick Mesh.py  |  165 ---
 .../Surface Mesh/02 SmallIN100 Smooth Mesh.py |  155 ---
 .../03 SmallIN100 Mesh Statistics.py          |  196 ---
 .../EBSD/Surface Mesh/04 SmallIN100 GBCD.py   |  190 ---
 Wrapping/Python/Examples/Edax_IPF_Colors.py   |   71 -
 .../Examples/Export_Small_IN100_ODF_Data.py   |  191 ---
 Wrapping/Python/Examples/INL_Export.py        |  164 ---
 .../01 - Image Initial Visualization.py       |   40 -
 .../02 - Image Segmentation.py                |  145 --
 Wrapping/Python/Examples/Image_Histogram.py   |   51 -
 Wrapping/Python/Examples/Import_ASCII.py      |  119 --
 Wrapping/Python/Examples/Misc_Filters.py      |  150 ---
 .../01_Single Cubic Phase Equiaxed.py         |  213 ---
 .../02_Single Hexagonal Phase Equiaxed.py     |  138 --
 .../Synthetic/03_Single Cubic Phase Rolled.py |  137 --
 ...hase Cubic Hexagonal Particles Equiaxed.py |  193 ---
 .../Synthetic/06_SmallN100_Synthetic.py       |  343 -----
 .../Python/Examples/Test_All_Pipelines.py     |   78 --
 .../Python/Examples/Threshold2_MoveData.py    |  122 --
 .../InsertTransformationPhase.py              |  284 ----
 Wrapping/Python/Examples/TxCopper_Exposed.py  |  119 --
 .../Python/Examples/TxCopper_Unexposed.py     |  103 --
 Wrapping/Python/Pybind11/CMakeLists.txt       |   58 +-
 .../Pybind11/CodeScraper/CodeScraper.cpp      |    2 +-
 .../CodeScraper/PyBind11Generator.cpp         |   70 +-
 .../Pybind11/CodeScraper/PyBind11Generator.h  |    4 +-
 .../CodeScraper/PythonBindingClass.cpp        |  102 +-
 .../Pybind11/CodeScraper/PythonBindingClass.h |    7 +-
 .../CodeScraper/PythonBindingsModule.cpp      |   43 +-
 .../CodeScraper/SIMPLPyBind11Config.h.in      |    2 +
 .../DerivedSharedPointerClassInit.in.h        |    3 +-
 .../Templates/PluginModuleCodeTemplate.in.cpp |   26 +-
 .../Templates/Pybind11CustomTypeCasts.in.h    |    2 +
 .../Pybind11/Templates/Pybind11TopMatter.in.h |    4 +-
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |  190 ++-
 .../Templates/SharedPointerClassInit.in.h     |    3 +-
 .../Pybind11/Templates/SimpleClassInit.in.h   |    3 +-
 .../Pybind11/cmake/WrappingFunctions.cmake    |   18 +-
 .../Python/Pybind11/python_test_driver.sh     |   37 +
 Wrapping/Python/SIMPL/simpl_helpers.py        |   86 +-
 Wrapping/Python/SIMPL/simpl_test_dirs.in.py   |    1 +
 Wrapping/Python/Testing/AbstractFilterTest.py |   10 +-
 .../Python/Testing/Array_Calculator_Test.py   |   49 +
 .../Python/Testing/AttributeMatrixTest.py     |    6 +-
 .../Convert_Attribute_Array_Data_Type.py      |   46 +
 Wrapping/Python/Testing/Copy_Object_Test.py   |   52 +
 .../Crop_Vertex_Geometry.py                   |   20 +-
 Wrapping/Python/Testing/DataArrayTest.py      |   16 +-
 .../Python/Testing/DataContainerArrayTest.py  |   36 +-
 Wrapping/Python/Testing/DataContainerTest.py  |   12 +-
 .../Export_Triangle_Geometry.py               |   30 +-
 Wrapping/Python/Testing/GeometryTest.py       |   17 +-
 Wrapping/Python/Testing/ImageReadTest.py      |   17 +-
 .../Python/Testing/Import_Ascii_Data_Array.py |   52 +
 .../Python/Testing/Import_Hdf5_Dataset.py     |   73 +
 Wrapping/Python/Testing/PipelineTest.py       |   78 --
 .../Remove_Component_From_Array.py            |  109 +-
 .../Rename_Attribute_Array.py                 |  109 +-
 Wrapping/Python/Testing/SourceList.cmake      |   12 -
 .../Split_Attribute_Array.py                  |  106 +-
 Wrapping/Python/Testing/TestBindings.py       |    8 +-
 .../Core Filters => Testing}/ascii_sample.csv |    0
 192 files changed, 1677 insertions(+), 17770 deletions(-)
 delete mode 100644 Resources/ThirdParty/Boost.txt
 rename Source/SIMPLib/Common/Testing/Cxx/{AbstractVecTest.cpp => SIMPLArrayTest.cpp} (54%)
 delete mode 100644 Source/SIMPLib/Testing/Unused/AngleFileLoaderTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/CSVGrainDataReader.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/CSVGrainDataReader.h
 delete mode 100644 Source/SIMPLib/Testing/Unused/EbsdTests.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/FeatureDataReaderTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/FilterParametersRWTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/FindNeighborsTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/GenericFilterTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/LambertArrayRWTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/ManagedPointerArrayTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/PFTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/QFilterParameterIOTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/RNGTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/ReplaceText.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/ResFixer.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/StatsDataTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/StatsGenTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/SurfaceMeshTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/SyntheticBuilderTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/SyntheticTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/UMich.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/UnitTestTemplate.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/VXLTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/VoxelTest.cpp
 delete mode 100644 Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
 delete mode 100644 Wrapping/Python/Examples/Anisotropy/01_Import Data.py
 delete mode 100644 Wrapping/Python/Examples/Anisotropy/02_Adaptive Alignment - Misorientation - Zero Shifts.py
 delete mode 100644 Wrapping/Python/Examples/Anisotropy/03_Adaptive Alignment Mutual Information - SEM Images.py
 delete mode 100644 Wrapping/Python/Examples/Anisotropy/04_Steiner Compact.py
 delete mode 100644 Wrapping/Python/Examples/ColorData_Change.ipynb
 delete mode 100644 Wrapping/Python/Examples/ColorData_Change_Test.py
 delete mode 100644 Wrapping/Python/Examples/Confidence_Index_Histogram.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Append_Z_Slice.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Array_Calculator_Test.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Convert_Attribute_Array_Data_Type.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Copy_Object_Test.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Create_Feature_Array_From_Element_Array.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Import_Ascii_Data_Array.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Import_Hdf5_Dataset.py
 delete mode 100644 Wrapping/Python/Examples/Core Filters/Link_Feature_Attribute_Matrix_To_Element_Array.py
 delete mode 100644 Wrapping/Python/Examples/Create_Lambert_Sphere_Surface.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Apply_Transformation_To_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Average_EdgeFaceCell_Array_To_Vertex_Array.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Average_Vertex_Array_To_EdgeFaceCell_Array.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Compute_Umeyama_Transform.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Create_Edge_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Create_Quad_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Create_RectilinearGrid.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Create_Triangle_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Create_Vertex_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/DBSCAN.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Extract_Internal_Surfaces_From_Triangle_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Find_Attribute_Array_Statistics.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Find_Element_Centroids.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Find_Norm.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/K Medoids.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/K_Distance_Graph.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/K_Means_Test.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Normalize_Attribute_Arrays.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Point_Sample_Triangle_Geometry.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Potts_Model.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Principal_Component_Analysis.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Remove_Flagged_Vertices.py
 delete mode 100644 Wrapping/Python/Examples/DREAM3DReview/Robust_Automatic_Threshold.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/01 SmallIN100 Archive.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/02 SmallIN100 Initial Visualization.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/03 SmallIN100 Alignment.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/04 SmallIN100 Presegmentation Processing.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/05 SmallIN100 Segmentation.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/06 SmallIN100 Postsegmentation Processing.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/07 SmallIN100 Final Processing.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Reconstruction/08 SmallIN100 Full Reconstruction.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Statistics/01 SmallIN100 Morphological Statistics.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Statistics/02 SmallIN100 Export Statistics.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Statistics/03 SmallIN100 Transfer Field Data.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Statistics/04 SmallIN100 Field Threshold.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Statistics/05 SmallIN100 Crystallographic Statistics.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Surface Mesh/01 SmallIN100 Quick Mesh.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Surface Mesh/02 SmallIN100 Smooth Mesh.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Surface Mesh/03 SmallIN100 Mesh Statistics.py
 delete mode 100644 Wrapping/Python/Examples/EBSD/Surface Mesh/04 SmallIN100 GBCD.py
 delete mode 100644 Wrapping/Python/Examples/Edax_IPF_Colors.py
 delete mode 100644 Wrapping/Python/Examples/Export_Small_IN100_ODF_Data.py
 delete mode 100644 Wrapping/Python/Examples/INL_Export.py
 delete mode 100644 Wrapping/Python/Examples/Image Reconstruction/01 - Image Initial Visualization.py
 delete mode 100644 Wrapping/Python/Examples/Image Reconstruction/02 - Image Segmentation.py
 delete mode 100644 Wrapping/Python/Examples/Image_Histogram.py
 delete mode 100644 Wrapping/Python/Examples/Import_ASCII.py
 delete mode 100644 Wrapping/Python/Examples/Misc_Filters.py
 delete mode 100644 Wrapping/Python/Examples/Synthetic/01_Single Cubic Phase Equiaxed.py
 delete mode 100644 Wrapping/Python/Examples/Synthetic/02_Single Hexagonal Phase Equiaxed.py
 delete mode 100644 Wrapping/Python/Examples/Synthetic/03_Single Cubic Phase Rolled.py
 delete mode 100644 Wrapping/Python/Examples/Synthetic/04_Two Phase Cubic Hexagonal Particles Equiaxed.py
 delete mode 100644 Wrapping/Python/Examples/Synthetic/06_SmallN100_Synthetic.py
 delete mode 100644 Wrapping/Python/Examples/Test_All_Pipelines.py
 delete mode 100644 Wrapping/Python/Examples/Threshold2_MoveData.py
 delete mode 100644 Wrapping/Python/Examples/Transformation Phase/InsertTransformationPhase.py
 delete mode 100644 Wrapping/Python/Examples/TxCopper_Exposed.py
 delete mode 100644 Wrapping/Python/Examples/TxCopper_Unexposed.py
 create mode 100755 Wrapping/Python/Pybind11/python_test_driver.sh
 create mode 100644 Wrapping/Python/Testing/Array_Calculator_Test.py
 create mode 100644 Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
 create mode 100644 Wrapping/Python/Testing/Copy_Object_Test.py
 rename Wrapping/Python/{Examples/Core Filters => Testing}/Crop_Vertex_Geometry.py (87%)
 rename Wrapping/Python/{Examples/Core Filters => Testing}/Export_Triangle_Geometry.py (83%)
 create mode 100644 Wrapping/Python/Testing/Import_Ascii_Data_Array.py
 create mode 100644 Wrapping/Python/Testing/Import_Hdf5_Dataset.py
 delete mode 100644 Wrapping/Python/Testing/PipelineTest.py
 rename Wrapping/Python/{Examples/Core Filters => Testing}/Remove_Component_From_Array.py (74%)
 rename Wrapping/Python/{Examples/Core Filters => Testing}/Rename_Attribute_Array.py (74%)
 delete mode 100644 Wrapping/Python/Testing/SourceList.cmake
 rename Wrapping/Python/{Examples/Core Filters => Testing}/Split_Attribute_Array.py (76%)
 rename Wrapping/Python/{Examples/Core Filters => Testing}/ascii_sample.csv (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7f0fc1df1..58cb3e05e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -452,5 +452,5 @@ if(SIMPL_ENABLE_PYTHON)
   # --------------------------------------------------------------------
   # add the Pybind11 Python Wrapping
   add_subdirectory(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11 ${PROJECT_BINARY_DIR}/Pybind11)
-
+ # include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing/SourceList.cmake)
 endif()
diff --git a/Resources/SIMPL_API.doxyfile.in b/Resources/SIMPL_API.doxyfile.in
index aa58be626d..2bbf470ea4 100644
--- a/Resources/SIMPL_API.doxyfile.in
+++ b/Resources/SIMPL_API.doxyfile.in
@@ -274,22 +274,22 @@ PREDEFINED  = "EBSD_INSTANCE_PROPERTY(type, prpty)= \
               "DREAM3D_TYPE_MACRO(class)=\
                 virtual const char* getNameOfClass() const \
                 {return "CrossCorrelationData";}" \
-               "MXA_INSTANCE_PROPERTY(type, prpty)= \
+               "SIMPL_INSTANCE_PROPERTY(type, prpty)= \
                 /** Sets the prpty instance variable */ \
                  void set##prpty (type); \
                  /** Gets the prpty instance variable */ \
                  type get##prpty (type);" \
-              "MXA_INSTANCE_PROPERTY(type, prpty, name)= \
+              "SIMPL_INSTANCE_PROPERTY(type, prpty, name)= \
                 /** Sets the prpty instance variable */ \
                  void set##prpty (type); \
                  /** Gets the prpty instance variable */ \
                  type get##prpty (type);" \
-              "MXA_INSTANCE_STRING_PROPERTY(prpty)=\
+              "SIMPL_INSTANCE_STRING_PROPERTY(prpty)=\
                 /** Sets the prpty instance variable */ \
                  void set##prpty (std::string); \
                  /** Gets the prpty instance variable */ \
                  std::string get##prpty (std::string);" \
-              "MXA_SHARED_POINTERS(class)=\
+              "SIMPL_SHARED_POINTERS(class)=\
                 typedef CrossCorrelation             Self;\
                 typedef boost::shared_ptr< Self >       Pointer;\
                 typedef boost::shared_ptr<const Self >  ConstPointer;\
@@ -297,13 +297,13 @@ PREDEFINED  = "EBSD_INSTANCE_PROPERTY(type, prpty)= \
                 { \
                   return Pointer(static_cast<CrossCorrelation*>(0));\
                 }"\
-              "MXA_STATIC_NEW_MACRO(class)=\
+              "SIMPL_STATIC_NEW_MACRO(class)=\
                 static Pointer New(void) \
                 { \
                   Pointer sharedPtr (new CrossCorrelationData); \
                   return sharedPtr; \
                 }"\
-              "MXA_TYPE_MACRO(class)=\
+              "SIMPL_TYPE_MACRO(class)=\
                 virtual const char* getNameOfClass() const \
                 {return "CrossCorrelationData";}"
 #---------------------------------------------------------------------------
diff --git a/Resources/ThirdParty.qrc b/Resources/ThirdParty.qrc
index 7c3962178e..8ec4e1a86e 100644
--- a/Resources/ThirdParty.qrc
+++ b/Resources/ThirdParty.qrc
@@ -1,7 +1,6 @@
 <!DOCTYPE RCC>
 <RCC version="1.0">
 <qresource>
-<file>ThirdParty/Boost.txt</file>
 <file>ThirdParty/ctk.txt</file>
 <file>ThirdParty/HDF5.txt</file>
 <file>ThirdParty/Qt.txt</file>
diff --git a/Resources/ThirdParty/Boost.txt b/Resources/ThirdParty/Boost.txt
deleted file mode 100644
index 0ee3eecc87..0000000000
--- a/Resources/ThirdParty/Boost.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-<html>
-<body>
-<pre>
-Boost from http://www.boost.org - A subset of the complete boost open-source
-project is being used by the project. The license to use and distribute boost
-related source and binaries is as follows:
-
-  Boost Software License - Version 1.0 - August 17th, 2003
-
-  Permission is hereby granted, free of charge, to any person or organization
-  obtaining a copy of the software and accompanying documentation covered by
-  this license (the "Software") to use, reproduce, display, distribute,
-  execute, and transmit the Software, and to prepare derivative works of the
-  Software, and to permit third-parties to whom the Software is furnished to
-  do so, all subject to the following:
-
-  The copyright notices in the Software and this entire statement, including
-  the above license grant, this restriction and the following disclaimer,
-  must be included in all copies of the Software, in whole or in part, and
-  all derivative works of the Software, unless such copies or derivative
-  works are solely in the form of machine-executable object code generated by
-  a source language processor.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  DEALINGS IN THE SOFTWARE.
-
-The complete sub-set of boost is included in this release of the project. The source
-is compressed as a GZip file and can be found as the file "MXABoost.tar.gz".
-
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/Source/H5Support/H5Utilities.cpp b/Source/H5Support/H5Utilities.cpp
index 4b9767f3aa..326ce3e56b 100644
--- a/Source/H5Support/H5Utilities.cpp
+++ b/Source/H5Support/H5Utilities.cpp
@@ -621,73 +621,6 @@ herr_t H5Utilities::getAllAttributeNames(hid_t loc_id, const std::string& obj_na
   return err;
 }
 
-#if 0
-// Returns a std::map with all of the attributes for obj_name
-//  and their attribute values in a std::string std::map
-herr_t H5Utilities::getAttributesMap(hid_t loc_id,
-                                     const std::string& obj_name,
-                                     std::map<std::string, std::string>& attributes)
-{
-  //std::map<std::string, std::string> attributes;
-  herr_t err = 0;
-  H5T_class_t attr_type;
-  size_t attr_size;
-  std::string res;
-  hid_t tid;
-  MXATypes::Int32Vector ires;
-  MXATypes::Float32Vector fres;
-  std::vector<uint64_t> dims;  //Reusable for the loop
-  std::list<std::string> names;
-  err = getAllAttributeNames(loc_id, obj_name, names);
-  if (err < 0) { return err; }
-  std::list<std::string>::iterator iter;
-  for (iter = names.begin(); iter != names.end(); iter++)
-  {
-    err = H5Lite::getAttributeInfo(loc_id, obj_name, (*iter), dims, attr_type, attr_size, tid);
-    if (err < 0)
-    {
-      std::cout << "Error getting all attributes" << std::endl;
-      return err;
-    }
-    else
-    {
-      switch(attr_type)
-      {
-        case H5T_STRING:
-          err = H5Lite::readStringAttribute(loc_id, obj_name, (*iter), res );
-          if (err >= 0)
-          {
-            attributes[(*iter)] = res;
-          }
-          else { return err; }
-          break;
-        case H5T_INTEGER:
-          err = H5Lite::readVectorAttribute(loc_id, obj_name, (*iter), ires);
-          if (err >= 0)
-          {
-            attributes[(*iter)] = QString::number(ires[0]);
-          }
-          else { return err; }
-          break;
-        case H5T_FLOAT:
-          err = H5Lite::readVectorAttribute(loc_id, obj_name, (*iter), fres);
-          if (err >= 0)
-          {
-            attributes[(*iter)] = QString::number(fres[0]);
-          }
-          else { return err; }
-          break;
-        default:
-          std::cout << "Unknown attribute type: " << attr_type << ": ";
-          printHDFClassType(attr_type);
-      }
-    }
-  }
-
-  return err;
-}
-#endif
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/H5Support/Test/H5LiteTest.cpp b/Source/H5Support/Test/H5LiteTest.cpp
index a87108fee5..efd0023a2f 100644
--- a/Source/H5Support/Test/H5LiteTest.cpp
+++ b/Source/H5Support/Test/H5LiteTest.cpp
@@ -86,7 +86,6 @@
 herr_t testMakeStringDataset(hid_t file_id);
 herr_t testMakeStringAttribute(hid_t file_id);
 void QH5LiteTest();
-// MXADataModel::Pointer createModelTemplate();
 template <typename T> herr_t testWritePointer1DArrayAttribute(hid_t file_id, const QString& dsetName);
 
 class H5LiteTest
@@ -603,99 +602,6 @@ class H5LiteTest
     return err;
   }
 
-#if 0
-    // -----------------------------------------------------------------------------
-    //
-    // -----------------------------------------------------------------------------
-    template<typename T>
-    herr_t testMXAAttribute(hid_t file_id, const QString& dsetName)
-    {
-      T value = 0x0F;
-      herr_t err = -1;
-      QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-      DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-      attributeKey = "MXAAttribute<" + attributeKey + ">";
-      IMXAArray* array = MXAArrayTemplate<T>::New(10);
-      IMXAArray::Pointer arrayPtr (array);
-      T* p = static_cast<T*>(array->getVoidPointer(0));
-      for (int var = 0; var < 10; ++var)
-      {
-        p[var] = static_cast<T>(var + 65);
-      }
-      err = QH5Lite::writeMXAAttribute(file_id, dsetName, attributeKey, array);
-      DREAM3D_REQUIRE(err >= 0);
-
-      // Now Read the Attribute back into an MXAArray object and test against the previous for equality
-      IMXAArray* rArray = QH5Lite::readMXAAttribute(file_id, dsetName, attributeKey);
-      DREAM3D_REQUIRE (rArray != nullptr);
-      //hid_t t = rArray->getDataType();
-      IMXAArray::Pointer rArrayPtr(rArray); // Let boost clean up the pointer
-      T* r = static_cast<T*>(rArrayPtr->getVoidPointer(0));
-      //  for (int var = 0; var < 10; ++var) {
-      //    qDebug() << "p=" << p[var] << "  r=" << (r[var]) << "\n";
-      //  }
-      DREAM3D_REQUIRE( ::memcmp(r, p, sizeof(T) * 10) == 0);
-
-
-
-      AbstractH5Attribute::Pointer ptr = H5Attribute::ReadH5Attribute(file_id, dsetName, attributeKey);
-      DREAM3D_REQUIRE(ptr.get() != nullptr);
-      r = static_cast<T*>(ptr->getAttributeValue()->getVoidPointer(0));
-      DREAM3D_REQUIRE( ::memcmp(r, p, sizeof(T) * 10) == 0);
-
-      return err;
-    }
-
-
-    // -----------------------------------------------------------------------------
-    //
-    // -----------------------------------------------------------------------------
-    template<typename T>
-    herr_t testWriteMXAArray(hid_t file_id)
-    {
-      herr_t err = 1;
-      T value = 0x0F;
-
-      QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>(value);
-      dsetName = "MXAArrayDataset<" + dsetName + ">";
-      qDebug() << "Running " << dsetName << " ... ";
-
-      IMXAArray* array = MXAArrayTemplate<T>::New(10);
-      IMXAArray::Pointer arrayPtr (array);
-      T* p = static_cast<T*>(array->getVoidPointer(0));
-      for (int var = 0; var < 10; ++var)
-      {
-        p[var] = static_cast<T>(var);
-      }
-      err = QH5Lite::writeMXAArray(file_id, dsetName, array);
-      DREAM3D_REQUIRE(err >= 0);
-
-      DREAM3D_REQUIRE ( testMXAAttribute<int8_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<uint8_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<int16_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<uint16_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<int32_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<uint32_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<int64_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<uint64_t>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<float32>(file_id, dsetName) >= 0 );
-      DREAM3D_REQUIRE ( testMXAAttribute<float64>(file_id, dsetName) >= 0 );
-
-      // Now Read the Attribute back into an MXAArray object and test against the previous for equality
-      IMXAArray* rArray = QH5Lite::readMXAArray(file_id, dsetName);
-      DREAM3D_REQUIRE (rArray != nullptr);
-      IMXAArray::Pointer rArrayPtr(rArray); // Let boost clean up the pointer
-      T* r = static_cast<T*>(rArrayPtr->getVoidPointer(0));
-      //  for (int var = 0; var < 10; ++var) {
-      //    qDebug() << "p=" << p[var] << "  r=" << (r[var]) << "\n";
-      //  }
-      DREAM3D_REQUIRE( ::memcmp(r, p, sizeof(T) * 10) == 0);
-
-      qDebug() << " Passed" << "\n";
-      return err;
-    }
-#endif
-
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -1121,18 +1027,7 @@ class H5LiteTest
 
     DREAM3D_REQUIRE(testWriteStringDatasetAndAttributes(file_id) >= 0);
 
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<int8_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<uint8_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<int16_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<uint16_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<int32_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<uint32_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<int64_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<uint64_t>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<float32>(file_id) >= 0);
-    //   DREAM3D_REQUIRE ( testWriteMXAArray<float64>(file_id) >= 0);
-
-    //  // ******************* Test Reading Data *************************************
+    // ******************* Test Reading Data *************************************
     DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int8_t>(file_id) >= 0);
     DREAM3D_REQUIRE(testReadPointer2DArrayDataset<uint8_t>(file_id) >= 0);
     DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int16_t>(file_id) >= 0);
diff --git a/Source/H5Support/Test/H5UtilitiesTest.cpp b/Source/H5Support/Test/H5UtilitiesTest.cpp
index e13162ddd4..608e761e99 100644
--- a/Source/H5Support/Test/H5UtilitiesTest.cpp
+++ b/Source/H5Support/Test/H5UtilitiesTest.cpp
@@ -414,9 +414,6 @@ class H5UtilitiesTest
     for(int i = 0; i < 100; ++i)
     {
       qDebug() << QDateTime::currentDateTime() << "Outer Loop: " << i;
-      //    err = H5Fclose(file_id);
-      //    DREAM3D_REQUIRE(err >= 0);
-      //    file_id = H5Fopen(MXAUnitTest::H5UtilTest::GroupTest.toStdString().c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
       ::memset(path, 0, 64);
       snprintf(path, 64, "/%03d", i);
       grpId = QH5Utilities::createGroup(file_id, path);
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index ca665298d6..be4e83cf33 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -54,6 +54,18 @@ class SIMPLArray
   SIMPLArray& operator=(SIMPLArray&&) noexcept = default;
   ~SIMPLArray() = default;
 
+  /**
+   * @brief Constructor using a random access container type as the input. This will copy the data
+   */
+  template <typename InType>
+  SIMPLArray(const InType& data)
+  {
+    for(size_t i = 0; i < Dimension; i++)
+    {
+      m_Array[i] = data[i];
+    }
+  }
+
   //========================================= STL INTERFACE COMPATIBILITY =================================
   using size_type = size_t;
   using value_type = T;
@@ -62,8 +74,8 @@ class SIMPLArray
   using iterator_category = std::input_iterator_tag;
   using pointer = T*;
   using difference_type = value_type;
-  using iterator = typename std::array<T, 3>::iterator;
-  using const_iterator = typename std::array<T, 3>::const_iterator;
+  using iterator = typename std::array<T, Dimension>::iterator;
+  using const_iterator = typename std::array<T, Dimension>::const_iterator;
   //========================================= END STL INTERFACE COMPATIBILITY ==============================
 
   /**
@@ -172,6 +184,22 @@ class SIMPLArray
     return m_Array == rhs.m_Array;
   }
 
+  /**
+   * @brief Converts to another container type. The output type that is being used needs to have the "push_back()" method implemented.
+   *
+   *   For STL containers this includes Vector, Deque. QVector will also work.
+   */
+  template <typename OutContainerType>
+  OutContainerType toContainer()
+  {
+    OutContainerType dest(Dimension);
+    for(typename OutContainerType::size_type i = 0; i < Dimension; i++)
+    {
+      dest[i] = m_Array[i];
+    }
+    return dest;
+  }
+
 protected:
   void setValue(size_t i, value_type value)
   {
@@ -203,29 +231,54 @@ class IVec2 : public SIMPLArray<T, 2>
     (*this)[0] = static_cast<T>(0);
     (*this)[1] = static_cast<T>(0);
   }
-
+  /**
+   * @brief IVec2
+   * @param x
+   * @param y
+   */
   IVec2(T x, T y)
   {
     (*this)[0] = x;
     (*this)[1] = y;
   }
-
-  IVec2(std::array<T, 2> data)
+  /**
+   * @brief IVec2
+   * @param data
+   */
+  IVec2(const std::array<T, 2>& data)
   {
     (*this)[0] = data[0];
     (*this)[1] = data[1];
   }
-  IVec2(std::tuple<T, T> data)
+  /**
+   * @brief IVec2
+   * @param data
+   */
+  IVec2(const std::tuple<T, T>& data)
   {
     (*this)[0] = std::get<0>(data);
     (*this)[1] = std::get<1>(data);
   }
+  /**
+   * @brief IVec2
+   * @param data
+   */
   IVec2(const T* data)
   {
     (*this)[0] = data[0];
     (*this)[1] = data[1];
   }
 
+  /**
+   * @brief IVec2
+   * @param data
+   */
+  IVec2(const std::vector<T>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+  }
+
   inline T getX() const
   {
     return ParentType::operator[](0);
@@ -244,13 +297,30 @@ class IVec2 : public SIMPLArray<T, 2>
   }
 
   /**
-   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @brief this is a convenience function that helps with the python bindings
+   */
+  inline void setValues(const T& x, const T& y)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+  }
+
+  /**
+   * @brief values Converts the internal data structure to a std::tuple<T, T, T>
    * @return
    */
-  std::tuple<T, T> toTuple() const
+  std::tuple<T, T> values() const
   {
     return std::make_tuple(getX(), getY());
   }
+  /**
+   *
+   */
+  template <typename OutType>
+  IVec2<OutType> convertType()
+  {
+    return IVec2<OutType>(static_cast<OutType>((*this)[0]), static_cast<OutType>((*this)[1]));
+  }
 };
 
 using FloatVec2Type = IVec2<float>;
@@ -258,7 +328,8 @@ using IntVec2Type = IVec2<int>;
 using SizeVec2Type = IVec2<size_t>;
 
 // -----------------------------------------------------------------------------
-template <typename T> class IVec3 : public SIMPLArray<T, 3>
+template <typename T>
+class IVec3 : public SIMPLArray<T, 3>
 {
   using ParentType = SIMPLArray<T, 3>;
 public:
@@ -277,32 +348,58 @@ template <typename T> class IVec3 : public SIMPLArray<T, 3>
     (*this)[1] = static_cast<T>(0);
     (*this)[2] = static_cast<T>(0);
   }
-
+  /**
+   * @brief IVec3
+   * @param x
+   * @param y
+   * @param z
+   */
   IVec3(T x, T y, T z)
   {
     (*this)[0] = x;
     (*this)[1] = y;
     (*this)[2] = z;
   }
-
-  IVec3(std::array<T, 3> data)
+  /**
+   * @brief IVec3
+   * @param data
+   */
+  IVec3(const std::array<T, 3>& data)
   {
     (*this)[0] = data[0];
     (*this)[1] = data[1];
     (*this)[2] = data[2];
   }
-  IVec3(std::tuple<T, T, T> data)
+  /**
+   * @brief IVec3
+   * @param data
+   */
+  IVec3(const std::tuple<T, T, T>& data)
   {
     (*this)[0] = std::get<0>(data);
     (*this)[1] = std::get<1>(data);
     (*this)[2] = std::get<2>(data);
   }
+  /**
+   * @brief IVec3
+   * @param data
+   */
   IVec3(const T* data)
   {
     (*this)[0] = data[0];
     (*this)[1] = data[1];
     (*this)[2] = data[2];
   }
+  /**
+   * @brief IVec3
+   * @param data
+   */
+  IVec3(const std::vector<T>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+  }
 
   inline T getX() const
   {
@@ -330,18 +427,33 @@ template <typename T> class IVec3 : public SIMPLArray<T, 3>
   }
 
   /**
-   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @brief this is a convenience function that helps with the python bindings
+   */
+  inline void setValues(const T& x, const T& y, const T& z)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+  }
+
+  /**
+   * @brief values Converts the internal data structure to a std::tuple<T, T, T>
    * @return
    */
-  std::tuple<T, T, T> toTuple() const
+  std::tuple<T, T, T> values() const
   {
     return std::make_tuple(getX(), getY(), getZ());
   }
-};
 
-using FloatVec3Type = IVec3<float>;
-using IntVec3Type = IVec3<int>;
-using SizeVec3Type = IVec3<size_t>;
+  /**
+   * @brief Converts to a new SIMPLArray with a different storage data type
+   */
+  template <typename OutType>
+  IVec3<OutType> convertType()
+  {
+    return IVec3<OutType>(static_cast<OutType>((*this)[0]), static_cast<OutType>((*this)[1]), static_cast<OutType>((*this)[2]));
+  }
+};
 
 // -----------------------------------------------------------------------------
 template <typename T> class IVec4 : public SIMPLArray<T, 4>
@@ -364,7 +476,13 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
     (*this)[2] = static_cast<T>(0);
     (*this)[3] = static_cast<T>(0);
   }
-
+  /**
+   * @brief IVec4
+   * @param x
+   * @param y
+   * @param z
+   * @param w
+   */
   IVec4(T x, T y, T z, T w)
   {
     (*this)[0] = x;
@@ -372,21 +490,32 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
     (*this)[2] = z;
     (*this)[3] = w;
   }
-
-  IVec4(std::array<T, 4> data)
+  /**
+   * @brief IVec4
+   * @param data
+   */
+  IVec4(const std::array<T, 4>& data)
   {
     (*this)[0] = data[0];
     (*this)[1] = data[1];
     (*this)[2] = data[2];
     (*this)[3] = data[3];
   }
-  IVec4(std::tuple<T, T> data)
+  /**
+   * @brief IVec4
+   * @param data
+   */
+  IVec4(const std::tuple<T, T, T, T>& data)
   {
     (*this)[0] = std::get<0>(data);
     (*this)[1] = std::get<1>(data);
     (*this)[2] = std::get<2>(data);
     (*this)[3] = std::get<3>(data);
   }
+  /**
+   * @brief IVec4
+   * @param data
+   */
   IVec4(const T* data)
   {
     (*this)[0] = data[0];
@@ -394,6 +523,17 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
     (*this)[2] = data[2];
     (*this)[3] = data[3];
   }
+  /**
+   * @brief IVec4
+   * @param data
+   */
+  IVec4(const std::vector<T>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+  }
 
   inline T getX() const
   {
@@ -428,13 +568,165 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
     (*this)[3] = w;
   }
 
-  std::tuple<T, T> toTuple() const
+  /**
+   * @brief this is a convenience function that helps with the python bindings
+   */
+  inline void setValues(const T& x, const T& y, const T& z, const T& w)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = w;
+  }
+
+  std::tuple<T, T, T, T> values() const
   {
     return std::make_tuple(getX(), getY(), getZ(), getW());
   }
+
+  /**
+   * @brief Converts this array into another array using a static_cast<OutType> mechanism
+   */
+  template <typename OutType>
+  IVec4<OutType> convertType()
+  {
+    return IVec4<OutType>(static_cast<OutType>((*this)[0]), static_cast<OutType>((*this)[1]), static_cast<OutType>((*this)[2]), static_cast<OutType>((*this)[3]));
+  }
+};
+
+// -----------------------------------------------------------------------------
+template <typename T>
+class IVec6 : public SIMPLArray<T, 6>
+{
+  using ParentType = SIMPLArray<T, 6>;
+
+public:
+  IVec6(const IVec6&) = default;
+  IVec6(IVec6&&) noexcept = default;
+  IVec6& operator=(const IVec6&) = default;
+  IVec6& operator=(IVec6&&) noexcept = default;
+  ~IVec6() = default;
+
+  /**
+   * @brief IVec6 Default constructor initializes all values to ZERO.
+   */
+  IVec6()
+  {
+    (*this)[0] = static_cast<T>(0);
+    (*this)[1] = static_cast<T>(0);
+    (*this)[2] = static_cast<T>(0);
+    (*this)[3] = static_cast<T>(0);
+    (*this)[4] = static_cast<T>(0);
+    (*this)[5] = static_cast<T>(0);
+  }
+  /**
+   * @brief IVec6
+   * @param x
+   * @param y
+   * @param z
+   * @param a
+   * @param b
+   * @param c
+   */
+  IVec6(T x, T y, T z, T a, T b, T c)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = a;
+    (*this)[4] = b;
+    (*this)[5] = c;
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec6(const std::array<T, 6>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec6(const std::tuple<T, T, T, T, T, T>& data)
+  {
+    (*this)[0] = std::get<0>(data);
+    (*this)[1] = std::get<1>(data);
+    (*this)[2] = std::get<2>(data);
+    (*this)[3] = std::get<3>(data);
+    (*this)[4] = std::get<4>(data);
+    (*this)[5] = std::get<5>(data);
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec6(const T* data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec6(const std::vector<T>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+  }
+
+  /**
+   * @brief this is a convenience function that helps with the python bindings
+   */
+  inline void setValues(const T& x, const T& y, const T& z, const T& i, const T& j, const T& k)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = i;
+    (*this)[4] = j;
+    (*this)[5] = k;
+  }
+
+  std::tuple<T, T, T, T, T, T> values() const
+  {
+    return std::make_tuple((*this)[0], (*this)[1], (*this)[2], (*this)[3], (*this)[4], (*this)[5]);
+  }
+
+  /**
+   * @brief Converts this array into another array using a static_cast<OutType> mechanism
+   */
+  template <typename OutType>
+  IVec6<OutType> convertType()
+  {
+    return IVec6<OutType>(static_cast<OutType>((*this)[0]), static_cast<OutType>((*this)[1]), static_cast<OutType>((*this)[2]), static_cast<OutType>((*this)[3]), static_cast<OutType>((*this)[4]),
+                          static_cast<OutType>((*this)[5]));
+  }
 };
 
+using FloatVec3Type = IVec3<float>;
+using IntVec3Type = IVec3<int>;
+using SizeVec3Type = IVec3<size_t>;
+
 using QuaternionType = IVec4<float>;
 using FloatVec4Type = IVec4<float>;
 using IntVec4Type = IVec4<int>;
 using SizeVec4Type = IVec4<size_t>;
+
+using FloatVec6Type = IVec6<float>;
+using IntVec6Type = IVec6<int32_t>;
diff --git a/Source/SIMPLib/Common/SIMPLibDLLExport.h b/Source/SIMPLib/Common/SIMPLibDLLExport.h
index 2f6e83a7d4..6df4516503 100755
--- a/Source/SIMPLib/Common/SIMPLibDLLExport.h
+++ b/Source/SIMPLib/Common/SIMPLibDLLExport.h
@@ -42,17 +42,16 @@
 #pragma warning(disable: 4800) /*  warning C4800: 'double' : forcing value to bool 'true' or 'false' */
 #endif
 
-
 /* Cmake will define SIMPLib_EXPORTS on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
 projects by hand you need to define SIMPLib_EXPORTS when
-building the MXADatModel DLL on windows.
+building on Windows with MSVC.
 */
 
 #if defined (SIMPLib_BUILT_AS_DYNAMIC_LIB)
 
-#if defined (SIMPLib_EXPORTS)  /* Compiling the MXA DLL/Dylib */
+#if defined(SIMPLib_EXPORTS) /* Compiling the SIMPLib DLL/Dylib */
 #if defined (_MSC_VER)  /* MSVC Compiler Case */
 #define  SIMPLib_EXPORT __declspec(dllexport)
 #define EXPIMP_TEMPLATE
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index db8c189f9e..27881ba6be 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -258,27 +258,28 @@ public:     \
 #define SIMPL_GET_PROPERTY_DECL(type, prpty)\
   type get##prpty() const;
 
-#define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  public:\
-  SIMPL_SET_PROPERTY_DECL(type, prpty)\
+#define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)                                                                                                                                                      \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_PROPERTY_DECL(type, prpty)                                                                                                                                                                 \
   SIMPL_GET_PROPERTY_DECL(type, prpty)
 
-#define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  public:\
-  SIMPL_SET_PROPERTY_DECL(type, prpty)\
+#define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)                                                                                                                                                      \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_PROPERTY_DECL(type, prpty)                                                                                                                                                                 \
   SIMPL_GET_PROPERTY_DECL(type, prpty)
 
-#define SIMPL_VIRTUAL_INSTANCE_PROPERTY_DECL(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  public:\
-  virtual SIMPL_SET_PROPERTY_DECL(type, prpty)\
-  virtual SIMPL_GET_PROPERTY_DECL(type, prpty)
-
+#define SIMPL_VIRTUAL_INSTANCE_PROPERTY_DECL(type, prpty)                                                                                                                                              \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  virtual SIMPL_SET_PROPERTY_DECL(type, prpty) virtual SIMPL_GET_PROPERTY_DECL(type, prpty)
 
 #define SIMPL_SET_PROPERTY_DEF(class, type, prpty)\
   void class::set##prpty(const type& value) { this->m_##prpty = value; }
@@ -297,19 +298,19 @@ public:     \
 /**
 * @brief
 */
-#define SIMPL_VIRTUAL_INSTANCE_PROPERTY(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  public:\
-  virtual SIMPL_SET_PROPERTY(type, prpty)\
-  virtual SIMPL_GET_PROPERTY(type, prpty)
-
+#define SIMPL_VIRTUAL_INSTANCE_PROPERTY(type, prpty)                                                                                                                                                   \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  virtual SIMPL_SET_PROPERTY(type, prpty) virtual SIMPL_GET_PROPERTY(type, prpty)
 
-#define SIMPL_INSTANCE_PROPERTY(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  public:\
-  SIMPL_SET_PROPERTY(type, prpty)\
+#define SIMPL_INSTANCE_PROPERTY(type, prpty)                                                                                                                                                           \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_PROPERTY(type, prpty)                                                                                                                                                                      \
   SIMPL_GET_PROPERTY(type, prpty)
 
 #define SIMPL_POINTER_PROPERTY(type, prpty)                                                                                                                                                            \
@@ -323,11 +324,11 @@ public:
   }                                                                                                                                                                                                    \
   SIMPL_GET_PROPERTY(type*, prpty)
 
-#define SIMPL_PRIVATE_INSTANCE_PROPERTY(type, prpty)\
-  private:\
-  type   m_##prpty = {};\
-  SIMPL_SET_PROPERTY(type, prpty)\
-  public:\
+#define SIMPL_PRIVATE_INSTANCE_PROPERTY(type, prpty)                                                                                                                                                   \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+  SIMPL_SET_PROPERTY(type, prpty)                                                                                                                                                                      \
+public:                                                                                                                                                                                                \
   SIMPL_GET_PROPERTY(type, prpty)
 
 /* *****************************************************************************
@@ -502,26 +503,27 @@ public:
     return d->m_##prpty;\
   }
 
-#define SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
-  void Class::set##prpty(const type& value) {\
-    Q_D(Class);\
-    d->m_##prpty = value;\
-  }\
-
+#define SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)                                                                                                                                               \
+  void Class::set##prpty(const type& value)                                                                                                                                                            \
+  {                                                                                                                                                                                                    \
+    Q_D(Class);                                                                                                                                                                                        \
+    d->m_##prpty = value;                                                                                                                                                                              \
+  }
 
-#define SIMPL_OVERLOAD_PROPERTY(type, prpty, overload)\
-  private:\
-  type m_##prpty = {};\
-  public:\
-  SIMPL_SET_PROPERTY(overload, prpty)\
+#define SIMPL_OVERLOAD_PROPERTY(type, prpty, overload)                                                                                                                                                 \
+private:                                                                                                                                                                                               \
+  type m_##prpty = {};                                                                                                                                                                                 \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_PROPERTY(overload, prpty)                                                                                                                                                                  \
   SIMPL_GET_PROPERTY(overload, prpty)
 
-#define SIMPL_BOOL_PROPERTY(prpty)\
-  private:\
-  bool m_##prpty = false;\
-  public:\
-  virtual SIMPL_SET_PROPERTY(bool, prpty)\
-  SIMPL_GET_BOOL_PROPERTY(prpty)\
+#define SIMPL_BOOL_PROPERTY(prpty)                                                                                                                                                                     \
+private:                                                                                                                                                                                               \
+  bool m_##prpty = false;                                                                                                                                                                              \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  virtual SIMPL_SET_PROPERTY(bool, prpty) SIMPL_GET_BOOL_PROPERTY(prpty)
 
 #define SIMPL_GET_BOOL_PROPERTY(prpty)\
   public:\
diff --git a/Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
similarity index 54%
rename from Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp
rename to Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index cf464a684a..cdc9500246 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/AbstractVecTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -30,7 +30,14 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <deque>
+#include <forward_list>
 #include <iostream>
+#include <list>
+#include <vector>
+
+#include <QtCore/QList>
+#include <QtCore/QVector>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
@@ -38,16 +45,16 @@
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
-class AbstractVecTest
+class SIMPLArrayTest
 {
 public:
-  AbstractVecTest() = default;
-  virtual ~AbstractVecTest() = default;
+  SIMPLArrayTest() = default;
+  virtual ~SIMPLArrayTest() = default;
 
-  AbstractVecTest(const AbstractVecTest&) = delete;            // Copy Constructor Not Implemented
-  AbstractVecTest(AbstractVecTest&&) = delete;                 // Move Constructor Not Implemented
-  AbstractVecTest& operator=(const AbstractVecTest&) = delete; // Copy Assignment Not Implemented
-  AbstractVecTest& operator=(AbstractVecTest&&) = delete;      // Move Assignment Not Implemented
+  SIMPLArrayTest(const SIMPLArrayTest&) = delete;            // Copy Constructor Not Implemented
+  SIMPLArrayTest(SIMPLArrayTest&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLArrayTest& operator=(const SIMPLArrayTest&) = delete; // Copy Assignment Not Implemented
+  SIMPLArrayTest& operator=(SIMPLArrayTest&&) = delete;      // Move Assignment Not Implemented
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -79,13 +86,18 @@ class AbstractVecTest
     int32_t y = i3.getY();
     DREAM3D_REQUIRED(y, ==, 5)
 
-    tpl = i3.toTuple();
+    tpl = i3.values();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
 
     DREAM3D_REQUIRED(i3.size(), ==, 2)
     DREAM3D_REQUIRED(i3[0], ==, 4)
     DREAM3D_REQUIRED(i3[1], ==, 5)
+
+    std::vector<int32_t> oVec = i3.toContainer<std::vector<int32_t>>();
+    std::deque<int32_t> oDeque = i3.toContainer<std::deque<int32_t>>();
+
+    QVector<int32_t> oQVec = i3.toContainer<QVector<int32_t>>();
   }
 
   // -----------------------------------------------------------------------------
@@ -111,7 +123,7 @@ class AbstractVecTest
     int32_t z = i3.getZ();
     DREAM3D_REQUIRED(z, ==, 6)
 
-    tpl = i3.toTuple();
+    tpl = i3.values();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
     DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
@@ -120,6 +132,91 @@ class AbstractVecTest
     DREAM3D_REQUIRED(i3[0], ==, 4)
     DREAM3D_REQUIRED(i3[1], ==, 5)
     DREAM3D_REQUIRED(i3[2], ==, 6)
+
+    std::vector<int32_t> oVec = i3.toContainer<std::vector<int32_t>>();
+    std::deque<int32_t> oDeque = i3.toContainer<std::deque<int32_t>>();
+
+    QVector<int32_t> oQVec = i3.toContainer<QVector<int32_t>>();
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestVec4()
+  {
+    FloatVec4Type f3(1.0f, 2.0f, 3.0f, 4.0f);
+
+    std::array<int32_t, 4> i32Array = {
+        1,
+        2,
+        3,
+        4,
+    };
+    IntVec4Type i3(i32Array);
+
+    std::tuple<int32_t, int32_t, int32_t, int32_t> tpl = std::make_tuple(1, 2, 3, 4);
+    i3 = tpl;
+
+    std::vector<int32_t> iv3 = {4, 5, 6, 7};
+    i3 = iv3.data();
+
+    int32_t x = i3.getX();
+    DREAM3D_REQUIRED(x, ==, 4)
+    int32_t y = i3.getY();
+    DREAM3D_REQUIRED(y, ==, 5)
+    int32_t z = i3.getZ();
+    DREAM3D_REQUIRED(z, ==, 6)
+
+    tpl = i3.values();
+    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
+    DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
+    DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
+
+    DREAM3D_REQUIRED(i3.size(), ==, 4)
+    DREAM3D_REQUIRED(i3[0], ==, 4)
+    DREAM3D_REQUIRED(i3[1], ==, 5)
+    DREAM3D_REQUIRED(i3[2], ==, 6)
+    DREAM3D_REQUIRED(i3[3], ==, 7)
+
+    std::vector<int32_t> oVec = i3.toContainer<std::vector<int32_t>>();
+    std::deque<int32_t> oDeque = i3.toContainer<std::deque<int32_t>>();
+
+    QVector<int32_t> oQVec = i3.toContainer<QVector<int32_t>>();
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestVec6()
+  {
+    FloatVec6Type f3(1.0f, 2.0f, 3.0f, 6.0f, 7.0f, 8.0f);
+
+    std::array<int32_t, 6> i32Array = {1, 2, 3, 4, 5, 6};
+    IntVec6Type i3(i32Array);
+
+    std::tuple<int32_t, int32_t, int32_t, int32_t, int32_t, int32_t> tpl = std::make_tuple(1, 2, 3, 5, 6, 7);
+    i3 = tpl;
+
+    std::vector<int32_t> iv3 = {4, 5, 6, 7, 8, 9};
+    i3 = iv3.data();
+
+    tpl = i3.values();
+    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
+    DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
+    DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
+
+    DREAM3D_REQUIRED(i3.size(), ==, 6)
+    DREAM3D_REQUIRED(i3[0], ==, 4)
+    DREAM3D_REQUIRED(i3[1], ==, 5)
+    DREAM3D_REQUIRED(i3[2], ==, 6)
+    DREAM3D_REQUIRED(i3[3], ==, 7)
+    DREAM3D_REQUIRED(i3[4], ==, 8)
+    DREAM3D_REQUIRED(i3[5], ==, 9)
+
+    std::vector<int32_t> oVec = i3.toContainer<std::vector<int32_t>>();
+    std::deque<int32_t> oDeque = i3.toContainer<std::deque<int32_t>>();
+
+    QVector<int32_t> oQVec = i3.toContainer<QVector<int32_t>>();
   }
   // -----------------------------------------------------------------------------
   //
@@ -128,12 +225,14 @@ class AbstractVecTest
   {
     int err = EXIT_SUCCESS;
 
-    std::cout << "#### AbstractVecTest Starting ####" << std::endl;
+    std::cout << "#### SIMPLArrayTest Starting ####" << std::endl;
 #if !REMOVE_TEST_FILES
     DREAM3D_REGISTER_TEST(RemoveTestFiles())
 #endif
     DREAM3D_REGISTER_TEST(TestVec2())
     DREAM3D_REGISTER_TEST(TestVec3())
+    DREAM3D_REGISTER_TEST(TestVec4())
+    DREAM3D_REGISTER_TEST(TestVec6())
 
 #if REMOVE_TEST_FILES
     DREAM3D_REGISTER_TEST(RemoveTestFiles())
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
index ac19f736c8..8775c7812f 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/Common/Testing/Cxx/SourceList.cmake
@@ -1,6 +1,6 @@
 
 set(TEST_${SUBDIR_NAME}_NAMES
-  AbstractVecTest
+  SIMPLArrayTest
 )
 
 SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 4515f4cbdb..0e2dc36811 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -145,8 +145,7 @@ void ApplyImageTransforms::execute()
     DataContainer::Pointer dc = getDataContainerArray()->getDataContainer(dcName);
     ImageGeom::Pointer imageGeom = dc->getGeometryAs<ImageGeom>();
 
-    FloatVec3Type origin;
-    imageGeom->getOrigin(origin);
+    FloatVec3Type origin = imageGeom->getOrigin();
 
     ::ITransformContainer::Pointer iTransformContainer = imageGeom->getTransformContainer();
     if (iTransformContainer)
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index c00eeb422d..58de5b0968 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -138,9 +138,9 @@ void CreateImageGeometry::dataCheck()
   }
 
   ImageGeom::Pointer image = ImageGeom::CreateGeometry("ImageGeometry");
-  image->setDimensions(std::make_tuple(m_Dimensions[0], m_Dimensions[1], m_Dimensions[2]));
-  image->setSpacing(std::make_tuple(m_Spacing[0], m_Spacing[1], m_Spacing[2]));
-  image->setOrigin(std::make_tuple(m_Origin[0], m_Origin[1], m_Origin[2]));
+  image->setDimensions(m_Dimensions.convertType<size_t>());
+  image->setSpacing(m_Spacing);
+  image->setOrigin(m_Origin);
   m->setGeometry(image);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index b0d46acc77..590265fa08 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -58,8 +58,6 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     PYB11_CREATE_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
     PYB11_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
-    PYB11_PROPERTY(QString LastFileRead READ getLastFileRead WRITE setLastFileRead)
-    PYB11_PROPERTY(QDateTime LastRead READ getLastRead WRITE setLastRead)
     PYB11_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
 
     PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS path)
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index d5cab1cbff..6b33e8dde2 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -175,7 +175,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
   private:
     QWaitCondition                                      m_WaitCondition;
     QMutex                                              m_Mutex;
-    bool                                                m_Pause = false;
+    bool m_Pause = false;
     QSharedPointer<QProcess>                            m_ProcessPtr;
 
     /**
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 2778d46fbe..26089f1816 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -181,10 +181,10 @@ void ExtractVertexGeometry::dataCheck()
   {
     vertexDataContainer = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getVertexDataContainerName(), DataContainerID);
     IGeometryGrid::Pointer imageGeom = std::dynamic_pointer_cast<IGeometryGrid>(fromGeometry);
-    SIMPL::Tuple3SVec imageDims = imageGeom->getDimensions();
-    VertexGeom::Pointer vertexGeom = VertexGeom::CreateGeometry(static_cast<int64_t>(std::get<0>(imageDims) * std::get<1>(imageDims) * std::get<2>(imageDims)), "VertexGeometry", !getInPreflight());
+    SizeVec3Type imageDims = imageGeom->getDimensions();
+    VertexGeom::Pointer vertexGeom = VertexGeom::CreateGeometry(imageDims[0] * imageDims[1] * imageDims[2], "VertexGeometry", !getInPreflight());
     vertexDataContainer->setGeometry(vertexGeom);
-    elementCount = std::get<0>(imageDims) * std::get<1>(imageDims) * std::get<2>(imageDims);
+    elementCount = imageDims[0] * imageDims[1] * imageDims[2];
   }
   else
   {
@@ -277,12 +277,9 @@ void ExtractVertexGeometry::execute()
   IGeometryGrid::Pointer sourceGeometry = getDataContainerArray()->getDataContainer(getSelectedDataContainerName())->getGeometryAs<IGeometryGrid>();
 
   float coords[3] = {0.0f, 0.0f, 0.0f};
-  size_t xPoints = 0;
-  size_t yPoints = 0;
-  size_t zPoints = 0;
 
-  std::tie(xPoints, yPoints, zPoints) = sourceGeometry->getDimensions();
-  size_t cellCount = xPoints * yPoints * zPoints;
+  SizeVec3Type dims = sourceGeometry->getDimensions();
+  size_t cellCount = std::accumulate(dims.begin(), dims.end(), static_cast<size_t>(1), std::multiplies<size_t>());
 
   VertexGeom::Pointer vertexGeom = getDataContainerArray()->getDataContainer(getVertexDataContainerName())->getGeometryAs<VertexGeom>();
   SharedVertexList::Pointer vertices = vertexGeom->getVertices();
@@ -294,9 +291,6 @@ void ExtractVertexGeometry::execute()
     sourceGeometry->getCoords(idx, coords);
     vertices->setTuple(idx, coords);
   }
-
-  // The moving or copying of the Cell DataArrays was already handled in the dataCheck() method.
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index d7e818fecb..c7ad987abb 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -429,12 +429,6 @@ IDataArray::Pointer ImportHDF5Dataset::readIDataArray(hid_t gid, const QString&
   case H5T_STRING:
     res.clear(); // Clear the string out first
     err = QH5Lite::readStringDataset(gid, name, res);
-    //        if(err >= 0)
-    //        {
-    //          IDataArray::Pointer attr = MXAAsciiStringData::Create(res);
-    //          attr->setName(name);
-    //          attributes[*iter] = attr;
-    //        }
     break;
   case H5T_INTEGER:
     // qDebug() << "User Meta Data Type is Integer" ;
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 9bef711254..dd18f6c9e0 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -229,8 +229,7 @@ void InitializeData::dataCheck()
 
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
 
-  size_t udims[3] = {0, 0, 0};
-  std::tie(udims[0], udims[1], udims[2]) = m->getGeometryAs<ImageGeom>()->getDimensions();
+  // SizeVec3Type udims = m->getGeometryAs<ImageGeom>()->getDimensions();
 
   QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
   QList<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
@@ -359,8 +358,7 @@ void InitializeData::execute()
   DataArrayPath attributeMatrixPath(m_CellAttributeMatrixPaths[0].getDataContainerName(), m_CellAttributeMatrixPaths[0].getAttributeMatrixName(), "");
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
 
-  size_t udims[3] = {0, 0, 0};
-  std::tie(udims[0], udims[1], udims[2]) = m->getGeometryAs<ImageGeom>()->getDimensions();
+  SizeVec3Type udims = m->getGeometryAs<ImageGeom>()->getDimensions();
 
   int64_t dims[3] = {
       static_cast<int64_t>(udims[0]), static_cast<int64_t>(udims[1]), static_cast<int64_t>(udims[2]),
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 43893d0b11..9a12b49d97 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -120,8 +120,7 @@ void RequiredZThickness::dataCheck()
     return;
   }
 
-  size_t dims[3] = {0, 0, 0};
-  std::tie(dims[0], dims[1], dims[2]) = image->getDimensions();
+  SizeVec3Type dims = image->getDimensions();
 
   if(dims[2] < getNumZVoxels() && m_PreflightCheck)
   {
@@ -179,8 +178,7 @@ void RequiredZThickness::execute()
 
   ImageGeom::Pointer image = dataContainer->getGeometryAs<ImageGeom>();
 
-  size_t dims[3] = {0, 0, 0};
-  std::tie(dims[0], dims[1], dims[2]) = image->getDimensions();
+  SizeVec3Type dims = image->getDimensions();
 
   if(dims[2] < getNumZVoxels())
   {
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 40cc648246..59622f2363 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -274,8 +274,7 @@ void ScaleVolume::execute()
     DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
     ImageGeom::Pointer image = m->getGeometryAs<ImageGeom>();
 
-    FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
-    image->getSpacing(spacing);
+    FloatVec3Type spacing = image->getSpacing();
     spacing[0] *= m_ScaleFactor[0];
     spacing[1] *= m_ScaleFactor[1];
     spacing[2] *= m_ScaleFactor[2];
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 8988f16817..0f9574c659 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -293,18 +293,18 @@ class CopyObjectTest
         ImageGeom::Pointer oldImageGeom = std::dynamic_pointer_cast<ImageGeom>(oldGeom);
         ImageGeom::Pointer newImageGeom = std::dynamic_pointer_cast<ImageGeom>(newGeom);
 
-        SIMPL::Tuple3SVec oldDims = oldImageGeom->getDimensions();
-        SIMPL::Tuple3SVec newDims = newImageGeom->getDimensions();
+        SizeVec3Type oldDims = oldImageGeom->getDimensions();
+        SizeVec3Type newDims = newImageGeom->getDimensions();
         bool sameDims = (oldDims == newDims);
         DREAM3D_REQUIRE_EQUAL(sameDims, true)
 
-        SIMPL::Tuple3FVec oldRes = oldImageGeom->getSpacing();
-        SIMPL::Tuple3FVec newRes = newImageGeom->getSpacing();
+        FloatVec3Type oldRes = oldImageGeom->getSpacing();
+        FloatVec3Type newRes = newImageGeom->getSpacing();
         bool sameRes = (oldRes == newRes);
         DREAM3D_REQUIRE_EQUAL(sameRes, true)
 
-        SIMPL::Tuple3FVec oldOrigin = oldImageGeom->getOrigin();
-        SIMPL::Tuple3FVec newOrigin = newImageGeom->getOrigin();
+        FloatVec3Type oldOrigin = oldImageGeom->getOrigin();
+        FloatVec3Type newOrigin = newImageGeom->getOrigin();
         bool sameOrigin = (oldOrigin == newOrigin);
         DREAM3D_REQUIRE_EQUAL(sameOrigin, true)
       }
@@ -313,8 +313,8 @@ class CopyObjectTest
         RectGridGeom::Pointer oldRectGridGeom = std::dynamic_pointer_cast<RectGridGeom>(oldGeom);
         RectGridGeom::Pointer newRectGridGeom = std::dynamic_pointer_cast<RectGridGeom>(newGeom);
 
-        SIMPL::Tuple3SVec oldDims = oldRectGridGeom->getDimensions();
-        SIMPL::Tuple3SVec newDims = newRectGridGeom->getDimensions();
+        SizeVec3Type oldDims = oldRectGridGeom->getDimensions();
+        SizeVec3Type newDims = newRectGridGeom->getDimensions();
         bool sameDims = (oldDims == newDims);
         DREAM3D_REQUIRE_EQUAL(sameDims, true)
 
@@ -766,7 +766,7 @@ class CopyObjectTest
     // Image
 
     ImageGeom::Pointer imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    imageGeom->setDimensions(std::forward_as_tuple(5, 5, 5));
+    imageGeom->setDimensions(SizeVec3Type(5, 5, 5));
     imageGeom->setSpacing(FloatVec3Type(5, 5, 5));
     imageGeom->setOrigin(FloatVec3Type(5, 5, 5));
     imageGeom->setName("Image Geom");
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index d13b0e7184..a7d9de3e02 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -173,21 +173,21 @@ class CreateGeometryTest
 
     ImageGeom::Pointer imageGeom = dc->getGeometryAs<ImageGeom>();
 
-    SIMPL::Tuple3SVec dim = imageGeom->getDimensions();
-    SIMPL::Tuple3FVec origin = imageGeom->getOrigin();
-    SIMPL::Tuple3FVec res = imageGeom->getSpacing();
+    SizeVec3Type dim = imageGeom->getDimensions();
+    FloatVec3Type origin = imageGeom->getOrigin();
+    FloatVec3Type res = imageGeom->getSpacing();
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(dim), numDimensions[0])
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(dim), numDimensions[1])
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(dim), numDimensions[2])
+    DREAM3D_REQUIRE_EQUAL(dim[0], numDimensions[0])
+    DREAM3D_REQUIRE_EQUAL(dim[1], numDimensions[1])
+    DREAM3D_REQUIRE_EQUAL(dim[2], numDimensions[2])
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(origin), originPos[0])
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(origin), originPos[1])
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(origin), originPos[2])
+    DREAM3D_REQUIRE_EQUAL(origin[0], originPos[0])
+    DREAM3D_REQUIRE_EQUAL(origin[1], originPos[1])
+    DREAM3D_REQUIRE_EQUAL(origin[2], originPos[2])
 
-    DREAM3D_REQUIRE_EQUAL(std::get<0>(res), imgResolution[0])
-    DREAM3D_REQUIRE_EQUAL(std::get<1>(res), imgResolution[1])
-    DREAM3D_REQUIRE_EQUAL(std::get<2>(res), imgResolution[2])
+    DREAM3D_REQUIRE_EQUAL(res[0], imgResolution[0])
+    DREAM3D_REQUIRE_EQUAL(res[1], imgResolution[1])
+    DREAM3D_REQUIRE_EQUAL(res[2], imgResolution[2])
 
     removeGeometry(dc);
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index ab92e05b0b..f3992e9637 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -174,8 +174,7 @@ class CreateImageGeometryTest
     DREAM3D_REQUIRE(nullptr != geometry.get());
 
     {
-      FloatVec3Type res;
-      geometry->getSpacing(res);
+      FloatVec3Type res = geometry->getSpacing();
 
       DREAM3D_REQUIRE_EQUAL(res[0], imgResolution[0]);
       DREAM3D_REQUIRE_EQUAL(res[1], imgResolution[1]);
@@ -183,8 +182,7 @@ class CreateImageGeometryTest
     }
 
     {
-      FloatVec3Type origin;
-      geometry->getOrigin(origin);
+      FloatVec3Type origin = geometry->getOrigin();
 
       DREAM3D_REQUIRE_EQUAL(origin[0], originPos[0]);
       DREAM3D_REQUIRE_EQUAL(origin[1], originPos[1]);
@@ -192,8 +190,7 @@ class CreateImageGeometryTest
     }
 
     {
-      SizeVec3Type dims;
-      geometry->getDimensions(dims);
+      SizeVec3Type dims = geometry->getDimensions();
 
       DREAM3D_REQUIRE_EQUAL(dims[0], numDimensions[0]);
       DREAM3D_REQUIRE_EQUAL(dims[1], numDimensions[1]);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 6bcb1c44b6..bb0d48a882 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -203,10 +203,10 @@ class FindDerivativesFilterTest
     QuadGeom::Pointer quads = QuadGeom::CreateGeometry(1, vertices4, "QuadGeom");
     TetrahedralGeom::Pointer tets = TetrahedralGeom::CreateGeometry(1, vertices5, "TetrahedralGeom");
 
-    image->setDimensions(std::make_tuple(10, 10, 10));
-    image->setOrigin(std::make_tuple(0.0f, 0.0f, 0.0f));
-    image->setSpacing(std::make_tuple(1.0f, 1.0f, 1.0f));
-    rectGrid->setDimensions(std::make_tuple(10, 10, 10));
+    image->setDimensions(10, 10, 10);
+    image->setOrigin(0.0f, 0.0f, 0.0f);
+    image->setSpacing(1.0f, 1.0f, 1.0f);
+    rectGrid->setDimensions(SizeVec3Type(10, 10, 10));
     FloatArrayType::Pointer xBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::xBoundsList);
     FloatArrayType::Pointer yBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::yBoundsList);
     FloatArrayType::Pointer zBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::zBoundsList);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index a9b9f36ee1..d1c423a6d5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -258,8 +258,7 @@ class ScaleVolumeTest
 
     DREAM3D_REQUIRE(imgGeom != nullptr);
 
-    FloatVec3Type spacing;
-    imgGeom->getSpacing(spacing);
+    FloatVec3Type spacing = imgGeom->getSpacing();
 
     DREAM3D_REQUIRE_EQUAL(spacing[0], ScaleVolumeTestConsts::SCALE[0]);
     DREAM3D_REQUIRE_EQUAL(spacing[1], ScaleVolumeTestConsts::SCALE[1]);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 5dff07fe0f..76d37951cc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -252,8 +252,7 @@ class SetOriginResolutionImageGeomTest
 
     DREAM3D_REQUIRE(imgGeom != nullptr);
 
-    FloatVec3Type origin;
-    imgGeom->getOrigin(origin);
+    FloatVec3Type origin = imgGeom->getOrigin();
     DREAM3D_REQUIRE_EQUAL(origin[0], SetOriginResolutionImageGeometryTest::ORIGIN[0]);
     DREAM3D_REQUIRE_EQUAL(origin[1], SetOriginResolutionImageGeometryTest::ORIGIN[1]);
     DREAM3D_REQUIRE_EQUAL(origin[2], SetOriginResolutionImageGeometryTest::ORIGIN[2]);
@@ -278,14 +277,11 @@ class SetOriginResolutionImageGeomTest
 
     DREAM3D_REQUIRE(imgGeom != nullptr);
 
-    float xRes = 0.0f;
-    float yRes = 0.0f;
-    float zRes = 0.0f;
-    std::tie(xRes, yRes, zRes) = imgGeom->getSpacing();
+    FloatVec3Type spacing = imgGeom->getSpacing();
 
-    DREAM3D_REQUIRE_EQUAL(xRes, SetOriginResolutionImageGeometryTest::RESOLUTION[0]);
-    DREAM3D_REQUIRE_EQUAL(yRes, SetOriginResolutionImageGeometryTest::RESOLUTION[1]);
-    DREAM3D_REQUIRE_EQUAL(zRes, SetOriginResolutionImageGeometryTest::RESOLUTION[2]);
+    DREAM3D_REQUIRE_EQUAL(spacing[0], SetOriginResolutionImageGeometryTest::RESOLUTION[0]);
+    DREAM3D_REQUIRE_EQUAL(spacing[1], SetOriginResolutionImageGeometryTest::RESOLUTION[1]);
+    DREAM3D_REQUIRE_EQUAL(spacing[2], SetOriginResolutionImageGeometryTest::RESOLUTION[2]);
   }
 
   // -----------------------------------------------------------------------------
@@ -332,7 +328,9 @@ class SetOriginResolutionImageGeomTest
     DREAM3D_REGISTER_TEST(TestNullGeometry());
   }
 
-private:
-  SetOriginResolutionImageGeomTest(const SetOriginResolutionImageGeomTest&); // Copy Constructor Not Implemented
-  void operator=(const SetOriginResolutionImageGeomTest&);                   // Move assignment Not Implemented
+public:
+  SetOriginResolutionImageGeomTest(const SetOriginResolutionImageGeomTest&) = delete;            // Copy Constructor Not Implemented
+  SetOriginResolutionImageGeomTest(SetOriginResolutionImageGeomTest&&) = delete;                 // Move Constructor Not Implemented
+  SetOriginResolutionImageGeomTest& operator=(const SetOriginResolutionImageGeomTest&) = delete; // Copy Assignment Not Implemented
+  SetOriginResolutionImageGeomTest& operator=(SetOriginResolutionImageGeomTest&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 4c3840e16d..1aa82e7905 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -83,6 +83,7 @@ class SIMPLib_EXPORT DataArrayPath
 
   PYB11_CREATE_BINDINGS(DataArrayPath)
   PYB11_CREATION(ARGS QString QString QString)
+  PYB11_CREATION(ARGS QString)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
   PYB11_PROPERTY(QString DataArrayName READ getDataArrayName WRITE setDataArrayName)
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index c6d9f8581f..aa4e441fa9 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -55,10 +55,10 @@ class SIMPLib_EXPORT DataArrayProxy
 {
   PYB11_CREATE_BINDINGS(DataArrayProxy)
   PYB11_CREATION()
-  PYB11_PROPERTY(QVector<size_t> tupleDims)
-  PYB11_PROPERTY(QVector<size_t> compDims)
-  PYB11_PROPERTY(QString path)
-  PYB11_PROPERTY(QString Name)
+  PYB11_PROPERTY(QVector<size_t> TupleDims READ getTupleDims WRITE setTupleDims)
+  PYB11_PROPERTY(QVector<size_t> CompDims READ getCompDims WRITE setCompDims)
+  PYB11_PROPERTY(QString Path READ getPath WRITE setPath)
+  PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
 public:
   using CompDimsVector = QVector<QVector<size_t>>;
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index b2cfa19747..dfb4621499 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
     /**
     * @brief This does the reverse of the flattenData function.  It expands the data back into a 2D array.
     */
-    static std::vector<std::vector<double> > ExpandData(std::vector<double> orig, size_t nRows, size_t nCols);
+    static std::vector<std::vector<double>> ExpandData(std::vector<double> orig, size_t nRows, size_t nCols);
 
     /**
     * @brief This deserializes a string of headers and returns the original QStringList.
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index 580e11fd33..b58b9e486d 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
 
   private:
-    hid_t                                 m_CurrentGroupId = -1;
+    hid_t m_CurrentGroupId = -1;
 
   public:
     H5FilterParametersWriter(const H5FilterParametersWriter&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 28d546b255..43d1e72aa2 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -170,9 +170,8 @@ void HexahedralGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if(data->getType() != AttributeMatrix::Type::Vertex
-     && data->getType() != AttributeMatrix::Type::Edge
-     && data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
+  if((data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge && data->getType() != AttributeMatrix::Type::Face) ||
+     data->getType() != AttributeMatrix::Type::Cell)
   {
     // HexahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index ce01f91dde..e0adf1efe5 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -377,6 +377,45 @@ QString IGeometry::LengthUnitToString(IGeometry::LengthUnit t)
   return SIMPL::Geometry::k_Unknown;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QVector<QString> IGeometry::GetAllLengthUnitStrings()
+{
+  QVector<QString> lengthUnits;
+
+  lengthUnits.push_back(SIMPL::Geometry::k_Yoctometer);  // ("Yoctometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Zeptometer);  // ("Zeptometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Attometer);   // ("Attometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Femtometer);  // ("Femtometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Picometer);   // ("Picometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Nanometer);   // ("Nanometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Micrometer);  // ("Micrometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Millimeter);  // ("Millimeter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Centimeter);  // ("Centimeter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Decimeter);   // ("Decimeter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Meter);       // ("Meter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Decameter);   // ("Decameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Hectometer);  // ("Hectometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Kilometer);   // ("Kilometer");
+  lengthUnits.push_back(SIMPL::Geometry::k_Megameter);   // ("Megameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Gigameter);   // ("Gigameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Terameter);   // ("Terameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Petameter);   // ("Petameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Exameter);    // ("Exameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Zettameter);  // ("Zettameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Yottameter);  // ("Yottameter");
+  lengthUnits.push_back(SIMPL::Geometry::k_Angstrom);    // ("Angstrom");
+  lengthUnits.push_back(SIMPL::Geometry::k_Mil);         // ("Mil");
+  lengthUnits.push_back(SIMPL::Geometry::k_Inch);        // ("Inch");
+  lengthUnits.push_back(SIMPL::Geometry::k_Foot);        // ("Foot");
+  lengthUnits.push_back(SIMPL::Geometry::k_Mile);        // ("Mile");
+  lengthUnits.push_back(SIMPL::Geometry::k_Fathom);      // ("Fathom");
+  lengthUnits.push_back(SIMPL::Geometry::k_Unspecified); // ("Unspecified");
+  lengthUnits.push_back(SIMPL::Geometry::k_Unknown);     // ("Unknown");
+  return lengthUnits;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 4d7f5b960e..93489ef7db 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -71,6 +71,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
 
   PYB11_ENUMERATION(Type)
   PYB11_ENUMERATION(VtkCellType)
+  PYB11_ENUMERATION(LengthUnit)
 
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_METHOD(Type getGeometryType)
@@ -197,6 +198,12 @@ class SIMPLib_EXPORT IGeometry : public Observable
      */
     static QString LengthUnitToString(IGeometry::LengthUnit t);
 
+    /**
+     * @brief GetAllLengthUnitStrings Returns all the Length Units as a vector of strings. This would be suitable to display as a list to a user.
+     * @return
+     */
+    static QVector<QString> GetAllLengthUnitStrings();
+
     SIMPL_INSTANCE_PROPERTY(float, TimeValue)
     SIMPL_INSTANCE_PROPERTY(bool, EnableTimeSeries)
     SIMPL_INSTANCE_PROPERTY(ITransformContainer::Pointer, TransformContainer)
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index e038d25c68..f9925ea986 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -41,12 +41,6 @@
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
-namespace SIMPL
-{
-using Tuple3FVec = std::tuple<float, float, float>;
-using Tuple6FVec = std::tuple<float, float, float, float, float, float>;
-using Tuple3SVec = std::tuple<size_t, size_t, size_t>;
-}
 
 /**
  * @brief The IGeometryGrid class extends IGeometry for grid type geometries
@@ -64,10 +58,7 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
     ~IGeometryGrid() override;
 
     virtual void setDimensions(const SizeVec3Type& dims) = 0;
-    virtual void setDimensions(SizeVec3Type& dims) = 0;
-    virtual void setDimensions(const SIMPL::Tuple3SVec& dims) = 0; // Needed for Python Interface
-
-    virtual SIMPL::Tuple3SVec getDimensions() const = 0;
+    virtual SizeVec3Type getDimensions() const = 0;
 
     virtual size_t getXPoints() = 0;
     virtual size_t getYPoints() = 0;
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 29a3aea93f..af4233c782 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -63,7 +63,7 @@
 class FindImageDerivativesImpl
 {
 public:
-  FindImageDerivativesImpl(ImageGeom* image, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindImageDerivativesImpl(ImageGeom* image, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Image(image)
   , m_Field(field)
   , m_Derivatives(derivs)
@@ -90,8 +90,7 @@ class FindImageDerivativesImpl
     std::vector<double> dValuesdEta(numComps);
     std::vector<double> dValuesdZeta(numComps);
 
-    size_t dims[3] = {0, 0, 0};
-    std::tie(dims[0], dims[1], dims[2]) = m_Image->getDimensions();
+    SizeVec3Type dims = m_Image->getDimensions();
 
     int64_t counter = 0;
     size_t totalElements = m_Image->getNumberOfElements();
@@ -106,19 +105,19 @@ class FindImageDerivativesImpl
           //  Xi derivatives (X)
           if(dims[0] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(x == 0)
           {
-            findValuesForFiniteDifference(LeftSide, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(x == (dims[0] - 1))
           {
-            findValuesForFiniteDifference(RightSide, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xxi = factor * (xp[0] - xm[0]);
@@ -132,19 +131,19 @@ class FindImageDerivativesImpl
           //  Eta derivatives (Y)
           if(dims[1] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(y == 0)
           {
-            findValuesForFiniteDifference(LeftSide, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(y == (dims[1] - 1))
           {
-            findValuesForFiniteDifference(RightSide, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xeta = factor * (xp[0] - xm[0]);
@@ -158,19 +157,19 @@ class FindImageDerivativesImpl
           //  Zeta derivatives (Z)
           if(dims[2] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(z == 0)
           {
-            findValuesForFiniteDifference(LeftSide, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(z == (dims[2] - 1))
           {
-            findValuesForFiniteDifference(RightSide, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xzeta = factor * (xp[0] - xm[0]);
@@ -235,7 +234,7 @@ class FindImageDerivativesImpl
   }
 #endif
 
-  void computeIndices(int32_t differenceType, int32_t directionType, size_t& index1, size_t& index2, size_t dims[3], size_t x, size_t y, size_t z, double xp[3], double xm[3]) const
+  void computeIndices(int32_t differenceType, int32_t directionType, size_t& index1, size_t& index2, const size_t dims[3], size_t x, size_t y, size_t z, double xp[3], double xm[3]) const
 
   {
     size_t tmpIndex1 = 0;
@@ -338,7 +337,7 @@ class FindImageDerivativesImpl
   }
 
   void findValuesForFiniteDifference(int32_t differenceType, int32_t directionType, size_t x, size_t y, size_t z, size_t dims[3], double xp[3], double xm[3], double& factor, int32_t numComps,
-                                     std::vector<double>& plusValues, std::vector<double>& minusValues, double* field) const
+                                     std::vector<double>& plusValues, std::vector<double>& minusValues, const double* field) const
   {
     size_t index1 = 0;
     size_t index2 = 0;
@@ -436,19 +435,9 @@ ImageGeom::Pointer ImageGeom::CreateGeometry(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPL::Tuple3FVec ImageGeom::getSpacing() const
+FloatVec3Type ImageGeom::getSpacing() const
 {
-  return m_Spacing.toTuple();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImageGeom::getSpacing(FloatVec3Type& spacing) const
-{
-  spacing[0] = m_Spacing[0];
-  spacing[1] = m_Spacing[1];
-  spacing[2] = m_Spacing[2];
+  return m_Spacing;
 }
 
 // -----------------------------------------------------------------------------
@@ -459,14 +448,6 @@ void ImageGeom::setSpacing(const FloatVec3Type& spacing)
   m_Spacing = spacing;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImageGeom::setSpacing(FloatVec3Type& spacing)
-{
-  m_Spacing = spacing;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -480,19 +461,9 @@ void ImageGeom::setSpacing(float x, float y, float z)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPL::Tuple3FVec ImageGeom::getOrigin() const
-{
-  return m_Origin.toTuple();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImageGeom::getOrigin(FloatVec3Type& origin) const
+FloatVec3Type ImageGeom::getOrigin() const
 {
-  origin[0] = m_Origin[0];
-  origin[1] = m_Origin[1];
-  origin[2] = m_Origin[2];
+  return m_Origin;
 }
 
 // -----------------------------------------------------------------------------
@@ -503,14 +474,6 @@ void ImageGeom::setOrigin(const FloatVec3Type& origin)
   m_Origin = origin;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImageGeom::setOrigin(FloatVec3Type& origin)
-{
-  m_Origin = origin;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -521,27 +484,16 @@ void ImageGeom::setOrigin(float x, float y, float z)
   m_Origin[2] = z;
 }
 
-SIMPL::Tuple3SVec ImageGeom::getDimensions() const
-{
-  return m_Dimensions.toTuple();
-}
-void ImageGeom::getDimensions(SizeVec3Type& dims) const
+SizeVec3Type ImageGeom::getDimensions() const
 {
-  dims = m_Dimensions;
+  return m_Dimensions;
 }
 
 void ImageGeom::setDimensions(const SizeVec3Type& dims)
 {
   m_Dimensions = dims;
 }
-void ImageGeom::setDimensions(SizeVec3Type& dims)
-{
-  m_Dimensions = dims;
-}
-void ImageGeom::setDimensions(const SIMPL::Tuple3SVec& dims)
-{
-  m_Dimensions = dims;
-}
+
 void ImageGeom::setDimensions(size_t x, size_t y, size_t z)
 {
   m_Dimensions[0] = x;
@@ -565,10 +517,10 @@ void ImageGeom::getBoundingBox(float* boundingBox)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPL::Tuple6FVec ImageGeom::getBoundingBox()
+FloatVec6Type ImageGeom::getBoundingBox()
 {
-  return std::make_tuple(m_Origin[0], m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]), m_Origin[1], m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]), m_Origin[2],
-                         m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]));
+  return FloatVec6Type(m_Origin[0], m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]), m_Origin[1], m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]), m_Origin[2],
+                       m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]));
 }
 
 // -----------------------------------------------------------------------------
@@ -868,8 +820,7 @@ void ImageGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int ImageGeom::findElementSizes()
 {
-  FloatVec3Type res = {0.0f, 0.0f, 0.0f};
-  std::tie(res[0], res[1], res[2]) = getSpacing();
+  FloatVec3Type res = getSpacing();
 
   if(res[0] <= 0.0f || res[1] <= 0.0f || res[2] <= 0.0f)
   {
@@ -964,8 +915,7 @@ void ImageGeom::getShapeFunctions(double pCoords[3], double* shape)
 void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  size_t dims[3] = {0, 0, 0};
-  std::tie(dims[0], dims[1], dims[2]) = getDimensions();
+  SizeVec3Type dims = getDimensions();
 
   if(observable != nullptr)
   {
@@ -1006,10 +956,8 @@ int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf
 {
   herr_t err = 0;
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
-  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
-  std::tie(origin[0], origin[1], origin[2]) = getOrigin();
+  FloatVec3Type spacing = getSpacing();
+  FloatVec3Type origin = getOrigin();
 
   int32_t rank = 1;
   hsize_t dims[1] = {3};
@@ -1051,18 +999,16 @@ int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
   herr_t err = 0;
 
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
-  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
-  std::tie(origin[0], origin[1], origin[2]) = getOrigin();
+  FloatVec3Type spacing = getSpacing();
+  FloatVec3Type origin = getOrigin();
 
   out << "  <!-- *************** START OF " << dcName << " *************** -->"
       << "\n";
-  out << "  <Grid Name=\"" << dcName << "\" GridType=\"Uniform\">"
+  out << "  <Grid Name=\"" << dcName << R"(" GridType="Uniform">)"
       << "\n";
   if(getEnableTimeSeries())
   {
-    out << "    <Time TimeType=\"Single\" Value=\"" << getTimeValue() << "\"/>\n";
+    out << R"(    <Time TimeType="Single" Value=")" << getTimeValue() << "\"/>\n";
   }
   out << "    <Topology TopologyType=\"3DCoRectMesh\" Dimensions=\"" << volDims[2] + 1 << " " << volDims[1] + 1 << " " << volDims[0] + 1 << " \"></Topology>"
       << "\n";
@@ -1089,13 +1035,11 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
 {
   QString info;
   QTextStream ss(&info);
+  QString lengthUnit = IGeometry::LengthUnitToString(static_cast<IGeometry::LengthUnit>(getUnits()));
 
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-  FloatVec3Type spacing = {0.0f, 0.0f, 0.0f};
-  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
-  std::tie(spacing[0], spacing[1], spacing[2]) = getSpacing();
-  FloatVec3Type origin = {0.0f, 0.0f, 0.0f};
-  std::tie(origin[0], origin[1], origin[2]) = getOrigin();
+  FloatVec3Type spacing = getSpacing();
+  FloatVec3Type origin = getOrigin();
 
   float halfRes[3] = {spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f};
 
@@ -1112,7 +1056,14 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Origin:</th><td>)" << origin[0] << ", " << origin[1] << ", " << origin[2] << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
 
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Bounds:</th><td>)"
+    float vol = (volDims[0] * spacing[0]) * (volDims[1] * spacing[1]) * (volDims[2] * spacing[2]);
+    QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Volume:</th><td>)" << usa.toString(vol) << " " << lengthUnit
+       << "s ^3"
+          "</td></tr>";
+
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Bounds (Cell Centered):</th><td>)"
        << "<p>X Range: " << (origin[0] - halfRes[0]) << " to " << (origin[0] - halfRes[0] + volDims[0] * spacing[0]) << " (delta: " << (volDims[0] * spacing[0]) << ")</p>"
        << "<p>Y Range: " << (origin[1] - halfRes[1]) << " to " << (origin[1] - halfRes[1] + volDims[1] * spacing[1]) << " (delta: " << (volDims[1] * spacing[1]) << ")</p>"
        << "<p>Z Range: " << (origin[2] - halfRes[2]) << " to " << (origin[2] - halfRes[2] + volDims[2] * spacing[2]) << " (delta: " << (volDims[2] * spacing[2]) << ")</p>"
@@ -1152,12 +1103,9 @@ IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate)
 {
   ImageGeom::Pointer imageCopy = ImageGeom::CreateGeometry(getName());
 
-  std::tuple<size_t, size_t, size_t> volDims = std::make_tuple(static_cast<size_t>(0), static_cast<size_t>(0), static_cast<size_t>(0));
-  std::tuple<float, float, float> spacing = std::make_tuple(1.0f, 1.0f, 1.0f);
-  std::tuple<float, float, float> origin = std::make_tuple(0.0f, 0.0f, 0.0f);
-  volDims = getDimensions();
-  spacing = getSpacing();
-  origin = getOrigin();
+  SizeVec3Type volDims = getDimensions();
+  FloatVec3Type spacing = getSpacing();
+  FloatVec3Type origin = getOrigin();
   imageCopy->setDimensions(volDims);
   imageCopy->setSpacing(spacing);
   imageCopy->setOrigin(origin);
@@ -1172,7 +1120,7 @@ IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int ImageGeom::gatherMetaData(hid_t parentId, size_t volDims[3], float spacing[3], float origin[3], unsigned int spatialDims, QString geomName, bool preflight)
+int ImageGeom::gatherMetaData(hid_t parentId, size_t volDims[3], float spacing[3], float origin[3], unsigned int spatialDims, const QString& geomName, bool preflight)
 {
   int err = QH5Lite::readPointerDataset(parentId, H5_DIMENSIONS, volDims);
   if(err < 0)
@@ -1205,7 +1153,7 @@ int ImageGeom::gatherMetaData(hid_t parentId, size_t volDims[3], float spacing[3
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ImageGeom::ErrorType ImageGeom::computeCellIndex(float coords[3], size_t index[3])
+ImageGeom::ErrorType ImageGeom::computeCellIndex(const float coords[3], size_t index[3])
 {
   ImageGeom::ErrorType err = ImageGeom::ErrorType::NoError;
   for(size_t i = 0; i < 3; i++)
@@ -1230,7 +1178,7 @@ ImageGeom::ErrorType ImageGeom::computeCellIndex(float coords[3], size_t index[3
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ImageGeom::ErrorType ImageGeom::computeCellIndex(float coords[3], size_t& index)
+ImageGeom::ErrorType ImageGeom::computeCellIndex(const float coords[], size_t& index)
 {
   ImageGeom::ErrorType err = ImageGeom::ErrorType::NoError;
   size_t cell[3] = {0, 0, 0};
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 4430279ea3..d4bf924c18 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -39,12 +39,6 @@
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometryGrid.h"
 
-namespace SIMPL {
-  using Tuple3FVec = std::tuple<float,float,float>;
-  using Tuple6FVec = std::tuple<float,float,float,float,float,float>;
-  using Tuple3SVec = std::tuple<size_t,size_t,size_t>;
-}
-
 /**
  * @brief The ImageGeom class represents a structured rectlinear grid
  */
@@ -58,19 +52,19 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   PYB11_ENUMERATION(ErrorType)
 
   PYB11_METHOD(void setDimensions OVERLOAD size_t,x size_t,y size_t,z)
-  PYB11_METHOD(SIMPL::Tuple3SVec getDimensions OVERLOAD CONST_METHOD)
+  PYB11_METHOD(SizeVec3Type getDimensions)
 
   PYB11_METHOD(void setSpacing OVERLOAD float,x float,y float,z)
-  PYB11_METHOD(SIMPL::Tuple3FVec getSpacing OVERLOAD CONST_METHOD)
+  PYB11_METHOD(FloatVec3Type getSpacing)
 
   PYB11_METHOD(size_t getXPoints)
   PYB11_METHOD(size_t getYPoints)
   PYB11_METHOD(size_t getZPoints)
 
   PYB11_METHOD(void setOrigin OVERLOAD float,x float,y float,z)
-  PYB11_METHOD(SIMPL::Tuple3FVec getOrigin OVERLOAD CONST_METHOD)
+  PYB11_METHOD(FloatVec3Type getOrigin)
 
-  PYB11_METHOD(SIMPL::Tuple6FVec getBoundingBox OVERLOAD)
+  PYB11_METHOD(FloatVec6Type getBoundingBox OVERLOAD)
   // clang-format on
 
 public:
@@ -81,6 +75,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   ~ImageGeom() override;
 
   using EnumType = unsigned int;
+
   enum class ErrorType : EnumType
   {
     XOutOfBoundsLow = 0,
@@ -103,21 +98,15 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   /**
    * @brief Sets/Gets the Spacing property
    */
-  // SIMPL_INSTANCE_VEC3_PROPERTY(float, Spacing)
-  SIMPL::Tuple3FVec getSpacing() const;
-  void getSpacing(FloatVec3Type& spacing) const;
+  FloatVec3Type getSpacing() const;
   void setSpacing(const FloatVec3Type& spacing);
-  void setSpacing(FloatVec3Type& spacing);
   void setSpacing(float x, float y, float z);
 
   /**
    * @brief Sets/Gets the Origin property
    */
-  // SIMPL_INSTANCE_VEC3_PROPERTY(float, Origin)
-  SIMPL::Tuple3FVec getOrigin() const;
-  void getOrigin(FloatVec3Type& origin) const;
+  FloatVec3Type getOrigin() const;
   void setOrigin(const FloatVec3Type& origin);
-  void setOrigin(FloatVec3Type& origin);
   void setOrigin(float x, float y, float z);
 
   /**
@@ -132,7 +121,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @param boundingBox The bounding box will be stored in the input argument in the following order:
    * xMin, xMax, yMin, yMax, zMin, zMax
    */
-  SIMPL::Tuple6FVec getBoundingBox();
+  FloatVec6Type getBoundingBox();
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -283,12 +272,9 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   // -----------------------------------------------------------------------------
   // Inherited from IGeometryGrid
   // -----------------------------------------------------------------------------
-  SIMPL::Tuple3SVec getDimensions() const override;
-  void getDimensions(SizeVec3Type& dims) const;
+  SizeVec3Type getDimensions() const override;
 
   void setDimensions(const SizeVec3Type& dims) override;
-  void setDimensions(SizeVec3Type& dims) override;
-  void setDimensions(const SIMPL::Tuple3SVec& dims) override;
   void setDimensions(size_t x, size_t y, size_t z);
 
   size_t getXPoints() override;
@@ -336,7 +322,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @return Int error code. There can be multiple failure mechanisms when doing
    * this calculation. Any return value != ErrorType::NoError is a failure to compute the indices.
    */
-  ErrorType computeCellIndex(float coords[3], size_t index[3]);
+  ErrorType computeCellIndex(const float coords[], size_t index[3]);
 
   /**
    * @brief computeCellIndex This method will compute the X, Y & Z Index based
@@ -360,7 +346,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @return Int error code. There can be multiple failure mechanisms when doing
    * this calculation. Any return value != ErrorType::NoError is a failure to compute the indices.
    */
-  ErrorType computeCellIndex(float coords[3], size_t& index);
+  ErrorType computeCellIndex(const float coords[3], size_t& index);
 
 protected:
   ImageGeom();
@@ -376,7 +362,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @param preflight
    * @return
    */
-  int gatherMetaData(hid_t parentid, size_t volDims[3], float spacing[3], float origin[3], unsigned int spatialDims, QString geomName, bool preflight);
+  int gatherMetaData(hid_t parentid, size_t volDims[3], float spacing[3], float origin[3], unsigned int spatialDims, const QString& geomName, bool preflight);
 
   /**
    * @brief setElementsContaingVert
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index ba06ea3f9b..65fbb11bb9 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -90,8 +90,7 @@ class FindRectGridDerivativesImpl
     std::vector<double> dValuesdEta(numComps);
     std::vector<double> dValuesdZeta(numComps);
 
-    size_t dims[3] = {0, 0, 0};
-    std::tie(dims[0], dims[1], dims[2]) = m_RectGrid->getDimensions();
+    SizeVec3Type dims = m_RectGrid->getDimensions();
 
     int64_t counter = 0;
     size_t totalElements = m_RectGrid->getNumberOfElements();
@@ -106,19 +105,19 @@ class FindRectGridDerivativesImpl
           //  Xi derivatives (X)
           if(dims[0] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(x == 0)
           {
-            findValuesForFiniteDifference(LeftSide, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(x == (dims[0] - 1))
           {
-            findValuesForFiniteDifference(RightSide, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, XDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, XDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xxi = factor * (xp[0] - xm[0]);
@@ -132,19 +131,19 @@ class FindRectGridDerivativesImpl
           //  Eta derivatives (Y)
           if(dims[1] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(y == 0)
           {
-            findValuesForFiniteDifference(LeftSide, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(y == (dims[1] - 1))
           {
-            findValuesForFiniteDifference(RightSide, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, YDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, YDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xeta = factor * (xp[0] - xm[0]);
@@ -158,19 +157,19 @@ class FindRectGridDerivativesImpl
           //  Zeta derivatives (Z)
           if(dims[2] == 1)
           {
-            findValuesForFiniteDifference(TwoDimensional, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(TwoDimensional, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(z == 0)
           {
-            findValuesForFiniteDifference(LeftSide, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(LeftSide, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else if(z == (dims[2] - 1))
           {
-            findValuesForFiniteDifference(RightSide, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(RightSide, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
           else
           {
-            findValuesForFiniteDifference(Centered, ZDirection, x, y, z, dims, xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
+            findValuesForFiniteDifference(Centered, ZDirection, x, y, z, dims.data(), xp, xm, factor, numComps, plusValues, minusValues, fieldPtr);
           }
 
           xzeta = factor * (xp[0] - xm[0]);
@@ -437,17 +436,9 @@ RectGridGeom::Pointer RectGridGeom::CreateGeometry(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPL::Tuple3SVec RectGridGeom::getDimensions() const
+SizeVec3Type RectGridGeom::getDimensions() const
 {
-  return m_Dimensions.toTuple();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RectGridGeom::getDimensions(SizeVec3Type& dims) const
-{
-  dims = m_Dimensions;
+  return m_Dimensions;
 }
 
 // -----------------------------------------------------------------------------
@@ -458,22 +449,6 @@ void RectGridGeom::setDimensions(const SizeVec3Type& dims)
   m_Dimensions = dims;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RectGridGeom::setDimensions(SizeVec3Type& dims)
-{
-  m_Dimensions = dims;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RectGridGeom::setDimensions(const SIMPL::Tuple3SVec& dims)
-{
-  m_Dimensions = dims;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -997,8 +972,7 @@ void RectGridGeom::getShapeFunctions(double pCoords[3], double* shape)
 void RectGridGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  size_t dims[3] = {0, 0, 0};
-  std::tie(dims[0], dims[1], dims[2]) = getDimensions();
+  SizeVec3Type dims = getDimensions();
 
   if(observable != nullptr)
   {
@@ -1179,8 +1153,7 @@ IGeometry::Pointer RectGridGeom::deepCopy(bool forceNoAllocate)
 
   RectGridGeom::Pointer copy = RectGridGeom::CreateGeometry(getName());
 
-  size_t volDims[3] = { 0, 0, 0 };
-  std::tie(volDims[0], volDims[1], volDims[2]) = getDimensions();
+  SizeVec3Type volDims = getDimensions();
   copy->setDimensions(volDims);
   copy->setXBounds(xBounds);
   copy->setYBounds(yBounds);
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 5b7eb14f5c..272965b88d 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -214,12 +214,8 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
 // -----------------------------------------------------------------------------
 // Inherited from IGeometryGrid
 // -----------------------------------------------------------------------------
-    SIMPL::Tuple3SVec getDimensions() const override;
-    void getDimensions(SizeVec3Type& dims) const;
-
     void setDimensions(const SizeVec3Type& dims) override;
-    void setDimensions(SizeVec3Type& dims) override;
-    void setDimensions(const SIMPL::Tuple3SVec& dims) override;
+    SizeVec3Type getDimensions() const override;
 
     size_t getXPoints() override;
     size_t getYPoints() override;
diff --git a/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp b/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
index b90200a3df..27826be22f 100644
--- a/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
+++ b/Source/SIMPLib/Geometry/Testing/Cxx/ImageGeomTest.cpp
@@ -1,12 +1,11 @@
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <iostream>
 
 #include <QtCore/QFile>
 
 #include "SIMPLib/Geometry/ImageGeom.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -40,9 +39,9 @@ class ImageGeomTest
 
     geom->setDimensions(dims);
     geom->setOrigin(origin);
-    geom->getSpacing(res);
+    geom->setSpacing(res);
 
-    float coords[3] = {3.5f, 9.23f, 12.78f};
+    float coords[3] = {2.5f, 9.23f, 12.78f};
     size_t indices[3] = {0, 0, 0};
     size_t index = 0;
     ImageGeom::ErrorType err = geom->computeCellIndex(coords, indices);
@@ -64,7 +63,7 @@ class ImageGeomTest
     DREAM3D_REQUIRE(err == ImageGeom::ErrorType::XOutOfBoundsHigh)
 
     // Y Coord out of bounds
-    coords[0] = 3.5f;
+    coords[0] = 2.9f;
     coords[1] = 4.0f;
     err = geom->computeCellIndex(coords, indices);
     DREAM3D_REQUIRE(err == ImageGeom::ErrorType::YOutOfBoundsLow)
@@ -77,7 +76,7 @@ class ImageGeomTest
     DREAM3D_REQUIRE(err == ImageGeom::ErrorType::YOutOfBoundsHigh)
 
     // Z Coord out of bounds
-    coords[0] = 3.5f;
+    coords[0] = 2.5f;
     coords[1] = 9.23f;
     coords[2] = 5.0f;
     err = geom->computeCellIndex(coords, indices);
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index f150ecedac..5e010e1025 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -205,9 +205,8 @@ void TetrahedralGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if(data->getType() != AttributeMatrix::Type::Vertex
-     && data->getType() != AttributeMatrix::Type::Edge
-     && data->getType() != AttributeMatrix::Type::Face || data->getType() != AttributeMatrix::Type::Cell)
+  if((data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge && data->getType() != AttributeMatrix::Type::Face) ||
+     data->getType() != AttributeMatrix::Type::Cell)
   {
     // TetrahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index d8b0147ebe..9382fd50b5 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -251,12 +251,6 @@ IDataArray::Pointer H5DataArrayReader::ReadIDataArray(hid_t gid, const QString&
     case H5T_STRING:
       res.clear(); // Clear the string out first
       err = QH5Lite::readStringDataset(gid, name, res);
-      //        if(err >= 0)
-      //        {
-      //          IDataArray::Pointer attr = MXAAsciiStringData::Create(res);
-      //          attr->setName(name);
-      //          attributes[*iter] = attr;
-      //        }
       break;
     case H5T_INTEGER:
       // qDebug() << "User Meta Data Type is Integer" ;
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 7bb474eaed..7709e701e7 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -329,8 +329,7 @@
       ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());                                    \
       if(nullptr != imageGeometry)                                                                                                                                                                     \
       {                                                                                                                                                                                                \
-        QVector<size_t> tDims(3, 0);                                                                                                                                                                   \
-        std::tie(tDims[0], tDims[1], tDims[2]) = imageGeometry->getDimensions();                                                                                                                       \
+        QVector<size_t> tDims = imageGeometry->getDimensions().toContainer<QVector<size_t>>();                                                                                                         \
         if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
           QString type = ptr->getTypeAsString();                                                                                                                                                       \
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 02ebb9a580..3d3f3aa0b8 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -108,16 +108,14 @@ template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkIm
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    FloatVec3Type sampleOrigin(0.0f, 0.0f, 0.0f);
-    m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
+    FloatVec3Type sampleOrigin = m->getGeometryAs<ImageGeom>()->getOrigin();
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
     origin[1] = sampleOrigin[1]; // Y coordinate
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    FloatVec3Type voxelResolution(0.0f, 0.0f, 0.0f);
-    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
+    FloatVec3Type voxelResolution = m->getGeometryAs<ImageGeom>()->getSpacing();
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -253,16 +251,14 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    FloatVec3Type sampleOrigin = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
+    FloatVec3Type sampleOrigin = m->getGeometryAs<ImageGeom>()->getOrigin();
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
     origin[1] = sampleOrigin[1]; // Y coordinate
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    FloatVec3Type voxelResolution = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
+    FloatVec3Type voxelResolution = m->getGeometryAs<ImageGeom>()->getSpacing();
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
@@ -357,16 +353,14 @@ template <typename ComponentType> class ItkBridge
     region.SetSize(size);
     importFilter->SetRegion(region);
 
-    FloatVec3Type sampleOrigin = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getOrigin(sampleOrigin);
+    FloatVec3Type sampleOrigin = m->getGeometryAs<ImageGeom>()->getOrigin();
     double origin[ImageProcessingConstants::ImageDimension];
     origin[0] = sampleOrigin[0]; // X coordinate
     origin[1] = sampleOrigin[1]; // Y coordinate
     origin[2] = sampleOrigin[2]; // Z coordinate
     importFilter->SetOrigin(origin);
 
-    FloatVec3Type voxelResolution = {0.0f, 0.0f, 0.0f};
-    m->getGeometryAs<ImageGeom>()->getSpacing(voxelResolution);
+    FloatVec3Type voxelResolution = m->getGeometryAs<ImageGeom>()->getSpacing();
     double spacing[ImageProcessingConstants::ImageDimension];
     spacing[0] = voxelResolution[0]; // along X direction
     spacing[1] = voxelResolution[1]; // along Y direction
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 01374226d4..f21a98db5d 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -80,14 +80,11 @@ void InPlaceDream3DDataToImageFilter< PixelType, VDimension >::GenerateOutputInf
     itkExceptionMacro("Error casting geometry!!!");
   }
   // Get data container properties
-  FloatVec3Type torigin;
+  FloatVec3Type torigin = imageGeom->getOrigin();
   // Setting spacing to 0 means dimension is not used. Used to know if
   // image is 2D or 3D. Setting dimensions to 0 leads to crashes
-  FloatVec3Type tspacing;
-  SizeVec3Type tDims;
-  imageGeom->getOrigin(torigin);
-  imageGeom->getSpacing(tspacing);
-  std::tie(tDims[0], tDims[1], tDims[2]) = imageGeom->getDimensions();
+  FloatVec3Type tspacing = imageGeom->getSpacing();
+  SizeVec3Type tDims = imageGeom->getDimensions();
   typename ImageType::PointType origin;
   typename ImageType::SizeType size;
   typename ImageType::SpacingType spacing;
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 06aecb070b..0ec6461f1d 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -122,8 +122,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<PixelType>();
   IGeometry::Pointer geom = dataContainer->getGeometry();
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-  QVector<size_t> tDims(3, 1);
-  std::tie(tDims[0], tDims[1], tDims[2]) = imageGeom->getDimensions();
+  QVector<size_t> tDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
   AttributeMatrix::Pointer attrMat;
   if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
diff --git a/Source/SIMPLib/Plugin/PluginDLLExport.h.in b/Source/SIMPLib/Plugin/PluginDLLExport.h.in
index b2207f9902..2d2d92113b 100644
--- a/Source/SIMPLib/Plugin/PluginDLLExport.h.in
+++ b/Source/SIMPLib/Plugin/PluginDLLExport.h.in
@@ -3,11 +3,10 @@
 /* CMake will define @plug_target_name@_EXPORTS on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
-projects by hand you need to define @PLUGIN_NAME@_EXPORTS when
-building the MXADatModel DLL on windows.
+projects by hand you need to define @plug_target_name@_EXPORTS when
+building the plugin.
 */
 
-
 #if defined (@plug_target_name@_EXPORTS)  /* Compiling the Plugin as a DLL/Dylib */
     #if defined (_MSC_VER)  /* MSVC Compiler Case */
         #define  @PLUGIN_NAME@_EXPORT __declspec(dllexport)
diff --git a/Source/SIMPLib/SIMPLibMacros.cmake b/Source/SIMPLib/SIMPLibMacros.cmake
index 05828d7073..76cc9d8d38 100755
--- a/Source/SIMPLib/SIMPLibMacros.cmake
+++ b/Source/SIMPLib/SIMPLibMacros.cmake
@@ -161,7 +161,7 @@ function(SIMPL_START_FILTER_GROUP)
   set(multiValueArgs)
 
   cmake_parse_arguments(P "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
-
+  #message(STATUS "===> [1] Starting ${P_FILTER_GROUP}")
   file(APPEND ${P_ALL_FILTERS_HEADERFILE} "\n/* ------ ${P_FILTER_GROUP} --------- */\n")
   file(APPEND ${P_REGISTER_KNOWN_FILTERS_FILE} "\n    /* ------ ${P_FILTER_GROUP} --------- */\n")
 
@@ -171,7 +171,12 @@ function(SIMPL_START_FILTER_GROUP)
   
   set_property(GLOBAL APPEND PROPERTY DREAM3DDoc_GROUPS ${P_FILTER_GROUP})
 
-  file(WRITE ${SIMPLProj_BINARY_DIR}/${P_FILTER_GROUP}PublicFilters.txt "# ${P_FILTER_GROUP} Public Filters\n")
+  # This bit of code creates a text file that the Python Bindings Generator is going to read from. We have to
+  # special case the "Core" filters that are part of SIMPLib to get the file naming correct.
+  if("${P_FILTER_GROUP}" STREQUAL "Core")
+    set(P_FILTER_GROUP "SIMPLib")
+  endif()
+  file(WRITE "${SIMPLProj_BINARY_DIR}/${P_FILTER_GROUP}PublicFilters.txt" "# ${P_FILTER_GROUP} Public Filters\n")
 endfunction()
 
 #-------------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index a1d9b6e5e0..6b4f5368cb 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -122,7 +122,7 @@ void TESTCLASSNAME::execute()
 AbstractFilter::Pointer TESTCLASSNAME::newFilterInstance(bool copyFilterParameters) const
 {
   TESTCLASSNAME::Pointer filter = TESTCLASSNAME::New();
-  if(true == copyFilterParameters)
+  if(copyFilterParameters)
   {
     copyFilterParameterInstanceVariables(filter.get());
   }
diff --git a/Source/SIMPLib/Testing/Unused/AngleFileLoaderTest.cpp b/Source/SIMPLib/Testing/Unused/AngleFileLoaderTest.cpp
deleted file mode 100644
index d6fb32a9c8..0000000000
--- a/Source/SIMPLib/Testing/Unused/AngleFileLoaderTest.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-// QFile::remove(UnitTest::XXXX::OutputFile);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MyTest()
-{
-  int i = 0;
-  int j = 1;
-
-  // This will pass because i < j
-  DREAM3D_REQUIRED(i, <, j)
-
-  // This will FAIL because i != j
-  DREAM3D_REQUIRE_EQUAL(i, j)
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-  DREAM3D_REGISTER_TEST(MyTest())
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.cpp b/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.cpp
deleted file mode 100644
index 68744fe5e7..0000000000
--- a/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "CSVGrainDataReader.h"
-
-#include <string.h>
-
-#include <algorithm>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
-#define PI_OVER_2f 1.57079632679489661f
-#define THREE_PI_OVER_2f 4.71238898038468985f
-#define TWO_PIf 6.28318530717958647f
-#define ONE_PIf 3.14159265358979323f
-
-#define kBufferSize 1024
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-CSVGrainDataReader::CSVGrainDataReader()
-: m_FileName("")
-, m_NumberOfElements(0)
-, m_ManageMemory(true)
-{
-  // Init all the arrays to nullptr
-  m_GrainId = nullptr;
-  m_Phi1 = nullptr;
-  m_Phi = nullptr;
-  m_Phi2 = nullptr;
-  m_EquivDiam = nullptr;
-  m_B_Over_A = nullptr;
-  m_C_Over_A = nullptr;
-  m_Omega3 = nullptr;
-  m_OutsideBoundingBox = nullptr;
-  m_NumNeighbors = nullptr;
-  m_SurfaceGrain = nullptr;
-
-  m_NumFeatures = 11;
-}
-
-// -----------------------------------------------------------------------------
-//  Clean up any Memory that was allocated for this class
-// -----------------------------------------------------------------------------
-CSVGrainDataReader::~CSVGrainDataReader()
-{
-  deletePointers();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CSVGrainDataReader::initPointers(size_t numElements)
-{
-  size_t numBytes = numElements * sizeof(float);
-  m_GrainId = allocateArray<int>(numElements);
-  m_Phi1 = allocateArray<float>(numElements);
-  m_Phi = allocateArray<float>(numElements);
-  m_Phi2 = allocateArray<float>(numElements);
-  m_EquivDiam = allocateArray<float>(numElements);
-  m_B_Over_A = allocateArray<float>(numElements);
-  m_C_Over_A = allocateArray<float>(numElements);
-  m_Omega3 = allocateArray<float>(numElements);
-  m_OutsideBoundingBox = allocateArray<int>(numElements);
-  m_NumNeighbors = allocateArray<int>(numElements);
-  m_SurfaceGrain = allocateArray<int>(numElements);
-
-  ::memset(m_GrainId, 0, numBytes);
-  ::memset(m_Phi1, 0, numBytes);
-  ::memset(m_Phi, 0, numBytes);
-  ::memset(m_Phi2, 0, numBytes);
-  ::memset(m_EquivDiam, 0, numBytes);
-  ::memset(m_B_Over_A, 0, numBytes);
-  ::memset(m_C_Over_A, 0, numBytes);
-  ::memset(m_Omega3, 0, numBytes);
-  ::memset(m_OutsideBoundingBox, 0, numBytes);
-  ::memset(m_NumNeighbors, 0, numBytes);
-  ::memset(m_SurfaceGrain, 0, numBytes);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CSVGrainDataReader::deletePointers()
-{
-  this->deallocateArrayData<int>(m_GrainId);
-  this->deallocateArrayData<float>(m_Phi1);
-  this->deallocateArrayData<float>(m_Phi);
-  this->deallocateArrayData<float>(m_Phi2);
-  this->deallocateArrayData<float>(m_EquivDiam);
-  this->deallocateArrayData<float>(m_B_Over_A);
-  this->deallocateArrayData<float>(m_C_Over_A);
-  this->deallocateArrayData<float>(m_Omega3);
-  this->deallocateArrayData<int>(m_OutsideBoundingBox);
-  this->deallocateArrayData<int>(m_NumNeighbors);
-  this->deallocateArrayData<int>(m_SurfaceGrain);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int CSVGrainDataReader::readHeaderOnly()
-{
-  int err = 1;
-  char buf[kBufferSize];
-  std::ifstream in(m_FileName.c_str());
-  m_headerComplete = false;
-  if(!in.is_open())
-  {
-    std::cout << "CSV file could not be opened: " << m_FileName << std::endl;
-    return -100;
-  }
-
-  while(!in.eof() && !m_headerComplete)
-  {
-    ::memset(buf, 0, kBufferSize);
-    in.getline(buf, kBufferSize);
-    parseHeaderLine(buf, kBufferSize);
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int CSVGrainDataReader::readFile()
-{
-  int err = 1;
-  char buf[kBufferSize];
-  m_headerComplete = false;
-  std::ifstream in(m_FileName.c_str());
-
-  if(!in.is_open())
-  {
-    std::cout << "Ang file could not be opened: " << m_FileName << std::endl;
-    return -100;
-  }
-
-  ::memset(buf, 0, kBufferSize);
-  in.getline(buf, kBufferSize);
-  if(sscanf(buf, "%lu", &m_NumberOfElements) != 1)
-  {
-    std::cout << "First Line of file not parsed." << std::endl;
-  }
-  else
-  {
-    std::cout << "m_NumberOfElements = " << m_NumberOfElements << std::endl;
-  }
-
-  ::memset(buf, 0, kBufferSize);
-  in.getline(buf, kBufferSize);
-  parseHeaderLine(buf, kBufferSize);
-
-  // Delete any currently existing pointers
-  deletePointers();
-
-  initPointers(m_NumberOfElements);
-
-  if(nullptr == m_GrainId || nullptr == m_Phi1 || nullptr == m_Phi || nullptr == m_Phi2 || nullptr == m_EquivDiam || nullptr == m_NumNeighbors || nullptr == m_B_Over_A || nullptr == m_C_Over_A ||
-     m_Omega3 == nullptr || m_OutsideBoundingBox == nullptr)
-  {
-    return -1;
-  }
-
-  size_t counter = 0;
-  for(size_t row = 0; row < m_NumberOfElements && in.eof() == false; ++row)
-  {
-    in.getline(buf, kBufferSize);
-    this->readData(buf, static_cast<int>(row), counter);
-    // Read the next line of data
-    ++counter;
-  }
-
-  if(counter != m_NumberOfElements && in.eof() == true)
-  {
-
-    std::cout << "Premature End Of File reached.\n"
-              << m_FileName << "\nNumRows=" << m_NumberOfElements << "\ncounter=" << counter << " m_NumberOfElements=" << m_NumberOfElements << "\nTotal Data Points Read=" << counter << std::endl;
-  }
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//  Read the Header part of the ANG file
-// -----------------------------------------------------------------------------
-void CSVGrainDataReader::parseHeaderLine(char* buf, size_t length)
-{
-  if(buf[0] != '#')
-  {
-    m_headerComplete = true;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//  Read the data part of the ANG file
-// -----------------------------------------------------------------------------
-void CSVGrainDataReader::readData(const QString& line, int row, size_t i)
-{
-  /* When reading the data there should be at least 8 cols of data. There may even
-   * be 11 columns of data. The column names should be the following:
-   * Grain ID
-   * phi1
-   * phi
-   * phi2
-   *
-   *
-   */
-  float p1, p, p2, eq, ba, ca, o3;
-
-  int gid, obb, nn, sg;
-
-  m_NumFeatures = sscanf(line.c_str(), "%d,%f,%f,%f,%f,%f,%f,%f,%d,%d,%d", &gid, &p1, &p, &p2, &eq, &ba, &ca, &o3, &obb, &nn, &sg);
-
-  m_GrainId[row] = gid;
-  m_Phi1[row] = p1;
-  m_Phi[row] = p;
-  m_Phi2[row] = p2;
-  m_EquivDiam[row] = eq;
-  m_B_Over_A[row] = ba;
-  m_C_Over_A[row] = ca;
-  m_Omega3[row] = o3;
-  m_OutsideBoundingBox[row] = obb;
-  m_NumNeighbors[row] = nn;
-  m_SurfaceGrain[row] = sg;
-}
diff --git a/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.h b/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.h
deleted file mode 100644
index 395c573460..0000000000
--- a/Source/SIMPLib/Testing/Unused/CSVGrainDataReader.h
+++ /dev/null
@@ -1,203 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include <QtCore/QString>
-
-#define SET_GET_POINTER(name, var, type)                                                                                                                                                               \
-  type* get##name##Pointer()                                                                                                                                                                           \
-  {                                                                                                                                                                                                    \
-    return m_##name;                                                                                                                                                                                   \
-  }                                                                                                                                                                                                    \
-  void set##name##Pointer(type* f)                                                                                                                                                                     \
-  {                                                                                                                                                                                                    \
-    if(m_##var != nullptr && m_##var != f)                                                                                                                                                             \
-    {                                                                                                                                                                                                  \
-      deallocateArrayData(m_##var);                                                                                                                                                                    \
-      m_##var = nullptr;                                                                                                                                                                               \
-    }                                                                                                                                                                                                  \
-    m_##var = f;                                                                                                                                                                                       \
-  }
-
-/**
-* @class CSVReader CSVReader.h CSVReader/CSVReader.h
-* @brief This class is a self contained TSL OIM .ang file reader. It should only be dependent on
-* standard C++ features
-* @author Michael A. Jackson for BlueQuartz Software
-* @date Mar 1, 2010
-* @version 1.0
-*/
-class CSVGrainDataReader
-{
-public:
-  CSVGrainDataReader();
-  virtual ~CSVGrainDataReader();
-
-  /** @brief Sets the file name of the ang file to be read */
-  void setFileName(const QString& f)
-  {
-    m_FileName = f;
-  }
-  QString getFileName()
-  {
-    return m_FileName;
-  }
-
-  void setNumberOfElements(size_t n)
-  {
-    m_NumberOfElements = n;
-  }
-  size_t getNumberOfElements()
-  {
-    return m_NumberOfElements;
-  }
-
-  void setNumFeatures(int n)
-  {
-    m_NumFeatures = n;
-  }
-  int getNumFeatures()
-  {
-    return m_NumFeatures;
-  }
-
-  /**
-  * @brief Reads the complete TSL .ang file.
-  * @return 1 on success
-  */
-  virtual int readFile();
-
-  /**
-  * @brief Reads ONLY the header portion of the TSL .ang file
-  * @return 1 on success
-  */
-  virtual int readHeaderOnly();
-
-  SET_GET_POINTER(GrainId, GrainId, int)
-  SET_GET_POINTER(Phi1, Phi1, float)
-  SET_GET_POINTER(Phi, Phi, float)
-  SET_GET_POINTER(Phi2, Phi2, float)
-  SET_GET_POINTER(EquivDiam, EquivDiam, float)
-  SET_GET_POINTER(B_Over_A, B_Over_A, float)
-  SET_GET_POINTER(C_Over_A, C_Over_A, float)
-  SET_GET_POINTER(Omega3, Omega3, float)
-  SET_GET_POINTER(OutsideBoundingBox, OutsideBoundingBox, int)
-  SET_GET_POINTER(NumNeighbors, NumNeighbors, int)
-  SET_GET_POINTER(SurfaceGrain, SurfaceGrain, int)
-
-protected:
-  /** @brief Allocates the proper amount of memory (after reading the header portion of the file)
-  * and then splats '0' across all the bytes of the memory allocation
-  */
-  void initPointers(size_t numElements);
-
-  /** @brief 'free's the allocated memory and sets the pointer to nullptr
-  */
-  void deletePointers();
-
-  /**
-   * @brief Allocats a contiguous chunk of memory to store values from the .ang file
-   * @param numberOfElements The number of elements in the Array. This method can
-   * also optionally produce SSE aligned memory for use with SSE intrinsics
-   * @return Pointer to allocated memory
-   */
-  template <typename T> T* allocateArray(size_t numberOfElements)
-  {
-#if defined(AIM_USE_SSE) && defined(__SSE2__)
-    T* m_buffer = static_cast<T*>(_mm_malloc(numberOfElements * sizeof(T), 16));
-#else
-    T* m_buffer = new T[numberOfElements];
-#endif
-    m_NumberOfElements = numberOfElements;
-    return m_buffer;
-  }
-
-  /**
-   * @brief Deallocates memory that has been previously allocated. This will set the
-   * value of the pointer passed in as the argument to nullptr.
-   * @param ptr The pointer to be freed.
-   */
-  template <typename T> void deallocateArrayData(T*& ptr)
-  {
-    if(ptr != nullptr && this->m_ManageMemory == true)
-    {
-#if defined(AIM_USE_SSE) && defined(__SSE2__)
-      _mm_free(ptr);
-#else
-      delete[] ptr;
-#endif
-      ptr = nullptr;
-      m_NumberOfElements = 0;
-    }
-  }
-
-private:
-  QString m_FileName;
-  size_t m_NumberOfElements;
-  int m_NumFeatures;
-
-  int* m_GrainId;
-  float* m_Phi1;
-  float* m_Phi;
-  float* m_Phi2;
-  float* m_EquivDiam;
-  float* m_B_Over_A;
-  float* m_C_Over_A;
-  float* m_Omega3;
-  int* m_OutsideBoundingBox;
-  int* m_NumNeighbors;
-  int* m_SurfaceGrain;
-
-  bool m_ManageMemory; // We are going to forcibly manage the memory. There is currently NO option otherwise.
-  bool m_headerComplete;
-
-  /** @brief Parses the value from a single line of the header section of the TSL .ang file
-  * @param line The line to parse
-  */
-  void parseHeaderLine(char* buf, size_t length);
-
-  /** @brief Parses the data from a line of data from the TSL .ang file
-  * @param line The line of data to parse
-  */
-  void readData(const QString& line, int row, size_t i);
-
-public:
-  CSVGrainDataReader(const CSVGrainDataReader&) = delete; // Copy Constructor Not Implemented
-  CSVGrainDataReader(CSVGrainDataReader&&) = delete;      // Move Constructor Not Implemented
-  CSVGrainDataReader& operator=(const CSVGrainDataReader&) = delete; // Copy Assignment Not Implemented
-  CSVGrainDataReader& operator=(CSVGrainDataReader&&) = delete;      // Move Assignment Not Implemented
-};
-
diff --git a/Source/SIMPLib/Testing/Unused/EbsdTests.cpp b/Source/SIMPLib/Testing/Unused/EbsdTests.cpp
deleted file mode 100644
index 5888bb9e8d..0000000000
--- a/Source/SIMPLib/Testing/Unused/EbsdTests.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "EbsdLib/EbsdConstants.h"
-#include "SIMPLib/OrientationOps/CubicLowOps.h"
-#include "SIMPLib/OrientationOps/CubicOps.h"
-#include "SIMPLib/OrientationOps/HexagonalLowOps.h"
-#include "SIMPLib/OrientationOps/HexagonalOps.h"
-#include "SIMPLib/OrientationOps/MonoclinicOps.h"
-#include "SIMPLib/OrientationOps/OrthoRhombicOps.h"
-#include "SIMPLib/OrientationOps/TetragonalLowOps.h"
-#include "SIMPLib/OrientationOps/TetragonalOps.h"
-#include "SIMPLib/OrientationOps/TriclinicOps.h"
-#include "SIMPLib/OrientationOps/TrigonalLowOps.h"
-#include "SIMPLib/OrientationOps/TrigonalOps.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Utilities/ColorTable.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestCrystalStructureTest()
-{
-
-  uint32_t chigh = Ebsd::CrystalStructure::Cubic_High;
-  uint32_t clow = Ebsd::CrystalStructure::Cubic_Low;
-
-  uint32_t hhigh = Ebsd::CrystalStructure::Hexagonal_High;
-  uint32_t hlow = Ebsd::CrystalStructure::Hexagonal_Low;
-
-  bool b = Ebsd::CrystalStructure::Cubic_High == chigh;
-  DREAM3D_REQUIRE_EQUAL(b, true)
-
-  b = Ebsd::CrystalStructure::Cubic_High == clow;
-  DREAM3D_REQUIRE_EQUAL(b, false)
-
-  b = Ebsd::CrystalStructure::Cubic_High == hlow;
-  DREAM3D_REQUIRE_EQUAL(b, false)
-
-  b = Ebsd::CrystalStructure::Hexagonal_High == hhigh;
-  DREAM3D_REQUIRE_EQUAL(b, true)
-
-  b = Ebsd::CrystalStructure::Hexagonal_High == hlow;
-  DREAM3D_REQUIRE_EQUAL(b, false)
-
-  b = Ebsd::CrystalStructure::Hexagonal_High == clow;
-  DREAM3D_REQUIRE_EQUAL(b, false)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestEbsdColoring()
-{
-
-  // Create 1 of every type of Ops class. This condenses the code below
-  std::vector<OrientationOps::Pointer> ops;
-  ops.push_back(HexagonalOps::New());
-  ops.push_back(CubicOps::New());
-  ops.push_back(HexagonalLowOps::New());
-  ops.push_back(CubicLowOps::New());
-  ops.push_back(TriclinicOps::New());
-  ops.push_back(MonoclinicOps::New());
-  ops.push_back(OrthoRhombicOps::New());
-  ops.push_back(TetragonalLowOps::New());
-  ops.push_back(TetragonalOps::New());
-  ops.push_back(TrigonalLowOps::New());
-  ops.push_back(TrigonalOps::New());
-
-  double refDir[3] = {0.0, 0.0, 1.0};
-  double dEuler[3] = {207.1653, 44.2854, 146.5178};
-  SIMPL::Rgb argb = 0x00000000;
-  size_t idx = 0;
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-  argb = ops[idx++]->generateIPFColor(dEuler, refDir, false);
-
-  DREAM3D_REQUIRE_EQUAL(idx, Ebsd::CrystalStructure::LaueGroupEnd)
-
-  std::cout << RgbColor::dRed(argb) << " " << RgbColor::dGreen(argb) << " " << RgbColor::dBlue(argb) << " " << std::endl;
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-  DREAM3D_REGISTER_TEST(TestEbsdColoring())
-
-  DREAM3D_REGISTER_TEST(TestCrystalStructureTest())
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/FeatureDataReaderTest.cpp b/Source/SIMPLib/Testing/Unused/FeatureDataReaderTest.cpp
deleted file mode 100644
index cc16702d4b..0000000000
--- a/Source/SIMPLib/Testing/Unused/FeatureDataReaderTest.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <iostream>
-#include <stdlib.h>
-#include <string>
-
-#include "CSVGrainDataReader.h"
-
-int main(int argc, char** argv)
-{
-
-  QString csvFile(argv[1]);
-
-  CSVGrainDataReader reader;
-  reader.setFileName(csvFile);
-  int err = reader.readFile();
-  if(err < 0)
-  {
-    std::cout << "Error occurred reading the CSV Grain Data file" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  // If the 'reader' object goes out of scope then all the pointers are going
-  // to be invalid as the CSVGrainDataReader manages the memory for you.
-  int* grain_ids = reader.getGrainIdPointer();
-  if(grain_ids > 0)
-  {
-  }
-  std::cout << "Success Reading the Grain Data File" << std::endl;
-
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/FilterParametersRWTest.cpp b/Source/SIMPLib/Testing/Unused/FilterParametersRWTest.cpp
deleted file mode 100644
index e13a5d0e00..0000000000
--- a/Source/SIMPLib/Testing/Unused/FilterParametersRWTest.cpp
+++ /dev/null
@@ -1,1186 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "H5Support/QH5Utilities.h"
-
-#include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
-#include "SIMPLib/FilterParameters/QFilterParametersReader.h"
-#include "SIMPLib/FilterParameters/QFilterParametersWriter.h"
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/IOFilters/DataContainerReader.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-#include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/TestFilters/ArraySelectionExample.h"
-#include "SIMPLib/TestFilters/GenericExample.h"
-#include "SIMPLib/TestFilters/TestFilters.h"
-#include "SIMPLib/TestFilters/ThresholdExample.h"
-#include "UnitTestSupport.hpp"
-
-#include "GenerateFeatureIds.h"
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-#define StlFilePrefixTestValue "StlFilePrefixTestValue"
-#define MaxIterationsTestValue 20
-#define MisorientationToleranceTestValue 43.0
-#define InputFileTestValue "InputFileTestValue.html"
-#define InputPathTestValue "InputPathTestValue.html"
-#define OutputFileTestValue "OutputFileTestValue.html"
-#define OutputPathTestValue "OutputPathTestValue.html"
-#define WriteAlignmentShiftsTestValue true
-#define ConversionTypeTestValue 10
-#define SelectedCellArrayNameTestValue "SelectedCellArrayNameTestValue"
-#define SelectedFeatureArrayNameTestValue "SelectedFeatureArrayNameTestValue"
-#define SelectedEnsembleArrayNameTestValue "SelectedEnsembleArrayNameTestValue"
-#define SurfaceMeshVertexArrayNameTestValue "SurfaceMeshVertexArrayNameTestValue"
-#define SurfaceMeshFaceArrayNameTestValue "SurfaceMeshFaceArrayNameTestValue"
-#define SurfaceMeshEdgeArrayNameTestValue "SurfaceMeshEdgeArrayNameTestValue"
-#define SolidMeshVertexArrayNameTestValue "SolidMeshVertexArrayNameTestValue"
-#define SolidMeshFaceArrayNameTestValue "SolidMeshFaceArrayNameTestValue"
-#define SolidMeshEdgeArrayNameTestValue "SolidMeshEdgeArrayNameTestValue"
-#define CellComparisonInputsArrayName1 "CellComparisonInputsArrayName1"
-#define CellComparisonInputsCompOperator1 0
-#define CellComparisonInputsCompValue1 15.0
-#define CellComparisonInputsArrayName2 "CellComparisonInputsArrayName2"
-#define CellComparisonInputsCompOperator2 1
-#define CellComparisonInputsCompValue2 21.0
-#define FeatureComparisonInputsArrayName1 "FeatureComparisonInputsArrayName1"
-#define FeatureComparisonInputsCompOperator1 2
-#define FeatureComparisonInputsCompValue1 13.4
-#define FeatureComparisonInputsArrayName2 "FeatureComparisonInputsArrayName2"
-#define FeatureComparisonInputsCompOperator2 0
-#define FeatureComparisonInputsCompValue2 45.6
-#define EnsembleComparisonInputsArrayName1 "EnsembleComparisonInputsArrayName1"
-#define EnsembleComparisonInputsCompOperator1 1
-#define EnsembleComparisonInputsCompValue1 13.6
-#define EnsembleComparisonInputsArrayName2 "EnsembleComparisonInputsArrayName2"
-#define EnsembleComparisonInputsCompOperator2 2
-#define EnsembleComparisonInputsCompValue2 45.9
-#define PointComparisonInputsArrayName1 "PointComparisonInputsArrayName1"
-#define PointComparisonInputsCompOperator1 0
-#define PointComparisonInputsCompValue1 67.0
-#define PointComparisonInputsArrayName2 "PointComparisonInputsArrayName2"
-#define PointComparisonInputsCompOperator2 1
-#define PointComparisonInputsCompValue2 52.1
-#define FaceComparisonInputsArrayName1 "FaceComparisonInputsArrayName1"
-#define FaceComparisonInputsCompOperator1 2
-#define FaceComparisonInputsCompValue1 12.0
-#define FaceComparisonInputsArrayName2 "FaceComparisonInputsArrayName2"
-#define FaceComparisonInputsCompOperator2 0
-#define FaceComparisonInputsCompValue2 13.1
-#define EdgeComparisonInputsArrayName1 "EdgeComparisonInputsArrayName1"
-#define EdgeComparisonInputsCompOperator1 1
-#define EdgeComparisonInputsCompValue1 13.0
-#define EdgeComparisonInputsArrayName2 "EdgeComparisonInputsArrayName2"
-#define EdgeComparisonInputsCompOperator2 2
-#define EdgeComparisonInputsCompValue2 14.1
-#define AxisAngles1AngleTestValue 2.1f
-#define AxisAngles1HTestValue 5.67f
-#define AxisAngles1KTestValue 7.0f
-#define AxisAngles1LTestValue 3.42f
-#define AxisAngles2AngleTestValue 4.82f
-#define AxisAngles2HTestValue 9.0f
-#define AxisAngles2KTestValue 12.234f
-#define AxisAngles2LTestValue 16.4f
-#define IntWidgetXTestValue 3
-#define IntWidgetYTestValue 4
-#define IntWidgetZTestValue 5
-#define FloatWidgetXTestValue 6.0f
-#define FloatWidgetYTestValue 7.234f
-#define FloatWidgetZTestValue 12.3f
-#define SelectedVolumeCellArraysString1 "SelectedVolumeCellArraysString1"
-#define SelectedVolumeCellArraysString2 "SelectedVolumeCellArraysString2"
-#define SelectedVolumeCellArraysString3 "SelectedVolumeCellArraysString3"
-#define SelectedVolumeCellArraysString4 "SelectedVolumeCellArraysString4"
-#define SelectedVolumeCellFeatureArraysString1 "SelectedVolumeCellFeatureArraysString1"
-#define SelectedVolumeCellFeatureArraysString2 "SelectedVolumeCellFeatureArraysString2"
-#define SelectedVolumeCellFeatureArraysString3 "SelectedVolumeCellFeatureArraysString3"
-#define SelectedVolumeCellFeatureArraysString4 "SelectedVolumeCellFeatureArraysString4"
-#define SelectedVolumeCellEnsembleArraysString1 "SelectedVolumeCellEnsembleArraysString1"
-#define SelectedVolumeCellEnsembleArraysString2 "SelectedVolumeCellEnsembleArraysString2"
-#define SelectedVolumeCellEnsembleArraysString3 "SelectedVolumeCellEnsembleArraysString3"
-#define SelectedVolumeCellEnsembleArraysString4 "SelectedVolumeCellEnsembleArraysString4"
-#define SelectedSurfaceVertexArraysString1 "SelectedSurfaceVertexArraysString1"
-#define SelectedSurfaceVertexArraysString2 "SelectedSurfaceVertexArraysString2"
-#define SelectedSurfaceVertexArraysString3 "SelectedSurfaceVertexArraysString3"
-#define SelectedSurfaceVertexArraysString4 "SelectedSurfaceVertexArraysString4"
-#define SelectedSurfaceFaceArraysString1 "SelectedSurfaceFaceArraysString1"
-#define SelectedSurfaceFaceArraysString2 "SelectedSurfaceFaceArraysString2"
-#define SelectedSurfaceFaceArraysString3 "SelectedSurfaceFaceArraysString3"
-#define SelectedSurfaceFaceArraysString4 "SelectedSurfaceFaceArraysString4"
-#define SelectedSurfaceEdgeArraysString1 "SelectedSurfaceEdgeArraysString1"
-#define SelectedSurfaceEdgeArraysString2 "SelectedSurfaceEdgeArraysString2"
-#define SelectedSurfaceEdgeArraysString3 "SelectedSurfaceEdgeArraysString3"
-#define SelectedSurfaceEdgeArraysString4 "SelectedSurfaceEdgeArraysString4"
-#define SelectedSurfaceFaceFeatureArraysString1 "SelectedSurfaceFaceFeatureArraysString1"
-#define SelectedSurfaceFaceFeatureArraysString2 "SelectedSurfaceFaceFeatureArraysString2"
-#define SelectedSurfaceFaceFeatureArraysString3 "SelectedSurfaceFaceFeatureArraysString3"
-#define SelectedSurfaceFaceFeatureArraysString4 "SelectedSurfaceFaceFeatureArraysString4"
-#define SelectedSurfaceFaceEnsembleArraysString1 "SelectedSurfaceFaceEnsembleArraysString1"
-#define SelectedSurfaceFaceEnsembleArraysString2 "SelectedSurfaceFaceEnsembleArraysString2"
-#define SelectedSurfaceFaceEnsembleArraysString3 "SelectedSurfaceFaceEnsembleArraysString3"
-#define SelectedSurfaceFaceEnsembleArraysString4 "SelectedSurfaceFaceEnsembleArraysString4"
-#define SelectedVertexVertexArraysString1 "SelectedVertexVertexArraysString1"
-#define SelectedVertexVertexArraysString2 "SelectedVertexVertexArraysString2"
-#define SelectedVertexVertexArraysString3 "SelectedVertexVertexArraysString3"
-#define SelectedVertexVertexArraysString4 "SelectedVertexVertexArraysString4"
-#define SelectedVertexVertexFeatureArraysString1 "SelectedVertexVertexFeatureArraysString1"
-#define SelectedVertexVertexFeatureArraysString2 "SelectedVertexVertexFeatureArraysString2"
-#define SelectedVertexVertexFeatureArraysString3 "SelectedVertexVertexFeatureArraysString3"
-#define SelectedVertexVertexFeatureArraysString4 "SelectedVertexVertexFeatureArraysString4"
-#define SelectedVertexVertexEnsembleArraysString1 "SelectedVertexVertexEnsembleArraysString1"
-#define SelectedVertexVertexEnsembleArraysString2 "SelectedVertexVertexEnsembleArraysString2"
-#define SelectedVertexVertexEnsembleArraysString3 "SelectedVertexVertexEnsembleArraysString3"
-#define SelectedVertexVertexEnsembleArraysString4 "SelectedVertexVertexEnsembleArraysString4"
-
-enum TestCases
-{
-  Test1 = 0,
-  Test2,
-  Test3
-};
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::FilterParametersRWTest::ArraySelectionFile);
-  QFile::remove(UnitTest::FilterParametersRWTest::GenericExampleFile);
-  QFile::remove(UnitTest::FilterParametersRWTest::ThresholdFile);
-  QFile::remove(UnitTest::FilterParametersRWTest::ArraySelectionFileQSettings);
-  QFile::remove(UnitTest::FilterParametersRWTest::GenericExampleFileQSettings);
-  QFile::remove(UnitTest::FilterParametersRWTest::ThresholdFileQSettings);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//  Function used to generate test sets
-// -----------------------------------------------------------------------------
-QSet<QString> getSet(QString name1, QString name2, QString name3, QString name4)
-{
-  QSet<QString> set1;
-  set1.insert(name1);
-  set1.insert(name2);
-  set1.insert(name3);
-  set1.insert(name4);
-  return set1;
-}
-
-// -----------------------------------------------------------------------------
-//  Function used to generate test comparison input vectors
-// -----------------------------------------------------------------------------
-QVector<ComparisonInput_t> getComparisonInputsVector(QString arrayName1, int compOperator1, double compValue1, QString arrayName2, int compOperator2, double compValue2)
-{
-  ComparisonInput_t comparison1, comparison2;
-  comparison1.arrayName = arrayName1;
-  comparison1.compOperator = compOperator1;
-  comparison1.compValue = compValue1;
-
-  comparison2.arrayName = arrayName2;
-  comparison2.compOperator = compOperator2;
-  comparison2.compValue = compValue2;
-
-  QVector<ComparisonInput_t> comparisonVector;
-  comparisonVector.push_back(comparison1);
-  comparisonVector.push_back(comparison2);
-
-  return comparisonVector;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-template <typename T> T getValue()
-{
-  return std::numeric_limits<T>::max();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-template <typename T> bool validateValue(T value)
-{
-  return (value == std::numeric_limits<T>::max());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-template <typename T> QVector<T> getArray()
-{
-  QVector<T> data(4);
-  data[0] = std::numeric_limits<T>::min();
-  data[1] = std::numeric_limits<T>::max();
-  data[2] = std::numeric_limits<T>::max();
-  data[3] = std::numeric_limits<T>::min();
-  return data;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-template <typename T> void validateArray(QVector<T> data)
-{
-  DREAM3D_REQUIRE_EQUAL(data.size(), 4)
-  DREAM3D_REQUIRE_EQUAL(data[0], std::numeric_limits<T>::min());
-  DREAM3D_REQUIRE_EQUAL(data[1], std::numeric_limits<T>::max());
-  DREAM3D_REQUIRE_EQUAL(data[2], std::numeric_limits<T>::max());
-  DREAM3D_REQUIRE_EQUAL(data[3], std::numeric_limits<T>::min());
-}
-
-QVector<float> getArrayFloat()
-{
-  QVector<float> data(4);
-  data[0] = 0.1;
-  data[1] = -1.5;
-  data[2] = 23.66;
-  data[3] = -126.325;
-  return data;
-}
-
-void validateArray(QVector<float> data)
-{
-  DREAM3D_REQUIRE_EQUAL(data.size(), 4)
-  bool b = AlmostEqualUlpsFinal(data[0], 0.1, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[1], -1.5, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[2], 23.66, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[3], -126.325, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-}
-
-QVector<double> getArrayDouble()
-{
-  QVector<double> data(4);
-  data[0] = 0.1;
-  data[1] = -1.5;
-  data[2] = 23.66;
-  data[3] = -126.325;
-  return data;
-}
-
-void validateArray(QVector<double> data)
-{
-  DREAM3D_REQUIRE_EQUAL(data.size(), 4)
-  bool b = AlmostEqualUlpsFinal(data[0], 0.1, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[1], -1.5, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[2], 23.66, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-  b = AlmostEqualUlpsFinal(data[3], -126.325, 1);
-  DREAM3D_REQUIRE_EQUAL(true, b);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int WritePipelineToQSettings(FilterPipeline::Pointer pipeline, QString filePath)
-{
-  int err = -1;
-  QFilterParametersWriter::Pointer parametersWriter = QFilterParametersWriter::New();
-  parametersWriter->openFile(filePath, QSettings::IniFormat);
-
-  // Get the list of filters that are in the pipeline
-  FilterPipeline::FilterContainerType filters = pipeline->getFilterContainer();
-
-  // Now starting with the first filter in the pipeline, start the actual writing
-  AbstractFilter::Pointer currentFilter = filters.at(0);
-  int index = 0;
-  while(nullptr != currentFilter.get())
-  {
-    index = currentFilter->writeFilterParameters(parametersWriter.get(), index);
-    currentFilter = currentFilter->getNextFilter();
-  }
-  parametersWriter->setNumberOfFilters(index);
-  parametersWriter->closeFile();
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenerateArraySelectionExamplePipelineFiles()
-{
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  ArraySelectionExample::Pointer filt = ArraySelectionExample::New();
-
-  QSet<QString> set1 = getSet(SelectedVolumeCellArraysString1, SelectedVolumeCellArraysString2, SelectedVolumeCellArraysString3, SelectedVolumeCellArraysString4);
-  filt->setSelectedVolumeCellArrays(set1);
-
-  QSet<QString> set2 = getSet(SelectedVolumeCellFeatureArraysString1, SelectedVolumeCellFeatureArraysString2, SelectedVolumeCellFeatureArraysString3, SelectedVolumeCellFeatureArraysString4);
-  filt->setSelectedVolumeCellFeatureArrays(set2);
-
-  QSet<QString> set3 = getSet(SelectedVolumeCellEnsembleArraysString1, SelectedVolumeCellEnsembleArraysString2, SelectedVolumeCellEnsembleArraysString3, SelectedVolumeCellEnsembleArraysString4);
-  filt->setSelectedVolumeCellEnsembleArrays(set3);
-
-  QSet<QString> set4 = getSet(SelectedSurfaceVertexArraysString1, SelectedSurfaceVertexArraysString2, SelectedSurfaceVertexArraysString3, SelectedSurfaceVertexArraysString4);
-  filt->setSelectedSurfaceVertexArrays(set4);
-
-  QSet<QString> set5 = getSet(SelectedSurfaceFaceArraysString1, SelectedSurfaceFaceArraysString2, SelectedSurfaceFaceArraysString3, SelectedSurfaceFaceArraysString4);
-  filt->setSelectedSurfaceFaceArrays(set5);
-
-  QSet<QString> set6 = getSet(SelectedSurfaceEdgeArraysString1, SelectedSurfaceEdgeArraysString2, SelectedSurfaceEdgeArraysString3, SelectedSurfaceEdgeArraysString4);
-  filt->setSelectedSurfaceEdgeArrays(set6);
-
-  QSet<QString> set7 = getSet(SelectedSurfaceFaceFeatureArraysString1, SelectedSurfaceFaceFeatureArraysString2, SelectedSurfaceFaceFeatureArraysString3, SelectedSurfaceFaceFeatureArraysString4);
-  filt->setSelectedSurfaceFaceFeatureArrays(set7);
-
-  QSet<QString> set8 = getSet(SelectedSurfaceFaceEnsembleArraysString1, SelectedSurfaceFaceEnsembleArraysString2, SelectedSurfaceFaceEnsembleArraysString3, SelectedSurfaceFaceEnsembleArraysString4);
-  filt->setSelectedSurfaceFaceEnsembleArrays(set8);
-
-  QSet<QString> set9 = getSet(SelectedVertexVertexArraysString1, SelectedVertexVertexArraysString2, SelectedVertexVertexArraysString3, SelectedVertexVertexArraysString4);
-  filt->setSelectedVertexVertexArrays(set9);
-
-  QSet<QString> set10 = getSet(SelectedVertexVertexFeatureArraysString1, SelectedVertexVertexFeatureArraysString2, SelectedVertexVertexFeatureArraysString3, SelectedVertexVertexFeatureArraysString4);
-  filt->setSelectedVertexVertexFeatureArrays(set10);
-
-  QSet<QString> set11 =
-      getSet(SelectedVertexVertexEnsembleArraysString1, SelectedVertexVertexEnsembleArraysString2, SelectedVertexVertexEnsembleArraysString3, SelectedVertexVertexEnsembleArraysString4);
-  filt->setSelectedVertexVertexEnsembleArrays(set11);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FilterParametersRWTest::ArraySelectionFile);
-  writer->setWriteXdmfFile(false);
-
-  CreateVolumeDataContainer::Pointer cdc = CreateVolumeDataContainer::New();
-  pipeline->pushBack(cdc);
-  pipeline->pushBack(filt);
-  pipeline->pushBack(writer);
-
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRED(err, >=, 0)
-
-  WritePipelineToQSettings(pipeline, UnitTest::FilterParametersRWTest::ArraySelectionFileQSettings);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ValidateArraySelectionExampleFilter(ArraySelectionExample::Pointer filt)
-{
-  QSet<QString> comp = filt->getSelectedVolumeCellArrays();
-  DREAM3D_REQUIRE_EQUAL(comp.size(), 4);
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellArraysString4), ==, true)
-
-  comp = filt->getSelectedVolumeCellFeatureArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellFeatureArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellFeatureArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellFeatureArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellFeatureArraysString4), ==, true)
-
-  comp = filt->getSelectedVolumeCellEnsembleArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellEnsembleArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellEnsembleArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellEnsembleArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVolumeCellEnsembleArraysString4), ==, true)
-
-  comp = filt->getSelectedSurfaceVertexArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceVertexArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceVertexArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceVertexArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceVertexArraysString4), ==, true)
-
-  comp = filt->getSelectedSurfaceFaceArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceArraysString4), ==, true)
-
-  comp = filt->getSelectedSurfaceEdgeArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceEdgeArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceEdgeArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceEdgeArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceEdgeArraysString4), ==, true)
-
-  comp = filt->getSelectedSurfaceFaceFeatureArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceFeatureArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceFeatureArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceFeatureArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceFeatureArraysString4), ==, true)
-
-  comp = filt->getSelectedSurfaceFaceEnsembleArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceEnsembleArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceEnsembleArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceEnsembleArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedSurfaceFaceEnsembleArraysString4), ==, true)
-
-  comp = filt->getSelectedVertexVertexArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexArraysString4), ==, true)
-
-  comp = filt->getSelectedVertexVertexFeatureArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexFeatureArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexFeatureArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexFeatureArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexFeatureArraysString4), ==, true)
-
-  comp = filt->getSelectedVertexVertexEnsembleArrays();
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexEnsembleArraysString1), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexEnsembleArraysString2), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexEnsembleArraysString3), ==, true)
-  DREAM3D_REQUIRED(comp.contains(SelectedVertexVertexEnsembleArraysString4), ==, true)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyArraySelectionExampleQSettingsFilterParameters()
-{
-  ArraySelectionExample::Pointer filt = ArraySelectionExample::New();
-  QFilterParametersReader::Pointer reader = QFilterParametersReader::New();
-  reader->openFile(UnitTest::FilterParametersRWTest::ArraySelectionFileQSettings, QSettings::IniFormat);
-  int index = 1;
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateArraySelectionExampleFilter(filt);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyArraySelectionExampleHDF5FilterParameters()
-{
-  // We are done writing a file, now we need to read the file using raw HDF5 codes
-  ArraySelectionExample::Pointer filt = ArraySelectionExample::New();
-  hid_t fid = -1;
-  H5FilterParametersReader::Pointer reader = H5FilterParametersReader::OpenDREAM3DFileForReadingPipeline(UnitTest::FilterParametersRWTest::ArraySelectionFile, fid);
-  DREAM3D_REQUIRED(fid, >, 0)
-  DREAM3D_REQUIRED(filt.get(), !=, nullptr)
-
-  // The Generic Filter is the second (index = 1) filter in the pipeline, so set this index value
-  int index = 1;
-
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateArraySelectionExampleFilter(filt);
-
-  // Close up the HDF5 file
-  H5Gclose(reader->getPipelineGroupId()); // Closes the "Pipeline" group
-  H5Fclose(fid);                          // Closes the file
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-GenericExample::Pointer GenerateGenericExample()
-{
-  GenericExample::Pointer filt = GenericExample::New();
-
-  // Set something for each and every property so you have something to compare against.
-  // You may want to make some constants for these values
-  filt->setStlFilePrefix(StlFilePrefixTestValue);
-  filt->setMaxIterations(MaxIterationsTestValue);
-  filt->setMisorientationTolerance(MisorientationToleranceTestValue);
-  filt->setInputFile(InputFileTestValue);
-  filt->setInputPath(InputPathTestValue);
-  filt->setOutputFile(OutputFileTestValue);
-  filt->setOutputPath(OutputPathTestValue);
-  filt->setWriteAlignmentShifts(WriteAlignmentShiftsTestValue);
-  filt->setConversionType(ConversionTypeTestValue);
-
-  filt->setSelectedVolumeCellArrayName(SelectedCellArrayNameTestValue);
-  filt->setSelectedVolumeFeatureArrayName(SelectedFeatureArrayNameTestValue);
-  filt->setSelectedVolumeEnsembleArrayName(SelectedEnsembleArrayNameTestValue);
-  filt->setSelectedSurfaceVertexArrayName(SurfaceMeshVertexArrayNameTestValue);
-  filt->setSelectedSurfaceFaceArrayName(SurfaceMeshFaceArrayNameTestValue);
-  filt->setSelectedSurfaceEdgeArrayName(SurfaceMeshEdgeArrayNameTestValue);
-  filt->setSelectedVertexVertexArrayName(SolidMeshVertexArrayNameTestValue);
-  filt->setSelectedVertexFeatureArrayName(SolidMeshFaceArrayNameTestValue);
-  filt->setSelectedVertexEnsembleArrayName(SolidMeshEdgeArrayNameTestValue);
-
-  QVector<QString> strVector;
-  strVector.push_back(SurfaceMeshVertexArrayNameTestValue);
-  strVector.push_back(SurfaceMeshFaceArrayNameTestValue);
-  strVector.push_back(SurfaceMeshEdgeArrayNameTestValue);
-  strVector.push_back(SolidMeshVertexArrayNameTestValue);
-  strVector.push_back(SolidMeshFaceArrayNameTestValue);
-  strVector.push_back(SolidMeshEdgeArrayNameTestValue);
-
-  filt->setStrVector(strVector);
-
-  filt->setInt8Array(getArray<int8_t>());
-  filt->setInt16Array(getArray<int16_t>());
-  filt->setInt32Array(getArray<int32_t>());
-  filt->setInt64Array(getArray<int64_t>());
-  filt->setUInt8Array(getArray<uint8_t>());
-  filt->setUInt16Array(getArray<uint16_t>());
-  filt->setUInt32Array(getArray<uint32_t>());
-  filt->setUInt64Array(getArray<uint64_t>());
-  filt->setFloatArray(getArrayFloat());
-  filt->setDoubleArray(getArrayDouble());
-
-  filt->setInt8Value(getValue<int8_t>());
-  filt->setInt16Value(getValue<int16_t>());
-  filt->setInt32Value(getValue<int32_t>());
-  filt->setInt64Value(getValue<int64_t>());
-  filt->setUInt8Value(getValue<uint8_t>());
-  filt->setUInt16Value(getValue<uint16_t>());
-  filt->setUInt32Value(getValue<uint32_t>());
-  filt->setUInt64Value(getValue<uint64_t>());
-  filt->setFloatValue(-1.521);
-  filt->setDoubleValue(2.36547);
-
-  IntVec3Widget_t intWidget;
-  intWidget.x = IntWidgetXTestValue;
-  intWidget.y = IntWidgetYTestValue;
-  intWidget.z = IntWidgetZTestValue;
-  filt->setDimensions(intWidget);
-
-  FloatVec3Widget_t floatWidget;
-  floatWidget.x = FloatWidgetXTestValue;
-  floatWidget.y = FloatWidgetYTestValue;
-  floatWidget.z = FloatWidgetZTestValue;
-  filt->setOrigin(floatWidget);
-
-  AxisAngleInput_t axisAngles1;
-  axisAngles1.angle = AxisAngles1AngleTestValue;
-  axisAngles1.h = AxisAngles1HTestValue;
-  axisAngles1.k = AxisAngles1KTestValue;
-  axisAngles1.l = AxisAngles1LTestValue;
-
-  AxisAngleInput_t axisAngles2;
-  axisAngles2.angle = AxisAngles2AngleTestValue;
-  axisAngles2.h = AxisAngles2HTestValue;
-  axisAngles2.k = AxisAngles2KTestValue;
-  axisAngles2.l = AxisAngles2LTestValue;
-
-  QVector<AxisAngleInput_t> axisAngleInputsVector;
-  axisAngleInputsVector.push_back(axisAngles1);
-  axisAngleInputsVector.push_back(axisAngles2);
-  filt->setAxisAngleInputs(axisAngleInputsVector);
-
-  return filt;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ValidateGenericExampleFilter(GenericExample::Pointer filt)
-{
-  // Now one by one, compare each of the filter parameters that you have stored in some constant somewhere to the values that are now in the filt variable.
-  // Use DREAM3D_REQUIRED() to make sure each one is what you think it is.
-  DREAM3D_REQUIRED(StlFilePrefixTestValue, ==, filt->getStlFilePrefix())
-  DREAM3D_REQUIRED(MaxIterationsTestValue, ==, filt->getMaxIterations())
-  DREAM3D_REQUIRED(MisorientationToleranceTestValue, ==, filt->getMisorientationTolerance())
-  DREAM3D_REQUIRED(InputFileTestValue, ==, filt->getInputFile())
-  DREAM3D_REQUIRED(InputPathTestValue, ==, filt->getInputPath())
-  DREAM3D_REQUIRED(OutputFileTestValue, ==, filt->getOutputFile())
-  DREAM3D_REQUIRED(OutputPathTestValue, ==, filt->getOutputPath())
-  DREAM3D_REQUIRED(WriteAlignmentShiftsTestValue, ==, filt->getWriteAlignmentShifts())
-  DREAM3D_REQUIRED(ConversionTypeTestValue, ==, filt->getConversionType())
-  DREAM3D_REQUIRED(SelectedCellArrayNameTestValue, ==, filt->getSelectedVolumeCellArrayName())
-  DREAM3D_REQUIRED(SelectedFeatureArrayNameTestValue, ==, filt->getSelectedVolumeFeatureArrayName())
-  DREAM3D_REQUIRED(SelectedEnsembleArrayNameTestValue, ==, filt->getSelectedVolumeEnsembleArrayName())
-  DREAM3D_REQUIRED(SurfaceMeshVertexArrayNameTestValue, ==, filt->getSelectedSurfaceVertexArrayName())
-  DREAM3D_REQUIRED(SurfaceMeshFaceArrayNameTestValue, ==, filt->getSelectedSurfaceFaceArrayName())
-  DREAM3D_REQUIRED(SurfaceMeshEdgeArrayNameTestValue, ==, filt->getSelectedSurfaceEdgeArrayName())
-  DREAM3D_REQUIRED(SolidMeshVertexArrayNameTestValue, ==, filt->getSelectedVertexVertexArrayName())
-  DREAM3D_REQUIRED(SolidMeshFaceArrayNameTestValue, ==, filt->getSelectedVertexFeatureArrayName())
-  DREAM3D_REQUIRED(SolidMeshEdgeArrayNameTestValue, ==, filt->getSelectedVertexEnsembleArrayName())
-
-  // Test the IntVec3Widget
-  IntVec3Widget_t intWidgetRead = filt->getDimensions();
-  DREAM3D_REQUIRED(IntWidgetXTestValue, ==, intWidgetRead.x)
-  DREAM3D_REQUIRED(IntWidgetYTestValue, ==, intWidgetRead.y)
-  DREAM3D_REQUIRED(IntWidgetZTestValue, ==, intWidgetRead.z)
-
-  // Test the FloatVec3Widget
-  FloatVec3Widget_t floatWidgetRead = filt->getOrigin();
-  DREAM3D_REQUIRED(FloatWidgetXTestValue, ==, floatWidgetRead.x)
-  DREAM3D_REQUIRED(FloatWidgetYTestValue, ==, floatWidgetRead.y)
-  DREAM3D_REQUIRED(FloatWidgetZTestValue, ==, floatWidgetRead.z)
-
-  // Test the AxisAngleInput
-  QVector<AxisAngleInput_t> axisAngleVectorRead = filt->getAxisAngleInputs();
-  AxisAngleInput_t axisAngles1Read = axisAngleVectorRead[0];
-  AxisAngleInput_t axisAngles2Read = axisAngleVectorRead[1];
-
-  DREAM3D_REQUIRED(AxisAngles1AngleTestValue, ==, axisAngles1Read.angle)
-  DREAM3D_REQUIRED(AxisAngles1HTestValue, ==, axisAngles1Read.h)
-  DREAM3D_REQUIRED(AxisAngles1KTestValue, ==, axisAngles1Read.k)
-  DREAM3D_REQUIRED(AxisAngles1LTestValue, ==, axisAngles1Read.l)
-  DREAM3D_REQUIRED(AxisAngles2AngleTestValue, ==, axisAngles2Read.angle)
-  DREAM3D_REQUIRED(AxisAngles2HTestValue, ==, axisAngles2Read.h)
-  DREAM3D_REQUIRED(AxisAngles2KTestValue, ==, axisAngles2Read.k)
-  DREAM3D_REQUIRED(AxisAngles2LTestValue, ==, axisAngles2Read.l)
-
-  // Test the string vector
-  QVector<QString> strVectorRead = filt->getStrVector();
-  DREAM3D_REQUIRED(SurfaceMeshVertexArrayNameTestValue, ==, strVectorRead[0])
-  DREAM3D_REQUIRED(SurfaceMeshFaceArrayNameTestValue, ==, strVectorRead[1])
-  DREAM3D_REQUIRED(SurfaceMeshEdgeArrayNameTestValue, ==, strVectorRead[2])
-  DREAM3D_REQUIRED(SolidMeshVertexArrayNameTestValue, ==, strVectorRead[3])
-  DREAM3D_REQUIRED(SolidMeshFaceArrayNameTestValue, ==, strVectorRead[4])
-  DREAM3D_REQUIRED(SolidMeshEdgeArrayNameTestValue, ==, strVectorRead[5])
-
-  validateArray<int8_t>(filt->getInt8Array());
-  validateArray<int16_t>(filt->getInt16Array());
-  validateArray<int32_t>(filt->getInt32Array());
-  validateArray<int64_t>(filt->getInt64Array());
-  validateArray<uint8_t>(filt->getUInt8Array());
-  validateArray<uint16_t>(filt->getUInt16Array());
-  validateArray<uint32_t>(filt->getUInt32Array());
-  validateArray<uint64_t>(filt->getUInt64Array());
-  validateArray(filt->getFloatArray());
-  validateArray(filt->getDoubleArray());
-
-  DREAM3D_REQUIRED(validateValue<int8_t>(filt->getInt8Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<int16_t>(filt->getInt16Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<int32_t>(filt->getInt32Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<int64_t>(filt->getInt64Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<uint8_t>(filt->getUInt8Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<uint16_t>(filt->getUInt16Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<uint32_t>(filt->getUInt32Value()), ==, true);
-  DREAM3D_REQUIRED(validateValue<uint64_t>(filt->getUInt64Value()), ==, true);
-  DREAM3D_COMPARE_FLOATS(-1.521, filt->getFloatValue(), 10);
-  DREAM3D_REQUIRE_EQUAL(2.36547, filt->getDoubleValue());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyGenericExampleQSettingsFilterParameters()
-{
-  GenericExample::Pointer filt = GenericExample::New();
-  QFilterParametersReader::Pointer reader = QFilterParametersReader::New();
-  reader->openFile(UnitTest::FilterParametersRWTest::GenericExampleFileQSettings, QSettings::IniFormat);
-  int index = 1;
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateGenericExampleFilter(filt);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyGenericExampleHDF5FilterParameters()
-{
-  GenericExample::Pointer filt = GenericExample::New();
-  hid_t fid = -1;
-  H5FilterParametersReader::Pointer reader = H5FilterParametersReader::OpenDREAM3DFileForReadingPipeline(UnitTest::FilterParametersRWTest::GenericExampleFile, fid);
-  DREAM3D_REQUIRED(fid, >, 0);
-  DREAM3D_REQUIRED(filt.get(), !=, nullptr);
-
-  // The Generic Filter is the second (index = 1) filter in the pipeline, so set this index value
-  int index = 1;
-
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateGenericExampleFilter(filt);
-
-  // Close up the HDF5 file
-  H5Gclose(reader->getPipelineGroupId()); // Closes the "Pipeline" group
-  H5Fclose(fid);                          // Closes the file
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenerateGenericExamplePipelineFiles()
-{
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  CreateVolumeDataContainer::Pointer cdc = CreateVolumeDataContainer::New();
-  pipeline->pushBack(cdc);
-
-  // This creates our GenericExample Filter instance packed with known values
-  GenericExample::Pointer filt = GenerateGenericExample();
-  pipeline->pushBack(filt);
-
-  // Add a DataContainerWriter filter to write the pipeline
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FilterParametersRWTest::GenericExampleFile);
-  writer->setWriteXdmfFile(false);
-  pipeline->pushBack(writer);
-
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRED(err, >=, 0)
-
-  WritePipelineToQSettings(pipeline, UnitTest::FilterParametersRWTest::GenericExampleFileQSettings);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ValidateThresholdExampleFilter(ThresholdExample::Pointer filt)
-{
-  // Test the CellComparisonInputs
-  QVector<ComparisonInput_t> cellComparisonInputsVectorRead = filt->getCellComparisonInputs();
-  ComparisonInput_t cellComparisonInputs1 = cellComparisonInputsVectorRead[0];
-  ComparisonInput_t cellComparisonInputs2 = cellComparisonInputsVectorRead[1];
-
-  QVector<ComparisonInput_t> featureComparisonInputsVectorRead = filt->getFeatureComparisonInputs();
-  ComparisonInput_t featureComparisonInputs1 = featureComparisonInputsVectorRead[0];
-  ComparisonInput_t featureComparisonInputs2 = featureComparisonInputsVectorRead[1];
-
-  QVector<ComparisonInput_t> ensembleComparisonInputsVectorRead = filt->getEnsembleComparisonInputs();
-  ComparisonInput_t ensembleComparisonInputs1 = ensembleComparisonInputsVectorRead[0];
-  ComparisonInput_t ensembleComparisonInputs2 = ensembleComparisonInputsVectorRead[1];
-
-  QVector<ComparisonInput_t> pointComparisonInputsVectorRead = filt->getPointComparisonInputs();
-  ComparisonInput_t pointComparisonInputs1 = pointComparisonInputsVectorRead[0];
-  ComparisonInput_t pointComparisonInputs2 = pointComparisonInputsVectorRead[1];
-
-  QVector<ComparisonInput_t> faceComparisonInputsVectorRead = filt->getFaceComparisonInputs();
-  ComparisonInput_t faceComparisonInputs1 = faceComparisonInputsVectorRead[0];
-  ComparisonInput_t faceComparisonInputs2 = faceComparisonInputsVectorRead[1];
-
-  QVector<ComparisonInput_t> edgeComparisonInputsVectorRead = filt->getEdgeComparisonInputs();
-  ComparisonInput_t edgeComparisonInputs1 = edgeComparisonInputsVectorRead[0];
-  ComparisonInput_t edgeComparisonInputs2 = edgeComparisonInputsVectorRead[1];
-
-  DREAM3D_REQUIRED(CellComparisonInputsArrayName1, ==, cellComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(CellComparisonInputsCompOperator1, ==, cellComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(CellComparisonInputsCompValue1, ==, cellComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(CellComparisonInputsArrayName2, ==, cellComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(CellComparisonInputsCompOperator2, ==, cellComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(CellComparisonInputsCompValue2, ==, cellComparisonInputs2.compValue)
-
-  //  union {
-  //  int64_t i;
-  //  double  d;
-  //  } comp;
-  //  comp.d = FeatureComparisonInputsCompValue1;
-  //  printf("%llx\n", comp.i);
-  //  comp.d = featureComparisonInputs1.compValue;
-  //  printf("%llx\n", comp.i);
-
-  DREAM3D_REQUIRED(FeatureComparisonInputsArrayName1, ==, featureComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(FeatureComparisonInputsCompOperator1, ==, featureComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(FeatureComparisonInputsCompValue1, ==, featureComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(FeatureComparisonInputsArrayName2, ==, featureComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(FeatureComparisonInputsCompOperator2, ==, featureComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(FeatureComparisonInputsCompValue2, ==, featureComparisonInputs2.compValue)
-
-  DREAM3D_REQUIRED(EnsembleComparisonInputsArrayName1, ==, ensembleComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(EnsembleComparisonInputsCompOperator1, ==, ensembleComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(EnsembleComparisonInputsCompValue1, ==, ensembleComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(EnsembleComparisonInputsArrayName2, ==, ensembleComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(EnsembleComparisonInputsCompOperator2, ==, ensembleComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(EnsembleComparisonInputsCompValue2, ==, ensembleComparisonInputs2.compValue)
-
-  DREAM3D_REQUIRED(PointComparisonInputsArrayName1, ==, pointComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(PointComparisonInputsCompOperator1, ==, pointComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(PointComparisonInputsCompValue1, ==, pointComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(PointComparisonInputsArrayName2, ==, pointComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(PointComparisonInputsCompOperator2, ==, pointComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(PointComparisonInputsCompValue2, ==, pointComparisonInputs2.compValue)
-
-  DREAM3D_REQUIRED(FaceComparisonInputsArrayName1, ==, faceComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(FaceComparisonInputsCompOperator1, ==, faceComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(FaceComparisonInputsCompValue1, ==, faceComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(FaceComparisonInputsArrayName2, ==, faceComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(FaceComparisonInputsCompOperator2, ==, faceComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(FaceComparisonInputsCompValue2, ==, faceComparisonInputs2.compValue)
-
-  DREAM3D_REQUIRED(EdgeComparisonInputsArrayName1, ==, edgeComparisonInputs1.arrayName)
-  DREAM3D_REQUIRED(EdgeComparisonInputsCompOperator1, ==, edgeComparisonInputs1.compOperator)
-  DREAM3D_REQUIRED(EdgeComparisonInputsCompValue1, ==, edgeComparisonInputs1.compValue)
-  DREAM3D_REQUIRED(EdgeComparisonInputsArrayName2, ==, edgeComparisonInputs2.arrayName)
-  DREAM3D_REQUIRED(EdgeComparisonInputsCompOperator2, ==, edgeComparisonInputs2.compOperator)
-  DREAM3D_REQUIRED(EdgeComparisonInputsCompValue2, ==, edgeComparisonInputs2.compValue)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyThresholdExampleQSettingsFilterParameters()
-{
-  ThresholdExample::Pointer filt = ThresholdExample::New();
-  QFilterParametersReader::Pointer reader = QFilterParametersReader::New();
-  reader->openFile(UnitTest::FilterParametersRWTest::ThresholdFileQSettings, QSettings::IniFormat);
-  int index = 1;
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateThresholdExampleFilter(filt);
-
-  FilterPipeline::Pointer pipeline = QFilterParametersReader::ReadPipelineFromFile(UnitTest::FilterParametersRWTest::ThresholdFile, QSettings::IniFormat);
-  DREAM3D_REQUIRE(pipeline.get() != nullptr)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void VerifyThresholdExampleHDF5FilterParameters()
-{
-  ThresholdExample::Pointer filt = ThresholdExample::New();
-  hid_t fid = -1;
-  H5FilterParametersReader::Pointer reader = H5FilterParametersReader::OpenDREAM3DFileForReadingPipeline(UnitTest::FilterParametersRWTest::ThresholdFile, fid);
-  DREAM3D_REQUIRED(fid, >, 0)
-  DREAM3D_REQUIRED(filt.get(), !=, nullptr)
-
-  // The Generic Filter is the second (index = 1) filter in the pipeline, so set this index value
-  int index = 1;
-
-  // This next line should read all the filter parameters into the filter.
-  filt->readFilterParameters(reader.get(), index);
-
-  // Compare the filter to what was read from the file
-  ValidateThresholdExampleFilter(filt);
-
-  // Close up the HDF5 file
-  H5Gclose(reader->getPipelineGroupId()); // Closes the "Pipeline" group
-  H5Fclose(fid);                          // Closes the file
-
-  FilterPipeline::Pointer pipeline = H5FilterParametersReader::ReadPipelineFromFile(UnitTest::FilterParametersRWTest::ThresholdFile);
-  DREAM3D_REQUIRE(pipeline.get() != nullptr)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenerateThresholdExamplePipelineFiles()
-{
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  ThresholdExample::Pointer filt = ThresholdExample::New();
-
-  QVector<ComparisonInput_t> cellComparisonInputsVector = getComparisonInputsVector(CellComparisonInputsArrayName1, CellComparisonInputsCompOperator1, CellComparisonInputsCompValue1,
-                                                                                    CellComparisonInputsArrayName2, CellComparisonInputsCompOperator2, CellComparisonInputsCompValue2);
-  filt->setCellComparisonInputs(cellComparisonInputsVector);
-
-  QVector<ComparisonInput_t> featureComparisonInputsVector = getComparisonInputsVector(FeatureComparisonInputsArrayName1, FeatureComparisonInputsCompOperator1, FeatureComparisonInputsCompValue1,
-                                                                                       FeatureComparisonInputsArrayName2, FeatureComparisonInputsCompOperator2, FeatureComparisonInputsCompValue2);
-  filt->setFeatureComparisonInputs(featureComparisonInputsVector);
-
-  QVector<ComparisonInput_t> ensembleComparisonInputsVector = getComparisonInputsVector(EnsembleComparisonInputsArrayName1, EnsembleComparisonInputsCompOperator1, EnsembleComparisonInputsCompValue1,
-                                                                                        EnsembleComparisonInputsArrayName2, EnsembleComparisonInputsCompOperator2, EnsembleComparisonInputsCompValue2);
-  filt->setEnsembleComparisonInputs(ensembleComparisonInputsVector);
-
-  QVector<ComparisonInput_t> pointComparisonInputsVector = getComparisonInputsVector(PointComparisonInputsArrayName1, PointComparisonInputsCompOperator1, PointComparisonInputsCompValue1,
-                                                                                     PointComparisonInputsArrayName2, PointComparisonInputsCompOperator2, PointComparisonInputsCompValue2);
-  filt->setPointComparisonInputs(pointComparisonInputsVector);
-
-  QVector<ComparisonInput_t> faceComparisonInputsVector = getComparisonInputsVector(FaceComparisonInputsArrayName1, FaceComparisonInputsCompOperator1, FaceComparisonInputsCompValue1,
-                                                                                    FaceComparisonInputsArrayName2, FaceComparisonInputsCompOperator2, FaceComparisonInputsCompValue2);
-  filt->setFaceComparisonInputs(faceComparisonInputsVector);
-
-  QVector<ComparisonInput_t> edgeComparisonInputsVector = getComparisonInputsVector(EdgeComparisonInputsArrayName1, EdgeComparisonInputsCompOperator1, EdgeComparisonInputsCompValue1,
-                                                                                    EdgeComparisonInputsArrayName2, EdgeComparisonInputsCompOperator2, EdgeComparisonInputsCompValue2);
-  filt->setEdgeComparisonInputs(edgeComparisonInputsVector);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FilterParametersRWTest::ThresholdFile);
-  writer->setWriteXdmfFile(false);
-
-  CreateVolumeDataContainer::Pointer cdc = CreateVolumeDataContainer::New();
-  pipeline->pushBack(cdc);
-  pipeline->pushBack(filt);
-  pipeline->pushBack(writer);
-
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRED(err, >=, 0)
-
-  WritePipelineToQSettings(pipeline, UnitTest::FilterParametersRWTest::ThresholdFileQSettings);
-}
-
-#if 0
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-FilterPipeline::Pointer readPipelineFromHDF5File(hid_t fileId)
-{
-  int err = 0;
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  H5FilterParametersReader::Pointer reader = H5FilterParametersReader::New();
-
-  // HDF5: Open the "Pipeline" Group
-  hid_t pipelineGroupId = H5Gopen(fileId, SIMPL::StringConstants::PipelineGroupName.toLatin1().data(), H5P_DEFAULT);
-  reader->setPipelineGroupId(pipelineGroupId);
-
-  // Use QH5Lite to ask how many "groups" are in the "Pipeline Group"
-  QList<QString> groupList;
-  err = QH5Utilities::getGroupObjects(pipelineGroupId, H5O_TYPE_GROUP, groupList);
-
-  // Loop over the items getting the "ClassName" attribute from each group
-  QString classNameStr = "";
-  for (int i = 0; i < groupList.size(); i++)
-  {
-    QString ss = QString::number(i, 10);
-    err = QH5Lite::readStringAttribute(pipelineGroupId, ss, "ClassName", classNameStr);
-    if (err < 0)
-    {
-      return FilterPipeline::NullPointer();
-    }
-
-    // Instantiate a new filter using the FilterFactory based on the value of the className attribute
-    FilterManager::Pointer fm = FilterManager::Instance();
-    IFilterFactory::Pointer ff = fm->getFactoryFromClassName(classNameStr);
-    AbstractFilter::Pointer filter = ff->create();
-
-    // Read the parameters
-    filter->readFilterParameters( reader.get(), i );
-
-    // Add filter to m_PipelineFromFile
-    pipeline->pushBack(filter);
-  }
-
-  return pipeline;
-}
-#endif
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterManagerTest()
-{
-  FilterManager::Pointer fm = FilterManager::Instance();
-
-  IFilterFactory::Pointer ff = fm->getFactoryFromClassName(DataContainerReader::ClassName());
-  DREAM3D_REQUIRE_NE(ff.get(), nullptr)
-  AbstractFilter::Pointer reader = ff->create();
-  DREAM3D_REQUIRE_NE(reader.get(), nullptr)
-
-  int comp = DataContainerReader::ClassName().compare(reader->getNameOfClass());
-  DREAM3D_REQUIRE_EQUAL(comp, 0);
-
-  /* Get all the factories which should be at least 1 */
-  FilterManager::Collection factories = fm->getFactories();
-
-  DREAM3D_REQUIRED(factories.size(), >, 0)
-
-  Filt0::Pointer filt0 = Filt0::New();
-  Filt1::Pointer filt1 = Filt1::New();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExistingPipelineTest(QString outputFile, QString inputFile, TestCases test_case)
-{
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  Filt0::Pointer filt0 = Filt0::New();
-  Filt1::Pointer filt1 = Filt1::New();
-  DataContainerWriter::Pointer w = DataContainerWriter::New();
-
-  DataContainerReader::Pointer r = DataContainerReader::New();
-  r->setInputFile(inputFile);
-
-  filt0->setFilt0_Float(13.1f + test_case);
-  filt0->setFilt0_Integer(12 + test_case);
-  filt1->setFilt1_Float(2.3f + test_case);
-  filt1->setFilt1_Integer(4 + test_case);
-  w->setOutputFile(outputFile);
-
-  if(test_case == Test1)
-  {
-    pipeline->pushBack(filt0);
-    pipeline->pushBack(filt1);
-    pipeline->pushBack(w);
-  }
-  else if(test_case == Test2)
-  {
-    pipeline->pushBack(r);
-    pipeline->pushBack(filt0);
-    pipeline->pushBack(filt1);
-    pipeline->pushBack(w);
-  }
-  else if(test_case == Test3)
-  {
-    pipeline->pushBack(filt0);
-    pipeline->pushBack(filt1);
-    pipeline->pushBack(r);
-    pipeline->pushBack(w);
-  }
-  else
-  {
-    return;
-  }
-
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRED(err, >=, 0)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExistingPipelineCheck(QString fileName)
-{
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  DataContainerReader::Pointer r = DataContainerReader::New();
-  r->setInputFile(fileName);
-
-  pipeline->pushBack(r);
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRED(err, >=, 0)
-
-  FilterPipeline::Pointer filePipeline = r.get()->getPipelinePointer();
-
-  AbstractFilter::Pointer absFilter = AbstractFilter::New();
-  FilterPipeline::FilterContainerType container = filePipeline->getFilterContainer();
-
-  DREAM3D_REQUIRED(container.size(), ==, 11)
-
-  FilterPipeline::FilterContainerType::iterator iter = container.begin();
-
-  absFilter = *iter;
-  Filt0::Pointer f0_1 = std::dynamic_pointer_cast<Filt0>(absFilter);
-  DREAM3D_REQUIRED(f0_1->getFilt0_Float(), ==, 15.1f)
-  DREAM3D_REQUIRED(f0_1->getFilt0_Integer(), ==, 14)
-  iter++;
-
-  absFilter = *iter;
-  Filt1::Pointer f1_1 = std::dynamic_pointer_cast<Filt1>(absFilter);
-  DREAM3D_REQUIRED(f1_1->getFilt1_Float(), ==, 4.3f)
-  DREAM3D_REQUIRED(f1_1->getFilt1_Integer(), ==, 6)
-  iter++;
-
-  absFilter = *iter;
-  Filt0::Pointer f0_2 = std::dynamic_pointer_cast<Filt0>(absFilter);
-  DREAM3D_REQUIRED(f0_2->getFilt0_Float(), ==, 13.1f)
-  DREAM3D_REQUIRED(f0_2->getFilt0_Integer(), ==, 12)
-  iter++;
-
-  absFilter = *iter;
-  Filt1::Pointer f1_2 = std::dynamic_pointer_cast<Filt1>(absFilter);
-  DREAM3D_REQUIRED(f1_2->getFilt1_Float(), ==, 2.3f)
-  DREAM3D_REQUIRED(f1_2->getFilt1_Integer(), ==, 4)
-  iter++;
-
-  absFilter = *iter;
-  DataContainerWriter::Pointer w1 = std::dynamic_pointer_cast<DataContainerWriter>(absFilter);
-  DREAM3D_REQUIRED(w1->getNameOfClass(), ==, "DataContainerWriter")
-  iter++;
-
-  absFilter = *iter;
-  DataContainerReader::Pointer r1 = std::dynamic_pointer_cast<DataContainerReader>(absFilter);
-  DREAM3D_REQUIRED(r1->getNameOfClass(), ==, "DataContainerReader")
-  iter++;
-
-  absFilter = *iter;
-  Filt0::Pointer f0_3 = std::dynamic_pointer_cast<Filt0>(absFilter);
-  DREAM3D_REQUIRED(f0_3->getFilt0_Float(), ==, 14.1f)
-  DREAM3D_REQUIRED(f0_3->getFilt0_Integer(), ==, 13)
-  iter++;
-
-  absFilter = *iter;
-  Filt1::Pointer f1_3 = std::dynamic_pointer_cast<Filt1>(absFilter);
-  DREAM3D_REQUIRED(f1_3->getFilt1_Float(), ==, 3.3f)
-  DREAM3D_REQUIRED(f1_3->getFilt1_Integer(), ==, 5)
-  iter++;
-
-  absFilter = *iter;
-  DataContainerWriter::Pointer w2 = std::dynamic_pointer_cast<DataContainerWriter>(absFilter);
-  DREAM3D_REQUIRED(w2->getNameOfClass(), ==, "DataContainerWriter")
-  iter++;
-
-  absFilter = *iter;
-  DataContainerReader::Pointer r2 = std::dynamic_pointer_cast<DataContainerReader>(absFilter);
-  DREAM3D_REQUIRED(r2->getNameOfClass(), ==, "DataContainerReader")
-  iter++;
-
-  absFilter = *iter;
-  DataContainerWriter::Pointer w3 = std::dynamic_pointer_cast<DataContainerWriter>(absFilter);
-  DREAM3D_REQUIRED(w3->getNameOfClass(), ==, "DataContainerWriter")
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-
-  FilterFactory<Filt0>::Pointer Filt0Factory = FilterFactory<Filt0>::New();
-  FilterManager::Instance()->addFilterFactory("Filt0", Filt0Factory);
-
-  FilterFactory<Filt1>::Pointer Filt1Factory = FilterFactory<Filt1>::New();
-  FilterManager::Instance()->addFilterFactory("Filt1", Filt1Factory);
-
-  int err = EXIT_SUCCESS;
-
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-
-  DREAM3D_REGISTER_TEST(GenerateGenericExamplePipelineFiles())
-  DREAM3D_REGISTER_TEST(VerifyGenericExampleHDF5FilterParameters())
-  DREAM3D_REGISTER_TEST(VerifyGenericExampleQSettingsFilterParameters())
-
-  DREAM3D_REGISTER_TEST(GenerateThresholdExamplePipelineFiles())
-  DREAM3D_REGISTER_TEST(VerifyThresholdExampleHDF5FilterParameters())
-  DREAM3D_REGISTER_TEST(VerifyThresholdExampleQSettingsFilterParameters())
-
-  DREAM3D_REGISTER_TEST(GenerateArraySelectionExamplePipelineFiles())
-  DREAM3D_REGISTER_TEST(VerifyArraySelectionExampleHDF5FilterParameters())
-  DREAM3D_REGISTER_TEST(VerifyArraySelectionExampleQSettingsFilterParameters())
-
-#if REMOVE_TEST_FILES
-//  DREAM3D_REGISTER_TEST( RemoveTestFiles() )
-#endif
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/FindNeighborsTest.cpp b/Source/SIMPLib/Testing/Unused/FindNeighborsTest.cpp
deleted file mode 100644
index c296b77e1a..0000000000
--- a/Source/SIMPLib/Testing/Unused/FindNeighborsTest.cpp
+++ /dev/null
@@ -1,386 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
-#include <string>
-#include <vector>
-
-#include "MXA/Common/LogTime.h"
-#include "MXA/MXA.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "EbsdLib/EbsdConstants.h"
-#include "EbsdLib/EbsdLib.h"
-#include "EbsdLib/HKL/CtfConstants.h"
-#include "EbsdLib/TSL/AngConstants.h"
-
-#include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Common/QualityMetricFilter.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/GenericFilters/FindNeighbors.h"
-#include "SIMPLib/IOFilters/DataContainerReader.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-#include "SIMPLib/IOFilters/ReadH5Ebsd.h"
-#include "SIMPLib/IOFilters/VtkRectilinearGridWriter.h"
-#include "SIMPLib/ProcessingFilters/MinNeighbors.h"
-#include "SIMPLib/ProcessingFilters/MinSize.h"
-#include "SIMPLib/ReconstructionFilters/AlignSectionsFeature.h"
-#include "SIMPLib/ReconstructionFilters/EBSDSegmentGrains.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatisticsFilters/FindAvgOrientations.h"
-#include "SIMPLib/StatisticsFilters/FindMDF.h"
-#include "SIMPLib/StatisticsFilters/FindNeighborhoods.h"
-#include "SIMPLib/StatisticsFilters/FindODF.h"
-#include "SIMPLib/StatisticsFilters/FindShapes.h"
-#include "SIMPLib/StatisticsFilters/FindSizes.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-#define DREAM3D_BENCHMARKS 1
-
-#if DREAM3D_BENCHMARKS
-#define START_CLOCK()                                                                                                                                                                                  \
-  unsigned long long int millis;                                                                                                                                                                       \
-  millis = MXA::getMilliSeconds();
-#else
-#define START_CLOCK()                                                                                                                                                                                  \
-  unsigned long long int millis = 0;                                                                                                                                                                   \
-  millis = 0;
-#endif
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-  QFile::remove(UnitTest::FindNeighborTest::OutputFile);
-  QFile::remove(UnitTest::FindNeighborTest::VtkOutputFile);
-}
-
-void updateProgressAndMessage(const QString& msg, int prog)
-{
-  std::cout << prog << "% - " << msg << std::endl;
-}
-
-QString getH5EbsdFile()
-{
-  QString s = UnitTest::DataDir + MXADir::Separator + "AdjTi6246MicroTensile.h5ebsd";
-  return s;
-}
-
-int getZStartIndex()
-{
-  return 50;
-}
-int getZEndIndex()
-{
-  return 250;
-}
-DataArray<unsigned int>::Pointer getPhaseTypes()
-{
-  DataArray<unsigned int>::Pointer phaseTypes = DataArray<unsigned int>::CreateArray(2, SIMPL::EnsembleData::PhaseTypes);
-  phaseTypes->SetValue(0, SIMPL::PhaseType::UnknownPhaseType);
-  phaseTypes->SetValue(1, SIMPL::PhaseType::PrimaryPhase);
-  return phaseTypes;
-}
-
-std::vector<QualityMetricFilter::Pointer> getQualityMetricFilters()
-{
-  std::vector<QualityMetricFilter::Pointer> filters;
-  {
-    QualityMetricFilter::Pointer filter = QualityMetricFilter::New();
-    filter->setFeatureName(Ebsd::Ang::ImageQuality);
-    filter->setFeatureValue(450);
-    filter->setFeatureOperator(">");
-    filter->setFeaturePhaseNumber(1);
-    filters.push_back(filter);
-  }
-  {
-    QualityMetricFilter::Pointer filter = QualityMetricFilter::New();
-    filter->setFeatureName(Ebsd::Ang::ConfidenceIndex);
-    filter->setFeatureValue(0.1f);
-    filter->setFeatureOperator(">");
-    filter->setFeaturePhaseNumber(1);
-    filters.push_back(filter);
-  }
-  {
-    QualityMetricFilter::Pointer filter = QualityMetricFilter::New();
-    filter->setFeatureName(Ebsd::Ang::ImageQuality);
-    filter->setFeatureValue(350);
-    filter->setFeatureOperator(">");
-    filter->setFeaturePhaseNumber(2);
-    filters.push_back(filter);
-  }
-  {
-    QualityMetricFilter::Pointer filter = QualityMetricFilter::New();
-    filter->setFeatureName(Ebsd::Ang::ConfidenceIndex);
-    filter->setFeatureValue(0.025f);
-    filter->setFeatureOperator(">");
-    filter->setFeaturePhaseNumber(2);
-    filters.push_back(filter);
-  }
-
-  return filters;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void pipelineProgress(int value)
-{
-  std::cout << value << "%" << std::endl;
-}
-
-void pipelineProgressMessage(const QString& msg)
-{
-  std::cout << msg << std::endl;
-}
-
-void pipelineErrorMessage(const char* message)
-{
-  std::cout << "Error Message: " << message << std::endl;
-}
-
-void setErrorCondition(int err)
-{
-  std::cout << "Error Condition: " << err << std::endl;
-}
-
-void pipelineFinished()
-{
-  std::cout << "Pipeline Complete." << std::endl;
-}
-
-typedef std::vector<AbstractFilter::Pointer> FilterContainerType;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestFindNeighbors()
-{
-  float m_MisorientationTolerance = 5.0f;
-  int m_MinAllowedGrainSize = 10;
-  int m_MinNumNeighbors = 1;
-
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  typedef DataArray<unsigned int> XTalStructArrayType;
-  XTalStructArrayType::Pointer xtal = XTalStructArrayType::CreateArray(2, SIMPL::EnsembleData::CrystalStructures);
-  xtal->SetValue(0, Ebsd::CrystalStructure::UnknownCrystalStructure);
-  xtal->SetValue(1, Ebsd::CrystalStructure::Cubic);
-
-  QString m_OutputDirectory = MXADir::toNativeSeparators(UnitTest::FindNeighborTest::TestDir);
-  QDir dir(m_OutputDirectory);
-  dir.mkpath(".");
-
-  // updateProgressAndMessage(("Loading Slices"), 10);
-  ReadH5Ebsd::Pointer read_h5ebsd = ReadH5Ebsd::New();
-  read_h5ebsd->setH5EbsdFile(getH5EbsdFile());
-  read_h5ebsd->setRefFrameZDir(Ebsd::LowtoHigh);
-  read_h5ebsd->setZStartIndex(getZStartIndex());
-  read_h5ebsd->setZEndIndex(getZEndIndex());
-  read_h5ebsd->setPTypes(getPhaseTypes());
-  read_h5ebsd->setQualityMetricFilters(getQualityMetricFilters());
-  pipeline->pushBack(read_h5ebsd);
-
-  AlignSectionsFeature::Pointer align_sections = AlignSectionsFeature::New();
-  // align_sections->setCrystalStructures(xtal);
-  pipeline->pushBack(align_sections);
-
-  EBSDSegmentGrains::Pointer ebsdsegment_grains = EBSDSegmentGrains::New();
-  ebsdsegment_grains->setMisorientationTolerance(m_MisorientationTolerance);
-  pipeline->pushBack(ebsdsegment_grains);
-
-  MinSize::Pointer min_size = MinSize::New();
-  min_size->setMinAllowedGrainSize(m_MinAllowedGrainSize);
-  pipeline->pushBack(min_size);
-
-  MinNeighbors::Pointer min_neighbors = MinNeighbors::New();
-  min_neighbors->setMinNumNeighbors(m_MinNumNeighbors);
-  //  pipeline->pushBack(min_neighbors);
-
-  bool m_WriteVtkFile(true);
-  bool m_WriteBinaryVTKFiles(true);
-  bool m_WritePhaseId(true);
-  bool m_WriteIPFColor(true);
-  bool m_WriteGoodVoxels(true);
-
-  VtkRectilinearGridWriter::Pointer vtkWriter = VtkRectilinearGridWriter::New();
-  if(m_WriteVtkFile)
-  {
-    vtkWriter->setOutputFile(UnitTest::FindNeighborTest::VtkOutputFile);
-    vtkWriter->setWriteGrainIds(true);
-    vtkWriter->setWritePhaseIds(m_WritePhaseId);
-    vtkWriter->setWriteGoodVoxels(m_WriteGoodVoxels);
-    vtkWriter->setWriteIPFColors(m_WriteIPFColor);
-    vtkWriter->setWriteBinaryFile(m_WriteBinaryVTKFiles);
-    pipeline->pushBack(vtkWriter);
-  }
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FindNeighborTest::OutputFile);
-  pipeline->pushBack(writer);
-
-  std::cout << "********* RUNNING PREFLIGHT **********************" << std::endl;
-  int err = pipeline->preflightPipeline();
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-
-  std::cout << "********* RUNNING PIPELINE **********************" << std::endl;
-  pipeline->run();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-
-  DREAM3D_REQUIRE_EQUAL(false, pipeline->empty());
-
-  pipeline->clear();
-  DREAM3D_REQUIRE_EQUAL(0, pipeline->size());
-  DREAM3D_REQUIRE_EQUAL(true, pipeline->empty());
-
-  updateProgressAndMessage("FindNeighborsTest Complete", 100);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestDataContainerReader()
-{
-  int err = 0;
-
-  // Create a Vector to hold all the filters. Later on we will execute all the filters
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  DataContainerReader::Pointer h5Reader = DataContainerReader::New();
-  h5Reader->setInputFile(UnitTest::FindNeighborTest::OutputFile);
-  pipeline->pushBack(h5Reader);
-
-#if 0
-  IDataArray* iDataPtr = nullptr;
-  iDataPtr = m->getFeatureData(SIMPL::EnsembleData::CrystalStructures).get();
-  UInt32ArrayType* data = UInt32ArrayType::SafeObjectDownCast<IDataArray*, UInt32ArrayType*>(iDataPtr);
-  m_CrystalStructure = data->GetValue(index);
-#endif
-
-  FindSizes::Pointer find_sizes = FindSizes::New();
-  find_sizes->setDistributionType(SIMPL::DistributionType::LogNormal);
-  pipeline->pushBack(find_sizes);
-
-  FindShapes::Pointer find_shapes = FindShapes::New();
-  find_shapes->setDistributionType(SIMPL::DistributionType::Beta);
-  pipeline->pushBack(find_shapes);
-
-  FindNeighborhoods::Pointer find_neighborhoods = FindNeighborhoods::New();
-  find_neighborhoods->setDistributionType(SIMPL::DistributionType::LogNormal);
-  pipeline->pushBack(find_neighborhoods);
-
-  FindNeighbors::Pointer find_neighbors = FindNeighbors::New();
-  pipeline->pushBack(find_neighbors);
-
-  FindAvgOrientations::Pointer find_avgorients = FindAvgOrientations::New();
-  pipeline->pushBack(find_avgorients);
-
-  FindODF::Pointer find_odf = FindODF::New();
-  pipeline->pushBack(find_odf);
-
-  FindMDF::Pointer find_mdf = FindMDF::New();
-  pipeline->pushBack(find_mdf);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FindNeighborTest::StatsFile);
-  pipeline->pushBack(writer);
-
-  //  std::cout << "********* RUNNING PREFLIGHT **********************" << std::endl;
-  //  int err = pipeline->preflightPipeline();
-  //  DREAM3D_REQUIRE_EQUAL(err, 0);
-
-  std::cout << "********* RUNNING PIPELINE **********************" << std::endl;
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-  pipeline->run();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-}
-
-void OtherTest()
-{
-
-  int err = 0;
-
-  // Create a Vector to hold all the filters. Later on we will execute all the filter
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-
-  DataContainerReader::Pointer reader = DataContainerReader::New();
-  reader->setInputFile("C:\\Users\\mjackson\\Desktop\\FindNeighborTest_Rewrite.h5");
-  reader->setInputFile(UnitTest::FindNeighborTest::OutputFile);
-  reader->setVoxelDataContainer(m.get());
-  reader->setReadCellData(true);
-  reader->setReadFeatureData(true);
-  reader->setReadEnsembleData(true);
-
-  reader->execute();
-  err = reader->getErrorCondition();
-
-  IDataArray::Pointer iPtr = m->getEnsembleData(SIMPL::EnsembleData::CrystalStructures);
-  DREAM3D_REQUIRE_NE(nullptr, iPtr.get());
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::FindNeighborTest::OutputFile2);
-  writer->setVoxelDataContainer(m.get());
-  writer->execute();
-  err = writer->getErrorCondition();
-
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-#if !REMOVE_TEST_FILES
-//  DREAM3D_REGISTER_TEST( RemoveTestFiles() )
-#endif
-  DREAM3D_REGISTER_TEST(TestFindNeighbors())
-//  DREAM3D_REGISTER_TEST( TestDataContainerReader() )
-//  DREAM3D_REGISTER_TEST( OtherTest() )
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/GenericFilterTest.cpp b/Source/SIMPLib/Testing/Unused/GenericFilterTest.cpp
deleted file mode 100644
index 44cc37b0c6..0000000000
--- a/Source/SIMPLib/Testing/Unused/GenericFilterTest.cpp
+++ /dev/null
@@ -1,279 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-
-#include "EbsdLib/EbsdLib.h"
-#include "EbsdLib/HKL/CtfFields.h"
-#include "EbsdLib/TSL/AngFields.h"
-
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/TestFilters/GenericExample.h"
-#include "SIMPLib/TestFilters/MakeVolumeDataContainer.h"
-
-#include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
-#include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
-#include "SIMPLib/FilterParameters/QFilterParametersReader.h"
-#include "SIMPLib/FilterParameters/QFilterParametersWriter.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-namespace GenericFilterTest
-{
-QString TestDir()
-{
-  return UnitTest::TestTempDir + QString::fromLatin1("/GenericFilterTest");
-}
-
-QString TestTSLPipelineFile()
-{
-  return TestDir() + QString::fromLatin1("/ReadH5Ebsd_AngFileExample.ini");
-}
-
-QString TestHKLPipelineFile()
-{
-  return TestDir() + QString::fromLatin1("/ReadH5Ebsd_HklFileExample.ini");
-}
-
-QString DREAM3DFile()
-{
-  return TestDir() + QString::fromLatin1("/SmallIN100.dream3d");
-}
-
-//// ****************** This file is a reference file from the DREAM3D Data Directory
-/// ******************** DO NOT FREAKING DELETE IT!!!!!!!!!!
-QString SmallIN100File()
-{
-  return UnitTest::DataDir + QString::fromLatin1("/SmallIN100/SmallIN100.h5ebsd");
-}
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(GenericFilterTest::TestTSLPipelineFile());
-  QFile::remove(GenericFilterTest::TestHKLPipelineFile());
-  QFile::remove(GenericFilterTest::DREAM3DFile());
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestGenericFilter()
-{
-
-  Observer obs; // Npte that this variale will go out of scope at the end of this method. This is NOT the
-  // way to add Observers into the FilterPipeline Object normally. We are careful here about the scope of
-  // the variable.
-
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  pipeline->addMessageReceiver(&obs);
-
-  // Insert a filter that simply creates an empty volume data container
-  MakeVolumeDataContainer::Pointer f = MakeVolumeDataContainer::New();
-  pipeline->pushBack(f);
-
-  GenericExample::Pointer filter = GenericExample::New();
-  pipeline->pushBack(filter);
-
-  pipeline->preflightPipeline();
-  int err = pipeline->getErrorCondition();
-
-  DREAM3D_REQUIRED(err, >=, 0)
-
-  pipeline->execute();
-  err = pipeline->getErrorCondition();
-
-  DREAM3D_REQUIRE(err >= 0)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestTslReadH5Ebsd()
-{
-
-  Observer obs;
-  // Send progress messages from PipelineBuilder to this object for display
-  qRegisterMetaType<PipelineMessage>();
-
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  pipeline->addMessageReceiver(&obs);
-
-  ReadH5Ebsd::Pointer reader = ReadH5Ebsd::New();
-  AngFields angFields;
-  QVector<QString> vArrayNames = angFields.getFieldNames();
-
-  QSet<QString> arrays;
-  for(int i = 0; i < vArrayNames.size(); i++)
-  {
-    arrays.insert(vArrayNames[i]);
-  }
-
-  reader->setInputFile(GenericFilterTest::SmallIN100File());
-  reader->setSelectedArrayNames(arrays);
-  reader->setRefFrameZDir(SIMPL::RefFrameZDir::HightoLow);
-  reader->setZStartIndex(1);
-  reader->setZEndIndex(117);
-  reader->setUseTransformations(true);
-
-  pipeline->pushBack(reader); // Push the H5EbsdReader into the Pipeline
-
-  DataContainerWriter::Pointer dcWriter = DataContainerWriter::New();
-  dcWriter->setOutputFile(GenericFilterTest::DREAM3DFile());
-  pipeline->pushBack(dcWriter); // Push the DREAM3D writer into the Pipeline
-
-  // Now create a QSettings based writer to write the parameters to a .ini file
-  QFilterParametersWriter::Pointer qWriter = QFilterParametersWriter::New();
-  QString iniFile(GenericFilterTest::TestTSLPipelineFile());
-  QFileInfo fi(iniFile);
-  if(fi.exists() == true)
-  {
-    QFile(iniFile).remove();
-  }
-  qWriter->openFile(GenericFilterTest::TestTSLPipelineFile(), QSettings::IniFormat);
-  // Write the Filter Parameters to the file
-  int idx = reader->writeFilterParameters(qWriter.get(), 0);
-  dcWriter->writeFilterParameters(qWriter.get(), idx);
-  qWriter->closeFile();
-
-  // Now preflight and run the Pipeline
-  int err = pipeline->preflightPipeline();
-  if(err < 0)
-  {
-    std::cout << "Failed Preflight" << std::endl;
-  }
-  pipeline->run();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE(err >= 0);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestHklReadH5Ebsd()
-{
-
-  Observer obs;
-  // Send progress messages from PipelineBuilder to this object for display
-  qRegisterMetaType<PipelineMessage>();
-
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  pipeline->addMessageReceiver(&obs);
-
-  ReadH5Ebsd::Pointer reader = ReadH5Ebsd::New();
-  CtfFields ctfFields;
-  QVector<QString> vArrayNames = ctfFields.getFieldNames();
-
-  QSet<QString> arrays;
-  for(int i = 0; i < vArrayNames.size(); i++)
-  {
-    arrays.insert(vArrayNames[i]);
-  }
-
-  reader->setInputFile(GenericFilterTest::SmallIN100File());
-  reader->setSelectedArrayNames(arrays);
-  reader->setRefFrameZDir(SIMPL::RefFrameZDir::HightoLow);
-  reader->setZStartIndex(1);
-  reader->setZEndIndex(117);
-  reader->setUseTransformations(true);
-
-  pipeline->pushBack(reader); // Push the H5EbsdReader into the Pipeline
-
-  DataContainerWriter::Pointer dcWriter = DataContainerWriter::New();
-  dcWriter->setOutputFile(GenericFilterTest::DREAM3DFile());
-  pipeline->pushBack(dcWriter); // Push the DREAM3D writer into the Pipeline
-
-  // Now create a QSettings based writer to write the parameters to a .ini file
-  QFilterParametersWriter::Pointer qWriter = QFilterParametersWriter::New();
-  QString iniFile(GenericFilterTest::TestHKLPipelineFile());
-  QFileInfo fi(iniFile);
-  if(fi.exists() == true)
-  {
-    QFile(iniFile).remove();
-  }
-  qWriter->openFile(GenericFilterTest::TestHKLPipelineFile(), QSettings::IniFormat);
-  // Write the Filter Parameters to the file
-  int idx = reader->writeFilterParameters(qWriter.get(), 0);
-  dcWriter->writeFilterParameters(qWriter.get(), idx);
-  qWriter->closeFile();
-
-  // Now preflight and run the Pipeline
-  //  int err = pipeline->preflightPipeline();
-  //  if(err < 0)
-  //  {
-  //    std::cout << "Failed Preflight" << std::endl;
-  //  }
-  //  pipeline->run();
-  //  err = pipeline->getErrorCondition();
-  //  DREAM3D_REQUIRE(err >= 0);
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  QDir dir(GenericFilterTest::TestDir());
-  dir.mkpath(".");
-
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  DREAM3D_REGISTER_TEST(TestTslReadH5Ebsd())
-  DREAM3D_REGISTER_TEST(TestHklReadH5Ebsd())
-  DREAM3D_REGISTER_TEST(TestGenericFilter())
-
-#if REMOVE_TEST_FILES
-//   DREAM3D_REGISTER_TEST( RemoveTestFiles() )
-#endif
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/LambertArrayRWTest.cpp b/Source/SIMPLib/Testing/Unused/LambertArrayRWTest.cpp
deleted file mode 100644
index 52bf115027..0000000000
--- a/Source/SIMPLib/Testing/Unused/LambertArrayRWTest.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <vector>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "H5Support/H5Lite.h"
-#include "H5Support/QH5Utilities.h"
-
-#include "SIMPLib/Common/ModifiedLambertProjection.h"
-#include "SIMPLib/Common/ModifiedLambertProjectionArray.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::LambertRWTest::TestFile);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestLambertWrite()
-{
-  FloatArrayType::Pointer xyzCoords = FloatArrayType::CreateArray(0, "XYZ Coords");
-  int lambertDim = 22;
-  float sphereRadius = 1.0;
-  size_t gbcdDims[3] = {40, 20, 40};
-  // Allocate a typical GBCD Data Array
-  QVector<ModifiedLambertProjection::Pointer> lamberts(gbcdDims[0] * gbcdDims[1] * gbcdDims[2]);
-  qint32 count = lamberts.size();
-  for(qint32 i = 0; i < count; ++i)
-  {
-    lamberts[i] = ModifiedLambertProjection::CreateProjectionFromXYZCoords(xyzCoords.get(), lambertDim, sphereRadius);
-    lamberts[i]->getNorthSquare()->initializeWithZeros();
-    lamberts[i]->getSouthSquare()->initializeWithValues(1.0);
-  }
-
-  // Create something to hold all the GBCD Data
-  ModifiedLambertProjectionArray::Pointer gbcdData = ModifiedLambertProjectionArray::New();
-  gbcdData->setModifiedLambertProjectionArray(lamberts);
-
-  // Now open an HDF5 File for writing
-  hid_t fid = QH5Utilities::createFile(UnitTest::LambertRWTest::TestFile);
-  DREAM3D_REQUIRE(fid > 0)
-
-  int err = gbcdData->writeH5Data(fid);
-  DREAM3D_REQUIRE(err >= 0)
-
-  QH5Utilities::closeFile(fid);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestLambertRead()
-{
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-
-  int err = EXIT_SUCCESS;
-
-#if !REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  DREAM3D_REGISTER_TEST(TestLambertWrite())
-  DREAM3D_REGISTER_TEST(TestLambertRead())
-
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/ManagedPointerArrayTest.cpp b/Source/SIMPLib/Testing/Unused/ManagedPointerArrayTest.cpp
deleted file mode 100644
index dfee57977f..0000000000
--- a/Source/SIMPLib/Testing/Unused/ManagedPointerArrayTest.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "SIMPLib/DataArrays/ManagedArrayOfArrays.hpp"
-#include "SIMPLib/SIMPLib.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-#define NUM_ELEMENTS 10
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-template <typename T> void __TestManagedArray()
-{
-
-  typename ManagedArrayOfArrays<T>::Pointer mArray = ManagedArrayOfArrays<T>::CreateArray(NUM_ELEMENTS, "test");
-
-  // Allocate some memory for each array
-  for(size_t i = 0; i < NUM_ELEMENTS; ++i)
-  {
-    typename ManagedArrayOfArrays<T>::Data_t& ptr = *(mArray->getPointer(i));
-    // First make sure we have a properly initialized Data structure
-    DREAM3D_REQUIRE_EQUAL(ptr.count, 0)
-    DREAM3D_REQUIRE_EQUAL(ptr.data, nullptr)
-
-    ptr.count = i;
-    ptr.data = (T*)(malloc(sizeof(T) * ptr.count));
-  }
-
-  for(size_t i = 0; i < NUM_ELEMENTS; ++i)
-  {
-    typename ManagedArrayOfArrays<T>::Data_t& ptr = *(mArray->getPointer(i));
-    DREAM3D_REQUIRE_EQUAL(ptr.count, i)
-    DREAM3D_REQUIRE_NE(ptr.data, nullptr)
-  }
-
-  // Forcibly set this to nullptr so that if something goes wrong the debugger will catch it here.
-  mArray = ManagedArrayOfArrays<T>::NullPointer();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int TestManagedPointerArray()
-{
-  __TestManagedArray<uint8_t>();
-  __TestManagedArray<int8_t>();
-  __TestManagedArray<uint16_t>();
-  __TestManagedArray<int16_t>();
-  __TestManagedArray<uint32_t>();
-  __TestManagedArray<int32_t>();
-  __TestManagedArray<uint64_t>();
-  __TestManagedArray<int64_t>();
-  __TestManagedArray<float>();
-  __TestManagedArray<double>();
-  __TestManagedArray<bool>();
-
-  return EXIT_SUCCESS;
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  DREAM3D_REGISTER_TEST(TestManagedPointerArray())
-
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp b/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
deleted file mode 100644
index 474781964e..0000000000
--- a/Source/SIMPLib/Testing/Unused/NewDataContainerStructureTest.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QList>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-
-#include "EbsdLib/EbsdConstants.h"
-#include "SIMPLib/SIMPLib.h"
-
-// DREAM3D Lib
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/DataArrays/IDataArray.h"
-#include "SIMPLib/DataArrays/NeighborList.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-// DREAM3DLib Filters
-#include "SIMPLib/GenericFilters/FindBoundingBoxFeatures.h"
-#include "SIMPLib/GenericFilters/FindFeatureCentroids.h"
-#include "SIMPLib/GenericFilters/FindSurfaceFeatures.h"
-#include "SIMPLib/GenericFilters/GenerateIPFColors.h"
-#include "SIMPLib/IOFilters/DataContainerReader.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-#include "SIMPLib/IOFilters/ParaDisReader.h"
-#include "SIMPLib/IOFilters/VASPReader.h"
-
-#include "SIMPLib/SyntheticBuildingFilters/InitializeSyntheticVolume.h"
-#include "SIMPLib/SyntheticBuildingFilters/MatchCrystallography.h"
-#include "SIMPLib/SyntheticBuildingFilters/PackPrimaryPhases.h"
-
-// Sampling Plugin
-//#include "Sampling/SamplingFilters/ChangeResolution.h"
-//#include "Sampling/SamplingFilters/RegularGridSampleSurfaceMesh.h"
-
-// Statistics Plugin
-//#include "Statistics/StatisticsFilters/FindNeighbors.h"
-//#include "Statistics/StatisticsFilters/FindNeighbors.h"
-//#include "Statistics/StatisticsFilters/FindNumFeatures.h"
-//#include "Statistics/StatisticsFilters/FindSizes.h"
-//#include "Statistics/StatisticsFilters/FitCorrelatedFeatureData.h"
-//#include "Statistics/StatisticsFilters/FitFeatureData.h"
-
-// SurfaceMeshing Plugin
-//#include "SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.h"
-//#include "SurfaceMeshing/SurfaceMeshingFilters/QuickSurfaceMesh.h"
-
-#include "UnitTestSupport.hpp"
-
-#include "TestFileLocations.h"
-
-void BuildNewDream3dFile()
-{
-  DataContainerArray::Pointer dca = DataContainerArray::New();
-  VolumeDataContainer::Pointer vdc = VolumeDataContainer::New();
-  dca->pushBack(vdc);
-  QVector<size_t> tDims(3, 0);
-  tDims[0] = 128;
-  tDims[1] = 128;
-  tDims[2] = 128;
-  AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New(tDims, "CellData", SIMPL::AttributeMatrixType::Cell);
-  vdc->addAttributeMatrix(cellAttrMat);
-  QVector<size_t> dims(1, 1);
-  cellAttrMat->createAndAddAttributeArray<DataArray<int64_t>, int64_t>("Ids", 1, dims);
-
-  DataArray<int64_t>::WeakPointer m_FeatureIdsPtr;
-  int64_t* m_FeatureIds;
-  AbstractFilter::Pointer filt = AbstractFilter::New();
-  m_FeatureIdsPtr = cellAttrMat->getPrereqArray<DataArray<int64_t>, AbstractFilter>(filt.get(), "Ids", -300, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                             /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
-  {
-    m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
-  } /* Now assign the raw pointer to data from the DataArray<T> object */
-
-  for(int i = 0; i < (128 * 128 * 128); i++)
-  {
-    m_FeatureIds[i] = i;
-  }
-  AttributeMatrix::Pointer cellFeatureAttrMat = AttributeMatrix::New(tDims, "CellFeatureData", SIMPL::AttributeMatrixType::CellFeature);
-  vdc->addAttributeMatrix(cellFeatureAttrMat);
-  tDims.resize(1);
-  tDims[0] = 2;
-  AttributeMatrix::Pointer cellEnsembleAttrMat = AttributeMatrix::New(tDims, "CellEnsembleData", SIMPL::AttributeMatrixType::CellEnsemble);
-  vdc->addAttributeMatrix(cellEnsembleAttrMat);
-
-  cellEnsembleAttrMat->createAndAddAttributeArray<DataArray<unsigned int>, unsigned int>("PhaseTypes", SIMPL::PhaseType::PrimaryPhase, dims);
-  DataArray<unsigned int>::WeakPointer m_PhaseTypesPtr;
-  unsigned int* m_PhaseTypes;
-  m_PhaseTypesPtr =
-      cellEnsembleAttrMat->getPrereqArray<DataArray<unsigned int>, AbstractFilter>(filt.get(), "PhaseTypes", -300, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_PhaseTypesPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
-  {
-    m_PhaseTypes = m_PhaseTypesPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
-    m_PhaseTypes[0] = SIMPL::PhaseType::UnknownPhaseType;
-  }
-
-  cellEnsembleAttrMat->createAndAddAttributeArray<DataArray<unsigned int>, unsigned int>("ShapeTypes", SIMPL::ShapeType::EllipsoidShape, dims);
-  DataArray<unsigned int>::WeakPointer m_ShapeTypesPtr;
-  unsigned int* m_ShapeTypes;
-  m_ShapeTypesPtr =
-      cellEnsembleAttrMat->getPrereqArray<DataArray<unsigned int>, AbstractFilter>(filt.get(), "ShapeTypes", -300, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_ShapeTypesPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
-  {
-    m_ShapeTypes = m_ShapeTypesPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
-    m_ShapeTypes[0] = SIMPL::ShapeType::UnknownShapeType;
-  }
-
-  cellEnsembleAttrMat->createAndAddAttributeArray<DataArray<unsigned int>, unsigned int>("CrystalStructures", Ebsd::CrystalStructure::Cubic_High, dims);
-  DataArray<unsigned int>::WeakPointer m_CrystalStructuresPtr;
-  unsigned int* m_CrystalStructures;
-  m_CrystalStructuresPtr = cellEnsembleAttrMat->getPrereqArray<DataArray<unsigned int>, AbstractFilter>(filt.get(), "CrystalStructures", -300,
-                                                                                                        dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_CrystalStructuresPtr.lock())                                                                 /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
-  {
-    m_CrystalStructures = m_CrystalStructuresPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
-    m_CrystalStructures[0] = Ebsd::CrystalStructure::UnknownCrystalStructure;
-  }
-
-  StatsDataArray* m_StatsDataArray = StatsDataArray::SafeObjectDownCast<IDataArray*, StatsDataArray*>(cellEnsembleAttrMat->getAttributeArray(SIMPL::EnsembleData::Statistics).get());
-  if(m_StatsDataArray == nullptr)
-  {
-    StatsDataArray::Pointer p = StatsDataArray::New();
-    m_StatsDataArray = p.get();
-    m_StatsDataArray->fillArrayWithNewStatsData(cellEnsembleAttrMat->getNumberOfTuples(), m_PhaseTypes);
-    cellEnsembleAttrMat->insertOrAssign(p);
-  }
-
-  StatsDataArray& statsDataArray = *m_StatsDataArray;
-
-  PrimaryStatsData::Pointer pp = std::dynamic_pointer_cast<PrimaryStatsData>(statsDataArray[1]);
-  pp->setPhaseFraction(1);
-  VectorOfFloatArray sizedist = statsDataArray[1]->CreateCorrelatedDistributionArrays(SIMPL::DistributionType::LogNormal, 1);
-  sizedist[0]->setValue(0, 1);
-  sizedist[1]->setValue(0, 0.1);
-  pp->setFeatureSizeDistribution(sizedist);
-  float maxdiam = 4.48169;
-  float mindiam = 1.64872;
-  float binSize = 0.5;
-  int numbins = int(((maxdiam - mindiam) / binSize) + 1);
-  pp->setFeatureDiameterInfo(binSize, maxdiam, mindiam);
-  FloatArrayType::Pointer binnumbers = FloatArrayType::CreateArray(numbins, SIMPL::StringConstants::BinNumber);
-  DistributionAnalysisOps::determinebinnumbers(maxdiam, mindiam, binSize, binnumbers);
-  pp->setBinNumbers(binnumbers);
-  VectorOfFloatArray boveras = statsDataArray[1]->CreateCorrelatedDistributionArrays(SIMPL::DistributionType::Beta, numbins);
-  VectorOfFloatArray coveras = statsDataArray[1]->CreateCorrelatedDistributionArrays(SIMPL::DistributionType::Beta, numbins);
-  boveras[0]->setValue(0, 15.0425);
-  boveras[1]->setValue(0, 1.26719);
-  boveras[0]->setValue(1, 15.9438);
-  boveras[1]->setValue(1, 1.44586);
-  boveras[0]->setValue(2, 15.4206);
-  boveras[1]->setValue(2, 1.6027);
-  boveras[0]->setValue(3, 15.3367);
-  boveras[1]->setValue(3, 1.47998);
-  boveras[0]->setValue(4, 15.7276);
-  boveras[1]->setValue(4, 1.64522);
-  boveras[0]->setValue(5, 15.9084);
-  boveras[1]->setValue(5, 1.71922);
-  pp->setFeatureSize_BOverA(boveras);
-  coveras[0]->setValue(0, 15.0425);
-  coveras[1]->setValue(0, 1.26719);
-  coveras[0]->setValue(1, 15.9438);
-  coveras[1]->setValue(1, 1.44586);
-  coveras[0]->setValue(2, 15.4206);
-  coveras[1]->setValue(2, 1.6027);
-  coveras[0]->setValue(3, 15.3367);
-  coveras[1]->setValue(3, 1.47998);
-  coveras[0]->setValue(4, 15.7276);
-  coveras[1]->setValue(4, 1.64522);
-  coveras[0]->setValue(5, 15.9084);
-  coveras[1]->setValue(5, 1.71922);
-  pp->setFeatureSize_COverA(coveras);
-  VectorOfFloatArray omega3s = statsDataArray[1]->CreateCorrelatedDistributionArrays(SIMPL::DistributionType::Beta, numbins);
-  omega3s[0]->setValue(0, 15.0425);
-  omega3s[1]->setValue(0, 1.26719);
-  omega3s[0]->setValue(1, 15.9438);
-  omega3s[1]->setValue(1, 1.44586);
-  omega3s[0]->setValue(2, 15.4206);
-  omega3s[1]->setValue(2, 1.6027);
-  omega3s[0]->setValue(3, 15.3367);
-  omega3s[1]->setValue(3, 1.47998);
-  omega3s[0]->setValue(4, 15.7276);
-  omega3s[1]->setValue(4, 1.64522);
-  omega3s[0]->setValue(5, 15.9084);
-  omega3s[1]->setValue(5, 1.71922);
-  pp->setFeatureSize_Omegas(omega3s);
-  VectorOfFloatArray neighborhoods = statsDataArray[1]->CreateCorrelatedDistributionArrays(SIMPL::DistributionType::LogNormal, numbins);
-  neighborhoods[0]->setValue(0, 2.07944);
-  neighborhoods[1]->setValue(0, 0.4);
-  neighborhoods[0]->setValue(1, 2.30259);
-  neighborhoods[1]->setValue(1, 0.36666);
-  neighborhoods[0]->setValue(2, 2.48491);
-  neighborhoods[1]->setValue(2, 0.33333);
-  neighborhoods[0]->setValue(3, 2.63906);
-  neighborhoods[1]->setValue(3, 0.3);
-  neighborhoods[0]->setValue(4, 2.77259);
-  neighborhoods[1]->setValue(4, 0.26666);
-  neighborhoods[0]->setValue(5, 2.89037);
-  neighborhoods[1]->setValue(5, 0.23333);
-  pp->setFeatureSize_Neighbors(neighborhoods);
-  FloatArrayType::Pointer axisodf;
-  axisodf = FloatArrayType::CreateArray((36 * 36 * 36), SIMPL::StringConstants::AxisOrientation);
-  float val = 1.0 / (36.0 * 36.0 * 36.0);
-  for(int j = 0; j < (36 * 36 * 36); j++)
-  {
-    axisodf->setValue(j, val);
-  }
-  pp->setAxisOrientation(axisodf);
-
-  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SyntheticInputFile);
-  dcw->setWriteXdmfFile(false);
-  dcw->setDataContainerArray(dca);
-  dcw->setPreviousFilter(AbstractFilter::NullPointer());
-  dcw->execute();
-}
-
-void RunPipeline1()
-{
-  Observer obs;
-  // Send progress messages from PipelineBuilder to this object for display
-  qRegisterMetaType<PipelineMessage>();
-
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  pipeline->addMessageReceiver(&obs);
-
-  InitializeSyntheticVolume::Pointer isv = InitializeSyntheticVolume::New();
-  isv->setInputFile(UnitTest::NewDataContainerStructureTest::SyntheticInputFile);
-  isv->setXVoxels(128);
-  isv->setYVoxels(128);
-  isv->setZVoxels(128);
-  isv->setXRes(0.1);
-  isv->setYRes(0.1);
-  isv->setZRes(0.1);
-  QVector<uint> sTypes;
-  sTypes.push_back(SIMPL::ShapeType::UnknownShapeType);
-  sTypes.push_back(SIMPL::ShapeType::EllipsoidShape);
-  isv->setShapeTypes(sTypes);
-  pipeline->pushBack(isv);
-
-  PackPrimaryPhases::Pointer ppp = PackPrimaryPhases::New();
-  ppp->setPeriodicBoundaries(false);
-  ppp->setWriteGoalAttributes(false);
-  pipeline->pushBack(ppp);
-
-  FindNeighbors::Pointer fn = FindNeighbors::New();
-  //  pipeline->pushBack(fn);
-
-  FindNumFeatures::Pointer fnf = FindNumFeatures::New();
-  //  pipeline->pushBack(fnf);
-
-  MatchCrystallography::Pointer mc = MatchCrystallography::New();
-  mc->setMaxIterations(100000);
-  //  pipeline->pushBack(mc);
-
-  GenerateIPFColors::Pointer gipfc = GenerateIPFColors::New();
-  //  pipeline->pushBack(gipfc);
-
-  //  ChangeResolution::Pointer cr = ChangeResolution::New();
-  //  FloatVec3_t res = {0.2, 0.2, 0.2};
-  //  cr->setResolution(res);
-  //  pipeline->pushBack(cr);
-
-  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile);
-  dcw->setWriteXdmfFile(true);
-  pipeline->pushBack(dcw);
-
-  int err = pipeline->preflightPipeline();
-  if(err < 0)
-  {
-    std::cout << "Failed Preflight" << std::endl;
-  }
-  pipeline->run();
-}
-
-// void RunPipeline2()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  DataContainerReader::Pointer dcr = DataContainerReader::New();
-//  dcr->setInputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile);
-//  dcr->setReadVertexData(false);
-//  dcr->setReadEdgeData(false);
-//  dcr->setReadSurfaceData(false);
-//  dcr->setReadVolumeData(true);
-//  dcr->setReadAllVertexArrays(true);
-//  dcr->setReadAllCellArrays(true);
-//  dcr->setReadAllCellFeatureArrays(true);
-//  dcr->setReadAllCellEnsembleArrays(true);
-//  pipeline->pushBack(dcr);
-//
-//  QuickSurfaceMesh::Pointer qsm = QuickSurfaceMesh::New();
-//  pipeline->pushBack(qsm);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile2);
-//  dcw->setWriteVolumeData(true);
-//  dcw->setWriteSurfaceData(true);
-//  dcw->setWriteEdgeData(false);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline3()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  DataContainerReader::Pointer dcr = DataContainerReader::New();
-//  dcr->setInputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile2);
-//  dcr->setReadVertexData(false);
-//  dcr->setReadEdgeData(false);
-//  dcr->setReadSurfaceData(true);
-//  dcr->setReadAllVertexArrays(true);
-//  dcr->setReadAllFaceArrays(true);
-//  dcr->setReadVolumeData(true);
-//  dcr->setReadAllCellArrays(true);
-//  dcr->setReadAllCellFeatureArrays(true);
-//  dcr->setReadAllCellEnsembleArrays(true);
-//  pipeline->pushBack(dcr);
-//
-//  LaplacianSmoothing::Pointer ls = LaplacianSmoothing::New();
-//  ls->setIterationSteps(50);
-//  ls->setLambda(0.25);
-//  ls->setTripleLineLambda(0.2);
-//  ls->setQuadPointLambda(0.15);
-//  ls->setSurfacePointLambda(0.0);
-//  ls->setSurfaceTripleLineLambda(0.0);
-//  ls->setSurfaceQuadPointLambda(0.0);
-//  pipeline->pushBack(ls);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile3);
-//  dcw->setWriteVolumeData(true);
-//  dcw->setWriteSurfaceData(true);
-//  dcw->setWriteEdgeData(false);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline4()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  VASPReader::Pointer vr = VASPReader::New();
-//  vr->setInputFile(UnitTest::NewDataContainerStructureTest::VASPInputFile);
-//  pipeline->pushBack(vr);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::VASPOutputFile);
-//  dcw->setWriteVolumeData(false);
-//  dcw->setWriteSurfaceData(false);
-//  dcw->setWriteEdgeData(false);
-//  dcw->setWriteVertexData(true);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline5()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  ParaDisReader::Pointer pr = ParaDisReader::New();
-//  pr->setInputFile(UnitTest::NewDataContainerStructureTest::ParaDisInputFile);
-//  pipeline->pushBack(pr);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::ParaDisOutputFile);
-//  dcw->setWriteVolumeData(false);
-//  dcw->setWriteSurfaceData(false);
-//  dcw->setWriteEdgeData(true);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline6()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  DataContainerReader::Pointer dcr = DataContainerReader::New();
-//  dcr->setInputFile(UnitTest::NewDataContainerStructureTest::ParaDisInputFile2);
-//  dcr->setReadVertexData(false);
-//  dcr->setReadEdgeData(true);
-//  dcr->setReadSurfaceData(false);
-//  dcr->setReadVolumeData(false);
-//  dcr->setReadAllVertexArrays(true);
-//  dcr->setReadAllEdgeArrays(true);
-//  pipeline->pushBack(dcr);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::ParaDisOutputFile2);
-//  dcw->setWriteVolumeData(false);
-//  dcw->setWriteSurfaceData(false);
-//  dcw->setWriteEdgeData(true);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline7()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  DataContainerReader::Pointer dcr = DataContainerReader::New();
-//  dcr->setInputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile3);
-//  dcr->setReadVertexData(false);
-//  dcr->setReadEdgeData(false);
-//  dcr->setReadSurfaceData(true);
-//  dcr->setReadAllVertexArrays(true);
-//  dcr->setReadAllFaceArrays(true);
-//  dcr->setReadVolumeData(false);
-//  dcr->setReadAllCellArrays(false);
-//  dcr->setReadAllCellFeatureArrays(false);
-//  dcr->setReadAllCellEnsembleArrays(false);
-//  pipeline->pushBack(dcr);
-//
-//  RegularGridSampleSurfaceMesh::Pointer rgssm = RegularGridSampleSurfaceMesh::New();
-//  rgssm->setXPoints(256);
-//  rgssm->setYPoints(256);
-//  rgssm->setZPoints(256);
-//  FloatVec3_t res = {0.05,0.05,0.05};
-//  rgssm->setResolution(res);
-//  pipeline->pushBack(rgssm);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SyntheticOutputFile4);
-//  dcw->setWriteVolumeData(true);
-//  dcw->setWriteSurfaceData(true);
-//  dcw->setWriteEdgeData(false);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//}
-//
-// void RunPipeline8()
-//{
-//  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-//
-//  DataContainerReader::Pointer dcr = DataContainerReader::New();
-//  dcr->setInputFile(UnitTest::NewDataContainerStructureTest::SmallIN100InputFile);
-//  dcr->setReadVertexData(false);
-//  dcr->setReadEdgeData(false);
-//  dcr->setReadSurfaceData(false);
-//  dcr->setReadVolumeData(true);
-//  dcr->setReadAllCellArrays(true);
-//  dcr->setReadAllCellFeatureArrays(true);
-//  dcr->setReadAllCellEnsembleArrays(true);
-//  pipeline->pushBack(dcr);
-//
-//  FindSurfaceFeatures::Pointer fsg = FindSurfaceFeatures::New();
-//  pipeline->pushBack(fsg);
-//
-//  FindFeatureCentroids::Pointer fgc = FindFeatureCentroids::New();
-//  pipeline->pushBack(fgc);
-//
-//  FindBoundingBoxFeatures::Pointer fbbg = FindBoundingBoxFeatures::New();
-//  pipeline->pushBack(fbbg);
-//
-//  FindSizes::Pointer fs = FindSizes::New();
-//  pipeline->pushBack(fs);
-//
-//  FindNeighbors::Pointer fn = FindNeighbors::New();
-//  pipeline->pushBack(fn);
-//
-//  FitCorrelatedFeatureData::Pointer fcfd = FitCorrelatedFeatureData::New();
-//  fcfd->setSelectedFeatureArrayName(SIMPL::FeatureData::NumNeighbors);
-//  fcfd->setCorrelatedFeatureArrayName(SIMPL::FeatureData::EquivalentDiameters);
-//  fcfd->setDistributionType(SIMPL::DistributionType::LogNormal);
-//  fcfd->setNumberOfCorrelatedBins(10);
-//  fcfd->setRemoveBiasedFeatures(true);
-//  pipeline->pushBack(fcfd);
-//
-//  DataContainerWriter::Pointer dcw = DataContainerWriter::New();
-//  dcw->setOutputFile(UnitTest::NewDataContainerStructureTest::SmallIN100OutputFile);
-//  dcw->setWriteVolumeData(true);
-//  dcw->setWriteSurfaceData(false);
-//  dcw->setWriteEdgeData(false);
-//  dcw->setWriteVertexData(false);
-//  dcw->setWriteXdmfFile(true);
-//  pipeline->pushBack(dcw);
-//
-//  int err = pipeline->preflightPipeline();
-//  if(err < 0)
-//  {
-//    std::cout << "Failed Preflight" << std::endl;
-//  }
-//  pipeline->run();
-//
-//  err = pipeline->getErrorCondition();
-//  if(err < 0)
-//  {
-//    std::cout << "Pipeline Execute Failed" << std::endl;
-//  }
-//  DREAM3D_REQUIRE(err >= 0)
-//
-//}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  //  BuildNewDream3dFile();
-  RunPipeline1();
-  //  RunPipeline2();
-  //  RunPipeline3();
-  //  RunPipeline4();
-  //  RunPipeline5();
-  //  RunPipeline6();
-  //  RunPipeline7();
-  //  RunPipeline8();
-
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/PFTest.cpp b/Source/SIMPLib/Testing/Unused/PFTest.cpp
deleted file mode 100644
index e58f4d9cf5..0000000000
--- a/Source/SIMPLib/Testing/Unused/PFTest.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <QtCore/QDir>
-#include <QtCore/QVector>
-
-#include <QtGui/QImage>
-#include <QtWidgets/QApplication>
-
-#include "EbsdLib/EbsdConstants.h"
-#include "EbsdLib/EbsdLib.h"
-
-#include "SIMPLib/Common/StatsGen.hpp"
-#include "SIMPLib/Common/Texture.hpp"
-#include "SIMPLib/SIMPLib.h"
-
-#define PFTEST_NO_QOBJECT 1
-
-#include "SVWidgetsLib/QtSupport/PoleFigureImageUtilities.h"
-
-#include "TestFileLocations.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void poleFigureGenerationComplete()
-{
-  //  std::cout << "ODF Pole Figure generation complete" << std::endl;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-unsigned int makePoleFigures(QVector<float> e1s, QVector<float> e2s, QVector<float> e3s, QVector<float> weights, QVector<float> sigmas, QString prefix)
-{
-
-  return EXIT_SUCCESS;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int main(int argc, char* argv[])
-{
-
-  QApplication app(argc, argv);
-
-  QDir d(QString::fromStdString(UnitTest::PFTest::TestDir));
-  d.mkdir(QString::fromStdString(UnitTest::PFTest::TestDir));
-
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/QFilterParameterIOTest.cpp b/Source/SIMPLib/Testing/Unused/QFilterParameterIOTest.cpp
deleted file mode 100644
index 40fb18086f..0000000000
--- a/Source/SIMPLib/Testing/Unused/QFilterParameterIOTest.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QSet>
-#include <QtCore/QSettings>
-#include <QtCore/QString>
-#include <QtCore/QtDebug>
-
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/FilterParameters/QFilterParametersReader.h"
-#include "SIMPLib/FilterParameters/QFilterParametersWriter.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/IOFilters/DataContainerReader.h"
-#include "SIMPLib/IOFilters/ReadH5Ebsd.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/SIMPLibVersion.h"
-
-#include "SIMPLib/IOFilters/EbsdToH5Ebsd.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::QFilterParameterIOTest::TestFile);
-#endif
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void writePipeline(FilterPipeline::Pointer pipeline)
-{
-
-  QFilterParametersWriter::Pointer writer = QFilterParametersWriter::New();
-  writer->openFile(UnitTest::QFilterParameterIOTest::TestFile, QSettings::IniFormat);
-  writer->setNumberOfFilters(pipeline->getFilterContainer().size());
-  QVariant filterCount = pipeline->getFilterContainer().size();
-  int count = pipeline->getFilterContainer().size();
-  QSettings* prefs = writer->getPrefs();
-  prefs->beginGroup(SIMPL::Settings::PipelineBuilderGroup);
-  prefs->setValue(SIMPL::Settings::NumFilters, filterCount);
-  prefs->setValue(SIMPL::Settings::Version, SIMPLib::Version::Complete());
-  prefs->endGroup();
-
-  for(int i = 0; i < count; ++i)
-  {
-    AbstractFilter::Pointer filter = pipeline->getFilterContainer().at(i);
-    filter->writeFilterParameters(writer.get(), i);
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestWriteQSettingsBasedFile()
-{
-  DataContainerReader::Pointer dcr = DataContainerReader::New();
-  dcr->setInputFile("foobar.dream3d");
-  dcr->setReadVertexData(false);
-  dcr->setReadEdgeData(false);
-  dcr->setReadSurfaceData(false);
-  dcr->setReadAllVertexArrays(false);
-  dcr->setReadAllFaceArrays(false);
-  dcr->setReadVolumeData(true);
-  dcr->setReadAllCellArrays(true);
-  dcr->setReadAllCellFeatureArrays(true);
-  dcr->setReadAllCellEnsembleArrays(true);
-
-  QSet<QString> cellArrays;
-  cellArrays << SIMPL::CellData::FeatureIds;
-  QSet<QString> featureArrays;
-  featureArrays << SIMPL::FeatureData::Centroids;
-  QSet<QString> ensembleArrays;
-  ensembleArrays << SIMPL::EnsembleData::CrystalStructures;
-  QSet<QString> blank;
-  dcr->setVolumeSelectedArrayNames(blank, blank, blank, cellArrays, featureArrays, ensembleArrays);
-
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  pipeline->pushBack(dcr);
-  writePipeline(pipeline);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void readPipeline(QFilterParametersReader::Pointer paramsReader, FilterPipeline::Pointer pipeline)
-{
-  FilterManager::Pointer filtManager = FilterManager::Instance();
-  QSettings* prefs = paramsReader->getPrefs();
-  prefs->beginGroup(SIMPL::Settings::PipelineBuilderGroup);
-  bool ok = false;
-  int filterCount = prefs->value(SIMPL::Settings::NumFilters).toInt(&ok);
-  prefs->endGroup();
-  if(false == ok)
-  {
-    filterCount = 0;
-  }
-
-  for(int i = 0; i < filterCount; ++i)
-  {
-    QString gName = QString::number(i);
-
-    // Open the group to get the name of the filter then close again.
-    prefs->beginGroup(gName);
-    QString filterName = prefs->value(SIMPL::Settings::FilterName, "").toString();
-    prefs->endGroup();
-    //  qDebug() << filterName;
-
-    IFilterFactory::Pointer factory = filtManager->getFactoryFromClassName(filterName);
-    DREAM3D_REQUIRE(nullptr != factory) // We should know about all the filters
-    AbstractFilter::Pointer filter = factory->create();
-
-    if(nullptr != filter.get())
-    {
-      filter->readFilterParameters(paramsReader.get(), i);
-      pipeline->pushBack(filter);
-    }
-  }
-  writePipeline(pipeline);
-}
-
-QString m_FilePrefix("Small_IN100_");
-QString m_FileSuffix("");
-QString m_FileExt("ang");
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QVector<QString> generateFileList(int start, int end, bool& hasMissingFiles, bool stackLowToHigh)
-{
-  int index = 0;
-  QVector<QString> fileList;
-
-  for(int i = 0; i < (end - start) + 1; ++i)
-  {
-    if(stackLowToHigh)
-    {
-      index = start + i;
-    }
-    else
-    {
-      index = end - i;
-    }
-    QString filename = QString("%1%2%3.%4").arg("Small_IN100_").arg(i).arg("").arg("ang");
-    QString filePath = UnitTest::QFilterParameterIOTest::SmallIN100Folder + QDir::separator() + filename;
-    filePath = QDir::toNativeSeparators(filePath);
-    fileList.push_back(filePath);
-  }
-  return fileList;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void importSmallIN100()
-{
-  Observer obs;
-
-  EbsdToH5Ebsd::Pointer filter = EbsdToH5Ebsd::New();
-  filter->setOutputFile(UnitTest::QFilterParameterIOTest::SmallIn100_H5EBSD_FILE);
-  filter->setZStartIndex(1);
-  filter->setZEndIndex(118);
-  filter->setZResolution(0.25);
-  filter->setSampleTransformationAngle(180.0);
-  filter->addObserver(&obs);
-  QVector<float> transAxis(3, 0.0f);
-  transAxis[0] = 0.0f;
-  transAxis[1] = 1.0f;
-  transAxis[2] = 0.0f;
-  filter->setSampleTransformationAxis(transAxis);
-
-  filter->setEulerTransformationAngle(90.0);
-  transAxis[0] = 0.0f;
-  transAxis[1] = 0.0f;
-  transAxis[2] = 1.0f;
-  filter->setEulerTransformationAxis(transAxis);
-
-  filter->setRefFrameZDir(Ebsd::HightoLow);
-
-  int start = filter->getZStartIndex();
-  int end = filter->getZEndIndex();
-  bool hasMissingFiles = false;
-
-  // Now generate all the file names in the "Low to High" order because that is what the importer is expecting
-  QVector<QString> fileList = generateFileList(start, end, hasMissingFiles, true);
-  QVector<QString> realFileList;
-  for(QVector<QString>::size_type i = 0; i < fileList.size(); ++i)
-  {
-    QString filePath = (fileList[i]);
-    QFileInfo fi(filePath);
-    if(fi.exists())
-    {
-      realFileList.push_back(fileList[i]);
-    }
-  }
-
-  filter->setEbsdFileList(realFileList);
-
-  // Run the preflight
-  filter->preflight();
-  if(filter->getErrorCondition() < 0)
-  {
-    QVector<PipelineMessage> msgs = filter->getPipelineMessages();
-    for(qint32 i = 0; i < msgs.size(); ++i)
-    {
-      qDebug() << msgs[i].generateErrorString();
-    }
-    return;
-  }
-
-  // Run the Filter to import the data
-  filter->execute();
-
-  if(filter->getErrorCondition() < 0)
-  {
-    QVector<PipelineMessage> msgs = filter->getPipelineMessages();
-    for(qint32 i = 0; i < msgs.size(); ++i)
-    {
-      qDebug() << msgs[i].generateErrorString();
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestReadQSettingsBasedFile()
-{
-  int err = 0;
-
-  FilterManager::Pointer filtManager = FilterManager::Instance();
-  // THIS IS A VERY IMPORTANT LINE: It will register all the known filters in the dream3d library. This
-  // will NOT however get filters from plugins. We are going to have to figure out how to compile filters
-  // into their own plugin and load the plugins from a command line.
-  filtManager->RegisterKnownFilters(filtManager.get());
-#if 0
-  qDebug() << "Current Path: " << QDir::currentPath();
-  // Read in the first Pipeline that converts the Small IN100 files to an .h5ebsd file
-  // importSmallIN100();
-  QDir cwd = QDir::current();
-  cwd.cdUp();
-  cwd.cd("Bin");
-  qDebug() << "Changing working directory to " << cwd.absolutePath();
-  QDir::setCurrent(cwd.absolutePath());
-#endif
-
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  QFilterParametersReader::Pointer paramsReader = QFilterParametersReader::New();
-  paramsReader->openFile(UnitTest::QFilterParameterIOTest::Prebuilt17, QSettings::IniFormat);
-  readPipeline(paramsReader, pipeline);
-
-  AbstractFilter::Pointer filter = pipeline->getFilterContainer().at(0);
-  ReadH5Ebsd::Pointer readH5Ebsd = std::dynamic_pointer_cast<ReadH5Ebsd>(filter);
-  DREAM3D_REQUIRE(readH5Ebsd != nullptr);
-  readH5Ebsd->setInputFile(UnitTest::QFilterParameterIOTest::SmallIn100_H5EBSD_FILE);
-
-  err = pipeline->preflightPipeline();
-  DREAM3D_REQUIRE(err >= 0)
-
-  pipeline->execute();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE(err >= 0)
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char* argv[])
-{
-  int err = EXIT_SUCCESS;
-
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-
-  DREAM3D_REGISTER_TEST(TestWriteQSettingsBasedFile())
-
-//  DREAM3D_REGISTER_TEST( TestReadQSettingsBasedFile() )
-
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  PRINT_TEST_SUMMARY();
-
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/RNGTest.cpp b/Source/SIMPLib/Testing/Unused/RNGTest.cpp
deleted file mode 100644
index 536d3c5653..0000000000
--- a/Source/SIMPLib/Testing/Unused/RNGTest.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <iostream>
-#include <stdlib.h>
-
-#include "SIMPLib/Math/SIMPLibRandom.h"
-
-int main(int argc, char** argv)
-{
-  std::cout << "RNGTest Start..." << std::endl;
-  SIMPL_RANDOMNG_NEW()
-  float random;
-  for(int i = 0; i < 1000000; ++i)
-  {
-    random = static_cast<float>(rg.genrand_res53());
-    if(random > 0.95)
-    {
-      std::cout << "Here" << std::endl;
-    }
-  }
-
-  std::cout << "RNGTest Ending" << std::endl;
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/ReplaceText.cpp b/Source/SIMPLib/Testing/Unused/ReplaceText.cpp
deleted file mode 100644
index 295e41d938..0000000000
--- a/Source/SIMPLib/Testing/Unused/ReplaceText.cpp
+++ /dev/null
@@ -1,495 +0,0 @@
-
-
-#include <iostream>
-
-#include <QtCore/QFile>
-
-#include <QtCore/QDir>
-#include <QtCore/QDirIterator>
-#include <QtCore/QFileInfo>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QtDebug>
-
-#include "TestFileLocations.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void buildInitializerList(QString hFile, QString cppFile)
-{
-
-  // Read the header file
-  QFile h(hFile);
-  h.open(QFile::ReadOnly);
-  QString header = h.readAll();
-  h.close();
-
-  QStringList list;
-  QStringList initializerList;
-
-  list = header.split(QRegExp("\\n"));
-
-  QStringListIterator lines(list);
-  while(lines.hasNext())
-  {
-
-    QString line = lines.next();
-    // std::cout << line.toStdString() << std::endl;
-    if(line.contains(QString("SIMPL_INSTANCE_STRING_PROPERTY")))
-    {
-      QStringList chunks = line.split(QRegExp("\\("));
-      chunks = chunks.at(1).split(QRegExp("\\)"));
-      QString s = QString("m_") + chunks.at(0);
-      s = s.trimmed();
-      initializerList << s;
-    }
-
-    if(line.contains(QString("SIMPL_INSTANCE_PROPERTY")))
-    {
-      QStringList chunks = line.split(QRegExp(", "));
-      chunks = chunks.at(1).split(QRegExp("\\)"));
-      QString s = QString("m_") + chunks.at(0);
-      s = s.trimmed();
-      initializerList << s;
-    }
-
-    if(line.contains(QString("DEFINE_DATAARRAY_VARIABLE")))
-    {
-      QStringList chunks = line.split(QRegExp(", "));
-      chunks = chunks.at(1).split(QRegExp("\\)"));
-      QString s = QString("m_") + chunks.at(0) + QString("ArrayName");
-      initializerList << s;
-      s = QString("m_") + chunks.at(0) + "(nullptr)";
-      s = s.trimmed();
-      initializerList << s;
-    }
-  }
-  //  lines = QStringListIterator(initializerList);
-  //  while (lines.hasNext())
-  //  {
-  //    std::cout << lines.next().toStdString() << std::endl;
-  //  }
-
-  // now read the source file
-  QFile source(cppFile);
-  source.open(QFile::ReadOnly);
-  QString cpp = source.readAll();
-  source.close();
-
-  QFileInfo fi(hFile);
-  QFile outSource(cppFile);
-  outSource.open(QFile::WriteOnly);
-  QTextStream stream(&outSource);
-
-  QString constructor = fi.baseName() + "::" + fi.baseName();
-  QStringList existinInitializerList;
-
-  list = cpp.split(QRegExp("\\n"));
-  QStringListIterator sourceLines(list);
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    stream << line << "\n";
-    if(line.contains(constructor) == true)
-    {
-      // We are in the constructor
-      line = sourceLines.next(); // Should be the super class
-      stream << line << "\n";
-      line = sourceLines.next(); // Should be the first instance variable of class
-      bool stop = false;
-      while(stop == false)
-      {
-        QStringList chunks = line.split(',');
-        existinInitializerList << chunks.at(0).trimmed();
-        if(chunks.size() == 1)
-        {
-          stop = true;
-        }
-        else
-        {
-          line = sourceLines.next();
-        }
-      }
-      break;
-    }
-  }
-
-  //  lines = QStringListIterator(existinInitializerList);
-  //  while (lines.hasNext())
-  //  {
-  //    std::cout << lines.next().toStdString() << std::endl;
-  //  }
-
-  QStringList newList;
-
-  lines = QStringListIterator(initializerList);
-  while(lines.hasNext())
-  {
-    QString line = lines.next();
-    QStringList result;
-    result = existinInitializerList.filter(line + "(");
-
-    if(result.size() == 1)
-    {
-      newList << result.at(0);
-    }
-    else
-    {
-
-      if(line.contains("nullptr") == false)
-      {
-        newList << line + QString("");
-      }
-      else
-      {
-        newList << QString(line);
-      }
-    }
-  }
-  //  std::cout << "----------------" << std::endl;
-
-  QString outS;
-  QTextStream ss(&outS);
-
-  lines = QStringListIterator(newList);
-  while(lines.hasNext())
-  {
-    ss << "  " << lines.next();
-    if(lines.hasNext() == true)
-    {
-      ss << ",\n";
-    }
-    else
-    {
-      ss << "\n";
-    }
-  }
-
-  stream << outS;
-
-  // Finish writing the source file back out
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    stream << line << "\n";
-  }
-
-  outSource.close();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void replaceText1(QString hFile, QString cppFile)
-{
-  QFile h(hFile);
-  h.open(QFile::ReadOnly);
-  QString header = h.readAll();
-  h.close();
-
-  QFile source(cppFile);
-  source.open(QFile::ReadOnly);
-  QString cpp = source.readAll();
-
-  QStringList varNames;
-  QStringList typeNames;
-
-  bool doReplace = false;
-
-  QString searchStr("size_t totalFeatures = m->getAttributeMatrix(getCellFeatureAttributeMatrixName())->getNumberOfTuples();");
-  int index = cpp.indexOf(searchStr);
-  int hIndex = -1;
-  if(index > 0)
-  {
-    hIndex = header.indexOf("SIMPL_INSTANCE_STRING_PROPERTY(CellFeatureAttributeMatrixName)");
-    if(hIndex < 0) // This class does not have a Feature Attribute Matrix Name
-    {
-      cpp.replace(searchStr, "size_t totalFeatures = 0;");
-      doReplace = true;
-    }
-  }
-
-  searchStr = QString("size_t totalEnsembles = m->getAttributeMatrix(getCellEnsembleAttributeMatrixName())->getNumberOfTuples();");
-  index = cpp.indexOf(searchStr);
-  hIndex = -1;
-  if(index > 0)
-  {
-    hIndex = header.indexOf("SIMPL_INSTANCE_STRING_PROPERTY(CellEnsembleAttributeMatrixName)");
-    if(hIndex < 0) // This class does not have a Ensemble Attribute Matrix Name
-    {
-      cpp.replace(searchStr, "size_t totalEnsembles = 0;");
-      doReplace = true;
-    }
-  }
-
-  //// WRITE THE HEADER BACK OUT TO A FILE
-  if(doReplace == true)
-  {
-    QFileInfo fi(cppFile);
-#if 0
-    QFile hOut("/tmp/junk/" + fi.fileName());
-#else
-    QFile hOut(cppFile);
-#endif
-    hOut.open(QFile::WriteOnly);
-    QTextStream stream(&hOut);
-    stream << cpp;
-    hOut.close();
-
-    qDebug() << "Saved File " << cppFile;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void replaceText(QString hFile, QString cppFile)
-{
-  QFile h(hFile);
-  h.open(QFile::ReadOnly);
-  QString header = h.readAll();
-  h.close();
-
-  QFile source(cppFile);
-  source.open(QFile::ReadOnly);
-  QString cpp = source.readAll();
-
-  QStringList varNames;
-  QStringList typeNames;
-
-  int index = cpp.indexOf("cellAttrMat->getPrereqArray<");
-  int endIdx = 0;
-  bool doReplace = false;
-  while(index > 0)
-  {
-    endIdx = cpp.indexOf(";", index);
-    QString sub = cpp.mid(index, endIdx - index);
-    sub = sub.section(',', 2, 2);
-    sub = sub.trimmed();
-    QString _type = cpp.mid(index, endIdx - index);
-    endIdx = sub.indexOf("AttributeMatrixName");
-    sub = sub.mid(2, endIdx - 2);
-    varNames << sub;
-    doReplace = true;
-    index = cpp.indexOf("cellAttrMat->getPrereqArray<", index + 1);
-    // break;
-  }
-
-  if(doReplace == false)
-  {
-    return;
-  }
-  doReplace = false;
-  // Now open the header file and read that.
-  for(int i = 0; i < varNames.size(); ++i)
-  {
-    QString s("SIMPL_INSTANCE_STRING_PROPERTY(" + varNames.at(i) + "AttributeMatrixName)");
-    index = header.indexOf(s, 0);
-    if(index < 0) // Not found
-    {
-
-      QString dc("SIMPL_INSTANCE_STRING_PROPERTY(SurfaceDataContainerName)\n");
-      int idx = header.indexOf(dc, 0);
-      if(idx > 0)
-      {
-        header.replace(dc, dc + "    " + s + "\n");
-        doReplace = true;
-      }
-    }
-  }
-
-  //// WRITE THE HEADER BACK OUT TO A FILE
-  if(doReplace == true)
-  {
-    QFileInfo fi(hFile);
-#if 0
-    QFile hOut("/tmp/junk/" + fi.fileName());
-#else
-    QFile hOut(hFile);
-#endif
-    hOut.open(QFile::WriteOnly);
-    QTextStream stream(&hOut);
-    stream << header;
-    hOut.close();
-
-    qDebug() << "Saved File " << hFile;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void fixDataCheck(QString hFile, QString cppFile)
-{
-  // Read the Source File
-  QFileInfo fi(cppFile);
-  QFile source(cppFile);
-  source.open(QFile::ReadOnly);
-  QString cpp = source.readAll();
-  source.close();
-
-  QStringList list;
-  QStringList initializerList;
-
-  list = cpp.split(QRegExp("\\n"));
-
-  QString dataCheck = QString("void ") + fi.baseName() + QString("::dataCheck(");
-  QString preflight = QString("void ") + fi.baseName() + QString("::preflight()");
-
-  bool needCellAttrGet = false;
-  bool needCellAttrCreate = false;
-  bool hasCellGet = false;
-  bool hasCellCreate = false;
-  bool alreadyHasDecl = false;
-
-  QStringListIterator sourceLines(list);
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    if(line.contains(dataCheck))
-    {
-      // We are in the constructor
-      bool stop = false;
-      while(stop == false)
-      {
-        line = sourceLines.next();
-        if(line.contains("cellEnsembleAttrMat->get"))
-        {
-          hasCellGet = true;
-        }
-        if(line.contains("cellEnsembleAttrMat->create"))
-        {
-          hasCellCreate = true;
-        }
-        if(line.contains("AttributeMatrix* cellEnsembleAttrMat ="))
-        {
-          alreadyHasDecl = true;
-        }
-
-        if(line.contains(preflight))
-        {
-          stop = true;
-        }
-        if(sourceLines.hasNext() == false)
-        {
-          stop = true;
-        }
-      }
-      break;
-    }
-  }
-  if(hasCellGet == true && alreadyHasDecl == false)
-  {
-    needCellAttrGet = true;
-  }
-  else if(hasCellCreate == true && alreadyHasDecl == false)
-  {
-    needCellAttrCreate = true;
-  }
-
-  if(!needCellAttrGet && !needCellAttrCreate)
-  {
-    return;
-  }
-
-  qDebug("Updating %s", qPrintable(cppFile));
-
-#if 0
-  QFile fout("/tmp/out.cpp");
-#else
-  QFile fout(cppFile);
-#endif
-  fout.open(QFile::WriteOnly);
-  QTextStream out(&fout);
-
-  sourceLines = QStringListIterator(list);
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    if(line.contains(dataCheck))
-    {
-      out << line << "\n";
-      // We are in the constructor
-      bool stop = false;
-      while(stop == false)
-      {
-        line = sourceLines.next();
-        if(line.contains("VolumeDataContainer* m = getDataContainerArray()"))
-        {
-          out << line << "\n";
-          line = sourceLines.next();
-          out << line << "\n";
-          if(needCellAttrGet)
-          {
-            out << "  AttributeMatrix::Pointer cellEnsembleAttrMat = m->(this, getCellEnsembleAttributeMatrixName(), -301);\n";
-            out << "  if(getErrorCondition() < 0) { return; }\n";
-          }
-          if(needCellAttrCreate)
-          {
-            out << "  AttributeMatrix::Pointer cellEnsembleAttrMat = m->createNonPrereqAttributeMatrix(this, getCellEnsembleAttributeMatrixName(), "
-                   "SIMPL::AttributeMatrixType::CellEnsemble);\n";
-            out << "  if(getErrorCondition() < 0) { return; }\n";
-          }
-
-          stop = true;
-        }
-        else
-        {
-          out << line << "\n";
-        }
-        if(line.contains(preflight))
-        {
-          out << line << "\n";
-          stop = true;
-        }
-      }
-    }
-    else
-    {
-      if(sourceLines.hasNext())
-      {
-        out << line << "\n";
-      }
-    }
-  }
-
-  fout.close();
-}
-
-void scanDirIter(QDir dir)
-{
-  QDirIterator iterator(dir.absolutePath(), QDirIterator::Subdirectories);
-  while(iterator.hasNext())
-  {
-    iterator.next();
-    if(!iterator.fileInfo().isDir())
-    {
-      QString filename = iterator.fileName();
-      if(filename.endsWith(".cpp"))
-      {
-        // qDebug("Found %s matching pattern.", qPrintable(filename));
-        QFileInfo fi(iterator.filePath());
-        QString header = fi.path() + "/" + fi.baseName() + ".h";
-        QString source = iterator.filePath();
-        fixDataCheck(header, source);
-      }
-    }
-  }
-}
-
-int main(int argc, char* argv[])
-{
-  Q_ASSERT(false); // We don't want anyone to run this program.
-
-  //#if 0
-  //  QString header = argv[1];
-  //  QString source = argv[2];
-  //  buildInitializerList(header, source);
-  //#else
-  //  scanDirIter(UnitTest::DREAM3DProjDir + QString("/Source/DREAM3DLib"));
-  //  scanDirIter(UnitTest::DREAM3DProjDir + QString("/Source/Plugins"));
-  //#endif
-
-  return 0;
-}
diff --git a/Source/SIMPLib/Testing/Unused/ResFixer.cpp b/Source/SIMPLib/Testing/Unused/ResFixer.cpp
deleted file mode 100644
index 5808584bfa..0000000000
--- a/Source/SIMPLib/Testing/Unused/ResFixer.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <algorithm>
-#include <fstream>
-#include <iostream>
-#include <sstream>
-
-#include <tclap/CmdLine.h>
-#include <tclap/ValueArg.h>
-
-#include <QtCore/QDir>
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-
-#include "EbsdLib/TSL/AngReader.h"
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/SIMPLibVersion.h"
-
-#define kBufferSize 1024
-
-#if _MSC_VER
-#define snprintf _snprintf
-#endif
-
-class AngResFixer
-{
-public:
-  AngResFixer();
-  virtual ~AngResFixer()
-  {
-  }
-
-  virtual int fixFile();
-  QString headerWord(QByteArray buf);
-  int fixHeaderValues(QString in, QVector<QString>& headerLines);
-
-  /** @brief Sets the file name of the ebsd file to be read */
-  SIMPL_INSTANCE_STRING_PROPERTY(FileName)
-  SIMPL_INSTANCE_STRING_PROPERTY(OutputFileName)
-  SIMPL_INSTANCE_PROPERTY(float, XStepFix)
-  SIMPL_INSTANCE_PROPERTY(float, YStepFix)
-private:
-  AngResFixer(const AngResFixer&);    // Copy Constructor Not Implemented
-  void operator=(const AngResFixer&); // Operator '=' Not Implemented
-};
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-AngResFixer::AngResFixer()
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int AngResFixer::fixHeaderValues(QString str, QVector<QString>& headerLines)
-{
-  QTextStream in(&str);
-  int err = 0;
-  QString buf = in.readLine();
-  while(!in.atEnd())
-  {
-
-    QStringList tokens = buf.split(' ');
-    QString word(tokens[1]);
-
-    if(word.size() > 0 && word.startsWith(Ebsd::Ang::XStep) == 0)
-    {
-      QString fix = QString("# XSTEP: %1\r\n").arg(m_XStepFix);
-      headerLines.push_back(fix);
-    }
-    else if(word.size() > 0 && word.startsWith(Ebsd::Ang::YStep) == 0)
-    {
-      QString fix = QString("# YSTEP: %1\r\n").arg(m_YStepFix);
-      headerLines.push_back(fix);
-    }
-
-    buf = in.readLine();
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int AngResFixer::fixFile()
-{
-
-  int err = 0;
-
-  AngReader reader;
-  reader.setFileName(m_FileName);
-  err |= reader.readFile();
-  if(err != 0)
-  {
-    return err;
-  }
-
-  QVector<QString> headerLines;
-  QString in(reader.getOriginalHeader());
-  err = fixHeaderValues(in, headerLines);
-
-  FILE* out = fopen(m_OutputFileName.toLatin1().data(), "wb");
-
-  // Write out the header
-  for(QVector<QString>::iterator hline = headerLines.begin(); hline != headerLines.end(); ++hline)
-  {
-    fprintf(out, "%s", (*hline).toLatin1().data());
-  }
-
-  float* p1 = reader.getPhi1Pointer();
-  float* p = reader.getPhiPointer();
-  float* p2 = reader.getPhi2Pointer();
-  float* x = reader.getXPositionPointer();
-  float* y = reader.getYPositionPointer();
-  float* iqual = reader.getImageQualityPointer();
-  float* conf = reader.getConfidenceIndexPointer();
-  int* ph = reader.getPhaseDataPointer();
-  float* semSignal = reader.getSEMSignalPointer();
-  float* fit = reader.getFitPointer();
-
-  size_t count = reader.getNumberOfElements();
-  // float xstep_old = reader.getXStep();
-  // float ystep_old = reader.getYStep();
-  float xFactor = m_XStepFix / reader.getXStep();
-  float yFactor = m_YStepFix / reader.getYStep();
-
-  for(size_t i = 0; i < count; ++i)
-  {
-    fprintf(out, "  %.5f  %.5f  %.5f  %.5f  %.5f  %.1f  %0.3f %d  %d  %.3f\n", p1[i], p[i], p2[i], x[i] * xFactor, y[i] * yFactor, iqual[i], conf[i], ph[i], (int)(semSignal[i]), fit[i]);
-  }
-
-  fclose(out);
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  std::cout << "Starting Resolution Fixer" << std::endl;
-
-  try
-  {
-    // Handle program options passed on command line.
-    TCLAP::CmdLine cmd("ResFixer", ' ', SIMPLib::Version::Complete().toStdString());
-
-    TCLAP::ValueArg<float> xres("x", "xres", "New X Resolution", true, 0.0f, "New X Resolution");
-    cmd.add(xres);
-
-    TCLAP::ValueArg<float> yres("y", "yres", "New Y Resolution", true, 0.0f, "New Y Resolution");
-    cmd.add(yres);
-
-    TCLAP::ValueArg<std::string> inputDir("i", "inputdir", "Input Directory", true, "", "Input Directory");
-    cmd.add(inputDir);
-
-    TCLAP::ValueArg<std::string> outputDir("o", "outputdir", "Output Directory", true, "", "Output Directory");
-    cmd.add(outputDir);
-
-    // Parse the argv array.
-    cmd.parse(argc, argv);
-    if(argc == 1)
-    {
-      std::cout << "ResFixer program was not provided any arguments. Use the --help argument to show the help listing." << std::endl;
-      return EXIT_FAILURE;
-    }
-
-    std::cout << "InputDir:" << std::endl;
-    std::cout << "   " << inputDir.getValue() << std::endl;
-    std::cout << "OutputDir:" << std::endl;
-    std::cout << "   " << outputDir.getValue() << std::endl;
-    std::cout << "New X Step: " << xres.getValue() << std::endl;
-    std::cout << "New Y Step: " << yres.getValue() << std::endl;
-
-    QDir dir(QString::fromStdString(outputDir.getValue()));
-    if(dir.exists() == false)
-    {
-      dir.mkpath(".");
-    }
-
-    QDir inputD(QString::fromStdString(inputDir.getValue()));
-    QStringList entryList = inputD.entryList();
-    foreach(QString file, entryList)
-    {
-      QFileInfo fi(file);
-      if(fi.suffix().compare("ang") == 0)
-      {
-        std::cout << "Fixing file " << file.toStdString() << std::endl;
-        AngResFixer fixer;
-        fixer.setFileName(QString::fromStdString(inputDir.getValue()) + "/" + fi.fileName());
-        fixer.setXStepFix(xres.getValue());
-        fixer.setYStepFix(yres.getValue());
-        QString outFile = QString::fromStdString(outputDir.getValue()) + "/" + fi.fileName();
-        fixer.setOutputFileName(outFile);
-        fixer.fixFile();
-        std::cout << "   + Complete" << std::endl;
-      }
-    }
-
-  } catch(TCLAP::ArgException& e) // catch any exceptions
-  {
-    std::cerr << " error: " << e.error() << " for arg " << e.argId() << std::endl;
-    return EXIT_FAILURE;
-  }
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/StatsDataTest.cpp b/Source/SIMPLib/Testing/Unused/StatsDataTest.cpp
deleted file mode 100644
index 304617a09f..0000000000
--- a/Source/SIMPLib/Testing/Unused/StatsDataTest.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <iostream>
-#include <limits>
-#include <limits>
-#include <string>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "H5Support/H5Utilities.h"
-
-#include "SIMPLib/Common/StatsGen.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/DataArrays/StatsDataArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
-#include "SIMPLib/IOFilters/DataContainerReader.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-#include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/StatsData.h"
-
-#include "UnitTestSupport.hpp"
-
-#include "TestFileLocations.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-  QFile::remove(UnitTest::StatsDataTest::TestFile);
-  QFile::remove(UnitTest::StatsDataTest::TestFile2);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeOmega3(StatsData::Pointer statsData, int count, uint32_t distType = SIMPL::DistributionType::Beta)
-{
-  float alpha, beta;
-  SIMPL_RANDOMNG_NEW()
-  VectorOfFloatArray data;
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Beta);
-
-  for(int32_t i = 0; i < count; ++i)
-  {
-    alpha = (0 * i) + 10.0 + rg.genrand_res53();
-    beta = (0 * i) + 1.5 + (0.5 * rg.genrand_res53());
-    alphas->SetValue(i, alpha);
-    betas->SetValue(i, beta);
-  }
-  data.push_back(alphas);
-  data.push_back(betas);
-  statsData->setGrainSize_Omegas(data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeBOverA(StatsData::Pointer statsData, int count, uint32_t distType = SIMPL::DistributionType::Beta)
-{
-  float alpha, beta;
-  SIMPL_RANDOMNG_NEW()
-  VectorOfFloatArray data;
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Beta);
-
-  for(int32_t i = 0; i < count; ++i)
-  {
-    alpha = (0 * i) + 15.0 + rg.genrand_res53();
-    beta = (0 * i) + 1.25 + (0.5 * rg.genrand_res53());
-    alphas->SetValue(i, alpha);
-    betas->SetValue(i, beta);
-  }
-  data.push_back(alphas);
-  data.push_back(betas);
-  statsData->setGrainSize_BOverA(data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeCOverA(StatsData::Pointer statsData, int count, uint32_t distType = SIMPL::DistributionType::Beta)
-{
-  float alpha, beta;
-  SIMPL_RANDOMNG_NEW()
-  VectorOfFloatArray data;
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Beta);
-
-  for(int32_t i = 0; i < count; ++i)
-  {
-    alpha = (0 * i) + 14.0 + rg.genrand_res53();
-    beta = (0 * i) + 1.15 + (0.5 * rg.genrand_res53());
-    alphas->SetValue(i, alpha);
-    betas->SetValue(i, beta);
-  }
-  data.push_back(alphas);
-  data.push_back(betas);
-  statsData->setGrainSize_COverA(data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeNeighbors(StatsData::Pointer statsData, std::vector<float> binNumbers, uint32_t distType = SIMPL::DistributionType::Power)
-{
-  float alpha, k, beta;
-  int32_t count = binNumbers.size();
-
-  SIMPL_RANDOMNG_NEW()
-  VectorOfFloatArray data;
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Beta);
-  FloatArrayType::Pointer ks = FloatArrayType::CreateArray(count, SIMPL::StringConstants::Exp_k);
-
-  int middlebin = count / 2;
-
-  for(int32_t i = 0; i < count; ++i)
-  {
-    alpha = (4 * (binNumbers[i] / binNumbers[middlebin])) + rg.genrand_res53();
-    k = 2 + (0.2 * (binNumbers[i] / binNumbers[middlebin])) + (0.05 * rg.genrand_res53());
-    beta = (0 * i) + 1;
-    alphas->SetValue(i, alpha);
-    ks->SetValue(i, k);
-    betas->SetValue(i, beta);
-  }
-  data.push_back(alphas);
-  data.push_back(ks);
-  data.push_back(betas);
-  statsData->setGrainSize_Neighbors(data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeODF_MDF(StatsData::Pointer statsData)
-{
-  std::vector<float> e1s;
-  std::vector<float> e2s;
-  std::vector<float> e3s;
-  std::vector<float> weights;
-  std::vector<float> sigmas;
-  std::vector<float> odf;
-  std::vector<float> mdf;
-  std::vector<float> angles;
-  std::vector<float> axes;
-
-  Texture::calculateCubicODFData(e1s, e2s, e3s, weights, sigmas, true, odf);
-
-  // Stupid, but copy the data from the vector to the DataArray<float> instance
-  FloatArrayType::Pointer odfData = FloatArrayType::CreateArray(odf.size(), SIMPL::StringConstants::ODF);
-  for(size_t i = 0; i < odf.size(); ++i)
-  {
-    odfData->SetValue(i, odf[i]);
-  }
-
-  // Push it onto the StatsData instance
-  statsData->setODF(odfData);
-
-  {
-    FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler1);
-    euler1->SetValue(0, 10.0f);
-    FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler2);
-    euler2->SetValue(0, 10.0f);
-    FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler3);
-    euler3->SetValue(0, 10.0f);
-    FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Sigma);
-    sigma->SetValue(0, 0.99f);
-    FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
-    weight->SetValue(0, 2.0f);
-
-    VectorOfFloatArray odfWeights;
-    odfWeights.push_back(euler1);
-    odfWeights.push_back(euler2);
-    odfWeights.push_back(euler3);
-    odfWeights.push_back(sigma);
-    odfWeights.push_back(weight);
-    statsData->setODF_Weights(odfWeights);
-    statsData->setAxisODF_Weights(odfWeights);
-  }
-  // unsigned long long int nElements = 18 * 18 * 18;
-  Texture::calculateMDFData<std::vector<float>, CubicOps>(angles, axes, weights, odf, mdf);
-
-  // Stupid, but copy the data from the vector to the DataArray<float> instance
-  FloatArrayType::Pointer mdfData = FloatArrayType::CreateArray(mdf.size(), SIMPL::StringConstants::MisorientationBins);
-  for(size_t i = 0; i < mdf.size(); ++i)
-  {
-    mdfData->SetValue(i, mdf[i]);
-  }
-  {
-    FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Angle);
-    angles->SetValue(0, 45.0f);
-    FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, SIMPL::StringConstants::Axis);
-    axis->SetNumberOfComponents(3);
-    axis->SetComponent(0, 0, 1.0f);
-    axis->SetComponent(0, 1, 2.0f);
-    axis->SetComponent(0, 2, 3.0f);
-    FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
-    weight->SetValue(0, 2.1254f);
-    VectorOfFloatArray mdfWeights;
-    mdfWeights.push_back(angles);
-    mdfWeights.push_back(axis);
-    mdfWeights.push_back(weight);
-    statsData->setMDF_Weights(mdfWeights);
-  }
-
-  // Push it onto the StatsData instance
-  statsData->setMisorientationBins(mdfData);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void initializeAxisODF(StatsData::Pointer statsData)
-{
-  std::vector<float> e1s;
-  std::vector<float> e2s;
-  std::vector<float> e3s;
-  std::vector<float> weights;
-  std::vector<float> sigmas;
-  std::vector<float> aodf;
-
-  Texture::calculateOrthoRhombicODFData(e1s, e2s, e3s, weights, sigmas, true, aodf);
-
-  // Stupid, but copy the data from the vector to the DataArray<float> instance
-  FloatArrayType::Pointer aodfData = FloatArrayType::CreateArray(aodf.size(), SIMPL::StringConstants::AxisOrientation);
-  for(size_t i = 0; i < aodf.size(); ++i)
-  {
-    aodfData->SetValue(i, aodf[i]);
-  }
-
-  // Push it onto the StatsData instance
-  statsData->setAxisOrientation(aodfData);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int computeBinsAndCutOffs(float mu, float sigma, float minCutOff, float maxCutOff, float binStepSize, std::vector<float>& binsizes, std::vector<float>& xCo, std::vector<float>& yCo, float& xMax,
-                          float& yMax, std::vector<float>& x, std::vector<float>& y)
-{
-  int err = 0;
-  int size = 250;
-
-  StatsGen sg;
-  err = sg.GenLogNormalPlotData<std::vector<float>>(mu, sigma, x, y, size);
-  if(err == 1)
-  {
-    // TODO: Present Error Message
-    return -1;
-  }
-
-  //  float xMax = std::numeric_limits<float >::min();
-  //  float yMax = std::numeric_limits<float >::min();
-  for(int i = 0; i < size; ++i)
-  {
-    //   std::cout << x[i] << "  " << y[i] << std::endl;
-    if(x[i] > xMax)
-    {
-      xMax = x[i];
-    }
-    if(y[i] > yMax)
-    {
-      yMax = y[i];
-    }
-  }
-
-  xCo.clear();
-  yCo.clear();
-  int numsizebins = 1;
-  binsizes.clear();
-  // std::vector<int> numgrains;
-  err = sg.GenCutOff<float, std::vector<float>>(mu, sigma, minCutOff, maxCutOff, binStepSize, xCo, yCo, yMax, numsizebins, binsizes);
-
-  return 0;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-StatsDataArray::Pointer createStatsDataArray()
-{
-
-  StatsDataArray::Pointer statsArray = StatsDataArray::New();
-  StatsData::Pointer s0;           // Create a nullptr instance of StatsData;
-  statsArray->setStatsData(0, s0); // The underlying storage will resize as needed.
-
-  float m_PhaseFraction = 0.25;
-  float m_TotalPhaseFraction = 1.0f;
-
-  int err = 0;
-  float mu = 1.0f;
-  float sigma = 0.1f;
-  float minCutOff = 5.0f;
-  float maxCutOff = 5.0f;
-  float binStep = 0.5f;
-
-  // Set the first phase
-  float calcPhaseFraction = m_PhaseFraction / m_TotalPhaseFraction;
-
-  std::vector<float> xCo;
-  std::vector<float> yCo;
-  std::vector<float> binsizes;
-  float xMax = std::numeric_limits<float>::min();
-  float yMax = std::numeric_limits<float>::min();
-  std::vector<float> x;
-  std::vector<float> y;
-  err = computeBinsAndCutOffs(mu, sigma, minCutOff, maxCutOff, binStep, binsizes, xCo, yCo, xMax, yMax, x, y);
-  DREAM3D_REQUIRE(err >= 0)
-
-  // We need to compute the Max and Min Diameter Bin Values
-  float mindiameter = xCo[0];
-  float maxdiameter = xCo[1];
-  //  float avglogdiam = mu;
-  //  float sdlogdiam = sigma;
-
-  size_t nBins = binsizes.size();
-  // Copy this into the DataArray<float>
-  FloatArrayType::Pointer binNumbers = FloatArrayType::CreateArray(nBins, SIMPL::StringConstants::BinNumber);
-  ::memcpy(binNumbers->getVoidPointer(0), &(binsizes.front()), binsizes.size() * sizeof(float));
-
-  // Phase 1
-  StatsData::Pointer data1 = StatsData::New();
-  data1->setPhaseFraction(calcPhaseFraction);
-  data1->setGrainDiameterInfo(binStep, maxdiameter, mindiameter);
-  //  data1->setGrainSizeDistribution(avglogdiam, sdlogdiam);
-  data1->setBinNumbers(binNumbers);
-  initializeOmega3(data1, nBins);
-  initializeBOverA(data1, nBins);
-  initializeCOverA(data1, nBins);
-  initializeNeighbors(data1, binsizes);
-  initializeODF_MDF(data1);
-  initializeAxisODF(data1);
-  statsArray->setStatsData(1, data1);
-
-  // Phase 2
-  StatsData::Pointer data2 = StatsData::New();
-  calcPhaseFraction = 0.75f;
-  data2->setPhaseFraction(calcPhaseFraction);
-  data2->setGrainDiameterInfo(binStep, maxdiameter, mindiameter);
-  //  data2->setGrainSizeDistribution(avglogdiam, sdlogdiam);
-  data2->setBinNumbers(binNumbers);
-  initializeOmega3(data2, nBins);
-  initializeBOverA(data2, nBins);
-  initializeCOverA(data2, nBins);
-  initializeNeighbors(data2, binsizes);
-  initializeODF_MDF(data2);
-  initializeAxisODF(data2);
-  statsArray->setStatsData(2, data2);
-
-  return statsArray;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestStatsData()
-{
-  StatsDataArray::Pointer statsArray = createStatsDataArray();
-  DREAM3D_REQUIRE_EQUAL(3, statsArray->GetNumberOfTuples());
-
-  StatsData::Pointer s0 = statsArray->getStatsData(0);
-
-  StatsData::Pointer s1 = statsArray->getStatsData(1);
-  StatsData::Pointer s2 = statsArray->getStatsData(2);
-
-  std::vector<size_t> idx(1, 1);
-  statsArray->EraseTuples(idx);
-  DREAM3D_REQUIRE_EQUAL(2, statsArray->GetNumberOfTuples());
-  idx[0] = 0;
-  statsArray->EraseTuples(idx);
-  DREAM3D_REQUIRE_EQUAL(1, statsArray->GetNumberOfTuples());
-
-  statsArray->clearAll();
-  DREAM3D_REQUIRE_EQUAL(0, statsArray->GetNumberOfTuples());
-
-  statsArray->setStatsData(0, s0);
-  statsArray->setStatsData(1, s1);
-  statsArray->setStatsData(2, s2);
-  DREAM3D_REQUIRE_EQUAL(3, statsArray->GetNumberOfTuples());
-
-  StatsDataArray& arrayRef = *statsArray;
-  StatsData::Pointer t0 = arrayRef[0];
-  DREAM3D_REQUIRE_EQUAL(nullptr, t0.get());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestWriteData()
-{
-  // Make sure the output directory is created
-  QDir dir(UnitTest::StatsDataTest::TestDir);
-  dir.mkpath(".");
-
-  // Create some test data for a 2 phase material
-  StatsDataArray::Pointer statsArray = createStatsDataArray();
-
-  // Create a data container and set the StatsArray
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-  m->addEnsembleData(SIMPL::EnsembleData::Statistics, statsArray);
-
-  DataArray<unsigned int>::Pointer crystalStructures = DataArray<unsigned int>::CreateArray(3, SIMPL::EnsembleData::CrystalStructures);
-  crystalStructures->SetValue(0, Ebsd::CrystalStructure::UnknownCrystalStructure);
-  crystalStructures->SetValue(1, Ebsd::CrystalStructure::Cubic);
-  crystalStructures->SetValue(2, Ebsd::CrystalStructure::Cubic);
-  m->addEnsembleData(SIMPL::EnsembleData::CrystalStructures, crystalStructures);
-
-  DataArray<unsigned int>::Pointer phaseTypes = DataArray<unsigned int>::CreateArray(3, SIMPL::EnsembleData::PhaseTypes);
-  phaseTypes->SetValue(0, SIMPL::PhaseType::UnknownPhaseType);
-  phaseTypes->SetValue(1, SIMPL::PhaseType::PrimaryPhase);
-  phaseTypes->SetValue(2, SIMPL::PhaseType::PrimaryPhase);
-  m->addEnsembleData(SIMPL::EnsembleData::PhaseTypes, phaseTypes);
-
-  DataArray<unsigned int>::Pointer shapeTypes = DataArray<unsigned int>::CreateArray(3, SIMPL::EnsembleData::ShapeTypes);
-  shapeTypes->SetValue(0, SIMPL::ShapeType::UnknownShapeType);
-  shapeTypes->SetValue(1, SIMPL::ShapeType::EllipsoidShape);
-  shapeTypes->SetValue(2, SIMPL::ShapeType::EllipsoidShape);
-  m->addEnsembleData(SIMPL::EnsembleData::ShapeTypes, shapeTypes);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  // H5StatsDataWriter::Pointer writer = H5StatsDataWriter::New();
-  writer->setVoxelDataContainer(m.get());
-  writer->setOutputFile(UnitTest::StatsDataTest::TestFile);
-  writer->execute();
-  DREAM3D_REQUIRE(writer->getErrorCondition() >= 0)
-
-  // This is an example of getting the StatsDataArray back from the DataContiner
-  // and being able to do something meaningful with it.
-  // Since StatsDataArray subclasses the IDataArray there are some simple things you
-  // can do like ask how many StatsData instances are being stored:
-  int numStatsData = m->getEnsembleData(SIMPL::EnsembleData::Statistics)->GetSize(); // This works because the
-  // size of each Tuple is 1
-  numStatsData = m->getEnsembleData(SIMPL::EnsembleData::Statistics)->GetNumberOfTuples();
-  // This also works. Either way the value at this point should be '3'
-  DREAM3D_REQUIRE_EQUAL(3, numStatsData);
-
-  // This will get us a Pointer to the instance of StatsDataArray class that is stored
-  // in the DataContainer.
-  StatsDataArray* statsArrayPtr = StatsDataArray::SafeObjectDownCast<IDataArray*, StatsDataArray*>(m->getEnsembleData(SIMPL::EnsembleData::Statistics).get());
-
-  // Unfortunately we can NOT use the operator [] with a pointer so sometimes creating
-  // a reference variable can be help. We do this by dereferencing the pointer and
-  // assigning that to a "reference variable"
-  StatsDataArray& statsArrayRef = *statsArrayPtr;
-
-  // So now we can get to the actual "StatsData" instances stored in the StatsDataArray object.
-  StatsData::Pointer s1 = statsArrayRef[1];
-  // We could have also done it using the pointer from above in this manner:
-  StatsData::Pointer s1_Alt = statsArrayPtr->getStatsData(1);
-
-  // Both shared pointer objects should wrapp the SAME StatsData Pointer. This line
-  // will verify that. You would NOT use this next line in normal production code. It
-  // is for Unit Testing ONLY.
-  DREAM3D_REQUIRE_EQUAL((s1.get()), (s1_Alt.get()))
-
-  size_t numBins = s1->getNumberOfBins();
-
-  // So Now if you want to get the B Over A values you can do this:
-  VectorOfFloatArray bovera = s1->getGrainSize_BOverA();
-  // This holds 2 arrays. Alphas and Betas which are of type FloatArrayType, or a
-  // DataArray<float>::Pointer
-
-  FloatArrayType::Pointer alphas = bovera[0];
-  FloatArrayType::Pointer betas = bovera[1];
-
-  DREAM3D_REQUIRE_EQUAL(numBins, alphas->GetSize());
-  // Since these are all shared_pointers, well at least the alphas and betas are,
-  // anything you do to this array (adding, erasing, changing values) you are doing
-  // to the arrays stored in the Data Container.
-  alphas->SetValue(0, 100.0f); // This sets the value at index 0 to 100.0
-  betas->SetValue(0, 6.0f);    // This sets the value at index 0 to 6.0
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestReadData()
-{
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-
-  DataContainerReader::Pointer reader = DataContainerReader::New();
-  reader->setInputFile(UnitTest::StatsDataTest::TestFile);
-  reader->setVoxelDataContainer(m.get());
-  reader->execute();
-  int err = reader->getErrorCondition();
-  if(err < 0)
-  {
-    std::cout << reader->getErrorMessage() << std::endl;
-  }
-  DREAM3D_REQUIRE(err >= 0);
-
-  IDataArray::Pointer p = m->getEnsembleData(SIMPL::EnsembleData::Statistics);
-  DREAM3D_REQUIRE_EQUAL(p->GetNumberOfTuples(), 3);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::StatsDataTest::TestFile2);
-  writer->setVoxelDataContainer(m.get());
-  writer->execute();
-  err = writer->getErrorCondition();
-  if(err < 0)
-  {
-    std::cout << "Rewriting the data failed" << std::endl;
-  }
-  DREAM3D_REQUIRE(err >= 0);
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-#if !REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  DREAM3D_REGISTER_TEST(TestStatsData())
-  DREAM3D_REGISTER_TEST(TestWriteData())
-  DREAM3D_REGISTER_TEST(TestReadData())
-
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/StatsGenTest.cpp b/Source/SIMPLib/Testing/Unused/StatsGenTest.cpp
deleted file mode 100644
index 2accff59c0..0000000000
--- a/Source/SIMPLib/Testing/Unused/StatsGenTest.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <QVector>
-#include <iostream>
-#include <map>
-#include <string>
-
-#include "SIMPLib/Common/StatsGen.hpp"
-#include "SIMPLib/SIMPLib.h"
-
-#include "UnitTestSupport.hpp"
-
-void GenHexMDFPlotData()
-{
-
-  int err = 0;
-  int size = 2500;
-  QVector<float> e1s;
-  QVector<float> e2s;
-  QVector<float> e3s;
-  QVector<float> weights;
-  QVector<float> sigmas;
-  QVector<float> odf;
-
-  odf.resize(HexagonalOps::k_OdfSize);
-  size_t numEntries = e1s.size();
-  Texture::CalculateHexODFData(e1s.data(), e2s.data(), e3s.data(), weights.data(), sigmas.data(), true, odf.data(), numEntries);
-
-  // These are the input vectors
-  QVector<float> angles;
-  QVector<float> axes;
-
-  // Allocate a new vector to hold the mdf data
-  QVector<float> mdf(HexagonalOps::k_MdfSize);
-  // Calculate the MDF Data using the ODF data and the rows from the MDF Table model
-  Texture::CalculateMDFData<float, HexagonalOps>(angles.data(), axes.data(), weights.data(), odf.data(), mdf.data(), angles.size());
-
-  int npoints = 20;
-  // Now generate the actual XY point data that gets plotted.
-  // These are the output vectors
-  QVector<float> x(npoints);
-  QVector<float> y(npoints);
-  err = StatsGen::GenHexMDFPlotData(mdf.data(), x.data(), y.data(), npoints, size);
-
-  DREAM3D_REQUIRE(err >= 0)
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestTextureStatsGen()
-{
-  float alpha = 1.0;
-  float beta = 1.0;
-
-  std::vector<float> x;
-  std::vector<float> y;
-  int size = 1000;
-  int err = StatsGen::GenBetaPlotData(alpha, beta, x, y, size);
-
-  float avg = 1.0f;
-  float stdDev = 0.5f;
-  err = StatsGen::GenLogNormalPlotData(avg, stdDev, x, y, size);
-
-  float k = 1.4f;
-  err = StatsGen::GenPowerLawPlotData(alpha, k, beta, x, y, size);
-
-  float mu = 1.0f;
-  float sigma = 1.0f;
-  float cutoff = 4.0f;
-  float maxCutOff = 4.0f;
-  float binstep = 0.75f;
-  float max, min;
-
-  err = StatsGen::ComputeNumberOfBins(mu, sigma, cutoff, maxCutOff, binstep, max, min);
-  size_t npoints = 1000;
-
-  std::vector<float> binsizes;
-  err = StatsGen::GenCutOff(mu, sigma, cutoff, maxCutOff, binstep, x, y, max, size, binsizes);
-
-  {
-    size_t numEntries = 0;
-    std::vector<float> e1s;
-    std::vector<float> e2s;
-    std::vector<float> e3s;
-    std::vector<float> weights;
-    std::vector<float> sigmas;
-    std::vector<float> odf(CubicOps::k_OdfSize);
-    Texture::CalculateCubicODFData(&(e1s.front()), &(e2s.front()), &(e3s.front()), &(weights.front()), &(sigmas.front()), true, &(odf.front()), numEntries);
-
-    std::vector<float> x001(npoints * 3);
-    std::vector<float> y001(npoints * 3);
-    std::vector<float> x011(npoints * 6);
-    std::vector<float> y011(npoints * 6);
-    std::vector<float> x111(npoints * 4);
-    std::vector<float> y111(npoints * 4);
-    //    err = StatsGen::GenCubicODFPlotData(&(odf.front()), &(x001.front()), &(y001.front()), &(x011.front()),
-    //                                        &(y011.front()), &(x111.front()), &(y111.front()), npoints);
-
-    // Now generate the actual XY point data that gets plotted.
-    // These are the output vectors
-    std::vector<float> angles;
-    std::vector<float> axes;
-    std::vector<float> mdf(CubicOps::k_MdfSize);
-
-    Texture::CalculateMDFData<float, CubicOps>(&(angles.front()), &(axes.front()), &(weights.front()), &(odf.front()), &(mdf.front()), angles.size());
-
-    npoints = 13;
-    x.resize(npoints);
-    y.resize(npoints);
-    size_t mdfSize = 100000;
-    err = StatsGen::GenCubicMDFPlotData(&(mdf.front()), &(x.front()), &(y.front()), npoints, mdfSize);
-
-    //    for(int i = 0; i < npoints; ++i)
-    //    {
-    //      std::cout << x[i] << " " << y[i] << std::endl;
-    //    }
-  }
-
-  {
-    std::vector<float> odf(HexagonalOps::k_OdfSize);
-
-    std::vector<float> x001(npoints * 1);
-    std::vector<float> y001(npoints * 1);
-    std::vector<float> x011(npoints * 3);
-    std::vector<float> y011(npoints * 3);
-    std::vector<float> x111(npoints * 3);
-    std::vector<float> y111(npoints * 3);
-    //    err = StatsGen::GenHexODFPlotData(&(odf.front()), &(x001.front()), &(y001.front()), &(x011.front()),
-    //                                      &(y011.front()), &(x111.front()), &(y111.front()), npoints);
-  }
-
-  {
-    std::vector<float> odf(OrthoRhombicOps::k_OdfSize);
-
-    std::vector<float> x001(npoints * 3);
-    std::vector<float> y001(npoints * 3);
-    std::vector<float> x011(npoints * 6);
-    std::vector<float> y011(npoints * 6);
-    std::vector<float> x111(npoints * 4);
-    std::vector<float> y111(npoints * 4);
-    //    err = StatsGen::GenOrthoRhombicODFPlotData(&(odf.front()), &(x001.front()), &(y001.front()), &(x011.front()),
-    //                                               &(y011.front()), &(x111.front()), &(y111.front()), npoints);
-  }
-
-  {
-    std::vector<float> odf(OrthoRhombicOps::k_OdfSize);
-
-    std::vector<float> x001(npoints * 1);
-    std::vector<float> y001(npoints * 1);
-    std::vector<float> x011(npoints * 1);
-    std::vector<float> y011(npoints * 1);
-    std::vector<float> x111(npoints * 1);
-    std::vector<float> y111(npoints * 1);
-    //    err = StatsGen::GenAxisODFPlotData(&(odf.front()), &(x001.front()), &(y001.front()), &(x011.front()),
-    //                                       &(y011.front()), &(x111.front()), &(y111.front()), npoints);
-  }
-}
-
-/**
- * @brief This code is just here to make sure each of the methods in the StatsGen
- *  class gets compiled due to some compilers NOT compiling the templates unless
- *  they are explicitly instantiated.
- * @param argc
- * @param argv
- * @return
- */
-int main(int argc, char** argv)
-{
-
-  int err = 0;
-  DREAM3D_REGISTER_TEST(TestTextureStatsGen())
-  DREAM3D_REGISTER_TEST(GenHexMDFPlotData())
-
-  PRINT_TEST_SUMMARY();
-
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/SurfaceMeshTest.cpp b/Source/SIMPLib/Testing/Unused/SurfaceMeshTest.cpp
deleted file mode 100644
index 08ce4bb3e2..0000000000
--- a/Source/SIMPLib/Testing/Unused/SurfaceMeshTest.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdio.h>
-
-#include <iostream>
-#include <set>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Common/ScopedFileMonitor.hpp"
-#include "SIMPLib/DataContainers/DataContainer.h"
-#include "SIMPLib/DataContainers/MeshStructs.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SurfaceMeshing/SurfaceMeshingFilters/BinaryNodesTrianglesReader.h"
-#include "SurfaceMeshing/SurfaceMeshingFilters/util/TriangleOps.h"
-
-#include "SurfaceMeshing/SurfaceMeshingFilters/LaplacianSmoothing.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  std::cout << "Starting SurfaceMeshTest" << std::endl;
-  if(argc < 3)
-  {
-    std::cout << "2 Arguments needed:\n  (1) Binary Nodes File\n  (2) Binary Triangle File" << std::endl;
-    return EXIT_FAILURE;
-  }
-  DEFINE_CLOCK;
-
-  START_CLOCK;
-
-  int err = 0;
-  SurfaceDataContainer::Pointer sm = SurfaceDataContainer::New();
-  sm->setName(SIMPL::Defaults::DataContainerName);
-  DataContainerArray::Pointer dca = DataContainerArray::New();
-  dca->pushBack(sm);
-
-  QString nodesFileName = argv[1];
-  QString trianglesFileName = argv[2];
-  Observer observer;
-
-  // This will read the mesh from the temp file and store it in the SurfaceMesh Data container
-  BinaryNodesTrianglesReader::Pointer binaryReader = BinaryNodesTrianglesReader::New();
-  binaryReader->setBinaryNodesFile(nodesFileName);
-  binaryReader->setBinaryTrianglesFile(trianglesFileName);
-  binaryReader->setMessagePrefix(binaryReader->getNameOfClass());
-  binaryReader->setDataContainerArray(dca);
-  binaryReader->execute();
-  if(binaryReader->getErrorCondition() < 0)
-  {
-    std::cout << "Error Code: " << binaryReader->getErrorCondition() << std::endl;
-  }
-  // END_CLOCK("Reading Nodes & Triangles");
-
-  START_CLOCK;
-  sm->getFaces()->findFacesContainingVert();
-  // END_CLOCK("Building Cell Links");
-
-  START_CLOCK;
-  sm->getFaces()->findFaceNeighbors();
-  // END_CLOCK("Building Triangle Neighbor Lists");
-
-  START_CLOCK;
-  LaplacianSmoothing::Pointer filter = LaplacianSmoothing::New();
-  filter->setLambda(0.25f);
-  filter->setTripleLineLambda(0.125f);
-  filter->setQuadPointLambda(0.65f);
-
-  filter->setDataContainerArray(dca);
-  filter->setMessagePrefix(filter->getNameOfClass());
-  filter->setIterationSteps(50);
-  filter->execute();
-  // END_CLOCK("Laplacian Filter");
-
-  std::cout << "Finished" << std::endl;
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/SyntheticBuilderTest.cpp b/Source/SIMPLib/Testing/Unused/SyntheticBuilderTest.cpp
deleted file mode 100644
index 836d23a9f5..0000000000
--- a/Source/SIMPLib/Testing/Unused/SyntheticBuilderTest.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
-#include <iostream>
-#include <string>
-
-#include "MXA/Common/LogTime.h"
-#include "MXA/Utilities/MXAFileInfo.h"
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "SIMPLib/Common/AbstractPipeline.h"
-#include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/VTKUtils/VTKFileWriters.hpp"
-//#include "SIMPLib/HDF5/H5VoxelReader.h"
-#include "SIMPLib/IOFilters/DataContainerWriter.h"
-#include "SIMPLib/IOFilters/FeatureDataCSVWriter.h"
-#include "SIMPLib/IOFilters/VtkRectilinearGridWriter.h"
-#include "SIMPLib/SyntheticBuilderFilters/AdjustVolume.h"
-#include "SIMPLib/SyntheticBuilderFilters/InitializeSyntheticVolume.h"
-#include "SIMPLib/SyntheticBuilderFilters/InitializeSyntheticVolume.h"
-#include "SIMPLib/SyntheticBuilderFilters/InsertPrecipitatePhases.h"
-#include "SIMPLib/SyntheticBuilderFilters/MatchCrystallography.h"
-#include "SIMPLib/SyntheticBuilderFilters/PackPrimaryPhases.h"
-
-#include "UnitTestSupport.hpp"
-
-#include "TestFileLocations.h"
-
-#define PACK_GRAINS_ERROR_TXT_OUT 1
-#define PACK_GRAINS_VTK_FILE_OUT 1
-
-#define MAKE_OUTPUT_FILE_PATH(outpath, filename) QString outpath = m_OutputDirectory + "/" + m_OutputFilePrefix + filename;
-
-QString m_H5StatsFile("");
-QString m_OutputDirectory = UnitTest::SyntheticBuilderTest::TestDir;
-QString m_OutputFilePrefix("");
-size_t m_XPoints = 150;
-size_t m_YPoints = 150;
-size_t m_ZPoints = 150;
-
-typedef DataArray<unsigned int> ShapeTypeArrayType;
-
-float m_XResolution = 0.25f;
-float m_YResolution = 0.25f;
-float m_ZResolution = 0.25f;
-double m_NeighborhoodErrorWeight = 1.0f;
-double m_FractionPrecipitates = 0.0f;
-
-bool m_PeriodicBoundary = false;
-QString m_StructureFile("");
-bool m_AlreadyFormed = false;
-
-int m_Precipitates = 0;
-
-bool m_WriteBinaryVTKFiles = true;
-bool m_WriteVtkFile = true;
-bool m_WriteSurfaceVoxel = true;
-bool m_WritePhaseId = true;
-bool m_WriteIPFColor = true;
-
-bool m_WriteHDF5GrainFile = false;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString getH5StatsFile()
-{
-  QString s = UnitTest::DataDir + MXADir::Separator + "3Phase.h5";
-  return s;
-}
-
-void setCurrentFilter(AbstractFilter::Pointer f)
-{
-}
-
-void pipelineFinished()
-{
-}
-
-void setErrorCondition(int err)
-{
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-  QFile::remove(UnitTest::SyntheticBuilderTest::CsvFile);
-  QFile::remove(UnitTest::SyntheticBuilderTest::OutputFile);
-  QFile::remove(UnitTest::SyntheticBuilderTest::VtkOutputFile);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TestSyntheticBuilder()
-{
-
-  QDir dir(m_OutputDirectory);
-  dir.mkpath(".");
-
-  Observer* observer = new Observer;
-
-  int err = 0;
-
-  // Create our Pipeline object
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-  pipeline->setVoxelDataContainer(m);
-
-  ShapeTypeArrayType::Pointer m_ShapeTypes = ShapeTypeArrayType::CreateArray(4, SIMPL::EnsembleData::ShapeTypes);
-  m_ShapeTypes->SetValue(0, SIMPL::ShapeType::UnknownShapeType);
-  m_ShapeTypes->SetValue(1, SIMPL::ShapeType::EllipsoidShape);
-  m_ShapeTypes->SetValue(2, SIMPL::ShapeType::EllipsoidShape);
-  m_ShapeTypes->SetValue(3, SIMPL::ShapeType::EllipsoidShape);
-
-  InitializeSyntheticVolume::Pointer init_volume = InitializeSyntheticVolume::New();
-  init_volume->setShapeTypes(m_ShapeTypes);
-  init_volume->setInputFile(getH5StatsFile());
-  init_volume->setXVoxels(m_XPoints);
-  init_volume->setYVoxels(m_YPoints);
-  init_volume->setZVoxels(m_ZPoints);
-  init_volume->setXRes(m_XResolution);
-  init_volume->setYRes(m_YResolution);
-  init_volume->setZRes(m_ZResolution);
-  pipeline->pushBack(init_volume);
-
-  PackPrimaryPhases::Pointer pack_grains = PackPrimaryPhases::New();
-  pack_grains->setPeriodicBoundaries(m_PeriodicBoundary);
-  pack_grains->setNeighborhoodErrorWeight(m_NeighborhoodErrorWeight);
-#if PACK_GRAINS_ERROR_TXT_OUT
-  MAKE_OUTPUT_FILE_PATH(errorFile, SIMPL::SyntheticBuilder::ErrorFile)
-  pack_grains->setErrorOutputFile(errorFile);
-#endif
-#if PACK_GRAINS_VTK_FILE_OUT
-  MAKE_OUTPUT_FILE_PATH(vtkFile, SIMPL::SyntheticBuilder::VtkFile)
-  pack_grains->setVtkOutputFile(vtkFile);
-#endif
-  pipeline->pushBack(pack_grains);
-
-  AdjustVolume::Pointer adjust_grains = AdjustVolume::New();
-  pipeline->pushBack(adjust_grains);
-
-  InsertPrecipitatePhases::Pointer place_precipitates = InsertPrecipitatePhases::New();
-  place_precipitates->setPeriodicBoundaries(m_PeriodicBoundary);
-  pipeline->pushBack(place_precipitates);
-
-  MatchCrystallography::Pointer match_crystallography = MatchCrystallography::New();
-  //  pipeline->pushBack(match_crystallography);
-
-  FeatureDataCSVWriter::Pointer write_featuredata = FeatureDataCSVWriter::New();
-  write_featuredata->setFeatureDataFile(UnitTest::SyntheticBuilderTest::CsvFile);
-  pipeline->pushBack(write_featuredata);
-
-  DataContainerWriter::Pointer writer = DataContainerWriter::New();
-  writer->setOutputFile(UnitTest::SyntheticBuilderTest::OutputFile);
-  pipeline->pushBack(writer);
-
-  bool m_WriteVtkFile(true);
-  bool m_WriteBinaryVTKFiles(true);
-  bool m_WritePhaseId(true);
-  bool m_WriteIPFColor(false);
-
-  if(m_WriteVtkFile)
-  {
-    VtkRectilinearGridWriter::Pointer vtkWriter = VtkRectilinearGridWriter::New();
-    vtkWriter->setOutputFile(UnitTest::SyntheticBuilderTest::VtkOutputFile);
-    vtkWriter->setWriteGrainIds(true);
-    vtkWriter->setWritePhaseIds(m_WritePhaseId);
-    // vtkWriter->setWriteGoodVoxels(m_WriteGoodVoxels);
-    vtkWriter->setWriteIPFColors(m_WriteIPFColor);
-    vtkWriter->setWriteBinaryFile(m_WriteBinaryVTKFiles);
-    pipeline->pushBack(vtkWriter);
-  }
-
-  std::cout << "********* RUNNING PIPELINE **********************" << std::endl;
-
-  m = VoxelDataContainer::New();
-
-  pipeline->setVoxelDataContainer(m);
-  pipeline->run();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-
-  DREAM3D_REQUIRE_EQUAL(false, pipeline->empty());
-
-  pipeline->clear();
-  DREAM3D_REQUIRE_EQUAL(0, pipeline->size());
-  DREAM3D_REQUIRE_EQUAL(true, pipeline->empty());
-
-  delete observer;
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-#if !REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  DREAM3D_REGISTER_TEST(TestSyntheticBuilder())
-
-#if REMOVE_TEST_FILES
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-#endif
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/SyntheticTest.cpp b/Source/SIMPLib/Testing/Unused/SyntheticTest.cpp
deleted file mode 100644
index bd41901de3..0000000000
--- a/Source/SIMPLib/Testing/Unused/SyntheticTest.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <string>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QString>
-
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataArrays/StructArray.hpp"
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/SIMPLib.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::SyntheticTest::OutputFile);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Test2PhaseMatrixPrecipitate()
-{
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  DREAM3D_REGISTER_TEST(Test2PhaseMatrixPrecipitate())
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-  PRINT_TEST_SUMMARY();
-
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/UMich.cpp b/Source/SIMPLib/Testing/Unused/UMich.cpp
deleted file mode 100644
index 215f605bbc..0000000000
--- a/Source/SIMPLib/Testing/Unused/UMich.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <math.h>
-#include <stdlib.h>
-
-#include <iostream>
-
-#include "SIMPLib/Math/SIMPLibMath.h"
-
-static const float CubicQuatSym[24][4] = {{0.000000000f, 0.000000000f, 0.000000000f, 1.000000000f},
-                                          {1.000000000f, 0.000000000f, 0.000000000f, 0.000000000f},
-                                          {0.000000000f, 1.000000000f, 0.000000000f, 0.000000000f},
-                                          {0.000000000f, 0.000000000f, 1.000000000f, 0.000000000f},
-                                          {SIMPLib::Constants::k_1OverRoot2, 0.000000000f, 0.000000000f, SIMPLib::Constants::k_1OverRoot2},
-                                          {0.000000000f, SIMPLib::Constants::k_1OverRoot2, 0.000000000f, SIMPLib::Constants::k_1OverRoot2},
-                                          {0.000000000f, 0.000000000f, SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2},
-                                          {-SIMPLib::Constants::k_1OverRoot2, 0.000000000f, 0.000000000f, SIMPLib::Constants::k_1OverRoot2},
-                                          {0.000000000f, -SIMPLib::Constants::k_1OverRoot2, 0.000000000f, SIMPLib::Constants::k_1OverRoot2},
-                                          {0.000000000f, 0.000000000f, -SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2},
-                                          {SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2, 0.000000000f, 0.000000000f},
-                                          {-SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2, 0.000000000f, 0.000000000f},
-                                          {0.000000000f, SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2, 0.000000000f},
-                                          {0.000000000f, -SIMPLib::Constants::k_1OverRoot2, SIMPLib::Constants::k_1OverRoot2, 0.000000000f},
-                                          {SIMPLib::Constants::k_1OverRoot2, 0.000000000f, SIMPLib::Constants::k_1OverRoot2, 0.000000000f},
-                                          {-SIMPLib::Constants::k_1OverRoot2, 0.000000000f, SIMPLib::Constants::k_1OverRoot2, 0.000000000f},
-                                          {0.500000000f, 0.500000000f, 0.500000000f, 0.500000000f},
-                                          {-0.500000000f, -0.500000000f, -0.500000000f, 0.500000000f},
-                                          {0.500000000f, -0.500000000f, 0.500000000f, 0.500000000f},
-                                          {-0.500000000f, 0.500000000f, -0.500000000f, 0.500000000f},
-                                          {-0.500000000f, 0.500000000f, 0.500000000f, 0.500000000f},
-                                          {0.500000000f, -0.500000000f, -0.500000000f, 0.500000000f},
-                                          {-0.500000000f, -0.500000000f, 0.500000000f, 0.500000000f},
-                                          {0.500000000f, 0.500000000f, -0.500000000f, 0.500000000f}};
-
-/**
- * @brief eulertoQuat This converts an Euler Angle to a Quaternion
- * @param q The output Quaterion
- * @param ea1 Input Euler Angle 1 (phi1)
- * @param ea2 Input Euler Angle 2 (Phi)
- * @param ea3 Input Euler Angle 3 (phi2)
- */
-void EulertoQuat(float* q, float ea1, float ea2, float ea3)
-{
-  float s, c, s1, c1, s2, c2;
-  s = sinf(0.5f * ea2);
-  c = cosf(0.5f * ea2);
-  s1 = sinf(0.5f * (ea1 - ea3));
-  c1 = cosf(0.5f * (ea1 - ea3));
-  s2 = sinf(0.5f * (ea1 + ea3));
-  c2 = cosf(0.5f * (ea1 + ea3));
-  q[0] = s * c1;
-  q[1] = s * s1;
-  q[2] = c * s2;
-  q[3] = c * c2;
-}
-
-/**
- * @brief QuattoEuler This converts a Quaternion to a Euler Angle
- * @param q Input Quaternion (1x4 Vector)
- * @param ea1 Output Euler Angle 1 (phi1)
- * @param ea2 Output Euler Angle 2 (Phi)
- * @param ea3 Output Euler Angle 3 (phi2)
- */
-void QuattoEuler(float* q, float& ea1, float& ea2, float& ea3)
-{
-  float diff, sum, tmp;
-  diff = atan2(q[1], q[0]);
-  sum = atan2(q[2], q[3]);
-  ea1 = (diff + sum);
-  ea3 = (sum - diff);
-  tmp = (q[2] * q[2]) + (q[3] * q[3]);
-  tmp = sqrt(tmp);
-  if(tmp > 1.0f)
-  {
-    tmp = 1.0f;
-  }
-  ea2 = 2 * acos(tmp);
-}
-
-/**
- * @brief main
- * @param argc
- * @param argv
- * @return
- */
-int main(int argc, char** argv)
-{
-  if(argc != 4)
-  {
-    std::cout << "This program needs 3 Euler Angles as arguments" << std::endl;
-    return EXIT_FAILURE;
-  }
-  // Gather the arguments from the command line and convert them into floating point values
-  float ea0 = static_cast<float>(atof(argv[1]));
-  float ea1 = static_cast<float>(atof(argv[2]));
-  float ea2 = static_cast<float>(atof(argv[3]));
-
-  std::cout << "Input Angle:\n  ";
-  std::cout << ea0 << ", " << ea1 << ", " << ea2 << std::endl;
-  std::cout << "\nOutput Euler Angles" << std::endl;
-  // We need to convert the Euler Angles into a Quaternion for the Math to work correctly.
-  float q[4]; // Quaterion for use to use
-
-  // Convert the Euler Angle to a Quaternion
-  EulertoQuat(q, ea0, ea1, ea2);
-
-  // Create a variable to hold the tranform each time through the loop of 24 symmetries
-  float out[4];
-
-  // This stores the Euler Angle for each of the 24 Symmetries. You might want to store these in an array or something
-  // like that. Here we will just print them out.
-  float outEa0, outEa1, outEa2;
-
-  // Loop on all 24 Symmetries. Note that the first symmetry will give you back the input angle so you can use this
-  // as a check to make sure things are going correctly.
-  for(int i = 0; i < 24; ++i)
-  {
-    out[0] = CubicQuatSym[i][3] * q[0] + CubicQuatSym[i][0] * q[3] + CubicQuatSym[i][2] * q[1] - CubicQuatSym[i][1] * q[2];
-    out[1] = CubicQuatSym[i][3] * q[1] + CubicQuatSym[i][1] * q[3] + CubicQuatSym[i][0] * q[2] - CubicQuatSym[i][2] * q[0];
-    out[2] = CubicQuatSym[i][3] * q[2] + CubicQuatSym[i][2] * q[3] + CubicQuatSym[i][1] * q[0] - CubicQuatSym[i][0] * q[1];
-    out[3] = CubicQuatSym[i][3] * q[3] - CubicQuatSym[i][0] * q[0] - CubicQuatSym[i][1] * q[1] - CubicQuatSym[i][2] * q[2];
-
-    QuattoEuler(out, outEa0, outEa1, outEa2);
-    std::cout << "[" << i << "]:    " << outEa0 << ", " << outEa1 << ", " << outEa2 << std::endl;
-  }
-
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/UnitTestTemplate.cpp b/Source/SIMPLib/Testing/Unused/UnitTestTemplate.cpp
deleted file mode 100644
index bf216256e1..0000000000
--- a/Source/SIMPLib/Testing/Unused/UnitTestTemplate.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::XXXX::OutputFile);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MyTest()
-{
-  int i = 0;
-  int j = 1;
-
-  // This will pass because i < j
-  DREAM3D_REQUIRED(i, <, j)
-
-  // This will FAIL because i != j
-  DREAM3D_REQUIRE_EQUAL(i, j)
-}
-
-// -----------------------------------------------------------------------------
-//  Use unit test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-  DREAM3D_REGISTER_TEST(MyTest())
-
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/Testing/Unused/VXLTest.cpp b/Source/SIMPLib/Testing/Unused/VXLTest.cpp
deleted file mode 100644
index ceef39998e..0000000000
--- a/Source/SIMPLib/Testing/Unused/VXLTest.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <stdlib.h>
-
-// This is core/vnl/examples/vnl_lsqr_test.cxx
-#include <vcl_cstdlib.h>
-#include <vcl_iostream.h>
-#include <vnl/algo/vnl_lsqr.h>
-#include <vnl/vnl_sparse_matrix.h>
-#include <vnl/vnl_sparse_matrix_linear_system.h>
-#include <vnl/vnl_vector.h>
-
-int main(int argc, char** argv)
-{
-  vnl_sparse_matrix<double> A(10000, 1000);
-
-  vcl_vector<int> cols(50);
-  vcl_vector<double> vals(50);
-
-  for(int row_ = 0; row_ < 10000; ++row_)
-  {
-    double sum = 0;
-    for(int i = 0; i < 50; ++i)
-    {
-      cols[i] = vcl_rand() % 999;
-      vals[i] = (double)vcl_rand() / (double)RAND_MAX;
-      sum += vals[i];
-    }
-    A.set_row(row_, cols, vals);
-    A.scale_row(row_, 1.0 / sum);
-  }
-
-  vnl_vector<double> x(1000);
-  for(int i = 0; i < 1000; ++i)
-  {
-    x[i] = (double)vcl_rand() / (double)RAND_MAX;
-  }
-
-  vnl_vector<double> b(10000);
-  A.mult(x, b);
-
-  for(int i = 0; i < 10000; ++i)
-  {
-    b[i] += 0.01 * (((double)vcl_rand() / (double)RAND_MAX) - 0.5);
-  }
-
-  vnl_sparse_matrix_linear_system<double> linear_system(A, b);
-  vnl_lsqr lsqr(linear_system);
-  vnl_vector<double> result(1000);
-  lsqr.minimize(result);
-  lsqr.diagnose_outcome(vcl_cerr);
-
-  vcl_cerr << "Ground truth relative residual : " << (x - result).two_norm() / x.two_norm() << vcl_endl;
-  return EXIT_SUCCESS;
-}
diff --git a/Source/SIMPLib/Testing/Unused/VoxelTest.cpp b/Source/SIMPLib/Testing/Unused/VoxelTest.cpp
deleted file mode 100644
index a224a18312..0000000000
--- a/Source/SIMPLib/Testing/Unused/VoxelTest.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-class Patch
-{
-public:
-  int verts[3];
-  virtual ~Patch()
-  {
-  }
-  Patch(){};
-  Patch(const Patch& p)
-  {
-    std::cout << "Patch(const Patch& p)" << std::endl;
-    //      verts[0] = p.verts[0];
-    //      verts[1] = p.verts[1];
-    //      verts[2] = p.verts[2];
-  }
-
-  void print()
-  {
-    std::cout << "vert[0]: " << verts[0] << "  vert[1]: " << verts[1] << "  vert[2]: " << verts[2] << std::endl;
-  }
-
-private:
-  // void operator=(const Patch&); // Operator '=' Not Implemented
-};
-
-int main(int argc, char** argv)
-{
-  std::cout << "Starting...." << std::endl;
-
-  std::vector<Patch> ps(2);
-  ps[0].verts[0] = 111;
-  ps[0].verts[1] = 111;
-  ps[0].verts[2] = 111;
-
-  Patch& p0 = ps[0];
-  p0.verts[0] = 222;
-  ps[0].print();
-  p0.print();
-
-  p0 = ps[1];
-  p0.verts[0] = 333;
-  ps[1].print();
-  p0.print();
-
-  return 0;
-}
diff --git a/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp b/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
deleted file mode 100644
index 0d120648b4..0000000000
--- a/Source/SIMPLib/Testing/Unused/VtkGrainIdIOTest.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <iostream>
-#include <stdlib.h>
-#include <vector>
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/IOFilters/VtkGrainIdReader.h"
-#include "SIMPLib/IOFilters/VtkGrainIdWriter.h"
-
-#include "TestFileLocations.h"
-#include "UnitTestSupport.hpp"
-
-class GenerateGrainIds : public AbstractFilter
-{
-  Q_OBJECT
-public:
-  SIMPL_SHARED_POINTERS(GenerateGrainIds)
-  SIMPL_STATIC_NEW_MACRO(GenerateGrainIds)
-  SIMPL_TYPE_MACRO_SUPER(GenerateGrainIds, AbstractFilter)
-
-  //------ Required Cell Data
-  SIMPL_INSTANCE_STRING_PROPERTY(GrainIdsArrayName)
-
-  virtual ~GenerateGrainIds(){};
-  virtual const QString getGroupName()
-  {
-    return "UnitTest";
-  }
-  virtual const QString getHumanLabel()
-  {
-    return "Generate Grain Ids";
-  }
-  virtual void execute()
-  {
-    clearErrorCode();
-    VoxelDataContainer* m = getVoxelDataContainer();
-    if(nullptr == m)
-    {
-      QStringstream ss;
-      ss << " DataContainer was nullptr";
-      setErrorCondition(-1, ss.str());
-      return;
-    }
-    int size = UnitTest::VtkGrainIdIOTest::XSize * UnitTest::VtkGrainIdIOTest::YSize * UnitTest::VtkGrainIdIOTest::ZSize;
-
-    int64_t nx = UnitTest::VtkGrainIdIOTest::XSize;
-    int64_t ny = UnitTest::VtkGrainIdIOTest::YSize;
-    int64_t nz = UnitTest::VtkGrainIdIOTest::ZSize;
-    m->setDimensions(nx, ny, nz);
-    m->setResolution(2.0f, 3.0f, 4.0f);
-    m->setOrigin(1.0f, 2.0f, 3.0f);
-
-    int64_t totalPoints = m->getTotalPoints();
-    dataCheck();
-    // Set the default data into the GrainIds
-    for(int i = 0; i < size; ++i)
-    {
-      m_GrainIds[i] = i + UnitTest::VtkGrainIdIOTest::Offset;
-    }
-  }
-  virtual void preflight()
-  {
-    dataCheck();
-  }
-
-protected:
-  GenerateGrainIds()
-  : m_GrainIdsArrayName(SIMPL::CellData::GrainIds)
-  , m_GrainIds(nullptr)
-  {
-  }
-
-private:
-  int32_t* m_GrainIds;
-
-  void dataCheck()
-  {
-    clearErrorCode();
-    QStringstream ss;
-    VoxelDataContainer* m = getVoxelDataContainer();
-    m_GrainIdsPtr = attrMat->createNonPrereqArray<DataArray<int32_t>, AbstractFilter, int32_t>(this, m_CellAttributeMatrixName, m_GrainIdsArrayName, 0, voxels,
-                                                                                               1); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-    if(nullptr != m_GrainIdsPtr.lock())                                                            /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
-    {
-      m_GrainIds = m_GrainIdsPtr.lock()->getPointer(0);
-    } /* Now assign the raw pointer to data from the DataArray<T> object */
-
-    setErrorMessage(ss.str());
-  }
-
-  GenerateGrainIds(const GenerateGrainIds&); // Copy Constructor Not Implemented
-  void operator=(const GenerateGrainIds&);   // Operator '=' Not Implemented
-};
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveTestFiles()
-{
-#if REMOVE_TEST_FILES
-  QFile::remove(UnitTest::VtkGrainIdIOTest::TestFile);
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int TestVtkGrainIdWriter()
-{
-  FilterPipeline::Pointer pipeline = FilterPipeline::New();
-
-  // This should FAIL because there are no GrainIds anywhere to write. It should
-  // fail in the preflight
-  VtkGrainIdWriter::Pointer writer = VtkGrainIdWriter::New();
-  writer->setOutputFile(UnitTest::VtkGrainIdIOTest::TestFile);
-  pipeline->pushBack(writer);
-  pipeline->execute();
-  int err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE(err < 0);
-
-  // Now create some GrainIds and lets setup a real pipeline that should work
-  pipeline->clear(); // Remove any filters from the pipeline first
-
-  GenerateGrainIds::Pointer generateGrainIds = GenerateGrainIds::New();
-  pipeline->pushBack(generateGrainIds);
-
-  writer = VtkGrainIdWriter::New();
-  writer->setOutputFile(UnitTest::VtkGrainIdIOTest::TestFile);
-  pipeline->pushBack(writer);
-
-  pipeline->execute();
-  err = pipeline->getErrorCondition();
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-
-  return EXIT_SUCCESS;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int TestVtkGrainIdReader()
-{
-
-  VtkGrainIdReader::Pointer reader = VtkGrainIdReader::New();
-  reader->setInputFile(UnitTest::VtkGrainIdIOTest::TestFile);
-  size_t nx = 0;
-  size_t ny = 0;
-  size_t nz = 0;
-
-  VoxelDataContainer::Pointer m = VoxelDataContainer::New();
-  reader->setVoxelDataContainer(m.get());
-  reader->execute();
-  int err = reader->getErrorCondition();
-  if(err < 0)
-  {
-    std::cout << reader->getErrorMessage() << std::endl;
-  }
-  DREAM3D_REQUIRE_EQUAL(err, 0);
-  std::tie(nx, ny, nz) = m->getDimensions();
-
-  IDataArray::Pointer mdata = reader->getVoxelDataContainer()->getCellData(SIMPL::CellData::GrainIds);
-
-  DREAM3D_REQUIRE_EQUAL(nx, UnitTest::VtkGrainIdIOTest::XSize);
-  DREAM3D_REQUIRE_EQUAL(ny, UnitTest::VtkGrainIdIOTest::YSize);
-  DREAM3D_REQUIRE_EQUAL(nz, UnitTest::VtkGrainIdIOTest::ZSize);
-  int size = UnitTest::VtkGrainIdIOTest::XSize * UnitTest::VtkGrainIdIOTest::YSize * UnitTest::VtkGrainIdIOTest::ZSize;
-  int32_t* data = Int32ArrayType::SafeReinterpretCast<IDataArray*, Int32ArrayType*, int32_t*>(mdata.get());
-
-  for(int i = 0; i < size; ++i)
-  {
-    int32_t file_value = data[i];
-    int32_t memory_value = i + UnitTest::VtkGrainIdIOTest::Offset;
-    DREAM3D_REQUIRE_EQUAL(memory_value, file_value);
-  }
-
-  return EXIT_SUCCESS;
-}
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  DREAM3D_REGISTER_TEST(TestVtkGrainIdWriter())
-  DREAM3D_REGISTER_TEST(TestVtkGrainIdReader())
-
-  DREAM3D_REGISTER_TEST(RemoveTestFiles())
-  PRINT_TEST_SUMMARY();
-  return err;
-}
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
index db82fc2446..fba727248e 100755
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -175,7 +175,7 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
       return err;
     }
 
-    template<typename T>
+    template <typename T>
     int skipVolume(std::ifstream& inStream, int byteSize, size_t xDim, size_t yDim, size_t zDim)
     {
       int err = 0;
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
index 35046f3499..cf8d02ef62 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
@@ -56,7 +56,7 @@
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
 projects by hand you need to define SVWidgetsLib_EXPORTS when
-building the MXADatModel DLL on windows.
+building on windows.
 */
 
 #if defined (SVWidgetsLib_BUILT_AS_DYNAMIC_LIB)
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
index 3d0bcabd1e..08de98fd38 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
@@ -290,23 +290,6 @@ void ImportHDF5TreeModel::setupModelData()
   }
 
   m_RootItem->appendChild(new ImportHDF5TreeModelItem(m_FileId, QString("/"), m_RootItem));
-
-#if 0
-  std::list<std::string> itemList;
-  herr_t err = H5Utilities::getGroupObjects(_fileId, H5Utilities::MXA_ANY, itemList);
-  if (err < 0)
-  {
-    std::cout << "Error getting group objects. " <<__FILE__ << ":" << __LINE__ << std::endl;
-    return;
-  }
-
-
-  for (std::list<std::string>::iterator iter = itemList.begin(); iter != itemList.end(); ++iter )
-  {
-    rootItem->appendChild(new ImportHDF5TreeModelItem(_fileId, QString( (*iter).c_str() ), rootItem) );
-  }
-#endif
-  // parents.last()->appendChild(new ImportHDF5TreeModelItem(columnData, parents.last()));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Wrapping/Python/Examples/Anisotropy/01_Import Data.py b/Wrapping/Python/Examples/Anisotropy/01_Import Data.py
deleted file mode 100644
index 105caf61fc..0000000000
--- a/Wrapping/Python/Examples/Anisotropy/01_Import Data.py	
+++ /dev/null
@@ -1,36 +0,0 @@
-"""
-
-Pipeline example based on 01_Import Data in Anisotropy examples
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-
-# Numpy for some data management assistance
-import numpy as np
-import datetime as datetime
-
-
-def import_data():
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    err = orientationanalysispy.ebsd_to_h5_ebsd(dca, sd.GetBuildDirectory() + "\Debug\Data\\ang",
-                          sd.GetBuildDirectory() + "\Debug\Data\AlMgSc.h5ebsd",
-                          "AlMgSc-TD_", "", "ang", 3,
-                          0, 9, simpl.AxisAngleInput(0, 0, 0, 0), simpl.AxisAngleInput(0, 0, 0, 0))
-    if err < 0:
-        print("EBSD to H5EBSD ErrorCondition %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    import_data()
-
-
diff --git a/Wrapping/Python/Examples/Anisotropy/02_Adaptive Alignment - Misorientation - Zero Shifts.py b/Wrapping/Python/Examples/Anisotropy/02_Adaptive Alignment - Misorientation - Zero Shifts.py
deleted file mode 100644
index 295e2aa8cf..0000000000
--- a/Wrapping/Python/Examples/Anisotropy/02_Adaptive Alignment - Misorientation - Zero Shifts.py	
+++ /dev/null
@@ -1,55 +0,0 @@
-"""
-
-Pipeline example based on 02_Adaptive Alignment - Misorientation - Zero Shifts in Anisotropy examples
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import anisotropypy
-
-
-def import_data():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read H5EBSD File
-    err = orientationanalysispy.read_h5_ebsd(dca, "AlMgSc Data", "Phase Data", "EBSD SEM Scan Data",
-                                             sd.GetBuildDirectory() + "/Debug/Data/AlMgSc.h5ebsd",
-                                             0, 9, True, sc.AngleRepresentation.Radians,
-                                             simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases",
-                                                             "X Position", "Y Position"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # Convert Orientation Representation
-    err = orientationanalysispy.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                     simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data",
-                                                                         "EulerAngles"),
-                                                     "Quats")
-    if err < 0:
-        print("Convert Orientations ErrorCondition %d" % err)
-
-    # Adaptive Alignment Misorientation
-    err = anisotropypy.adaptive_alignment_misorientation(dca, 5, False,
-                                                         simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data",
-                                                                             "Quats"),
-                                                         simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data",
-                                                                             "Phases"),
-                                                         simpl.DataArrayPath("", "", ""),
-                                                         simpl.DataArrayPath("AlMgSc Data", "Phase Data",
-                                                                             "CrystalStructures"))
-    if err < 0:
-        print("AdaptiveAlignment Misorientation %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    import_data()
-
-
diff --git a/Wrapping/Python/Examples/Anisotropy/03_Adaptive Alignment Mutual Information - SEM Images.py b/Wrapping/Python/Examples/Anisotropy/03_Adaptive Alignment Mutual Information - SEM Images.py
deleted file mode 100644
index 8331849c17..0000000000
--- a/Wrapping/Python/Examples/Anisotropy/03_Adaptive Alignment Mutual Information - SEM Images.py	
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-
-Pipeline example based on 03_Adaptive Alignment - Mutual Information - SEM Images in Anisotropy examples
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import anisotropypy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-# Numpy for some data management assistance
-import numpy as np
-import datetime as datetime
-
-
-def adaptive_alignment():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Register the ImageIO Factories
-    imageWriter = itkimageprocessing.ITKImageWriter.New()    
-    imageWriter.registerImageIOFactories()
-
-    # Read H5EBSD File
-    err = orientationanalysispy.read_h5_ebsd(dca, "AlMgSc Data", "Phase Data", "EBSD SEM Scan Data",
-                                            sd.GetBuildDirectory() + "/Debug/Data/AlMgSc.h5ebsd",
-                                            0, 9, True, sc.AngleRepresentation.Radians,
-                                            simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases",
-                                                             "X Position", "Y Position"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # Import Image Stack [ITK]
-    fileListInfo = simpl.FileListInfo(3, 0, 0, 9, 0, sd.GetBuildDirectory() + "/Debug/Data/Anisotropy/tif",
-                                      "AlMgSc-TD_", "", "tif")
-    err = itkimageprocessingpy.itk_import_image_stack(dca, "SEMAlMgSc Data", "EBSD SEM Scan Data",
-                                                      simpl.FloatVec3(0, 0, 0), simpl.FloatVec3(1, 1, 1),
-                                                      "", fileListInfo, 10, "ImageData")
-    if err < 0:
-        print("ITK Import Image Stack ErrorCondition %d" % err)
-
-    # Convert Orientation Representation
-    err = orientationanalysispy.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                    simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "EulerAngles"),
-                                                    "Quats")
-    if err < 0:
-        print("Convert Orientations ErrorCondition %d" % err)
-
-    # Adaptive Alignment Mutual Information
-    err = anisotropypy.adaptive_alignment_mutual_information(dca, 5, False,
-                                                             simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Quats"),
-                                                             simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Phases"),
-                                                             simpl.DataArrayPath("", "", ""),
-                                                             simpl.DataArrayPath("AlMgSc Data", "Phase Data", "CrystalStructures"))
-    if err < 0:
-        print("AdaptiveAlignment Mutual Information %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    adaptive_alignment()
-
-
diff --git a/Wrapping/Python/Examples/Anisotropy/04_Steiner Compact.py b/Wrapping/Python/Examples/Anisotropy/04_Steiner Compact.py
deleted file mode 100644
index bb0b7bb6f7..0000000000
--- a/Wrapping/Python/Examples/Anisotropy/04_Steiner Compact.py	
+++ /dev/null
@@ -1,103 +0,0 @@
-"""
-
-Pipeline example based on 04_Steiner Compact in Anisotropy examples
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import anisotropypy
-from dream3d import reconstructionpy
-from dream3d import processingpy
-
-# Numpy for some data management assistance
-import numpy as np
-import datetime as datetime
-
-
-def adaptive_alignment():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read H5EBSD File
-    err = orientationanalysispy.read_h5_ebsd(dca, "AlMgSc Data", "Phase Data", "EBSD SEM Scan Data",
-                                            sd.GetBuildDirectory() + "/Debug/Data/AlMgSc.h5ebsd",
-                                            0, 9, True, sc.AngleRepresentation.Radians,
-                                            simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases",
-                                                             "X Position", "Y Position"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # MultiThreshold Objects
-    err = sc.MultiThresholdObjects(dca, "Mask", [("AlMgSc Data", "EBSD SEM Scan Data", "Confidence Index", ">", 0.05),
-                                                 ("AlMgSc Data", "EBSD SEM Scan Data", "Image Quality", ">", 800)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Convert Orientation Representation
-    err = orientationanalysispy.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                    simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "EulerAngles"),
-                                                    "Quats")
-    if err < 0:
-        print("Convert Orientations ErrorCondition %d" % err)
-
-    # Neighbor Orientation Comparison (Bad Data)
-    err = orientationanalysispy.bad_data_neighbor_orientation_check(dca, 2, 4,
-                                              simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Mask"),
-                                              simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Phases"),
-                                              simpl.DataArrayPath("AlMgSc Data", "Phase Data", "CrystalStructures"),
-                                              simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Quats"))
-    if err < 0:
-        print("BadDataNeighborOrientationCheck ErrorCondition %d" % err)
-
-    # Neighbor Orientation Correlation
-    err = orientationanalysispy.neighbor_orientation_correlation(dca, 2, 0.05, 2,
-                                           simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Confidence Index"),
-                                           simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Phases"),
-                                           simpl.DataArrayPath("AlMgSc Data", "Phase Data", "CrystalStructures"),
-                                           simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Quats"))
-    if err < 0:
-        print("NeighborOrientationCorrelation ErrorCondition %d" % err)
-
-    # EBSD Segment Features (Misorientation)
-    err = reconstructionpy.ebsd_segment_features(dca, "CellFeatureData", 2,
-                                                 True,
-                                                 simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Mask"),
-                                                 simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Phases"),
-                                                 simpl.DataArrayPath("AlMgSc Data", "Phase Data", "CrystalStructures"),
-                                                 simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Quats"),
-                                                 "FeatureIds",
-                                                 "Active")
-    if err < 0:
-        print("EbsdSegmentFeatures ErrorCondition %d" % err)
-
-    # Erode Bad Data
-    err = processingpy.erode_dilate_bad_data(dca, sc.BadDataOperation.Erode, 3, True, True, True,
-                                           simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "FeatureIds"))
-    if err < 0:
-        print("ErodeDilateBadData ErrorCondition %d" % err)
-
-    # Steiner Compact
-
-    # The following 'enums' need binded
-    # Section Plane options --> [0 : XY] , [1 : XZ], [2 : YZ]
-    # Number of Sites options --> [0 : 8] , [1 : 12], [2 : 16], [3 : 24], [4 : 36]
-    err = anisotropypy.steiner_compact(dca, True, sd.GetBuildDirectory() + "/Debug/SteinerCompactXY.vtk",
-                          True, sd.GetBuildDirectory() + "/Debug/SteinerCompactXY.txt",
-                          simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "FeatureIds"),
-                          simpl.DataArrayPath("AlMgSc Data", "EBSD SEM Scan Data", "Phases"),
-                          0, 1)
-    if err < 0:
-        print("SteinerCompact ErrorCondition %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    adaptive_alignment()
-
-
diff --git a/Wrapping/Python/Examples/ColorData_Change.ipynb b/Wrapping/Python/Examples/ColorData_Change.ipynb
deleted file mode 100644
index d22ffdb4c3..0000000000
--- a/Wrapping/Python/Examples/ColorData_Change.ipynb
+++ /dev/null
@@ -1,281 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "# Changing the IPFColor data in an existing DREAM3D data file"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Import necessary modules and submodules"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 0,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from dream3d import simplpy\n",
-    "from dream3d import simpl\n",
-    "from dream3d import simpl_helpers as sc\n",
-    "from dream3d import simpl_test_dirs as sd\n",
-    "\n",
-    "# Numpy for some data management assistance\n",
-    "import numpy as np\n",
-    "import datetime as datetime"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    " Create Data Container Array"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 2,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "dca = simpl.DataContainerArray.New()"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Build the DataContainerArrayProxy object to select data arrays to read"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 3,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "dcap = simpl.DataContainerArrayProxy()\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Confidence Index\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"CriticalField\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"EulerAngles\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"FeatureIds\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Fit\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"GBManhattanDistances\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"IPFColor\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Image Quality\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Mask\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"ParentIds\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Phases\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"QPManhattanDistances\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"Quats\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"SEM Signal\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"TJManhattanDistances\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"EBSD Scan Data\").getDataArrayProxy(\"IPFColor\").flag = 2\n",
-    "\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Phase Data\").getDataArrayProxy(\"CrystalStructures\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Phase Data\").getDataArrayProxy(\"LatticeConstants\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Phase Data\").getDataArrayProxy(\"MaterialName\").flag = 2\n",
-    "\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Active\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"AspectRatios\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"AvgEuler\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"AxisEulerAngles\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"AxisLengths\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Centroids\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"CriticalFields\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"EquivalentDiameters\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"NeighborList\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"NeighborhoodList\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Neighborhoods\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"NumElements\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"NumNeighbors\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"NumNeighbors2\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Omega3s\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"ParentIds\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Phases\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Shape Volumes\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"SharedSurfaceAreaList\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Size Volumes\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"Sphericity\").flag = 2\n",
-    "dcap.getDataContainerProxy(\"Small IN100\").getAttributeMatrixProxy(\"Grain Data\").getDataArrayProxy(\"SurfaceAreaVolumeRatio\").flag = 2"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Get the current time to use as a parameter to the Data Container Reader function"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "now_time = datetime.datetime.now()\n",
-    "now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second\n",
-    "dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Read the DREAM3D file by running the Data Container Reader filter / function"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 5,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "err = simplpy.data_container_reader(dca, sd.GetBuildDirectory() +\n",
-    "                                    \"/Debug/Data/Output/Synthetic/06_SmallIN100Synthetic.dream3d\",\n",
-    "                                    False, \"\", dt, dcap)\n",
-    "if err < 0:\n",
-    "    print(\"DataContainerReader ErrorCondition %d\" % err)"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Get the attribute matrix and then get the data array and component dimensions"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 6,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "am = dca.getAttributeMatrix(simpl.DataArrayPath(\"Small IN100\", \"EBSD Scan Data\", \"\"))\n",
-    "data_array = am.getAttributeArray(\"IPFColor\")\n",
-    "comp_dims = data_array.getComponentDimensions()\n",
-    "data = data_array.Data"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Create a numpy array from the existing IPFColor data"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "np_array = np.asanyarray(data).reshape(data_array.getNumberOfTuples(), data_array.getNumberOfComponents())"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Iterate over the array and alter the color values"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 8,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "for row in np_array:\n",
-    "    if row[0] > 0:\n",
-    "        row[0] = row[0] / 2\n",
-    "    else:\n",
-    "        row[0] = 255\n",
-    "    row[1] = 128\n",
-    "    row[2] = 0"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Convert the numpy array into a Data Array and replace the IPFColor array in the attribute matrix"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 9,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/plain": [
-       "0"
-      ]
-     },
-     "execution_count": 9,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "newdata = sc.ConvertToDataArray(\"IPFColor\", np_array, comp_dims[0])\n",
-    "sc.RemoveArray(dca, [\"Small IN100\", \"EBSD Scan Data\", \"IPFColor\"])\n",
-    "am.addAttributeArray(\"IPFColor\", newdata[1])"
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "metadata": {},
-   "source": [
-    "Write to DREAM3D File"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 10,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "err = sc.WriteDREAM3DFile(\"06_SmallIN100Synthetic_ColorChanged.dream3d\", dca)\n",
-    "if err < 0:\n",
-    "    print(\"WriteDREAM3DFile ErrorCondition: %d\" % err)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python 3",
-   "language": "python",
-   "name": "python3"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.6.5"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}
diff --git a/Wrapping/Python/Examples/ColorData_Change_Test.py b/Wrapping/Python/Examples/ColorData_Change_Test.py
deleted file mode 100644
index 2b34ce716c..0000000000
--- a/Wrapping/Python/Examples/ColorData_Change_Test.py
+++ /dev/null
@@ -1,118 +0,0 @@
-"""
-
-Pipeline example based on Small IN100 Synthetic where IPF Color values are changed
-using Numpy and re-added to the attribute matrix
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-# Numpy for some data management assistance
-import numpy as np
-import datetime as datetime
-
-
-def color_data_change_test():
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("TJManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy("IPFColor").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy("CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy("LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy("MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("SurfaceAreaVolumeRatio").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Synthetic/06_SmallIN100Synthetic.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-        print("Exiting...")
-        return
-
-    # Change the color data
-    am = dca.getAttributeMatrix(simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""))
-    data_array = am.getAttributeArray("IPFColor")
-    comp_dims = data_array.getComponentDimensions()
-    data = data_array.Data
-
-    # Zero array
-    # np_array = np.zeros_like(data).astype('uint8').reshape(dataArray.getNumberOfTuples(),
-    # dataArray.getNumberOfComponents())
-
-    # Unchanged array
-    np_array = np.asanyarray(data).reshape(data_array.getNumberOfTuples(), data_array.getNumberOfComponents())
-    for row in np_array:
-        if row[0] > 0:
-            row[0] = row[0] / 2
-        else:
-            row[0] = 255
-        row[1] = 128
-        row[2] = 0
-    newdata = sc.ConvertToDataArray("IPFColor", np_array, comp_dims[0])
-    sc.RemoveArray(dca, ["Small IN100", "EBSD Scan Data", "IPFColor"])
-    am.addAttributeArray("IPFColor", newdata[1])
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/Synthetic/06_SmallIN100Synthetic_ColorChanged.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    color_data_change_test()
-
-
diff --git a/Wrapping/Python/Examples/Confidence_Index_Histogram.py b/Wrapping/Python/Examples/Confidence_Index_Histogram.py
deleted file mode 100644
index f40b3fbb4c..0000000000
--- a/Wrapping/Python/Examples/Confidence_Index_Histogram.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# Based on Confidence Index Histogram example
-# 
-
-# These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import statisticspy
-from dream3d import samplingpy
-
-
-def confidence_index_histogram_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # ReadAngData
-    err = orientationanalysispy.read_ang_data(dca, "Small IN100 Slice 1", "Phase Data", "EBSD Scan Data",
-                                              False, sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    err = orientationanalysispy.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                       simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                           "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    # Create the selected thresholds / comparison inputs for MultiThresholdObjects filter
-    selected_thresholds = simpl.ComparisonInputs()
-    selected_thresholds.addInput("Small IN100 Slice 1", "EBSD Scan Data", "Confidence Index", 0, 0)
-
-    err = sc.MultiThresholdObjects(dca, "Mask", [("Small IN100 Slice 1", "EBSD Scan Data", "Confidence Index", "<", 0)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Replace Value in Array (Conditional)
-    err = simplpy.conditional_set_value(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                 "Confidence Index"),
-                                        simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Mask"), 0)
-    if err < 0:
-        print("ConditionalSetValue ErrorCondition: %d" % err)
-
-    # Calculate Frequency Histogram
-    err = statisticspy.calculate_array_histogram(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                          "Confidence Index"),
-                                                 50, 0, 1, False, 0, "Histograms", "CI_Histogram", False, "")
-    if err < 0:
-        print("CalculatArrayHistogram ErrorCondition: %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("Small IN100 Slice 1", "Histograms", "CI_Histogram")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Debug/Data/Output/Histograms", 0, ".csv", 1)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    confidence_index_histogram_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Append_Z_Slice.py b/Wrapping/Python/Examples/Core Filters/Append_Z_Slice.py
deleted file mode 100644
index 0d09390f42..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Append_Z_Slice.py	
+++ /dev/null
@@ -1,61 +0,0 @@
-# Based on Image Initial Visualization example
-# Tests the Append Z Slice filter
-# These are the simpl_py python modules
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-from dream3d import samplingpy
-
-
-def append_z_slice():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Register the ImageIO Factories
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-
-    # Import Image Stack [ITK]
-    file_list_info = simpl.FileListInfo(2, 0, 11, 174, 1, sd.GetBuildDirectory() + "/Debug/Data/Image",
-                                        "slice_", "", "tif")
-    err = itkimageprocessingpy.itk_import_image_stack(dca, "RoboMet.3D Image Stack", "Optical Data",
-                                                      simpl.FloatVec3(0, 0, 0), simpl.FloatVec3(1, 1, 1),
-                                                      "", file_list_info, 164, "ImageData")
-    if err < 0:
-        print("ITK Import Image Stack ErrorCondition %d" % err)
-
-    # Append Image Geometry Z Slice #1
-    err = samplingpy.append_image_geometry_z_slice(dca,
-                                                   simpl.DataArrayPath("RoboMet.3D Image Stack",
-                                                                       "Optical Data", ""),
-                                                   simpl.DataArrayPath("RoboMet.3D Image Stack",
-                                                                       "Optical Data", ""), False)
-    if err < 0:
-        print("AppendImageGeometryZSlice #1 ErrorCondition: %d" % err)
-
-    # Append Image Geometry Z Slice #2
-    err = samplingpy.append_image_geometry_z_slice(dca,
-                                                   simpl.DataArrayPath("RoboMet.3D Image Stack",
-                                                                       "Optical Data", ""),
-                                                   simpl.DataArrayPath("RoboMet.3D Image Stack",
-                                                                       "Optical Data", ""), False)
-    if err < 0:
-        print("AppendImageGeometryZSlice #2 ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/CoreFilterTests/" + 
-                              "AppendImageGeometryZSlice.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    append_z_slice()
\ No newline at end of file
diff --git a/Wrapping/Python/Examples/Core Filters/Array_Calculator_Test.py b/Wrapping/Python/Examples/Core Filters/Array_Calculator_Test.py
deleted file mode 100644
index b4764deae4..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Array_Calculator_Test.py	
+++ /dev/null
@@ -1,148 +0,0 @@
-# Pipeline : Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# This pipeline is designed to test the Attribute Array Calculator filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def array_calculator_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-    
-    # Test: Attribute Array Calculator
-    err = simplpy.array_calculator(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""), 
-                                   "IPFColor*3.1415927*100", simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Output"),
-                                   simpl.AngleUnits.Radians, simpl.ScalarTypes.UInt32)
-    if err < 0:
-        print("ArrayCalculator ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Debug/Data/Output/CoreFilterTests/SmallIN100_ArrayCalculator.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    array_calculator_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Examples/Core Filters/Convert_Attribute_Array_Data_Type.py
deleted file mode 100644
index 683aa8fefe..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Convert_Attribute_Array_Data_Type.py	
+++ /dev/null
@@ -1,147 +0,0 @@
-# Pipeline : Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# This pipeline is designed to test the Convert Data filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def convert_data_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-    
-    # Test: Convert AttributeArray Data Type
-    err = simplpy.convert_data(dca, simpl.NumericTypes.UInt8, "IPFColor_uint8",
-                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "IPFColor"))
-    if err < 0:
-        print("ConvertData ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Debug/Data/Output/CoreFilterTests/SmallIN100_ConvertData.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    convert_data_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Copy_Object_Test.py b/Wrapping/Python/Examples/Core Filters/Copy_Object_Test.py
deleted file mode 100644
index 5dac9e82f8..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Copy_Object_Test.py	
+++ /dev/null
@@ -1,149 +0,0 @@
-# Pipeline : Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# This pipeline is designed to test the Copy Object filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def copy_object_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-    
-    # Test: Copy Object
-    err = simplpy.copy_object(dca, sc.ObjectToCopy.AttributeArray, "", 
-                              simpl.DataArrayPath("", "", ""),
-                              simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "IPFColor"),
-                              "IPFColor_Copy")
-    if err < 0:
-        print("ConvertData ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Debug/Data/Output/CoreFilterTests/SmallIN100_CopyObject.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    copy_object_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Create_Feature_Array_From_Element_Array.py b/Wrapping/Python/Examples/Core Filters/Create_Feature_Array_From_Element_Array.py
deleted file mode 100644
index 6755e77c25..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Create_Feature_Array_From_Element_Array.py	
+++ /dev/null
@@ -1,155 +0,0 @@
-# Pipeline : Create Feature Array From Element Array Filter Test
-# Based on (01) SmallIN100 Morphological Statistics (from EBSD Statistics)
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-
-import datetime as datetime
-
-
-def create_feature_array_from_element_array_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Reconstruction/SmallIN100_Final.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Centroids
-    err = generic.find_feature_centroids(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                         simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                "Size Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Shapes
-    err = statistics.find_shapes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                 simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                 "Omega3s", "Shape Volumes", "AxisLengths", "AxisEulerAngles", "AspectRatios")
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors", "", False, False)
-    if err < 0:
-        print("FindNeighbors ErrorCondition %d" % err)
-
-    # Find Feature Neighborhoods
-    err = statistics.find_neighborhoods(dca, "NeighborhoodList", 1,
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "EquivalentDiameters"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                        "Neighborhoods")
-    if err < 0:
-        print("FindNeighborhoods ErrorCondition %d" % err)
-
-    # Find Euclidean Distance Map
-    err = statistics.find_euclidean_dist_map(dca,
-                                             simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                             "GBManhattanDistances", "TJManhattanDistances", "QPManhattanDistances",
-                                             "NearestNeighbors", True, True, True, False, True)
-    if err < 0:
-        print("FindEuclideanDistanceMap ErrorCondition %d" % err)
-
-    # Find Surface Area to Volume and Sphericity
-    err = statistics.find_surface_area_to_volume(dca,
-                                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                 simpl.DataArrayPath("Small IN100", "Grain Data", "NumElements"),
-                                                 "SurfaceAreaVolumeRatio", "Sphericity", True)
-    if err < 0:
-        print("FindSurfaceAreaToVolume ErrorCondition %d" % err)
-
-    # Create Feature Array From Element Array
-    err = simplpy.create_feature_array_from_element_array(dca,
-                                                          simpl.DataArrayPath("Small IN100",
-                                                                              "Grain Data", ""),
-                                                          simpl.DataArrayPath("Small IN100",
-                                                                              "EBSD Scan Data",
-                                                                              "IPFColor"),
-                                                          "IPFColorCopied",
-                                                          simpl.DataArrayPath("Small IN100",
-                                                                              "EBSD Scan Data",
-                                                                              "FeatureIds"))
-    if err < 0:
-        print("CreateFeatureArrayFromElementArray ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/CoreFilterTests/" + 
-                              "CreateFeatureFromElementArray.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    create_feature_array_from_element_array_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Import_Ascii_Data_Array.py b/Wrapping/Python/Examples/Core Filters/Import_Ascii_Data_Array.py
deleted file mode 100644
index edf407054a..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Import_Ascii_Data_Array.py	
+++ /dev/null
@@ -1,52 +0,0 @@
-# Pipeline: Import Ascii Data Array Test
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-
-def import_ascii_array_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix
-    # Using helper function
-    dynamic_table_data = sc.CreateDynamicTableData([[5, 5, 1]], ["0", "1", "2"], ["1"])
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("DataContainer",
-                                                                   "AttributeMatrix", ""),
-                                          simpl.AttributeMatrix.Type.Vertex, dynamic_table_data)
-    if err < 0:
-        print("CreateAttributeMatrix ErrorCondition: %d" % err)
-
-    # Import ASCII Data Attribute Array
-    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath("DataContainer", "AttributeMatrix",
-                                                                  "AsciiData"),
-                                         simpl.NumericTypes.Int32, 2, 0,
-                                         sd.GetBuildDirectory() + "/Debug/Data/ascii_sample.csv",
-                                         simpl.DelimiterTypes.Space)
-    if err < 0:
-        print("ImportAsciiDataArray ErrorCondition: %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "AttributeMatrix",
-                                                     "AsciiData")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Debug/Data/Output",
-                                   simpl.DelimiterTypes.Comma, ".csv", 10)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    import_ascii_array_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Import_Hdf5_Dataset.py b/Wrapping/Python/Examples/Core Filters/Import_Hdf5_Dataset.py
deleted file mode 100644
index ce943a2b7c..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Import_Hdf5_Dataset.py	
+++ /dev/null
@@ -1,51 +0,0 @@
-# Pipeline: Import Hdf5 Data Array Test
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-
-def import_hdf5_dataset_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix
-    # Using helper function
-    dynamic_table_data = sc.CreateDynamicTableData([[8, 8, 1]], ["0", "1", "2"], ["1"])
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("DataContainer",
-                                                                   "AttributeMatrix", ""),
-                                          simpl.AttributeMatrix.Type.Vertex, dynamic_table_data)
-    if err < 0:
-        print("CreateAttributeMatrix ErrorCondition: %d" % err)
-
-    # Import HDF5 Dataset
-    dataset_import_info_list = simpl.DatasetImportInfoList([["/DummyDBL", "1, 1"]])
-    err = simplpy.import_hdf5_dataset(dca, sd.GetBuildDirectory() + "/Debug/Data/packedbits.h5",
-                                      dataset_import_info_list,
-                                      simpl.DataArrayPath("DataContainer", "AttributeMatrix", ""))
-    if err < 0:
-        print("ImportHdf5Dataset ErrorCondition: %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "AttributeMatrix",
-                                                     "DummyDBL")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Debug/Data/Output",
-                                   simpl.DelimiterTypes.Comma, ".csv", 10)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    import_hdf5_dataset_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Link_Feature_Attribute_Matrix_To_Element_Array.py b/Wrapping/Python/Examples/Core Filters/Link_Feature_Attribute_Matrix_To_Element_Array.py
deleted file mode 100644
index a737dbfd88..0000000000
--- a/Wrapping/Python/Examples/Core Filters/Link_Feature_Attribute_Matrix_To_Element_Array.py	
+++ /dev/null
@@ -1,150 +0,0 @@
-# Pipeline : Link Feature Attribute Matrix to Element Attribute Array Filter Test
-# Based on (01) SmallIN100 Morphological Statistics (from EBSD Statistics)
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-
-import datetime as datetime
-
-
-def link_feature_map_to_element_array_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Reconstruction/SmallIN100_Final.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Centroids
-    err = generic.find_feature_centroids(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                         simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                "Size Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Shapes
-    err = statistics.find_shapes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                 simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                 "Omega3s", "Shape Volumes", "AxisLengths", "AxisEulerAngles", "AspectRatios")
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors", "", False, False)
-    if err < 0:
-        print("FindNeighbors ErrorCondition %d" % err)
-
-    # Find Feature Neighborhoods
-    err = statistics.find_neighborhoods(dca, "NeighborhoodList", 1,
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "EquivalentDiameters"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                        "Neighborhoods")
-    if err < 0:
-        print("FindNeighborhoods ErrorCondition %d" % err)
-
-    # Find Euclidean Distance Map
-    err = statistics.find_euclidean_dist_map(dca,
-                                             simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                             "GBManhattanDistances", "TJManhattanDistances", "QPManhattanDistances",
-                                             "NearestNeighbors", True, True, True, False, True)
-    if err < 0:
-        print("FindEuclideanDistanceMap ErrorCondition %d" % err)
-
-    # Find Surface Area to Volume and Sphericity
-    err = statistics.find_surface_area_to_volume(dca,
-                                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                 simpl.DataArrayPath("Small IN100", "Grain Data", "NumElements"),
-                                                 "SurfaceAreaVolumeRatio", "Sphericity", True)
-    if err < 0:
-        print("FindSurfaceAreaToVolume ErrorCondition %d" % err)
-
-    # Link Feature Attribute Matrix to Element Attribute Array 
-    err = simplpy.link_feature_map_to_element_array(dca, "FeatureAttributeMatrix",
-                                                    simpl.DataArrayPath("Small IN100", 
-                                                                        "EBSD Scan Data",
-                                                                        "FeatureIds"),
-                                                    "Active")
-    if err < 0:
-        print("LinkFeatureMapToElementArray ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/CoreFilterTests/" + 
-                              "LinkFeatureMapToElementArray.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    link_feature_map_to_element_array_test()
diff --git a/Wrapping/Python/Examples/Create_Lambert_Sphere_Surface.py b/Wrapping/Python/Examples/Create_Lambert_Sphere_Surface.py
deleted file mode 100644
index 017b9bac79..0000000000
--- a/Wrapping/Python/Examples/Create_Lambert_Sphere_Surface.py
+++ /dev/null
@@ -1,154 +0,0 @@
-import time
-
-# Based on CreateLambertSphereSurface pipeline example
-# Creates a LambertSphereSurface using Python/C++ bindings
-#
-# There are 2 options. Run using the pipeline and building the filters non-pythonic
-# The other option is to "build" the pipeline effect through pythonic API and
-# executing each filter upon creation. The choice can be selected by changing the value of runPipeline
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-
-
-def create_lambert_sphere_test():
-    run_pipeline = False
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-    if run_pipeline:
-        run_pipeline_test(dca)
-    else:
-        run_pythonic_test(dca)
-
-
-def run_pipeline_test(dca):
-    # Create Data Container
-    data_container = simpl.CreateDataContainer.New()
-    data_container.setDataContainerArray(dca)
-    data_container.DataContainerName = "ImageDataContainer"
-
-    # Create Geometry (Image)
-    image_geom = simpl.CreateImageGeometry.New()
-    image_geom.setDataContainerArray(dca)
-    image_geom.SelectedDataContainer = "ImageDataContainer"
-    image_geom.Dimensions = simpl.IntVec3(101, 101, 1)
-    image_geom.Origin = simpl.FloatVec3(0, 0, 0)
-    image_geom.Resolution = simpl.FloatVec3(1, 1, 1)
-
-    # Create Attribute Matrix
-    attribute_matrix = simpl.CreateAttributeMatrix.New()
-    attribute_matrix.setDataContainerArray(dca)
-    attribute_matrix.AttributeMatrixType = 3
-    new_row = simpl.VectorDouble()
-    new_row.append(101)
-    new_row.append(101)
-    new_row.append(1)
-    table_data = list()
-    table_data.append(new_row)
-    attribute_matrix.TupleDimensions = simpl.DynamicTableData(table_data, ["0", "1", "2"], ["0"])
-    attribute_matrix.CreatedAttributeMatrix = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
-
-    # Create Data Array
-    data_array = simpl.CreateDataArray.New()
-    data_array.setDataContainerArray(dca)
-    data_array.ScalarType = simpl.ScalarTypes.UInt8
-    data_array.NumberOfComponents = 1
-    data_array.InitializationType = 0
-    data_array.InitializationValue = "128"
-    data_array.NewArray = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "ScalarValues")
-
-    # Create Sphere (Lambert Projection)
-    # Note: "Checkboxes" default to true
-    create_lambert_sphere = orientationanalysis.CreateLambertSphere.New()
-    create_lambert_sphere.setDataContainerArray(dca)
-    create_lambert_sphere.Hemisphere = 0
-    create_lambert_sphere.ImageDataArrayPath = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix",
-                                                                 "ScalarValues")
-    create_lambert_sphere.VertexDataContainerName = "VertexDataContainer"
-    create_lambert_sphere.EdgeDataContainerName = "EdgeDataContainer"
-    create_lambert_sphere.TriangleDataContainerName = "TriangleDataContainer"
-    create_lambert_sphere.QuadDataContainerName = "QuadDataContainer"
-
-    # Write DREAM.3D Data File
-    data_container_writer = simpl.DataContainerWriter.New()
-    data_container_writer.setDataContainerArray(dca)
-    data_container_writer.OutputFile = sd.GetTestTempDirectory() + "/LambertSphere.dream3d"
-    data_container_writer.WriteXdmfFile = True
-    data_container_writer.WriteTimeSeries = False
-
-    # Create  Pipeline
-    pipeline = simpl.FilterPipeline.New()
-    pipeline.Name = "New Pipeline"
-
-    # Add filters (order is important)
-    pipeline.pushBack(data_container)
-    pipeline.pushBack(image_geom)
-    pipeline.pushBack(attribute_matrix)
-    pipeline.pushBack(data_array)
-    pipeline.pushBack(create_lambert_sphere)
-    pipeline.pushBack(data_container_writer)
-
-    err = pipeline.preflightPipeline()
-    if err < 0:
-        print("Preflight ErrorCondition: %d" % err)
-
-    pipeline.run()
-    err = pipeline.ErrorCondition
-    if err < 0:
-        print("Execute ErrorCondition: %d" % err)
-
-    time.sleep(2)
-
-
-def run_pythonic_test(dca):
-    err = simplpy.create_data_container(dca, "ImageDataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    err = simplpy.create_image_geometry(dca, "ImageDataContainer", simpl.IntVec3(101, 101, 1), simpl.FloatVec3(0, 0, 0),
-                                        simpl.FloatVec3(1, 1, 1))
-    if err < 0:
-        print("ImageGeometry ErrorCondition: %d" % err)
-
-    new_row = simpl.VectorDouble()
-    new_row.append(101)
-    new_row.append(101)
-    new_row.append(1)
-    table_data = list()
-    table_data.append(new_row)
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", ""), 3,
-                                          simpl.DynamicTableData(table_data, ["0", "1", "2"], ["0"]))
-    if err < 0:
-        print("AttributeMatrix ErrorCondition: %d" % err)
-
-    err = simplpy.create_data_array(dca, simpl.ScalarTypes.UInt8, 1,
-                                    simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "ScalarValues"),
-                                    simpl.InitializationType.Manual, "128", (0.0, 151.1))
-    if err < 0:
-        print("DataArray ErrorCondition: %d" % err)
-
-    err = orientationanalysis.create_lambert_sphere(dca, sc.Hemisphere.Northern,
-                                                    simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix",
-                                                                        "ScalarValues"),
-                                                    "QuadDataContainer", "TriangleDataContainer", "EdgeDataContainer",
-                                                    "VertexDataContainer", "VertexAttributeMatrix",
-                                                    "EdgeAttributeMatrix", "FaceAttributeMatrix",
-                                                    True, True, True, True)
-    if err < 0:
-        print("LambertSphere ErrorCondition: %d" % err)
-    err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + "/LambertSphere.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    create_lambert_sphere_test()
-    print("Test Complete")
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Apply_Transformation_To_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Apply_Transformation_To_Geometry.py
deleted file mode 100644
index 5685d49de3..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Apply_Transformation_To_Geometry.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the Apply Transformation To Geometry filter
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def apply_transform_to_geom():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # Apply Transformation to Geometry - Scale in Z direction
-    transformation_matrix = sc.CreateDynamicTableData([[1, 0, 0, 0],
-                                                       [0, 1, 0, 0],
-                                                       [0, 0, 1, 0],
-                                                       [0, 0, 0, 1]])
-    err = dream3dreviewpy.apply_transformation_to_geometry(dca, transformation_matrix,
-                                                           simpl.DataArrayPath("", "", ""),
-                                                           "DataContainer",
-                                                           5, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           0, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           simpl.FloatVec3(1.0, 1.0, 2.5))
-    if err < 0:
-        print("ApplyTransformationToGeometry -  ErrorCondition: %d" % err)
-
-    # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "ApplyTransformationToGeometry.dream3d",
-                                        True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    apply_transform_to_geom()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Average_EdgeFaceCell_Array_To_Vertex_Array.py b/Wrapping/Python/Examples/DREAM3DReview/Average_EdgeFaceCell_Array_To_Vertex_Array.py
deleted file mode 100644
index c7e5359270..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Average_EdgeFaceCell_Array_To_Vertex_Array.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the Average Edge/Face/Cell Array to Vertex Array filter
-
-# These are the simpl_py python modules
-
-import datetime
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-from dream3d import surfacemeshingpy
-from dream3d import orientationanalysispy
-
-
-def average_vertex_value_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Average Edge/Face/Cell Array to Vertex Array
-    err = dream3dreviewpy.average_edge_face_cell_array_to_vertex_array(dca,
-                                                                       simpl.DataArrayPath("TriangleDataContainer",
-                                                                                           "FaceData", "FaceAreas"),
-                                                                       simpl.DataArrayPath("TriangleDataContainer",
-                                                                                           "VertexData",
-                                                                                           "AverageValue"))
-    if err < 0:
-        print("AverageEdgeFaceCellArrayToVertexArray ErrorCondition %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "AverageVertexValue.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    average_vertex_value_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Average_Vertex_Array_To_EdgeFaceCell_Array.py b/Wrapping/Python/Examples/DREAM3DReview/Average_Vertex_Array_To_EdgeFaceCell_Array.py
deleted file mode 100644
index f0fc2266cf..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Average_Vertex_Array_To_EdgeFaceCell_Array.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the Average Vertex Array to Edge/Face/Cell Array filter
-
-# These are the simpl_py python modules
-
-import datetime
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-from dream3d import surfacemeshingpy
-from dream3d import orientationanalysispy
-
-
-def average_face_value_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Average Vertex Array to Edge/Face/Cell Array
-    err = dream3dreviewpy.average_vertex_array_to_edge_face_cell_array(dca,
-                                                                       simpl.DataArrayPath("TriangleDataContainer",
-                                                                                           "VertexData", "NodeType"),
-                                                                       simpl.DataArrayPath("TriangleDataContainer",
-                                                                                           "FaceData",
-                                                                                           "AverageFaceValue"), False)
-    if err < 0:
-        print("AverageEdgeFaceCellArrayToVertexArray ErrorCondition %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "AverageFaceValue.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    average_face_value_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Compute_Umeyama_Transform.py b/Wrapping/Python/Examples/DREAM3DReview/Compute_Umeyama_Transform.py
deleted file mode 100644
index d2060ff126..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Compute_Umeyama_Transform.py
+++ /dev/null
@@ -1,165 +0,0 @@
-# Based on CreateQuadGeometry example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import ucsbutilitiespy
-from dream3d import dream3dreviewpy
-
-
-def compute_umeyama_transform_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # Copy Data Container
-    err = ucsbutilitiespy.copy_data_container(dca, "DataContainer", "MovingDataContainer")
-    if err < 0:
-        print("CopyDataContainer -  ErrorCondition: %d" % err)
-
-    # Apply Transformation to Geometry - Rotate around Y axis, scale in Y axis and translate +2 in Z axis
-    transformation_matrix = sc.CreateDynamicTableData([[0.707, 0, 0.707, 0],
-                                                       [0, 2.5, 0, 0],
-                                                       [-0.707, 0, 0.707, 2],
-                                                       [0, 0, 0, 1]])
-    err = dream3dreviewpy.apply_transformation_to_geometry(dca, transformation_matrix,
-                                                           simpl.DataArrayPath("", "", ""),
-                                                           "DataContainer",
-                                                           2, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           0, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           simpl.FloatVec3(0.0, 0.0, 0.0))
-    if err < 0:
-        print("ApplyTransformationToGeometry #1 -  ErrorCondition: %d" % err)
-
-    # Compute Umeyama Transform
-    err = dream3dreviewpy.compute_umeyama_transform(dca, "MovingDataContainer", "DataContainer",
-                                                    False, "TransformationData",
-                                                    "TransformationMatrix")
-    if err < 0:
-        print("ComputeUmeyamaTransform -  ErrorCondition: %d" % err)
-
-    # Apply Transformation to Geometry - Scale in Z direction
-    transformation_matrix = sc.CreateDynamicTableData([[1, 0, 0, 0],
-                                                       [0, 1, 0, 0],
-                                                       [0, 0, 1, 0],
-                                                       [0, 0, 0, 1]])
-    err = dream3dreviewpy.apply_transformation_to_geometry(dca, transformation_matrix,
-                                                           simpl.DataArrayPath("MovingDataContainer",
-                                                                               "TransformationData",
-                                                                               "TransformationMatrix"),
-                                                           "DataContainer",
-                                                           1, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           0, simpl.FloatVec3(0.0, 0.0, 0.0),
-                                                           simpl.FloatVec3(0.0, 0.0, 0.0))
-    if err < 0:
-        print("ApplyTransformationToGeometry #2 -  ErrorCondition: %d" % err)
-
-    # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "ComputeUmeyamaTransform.dream3d",
-                                        True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    compute_umeyama_transform_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Create_Edge_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Create_Edge_Geometry.py
deleted file mode 100644
index 779d7dc9fc..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Create_Edge_Geometry.py
+++ /dev/null
@@ -1,97 +0,0 @@
-
-import time
-
-# Based on CreateEdgeGeometry example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-def CreateEdgeGeometryTest():
-  # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
-
-  # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
-  if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
-
-  # Import ASCII Data - #1 - Vertex Coordinates (Using helper function)
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-
-  err = d3d.read_ascii_data(dca, sc.CreateAsciiWizardData(importFile, 2, 145, [','], False, True, 
-  simpl.DataArrayPath("DataContainer", "Bounds", ""), ["x", "y", "z"], 3,
-  [144], ["float", "float", "float"]))
-  if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-  
-
-  # Import ASCII Data - #2 - Edge Connectivity (Without using helper function)
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/EdgeConnectivity.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 265,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "EdgeList", ""),
-    "headers": ["V1", "V0"],
-    "attrMatType": 3,
-    "tupleDimensions": [264],
-    "dataTypes": ["int64_t", "int64_t"]
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
-  if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 1
-  # Remove array helper function:
-  err = sc.RemoveArrays(dca, [("DataContainer", "Bounds", "x"), ("DataContainer", "Bounds", "y"), ("DataContainer", "Bounds", "z")])
-  if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "EdgeList", "V0"), 
-  simpl.DataArrayPath("DataContainer", "EdgeList", "V1")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Edges", False)
-  if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 2
-  # Remove array helper function:
-  err = sc.RemoveArrays(dca, [("DataContainer", "EdgeList", "V0"), ("DataContainer", "EdgeList", "V1")])
-  if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Create Geometry
-  err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_edge_list_array_path = simpl.DataArrayPath("DataContainer", "EdgeList", "Edges"),
-  vertex_attribute_matrix_name = "VertexData",
-  edge_attribute_matrix_name = "EdgeData")
-  if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
-
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateEdgeGeometry.dream3d", True, False)
-  if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  #help(simpl.ImageGeom)
-  CreateEdgeGeometryTest()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Create_Quad_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Create_Quad_Geometry.py
deleted file mode 100644
index 78175194ac..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Create_Quad_Geometry.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# Based on CreateQuadGeometry example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-def CreateQuadGeometryTest():
-  # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
-
-  # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
-  if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
-
-  # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-  
-
-  # Import ASCII Data - #2 - Edge Connectivity
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 122,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-    "headers": ["V0", "V1", "V2", "V3"],
-    "attrMatType": 3,
-    "tupleDimensions": [121],
-    "dataTypes": ["int64_t", "int64_t","int64_t", "int64_t"]
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
-  if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 1
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"), 
-  simpl.DataArrayPath("DataContainer", "QuadList", "V1"), simpl.DataArrayPath("DataContainer", "QuadList", "V2"), 
-  simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Quads", False)
-  if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 2
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_quad_list_array_path = simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-  vertex_attribute_matrix_name = "VertexData",
-  face_attribute_matrix_name = "FaceData")
-  if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
-
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateQuadGeometry.dream3d", True, False)
-  if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  CreateQuadGeometryTest()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Create_RectilinearGrid.py b/Wrapping/Python/Examples/DREAM3DReview/Create_RectilinearGrid.py
deleted file mode 100644
index 9d722e3e9d..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Create_RectilinearGrid.py
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# Based on CreateRectilinearGrid example
-# 
-
-# As of 9-13-18, this example will not work as the input file is not available
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-def CreateRectilinearGridTest():
-  # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
-
-  # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
-  if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
-
-  # Import ASCII Data - Rectilinear Grid
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/RectilinearGrid.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 15,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [14],
-    "dataTypes": ["float", "float", "float"]
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-  
-  # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
-  x_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-  y_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-  z_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "z"),
-  face_attribute_matrix_name = "CellData")
-  if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
-
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateRectilinearGrid.dream3d", True, False)
-  if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  CreateRectilinearGridTest()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Create_Triangle_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Create_Triangle_Geometry.py
deleted file mode 100644
index c5988151e8..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Create_Triangle_Geometry.py
+++ /dev/null
@@ -1,111 +0,0 @@
-# Based on CreateTriangleGeometry example
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-def CreateTriangleGeometryTest():
-  # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
-
-  # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
-  if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
-
-  # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-  
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
-  if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 1
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Import ASCII Data - #2 - Triangle Connectivity
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/TriangleConnectivity.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 243,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Triangles", ""),
-    "headers": ["V0", "V1", "V2"],
-    "attrMatType": 3,
-    "tupleDimensions": [242],
-    "dataTypes": ["int64_t", "int64_t","int64_t"]
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Triangles", "V0"), 
-  simpl.DataArrayPath("DataContainer", "Triangles", "V1"), simpl.DataArrayPath("DataContainer", "Triangles", "V2")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Triangles", False)
-  if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 2
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-  # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_tri_list_array_path = simpl.DataArrayPath("DataContainer", "Triangles", "Triangles"),
-  vertex_attribute_matrix_name = "VertexData",
-  face_attribute_matrix_name = "FaceData")
-  if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
-
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateTriangleGeometry.dream3d", True, False)
-  if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  CreateTriangleGeometryTest()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Create_Vertex_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Create_Vertex_Geometry.py
deleted file mode 100644
index 8008bc3a8b..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Create_Vertex_Geometry.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Based on CreateVertexGeometry example
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-def CreateVertexGeometryTest():
-  # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
-
-  # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
-  if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
-
-  # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-  wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-  
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
-  if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Delete Data # 1
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-  # Create Geometry
-  data_container_name = "DataContainer"
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices")
-  vertex_attribute_matrix_name = "VertexData"
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  vertex_attribute_matrix_name = "VertexData")
-  if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
-
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateVertexGeometry.dream3d", True, False)
-  if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  CreateVertexGeometryTest()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/DBSCAN.py b/Wrapping/Python/Examples/DREAM3DReview/DBSCAN.py
deleted file mode 100644
index e1596731da..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/DBSCAN.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# Based on CreateQuadGeometry example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def dbscan_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # DBSCAN
-    err = dream3dreviewpy.dbscan(dca, simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                                 False, simpl.DataArrayPath("", "", ""), "ClusterIds", "ClusterData",
-                                 0.01, 50, 3)
-    if err < 0:
-        print("DBSCAN  ErrorCondition: %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "DBSCAN.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    dbscan_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Extract_Internal_Surfaces_From_Triangle_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Extract_Internal_Surfaces_From_Triangle_Geometry.py
deleted file mode 100644
index 242e6ea3de..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Extract_Internal_Surfaces_From_Triangle_Geometry.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# Pipeline : (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# Tests the Extract Internal Surfaces From Triangle Geometry filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import samplingpy as sampling
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def extract_internal_surfaces():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Crop Geometry (Image)
-    err = sampling.crop_image_geometry(dca, "",
-                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""),
-                                       simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                       41, 41, 0, 140, 140, 99, True, False, True,
-                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("CropImageGeometry ErrorCondition %d" % err)
-
-    # Quick Surface Mesh
-    err = surfacemeshingpy.quick_surface_mesh(dca,
-                                              [],
-                                              "TriangleDataContainer",
-                                              "VertexData",
-                                              "FaceData",
-                                              simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                              "FaceLabels",
-                                              "NodeType",
-                                              "FaceFeatureData")
-    if err < 0:
-        print("QuickSurfaceMesh ErrorCondition %d" % err)
-
-    # Extract Internal Surfaces From Triangle Geometry
-    err = dream3dreviewpy.extract_internal_surfaces_from_triangle_geometry(dca,
-                                                                           "TriangleDataContainer",
-                                                                           simpl.DataArrayPath(
-                                                                               "TriangleDataContainer",
-                                                                               "VertexData",
-                                                                               "NodeType"),
-                                                                           "InternalTrianglesDataContainer")
-    if err < 0:
-        print("ExtractInternalSurfacesFromTriangleGeometry ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/DREAM3DReview/" +
-                              "SmallIN100_WithInternalSurfaces.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    extract_internal_surfaces()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Find_Attribute_Array_Statistics.py b/Wrapping/Python/Examples/DREAM3DReview/Find_Attribute_Array_Statistics.py
deleted file mode 100644
index 0c1350a563..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Find_Attribute_Array_Statistics.py
+++ /dev/null
@@ -1,117 +0,0 @@
-import time
-
-# Based on CreateLambertSphereSurface pipeline example
-# Tests the Find Attribute Array Statistics filter
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import dream3dreviewpy
-
-
-def find_array_statistics_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create Data Container
-    err = simplpy.create_data_container(dca, "ImageDataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Create Image Geometry
-    err = simplpy.create_image_geometry(dca, "ImageDataContainer", simpl.IntVec3(101, 101, 1), simpl.FloatVec3(0, 0, 0),
-                                        simpl.FloatVec3(1, 1, 1))
-    if err < 0:
-        print("ImageGeometry ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix #1 for Lambert Sphere
-    new_row = simpl.VectorDouble()
-    new_row.append(101)
-    new_row.append(101)
-    new_row.append(1)
-    table_data = list()
-    table_data.append(new_row)
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", ""), 3,
-                                          simpl.DynamicTableData(table_data, ["0", "1", "2"], ["0"]))
-    if err < 0:
-        print("AttributeMatrix #1 ErrorCondition: %d" % err)
-
-    # Create Data Array
-    err = simplpy.create_data_array(dca, simpl.ScalarTypes.UInt8, 1,
-                                    simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "ScalarValues"),
-                                    simpl.InitializationType.Manual, "128", (0.0, 151.1))
-    if err < 0:
-        print("DataArray ErrorCondition: %d" % err)
-
-    # Create Lambert Sphere
-    err = orientationanalysispy.create_lambert_sphere(dca, sc.Hemisphere.Northern,
-                                                      simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix",
-                                                                          "ScalarValues"),
-                                                      "QuadDataContainer", "TriangleDataContainer", "EdgeDataContainer",
-                                                      "VertexDataContainer", "VertexAttributeMatrix",
-                                                      "EdgeAttributeMatrix", "FaceAttributeMatrix",
-                                                      True, True, True, True)
-    if err < 0:
-        print("LambertSphere ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix #2 for Statistics
-    new_row = simpl.VectorDouble()
-    new_row.append(1)
-    table_data = list()
-    table_data.append(new_row)
-    err = simplpy.create_attribute_matrix(dca,
-                                          simpl.DataArrayPath("QuadDataContainer", "StatisticsAttributeMatrix", ""),
-                                          simpl.AttributeMatrix.Type.Generic,
-                                          simpl.DynamicTableData(table_data, ["0"], ["0"]))
-    if err < 0:
-        print("AttributeMatrix #2 ErrorCondition: %d" % err)
-
-    # Find Attribute Array Statistics
-    err = dream3dreviewpy.find_array_statistics(dca, True, False, False, True, False, True, True,
-                                                False, False, False,
-                                                simpl.DataArrayPath("QuadDataContainer",
-                                                                    "StatisticsAttributeMatrix",
-                                                                    ""),
-                                                simpl.DataArrayPath("", "", ""), "Length", "", "",
-                                                "Mean", "", "StandardDeviation", "Summation", "",
-                                                simpl.DataArrayPath("QuadDataContainer", "FaceAttributeMatrix",
-                                                                    "Quad_ScalarValues"),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("FindArrayStatistics ErrorCondition: %d" % err)
-
-    # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/Statistics/FindArrayStats.dream3d", True,
-                                        False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("QuadDataContainer",
-                                                     "StatisticsAttributeMatrix",
-                                                     "Length"),
-                                 simpl.DataArrayPath("QuadDataContainer",
-                                                     "StatisticsAttributeMatrix",
-                                                     "Mean"),
-                                 simpl.DataArrayPath("QuadDataContainer",
-                                                     "StatisticsAttributeMatrix",
-                                                     "StandardDeviation"),
-                                 simpl.DataArrayPath("QuadDataContainer",
-                                                     "StatisticsAttributeMatrix",
-                                                     "Summation")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Debug/Data/Output/DREAM3DReview/Statistics",
-                                   simpl.DelimiterTypes.Comma, ".csv", 10)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    find_array_statistics_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Find_Element_Centroids.py b/Wrapping/Python/Examples/DREAM3DReview/Find_Element_Centroids.py
deleted file mode 100644
index ca0de3f0b7..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Find_Element_Centroids.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# Based on CreateLambertSphereSurface pipeline example
-# Tests the Find Element Centroids filter
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import dream3dreviewpy
-
-
-def find_element_centroids():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create Data Container
-    err = simplpy.create_data_container(dca, "ImageDataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Create Image Geometry
-    err = simplpy.create_image_geometry(dca, "ImageDataContainer", simpl.IntVec3(101, 101, 1), simpl.FloatVec3(0, 0, 0),
-                                        simpl.FloatVec3(1, 1, 1))
-    if err < 0:
-        print("ImageGeometry ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix
-    new_row = simpl.VectorDouble()
-    new_row.append(101)
-    new_row.append(101)
-    new_row.append(1)
-    table_data = list()
-    table_data.append(new_row)
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", ""), 3,
-                                          simpl.DynamicTableData(table_data, ["0", "1", "2"], ["0"]))
-    if err < 0:
-        print("AttributeMatrix ErrorCondition: %d" % err)
-
-    # Create Data Array
-    err = simplpy.create_data_array(dca, simpl.ScalarTypes.UInt8, 1,
-                                    simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "ScalarValues"),
-                                    simpl.InitializationType.Manual, "128", (0.0, 151.1))
-    if err < 0:
-        print("DataArray ErrorCondition: %d" % err)
-
-    # Create Lambert Sphere
-    err = orientationanalysispy.create_lambert_sphere(dca, sc.Hemisphere.Northern,
-                                                      simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix",
-                                                                          "ScalarValues"),
-                                                      "QuadDataContainer", "TriangleDataContainer", "EdgeDataContainer",
-                                                      "VertexDataContainer", "VertexAttributeMatrix",
-                                                      "EdgeAttributeMatrix", "FaceAttributeMatrix",
-                                                      True, True, True, True)
-    if err < 0:
-        print("LambertSphere ErrorCondition: %d" % err)
-
-    # Find Element Centroids
-    err = dream3dreviewpy.find_element_centroids(dca,
-                                                 simpl.DataArrayPath("EdgeDataContainer",
-                                                                     "EdgeAttributeMatrix", "Centroids"),
-                                                 False, "", "")
-    if err < 0:
-        print("FindElementCentroids ErrorCondition: %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "FindElementCentroid.dream3d",
-                                        True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    find_element_centroids()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Find_Norm.py b/Wrapping/Python/Examples/DREAM3DReview/Find_Norm.py
deleted file mode 100644
index 50db6c9c54..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Find_Norm.py
+++ /dev/null
@@ -1,127 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the Find Norm filter
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def find_norm_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # Find Norm
-    err = dream3dreviewpy.find_norm(dca, simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                                    simpl.DataArrayPath("DataContainer", "QuadList", "Norm"), 2)
-    if err < 0:
-        print("FindNorm -  ErrorCondition: %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/FindNorm.dream3d", True,
-                                        False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    find_norm_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/K Medoids.py b/Wrapping/Python/Examples/DREAM3DReview/K Medoids.py
deleted file mode 100644
index 3823dd2de1..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/K Medoids.py	
+++ /dev/null
@@ -1,128 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the K Medoids filter
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def k_medoids_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # K Medoids
-    err = dream3dreviewpy.k_medoids(dca, simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                                    False, simpl.DataArrayPath("", "", ""), "ClusterIds", "ClusterMedoids",
-                                    "ClusterData", 7, 3)
-    if err < 0:
-        print("KMedoids  ErrorCondition: %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "KMedoids.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    k_medoids_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/K_Distance_Graph.py b/Wrapping/Python/Examples/DREAM3DReview/K_Distance_Graph.py
deleted file mode 100644
index c0f991316c..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/K_Distance_Graph.py
+++ /dev/null
@@ -1,130 +0,0 @@
-# Based on CreateQuadGeometry example
-# Tests the K Distance Graph filter
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def k_dist_graph_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #2 - Edge Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/QuadConnectivity.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 122,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-        "headers": ["V0", "V1", "V2", "V3"],
-        "attrMatType": 3,
-        "tupleDimensions": [121],
-        "dataTypes": ["int64_t", "int64_t", "int64_t", "int64_t"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V2"),
-                                 simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Quads", False)
-    if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_quad_list_array_path=simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # K Distance Graph
-    err = dream3dreviewpy.k_distance_graph(dca, simpl.DataArrayPath("DataContainer", "QuadList",
-                                                                    "Quads"),
-                                           False, simpl.DataArrayPath("", "", ""),
-                                           simpl.DataArrayPath("DataContainer", "QuadList",
-                                                               "KDistance"), 7, 3)
-    if err < 0:
-        print("KDistanceGraph ErrorCondition: %d" % err)
-
-    # Write DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "KDistanceGraph.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    k_dist_graph_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/K_Means_Test.py b/Wrapping/Python/Examples/DREAM3DReview/K_Means_Test.py
deleted file mode 100644
index 2b7dac5aaf..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/K_Means_Test.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# Pipeline : Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# This pipeline is designed to test the K Means filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def k_means_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-    
-    # Test: K Means
-    err = dream3dreviewpy.k_means(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                  False, simpl.DataArrayPath("", "", ""), "ClusterIds", "ClusterMeans",
-                                  5, "ClusterData", 0)
-    if err < 0:
-        print("KMeans ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Debug/Data/Output/DREAM3DReview/SmallIN100_KMeans.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    k_means_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Normalize_Attribute_Arrays.py b/Wrapping/Python/Examples/DREAM3DReview/Normalize_Attribute_Arrays.py
deleted file mode 100644
index 82388354cf..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Normalize_Attribute_Arrays.py
+++ /dev/null
@@ -1,206 +0,0 @@
-# Based on (03) SmallIN100 Mesh Statistics (from EBSD Surface Meshing)
-# Tests the Normalize Attribute Arrays filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def normalize_arrays_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Normalize Attribute Arrays
-    selected_data_arrays = [simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceDihedralAngles"),
-                            simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas")]
-    err = dream3dreviewpy.normalize_arrays(dca, selected_data_arrays, 0, 0, 1, "_Normalized", False,
-                                           simpl.DataArrayPath("", "", ""), 0)
-    if err < 0:
-        print("NormalizeArrays ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/DREAM3DReview/NormalizeArrays.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    normalize_arrays_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Point_Sample_Triangle_Geometry.py b/Wrapping/Python/Examples/DREAM3DReview/Point_Sample_Triangle_Geometry.py
deleted file mode 100644
index e6cab018cb..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Point_Sample_Triangle_Geometry.py
+++ /dev/null
@@ -1,209 +0,0 @@
-# Pipeline : (03) SmallIN100 Mesh Statistics (from EBSD Surface Meshing)
-# Test of Point Sample Triangle Geometry filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def point_sample_triangle_geom():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Point Sample Triangle Geometry
-    err = dream3dreviewpy.point_sample_triangle_geometry(dca, 0, "TriangleDataContainer",
-                                                         "VertexDataContainer", "VertexData",
-                                                         100000, "",
-                                                         simpl.DataArrayPath("TriangleDataContainer",
-                                                                             "FaceData", "FaceAreas"),
-                                                         False, simpl.DataArrayPath("", "", ""), [])
-    if err < 0:
-        print("PointSampleTriangleGeometry ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/DREAM3DReview/PointSampleTriangleGeom.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    point_sample_triangle_geom()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Potts_Model.py b/Wrapping/Python/Examples/DREAM3DReview/Potts_Model.py
deleted file mode 100644
index 676bdc1124..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Potts_Model.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-# Tests the Potts Model filter
-# NOTE: The Potts Model takes several minutes to run on this pipeline
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import samplingpy
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def potts_model_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Crop Geometry (Image)
-    err = samplingpy.crop_image_geometry(dca, "",
-                                         simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""),
-                                         simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                         41, 41, 0, 140, 140, 99, True, False, True,
-                                         simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("CropImageGeometry ErrorCondition %d" % err)
-
-    # Quick Surface Mesh
-    err = surfacemeshingpy.quick_surface_mesh(dca,
-                                              [],
-                                              "TriangleDataContainer",
-                                              "VertexData",
-                                              "FaceData",
-                                              simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                              "FaceLabels",
-                                              "NodeType",
-                                              "FaceFeatureData")
-    if err < 0:
-        print("QuickSurfaceMesh ErrorCondition %d" % err)
-
-    # Potts Model
-    err = dream3dreviewpy.potts_model(dca, 100, 273, False, False,
-                                      simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                          "FeatureIds"),
-                                      simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PottsModel ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/DREAM3DReview/SmallIN100_PottsModel.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    potts_model_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Principal_Component_Analysis.py b/Wrapping/Python/Examples/DREAM3DReview/Principal_Component_Analysis.py
deleted file mode 100644
index 5650e70fbd..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Principal_Component_Analysis.py
+++ /dev/null
@@ -1,225 +0,0 @@
-# Pipeline : (03) SmallIN100 Mesh Statistics (from EBSD Surface Meshing)
-# Tests the Principal Component Analysis filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def principal_component_analysis_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Principal Component Analysis
-    selected_data_array_paths = [simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                     "FaceAreas"),
-                                 simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                     "FaceDihedralAngles")]
-    err = dream3dreviewpy.principal_component_analysis(dca, selected_data_array_paths,
-                                                       "PrincipalComponentAnalysis",
-                                                       "PrincipalComponentEigenvalues",
-                                                       "PrincipalComponentEigenvectors", 1, False,
-                                                       0, simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PrincipalComponentAnalysis ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/DREAM3DReview/PrincipalComponentAnalysis.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("TriangleDataContainer",
-                                                     "PrincipalComponentAnalysis",
-                                                     "PrincipalComponentEigenvalues"),
-                                 simpl.DataArrayPath("TriangleDataContainer",
-                                                     "PrincipalComponentAnalysis",
-                                                     "PrincipalComponentEigenvectors")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Debug/Data/Output/DREAM3DReview",
-                                   simpl.DelimiterTypes.Comma, ".csv", 10)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    principal_component_analysis_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Remove_Flagged_Vertices.py b/Wrapping/Python/Examples/DREAM3DReview/Remove_Flagged_Vertices.py
deleted file mode 100644
index ee52b7457c..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Remove_Flagged_Vertices.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# Based on CreateVertexGeometry example
-# Tests the Remove Flagged Vertices filter
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import dream3dreviewpy
-
-
-def remove_flagged_vertices_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
-    wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
-
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
-    if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            vertex_attribute_matrix_name="VertexData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # Extract Attribute Arrays from Geometry
-    empty_data_array_path = simpl.DataArrayPath("", "", "")
-    vertex_list_path = simpl.DataArrayPath("DataContainer", "VertexData", "VertexCoordinates")
-    err = simplpy.extract_attribute_arrays_from_geometry(dca, "DataContainer", vertex_list_path,
-                                                         empty_data_array_path, empty_data_array_path,
-                                                         empty_data_array_path, empty_data_array_path,
-                                                         empty_data_array_path, empty_data_array_path,
-                                                         empty_data_array_path, empty_data_array_path,
-                                                         empty_data_array_path, empty_data_array_path,
-                                                         empty_data_array_path)
-    if err < 0:
-        print("ExtractAttributeArraysFromGeometry ErrorCondition %d" % err)
-
-    # Split Multicomponent Attribute Array
-    err = simplpy.split_attribute_array(dca,
-                                        simpl.DataArrayPath("DataContainer", "VertexData",
-                                                            "VertexCoordinates"),
-                                        "_Component_")
-    if err < 0:
-        print("SplitAttributeArray ErrorCondition %d" % err)
-
-    # Threshold Objects
-    err = sc.MultiThresholdObjects(dca, "Mask", [("DataContainer", "VertexData",
-                                                  "VertexCoordinates_Component_0", ">", -0.5),
-                                                 ("DataContainer", "VertexData",
-                                                  "VertexCoordinates_Component_1", "<", 0.5)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition %d" % err)
-
-    # Remove Flagged Vertices
-    err = dream3dreviewpy.remove_flagged_vertices(dca, "DataContainer",
-                                                  simpl.DataArrayPath("DataContainer", "VertexData",
-                                                                      "Mask"),
-                                                  "ReducedVertexDataContainer")
-    if err < 0:
-        print("RemoveFlaggedVertices ErrorCondition %d" % err)
-
-    # Delete Data
-    err = sc.RemoveArrays(dca, [["DataContainer", "", ""]])
-    if err < 0:
-        print("RemoveArrays ErrorCondition %d" % err)
-
-    # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/DREAM3DReview/" +
-                                        "RemoveFlaggedVertices.dream3d", True, False)
-    if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    remove_flagged_vertices_test()
diff --git a/Wrapping/Python/Examples/DREAM3DReview/Robust_Automatic_Threshold.py b/Wrapping/Python/Examples/DREAM3DReview/Robust_Automatic_Threshold.py
deleted file mode 100644
index 3598e2415e..0000000000
--- a/Wrapping/Python/Examples/DREAM3DReview/Robust_Automatic_Threshold.py
+++ /dev/null
@@ -1,212 +0,0 @@
-# Pipeline : (03) SmallIN100 Mesh Statistics (from EBSD Surface Meshing)
-# Tests the Robust Automatic Threshold filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import surfacemeshingpy
-from dream3d import dream3dreviewpy
-
-import datetime as datetime
-
-
-def robust_automatic_threshold_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                        False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshingpy.triangle_area_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshingpy.triangle_normal_filter(dca,
-                                                  simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                      "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshingpy.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                   "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysispy.generate_face_ipf_coloring(dca,
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceLabels"),
-                                                           simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                               "FaceNormals"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                               "AvgEulerAngles"),
-                                                           simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                           simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                               "CrystalStructures"),
-                                                           "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysispy.generate_face_misorientation_coloring(dca,
-                                                                      simpl.DataArrayPath("TriangleDataContainer",
-                                                                                          "FaceData", "FaceLabels"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Robust Automatic Threshold
-    err = dream3dreviewpy.robust_automatic_threshold(dca, simpl.DataArrayPath("Small IN100",
-                                                                              "EBSD Scan Data",
-                                                                              "FeatureIds"),
-                                                     simpl.DataArrayPath("Small IN100",
-                                                                         "EBSD Scan Data",
-                                                                         "Mask2"),
-                                                     simpl.DataArrayPath("Small IN100",
-                                                                         "EBSD Scan Data",
-                                                                         "KernelAverageMisorientations"))
-    if err < 0:
-        print("RobustAutomaticThreshold ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() +
-                              "/Debug/Data/Output/DREAM3DReview/RobustAutomaticThreshold.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    robust_automatic_threshold_test()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/01 SmallIN100 Archive.py b/Wrapping/Python/Examples/EBSD/Reconstruction/01 SmallIN100 Archive.py
deleted file mode 100644
index d1b5919546..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/01 SmallIN100 Archive.py	
+++ /dev/null
@@ -1,26 +0,0 @@
-# Pipeline : (01) SmallIN100 Archive (from EBSD Reconstruction)
-#
-#
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-
-
-def small_in100_archive():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    err = orientation_analysis.ebsd_to_h5_ebsd(dca, sd.GetBuildDirectory() + "/Debug/Data/SmallIN100",
-                                               sd.GetBuildDirectory() +
-                                               "/Debug/Data/Output/Reconstruction/SmallIN100.h5ebsd",
-                                               "Slice_", "", "ang", 1, 1, 117, simpl.AxisAngleInput(0, 0, 0, 0),
-                                               simpl.AxisAngleInput(0, 0, 0, 0))
-    if err < 0:
-        print("EbsdToH5Ebsd error condition: %", err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_archive()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/02 SmallIN100 Initial Visualization.py b/Wrapping/Python/Examples/EBSD/Reconstruction/02 SmallIN100 Initial Visualization.py
deleted file mode 100644
index a681ff734e..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/02 SmallIN100 Initial Visualization.py	
+++ /dev/null
@@ -1,37 +0,0 @@
-# Pipeline : (02) SmallIN100 Initial Visualization (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simpl
-from dream3d import simpl_helpers
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-
-
-def small_in100_initial_visualization():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read H5EBSD File
-    err = orientation_analysis.read_h5_ebsd(dca, "Small IN100", "Phase Data", "EBSD Scan Data",
-                                            sd.GetBuildDirectory() +
-                                            "/Debug/Data/Output/Reconstruction/SmallIN100.h5ebsd",
-                                            1, 117, True, simpl_helpers.AngleRepresentation.Radians,
-                                            simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = simpl_helpers.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/SmallIN100.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_initial_visualization()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/03 SmallIN100 Alignment.py b/Wrapping/Python/Examples/EBSD/Reconstruction/03 SmallIN100 Alignment.py
deleted file mode 100644
index 783f829021..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/03 SmallIN100 Alignment.py	
+++ /dev/null
@@ -1,93 +0,0 @@
-# Pipeline : (03) SmallIN100 Alignment (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-from dream3d import reconstructionpy as reconstruction
-from dream3d import processingpy as processing
-
-
-def small_in100_alignment():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read H5EBSD File
-    err = orientation_analysis.read_h5_ebsd(dca, "Small IN100", "Phase Data", "EBSD Scan Data",
-                                            sd.GetBuildDirectory() +
-                                            "/Debug/Data/Output/Reconstruction/SmallIN100.h5ebsd",
-                                            1, 117, True, sc.AngleRepresentation.Radians,
-                                            simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # Threshold Objects
-    # Create the selected thresholds / comparison inputs for MultiThresholdObjects filter
-    selected_thresholds = simpl.ComparisonInputs()
-    selected_thresholds.addInput("Small IN100", "EBSD Scan Data", "Confidence Index",
-                                simpl.ComparisonOperators.GreaterThan, 0.1)
-    selected_thresholds.addInput("Small IN100", "EBSD Scan Data", "Image Quality", simpl.ComparisonOperators.GreaterThan,
-                                120)
-
-    err = d3d.multi_threshold_objects(dca, "Mask", selected_thresholds)
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Convert Orientation Representation
-    err = orientation_analysis.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "EulerAngles"),
-                                                    "Quats")
-    if err < 0:
-        print("ConvertOrientation ErrorCondition: %d" % err)
-
-    # Align Sections (Misorientation)
-    err = reconstruction.align_sections_misorientation(dca, 5, True,
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                                       simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                           "CrystalStructures"))
-    if err < 0:
-        print("AlignSectionsMisorientation ErrorCondition: %d" % err)
-
-    # Isolate Largest Feature (Identify Sample)
-    err = processing.identify_sample(dca, False, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"))
-    if err < 0:
-        print("IsolateLargestFeature ErrorCondition: %d" % err)
-
-    # Align Sections (Feature Centroid)
-    err = reconstruction.align_sections_feature_centroid(dca,
-                                                         0, True,
-                                                         simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"))
-    if err < 0:
-        print("AlignSectionsFeatureCentroid %d" % err)
-
-    # Generate IPF Colors
-    err = orientation_analysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "EulerAngles"),
-                                                   simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                       "CrystalStructures"),
-                                                   True,
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                                   "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/03_SmallIN100_Aligned.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_alignment()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/04 SmallIN100 Presegmentation Processing.py b/Wrapping/Python/Examples/EBSD/Reconstruction/04 SmallIN100 Presegmentation Processing.py
deleted file mode 100644
index e5d4707288..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/04 SmallIN100 Presegmentation Processing.py	
+++ /dev/null
@@ -1,109 +0,0 @@
-# Pipeline : (04) SmallIN100 Presegmentation Processing (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-
-import datetime as datetime
-
-
-def small_in100_presegmentation_processing():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Reconstruction/03_SmallIN100_Aligned.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Neighbor Orientation Comparison (Bad Data)
-    err = orientation_analysis.bad_data_neighbor_orientation_check(dca, 5, 4,
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Mask"),
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Phases"),
-                                                                   simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                       "CrystalStructures"),
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Quats"))
-    if err < 0:
-        print("NeighborOrientationComparison ErrorCondition %d" % err)
-
-    # Neighbor Orientation Correlation
-    err = orientation_analysis.neighbor_orientation_correlation(dca, 5, 0.2, 2,
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Confidence Index"),
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Phases"),
-                                                                simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                    "CrystalStructures"),
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Quats"))
-    if err < 0:
-        print("NeighborOrientationCorrelation ErrorCondition %d" % err)
-
-    # Delete Data (Remove array helper function)
-    sc.RemoveArrays(dca, [("Small IN100", "EBSD Scan Data", "IPFColor")])
-
-    # Generate IPF Colors
-    err = orientation_analysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "EulerAngles"),
-                                                   simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                       "CrystalStructures"),
-                                                   True,
-                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                                   "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/04_SmallIN100_Presegmentation.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_presegmentation_processing()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/05 SmallIN100 Segmentation.py b/Wrapping/Python/Examples/EBSD/Reconstruction/05 SmallIN100 Segmentation.py
deleted file mode 100644
index 53b9796af2..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/05 SmallIN100 Segmentation.py	
+++ /dev/null
@@ -1,78 +0,0 @@
-# Pipeline : (05) SmallIN100 Segmentation (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import reconstructionpy as reconstruction
-
-import datetime as datetime
-
-
-def small_in100_segmentation():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Reconstruction/04_SmallIN100_Presegmentation.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Segment Features (Misorientation)
-    err = reconstruction.ebsd_segment_features(dca, "Grain Data", 5, True,
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                               simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                               "FeatureIds", "Active")
-    if err < 0:
-        print("SegmentFeatures ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/05_SmallIN100_Segmentation.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_segmentation()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/06 SmallIN100 Postsegmentation Processing.py b/Wrapping/Python/Examples/EBSD/Reconstruction/06 SmallIN100 Postsegmentation Processing.py
deleted file mode 100644
index 5761acd009..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/06 SmallIN100 Postsegmentation Processing.py	
+++ /dev/null
@@ -1,146 +0,0 @@
-# Pipeline : (06) SmallIN100 Postsegmentation Processing (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-from dream3d import reconstructionpy as reconstruction
-from dream3d import processingpy as processing
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-
-import datetime as datetime
-
-
-def small_in100_postseg_processing():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Reconstruction/05_SmallIN100_Segmentation.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Phases
-    err = generic.find_feature_phases(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                      simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                      simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"))
-    if err < 0:
-        print("FindFeaturePhases ErrorCondition %d" % err)
-
-    # Find Feature Average Orientations
-    err = orientation_analysis.find_avg_orientations(dca,
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                                     simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                         "CrystalStructures"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEuler"))
-    if err < 0:
-        print("FindAvgOrientations ErrorCondition %d" % err)
-
-    # Find Feature Neighbors #1
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList2", "NeighborList2",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors2", "", False, False)
-    if err < 0:
-        print("FindNeighbors #1 ErrorCondition %d" % err)
-
-    # Merge Twins
-    err = reconstruction.merge_twins(dca, "NewGrain Data", 3, 2,
-                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                     simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                     "ParentIds", "ParentIds", "Active",
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "NeighborList2"),
-                                     simpl.DataArrayPath("", "", ""),
-                                     False)
-    if err < 0:
-        print("MergeTwins ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                "Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Minimum Size
-    err = processing.min_size(dca, 16, False, 0,
-                              simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                              simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                              simpl.DataArrayPath("Small IN100", "Grain Data", "NumElements"))
-    if err < 0:
-        print("MinSize ErrorCondition %d" % err)
-
-    # Find Feature Neighbors #12
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors", "", False, False)
-    if err < 0:
-        print("FindNeighbors #2 ErrorCondition %d" % err)
-
-    # Minimum Number of Neighbors
-    err = processing.min_neighbors(dca, 2, False, 0, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                   simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                   simpl.DataArrayPath("Small IN100", "Grain Data", "NumNeighbors"))
-    if err < 0:
-        print("MinNeighbors ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/06_SmallIN100_Postsegmentation.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_postseg_processing()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/07 SmallIN100 Final Processing.py b/Wrapping/Python/Examples/EBSD/Reconstruction/07 SmallIN100 Final Processing.py
deleted file mode 100644
index 54f7a94a2d..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/07 SmallIN100 Final Processing.py	
+++ /dev/null
@@ -1,112 +0,0 @@
-# Pipeline : (07) SmallIN100 Final Processing (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import processingpy as processing
-
-import datetime as datetime
-
-
-def small_in100_final_processing():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Volumes").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Reconstruction/06_SmallIN100_Postsegmentation.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Fill Bad Data
-    err = processing.fill_bad_data(dca, False, 1000,
-                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                   simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("FillBadData ErrorCondition %d" % err)
-
-    # Erode / Dilate Bad Data #1
-    err = processing.erode_dilate_bad_data(dca, sc.BadDataOperation.Erode, 2, True, True, True,
-                                           simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("ErodeDilateBadData #1 ErrorCondition %d" % err)
-
-    # Erode / Dilate Bad Data #2
-    err = processing.erode_dilate_bad_data(dca, sc.BadDataOperation.Dilate, 2, True, True, True,
-                                           simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("ErodeDilateBadData #1 ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/SmallIN100_Final.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_final_processing()
diff --git a/Wrapping/Python/Examples/EBSD/Reconstruction/08 SmallIN100 Full Reconstruction.py b/Wrapping/Python/Examples/EBSD/Reconstruction/08 SmallIN100 Full Reconstruction.py
deleted file mode 100644
index d2a953cee9..0000000000
--- a/Wrapping/Python/Examples/EBSD/Reconstruction/08 SmallIN100 Full Reconstruction.py	
+++ /dev/null
@@ -1,207 +0,0 @@
-# Pipeline : (08) SmallIN100 Full Reconstruction (from EBSD Reconstruction)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-from dream3d import reconstructionpy as reconstruction
-from dream3d import processingpy as processing
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-
-
-def small_in100_full_reconstruction():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read H5EBSD File
-    err = orientation_analysis.read_h5_ebsd(dca, "Small IN100", "Phase Data", "EBSD Scan Data",
-                                            sd.GetBuildDirectory() +
-                                            "/Debug/Data/Output/Reconstruction/SmallIN100.h5ebsd",
-                                            1, 117, True, sc.AngleRepresentation.Radians,
-                                            simpl.StringSet({"Fit", "Image Quality", "EulerAngles",
-                                                             "SEM Signal", "Confidence Index", "Phases"}))
-    if err < 0:
-        print("ReadH5Ebsd ErrorCondition %d" % err)
-
-    # Threshold Objects
-    # Create the selected thresholds / comparison inputs for MultiThresholdObjects filter
-    selectedThresholds = simpl.ComparisonInputs()
-    selectedThresholds.addInput("Small IN100", "EBSD Scan Data", "Confidence Index",
-                                simpl.ComparisonOperators.GreaterThan, 0.1)
-    selectedThresholds.addInput("Small IN100", "EBSD Scan Data", "Image Quality", simpl.ComparisonOperators.GreaterThan,
-                                120)
-
-    err = d3d.multi_threshold_objects(dca, "Mask", selectedThresholds)
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Convert Orientation Representation
-    err = orientation_analysis.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "EulerAngles"),
-                                                    "Quats")
-    if err < 0:
-        print("ConvertOrientation ErrorCondition: %d" % err)
-
-    # Align Sections (Misorientation)
-    err = reconstruction.align_sections_misorientation(dca, 5, True,
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                                       simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                           "CrystalStructures"))
-    if err < 0:
-        print("AlignSectionsMisorientation ErrorCondition: %d" % err)
-
-    # Isolate Largest Feature (Identify Sample)
-    err = processing.identify_sample(dca, False, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"))
-    if err < 0:
-        print("IsolateLargestFeature ErrorCondition: %d" % err)
-
-    # Align Sections (Feature Centroid)
-    err = reconstruction.align_sections_feature_centroid(dca,
-                                                         0, True,
-                                                         simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"))
-    if err < 0:
-        print("AlignSectionsFeatureCentroid %d" % err)
-
-    # Neighbor Orientation Comparison (Bad Data)
-    err = orientation_analysis.bad_data_neighbor_orientation_check(dca, 5, 4,
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Mask"),
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Phases"),
-                                                                   simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                       "CrystalStructures"),
-                                                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                       "Quats"))
-    if err < 0:
-        print("NeighborOrientationComparison ErrorCondition %d" % err)
-
-    # Neighbor Orientation Correlation
-    err = orientation_analysis.neighbor_orientation_correlation(dca, 5, 0.2, 2,
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Confidence Index"),
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Phases"),
-                                                                simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                    "CrystalStructures"),
-                                                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                    "Quats"))
-    if err < 0:
-        print("NeighborOrientationCorrelation ErrorCondition %d" % err)
-
-    # Segment Features (Misorientation)
-    err = reconstruction.ebsd_segment_features(dca, "Grain Data", 5, True,
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Mask"),
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                               simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                               "FeatureIds", "Active")
-    if err < 0:
-        print("SegmentFeatures ErrorCondition %d" % err)
-
-    # Find Feature Phases
-    err = generic.find_feature_phases(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                      simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                      simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"))
-    if err < 0:
-        print("FindFeaturePhases ErrorCondition %d" % err)
-
-    # Find Feature Average Orientations
-    err = orientation_analysis.find_avg_orientations(dca,
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                                     simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                         "CrystalStructures"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEuler"))
-    if err < 0:
-        print("FindAvgOrientations ErrorCondition %d" % err)
-
-    # Find Feature Neighbors #1
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList2", "NeighborList2",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors2", "", False, False)
-    if err < 0:
-        print("FindNeighbors #1 ErrorCondition %d" % err)
-
-    # Merge Twins
-    err = reconstruction.merge_twins(dca, "NewGrain Data", 3, 2,
-                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                     simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                     "ParentIds", "ParentIds", "Active",
-                                     simpl.DataArrayPath("Small IN100", "Grain Data", "NeighborList2"),
-                                     simpl.DataArrayPath("", "", ""),
-                                     False)
-    if err < 0:
-        print("MergeTwins ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                "Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Minimum Size
-    err = processing.min_size(dca, 16, False, 0,
-                              simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                              simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                              simpl.DataArrayPath("Small IN100", "Grain Data", "NumElements"))
-    if err < 0:
-        print("MinSize ErrorCondition %d" % err)
-
-    # Find Feature Neighbors #2
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors", "", False, False)
-    if err < 0:
-        print("FindNeighbors #2 ErrorCondition %d" % err)
-
-    # Minimum Number of Neighbors
-    err = processing.min_neighbors(dca, 2, False, 0, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                   simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                   simpl.DataArrayPath("Small IN100", "Grain Data", "NumNeighbors"))
-    if err < 0:
-        print("MinNeighbors ErrorCondition %d" % err)
-
-    # Fill Bad Data
-    err = processing.fill_bad_data(dca, False, 1000,
-                                   simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                   simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("FillBadData ErrorCondition %d" % err)
-
-    # Erode / Dilate Bad Data #1
-    err = processing.erode_dilate_bad_data(dca, sc.BadDataOperation.Erode, 2, True, True, True,
-                                           simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("ErodeDilateBadData #1 ErrorCondition %d" % err)
-
-    # Erode / Dilate Bad Data #2
-    err = processing.erode_dilate_bad_data(dca, sc.BadDataOperation.Dilate, 2, True, True, True,
-                                           simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("ErodeDilateBadData #1 ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Reconstruction/08_SmallIN100_Final.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_full_reconstruction()
diff --git a/Wrapping/Python/Examples/EBSD/Statistics/01 SmallIN100 Morphological Statistics.py b/Wrapping/Python/Examples/EBSD/Statistics/01 SmallIN100 Morphological Statistics.py
deleted file mode 100644
index 249e6ae354..0000000000
--- a/Wrapping/Python/Examples/EBSD/Statistics/01 SmallIN100 Morphological Statistics.py	
+++ /dev/null
@@ -1,140 +0,0 @@
-# Pipeline : (01) SmallIN100 Morphological Statistics (from EBSD Statistics)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-
-import datetime as datetime
-
-
-def small_in100_morph_stats():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Reconstruction/SmallIN100_Final.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Centroids
-    err = generic.find_feature_centroids(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                         simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                "Size Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Shapes
-    err = statistics.find_shapes(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                 simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                 "Omega3s", "Shape Volumes", "AxisLengths", "AxisEulerAngles", "AspectRatios")
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                    "", "NumNeighbors", "", False, False)
-    if err < 0:
-        print("FindNeighbors ErrorCondition %d" % err)
-
-    # Find Feature Neighborhoods
-    err = statistics.find_neighborhoods(dca, "NeighborhoodList", 1,
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "EquivalentDiameters"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids"),
-                                        "Neighborhoods")
-    if err < 0:
-        print("FindNeighborhoods ErrorCondition %d" % err)
-
-    # Find Euclidean Distance Map
-    err = statistics.find_euclidean_dist_map(dca,
-                                             simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                             "GBManhattanDistances", "TJManhattanDistances", "QPManhattanDistances",
-                                             "NearestNeighbors", True, True, True, False, True)
-    if err < 0:
-        print("FindEuclideanDistanceMap ErrorCondition %d" % err)
-
-    # Find Surface Area to Volume and Sphericity
-    err = statistics.find_surface_area_to_volume(dca,
-                                                 simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                 simpl.DataArrayPath("Small IN100", "Grain Data", "NumElements"),
-                                                 "SurfaceAreaVolumeRatio", "Sphericity", True)
-    if err < 0:
-        print("FindSurfaceAreaToVolume ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Statistics/SmallIN100_Morph.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_morph_stats()
diff --git a/Wrapping/Python/Examples/EBSD/Statistics/02 SmallIN100 Export Statistics.py b/Wrapping/Python/Examples/EBSD/Statistics/02 SmallIN100 Export Statistics.py
deleted file mode 100644
index ca6223169a..0000000000
--- a/Wrapping/Python/Examples/EBSD/Statistics/02 SmallIN100 Export Statistics.py	
+++ /dev/null
@@ -1,122 +0,0 @@
-# Pipeline : (02) SmallIN100 Export Statistics (from EBSD Statistics)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def small_in100_export_stats():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca, sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Statistics/SmallIN100_Morph.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Export Feature Data as CSV File
-    err = d3d.feature_data_csv_writer(dca, simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                      sd.GetBuildDirectory() +
-                                      "/Debug/Data/Statistics/SmallIN100_Morph/FeatureStatistics.csv",
-                                      False, simpl.DelimiterTypes.Comma, True)
-    if err < 0:
-        print("FeatureDataCSVWriter ErrorCondition %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_export_stats()
diff --git a/Wrapping/Python/Examples/EBSD/Statistics/03 SmallIN100 Transfer Field Data.py b/Wrapping/Python/Examples/EBSD/Statistics/03 SmallIN100 Transfer Field Data.py
deleted file mode 100644
index b78cdaadef..0000000000
--- a/Wrapping/Python/Examples/EBSD/Statistics/03 SmallIN100 Transfer Field Data.py	
+++ /dev/null
@@ -1,131 +0,0 @@
-# Pipeline : (03) SmallIN100 Transfer Field Data (from EBSD Statistics)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def small_in100_transfer_field_data():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() + "/Debug/Data/Output/Statistics/SmallIN100_Morph.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Copy Feature Array to Element Array
-    err = d3d.copy_feature_array_to_element_array(dca,
-                                                  simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                      "EquivalentDiameters"),
-                                                  simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                  "EquivalentDiameters")
-    if err < 0:
-        print("CopyFeatureArrayToElementArray ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Statistics/SmallIN100_TransferFieldData.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_transfer_field_data()
diff --git a/Wrapping/Python/Examples/EBSD/Statistics/04 SmallIN100 Field Threshold.py b/Wrapping/Python/Examples/EBSD/Statistics/04 SmallIN100 Field Threshold.py
deleted file mode 100644
index eae15c7964..0000000000
--- a/Wrapping/Python/Examples/EBSD/Statistics/04 SmallIN100 Field Threshold.py	
+++ /dev/null
@@ -1,140 +0,0 @@
-# Pipeline : (04) SmallIN100 Field Threshold (from EBSD Statistics)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
-
-def small_in100_field_threshold():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Statistics/SmallIN100_TransferFieldData.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Create the selected thresholds / comparison inputs for MultiThresholdObjects filter
-    selectedThresholds = simpl.ComparisonInputs()
-    selectedThresholds.addInput("Small IN100", "Grain Data", "EquivalentDiameters", 1, 5)
-    selectedThresholds.addInput("Small IN100", "Grain Data", "NumNeighbors", 1, 20)
-    selectedThresholds.addInput("Small IN100", "Grain Data", "Omega3s", 0, 0.5)
-
-    err = d3d.multi_threshold_objects(dca, "CriticalFields", selectedThresholds)
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Copy Feature Array to Element Array
-    err = d3d.copy_feature_array_to_element_array(dca,
-                                                  simpl.DataArrayPath("Small IN100", "Grain Data", "CriticalFields"),
-                                                  simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                  "CriticalField")
-    if err < 0:
-        print("CopyFeatureArrayToElementArray ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Statistics/SmallIN100_CopyCritical.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_field_threshold()
diff --git a/Wrapping/Python/Examples/EBSD/Statistics/05 SmallIN100 Crystallographic Statistics.py b/Wrapping/Python/Examples/EBSD/Statistics/05 SmallIN100 Crystallographic Statistics.py
deleted file mode 100644
index 69f7cb3459..0000000000
--- a/Wrapping/Python/Examples/EBSD/Statistics/05 SmallIN100 Crystallographic Statistics.py	
+++ /dev/null
@@ -1,195 +0,0 @@
-# Pipeline : (05) SmallIN100 Crystallographic Statistics (from EBSD Statistics)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientation_analysis
-
-import datetime as datetime
-
-
-def small_in100_cryst_stats():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    # dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data")
-    # .getDataArrayProxy("AvgQuats").flag = 2 # Not sure why, it is not flagged
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Statistics/SmallIN100_CopyCritical.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Average Orientations
-    err = orientation_analysis.find_avg_orientations(dca,
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases"),
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats"),
-                                                     simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                         "CrystalStructures"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                                     simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEulerAngles"))
-    if err < 0:
-        print("FindAvgOrientations ErrorCondition %d" % err)
-
-    # Find Feature Neighbor Misorientations
-    err = orientation_analysis.find_misorientations(dca,
-                                                    simpl.DataArrayPath("Small IN100", "Grain Data", "NeighborList"),
-                                                    "MisorientationList",
-                                                    simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                                    simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                    simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                        "CrystalStructures"),
-                                                    "", False)
-    if err < 0:
-        print("FindMisorientations ErrorCondition %d" % err)
-
-    # Find Schmid Factors
-    err = orientation_analysis.find_schmids(dca, simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                            simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                            simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats"),
-                                            "Schmids", "SlipSystems", "Poles", "", "", simpl.FloatVec3(1, 1, 1),
-                                            False, False, simpl.FloatVec3(1, 1, 1), simpl.FloatVec3(1, 1, 1))
-    if err < 0:
-        print("FindSchmids ErrorCondition %d" % err)
-
-    # Find Feature Reference Misorientations
-    err = orientation_analysis.find_feature_reference_misorientations(dca,
-                                                                      simpl.DataArrayPath("Small IN100",
-                                                                                          "EBSD Scan Data",
-                                                                                          "FeatureIds"),
-                                                                      simpl.DataArrayPath("Small IN100",
-                                                                                          "EBSD Scan Data", "Phases"),
-                                                                      simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                          "CrystalStructures"),
-                                                                      simpl.DataArrayPath("Small IN100",
-                                                                                          "EBSD Scan Data", "Quats"),
-                                                                      simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                          "AvgQuats"),
-                                                                      simpl.DataArrayPath("", "", ""),
-                                                                      "FeatureAvgMisorientations",
-                                                                      "FeatureReferenceMisorientations",
-                                                                      sc.ReferenceOrientation.AverageOrientation)
-    if err < 0:
-        print("FindFeatureReferenceMisorientations ErrorCondition %d" % err)
-
-    # Find Kernel Average Misorientations
-    err = orientation_analysis.find_kernel_avg_misorientations(dca,
-                                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                   "FeatureIds"),
-                                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                   "Phases"),
-                                                               simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                   "CrystalStructures"),
-                                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                   "Quats"),
-                                                               "KernelAverageMisorientations",
-                                                               simpl.IntVec3(1, 1, 1))
-    if err < 0:
-        print("FindKernelAvgMisorientations ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_cryst_stats()
diff --git a/Wrapping/Python/Examples/EBSD/Surface Mesh/01 SmallIN100 Quick Mesh.py b/Wrapping/Python/Examples/EBSD/Surface Mesh/01 SmallIN100 Quick Mesh.py
deleted file mode 100644
index 991378fc08..0000000000
--- a/Wrapping/Python/Examples/EBSD/Surface Mesh/01 SmallIN100 Quick Mesh.py	
+++ /dev/null
@@ -1,165 +0,0 @@
-# Pipeline : (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import samplingpy as sampling
-from dream3d import surfacemeshingpy as surfacemeshing
-
-import datetime as datetime
-
-
-def small_in100_quickmesh():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Crop Geometry (Image)
-    err = sampling.crop_image_geometry(dca, "",
-                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""),
-                                       simpl.DataArrayPath("Small IN100", "Grain Data", ""),
-                                       41, 41, 0, 140, 140, 99, True, False, True,
-                                       simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("CropImageGeometry ErrorCondition %d" % err)
-
-    # Quick Surface Mesh
-    err = surfacemeshing.quick_surface_mesh(dca,
-                                            [],
-                                            "TriangleDataContainer",
-                                            "VertexData",
-                                            "FaceData",
-                                            simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds"),
-                                            "FaceLabels",
-                                            "NodeType",
-                                            "FaceFeatureData")
-    if err < 0:
-        print("QuickSurfaceMesh ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/SurfaceMesh/SmallIN100.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_quickmesh()
diff --git a/Wrapping/Python/Examples/EBSD/Surface Mesh/02 SmallIN100 Smooth Mesh.py b/Wrapping/Python/Examples/EBSD/Surface Mesh/02 SmallIN100 Smooth Mesh.py
deleted file mode 100644
index e253cef47e..0000000000
--- a/Wrapping/Python/Examples/EBSD/Surface Mesh/02 SmallIN100 Smooth Mesh.py	
+++ /dev/null
@@ -1,155 +0,0 @@
-# Pipeline : (02) SmallIN100 Smooth Mesh (from EBSD Surface Meshing)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import surfacemeshingpy as surfacemeshing
-
-import datetime as datetime
-
-
-def small_in100_smoothmesh():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca, sd.GetBuildDirectory() + "/Debug/Data/Output/SurfaceMesh/SmallIN100.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Laplacian Smoothing
-    err = surfacemeshing.laplacian_smoothing(dca,
-                                             "TriangleDataContainer",
-                                             simpl.DataArrayPath("TriangleDataContainer", "VertexData", "NodeType"),
-                                             simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceLabels"),
-                                             100, 0.25, 0, 0.2, 0.15, 0, 0, False, 0)
-    if err < 0:
-        print("LaplacianSmoothing ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_smoothmesh()
diff --git a/Wrapping/Python/Examples/EBSD/Surface Mesh/03 SmallIN100 Mesh Statistics.py b/Wrapping/Python/Examples/EBSD/Surface Mesh/03 SmallIN100 Mesh Statistics.py
deleted file mode 100644
index 7ab6be2e25..0000000000
--- a/Wrapping/Python/Examples/EBSD/Surface Mesh/03 SmallIN100 Mesh Statistics.py	
+++ /dev/null
@@ -1,196 +0,0 @@
-# Pipeline : (03) SmallIN100 Mesh Statistics (from EBSD Surface Meshing)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import surfacemeshingpy as surfacemeshing
-
-import datetime as datetime
-
-
-def small_in100_mesh_stats():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/SurfaceMesh/SmallIN100_Smoothed.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Generate Triangle Areas
-    err = surfacemeshing.triangle_area_filter(dca,
-                                              simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"))
-    if err < 0:
-        print("TriangleAreaFilter ErrorCondition %d" % err)
-
-    # Generate Triangle Normals
-    err = surfacemeshing.triangle_normal_filter(dca,
-                                                simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceNormals"))
-    if err < 0:
-        print("TriangleNormalFilter ErrorCondition %d" % err)
-
-    # Find Minimum Triangle Dihedral Angle
-    err = surfacemeshing.triangle_dihedral_angle_filter(dca, simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                                 "FaceDihedralAngles"))
-    if err < 0:
-        print("TriangleDihedralAngleFilter ErrorCondition %d" % err)
-
-    # Generate IPF Colors (Face)
-    err = orientationanalysis.generate_face_ipf_coloring(dca,
-                                                         simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                             "FaceLabels"),
-                                                         simpl.DataArrayPath("TriangleDataContainer", "FaceData",
-                                                                             "FaceNormals"),
-                                                         simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                             "AvgEulerAngles"),
-                                                         simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                                         simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                             "CrystalStructures"),
-                                                         "SurfaceMeshFaceIPFColors")
-    if err < 0:
-        print("GenerateFaceIPFColoring ErrorCondition %d" % err)
-
-    # Generate Misorientation Colors (Face)
-    err = orientationanalysis.generate_face_misorientation_coloring(dca,
-                                                                    simpl.DataArrayPath("TriangleDataContainer",
-                                                                                        "FaceData", "FaceLabels"),
-                                                                    simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                        "AvgQuats"),
-                                                                    simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                                                        "Phases"),
-                                                                    simpl.DataArrayPath("Small IN100", "Phase Data",
-                                                                                        "CrystalStructures"),
-                                                                    "SurfaceMeshFaceMisorientationColors")
-    if err < 0:
-        print("GenerateFaceMisorientationColoring ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_mesh_stats()
diff --git a/Wrapping/Python/Examples/EBSD/Surface Mesh/04 SmallIN100 GBCD.py b/Wrapping/Python/Examples/EBSD/Surface Mesh/04 SmallIN100 GBCD.py
deleted file mode 100644
index 4051822a60..0000000000
--- a/Wrapping/Python/Examples/EBSD/Surface Mesh/04 SmallIN100 GBCD.py	
+++ /dev/null
@@ -1,190 +0,0 @@
-# Pipeline : (04) SmallIN100 GBCD (from EBSD Surface Meshing)
-#
-#
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import iopy
-
-import datetime as datetime
-
-
-def small_in100_gbcd():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceAreas").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceDihedralAngles").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceLabels").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "FaceNormals").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "SurfaceMeshFaceIPFColors").flag = 2
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceData").getDataArrayProxy(
-        "SurfaceMeshMisorientationColors").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("FaceFeatureData").flag = 2
-
-    dcap.getDataContainerProxy("TriangleDataContainer").getAttributeMatrixProxy("VertexData").getDataArrayProxy(
-        "NodeType").flag = 2
-
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/SurfaceMesh/SmallIN100_MeshStats.dream3d",
-                                    False, "", dt, dcap)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find GBCD
-    err = orientationanalysis.find_gbcd(dca, "FaceEnsembleData", 9,
-                                        simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceLabels"),
-                                        simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceNormals"),
-                                        simpl.DataArrayPath("TriangleDataContainer", "FaceData", "FaceAreas"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEulerAngles"),
-                                        simpl.DataArrayPath("Small IN100", "Grain Data", "Phases"),
-                                        simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"),
-                                        "GBCD")
-    if err < 0:
-        print("FindGBCD ErrorCondition %d" % err)
-
-    # Export GBCD Pole Figure (GMT 5)
-    err = iopy.visualize_gbcdgmt(dca, sd.GetBuildDirectory() + "/Debug/Data/Output/SmallIN100GBCD/SmallIn100GMT_1.dat",
-                                 1, simpl.AxisAngleInput(60, 1, 1, 1),
-                                 simpl.DataArrayPath("TriangleDataContainer", "FaceEnsembleData", "GBCD"),
-                                 simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"))
-    if err < 0:
-        print("VisualizeGBCDGMT ErrorCondition %d" % err)
-
-    # Export GBCD Pole Figure (VTK)
-    err = iopy.visualize_gbcd_pole_figure(dca,
-                                          sd.GetBuildDirectory() + "/Debug/Data/Output/SmallIN100GBCD/SmallIn100VTK.vtk",
-                                          1, simpl.AxisAngleInput(60, 1, 1, 1),
-                                          simpl.DataArrayPath("TriangleDataContainer", "FaceEnsembleData", "GBCD"),
-                                          simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures"))
-    if err < 0:
-        print("VisualizeGBCDPoleFigure ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/SurfaceMesh/SmallIN100_GBCD.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_gbcd()
diff --git a/Wrapping/Python/Examples/Edax_IPF_Colors.py b/Wrapping/Python/Examples/Edax_IPF_Colors.py
deleted file mode 100644
index e88b64f2e6..0000000000
--- a/Wrapping/Python/Examples/Edax_IPF_Colors.py
+++ /dev/null
@@ -1,71 +0,0 @@
-"""
-
-Pipeline example based on Edax_IPF_Colors
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import samplingpy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def color_data_change_test():
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-    print("Build Dir: %s" % sd.GetBuildDirectory())
-    # ReadAngData
-    err = orientationanalysispy.read_ang_data(dca, "EBSD Scan", "Phase Data", "Scan Data",
-                                              False, sd.GetBuildDirectory() + "/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    # Rotate Sample Reference Frame
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath("EBSD Scan", "Scan Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    # Rotate Euler Reference Frame
-    err = orientationanalysispy.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                       simpl.DataArrayPath("EBSD Scan", "Scan Data", "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    # Threshold Objects
-    err = sc.MultiThresholdObjects(dca, "Mask", [("EBSD Scan", "Scan Data", "Confidence Index", ">", 0.1)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath("EBSD Scan", "Scan Data", "Phases"),
-                                                    simpl.DataArrayPath("EBSD Scan", "Scan Data", "EulerAngles"),
-                                                    simpl.DataArrayPath("EBSD Scan",
-                                                                        "Phase Data", "CrystalStructures"),
-                                                    True,
-                                                    simpl.DataArrayPath("EBSD Scan", "Scan Data", "Mask"), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # ITK Image Writer
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "Data/Output/Small_IN100_Slice_1.png",
-                                                simpl.DataArrayPath("EBSD Scan", "Scan Data", "IPFColor"), 0)
-    if err < 0:
-        print("ITKImageWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    color_data_change_test()
-
-
diff --git a/Wrapping/Python/Examples/Export_Small_IN100_ODF_Data.py b/Wrapping/Python/Examples/Export_Small_IN100_ODF_Data.py
deleted file mode 100644
index a4be0ed879..0000000000
--- a/Wrapping/Python/Examples/Export_Small_IN100_ODF_Data.py
+++ /dev/null
@@ -1,191 +0,0 @@
-#
-# Example pipeline : Export Small IN100 ODF Data
-#
-
-import time
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import samplingpy as sampling
-
-
-def export_small_in100_odf_data():
-    run_pipeline = False
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    if run_pipeline:
-        pipeline_test(dca)
-    else:
-        pythonic_test(dca)
-
-
-def pipeline_test(dca):
-    # ReadAngData
-    # Read in the SmallIN100 data
-    print("# --- ReadAngData ")
-    read_ang_data = orientationanalysis.ReadAngData.New()
-    read_ang_data.setDataContainerArray(dca)
-    read_ang_data.InputFile = sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang"
-    read_ang_data.DataContainerName = "Small IN100 Slice 1"
-    read_ang_data.CellAttributeMatrixName = "EBSD Scan Data"
-    read_ang_data.CellEnsembleAttributeMatrixName = "Phase Data"
-    read_ang_data.preflight()
-    print("  Preflight Error Code: %s" % read_ang_data.ErrorCondition)
-    filter_name = read_ang_data.NameOfClass
-    if filter_name != "ReadAngData":
-        print("  Error: Filter class name is not correct. %s != ReadAngData" % filter_name)
-
-    # RotateEulerRefFrame
-    print("# --- RotateEulerRefFrame ")
-    rotate_euler_ref_frame = orientationanalysis.RotateEulerRefFrame.New()
-    rotate_euler_ref_frame.setDataContainerArray(dca)
-    rotate_euler_ref_frame.RotationAngle = 90.0
-    rotate_euler_ref_frame.RotationAxis = simpl.FloatVec3(0.0, 0.0, 1.0)
-    rotate_euler_ref_frame.CellEulerAnglesArrayPath = simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                       "EulerAngles")
-    rotate_euler_ref_frame.preflight()
-    print("  Preflight Error Code: %s" % rotate_euler_ref_frame.ErrorCondition)
-    filter_name = rotate_euler_ref_frame.NameOfClass
-    if filter_name != "RotateEulerRefFrame":
-        print("  Error: Filter class name is not correct. %s != RotateEulerRefFrame" % filter_name)
-
-    # RotateSampleRefFrame
-    #
-    print("# --- RotateSampleRefFrame ")
-    rotate_sample_ref_frame = sampling.RotateSampleRefFrame.New()
-    rotate_sample_ref_frame.setDataContainerArray(dca)
-    rotate_sample_ref_frame.RotationAngle = 180.0
-    rotate_sample_ref_frame.RotationAxis = simpl.FloatVec3(0.0, 1.0, 0.0)
-    rotate_sample_ref_frame.CellAttributeMatrixPath = simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "")
-    rotate_sample_ref_frame.preflight()
-    print("  Preflight Error Code: %s" % rotate_sample_ref_frame.ErrorCondition)
-    filter_name = rotate_sample_ref_frame.NameOfClass
-    if filter_name != "RotateSampleRefFrame":
-        print("  Error: Filter class name is not correct. %s != RotateSampleRefFrame" % filter_name)
-
-    # MultiThresholdObjects
-    #
-    print("# --- MultiThresholdObjects ")
-    multi_threshold_objects = simpl.MultiThresholdObjects.New()
-    multi_threshold_objects.setDataContainerArray(dca)
-    multi_threshold_objects.DestinationArrayName = "Mask"
-    selected_thresholds = simpl.ComparisonInputs()
-    selected_thresholds.addInput("Small IN100 Slice 1", "EBSD Scan Data", "Confidence Index", 1, 0.1)
-    selected_thresholds.addInput("Small IN100 Slice 1", "EBSD Scan Data", "Image Quality", 1, 120)
-    multi_threshold_objects.SelectedThresholds = selected_thresholds
-    multi_threshold_objects.preflight()
-    print("  Preflight Error Code: %s" % multi_threshold_objects.ErrorCondition)
-    filter_name = multi_threshold_objects.NameOfClass
-    if filter_name != "MultiThresholdObjects":
-        print("  Error: Filter class name is not correct. %s != MultiThresholdObjects" % filter_name)
-
-    # WriteStatsGenOdfAngleFile
-    #
-    print("# --- WriteStatsGenOdfAngleFile ")
-    write_stats_gen_odf_angle_file = orientationanalysis.WriteStatsGenOdfAngleFile.New()
-    write_stats_gen_odf_angle_file.setDataContainerArray(dca)
-    write_stats_gen_odf_angle_file.OutputFile = sd.GetTestTempDirectory() + "/StatsGenODF.txt"
-    write_stats_gen_odf_angle_file.Weight = 1
-    write_stats_gen_odf_angle_file.Sigma = 1
-    write_stats_gen_odf_angle_file.Delimiter = 2
-    write_stats_gen_odf_angle_file.CellPhasesArrayPath = simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                        "Phases")
-    write_stats_gen_odf_angle_file.CellEulerAnglesArrayPath = simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                             "EulerAngles")
-    write_stats_gen_odf_angle_file.GoodVoxelsArrayPath = simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Mask")
-    write_stats_gen_odf_angle_file.ConvertToDegrees = True
-    write_stats_gen_odf_angle_file.UseGoodVoxels = True
-    write_stats_gen_odf_angle_file.preflight()
-    print("  Preflight Error Code: %s" % write_stats_gen_odf_angle_file.ErrorCondition)
-    filter_name = write_stats_gen_odf_angle_file.NameOfClass
-    if filter_name != "WriteStatsGenOdfAngleFile":
-        print("  Error: Filter class name is not correct. %s != WriteStatsGenOdfAngleFile" % filter_name)
-
-    # Construct the pipeline
-    pipeline = simpl.FilterPipeline.New()
-    pipeline.Name = ("New Pipeline")
-    print("Pipeline Name: %s " % pipeline.Name)
-
-    pipeline.pushBack(read_ang_data)
-    pipeline.pushBack(rotate_euler_ref_frame)
-    pipeline.pushBack(rotate_sample_ref_frame)
-    pipeline.pushBack(multi_threshold_objects)
-    pipeline.pushBack(write_stats_gen_odf_angle_file)
-
-    filter_count = pipeline.size()
-    print("Filter Count: %d" % filter_count)
-
-    err = pipeline.preflightPipeline()
-    print("Preflight ErrorCondition: %d" % err)
-
-    # Run the pipeline
-    data_container = pipeline.run()
-    err = pipeline.ErrorCondition
-    print("Execute ErrorCondition: %d" % err)
-
-    pipeline.popFront()
-    filter_count = pipeline.size()
-    print("Filter Count: %d" % filter_count)
-
-    time.sleep(2)
-
-
-def pythonic_test(dca):
-    err = orientationanalysis.read_ang_data(dca, "Small IN100 Slice 1", "Phase Data", "EBSD Scan Data",
-                                            False,
-                                            sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    err = orientationanalysis.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                     simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                         "EBSD Scan Data", "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    err = sampling.rotate_sample_ref_frame(dca,
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", ""),
-                                           simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    # Create the selected thresholds / comparison inputs for MultiThresholdObjects filter
-    selected_thresholds = simpl.ComparisonInputs()
-    selected_thresholds.addInput("Small IN100 Slice 1", "EBSD Scan Data", "Confidence Index", 1, 0.1)
-    selected_thresholds.addInput("Small IN100 Slice 1", "EBSD Scan Data", "Image Quality", 1, 120)
-
-    err = simplpy.multi_threshold_objects(dca, "Mask", selected_thresholds)
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    am = dca.getAttributeMatrix(simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", ""))
-    data_array = am.getAttributeArray("EulerAngles")
-    rawdata = data_array.Data
-    # print(rawdata)
-    err = orientationanalysis.write_stats_gen_odf_angle_file(dca,
-                                                             sd.GetTestTempDirectory() + "/StatsGenODF.txt",
-                                                             1, 1, 2,
-                                                             simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                 "EBSD Scan Data", "Phases"),
-                                                             simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                 "EBSD Scan Data",
-                                                                                 "EulerAngles"),
-                                                             simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                 "EBSD Scan Data", "Mask"),
-                                                             True, True)
-    if err < 0:
-        print("WriteStatsGenOdfAngleFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    export_small_in100_odf_data()
-    print("Test Complete")
diff --git a/Wrapping/Python/Examples/INL_Export.py b/Wrapping/Python/Examples/INL_Export.py
deleted file mode 100644
index bf0fe609ca..0000000000
--- a/Wrapping/Python/Examples/INL_Export.py
+++ /dev/null
@@ -1,164 +0,0 @@
-# Based on INL_Export example
-# 
-# These are the simpl_py python modules
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import samplingpy
-from dream3d import processingpy
-from dream3d import reconstructionpy
-from dream3d import genericpy
-from dream3d import statisticspy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def inl_export():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # ReadAngData
-    err = orientationanalysispy.read_ang_data(dca, "Small IN100 Slice 1", "Phase Data", "EBSD Scan Data",
-                                              False, sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    # Rotate Sample Reference Frame
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    # Rotate Euler Reference Frame
-    err = orientationanalysispy.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                       simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                           "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    # MultiThresholdObjects filter
-    err = sc.MultiThresholdObjects(dca, "Mask",
-                                   [("Small IN100 Slice 1", "EBSD Scan Data", "Confidence Index", 1, 0.1),
-                                    ("Small IN100 Slice 1", "EBSD Scan Data", "Image Quality", 1, 120)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Convert Orientation Representation
-    err = orientationanalysispy.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                     simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                         "EulerAngles"),
-                                                     "Quats")
-    if err < 0:
-        print("ConvertOrientation ErrorCondition: %d" % err)
-
-    # Isolate Largest Feature (Identify Sample)
-    err = processingpy.identify_sample(dca, False,
-                                       simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Mask"))
-    if err < 0:
-        print("IdentifySample ErrorCondition: %d" % err)
-
-    # Neighbor Orientation Comparison (Bad Data)
-    err = orientationanalysispy.bad_data_neighbor_orientation_check(dca, 5, 4,
-                                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                        "EBSD Scan Data",
-                                                                                        "Mask"),
-                                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                        "EBSD Scan Data",
-                                                                                        "Phases"),
-                                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                        "Phase Data",
-                                                                                        "CrystalStructures"),
-                                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                        "EBSD Scan Data",
-                                                                                        "Quats"))
-    if err < 0:
-        print("NeighborOrientationComparison ErrorCondition %d" % err)
-
-    # Neighbor Orientation Correlation
-    err = orientationanalysispy.neighbor_orientation_correlation(dca, 5, 0.2, 2,
-                                                                 simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                     "EBSD Scan Data",
-                                                                                     "Confidence Index"),
-                                                                 simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                     "EBSD Scan Data",
-                                                                                     "Phases"),
-                                                                 simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                     "Phase Data",
-                                                                                     "CrystalStructures"),
-                                                                 simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                     "EBSD Scan Data",
-                                                                                     "Quats"))
-    if err < 0:
-        print("NeighborOrientationCorrelation ErrorCondition %d" % err)
-
-    # Segment Features (Misorientation)
-    err = reconstructionpy.ebsd_segment_features(dca, "Grain Data", 5, True,
-                                                 simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Mask"),
-                                                 simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Phases"),
-                                                 simpl.DataArrayPath("Small IN100 Slice 1", "Phase Data",
-                                                                     "CrystalStructures"),
-                                                 simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Quats"),
-                                                 "FeatureIds", "Active")
-    if err < 0:
-        print("SegmentFeatures ErrorCondition %d" % err)
-
-    # Find Feature Phases
-    err = genericpy.find_feature_phases(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "FeatureIds"),
-                                        simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Phases"),
-                                        simpl.DataArrayPath("Small IN100 Slice 1", "Grain Data", "Phases"))
-    if err < 0:
-        print("FindFeaturePhases ErrorCondition %d" % err)
-
-    # Find Number of Features
-    err = statisticspy.find_num_features(dca,
-                                         simpl.DataArrayPath("Small IN100 Slice 1", "Grain Data", "Phases"),
-                                         simpl.DataArrayPath("Small IN100 Slice 1", "Phase Data", "NumFeatures"))
-    if err < 0:
-        print("FindNumFeatures ErrorCondition %d" % err)
-    
-    # Export INL File
-    err = orientationanalysispy.inl_writer(dca, sd.GetBuildDirectory() +
-                                           "/Debug/Data/Output/INL_Example/Small_IN100.inl",
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "Phase Data", "MaterialName"),
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "FeatureIds"),
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "Phases"),
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "Phase Data",
-                                                               "CrystalStructures"),
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "Phase Data", "NumFeatures"),
-                                           simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data", "EulerAngles"))
-    if err < 0:
-        print("INL Writer ErrorCondition %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                        "EBSD Scan Data", "Phases"),
-                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                        "EBSD Scan Data", "EulerAngles"),
-                                                    simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                        "Phase Data", "CrystalStructures"),
-                                                    True,
-                                                    simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                        "Mask"),
-                                                    "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # ITK Image Writer
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Debug/Data/Example/Small_IN100_Slice_1.png",
-                                                simpl.DataArrayPath("Small IN100 Slice 1", "EBSD Scan Data",
-                                                                    "IPFColor"), 0)
-    if err < 0:
-        print("ITKImageWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    inl_export()
diff --git a/Wrapping/Python/Examples/Image Reconstruction/01 - Image Initial Visualization.py b/Wrapping/Python/Examples/Image Reconstruction/01 - Image Initial Visualization.py
deleted file mode 100644
index dab343357b..0000000000
--- a/Wrapping/Python/Examples/Image Reconstruction/01 - Image Initial Visualization.py	
+++ /dev/null
@@ -1,40 +0,0 @@
-# Based on Image Initial Visualization example
-# 
-# These are the simpl_py python modules
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def image_initial_visualization():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Register the ImageIO Factories
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-
-    # Import Image Stack [ITK]
-    file_list_info = simpl.FileListInfo(2, 0, 11, 174, 1, sd.GetBuildDirectory() + "/Debug/Data/Image",
-                                        "slice_", "", "tif")
-    err = itkimageprocessingpy.itk_import_image_stack(dca, "RoboMet.3D Image Stack", "Optical Data",
-                                                      simpl.FloatVec3(0, 0, 0), simpl.FloatVec3(1, 1, 1),
-                                                      "", file_list_info, 164, "ImageData")
-    if err < 0:
-        print("ITK Import Image Stack ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/ImagesStack/Images.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    image_initial_visualization()
\ No newline at end of file
diff --git a/Wrapping/Python/Examples/Image Reconstruction/02 - Image Segmentation.py b/Wrapping/Python/Examples/Image Reconstruction/02 - Image Segmentation.py
deleted file mode 100644
index 972aea3fda..0000000000
--- a/Wrapping/Python/Examples/Image Reconstruction/02 - Image Segmentation.py	
+++ /dev/null
@@ -1,145 +0,0 @@
-# Based on Image Segmentation example
-# 
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-from dream3d import reconstructionpy
-from dream3d import statisticspy
-from dream3d import genericpy
-from dream3d import orientationanalysispy
-
-"""
-Pipeline Annotation:
---------------------
-This example pipeline shows how to read in a 3D stack of images, segment them and perform 
-some basic size statistics on the segmented features. Since this data set is from an image 
-there is no phase data which is created in a filter and phase data is also generated during
-the pipeline. Note the technique for accomplishing this as it is handy to do for other pipelines.
-"""
-
-
-def image_segmentation():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Register the ImageIO Factories
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-
-    # Common variables
-    data_container_name = "RoboMet.3D Image Stack"
-    attr_matrix_name = "Optical Data"
-
-    # Import Image Stack [ITK]
-    file_list_info = simpl.FileListInfo(2, 0, 11, 174, 1, sd.GetBuildDirectory() + "/Debug/Data/Image",
-                                        "slice_", "", "tif")
-    err = itkimageprocessingpy.itk_import_image_stack(dca, data_container_name, attr_matrix_name,
-                                                      simpl.FloatVec3(0, 0, 0), simpl.FloatVec3(1, 1, 1),
-                                                      "", file_list_info, 164, "ImageData")
-    if err < 0:
-        print("ITK Import Image Stack ErrorCondition %d" % err)
-
-    # MultiThresholdObjects filter
-    err = sc.MultiThresholdObjects(dca, "Mask",
-                                  [(data_container_name, attr_matrix_name, "ImageData", 2, 0)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Segment Features (Scalar)
-    err = reconstructionpy.scalar_segment_features(dca, "Pore Data",
-                                                   simpl.DataArrayPath(data_container_name,
-                                                                       attr_matrix_name, "ImageData"),
-                                                   10, True, simpl.DataArrayPath(data_container_name,
-                                                                                 attr_matrix_name, "Mask"),
-                                                   "FeatureIds", "Active")
-    if err < 0:
-        print("ScalarSegmentFeatures ErrorCondition %d" % err)
-
-    # Find Feature Sizes
-    err = statisticspy.find_sizes(dca, simpl.DataArrayPath(data_container_name, "Pore Data", ""),
-                                  simpl.DataArrayPath(data_container_name, attr_matrix_name, "FeatureIds"),
-                                  "Volumes", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition %d" % err)
-
-    # Copy Feature Array To Element Array
-    err = simplpy.copy_feature_array_to_element_array(dca,
-                                                      simpl.DataArrayPath(data_container_name,
-                                                                          "Pore Data",
-                                                                          "EquivalentDiameters"),
-                                                      simpl.DataArrayPath(data_container_name,
-                                                                          attr_matrix_name,
-                                                                          "FeatureIds"),
-                                                      "EquivalentDiameters")
-    if err < 0:
-        print("CopyFeatureArrayToElementArray ErrorCondition %d" % err)
-
-    # Create Data Array
-    err = simplpy.create_data_array(dca, simpl.ScalarTypes.Int32, 1,
-                                    simpl.DataArrayPath(data_container_name, attr_matrix_name, "Phases"),
-                                    simpl.InitializationType.Manual, "1", (0.0, 151.1))
-    if err < 0:
-        print("DataArray ErrorCondition: %d" % err)
-    
-    # Replace Value in Array (Conditional)
-    err = simplpy.conditional_set_value(dca, simpl.DataArrayPath(data_container_name,
-                                                                 attr_matrix_name,
-                                                                 "Phases"),
-                                        simpl.DataArrayPath(data_container_name,
-                                                            attr_matrix_name,
-                                                            "Mask"), 2)
-    if err < 0:
-        print("ConditionalSetValue ErrorCondition: %d" % err)
-
-    # Find Feature Phases
-    err = genericpy.find_feature_phases(dca, simpl.DataArrayPath(data_container_name, attr_matrix_name, "FeatureIds"),
-                                        simpl.DataArrayPath(data_container_name, attr_matrix_name, "Phases"),
-                                        simpl.DataArrayPath(data_container_name, "Pore Data", "Phases"))
-    if err < 0:
-        print("FindFeaturePhases ErrorCondition %d" % err)
-
-    # Find Feature Centroids
-    err = genericpy.find_feature_centroids(dca, simpl.DataArrayPath(data_container_name, attr_matrix_name,
-                                                                    "FeatureIds"),
-                                           simpl.DataArrayPath(data_container_name, "Pore Data", "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition %d" % err)
-    
-    # Create Ensemble Info
-    ensemble_info = simpl.EnsembleInfo()
-    ensemble_info.addValues(simpl.CrystalStructure.Cubic_High, simpl.PhaseType.Matrix, "Matrix")
-    ensemble_info.addValues(simpl.CrystalStructure.Cubic_High, simpl.PhaseType.Precipitate, "Pores")
-    err = orientationanalysispy.create_ensemble_info(dca, data_container_name, "EnsembleAttributeMatrix",
-                                                     ensemble_info, "CrystalStructures", "PhaseTypes", "PhaseNames")
-    if err < 0:
-        print("CreateEnsembleInfo ErrorCondition %d" % err)
-
-    # Find Feature Clustering
-    err = statisticspy.find_feature_clustering(dca, 10, 2, simpl.DataArrayPath(data_container_name,
-                                                                               "EnsembleAttributeMatrix", ""),
-                                               False, simpl.DataArrayPath("", "", ""), 
-                                               simpl.DataArrayPath(data_container_name, "Pore Data",
-                                                                   "EquivalentDiameters"),
-                                               simpl.DataArrayPath(data_container_name, "Pore Data", "Phases"),
-                                               simpl.DataArrayPath(data_container_name, "Pore Data", "Centroids"),
-                                               "ClusteringList", "RDF", "RDFMaxMinDistances")
-    if err < 0:
-        print("FindFeatureClustering ErrorCondition %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/ImagesStack/Images.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    image_segmentation()
diff --git a/Wrapping/Python/Examples/Image_Histogram.py b/Wrapping/Python/Examples/Image_Histogram.py
deleted file mode 100644
index 9aea05ffeb..0000000000
--- a/Wrapping/Python/Examples/Image_Histogram.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-
-Pipeline example based on Image_Histogram
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import statisticspy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def image_histogram():
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # ITK Image Reader
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_reader(dca, sd.GetBuildDirectory() + "/Data/Image/slice_11.tif",
-                                                "ImageDataContainer", "CellData", "ImageData")
-    if err < 0:
-        print("ITKImageReader ErrorCondition %d" % err)
-
-    # Calculate Frequency Histogram
-    err = statisticspy.calculate_array_histogram(dca, simpl.DataArrayPath("ImageDataContainer", "CellData",
-                                                                          "ImageData"),
-                                                 256, 0, 256, True, False, "HistogramAttributeMatrix",
-                                                 "Image_Histogram", False, "")
-    if err < 0:
-        print("CalculateArrayHistogram ErrorCondition %d" % err)
-
-    # Export ASCII Data
-    selected_data_array_paths = [simpl.DataArrayPath("ImageDataContainer", "HistogramAttributeMatrix",
-                                                     "Image_Histogram")]
-    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Data/Output/Histograms", 0, ".csv", 1)
-    if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    image_histogram()
-
-
diff --git a/Wrapping/Python/Examples/Import_ASCII.py b/Wrapping/Python/Examples/Import_ASCII.py
deleted file mode 100644
index 2b83405459..0000000000
--- a/Wrapping/Python/Examples/Import_ASCII.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-
-Pipeline example based on Import_ASCII
-
-"""
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def import_ascii():
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Pipeline Annotation:
-    """
-    This pipeline shows how to import column oriented data into DREAM.3D.
-
-    # Create DataContainer #
-    We need somewhere to store the data
-
-    # Create Geometry #
-    Create the proper geometry that the data is stored on
-
-    # Import ASCII Data #
-    This imports all the data from the .ang file into DREAM.3D. **Note that there is a filter specific for this and you should use that filter. We are just using that file because it is a convenient file that is distributed with DREAM.3D**
-
-    # Combine Attribute Arrrays #
-    This will take the phi1, PHI, phi2 arrays and combine them into a single 3 Component AttributeArray
-    """
-
-    # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
-    if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
-
-    # Create Geometry
-    err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Image, "DataContainer", False, 
-                            dimensions=simpl.IntVec3(189, 201, 1), origin=simpl.FloatVec3(0, 0, 0),
-                            resolution=simpl.FloatVec3(0.25, 0.25, 1), cell_attribute_matrix_name="CellData")
-    if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
-
-    # Import ASCII Data- Vertex Coordinates (Using helper function)
-    importFile = sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang"
-
-    err = simplpy.read_ascii_data(dca, sc.CreateAsciiWizardData(importFile, 33, 38021, [' '], True, True, 
-                                  simpl.DataArrayPath("DataContainer", "CellData", ""),
-                                  ["phi1", "Phi", "phi2", "x", "y", "Image Quality",
-                                   "Confidence Index", "Phase", "SEM Signal", "Fit"],
-                                  3, [37989], ["float", "float", "float", "float", "float",
-                                  "float", "float", "int32_t", "float", "float"]))
-    if err < 0:
-        print("Import ASCII Data -  ErrorCondition: %d" % err)
-    
-    # Combine Attribute Arrays:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "CellData", "phi1"),
-                                 simpl.DataArrayPath("DataContainer", "CellData", "Phi"),
-                                 simpl.DataArrayPath("DataContainer", "CellData", "phi1")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Eulers", False)
-    if err < 0:
-        print("Combined Attribute Arrays -  ErrorCondition: %d" % err)
-
-    # Delete Data
-    # Remove array helper function:
-    err = sc.RemoveArrays(dca, [("DataContainer", "CellData", "phi1"), ("DataContainer", "CellData", "phi2"),
-                                ("DataContainer", "CellData", "Phi")])
-    if err < 0:
-        print("Remove Arrays -  ErrorCondition: %d" % err)
-
-    # Create Ensemble Info
-    ensemble_info = simpl.EnsembleInfo()
-    ensemble_info.addValues(simpl.CrystalStructure.Cubic_High, simpl.PhaseType.Primary, "Nickel")
-    err = orientationanalysispy.create_ensemble_info(dca, "DataContainer", "EnsembleAttributeMatrix",
-                                                     ensemble_info, "CrystalStructures", "PhaseTypes", "PhaseNames")
-    if err < 0:
-        print("CreateEnsembleInfo ErrorCondition %d" % err)
-
-    # Replace Value in Array
-    err = simplpy.replace_value_in_array(dca, simpl.DataArrayPath("DataContainer", "CellData", "Phase"),
-                                         0, 1)
-    if err < 0:
-        print("ReplaceValueInArray ErrorCondition %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath("DataContainer", "CellData", "Phase"),
-                                                    simpl.DataArrayPath("DataContainer", "CellData", "Eulers"),
-                                                    simpl.DataArrayPath("DataContainer",
-                                                                        "EnsembleAttributeMatrix",
-                                                                        "CrystalStructures"),
-                                                    False,
-                                                    simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # ITK Image Writer
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Debug/Data/Example/Import_ASCII_IPF.png",
-                                                simpl.DataArrayPath("DataContainer", "CellData", "IPFColor"), 0)
-    if err < 0:
-        print("ITKImageWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    import_ascii()
-
-
diff --git a/Wrapping/Python/Examples/Misc_Filters.py b/Wrapping/Python/Examples/Misc_Filters.py
deleted file mode 100644
index 4f21dfb187..0000000000
--- a/Wrapping/Python/Examples/Misc_Filters.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# Based on Misc_Filters example
-# 
-
-# These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import samplingpy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def misc_filters_test():
-    """
-    Pipeline Annotation
-    --------------------
-    This pipeline shows some miscellaneous filters that can be used in a pipeline.
-
-    The only thing that this particular "Filter" does is allow you, the user/developer of the pipeline, to do is provide
-     your self notes about the purpose of a particular section of pipeline or an entire pipeline.
-
-    For example in this pipeline we are going to read some EBSD data, rename a few things and show other filters being
-     used.
-
-    """
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # ReadAngData
-    err = orientationanalysispy.read_ang_data(dca, "ImageDataContainer", "CellEnsembleData", "CellData",
-                                              False, sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    # Rename Data Container
-    err = simplpy.rename_data_container(dca, "ImageDataContainer", "Small IN100 Slice 1")
-    if err < 0:
-        print("RenameDataContainer ErrorCondition: %d" % err)
-  
-    # Rename Attribute Matrix
-    err = simplpy.rename_attribute_matrix(dca, simpl.DataArrayPath("Small IN100 Slice 1", "CellData", ""),
-                                          "EBSD_Data")
-
-    # Rotate Sample Reference Frame
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath("Small IN100 Slice 1", "EBSD_Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    # Rotate Euler Reference Frame
-    err = orientationanalysispy.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                       simpl.DataArrayPath("Small IN100 Slice 1", "EBSD_Data",
-                                                                           "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    # Create String Array
-    err = simplpy.create_string_array(dca, 1, simpl.DataArrayPath("Small IN100 Slice 1", "CellEnsembleData",
-                                                                  "Description"),
-                                      "A description of the phase")
-    if err < 0:
-        print("CreateStringArray ErrorCondition: %d" % err)
-
-    """
-    Pipeline Annotation:
-    --------------------
-    This next section shows applying a color table to the Confidence Index and then saving the image
-    """
-
-    # Generate color table #1
-    jet_json_array = simpl.JsonArray([
-         -1,
-         0,
-         0,
-         0.5625,
-         -0.777778,
-         0,
-         0,
-         1,
-         -0.269841,
-         0,
-         1,
-         1,
-         -0.015873,
-         0.5,
-         1,
-         0.5,
-         0.238095,
-         1,
-         1,
-         0,
-         0.746032,
-         1,
-         0,
-         0,
-         1,
-         0.5,
-         0,
-         0])
-    err = simplpy.generate_color_table(dca, "jet", jet_json_array, simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                       "EBSD_Data", "Confidence Index"),
-                                       "Confidence_Index_Jet")
-    if err < 0:
-        print("GenerateColorTable #1 ErrorCondition: %d" % err)
-
-    # ITK Image Writer #1
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Debug/Data/Output/Example/Small_IN100_Slice_1_CI_Jet.png",
-                                                simpl.DataArrayPath("Small IN100 Slice 1", "EBSD_Data",
-                                                                    "Confidence_Index_Jet"), 0)
-    if err < 0:
-        print("ITKImageWriter #1 ErrorCondition: %d" % err)
-
-    """
-    Pipeline Annotation:
-    --------------------
-    This next section shows extracting the "phi1" Euler angle, applying the "Jet" color table and then saving the image.
-    """
-
-    # Extract Component as Attribute Array
-    err = simplpy.extract_component_as_array(dca,
-                                             simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                 "EBSD_Data", "EulerAngles"),
-                                             0, "phi1")
-    if err < 0:
-        print("ExtractComponentAsArray ErrorCondition %d" % err)
-
-    # Generate color table #1
-    err = simplpy.generate_color_table(dca, "jet", jet_json_array, simpl.DataArrayPath("Small IN100 Slice 1",
-                                                                                       "EBSD_Data", "phi1"),
-                                       "phi1_Jet")
-    if err < 0:
-        print("GenerateColorTable #2 ErrorCondition: %d" % err)
-
-    # ITK Image Writer #2
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Debug/Data/Output/Example/Small_IN100_Slice_1_phi1_Jet.png",
-                                                simpl.DataArrayPath("Small IN100 Slice 1", "EBSD_Data", "phi1_Jet"), 0)
-    if err < 0:
-        print("ITKImageWriter #2 ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    misc_filters_test()
diff --git a/Wrapping/Python/Examples/Synthetic/01_Single Cubic Phase Equiaxed.py b/Wrapping/Python/Examples/Synthetic/01_Single Cubic Phase Equiaxed.py
deleted file mode 100644
index 25623e4ab9..0000000000
--- a/Wrapping/Python/Examples/Synthetic/01_Single Cubic Phase Equiaxed.py	
+++ /dev/null
@@ -1,213 +0,0 @@
-"""
-Test of Single Cubic Phase Equiaxed Pipeline example in Python
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import statisticspy as statistics
-from dream3d import syntheticbuildingpy as syntheticbuilding
-
-# Numpy for some data management assistance
-import numpy as np
-
-
-def single_cubic_phase_equiaxed():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Stats Generator Filter
-    # # Create a StatsDataArray
-    stats_data_array = simpl.StatsDataArray(1, "StatsDataArray", True)
-    stats_data_array.fillArrayWithNewStatsData(1, simpl.PhaseType.Primary)
-    stats_data_array.getStatsData(0).BinStepSize = 10.0
-
-    # Might not need to set the Min and Max Feature Diameter (should be calculated)
-    stats_data_array.getStatsData(0).MinFeatureDiameter = 2
-    stats_data_array.getStatsData(0).MaxFeatureDiameter = 33
-
-    stats_data_array.getStatsData(0).PhaseFraction = 1
-    stats_data_array.getStatsData(0).BoundaryArea = 0
-    stats_data_array.getStatsData(0).FeatureSize_DistType = 1
-
-    # Crystal Structures:
-    crystal_structures = simpl.UInt32ArrayType(1, "CrystalStructures", True)
-    crystal_structures.setValue(0, 1)
-
-    # Phase Types
-    phase_types = simpl.UInt32ArrayType(1, "PhaseTypes", True)
-    phase_types.setValue(0, simpl.PhaseType.Primary)
-
-    # Phase Name
-    phase_names = simpl.StringDataArray(1, "PhaseName", True)
-    phase_names.setValue(0, "Primary")
-
-    # TESTING --> FloatArrayType array
-    (z1, floatArray1) = sc.ConvertToDataArray("FloatArray", np.zeros((1,)).astype('float32'))
-    floatArray1.Name = "Average"
-    floatArray1.setValue(0, 2.3)
-    (z2, floatArray2) = sc.ConvertToDataArray("FloatArray", np.zeros((1,)).astype('float32'))
-    floatArray2.Name = "Standard Deviation"
-    floatArray2.setValue(0, 0.4)
-    stats_data_array.getStatsData(0).FeatureSizeDistribution = [floatArray1, floatArray2]
-
-    # err = syntheticbuilding.stats_generator_filter(dca, "StatsGeneratorDataContainer",
-    #                                                        "CellEnsembleData", "Statistics", "CrystalStructures",
-    #                                                         "PhaseTypes", "PhaseName", stats_data_array,
-    #                                                         crystal_structures, phase_types, phase_names,
-    #                                                         simpl.DataArrayPath("StatsGeneratorDataContainer",
-    #                                                                             "CellEnsembleData", ""))
-
-    # err = syntheticbuilding.generate_primary_stats_data(dca, "Primary", 0, 1, 0,
-    #                             1, 2.3, 0.4, 4, 3, 10.5,
-    #                             True, "StatsGeneratorDataContainer",
-    #                             "CellEnsembleData", False,
-    #                             simpl.DataArrayPath("", "", ""),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-    #                                                                                            "Euler 3", "Weight",
-    #                                                                                            "Sigma"], ["0"]),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-    #                                                                                            "Axis (k)", "Axis (l)",
-    #                                                                                            "Weight (MRD)"], ["0"]),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-    #                                                                                            "Euler 3", "Weight",
-    #                                                                                            "Sigma"], ["0"]))
-
-    # Using the GenerateStatsData helper function
-    # err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 1, 0,
-    #                             1, 2.3, 0.4, 4, 3, 10.5,
-    #                             True, "StatsGeneratorDataContainer",
-    #                             "CellEnsembleData", False,
-    #                             simpl.DataArrayPath("", "", ""),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-    #                                                                                            "Euler 3", "Weight",
-    #                                                                                            "Sigma"], ["0"]),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-    #                                                                                            "Axis (k)", "Axis (l)",
-    #                                                                                            "Weight (MRD)"], ["0"]),
-    #                             simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-    #                                                                                            "Euler 3", "Weight",
-    #                                                                                            "Sigma"], ["0"]))
-
-    # Using the GenerateStatsData and CreateDynamicTableData functions
-    euler_dynamic_table_data = sc.CreateDynamicTableData([[0, 0, 0, 0, 0]],
-                                                      ["Euler 1", "Euler 2", "Euler 3", "Weight", "Sigma"], ["0"])
-    axis_dynamic_table_data = sc.CreateDynamicTableData([[0, 0, 0, 0, 0]],
-                                                     ["Angle(w)", "Axis (h)", "Axis (k)", "Axis (l)", "Weight (MRD)"],
-                                                     ["0"])
-    err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 1, 0,
-                               1, 2.3, 0.4, 4, 3, 10.5,
-                               True, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", False,
-                               simpl.DataArrayPath("", "", ""),
-                               euler_dynamic_table_data,
-                               axis_dynamic_table_data,
-                               euler_dynamic_table_data)
-
-    if err < 0:
-        print("StatsGeneratorFilter ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuilding.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "CellData",
-                                                        "CellEnsembleMatrixName", simpl.IntVec3(128, 128, 128),
-                                                        simpl.FloatVec3(0.5, 0.5, 0.5),
-                                                        simpl.FloatVec3(0, 0, 0),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "Statistics"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseTypes"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseName"),
-                                                        False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuilding.establish_shape_types(dca,
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuilding.pack_primary_phases(dca,
-                                                simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                    ""),
-                                                "Grain Data", "CellEnsembleData", "FeatureIds", "Phases",
-                                                "Phases", "NumFeatures",
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "Statistics"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseTypes"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseName"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "ShapeTypes"),
-                                                simpl.DataArrayPath("", "", ""), False,
-                                                sc.FeatureGeneration.GenerateFeatures, "", "", False,
-                                                False, sc.SaveShapeDescArrays.DoNotSave,
-                                                simpl.DataArrayPath("", "", ""),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                        "FeatureIds"),
-                                    "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuilding.match_crystallography(dca, simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                           "CellEnsembleData", "Statistics"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "FeatureIds"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SurfaceFeatures"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "NeighborList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SharedSurfaceAreaList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellEnsembleData", "NumFeatures"),
-                                                  "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "EulerAngles"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  False,
-                                                  simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Synthetic/01_CubicSingleEquiaxedOut.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    single_cubic_phase_equiaxed()
diff --git a/Wrapping/Python/Examples/Synthetic/02_Single Hexagonal Phase Equiaxed.py b/Wrapping/Python/Examples/Synthetic/02_Single Hexagonal Phase Equiaxed.py
deleted file mode 100644
index b668bc7a23..0000000000
--- a/Wrapping/Python/Examples/Synthetic/02_Single Hexagonal Phase Equiaxed.py	
+++ /dev/null
@@ -1,138 +0,0 @@
-"""
-Test of Single Hexagonal Phase Equiaxed Pipeline example in Python
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import statisticspy as statistics
-from dream3d import syntheticbuildingpy as syntheticbuilding
-
-
-def single_hexagonal_phase_equiaxed():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Generate the StatsData
-
-    err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 0, 0,
-                               1, 2.3, 0.4, 4, 3, 10.5,
-                               True, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", False,
-                               simpl.DataArrayPath("", "", ""),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-                                                                                              "Axis (k)", "Axis (l)",
-                                                                                              "Weight (MRD)"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]))
-
-    if err < 0:
-        print("StatsGeneratorFilter ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuilding.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "CellData",
-                                                        "CellEnsembleMatrixName", simpl.IntVec3(128, 128, 128),
-                                                        simpl.FloatVec3(0.5, 0.5, 0.5),
-                                                        simpl.FloatVec3(0, 0, 0),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "Statistics"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseTypes"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseName"),
-                                                        False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuilding.establish_shape_types(dca,
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuilding.pack_primary_phases(dca,
-                                                simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                    ""),
-                                                "Grain Data", "CellEnsembleData", "FeatureIds", "Phases",
-                                                "Phases", "NumFeatures",
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "Statistics"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseTypes"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseName"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "ShapeTypes"),
-                                                simpl.DataArrayPath("", "", ""), False, 0, "", "", False,
-                                                False, False,
-                                                simpl.DataArrayPath("", "", ""),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                        "FeatureIds"),
-                                    "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuilding.match_crystallography(dca, simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                           "CellEnsembleData", "Statistics"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "FeatureIds"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SurfaceFeatures"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "NeighborList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SharedSurfaceAreaList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellEnsembleData", "NumFeatures"),
-                                                  "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "EulerAngles"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  False,
-                                                  simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Synthetic/01_CubicSingleEquiaxedOut.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    single_hexagonal_phase_equiaxed()
diff --git a/Wrapping/Python/Examples/Synthetic/03_Single Cubic Phase Rolled.py b/Wrapping/Python/Examples/Synthetic/03_Single Cubic Phase Rolled.py
deleted file mode 100644
index 244fe4f568..0000000000
--- a/Wrapping/Python/Examples/Synthetic/03_Single Cubic Phase Rolled.py	
+++ /dev/null
@@ -1,137 +0,0 @@
-"""
-Test of Single Cubic Phase Equiaxed Pipeline example in Python
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import statisticspy as statistics
-from dream3d import syntheticbuildingpy as syntheticbuilding
-
-
-def single_cubic_phase_rolled():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Stats Generator Filter
-    err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 1, 1,
-                               1, 2.3, 0.4, 4, 3, 10.5,
-                               True, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", False,
-                               simpl.DataArrayPath("", "", ""),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-                                                                                              "Axis (k)", "Axis (l)",
-                                                                                              "Weight (MRD)"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]))
-
-    if err < 0:
-        print("StatsGeneratorFilter ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuilding.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "CellData",
-                                                        "CellEnsembleMatrixName", simpl.IntVec3(128, 128, 128),
-                                                        simpl.FloatVec3(0.5, 0.5, 0.5),
-                                                        simpl.FloatVec3(0, 0, 0),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "Statistics"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseTypes"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseName"),
-                                                        False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuilding.establish_shape_types(dca,
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuilding.pack_primary_phases(dca,
-                                                simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                    ""),
-                                                "Grain Data", "CellEnsembleData", "FeatureIds", "Phases",
-                                                "Phases", "NumFeatures",
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "Statistics"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseTypes"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseName"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "ShapeTypes"),
-                                                simpl.DataArrayPath("", "", ""), False, 0, "", "", False,
-                                                False, False,
-                                                simpl.DataArrayPath("", "", ""),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                        "FeatureIds"),
-                                    "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuilding.match_crystallography(dca, simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                           "CellEnsembleData", "Statistics"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "FeatureIds"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SurfaceFeatures"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "NeighborList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SharedSurfaceAreaList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellEnsembleData", "NumFeatures"),
-                                                  "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "EulerAngles"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  False,
-                                                  simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Synthetic/03_CubicSingleRolledOut.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    single_cubic_phase_rolled()
diff --git a/Wrapping/Python/Examples/Synthetic/04_Two Phase Cubic Hexagonal Particles Equiaxed.py b/Wrapping/Python/Examples/Synthetic/04_Two Phase Cubic Hexagonal Particles Equiaxed.py
deleted file mode 100644
index 10275a9468..0000000000
--- a/Wrapping/Python/Examples/Synthetic/04_Two Phase Cubic Hexagonal Particles Equiaxed.py	
+++ /dev/null
@@ -1,193 +0,0 @@
-"""
-Test of Two Phase Cubic Hexagonal Particles Equiaxed Pipeline example in Python
-
-"""
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-from dream3d import syntheticbuildingpy as syntheticbuilding
-
-
-def two_phase_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Generate Primary StatsData
-    err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 1, 0,
-                               0.9, 3, 0.25, 4, 3, 10,
-                               True, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", False,
-                               simpl.DataArrayPath("", "", ""),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-                                                                                              "Axis (k)", "Axis (l)",
-                                                                                              "Weight (MRD)"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]))
-
-    if err < 0:
-        print("Primary StatsData ErrorCondition: %d" % err)
-
-    # Generate Precipitate StatsData
-    err = sc.GenerateStatsData(dca, "Precipitate", "Precipitate", 1, 0, 0,
-                               0.1, 1.6, 0.2, 4, 3, 2,
-                               False, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", True,
-                               simpl.DataArrayPath("StatsGeneratorDataContainer", "CellEnsembleData", ""),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-                                                                                              "Axis (k)", "Axis (l)",
-                                                                                              "Weight (MRD)"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.FloatVec2(10, 80), 50, simpl.FloatVec3(100, 100, 100))
-
-    if err < 0:
-        print("Precipitate StatsData ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuilding.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "CellData",
-                                                        "CellEnsembleMatrixName", simpl.IntVec3(128, 128, 128),
-                                                        simpl.FloatVec3(0.5, 0.5, 0.5),
-                                                        simpl.FloatVec3(0, 0, 0),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "Statistics"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseTypes"),
-                                                        simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                            "CellEnsembleData", "PhaseName"),
-                                                        False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuilding.establish_shape_types(dca,
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuilding.pack_primary_phases(dca,
-                                                simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                    ""),
-                                                "Grain Data", "CellEnsembleData", "FeatureIds", "Phases",
-                                                "Phases", "NumFeatures",
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "Statistics"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseTypes"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "PhaseName"),
-                                                simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                    "CellEnsembleData", "ShapeTypes"),
-                                                simpl.DataArrayPath("", "", ""), False, 0, "", "", False,
-                                                False, False,
-                                                simpl.DataArrayPath("", "", ""),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Boundary Cells (Image)
-    err = generic.find_boundary_cells(dca,
-                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData", "FeatureIds"),
-                                      "BoundaryCells",
-                                      True, False)
-    if err < 0:
-        print("FindBoundaryCells ErrorCondition: %d" % err)
-
-    # Insert Precipitate Phases
-    err = syntheticbuilding.insert_precipitate_phases(dca, "", simpl.DataArrayPath("", "", ""), False, 0, "",
-                                                      False, False, 0,
-                                                      simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                          "CellEnsembleData", "Statistics"),
-                                                      simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                          "CellEnsembleData", "PhaseTypes"),
-                                                      simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                          "CellEnsembleData", "ShapeTypes"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "FeatureIds"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "Phases"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "BoundaryCells"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data",
-                                                                          "Phases"),
-                                                      "NumCells", "EquivalentDiameters", "Volumes", "Omega3s",
-                                                      "Centroids", "AxisEulerAngles", "AxisLengths",
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                          "CellEnsembleData", "NumFeatures"),
-                                                      False, simpl.DataArrayPath("", "", ""),
-                                                      simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("InsertPrecipitatePhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                        "FeatureIds"),
-                                    "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuilding.match_crystallography(dca, simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                           "CellEnsembleData", "Statistics"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "FeatureIds"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SurfaceFeatures"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "NeighborList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SharedSurfaceAreaList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellEnsembleData", "NumFeatures"),
-                                                  "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "CellData", "EulerAngles"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "CrystalStructures"),
-                                                  False,
-                                                  simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/Synthetic/04_TwoPhaseCubicHexagonalEquiaxed.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    two_phase_test()
diff --git a/Wrapping/Python/Examples/Synthetic/06_SmallN100_Synthetic.py b/Wrapping/Python/Examples/Synthetic/06_SmallN100_Synthetic.py
deleted file mode 100644
index b5f515fabf..0000000000
--- a/Wrapping/Python/Examples/Synthetic/06_SmallN100_Synthetic.py
+++ /dev/null
@@ -1,343 +0,0 @@
-"""
-(06) Small IN100 Synthetic - Pipeline example in Python
-
-"""
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import genericpy as generic
-from dream3d import statisticspy as statistics
-from dream3d import syntheticbuildingpy as syntheticbuilding
-
-# Numpy for some data management assistance
-# import numpy as np
-
-import datetime as datetime
-
-
-def small_in100_test():
-    # Data Array Paths used in this script
-    feature_ids_array_path = simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "FeatureIds")
-    centroids_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "Centroids")
-    empty_array_path = simpl.DataArrayPath("", "", "")
-    grain_data_attr_matrix = simpl.DataArrayPath("Small IN100", "Grain Data", "")
-    equivalent_diameters_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "EquivalentDiameters")
-    feature_phases_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "Phases")
-    cell_phases_array_path = simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Phases")
-    quats_array_path = simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "Quats")
-    crystal_structures_array_path = simpl.DataArrayPath("Small IN100", "Phase Data", "CrystalStructures")
-    avg_quats_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "AvgQuats")
-    avg_euler_angles_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEulerAngles")
-    cell_ensemble_attribute_matrix_path = simpl.DataArrayPath("Small IN100", "Phase Data", "")
-    neighbor_list_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "NeighborList")
-    shared_surface_area_list_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "SharedSurfaceAreaList")
-    biased_features_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "BiasedFeatures")
-    neighborhoods_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "Neighborhoods")
-    aspect_ratios_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "AspectRatios")
-    omega3s_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "Omega3s")
-    axis_euler_angles_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "AxisEulerAngles")
-    surface_features_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "SurfaceFeatures")
-    volumes_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "SizeVolumes")
-    rdf_array_path = empty_array_path
-    max_min_rdf_array_path = empty_array_path
-    feature_euler_angles_array_path = simpl.DataArrayPath("Small IN100", "Grain Data", "AvgEulerAngles")
-
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
-
-    # Several possible input data items are not flagged, the ones commented out
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
-
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
-
-    dcap_ = sc.CreateDataContainerProxy(dca, [["Small IN100", "EBSD Scan Data", "Confidence Index"],
-                                              ["Small IN100", "EBSD Scan Data", "CriticalField"],
-                                              ["Small IN100", "EBSD Scan Data", "EulerAngles"],
-                                              ["Small IN100", "EBSD Scan Data", "FeatureIds"],
-                                              ["Small IN100", "EBSD Scan Data", "FeatureReferenceMisorientations"],
-                                              ["Small IN100", "EBSD Scan Data", "Fit"],
-                                              ["Small IN100", "EBSD Scan Data", "GBManhattanDistances"],
-                                              ["Small IN100", "EBSD Scan Data", "IPFColor"],
-                                              ["Small IN100", "EBSD Scan Data", "Image Quality"],
-                                              ["Small IN100", "EBSD Scan Data", "KernelAverageMisorientations"],
-                                              ["Small IN100", "EBSD Scan Data", "Mask"],
-                                              ["Small IN100", "EBSD Scan Data", "ParentIds"],
-                                              ["Small IN100", "EBSD Scan Data", "Phases"],
-                                              ["Small IN100", "EBSD Scan Data", "QPManhattanDistances"],
-                                              ["Small IN100", "EBSD Scan Data", "Quats"],
-                                              ["Small IN100", "EBSD Scan Data", "SEM Signal"],
-                                              ["Small IN100", "EBSD Scan Data", "TJManhattanDistances"],
-                                              ["Small IN100", "Phase Data", "CrystalStructures"],
-                                              ["Small IN100", "Phase Data", "LatticeConstants"],
-                                              ["Small IN100", "Phase Data", "MaterialName"],
-                                              ["Small IN100", "Grain Data", "Active"],
-                                              ["Small IN100", "Grain Data", "AvgEuler"],
-                                              ["Small IN100", "Grain Data", "CriticalFields"],
-                                              ["Small IN100", "Grain Data", "FeatureAvgMisorientations"],
-                                              ["Small IN100", "Grain Data", "MisorientationList"],
-                                              ["Small IN100", "Grain Data", "ParentIds"],
-                                              ["Small IN100", "Grain Data", "Phases"],
-                                              ["Small IN100", "Grain Data", "Poles"],
-                                              ["Small IN100", "Grain Data", "Schmids"],
-                                              ["Small IN100", "Grain Data", "SlipSystems"],
-                                              ["Small IN100", "Grain Data", "Sphericity"],
-                                              ["Small IN100", "Grain Data", "SurfaceAreaVolumeRatio"]])
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
-    err = d3d.data_container_reader(dca,
-                                    sd.GetBuildDirectory() +
-                                    "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                    False, "", dt, dcap_)
-    if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, grain_data_attr_matrix,
-                                    "SharedSurfaceAreaList", "NeighborList", feature_ids_array_path,
-                                    "", "NumNeighbors", "SurfaceFeatures", False, False)
-    if err < 0:
-        print("FindNeighbors #1 ErrorCondition: %d" % err)
-
-    # Find Feature Centroids
-    err = generic.find_feature_centroids(dca, feature_ids_array_path, centroids_array_path)
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition: %d" % err)
-
-    # Find Surface Features
-    err = generic.find_surface_features(dca, feature_ids_array_path, surface_features_array_path)
-    if err < 0:
-        print("FindSurfaceFeatures ErrorCondition: %d" % err)
-
-    # Find Biased Features (Bounding Box)
-    err = generic.find_bounding_box_features(dca, False, centroids_array_path, empty_array_path,
-                                             surface_features_array_path, "BiasedFeatures")
-    if err < 0:
-        print("FindBiasedFeatures ErrorCondition: %d" % err)
-
-    # Find Feature Sizes
-    err = statistics.find_sizes(dca, grain_data_attr_matrix, feature_ids_array_path, "SizeVolumes",
-                                "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes ErrorCondition: %d" % err)
-
-    # Find Feature Shapes
-    err = statistics.find_shapes(dca, grain_data_attr_matrix, feature_ids_array_path, centroids_array_path,
-                                 "Omega3s", "ShapeVolumes", "AxisLengths", "AxisEulerAngles", "AspectRatios")
-    if err < 0:
-        print("FindShapes ErrorCondition: %d" % err)
-
-    # Find Feature Neighborhoods
-    err = statistics.find_neighborhoods(dca, "NeighborhoodList", 1, equivalent_diameters_array_path,
-                                        feature_phases_array_path,
-                                        centroids_array_path, "Neighborhoods")
-    if err < 0:
-        print("FindNeighborhoods ErrorCondition: %d" % err)
-
-    # Find Feature Average Orientations
-    err = orientationanalysis.find_avg_orientations(dca, feature_ids_array_path, cell_phases_array_path,
-                                                    quats_array_path, crystal_structures_array_path,
-                                                    avg_quats_array_path, avg_euler_angles_array_path)
-    if err < 0:
-        print("FindAvgOrientations ErrorCondition: %d" % err)
-
-    # Generate Ensemble Statistics
-    err = statistics.generate_ensemble_statistics(dca, cell_ensemble_attribute_matrix_path,
-                                                  "PhaseTypes", [simpl.PhaseType.Primary], [simpl.PhaseType.Primary],
-                                                  neighbor_list_array_path, shared_surface_area_list_array_path,
-                                                  feature_phases_array_path, biased_features_array_path,
-                                                  equivalent_diameters_array_path, neighborhoods_array_path,
-                                                  aspect_ratios_array_path, omega3s_array_path,
-                                                  axis_euler_angles_array_path, crystal_structures_array_path,
-                                                  surface_features_array_path, volumes_array_path,
-                                                  rdf_array_path, max_min_rdf_array_path,
-                                                  feature_euler_angles_array_path, avg_quats_array_path,
-                                                  "Statistics", False,
-                                                  True, sc.DistributionFitType.Lognormal,
-                                                  True, sc.DistributionFitType.Beta,
-                                                  True, sc.DistributionFitType.Beta,
-                                                  True, sc.DistributionFitType.Lognormal,
-                                                  True, False, False, False, 1)
-    if err < 0:
-        print("GenerateEnsembleStatistics ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuilding.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "EBSD Scan Data",
-                                                        "Phase Data", simpl.IntVec3(128, 128, 128),
-                                                        simpl.FloatVec3(0.25, 0.25, 0.25),
-                                                        simpl.FloatVec3(0, 0, 0),
-                                                        simpl.DataArrayPath("Small IN100",
-                                                                            "Phase Data", "Statistics"),
-                                                        simpl.DataArrayPath("Small IN100",
-                                                                            "Phase Data", "PhaseTypes"),
-                                                        simpl.DataArrayPath("Small IN100",
-                                                                            "Phase Data", "MaterialName"),
-                                                        False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuilding.establish_shape_types(dca,
-                                                  simpl.DataArrayPath("Small IN100",
-                                                                      "Phase Data", "PhaseTypes"),
-                                                  "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuilding.pack_primary_phases(dca,
-                                                simpl.DataArrayPath("SyntheticVolumeDataContainer", "EBSD Scan Data",
-                                                                    ""),
-                                                "Grain Data", "Phase Data", "FeatureIds", "Phases",
-                                                "Phases", "NumFeatures",
-                                                simpl.DataArrayPath("Small IN100",
-                                                                    "Phase Data", "Statistics"),
-                                                simpl.DataArrayPath("Small IN100",
-                                                                    "Phase Data", "PhaseTypes"),
-                                                simpl.DataArrayPath("Small IN100",
-                                                                    "Phase Data", "MaterialName"),
-                                                simpl.DataArrayPath("Small IN100",
-                                                                    "Phase Data", "ShapeTypes"),
-                                                simpl.DataArrayPath("", "", ""), False,
-                                                sc.FeatureGeneration.GenerateFeatures,
-                                                "", "", False, False, False,
-                                                simpl.DataArrayPath("", "", ""),
-                                                simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statistics.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "Grain Data", ""),
-                                    "SharedSurfaceAreaList", "NeighborList",
-                                    simpl.DataArrayPath("SyntheticVolumeDataContainer", "EBSD Scan Data",
-                                                        "FeatureIds"),
-                                    "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors #2 ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuilding.match_crystallography(dca, simpl.DataArrayPath("Small IN100",
-                                                                           "Phase Data", "Statistics"),
-                                                  simpl.DataArrayPath("Small IN100",
-                                                                      "Phase Data", "CrystalStructures"),
-                                                  simpl.DataArrayPath("Small IN100",
-                                                                      "Phase Data", "PhaseTypes"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "EBSD Scan Data", "FeatureIds"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SurfaceFeatures"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "NeighborList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Grain Data", "SharedSurfaceAreaList"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "Phase Data", "NumFeatures"),
-                                                  "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Generate IPF Colors
-    err = orientationanalysis.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "EBSD Scan Data", "Phases"),
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                      "EBSD Scan Data", "EulerAngles"),
-                                                  simpl.DataArrayPath("Small IN100",
-                                                                      "Phase Data", "CrystalStructures"),
-                                                  False,
-                                                  simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Set all the IPFColor values to zero
-    # am = dca.getAttributeMatrix(simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""))
-    # data_array = am.getAttributeArray("IPFColor")
-    # data = data_array.Data
-    # newdata = sc.ConvertToDataArray("IPFColor", np.zeros_like(data).astype('uint8'))
-    # am.addAttributeArray("IPFColor", newdata[1])
-    # print(type(dataArray.Data))
-    # print("Max: %d" % max(dataArray.Data))
-    # print("Min: %d" % min(dataArray.Data))
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Synthetic/06_SmallIN100Synthetic.dream3d",
-                              dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    small_in100_test()
diff --git a/Wrapping/Python/Examples/Test_All_Pipelines.py b/Wrapping/Python/Examples/Test_All_Pipelines.py
deleted file mode 100644
index ef6fd6e986..0000000000
--- a/Wrapping/Python/Examples/Test_All_Pipelines.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Tests all the pipelines by directory
-# 
-
-
-import os
-import subprocess
-
-# import unittest
-
-# Anisotropy filters (Required files not present)
-# for f in os.listdir('Anisotropy'):
-#     filepath = 'Anisotropy/' + f
-#     if os.path.isfile(filepath) and ".py" in filepath:
-#         print(f)
-#         subprocess.call(["python", filepath])
-
-# # Core Filters
-for f in os.listdir('Core Filters'):
-    f = 'Core Filters/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# DREAM3DReview
-for f in os.listdir('DREAM3DReview'):
-    f = 'DREAM3DReview/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# EBSD Reconstruction
-for f in os.listdir('EBSD/Reconstruction'):
-    f = 'EBSD/Reconstruction/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# EBSD Statistics
-for f in os.listdir('EBSD/Statistics'):
-    f = 'EBSD/Statistics/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# EBSD Surface Mesh
-for f in os.listdir('EBSD/Surface Mesh'):
-    f = 'EBSD/Surface Mesh/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# Image Reconstruction
-for f in os.listdir('Image Reconstruction'):
-    f = 'Image Reconstruction/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# Synthetic
-for f in os.listdir('Synthetic'):
-    f = 'Synthetic/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# Transformation Phase
-for f in os.listdir('Transformation Phase'):
-    f = 'Transformation Phase/' + f
-    if os.path.isfile(f) and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
-
-# Root Directory
-for f in os.listdir('.'):
-    if os.path.isfile(f) and f != "Test_All_Pipelines.py" and ".py" in f:
-        print(f)
-        subprocess.call(["python", f])
diff --git a/Wrapping/Python/Examples/Threshold2_MoveData.py b/Wrapping/Python/Examples/Threshold2_MoveData.py
deleted file mode 100644
index 0800f4edde..0000000000
--- a/Wrapping/Python/Examples/Threshold2_MoveData.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# Based on Threshold2 MoveData example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orientationanalysis
-from dream3d import samplingpy as sampling
-
-
-def threshold2_move_data_test():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Pipeline Annotation 1
-    err = simplpy.pipeline_annotation(dca,
-                                      "This pipeline shows using the newer threshold objects filter" \
-                                      " and moving data around in the data structure.")
-    if err < 0:
-        print("PipelineAnnotation 1 ErrorCondition: %d" % err)
-
-    # ReadAngData
-    err = orientationanalysis.read_ang_data(dca, "Small IN100", "Phase Data", "EBSD Scan Data",
-                                            False, sd.GetBuildDirectory() + "/Debug/Data/SmallIN100/Slice_1.ang")
-    if err < 0:
-        print("ReadAngData ErrorCondition: %d" % err)
-
-    err = sampling.rotate_sample_ref_frame(dca, simpl.DataArrayPath("Small IN100", "EBSD Scan Data", ""),
-                                           simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
-
-    err = orientationanalysis.rotate_euler_ref_frame(dca, simpl.FloatVec3(0.0, 0.0, 1.0), 90.0,
-                                                     simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                         "EulerAngles"))
-    if err < 0:
-        print("RotateEulerRefFrame ErrorCondition: %d" % err)
-
-    # MultiThresholdObjects filter
-    err = sc.MultiThresholdObjects2(dca, ["Small IN100", "EBSD Scan Data", ""], "Mask",
-                                    ["AND", ("Confidence Index", 1, 0.1), ("Image Quality", 1, 400),
-                                     ["OR", ("Image Quality", 0, 0)]])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-
-    # Pipeline Annotation 2
-    err = simplpy.pipeline_annotation(dca, "These next filters show creating a new DataContainer and AttributeMatrix, \
-   then we move some data arrays from the Small IN100/EBSD Scan Data Attribute Matrix to the new attributeMatrix using "
-                                      "the  \"Move Multi Data\" filter and the \"Move Data\" filter.")
-    if err < 0:
-        print("PipelineAnnotation 2 ErrorCondition: %d" % err)
-
-        # Create Data Container
-    # Improve helper function for creation of data containers to include a dca
-    err = simplpy.create_data_container(dca, "Extra_DataContainer")
-    if err < 0:
-        print("CreateDataContainer ErrorCondition: %d" % err)
-
-    # Create Attribute Matrix
-    # Using helper function
-    dynamic_table_data = sc.CreateDynamicTableData([[189, 201, 1]], ["0", "1", "2"], ["1"])
-    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath("Extra_DataContainer", "Positions", ""), 13,
-                                          dynamic_table_data)
-
-    if err < 0:
-        print("CreateAttributeMatrix ErrorCondition: %d" % err)
-
-    # Move Multiple Data Arrays
-    err = sc.MoveMultiData(dca, sc.WhatToMove.AttributeArray, [("Small IN100", "EBSD Scan Data", "X Position"),
-                                                               simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                                                   "Y Position")],
-                           simpl.DataArrayPath("Extra_DataContainer", "Positions", ""))
-    if err < 0:
-        print("MoveMultiData ErrorCondition: %d" % err)
-
-    # Move Data Arrays
-    err = sc.MoveData(dca, "Attribute Array", simpl.DataArrayPath("Small IN100", "EBSD Scan Data", "SEM Signal"),
-                      simpl.DataArrayPath("Extra_DataContainer", "Positions", ""))
-    if err < 0:
-        print("MoveData ErrorCondition: %d" % err)
-
-    # Pipeline Annotation 3
-    err = simplpy.pipeline_annotation(dca, "This next part simply changes (arbitrarily) the Origin \
-  and Resolution of the Image Geometry that the data resides on.")
-    if err < 0:
-        print("PipelineAnnotation 3 ErrorCondition: %d" % err)
-
-        # Set Origin & Resolution (Image)
-    err = simplpy.set_origin_resolution_image_geom(dca, "Small IN100", True, simpl.FloatVec3(50, 25, 10),
-                                                   True, simpl.FloatVec3(1, 1, 25))
-    if err < 0:
-        print("SetOriginResolutionImageGeom ErrorCondition: %d" % err)
-
-    # Write to DREAM3D File 1
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Example/OriginChange.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile 1 ErrorCondition: %d" % err)
-
-    # Pipeline Annotation 4
-    err = simplpy.pipeline_annotation(dca, "This next part simply scales the image geometry by some arbitrary amount.")
-    if err < 0:
-        print("PipelineAnnotation 4 ErrorCondition: %d" % err)
-
-        # Change Scaling of Volume
-    err = simplpy.scale_volume(dca, "Small IN100", "", True, False, simpl.FloatVec3(2, 2, 2))
-    if err < 0:
-        print("ScaleVolume ErrorCondition: %d" % err)
-
-        # Write to DREAM3D File 2
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/Example/ScaleVolume.dream3d", dca)
-    if err < 0:
-        print("WriteDREAM3DFile 2 ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    threshold2_move_data_test()
diff --git a/Wrapping/Python/Examples/Transformation Phase/InsertTransformationPhase.py b/Wrapping/Python/Examples/Transformation Phase/InsertTransformationPhase.py
deleted file mode 100644
index b1e900466d..0000000000
--- a/Wrapping/Python/Examples/Transformation Phase/InsertTransformationPhase.py	
+++ /dev/null
@@ -1,284 +0,0 @@
-# Insert Transformation Phase
-# Based on InsertTransformationPhase example pipeline
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import simplpy
-from dream3d import orientationanalysispy
-from dream3d import genericpy
-from dream3d import statisticspy
-from dream3d import syntheticbuildingpy
-from dream3d import transformationphasepy
-
-
-def insert_transformation_phase():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-
-    # Generate Primary StatsData
-    err = sc.GenerateStatsData(dca, "Primary", "Primary", 0, 1, 0,
-                               1, 2.3, 0.4, 4, 3, 10,
-                               True, "StatsGeneratorDataContainer",
-                               "CellEnsembleData", False,
-                               simpl.DataArrayPath("", "", ""),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Angle(w)", "Axis (h)",
-                                                                                              "Axis (k)", "Axis (l)",
-                                                                                              "Weight (MRD)"], ["0"]),
-                               simpl.DynamicTableData([simpl.VectorDouble([0, 0, 0, 0, 0])], ["Euler 1", "Euler 2",
-                                                                                              "Euler 3", "Weight",
-                                                                                              "Sigma"], ["0"]))
-
-    if err < 0:
-        print("Primary StatsData ErrorCondition: %d" % err)
-
-    # Initialize Synthetic Volume
-    err = syntheticbuildingpy.initialize_synthetic_volume(dca, "SyntheticVolumeDataContainer", "CellData",
-                                                          "CellEnsembleData", simpl.IntVec3(128, 128, 128),
-                                                          simpl.FloatVec3(0.5, 0.5, 0.5),
-                                                          simpl.FloatVec3(0, 0, 0),
-                                                          simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                              "CellEnsembleData", "Statistics"),
-                                                          simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                              "CellEnsembleData", "PhaseTypes"),
-                                                          simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                              "CellEnsembleData", "PhaseName"),
-                                                          False)
-    if err < 0:
-        print("InitializeSyntheticVolume ErrorCondition: %d" % err)
-
-    # Establish Shape Types
-    err = syntheticbuildingpy.establish_shape_types(dca,
-                                                    simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                        "CellEnsembleData", "PhaseTypes"),
-                                                    "ShapeTypes", [simpl.ShapeType.Ellipsoid])
-    if err < 0:
-        print("EstablishShapeTypes ErrorCondition: %d" % err)
-
-    # Pack Primary Phases
-    err = syntheticbuildingpy.pack_primary_phases(dca,
-                                                  simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                      ""),
-                                                  "CellFeatureData", "CellEnsembleData", "FeatureIds", "Phases",
-                                                  "Phases", "NumFeatures",
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "Statistics"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseTypes"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "PhaseName"),
-                                                  simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                      "CellEnsembleData", "ShapeTypes"),
-                                                  simpl.DataArrayPath("", "", ""), False, 0, "", "", False,
-                                                  False, False,
-                                                  simpl.DataArrayPath("", "", ""),
-                                                  simpl.DataArrayPath("", "", ""))
-    if err < 0:
-        print("PackPrimaryPhases ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors
-    err = statisticspy.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData", ""),
-                                      "SharedSurfaceAreaList", "NeighborList",
-                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                          "FeatureIds"),
-                                      "", "NumNeighbors", "SurfaceFeatures", False, True)
-    if err < 0:
-        print("FindNeighbors ErrorCondition: %d" % err)
-
-    # Match Crystallography
-    err = syntheticbuildingpy.match_crystallography(dca, simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                             "CellEnsembleData", "Statistics"),
-                                                    simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                        "CellEnsembleData", "CrystalStructures"),
-                                                    simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                        "CellEnsembleData", "PhaseTypes"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellData", "FeatureIds"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellFeatureData", "Phases"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellFeatureData", "SurfaceFeatures"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellFeatureData", "NeighborList"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellFeatureData", "SharedSurfaceAreaList"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellEnsembleData", "NumFeatures"),
-                                                    "EulerAngles", "Volumes", "EulerAngles", "AvgQuats", 100000)
-    if err < 0:
-        print("MatchCrystallography ErrorCondition: %d" % err)
-
-    # Find Feature Centroids
-    err = genericpy.find_feature_centroids(dca,
-                                           simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                               "CellData", "FeatureIds"),
-                                           simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                               "CellFeatureData", "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition: %d" % err)
-
-    # Find Feature Sizes #1
-    err = statisticspy.find_sizes(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData", ""),
-                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                      "CellData", "FeatureIds"),
-                                  "Volumes2", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes #1 ErrorCondition %d" % err)
-
-    # Insert Transformation Phases
-    # Possible candidate for a helper function
-    # Possible enums: trans_crystal_struct
-    # May want to use a "dictionary" for the numerical portion in helper function
-    err = transformationphasepy.insert_transformation_phases(dca,
-                                                             1, 1, 60, simpl.FloatVec3(1, 1, 1), True, True, 1, 0.2, 1,
-                                                             0,
-                                                             simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                                 "CellEnsembleData", ""),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData", ""),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellData", "FeatureIds"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellData", "EulerAngles"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellData", "Phases"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData", "AvgQuats"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData", "Centroids"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData",
-                                                                                 "EquivalentDiameters"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData", "EulerAngles"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellFeatureData", "Phases"),
-                                                             "ParentIds",
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellEnsembleData",
-                                                                                 "NumFeaturesPerParent"),
-                                                             simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                                 "CellEnsembleData",
-                                                                                 "CrystalStructures"),
-                                                             simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                                 "CellEnsembleData", "PhaseTypes"),
-                                                             simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                                 "CellEnsembleData", "ShapeTypes"),
-                                                             simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                                 "CellEnsembleData", "NumFeatures"))
-    if err < 0:
-        print("InsertTransformationPhases ErrorCondition %d" % err)
-
-    # Delete Data (using helper function)
-    sc.RemoveArrays(dca, [("SyntheticVolumeDataContainer", "CellFeatureData", "AvgQuats"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "Centroids"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "EquivalentDiameters"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "EulerAngles"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "NeighborList"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "NumElements"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "NumFeaturesPerParent"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "NumNeighbors"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "SharedSurfaceAreaList"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "SurfaceFeatures"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "Volumes"),
-                          ("SyntheticVolumeDataContainer", "CellFeatureData", "Volumes2")])
-
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellData", "Phases"),
-                                                    simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                        "CellData", "EulerAngles"),
-                                                    simpl.DataArrayPath("StatsGeneratorDataContainer",
-                                                                        "CellEnsembleData", "CrystalStructures"),
-                                                    False,
-                                                    simpl.DataArrayPath("", "", ""), "IPFColor")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # Find Feature Sizes #2
-    err = statisticspy.find_sizes(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData", ""),
-                                  simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                      "CellData", "FeatureIds"),
-                                  "Volumes2", "EquivalentDiameters", "NumElements", False)
-    if err < 0:
-        print("FindSizes #2 ErrorCondition %d" % err)
-
-    # Convert Orientation Representation
-    err = orientationanalysispy.convert_orientations(dca, simpl.OrientationType.Euler, simpl.OrientationType.Quaternion,
-                                                     simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                         "EulerAngles"),
-                                                     "Quats")
-    if err < 0:
-        print("Convert Orientations ErrorCondition %d" % err)
-
-    # Find Feature Average Orientations
-    err = orientationanalysispy.find_avg_orientations(dca,
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "FeatureIds"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "Phases"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                          "Quats"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                          "CellEnsembleData", "CrystalStructures"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                          "CellFeatureData", "AvgQuats"),
-                                                      simpl.DataArrayPath("SyntheticVolumeDataContainer",
-                                                                          "CellFeatureData", "AvgEulers"))
-    if err < 0:
-        print("FindAvgOrientations ErrorCondition: %d" % err)
-
-    # Find Feature Centroids
-    err = genericpy.find_feature_centroids(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData",
-                                                                    "FeatureIds"),
-                                           simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData",
-                                                               "Centroids"))
-    if err < 0:
-        print("FindFeatureCentroids ErrorCondition: %d" % err)
-
-    # Find Feature Neighborhoods
-    err = statisticspy.find_neighborhoods(dca, "NeighborhoodList", 1,
-                                          simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData",
-                                                              "EquivalentDiameters"),
-                                          simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData",
-                                                              "Phases"),
-                                          simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData",
-                                                              "Centroids"),
-                                          "Neighborhoods")
-    if err < 0:
-        print("FindNeighborhoods ErrorCondition: %d" % err)
-
-    # Find Feature Neighbors #2
-    err = statisticspy.find_neighbors(dca, simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData", ""),
-                                      "SharedSurfaceAreaList", "NeighborList",
-                                      simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellData", "FeatureIds"),
-                                      "", "NumNeighbors", "SurfaceFeatures", False, False)
-    if err < 0:
-        print("FindNeighbors #2 ErrorCondition: %d" % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(
-        sd.GetBuildDirectory() + "/Debug/Data/Output/TransformationPhase/InsertTransformationPhases.dream3d",
-        dca)
-    if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
-    # Export Feature Data as CSV File
-    err = simplpy.feature_data_csv_writer(dca,
-                                          simpl.DataArrayPath("SyntheticVolumeDataContainer", "CellFeatureData", ""),
-                                          sd.GetBuildDirectory() +
-                                          "/Debug/Data/Output/TransformationPhase/InsertTransformationPhases.csv",
-                                          False, simpl.DelimiterTypes.Comma, True)
-    if err < 0:
-        print("FeatureDataCsvWriter ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    insert_transformation_phase()
diff --git a/Wrapping/Python/Examples/TxCopper_Exposed.py b/Wrapping/Python/Examples/TxCopper_Exposed.py
deleted file mode 100644
index 92e42df903..0000000000
--- a/Wrapping/Python/Examples/TxCopper_Exposed.py
+++ /dev/null
@@ -1,119 +0,0 @@
-# Based on TxCopper_Exposed example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import samplingpy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def txcopper_exposed():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-    data_container_name = "Cugrid_after 2nd_15kv_2kx_2"
-
-    # Import Oxford Instr. EBSD Data (.ctf)
-    err = orientationanalysispy.read_ctf_data(dca, data_container_name,
-                                              "Phase Data", "EBSD Scan Data",
-                                              False, 
-                                              sd.GetBuildDirectory()
-                                              + "/Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf")
-    if err < 0:
-        print("ReadCtfData ErrorCondition: %d" % err)
-
-    # Rotate Sample Reference Frame
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath(data_container_name, "EBSD Scan Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
- 
-    # Convert Angles to Degrees or Radians
-    # Conversion type may need to be enumeration ?
-    err = orientationanalysispy.change_angle_representation(dca, 0, simpl.DataArrayPath(data_container_name,
-                                                            "EBSD Scan Data", "EulerAngles"))
-    if err < 0:
-        print("ChangeAngleRepresentation ErrorCondition: %d" % err)
-
-    # Crop Geometry (Image)
-    err = samplingpy.crop_image_geometry(dca, "",
-                                         simpl.DataArrayPath(data_container_name, "EBSD Scan Data", ""),
-                                         simpl.DataArrayPath(data_container_name, "Grain Data", ""),
-                                         0, 0, 0, 460, 399, 0, False, False, True,
-                                         simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("CropImageGeometry ErrorCondition %d" % err)
-
-    # MultiThresholdObjects filter
-    err = sc.MultiThresholdObjects(dca, "Mask",
-                                  [(data_container_name, "EBSD Scan Data", "Error", 2, 0)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-    
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "EBSD Scan Data", "Phases"),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "EBSD Scan Data", "EulerAngles"),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "Phase Data", "CrystalStructures"),
-                                                    True,
-                                                    simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Mask"),
-                                                    "IPF_Exposed_001")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # ITK Image Writer
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Data/Output/TexturedCopper/IPF_Exposed.png",
-                                                simpl.DataArrayPath(data_container_name, "EBSD Scan Data",
-                                                                    "IPF_Exposed_001"), 0)
-    if err < 0:
-        print("ITKImageWriter ErrorCondition: %d" % err)
-
-    # Export Pole Figure Images #1
-    # Possible enumerations: Image Format, Image Layout, Generation Algorithm / Pole Figure Type
-    err = orientationanalysispy.write_pole_figure(dca, "Exposed_Lambert_",
-                                                  sd.GetBuildDirectory() + "/Data/Output/TexturedCopper", 0,
-                                                  1000, 32, 32, 0,
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data",
-                                                                      "EulerAngles"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Phases"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "CrystalStructures"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "MaterialName"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Mask"),
-                                                  True, 0)
-    if err < 0:
-        print("WritePoleFigure #1 ErrorCondition: %d" % err)
-
-    # Export Pole Figure Images #2
-    err = orientationanalysispy.write_pole_figure(dca, "Exposed_Discrete_",
-                                                  sd.GetBuildDirectory() + "/Data/Output/TexturedCopper", 0,
-                                                  1000, 32, 32, 0,
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data",
-                                                                      "EulerAngles"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Phases"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "CrystalStructures"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "MaterialName"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Mask"),
-                                                  True, 1)
-    if err < 0:
-        print("WritePoleFigure #2 ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    txcopper_exposed()
diff --git a/Wrapping/Python/Examples/TxCopper_Unexposed.py b/Wrapping/Python/Examples/TxCopper_Unexposed.py
deleted file mode 100644
index 0dda1e559e..0000000000
--- a/Wrapping/Python/Examples/TxCopper_Unexposed.py
+++ /dev/null
@@ -1,103 +0,0 @@
-# Based on TxCopper_Unexposed example
-# 
-
-# These are the simpl_py python modules
-
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy
-from dream3d import samplingpy
-from dream3d import itkimageprocessing
-from dream3d import itkimageprocessingpy
-
-
-def txcopper_unexposed():
-    # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
-    data_container_name = "Cugrid_after 2nd_15kv_2kx_2"
-
-    # Import Oxford Instr. EBSD Data (.ctf)
-    err = orientationanalysispy.read_ctf_data(dca, data_container_name,
-                                              "Phase Data", "EBSD Scan Data",
-                                              False, 
-                                              sd.GetBuildDirectory()
-                                              + "/Debug/Data/Textured_Copper/Cugrid_after 2nd_15kv_2kx_2.ctf")
-    if err < 0:
-        print("ReadCtfData ErrorCondition: %d" % err)
-
-    # Rotate Sample Reference Framce
-    err = samplingpy.rotate_sample_ref_frame(dca, simpl.DataArrayPath(data_container_name, "EBSD Scan Data", ""),
-                                             simpl.FloatVec3(0.0, 1.0, 0.0), 180.0, False)
-    if err < 0:
-        print("RotateSampleRefFrame ErrorCondition: %d" % err)
- 
-    # Convert Angles to Degrees or Radians
-    # Conversion type may need to be enumeration ?
-    err = orientationanalysispy.change_angle_representation(dca, 0, simpl.DataArrayPath(data_container_name,
-                                                            "EBSD Scan Data", "EulerAngles"))
-    if err < 0:
-        print("ChangeAngleRepresentation ErrorCondition: %d" % err)
-
-    # Crop Geometry (Image)
-    err = samplingpy.crop_image_geometry(dca, "",
-                                         simpl.DataArrayPath(data_container_name, "EBSD Scan Data", ""),
-                                         simpl.DataArrayPath(data_container_name, "Grain Data", ""),
-                                         488, 0, 0, 549, 399, 0, False, False, True,
-                                         simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "FeatureIds"))
-    if err < 0:
-        print("CropImageGeometry ErrorCondition %d" % err)
-
-    # MultiThresholdObjects filter
-    err = sc.MultiThresholdObjects(dca, "Mask",
-                                  [(data_container_name, "EBSD Scan Data", "Error", 2, 0)])
-    if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
-    
-    # Generate IPF Colors
-    err = orientationanalysispy.generate_ipf_colors(dca, simpl.FloatVec3(0, 0, 1),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "EBSD Scan Data", "Phases"),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "EBSD Scan Data", "EulerAngles"),
-                                                    simpl.DataArrayPath(data_container_name,
-                                                                        "Phase Data", "CrystalStructures"),
-                                                    True,
-                                                    simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Mask"),
-                                                    "IPF_Unexposed_001")
-    if err < 0:
-        print("GenerateIPFColors ErrorCondition: %d" % err)
-
-    # ITK Image Writer
-    image_writer = itkimageprocessing.ITKImageWriter.New()
-    image_writer.registerImageIOFactories()
-    err = itkimageprocessingpy.itk_image_writer(dca, sd.GetBuildDirectory() +
-                                                "/Debug/Data/Output/TexturedCopper/IPF_Unexposed.png",
-                                                simpl.DataArrayPath(data_container_name, "EBSD Scan Data",
-                                                                    "IPF_Unexposed_001"), 0)
-    if err < 0:
-        print("ITKImageWriter ErrorCondition: %d" % err)
-
-    # Export Pole Figure Images
-    # Possible enumerations: Image Format, Image Layout, Generation Algorithm / Pole Figure Type
-    err = orientationanalysispy.write_pole_figure(dca, "Unexposed_",
-                                                  sd.GetBuildDirectory() + "/Debug/Data/Output/TexturedCopper", 0,
-                                                  512, 32, 32, 2,
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data",
-                                                                      "EulerAngles"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Phases"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "CrystalStructures"),
-                                                  simpl.DataArrayPath(data_container_name, "Phase Data",
-                                                                      "MaterialName"),
-                                                  simpl.DataArrayPath(data_container_name, "EBSD Scan Data", "Mask"),
-                                                  False, 0)
-    if err < 0:
-        print("WritePoleFigure ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    txcopper_unexposed()
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index 7e71d9533b..6aec8b9df9 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -15,6 +15,7 @@ elseif(TARGET SIMPLView)
 else()
   set(SIMPL_ANACONDA_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Anaconda")
 endif()
+
 set_property(GLOBAL PROPERTY SIMPL_ANACONDA_OUTPUT_DIR "${SIMPL_ANACONDA_OUTPUT_DIR}")
 
 
@@ -46,7 +47,12 @@ set(SIMPL_PYTHON_MODULE_SUFFIX "")
 set_property(GLOBAL PROPERTY SIMPL_PYTHON_MODULE_SUFFIX ${SIMPL_PYTHON_MODULE_SUFFIX})
 set(SIMPL_PYTHON_MODULE_NAME "dream3d")
 set(PYTHON_SITE_PACKAGES_NAME "site-packages")
-
+set_property(GLOBAL PROPERTY PYTHON_SITE_PACKAGES_NAME ${PYTHON_SITE_PACKAGES_NAME})
+set(TEST_SCRIPT_FILE_EXT "sh")
+if(WIN32)
+  set(TEST_SCRIPT_FILE_EXT "bat")
+endif()
+set_property(GLOBAL PROPERTY SIMPL_PYTHON_TEST_SCRIPT "${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.${TEST_SCRIPT_FILE_EXT}")
 # --------------------------------------------------------------------------
 # Add an executable that will generate our python bindings
 add_executable(GeneratePythonBindings)
@@ -95,7 +101,52 @@ CreatePybind11Module(MODULE_NAME ${SIMPL_PYTHON_MODULE_NAME}
                     SIMPLIB
 )
 
+# --------------------------------------------------------------------------
+# Add each of the python scripts as a ctest unit test that should get run
+# during the normal CTest execution
+# --------------------------------------------------------------------------
+if(SIMPL_BUILD_TESTING)
 
+  if("${ANACONDA_DIR}" STREQUAL "")
+    set(ANACONDA_DIR "" CACHE STRING "")
+    message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
+  endif()
+
+  #------------------------------
+  # Initialize the PYTHON_TEST_INPUT_DIR variable to point to the "Testing Directory"
+  file(TO_CMAKE_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing" PYTHON_TEST_INPUT_DIR)
+
+  set(SIMPL_PYTHON_TESTS
+    AbstractFilterTest
+    AttributeMatrixTest
+    DataArrayTest
+    DataContainerArrayTest
+    DataContainerTest
+    GeometryTest
+    ImageReadTest
+    TestBindings
+
+    "Array_Calculator_Test"
+    "Convert_Attribute_Array_Data_Type"
+    "Copy_Object_Test"
+    "Crop_Vertex_Geometry"
+    "Export_Triangle_Geometry"
+    "Import_Ascii_Data_Array"
+    "Import_Hdf5_Dataset"
+    "Link_Feature_Attribute_Matrix_To_Element_Array"
+    "Remove_Component_From_Array"
+    "Rename_Attribute_Array"
+    "Split_Attribute_Array"
+  )
+
+  foreach(test ${SIMPL_PYTHON_TESTS})
+    set(SIMPL_PYTHON_TEST_DRIVER "${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest/SIMPL/${test}.sh")
+    configure_file(${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.sh
+                  "${SIMPL_PYTHON_TEST_DRIVER}" @ONLY)
+    add_test(NAME SIMPL_${test} COMMAND "${SIMPL_PYTHON_TEST_DRIVER}" )
+  endforeach(test ${SIMPL_PYTHON_TESTS})
+  
+endif()
 
 # --------------------------------------------------------------------------
 # Copy the recipe and egg info for the building Conda package to the 
@@ -173,4 +224,9 @@ if (SIMPL_ENABLE_ANACONDA_PACKAGE)
   #   add_custom_command(TARGET dream3d POST_BUILD COMMAND ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda install -y --use-local dream3d 
   #     COMMENT "Installing the dream3d Conda package")
   # endif()
+
+
+
 endif()
+
+
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
index 6af8e85e18..87b4ec295b 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
@@ -1,5 +1,5 @@
 
-#include <stdint.h>
+#include <cstdint>
 
 #include <iostream>
 #include <map>
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index b15a578862..7fdc3ca8d2 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -74,7 +74,8 @@ void PyBind11Generator::readFilterList()
       m_FilterList << tLine;
     }
   }
-  qDebug() << "[PyBind11Generator] " << libName << ": Generating " << m_FilterList.size() << " Pybind11 Headers ";
+  QTextStream out(&m_DiagnosticMessage);
+  out << "Files To Consider: " << m_FilterList.size();
 }
 
 //-----------------------------------------------------------------------------
@@ -104,7 +105,7 @@ void PyBind11Generator::execute()
   {
     libName = QString("simpl");
   }
-  ss << SIMPL::PyBind11::RuntimeOutputDir << "/UnitTest/" << libName << "_UnitTest.py";
+  ss << SIMPL::PyBind11::RuntimeOutputDir << "/UnitTest/" << libName << "/" << libName << "_UnitTest.py";
   genHeaderPath = genHeaderPath.replace("/./", "/");
   m_ModuleCode.generatePythonTestFile(genHeaderPath, m_IsSIMPLib);
   
@@ -120,7 +121,11 @@ void PyBind11Generator::execute()
   m_ModuleCode.generatePythonicInterface(genHeaderPath, m_IsSIMPLib);
 
   generateModuleInitPy();
+  QTextStream out(&m_DiagnosticMessage);
+  out << "    Generated " << m_FileGenCount;
+  std::cout << "[PyBind11Generator] " << m_DiagnosticMessage.toStdString() << std::endl;
 }
+
 //-----------------------------------------------------------------------------
 void PyBind11Generator::generateModuleInitPy()
 {
@@ -198,7 +203,7 @@ void PyBind11Generator::copyPyInitFiles()
 
   QStringList filters;
   filters.append("*.py");
-  QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
+  // QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
 
   QFileInfoList itemList = currentDir.entryInfoList(filters);
 
@@ -228,19 +233,36 @@ void PyBind11Generator::copyPyInitFiles()
       QTextStream stream(&hOut);
       stream << contents;
       hOut.close();
-
     }
     else
     {
       QFile pyFile(pyFilePath);
-      pyFile.copy(outputPath + "/" + itemInfo.fileName());
+      QFileInfo outputFileInfo(outputPath + "/" + itemInfo.fileName());
+      if(outputFileInfo.exists())
+      {
+        std::cout << "[PyBind11Generator] Dest File Exists: " << outputFileInfo.absoluteFilePath().toStdString() << std::endl;
+        QFile outputFile(outputPath + "/" + itemInfo.fileName());
+        bool didDelete = outputFile.remove();
+        if(!didDelete)
+        {
+          qDebug() << "[PyBind11Generator] File was NOT removed: " << outputFileInfo.absoluteFilePath();
+        }
+      }
+      if(!pyFile.copy(outputFileInfo.absoluteFilePath()))
+      {
+        std::cout << "[PyBind11Generator] File '" << pyFilePath.toStdString() << "' could not be copied to '" << outputFileInfo.absoluteFilePath().toStdString() << "'" << std::endl;
+      }
+      else
+      {
+        qDebug() << "[PyBind11Generator] File Copied: " << outputFileInfo.absoluteFilePath();
+      }
     }
   }
 
 }
 
 //-----------------------------------------------------------------------------
-void PyBind11Generator::recursiveSearch(QDir currentDir)
+void PyBind11Generator::recursiveSearch(const QDir& currentDir)
 {
   if(currentDir.dirName().compare("zRel") == 0 || currentDir.dirName().compare("Build") == 0 || currentDir.dirName().compare("pybind11") == 0)
   {
@@ -253,7 +275,7 @@ void PyBind11Generator::recursiveSearch(QDir currentDir)
   {
     // Get a list of all the directories
     QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-    if(dirList.size() > 0)
+    if(!dirList.empty())
     {
       foreach(QFileInfo fi, dirList)
       {
@@ -287,7 +309,7 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
   QString contents;
   QFileInfo fi(hFile);
 
-  if(fi.baseName().compare("SIMPLibSetGetMacros") == 0)
+  if(fi.baseName() == "SIMPLibSetGetMacros")
   {
     return;
   }
@@ -391,22 +413,14 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
       bindingClass.addConstructor(line);
     }
 
-    if(enumerations.size() != 0)
-    { 
-      bool foundEnumerationCode = false;
-      for(auto e : enumerations)
+    if(!enumerations.empty())
+    {
+      for(const auto& enum_ : enumerations)
       {
-        QString search = QString("enum class %1").arg(e);
+        QString search = QString("enum class %1").arg(enum_);
+
         if(tLine.contains(search))
         {
-          //qDebug() << "Found Enumeration Definition.... " << tLine;
-          enumerations.removeAll(e);
-          foundEnumerationCode = true;
-        }
-        
-        if(foundEnumerationCode)
-        {
-          //qDebug() << "Looking for opening brace... ";
           // Find where the opening brace is at.
           while(!tLine.contains("{"))
           {
@@ -416,23 +430,25 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
           // Grab the first value. They MUST be one value per line.
           line = sourceLines.next();
           tLine = line.trimmed();
-          // qDebug() << "Finding enumeration values.....";
+
           // Grab lines until the closing brace
           QStringList values;
           while(!tLine.contains("};"))
           {
             QStringList tokens = tLine.split(" ");
             values << tokens[0];
-            // qDebug() << tokens[0];
             line = sourceLines.next();
             tLine = line.trimmed();
-          }  
-         // qDebug() << "... Complete";
-          bindingClass.addEnumeration(e, values);
+          }
+          bindingClass.addEnumeration(enum_, values);
+          enumerations.removeAll(enum_);
         }    
       }
     }
   }
 
-  bindingClass.writeBindingFile(genHeaderPath);
+  if(bindingClass.writeBindingFile(genHeaderPath))
+  {
+    m_FileGenCount++;
+  }
 }
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
index 552ebfe29c..1033eab4f6 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
@@ -35,7 +35,7 @@ class PyBind11Generator
  * @brief recursiveSearch
  * @param currentDir
  */
-  void recursiveSearch(QDir currentDir);
+  void recursiveSearch(const QDir& currentDir);
 
   /**
  * @brief generatePybind11Header
@@ -70,6 +70,8 @@ class PyBind11Generator
   QString m_IsSIMPLib;
   QString m_CfgIntDir;
   QStringList m_FilterList;
+  int m_FileGenCount = 0;
+  QString m_DiagnosticMessage;
 
   PyBind11Generator(const PyBind11Generator&) = delete; // Copy Constructor Not Implemented
   void operator=(const PyBind11Generator&) = delete;    // Operator '=' Not Implemented
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
index 76ff80961e..4dff80ab2a 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
@@ -75,8 +75,9 @@ void PythonBindingClass::clearEnumerations()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PythonBindingClass::writeBindingFile(const QString& outputFilePath)
+bool PythonBindingClass::writeBindingFile(const QString& outputFilePath)
 {
+  bool didWrite = false;
   if(getNeedsWrapping())
   {
     QString output;
@@ -138,10 +139,7 @@ void PythonBindingClass::writeBindingFile(const QString& outputFilePath)
     out << generateEnumerationCode();
     out << generateFooterCode();
 
-    // -----------------------------------------------------------------------------
-    //
-    // -----------------------------------------------------------------------------
-    writeOutput(getNeedsWrapping(), output, outputFilePath);
+    didWrite = writeOutput(getNeedsWrapping(), output, outputFilePath);
 
     QString initCode;
     QTextStream init(&initCode);
@@ -172,6 +170,7 @@ void PythonBindingClass::writeBindingFile(const QString& outputFilePath)
     m_Module->addInitCode(getClassName(), initCode);
     m_Module->addPythonCodes(getClassName(), "");
   }
+  return didWrite;
 }
 
 // -----------------------------------------------------------------------------
@@ -205,8 +204,9 @@ QByteArray PythonBindingClass::md5FileContents(const QString& filename)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, const QString& filename)
+bool PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, const QString& filename)
 {
+  bool didWrite = false;
   if(didReplace)
   {
     QFileInfo fi2(filename);
@@ -217,7 +217,7 @@ void PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, c
     {
       QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath);
       qDebug() << ss;
-      return;
+      return didWrite;
     }
 
     QTemporaryFile tempfile;
@@ -237,15 +237,16 @@ void PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, c
       if(!tempfile.copy(filename))
       {
         std::cout << "[PythonBindingClass] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
+        didWrite = false;
       }
       else
       {
         qDebug() << "[PythonBindingClass] Pybind11 Module Generated for: " << fi2.absoluteFilePath();
+        didWrite = true;
       }
     }
     else
     {
-
       QByteArray destMd5Hash = md5FileContents(filename);
       QByteArray sourceMd5Hash = md5FileContents(tempfile.fileName());
 
@@ -257,31 +258,22 @@ void PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, c
         if(!didDelete)
         {
           qDebug() << "[PythonBindingClass] Dest File was NOT removed: " << filename;
+          didWrite = false;
         }
         if(!tempfile.copy(filename))
         {
           std::cout << "[PythonBindingClass] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
+          didWrite = false;
         }
         else
         {
           qDebug() << "[PythonBindingClass]: New File Generated: " << fi2.absoluteFilePath();
+          didWrite = true;
         }
       }
     }
-
-#if 0
-#if OVERWRITE_SOURCE_FILE
-    QFile hOut(filename);
-#else
-    QString tmpPath = "/tmp/" + fi2.fileName();
-    QFile hOut(tmpPath);
-#endif
-    hOut.open(QFile::WriteOnly);
-    QTextStream stream(&hOut);
-    stream << outLines;
-    hOut.close();
-#endif
   }
+  return didWrite;
 }
 
 // -----------------------------------------------------------------------------
@@ -512,10 +504,13 @@ QString PythonBindingClass::generatePropertiesCode()
   QString code;
   QTextStream out(&code);
 
-  QString methodArgs;
-  QTextStream pcodes(&methodArgs);
-  pcodes << "(data_container_array, ";
+  QString args;
+  QTextStream argCode(&args);
+  argCode << "(data_container_array, ";
+  QString docString;
+  QTextStream docCode(&docString);
 
+  docCode << "    :param DataContainerArray data_container_array: The DataContainerArray that the filter will use.\n";
   QString bodyCodes;
   QTextStream bcodes(&bodyCodes);
   QString camelClassName = SIMPL::Python::fromCamelCase(getClassName());
@@ -527,7 +522,7 @@ QString PythonBindingClass::generatePropertiesCode()
     QString line = m_Properties.at(i);
     QStringList tokens = line.split("(");
     tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    // QString pyType = tokens[0];
+    QString pyType = tokens[0];
     QString varName = tokens[1];
 
     if(tokens.size() == 7 && tokens[6] == ::kConstGetOverload)
@@ -536,24 +531,46 @@ QString PythonBindingClass::generatePropertiesCode()
       out << TAB << ".def_property(\"" << varName << "\", py::overload_cast<>(&" << getClassName() << "::get" << varName << ", py::const_), &" << getClassName() << "::set" << varName << ")"
           << NEWLINE_SIMPL;
 
-      pcodes << SIMPL::Python::fromCamelCase(varName);
+      argCode << SIMPL::Python::fromCamelCase(varName);
+      docCode << "    :param " << pyType << " " << SIMPL::Python::fromCamelCase(varName) << ": Sets the " << varName << " value.\n";
       if(i < m_Properties.size() - 1)
       {
-        pcodes << ", ";
+        argCode << ", ";
+      }
+
+      bcodes << "    " << camelClassName << "." << varName << " = ";
+      if(pyType == "DataArrayPath")
+      {
+        bcodes << "simpl.DataArrayPath(" << SIMPL::Python::fromCamelCase(varName) << ")";
+      }
+      else
+      {
+        bcodes << SIMPL::Python::fromCamelCase(varName);
       }
-      bcodes << "    " << camelClassName << "." << varName << " = " << SIMPL::Python::fromCamelCase(varName) << NEWLINE_SIMPL;
+      bcodes << NEWLINE_SIMPL;
     }
     else if(tokens.size() == 6)
     {
       out << TAB << "/* Property accessors for " << varName << " */" << NEWLINE_SIMPL;
       out << TAB << ".def_property(\"" << varName << "\", &" << getClassName() << "::get" << varName << ", &" << getClassName() << "::set" << varName << ")" << NEWLINE_SIMPL;
 
-      pcodes << SIMPL::Python::fromCamelCase(varName);
+      argCode << SIMPL::Python::fromCamelCase(varName);
+      docCode << "    :param " << pyType << " " << SIMPL::Python::fromCamelCase(varName) << ": Sets the " << varName << " value.\n";
+
       if(i < m_Properties.size() - 1)
       {
-        pcodes << ", ";
+        argCode << ", ";
+      }
+      bcodes << "    " << camelClassName << "." << varName << " = ";
+      if(pyType == "DataArrayPath")
+      {
+        bcodes << "simpl.DataArrayPath(" << SIMPL::Python::fromCamelCase(varName) << ")";
       }
-      bcodes << "    " << camelClassName << "." << varName << " = " << SIMPL::Python::fromCamelCase(varName) << NEWLINE_SIMPL;
+      else
+      {
+        bcodes << SIMPL::Python::fromCamelCase(varName);
+      }
+      bcodes << NEWLINE_SIMPL;
     }
     else if(tokens.size() == 4 && tokens[2] == ::kRead)
     {
@@ -566,27 +583,29 @@ QString PythonBindingClass::generatePropertiesCode()
       out << TAB << ".def(\"set" << varName << "\", &" << getClassName() << "::set" << varName << ", py::arg(\"" << varName << "\"))" << NEWLINE_SIMPL;
     }
   }
-  pcodes << ")";
+  argCode << ")";
 
   bcodes
       //     << "    " << camelClassName << ".preflight()" << NEWLINE_SIMPL
       //     << "    preflightError = " << camelClassName << ".ErrorCondition" << NEWLINE_SIMPL
       //     << "    if preflightError >= 0 :" << NEWLINE_SIMPL
-      << "    " << camelClassName << ".execute()" << NEWLINE_SIMPL << "    executeError = " << camelClassName << ".ErrorCondition" << NEWLINE_SIMPL << "    return executeError" << NEWLINE_SIMPL;
-
+      << "    " << camelClassName << ".execute()" << NEWLINE_SIMPL << "    executeError = " << camelClassName << ".ErrorCode" << NEWLINE_SIMPL << "    return executeError" << NEWLINE_SIMPL;
+  docCode << "    :return: ErrorCode produced by the filter\n"
+          << "    :rtype: int\n";
   /*
     Replace any Python keywords in arguments
      For now, just replace the occurence of 'lambda'
   */
-  if(methodArgs.contains("lambda") || bodyCodes.contains("lambda"))
+  if(args.contains("lambda") || bodyCodes.contains("lambda"))
   {
-    methodArgs.replace("lambda", "lambda_1");
+    args.replace("lambda", "lambda_1");
     bodyCodes.replace("lambda", "lambda_1");
   }
 
   QVector<QString> pythonicCodes;
-  pythonicCodes.push_back(methodArgs);
+  pythonicCodes.push_back(args);
   pythonicCodes.push_back(bodyCodes);
+  pythonicCodes.push_back(docString);
 
   m_Module->addPythonicCodes(getClassName(), pythonicCodes);
   return code;
@@ -715,10 +734,8 @@ QString PythonBindingClass::generateEnumerationCode()
 
   for(iter = m_Enumerations.begin(); iter != m_Enumerations.end(); iter++)
   {
-
-    out << "\n\n  /* Enumeration code for " << getClassName() << "::" << iter.key() << " ******************/\n";
-    QString n = iter.key(); // Get the variable name of the enumeration
-    out << "  py::enum_<" << getClassName() << "::" << n << ">(instance, \"" << n << "\")\n";
+    out << "\n\n  /* Enumeration code for " << getClassName() << "::" << iter.key() << "  */\n";
+    out << "  py::enum_<" << getClassName() << "::" << iter.key() << ">(instance, \"" << iter.key() << "\")\n";
     QStringList values = iter.value();
     for(auto v : values)
     {
@@ -726,11 +743,10 @@ QString PythonBindingClass::generateEnumerationCode()
       {
         v = v.remove(',');
       }
-      out << "    .value(\"" << v << "\", " << getClassName() << "::" << n << "::" << v << ")\n";
+      out << "    .value(\"" << v << "\", " << getClassName() << "::" << iter.key() << "::" << v << ")\n";
     }
     out << "    .export_values();\n";
   }
-  // qDebug() << code;
   return code;
 }
 
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
index 7c2b931587..18a46bc097 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
@@ -50,10 +50,9 @@ class PythonBindingClass : public QObject
   using EnumerationType = QMap<QString, QStringList>;
   SIMPL_INSTANCE_PROPERTY(EnumerationType, Enumerations)
   void addEnumeration(const QString& name, const QStringList& values);
-  void clearEnumerations(); 
-  
+  void clearEnumerations();
 
-  void writeBindingFile(const QString& outputFilePath);
+  bool writeBindingFile(const QString& outputFilePath);
 
   /**
   *@brief quote
@@ -68,7 +67,7 @@ class PythonBindingClass : public QObject
   *@param outLines
   *@param filename
   */
-  void writeOutput(bool didReplace, const QString& outLines, const QString& filename);
+  bool writeOutput(bool didReplace, const QString& outLines, const QString& filename);
 
 protected:
   PythonBindingClass() = delete;
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
index 56d9e84100..80b596b832 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
@@ -16,16 +16,11 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PythonBindingsModule::PythonBindingsModule()
-{
-}
-
+PythonBindingsModule::PythonBindingsModule() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PythonBindingsModule::~PythonBindingsModule()
-{
-}
+PythonBindingsModule::~PythonBindingsModule() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -197,7 +192,7 @@ QByteArray PythonBindingsModule::md5FileContents(const QString& filename)
 void PythonBindingsModule::writeOutput(bool didReplace, const QString& outLines, QString filename)
 {
   // qDebug() << "Writing File: " << filename;
-  if(didReplace == true)
+  if(didReplace)
   {
     QFileInfo fi2(filename);
     QString parentPath = fi2.path();
@@ -376,15 +371,24 @@ void PythonBindingsModule::generatePythonTestFile(const QString& outputPath, con
 // -----------------------------------------------------------------------------
 void PythonBindingsModule::generatePythonicInterface(const QString& outputPath, const QString& isSIMPLib)
 {
-  QFileInfo fi(outputPath);
+  QList<QString> classes = m_Headers.keys();
+  QListIterator<QString> iter(classes);
 
   QString code;
   QTextStream out(&code);
 
   out << "\"\"\"\n Pythonic Interface to SIMPL Plugin " << getLibNameUpper() << "\n";
   out << " This file is auto generated during the build of DREAM.3D and the plugin " << getLibNameUpper() << "\n";
-  out << "\"\"\""
-      << "\n";
+  out << " The code is generate from file " << __FILE__ << "(" << __LINE__ << ")\n";
+  out << " The Filters that have pythonic interfaces generated for them are:\n";
+
+  while(iter.hasNext())
+  {
+    QString aClass = iter.next();
+    out << "    " << aClass << "\n";
+  }
+
+  out << QStringLiteral("\"\"\"") << "\n";
   out << "\n";
   QString shortLibName = m_LibName;
   shortLibName.replace("_py", "");
@@ -395,17 +399,18 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
   }
   out
       //<< "import dream3d\n"
+      << "from .dream3d import simpl\n"
       << "from .dream3d import " << shortLibName << "\n"
-      << "\n\n\n";
+      << "\n";
 
-  QList<QString> classes = m_Headers.keys();
-  QListIterator<QString> iter(classes);
+  iter.toFront();
   while(iter.hasNext())
   {
     QString aClass = iter.next();
     QVector<QString> pythonicCodes = m_PythonicCodes[aClass];
     QString initCodes;
     QString bodyCodes;
+    QString docCodes;
     if(pythonicCodes.size() >= 1)
     {
       initCodes = pythonicCodes[0];
@@ -414,21 +419,25 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
     {
       bodyCodes = pythonicCodes[1];
     }
+    if(pythonicCodes.size() >= 3)
+    {
+      docCodes = pythonicCodes[2];
+    }
     bodyCodes = bodyCodes.replace("@shortLibName@", shortLibName);
     if(aClass.compare("AbstractFilter") == 0 && isSIMPLib.compare("FALSE") == 0)
     {
       continue;
     }
-    else if(bodyCodes.isEmpty())
+    if(bodyCodes.isEmpty())
     {
       continue;
     }
     out << "def " << SIMPL::Python::fromCamelCase(aClass) << initCodes << ":\n"
-        << "    \"\"\""
+        << R"(    ''')"
         << "\n"
         << "    Executes the filter " << aClass << " and returns the error.\n"
-        << "    \"\"\""
         << "\n"
+        << docCodes << "    '''\n\n"
         << bodyCodes << "\n"
 
         << "\n\n";
diff --git a/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in b/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
index b9f6082287..0d619641a9 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
+++ b/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
@@ -66,6 +66,8 @@ namespace SIMPL
       static const QString TestTempDirectory("@SIMPLProj_BINARY_DIR@/Testing/Temporary");
 
       static const QString DataDirectory("@DREAM3D_DATA_DIR@");
+
+      static const QString IsMSVC("@MSVC_IDE@");
   }
   
 }
diff --git a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
index 2031aad014..079737d8ec 100644
--- a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
@@ -1,5 +1,5 @@
 /* Template file used is called DerivedSharedPointerClassInit.in.h */
-
+// clang-format off
 /**
  * @brief This defines a C++11 alias so loading the file by itself into an IDE
  * will allow the proper code completion for a wrapped std::shared_ptr<> class.
@@ -18,3 +18,4 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
  */
 
 /* END TEMPLATE FILE DerivedSharedPointerClassInit.in.h */
+// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
index f5f1568298..be932bbfdb 100644
--- a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
@@ -1,7 +1,7 @@
 /* This file is auto-genereated from a template file. If you want changes
  * then edit the template file.
  */
-
+// clang-format off
 #include <pybind11/pybind11.h>
 
 #include <utility>
@@ -15,6 +15,14 @@ namespace py = pybind11;
 template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
 #endif
 
+#define @FULL_LIB_NAME@_PYBIND_11_HEADER
+
+/******************************************************************************
+ * These are Plugin specific Headers. Yep sort of hard coded and brittle.
+ ******************************************************************************/
+#ifdef ORIENTATIONANALYSIS_PYBIND_11_HEADER
+#include "OrientationLib/OrientationMath/OrientationConverter.hpp"
+#endif
 
 /******************************************************************************
  * This is a list of all the SIMPL headers that are needed/wrapped by Pybind11
@@ -36,6 +44,22 @@ void Init_@LIB_NAME@(py::module& parentModule)
   py::module mod = parentModule.def_submodule("@LIB_NAME@", "  Python wrapping for @FULL_LIB_NAME@");
   mod.doc() = "Python wrapping for @LIB_NAME@";
 
+  /* Enumeration code for OrientationType */
+#ifdef ORIENTATIONANALYSIS_PYBIND_11_HEADER
+  py::enum_<OrientationRepresentation::Type>(mod, "OrientationType")
+      .value("Euler", OrientationRepresentation::Type::Euler)
+      .value("OrientationMatrix", OrientationRepresentation::Type::OrientationMatrix)
+      .value("Quaternion", OrientationRepresentation::Type::Quaternion)
+      .value("AxisAngle", OrientationRepresentation::Type::AxisAngle)
+      .value("Rodrigues", OrientationRepresentation::Type::Rodrigues)
+      .value("Homochoric", OrientationRepresentation::Type::Homochoric)
+      .value("Cubochoric", OrientationRepresentation::Type::Cubochoric)
+      .value("Unknown", OrientationRepresentation::Type::Unknown);
+#endif
+
   /* Init codes for classes in the Module */
   @MODULE_INIT_CODE@
 }
+
+#undef @FULL_LIB_NAME@_PYBIND_11_HEADER
+// clang-format on
\ No newline at end of file
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
index 905c4ccce8..fcd3f469d1 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
@@ -1,3 +1,4 @@
+// clang-format off
 #include <QtCore/QString>
 
 #include <pybind11/numpy.h>
@@ -625,3 +626,4 @@ template <> struct type_caster<VectorOfFloatArray>
 
 } // namespace detail
 } // namespace pybind11
+// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
index a240b951db..b42dff760a 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
@@ -1,5 +1,5 @@
 #pragma once
-
+// clang-format off
 /* =============================================================================
  * BEGIN Template file Pybind11TopMatter.in.h
  * ========================================================================== */
@@ -25,4 +25,4 @@ namespace
 /* =============================================================================
  * END Template file Pybind11TopMatter.in.h
  * ========================================================================== */
-
+// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index e2dd2b4306..6feed6c5c4 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -1,4 +1,4 @@
-
+// clang-format off
 /* =============================================================================
  * BEGIN Template file SIMPLModuleCodeTemplate.in.cpp
  * ========================================================================== */
@@ -67,6 +67,7 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
  *
  ******************************************************************************/
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 /**
  * @brief Initializes a template specialization of DataArray<T>
@@ -94,7 +95,7 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
         })) /* Class instance method setValue */                                                                                                                                                       \
         .def("setValue", &DataArrayType::setValue, py::arg("index"), py::arg("value"))                                                                                                                 \
         .def("getValue", &DataArrayType::getValue, py::arg("index"))                                                                                                                                   \
-	    .def_property("Data", &DataArrayType::getArray, &DataArrayType::setArray, py::return_value_policy::reference)                                                                                  \
+	      .def_property("Data", &DataArrayType::getArray, &DataArrayType::setArray, py::return_value_policy::reference)                                                                                  \
         .def_property("Name", &DataArrayType::getName, &DataArrayType::setName)                                                                                                                        \
         .def("Cleanup", []() { return DataArrayType::NullPointer(); });                                                                                                                                \
     ;                                                                                                                                                                                                  \
@@ -117,6 +118,89 @@ PYB11_DEFINE_DATAARRAY_INIT(float, FloatArrayType);
 PYB11_DEFINE_DATAARRAY_INIT(double, DoubleArrayType);
 
 
+#define PYB11_DEFINE_SIMPLARRAY_2_INIT(T, NAME)\
+  py::class_<NAME>(mod, #NAME)\
+	  .def(py::init<>([](py::list values) {\
+      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]));\
+      return vec;\
+    }))\
+	  .def("__repr__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+		  return outValues;\
+	  })\
+	  .def("__str__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+      return py::str(outValues);\
+	  })\
+	  .def("__getitem__", [](const NAME &values, int index) {\
+		  return values[index];\
+	  })\
+  ;
+
+#define PYB11_DEFINE_SIMPLARRAY_3_INIT(T, NAME)\
+  py::class_<NAME>(mod, #NAME)\
+	  .def(py::init<>([](py::list values) {\
+      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]));\
+      return vec;\
+    }))\
+	  .def("__repr__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+		  return outValues;\
+	  })\
+	  .def("__str__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+      return py::str(outValues);\
+	  })\
+	  .def("__getitem__", [](const NAME &values, int index) {\
+		  return values[index];\
+	  })\
+  ;
+
+#define PYB11_DEFINE_SIMPLARRAY_4_INIT(T, NAME)\
+  py::class_<NAME>(mod, #NAME)\
+	  .def(py::init<>([](py::list values) {\
+      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]));\
+      return vec;\
+    }))\
+	  .def("__repr__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+		  return outValues;\
+	  })\
+	  .def("__str__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+      return py::str(outValues);\
+	  })\
+	  .def("__getitem__", [](const NAME &values, int index) {\
+		  return values[index];\
+	  })\
+  ;
+
+#define PYB11_DEFINE_SIMPLARRAY_6_INIT(T, NAME)\
+  py::class_<NAME>(mod, #NAME)\
+	  .def(py::init<>([](py::list values) {\
+      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]), py::cast<T>(values[4]), py::cast<T>(values[5]));\
+      return vec;\
+    }))\
+	  .def("__repr__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+		  return outValues;\
+	  })\
+	  .def("__str__", [](const NAME &inValues) {\
+		  py::list outValues;\
+		  for (T value : inValues) { outValues.append(value); }\
+      return py::str(outValues);\
+	  })\
+	  .def("__getitem__", [](const NAME &values, int index) {\
+		  return values[index];\
+	  })\
+  ;
 
 //------------------------------------------------------------------------------
 // This header file is auto-generated and contains include directives for each
@@ -137,14 +221,50 @@ PYBIND11_MODULE(dream3d, m)
   /* Define a python submodule for SIMPL */
   py::module mod = m.def_submodule("simpl", "  Python wrapping for SIMPL");
 
-  //
-  //
-  //
-  py::class_<FloatVec3Type>(mod, "FloatVec3Type").def(py::init<const float&, const float&, const float&>());
-  py::class_<FloatVec2Type>(mod, "FloatVec2Type").def(py::init<const float&, const float&>());
-  py::class_<IntVec3Type>(mod, "IntVec3Type").def(py::init<const int&, const int&, const int&>());
+#if 0
+  py::class_<SizeVec3Type>(mod, "SizeVec3Type")
+	  .def(py::init<>([](py::list values) {
+      SizeVec3Type sv3 = SizeVec3Type(py::cast<size_t>(values[0]), py::cast<size_t>(values[1]), py::cast<size_t>(values[2]));
+      return sv3;
+    }))
+	  .def("__repr__", [](const SizeVec3Type &inValues) {
+		  py::list outValues;
+		  for (size_t value : inValues)
+		  {
+			  outValues.append(value);
+		  }
+		  return outValues;
+	  })
+	  .def("__str__", [](const SizeVec3Type &inValues) {
+		  py::list outValues;
+		  for (size_t value : inValues)
+		  {
+			  outValues.append(value);
+		  }
+      return py::str(outValues);
+	  })
+	  .def("__getitem__", [](const SizeVec3Type &values, int index) {
+		  return values[index];
+	  })
+  ;
+#endif
+
+
+  // SIMPLArray declarations/definitions
+  PYB11_DEFINE_SIMPLARRAY_2_INIT(float, FloatVec2Type)
+  PYB11_DEFINE_SIMPLARRAY_2_INIT(int32_t, IntVec2Type)
+  PYB11_DEFINE_SIMPLARRAY_2_INIT(size_t, SizeVec2Type)
+
+  PYB11_DEFINE_SIMPLARRAY_3_INIT(float, FloatVec3Type)
+  PYB11_DEFINE_SIMPLARRAY_3_INIT(int, IntVec3Type)
+  PYB11_DEFINE_SIMPLARRAY_3_INIT(size_t, SizeVec3Type)
+
+  PYB11_DEFINE_SIMPLARRAY_4_INIT(float, FloatVec4Type)
+  PYB11_DEFINE_SIMPLARRAY_4_INIT(int, IntVec4Type)
+  PYB11_DEFINE_SIMPLARRAY_4_INIT(size_t, SizeVec4Type)
 
-  py::class_<SizeVec3Type>(mod, "SizeVec3Type").def(py::init<const size_t&, const size_t&, const size_t&>());
+  PYB11_DEFINE_SIMPLARRAY_6_INIT(float, FloatVec6Type)
+  PYB11_DEFINE_SIMPLARRAY_6_INIT(int32_t, IntVec6Type)
 
   py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
 	  .def(py::init< const float &, const float &, const float &, const float &>())
@@ -317,7 +437,23 @@ PYBIND11_MODULE(dream3d, m)
 	  .value("Any", ShapeType::Type::Any)
 	  .export_values();
 
-  /* Enumeration code for AttributeMatrix::Type ******************/
+  /* Enumeration code for Crystal Structures */
+  py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
+      .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
+      .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
+      .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
+      .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
+      .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
+      .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
+      .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
+      .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
+      .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
+      .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
+      .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
+      .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure)
+      .export_values();
+
+  /* Enumeration code for Data types ******************/
   py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
     .value("Int8", SIMPL::ScalarTypes::Type::Int8)
     .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
@@ -330,7 +466,6 @@ PYBIND11_MODULE(dream3d, m)
     .value("Float", SIMPL::ScalarTypes::Type::Float)
     .value("Double", SIMPL::ScalarTypes::Type::Double)
     .value("Bool", SIMPL::ScalarTypes::Type::Bool)
-
     .export_values();
 
   /* Enumeration code for Initialization Choices */
@@ -339,36 +474,6 @@ PYBIND11_MODULE(dream3d, m)
       .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
       .export_values();
 
-  /* Enumeration code for OrientationType */
-#if 0
-  py::enum_<OrientationConverter<float>::OrientationType>(mod, "OrientationType")
-	  .value("Euler", OrientationConverter<float>::Euler)
-	  .value("OrientationMatrix", OrientationConverter<float>::OrientationMatrix)
-	  .value("Quaternion", OrientationConverter<float>::Quaternion)
-	  .value("AxisAngle", OrientationConverter<float>::AxisAngle)
-	  .value("Rodrigues", OrientationConverter<float>::Rodrigues)
-	  .value("Homochoric", OrientationConverter<float>::Homochoric)
-	  .value("Cubochoric", OrientationConverter<float>::Cubochoric)
-	  .value("UnknownOrientationType", OrientationConverter<float>::UnknownOrientationType)
-	  .export_values();
-
-  /* Enumeration code for Crystal Structures */
-  py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
-	  .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
-	  .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
-	  .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
-	  .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
-	  .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
-	  .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
-	  .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
-	  .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
-	  .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
-	  .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
-	  .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
-	  .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure)
-	  .export_values();
-#endif
-
   /* Enumeration code for AngleUnits */
   py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits")
 	  .value("Radians", ArrayCalculator::AngleUnits::Radians)
@@ -416,7 +521,7 @@ PYBIND11_MODULE(dream3d, m)
   
   //--------------------------------------------------------------------------
   // This header file is auto-generated and contains some C++ code to create
-  // a submole for each dream3d plugin
+  // a submodule for each dream3d plugin
   //--------------------------------------------------------------------------
   #include "DREAM3D_SubmoduleInit.hpp"
  
@@ -427,3 +532,4 @@ PYBIND11_MODULE(dream3d, m)
 /* =============================================================================
  * END Template file SIMPLModuleCodeTemplate.in.cpp
  * ========================================================================== */
+// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
index cff6d00fd5..749defb095 100644
--- a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
@@ -1,4 +1,4 @@
-
+// clang-format off
 /* =============================================================================
  * BEGIN Template file SharedPointerClassInit.in.h
  * ========================================================================== */
@@ -24,3 +24,4 @@ PySharedPtrClass<@CLASS_NAME@> declare@CLASS_NAME@(py::module& m)
 /* =============================================================================
  * END Template file SharedPointerClassInit.in.h
  * ========================================================================== */
+  // clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
index d40dacfcfe..2f5959d089 100644
--- a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
@@ -1,4 +1,4 @@
-
+// clang-format off
 /* =============================================================================
  * BEGIN Template file SimpleClassInit.in.h
  * ========================================================================== */
@@ -27,3 +27,4 @@ PySharedPtrClass<@CLASS_NAME@> declare@CLASS_NAME@(py::module& m)
 /* =============================================================================
  * END Template file SimpleClassInit.in.h
  * ========================================================================== */
+  // clang-format on
diff --git a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
index faa9ef4079..7c6164dc5a 100644
--- a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
+++ b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
@@ -107,16 +107,24 @@ function(CreatePybind11Module)
     target_link_libraries(${SIMPL_PY_MODULE_NAME} 
                             LINK_PRIVATE pybind11::module SIMPLib
     )
+
+    set (SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR})
+    if (SIMPL_ENABLE_ANACONDA_PACKAGE)
+      #message(STATUS "${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${SIMPL_PYTHON_MODULE_NAME}")
+      #message(STATUS "SIMPL_ENABLE_ANACONDA_PACKAGE: ON <================>")
+      set (SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${SIMPL_PYTHON_MODULE_NAME})
+    endif()
+
   
     set_target_properties(${SIMPL_PY_MODULE_NAME} PROPERTIES 
       PREFIX "${PYTHON_MODULE_PREFIX}"
       SUFFIX "${PYTHON_MODULE_EXTENSION}"
       OUTPUT_NAME ${SIMPL_PY_MODULE_NAME}
-      LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
-      LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
-      LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
-      LIBRARY_OUTPUT_DIRECTORY_RELWDEBUG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
-      LIBRARY_OUTPUT_DIRECTORY_RELMINSIZE ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}
+      LIBRARY_OUTPUT_DIRECTORY ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
+      LIBRARY_OUTPUT_DIRECTORY_DEBUG ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
+      LIBRARY_OUTPUT_DIRECTORY_RELEASE ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
+      LIBRARY_OUTPUT_DIRECTORY_RELWDEBUG ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
+      LIBRARY_OUTPUT_DIRECTORY_RELMINSIZE ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
       ARCHIVE_OUTPUT_NAME ${PYTHON_MODULE_PREFIX}${SIMPL_PY_MODULE_NAME}${PYTHON_MODULE_EXTENSION}
       PDB_NAME ${PYTHON_MODULE_PREFIX}${SIMPL_PY_MODULE_NAME}${PYTHON_MODULE_EXTENSION}
     )
diff --git a/Wrapping/Python/Pybind11/python_test_driver.sh b/Wrapping/Python/Pybind11/python_test_driver.sh
new file mode 100755
index 0000000000..b35f957e34
--- /dev/null
+++ b/Wrapping/Python/Pybind11/python_test_driver.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+#set -e
+
+echo "[@test@] SIMPL Python Test Starting"
+
+ANACONDA_DIR=@ANACONDA_DIR@
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$(CONDA_REPORT_ERRORS=false '${ANACONDA_DIR}/bin/conda' shell.bash hook 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    \eval "$__conda_setup"
+else
+    if [ -f "${ANACONDA_DIR}/etc/profile.d/conda.sh" ]; then
+        . "${ANACONDA_DIR}/etc/profile.d/conda.sh"
+        CONDA_CHANGEPS1=false conda activate base
+    else
+        \export PATH="${ANACONDA_DIR}/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+
+export PYTHONPATH="@SIMPL_ANACONDA_OUTPUT_DIR@/@PYTHON_SITE_PACKAGES_NAME@"
+cd "$PYTHONPATH"
+echo "PYTHONPATH: $PYTHONPATH"
+
+PYTHON_TEST_INPUT_DIR="@PYTHON_TEST_INPUT_DIR@"
+
+"@PYTHON_EXECUTABLE@" "${PYTHON_TEST_INPUT_DIR}/@test@.py"
+
+if [ $? -eq 0 ]
+then
+  echo "[@test@] Success"
+  exit 0
+else
+  echo "[@test@] Failure" >&2
+  exit 1
+fi
diff --git a/Wrapping/Python/SIMPL/simpl_helpers.py b/Wrapping/Python/SIMPL/simpl_helpers.py
index 226a74ec85..aa0be4eff4 100644
--- a/Wrapping/Python/SIMPL/simpl_helpers.py
+++ b/Wrapping/Python/SIMPL/simpl_helpers.py
@@ -1,7 +1,7 @@
 
 from dream3d import simpl
 from dream3d import simplpy as d3d
-from dream3d import syntheticbuildingpy as synthetic_building
+#from dream3d import syntheticbuildingpy as synthetic_building
 from enum import IntEnum
 
 try:
@@ -25,7 +25,7 @@ def CreateDataContainer(name):
     Keyword arguments:
     name -- The name of the DataContainer    
     """
-    dc = simpl.DataContainer.New(name)
+    dc = simpl.DataContainer(name)
     return dc
 
 
@@ -59,9 +59,9 @@ def WriteDREAM3DFile(path, dca, verbose=False):
         print("Writing to file:", path)
     writer.setDataContainerArray(dca)
     writer.execute()
-    if(writer.ErrorCondition != 0):
-        print("Error %d writing DREAM.3D File to path %s" % writer.ErrorCondition, path)
-    return writer.ErrorCondition
+    if(writer.ErrorCode != 0):
+        print("Error %d writing DREAM.3D File to path %s" % writer.ErrorCode, path)
+    return writer.ErrorCode
 
 
 def CreateDataArray(name, shape, cDims, type):
@@ -200,17 +200,17 @@ def CreateDataContainerProxy(dca, data_array_paths):
         if data_container_name == "":
             continue
         elif attr_matrix_name == "":
-            dcap.getDataContainerProxy(data_container_name).flag = checked
+            dcap.getDataContainerProxy(data_container_name).Flag =checked
         elif data_array_name == "":
-            dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name).flag = checked
+            dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name).Flag =checked
         else:
             dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name) \
-            .getDataArrayProxy(data_array_name).flag = checked
+            .getDataArrayProxy(data_array_name).Flag =checked
     return dcap
 
 
-def CreateGeometry(data_container_array, array_handling, geometry_type, data_container_name, treat_warnings_as_errors, dimensions = simpl.IntVec3(0,0,0),
-origin = simpl.FloatVec3(0,0,0), resolution = simpl.FloatVec3(0,0,0), cell_attribute_matrix_name="", x_bounds_array_path = simpl.DataArrayPath("", "", ""),
+def CreateGeometry(data_container_array, array_handling, geometry_type, data_container_name, treat_warnings_as_errors, dimensions = simpl.IntVec3Type([0,0,0]),
+origin = simpl.FloatVec3Type([0,0,0]), spacing = simpl.FloatVec3Type([0,0,0]), cell_attribute_matrix_name="", x_bounds_array_path = simpl.DataArrayPath("", "", ""),
 y_bounds_array_path = simpl.DataArrayPath("", "", ""), z_bounds_array_path = simpl.DataArrayPath("", "", ""), 
 shared_vertex_list_array_path = simpl.DataArrayPath("", "", ""), vertex_attribute_matrix_name = "", shared_edge_list_array_path = simpl.DataArrayPath("", "", ""),
 edge_attribute_matrix_name = "", shared_tri_list_array_path = simpl.DataArrayPath("", "", ""), face_attribute_matrix_name="",
@@ -265,7 +265,7 @@ def CreateGeometry(data_container_array, array_handling, geometry_type, data_con
     # For all geometry types
     create_geometry = simpl.CreateGeometry.New()
     create_geometry.setDataContainerArray(data_container_array)
-    create_geometry.DataContainerName = data_container_name
+    create_geometry.DataContainerName = simpl.DataArrayPath(data_container_name, "", "")
     create_geometry.GeometryType = geometry_type
     create_geometry.TreatWarningsAsErrors = treat_warnings_as_errors
 
@@ -281,7 +281,7 @@ def CreateGeometry(data_container_array, array_handling, geometry_type, data_con
     if geometry_type == simpl.IGeometry.Type.Image:     
         create_geometry.Dimensions = dimensions
         create_geometry.Origin = origin
-        create_geometry.Resolution = resolution
+        create_geometry.Spacing= spacing
         create_geometry.ImageCellAttributeMatrixName = cell_attribute_matrix_name
     elif geometry_type == simpl.IGeometry.Type.RectGrid:
         create_geometry.XBoundsArrayPath = x_bounds_array_path
@@ -314,7 +314,7 @@ def CreateGeometry(data_container_array, array_handling, geometry_type, data_con
 
     # Execute the filter and return the error condition
     create_geometry.execute()
-    executeError = create_geometry.ErrorCondition
+    executeError = create_geometry.ErrorCode
     return executeError
 
 
@@ -411,13 +411,13 @@ def RemoveArray(dca, path):
     if datacontainername == "":
         return False
     elif attrmatrixname == "" and dataarrayname == "":
-        dcap.getDataContainerProxy(datacontainername).flag = 2
+        dcap.getDataContainerProxy(datacontainername).Flag =2
     elif dataarrayname == "":
-        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).flag = 2
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).Flag =2
     else:
-        dcap.getDataContainerProxy(datacontainername).flag = 0
-        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).flag = 0
-        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).getDataArrayProxy(dataarrayname).flag = 2
+        dcap.getDataContainerProxy(datacontainername).Flag =0
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).Flag =0
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).getDataArrayProxy(dataarrayname).Flag =2
 
     err = d3d.remove_arrays(dca, dcap)
     if err < 0:
@@ -526,7 +526,7 @@ def MultiThresholdObjects2(dca, source_path, destination_array_name, selected_th
     
     err = d3d.multi_threshold_objects2(dca, destination_array_name, thresholds)
     if err < 0:
-        print("MultiThresholdObjects ErrorCondition: %d" % err)
+        print("MultiThresholdObjects ErrorCode: %d" % err)
     return err
 
 
@@ -611,7 +611,7 @@ def MoveData(dca, what_to_move, source_path, destination_path):
     err = d3d.move_data(dca, what_to_move_number, destination_datacontainername, simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, ""),
     simpl.DataArrayPath(destination_datacontainername, destination_attrmatrixname, ""), simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, source_dataarrayname))
     if err < 0:
-        print("MoveData ErrorCondition %d: " % err)
+        print("MoveData ErrorCode %d: " % err)
     return err
     
 
@@ -631,52 +631,6 @@ def MoveMultiData(dca, what_to_move, source_paths, destination_path):
         err = MoveData(dca, what_to_move, source_path, destination_path)
     return err
 
-
-def GenerateStatsData(dca, stats_data_type, phase_name, phase_index, crystal_symmetry, micro_preset_model, phase_fraction,
- mu, sigma, min_cut_off, max_cut_off, bin_step_size, create_ensemble_attribute_matrix, data_container_name,
-  cell_ensemble_attribute_matrix_name, append_to_existing_attribute_matrix, selected_ensemble_attribute_matrix,
-   odf_data, mdf_data, axis_odf_data, rdf_min_max_distance=0, rdf_num_bins=0, rdf_box_size=0):
-   """
-   Generate StatsData for use in Synthetic Building filters
-   \ndca: Data Container Array to place data in
-   \nstats_data_type: The type of StatsData to generate, either "Primary" or "Precipitate"
-   \nphase_name: The name of the Phase
-   \nphase_index: The index of the Phase
-   \ncrystal_symmetry: The classification of the structure by symmetry
-   \nmicro_preset_model: The type of microstructure preset model (Equiaxed, Rolled, or Recrystallized (Primary only))
-   \nphase_fraction: The volume fraction of the Phase
-   \nmu: The average value of the lognormal grain size distribution
-   \nsigma: The standard deviation of the lognormal grain size distribution.
-   \nmin_cut_off: Minimum cutoff value of sigma
-   \nmax_cut_off: Maximum cutoff value of sigma
-   \nbin_step_size: The size of bin to use in segregating the Feature size distribution into classes for correlating other statistics to Feature size.
-   \ncreate_ensemble_attribute_matrix: Whether to create ensemble matrix
-   \ndata_container_name: The name of the new DataContainer holding the output
-   \ncell_ensemble_attribute_matrix_name: The name of the new Attribute Matrix holding output
-   \nappend_to_existing_attribute_matrix: Whether to append to an existing attribute matrix
-   \nselected_ensemble_attribute_matrix: The DataArrayPath of the Attribute Matrix to append data to
-   \nodf_data: DynamicTableData of weights for the ODF generation
-   \nmdf_data: DynamicTableData of weights for the MDF generation
-   \naxis_odf_data: DynamicTableData of weights for the AxisODF generation
-   \nrdf_min_max_distance: The min / max distance of RDF
-   \nrdf_num_bins: The number of bins
-   \nrdf_box_size: The (X, Y, Z) size of the box
-   """
-   if stats_data_type == "Primary":
-       err = synthetic_building.generate_primary_stats_data(dca, phase_name, phase_index, crystal_symmetry, micro_preset_model,
-            phase_fraction, mu, sigma, min_cut_off, max_cut_off, bin_step_size, create_ensemble_attribute_matrix,
-            data_container_name, cell_ensemble_attribute_matrix_name, append_to_existing_attribute_matrix,
-            selected_ensemble_attribute_matrix, odf_data, mdf_data, axis_odf_data)
-       return err
-   elif stats_data_type == "Precipitate":
-        err = synthetic_building.generate_precipitate_stats_data(dca, phase_name, phase_index, crystal_symmetry,
-            micro_preset_model, phase_fraction, mu, sigma, min_cut_off, max_cut_off, bin_step_size,
-            create_ensemble_attribute_matrix, data_container_name, cell_ensemble_attribute_matrix_name,
-            append_to_existing_attribute_matrix, selected_ensemble_attribute_matrix, odf_data, mdf_data,
-            axis_odf_data, rdf_min_max_distance, rdf_num_bins, rdf_box_size)
-        return err
-
-
 def is_number(s):
     try:
         float(s)
diff --git a/Wrapping/Python/SIMPL/simpl_test_dirs.in.py b/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
index b2a78ef504..d03e5efff2 100644
--- a/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
+++ b/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
@@ -13,3 +13,4 @@ def GetTestTempDirectory():
 
 def GetDataDirectory():
   return "${DREAM3D_DATA_DIR}"
+
diff --git a/Wrapping/Python/Testing/AbstractFilterTest.py b/Wrapping/Python/Testing/AbstractFilterTest.py
index 31581aa577..dbbc3ca61e 100644
--- a/Wrapping/Python/Testing/AbstractFilterTest.py
+++ b/Wrapping/Python/Testing/AbstractFilterTest.py
@@ -2,9 +2,10 @@
 
 import time
 
-import dream3d
-
+from dream3d import simplpy
 from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def BasicTest():
@@ -36,13 +37,14 @@ def BasicTest():
     b = filter.Enabled
     assert b is True
 
-    filter.ErrorCondition = -1000
-    e = filter.ErrorCondition
+    filter.setErrorCondition(-1000, "Foo")
+    e = filter.ErrorCode
     assert e == -1000
 
 """
 Main entry point for python script
 """
 if __name__ == "__main__":
+    print("AbstractFilter Test Starting")
     BasicTest()
     print("AbstractFilter Test Complete")
diff --git a/Wrapping/Python/Testing/Array_Calculator_Test.py b/Wrapping/Python/Testing/Array_Calculator_Test.py
new file mode 100644
index 0000000000..3c45519239
--- /dev/null
+++ b/Wrapping/Python/Testing/Array_Calculator_Test.py
@@ -0,0 +1,49 @@
+# Pipeline : 
+# This pipeline is designed to test the Attribute Array Calculator filter
+#
+
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+
+def array_calculator_test():
+    # Create Data Container Array using simpl directly
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container using the pythonic version
+    err = simplpy.create_data_container(dca, "ImageDataContainer")
+    assert err == 0
+
+    # Create an Attribute Matrix
+    amDims = [[4, 5, 6]]
+    tableData = sc.CreateDynamicTableData(amDims)
+    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
+    err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
+    assert err == 0
+    
+    # Add a data array to the Attribute Matrix by using a Filter
+    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
+    inputRange = (0,0)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    assert err == 0
+    
+    # Test: Attribute Array Calculator
+    err = simplpy.array_calculator(dca, simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", ""), 
+                                   "Int32Data*3.1415927*100", simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Output"),
+                                   simpl.AngleUnits.Radians, simpl.ScalarTypes.UInt32)
+    assert err == 0
+
+
+    # Write to DREAM3D file
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+                              + "/Data/Output/CoreFilterTests/ArrayCalculatorTest.dream3d", dca)
+    assert err == 0
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+    array_calculator_test()
diff --git a/Wrapping/Python/Testing/AttributeMatrixTest.py b/Wrapping/Python/Testing/AttributeMatrixTest.py
index 3fdf9d5fda..826810d0be 100644
--- a/Wrapping/Python/Testing/AttributeMatrixTest.py
+++ b/Wrapping/Python/Testing/AttributeMatrixTest.py
@@ -1,9 +1,9 @@
 
 
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def AttributeMatrixTest():
diff --git a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
new file mode 100644
index 0000000000..678be58bc8
--- /dev/null
+++ b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
@@ -0,0 +1,46 @@
+''' 
+Creates a Int32 array and then converts it to UInt8
+'''
+
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+import datetime as datetime
+
+
+def convert_data_test():
+    # Create Data Container Array
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container
+    dc = sc.CreateDataContainer("ImageDataContainer")
+    dca.addOrReplaceDataContainer(dc)
+ 
+    shape = simpl.VectorSizeT([4, 5, 2])
+    cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
+    dc.addOrReplaceAttributeMatrix(cellAm)   
+    
+    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
+    inputRange = (0,0)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    assert err == 0
+
+
+    # Test: Convert AttributeArray Data Type
+    err = simplpy.convert_data(dca, simpl.NumericTypes.UInt8, "uint8",
+                               simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data"))
+    assert err == 0
+
+    # Write to DREAM3D file
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+                              + "/Data/Output/CoreFilterTests/ConvertAttributeArrayDataType.dream3d", dca)
+    assert err == 0
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+    convert_data_test()
diff --git a/Wrapping/Python/Testing/Copy_Object_Test.py b/Wrapping/Python/Testing/Copy_Object_Test.py
new file mode 100644
index 0000000000..5a6a8caa33
--- /dev/null
+++ b/Wrapping/Python/Testing/Copy_Object_Test.py
@@ -0,0 +1,52 @@
+# Pipeline : 
+# This pipeline is designed to test the Copy Object filter
+#
+
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def copy_object_test():
+    # Create Data Container Array using simpl directly
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container using the pythonic version
+    err = simplpy.create_data_container(dca, "ImageDataContainer")
+    assert err == 0
+
+    # Create an Attribute Matrix
+    amDims = [[4, 5, 6]]
+    tableData = sc.CreateDynamicTableData(amDims)
+    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
+    err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
+    assert err == 0
+    
+    # Add a data array to the Attribute Matrix by using a Filter
+    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
+    inputRange = (0,0)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    assert err == 0
+
+    # Test: Copy Object
+    err = simplpy.copy_object(dca, sc.ObjectToCopy.AttributeArray, "", 
+                              simpl.DataArrayPath("", "", ""),
+                              simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data"),
+                              "Int32Data_Copy")
+    if err < 0:
+        print("copy_object ErrorCondition %d" % err)
+    assert err == 0
+
+    # Write to DREAM3D file
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+                              + "/Data/Output/CoreFilterTests/CopyObjectTest.dream3d", dca)
+    if err < 0:
+        print("WriteDREAM3DFile ErrorCondition: %d" % err)
+    assert err == 0
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+    copy_object_test()
diff --git a/Wrapping/Python/Examples/Core Filters/Crop_Vertex_Geometry.py b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
similarity index 87%
rename from Wrapping/Python/Examples/Core Filters/Crop_Vertex_Geometry.py
rename to Wrapping/Python/Testing/Crop_Vertex_Geometry.py
index 16b0c9110b..58b48325e4 100644
--- a/Wrapping/Python/Examples/Core Filters/Crop_Vertex_Geometry.py	
+++ b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
@@ -47,11 +47,11 @@ def crop_vertex_geometry_test():
 
     # Delete Data # 1
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
+    dcap.getDataContainerProxy("DataContainer").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
         print("Remove Arrays #1 -  ErrorCondition: %d" % err)
@@ -71,17 +71,17 @@ def crop_vertex_geometry_test():
 
     # Delete Data #2
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("VertexData").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("Vertices").flag = 2
+    dcap.getDataContainerProxy("DataContainer").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("VertexData").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("Vertices").Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
         print("Remove Arrays #2 -  ErrorCondition: %d" % err)
 
     # Write to DREAM.3D File
     err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/CoreFilterTests/" +
+                                        "/Data/Output/CoreFilterTests/" +
                                         "CropVertexGeometry.dream3d", True, False)
     if err < 0:
         print("DataContainerWriter ErrorCondition: %d" % err)
diff --git a/Wrapping/Python/Testing/DataArrayTest.py b/Wrapping/Python/Testing/DataArrayTest.py
index d7c0eac2ee..f05b7638bb 100644
--- a/Wrapping/Python/Testing/DataArrayTest.py
+++ b/Wrapping/Python/Testing/DataArrayTest.py
@@ -8,10 +8,10 @@
 sure that it is installed properly.")
 
 # These are the SIMPL python modules
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def DataArrayTest():
@@ -22,11 +22,11 @@ def DataArrayTest():
     dca = sc.CreateDataContainerArray()
 
     dc = sc.CreateDataContainer("ImageDataContainer")
-    dca.addDataContainer(dc)
+    dca.addOrReplaceDataContainer(dc)
 
     shape = simpl.VectorSizeT([4, 5, 2])
     cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
-    dc.addAttributeMatrix(cellAm.Name, cellAm)
+    dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create the Component Dimensions for the Array, 1 Component in this case
     cDims = simpl.VectorSizeT([1])
@@ -40,12 +40,12 @@ def DataArrayTest():
     for index, item in enumerate(arrayTypes):
         # print("+++ Creating Array: %s" % item)
         z_flat, array = sc.CreateDataArray(arrayTypes[index].__name__, shape, cDims, item)
-        cellAm.addAttributeArray(array.Name, array)
+        cellAm.addOrReplaceAttributeArray(array)
         arrayList.append(z_flat)
         # Now add an array that is purely allocated on the C++/SIMPL side of things.
         # print ("  Creating Int32Array locally to the Loop.... Int32 SIMPL %s" % array.Name)
         array = simpl.Int32ArrayType(shape[0]*shape[1]*shape[2], "Int32 SIMPL " + array.Name, True)
-        # cellAm.addAttributeArray(array.Name, array)
+        # cellAm.addOrReplaceAttributeArray(array)
         # for x in range(shape[0]*shape[1]*shape[2]):
         #     array.setValue(x, x)
         # This will force cleanup the array that just got created.
@@ -55,7 +55,7 @@ def DataArrayTest():
     # Create a Geometry Object and store it in the DataContainer
     imageGeom = simpl.ImageGeom.CreateGeometry("ImageGeometry")
     imageGeom.setDimensions(shape[0], shape[1], shape[2])
-    imageGeom.setResolution(1.0, 2.0, 3.0)
+    imageGeom.setSpacing(1.0, 2.0, 3.0)
     imageGeom.setOrigin(5.5, -9.0, 0.0)
     dc.setGeometry(imageGeom)
 
diff --git a/Wrapping/Python/Testing/DataContainerArrayTest.py b/Wrapping/Python/Testing/DataContainerArrayTest.py
index 38ba7295e8..ba50baab69 100644
--- a/Wrapping/Python/Testing/DataContainerArrayTest.py
+++ b/Wrapping/Python/Testing/DataContainerArrayTest.py
@@ -2,28 +2,23 @@
 """ This is a test for DataContainerArray """
 
 
+from dream3d import simplpy
 from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
 
-def create_data_container(data_container_array, data_container_name):
+
+def create_data_container(data_container_array, ):
     """
     Instantiates CreateDataContainer
     """
-    create_data_container = simpl.CreateDataContainer.New()
+    create_data_container = simpl.CreateDataContainer(data_container_name)
     create_data_container.setDataContainerArray(data_container_array)
     create_data_container.DataContainerName = data_container_name
-    create_data_container.execute()
-    executeError = create_data_container.ErrorCondition
-    return (executeError)
-
-
-def MiscTest():
-    print("Starting MiscTest")
-    dca = sc.CreateDataContainerArray()
-    (executeError) = create_data_container(dca, "My New DataContainer")
-    print("executeError %s" % executeError)
+    # create_data_container.execute()
+    # executeError = create_data_container.ErrorCondition
+    return 0
 
 
 def AttributeMatrixAccessTest():
@@ -34,12 +29,12 @@ def AttributeMatrixAccessTest():
     print("Starting AttributeMatrixAccessTest....")
     dca = sc.CreateDataContainerArray()
     dc = sc.CreateDataContainer("AM Test")
-    dca.addDataContainer(dc)
+    dca.addOrReplaceDataContainer(dc)
     
     amType = simpl.AttributeMatrix.Type.Cell
     tupleDims = simpl.VectorSizeT([5,4,3])
     am = simpl.AttributeMatrix.Create(tupleDims, "CellAttributeMatrix", amType)
-    dc.addAttributeMatrix(am.Name, am)
+    dc.addOrReplaceAttributeMatrix(am)
 
     # See if we can get the AttributeMatrix based on a DataArrayPath object
     dap = simpl.DataArrayPath("AM Test", "CellAttributeMatrix", "")
@@ -64,8 +59,8 @@ def DataContainerTest():
     dc0 = sc.CreateDataContainer("dc0")
     dc1 = sc.CreateDataContainer("dc1")
 
-    dca.addDataContainer(dc0)
-    dca.addDataContainer(dc1)
+    dca.addOrReplaceDataContainer(dc0)
+    dca.addOrReplaceDataContainer(dc1)
 
     exist = dca.doesDataContainerExist("dc0")
     assert exist is True
@@ -93,6 +88,11 @@ def DataContainerTest():
     numDC = dca.getNumDataContainers()
     assert numDC == 0
 
+def MiscTest():
+    print("Starting MiscTest")
+    dca = sc.CreateDataContainerArray()
+    dc = sc.CreateDataContainer("My New DataContainer")
+    dca.addOrReplaceDataContainer(dc)
 
 """
 Main entry point for python script
diff --git a/Wrapping/Python/Testing/DataContainerTest.py b/Wrapping/Python/Testing/DataContainerTest.py
index efbb047a55..ff812c1d83 100644
--- a/Wrapping/Python/Testing/DataContainerTest.py
+++ b/Wrapping/Python/Testing/DataContainerTest.py
@@ -1,12 +1,10 @@
 """ This is a test for DataContainer """
 
 # These are the simpl_py python modules
-
-
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def CreateAttributeMatrix():
@@ -25,7 +23,7 @@ def DataContainerTest() :
   dca = sc.CreateDataContainerArray()
 
   # Create a DataContainer
-  dc = simpl.DataContainer.New("Default Name")
+  dc = simpl.DataContainer("Default Name")
   assert dc.Name == "Default Name"
   dc.Name = "ImageDataContainer"
   assert dc.Name == "ImageDataContainer"
@@ -35,7 +33,7 @@ def DataContainerTest() :
   amName = "CellAttributeMatrix"
   am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
-  dc.addAttributeMatrix(am.Name, am)
+  dc.addOrReplaceAttributeMatrix(am)
 
   exists = dc.doesAttributeMatrixExist("CellAttributeMatrix")
   
diff --git a/Wrapping/Python/Examples/Core Filters/Export_Triangle_Geometry.py b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
similarity index 83%
rename from Wrapping/Python/Examples/Core Filters/Export_Triangle_Geometry.py
rename to Wrapping/Python/Testing/Export_Triangle_Geometry.py
index 70e113095d..514b796ecb 100644
--- a/Wrapping/Python/Examples/Core Filters/Export_Triangle_Geometry.py	
+++ b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
@@ -18,7 +18,7 @@ def export_triangle_geometry():
         print("DataContainer ErrorCondition: %d" % err)
 
     # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
+    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
     wizard_data = {
         "inputFilePath": import_file,
         "beginIndex": 2,
@@ -46,17 +46,17 @@ def export_triangle_geometry():
 
     # Delete Data # 1
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").flag = 2
+    dcap.getDataContainerProxy("DataContainer").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
         print("Remove Arrays #1 -  ErrorCondition: %d" % err)
 
     # Import ASCII Data - #2 - Triangle Connectivity
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/TriangleConnectivity.csv"
+    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/TriangleConnectivity.csv"
     wizard_data = {
         "inputFilePath": import_file,
         "beginIndex": 2,
@@ -84,11 +84,11 @@ def export_triangle_geometry():
 
     # Delete Data # 2
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").flag = 2
+    dcap.getDataContainerProxy("DataContainer").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").Flag = 0
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").Flag = 2
+    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
         print("Remove Arrays #2 -  ErrorCondition: %d" % err)
@@ -103,15 +103,15 @@ def export_triangle_geometry():
         print("Create Geometry -  ErrorCondition: %d" % err)
 
     # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + "/ExportTriangleGeometry.dream3d", True, False)
+    err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + "/Data/Output/CoreFilters/ExportTriangleGeometry.dream3d", True, False)
     if err < 0:
         print("DataContainerWriter ErrorCondition: %d" % err)
 
     # Export Triangle Geometry
     err = simplpy.write_triangle_geometry(dca, "DataContainer", sd.GetBuildDirectory() +
-                                          "/Debug/Data/Output/CoreFilterTests/output_nodes.txt",
+                                          "/Data/Output/CoreFilters/output_nodes.txt",
                                           sd.GetBuildDirectory() +
-                                          "/Debug/Data/Output/CoreFilterTests/output_triangles.txt")
+                                          "/Data/Output/CoreFilters/output_triangles.txt")
     if err < 0:
         print("WriteTriangleGeometry ErrorCondition: %d" % err)
 
diff --git a/Wrapping/Python/Testing/GeometryTest.py b/Wrapping/Python/Testing/GeometryTest.py
index 70538292cb..7ab7e19fc3 100644
--- a/Wrapping/Python/Testing/GeometryTest.py
+++ b/Wrapping/Python/Testing/GeometryTest.py
@@ -12,10 +12,10 @@
 sure that it is installed properly.")
 
 # These are the simpl_py python modules
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def GeometryTest():
@@ -24,23 +24,27 @@ def GeometryTest():
 
   imageGeom.setDimensions(100, 1001, 200)
   dims = imageGeom.getDimensions()
+  print("dims= %s" % dims)
   assert dims[0] == 100
   assert dims[1] == 1001
   assert dims[2] == 200
 
-  imageGeom.setResolution(1.0, 2.0, 3.0)
-  imageRes = imageGeom.getResolution()
+  imageGeom.setSpacing(1.0, 2.0, 3.0)
+  imageRes = imageGeom.getSpacing()
   assert imageRes[0] == 1.0
   assert imageRes[1] == 2.0
   assert imageRes[2] == 3.0
+  print("imageRes= %s" % imageRes)
 
   imageGeom.setOrigin(20, 45, 70)
   origin = imageGeom.getOrigin()
   assert origin[0] == 20
   assert origin[1] == 45
   assert origin[2] == 70
-  
+  print("origin= %s" % origin)
+
   infoString = imageGeom.getInfoString(simpl.HtmlFormat)
+  print("%s" % infoString)
 
   boundingBox = imageGeom.getBoundingBox()
   assert boundingBox[0] == 20
@@ -49,6 +53,7 @@ def GeometryTest():
   assert boundingBox[3] == 2047
   assert boundingBox[4] == 70
   assert boundingBox[5] == 670
+  print("boundingBox= %s" % boundingBox)
 
 """
 Main entry point for python script
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index c353b367f1..b2f9f4cb58 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -12,11 +12,10 @@
 sure that it is installed properly.")
 
 # These are the simpl_py python modules
-
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 
 def ImageReadTest():
@@ -43,28 +42,28 @@ def ImageReadTest():
 
     # Create the DataContainer
     dc = sc.CreateDataContainer("ImageDataContainer")
-    dca.addDataContainer(dc)
+    dca.addOrReplaceDataContainer(dc)
 
     # Create an AttributeMatrix and add it to the DataContainer
     amShape = simpl.VectorSizeT([shape[1], shape[0], 1])
     cellAm = sc.CreateAttributeMatrix(amShape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
-    dc.addAttributeMatrix(cellAm.Name, cellAm)
+    dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
     cDims = simpl.VectorSizeT([1])
     name = "slice_11.tiff"
     array = simpl.UInt8ArrayType(z_flat, cDims, name, False)
-    cellAm.addAttributeArray(array.Name, array)
+    cellAm.addOrReplaceAttributeArray(array)
 
     # Create a Geometry Object and store it in the DataContainer
     imageGeom = simpl.ImageGeom.CreateGeometry("ImageGeometry")
     imageGeom.setDimensions(shape[1], shape[0], 1)
-    imageGeom.setResolution(1.0, 1.0, 1.0)
+    imageGeom.setSpacing(1.0, 1.0, 1.0)
     imageGeom.setOrigin(20, 45, 70)
     dc.setGeometry(imageGeom)
 
     # Write the file out
-    err = sc.WriteDREAM3DFile( sd.GetTestTempDirectory() + "/ImageReadTest.dream3d", dca, True)
+    err = sc.WriteDREAM3DFile( sd.GetBuildDirectory() + "/Data/Output/PythonTest/ImageReadTest.dream3d", dca, True)
     assert err == 0
 
 
diff --git a/Wrapping/Python/Testing/Import_Ascii_Data_Array.py b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
new file mode 100644
index 0000000000..919aea556a
--- /dev/null
+++ b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
@@ -0,0 +1,52 @@
+# Pipeline: Import Ascii Data Array Test
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+
+def import_ascii_array_test():
+    # Create Data Container Array using simpl directly
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container using the pythonic version
+    err = simplpy.create_data_container(dca, "DataContainer")
+    assert err == 0
+
+    # Create an Attribute Matrix
+    amDims = [[143,1,1]]
+    tableData = sc.CreateDynamicTableData(amDims)
+    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
+    assert err == 0
+
+    # Import ASCII Data Attribute Array
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "AsciiData"),
+                                         simpl.NumericTypes.Float, 3, 1,
+                                         sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv",
+                                         simpl.DelimiterTypes.Comma)
+    if err < 0:
+        print("ImportAsciiDataArray ErrorCondition: %d" % err)
+    assert err == 0
+
+    # Export ASCII Data
+    # Output Style = 0 Means Multiple Files, Style = 1 Means a Single file
+    outStyle = 0 
+    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "AsciiData")]
+    err = simplpy.write_ascii_data(dca, selected_data_array_paths,
+                                   sd.GetBuildDirectory() + "/Data/Output/CoreFilters", # Only needed for Multi-File output
+                                   sd.GetBuildDirectory() + "/Data/Output/CoreFilters/AcsiiOutput.csv", # Only needed for Single File Style
+                                   simpl.DelimiterTypes.Comma, ".csv", 10, outStyle)
+    if err < 0:
+        print("WriteAsciiData ErrorCondition: %d" % err)
+    assert err == 0
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+    import_ascii_array_test()
diff --git a/Wrapping/Python/Testing/Import_Hdf5_Dataset.py b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
new file mode 100644
index 0000000000..4ea8a63ce9
--- /dev/null
+++ b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
@@ -0,0 +1,73 @@
+# Pipeline: Import Hdf5 Data Array Test
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def createInputFile():
+    # Create Data Container Array using simpl directly
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container using the pythonic version
+    err = simplpy.create_data_container(dca, "DataContainer")
+    assert err == 0
+
+    # Create an Attribute Matrix
+    amDims = [[143,1,1]]
+    tableData = sc.CreateDynamicTableData(amDims)
+    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
+    assert err == 0
+
+    # Import ASCII Data Attribute Array
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "DummyDBL"),
+                                         simpl.NumericTypes.Float, 3, 1,
+                                         sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv",
+                                         simpl.DelimiterTypes.Comma)
+    if err < 0:
+        print("ImportAsciiDataArray ErrorCondition: %d" % err)
+    assert err == 0
+
+    # Write to DREAM3D file
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.h5", dca)
+    assert err == 0
+
+
+def import_hdf5_dataset_test():
+    # Create Data Container Array using simpl directly
+    dca = simpl.DataContainerArray.New()
+
+    # Create a Data Container using the pythonic version
+    err = simplpy.create_data_container(dca, "DataContainer")
+    assert err == 0
+
+    # Create an Attribute Matrix
+    amDims = [[143,1,1]]
+    tableData = sc.CreateDynamicTableData(amDims)
+    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
+    assert err == 0
+
+    # Import HDF5 Dataset
+    dataset_import_info_list = simpl.DatasetImportInfoList([["DataContainers/DataContainer/CellAttributeMatrix/DummyDBL", "3, 1"]])
+    err = simplpy.import_hdf5_dataset(dca, sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.h5",
+                                      dataset_import_info_list,
+                                      simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", ""))
+    if err < 0:
+        print("ImportHdf5Dataset ErrorCondition: %d" % err)
+    assert err == 0
+
+    # Write to DREAM3D file
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.dream3d", dca)
+    assert err == 0
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+    createInputFile()
+    import_hdf5_dataset_test()
diff --git a/Wrapping/Python/Testing/PipelineTest.py b/Wrapping/Python/Testing/PipelineTest.py
deleted file mode 100644
index 546e3b6b0b..0000000000
--- a/Wrapping/Python/Testing/PipelineTest.py
+++ /dev/null
@@ -1,78 +0,0 @@
-import time
-
-
-# These are the simpl_py python modules
-from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
-
-def Pipeline1():
-
-  pipeline = simpl.FilterPipeline.New()
-  pipeline.Name = ("Image Data Container Test Pipeline")
-
-  createDataContainer = simpl.CreateDataContainer.New()
-  createDataContainer.DataContainerName = "ImageDataContainer"
-  pipeline.pushBack(createDataContainer)
-
-  createImageGeom = simpl.CreateImageGeometry.New()
-  createImageGeom.SelectedDataContainer = createDataContainer.DataContainerName
-  createImageGeom.Dimensions = simpl.IntVec3(101, 101, 1)
-  createImageGeom.Resolution = simpl.FloatVec3(1.0, 1.0, 1.0)
-  createImageGeom.Origin = simpl.FloatVec3(0.0, 0.0, 0.0)
-  pipeline.pushBack(createImageGeom)
-
-  createAttributeMatrix = simpl.CreateAttributeMatrix.New()
-  createAttributeMatrix.CreatedAttributeMatrix = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
-  createAttributeMatrix.AttributeMatrixType = simpl.AttributeMatrix.Type.Cell
-  # This next part of the code is really ugly and verbose and there is probably
-  # a better way to do it, but this was all I could get working. Somebody please
-  # change it.
-  rHdrs = []
-  rHdrs.append("Row[0]")
-  cHdrs = []
-  cHdrs.append("Col[6]")
-  cHdrs.append("Col[6]")
-  cHdrs.append("Col[6]")
-  rowDim = simpl.VectorDouble([101,101,1])
-  rDims = []
-  rDims.append(rowDim)
-  ddt = simpl.DynamicTableData.Create(rDims, rHdrs, cHdrs)
-  createAttributeMatrix.TupleDimensions = ddt
-  # END really ugly section
-  pipeline.pushBack(createAttributeMatrix)
-
-  createDataArray = simpl.CreateDataArray.New()
-  createDataArray.ScalarType = simpl.ScalarTypes.UInt8
-  createDataArray.NumberOfComponents = 1
-  createDataArray.NewArray = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "ScalarValues")
-  createDataArray.InitializationType = 0
-  createDataArray.InitializationValue = "128"
-  pipeline.pushBack(createDataArray)
-
-  writer = simpl.DataContainerWriter.New()
-  writer.OutputFile = (sd.GetTestTempDirectory() + "/PipelineTest.dream3d")
-  print(" humanLabel: %s " % writer.HumanLabel)
-  print(" groupName: %s " % writer.GroupName)
-  print(" subGroupName: %s " % writer.SubGroupName)
-  print(" filterVersion: %s " % writer.FilterVersion)
-  print(" compiledLibraryName: %s " % writer.CompiledLibraryName)
-
-  pipeline.pushBack(writer)
-  print("%s" % sd.GetTestTempDirectory() + "/PipelineTest.dream3d")
-
-  err = pipeline.preflightPipeline()
-  print("Preflight ErrorCondition: %d" % err)
-  dataContainer = pipeline.run()
-  err = pipeline.ErrorCondition
-  print("Execute ErrorCondition: %d" % err)
-
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  print("=> PipelineTest Start")
-  Pipeline1()
-  print("=> PipelineTest Complete")
diff --git a/Wrapping/Python/Examples/Core Filters/Remove_Component_From_Array.py b/Wrapping/Python/Testing/Remove_Component_From_Array.py
similarity index 74%
rename from Wrapping/Python/Examples/Core Filters/Remove_Component_From_Array.py
rename to Wrapping/Python/Testing/Remove_Component_From_Array.py
index feb8f81f66..00a415b779 100644
--- a/Wrapping/Python/Examples/Core Filters/Remove_Component_From_Array.py	
+++ b/Wrapping/Python/Testing/Remove_Component_From_Array.py
@@ -16,113 +16,110 @@ def remove_component_from_array_test():
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
+        "Confidence Index").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
+        "CriticalField").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
+        "EulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
+        "FeatureIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
+        "FeatureReferenceMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
+        "Fit").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
+        "GBManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
+        "IPFColor").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
+        "Image Quality").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
+        "KernelAverageMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
+        "Mask").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
+        "ParentIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
+        "Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
+        "QPManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
+        "Quats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
+        "SEM Signal").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
+        "TJManhattanDistances").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
+        "CrystalStructures").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
+        "LatticeConstants").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
+        "MaterialName").Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
+        "AspectRatios").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
+        "AvgEuler").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
+        "AvgEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
+        "AvgQuats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
+        "AxisEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
+        "AxisLengths").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
+        "Centroids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
+        "CriticalFields").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
+        "EquivalentDiameters").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
+        "FeatureAvgMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
+        "MisorientationList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
+        "NeighborList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
+        "NeighborhoodList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
+        "Neighborhoods").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
+        "NumElements").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
+        "NumNeighbors").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
+        "NumNeighbors2").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
+        "Omega3s").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
+        "ParentIds").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
+        "Schmids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
+        "Shape Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
+        "SharedSurfaceAreaList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
+        "Size Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
+        "SlipSystems").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
+        "Sphericity").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
+        "SurfaceAreaVolumeRatio").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
+        "Active").Flag = 2
 
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
+                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        False, dcap)
     if err < 0:
         print("DataContainerReader ErrorCondition %d" % err)
         
@@ -137,7 +134,7 @@ def remove_component_from_array_test():
         print("RemoveComponentFromArray ErrorCondition %d" % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/CoreFilterTests/" +
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
                               "RemoveComponentFromArray.dream3d",
                               dca)
     if err < 0:
diff --git a/Wrapping/Python/Examples/Core Filters/Rename_Attribute_Array.py b/Wrapping/Python/Testing/Rename_Attribute_Array.py
similarity index 74%
rename from Wrapping/Python/Examples/Core Filters/Rename_Attribute_Array.py
rename to Wrapping/Python/Testing/Rename_Attribute_Array.py
index 07a205a61a..ce2ad33d43 100644
--- a/Wrapping/Python/Examples/Core Filters/Rename_Attribute_Array.py	
+++ b/Wrapping/Python/Testing/Rename_Attribute_Array.py
@@ -16,113 +16,110 @@ def rename_array_test():
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
+        "Confidence Index").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
+        "CriticalField").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
+        "EulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
+        "FeatureIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
+        "FeatureReferenceMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
+        "Fit").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
+        "GBManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
+        "IPFColor").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
+        "Image Quality").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
+        "KernelAverageMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
+        "Mask").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
+        "ParentIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
+        "Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
+        "QPManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
+        "Quats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
+        "SEM Signal").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
+        "TJManhattanDistances").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
+        "CrystalStructures").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
+        "LatticeConstants").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
+        "MaterialName").Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
+        "AspectRatios").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
+        "AvgEuler").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
+        "AvgEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
+        "AvgQuats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
+        "AxisEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
+        "AxisLengths").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
+        "Centroids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
+        "CriticalFields").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
+        "EquivalentDiameters").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
+        "FeatureAvgMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
+        "MisorientationList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
+        "NeighborList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
+        "NeighborhoodList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
+        "Neighborhoods").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
+        "NumElements").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
+        "NumNeighbors").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
+        "NumNeighbors2").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
+        "Omega3s").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
+        "ParentIds").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
+        "Schmids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
+        "Shape Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
+        "SharedSurfaceAreaList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
+        "Size Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
+        "SlipSystems").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
+        "Sphericity").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
+        "SurfaceAreaVolumeRatio").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
+        "Active").Flag = 2
 
-    now_time = datetime.datetime.now()
-    now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
-    dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
+                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        False, dcap)
     if err < 0:
         print("DataContainerReader ErrorCondition %d" % err)
         
@@ -135,7 +132,7 @@ def rename_array_test():
         print("RenameAttributeArray ErrorCondition %d" % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/CoreFilterTests/" +
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
                               "RenameAttributeArray.dream3d",
                               dca)
     if err < 0:
diff --git a/Wrapping/Python/Testing/SourceList.cmake b/Wrapping/Python/Testing/SourceList.cmake
deleted file mode 100644
index 000dc64b71..0000000000
--- a/Wrapping/Python/Testing/SourceList.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
-
-set(PYSIMPL_Testing_Scripts
-  ${CMAKE_CURRENT_LIST_DIR}/AbstractFilterTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/AttributeMatrixTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/DataArrayTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/DataContainerArrayTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/DataContainerTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/GeometryTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/ImageReadTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/PipelineTest.py
-  ${CMAKE_CURRENT_LIST_DIR}/TestBindings.py
-)
diff --git a/Wrapping/Python/Examples/Core Filters/Split_Attribute_Array.py b/Wrapping/Python/Testing/Split_Attribute_Array.py
similarity index 76%
rename from Wrapping/Python/Examples/Core Filters/Split_Attribute_Array.py
rename to Wrapping/Python/Testing/Split_Attribute_Array.py
index 8fe85ac028..e403bc86e3 100644
--- a/Wrapping/Python/Examples/Core Filters/Split_Attribute_Array.py	
+++ b/Wrapping/Python/Testing/Split_Attribute_Array.py
@@ -16,113 +16,113 @@ def split_array_test():
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").flag = 2
+        "Confidence Index").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").flag = 2
+        "CriticalField").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").flag = 2
+        "EulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").flag = 2
+        "FeatureIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").flag = 2
+        "FeatureReferenceMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").flag = 2
+        "Fit").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").flag = 2
+        "GBManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").flag = 2
+        "IPFColor").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").flag = 2
+        "Image Quality").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").flag = 2
+        "KernelAverageMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").flag = 2
+        "Mask").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").flag = 2
+        "ParentIds").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").flag = 2
+        "Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").flag = 2
+        "QPManhattanDistances").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").flag = 2
+        "Quats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").flag = 2
+        "SEM Signal").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").flag = 2
+        "TJManhattanDistances").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").flag = 2
+        "CrystalStructures").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").flag = 2
+        "LatticeConstants").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").flag = 2
+        "MaterialName").Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").flag = 2
+        "AspectRatios").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").flag = 2
+        "AvgEuler").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").flag = 2
+        "AvgEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").flag = 2
+        "AvgQuats").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").flag = 2
+        "AxisEulerAngles").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").flag = 2
+        "AxisLengths").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").flag = 2
+        "Centroids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").flag = 2
+        "CriticalFields").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").flag = 2
+        "EquivalentDiameters").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").flag = 2
+        "FeatureAvgMisorientations").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").flag = 2
+        "MisorientationList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").flag = 2
+        "NeighborList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").flag = 2
+        "NeighborhoodList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").flag = 2
+        "Neighborhoods").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").flag = 2
+        "NumElements").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").flag = 2
+        "NumNeighbors").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").flag = 2
+        "NumNeighbors2").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").flag = 2
+        "Omega3s").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").flag = 2
+        "ParentIds").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
+    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").flag = 2
+        "Schmids").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").flag = 2
+        "Shape Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").flag = 2
+        "SharedSurfaceAreaList").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").flag = 2
+        "Size Volumes").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").flag = 2
+        "SlipSystems").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").flag = 2
+        "Sphericity").Flag = 2
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").flag = 2
+        "SurfaceAreaVolumeRatio").Flag = 2
 
     dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").flag = 2
+        "Active").Flag = 2
 
     now_time = datetime.datetime.now()
     now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
     dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Debug/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
-                                        False, "", dt, dcap)
+                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        False, dcap)
     if err < 0:
         print("DataContainerReader ErrorCondition %d" % err)
         
@@ -135,7 +135,7 @@ def split_array_test():
         print("SplitAttributeArray ErrorCondition %d" % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Debug/Data/Output/CoreFilterTests/" +
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
                               "SplitAttributeArray.dream3d",
                               dca)
     if err < 0:
diff --git a/Wrapping/Python/Testing/TestBindings.py b/Wrapping/Python/Testing/TestBindings.py
index f6b2106947..f7fbffaf95 100644
--- a/Wrapping/Python/Testing/TestBindings.py
+++ b/Wrapping/Python/Testing/TestBindings.py
@@ -3,10 +3,10 @@
 
 
 # These are the simpl_py python modules
+from dream3d import simplpy
 from dream3d import simpl
-
-import dream3d.utils.simpl_common as sc
-import dream3d.utils.simpl_test_dirs as sd
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
 
 def PipelineTest():
   inputPath = sd.GetTestTempDirectory() + "/SmallIN100.dream3d"
@@ -47,7 +47,7 @@ def PipelineTest():
   print("Preflight ErrorCondition: %d" % err)
 
   dataContainer = pipeline.run()
-  err = pipeline.ErrorCondition
+  err = pipeline.ErrorCode
   print("Execute ErrorCondition: %d" % err)
 
   pipeline.popFront()
diff --git a/Wrapping/Python/Examples/Core Filters/ascii_sample.csv b/Wrapping/Python/Testing/ascii_sample.csv
similarity index 100%
rename from Wrapping/Python/Examples/Core Filters/ascii_sample.csv
rename to Wrapping/Python/Testing/ascii_sample.csv

From 9070c91ebf1d6a284ee1d0af0ab0f7c9c6ab1a4d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 24 Apr 2019 13:08:20 -0400
Subject: [PATCH 080/397] Fixing failing Python unit tests. Moving some Python
 unit tests into SIMPL

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   9 +-
 .../CoreFilters/FeatureDataCSVWriter.h        |   5 +-
 Wrapping/Python/Pybind11/CMakeLists.txt       |  16 ++-
 .../CodeScraper/CodeScraperConstants.h        |   3 +
 .../CodeScraper/PyBind11Generator.cpp         |   5 +
 .../CodeScraper/PythonBindingClass.cpp        |  40 +++++-
 .../Pybind11/CodeScraper/PythonBindingClass.h |   6 +-
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |  30 ++---
 .../Python/Testing/Create_Edge_Geometry.py    |  97 +++++++++++++++
 .../Python/Testing/Create_Quad_Geometry.py    | 115 ++++++++++++++++++
 .../Python/Testing/Create_RectilinearGrid.py  |  59 +++++++++
 .../Testing/Create_Triangle_Geometry.py       | 111 +++++++++++++++++
 .../Python/Testing/Create_Vertex_Geometry.py  |  75 ++++++++++++
 .../Python/Testing/Crop_Vertex_Geometry.py    |   4 +-
 14 files changed, 543 insertions(+), 32 deletions(-)
 create mode 100644 Wrapping/Python/Testing/Create_Edge_Geometry.py
 create mode 100644 Wrapping/Python/Testing/Create_Quad_Geometry.py
 create mode 100644 Wrapping/Python/Testing/Create_RectilinearGrid.py
 create mode 100644 Wrapping/Python/Testing/Create_Triangle_Geometry.py
 create mode 100644 Wrapping/Python/Testing/Create_Vertex_Geometry.py

diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 736010e646..6f7891af1c 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -55,7 +55,7 @@ FeatureDataCSVWriter::FeatureDataCSVWriter()
 : m_CellFeatureAttributeMatrixPath("", "", "")
 , m_FeatureDataFile("")
 , m_WriteNeighborListData(false)
-, m_DelimiterChoice(SIMPL::DelimiterTypes::Type::Comma)
+, m_DelimiterChoice(0)
 , m_WriteNumFeaturesLine(true)
 , m_Delimiter(',')
 {
@@ -131,8 +131,8 @@ void FeatureDataCSVWriter::dataCheck()
   }
   FileSystemPathHelper::CheckOutputFile(this, "Output File Name", getFeatureDataFile(), true);
 
-
-  switch (getDelimiterChoice())
+  SIMPL::DelimiterTypes::Type delim = static_cast<SIMPL::DelimiterTypes::Type>(getDelimiterChoice());
+  switch(delim)
   {
   case SIMPL::DelimiterTypes::Type::Comma:
     setDelimiter(',');
@@ -396,10 +396,11 @@ int FeatureDataCSVWriter::getDelimiterChoiceInt() const
 // -----------------------------------------------------------------------------
 void FeatureDataCSVWriter::setDelimiterChoiceInt(const int& value)
 {
+  this->m_DelimiterChoice = 0; // Set the default and if the value falls within the correct range, use that.
   // Allowed integer values of the enum SIMPL::DelimiterTypes::Type; see defintion in Constants.h
   if (value >= 0 && value <= 4)
   {
-    this->m_DelimiterChoice = static_cast<SIMPL::DelimiterTypes::Type>(value);
+    this->m_DelimiterChoice = value;
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 7d517416d1..24118caba4 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -71,9 +71,8 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
     SIMPL_FILTER_PARAMETER(bool, WriteNeighborListData)
     Q_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
 
-    SIMPL_FILTER_PARAMETER(SIMPL::DelimiterTypes::Type, DelimiterChoice)
-    Q_PROPERTY(SIMPL::DelimiterTypes::Type DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
-    Q_PROPERTY(int DelimiterChoiceInt READ getDelimiterChoiceInt WRITE setDelimiterChoiceInt)
+    SIMPL_FILTER_PARAMETER(int, DelimiterChoice)
+    Q_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
 
     SIMPL_FILTER_PARAMETER(bool, WriteNumFeaturesLine)
     Q_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index 6aec8b9df9..e80d8f00a5 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -111,6 +111,9 @@ if(SIMPL_BUILD_TESTING)
     set(ANACONDA_DIR "" CACHE STRING "")
     message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
   endif()
+  if(NOT SIMPL_ENABLE_ANACONDA_PACKAGE)
+    message(FATAL_ERROR "Please SIMPL_ENABLE_ANACONDA_PACKAGE=ON in order for the Python unit tests to execute correctly.")
+  endif()
 
   #------------------------------
   # Initialize the PYTHON_TEST_INPUT_DIR variable to point to the "Testing Directory"
@@ -126,6 +129,12 @@ if(SIMPL_BUILD_TESTING)
     ImageReadTest
     TestBindings
 
+    Create_Edge_Geometry
+    Create_Quad_Geometry
+    Create_RectilinearGrid
+    Create_Triangle_Geometry
+    Create_Vertex_Geometry
+    
     "Array_Calculator_Test"
     "Convert_Attribute_Array_Data_Type"
     "Copy_Object_Test"
@@ -133,7 +142,6 @@ if(SIMPL_BUILD_TESTING)
     "Export_Triangle_Geometry"
     "Import_Ascii_Data_Array"
     "Import_Hdf5_Dataset"
-    "Link_Feature_Attribute_Matrix_To_Element_Array"
     "Remove_Component_From_Array"
     "Rename_Attribute_Array"
     "Split_Attribute_Array"
@@ -143,7 +151,7 @@ if(SIMPL_BUILD_TESTING)
     set(SIMPL_PYTHON_TEST_DRIVER "${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest/SIMPL/${test}.sh")
     configure_file(${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.sh
                   "${SIMPL_PYTHON_TEST_DRIVER}" @ONLY)
-    add_test(NAME SIMPL_${test} COMMAND "${SIMPL_PYTHON_TEST_DRIVER}" )
+    add_test(NAME PY_SIMPL_${test} COMMAND "${SIMPL_PYTHON_TEST_DRIVER}" )
   endforeach(test ${SIMPL_PYTHON_TESTS})
   
 endif()
@@ -151,7 +159,7 @@ endif()
 # --------------------------------------------------------------------------
 # Copy the recipe and egg info for the building Conda package to the 
 # output directory
-if (SIMPL_ENABLE_ANACONDA_PACKAGE)
+if (SIMPL_ENABLE_ANACONDA_PACKAGE AND SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL)
   if("${ANACONDA_DIR}" STREQUAL "")
     set(ANACONDA_DIR "" CACHE STRING "")
     message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
@@ -161,8 +169,6 @@ if (SIMPL_ENABLE_ANACONDA_PACKAGE)
     message(FATAL_ERROR "Please set the ANACONDA_ENVIRONMENT_NAME variable either through the CMake-GUI or through the -DANACONDA_ENVIRONMENT_NAME=ANACONDA_ENV_NAME")
   endif()   
   
-  option(SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL "Install the dream3d Conda package locally" OFF)
-
     
   set(ANACONDA_SCRIPTS_DIR_NAME "bin")
   if(WIN32)
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
index 51443b87fe..b6a3cc9aa4 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
@@ -38,4 +38,7 @@ const QString kPYB11_METHOD("PYB11_METHOD");
 const QString kPYB11_STATIC_CREATION("PYB11_STATIC_CREATION");
 const QString kPYB11_CREATION("PYB11_CREATION");
 const QString kPYB11_ENUMERATION("PYB11_ENUMERATION");
+
+/* */
+const QString kSIMPL_FILTER_PARAMETER("SIMPL_FILTER_PARAMETER");
 }
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index 7fdc3ca8d2..dd21ee8fd9 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -397,6 +397,11 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
       line = line.trimmed();
       bindingClass.addProperty(line);
     }
+    else if(bindingClass.getNeedsWrapping() && line.contains(::kSIMPL_FILTER_PARAMETER))
+    {
+      line = line.trimmed();
+      bindingClass.addSimplFilterParam(line);
+    }
     else if(bindingClass.getNeedsWrapping() && line.contains(::kPYB11_METHOD))
     {
       line = line.trimmed();
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
index 4dff80ab2a..ea5da4645d 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
@@ -25,6 +25,15 @@ PythonBindingClass::PythonBindingClass(PythonBindingsModule* moduleCode, const Q
 
 PythonBindingClass::~PythonBindingClass() = default;
 
+void PythonBindingClass::addSimplFilterParam(const QString& property)
+{
+  m_SimplFilterParams.push_back(property);
+}
+void PythonBindingClass::clearSimplFilterParams()
+{
+  m_SimplFilterParams.clear();
+}
+
 void PythonBindingClass::addProperty(const QString& property)
 {
   m_Properties.push_back(property);
@@ -69,14 +78,41 @@ void PythonBindingClass::clearEnumerations()
 {
   m_Enumerations.clear();
 }
-#if 0
-#endif
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 bool PythonBindingClass::writeBindingFile(const QString& outputFilePath)
 {
+  // Sanity check the Properties against the Filter Parameters
+  for(const auto& property : m_Properties)
+  {
+    bool found = false;
+    for(const auto& param : m_SimplFilterParams)
+    {
+      QString temp = param;
+      temp.replace(::kSIMPL_FILTER_PARAMETER, ::kPYB11_PROPERTY);
+      temp.replace(",", "");
+      temp.replace(")", "");
+      if(property.startsWith(temp))
+      {
+        found = true;
+        continue;
+      }
+      // Now look for the Variable Name...
+      QStringList tokens = temp.split(" ");
+      QString varName = " " + tokens[1] + " ";
+      if(property.contains(varName))
+      {
+        found = true;
+        std::cout << "==> Parameter Inconsistency:" << param.toStdString() << std::endl;
+        std::cout << "    " << getSourceFile().toStdString() << std::endl;
+        std::cout << "    " << property.toStdString() << std::endl;
+        std::cout << "    " << param.toStdString() << std::endl;
+      }
+    }
+  }
+
   bool didWrite = false;
   if(getNeedsWrapping())
   {
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
index 18a46bc097..13a394ecc3 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
@@ -17,7 +17,7 @@ class PythonBindingClass : public QObject
 
 public:
   PythonBindingClass(PythonBindingsModule* moduleCode, const QString& isSIMPLib);
-  ~PythonBindingClass();
+  ~PythonBindingClass() override;
 
   SIMPL_INSTANCE_PROPERTY(QString, ClassName)
   SIMPL_INSTANCE_PROPERTY(QString, SuperClass)
@@ -31,6 +31,10 @@ class PythonBindingClass : public QObject
   SIMPL_INSTANCE_PROPERTY(bool, IsSharedPointer)
   SIMPL_INSTANCE_PROPERTY(bool, HasStaticNewMacro)
 
+  SIMPL_INSTANCE_PROPERTY(QVector<QString>, SimplFilterParams)
+  void addSimplFilterParam(const QString& property);
+  void clearSimplFilterParams();
+
   SIMPL_INSTANCE_PROPERTY(QVector<QString>, Properties)
   void addProperty(const QString& property);
   void clearProperties();
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 6feed6c5c4..3c57ad6af9 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -275,21 +275,21 @@ PYBIND11_MODULE(dream3d, m)
 		  const int & endIndex, const int & incrementIndex, const py::str & inputPath, const py::str & filePrefix,
 		  const py::str & fileSuffix, const py::str &fileExtension)
       {
-	  FileListInfo_t fileListInfo;
-	  fileListInfo.PaddingDigits = paddingDigits;
-	  fileListInfo.Ordering = ordering;
-	  fileListInfo.StartIndex = startIndex;
-	  fileListInfo.EndIndex = endIndex;
-	  fileListInfo.IncrementIndex = incrementIndex;
-	  QString InputPath = QString::fromStdString(py::cast<std::string>(inputPath));
-	  QString FilePrefix = QString::fromStdString(py::cast<std::string>(filePrefix));
-	  QString FileSuffix = QString::fromStdString(py::cast<std::string>(fileSuffix));
-	  QString FileExtension = QString::fromStdString(py::cast<std::string>(fileExtension));
-	  fileListInfo.InputPath = InputPath;
-	  fileListInfo.FilePrefix = FilePrefix;
-	  fileListInfo.FileSuffix = FileSuffix;
-	  fileListInfo.FileExtension = FileExtension;
-	  return fileListInfo;
+				FileListInfo_t fileListInfo;
+				fileListInfo.PaddingDigits = paddingDigits;
+				fileListInfo.Ordering = ordering;
+				fileListInfo.StartIndex = startIndex;
+				fileListInfo.EndIndex = endIndex;
+				fileListInfo.IncrementIndex = incrementIndex;
+				QString InputPath = QString::fromStdString(py::cast<std::string>(inputPath));
+				QString FilePrefix = QString::fromStdString(py::cast<std::string>(filePrefix));
+				QString FileSuffix = QString::fromStdString(py::cast<std::string>(fileSuffix));
+				QString FileExtension = QString::fromStdString(py::cast<std::string>(fileExtension));
+				fileListInfo.InputPath = InputPath;
+				fileListInfo.FilePrefix = FilePrefix;
+				fileListInfo.FileSuffix = FileSuffix;
+				fileListInfo.FileExtension = FileExtension;
+				return fileListInfo;
       }))
   ;
 
diff --git a/Wrapping/Python/Testing/Create_Edge_Geometry.py b/Wrapping/Python/Testing/Create_Edge_Geometry.py
new file mode 100644
index 0000000000..3f96aa1b8c
--- /dev/null
+++ b/Wrapping/Python/Testing/Create_Edge_Geometry.py
@@ -0,0 +1,97 @@
+
+import time
+
+# Based on CreateEdgeGeometry example
+# 
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy as d3d
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def CreateEdgeGeometryTest():
+  # Create Data Container Array
+  dca = simpl.DataContainerArray.New()
+
+  # Create the Data Container
+  err = d3d.create_data_container(dca, "DataContainer")
+  if err < 0:
+    print("DataContainer ErrorCondition: %d" % err)
+
+  # Import ASCII Data - #1 - Vertex Coordinates (Using helper function)
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+
+  err = d3d.read_ascii_data(dca, sc.CreateAsciiWizardData(importFile, 2, 145, [','], False, True, 
+  simpl.DataArrayPath("DataContainer", "Bounds", ""), ["x", "y", "z"], 3,
+  [144], ["float", "float", "float"]))
+  if err < 0:
+    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+  
+
+  # Import ASCII Data - #2 - Edge Connectivity (Without using helper function)
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/EdgeConnectivity.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 265,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "EdgeList", ""),
+    "headers": ["V1", "V0"],
+    "attrMatType": 3,
+    "tupleDimensions": [264],
+    "dataTypes": ["int64_t", "int64_t"]
+  }  
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+
+  # Combine Attribute Arrays # 1:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  if err < 0:
+    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 1
+  # Remove array helper function:
+  err = sc.RemoveArrays(dca, [("DataContainer", "Bounds", "x"), ("DataContainer", "Bounds", "y"), ("DataContainer", "Bounds", "z")])
+  if err < 0:
+    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Combine Attribute Arrays #2:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "EdgeList", "V0"), 
+  simpl.DataArrayPath("DataContainer", "EdgeList", "V1")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Edges", False)
+  if err < 0:
+    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 2
+  # Remove array helper function:
+  err = sc.RemoveArrays(dca, [("DataContainer", "EdgeList", "V0"), ("DataContainer", "EdgeList", "V1")])
+  if err < 0:
+    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Create Geometry
+  err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, "DataContainer", False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
+  shared_edge_list_array_path = simpl.DataArrayPath("DataContainer", "EdgeList", "Edges"),
+  vertex_attribute_matrix_name = "VertexData",
+  edge_attribute_matrix_name = "EdgeData")
+  if err < 0:
+    print("Create Geometry -  ErrorCondition: %d" % err)
+
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateEdgeGeometry.dream3d", True, False)
+  if err < 0:
+    print("DataContainerWriter ErrorCondition: %d" % err)
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  #help(simpl.ImageGeom)
+  CreateEdgeGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Quad_Geometry.py b/Wrapping/Python/Testing/Create_Quad_Geometry.py
new file mode 100644
index 0000000000..dfaca618fd
--- /dev/null
+++ b/Wrapping/Python/Testing/Create_Quad_Geometry.py
@@ -0,0 +1,115 @@
+# Based on CreateQuadGeometry example
+# 
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy as d3d
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def CreateQuadGeometryTest():
+  # Create Data Container Array
+  dca = simpl.DataContainerArray.New()
+
+  # Create the Data Container
+  err = d3d.create_data_container(dca, "DataContainer")
+  if err < 0:
+    print("DataContainer ErrorCondition: %d" % err)
+
+  # Import ASCII Data - #1 - Vertex Coordinates
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 145,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
+    "headers": ["x", "y", "z"],
+    "attrMatType": 3,
+    "tupleDimensions": [144],
+    "dataTypes": ["float", "float", "float"]
+  }
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+  
+
+  # Import ASCII Data - #2 - Edge Connectivity
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/QuadConnectivity.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 122,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
+    "headers": ["V0", "V1", "V2", "V3"],
+    "attrMatType": 3,
+    "tupleDimensions": [121],
+    "dataTypes": ["int64_t", "int64_t","int64_t", "int64_t"]
+  }  
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+
+  # Combine Attribute Arrays # 1:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  if err < 0:
+    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 1
+  dcap = simpl.DataContainerArrayProxy()
+  dcap.getDataContainerProxy("DataContainer").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  err = d3d.remove_arrays(dca, dcap)
+  if err < 0:
+    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Combine Attribute Arrays #2:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"), 
+  simpl.DataArrayPath("DataContainer", "QuadList", "V1"), simpl.DataArrayPath("DataContainer", "QuadList", "V2"), 
+  simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Quads", False)
+  if err < 0:
+    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 2
+  dcap = simpl.DataContainerArrayProxy()
+  dcap.getDataContainerProxy("DataContainer").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").Flag = 2
+  err = d3d.remove_arrays(dca, dcap)
+  if err < 0:
+    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Create Geometry
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
+  shared_quad_list_array_path = simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
+  vertex_attribute_matrix_name = "VertexData",
+  face_attribute_matrix_name = "FaceData")
+  if err < 0:
+    print("Create Geometry -  ErrorCondition: %d" % err)
+
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateQuadGeometry.dream3d", True, False)
+  if err < 0:
+    print("DataContainerWriter ErrorCondition: %d" % err)
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  CreateQuadGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_RectilinearGrid.py b/Wrapping/Python/Testing/Create_RectilinearGrid.py
new file mode 100644
index 0000000000..6aa8a39bf9
--- /dev/null
+++ b/Wrapping/Python/Testing/Create_RectilinearGrid.py
@@ -0,0 +1,59 @@
+
+# Based on CreateRectilinearGrid example
+# 
+
+# As of 9-13-18, this example will not work as the input file is not available
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy as d3d
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def CreateRectilinearGridTest():
+  # Create Data Container Array
+  dca = simpl.DataContainerArray.New()
+
+  # Create the Data Container
+  err = d3d.create_data_container(dca, "DataContainer")
+  if err < 0:
+    print("DataContainer ErrorCondition: %d" % err)
+
+  # Import ASCII Data - Rectilinear Grid
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/RectilinearGrid.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 15,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
+    "headers": ["x", "y", "z"],
+    "attrMatType": 3,
+    "tupleDimensions": [14],
+    "dataTypes": ["float", "float", "float"]
+  }
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+  
+  # Create Geometry
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
+  x_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "x"),
+  y_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "y"),
+  z_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "z"),
+  face_attribute_matrix_name = "CellData")
+  if err < 0:
+    print("Create Geometry -  ErrorCondition: %d" % err)
+
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateRectilinearGrid.dream3d", True, False)
+  if err < 0:
+    print("DataContainerWriter ErrorCondition: %d" % err)
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  CreateRectilinearGridTest()
diff --git a/Wrapping/Python/Testing/Create_Triangle_Geometry.py b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
new file mode 100644
index 0000000000..7ce24fdab2
--- /dev/null
+++ b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
@@ -0,0 +1,111 @@
+# Based on CreateTriangleGeometry example
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy as d3d
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def CreateTriangleGeometryTest():
+  # Create Data Container Array
+  dca = simpl.DataContainerArray.New()
+
+  # Create the Data Container
+  err = d3d.create_data_container(dca, "DataContainer")
+  if err < 0:
+    print("DataContainer ErrorCondition: %d" % err)
+
+  # Import ASCII Data - #1 - Vertex Coordinates
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 145,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
+    "headers": ["x", "y", "z"],
+    "attrMatType": 3,
+    "tupleDimensions": [144],
+    "dataTypes": ["float", "float", "float"]
+  }
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+  
+  # Combine Attribute Arrays # 1:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  if err < 0:
+    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 1
+  dcap = simpl.DataContainerArrayProxy()
+  dcap.getDataContainerProxy("DataContainer").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  err = d3d.remove_arrays(dca, dcap)
+  if err < 0:
+    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Import ASCII Data - #2 - Triangle Connectivity
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/TriangleConnectivity.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 243,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "Triangles", ""),
+    "headers": ["V0", "V1", "V2"],
+    "attrMatType": 3,
+    "tupleDimensions": [242],
+    "dataTypes": ["int64_t", "int64_t","int64_t"]
+  }  
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+
+  # Combine Attribute Arrays #2:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Triangles", "V0"), 
+  simpl.DataArrayPath("DataContainer", "Triangles", "V1"), simpl.DataArrayPath("DataContainer", "Triangles", "V2")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Triangles", False)
+  if err < 0:
+    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 2
+  dcap = simpl.DataContainerArrayProxy()
+  dcap.getDataContainerProxy("DataContainer").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").Flag = 2
+  err = d3d.remove_arrays(dca, dcap)
+  if err < 0:
+    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+
+  # Create Geometry
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
+  shared_tri_list_array_path = simpl.DataArrayPath("DataContainer", "Triangles", "Triangles"),
+  vertex_attribute_matrix_name = "VertexData",
+  face_attribute_matrix_name = "FaceData")
+  if err < 0:
+    print("Create Geometry -  ErrorCondition: %d" % err)
+
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateTriangleGeometry.dream3d", True, False)
+  if err < 0:
+    print("DataContainerWriter ErrorCondition: %d" % err)
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  CreateTriangleGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Vertex_Geometry.py b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
new file mode 100644
index 0000000000..b3c799e889
--- /dev/null
+++ b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
@@ -0,0 +1,75 @@
+# Based on CreateVertexGeometry example
+
+# These are the simpl_py python modules
+
+from dream3d import simplpy as d3d
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+
+def CreateVertexGeometryTest():
+  # Create Data Container Array
+  dca = simpl.DataContainerArray.New()
+
+  # Create the Data Container
+  err = d3d.create_data_container(dca, "DataContainer")
+  if err < 0:
+    print("DataContainer ErrorCondition: %d" % err)
+
+  # Import ASCII Data - #1 - Vertex Coordinates
+  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  wizardData = {
+    "inputFilePath": importFile,
+    "beginIndex": 2,
+    "numberOfLines": 145,
+    "delimiters": [','],    
+    "consecutiveDelimiters": False,
+    "automaticAM": True,
+    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
+    "headers": ["x", "y", "z"],
+    "attrMatType": 3,
+    "tupleDimensions": [144],
+    "dataTypes": ["float", "float", "float"]
+  }
+  err = d3d.read_ascii_data(dca, wizardData)
+  if err < 0:
+    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+  
+  # Combine Attribute Arrays # 1:
+  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
+  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  if err < 0:
+    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Delete Data # 1
+  dcap = simpl.DataContainerArrayProxy()
+  dcap.getDataContainerProxy("DataContainer").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
+  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  err = d3d.remove_arrays(dca, dcap)
+  if err < 0:
+    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+
+  # Create Geometry
+  data_container_name = "DataContainer"
+  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices")
+  vertex_attribute_matrix_name = "VertexData"
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, "DataContainer", False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
+  vertex_attribute_matrix_name = "VertexData")
+  if err < 0:
+    print("Create Geometry -  ErrorCondition: %d" % err)
+
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateVertexGeometry.dream3d", True, False)
+  if err < 0:
+    print("DataContainerWriter ErrorCondition: %d" % err)
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  CreateVertexGeometryTest()
diff --git a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
index 58b48325e4..3e4037c53a 100644
--- a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
@@ -19,7 +19,7 @@ def crop_vertex_geometry_test():
         print("DataContainer ErrorCondition: %d" % err)
 
     # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Debug/Data/DREAM3DReview/VertexCoordinates.csv"
+    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
     wizard_data = {
         "inputFilePath": import_file,
         "beginIndex": 2,
@@ -81,7 +81,7 @@ def crop_vertex_geometry_test():
 
     # Write to DREAM.3D File
     err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Data/Output/CoreFilterTests/" +
+                                        "/Data/Output/CoreFilters/" +
                                         "CropVertexGeometry.dream3d", True, False)
     if err < 0:
         print("DataContainerWriter ErrorCondition: %d" % err)

From ff803adc829bde9c329ed681103cfa1567eed7a3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 29 Apr 2019 10:51:40 -0400
Subject: [PATCH 081/397] Use the proper file extension for bash or command
 prompt depending on OS.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Pybind11/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index e80d8f00a5..c3bb4bf957 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -148,8 +148,8 @@ if(SIMPL_BUILD_TESTING)
   )
 
   foreach(test ${SIMPL_PYTHON_TESTS})
-    set(SIMPL_PYTHON_TEST_DRIVER "${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest/SIMPL/${test}.sh")
-    configure_file(${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.sh
+    set(SIMPL_PYTHON_TEST_DRIVER "${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest/SIMPL/${test}.${TEST_SCRIPT_FILE_EXT}")
+    configure_file(${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.${TEST_SCRIPT_FILE_EXT}
                   "${SIMPL_PYTHON_TEST_DRIVER}" @ONLY)
     add_test(NAME PY_SIMPL_${test} COMMAND "${SIMPL_PYTHON_TEST_DRIVER}" )
   endforeach(test ${SIMPL_PYTHON_TESTS})

From f9de97a88c5fdbaf74e5e164577d8f6445abdcf7 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 29 Apr 2019 10:36:01 -0400
Subject: [PATCH 082/397] fix compiler error by #include <vector>

Add code to unit test specifically for std::vector to SIMPLArray conversion

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp                 | 1 +
 Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index be4e83cf33..abc1e49c26 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -34,6 +34,7 @@
 #include <array>
 #include <tuple>
 #include <cassert>
+#include <vector>
 
 #include <QtCore/QMetaObject>
 
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index cdc9500246..ab36314681 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -81,6 +81,9 @@ class SIMPLArrayTest
     std::vector<int32_t> iv3 = {4, 5};
     i3 = iv3.data();
 
+    std::vector<int32_t> iv2 = {6,5};
+    i3 = IntVec2Type(iv2);
+
     int32_t x = i3.getX();
     DREAM3D_REQUIRED(x, ==, 4)
     int32_t y = i3.getY();

From 7aa97ad3763063040d2929c9375bf762ab8a2396 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 29 Apr 2019 15:13:42 -0400
Subject: [PATCH 083/397] Python: Update plugins to use correct OS specfic file
 extension.

---
 Wrapping/Python/Conda/package.in.bat            |  4 ++--
 Wrapping/Python/Pybind11/CMakeLists.txt         | 12 +++++++-----
 Wrapping/Python/Pybind11/python_test_driver.bat | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 Wrapping/Python/Pybind11/python_test_driver.bat

diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
index 078e21eecf..0e0df2146f 100644
--- a/Wrapping/Python/Conda/package.in.bat
+++ b/Wrapping/Python/Conda/package.in.bat
@@ -64,7 +64,7 @@ xcopy /i /q /y /s %BUILD_DIR%\Data %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_
 xcopy /i /q /y /s %BUILD_DIR%\Help %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\Help
 xcopy /i /q /y /s %BUILD_DIR%\PrebuiltPipelines %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\PrebuiltPipelines
 
-@echo "Preparing to build the Conda %PYTHON_SITE_PACKAGES_NAME% of DREAM3D using Conda environment: %ANACONDA_ENVIRONMENT_NAME% and Conda installation: %ANACONDA_DIR%. Activating the environment..."
+@echo "Preparing to build the Conda package %PYTHON_SITE_PACKAGES_NAME% using Conda environment: %ANACONDA_ENVIRONMENT_NAME% and Conda installation: %ANACONDA_DIR%. Activating the environment..."
 call %ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\activate.bat %ANACONDA_ENVIRONMENT_NAME% 
 
 @echo "Ensuring conda-build is installed..."         
@@ -92,5 +92,5 @@ IF "@SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL@" == "ON" (
 )
 
 echo "====================================================================="
-echo "       COMPELTED      "
+echo "       COMPLETED      "
 echo "====================================================================="
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index c3bb4bf957..1e3c410080 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -16,9 +16,6 @@ else()
   set(SIMPL_ANACONDA_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Anaconda")
 endif()
 
-set_property(GLOBAL PROPERTY SIMPL_ANACONDA_OUTPUT_DIR "${SIMPL_ANACONDA_OUTPUT_DIR}")
-
-
 # --------------------------------------------------------------------------
 # macro to convert a file system path to compatible C++ strings, i.e., on
 # Windows, convert the backslash to forward slash.
@@ -61,9 +58,14 @@ get_target_property(GeneratePythonBindings_RUNTIME_OUTPUT_DIR GeneratePythonBind
 get_filename_component(SIMPL_PYB11_PARENT_DIR  ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
 get_filename_component(SIMPL_PYB11_PARENT_DIR  ${SIMPL_PYB11_PARENT_DIR} DIRECTORY)
 
+ConvertPathToHeaderCompatible(${SIMPL_ANACONDA_OUTPUT_DIR})
 configure_file( ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/SIMPLPyBind11Config.h.in
                 ${SIMPLPyBind11_BINARY_DIR}/CodeScraper/SIMPLPyBind11Config.h
                 )
+file(TO_NATIVE_PATH "${SIMPL_ANACONDA_OUTPUT_DIR}" SIMPL_ANACONDA_OUTPUT_DIR)
+set_property(GLOBAL PROPERTY SIMPL_ANACONDA_OUTPUT_DIR "${SIMPL_ANACONDA_OUTPUT_DIR}")
+                
+
 
 target_sources(GeneratePythonBindings PRIVATE ${SIMPLPyBind11_BINARY_DIR}/CodeScraper/SIMPLPyBind11Config.h)
 
@@ -117,7 +119,7 @@ if(SIMPL_BUILD_TESTING)
 
   #------------------------------
   # Initialize the PYTHON_TEST_INPUT_DIR variable to point to the "Testing Directory"
-  file(TO_CMAKE_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing" PYTHON_TEST_INPUT_DIR)
+  file(TO_NATIVE_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing" PYTHON_TEST_INPUT_DIR)
 
   set(SIMPL_PYTHON_TESTS
     AbstractFilterTest
@@ -159,7 +161,7 @@ endif()
 # --------------------------------------------------------------------------
 # Copy the recipe and egg info for the building Conda package to the 
 # output directory
-if (SIMPL_ENABLE_ANACONDA_PACKAGE AND SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL)
+if (SIMPL_ENABLE_ANACONDA_PACKAGE)
   if("${ANACONDA_DIR}" STREQUAL "")
     set(ANACONDA_DIR "" CACHE STRING "")
     message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
diff --git a/Wrapping/Python/Pybind11/python_test_driver.bat b/Wrapping/Python/Pybind11/python_test_driver.bat
new file mode 100644
index 0000000000..8aea37e789
--- /dev/null
+++ b/Wrapping/Python/Pybind11/python_test_driver.bat
@@ -0,0 +1,16 @@
+@echo off
+
+@echo "[@test@] SIMPL Python Test Starting"
+
+@set ANACONDA_DIR=@ANACONDA_DIR@
+@set PATH=%PATH%;%ANACONDA_DIR%;%ANACONDA_DIR%\Scripts
+
+@set PYTHONPATH=@SIMPL_ANACONDA_OUTPUT_DIR@\@PYTHON_SITE_PACKAGES_NAME@
+cd %PYTHONPATH%
+@echo "PYTHONPATH: %PYTHONPATH%"
+
+@set PYTHON_TEST_INPUT_DIR=@PYTHON_TEST_INPUT_DIR@
+@echo "PYTHON_TEST_INPUT_DIR: @PYTHON_TEST_INPUT_DIR@"
+
+@echo "PYTHON_EXECUTABLE: @PYTHON_EXECUTABLE@"
+"@PYTHON_EXECUTABLE@" "%PYTHON_TEST_INPUT_DIR%\@test@.py"

From 827b8a880493250ae6d8548d507043bd81fb6978 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 30 Apr 2019 17:27:41 -0400
Subject: [PATCH 084/397] Rename SIMPLArray::values to toTuple().

---
 Source/SIMPLib/Common/SIMPLArray.hpp          | 22 +++++++++-----
 .../Common/Testing/Cxx/SIMPLArrayTest.cpp     |  8 ++---
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  | 30 -------------------
 3 files changed, 18 insertions(+), 42 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index abc1e49c26..5bedd9b759 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -36,8 +36,6 @@
 #include <cassert>
 #include <vector>
 
-#include <QtCore/QMetaObject>
-
 /**
  * @brief This class is a facade pattern around a std::array<T,D> array to allow for some semantics
  * for either a 2D or 3D point such as X,Y,Z. We Provide 3 concrete implementations that are for 2, 3 and 4 element
@@ -307,10 +305,10 @@ class IVec2 : public SIMPLArray<T, 2>
   }
 
   /**
-   * @brief values Converts the internal data structure to a std::tuple<T, T, T>
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
    * @return
    */
-  std::tuple<T, T> values() const
+  std::tuple<T, T> toTuple() const
   {
     return std::make_tuple(getX(), getY());
   }
@@ -438,10 +436,10 @@ class IVec3 : public SIMPLArray<T, 3>
   }
 
   /**
-   * @brief values Converts the internal data structure to a std::tuple<T, T, T>
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
    * @return
    */
-  std::tuple<T, T, T> values() const
+  std::tuple<T, T, T> toTuple() const
   {
     return std::make_tuple(getX(), getY(), getZ());
   }
@@ -580,7 +578,11 @@ template <typename T> class IVec4 : public SIMPLArray<T, 4>
     (*this)[3] = w;
   }
 
-  std::tuple<T, T, T, T> values() const
+  /**
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @return
+   */
+  std::tuple<T, T, T, T> toTuple() const
   {
     return std::make_tuple(getX(), getY(), getZ(), getW());
   }
@@ -704,7 +706,11 @@ class IVec6 : public SIMPLArray<T, 6>
     (*this)[5] = k;
   }
 
-  std::tuple<T, T, T, T, T, T> values() const
+  /**
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @return
+   */
+  std::tuple<T, T, T, T, T, T> toTuple() const
   {
     return std::make_tuple((*this)[0], (*this)[1], (*this)[2], (*this)[3], (*this)[4], (*this)[5]);
   }
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index ab36314681..57490f7700 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -89,7 +89,7 @@ class SIMPLArrayTest
     int32_t y = i3.getY();
     DREAM3D_REQUIRED(y, ==, 5)
 
-    tpl = i3.values();
+    tpl = i3.toTuple();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
 
@@ -126,7 +126,7 @@ class SIMPLArrayTest
     int32_t z = i3.getZ();
     DREAM3D_REQUIRED(z, ==, 6)
 
-    tpl = i3.values();
+    tpl = i3.toTuple();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
     DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
@@ -170,7 +170,7 @@ class SIMPLArrayTest
     int32_t z = i3.getZ();
     DREAM3D_REQUIRED(z, ==, 6)
 
-    tpl = i3.values();
+    tpl = i3.toTuple();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
     DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
@@ -203,7 +203,7 @@ class SIMPLArrayTest
     std::vector<int32_t> iv3 = {4, 5, 6, 7, 8, 9};
     i3 = iv3.data();
 
-    tpl = i3.values();
+    tpl = i3.toTuple();
     DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
     DREAM3D_REQUIRED(std::get<2>(tpl), ==, 6)
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 3c57ad6af9..c406e687ec 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -35,7 +35,6 @@ PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/PhaseType.h"
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
@@ -221,35 +220,6 @@ PYBIND11_MODULE(dream3d, m)
   /* Define a python submodule for SIMPL */
   py::module mod = m.def_submodule("simpl", "  Python wrapping for SIMPL");
 
-#if 0
-  py::class_<SizeVec3Type>(mod, "SizeVec3Type")
-	  .def(py::init<>([](py::list values) {
-      SizeVec3Type sv3 = SizeVec3Type(py::cast<size_t>(values[0]), py::cast<size_t>(values[1]), py::cast<size_t>(values[2]));
-      return sv3;
-    }))
-	  .def("__repr__", [](const SizeVec3Type &inValues) {
-		  py::list outValues;
-		  for (size_t value : inValues)
-		  {
-			  outValues.append(value);
-		  }
-		  return outValues;
-	  })
-	  .def("__str__", [](const SizeVec3Type &inValues) {
-		  py::list outValues;
-		  for (size_t value : inValues)
-		  {
-			  outValues.append(value);
-		  }
-      return py::str(outValues);
-	  })
-	  .def("__getitem__", [](const SizeVec3Type &values, int index) {
-		  return values[index];
-	  })
-  ;
-#endif
-
-
   // SIMPLArray declarations/definitions
   PYB11_DEFINE_SIMPLARRAY_2_INIT(float, FloatVec2Type)
   PYB11_DEFINE_SIMPLARRAY_2_INIT(int32_t, IntVec2Type)

From d5e5535af7d5711bcb5771a496d9de27a417b0ea Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 23 Apr 2019 09:00:22 -0400
Subject: [PATCH 085/397] Topic/2 d image import fix (#342)

Updating ITKImageReader and itkInPlaceImageToDream3DDataFilter classes so that they import 2D datasets with the 3rd dimension set to 0.
---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  26 +--
 .../itkInPlaceImageToDream3DDataFilter.hxx    | 200 ++++++++----------
 2 files changed, 94 insertions(+), 132 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 8f2a50117d..1317a10a80 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -48,9 +48,7 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   const unsigned int dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
@@ -77,9 +75,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   using PixelTypeType = itk::ImageIOBase::IOPixelType;
   PixelTypeType pixel = imageIO->GetPixelType();
@@ -135,9 +131,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
 {
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
@@ -172,9 +166,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool da
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 {
   try
   {
@@ -240,9 +232,8 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container)
+void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader,
+                                                              DataContainer::Pointer& container)
 {
   using ImageType = itk::Dream3DImage<TPixel, dimensions>;
   using ValueType = typename itk::NumericTraits<TPixel>::ValueType;
@@ -253,12 +244,14 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
   FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
-  SizeVec3Type tDims = {1, 1, 1};
+  SizeVec3Type tDims = {0, 0, 0};
+  QVector<size_t> qTdims(dimensions);
   for(size_t i = 0; i < dimensions; i++)
   {
     torigin[i] = origin[i];
     tspacing[i] = spacing[i];
     tDims[i] = size[i];
+    qTdims[i] = tDims[i];
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
   image->setDimensions(tDims);
@@ -267,7 +260,6 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   container->setGeometry(image);
 
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
-  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 0ec6461f1d..624aafc7a7 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -1,23 +1,21 @@
 #pragma once
 
-#include "itkInPlaceImageToDream3DDataFilter.h"
-#include "itkGetComponentsDimensions.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "itkGetComponentsDimensions.h"
+#include "itkInPlaceImageToDream3DDataFilter.h"
 #include <QString>
 
 namespace itk
 {
 
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType,VDimension>
-::InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDataFilter()
 {
   m_DataArrayName = (SIMPL::Defaults::CellAttributeMatrixName).toStdString();
   m_AttributeMatrixArrayName = (SIMPL::CellData::ImageData).toStdString();
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
-  typename DecoratorType::Pointer output =
-    static_cast< DecoratorType * >(this->MakeOutput(0).GetPointer());
+  typename DecoratorType::Pointer output = static_cast<DecoratorType*>(this->MakeOutput(0).GetPointer());
   this->ProcessObject::SetNumberOfRequiredOutputs(1);
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
   this->SetNumberOfRequiredInputs(1);
@@ -25,55 +23,40 @@ InPlaceImageToDream3DDataFilter<PixelType,VDimension>
   m_InPlace = true;
 }
 
-
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetDataContainer(DataContainer::Pointer dc)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetDataContainer(DataContainer::Pointer dc)
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   outputPtr->Set(dc);
 }
 
-
-
-template< typename PixelType, unsigned int VDimension>
-ProcessObject::DataObjectPointer
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+template <typename PixelType, unsigned int VDimension>
+ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDimension>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   return DecoratorType::New().GetPointer();
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::~InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::~InPlaceImageToDream3DDataFilter()
 {
 }
 
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetInput(const ImageType *input)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetInput(const ImageType* input)
 {
   // Process object is not const-correct so the const_cast is required here
-  this->ProcessObject::SetNthInput(0,
-    const_cast< ImageType * >(input));
+  this->ProcessObject::SetNthInput(0, const_cast<ImageType*>(input));
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateOutputInformation()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInformation()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
-  //float tol = 0.000001;
+  // float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
-  QVector<size_t> tDims(3, 1);
+  QVector<size_t> tDims(3, 0);
   // Get Input image properties
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   typename ImageType::PointType origin = inputPtr->GetOrigin();
@@ -82,10 +65,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   //// Create image geometry (data container)
   ImageGeom::Pointer imageGeom;
   IGeometry::Pointer geom = dataContainer->getGeometry();
-  if (geom)
+  if(geom)
   {
     imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Data container contains a geometry that is not ImageGeometry");
     }
@@ -93,16 +76,16 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   else
   {
     imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Could not create image geometry");
     }
   }
-  for (size_t i = 0; i < VDimension; i++)
+  for(size_t i = 0; i < VDimension; i++)
   {
-	  torigin[i] = origin[i];
-	  tspacing[i] = spacing[i];
-	  tDims[i] = size[i];
+    torigin[i] = origin[i];
+    tspacing[i] = spacing[i];
+    tDims[i] = size[i];
   }
   imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
   imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
@@ -110,70 +93,67 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   dataContainer->setGeometry(imageGeom);
 }
 
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateData()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<PixelType>();
   IGeometry::Pointer geom = dataContainer->getGeometry();
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-  QVector<size_t> tDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
+  QVector<size_t> attrMatDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
+
   AttributeMatrix::Pointer attrMat;
-  if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
+  if(dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
-	attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-	// Check that attribute matrix type is 'cell'
-	if (attrMat->getType() != AttributeMatrix::Type::Cell)
-	{
-		itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
-	}
-	// Check that if size does not match, there are no other data array than the one we expect.
-	// That makes it possible to modify the attribute matrix without having to worry.
-	QVector<size_t> matDims = attrMat->getTupleDimensions();
-	if (matDims != tDims)
-	{
-    if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
-      || ! (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)) )
-		{
-			itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
-		}
-		dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-		attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
-	}
+    attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+    // Check that attribute matrix type is 'cell'
+    if(attrMat->getType() != AttributeMatrix::Type::Cell)
+    {
+      itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
+    }
+    // Check that if size does not match, there are no other data array than the one we expect.
+    // That makes it possible to modify the attribute matrix without having to worry.
+    QVector<size_t> matDims = attrMat->getTupleDimensions();
+    if(matDims != tDims)
+    {
+      if(!((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1) ||
+           !(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)))
+      {
+        itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
+      }
+      dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+      attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    }
   }
   else
   {
-    attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
   }
   // Checks if doesAttributeArray exists and remove it if it is the case
-  if (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
+  if(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
   {
-	  IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
-	  if (attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
-	  {
-		  attrMat->removeAttributeArray(m_DataArrayName.c_str());
-	  }
+    IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
+    if(attrArray->getNumberOfTuples() != attrMat->getNumberOfTuples())
+    {
+      attrMat->removeAttributeArray(m_DataArrayName.c_str());
+    }
   }
   typename DataArrayPixelType::Pointer data;
-  inputPtr->SetBufferedRegion( inputPtr->GetLargestPossibleRegion() );
-  if( m_InPlace )
+  inputPtr->SetBufferedRegion(inputPtr->GetLargestPossibleRegion());
+  if(m_InPlace)
   {
-    inputPtr->GetPixelContainer()->SetContainerManageMemory( false );
-    data = DataArrayPixelType::WrapPointer( reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()),
-              imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true );
+    inputPtr->GetPixelContainer()->SetContainerManageMemory(false);
+    data = DataArrayPixelType::WrapPointer(reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples(), cDims, this->GetDataArrayName().c_str(), true);
   }
   else
   {
-    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims,
-              m_DataArrayName.c_str(), true);
-    if (nullptr != data.get())
+    data = DataArrayPixelType::CreateArray(attrMat->getNumberOfTuples(), cDims, m_DataArrayName.c_str(), true);
+    if(nullptr != data.get())
     {
-      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
+      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples() * sizeof(ValueType));
     }
   }
   attrMat->insertOrAssign(data);
@@ -181,38 +161,33 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 // Check that names has been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::CheckValidArrayPathComponentName(std::string var) const
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::CheckValidArrayPathComponentName(std::string var) const
 {
-  if (var.find('/') != std::string::npos)
+  if(var.find('/') != std::string::npos)
   {
     itkExceptionMacro("Name contains a '/'");
   }
-  if (var.empty())
+  if(var.empty())
   {
     itkExceptionMacro("Name is empty");
   }
 }
 
-
 // Check that the inputs have been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::VerifyPreconditions() ITKv5_CONST
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
 {
-  //Test only works if image if of dimension 2 or 3
-  if (VDimension != 2 && VDimension != 3)
+  // Test only works if image if of dimension 2 or 3
+  if(VDimension != 2 && VDimension != 3)
   {
     itkExceptionMacro("Dimension must be 2 or 3.");
   }
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  const DecoratorType *outputPtr = this->GetOutput();
-  if (!outputPtr->Get())
+  const DecoratorType* outputPtr = this->GetOutput();
+  if(!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
   }
@@ -221,23 +196,18 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 /**
-*
-*/
-template<typename PixelType, unsigned int VDimension>
-typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput()
+ *
+ */
+template <typename PixelType, unsigned int VDimension>
+typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput()
 {
-  return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-template<typename PixelType, unsigned int VDimension>
-const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput() const
+template <typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput() const
 {
-  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
-
+} // namespace itk

From 98232abd26093e69b3b1b9a2be91b98ff385f07e Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 24 Apr 2019 07:35:58 -0400
Subject: [PATCH 086/397] Revert "Topic/2 d image import fix (#342)" (#344)

This reverts commit fa06dd2b07f075f7ed8e7191ee1e06594c0410a6.
---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  26 ++-
 .../itkInPlaceImageToDream3DDataFilter.hxx    | 197 ++++++++++--------
 2 files changed, 131 insertions(+), 92 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 1317a10a80..8f2a50117d 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -48,7 +48,9 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   const unsigned int dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
@@ -75,7 +77,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   using PixelTypeType = itk::ImageIOBase::IOPixelType;
   PixelTypeType pixel = imageIO->GetPixelType();
@@ -131,7 +135,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
 {
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
@@ -166,7 +172,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 {
   try
   {
@@ -232,8 +240,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader,
-                                                              DataContainer::Pointer& container)
+void
+ITK_IMAGE_READER_CLASS_NAME
+::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container)
 {
   using ImageType = itk::Dream3DImage<TPixel, dimensions>;
   using ValueType = typename itk::NumericTraits<TPixel>::ValueType;
@@ -244,14 +253,12 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
   // Initialize torigin/tspacing/tDims since arrays are always of size 3 and ITK image may have a different size.
   FloatVec3Type torigin = {0.0f, 0.0f, 0.0f};
   FloatVec3Type tspacing = {1.0f, 1.0f, 1.0f};
-  SizeVec3Type tDims = {0, 0, 0};
-  QVector<size_t> qTdims(dimensions);
+  SizeVec3Type tDims = {1, 1, 1};
   for(size_t i = 0; i < dimensions; i++)
   {
     torigin[i] = origin[i];
     tspacing[i] = spacing[i];
     tDims[i] = size[i];
-    qTdims[i] = tDims[i];
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
   image->setDimensions(tDims);
@@ -260,6 +267,7 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
   container->setGeometry(image);
 
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
+  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 624aafc7a7..85d2c0d497 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -1,21 +1,23 @@
 #pragma once
 
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "itkGetComponentsDimensions.h"
 #include "itkInPlaceImageToDream3DDataFilter.h"
+#include "itkGetComponentsDimensions.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
 #include <QString>
 
 namespace itk
 {
 
-template <typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDataFilter()
+template<typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType,VDimension>
+::InPlaceImageToDream3DDataFilter()
 {
   m_DataArrayName = (SIMPL::Defaults::CellAttributeMatrixName).toStdString();
   m_AttributeMatrixArrayName = (SIMPL::CellData::ImageData).toStdString();
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
-  typename DecoratorType::Pointer output = static_cast<DecoratorType*>(this->MakeOutput(0).GetPointer());
+  typename DecoratorType::Pointer output =
+    static_cast< DecoratorType * >(this->MakeOutput(0).GetPointer());
   this->ProcessObject::SetNumberOfRequiredOutputs(1);
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
   this->SetNumberOfRequiredInputs(1);
@@ -23,40 +25,55 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDat
   m_InPlace = true;
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetDataContainer(DataContainer::Pointer dc)
+
+template< typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::SetDataContainer(DataContainer::Pointer dc)
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   outputPtr->Set(dc);
 }
 
-template <typename PixelType, unsigned int VDimension>
-ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDimension>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+
+
+template< typename PixelType, unsigned int VDimension>
+ProcessObject::DataObjectPointer
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   return DecoratorType::New().GetPointer();
 }
 
-template <typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>::~InPlaceImageToDream3DDataFilter()
+
+template<typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::~InPlaceImageToDream3DDataFilter()
 {
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetInput(const ImageType* input)
+template< typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter< PixelType, VDimension >
+::SetInput(const ImageType *input)
 {
   // Process object is not const-correct so the const_cast is required here
-  this->ProcessObject::SetNthInput(0, const_cast<ImageType*>(input));
+  this->ProcessObject::SetNthInput(0,
+    const_cast< ImageType * >(input));
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInformation()
+
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GenerateOutputInformation()
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
-  // float tol = 0.000001;
+  //float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
-  QVector<size_t> tDims(3, 0);
+  QVector<size_t> tDims(3, 1);
   // Get Input image properties
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   typename ImageType::PointType origin = inputPtr->GetOrigin();
@@ -65,10 +82,10 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   //// Create image geometry (data container)
   ImageGeom::Pointer imageGeom;
   IGeometry::Pointer geom = dataContainer->getGeometry();
-  if(geom)
+  if (geom)
   {
     imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-    if(!imageGeom)
+    if (!imageGeom)
     {
       itkExceptionMacro("Data container contains a geometry that is not ImageGeometry");
     }
@@ -76,16 +93,16 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   else
   {
     imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    if(!imageGeom)
+    if (!imageGeom)
     {
       itkExceptionMacro("Could not create image geometry");
     }
   }
-  for(size_t i = 0; i < VDimension; i++)
+  for (size_t i = 0; i < VDimension; i++)
   {
-    torigin[i] = origin[i];
-    tspacing[i] = spacing[i];
-    tDims[i] = size[i];
+	  torigin[i] = origin[i];
+	  tspacing[i] = spacing[i];
+	  tDims[i] = size[i];
   }
   imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
   imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
@@ -93,10 +110,12 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInfor
   dataContainer->setGeometry(imageGeom);
 }
 
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GenerateData()
 {
-  DecoratorType* outputPtr = this->GetOutput();
+  DecoratorType *outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
@@ -106,54 +125,56 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
   QVector<size_t> attrMatDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
 
   AttributeMatrix::Pointer attrMat;
-  if(dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
+  if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
-    attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-    // Check that attribute matrix type is 'cell'
-    if(attrMat->getType() != AttributeMatrix::Type::Cell)
-    {
-      itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
-    }
-    // Check that if size does not match, there are no other data array than the one we expect.
-    // That makes it possible to modify the attribute matrix without having to worry.
-    QVector<size_t> matDims = attrMat->getTupleDimensions();
-    if(matDims != tDims)
-    {
-      if(!((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1) ||
-           !(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)))
-      {
-        itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
-      }
-      dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-      attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
-    }
+	attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+	// Check that attribute matrix type is 'cell'
+	if (attrMat->getType() != AttributeMatrix::Type::Cell)
+	{
+		itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
+	}
+	// Check that if size does not match, there are no other data array than the one we expect.
+	// That makes it possible to modify the attribute matrix without having to worry.
+	QVector<size_t> matDims = attrMat->getTupleDimensions();
+	if (matDims != tDims)
+	{
+    if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
+      || ! (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)) )
+		{
+			itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
+		}
+		dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+		attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+	}
   }
   else
   {
-    attrMat = dataContainer->createAndAddAttributeMatrix(attrMatDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
   }
   // Checks if doesAttributeArray exists and remove it if it is the case
-  if(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
+  if (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
   {
-    IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
-    if(attrArray->getNumberOfTuples() != attrMat->getNumberOfTuples())
-    {
-      attrMat->removeAttributeArray(m_DataArrayName.c_str());
-    }
+	  IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
+	  if (attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
+	  {
+		  attrMat->removeAttributeArray(m_DataArrayName.c_str());
+	  }
   }
   typename DataArrayPixelType::Pointer data;
-  inputPtr->SetBufferedRegion(inputPtr->GetLargestPossibleRegion());
-  if(m_InPlace)
+  inputPtr->SetBufferedRegion( inputPtr->GetLargestPossibleRegion() );
+  if( m_InPlace )
   {
-    inputPtr->GetPixelContainer()->SetContainerManageMemory(false);
-    data = DataArrayPixelType::WrapPointer(reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples(), cDims, this->GetDataArrayName().c_str(), true);
+    inputPtr->GetPixelContainer()->SetContainerManageMemory( false );
+    data = DataArrayPixelType::WrapPointer( reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()),
+              imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true );
   }
   else
   {
-    data = DataArrayPixelType::CreateArray(attrMat->getNumberOfTuples(), cDims, m_DataArrayName.c_str(), true);
-    if(nullptr != data.get())
+    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims,
+              m_DataArrayName.c_str(), true);
+    if (nullptr != data.get())
     {
-      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), attrMat->getNumberOfTuples() * sizeof(ValueType));
+      ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
     }
   }
   attrMat->insertOrAssign(data);
@@ -161,33 +182,38 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
 }
 
 // Check that names has been initialized correctly
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::CheckValidArrayPathComponentName(std::string var) const
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::CheckValidArrayPathComponentName(std::string var) const
 {
-  if(var.find('/') != std::string::npos)
+  if (var.find('/') != std::string::npos)
   {
     itkExceptionMacro("Name contains a '/'");
   }
-  if(var.empty())
+  if (var.empty())
   {
     itkExceptionMacro("Name is empty");
   }
 }
 
+
 // Check that the inputs have been initialized correctly
-template <typename PixelType, unsigned int VDimension>
-void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
+template<typename PixelType, unsigned int VDimension>
+void
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::VerifyPreconditions() ITKv5_CONST
 {
-  // Test only works if image if of dimension 2 or 3
-  if(VDimension != 2 && VDimension != 3)
+  //Test only works if image if of dimension 2 or 3
+  if (VDimension != 2 && VDimension != 3)
   {
     itkExceptionMacro("Dimension must be 2 or 3.");
   }
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  const DecoratorType* outputPtr = this->GetOutput();
-  if(!outputPtr->Get())
+  const DecoratorType *outputPtr = this->GetOutput();
+  if (!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
   }
@@ -196,18 +222,23 @@ void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions
 }
 
 /**
- *
- */
-template <typename PixelType, unsigned int VDimension>
-typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput()
+*
+*/
+template<typename PixelType, unsigned int VDimension>
+typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput()
 {
-  return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
 }
 
-template <typename PixelType, unsigned int VDimension>
-const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput() const
+template<typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>
+::GetOutput() const
 {
-  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
 }
 
-} // namespace itk
+} // end of itk namespace
+

From 6b2864108d41c8916ffa17fd70c7649bfd4a3889 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 1 May 2019 17:40:20 -0400
Subject: [PATCH 087/397] Fix Compile error due to wrong variable name
 declared.

Probably happened during a merge conflict resolution

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 85d2c0d497..8ccc8ec62c 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -122,7 +122,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<PixelType>();
   IGeometry::Pointer geom = dataContainer->getGeometry();
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-  QVector<size_t> attrMatDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
+  QVector<size_t> tDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
 
   AttributeMatrix::Pointer attrMat;
   if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))

From 9ed5afc8432c7695392157265882b12bb46cc658 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 2 May 2019 07:58:51 -0400
Subject: [PATCH 088/397] Fix Unit Test errors for SIMPLArrayTest

Remove spurious messages about signal/slot connections

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp        | 6 +++---
 .../CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index 57490f7700..1ac3776c3e 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -85,16 +85,16 @@ class SIMPLArrayTest
     i3 = IntVec2Type(iv2);
 
     int32_t x = i3.getX();
-    DREAM3D_REQUIRED(x, ==, 4)
+    DREAM3D_REQUIRED(x, ==, 6)
     int32_t y = i3.getY();
     DREAM3D_REQUIRED(y, ==, 5)
 
     tpl = i3.toTuple();
-    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 4)
+    DREAM3D_REQUIRED(std::get<0>(tpl), ==, 6)
     DREAM3D_REQUIRED(std::get<1>(tpl), ==, 5)
 
     DREAM3D_REQUIRED(i3.size(), ==, 2)
-    DREAM3D_REQUIRED(i3[0], ==, 4)
+    DREAM3D_REQUIRED(i3[0], ==, 6)
     DREAM3D_REQUIRED(i3[1], ==, 5)
 
     std::vector<int32_t> oVec = i3.toContainer<std::vector<int32_t>>();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index d9e44d5fc6..f2b2a6ab8e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -413,7 +413,7 @@ class ConvertColorToGrayScaleTest
   int RunTest(const uint8_t& algoMapIndex)
   {
     Observer obs;
-    m_colorToGrayscaleFilter->connect(m_colorToGrayscaleFilter.get(), SIGNAL(filterGeneratedMessage(const PipelineMessage&)), &obs, SLOT(processPipelineMessage(const PipelineMessage&)));
+    m_colorToGrayscaleFilter->connect(m_colorToGrayscaleFilter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
     m_colorToGrayscaleFilter->execute();
     int erred = m_colorToGrayscaleFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(erred, 0);

From b06192eb3cb506e84239dc0dee8200cd899ec66f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 2 May 2019 09:03:03 -0400
Subject: [PATCH 089/397] Quiet compiler warnings about signed/unsigned
 comparisons

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index f2f33b0bf2..4886545b17 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -208,7 +208,6 @@ bool QtSFileUtils::HasValidFilePath(const QString& filePath)
   }
 
   QString pathBuildUp;
-  QFileInfo fi(filePath);
 
   /* This block of code figures out, based on the current OS, how the built-up path should begin.
    * For Mac and Linux, it should start with a separator for absolute paths or a path part for relative paths.
@@ -218,7 +217,7 @@ bool QtSFileUtils::HasValidFilePath(const QString& filePath)
 #if defined(Q_OS_WIN)
     /* If there is at least one part, then add it to the pathBuildUp variable.
       A valid Windows path, absolute or relative, has to have at least one part. */
-    if(pathParts[0].isEmpty() == false)
+    if(!pathParts[0].isEmpty())
     {
       pathBuildUp.append(pathParts[0]);
     }
@@ -251,7 +250,7 @@ bool QtSFileUtils::HasValidFilePath(const QString& filePath)
   bool valid = false;
 
   QFileInfo buildingFi(pathBuildUp);
-  size_t pathPartsIdx = 1; // We already processed the first path part above
+  int32_t pathPartsIdx = 1; // We already processed the first path part above
   while(buildingFi.exists() && pathPartsIdx <= pathParts.size())
   {
     valid = true;

From 7f7e24a248f13109b8183742da695d7a947c6565 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 2 May 2019 09:07:21 -0400
Subject: [PATCH 090/397] Fix compiler error on non windows platforms

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index 4886545b17..398b825fc4 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -226,6 +226,7 @@ bool QtSFileUtils::HasValidFilePath(const QString& filePath)
       return false;
     }
 #else
+    QFileInfo fi(filePath);
     /* If the first part is empty and the filePath is absolute, then that means that
      * we are starting with the root directory and need to add it to our pathBuildUp */
     if(pathParts[0].isEmpty() && fi.isAbsolute())

From 7f01a1386918f576b10f8f56446faf0ca5911f38 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 7 May 2019 07:27:22 -0400
Subject: [PATCH 091/397] All the IGeometry subclasses are updated to use
 size_t instead of int64_t (#347)

* All the IGeometry subclasses are updated to use size_t instead of int64_t

When asking for the number of items/elements in a geometry the type should be a size_t
since those values are natively stored as size_t in the underlying classes.

* Fixing String comparisons

* Update mesh based geometry classes to use size_t for index/id type

All instances were updated to a typedef MeshIndexType which is size_t.
Calls in related classes were updated to this API

* Update all index based values in the various Mesh geometries to size_t

Updated HDF5 readers to properly read the values.
All unit tests including python bindings pass their unit tests.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/RESTServer/main.cpp                    |   2 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  22 ++--
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |  10 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |  10 +-
 .../ExtractAttributeArraysFromGeometry.h      |   8 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  10 +-
 .../Testing/Cxx/CopyObjectTest.cpp            | 114 +++++++++---------
 .../Testing/Cxx/CreateGeometryTest.cpp        |  67 +++++-----
 ...ExtractAttributeArraysFromGeometryTest.cpp |  50 ++++----
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   8 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |   2 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |   2 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   2 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   2 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |  12 +-
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |  10 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.cpp |  20 +--
 Source/SIMPLib/Geometry/DerivativeHelpers.h   |  14 +--
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |  54 +++++----
 Source/SIMPLib/Geometry/EdgeGeom.h            |  38 +++---
 Source/SIMPLib/Geometry/GeometryHelpers.h     |   5 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    | 104 ++++++++++------
 Source/SIMPLib/Geometry/HexahedralGeom.h      |  88 +++++++-------
 Source/SIMPLib/Geometry/IGeometry.h           |  16 +--
 Source/SIMPLib/Geometry/IGeometry2D.h         |  35 +++---
 Source/SIMPLib/Geometry/IGeometry3D.h         |  35 +++---
 Source/SIMPLib/Geometry/QuadGeom.cpp          |  80 +++++++-----
 Source/SIMPLib/Geometry/QuadGeom.h            |  56 ++++-----
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   8 +-
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     |  22 ++--
 Source/SIMPLib/Geometry/SharedHexOps.cpp      |  22 ++--
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     |  22 ++--
 Source/SIMPLib/Geometry/SharedTetOps.cpp      |  22 ++--
 Source/SIMPLib/Geometry/SharedTriOps.cpp      |  22 ++--
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |  14 +--
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   | 104 ++++++++++------
 Source/SIMPLib/Geometry/TetrahedralGeom.h     |  88 +++++++-------
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |  63 +++++-----
 Source/SIMPLib/Geometry/TriangleGeom.h        |  54 ++++-----
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   8 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |  24 ++--
 41 files changed, 722 insertions(+), 627 deletions(-)

diff --git a/Source/RESTServer/main.cpp b/Source/RESTServer/main.cpp
index 613538ac52..dd24231930 100644
--- a/Source/RESTServer/main.cpp
+++ b/Source/RESTServer/main.cpp
@@ -142,7 +142,7 @@ int main(int argc, char* argv[])
   ServerSettings serverSettings(config);
 
   HttpSessionStore* sessionStore = HttpSessionStore::CreateInstance(&serverSettings, &app);
-
+  sessionStore = nullptr; // This is here to quiet the compiler about unused variable.
   // Configure static file controller
   SIMPLStaticFileController::CreateInstance(&serverSettings, &app);
 
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 54119589b1..410b47d103 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -394,7 +394,7 @@ void CreateGeometry::dataCheck()
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath1(), cDims);
     cDims[0] = 2;
-    m_EdgesPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(this, getSharedEdgeListArrayPath(), cDims);
+    m_EdgesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedEdgeList, AbstractFilter>(this, getSharedEdgeListArrayPath(), cDims);
     if(m_EdgesPtr.lock())
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
@@ -408,7 +408,7 @@ void CreateGeometry::dataCheck()
     EdgeGeom::Pointer edge = EdgeGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      edge = EdgeGeom::CreateGeometry(std::static_pointer_cast<Int64ArrayType>(m_EdgesPtr.lock()->deepCopy(getInPreflight())),
+      edge = EdgeGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_EdgesPtr.lock()->deepCopy(getInPreflight())),
                                       std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::EdgeGeometry);
     }
     else
@@ -434,7 +434,7 @@ void CreateGeometry::dataCheck()
     QVector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath2(), cDims);
-    m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(this, getSharedTriListArrayPath(), cDims);
+    m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTriList, AbstractFilter>(this, getSharedTriListArrayPath(), cDims);
     if(m_TrisPtr.lock())
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
@@ -448,7 +448,7 @@ void CreateGeometry::dataCheck()
     TriangleGeom::Pointer triangle = TriangleGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      triangle = TriangleGeom::CreateGeometry(std::static_pointer_cast<Int64ArrayType>(m_TrisPtr.lock()->deepCopy(getInPreflight())),
+      triangle = TriangleGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_TrisPtr.lock()->deepCopy(getInPreflight())),
                                               std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::TriangleGeometry);
     }
     else
@@ -475,7 +475,7 @@ void CreateGeometry::dataCheck()
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath3(), cDims);
     cDims[0] = 4;
-    m_QuadsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(this, getSharedQuadListArrayPath(), cDims);
+    m_QuadsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedQuadList, AbstractFilter>(this, getSharedQuadListArrayPath(), cDims);
     if(m_QuadsPtr.lock())
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
@@ -489,7 +489,7 @@ void CreateGeometry::dataCheck()
     QuadGeom::Pointer quadrilateral = QuadGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      quadrilateral = QuadGeom::CreateGeometry(std::static_pointer_cast<Int64ArrayType>(m_QuadsPtr.lock()->deepCopy(getInPreflight())),
+      quadrilateral = QuadGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_QuadsPtr.lock()->deepCopy(getInPreflight())),
                                                std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::QuadGeometry);
     }
     else
@@ -516,7 +516,7 @@ void CreateGeometry::dataCheck()
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath4(), cDims);
     cDims[0] = 4;
-    m_TetsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(this, getSharedTetListArrayPath(), cDims);
+    m_TetsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTetList, AbstractFilter>(this, getSharedTetListArrayPath(), cDims);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -530,7 +530,7 @@ void CreateGeometry::dataCheck()
     TetrahedralGeom::Pointer tetrahedral = TetrahedralGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      tetrahedral = TetrahedralGeom::CreateGeometry(std::static_pointer_cast<Int64ArrayType>(m_TetsPtr.lock()->deepCopy(getInPreflight())),
+      tetrahedral = TetrahedralGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_TetsPtr.lock()->deepCopy(getInPreflight())),
                                                     std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::TetrahedralGeometry);
     }
     else
@@ -558,7 +558,7 @@ void CreateGeometry::dataCheck()
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath5(), cDims);
     cDims[0] = 8;
-    m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(this, getSharedHexListArrayPath(), cDims);
+    m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedHexList, AbstractFilter>(this, getSharedHexListArrayPath(), cDims);
     if (m_HexesPtr.lock())
     {
       m_Hexes = m_HexesPtr.lock()->getPointer(0);
@@ -573,8 +573,8 @@ void CreateGeometry::dataCheck()
     HexahedralGeom::Pointer hexahedral = HexahedralGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      hexahedral = HexahedralGeom::CreateGeometry(std::static_pointer_cast<Int64ArrayType>(m_HexesPtr.lock()->deepCopy(getInPreflight())),
-        std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::HexahedralGeometry);
+      hexahedral = HexahedralGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_HexesPtr.lock()->deepCopy(getInPreflight())),
+                                                  std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::HexahedralGeometry);
     }
     else
     {
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 8c1549b903..7a820ce1d4 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -291,11 +291,11 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   DEFINE_DATAARRAY_VARIABLE(float, XBounds)
   DEFINE_DATAARRAY_VARIABLE(float, YBounds)
   DEFINE_DATAARRAY_VARIABLE(float, ZBounds)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Edges)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Tris)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Quads)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Tets)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Hexes)
+  DEFINE_DATAARRAY_VARIABLE(size_t, Edges)
+  DEFINE_DATAARRAY_VARIABLE(size_t, Tris)
+  DEFINE_DATAARRAY_VARIABLE(size_t, Quads)
+  DEFINE_DATAARRAY_VARIABLE(size_t, Tets)
+  DEFINE_DATAARRAY_VARIABLE(size_t, Hexes)
 
   int64_t m_NumVerts;
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index d53706a638..03455e789f 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -330,7 +330,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 2;
 
-    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedEdgeListArrayPath(), 0, cDims, "", Edge_SharedEdgeID);
+    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedEdgeList, AbstractFilter, MeshIndexType>(this, getSharedEdgeListArrayPath(), 0, cDims, "", Edge_SharedEdgeID);
     if(m_EdgesPtr.lock())
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
@@ -366,7 +366,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       varrays.push_back(m_VertsPtr.lock());
     }
 
-    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTriListArrayPath(), 0, cDims, "", Tri_SharedTriangleID);
+    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTriList, AbstractFilter, MeshIndexType>(this, getSharedTriListArrayPath(), 0, cDims, "", Tri_SharedTriangleID);
     if(m_TrisPtr.lock())
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
@@ -404,7 +404,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedQuadListArrayPath(), 0, cDims, "", Quad_SharedQuadID);
+    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedQuadList, AbstractFilter, MeshIndexType>(this, getSharedQuadListArrayPath(), 0, cDims, "", Quad_SharedQuadID);
     if(m_QuadsPtr.lock())
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
@@ -442,7 +442,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedTetListArrayPath(), 0, cDims, "", Tet_SharedTetID);
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTetList, AbstractFilter, MeshIndexType>(this, getSharedTetListArrayPath(), 0, cDims, "", Tet_SharedTetID);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -480,7 +480,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 8;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(this, getSharedHexListArrayPath(), 0, cDims, "", Hex_SharedHexID);
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedHexList, AbstractFilter, MeshIndexType>(this, getSharedHexListArrayPath(), 0, cDims, "", Hex_SharedHexID);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 0ecaf8b7e8..6535c31fc1 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -218,10 +218,10 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   DEFINE_DATAARRAY_VARIABLE(float, YBounds)
   DEFINE_DATAARRAY_VARIABLE(float, ZBounds)
   DEFINE_DATAARRAY_VARIABLE(float, Verts)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Edges)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Tris)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Quads)
-  DEFINE_DATAARRAY_VARIABLE(int64_t, Tets)
+  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Edges)
+  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Tris)
+  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Quads)
+  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Tets)
 
 public:
   ExtractAttributeArraysFromGeometry(const ExtractAttributeArraysFromGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index b56f9a5fcc..f85a10e34e 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -209,7 +209,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
     EdgeGeom::Pointer edgeGeom = m->getGeometryAs<EdgeGeom>();
     SharedVertexList::Pointer verts = edgeGeom->getVertices();
     outDataPtr->resizeTuples(edgeGeom->getNumberOfVertices());
-    GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
+    GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
   case IGeometry::Type::Triangle:
@@ -217,7 +217,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
     TriangleGeom::Pointer triGeom = m->getGeometryAs<TriangleGeom>();
     SharedVertexList::Pointer verts = triGeom->getVertices();
     outDataPtr->resizeTuples(triGeom->getNumberOfVertices());
-    GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
+    GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
   case IGeometry::Type::Quad:
@@ -225,7 +225,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
     QuadGeom::Pointer quadGeom = m->getGeometryAs<QuadGeom>();
     SharedVertexList::Pointer verts = quadGeom->getVertices();
     outDataPtr->resizeTuples(quadGeom->getNumberOfVertices());
-    GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
+    GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
   case IGeometry::Type::Tetrahedral:
@@ -233,7 +233,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
     TetrahedralGeom::Pointer tets = m->getGeometryAs<TetrahedralGeom>();
     SharedVertexList::Pointer verts = tets->getVertices();
     outDataPtr->resizeTuples(tets->getNumberOfVertices());
-    GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
+    GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
   case IGeometry::Type::Hexahedral:
@@ -241,7 +241,7 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
     HexahedralGeom::Pointer hexas = m->getGeometryAs<HexahedralGeom>();
     SharedVertexList::Pointer verts = hexas->getVertices();
     outDataPtr->resizeTuples(hexas->getNumberOfVertices());
-    GeometryHelpers::Generic::AverageCellArrayValues<int64_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
+    GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
   default:
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 0f9574c659..b2ddffe660 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -344,9 +344,9 @@ class CopyObjectTest
         EdgeGeom::Pointer oldEdgeGeom = std::dynamic_pointer_cast<EdgeGeom>(oldGeom);
         EdgeGeom::Pointer newEdgeGeom = std::dynamic_pointer_cast<EdgeGeom>(newGeom);
 
-        Int64ArrayType::Pointer oldEdges = oldEdgeGeom->getEdges();
-        Int64ArrayType::Pointer newEdges = newEdgeGeom->getEdges();
-        checkDataArray<int64_t>(oldEdges, newEdges, false);
+        SharedEdgeList::Pointer oldEdges = oldEdgeGeom->getEdges();
+        SharedEdgeList::Pointer newEdges = newEdgeGeom->getEdges();
+        checkDataArray<MeshIndexType>(oldEdges, newEdges, false);
 
         FloatArrayType::Pointer oldVertices = oldEdgeGeom->getVertices();
         FloatArrayType::Pointer newVertices = newEdgeGeom->getVertices();
@@ -369,21 +369,21 @@ class CopyObjectTest
         TriangleGeom::Pointer oldTriangleGeom = std::dynamic_pointer_cast<TriangleGeom>(oldGeom);
         TriangleGeom::Pointer newTriangleGeom = std::dynamic_pointer_cast<TriangleGeom>(newGeom);
 
-        Int64ArrayType::Pointer oldTriangles = oldTriangleGeom->getTriangles();
-        Int64ArrayType::Pointer newTriangles = newTriangleGeom->getTriangles();
-        checkDataArray<int64_t>(oldTriangles, newTriangles, false);
+        SharedTriList::Pointer oldTriangles = oldTriangleGeom->getTriangles();
+        SharedTriList::Pointer newTriangles = newTriangleGeom->getTriangles();
+        checkDataArray<MeshIndexType>(oldTriangles, newTriangles, false);
 
         FloatArrayType::Pointer oldVertices = oldTriangleGeom->getVertices();
         FloatArrayType::Pointer newVertices = newTriangleGeom->getVertices();
         checkDataArray<float>(oldVertices, newVertices, false);
 
-        Int64ArrayType::Pointer oldEdges = oldTriangleGeom->getEdges();
-        Int64ArrayType::Pointer newEdges = newTriangleGeom->getEdges();
-        checkDataArray<int64_t>(oldEdges, newEdges, false);
+        SharedEdgeList::Pointer oldEdges = oldTriangleGeom->getEdges();
+        SharedEdgeList::Pointer newEdges = newTriangleGeom->getEdges();
+        checkDataArray<MeshIndexType>(oldEdges, newEdges, false);
 
-        Int64ArrayType::Pointer oldUnsharedEdges = oldTriangleGeom->getUnsharedEdges();
-        Int64ArrayType::Pointer newUnsharedEdges = newTriangleGeom->getUnsharedEdges();
-        checkDataArray<int64_t>(oldUnsharedEdges, newUnsharedEdges, false);
+        SharedEdgeList::Pointer oldUnsharedEdges = oldTriangleGeom->getUnsharedEdges();
+        SharedEdgeList::Pointer newUnsharedEdges = newTriangleGeom->getUnsharedEdges();
+        checkDataArray<MeshIndexType>(oldUnsharedEdges, newUnsharedEdges, false);
 
         ElementDynamicList::Pointer oldElementsContainingVert = oldTriangleGeom->getElementsContainingVert();
         ElementDynamicList::Pointer newElementsContainingVert = newTriangleGeom->getElementsContainingVert();
@@ -402,21 +402,21 @@ class CopyObjectTest
         QuadGeom::Pointer oldQuadGeom = std::dynamic_pointer_cast<QuadGeom>(oldGeom);
         QuadGeom::Pointer newQuadGeom = std::dynamic_pointer_cast<QuadGeom>(newGeom);
 
-        Int64ArrayType::Pointer oldQuads = oldQuadGeom->getQuads();
-        Int64ArrayType::Pointer newQuads = newQuadGeom->getQuads();
-        checkDataArray<int64_t>(oldQuads, newQuads, false);
+        SharedQuadList::Pointer oldQuads = oldQuadGeom->getQuads();
+        SharedQuadList::Pointer newQuads = newQuadGeom->getQuads();
+        checkDataArray<MeshIndexType>(oldQuads, newQuads, false);
 
         FloatArrayType::Pointer oldVertices = oldQuadGeom->getVertices();
         FloatArrayType::Pointer newVertices = newQuadGeom->getVertices();
         checkDataArray<float>(oldVertices, newVertices, false);
 
-        Int64ArrayType::Pointer oldEdges = oldQuadGeom->getEdges();
-        Int64ArrayType::Pointer newEdges = newQuadGeom->getEdges();
-        checkDataArray<int64_t>(oldEdges, newEdges, false);
+        SharedEdgeList::Pointer oldEdges = oldQuadGeom->getEdges();
+        SharedEdgeList::Pointer newEdges = newQuadGeom->getEdges();
+        checkDataArray<MeshIndexType>(oldEdges, newEdges, false);
 
-        Int64ArrayType::Pointer oldUnsharedEdges = oldQuadGeom->getUnsharedEdges();
-        Int64ArrayType::Pointer newUnsharedEdges = newQuadGeom->getUnsharedEdges();
-        checkDataArray<int64_t>(oldUnsharedEdges, newUnsharedEdges, false);
+        SharedEdgeList::Pointer oldUnsharedEdges = oldQuadGeom->getUnsharedEdges();
+        SharedEdgeList::Pointer newUnsharedEdges = newQuadGeom->getUnsharedEdges();
+        checkDataArray<MeshIndexType>(oldUnsharedEdges, newUnsharedEdges, false);
 
         ElementDynamicList::Pointer oldElementsContainingVert = oldQuadGeom->getElementsContainingVert();
         ElementDynamicList::Pointer newElementsContainingVert = newQuadGeom->getElementsContainingVert();
@@ -435,29 +435,29 @@ class CopyObjectTest
         TetrahedralGeom::Pointer oldTetrahedralGeom = std::dynamic_pointer_cast<TetrahedralGeom>(oldGeom);
         TetrahedralGeom::Pointer newTetrahedralGeom = std::dynamic_pointer_cast<TetrahedralGeom>(newGeom);
 
-        Int64ArrayType::Pointer oldTetrahedra = oldTetrahedralGeom->getTetrahedra();
-        Int64ArrayType::Pointer newTetrahedra = newTetrahedralGeom->getTetrahedra();
-        checkDataArray<int64_t>(oldTetrahedra, newTetrahedra, false);
+        SharedTetList::Pointer oldTetrahedra = oldTetrahedralGeom->getTetrahedra();
+        SharedTetList::Pointer newTetrahedra = newTetrahedralGeom->getTetrahedra();
+        checkDataArray<MeshIndexType>(oldTetrahedra, newTetrahedra, false);
 
         FloatArrayType::Pointer oldVertices = oldTetrahedralGeom->getVertices();
         FloatArrayType::Pointer newVertices = newTetrahedralGeom->getVertices();
         checkDataArray<float>(oldVertices, newVertices, false);
 
-        Int64ArrayType::Pointer oldEdges = oldTetrahedralGeom->getEdges();
-        Int64ArrayType::Pointer newEdges = newTetrahedralGeom->getEdges();
-        checkDataArray<int64_t>(oldEdges, newEdges, false);
+        SharedEdgeList::Pointer oldEdges = oldTetrahedralGeom->getEdges();
+        SharedEdgeList::Pointer newEdges = newTetrahedralGeom->getEdges();
+        checkDataArray<MeshIndexType>(oldEdges, newEdges, false);
 
-        Int64ArrayType::Pointer oldUnsharedEdges = oldTetrahedralGeom->getUnsharedEdges();
-        Int64ArrayType::Pointer newUnsharedEdges = newTetrahedralGeom->getUnsharedEdges();
-        checkDataArray<int64_t>(oldUnsharedEdges, newUnsharedEdges, false);
+        SharedEdgeList::Pointer oldUnsharedEdges = oldTetrahedralGeom->getUnsharedEdges();
+        SharedEdgeList::Pointer newUnsharedEdges = newTetrahedralGeom->getUnsharedEdges();
+        checkDataArray<MeshIndexType>(oldUnsharedEdges, newUnsharedEdges, false);
 
-        Int64ArrayType::Pointer oldTriangles = oldTetrahedralGeom->getTriangles();
-        Int64ArrayType::Pointer newTriangles = newTetrahedralGeom->getTriangles();
-        checkDataArray<int64_t>(oldTriangles, newTriangles, false);
+        SharedTriList::Pointer oldTriangles = oldTetrahedralGeom->getTriangles();
+        SharedTriList::Pointer newTriangles = newTetrahedralGeom->getTriangles();
+        checkDataArray<MeshIndexType>(oldTriangles, newTriangles, false);
 
-        Int64ArrayType::Pointer oldUnsharedFaces = oldTetrahedralGeom->getUnsharedFaces();
-        Int64ArrayType::Pointer newUnsharedFaces = newTetrahedralGeom->getUnsharedFaces();
-        checkDataArray<int64_t>(oldUnsharedFaces, newUnsharedFaces, false);
+        SharedTriList::Pointer oldUnsharedFaces = oldTetrahedralGeom->getUnsharedFaces();
+        SharedTriList::Pointer newUnsharedFaces = newTetrahedralGeom->getUnsharedFaces();
+        checkDataArray<MeshIndexType>(oldUnsharedFaces, newUnsharedFaces, false);
 
         ElementDynamicList::Pointer oldElementsContainingVert = oldTetrahedralGeom->getElementsContainingVert();
         ElementDynamicList::Pointer newElementsContainingVert = newTetrahedralGeom->getElementsContainingVert();
@@ -476,29 +476,29 @@ class CopyObjectTest
         HexahedralGeom::Pointer oldHexahedralGeom = std::dynamic_pointer_cast<HexahedralGeom>(oldGeom);
         HexahedralGeom::Pointer newHexahedralGeom = std::dynamic_pointer_cast<HexahedralGeom>(newGeom);
 
-        Int64ArrayType::Pointer oldHexahedra = oldHexahedralGeom->getHexahedra();
-        Int64ArrayType::Pointer newHexahedra = newHexahedralGeom->getHexahedra();
-        checkDataArray<int64_t>(oldHexahedra, newHexahedra, false);
+        SharedHexList::Pointer oldHexahedra = oldHexahedralGeom->getHexahedra();
+        SharedHexList::Pointer newHexahedra = newHexahedralGeom->getHexahedra();
+        checkDataArray<MeshIndexType>(oldHexahedra, newHexahedra, false);
 
         FloatArrayType::Pointer oldVertices = oldHexahedralGeom->getVertices();
         FloatArrayType::Pointer newVertices = newHexahedralGeom->getVertices();
         checkDataArray<float>(oldVertices, newVertices, false);
 
-        Int64ArrayType::Pointer oldEdges = oldHexahedralGeom->getEdges();
-        Int64ArrayType::Pointer newEdges = newHexahedralGeom->getEdges();
-        checkDataArray<int64_t>(oldEdges, newEdges, false);
+        SharedEdgeList::Pointer oldEdges = oldHexahedralGeom->getEdges();
+        SharedEdgeList::Pointer newEdges = newHexahedralGeom->getEdges();
+        checkDataArray<MeshIndexType>(oldEdges, newEdges, false);
 
-        Int64ArrayType::Pointer oldUnsharedEdges = oldHexahedralGeom->getUnsharedEdges();
-        Int64ArrayType::Pointer newUnsharedEdges = newHexahedralGeom->getUnsharedEdges();
-        checkDataArray<int64_t>(oldUnsharedEdges, newUnsharedEdges, false);
+        SharedEdgeList::Pointer oldUnsharedEdges = oldHexahedralGeom->getUnsharedEdges();
+        SharedEdgeList::Pointer newUnsharedEdges = newHexahedralGeom->getUnsharedEdges();
+        checkDataArray<MeshIndexType>(oldUnsharedEdges, newUnsharedEdges, false);
 
-        Int64ArrayType::Pointer oldQuads = oldHexahedralGeom->getQuads();
-        Int64ArrayType::Pointer newQuads = newHexahedralGeom->getQuads();
-        checkDataArray<int64_t>(oldQuads, newQuads, false);
+        SharedQuadList::Pointer oldQuads = oldHexahedralGeom->getQuads();
+        SharedQuadList::Pointer newQuads = newHexahedralGeom->getQuads();
+        checkDataArray<MeshIndexType>(oldQuads, newQuads, false);
 
-        Int64ArrayType::Pointer oldUnsharedFaces = oldHexahedralGeom->getUnsharedFaces();
-        Int64ArrayType::Pointer newUnsharedFaces = newHexahedralGeom->getUnsharedFaces();
-        checkDataArray<int64_t>(oldUnsharedFaces, newUnsharedFaces, false);
+        SharedQuadList::Pointer oldUnsharedFaces = oldHexahedralGeom->getUnsharedFaces();
+        SharedQuadList::Pointer newUnsharedFaces = newHexahedralGeom->getUnsharedFaces();
+        checkDataArray<MeshIndexType>(oldUnsharedFaces, newUnsharedFaces, false);
 
         ElementDynamicList::Pointer oldElementsContainingVert = oldHexahedralGeom->getElementsContainingVert();
         ElementDynamicList::Pointer newElementsContainingVert = newHexahedralGeom->getElementsContainingVert();
@@ -795,10 +795,10 @@ class CopyObjectTest
     // Edge
 
     vertices = {{1.0f, 1.0f, 0.0f}, {3.0f, 1.0f, 0.0f}};
-    std::vector<std::vector<int64_t>> elements = {{0, 1}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1}};
 
     DataArray<float>::Pointer daEdgeVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims2, m_Dims3);
-    DataArray<int64_t>::Pointer daEdgeList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims2);
+    SharedEdgeList::Pointer daEdgeList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims2);
 
     EdgeGeom::Pointer edgeGeom = EdgeGeom::CreateGeometry(daEdgeList, daEdgeVert, SIMPL::Geometry::EdgeGeometry);
 
@@ -808,7 +808,7 @@ class CopyObjectTest
     elements = {{0, 1, 2}};
 
     DataArray<float>::Pointer daTriVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims3, m_Dims3);
-    DataArray<int64_t>::Pointer daTriList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims3);
+    SharedTriList::Pointer daTriList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims3);
 
     TriangleGeom::Pointer triGeom = TriangleGeom::CreateGeometry(daTriList, daTriVert, SIMPL::Geometry::TriangleGeometry);
     triGeom->setName("triGeom");
@@ -819,7 +819,7 @@ class CopyObjectTest
     elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daQuadVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daQuadList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
+    SharedQuadList::Pointer daQuadList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
 
     QuadGeom::Pointer quadGeom = QuadGeom::CreateGeometry(daQuadList, daQuadVert, SIMPL::Geometry::QuadGeometry);
     quadGeom->setName("quadGeom");
@@ -831,7 +831,7 @@ class CopyObjectTest
     elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daTetVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daTetList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
+    SharedTetList::Pointer daTetList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims4);
 
     TetrahedralGeom::Pointer tetGeom = TetrahedralGeom::CreateGeometry(daTetList, daTetVert, SIMPL::Geometry::TetrahedralGeometry);
     tetGeom->setName("tetGeom");
@@ -843,7 +843,7 @@ class CopyObjectTest
     elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
     DataArray<float>::Pointer daHexVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims8, m_Dims3);
-    DataArray<int64_t>::Pointer daHexList = createDataArray<int64_t>(k_ElementListDAName, elements, m_Dims1, m_Dims8);
+    SharedHexList::Pointer daHexList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims8);
 
     HexahedralGeom::Pointer hexGeom = HexahedralGeom::CreateGeometry(daHexList, daHexVert, SIMPL::Geometry::HexahedralGeometry);
     hexGeom->setName("hexGeom");
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index a7d9de3e02..fba1539cb4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -110,11 +110,12 @@ class CreateGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
+  template <typename T>
+  void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
   {
     DREAM3D_REQUIRE_EQUAL(originalData->getSize(), newData->getSize())
 
-    for(int i = 0; i < originalData->getSize(); i++)
+    for(size_t i = 0; i < originalData->getSize(); i++)
     {
       T* valueOld = originalData->getPointer(i);
       T* valueNew = newData->getPointer(i);
@@ -255,7 +256,7 @@ class CreateGeometryTest
   //
   // -----------------------------------------------------------------------------
   void testCase(AbstractFilter::Pointer createGeometry, DataContainer::Pointer dc, AttributeMatrix::Pointer am, IGeometry::Type geomType, FloatArrayType::Pointer daVertices,
-                Int64ArrayType::Pointer daElements, bool treatWarningsAsErrors, bool arrayHandling)
+                MeshIndexArrayType::Pointer daElements, bool treatWarningsAsErrors, bool arrayHandling)
   {
     int geomChoice = 2;
 
@@ -263,11 +264,13 @@ class CreateGeometryTest
     {
       return;
     }
-    else if(geomType == IGeometry::Type::RectGrid)
+
+    if(geomType == IGeometry::Type::RectGrid)
     {
       return;
     }
-    else if(geomType == IGeometry::Type::Vertex)
+
+    if(geomType == IGeometry::Type::Vertex)
     {
       geomChoice = 2;
     }
@@ -323,7 +326,7 @@ class CreateGeometryTest
       DREAM3D_REQUIRE_EQUAL(correctGeom, true)
 
       FloatArrayType::Pointer vert = FloatArrayType::NullPointer();
-      Int64ArrayType::Pointer elements = Int64ArrayType::NullPointer();
+      MeshIndexArrayType::Pointer elements = MeshIndexArrayType::NullPointer();
 
       if(geomType == IGeometry::Type::Vertex)
       {
@@ -336,46 +339,46 @@ class CreateGeometryTest
       {
         EdgeGeom::Pointer edgeGeom = dc->getGeometryAs<EdgeGeom>();
         FloatArrayType::Pointer vert = edgeGeom->getVertices();
-        Int64ArrayType::Pointer edges = edgeGeom->getEdges();
+        SharedEdgeList::Pointer edges = edgeGeom->getEdges();
 
         checkDataArray<float>(vert, daVertices);
-        checkDataArray<int64_t>(edges, daElements);
+        checkDataArray<MeshIndexType>(edges, daElements);
       }
       else if(geomType == IGeometry::Type::Triangle)
       {
         TriangleGeom::Pointer triGeom = dc->getGeometryAs<TriangleGeom>();
         FloatArrayType::Pointer vert = triGeom->getVertices();
-        Int64ArrayType::Pointer triangles = triGeom->getTriangles();
+        SharedTriList::Pointer triangles = triGeom->getTriangles();
 
         checkDataArray<float>(vert, daVertices);
-        checkDataArray<int64_t>(triangles, daElements);
+        checkDataArray<MeshIndexType>(triangles, daElements);
       }
       else if(geomType == IGeometry::Type::Quad)
       {
         QuadGeom::Pointer quadGeom = dc->getGeometryAs<QuadGeom>();
         FloatArrayType::Pointer vert = quadGeom->getVertices();
-        Int64ArrayType::Pointer quads = quadGeom->getQuads();
+        SharedQuadList::Pointer quads = quadGeom->getQuads();
 
         checkDataArray<float>(vert, daVertices);
-        checkDataArray<int64_t>(quads, daElements);
+        checkDataArray<MeshIndexType>(quads, daElements);
       }
       else if(geomType == IGeometry::Type::Tetrahedral)
       {
         TetrahedralGeom::Pointer tetraGeom = dc->getGeometryAs<TetrahedralGeom>();
         FloatArrayType::Pointer vert = tetraGeom->getVertices();
-        Int64ArrayType::Pointer tetrahedra = tetraGeom->getTetrahedra();
+        SharedTetList::Pointer tetrahedra = tetraGeom->getTetrahedra();
 
         checkDataArray<float>(vert, daVertices);
-        checkDataArray<int64_t>(tetrahedra, daElements);
+        checkDataArray<MeshIndexType>(tetrahedra, daElements);
       }
       else if(geomType == IGeometry::Type::Hexahedral)
       {
         HexahedralGeom::Pointer hexaGeom = dc->getGeometryAs<HexahedralGeom>();
         FloatArrayType::Pointer vert = hexaGeom->getVertices();
-        Int64ArrayType::Pointer hexahedra = hexaGeom->getHexahedra();
+        SharedHexList::Pointer hexahedra = hexaGeom->getHexahedra();
 
         checkDataArray<float>(vert, daVertices);
-        checkDataArray<int64_t>(hexahedra, daElements);
+        checkDataArray<MeshIndexType>(hexahedra, daElements);
       }
 
       if(arrayHandling)
@@ -719,7 +722,7 @@ class CreateGeometryTest
 
     // Vertex test cases
 
-    testCase(createGeometry, dc, vertexAM, IGeometry::Type::Vertex, daVert, Int64ArrayType::NullPointer(), false, false);
+    testCase(createGeometry, dc, vertexAM, IGeometry::Type::Vertex, daVert, MeshIndexArrayType::NullPointer(), false, false);
   }
 
   // -----------------------------------------------------------------------------
@@ -756,10 +759,10 @@ class CreateGeometryTest
     // Create Edge Data Arrays
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 0.0f}, {3.0f, 1.0f, 0.0f}};
-    std::vector<std::vector<int64_t>> elements = {{0, 1}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1}};
 
     DataArray<float>::Pointer daEdgeVert = createDataArray<float>(k_EdgeVertexListDAName, vertices, m_Dims2, m_Dims3);
-    DataArray<int64_t>::Pointer daEdgeList = createDataArray<int64_t>(k_EdgeListDAName, elements, m_Dims1, m_Dims2);
+    SharedEdgeList::Pointer daEdgeList = createDataArray<MeshIndexType>(k_EdgeListDAName, elements, m_Dims1, m_Dims2);
     edgeVertexAM->insertOrAssign(daEdgeVert);
     edgeElementAM->insertOrAssign(daEdgeList);
 
@@ -767,7 +770,7 @@ class CreateGeometryTest
 
     elements = {{0, 2}};
 
-    DataArray<int64_t>::Pointer daBadEdgeList = createDataArray<int64_t>(k_BadEdgeListDAName, elements, m_Dims1, m_Dims2);
+    SharedEdgeList::Pointer daBadEdgeList = createDataArray<MeshIndexType>(k_BadEdgeListDAName, elements, m_Dims1, m_Dims2);
     edgeElementAM->insertOrAssign(daBadEdgeList);
 
     // Create Filter
@@ -872,10 +875,10 @@ class CreateGeometryTest
     // Create Triangle Data Arrays
 
     std::vector<std::vector<float>> vertices = {{1.0, 1.0, 0.0}, {3.0, 1.0, 0.0}, {2.0, 3.0, 0.0}};
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2}};
 
     DataArray<float>::Pointer daTriVert = createDataArray<float>(k_TriVertexListDAName, vertices, m_Dims3, m_Dims3);
-    DataArray<int64_t>::Pointer daTriList = createDataArray<int64_t>(k_TriListDAName, elements, m_Dims1, m_Dims3);
+    SharedTriList::Pointer daTriList = createDataArray<MeshIndexType>(k_TriListDAName, elements, m_Dims1, m_Dims3);
     triVertexAM->insertOrAssign(daTriVert);
     triElementAM->insertOrAssign(daTriList);
 
@@ -883,7 +886,7 @@ class CreateGeometryTest
 
     elements = {{0, 3, 2}};
 
-    DataArray<int64_t>::Pointer daBadTriList = createDataArray<int64_t>(k_BadTriListDAName, elements, m_Dims1, m_Dims3);
+    SharedTriList::Pointer daBadTriList = createDataArray<MeshIndexType>(k_BadTriListDAName, elements, m_Dims1, m_Dims3);
     triElementAM->insertOrAssign(daBadTriList);
 
     // Create Filter
@@ -988,10 +991,10 @@ class CreateGeometryTest
     // Create Quadrilateral Data Arrays
 
     std::vector<std::vector<float>> vertices = {{1.0, 1.0, 0.0}, {3.0, 1.0, 0.0}, {2.0, 3.0, 0.0}, {2.0, 2.0, 0.0}};
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daQuadVert = createDataArray<float>(k_QuadVertexListDAName, vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daQuadList = createDataArray<int64_t>(k_QuadListDAName, elements, m_Dims1, m_Dims4);
+    SharedQuadList::Pointer daQuadList = createDataArray<MeshIndexType>(k_QuadListDAName, elements, m_Dims1, m_Dims4);
     quadVertexAM->insertOrAssign(daQuadVert);
     quadElementAM->insertOrAssign(daQuadList);
 
@@ -999,7 +1002,7 @@ class CreateGeometryTest
 
     elements = {{0, 1, 7, 3}};
 
-    DataArray<int64_t>::Pointer daBadQuadList = createDataArray<int64_t>(k_BadQuadListDAName, elements, m_Dims1, m_Dims4);
+    SharedQuadList::Pointer daBadQuadList = createDataArray<MeshIndexType>(k_BadQuadListDAName, elements, m_Dims1, m_Dims4);
     quadElementAM->insertOrAssign(daBadQuadList);
 
     // Create Filter
@@ -1105,10 +1108,10 @@ class CreateGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daTetVert = createDataArray<float>(k_TetVertexListDAName, vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daTetList = createDataArray<int64_t>(k_TetListDAName, elements, m_Dims1, m_Dims4);
+    SharedTetList::Pointer daTetList = createDataArray<MeshIndexType>(k_TetListDAName, elements, m_Dims1, m_Dims4);
     tetVertexAM->insertOrAssign(daTetVert);
     tetElementAM->insertOrAssign(daTetList);
 
@@ -1116,7 +1119,7 @@ class CreateGeometryTest
 
     elements = {{0, 10, 2, 3}};
 
-    DataArray<int64_t>::Pointer daBadTetList = createDataArray<int64_t>(k_BadTetListDAName, elements, m_Dims1, m_Dims4);
+    SharedTetList::Pointer daBadTetList = createDataArray<MeshIndexType>(k_BadTetListDAName, elements, m_Dims1, m_Dims4);
     tetElementAM->insertOrAssign(daBadTetList);
 
     // Create Filter
@@ -1222,10 +1225,10 @@ class CreateGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
     DataArray<float>::Pointer daHexVert = createDataArray<float>(k_HexVertexListDAName, vertices, m_Dims8, m_Dims3);
-    DataArray<int64_t>::Pointer daHexList = createDataArray<int64_t>(k_HexListDAName, elements, m_Dims1, m_Dims8);
+    SharedHexList::Pointer daHexList = createDataArray<MeshIndexType>(k_HexListDAName, elements, m_Dims1, m_Dims8);
     hexVertexAM->insertOrAssign(daHexVert);
     hexElementAM->insertOrAssign(daHexList);
 
@@ -1233,7 +1236,7 @@ class CreateGeometryTest
 
     elements = {{0, 1, 2, 32, 4, 5, 6, 7}};
 
-    DataArray<int64_t>::Pointer daBadHexList = createDataArray<int64_t>(k_BadHexListDAName, elements, m_Dims1, m_Dims8);
+    SharedHexList::Pointer daBadHexList = createDataArray<MeshIndexType>(k_BadHexListDAName, elements, m_Dims1, m_Dims8);
     hexElementAM->insertOrAssign(daBadHexList);
 
     // Create Filter
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index b8dd7aa064..ae6b7a926c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -329,10 +329,10 @@ class ExtractAttributeArraysFromGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0, 1.0, 0.0}, {3.0, 1.0, 0.0}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>("Vertices", vertices, m_Dims2, m_Dims3);
-    DataArray<int64_t>::Pointer daList = createDataArray<int64_t>("List", elements, m_Dims1, m_Dims2);
+    SharedEdgeList::Pointer daList = createDataArray<MeshIndexType>("List", elements, m_Dims1, m_Dims2);
 
     EdgeGeom::Pointer geom = EdgeGeom::CreateGeometry(daList, daVert, SIMPL::Geometry::EdgeGeometry);
 
@@ -378,13 +378,13 @@ class ExtractAttributeArraysFromGeometryTest
     DREAM3D_REQUIRE_EQUAL(elementNames.contains(k_ElementListDAName), true)
 
     FloatArrayType::Pointer originalVertices = geom->getVertices();
-    Int64ArrayType::Pointer originalConnectivity = geom->getEdges();
+    SharedEdgeList::Pointer originalConnectivity = geom->getEdges();
 
     FloatArrayType::Pointer newVertices = vertexAM->getAttributeArrayAs<FloatArrayType>(k_VerticesDAName);
-    Int64ArrayType::Pointer newConnectivity = elementAM->getAttributeArrayAs<Int64ArrayType>(k_ElementListDAName);
+    SharedEdgeList::Pointer newConnectivity = elementAM->getAttributeArrayAs<SharedEdgeList>(k_ElementListDAName);
 
     checkDataArray<float>(originalVertices, newVertices);
-    checkDataArray<int64_t>(originalConnectivity, newConnectivity);
+    checkDataArray<MeshIndexType>(originalConnectivity, newConnectivity);
   }
 
   // -----------------------------------------------------------------------------
@@ -417,10 +417,10 @@ class ExtractAttributeArraysFromGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0, 1.0, 0.0}, {3.0, 1.0, 0.0}, {2.0, 3.0, 0.0}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>("Vertices", vertices, m_Dims3, m_Dims3);
-    DataArray<int64_t>::Pointer daList = createDataArray<int64_t>("List", elements, m_Dims1, m_Dims3);
+    SharedTriList::Pointer daList = createDataArray<MeshIndexType>("List", elements, m_Dims1, m_Dims3);
 
     TriangleGeom::Pointer geom = TriangleGeom::CreateGeometry(daList, daVert, SIMPL::Geometry::TriangleGeometry);
 
@@ -466,13 +466,13 @@ class ExtractAttributeArraysFromGeometryTest
     DREAM3D_REQUIRE_EQUAL(elementNames.contains(k_ElementListDAName), true)
 
     FloatArrayType::Pointer originalVertices = geom->getVertices();
-    Int64ArrayType::Pointer originalConnectivity = geom->getTriangles();
+    SharedTriList::Pointer originalConnectivity = geom->getTriangles();
 
     FloatArrayType::Pointer newVertices = vertexAM->getAttributeArrayAs<FloatArrayType>(k_VerticesDAName);
-    Int64ArrayType::Pointer newConnectivity = elementAM->getAttributeArrayAs<Int64ArrayType>(k_ElementListDAName);
+    SharedTriList::Pointer newConnectivity = elementAM->getAttributeArrayAs<SharedTriList>(k_ElementListDAName);
 
     checkDataArray<float>(originalVertices, newVertices);
-    checkDataArray<int64_t>(originalConnectivity, newConnectivity);
+    checkDataArray<MeshIndexType>(originalConnectivity, newConnectivity);
   }
 
   // -----------------------------------------------------------------------------
@@ -505,10 +505,10 @@ class ExtractAttributeArraysFromGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0, 1.0, 0.0}, {3.0, 1.0, 0.0}, {2.0, 3.0, 0.0}, {2.0, 2.0, 0.0}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>("Vertices", vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daList = createDataArray<int64_t>("List", elements, m_Dims1, m_Dims4);
+    SharedQuadList::Pointer daList = createDataArray<MeshIndexType>("List", elements, m_Dims1, m_Dims4);
 
     QuadGeom::Pointer geom = QuadGeom::CreateGeometry(daList, daVert, SIMPL::Geometry::QuadGeometry);
 
@@ -554,13 +554,13 @@ class ExtractAttributeArraysFromGeometryTest
     DREAM3D_REQUIRE_EQUAL(elementNames.contains(k_ElementListDAName), true)
 
     FloatArrayType::Pointer originalVertices = geom->getVertices();
-    Int64ArrayType::Pointer originalConnectivity = geom->getQuads();
+    SharedQuadList::Pointer originalConnectivity = geom->getQuads();
 
     FloatArrayType::Pointer newVertices = vertexAM->getAttributeArrayAs<FloatArrayType>(k_VerticesDAName);
-    Int64ArrayType::Pointer newConnectivity = elementAM->getAttributeArrayAs<Int64ArrayType>(k_ElementListDAName);
+    SharedQuadList::Pointer newConnectivity = elementAM->getAttributeArrayAs<SharedQuadList>(k_ElementListDAName);
 
     checkDataArray<float>(originalVertices, newVertices);
-    checkDataArray<int64_t>(originalConnectivity, newConnectivity);
+    checkDataArray<MeshIndexType>(originalConnectivity, newConnectivity);
   }
 
   // -----------------------------------------------------------------------------
@@ -593,10 +593,10 @@ class ExtractAttributeArraysFromGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>("Vertices", vertices, m_Dims4, m_Dims3);
-    DataArray<int64_t>::Pointer daList = createDataArray<int64_t>("List", elements, m_Dims1, m_Dims4);
+    SharedTetList::Pointer daList = createDataArray<MeshIndexType>("List", elements, m_Dims1, m_Dims4);
 
     TetrahedralGeom::Pointer geom = TetrahedralGeom::CreateGeometry(daList, daVert, SIMPL::Geometry::TetrahedralGeometry);
 
@@ -642,13 +642,13 @@ class ExtractAttributeArraysFromGeometryTest
     DREAM3D_REQUIRE_EQUAL(elementNames.contains(k_ElementListDAName), true)
 
     FloatArrayType::Pointer originalVertices = geom->getVertices();
-    Int64ArrayType::Pointer originalConnectivity = geom->getTetrahedra();
+    SharedTetList::Pointer originalConnectivity = geom->getTetrahedra();
 
     FloatArrayType::Pointer newVertices = vertexAM->getAttributeArrayAs<FloatArrayType>(k_VerticesDAName);
-    Int64ArrayType::Pointer newConnectivity = elementAM->getAttributeArrayAs<Int64ArrayType>(k_ElementListDAName);
+    SharedTetList::Pointer newConnectivity = elementAM->getAttributeArrayAs<SharedTetList>(k_ElementListDAName);
 
     checkDataArray<float>(originalVertices, newVertices);
-    checkDataArray<int64_t>(originalConnectivity, newConnectivity);
+    checkDataArray<MeshIndexType>(originalConnectivity, newConnectivity);
   }
 
   // -----------------------------------------------------------------------------
@@ -681,10 +681,10 @@ class ExtractAttributeArraysFromGeometryTest
 
     std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
 
-    std::vector<std::vector<int64_t>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
     DataArray<float>::Pointer daVert = createDataArray<float>("Vertices", vertices, m_Dims8, m_Dims3);
-    DataArray<int64_t>::Pointer daList = createDataArray<int64_t>("List", elements, m_Dims1, m_Dims8);
+    SharedHexList::Pointer daList = createDataArray<MeshIndexType>("List", elements, m_Dims1, m_Dims8);
 
     HexahedralGeom::Pointer geom = HexahedralGeom::CreateGeometry(daList, daVert, SIMPL::Geometry::HexahedralGeometry);
 
@@ -730,13 +730,13 @@ class ExtractAttributeArraysFromGeometryTest
     DREAM3D_REQUIRE_EQUAL(elementNames.contains(k_ElementListDAName), true)
 
     FloatArrayType::Pointer originalVertices = geom->getVertices();
-    Int64ArrayType::Pointer originalConnectivity = geom->getHexahedra();
+    SharedHexList::Pointer originalConnectivity = geom->getHexahedra();
 
     FloatArrayType::Pointer newVertices = vertexAM->getAttributeArrayAs<FloatArrayType>(k_VerticesDAName);
-    Int64ArrayType::Pointer newConnectivity = elementAM->getAttributeArrayAs<Int64ArrayType>(k_ElementListDAName);
+    SharedHexList::Pointer newConnectivity = elementAM->getAttributeArrayAs<SharedHexList>(k_ElementListDAName);
 
     checkDataArray<float>(originalVertices, newVertices);
-    checkDataArray<int64_t>(originalConnectivity, newConnectivity);
+    checkDataArray<MeshIndexType>(originalConnectivity, newConnectivity);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index bb0d48a882..6b43fcc34e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -228,10 +228,10 @@ class FindDerivativesFilterTest
     float* verts3 = vertices3->getPointer(0);
     float* verts4 = vertices4->getPointer(0);
     float* verts5 = vertices5->getPointer(0);
-    int64_t* edge = edges->getEdgePointer(0);
-    int64_t* tri = tris->getTriPointer(0);
-    int64_t* quad = quads->getQuadPointer(0);
-    int64_t* tet = tets->getTetPointer(0);
+    MeshIndexType* edge = edges->getEdgePointer(0);
+    MeshIndexType* tri = tris->getTriPointer(0);
+    MeshIndexType* quad = quads->getQuadPointer(0);
+    MeshIndexType* tet = tets->getTetPointer(0);
 
     for(size_t i = 0; i < 3; i++) // first vertex at (0,0,0)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index ff2fce2bbf..27e52ba750 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -96,7 +96,7 @@ class RequiredZThicknessTest
 
     QVector<size_t> dims2;
     dims2.push_back(3);
-    DataArray<int64_t>::Pointer tris = DataArray<int64_t>::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index d1c423a6d5..affe9a8841 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -106,7 +106,7 @@ class ScaleVolumeTest
 
     QVector<size_t> dims2;
     dims2.push_back(3);
-    DataArray<int64_t>::Pointer tris = DataArray<int64_t>::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 76d37951cc..b78876fb85 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -105,7 +105,7 @@ class SetOriginResolutionImageGeomTest
 
     QVector<size_t> dims2;
     dims2.push_back(3);
-    DataArray<int64_t>::Pointer tris = DataArray<int64_t>::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 1af2f35492..6eefaae913 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -139,7 +139,7 @@ class WriteTriangleGeometryTest
       }
     }
 
-    Int64ArrayType::Pointer daTriList = Int64ArrayType::CreateArray(k_NumTriangles, k_Dims3, k_TriListDAName);
+    SharedTriList::Pointer daTriList = SharedTriList::CreateArray(k_NumTriangles, k_Dims3, k_TriListDAName);
     for (size_t i = 0; i < daTriList->getNumberOfTuples(); i++)
     {
       for (int j = 0; j < daTriList->getNumberOfComponents(); j++)
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index a2bce89829..04787b1d4f 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -180,11 +180,11 @@ void WriteTriangleGeometry::execute()
   TriangleGeom::Pointer triangleGeom = dataContainer->getGeometryAs<TriangleGeom>();
   QString geometryType = triangleGeom->getGeometryTypeAsString();
   float* nodes = triangleGeom->getVertexPointer(0);
-  int64_t* triangles = triangleGeom->getTriPointer(0);
+  size_t* triangles = triangleGeom->getTriPointer(0);
 
-  int64_t numNodes = triangleGeom->getNumberOfVertices();
-  int64_t maxNodeId = numNodes - 1;
-  int64_t numTriangles = triangleGeom->getNumberOfTris();
+  size_t numNodes = triangleGeom->getNumberOfVertices();
+  size_t maxNodeId = numNodes - 1;
+  size_t numTriangles = triangleGeom->getNumberOfTris();
 
   // ++++++++++++++ Write the Nodes File +++++++++++++++++++++++++++++++++++++++++++
   // Make sure any directory path is also available as the user may have just typed
@@ -222,7 +222,7 @@ void WriteTriangleGeometry::execute()
   outFileNodes.setRealNumberPrecision(5);
   outFileNodes.setRealNumberNotation(QTextStream::FixedNotation);
 
-  for(int64_t i = 0; i < numNodes; i++)
+  for(size_t i = 0; i < numNodes; i++)
   {
     outFileNodes.setFieldWidth(8);
     outFileNodes << nodes[i * 3] << qSetFieldWidth(0);
@@ -270,7 +270,7 @@ void WriteTriangleGeometry::execute()
   outFileTri << "Triangle Count: " << numTriangles << "\n";
 
   int n1, n2, n3;
-  for(int64_t j = 0; j < numTriangles; ++j)
+  for(size_t j = 0; j < numTriangles; ++j)
   {
     n1 = triangles[j * 3];
     n2 = triangles[j * 3 + 1];
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 41664fc21f..8a1823d85e 100755
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -289,11 +289,7 @@ template <typename T, typename K> class DynamicListArray
   }
 
 protected:
-  DynamicListArray()
-  : m_Array(nullptr)
-  , m_Size(0)
-  {
-  }
+  DynamicListArray() = default;
 
   //----------------------------------------------------------------------------
   // This will allocate memory to hold all the NeighborList structures where each
@@ -328,8 +324,8 @@ template <typename T, typename K> class DynamicListArray
   }
 
 private:
-  ElementList* m_Array; // pointer to data
-  size_t m_Size;
+  ElementList* m_Array = nullptr; // pointer to data
+  size_t m_Size = 0;
 };
 
 typedef DynamicListArray<int32_t, int32_t> Int32Int32DynamicListArray;
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
index 47e96e3435..65e40f7a46 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
@@ -66,14 +66,14 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DerivativeHelpers::EdgeDeriv::operator()(EdgeGeom* edges, int64_t edgeId, double values[2], double derivs[3])
+void DerivativeHelpers::EdgeDeriv::operator()(EdgeGeom* edges, size_t edgeId, double values[2], double derivs[3])
 {
   float vert0_f[3] = {0.0f, 0.0f, 0.0f};
   float vert1_f[3] = {0.0f, 0.0f, 0.0f};
   double vert0[3] = {0.0, 0.0, 0.0};
   double vert1[3] = {0.0, 0.0, 0.0};
   double delta[3] = {0.0, 0.0, 0.0};
-  int64_t verts[2] = {0, 0};
+  size_t verts[2] = {0, 0};
 
   edges->getVertsAtEdge(edgeId, verts);
   edges->getCoords(verts[0], vert0_f);
@@ -103,7 +103,7 @@ void DerivativeHelpers::EdgeDeriv::operator()(EdgeGeom* edges, int64_t edgeId, d
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DerivativeHelpers::TriangleDeriv::operator()(TriangleGeom* triangles, int64_t triId, double values[3], double derivs[3])
+void DerivativeHelpers::TriangleDeriv::operator()(TriangleGeom* triangles, size_t triId, double values[3], double derivs[3])
 {
   float vert0_f[3] = {0.0f, 0.0f, 0.0f};
   float vert1_f[3] = {0.0f, 0.0f, 0.0f};
@@ -124,7 +124,7 @@ void DerivativeHelpers::TriangleDeriv::operator()(TriangleGeom* triangles, int64
   double sum[2] = {0.0, 0.0};
   double dBydx = 0.0;
   double dBydy = 0.0;
-  int64_t verts[3] = {0, 0, 0};
+  size_t verts[3] = {0, 0, 0};
 
   triangles->getVertsAtTri(triId, verts);
   triangles->getCoords(verts[0], vert0_f);
@@ -206,7 +206,7 @@ void DerivativeHelpers::TriangleDeriv::operator()(TriangleGeom* triangles, int64
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DerivativeHelpers::QuadDeriv::operator()(QuadGeom* quads, int64_t quadId, double values[4], double derivs[3])
+void DerivativeHelpers::QuadDeriv::operator()(QuadGeom* quads, size_t quadId, double values[4], double derivs[3])
 {
   float vert0_f[3] = {0.0f, 0.0f, 0.0f};
   float vert1_f[3] = {0.0f, 0.0f, 0.0f};
@@ -232,7 +232,7 @@ void DerivativeHelpers::QuadDeriv::operator()(QuadGeom* quads, int64_t quadId, d
   double sum[2] = {0.0, 0.0};
   double dBydx = 0.0;
   double dBydy = 0.0;
-  int64_t verts[4] = {0, 0, 0, 0};
+  size_t verts[4] = {0, 0, 0, 0};
 
   quads->getVertsAtQuad(quadId, verts);
   quads->getCoords(verts[0], vert0_f);
@@ -336,10 +336,10 @@ void DerivativeHelpers::QuadDeriv::operator()(QuadGeom* quads, int64_t quadId, d
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DerivativeHelpers::TetDeriv::operator()(TetrahedralGeom* tets, int64_t tetId, double values[4], double derivs[3])
+void DerivativeHelpers::TetDeriv::operator()(TetrahedralGeom* tets, size_t tetId, double values[4], double derivs[3])
 {
   double shapeFunctions[12] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
-  int64_t verts[4] = {0, 0, 0, 0};
+  size_t verts[4] = {0, 0, 0, 0};
   double sum[3] = {0.0, 0.0, 0.0};
 
   tets->getShapeFunctions(nullptr, shapeFunctions);
@@ -397,11 +397,11 @@ void DerivativeHelpers::TetDeriv::operator()(TetrahedralGeom* tets, int64_t tetI
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DerivativeHelpers::HexDeriv::operator()(HexahedralGeom* hexas, int64_t hexId, double values[8], double derivs[3])
+void DerivativeHelpers::HexDeriv::operator()(HexahedralGeom* hexas, size_t hexId, double values[8], double derivs[3])
 {
   double shapeFunctions[24] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
                                0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
-  int64_t verts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+  size_t verts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
   double sum[3] = {0.0, 0.0, 0.0};
   double pCoords[3] = {0.0, 0.0, 0.0};
 
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.h b/Source/SIMPLib/Geometry/DerivativeHelpers.h
index 52bfab8825..8e5e44edb9 100755
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.h
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.h
@@ -80,7 +80,7 @@ using HexJacobian = Eigen::Matrix<double, 3, 3, Eigen::RowMajor>;
 class EdgeDeriv
 {
 public:
-  void operator()(EdgeGeom* edges, int64_t edgeId, double values[2], double derivs[3]);
+  void operator()(EdgeGeom* edges, size_t edgeId, double values[2], double derivs[3]);
   };
 
   /**
@@ -89,8 +89,7 @@ class EdgeDeriv
   class TriangleDeriv
   {
     public:
-
-      void operator()(TriangleGeom* triangles, int64_t triId, double values[3], double derivs[3]);
+      void operator()(TriangleGeom* triangles, size_t triId, double values[3], double derivs[3]);
   };
 
   /**
@@ -99,8 +98,7 @@ class EdgeDeriv
   class QuadDeriv
   {
     public:
-
-      void operator()(QuadGeom* quads, int64_t quadId, double values[4], double derivs[3]);
+      void operator()(QuadGeom* quads, size_t quadId, double values[4], double derivs[3]);
   };
 
   /**
@@ -109,8 +107,7 @@ class EdgeDeriv
   class TetDeriv
   {
     public:
-
-      void operator()(TetrahedralGeom* tets, int64_t tetId, double values[4], double derivs[3]);
+      void operator()(TetrahedralGeom* tets, size_t tetId, double values[4], double derivs[3]);
   };
 
   /**
@@ -119,8 +116,7 @@ class EdgeDeriv
   class HexDeriv
   {
     public:
-
-      void operator()(HexahedralGeom* hexas, int64_t hexId, double values[8], double derivs[3]);
+      void operator()(HexahedralGeom* hexas, size_t hexId, double values[8], double derivs[3]);
   };
 
 }
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index f60fe0fd54..8ac86c97a7 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -63,7 +63,7 @@
 class FindEdgeDerivativesImpl
 {
 public:
-  FindEdgeDerivativesImpl(EdgeGeom* edges, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindEdgeDerivativesImpl(EdgeGeom* edges, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Edges(edges)
   , m_Field(field)
   , m_Derivatives(derivs)
@@ -71,20 +71,20 @@ class FindEdgeDerivativesImpl
   }
   virtual ~FindEdgeDerivativesImpl() = default;
 
-  void compute(int64_t start, int64_t end) const
+  void compute(size_t start, size_t end) const
   {
     int32_t cDims = m_Field->getNumberOfComponents();
     double* fieldPtr = m_Field->getPointer(0);
     double* derivsPtr = m_Derivatives->getPointer(0);
     double values[2] = {0.0, 0.0};
     double derivs[3] = {0.0, 0.0, 0.0};
-    int64_t verts[2] = {0, 0};
+    size_t verts[2] = {0, 0};
 
-    int64_t counter = 0;
-    int64_t totalElements = m_Edges->getNumberOfEdges();
-    int64_t progIncrement = static_cast<int64_t>(totalElements / 100);
+    size_t counter = 0;
+    size_t totalElements = m_Edges->getNumberOfEdges();
+    size_t progIncrement = static_cast<size_t>(totalElements / 100);
 
-    for(int64_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       m_Edges->getVertsAtEdge(i, verts);
       for(size_t j = 0; j < cDims; j++)
@@ -109,7 +109,7 @@ class FindEdgeDerivativesImpl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<int64_t>& r) const
+  void operator()(const tbb::blocked_range<size_t>& r) const
   {
     compute(r.begin(), r.end());
   }
@@ -147,7 +147,7 @@ EdgeGeom::~EdgeGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-EdgeGeom::Pointer EdgeGeom::CreateGeometry(int64_t numEdges, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
+EdgeGeom::Pointer EdgeGeom::CreateGeometry(size_t numEdges, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -206,7 +206,7 @@ void EdgeGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
     // EdgeGeom can only accept vertex or edge Attribute Matrices
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfVertices())
+  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
   {
     return;
   }
@@ -235,7 +235,7 @@ size_t EdgeGeom::getNumberOfElements()
 int EdgeGeom::findElementsContainingVert()
 {
   m_EdgesContainingVert = ElementDynamicList::New();
-  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, int64_t>(m_EdgeList, m_EdgesContainingVert, getNumberOfVertices());
+  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, size_t>(m_EdgeList, m_EdgesContainingVert, getNumberOfVertices());
   if(m_EdgesContainingVert.get() == nullptr)
   {
     return -1;
@@ -282,7 +282,7 @@ int EdgeGeom::findElementNeighbors()
     }
   }
   m_EdgeNeighbors = ElementDynamicList::New();
-  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, int64_t>(m_EdgeList, m_EdgesContainingVert, m_EdgeNeighbors, IGeometry::Type::Edge);
+  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, size_t>(m_EdgeList, m_EdgesContainingVert, m_EdgeNeighbors, IGeometry::Type::Edge);
   if(m_EdgeNeighbors.get() == nullptr)
   {
     err = -1;
@@ -321,7 +321,7 @@ int EdgeGeom::findElementCentroids()
 {
   QVector<size_t> cDims(1, 3);
   m_EdgeCentroids = FloatArrayType::CreateArray(getNumberOfElements(), cDims, SIMPL::StringConstants::EdgeCentroids);
-  GeometryHelpers::Topology::FindElementCentroids<int64_t>(m_EdgeList, m_VertexList, m_EdgeCentroids);
+  GeometryHelpers::Topology::FindElementCentroids<size_t>(m_EdgeList, m_VertexList, m_EdgeCentroids);
   if(m_EdgeCentroids.get() == nullptr)
   {
     return -1;
@@ -364,7 +364,7 @@ int EdgeGeom::findElementSizes()
   float vert0[3] = {0.0f, 0.0f, 0.0f};
   float vert1[3] = {0.0f, 0.0f, 0.0f};
 
-  for(int64_t i = 0; i < getNumberOfEdges(); i++)
+  for(size_t i = 0; i < getNumberOfEdges(); i++)
   {
     getVertCoordsAtEdge(i, vert0, vert1);
     float length = 0.0f;
@@ -429,7 +429,7 @@ void EdgeGeom::getShapeFunctions(double pCoords[3], double* shape)
 void EdgeGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  int64_t numEdges = getNumberOfEdges();
+  size_t numEdges = getNumberOfEdges();
 
   if(observable != nullptr)
   {
@@ -444,7 +444,7 @@ void EdgeGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   if(doParallel)
   {
-    tbb::parallel_for(tbb::blocked_range<int64_t>(0, numEdges), FindEdgeDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, numEdges), FindEdgeDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
   }
   else
 #endif
@@ -500,7 +500,7 @@ int EdgeGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
   if(m_EdgeNeighbors.get() != nullptr)
   {
     size_t numEdges = static_cast<size_t>(getNumberOfEdges());
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_EdgeNeighbors, numEdges, SIMPL::StringConstants::EdgeNeighbors);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_EdgeNeighbors, numEdges, SIMPL::StringConstants::EdgeNeighbors);
     if(err < 0)
     {
       return err;
@@ -510,7 +510,7 @@ int EdgeGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
   if(m_EdgesContainingVert.get() != nullptr)
   {
     size_t numVerts = static_cast<size_t>(getNumberOfVertices());
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_EdgesContainingVert, numVerts, SIMPL::StringConstants::EdgesContainingVert);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_EdgesContainingVert, numVerts, SIMPL::StringConstants::EdgesContainingVert);
     if(err < 0)
     {
       return err;
@@ -584,10 +584,10 @@ QString EdgeGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Edges</th><td>" << getNumberOfEdges() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Vertices</th><td>" << getNumberOfVertices() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Edges</th><td>)" << getNumberOfEdges() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
     ss << "</tbody></table>";
   }
   else
@@ -603,7 +603,13 @@ int EdgeGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer edges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(edges.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
@@ -620,13 +626,13 @@ int EdgeGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   {
     return -1;
   }
-  ElementDynamicList::Pointer edgeNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::EdgeNeighbors, parentId, numEdges, preflight, err);
+  ElementDynamicList::Pointer edgeNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::EdgeNeighbors, parentId, numEdges, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
   ElementDynamicList::Pointer edgesContainingVert =
-      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::EdgesContainingVert, parentId, numVerts, preflight, err);
+      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::EdgesContainingVert, parentId, numVerts, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index a53d285508..5a8038bf34 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -46,7 +46,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   // clang-format off
   PYB11_CREATE_BINDINGS(EdgeGeom SUPERCLASS IGeometry)
 
-  PYB11_CREATION(CreateGeometry ARGS int64_t SharedVertexList::Pointer QString bool)
+  PYB11_CREATION(CreateGeometry ARGS size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedEdgeList::Pointer SharedVertexList::Pointer QString)
 
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
@@ -55,11 +55,11 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
 
-  PYB11_METHOD(void setCoords int64_t,vertId float,coords[3])
-  PYB11_METHOD(void getCoords int64_t,vertId float,coords[3])
+  PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
+  PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
 
-  PYB11_METHOD(int64_t getNumberOfVertices)
-  PYB11_METHOD(int64_t getNumberOfEdges)
+  PYB11_METHOD(size_t getNumberOfVertices)
+  PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_METHOD(size_t getNumberOfElements)
   // clang-format on
 
@@ -77,7 +77,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(int64_t numEdges, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
+  static Pointer CreateGeometry(size_t numEdges, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateGeometry
@@ -97,13 +97,13 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param numVertices
    * @return
    */
-  static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
   /**
    * @brief resizeVertexList
    * @param newNumVertices
    */
-  void resizeVertexList(int64_t newNumVertices);
+  void resizeVertexList(size_t newNumVertices);
 
   /**
    * @brief setVertices
@@ -122,27 +122,27 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param vertId
    * @param coords
    */
-  void setCoords(int64_t vertId, float coords[3]);
+  void setCoords(size_t vertId, float coords[3]);
 
   /**
    * @brief getCoords
    * @param vertId
    * @param coords
    */
-  void getCoords(int64_t vertId, float coords[3]);
+  void getCoords(size_t vertId, float coords[3]);
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(int64_t i);
+  float* getVertexPointer(size_t i);
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  int64_t getNumberOfVertices();
+  size_t getNumberOfVertices();
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedEdgeOps
@@ -153,13 +153,13 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param numEdges
    * @return
    */
-  static SharedEdgeList::Pointer CreateSharedEdgeList(int64_t numEdges, bool allocate = true);
+  static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
 
   /**
    * @brief resizeEdgeList
    * @param newNumEdges
    */
-  void resizeEdgeList(int64_t newNumEdges);
+  void resizeEdgeList(size_t newNumEdges);
 
   /**
    * @brief setEdges
@@ -178,14 +178,14 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param edgeId
    * @param verts
    */
-  void setVertsAtEdge(int64_t edgeId, int64_t verts[2]);
+  void setVertsAtEdge(size_t edgeId, size_t verts[2]);
 
   /**
    * @brief getVerts
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(int64_t edgeId, int64_t verts[2]);
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]);
 
   /**
    * @brief getVertCoordsAtEdge
@@ -193,20 +193,20 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]);
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]);
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  int64_t* getEdgePointer(int64_t i);
+  size_t* getEdgePointer(size_t i);
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  int64_t getNumberOfEdges();
+  size_t getNumberOfEdges();
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index 9650181fd1..19366b6031 100755
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -158,7 +158,7 @@ class GeomIO
       err = -2;
       return dynamicList = DynamicListArray<T, K>::NullPointer();
     }
-    if(preflight == true)
+    if(preflight)
     {
       if(err < 0)
       {
@@ -242,7 +242,8 @@ class Connectivity
    * @param dynamicList
    * @param numVerts
    */
-  template <typename T, typename K> static void FindElementsContainingVert(typename DataArray<K>::Pointer elemList, typename DynamicListArray<T, K>::Pointer dynamicList, size_t numVerts)
+  template <typename T, typename K>
+  static void FindElementsContainingVert(typename DataArray<K>::Pointer elemList, typename DynamicListArray<T, K>::Pointer dynamicList, size_t numVerts)
   {
     size_t numElems = elemList->getNumberOfTuples();
     size_t numVertsPerElem = elemList->getNumberOfComponents();
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 43d1e72aa2..3330f38f12 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -28,7 +28,7 @@
 class FindHexDerivativesImpl
 {
 public:
-  FindHexDerivativesImpl(HexahedralGeom* hexas, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindHexDerivativesImpl(HexahedralGeom* hexas, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Hexas(hexas)
   , m_Field(field)
   , m_Derivatives(derivs)
@@ -36,20 +36,20 @@ class FindHexDerivativesImpl
   }
   virtual ~FindHexDerivativesImpl() = default;
 
-  void compute(int64_t start, int64_t end) const
+  void compute(size_t start, size_t end) const
   {
     int32_t cDims = m_Field->getNumberOfComponents();
     double* fieldPtr = m_Field->getPointer(0);
     double* derivsPtr = m_Derivatives->getPointer(0);
     double values[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
     double derivs[3] = {0.0, 0.0, 0.0};
-    int64_t verts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+    size_t verts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
-    int64_t counter = 0;
-    int64_t totalElements = m_Hexas->getNumberOfHexas();
-    int64_t progIncrement = static_cast<int64_t>(totalElements / 100);
+    size_t counter = 0;
+    size_t totalElements = m_Hexas->getNumberOfHexas();
+    size_t progIncrement = static_cast<size_t>(totalElements / 100);
 
-    for(int64_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       m_Hexas->getVertsAtHex(i, verts);
       for(size_t j = 0; j < cDims; j++)
@@ -74,7 +74,7 @@ class FindHexDerivativesImpl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<int64_t>& r) const
+  void operator()(const tbb::blocked_range<size_t>& r) const
   {
     compute(r.begin(), r.end());
   }
@@ -116,7 +116,7 @@ HexahedralGeom::~HexahedralGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-HexahedralGeom::Pointer HexahedralGeom::CreateGeometry(int64_t numHexas, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
+HexahedralGeom::Pointer HexahedralGeom::CreateGeometry(size_t numHexas, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -134,7 +134,7 @@ HexahedralGeom::Pointer HexahedralGeom::CreateGeometry(int64_t numHexas, SharedV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-HexahedralGeom::Pointer HexahedralGeom::CreateGeometry(SharedHexList::Pointer hexas, SharedVertexList::Pointer vertices, const QString& name)
+HexahedralGeom::Pointer HexahedralGeom::CreateGeometry(const SharedHexList::Pointer& hexas, const SharedVertexList::Pointer& vertices, const QString& name)
 {
   if(name.isEmpty())
   {
@@ -176,15 +176,15 @@ void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeM
     // HexahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfVertices())
+  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfEdges())
+  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfEdges())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Face && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfQuads())
+  if(data->getType() == AttributeMatrix::Type::Face && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfQuads())
   {
     return;
   }
@@ -213,7 +213,7 @@ size_t HexahedralGeom::getNumberOfElements()
 int HexahedralGeom::findEdges()
 {
   m_EdgeList = CreateSharedEdgeList(0, false);
-  GeometryHelpers::Connectivity::FindHexEdges<int64_t>(m_HexList, m_EdgeList);
+  GeometryHelpers::Connectivity::FindHexEdges<size_t>(m_HexList, m_EdgeList);
   if(m_EdgeList.get() == nullptr)
   {
     return -1;
@@ -235,7 +235,7 @@ void HexahedralGeom::deleteEdges()
 int HexahedralGeom::findFaces()
 {
   m_QuadList = CreateSharedQuadList(0, false);
-  GeometryHelpers::Connectivity::FindHexFaces<int64_t>(m_HexList, m_QuadList);
+  GeometryHelpers::Connectivity::FindHexFaces<size_t>(m_HexList, m_QuadList);
   if(m_QuadList.get() == nullptr)
   {
     return -1;
@@ -257,7 +257,7 @@ void HexahedralGeom::deleteFaces()
 int HexahedralGeom::findElementsContainingVert()
 {
   m_HexasContainingVert = ElementDynamicList::New();
-  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, int64_t>(m_HexList, m_HexasContainingVert, getNumberOfVertices());
+  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, size_t>(m_HexList, m_HexasContainingVert, getNumberOfVertices());
   if(m_HexasContainingVert.get() == nullptr)
   {
     return -1;
@@ -304,7 +304,7 @@ int HexahedralGeom::findElementNeighbors()
     }
   }
   m_HexNeighbors = ElementDynamicList::New();
-  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, int64_t>(m_HexList, m_HexasContainingVert, m_HexNeighbors, IGeometry::Type::Hexahedral);
+  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, size_t>(m_HexList, m_HexasContainingVert, m_HexNeighbors, IGeometry::Type::Hexahedral);
   if(m_HexNeighbors.get() == nullptr)
   {
     return -1;
@@ -343,7 +343,7 @@ int HexahedralGeom::findElementCentroids()
 {
   QVector<size_t> cDims(1, 3);
   m_HexCentroids = FloatArrayType::CreateArray(getNumberOfHexas(), cDims, SIMPL::StringConstants::HexCentroids);
-  GeometryHelpers::Topology::FindElementCentroids<int64_t>(m_HexList, m_VertexList, m_HexCentroids);
+  GeometryHelpers::Topology::FindElementCentroids<size_t>(m_HexList, m_VertexList, m_HexCentroids);
   if(m_HexCentroids.get() == nullptr)
   {
     return -1;
@@ -382,9 +382,9 @@ void HexahedralGeom::deleteElementCentroids()
 int HexahedralGeom::findElementSizes()
 {
   QVector<size_t> cDims(1, 1);
-  int64_t numHexs = getNumberOfHexas();
+  size_t numHexs = getNumberOfHexas();
   m_HexSizes = FloatArrayType::CreateArray(numHexs, cDims, SIMPL::StringConstants::HexVolumes, (numHexs != 0));
-  GeometryHelpers::Topology::FindHexVolumes<int64_t>(m_HexList, m_VertexList, m_HexSizes);
+  GeometryHelpers::Topology::FindHexVolumes<size_t>(m_HexList, m_VertexList, m_HexSizes);
   if(m_HexSizes.get() == nullptr)
   {
     return -1;
@@ -423,7 +423,7 @@ int HexahedralGeom::findUnsharedEdges()
 {
   QVector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, false);
-  GeometryHelpers::Connectivity::FindUnsharedHexEdges<int64_t>(m_HexList, m_UnsharedEdgeList);
+  GeometryHelpers::Connectivity::FindUnsharedHexEdges<size_t>(m_HexList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
     return -1;
@@ -462,7 +462,7 @@ int HexahedralGeom::findUnsharedFaces()
 {
   QVector<size_t> cDims(1, 4);
   m_UnsharedQuadList = SharedQuadList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList, false);
-  GeometryHelpers::Connectivity::FindUnsharedHexFaces<int64_t>(m_HexList, m_UnsharedQuadList);
+  GeometryHelpers::Connectivity::FindUnsharedHexFaces<size_t>(m_HexList, m_UnsharedQuadList);
   if(m_UnsharedQuadList.get() == nullptr)
   {
     return -1;
@@ -554,7 +554,7 @@ void HexahedralGeom::getShapeFunctions(double pCoords[3], double* shape)
 void HexahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  int64_t numHexas = getNumberOfHexas();
+  size_t numHexas = getNumberOfHexas();
 
   if(observable != nullptr)
   {
@@ -569,7 +569,7 @@ void HexahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArray
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   if(doParallel)
   {
-    tbb::parallel_for(tbb::blocked_range<int64_t>(0, numHexas), FindHexDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, numHexas), FindHexDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
   }
   else
 #endif
@@ -661,7 +661,7 @@ int HexahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writ
   if(m_HexNeighbors.get() != nullptr)
   {
     size_t numHexas = getNumberOfHexas();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_HexNeighbors, numHexas, SIMPL::StringConstants::HexNeighbors);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_HexNeighbors, numHexas, SIMPL::StringConstants::HexNeighbors);
     if(err < 0)
     {
       return err;
@@ -671,7 +671,7 @@ int HexahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writ
   if(m_HexasContainingVert.get() != nullptr)
   {
     size_t numVerts = getNumberOfVertices();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_HexasContainingVert, numVerts, SIMPL::StringConstants::HexasContainingVert);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_HexasContainingVert, numVerts, SIMPL::StringConstants::HexasContainingVert);
     if(err < 0)
     {
       return err;
@@ -745,10 +745,10 @@ QString HexahedralGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Hexahedra</th><td>" << getNumberOfHexas() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Vertices</th><td>" << getNumberOfVertices() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Hexahedra</th><td>)" << getNumberOfHexas() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
   }
   else
   {
@@ -763,29 +763,60 @@ int HexahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  SharedHexList::Pointer hexas = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedHexList>(SIMPL::Geometry::SharedHexList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedHexList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedHexList::Pointer hexas =
+      SharedHexList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(hexas.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
   size_t numHexas = hexas->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  SharedQuadList::Pointer quads = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedQuadList>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedQuadList::Pointer quads =
+      SharedQuadList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedQuadList::Pointer bQuads = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedQuadList>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedQuadList::Pointer bQuads =
+      SharedQuadList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer edges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer bEdges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer bEdges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
@@ -800,12 +831,13 @@ int HexahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   {
     return -1;
   }
-  ElementDynamicList::Pointer hexNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::HexNeighbors, parentId, numHexas, preflight, err);
+  ElementDynamicList::Pointer hexNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::HexNeighbors, parentId, numHexas, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  ElementDynamicList::Pointer hexasContainingVert = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::HexasContainingVert, parentId, numVerts, preflight, err);
+  ElementDynamicList::Pointer hexasContainingVert =
+      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::HexasContainingVert, parentId, numVerts, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 6e48a088fe..32cfb35212 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -24,7 +24,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param name
      * @return
      */
-    static Pointer CreateGeometry(int64_t numHexas, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
+    static Pointer CreateGeometry(size_t numHexas, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
 
     /**
      * @brief CreateGeometry
@@ -33,46 +33,46 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param name
      * @return
      */
-    static Pointer CreateGeometry(SharedHexList::Pointer hexas, SharedVertexList::Pointer vertices, const QString& name);
+    static Pointer CreateGeometry(const SharedHexList::Pointer& hexas, const SharedVertexList::Pointer& vertices, const QString& name);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedVertexOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedVertexOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedVertexList
      * @param numVertices
      * @return
      */
-    static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+    static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedEdgeOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedEdgeOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedEdgeList
      * @param numEdges
      * @return
      */
-    static SharedEdgeList::Pointer CreateSharedEdgeList(int64_t numEdges, bool allocate = true);
+    static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedQuadOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedQuadOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedQuadLost
      * @param numQuads
      * @return
      */
-    static SharedQuadList::Pointer CreateSharedQuadList(int64_t numQuads, bool allocate = true);
+    static SharedQuadList::Pointer CreateSharedQuadList(size_t numQuads, bool allocate = true);
 
     /**
      * @brief resizeQuadList
      * @param newNumQuads
      */
-    void resizeQuadList(int64_t newNumQuads);
+    void resizeQuadList(size_t newNumQuads);
 
     /**
      * @brief setQuads
@@ -91,14 +91,14 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param quadId
      * @param verts
      */
-    void setVertsAtQuad(int64_t quadId, int64_t verts[4]);
+    void setVertsAtQuad(size_t quadId, size_t verts[4]);
 
     /**
      * @brief getVertsAtQuad
      * @param quadId
      * @param verts
      */
-    void getVertsAtQuad(int64_t quadId, int64_t verts[4]);
+    void getVertsAtQuad(size_t quadId, size_t verts[4]);
 
     /**
      * @brief getVertCoordsAtQuad
@@ -108,37 +108,37 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert3
      * @param vert4
      */
-    void getVertCoordsAtQuad(int64_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+    void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
 
     /**
      * @brief getPointer
      * @param i
      * @return
      */
-    int64_t* getQuadPointer(int64_t i);
+    size_t* getQuadPointer(size_t i);
 
     /**
      * @brief getNumberOfQuads
      * @return
      */
-    int64_t getNumberOfQuads();
+    size_t getNumberOfQuads();
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedHexOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedHexOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedHexList
      * @param numTets
      * @return
      */
-    static SharedHexList::Pointer CreateSharedHexList(int64_t numHexas, bool allocate = true);
+    static SharedHexList::Pointer CreateSharedHexList(size_t numHexas, bool allocate = true);
 
     /**
      * @brief resizeHexList
      * @param newNumHexas
      */
-    void resizeHexList(int64_t newNumHexas);
+    void resizeHexList(size_t newNumHexas);
 
     /**
      * @brief setHexahedra
@@ -157,14 +157,14 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param hexId
      * @param verts
      */
-    void setVertsAtHex(int64_t hexId, int64_t verts[7]);
+    void setVertsAtHex(size_t hexId, size_t verts[7]);
 
     /**
      * @brief getVertsAtHex
      * @param hexId
      * @param verts
      */
-    void getVertsAtHex(int64_t hexId, int64_t verts[7]);
+    void getVertsAtHex(size_t hexId, size_t verts[7]);
 
     /**
      * @brief getVertCoordsAtHex
@@ -176,24 +176,24 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert5
      * @param vert6
      */
-    void getVertCoordsAtHex(int64_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]);
+    void getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]);
 
     /**
      * @brief getHexPointer
      * @param i
      * @return
      */
-    int64_t* getHexPointer(int64_t i);
+    size_t* getHexPointer(size_t i);
 
     /**
      * @brief getNumberOfHexas
      * @return
      */
-    int64_t getNumberOfHexas();
+    size_t getNumberOfHexas();
 
-// -----------------------------------------------------------------------------
-// Inherited from IGeometry
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from IGeometry
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief initializeWithZeros
@@ -345,7 +345,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief resizeVertexList
      * @param newNumVertices
      */
-    void resizeVertexList(int64_t newNumVertices) override;
+    void resizeVertexList(size_t newNumVertices) override;
 
     /**
      * @brief setVertices
@@ -364,33 +364,33 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vertId
      * @param coords
      */
-    void setCoords(int64_t vertId, float coords[3]) override;
+    void setCoords(size_t vertId, float coords[3]) override;
 
     /**
      * @brief getCoords
      * @param vertId
      * @param coords
      */
-    void getCoords(int64_t vertId, float coords[3]) override;
+    void getCoords(size_t vertId, float coords[3]) override;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    float* getVertexPointer(int64_t i) override;
+    float* getVertexPointer(size_t i) override;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    int64_t getNumberOfVertices() override;
+    size_t getNumberOfVertices() override;
 
     /**
      * @brief resizeEdgeList
      * @param newNumEdges
      */
-    void resizeEdgeList(int64_t newNumEdges) override;
+    void resizeEdgeList(size_t newNumEdges) override;
 
     /**
      * @brief getEdges
@@ -403,14 +403,14 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param edgeId
      * @param verts
      */
-    void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+    void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
     /**
      * @brief getVerts
      * @param edgeId
      * @param verts
      */
-    void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+    void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -418,20 +418,20 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert1
      * @param vert2
      */
-    void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) override;
+    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    int64_t* getEdgePointer(int64_t i) override;
+    size_t* getEdgePointer(size_t i) override;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    int64_t getNumberOfEdges() override;
+    size_t getNumberOfEdges() override;
 
     /**
      * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 93489ef7db..6eef08a4ef 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -52,14 +52,16 @@ class QTextStream;
 // -----------------------------------------------------------------------------
 // Typedefs
 // -----------------------------------------------------------------------------
+using MeshIndexType = size_t;
+using MeshIndexArrayType = DataArray<MeshIndexType>;
 using SharedVertexList = FloatArrayType;
-using SharedEdgeList = Int64ArrayType;
-using SharedTriList = Int64ArrayType;
-using SharedQuadList = Int64ArrayType;
-using SharedTetList = Int64ArrayType;
-using SharedHexList = Int64ArrayType;
-using SharedFaceList = Int64ArrayType;
-using ElementDynamicList = UInt16Int64DynamicListArray;
+using SharedEdgeList = DataArray<MeshIndexType>;
+using SharedTriList = DataArray<MeshIndexType>;
+using SharedQuadList = DataArray<MeshIndexType>;
+using SharedTetList = DataArray<MeshIndexType>;
+using SharedHexList = DataArray<MeshIndexType>;
+using SharedFaceList = DataArray<MeshIndexType>;
+using ElementDynamicList = DynamicListArray<uint16_t, MeshIndexType>;
 
 /**
  * @brief The IGeometry class
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index 0516b810e7..00ec23d7da 100755
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @brief resizeVertexList
      * @param newNumVertices
      */
-    virtual void resizeVertexList(int64_t newNumVertices) = 0;
+    virtual void resizeVertexList(size_t newNumVertices) = 0;
 
     /**
      * @brief setVertices
@@ -80,37 +80,37 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param vertId
      * @param coords
      */
-    virtual void setCoords(int64_t vertId, float coords[3]) = 0;
+    virtual void setCoords(size_t vertId, float coords[3]) = 0;
 
     /**
      * @brief getCoords
      * @param vertId
      * @param coords
      */
-    virtual void getCoords(int64_t vertId, float coords[3]) = 0;
+    virtual void getCoords(size_t vertId, float coords[3]) = 0;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    virtual float* getVertexPointer(int64_t i) = 0;
+    virtual float* getVertexPointer(size_t i) = 0;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    virtual int64_t getNumberOfVertices() = 0;
+    virtual size_t getNumberOfVertices() = 0;
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedEdgeOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedEdgeOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief resizeEdgeList
      * @param newNumEdges
      */
-    virtual void resizeEdgeList(int64_t newNumEdges) = 0;
+    virtual void resizeEdgeList(size_t newNumEdges) = 0;
 
     /**
      * @brief getEdges
@@ -123,14 +123,14 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param edgeId
      * @param verts
      */
-    virtual void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) = 0;
+    virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
 
     /**
      * @brief getVerts
      * @param edgeId
      * @param verts
      */
-    virtual void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) = 0;
+    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -138,25 +138,24 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param vert1
      * @param vert2
      */
-    virtual void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) = 0;
+    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) = 0;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    virtual int64_t* getEdgePointer(int64_t i) = 0;
+    virtual size_t* getEdgePointer(size_t i) = 0;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    virtual int64_t getNumberOfEdges() = 0;
-
+    virtual size_t getNumberOfEdges() = 0;
 
-// -----------------------------------------------------------------------------
-// Connectivity
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Connectivity
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
index 17578d5a13..7dbdb747dd 100755
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @brief resizeVertexList
      * @param newNumVertices
      */
-    virtual void resizeVertexList(int64_t newNumVertices) = 0;
+    virtual void resizeVertexList(size_t newNumVertices) = 0;
 
     /**
      * @brief setVertices
@@ -79,37 +79,37 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param vertId
      * @param coords
      */
-    virtual void setCoords(int64_t vertId, float coords[3]) = 0;
+    virtual void setCoords(size_t vertId, float coords[3]) = 0;
 
     /**
      * @brief getCoords
      * @param vertId
      * @param coords
      */
-    virtual void getCoords(int64_t vertId, float coords[3]) = 0;
+    virtual void getCoords(size_t vertId, float coords[3]) = 0;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    virtual float* getVertexPointer(int64_t i) = 0;
+    virtual float* getVertexPointer(size_t i) = 0;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    virtual int64_t getNumberOfVertices() = 0;
+    virtual size_t getNumberOfVertices() = 0;
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedEdgeOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedEdgeOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief resizeEdgeList
      * @param newNumEdges
      */
-    virtual void resizeEdgeList(int64_t newNumEdges) = 0;
+    virtual void resizeEdgeList(size_t newNumEdges) = 0;
 
     /**
      * @brief getEdges
@@ -122,14 +122,14 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param edgeId
      * @param verts
      */
-    virtual void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) = 0;
+    virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
 
     /**
      * @brief getVerts
      * @param edgeId
      * @param verts
      */
-    virtual void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) = 0;
+    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -137,25 +137,24 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param vert1
      * @param vert2
      */
-    virtual void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) = 0;
+    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) = 0;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    virtual int64_t* getEdgePointer(int64_t i) = 0;
+    virtual size_t* getEdgePointer(size_t i) = 0;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    virtual int64_t getNumberOfEdges() = 0;
-
+    virtual size_t getNumberOfEdges() = 0;
 
-// -----------------------------------------------------------------------------
-// Connectivity
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Connectivity
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 2e1116e8d1..2b9e32c8c3 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -65,27 +65,27 @@
 class FindQuadDerivativesImpl
 {
 public:
-  FindQuadDerivativesImpl(QuadGeom* quads, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindQuadDerivativesImpl(QuadGeom* quads, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Quads(quads)
   , m_Field(field)
   , m_Derivatives(derivs)
   {
   }
 
-  void compute(int64_t start, int64_t end) const
+  void compute(size_t start, size_t end) const
   {
     int32_t cDims = m_Field->getNumberOfComponents();
     double* fieldPtr = m_Field->getPointer(0);
     double* derivsPtr = m_Derivatives->getPointer(0);
     double values[4] = {0.0, 0.0, 0.0, 0.0};
     double derivs[3] = {0.0, 0.0, 0.0};
-    int64_t verts[4] = {0, 0, 0, 0};
+    size_t verts[4] = {0, 0, 0, 0};
 
-    int64_t counter = 0;
-    int64_t totalElements = m_Quads->getNumberOfQuads();
-    int64_t progIncrement = static_cast<int64_t>(totalElements / 100);
+    size_t counter = 0;
+    size_t totalElements = m_Quads->getNumberOfQuads();
+    size_t progIncrement = static_cast<size_t>(totalElements / 100);
 
-    for(int64_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       m_Quads->getVertsAtQuad(i, verts);
       for(size_t j = 0; j < cDims; j++)
@@ -110,7 +110,7 @@ class FindQuadDerivativesImpl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<int64_t>& r) const
+  void operator()(const tbb::blocked_range<size_t>& r) const
   {
     compute(r.begin(), r.end());
   }
@@ -150,7 +150,7 @@ QuadGeom::~QuadGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QuadGeom::Pointer QuadGeom::CreateGeometry(int64_t numQuads, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
+QuadGeom::Pointer QuadGeom::CreateGeometry(size_t numQuads, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -168,7 +168,7 @@ QuadGeom::Pointer QuadGeom::CreateGeometry(int64_t numQuads, SharedVertexList::P
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QuadGeom::Pointer QuadGeom::CreateGeometry(SharedQuadList::Pointer quads, SharedVertexList::Pointer vertices, const QString& name)
+QuadGeom::Pointer QuadGeom::CreateGeometry(const SharedQuadList::Pointer& quads, const SharedVertexList::Pointer& vertices, const QString& name)
 {
   if(name.isEmpty())
   {
@@ -209,11 +209,11 @@ void QuadGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
     // QuadGeom can only accept vertex, edge, or face Attribute Matrices
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfVertices())
+  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfEdges())
+  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfEdges())
   {
     return;
   }
@@ -242,7 +242,7 @@ size_t QuadGeom::getNumberOfElements()
 int QuadGeom::findEdges()
 {
   m_EdgeList = CreateSharedEdgeList(0);
-  GeometryHelpers::Connectivity::Find2DElementEdges<int64_t>(m_QuadList, m_EdgeList);
+  GeometryHelpers::Connectivity::Find2DElementEdges<size_t>(m_QuadList, m_EdgeList);
   if(m_EdgeList.get() == nullptr)
   {
     return -1;
@@ -264,7 +264,7 @@ void QuadGeom::deleteEdges()
 int QuadGeom::findElementsContainingVert()
 {
   m_QuadsContainingVert = ElementDynamicList::New();
-  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, int64_t>(m_QuadList, m_QuadsContainingVert, getNumberOfVertices());
+  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, size_t>(m_QuadList, m_QuadsContainingVert, getNumberOfVertices());
   if(m_QuadsContainingVert.get() == nullptr)
   {
     return -1;
@@ -311,7 +311,7 @@ int QuadGeom::findElementNeighbors()
     }
   }
   m_QuadNeighbors = ElementDynamicList::New();
-  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, int64_t>(m_QuadList, m_QuadsContainingVert, m_QuadNeighbors, IGeometry::Type::Quad);
+  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, size_t>(m_QuadList, m_QuadsContainingVert, m_QuadNeighbors, IGeometry::Type::Quad);
   if(m_QuadNeighbors.get() == nullptr)
   {
     return -1;
@@ -350,7 +350,7 @@ int QuadGeom::findElementCentroids()
 {
   QVector<size_t> cDims(1, 3);
   m_QuadCentroids = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadCentroids);
-  GeometryHelpers::Topology::FindElementCentroids<int64_t>(m_QuadList, m_VertexList, m_QuadCentroids);
+  GeometryHelpers::Topology::FindElementCentroids<size_t>(m_QuadList, m_VertexList, m_QuadCentroids);
   if(m_QuadCentroids.get() == nullptr)
   {
     return -1;
@@ -389,7 +389,7 @@ int QuadGeom::findElementSizes()
 {
   QVector<size_t> cDims(1, 1);
   m_QuadSizes = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadAreas);
-  GeometryHelpers::Topology::Find2DElementAreas<int64_t>(m_QuadList, m_VertexList, m_QuadSizes);
+  GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_QuadList, m_VertexList, m_QuadSizes);
   if(m_QuadSizes.get() == nullptr)
   {
     return -1;
@@ -428,7 +428,7 @@ int QuadGeom::findUnsharedEdges()
 {
   QVector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
-  GeometryHelpers::Connectivity::Find2DUnsharedEdges<int64_t>(m_QuadList, m_UnsharedEdgeList);
+  GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_QuadList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
     return -1;
@@ -497,7 +497,7 @@ void QuadGeom::getShapeFunctions(double pCoords[3], double* shape)
 void QuadGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  int64_t numQuads = getNumberOfQuads();
+  size_t numQuads = getNumberOfQuads();
 
   if(observable != nullptr)
   {
@@ -512,7 +512,7 @@ void QuadGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   if(doParallel)
   {
-    tbb::parallel_for(tbb::blocked_range<int64_t>(0, numQuads), FindQuadDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, numQuads), FindQuadDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
   }
   else
 #endif
@@ -586,7 +586,7 @@ int QuadGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
   if(m_QuadNeighbors.get() != nullptr)
   {
     size_t numQuads = getNumberOfQuads();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_QuadNeighbors, numQuads, SIMPL::StringConstants::QuadNeighbors);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_QuadNeighbors, numQuads, SIMPL::StringConstants::QuadNeighbors);
     if(err < 0)
     {
       return err;
@@ -596,7 +596,7 @@ int QuadGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
   if(m_QuadsContainingVert.get() != nullptr)
   {
     size_t numVerts = getNumberOfVertices();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_QuadsContainingVert, numVerts, SIMPL::StringConstants::QuadsContainingVert);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_QuadsContainingVert, numVerts, SIMPL::StringConstants::QuadsContainingVert);
     if(err < 0)
     {
       return err;
@@ -669,10 +669,10 @@ QString QuadGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Quads</th><td>" << getNumberOfQuads() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Vertices</th><td>" << getNumberOfVertices() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Quads</th><td>)" << getNumberOfQuads() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
     ss << "</tbody></table>";
   }
   else
@@ -688,19 +688,39 @@ int QuadGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  SharedQuadList::Pointer quads = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedQuadList>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedQuadList::Pointer quads =
+      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(quads.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
   size_t numQuads = quads->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer edges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer bEdges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer bEdges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
@@ -715,13 +735,13 @@ int QuadGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   {
     return -1;
   }
-  ElementDynamicList::Pointer quadNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::QuadNeighbors, parentId, numQuads, preflight, err);
+  ElementDynamicList::Pointer quadNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::QuadNeighbors, parentId, numQuads, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
   ElementDynamicList::Pointer quadsContainingVert =
-      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::QuadsContainingVert, parentId, numVerts, preflight, err);
+      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::QuadsContainingVert, parentId, numVerts, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index b020262c7a..4ca83633af 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -46,7 +46,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   // clang-format off
   PYB11_CREATE_BINDINGS(QuadGeom SUPERCLASS IGeometry2D)
 
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD int64_t SharedVertexList::Pointer QString bool)
+  PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedQuadList::Pointer SharedVertexList::Pointer QString)
 
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
@@ -58,12 +58,12 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   PYB11_METHOD(void setQuads SharedQuadList::Pointer,quads)
   PYB11_METHOD(SharedQuadList::Pointer getQuads)
 
-  PYB11_METHOD(void setCoords int64_t,vertId float,coords[3])
-  PYB11_METHOD(void getCoords int64_t,vertId float,coords[3])
+  PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
+  PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
 
-  PYB11_METHOD(int64_t getNumberOfVertices)
-  PYB11_METHOD(int64_t getNumberOfEdges)
-  PYB11_METHOD(int64_t getNumberOfQuads)
+  PYB11_METHOD(size_t getNumberOfVertices)
+  PYB11_METHOD(size_t getNumberOfEdges)
+  PYB11_METHOD(size_t getNumberOfQuads)
   PYB11_METHOD(size_t getNumberOfElements)
   // clang-format on
 
@@ -81,7 +81,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(int64_t numQuads, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
+  static Pointer CreateGeometry(size_t numQuads, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateGeometry
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(SharedQuadList::Pointer quads, SharedVertexList::Pointer vertices, const QString& name);
+  static Pointer CreateGeometry(const SharedQuadList::Pointer& quads, const SharedVertexList::Pointer& vertices, const QString& name);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedVertexOps
@@ -101,7 +101,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param numVertices
    * @return
    */
-  static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedEdgeOps
@@ -112,7 +112,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param numEdges
    * @return
    */
-  static SharedEdgeList::Pointer CreateSharedEdgeList(int64_t numEdges, bool allocate = true);
+  static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedQuadOps
@@ -123,13 +123,13 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param numQuads
    * @return
    */
-  static SharedQuadList::Pointer CreateSharedQuadList(int64_t numQuads, bool allocate = true);
+  static SharedQuadList::Pointer CreateSharedQuadList(size_t numQuads, bool allocate = true);
 
   /**
    * @brief resizeQuadList
    * @param newNumQuads
    */
-  void resizeQuadList(int64_t newNumQuads);
+  void resizeQuadList(size_t newNumQuads);
 
   /**
    * @brief setQuads
@@ -148,14 +148,14 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param quadId
    * @param verts
    */
-  void setVertsAtQuad(int64_t quadId, int64_t verts[4]);
+  void setVertsAtQuad(size_t quadId, size_t verts[4]);
 
   /**
    * @brief getVertsAtQuad
    * @param quadId
    * @param verts
    */
-  void getVertsAtQuad(int64_t quadId, int64_t verts[4]);
+  void getVertsAtQuad(size_t quadId, size_t verts[4]);
 
   /**
    * @brief getVertCoordsAtQuad
@@ -165,20 +165,20 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vert3
    * @param vert4
    */
-  void getVertCoordsAtQuad(int64_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+  void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
 
   /**
    * @brief getPointer
    * @param i
    * @return
    */
-  int64_t* getQuadPointer(int64_t i);
+  size_t* getQuadPointer(size_t i);
 
   /**
    * @brief getNumberOfQuads
    * @return
    */
-  int64_t getNumberOfQuads();
+  size_t getNumberOfQuads();
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -334,7 +334,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief resizeVertexList
    * @param newNumVertices
    */
-  void resizeVertexList(int64_t newNumVertices) override;
+  void resizeVertexList(size_t newNumVertices) override;
 
   /**
    * @brief setVertices
@@ -353,33 +353,33 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vertId
    * @param coords
    */
-  void setCoords(int64_t vertId, float coords[3]) override;
+  void setCoords(size_t vertId, float coords[3]) override;
 
   /**
    * @brief getCoords
    * @param vertId
    * @param coords
    */
-  void getCoords(int64_t vertId, float coords[3]) override;
+  void getCoords(size_t vertId, float coords[3]) override;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(int64_t i) override;
+  float* getVertexPointer(size_t i) override;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  int64_t getNumberOfVertices() override;
+  size_t getNumberOfVertices() override;
 
   /**
    * @brief resizeEdgeList
    * @param newNumEdges
    */
-  void resizeEdgeList(int64_t newNumEdges) override;
+  void resizeEdgeList(size_t newNumEdges) override;
 
   /**
    * @brief getEdges
@@ -392,14 +392,14 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param edgeId
    * @param verts
    */
-  void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+  void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
   /**
    * @brief getVerts
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
   /**
    * @brief getVertCoordsAtEdge
@@ -407,20 +407,20 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) override;
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  int64_t* getEdgePointer(int64_t i) override;
+  size_t* getEdgePointer(size_t i) override;
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  int64_t getNumberOfEdges() override;
+  size_t getNumberOfEdges() override;
 
   /**
    * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 65fbb11bb9..a81362e410 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -1068,11 +1068,11 @@ int RectGridGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileNam
 
   out << "  <!-- *************** START OF " << dcName << " *************** -->"
       << "\n";
-  out << "  <Grid Name=\"" << dcName << "\" GridType=\"Uniform\">"
+  out << "  <Grid Name=\"" << dcName << R"(" GridType="Uniform">)"
       << "\n";
   if(getEnableTimeSeries())
   {
-    out << "    <Time TimeType=\"Single\" Value=\"" << getTimeValue() << "\"/>\n";
+    out << R"(    <Time TimeType="Single" Value=")" << getTimeValue() << "\"/>\n";
   }
   out << "    <Topology TopologyType=\"3DRectMesh\" Dimensions=\"" << volDims[2] + 1 << " " << volDims[1] + 1 << " " << volDims[0] + 1 << " \"></Topology>"
       << "\n";
@@ -1112,10 +1112,10 @@ QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
     ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Dimensions:</th><td>" << volDims[0] << " x " << volDims[1] << " x " << volDims[2] << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Spacing:</th><td>"
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing:</th><td>)"
        << "Variable"
        << "</td></tr>";
   }
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index a4d18b8b3e..667f2f4001 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -36,7 +36,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer GEOM_CLASS_NAME::CreateSharedEdgeList(int64_t numEdges, bool allocate)
+SharedEdgeList::Pointer GEOM_CLASS_NAME::CreateSharedEdgeList(size_t numEdges, bool allocate)
 {
   QVector<size_t> edgeDims(1, 2);
   SharedEdgeList::Pointer edges = SharedEdgeList::CreateArray(numEdges, edgeDims, SIMPL::Geometry::SharedEdgeList, allocate);
@@ -47,7 +47,7 @@ SharedEdgeList::Pointer GEOM_CLASS_NAME::CreateSharedEdgeList(int64_t numEdges,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeEdgeList(int64_t newNumEdges)
+void GEOM_CLASS_NAME::resizeEdgeList(size_t newNumEdges)
 {
   m_EdgeList->resizeTuples(newNumEdges);
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setEdges(SharedEdgeList::Pointer edges)
 {
   if(edges.get() != nullptr)
   {
-    if(edges->getName().compare(SIMPL::Geometry::SharedEdgeList) != 0)
+    if(edges->getName() != SIMPL::Geometry::SharedEdgeList)
     {
       edges->setName(SIMPL::Geometry::SharedEdgeList);
     }
@@ -78,9 +78,9 @@ SharedEdgeList::Pointer GEOM_CLASS_NAME::getEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setVertsAtEdge(int64_t edgeId, int64_t verts[2])
+void GEOM_CLASS_NAME::setVertsAtEdge(size_t edgeId, size_t verts[2])
 {
-  int64_t* Edge = m_EdgeList->getTuplePointer(edgeId);
+  size_t* Edge = m_EdgeList->getTuplePointer(edgeId);
   Edge[0] = verts[0];
   Edge[1] = verts[1];
 }
@@ -88,9 +88,9 @@ void GEOM_CLASS_NAME::setVertsAtEdge(int64_t edgeId, int64_t verts[2])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtEdge(int64_t edgeId, int64_t verts[2])
+void GEOM_CLASS_NAME::getVertsAtEdge(size_t edgeId, size_t verts[2])
 {
-  int64_t* Edge = m_EdgeList->getTuplePointer(edgeId);
+  size_t* Edge = m_EdgeList->getTuplePointer(edgeId);
   verts[0] = Edge[0];
   verts[1] = Edge[1];
 }
@@ -98,9 +98,9 @@ void GEOM_CLASS_NAME::getVertsAtEdge(int64_t edgeId, int64_t verts[2])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3])
+void GEOM_CLASS_NAME::getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3])
 {
-  int64_t* Edge = m_EdgeList->getTuplePointer(edgeId);
+  size_t* Edge = m_EdgeList->getTuplePointer(edgeId);
   float* tmp1 = m_VertexList->getTuplePointer(Edge[0]);
   float* tmp2 = m_VertexList->getTuplePointer(Edge[1]);
   vert1[0] = tmp1[0];
@@ -114,7 +114,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t* GEOM_CLASS_NAME::getEdgePointer(int64_t i)
+size_t* GEOM_CLASS_NAME::getEdgePointer(size_t i)
 {
   return m_EdgeList->getTuplePointer(i);
 }
@@ -122,7 +122,7 @@ int64_t* GEOM_CLASS_NAME::getEdgePointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfEdges()
+size_t GEOM_CLASS_NAME::getNumberOfEdges()
 {
   return m_EdgeList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedHexOps.cpp b/Source/SIMPLib/Geometry/SharedHexOps.cpp
index bb103f97c2..4d407b8ec1 100644
--- a/Source/SIMPLib/Geometry/SharedHexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedHexOps.cpp
@@ -1,7 +1,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedHexList::Pointer GEOM_CLASS_NAME::CreateSharedHexList(int64_t numHexas, bool allocate)
+SharedHexList::Pointer GEOM_CLASS_NAME::CreateSharedHexList(size_t numHexas, bool allocate)
 {
   QVector<size_t> hexDims(1, 8);
   SharedHexList::Pointer hexas = SharedHexList::CreateArray(numHexas, hexDims, SIMPL::Geometry::SharedHexList, allocate);
@@ -12,7 +12,7 @@ SharedHexList::Pointer GEOM_CLASS_NAME::CreateSharedHexList(int64_t numHexas, bo
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeHexList(int64_t newNumHexas)
+void GEOM_CLASS_NAME::resizeHexList(size_t newNumHexas)
 {
   m_HexList->resizeTuples(newNumHexas);
 }
@@ -24,7 +24,7 @@ void GEOM_CLASS_NAME::setHexahedra(SharedHexList::Pointer hexas)
 {
   if(hexas.get() != nullptr)
   {
-    if(hexas->getName().compare(SIMPL::Geometry::SharedHexList) != 0)
+    if(hexas->getName() != SIMPL::Geometry::SharedHexList)
     {
       hexas->setName(SIMPL::Geometry::SharedHexList);
     }
@@ -43,9 +43,9 @@ SharedHexList::Pointer GEOM_CLASS_NAME::getHexahedra()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setVertsAtHex(int64_t hexId, int64_t verts[8])
+void GEOM_CLASS_NAME::setVertsAtHex(size_t hexId, size_t verts[8])
 {
-  int64_t* hex = m_HexList->getTuplePointer(hexId);
+  size_t* hex = m_HexList->getTuplePointer(hexId);
   hex[0] = verts[0];
   hex[1] = verts[1];
   hex[2] = verts[2];
@@ -59,9 +59,9 @@ void GEOM_CLASS_NAME::setVertsAtHex(int64_t hexId, int64_t verts[8])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtHex(int64_t hexId, int64_t verts[8])
+void GEOM_CLASS_NAME::getVertsAtHex(size_t hexId, size_t verts[8])
 {
-  int64_t* hex = m_HexList->getTuplePointer(hexId);
+  size_t* hex = m_HexList->getTuplePointer(hexId);
   verts[0] = hex[0];
   verts[1] = hex[1];
   verts[2] = hex[2];
@@ -75,9 +75,9 @@ void GEOM_CLASS_NAME::getVertsAtHex(int64_t hexId, int64_t verts[8])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtHex(int64_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3])
+void GEOM_CLASS_NAME::getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3])
 {
-  int64_t* hex = m_HexList->getTuplePointer(hexId);
+  size_t* hex = m_HexList->getTuplePointer(hexId);
   float* tmp1 = m_VertexList->getTuplePointer(hex[0]);
   float* tmp2 = m_VertexList->getTuplePointer(hex[1]);
   float* tmp3 = m_VertexList->getTuplePointer(hex[2]);
@@ -115,7 +115,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtHex(int64_t hexId, float vert1[3], float ve
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t* GEOM_CLASS_NAME::getHexPointer(int64_t i)
+size_t* GEOM_CLASS_NAME::getHexPointer(size_t i)
 {
   return m_HexList->getTuplePointer(i);
 }
@@ -123,7 +123,7 @@ int64_t* GEOM_CLASS_NAME::getHexPointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfHexas()
+size_t GEOM_CLASS_NAME::getNumberOfHexas()
 {
   return m_HexList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index 6cea373bad..199d04aee0 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -36,7 +36,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedQuadList::Pointer GEOM_CLASS_NAME::CreateSharedQuadList(int64_t numQuads, bool allocate)
+SharedQuadList::Pointer GEOM_CLASS_NAME::CreateSharedQuadList(size_t numQuads, bool allocate)
 {
   QVector<size_t> quadDims(1, 4);
   SharedQuadList::Pointer quads = SharedEdgeList::CreateArray(numQuads, quadDims, SIMPL::Geometry::SharedQuadList, allocate);
@@ -47,7 +47,7 @@ SharedQuadList::Pointer GEOM_CLASS_NAME::CreateSharedQuadList(int64_t numQuads,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeQuadList(int64_t newNumQuads)
+void GEOM_CLASS_NAME::resizeQuadList(size_t newNumQuads)
 {
   m_QuadList->resizeTuples(newNumQuads);
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setQuads(SharedQuadList::Pointer quads)
 {
   if(quads.get() != nullptr)
   {
-    if(quads->getName().compare(SIMPL::Geometry::SharedQuadList) != 0)
+    if(quads->getName() != SIMPL::Geometry::SharedQuadList)
     {
       quads->setName(SIMPL::Geometry::SharedQuadList);
     }
@@ -78,9 +78,9 @@ SharedQuadList::Pointer GEOM_CLASS_NAME::getQuads()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setVertsAtQuad(int64_t quadId, int64_t verts[4])
+void GEOM_CLASS_NAME::setVertsAtQuad(size_t quadId, size_t verts[4])
 {
-  int64_t* Quad = m_QuadList->getTuplePointer(quadId);
+  size_t* Quad = m_QuadList->getTuplePointer(quadId);
   Quad[0] = verts[0];
   Quad[1] = verts[1];
   Quad[2] = verts[2];
@@ -90,9 +90,9 @@ void GEOM_CLASS_NAME::setVertsAtQuad(int64_t quadId, int64_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtQuad(int64_t quadId, int64_t verts[4])
+void GEOM_CLASS_NAME::getVertsAtQuad(size_t quadId, size_t verts[4])
 {
-  int64_t* Quad = m_QuadList->getTuplePointer(quadId);
+  size_t* Quad = m_QuadList->getTuplePointer(quadId);
   verts[0] = Quad[0];
   verts[1] = Quad[1];
   verts[2] = Quad[2];
@@ -102,9 +102,9 @@ void GEOM_CLASS_NAME::getVertsAtQuad(int64_t quadId, int64_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtQuad(int64_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
+void GEOM_CLASS_NAME::getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
 {
-  int64_t* Quad = m_QuadList->getTuplePointer(quadId);
+  size_t* Quad = m_QuadList->getTuplePointer(quadId);
   float* tmp1 = m_VertexList->getTuplePointer(Quad[0]);
   float* tmp2 = m_VertexList->getTuplePointer(Quad[1]);
   float* tmp3 = m_VertexList->getTuplePointer(Quad[2]);
@@ -126,7 +126,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtQuad(int64_t quadId, float vert1[3], float
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t* GEOM_CLASS_NAME::getQuadPointer(int64_t i)
+size_t* GEOM_CLASS_NAME::getQuadPointer(size_t i)
 {
   return m_QuadList->getTuplePointer(i);
 }
@@ -134,7 +134,7 @@ int64_t* GEOM_CLASS_NAME::getQuadPointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfQuads()
+size_t GEOM_CLASS_NAME::getNumberOfQuads()
 {
   return m_QuadList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index 298f77fd31..bd6dc9388a 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -36,7 +36,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedTetList::Pointer GEOM_CLASS_NAME::CreateSharedTetList(int64_t numTets, bool allocate)
+SharedTetList::Pointer GEOM_CLASS_NAME::CreateSharedTetList(size_t numTets, bool allocate)
 {
   QVector<size_t> tetDims(1, 4);
   SharedTetList::Pointer tets = SharedTetList::CreateArray(numTets, tetDims, SIMPL::Geometry::SharedTetList, allocate);
@@ -47,7 +47,7 @@ SharedTetList::Pointer GEOM_CLASS_NAME::CreateSharedTetList(int64_t numTets, boo
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeTetList(int64_t newNumTets)
+void GEOM_CLASS_NAME::resizeTetList(size_t newNumTets)
 {
   m_TetList->resizeTuples(newNumTets);
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setTetrahedra(SharedTetList::Pointer tets)
 {
   if(tets.get() != nullptr)
   {
-    if(tets->getName().compare(SIMPL::Geometry::SharedTetList) != 0)
+    if(tets->getName() != SIMPL::Geometry::SharedTetList)
     {
       tets->setName(SIMPL::Geometry::SharedTetList);
     }
@@ -78,9 +78,9 @@ SharedTetList::Pointer GEOM_CLASS_NAME::getTetrahedra()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setVertsAtTet(int64_t tetId, int64_t verts[4])
+void GEOM_CLASS_NAME::setVertsAtTet(size_t tetId, size_t verts[4])
 {
-  int64_t* tet = m_TetList->getTuplePointer(tetId);
+  size_t* tet = m_TetList->getTuplePointer(tetId);
   tet[0] = verts[0];
   tet[1] = verts[1];
   tet[2] = verts[2];
@@ -90,9 +90,9 @@ void GEOM_CLASS_NAME::setVertsAtTet(int64_t tetId, int64_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtTet(int64_t tetId, int64_t verts[4])
+void GEOM_CLASS_NAME::getVertsAtTet(size_t tetId, size_t verts[4])
 {
-  int64_t* tet = m_TetList->getTuplePointer(tetId);
+  size_t* tet = m_TetList->getTuplePointer(tetId);
   verts[0] = tet[0];
   verts[1] = tet[1];
   verts[2] = tet[2];
@@ -102,9 +102,9 @@ void GEOM_CLASS_NAME::getVertsAtTet(int64_t tetId, int64_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtTet(int64_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
+void GEOM_CLASS_NAME::getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
 {
-  int64_t* tet = m_TetList->getTuplePointer(tetId);
+  size_t* tet = m_TetList->getTuplePointer(tetId);
   float* tmp1 = m_VertexList->getTuplePointer(tet[0]);
   float* tmp2 = m_VertexList->getTuplePointer(tet[1]);
   float* tmp3 = m_VertexList->getTuplePointer(tet[2]);
@@ -126,7 +126,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtTet(int64_t tetId, float vert1[3], float ve
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t* GEOM_CLASS_NAME::getTetPointer(int64_t i)
+size_t* GEOM_CLASS_NAME::getTetPointer(size_t i)
 {
   return m_TetList->getTuplePointer(i);
 }
@@ -134,7 +134,7 @@ int64_t* GEOM_CLASS_NAME::getTetPointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfTets()
+size_t GEOM_CLASS_NAME::getNumberOfTets()
 {
   return m_TetList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index e7da99830a..21f015fc4d 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -36,7 +36,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedTriList::Pointer GEOM_CLASS_NAME::CreateSharedTriList(int64_t numTris, bool allocate)
+SharedTriList::Pointer GEOM_CLASS_NAME::CreateSharedTriList(size_t numTris, bool allocate)
 {
   QVector<size_t> triDims(1, 3);
   SharedTriList::Pointer triangles = SharedTriList::CreateArray(numTris, triDims, SIMPL::Geometry::SharedTriList, allocate);
@@ -47,7 +47,7 @@ SharedTriList::Pointer GEOM_CLASS_NAME::CreateSharedTriList(int64_t numTris, boo
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeTriList(int64_t newNumTris)
+void GEOM_CLASS_NAME::resizeTriList(size_t newNumTris)
 {
   m_TriList->resizeTuples(newNumTris);
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setTriangles(SharedTriList::Pointer triangles)
 {
   if(triangles.get() != nullptr)
   {
-    if(triangles->getName().compare(SIMPL::Geometry::SharedTriList) != 0)
+    if(triangles->getName() != SIMPL::Geometry::SharedTriList)
     {
       triangles->setName(SIMPL::Geometry::SharedTriList);
     }
@@ -78,9 +78,9 @@ SharedTriList::Pointer GEOM_CLASS_NAME::getTriangles()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setVertsAtTri(int64_t triId, int64_t verts[3])
+void GEOM_CLASS_NAME::setVertsAtTri(size_t triId, size_t verts[3])
 {
-  int64_t* Tri = m_TriList->getTuplePointer(triId);
+  size_t* Tri = m_TriList->getTuplePointer(triId);
   Tri[0] = verts[0];
   Tri[1] = verts[1];
   Tri[2] = verts[2];
@@ -89,9 +89,9 @@ void GEOM_CLASS_NAME::setVertsAtTri(int64_t triId, int64_t verts[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtTri(int64_t triId, int64_t verts[3])
+void GEOM_CLASS_NAME::getVertsAtTri(size_t triId, size_t verts[3])
 {
-  int64_t* Tri = m_TriList->getTuplePointer(triId);
+  size_t* Tri = m_TriList->getTuplePointer(triId);
   verts[0] = Tri[0];
   verts[1] = Tri[1];
   verts[2] = Tri[2];
@@ -100,9 +100,9 @@ void GEOM_CLASS_NAME::getVertsAtTri(int64_t triId, int64_t verts[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtTri(int64_t triId, float vert1[3], float vert2[3], float vert3[3])
+void GEOM_CLASS_NAME::getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3])
 {
-  int64_t* Tri = m_TriList->getTuplePointer(triId);
+  size_t* Tri = m_TriList->getTuplePointer(triId);
   float* tmp1 = m_VertexList->getTuplePointer(Tri[0]);
   float* tmp2 = m_VertexList->getTuplePointer(Tri[1]);
   float* tmp3 = m_VertexList->getTuplePointer(Tri[2]);
@@ -120,7 +120,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtTri(int64_t triId, float vert1[3], float ve
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t* GEOM_CLASS_NAME::getTriPointer(int64_t i)
+size_t* GEOM_CLASS_NAME::getTriPointer(size_t i)
 {
   return m_TriList->getTuplePointer(i);
 }
@@ -128,7 +128,7 @@ int64_t* GEOM_CLASS_NAME::getTriPointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfTris()
+size_t GEOM_CLASS_NAME::getNumberOfTris()
 {
   return m_TriList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index a5b2aad299..c1db85fd9b 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -36,7 +36,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedVertexList::Pointer GEOM_CLASS_NAME::CreateSharedVertexList(int64_t numVertices, bool allocate)
+SharedVertexList::Pointer GEOM_CLASS_NAME::CreateSharedVertexList(size_t numVertices, bool allocate)
 {
   QVector<size_t> vertDims(1, 3);
   SharedVertexList::Pointer vertices = SharedVertexList::CreateArray(numVertices, vertDims, SIMPL::Geometry::SharedVertexList, allocate);
@@ -47,7 +47,7 @@ SharedVertexList::Pointer GEOM_CLASS_NAME::CreateSharedVertexList(int64_t numVer
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::resizeVertexList(int64_t newNumVertices)
+void GEOM_CLASS_NAME::resizeVertexList(size_t newNumVertices)
 {
   m_VertexList->resizeTuples(newNumVertices);
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setVertices(SharedVertexList::Pointer vertices)
 {
   if(vertices.get() != nullptr)
   {
-    if(vertices->getName().compare(SIMPL::Geometry::SharedVertexList) != 0)
+    if(vertices->getName() != SIMPL::Geometry::SharedVertexList)
     {
       vertices->setName(SIMPL::Geometry::SharedVertexList);
     }
@@ -78,7 +78,7 @@ SharedVertexList::Pointer GEOM_CLASS_NAME::getVertices()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::setCoords(int64_t vertId, float coords[3])
+void GEOM_CLASS_NAME::setCoords(size_t vertId, float coords[3])
 {
   float* Vert = m_VertexList->getTuplePointer(vertId);
   Vert[0] = coords[0];
@@ -89,7 +89,7 @@ void GEOM_CLASS_NAME::setCoords(int64_t vertId, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getCoords(int64_t vertId, float coords[3])
+void GEOM_CLASS_NAME::getCoords(size_t vertId, float coords[3])
 {
   float* Vert = m_VertexList->getTuplePointer(vertId);
   coords[0] = Vert[0];
@@ -100,7 +100,7 @@ void GEOM_CLASS_NAME::getCoords(int64_t vertId, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-float* GEOM_CLASS_NAME::getVertexPointer(int64_t i)
+float* GEOM_CLASS_NAME::getVertexPointer(size_t i)
 {
   return m_VertexList->getTuplePointer(i);
 }
@@ -108,7 +108,7 @@ float* GEOM_CLASS_NAME::getVertexPointer(int64_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t GEOM_CLASS_NAME::getNumberOfVertices()
+size_t GEOM_CLASS_NAME::getNumberOfVertices()
 {
   return m_VertexList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 5e010e1025..82b9f4ac25 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -63,7 +63,7 @@
 class FindTetDerivativesImpl
 {
 public:
-  FindTetDerivativesImpl(TetrahedralGeom* tets, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindTetDerivativesImpl(TetrahedralGeom* tets, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Tets(tets)
   , m_Field(field)
   , m_Derivatives(derivs)
@@ -71,20 +71,20 @@ class FindTetDerivativesImpl
   }
   virtual ~FindTetDerivativesImpl() = default;
 
-  void compute(int64_t start, int64_t end) const
+  void compute(size_t start, size_t end) const
   {
     int32_t cDims = m_Field->getNumberOfComponents();
     double* fieldPtr = m_Field->getPointer(0);
     double* derivsPtr = m_Derivatives->getPointer(0);
     double values[4] = {0.0, 0.0, 0.0, 0.0};
     double derivs[3] = {0.0, 0.0, 0.0};
-    int64_t verts[4]{0, 0, 0, 0};
+    size_t verts[4]{0, 0, 0, 0};
 
-    int64_t counter = 0;
-    int64_t totalElements = m_Tets->getNumberOfTets();
-    int64_t progIncrement = static_cast<int64_t>(totalElements / 100);
+    size_t counter = 0;
+    size_t totalElements = m_Tets->getNumberOfTets();
+    size_t progIncrement = static_cast<size_t>(totalElements / 100);
 
-    for(int64_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       m_Tets->getVertsAtTet(i, verts);
       for(size_t j = 0; j < cDims; j++)
@@ -109,7 +109,7 @@ class FindTetDerivativesImpl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<int64_t>& r) const
+  void operator()(const tbb::blocked_range<size_t>& r) const
   {
     compute(r.begin(), r.end());
   }
@@ -151,7 +151,7 @@ TetrahedralGeom::~TetrahedralGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TetrahedralGeom::Pointer TetrahedralGeom::CreateGeometry(int64_t numTets, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
+TetrahedralGeom::Pointer TetrahedralGeom::CreateGeometry(size_t numTets, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -169,7 +169,7 @@ TetrahedralGeom::Pointer TetrahedralGeom::CreateGeometry(int64_t numTets, Shared
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TetrahedralGeom::Pointer TetrahedralGeom::CreateGeometry(SharedTetList::Pointer tets, SharedVertexList::Pointer vertices, const QString& name)
+TetrahedralGeom::Pointer TetrahedralGeom::CreateGeometry(const SharedTetList::Pointer& tets, const SharedVertexList::Pointer& vertices, const QString& name)
 {
   if(name.isEmpty())
   {
@@ -211,15 +211,15 @@ void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, Attribute
     // TetrahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfVertices())
+  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfEdges())
+  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfEdges())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Face && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfTris())
+  if(data->getType() == AttributeMatrix::Type::Face && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfTris())
   {
     return;
   }
@@ -248,7 +248,7 @@ size_t TetrahedralGeom::getNumberOfElements()
 int TetrahedralGeom::findEdges()
 {
   m_EdgeList = CreateSharedEdgeList(0);
-  GeometryHelpers::Connectivity::FindTetEdges<int64_t>(m_TetList, m_EdgeList);
+  GeometryHelpers::Connectivity::FindTetEdges<size_t>(m_TetList, m_EdgeList);
   if(m_EdgeList.get() == nullptr)
   {
     return -1;
@@ -270,7 +270,7 @@ void TetrahedralGeom::deleteEdges()
 int TetrahedralGeom::findFaces()
 {
   m_TriList = CreateSharedTriList(0);
-  GeometryHelpers::Connectivity::FindTetFaces<int64_t>(m_TetList, m_TriList);
+  GeometryHelpers::Connectivity::FindTetFaces<size_t>(m_TetList, m_TriList);
   if(m_TriList.get() == nullptr)
   {
     return -1;
@@ -292,7 +292,7 @@ void TetrahedralGeom::deleteFaces()
 int TetrahedralGeom::findElementsContainingVert()
 {
   m_TetsContainingVert = ElementDynamicList::New();
-  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, int64_t>(m_TetList, m_TetsContainingVert, getNumberOfVertices());
+  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, size_t>(m_TetList, m_TetsContainingVert, getNumberOfVertices());
   if(m_TetsContainingVert.get() == nullptr)
   {
     return -1;
@@ -339,7 +339,7 @@ int TetrahedralGeom::findElementNeighbors()
     }
   }
   m_TetNeighbors = ElementDynamicList::New();
-  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, int64_t>(m_TetList, m_TetsContainingVert, m_TetNeighbors, IGeometry::Type::Tetrahedral);
+  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, size_t>(m_TetList, m_TetsContainingVert, m_TetNeighbors, IGeometry::Type::Tetrahedral);
   if(m_TetNeighbors.get() == nullptr)
   {
     return -1;
@@ -378,7 +378,7 @@ int TetrahedralGeom::findElementCentroids()
 {
   QVector<size_t> cDims(1, 3);
   m_TetCentroids = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetCentroids);
-  GeometryHelpers::Topology::FindElementCentroids<int64_t>(m_TetList, m_VertexList, m_TetCentroids);
+  GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TetList, m_VertexList, m_TetCentroids);
   if(m_TetCentroids.get() == nullptr)
   {
     return -1;
@@ -418,7 +418,7 @@ int TetrahedralGeom::findElementSizes()
 {
   QVector<size_t> cDims(1, 1);
   m_TetSizes = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetVolumes);
-  GeometryHelpers::Topology::FindTetVolumes<int64_t>(m_TetList, m_VertexList, m_TetSizes);
+  GeometryHelpers::Topology::FindTetVolumes<size_t>(m_TetList, m_VertexList, m_TetSizes);
   if(m_TetSizes.get() == nullptr)
   {
     return -1;
@@ -457,7 +457,7 @@ int TetrahedralGeom::findUnsharedEdges()
 {
   QVector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
-  GeometryHelpers::Connectivity::FindUnsharedTetEdges<int64_t>(m_TetList, m_UnsharedEdgeList);
+  GeometryHelpers::Connectivity::FindUnsharedTetEdges<size_t>(m_TetList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
     return -1;
@@ -496,7 +496,7 @@ int TetrahedralGeom::findUnsharedFaces()
 {
   QVector<size_t> cDims(1, 3);
   m_UnsharedTriList = SharedTriList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList);
-  GeometryHelpers::Connectivity::FindUnsharedTetFaces<int64_t>(m_TetList, m_UnsharedTriList);
+  GeometryHelpers::Connectivity::FindUnsharedTetFaces<size_t>(m_TetList, m_UnsharedTriList);
   if(m_UnsharedTriList.get() == nullptr)
   {
     return -1;
@@ -570,7 +570,7 @@ void TetrahedralGeom::getShapeFunctions(double pCoords[3], double* shape)
 void TetrahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  int64_t numTets = getNumberOfTets();
+  size_t numTets = getNumberOfTets();
 
   if(observable != nullptr)
   {
@@ -585,7 +585,7 @@ void TetrahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArra
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   if(doParallel)
   {
-    tbb::parallel_for(tbb::blocked_range<int64_t>(0, numTets), FindTetDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, numTets), FindTetDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
   }
   else
 #endif
@@ -677,7 +677,7 @@ int TetrahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(wri
   if(m_TetNeighbors.get() != nullptr)
   {
     size_t numTets = getNumberOfTets();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_TetNeighbors, numTets, SIMPL::StringConstants::TetNeighbors);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_TetNeighbors, numTets, SIMPL::StringConstants::TetNeighbors);
     if(err < 0)
     {
       return err;
@@ -687,7 +687,7 @@ int TetrahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(wri
   if(m_TetsContainingVert.get() != nullptr)
   {
     size_t numVerts = getNumberOfVertices();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_TetsContainingVert, numVerts, SIMPL::StringConstants::TetsContainingVert);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_TetsContainingVert, numVerts, SIMPL::StringConstants::TetsContainingVert);
     if(err < 0)
     {
       return err;
@@ -761,10 +761,10 @@ QString TetrahedralGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tetrahedra</th><td>" << getNumberOfTets() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Vertices</th><td>" << getNumberOfVertices() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Tetrahedra</th><td>)" << getNumberOfTets() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
   }
   else
   {
@@ -779,29 +779,62 @@ int TetrahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  SharedTetList::Pointer tets = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedTetList>(SIMPL::Geometry::SharedTetList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTetList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedTetList::Pointer tets =
+      SharedTetList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(tets.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
   size_t numTets = tets->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  SharedTriList::Pointer tris = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedTriList>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedTriList::Pointer tris =
+      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedTriList::Pointer bTris = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedTriList>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedTriList::Pointer bTris =
+      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer edges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer bEdges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedEdgeList::Pointer bEdges =
+      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
   if(err < 0 && err != -2)
   {
     return -1;
@@ -816,12 +849,13 @@ int TetrahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   {
     return -1;
   }
-  ElementDynamicList::Pointer tetNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::TetNeighbors, parentId, numTets, preflight, err);
+  ElementDynamicList::Pointer tetNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::TetNeighbors, parentId, numTets, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  ElementDynamicList::Pointer tetsContainingVert = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::TetsContainingVert, parentId, numVerts, preflight, err);
+  ElementDynamicList::Pointer tetsContainingVert =
+      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, MeshIndexType>(SIMPL::StringConstants::TetsContainingVert, parentId, numVerts, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 43e0f72cc3..23777f7d5a 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param name
      * @return
      */
-    static Pointer CreateGeometry(int64_t numTets, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
+    static Pointer CreateGeometry(size_t numTets, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
 
     /**
      * @brief CreateGeometry
@@ -67,46 +67,46 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param name
      * @return
      */
-    static Pointer CreateGeometry(SharedTetList::Pointer tets, SharedVertexList::Pointer vertices, const QString& name);
+    static Pointer CreateGeometry(const SharedTetList::Pointer& tets, const SharedVertexList::Pointer& vertices, const QString& name);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedVertexOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedVertexOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedVertexList
      * @param numVertices
      * @return
      */
-    static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+    static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedEdgeOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedEdgeOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedEdgeList
      * @param numEdges
      * @return
      */
-    static SharedEdgeList::Pointer CreateSharedEdgeList(int64_t numEdges, bool allocate = true);
+    static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedTriOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedTriOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedTriList
      * @param numTris
      * @return
      */
-    static SharedTriList::Pointer CreateSharedTriList(int64_t numTris, bool allocate = true);
+    static SharedTriList::Pointer CreateSharedTriList(size_t numTris, bool allocate = true);
 
     /**
      * @brief resizeTriList
      * @param newNumTris
      */
-    void resizeTriList(int64_t newNumTris);
+    void resizeTriList(size_t newNumTris);
 
     /**
      * @brief setTriangles
@@ -125,14 +125,14 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param triId
      * @param verts
      */
-    void setVertsAtTri(int64_t triId, int64_t verts[3]);
+    void setVertsAtTri(size_t triId, size_t verts[3]);
 
     /**
      * @brief getVertsAtTri
      * @param triId
      * @param verts
      */
-    void getVertsAtTri(int64_t triId, int64_t verts[3]);
+    void getVertsAtTri(size_t triId, size_t verts[3]);
 
     /**
      * @brief getVertCoordsAtTri
@@ -141,37 +141,37 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert2
      * @param vert3
      */
-    void getVertCoordsAtTri(int64_t triId, float vert1[3], float vert2[3], float vert3[3]);
+    void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]);
 
     /**
      * @brief getTriPointer
      * @param i
      * @return
      */
-    int64_t* getTriPointer(int64_t i);
+    size_t* getTriPointer(size_t i);
 
     /**
      * @brief getNumberOfTris
      * @return
      */
-    int64_t getNumberOfTris();
+    size_t getNumberOfTris();
 
-// -----------------------------------------------------------------------------
-// Inherited from SharedTetOps
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from SharedTetOps
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief CreateSharedTetList
      * @param numTets
      * @return
      */
-    static SharedTriList::Pointer CreateSharedTetList(int64_t numTets, bool allocate = true);
+    static SharedTriList::Pointer CreateSharedTetList(size_t numTets, bool allocate = true);
 
     /**
      * @brief resizeTetList
      * @param newNumTets
      */
-    void resizeTetList(int64_t newNumTets);
+    void resizeTetList(size_t newNumTets);
 
     /**
      * @brief setTetrahedra
@@ -190,14 +190,14 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param tetId
      * @param verts
      */
-    void setVertsAtTet(int64_t tetId, int64_t verts[4]);
+    void setVertsAtTet(size_t tetId, size_t verts[4]);
 
     /**
      * @brief getVertsAtTet
      * @param tetId
      * @param verts
      */
-    void getVertsAtTet(int64_t tetId, int64_t verts[4]);
+    void getVertsAtTet(size_t tetId, size_t verts[4]);
 
     /**
      * @brief getVertCoordsAtTet
@@ -206,24 +206,24 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert2
      * @param vert3
      */
-    void getVertCoordsAtTet(int64_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+    void getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
 
     /**
      * @brief getTetPointer
      * @param i
      * @return
      */
-    int64_t* getTetPointer(int64_t i);
+    size_t* getTetPointer(size_t i);
 
     /**
      * @brief getNumberOfTets
      * @return
      */
-    int64_t getNumberOfTets();
+    size_t getNumberOfTets();
 
-// -----------------------------------------------------------------------------
-// Inherited from IGeometry
-// -----------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------
+    // Inherited from IGeometry
+    // -----------------------------------------------------------------------------
 
     /**
      * @brief initializeWithZeros
@@ -375,7 +375,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief resizeVertexList
      * @param newNumVertices
      */
-    void resizeVertexList(int64_t newNumVertices) override;
+    void resizeVertexList(size_t newNumVertices) override;
 
     /**
      * @brief setVertices
@@ -394,33 +394,33 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vertId
      * @param coords
      */
-    void setCoords(int64_t vertId, float coords[3]) override;
+    void setCoords(size_t vertId, float coords[3]) override;
 
     /**
      * @brief getCoords
      * @param vertId
      * @param coords
      */
-    void getCoords(int64_t vertId, float coords[3]) override;
+    void getCoords(size_t vertId, float coords[3]) override;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    float* getVertexPointer(int64_t i) override;
+    float* getVertexPointer(size_t i) override;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    int64_t getNumberOfVertices() override;
+    size_t getNumberOfVertices() override;
 
     /**
      * @brief resizeEdgeList
      * @param newNumEdges
      */
-    void resizeEdgeList(int64_t newNumEdges) override;
+    void resizeEdgeList(size_t newNumEdges) override;
 
     /**
      * @brief getEdges
@@ -433,14 +433,14 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param edgeId
      * @param verts
      */
-    void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+    void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
     /**
      * @brief getVerts
      * @param edgeId
      * @param verts
      */
-    void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+    void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -448,20 +448,20 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert1
      * @param vert2
      */
-    void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) override;
+    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    int64_t* getEdgePointer(int64_t i) override;
+    size_t* getEdgePointer(size_t i) override;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    int64_t getNumberOfEdges() override;
+    size_t getNumberOfEdges() override;
 
     /**
      * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index cfdd4e8a9f..893234c4e8 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -63,7 +63,7 @@
 class FindTriangleDerivativesImpl
 {
 public:
-  FindTriangleDerivativesImpl(TriangleGeom* tris, DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivs)
+  FindTriangleDerivativesImpl(TriangleGeom* tris, const DoubleArrayType::Pointer& field, const DoubleArrayType::Pointer& derivs)
   : m_Tris(tris)
   , m_Field(field)
   , m_Derivatives(derivs)
@@ -71,20 +71,20 @@ class FindTriangleDerivativesImpl
   }
   virtual ~FindTriangleDerivativesImpl() = default;
 
-  void compute(int64_t start, int64_t end) const
+  void compute(size_t start, size_t end) const
   {
     int32_t cDims = m_Field->getNumberOfComponents();
     double* fieldPtr = m_Field->getPointer(0);
     double* derivsPtr = m_Derivatives->getPointer(0);
     double values[3] = {0.0, 0.0, 0.0};
     double derivs[3] = {0.0, 0.0, 0.0};
-    int64_t verts[3]{0, 0, 0};
+    size_t verts[3]{0, 0, 0};
 
-    int64_t counter = 0;
-    int64_t totalElements = m_Tris->getNumberOfTris();
-    int64_t progIncrement = static_cast<int64_t>(totalElements / 100);
+    size_t counter = 0;
+    size_t totalElements = m_Tris->getNumberOfTris();
+    size_t progIncrement = static_cast<size_t>(totalElements / 100);
 
-    for(int64_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       m_Tris->getVertsAtTri(i, verts);
       for(size_t j = 0; j < cDims; j++)
@@ -109,7 +109,7 @@ class FindTriangleDerivativesImpl
   }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<int64_t>& r) const
+  void operator()(const tbb::blocked_range<size_t>& r) const
   {
     compute(r.begin(), r.end());
   }
@@ -149,7 +149,7 @@ TriangleGeom::~TriangleGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TriangleGeom::Pointer TriangleGeom::CreateGeometry(int64_t numTriangles, SharedVertexList::Pointer vertices, const QString& name, bool allocate)
+TriangleGeom::Pointer TriangleGeom::CreateGeometry(size_t numTriangles, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -167,7 +167,7 @@ TriangleGeom::Pointer TriangleGeom::CreateGeometry(int64_t numTriangles, SharedV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TriangleGeom::Pointer TriangleGeom::CreateGeometry(SharedTriList::Pointer triangles, SharedVertexList::Pointer vertices, const QString& name)
+TriangleGeom::Pointer TriangleGeom::CreateGeometry(const SharedTriList::Pointer& triangles, const SharedVertexList::Pointer& vertices, const QString& name)
 {
   if(name.isEmpty())
   {
@@ -208,11 +208,11 @@ void TriangleGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMat
     // TriangleGeom can only accept vertex, edge, or face Attribute Matrices
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfVertices())
+  if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
   {
     return;
   }
-  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<int64_t>(data->getNumberOfTuples()) != getNumberOfEdges())
+  if(data->getType() == AttributeMatrix::Type::Edge && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfEdges())
   {
     return;
   }
@@ -241,7 +241,7 @@ size_t TriangleGeom::getNumberOfElements()
 int TriangleGeom::findEdges()
 {
   m_EdgeList = CreateSharedEdgeList(0);
-  GeometryHelpers::Connectivity::Find2DElementEdges<int64_t>(m_TriList, m_EdgeList);
+  GeometryHelpers::Connectivity::Find2DElementEdges<size_t>(m_TriList, m_EdgeList);
   if(m_EdgeList.get() == nullptr)
   {
     return -1;
@@ -263,7 +263,7 @@ void TriangleGeom::deleteEdges()
 int TriangleGeom::findElementsContainingVert()
 {
   m_TrianglesContainingVert = ElementDynamicList::New();
-  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, int64_t>(m_TriList, m_TrianglesContainingVert, getNumberOfVertices());
+  GeometryHelpers::Connectivity::FindElementsContainingVert<uint16_t, size_t>(m_TriList, m_TrianglesContainingVert, getNumberOfVertices());
   if(m_TrianglesContainingVert.get() == nullptr)
   {
     return -1;
@@ -310,7 +310,7 @@ int TriangleGeom::findElementNeighbors()
     }
   }
   m_TriangleNeighbors = ElementDynamicList::New();
-  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, int64_t>(m_TriList, m_TrianglesContainingVert, m_TriangleNeighbors, IGeometry::Type::Triangle);
+  err = GeometryHelpers::Connectivity::FindElementNeighbors<uint16_t, size_t>(m_TriList, m_TrianglesContainingVert, m_TriangleNeighbors, IGeometry::Type::Triangle);
   if(m_TriangleNeighbors.get() == nullptr)
   {
     return -1;
@@ -349,7 +349,7 @@ int TriangleGeom::findElementCentroids()
 {
   QVector<size_t> cDims(1, 3);
   m_TriangleCentroids = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleCentroids);
-  GeometryHelpers::Topology::FindElementCentroids<int64_t>(m_TriList, m_VertexList, m_TriangleCentroids);
+  GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TriList, m_VertexList, m_TriangleCentroids);
   if(m_TriangleCentroids.get() == nullptr)
   {
     return -1;
@@ -388,7 +388,7 @@ int TriangleGeom::findElementSizes()
 {
   QVector<size_t> cDims(1, 1);
   m_TriangleSizes = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleAreas);
-  GeometryHelpers::Topology::Find2DElementAreas<int64_t>(m_TriList, m_VertexList, m_TriangleSizes);
+  GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_TriList, m_VertexList, m_TriangleSizes);
   if(m_TriangleSizes.get() == nullptr)
   {
     return -1;
@@ -427,7 +427,7 @@ int TriangleGeom::findUnsharedEdges()
 {
   QVector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
-  GeometryHelpers::Connectivity::Find2DUnsharedEdges<int64_t>(m_TriList, m_UnsharedEdgeList);
+  GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_TriList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
     return -1;
@@ -493,7 +493,7 @@ void TriangleGeom::getShapeFunctions(double pCoords[3], double* shape)
 void TriangleGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable)
 {
   m_ProgressCounter = 0;
-  int64_t numTris = getNumberOfTris();
+  size_t numTris = getNumberOfTris();
 
   if(observable != nullptr)
   {
@@ -508,7 +508,7 @@ void TriangleGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   if(doParallel)
   {
-    tbb::parallel_for(tbb::blocked_range<int64_t>(0, numTris), FindTriangleDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
+    tbb::parallel_for(tbb::blocked_range<size_t>(0, numTris), FindTriangleDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
   }
   else
 #endif
@@ -583,7 +583,7 @@ int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
   if(m_TriangleNeighbors.get() != nullptr)
   {
     size_t numTris = getNumberOfTris();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_TriangleNeighbors, numTris, SIMPL::StringConstants::TriangleNeighbors);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_TriangleNeighbors, numTris, SIMPL::StringConstants::TriangleNeighbors);
     if(err < 0)
     {
       return err;
@@ -593,7 +593,7 @@ int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
   if(m_TrianglesContainingVert.get() != nullptr)
   {
     size_t numVerts = getNumberOfVertices();
-    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, int64_t>(parentId, m_TrianglesContainingVert, numVerts, SIMPL::StringConstants::TrianglesContainingVert);
+    err = GeometryHelpers::GeomIO::WriteDynamicListToHDF5<uint16_t, size_t>(parentId, m_TrianglesContainingVert, numVerts, SIMPL::StringConstants::TrianglesContainingVert);
     if(err < 0)
     {
       return err;
@@ -667,10 +667,10 @@ QString TriangleGeom::getInfoString(SIMPL::InfoStringFormat format)
   if(format == SIMPL::HtmlFormat)
   {
     ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type</th><td>" << TypeToString(getGeometryType()) << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
     ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Triangles</th><td>" << getNumberOfTris() << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Vertices</th><td>" << getNumberOfVertices() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Triangles</th><td>)" << getNumberOfTris() << "</td></tr>";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
   }
   else
   {
@@ -685,7 +685,14 @@ int TriangleGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  SharedTriList::Pointer tris = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedQuadList>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
+  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
+  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
+  // Now create the correct type and pass in the pointer to tempTris.
+  SharedTriList::Pointer tris =
+      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+  // Release the ownership of the memory from TempTris and essentially pass it to tris.
+  tempUInt64->releaseOwnership();
+
   if(tris.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
@@ -712,13 +719,13 @@ int TriangleGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   {
     return -1;
   }
-  ElementDynamicList::Pointer triNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::TriangleNeighbors, parentId, numTris, preflight, err);
+  ElementDynamicList::Pointer triNeighbors = GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, size_t>(SIMPL::StringConstants::TriangleNeighbors, parentId, numTris, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
   ElementDynamicList::Pointer trisContainingVert =
-      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, int64_t>(SIMPL::StringConstants::TrianglesContainingVert, parentId, numVerts, preflight, err);
+      GeometryHelpers::GeomIO::ReadDynamicListFromHDF5<uint16_t, size_t>(SIMPL::StringConstants::TrianglesContainingVert, parentId, numVerts, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index eec4095b86..c856382e25 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -46,7 +46,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   // clang-format off
   PYB11_CREATE_BINDINGS(TriangleGeom SUPERCLASS IGeometry2D)
 	  
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD int64_t SharedVertexList::Pointer QString bool)
+  PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedTriList::Pointer SharedVertexList::Pointer QString)
 
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
@@ -55,11 +55,11 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
 
-  PYB11_METHOD(void setCoords int64_t,vertId float,coords[3])
-  PYB11_METHOD(void getCoords int64_t,vertId float,coords[3])
+  PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
+  PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
 
-  PYB11_METHOD(int64_t getNumberOfVertices)
-  PYB11_METHOD(int64_t getNumberOfEdges)
+  PYB11_METHOD(size_t getNumberOfVertices)
+  PYB11_METHOD(size_t getNumberOfEdges)
   // clang-format on
 
 public:
@@ -76,7 +76,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(int64_t numTriangles, SharedVertexList::Pointer vertices, const QString& name, bool allocate = true);
+  static Pointer CreateGeometry(size_t numTriangles, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateGeometry
@@ -85,7 +85,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(SharedTriList::Pointer triangles, SharedVertexList::Pointer vertices, const QString& name);
+  static Pointer CreateGeometry(const SharedTriList::Pointer& triangles, const SharedVertexList::Pointer& vertices, const QString& name);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedVertexOps
@@ -96,7 +96,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param numVertices
    * @return
    */
-  static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedEdgeOps
@@ -107,7 +107,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param numEdges
    * @return
    */
-  static SharedEdgeList::Pointer CreateSharedEdgeList(int64_t numEdges, bool allocate = true);
+  static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedTriOps
@@ -118,13 +118,13 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param numTris
    * @return
    */
-  static SharedTriList::Pointer CreateSharedTriList(int64_t numTris, bool allocate = true);
+  static SharedTriList::Pointer CreateSharedTriList(size_t numTris, bool allocate = true);
 
   /**
    * @brief resizeTriList
    * @param newNumTris
    */
-  void resizeTriList(int64_t newNumTris);
+  void resizeTriList(size_t newNumTris);
 
   /**
    * @brief setTriangles
@@ -143,14 +143,14 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param triId
    * @param verts
    */
-  void setVertsAtTri(int64_t triId, int64_t verts[3]);
+  void setVertsAtTri(size_t triId, size_t verts[3]);
 
   /**
    * @brief getVertsAtTri
    * @param triId
    * @param verts
    */
-  void getVertsAtTri(int64_t triId, int64_t verts[3]);
+  void getVertsAtTri(size_t triId, size_t verts[3]);
 
   /**
    * @brief getVertCoordsAtTri
@@ -159,20 +159,20 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vert2
    * @param vert3
    */
-  void getVertCoordsAtTri(int64_t triId, float vert1[3], float vert2[3], float vert3[3]);
+  void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]);
 
   /**
    * @brief getPointer
    * @param i
    * @return
    */
-  int64_t* getTriPointer(int64_t i);
+  size_t* getTriPointer(size_t i);
 
   /**
    * @brief getNumberOfTris
    * @return
    */
-  int64_t getNumberOfTris();
+  size_t getNumberOfTris();
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -328,7 +328,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief resizeVertexList
    * @param newNumVertices
    */
-  void resizeVertexList(int64_t newNumVertices) override;
+  void resizeVertexList(size_t newNumVertices) override;
 
   /**
    * @brief setVertices
@@ -347,33 +347,33 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vertId
    * @param coords
    */
-  void setCoords(int64_t vertId, float coords[3]) override;
+  void setCoords(size_t vertId, float coords[3]) override;
 
   /**
    * @brief getCoords
    * @param vertId
    * @param coords
    */
-  void getCoords(int64_t vertId, float coords[3]) override;
+  void getCoords(size_t vertId, float coords[3]) override;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(int64_t i) override;
+  float* getVertexPointer(size_t i) override;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  int64_t getNumberOfVertices() override;
+  size_t getNumberOfVertices() override;
 
   /**
    * @brief resizeEdgeList
    * @param newNumEdges
    */
-  void resizeEdgeList(int64_t newNumEdges) override;
+  void resizeEdgeList(size_t newNumEdges) override;
 
   /**
    * @brief getEdges
@@ -386,14 +386,14 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param edgeId
    * @param verts
    */
-  void setVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+  void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
   /**
    * @brief getVerts
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(int64_t edgeId, int64_t verts[2]) override;
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
 
   /**
    * @brief getVertCoordsAtEdge
@@ -401,20 +401,20 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(int64_t edgeId, float vert1[3], float vert2[3]) override;
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  int64_t* getEdgePointer(int64_t i) override;
+  size_t* getEdgePointer(size_t i) override;
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  int64_t getNumberOfEdges() override;
+  size_t getNumberOfEdges() override;
 
   /**
    * @brief findElementEdges
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 1bd52b2cff..a6bb689cde 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -67,7 +67,7 @@ VertexGeom::~VertexGeom() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-VertexGeom::Pointer VertexGeom::CreateGeometry(int64_t numVertices, const QString& name, bool allocate)
+VertexGeom::Pointer VertexGeom::CreateGeometry(size_t numVertices, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -84,7 +84,7 @@ VertexGeom::Pointer VertexGeom::CreateGeometry(int64_t numVertices, const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-VertexGeom::Pointer VertexGeom::CreateGeometry(SharedVertexList::Pointer vertices, const QString& name)
+VertexGeom::Pointer VertexGeom::CreateGeometry(const SharedVertexList::Pointer& vertices, const QString& name)
 {
   if(name.isEmpty())
   {
@@ -317,8 +317,8 @@ int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
     if(writeXdmf)
     {
       QVector<size_t> cDims(1, 1);
-      DataArray<int64_t>::Pointer vertsPtr = DataArray<int64_t>::CreateArray(getNumberOfVertices(), cDims, SIMPL::StringConstants::VertsName);
-      int64_t* verts = vertsPtr->getPointer(0);
+      DataArray<size_t>::Pointer vertsPtr = DataArray<size_t>::CreateArray(getNumberOfVertices(), cDims, SIMPL::StringConstants::VertsName);
+      size_t* verts = vertsPtr->getPointer(0);
       for(size_t i = 0; i < vertsPtr->getNumberOfTuples(); i++)
       {
         verts[i] = i;
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index c8f149bc2d..decd5aeafd 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -50,16 +50,16 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
 
   PYB11_CREATE_BINDINGS(VertexGeom SUPERCLASS IGeometry)
   
-  PYB11_CREATION(CreateGeometry ARGS int64_t QString bool)
+  PYB11_CREATION(CreateGeometry ARGS size_t QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedVertexList::Pointer QString)
 
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertexList::Pointer getVertices)
 
-  PYB11_METHOD(void setCoords int64_t,vertId float,coords[3])
-  PYB11_METHOD(void getCoords int64_t,vertId float,coords[3])
+  PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
+  PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
 
-  PYB11_METHOD(int64_t getNumberOfVertices)
+  PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfElements)
   // clang-format on
 
@@ -76,7 +76,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(int64_t numVertices, const QString& name, bool allocate = true);
+  static Pointer CreateGeometry(size_t numVertices, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateGeometry
@@ -84,7 +84,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param name
    * @return
    */
-  static Pointer CreateGeometry(SharedVertexList::Pointer vertices, const QString& name);
+  static Pointer CreateGeometry(const SharedVertexList::Pointer& vertices, const QString& name);
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedVertexOps
@@ -95,13 +95,13 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param numVertices
    * @return
    */
-  static SharedVertexList::Pointer CreateSharedVertexList(int64_t numVertices, bool allocate = true);
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
 
   /**
    * @brief resizeVertexList
    * @param newNumVertices
    */
-  void resizeVertexList(int64_t newNumVertices);
+  void resizeVertexList(size_t newNumVertices);
 
   /**
    * @brief setVertices
@@ -120,27 +120,27 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param vertId
    * @param coords
    */
-  void setCoords(int64_t vertId, float coords[3]);
+  void setCoords(size_t vertId, float coords[3]);
 
   /**
    * @brief getCoords
    * @param vertId
    * @param coords
    */
-  void getCoords(int64_t vertId, float coords[3]);
+  void getCoords(size_t vertId, float coords[3]);
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(int64_t i);
+  float* getVertexPointer(size_t i);
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  int64_t getNumberOfVertices();
+  size_t getNumberOfVertices();
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry

From 0ecb8dd854ce31dd7efd1e252c56546f7e4f1900 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Tue, 7 May 2019 12:08:09 -0400
Subject: [PATCH 092/397] The DataStructureWidget no longer expands all items
 on refresh (#348)

* Refreshing the data in DataStructureWidget no longer expands all items.
* Adding child nodes to the DataStructureWidget now expands the parent if the parent did not have any children previously.
* Removed commented out styling for the DataStructure.  This has been handled by the stylesheets for some time and is unlikely to ever return to DataStructureWidget.
---
 .../SVWidgetsLib/Widgets/DataStructureTreeView.cpp | 14 ++++++++++++++
 .../SVWidgetsLib/Widgets/DataStructureTreeView.h   |  8 ++++++++
 .../SVWidgetsLib/Widgets/DataStructureWidget.cpp   | 11 +----------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 7385f833a0..9d6b3ff27e 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -520,3 +520,17 @@ void DataStructureTreeView::search(const QString& name)
   }
   update();
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::rowsInserted(const QModelIndex& parent, int start, int end)
+{
+  QTreeView::rowsInserted(parent, start, end);
+
+  // Expand if the specified parent did not have children previously
+  if(0 == start && !parent.child(end + 1, 0).isValid())
+  {
+    expand(parent);
+  }
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index 4ffeba148f..672e5ef173 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -205,6 +205,14 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void findExpandedChildren(QAbstractItemModel* model, const QModelIndex& index, QVector<QModelIndex>& expandedVector);
 
+  /**
+   * @brief rowsInserted
+   * @param parent
+   * @param start
+   * @param end
+   */
+  void rowsInserted(const QModelIndex& parent, int start, int end) override;
+
   /**
    * @brief Create custom context menu
    * @param event
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index b2ed4ef1c5..6a8b8d83d0 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -241,7 +241,6 @@ void DataStructureWidget::refreshData()
       path.push_front(item->text());
       item = item->parent();
     }
-
   }
 
   model = m_Ui->dataBrowserTreeView->getStandardModel();
@@ -263,8 +262,7 @@ void DataStructureWidget::refreshData()
     if(dcItem == nullptr)
     {
       dcItem = new QStandardItem(dc->getName());
-      rootItem->appendRow(dcItem);
-      //      dcItem->setBackground(QBrush(QColor(154, 136, 255)));
+      model->appendRow(dcItem);
       m_Ui->dataBrowserTreeView->expand(dcItem->index());
     }
     dcItem->setData(dc->getInfoString(SIMPL::HtmlFormat), Qt::UserRole + 1);
@@ -319,7 +317,6 @@ void DataStructureWidget::refreshData()
       if(amItem == nullptr)
       {
         amItem = new QStandardItem(am->getName());
-        //          amItem->setBackground(QColor(128, 224, 138));
         dcItem->appendRow(amItem);
         m_Ui->dataBrowserTreeView->expand(amItem->index());
       }
@@ -344,13 +341,8 @@ void DataStructureWidget::refreshData()
         if(aaItem == nullptr)
         {
           aaItem = new QStandardItem(attrArrayName);
-          // aaItem->setBackground(QColor(255, 210, 173));
           amItem->appendRow(aaItem);
         }
-        //        else
-        //        {
-        //          aaItem->setBackground(QColor(255, 255, 255));
-        //        }
         aaItem->setData(attrArray->getInfoString(SIMPL::HtmlFormat), Qt::UserRole + 1);
         aaItem->setToolTip(attrArray->getInfoString(SIMPL::HtmlFormat));
         aaItem->setIcon(QIcon());
@@ -367,7 +359,6 @@ void DataStructureWidget::refreshData()
   }
   removeNonexistingEntries(rootItem, m_Dca->getDataContainerNames(), 0);
 
-  m_Ui->dataBrowserTreeView->expandAll();
   // repaint the DataStructureTreeView
   m_Ui->dataBrowserTreeView->repaint();
 }

From 598e778712b9af89e4c77be2f1ea66719c693008 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 9 May 2019 08:00:49 -0400
Subject: [PATCH 093/397] When generating a pure python file the backslash
 character causes parse issues

Replace instances of '\' with '/' when generating paths.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
index 80b596b832..472ca2a1a7 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
@@ -379,7 +379,9 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
 
   out << "\"\"\"\n Pythonic Interface to SIMPL Plugin " << getLibNameUpper() << "\n";
   out << " This file is auto generated during the build of DREAM.3D and the plugin " << getLibNameUpper() << "\n";
-  out << " The code is generate from file " << __FILE__ << "(" << __LINE__ << ")\n";
+  QString fromFile = QString::fromLatin1(__FILE__);
+  fromFile = fromFile.replace("\\", "/");
+  out << " The code is generate from file " << fromFile << "(" << __LINE__ << ")\n";
   out << " The Filters that have pythonic interfaces generated for them are:\n";
 
   while(iter.hasNext())

From 411a983f05fc8e4839467cdce4f51c08e19092fa Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 10 May 2019 17:04:30 -0400
Subject: [PATCH 094/397] Fixing compiler warning about non-virtual destructor

Remove unused variable.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameters/LinkedPathCreationFilterParameter.h        | 2 ++
 Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp           | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 8e9bd380c3..58b7377b8b 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -138,6 +138,8 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
      * @return
      */
     virtual DataArrayPath generatePath() = 0;
+
+    virtual ~ILinkedPath() = default;
   };
 
   /**
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 9d6b3ff27e..5f40729dcf 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -484,7 +484,6 @@ void DataStructureTreeView::contextMenuEvent(QContextMenuEvent* event)
   DataStructureProxyModel* proxyModel = getProxyModel();
   const bool isValid = index.isValid();
   const int numChildren = proxyModel->rowCount(index);
-  const int numSiblings = proxyModel->rowCount(index.parent());
 
   QMenu menu;
   QAction* expandAllAction = menu.addAction("Expand All");

From 6d948bc12cc5e491b73bf4e9b4f27c123fe97cce Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 11 May 2019 09:47:46 -0400
Subject: [PATCH 095/397] Update docs with preferred markdown heading 1 style

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLibFilters/CoreFilters/ArrayCalculator.md             | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/Breakpoint.md    | 3 +--
 .../SIMPLibFilters/CoreFilters/CombineAttributeArrays.md      | 4 ++--
 .../SIMPLibFilters/CoreFilters/CombineAttributeMatrices.md    | 4 ++--
 .../SIMPLibFilters/CoreFilters/ConditionalSetValue.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md     | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/ConvertData.md   | 4 ++--
 .../CoreFilters/CopyFeatureArrayToElementArray.md             | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/CopyObject.md    | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateAttributeMatrix.md       | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateDataArray.md             | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateDataContainer.md         | 4 ++--
 .../CoreFilters/CreateFeatureArrayFromElementArray.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateGeometry.md              | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateImageGeometry.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/CreateStringArray.md           | 4 ++--
 .../SIMPLibFilters/CoreFilters/CropVertexGeometry.md          | 4 ++--
 .../SIMPLibFilters/CoreFilters/DataContainerReader.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/DataContainerWriter.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/ExecuteProcess.md              | 4 ++--
 .../CoreFilters/ExtractAttributeArraysFromGeometry.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/ExtractComponentAsArray.md     | 4 ++--
 .../SIMPLibFilters/CoreFilters/FeatureCountDecision.md        | 4 ++--
 .../SIMPLibFilters/CoreFilters/FindDerivatives.md             | 4 ++--
 .../SIMPLibFilters/CoreFilters/GenerateColorTable.md          | 4 ++--
 .../SIMPLibFilters/CoreFilters/ImportAsciDataArray.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md           | 4 ++--
 .../SIMPLibFilters/CoreFilters/InitializeData.md              | 4 ++--
 .../CoreFilters/LinkFeatureMapToElementArray.md               | 4 ++--
 .../SIMPLibFilters/CoreFilters/MaskCountDecision.md           | 4 ++--
 .../SIMPLibFilters/CoreFilters/MassCreateData.md              | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/MoveData.md      | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/MoveMultiData.md | 4 ++--
 .../SIMPLibFilters/CoreFilters/MultiThresholdObjects.md       | 4 ++--
 .../SIMPLibFilters/CoreFilters/MultiThresholdObjects2.md      | 4 ++--
 .../SIMPLibFilters/CoreFilters/PipelineAnnotation.md          | 4 ++--
 .../SIMPLibFilters/CoreFilters/PostSlackMessage.md            | 4 ++--
 .../SIMPLibFilters/CoreFilters/RawBinaryReader.md             | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/ReadASCIIData.md | 4 ++--
 .../Documentation/SIMPLibFilters/CoreFilters/RemoveArrays.md  | 4 ++--
 .../SIMPLibFilters/CoreFilters/RemoveComponentFromArray.md    | 4 ++--
 .../SIMPLibFilters/CoreFilters/RenameAttributeArray.md        | 4 ++--
 .../SIMPLibFilters/CoreFilters/RenameAttributeMatrix.md       | 4 ++--
 .../SIMPLibFilters/CoreFilters/RenameDataContainer.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/ReplaceValueInArray.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/RequiredZThickness.md          | 4 ++--
 .../CoreFilters/SetOriginResolutionImageGeom.md               | 4 ++--
 .../SIMPLibFilters/CoreFilters/SplitAttributeArray.md         | 4 ++--
 .../SIMPLibFilters/CoreFilters/WriteTriangleGeometry.md       | 4 ++--
 .../SIMPLibFilters/TestFilters/ArraySelectionExample.md       | 4 ++--
 .../SIMPLibFilters/TestFilters/DynamicTableExample.md         | 4 ++--
 .../SIMPLibFilters/TestFilters/ErrorWarningFilter.md          | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup01.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup02.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup03.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup04.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup05.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup06.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup07.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup08.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup09.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup10.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup11.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup12.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup13.md | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/FilterGroup14.md | 4 ++--
 .../SIMPLibFilters/TestFilters/GenericExample.md              | 4 ++--
 .../SIMPLibFilters/TestFilters/MakeDataContainer.md           | 4 ++--
 .../Documentation/SIMPLibFilters/TestFilters/TestFilters.md   | 4 ++--
 .../SIMPLibFilters/TestFilters/ThresholdExample.md            | 4 ++--
 Source/SIMPLib/TestFilters/FilterDoc.md                       | 4 ++--
 71 files changed, 141 insertions(+), 142 deletions(-)

diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ArrayCalculator.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ArrayCalculator.md
index 0d199ab27c..b6e3cc312d 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ArrayCalculator.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ArrayCalculator.md
@@ -1,5 +1,5 @@
-Attribute Array Calculator 
-=============
+# Attribute Array Calculator  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Breakpoint.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Breakpoint.md
index 7272b8201b..1ea57aec54 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Breakpoint.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Breakpoint.md
@@ -1,2 +1 @@
-Breakpoint 
-=============
\ No newline at end of file
+# Breakpoint  #
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeArrays.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeArrays.md
index e29a42737f..9791d430d1 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeArrays.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeArrays.md
@@ -1,5 +1,5 @@
-Combine Attribute Arrays 
-=============
+# Combine Attribute Arrays  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeMatrices.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeMatrices.md
index 87ef3fcdca..05e844f722 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeMatrices.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CombineAttributeMatrices.md
@@ -1,5 +1,5 @@
-Combine Feature/Ensemble Attribute Matrices 
-=============
+# Combine Feature/Ensemble Attribute Matrices  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConditionalSetValue.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConditionalSetValue.md
index 983d4b3f92..c165637d70 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConditionalSetValue.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConditionalSetValue.md
@@ -1,5 +1,5 @@
-Replace Value in Array (Conditional) 
-=============
+# Replace Value in Array (Conditional)  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md
index bf3f8df96b..d6b0657291 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertColorToGrayScale.md
@@ -1,5 +1,5 @@
-Color to GrayScale 
-=============
+# Color to GrayScale  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertData.md
index 09e667ce22..d2e49ef18c 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ConvertData.md
@@ -1,5 +1,5 @@
-Convert Attribute Data Type 
-=============
+# Convert Attribute Data Type  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyFeatureArrayToElementArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyFeatureArrayToElementArray.md
index f50f268cfe..6209d42f92 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyFeatureArrayToElementArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyFeatureArrayToElementArray.md
@@ -1,5 +1,5 @@
-Create Element Array from Feature Array 
-=============
+# Create Element Array from Feature Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyObject.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyObject.md
index e2f5caf45b..fbcc68e236 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyObject.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CopyObject.md
@@ -1,5 +1,5 @@
-Copy Object 
-=============
+# Copy Object  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateAttributeMatrix.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateAttributeMatrix.md
index ce017dd859..13382bacce 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateAttributeMatrix.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateAttributeMatrix.md
@@ -1,5 +1,5 @@
-Create Attribute Matrix 
-=============
+# Create Attribute Matrix  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
index 5c700696aa..95afe61316 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
@@ -1,5 +1,5 @@
-Create Data Array 
-=============
+# Create Data Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataContainer.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataContainer.md
index b92f83bebd..1a3f0c0c71 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataContainer.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataContainer.md
@@ -1,5 +1,5 @@
-Create Data Container 
-=============
+# Create Data Container  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateFeatureArrayFromElementArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateFeatureArrayFromElementArray.md
index 02d25b8d93..1b0996a2f4 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateFeatureArrayFromElementArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateFeatureArrayFromElementArray.md
@@ -1,5 +1,5 @@
-Create Feature Array From Element Array 
-=============
+# Create Feature Array From Element Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGeometry.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGeometry.md
index 77fdd9c940..057ca8516c 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGeometry.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGeometry.md
@@ -1,5 +1,5 @@
-Create Geometry 
-=============
+# Create Geometry  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateImageGeometry.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateImageGeometry.md
index c13c7248d0..3c04e96e3e 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateImageGeometry.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateImageGeometry.md
@@ -1,5 +1,5 @@
-Create Geometry (Image)  
-=============
+# Create Geometry (Image)   #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateStringArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateStringArray.md
index c35a5d070d..318f15d436 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateStringArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateStringArray.md
@@ -1,5 +1,5 @@
-Create String Array 
-=============
+# Create String Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CropVertexGeometry.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CropVertexGeometry.md
index 2a75b8df5b..46ab7c279d 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CropVertexGeometry.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CropVertexGeometry.md
@@ -1,5 +1,5 @@
-Crop Geometry (Vertex) 
-=============
+# Crop Geometry (Vertex)  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerReader.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerReader.md
index 18de70ac4c..5663c91928 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerReader.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerReader.md
@@ -1,5 +1,5 @@
-Read DREAM.3D Data File 
-=============
+# Read DREAM.3D Data File  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerWriter.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerWriter.md
index f5baf9eb0c..196457d8a0 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerWriter.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/DataContainerWriter.md
@@ -1,5 +1,5 @@
-Write DREAM.3D Data File 
-=============
+# Write DREAM.3D Data File  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExecuteProcess.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExecuteProcess.md
index 0345993cf2..453cc60775 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExecuteProcess.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExecuteProcess.md
@@ -1,5 +1,5 @@
-Execute Process 
-=============
+# Execute Process  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractAttributeArraysFromGeometry.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractAttributeArraysFromGeometry.md
index bc14248bd7..3758664b51 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractAttributeArraysFromGeometry.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractAttributeArraysFromGeometry.md
@@ -1,5 +1,5 @@
-Extract Attribute Arrays from Geometry 
-=============
+# Extract Attribute Arrays from Geometry  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractComponentAsArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractComponentAsArray.md
index 3666a37cb4..b9de7271be 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractComponentAsArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ExtractComponentAsArray.md
@@ -1,5 +1,5 @@
-Extract Component as Attribute Array 
-=============
+# Extract Component as Attribute Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FeatureCountDecision.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FeatureCountDecision.md
index 949633ff58..c13373f427 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FeatureCountDecision.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FeatureCountDecision.md
@@ -1,5 +1,5 @@
-Feature Count Decision 
-=============
+# Feature Count Decision  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FindDerivatives.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FindDerivatives.md
index d55c688a90..c4072d9066 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FindDerivatives.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/FindDerivatives.md
@@ -1,5 +1,5 @@
-Find Derivatives 
-=====
+# Find Derivatives  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateColorTable.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateColorTable.md
index 0abc73b114..fac6bf9b4f 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateColorTable.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateColorTable.md
@@ -1,5 +1,5 @@
-GenerateColorTable 
-=============
+# GenerateColorTable  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportAsciDataArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportAsciDataArray.md
index c4188feda9..63c2e9afd2 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportAsciDataArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportAsciDataArray.md
@@ -1,5 +1,5 @@
-Import ASCII Attribute Array 
-=============
+# Import ASCII Attribute Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
index 079eb0a1fd..736914a69e 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
@@ -1,5 +1,5 @@
-Import HDF5 Dataset 
-=============
+# Import HDF5 Dataset  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md
index 1aa64f764c..b5b2d8bfaa 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/InitializeData.md
@@ -1,5 +1,5 @@
-Initialize Data 
-=============
+# Initialize Data  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/LinkFeatureMapToElementArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/LinkFeatureMapToElementArray.md
index ad4b6787c5..0426b2b28e 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/LinkFeatureMapToElementArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/LinkFeatureMapToElementArray.md
@@ -1,5 +1,5 @@
-Link Feature Attribute Matrix to Element Attribute Array 
-=============
+# Link Feature Attribute Matrix to Element Attribute Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MaskCountDecision.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MaskCountDecision.md
index ba3cfea5b0..53980193dd 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MaskCountDecision.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MaskCountDecision.md
@@ -1,5 +1,5 @@
-Mask Count Decision 
-=============
+# Mask Count Decision  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
index d5ff428e4e..59fc8c04ff 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MassCreateData.md
@@ -1,5 +1,5 @@
-Mass Create Data Containers
-=============
+# Mass Create Data Containers #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveData.md
index 58827ad54f..77f9ca507c 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveData.md
@@ -1,5 +1,5 @@
-Move Data 
-=============
+# Move Data  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveMultiData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveMultiData.md
index 8207b8dffe..f33a99b2e4 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveMultiData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MoveMultiData.md
@@ -1,5 +1,5 @@
-Move Multi Data 
-=============
+# Move Multi Data  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects.md
index bbf3221ebb..9b47d343d9 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects.md
@@ -1,5 +1,5 @@
-Threshold Objects 
-=============
+# Threshold Objects  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects2.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects2.md
index 52f5e65de9..23556b75cb 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects2.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/MultiThresholdObjects2.md
@@ -1,5 +1,5 @@
-Threshold Objects 2 
-=============
+# Threshold Objects 2  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PipelineAnnotation.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PipelineAnnotation.md
index 3f1dbcecd8..9cb418e0c1 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PipelineAnnotation.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PipelineAnnotation.md
@@ -1,5 +1,5 @@
-Pipeline Annotation 
-=============
+# Pipeline Annotation  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PostSlackMessage.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PostSlackMessage.md
index c646be9a71..c6c1d0419c 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PostSlackMessage.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/PostSlackMessage.md
@@ -1,5 +1,5 @@
-Post Slack Message 
-=============
+# Post Slack Message  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RawBinaryReader.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RawBinaryReader.md
index d633bf96c1..8dc7a3906b 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RawBinaryReader.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RawBinaryReader.md
@@ -1,5 +1,5 @@
-Raw Binary Reader 
-=============
+# Raw Binary Reader  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReadASCIIData.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReadASCIIData.md
index 3a7431d5c4..ca9989b01e 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReadASCIIData.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReadASCIIData.md
@@ -1,5 +1,5 @@
-Import ASCII Data 
-=============
+# Import ASCII Data  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveArrays.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveArrays.md
index 3d84b1a813..66b52ba497 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveArrays.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveArrays.md
@@ -1,5 +1,5 @@
-Delete Data 
-=============
+# Delete Data  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveComponentFromArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveComponentFromArray.md
index 355a6d825c..d6168d4e5e 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveComponentFromArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RemoveComponentFromArray.md
@@ -1,5 +1,5 @@
-Remove Component From Array 
-=============
+# Remove Component From Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeArray.md
index a3cce8e519..b9db60e7c9 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeArray.md
@@ -1,5 +1,5 @@
-Rename Attribute Array 
-=============
+# Rename Attribute Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeMatrix.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeMatrix.md
index 6ee3d67f28..c7d89ba35d 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeMatrix.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameAttributeMatrix.md
@@ -1,5 +1,5 @@
-Rename Attribute Matrix 
-=============
+# Rename Attribute Matrix  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameDataContainer.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameDataContainer.md
index 4b9ada91ca..f154acd9c9 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameDataContainer.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RenameDataContainer.md
@@ -1,5 +1,5 @@
-Rename Data Container 
-=============
+# Rename Data Container  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReplaceValueInArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReplaceValueInArray.md
index 2b8d5f4871..25a848ca70 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReplaceValueInArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ReplaceValueInArray.md
@@ -1,5 +1,5 @@
-Replace Value in Array 
-=============
+# Replace Value in Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RequiredZThickness.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RequiredZThickness.md
index aff1dfec37..3a672f4768 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RequiredZThickness.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RequiredZThickness.md
@@ -1,5 +1,5 @@
-RequiredZThickness 
-=====
+# RequiredZThickness  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SetOriginResolutionImageGeom.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SetOriginResolutionImageGeom.md
index 4666f56600..6f5dd24a79 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SetOriginResolutionImageGeom.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SetOriginResolutionImageGeom.md
@@ -1,5 +1,5 @@
-Set Origin & Resolution (Image)  
-=============
+# Set Origin & Resolution (Image)   #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SplitAttributeArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SplitAttributeArray.md
index 5b10a059f1..e5f7ffa8a4 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SplitAttributeArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/SplitAttributeArray.md
@@ -1,5 +1,5 @@
-Split Multicomponent Attribute Array 
-=============
+# Split Multicomponent Attribute Array  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/WriteTriangleGeometry.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/WriteTriangleGeometry.md
index 44eebcb24d..e0005ac294 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/WriteTriangleGeometry.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/WriteTriangleGeometry.md
@@ -1,5 +1,5 @@
-Export Triangle Geometry 
-======
+# Export Triangle Geometry  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ArraySelectionExample.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ArraySelectionExample.md
index a66c43e414..e4e59a2854 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ArraySelectionExample.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ArraySelectionExample.md
@@ -1,5 +1,5 @@
-DataContainerArrayProxy Example 
-=====
+# DataContainerArrayProxy Example  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/DynamicTableExample.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/DynamicTableExample.md
index f61875a46b..546272cc9a 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/DynamicTableExample.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/DynamicTableExample.md
@@ -1,5 +1,5 @@
-Dynamic Table Example 
-=====
+# Dynamic Table Example  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ErrorWarningFilter.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ErrorWarningFilter.md
index d9a790f840..b9e7a60f89 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ErrorWarningFilter.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ErrorWarningFilter.md
@@ -1,5 +1,5 @@
-ErrorWarningFilter 
-=============
+# ErrorWarningFilter  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup01.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup01.md
index d04c85a646..fa134be744 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup01.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup01.md
@@ -1,5 +1,5 @@
-FilterGroup01 
-=============
+# FilterGroup01  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup02.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup02.md
index fa11f98cf1..13a865f7b7 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup02.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup02.md
@@ -1,5 +1,5 @@
-FilterGroup02 
-=============
+# FilterGroup02  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup03.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup03.md
index fc2b60f6c5..2896312add 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup03.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup03.md
@@ -1,5 +1,5 @@
-FilterGroup03 
-=============
+# FilterGroup03  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup04.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup04.md
index d46c4682de..31dd20e54f 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup04.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup04.md
@@ -1,5 +1,5 @@
-FilterGroup04 
-=============
+# FilterGroup04  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup05.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup05.md
index 9b6dc04d14..1bab101fdf 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup05.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup05.md
@@ -1,5 +1,5 @@
-FilterGroup05 
-=============
+# FilterGroup05  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup06.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup06.md
index 50540ba14f..b510e835e0 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup06.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup06.md
@@ -1,5 +1,5 @@
-FilterGroup06 
-=============
+# FilterGroup06  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup07.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup07.md
index 03c53b2815..e300373a1d 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup07.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup07.md
@@ -1,5 +1,5 @@
-FilterGroup07 
-=============
+# FilterGroup07  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup08.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup08.md
index 430f677dc8..3e9ca23b5f 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup08.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup08.md
@@ -1,5 +1,5 @@
-FilterGroup08 
-=============
+# FilterGroup08  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup09.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup09.md
index 1429b86509..7e83b8dca6 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup09.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup09.md
@@ -1,5 +1,5 @@
-FilterGroup09 
-=============
+# FilterGroup09  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup10.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup10.md
index 23b49e402e..710fc60f99 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup10.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup10.md
@@ -1,5 +1,5 @@
-FilterGroup10 
-=============
+# FilterGroup10  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup11.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup11.md
index e377f13db8..d0696431c3 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup11.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup11.md
@@ -1,5 +1,5 @@
-FilterGroup11 
-=============
+# FilterGroup11  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup12.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup12.md
index bd3d642615..0b480cfbb3 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup12.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup12.md
@@ -1,5 +1,5 @@
-FilterGroup12 
-=============
+# FilterGroup12  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup13.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup13.md
index d450845452..acb6d9c3c3 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup13.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup13.md
@@ -1,5 +1,5 @@
-FilterGroup13 
-=============
+# FilterGroup13  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup14.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup14.md
index 96dec60dee..1106914097 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup14.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/FilterGroup14.md
@@ -1,5 +1,5 @@
-FilterGroup14 
-=============
+# FilterGroup14  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/GenericExample.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/GenericExample.md
index 3599725dec..017446049b 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/GenericExample.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/GenericExample.md
@@ -1,5 +1,5 @@
-Generic Example 
-=====
+# Generic Example  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/MakeDataContainer.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/MakeDataContainer.md
index ddffbd9f3d..b4cc72c7ec 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/MakeDataContainer.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/MakeDataContainer.md
@@ -1,5 +1,5 @@
-Make DataContainer 
-=====
+# Make DataContainer  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/TestFilters.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/TestFilters.md
index 5346a7d489..dccb0e43a4 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/TestFilters.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/TestFilters.md
@@ -1,5 +1,5 @@
-TestFilter 
-=====
+# TestFilter  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ThresholdExample.md b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ThresholdExample.md
index 86f8051ebe..97ce03f5c1 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ThresholdExample.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/TestFilters/ThresholdExample.md
@@ -1,5 +1,5 @@
-Threshold Example 
-=====
+# Threshold Example  #
+
 
 ## Group (Subgroup) ##
 
diff --git a/Source/SIMPLib/TestFilters/FilterDoc.md b/Source/SIMPLib/TestFilters/FilterDoc.md
index 8a71a1729b..5834ef1206 100644
--- a/Source/SIMPLib/TestFilters/FilterDoc.md
+++ b/Source/SIMPLib/TestFilters/FilterDoc.md
@@ -1,5 +1,5 @@
-TESTCLASSNAME 
-=============
+# TESTCLASSNAME  #
+
 
 ## Group (Subgroup) ##
 

From 41338420aec4146e0d2fd9216e3c35618286b0f8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 11 May 2019 16:56:49 -0400
Subject: [PATCH 096/397] Remove escape sequences from logic statement.

---
 Wrapping/Python/Conda/package.in.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
index 0e0df2146f..e5dce399da 100644
--- a/Wrapping/Python/Conda/package.in.bat
+++ b/Wrapping/Python/Conda/package.in.bat
@@ -4,7 +4,7 @@
 :: then we need an additional argument to tell this script which configuration
 :: directory to use as the source for the compiled files.
 set CONFIG_DIR=
-IF "@MSVC_IDE@" == "1"\ (\
+IF "@MSVC_IDE@" == "1" (
     if "%1" == "" goto usage
     if "%1" == "Debug" goto Debug
     if "%1" == "Release" goto Release

From 4f34fd5ee88fd2e2d41606535bd35cfc3c42fec0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 14 May 2019 12:28:43 -0400
Subject: [PATCH 097/397] Making two methods const in SIMPLArray.

These should have been const from the start..

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 5bedd9b759..54dfd75f8b 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -168,7 +168,7 @@ class SIMPLArray
    * @brief Returns the number of elements
    * @return
    */
-  size_type size()
+  size_type size() const
   {
     return Dimension;
   }
@@ -189,7 +189,7 @@ class SIMPLArray
    *   For STL containers this includes Vector, Deque. QVector will also work.
    */
   template <typename OutContainerType>
-  OutContainerType toContainer()
+  OutContainerType toContainer() const
   {
     OutContainerType dest(Dimension);
     for(typename OutContainerType::size_type i = 0; i < Dimension; i++)

From 534072281c0b6b54a5c950880ad6d9f7d4905e82 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 14 May 2019 17:16:28 -0400
Subject: [PATCH 098/397] Correctly override a method from the parent class.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Filtering/AbstractFilter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 1b842350f0..c1bbb678b0 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -350,7 +350,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * @param progress
    * @param messageText
    */
-  void notifyProgressMessage(int progress, const QString& messageText);
+  void notifyProgressMessage(int progress, const QString& messageText) override;
 
   /**
    * @brief notifyMissingProperty

From 7edc359338112d0b70e35f04f312903e399b1745 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 14 May 2019 17:16:58 -0400
Subject: [PATCH 099/397] RawBinaryReader: Display the file path inside of
 error message.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/RawBinaryReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 5a8dd0dd7d..87fd992a90 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -256,7 +256,7 @@ void RawBinaryReader::dataCheck()
   }
   else if(!fi.exists())
   {
-    QString ss = QObject::tr("The input file does not exist");
+    QString ss = QObject::tr("The input file does not exist: %1").arg(getInputFile());
     setErrorCondition(-388, ss);
   }
 

From c87cac041a10351b94e2cf21efce4a8cac39618f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 14 May 2019 17:17:34 -0400
Subject: [PATCH 100/397] Fixes more issues when trying to reveal the file
 using the native file explorer

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidgets/AbstractIOFileWidget.cpp          | 2 ++
 .../FilterParameterWidgets/DataContainerReaderWidget.cpp     | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 81e5ab063f..55c4535ac2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -231,6 +231,7 @@ void AbstractIOFileWidget::on_m_LineEdit_editingFinished()
 
   QtSFileUtils::VerifyPathExists(path, m_LineEdit);
   m_CurrentText = m_LineEdit->text();
+  setValidFilePath(m_LineEdit->text());
   emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
@@ -259,6 +260,7 @@ void AbstractIOFileWidget::on_m_LineEdit_textChanged(const QString& text)
   if(QtSFileUtils::HasValidFilePath(inputPath))
   {
     m_ShowFileAction->setEnabled(true);
+    setValidFilePath(m_LineEdit->text());
   }
   else
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index 40da0bd142..fe9e2b9c1b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -69,7 +69,7 @@ namespace Detail
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QList<QStandardItem*> findChildItems(QStandardItem* parent, QString text)
+QList<QStandardItem*> findChildItems(QStandardItem* parent, const QString& text)
 {
   QList<QStandardItem*> list;
   if(!parent->hasChildren())
@@ -92,7 +92,7 @@ QList<QStandardItem*> findChildItems(QStandardItem* parent, QString text)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void removeNonExistantChildren(QStandardItem* parent, QStringList possibleNames)
+void removeNonExistantChildren(QStandardItem* parent, const QStringList& possibleNames)
 {
   int childCount = parent->rowCount();
 
@@ -623,6 +623,7 @@ void DataContainerReaderWidget::checkFilePath(const QString& text)
   {
     absPathLabel->setText(path);
     absPathLabel->show();
+    setValidFilePath(path);
   }
   else
   {

From de4b9e4d0b13668305d4ba98bcd644f4e4d130d2 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 07:42:29 -0400
Subject: [PATCH 101/397] Adjust API in itkBridge for
 Dream3DtoITKImportFilterDataArray

Remove Constants fomr itkSupportConstants.h that should be in a plugin

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkBridge.h           | 24 +++++++++++++-----------
 Source/SIMPLib/ITK/itkSupportConstants.h |  3 ---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 3d3f3aa0b8..787149f65d 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -290,7 +290,8 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
  * @date Feb 26, 2014
  * @version 1.0
  */
-template <typename ComponentType> class ItkBridge
+template <typename ComponentType>
+class ItkBridge
 {
 public:
   SIMPL_SHARED_POINTERS(ItkBridge<ComponentType>)
@@ -320,7 +321,8 @@ template <typename ComponentType> class ItkBridge
    * @return
    */
   template <typename TPixel>
-  static typename itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>::Pointer Dream3DtoITKImportFilter(DataContainer::Pointer m, QString attrMatName, ComponentType* data)
+  static typename itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>::Pointer Dream3DtoITKImportFilter(const DataContainer::Pointer& m, const QString& attrMatName,
+                                                                                                                             ComponentType* data)
   {
     AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
@@ -373,16 +375,16 @@ template <typename ComponentType> class ItkBridge
     return importFilter;
   }
 
+  // clang-format off
   template <typename TPixel>
-  static typename itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>::Pointer Dream3DtoITKImportFilterDataArray(size_t totalPoints, QVector<size_t> udims, float sampleOrigin[3],
-                                                                                                                                      float voxelResolution[3], ComponentType* data)
+  static typename itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>::Pointer
+  Dream3DtoITKImportFilterDataArray(size_t totalPoints,
+                                    const SizeVec3Type& udims,
+                                    const FloatVec3Type& sampleOrigin,
+                                    const FloatVec3Type& voxelResolution,
+                                    const typename DataArray<TPixel>::Pointer& data)
   {
-    //      AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
-
-    // get size+dimensions of dataset
-    //      QVector<size_t> udims = attrMat->getTupleDimensions();
-    //      size_t totalPoints = attrMat->getNumberOfTuples();
-
+    // clang-format on
     // create and setup import filter
     using ImportImageFilterType = itk::ImportImageFilter<TPixel, ImageProcessingConstants::ImageDimension>;
     typename ImportImageFilterType::Pointer importFilter = ImportImageFilterType::New();
@@ -425,7 +427,7 @@ template <typename ComponentType> class ItkBridge
     importFilter->SetSpacing(spacing);
 
     const bool importImageFilterWillOwnTheBuffer = false;
-    importFilter->SetImportPointer(reinterpret_cast<TPixel*>(data), totalPoints, importImageFilterWillOwnTheBuffer);
+    importFilter->SetImportPointer(reinterpret_cast<TPixel*>(data->getPointer(0)), totalPoints, importImageFilterWillOwnTheBuffer);
     importFilter->Update();
     return importFilter;
   }
diff --git a/Source/SIMPLib/ITK/itkSupportConstants.h b/Source/SIMPLib/ITK/itkSupportConstants.h
index 0b988bef88..6948c9b8ba 100644
--- a/Source/SIMPLib/ITK/itkSupportConstants.h
+++ b/Source/SIMPLib/ITK/itkSupportConstants.h
@@ -54,9 +54,6 @@
  */
 namespace ImageProcessingConstants
 {
-const QString ImageProcessingPluginFile("ImageProcessingPlugin");
-const QString ImageProcessingPluginDisplayName("ImageProcessing");
-const QString ImageProcessingBaseName("ImageProcessing");
 
 namespace FilterGroups
 {

From a388915939412e62e6d8cc99278be5f7e19973ad Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Fri, 17 May 2019 10:26:57 -0400
Subject: [PATCH 102/397] Fixing bug where turning off SIMPL_USE_ITK would
 still compile the ITK directory in SIMPLib. (#351)

---
 Source/SIMPLib/CMakeLists.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index c25732fd2a..eb5f007ce2 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -87,7 +87,11 @@ endMacro()
 
 #------------------------------------------------------------------------------
 # Set up the directories that are used for each Group
-set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages StatsData Utilities ITK)
+set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages StatsData Utilities)
+if (SIMPL_USE_ITK)
+  set(SIMPL_Group_BASE_MODULES ${SIMPL_Group_BASE_MODULES} ITK)
+endif()
+
 set(SIMPL_Group_FILTERS_MODULES Filtering FilterParameters VTKUtils)
 set(SIMPL_Group_PLUGIN_MODULES Plugin)
 set(SIMPL_Group_REST_MODULES REST)

From 4b7320843af67ac6a3b1ffbfb12571c668e2a8ae Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 12:24:10 -0400
Subject: [PATCH 103/397] Pipeline Runner outputs the name of the Pipeline file
 being used.

ReadASCIIData prints the filepath that it is trying to read on error.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/PipelineRunner/PipelineRunner.cpp     | 4 ++--
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 5ad9c87b6c..96702d1586 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -97,8 +97,8 @@ int main(int argc, char* argv[])
 
   QString pipelineFile = parser.value(pipelineFileArg);
 
-  std::cout << "PipelineRunner Starting. " << std::endl;
-  std::cout << "   " << SIMPLib::Version::PackageComplete().toStdString() << std::endl;
+  std::cout << "PipelineRunner " << SIMPLib::Version::PackageComplete().toStdString() << std::endl;
+  std::cout << "Input File: " << pipelineFile.toStdString() << std::endl;
 
   // Register all the filters including trying to load those from Plugins
   FilterManager* fm = FilterManager::Instance();
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 58d4009ee3..67dfbfed96 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -273,7 +273,7 @@ void ReadASCIIData::dataCheck()
 
   if(!fi.exists())
   {
-    QString ss = QObject::tr("The input file does not exist");
+    QString ss = QObject::tr("The input file does not exist: '%1'").arg(inputFilePath);
     setErrorCondition(-388, ss);
   }
 

From 4fb6fe497e0ece946978ff751f7cb2c1c6b0087c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 13:16:06 -0400
Subject: [PATCH 104/397] Do not write out this FilterParameter to the JSON
 file.

The value inside of the FilterParameter is dynamically generated during preflight
and makes no sense to store in the file.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../PreflightUpdatedValueFilterParameter.cpp          | 11 -----------
 .../PreflightUpdatedValueFilterParameter.h            |  6 ------
 2 files changed, 17 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index f900b4f770..e338f66e76 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -69,14 +69,3 @@ QString PreflightUpdatedValueFilterParameter::getWidgetType() const
 {
   return QString("PreflightUpdatedValueWidget");
 }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PreflightUpdatedValueFilterParameter::writeJson(QJsonObject& json)
-{
-  if(m_GetterCallback)
-  {
-    json[getPropertyName()] = m_GetterCallback();
-  }
-}
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 51426ccf89..2f4b64b6ce 100755
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -98,12 +98,6 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
      */
     QString getWidgetType() const override;
 
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.

From d9f3bf295df7dac98139b093dfee3a86878e8e00 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 13:17:05 -0400
Subject: [PATCH 105/397] Do not check for an absolute path in the ReadASCII
 filter.

The method being used makes assumptions about the layout of the binaries and where
the executable is being run.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp      | 5 -----
 Source/SIMPLib/Utilities/SIMPLDataPathValidator.h | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 67dfbfed96..b43cb7435f 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -267,8 +267,6 @@ void ReadASCIIData::dataCheck()
     setErrorCondition(-387, ss);
   }
 
-  SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
-  inputFilePath = validator->convertToAbsolutePath(inputFilePath);
   fi.setFile(inputFilePath);
 
   if(!fi.exists())
@@ -522,9 +520,6 @@ void ReadASCIIData::execute()
 
   int insertIndex = 0;
 
-  SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
-  inputFilePath = validator->convertToAbsolutePath(inputFilePath);
-
   QFile inputFile(inputFilePath);
   if(inputFile.open(QIODevice::ReadOnly))
   {
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
index 6dee3c46b7..93872e0e68 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
@@ -57,7 +57,9 @@ class SIMPLib_EXPORT SIMPLDataPathValidator : public QObject
     void setSIMPLDataDirectory(const QString &path);
 
     /**
-     * @brief sanityCheckRelativePath
+     * @brief This function creates an absolute path based on the location of the application executing the code BUT more
+     * assumes that this code is running from a packaged application in which case there are more assumptions made about
+     * where certain directories. We may try to navigate up/down directories based on platform.
      * @param relativePath
      * @return
      */

From b40fce651fb8dcd20ac932cb369750193343586b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 13:44:20 -0400
Subject: [PATCH 106/397] Remove the test for PreflightUpdatedValue since
 testing it makes no sense.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 0976c91658..a7f79461f3 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -800,6 +800,8 @@ class FilterParametersRWTest
       //      m_PhaseTypeVector_2 = PhaseTypeVector_t(); // Does this line do anything?
     }
 
+#if 0
+This Filter Parameter is NOT tesed since nothing is read or written for the filter parameter.
     {
       PreflightUpdatedValueFilterParameter::Pointer fp =
           PreflightUpdatedValueFilterParameter::New("Test", "String2", getString1(), FilterParameter::Parameter, SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
@@ -816,7 +818,7 @@ class FilterParametersRWTest
 
       DREAM3D_REQUIRE_EQUAL(m_String1, result)
     }
-
+#endif
     {
       RangeFilterParameter::Pointer fp = RangeFilterParameter::New("Test", "Pair1", getPair1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Pair2),
                                                                    SIMPL_BIND_GETTER(FilterParametersRWTest, this, Pair1));

From 7d084fc1c0e11e3a2a52626086dfe9f4a0838692 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 May 2019 16:42:59 -0400
Subject: [PATCH 107/397] Modernize the typedefs to using statements.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index c2f02b1f80..b7b5889720 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -57,8 +57,8 @@ struct FijiImageTileData
   int col;
 };
 
-typedef std::vector<FijiImageTileData> FijiRowData;
-typedef std::vector<FijiRowData> FijiFileData;
+using FijiRowData = std::vector<FijiImageTileData>;
+using FijiFileData = std::vector<FijiRowData>;
 
 class FijiConfigurationFileReader : public QObject
 {

From ff636675d09ab1b7f01256338d8d3699f6aa5dab Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 20 May 2019 10:50:13 -0400
Subject: [PATCH 108/397] PYTHON: Update the Anaconda packaging batch file

+ Allow automatic updating of the virtual environment packages so that conda-build can be installed.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Conda/package.in.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
index e5dce399da..a5a8cef80e 100644
--- a/Wrapping/Python/Conda/package.in.bat
+++ b/Wrapping/Python/Conda/package.in.bat
@@ -68,7 +68,7 @@ xcopy /i /q /y /s %BUILD_DIR%\PrebuiltPipelines %ANACONDA_PACKAGE_DIR%\%PYTHON_S
 call %ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\activate.bat %ANACONDA_ENVIRONMENT_NAME% 
 
 @echo "Ensuring conda-build is installed..."         
-call %ENV_CONDA_EXE% install conda-build 
+call %ENV_CONDA_EXE% install --update-all conda-build 
 
 @echo "Creating output directory for the Conda Package..."
 mkdir %ANACONDA_PACKAGE_DIR%\conda-package

From 77357ce1dc17d4cd1d40115b56d06e178e174f4d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 20 May 2019 11:25:54 -0400
Subject: [PATCH 109/397] PYTHON: Use a varaible that is only set during unit
 tests to only copy needed libraries for the python testing

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Conda/package.in.bat | 48 +++++++++++++++++-----------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
index a5a8cef80e..65d4cb964e 100644
--- a/Wrapping/Python/Conda/package.in.bat
+++ b/Wrapping/Python/Conda/package.in.bat
@@ -64,31 +64,41 @@ xcopy /i /q /y /s %BUILD_DIR%\Data %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_
 xcopy /i /q /y /s %BUILD_DIR%\Help %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\Help
 xcopy /i /q /y /s %BUILD_DIR%\PrebuiltPipelines %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\PrebuiltPipelines
 
-@echo "Preparing to build the Conda package %PYTHON_SITE_PACKAGES_NAME% using Conda environment: %ANACONDA_ENVIRONMENT_NAME% and Conda installation: %ANACONDA_DIR%. Activating the environment..."
-call %ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\activate.bat %ANACONDA_ENVIRONMENT_NAME% 
+::-----------------------------------------------------------------------------
+:: The ANACONDA_PREPARE_PACKAGE_ONLY should ONLY be set by CTest Cache files so
+:: that the proper libraries are copied from the build directory into the 
+:: site packages directory. This allows the unit tests to correctly execute on 
+:: Windows due to the DLL path issues. The ANACONDA_PREPARE_PACKAGE_ONLY should
+:: NEVER set by a normal cmake configuration process.
+
+IF "@ANACONDA_PREPARE_PACKAGE_ONLY@" == "" (
+    @echo "Preparing to build the Conda package %PYTHON_SITE_PACKAGES_NAME% using Conda environment: %ANACONDA_ENVIRONMENT_NAME% and Conda installation: %ANACONDA_DIR%. Activating the environment..."
+    call %ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\activate.bat %ANACONDA_ENVIRONMENT_NAME% 
+
+    @echo "Ensuring conda-build is installed..."         
+    call %ENV_CONDA_EXE% install --update-all conda-build 
 
-@echo "Ensuring conda-build is installed..."         
-call %ENV_CONDA_EXE% install --update-all conda-build 
+    @echo "Creating output directory for the Conda Package..."
+    mkdir %ANACONDA_PACKAGE_DIR%\conda-package
 
-@echo "Creating output directory for the Conda Package..."
-mkdir %ANACONDA_PACKAGE_DIR%\conda-package
+    @echo "Building the Conda %PYTHON_SITE_PACKAGES_NAME%..."
+    cd %ANACONDA_PACKAGE_DIR%\conda-recipe
+    call %ENV_CONDA_EXE% build --output-folder %ANACONDA_PACKAGE_DIR%\conda-package .  
 
-@echo "Building the Conda %PYTHON_SITE_PACKAGES_NAME%..."
-cd %ANACONDA_PACKAGE_DIR%\conda-recipe
-call %ENV_CONDA_EXE% build --output-folder %ANACONDA_PACKAGE_DIR%\conda-package .  
+    @echo "Purging the Anaconda Build directory...."
+    call %ENV_CONDA_EXE% build purge 
 
-@echo "Purging the Anaconda Build directory...."
-call %ENV_CONDA_EXE% build purge 
 
+    IF "@SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL@" == "ON" (
+        echo "====================================================================="
+        echo "        Starting Local Install of %SIMPL_PYTHON_MODULE_NAME% into %ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%"
+        echo "====================================================================="
+        echo "Removing any existing dream3d Conda package"
+        call %ENV_CONDA_EXE% remove -y %SIMPL_PYTHON_MODULE_NAME% 
+        echo "Installing the dream3d Conda package"
+        call %ENV_CONDA_EXE% install -y --use-local  %SIMPL_PYTHON_MODULE_NAME% 
+    )
 
-IF "@SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL@" == "ON" (
-    echo "====================================================================="
-    echo "        Starting Local Install of %SIMPL_PYTHON_MODULE_NAME% into %ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%"
-    echo "====================================================================="
-    echo "Removing any existing dream3d Conda package"
-    call %ENV_CONDA_EXE% remove -y %SIMPL_PYTHON_MODULE_NAME% 
-    echo "Installing the dream3d Conda package"
-    call %ENV_CONDA_EXE% install -y --use-local  %SIMPL_PYTHON_MODULE_NAME% 
 )
 
 echo "====================================================================="

From 5ab91377cadc283de2a62a0781d1a69b66a5d948 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 20 May 2019 12:53:33 -0400
Subject: [PATCH 110/397] PYTHON: Properly initialize the Anaconda3 env. Better
 CMake Errors messages

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Pybind11/CMakeLists.txt       | 25 +++++++++++++------
 .../Python/Pybind11/python_test_driver.bat    | 11 ++++++--
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index 1e3c410080..56ecb98dc5 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -162,14 +162,25 @@ endif()
 # Copy the recipe and egg info for the building Conda package to the 
 # output directory
 if (SIMPL_ENABLE_ANACONDA_PACKAGE)
-  if("${ANACONDA_DIR}" STREQUAL "")
-    set(ANACONDA_DIR "" CACHE STRING "")
-    message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
+  if("${ANACONDA_DIR}" STREQUAL "" OR "${ANACONDA_ENVIRONMENT_NAME}" STREQUAL "")
+    message(FATAL_ERROR "You have enabled Anaconda3 style packaging by setting SIMPL_ENABLE_ANACONDA_PACKAGE=ON, but some required variables are empty or OFF.\
+    The following CMake variables need to be set either through the CMake-Gui, ccmake or the command line:\n\
+    [VAR NAME] = [CURRENT VALUE]\n\
+    ANACONDA_DIR = ${ANACONDA_DIR}\n\
+    ANACONDA_ENVIRONMENT_NAME = ${ANACONDA_ENVIRONMENT_NAME}\n\
+    SIMPL_ENABLE_ANACONDA_PACKAGE = ${SIMPL_ENABLE_ANACONDA_PACKAGE}\n\
+    SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL = ${SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL}\n\
+    **********************************************************\n\
+    ANACONDA_DIR is the top level directory to Anaconda3 such as /usr/local/anaconda3 or C:/Anaconda3\n\
+    ANACONDA_ENVIRONMENT_NAME is the virtual environment name. Leaving this blank might work....\n\
+    SIMPL_ENABLE_ANACONDA_PACKAGE This will enable the creation of a script that will create an Anaconda3 package for DREAM3D/SIMPL\n\
+    SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL Will install the python package to the ANACONDA_ENVIRONMENT_NAME name on your local computer. Use this with caution.\n\
+    ")
   endif()
-  if("${ANACONDA_ENVIRONMENT_NAME}" STREQUAL "")
-    set(ANACONDA_ENVIRONMENT_NAME "" CACHE STRING "")
-    message(FATAL_ERROR "Please set the ANACONDA_ENVIRONMENT_NAME variable either through the CMake-GUI or through the -DANACONDA_ENVIRONMENT_NAME=ANACONDA_ENV_NAME")
-  endif()   
+  #if()
+  #  set(ANACONDA_ENVIRONMENT_NAME "" CACHE STRING "")
+  #  message(FATAL_ERROR "Please set the ANACONDA_ENVIRONMENT_NAME variable either through the CMake-GUI or through the -DANACONDA_ENVIRONMENT_NAME=ANACONDA_ENV_NAME")
+  #endif()   
   
     
   set(ANACONDA_SCRIPTS_DIR_NAME "bin")
diff --git a/Wrapping/Python/Pybind11/python_test_driver.bat b/Wrapping/Python/Pybind11/python_test_driver.bat
index 8aea37e789..daba5d2067 100644
--- a/Wrapping/Python/Pybind11/python_test_driver.bat
+++ b/Wrapping/Python/Pybind11/python_test_driver.bat
@@ -1,13 +1,20 @@
 @echo off
 
-@echo "[@test@] SIMPL Python Test Starting"
+@echo "Python Test Starting"
+@echo "    [@test@]"
 
 @set ANACONDA_DIR=@ANACONDA_DIR@
+@echo "ANACONDA_DIR: %ANACONDA_DIR%"
+
 @set PATH=%PATH%;%ANACONDA_DIR%;%ANACONDA_DIR%\Scripts
 
+@echo "Activating anaconda base Environment... "
+@set ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
+CALL %ANACONDA_DIR%\condabin\conda.bat activate %ANACONDA_ENVIRONMENT_NAME%
+
 @set PYTHONPATH=@SIMPL_ANACONDA_OUTPUT_DIR@\@PYTHON_SITE_PACKAGES_NAME@
-cd %PYTHONPATH%
 @echo "PYTHONPATH: %PYTHONPATH%"
+cd %PYTHONPATH%
 
 @set PYTHON_TEST_INPUT_DIR=@PYTHON_TEST_INPUT_DIR@
 @echo "PYTHON_TEST_INPUT_DIR: @PYTHON_TEST_INPUT_DIR@"

From 981ccd2f7a4a57d191bdaed659d392994351368e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 22 May 2019 15:56:37 -0400
Subject: [PATCH 111/397] Fix compiler warnings for signed/unsigned
 comparisons.

All are due to use of int64_t instead of size_t for pointer index operations/variables

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp        | 11 +++++------
 Source/SIMPLib/CoreFilters/CreateGeometry.h          |  2 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp        | 12 ++++++------
 Source/SIMPLib/Math/SIMPLibRandom.h                  |  2 +-
 Source/SIMPLib/TestFilters/MakeDataContainer.cpp     |  6 +++---
 Wrapping/Python/Pybind11/python_test_driver.bat      |  3 ++-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 410b47d103..90bc5f18d5 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -724,7 +724,7 @@ void CreateGeometry::execute()
   }
   case 3: // EdgeGeom
   {
-    int64_t idx = 0;
+    size_t idx = 0;
     for(size_t i = 0; i < m_EdgesPtr.lock()->getSize(); i++)
     {
       if(m_Edges[i] > idx)
@@ -755,7 +755,7 @@ void CreateGeometry::execute()
   }
   case 4: // TriangleGeom
   {
-    int64_t idx = 0;
+    size_t idx = 0;
     for(size_t i = 0; i < m_TrisPtr.lock()->getSize(); i++)
     {
       if(m_Tris[i] > idx)
@@ -786,7 +786,7 @@ void CreateGeometry::execute()
   }
   case 5: // QuadGeom
   {
-    int64_t idx = 0;
+    size_t idx = 0;
     for(size_t i = 0; i < m_QuadsPtr.lock()->getSize(); i++)
     {
       if(m_Quads[i] > idx)
@@ -817,7 +817,7 @@ void CreateGeometry::execute()
   }
   case 6: // TetrahedralGeom
   {
-    int64_t idx = 0;
+    size_t idx = 0;
     for(size_t i = 0; i < m_TetsPtr.lock()->getSize(); i++)
     {
       if(m_Tets[i] > idx)
@@ -848,7 +848,7 @@ void CreateGeometry::execute()
   }
   case 7: // HexahedralGeom
   {
-    int64_t idx = 0;
+    size_t idx = 0;
     for (size_t i = 0; i < m_HexesPtr.lock()->getSize(); i++)
     {
       if (m_Hexes[i] > idx)
@@ -902,7 +902,6 @@ QString CreateGeometry::getBoxDimensions()
      << "Y Range: " << (m_Origin[1] - halfRes[1]) << " to " << (m_Origin[1] - halfRes[1] + m_Dimensions[1] * m_Spacing[1]) << " (delta: " << (m_Dimensions[1] * m_Spacing[1]) << ")\n"
      << "Z Range: " << (m_Origin[2] - halfRes[2]) << " to " << (m_Origin[2] - halfRes[2] + m_Dimensions[2] * m_Spacing[2]) << " (delta: " << (m_Dimensions[2] * m_Spacing[2]) << ")\n";
   return desc;
-  return desc;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 7a820ce1d4..140651d1da 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -297,7 +297,7 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   DEFINE_DATAARRAY_VARIABLE(size_t, Tets)
   DEFINE_DATAARRAY_VARIABLE(size_t, Hexes)
 
-  int64_t m_NumVerts;
+  size_t m_NumVerts;
 
 public:
   CreateGeometry(const CreateGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 6eefaae913..bdc0df1c8b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -210,16 +210,16 @@ class WriteTriangleGeometryTest
     QStringList list = line.split(':');
     DREAM3D_REQUIRE(list[0].trimmed() == "Node Count")
 
-    qlonglong nodeCount = list[1].trimmed().toLongLong();
+    MeshIndexType nodeCount = list[1].trimmed().toULongLong();
     DREAM3D_REQUIRE(nodeCount == triGeom->getNumberOfVertices())
 
     // Check vertices
 
-    for(int64_t i = 0; i < triGeom->getNumberOfVertices(); i++)
+    for(MeshIndexType i = 0; i < triGeom->getNumberOfVertices(); i++)
     {
       line = inFileNodes.readLine();
       list = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
-      for(int j = 0; j < daTriVert->getNumberOfComponents(); j++)
+      for(MeshIndexType j = 0; j < daTriVert->getNumberOfComponents(); j++)
       {
         DREAM3D_REQUIRE(list[j] == QString::number(daTriVert->getComponent(i, j), 'f', 5))
       }
@@ -282,13 +282,13 @@ class WriteTriangleGeometryTest
 
     // Check triangles
 
-    for(int64_t i = 0; i < triGeom->getNumberOfTris(); i++)
+    for(MeshIndexType i = 0; i < triGeom->getNumberOfTris(); i++)
     {
       line = inFileTriangles.readLine();
       list = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
-      for(int j = 0; j < daTriList->getNumberOfComponents(); j++)
+      for(MeshIndexType j = 0; j < daTriList->getNumberOfComponents(); j++)
       {
-        DREAM3D_REQUIRE(list[j].toLongLong() == daTriList->getComponent(i, j))
+        DREAM3D_REQUIRE(list[j].toULongLong() == daTriList->getComponent(i, j))
       }
     }
 
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.h b/Source/SIMPLib/Math/SIMPLibRandom.h
index 29e5c4eabd..0d23582c7b 100755
--- a/Source/SIMPLib/Math/SIMPLibRandom.h
+++ b/Source/SIMPLib/Math/SIMPLibRandom.h
@@ -198,7 +198,7 @@ class SIMPLib_EXPORT SIMPLibRandom
 #define SIMPL_RANDOMNG_NEW()                                                                                                                                                                           \
   SIMPLibRandom rg;                                                                                                                                                                                    \
   {                                                                                                                                                                                                    \
-    unsigned long long int millisSinceEpoch = QDateTime::currentMSecsSinceEpoch();                                                                                                                     \
+    unsigned long long int millisSinceEpoch = static_cast<unsigned long long int>(QDateTime::currentMSecsSinceEpoch());                                                                                                                     \
     unsigned long long int* millisSinceEpochPtr = &millisSinceEpoch;                                                                                                                                   \
     unsigned int* seedPtr = reinterpret_cast<unsigned int*>(millisSinceEpochPtr);                                                                                                                      \
     rg.init_genrand(seedPtr[AIMRNG_OFFSET]);                                                                                                                                                           \
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 5300c3f82f..5ac821899d 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -146,7 +146,7 @@ void MakeDataContainer::dataCheck()
   {
     SharedVertexList::Pointer test = vertices->getVertices();
     float* verts = test->getPointer(0);
-    for(int64_t i = 0; i < vertices->getNumberOfVertices(); i++)
+    for(size_t i = 0; i < vertices->getNumberOfVertices(); i++)
     {
       verts[3 * i] = float(0.1 + i);
       verts[3 * i + 1] = float(0.2 + i);
@@ -204,9 +204,9 @@ void MakeDataContainer::execute()
 
   VertexGeom::Pointer verts = getDataContainerArray()->getDataContainer(getDataContainerName())->getGeometryAs<VertexGeom>();
 
-  for(int64_t i = 0; i < verts->getNumberOfVertices(); i++)
+  for(size_t i = 0; i < verts->getNumberOfVertices(); i++)
   {
-    m_FeatureIds[i] = i;
+    m_FeatureIds[i] = static_cast<int32_t>(i);
   }
 }
 // -----------------------------------------------------------------------------
diff --git a/Wrapping/Python/Pybind11/python_test_driver.bat b/Wrapping/Python/Pybind11/python_test_driver.bat
index daba5d2067..4e023c47a2 100644
--- a/Wrapping/Python/Pybind11/python_test_driver.bat
+++ b/Wrapping/Python/Pybind11/python_test_driver.bat
@@ -8,8 +8,9 @@
 
 @set PATH=%PATH%;%ANACONDA_DIR%;%ANACONDA_DIR%\Scripts
 
-@echo "Activating anaconda base Environment... "
+
 @set ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
+@echo "Activating anaconda %ANACONDA_ENVIRONMENT_NAME% Environment... "
 CALL %ANACONDA_DIR%\condabin\conda.bat activate %ANACONDA_ENVIRONMENT_NAME%
 
 @set PYTHONPATH=@SIMPL_ANACONDA_OUTPUT_DIR@\@PYTHON_SITE_PACKAGES_NAME@

From 2f53decf80d78b8ab27c8e34e8b2280e09a51a8d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 24 May 2019 10:12:00 -0400
Subject: [PATCH 112/397] Condense disabling of MSVC warnigns. Remove rarely
 used debug macro.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLibDLLExport.h      |  5 -----
 .../DataContainers/AttributeMatrix.cpp        |  4 ----
 .../SIMPLib/DataContainers/DataArrayProxy.cpp |  5 -----
 .../SIMPLib/DataContainers/DataContainer.cpp  |  4 ----
 Source/SIMPLib/SIMPLibConfiguration.h.in      | 19 ++++++-------------
 5 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLibDLLExport.h b/Source/SIMPLib/Common/SIMPLibDLLExport.h
index 6df4516503..3479f23e97 100755
--- a/Source/SIMPLib/Common/SIMPLibDLLExport.h
+++ b/Source/SIMPLib/Common/SIMPLibDLLExport.h
@@ -37,11 +37,6 @@
 #pragma once
 
 
-#if defined (_MSC_VER)
-#pragma warning(disable: 4267)
-#pragma warning(disable: 4800) /*  warning C4800: 'double' : forcing value to bool 'true' or 'false' */
-#endif
-
 /* Cmake will define SIMPLib_EXPORTS on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index e1fa26a412..65c12667f7 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -237,10 +237,6 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
   {
     if(attributeMatrixName.compare(SIMPL::Geometry::Geometry) != 0)
     {
-      if(__SHOW_DEBUG_MSG__)
-      {
-        std::cout << "    AttributeMatrix: " << attributeMatrixName.toStdString() << std::endl;
-      }
       hid_t attrMatGid = H5Gopen(containerId, attributeMatrixName.toLatin1().constData(), H5P_DEFAULT);
       if(attrMatGid < 0)
       {
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index e9b327b7f9..f3c44b2367 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -121,11 +121,6 @@ void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, Data
   QH5Utilities::getGroupObjects(attrMatGid, H5Utilities::H5Support_DATASET | H5Utilities::H5Support_GROUP, dataArrayNames);
   foreach(QString dataArrayName, dataArrayNames)
   {
-    if(__SHOW_DEBUG_MSG__)
-    {
-      std::cout << "        DataArray: " << dataArrayName.toStdString() << std::endl;
-    }
-
     DataArrayProxy proxy(h5InternalPath, dataArrayName, SIMPL::Unchecked);
 
     herr_t err = QH5Lite::readVectorAttribute(attrMatGid, dataArrayName, SIMPL::HDF5::TupleDimensions, proxy.m_TupleDims);
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 40512124c1..0935c28c55 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -118,10 +118,6 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
   QH5Utilities::getGroupObjects(dcArrayGroupId, H5Utilities::H5Support_GROUP, dataContainers);
   foreach(QString dataContainerName, dataContainers)
   {
-    if(__SHOW_DEBUG_MSG__)
-    {
-      std::cout << "Data Container:" << dataContainerName.toStdString() << std::endl;
-    }
     hid_t containerGid = H5Gopen(dcArrayGroupId, dataContainerName.toLatin1().constData(), H5P_DEFAULT);
     if(containerGid < 0)
     {
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index c25ef2d064..38338e6341 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -79,23 +79,16 @@
 * during an MSVC build */
 #cmakedefine SIMPLib_DISABLE_MSVC_WARNINGS @SIMPLib_DISABLE_MSVC_WARNINGS@
 
-#define __SHOW_DEBUG_MSG__ false
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#endif
 
 #if (_MSC_VER >= 1)
-
-  #pragma warning (error: 4715) /* Not all control points return a value */
-  #pragma warning (error: 4258) /* Nested Variable Definitions are ignored */
+    #pragma warning (error: 4715) /* Not all control points return a value */
+    #pragma warning (error: 4258) /* Nested Variable Definitions are ignored */
     #ifdef SIMPLib_DISABLE_MSVC_WARNINGS
-      #pragma warning(disable:4244)
-      #pragma warning(disable:4267)
-      #pragma warning(disable:4305)
+        #pragma warning(disable:4244)  /* 'argument' : conversion from 'type1' to 'type2', possible loss of data */
+        #pragma warning(disable:4305)  /* 'context' : truncation from 'type1' to 'type2' */
+        #pragma warning(disable:4267)  /* 'var' : conversion from 'size_t' to 'type', possible loss of data */
+        #pragma warning(disable:4800)  /* 'double' : forcing value to bool 'true' or 'false' */
     #endif
-
 #endif
 
 #ifdef QT_CORE_LIB

From efc7034faaf1b5076059cb031fe645a2f60c3a90 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 29 May 2019 16:34:16 -0400
Subject: [PATCH 113/397] Remove file that was moved to SIMPLib/Core and never
 removed.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/Core/DynamicTableData.h | 93 ---------------------
 1 file changed, 93 deletions(-)
 delete mode 100644 Source/SVWidgetsLib/Core/DynamicTableData.h

diff --git a/Source/SVWidgetsLib/Core/DynamicTableData.h b/Source/SVWidgetsLib/Core/DynamicTableData.h
deleted file mode 100644
index d74e36b4bd..0000000000
--- a/Source/SVWidgetsLib/Core/DynamicTableData.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#pragma once
-
-
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QAbstractTableModel>
-
-#include <QtWidgets/QWidget>
-
-#include "SIMPLib/Filtering/AbstractFilter.h"
-
-#include "SVWidgetsLib/SVWidgetsLib.h"
-
-/**
-* @brief
-* @author
-* @version
-*/
-class SIMPLib_EXPORT DynamicTableData : public QObject
-{
-    Q_OBJECT
-
-  public:
-    DynamicTableData();
-    DynamicTableData(std::vector<std::vector<double> > data, int nRows, int nCols, QStringList rHeaders = QStringList(), QStringList cHeaders = QStringList());
-    DynamicTableData(QAbstractItemModel* model);
-
-    virtual ~DynamicTableData();
-
-    std::vector<std::vector<double> > getTableData();
-    void setTableData(std::vector<std::vector<double> > data);
-
-    QStringList getRowHeaders();
-    void setRowHeaders(QStringList rHeaders);
-
-    QStringList getColHeaders();
-    void setColHeaders(QStringList cHeaders);
-
-    int getNumRows();
-    void setNumRows(int nRows);
-
-    int getNumCols();
-    void setNumCols(int nCols);
-
-    static QAbstractItemModel* convertToModel(DynamicTableData data);
-
-    DynamicTableData(const DynamicTableData& rhs);
-    void operator=(const DynamicTableData& rhs);
-
-  private:
-    std::vector<std::vector<double> > tableData;
-    QStringList rowHeaders;
-    QStringList colHeaders;
-    int numRows;
-    int numCols;
-};
-
-Q_DECLARE_METATYPE(DynamicTableData)
-

From 591e57155cb1fd6e86510d6c6fe8f387bcbc21d0 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Fri, 31 May 2019 14:31:25 -0400
Subject: [PATCH 114/397] Feature/IntVec2FilterParameter (#353)

* Created IntVec2FilterParameter and corresponding IntVec2Widget based on IntVec3FilterParameter and IntVec3Widget.
* Added IntVec2FilterParameter to GenericExample.
---
 .../IntVec2FilterParameter.cpp                | 107 +++++++++++++
 .../FilterParameters/IntVec2FilterParameter.h | 140 ++++++++++++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 Source/SIMPLib/TestFilters/GenericExample.cpp |   2 +-
 Source/SIMPLib/TestFilters/GenericExample.h   |   5 +
 .../FilterParameterWidgets/IntVec2Widget.cpp  | 133 +++++++++++++++++
 .../FilterParameterWidgets/IntVec2Widget.h    |  88 +++++++++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../UI_Files/IntVec2Widget.ui                 |  95 ++++++++++++
 9 files changed, 572 insertions(+), 1 deletion(-)
 create mode 100644 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/IntVec2Widget.ui

diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
new file mode 100644
index 0000000000..747c5ae7b0
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -0,0 +1,107 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "IntVec2FilterParameter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::IntVec2FilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::~IntVec2FilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::Pointer IntVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category,
+                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+{
+
+  IntVec2FilterParameter::Pointer ptr = IntVec2FilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
+  ptr->setCategory(category);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString IntVec2FilterParameter::getWidgetType() const
+{
+  return QString("IntVec2Widget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2FilterParameter::readJson(const QJsonObject& obj)
+{
+  QJsonValue jsonValue = obj[getPropertyName()];
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    QJsonObject json = jsonValue.toObject();
+    IntVec2Type intVec2;
+    if(json["x"].isDouble() && json["y"].isDouble())
+    {
+      intVec2[0] = json["x"].toInt();
+      intVec2[1] = json["y"].toInt();
+    }
+    m_SetterCallback(intVec2);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2FilterParameter::writeJson(QJsonObject& obj)
+{
+  if(m_GetterCallback)
+  {
+    IntVec2Type intVec2 = m_GetterCallback();
+    QJsonObject json;
+    json["x"] = intVec2.getX();
+    json["y"] = intVec2.getY();
+    obj[getPropertyName()] = json;
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
new file mode 100644
index 0000000000..cd7a1cb161
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -0,0 +1,140 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <functional>
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+
+/**
+ * @brief SIMPL_NEW_INT_VEC2_FP This macro is a short-form way of instantiating an instance of
+ * IntVec2FilterParameter. There are 4 required parameters and 2 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), Units (optional), GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_INT_VEC2_FP("HumanLabel", PropertyName, Category, FilterName, Units, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
+ * SIMPL_NEW_INT_VEC2_FP("Dimensions (XY)", Dimensions, FilterParameter::Parameter, GenericExample);
+ */
+#define SIMPL_NEW_INT_VEC2_FP(...)                                                                                                                                                                     \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntVec2FilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The IntVec2FilterParameter class is used by filters to instantiate an IntVec2Widget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, an IntVec2Widget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
+{
+public:
+  SIMPL_SHARED_POINTERS(IntVec2FilterParameter)
+  SIMPL_STATIC_NEW_MACRO(IntVec2FilterParameter)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IntVec2FilterParameter, FilterParameter)
+
+  using SetterCallbackType = std::function<void(IntVec2Type)>;
+  using GetterCallbackType = std::function<IntVec2Type(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the IntVec2FilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INT_VEC2_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~IntVec2FilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+protected:
+  /**
+   * @brief IntVec2FilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  IntVec2FilterParameter();
+
+public:
+  IntVec2FilterParameter(const IntVec2FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  IntVec2FilterParameter(IntVec2FilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  IntVec2FilterParameter& operator=(const IntVec2FilterParameter&) = delete; // Copy Assignment Not Implemented
+  IntVec2FilterParameter& operator=(IntVec2FilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
+
+Q_DECLARE_METATYPE(IntVec2Type)
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index b5a0e845b3..dc66a8f434 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -50,6 +50,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputFileFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputPathFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec2FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec3FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersReader.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersWriter.h
@@ -114,6 +115,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputFileFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/InputPathFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec2FilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IntVec3FilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersReader.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/JsonFilterParametersWriter.cpp
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index d9e59eedc9..43968dfd03 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -55,7 +55,6 @@
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
-#include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
@@ -176,6 +175,7 @@ void GenericExample::setupFilterParameters()
 
   /* Display a group of 3 text boxes to collect 3 integer values */
   parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_INT_VEC2_FP("Range (XY)", Range, FilterParameter::Parameter, GenericExample));
 
   parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, GenericExample));
 
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index f46edce029..6827c3b758 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -44,6 +44,7 @@
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
+#include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
@@ -89,6 +90,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(bool WriteAlignmentShifts READ getWriteAlignmentShifts WRITE setWriteAlignmentShifts)
   PYB11_PROPERTY(int ConversionType READ getConversionType WRITE setConversionType)
   PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+  PYB11_PROPERTY(IntVec2Type Range READ getRange WRITE setRange)
   PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
   PYB11_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
   PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
@@ -189,6 +191,9 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
   Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
+  SIMPL_FILTER_PARAMETER(IntVec2Type, Range)
+  Q_PROPERTY(IntVec2Type Range READ getRange WRITE setRange)
+
   SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
   Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
new file mode 100644
index 0000000000..c2513494d2
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -0,0 +1,133 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "IntVec2Widget.h"
+
+#include <QtCore/QMetaProperty>
+
+#include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
+
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+
+#include "FilterParameterWidgetsDialogs.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IntVec2Widget::IntVec2Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+{
+  m_FilterParameter = dynamic_cast<IntVec2FilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "IntVec2Widget can ONLY be used with a IntVec2FilterParameter object");
+
+  setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IntVec2Widget::~IntVec2Widget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2Widget::setupGui()
+{
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
+  connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
+
+  QIntValidator* xVal = new QIntValidator(xData);
+  xData->setValidator(xVal);
+  QIntValidator* yVal = new QIntValidator(yData);
+  yData->setValidator(yVal);
+
+  if(getFilterParameter() != nullptr)
+  {
+    IntVec2WidgetLabel->setText(getFilterParameter()->getHumanLabel());
+
+    IntVec2Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<IntVec2Type>();
+    xData->setText(QString::number(data[0]));
+    yData->setText(QString::number(data[1]));
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2Widget::widgetChanged(const QString& text)
+{
+  emit parametersChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  bool ok = false;
+  IntVec2Type data;
+  data[0] = xData->text().toInt(&ok);
+  data[1] = yData->text().toInt(&ok);
+
+  QVariant v;
+  v.setValue(data);
+  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
+  if(!ok)
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2Widget::beforePreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void IntVec2Widget::afterPreflight()
+{
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
new file mode 100644
index 0000000000..73d6ae9d4b
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
@@ -0,0 +1,88 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+#include <QtWidgets/QWidget>
+
+#include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+#include "SVWidgetsLib/ui_IntVec2Widget.h"
+
+/**
+ * @brief
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT IntVec2Widget : public FilterParameterWidget, private Ui::IntVec2Widget
+{
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  IntVec2Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~IntVec2Widget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  IntVec2FilterParameter* m_FilterParameter;
+
+public:
+  IntVec2Widget(const IntVec2Widget&) = delete;            // Copy Constructor Not Implemented
+  IntVec2Widget(IntVec2Widget&&) = delete;                 // Move Constructor Not Implemented
+  IntVec2Widget& operator=(const IntVec2Widget&) = delete; // Copy Assignment Not Implemented
+  IntVec2Widget& operator=(IntVec2Widget&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index d8a10140ef..e96e0ec70e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -29,6 +29,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     FloatWidget
     FourthOrderPolynomialWidget
     GenerateColorTableWidget
+    IntVec2Widget
     IntVec3Widget
     IntWidget
     LinkedBooleanWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/IntVec2Widget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/IntVec2Widget.ui
new file mode 100644
index 0000000000..f0acc50cfc
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/IntVec2Widget.ui
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>IntVec2Widget</class>
+ <widget class="QFrame" name="IntVec2Widget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>566</width>
+    <height>37</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="IntVec2WidgetLabel">
+     <property name="text">
+      <string>Property</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="SVLineEdit" name="xData">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="SVLineEdit" name="yData">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </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>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SVLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>xData</tabstop>
+  <tabstop>yData</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>

From 61a1a838eddb157230ee8f3fa0633406f6c2b62f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 3 Jun 2019 11:39:37 -0400
Subject: [PATCH 115/397] Enable extraction of Pipeline from .dream3d file.
 (#355)

* Enable extraction of Pipeline from .dream3d file.
* Reverts 0b9d9c8ee67f22afbd5c2a1b6af6dc8abf4c4630
* Fixing bad base class in the .ui file

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../UI_Files/QtSFileDragMessageBox.ui         | 16 +++++++++++--
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   | 24 +++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/Source/SVWidgetsLib/QtSupport/UI_Files/QtSFileDragMessageBox.ui b/Source/SVWidgetsLib/QtSupport/UI_Files/QtSFileDragMessageBox.ui
index 49348a6a33..3bb63e98f8 100755
--- a/Source/SVWidgetsLib/QtSupport/UI_Files/QtSFileDragMessageBox.ui
+++ b/Source/SVWidgetsLib/QtSupport/UI_Files/QtSFileDragMessageBox.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QtSFileDragMessageBox</class>
- <widget class="QWidget" name="QtSFileDragMessageBox">
+ <widget class="QDialog" name="QtSFileDragMessageBox">
   <property name="windowModality">
    <enum>Qt::WindowModal</enum>
   </property>
@@ -23,6 +23,18 @@
    <string>Pipeline File Drop</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>4</number>
+   </property>
+   <property name="topMargin">
+    <number>4</number>
+   </property>
+   <property name="rightMargin">
+    <number>4</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
+   </property>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <property name="sizeConstraint">
@@ -38,7 +50,7 @@
         </font>
        </property>
        <property name="text">
-        <string>A pipeline file has been dragged into the SIMPLView interface.</string>
+        <string>A DREAM.3D file has been dragged into the SIMPLView interface.</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 453ead155c..61688c7d8c 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -101,10 +101,10 @@
 
 class ExecutionResultInvalidException : public std::exception
 {
-   const char* what () const noexcept
-   {
-      return "The execution result of a pipeline was invalid.";
-   }
+  const char* what() const noexcept override
+  {
+    return "The execution result of a pipeline was invalid.";
+  }
 };
 
 // -----------------------------------------------------------------------------
@@ -853,9 +853,9 @@ QPixmap SVPipelineView::getDraggingPixmap(QModelIndexList indexes)
   p.begin(&dragPixmap);
   p.setOpacity(0.70);
   int offset = 0;
-  for(int i = 0; i < indexes.size(); i++)
+  for(const auto& listItem : indexes)
   {
-    QPixmap currentPixmap = delegate->createPixmap(indexes[i]);
+    QPixmap currentPixmap = delegate->createPixmap(listItem);
     p.drawPixmap(0, offset, currentPixmap);
     offset = offset + indexPixmap.size().height() + spacing();
   }
@@ -1539,12 +1539,11 @@ int SVPipelineView::openPipeline(const QString& filePath, int insertIndex)
   }
 
   QString ext = fi.suffix();
-  QString name = fi.fileName();
+  // QString name = fi.fileName();
   QString baseName = fi.baseName();
 
   if(ext == "dream3d")
   {
-#if 0
     QtSFileDragMessageBox* msgBox = new QtSFileDragMessageBox(this);
     msgBox->exec();
     msgBox->deleteLater();
@@ -1553,18 +1552,17 @@ int SVPipelineView::openPipeline(const QString& filePath, int insertIndex)
     {
       return 0;
     }
-    else if(msgBox->didPressOkBtn() == true)
+
+    if(msgBox->didPressOkBtn())
     {
-      if(msgBox->isExtractPipelineBtnChecked() == false)
-#endif
+      if(!msgBox->isExtractPipelineBtnChecked())
       {
         DataContainerReader::Pointer reader = DataContainerReader::New();
         reader->setInputFile(filePath);
-
         addFilter(reader, insertIndex);
         return 1;
       }
-    //}
+    }
   }
 
   // Read the pipeline from the file

From 79d3f34a6f90088b936317aeef1e67b66a0e01e4 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Mon, 3 Jun 2019 12:37:08 -0400
Subject: [PATCH 116/397] Feature/montage selection (#352)

* Added MontageSelection class to contain values required for selecting a range of montage tiles.
* Added MontageSelectionFilterParameter to wrap MontageSelection and allow the creation of the corresponding MontageSelectionWidget. This allows the user to select a range of DataContainers for a montage based on start and end values for row, a padding amount for digits, as well as prefix and suffix values surrounding the DataContainer name.
* The resulting DataContainers matching the MontageSelection are displayed in MontageSelectionWidget in a QTableWidget. DataContainers that exist in the filter's DataContainerArray are marked with a green bullet icon. DataContainers that could not be found are marked with a red bullet icon.
---
 .../MontageSelectionFilterParameter.cpp       |  99 ++++++
 .../MontageSelectionFilterParameter.h         | 137 ++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 Source/SIMPLib/TestFilters/GenericExample.cpp |   4 +
 Source/SIMPLib/TestFilters/GenericExample.h   |   5 +
 Source/SIMPLib/Utilities/MontageSelection.cpp | 306 ++++++++++++++++++
 Source/SIMPLib/Utilities/MontageSelection.h   | 226 +++++++++++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   2 +
 .../MontageSelectionWidget.cpp                | 220 +++++++++++++
 .../MontageSelectionWidget.h                  | 119 +++++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../UI_Files/MontageSelectionWidget.ui        | 241 ++++++++++++++
 12 files changed, 1362 insertions(+)
 create mode 100644 Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
 create mode 100644 Source/SIMPLib/Utilities/MontageSelection.cpp
 create mode 100644 Source/SIMPLib/Utilities/MontageSelection.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui

diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
new file mode 100644
index 0000000000..980cda40a7
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -0,0 +1,99 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MontageSelectionFilterParameter.h"
+
+#include <QtCore/QJsonArray>
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::MontageSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::~MontageSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::Pointer MontageSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category,
+                                                                              const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+{
+  MontageSelectionFilterParameter::Pointer ptr = MontageSelectionFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  ptr->setDefaultValue(QVariant::fromValue(defaultValue));
+  ptr->setCategory(category);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageSelectionFilterParameter::getWidgetType() const
+{
+  return QString("MontageSelectionWidget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonObject jsonValues = json[getPropertyName()].toObject();
+  if(!jsonValues.isEmpty() && m_SetterCallback)
+  {
+    MontageSelection selection;
+    selection.fromJson(jsonValues);
+    m_SetterCallback(selection);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    MontageSelection values = m_GetterCallback();
+    json[getPropertyName()] = values.toJson();
+  }
+}
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
new file mode 100644
index 0000000000..c8beeca5a7
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -0,0 +1,137 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Utilities/MontageSelection.h"
+
+/**
+ * @brief SIMPL_NEW_MONTAGE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * MontageSelectionFilterParameter. There are 4 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_MONTAGE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_MONTAGE_SELECTION_FP("Montage 2", Montage2, FilterParameter::Parameter, GenericExample);
+ */
+#define SIMPL_NEW_MONTAGE_SELECTION_FP(...)                                                                                                                                                            \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MontageSelectionFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The MontageSelectionFilterParameter class is used by filters to instantiate an MontageSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a MontageSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
+{
+public:
+  SIMPL_SHARED_POINTERS(MontageSelectionFilterParameter)
+  SIMPL_STATIC_NEW_MACRO(MontageSelectionFilterParameter)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MontageSelectionFilterParameter, FilterParameter)
+
+  using SetterCallbackType = std::function<void(MontageSelection)>;
+  using GetterCallbackType = std::function<MontageSelection(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the MontageSelectionFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~MontageSelectionFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+
+protected:
+  /**
+   * @brief MontageSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MontageSelectionFilterParameter();
+
+public:
+  MontageSelectionFilterParameter(const MontageSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MontageSelectionFilterParameter(MontageSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MontageSelectionFilterParameter& operator=(const MontageSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MontageSelectionFilterParameter& operator=(MontageSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index dc66a8f434..ea3d4de836 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -58,6 +58,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.h
@@ -123,6 +124,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.cpp
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 43968dfd03..cdd1a9fe15 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -57,6 +57,7 @@
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
@@ -309,6 +310,9 @@ void GenericExample::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0));
   }
 
+  parameters.push_back(SeparatorFilterParameter::New("Montage Selection Example", FilterParameter::Parameter));
+  parameters.push_back(SIMPL_NEW_MONTAGE_SELECTION_FP("Montage Selection", MontageSelection, FilterParameter::Parameter, GenericExample));
+
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 6827c3b758..914a21e3c7 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -46,6 +46,7 @@
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -106,6 +107,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(bool Bool2 READ getBool2 WRITE setBool2)
   PYB11_PROPERTY(int AlgorithmSelection READ getAlgorithmSelection WRITE setAlgorithmSelection)
   PYB11_PROPERTY(int DistanceMetric READ getDistanceMetric WRITE setDistanceMetric)
+  PYB11_PROPERTY(MontageSelection MontageSelection READ getMontageSelection WRITE setMontageSelection)
 
 public:
   SIMPL_SHARED_POINTERS(GenericExample)
@@ -238,6 +240,9 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
 
   SIMPL_FILTER_PARAMETER(int, DistanceMetric)
   Q_PROPERTY(int DistanceMetric READ getDistanceMetric WRITE setDistanceMetric)
+    
+  SIMPL_FILTER_PARAMETER(MontageSelection, MontageSelection)
+  Q_PROPERTY(MontageSelection MontageSelection READ getMontageSelection WRITE setMontageSelection)
 
   const QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
diff --git a/Source/SIMPLib/Utilities/MontageSelection.cpp b/Source/SIMPLib/Utilities/MontageSelection.cpp
new file mode 100644
index 0000000000..fddf2ac849
--- /dev/null
+++ b/Source/SIMPLib/Utilities/MontageSelection.cpp
@@ -0,0 +1,306 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MontageSelection.h"
+
+#include <algorithm>
+
+namespace
+{
+const QString RowChar = "r";
+const QString ColChar = "c";
+const QString Prefix = "PrefixStr";
+const QString Suffix = "SuffixStr";
+const QString Padding = "Padding";
+const QString RowStart = "RowStart";
+const QString RowEnd = "RowEnd";
+const QString ColStart = "ColStart";
+const QString ColEnd = "ColEnd";
+} // namespace
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelection::MontageSelection()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelection::MontageSelection(const QString& prefix, const QString& suffix, int padding, int rowStart, int rowEnd, int colStart, int colEnd)
+: m_Prefix(prefix)
+, m_Suffix(suffix)
+, m_Padding(padding)
+, m_RowStart(rowStart)
+, m_RowEnd(rowEnd)
+, m_ColStart(colStart)
+, m_ColEnd(colEnd)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelection MontageSelection::Create(const std::string& prefix, const std::string& suffix, int padding, int rowStart, int rowEnd, int colStart, int colEnd)
+{
+  QString prefixStr = QString::fromStdString(prefix);
+  QString suffixStr = QString::fromStdString(suffix);
+  return MontageSelection(prefixStr, suffixStr, padding, rowStart, rowEnd, colStart, colEnd);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelection::~MontageSelection() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageSelection::getPrefix() const
+{
+  return m_Prefix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageSelection::getSuffix() const
+{
+  return m_Suffix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setPrefix(const QString& prefix)
+{
+  m_Prefix = prefix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setSuffix(const QString& suffix)
+{
+  m_Suffix = suffix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int MontageSelection::getPadding() const
+{
+  return m_Padding;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setPadding(int padding)
+{
+  m_Padding = std::max(padding, 1);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int MontageSelection::getRowStart() const
+{
+  return m_RowStart;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setRowStart(int rowStart)
+{
+  m_RowStart = rowStart;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int MontageSelection::getRowEnd() const
+{
+  return m_RowEnd;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setRowEnd(int rowEnd)
+{
+  m_RowEnd = std::max(rowEnd, m_RowStart);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int MontageSelection::getColStart() const
+{
+  return m_ColStart;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setColStart(int colStart)
+{
+  m_ColStart = std::max(colStart, 0);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int MontageSelection::getColEnd() const
+{
+  return m_ColEnd;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setColEnd(int colEnd)
+{
+  m_ColEnd = std::max(colEnd, m_ColStart);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setRowRange(int rowStart, int rowEnd)
+{
+  setRowStart(rowStart);
+  setRowEnd(rowEnd);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::setColRange(int colStart, int colEnd)
+{
+  setColStart(colStart);
+  setColEnd(colEnd);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageSelection::getDataContainerName(int row, int col) const
+{
+  const QString rowStr = QString::number(row).rightJustified(m_Padding, '0');
+  const QString colStr = QString::number(col).rightJustified(m_Padding, '0');
+  return m_Prefix + ::RowChar + rowStr + ::ColChar + colStr + m_Suffix;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList MontageSelection::getDataContainerNamesCombOrder() const
+{
+  QStringList dcNames;
+  for(int row = m_RowStart; row <= m_RowEnd; row++)
+  {
+    const QString rowStr = QString::number(row).rightJustified(m_Padding, '0');
+    for(int col = m_ColStart; col <= m_ColEnd; col++)
+    {
+      const QString colStr = QString::number(col).rightJustified(m_Padding, '0');
+      dcNames.push_back(m_Prefix + ::RowChar + rowStr + ::ColChar + colStr + m_Suffix);
+    }
+  }
+  return dcNames;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList MontageSelection::getDataContainerNamesSnakeOrder() const
+{
+  QStringList dcNames;
+  bool snakeBack = false;
+  for(int row = m_RowStart; row <= m_RowEnd; row++)
+  {
+    const QString rowStr = QString::number(row).rightJustified(m_Padding, '0');
+    if(snakeBack)
+    {
+      for(int col = m_ColEnd; col <= m_ColStart; col--)
+      {
+        const QString colStr = QString::number(col).rightJustified(m_Padding, '0');
+        dcNames.push_back(m_Prefix + ::RowChar + rowStr + ::ColChar + colStr + m_Suffix);
+      }
+    }
+    else
+    {
+      for(int col = m_ColStart; col <= m_ColEnd; col++)
+      {
+        const QString colStr = QString::number(col).rightJustified(m_Padding, '0');
+        dcNames.push_back(m_Prefix + ::RowChar + rowStr + ::ColChar + colStr + m_Suffix);
+      }
+    }
+    snakeBack = !snakeBack;
+  }
+  return dcNames;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QJsonObject MontageSelection::toJson() const
+{
+  QJsonObject object;
+  object[::Prefix] = getPrefix();
+  object[::Suffix] = getSuffix();
+  object[::Padding] = getPadding();
+  object[::RowStart] = getRowStart();
+  object[::RowEnd] = getRowEnd();
+  object[::ColStart] = getColStart();
+  object[::ColEnd] = getColEnd();
+
+  return object;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelection::fromJson(const QJsonObject& json)
+{
+  setPrefix(json[::Prefix].toString());
+  setSuffix(json[::Suffix].toString());
+  setPadding(json[::Padding].toInt());
+  setRowStart(json[::RowStart].toInt());
+  setRowEnd(json[::RowEnd].toInt());
+  setColStart(json[::ColStart].toInt());
+  setColEnd(json[::ColEnd].toInt());
+}
diff --git a/Source/SIMPLib/Utilities/MontageSelection.h b/Source/SIMPLib/Utilities/MontageSelection.h
new file mode 100644
index 0000000000..6b922750e1
--- /dev/null
+++ b/Source/SIMPLib/Utilities/MontageSelection.h
@@ -0,0 +1,226 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @class MontageSelection MontageSelection.h SIMPLib/Utilities/MontageSelection.h
+ * @brief The MontageSelection class is a utility class for generating and storing
+ * a list of DataContainer names from prefix, suffix, as well as a range of rows
+ * and columns.  This class is used in MontageSelectionFilterParameter and the
+ * corresponding MontageSelectionWidget.
+ */
+class SIMPLib_EXPORT MontageSelection
+{
+  PYB11_CREATE_BINDINGS(MontageSelection)
+  PYB11_STATIC_CREATION(Create ARGS std::string std::string int int int int int)
+  PYB11_PROPERTY(QString Prefix READ getPrefix WRITE setPrefix)
+  PYB11_PROPERTY(QString Suffix READ getSuffix WRITE setSuffix)
+  PYB11_PROPERTY(int Padding READ getPadding WRITE setPadding)
+  PYB11_PROPERTY(int RowStart READ getRowStart WRITE setRowStart)
+  PYB11_PROPERTY(int RowEnd READ getRowEnd WRITE setRowEnd)
+  PYB11_PROPERTY(int ColStart READ getColStart WRITE setColStart)
+  PYB11_PROPERTY(int ColEnd READ getColEnd WRITE setColEnd)
+
+public:
+  MontageSelection();
+  MontageSelection(const QString& prefix, const QString& suffix, int padding, int rowStart, int rowEnd, int colStart, int colEnd);
+  virtual ~MontageSelection();
+
+  static MontageSelection Create(const std::string& prefix, const std::string& suffix, int padding, int rowStart, int rowEnd, int colStart, int colEnd);
+
+  /**
+   * @brief Returns the prefix used for generating DataContainer names.
+   * @return
+   */
+  QString getPrefix() const;
+
+  /**
+   * @brief Returns the suffix used for generating DataContainer names.
+   * @return
+   */
+  QString getSuffix() const;
+
+  /**
+   * @brief Sets the prefix used for generating DataContainer names.
+   * @param prefix
+   */
+  void setPrefix(const QString& prefix);
+
+  /**
+   * @brief Sets the suffix used for generating DataContainer names.
+   * @param suffix
+   */
+  void setSuffix(const QString& suffix);
+
+  /**
+   * @brief Returns the padding used for digits in DataContainer names.
+   * @return
+   */
+  int getPadding() const;
+
+  /**
+   * @brief Sets the padding used for digits in DataContainer names.
+   * The minimum value allowed is 1, and values under that will be bumped up.
+   * @param padding
+   */
+  void setPadding(int padding);
+
+  /**
+   * @brief Returns the starting row in the montage DataContainer selection.
+   * @return
+   */
+  int getRowStart() const;
+
+  /**
+   * @brief Returns the last row in the montage DataContainer selection.
+   * @return
+   */
+  int getRowEnd() const;
+
+  /**
+   * @brief Returns the starting column in the montage DataContainer selection.
+   * @return
+   */
+  int getColStart() const;
+
+  /**
+   * @brief Returns the last column in the montage DataContainer selection.
+   * @return
+   */
+  int getColEnd() const;
+
+  /**
+   * @brief Sets the starting row in the montage DataContainer selection.
+   * The minimum value allowed is 0, and values under that will be bumped up.
+   * @param rowStart
+   */
+  void setRowStart(int rowStart);
+
+  /**
+   * @brief Sets the last row in the montage DataContainer selection.
+   * The minimum value allowed is the RowStart value, and values under that will be bumped up.
+   * @param rowEnd
+   */
+  void setRowEnd(int rowEnd);
+
+  /**
+   * @brief Sets the starting column in the montage DataContainer selection.
+   * The minimum value allowed is 0, and values under that will be bumped up.
+   * @param colStart
+   */
+  void setColStart(int colStart);
+
+  /**
+   * @brief Sets the last column in the montage DataContainer selection.
+   * The minimum value allowed is the ColStart value, and values under that will be bumped up.
+   * @param colEnd
+   */
+  void setColEnd(int colEnd);
+
+  /**
+   * @brief Sets the range of rows for the montage DataContainer selection.
+   * The minimum value allowed is 0, and the end value must be equal or greater than the start value.
+   * Invalid values will be bumped up to their minimum values.
+   * @param rowStart
+   * @param rowEnd
+   */
+  void setRowRange(int rowStart, int rowEnd);
+
+  /**
+   * @brief Sets the range of columns for the montage DataContainer selection.
+   * The minimum value allowed is 0, and the end value must be equal or greater than the start value.
+   * Invalid values will be bumped up to their minimum values.
+   * @param colStart
+   * @param colEnd
+   */
+  void setColRange(int colStart, int colEnd);
+
+  /**
+   * @brief Returns the DataContainer name for the tile at the given row and column.
+   * @param row
+   * @param col
+   * @return
+   */
+  QString getDataContainerName(int row, int col) const;
+
+  /**
+   * @brief Returns a QStringList of the target DataContainer names in comb order.
+   * @return
+   */
+  QStringList getDataContainerNamesCombOrder() const;
+
+  /**
+   * @brief Returns a QStringList of the target DataContainer names in snake order.
+   * @return
+   */
+  QStringList getDataContainerNamesSnakeOrder() const;
+
+  /**
+   * @brief Returns a QJsonObject corresponding to the current values.
+   * @return
+   */
+  QJsonObject toJson() const;
+
+  /**
+   * @brief Loads values from the given QJsonObject.
+   * @param json
+   */
+  void fromJson(const QJsonObject& json);
+
+private:
+  QString m_Prefix;
+  QString m_Suffix;
+  int m_Padding = 0;
+  int m_RowStart = 0;
+  int m_RowEnd = 0;
+  int m_ColStart = 0;
+  int m_ColEnd = 0;
+
+public:
+  MontageSelection(const MontageSelection&) = default;            // Copy Constructor Default Implemented
+  MontageSelection(MontageSelection&&) = default;                 // Move Constructor Default Implemented
+  MontageSelection& operator=(const MontageSelection&) = default; // Copy Assignment Default Implemented
+  MontageSelection& operator=(MontageSelection&&) = default;      // Move Assignment Default Implemented
+};
+
+Q_DECLARE_METATYPE(MontageSelection);
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index 26c88f9939..0a4102464b 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -21,6 +21,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilePathGenerator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileSystemPathHelper.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatSummation.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelection.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibEndian.h
@@ -34,6 +35,7 @@ set(SIMPLib_Utilities_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilePathGenerator.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileSystemPathHelper.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatSummation.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelection.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReader.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.cpp
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
new file mode 100644
index 0000000000..c8fc315b60
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -0,0 +1,220 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MontageSelectionWidget.h"
+
+#include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
+
+#include "SVWidgetsLib/ui_MontageSelectionWidget.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelectionWidget::MontageSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
+, m_Ui(new Ui::MontageSelectionWidget)
+{
+  m_FilterParameter = dynamic_cast<MontageSelectionFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MontageSelectionWidget can ONLY be used with a MontageSelectionFilterParameter object");
+
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelectionWidget::MontageSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_DidCausePreflight(false)
+{
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::setupGui()
+{
+  // Sanity Check the filter and the filter parameter
+  if(getFilter() == nullptr)
+  {
+    return;
+  }
+  if(getFilterParameter() == nullptr)
+  {
+    return;
+  }
+
+  // Lastly, hook up the filter's signals and slots to our own signals and slots
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+
+  // Set FilterParameter values
+  MontageSelection selection = dynamic_cast<MontageSelectionFilterParameter*>(getFilterParameter())->getGetterCallback()();
+  m_Ui->prefixStringEdit->setText(selection.getPrefix());
+  m_Ui->suffixStringEdit->setText(selection.getSuffix());
+  m_Ui->paddingSpinBox->setValue(selection.getPadding());
+  m_Ui->rowStartSpinBox->setValue(selection.getRowStart());
+  m_Ui->rowEndSpinBox->setValue(selection.getRowEnd());
+  m_Ui->colStartSpinBox->setValue(selection.getColStart());
+  m_Ui->colEndSpinBox->setValue(selection.getColEnd());
+
+  // Connect widget signals
+  connect(m_Ui->prefixStringEdit, &QtSStringEdit::valueChanged, this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->suffixStringEdit, &QtSStringEdit::valueChanged, this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->paddingSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->rowStartSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->rowEndSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->colStartSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->colEndSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageSelection MontageSelectionWidget::getMontageSelection() const
+{
+  MontageSelection montage;
+  montage.setPrefix(m_Ui->prefixStringEdit->getText());
+  montage.setSuffix(m_Ui->suffixStringEdit->getText());
+  montage.setPadding(m_Ui->paddingSpinBox->value());
+  montage.setRowStart(m_Ui->rowStartSpinBox->value());
+  montage.setRowEnd(m_Ui->rowEndSpinBox->value());
+  montage.setColStart(m_Ui->colStartSpinBox->value());
+  montage.setColEnd(m_Ui->colEndSpinBox->value());
+  return montage;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::beforePreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::afterPreflight()
+{
+  populateDataContainerTable();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::populateDataContainerTable()
+{
+  MontageSelection selection = getMontageSelection();
+  const int rowCount = selection.getRowEnd() - selection.getRowStart() + 1;
+  const int colCount = selection.getColEnd() - selection.getColStart() + 1;
+
+  m_Ui->dataContainerTableWidget->clear();
+  m_Ui->dataContainerTableWidget->setRowCount(rowCount);
+  m_Ui->dataContainerTableWidget->setColumnCount(colCount);
+  for(int row = 0; row < rowCount; row++)
+  {
+    for(int col = 0; col < colCount; col++)
+    {
+      QString dcName = selection.getDataContainerName(row + selection.getRowStart(), col + selection.getColStart());
+      m_Ui->dataContainerTableWidget->setItem(row, col, new QTableWidgetItem(getDcIcon(dcName), dcName));
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon MontageSelectionWidget::getDcIcon(const QString& dcName) const
+{
+  // Do not recreate the variables with every call, and these are not variables
+  // that make sense to be available outside of this method.
+  static QIcon dcFoundIcon = QIcon(":SIMPL/icons/images/bullet_ball_green.png");
+  static QIcon dcNotFoundIcon = QIcon(":SIMPL/icons/images/bullet_ball_red.png");
+
+  bool dcExists = (getFilter()->getDataContainerArray()->getDataContainer(dcName) != nullptr);
+  return dcExists ? dcFoundIcon : dcNotFoundIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::causePreflight()
+{
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  MontageSelection selection = getMontageSelection();
+
+  QVariant var;
+  var.setValue(selection);
+  bool ok = false;
+
+  // Set the value into the Filter
+  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
+  if(!ok)
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
new file mode 100644
index 0000000000..7c2202ff53
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
@@ -0,0 +1,119 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <QtCore/QPointer>
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+
+#include "SIMPLib/Utilities/MontageSelection.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+class MontageSelectionFilterParameter;
+namespace Ui
+{
+class MontageSelectionWidget;
+}
+
+/**
+ * @brief
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT MontageSelectionWidget : public FilterParameterWidget
+{
+  Q_OBJECT
+
+public:
+  MontageSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  MontageSelectionWidget(QWidget* parent = nullptr);
+
+  /**
+   * @brief Creates and returns a MontageSelection based on the the current values.
+   * @return
+   */
+  MontageSelection getMontageSelection() const;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected:
+  /**
+   * @brief Helper method for triggering the preflight signal and toggling
+   * the values consistently based on signals.
+   */
+  void causePreflight();
+
+  /**
+   * @brief Returns the corresponding QIcon for the given DataContainer name.
+   * The icon returned is determined from the presence of the given DataContainer
+   * in the given filter's DataContainerArray.
+   * @param dcName
+   * @return
+   */
+  QIcon getDcIcon(const QString& dcName) const;
+
+private:
+  /**
+   * @brief Performs initial setup for signals.
+   */
+  void setupGui();
+
+  /**
+   * @brief Initializes the widget for the given FilterParameter and AbstractFilter.
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief Populate the DataContainer table with names based on the current values.
+   */
+  void populateDataContainerTable();
+
+  bool m_DidCausePreflight;
+  QSharedPointer<Ui::MontageSelectionWidget> m_Ui;
+
+  MontageSelectionFilterParameter* m_FilterParameter;
+
+public:
+  MontageSelectionWidget(const MontageSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MontageSelectionWidget(MontageSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MontageSelectionWidget& operator=(const MontageSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MontageSelectionWidget& operator=(MontageSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index e96e0ec70e..d79d772678 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -34,6 +34,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     IntWidget
     LinkedBooleanWidget
     LinkedPathCreationWidget
+    MontageSelectionWidget
     MultiAttributeMatrixSelectionWidget
     MultiDataContainerSelectionWidget
     MultiDataArraySelectionWidget
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui
new file mode 100644
index 0000000000..3f2c180f80
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MontageSelectionWidget</class>
+ <widget class="QWidget" name="MontageSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>450</width>
+    <height>198</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="leftMargin">
+    <number>1</number>
+   </property>
+   <property name="topMargin">
+    <number>1</number>
+   </property>
+   <property name="rightMargin">
+    <number>1</number>
+   </property>
+   <property name="bottomMargin">
+    <number>1</number>
+   </property>
+   <property name="spacing">
+    <number>4</number>
+   </property>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="paddingSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimum">
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QSpinBox" name="colStartSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Padding Digits:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Row Start:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="5">
+    <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 row="2" column="1">
+    <widget class="QSpinBox" name="rowStartSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="6">
+    <widget class="QWidget" name="widget_3" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <item row="0" column="1">
+       <widget class="QtSStringEdit" name="prefixStringEdit" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Container Prefix:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Container Suffix:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QtSStringEdit" name="suffixStringEdit" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="label_5">
+     <property name="text">
+      <string>Columnn Start:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Column End:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4">
+    <widget class="QSpinBox" name="colEndSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string>Row End:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="4">
+    <widget class="QSpinBox" name="rowEndSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QLabel" name="label_8">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Data Containers:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="6">
+    <widget class="QTableWidget" name="dataContainerTableWidget">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>90</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QtSStringEdit</class>
+   <extends>QWidget</extends>
+   <header>QtSStringEdit.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

From 6a17bb069a9cc07315eeb767816638de73e58e03 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Thu, 6 Jun 2019 12:18:23 -0400
Subject: [PATCH 117/397] Added header file that allows simpler coding for
 parallel algorithms (#350)

* Added header file that allows simpler coding for parallel algorithms
* Added SIMPLibParallelAlgorithm.hpp with macros defined for several parts required for running algorithms in parallel.  Alternate versions are available for uses where SIMPL_USE_PARALLEL_ALGORITHMS is not defined.
* Added version 2 of parallel algorithms for data and task
* ParallelDataAlgorithm requires a range and function operator taking the beginning and end.
* ParallelTaskAlgorithm requires only the object for execution.
* Removed SIMPLibParallelAlgorithm.hpp and its macros.
* Added SIMPLRange class that stores a given range, either from manually entered values, SIMPLArray, or tbb::blocked_range<size_t>.  This can be used for function operators instead of diverging tbb::blocked_range<size_t> and size_t versions.
* Updated copyright headers
* Added SIMPLRange3D and ParallelData3DAlgorithm for 3D geometries
* Changed SIMPLRange's  array operator to be const.
* Updated ParallelDataAlgorithm to allow accepting SIMPLRange as a parameter when setting the algorithm's range.
* Updated SIMPLib parallel algorithms to use new ParallelData classes
* Removed several SIMPL_USE_PARALLEL_ALGORITHMS checks and replaced them with ParallelDataAlgorithm or ParallelData3DAlgorithm objects.  This reduced the line count and improved readability.
* Updated the prime contract number for new files
* Updated ParallelTaskAlgorithm checks and destructor
* This prevents crashes and better falls in line with RAII principles.
* Updated ParallelTaskAlgorithm num threads check for >= max threads instead of == max threads
* Added ParallelData2DAlgorithm and SIMPLRange2D
* Split SIMPLRange classes into .h and .cpp
* Split SIMPLRange, SIMPLRange2D, and SIMPLRange3D files and updated their references.
* Added missing const to tbb::blocked_range parameters in SIMPLRange
* All constructors added const to the tbb range references, whether they be tbb::blocked_range, tbb::blocked_range2d, or tbb::blocked_range3d.
* Added explanation as to why TBB is included after SIMPLib
* Added clang-format guards around TBB includes.
* Additional methods required to get dimensional ranges for SIMPLRange3D.
* Added SIMPLRange3D's range getter methods to PyBind11 support
---
 Source/SIMPLib/Common/SIMPLRange.cpp          | 116 ++++++++++++++
 Source/SIMPLib/Common/SIMPLRange.h            | 109 +++++++++++++
 Source/SIMPLib/Common/SIMPLRange2D.cpp        | 146 +++++++++++++++++
 Source/SIMPLib/Common/SIMPLRange2D.h          | 133 ++++++++++++++++
 Source/SIMPLib/Common/SIMPLRange3D.cpp        | 121 ++++++++++++++
 Source/SIMPLib/Common/SIMPLRange3D.h          | 113 ++++++++++++++
 Source/SIMPLib/Common/SourceList.cmake        |   6 +
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  31 +---
 .../CoreFilters/GenerateColorTable.cpp        |  33 +---
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  33 +---
 .../SetOriginResolutionImageGeom.cpp          |  14 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |  33 +---
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |  33 +---
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  38 +----
 Source/SIMPLib/Geometry/QuadGeom.cpp          |  33 +---
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |  36 +----
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |  33 +---
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |  33 +---
 .../Utilities/ParallelData2DAlgorithm.cpp     | 102 ++++++++++++
 .../Utilities/ParallelData2DAlgorithm.h       | 139 +++++++++++++++++
 .../Utilities/ParallelData3DAlgorithm.cpp     | 118 ++++++++++++++
 .../Utilities/ParallelData3DAlgorithm.h       | 147 ++++++++++++++++++
 .../Utilities/ParallelDataAlgorithm.cpp       | 102 ++++++++++++
 .../SIMPLib/Utilities/ParallelDataAlgorithm.h | 135 ++++++++++++++++
 .../Utilities/ParallelTaskAlgorithm.cpp       | 108 +++++++++++++
 .../SIMPLib/Utilities/ParallelTaskAlgorithm.h | 126 +++++++++++++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   8 +
 27 files changed, 1797 insertions(+), 282 deletions(-)
 create mode 100644 Source/SIMPLib/Common/SIMPLRange.cpp
 create mode 100644 Source/SIMPLib/Common/SIMPLRange.h
 create mode 100644 Source/SIMPLib/Common/SIMPLRange2D.cpp
 create mode 100644 Source/SIMPLib/Common/SIMPLRange2D.h
 create mode 100644 Source/SIMPLib/Common/SIMPLRange3D.cpp
 create mode 100644 Source/SIMPLib/Common/SIMPLRange3D.h
 create mode 100644 Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
 create mode 100644 Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
 create mode 100644 Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
 create mode 100644 Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
 create mode 100644 Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
 create mode 100644 Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
 create mode 100644 Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
 create mode 100644 Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h

diff --git a/Source/SIMPLib/Common/SIMPLRange.cpp b/Source/SIMPLib/Common/SIMPLRange.cpp
new file mode 100644
index 0000000000..46a6507506
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange.cpp
@@ -0,0 +1,116 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "SIMPLib/Common/SIMPLRange.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange::SIMPLRange()
+: m_Range({0, 0})
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange::SIMPLRange(size_t begin, size_t end)
+: m_Range({begin, end})
+{
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange::SIMPLRange(const tbb::blocked_range<size_t>& r)
+: m_Range({r.begin(), r.end()})
+{
+}
+#endif
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange::RangeType SIMPLRange::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange::min() const
+{
+  return m_Range[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange::max() const
+{
+  return m_Range[1];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange::size() const
+{
+  return m_Range[1] - m_Range[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool SIMPLRange::empty() const
+{
+  return size() == 0;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange::operator[](size_t index) const
+{
+  switch(index)
+  {
+  case 0:
+    return min();
+  case 1:
+    return max();
+  default:
+    throw std::range_error("Range must be 0 or 1");
+  }
+}
diff --git a/Source/SIMPLib/Common/SIMPLRange.h b/Source/SIMPLib/Common/SIMPLRange.h
new file mode 100644
index 0000000000..cb97fb381f
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange.h
@@ -0,0 +1,109 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range.h>
+// clang-format on
+#endif
+
+/**
+ * @class SIMPLRange SIMPLRange.h SIMPLib/Common/SIMPLRange.h
+ * @brief The SIMPLRange class defines a range between set of minimum and
+ * maximum values. The purpose of this class is mainly to allow a more unified
+ * control flow during parallelization between builds using TBB and those that
+ * do not.  Because tbb::blocked_range is used in an implicit conversion constructor,
+ * a single operator accepting a SIMPLRange can be used TBB parallelized and
+ * non-paralleled versions without a branching code base.
+ */
+class SIMPLib_EXPORT SIMPLRange
+{
+public:
+  using RangeType = std::array<size_t, 2>;
+
+  SIMPLRange();
+  SIMPLRange(size_t begin, size_t end);
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  SIMPLRange(const tbb::blocked_range<size_t>& r);
+#endif
+
+  /**
+   * @brief Returns an array representation of the range.
+   * @return
+   */
+  RangeType getRange() const;
+
+  /**
+   * @brief Returns the minimum index in the range.
+   * @return
+   */
+  size_t min() const;
+
+  /**
+   * @brief Returns the maximum index in the range.
+   * @return
+   */
+  size_t max() const;
+
+  /**
+   * @brief Returns the number of indices in the range.
+   * @return
+   */
+  size_t size() const;
+
+  /**
+   * @brief Returns true if the range is empty.  Returns false otherwise.
+   * @return
+   */
+  bool empty() const;
+
+  /**
+   * @brief Returns the range based on the specified index.  The range is
+   * organized as [min, max]
+   */
+  size_t operator[](size_t index) const;
+
+private:
+  RangeType m_Range;
+};
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.cpp b/Source/SIMPLib/Common/SIMPLRange2D.cpp
new file mode 100644
index 0000000000..2b27d74043
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange2D.cpp
@@ -0,0 +1,146 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "SIMPLib/Common/SIMPLRange2D.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange2D::SIMPLRange2D()
+: m_Range({0, 0, 0, 0})
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange2D::SIMPLRange2D(size_t initRow, size_t initCol, size_t endRow, size_t endCol)
+: m_Range({initRow, initCol, endRow, endCol})
+{
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange2D::SIMPLRange2D(const tbb::blocked_range2d<size_t, size_t>& r)
+: m_Range({r.rows().begin(), r.cols().begin(), r.rows().end(), r.cols().end()})
+{
+}
+#endif
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange2D::RangeType SIMPLRange2D::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::minRow() const
+{
+  return m_Range[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::minCol() const
+{
+  return m_Range[1];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::maxRow() const
+{
+  return m_Range[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::maxCol() const
+{
+  return m_Range[3];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::numRows() const
+{
+  return maxRow() - minRow();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::numCols() const
+{
+  return maxCol() - minCol();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::size() const
+{
+  return numRows() * numCols();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool SIMPLRange2D::empty() const
+{
+  const bool emptyRows = (m_Range[0] == m_Range[2]) && (m_Range[0] == 0);
+  const bool emptyCols = (m_Range[1] == m_Range[3]) && (m_Range[1] == 0);
+  return emptyRows && emptyCols;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange2D::operator[](size_t index) const
+{
+  if(index < 4)
+  {
+    return m_Range[index];
+  }
+  throw std::range_error("Range out of bounds");
+}
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.h b/Source/SIMPLib/Common/SIMPLRange2D.h
new file mode 100644
index 0000000000..d1f810c779
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange2D.h
@@ -0,0 +1,133 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range2d.h>
+// clang-format on
+#endif
+
+/**
+ * @class SIMPLRange2D SIMPLRange2D.h SIMPLib/Common/SIMPLRange2D.h
+ * @brief The SIMPLRange2D class defines a range between set of minimum and
+ * maximum values. The purpose of this class is mainly to allow a more unified
+ * control flow during parallelization between builds using TBB and those that
+ * do not.  Because tbb::blocked_range is used in an implicit conversion constructor,
+ * a single operator accepting a SIMPLRange can be used TBB parallelized and
+ * non-paralleled versions without a branching code base.
+ */
+class SIMPLib_EXPORT SIMPLRange2D
+{
+public:
+  using RangeType = std::array<size_t, 4>; // { init row, init col, final row, final col }
+
+  SIMPLRange2D();
+  SIMPLRange2D(size_t initRow, size_t initCol, size_t endRow, size_t endCol);
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  SIMPLRange2D(const tbb::blocked_range2d<size_t, size_t>& r);
+#endif
+
+  /**
+   * @brief Returns an array representation of the range.
+   * @return
+   */
+  RangeType getRange() const;
+
+  /**
+   * @brief Returns the minimum row index in the range.
+   * @return
+   */
+  size_t minRow() const;
+
+  /**
+   * @brief Returns the minimum column index in the range.
+   * @return
+   */
+  size_t minCol() const;
+
+  /**
+   * @brief Returns the maximum row index in the range.
+   * @return
+   */
+  size_t maxRow() const;
+
+  /**
+   * @brief Returns the maximum column index in the range.
+   * @return
+   */
+  size_t maxCol() const;
+
+  /**
+   * @brief Returns the number of rows in the range.
+   * @return
+   */
+  size_t numRows() const;
+
+  /**
+   * @brief Returns the number of columns in the range.
+   * @return
+   */
+  size_t numCols() const;
+
+  /**
+   * @brief Returns the number of indices in the range.
+   * @return
+   */
+  size_t size() const;
+
+  /**
+   * @brief Returns true if the range is empty.  Returns false otherwise.
+   * @return
+   */
+  bool empty() const;
+
+  /**
+   * @brief Returns the range based on the specified index.  The range is
+   * organized as [min, max]
+   */
+  size_t operator[](size_t index) const;
+
+private:
+  RangeType m_Range;
+};
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.cpp b/Source/SIMPLib/Common/SIMPLRange3D.cpp
new file mode 100644
index 0000000000..2396771f8c
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange3D.cpp
@@ -0,0 +1,121 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "SIMPLib/Common/SIMPLRange3D.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::SIMPLRange3D()
+: m_Range({0, 0, 0, 0, 0, 0})
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::SIMPLRange3D(size_t x, size_t y, size_t z)
+: m_Range({0, x, 0, y, 0, z})
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax)
+: m_Range({xMin, xMax, yMin, yMax, zMin, zMax})
+{
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::SIMPLRange3D(const tbb::blocked_range3d<size_t>& r)
+: m_Range({r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end()})
+{
+}
+#endif
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::RangeType SIMPLRange3D::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::DimensionRange SIMPLRange3D::getXRange() const
+{
+  return {m_Range[0], m_Range[1]};
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::DimensionRange SIMPLRange3D::getYRange() const
+{
+  return {m_Range[2], m_Range[3]};
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D::DimensionRange SIMPLRange3D::getZRange() const
+{
+  return {m_Range[4], m_Range[5]};
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool SIMPLRange3D::empty() const
+{
+  return (m_Range[0] == m_Range[1]) && (m_Range[2] == m_Range[3]) && (m_Range[4] == m_Range[5]);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t SIMPLRange3D::operator[](size_t index) const
+{
+  if(index < 6)
+  {
+    return m_Range[index];
+  }
+
+  throw std::range_error("Range must be 0 or 1");
+}
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
new file mode 100644
index 0000000000..6199bd17df
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -0,0 +1,113 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range3d.h>
+// clang-format on
+#endif
+
+/**
+ * @class SIMPLRange3D SIMPLRange3D.h SIMPLib/Common/SIMPLRange3D.h
+ * @brief The SIMPLRange3D class defines a range between set of minimum and
+ * maximum values. The purpose of this class is mainly to allow a more unified
+ * control flow during parallelization between builds using TBB and those that
+ * do not.  Because tbb::blocked_range is used in an implicit conversion constructor,
+ * a single operator accepting a SIMPLRange can be used TBB parallelized and
+ * non-paralleled versions without a branching code base.
+ */
+class SIMPLib_EXPORT SIMPLRange3D
+{
+public:
+  using RangeType = std::array<size_t, 6>;
+  using DimensionRange = std::array<size_t, 2>;
+
+  SIMPLRange3D();
+  SIMPLRange3D(size_t x, size_t y, size_t z);
+  SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax); 
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  SIMPLRange3D(const tbb::blocked_range3d<size_t>& r);
+#endif
+
+  /**
+   * @brief Returns an array representation of the range.
+   * @return
+   */
+  RangeType getRange() const;
+
+  /**
+   * @brief Returns the range along the X dimension
+   * @return
+   */
+  DimensionRange getXRange() const;
+
+  /**
+   * @brief Returns the range along the Y dimension
+   * @return
+   */
+  DimensionRange getYRange() const;
+
+  /**
+   * @brief Returns the range along the Z dimension
+   * @return
+   */
+  DimensionRange getZRange() const;
+
+  /**
+   * @brief Returns true if the range is empty.  Returns false otherwise.
+   * @return
+   */
+  bool empty() const;
+
+  /**
+   * @brief Returns the specified part of the range.  The range is organized as
+   * [xMin, xMax, yMin, yMax, zMin, zMax].
+   * @param index
+   * @return
+   */
+  size_t operator[](size_t index) const;
+
+private:
+  RangeType m_Range;
+};
diff --git a/Source/SIMPLib/Common/SourceList.cmake b/Source/SIMPLib/Common/SourceList.cmake
index 00c1558c1c..7157abbc28 100755
--- a/Source/SIMPLib/Common/SourceList.cmake
+++ b/Source/SIMPLib/Common/SourceList.cmake
@@ -28,6 +28,9 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ScopedFileMonitor.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeType.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLArray.hpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange2D.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange3D.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TemplateHelpers.h
 )
 
@@ -42,6 +45,9 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Observer.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeType.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange2D.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLRange3D.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TemplateHelpers.cpp
 
 )
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index f39f0ed65f..f33628800d 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -38,12 +38,6 @@
 
 #include "ConvertColorToGrayScale.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
 #include <algorithm>
 
 #include "SIMPLib/Common/Constants.h"
@@ -56,6 +50,7 @@
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 class LuminosityImpl
 {
@@ -88,9 +83,7 @@ class LuminosityImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-   void operator()(const tbb::blocked_range<size_t>& r) const { convert(r.begin(), r.end()); }
-#endif
+   void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
 };
 
 class LightnessImpl
@@ -124,9 +117,7 @@ class LightnessImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const { convert(r.begin(), r.end()); }
-#endif
+  void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
 };
 
 class SingleChannelImpl
@@ -159,9 +150,7 @@ class SingleChannelImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-   void operator()(const tbb::blocked_range<size_t>& r) const { convert(r.begin(), r.end()); }
-#endif
+   void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
 
 };
 
@@ -177,11 +166,9 @@ class ParallelWrapper
     template<typename T>
     static void Run(T impl, size_t totalPoints)
     {
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-      tbb::parallel_for(tbb::blocked_range<size_t>(0, totalPoints), impl, tbb::auto_partitioner());
-#else
-      impl.convert(0, totalPoints);
-#endif
+      ParallelDataAlgorithm dataAlg;
+      dataAlg.setRange(0, totalPoints);
+      dataAlg.execute(impl);
     }
 
   protected:
@@ -409,10 +396,6 @@ void ConvertColorToGrayScale::execute()
     size_t comp = inputColorData->getNumberOfComponents();
     size_t totalPoints = inputColorData->getNumberOfTuples();
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-#endif
-
     switch (convType)
     {
       case ConversionType::Luminosity:
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index da4d4f5248..04198fd942 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -4,19 +4,13 @@
 
 #include "GenerateColorTable.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h"
 #include "SIMPLib/Utilities/ColorTable.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
@@ -132,12 +126,10 @@ class GenerateColorTableImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& r) const
   {
-    convert(r.begin(), r.end());
+    convert(r.min(), r.max());
   }
-#endif
 private:
   typename DataArray<T>::Pointer                        m_ArrayPtr;
   QVector<float>                                        m_BinPoints;
@@ -193,22 +185,9 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, tmpPath, QVector<size_t>(1, 3));
   if (colorArray.get() == nullptr) { return; }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, arrayPtr->getNumberOfTuples()), GenerateColorTableImpl<T>(arrayPtr, binPoints, controlPoints, numControlColors, colorArray),
-                      tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    GenerateColorTableImpl<T> serial(arrayPtr, binPoints, controlPoints, numControlColors, colorArray);
-    serial.convert(0, arrayPtr->getNumberOfTuples());
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, arrayPtr->getNumberOfTuples());
+  dataAlg.execute(GenerateColorTableImpl<T>(arrayPtr, binPoints, controlPoints, numControlColors, colorArray));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 59622f2363..feecf1dbf9 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -35,15 +35,9 @@
 
 #include "ScaleVolume.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
@@ -81,12 +75,10 @@ class ScaleVolumeUpdateVerticesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    generate(r.begin(), r.end());
+    generate(range.min(), range.max());
   }
-#endif
 };
 
 // -----------------------------------------------------------------------------
@@ -200,11 +192,6 @@ void ScaleVolume::updateSurfaceMesh()
   clearErrorCode();
   clearWarningCode();
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
   IGeometry2D::Pointer geom2D = getDataContainerArray()->getDataContainer(getSurfaceDataContainerName())->getGeometryAs<IGeometry2D>();
   float* nodes = geom2D->getVertexPointer(0);
 
@@ -243,17 +230,9 @@ void ScaleVolume::updateSurfaceMesh()
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, count), ScaleVolumeUpdateVerticesImpl(nodes, min, m_ScaleFactor), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    ScaleVolumeUpdateVerticesImpl serial(nodes, min, m_ScaleFactor);
-    serial.generate(0, count);
-  }
+  ParallelDataAlgorithm dataAlg = ParallelDataAlgorithm();
+  dataAlg.setRange(0, count);
+  dataAlg.execute(ScaleVolumeUpdateVerticesImpl(nodes, min, m_ScaleFactor));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index a70e0e29d6..ce936a101f 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -35,15 +35,9 @@
 
 #include "SetOriginResolutionImageGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
@@ -80,12 +74,10 @@ class SetOriginResolutionImageUpdateVerticesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    generate(r.begin(), r.end());
+    generate(range.min(), range.max());
   }
-#endif
 };
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 8ac86c97a7..8aeb93c5dd 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -46,15 +46,9 @@
 
 #include "SIMPLib/Geometry/EdgeGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The FindEdgeDerivativesImpl class implements a threaded algorithm that computes the
@@ -108,12 +102,10 @@ class FindEdgeDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    compute(r.begin(), r.end());
+    compute(range.min(), range.max());
   }
-#endif
 private:
   EdgeGeom* m_Edges;
   DoubleArrayType::Pointer m_Field;
@@ -436,22 +428,9 @@ void EdgeGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, numEdges), FindEdgeDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindEdgeDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, numEdges);
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, numEdges);
+  dataAlg.execute(FindEdgeDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 3330f38f12..b6f64bdeb8 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -11,15 +11,9 @@
 
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The FindHexDerivativesImpl class implements a threaded algorithm that computes the
@@ -73,12 +67,10 @@ class FindHexDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    compute(r.begin(), r.end());
+    compute(range.min(), range.max());
   }
-#endif
 private:
   HexahedralGeom* m_Hexas;
   DoubleArrayType::Pointer m_Field;
@@ -561,22 +553,9 @@ void HexahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArray
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, numHexas), FindHexDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindHexDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, numHexas);
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, numHexas);
+  dataAlg.execute(FindHexDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index af4233c782..3e4b569ced 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -45,16 +45,10 @@
 
 #include "SIMPLib/Geometry/ImageGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range3d.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "H5Support/H5Lite.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/HDF5/VTKH5Constants.h"
+#include "SIMPLib/Utilities/ParallelData3DAlgorithm.h"
 
 /**
  * @brief The FindImageDerivativesImpl class implements a threaded algorithm that computes the
@@ -227,12 +221,10 @@ class FindImageDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range3d<size_t, size_t, size_t>& r) const
+  void operator()(const SIMPLRange3D& r) const
   {
-    compute(r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end());
+    compute(r[0], r[1], r[2], r[3], r[4], r[5]);
   }
-#endif
 
   void computeIndices(int32_t differenceType, int32_t directionType, size_t& index1, size_t& index2, const size_t dims[3], size_t x, size_t y, size_t z, double xp[3], double xm[3]) const
 
@@ -922,31 +914,17 @@ void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType:
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-
   size_t grain = dims[2] == 1 ? 1 : dims[2] / tbb::task_scheduler_init::default_num_threads();
 
   if(grain == 0) // This can happen if dims[2] > number of processors
   {
     grain = 1;
   }
-
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range3d<size_t, size_t, size_t>(0, dims[2], grain, 0, dims[1], dims[1], 0, dims[0], dims[0]),
-                      FindImageDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindImageDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, dims[2], 0, dims[1], 0, dims[0]);
-  }
+  
+  ParallelData3DAlgorithm dataAlg;
+  dataAlg.setRange(dims[2], dims[1], dims[0]);
+  dataAlg.setGrain(grain);
+  dataAlg.execute(FindImageDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 2b9e32c8c3..65b4712ccf 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -46,17 +46,11 @@
 
 #include "SIMPLib/Geometry/QuadGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #if defined SIMPL_USE_EIGEN
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #endif
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The FindQuadDerivativesImpl class implements a threaded algorithm that computes the
@@ -109,12 +103,10 @@ class FindQuadDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    compute(r.begin(), r.end());
+    compute(range.min(), range.max());
   }
-#endif
 private:
   QuadGeom* m_Quads;
   DoubleArrayType::Pointer m_Field;
@@ -504,22 +496,9 @@ void QuadGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, numQuads), FindQuadDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindQuadDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, numQuads);
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, numQuads);
+  dataAlg.execute(FindQuadDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index a81362e410..5e01546448 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -45,16 +45,10 @@
 
 #include "SIMPLib/Geometry/RectGridGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range3d.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "H5Support/H5Lite.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/HDF5/VTKH5Constants.h"
+#include "SIMPLib/Utilities/ParallelData3DAlgorithm.h"
 
 /**
  * @brief The FindImageDerivativesImpl class implements a threaded algorithm that computes the
@@ -227,12 +221,10 @@ class FindRectGridDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range3d<size_t, size_t, size_t>& r) const
+  void operator()(const SIMPLRange3D& r) const
   {
-    compute(r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end());
+    compute(r[0], r[1], r[2], r[3], r[4], r[5]);
   }
-#endif
 
   void computeIndices(int32_t differenceType, int32_t directionType, size_t& index1, size_t& index2, size_t dims[3], size_t x, size_t y, size_t z, double xp[3], double xm[3]) const
 
@@ -979,28 +971,16 @@ void RectGridGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   size_t grain = dims[2] == 1 ? 1 : dims[2] / tbb::task_scheduler_init::default_num_threads();
   if(grain == 0)
   {
     grain = 1;
   }
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range3d<size_t, size_t, size_t>(0, dims[2], grain, 0, dims[1], dims[1], 0, dims[0], dims[0]),
-                      FindRectGridDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindRectGridDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, dims[2], 0, dims[1], 0, dims[0]);
-  }
+
+  ParallelData3DAlgorithm dataAlg;
+  dataAlg.setRange(dims[2], dims[1], dims[0]);
+  dataAlg.setGrain(grain);
+  dataAlg.execute(FindRectGridDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 82b9f4ac25..6cfce0fd53 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -46,15 +46,9 @@
 
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The FindTriangleDerivativesImpl class implements a threaded algorithm that computes the
@@ -108,12 +102,10 @@ class FindTetDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    compute(r.begin(), r.end());
+    compute(range.min(), range.max());
   }
-#endif
 private:
   TetrahedralGeom* m_Tets;
   DoubleArrayType::Pointer m_Field;
@@ -577,22 +569,9 @@ void TetrahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArra
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, numTets), FindTetDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindTetDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, numTets);
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, numTets);
+  dataAlg.execute(FindTetDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 893234c4e8..1a0c263a7e 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -46,15 +46,9 @@
 
 #include "SIMPLib/Geometry/TriangleGeom.h"
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-#include <tbb/blocked_range.h>
-#include <tbb/parallel_for.h>
-#include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
-#endif
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The FindTriangleDerivativesImpl class implements a threaded algorithm that computes the
@@ -108,12 +102,10 @@ class FindTriangleDerivativesImpl
     }
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  void operator()(const tbb::blocked_range<size_t>& r) const
+  void operator()(const SIMPLRange& range) const
   {
-    compute(r.begin(), r.end());
+    compute(range.min(), range.max());
   }
-#endif
 private:
   TriangleGeom* m_Tris;
   DoubleArrayType::Pointer m_Field;
@@ -500,22 +492,9 @@ void TriangleGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
-  bool doParallel = true;
-#endif
-
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  if(doParallel)
-  {
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, numTris), FindTriangleDerivativesImpl(this, field, derivatives), tbb::auto_partitioner());
-  }
-  else
-#endif
-  {
-    FindTriangleDerivativesImpl serial(this, field, derivatives);
-    serial.compute(0, numTris);
-  }
+  ParallelDataAlgorithm dataAlg;
+  dataAlg.setRange(0, numTris);
+  dataAlg.execute(FindTriangleDerivativesImpl(this, field, derivatives));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
new file mode 100644
index 0000000000..07eefc1da8
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
@@ -0,0 +1,102 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ParallelData2DAlgorithm.h"
+
+ // -----------------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------------
+ParallelData2DAlgorithm::ParallelData2DAlgorithm()
+: m_Range(SIMPLRange2D())
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+, m_RunParallel(true)
+, m_Partitioner(tbb::auto_partitioner())
+#endif
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ParallelData2DAlgorithm::~ParallelData2DAlgorithm() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool ParallelData2DAlgorithm::getParallelizationEnabled() const
+{
+  return m_RunParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData2DAlgorithm::setParallelizationEnabled(bool doParallel)
+{
+  m_RunParallel = doParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange2D ParallelData2DAlgorithm::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData2DAlgorithm::setRange(const SIMPLRange2D& range)
+{
+  m_Range = range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData2DAlgorithm::setRange(size_t minRows, size_t minCols, size_t maxRows, size_t maxCols)
+{
+  m_Range = { minRows, minCols, maxRows, maxCols };
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData2DAlgorithm::setPartitioner(const tbb::auto_partitioner& partitioner)
+{
+  m_Partitioner = partitioner;
+}
+#endif
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
new file mode 100644
index 0000000000..2b94f08e87
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
@@ -0,0 +1,139 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLRange2D.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+#include <tbb/partitioner.h>
+#include <tbb/task_scheduler_init.h>
+// clang-format on
+#endif
+
+/**
+ * @brief The ParallelData2DAlgorithm class handles parallelization across 2D data-based algorithms.
+ * A range is required, as well as an object with a matching function operator.  This class
+ * utilizes TBB for parallelization and will fallback to non-parallelization if it is not
+ * available or the parallelization is disabled.
+ */
+class SIMPLib_EXPORT ParallelData2DAlgorithm
+{
+public:
+  using RangeType = SIMPLRange2D;
+
+  ParallelData2DAlgorithm();
+  virtual ~ParallelData2DAlgorithm();
+
+  /**
+   * @brief Returns true if parallelization is enabled.  Returns false otherwise.
+   * @return
+   */
+  bool getParallelizationEnabled() const;
+
+  /**
+   * @brief Sets whether parallelization is enabled.
+   * @param doParallel
+   */
+  void setParallelizationEnabled(bool doParallel);
+
+  /**
+   * @brief Returns the range to operate over.
+   * @return
+   */
+  RangeType getRange() const;
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param range2D
+   */
+  void setRange(const RangeType& range);
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param minRows
+   * @param minCols
+   * @param maxRows
+   * @param maxCols
+   */
+  void setRange(size_t minRows, size_t minCols, size_t maxRows, size_t maxCols);
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  /**
+   * @brief Sets the partitioner for parallelization.
+   * @param partitioner
+   */
+  void setPartitioner(const tbb::auto_partitioner& partitioner);
+#endif
+
+  /**
+   * @brief Runs the data algorithm.  Parallelization is used if appropriate.
+   * @param body
+   */
+  template <typename Body>
+  void execute(const Body& body)
+  {
+    bool doParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    doParallel = m_RunParallel;
+    if(doParallel)
+    {
+      tbb::blocked_range2d<size_t, size_t> tbbRange(m_Range.minRow(), m_Range.maxRow(), m_Range.minCol(), m_Range.maxCol());
+      tbb::parallel_for(tbbRange, body, m_Partitioner);
+    }
+#endif
+
+    // Run non-parallel operation
+    if(!doParallel)
+    {
+      body(m_Range);
+    }
+  }
+
+private:
+  RangeType m_Range;
+  bool m_RunParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::auto_partitioner m_Partitioner;
+#endif
+};
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
new file mode 100644
index 0000000000..9ea43ea1dd
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
@@ -0,0 +1,118 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ParallelData3DAlgorithm.h"
+
+ // -----------------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------------
+ParallelData3DAlgorithm::ParallelData3DAlgorithm()
+: m_Range(SIMPLRange3D())
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+, m_RunParallel(true)
+, m_Partitioner(tbb::auto_partitioner())
+#endif
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ParallelData3DAlgorithm::~ParallelData3DAlgorithm() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool ParallelData3DAlgorithm::getParallelizationEnabled() const
+{
+  return m_RunParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData3DAlgorithm::setParallelizationEnabled(bool doParallel)
+{
+  m_RunParallel = doParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange3D ParallelData3DAlgorithm::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData3DAlgorithm::setRange(const SIMPLRange3D& range)
+{
+  m_Range = range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData3DAlgorithm::setRange(size_t xMax, size_t yMax, size_t zMax)
+{
+  m_Range = { 0, xMax, 0, yMax, 0, zMax };
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t ParallelData3DAlgorithm::getGrain() const
+{
+  return m_Grain;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData3DAlgorithm::setGrain(size_t grain)
+{
+  m_Grain = grain;
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelData3DAlgorithm::setPartitioner(const tbb::auto_partitioner& partitioner)
+{
+  m_Partitioner = partitioner;
+}
+#endif
\ No newline at end of file
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
new file mode 100644
index 0000000000..36659e6753
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
@@ -0,0 +1,147 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLRange3D.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+#include <tbb/partitioner.h>
+#include <tbb/task_scheduler_init.h>
+// clang-format on
+#endif
+
+/**
+ * @brief The ParallelDataAlgorithm class handles parallelization across data-based algorithms.
+ * A range is required, as well as an object with a matching function operator.  This class
+ * utilizes TBB for parallelization and will fallback to non-parallelization if it is not
+ * available or the parallelization is disabled.
+ */
+class SIMPLib_EXPORT ParallelData3DAlgorithm
+{
+public:
+  ParallelData3DAlgorithm();
+  virtual ~ParallelData3DAlgorithm();
+
+  /**
+   * @brief Returns true if parallelization is enabled.  Returns false otherwise.
+   * @return
+   */
+  bool getParallelizationEnabled() const;
+
+  /**
+   * @brief Sets whether parallelization is enabled.
+   * @param doParallel
+   */
+  void setParallelizationEnabled(bool doParallel);
+
+  /**
+   * @brief Returns the range to operate over.
+   * @return
+   */
+  SIMPLRange3D getRange() const;
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param range3D
+   */
+  void setRange(const SIMPLRange3D& range);
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param range3D
+   */
+  void setRange(size_t xMax, size_t yMax, size_t zMax);
+
+  /**
+   * @brief Returns the grain size.
+   * @return
+   */
+  size_t getGrain() const;
+
+  /**
+   * @brief Sets the grain size.
+   * @param grain
+   */
+  void setGrain(size_t grain);
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  /**
+   * @brief Sets the partitioner for parallelization.
+   * @param partitioner
+   */
+  void setPartitioner(const tbb::auto_partitioner& partitioner);
+#endif
+
+  /**
+   * @brief Runs the data algorithm.  Parallelization is used if appropriate.
+   * @param body
+   */
+  template <typename Body>
+  void execute(const Body& body)
+  {
+    bool doParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    doParallel = m_RunParallel;
+    if(doParallel)
+    {
+      tbb::blocked_range3d<size_t, size_t, size_t> tbbRange(m_Range[0], m_Range[1], m_Grain, m_Range[2], m_Range[3], m_Range[3], m_Range[4], m_Range[5], m_Range[5]);
+      tbb::parallel_for(tbbRange, body, m_Partitioner);
+    }
+#endif
+
+    // Run non-parallel operation
+    if(!doParallel)
+    {
+      body(m_Range);
+    }
+  }
+
+private:
+  SIMPLRange3D m_Range;
+  size_t m_Grain = 1;
+  bool m_RunParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::auto_partitioner m_Partitioner;
+#endif
+};
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
new file mode 100644
index 0000000000..0c349fa9e1
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
@@ -0,0 +1,102 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ParallelDataAlgorithm.h"
+
+ // -----------------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------------
+ParallelDataAlgorithm::ParallelDataAlgorithm()
+: m_Range(SIMPLRange())
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+, m_RunParallel(true)
+, m_Partitioner(tbb::auto_partitioner())
+#endif
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ParallelDataAlgorithm::~ParallelDataAlgorithm() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool ParallelDataAlgorithm::getParallelizationEnabled() const
+{
+  return m_RunParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelDataAlgorithm::setParallelizationEnabled(bool doParallel)
+{
+  m_RunParallel = doParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SIMPLRange ParallelDataAlgorithm::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelDataAlgorithm::setRange(const SIMPLRange& range)
+{
+  m_Range = range;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelDataAlgorithm::setRange(size_t min, size_t max)
+{
+  m_Range = { min, max };
+}
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelDataAlgorithm::setPartitioner(const tbb::auto_partitioner& partitioner)
+{
+  m_Partitioner = partitioner;
+}
+#endif
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
new file mode 100644
index 0000000000..578ffe5dcd
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -0,0 +1,135 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <array>
+
+#include "SIMPLib/Common/SIMPLRange.h"
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/blocked_range.h>
+#include <tbb/parallel_for.h>
+#include <tbb/partitioner.h>
+#include <tbb/task_scheduler_init.h>
+// clang-format on
+#endif
+
+/**
+ * @brief The ParallelDataAlgorithm class handles parallelization across data-based algorithms.
+ * A range is required, as well as an object with a matching function operator.  This class
+ * utilizes TBB for parallelization and will fallback to non-parallelization if it is not
+ * available or the parallelization is disabled.
+ */
+class SIMPLib_EXPORT ParallelDataAlgorithm
+{
+public:
+  ParallelDataAlgorithm();
+  virtual ~ParallelDataAlgorithm();
+
+  /**
+   * @brief Returns true if parallelization is enabled.  Returns false otherwise.
+   * @return
+   */
+  bool getParallelizationEnabled() const;
+
+  /**
+   * @brief Sets whether parallelization is enabled.
+   * @param doParallel
+   */
+  void setParallelizationEnabled(bool doParallel);
+
+  /**
+   * @brief Returns the range to operate over.
+   * @return
+   */
+  SIMPLRange getRange() const;
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param range2D
+   */
+  void setRange(const SIMPLRange& range);
+
+  /**
+   * @brief Sets the range to operate over.
+   * @param min
+   * @param max
+   */
+  void setRange(size_t min, size_t max);
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  /**
+   * @brief Sets the partitioner for parallelization.
+   * @param partitioner
+   */
+  void setPartitioner(const tbb::auto_partitioner& partitioner);
+#endif
+  
+  /**
+   * @brief Runs the data algorithm.  Parallelization is used if appropriate.
+   * @param body
+   */
+  template<typename Body>
+  void execute(const Body& body)
+  {
+    bool doParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    doParallel = m_RunParallel;
+    if(doParallel)
+    {
+      tbb::blocked_range<size_t> tbbRange(m_Range[0], m_Range[1]);
+      tbb::parallel_for(tbbRange, body, m_Partitioner);
+    }
+#endif
+
+    // Run non-parallel operation
+    if(!doParallel)
+    {
+      body(m_Range);
+    }
+  }
+
+private:
+  SIMPLRange m_Range;
+  bool m_RunParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::auto_partitioner m_Partitioner;
+#endif
+};
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
new file mode 100644
index 0000000000..5f3f8f20ff
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
@@ -0,0 +1,108 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "ParallelTaskAlgorithm.h"
+
+#include <algorithm>
+#include <thread>
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ParallelTaskAlgorithm::ParallelTaskAlgorithm()
+: m_Parallelization(true)
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+, m_MaxThreads(std::thread::hardware_concurrency())
+, m_TaskGroup(new tbb::task_group)
+#endif
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ParallelTaskAlgorithm::~ParallelTaskAlgorithm()
+{
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  m_TaskGroup->wait();
+#endif
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool ParallelTaskAlgorithm::getParallelizationEnabled() const
+{
+  return m_Parallelization;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelTaskAlgorithm::setParallelizationEnabled(bool doParallel)
+{
+  m_Parallelization = doParallel;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+uint32_t ParallelTaskAlgorithm::getMaxThreads() const
+{
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  return m_MaxThreads;
+#else
+  return std::thread::hardware_concurrency();
+#endif
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelTaskAlgorithm::setMaxThreads(uint32_t threads)
+{
+  m_MaxThreads = std::min(threads, std::thread::hardware_concurrency());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ParallelTaskAlgorithm::wait()
+{
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  // This will spill over if the number of files to process does not divide evenly by the number of threads.
+  m_TaskGroup->wait();
+  m_CurThreads = 0;
+#endif
+}
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
new file mode 100644
index 0000000000..a7cd12e7b3
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -0,0 +1,126 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/SIMPLib.h"
+
+// SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
+// This is consistent with previous behavior, only earlier parallelization split the includes between
+// the corresponding .h and .cpp files.
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+// clang-format off
+#include <tbb/task_group.h>
+#include <tbb/task_scheduler_init.h>
+// clang-format on
+#endif
+
+/**
+ * @brief The ParallelTaskAlgorithm class handles parallelization across task-based algorithms.
+ * An object with a function operator is required to operate the task.  This class utilizes
+ * TBB for parallelization and will fallback to non-parallelization if it is not available
+ * or the parallelization is disabled.
+ */
+class SIMPLib_EXPORT ParallelTaskAlgorithm
+{
+public:
+  ParallelTaskAlgorithm();
+  virtual ~ParallelTaskAlgorithm();
+
+  /**
+   * @brief Returns true if parallelization is enabled.  Returns false otherwise.
+   * @return
+   */
+  bool getParallelizationEnabled() const;
+
+  /**
+   * @brief Sets whether parallelization is enabled.
+   * @param doParallel
+   */
+  void setParallelizationEnabled(bool doParallel);
+
+  /**
+   * @brief Return maximum threads to use for parallelization.  If Parallel Algorithms
+   * is not enabled, the maximum hardware concurrency is returned instead.
+   * @return
+   */
+  uint32_t getMaxThreads() const;
+
+  /**
+   * @brief Sets the maximum number of threads to use.  This amount is automatically
+   * reduced to the max hardware concurrency.
+   * @param threads
+   */
+  void setMaxThreads(uint32_t threads);
+
+  /**
+   * @brief Executes the given object's function operator.  If parallel algorithms
+   * is enabled, this process is multi-threaded.  Otherwise, this process is done
+   * in a single thread.
+   * @param body
+   */
+  template <typename Body>
+  void execute(const Body& body)
+  {
+    bool doParallel = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    doParallel = m_Parallelization;
+    if(doParallel)
+    {
+      m_TaskGroup->run(body);
+      m_CurThreads++;
+      if(m_CurThreads >= m_MaxThreads)
+      {
+        wait();
+      }
+    }
+#else
+    body();
+#endif
+  }
+
+  /**
+   * @brief Waits for the threads to finish and resets the current thread count.
+   */
+  void wait();
+
+private:
+  bool m_Parallelization = false;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  uint32_t m_MaxThreads = 1;
+  uint32_t m_CurThreads = 0;
+  tbb::task_scheduler_init init;
+  std::shared_ptr<tbb::task_group> m_TaskGroup;
+#endif
+};
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index 0a4102464b..a0644f71c3 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -22,6 +22,10 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileSystemPathHelper.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatSummation.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelection.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelDataAlgorithm.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData2DAlgorithm.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData3DAlgorithm.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelTaskAlgorithm.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibEndian.h
@@ -36,6 +40,10 @@ set(SIMPLib_Utilities_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileSystemPathHelper.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatSummation.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelection.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelDataAlgorithm.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData2DAlgorithm.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData3DAlgorithm.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelTaskAlgorithm.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReader.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.cpp

From 3ab1162e18ce23f9853144be28c0139ebea414d6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 6 Jun 2019 11:48:28 -0400
Subject: [PATCH 118/397] Cleanup of SIMPLH5DataReader sources

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp |  4 +---
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h   | 11 ++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 2cb78fb29e..47f99d05ea 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -34,11 +34,9 @@
 
 #include <sstream>
 
-#include <QtCore/QTextStream>
-
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
 
 #include "H5Support/QH5Utilities.h"
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index e5ce3ef46b..64caa244b2 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -29,23 +29,20 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
 #pragma once
 
-#include <QtCore/QStringList>
-
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
 
 class IObserver;
 class DataContainerArrayProxy;
 class SIMPLH5DataReaderRequirements;
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 /**
  * @brief The SIMPLH5DataReader class
@@ -92,7 +89,7 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
      * @param preflight
      * @return
      */
-    DataContainerArray::Pointer readSIMPLDataUsingProxy(DataContainerArrayProxy& proxy, bool preflight);
+    DataContainerArrayShPtrType readSIMPLDataUsingProxy(DataContainerArrayProxy& proxy, bool preflight);
 
     /**
      * @brief readPipelineJson
@@ -121,7 +118,7 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
      * @param dca
      * @return
      */
-    bool readDataContainerBundles(hid_t fileId, const DataContainerArray::Pointer& dca);
+    bool readDataContainerBundles(hid_t fileId, const DataContainerArrayShPtrType& dca);
 
   public:
     SIMPLH5DataReader(const SIMPLH5DataReader&) = delete; // Copy Constructor Not Implemented

From 986428063204fa36975929ba62062348ce4a478d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 6 Jun 2019 17:17:06 -0400
Subject: [PATCH 119/397] Remove include statement that includes all of QWidget

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/PipelineModel.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
index aa8d896e03..006df3e3be 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
@@ -31,8 +31,6 @@
 
 #include "PipelineModel.h"
 
-#include <QtWidgets>
-
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"

From b21f6b45efceecf63b9f58892d9543208981f8f1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 10 Jun 2019 11:39:57 -0400
Subject: [PATCH 120/397] Remove unused Qt5 include directives (#358)

* Cleanup of SIMPLH5DataReader sources
* Remove include statement that includes all of QWidget
* Remove unused Qt5 include directives

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterCallback/FilterParameter.h          |   1 -
 .../FilterParameterCallbackExample.cpp        |   1 -
 Source/H5Support/QH5Lite.h                    |   4 +-
 Source/H5Support/QH5Utilities.h               |   1 -
 Source/PipelineRunner/PipelineRunner.cpp      |   5 +-
 Source/RESTServer/main.cpp                    |   4 +-
 .../Common/CreatedArrayHelpIndexEntry.h       |   1 -
 Source/SIMPLib/Common/EnsembleInfo.h          |   3 -
 Source/SIMPLib/Common/Observer.h              |   1 -
 Source/SIMPLib/Common/ShapeType.h             |   1 -
 .../Common/Testing/Cxx/SIMPLArrayTest.cpp     |   1 -
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   2 -
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |   1 -
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   1 -
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   1 -
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   1 -
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |   1 -
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |   1 -
 Source/SIMPLib/CoreFilters/InitializeData.cpp |   2 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |   1 -
 .../Testing/Cxx/ApplyImageTransformsTest.cpp  |   2 -
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |   1 -
 .../Cxx/CombineAttributeArraysTest.cpp        |   1 -
 .../Cxx/CombineAttributeMatricesTest.cpp      |   2 -
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   2 -
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |   1 -
 .../Testing/Cxx/ConvertDataTest.cpp           |   2 -
 .../CopyFeatureArrayToElementArrayTest.cpp    |   2 -
 .../Testing/Cxx/CopyObjectTest.cpp            |   2 -
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |   2 -
 .../Testing/Cxx/CreateDataArrayTest.cpp       |   2 -
 .../Testing/Cxx/CreateDataContainerTest.cpp   |   2 -
 ...CreateFeatureArrayFromElementArrayTest.cpp |   2 -
 .../Testing/Cxx/CreateGeometryTest.cpp        |   2 -
 .../Testing/Cxx/CreateStringArrayTest.cpp     |   2 -
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |   2 -
 .../Testing/Cxx/ExecuteProcessTest.cpp        |   2 -
 ...ExtractAttributeArraysFromGeometryTest.cpp |   2 -
 .../Cxx/ExtractComponentAsArrayTest.cpp       |   2 -
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |   1 -
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |   1 -
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   5 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   2 -
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |   1 -
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |   2 -
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   2 -
 .../Cxx/MultiThresholdObjects2Test.cpp        |   1 -
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   1 -
 .../Testing/Cxx/PostSlackMessageTest.cpp      |   1 -
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |   1 -
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |   1 -
 .../Testing/Cxx/RemoveArraysTest.cpp          |   7 -
 .../Cxx/RemoveComponentFromArrayTest.cpp      |   2 -
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |   4 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |   4 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |   2 -
 .../Testing/Cxx/RenameTimingTest.cpp          |   3 -
 .../Testing/Cxx/ReplaceValueTest.cpp          |   2 -
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |   2 -
 .../Testing/Cxx/ScaleVolumeTest.cpp           |   2 -
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   2 -
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |   2 -
 .../Cxx/Unused/RecursivePipelineTest.cpp      |   1 -
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |   1 -
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   1 -
 Source/SIMPLib/CoreFilters/util/ABSOperator.h |   1 -
 .../SIMPLib/CoreFilters/util/ACosOperator.h   |   1 -
 .../SIMPLib/CoreFilters/util/ASinOperator.h   |   1 -
 .../SIMPLib/CoreFilters/util/ATanOperator.h   |   1 -
 .../CoreFilters/util/AdditionOperator.h       |   1 -
 .../SIMPLib/CoreFilters/util/CalculatorItem.h |   1 -
 .../CoreFilters/util/CalculatorOperator.h     |   2 -
 .../SIMPLib/CoreFilters/util/CeilOperator.h   |   1 -
 Source/SIMPLib/CoreFilters/util/CosOperator.h |   1 -
 .../CoreFilters/util/DivisionOperator.h       |   1 -
 Source/SIMPLib/CoreFilters/util/ExpOperator.h |   1 -
 .../SIMPLib/CoreFilters/util/FloorOperator.h  |   1 -
 .../CoreFilters/util/ICalculatorArray.h       |   1 -
 Source/SIMPLib/CoreFilters/util/LnOperator.h  |   1 -
 .../SIMPLib/CoreFilters/util/Log10Operator.h  |   1 -
 Source/SIMPLib/CoreFilters/util/LogOperator.h |   1 -
 .../CoreFilters/util/MultiplicationOperator.h |   1 -
 .../CoreFilters/util/NegativeOperator.h       |   1 -
 Source/SIMPLib/CoreFilters/util/PowOperator.h |   1 -
 .../SIMPLib/CoreFilters/util/RootOperator.h   |   1 -
 Source/SIMPLib/CoreFilters/util/SinOperator.h |   1 -
 .../SIMPLib/CoreFilters/util/SqrtOperator.h   |   1 -
 .../CoreFilters/util/SubtractionOperator.h    |   1 -
 Source/SIMPLib/CoreFilters/util/TanOperator.h |   1 -
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   2 -
 .../DataContainers/AttributeMatrixProxy.h     |   1 -
 .../SIMPLib/DataContainers/DataArrayProxy.h   |   1 -
 .../DataContainers/DataContainerArray.h       |   1 -
 .../DataContainers/DataContainerArrayProxy.h  |   2 -
 .../DataContainers/DataContainerBundle.h      |   1 -
 .../DataContainers/DataContainerProxy.h       |   1 -
 .../DataContainers/DataStructureUtilities.cpp | 236 +++++++++++
 .../DataContainers/DataStructureUtilities.h   | 395 ++++++++++++++++++
 .../AttributeMatrixCreationFilterParameter.h  |   1 -
 ...arisonSelectionAdvancedFilterParameter.cpp |   1 -
 .../FilterParameters/DynamicTableData.cpp     |   1 +
 .../FilterParameters/DynamicTableData.h       |   3 -
 .../FileListInfoFilterParameter.h             |   1 -
 .../FilterParameters/FilterParameter.h        |   1 -
 .../FloatVec2FilterParameter.h                |   1 -
 .../FloatVec3FilterParameter.h                |   1 -
 .../H5FilterParametersReader.cpp              |   2 -
 .../H5FilterParametersWriter.cpp              |   3 +-
 .../JsonFilterParametersReader.cpp            |   3 -
 .../JsonFilterParametersReader.h              |   2 +-
 .../JsonFilterParametersWriter.cpp            |   1 -
 .../MontageSelectionFilterParameter.cpp       |   1 -
 .../NumericTypeFilterParameter.cpp            |   1 -
 .../PreflightUpdatedValueFilterParameter.h    |   1 -
 .../ScalarTypeFilterParameter.cpp             |   1 -
 .../Testing/Cxx/FilterParametersRWTest.cpp    |   3 -
 .../FilterParameters/UnknownFilterParameter.h |   1 -
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |   1 -
 Source/SIMPLib/Filtering/AbstractFilter.h     |   2 -
 Source/SIMPLib/Filtering/ComparisonInputs.h   |   1 -
 .../Filtering/ComparisonInputsAdvanced.cpp    |   2 +
 .../Filtering/ComparisonInputsAdvanced.h      |   2 -
 Source/SIMPLib/Filtering/FilterManager.cpp    |   2 +
 .../Filtering/QMetaObjectUtilities.cpp        |   1 -
 .../SIMPLib/Filtering/QMetaObjectUtilities.h  |   2 -
 .../Testing/Cxx/FilterPipelineTest.cpp        |   4 -
 Source/SIMPLib/Geometry/MeshStructs.h         |   1 -
 .../HDF5/H5BoundaryStatsDataDelegate.h        |   1 -
 .../SIMPLib/HDF5/H5MatrixStatsDataDelegate.h  |   1 -
 Source/SIMPLib/HDF5/H5StatsDataDelegate.h     |   1 -
 Source/SIMPLib/Messages/AbstractMessage.h     |   1 -
 Source/SIMPLib/Plugin/ISIMPLibPlugin.h        |   1 -
 Source/SIMPLib/Plugin/PluginManager.cpp       |   1 +
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp |   2 +-
 Source/SIMPLib/REST/SIMPLDirectoryListing.cpp |   1 +
 Source/SIMPLib/REST/SIMPLDirectoryListing.h   |   1 -
 Source/SIMPLib/REST/SIMPLRequestMapper.cpp    |   1 -
 .../V1Controllers/ApiNotFoundController.cpp   |   2 -
 .../ExecutePipelineController.cpp             |   5 -
 .../V1Controllers/ExecutePipelineController.h |   1 -
 .../ListFilterParametersController.cpp        |   2 -
 .../V1Controllers/LoadedPluginsController.cpp |   3 -
 .../NamesOfFiltersController.cpp              |   3 -
 .../V1Controllers/NumFiltersController.cpp    |   2 -
 .../V1Controllers/PluginInfoController.cpp    |   2 -
 .../PreflightPipelineController.cpp           |   2 -
 .../PreflightPipelineController.h             |   1 -
 .../SIMPLibVersionController.cpp              |   2 -
 .../REST/V1Controllers/V1RequestMapper.cpp    |   2 -
 Source/SIMPLib/Utilities/MontageSelection.h   |   1 -
 Source/SIMPLib/Utilities/TestObserver.h       |   2 -
 Source/SIMPLib/Utilities/TimeUtilities.h      |   1 -
 Source/SIMPLib/VTKUtils/VTKWriterMacros.h     |   1 -
 .../SVWidgetsLib/Core/FilterWidgetManager.h   |   1 -
 Source/SVWidgetsLib/Dialogs/AboutPlugins.h    |   1 -
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp  |   3 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.h    |   1 -
 .../Dialogs/ColorPresetsDialog.cpp            |   4 -
 .../SVWidgetsLib/Dialogs/ColorPresetsDialog.h |   1 -
 .../Dialogs/ColorPresetsDialogTableModel.cpp  |   2 +
 .../Dialogs/ColorPresetsDialogTableModel.h    |   2 -
 .../Dialogs/FavoritesChangedDialog.h          |   1 -
 Source/SVWidgetsLib/Dialogs/PluginDetails.h   |   1 -
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp   |   4 -
 Source/SVWidgetsLib/Dialogs/UpdateCheckData.h |   4 +-
 .../Dialogs/UpdateCheckDialog.cpp             |   6 -
 .../SVWidgetsLib/Dialogs/UpdateCheckDialog.h  |   2 -
 .../AbstractIOFileWidget.cpp                  |   2 -
 .../AbstractIOFileWidget.h                    |   2 -
 .../AttributeMatrixCreationWidget.cpp         |   6 -
 .../AttributeMatrixCreationWidget.h           |   2 -
 .../AttributeMatrixSelectionWidget.cpp        |   6 -
 .../AttributeMatrixSelectionWidget.h          |   1 -
 .../AxisAngleWidget.cpp                       |   1 -
 .../FilterParameterWidgets/AxisAngleWidget.h  |   2 -
 .../FilterParameterWidgets/BooleanWidget.cpp  |   1 -
 .../FilterParameterWidgets/BooleanWidget.h    |   2 -
 .../CalculatorWidget.cpp                      |   3 -
 .../FilterParameterWidgets/CalculatorWidget.h |   2 -
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   1 -
 .../FilterParameterWidgets/ChoiceWidget.h     |   2 -
 .../ComparisonSelectionAdvancedWidget.cpp     |   1 -
 .../ComparisonSelectionAdvancedWidget.h       |   2 -
 .../ComparisonSelectionItemDelegate.cpp       |   1 -
 .../ComparisonSelectionWidget.cpp             |   2 -
 .../ComparisonSelectionWidget.h               |   1 -
 .../ConstrainedDoubleWidget.cpp               |   1 -
 .../ConstrainedDoubleWidget.h                 |   2 -
 .../ConstrainedIntWidget.cpp                  |   1 -
 .../ConstrainedIntWidget.h                    |   2 -
 .../FilterParameterWidgets/CustomWidget.cpp   |   1 -
 .../FilterParameterWidgets/CustomWidget.h     |   1 -
 .../DataArrayCreationWidget.cpp               |   6 -
 .../DataArrayCreationWidget.h                 |   2 -
 .../DataArrayInformationDisplayWidget.cpp     |   3 -
 .../DataArrayInformationDisplayWidget.h       |   2 -
 .../DataArraySelectionWidget.cpp              |  10 -
 .../DataArraySelectionWidget.h                |   3 -
 .../DataContainerArrayProxyWidget.cpp         |   1 -
 .../DataContainerArrayProxyWidget.h           |   2 -
 .../DataContainerCreationWidget.cpp           |   3 -
 .../DataContainerCreationWidget.h             |   3 -
 .../DataContainerReaderWidget.cpp             |   5 -
 .../DataContainerReaderWidget.h               |   2 -
 .../DataContainerSelectionWidget.cpp          |   6 -
 .../DataContainerSelectionWidget.h            |   1 -
 .../FilterParameterWidgets/DoubleWidget.cpp   |   1 -
 .../FilterParameterWidgets/DoubleWidget.h     |   2 -
 .../DynamicChoiceWidget.cpp                   |   1 -
 .../DynamicChoiceWidget.h                     |   2 -
 .../DynamicTableItemDelegate.cpp              |   1 -
 .../DynamicTableWidget.cpp                    |   3 -
 .../DynamicTableWidget.h                      |   2 -
 .../FileListInfoWidget.h                      |   4 -
 .../FilterParameterWidget.cpp                 |   2 -
 .../FilterParameterWidget.h                   |   1 -
 .../FilterParameterWidgetsDialogs.cpp         |   1 -
 .../FloatVec2Widget.cpp                       |   1 -
 .../FilterParameterWidgets/FloatVec2Widget.h  |   2 -
 .../FloatVec3Widget.cpp                       |   1 -
 .../FilterParameterWidgets/FloatVec3Widget.h  |   2 -
 .../FilterParameterWidgets/FloatWidget.cpp    |   1 -
 .../FilterParameterWidgets/FloatWidget.h      |   2 -
 .../FourthOrderPolynomialWidget.cpp           |   2 -
 .../FourthOrderPolynomialWidget.h             |   2 -
 .../GenerateColorTableWidget.h                |   2 -
 .../ImportHDF5DatasetWidget.cpp               |  14 +-
 .../ImportHDF5DatasetWidget.h                 |   1 -
 .../InputFileWidget.cpp                       |   1 -
 .../FilterParameterWidgets/InputFileWidget.h  |   1 -
 .../InputPathWidget.cpp                       |   1 -
 .../FilterParameterWidgets/InputPathWidget.h  |   1 -
 .../FilterParameterWidgets/IntVec2Widget.cpp  |   1 -
 .../FilterParameterWidgets/IntVec2Widget.h    |   2 -
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   1 -
 .../FilterParameterWidgets/IntVec3Widget.h    |   2 -
 .../FilterParameterWidgets/IntWidget.cpp      |   1 -
 .../FilterParameterWidgets/IntWidget.h        |   2 -
 .../LinkedBooleanWidget.cpp                   |   1 -
 .../LinkedBooleanWidget.h                     |   2 -
 .../LinkedDataContainerSelectionWidget.cpp    |   4 -
 .../LinkedPathCreationWidget.cpp              |   3 -
 .../LinkedPathCreationWidget.h                |   3 -
 .../MontageSelectionWidget.h                  |   1 -
 .../MultiAttributeMatrixSelectionWidget.cpp   |   5 -
 .../MultiAttributeMatrixSelectionWidget.h     |   1 -
 .../MultiDataArraySelectionWidget.cpp         |   5 -
 .../MultiDataArraySelectionWidget.h           |   1 -
 .../MultiDataContainerSelectionWidget.cpp     |   5 -
 .../MultiDataContainerSelectionWidget.h       |   1 -
 .../NumericTypeWidget.cpp                     |   1 -
 .../NumericTypeWidget.h                       |   2 -
 .../OutputFileWidget.cpp                      |   1 -
 .../FilterParameterWidgets/OutputFileWidget.h |   1 -
 .../OutputPathWidget.cpp                      |   1 -
 .../FilterParameterWidgets/OutputPathWidget.h |   1 -
 .../ParagraphWidget.cpp                       |   3 -
 .../FilterParameterWidgets/ParagraphWidget.h  |   3 -
 .../PhaseTypeSelectionWidget.cpp              |   3 -
 .../PhaseTypeSelectionWidget.h                |   1 -
 .../PreflightUpdatedValueWidget.cpp           |   1 -
 .../PreflightUpdatedValueWidget.h             |   2 -
 .../FilterParameterWidgets/RangeWidget.cpp    |   3 -
 .../FilterParameterWidgets/RangeWidget.h      |   2 -
 .../ReadASCIIDataWidget.h                     |   1 -
 .../ScalarTypeWidget.cpp                      |   1 -
 .../FilterParameterWidgets/ScalarTypeWidget.h |   2 -
 .../SecondOrderPolynomialWidget.cpp           |   2 -
 .../SecondOrderPolynomialWidget.h             |   2 -
 .../SeparatorWidget.cpp                       |   1 -
 .../FilterParameterWidgets/SeparatorWidget.h  |   2 -
 .../ShapeTypeSelectionWidget.cpp              |   2 -
 .../ShapeTypeSelectionWidget.h                |   2 -
 .../FilterParameterWidgets/StringWidget.cpp   |   3 -
 .../FilterParameterWidgets/StringWidget.h     |   3 -
 .../ThirdOrderPolynomialWidget.cpp            |   2 -
 .../ThirdOrderPolynomialWidget.h              |   2 -
 .../FilterParameterWidgets/UInt64Widget.cpp   |   1 -
 .../FilterParameterWidgets/UInt64Widget.h     |   2 -
 .../FilterParameterWidgets/UnknownWidget.cpp  |   1 -
 .../FilterParameterWidgets/UnknownWidget.h    |   2 -
 .../QtSupport/QtSBookmarkMissingDialog.cpp    |   1 -
 .../QtSupport/QtSDisclosableWidget.cpp        |  10 -
 .../QtSupport/QtSDistributionTypeWidget.h     |   1 -
 .../QtSupport/QtSDroppableScrollArea.cpp      |   4 +-
 .../QtSupport/QtSGraphicsView.cpp             |   3 +-
 .../SVWidgetsLib/QtSupport/QtSGraphicsView.h  |   1 -
 .../QtSupport/QtSHelpUrlGenerator.cpp         |   1 +
 .../QtSupport/QtSHelpUrlGenerator.h           |   5 +-
 .../QtSupport/QtSImageGraphicsDelegate.cpp    |   5 -
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp |   3 -
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.h   |   1 -
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.h   |   2 -
 .../QtSupport/QtSRecentFileList.cpp           |   2 -
 Source/SVWidgetsLib/QtSupport/QtSSettings.cpp |   4 +-
 Source/SVWidgetsLib/QtSupport/QtSSettings.h   |   2 -
 .../QtSupport/QtSSplitterHandle.cpp           |   1 -
 Source/SVWidgetsLib/QtSupport/QtSStringEdit.h |   1 -
 Source/SVWidgetsLib/Widgets/BookmarksItem.cpp |   2 -
 Source/SVWidgetsLib/Widgets/BookmarksItem.h   |   2 -
 .../Widgets/BookmarksItemDelegate.cpp         |   2 -
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   1 +
 .../Widgets/BookmarksToolboxWidget.cpp        |   6 -
 .../Widgets/BookmarksToolboxWidget.h          |   2 -
 .../Widgets/BookmarksTreeView.cpp             |   1 -
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h  |   2 -
 .../Widgets/DataContainerArrayWidget.cpp      |   3 +-
 .../Widgets/DataContainerArrayWidget.h        |   6 -
 .../Widgets/DataStructureItem.cpp             |   1 -
 .../Widgets/DataStructureItemDelegate.cpp     |   5 -
 .../SVWidgetsLib/Widgets/DataStructureModel.h |   1 -
 .../Widgets/DataStructureTreeView.cpp         |   7 -
 .../Widgets/DataStructureTreeView.h           |   3 -
 .../Widgets/DataStructureWidget.cpp           |   3 -
 .../Widgets/DataStructureWidget.h             |   3 -
 .../Widgets/FilterInputWidget.cpp             |   5 -
 .../Widgets/FilterLibraryToolboxWidget.cpp    |   1 -
 .../Widgets/FilterLibraryToolboxWidget.h      |   1 -
 .../SVWidgetsLib/Widgets/FilterListItem.cpp   |   2 -
 Source/SVWidgetsLib/Widgets/FilterListItem.h  |   2 -
 .../Widgets/FilterListToolboxWidget.cpp       |   4 +-
 .../Widgets/FilterListToolboxWidget.h         |   1 -
 Source/SVWidgetsLib/Widgets/FilterListView.h  |   1 -
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |   2 +-
 .../ImportASCIIDataWizard/DataFormatPage.h    |   3 +-
 .../ImportASCIIDataWizard/DelimitedPage.h     |   1 -
 .../LineCounterObject.cpp                     |   1 -
 .../TupleSelectionPage.cpp                    |   1 -
 .../TupleSelectionPage.h                      |   1 -
 .../TupleTableItemDelegate.cpp                |   1 -
 .../TupleTableWidget.cpp                      |   2 -
 .../ImportASCIIDataWizard/TupleTableWidget.h  |   2 -
 .../Widgets/ImportHDF5TreeModel.cpp           |   2 -
 .../Widgets/ImportHDF5TreeModelItem.cpp       |   1 -
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp  |   2 -
 Source/SVWidgetsLib/Widgets/IssuesWidget.h    |   1 -
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp  |   2 -
 .../Widgets/PipelineItemDelegate.cpp          |   4 -
 .../Widgets/PipelineItemDelegate.h            |   2 -
 Source/SVWidgetsLib/Widgets/PipelineModel.h   |   1 -
 Source/SVWidgetsLib/Widgets/PipelineView.cpp  |   1 -
 Source/SVWidgetsLib/Widgets/PopUpWidget.cpp   |   3 -
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |  11 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   6 -
 Source/SVWidgetsLib/Widgets/SVStyle.cpp       |   1 -
 Source/SVWidgetsLib/Widgets/SVStyle.h         |   1 -
 .../Widgets/SVUserManualDialog.cpp            |   3 -
 .../Widgets/StandardOutputWidget.h            |   1 -
 Source/SVWidgetsLib/Widgets/StatusBarButton.h |   1 -
 .../Widgets/StatusBarIssuesButton.cpp         |   1 -
 .../Widgets/StatusBarIssuesButton.h           |   1 -
 .../SVWidgetsLib/Widgets/StatusBarWidget.cpp  |   1 -
 .../Widgets/util/AddFilterCommand.cpp         |   3 -
 .../Widgets/util/AddFilterCommand.h           |   1 -
 .../Widgets/util/MoveFilterCommand.h          |   1 -
 .../Widgets/util/RemoveFilterCommand.h        |   3 -
 356 files changed, 668 insertions(+), 673 deletions(-)
 create mode 100644 Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
 create mode 100644 Source/SIMPLib/DataContainers/DataStructureUtilities.h

diff --git a/Source/Experimental/FilterCallback/FilterParameter.h b/Source/Experimental/FilterCallback/FilterParameter.h
index c2514d2f10..081265c5d7 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.h
+++ b/Source/Experimental/FilterCallback/FilterParameter.h
@@ -10,7 +10,6 @@
 
 
 #include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
index 9451426f63..ab7b4ade7d 100644
--- a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
@@ -4,7 +4,6 @@
 #include <iostream>
 
 #include <QtCore/QDebug>
-#include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/H5Support/QH5Lite.h b/Source/H5Support/QH5Lite.h
index c054f4b7f0..827a137250 100644
--- a/Source/H5Support/QH5Lite.h
+++ b/Source/H5Support/QH5Lite.h
@@ -54,11 +54,9 @@
 #error THIS FILE SHOULD NOT BE INCLUDED UNLESS THE H5Support_USE_QT is also defined
 #endif
 
-
-#include <QtCore/QtDebug>
+#include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QVector>
-#include <QtCore/QList>
 
 
 #if defined (H5Support_NAMESPACE)
diff --git a/Source/H5Support/QH5Utilities.h b/Source/H5Support/QH5Utilities.h
index 7a198a6696..d5c7240cd6 100644
--- a/Source/H5Support/QH5Utilities.h
+++ b/Source/H5Support/QH5Utilities.h
@@ -45,7 +45,6 @@
 
 
 #include <QtCore/QString>
-#include <QtCore/QVector>
 #include <QtCore/QList>
 
 
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 96702d1586..f9a625e0d7 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -43,13 +43,12 @@
 // Qt Includes
 #include <QtCore/QCommandLineOption>
 #include <QtCore/QCommandLineParser>
+#include <QtCore/QFileInfo>
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
+#include <QtCore/QDebug>
 #include <QtCore/QFile>
-#include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 
 // DREAM3DLib includes
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/RESTServer/main.cpp b/Source/RESTServer/main.cpp
index dd24231930..f2eae7cd89 100644
--- a/Source/RESTServer/main.cpp
+++ b/Source/RESTServer/main.cpp
@@ -38,14 +38,12 @@
 #include <iostream>
 
 // Qt Includes
-#include <QtCore/QCommandLineOption>
-#include <QtCore/QCommandLineParser>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 
 #include "QtWebApp/httpserver/ServerSettings.h"
 #include "QtWebApp/httpserver/httplistener.h"
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
index 7045004b2b..ce17eeae9c 100755
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QString>
 #include <vector>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index ba61112f89..3089d41ef9 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -35,10 +35,7 @@
 
 #pragma once
 
-#include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 #include <QtCore/QObject>
-#include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
 
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index fc0fae5605..65d72672a8 100755
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -38,7 +38,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/Common/ShapeType.h b/Source/SIMPLib/Common/ShapeType.h
index eea8e06b5b..58ef0d6edf 100755
--- a/Source/SIMPLib/Common/ShapeType.h
+++ b/Source/SIMPLib/Common/ShapeType.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QTextStream>
 #include <QtCore/QVector>
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index 1ac3776c3e..1c2d1c3964 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -36,7 +36,6 @@
 #include <list>
 #include <vector>
 
-#include <QtCore/QList>
 #include <QtCore/QVector>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 11438f2573..778894358a 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -35,9 +35,7 @@
 
 #include "ArrayCalculator.h"
 
-#include <QtCore/QMapIterator>
 #include <QtCore/QRegularExpression>
-#include <QtCore/QVectorIterator>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index eb08a233a0..8e8f97fe60 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -37,7 +37,6 @@
 #pragma once
 
 #include <QtCore/QStack>
-#include <QtCore/QQueue>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index aba88972a9..5325fad953 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -35,7 +35,6 @@
 
 #include "Breakpoint.h"
 
-#include <QtCore/QCoreApplication>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index f5eff9b894..acb75a4301 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -35,7 +35,6 @@
 
 #include "CreateDataArray.h"
 
-#include <QtCore/QDateTime>
 
 #include <limits>
 #include <random>
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index cd47fcfbff..a9d9130b6c 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -35,7 +35,6 @@
 
 #include "CreateStringArray.h"
 
-#include <QtCore/QDateTime>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index b2141b2552..3e8c468376 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QFile>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 316be8737d..780d71376b 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <QtCore/QJsonObject>
 #include <QtCore/QJsonArray>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index dd18f6c9e0..685e69c0bc 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -39,7 +39,7 @@
 #include <chrono>
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QDateTime>
+#include <QtCore/QTime>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 747c1e3527..ce0cc08d75 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -33,7 +33,6 @@
 #include "PostSlackMessage.h"
 
 #include <QtCore/QEventLoop>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
index 3aebf9cf51..f2c72d30d5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -3,8 +3,6 @@
 // -----------------------------------------------------------------------------
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/ApplyImageTransforms.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 338baf451e..4a482486e4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index b7b595ccfd..59fff9375a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 8b5afc6cb0..0e6670ad4c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 5bfa627cc5..a590c9c293 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index f2b2a6ab8e..5493237476 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -35,7 +35,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QTextStream>
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index 21873e7c72..1864a8afe1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include <assert.h>
 #include <stdint.h>
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index ff780aa7a5..68623ba629 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index b2ddffe660..edec612c27 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index beda654b64..e0aa703126 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include <cassert>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index e0daeffae5..e1c0cdbfed 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index 702aafa0bc..f658095933 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include <assert.h>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 38c2559e81..df85899781 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index fba1539cb4..c62c290537 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index 79d993f7ef..cdbbe39a1f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index fbb2906cf2..02258a794a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index 2a6fd903b4..f6a268d171 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 #include <QtCore/QObject>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index ae6b7a926c..4461da1b09 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 667e0a6164..44357b2e51 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 8648e8db5b..974be63559 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -6,7 +6,6 @@
 #include <array>
 #include <numeric>
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index a4f2ebe230..266eaa9917 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 6b43fcc34e..a2a48e02fb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -33,12 +33,9 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
+#include <QtCore/QDebug>
 #include <QtCore/QFile>
-#include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 
 #include "SIMPLib/Common/Constants.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 4c51325a4b..ee7b4147d2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -33,13 +33,11 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonParseError>
-#include <QtCore/QObject>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index d299068964..f77f580558 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -5,7 +5,6 @@
 #include <fstream>
 #include <iostream>
 
-#include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index a9b6678648..93beb43d22 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index a8bdcf4931..ecc87446cd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index 2a10ae8e58..19d67a875e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 891b858911..d49dd69d9d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
index eced49ef27..ff3a982124 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
@@ -2,7 +2,6 @@
 // Insert your license & copyright information here
 // -----------------------------------------------------------------------------
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index e07ef3c3c2..7b777d9c13 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -38,7 +38,6 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QtCore/QFileInfo>
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 8fd3640d4b..9b0416d9fa 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <cmath>
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index 3ea5d0f7e0..7b44094acb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -33,13 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonParseError>
-#include <QtCore/QObject>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index b58231457b..9a80e95224 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index 519997019f..38bdb70f12 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
@@ -327,4 +325,4 @@ class RenameAttributeArrayTest
 private:
   RenameAttributeArrayTest(const RenameAttributeArrayTest&); // Copy Constructor Not Implemented
   void operator=(const RenameAttributeArrayTest&);           // Move assignment Not Implemented
-};
\ No newline at end of file
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 758797f7dc..880957518b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
@@ -269,4 +267,4 @@ class RenameAttributeMatrixTest
 private:
   RenameAttributeMatrixTest(const RenameAttributeMatrixTest&); // Copy Constructor Not Implemented
   void operator=(const RenameAttributeMatrixTest&);            // Move assignment Not Implemented
-};
\ No newline at end of file
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 8cbe9e7c12..32b7fc99e7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
index d75a2c8f15..459c7f3401 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -37,8 +37,6 @@
 #include <chrono>
 #include <iostream>
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
@@ -153,4 +151,3 @@ class RenameTimingTest
 private:
   RenameTimingTest(const RenameTimingTest&); // Copy Constructor Not Implemented
   void operator=(const RenameTimingTest&);          // Move assignment Not Implemented
-};
\ No newline at end of file
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index a832d55b5e..6cbd42cd52 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index 27e52ba750..442965b646 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index affe9a8841..8f45bb6b11 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index b78876fb85..5a5dfbcce2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index c01fcbb8a5..cb97ed8d4c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -33,8 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
index 6dcc0b25a3..e30b2273fe 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
@@ -36,7 +36,6 @@
 #include <iostream>
 
 #include <QtCore/QFile>
-#include <QtCore/QObject>
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/CoreFilters/DataContainerWriter.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 2e081ca19f..f787e43f49 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -38,7 +38,6 @@
 #include <iostream>
 #include <string>
 
-#include <QtCore/QDir>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index bdc0df1c8b..d14e777b9b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.h b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
index 48be1bf213..0ebfb880c4 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.h b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
index 2bba0e11cc..b45684e494 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.h b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
index e303a9fc0a..ff4d06e63e 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.h b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
index 97aeac5894..b2d5b9c884 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
index 26f8e3121e..862c9bf2a1 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index 25fba1a526..d2e3b9dfaf 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index 9758f4df37..cfde495551 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
-#include <QtCore/QVector>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.h b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
index 676075478a..6a44ce2739 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.h b/Source/SIMPLib/CoreFilters/util/CosOperator.h
index f06bfd5e15..eaa424741e 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
index 105be7898d..521255b23d 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.h b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
index a30e60671a..0a7cd90c35 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.h b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
index baeea72311..9ec56bd8d3 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
index e01e52e95f..a1e4580d41 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.h b/Source/SIMPLib/CoreFilters/util/LnOperator.h
index 2de98a2dd5..65b9e71a33 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.h b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
index ecbf864672..b636199a6e 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.h
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.h b/Source/SIMPLib/CoreFilters/util/LogOperator.h
index 5ff42c72e2..721966d7ac 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
index 05d6082c07..ca38a008ff 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
index 515e7b6ed4..5f2c031586 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.h b/Source/SIMPLib/CoreFilters/util/PowOperator.h
index 5b0731b4b9..c6dfc62df3 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.h b/Source/SIMPLib/CoreFilters/util/RootOperator.h
index 8cc350a9b8..60907c9bde 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.h b/Source/SIMPLib/CoreFilters/util/SinOperator.h
index 438a646d2f..008e7f6833 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
index a026787d05..0c3ec2b1f5 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
index 207104fd23..4429fcfe38 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.h b/Source/SIMPLib/CoreFilters/util/TanOperator.h
index 18773ac96a..98c68e1778 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 5fc5da8412..6d140610c8 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -47,9 +47,7 @@
 #include <hdf5.h>
 
 #include <QtCore/QObject>
-#include <QtCore/QList>
 #include <QtCore/QString>
-#include <QtCore/QMap>
 #include <QtCore/QVector>
 
 //-- DREAM3D Includes
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
index 78dfd19539..d2487e8396 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QMap>
-#include <QtCore/QMetaType>
 #include <QtCore/QString>
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index aa4e441fa9..5097a8dfd9 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 8b751b3737..060010330e 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -40,7 +40,6 @@
 
 #include <QtCore/QObject> // for Q_OBJECT
 #include <QtCore/QString>
-#include <QtCore/QList>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index d402e8bf94..0f0965887a 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QList>
-#include <QtCore/QMetaType>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
index 150983a36f..674c83acd5 100755
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -36,7 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.h b/Source/SIMPLib/DataContainers/DataContainerProxy.h
index 1461d4ce45..94142909ca 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QMap>
-#include <QtCore/QMetaType>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
new file mode 100644
index 0000000000..c3c47ed290
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
@@ -0,0 +1,236 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5261
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "DataStructureUtilities.h"
+
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
+// -----------------------------------------------------------------------------
+DataStructureUtilities::DataStructureUtilities() = default;
+// -----------------------------------------------------------------------------
+DataStructureUtilities::~DataStructureUtilities() = default;
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataStructureUtilities::getPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists)
+{
+  return getPrereqDataContainer(filter, dap.getDataContainerName(), createIfNotExists);
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataStructureUtilities::getPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const QString& name, bool createIfNotExists)
+{
+  DataContainerShPtr dc = getDataContainer(name);
+  if(nullptr == dc.get() && !createIfNotExists)
+  {
+    if(filter != nullptr)
+    {
+      QString ss = "The DataContainer Object with the specific name '" + name + "' was not available.";
+      filter->setErrorCondition(-999, ss);
+    }
+    return dc;
+  }
+  if(nullptr != dc && createIfNotExists)
+  {
+    DataContainerShPtr dataContainer = DataContainer::New(name); // Create a new Data Container
+    addOrReplaceDataContainer(dataContainer);                    // Put the new DataContainer into the array
+    return dataContainer;                                        // Return the wrapped pointer
+  }
+  // The DataContainer we asked for was present and NON Null so return that.
+  return dc;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataStructureUtilities::createNonPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id)
+{
+  return createNonPrereqDataContainer(filter, dap.getDataContainerName(), id);
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataStructureUtilities::createNonPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id)
+{
+  if(dataContainerName.isEmpty())
+  {
+    if(filter != nullptr)
+    {
+      QString ss = QObject::tr("The DataContainer Object must have a name to be created.");
+      filter->setErrorCondition(-887, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  if(dataContainerName.contains('/'))
+  {
+    if(filter != nullptr)
+    {
+      QString ss = QObject::tr("The DataContainer Object has forward slashes in its name.");
+      filter->setErrorCondition(-888, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  DataContainerShPtr dataContainer = DataContainer::New(dataContainerName);
+  bool dcExists = !push_back(dataContainer);
+  if(dcExists)
+  {
+    if(filter != nullptr)
+    {
+      QString ss = QObject::tr("The DataContainer Object with the specific name '%1' already exists.").arg(dataContainerName);
+      filter->setErrorCondition(-889, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(dataContainerName, "", ""));
+  return dataContainer;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixShPtrType DataStructureUtilities::getPrereqAttributeMatrixFromPath(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& path, int err)
+{
+  // First try to get the Parent DataContainer. If an error occurs the error message will have been set
+  // so just return a nullptr shared pointer
+  DataContainerShPtr dc = getPrereqDataContainer(filter, path.getDataContainerName(), false);
+  if(nullptr == dc)
+  {
+    return AttributeMatrix::NullPointer();
+  }
+
+  // Now just return what ever the DataContainer gives us. if the AttributeMatrix was not available then an
+  // error message and code will have been set into the "filter" object if that object was non-null itself.
+  return dc->getPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), err);
+}
+
+// -----------------------------------------------------------------------------
+bool DataStructureUtilities::validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const std::vector<DataArrayPath>& paths)
+{
+  if(paths.size() <= 1)
+  {
+    return false;
+  }
+  QVector<IDataArray::Pointer> dataArrays;
+  bool valid = true;
+  QString ss;
+  if(!paths.at(0).isValid() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+             .arg(__LINE__)
+             .arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10000, ss);
+    valid = false;
+    return valid;
+  }
+  IDataArray::Pointer array0 = getPrereqIDataArrayFromPath<IDataArray>(filter, paths.at(0));
+  if(nullptr == array0.get() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10100, ss);
+    valid = false;
+    return valid;
+  }
+
+  dataArrays.push_back(array0);
+  for(int32_t i = 1; i < paths.size(); i++)
+  {
+    if(!paths.at(i).isValid() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+               .arg(__LINE__)
+               .arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10000, ss);
+      valid = false;
+      return valid;
+    }
+    IDataArray::Pointer nextArray = getPrereqIDataArrayFromPath<IDataArray>(filter, paths.at(i));
+    if(nullptr == nextArray.get() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10100, ss);
+      valid = false;
+      return valid;
+    }
+
+    dataArrays.push_back(nextArray);
+  }
+  size_t numTuples = dataArrays[0]->getNumberOfTuples();
+  for(int32_t i = 1; i < dataArrays.size(); i++)
+  {
+    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
+    {
+      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
+               .arg(dataArrays[0]->getName())
+               .arg(dataArrays[0]->getNumberOfTuples())
+               .arg(dataArrays[i]->getName())
+               .arg(dataArrays[i]->getNumberOfTuples());
+      filter->setErrorCondition(-10200, ss);
+      valid = false;
+    }
+  }
+  return valid;
+}
+
+// -----------------------------------------------------------------------------
+bool DataStructureUtilities::validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, std::vector<IDataArray::Pointer>& dataArrays)
+{
+  if(dataArrays.size() <= 1)
+  {
+    return false;
+  }
+  bool valid = true;
+  QString ss;
+  for(const auto& dataArray : dataArrays)
+  {
+    if(nullptr == dataArray && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available").arg(__LINE__);
+      filter->setErrorCondition(-10100, ss);
+      valid = false;
+    }
+  }
+  size_t numTuples = dataArrays[0]->getNumberOfTuples();
+  for(int32_t i = 1; i < dataArrays.size(); i++)
+  {
+    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
+    {
+      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
+               .arg(dataArrays[i - 1]->getName())
+               .arg(dataArrays[i - 1]->getNumberOfTuples())
+               .arg(dataArrays[i]->getName())
+               .arg(dataArrays[i]->getNumberOfTuples());
+      filter->setErrorCondition(-10200, ss);
+      valid = false;
+    }
+  }
+  return valid;
+}
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
new file mode 100644
index 0000000000..a48e3c77e3
--- /dev/null
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -0,0 +1,395 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5261
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <memory>
+#include <vector>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/SIMPLib.h"
+
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
+
+class DataContainer;
+using DataContainerShPtrType = std::shared_ptr<DataContainer>;
+
+class AttributeMatrix;
+using AttributeMatrixShPtrType = std::shared_ptr<AttributeMatrix>;
+
+class AbstractFilter;
+
+class SIMPLib_EXPORT DataStructureUtilities
+{
+public:
+  DataStructureUtilities();
+  ~DataStructureUtilities();
+
+  /**
+   * @brief getPrereqDataContainer
+   * @param filter
+   * @param dap
+   * @param createIfNotExists
+   * @return
+   */
+  ADataContainerShPtrType getPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists = false);
+
+  /**
+   * @brief getPrereqDataContainer
+   * @param name
+   * @param createIfNotExists
+   * @return
+   */
+  ADataContainerShPtrType getPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const QString& name, bool createIfNotExists = false);
+
+  /**
+   * @brief createNonPrereqDataContainer
+   * @param filter
+   * @param dap
+   * @param id
+   * @return
+   */
+  ADataContainerShPtrType createNonPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& dap,
+                                                       RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+
+  /**
+   * @brief This function will create a new DataContainer of type <T>
+   * @param dataContainerName The name of the DataContainer. Must not be empty or this method will ASSERT()
+   * @return Valid DataContainer Object UNLESS the DataContainer with the given name already exists or the
+   * dataContainerName is empty in which case a Null DataContainer will be returned.
+   */
+  ADataContainerShPtrType createNonPrereqDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const QString& dataContainerName,
+                                                       RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+
+  /**
+   * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
+   * if it is available for the given DataContainer
+   * @param filter
+   * @param dcName
+   * @return
+   */
+  template <typename GeometryType>
+  typename GeometryType::Pointer getPrereqGeometryFromDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const QString& dcName)
+  {
+    typename GeometryType::Pointer geom = GeometryType::NullPointer();
+    ADataContainerShPtrType dc = DataStructureUtilites::getPrereqDataContainer(filter, dcName, false);
+    if(nullptr == dc)
+    {
+      return geom;
+    }
+
+    return dc->getPrereqGeometry<GeometryType>(filter);
+  }
+
+  /**
+   * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
+   * if it is available for the given DataContainer
+   * @param filter
+   * @param path
+   * @return
+   */
+  template <typename GeometryType>
+  typename GeometryType::Pointer getPrereqGeometryFromDataContainer(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& path)
+  {
+    typename GeometryType::Pointer geom = GeometryType::NullPointer();
+    ADataContainerShPtrType dc = DataStructureUtilites::getPrereqDataContainer(filter, path.getDataContainerName(), false);
+    if(nullptr == dc)
+    {
+      return geom;
+    }
+
+    return dc->getPrereqGeometry<GeometryType>(filter);
+  }
+
+  /**
+   * @brief getPrereqAttributeMatrixFromPath This function will return an AttributeMatrix if it is availabe
+   * at the path
+   * @param filter An AbstractFilter or subclass where error messages and error codes can be sent
+   * @param path The DataArrayPath object that has the path to the AttributeMatrix
+   * @param err The error code to display to the user
+   * @return
+   */
+  AttributeMatrixShPtrType getPrereqAttributeMatrixFromPath(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const DataArrayPath& path, int err);
+
+  /**
+   * @brief getPrereqArrayFromPath
+   * @param filter Instance of an AbstractFilter. Can be nullptr
+   * @param path The path to the IDataArray
+   * @param cDims The component dimensions of the IDataArray subclass
+   * @return Valid or nullptr shared pointer based on availability of the array
+   */
+  template <class ArrayType, class Filter>
+  typename ArrayType::Pointer getPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, QVector<size_t> cDims)
+  {
+
+    QString ss;
+    typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+
+    if(path.isEmpty())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
+        filter->setErrorCondition(-80000, ss);
+      }
+      return dataArray;
+    }
+
+    if(!path.isValid())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+                 .arg(__LINE__)
+                 .arg(path.serialize());
+        filter->setErrorCondition(-80001, ss);
+      }
+      return dataArray;
+    }
+
+    QString dcName = path.getDataContainerName();
+    QString amName = path.getAttributeMatrixName();
+    QString daName = path.getDataArrayName();
+
+    ADataContainerShPtrType dc = dca->getDataContainer(dcName);
+    if(nullptr == dc.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
+        filter->setErrorCondition(-80002, ss);
+      }
+      return dataArray;
+    }
+
+    AttributeMatrixShPtrType attrMat = dc->getAttributeMatrix(amName);
+    if(nullptr == attrMat.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
+        filter->setErrorCondition(-80003, ss);
+      }
+      return dataArray;
+    }
+
+    dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    return dataArray;
+  }
+
+  /**
+   * @brief getPrereqIDataArrayFromPath
+   * @param filter
+   * @param path
+   * @return
+   */
+  template <class ArrayType, class Filter>
+  typename ArrayType::Pointer getPrereqIDataArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path)
+  {
+
+    QString ss;
+    typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+
+    if(path.isEmpty())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
+        filter->setErrorCondition(-90000, ss);
+      }
+      return dataArray;
+    }
+
+    if(!path.isValid())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+                 .arg(__LINE__)
+                 .arg(path.serialize());
+        filter->setErrorCondition(-90001, ss);
+      }
+      return dataArray;
+    }
+
+    QString dcName = path.getDataContainerName();
+    QString amName = path.getAttributeMatrixName();
+    QString daName = path.getDataArrayName();
+
+    ADataContainerShPtrType dc = getDataContainer(dcName);
+    if(nullptr == dc.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
+        filter->setErrorCondition(-999, ss);
+      }
+      return dataArray;
+    }
+
+    AttributeMatrixShPtrType attrMat = dc->getAttributeMatrix(amName);
+    if(nullptr == attrMat.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
+        filter->setErrorCondition(-307020, ss);
+      }
+      return dataArray;
+    }
+
+    dataArray = std::dynamic_pointer_cast<ArrayType>(attrMat->getPrereqIDataArray(filter, daName, -90002)); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    return dataArray;
+  }
+
+  /**
+   * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The conditions for this
+   * method to work properly include: a valid DataArrayPath is supplied, the name of the attribute array is not empty,
+   * and an array with the same name cannot already exist
+   * @param filter The instance of the filter the filter that is requesting the new array
+   * @param attributeArrayName The name of the AttributeArray to create
+   * @param initValue The initial value of all the elements of the array
+   * @param size The number of tuples in the Array
+   * @param dims The dimensions of the components of the AttributeArray
+   * @return A Shared Pointer to the newly created array
+   */
+  template <class ArrayType, class Filter, typename T>
+  typename ArrayType::Pointer createNonPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, T initValue, QVector<size_t> compDims,
+                                                           const QString& property = "", RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+  {
+    typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+    QString ss;
+    if(!path.isValid())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("Property '%1': The DataArrayPath is invalid because one of the elements was empty.\n  DataContainer: %2\n  AttributeMatrix: %3\n  DataArray: %4")
+                 .arg(property)
+                 .arg(path.getDataContainerName())
+                 .arg(path.getAttributeMatrixName())
+                 .arg(path.getDataArrayName());
+        filter->setErrorCondition(-80010, ss);
+      }
+      return dataArray;
+    }
+
+    if(path.getDataContainerName().contains('/'))
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80005, ss);
+      }
+      return dataArray;
+    }
+
+    if(path.getAttributeMatrixName().contains('/'))
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(path.getAttributeMatrixName());
+        filter->setErrorCondition(-80006, ss);
+      }
+      return dataArray;
+    }
+
+    if(path.getDataArrayName().contains('/'))
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataArray '%1' has forward slashes in its name").arg(path.getDataArrayName());
+        filter->setErrorCondition(-80007, ss);
+      }
+      return dataArray;
+    }
+
+    if(path.getDataContainerName().contains('/'))
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80004, ss);
+      }
+      return dataArray;
+    }
+
+    ADataContainerShPtrType dc = getDataContainer(path.getDataContainerName());
+    if(nullptr == dc.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80002, ss);
+      }
+      return dataArray;
+    }
+
+    AttributeMatrixShPtrType attrMat = dc->getAttributeMatrix(path.getAttributeMatrixName());
+    if(nullptr == attrMat.get())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(path.getAttributeMatrixName()).arg(path.getDataContainerName());
+        filter->setErrorCondition(-80003, ss);
+      }
+      return dataArray;
+    }
+
+    // If something goes wrong at this point the error message will be directly set in the 'filter' object so we just
+    // simply return what ever is given to us.
+    dataArray = attrMat->createNonPrereqArray<ArrayType, Filter, T>(filter, path.getDataArrayName(), initValue, compDims, id);
+    return dataArray;
+  }
+
+  /**
+   * @brief validateNumberOfTuples This method will validate that all of the DataArray
+   * paths supplied are valid, return non-nullptr DataArray pointers, and that all have the
+   * same number of tuples.  It will return false if and any of the checks fail, or
+   * if the QVector of input paths has 0 or 1 element.
+   * @param filter The filter calling the validation
+   * @param paths The paths that should be checked
+   * @return bool Validation check
+   */
+  bool validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const std::vector<DataArrayPath>& paths);
+
+  /**
+   * @brief validateNumberOfTuples This method will validate that all of the DataArray
+   * objects supplied are non-nullptr and that all are have the same number of tuples.
+   * It will return false if and any of the checks fail, or
+   * if the QVector of input DataArray objects has 0 or 1 element.
+   * @param filter The filter calling the validation
+   * @param paths The paths that should be checked
+   * @return bool Validation check
+   */
+  bool validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const std::vector<IDataArray::Pointer>& dataArrays);
+};
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 623f5f5910..c49547453c 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QVector>
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 918fd88175..5e8eb038dd 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -35,7 +35,6 @@
 
 #include "ComparisonSelectionAdvancedFilterParameter.h"
 
-#include <QtCore/QJsonArray>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index 3121e15ed0..adf06fc4b1 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -37,6 +37,7 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+#include <QtCore/QSize>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index dfb4621499..bc471ccca9 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -36,10 +36,7 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QAbstractTableModel>
 
-#include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 130a62e67d..99d21a1e1f 100755
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FileListInfo.h"
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 12377f1b19..09b000ef24 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -39,7 +39,6 @@
 #include <functional>
 
 
-#include <QtCore/QVector>
 #include <QtCore/QVariant>
 #include <QtCore/QString>
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index f2bdac3c14..46b817978a 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -40,7 +40,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 0f3d0f7d40..f3313d3b39 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -40,7 +40,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index a648ec8499..047f38a0d6 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -37,8 +37,6 @@
 
 #include <limits>
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QJsonDocument>
 #include <QtCore/QStringList>
 
 #include "H5Support/H5ScopedSentinel.h"
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 943ec7b6d1..8fd9fd68d0 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -35,9 +35,8 @@
 
 #include "H5FilterParametersWriter.h"
 
-#include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QtCore/QJsonDocument>
+#include <QtCore/QFileInfo>
 
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index a9f4678cd9..8a2c5361f3 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -34,11 +34,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "JsonFilterParametersReader.h"
 
-#include <QtCore/QDataStream>
 #include <QtCore/QFileInfo>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
-#include <QtCore/QMetaType>
 #include <QtCore/QStringList>
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 6fc0396a20..f8e813ed19 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -34,7 +34,7 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonParseError>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 7bc1a99409..cf3298966f 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -35,7 +35,6 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index 980cda40a7..d1aa10e5e4 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -34,7 +34,6 @@
 
 #include "MontageSelectionFilterParameter.h"
 
-#include <QtCore/QJsonArray>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 2becb3ec5b..188b6dd815 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -35,7 +35,6 @@
 
 #include "NumericTypeFilterParameter.h"
 
-#include <QtCore/QJsonArray>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 2f4b64b6ce..1b97aa7f1f 100755
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index 205b4772ae..9a03e91fdf 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -35,7 +35,6 @@
 
 #include "ScalarTypeFilterParameter.h"
 
-#include <QtCore/QJsonArray>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index a7f79461f3..1d6be2ede2 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -33,10 +33,7 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 #include <QtCore/QPair>
-#include <QtCore/QSet>
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index b3971e5f28..e6b2121b17 100755
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index eb331a7a67..9a38d0fac2 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -35,7 +35,6 @@
 
 #include "AbstractFilter.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index c1bbb678b0..8361bcdd52 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -37,9 +37,7 @@
 
 #include <map>
 
-#include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtCore/QVector>
 #include <QtCore/QUuid>
 
 #include "SIMPLib/Common/Observable.h"
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index f408518e31..60c61b65fe 100755
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
index c15b165a94..f66f20b354 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
@@ -35,6 +35,8 @@
 
 #include "ComparisonInputsAdvanced.h"
 
+#include <QtCore/QJsonArray>
+
 #include "SIMPLib/Filtering/ComparisonSet.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index 2dda50ee42..cce38c20e9 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -37,9 +37,7 @@
 
 #include <memory>
 
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index bcc61512f9..770dc1bffb 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -35,6 +35,8 @@
 
 #include "FilterManager.h"
 
+#include <QtCore/QJsonObject>
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/CorePlugin.h"
 
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index c112de77f5..53fdbc08ae 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -38,7 +38,6 @@
 #include <cassert>
 
 #include <QtCore/QDataStream>
-#include <QtCore/QVector>
 
 #include "SIMPLib/Common/EnsembleInfo.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
index c4c423c53b..3ca919350d 100755
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QMetaType>
-#include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
 
diff --git a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
index 9ded57da01..977dcd0009 100644
--- a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
+++ b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
@@ -33,11 +33,7 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QtCore/QFileInfo>
-#include <QtCore/QPluginLoader>
 
 //#include "Applications/DREAM3D/DREAM3DApplication.h"
 
diff --git a/Source/SIMPLib/Geometry/MeshStructs.h b/Source/SIMPLib/Geometry/MeshStructs.h
index 6948d56d5c..996769dfe5 100755
--- a/Source/SIMPLib/Geometry/MeshStructs.h
+++ b/Source/SIMPLib/Geometry/MeshStructs.h
@@ -32,7 +32,6 @@
 #pragma once
 
 //Qt Includes
-#include <QtCore/QString>
 
 //SIMPLib Includes
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
index f02d4d8748..4b77e9cb01 100755
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <QtCore/QString>
 
 #include <hdf5.h>
 
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
index f0a63a48c7..261c2dedea 100755
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <QtCore/QString>
 
 #include <hdf5.h>
 
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
index adea23a832..ccc4cab06c 100755
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <QtCore/QString>
 
 #include <hdf5.h>
 
diff --git a/Source/SIMPLib/Messages/AbstractMessage.h b/Source/SIMPLib/Messages/AbstractMessage.h
index 46928af625..cb9687723e 100755
--- a/Source/SIMPLib/Messages/AbstractMessage.h
+++ b/Source/SIMPLib/Messages/AbstractMessage.h
@@ -37,7 +37,6 @@
 #pragma once
 
 #include <QtCore/QString>
-#include <QtCore/QMetaType>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
index 70124f0db7..74a73665ba 100755
--- a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
@@ -36,7 +36,6 @@
 
 
 #include <QtCore/QSettings>
-#include <QtCore/QtPlugin>
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/Plugin/PluginManager.cpp b/Source/SIMPLib/Plugin/PluginManager.cpp
index e6ff2631be..92c59c5612 100644
--- a/Source/SIMPLib/Plugin/PluginManager.cpp
+++ b/Source/SIMPLib/Plugin/PluginManager.cpp
@@ -36,6 +36,7 @@
 #include "PluginManager.h"
 
 #include <QtCore/QJsonArray>
+#include <QtCore/QJsonObject>
 
 #include "SIMPLib/Filtering/CorePlugin.h"
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
index f3e4b9f9af..df9bab14f5 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
@@ -41,10 +41,10 @@
 
 // Qt Includes
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QPluginLoader>
 #include <QtCore/QStringList>
-#include <QtCore/QtDebug>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
index a4a13000f4..3c6053de1a 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
@@ -35,6 +35,7 @@
 
 #include "SIMPLDirectoryListing.h"
 
+#include <QtCore/QDateTIme>
 #include <QtCore/QFileInfoList>
 #include <QtCore/QTextStream>
 
diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.h b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
index 5e2b9e85c0..3385300717 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.h
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QString>
 #include <QtCore/QVector>
diff --git a/Source/SIMPLib/REST/SIMPLRequestMapper.cpp b/Source/SIMPLib/REST/SIMPLRequestMapper.cpp
index ab07da54ea..07f6aa20be 100644
--- a/Source/SIMPLib/REST/SIMPLRequestMapper.cpp
+++ b/Source/SIMPLib/REST/SIMPLRequestMapper.cpp
@@ -31,7 +31,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLRequestMapper.h"
 
-#include <QtCore/QCoreApplication>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
index 9cdbf95bfc..dbbb921f06 100644
--- a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
@@ -37,8 +37,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QVariant>
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 935edc3061..9cc9247920 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -31,16 +31,11 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ExecutePipelineController.h"
 
-#include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QMimeDatabase>
 #include <QtCore/QProcess>
-#include <QtCore/QVariant>
-#include <QtNetwork/QNetworkInterface>
-#include <QtWidgets/QApplication>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
index 8fb7e7ef7c..d448959cc4 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
@@ -34,7 +34,6 @@
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QTemporaryDir>
-#include <QtCore/QTemporaryFile>
 
 #include "QtWebApp/httpserver/httprequest.h"
 #include "QtWebApp/httpserver/httprequesthandler.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
index 87d3135fac..911cb60be5 100644
--- a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
@@ -31,11 +31,9 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ListFilterParametersController.h"
 
-#include <QtCore/QDateTime>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QVariant>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Plugin/PluginManager.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.cpp b/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.cpp
index c582cba94a..8f34b5a8de 100644
--- a/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.cpp
@@ -31,11 +31,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "LoadedPluginsController.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QVariant>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Plugin/PluginManager.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.cpp b/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.cpp
index 41185d62aa..59caf1a4f0 100644
--- a/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.cpp
@@ -32,11 +32,8 @@
 
 #include "NamesOfFiltersController.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QVariant>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Plugin/PluginManager.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
index de61c1f99c..12d51469dd 100644
--- a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
@@ -36,8 +36,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QVariant>
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
diff --git a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
index 75767ff7a4..985bf1c22c 100644
--- a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
@@ -37,8 +37,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-#include <QtCore/QDateTime>
-#include <QtCore/QVariant>
 
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
index 6927456c6b..81903a17de 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
@@ -32,12 +32,10 @@
 
 #include "PreflightPipelineController.h"
 
-#include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QVariant>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
index ee947a50f3..014134d492 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
@@ -31,7 +31,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QJsonObject>
 
 #include "QtWebApp/httpserver/httprequest.h"
 #include "QtWebApp/httpserver/httprequesthandler.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp b/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
index a426072091..c55ba4ed90 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
@@ -32,8 +32,6 @@
 
 #include "SIMPLibVersionController.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
index 2c8022fcbf..57511a8400 100644
--- a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
@@ -31,8 +31,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "V1RequestMapper.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QJsonDocument>
 
 #include "QtWebApp/logging/filelogger.h"
 
diff --git a/Source/SIMPLib/Utilities/MontageSelection.h b/Source/SIMPLib/Utilities/MontageSelection.h
index 6b922750e1..85f4a7dbd6 100644
--- a/Source/SIMPLib/Utilities/MontageSelection.h
+++ b/Source/SIMPLib/Utilities/MontageSelection.h
@@ -35,7 +35,6 @@
 #pragma once
 
 #include <QtCore/QJsonObject>
-#include <QtCore/QMetaType>
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
diff --git a/Source/SIMPLib/Utilities/TestObserver.h b/Source/SIMPLib/Utilities/TestObserver.h
index abf6fe8102..75fdcdc67b 100755
--- a/Source/SIMPLib/Utilities/TestObserver.h
+++ b/Source/SIMPLib/Utilities/TestObserver.h
@@ -32,8 +32,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QVector>
-#include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SIMPLib/Utilities/TimeUtilities.h b/Source/SIMPLib/Utilities/TimeUtilities.h
index 0e2b2529cf..d20518c8ee 100755
--- a/Source/SIMPLib/Utilities/TimeUtilities.h
+++ b/Source/SIMPLib/Utilities/TimeUtilities.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QString>
-#include <QtCore/QTextStream>
 
 namespace DREAM3D
 {
diff --git a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
index 4754e21a73..e736f4b4c4 100755
--- a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
+++ b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QtEndian>
 
 #include "SIMPLib/Utilities/SIMPLibEndian.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.h b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
index 8368e34979..a866be4ae3 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.h
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
@@ -38,7 +38,6 @@
 
 #include <QtCore/QString>
 #include <QtCore/QMap>
-#include <QtCore/QSet>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
index dec2165876..721c8f799c 100755
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
@@ -38,7 +38,6 @@
 
 #include <QtWidgets/QCheckBox>
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/Plugin/PluginProxy.h"
 #include "SIMPLib/Plugin/PluginManager.h"
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index 9f060fac4c..62c940a229 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -37,9 +37,8 @@
 
 #include <iostream>
 
-#include <QtCore/QStringList>
 #include <QtCore/QFile>
-#include <QtCore/QDir>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonParseError>
 
 #include <QtGui/QPixmap>
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index 2e5ddb5873..2c212c864d 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -47,7 +47,6 @@
 #pragma once
 
 #include <QtCore/QString>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
index c4d2a0dec3..de204f832d 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
@@ -35,10 +35,6 @@
 
 #include "ColorPresetsDialog.h"
 
-#include <QtCore/QList>
-#include <QtCore/QPointer>
-#include <QtCore/QSize>
-#include <QtCore/QSortFilterProxyModel>
 
 #include <QtGui/QPixmap>
 
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
index b2bebf9214..a9ee25b954 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
@@ -38,7 +38,6 @@
 #include <QtCore/QModelIndex>
 #include <QtCore/QScopedPointer>
 
-#include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
index b5a2d1c20d..812ddc22a4 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
@@ -35,6 +35,8 @@
 
 #include "ColorPresetsDialogTableModel.h"
 
+#include <QtGui/QPixmap>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
index 15de9cbf72..edc29d3e15 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
@@ -36,9 +36,7 @@
 #pragma once
 
 #include <QtCore/QModelIndex>
-#include <QtCore/QScopedPointer>
 
-#include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/Dialogs/ColorPresets.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
index b9d5ade339..7ec4d650bf 100755
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.h b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
index 9c4b648361..b0fb45a6c0 100755
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.h
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index b8145c48bb..82ea443e4b 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -36,14 +36,10 @@
 #include "UpdateCheck.h"
 
 #include <QtCore/QDate>
-#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
-#include <QtCore/QSettings>
 #include <QtCore/QSysInfo>
 
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QWidget>
 
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
index b6a22c47a2..53cb8a5cdc 100755
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
@@ -37,10 +37,10 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
 
 #if defined (QT_CORE_LIB)
-#include <QtCore/QMetaType>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #endif
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
index 651ca23b3c..11f6005aec 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
@@ -38,17 +38,11 @@
 #include <iostream>
 
 #include <QtCore/QDate>
-#include <QtCore/QDir>
 #include <QtCore/QString>
-#include <QtCore/QStringList>
 
-#include <QtGui/QDesktopServices>
 
 #include <QtWidgets/QAction>
 
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
 
 #include "SVWidgetsLib/Dialogs/UpdateCheckData.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
index 03e24aa2e3..fc5fd16f26 100755
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
@@ -37,9 +37,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QDateTime>
-#include <QtCore/QSettings>
 #include <QtWidgets/QWidget>
-#include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 55c4535ac2..97afcb1dd7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -36,13 +36,11 @@
 #include "AbstractIOFileWidget.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QMetaProperty>
 #include <QtCore/QFileInfo>
 
 #include <QtGui/QPainter>
 #include <QtGui/QKeyEvent>
 
-#include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index 88c37986f4..ccd7192e47 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 
 #include <QtWidgets/QWidget>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index a7a0094341..f188d9102b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -35,14 +35,8 @@
 
 #include "AttributeMatrixCreationWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
-#include <QtGui/QStandardItemModel>
 
-#include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index d02ea19e03..050a1766d2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -37,9 +37,7 @@
 
 #include <QtCore/QSharedPointer>
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
-#include <QtGui/QKeyEvent>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index acd103196e..0dab130f4c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -35,14 +35,8 @@
 
 #include "AttributeMatrixSelectionWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
-#include <QtGui/QStandardItemModel>
 
-#include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index 437a77461a..d3a72ee47f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -37,7 +37,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index 9820d1c89e..700c1aec65 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "AxisAngleWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index 62f14ae5d0..b1f4bf2675 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index fb97f61909..339b824bab 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "BooleanWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
index 02ad35fe10..c8ea5581ce 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 176ba9b40f..c615431c68 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -35,9 +35,6 @@
 
 #include "CalculatorWidget.h"
 
-#include <QtCore/QMetaProperty>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include <QtWidgets/QMenu>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index 110f4a8ec6..9c5963f74d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -38,8 +38,6 @@
 
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index cd71600762..497d702278 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "ChoiceWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
index 9dc2a7824a..0eb1af2ced 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 159b6c9ccc..5e997875c6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "ComparisonSelectionAdvancedWidget.h"
 
-#include <QtWidgets/QMenu>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index 0279fc5001..d1a30f5490 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QSignalMapper>
 
 #include <QtWidgets/QWidget>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
index 784ac30263..4f281fa7f7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
@@ -43,7 +43,6 @@
 #include <QtGui/QPainter>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QLineEdit>
-#include <QtWidgets/QStyleOptionViewItemV4>
 
 #include "SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 51254a7a59..6136944953 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -35,9 +35,7 @@
 
 #include "ComparisonSelectionWidget.h"
 
-#include <QtCore/QSignalMapper>
 
-#include <QtWidgets/QMenu>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 4a7f8bee54..2678556f93 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -37,7 +37,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 
 #include <QtWidgets/QWidget>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index 2ed52a3937..a716843615 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "ConstrainedDoubleWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
index 7887dadecd..ce28d1b4fe 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index 72975ff245..f359bf2b56 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "ConstrainedIntWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
index e193d2074e..51d2130466 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
index 4cc7e63745..e9c6db9ce0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "CustomWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "FilterWidgetsLib/Widgets/moc_CustomWidget.cxx"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
index 48dd7b05e4..5cb8d9abeb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
@@ -38,7 +38,6 @@
 
 
 
-#include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 5db84f127f..2df2d32087 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -35,14 +35,8 @@
 
 #include "DataArrayCreationWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
-#include <QtGui/QStandardItemModel>
 
-#include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index 504a929784..d4bdc7745a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -37,9 +37,7 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
-#include <QtGui/QKeyEvent>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
index 7077916616..9e905feccf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
@@ -35,9 +35,6 @@
 
 #include "DataArrayInformationDisplayWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtWidgets/QListWidgetItem>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index 8376817e1d..ccf74fe64f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 6338d45f13..5c93d2517b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -35,16 +35,6 @@
 
 #include "DataArraySelectionWidget.h"
 
-#include <QtCore/QMimeData>
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
-#include <QtGui/QPainter>
-#include <QtGui/QStandardItemModel>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index 40b678e039..b66f7063dd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -37,10 +37,7 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
-#include <QtWidgets/QMenu>
-#include <QtGui/QShowEvent>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 5c0fca3825..358add76cc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -37,7 +37,6 @@
 
 #include <cassert>
 
-#include <QtCore/QMetaProperty>
 
 #include <QtGui/QBrush>
 #include <QtGui/QColor>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index 5064af9b59..12bd67208a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index 97b4ae821e..90ff99680a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -35,11 +35,8 @@
 
 #include "DataContainerCreationWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index 325b781930..0f11947855 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -38,10 +38,7 @@
 
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
-#include <QtGui/QKeyEvent>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index fe9e2b9c1b..b96bf288fb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -40,15 +40,10 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
-#include <QtCore/QMetaProperty>
 
-#include <QtCore/QItemSelectionModel>
 #include <QtGui/QStandardItemModel>
-#include <QtGui/QDesktopServices>
 #include <QtGui/QPainter>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QListWidget>
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 838b6f5343..946ce355af 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 475640888a..6ddedaad5d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -35,14 +35,8 @@
 
 #include "DataContainerSelectionWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
-#include <QtGui/QStandardItemModel>
 
-#include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index 5f815813c1..8e11a3987e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index 56cf69f6e4..c567545115 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "DoubleWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
index d7ceb12016..002e4b0476 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index 1b8b806e68..a21e660433 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "DynamicChoiceWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index f30b038d7a..ef907d1e70 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
index bf4786cee9..a4ce5d6377 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicTableItemDelegate.h"
-#include <QtGui/QIntValidator>
 #include <QtWidgets/QLineEdit>
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 6648444a16..efbd56cf98 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -34,10 +34,7 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DynamicTableWidget.h"
 
-#include <QtCore/QMetaProperty>
-#include <QtGui/QFontMetrics>
 #include <QtWidgets/QMessageBox>
-#include <QtWidgets/QScrollBar>
 
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index 2e4a15eb88..8e60e4153e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -35,8 +35,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 1127e75132..2757342d37 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -35,11 +35,7 @@
 
 #pragma once
 
-#include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtCore/QStringList>
-#include <QtCore/QUrl>
-#include <QtCore/QVector>
 #include <QtWidgets/QButtonGroup>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 85cef7ed06..529c5325f2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -37,13 +37,11 @@
 #include <QtCore/QPropertyAnimation>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>
-#include <QtCore/QDir>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QGraphicsOpacityEffect>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QLineEdit>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 204312abcc..e05b18f7ed 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 #include <QtCore/QPointer>
 
 #include <QtWidgets/QToolButton>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
index 4ac8dcc0d4..870129a575 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
@@ -35,7 +35,6 @@
 
 #include "FilterParameterWidgetsDialogs.h"
 
-#include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtWidgets/QMessageBox>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index aa82b47229..f773a0ba44 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -35,7 +35,6 @@
 
 #include "FloatVec2Widget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/FloatVec2FilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index df5ebf0996..a80c38dfa9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index a59fc00325..6581a62be5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -35,7 +35,6 @@
 
 #include "FloatVec3Widget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
index 27748623c2..eee4983168 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index 9c3f91ed56..9e06e15d5d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "FloatWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
index 375a4b11e4..0ccccf8575 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index 2530f3a69b..2e01b2ffb4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -35,8 +35,6 @@
 
 #include "FourthOrderPolynomialWidget.h"
 
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
index 1b8979a515..8cfa0e0f22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index 6fa9ba917c..5a9b611543 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 958f1c2f64..9310795d22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -1,4 +1,4 @@
-/* ============================================================================
+/* ============================================================================
  * Copyright (c) 2017 BlueQuartz Software, LLC
  * All rights reserved.
  *
@@ -34,29 +34,17 @@
 
 #include <cmath>
 
-#include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QMimeData>
-#include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtCore/QTimer>
 #include <QtCore/QUrl>
-#include <QtCore/QVariant>
 
-#include <QtGui/QCloseEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QPainter>
 
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QDockWidget>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QHeaderView>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QStatusBar>
 
 #include "H5Support/H5Lite.h"
 #include "H5Support/H5Utilities.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index 725dae7552..b35ceec71c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -32,7 +32,6 @@
 
 #pragma once
 
-#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index a381b79bc2..7cf704e1e5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "InputFileWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include <QtWidgets/QFileDialog>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
index b240e7e1a9..b5db472c66 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
@@ -36,7 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 9ea7a5d552..43e1318b72 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "InputPathWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include <QtWidgets/QFileDialog>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
index f9f8fb7660..be2d6e1296 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index c2513494d2..4108173a3b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -33,7 +33,6 @@
 
 #include "IntVec2Widget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
index 73d6ae9d4b..e67c08cef9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
@@ -33,8 +33,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index c8ac5b6ea9..10ca233742 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -35,7 +35,6 @@
 
 #include "IntVec3Widget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
index 728fa3c486..a82fff3ff5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
@@ -38,8 +38,6 @@
 
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 07f79c87f9..6a8b768fa7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "IntWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
index 78dd1ac8b7..2d4d223d83 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 0b0f9cd581..fde8540702 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "LinkedBooleanWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
index bc357250fb..ad45bf6cdb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 8aab92d12b..c344a611dd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -35,13 +35,9 @@
 
 #include "LinkedDataContainerSelectionWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
 #include <QtCore/QSignalMapper>
 
-#include <QtGui/QStandardItemModel>
 
-#include <QtWidgets/QListWidgetItem>
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index c321ab3166..7da12bdbd5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -33,10 +33,7 @@
 
 #include "LinkedPathCreationWidget.h"
 
-#include <QtCore/QMetaProperty>
 
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
index fd11fa61cb..bef7755ea1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtGui/QKeyEvent>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
index 7c2202ff53..8804a05bd5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
@@ -34,7 +34,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QPointer>
 #include <QtCore/QString>
 #include <QtWidgets/QWidget>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 743347c2f8..e464ab79c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -35,15 +35,10 @@
 #include "MultiAttributeMatrixSelectionWidget.h"
 
 #include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 #include <QtCore/QModelIndex>
 
-#include <QtGui/QStandardItemModel>
 
 #include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QStyledItemDelegate>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index e1baf71843..d3c6398b6d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -36,7 +36,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index b01d190def..6d900a67d6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -35,15 +35,10 @@
 #include "MultiDataArraySelectionWidget.h"
 
 #include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 #include <QtCore/QModelIndex>
 
-#include <QtGui/QStandardItemModel>
 
 #include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QStyledItemDelegate>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 2bb7aa4dc8..583bed6404 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -36,7 +36,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index fd4cd98b10..bbcde43f16 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -35,15 +35,10 @@
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 #include <QtCore/QModelIndex>
 
-#include <QtGui/QStandardItemModel>
 
 #include <QtWidgets/QListWidgetItem>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QStyledItemDelegate>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 6393c39f1d..3a20e690a9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -36,7 +36,6 @@
 
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index ad9d4e195d..51400f14a9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "NumericTypeWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
index df7c6e7129..f7a6a56b3c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
index 5378929b67..f24e8dfd94 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
@@ -36,7 +36,6 @@
 #include "OutputFileWidget.h"
 
 #include <QtCore/QDir>
-#include <QtCore/QMetaProperty>
 
 #include <QtWidgets/QFileDialog>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
index 1b137bf444..8333587974 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index 646c47f184..58cdcd48dc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "OutputPathWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include <QtWidgets/QFileDialog>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
index 003803810c..aa59775755 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index 15cf2d3158..03ae75a90d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -33,11 +33,8 @@
 
 #include "ParagraphWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include "FilterParameterWidgetsDialogs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
index dadc8bae13..ed76b0f10f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
@@ -33,9 +33,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtGui/QKeyEvent>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 9487eb777f..5e4395a4a5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -36,12 +36,9 @@
 #include "PhaseTypeSelectionWidget.h"
 
 #include <QtCore/QList>
-#include <QtCore/QMetaProperty>
 #include <QtCore/QSignalMapper>
 
 #include <QtWidgets/QComboBox>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMenu>
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index 5a3c71f430..8395ed5604 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index 40a48a2d30..08ff321094 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "PreflightUpdatedValueWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
index 321af8bd8c..58c23e9f9b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
@@ -37,8 +37,6 @@
 
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index b3ec1cd2ba..23767d1ef1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -35,11 +35,8 @@
 
 #include "RangeWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include "FilterParameterWidgetsDialogs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index 1444d7bb92..710675b6b4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -38,8 +38,6 @@
 
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
index a58dbf4656..ca312db8c8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
@@ -38,7 +38,6 @@
 
 #include <QtCore/QThread>
 
-#include <QtGui/QMovie>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index a9e88b9851..8134280a96 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "ScalarTypeWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
index a771452f6c..5701ec8b01 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index 0cb8ae3985..9912185671 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -35,8 +35,6 @@
 
 #include "SecondOrderPolynomialWidget.h"
 
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
index 76036bbb3d..b255bc9a43 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
index 89ae316d85..633309632d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
@@ -35,7 +35,6 @@
 
 #include "SeparatorWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
index 4dd18d9613..28f2f0967e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index 9cdff111d7..45605a9e42 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -35,8 +35,6 @@
 
 #include "ShapeTypeSelectionWidget.h"
 
-#include <QtCore/QList>
-#include <QtCore/QMetaProperty>
 
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QLabel>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
index bc9756c514..e145ba28d1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
@@ -35,8 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index 1a9d3c0116..4070a9321e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -35,11 +35,8 @@
 
 #include "StringWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 
 #include "FilterParameterWidgetsDialogs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
index 19ac8d086c..e218e137d7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
@@ -36,10 +36,7 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
-#include <QtGui/QKeyEvent>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index 7fba5f9e0d..cc8e3704ce 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -35,8 +35,6 @@
 
 #include "ThirdOrderPolynomialWidget.h"
 
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSignalMapper>
 
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
index e3720a05a1..533d800a01 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
@@ -36,8 +36,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 0276124d65..9f27657b9d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -33,7 +33,6 @@
 
 #include "UInt64Widget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SIMPLib/FilterParameters/UInt64FilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
index f0f4d4be00..931f8810eb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
@@ -34,8 +34,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
index a657372877..f94a81b34a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "UnknownWidget.h"
 
-#include <QtCore/QMetaProperty>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
index cb474cef4b..8d9b19207f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
@@ -35,8 +35,6 @@
 #pragma once
 
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
index eeceb9feec..61cccd1ca5 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
@@ -35,7 +35,6 @@
 
 #include "QtSBookmarkMissingDialog.h"
 
-#include <QtWidgets/QFileDialog>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
index 32508aa974..a1751307a0 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
@@ -38,20 +38,10 @@
 
 #include <iostream>
 
-#include <QtCore/QTimer>
 #include <QtCore/QPropertyAnimation>
 
-#include <QtGui/QPainter>
 
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QFormLayout>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
 
-#include <QtGui/QMouseEvent>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QPushButton>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
index 1d04876b9e..3f0089a17e 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 
 #include <QtWidgets/QWidget>
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
index af104d981f..113728a8e2 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
@@ -37,14 +37,12 @@
 
 #include <iostream>
 
+#include <QtCore/QDebug>
 #include <QtCore/QMimeData>
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 #include <QtGui/QDragEnterEvent>
-#include <QtGui/QDragLeaveEvent>
 #include <QtGui/QDragMoveEvent>
 #include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
index 26bcae1ce2..bda226d08d 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
@@ -35,17 +35,16 @@
 
 #include "QtSGraphicsView.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QMimeData>
 #include <QtCore/QUrl>
-#include <QtCore/QtDebug>
 
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragLeaveEvent>
 #include <QtGui/QDropEvent>
 #include <QtGui/QImageReader>
 #include <QtGui/QPixmap>
-#include <QtWidgets/QGraphicsPolygonItem>
 #include <QtWidgets/QWidget>
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
index ff540f5ce5..e6fc121673 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
@@ -41,7 +41,6 @@
 #include <QtCore/QVector>
 #include <QtWidgets/QGraphicsView>
 #include <QtWidgets/QGraphicsItem>
-#include <QtWidgets/QRubberBand>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
index 5ac045e1ff..2af8521560 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
@@ -40,6 +40,7 @@
 #include <QtGui/QDesktopServices>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMessageBox>
+#include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
index 54c1046248..3447922178 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
@@ -37,11 +37,10 @@
 #include <QtCore/QUrl>
 #include <QtCore/QString>
 
-#include <QtWidgets/QApplication>
-
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
+class QWidget;
+
 /**
  * @brief The QtSHelpUrlGenerator class generates a QUrl that contains a path to the specified help file
  */
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
index 7b46898c0f..23ef7d3f28 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
@@ -41,13 +41,8 @@
 //-- Qt Includes
 #include <QtCore/QPoint>
 #include <QtGui/QPixmap>
-#include <QtWidgets/QGraphicsItem>
-#include <QtWidgets/QGraphicsPixmapItem>
 #include <QtWidgets/QGraphicsScene>
 #include <QtWidgets/QGraphicsView>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QTableWidget>
 
 #define ZOOM_INDEX_MAX 9
 #define ZOOM_INDEX_MIN 0
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
index 8c15568af0..b4f4f01893 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
@@ -38,15 +38,12 @@
 #include <QtCore/QMimeData>
 #include <QtCore/QPropertyAnimation>
 #include <QtCore/QString>
-#include <QtGui/QMouseEvent>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QPainter>
 #include <QtWidgets/QAbstractButton>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QLabel>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QStyle>
 
 /**
  * @brief execMenuAtWidget
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
index 3c2de29c1a..390893168e 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
@@ -32,7 +32,6 @@
 #pragma once
 
 #include <QtWidgets/QAbstractButton>
-#include <QtWidgets/QLineEdit>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
index 2d20dc8935..738a11cc36 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -36,12 +36,10 @@
 
 #pragma once
 
-#include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtWidgets/QFrame>
 #include <QtCore/QSettings>
 #include <QtWidgets/QStatusBar>
-#include <QtGui/QIcon>
 #include <QtWidgets/QMessageBox>
 
 #include "SIMPLib/Messages/AbstractMessage.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
index 47bac9a387..02f28929d3 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
@@ -38,8 +38,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QSettings>
-#include <QtWidgets/QMenu>
 
 QtSRecentFileList* QtSRecentFileList::self = nullptr;
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
index 81de214390..927dfea418 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
@@ -39,11 +39,9 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
+#include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QSettings>
-#include <QtCore/QTextCodec>
-
-#include <QtWidgets/QTreeWidgetItemIterator>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.h b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
index e1c14a58a2..4239aa68c4 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
@@ -40,10 +40,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QVariant>
 #include <QtCore/QJsonObject>
-#include <QtCore/QJsonArray>
 #include <QtCore/QStack>
 
-#include <QtWidgets/QTreeWidget>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
index 2c5251db36..8e70f19688 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
@@ -36,7 +36,6 @@
 
 #include <QtGui/QPainter>
 
-#include <QtCore/QObject>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
index adfa08ffae..84dd8e6024 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtWidgets/QWidget>
-#include <QtGui/QKeyEvent>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
index 29cb1ae3af..fefa2d5e97 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
@@ -34,8 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "BookmarksItem.h"
 
-#include <QtCore/QStringList>
-#include <QtGui/QColor>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.h b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
index 74bcbe900e..003b491baf 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
@@ -36,8 +36,6 @@
 #pragma once
 
 #include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
 
 #include <QtGui/QIcon>
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
index 6b0d2abef7..88857e8fe2 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
@@ -33,11 +33,9 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QFileInfo>
 
 #include <QtWidgets/QLineEdit>
 
-#include <QtGui/QIntValidator>
 #include <QtGui/QPainter>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index a9700aff05..24c9cf4e3d 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -35,6 +35,7 @@
 
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 
+#include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index 5952a3f3f2..d2a39b14c3 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -37,16 +37,10 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
-#include <QtCore/QDirIterator>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QFileInfoList>
-#include <QtCore/QUrl>
 
-#include <QtWidgets/QAction>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QMenu>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QTreeWidgetItem>
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
index 1b92a775a6..7167318c8b 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
@@ -34,10 +34,8 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QFileInfo>
 #include <QtCore/QSettings>
 #include <QtCore/QString>
-#include <QtWidgets/QDockWidget>
 #include <QtWidgets/QTreeWidgetItem>
 
 #include "SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h"
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index 407e1ddd5d..607df690eb 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -45,7 +45,6 @@
 #include <QtGui/QDrag>
 #include <QtGui/QMouseEvent>
 
-#include <QtWidgets/QHeaderView>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
index 1a98568e7f..91162d63cb 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -36,9 +36,7 @@
 
 #pragma once
 
-#include <QtWidgets/QApplication>
 
-#include <QtCore/QJsonObject>
 
 #include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 7c084377c7..9062e77955 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -34,7 +34,8 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerArrayWidget.h"
 
-#include <QtCore/QMetaProperty>
+#include <QtGui/QStandardItem>
+#include <QtGui/QStandardItemModel>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
index 59b58afe02..95d7bfa51d 100755
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
@@ -1,13 +1,7 @@
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
 
 #include <QtWidgets/QWidget>
-#include <QtGui/QStandardItemModel>
-#include <QtCore/QItemSelectionModel>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
index 3bd893cee0..4fd7ec6ad6 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataStructureItem.h"
 
-#include <QtCore/QStringList>
 #include <QtGui/QColor>
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index 7a3c8d3793..c6715d2442 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -33,16 +33,11 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtWidgets/QApplication>
-#include <QtCore/QFileInfo>
 
-#include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QLineEdit>
 
-#include <QtGui/QIntValidator>
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
-#include <QtGui/QStaticText>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index 32c117ef8b..e267d412f8 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -38,7 +38,6 @@
 
 #include <QtCore/QModelIndex>
 #include <QtCore/QVariant>
-#include <QtCore/QFileSystemWatcher>
 #include <QtGui/QStandardItemModel>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 5f40729dcf..337fec8864 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -38,18 +38,11 @@
 
 #include <iostream>
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
 #include <QtCore/QMimeData>
-#include <QtCore/QSortFilterProxyModel>
 #include <QtGui/QDrag>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QStandardItemModel>
 #include <QtWidgets/QApplication>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMessageBox>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index 672e5ef173..1d6dfc588b 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -36,16 +36,13 @@
 
 #pragma once
 
-#include <QtWidgets/QApplication>
 
-#include <QtCore/QJsonObject>
 
 #include <QtCore/QModelIndex>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragMoveEvent>
 #include <QtGui/QDropEvent>
 #include <QtGui/QMouseEvent>
-#include <QtWidgets/QMenu>
 #include <QtWidgets/QTreeView>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index 6a8b8d83d0..bef67c3ff7 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -37,10 +37,7 @@
 #include "DataStructureWidget.h"
 
 
-#include <QtCore/QMetaProperty>
-#include <QtCore/QItemSelectionModel>
 #include <QtGui/QStandardItemModel>
-#include <QtWidgets/QHeaderView>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index a366f8677e..ae5cba2eb6 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -35,10 +35,7 @@
 
 #pragma once
 
-#include <QtCore/QUuid>
-#include <QtGui/QBrush>
 #include <QtGui/QIcon>
-#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Common/IObserver.h"
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 2d96b6c647..8c66658416 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -37,14 +37,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QSequentialAnimationGroup>
 #include <QtWidgets/QFileDialog>
-#include <QtWidgets/QFormLayout>
 #include <QtWidgets/QGroupBox>
 #include <QtWidgets/QLabel>
-#include <QtWidgets/QLineEdit>
 #include <QtWidgets/QVBoxLayout>
 
 #include "SIMPLib/Common/DocRequestManager.h"
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index 71df7ba071..0adba9ddf7 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -36,7 +36,6 @@
 
 #include <QtCore/QFileInfo>
 
-#include <QtWidgets/QMainWindow>
 
 #include "SIMPLib/Common/DocRequestManager.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
index ddd2e84c20..7c2209988e 100755
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
@@ -36,7 +36,6 @@
 #pragma once
 
 
-#include <QtWidgets/QDockWidget>
 #include <QtWidgets/QMenu>
 
 #include <QtCore/QSignalMapper>
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
index b882eeb347..e30f7e92b8 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
@@ -34,8 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterListItem.h"
 
-#include <QtCore/QStringList>
-#include <QtGui/QColor>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.h b/Source/SVWidgetsLib/Widgets/FilterListItem.h
index 10ee63840a..0c8a571b41 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.h
@@ -36,8 +36,6 @@
 #pragma once
 
 #include <QtCore/QList>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
 
 #include <QtGui/QIcon>
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
index 957f2f8081..8c5f454bf3 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
@@ -35,11 +35,9 @@
 #include "FilterListToolboxWidget.h"
 
 #include <QtCore/QBitArray>
-#include <QtCore/QFileInfo>
 #include <QtCore/QMapIterator>
+#include <QtGui/QKeyEvent>
 #include <QtGui/QPainter>
-#include <QtWidgets/QMainWindow>
-#include <QtWidgets/QTreeWidgetItem>
 
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
index 89f59562f4..1fa24cc9c4 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -41,7 +41,6 @@
 #include <QtCore/QSignalMapper>
 #include <QtCore/QList>
 
-#include <QtGui/QKeyEvent>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.h b/Source/SVWidgetsLib/Widgets/FilterListView.h
index 043bc36efc..b51e164ad7 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListView.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QJsonObject>
 
 #include <QtWidgets/QTreeView>
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 8782b91b21..c8301da57e 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -37,8 +37,8 @@
 
 #include <QtCore/QSignalMapper>
 
-#include <QtWidgets/QMenu>
 #include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QMenu>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Utilities/StringOperations.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index bbdb7272b4..0887e3a5a5 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -36,8 +36,7 @@
 
 #pragma once
 
-#include <QtWidgets/QWizardPage>
-#include <QtWidgets/QButtonGroup>
+#include <QtCore/QPointer>
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
index f24dd7b14e..aa80b1ad98 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <QtWidgets/QWizardPage>
 
 #include "AbstractWizardPage.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
index 2c20df5ada..24b713a51b 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
@@ -36,7 +36,6 @@
 #include "LineCounterObject.h"
 
 #include <QtCore/QFile>
-#include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLibTypes.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
index 450402704b..31b23431e8 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
@@ -35,7 +35,6 @@
 
 #include "TupleSelectionPage.h"
 
-#include <QtCore/QFile>
 
 #include "SIMPLib/Common/Constants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
index 7fc9d29927..5b085507df 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
@@ -36,7 +36,6 @@
 
 #pragma once
 
-#include <QtWidgets/QWizardPage>
 
 #include "AbstractWizardPage.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
index 5e1c736606..bbbf3601cc 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TupleTableItemDelegate.h"
-#include <QtGui/QIntValidator>
 #include <QtWidgets/QLineEdit>
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
index c852414537..9250201242 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
@@ -34,9 +34,7 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "TupleTableWidget.h"
 
-#include <QtCore/QMetaProperty>
 
-#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QTableWidgetItem>
 
 #include "TupleTableItemDelegate.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
index 6787de4fa4..2c8d0a97ae 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
@@ -34,8 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
 #include <QtWidgets/QWidget>
 
 #include "ui_TupleTableWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
index 08de98fd38..0ea11e91e4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
@@ -30,8 +30,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtGui/QIcon>
-#include <QtGui/QPixmap>
 
 #include "H5Support/H5Utilities.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
index d07d05a719..42ca9c9adc 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
@@ -32,7 +32,6 @@
 
 #include "ImportHDF5TreeModelItem.h"
 
-#include <QtCore/QStringList>
 
 #include "H5Support/H5Utilities.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 1d2f7617e6..5c701388db 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -37,8 +37,6 @@
 
 #include <iostream>
 
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QTableWidgetItem>
 
 #include "SIMPLib/Common/DocRequestManager.h"
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
index cb224a886e..9f9ef7318b 100755
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtWidgets/QWidget>
-#include <QtWidgets/QMainWindow>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/IObserver.h"
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index 1d822b508d..865ce57420 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -31,8 +31,6 @@
 
 #include "PipelineItem.h"
 
-#include <QtCore/QStringList>
-#include <QtGui/QColor>
 
 #include "SVWidgetsLib/Widgets/FilterInputWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
index 6d66aa4f2f..6eecac2336 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
@@ -29,15 +29,11 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QFileInfo>
 
-#include <QtWidgets/QLineEdit>
 
-#include <QtGui/QIntValidator>
 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
 
-#include <QtWidgets/QStylePainter>
 
 #include "SVWidgetsLib/Widgets/PipelineItem.h"
 #include "SVWidgetsLib/Widgets/PipelineItemDelegate.h"
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
index 5ca498c376..37a80f0ca2 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
@@ -32,8 +32,6 @@
 #pragma once
 
 #include <QtCore/QModelIndex>
-#include <QtCore/QTimer>
-#include <QtCore/QVariantAnimation>
 
 #include <QtWidgets/QStyledItemDelegate>
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.h b/Source/SVWidgetsLib/Widgets/PipelineModel.h
index fe311f668e..647402eeac 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.h
@@ -35,7 +35,6 @@
 #include <QtCore/QModelIndex>
 #include <QtCore/QVariant>
 
-#include <QtWidgets/QAction>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.cpp b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
index 1ed1b63c85..ad5025461f 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
@@ -37,7 +37,6 @@
 
 #include <QtWidgets/QUndoStack>
 #include <QtWidgets/QUndoCommand>
-#include <QtWidgets/QWidget>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
index 31188ca552..7b49443ccf 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
@@ -33,9 +33,6 @@
 
 #include <QtGui/QPainter>
 
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QScrollArea>
-#include <QtWidgets/QGridLayout>
 
 #include "moc_PopUpWidget.cpp"
 
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 61688c7d8c..3551ea3a20 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -37,14 +37,10 @@
 #include <iostream>
 #include <utility>
 
-#include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QMimeData>
-#include <QtCore/QSharedPointer>
-#include <QtCore/QSignalMapper>
-#include <QtCore/QTemporaryFile>
 #include <QtCore/QThread>
 #include <QtCore/QUrl>
 
@@ -55,16 +51,11 @@
 #include <QtGui/QDragMoveEvent>
 #include <QtGui/QDropEvent>
 #include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 #include <QtGui/QPixmap>
 
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QLabel>
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMessageBox>
-#include <QtWidgets/QProgressDialog>
-#include <QtWidgets/QScrollArea>
-#include <QtWidgets/QScrollBar>
-#include <QtWidgets/QVBoxLayout>
 
 #include "SIMPLib/Common/DocRequestManager.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index b32878fdf9..15e60e26be 100755
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -38,15 +38,9 @@
 #include <stack>
 #include <vector>
 
-#include <QtCore/QSharedPointer>
 
-#include <QtGui/QPainter>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QListView>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QTableWidget>
-#include <QtWidgets/QTextEdit>
-#include <QtWidgets/QVBoxLayout>
 
 #include "SIMPLib/Common/Observer.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index dc2cea3fad..de09ab20d2 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -46,7 +46,6 @@
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QLineEdit>
-#include <QtWidgets/QPushButton>
 
 #include "SIMPLib/Common/Constants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index 379c176450..ff760da81c 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <QtCore/QObject>
-#include <QtCore/QSet>
 #include <QtCore/QString>
 
 #include <QtGui/QFont>
diff --git a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
index 3979f736c2..17dbbb6719 100755
--- a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
@@ -35,11 +35,8 @@
 
 #include "SVUserManualDialog.h"
 
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
 
 #include <QtWidgets/QAction>
-#include <QtWidgets/QMessageBox>
 
 #include <QtWebEngineWidgets/QWebEngineHistory>
 
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
index 417568a0dc..9fc3466b5f 100755
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Common/IObserver.h"
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.h b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
index ba65e6f3e8..bd3f218dfa 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QtCore/QObject>
 #include <QtWidgets/QToolButton>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
index 1499d14575..62975c19ed 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
@@ -3,7 +3,6 @@
 
 #include <QtCore/QDebug>
 #include <QtGui/QPainter>
-#include <QtGui/QMouseEvent>
 #include <QtWidgets/QStyleOption>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
index 2497720f03..c11f55d455 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <QtCore/QObject>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/StatusBarButton.h"
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
index 489b3d33ce..e4ad10e51d 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QDebug>
 
 #include <QtWidgets/QDockWidget>
-#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QMenu>
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
index a8bef8fdb7..9d1d3ff6db 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
@@ -35,9 +35,6 @@
 
 #include "AddFilterCommand.h"
 
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonParseError>
 #include <QtCore/QObject>
 
 #include "SIMPLib/CoreFilters/Breakpoint.h"
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
index bf1a1f9d57..ab25e189c3 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
@@ -37,7 +37,6 @@
 
 #include <vector>
 
-#include <QtCore/QModelIndex>
 
 #include <QtWidgets/QUndoCommand>
 
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
index 3cb3333a65..6388505468 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <QtCore/QVariant>
 
 #include <QtWidgets/QUndoCommand>
 
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
index 88b7d07b84..bd8e3902a1 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
@@ -37,9 +37,6 @@
 
 #include <vector>
 
-#include <QtCore/QModelIndex>
-#include <QtCore/QUuid>
-#include <QtCore/QVariant>
 
 #include <QtWidgets/QUndoCommand>
 

From 83f540f2afdf5917be784cf3086abaf728d56d8b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 10 Jun 2019 11:41:12 -0400
Subject: [PATCH 121/397] Fixes issue where the red background was not clearing
 when fixed by user. (#357)

updates #356

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidget.h                   | 31 +++++-----
 .../FloatVec2Widget.cpp                       | 52 ++++++++++------
 .../FilterParameterWidgets/FloatVec2Widget.h  |  7 ++-
 .../FloatVec3Widget.cpp                       | 59 ++++++++++++-------
 .../FilterParameterWidgets/FloatVec3Widget.h  | 16 +++--
 .../UI_Files/FloatVec3Widget.ui               |  2 +-
 6 files changed, 103 insertions(+), 64 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index e05b18f7ed..aede0f0a71 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -197,21 +197,18 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
     errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());\
     errorLabel->show();\
   }\
-}\
-
-
-
-#define FOPW_EXTRACT_VALUE(cell)\
-  data.cell = loc.toFloat(cell->text(), &ok);\
-  if(!ok)\
-  {\
-    if(errorLabel) {\
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);\
-    errorLabel->setText("Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());\
-    errorLabel->show();\
-    }\
-    SVStyle::Instance()->LineEditErrorStyle(cell);\
-    data.cell = defValue.cell;\
-  }\
-
+}
 
+#define FOPW_EXTRACT_VALUE(cell)                                                                                                                                                                       \
+  data.cell = loc.toFloat(cell->text(), &ok);                                                                                                                                                          \
+  if(!ok)                                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    if(errorLabel)                                                                                                                                                                                     \
+    {                                                                                                                                                                                                  \
+      SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);                                                                                                                                        \
+      errorLabel->setText("Value entered is beyond the representable range for the value type.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());      \
+      errorLabel->show();                                                                                                                                                                              \
+    }                                                                                                                                                                                                  \
+    SVStyle::Instance()->LineEditErrorStyle(cell);                                                                                                                                                     \
+    data.cell = defValue.cell;                                                                                                                                                                         \
+  }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index f773a0ba44..09b2cb6cfb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -76,8 +76,8 @@ void FloatVec2Widget::setupGui()
   // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
 
-  connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
-  connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
+  connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(xDataChanged(const QString&)));
+  connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(yDataChanged(const QString&)));
 
   QLocale loc = QLocale::system();
 
@@ -104,27 +104,39 @@ void FloatVec2Widget::setupGui()
 }
 
 // -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FloatVec2Widget::widgetChanged(const QString& text)
+void FloatVec2Widget::xDataChanged(const QString& value)
 {
-  Q_UNUSED(text);
+  widgetChanged(xData, value);
+}
 
-  QLineEdit* le = nullptr;
-  (sender() == xData) ? le = xData : le = nullptr;
-  (sender() == yData) ? le = yData : le = nullptr;
+// -----------------------------------------------------------------------------
+void FloatVec2Widget::yDataChanged(const QString& value)
+{
+  widgetChanged(yData, value);
+}
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FloatVec2Widget::widgetChanged(QLineEdit* le, const QString& msg)
+{
+  Q_UNUSED(msg);
+  if(nullptr == le)
+  {
+    return;
+  }
   errorLabel->hide();
 
-  if(le != nullptr)
+  if(le->text().isEmpty())
+  {
+    SVStyle::Instance()->LineEditBackgroundErrorStyle(le);
+    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
+    errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
+    errorLabel->show();
+  }
+  else
   {
-    if(le->text().isEmpty())
-    {
-      SVStyle::Instance()->LineEditErrorStyle(le);
-      SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
-      errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
-      errorLabel->show();
-    }
+    SVStyle::Instance()->LineEditClearStyle(le);
   }
 
   emit parametersChanged();
@@ -145,7 +157,8 @@ void FloatVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(xData);
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);    errorLabel->setText("X Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
+    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
+    errorLabel->setText("X Value entered is beyond the representable range for a float.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
     data[0] = defValue[0];
   }
@@ -154,7 +167,8 @@ void FloatVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(yData);
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);    errorLabel->setText("Y Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
+    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
+    errorLabel->setText("Y Value entered is beyond the representable range for a float.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
     data[1] = defValue[1];
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index a80c38dfa9..964718afdf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -76,11 +76,16 @@ class SVWidgetsLib_EXPORT FloatVec2Widget : public FilterParameterWidget, privat
     void setupGui() override;
 
   public slots:
-    void widgetChanged(const QString& msg);
     void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
     void beforePreflight(); // Called just before the "dataCheck()" is called
     void afterPreflight(); // Called just after the dataCheck() is called.
 
+    void xDataChanged(const QString& value);
+    void yDataChanged(const QString& value);
+
+  protected:
+    void widgetChanged(QLineEdit* le, const QString& msg);
+
   private:
     FloatVec2FilterParameter* m_FilterParameter;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index 6581a62be5..e6e6f623f5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -76,9 +76,9 @@ void FloatVec3Widget::setupGui()
   // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
 
-  connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
-  connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
-  connect(zData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
+  connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(xDataChanged(const QString&)));
+  connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(yDataChanged(const QString&)));
+  connect(zData, SIGNAL(textChanged(const QString&)), this, SLOT(zDataChanged(const QString&)));
 
   QLocale loc = QLocale::system();
 
@@ -108,28 +108,45 @@ void FloatVec3Widget::setupGui()
 }
 
 // -----------------------------------------------------------------------------
-//
+void FloatVec3Widget::xDataChanged(const QString& value)
+{
+  widgetChanged(xData, value);
+}
+
 // -----------------------------------------------------------------------------
-void FloatVec3Widget::widgetChanged(const QString& text)
+void FloatVec3Widget::yDataChanged(const QString& value)
 {
-  Q_UNUSED(text);
+  widgetChanged(yData, value);
+}
 
-  QLineEdit* le = nullptr;
-  (sender() == xData) ? le = xData : le = nullptr;
-  (sender() == yData) ? le = yData : le = nullptr;
-  (sender() == zData) ? le = zData : le = nullptr;
+// -----------------------------------------------------------------------------
+void FloatVec3Widget::zDataChanged(const QString& value)
+{
+  widgetChanged(zData, value);
+}
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FloatVec3Widget::widgetChanged(QLineEdit* le, const QString& msg)
+{
+  Q_UNUSED(msg);
+  if(nullptr == le)
+  {
+    return;
+  }
   errorLabel->hide();
 
-  if(le != nullptr)
+  if(le->text().isEmpty())
   {
-    if(le->text().isEmpty())
-    {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(le);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
-      errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
-      errorLabel->show();
-    }
+    errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
+    errorLabel->show();
+  }
+  else
+  {
+    SVStyle::Instance()->LineEditClearStyle(le);
   }
 
   emit parametersChanged();
@@ -150,8 +167,8 @@ void FloatVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(xData);
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);  
-    errorLabel->setText("X Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
+    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
+    errorLabel->setText("X Value entered is beyond the representable range for a float.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
     data[0] = defValue[0];
   }
@@ -160,8 +177,8 @@ void FloatVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
   if(!ok)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(yData);
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);  
-    errorLabel->setText("Y Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
+    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
+    errorLabel->setText("Y Value entered is beyond the representable range for a float.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
     data[1] = defValue[1];
   }
@@ -171,7 +188,7 @@ void FloatVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
   {
     SVStyle::Instance()->LineEditBackgroundErrorStyle(zData);
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
-    errorLabel->setText("Z Value entered is beyond the representable range for a double.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
+    errorLabel->setText("Z Value entered is beyond the representable range for a float.\nThe filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
     data[2] = defValue[2];
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
index eee4983168..1a1c0b0c21 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
@@ -38,17 +38,17 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
-
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_FloatVec3Widget.h"
 
+class QLineEdit;
 
 /**
 * @brief
@@ -76,10 +76,16 @@ class SVWidgetsLib_EXPORT FloatVec3Widget : public FilterParameterWidget, privat
     void setupGui() override;
 
   public slots:
-    void widgetChanged(const QString& msg);
     void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
     void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
+    void afterPreflight();  // Called just after the dataCheck() is called.
+
+    void xDataChanged(const QString& value);
+    void yDataChanged(const QString& value);
+    void zDataChanged(const QString& value);
+
+  protected:
+    void widgetChanged(QLineEdit* le, const QString& msg);
 
   private:
     FloatVec3FilterParameter* m_FilterParameter;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/FloatVec3Widget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/FloatVec3Widget.ui
index 8464c73c2a..5be9930899 100755
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/FloatVec3Widget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/FloatVec3Widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>566</width>
-    <height>53</height>
+    <height>25</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">

From d1f1853c51f75d262e6b31100137c7a77256bc2a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 10 Jun 2019 11:58:02 -0400
Subject: [PATCH 122/397] Fix capitalization issue in QtCore/QDateTime include
 directive.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/REST/SIMPLDirectoryListing.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
index 3c6053de1a..559256832f 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
@@ -35,7 +35,7 @@
 
 #include "SIMPLDirectoryListing.h"
 
-#include <QtCore/QDateTIme>
+#include <QtCore/QDateTime>
 #include <QtCore/QFileInfoList>
 #include <QtCore/QTextStream>
 

From f4d58b03a0e3e180e530b2435ce26551ac8bb5db Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 11 Jun 2019 17:19:51 -0400
Subject: [PATCH 123/397] Various small code changes and cleanups to allow
 deeper refactoring (#359)

* Add to .gitignore
* Add class qualification onto use of class enum
* Add class qualification onto use of class enum
* Breaking up some test filters into their own files
* Breaking up RadialDistributionFunction source files into discrete files for each class
* Breaking up TestFilters into separate files
* Fixing issues with TransformContainer when macro is broken up
* Adding qualifier to alias type
* Adding qualification to use of class enum
* Adding qualification to use of class struct
* AbstractErrorMessage: Moving implementation into a .cpp file.
* Break up files into header and implementation files
* Add missing source file to CMake files to compile it.
* Break apart ITransformContainer
* Qualify the use of the class enumeration
* Remove override of pure virtual methods. Add newline to and of source file
* Remove pure virtual subclasses and update TYPE_MACRO to eliminate clang-tidy warning


Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .gitignore                                    |   1 +
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |   2 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |   2 +-
 .../FilterParameters/FilterParameter.h        |   2 +-
 Source/SIMPLib/Geometry/IGeometry.h           |   2 +-
 .../SIMPLib/Geometry/ITransformContainer.cpp  |  37 ++++
 Source/SIMPLib/Geometry/ITransformContainer.h |  13 +-
 Source/SIMPLib/Geometry/SourceList.cmake      |   1 +
 Source/SIMPLib/Geometry/TransformContainer.h  |  26 +--
 .../Math/RadialDistributionFunction.cpp       | 133 --------------
 .../SIMPLib/Math/RadialDistributionFunction.h |  54 ------
 Source/SIMPLib/Math/RdfData.cpp               | 169 ++++++++++++++++++
 Source/SIMPLib/Math/RdfData.h                 |  93 ++++++++++
 Source/SIMPLib/Math/SourceList.cmake          |   2 +
 .../SIMPLib/Messages/AbstractErrorMessage.cpp |  44 +++++
 .../SIMPLib/Messages/AbstractErrorMessage.h   |  36 +---
 .../Messages/AbstractProgressMessage.cpp      |  43 +++++
 .../Messages/AbstractProgressMessage.h        |  34 +---
 .../Messages/AbstractStatusMessage.cpp        |  42 +++++
 .../SIMPLib/Messages/AbstractStatusMessage.h  |  34 +---
 .../Messages/AbstractWarningMessage.cpp       |  43 +++++
 .../SIMPLib/Messages/AbstractWarningMessage.h |  31 +---
 Source/SIMPLib/Messages/SourceList.cmake      |   4 +
 .../SIMPLib/StatsData/PrecipitateStatsData.h  |   2 +
 Source/SIMPLib/TestFilters/Filt0.cpp          | 103 +++++++++++
 .../TestFilters/{TestFilters.h => Filt0.h}    |  93 ----------
 .../{TestFilters.cpp => Filt1.cpp}            |  96 +---------
 Source/SIMPLib/TestFilters/Filt1.h            | 106 +++++++++++
 Source/SIMPLib/TestFilters/SourceList.cmake   |   3 +-
 .../Utilities/SIMPLH5DataReaderRequirements.h |   4 +-
 .../ComparisonSelectionWidget.h               |   2 +-
 Source/SVWidgetsLib/Widgets/BookmarksItem.h   |   2 +-
 Source/SVWidgetsLib/Widgets/FilterListItem.h  |   2 +-
 .../Widgets/PipelineFilterMimeData.h          |   5 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.h    |  10 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   2 +-
 36 files changed, 758 insertions(+), 520 deletions(-)
 create mode 100644 Source/SIMPLib/Geometry/ITransformContainer.cpp
 create mode 100644 Source/SIMPLib/Math/RdfData.cpp
 create mode 100644 Source/SIMPLib/Math/RdfData.h
 create mode 100644 Source/SIMPLib/Messages/AbstractErrorMessage.cpp
 create mode 100644 Source/SIMPLib/Messages/AbstractProgressMessage.cpp
 create mode 100644 Source/SIMPLib/Messages/AbstractStatusMessage.cpp
 create mode 100644 Source/SIMPLib/Messages/AbstractWarningMessage.cpp
 create mode 100644 Source/SIMPLib/TestFilters/Filt0.cpp
 rename Source/SIMPLib/TestFilters/{TestFilters.h => Filt0.h} (53%)
 rename Source/SIMPLib/TestFilters/{TestFilters.cpp => Filt1.cpp} (51%)
 create mode 100644 Source/SIMPLib/TestFilters/Filt1.h

diff --git a/.gitignore b/.gitignore
index 9a2ece8b74..65f085a816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ CMakeLists.txt.*
 /Build-ninja/
 /Build-Xcode/
 /zRel/
+/Release/
 /CleanBuild/
 .cproject
 .project
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 8e8f97fe60..9688060ba5 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
     SIMPL_FILTER_PARAMETER(DataArrayPath, CalculatedArray)
     Q_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
 
-    SIMPL_FILTER_PARAMETER(AngleUnits, Units)
+    SIMPL_FILTER_PARAMETER(ArrayCalculator::AngleUnits, Units)
     Q_PROPERTY(AngleUnits Units READ getUnits WRITE setUnits)
 
     SIMPL_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 32d917c9ba..511651f05a 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   SIMPL_FILTER_PARAMETER(QString, HDF5FilePath)
   Q_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
 
-  SIMPL_FILTER_PARAMETER(QList<DatasetImportInfo>, DatasetImportInfoList)
+  SIMPL_FILTER_PARAMETER(QList<ImportHDF5Dataset::DatasetImportInfo>, DatasetImportInfoList)
   Q_PROPERTY(QList<DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
 
   QString getHDF5Dimensions();
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 09b000ef24..d0da3ec272 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -83,7 +83,7 @@ class SIMPLib_EXPORT FilterParameter
     virtual QString getWidgetType() const = 0;
 
     SIMPL_VIRTUAL_INSTANCE_PROPERTY(QVariant, DefaultValue)
-    SIMPL_INSTANCE_PROPERTY(Category, Category)
+    SIMPL_INSTANCE_PROPERTY(FilterParameter::Category, Category)
     SIMPL_INSTANCE_PROPERTY(bool, ReadOnly)
     SIMPL_INSTANCE_PROPERTY(int, GroupIndex)
 
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 6eef08a4ef..ed39c5711d 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -209,7 +209,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
     SIMPL_INSTANCE_PROPERTY(float, TimeValue)
     SIMPL_INSTANCE_PROPERTY(bool, EnableTimeSeries)
     SIMPL_INSTANCE_PROPERTY(ITransformContainer::Pointer, TransformContainer)
-    SIMPL_INSTANCE_PROPERTY(LengthUnit, Units)
+    SIMPL_INSTANCE_PROPERTY(IGeometry::LengthUnit, Units)
 
     // -----------------------------------------------------------------------------
     // Connectivity
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.cpp b/Source/SIMPLib/Geometry/ITransformContainer.cpp
new file mode 100644
index 0000000000..5c42d0c530
--- /dev/null
+++ b/Source/SIMPLib/Geometry/ITransformContainer.cpp
@@ -0,0 +1,37 @@
+/* ============================================================================
+* Copyright (c) 2009-2018 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-15-D-5231
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "ITransformContainer.h"
+
+ITransformContainer::ITransformContainer() = default;
+
+ITransformContainer::~ITransformContainer() = default;
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index e974813db4..c5968824a4 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -42,7 +42,18 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
 public:
   SIMPL_SHARED_POINTERS(ITransformContainer)
   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ITransformContainer, Observable)
+  
+  ITransformContainer();
+  ~ITransformContainer() override;
+
   virtual int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) = 0;
   virtual int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
-  ~ITransformContainer() override = default;
+
+  
+public:
+  ITransformContainer(const ITransformContainer&) = delete; // Copy Constructor Not Implemented
+  ITransformContainer(ITransformContainer&&) = delete;      // Move Constructor Not Implemented
+  ITransformContainer& operator=(const ITransformContainer&) = delete; // Copy Assignment Not Implemented
+  ITransformContainer& operator=(ITransformContainer&&) = delete;      // Move Assignment Not Implemented
+
 };
diff --git a/Source/SIMPLib/Geometry/SourceList.cmake b/Source/SIMPLib/Geometry/SourceList.cmake
index 83bb18f8ff..e2a06c9459 100755
--- a/Source/SIMPLib/Geometry/SourceList.cmake
+++ b/Source/SIMPLib/Geometry/SourceList.cmake
@@ -39,6 +39,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/Geometry/IGeometry3D.cpp
   ${SIMPLib_SOURCE_DIR}/Geometry/IGeometryGrid.cpp
   ${SIMPLib_SOURCE_DIR}/Geometry/ImageGeom.cpp
+  ${SIMPLib_SOURCE_DIR}/Geometry/ITransformContainer.cpp
   ${SIMPLib_SOURCE_DIR}/Geometry/QuadGeom.cpp
   ${SIMPLib_SOURCE_DIR}/Geometry/RectGridGeom.cpp
   ${SIMPLib_SOURCE_DIR}/Geometry/ShapeOps/CubeOctohedronOps.cpp
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index 635b546ead..ab76eb6cca 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -41,21 +41,27 @@
 class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 {
 public:
-  typedef double ParametersValueType;
-  typedef std::vector<ParametersValueType> TransformParametersType;
-  typedef std::vector<ParametersValueType> TransformFixedParametersType;
+
+  using ParametersValueType = double;
+  using TransformParametersType = std::vector<ParametersValueType>;
+  using TransformFixedParametersType = std::vector<ParametersValueType>;
+
+  TransformContainer();
+  ~TransformContainer() override;
+
   SIMPL_SHARED_POINTERS(TransformContainer)
   SIMPL_STATIC_NEW_MACRO(TransformContainer)
   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TransformContainer, ITransformContainer)
-  TransformContainer();
-  ~TransformContainer() override;
-  TransformContainer& operator=(const TransformContainer&);
-  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
-  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
 
-  SIMPL_INSTANCE_PROPERTY(TransformParametersType, Parameters)
-  SIMPL_INSTANCE_PROPERTY(TransformFixedParametersType, FixedParameters)
+  SIMPL_INSTANCE_PROPERTY(TransformContainer::TransformParametersType, Parameters)
+  SIMPL_INSTANCE_PROPERTY(TransformContainer::TransformFixedParametersType, FixedParameters)
   SIMPL_INSTANCE_PROPERTY(std::string, TransformTypeAsString)
   SIMPL_INSTANCE_PROPERTY(std::string, MovingName)
   SIMPL_INSTANCE_PROPERTY(std::string, ReferenceName)
+
+  TransformContainer& operator=(const TransformContainer&);
+
+  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
+  
+  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
 };
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.cpp b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
index f6aa943367..e191b19bf0 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.cpp
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
@@ -37,140 +37,7 @@
 
 #include <cmath>
 
-#include <fstream>
-#include <iostream>
-
 #include "SIMPLib/Math/SIMPLibRandom.h"
-#include "SIMPLib/StatsData/StatsData.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-RdfData::RdfData()
-: m_MinDistance(0.0f)
-, m_MaxDistance(0.0f)
-, m_NumberOfBins(50)
-, m_DistributionType(SIMPL::StringConstants::UnknownDistribution)
-{
-  m_BoxResolution[0] = 0.1f;
-  m_BoxResolution[1] = 0.1f;
-  m_BoxResolution[2] = 0.1f;
-  m_BoxSize[0] = 100;
-  m_BoxSize[1] = 100;
-  m_BoxSize[2] = 100;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-RdfData::~RdfData() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int RdfData::getFrequencyCount()
-{
-  return m_Frequencies.size();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-RdfData::Pointer RdfData::deepCopy()
-{
-  RdfData::Pointer ptr = RdfData::New();
-  ptr->setFrequencies(getFrequencies());
-  ptr->setMinDistance(getMinDistance());
-  ptr->setMaxDistance(getMaxDistance());
-  ptr->setDistributionType(getDistributionType());
-  float temp[3] = {0.0f, 0.0f, 0.0f};
-  getBoxSize(temp);
-  ptr->setBoxSize(temp);
-  getBoxResolution(temp);
-  ptr->setBoxResolution(temp);
-  return ptr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int RdfData::readJson(const QJsonObject& json)
-{
-  int err = 0;
-  float boxDims[3] = {0.0f, 0.0f, 0.0f};
-
-  QJsonObject rdfJson = json[SIMPL::StringConstants::RadialDistFunc].toObject();
-
-  QJsonValue jsonValue = rdfJson[SIMPL::StringConstants::RdfMinDistance];
-  if(!jsonValue.isUndefined() && jsonValue.isDouble())
-  {
-    setMinDistance(static_cast<float>(jsonValue.toDouble(0.0)));
-  }
-  jsonValue = rdfJson[SIMPL::StringConstants::RdfMaxDistance];
-  if(!jsonValue.isUndefined() && jsonValue.isDouble())
-  {
-    setMaxDistance(static_cast<float>(jsonValue.toDouble(0.0)));
-  }
-
-  if(StatsData::ParseFloat3Vec(rdfJson, SIMPL::StringConstants::RdfBoxDims, boxDims, 0.0) == 0)
-  {
-    // Throw warning
-  }
-  setBoxSize(boxDims);
-
-  float boxRes[3] = {0.0f, 0.0f, 0.0f};
-
-  if(StatsData::ParseFloat3Vec(rdfJson, SIMPL::StringConstants::RdfBoxRes, boxRes, 0.0) == 0)
-  {
-    // Throw warning
-  }
-  setBoxResolution(boxRes);
-
-  int numBins = 0;
-  jsonValue = rdfJson[SIMPL::StringConstants::BinCount];
-  if(!jsonValue.isUndefined() && jsonValue.isDouble())
-  {
-    numBins = jsonValue.toInt(0);
-  }
-  setNumberOfBins(numBins);
-
-  std::vector<float> bd = {boxDims[0], boxDims[1], boxDims[2]};
-  std::vector<float> br = {boxRes[0], boxRes[1], boxRes[2]};
-  std::vector<float> freqs = RadialDistributionFunction::GenerateRandomDistribution(m_MinDistance, m_MaxDistance, numBins, bd, br);
-  setFrequencies(freqs);
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int RdfData::writeJson(QJsonObject& json)
-{
-  int err = 0;
-  QJsonObject rdfJson;
-  rdfJson.insert(SIMPL::StringConstants::BinCount, getNumberOfBins());
-  rdfJson.insert(SIMPL::StringConstants::RdfMinDistance, getMinDistance());
-  rdfJson.insert(SIMPL::StringConstants::RdfMaxDistance, getMaxDistance());
-  QJsonArray boxArray;
-  float boxDims[3];
-  getBoxSize(boxDims);
-  for(int i = 0; i < 3; i++)
-  {
-    boxArray.insert(i, boxDims[i]);
-  }
-  rdfJson.insert(SIMPL::StringConstants::RdfBoxDims, boxArray);
-
-  getBoxResolution(boxDims);
-  for(int i = 0; i < 3; i++)
-  {
-    boxArray.replace(i, boxDims[i]);
-  }
-  rdfJson.insert(SIMPL::StringConstants::RdfBoxRes, boxArray);
-
-  json.insert(SIMPL::StringConstants::RadialDistFunc, rdfJson);
-  return err;
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.h b/Source/SIMPLib/Math/RadialDistributionFunction.h
index c830b26f71..0099259606 100755
--- a/Source/SIMPLib/Math/RadialDistributionFunction.h
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.h
@@ -37,61 +37,7 @@
 
 #include <vector>
 
-#include <QtCore/QJsonObject>
-
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
-
-
-
-class SIMPLib_EXPORT RdfData
-{
-  public:
-    SIMPL_SHARED_POINTERS(RdfData)
-    SIMPL_STATIC_NEW_MACRO(RdfData)
-    SIMPL_TYPE_MACRO(RdfData)
-
-    virtual ~RdfData();
-
-    SIMPL_INSTANCE_PROPERTY(std::vector<float>, Frequencies)
-    SIMPL_INSTANCE_PROPERTY(float, MinDistance)
-    SIMPL_INSTANCE_PROPERTY(float, MaxDistance)
-    SIMPL_INSTANCE_PROPERTY(int, NumberOfBins)
-    SIMPL_INSTANCE_STRING_PROPERTY(DistributionType)
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxSize)
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxResolution)
-
-    int getFrequencyCount();
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    Pointer deepCopy();
-
-    /**
-     * @brief readJson
-     * @param json
-     * @return
-     */
-    int readJson(const QJsonObject &json);
-
-    /**
-     * @brief writeJson
-     * @param json
-     * @return
-     */
-    int writeJson(QJsonObject &json);
-
-  protected:
-    RdfData();
-
-  private:
-    RdfData(const RdfData&) = delete;        // Copy Constructor Not Implemented
-    void operator=(const RdfData&) = delete; // Move assignment Not Implemented
-};
-
 
 /**
  * @brief The RadialDistributionFunction class can generate different types of distributions
diff --git a/Source/SIMPLib/Math/RdfData.cpp b/Source/SIMPLib/Math/RdfData.cpp
new file mode 100644
index 0000000000..dbed968b00
--- /dev/null
+++ b/Source/SIMPLib/Math/RdfData.cpp
@@ -0,0 +1,169 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "RdfData.h"
+
+#include "SIMPLib/Math/RadialDistributionFunction.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/StatsData/StatsData.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+RdfData::RdfData()
+: m_MinDistance(0.0f)
+, m_MaxDistance(0.0f)
+, m_NumberOfBins(50)
+, m_DistributionType(SIMPL::StringConstants::UnknownDistribution)
+{
+  m_BoxResolution[0] = 0.1f;
+  m_BoxResolution[1] = 0.1f;
+  m_BoxResolution[2] = 0.1f;
+  m_BoxSize[0] = 100;
+  m_BoxSize[1] = 100;
+  m_BoxSize[2] = 100;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+RdfData::~RdfData() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int RdfData::getFrequencyCount()
+{
+  return m_Frequencies.size();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+RdfData::Pointer RdfData::deepCopy()
+{
+  RdfData::Pointer ptr = RdfData::New();
+  ptr->setFrequencies(getFrequencies());
+  ptr->setMinDistance(getMinDistance());
+  ptr->setMaxDistance(getMaxDistance());
+  ptr->setDistributionType(getDistributionType());
+  float temp[3] = {0.0f, 0.0f, 0.0f};
+  getBoxSize(temp);
+  ptr->setBoxSize(temp);
+  getBoxResolution(temp);
+  ptr->setBoxResolution(temp);
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int RdfData::readJson(const QJsonObject& json)
+{
+  int err = 0;
+  float boxDims[3] = {0.0f, 0.0f, 0.0f};
+
+  QJsonObject rdfJson = json[SIMPL::StringConstants::RadialDistFunc].toObject();
+
+  QJsonValue jsonValue = rdfJson[SIMPL::StringConstants::RdfMinDistance];
+  if(!jsonValue.isUndefined() && jsonValue.isDouble())
+  {
+    setMinDistance(static_cast<float>(jsonValue.toDouble(0.0)));
+  }
+  jsonValue = rdfJson[SIMPL::StringConstants::RdfMaxDistance];
+  if(!jsonValue.isUndefined() && jsonValue.isDouble())
+  {
+    setMaxDistance(static_cast<float>(jsonValue.toDouble(0.0)));
+  }
+
+  if(StatsData::ParseFloat3Vec(rdfJson, SIMPL::StringConstants::RdfBoxDims, boxDims, 0.0) == 0)
+  {
+    // Throw warning
+  }
+  setBoxSize(boxDims);
+
+  float boxRes[3] = {0.0f, 0.0f, 0.0f};
+
+  if(StatsData::ParseFloat3Vec(rdfJson, SIMPL::StringConstants::RdfBoxRes, boxRes, 0.0) == 0)
+  {
+    // Throw warning
+  }
+  setBoxResolution(boxRes);
+
+  int numBins = 0;
+  jsonValue = rdfJson[SIMPL::StringConstants::BinCount];
+  if(!jsonValue.isUndefined() && jsonValue.isDouble())
+  {
+    numBins = jsonValue.toInt(0);
+  }
+  setNumberOfBins(numBins);
+
+  std::vector<float> bd = {boxDims[0], boxDims[1], boxDims[2]};
+  std::vector<float> br = {boxRes[0], boxRes[1], boxRes[2]};
+  std::vector<float> freqs = RadialDistributionFunction::GenerateRandomDistribution(m_MinDistance, m_MaxDistance, numBins, bd, br);
+  setFrequencies(freqs);
+
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int RdfData::writeJson(QJsonObject& json)
+{
+  int err = 0;
+  QJsonObject rdfJson;
+  rdfJson.insert(SIMPL::StringConstants::BinCount, getNumberOfBins());
+  rdfJson.insert(SIMPL::StringConstants::RdfMinDistance, getMinDistance());
+  rdfJson.insert(SIMPL::StringConstants::RdfMaxDistance, getMaxDistance());
+  QJsonArray boxArray;
+  float boxDims[3];
+  getBoxSize(boxDims);
+  for(int i = 0; i < 3; i++)
+  {
+    boxArray.insert(i, boxDims[i]);
+  }
+  rdfJson.insert(SIMPL::StringConstants::RdfBoxDims, boxArray);
+
+  getBoxResolution(boxDims);
+  for(int i = 0; i < 3; i++)
+  {
+    boxArray.replace(i, boxDims[i]);
+  }
+  rdfJson.insert(SIMPL::StringConstants::RdfBoxRes, boxArray);
+
+  json.insert(SIMPL::StringConstants::RadialDistFunc, rdfJson);
+  return err;
+}
diff --git a/Source/SIMPLib/Math/RdfData.h b/Source/SIMPLib/Math/RdfData.h
new file mode 100644
index 0000000000..b85e4affc4
--- /dev/null
+++ b/Source/SIMPLib/Math/RdfData.h
@@ -0,0 +1,93 @@
+/* ============================================================================
+* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+*
+* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+* 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 COPYRIGHT HOLDER 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.
+*
+* The code contained herein was partially funded by the followig contracts:
+*    United States Air Force Prime Contract FA8650-07-D-5800
+*    United States Air Force Prime Contract FA8650-10-D-5210
+*    United States Prime Contract Navy N00173-07-C-2068
+*
+* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <vector>
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
+
+
+
+class SIMPLib_EXPORT RdfData
+{
+  public:
+    SIMPL_SHARED_POINTERS(RdfData)
+    SIMPL_STATIC_NEW_MACRO(RdfData)
+    SIMPL_TYPE_MACRO(RdfData)
+
+    virtual ~RdfData();
+
+    SIMPL_INSTANCE_PROPERTY(std::vector<float>, Frequencies)
+    SIMPL_INSTANCE_PROPERTY(float, MinDistance)
+    SIMPL_INSTANCE_PROPERTY(float, MaxDistance)
+    SIMPL_INSTANCE_PROPERTY(int, NumberOfBins)
+    SIMPL_INSTANCE_STRING_PROPERTY(DistributionType)
+    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxSize)
+    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxResolution)
+
+    int getFrequencyCount();
+
+    /**
+     * @brief deepCopy
+     * @return
+     */
+    Pointer deepCopy();
+
+    /**
+     * @brief readJson
+     * @param json
+     * @return
+     */
+    int readJson(const QJsonObject &json);
+
+    /**
+     * @brief writeJson
+     * @param json
+     * @return
+     */
+    int writeJson(QJsonObject &json);
+
+  protected:
+    RdfData();
+
+  private:
+    RdfData(const RdfData&) = delete;        // Copy Constructor Not Implemented
+    void operator=(const RdfData&) = delete; // Move assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Math/SourceList.cmake b/Source/SIMPLib/Math/SourceList.cmake
index 49dd758d31..a735f163d4 100755
--- a/Source/SIMPLib/Math/SourceList.cmake
+++ b/Source/SIMPLib/Math/SourceList.cmake
@@ -7,6 +7,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MatrixMath.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QuaternionMath.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RadialDistributionFunction.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RdfData.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibMath.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibRandom.h
 )
@@ -14,6 +15,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GeometryMath.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MatrixMath.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RadialDistributionFunction.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RdfData.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibMath.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibRandom.cpp
 )
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.cpp b/Source/SIMPLib/Messages/AbstractErrorMessage.cpp
new file mode 100644
index 0000000000..94a3f2f729
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.cpp
@@ -0,0 +1,44 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "AbstractErrorMessage.h"
+
+AbstractErrorMessage::AbstractErrorMessage() = default;
+
+AbstractErrorMessage::AbstractErrorMessage(const QString& msgText, int code)
+: AbstractMessage(msgText)
+, m_Code(code)
+{
+}
+
+AbstractErrorMessage::~AbstractErrorMessage() = default;
+
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.h b/Source/SIMPLib/Messages/AbstractErrorMessage.h
index 56162cc2a7..63b80a26a8 100755
--- a/Source/SIMPLib/Messages/AbstractErrorMessage.h
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.h
@@ -1,5 +1,5 @@
 /* ============================================================================
- * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -27,9 +27,6 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * The code contained herein was partially funded by the following contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -46,39 +43,16 @@ class SIMPLib_EXPORT AbstractErrorMessage : public AbstractMessage
 {
 public:
   SIMPL_SHARED_POINTERS(AbstractErrorMessage)
-  SIMPL_TYPE_MACRO(AbstractErrorMessage)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractErrorMessage, AbstractMessage)
 
-  virtual ~AbstractErrorMessage()
-  {
-  }
+  ~AbstractErrorMessage() override;
 
   SIMPL_INSTANCE_PROPERTY(int, Code)
 
-  /**
-   * @brief This method creates and returns a string for error messages
-   */
-  virtual QString generateMessageString() const = 0;
-
-  /**
-   * @brief Method that allows the visitation of a message by a message handler.  This
-   * is part of the double-dispatch API that allows observers to be able to perform
-   * subclass specific operations on messages that they receive.
-   * @param msgHandler The observer's message handler
-   */
-  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
-
 protected:
-  AbstractErrorMessage()
-  : AbstractMessage()
-  , m_Code(0)
-  {
-  }
+  AbstractErrorMessage();
 
-  AbstractErrorMessage(const QString& msgText, int code)
-  : AbstractMessage(msgText)
-  , m_Code(code)
-  {
-  }
+  AbstractErrorMessage(const QString& msgText, int code);
 
 private:
 };
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.cpp b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
new file mode 100644
index 0000000000..982176e511
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
@@ -0,0 +1,43 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "AbstractProgressMessage.h"
+
+AbstractProgressMessage::AbstractProgressMessage() = default;
+
+AbstractProgressMessage::  AbstractProgressMessage(const QString& msgText, int progress)
+: AbstractMessage(msgText)
+, m_ProgressValue(progress)
+{
+}
+
+  AbstractProgressMessage::~AbstractProgressMessage() = default;
\ No newline at end of file
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.h b/Source/SIMPLib/Messages/AbstractProgressMessage.h
index 5acbc580ae..b50484a231 100755
--- a/Source/SIMPLib/Messages/AbstractProgressMessage.h
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.h
@@ -27,9 +27,6 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * The code contained herein was partially funded by the following contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -48,39 +45,16 @@ class SIMPLib_EXPORT AbstractProgressMessage : public AbstractMessage
 {
 public:
   SIMPL_SHARED_POINTERS(AbstractProgressMessage)
-  SIMPL_TYPE_MACRO(AbstractProgressMessage)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractProgressMessage, AbstractMessage)
 
-  virtual ~AbstractProgressMessage()
-  {
-  }
+  ~AbstractProgressMessage() override;
 
   SIMPL_INSTANCE_PROPERTY(int, ProgressValue)
 
-  /**
-   * @brief This method creates and returns a string for progress messages
-   */
-  virtual QString generateMessageString() const = 0;
-
-  /**
-   * @brief Method that allows the visitation of a message by a message handler.  This
-   * is part of the double-dispatch API that allows observers to be able to perform
-   * subclass specific operations on messages that they receive.
-   * @param msgHandler The observer's message handler
-   */
-  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
-
 protected:
-  AbstractProgressMessage()
-  : AbstractMessage()
-  , m_ProgressValue(0)
-  {
-  }
+  AbstractProgressMessage();
 
-  AbstractProgressMessage(const QString& msgText, int progress)
-  : AbstractMessage(msgText)
-  , m_ProgressValue(progress)
-  {
-  }
+  AbstractProgressMessage(const QString& msgText, int progress);
 
 private:
 };
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.cpp b/Source/SIMPLib/Messages/AbstractStatusMessage.cpp
new file mode 100644
index 0000000000..01ef1a5e86
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.cpp
@@ -0,0 +1,42 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "AbstractStatusMessage.h"
+
+AbstractStatusMessage::AbstractStatusMessage() = default;
+
+AbstractStatusMessage::AbstractStatusMessage(const QString& msgText)
+: AbstractMessage(msgText)
+{
+}
+
+AbstractStatusMessage::~AbstractStatusMessage() = default;
\ No newline at end of file
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.h b/Source/SIMPLib/Messages/AbstractStatusMessage.h
index a558056362..5c8474556e 100755
--- a/Source/SIMPLib/Messages/AbstractStatusMessage.h
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.h
@@ -27,15 +27,14 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * The code contained herein was partially funded by the following contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
+#include <QtCore/QString>
+
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 class AbstractMessageHandler;
@@ -48,35 +47,14 @@ class SIMPLib_EXPORT AbstractStatusMessage : public AbstractMessage
 {
 public:
   SIMPL_SHARED_POINTERS(AbstractStatusMessage)
-  SIMPL_TYPE_MACRO(AbstractStatusMessage)
-
-  virtual ~AbstractStatusMessage()
-  {
-  }
-
-  /**
-   * @brief This method creates and returns a string for status messages
-   */
-  virtual QString generateMessageString() const = 0;
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractStatusMessage, AbstractMessage)
 
-  /**
-   * @brief Method that allows the visitation of a message by a message handler.  This
-   * is part of the double-dispatch API that allows observers to be able to perform
-   * subclass specific operations on messages that they receive.
-   * @param msgHandler The observer's message handler
-   */
-  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+  ~AbstractStatusMessage() override;
 
 protected:
-  AbstractStatusMessage()
-  : AbstractMessage()
-  {
-  }
+  AbstractStatusMessage();
 
-  AbstractStatusMessage(const QString& msgText)
-  : AbstractMessage(msgText)
-  {
-  }
+  AbstractStatusMessage(const QString& msgText);
 
 private:
 };
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.cpp b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
new file mode 100644
index 0000000000..63d52b5661
--- /dev/null
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
@@ -0,0 +1,43 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "AbstractWarningMessage.h"
+
+AbstractWarningMessage::AbstractWarningMessage() = default;
+
+AbstractWarningMessage::AbstractWarningMessage(const QString& msgText, int32_t code)
+: AbstractMessage(msgText)
+{
+}
+
+AbstractWarningMessage::~AbstractWarningMessage() = default;
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.h b/Source/SIMPLib/Messages/AbstractWarningMessage.h
index e304314ee4..a16f6086ba 100755
--- a/Source/SIMPLib/Messages/AbstractWarningMessage.h
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.h
@@ -48,39 +48,16 @@ class SIMPLib_EXPORT AbstractWarningMessage : public AbstractMessage
 {
 public:
   SIMPL_SHARED_POINTERS(AbstractWarningMessage)
-  SIMPL_TYPE_MACRO(AbstractWarningMessage)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractWarningMessage, AbstractMessage)
 
-  virtual ~AbstractWarningMessage()
-  {
-  }
+  ~AbstractWarningMessage() override;
 
   SIMPL_INSTANCE_PROPERTY(int, Code)
 
-  /**
-   * @brief This method creates and returns a string for warning messages
-   */
-  virtual QString generateMessageString() const = 0;
-
-  /**
-   * @brief Method that allows the visitation of a message by a message handler.  This
-   * is part of the double-dispatch API that allows observers to be able to perform
-   * subclass specific operations on messages that they receive.
-   * @param msgHandler The observer's message handler
-   */
-  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
-
 protected:
-  AbstractWarningMessage()
-  : AbstractMessage()
-  , m_Code(0)
-  {
-  }
+  AbstractWarningMessage();
 
-  AbstractWarningMessage(const QString& msgText, int code)
-  : AbstractMessage(msgText)
-  , m_Code(code)
-  {
-  }
+  AbstractWarningMessage(const QString& msgText, int code);
 
 private:
 };
diff --git a/Source/SIMPLib/Messages/SourceList.cmake b/Source/SIMPLib/Messages/SourceList.cmake
index cde173b105..cd147ea382 100755
--- a/Source/SIMPLib/Messages/SourceList.cmake
+++ b/Source/SIMPLib/Messages/SourceList.cmake
@@ -37,7 +37,11 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractErrorMessage.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMessageHandler.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractProgressMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractStatusMessage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractWarningMessage.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterErrorMessage.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterProgressMessage.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterStatusMessage.cpp
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index a12270b8c2..ff9824f2f5 100755
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -45,6 +45,8 @@
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
 #include "SIMPLib/Math/RadialDistributionFunction.h"
+#include "SIMPLib/Math/RdfData.h"
+
 
 typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
new file mode 100644
index 0000000000..a0bb1b2d93
--- /dev/null
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -0,0 +1,103 @@
+/*
+ * Your License or Copyright Information can go here
+ */
+
+#include "Filt0.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/FloatFilterParameter.h"
+#include "SIMPLib/FilterParameters/IntFilterParameter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+Filt0::Filt0()
+: m_DataContainerName(SIMPL::Defaults::DataContainerName)
+, m_Filt0_Float(6.6f)
+, m_Filt0_Integer(15)
+{
+  setupFilterParameters();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+Filt0::~Filt0() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+  /* Place all your option initialization code here */
+
+  /*  For an Integer use this code*/
+  {
+    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt0_Integer, FilterParameter::Parameter, Filt0));
+  }
+  /*  For a Floating point value use this code*/
+  {
+    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt0_Float, FilterParameter::Parameter, Filt0));
+  }
+
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::readFilterParameters(AbstractFilterParametersReader* reader, int index)
+{
+  float dummyFloat = 0.0f;
+  int dummyInt = 0;
+  reader->openFilterGroup(this, index);
+  setFilt0_Float(reader->readValue("Filt0_Float", dummyFloat));
+  setFilt0_Integer(reader->readValue("Filt0_Integer", dummyInt));
+  reader->closeFilterGroup();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::preflight()
+{
+
+  dataCheck();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void Filt0::execute()
+{
+  clearErrorCode();
+  clearWarningCode();
+  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
+  if(nullptr == m)
+  {
+    QString ss = QObject::tr(" DataContainer was nullptr");
+    setErrorCondition(-1, QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()));
+    return;
+  }
+  clearErrorCode();
+  clearWarningCode();
+
+  /* Place all your code to execute your filter here. */
+}
+
diff --git a/Source/SIMPLib/TestFilters/TestFilters.h b/Source/SIMPLib/TestFilters/Filt0.h
similarity index 53%
rename from Source/SIMPLib/TestFilters/TestFilters.h
rename to Source/SIMPLib/TestFilters/Filt0.h
index 007b782293..cbbcb3f576 100644
--- a/Source/SIMPLib/TestFilters/TestFilters.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -103,96 +103,3 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   Filt0(const Filt0&) = delete;          // Copy Constructor Not Implemented
   void operator=(const Filt0&) = delete; // Move assignment Not Implemented
 };
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-class SIMPLib_EXPORT Filt1 : public AbstractFilter
-{
-  Q_OBJECT
-public:
-  SIMPL_SHARED_POINTERS(Filt1)
-  SIMPL_FILTER_NEW_MACRO(Filt1)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Filt1, AbstractFilter)
-
-  ~Filt1() override;
-  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-
-  SIMPL_INSTANCE_PROPERTY(float, Filt1_Float)
-  SIMPL_INSTANCE_PROPERTY(int32_t, Filt1_Integer)
-
-  /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
-  const QString getGroupName() const override
-  {
-    return "TestFilters";
-  }
-
-  /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
-  const QString getHumanLabel() const override
-  {
-    return "Filt1";
-  }
-
-  /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
-  const QString getSubGroupName() const override
-  {
-    return "Test";
-  }
-
-  /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
-  void setupFilterParameters() override;
-
-  /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-  /**
-   * @brief Reimplemented from @see AbstractFilter class
-   */
-  void execute() override;
-
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
-
-protected:
-  Filt1();
-
-  /**
-   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-   */
-  void dataCheck();
-
-  /**
-   * @brief Initializes all the private instance variables.
-   */
-  void initialize();
-
-private:
-  Filt1(const Filt1&) = delete;          // Copy Constructor Not Implemented
-  void operator=(const Filt1&) = delete; // Move assignment Not Implemented
-};
-
diff --git a/Source/SIMPLib/TestFilters/TestFilters.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
similarity index 51%
rename from Source/SIMPLib/TestFilters/TestFilters.cpp
rename to Source/SIMPLib/TestFilters/Filt1.cpp
index d67127e9e3..a48d0f4cfb 100644
--- a/Source/SIMPLib/TestFilters/TestFilters.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -2,105 +2,11 @@
  * Your License or Copyright Information can go here
  */
 
-#include "TestFilters.h"
+#include "Filt1.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-Filt0::Filt0()
-: m_DataContainerName(SIMPL::Defaults::DataContainerName)
-, m_Filt0_Float(6.6f)
-, m_Filt0_Integer(15)
-{
-  setupFilterParameters();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-Filt0::~Filt0() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::setupFilterParameters()
-{
-  FilterParameterVectorType parameters;
-  /* Place all your option initialization code here */
-
-  /*  For an Integer use this code*/
-  {
-    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt0_Integer, FilterParameter::Parameter, Filt0));
-  }
-  /*  For a Floating point value use this code*/
-  {
-    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt0_Float, FilterParameter::Parameter, Filt0));
-  }
-
-  setFilterParameters(parameters);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  float dummyFloat = 0.0f;
-  int dummyInt = 0;
-  reader->openFilterGroup(this, index);
-  setFilt0_Float(reader->readValue("Filt0_Float", dummyFloat));
-  setFilt0_Integer(reader->readValue("Filt0_Integer", dummyInt));
-  reader->closeFilterGroup();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::initialize()
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::dataCheck()
-{
-  clearErrorCode();
-  clearWarningCode();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::preflight()
-{
-
-  dataCheck();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::execute()
-{
-  clearErrorCode();
-  clearWarningCode();
-  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
-  if(nullptr == m)
-  {
-    QString ss = QObject::tr(" DataContainer was nullptr");
-    setErrorCondition(-1, QObject::tr("VolumeDataContainer was nullptr. Returning from Execute Method for filter %1").arg(getHumanLabel()));
-    return;
-  }
-  clearErrorCode();
-  clearWarningCode();
-
-  /* Place all your code to execute your filter here. */
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
new file mode 100644
index 0000000000..5433f090a4
--- /dev/null
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -0,0 +1,106 @@
+/*
+ * Your License or Copyright Information can go here
+ */
+
+#pragma once
+
+#include <QString>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/SIMPLib.h"
+
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+class SIMPLib_EXPORT Filt1 : public AbstractFilter
+{
+  Q_OBJECT
+public:
+  SIMPL_SHARED_POINTERS(Filt1)
+  SIMPL_FILTER_NEW_MACRO(Filt1)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Filt1, AbstractFilter)
+
+  ~Filt1() override;
+  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
+
+  SIMPL_INSTANCE_PROPERTY(float, Filt1_Float)
+  SIMPL_INSTANCE_PROPERTY(int32_t, Filt1_Integer)
+
+  /**
+  * @brief This returns the group that the filter belonds to. You can select
+  * a different group if you want. The string returned here will be displayed
+  * in the GUI for the filter
+  */
+  const QString getGroupName() const override
+  {
+    return "TestFilters";
+  }
+
+  /**
+  * @brief This returns a string that is displayed in the GUI. It should be readable
+  * and understandable by humans.
+  */
+  const QString getHumanLabel() const override
+  {
+    return "Filt1";
+  }
+
+  /**
+  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+  * a subgroup. It should be readable and understandable by humans.
+  */
+  const QString getSubGroupName() const override
+  {
+    return "Test";
+  }
+
+  /**
+  * @brief This method will instantiate all the end user settable options/parameters
+  * for this filter
+  */
+  void setupFilterParameters() override;
+
+  /**
+  * @brief This method will read the options from a file
+  * @param reader The reader that is used to read the options from a file
+  */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+  * @brief This function runs some sanity checks on the DataContainer and inputs
+  * in an attempt to ensure the filter can process the inputs.
+  */
+  void preflight() override;
+
+signals:
+  void updateFilterParameters(AbstractFilter* filter);
+  void parametersChanged();
+  void preflightAboutToExecute();
+  void preflightExecuted();
+
+protected:
+  Filt1();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  Filt1(const Filt1&) = delete;          // Copy Constructor Not Implemented
+  void operator=(const Filt1&) = delete; // Move assignment Not Implemented
+};
+
diff --git a/Source/SIMPLib/TestFilters/SourceList.cmake b/Source/SIMPLib/TestFilters/SourceList.cmake
index a54db19c3c..7df6409677 100644
--- a/Source/SIMPLib/TestFilters/SourceList.cmake
+++ b/Source/SIMPLib/TestFilters/SourceList.cmake
@@ -62,7 +62,8 @@ endforeach()
 # This is the list of Private Filters. These filters are available from other filters but the user will not
 # be able to use them from the DREAM3D user interface.
 set(_PrivateFilters
-  TestFilters
+  Filt0
+  Filt1
 )
 
 #-----------------
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
index 8f834f957d..c897c6cb1c 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
@@ -52,12 +52,12 @@ class SIMPLib_EXPORT SIMPLH5DataReaderRequirements
     
     virtual ~SIMPLH5DataReaderRequirements();
 
-    typedef QVector< QVector<size_t> > QVectorSizeT;
+    using QVectorSizeT = QVector<QVector<size_t>> ;
 
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DCGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, AMTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DATypes)
-    SIMPL_INSTANCE_PROPERTY(QVectorSizeT, ComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(SIMPLH5DataReaderRequirements::QVectorSizeT, ComponentDimensions)
 
   private:
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 2678556f93..fbc6c94feb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -85,7 +85,7 @@ class ComparisonSelectionWidget : public FilterParameterWidget, private Ui::Comp
       FaceListType,
     };
 
-    SIMPL_INSTANCE_PROPERTY(ArrayListType, ArrayListType)
+    SIMPL_INSTANCE_PROPERTY(ComparisonSelectionWidget::ArrayListType, ArrayListType)
     SIMPL_INSTANCE_PROPERTY(bool, ShowOperators)
 
     /**
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.h b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
index 003b491baf..8b4f3660dd 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
@@ -69,7 +69,7 @@ class SVWidgetsLib_EXPORT BookmarksItem
 
     SIMPL_INSTANCE_PROPERTY(QString, ItemTooltip)
     SIMPL_INSTANCE_PROPERTY(QIcon, Icon)
-    SIMPL_INSTANCE_PROPERTY(ItemType, ItemType)
+    SIMPL_INSTANCE_PROPERTY(BookmarksItem::ItemType, ItemType)
 
     BookmarksItem* child(int number);
     BookmarksItem* parent();
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.h b/Source/SVWidgetsLib/Widgets/FilterListItem.h
index 0c8a571b41..266e1526e5 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.h
@@ -60,7 +60,7 @@ class SVWidgetsLib_EXPORT FilterListItem
     SIMPL_INSTANCE_PROPERTY(QString, ItemTooltip)
     SIMPL_INSTANCE_PROPERTY(QString, ClassName)
     SIMPL_INSTANCE_PROPERTY(QIcon, Icon)
-    SIMPL_INSTANCE_PROPERTY(ItemType, ItemType)
+    SIMPL_INSTANCE_PROPERTY(FilterListItem::ItemType, ItemType)
 
     FilterListItem* child(int number);
     FilterListItem* parent();
diff --git a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
index 4d9246d49a..0c3a49fa54 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
@@ -44,9 +44,10 @@ class SVWidgetsLib_EXPORT PipelineFilterMimeData : public QMimeData
     PipelineFilterMimeData();
     ~PipelineFilterMimeData() override;
 
-    typedef std::pair<AbstractFilter::Pointer, int> FilterDragMetadata;
+    using FilterDragMetadata = std::pair<AbstractFilter::Pointer, int>;
+    using FilterDragMetadataContainer = std::vector<PipelineFilterMimeData::FilterDragMetadata>;
 
-    SIMPL_INSTANCE_PROPERTY(std::vector<FilterDragMetadata>, FilterDragData)
+    SIMPL_INSTANCE_PROPERTY(PipelineFilterMimeData::FilterDragMetadataContainer, FilterDragData)
 
   public:
     PipelineFilterMimeData(const PipelineFilterMimeData&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.h b/Source/SVWidgetsLib/Widgets/PipelineItem.h
index 5b5bc080f6..46e03e6ac3 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.h
@@ -74,7 +74,7 @@ class SVWidgetsLib_EXPORT PipelineItem
       Remove
     };
 
-    SIMPL_INSTANCE_PROPERTY(AnimationType, CurrentAnimationType)
+    SIMPL_INSTANCE_PROPERTY(PipelineItem::AnimationType, CurrentAnimationType)
 
     enum PipelineItemData
     {
@@ -90,7 +90,7 @@ class SVWidgetsLib_EXPORT PipelineItem
       Completed = 2, //!<
       Disabled = 3
     };
-    SIMPL_INSTANCE_PROPERTY(WidgetState, WidgetState)
+    SIMPL_INSTANCE_PROPERTY(PipelineItem::WidgetState, WidgetState)
 
     enum class PipelineState : EnumType
     {
@@ -98,7 +98,7 @@ class SVWidgetsLib_EXPORT PipelineItem
       Stopped = 1,
       Paused = 4,
     };
-    SIMPL_INSTANCE_PROPERTY(PipelineState, PipelineState)
+    SIMPL_INSTANCE_PROPERTY(PipelineItem::PipelineState, PipelineState)
 
     enum class ErrorState : EnumType
     {
@@ -106,7 +106,7 @@ class SVWidgetsLib_EXPORT PipelineItem
       Error = 1,
       Warning = 2,
     };
-    SIMPL_INSTANCE_PROPERTY(ErrorState, ErrorState)
+    SIMPL_INSTANCE_PROPERTY(PipelineItem::ErrorState, ErrorState)
 
     enum class ItemType : EnumType
     {
@@ -115,7 +115,7 @@ class SVWidgetsLib_EXPORT PipelineItem
       DropIndicator,
       Unknown
     };
-    SIMPL_INSTANCE_PROPERTY(ItemType, ItemType)
+    SIMPL_INSTANCE_PROPERTY(PipelineItem::ItemType, ItemType)
 
     PipelineItem* child(int number);
     PipelineItem* parent();
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index 15e60e26be..d3a7858ffb 100755
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -82,7 +82,7 @@ class SVWidgetsLib_EXPORT SVPipelineView : public QListView, public PipelineView
 
   using IndexedFilterObject = std::pair<int, PipelineFilterObject*>;
 
-  SIMPL_INSTANCE_PROPERTY(PipelineViewState, PipelineState)
+  SIMPL_INSTANCE_PROPERTY(SVPipelineView::PipelineViewState, PipelineState)
 
   SIMPL_GET_PROPERTY(QAction*, ActionEnableFilter)
   SIMPL_GET_PROPERTY(QAction*, ActionCut)

From 46c3c7265112050ffc1f2ac49a58bb7db9d85c4d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 14 Jun 2019 13:31:55 -0400
Subject: [PATCH 124/397] Fix crash when reading prior .dream3d files with mesh
 based geometry (#364)

The crash is due to a bad cast from Int64 array to size_t array.
We now try to first read as the Int64 array and reinterpret cast to size_t. If that fails
then we read as a size_t (unsigned long long int) and return the result of that
operation.

fixes #363. closes #363

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Geometry/EdgeGeom.cpp        | 10 +---
 Source/SIMPLib/Geometry/GeometryHelpers.cpp | 62 +++++++++++++++++++++
 Source/SIMPLib/Geometry/GeometryHelpers.h   | 56 +++++++------------
 Source/SIMPLib/Geometry/HexahedralGeom.cpp  | 45 ++++-----------
 Source/SIMPLib/Geometry/IGeometry.h         | 12 ++--
 Source/SIMPLib/Geometry/QuadGeom.cpp        | 25 ++-------
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp | 42 +++-----------
 Source/SIMPLib/Geometry/TriangleGeom.cpp    | 14 ++---
 8 files changed, 117 insertions(+), 149 deletions(-)

diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 8aeb93c5dd..2f15baad1d 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -582,13 +582,9 @@ int EdgeGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer edges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+
   if(edges.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.cpp b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
index aad34ced95..59e9213d11 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.cpp
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
@@ -34,5 +34,67 @@
 namespace GeometryHelpers
 {
 
+// -----------------------------------------------------------------------------
+MeshIndexArrayType::Pointer GeomIO::ReadMeshIndexListFromHDF5(const QString& listName, hid_t parentId, bool preflight, herr_t& err)
+{
+  MeshIndexArrayType::Pointer meshIndex = MeshIndexArrayType::NullPointer();
+
+  // In versions of DREAM3D before 6.6, the index list was stored as a Int64_t type, versions starting with 6.6 now store
+  // the list as a size_t (UInt64_t). So we need to try each type:
+  Int64ArrayType::Pointer tempInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<Int64ArrayType>(listName, parentId, preflight, err);
+  if(tempInt64.get() != nullptr)
+  {
+    meshIndex = SharedEdgeList::WrapPointer(reinterpret_cast<MeshIndexType*>(tempInt64->data()), tempInt64->getNumberOfTuples(), tempInt64->getComponentDimensions(), tempInt64->getName(), true);
+    // Release the ownership of the memory from TempTris and essentially pass it to tris.
+    tempInt64->releaseOwnership();
+  }
+  else // Reading as a Int64 didn't work which means the data _should_ be a UInt64_t (size_t)
+  {
+    MeshIndexArrayType::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<MeshIndexArrayType>(listName, parentId, preflight, err);
+    if(tempUInt64.get() != nullptr)
+    {
+      meshIndex = SharedEdgeList::WrapPointer(reinterpret_cast<MeshIndexType*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
+      // Release the ownership of the memory from TempTris and essentially pass it to tris.
+      tempUInt64->releaseOwnership();
+    }
+  }
+
+  return meshIndex;
+}
+
+// -----------------------------------------------------------------------------
+int GeomIO::ReadMetaDataFromHDF5(hid_t parentId, const IGeometry::Pointer& geometry)
+{
+  herr_t err = 0;
+  unsigned int spatialDims = 0;
+  QString geomName = "";
+  err = QH5Lite::readScalarAttribute(parentId, SIMPL::Geometry::Geometry, SIMPL::Geometry::SpatialDimensionality, spatialDims);
+  if(err < 0)
+  {
+    return err;
+  }
+  err = QH5Lite::readStringAttribute(parentId, SIMPL::Geometry::Geometry, SIMPL::Geometry::GeometryName, geomName);
+  if(err < 0)
+  {
+    return err;
+  }
+  geometry->setSpatialDimensionality(spatialDims);
+  geometry->setName(geomName);
 
+  return 1;
 }
+
+// -----------------------------------------------------------------------------
+int GeomIO::WriteListToHDF5(hid_t parentId, const IDataArray::Pointer& list)
+{
+  herr_t err = 0;
+  if(list->getNumberOfTuples() == 0)
+  {
+    return err;
+  }
+  QVector<size_t> tDims(1, list->getNumberOfTuples());
+  err = list->writeH5Data(parentId, tDims);
+  return err;
+}
+
+} // namespace GeometryHelpers
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index 19366b6031..f5fbea0214 100755
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -64,12 +64,14 @@ class GeomIO
 
   /**
    * @brief ReadMeshFromHDF5
-   * @param listName
-   * @param parentId
-   * @param preflight
+   * @param listName The name of the DataSet
+   * @param parentId The HDF5
+   * @param preflight Are we in preflight mode. If TRUE then the underlying memory for the array will *not* be allocated
+   * @param err Any error that occured.
    * @return
    */
-  template <typename ListType> static typename ListType::Pointer ReadListFromHDF5(const QString& listName, hid_t parentId, bool preflight, herr_t& err)
+  template <typename ListType>
+  static typename ListType::Pointer ReadListFromHDF5(const QString& listName, hid_t parentId, bool preflight, herr_t& err)
   {
     QVector<hsize_t> dims;
     H5T_class_t type_class;
@@ -91,32 +93,23 @@ class GeomIO
     return std::dynamic_pointer_cast<ListType>(mesh);
   }
 
+  /**
+   * @brief ReadIndexListFromHDF5
+   * @param listName The name of the DataSet
+   * @param parentId The HDF5
+   * @param preflight Are we in preflight mode. If TRUE then the underlying memory for the array will *not* be allocated
+   * @param err Any error that occured.
+   * @return
+   */
+  static MeshIndexArrayType::Pointer ReadMeshIndexListFromHDF5(const QString& listName, hid_t parentId, bool preflight, herr_t& err);
+
   /**
    * @brief ReadMetaDataFromHDF5
    * @param parentId
    * @param geometry
    * @return
    */
-  static int ReadMetaDataFromHDF5(hid_t parentId, IGeometry::Pointer geometry)
-  {
-    herr_t err = 0;
-    unsigned int spatialDims = 0;
-    QString geomName = "";
-    err = QH5Lite::readScalarAttribute(parentId, SIMPL::Geometry::Geometry, SIMPL::Geometry::SpatialDimensionality, spatialDims);
-    if(err < 0)
-    {
-      return err;
-    }
-    err = QH5Lite::readStringAttribute(parentId, SIMPL::Geometry::Geometry, SIMPL::Geometry::GeometryName, geomName);
-    if(err < 0)
-    {
-      return err;
-    }
-    geometry->setSpatialDimensionality(spatialDims);
-    geometry->setName(geomName);
-
-    return 1;
-  }
+  static int ReadMetaDataFromHDF5(hid_t parentId, const IGeometry::Pointer& geometry);
 
   /**
    * @brief WriteListToHDF5
@@ -124,17 +117,7 @@ class GeomIO
    * @param list
    * @return
    */
-  static int WriteListToHDF5(hid_t parentId, IDataArray::Pointer list)
-  {
-    herr_t err = 0;
-    if(list->getNumberOfTuples() == 0)
-    {
-      return err;
-    }
-    QVector<size_t> tDims(1, list->getNumberOfTuples());
-    err = list->writeH5Data(parentId, tDims);
-    return err;
-  }
+  static int WriteListToHDF5(hid_t parentId, const IDataArray::Pointer& list);
 
   /**
    * @brief ReadDynamicListFromHDF5
@@ -187,7 +170,8 @@ class GeomIO
    * @param name
    * @return
    */
-  template <typename T, typename K> static int WriteDynamicListToHDF5(hid_t parentId, typename DynamicListArray<T, K>::Pointer dynamicList, size_t numElems, const QString& name)
+  template <typename T, typename K>
+  static int WriteDynamicListToHDF5(hid_t parentId, typename DynamicListArray<T, K>::Pointer dynamicList, size_t numElems, const QString& name)
   {
     herr_t err = 0;
     if(numElems == 0)
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index b6f64bdeb8..3bf87b8b37 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -742,60 +742,35 @@ int HexahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedHexList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedHexList::Pointer hexas =
-      SharedHexList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer hexas = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedHexList, parentId, preflight, err);
   if(hexas.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
+
   size_t numHexas = hexas->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedQuadList::Pointer quads =
-      SharedQuadList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer quads = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedQuadList::Pointer bQuads =
-      SharedQuadList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer bQuads = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer edges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer edges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer bEdges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer bEdges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index ed39c5711d..ee25214e98 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -55,12 +55,12 @@ class QTextStream;
 using MeshIndexType = size_t;
 using MeshIndexArrayType = DataArray<MeshIndexType>;
 using SharedVertexList = FloatArrayType;
-using SharedEdgeList = DataArray<MeshIndexType>;
-using SharedTriList = DataArray<MeshIndexType>;
-using SharedQuadList = DataArray<MeshIndexType>;
-using SharedTetList = DataArray<MeshIndexType>;
-using SharedHexList = DataArray<MeshIndexType>;
-using SharedFaceList = DataArray<MeshIndexType>;
+using SharedEdgeList = MeshIndexArrayType;
+using SharedTriList = MeshIndexArrayType;
+using SharedQuadList = MeshIndexArrayType;
+using SharedTetList = MeshIndexArrayType;
+using SharedHexList = MeshIndexArrayType;
+using SharedFaceList = MeshIndexArrayType;
 using ElementDynamicList = DynamicListArray<uint16_t, MeshIndexType>;
 
 /**
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 65b4712ccf..72c45a96ef 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -667,13 +667,8 @@ int QuadGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedQuadList::Pointer quads =
-      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer quads = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedQuadList, parentId, preflight, err);
   if(quads.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
@@ -681,25 +676,13 @@ int QuadGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   size_t numQuads = quads->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer edges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer edges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer bEdges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer bEdges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 6cfce0fd53..8498fe231d 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -759,61 +759,33 @@ int TetrahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTetList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedTetList::Pointer tets =
-      SharedTetList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer tets = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedTetList, parentId, preflight, err);
   if(tets.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
   size_t numTets = tets->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedTriList::Pointer tris =
-      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer tris = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedTriList::Pointer bTris =
-      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+
+  MeshIndexArrayType::Pointer bTris = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedFaceList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer edges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer edges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
 
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedEdgeList::Pointer bEdges =
-      SharedEdgeList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
+  MeshIndexArrayType::Pointer bEdges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 1a0c263a7e..41425f7f1a 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -664,26 +664,22 @@ int TriangleGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
   SharedVertexList::Pointer vertices = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedVertexList>(SIMPL::Geometry::SharedVertexList, parentId, preflight, err);
-  // The cast from the method is going to fail so create a temp DataArray<uint64_t>
-  DataArray<uint64_t>::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<DataArray<uint64_t>>(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
-  // Now create the correct type and pass in the pointer to tempTris.
-  SharedTriList::Pointer tris =
-      SharedTriList::WrapPointer(reinterpret_cast<size_t*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);
-  // Release the ownership of the memory from TempTris and essentially pass it to tris.
-  tempUInt64->releaseOwnership();
 
+  MeshIndexArrayType::Pointer tris = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedTriList, parentId, preflight, err);
   if(tris.get() == nullptr || vertices.get() == nullptr)
   {
     return -1;
   }
   size_t numTris = tris->getNumberOfTuples();
   size_t numVerts = vertices->getNumberOfTuples();
-  SharedEdgeList::Pointer edges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
+
+  MeshIndexArrayType::Pointer edges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::SharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;
   }
-  SharedEdgeList::Pointer bEdges = GeometryHelpers::GeomIO::ReadListFromHDF5<SharedEdgeList>(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
+
+  MeshIndexArrayType::Pointer bEdges = GeometryHelpers::GeomIO::ReadMeshIndexListFromHDF5(SIMPL::Geometry::UnsharedEdgeList, parentId, preflight, err);
   if(err < 0 && err != -2)
   {
     return -1;

From d87d8138a31715fff2fbdcb962fa8b76c35e6f36 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 14 Jun 2019 14:08:59 -0400
Subject: [PATCH 125/397] Updating the Python Anaconda packaging script with
 useful information

---
 Wrapping/Python/Conda/package.in.bat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
index 65d4cb964e..e67ac7ae9e 100644
--- a/Wrapping/Python/Conda/package.in.bat
+++ b/Wrapping/Python/Conda/package.in.bat
@@ -1,3 +1,7 @@
+:: This file was auto generated from:
+:: @SIMPLProj_SOURCE_DIR@/Wrapping/Python/Conda/package.in.bat
+:: Edit that file and NOT this one. CMake will over write this file each time it runs
+
 @echo off
 
 :: Check to see if we were built using the Visual Studio generators, if so
@@ -47,7 +51,8 @@ set ANACONDA_SCRIPTS_DIR_NAME=@ANACONDA_SCRIPTS_DIR_NAME@
 set ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
 set PYTHON_SITE_PACKAGES_NAME=@PYTHON_SITE_PACKAGES_NAME@
 set SIMPL_PYTHON_MODULE_NAME=@SIMPL_PYTHON_MODULE_NAME@
-set ENV_CONDA_EXE=%ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%\%ANACONDA_SCRIPTS_DIR_NAME%\conda.exe
+set ENV_CONDA_EXE=%ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\conda.exe
+::set ENV_CONDA_EXE=%ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%\%ANACONDA_SCRIPTS_DIR_NAME%\conda.exe
 
 ::---------------------------------------------------------------------------------------
 ::Copy the build artifacts from the normal build directory into the Anaconda package dir

From a9ec430d1e9a43ff7b5be696d6526068f08b6d3b Mon Sep 17 00:00:00 2001
From: Matt McCormick <matt.mccormick@kitware.com>
Date: Fri, 14 Jun 2019 16:48:35 -0400
Subject: [PATCH 126/397] Add export specification to Dream3DImage (#365)

Required on macOS to resolve symbols correctly.

Intended to address:

  libc++abi.dylib: terminating with uncaught exception of type itk::ExceptionObject: /Users/Shared/IMF_SDK/superbuild/ITK/Source/ITK/Modules/Core/Common/include/itkImageBase.hxx:333:

  itk::ERROR: Dream3DImage(0x7fc7ad7dc250): itk::ImageBase::CopyInformation() cannot cast PKN3itk10DataObjectE to PKN3itk9ImageBaseILj2EEE
---
 Source/SIMPLib/ITK/itkDream3DImage.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DImage.h b/Source/SIMPLib/ITK/itkDream3DImage.h
index 0f36355f51..73cfeaee98 100644
--- a/Source/SIMPLib/ITK/itkDream3DImage.h
+++ b/Source/SIMPLib/ITK/itkDream3DImage.h
@@ -81,7 +81,7 @@ namespace itk
  * \wikiexample{SimpleOperations/SetPixels,Set specified pixels to specified values}
  * \endwiki
  */
-template <typename TPixel, unsigned int VImageDimension = 2> class Dream3DImage : public Image<TPixel, VImageDimension>
+template <typename TPixel, unsigned int VImageDimension = 2> class ITK_TEMPLATE_EXPORT Dream3DImage : public Image<TPixel, VImageDimension>
 {
 public:
   /** Standard class typedefs */

From 66215f2311021d8060b137bbaa819447a0b2ba13 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sun, 16 Jun 2019 22:22:24 -0400
Subject: [PATCH 127/397] Fix issue where dynamic cast fails on macOS and
 causes other issues downstream

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Geometry/GeometryHelpers.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.cpp b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
index 59e9213d11..f2a3ea38eb 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.cpp
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
@@ -50,7 +50,13 @@ MeshIndexArrayType::Pointer GeomIO::ReadMeshIndexListFromHDF5(const QString& lis
   }
   else // Reading as a Int64 didn't work which means the data _should_ be a UInt64_t (size_t)
   {
+#ifdef Q_OS_MACOS
+    // Mac OS will fail the dynamic cast from unsigned long ling (Uint64_t) to unsigned long (size_t) so we use the proper
+    // type from the hdf5 file for macOS.
+    UInt64ArrayType::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<UInt64ArrayType>(listName, parentId, preflight, err);
+#else
     MeshIndexArrayType::Pointer tempUInt64 = GeometryHelpers::GeomIO::ReadListFromHDF5<MeshIndexArrayType>(listName, parentId, preflight, err);
+#endif
     if(tempUInt64.get() != nullptr)
     {
       meshIndex = SharedEdgeList::WrapPointer(reinterpret_cast<MeshIndexType*>(tempUInt64->data()), tempUInt64->getNumberOfTuples(), tempUInt64->getComponentDimensions(), tempUInt64->getName(), true);

From 0e2471558e98aea05463e223ffdcb31430d45dac Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 18 Jun 2019 18:29:55 -0400
Subject: [PATCH 128/397] Workaround casting issue in ITK 5

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkDream3DImage.h   |  5 +++++
 Source/SIMPLib/ITK/itkDream3DImage.hxx | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkDream3DImage.h b/Source/SIMPLib/ITK/itkDream3DImage.h
index 73cfeaee98..5f7affd33f 100644
--- a/Source/SIMPLib/ITK/itkDream3DImage.h
+++ b/Source/SIMPLib/ITK/itkDream3DImage.h
@@ -264,6 +264,11 @@ template <typename TPixel, unsigned int VImageDimension = 2> class ITK_TEMPLATE_
     return NeighborhoodAccessorFunctorType();
   }
 
+#if ITK_VERSION_MAJOR == 5
+  /** Work around casting issue. */
+  void CopyInformation(const DataObject* data) override;
+#endif
+
 protected:
   Dream3DImage();
   void PrintSelf(std::ostream& os, Indent indent) const override;
diff --git a/Source/SIMPLib/ITK/itkDream3DImage.hxx b/Source/SIMPLib/ITK/itkDream3DImage.hxx
index c1439a5628..0821a58925 100644
--- a/Source/SIMPLib/ITK/itkDream3DImage.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DImage.hxx
@@ -141,5 +141,23 @@ Dream3DImage<TPixel, VImageDimension>
   // m_Origin and m_Spacing are printed in the Superclass
 }
 
+#if(ITK_VERSION_MAJOR == 5)
+template <typename TPixel, unsigned int VImageDimension>
+void Dream3DImage<TPixel, VImageDimension>::CopyInformation(const DataObject* data)
+{
+  if(data)
+  {
+    const auto* const imgData = static_cast<const ImageBase<VImageDimension>*>(data);
+
+    // Copy the meta data for this data type
+    this->SetLargestPossibleRegion(imgData->GetLargestPossibleRegion());
+    this->SetSpacing(imgData->GetSpacing());
+    this->SetOrigin(imgData->GetOrigin());
+    this->SetDirection(imgData->GetDirection());
+    this->SetNumberOfComponentsPerPixel(imgData->GetNumberOfComponentsPerPixel());
+  }
+}
+#endif
+
 } // end namespace itk
 

From 4d22e09782c84e24f60ed4ab02c5aa7c6c18be0d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 26 Jun 2019 14:06:52 -0400
Subject: [PATCH 129/397] Change API of IDataArray and DataArray to use STL
 containers

    Fix Python wrapping errors due to API changes

    Refinements to the code that looks for a std::vector<T> inside another std::vector<T>

    Address Feedback from PR #362.

    Replace hand rolled code to find something with std::find.

    Changing the IDataArray and DataArray API to use STL containers.

    * Predominant change is to use std::vector<size_t> for the component dimensions argument.
    * Other minor clang-tidy warning cleanup if deemed appropriate.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterCallback/FilterParameter.cpp        |   6 +-
 .../FilterCallback/FilterParameter.h          |  15 +-
 Source/H5Support/QH5Lite.h                    | 179 +-----
 Source/H5Support/Test/H5LiteTest.cpp          |   6 +-
 Source/SIMPLib/Common/EnsembleInfo.cpp        |   2 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |   8 +-
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  23 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |  18 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   6 +-
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |   2 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |   2 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |  10 +-
 .../CoreFilters/ConditionalSetValue.cpp       |   2 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |   4 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   7 +-
 .../CopyFeatureArrayToElementArray.cpp        |   4 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   2 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |   4 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  30 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   2 +-
 .../CoreFilters/CropVertexGeometry.cpp        |   6 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |  14 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   2 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   2 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |   2 +-
 .../CoreFilters/GenerateColorTable.cpp        |  70 +--
 .../CoreFilters/ImportAsciDataArray.cpp       |   8 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  21 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |   6 +-
 .../LinkFeatureMapToElementArray.cpp          |   6 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   2 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   2 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   4 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |   8 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   2 +-
 .../CoreFilters/SplitAttributeArray.cpp       |   2 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |   8 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   6 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |   4 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   4 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |   6 +-
 .../Testing/Cxx/ConvertDataTest.cpp           |  78 +--
 .../CopyFeatureArrayToElementArrayTest.cpp    |  11 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |  16 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |   2 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       |   2 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |  14 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |  13 +-
 .../Testing/Cxx/CreateImageGeometryTest.cpp   |   2 +-
 .../Testing/Cxx/CreateStringArrayTest.cpp     |   2 +-
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |  17 +-
 .../Testing/Cxx/DataContainerTest.cpp         |  23 +-
 ...ExtractAttributeArraysFromGeometryTest.cpp |  13 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |   4 +-
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |   4 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |   8 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |  14 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   4 +-
 .../Testing/Cxx/ImportAsciDataArrayTest.cpp   |   2 +-
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |  53 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |   9 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   9 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   4 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   4 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |  12 +-
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |  10 +-
 .../Testing/Cxx/RemoveArraysTest.cpp          |   4 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |   2 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |  12 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |   8 +-
 .../Testing/Cxx/ReplaceValueTest.cpp          |   4 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |   4 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |   4 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   4 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |  28 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |   2 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   6 +-
 .../CoreFilters/util/ASCIIWizardData.hpp      |  81 ++-
 .../CoreFilters/util/CalculatorArray.hpp      |  20 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       | 558 ++++++++----------
 Source/SIMPLib/DataArrays/IDataArray.h        |  17 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  73 ++-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |  50 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |  32 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |  28 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |  18 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |  34 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |  60 +-
 .../Testing/Cxx/StringDataArrayTest.cpp       |   2 +-
 .../Testing/Cxx/StructArrayTest.cpp           |   4 +-
 .../DataContainers/AttributeMatrix.cpp        |  14 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  | 130 ++--
 .../SIMPLib/DataContainers/DataArrayProxy.cpp |  30 +-
 .../SIMPLib/DataContainers/DataArrayProxy.h   |  29 +-
 .../SIMPLib/DataContainers/DataContainer.cpp  |  12 +-
 Source/SIMPLib/DataContainers/DataContainer.h |   8 +-
 .../DataContainers/DataContainerArray.h       |  12 +-
 .../DataContainers/DataStructureUtilities.h   |   4 +-
 .../Testing/Cxx/DataContainerBundleTest.cpp   |   9 +-
 .../AxisAngleFilterParameter.cpp              |   2 +-
 .../AxisAngleFilterParameter.h                |   2 +-
 .../BooleanFilterParameter.cpp                |   4 +-
 .../FilterParameters/BooleanFilterParameter.h |   3 +-
 .../CalculatorFilterParameter.cpp             |   2 +-
 .../CalculatorFilterParameter.h               |   2 +-
 .../ChoiceFilterParameter.cpp                 |   3 +-
 .../FilterParameters/ChoiceFilterParameter.h  |   2 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   2 +-
 ...mparisonSelectionAdvancedFilterParameter.h |   3 +-
 .../ComparisonSelectionFilterParameter.cpp    |   2 +-
 .../ComparisonSelectionFilterParameter.h      |   3 +-
 .../ConstrainedDoubleFilterParameter.cpp      |   2 +-
 .../ConstrainedDoubleFilterParameter.h        |   3 +-
 .../ConstrainedIntFilterParameter.cpp         |   2 +-
 .../ConstrainedIntFilterParameter.h           |   3 +-
 .../DataArrayCreationFilterParameter.cpp      |   2 +-
 .../DataArrayCreationFilterParameter.h        |   4 +-
 .../DataArraySelectionFilterParameter.cpp     |  17 +-
 .../DataArraySelectionFilterParameter.h       |  12 +-
 ...DataContainerArrayProxyFilterParameter.cpp |   2 +-
 .../DataContainerArrayProxyFilterParameter.h  |   3 +-
 .../DataContainerCreationFilterParameter.cpp  |   2 +-
 .../DataContainerCreationFilterParameter.h    |   2 +-
 .../DataContainerSelectionFilterParameter.cpp |   2 +-
 .../DataContainerSelectionFilterParameter.h   |   3 +-
 .../DoubleFilterParameter.cpp                 |   6 +-
 .../FilterParameters/DoubleFilterParameter.h  |   6 +-
 .../DynamicChoiceFilterParameter.cpp          |   2 +-
 .../DynamicChoiceFilterParameter.h            |   2 +-
 .../DynamicTableFilterParameter.cpp           |   2 +-
 .../DynamicTableFilterParameter.h             |   2 +-
 .../FilterParameters/FloatFilterParameter.cpp |   6 +-
 .../FilterParameters/FloatFilterParameter.h   |   3 +-
 .../FloatVec2FilterParameter.cpp              |   2 +-
 .../FloatVec2FilterParameter.h                |   3 +-
 .../FloatVec3FilterParameter.cpp              |   2 +-
 .../FloatVec3FilterParameter.h                |   3 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |   2 +-
 .../FourthOrderPolynomialFilterParameter.h    |   5 +-
 .../InputFileFilterParameter.cpp              |   2 +-
 .../InputFileFilterParameter.h                |   3 +-
 .../InputPathFilterParameter.cpp              |   2 +-
 .../InputPathFilterParameter.h                |   3 +-
 .../FilterParameters/IntFilterParameter.cpp   |   4 +-
 .../FilterParameters/IntFilterParameter.h     |   3 +-
 .../LinkedBooleanFilterParameter.cpp          |   2 +-
 .../LinkedBooleanFilterParameter.h            |   2 +-
 .../LinkedChoicesFilterParameter.cpp          |   2 +-
 .../LinkedChoicesFilterParameter.h            |   2 +-
 .../LinkedPathCreationFilterParameter.cpp     |   2 +-
 .../LinkedPathCreationFilterParameter.h       |   2 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  12 +-
 ...iAttributeMatrixSelectionFilterParameter.h |   8 +-
 ...MultiDataArraySelectionFilterParameter.cpp |  12 +-
 .../MultiDataArraySelectionFilterParameter.h  |   8 +-
 ...iDataContainerSelectionFilterParameter.cpp |  34 +-
 ...ltiDataContainerSelectionFilterParameter.h |   8 +-
 .../NumericTypeFilterParameter.cpp            |   2 +-
 .../NumericTypeFilterParameter.h              |   2 +-
 .../OutputFileFilterParameter.cpp             |   2 +-
 .../OutputFileFilterParameter.h               |   2 +-
 .../OutputPathFilterParameter.cpp             |   2 +-
 .../OutputPathFilterParameter.h               |   2 +-
 .../ParagraphFilterParameter.cpp              |   2 +-
 .../ParagraphFilterParameter.h                |   2 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |   2 +-
 .../PhaseTypeSelectionFilterParameter.h       |   4 +-
 .../FilterParameters/RangeFilterParameter.cpp |   2 +-
 .../FilterParameters/RangeFilterParameter.h   |   2 +-
 .../ScalarTypeFilterParameter.cpp             |   2 +-
 .../ScalarTypeFilterParameter.h               |   2 +-
 .../SecondOrderPolynomialFilterParameter.cpp  |   2 +-
 .../SecondOrderPolynomialFilterParameter.h    |   2 +-
 .../ShapeTypeSelectionFilterParameter.cpp     |   2 +-
 .../ShapeTypeSelectionFilterParameter.h       |   2 +-
 .../StringFilterParameter.cpp                 |   3 +-
 .../FilterParameters/StringFilterParameter.h  |   3 +-
 .../ThirdOrderPolynomialFilterParameter.cpp   |   2 +-
 .../ThirdOrderPolynomialFilterParameter.h     |   2 +-
 .../UInt64FilterParameter.cpp                 |   3 +-
 .../FilterParameters/UInt64FilterParameter.h  |   2 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   2 +-
 Source/SIMPLib/Geometry/GeometryHelpers.cpp   |   2 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |   8 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   6 +-
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedHexOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedTetOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedTriOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |   2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   8 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   6 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   4 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |  18 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.h       |   2 +-
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |  14 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp   |  12 +-
 .../HDF5/H5PrimaryStatsDataDelegate.cpp       |  12 +-
 .../H5TransformationStatsDataDelegate.cpp     |  12 +-
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |   6 +-
 Source/SIMPLib/ITK/itkBridge.h                |  25 +-
 .../SIMPLib/ITK/itkGetComponentsDimensions.h  |  67 ++-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |   4 +-
 .../itkInPlaceImageToDream3DDataFilter.hxx    |   8 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |   4 +-
 .../SIMPLH5DataReaderRequirements.cpp         |   2 +-
 .../Utilities/SIMPLH5DataReaderRequirements.h |   4 +-
 .../FilterParameterWidgetUtils.hpp            |  21 +-
 .../ImportHDF5DatasetWidget.cpp               |   2 +-
 .../ReadASCIIDataWidget.cpp                   |   6 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  |  28 +-
 .../Widgets/DataArrayPathSelectionWidget.h    |   2 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |  12 +-
 .../ImportASCIIDataWizard/DataFormatPage.h    |   4 +-
 .../ImportASCIIDataWizard.cpp                 |   4 +-
 .../ImportASCIIDataWizard.h                   |   2 +-
 .../TupleTableWidget.cpp                      |   8 +-
 .../ImportASCIIDataWizard/TupleTableWidget.h  |   6 +-
 .../Templates/Pybind11CustomTypeCasts.in.h    |   2 +-
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |  16 +-
 Wrapping/Python/SIMPL/simpl_helpers.py        |   4 +-
 .../Python/Testing/AttributeMatrixTest.py     |   2 +-
 .../Convert_Attribute_Array_Data_Type.py      |   2 +-
 Wrapping/Python/Testing/DataArrayTest.py      |   6 +-
 .../Python/Testing/DataContainerArrayTest.py  |   4 +-
 Wrapping/Python/Testing/DataContainerTest.py  |   2 +-
 Wrapping/Python/Testing/ImageReadTest.py      |   4 +-
 230 files changed, 1295 insertions(+), 1533 deletions(-)

diff --git a/Source/Experimental/FilterCallback/FilterParameter.cpp b/Source/Experimental/FilterCallback/FilterParameter.cpp
index b9d65b5731..ab7970341b 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameter.cpp
@@ -61,7 +61,7 @@ void Int32Parameter::writeJson(QJsonObject& json) const
   json[QString::fromStdString(getPropertyName())] = m_GetterCallback();
 }
 
-Int32Parameter::Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+Int32Parameter::Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
   : IFilterParameter(humanLabel, propertyName, category, groupIndex)
   , m_DefaultValue(defaultValue)
   , m_SetterCallback(setterCallback)
@@ -110,7 +110,7 @@ void DoubleParameter::writeJson(QJsonObject& json) const
 }
 
 
-DoubleParameter::DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+DoubleParameter::DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
   : IFilterParameter(humanLabel, propertyName, category, groupIndex)
   , m_DefaultValue(defaultValue)
   , m_SetterCallback(setterCallback)
@@ -169,7 +169,7 @@ void DataArrayPathParameter::writeJson(QJsonObject& json) const
   }
 }
 
-DataArrayPathParameter::DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+DataArrayPathParameter::DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
   : IFilterParameter(humanLabel, propertyName, category, groupIndex)
   , m_DefaultValue(defaultValue)
   , m_SetterCallback(setterCallback)
diff --git a/Source/Experimental/FilterCallback/FilterParameter.h b/Source/Experimental/FilterCallback/FilterParameter.h
index 081265c5d7..208e10eae3 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.h
+++ b/Source/Experimental/FilterCallback/FilterParameter.h
@@ -160,8 +160,7 @@ class Int32Parameter : public IFilterParameter
                        const std::string& propertyName,
                        const int& defaultValue,
                        Category category,
-                       SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
     virtual ~Int32Parameter();
     
@@ -175,7 +174,7 @@ class Int32Parameter : public IFilterParameter
     void writeJson(QJsonObject& json) const override;
     
   protected:
-    Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex);
+    Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
     
   private:
     Int32Parameter(const Int32Parameter&) = delete; // Copy Constructor Not Implemented
@@ -200,8 +199,7 @@ class DoubleParameter : public IFilterParameter
                        const std::string& propertyName,
                        const double& defaultValue,
                        Category category,
-                       SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
     virtual ~DoubleParameter();
     
@@ -216,7 +214,7 @@ class DoubleParameter : public IFilterParameter
     void writeJson(QJsonObject& json) const override;
     
   protected:
-    DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex);
+    DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
     
   private:
     DoubleParameter(const DoubleParameter&) = delete; // Copy Constructor Not Implemented
@@ -241,8 +239,7 @@ class DataArrayPathParameter : public IFilterParameter
                        const std::string& propertyName,
                        const DataArrayPath& defaultValue,
                        Category category,
-                       SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
     
     virtual ~DataArrayPathParameter();
@@ -258,7 +255,7 @@ class DataArrayPathParameter : public IFilterParameter
     void writeJson(QJsonObject& json) const override;
     
   protected:
-    DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex);
+    DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
     
   private:
     DataArrayPathParameter(const DataArrayPathParameter&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/H5Support/QH5Lite.h b/Source/H5Support/QH5Lite.h
index 827a137250..c19079b53e 100644
--- a/Source/H5Support/QH5Lite.h
+++ b/Source/H5Support/QH5Lite.h
@@ -547,10 +547,7 @@ namespace H5Support_NAMESPACE
        * @return Standard HDF Error condition
        */
       template <typename T>
-      static herr_t readVectorAttribute(hid_t loc_id,
-                                        const QString& objName,
-                                        const QString& attrName,
-                                        QVector<T>& data)
+      static herr_t readVectorAttribute(hid_t loc_id, const QString& objName, const QString& attrName, std::vector<T>& data)
       {
 
         std::string objNameStr = objName.toStdString();
@@ -560,78 +557,6 @@ namespace H5Support_NAMESPACE
         data.resize(dataV.size());
         std::copy(dataV.begin(), dataV.end(), data.begin());
         return err;
-#if 0
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        hid_t tid;
-        T test = 0x00;
-        hid_t dataType = QH5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //qDebug() << "   Reading Vector Attribute at Path '" << objName << "' with Key: '" << attrName << "'";
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.toLatin1().data(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = QH5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.toLatin1().data(), attrName.toLatin1().data(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            //Need to allocate the array size
-            H5T_class_t type_class;
-            size_t type_size;
-            QVector<hsize_t> dims;
-            err = QH5Lite::getAttributeInfo(loc_id, objName, attrName, dims, type_class, type_size, tid);
-            hsize_t numElements = 1;
-            for (QVector<hsize_t>::iterator iter = dims.begin(); iter < dims.end(); ++iter )
-            {
-              numElements *= *(iter);
-            }
-            //qDebug() << "    Vector Attribute has " << numElements << " elements.";
-            if (numElements > static_cast<hsize_t>(std::numeric_limits<qint32>::max() ) )
-            {
-              qDebug() << "Number of Elements in Array is larger than QVector can handle. Suggest using a std::vector<> instead";
-              err = -1000;
-            }
-            else
-            {
-              data.resize( static_cast<signed int>(numElements) );
-              err = H5Aread( attr_id, dataType, &(data.front()) );
-            }
-            if ( err < 0 )
-            {
-              qDebug() << "Error Reading Attribute." << err;
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              qDebug() << "Error Closing Attribute";
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = attr_id;
-          }
-          err = QH5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            qDebug() << "Error Closing Object";
-            retErr = err;
-          }
-        }
-        return retErr;
-#endif
       }
 
       /**
@@ -652,57 +577,6 @@ namespace H5Support_NAMESPACE
         std::string attrNameStr = attrName.toStdString();
         herr_t  err = H5Lite::readScalarAttribute(loc_id, objNameStr, attrNameStr, data);
         return err;
-#if 0
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        T test = static_cast<T>(0x00);
-        hid_t dataType = QH5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //qDebug() << "Reading Scalar style Attribute at Path '" << objName << "' with Key: '" << attrName << "'";
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.toLatin1().data(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = QH5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.toLatin1().data(), attrName.toLatin1().data(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            err = H5Aread( attr_id, dataType, &data );
-            if ( err < 0 )
-            {
-              qDebug() << "Error Reading Attribute.";
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              qDebug() << "Error Closing Attribute";
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = attr_id;
-          }
-          err = QH5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            qDebug() << "Error Closing Object";
-            retErr = err;
-          }
-        }
-        return retErr;
-#endif
       }
 
       /**
@@ -723,57 +597,6 @@ namespace H5Support_NAMESPACE
         std::string attrNameStr = attrName.toStdString();
         herr_t  err = H5Lite::readPointerAttribute(loc_id, objNameStr, attrNameStr, data);
         return err;
-#if 0
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        T test = 0x00;
-        hid_t dataType = QH5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //qDebug() << "   Reading Vector Attribute at Path '" << objName << "' with Key: '" << attrName << "'";
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.toLatin1().data(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = QH5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.toLatin1().data(), attrName.toLatin1().data(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            err = H5Aread( attr_id, dataType, data);
-            if ( err < 0 )
-            {
-              qDebug() << "Error Reading Attribute." << err;
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              qDebug() << "Error Closing Attribute";
-              retErr = err;
-            }
-          }
-          else
-          {
-            //retErr = attr_id;
-          }
-          err = QH5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            qDebug() << "Error Closing Object";
-            retErr = err;
-          }
-        }
-        return retErr;
-#endif
       }
 
       /**
diff --git a/Source/H5Support/Test/H5LiteTest.cpp b/Source/H5Support/Test/H5LiteTest.cpp
index efd0023a2f..bd0540ac67 100644
--- a/Source/H5Support/Test/H5LiteTest.cpp
+++ b/Source/H5Support/Test/H5LiteTest.cpp
@@ -364,14 +364,14 @@ class H5LiteTest
     attributeKey = "VectorAttribute<" + attributeKey + ">";
 
     int32_t numElements = DIM0;
-    QVector<hsize_t> dims(1, DIM0);
+    std::vector<hsize_t> dims(1, DIM0);
 
-    QVector<T> data(DIM0, 0);
+    std::vector<T> data(DIM0, 0);
     for(int i = 0; i < numElements; ++i)
     {
       data[i] = (T)(i);
     }
-    QVector<T> rData(numElements, 0); // allocate and zero out the memory
+    std::vector<T> rData(numElements, 0); // allocate and zero out the memory
     err = QH5Lite::readVectorAttribute(file_id, dsetName, attributeKey, rData);
     DREAM3D_REQUIRE(err >= 0);
     DREAM3D_REQUIRE(data == rData);
diff --git a/Source/SIMPLib/Common/EnsembleInfo.cpp b/Source/SIMPLib/Common/EnsembleInfo.cpp
index 1e3a6741b0..a2c8f258e4 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.cpp
+++ b/Source/SIMPLib/Common/EnsembleInfo.cpp
@@ -200,7 +200,7 @@ void EnsembleInfo::setPhaseName(size_t index, QString phaseName)
 // -----------------------------------------------------------------------------
 void EnsembleInfo::remove(size_t index)
 {
-  QVector<size_t> indexVec;
+  std::vector<size_t> indexVec;
   indexVec.push_back(index);
   m_CrystalStructures.erase(m_CrystalStructures.begin() + index);
   m_PhaseTypes.erase(m_PhaseTypes.begin() + index);
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 27881ba6be..fc361be8e2 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -220,9 +220,11 @@ public:     \
     return superclass::IsTypeOf(type); \
   }
 
-#define SIMPL_CLASS_VERSION(vers)\
-  virtual int getClassVersion() { return vers; }
-
+#define SIMPL_CLASS_VERSION(vers)                                                                                                                                                                      \
+  int getClassVersion() override                                                                                                                                                                       \
+  {                                                                                                                                                                                                    \
+    return vers;                                                                                                                                                                                       \
+  }
 
 //------------------------------------------------------------------------------
 // Macros for Properties
diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 42be46c80a..aa0abc72bd 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -37,7 +37,8 @@
 using namespace TemplateHelpers;
 
 // -----------------------------------------------------------------------------
-IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType, RenameDataPath::DataID_t id)
+IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const std::vector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType,
+                                                              RenameDataPath::DataID_t id)
 {
 
   IDataArrayShPtr ptr = IDataArray::NullPointer();
@@ -99,7 +100,8 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue, RenameDataPath::DataID_t id)
+IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const std::vector<size_t>& compDims, int arrayType, double initValue,
+                                                             RenameDataPath::DataID_t id)
 {
   IDataArrayShPtr ptr = IDataArray::NullPointer();
 
@@ -150,16 +152,16 @@ IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f,
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const size_t& numTuples, const QVector<size_t>& compDims, const QString& arrayName, bool allocate,
+IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const size_t& numTuples, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate,
                                                      const IDataArrayShPtr& sourceArrayType)
 {
   CreateArrayFromArrayType classInstance;
-  QVector<size_t> tupleDims(1, numTuples);
+  std::vector<size_t> tupleDims = {numTuples};
   return classInstance(f, tupleDims, compDims, arrayName, allocate, sourceArrayType);
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const QVector<size_t>& tupleDims, const QVector<size_t>& compDims, const QString& arrayName, bool allocate,
+IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const std::vector<size_t>& tupleDims, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate,
                                                      const IDataArrayShPtr& sourceArrayType)
 {
   IDataArrayShPtr ptr = IDataArray::NullPointer();
@@ -221,15 +223,16 @@ IDataArrayShPtr CreateArrayFromArrayType::operator()(AbstractFilter* f, const QV
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const size_t& numTuples, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type)
+IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const size_t& numTuples, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type)
 {
   CreateArrayFromType classInstance;
-  QVector<size_t> tupleDims(1, numTuples);
+  std::vector<size_t> tupleDims(1, numTuples);
   return classInstance(f, tupleDims, compDims, arrayName, allocate, type);
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector<size_t>& tupleDims, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type)
+IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const std::vector<size_t>& tupleDims, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate,
+                                                const QString& type)
 {
   IDataArrayShPtr ptr = IDataArray::NullPointer();
 
@@ -287,7 +290,7 @@ IDataArrayShPtr CreateArrayFromType::operator()(AbstractFilter* f, const QVector
 }
 
 // -----------------------------------------------------------------------------
-IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, QVector<size_t>& compDims)
+IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const DataArrayPath& arrayPath, std::vector<size_t>& compDims)
 {
   IDataArrayShPtr retPtr = IDataArray::NullPointer();
   DataContainer::Pointer volDataCntr = f->getDataContainerArray()->getPrereqDataContainer(f, arrayPath.getDataContainerName(), false);
@@ -311,7 +314,7 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
     f->setErrorCondition(Errors::MissingArray, ss);
     return retPtr;
   }
-  if(compDims.isEmpty())
+  if(compDims.empty())
   {
     compDims = templ_ptr->getComponentDimensions();
   }
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index bf9abc6181..2ac5858ba5 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -36,6 +36,7 @@
 
 //-- C++11 Includes
 #include <memory>
+#include <vector>
 
 #include <QtCore/QString>
 
@@ -230,7 +231,8 @@ class SIMPLib_EXPORT CreateNonPrereqArrayFromArrayType
    * @param sourceArrayType
    * @return
    */
-  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType, RenameDataPath::DataID_t = RenameDataPath::k_Invalid_ID);
+  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const std::vector<size_t>& compDims, const IDataArrayShPtr& sourceArrayType,
+                             RenameDataPath::DataID_t = RenameDataPath::k_Invalid_ID);
 };
 
 /**
@@ -256,7 +258,8 @@ class SIMPLib_EXPORT CreateNonPrereqArrayFromTypeEnum
    * @param initValue
    * @return
    */
-  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const QVector<size_t>& compDims, int arrayType, double initValue, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, const std::vector<size_t>& compDims, int arrayType, double initValue,
+                             RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 };
 
 /**
@@ -273,7 +276,7 @@ class SIMPLib_EXPORT CreateArrayFromArrayType
   CreateArrayFromArrayType& operator=(const CreateArrayFromArrayType&) = delete; // Copy Assignment Not Implemented
   CreateArrayFromArrayType& operator=(CreateArrayFromArrayType&&) = delete;      // Move Assignment Not Implemented
 
-  IDataArrayShPtr operator()(AbstractFilter* f, const size_t& numTuples, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const IDataArrayShPtr& sourceArrayType);
+  IDataArrayShPtr operator()(AbstractFilter* f, const size_t& numTuples, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate, const IDataArrayShPtr& sourceArrayType);
 
   /**
    * @brief operator ()
@@ -285,7 +288,8 @@ class SIMPLib_EXPORT CreateArrayFromArrayType
    * @param sourceArrayType
    * @return
    */
-  IDataArrayShPtr operator()(AbstractFilter* f, const QVector<size_t>& tupleDims, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const IDataArrayShPtr& sourceArrayType);
+  IDataArrayShPtr operator()(AbstractFilter* f, const std::vector<size_t>& tupleDims, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate,
+                             const IDataArrayShPtr& sourceArrayType);
 };
 
 /**
@@ -312,7 +316,7 @@ class SIMPLib_EXPORT CreateArrayFromType
    * @param type
    * @return
    */
-  IDataArrayShPtr operator()(AbstractFilter* f, const size_t& numTuples, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type);
+  IDataArrayShPtr operator()(AbstractFilter* f, const size_t& numTuples, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type);
 
   /**
    * @brief operator ()
@@ -324,7 +328,7 @@ class SIMPLib_EXPORT CreateArrayFromType
    * @param type
    * @return
    */
-  IDataArrayShPtr operator()(AbstractFilter* f, const QVector<size_t>& tupleDims, const QVector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type);
+  IDataArrayShPtr operator()(AbstractFilter* f, const std::vector<size_t>& tupleDims, const std::vector<size_t>& compDims, const QString& arrayName, bool allocate, const QString& type);
 };
 
 /**
@@ -347,7 +351,7 @@ class SIMPLib_EXPORT GetPrereqArrayFromPath
    * @param compDims
    * @return
    */
-  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, QVector<size_t>& compDims);
+  IDataArrayWkPtr operator()(AbstractFilter* f, const DataArrayPath& arrayPath, std::vector<size_t>& compDims);
   // Move assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 778894358a..31f3c93700 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -265,7 +265,7 @@ void ArrayCalculator::dataCheck()
 
   AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getAttributeMatrix(m_SelectedAttributeMatrix);
 
-  QVector<size_t> cDims;
+  std::vector<size_t> cDims;
   ICalculatorArray::ValueType resultType = ICalculatorArray::ValueType::Unknown;
 
   for(const auto& item1 : parsedInfix)
@@ -277,7 +277,7 @@ void ArrayCalculator::dataCheck()
       ICalculatorArray::Pointer array1 = std::dynamic_pointer_cast<ICalculatorArray>(item1);
       if (item1->isArray())
       {
-        if(!cDims.isEmpty() && resultType == ICalculatorArray::ValueType::Array && cDims != array1->getArray()->getComponentDimensions())
+        if(!cDims.empty() && resultType == ICalculatorArray::ValueType::Array && cDims != array1->getArray()->getComponentDimensions())
         {
           QString ss = QObject::tr("Attribute Array symbols in the infix expression have mismatching component dimensions");
           setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::INCONSISTENT_COMP_DIMS), ss);
@@ -804,7 +804,7 @@ void ArrayCalculator::parseMinusSign(QString token, QVector<CalculatorItem::Poin
 void ArrayCalculator::parseNumericValue(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, double number)
 {
   // This is a number, so create an array with numOfTuples equal to 1 and set the value into it
-  DoubleArrayType::Pointer ptr = DoubleArrayType::CreateArray(1, QVector<size_t>(1, 1), "INTERNAL_USE_ONLY_NumberArray");
+  DoubleArrayType::Pointer ptr = DoubleArrayType::CreateArray(1, std::vector<size_t>(1, 1), "INTERNAL_USE_ONLY_NumberArray");
   ptr->setValue(0, number);
   CalculatorItem::Pointer itemPtr = CalculatorArray<double>::New(ptr, ICalculatorArray::Number, !getInPreflight());
   parsedInfix.push_back(itemPtr);
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 9688060ba5..f361983eb3 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
     PYB11_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
     PYB11_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
-    PYB11_PROPERTY(AngleUnits Units READ getUnits WRITE setUnits)
+    PYB11_PROPERTY(ArrayCalculator::AngleUnits Units READ getUnits WRITE setUnits)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 0b6982b80e..90f211aa84 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -285,7 +285,7 @@ void CombineAttributeArrays::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, totalComps);
+  std::vector<size_t> cDims(1, totalComps);
 
   DataArrayPath tempPath(getSelectedDataArrayPaths()[0].getDataContainerName(), getSelectedDataArrayPaths()[0].getAttributeMatrixName(), getStackedDataArrayName());
   m_StackedDataPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_SelectedWeakPtrVector[0].lock(), CombinedArrayID);
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 8f73fd41b0..70d94ea986 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -107,7 +107,7 @@ void CombineAttributeMatrices::setupFilterParameters()
     amTypes.push_back(AttributeMatrix::Type::VertexFeature);
     QVector<QString> daTypes;
     daTypes.push_back(SIMPL::TypeNames::Int32);
-    QVector<QVector<size_t>> compDims;
+    std::vector<std::vector<size_t>> compDims;
     compDims.resize(1);
     compDims[0].resize(1);
     compDims[0][0] = 1;
@@ -197,7 +197,7 @@ void CombineAttributeMatrices::dataCheck()
   // Note that the minus 1 in the totalTuples calculation is to account for the fact that the zeroth tuple in the two attribute matrices should only be counted once, not twice.
   // All Feature or Ensemble AMs should start from 1 and the zeroth tuple can be combined in the two AMs
   size_t totalTuples = firstAttrMat->getNumberOfTuples() + secondAttrMat->getNumberOfTuples() - 1;
-  QVector<size_t> tDims(1, totalTuples);
+  std::vector<size_t> tDims(1, totalTuples);
   m->createNonPrereqAttributeMatrix(this, getCombinedAttributeMatrixName(), tDims, firstAttrMat->getType(), CombinedMatrixID);
   if(getErrorCode() < 0)
   {
@@ -205,7 +205,7 @@ void CombineAttributeMatrices::dataCheck()
   }
   AttributeMatrix::Pointer combinedAttrMat = m->getAttributeMatrix(getCombinedAttributeMatrixName());
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_FirstIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFirstIndexArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FirstIndexPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
@@ -236,7 +236,7 @@ void CombineAttributeMatrices::dataCheck()
     IDataArray::Pointer tmpDataArray = firstAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, *iter, -90001);
     if(getErrorCode() >= 0)
     {
-      QVector<size_t> cDims = tmpDataArray->getComponentDimensions();
+      std::vector<size_t> cDims = tmpDataArray->getComponentDimensions();
       TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, tmpDataArray);
     }
   }
@@ -249,7 +249,7 @@ void CombineAttributeMatrices::dataCheck()
     {
       if(!fArrayNames.contains(*iter))
       {
-        QVector<size_t> cDims = tmpDataArray->getComponentDimensions();
+        std::vector<size_t> cDims = tmpDataArray->getComponentDimensions();
         TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, tmpDataArray);
       }
     }
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index a376c5edcd..10523a27d8 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -176,7 +176,7 @@ void ConditionalSetValue::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_ConditionalArrayPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getConditionalArrayPath(),
                                                                                                            cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_ConditionalArrayPtr.lock())                                                                      /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index f33628800d..48d8ea4d07 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -285,7 +285,7 @@ void ConvertColorToGrayScale::dataCheck()
   AttributeMatrix::Pointer outAM;
   if(m_CreateNewAttributeMatrix)
   {
-    QVector<size_t> tDims = inAM->getTupleDimensions();
+    std::vector<size_t> tDims = inAM->getTupleDimensions();
 
     outAM = dc->createNonPrereqAttributeMatrix(this, getOutputAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
     if(getErrorCode() < 0 || nullptr == outAM.get())
@@ -308,7 +308,7 @@ void ConvertColorToGrayScale::dataCheck()
     {
       return;
     }
-    QVector<size_t> outCDims(1, 1);
+    std::vector<size_t> outCDims(1, 1);
     if(outAM.get() == nullptr)
     {
       outAM = dc->getPrereqAttributeMatrix(this, inputAMPath.getAttributeMatrixName(), -62105);
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 1c94f4be1b..1b4786248a 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -51,7 +51,7 @@
     Type::Pointer Type##Ptr = std::dynamic_pointer_cast<Type>(Array);                                                                                                                                  \
     if(nullptr != Type##Ptr)                                                                                                                                                                           \
     {                                                                                                                                                                                                  \
-      QVector<size_t> dims = Array->getComponentDimensions();                                                                                                                                          \
+      std::vector<size_t> dims = Array->getComponentDimensions();                                                                                                                                      \
       Detail::ConvertData<Type>(this, Type##Ptr.get(), dims, DataContainer, ScalarType, AttributeMatrixName, OutputName);                                                                              \
       completed = true;                                                                                                                                                                                \
     }                                                                                                                                                                                                  \
@@ -69,7 +69,8 @@ template <typename T>
  * @param attributeMatrixName Name of target AttributeMatrix
  * @param name Name of converted array
  */
-void ConvertData(AbstractFilter* filter, T* ptr, QVector<size_t> dims, DataContainer::Pointer m, SIMPL::NumericTypes::Type scalarType, const QString attributeMatrixName, const QString& name)
+void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims, DataContainer::Pointer m, SIMPL::NumericTypes::Type scalarType, const QString attributeMatrixName,
+                 const QString& name)
 {
   size_t voxels = ptr->getNumberOfTuples();
   size_t size = ptr->getSize();
@@ -267,7 +268,7 @@ void ConvertData::dataCheck()
       return;
     }
 
-    QVector<size_t> dims = p->getComponentDimensions();
+    std::vector<size_t> dims = p->getComponentDimensions();
     size_t voxels = cellAttrMat->getNumberOfTuples();
     if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
     {
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 4a89334ced..f66b406d96 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -121,7 +121,7 @@ void CopyFeatureArrayToElementArray::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
@@ -170,7 +170,7 @@ template <typename T> IDataArray::Pointer copyData(IDataArray::Pointer inputData
     return IDataArray::NullPointer();
   }
 
-  QVector<size_t> cDims = inputData->getComponentDimensions();
+  std::vector<size_t> cDims = inputData->getComponentDimensions();
   typename DataArray<T>::Pointer cell = DataArray<T>::CreateArray(totalPoints, cDims, cellArrayName);
 
   T* fPtr = feature->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 2f2ac7706f..c123816213 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -140,7 +140,7 @@ void CreateAttributeMatrix::dataCheck()
   }
 
   std::vector<double> cols = rows[0]; // Get the first (and only) row of data
-  QVector<size_t> tDims(cols.size(), 0);
+  std::vector<size_t> tDims(cols.size(), 0);
   for(int i = 0; i < cols.size(); i++)
   {
     tDims[i] = static_cast<size_t>(cols[i]);
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index acb75a4301..371d61bc71 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -352,7 +352,7 @@ void CreateDataArray::dataCheck()
     QString ss = QObject::tr("The Created DataArrayPath is invalid. Please select the Data Container, Attribute Matrix and set an output DataArray name.");
     setErrorCondition(-8051, ss);
   }
-  QVector<size_t> cDims(1, getNumberOfComponents());
+  std::vector<size_t> cDims(1, getNumberOfComponents());
   if(getErrorCode() < 0)
   {
     return;
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 17ee49bf93..eacdfb4f4f 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -124,7 +124,7 @@ void CreateFeatureArrayFromElementArray::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
@@ -171,7 +171,7 @@ template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, I
     return IDataArray::NullPointer();
   }
 
-  QVector<size_t> dims = inputData->getComponentDimensions();
+  std::vector<size_t> dims = inputData->getComponentDimensions();
   typename DataArray<T>::Pointer feature = DataArray<T>::CreateArray(features, dims, createdArrayName);
 
   T* fPtr = feature->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 90bc5f18d5..2b8a3cf1dd 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -289,7 +289,7 @@ void CreateGeometry::dataCheck()
     image->setSpacing(getSpacing());
     dc->setGeometry(image);
 
-    QVector<size_t> tDims = {image->getXPoints(), image->getYPoints(), image->getZPoints()};
+    std::vector<size_t> tDims = {image->getXPoints(), image->getYPoints(), image->getZPoints()};
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getImageCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
@@ -297,7 +297,7 @@ void CreateGeometry::dataCheck()
   }
   case 1: // RectGridGeom
   {
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
 
     m_XBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getXBoundsArrayPath(), cDims);
     if(m_XBoundsPtr.lock())
@@ -353,7 +353,7 @@ void CreateGeometry::dataCheck()
     rectgrid->setDimensions(SizeVec3Type(m_XBoundsPtr.lock()->getNumberOfTuples() - 1, m_YBoundsPtr.lock()->getNumberOfTuples() - 1, m_ZBoundsPtr.lock()->getNumberOfTuples() - 1));
     dc->setGeometry(rectgrid);
 
-    QVector<size_t> tDims = {rectgrid->getXPoints(), rectgrid->getYPoints(), rectgrid->getZPoints()};
+    std::vector<size_t> tDims = {rectgrid->getXPoints(), rectgrid->getYPoints(), rectgrid->getZPoints()};
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getRectGridCellAttributeMatrixName());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
@@ -361,7 +361,7 @@ void CreateGeometry::dataCheck()
   }
   case 2: // VertexGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath0(), cDims);
 
@@ -382,7 +382,7 @@ void CreateGeometry::dataCheck()
     }
     dc->setGeometry(vertex);
 
-    QVector<size_t> tDims(1, vertex->getNumberOfVertices());
+    std::vector<size_t> tDims(1, vertex->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName0());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
@@ -390,7 +390,7 @@ void CreateGeometry::dataCheck()
   }
   case 3: // EdgeGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath1(), cDims);
     cDims[0] = 2;
@@ -420,7 +420,7 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(edge);
 
     m_NumVerts = edge->getNumberOfVertices();
-    QVector<size_t> tDims(1, edge->getNumberOfVertices());
+    std::vector<size_t> tDims(1, edge->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName1());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
@@ -431,7 +431,7 @@ void CreateGeometry::dataCheck()
   }
   case 4: // TriangleGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath2(), cDims);
     m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTriList, AbstractFilter>(this, getSharedTriListArrayPath(), cDims);
@@ -460,7 +460,7 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(triangle);
 
     m_NumVerts = triangle->getNumberOfVertices();
-    QVector<size_t> tDims(1, triangle->getNumberOfVertices());
+    std::vector<size_t> tDims(1, triangle->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName2());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
@@ -471,7 +471,7 @@ void CreateGeometry::dataCheck()
   }
   case 5: // QuadGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath3(), cDims);
     cDims[0] = 4;
@@ -501,7 +501,7 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(quadrilateral);
 
     m_NumVerts = quadrilateral->getNumberOfVertices();
-    QVector<size_t> tDims(1, quadrilateral->getNumberOfVertices());
+    std::vector<size_t> tDims(1, quadrilateral->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName3());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
@@ -512,7 +512,7 @@ void CreateGeometry::dataCheck()
   }
   case 6: // TetrahedralGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath4(), cDims);
     cDims[0] = 4;
@@ -543,7 +543,7 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(tetrahedral);
 
     m_NumVerts = tetrahedral->getNumberOfVertices();
-    QVector<size_t> tDims(1, tetrahedral->getNumberOfVertices());
+    std::vector<size_t> tDims(1, tetrahedral->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName4());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
@@ -554,7 +554,7 @@ void CreateGeometry::dataCheck()
   }
   case 7: // HexahedralGeom
   {
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath5(), cDims);
     cDims[0] = 8;
@@ -586,7 +586,7 @@ void CreateGeometry::dataCheck()
     dc->setGeometry(hexahedral);
 
     m_NumVerts = hexahedral->getNumberOfVertices();
-    QVector<size_t> tDims(1, hexahedral->getNumberOfVertices());
+    std::vector<size_t> tDims(1, hexahedral->getNumberOfVertices());
     DataArrayPath path = getDataContainerName();
     path.setAttributeMatrixName(getVertexAttributeMatrixName5());
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Vertex);
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index a9d9130b6c..4c3293f4e3 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -152,7 +152,7 @@ void CreateStringArray::dataCheck()
     QString ss = "Empty initialization value.";
     setErrorCondition(-5759, ss);
   }
-  QVector<size_t> cDims(1, getNumberOfComponents());
+  std::vector<size_t> cDims(1, getNumberOfComponents());
   if(getErrorCode() < 0)
   {
     return;
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 1872f92f3f..b498c294a6 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -158,7 +158,7 @@ void CropVertexGeometry::dataCheck()
 
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getDataContainerName());
   m_AttrMatList = m->getAttributeMatrixNames();
-  QVector<size_t> tDims(1, 0);
+  std::vector<size_t> tDims(1, 0);
   QList<QString> tempDataArrayList;
   DataArrayPath tempPath;
   AttributeMatrix::Type tempAttrMatType = AttributeMatrix::Type::Vertex;
@@ -189,7 +189,7 @@ void CropVertexGeometry::dataCheck()
           IDataArray::Pointer tmpDataArray = tmpAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, data_array, -90002);
           if(getErrorCode() >= 0)
           {
-            QVector<size_t> cDims = tmpDataArray->getComponentDimensions();
+            std::vector<size_t> cDims = tmpDataArray->getComponentDimensions();
             TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, tmpDataArray);
           }
         }
@@ -287,7 +287,7 @@ void CropVertexGeometry::execute()
     crop->setCoords(i, coords);
   }
 
-  QVector<size_t> tDims(1, croppedPoints.size());
+  std::vector<size_t> tDims(1, croppedPoints.size());
 
   for(auto&& attr_mat : m_AttrMatList)
   {
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index 03455e789f..b153e7bf28 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -246,7 +246,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     yarrays.push_back(rectgrid->getYBounds());
     zarrays.push_back(rectgrid->getZBounds());
 
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
 
     m_XBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getXBoundsArrayPath(), 0, cDims, "", RectGrid_XBoundsID);
     if(m_XBoundsPtr.lock())
@@ -291,7 +291,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     QVector<IDataArray::Pointer> arrays;
     arrays.push_back(vertex->getVertices());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath0(), 0, cDims, "", Vert_SharedVertexID);
     if(m_VertsPtr.lock())
@@ -316,7 +316,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     varrays.push_back(edge->getVertices());
     earrays.push_back(edge->getEdges());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath1(), 0, cDims, "", Edge_SharedVertexID);
     if(m_VertsPtr.lock())
@@ -354,7 +354,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     varrays.push_back(triangle->getVertices());
     earrays.push_back(triangle->getTriangles());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath2(), 0, cDims, "", Tri_SharedVertexID);
     if(m_VertsPtr.lock())
@@ -390,7 +390,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     varrays.push_back(quad->getVertices());
     earrays.push_back(quad->getQuads());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath3(), 0, cDims, "", Quad_SharedVertexID);
     if(m_VertsPtr.lock())
@@ -428,7 +428,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     varrays.push_back(tet->getVertices());
     earrays.push_back(tet->getTetrahedra());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath4(), 0, cDims, "", Tet_SharedVertexID);
     if(m_VertsPtr.lock())
@@ -466,7 +466,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
     varrays.push_back(hex->getVertices());
     earrays.push_back(hex->getHexahedra());
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath5(), 0, cDims, "", Hex_SharedVertexID);
     if(m_VertsPtr.lock())
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 5f2fe581eb..7eb2654f6b 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -150,7 +150,7 @@ void ExtractComponentAsArray::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   DataArrayPath tempPath(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getNewArrayArrayName());
   m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), DataArrayID);
 }
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 6ff61f8346..aafd582d1b 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -103,7 +103,7 @@ void FeatureCountDecision::dataCheck()
 
   getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getFeatureIdsArrayPath().getDataContainerName());
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
 
   m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index f85a10e34e..69ed6b39df 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -366,7 +366,7 @@ void FindDerivatives::dataCheck()
 
   int cDims = m_InArrayPtr.lock()->getNumberOfComponents();
   cDims *= 3;
-  QVector<size_t> dims(1, cDims);
+  std::vector<size_t> dims(1, cDims);
 
   m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(
       this, getDerivativesArrayPath(), 0, dims, "", DerivativesArrayID);    /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 04198fd942..f99bf5ff01 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -21,7 +21,7 @@ enum createdPathID : RenameDataPath::DataID_t {
 //
 // -----------------------------------------------------------------------------
 template <typename T>
-int findRightBinIndex(T nValue, QVector<float> binPoints)
+int findRightBinIndex(T nValue, std::vector<float> binPoints)
 {
   /* This is a brute-force way of finding the proper bins.
      We will need to change this method to a binary search. */
@@ -37,7 +37,7 @@ int findRightBinIndex(T nValue, QVector<float> binPoints)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int findRightBinIndex_Binary(float nValue, QVector<float> binPoints)
+int findRightBinIndex_Binary(float nValue, std::vector<float> binPoints)
 {
   int min = 0, max = binPoints.size() - 1;
   while (min < max)
@@ -63,13 +63,13 @@ template <typename T>
 class GenerateColorTableImpl
 {
 public:
-  GenerateColorTableImpl(typename DataArray<T>::Pointer arrayPtr, QVector<float> binPoints,
-                         std::vector<std::vector<double> > controlPoints, int numControlColors, UInt8ArrayType::Pointer colorArray) :
-    m_ArrayPtr(arrayPtr),
-    m_BinPoints(binPoints),
-    m_NumControlColors(numControlColors),
-    m_ControlPoints(controlPoints),
-    m_ColorArray(colorArray)
+  GenerateColorTableImpl(typename DataArray<T>::Pointer arrayPtr, std::vector<float> binPoints, std::vector<std::vector<double>> controlPoints, int numControlColors,
+                         UInt8ArrayType::Pointer colorArray)
+  : m_ArrayPtr(arrayPtr)
+  , m_BinPoints(std::move(binPoints))
+  , m_NumControlColors(numControlColors)
+  , m_ControlPoints(std::move(controlPoints))
+  , m_ColorArray(std::move(colorArray))
   {
     m_ArrayMin = arrayPtr->getValue(0);
     m_ArrayMax = arrayPtr->getValue(0);
@@ -132,7 +132,7 @@ class GenerateColorTableImpl
   }
 private:
   typename DataArray<T>::Pointer                        m_ArrayPtr;
-  QVector<float>                                        m_BinPoints;
+  std::vector<float> m_BinPoints;
   T                                                     m_ArrayMin;
   T                                                     m_ArrayMax;
   int                                                   m_NumControlColors;
@@ -158,7 +158,7 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   std::vector<std::vector<double> > controlPoints(numControlColors, std::vector<double>(numComponents));
 
   // Migrate colorControlPoints values from QJsonArray to 2D array.  Store A-values in binPoints vector.
-  QVector<float> binPoints;
+  std::vector<float> binPoints;
   for (int i=0; i<numControlColors; i++)
   {
     for (int j=0; j<numComponents; j++)
@@ -182,7 +182,7 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   DataArrayPath tmpPath = selectedDAP;
   tmpPath.setDataArrayName(rgbArrayName);
 
-  UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, tmpPath, QVector<size_t>(1, 3));
+  UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, tmpPath, std::vector<size_t>(1, 3));
   if (colorArray.get() == nullptr) { return; }
 
   ParallelDataAlgorithm dataAlg;
@@ -256,7 +256,7 @@ void GenerateColorTable::dataCheck()
   DataArrayPath tmpPath = getSelectedDataArrayPath();
   tmpPath.setDataArrayName(getRgbArrayName());
 
-  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(this, tmpPath, 0, QVector<size_t>(1, 3), "", ColorArrayID);
+  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(this, tmpPath, 0, std::vector<size_t>(1, 3), "", ColorArrayID);
 }
 
 // -----------------------------------------------------------------------------
@@ -285,59 +285,59 @@ void GenerateColorTable::execute()
     return;
   }
 
-  if (getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  if(getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    Int8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int8_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    UInt8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint8_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    Int16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int16_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    UInt16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint16_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    Int32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int32_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    UInt32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint32_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    Int64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int64_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    UInt64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint64_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    DoubleArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    DoubleArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<double>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    FloatArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    FloatArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<float>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if (getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), QVector<size_t>(1, 1)).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    BoolArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), QVector<size_t>(1, 1));
+    BoolArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<bool>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
   else
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 921311d506..ec8113f0b1 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -428,14 +428,14 @@ void ImportAsciDataArray::dataCheck()
     return;
   }
 
-  QVector<size_t> tDims = attrMat->getTupleDimensions();
+  std::vector<size_t> tDims = attrMat->getTupleDimensions();
   size_t totalDim = 1;
-  for(int i = 0; i < tDims.size(); i++)
+  for(size_t i = 0; i < tDims.size(); i++)
   {
     totalDim = totalDim * tDims[i];
   }
 
-  QVector<size_t> cDims(1, m_NumberOfComponents);
+  std::vector<size_t> cDims(1, m_NumberOfComponents);
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
     getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
@@ -517,7 +517,7 @@ void ImportAsciDataArray::execute()
 
   char delimiter = converSelectedDelimiter();
 
-  QVector<size_t> cDims(1, m_NumberOfComponents);
+  std::vector<size_t> cDims(1, m_NumberOfComponents);
   int32_t err = 0;
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index c7ad987abb..3fa56dd922 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -49,7 +49,8 @@ namespace Detail
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const size_t& numOfTuples, const QVector<size_t>& cDims)
+template <typename T>
+IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const size_t& numOfTuples, const std::vector<size_t>& cDims)
 {
   herr_t err = -1;
   IDataArray::Pointer ptr;
@@ -215,8 +216,8 @@ void ImportHDF5Dataset::dataCheck()
       return;
     }
 
-    QVector<size_t> cDims = createComponentDimensions(cDimsStr);
-    if(cDims.isEmpty())
+    std::vector<size_t> cDims = createComponentDimensions(cDimsStr);
+    if(cDims.empty())
     {
       QString ss = tr("Component Dimensions are not in the right format for dataset with path '%1'. Use comma-separated values (ex: 4x2 would be '4, 2').").arg(datasetPath);
       setErrorCondition(-20007, ss);
@@ -256,8 +257,8 @@ void ImportHDF5Dataset::dataCheck()
     stream << tr("Attribute Matrix Path: %1\n").arg(m_SelectedAttributeMatrix.serialize("/"));
 
     size_t userEnteredTotalElements = 1;
-    QVector<size_t> amTupleDims = am->getTupleDimensions();
-    stream << tr("No. of Attribute Matrix Dimension(s): ") << locale.toString(amTupleDims.size()) << "\n";
+    std::vector<size_t> amTupleDims = am->getTupleDimensions();
+    stream << tr("No. of Attribute Matrix Dimension(s): ") << locale.toString(static_cast<quint64>(amTupleDims.size())) << "\n";
     stream << "Attribute Matrix Dimension(s): ";
     for(int i = 0; i < amTupleDims.size(); i++)
     {
@@ -274,7 +275,7 @@ void ImportHDF5Dataset::dataCheck()
     int numOfAMTuples = am->getNumberOfTuples();
     stream << tr("Total Attribute Matrix Tuple Count: %1\n").arg(locale.toString(numOfAMTuples));
 
-    stream << tr("No. of Component Dimension(s): ") << locale.toString(cDims.size()) << "\n";
+    stream << tr("No. of Component Dimension(s): ") << locale.toString(static_cast<quint64>(cDims.size())) << "\n";
     stream << "Component Dimension(s): ";
 
     int totalComponents = 1;
@@ -375,9 +376,9 @@ void ImportHDF5Dataset::execute()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString& cDimsStr)
+std::vector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString& cDimsStr)
 {
-  QVector<size_t> cDims;
+  std::vector<size_t> cDims;
   QStringList dimsStrVec = cDimsStr.split(',', QString::SkipEmptyParts);
   for(int i = 0; i < dimsStrVec.size(); i++)
   {
@@ -388,7 +389,7 @@ QVector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString& cDim
     int val = dimsStr.toInt(&ok);
     if(!ok)
     {
-      return QVector<size_t>();
+      return std::vector<size_t>();
     }
 
     cDims.push_back(val);
@@ -400,7 +401,7 @@ QVector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString& cDim
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer ImportHDF5Dataset::readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, QVector<size_t> cDims, bool metaDataOnly)
+IDataArray::Pointer ImportHDF5Dataset::readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, std::vector<size_t> cDims, bool metaDataOnly)
 {
   herr_t err = -1;
   // herr_t retErr = 1;
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 511651f05a..8d5532124b 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   PYB11_CREATE_BINDINGS(ImportHDF5Dataset SUPERCLASS AbstractFilter)
   PYB11_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
   PYB11_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
-  PYB11_PROPERTY(QList<DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
+  PYB11_PROPERTY(QList<ImportHDF5Dataset::DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
   PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
 
 public:
@@ -188,13 +188,13 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
 private:
   QString m_HDF5Dimensions = "";
 
-  IDataArray::Pointer readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, QVector<size_t> cDims, bool metaDataOnly);
+  IDataArray::Pointer readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, std::vector<size_t> cDims, bool metaDataOnly);
 
   /**
    * @brief createComponentDimensions
    * @return
    */
-  QVector<size_t> createComponentDimensions(const QString& cDimsStr);
+  std::vector<size_t> createComponentDimensions(const QString& cDimsStr);
 
 public:
   ImportHDF5Dataset(const ImportHDF5Dataset&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index bebce72558..98470ecc60 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -130,10 +130,10 @@ void LinkFeatureMapToElementArray::dataCheck()
     return;
   }
 
-  QVector<size_t> tDims(1, 0);
+  std::vector<size_t> tDims(1, 0);
   m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature, AttributeMatrixID);
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getSelectedCellArrayPath(),
                                                                                                               cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_SelectedCellDataPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
@@ -196,7 +196,7 @@ void LinkFeatureMapToElementArray::execute()
     }
   }
 
-  QVector<size_t> tDims(1, maxIndex);
+  std::vector<size_t> tDims(1, maxIndex);
   m->getAttributeMatrix(getCellFeatureAttributeMatrixName())->resizeAttributeArrays(tDims);
   updateFeatureInstancePointers();
 
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index a43db2fda8..08fff67807 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -96,7 +96,7 @@ void MaskCountDecision::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
 
   m_MaskPtr =
       getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 60cbd4aaf3..2abbbc10e9 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -138,7 +138,7 @@ void MultiThresholdObjects::dataCheck()
     }
 
     ComparisonInput_t comp = m_SelectedThresholds[0];
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(comp.dataContainerName, comp.attributeMatrixName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index f81e986764..e256856709 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -133,7 +133,7 @@ void MultiThresholdObjects2::dataCheck()
     }
 
     //AbstractComparison::Pointer comp = m_SelectedThresholds[0];
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 87fd992a90..0f7f2412bd 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -272,11 +272,11 @@ void RawBinaryReader::dataCheck()
     return;
   }
 
-  QVector<size_t> tDims = attrMat->getTupleDimensions();
+  std::vector<size_t> tDims = attrMat->getTupleDimensions();
   size_t totalDim = std::accumulate(tDims.begin(), tDims.end(), 1, std::multiplies<size_t>());
 
   size_t allocatedBytes = 0;
-  QVector<size_t> cDims(1, m_NumberOfComponents);
+  std::vector<size_t> cDims(1, m_NumberOfComponents);
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
     getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index b43cb7435f..bd006ec508 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -74,7 +74,7 @@ void ReadASCIIData::readFilterParameters(AbstractFilterParametersReader* reader,
   data.automaticAM = reader->readValue(prefix + "AutomaticAM", false);
 
   QVector<uint64_t> tmpVec;
-  QVector<size_t> tDims;
+  std::vector<size_t> tDims;
   tmpVec = reader->readArray(prefix + "TupleDims", QVector<uint64_t>());
   for(uint64_t i : tmpVec)
   {
@@ -143,7 +143,7 @@ void ReadASCIIData::readFilterParameters(QJsonObject& obj)
 
   {
     QJsonArray jsonArray = obj[prefix + "TupleDims"].toArray();
-    QVector<size_t> tupleDims;
+    std::vector<size_t> tupleDims;
     for(int i = 0, total = jsonArray.size(); i < total; ++i)
     {
       tupleDims.push_back(static_cast<size_t>(jsonArray[i].toInt()));
@@ -257,8 +257,8 @@ void ReadASCIIData::dataCheck()
   QStringList dataTypes = wizardData.dataTypes;
   bool automaticAM = wizardData.automaticAM;
   DataArrayPath selectedPath = wizardData.selectedPath;
-  QVector<size_t> tDims = wizardData.tupleDims;
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> tDims = wizardData.tupleDims;
+  std::vector<size_t> cDims(1, 1);
 
   QFileInfo fi(inputFilePath);
   if(inputFilePath.isEmpty())
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index d60ae4df58..2e2f5f0a04 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -162,7 +162,7 @@ void RemoveComponentFromArray::dataCheck()
     return;
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   if(m_SaveRemovedComponent)
   {
     DataArrayPath tempPath(getSelectedArrayPath().getDataContainerName(), getSelectedArrayPath().getAttributeMatrixName(), getNewArrayArrayName());
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 9c7fcc391f..00c52a671d 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -119,7 +119,7 @@ void SplitAttributeArray::dataCheck()
       return;
     }
 
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
 
     for(int32_t i = 0; i < numComps; i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 4a482486e4..8483d9b595 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -87,8 +87,8 @@ class ArrayCalculatorTest
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
-    AttributeMatrix::Pointer am1 = AttributeMatrix::New(QVector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Cell);
-    AttributeMatrix::Pointer am2 = AttributeMatrix::New(QVector<size_t>(1, 1), "NumericMatrix", AttributeMatrix::Type::Cell);
+    AttributeMatrix::Pointer am1 = AttributeMatrix::New(std::vector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Cell);
+    AttributeMatrix::Pointer am2 = AttributeMatrix::New(std::vector<size_t>(1, 1), "NumericMatrix", AttributeMatrix::Type::Cell);
     FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, "InputArray1");
     array1->initializeWithValue(-12);
     UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, "InputArray2");
@@ -96,7 +96,7 @@ class ArrayCalculatorTest
     UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, "Spaced Array");
     sArray->initializeWithValue(2);
 
-    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 3), "MultiComponent Array1");
+    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array1");
     int num = 0;
     for(int i = 0; i < mcArray1->getNumberOfTuples() * mcArray1->getNumberOfComponents(); i++)
     {
@@ -104,7 +104,7 @@ class ArrayCalculatorTest
       num++;
     }
 
-    UInt32ArrayType::Pointer mcArray2 = UInt32ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 3), "MultiComponent Array2");
+    UInt32ArrayType::Pointer mcArray2 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array2");
     num = 0;
     for(int i = 0; i < mcArray2->getNumberOfTuples() * mcArray2->getNumberOfComponents(); i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 59fff9375a..e87bd26608 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -117,13 +117,13 @@ class CombineAttributeArraysTest
 
     DataContainer::Pointer m = DataContainer::New("CombineAttributeArraysTest");
 
-    QVector<size_t> tDims(1, 100);
+    std::vector<size_t> tDims(1, 100);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "CombineAttributeArraysTest", AttributeMatrix::Type::Cell);
     m->addOrReplaceAttributeMatrix(attrMat);
     dca->addOrReplaceDataContainer(m);
 
-    QVector<size_t> cDimsVec(1, 3);
-    QVector<size_t> cDimsScalar(1, 1);
+    std::vector<size_t> cDimsVec(1, 3);
+    std::vector<size_t> cDimsScalar(1, 1);
 
     CREATE_DATA_ARRAY(uint8_t, attrMat, tDims, cDimsVec, cDimsScalar, uint8_tVectorArray, uint8_tScalarArray, err);
     CREATE_DATA_ARRAY(int8_t, attrMat, tDims, cDimsVec, cDimsScalar, int8_tVectorArray, int8_tScalarArray, err);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 0e6670ad4c..435d338a1d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -219,11 +219,11 @@ class CombineAttributeMatricesTest
     DataContainer::Pointer m2 = DataContainer::New("CombineAttributeMatricesTest2");
 
     // Create Attribute Matrices with different tDims to test validation of tuple compatibility
-    QVector<size_t> tDims(3, 0);
+    std::vector<size_t> tDims(3, 0);
     tDims[0] = 2;
     tDims[1] = 2;
     tDims[2] = 1;
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
     int32_t initVal = 10;
 
     // Make Cell AM
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index a590c9c293..c31124e94c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -151,14 +151,14 @@ class ConditionalSetValueTest
     DataContainer::Pointer m = DataContainer::New("ConditionalSetValueTest");
 
     // Create Attribute Matrices with different tDims to test validation of tuple compatibility
-    QVector<size_t> tDims(1, 10);
+    std::vector<size_t> tDims(1, 10);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "ConditionalSetValueAttrMat", AttributeMatrix::Type::Cell);
 
     m->addOrReplaceAttributeMatrix(attrMat);
 
     dca->addOrReplaceDataContainer(m);
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
     int32_t initVal = 10;
 
     CREATE_DATA_ARRAY(uint8_t, attrMat, tDims, cDims, initVal, 3, err);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 5493237476..8f88ba41f8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -295,7 +295,7 @@ class ConvertColorToGrayScaleTest
     }
   }
 
-  static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const QVector<size_t>& tDims)
+  static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const std::vector<size_t>& tDims)
   {
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
     am->insertOrAssign(aa);
@@ -477,8 +477,8 @@ class ConvertColorToGrayScaleTest
     int err = 0;
 
     const QString aaName = SIMPL::VertexData::SurfaceMeshNodes;
-    const QVector<size_t> tDims{16};
-    const QVector<size_t> cDims{3, 1, 1};
+    const std::vector<size_t> tDims{16};
+    const std::vector<size_t> cDims{3, 1, 1};
 
     DataArray<uint8_t>::Pointer testAA{DataArray<uint8_t>::CreateArray(tDims, cDims, aaName)};
     SetDataArrayTestValues(testAA);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index 1864a8afe1..8f3c7a13e7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -1,41 +1,41 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
-#include <assert.h>
-#include <stdint.h>
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <cassert>
+#include <cstdint>
+#include <vector>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/ConvertData.h"
@@ -67,12 +67,12 @@ class ConvertDataTest
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims;
+    std::vector<size_t> dims;
     dims.push_back(2);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    QVector<size_t> cdims;
+    std::vector<size_t> cdims;
     cdims.push_back(2);
     IDataArray::Pointer da;
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index 68623ba629..901bfb9ab1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -81,7 +81,8 @@ class CopyFeatureArrayToElementArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
@@ -116,7 +117,7 @@ class CopyFeatureArrayToElementArrayTest
     dca->addOrReplaceDataContainer(dc);
 
     // Create AttributeMatrices
-    QVector<size_t> tDims = {{10, 3}};
+    std::vector<size_t> tDims = {{10, 3}};
     AttributeMatrix::Pointer cellAM = AttributeMatrix::New(tDims, k_Cell_AMName, AttributeMatrix::Type::Cell);
     dc->addOrReplaceAttributeMatrix(cellAM);
 
@@ -234,7 +235,7 @@ class CopyFeatureArrayToElementArrayTest
 
 private:
   QString m_FilterName = QString("CopyFeatureArrayToElementArray");
-  QVector<size_t> m_Dims1 = {1};
-  QVector<size_t> m_Dims3 = {3};
-  QVector<size_t> m_Dims10 = {10};
+  std::vector<size_t> m_Dims1 = {1};
+  std::vector<size_t> m_Dims3 = {3};
+  std::vector<size_t> m_Dims10 = {10};
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index edec612c27..a9fa889dd8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -92,7 +92,8 @@ class CopyObjectTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
@@ -105,7 +106,8 @@ class CopyObjectTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(size_t i = 0; i < da->getSize(); i++)
@@ -948,9 +950,9 @@ class CopyObjectTest
 
 private:
   QString m_FilterName = QString("CopyObject");
-  QVector<size_t> m_Dims1 = {1};
-  QVector<size_t> m_Dims2 = {2};
-  QVector<size_t> m_Dims3 = {3};
-  QVector<size_t> m_Dims4 = {4};
-  QVector<size_t> m_Dims8 = {8};
+  std::vector<size_t> m_Dims1 = {1};
+  std::vector<size_t> m_Dims2 = {2};
+  std::vector<size_t> m_Dims3 = {3};
+  std::vector<size_t> m_Dims4 = {4};
+  std::vector<size_t> m_Dims8 = {8};
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index e0aa703126..58d4fdeadb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -359,7 +359,7 @@ class CreateAttributeMatrixTest
   // -----------------------------------------------------------------------------
   void TestOperators()
   {
-    QVector<size_t> tDims = {10, 10};
+    std::vector<size_t> tDims = {10, 10};
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Test", AttributeMatrix::Type::Cell);
 
     FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, "Float");
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index e1c0cdbfed..75faae5cff 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -169,7 +169,7 @@ class CreateDataArrayTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
     dca->addOrReplaceDataContainer(m);
-    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(QVector<size_t>(1, 1), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
+    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(std::vector<size_t>(1, 1), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
     m->addOrReplaceAttributeMatrix(attrMatrix);
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index df85899781..284db626e9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -93,8 +93,8 @@ class CreateFeatureArrayFromElementArrayTest
 
         DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(QVector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
-        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(QVector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
         DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
         size_t numTuples = featureIds->getNumberOfTuples();
@@ -183,8 +183,8 @@ class CreateFeatureArrayFromElementArrayTest
 
         DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(QVector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
-        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(QVector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
         DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
         size_t numTuples = featureIds->getNumberOfTuples();
@@ -213,7 +213,7 @@ class CreateFeatureArrayFromElementArrayTest
         featureIds->initializeTuple(14, &value);
         featureIds->initializeTuple(15, &value);
 
-        QVector<size_t> cDims = QVector<size_t>(1, 3);
+        std::vector<size_t> cDims = std::vector<size_t>(1, 3);
         DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, cDims, "CellData");
         numTuples = cellDataArray->getNumberOfTuples();
         for(size_t i = 0; i < numTuples; i++)
@@ -274,8 +274,8 @@ class CreateFeatureArrayFromElementArrayTest
 
         DataContainer::Pointer dc = DataContainer::New("DataContainer");
 
-        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(QVector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
-        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(QVector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
+        AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
         DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
         int32_t value = 1;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index c62c290537..17149de6d6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -95,7 +95,8 @@ class CreateGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
@@ -1328,9 +1329,9 @@ class CreateGeometryTest
 
 private:
   QString m_FilterName = QString("CreateGeometry");
-  QVector<size_t> m_Dims1 = {1};
-  QVector<size_t> m_Dims2 = {2};
-  QVector<size_t> m_Dims3 = {3};
-  QVector<size_t> m_Dims4 = {4};
-  QVector<size_t> m_Dims8 = {8};
+  std::vector<size_t> m_Dims1 = {1};
+  std::vector<size_t> m_Dims2 = {2};
+  std::vector<size_t> m_Dims3 = {3};
+  std::vector<size_t> m_Dims4 = {4};
+  std::vector<size_t> m_Dims8 = {8};
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index f3992e9637..793a7a7e4c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -60,7 +60,7 @@ class CreateImageGeometryTest
   {
     CreateImageGeometry::Pointer imageGeometry = CreateImageGeometry::New();
 
-    QVector<size_t> attributeMatrixSize = QVector<size_t>();
+    std::vector<size_t> attributeMatrixSize = std::vector<size_t>();
     attributeMatrixSize.push_back(3);
     attributeMatrixSize.push_back(3);
     attributeMatrixSize.push_back(3);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index cdbbe39a1f..2822db3e5c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -93,7 +93,7 @@ class CreateStringArrayTest
     static const QString k_StringInitialValue("Test String");
     static const QString k_EmptyQString("");
 
-    QVector<size_t> tupleDims(1, 5);
+    std::vector<size_t> tupleDims(1, 5);
 
     // Create DataContainerArray
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index 02258a794a..d6bd2f3771 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -85,7 +85,8 @@ class CropVertexGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
@@ -131,7 +132,7 @@ class CropVertexGeometryTest
 
     // Create AttributeMatrix
 
-    QVector<size_t> dims(1, vertices.size());
+    std::vector<size_t> dims(1, vertices.size());
 
     AttributeMatrix::Pointer vertexAM = AttributeMatrix::New(dims, k_VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
     dc->addOrReplaceAttributeMatrix(vertexAM);
@@ -146,7 +147,7 @@ class CropVertexGeometryTest
 
     // Manually create cropped DataArray for comparison
 
-    QVector<size_t> croppedDims(1, postCropVertices.size());
+    std::vector<size_t> croppedDims(1, postCropVertices.size());
 
     FloatArrayType::Pointer daCroppedVert = createDataArray<float>(k_CroppedVertexCoordinatesDAName, postCropVertices, croppedDims, m_Dims3);
 
@@ -302,9 +303,9 @@ class CropVertexGeometryTest
 
 private:
   QString m_FilterName = QString("CropVertexGeometry");
-  QVector<size_t> m_Dims1 = {1};
-  QVector<size_t> m_Dims2 = {2};
-  QVector<size_t> m_Dims3 = {3};
-  QVector<size_t> m_Dims4 = {4};
-  QVector<size_t> m_Dims8 = {8};
+  std::vector<size_t> m_Dims1 = {1};
+  std::vector<size_t> m_Dims2 = {2};
+  std::vector<size_t> m_Dims3 = {3};
+  std::vector<size_t> m_Dims4 = {4};
+  std::vector<size_t> m_Dims8 = {8};
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index 2e47e1ff1f..eb469ae621 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -181,7 +181,8 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void CreateDataArray(AttributeMatrix::Pointer attrMat, QVector<size_t> compDims)
+  template <typename T>
+  void CreateDataArray(AttributeMatrix::Pointer attrMat, std::vector<size_t> compDims)
   {
     QString name("[");
     for(int i = 0; i < compDims.size(); i++)
@@ -205,7 +206,7 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void CreateStringArray(AttributeMatrix::Pointer attrMat, QVector<size_t> compDims)
+  void CreateStringArray(AttributeMatrix::Pointer attrMat, std::vector<size_t> compDims)
   {
     QString name("ExampleStringDataArray");
     StringDataArray::Pointer data = StringDataArray::CreateArray(attrMat->getNumberOfTuples(), name);
@@ -220,7 +221,7 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void FillAttributeMatrix(const AttributeMatrix::Pointer& attrMat, const QVector<size_t>& compDims)
+  void FillAttributeMatrix(const AttributeMatrix::Pointer& attrMat, const std::vector<size_t>& compDims)
   {
     CreateDataArray<int8_t>(attrMat, compDims);
     CreateDataArray<uint8_t>(attrMat, compDims);
@@ -238,11 +239,11 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void PopulateVolumeDataContainer(const DataContainer::Pointer& dc, QVector<size_t> tupleDims, const QString& name)
+  void PopulateVolumeDataContainer(const DataContainer::Pointer& dc, std::vector<size_t> tupleDims, const QString& name)
   {
     // Create the attribute matrix with the dimensions and name
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tupleDims, name, AttributeMatrix::Type::Cell);
-    QVector<size_t> compDims(1, 1); // Create a Single Scalar Component (numComp = 1) Data Array
+    std::vector<size_t> compDims(1, 1); // Create a Single Scalar Component (numComp = 1) Data Array
     FillAttributeMatrix(attrMat, compDims);
 
     // Add Data Arrays that have a [1x3] component dimensions
@@ -280,7 +281,7 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   void TestDataContainerWriter()
   {
-    QVector<size_t> tupleDims;
+    std::vector<size_t> tupleDims;
     DataContainerArray::Pointer dca = DataContainerArray::New();
     size_t nx = DataContainerIOTest::XSize;
     size_t ny = DataContainerIOTest::YSize;
@@ -335,7 +336,7 @@ class DataContainerTest
     }
     attrMatrix->insertOrAssign(boolArray);
 
-    QVector<size_t> dims(1, 3);
+    std::vector<size_t> dims(1, 3);
     FloatArrayType::Pointer avgEuler = FloatArrayType::CreateArray(size, dims, SIMPL::FeatureData::AxisEulerAngles);
     for(int32_t i = 0; i < size; ++i)
     {
@@ -480,7 +481,7 @@ class DataContainerTest
     DREAM3D_REQUIRE_NULL_POINTER(attrMatrix.get())
 
     // Now add an AttributeMatrix to the DataContainer
-    QVector<size_t> tDims(1, 0);
+    std::vector<size_t> tDims(1, 0);
     AttributeMatrix::Pointer attrMat = m->createAndAddAttributeMatrix(tDims, getCellAttributeMatrixName(), AttributeMatrix::Type::Cell);
     DREAM3D_REQUIRE_VALID_POINTER(attrMat.get())
 
@@ -500,7 +501,7 @@ class DataContainerTest
     IDataArray::Pointer ida = attrMat->getAttributeArray("Test");
     DREAM3D_REQUIRE_VALID_POINTER(ida.get());
 
-    QVector<size_t> dims(1, 1);
+    std::vector<size_t> dims(1, 1);
     t = attrMat->getPrereqArray<T, AbstractFilter>(nullptr, "Test", -723, dims);
     DREAM3D_REQUIRE_VALID_POINTER(ida.get());
 
@@ -1004,7 +1005,7 @@ class DataContainerTest
 
     const QString k_DC0("DCO");
     const QString k_DC1("DC1");
-    QVector<size_t> tDims = {10, 10};
+    std::vector<size_t> tDims = {10, 10};
     AttributeMatrix::Pointer am0 = AttributeMatrix::New(tDims, k_DC0, AttributeMatrix::Type::Generic);
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(tDims, k_DC1, AttributeMatrix::Type::Generic);
 
@@ -1082,7 +1083,7 @@ class DataContainerTest
   void TestAttributeMatrix()
   {
     bool result = false;
-    QVector<size_t> tDims = {10, 10};
+    std::vector<size_t> tDims = {10, 10};
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Generic);
     // addDataContainer
     // insertOrAssign
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 4461da1b09..16ec03a6b7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -91,7 +91,8 @@ class ExtractAttributeArraysFromGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
@@ -759,9 +760,9 @@ class ExtractAttributeArraysFromGeometryTest
 
 private:
   QString m_FilterName = QString("ExtractAttributeArraysFromGeometry");
-  QVector<size_t> m_Dims1 = {1};
-  QVector<size_t> m_Dims2 = {2};
-  QVector<size_t> m_Dims3 = {3};
-  QVector<size_t> m_Dims4 = {4};
-  QVector<size_t> m_Dims8 = {8};
+  std::vector<size_t> m_Dims1 = {1};
+  std::vector<size_t> m_Dims2 = {2};
+  std::vector<size_t> m_Dims3 = {3};
+  std::vector<size_t> m_Dims4 = {4};
+  std::vector<size_t> m_Dims8 = {8};
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 44357b2e51..5efce8afdb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -66,12 +66,12 @@ class ExtractComponentAsArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims;
+    std::vector<size_t> dims;
     dims.push_back(2);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    QVector<size_t> cdims;
+    std::vector<size_t> cdims;
     cdims.push_back(2);
     DataArray<int>::Pointer da = DataArray<int>::CreateArray(2, cdims, "DataArray");
     da->setComponent(0, 0, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 974be63559..89476f2338 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -89,7 +89,7 @@ class ExtractVertexGeometryTest
     imageGeomDC->setGeometry(imageGeom);
 
     // Create the Cell AttributeMatrix
-    AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::Create(dims, k_CellAttrMatName, AttributeMatrix::Type::Cell);
+    AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New(dims, k_CellAttrMatName, AttributeMatrix::Type::Cell);
     imageGeomDC->addOrReplaceAttributeMatrix(cellAttrMat);
 
     // Create a cell attribute array
@@ -101,7 +101,7 @@ class ExtractVertexGeometryTest
     dims[0] = 1;
     dims[1] = 2;
     dims[2] = 3;
-    AttributeMatrix::Pointer featureAttrMat = AttributeMatrix::Create(dims, k_FeatureAttrMatName, AttributeMatrix::Type::CellFeature);
+    AttributeMatrix::Pointer featureAttrMat = AttributeMatrix::New(dims, k_FeatureAttrMatName, AttributeMatrix::Type::CellFeature);
     imageGeomDC->addOrReplaceAttributeMatrix(featureAttrMat);
 
     // Create a feature attribute array
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 266eaa9917..ec20a7b413 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -378,10 +378,10 @@ class FeatureDataCSVWriterTest
     static const size_t yDim(2);
     static const size_t zDim(3);
 
-    QVector<size_t> tupleDims = {xDim, yDim, zDim};
-    QVector<size_t> cDims = {2};
-    QVector<size_t> cDimsFloat = {3};
-    QVector<size_t> cDimsNeighbor = {1};
+    std::vector<size_t> tupleDims = {xDim, yDim, zDim};
+    std::vector<size_t> cDims = {2};
+    std::vector<size_t> cDimsFloat = {3};
+    std::vector<size_t> cDimsNeighbor = {1};
 
     // Create DataContainerArray
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index a2a48e02fb..884b7519d0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -118,7 +118,7 @@ class FindDerivativesFilterTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void initializeDataArrays(DataContainer::Pointer m, QVector<size_t> cDims)
+  void initializeDataArrays(DataContainer::Pointer m, std::vector<size_t> cDims)
   {
     for(auto& am : m->getChildren())
     {
@@ -161,7 +161,7 @@ class FindDerivativesFilterTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void initializeAttributeMatrices(DataContainer::Pointer m, QVector<size_t> tDimsVert, QVector<size_t> tDimsCell)
+  void initializeAttributeMatrices(DataContainer::Pointer m, std::vector<size_t> tDimsVert, std::vector<size_t> tDimsCell)
   {
     AttributeMatrix::Pointer attrMat;
     QString ss = QObject::tr("AttrMatType%1").arg(0);
@@ -282,8 +282,8 @@ class FindDerivativesFilterTest
     FDTEST_CREATE_DATA_CONTAINER(QuadDC, quads, dca);
     FDTEST_CREATE_DATA_CONTAINER(TetDC, tets, dca);
 
-    QVector<size_t> tDims(1, 100);
-    QVector<size_t> tDims2(1, 1);
+    std::vector<size_t> tDims(1, 100);
+    std::vector<size_t> tDims2(1, 1);
     initializeAttributeMatrices(_nullGeomContainer, tDims, tDims);
     tDims[0] = 1000;
     initializeAttributeMatrices(_imageContainer, tDims, tDims);
@@ -298,7 +298,7 @@ class FindDerivativesFilterTest
     initializeAttributeMatrices(_quadsContainer, tDims, tDims2);
     initializeAttributeMatrices(_tetsContainer, tDims, tDims2);
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
 
     initializeDataArrays(_nullGeomContainer, cDims);
     initializeDataArrays(_imageContainer, cDims);
@@ -349,8 +349,8 @@ class FindDerivativesFilterTest
     QVariant var;
     bool propWasSet;
     int err = 0;
-    QVector<size_t> checkDims;
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> checkDims;
+    std::vector<size_t> cDims(1, 3);
     QString derivativeName = "Derivatives";
     DataArrayPath derivs;
     IDataArray::Pointer data;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index ee7b4147d2..32d8f486b2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -165,7 +165,7 @@ class GenerateColorTableTest
     // Validate Results
     {
       DataArrayPath daPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "CI_RGB");
-      UInt8ArrayType::Pointer da = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, daPath, QVector<size_t>(1, 3));
+      UInt8ArrayType::Pointer da = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, daPath, std::vector<size_t>(1, 3));
       if(da.get() != nullptr)
       {
         QFile file(presetFilePath);
@@ -205,7 +205,7 @@ class GenerateColorTableTest
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New(SIMPL::Defaults::ImageDataContainerName);
-    AttributeMatrix::Pointer am = AttributeMatrix::New(QVector<size_t>(1, 37989), SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Generic);
+    AttributeMatrix::Pointer am = AttributeMatrix::New(std::vector<size_t>(1, 37989), SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Generic);
     dc->addOrReplaceAttributeMatrix(am);
     dca->addOrReplaceDataContainer(dc);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
index f2e8e0e187..e95df2a74c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
@@ -66,7 +66,7 @@ class ImportAsciDataArrayTest
     dc->setGeometry(imageGeom);
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> tDims = {m_XDim, m_YDim, m_ZDim};
+    std::vector<size_t> tDims = {m_XDim, m_YDim, m_ZDim};
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Generic);
 
     dc->addOrReplaceAttributeMatrix(attrMat);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index f77f580558..2388e52035 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -253,7 +253,7 @@ class ImportHDF5DatasetTest
     ImportHDF5Dataset::Pointer filter = ImportHDF5Dataset::New();
 
     // Set a dummy data container array for error testing purposes
-    DataContainerArray::Pointer dca = createDataContainerArray(QVector<size_t>(1, 1));
+    DataContainerArray::Pointer dca = createDataContainerArray(std::vector<size_t>(1, 1));
     filter->setDataContainerArray(dca);
     filter->setSelectedAttributeMatrix(DataArrayPath("DataContainer", "AttributeMatrix", ""));
 
@@ -324,7 +324,7 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  DataContainerArray::Pointer createDataContainerArray(QVector<size_t> tDims)
+  DataContainerArray::Pointer createDataContainerArray(std::vector<size_t> tDims)
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
 
@@ -341,7 +341,7 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  QString createVectorString(QVector<size_t> vec)
+  QString createVectorString(std::vector<size_t> vec)
   {
     QString str = "(";
     for(int i = 0; i < vec.size(); i++)
@@ -360,7 +360,7 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void DatasetTest(ImportHDF5Dataset::Pointer filter, QList<ImportHDF5Dataset::DatasetImportInfo> importInfoList, QVector<size_t> amDims, int errCode)
+  template <typename T> void DatasetTest(ImportHDF5Dataset::Pointer filter, QList<ImportHDF5Dataset::DatasetImportInfo> importInfoList, std::vector<size_t> amDims, int errCode)
   {
     if(importInfoList.empty())
     {
@@ -427,7 +427,7 @@ class ImportHDF5DatasetTest
 
         QString cDimsStr = dsetInfoList[i].componentDimensions;
         QStringList tokens = cDimsStr.split(", ");
-        QVector<size_t> cDims;
+        std::vector<size_t> cDims;
         for(int i = 0; i < tokens.size(); i++)
         {
           cDims.push_back(tokens[i].toInt());
@@ -472,7 +472,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> QString joinVector(QVector<T> vector, const QString& separator)
+  template <typename T>
+  QString joinVector(std::vector<T> vector, const QString& separator)
   {
     QString cDimsStr = "";
     for(int i = 0; i < vector.size(); i++)
@@ -497,8 +498,8 @@ class ImportHDF5DatasetTest
     //  // ******************* Test Reading Data *************************************
 
     // Create tuple and component dimensions for all tests
-    QVector<QVector<size_t>> tDimsVector;
-    QVector<QVector<size_t>> cDimsVector;
+    QVector<std::vector<size_t>> tDimsVector;
+    QVector<std::vector<size_t>> cDimsVector;
 
     // Add 1D, 2D, 3D, and 4D tuple and component dimensions that test all 4 possibilities:
     // 1. Tuple dimensions and component dimensions are both valid
@@ -506,37 +507,37 @@ class ImportHDF5DatasetTest
     // 3. Tuple dimensions are invalid, but component dimensions are valid
     // 4. Neither tuple dimensions or component dimensions are valid
 
-    tDimsVector.push_back(QVector<size_t>(1) = {TUPLEDIMPROD});
-    cDimsVector.push_back(QVector<size_t>(1) = {COMPDIMPROD});
+    tDimsVector.push_back(std::vector<size_t>(1) = {TUPLEDIMPROD});
+    cDimsVector.push_back(std::vector<size_t>(1) = {COMPDIMPROD});
 
-    tDimsVector.push_back(QVector<size_t>(2) = {10, 4});
-    cDimsVector.push_back(QVector<size_t>(2) = {12, 6});
+    tDimsVector.push_back(std::vector<size_t>(2) = {10, 4});
+    cDimsVector.push_back(std::vector<size_t>(2) = {12, 6});
 
-    tDimsVector.push_back(QVector<size_t>(3) = {2, 2, 10});
-    cDimsVector.push_back(QVector<size_t>(3) = {4, 3, 6});
+    tDimsVector.push_back(std::vector<size_t>(3) = {2, 2, 10});
+    cDimsVector.push_back(std::vector<size_t>(3) = {4, 3, 6});
 
-    tDimsVector.push_back(QVector<size_t>(4) = {2, 2, 5, 2});
-    cDimsVector.push_back(QVector<size_t>(4) = {4, 3, 3, 2});
+    tDimsVector.push_back(std::vector<size_t>(4) = {2, 2, 5, 2});
+    cDimsVector.push_back(std::vector<size_t>(4) = {4, 3, 3, 2});
 
-    tDimsVector.push_back(QVector<size_t>(1) = {TUPLEDIMPROD - 1});
-    cDimsVector.push_back(QVector<size_t>(1) = {COMPDIMPROD - 1});
+    tDimsVector.push_back(std::vector<size_t>(1) = {TUPLEDIMPROD - 1});
+    cDimsVector.push_back(std::vector<size_t>(1) = {COMPDIMPROD - 1});
 
-    tDimsVector.push_back(QVector<size_t>(2) = {TUPLEDIMPROD - 1, 34});
-    cDimsVector.push_back(QVector<size_t>(2) = {COMPDIMPROD - 1, 56});
+    tDimsVector.push_back(std::vector<size_t>(2) = {TUPLEDIMPROD - 1, 34});
+    cDimsVector.push_back(std::vector<size_t>(2) = {COMPDIMPROD - 1, 56});
 
-    tDimsVector.push_back(QVector<size_t>(3) = {TUPLEDIMPROD - 1, 23, 654});
-    cDimsVector.push_back(QVector<size_t>(3) = {COMPDIMPROD - 1, 56, 12});
+    tDimsVector.push_back(std::vector<size_t>(3) = {TUPLEDIMPROD - 1, 23, 654});
+    cDimsVector.push_back(std::vector<size_t>(3) = {COMPDIMPROD - 1, 56, 12});
 
-    tDimsVector.push_back(QVector<size_t>(4) = {TUPLEDIMPROD - 1, 98, 12, 45});
-    cDimsVector.push_back(QVector<size_t>(4) = {COMPDIMPROD - 1, 43, 12, 53});
+    tDimsVector.push_back(std::vector<size_t>(4) = {TUPLEDIMPROD - 1, 98, 12, 45});
+    cDimsVector.push_back(std::vector<size_t>(4) = {COMPDIMPROD - 1, 43, 12, 53});
 
     // Execute all combinations of tests
     for(int i = 0; i < tDimsVector.size(); i++)
     {
       for(int j = 0; j < cDimsVector.size(); j++)
       {
-        QVector<size_t> tDims = tDimsVector[i];
-        QVector<size_t> cDims = cDimsVector[j];
+        std::vector<size_t> tDims = tDimsVector[i];
+        std::vector<size_t> cDims = cDimsVector[j];
 
         size_t amTupleCount = 1;
         for(int t = 0; t < tDims.size(); t++)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 93beb43d22..381458a5e2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -83,7 +83,8 @@ class MoveDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
@@ -374,9 +375,9 @@ class MoveDataTest
     static const QString k_AttributeMatrixBadDstName("AttributeMatrixBadDst");
     static const QString k_DataArraySrcName("DataArraySrc");
 
-    QVector<size_t> tupleDims = {12};
-    QVector<size_t> badTupleDims = {14};
-    QVector<size_t> cDims = {3};
+    std::vector<size_t> tupleDims = {12};
+    std::vector<size_t> badTupleDims = {14};
+    std::vector<size_t> cDims = {3};
 
     // Create DataContainerArray
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index ecc87446cd..d28287ba22 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -83,7 +83,8 @@ class MoveMultiDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const QVector<size_t>& tupleDims, const QVector<size_t>& cDims)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
     typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
@@ -398,9 +399,9 @@ class MoveMultiDataTest
     static const QString k_floatArrayName("floatDataArray");
     static const QString k_doubleArrayName("doubleDataArray");
 
-    QVector<size_t> tupleDims = {12};
-    QVector<size_t> badTupleDims = {14};
-    QVector<size_t> cDims = {3};
+    std::vector<size_t> tupleDims = {12};
+    std::vector<size_t> badTupleDims = {14};
+    std::vector<size_t> cDims = {3};
 
     // Create DataContainerArray
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index 19d67a875e..a1edae703c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -89,9 +89,9 @@ class MultiThresholdObjects2Test
     size_t dims[1] = {20};
     image->setDimensions(dims);
 
-    QVector<size_t> tDims(1, 0);
+    std::vector<size_t> tDims(1, 0);
     tDims[0] = 20;
-    QVector<size_t> cDims(1);
+    std::vector<size_t> cDims(1);
     cDims[0] = 1;
     float fnum = 0.0f;
     int inum = 0;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index d49dd69d9d..31f918a495 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -87,9 +87,9 @@ class MultiThresholdObjectsTest
     size_t dims[1] = {20};
     image->setDimensions(dims);
 
-    QVector<size_t> tDims(1, 0);
+    std::vector<size_t> tDims(1, 0);
     tDims[0] = 20;
-    QVector<size_t> cDims(1);
+    std::vector<size_t> cDims(1);
     cDims[0] = 1;
     float fnum = 0.0f;
     int inum = 0;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 7b777d9c13..c1f5c76aea 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -244,7 +244,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
@@ -349,7 +349,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
@@ -449,7 +449,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
@@ -559,7 +559,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
@@ -697,7 +697,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
@@ -807,7 +807,7 @@ class RawBinaryReaderTest
     DREAM3D_REQUIRED(result, ==, true)
 
     // Create the attribute matrix
-    QVector<size_t> dims(1, k_ArraySize);
+    std::vector<size_t> dims(1, k_ArraySize);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
 
     // Create the data container
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 9b0416d9fa..2d2b388263 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -133,7 +133,7 @@ class ReadASCIIDataTest
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New(DataContainerName);
-    AttributeMatrix::Pointer am = AttributeMatrix::New(QVector<size_t>(1, data.numberOfLines), AttributeMatrixName, AttributeMatrix::Type::Cell);
+    AttributeMatrix::Pointer am = AttributeMatrix::New(std::vector<size_t>(1, data.numberOfLines), AttributeMatrixName, AttributeMatrix::Type::Cell);
     dc->addOrReplaceAttributeMatrix(am);
     dca->addOrReplaceDataContainer(dc);
 
@@ -188,7 +188,7 @@ class ReadASCIIDataTest
     data.inputFilePath = UnitTest::ReadASCIIDataTest::TestFile1;
     data.numberOfLines = 10;
     data.selectedPath = DataArrayPath(DataContainerName, AttributeMatrixName, "");
-    data.tupleDims = QVector<size_t>(1, 10);
+    data.tupleDims = std::vector<size_t>(1, 10);
 
     // Test Using Expected Input - Double/Float
     {
@@ -335,7 +335,7 @@ class ReadASCIIDataTest
       CreateFile(UnitTest::ReadASCIIDataTest::TestFile1, inputOctVector, delimiter);
 
       data.numberOfLines = 7;
-      data.tupleDims = QVector<size_t>(1, 7);
+      data.tupleDims = std::vector<size_t>(1, 7);
       AbstractFilter::Pointer importASCIIData = PrepFilter(data);
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
@@ -363,7 +363,7 @@ class ReadASCIIDataTest
       CreateFile(UnitTest::ReadASCIIDataTest::TestFile1, inputMaxVector, delimiter);
 
       data.numberOfLines = 1;
-      data.tupleDims = QVector<size_t>(1, 1);
+      data.tupleDims = std::vector<size_t>(1, 1);
       AbstractFilter::Pointer importASCIIData = PrepFilter(data);
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
@@ -399,7 +399,7 @@ class ReadASCIIDataTest
       CreateFile(UnitTest::ReadASCIIDataTest::TestFile1, inputMinVector, delimiter);
 
       data.numberOfLines = 1;
-      data.tupleDims = QVector<size_t>(1, 1);
+      data.tupleDims = std::vector<size_t>(1, 1);
       AbstractFilter::Pointer importASCIIData = PrepFilter(data);
       DREAM3D_REQUIRE_VALID_POINTER(importASCIIData.get())
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index 7b44094acb..e3764a30a1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -62,13 +62,13 @@ class RemoveArraysTest
   // -----------------------------------------------------------------------------
   AbstractFilter::Pointer createFilter()
   {
-    QVector<size_t> vec;
+    std::vector<size_t> vec;
     vec.push_back(1);
 
     const QString arrayName = "DataArray";
     DataArray<uint>::Pointer da = DataArray<uint>::CreateArray(1, vec, arrayName);
 
-    QVector<size_t> sizeList;
+    std::vector<size_t> sizeList;
     sizeList.push_back(1);
     sizeList.push_back(1);
     sizeList.push_back(1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index 9a80e95224..01e935c9f1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -170,7 +170,7 @@ class RemoveComponentFromArrayTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
     dca->addOrReplaceDataContainer(m);
-    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(QVector<size_t>(1, numTuples), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
+    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(std::vector<size_t>(1, numTuples), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
     m->addOrReplaceAttributeMatrix(attrMatrix);
     return dca;
   }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index 38bdb70f12..caba7051bc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -91,7 +91,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -126,7 +126,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -164,7 +164,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -204,7 +204,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -242,7 +242,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -279,7 +279,7 @@ class RenameAttributeArrayTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 880957518b..95f8c3b76c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -121,7 +121,7 @@ class RenameAttributeMatrixTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -156,7 +156,7 @@ class RenameAttributeMatrixTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -193,7 +193,7 @@ class RenameAttributeMatrixTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
@@ -228,7 +228,7 @@ class RenameAttributeMatrixTest
 
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<size_t> dims = QVector<size_t>();
+    std::vector<size_t> dims = std::vector<size_t>();
     dims.push_back(1);
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 6cbd42cd52..5d1943b922 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -149,14 +149,14 @@ class ReplaceValueTest
     DataContainer::Pointer m = DataContainer::New("ReplaceValueTest");
 
     // Create Attribute Matrices with different tDims to test validation of tuple compatibility
-    QVector<size_t> tDims(1, 100);
+    std::vector<size_t> tDims(1, 100);
     AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, "ReplaceValueAttrMat", AttributeMatrix::Type::Cell);
 
     m->addOrReplaceAttributeMatrix(attrMat);
 
     dca->addOrReplaceDataContainer(m);
 
-    QVector<size_t> cDims(1, 3);
+    std::vector<size_t> cDims(1, 3);
     int32_t initVal = 10;
     tDims[0] = 100;
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index 442965b646..d551f6ce4a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -77,7 +77,7 @@ class RequiredZThicknessTest
     // incorrect geometry
     TriangleGeom::Pointer triGeom = TriangleGeom::New();
 
-    QVector<size_t> dims;
+    std::vector<size_t> dims;
     dims.push_back(3);
     DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
     verts->setComponent(0, 0, -1);
@@ -92,7 +92,7 @@ class RequiredZThicknessTest
     verts->setComponent(2, 1, 1);
     verts->setComponent(2, 2, 0);
 
-    QVector<size_t> dims2;
+    std::vector<size_t> dims2;
     dims2.push_back(3);
     SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index 8f45bb6b11..d2768a6b17 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -87,7 +87,7 @@ class ScaleVolumeTest
 
     TriangleGeom::Pointer triGeom = TriangleGeom::New();
 
-    QVector<size_t> dims;
+    std::vector<size_t> dims;
     dims.push_back(3);
     DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
     verts->setComponent(0, 0, -1);
@@ -102,7 +102,7 @@ class ScaleVolumeTest
     verts->setComponent(2, 1, 1);
     verts->setComponent(2, 2, 0);
 
-    QVector<size_t> dims2;
+    std::vector<size_t> dims2;
     dims2.push_back(3);
     SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 5a5dfbcce2..ab5fbe1022 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -86,7 +86,7 @@ class SetOriginResolutionImageGeomTest
     // incorrect geometry
     TriangleGeom::Pointer triGeom = TriangleGeom::New();
 
-    QVector<size_t> dims;
+    std::vector<size_t> dims;
     dims.push_back(3);
     DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
     verts->setComponent(0, 0, -1);
@@ -101,7 +101,7 @@ class SetOriginResolutionImageGeomTest
     verts->setComponent(2, 1, 1);
     verts->setComponent(2, 2, 0);
 
-    QVector<size_t> dims2;
+    std::vector<size_t> dims2;
     dims2.push_back(3);
     SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index cb97ed8d4c..9c7f701b51 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -65,45 +65,45 @@ class SplitAttributeArrayTest
   {
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
-    AttributeMatrix::Pointer am1 = AttributeMatrix::New(QVector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Any);
+    AttributeMatrix::Pointer am1 = AttributeMatrix::New(std::vector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Any);
 
-    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array uint32_t");
+    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint32_t");
     fillDataArray<uint32_t>(mcArray1);
 
-    BoolArrayType::Pointer mcArray2 = BoolArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array bool");
+    BoolArrayType::Pointer mcArray2 = BoolArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array bool");
     fillDataArray(mcArray2);
 
-    UCharArrayType::Pointer mcArray3 = UCharArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array unsigned char");
+    UCharArrayType::Pointer mcArray3 = UCharArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array unsigned char");
     fillDataArray<unsigned char>(mcArray3);
 
-    Int8ArrayType::Pointer mcArray4 = Int8ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array int8_t");
+    Int8ArrayType::Pointer mcArray4 = Int8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int8_t");
     fillDataArray<int8_t>(mcArray4);
 
-    UInt8ArrayType::Pointer mcArray5 = UInt8ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array uint8_t");
+    UInt8ArrayType::Pointer mcArray5 = UInt8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint8_t");
     fillDataArray<uint8_t>(mcArray5);
 
-    Int16ArrayType::Pointer mcArray6 = Int16ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array int16_t");
+    Int16ArrayType::Pointer mcArray6 = Int16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int16_t");
     fillDataArray<int16_t>(mcArray6);
 
-    UInt16ArrayType::Pointer mcArray7 = UInt16ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array uint16_t");
+    UInt16ArrayType::Pointer mcArray7 = UInt16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint16_t");
     fillDataArray<uint16_t>(mcArray7);
 
-    Int32ArrayType::Pointer mcArray8 = Int32ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array int32_t");
+    Int32ArrayType::Pointer mcArray8 = Int32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int32_t");
     fillDataArray<int32_t>(mcArray8);
 
-    Int64ArrayType::Pointer mcArray9 = Int64ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array int64_t");
+    Int64ArrayType::Pointer mcArray9 = Int64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int64_t");
     fillDataArray<int64_t>(mcArray9);
 
-    UInt64ArrayType::Pointer mcArray10 = UInt64ArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array uint64_t");
+    UInt64ArrayType::Pointer mcArray10 = UInt64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint64_t");
     fillDataArray<uint64_t>(mcArray10);
 
-    FloatArrayType::Pointer mcArray11 = FloatArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array float");
+    FloatArrayType::Pointer mcArray11 = FloatArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array float");
     fillDataArray<float>(mcArray11);
 
-    DoubleArrayType::Pointer mcArray12 = DoubleArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array double");
+    DoubleArrayType::Pointer mcArray12 = DoubleArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array double");
     fillDataArray<double>(mcArray12);
 
-    SizeTArrayType::Pointer mcArray13 = SizeTArrayType::CreateArray(QVector<size_t>(1, 10), QVector<size_t>(1, 5), "MultiComponent Array size_t");
+    SizeTArrayType::Pointer mcArray13 = SizeTArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array size_t");
     fillDataArray<size_t>(mcArray13);
 
     am1->insertOrAssign(mcArray1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index f787e43f49..7e19efea63 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -89,7 +89,7 @@ class WriteASCIIDataTest
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
-    AttributeMatrix::Pointer am = AttributeMatrix::New(QVector<size_t>(1, k_ArraySize), "TestAttributeMatrix", AttributeMatrix::Type::Any);
+    AttributeMatrix::Pointer am = AttributeMatrix::New(std::vector<size_t>(1, k_ArraySize), "TestAttributeMatrix", AttributeMatrix::Type::Any);
 
     StringDataArray::Pointer strArray = StringDataArray::CreateArray(k_ArraySize, k_ArrayName, true);
     strArray->setValue(0, QString("Foo"));
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index d14e777b9b..fcf4d9f82e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -105,9 +105,9 @@ class WriteTriangleGeometryTest
     static const QString k_TriVertexListDAName("TriVertexList");
     static const QString k_TriListDAName("TriangleList");
 
-    QVector<size_t> k_Dims3(1, 3);
-    QVector<size_t> k_NumNodes(1, 99);
-    QVector<size_t> k_NumTriangles(1, 33);
+    std::vector<size_t> k_Dims3(1, 3);
+    std::vector<size_t> k_NumNodes(1, 99);
+    std::vector<size_t> k_NumTriangles(1, 33);
 
     // Create DataContainerArray
 
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 28056ed2e2..990846a75a 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -58,21 +57,15 @@ class ASCIIWizardData
   // clang-format on
 
 public:
-  ASCIIWizardData() :
-    inputFilePath(""),
-    beginIndex(-1),
-    numberOfLines(-1)
-  {
-
-  }
+  ASCIIWizardData() = default;
 
-  QString inputFilePath;
+  QString inputFilePath = "";
   QStringList dataHeaders;
   int beginIndex = -1;
   int numberOfLines = -1;
   QStringList dataTypes;
   QList<char> delimiters;
-  QVector<size_t> tupleDims;
+  std::vector<size_t> tupleDims;
   int attrMatType = 999;
   DataArrayPath selectedPath;
 
@@ -109,7 +102,7 @@ class ASCIIWizardData
 
   bool isEmpty()
   {
-    if (inputFilePath.isEmpty() && dataHeaders.isEmpty() && dataTypes.isEmpty() && tupleDims.isEmpty() && beginIndex < 0 && numberOfLines < 0 && selectedPath.isEmpty())
+    if(inputFilePath.isEmpty() && dataHeaders.isEmpty() && dataTypes.isEmpty() && tupleDims.empty() && beginIndex < 0 && numberOfLines < 0 && selectedPath.isEmpty())
     {
       return true;
     }
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index a968b6d2eb..e168e31b56 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -68,15 +68,12 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
       {
         return static_cast<double>(m_Array->getValue(i));
       }
-      else if (m_Array->getNumberOfTuples() == 1)
+      if(m_Array->getNumberOfTuples() == 1)
       {
         return static_cast<double>(m_Array->getValue(0));
       }
-      else
-      {
-        // ERROR: The array is empty!
-        return 0.0;
-      }
+      // ERROR: The array is empty!
+      return 0.0;
     }
 
     ICalculatorArray::ValueType getType() override
@@ -90,7 +87,7 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
       {
         if(m_Array->getNumberOfComponents() > 1)
         {
-          DoubleArrayType::Pointer newArray = DoubleArrayType::CreateArray(m_Array->getNumberOfTuples(), QVector<size_t>(1, 1), m_Array->getName(), allocate);
+          DoubleArrayType::Pointer newArray = DoubleArrayType::CreateArray(m_Array->getNumberOfTuples(), {1}, m_Array->getName(), allocate);
           if(allocate)
           {
             for(int i = 0; i < m_Array->getNumberOfTuples(); i++)
@@ -122,7 +119,7 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
       m_Type(type)
     {
       m_Array = DoubleArrayType::CreateArray(dataArray->getNumberOfTuples(), dataArray->getComponentDimensions(), dataArray->getName(), allocate);
-      if (allocate == true)
+      if(allocate)
       {
         for (int i = 0; i < dataArray->getSize(); i++)
         {
@@ -135,7 +132,10 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
     DoubleArrayType::Pointer                                  m_Array;
     ValueType                                                 m_Type;
 
-    CalculatorArray(const CalculatorArray&); // Copy Constructor Not Implemented
-    void operator=(const CalculatorArray&);  // Move assignment Not Implemented
+  public:
+    CalculatorArray(const CalculatorArray&) = delete;            // Copy Constructor Not Implemented
+    CalculatorArray(CalculatorArray&&) = delete;                 // Move Constructor Not Implemented
+    CalculatorArray& operator=(const CalculatorArray&) = delete; // Copy Assignment Not Implemented
+    CalculatorArray& operator=(CalculatorArray&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 8efb296a46..5c34112bcd 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -55,23 +55,9 @@
   ptr[s] = ptr[d];                                                                                                                                                                                     \
   ptr[d] = t[0];
 
-/** @brief Resizes the DataArray Shared m_Array and assigns its internal data pointer
- *
- */
-#define RESIZE_ARRAY(sharedArray, pointer, size) pointer = sharedArray->WritePointer(0, size);
-
-#define DECLARE_WRAPPED_ARRAY(pubVar, priVar, Type)                                                                                                                                                    \
-  DataArray<Type>::Pointer priVar;                                                                                                                                                                     \
-  Type* pubVar;
-
-#define INIT_DataArray(var, Type) var = DataArray<Type>::CreateArray(0, #var);
-
 /**
- * @class DataArray DataArray.hpp DREAM3DLib/Common/DataArray.hpp
- * @brief Template class for wrapping raw arrays of data.
- * @author mjackson
- * @date July 3, 2008
- * @version $Revision: 1.2 $
+ * @class DataArray
+ * @brief Template class for wrapping raw arrays of data and is the basis for storing data within the SIMPL data structure.
  */
 template <typename T> class DataArray : public IDataArray
 {
@@ -81,13 +67,246 @@ template <typename T> class DataArray : public IDataArray
   SIMPL_TYPE_MACRO_SUPER(DataArray<T>, IDataArray)
   SIMPL_CLASS_VERSION(2)
 
-  DataArray(const DataArray&) = default;           // Copy Constructor Not Implemented
+  DataArray(const DataArray&) = default;           // Copy Constructor default Implemented
   DataArray(DataArray&&) = delete;                 // Move Constructor Not Implemented
   DataArray& operator=(const DataArray&) = delete; // Copy Assignment Not Implemented
   DataArray& operator=(DataArray&&) = delete;      // Move Assignment Not Implemented
 
-  using ContainterType = QVector<Pointer>;
+  //========================================= STL INTERFACE COMPATIBILITY =================================
+  using comp_dims_type = std::vector<size_t>;
+  using size_type = size_t;
+  using value_type = T;
+  using reference = T&;
+  using iterator_category = std::input_iterator_tag;
+  using pointer = T*;
+  using difference_type = value_type;
+
+  //========================================= SIMPL INTERFACE COMPATIBILITY =================================
+  using ContainterType = std::vector<Pointer>;
+
+  //========================================= Constructing DataArray Objects =================================
+  DataArray() = default;
+
+  /**
+   * @brief Constructor
+   * @param numTuples The number of Tuples in the DataArray
+   * @param name The name of the DataArray
+   * @param initValue The value to use when initializing each element of the array
+   */
+  DataArray(size_t numTuples, const QString& name, T initValue)
+  : IDataArray(name)
+  {
+    m_NumComponents = 1;
+    resizeTuples(numTuples);
+  }
+
+  /**
+   * @brief DataArray
+   * @param numTuples The number of Tuples in the DataArray
+   * @param name The name of the DataArray
+   * @param compDims The number of elements in each axis dimension.
+   * @param initValue The value to use when initializing each element of the array
+   *
+   * For example if you have a 2D image dimensions of 80(w) x 60(h) then the "cdims" would be [80][60]
+   */
+  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue)
+  : IDataArray(name)
+  , m_NumTuples(numTuples)
+  , m_CompDims(std::move(compDims))
+  {
+    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<>());
+    m_InitValue = initValue;
+    m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
+  }
+
+  /**
+   * @brief Protected Constructor
+   * @param numTuples The number of Tuples in the DataArray
+   * @param name The name of the DataArray
+   * @param compDims The number of elements in each axis dimension.
+   * @param initValue The value to use when initializing each element of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   */
+  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate)
+  : IDataArray(name)
+  , m_NumTuples(numTuples)
+  , m_CompDims(std::move(compDims))
+  {
+    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<>());
+    m_InitValue = static_cast<T>(0);
+    if(allocate)
+    {
+      resizeTuples(numTuples);
+    }
+    else
+    {
+      m_Size = m_NumTuples * m_NumComponents;
+      m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
+    }
+#if 0
+      MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
+#endif
+  }
+
+  ~DataArray() override
+  {
+    clear();
+  }
+
+  //========================================= Static Constructing DataArray Objects =================================
+  /**
+   * @brief Static constructor
+   * @param numElements The number of elements in the internal array.
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
+    {
+      return NullPointer();
+    }
+    comp_dims_type cDims = {1};
+    auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
+    if(allocate)
+    {
+      if(d->allocate() < 0)
+      {
+        // Could not allocate enough memory, reset the pointer to null and return
+        delete d;
+        return DataArray<T>::NullPointer();
+      }
+    }
+    Pointer ptr(d);
+    return ptr;
+  }
+
+  /**
+   * @brief Static constructor
+   * @param numTuples The number of tuples in the array.
+   * @param rank The number of dimensions of the attribute on each Tuple
+   * @param dims The actual dimensions of the attribute on each Tuple
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
+    {
+      return NullPointer();
+    }
+    comp_dims_type cDims(rank);
+    for(int i = 0; i < rank; i++)
+    {
+      cDims[i] = dims[i];
+    }
+    auto d = new DataArray<T>(numTuples, name, cDims, allocate);
+    if(allocate)
+    {
+      if(d->allocate() < 0)
+      {
+        // Could not allocate enough memory, reset the pointer to null and return
+        delete d;
+        return DataArray<T>::NullPointer();
+      }
+    }
+    Pointer ptr(d);
+    return ptr;
+  }
+
+  /**
+   * @brief Static constructor
+   * @param numTuples The number of tuples in the array.
+   * @param compDims The actual dimensions of the attribute on each Tuple
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  static Pointer CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
+    {
+      return NullPointer();
+    }
+    DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, allocate);
+    if(allocate)
+    {
+      if(d->allocate() < 0)
+      {
+        // Could not allocate enough memory, reset the pointer to null and return
+        delete d;
+        return DataArray<T>::NullPointer();
+      }
+    }
+    Pointer ptr(d);
+    return ptr;
+  }
 
+  /**
+   * @brief Static constructor
+   * @param numTuples The number of tuples in the array.
+   * @param tDims The actual dimensions of the Tuples
+   * @param compDims The number of elements in each axis dimension.
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  static Pointer CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
+    {
+      return NullPointer();
+    }
+
+    size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), 1, std::multiplies<>());
+
+    auto d = new DataArray<T>(numTuples, name, compDims, allocate);
+    if(allocate)
+    {
+      if(d->allocate() < 0)
+      {
+        // Could not allocate enough memory, reset the pointer to null and return
+        delete d;
+        return DataArray<T>::NullPointer();
+      }
+    }
+    Pointer ptr(d);
+    return ptr;
+  }
+
+  //========================================= Instance Constructing DataArray Objects =================================
+  /**
+   * @brief createNewArray Creates a new DataArray object using the same POD type as the existing instance
+   * @param numTuples The number of tuples in the array.
+   * @param rank The number of dimensions of the attribute on each Tuple
+   * @param dims The actual dimensions of the attribute on each Tuple
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return
+   */
+  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate = true) override
+  {
+    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
+    return p;
+  }
+
+  /**
+   * @brief createNewArray
+   * @param numTuples The number of tuples in the array.
+   * @param compDims The number of elements in each axis dimension.
+   * @param name The name of the array
+   * @param allocate Will all the memory be allocated at time of construction
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate = true) override
+  {
+    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
+    return p;
+  }
+
+  //========================================= Begin API =================================
   /**
    * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
    * can be a primitive like char, float, int or the name of a class.
@@ -222,153 +441,6 @@ template <typename T> class DataArray : public IDataArray
     return SIMPL::NumericTypes::Type::UnknownNumType;
   }
 
-  /**
-   * @brief Static constructor
-   * @param numElements The number of elements in the internal array.
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer CreateArray(size_t numElements, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    QVector<size_t> cDims(1, 1);
-    auto d = new DataArray<T>(numElements, cDims, name, allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
-
-  /**
-   * @brief Static constructor
-   * @param numTuples The number of tuples in the array.
-   * @param rank The number of dimensions of the attribute on each Tuple
-   * @param dims The actual dimensions of the attribute on each Tuple
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    QVector<size_t> cDims(rank);
-    for(int i = 0; i < rank; i++)
-    {
-      cDims[i] = dims[i];
-    }
-    auto d = new DataArray<T>(numTuples, cDims, name, allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
-
-  /**
-   * @brief Static constructor
-   * @param numTuples The number of tuples in the array.
-   * @param dims The actual dimensions of the attribute on each Tuple
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    DataArray<T>* d = new DataArray<T>(numTuples, QVector<size_t>::fromStdVector(cDims), name, allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
-
-  /**
-   * @brief Static constructor
-   * @param numTuples The number of tuples in the array.
-   * @param dims The actual dimensions of the attribute on each Tuple
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer CreateArray(size_t numTuples, QVector<size_t> cDims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    auto d = new DataArray<T>(numTuples, cDims, name, allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
-
-  /**
-   * @brief Static constructor
-   * @param numTuples The number of tuples in the array.
-   * @param tDims The actual dimensions of the Tuples
-   * @param cDims The actual dimensions of the attribute on each Tuple
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer CreateArray(QVector<size_t> tDims, QVector<size_t> cDims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    size_t numTuples = tDims[0];
-    for(int i = 1; i < tDims.size(); i++)
-    {
-      numTuples *= tDims[i];
-    }
-    auto d = new DataArray<T>(numTuples, cDims, name, allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
-
   /**
    * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
    * contained in the vector. The number of components will be set to 1.
@@ -388,7 +460,7 @@ template <typename T> class DataArray : public IDataArray
   }
 
   /**
-   * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
+   * @brief Static Method to create a DataArray from a std::vector through a deep copy of the data
    * contained in the vector. The number of components will be set to 1.
    * @param vec The vector to copy the data from
    * @param name The name of the array
@@ -396,7 +468,7 @@ template <typename T> class DataArray : public IDataArray
    */
   static Pointer FromStdVector(std::vector<T>& vec, const QString& name, bool allocate = true)
   {
-    QVector<size_t> cDims(1, 1);
+    comp_dims_type cDims(1, 1);
     Pointer p = CreateArray(vec.size(), cDims, name, allocate);
     if(nullptr != p.get())
     {
@@ -433,10 +505,10 @@ template <typename T> class DataArray : public IDataArray
    * @param ownsData
    * @return
    */
-  static Pointer WrapPointer(T* data, size_t numTuples, QVector<size_t> cDims, const QString& name, bool ownsData)
+  static Pointer WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
   {
     // Allocate on the heap
-    auto d = new DataArray(numTuples, cDims, name, false);
+    auto d = new DataArray(numTuples, name, compDims, false);
     // Wrap that heap pointer with a shared_pointer to make it reference counted
     Pointer p(d);
 
@@ -533,46 +605,6 @@ template <typename T> class DataArray : public IDataArray
     return false;
   }
 
-  /**
-   * @brief createNewArray
-   * @param numTuples
-   * @param rank
-   * @param dims
-   * @param name
-   * @return
-   */
-  IDataArray::Pointer createNewArray(size_t numTuples, int rank, size_t* dims, const QString& name, bool allocate = true) override
-  {
-    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, dims, name, allocate);
-    return p;
-  }
-
-  /**
-   * @brief createNewArray
-   * @param numTuples
-   * @param dims
-   * @param name
-   * @return
-   */
-  IDataArray::Pointer createNewArray(size_t numTuples, std::vector<size_t> dims, const QString& name, bool allocate = true) override
-  {
-    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, dims, name, allocate);
-    return p;
-  }
-
-  /**
-   * @brief createNewArray
-   * @param numTuples
-   * @param dims
-   * @param name
-   * @return
-   */
-  IDataArray::Pointer createNewArray(size_t numTuples, QVector<size_t> dims, const QString& name, bool allocate = true) override
-  {
-    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, dims, name, allocate);
-    return p;
-  }
-
   /**
    * @brief isAllocated
    * @return
@@ -678,7 +710,7 @@ template <typename T> class DataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(QVector<size_t>& idxs) override
+  int eraseTuples(comp_dims_type& idxs) override
   {
     int err = 0;
 
@@ -743,9 +775,9 @@ template <typename T> class DataArray : public IDataArray
       return 0;
     }
 
-    QVector<size_t> srcIdx(idxs.size() + 1);
-    QVector<size_t> destIdx(idxs.size() + 1);
-    QVector<size_t> copyElements(idxs.size() + 1);
+    comp_dims_type srcIdx(idxs.size() + 1);
+    comp_dims_type destIdx(idxs.size() + 1);
+    comp_dims_type copyElements(idxs.size() + 1);
     srcIdx[0] = 0;
     destIdx[0] = 0;
     copyElements[0] = (idxs[0] - 0) * m_NumComponents;
@@ -841,9 +873,9 @@ template <typename T> class DataArray : public IDataArray
    * at each tuple then this will return a single element QVector. If you have a 1x3 array (like EUler Angles) then
    * this will return a 3 Element QVector.
    */
-  QVector<size_t> getComponentDimensions() override
+  comp_dims_type getComponentDimensions() override
   {
-    return QVector<size_type>::fromStdVector(m_CompDims);
+    return m_CompDims;
   }
 
   /**
@@ -1299,7 +1331,7 @@ template <typename T> class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, QVector<size_t> tDims) override
+  int writeH5Data(hid_t parentId, comp_dims_type tDims) override
   {
     if(m_Array == nullptr)
     {
@@ -1440,7 +1472,7 @@ template <typename T> class DataArray : public IDataArray
     m_IsAllocated = true;
     setName(p->getName());
     m_NumTuples = p->getNumberOfTuples();
-    m_CompDims = p->getComponentDimensions().toStdVector();
+    m_CompDims = p->getComponentDimensions();
     m_NumComponents = p->getNumberOfComponents();
 
     // Tell the intermediate DataArray to release ownership of the data as we are going to be responsible
@@ -1481,70 +1513,6 @@ template <typename T> class DataArray : public IDataArray
 
   //========================================= STL INTERFACE COMPATIBILITY =================================
 
-  using comp_dims_type = std::vector<size_t>;
-  using size_type = size_t;
-  using value_type = T;
-  using reference = T&;
-  using iterator_category = std::input_iterator_tag;
-  using pointer = T*;
-  using difference_type = value_type;
-
-  DataArray() = default;
-  /**
-   * @brief DataArray
-   * @param ntuples
-   * @param name
-   * @param allocate
-   */
-  DataArray(size_t ntuples, const std::string& name, bool allocate = true)
-  : IDataArray(QString::fromStdString(name))
-  {
-    m_NumComponents = 1;
-    if(allocate)
-    {
-      resizeTuples(ntuples);
-    }
-    else
-    {
-      m_Size = ntuples;
-      m_MaxId = (ntuples == 0) ? 0 : ntuples - 1;
-      m_NumTuples = ntuples;
-      m_NumComponents = 1;
-    }
-  }
-
-  /**
-   * @brief DataArray
-   * @param ntuples
-   * @param cdims
-   * @param name
-   * @param allocate
-   */
-  DataArray(size_t ntuples, comp_dims_type cdims, const std::string& name, bool allocate = true)
-  : IDataArray(QString::fromStdString(name))
-  , m_NumTuples(ntuples)
-  , m_CompDims(std::move(cdims))
-  {
-    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<T>());
-    m_InitValue = static_cast<T>(0);
-    if(allocate)
-    {
-      m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
-    }
-    else
-    {
-      m_Size = m_NumTuples * m_NumComponents;
-      m_MaxId = (m_Size == 0) ? 0 : m_Size - 1;
-    }
-  }
-
-  ~DataArray() override
-  {
-    clear();
-  }
-
-  //========================================= STL INTERFACE COMPATIBILITY =================================
-
   class tuple_iterator
   {
   public:
@@ -1984,32 +1952,6 @@ template <typename T> class DataArray : public IDataArray
   // =================================== END STL COMPATIBLE INTERFACe ===================================================
 
 protected:
-  /**
-   * @brief Protected Constructor
-   * @param numTuples The number of elements in the internal array.
-   * @param rank The number of dimensions the attribute on each Tuple has.
-   * @param dims The actual dimensions the attribute on each Tuple has.
-   * @param takeOwnership Will the class clean up the memory. Default=true
-   */
-  DataArray(size_t numTuples, const QVector<size_t>& compDims, const QString& name, bool ownsData = true)
-  : IDataArray(name)
-  , m_NumTuples(numTuples)
-  , m_OwnsData(ownsData)
-  {
-    // Set the Component Dimensions and compute the number of components at each tuple for caching
-    m_CompDims = std::vector<size_type>(compDims.begin(), compDims.end());
-    m_NumComponents = m_CompDims[0];
-    for(int i = 1; i < m_CompDims.size(); i++)
-    {
-      m_NumComponents = m_NumComponents * m_CompDims[i];
-    }
-
-    m_Size = m_NumTuples * m_NumComponents;
-    m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
-
-    m_InitValue = static_cast<T>(0);
-    //  MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
-  }
 
   /**
    * @brief deallocates the memory block
@@ -2187,7 +2129,7 @@ template <typename T> class DataArray : public IDataArray
   size_t m_NumTuples = 0;
   size_t m_NumComponents = 1;
   T m_InitValue = static_cast<T>(0);
-  std::vector<size_t> m_CompDims = {1};
+  comp_dims_type m_CompDims = {1};
   bool m_IsAllocated = false;
   bool m_OwnsData = true;
 };
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 3b2ab1d1ee..08b5e5a9b0 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -17,8 +17,8 @@
 #include <hdf5.h>
 
 //--Qt Includes
+#include <QtCore/QDebug>
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 
 //SIMPLib Includes
 #include "SIMPLib/SIMPLib.h"
@@ -44,7 +44,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
 
   PYB11_METHOD(QString getTypeAsString)
-  PYB11_METHOD(QVector<size_t> getComponentDimensions)
+  PYB11_METHOD(std::vector<size_t> getComponentDimensions)
   PYB11_METHOD(size_t getNumberOfTuples)
   PYB11_METHOD(int getNumberOfComponents)
 
@@ -78,9 +78,9 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
     IDataArray(const QString& name = "");
     ~IDataArray() override;
 
-    virtual Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) = 0;
-    virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
-    virtual Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) = 0;
+    virtual Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) = 0;
+    virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) = 0;
+    // virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
 
     /**
      * @brief Creates and returns a DataArrayPath for the DataArray
@@ -129,8 +129,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
     virtual size_t getSize() = 0;
 
     virtual int getNumberOfComponents() = 0;
-    virtual QVector<size_t> getComponentDimensions() = 0;
-
+    virtual std::vector<size_t> getComponentDimensions() = 0;
 
     /**
      * @brief Returns the number of bytes that make up the data type.
@@ -153,7 +152,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param idxs The indices to erase
      * @return
      */
-    virtual int eraseTuples(QVector<size_t>& idxs) = 0;
+    virtual int eraseTuples(std::vector<size_t>& idxs) = 0;
 
     /**
      * @brief Copies a Tuple from one position to another.
@@ -261,7 +260,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param tDims
      * @return
      */
-    virtual int writeH5Data(hid_t parentId, QVector<size_t> tDims) = 0;
+    virtual int writeH5Data(hid_t parentId, std::vector<size_t> tDims) = 0;
 
     /**
      * @brief readH5Data
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 02b5d279ef..a67fbbaf2f 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -106,7 +106,7 @@ class NeighborList : public IDataArray
      * @param allocate
      * @return
      */
-    static Pointer CreateArray(size_t numTuples, int rank, size_t* dims, const QString& name, bool allocate = true)
+    static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
     {
       //std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
       if(name.isEmpty())
@@ -135,17 +135,14 @@ class NeighborList : public IDataArray
      * @param allocate
      * @return
      */
-    static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true)
+    static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
     {
       if(name.isEmpty())
       {
         return NullPointer();
       }
-      size_t numElements = numTuples;
-      for(size_t iter = 0; iter < cDims.size(); iter++)
-      {
-        numElements *= cDims[iter];
-      }
+      size_t numElements = std::accumulate(cDims.begin(), cDims.end(), numTuples, std::multiplies<>());
+
       Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
       if(allocate)
       {
@@ -162,24 +159,24 @@ class NeighborList : public IDataArray
      * @param allocate
      * @return
      */
-    static Pointer CreateArray(size_t numTuples, QVector<size_t> cDims, const QString& name, bool allocate = true)
-    {
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-      size_t numElements = numTuples;
-      for(int iter = 0; iter < cDims.size(); iter++)
-      {
-        numElements *= cDims[iter];
-      }
-      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-      if(allocate)
-      {
-        ptr->resizeTuples(numElements);
-      }
-      return ptr;
-    }
+    //    static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true)
+    //    {
+    //      if(name.isEmpty())
+    //      {
+    //        return NullPointer();
+    //      }
+    //      size_t numElements = numTuples;
+    //      for(int iter = 0; iter < cDims.size(); iter++)
+    //      {
+    //        numElements *= cDims[iter];
+    //      }
+    //      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+    //      if(allocate)
+    //      {
+    //        ptr->resizeTuples(numElements);
+    //      }
+    //      return ptr;
+    //    }
 
     /**
      * @brief CreateArray
@@ -189,7 +186,7 @@ class NeighborList : public IDataArray
      * @param allocate
      * @return
      */
-    static Pointer CreateArray(QVector<size_t> tDims, QVector<size_t> cDims, const QString& name, bool allocate = true)
+    static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
     {
       if(name.isEmpty())
       {
@@ -220,7 +217,7 @@ class NeighborList : public IDataArray
      * @param name
      * @return
      */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override
     {
       return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
     }
@@ -232,7 +229,7 @@ class NeighborList : public IDataArray
      * @param name
      * @return
      */
-    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override
     {
       return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
     }
@@ -244,10 +241,10 @@ class NeighborList : public IDataArray
      * @param name
      * @return
      */
-    IDataArray::Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) override
-    {
-      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
-    }
+    //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
+    //    {
+    //      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
+    //    }
 
     using VectorType = std::vector<T>;
     using SharedVectorType = std::shared_ptr<VectorType>;
@@ -338,7 +335,7 @@ class NeighborList : public IDataArray
      * @param idxs The indices to remove
      * @return error code.
      */
-    int eraseTuples(QVector<size_t>& idxs) override
+    int eraseTuples(std::vector<size_t>& idxs) override
     {
       int err = 0;
       // If nothing is to be erased just return
@@ -357,7 +354,7 @@ class NeighborList : public IDataArray
       size_t arraySize = m_Array.size();
       // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
       // off the end of the array and return an error code.
-      for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+      for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
       {
         if (idxs[i] >= arraySize) { return -100; }
       }
@@ -519,9 +516,9 @@ class NeighborList : public IDataArray
      * @brief getComponentDimensions
      * @return
      */
-    QVector<size_t> getComponentDimensions() override
+    std::vector<size_t> getComponentDimensions() override
     {
-      QVector<size_t> dims(1, 1);
+      std::vector<size_t> dims = {1};
       return dims;
     }
 
@@ -630,7 +627,7 @@ class NeighborList : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, QVector<size_t> tDims) override
+    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override
     {
       int err = 0;
 
@@ -741,7 +738,7 @@ class NeighborList : public IDataArray
           return -609;
         }
 
-        QVector<size_t> cDims = getComponentDimensions();
+        std::vector<size_t> cDims = getComponentDimensions();
         // write the component dimensions as  an attribute
         size = cDims.size();
         err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 024cfe15dc..c664f06981 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -83,7 +83,7 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numElements, const QS
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, int rank, size_t* dims, const QString& name, bool allocate)
+StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -102,7 +102,7 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, int rank,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate)
+StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -118,29 +118,11 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, std::vecto
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, QVector<size_t> cDims, const QString& name, bool allocate)
-{
-  if(name.isEmpty())
-  {
-    return NullPointer();
-  }
-  StatsDataArray::Pointer ptr = StatsDataArray::New();
-  ptr->setName(name);
-  std::vector<PhaseType::Type> phase_types(numTuples, PhaseType::Type::Unknown);
-  if(allocate)
-  {
-    ptr->fillArrayWithNewStatsData(numTuples, &(phase_types.front()));
-  }
-  return ptr;
-}
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsDataArray::Pointer StatsDataArray::CreateArray(QVector<size_t> tDims, QVector<size_t> cDims, const QString& name, bool allocate)
+StatsDataArray::Pointer StatsDataArray::CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -165,15 +147,7 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(QVector<size_t> tDims, QVect
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate)
-{
-  return StatsDataArray::NullPointer();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate)
+IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate)
 {
   return StatsDataArray::NullPointer();
 }
@@ -181,7 +155,7 @@ IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, std::vect
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate)
+IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate)
 {
   return StatsDataArray::NullPointer();
 }
@@ -253,9 +227,9 @@ int StatsDataArray::getNumberOfComponents()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> StatsDataArray::getComponentDimensions()
+std::vector<size_t> StatsDataArray::getComponentDimensions()
 {
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims = {1};
   return dims;
 }
 
@@ -270,7 +244,7 @@ size_t StatsDataArray::getTypeSize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::eraseTuples(QVector<size_t>& idxs)
+int StatsDataArray::eraseTuples(std::vector<size_t>& idxs)
 {
   int err = 0;
 
@@ -288,9 +262,9 @@ int StatsDataArray::eraseTuples(QVector<size_t>& idxs)
 
   // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
   // off the end of the array and return an error code.
-  for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+  for(const auto& idx : idxs)
   {
-    if(idxs[i] >= static_cast<size_t>(m_StatsDataArray.size()))
+    if(idx >= static_cast<size_t>(m_StatsDataArray.size()))
     {
       return -100;
     }
@@ -454,7 +428,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeH5Data(hid_t parentId, QVector<size_t> tDims)
+int StatsDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims)
 {
   herr_t err = 0;
   hid_t gid = QH5Utilities::createGroup(parentId, getName());
@@ -480,7 +454,7 @@ int StatsDataArray::writeH5Data(hid_t parentId, QVector<size_t> tDims)
     }
   }
 
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   err = H5DataArrayWriter::writeDataArrayAttributes<StatsDataArray>(parentId, this, tDims, cDims);
 
   return err;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 6e1e18e369..6a25b8a316 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -52,8 +52,8 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t int size_t* QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
-  PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QVector<size_t> QString bool)
-  PYB11_STATIC_CREATION(CreateArray OVERLOAD QVector<size_t> QVector<size_t> QString bool)
+  PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
+  PYB11_STATIC_CREATION(CreateArray OVERLOAD std::vector<size_t> std::vector<size_t> QString bool)
   PYB11_METHOD(void setStatsData ARGS int,index StatsData::Pointer,statsData)
   PYB11_METHOD(StatsData::Pointer getStatsData ARGS int,index)
   PYB11_METHOD(void fillArrayWithNewStatsData OVERLOAD size_t,n PhaseType::Type*,phase_types)
@@ -85,7 +85,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, int rank, size_t* dims, const QString& name, bool allocate = true);
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateArray
@@ -95,17 +95,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true);
-
-  /**
-   * @brief CreateArray
-   * @param numTuples
-   * @param cDims
-   * @param name
-   * @param allocate
-   * @return
-   */
-  static Pointer CreateArray(size_t numTuples, QVector<size_t> cDims, const QString& name, bool allocate = true);
+  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateArray
@@ -115,7 +105,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(QVector<size_t> tDims, QVector<size_t> cDims, const QString& name, bool allocate = true);
+  static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate = true);
 
   /**
    * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
@@ -132,11 +122,9 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
 
   SIMPL_INSTANCE_PROPERTY(QVector<StatsData::Pointer>, StatsDataArray)
 
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) override;
-
-  IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override;
 
-  IDataArray::Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override;
 
   /**
    * @brief
@@ -226,7 +214,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @brief getComponentDimensions
    * @return
    */
-  QVector<size_t> getComponentDimensions() override;
+  std::vector<size_t> getComponentDimensions() override;
 
   /**
    * @brief Returns the number of bytes that make up the data type.
@@ -245,7 +233,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(QVector<size_t>& idxs) override;
+  int eraseTuples(std::vector<size_t>& idxs) override;
 
   /**
    * @brief Copies a Tuple from one position to another.
@@ -333,7 +321,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, QVector<size_t> tDims) override;
+  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override;
 
   /**
    * @brief readH5Data
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index 86466347f4..06bcb991f7 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -74,7 +74,7 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const QS
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, QVector<size_t> compDims, const QString& name, bool allocate)
+StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const std::vector<size_t>& compDims, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
@@ -88,7 +88,7 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, QVector<
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate)
+IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate)
 {
   IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
   return p;
@@ -97,7 +97,7 @@ IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate)
+IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate)
 {
   IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
   return p;
@@ -106,11 +106,11 @@ IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, std::vec
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate)
-{
-  IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
-  return p;
-}
+// IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate)
+//{
+//  IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
+//  return p;
+//}
 
 StringDataArray::~StringDataArray() = default;
 
@@ -206,9 +206,9 @@ int StringDataArray::getNumberOfComponents()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> StringDataArray::getComponentDimensions()
+std::vector<size_t> StringDataArray::getComponentDimensions()
 {
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims = {1};
   return dims;
 }
 
@@ -238,7 +238,7 @@ size_t StringDataArray::getTypeSize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::eraseTuples(QVector<size_t>& idxs)
+int StringDataArray::eraseTuples(std::vector<size_t>& idxs)
 {
 
   int err = 0;
@@ -257,7 +257,7 @@ int StringDataArray::eraseTuples(QVector<size_t>& idxs)
 
   // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
   // off the end of the array and return an error code.
-  // for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+  // for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
   for(auto& value : idxs)
   {
     if(value >= static_cast<size_t>(m_Array.size()))
@@ -272,7 +272,7 @@ int StringDataArray::eraseTuples(QVector<size_t>& idxs)
   for(QVector<QString>::size_type i = 0; i < m_Array.size(); ++i)
   {
     bool keep = true;
-    for(QVector<size_t>::size_type j = start; j < idxs.size(); ++j)
+    for(std::vector<size_t>::size_type j = start; j < idxs.size(); ++j)
     {
       if(static_cast<size_t>(i) == idxs[j])
       {
@@ -443,7 +443,7 @@ QString StringDataArray::getFullNameOfClass()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeH5Data(hid_t parentId, QVector<size_t> tDims)
+int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims)
 {
   return H5DataArrayWriter::writeStringDataArray<StringDataArray>(parentId, this);
 }
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index e56ce15ae9..5942ca92c5 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   // clang-format off
   PYB11_CREATE_BINDINGS(StringDataArray SUPER IDataArray)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
-  PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QVector<size_t> QString bool)
+  PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_METHOD(QString getValue ARGS size_t,i)
   PYB11_METHOD(void setValue ARGS size_t,i const.QString.&,value)
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
 public:
   SIMPL_SHARED_POINTERS(StringDataArray)
   SIMPL_STATIC_NEW_MACRO(StringDataArray)
-  SIMPL_TYPE_MACRO_SUPER(StringDataArray, IDataArray)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(StringDataArray, IDataArray)
   SIMPL_CLASS_VERSION(2)
 
   /**
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, QVector<size_t> compDims, const QString& name, bool allocate = true);
+  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& compDims, const QString& name, bool allocate = true);
   /**
    * @brief createNewArray
    * @param numElements
@@ -97,7 +97,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param name
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override;
 
   /**
    * @brief createNewArray
@@ -107,7 +107,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override;
 
   /**
    * @brief createNewArray
@@ -117,7 +117,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) override;
+  // IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override;
 
   /**
    * @brief ~StringDataArray
@@ -185,7 +185,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
 
   int getNumberOfComponents() override;
 
-  QVector<size_t> getComponentDimensions() override;
+  std::vector<size_t> getComponentDimensions() override;
 
   // Description:
   // Set/Get the dimension (n) of the rank. Must be >= 1. Make sure that
@@ -215,7 +215,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(QVector<size_t>& idxs) override;
+  int eraseTuples(std::vector<size_t>& idxs) override;
 
   /**
    * @brief Copies a Tuple from one position to another.
@@ -326,7 +326,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, QVector<size_t> tDims) override;
+  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override;
 
   /**
    * @brief writeXdmfAttribute
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index fc59295d76..7d9414e567 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -90,23 +90,23 @@ class StructArray : public IDataArray
      * @param name The name of the array
      * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
      */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, size_t* dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override
     {
       IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
       return p;
     }
 
-    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override
     {
       IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
       return p;
     }
 
-    IDataArray::Pointer createNewArray(size_t numElements, QVector<size_t> dims, const QString& name, bool allocate = true) override
-    {
-      IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
-      return p;
-    }
+    //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
+    //    {
+    //      IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
+    //      return p;
+    //    }
 
     /**
      * @brief Destructor
@@ -259,13 +259,13 @@ class StructArray : public IDataArray
      * @param idxs The indices to remove
      * @return error code.
      */
-    int eraseTuples(QVector<size_t>& idxs) override
+    int eraseTuples(std::vector<size_t>& idxs) override
     {
 
       int err = 0;
 
       // If nothing is to be erased just return
-      if(idxs.size() == 0)
+      if(idxs.empty())
       {
         return 0;
       }
@@ -279,7 +279,7 @@ class StructArray : public IDataArray
 
       // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
       // off the end of the array and return an error code.
-      for(QVector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+      for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
       {
         if (idxs[i] > this->m_MaxId) { return -100; }
       }
@@ -323,9 +323,9 @@ class StructArray : public IDataArray
         return 0;
       }
 
-      QVector<size_t> srcIdx(idxs.size() + 1);
-      QVector<size_t> destIdx(idxs.size() + 1);
-      QVector<size_t> copyElements(idxs.size() + 1);
+      std::vector<size_t> srcIdx(idxs.size() + 1);
+      std::vector<size_t> destIdx(idxs.size() + 1);
+      std::vector<size_t> copyElements(idxs.size() + 1);
       srcIdx[0] = 0;
       destIdx[0] = 0;
       copyElements[0] = (idxs[0] - 0);
@@ -496,9 +496,9 @@ class StructArray : public IDataArray
      * @brief getNumberOfComponents
      * @return
      */
-    QVector<size_t> getComponentDimensions() override
+    std::vector<size_t> getComponentDimensions() override
     {
-      QVector<size_t> dims(1, 1);
+      std::vector<size_t> dims(1, 1);
       return dims;
     }
 
@@ -571,7 +571,7 @@ class StructArray : public IDataArray
     IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
     {
       IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), m_IsAllocated);
-      if(m_IsAllocated == true && forceNoAllocate == false)
+      if(m_IsAllocated && !forceNoAllocate)
       {
         T* src = getPointer(0);
         void* dest = daCopy->getVoidPointer(0);
@@ -638,7 +638,7 @@ class StructArray : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, QVector<size_t> tDims) override
+    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override
     {
       Q_ASSERT(false);
       return -1;
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 6b1e73f55f..df1a51d3a2 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -128,7 +128,7 @@ class DataArrayTest
   template <typename T> void TestcopyTuplesForType()
   {
     int err = 0;
-    QVector<size_t> dims(1, NUM_COMPONENTS_2);
+    std::vector<size_t> dims(1, NUM_COMPONENTS_2);
     typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "TestcopyTuples");
     DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
 
@@ -190,7 +190,7 @@ class DataArrayTest
         array->setComponent(i, 0, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(0);
       eraseElements.push_back(1);
 
@@ -204,7 +204,7 @@ class DataArrayTest
 
     // Test Dropping of internal elements
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test2");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -213,7 +213,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(3);
       eraseElements.push_back(6);
       eraseElements.push_back(8);
@@ -230,7 +230,7 @@ class DataArrayTest
 
     // Test Dropping of internal elements
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test3");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -239,7 +239,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(3);
       eraseElements.push_back(6);
       eraseElements.push_back(9);
@@ -255,7 +255,7 @@ class DataArrayTest
 
     // Test Dropping of internal continuous elements
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test4");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -264,7 +264,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(3);
       eraseElements.push_back(4);
       eraseElements.push_back(5);
@@ -280,7 +280,7 @@ class DataArrayTest
 
     // Test Dropping of Front and Back Elements
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test5");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -289,7 +289,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(0);
       eraseElements.push_back(9);
 
@@ -303,7 +303,7 @@ class DataArrayTest
 
     // Test Dropping of Back Elements
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test6");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -312,7 +312,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(7);
       eraseElements.push_back(8);
       eraseElements.push_back(9);
@@ -326,7 +326,7 @@ class DataArrayTest
 
     // Test Dropping of indices larger than the number of tuples
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS_2);
+      std::vector<size_t> dims(1, NUM_COMPONENTS_2);
       typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "Test6");
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -335,7 +335,7 @@ class DataArrayTest
         array->setComponent(i, 1, static_cast<T>(i));
       }
 
-      QVector<size_t> eraseElements;
+      std::vector<size_t> eraseElements;
       eraseElements.push_back(10);
       int err = array->eraseTuples(eraseElements);
       DREAM3D_REQUIRE_EQUAL(err, -100)
@@ -465,7 +465,7 @@ class DataArrayTest
     }
 
     {
-      QVector<size_t> dims(1, NUM_COMPONENTS);
+      std::vector<size_t> dims(1, NUM_COMPONENTS);
       Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(NUM_ELEMENTS, dims, "Test8");
       ptr = int32Array->getPointer(0);
       DREAM3D_REQUIRE_EQUAL(int32Array->isAllocated(), true);
@@ -551,7 +551,7 @@ class DataArrayTest
     }
 
     // Remove the front 2 elements and test
-    QVector<size_t> eraseElements;
+    std::vector<size_t> eraseElements;
     eraseElements.push_back(0);
     eraseElements.push_back(1);
 
@@ -629,7 +629,7 @@ class DataArrayTest
   template <typename T> void TestNeighborListDeepCopyForType()
   {
 
-    QVector<size_t> tDims(10);
+    std::vector<size_t> tDims(10);
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Cell);
 
     typename NeighborList<T>::Pointer neiList = NeighborList<T>::CreateArray(10, "NeighborList");
@@ -754,7 +754,7 @@ class DataArrayTest
       }
     }
 
-    ///     virtual QVector<size_t> getComponentDimensions()
+    ///     virtual std::vector<size_t> getComponentDimensions()
     // Test resizing the array based on a give number of tuples. The number of Components will stay the same at each tuple
     array->resizeTuples(numTuples);
     array->initializeWithZeros(); // Init the grown array to all Zeros
@@ -834,7 +834,7 @@ class DataArrayTest
 
     {
       numComp = DIM0 * DIM1 * DIM2;
-      QVector<size_t> vDims(3, 0);
+      std::vector<size_t> vDims(3, 0);
       vDims[0] = DIM0;
       vDims[1] = DIM1;
       vDims[2] = DIM2;
@@ -844,8 +844,8 @@ class DataArrayTest
     }
 
     {
-      QVector<size_t> tDims(2, 4);
-      QVector<size_t> vDims(3, 0);
+      std::vector<size_t> tDims(2, 4);
+      std::vector<size_t> vDims(3, 0);
       vDims[0] = DIM0;
       vDims[1] = DIM1;
       vDims[2] = DIM2;
@@ -870,7 +870,7 @@ class DataArrayTest
         } mudflap;
         unsigned char* cptr = nullptr;
 
-        QVector<size_t> tDims(1, 10);
+        std::vector<size_t> tDims(1, 10);
         typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(DIM0, "TEST");
         array->initializeWithZeros();
         cptr = reinterpret_cast<uint8_t*>(array->getPointer(0));
@@ -946,7 +946,7 @@ class DataArrayTest
   template <typename T> void TestDeepCopyDataArrayForType()
   {
     size_t numTuples = 10;
-    QVector<size_t> cDims(1, 5);
+    std::vector<size_t> cDims(1, 5);
     QString name("Source Array");
 
     // First lets try it without allocating any memory
@@ -1002,7 +1002,7 @@ class DataArrayTest
   template <typename T> void TestCopyDataForType()
   {
     size_t numTuples = 10;
-    QVector<size_t> cDims(1, 5);
+    std::vector<size_t> cDims(1, 5);
     QString name("Source Array");
 
     // First lets try it without allocating any memory
@@ -1123,7 +1123,7 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   template <typename T> void TestWrapPointerForType()
   {
-    QVector<size_t> cDims = {1};
+    std::vector<size_t> cDims = {1};
     T* ptr = new T[TEST_SIZE]; // Allocate on the heap
     {
       // Wrap the pointer, write some data to it, and then let the object go
@@ -1189,7 +1189,7 @@ class DataArrayTest
   template <typename T> void TestSetTupleForType()
   {
     size_t numTuples = 10;
-    QVector<size_t> cDims(1, 5);
+    std::vector<size_t> cDims(1, 5);
     QString name("Source Array");
 
     // Each index of the vector is a tuple with a vector containing the components for that tuple
@@ -1249,8 +1249,8 @@ class DataArrayTest
   {
     std::cout << "STLInterfaceTest Test Starting...." << std::endl;
 
-    DataArray<int32_t> i32Array(10, "Test Array");
-    DataArray<int32_t> i32Array1(10, "Other Array");
+    DataArray<int32_t> i32Array(10, "Test Array", 0);
+    DataArray<int32_t> i32Array1(10, "Other Array", 0);
 
     // Initialize with a value
     for(auto& value : i32Array)
@@ -1317,7 +1317,7 @@ class DataArrayTest
     std::cout << "" << std::endl;
 
     std::cout << "std::transform from int32_t to float using a back_inserter" << std::endl;
-    DataArray<float> f32Array(0, "Float Array");
+    DataArray<float> f32Array(0, "Float Array", 0.0f);
     std::transform(i32Array.begin(), i32Array.end(), std::back_inserter(f32Array), [](int32_t i) -> float { return i * 2.5; });
     std::for_each(f32Array.begin(), f32Array.end(), print<float>);
     std::cout << std::endl;
@@ -1363,7 +1363,7 @@ class DataArrayTest
     using RgbaIterator = RgbaType::tuple_iterator;
 
     CompDimsType cDims = {4};
-    RgbaType rgba(static_cast<size_t>(10), cDims, "RGBA Array");
+    RgbaType rgba(10, QString("RGBA Array"), cDims, 0);
 
     RgbaIterator begin = rgba.begin<RgbaIterator>();
     rgba.initializeWithValue(0xFF);
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 7dd9faa5b3..a11953b68b 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -297,7 +297,7 @@ class StringDataArrayTest
   {
     // Create an Array of 10 Structs
     StringDataArray::Pointer nodes = initializeStringDataArray();
-    QVector<size_t> idxs(k_ArraySize + 1, 0);
+    std::vector<size_t> idxs(k_ArraySize + 1, 0);
     // Try to erase more indices than there are in the struct array
     int err = nodes->eraseTuples(idxs);
     DREAM3D_REQUIRE_EQUAL(err, 0)
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index d85782f984..e21b32579b 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -388,7 +388,7 @@ class StructArrayTest
   {
     // Create an Array of 10 Structs
     Vec3IntListPointer_t nodes = initializeStructArray();
-    QVector<size_t> idxs(k_ArraySize + 1, 0);
+    std::vector<size_t> idxs(k_ArraySize + 1, 0);
     // Try to erase more indices than there are in the struct array
     int err = nodes->eraseTuples(idxs);
     DREAM3D_REQUIRE_EQUAL(err, 0)
@@ -461,7 +461,7 @@ class StructArrayTest
   template <typename T> void _TestDeepCopyStructArray()
   {
     size_t numTuples = 10;
-    QVector<size_t> cDims(1, 1);
+    std::vector<size_t> cDims(1, 1);
     QString name("Source Array");
     typename StructArray<T>::Pointer src = StructArray<T>::CreateArray(numTuples, name, false);
     typename StructArray<T>::Pointer copy = std::dynamic_pointer_cast<StructArray<T>>(src->deepCopy());
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 65c12667f7..fbd67b0a8a 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -59,7 +59,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::AttributeMatrix(const QVector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType)
+AttributeMatrix::AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType)
 : IDataStructureContainerNode(name)
 , m_Type(attrType)
 , m_TupleDims(tDims)
@@ -368,7 +368,7 @@ RenameErrorCodes AttributeMatrix::renameAttributeArray(const QString& oldname, c
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> AttributeMatrix::getTupleDimensions()
+std::vector<size_t> AttributeMatrix::getTupleDimensions()
 {
   return m_TupleDims;
 }
@@ -376,7 +376,7 @@ QVector<size_t> AttributeMatrix::getTupleDimensions()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrix::setTupleDimensions(const QVector<size_t>& tupleDims)
+void AttributeMatrix::setTupleDimensions(const std::vector<size_t>& tupleDims)
 {
   resizeAttributeArrays(tupleDims);
 }
@@ -416,8 +416,8 @@ bool AttributeMatrix::removeInactiveObjects(const QVector<bool> &activeObjects,
   if(static_cast<size_t>(activeObjects.size()) == totalTuples && acceptableMatrix)
   {
     size_t goodcount = 1;
-    QVector<size_t> newNames(totalTuples, 0);
-    QVector<size_t> removeList;
+    std::vector<size_t> newNames(totalTuples, 0);
+    std::vector<size_t> removeList;
 
     for(qint32 i = 1; i < activeObjects.size(); i++)
     {
@@ -449,7 +449,7 @@ bool AttributeMatrix::removeInactiveObjects(const QVector<bool> &activeObjects,
           p->eraseTuples(removeList);
         }
       }
-      QVector<size_t> tDims(1, (totalTuples - removeList.size()));
+      std::vector<size_t> tDims(1, (totalTuples - removeList.size()));
       setTupleDimensions(tDims);
 
       // Loop over all the points and correct all the feature names
@@ -474,7 +474,7 @@ bool AttributeMatrix::removeInactiveObjects(const QVector<bool> &activeObjects,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrix::resizeAttributeArrays(const QVector<size_t>& tDims)
+void AttributeMatrix::resizeAttributeArrays(const std::vector<size_t>& tDims)
 {
   m_TupleDims = tDims;
   size_t numTuples = m_TupleDims[0];
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 6d140610c8..83d0a045e7 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -86,13 +86,13 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
 {
   // clang-format off
   PYB11_CREATE_BINDINGS(AttributeMatrix)
-  PYB11_STATIC_CREATION(Create ARGS std::vector<size_t> QString AttributeMatrix::Type)
+  PYB11_STATIC_CREATION(New ARGS std::vector<size_t> QString AttributeMatrix::Type)
   
   PYB11_ENUMERATION(Type)
   PYB11_ENUMERATION(Category)
  
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
-  PYB11_PROPERTY(QVector<size_t> TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
+  PYB11_PROPERTY(std::vector<size_t> TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
 
   PYB11_METHOD(bool doesAttributeArrayExist ARGS Name)
   PYB11_METHOD(bool addOrReplaceAttributeArray OVERLOAD const.IDataArray::Pointer.&,Data)
@@ -171,7 +171,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     Unknown = 999, //!<
   };
 
-  using Categories = QVector<Category>;
+  using Categories = std::vector<Category>;
 
   /**
    * @brief New Creates an AttributeMatrix with the give name
@@ -180,74 +180,61 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    * @param attrType The type of AttributeMatrix, one of
    * @return
    */
-  static Pointer New(const QVector<size_t> &tupleDims, const QString& name, AttributeMatrix::Type attrType)
+  static Pointer New(const std::vector<size_t>& tupleDims, const QString& name, AttributeMatrix::Type attrType)
   {
     Pointer sharedPtr(new AttributeMatrix(tupleDims, name, attrType));
     return sharedPtr;
   }
 
   /**
-   * @brief New Creates an AttributeMatrix with the give name
-   * @param tupleDims The dimensions of the Attribute matrix given in the order fastest moving to slowest moving (XYZ)
-   * @param name The name of the AttributeMatrix. Each AttributeMatrix should have a unique name.
-   * @param attrType The type of AttributeMatrix, one of
-   * @return
+   * @brief ReadAttributeMatrixStructure
+   * @param containerId
+   * @param dataContainer
+   * @param h5InternalPath
    */
-  static Pointer Create(const std::vector<size_t> &tupleDims, const QString& name, AttributeMatrix::Type attrType)
-  {
-    Pointer sharedPtr(new AttributeMatrix(QVector<size_t>::fromStdVector(tupleDims), name, static_cast<AttributeMatrix::Type>(attrType)));
-    return sharedPtr;
-  }
-
-    /**
-     * @brief ReadAttributeMatrixStructure
-     * @param containerId
-     * @param dataContainer
-     * @param h5InternalPath
-     */
-    static void ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath);
+  static void ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath);
 
-    /**
-     * @brief Creates and returns a DataArrayPath for the AttributeMatrix
-     * @return
-     */
-    DataArrayPath getDataArrayPath() const override;
+  /**
+   * @brief Creates and returns a DataArrayPath for the AttributeMatrix
+   * @return
+   */
+  DataArrayPath getDataArrayPath() const override;
 
-    /**
-    * @brief Type
-    */
-    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Type, Type)
+  /**
+   * @brief Type
+   */
+  SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Type, Type)
 
-    /**
-     * @brief Adds the IDataArray to the AttributeMatrix.
-     * @param data The IDataArray::Pointer that will hold the data
-     * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
-     */
-    bool addOrReplaceAttributeArray(const IDataArray::Pointer& data)
+  /**
+   * @brief Adds the IDataArray to the AttributeMatrix.
+   * @param data The IDataArray::Pointer that will hold the data
+   * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
+   */
+  bool addOrReplaceAttributeArray(const IDataArray::Pointer& data)
+  {
+    // Can not insert a null IDataArray object
+    if(data.get() == nullptr)
     {
-      // Can not insert a null IDataArray object
-      if(data.get() == nullptr)
-      {
-        return false;
-      }
-      if(getNumberOfTuples() != data->getNumberOfTuples())
-      {
-        qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
-        qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
-      }
-      Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
-      return insertOrAssign(data);
+      return false;
     }
-    
-    /**
-     * @brief Returns the array for a given named array or the equivelant to a
-     * null pointer if the name does not exist.
-     * @param name The name of the data array
-     */
-    IDataArray::Pointer getAttributeArray(const QString& name)
+    if(getNumberOfTuples() != data->getNumberOfTuples())
     {
-      return getChildByName(name);
+      qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
+      qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
     }
+    Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
+    return insertOrAssign(data);
+  }
+
+  /**
+   * @brief Returns the array for a given named array or the equivelant to a
+   * null pointer if the name does not exist.
+   * @param name The name of the data array
+   */
+  IDataArray::Pointer getAttributeArray(const QString& name)
+  {
+    return getChildByName(name);
+  }
 
     /**
      * @brief getAttributeArray
@@ -332,7 +319,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * @brief Resizes an array from the Attribute Matrix
     * @param size The new size of the array
     */
-    void resizeAttributeArrays(const QVector<size_t>& tDims);
+    void resizeAttributeArrays(const std::vector<size_t>& tDims);
 
     /**
      * @brief Returns bool of whether a named array exists
@@ -349,11 +336,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param cDims The component Dimensions of the Data Array
      * @return A valid IDataArray Subclass if the array exists otherwise a null shared pointer.
      */
-    template<class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArray(Filter* filter,
-                                               QString attributeArrayName,
-                                               int err,
-                                               QVector<size_t> cDims)
+    template <class ArrayType, class Filter>
+    typename ArrayType::Pointer getPrereqArray(Filter* filter, QString attributeArrayName, int err, std::vector<size_t> cDims)
     {
       QString ss;
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -453,11 +437,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param dims The dimensions of the components of the AttributeArray
      * @return A Shared Pointer to the newly created array
      */
-    template<class ArrayType, class Filter, typename T>
-    typename ArrayType::Pointer createNonPrereqArray(Filter* filter,
-                                                     const QString& attributeArrayName,
-                                                     T initValue,
-                                                     QVector<size_t> compDims,
+    template <class ArrayType, class Filter, typename T>
+    typename ArrayType::Pointer createNonPrereqArray(Filter* filter, const QString& attributeArrayName, T initValue, const std::vector<size_t>& compDims,
                                                      RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -510,8 +491,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * @param name The name that the array will be known by
     * @param dims The size the data on each tuple
     */
-    template<class ArrayType, class Filter, typename T>
-    void createAndAddAttributeArray(Filter* filter, const QString& name, T initValue, QVector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+    template <class ArrayType, class Filter, typename T>
+    void createAndAddAttributeArray(Filter* filter, const QString& name, T initValue, std::vector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       bool allocateData = false;
       if(nullptr == filter) { allocateData = true; }
@@ -608,14 +589,13 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @brief Sets the Tuple Dimensions for the Attribute Matrix
      * @param tupleDims
      */
-    void setTupleDimensions(const QVector<size_t>& tupleDims);
+    void setTupleDimensions(const std::vector<size_t>& tupleDims);
 
     /**
      * @brief Returns the Tuple Dimensions of the AttributeMatrix
      * @return
      */
-    QVector<size_t> getTupleDimensions();
-
+    std::vector<size_t> getTupleDimensions();
 
     /**
     * @brief Returns the number of Tuples that the feature data has. For example if there are 32 features
@@ -674,7 +654,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     virtual QString getInfoString(SIMPL::InfoStringFormat format);
 
   protected:
-    AttributeMatrix(const QVector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
+    AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
 
     /**
      * @brief writeXdmfAttributeData
@@ -704,7 +684,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
                                                  const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0);
 
   private:
-    QVector<size_t> m_TupleDims;
+    std::vector<size_t> m_TupleDims;
 
     AttributeMatrix(const AttributeMatrix&);
     void operator =(const AttributeMatrix&);
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index f3c44b2367..1664f916f7 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -119,7 +119,7 @@ void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, Data
 
   QList<QString> dataArrayNames;
   QH5Utilities::getGroupObjects(attrMatGid, H5Utilities::H5Support_DATASET | H5Utilities::H5Support_GROUP, dataArrayNames);
-  foreach(QString dataArrayName, dataArrayNames)
+  for(const auto& dataArrayName : dataArrayNames)
   {
     DataArrayProxy proxy(h5InternalPath, dataArrayName, SIMPL::Unchecked);
 
@@ -138,11 +138,21 @@ void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, Data
     bool cDimsResult = false;
     if(req != nullptr)
     {
-      QVector<QVector<size_t>> cDims = req->getComponentDimensions();
-      if(cDims.empty() || cDims.contains(proxy.m_CompDims))
+      std::vector<std::vector<size_t>> cDims = req->getComponentDimensions();
+      if(cDims.empty())
       {
         cDimsResult = true;
       }
+      if(!cDimsResult)
+      {
+        for(const auto& cDim : cDims)
+        {
+          if(cDim == proxy.m_CompDims)
+          {
+            cDimsResult = true;
+          }
+        }
+      }
     }
 
     err = QH5Lite::readScalarAttribute(attrMatGid, dataArrayName, SIMPL::HDF5::DataArrayVersion, proxy.m_Version);
@@ -187,7 +197,7 @@ bool DataArrayProxy::operator==(const DataArrayProxy& rhs) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QJsonArray DataArrayProxy::writeVector(QVector<size_t> vector) const
+QJsonArray DataArrayProxy::writeVector(const std::vector<size_t>& vector) const
 {
   QJsonArray jsonArray;
   for(const auto& num : vector)
@@ -200,9 +210,9 @@ QJsonArray DataArrayProxy::writeVector(QVector<size_t> vector) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> DataArrayProxy::readVector(QJsonArray jsonArray)
+std::vector<size_t> DataArrayProxy::readVector(QJsonArray jsonArray)
 {
-  QVector<size_t> vector;
+  std::vector<size_t> vector;
   for(const auto& val : jsonArray)
   {
     if(val.isDouble())
@@ -377,7 +387,7 @@ QString DataArrayProxy::getObjectType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayProxy::setTupleDims(const QVector<size_t>& tDims)
+void DataArrayProxy::setTupleDims(const std::vector<size_t>& tDims)
 {
   m_TupleDims = tDims;
 }
@@ -385,7 +395,7 @@ void DataArrayProxy::setTupleDims(const QVector<size_t>& tDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> DataArrayProxy::getTupleDims() const
+std::vector<size_t> DataArrayProxy::getTupleDims() const
 {
   return m_TupleDims;
 }
@@ -393,7 +403,7 @@ QVector<size_t> DataArrayProxy::getTupleDims() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayProxy::setCompDims(const QVector<size_t>& cDims)
+void DataArrayProxy::setCompDims(const std::vector<size_t>& cDims)
 {
   m_CompDims = cDims;
 }
@@ -401,7 +411,7 @@ void DataArrayProxy::setCompDims(const QVector<size_t>& cDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> DataArrayProxy::getCompDims() const
+std::vector<size_t> DataArrayProxy::getCompDims() const
 {
   return m_CompDims;
 }
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index 5097a8dfd9..eabddcf3b1 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -35,12 +35,13 @@
 
 #pragma once
 
+#include <vector>
+
+#include <hdf5.h>
+
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtCore/QString>
-#include <QtCore/QVector>
-
-#include <hdf5.h>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -54,13 +55,13 @@ class SIMPLib_EXPORT DataArrayProxy
 {
   PYB11_CREATE_BINDINGS(DataArrayProxy)
   PYB11_CREATION()
-  PYB11_PROPERTY(QVector<size_t> TupleDims READ getTupleDims WRITE setTupleDims)
-  PYB11_PROPERTY(QVector<size_t> CompDims READ getCompDims WRITE setCompDims)
+  PYB11_PROPERTY(std::vector<size_t> TupleDims READ getTupleDims WRITE setTupleDims)
+  PYB11_PROPERTY(std::vector<size_t> CompDims READ getCompDims WRITE setCompDims)
   PYB11_PROPERTY(QString Path READ getPath WRITE setPath)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
 public:
-  using CompDimsVector = QVector<QVector<size_t>>;
+  using CompDimsVector = std::vector<std::vector<size_t>>;
 
   // This enumeration is not a class enumeration because it is not possible to
   // do a bit-wise NOT operation on a class enumeration value.  We need to be
@@ -215,25 +216,25 @@ class SIMPLib_EXPORT DataArrayProxy
    * @brief setTupleDims
    * @param tDims
    */
-  void setTupleDims(const QVector<size_t>& tDims);
+  void setTupleDims(const std::vector<size_t>& tDims);
 
   /**
    * @brief getTupleDims
    * @return
    */
-  QVector<size_t> getTupleDims() const;
+  std::vector<size_t> getTupleDims() const;
 
   /**
    * @brief setCompDims
    * @param cDims
    */
-  void setCompDims(const QVector<size_t>& cDims);
+  void setCompDims(const std::vector<size_t>& cDims);
 
   /**
    * @brief getCompDims
    * @return
    */
-  QVector<size_t> getCompDims() const;
+  std::vector<size_t> getCompDims() const;
 
 private:
   uint8_t m_Flag = SIMPL::Unchecked;
@@ -241,22 +242,22 @@ class SIMPLib_EXPORT DataArrayProxy
   QString m_Path;
   QString m_Name;
   QString m_ObjectType;
-  QVector<size_t> m_TupleDims;
-  QVector<size_t> m_CompDims;
+  std::vector<size_t> m_TupleDims;
+  std::vector<size_t> m_CompDims;
 
   /**
    * @brief writeVector
    * @param vector
    * @return
    */
-  QJsonArray writeVector(QVector<size_t> vector) const;
+  QJsonArray writeVector(const std::vector<size_t>& vector) const;
 
   /**
    * @brief readVector
    * @param jsonArray
    * @return
    */
-  QVector<size_t> readVector(QJsonArray jsonArray);
+  std::vector<size_t> readVector(QJsonArray jsonArray);
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(DataArrayProxy::PrimitiveTypeFlags)
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 0935c28c55..9c690bb5ee 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -181,7 +181,7 @@ IGeometry::Pointer DataContainer::getGeometry()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Pointer DataContainer::createAndAddAttributeMatrix(const QVector<size_t>& tDims, const QString& attrMatName, AttributeMatrix::Type attrType)
+AttributeMatrix::Pointer DataContainer::createAndAddAttributeMatrix(const std::vector<size_t>& tDims, const QString& attrMatName, AttributeMatrix::Type attrType)
 {
   AttributeMatrix::Pointer attrMat = AttributeMatrix::New(tDims, attrMatName, attrType);
   addOrReplaceAttributeMatrix(attrMat);
@@ -276,7 +276,7 @@ int DataContainer::writeAttributeMatricesToHDF5(hid_t parentId)
 int DataContainer::readAttributeMatricesFromHDF5(bool preflight, hid_t dcGid, DataContainerProxy& dcProxy)
 {
   int err = 0;
-  QVector<size_t> tDims;
+  std::vector<size_t> tDims;
 
   DataContainerProxy::StorageType& attrMatsToRead = dcProxy.getAttributeMatricies();
   AttributeMatrix::Type amType = AttributeMatrix::Type::Unknown;
@@ -822,7 +822,8 @@ AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* fil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id)
+AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const std::vector<size_t>& tDims, AttributeMatrix::Type amType,
+                                                                   RenameDataPath::DataID_t id)
 {
   return createNonPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), tDims, amType, id);
 }
@@ -833,7 +834,7 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
 AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const SizeVec3Type& tDims, AttributeMatrix::Type amType,
                                                                    RenameDataPath::DataID_t id)
 {
-  QVector<size_t> tupleDims;
+  std::vector<size_t> tupleDims;
   for(const auto& value : tDims)
   {
     tupleDims.push_back(value);
@@ -844,7 +845,8 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t> &tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id)
+AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const std::vector<size_t>& tDims, AttributeMatrix::Type amType,
+                                                                   RenameDataPath::DataID_t id)
 {
   QString ss;
   if(attributeMatrixName.isEmpty())
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 5125cab554..b71a40978d 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -283,7 +283,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param amType The Type of AttributeMatrix
    * @return A Shared Pointer to the AttributeMatrix
    */
-  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const DataArrayPath& path, const std::vector<size_t>& tDims, AttributeMatrix::Type amType,
+                                                      RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 
   /**
    * @brief createNonPrereqAttributeMatrix
@@ -306,7 +307,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param amType The Type of AttributeMatrix
    * @return A Shared Pointer to the AttributeMatrix
    */
-  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const QVector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+  AttributeMatrixShPtr createNonPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, const std::vector<size_t>& tDims, AttributeMatrix::Type amType,
+                                                      RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 
   /**
    * @brief Returns the geometry as the templated type
@@ -358,7 +360,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param attrType The Type of AttributeMatrix to create
    * @return
    */
-  virtual AttributeMatrixShPtr createAndAddAttributeMatrix(const QVector<size_t>& tDims, const QString& attrMatName, AttributeMatrix::Type attrType);
+  virtual AttributeMatrixShPtr createAndAddAttributeMatrix(const std::vector<size_t>& tDims, const QString& attrMatName, AttributeMatrix::Type attrType);
 
   /**
    * @brief Writes all the Attribute Matrices to HDF5 file
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 060010330e..8cf7765bee 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -442,8 +442,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param cDims The component dimensions of the IDataArray subclass
      * @return Valid or nullptr shared pointer based on availability of the array
      */
-    template<class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, QVector<size_t> cDims)
+    template <class ArrayType, class Filter>
+    typename ArrayType::Pointer getPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, std::vector<size_t> cDims)
     {
 
       QString ss;
@@ -575,12 +575,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param dims The dimensions of the components of the AttributeArray
      * @return A Shared Pointer to the newly created array
      */
-    template<class ArrayType, class Filter, typename T>
-    typename ArrayType::Pointer createNonPrereqArrayFromPath(Filter* filter,
-                                                             const DataArrayPath& path,
-                                                             T initValue,
-                                                             QVector<size_t> compDims,
-                                                             const QString& property = "",
+    template <class ArrayType, class Filter, typename T>
+    typename ArrayType::Pointer createNonPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, T initValue, const std::vector<size_t>& compDims, const QString& property = "",
                                                              RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
index a48e3c77e3..26fc16da9e 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.h
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -149,7 +149,7 @@ class SIMPLib_EXPORT DataStructureUtilities
    * @return Valid or nullptr shared pointer based on availability of the array
    */
   template <class ArrayType, class Filter>
-  typename ArrayType::Pointer getPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, QVector<size_t> cDims)
+  typename ArrayType::Pointer getPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, std::vector<size_t> cDims)
   {
 
     QString ss;
@@ -284,7 +284,7 @@ class SIMPLib_EXPORT DataStructureUtilities
    * @return A Shared Pointer to the newly created array
    */
   template <class ArrayType, class Filter, typename T>
-  typename ArrayType::Pointer createNonPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, T initValue, QVector<size_t> compDims,
+  typename ArrayType::Pointer createNonPrereqArrayFromPath(const DataContainerArrayShPtrType& dca, Filter* filter, const DataArrayPath& path, T initValue, std::vector<size_t> compDims,
                                                            const QString& property = "", RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
   {
     typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index f79a8be563..fc44112c6c 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -67,7 +67,8 @@ class DataContainerBundleTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void AddDataArray(AttributeMatrix::Pointer am, const QString name, QVector<size_t>& tDims, QVector<size_t>& cDims)
+  template <typename T>
+  void AddDataArray(AttributeMatrix::Pointer am, const QString name, std::vector<size_t>& tDims, std::vector<size_t>& cDims)
   {
 
     typename DataArray<T>::Pointer data = DataArray<T>::CreateArray(tDims, cDims, name);
@@ -81,11 +82,11 @@ class DataContainerBundleTest
   void TestDataBundleCommonPaths()
   {
 
-    QVector<size_t> tDims(3, 0);
+    std::vector<size_t> tDims(3, 0);
     tDims[0] = 10;
     tDims[1] = 20;
     tDims[2] = 30;
-    QVector<size_t> cDims(2);
+    std::vector<size_t> cDims(2);
     cDims[0] = 3;
     cDims[1] = 3;
 
@@ -96,7 +97,7 @@ class DataContainerBundleTest
     AddDataArray<int32_t>(am, "int32 Array", tDims, cDims);
     dc0->addOrReplaceAttributeMatrix(am);
 
-    QVector<size_t> tupleDims(1, 1);
+    std::vector<size_t> tupleDims(1, 1);
     AttributeMatrix::Pointer metaAm = AttributeMatrix::New(tupleDims, DataContainerBundle::GetMetaDataName(), AttributeMatrix::Type::MetaData);
     dc0->addOrReplaceAttributeMatrix(metaAm);
 
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index deb27eab0b..070490df4e 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -49,7 +49,7 @@ AxisAngleFilterParameter::~AxisAngleFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 AxisAngleFilterParameter::Pointer AxisAngleFilterParameter::New(const QString& humanLabel, const QString& propertyName, const AxisAngleInput_t& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   AxisAngleFilterParameter::Pointer ptr = AxisAngleFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index d30175685c..280d46430a 100755
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const AxisAngleInput_t& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
 
     ~AxisAngleFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index 8201216dc5..fb6fa5aa92 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -48,8 +48,8 @@ BooleanFilterParameter::~BooleanFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-BooleanFilterParameter::Pointer BooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                            GetterCallbackType getterCallback, int groupIndex)
+BooleanFilterParameter::Pointer BooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
+                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   BooleanFilterParameter::Pointer ptr = BooleanFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 0615c396c7..6e2c18c609 100755
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -87,8 +87,7 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const bool& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+    const bool& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~BooleanFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index f5727ce1d3..14628ed94c 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -52,7 +52,7 @@ CalculatorFilterParameter::~CalculatorFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 CalculatorFilterParameter::Pointer CalculatorFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   CalculatorFilterParameter::Pointer ptr = CalculatorFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index d1bbae933c..c6f7b34f09 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
     const QString& defaultValue, Category category,
-    SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex = -1);
+    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~CalculatorFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index b0ab478351..bd129d9740 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -51,8 +51,7 @@ ChoiceFilterParameter::~ChoiceFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, QVector<QString> choices, bool editable, int groupIndex)
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
 
 {
   ChoiceFilterParameter::Pointer ptr = ChoiceFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index 0461ea00b6..dee4b0cba2 100755
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const int& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        QVector<QString> choices, bool editable,
                        int groupIndex = -1);
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 5e8eb038dd..bde4ddc529 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -56,7 +56,7 @@ ComparisonSelectionAdvancedFilterParameter::~ComparisonSelectionAdvancedFilterPa
 //
 // -----------------------------------------------------------------------------
 ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category,
-                                                                                    SetterCallbackType setterCallback, GetterCallbackType getterCallback, QVector<QString> choices, bool showOperators,
+                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
                                                                                     int groupIndex)
 {
   ComparisonSelectionAdvancedFilterParameter::Pointer ptr = ComparisonSelectionAdvancedFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 67d2a1766a..b2fce98646 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -93,8 +93,7 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       ComparisonInputsAdvanced defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, QVector<QString> choices,
+                       ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
                        bool showOperators, int groupIndex = -1);
 
     ~ComparisonSelectionAdvancedFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index a4c065fb33..10db67e04a 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -56,7 +56,7 @@ ComparisonSelectionFilterParameter::~ComparisonSelectionFilterParameter() = defa
 //
 // -----------------------------------------------------------------------------
 ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category,
-                                                                                    SetterCallbackType setterCallback, GetterCallbackType getterCallback, QVector<QString> choices, bool showOperators,
+                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
                                                                                     int groupIndex)
 {
   ComparisonSelectionFilterParameter::Pointer ptr = ComparisonSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index e0292e5935..d30a3de297 100755
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -92,8 +92,7 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       ComparisonInputs defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, QVector<QString> choices,
+                       ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
                        bool showOperators, int groupIndex = -1);
 
     ~ComparisonSelectionFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index 2c02ecaf8b..79ce75c2c2 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -49,7 +49,7 @@ ConstrainedDoubleFilterParameter::~ConstrainedDoubleFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  const double& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+  const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ConstrainedDoubleFilterParameter::Pointer ptr = ConstrainedDoubleFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 296809b64b..92411048d9 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -88,8 +88,7 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const double& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~ConstrainedDoubleFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index b2faaa322c..c8c9797804 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -49,7 +49,7 @@ ConstrainedIntFilterParameter::~ConstrainedIntFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  const int& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+  const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
   int groupIndex)
 {
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index 5e1b58c456..cc06acf4ef 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -87,8 +87,7 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~ConstrainedIntFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 6cc79c8a17..2888a6b186 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -52,7 +52,7 @@ DataArrayCreationFilterParameter::~DataArrayCreationFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 DataArrayCreationFilterParameter::Pointer DataArrayCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, const RequirementType req, int groupIndex)
+                                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req, int groupIndex)
 {
 
   DataArrayCreationFilterParameter::Pointer ptr = DataArrayCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 3c11039c28..5819db1806 100755
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -104,8 +104,8 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const DataArrayPath& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                       RequirementType req, int groupIndex = -1);
 
     ~DataArrayCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 28dfb09c74..64bf7330c4 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -50,13 +50,8 @@ DataArraySelectionFilterParameter::~DataArraySelectionFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::New(const QString& humanLabel,
-                                                                                  const QString& propertyName,
-                                                                                  const DataArrayPath& defaultValue,
-                                                                                  Category category,
-                                                                                  SetterCallbackType setterCallback,
-                                                                                  GetterCallbackType getterCallback,
-                                                                                  const RequirementType req,
+DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req,
                                                                                   int groupIndex)
 {
 
@@ -93,7 +88,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
                                                                                                                 size_t allowedCompDim,
                                                                                                                 AttributeMatrix::Category attributeMatrixCategory)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  using SizeTVectorType = std::vector<size_t>;
   DataArraySelectionFilterParameter::RequirementType req;
   AttributeMatrix::Types amTypes;
   if(attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -124,7 +119,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   //  if(IGeometry::Type::Unknown != geometryType)
   //  {
@@ -141,7 +136,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
                                                                                                         AttributeMatrix::Type attributeMatrixType,
                                                                                                         IGeometry::Type geometryType)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  using SizeTVectorType = std::vector<size_t>;
   DataArraySelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
@@ -149,7 +144,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 79b5a48f59..385f1fbac3 100755
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -76,13 +76,13 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-    typedef struct
+    using RequirementType = struct
     {
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector< QVector<size_t> > componentDimensions;
-    } RequirementType;
+      std::vector<std::vector<size_t>> componentDimensions;
+    };
 
     /**
      * @brief New This function instantiates an instance of the DataArraySelectionFilterParameter.  Specifying a RequirementType will
@@ -106,8 +106,8 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const DataArrayPath& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                       RequirementType req, int groupIndex = -1);
 
     ~DataArraySelectionFilterParameter() override;
 
@@ -183,7 +183,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     * @param DefaultComponentDimensions Default component dimensions required for Attribute Array selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(std::vector<std::vector<size_t>>, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 1521554ca3..ffae612f70 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -54,7 +54,7 @@ DataContainerArrayProxyFilterParameter::~DataContainerArrayProxyFilterParameter(
 //
 // -----------------------------------------------------------------------------
 DataContainerArrayProxyFilterParameter::Pointer DataContainerArrayProxyFilterParameter::New(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue,
-                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                                                                                             DataContainerArrayProxy proxy, Qt::CheckState defValue, int groupIndex)
 {
   DataContainerArrayProxyFilterParameter::Pointer ptr = DataContainerArrayProxyFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 629c9de96f..249109a6b1 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -91,8 +91,7 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       DataContainerArrayProxy defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, DataContainerArrayProxy proxy,
+                       DataContainerArrayProxy defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, DataContainerArrayProxy proxy,
                        Qt::CheckState defState, int groupIndex = -1);
 
     ~DataContainerArrayProxyFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index da08211bdc..a425e1f927 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -51,7 +51,7 @@ DataContainerCreationFilterParameter::~DataContainerCreationFilterParameter() =
 //
 // -----------------------------------------------------------------------------
 DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DataContainerCreationFilterParameter::Pointer ptr = DataContainerCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index adc7e4bd18..e8fb33ef6d 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -87,7 +87,7 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                      int groupIndex = -1);
 
   ~DataContainerCreationFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index b36abbd753..68f28cb04a 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -51,7 +51,7 @@ DataContainerSelectionFilterParameter::~DataContainerSelectionFilterParameter()
 //
 // -----------------------------------------------------------------------------
 DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                          SetterCallbackType setterCallback, GetterCallbackType getterCallback, const RequirementType& req,
+                                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const RequirementType& req,
                                                                                           int groupIndex)
 {
   DataContainerSelectionFilterParameter::Pointer ptr = DataContainerSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 43f6b5b940..15d2324d52 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -98,8 +98,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, const RequirementType& req, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
     ~DataContainerSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index b7299d8833..5bcb37878e 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -49,8 +49,7 @@ DoubleFilterParameter::~DoubleFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          const double& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, int groupIndex)
+                                                          const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
@@ -70,8 +69,7 @@ DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLa
 //
 // -----------------------------------------------------------------------------
 DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          const float& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, int groupIndex)
+                                                          const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index f7690b77d2..64a96b1c37 100755
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -88,8 +88,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const double& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     /**
      * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
@@ -108,8 +107,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const float& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~DoubleFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index f627851c5e..8cdea5c579 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -49,7 +49,7 @@ DynamicChoiceFilterParameter::~DynamicChoiceFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 DynamicChoiceFilterParameter::Pointer DynamicChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& listProperty, int groupIndex)
+                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& listProperty, int groupIndex)
 {
   DynamicChoiceFilterParameter::Pointer ptr = DynamicChoiceFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index dfc8d7ec85..19e9411d2c 100755
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const QString& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        const QString& listProperty, int groupIndex = -1);
 
     ~DynamicChoiceFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 185412839d..4846ab4f54 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -51,7 +51,7 @@ DynamicTableFilterParameter::~DynamicTableFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   DynamicTableFilterParameter::Pointer ptr = DynamicTableFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index c1a673c4a8..c6b39208ba 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -94,7 +94,7 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        DynamicTableData defaultTableData, FilterParameter::Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
 
     ~DynamicTableFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index c7bfa9348d..24cebefee4 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -45,8 +45,10 @@ FloatFilterParameter::~FloatFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 FloatFilterParameter::Pointer FloatFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          const float& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, int groupIndex)
+                       const float& defaultValue, Category category, 
+                       const SetterCallbackType& setterCallback, 
+                       const GetterCallbackType& getterCallback, 
+                       int groupIndex)
 {
 
   FloatFilterParameter::Pointer ptr = FloatFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 97ad2c875d..5f50095ec3 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -88,8 +88,7 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const float& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~FloatFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 33a33d90aa..65c293e783 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -47,7 +47,7 @@ FloatVec2FilterParameter::~FloatVec2FilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatVec2FilterParameter::Pointer ptr = FloatVec2FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 46b817978a..6fab53ca5c 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -93,8 +93,7 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~FloatVec2FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 92a4a6ccc8..4745e88ebd 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -49,7 +49,7 @@ FloatVec3FilterParameter::~FloatVec3FilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatVec3FilterParameter::Pointer ptr = FloatVec3FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index f3313d3b39..60e5d44de1 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -94,8 +94,7 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~FloatVec3FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index a96fc9b567..c1dd595d00 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -49,7 +49,7 @@ FourthOrderPolynomialFilterParameter::~FourthOrderPolynomialFilterParameter() =
 //
 // -----------------------------------------------------------------------------
 FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue,
-                                                                                        Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FourthOrderPolynomialFilterParameter::Pointer ptr = FourthOrderPolynomialFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 84cd6f99f5..552311fbe1 100755
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -169,9 +169,8 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const Float4thOrderPoly_t& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, int groupIndex = -1);
+    static Pointer New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                       const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~FourthOrderPolynomialFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index f8f5455281..846949fc0f 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -53,7 +53,7 @@ InputFileFilterParameter::~InputFileFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 InputFileFilterParameter::Pointer InputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& fileExtension, const QString& fileType,
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
                                                                 int groupIndex)
 {
   InputFileFilterParameter::Pointer ptr = InputFileFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index 2b40687ce2..4645520887 100755
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -89,8 +89,7 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, const QString& fileExtension = QString(""),
+    const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""),
     const QString& fileType = QString(""), int groupIndex = -1);
 
     ~InputFileFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index d4992904ff..35785a233b 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -49,7 +49,7 @@ InputPathFilterParameter::~InputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 InputPathFilterParameter::Pointer InputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& fileExtension, const QString& fileType,
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
                                                                 int groupIndex)
 {
   InputPathFilterParameter::Pointer ptr = InputPathFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index ebdbd5b0c6..67a60bec56 100755
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -89,8 +89,7 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category, SetterCallbackType setterCallback,
-    GetterCallbackType getterCallback, const QString& fileExtension = QString(""),
+    const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""),
     const QString& fileType = QString(""), int groupIndex = -1);
 
     ~InputPathFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index 0e5acda479..d1d4f74765 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -48,8 +48,8 @@ IntFilterParameter::~IntFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntFilterParameter::Pointer IntFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                    GetterCallbackType getterCallback, int groupIndex)
+IntFilterParameter::Pointer IntFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                    const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   IntFilterParameter::Pointer ptr = IntFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 8d4746d3bc..76d6cc2be3 100755
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -87,8 +87,7 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~IntFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 999cdd8495..859389b151 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -49,7 +49,7 @@ LinkedBooleanFilterParameter::~LinkedBooleanFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
-                                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, QStringList conditionalProperties, int groupIndex)
+                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex)
 {
   LinkedBooleanFilterParameter::Pointer ptr = LinkedBooleanFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index d977b8982d..09cc14e948 100755
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const bool& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        QStringList conditionalProperties, int groupIndex = -1);
 
     ~LinkedBooleanFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 890e75221b..0ab0ae4681 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -49,7 +49,7 @@ LinkedChoicesFilterParameter::~LinkedChoicesFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category,
-                                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, QVector<QString> choices, QStringList linkedProperties,
+                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, QStringList linkedProperties,
                                                                         int groupIndex)
 {
   LinkedChoicesFilterParameter::Pointer ptr = LinkedChoicesFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index e49798789b..cf67344198 100755
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const int& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        QVector<QString> choices, QStringList linkedProperties,
                        int groupIndex = -1);
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 3c6a34071f..aff4abde92 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -107,7 +107,7 @@ LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, ILinkedPath* linkedPath, int groupIndex)
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, ILinkedPath* linkedPath, int groupIndex)
 {
 
   LinkedPathCreationFilterParameter::Pointer ptr = LinkedPathCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 58b7377b8b..fc82214d79 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -294,7 +294,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                      ILinkedPath* linkedPath, int groupIndex = -1);
 
   ~LinkedPathCreationFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 8b8b06ba62..40a9eb0086 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -57,8 +57,8 @@ MultiAttributeMatrixSelectionFilterParameter::~MultiAttributeMatrixSelectionFilt
 //
 // -----------------------------------------------------------------------------
 MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
-                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                            const RequirementType req, int groupIndex)
+                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                            RequirementType req, int groupIndex)
 {
 
   MultiAttributeMatrixSelectionFilterParameter::Pointer ptr = MultiAttributeMatrixSelectionFilterParameter::New();
@@ -93,7 +93,7 @@ QString MultiAttributeMatrixSelectionFilterParameter::getWidgetType() const
 MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatrixSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
                                                                                                                           AttributeMatrix::Category attributeMatrixCategory)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  typedef std::vector<size_t> SizeTVectorType;
   MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
   AttributeMatrix::Types amTypes;
   if(attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -124,7 +124,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   //  if(IGeometry::Type::Unknown != geometryType)
   //  {
@@ -139,7 +139,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
 MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatrixSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
                                                                                                                   IGeometry::Type geometryType)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  typedef std::vector<size_t> SizeTVectorType;
   MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
@@ -147,7 +147,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index b65b0199b7..677fb5866d 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector< QVector<size_t> > componentDimensions;
+      QVector< std::vector<size_t> > componentDimensions;
     } RequirementType;
 
     /**
@@ -104,8 +104,8 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const QVector<DataArrayPath>& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                       RequirementType req, int groupIndex = -1);
 
     ~MultiAttributeMatrixSelectionFilterParameter() override;
 
@@ -157,7 +157,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector< std::vector<size_t> >, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index 6ab318a2dd..c5c54856ba 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -57,8 +57,8 @@ MultiDataArraySelectionFilterParameter::~MultiDataArraySelectionFilterParameter(
 //
 // -----------------------------------------------------------------------------
 MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
-                                                                                            Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                            const RequirementType req, int groupIndex)
+                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                            RequirementType req, int groupIndex)
 {
 
   MultiDataArraySelectionFilterParameter::Pointer ptr = MultiDataArraySelectionFilterParameter::New();
@@ -93,7 +93,7 @@ QString MultiDataArraySelectionFilterParameter::getWidgetType() const
 MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
                                                                                                                           AttributeMatrix::Category attributeMatrixCategory)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  typedef std::vector<size_t> SizeTVectorType;
   MultiDataArraySelectionFilterParameter::RequirementType req;
   AttributeMatrix::Types amTypes;
   if(attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -124,7 +124,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   //  if(IGeometry::Type::Unknown != geometryType)
   //  {
@@ -139,7 +139,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
 MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
                                                                                                                   IGeometry::Type geometryType)
 {
-  typedef QVector<size_t> QVectorOfSizeType;
+  typedef std::vector<size_t> SizeTVectorType;
   MultiDataArraySelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
@@ -147,7 +147,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
+    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 8d7aa921d0..1f28131207 100755
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector< QVector<size_t> > componentDimensions;
+      QVector< std::vector<size_t> > componentDimensions;
     } RequirementType;
 
     /**
@@ -104,8 +104,8 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const QVector<DataArrayPath>& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                       const RequirementType req, int groupIndex = -1);
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                       RequirementType req, int groupIndex = -1);
 
     ~MultiDataArraySelectionFilterParameter() override;
 
@@ -157,7 +157,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(QVector< std::vector<size_t> >, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 44f386706b..7215ba01e7 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -94,7 +94,7 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
 	AttributeMatrix::Category attributeMatrixCategory)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+  using SizeTVectorType = std::vector<size_t>;
   MultiDataContainerSelectionFilterParameter::RequirementType req;
 	AttributeMatrix::Types amTypes;
 	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
@@ -121,17 +121,17 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 	req.amTypes = amTypes;
 	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
 	{
-		req.daTypes = QVector<QString>(1, primitiveType);
-	}
-	if (SIMPL::Defaults::AnyComponentSize != allowedCompDim)
-	{
-		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
-	}
-	//  if(IGeometry::Type::Unknown != geometryType)
-	//  {
-	//    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
-	//  }
-	return req;
+    req.daTypes = QVector<QString>(1, primitiveType);
+  }
+  if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+  {
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+  }
+  //  if(IGeometry::Type::Unknown != geometryType)
+  //  {
+  //    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+  //  }
+  return req;
 }
 
 // -----------------------------------------------------------------------------
@@ -140,7 +140,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
 	IGeometry::Type geometryType)
 {
-  using QVectorOfSizeType = QVector<size_t>;
+  using SizeTVectorType = std::vector<size_t>;
   MultiDataContainerSelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
@@ -148,10 +148,10 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-		req.componentDimensions = QVector<QVectorOfSizeType>(1, QVectorOfSizeType(1, allowedCompDim));
-	}
-	if (AttributeMatrix::Type::Any != attributeMatrixType)
-	{
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+  }
+  if(AttributeMatrix::Type::Any != attributeMatrixType)
+  {
 		QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
 		req.amTypes = amTypes;
 	}
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 09eba5edee..ee9763290a 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -74,13 +74,13 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     using SetterCallbackType = std::function<void(QStringList)>;
     using GetterCallbackType = std::function<QStringList(void)>;
 
-    typedef struct
+    using RequirementType = struct
     {
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector<QVector<size_t>> componentDimensions;
-    } RequirementType;
+      std::vector<std::vector<size_t>> componentDimensions;
+    };
 
     /**
      * @brief New This function instantiates an instance of the MultiDataContainerSelectionFilterParameter.  Specifying a RequirementType will
@@ -155,7 +155,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
     SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< QVector<size_t> >, DefaultComponentDimensions)
+    SIMPL_INSTANCE_PROPERTY(std::vector<std::vector<size_t>>, DefaultComponentDimensions)
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 188b6dd815..2d900b963c 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -50,7 +50,7 @@ NumericTypeFilterParameter::~NumericTypeFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category,
-                                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   NumericTypeFilterParameter::Pointer ptr = NumericTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index d8039debb5..baa047ca3c 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   * @return
   */
   static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category, 
-                     SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex = -1);
+                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~NumericTypeFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index 05a06e2a98..6e8bd0115f 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -49,7 +49,7 @@ OutputFileFilterParameter::~OutputFileFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 OutputFileFilterParameter::Pointer OutputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& fileExtension, const QString& fileType,
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
                                                                   int groupIndex)
 {
   OutputFileFilterParameter::Pointer ptr = OutputFileFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index a9276316a9..94a94a7abd 100755
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
    */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                        const QString& defaultValue, Category category,
-                       SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        const QString& fileExtension = QString(""),
                        const QString& fileType = QString(""),
                        int groupIndex = -1);
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index f9822cc712..61ef3ec7d9 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -49,7 +49,7 @@ OutputPathFilterParameter::~OutputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 OutputPathFilterParameter::Pointer OutputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& fileExtension, const QString& fileType,
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
                                                                   int groupIndex)
 {
   OutputPathFilterParameter::Pointer ptr = OutputPathFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index a63c3b0806..6406b17c90 100755
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
     const QString& defaultValue, Category category,
-    SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
     const QString& fileExtension = QString(""),
     const QString& fileType = QString(""),
     int groupIndex = -1);
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index f5712ff6da..789efad259 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -47,7 +47,7 @@ ParagraphFilterParameter::~ParagraphFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ParagraphFilterParameter::Pointer ParagraphFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, bool allowPreflight, int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, bool allowPreflight, int groupIndex)
 {
 
   ParagraphFilterParameter::Pointer ptr = ParagraphFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index e5f572cf2e..5f3ebb57a1 100755
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -82,7 +82,7 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, bool allowPreflight = true,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, bool allowPreflight = true,
                      int groupIndex = -1);
 
   ~ParagraphFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 09def6082e..26d81d10f0 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -53,7 +53,7 @@ PhaseTypeSelectionFilterParameter::~PhaseTypeSelectionFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault,
-                                                                                  Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                  Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                                                                                   const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
                                                                                   const QStringList& phaseListChoices, int groupIndex)
 {
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index f768211c8e..ce28201a75 100755
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -88,8 +88,8 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, SetterCallbackType setterCallback,
-                     GetterCallbackType getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
+  static Pointer New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
                      const QStringList& phaseListChoices, int groupIndex = -1);
 
   ~PhaseTypeSelectionFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 78a17585ee..b9e194dc79 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -49,7 +49,7 @@ RangeFilterParameter::~RangeFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 RangeFilterParameter::Pointer RangeFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QPair<double, double>& defaultPair, Category category,
-                                                        SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   RangeFilterParameter::Pointer ptr = RangeFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 35d96ec9f3..838add02f3 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -91,7 +91,7 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
                       const QPair<double, double>& defaultPair, Category category,
-                      SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                      const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                       int groupIndex = -1);
 
     ~RangeFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index 9a03e91fdf..36609a75b3 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -50,7 +50,7 @@ ScalarTypeFilterParameter::~ScalarTypeFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category,
-                                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   ScalarTypeFilterParameter::Pointer ptr = ScalarTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index 319a4c6d26..dcc623b12e 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   * @return
   */
   static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category, 
-                     SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex = -1);
+                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ScalarTypeFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 654925d531..bfc958e956 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -49,7 +49,7 @@ SecondOrderPolynomialFilterParameter::~SecondOrderPolynomialFilterParameter() =
 //
 // -----------------------------------------------------------------------------
 SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPoly_t& defaultValue,
-                                                                                        Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   SecondOrderPolynomialFilterParameter::Pointer ptr = SecondOrderPolynomialFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index 9801395431..fe1db9c2cb 100755
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -121,7 +121,7 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
     const Float2ndOrderPoly_t& defaultValue, Category category,
-     SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
      int groupIndex = -1);
 
     ~SecondOrderPolynomialFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 563ec09cd6..20f9f1d721 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -51,7 +51,7 @@ ShapeTypeSelectionFilterParameter::~ShapeTypeSelectionFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category,
-                                                                                  SetterCallbackType setterCallback, GetterCallbackType getterCallback, const QString& phaseTypeCountProperty,
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& phaseTypeCountProperty,
                                                                                   const QString& phaseTypeArrayPathProperty, int groupIndex)
 {
   ShapeTypeSelectionFilterParameter::Pointer ptr = ShapeTypeSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index 0a3f7e6607..f4232ce7f1 100755
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                      const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex = -1);
 
   ~ShapeTypeSelectionFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index b6cb9be877..a816440448 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -48,8 +48,7 @@ StringFilterParameter::~StringFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringFilterParameter::Pointer StringFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, int groupIndex)
+StringFilterParameter::Pointer StringFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   StringFilterParameter::Pointer ptr = StringFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 0acc809719..f2e0afbfe9 100755
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -87,8 +87,7 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category, SetterCallbackType setterCallback,
-                       GetterCallbackType getterCallback, int groupIndex = -1);
+                       const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~StringFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index a2d51dc26c..954d3a86eb 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -49,7 +49,7 @@ ThirdOrderPolynomialFilterParameter::~ThirdOrderPolynomialFilterParameter() = de
 //
 // -----------------------------------------------------------------------------
 ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue,
-                                                                                      Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+                                                                                      Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ThirdOrderPolynomialFilterParameter::Pointer ptr = ThirdOrderPolynomialFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index ac537bc7c6..2bb3a1061e 100755
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
    */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
     const Float3rdOrderPoly_t& defaultValue, Category category,
-    SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
     int groupIndex = -1);
 
     ~ThirdOrderPolynomialFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 7dbdd12d14..7a54c001e9 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -46,8 +46,7 @@ UInt64FilterParameter::~UInt64FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-UInt64FilterParameter::Pointer UInt64FilterParameter::New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, SetterCallbackType setterCallback,
-                                                          GetterCallbackType getterCallback, int groupIndex)
+UInt64FilterParameter::Pointer UInt64FilterParameter::New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   UInt64FilterParameter::Pointer ptr = UInt64FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 7c4fdeeaad..41f8f04894 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -84,7 +84,7 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
      * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
      * @return
      */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+    static Pointer New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
 
     ~UInt64FilterParameter() override;
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 2f15baad1d..a2166829cf 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -311,7 +311,7 @@ void EdgeGeom::deleteElementNeighbors()
 // -----------------------------------------------------------------------------
 int EdgeGeom::findElementCentroids()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_EdgeCentroids = FloatArrayType::CreateArray(getNumberOfElements(), cDims, SIMPL::StringConstants::EdgeCentroids);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_EdgeList, m_VertexList, m_EdgeCentroids);
   if(m_EdgeCentroids.get() == nullptr)
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.cpp b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
index f2a3ea38eb..b625ad150f 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.cpp
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.cpp
@@ -98,7 +98,7 @@ int GeomIO::WriteListToHDF5(hid_t parentId, const IDataArray::Pointer& list)
   {
     return err;
   }
-  QVector<size_t> tDims(1, list->getNumberOfTuples());
+  std::vector<size_t> tDims(1, list->getNumberOfTuples());
   err = list->writeH5Data(parentId, tDims);
   return err;
 }
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 3bf87b8b37..688f2e0d07 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -333,7 +333,7 @@ void HexahedralGeom::deleteElementNeighbors()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findElementCentroids()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_HexCentroids = FloatArrayType::CreateArray(getNumberOfHexas(), cDims, SIMPL::StringConstants::HexCentroids);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_HexList, m_VertexList, m_HexCentroids);
   if(m_HexCentroids.get() == nullptr)
@@ -373,7 +373,7 @@ void HexahedralGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findElementSizes()
 {
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   size_t numHexs = getNumberOfHexas();
   m_HexSizes = FloatArrayType::CreateArray(numHexs, cDims, SIMPL::StringConstants::HexVolumes, (numHexs != 0));
   GeometryHelpers::Topology::FindHexVolumes<size_t>(m_HexList, m_VertexList, m_HexSizes);
@@ -413,7 +413,7 @@ void HexahedralGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findUnsharedEdges()
 {
-  QVector<size_t> cDims(1, 2);
+  std::vector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, false);
   GeometryHelpers::Connectivity::FindUnsharedHexEdges<size_t>(m_HexList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
@@ -452,7 +452,7 @@ void HexahedralGeom::deleteUnsharedEdges()
 // -----------------------------------------------------------------------------
 int HexahedralGeom::findUnsharedFaces()
 {
-  QVector<size_t> cDims(1, 4);
+  std::vector<size_t> cDims(1, 4);
   m_UnsharedQuadList = SharedQuadList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList, false);
   GeometryHelpers::Connectivity::FindUnsharedHexFaces<size_t>(m_HexList, m_UnsharedQuadList);
   if(m_UnsharedQuadList.get() == nullptr)
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 72c45a96ef..ce7f5bb881 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -340,7 +340,7 @@ void QuadGeom::deleteElementNeighbors()
 // -----------------------------------------------------------------------------
 int QuadGeom::findElementCentroids()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_QuadCentroids = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadCentroids);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_QuadList, m_VertexList, m_QuadCentroids);
   if(m_QuadCentroids.get() == nullptr)
@@ -379,7 +379,7 @@ void QuadGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int QuadGeom::findElementSizes()
 {
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_QuadSizes = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadAreas);
   GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_QuadList, m_VertexList, m_QuadSizes);
   if(m_QuadSizes.get() == nullptr)
@@ -418,7 +418,7 @@ void QuadGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 int QuadGeom::findUnsharedEdges()
 {
-  QVector<size_t> cDims(1, 2);
+  std::vector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
   GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_QuadList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index 667f2f4001..9ab7c9cad8 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -38,7 +38,7 @@
 // -----------------------------------------------------------------------------
 SharedEdgeList::Pointer GEOM_CLASS_NAME::CreateSharedEdgeList(size_t numEdges, bool allocate)
 {
-  QVector<size_t> edgeDims(1, 2);
+  std::vector<size_t> edgeDims(1, 2);
   SharedEdgeList::Pointer edges = SharedEdgeList::CreateArray(numEdges, edgeDims, SIMPL::Geometry::SharedEdgeList, allocate);
   edges->initializeWithZeros();
   return edges;
diff --git a/Source/SIMPLib/Geometry/SharedHexOps.cpp b/Source/SIMPLib/Geometry/SharedHexOps.cpp
index 4d407b8ec1..50f21c42a5 100644
--- a/Source/SIMPLib/Geometry/SharedHexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedHexOps.cpp
@@ -3,7 +3,7 @@
 // -----------------------------------------------------------------------------
 SharedHexList::Pointer GEOM_CLASS_NAME::CreateSharedHexList(size_t numHexas, bool allocate)
 {
-  QVector<size_t> hexDims(1, 8);
+  std::vector<size_t> hexDims(1, 8);
   SharedHexList::Pointer hexas = SharedHexList::CreateArray(numHexas, hexDims, SIMPL::Geometry::SharedHexList, allocate);
   hexas->initializeWithZeros();
   return hexas;
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index 199d04aee0..c548d7657c 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -38,7 +38,7 @@
 // -----------------------------------------------------------------------------
 SharedQuadList::Pointer GEOM_CLASS_NAME::CreateSharedQuadList(size_t numQuads, bool allocate)
 {
-  QVector<size_t> quadDims(1, 4);
+  std::vector<size_t> quadDims(1, 4);
   SharedQuadList::Pointer quads = SharedEdgeList::CreateArray(numQuads, quadDims, SIMPL::Geometry::SharedQuadList, allocate);
   quads->initializeWithZeros();
   return quads;
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index bd6dc9388a..b3bc6adfd4 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -38,7 +38,7 @@
 // -----------------------------------------------------------------------------
 SharedTetList::Pointer GEOM_CLASS_NAME::CreateSharedTetList(size_t numTets, bool allocate)
 {
-  QVector<size_t> tetDims(1, 4);
+  std::vector<size_t> tetDims(1, 4);
   SharedTetList::Pointer tets = SharedTetList::CreateArray(numTets, tetDims, SIMPL::Geometry::SharedTetList, allocate);
   tets->initializeWithZeros();
   return tets;
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index 21f015fc4d..3fb684233a 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -38,7 +38,7 @@
 // -----------------------------------------------------------------------------
 SharedTriList::Pointer GEOM_CLASS_NAME::CreateSharedTriList(size_t numTris, bool allocate)
 {
-  QVector<size_t> triDims(1, 3);
+  std::vector<size_t> triDims(1, 3);
   SharedTriList::Pointer triangles = SharedTriList::CreateArray(numTris, triDims, SIMPL::Geometry::SharedTriList, allocate);
   triangles->initializeWithZeros();
   return triangles;
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index c1db85fd9b..cd9a323a80 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -38,7 +38,7 @@
 // -----------------------------------------------------------------------------
 SharedVertexList::Pointer GEOM_CLASS_NAME::CreateSharedVertexList(size_t numVertices, bool allocate)
 {
-  QVector<size_t> vertDims(1, 3);
+  std::vector<size_t> vertDims = {3};
   SharedVertexList::Pointer vertices = SharedVertexList::CreateArray(numVertices, vertDims, SIMPL::Geometry::SharedVertexList, allocate);
   vertices->initializeWithZeros();
   return vertices;
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 8498fe231d..9216f4d5d7 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -368,7 +368,7 @@ void TetrahedralGeom::deleteElementNeighbors()
 // -----------------------------------------------------------------------------
 int TetrahedralGeom::findElementCentroids()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_TetCentroids = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetCentroids);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TetList, m_VertexList, m_TetCentroids);
   if(m_TetCentroids.get() == nullptr)
@@ -408,7 +408,7 @@ void TetrahedralGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int TetrahedralGeom::findElementSizes()
 {
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_TetSizes = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetVolumes);
   GeometryHelpers::Topology::FindTetVolumes<size_t>(m_TetList, m_VertexList, m_TetSizes);
   if(m_TetSizes.get() == nullptr)
@@ -447,7 +447,7 @@ void TetrahedralGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 int TetrahedralGeom::findUnsharedEdges()
 {
-  QVector<size_t> cDims(1, 2);
+  std::vector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
   GeometryHelpers::Connectivity::FindUnsharedTetEdges<size_t>(m_TetList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
@@ -486,7 +486,7 @@ void TetrahedralGeom::deleteUnsharedEdges()
 // -----------------------------------------------------------------------------
 int TetrahedralGeom::findUnsharedFaces()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_UnsharedTriList = SharedTriList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList);
   GeometryHelpers::Connectivity::FindUnsharedTetFaces<size_t>(m_TetList, m_UnsharedTriList);
   if(m_UnsharedTriList.get() == nullptr)
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 41425f7f1a..a662c7614d 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -339,7 +339,7 @@ void TriangleGeom::deleteElementNeighbors()
 // -----------------------------------------------------------------------------
 int TriangleGeom::findElementCentroids()
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   m_TriangleCentroids = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleCentroids);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TriList, m_VertexList, m_TriangleCentroids);
   if(m_TriangleCentroids.get() == nullptr)
@@ -378,7 +378,7 @@ void TriangleGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int TriangleGeom::findElementSizes()
 {
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   m_TriangleSizes = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleAreas);
   GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_TriList, m_VertexList, m_TriangleSizes);
   if(m_TriangleSizes.get() == nullptr)
@@ -417,7 +417,7 @@ void TriangleGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 int TriangleGeom::findUnsharedEdges()
 {
-  QVector<size_t> cDims(1, 2);
+  std::vector<size_t> cDims(1, 2);
   m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
   GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_TriList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index a6bb689cde..87790abd6b 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -305,7 +305,7 @@ void VertexGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType
 int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
 {
   herr_t err = 0;
-  QVector<size_t> tDims(1, 0);
+  std::vector<size_t> tDims(1, 0);
 
   if(m_VertexList.get() != nullptr)
   {
@@ -316,7 +316,7 @@ int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
     }
     if(writeXdmf)
     {
-      QVector<size_t> cDims(1, 1);
+      std::vector<size_t> cDims(1, 1);
       DataArray<size_t>::Pointer vertsPtr = DataArray<size_t>::CreateArray(getNumberOfVertices(), cDims, SIMPL::StringConstants::VertsName);
       size_t* verts = vertsPtr->getPointer(0);
       for(size_t i = 0; i < vertsPtr->getNumberOfTuples(); i++)
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index 9382fd50b5..5c38976d15 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -61,7 +61,8 @@ namespace Detail
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const QVector<size_t>& tDims, const QVector<size_t>& cDims)
+template <typename T>
+IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const std::vector<size_t>& tDims, const std::vector<size_t>& cDims)
 {
   herr_t err = -1;
   IDataArray::Pointer ptr;
@@ -82,7 +83,7 @@ template <typename T> IDataArray::Pointer readH5Dataset(hid_t locId, const QStri
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5DataArrayReader::ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, QVector<size_t>& tDims, QVector<size_t>& cDims)
+int H5DataArrayReader::ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, std::vector<size_t>& tDims, std::vector<size_t>& cDims)
 {
   int err = 0;
   int retErr = 0;
@@ -128,7 +129,6 @@ IDataArray::Pointer H5DataArrayReader::ReadStringDataArray(hid_t gid, const QStr
   hid_t typeId = -1;
   H5T_class_t attr_type;
   size_t attr_size;
-  QString res;
 
   QVector<hsize_t> dims; // Reusable for the loop
   IDataArray::Pointer ptr = IDataArray::NullPointer();
@@ -148,8 +148,8 @@ IDataArray::Pointer H5DataArrayReader::ReadStringDataArray(hid_t gid, const QStr
 
   QString classType;
   int version = 0;
-  QVector<size_t> tDims;
-  QVector<size_t> cDims;
+  std::vector<size_t> tDims;
+  std::vector<size_t> cDims;
 
   err = ReadRequiredAttributes(gid, name, classType, version, tDims, cDims);
   if(err < 0)
@@ -223,8 +223,8 @@ IDataArray::Pointer H5DataArrayReader::ReadIDataArray(hid_t gid, const QString&
   {
     QString classType;
     int version = 0;
-    QVector<size_t> tDims;
-    QVector<size_t> cDims;
+    std::vector<size_t> tDims;
+    std::vector<size_t> cDims;
 
     err = ReadRequiredAttributes(gid, name, classType, version, tDims, cDims);
     if(err < 0)
@@ -413,8 +413,8 @@ IDataArray::Pointer H5DataArrayReader::ReadNeighborListData(hid_t gid, const QSt
   {
     QString classType;
     int version = 0;
-    QVector<size_t> tDims;
-    QVector<size_t> cDims;
+    std::vector<size_t> tDims;
+    std::vector<size_t> cDims;
 
     err = ReadRequiredAttributes(gid, name, classType, version, tDims, cDims);
     if(err < 0)
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.h b/Source/SIMPLib/HDF5/H5DataArrayReader.h
index adb3e2e595..eb1e42fdc8 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.h
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT H5DataArrayReader
      * @param cDims The Component Dimensions of the data array
      * @return
      */
-    static int ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, QVector<size_t>& tDims, QVector<size_t>& cDims);
+    static int ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, std::vector<size_t>& tDims, std::vector<size_t>& cDims);
 
     /**
      * @brief ReadIDataArray Reads an IDataArray subclass from the HDF5 file
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
index c5f113f129..2df138f2aa 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -66,8 +66,8 @@ class H5DataArrayWriter
      * @param cDims
      * @return
      */
-    template<typename IDataArrayType>
-    static int writeDataArrayAttributes(hid_t gid, IDataArrayType* dataArray, QVector<size_t> tDims, QVector<size_t> cDims)
+    template <typename IDataArrayType>
+    static int writeDataArrayAttributes(hid_t gid, IDataArrayType* dataArray, std::vector<size_t> tDims, std::vector<size_t> cDims)
     {
       int err = QH5Lite::writeScalarAttribute(gid, dataArray->getName(), SIMPL::HDF5::DataArrayVersion, dataArray->getClassVersion());
       if(err < 0)
@@ -115,12 +115,12 @@ class H5DataArrayWriter
      * @param tDims
      * @return
      */
-    template<class T>
-    static int writeDataArray(hid_t gid, T* dataArray, QVector<size_t> tDims)
+    template <class T>
+    static int writeDataArray(hid_t gid, T* dataArray, std::vector<size_t> tDims)
     {
       int err = 0;
 
-      QVector<size_t> cDims = dataArray->getComponentDimensions();
+      std::vector<size_t> cDims = dataArray->getComponentDimensions();
       hsize_t h5Rank = static_cast<hsize_t>(tDims.size()) + cDims.size();
 
       QVector<hsize_t> h5Dims(tDims.size() + cDims.size());
@@ -205,8 +205,8 @@ class H5DataArrayWriter
       }
 
       err = H5Lite::writeVectorOfStringsDataset(gid, dataArray->getName().toStdString(), data);
-      QVector<size_t> tDims(1, dataArray->getNumberOfTuples());
-      QVector<size_t> cDims(1, 1);
+      std::vector<size_t> tDims(1, dataArray->getNumberOfTuples());
+      std::vector<size_t> cDims(1, 1);
       err = writeDataArrayAttributes<T>(gid, dataArray, tDims, cDims);
 
       return err;
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index c8c37d5d1b..0cd1651886 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -285,7 +285,7 @@ int H5PrecipitateStatsDataDelegate::writePrecipitateStatsData(PrecipitateStatsDa
   // Write the Misorientation Bins
   if(nullptr != data->getMisorientationBins().get())
   {
-    QVector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
     err = data->getMisorientationBins()->writeH5Data(groupId, tDims);
   }
 
@@ -294,7 +294,7 @@ int H5PrecipitateStatsDataDelegate::writePrecipitateStatsData(PrecipitateStatsDa
   // Write the ODF
   if(nullptr != data->getODF().get())
   {
-    QVector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
     err = data->getODF()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::ODFWeights, data->getODF_Weights());
@@ -302,7 +302,7 @@ int H5PrecipitateStatsDataDelegate::writePrecipitateStatsData(PrecipitateStatsDa
   // Write the Axis ODF
   if(nullptr != data->getAxisOrientation().get())
   {
-    QVector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
     err = data->getAxisOrientation()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::AxisODFWeights, data->getAxisODF_Weights());
@@ -326,7 +326,7 @@ int H5PrecipitateStatsDataDelegate::writeVectorOfArrays(hid_t pid, VectorOfFloat
     err = -1;
     if(nullptr != colData[c] && colData[c]->getSize() > 0)
     {
-      QVector<size_t> tDims(1, colData[c]->getNumberOfTuples());
+      std::vector<size_t> tDims(1, colData[c]->getNumberOfTuples());
       err = colData[c]->writeH5Data(pid, tDims);
       if(err < 0)
       {
@@ -371,7 +371,7 @@ int H5PrecipitateStatsDataDelegate::readVectorOfArrays(hid_t pid, VectorOfFloatA
 int H5PrecipitateStatsDataDelegate::readMDFWeights(hid_t pid, PrecipitateStatsData* data)
 {
   int err = 0;
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims(1, 1);
   FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
   FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
   dims[0] = 3;
@@ -813,7 +813,7 @@ int H5PrecipitateStatsDataDelegate::writeBinNumbers(PrecipitateStatsData* data,
   {
     data->generateBinNumbers();
   }
-  QVector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
+  std::vector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
   return data->getBinNumbers()->writeH5Data(groupId, tDims);
 }
 
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
index d44da2d2d8..a1446c3515 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
@@ -244,7 +244,7 @@ int H5PrimaryStatsDataDelegate::writePrimaryStatsData(PrimaryStatsData* data, hi
   // Write the Misorientation Bins
   if(nullptr != data->getMisorientationBins().get())
   {
-    QVector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
     err = data->getMisorientationBins()->writeH5Data(groupId, tDims);
   }
 
@@ -253,7 +253,7 @@ int H5PrimaryStatsDataDelegate::writePrimaryStatsData(PrimaryStatsData* data, hi
   // Write the ODF
   if(nullptr != data->getODF().get())
   {
-    QVector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
     err = data->getODF()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::ODFWeights, data->getODF_Weights());
@@ -261,7 +261,7 @@ int H5PrimaryStatsDataDelegate::writePrimaryStatsData(PrimaryStatsData* data, hi
   // Write the Axis ODF
   if(nullptr != data->getAxisOrientation().get())
   {
-    QVector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
     err = data->getAxisOrientation()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::AxisODFWeights, data->getAxisODF_Weights());
@@ -285,7 +285,7 @@ int H5PrimaryStatsDataDelegate::writeVectorOfArrays(hid_t pid, VectorOfFloatArra
     err = -1;
     if(nullptr != colData[c] && colData[c]->getSize() > 0)
     {
-      QVector<size_t> tDims(1, colData[c]->getNumberOfTuples());
+      std::vector<size_t> tDims(1, colData[c]->getNumberOfTuples());
       err = colData[c]->writeH5Data(pid, tDims);
       if(err < 0)
       {
@@ -330,7 +330,7 @@ int H5PrimaryStatsDataDelegate::readVectorOfArrays(hid_t pid, VectorOfFloatArray
 int H5PrimaryStatsDataDelegate::readMDFWeights(hid_t pid, PrimaryStatsData* data)
 {
   int err = 0;
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims(1, 1);
   FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
   FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
   dims[0] = 3;
@@ -629,7 +629,7 @@ int H5PrimaryStatsDataDelegate::writeBinNumbers(PrimaryStatsData* data, hid_t gr
   {
     data->generateBinNumbers();
   }
-  QVector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
+  std::vector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
   return data->getBinNumbers()->writeH5Data(groupId, tDims);
 }
 
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
index 79b640d3c3..94e951fb37 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
@@ -238,7 +238,7 @@ int H5TransformationStatsDataDelegate::writeTransformationStatsData(Transformati
   // Write the Misorientation Bins
   if(nullptr != data->getMisorientationBins().get())
   {
-    QVector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getMisorientationBins()->getNumberOfTuples());
     err = data->getMisorientationBins()->writeH5Data(groupId, tDims);
   }
 
@@ -247,7 +247,7 @@ int H5TransformationStatsDataDelegate::writeTransformationStatsData(Transformati
   // Write the ODF
   if(nullptr != data->getODF().get())
   {
-    QVector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getODF()->getNumberOfTuples());
     err = data->getODF()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::ODFWeights, data->getODF_Weights());
@@ -255,7 +255,7 @@ int H5TransformationStatsDataDelegate::writeTransformationStatsData(Transformati
   // Write the Axis ODF
   if(nullptr != data->getAxisOrientation().get())
   {
-    QVector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
+    std::vector<size_t> tDims(1, data->getAxisOrientation()->getNumberOfTuples());
     err = data->getAxisOrientation()->writeH5Data(groupId, tDims);
   }
   err = writeWeightsData(groupId, SIMPL::StringConstants::AxisODFWeights, data->getAxisODF_Weights());
@@ -279,7 +279,7 @@ int H5TransformationStatsDataDelegate::writeVectorOfArrays(hid_t pid, VectorOfFl
     err = -1;
     if(nullptr != colData[c] && colData[c]->getSize() > 0)
     {
-      QVector<size_t> tDims(1, colData[c]->getNumberOfTuples());
+      std::vector<size_t> tDims(1, colData[c]->getNumberOfTuples());
       err = colData[c]->writeH5Data(pid, tDims);
       if(err < 0)
       {
@@ -324,7 +324,7 @@ int H5TransformationStatsDataDelegate::readVectorOfArrays(hid_t pid, VectorOfFlo
 int H5TransformationStatsDataDelegate::readMDFWeights(hid_t pid, TransformationStatsData* data)
 {
   int err = 0;
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims(1, 1);
   FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
   FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
   dims[0] = 3;
@@ -639,7 +639,7 @@ int H5TransformationStatsDataDelegate::writeBinNumbers(TransformationStatsData*
   {
     data->generateBinNumbers();
   }
-  QVector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
+  std::vector<size_t> tDims(1, data->getBinNumbers()->getNumberOfTuples());
   return data->getBinNumbers()->writeH5Data(groupId, tDims);
 }
 
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 7709e701e7..ef86310a25 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -182,7 +182,7 @@
 
 // Select vector, RGB/RGBA, or scalar images
 #define Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                               \
-  QVector<size_t> cDims = ptr->getComponentDimensions();                                                                                                                                               \
+  std::vector<size_t> cDims = ptr->getComponentDimensions();                                                                                                                                           \
   if(cDims.size() > 1)                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
     Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Vector);                                                       \
@@ -329,7 +329,7 @@
       ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());                                    \
       if(nullptr != imageGeometry)                                                                                                                                                                     \
       {                                                                                                                                                                                                \
-        QVector<size_t> tDims = imageGeometry->getDimensions().toContainer<QVector<size_t>>();                                                                                                         \
+        std::vector<size_t> tDims = imageGeometry->getDimensions().toContainer<std::vector<size_t>>();                                                                                                     \
         if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
           QString type = ptr->getTypeAsString();                                                                                                                                                       \
@@ -426,7 +426,7 @@
       ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, input2_path.getDataContainerName());                             \
       if(imageGeometry.get() != nullptr)                                                                                                                                                               \
       {                                                                                                                                                                                                \
-        QVector<size_t> tDims(3, 0);                                                                                                                                                                   \
+        std::vector<size_t> tDims(3, 0);                                                                                                                                                               \
         std::tie(tDims[0], tDims[1], tDims[2]) = imageGeometry->getDimensions();                                                                                                                       \
         if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 787149f65d..11c0babea9 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -54,19 +54,16 @@
 template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkImageConversion
 {
 public:
-  Dream3DToItkImageConversion()
-  {
-  }
-  virtual ~Dream3DToItkImageConversion()
-  {
-  }
+  Dream3DToItkImageConversion() = default;
+
+  virtual ~Dream3DToItkImageConversion() = default;
 
   /// Itk ImportImage Filter Types
-  typedef itk::ImportImageFilter<K, ImageProcessingConstants::ImageDimension> ItkImportImageFilterType;
-  typedef typename ItkImportImageFilterType::Pointer ItkImportImageFilterPointerType;
+  using ItkImportImageFilterType = itk::ImportImageFilter<K, ImageProcessingConstants::ImageDimension>;
+  using ItkImportImageFilterPointerType = typename ItkImportImageFilterType::Pointer;
 
-  typedef typename itk::Image<ItkOutPixelType, ImageProcessingConstants::ImageDimension> ItkImageOutType; // 3D RGB Image
-  typedef typename ItkImageOutType::Pointer ItkImageOutPointerType;
+  using ItkImageOutType = typename itk::Image<ItkOutPixelType, ImageProcessingConstants::ImageDimension>; // 3D RGB Image
+  using ItkImageOutPointerType = typename ItkImageOutType::Pointer;
 
   /**
    * @brief operator ()
@@ -80,7 +77,7 @@ template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkIm
     AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
     // get size+dimensions of dataset
-    QVector<size_t> udims = attrMat->getTupleDimensions();
+    std::vector<size_t> udims = attrMat->getTupleDimensions();
     size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
@@ -157,7 +154,7 @@ class ItkBridge2
       AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
       //get size+dimensions of dataset
-      QVector<size_t> udims = attrMat->getTupleDimensions();
+      std::vector<size_t> udims = attrMat->getTupleDimensions();
       size_t totalPoints = attrMat->getNumberOfTuples();
 
       //create and setup import filter
@@ -223,7 +220,7 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
     AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
     // get size+dimensions of dataset
-    QVector<size_t> udims = attrMat->getTupleDimensions();
+    std::vector<size_t> udims = attrMat->getTupleDimensions();
     size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
@@ -327,7 +324,7 @@ class ItkBridge
     AttributeMatrix::Pointer attrMat = m->getAttributeMatrix(attrMatName);
 
     // get size+dimensions of dataset
-    QVector<size_t> udims = attrMat->getTupleDimensions();
+    std::vector<size_t> udims = attrMat->getTupleDimensions();
     size_t totalPoints = attrMat->getNumberOfTuples();
 
     // create and setup import filter
diff --git a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
index 2f92d9af45..6718fa666d 100644
--- a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
+++ b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
@@ -1,6 +1,38 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QVector>
+#include <vector>
+
 #include <itkRGBAPixel.h>
 #include <itkRGBPixel.h>
 #include <itkVector.h>
@@ -8,43 +40,50 @@
 namespace ITKDream3DHelper
 {
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(PixelType*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(PixelType*)
 {
-  QVector<size_t> cDims(1, 1);
+  std::vector<size_t> cDims(1, 1);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
 {
-  QVector<size_t> cDims(36, 1);
+  std::vector<size_t> cDims(36, 1);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
 {
-  QVector<size_t> cDims(3, 1);
+  std::vector<size_t> cDims(3, 1);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
 {
-  QVector<size_t> cDims(2, 1);
+  std::vector<size_t> cDims(2, 1);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
 {
-  QVector<size_t> cDims(1, 3);
+  std::vector<size_t> cDims(1, 3);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
 {
-  QVector<size_t> cDims(1, 4);
+  std::vector<size_t> cDims(1, 4);
   return cDims;
 }
 
-template <class PixelType> QVector<size_t> GetComponentsDimensions()
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions()
 {
   return GetComponentsDimensions_impl(static_cast<PixelType*>(0));
 }
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 8f2a50117d..b9a2fc05a7 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -266,8 +266,8 @@ ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::I
   image->setSpacing(tspacing);
   container->setGeometry(image);
 
-  QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
-  QVector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
+  std::vector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<TPixel>();
+  std::vector<size_t> qTdims = {tDims[0], tDims[1], tDims[2]};
   AttributeMatrix::Pointer cellAttrMat = container->createNonPrereqAttributeMatrix(this, dataArrayPath.getAttributeMatrixName(), qTdims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 8ccc8ec62c..d4e24d744a 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -73,7 +73,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   //float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
-  QVector<size_t> tDims(3, 1);
+  std::vector<size_t> tDims(3, 1);
   // Get Input image properties
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   typename ImageType::PointType origin = inputPtr->GetOrigin();
@@ -119,10 +119,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
-  QVector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<PixelType>();
+  std::vector<size_t> cDims = ITKDream3DHelper::GetComponentsDimensions<PixelType>();
   IGeometry::Pointer geom = dataContainer->getGeometry();
   ImageGeom::Pointer imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-  QVector<size_t> tDims = imageGeom->getDimensions().toContainer<QVector<size_t>>();
+  std::vector<size_t> tDims = imageGeom->getDimensions().toContainer<std::vector<size_t>>();
 
   AttributeMatrix::Pointer attrMat;
   if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
@@ -135,7 +135,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 	}
 	// Check that if size does not match, there are no other data array than the one we expect.
 	// That makes it possible to modify the attribute matrix without having to worry.
-	QVector<size_t> matDims = attrMat->getTupleDimensions();
+	std::vector<size_t> matDims = attrMat->getTupleDimensions();
 	if (matDims != tDims)
 	{
     if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 5ac821899d..f18409e9d6 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -113,7 +113,7 @@ void MakeDataContainer::dataCheck()
   {
     return;
   }
-  QVector<size_t> tDims(3, 64);
+  std::vector<size_t> tDims(3, 64);
   AttributeMatrix::Pointer cellAttrMat = m->createNonPrereqAttributeMatrix(this, getCellAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
   if(getErrorCode() < 0)
   {
@@ -127,7 +127,7 @@ void MakeDataContainer::dataCheck()
   //    return;
   //  }
 
-  QVector<size_t> dims(1, 1);
+  std::vector<size_t> dims(1, 1);
   m_FeatureIdsPtr =
       cellAttrMat->createNonPrereqArray<DataArray<int32_t>, AbstractFilter, int32_t>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
index 61eac0e703..d4e5847e0e 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
@@ -51,7 +51,7 @@ SIMPLH5DataReaderRequirements::SIMPLH5DataReaderRequirements(const QString &prim
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    m_ComponentDimensions = QVector<QVector<size_t> >(1, QVector<size_t>(1, allowedCompDim));
+    m_ComponentDimensions = std::vector<std::vector<size_t>>(1, std::vector<size_t>(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
index c897c6cb1c..8b161942e0 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
@@ -32,6 +32,8 @@
 
 #pragma once
 
+#include <vector>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
@@ -52,7 +54,7 @@ class SIMPLib_EXPORT SIMPLH5DataReaderRequirements
     
     virtual ~SIMPLH5DataReaderRequirements();
 
-    using QVectorSizeT = QVector<QVector<size_t>> ;
+    using QVectorSizeT = std::vector<std::vector<size_t>>;
 
     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DCGeometryTypes)
     SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, AMTypes)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
index 0fe0552e6c..b319759c96 100755
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -169,7 +169,7 @@ class FilterParameterWidgetUtils
       DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
 
       QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
-      QVector< QVector<size_t> > cDims = fp->getDefaultComponentDimensions();
+      std::vector<std::vector<size_t>> cDims = fp->getDefaultComponentDimensions();
       for(auto& dc : dcMap)
       {
         if(dc.getName() == currentDCName)
@@ -191,7 +191,7 @@ class FilterParameterWidgetUtils
                 IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
                 aaCombo->addItem(daName);
 
-                if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.isEmpty() && !cDims.contains(da->getComponentDimensions()))))
+                if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.empty() && !VectorContains<size_t>(cDims, da->getComponentDimensions()))))
                 {
                   QStandardItemModel* model = qobject_cast<QStandardItemModel*>(aaCombo->model());
                   if (nullptr != model)
@@ -216,7 +216,20 @@ class FilterParameterWidgetUtils
       }
     }
 
-
+    // -----------------------------------------------------------------------------
+    template <typename T>
+    static bool VectorContains(const std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+    {
+      auto pos = std::find(container.begin(), container.end(), comparison);
+      return (pos != container.end());
+    }
+    // -----------------------------------------------------------------------------
+    template <typename T>
+    static bool VectorContains(std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+    {
+      auto pos = std::find(container.begin(), container.end(), comparison);
+      return (pos != container.end());
+    }
     /**
      * @brief PopulateAttributeArrayList This method populates a QListWidget with
      * items representing AttributeArrays
@@ -249,7 +262,7 @@ class FilterParameterWidgetUtils
       DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
 
       QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
-      QVector< QVector<size_t> > cDims = fp->getDefaultComponentDimensions();
+      QVector< std::vector<size_t> > cDims = fp->getDefaultComponentDimensions();
       for(auto& dc : dcMap)
       {
         if(dc.getName() == currentDCName)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 9310795d22..a4ac449ebd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -966,7 +966,7 @@ std::tuple<herr_t, QString> ImportHDF5DatasetWidget::bestGuessCDims(const QStrin
   AttributeMatrix::Pointer am = m_Filter->getDataContainerArray()->getAttributeMatrix(amPath);
   if(am != nullptr)
   {
-    QVector<size_t> amTupleDims = am->getTupleDimensions();
+    std::vector<size_t> amTupleDims = am->getTupleDimensions();
     int fileDimsSize = fileDims.size();
 
     //      // Calculate the prime factors of the attribute matrix tuple dimensions
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index acdd1eff22..f6bdac8eba 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -121,7 +121,7 @@ void ReadASCIIDataWidget::setupGui()
 
     m_LineCounter = new LineCounterObject(m_FilePath, m_Filter->getWizardData().numberOfLines);
 
-    QVector<size_t> tupleDimsArray = m_Filter->getWizardData().tupleDims;
+    std::vector<size_t> tupleDimsArray = m_Filter->getWizardData().tupleDims;
 
     if(!tupleDimsArray.empty())
     {
@@ -177,7 +177,7 @@ void ReadASCIIDataWidget::on_editImportSettings_clicked()
       int beginIndex = m_ImportWizard->getBeginningLineNum();
       int numOfDataLines = numOfLines - beginIndex + 1;
       tupleCount->setText(QString::number(numOfDataLines));
-      QVector<size_t> dims = m_ImportWizard->getTupleDims();
+      std::vector<size_t> dims = m_ImportWizard->getTupleDims();
 
       QString tupleDimsStr = "";
       for(int i = 0; i < dims.size(); i++)
@@ -403,7 +403,7 @@ void ReadASCIIDataWidget::lineCountDidFinish()
     int beginIndex = m_ImportWizard->getBeginningLineNum();
     int numOfDataLines = numOfLines - beginIndex + 1;
     tupleCount->setText(QString::number(numOfDataLines));
-    QVector<size_t> dims = m_ImportWizard->getTupleDims();
+    std::vector<size_t> dims = m_ImportWizard->getTupleDims();
 
     QString tupleDimsStr = "";
     for(int i = 0; i < dims.size(); i++)
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index e9244e6b1a..4bc2a828cc 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -42,6 +42,7 @@
 #include <QtWidgets/QApplication>
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -271,6 +272,19 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   return true;
 }
 
+// -----------------------------------------------------------------------------
+template <typename T>
+bool vectorContains(const std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+{
+  for(const auto& value : container)
+  {
+    if(value == comparison)
+    {
+      return true;
+    }
+  }
+  return false;
+}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -341,12 +355,8 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!reqs.componentDimensions.empty() && !reqs.componentDimensions.contains(da->getComponentDimensions()))
-  {
-    return false;
-  }
-
-  return true;
+  bool b = !FilterParameterWidgetUtils::VectorContains<size_t>(reqs.componentDimensions, da->getComponentDimensions());
+  return !(!reqs.componentDimensions.empty() && !b);
 }
 
 // -----------------------------------------------------------------------------
@@ -601,7 +611,7 @@ QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString>
   }
   else
   {
-    for(QString type : daTypes)
+    for(const QString& type : daTypes)
     {
       reqStr += "<td>" + type + "</td>";
     }
@@ -614,7 +624,7 @@ QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString>
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createComponentReqString(QVector<QVector<size_t>> comps) const
+QString DataArrayPathSelectionWidget::createComponentReqString(std::vector<std::vector<size_t>> comps) const
 {
   QString reqStr = "<tr><td><i>Required Component Size:</i></td>";
   if(comps.empty())
@@ -623,7 +633,7 @@ QString DataArrayPathSelectionWidget::createComponentReqString(QVector<QVector<s
   }
   else
   {
-    for(QVector<size_t> comp : comps)
+    for(const std::vector<size_t>& comp : comps)
     {
       reqStr += "<td>[";
 
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index 2214da89ec..c1a30d4765 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -387,7 +387,7 @@ public slots:
   * @param compDims
   * @return
   */
-  QString createComponentReqString(QVector<QVector<size_t>> compDims) const;
+  QString createComponentReqString(std::vector<std::vector<size_t>> compDims) const;
 
   /**
   * @brief mouseMoveEvent
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index c8301da57e..4e421365c5 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -83,7 +83,7 @@ void DataFormatPage::setupGui()
   dataView->setModel(m_ASCIIDataModel.data());
 
   connect(dataView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(updateSelection(const QItemSelection&, const QItemSelection&)));
-  connect(tupleDimsTable, SIGNAL(tupleDimsChanged(QVector<size_t>)), this, SLOT(checkTupleDimensions(QVector<size_t>)));
+  connect(tupleDimsTable, SIGNAL(tupleDimsChanged(std::vector<size_t>)), this, SLOT(checkTupleDimensions(std::vector<size_t>)));
   connect(amName, SIGNAL(textEdited(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
   headersIndexLineEdit->setValidator(new QRegularExpressionValidator(QRegularExpression("[1-9][0-9]*"), headersIndexLineEdit));
@@ -115,7 +115,7 @@ void DataFormatPage::setupGui()
 //  amTuplesLabel->setText(QString::number(numOfDataLines));
 
   tupleDimsTable->blockSignals(true);
-  tupleDimsTable->addTupleDimensions(QVector<size_t>(1, numOfDataLines));
+  tupleDimsTable->addTupleDimensions(std::vector<size_t>(1, numOfDataLines));
   tupleDimsTable->blockSignals(false);
 
   selectedDCBtn->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(false));
@@ -452,7 +452,7 @@ void DataFormatPage::createAMSelectionMenu()
   // Loop over the data containers until we find the proper data container
   DataContainerArray::Container containers = dca->getDataContainers();
   QVector<QString> daTypes;// = m_FilterParameter->getDefaultAttributeArrayTypes();
-  QVector<QVector<size_t>> cDims;// = m_FilterParameter->getDefaultComponentDimensions();
+  QVector<std::vector<size_t>> cDims;// = m_FilterParameter->getDefaultComponentDimensions();
   QVector<AttributeMatrix::Type> amTypes;// = m_FilterParameter->getDefaultAttributeMatrixTypes();
   IGeometry::Types geomTypes;// = m_FilterParameter->getDefaultGeometryTypes();
 
@@ -709,7 +709,7 @@ void DataFormatPage::on_startRowSpin_valueChanged(int value)
   if(!tupleDimsTable->didUseEdit())
   {
     tupleDimsTable->clearTupleDimensions();
-    tupleDimsTable->addTupleDimensions(QVector<size_t>(1, numOfDataLines));
+    tupleDimsTable->addTupleDimensions(std::vector<size_t>(1, numOfDataLines));
   }
   checkTupleDimensions(getTupleTable()->getData());
 
@@ -956,7 +956,7 @@ void DataFormatPage::updateSelection(const QItemSelection& selected, const QItem
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataFormatPage::checkTupleDimensions(QVector<size_t> tupleDims)
+bool DataFormatPage::checkTupleDimensions(std::vector<size_t> tupleDims)
 {
   if(!validateTupleDimensions(tupleDims))
   {
@@ -977,7 +977,7 @@ bool DataFormatPage::checkTupleDimensions(QVector<size_t> tupleDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataFormatPage::validateTupleDimensions(QVector<size_t> tupleDims)
+bool DataFormatPage::validateTupleDimensions(std::vector<size_t> tupleDims)
 {
   size_t tupleTotal = 1;
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index 0887e3a5a5..71b269198f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -265,7 +265,7 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
     void on_amName_returnPressed();
 
     void updateSelection(const QItemSelection &selected, const QItemSelection &deselected);
-    bool checkTupleDimensions(QVector<size_t> tupleDims);
+    bool checkTupleDimensions(std::vector<size_t> tupleDims);
 
     void on_createAMRadio_toggled(bool b);
     void on_useAMRadio_toggled(bool b);
@@ -291,7 +291,7 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
     bool                                            m_HeadersHasErrors = false;
 
     bool validateHeaders(QVector<QString> headers);
-    bool validateTupleDimensions(QVector<size_t> tupleDims);
+    bool validateTupleDimensions(std::vector<size_t> tupleDims);
   
   public:
     DataFormatPage(const DataFormatPage&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index 2b3928dc5b..984ab0a244 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -454,7 +454,7 @@ QString ImportASCIIDataWizard::getInputFilePath()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> ImportASCIIDataWizard::getTupleDims()
+std::vector<size_t> ImportASCIIDataWizard::getTupleDims()
 {
   DataFormatPage* dfPage = dynamic_cast<DataFormatPage*>(page(DataFormat));
   if(nullptr != dfPage)
@@ -462,7 +462,7 @@ QVector<size_t> ImportASCIIDataWizard::getTupleDims()
     return dfPage->getTupleTable()->getData();
   }
 
-  return QVector<size_t>();
+  return std::vector<size_t>();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
index 3470bbfce9..8f4c6d1bf4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
@@ -136,7 +136,7 @@ class ImportASCIIDataWizard : public QWizard
     QStringList getDataTypes();
     int getBeginningLineNum();
     QString getInputFilePath();
-    QVector<size_t> getTupleDims();
+    std::vector<size_t> getTupleDims();
     bool getAutomaticAM();
     DataArrayPath getSelectedPath();
     int getAttributeMatrixType();
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
index 9250201242..110b1f9c57 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
@@ -78,17 +78,17 @@ void TupleTableWidget::setupGui()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<size_t> TupleTableWidget::getData()
+std::vector<size_t> TupleTableWidget::getData()
 {
   int cCount = tupleTable->columnCount();
-  QVector<size_t> data(cCount, 0);
+  std::vector<size_t> data(cCount, 0);
 
   for(int col = 0; col < cCount; col++)
   {
     QTableWidgetItem* item = tupleTable->item(0, col);
     if(nullptr == item)
     {
-      return QVector<size_t>();
+      return std::vector<size_t>();
     }
     data[col] = item->data(Qt::DisplayRole).toInt();
   }
@@ -99,7 +99,7 @@ QVector<size_t> TupleTableWidget::getData()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TupleTableWidget::addTupleDimensions(QVector<size_t> tupleDims)
+void TupleTableWidget::addTupleDimensions(std::vector<size_t> tupleDims)
 {
   if(!m_UserEdited)
   {
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
index 2c8d0a97ae..6362ae944a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
@@ -65,9 +65,9 @@ class TupleTableWidget : public QWidget, private Ui::TupleTableWidget
     */
     void setupGui();
 
-    QVector<size_t> getData();
+    std::vector<size_t> getData();
 
-    void addTupleDimensions(QVector<size_t> tupleDims);
+    void addTupleDimensions(std::vector<size_t> tupleDims);
     void clearTupleDimensions();
 
     bool didUseEdit();
@@ -83,7 +83,7 @@ class TupleTableWidget : public QWidget, private Ui::TupleTableWidget
     void on_tupleTable_itemChanged(QTableWidgetItem* item);
 
   signals:
-    void tupleDimsChanged(QVector<size_t> tupleDims);
+    void tupleDimsChanged(std::vector<size_t> tupleDims);
 
   private:
     void updateDynamicButtons();
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
index fcd3f469d1..a4437ed7d6 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
@@ -186,7 +186,7 @@ template <> struct type_caster<ASCIIWizardData>
       }
       value.dataHeaders = dataHeaders;
       value.attrMatType = py::cast<int>(awdDict["attrMatType"]);
-      QVector<size_t> tupleDims;
+      std::vector<size_t> tupleDims;
       for(auto tupleDim : awdDict["tupleDimensions"])
       {
         tupleDims.push_back(py::cast<size_t>(tupleDim));
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index c406e687ec..a7b7c8df90 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -78,9 +78,9 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
   {                                                                                                                                                                                                    \
     using DataArrayType = DataArray<T>;                                                                                                                                                                \
     PySharedPtrClass<DataArrayType> instance(m, #NAME, parent, py::buffer_protocol());                                                                                                                 \
-    instance.def(py::init([](size_t numElements, QString name, bool allocate) { return DataArrayType::CreateArray(numElements, name, allocate); }))                                                    \
+    instance.def(py::init([](size_t numElements, QString name, T initValue) { return DataArrayType::CreateArray(numElements, name, initValue); }))                                                    \
         .def(py::init([](T* ptr, size_t numElements, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                                         \
-          return DataArrayType::WrapPointer(ptr, numElements, QVector<size_t>::fromStdVector(cDims), name, ownsData);                                                                                  \
+          return DataArrayType::WrapPointer(ptr, numElements, cDims, name, ownsData);                                                                                  \
         }))                                                                                                                                                                                            \
         .def(py::init([](py::array_t<T, py::array::c_style> b, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                               \
           ssize_t numElements = 1;                                                                                                                                                                     \
@@ -90,7 +90,7 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
             numElements *= b.shape(e);                                                                                                                                                                 \
           }                                                                                                                                                                                            \
           numElements /= cDims[0];                                                                                                                                                                     \
-          return DataArrayType::WrapPointer(reinterpret_cast<T*>(b.mutable_data(0)), static_cast<size_t>(numElements), QVector<size_t>::fromStdVector(cDims), name, ownsData);                         \
+          return DataArrayType::WrapPointer(reinterpret_cast<T*>(b.mutable_data(0)), static_cast<size_t>(numElements), cDims, name, ownsData);                         \
         })) /* Class instance method setValue */                                                                                                                                                       \
         .def("setValue", &DataArrayType::setValue, py::arg("index"), py::arg("value"))                                                                                                                 \
         .def("getValue", &DataArrayType::getValue, py::arg("index"))                                                                                                                                   \
@@ -264,16 +264,16 @@ PYBIND11_MODULE(dream3d, m)
   ;
 
   // Handle QVector of size_t
-  py::class_<QVector<size_t>>(mod, "Dims")
+  py::class_<std::vector<size_t>>(mod, "Dims")
 	  .def(py::init<>([](py::list dimensions) {
-	  QVector<size_t> dims = QVector<size_t>();
+	  std::vector<size_t> dims = std::vector<size_t>();
 	  for (auto dimension : dimensions)
 	  {
 		  dims.push_back(py::cast<size_t>(dimension));
 	  }
 	  return dims;
       }))
-	  .def("__repr__", [](const QVector<size_t> &dims) {
+	  .def("__repr__", [](const std::vector<size_t> &dims) {
 		  py::list dimensions;
 		  for (size_t dim : dims)
 		  {
@@ -281,7 +281,7 @@ PYBIND11_MODULE(dream3d, m)
 		  }
 		  return dimensions;
 	  })
-	  .def("__str__", [](const QVector<size_t> &dims) {
+	  .def("__str__", [](const std::vector<size_t> &dims) {
 		  py::list dimensions;
 		  for (size_t dim : dims)
 		  {
@@ -289,7 +289,7 @@ PYBIND11_MODULE(dream3d, m)
 		  }
       return py::str(dimensions);
 	  })
-	  .def("__getitem__", [](const QVector<size_t> &dims, int key) {
+	  .def("__getitem__", [](const std::vector<size_t> &dims, int key) {
 		  return dims[key];
 	  })
   ;
diff --git a/Wrapping/Python/SIMPL/simpl_helpers.py b/Wrapping/Python/SIMPL/simpl_helpers.py
index aa0be4eff4..9311ffff45 100644
--- a/Wrapping/Python/SIMPL/simpl_helpers.py
+++ b/Wrapping/Python/SIMPL/simpl_helpers.py
@@ -38,7 +38,7 @@ def CreateAttributeMatrix(dims, name, type):
     name -- The name of the AttributeMatrix
     type -- the type of the AttributeMatrix
     """
-    am = simpl.AttributeMatrix.Create(dims, name, type)
+    am = simpl.AttributeMatrix.New(dims, name, type)
     return am
 
 
@@ -132,7 +132,7 @@ def ConvertToDataArray(name, array, componentDimensions = 1):
     # Get shape
     shape = array.shape
     # Determine cDims
-    cDims = simpl.VectorSizeT([componentDimensions])  # Default is 1
+    cDims = simpl.Dims([componentDimensions])  # Default is 1
 
     # Determine type
     type = array.dtype
diff --git a/Wrapping/Python/Testing/AttributeMatrixTest.py b/Wrapping/Python/Testing/AttributeMatrixTest.py
index 826810d0be..7611e8b15e 100644
--- a/Wrapping/Python/Testing/AttributeMatrixTest.py
+++ b/Wrapping/Python/Testing/AttributeMatrixTest.py
@@ -9,7 +9,7 @@
 def AttributeMatrixTest():
     # Create an AttributeMatrix
     amType = simpl.AttributeMatrix.Type.Cell
-    tupleDims = simpl.VectorSizeT([5, 4, 3])
+    tupleDims = simpl.Dims([5, 4, 3])
     amName = "CellAttributeMatrix"
     am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
diff --git a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
index 678be58bc8..19be884c58 100644
--- a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
+++ b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
@@ -18,7 +18,7 @@ def convert_data_test():
     dc = sc.CreateDataContainer("ImageDataContainer")
     dca.addOrReplaceDataContainer(dc)
  
-    shape = simpl.VectorSizeT([4, 5, 2])
+    shape = simpl.Dims([4, 5, 2])
     cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)   
     
diff --git a/Wrapping/Python/Testing/DataArrayTest.py b/Wrapping/Python/Testing/DataArrayTest.py
index f05b7638bb..adc0635254 100644
--- a/Wrapping/Python/Testing/DataArrayTest.py
+++ b/Wrapping/Python/Testing/DataArrayTest.py
@@ -24,12 +24,12 @@ def DataArrayTest():
     dc = sc.CreateDataContainer("ImageDataContainer")
     dca.addOrReplaceDataContainer(dc)
 
-    shape = simpl.VectorSizeT([4, 5, 2])
+    shape = simpl.Dims([4, 5, 2])
     cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
-
+    shape = [4,5,2]
     # Create the Component Dimensions for the Array, 1 Component in this case
-    cDims = simpl.VectorSizeT([1])
+    cDims = simpl.Dims([1])
 
     arrayTypes = [np.int8, np.uint8, np.int16, np.uint16, np.int32, np.uint32, np.int64, np.uint64, np.float32, np.double]
     # We store each return numpy array in order to keep it in scope. If we let it
diff --git a/Wrapping/Python/Testing/DataContainerArrayTest.py b/Wrapping/Python/Testing/DataContainerArrayTest.py
index ba50baab69..d11785728e 100644
--- a/Wrapping/Python/Testing/DataContainerArrayTest.py
+++ b/Wrapping/Python/Testing/DataContainerArrayTest.py
@@ -32,8 +32,8 @@ def AttributeMatrixAccessTest():
     dca.addOrReplaceDataContainer(dc)
     
     amType = simpl.AttributeMatrix.Type.Cell
-    tupleDims = simpl.VectorSizeT([5,4,3])
-    am = simpl.AttributeMatrix.Create(tupleDims, "CellAttributeMatrix", amType)
+    tupleDims = simpl.Dims([5,4,3])
+    am = simpl.AttributeMatrix.New(tupleDims, "CellAttributeMatrix", amType)
     dc.addOrReplaceAttributeMatrix(am)
 
     # See if we can get the AttributeMatrix based on a DataArrayPath object
diff --git a/Wrapping/Python/Testing/DataContainerTest.py b/Wrapping/Python/Testing/DataContainerTest.py
index ff812c1d83..1a987cf8ca 100644
--- a/Wrapping/Python/Testing/DataContainerTest.py
+++ b/Wrapping/Python/Testing/DataContainerTest.py
@@ -29,7 +29,7 @@ def DataContainerTest() :
   assert dc.Name == "ImageDataContainer"
   
   amType = simpl.AttributeMatrix.Type.Cell
-  tupleDims = simpl.VectorSizeT([5,4,3])
+  tupleDims = simpl.Dims([5,4,3])
   amName = "CellAttributeMatrix"
   am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index b2f9f4cb58..690b332cc1 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -45,12 +45,12 @@ def ImageReadTest():
     dca.addOrReplaceDataContainer(dc)
 
     # Create an AttributeMatrix and add it to the DataContainer
-    amShape = simpl.VectorSizeT([shape[1], shape[0], 1])
+    amShape = simpl.Dims([shape[1], shape[0], 1])
     cellAm = sc.CreateAttributeMatrix(amShape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
-    cDims = simpl.VectorSizeT([1])
+    cDims = simpl.Dims([1])
     name = "slice_11.tiff"
     array = simpl.UInt8ArrayType(z_flat, cDims, name, False)
     cellAm.addOrReplaceAttributeArray(array)

From 3ff7f5db81626d977a1a3882558fab3244d2857e Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Thu, 27 Jun 2019 11:31:18 -0400
Subject: [PATCH 130/397] Fixed AbstractIOFileWidget preflighting twice (#368)

---
 .../FilterParameterWidgets/AbstractIOFileWidget.cpp          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 97afcb1dd7..981a0c833d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -228,9 +228,12 @@ void AbstractIOFileWidget::on_m_LineEdit_editingFinished()
   }
 
   QtSFileUtils::VerifyPathExists(path, m_LineEdit);
+  if(m_LineEdit->text() != m_CurrentText)
+  {
+    emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  }
   m_CurrentText = m_LineEdit->text();
   setValidFilePath(m_LineEdit->text());
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------

From 40f1be7c0a770913c546c9aea6416f0084378195 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Jul 2019 13:20:42 -0400
Subject: [PATCH 131/397] Fix python runtime issues due to DataArray API
 Changes

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CodeScraper/PythonBindingsModule.cpp       | 18 ++++++++++--------
 .../Templates/SIMPLModuleCodeTemplate.in.cpp   |  2 ++
 Wrapping/Python/SIMPL/simpl_helpers.py         |  2 +-
 Wrapping/Python/Testing/AttributeMatrixTest.py |  2 +-
 .../Convert_Attribute_Array_Data_Type.py       |  2 +-
 Wrapping/Python/Testing/DataArrayTest.py       |  4 ++--
 .../Python/Testing/DataContainerArrayTest.py   |  2 +-
 Wrapping/Python/Testing/DataContainerTest.py   |  2 +-
 Wrapping/Python/Testing/ImageReadTest.py       |  4 ++--
 9 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
index 472ca2a1a7..028bd19a15 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
@@ -392,18 +392,14 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
 
   out << QStringLiteral("\"\"\"") << "\n";
   out << "\n";
+  out  << "from .dream3d import simpl\n";
+
   QString shortLibName = m_LibName;
   shortLibName.replace("_py", "");
-
-  if(isSIMPLib.compare("TRUE") == 0)
+  if(isSIMPLib != "TRUE")
   {
-    shortLibName = QString("simpl");
+    out  << "from .dream3d import " << shortLibName << "\n\n\n";
   }
-  out
-      //<< "import dream3d\n"
-      << "from .dream3d import simpl\n"
-      << "from .dream3d import " << shortLibName << "\n"
-      << "\n";
 
   iter.toFront();
   while(iter.hasNext())
@@ -425,7 +421,13 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
     {
       docCodes = pythonicCodes[2];
     }
+    
+    if(shortLibName == "dream3d")
+    {
+      shortLibName = "simpl";
+    }
     bodyCodes = bodyCodes.replace("@shortLibName@", shortLibName);
+    
     if(aClass.compare("AbstractFilter") == 0 && isSIMPLib.compare("FALSE") == 0)
     {
       continue;
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index a7b7c8df90..8a12a38c14 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -263,6 +263,7 @@ PYBIND11_MODULE(dream3d, m)
       }))
   ;
 
+#if 0
   // Handle QVector of size_t
   py::class_<std::vector<size_t>>(mod, "Dims")
 	  .def(py::init<>([](py::list dimensions) {
@@ -293,6 +294,7 @@ PYBIND11_MODULE(dream3d, m)
 		  return dims[key];
 	  })
   ;
+#endif
 
   // Handle QSet of QString
   py::class_<QSet<QString>>(mod, "StringSet")
diff --git a/Wrapping/Python/SIMPL/simpl_helpers.py b/Wrapping/Python/SIMPL/simpl_helpers.py
index 9311ffff45..698892e7f3 100644
--- a/Wrapping/Python/SIMPL/simpl_helpers.py
+++ b/Wrapping/Python/SIMPL/simpl_helpers.py
@@ -132,7 +132,7 @@ def ConvertToDataArray(name, array, componentDimensions = 1):
     # Get shape
     shape = array.shape
     # Determine cDims
-    cDims = simpl.Dims([componentDimensions])  # Default is 1
+    cDims = simpl.VectorSizeT([componentDimensions])  # Default is 1
 
     # Determine type
     type = array.dtype
diff --git a/Wrapping/Python/Testing/AttributeMatrixTest.py b/Wrapping/Python/Testing/AttributeMatrixTest.py
index 7611e8b15e..72dc8b2ed6 100644
--- a/Wrapping/Python/Testing/AttributeMatrixTest.py
+++ b/Wrapping/Python/Testing/AttributeMatrixTest.py
@@ -9,7 +9,7 @@
 def AttributeMatrixTest():
     # Create an AttributeMatrix
     amType = simpl.AttributeMatrix.Type.Cell
-    tupleDims = simpl.Dims([5, 4, 3])
+    tupleDims = simpl.VectorSizeT([5,4,3])
     amName = "CellAttributeMatrix"
     am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
diff --git a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
index 19be884c58..678be58bc8 100644
--- a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
+++ b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
@@ -18,7 +18,7 @@ def convert_data_test():
     dc = sc.CreateDataContainer("ImageDataContainer")
     dca.addOrReplaceDataContainer(dc)
  
-    shape = simpl.Dims([4, 5, 2])
+    shape = simpl.VectorSizeT([4, 5, 2])
     cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)   
     
diff --git a/Wrapping/Python/Testing/DataArrayTest.py b/Wrapping/Python/Testing/DataArrayTest.py
index adc0635254..59eaf8b748 100644
--- a/Wrapping/Python/Testing/DataArrayTest.py
+++ b/Wrapping/Python/Testing/DataArrayTest.py
@@ -24,12 +24,12 @@ def DataArrayTest():
     dc = sc.CreateDataContainer("ImageDataContainer")
     dca.addOrReplaceDataContainer(dc)
 
-    shape = simpl.Dims([4, 5, 2])
+    shape = simpl.VectorSizeT([4, 5, 2])
     cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
     shape = [4,5,2]
     # Create the Component Dimensions for the Array, 1 Component in this case
-    cDims = simpl.Dims([1])
+    cDims = simpl.VectorSizeT([1])
 
     arrayTypes = [np.int8, np.uint8, np.int16, np.uint16, np.int32, np.uint32, np.int64, np.uint64, np.float32, np.double]
     # We store each return numpy array in order to keep it in scope. If we let it
diff --git a/Wrapping/Python/Testing/DataContainerArrayTest.py b/Wrapping/Python/Testing/DataContainerArrayTest.py
index d11785728e..3d1c305fa9 100644
--- a/Wrapping/Python/Testing/DataContainerArrayTest.py
+++ b/Wrapping/Python/Testing/DataContainerArrayTest.py
@@ -32,7 +32,7 @@ def AttributeMatrixAccessTest():
     dca.addOrReplaceDataContainer(dc)
     
     amType = simpl.AttributeMatrix.Type.Cell
-    tupleDims = simpl.Dims([5,4,3])
+    tupleDims = simpl.VectorSizeT([5,4,3])
     am = simpl.AttributeMatrix.New(tupleDims, "CellAttributeMatrix", amType)
     dc.addOrReplaceAttributeMatrix(am)
 
diff --git a/Wrapping/Python/Testing/DataContainerTest.py b/Wrapping/Python/Testing/DataContainerTest.py
index 1a987cf8ca..ff812c1d83 100644
--- a/Wrapping/Python/Testing/DataContainerTest.py
+++ b/Wrapping/Python/Testing/DataContainerTest.py
@@ -29,7 +29,7 @@ def DataContainerTest() :
   assert dc.Name == "ImageDataContainer"
   
   amType = simpl.AttributeMatrix.Type.Cell
-  tupleDims = simpl.Dims([5,4,3])
+  tupleDims = simpl.VectorSizeT([5,4,3])
   amName = "CellAttributeMatrix"
   am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index 690b332cc1..b2f9f4cb58 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -45,12 +45,12 @@ def ImageReadTest():
     dca.addOrReplaceDataContainer(dc)
 
     # Create an AttributeMatrix and add it to the DataContainer
-    amShape = simpl.Dims([shape[1], shape[0], 1])
+    amShape = simpl.VectorSizeT([shape[1], shape[0], 1])
     cellAm = sc.CreateAttributeMatrix(amShape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
-    cDims = simpl.Dims([1])
+    cDims = simpl.VectorSizeT([1])
     name = "slice_11.tiff"
     array = simpl.UInt8ArrayType(z_flat, cDims, name, False)
     cellAm.addOrReplaceAttributeArray(array)

From eda670c582622f65c03f8a315da7c814c6ccea8c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 2 Jul 2019 10:13:45 -0400
Subject: [PATCH 132/397] Fix issue where DataArrays were allocated when not
 needed.

This was due to an API call not being updated explicitly enough.
Also replace a std::for_each() with a range based loop instead as compilers have a hard time
optimizing std::for_each that use lambdas.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.hpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 5c34112bcd..01a622f7a4 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -202,7 +202,7 @@ template <typename T> class DataArray : public IDataArray
     {
       cDims[i] = dims[i];
     }
-    auto d = new DataArray<T>(numTuples, name, cDims, allocate);
+    auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
     if(allocate)
     {
       if(d->allocate() < 0)
@@ -230,7 +230,7 @@ template <typename T> class DataArray : public IDataArray
     {
       return NullPointer();
     }
-    DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, allocate);
+    DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
     if(allocate)
     {
       if(d->allocate() < 0)
@@ -262,7 +262,7 @@ template <typename T> class DataArray : public IDataArray
 
     size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), 1, std::multiplies<>());
 
-    auto d = new DataArray<T>(numTuples, name, compDims, allocate);
+    auto d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
     if(allocate)
     {
       if(d->allocate() < 0)
@@ -699,7 +699,10 @@ template <typename T> class DataArray : public IDataArray
     {
       return;
     }
-    std::for_each(begin() + offset, end(), [=](T& n) { n = initValue; });
+    for(size_t i = offset; i < m_Size; i++)
+    {
+      m_Array[i] = initValue;
+    }
   }
 
   /**
@@ -1871,7 +1874,10 @@ template <typename T> class DataArray : public IDataArray
   void assign(size_type n, const value_type& val) // fill (2)
   {
     resizeAndExtend(n);
-    std::for_each(begin(), end(), [=](T& n) { n = val; });
+    for(size_t i = 0; i < n; i++)
+    {
+      m_Array[i] = val;
+    }
   }
 
   /**

From 3412dde39649212044834dadd54e2258158e89e8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 3 Jul 2019 11:02:06 -0400
Subject: [PATCH 133/397] Update DataArray API to require the allocation
 parameter

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.hpp    | 287 +++++++++++----------
 Source/SIMPLib/DataArrays/NeighborList.hpp |  10 +-
 Source/SIMPLib/DataArrays/StructArray.hpp  |   7 +-
 3 files changed, 160 insertions(+), 144 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 01a622f7a4..8527baa79d 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -95,8 +95,8 @@ template <typename T> class DataArray : public IDataArray
    */
   DataArray(size_t numTuples, const QString& name, T initValue)
   : IDataArray(name)
+  , m_InitValue(initValue)
   {
-    m_NumComponents = 1;
     resizeTuples(numTuples);
   }
 
@@ -161,7 +161,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true)
+  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate)
   {
     if(name.isEmpty())
     {
@@ -191,7 +191,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
   {
     if(name.isEmpty())
     {
@@ -224,7 +224,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate = true)
+  static Pointer CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate)
   {
     if(name.isEmpty())
     {
@@ -253,7 +253,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate = true)
+  static Pointer CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate)
   {
     if(name.isEmpty())
     {
@@ -286,7 +286,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate = true) override
+  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) override
   {
     IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
     return p;
@@ -300,83 +300,116 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate = true) override
+  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) override
   {
     IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
     return p;
   }
 
-  //========================================= Begin API =================================
   /**
-   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-   * can be a primitive like char, float, int or the name of a class.
-   * @return
+   * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
+   * contained in the vector. The number of components will be set to 1.
+   * @param vec The vector to copy the data from
+   * @param name The name of the array
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override
+  static Pointer FromQVector(QVector<T>& vec, const QString& name)
   {
-    T value = static_cast<T>(0x00);
-    xdmfTypeName = "UNKNOWN";
-    precision = 0;
-    if(typeid(value) == typeid(int8_t))
-    {
-      xdmfTypeName = "Char";
-      precision = 1;
-    }
-    if(typeid(value) == typeid(uint8_t))
-    {
-      xdmfTypeName = "UChar";
-      precision = 1;
-    }
 
-    if(typeid(value) == typeid(int16_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 2;
-    }
-    if(typeid(value) == typeid(uint16_t))
+    Pointer p = CreateArray(vec.size(), name, true);
+    if(nullptr != p.get())
     {
-      xdmfTypeName = "UInt";
-      precision = 2;
+      std::memcpy(p->getPointer(0), vec.data(), vec.size() * sizeof(T));
     }
+    return p;
+  }
 
-    if(typeid(value) == typeid(int32_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 4;
-    }
-    if(typeid(value) == typeid(uint32_t))
+  /**
+   * @brief Static Method to create a DataArray from a std::vector through a deep copy of the data
+   * contained in the vector. The number of components will be set to 1.
+   * @param vec The vector to copy the data from
+   * @param name The name of the array
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  static Pointer FromStdVector(std::vector<T>& vec, const QString& name)
+  {
+    comp_dims_type cDims = {1};
+    Pointer p = CreateArray(vec.size(), cDims, name, true);
+    if(nullptr != p.get())
     {
-      xdmfTypeName = "UInt";
-      precision = 4;
+      std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
     }
+    return p;
+  }
 
-    if(typeid(value) == typeid(int64_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 8;
-    }
-    if(typeid(value) == typeid(uint64_t))
+  /**
+   * @brief FromPointer Creates a DataArray<T> object with a <b>DEEP COPY</b> of the data
+   * @param data
+   * @param size
+   * @param name
+   * @return
+   */
+  static Pointer CopyFromPointer(T* data, size_t size, const QString& name)
+  {
+    Pointer p = CreateArray(size, name, true);
+    if(nullptr != p.get())
     {
-      xdmfTypeName = "UInt";
-      precision = 8;
+      std::memcpy(p->getPointer(0), data, size * sizeof(T));
     }
+    return p;
+  }
 
-    if(typeid(value) == typeid(float))
+  /**
+   * @brief WrapPointer Creates a DataArray<T> object that references the pointer. The original caller can
+   * set if the memory should be "free()'ed" when the object goes away. The original memory MUST have been
+   * "alloc()'ed" and <b>NOT</b> new 'ed.
+   * @param data
+   * @param numTuples
+   * @param cDims
+   * @param name
+   * @param ownsData
+   * @return
+   */
+  static Pointer WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
+  {
+    // Allocate on the heap
+    auto d = new DataArray(numTuples, name, compDims, static_cast<T>(0), false);
+    // Wrap that heap pointer with a shared_pointer to make it reference counted
+    Pointer p(d);
+
+    p->m_Array = data;        // Now set the internal array to the raw pointer
+    p->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
+    if(nullptr != data)
     {
-      xdmfTypeName = "Float";
-      precision = 4;
+      p->m_IsAllocated = true;
     }
-    if(typeid(value) == typeid(double))
+
+    return p;
+  }
+
+  //========================================= Begin API =================================
+
+  /**
+   * @brief deepCopy
+   * @param forceNoAllocate
+   * @return
+   */
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
+  {
+    bool allocate = m_IsAllocated;
+    if(forceNoAllocate)
     {
-      xdmfTypeName = "Float";
-      precision = 8;
+      allocate = false;
     }
-
-    if(typeid(value) == typeid(bool))
+    IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
+    if(m_IsAllocated && !forceNoAllocate)
     {
-      xdmfTypeName = "uchar";
-      precision = 1;
+      T* src = getPointer(0);
+      void* dest = daCopy->getVoidPointer(0);
+      size_t totalBytes = (getNumberOfTuples() * getNumberOfComponents() * sizeof(T));
+      std::memcpy(dest, src, totalBytes);
     }
+    return daCopy;
   }
 
   /**
@@ -442,86 +475,76 @@ template <typename T> class DataArray : public IDataArray
   }
 
   /**
-   * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
-   * contained in the vector. The number of components will be set to 1.
-   * @param vec The vector to copy the data from
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
    */
-  static Pointer FromQVector(QVector<T>& vec, const QString& name, bool allocate = true)
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override
   {
-
-    Pointer p = CreateArray(vec.size(), name, allocate);
-    if(nullptr != p.get())
+    T value = static_cast<T>(0x00);
+    xdmfTypeName = "UNKNOWN";
+    precision = 0;
+    if(typeid(value) == typeid(int8_t))
     {
-      std::memcpy(p->getPointer(0), vec.data(), vec.size() * sizeof(T));
+      xdmfTypeName = "Char";
+      precision = 1;
+    }
+    if(typeid(value) == typeid(uint8_t))
+    {
+      xdmfTypeName = "UChar";
+      precision = 1;
     }
-    return p;
-  }
 
-  /**
-   * @brief Static Method to create a DataArray from a std::vector through a deep copy of the data
-   * contained in the vector. The number of components will be set to 1.
-   * @param vec The vector to copy the data from
-   * @param name The name of the array
-   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-   */
-  static Pointer FromStdVector(std::vector<T>& vec, const QString& name, bool allocate = true)
-  {
-    comp_dims_type cDims(1, 1);
-    Pointer p = CreateArray(vec.size(), cDims, name, allocate);
-    if(nullptr != p.get())
+    if(typeid(value) == typeid(int16_t))
     {
-      std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
+      xdmfTypeName = "Int";
+      precision = 2;
+    }
+    if(typeid(value) == typeid(uint16_t))
+    {
+      xdmfTypeName = "UInt";
+      precision = 2;
     }
-    return p;
-  }
 
-  /**
-   * @brief FromPointer Creates a DataArray<T> object with a <b>DEEP COPY</b> of the data
-   * @param data
-   * @param size
-   * @param name
-   * @return
-   */
-  static Pointer CopyFromPointer(T* data, size_t size, const QString& name, bool allocate = true)
-  {
-    Pointer p = CreateArray(size, name, allocate);
-    if(nullptr != p.get())
+    if(typeid(value) == typeid(int32_t))
     {
-      std::memcpy(p->getPointer(0), data, size * sizeof(T));
+      xdmfTypeName = "Int";
+      precision = 4;
+    }
+    if(typeid(value) == typeid(uint32_t))
+    {
+      xdmfTypeName = "UInt";
+      precision = 4;
     }
-    return p;
-  }
 
-  /**
-   * @brief WrapPointer Creates a DataArray<T> object that references the pointer. The original caller can
-   * set if the memory should be "free()'ed" when the object goes away. The original memory MUST have been
-   * "alloc()'ed" and <b>NOT</b> new 'ed.
-   * @param data
-   * @param numTuples
-   * @param cDims
-   * @param name
-   * @param ownsData
-   * @return
-   */
-  static Pointer WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
-  {
-    // Allocate on the heap
-    auto d = new DataArray(numTuples, name, compDims, false);
-    // Wrap that heap pointer with a shared_pointer to make it reference counted
-    Pointer p(d);
+    if(typeid(value) == typeid(int64_t))
+    {
+      xdmfTypeName = "Int";
+      precision = 8;
+    }
+    if(typeid(value) == typeid(uint64_t))
+    {
+      xdmfTypeName = "UInt";
+      precision = 8;
+    }
 
-    p->m_Array = data;        // Now set the internal array to the raw pointer
-    p->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
-    if(nullptr != data)
+    if(typeid(value) == typeid(float))
     {
-      p->m_IsAllocated = true;
+      xdmfTypeName = "Float";
+      precision = 4;
+    }
+    if(typeid(value) == typeid(double))
+    {
+      xdmfTypeName = "Float";
+      precision = 8;
     }
 
-    return p;
+    if(typeid(value) == typeid(bool))
+    {
+      xdmfTypeName = "uchar";
+      precision = 1;
+    }
   }
-
   // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
   // This is required so that other classes can call this version of copyData from the subclasses.
   using IDataArray::copyFromArray;
@@ -1311,24 +1334,6 @@ template <typename T> class DataArray : public IDataArray
     return "UnknownType";
   }
 
-  /**
-   * @brief deepCopy
-   * @param forceNoAllocate
-   * @return
-   */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
-  {
-    IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), m_IsAllocated);
-    if(m_IsAllocated && !forceNoAllocate)
-    {
-      T* src = getPointer(0);
-      void* dest = daCopy->getVoidPointer(0);
-      size_t totalBytes = (getNumberOfTuples() * getNumberOfComponents() * sizeof(T));
-      std::memcpy(dest, src, totalBytes);
-    }
-    return daCopy;
-  }
-
   /**
    *
    * @param parentId
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index a67fbbaf2f..8c7e54059f 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -554,9 +554,15 @@ class NeighborList : public IDataArray
      */
     IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
     {
-      typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), m_IsAllocated);
+      bool allocate = m_IsAllocated;
+      if(forceNoAllocate)
+      {
+        allocate = false;
+      }
+
+      typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), allocate);
 
-      if(!forceNoAllocate)
+      if(m_IsAllocated && !forceNoAllocate)
       {
         size_t count = (m_IsAllocated ? getNumberOfTuples(): 0);
         for(size_t i = 0; i < count; i++)
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 7d9414e567..84d3d14721 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -570,7 +570,12 @@ class StructArray : public IDataArray
 
     IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
     {
-      IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), m_IsAllocated);
+      bool allocate = m_IsAllocated;
+      if(forceNoAllocate)
+      {
+        allocate = false;
+      }
+      IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
       if(m_IsAllocated && !forceNoAllocate)
       {
         T* src = getPointer(0);

From b0ae871b14b24277bda91dbbb2a77b0f4688b7ee Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 3 Jul 2019 15:45:02 -0400
Subject: [PATCH 134/397] Update DataArray API constructors to decrease the
 chance of ambigious overloads

With the recently introduced API changes there were instances where a boolean parameter that was
to signal whether or not to allocate data was instead used as the init value for the
data array. The API has been updated to force the developer to supply all the arguments
when constructing the DataArray<T> object

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  4 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    | 22 ++++----
 .../CopyFeatureArrayToElementArray.cpp        |  2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  2 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  4 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  2 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |  2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |  4 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       | 10 ++--
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |  2 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |  2 +-
 .../Testing/Cxx/ConvertDataTest.cpp           | 24 ++++----
 .../CopyFeatureArrayToElementArrayTest.cpp    |  6 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |  4 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |  4 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp | 10 ++--
 .../Testing/Cxx/CreateGeometryTest.cpp        | 10 ++--
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |  4 +-
 .../Testing/Cxx/DataContainerTest.cpp         | 22 ++++----
 ...ExtractAttributeArraysFromGeometryTest.cpp |  8 +--
 .../Cxx/ExtractComponentAsArrayTest.cpp       |  2 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |  8 +--
 .../Testing/Cxx/FindDerivativesFilterTest.cpp | 28 +++++-----
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |  2 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |  2 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |  4 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |  4 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       | 18 ++++--
 .../Testing/Cxx/RemoveArraysTest.cpp          |  2 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  | 12 ++--
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |  4 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |  4 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |  4 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   | 26 ++++-----
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |  4 +-
 .../SIMPLib/CoreFilters/util/BinaryOperator.h |  5 +-
 .../CoreFilters/util/CalculatorOperator.h     |  5 +-
 .../CoreFilters/util/NegativeOperator.cpp     |  3 +-
 .../SIMPLib/CoreFilters/util/UnaryOperator.h  |  7 +--
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  2 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |  5 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |  6 --
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  | 35 ++++++------
 .../Testing/Cxx/StringDataArrayTest.cpp       |  2 +-
 .../Testing/Cxx/StructArrayTest.cpp           |  2 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  2 +-
 .../Testing/Cxx/DataContainerBundleTest.cpp   |  2 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |  4 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |  4 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |  2 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  2 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |  6 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |  2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |  8 +--
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |  6 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |  4 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |  4 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp   | 56 ++++++++-----------
 .../HDF5/H5PrimaryStatsDataDelegate.cpp       | 54 +++++++-----------
 .../H5TransformationStatsDataDelegate.cpp     | 42 +++++++-------
 .../StatsData/PrecipitateStatsData.cpp        |  2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp |  2 +-
 Source/SIMPLib/StatsData/StatsData.cpp        | 18 +++---
 .../Testing/Cxx/StatsDataJsonRWTest.cpp       | 20 +++----
 .../StatsData/TransformationStatsData.cpp     |  2 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.h       |  2 +-
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |  2 +-
 67 files changed, 283 insertions(+), 307 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 31f3c93700..2ef86974bc 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -502,7 +502,7 @@ template<typename T> IDataArray::Pointer convertArray(const DoubleArrayType::Poi
 
   double* rawInputarray = inputArray->getPointer(0);
 
-  typename DataArray<T>::Pointer convertedArrayPtr = DataArray<T>::CreateArray(inputArray->getNumberOfTuples(), inputArray->getComponentDimensions(), inputArray->getName());
+  typename DataArray<T>::Pointer convertedArrayPtr = DataArray<T>::CreateArray(inputArray->getNumberOfTuples(), inputArray->getComponentDimensions(), inputArray->getName(), true);
   T* rawOutputArray = convertedArrayPtr->getPointer(0);
 
   int count = inputArray->getSize();
@@ -804,7 +804,7 @@ void ArrayCalculator::parseMinusSign(QString token, QVector<CalculatorItem::Poin
 void ArrayCalculator::parseNumericValue(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, double number)
 {
   // This is a number, so create an array with numOfTuples equal to 1 and set the value into it
-  DoubleArrayType::Pointer ptr = DoubleArrayType::CreateArray(1, std::vector<size_t>(1, 1), "INTERNAL_USE_ONLY_NumberArray");
+  DoubleArrayType::Pointer ptr = DoubleArrayType::CreateArray(1, std::vector<size_t>(1, 1), "INTERNAL_USE_ONLY_NumberArray", true);
   ptr->setValue(0, number);
   CalculatorItem::Pointer itemPtr = CalculatorArray<double>::New(ptr, ICalculatorArray::Number, !getInPreflight());
   parsedInfix.push_back(itemPtr);
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 1b4786248a..254a665cd5 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -77,7 +77,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
 
   if(scalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    Int8ArrayType::Pointer p = Int8ArrayType::CreateArray(voxels, dims, name);
+    Int8ArrayType::Pointer p = Int8ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -86,7 +86,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    UInt8ArrayType::Pointer p = UInt8ArrayType::CreateArray(voxels, dims, name);
+    UInt8ArrayType::Pointer p = UInt8ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -95,7 +95,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    Int16ArrayType::Pointer p = Int16ArrayType::CreateArray(voxels, dims, name);
+    Int16ArrayType::Pointer p = Int16ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -104,7 +104,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    UInt16ArrayType::Pointer p = UInt16ArrayType::CreateArray(voxels, dims, name);
+    UInt16ArrayType::Pointer p = UInt16ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -113,7 +113,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    Int32ArrayType::Pointer p = Int32ArrayType::CreateArray(voxels, dims, name);
+    Int32ArrayType::Pointer p = Int32ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -122,7 +122,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    UInt32ArrayType::Pointer p = UInt32ArrayType::CreateArray(voxels, dims, name);
+    UInt32ArrayType::Pointer p = UInt32ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -131,7 +131,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    Int64ArrayType::Pointer p = Int64ArrayType::CreateArray(voxels, dims, name);
+    Int64ArrayType::Pointer p = Int64ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -140,7 +140,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    UInt64ArrayType::Pointer p = UInt64ArrayType::CreateArray(voxels, dims, name);
+    UInt64ArrayType::Pointer p = UInt64ArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -149,7 +149,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Float)
   {
-    FloatArrayType::Pointer p = FloatArrayType::CreateArray(voxels, dims, name);
+    FloatArrayType::Pointer p = FloatArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -158,7 +158,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Double)
   {
-    DoubleArrayType::Pointer p = DoubleArrayType::CreateArray(voxels, dims, name);
+    DoubleArrayType::Pointer p = DoubleArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
@@ -167,7 +167,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
   }
   else if(scalarType == SIMPL::NumericTypes::Type::Bool)
   {
-    BoolArrayType::Pointer p = BoolArrayType::CreateArray(voxels, dims, name);
+    BoolArrayType::Pointer p = BoolArrayType::CreateArray(voxels, dims, name, true);
     m->getAttributeMatrix(attributeMatrixName)->insertOrAssign(p);
     for(size_t v = 0; v < size; ++v)
     {
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index f66b406d96..2097519d80 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -171,7 +171,7 @@ template <typename T> IDataArray::Pointer copyData(IDataArray::Pointer inputData
   }
 
   std::vector<size_t> cDims = inputData->getComponentDimensions();
-  typename DataArray<T>::Pointer cell = DataArray<T>::CreateArray(totalPoints, cDims, cellArrayName);
+  typename DataArray<T>::Pointer cell = DataArray<T>::CreateArray(totalPoints, cDims, cellArrayName, true);
 
   T* fPtr = feature->getPointer(0);
   T* cPtr = cell->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index eacdfb4f4f..6d99d7f133 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -172,7 +172,7 @@ template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, I
   }
 
   std::vector<size_t> dims = inputData->getComponentDimensions();
-  typename DataArray<T>::Pointer feature = DataArray<T>::CreateArray(features, dims, createdArrayName);
+  typename DataArray<T>::Pointer feature = DataArray<T>::CreateArray(features, dims, createdArrayName, true);
 
   T* fPtr = feature->getPointer(0);
   T* cPtr = cell->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 69ed6b39df..2c9fd81ad3 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -169,7 +169,7 @@ template <typename DataType> void findDerivs(IDataArray::Pointer inDataPtr, Doub
 {
   typename DataArray<DataType>::Pointer inputDataPtr = std::dynamic_pointer_cast<DataArray<DataType>>(inDataPtr);
   IGeometry::Pointer geom = m->getGeometry();
-  DoubleArrayType::Pointer dblInArray = DoubleArrayType::CreateArray(inputDataPtr->getNumberOfTuples(), inputDataPtr->getComponentDimensions(), "FIND_DERIVS_INTERNAL_USE_ONLY");
+  DoubleArrayType::Pointer dblInArray = DoubleArrayType::CreateArray(inputDataPtr->getNumberOfTuples(), inputDataPtr->getComponentDimensions(), "FIND_DERIVS_INTERNAL_USE_ONLY", true);
 
   size_t size = inputDataPtr->getSize();
 
@@ -408,7 +408,7 @@ void FindDerivatives::execute()
   if(m_Interpolate)
   {
     DoubleArrayType::Pointer interpolatedValues =
-        DoubleArrayType::CreateArray(m_InArrayPtr.lock()->getNumberOfTuples(), m_InArrayPtr.lock()->getComponentDimensions(), "FIND_DERIVATIVES_INTERNAL_USE_ONLY");
+        DoubleArrayType::CreateArray(m_InArrayPtr.lock()->getNumberOfTuples(), m_InArrayPtr.lock()->getComponentDimensions(), "FIND_DERIVATIVES_INTERNAL_USE_ONLY", true);
     EXECUTE_FUNCTION_TEMPLATE(this, interpolateCellValues, m_InArrayPtr.lock(), m_InArrayPtr.lock(), interpolatedValues, m)
 
     geom->findDerivatives(interpolatedValues, m_DerivativesArrayPtr.lock(), this);
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 3fa56dd922..f6f9bc47c5 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -55,7 +55,7 @@ IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const
   herr_t err = -1;
   IDataArray::Pointer ptr;
 
-  ptr = DataArray<T>::CreateArray(numOfTuples, cDims, datasetPath);
+  ptr = DataArray<T>::CreateArray(numOfTuples, cDims, datasetPath, true);
 
   T* data = (T*)(ptr->getVoidPointer(0));
   err = QH5Lite::readPointerDataset(locId, datasetPath, data);
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 2abbbc10e9..e943d2ca68 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -223,7 +223,7 @@ void MultiThresholdObjects::execute()
   {
     // Get the total number of tuples, create and initialize an array to use for these results
     int64_t totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-    BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP");
+    BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
 
     // Loop on the remaining Comparison objects updating our final result array as we go
     for(int32_t i = 1; i < m_SelectedThresholds.size(); ++i)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index e256856709..8a94dcc47e 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -265,7 +265,7 @@ void MultiThresholdObjects2::createBoolArray(int64_t& totalTuples, BoolArrayType
 
   // Get the total number of tuples, create and initialize an array to use for these results
   totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-  thresholdArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP");
+  thresholdArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
 
   // Initialize the array to false
   thresholdArrayPtr->initializeWithZeros();
@@ -394,7 +394,7 @@ void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonV
 
   // Get the total number of tuples, create and initialize an array to use for these results
   int64_t totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-  BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP");
+  BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
 
   // Initialize the array to false
   currentArrayPtr->initializeWithZeros();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 8483d9b595..584f0eb6f9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -89,14 +89,14 @@ class ArrayCalculatorTest
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(std::vector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Cell);
     AttributeMatrix::Pointer am2 = AttributeMatrix::New(std::vector<size_t>(1, 1), "NumericMatrix", AttributeMatrix::Type::Cell);
-    FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, "InputArray1");
+    FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, "InputArray1", true);
     array1->initializeWithValue(-12);
-    UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, "InputArray2");
+    UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, "InputArray2", true);
     array2->initializeWithValue(10);
-    UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, "Spaced Array");
+    UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, "Spaced Array", true);
     sArray->initializeWithValue(2);
 
-    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array1");
+    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array1", true);
     int num = 0;
     for(int i = 0; i < mcArray1->getNumberOfTuples() * mcArray1->getNumberOfComponents(); i++)
     {
@@ -104,7 +104,7 @@ class ArrayCalculatorTest
       num++;
     }
 
-    UInt32ArrayType::Pointer mcArray2 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array2");
+    UInt32ArrayType::Pointer mcArray2 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array2", true);
     num = 0;
     for(int i = 0; i < mcArray2->getNumberOfTuples() * mcArray2->getNumberOfComponents(); i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index c31124e94c..322ae029c9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -189,7 +189,7 @@ class ConditionalSetValueTest
 
     // this is the conditional array
     QString name = "ConditionalArray";
-    BoolArrayType::Pointer condArrayPtr = BoolArrayType::CreateArray(tDims, cDims, name);
+    BoolArrayType::Pointer condArrayPtr = BoolArrayType::CreateArray(tDims, cDims, name, true);
     attrMat->insertOrAssign(condArrayPtr);
     condArrayPtr->initializeWithValue(true);
     // Set some of the values to false int he conditional array
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 8f88ba41f8..f9d5f5c4eb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -480,7 +480,7 @@ class ConvertColorToGrayScaleTest
     const std::vector<size_t> tDims{16};
     const std::vector<size_t> cDims{3, 1, 1};
 
-    DataArray<uint8_t>::Pointer testAA{DataArray<uint8_t>::CreateArray(tDims, cDims, aaName)};
+    DataArray<uint8_t>::Pointer testAA{DataArray<uint8_t>::CreateArray(tDims, cDims, aaName, true)};
     SetDataArrayTestValues(testAA);
 
     // NOTE: This filter has no geometry requirements
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index 8f3c7a13e7..a973ccb2bb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -79,40 +79,40 @@ class ConvertDataTest
     switch(dataType)
     {
     case SIMPL::NumericTypes::Type::Int8:
-      da = DataArray<int8_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<int8_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::UInt8:
-      da = DataArray<uint8_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<uint8_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Int16:
-      da = DataArray<int16_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<int16_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::UInt16:
-      da = DataArray<uint16_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<uint16_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Int32:
-      da = DataArray<int32_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<int32_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::UInt32:
-      da = DataArray<uint32_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<uint32_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Int64:
-      da = DataArray<int64_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<int64_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::UInt64:
-      da = DataArray<uint64_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<uint64_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Float:
-      da = DataArray<float>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<float>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Double:
-      da = DataArray<double>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<double>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::Bool:
-      da = DataArray<bool>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<bool>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::SizeT:
-      da = DataArray<size_t>::CreateArray(2, cdims, "DataArray");
+      da = DataArray<size_t>::CreateArray(2, cdims, "DataArray", true);
       break;
     case SIMPL::NumericTypes::Type::UnknownNumType:
       break;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index 901bfb9ab1..15f2e6e1a4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -84,7 +84,7 @@ class CopyFeatureArrayToElementArrayTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
     {
       da->setTuple(i, data[i]);
@@ -125,7 +125,7 @@ class CopyFeatureArrayToElementArrayTest
     dc->addOrReplaceAttributeMatrix(featureAM);
 
     // Create Cell FeatureIds array
-    typename DataArray<int32_t>::Pointer cellFeatureIds = DataArray<int32_t>::CreateArray(cellAM->getNumberOfTuples(), k_CellFeatureIdsArrayName);
+    typename DataArray<int32_t>::Pointer cellFeatureIds = DataArray<int32_t>::CreateArray(cellAM->getNumberOfTuples(), k_CellFeatureIdsArrayName, true);
     cellAM->insertOrAssign(cellFeatureIds);
 
     for(size_t y = 0; y < 3; y++)
@@ -138,7 +138,7 @@ class CopyFeatureArrayToElementArrayTest
     }
 
     //Create an array in teh Feature Attribute Matrix with 3 values since we created 3 features in the cell attribute matrix
-    typename DataArray<T>::Pointer avgTempValue = DataArray<T>::CreateArray(3, k_FeatureDataArrayName);
+    typename DataArray<T>::Pointer avgTempValue = DataArray<T>::CreateArray(3, k_FeatureDataArrayName, true);
     featureAM->insertOrAssign(avgTempValue);
     for(int i = 0; i < 3; i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index a9fa889dd8..548d80233a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -95,7 +95,7 @@ class CopyObjectTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
     {
       da->setTuple(i, data[i]);
@@ -109,7 +109,7 @@ class CopyObjectTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(size_t i = 0; i < da->getSize(); i++)
     {
       da->setValue(i, static_cast<T>(i));
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 58d4fdeadb..04a169015a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -362,8 +362,8 @@ class CreateAttributeMatrixTest
     std::vector<size_t> tDims = {10, 10};
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Test", AttributeMatrix::Type::Cell);
 
-    FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, "Float");
-    Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(100, "Int32");
+    FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, "Float", true);
+    Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(100, "Int32", true);
   }
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 284db626e9..3c4172803e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -96,7 +96,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
         size_t numTuples = featureIds->getNumberOfTuples();
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
@@ -123,7 +123,7 @@ class CreateFeatureArrayFromElementArrayTest
         featureIds->initializeTuple(14, &value);
         featureIds->initializeTuple(15, &value);
 
-        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, "CellData");
+        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, "CellData", true);
         numTuples = cellDataArray->getNumberOfTuples();
         for(size_t i = 0; i < numTuples; i++)
         {
@@ -186,7 +186,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
         size_t numTuples = featureIds->getNumberOfTuples();
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
@@ -214,7 +214,7 @@ class CreateFeatureArrayFromElementArrayTest
         featureIds->initializeTuple(15, &value);
 
         std::vector<size_t> cDims = std::vector<size_t>(1, 3);
-        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, cDims, "CellData");
+        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, cDims, "CellData", true);
         numTuples = cellDataArray->getNumberOfTuples();
         for(size_t i = 0; i < numTuples; i++)
         {
@@ -277,7 +277,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds");
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
         featureIds->initializeTuple(1, &value);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index 17149de6d6..aad7511a25 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -98,7 +98,7 @@ class CreateGeometryTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
     {
       da->setTuple(i, data[i]);
@@ -523,21 +523,21 @@ class CreateGeometryTest
 
     // Create Bounds Arrays
 
-    DataArray<float>::Pointer daXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_XBoundsDAName);
+    DataArray<float>::Pointer daXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_XBoundsDAName, true);
     for(size_t i = 0; i < daXBounds->getSize(); i++)
     {
       daXBounds->setValue(i, i);
     }
     boundsAM->insertOrAssign(daXBounds);
 
-    DataArray<float>::Pointer daYBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_YBoundsDAName);
+    DataArray<float>::Pointer daYBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_YBoundsDAName, true);
     for(size_t i = 0; i < daYBounds->getSize(); i++)
     {
       daYBounds->setValue(i, i);
     }
     boundsAM->insertOrAssign(daYBounds);
 
-    DataArray<float>::Pointer daZBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_ZBoundsDAName);
+    DataArray<float>::Pointer daZBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_ZBoundsDAName, true);
     for(size_t i = 0; i < daZBounds->getSize(); i++)
     {
       daZBounds->setValue(i, i);
@@ -546,7 +546,7 @@ class CreateGeometryTest
 
     // Create bad xBounds arrays
 
-    DataArray<float>::Pointer daBadXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_BadXBoundsDAName);
+    DataArray<float>::Pointer daBadXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, k_BadXBoundsDAName, true);
     for(size_t i = 0; i < daBadXBounds->getSize(); i++)
     {
       daBadXBounds->setValue(i, i);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index d6bd2f3771..a791f7b21b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -88,7 +88,7 @@ class CropVertexGeometryTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
     {
       da->setTuple(i, data[i]);
@@ -153,7 +153,7 @@ class CropVertexGeometryTest
 
     // Create extra DataArray to be copied
 
-    FloatArrayType::Pointer da = DataArray<float>::CreateArray(m_Dims4, m_Dims3, k_DataArray0Name);
+    FloatArrayType::Pointer da = DataArray<float>::CreateArray(m_Dims4, m_Dims3, k_DataArray0Name, true);
     for(int i = 0; i < da->getSize(); i++)
     {
       da->setValue(i, i + 0.5f);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index eb469ae621..e6fe97aa5d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -69,7 +69,7 @@
 #define helper(a, b) a##b
 
 #define MAKE_ARRAY(m_msgType, name)                                                                                                                                                                    \
-  IDataArray::Pointer m_msgType##Ptr = DataArray<m_msgType>::CreateArray(5, name);                                                                                                                     \
+  IDataArray::Pointer m_msgType##Ptr = DataArray<m_msgType>::CreateArray(5, name, true);                                                                                                               \
   dataContainer->addCellData(name, m_msgType##Ptr);
 
 #define TEST_DATA_CONTAINER(Type, DCType)                                                                                                                                                              \
@@ -194,7 +194,7 @@ class DataContainerTest
       }
     }
     name = name + "]";
-    typename DataArray<T>::Pointer foo = DataArray<T>::CreateArray(attrMat->getTupleDimensions(), compDims, "RENAME_ME");
+    typename DataArray<T>::Pointer foo = DataArray<T>::CreateArray(attrMat->getTupleDimensions(), compDims, "RENAME_ME", true);
     foo->setName(foo->getFullNameOfClass() + name);
     foo->initializeWithValue(static_cast<T>(1));
     attrMat->insertOrAssign(foo);
@@ -209,7 +209,7 @@ class DataContainerTest
   void CreateStringArray(AttributeMatrix::Pointer attrMat, std::vector<size_t> compDims)
   {
     QString name("ExampleStringDataArray");
-    StringDataArray::Pointer data = StringDataArray::CreateArray(attrMat->getNumberOfTuples(), name);
+    StringDataArray::Pointer data = StringDataArray::CreateArray(attrMat->getNumberOfTuples(), name, true);
     for(size_t i = 0; i < attrMat->getNumberOfTuples(); i++)
     {
       QString value = QString("string_%1").arg(i);
@@ -322,14 +322,14 @@ class DataContainerTest
     m->addOrReplaceAttributeMatrix(attrMatrix);
 
     int size = nx * ny * nz;
-    Int32ArrayType::Pointer featureIds = Int32ArrayType::CreateArray(size, SIMPL::CellData::FeatureIds);
+    Int32ArrayType::Pointer featureIds = Int32ArrayType::CreateArray(size, SIMPL::CellData::FeatureIds, true);
     for(int i = 0; i < size; ++i)
     {
       featureIds->setValue(i, i + DataContainerIOTest::Offset);
     }
     attrMatrix->insertOrAssign(featureIds);
 
-    BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(size, SIMPL::CellData::BoundaryCells);
+    BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(size, SIMPL::CellData::BoundaryCells, true);
     for(int i = 0; i < size; ++i)
     {
       boolArray->setValue(i, i + DataContainerIOTest::Offset);
@@ -337,7 +337,7 @@ class DataContainerTest
     attrMatrix->insertOrAssign(boolArray);
 
     std::vector<size_t> dims(1, 3);
-    FloatArrayType::Pointer avgEuler = FloatArrayType::CreateArray(size, dims, SIMPL::FeatureData::AxisEulerAngles);
+    FloatArrayType::Pointer avgEuler = FloatArrayType::CreateArray(size, dims, SIMPL::FeatureData::AxisEulerAngles, true);
     for(int32_t i = 0; i < size; ++i)
     {
       avgEuler->setComponent(i, 0, i * 0.665f);
@@ -351,7 +351,7 @@ class DataContainerTest
     AttributeMatrix::Pointer ensemAttrMat = AttributeMatrix::New(tupleDims, getCellEnsembleAttributeMatrixName(), AttributeMatrix::Type::CellEnsemble);
     m->addOrReplaceAttributeMatrix(ensemAttrMat);
 
-    FloatArrayType::Pointer surfArea = FloatArrayType::CreateArray(4, SIMPL::EnsembleData::TotalSurfaceAreas);
+    FloatArrayType::Pointer surfArea = FloatArrayType::CreateArray(4, SIMPL::EnsembleData::TotalSurfaceAreas, true);
     for(int i = 0; i < 4; ++i)
     {
       surfArea->setValue(i, i + 41.2f);
@@ -486,7 +486,7 @@ class DataContainerTest
     DREAM3D_REQUIRE_VALID_POINTER(attrMat.get())
 
     // Now create an Array and add it to the Attribute Matrix
-    typename T::Pointer p = T::CreateArray(5, "Test");
+    typename T::Pointer p = T::CreateArray(5, "Test", true);
 
     tDims[0] = 5;
     attrMat->resizeAttributeArrays(tDims);
@@ -1099,8 +1099,8 @@ class DataContainerTest
 
     const QString k_DC0("DCO");
     const QString k_DC1("DC1");
-    Int32ArrayType::Pointer am0 = Int32ArrayType::CreateArray(100, k_DC0);
-    Int32ArrayType::Pointer am1 = Int32ArrayType::CreateArray(100, k_DC1);
+    Int32ArrayType::Pointer am0 = Int32ArrayType::CreateArray(100, k_DC0, true);
+    Int32ArrayType::Pointer am1 = Int32ArrayType::CreateArray(100, k_DC1, true);
 
     result = am->addOrReplaceAttributeArray(am0);
     DREAM3D_REQUIRED(true, ==, result);
@@ -1154,7 +1154,7 @@ class DataContainerTest
     DREAM3D_REQUIRED(am->empty(), ==, true)
     for(int i = 0; i < 10; i++)
     {
-      Int32ArrayType::Pointer aa = Int32ArrayType::CreateArray(100, "Foo" + QString::number(i));
+      Int32ArrayType::Pointer aa = Int32ArrayType::CreateArray(100, "Foo" + QString::number(i), true);
       am->addOrReplaceAttributeArray(aa);
       //   std::cout << dca->size() << std::endl;
       DREAM3D_REQUIRED(am->size(), ==, i + 1)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 16ec03a6b7..2ae5053a77 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -94,7 +94,7 @@ class ExtractAttributeArraysFromGeometryTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<std::vector<T>>& data, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(int i = 0; i < da->getNumberOfTuples(); i++)
     {
       da->setTuple(i, data[i]);
@@ -143,19 +143,19 @@ class ExtractAttributeArraysFromGeometryTest
 
     // Create Geometry
 
-    DataArray<float>::Pointer daXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "X");
+    DataArray<float>::Pointer daXBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "X", true);
     for(size_t i = 0; i < daXBounds->getSize(); i++)
     {
       daXBounds->setValue(i, i);
     }
 
-    DataArray<float>::Pointer daYBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "Y");
+    DataArray<float>::Pointer daYBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "Y", true);
     for(size_t i = 0; i < daYBounds->getSize(); i++)
     {
       daYBounds->setValue(i, i);
     }
 
-    DataArray<float>::Pointer daZBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "Z");
+    DataArray<float>::Pointer daZBounds = DataArray<float>::CreateArray(m_Dims4, m_Dims1, "Z", true);
     for(size_t i = 0; i < daZBounds->getSize(); i++)
     {
       daZBounds->setValue(i, i);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 5efce8afdb..1dacc0199c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -73,7 +73,7 @@ class ExtractComponentAsArrayTest
 
     std::vector<size_t> cdims;
     cdims.push_back(2);
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(2, cdims, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(2, cdims, "DataArray", true);
     da->setComponent(0, 0, 1);
     da->setComponent(0, 1, 2);
     da->setComponent(1, 0, 3);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index ec20a7b413..d50f4dcc35 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -405,7 +405,7 @@ class FeatureDataCSVWriterTest
 
     // Create DataArrayInt (add in under checkFilter)
 
-    DataArray<int32_t>::Pointer da = DataArray<int32_t>::CreateArray(tupleDims, cDims, k_DataArrayIntName);
+    DataArray<int32_t>::Pointer da = DataArray<int32_t>::CreateArray(tupleDims, cDims, k_DataArrayIntName, true);
     for(size_t i = 0; i < da->getSize(); i++)
     {
       da->setValue(i, i);
@@ -414,7 +414,7 @@ class FeatureDataCSVWriterTest
 
     // Create DataArrayFloat
 
-    DataArray<float>::Pointer daFloat = DataArray<float>::CreateArray(tupleDims, cDimsFloat, k_DataArrayFloatName);
+    DataArray<float>::Pointer daFloat = DataArray<float>::CreateArray(tupleDims, cDimsFloat, k_DataArrayFloatName, true);
     for(size_t i = 0; i < daFloat->getSize(); i++)
     {
       if(i % 2 == 0)
@@ -430,7 +430,7 @@ class FeatureDataCSVWriterTest
 
     // Create NeighborLists (must be int32_t)
 
-    NeighborList<int32_t>::Pointer nl = NeighborList<int32_t>::CreateArray(tupleDims, cDimsNeighbor, k_NeighborListName);
+    NeighborList<int32_t>::Pointer nl = NeighborList<int32_t>::CreateArray(tupleDims, cDimsNeighbor, k_NeighborListName, true);
     for(size_t i = 0; i < nl->getNumberOfTuples(); i++)
     {
       nl->addEntry(i, i);
@@ -438,7 +438,7 @@ class FeatureDataCSVWriterTest
     }
     am->insertOrAssign(nl);
 
-    NeighborList<int32_t>::Pointer nl2 = NeighborList<int32_t>::CreateArray(tupleDims, cDimsNeighbor, k_NeighborListName2);
+    NeighborList<int32_t>::Pointer nl2 = NeighborList<int32_t>::CreateArray(tupleDims, cDimsNeighbor, k_NeighborListName2, true);
     for(size_t i = 0; i < nl2->getNumberOfTuples(); i++)
     {
       nl2->addEntry(i, i * 3);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 884b7519d0..120ccfa8ab 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -122,37 +122,37 @@ class FindDerivativesFilterTest
   {
     for(auto& am : m->getChildren())
     {
-      DoubleArrayType::Pointer dblArray = DoubleArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_D");
+      DoubleArrayType::Pointer dblArray = DoubleArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_D", true);
       dblArray->initializeWithValue(5);
       am->insertOrAssign(dblArray);
-      FloatArrayType::Pointer fltArray = FloatArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_F");
+      FloatArrayType::Pointer fltArray = FloatArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_F", true);
       fltArray->initializeWithValue(5);
       am->insertOrAssign(fltArray);
-      Int8ArrayType::Pointer int8Array = Int8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I8");
+      Int8ArrayType::Pointer int8Array = Int8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I8", true);
       int8Array->initializeWithValue(5);
       am->insertOrAssign(int8Array);
-      UInt8ArrayType::Pointer uint8Array = UInt8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI8");
+      UInt8ArrayType::Pointer uint8Array = UInt8ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI8", true);
       uint8Array->initializeWithValue(5);
       am->insertOrAssign(uint8Array);
-      Int16ArrayType::Pointer int16Array = Int16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I16");
+      Int16ArrayType::Pointer int16Array = Int16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I16", true);
       int16Array->initializeWithValue(5);
       am->insertOrAssign(int16Array);
-      UInt16ArrayType::Pointer uint16Array = UInt16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI16");
+      UInt16ArrayType::Pointer uint16Array = UInt16ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI16", true);
       uint16Array->initializeWithValue(5);
       am->insertOrAssign(uint16Array);
-      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I32");
+      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I32", true);
       int32Array->initializeWithValue(5);
       am->insertOrAssign(int32Array);
-      UInt32ArrayType::Pointer uint32Array = UInt32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI32");
+      UInt32ArrayType::Pointer uint32Array = UInt32ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI32", true);
       uint32Array->initializeWithValue(5);
       am->insertOrAssign(uint32Array);
-      Int64ArrayType::Pointer int64Array = Int64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I64");
+      Int64ArrayType::Pointer int64Array = Int64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_I64", true);
       int64Array->initializeWithValue(5);
       am->insertOrAssign(int64Array);
-      UInt64ArrayType::Pointer uint64Array = UInt64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI64");
+      UInt64ArrayType::Pointer uint64Array = UInt64ArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_UI64", true);
       uint64Array->initializeWithValue(5);
       am->insertOrAssign(uint64Array);
-      BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_BOOL");
+      BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(am->getTupleDimensions(), cDims, "TEST_BOOL", true);
       boolArray->initializeWithZeros();
       am->insertOrAssign(boolArray);
     }
@@ -204,9 +204,9 @@ class FindDerivativesFilterTest
     image->setOrigin(0.0f, 0.0f, 0.0f);
     image->setSpacing(1.0f, 1.0f, 1.0f);
     rectGrid->setDimensions(SizeVec3Type(10, 10, 10));
-    FloatArrayType::Pointer xBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::xBoundsList);
-    FloatArrayType::Pointer yBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::yBoundsList);
-    FloatArrayType::Pointer zBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::zBoundsList);
+    FloatArrayType::Pointer xBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::xBoundsList, true);
+    FloatArrayType::Pointer yBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::yBoundsList, true);
+    FloatArrayType::Pointer zBounds = FloatArrayType::CreateArray(11, SIMPL::Geometry::zBoundsList, true);
     float* xBoundsPtr = xBounds->getPointer(0);
     float* yBoundsPtr = yBounds->getPointer(0);
     float* zBoundsPtr = zBounds->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 381458a5e2..ad2ba398fc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -86,7 +86,7 @@ class MoveDataTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
     {
       for(int j = 0; j < da->getNumberOfComponents(); j++)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index d28287ba22..aefced0031 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -86,7 +86,7 @@ class MoveMultiDataTest
   template <typename T>
   std::shared_ptr<DataArray<T>> createDataArray(const QString& daName, const std::vector<size_t>& tupleDims, const std::vector<size_t>& cDims)
   {
-    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName);
+    typename DataArray<T>::Pointer da = DataArray<T>::CreateArray(tupleDims, cDims, daName, true);
     for(size_t i = 0; i < da->getNumberOfTuples(); i++)
     {
       for(int j = 0; j < da->getNumberOfComponents(); j++)
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index a1edae703c..ca7873d835 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -96,8 +96,8 @@ class MultiThresholdObjects2Test
     float fnum = 0.0f;
     int inum = 0;
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
-    DataArray<float>::Pointer dataf = DataArray<float>::CreateArray(tDims, cDims, "TestArrayFloat");
-    DataArray<int32_t>::Pointer datai = DataArray<int32_t>::CreateArray(tDims, cDims, "TestArrayInt");
+    DataArray<float>::Pointer dataf = DataArray<float>::CreateArray(tDims, cDims, "TestArrayFloat", true);
+    DataArray<int32_t>::Pointer datai = DataArray<int32_t>::CreateArray(tDims, cDims, "TestArrayInt", true);
 
     // Fill the float array with {.01,.02,.03,.04,.05,.06,.07,.08,.09,.10,.11,.12,.13,.14,.15.,16,.17,.18,.19,.20}
     // Fill the int array with { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19 }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 31f918a495..6c9d316a85 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -94,8 +94,8 @@ class MultiThresholdObjectsTest
     float fnum = 0.0f;
     int inum = 0;
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
-    DataArray<float>::Pointer data = DataArray<float>::CreateArray(tDims, cDims, "TestArrayFloat");
-    DataArray<int32_t>::Pointer data1 = DataArray<int32_t>::CreateArray(tDims, cDims, "TestArrayInt");
+    DataArray<float>::Pointer data = DataArray<float>::CreateArray(tDims, cDims, "TestArrayFloat", true);
+    DataArray<int32_t>::Pointer data1 = DataArray<int32_t>::CreateArray(tDims, cDims, "TestArrayInt", true);
 
     // Fill the float array with {.01,.02,.03,.04,.05,.06,.07,.08,.09,.10,.11,.12,.13,.14,.15.,16,.17,.18,.19,.20}
     // Fill the int array with { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19 }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index c1f5c76aea..390b96b80c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -225,7 +225,8 @@ class RawBinaryReaderTest
     //// qDebug() << "Testing case 1: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -330,7 +331,8 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 2: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -424,7 +426,8 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 3: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp__"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp__",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -534,7 +537,8 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 4: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -672,7 +676,8 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 5: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -782,7 +787,8 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 6: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_"); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+                                                                     true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index e3764a30a1..a2b16abe43 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -66,7 +66,7 @@ class RemoveArraysTest
     vec.push_back(1);
 
     const QString arrayName = "DataArray";
-    DataArray<uint>::Pointer da = DataArray<uint>::CreateArray(1, vec, arrayName);
+    DataArray<uint>::Pointer da = DataArray<uint>::CreateArray(1, vec, arrayName, true);
 
     std::vector<size_t> sizeList;
     sizeList.push_back(1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index caba7051bc..17ca9e6cac 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -131,7 +131,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -169,7 +169,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -209,7 +209,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -247,7 +247,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -284,9 +284,9 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray");
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
     am->insertOrAssign(da);
-    DataArray<int>::Pointer da2 = DataArray<int>::CreateArray(1, "DataArray_2");
+    DataArray<int>::Pointer da2 = DataArray<int>::CreateArray(1, "DataArray_2", true);
     am->insertOrAssign(da2);
 
     filter->setDataContainerArray(dca);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index d551f6ce4a..d19399e99d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -79,7 +79,7 @@ class RequiredZThicknessTest
 
     std::vector<size_t> dims;
     dims.push_back(3);
-    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
+    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices", true);
     verts->setComponent(0, 0, -1);
     verts->setComponent(0, 1, 0);
     verts->setComponent(0, 2, 0);
@@ -94,7 +94,7 @@ class RequiredZThicknessTest
 
     std::vector<size_t> dims2;
     dims2.push_back(3);
-    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles", true);
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index d2768a6b17..dae35bef3a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -89,7 +89,7 @@ class ScaleVolumeTest
 
     std::vector<size_t> dims;
     dims.push_back(3);
-    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
+    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices", true);
     verts->setComponent(0, 0, -1);
     verts->setComponent(0, 1, 0);
     verts->setComponent(0, 2, 0);
@@ -104,7 +104,7 @@ class ScaleVolumeTest
 
     std::vector<size_t> dims2;
     dims2.push_back(3);
-    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles", true);
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index ab5fbe1022..9fec922182 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -88,7 +88,7 @@ class SetOriginResolutionImageGeomTest
 
     std::vector<size_t> dims;
     dims.push_back(3);
-    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices");
+    DataArray<float>::Pointer verts = DataArray<float>::CreateArray(3, dims, "Vertices", true);
     verts->setComponent(0, 0, -1);
     verts->setComponent(0, 1, 0);
     verts->setComponent(0, 2, 0);
@@ -103,7 +103,7 @@ class SetOriginResolutionImageGeomTest
 
     std::vector<size_t> dims2;
     dims2.push_back(3);
-    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles");
+    SharedTriList::Pointer tris = SharedTriList::CreateArray(1, dims2, "Triangles", true);
 
     tris->setComponent(0, 0, 0);
     tris->setComponent(0, 1, 1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 9c7f701b51..b86c24ee4a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -67,43 +67,43 @@ class SplitAttributeArrayTest
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(std::vector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Any);
 
-    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint32_t");
+    UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint32_t", true);
     fillDataArray<uint32_t>(mcArray1);
 
-    BoolArrayType::Pointer mcArray2 = BoolArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array bool");
+    BoolArrayType::Pointer mcArray2 = BoolArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array bool", true);
     fillDataArray(mcArray2);
 
-    UCharArrayType::Pointer mcArray3 = UCharArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array unsigned char");
+    UCharArrayType::Pointer mcArray3 = UCharArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array unsigned char", true);
     fillDataArray<unsigned char>(mcArray3);
 
-    Int8ArrayType::Pointer mcArray4 = Int8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int8_t");
+    Int8ArrayType::Pointer mcArray4 = Int8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int8_t", true);
     fillDataArray<int8_t>(mcArray4);
 
-    UInt8ArrayType::Pointer mcArray5 = UInt8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint8_t");
+    UInt8ArrayType::Pointer mcArray5 = UInt8ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint8_t", true);
     fillDataArray<uint8_t>(mcArray5);
 
-    Int16ArrayType::Pointer mcArray6 = Int16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int16_t");
+    Int16ArrayType::Pointer mcArray6 = Int16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int16_t", true);
     fillDataArray<int16_t>(mcArray6);
 
-    UInt16ArrayType::Pointer mcArray7 = UInt16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint16_t");
+    UInt16ArrayType::Pointer mcArray7 = UInt16ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint16_t", true);
     fillDataArray<uint16_t>(mcArray7);
 
-    Int32ArrayType::Pointer mcArray8 = Int32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int32_t");
+    Int32ArrayType::Pointer mcArray8 = Int32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int32_t", true);
     fillDataArray<int32_t>(mcArray8);
 
-    Int64ArrayType::Pointer mcArray9 = Int64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int64_t");
+    Int64ArrayType::Pointer mcArray9 = Int64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array int64_t", true);
     fillDataArray<int64_t>(mcArray9);
 
-    UInt64ArrayType::Pointer mcArray10 = UInt64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint64_t");
+    UInt64ArrayType::Pointer mcArray10 = UInt64ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array uint64_t", true);
     fillDataArray<uint64_t>(mcArray10);
 
-    FloatArrayType::Pointer mcArray11 = FloatArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array float");
+    FloatArrayType::Pointer mcArray11 = FloatArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array float", true);
     fillDataArray<float>(mcArray11);
 
-    DoubleArrayType::Pointer mcArray12 = DoubleArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array double");
+    DoubleArrayType::Pointer mcArray12 = DoubleArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array double", true);
     fillDataArray<double>(mcArray12);
 
-    SizeTArrayType::Pointer mcArray13 = SizeTArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array size_t");
+    SizeTArrayType::Pointer mcArray13 = SizeTArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 5), "MultiComponent Array size_t", true);
     fillDataArray<size_t>(mcArray13);
 
     am1->insertOrAssign(mcArray1);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index fcf4d9f82e..2dc9315c74 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -120,7 +120,7 @@ class WriteTriangleGeometryTest
 
     // Create Triangle Data Arrays
 
-    FloatArrayType::Pointer daTriVert = FloatArrayType::CreateArray(k_NumNodes, k_Dims3, k_TriVertexListDAName);
+    FloatArrayType::Pointer daTriVert = FloatArrayType::CreateArray(k_NumNodes, k_Dims3, k_TriVertexListDAName, true);
     for (size_t i = 0; i < daTriVert->getNumberOfTuples(); i++)
     {
       for (int j = 0; j < daTriVert->getNumberOfComponents(); j++)
@@ -138,7 +138,7 @@ class WriteTriangleGeometryTest
       }
     }
 
-    SharedTriList::Pointer daTriList = SharedTriList::CreateArray(k_NumTriangles, k_Dims3, k_TriListDAName);
+    SharedTriList::Pointer daTriList = SharedTriList::CreateArray(k_NumTriangles, k_Dims3, k_TriListDAName, true);
     for (size_t i = 0; i < daTriList->getNumberOfTuples(); i++)
     {
       for (int j = 0; j < daTriList->getNumberOfComponents(); j++)
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
index 28b71c79c5..0c157071b8 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
@@ -74,11 +74,11 @@ class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
     DoubleArrayType::Pointer newArray;                                                                                                                                                                 \
     if(array1->getType() == ICalculatorArray::Array)                                                                                                                                                   \
     {                                                                                                                                                                                                  \
-      newArray = DoubleArrayType::CreateArray(array1->getArray()->getNumberOfTuples(), array1->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                          \
+      newArray = DoubleArrayType::CreateArray(array1->getArray()->getNumberOfTuples(), array1->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                    \
     }                                                                                                                                                                                                  \
     else                                                                                                                                                                                               \
     {                                                                                                                                                                                                  \
-      newArray = DoubleArrayType::CreateArray(array2->getArray()->getNumberOfTuples(), array2->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                          \
+      newArray = DoubleArrayType::CreateArray(array2->getArray()->getNumberOfTuples(), array2->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                    \
     }                                                                                                                                                                                                  \
                                                                                                                                                                                                        \
     int numComps = newArray->getNumberOfComponents();                                                                                                                                                  \
@@ -103,4 +103,3 @@ class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
     }                                                                                                                                                                                                  \
     return;                                                                                                                                                                                            \
   }
-
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index cfde495551..5def7db93c 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -108,11 +108,11 @@ class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
     DoubleArrayType::Pointer newArray;                                                                                                                                                                 \
     if(array1->getType() == ICalculatorArray::Array)                                                                                                                                                   \
     {                                                                                                                                                                                                  \
-      newArray = DoubleArrayType::CreateArray(array1->getArray()->getNumberOfTuples(), array1->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                          \
+      newArray = DoubleArrayType::CreateArray(array1->getArray()->getNumberOfTuples(), array1->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                    \
     }                                                                                                                                                                                                  \
     else                                                                                                                                                                                               \
     {                                                                                                                                                                                                  \
-      newArray = DoubleArrayType::CreateArray(array2->getArray()->getNumberOfTuples(), array2->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                          \
+      newArray = DoubleArrayType::CreateArray(array2->getArray()->getNumberOfTuples(), array2->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                    \
     }                                                                                                                                                                                                  \
                                                                                                                                                                                                        \
     int numComps = newArray->getNumberOfComponents();                                                                                                                                                  \
@@ -137,4 +137,3 @@ class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
     }                                                                                                                                                                                                  \
     return;                                                                                                                                                                                            \
   }
-
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
index 575ae79a8f..67edce8a30 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
@@ -66,7 +66,8 @@ void NegativeOperator::calculate(AbstractFilter* filter, DataArrayPath calculate
   {
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();
 
-    DoubleArrayType::Pointer newArray = DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());
+    DoubleArrayType::Pointer newArray =
+        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);
 
     int numComps = newArray->getNumberOfComponents();
     for(int i = 0; i < newArray->getNumberOfTuples(); i++)
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
index b07b710e52..3bc75cfc43 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
     DoubleArrayType::Pointer newArray =                                                                                                                                                                \
-        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                               \
+        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                         \
                                                                                                                                                                                                        \
     int numComps = newArray->getNumberOfComponents();                                                                                                                                                  \
     for(int i = 0; i < newArray->getNumberOfTuples(); i++)                                                                                                                                             \
@@ -103,7 +103,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
     DoubleArrayType::Pointer newArray =                                                                                                                                                                \
-        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                               \
+        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                         \
                                                                                                                                                                                                        \
     int numComps = newArray->getNumberOfComponents();                                                                                                                                                  \
     for(int i = 0; i < newArray->getNumberOfTuples(); i++)                                                                                                                                             \
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
     DoubleArrayType::Pointer newArray =                                                                                                                                                                \
-        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName());                               \
+        DoubleArrayType::CreateArray(arrayPtr->getArray()->getNumberOfTuples(), arrayPtr->getArray()->getComponentDimensions(), calculatedArrayPath.getDataArrayName(), true);                         \
                                                                                                                                                                                                        \
     int numComps = newArray->getNumberOfComponents();                                                                                                                                                  \
     for(int i = 0; i < newArray->getNumberOfTuples(); i++)                                                                                                                                             \
@@ -160,4 +160,3 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     executionStack.push(CalculatorArray<double>::New(newArray, arrayPtr->getType(), true));                                                                                                            \
     return;                                                                                                                                                                                            \
   }
-
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 8c7e54059f..782cf221d8 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -646,7 +646,7 @@ class NeighborList : public IDataArray
       {
         m_NumNeighborsArrayName = getName() + "_NumNeighbors";
       }
-      Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), m_NumNeighborsArrayName);
+      Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), m_NumNeighborsArrayName, true);
       int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
       size_t total = 0;
       for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index 06bcb991f7..a101fc68c2 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -108,7 +108,8 @@ IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, const st
 // -----------------------------------------------------------------------------
 // IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate)
 //{
-//  IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
+//  IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name,
+// allocate);
 //  return p;
 //}
 
@@ -376,7 +377,7 @@ void StringDataArray::initializeWithValue(const std::string& value)
 // -----------------------------------------------------------------------------
 IDataArray::Pointer StringDataArray::deepCopy(bool forceNoAllocate)
 {
-  StringDataArray::Pointer daCopy = StringDataArray::CreateArray(getNumberOfTuples(), getName());
+  StringDataArray::Pointer daCopy = StringDataArray::CreateArray(getNumberOfTuples(), getName(), true);
   if(!forceNoAllocate)
   {
     for(std::vector<QString>::size_type i = 0; i < m_Array.size(); ++i)
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 84d3d14721..eb38afe150 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -102,12 +102,6 @@ class StructArray : public IDataArray
       return p;
     }
 
-    //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
-    //    {
-    //      IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
-    //      return p;
-    //    }
-
     /**
      * @brief Destructor
      */
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index df1a51d3a2..3f1bcdc5eb 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -129,7 +129,7 @@ class DataArrayTest
   {
     int err = 0;
     std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "TestcopyTuples");
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "TestcopyTuples", true);
     DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
 
     for(size_t i = 0; i < NUM_TUPLES_2; ++i)
@@ -183,7 +183,7 @@ class DataArrayTest
   {
     // Test dropping of front elements only
     {
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS, "Test1");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS, "Test1", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_ELEMENTS; ++i)
       {
@@ -205,7 +205,7 @@ class DataArrayTest
     // Test Dropping of internal elements
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test2");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test2", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -231,7 +231,7 @@ class DataArrayTest
     // Test Dropping of internal elements
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test3");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test3", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -256,7 +256,7 @@ class DataArrayTest
     // Test Dropping of internal continuous elements
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test4");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test4", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -281,7 +281,7 @@ class DataArrayTest
     // Test Dropping of Front and Back Elements
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test5");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test5", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -304,7 +304,7 @@ class DataArrayTest
     // Test Dropping of Back Elements
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test6");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS_2, dims, "Test6", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -327,7 +327,7 @@ class DataArrayTest
     // Test Dropping of indices larger than the number of tuples
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS_2);
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "Test6");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_TUPLES_2, dims, "Test6", true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_TUPLES_2; ++i)
       {
@@ -456,7 +456,7 @@ class DataArrayTest
   {
     int32_t* ptr = nullptr;
     {
-      Int32ArrayType::Pointer d = Int32ArrayType::CreateArray(0, "Test7");
+      Int32ArrayType::Pointer d = Int32ArrayType::CreateArray(0, "Test7", true);
       DREAM3D_REQUIRE_EQUAL(0, d->getSize());
       DREAM3D_REQUIRE_EQUAL(0, d->getNumberOfTuples());
       ptr = d->getPointer(0);
@@ -466,7 +466,7 @@ class DataArrayTest
 
     {
       std::vector<size_t> dims(1, NUM_COMPONENTS);
-      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(NUM_ELEMENTS, dims, "Test8");
+      Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(NUM_ELEMENTS, dims, "Test8", true);
       ptr = int32Array->getPointer(0);
       DREAM3D_REQUIRE_EQUAL(int32Array->isAllocated(), true);
       DREAM3D_REQUIRE_EQUAL(NUM_ELEMENTS, int32Array->getNumberOfTuples());
@@ -632,7 +632,7 @@ class DataArrayTest
     std::vector<size_t> tDims(10);
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Cell);
 
-    typename NeighborList<T>::Pointer neiList = NeighborList<T>::CreateArray(10, "NeighborList");
+    typename NeighborList<T>::Pointer neiList = NeighborList<T>::CreateArray(10, "NeighborList", true);
 
     for(int i = 0; i < 10; ++i)
     {
@@ -809,14 +809,14 @@ class DataArrayTest
     size_t dims[RANK] = {DIM0, DIM1, DIM2};
     int numComp = 1;
     {
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, "TEST");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, "TEST", true);
       err = ValidateArrayForType<T>(array, numTuples, numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
 
     {
       numComp = DIM0 * DIM1 * DIM2;
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, rank, dims, "TEST");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, rank, dims, "TEST", true);
       err = ValidateArrayForType<T>(array, numTuples, numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
@@ -827,7 +827,7 @@ class DataArrayTest
       vDims[0] = DIM0;
       vDims[1] = DIM1;
       vDims[2] = DIM2;
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, vDims, "TEST");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, vDims, "TEST", true);
       err = ValidateArrayForType<T>(array, numTuples, numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
@@ -838,7 +838,7 @@ class DataArrayTest
       vDims[0] = DIM0;
       vDims[1] = DIM1;
       vDims[2] = DIM2;
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, vDims, "TEST");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, vDims, "TEST", true);
       err = ValidateArrayForType<T>(array, numTuples, numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
@@ -849,7 +849,7 @@ class DataArrayTest
       vDims[0] = DIM0;
       vDims[1] = DIM1;
       vDims[2] = DIM2;
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(tDims, vDims, "TEST");
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(tDims, vDims, "TEST", true);
       err = ValidateArrayForType<T>(array, tDims[0] * tDims[1], numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
@@ -871,7 +871,8 @@ class DataArrayTest
         unsigned char* cptr = nullptr;
 
         std::vector<size_t> tDims(1, 10);
-        typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(DIM0, "TEST");
+        typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(DIM0, "TEST", 
+true);
         array->initializeWithZeros();
         cptr = reinterpret_cast<uint8_t*>(array->getPointer(0));
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index a11953b68b..9727c938f8 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -110,7 +110,7 @@ class StringDataArrayTest
   // -----------------------------------------------------------------------------
   StringDataArray::Pointer initializeStringDataArray()
   {
-    StringDataArray::Pointer data = StringDataArray::CreateArray(k_ArraySize, kArrayName);
+    StringDataArray::Pointer data = StringDataArray::CreateArray(k_ArraySize, kArrayName, true);
 
     size_t nTuples = data->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ArraySize, nTuples)
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index e21b32579b..462dea230c 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -110,7 +110,7 @@ class StructArrayTest
   // -----------------------------------------------------------------------------
   Vec3IntListPointer_t initializeStructArray()
   {
-    Vec3IntListPointer_t nodes = Vec3IntList_t::CreateArray(k_ArraySize, kArrayName);
+    Vec3IntListPointer_t nodes = Vec3IntList_t::CreateArray(k_ArraySize, kArrayName, true);
     size_t nTuples = nodes->getNumberOfTuples();
     DREAM3D_REQUIRE_EQUAL(k_ArraySize, nTuples)
     bool isAllocated = nodes->isAllocated();
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 83d0a045e7..1c3dbea27c 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -565,7 +565,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       typename ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(targetDestArray);
       if (nullptr == array.get())
       {
-        typename ArrayType::Pointer dat = ArrayType::CreateArray(1, "JUNK-INTERNAL-USE-ONLY");
+        typename ArrayType::Pointer dat = ArrayType::CreateArray(1, "JUNK-INTERNAL-USE-ONLY", true);
         QString ss = QObject::tr(" - The filter requested an array named '%1' with type '%2' from the filter '%3'.\n"
                                  "An Array with name '%4' is stored in the %5 but is of type %6\n")
                      .arg(arrayName).arg(dat->getTypeAsString()).arg(getNameOfClass()).arg(arrayName).arg(getNameOfClass()).arg(targetDestArray->getTypeAsString());
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index fc44112c6c..7d885b798b 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -71,7 +71,7 @@ class DataContainerBundleTest
   void AddDataArray(AttributeMatrix::Pointer am, const QString name, std::vector<size_t>& tDims, std::vector<size_t>& cDims)
   {
 
-    typename DataArray<T>::Pointer data = DataArray<T>::CreateArray(tDims, cDims, name);
+    typename DataArray<T>::Pointer data = DataArray<T>::CreateArray(tDims, cDims, name, true);
 
     am->insertOrAssign(data);
   }
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index a2166829cf..d1fb082b58 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -312,7 +312,7 @@ void EdgeGeom::deleteElementNeighbors()
 int EdgeGeom::findElementCentroids()
 {
   std::vector<size_t> cDims(1, 3);
-  m_EdgeCentroids = FloatArrayType::CreateArray(getNumberOfElements(), cDims, SIMPL::StringConstants::EdgeCentroids);
+  m_EdgeCentroids = FloatArrayType::CreateArray(getNumberOfElements(), cDims, SIMPL::StringConstants::EdgeCentroids, true);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_EdgeList, m_VertexList, m_EdgeCentroids);
   if(m_EdgeCentroids.get() == nullptr)
   {
@@ -350,7 +350,7 @@ void EdgeGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int EdgeGeom::findElementSizes()
 {
-  m_EdgeSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::EdgeLengths);
+  m_EdgeSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::EdgeLengths, true);
 
   float* sizes = m_EdgeSizes->getPointer(0);
   float vert0[3] = {0.0f, 0.0f, 0.0f};
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index f5fbea0214..ee0950de9b 100755
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -237,7 +237,7 @@ class Connectivity
     size_t elemId = 0;
 
     // Fill out lists with number of references to cells
-    typename DataArray<K>::Pointer linkLocPtr = DataArray<K>::CreateArray(numVerts, "_INTERNAL_USE_ONLY_Vertices");
+    typename DataArray<K>::Pointer linkLocPtr = DataArray<K>::CreateArray(numVerts, "_INTERNAL_USE_ONLY_Vertices", true);
     linkLocPtr->initializeWithValue(0);
     K* linkLoc = linkLocPtr->getPointer(0);
     K* verts = nullptr;
@@ -324,7 +324,7 @@ class Connectivity
     dynamicList->allocateLists(linkCount);
 
     // Allocate an array of bools that we use each iteration so that we don't put duplicates into the array
-    typename DataArray<bool>::Pointer visitedPtr = DataArray<bool>::CreateArray(numElems, "_INTERNAL_USE_ONLY_Visited");
+    typename DataArray<bool>::Pointer visitedPtr = DataArray<bool>::CreateArray(numElems, "_INTERNAL_USE_ONLY_Visited", true);
     visitedPtr->initializeWithValue(false);
     bool* visited = visitedPtr->getPointer(0);
 
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 688f2e0d07..fed27ff883 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -334,7 +334,7 @@ void HexahedralGeom::deleteElementNeighbors()
 int HexahedralGeom::findElementCentroids()
 {
   std::vector<size_t> cDims(1, 3);
-  m_HexCentroids = FloatArrayType::CreateArray(getNumberOfHexas(), cDims, SIMPL::StringConstants::HexCentroids);
+  m_HexCentroids = FloatArrayType::CreateArray(getNumberOfHexas(), cDims, SIMPL::StringConstants::HexCentroids, true);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_HexList, m_VertexList, m_HexCentroids);
   if(m_HexCentroids.get() == nullptr)
   {
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 3e4b569ced..2acc0fbb61 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -818,7 +818,7 @@ int ImageGeom::findElementSizes()
   {
     return -1;
   }
-  m_VoxelSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes);
+  m_VoxelSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes, true);
   m_VoxelSizes->initializeWithValue(res[0] * res[1] * res[2]);
   return 1;
 }
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index ce7f5bb881..acb32c0cf7 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -341,7 +341,7 @@ void QuadGeom::deleteElementNeighbors()
 int QuadGeom::findElementCentroids()
 {
   std::vector<size_t> cDims(1, 3);
-  m_QuadCentroids = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadCentroids);
+  m_QuadCentroids = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadCentroids, true);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_QuadList, m_VertexList, m_QuadCentroids);
   if(m_QuadCentroids.get() == nullptr)
   {
@@ -380,7 +380,7 @@ void QuadGeom::deleteElementCentroids()
 int QuadGeom::findElementSizes()
 {
   std::vector<size_t> cDims(1, 1);
-  m_QuadSizes = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadAreas);
+  m_QuadSizes = FloatArrayType::CreateArray(getNumberOfQuads(), cDims, SIMPL::StringConstants::QuadAreas, true);
   GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_QuadList, m_VertexList, m_QuadSizes);
   if(m_QuadSizes.get() == nullptr)
   {
@@ -419,7 +419,7 @@ void QuadGeom::deleteElementSizes()
 int QuadGeom::findUnsharedEdges()
 {
   std::vector<size_t> cDims(1, 2);
-  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
+  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, true);
   GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_QuadList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 5e01546448..95c31d4ad5 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -848,7 +848,7 @@ void RectGridGeom::deleteElementCentroids()
 // -----------------------------------------------------------------------------
 int RectGridGeom::findElementSizes()
 {
-  m_VoxelSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes);
+  m_VoxelSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes, true);
 
   float* sizes = m_VoxelSizes->getPointer(0);
   float* xBnds = m_xBounds->getPointer(0);
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 9216f4d5d7..6ddd4fd1ab 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -369,7 +369,7 @@ void TetrahedralGeom::deleteElementNeighbors()
 int TetrahedralGeom::findElementCentroids()
 {
   std::vector<size_t> cDims(1, 3);
-  m_TetCentroids = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetCentroids);
+  m_TetCentroids = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetCentroids, true);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TetList, m_VertexList, m_TetCentroids);
   if(m_TetCentroids.get() == nullptr)
   {
@@ -409,7 +409,7 @@ void TetrahedralGeom::deleteElementCentroids()
 int TetrahedralGeom::findElementSizes()
 {
   std::vector<size_t> cDims(1, 1);
-  m_TetSizes = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetVolumes);
+  m_TetSizes = FloatArrayType::CreateArray(getNumberOfTets(), cDims, SIMPL::StringConstants::TetVolumes, true);
   GeometryHelpers::Topology::FindTetVolumes<size_t>(m_TetList, m_VertexList, m_TetSizes);
   if(m_TetSizes.get() == nullptr)
   {
@@ -448,7 +448,7 @@ void TetrahedralGeom::deleteElementSizes()
 int TetrahedralGeom::findUnsharedEdges()
 {
   std::vector<size_t> cDims(1, 2);
-  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
+  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, true);
   GeometryHelpers::Connectivity::FindUnsharedTetEdges<size_t>(m_TetList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
@@ -487,7 +487,7 @@ void TetrahedralGeom::deleteUnsharedEdges()
 int TetrahedralGeom::findUnsharedFaces()
 {
   std::vector<size_t> cDims(1, 3);
-  m_UnsharedTriList = SharedTriList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList);
+  m_UnsharedTriList = SharedTriList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedFaceList, true);
   GeometryHelpers::Connectivity::FindUnsharedTetFaces<size_t>(m_TetList, m_UnsharedTriList);
   if(m_UnsharedTriList.get() == nullptr)
   {
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index a662c7614d..9d68265240 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -340,7 +340,7 @@ void TriangleGeom::deleteElementNeighbors()
 int TriangleGeom::findElementCentroids()
 {
   std::vector<size_t> cDims(1, 3);
-  m_TriangleCentroids = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleCentroids);
+  m_TriangleCentroids = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleCentroids, true);
   GeometryHelpers::Topology::FindElementCentroids<size_t>(m_TriList, m_VertexList, m_TriangleCentroids);
   if(m_TriangleCentroids.get() == nullptr)
   {
@@ -379,7 +379,7 @@ void TriangleGeom::deleteElementCentroids()
 int TriangleGeom::findElementSizes()
 {
   std::vector<size_t> cDims(1, 1);
-  m_TriangleSizes = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleAreas);
+  m_TriangleSizes = FloatArrayType::CreateArray(getNumberOfTris(), cDims, SIMPL::StringConstants::TriangleAreas, true);
   GeometryHelpers::Topology::Find2DElementAreas<size_t>(m_TriList, m_VertexList, m_TriangleSizes);
   if(m_TriangleSizes.get() == nullptr)
   {
@@ -418,7 +418,7 @@ void TriangleGeom::deleteElementSizes()
 int TriangleGeom::findUnsharedEdges()
 {
   std::vector<size_t> cDims(1, 2);
-  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList);
+  m_UnsharedEdgeList = SharedEdgeList::CreateArray(0, cDims, SIMPL::Geometry::UnsharedEdgeList, true);
   GeometryHelpers::Connectivity::Find2DUnsharedEdges<size_t>(m_TriList, m_UnsharedEdgeList);
   if(m_UnsharedEdgeList.get() == nullptr)
   {
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 87790abd6b..c18ca3be99 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -238,7 +238,7 @@ int VertexGeom::findElementSizes()
 {
   // Vertices are 0-dimensional (they have no size),
   // so simply splat 0 over the sizes array
-  m_VertexSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes);
+  m_VertexSizes = FloatArrayType::CreateArray(getNumberOfElements(), SIMPL::StringConstants::VoxelSizes, true);
   m_VertexSizes->initializeWithValue(0.0f);
   return 1;
 }
@@ -317,7 +317,7 @@ int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
     if(writeXdmf)
     {
       std::vector<size_t> cDims(1, 1);
-      DataArray<size_t>::Pointer vertsPtr = DataArray<size_t>::CreateArray(getNumberOfVertices(), cDims, SIMPL::StringConstants::VertsName);
+      DataArray<size_t>::Pointer vertsPtr = DataArray<size_t>::CreateArray(getNumberOfVertices(), cDims, SIMPL::StringConstants::VertsName, true);
       size_t* verts = vertsPtr->getPointer(0);
       for(size_t i = 0; i < vertsPtr->getNumberOfTuples(); i++)
       {
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index 5c38976d15..63f1c8b063 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -67,7 +67,7 @@ IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const
   herr_t err = -1;
   IDataArray::Pointer ptr;
 
-  ptr = DataArray<T>::CreateArray(tDims, cDims, datasetPath);
+  ptr = DataArray<T>::CreateArray(tDims, cDims, datasetPath, true);
 
   T* data = (T*)(ptr->getVoidPointer(0));
   err = QH5Lite::readPointerDataset(locId, datasetPath, data);
@@ -172,7 +172,7 @@ IDataArray::Pointer H5DataArrayReader::ReadStringDataArray(hid_t gid, const QStr
   }
   // Strings are stored as variable length arrays so trying to match the component
   // dimensions does not make sense.
-  StringDataArray::Pointer strTemp = StringDataArray::CreateArray(dims[0], name);
+  StringDataArray::Pointer strTemp = StringDataArray::CreateArray(dims[0], name, true);
 
   std::vector<std::string> strings;
   err = H5Lite::readVectorOfStringDataset(gid, name.toStdString(), strings);
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index 0cd1651886..96d077b0d5 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -54,30 +54,18 @@ H5PrecipitateStatsDataDelegate::~H5PrecipitateStatsDataDelegate() = default;
 // -----------------------------------------------------------------------------
 VectorOfFloatArray H5PrecipitateStatsDataDelegate::createBetaDistributionArrays()
 {
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta);
+  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha, true);
+  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(alphas);
   vect.push_back(betas);
   return vect;
 }
 
-// VectorOfFloatArray H5PrecipitateStatsDataDelegate::createPowerDistributionArrays()
-//{
-//  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha);
-//  FloatArrayType::Pointer ks = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Exp_k);
-//  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta);
-//  QVector<FloatArrayType::Pointer> vect;
-//  vect.push_back(alphas);
-//  vect.push_back(ks);
-//  vect.push_back(betas);
-//  return vect;
-//}
-
 VectorOfFloatArray H5PrecipitateStatsDataDelegate::createLogNormalDistributionArrays()
 {
-  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average);
-  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation);
+  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average, true);
+  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(avgs);
   vect.push_back(sd);
@@ -86,7 +74,7 @@ VectorOfFloatArray H5PrecipitateStatsDataDelegate::createLogNormalDistributionAr
 
 VectorOfFloatArray H5PrecipitateStatsDataDelegate::createRDFMaxMinDistributionArrays()
 {
-  FloatArrayType::Pointer maxmin = FloatArrayType::CreateArray(2, SIMPL::StringConstants::MinMaxNoOfBins);
+  FloatArrayType::Pointer maxmin = FloatArrayType::CreateArray(2, SIMPL::StringConstants::MinMaxNoOfBins, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(maxmin);
   return vect;
@@ -189,7 +177,7 @@ int H5PrecipitateStatsDataDelegate::readPrecipitateStatsData(PrecipitateStatsDat
   err = readDistributionData(groupId, SIMPL::StringConstants::Feature_SizeVOmega3_Distributions, data->getFeatureSize_Omegas());
 
   // Read the Misorientation Bins
-  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins);
+  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins, true);
   err = misoBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -199,7 +187,7 @@ int H5PrecipitateStatsDataDelegate::readPrecipitateStatsData(PrecipitateStatsDat
   err = readMDFWeights(groupId, data);
 
   // Read the ODF Data
-  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF);
+  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF, true);
   err = odfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -209,7 +197,7 @@ int H5PrecipitateStatsDataDelegate::readPrecipitateStatsData(PrecipitateStatsDat
   err = readODFWeights(groupId, data);
 
   // Read the Axis ODF Data
-  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation);
+  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation, true);
   err = axisOdfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -372,10 +360,10 @@ int H5PrecipitateStatsDataDelegate::readMDFWeights(hid_t pid, PrecipitateStatsDa
 {
   int err = 0;
   std::vector<size_t> dims(1, 1);
-  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight, true);
   dims[0] = 3;
-  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis);
+  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis, true);
 
   VectorOfFloatArray mdfWeights;
   mdfWeights.push_back(angles);
@@ -402,11 +390,11 @@ int H5PrecipitateStatsDataDelegate::readODFWeights(hid_t pid, PrecipitateStatsDa
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -436,11 +424,11 @@ int H5PrecipitateStatsDataDelegate::readAxisODFWeights(hid_t pid, PrecipitateSta
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -823,7 +811,7 @@ int H5PrecipitateStatsDataDelegate::writeBinNumbers(PrecipitateStatsData* data,
 int H5PrecipitateStatsDataDelegate::readBinNumbers(PrecipitateStatsData* data, hid_t groupId)
 {
   int err = 0;
-  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber);
+  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber, true);
   err = p->readH5Data(groupId);
   data->setBinNumbers(p);
   return err;
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
index a1446c3515..5abb03c139 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
@@ -53,30 +53,18 @@ H5PrimaryStatsDataDelegate::~H5PrimaryStatsDataDelegate() = default;
 // -----------------------------------------------------------------------------
 VectorOfFloatArray H5PrimaryStatsDataDelegate::createBetaDistributionArrays()
 {
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta);
+  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha, true);
+  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(alphas);
   vect.push_back(betas);
   return vect;
 }
 
-// VectorOfFloatArray H5PrimaryStatsDataDelegate::createPowerDistributionArrays()
-//{
-//  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha);
-//  FloatArrayType::Pointer ks = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Exp_k);
-//  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta);
-//  QVector<FloatArrayType::Pointer> vect;
-//  vect.push_back(alphas);
-//  vect.push_back(ks);
-//  vect.push_back(betas);
-//  return vect;
-//}
-
 VectorOfFloatArray H5PrimaryStatsDataDelegate::createLogNormalDistributionArrays()
 {
-  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average);
-  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation);
+  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average, true);
+  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(avgs);
   vect.push_back(sd);
@@ -158,7 +146,7 @@ int H5PrimaryStatsDataDelegate::readPrimaryStatsData(PrimaryStatsData* data, hid
   err = readDistributionData(groupId, SIMPL::StringConstants::Feature_SizeVOmega3_Distributions, data->getFeatureSize_Omegas());
 
   // Read the Misorientation Bins
-  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins);
+  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins, true);
   err = misoBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -168,7 +156,7 @@ int H5PrimaryStatsDataDelegate::readPrimaryStatsData(PrimaryStatsData* data, hid
   err = readMDFWeights(groupId, data);
 
   // Read the ODF Data
-  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF);
+  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF, true);
   err = odfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -178,7 +166,7 @@ int H5PrimaryStatsDataDelegate::readPrimaryStatsData(PrimaryStatsData* data, hid
   err = readODFWeights(groupId, data);
 
   // Read the Axis ODF Data
-  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation);
+  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation, true);
   err = axisOdfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -331,10 +319,10 @@ int H5PrimaryStatsDataDelegate::readMDFWeights(hid_t pid, PrimaryStatsData* data
 {
   int err = 0;
   std::vector<size_t> dims(1, 1);
-  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight, true);
   dims[0] = 3;
-  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis);
+  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis, true);
 
   VectorOfFloatArray mdfWeights;
   mdfWeights.push_back(angles);
@@ -362,11 +350,11 @@ int H5PrimaryStatsDataDelegate::readODFWeights(hid_t pid, PrimaryStatsData* data
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -397,11 +385,11 @@ int H5PrimaryStatsDataDelegate::readAxisODFWeights(hid_t pid, PrimaryStatsData*
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -639,7 +627,7 @@ int H5PrimaryStatsDataDelegate::writeBinNumbers(PrimaryStatsData* data, hid_t gr
 int H5PrimaryStatsDataDelegate::readBinNumbers(PrimaryStatsData* data, hid_t groupId)
 {
   int err = 0;
-  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber);
+  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber, true);
   err = p->readH5Data(groupId);
   data->setBinNumbers(p);
   return err;
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
index 94e951fb37..cfa70cece6 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
@@ -53,8 +53,8 @@ H5TransformationStatsDataDelegate::~H5TransformationStatsDataDelegate() = defaul
 // -----------------------------------------------------------------------------
 VectorOfFloatArray H5TransformationStatsDataDelegate::createBetaDistributionArrays()
 {
-  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha);
-  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta);
+  FloatArrayType::Pointer alphas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Alpha, true);
+  FloatArrayType::Pointer betas = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Beta, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(alphas);
   vect.push_back(betas);
@@ -66,8 +66,8 @@ VectorOfFloatArray H5TransformationStatsDataDelegate::createBetaDistributionArra
 // -----------------------------------------------------------------------------
 VectorOfFloatArray H5TransformationStatsDataDelegate::createLogNormalDistributionArrays()
 {
-  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average);
-  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation);
+  FloatArrayType::Pointer avgs = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Average, true);
+  FloatArrayType::Pointer sd = FloatArrayType::CreateArray(0, SIMPL::StringConstants::StandardDeviation, true);
   QVector<FloatArrayType::Pointer> vect;
   vect.push_back(avgs);
   vect.push_back(sd);
@@ -149,7 +149,7 @@ int H5TransformationStatsDataDelegate::readTransformationStatsData(Transformatio
   err = readDistributionData(groupId, SIMPL::StringConstants::Feature_SizeVOmega3_Distributions, data->getFeatureSize_Omegas());
 
   // Read the Misorientation Bins
-  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins);
+  FloatArrayType::Pointer misoBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::MisorientationBins, true);
   err = misoBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -159,7 +159,7 @@ int H5TransformationStatsDataDelegate::readTransformationStatsData(Transformatio
   err = readMDFWeights(groupId, data);
 
   // Read the ODF Data
-  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF);
+  FloatArrayType::Pointer odfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::ODF, true);
   err = odfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -169,7 +169,7 @@ int H5TransformationStatsDataDelegate::readTransformationStatsData(Transformatio
   err = readODFWeights(groupId, data);
 
   // Read the Axis ODF Data
-  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation);
+  FloatArrayType::Pointer axisOdfBins = FloatArrayType::CreateArray(0, SIMPL::StringConstants::AxisOrientation, true);
   err = axisOdfBins->readH5Data(groupId);
   if(err < 0)
   {
@@ -325,10 +325,10 @@ int H5TransformationStatsDataDelegate::readMDFWeights(hid_t pid, TransformationS
 {
   int err = 0;
   std::vector<size_t> dims(1, 1);
-  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, dims, SIMPL::StringConstants::Angle, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight, true);
   dims[0] = 3;
-  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis);
+  FloatArrayType::Pointer axis = FloatArrayType::CreateArray(3, dims, SIMPL::StringConstants::Axis, true);
 
   VectorOfFloatArray mdfWeights;
   mdfWeights.push_back(angles);
@@ -355,11 +355,11 @@ int H5TransformationStatsDataDelegate::readODFWeights(hid_t pid, TransformationS
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -389,11 +389,11 @@ int H5TransformationStatsDataDelegate::readAxisODFWeights(hid_t pid, Transformat
 
   int err = 0;
 
-  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1);
-  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2);
-  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3);
-  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma);
-  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight);
+  FloatArrayType::Pointer euler1 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler1, true);
+  FloatArrayType::Pointer euler2 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler2, true);
+  FloatArrayType::Pointer euler3 = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Euler3, true);
+  FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Sigma, true);
+  FloatArrayType::Pointer weight = FloatArrayType::CreateArray(0, SIMPL::StringConstants::Weight, true);
 
   VectorOfFloatArray odfWeights;
   odfWeights.push_back(euler1);
@@ -649,7 +649,7 @@ int H5TransformationStatsDataDelegate::writeBinNumbers(TransformationStatsData*
 int H5TransformationStatsDataDelegate::readBinNumbers(TransformationStatsData* data, hid_t groupId)
 {
   int err = 0;
-  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber);
+  FloatArrayType::Pointer p = FloatArrayType::CreateArray(1, SIMPL::StringConstants::BinNumber, true);
   err = p->readH5Data(groupId);
   data->setBinNumbers(p);
   return err;
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index 2e64c558a1..e7cde1a118 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -89,7 +89,7 @@ FloatArrayType::Pointer PrecipitateStatsData::generateBinNumbers()
   if(!bins.empty())
   {
     // Copy this into the DataArray<float>
-    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber);
+    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber, true);
     ::memcpy(m_BinNumbers->getVoidPointer(0), &(bins.front()), bins.size() * sizeof(float));
   }
   return m_BinNumbers;
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index 6369180030..3dc8c10890 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -164,7 +164,7 @@ FloatArrayType::Pointer PrimaryStatsData::generateBinNumbers()
   if(!bins.empty())
   {
     // Copy this into the DataArray<float>
-    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber);
+    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber, true);
     ::memcpy(m_BinNumbers->getVoidPointer(0), &(bins.front()), bins.size() * sizeof(float));
   }
   return m_BinNumbers;
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index f9a7ab3277..34e954dcde 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -99,25 +99,25 @@ VectorOfFloatArray StatsData::CreateCorrelatedDistributionArrays(uint32_t distri
   if(distributionType == SIMPL::DistributionType::Beta)
   {
     v.resize(SIMPL::DistributionType::BetaColumnCount);
-    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Alpha);
+    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Alpha, true);
     v[0]->initializeWithZeros();
-    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Beta);
+    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Beta, true);
     v[1]->initializeWithZeros();
   }
   else if(distributionType == SIMPL::DistributionType::LogNormal)
   {
     v.resize(SIMPL::DistributionType::LogNormalColumnCount);
-    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Average);
+    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Average, true);
     v[0]->initializeWithZeros();
-    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::StandardDeviation);
+    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::StandardDeviation, true);
     v[1]->initializeWithZeros();
   }
   else if(distributionType == SIMPL::DistributionType::Power)
   {
     v.resize(SIMPL::DistributionType::PowerLawColumnCount);
-    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Alpha);
+    v[0] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::Alpha, true);
     v[0]->initializeWithZeros();
-    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::MinimumValue);
+    v[1] = FloatArrayType::CreateArray(numBins, SIMPL::StringConstants::MinimumValue, true);
     v[1]->initializeWithZeros();
   }
   else if(distributionType == SIMPL::DistributionType::UnknownDistributionType)
@@ -135,17 +135,17 @@ FloatArrayType::Pointer StatsData::CreateDistributionArrays(uint32_t distributio
   FloatArrayType::Pointer v;
   if(distributionType == SIMPL::DistributionType::Beta)
   {
-    v = FloatArrayType::CreateArray(SIMPL::DistributionType::BetaColumnCount, SIMPL::StringConstants::Feature_Size_Distribution);
+    v = FloatArrayType::CreateArray(SIMPL::DistributionType::BetaColumnCount, SIMPL::StringConstants::Feature_Size_Distribution, true);
     v->initializeWithZeros();
   }
   else if(distributionType == SIMPL::DistributionType::LogNormal)
   {
-    v = FloatArrayType::CreateArray(SIMPL::DistributionType::LogNormalColumnCount, SIMPL::StringConstants::Feature_Size_Distribution);
+    v = FloatArrayType::CreateArray(SIMPL::DistributionType::LogNormalColumnCount, SIMPL::StringConstants::Feature_Size_Distribution, true);
     v->initializeWithZeros();
   }
   else if(distributionType == SIMPL::DistributionType::Power)
   {
-    v = FloatArrayType::CreateArray(SIMPL::DistributionType::PowerLawColumnCount, SIMPL::StringConstants::Feature_Size_Distribution);
+    v = FloatArrayType::CreateArray(SIMPL::DistributionType::PowerLawColumnCount, SIMPL::StringConstants::Feature_Size_Distribution, true);
     v->initializeWithZeros();
   }
   return v;
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index 4a979050c7..83e53d9662 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -179,8 +179,8 @@ class StatsDataJsonRWTest
     // Feature Size Distribution
     {
       VectorOfFloatArray data;
-      FloatArrayType::Pointer d1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Average);
-      FloatArrayType::Pointer d2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::StandardDeviation);
+      FloatArrayType::Pointer d1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Average, true);
+      FloatArrayType::Pointer d2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::StandardDeviation, true);
       data.push_back(d1);
       data.push_back(d2);
       d1->setValue(0, 1.1f);
@@ -206,13 +206,13 @@ class StatsDataJsonRWTest
 
     // Write the Misorientation Weights
     {
-      FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Angle);
+      FloatArrayType::Pointer angles = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Angle, true);
       angles->initializeWithValue(45.0f);
       std::vector<size_t> vec;
       vec.push_back(3);
-      FloatArrayType::Pointer axis = FloatArrayType::CreateArray(1, vec, SIMPL::StringConstants::Axis);
+      FloatArrayType::Pointer axis = FloatArrayType::CreateArray(1, vec, SIMPL::StringConstants::Axis, true);
       axis->initializeWithValue(1.0);
-      FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
+      FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight, true);
       weight->initializeWithValue(1000.0f);
       arrays.clear();
       arrays.push_back(angles);
@@ -223,15 +223,15 @@ class StatsDataJsonRWTest
 
     // Write the ODF
     {
-      FloatArrayType::Pointer e1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler1);
+      FloatArrayType::Pointer e1 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler1, true);
       e1->initializeWithValue(45.0f);
-      FloatArrayType::Pointer e2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler2);
+      FloatArrayType::Pointer e2 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler2, true);
       e2->initializeWithValue(30.0f);
-      FloatArrayType::Pointer e3 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler3);
+      FloatArrayType::Pointer e3 = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Euler3, true);
       e3->initializeWithValue(60.0f);
-      FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Sigma);
+      FloatArrayType::Pointer sigma = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Sigma, true);
       sigma->initializeWithValue(2.0);
-      FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight);
+      FloatArrayType::Pointer weight = FloatArrayType::CreateArray(1, SIMPL::StringConstants::Weight, true);
       weight->initializeWithValue(100000.0f);
       arrays.clear();
       arrays.push_back(e1);
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index 5a068b9331..65158f75fa 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -164,7 +164,7 @@ FloatArrayType::Pointer TransformationStatsData::generateBinNumbers()
   if(!bins.empty())
   {
     // Copy this into the DataArray<float>
-    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber);
+    m_BinNumbers = FloatArrayType::CreateArray(bins.size(), SIMPL::StringConstants::BinNumber, true);
     ::memcpy(m_BinNumbers->getVoidPointer(0), &(bins.front()), bins.size() * sizeof(float));
   }
   return m_BinNumbers;
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
index fba727248e..9f07035b31 100755
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -182,7 +182,7 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
       if(getFileIsBinary() == true)
       {
         size_t totalSize = xDim * yDim * zDim;
-        typename DataArray<T>::Pointer bufferPtr = DataArray<T>::CreateArray(totalSize, "JUNK");
+        typename DataArray<T>::Pointer bufferPtr = DataArray<T>::CreateArray(totalSize, "JUNK", true);
         // Read all the xpoints in one shot into a buffer
         inStream.read(reinterpret_cast<char*>(bufferPtr->getPointer(0)), (totalSize * sizeof(T)));
         if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 8a12a38c14..1f4ebff60d 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -78,7 +78,7 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
   {                                                                                                                                                                                                    \
     using DataArrayType = DataArray<T>;                                                                                                                                                                \
     PySharedPtrClass<DataArrayType> instance(m, #NAME, parent, py::buffer_protocol());                                                                                                                 \
-    instance.def(py::init([](size_t numElements, QString name, T initValue) { return DataArrayType::CreateArray(numElements, name, initValue); }))                                                    \
+    instance.def(py::init([](size_t numElements, QString name, T initValue) { return std::shared_ptr<DataArrayType>(new DataArrayType(numElements, name, initValue)); }))                                                    \
         .def(py::init([](T* ptr, size_t numElements, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                                         \
           return DataArrayType::WrapPointer(ptr, numElements, cDims, name, ownsData);                                                                                  \
         }))                                                                                                                                                                                            \

From 0b743e3e10e07b6251ff36490863abe3783c0b24 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Jul 2019 15:58:01 -0400
Subject: [PATCH 135/397] Update itkInPlaceDream3DDataToImageFilter to modern
 C++ standards

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../ITK/itkInPlaceDream3DDataToImageFilter.h  | 40 ++++++++++---------
 .../itkInPlaceDream3DDataToImageFilter.hxx    | 31 ++++----------
 2 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index b9a2b7aac8..44b63b65de 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -15,16 +15,16 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<Pix
 {
 public:
   /** Standard class typedefs. */
-  typedef InPlaceDream3DDataToImageFilter Self;
-  typedef SmartPointer<Self> Pointer;
+  using Self = InPlaceDream3DDataToImageFilter;
+  using Pointer = SmartPointer<Self>;
 
-  typedef typename itk::Dream3DImage<PixelType, VDimension> ImageType;
-  typedef typename ImageType::PixelContainerType ImportImageContainerType;
-  typedef typename ImageType::Pointer ImagePointer;
-  typedef typename itk::NumericTraits<PixelType>::ValueType ValueType;
-  typedef typename ::DataArray<ValueType> DataArrayPixelType;
-  typedef typename itk::ImageSource<ImageType> Superclass;
-  typedef typename itk::SizeValueType SizeValueType;
+  using ImageType = typename itk::Dream3DImage<PixelType, VDimension>;
+  using ImportImageContainerType = typename ImageType::PixelContainerType;
+  using ImagePointer = typename ImageType::Pointer;
+  using ValueType = typename itk::NumericTraits<PixelType>::ValueType;
+  using DataArrayPixelType = typename ::DataArray<ValueType>;
+  using Superclass = typename itk::ImageSource<ImageType>;
+  using SizeValueType = typename itk::SizeValueType;
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);
@@ -47,23 +47,27 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<Pix
 
 protected:
   InPlaceDream3DDataToImageFilter();
-  virtual ~InPlaceDream3DDataToImageFilter();
+  ~InPlaceDream3DDataToImageFilter();
 
-  virtual void VerifyPreconditions() ITKv5_CONST override;
+  void VerifyPreconditions() ITKv5_CONST override;
 
-  virtual void GenerateOutputInformation() override;
-  virtual void GenerateData() override;
-  DataContainer::Pointer m_DataContainer;
+  void GenerateOutputInformation() override;
+  void GenerateData() override;
+  DataContainer::Pointer m_DataContainer = DataContainer::NullPointer();
 
 private:
-  InPlaceDream3DDataToImageFilter(const InPlaceDream3DDataToImageFilter&) = delete; // Copy Constructor Not Implemented
-  void operator=(const InPlaceDream3DDataToImageFilter&) = delete;                  // Move assignment Not Implemented
   using Superclass::SetInput;
   std::string m_DataArrayName;
   std::string m_AttributeMatrixArrayName;
   typename ImportImageContainerType::Pointer m_ImportImageContainer;
-  bool m_InPlace;                        // enable the possibility of in-place
-  bool m_PixelContainerWillOwnTheBuffer; // By default, this filter does not take data ownership
+  bool m_InPlace = true;                         // enable the possibility of in-place
+  bool m_PixelContainerWillOwnTheBuffer = false; // By default, this filter does not take data ownership
+
+public:
+  InPlaceDream3DDataToImageFilter(const InPlaceDream3DDataToImageFilter&) = delete;            // Copy Constructor Not Implemented
+  InPlaceDream3DDataToImageFilter(InPlaceDream3DDataToImageFilter&&) = delete;                 // Move Constructor Not Implemented
+  InPlaceDream3DDataToImageFilter& operator=(const InPlaceDream3DDataToImageFilter&) = delete; // Copy Assignment Not Implemented
+  InPlaceDream3DDataToImageFilter& operator=(InPlaceDream3DDataToImageFilter&&) = delete;      // Move Assignment Not Implemented
 };
 } // namespace itk
 
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index f21a98db5d..516965a117 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -6,25 +6,13 @@
 namespace itk
 {
 
-template< typename PixelType, unsigned int VDimension >
-InPlaceDream3DDataToImageFilter<PixelType, VDimension>::InPlaceDream3DDataToImageFilter()
-{
-  m_DataContainer = DataContainer::NullPointer();
-  m_InPlace = true;
-  m_PixelContainerWillOwnTheBuffer = false;
-}
-
-
-template< typename PixelType, unsigned int VDimension >
-InPlaceDream3DDataToImageFilter<PixelType, VDimension>::~InPlaceDream3DDataToImageFilter()
-{
-}
-
+template <typename PixelType, unsigned int VDimension>
+InPlaceDream3DDataToImageFilter<PixelType, VDimension>::InPlaceDream3DDataToImageFilter() = default;
+template <typename PixelType, unsigned int VDimension>
+InPlaceDream3DDataToImageFilter<PixelType, VDimension>::~InPlaceDream3DDataToImageFilter() = default;
 
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::SetInput(DataContainer::Pointer& dc)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceDream3DDataToImageFilter<PixelType, VDimension>::SetInput(DataContainer::Pointer& dc)
 {
   if (!(dc == m_DataContainer))
   {
@@ -33,11 +21,8 @@ InPlaceDream3DDataToImageFilter< PixelType, VDimension >
   }
 }
 
-
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceDream3DDataToImageFilter< PixelType, VDimension >
-::VerifyPreconditions() ITKv5_CONST
+template <typename PixelType, unsigned int VDimension>
+void InPlaceDream3DDataToImageFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
 {
   if (m_DataContainer == DataContainer::NullPointer() )
   {

From 5a96db84c0433872bbdb59955bd84120e5b553b0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Jul 2019 17:24:46 -0400
Subject: [PATCH 136/397] Properly implement itk::Command subclasses.

Use the ITK macros to properly implement ITK's smart pointer paradigm

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../ITK/itkDream3DFilterInterruption.h        |  42 +++++---
 Source/SIMPLib/ITK/itkProgressObserver.hpp    | 102 +++++++++---------
 2 files changed, 80 insertions(+), 64 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
index ad2abc4a0e..702a97a9ee 100644
--- a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
+++ b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
@@ -3,31 +3,29 @@
 #include <itkCommand.h>
 #include <itkProcessObject.h>
 
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
 namespace itk
 {
 
 class Dream3DFilterInterruption : public Command
 {
 public:
-  /** Standard class typedefs. */
-  typedef Dream3DFilterInterruption Self;
-  typedef Command Superclass;
-  typedef SmartPointer<Self> Pointer;
-  typedef SmartPointer<const Self> ConstPointer;
-  itkNewMacro(Dream3DFilterInterruption);
-  itkSetObjectMacro(Filter, AbstractFilter);
+  ITK_DISALLOW_COPY_AND_ASSIGN(Dream3DFilterInterruption);
 
-private:
-  AbstractFilter* m_Filter;
-  Dream3DFilterInterruption()
-  {
-    m_Filter = nullptr;
-  }
+  /** Standard class type aliases. */
+  using Self = Dream3DFilterInterruption;
+  using Pointer = SmartPointer<Self>;
+
+  /** Method for creation through the object factory. */
+  itkNewMacro(Self);
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(Dream3DFilterInterruption, itk::Command);
 
-public:
   void Execute(Object* caller, const EventObject& event) override
   {
-    if(m_Filter && m_Filter->getCancel())
+    if(m_Filter != nullptr && m_Filter->getCancel())
     {
       ProcessObject* po = dynamic_cast<ProcessObject*>(caller);
       if(po)
@@ -42,9 +40,21 @@ class Dream3DFilterInterruption : public Command
     object->AbortGenerateDataOn();
   }
 
-  void Execute(const Object*, const EventObject&) override // has to be implemented
+  void Execute(const Object* o_not_used, const EventObject& eo_not_used) override // has to be implemented
   {
   }
+
+  void SetFilter(AbstractFilter* filter)
+  {
+    m_Filter = filter;
+  }
+
+protected:
+  Dream3DFilterInterruption() = default;
+  ~Dream3DFilterInterruption() override = default;
+
+private:
+  AbstractFilter* m_Filter = nullptr;
 };
 
 } // namespace itk
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 3ebecd9ee0..6d8e5174e7 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -40,72 +40,78 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "itkProcessObject.h"
 #include "itkCommand.h"
+#include "itkProcessObject.h"
 
 namespace itk
 {
 class ProgressObserver : public itk::Command
 {
-  public:
-    SIMPL_SHARED_POINTERS(ProgressObserver)
-    SIMPL_STATIC_NEW_MACRO(ProgressObserver)
+public:
+  ITK_DISALLOW_COPY_AND_ASSIGN(ProgressObserver);
+
+  /** Standard class type aliases. */
+  using Self = ProgressObserver;
+  using Pointer = SmartPointer<Self>;
+
+  /** Method for creation through the object factory. */
+  itkNewMacro(Self);
+
+  /** Run-time type information (and related methods). */
+  itkTypeMacro(ProgressObserver, itk::Command);
+
+  void Execute(itk::Object* caller, const itk::EventObject& event) override
+  {
+    Execute((const itk::Object*)caller, event);
+  }
 
-    void Execute(itk::Object* caller, const itk::EventObject& event) override
+  void Execute(const itk::Object* caller, const itk::EventObject& event) override
+  {
+    if(!itk::ProgressEvent().CheckEvent(&event))
     {
-      Execute((const itk::Object*)caller, event);
+      return;
     }
-
-    void Execute(const itk::Object* caller, const itk::EventObject& event) override
+    const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
+    if(processObject == nullptr)
     {
-      if(!itk::ProgressEvent().CheckEvent(&event))
-      {
-        return;
-      }
-      const auto* processObject = dynamic_cast<const itk::ProcessObject*>(caller);
-      if(!processObject)
-      {
-        return;
-      }
-
-      QString progressStr = QString::number(processObject->GetProgress() * 100);
-
-      QString ss;
-      if (m_MessagePrefix.isEmpty())
-      {
-        ss = QObject::tr("%1%").arg(progressStr);
-      }
-      else
-      {
-        ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
-      }
-
-      if (m_Filter)
-      {
-        m_Filter->notifyStatusMessage(ss);
-      }
+      return;
     }
 
-    void setMessagePrefix(const QString &prefix)
+    QString progressStr = QString::number(processObject->GetProgress() * 100, 'f', 0);
+
+    QString ss;
+    if(m_MessagePrefix.isEmpty())
+    {
+      ss = QObject::tr("%1%").arg(progressStr);
+    }
+    else
     {
-      m_MessagePrefix = prefix;
+      ss = QObject::tr("%1: %2%").arg(m_MessagePrefix).arg(progressStr);
     }
 
-    void setFilter(AbstractFilter* filter)
+    if(m_Filter != nullptr)
     {
-      m_Filter = filter;
+      m_Filter->notifyStatusMessage(ss);
     }
+  }
+
+  void SetMessagePrefix(const QString& prefix)
+  {
+    m_MessagePrefix = prefix;
+  }
+
+  void SetFilter(AbstractFilter* filter)
+  {
+    m_Filter = filter;
+  }
 
-  protected:
-    ProgressObserver() {}
+protected:
+  ProgressObserver() = default;
 
-  private:
-    AbstractFilter* m_Filter = nullptr;
-    QString m_MessagePrefix;
+  ~ProgressObserver() override = default;
 
-    ProgressObserver(const ProgressObserver&) = delete; // Copy Constructor Not Implemented
-    ProgressObserver(ProgressObserver&&) = delete;      // Move Constructor Not Implemented
-    ProgressObserver& operator=(const ProgressObserver&) = delete; // Copy Assignment Not Implemented
-    ProgressObserver& operator=(ProgressObserver&&) = delete;      // Move Assignment Not Implemented
+private:
+  AbstractFilter* m_Filter = nullptr;
+  QString m_MessagePrefix;
 };
-} // end of itk namespace
+} // namespace itk

From a3c5957cd4f9d1d68e1e4fc60693ebe25e44daee Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Jul 2019 17:25:50 -0400
Subject: [PATCH 137/397] Fix code to remove QGradient warning during runtime.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
index ec5b447172..04dd4e1cd0 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
@@ -185,10 +185,17 @@ QString PipelineListWidget::getStartPipelineInProgressStyle(float percent)
 
   QString cssStr;
   QTextStream ss(&cssStr);
+  float offset = 0.001f;
+  // At the end of the pipeline the percent will = 1.0 and the next stop will be 1.001 which QGradiant does not like
+  // Force it to just 1.0 to remove warnings.
+  if(percent >= 1.0f)
+  {
+    offset = 0.0f;
+  }
   ss << "QPushButton { ";
   ss << QString("background: qlineargradient(x1:0, y1:0.5, x2:1, y2:0.5, stop:0 rgb(29, 168, 29), stop:%1 rgb(29, 168, 29), stop:%2 rgb(0, 118, 6), stop:1 rgb(0, 118, 6));\n")
             .arg(percent)
-            .arg(percent + 0.001);
+            .arg(percent + offset);
   ss << "color: white;\n";
   ss << "border-radius: 0px;\n";
   ss << fontString;

From aafaf56686f2aeb8412c9358a591a5198329dd9a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 17 Jul 2019 09:33:20 -0400
Subject: [PATCH 138/397] Fix compile errors on early versions of Visual Studio
 2017.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidgets/MontageSelectionWidget.cpp  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index c8fc315b60..a3d618d905 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -116,11 +116,11 @@ void MontageSelectionWidget::setupGui()
   // Connect widget signals
   connect(m_Ui->prefixStringEdit, &QtSStringEdit::valueChanged, this, &MontageSelectionWidget::causePreflight);
   connect(m_Ui->suffixStringEdit, &QtSStringEdit::valueChanged, this, &MontageSelectionWidget::causePreflight);
-  connect(m_Ui->paddingSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
-  connect(m_Ui->rowStartSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
-  connect(m_Ui->rowEndSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
-  connect(m_Ui->colStartSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
-  connect(m_Ui->colEndSpinBox, qOverload<int>(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->paddingSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->rowStartSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->rowEndSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->colStartSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
+  connect(m_Ui->colEndSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &MontageSelectionWidget::causePreflight);
 }
 
 // -----------------------------------------------------------------------------

From 62420c7152093c382f6d78820734869a90795e5c Mon Sep 17 00:00:00 2001
From: Megna Shah <megnashah@gmail.com>
Date: Wed, 17 Jul 2019 13:29:19 -0400
Subject: [PATCH 139/397] Reduce code clutter by returning inline generated
 code

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/ITK/itkGetComponentsDimensions.h  | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
index 6718fa666d..0b60b7cf3f 100644
--- a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
+++ b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
@@ -40,50 +40,52 @@
 namespace ITKDream3DHelper
 {
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(PixelType*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(PixelType*)
 {
-  std::vector<size_t> cDims(1, 1);
-  return cDims;
+  return {1};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
 {
-  std::vector<size_t> cDims(36, 1);
-  return cDims;
+  return {36};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
 {
-  std::vector<size_t> cDims(3, 1);
-  return cDims;
+  return {3};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
 {
-  std::vector<size_t> cDims(2, 1);
-  return cDims;
+  return {2};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 4>*)
 {
-  std::vector<size_t> cDims(1, 3);
-  return cDims;
+  return {4};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 11>*)
 {
-  std::vector<size_t> cDims(1, 4);
-  return cDims;
+  return {11};
 }
 
-template <class PixelType>
-std::vector<size_t> GetComponentsDimensions()
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 10>*)
+{
+  return {10};
+}
+
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
+{
+  return {3};
+}
+
+template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
+{
+  return {4};
+}
+
+template <class PixelType> std::vector<size_t> GetComponentsDimensions()
 {
   return GetComponentsDimensions_impl(static_cast<PixelType*>(0));
 }

From cc72b13b17616a5613dee62816f46df7d1b866d1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 18 Jul 2019 21:27:23 -0400
Subject: [PATCH 140/397] Fix bad logic to determine the requirements of a
 DataArrayPath

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Widgets/DataArrayPathSelectionWidget.cpp  | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 4bc2a828cc..ca72028f21 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -354,9 +354,26 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
+  using SizeTVectorType = std::vector<size_t>;
 
-  bool b = !FilterParameterWidgetUtils::VectorContains<size_t>(reqs.componentDimensions, da->getComponentDimensions());
-  return !(!reqs.componentDimensions.empty() && !b);
+  if(reqs.componentDimensions.empty())
+  {
+    return true;
+  }
+  std::vector<SizeTVectorType> reqComps = reqs.componentDimensions;
+  std::vector<size_t> daComp = da->getComponentDimensions();
+  bool contains = false;
+  for(const auto& reqComp : reqComps)
+  {
+    if(reqComp == daComp)
+    {
+      contains = true;
+      break;
+    }
+  }
+
+  // bool b = !FilterParameterWidgetUtils::VectorContains<size_t>(reqComp, daComp);
+  return contains;
 }
 
 // -----------------------------------------------------------------------------

From 4787408750d6e05a781fe002b43120c08289d832 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 30 Jul 2019 12:27:01 -0400
Subject: [PATCH 141/397] Fix issues determining when to use a vector image
 versus an RGB/RGBA Image

The recent change to the itkGetComponentDimensions rippled to cause these changes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 45 ++++++++++++-------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index ef86310a25..4fe55969b4 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -183,7 +183,7 @@
 // Select vector, RGB/RGBA, or scalar images
 #define Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                               \
   std::vector<size_t> cDims = ptr->getComponentDimensions();                                                                                                                                           \
-  if(cDims.size() > 1)                                                                                                                                                                                 \
+  if(cDims[0] > 1 && DREAM3D_USE_Vector == 1)                                                                                                                                                          \
   {                                                                                                                                                                                                    \
     Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, DREAM3D_USE_Vector);                                                       \
   }                                                                                                                                                                                                    \
@@ -199,7 +199,7 @@
     }                                                                                                                                                                                                  \
     else                                                                                                                                                                                               \
     {                                                                                                                                                                                                  \
-      setErrorCondition(errorCondition, QString("Size of tuple not handled:%1").arg(cDims[0]));                                                                                                        \
+      setErrorCondition(errorCondition, QString("Value of Component Dimension not Handled: cDims[0] = %1").arg(cDims[0]));                                                                             \
     }                                                                                                                                                                                                  \
   }
 
@@ -237,44 +237,59 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // Define the input and output pixel types, depending on 'isTypeOUT' value. This is required for
 // vectors because it is not possible to pass a macro argument that contains a comma.
-#define DefineVectorPixelTypes_0(typeIN, typeOUT, vDim)                       \
-  typedef itk::Vector<typeIN, vDim> InputPixelType; \
-  typedef itk::Vector<typeIN, vDim> OutputPixelType;
-#define DefineVectorPixelTypes_1(typeIN, typeOUT, vDim)                       \
-  typedef itk::Vector<typeIN, vDim> InputPixelType; \
-  typedef typeOUT OutputPixelType;
+#define DefineVectorPixelTypes_0(typeIN, typeOUT, vDim)                                                                                                                                                \
+  using InputPixelType = itk::Vector<typeIN, vDim>;                                                                                                                                                    \
+  using OutputPixelType = itk::Vector<typeIN, vDim>;
+#define DefineVectorPixelTypes_1(typeIN, typeOUT, vDim)                                                                                                                                                \
+  using InputPixelType = itk::Vector<typeIN, vDim>;                                                                                                                                                    \
+  using OutputPixelType = typeOUT;
+
 // Expands the value of 'Vector' that is 0 if the filter does not accept 'Vector' images, and '1' if it does.
 #define Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)        \
   Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)
+
 #define Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)        \
   Dream3DTemplateAliasMacroCaseVectorImage1_##Vector(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)
+
 // Vector images not accepted, throw an error message if a vector image is given.
 #define Dream3DTemplateAliasMacroCaseVectorImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
   setErrorCondition(                                                                                                                                                                                   \
       errorCondition,                                                                                                                                                                                  \
-      "Vector not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters");             \
+      "Vector not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters");
+
 // Vector images: Call the given function with the correct dimension after defining the input and output vector types.
 #define Dream3DTemplateAliasMacroCaseVectorImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
-  if(cDims.size() == 2)                                                                                                                                                                                \
+  if(cDims[0] == 2)                                                                                                                                                                                    \
   {                                                                                                                                                                                                    \
     DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 2);                                                                                                                                            \
     Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
   }                                                                                                                                                                                                    \
-  else if(cDims.size() == 3)                                                                                                                                                                           \
+  else if(cDims[0] == 3)                                                                                                                                                                               \
   {                                                                                                                                                                                                    \
     DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 3);                                                                                                                                            \
     Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
   }                                                                                                                                                                                                    \
-  else if(cDims.size() == 36)                                                                                                                                                                          \
+  else if(cDims[0] == 11)                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 11);                                                                                                                                           \
+    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(cDims[0] == 10)                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 10);                                                                                                                                           \
+    Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(cDims[0] == 36)                                                                                                                                                                              \
   {                                                                                                                                                                                                    \
     DefineVectorPixelTypes_##isTypeOUT(typeIN, typeOUT, 36);                                                                                                                                           \
     Dream3DTemplateAliasMacroCaseIf(InputPixelType, OutputPixelType, call, typeOUTTypename, dimension);                                                                                                \
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    setErrorCondition(                                                                                                                                                                                 \
-        errorCondition,                                                                                                                                                                                \
-        "Vector dimension not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters"); \
+    QString errorMessage = QString("Vector dimension not supported. cDims[0] = %1 Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance "            \
+                                   "ImageFilter' or 'Convert Rgb To GrayScale' filters")                                                                                                               \
+                               .arg(cDims.size());                                                                                                                                                     \
+    setErrorCondition(errorCondition, errorMessage);                                                                                                                                                   \
   }
 
 //////////////////////////////////////////////////////////////////////////////

From 577d21e7033e4d40a8c08887cf6a9923c573e609 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Fri, 16 Aug 2019 11:17:49 -0400
Subject: [PATCH 142/397] Fixed braces around initialization of subobjects
 (#374)

* Added an extra set of braces around the various SIMPLRange array initialization points to silence warnings for MacOS.
* This has been tested to ensure this does not add additional warnings for Windows.
* This affects SIMPLRange, SIMPLRange2D, and SIMPLRange3D.
---
 Source/SIMPLib/Common/SIMPLRange.cpp   |  6 +++---
 Source/SIMPLib/Common/SIMPLRange2D.cpp |  6 +++---
 Source/SIMPLib/Common/SIMPLRange3D.cpp | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLRange.cpp b/Source/SIMPLib/Common/SIMPLRange.cpp
index 46a6507506..88bbcb3d0a 100644
--- a/Source/SIMPLib/Common/SIMPLRange.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange.cpp
@@ -37,7 +37,7 @@
 //
 // -----------------------------------------------------------------------------
 SIMPLRange::SIMPLRange()
-: m_Range({0, 0})
+: m_Range({{0, 0}})
 {
 }
 
@@ -45,7 +45,7 @@ SIMPLRange::SIMPLRange()
 //
 // -----------------------------------------------------------------------------
 SIMPLRange::SIMPLRange(size_t begin, size_t end)
-: m_Range({begin, end})
+: m_Range({{begin, end}})
 {
 }
 
@@ -54,7 +54,7 @@ SIMPLRange::SIMPLRange(size_t begin, size_t end)
 //
 // -----------------------------------------------------------------------------
 SIMPLRange::SIMPLRange(const tbb::blocked_range<size_t>& r)
-: m_Range({r.begin(), r.end()})
+: m_Range({{r.begin(), r.end()}})
 {
 }
 #endif
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.cpp b/Source/SIMPLib/Common/SIMPLRange2D.cpp
index 2b27d74043..b2e0eb4ef1 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange2D.cpp
@@ -37,7 +37,7 @@
 //
 // -----------------------------------------------------------------------------
 SIMPLRange2D::SIMPLRange2D()
-: m_Range({0, 0, 0, 0})
+: m_Range({{0, 0, 0, 0}})
 {
 }
 
@@ -45,7 +45,7 @@ SIMPLRange2D::SIMPLRange2D()
 //
 // -----------------------------------------------------------------------------
 SIMPLRange2D::SIMPLRange2D(size_t initRow, size_t initCol, size_t endRow, size_t endCol)
-: m_Range({initRow, initCol, endRow, endCol})
+: m_Range({{initRow, initCol, endRow, endCol}})
 {
 }
 
@@ -54,7 +54,7 @@ SIMPLRange2D::SIMPLRange2D(size_t initRow, size_t initCol, size_t endRow, size_t
 //
 // -----------------------------------------------------------------------------
 SIMPLRange2D::SIMPLRange2D(const tbb::blocked_range2d<size_t, size_t>& r)
-: m_Range({r.rows().begin(), r.cols().begin(), r.rows().end(), r.cols().end()})
+: m_Range({{r.rows().begin(), r.cols().begin(), r.rows().end(), r.cols().end()}})
 {
 }
 #endif
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.cpp b/Source/SIMPLib/Common/SIMPLRange3D.cpp
index 2396771f8c..2753cede76 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange3D.cpp
@@ -37,7 +37,7 @@
 //
 // -----------------------------------------------------------------------------
 SIMPLRange3D::SIMPLRange3D()
-: m_Range({0, 0, 0, 0, 0, 0})
+: m_Range({{0, 0, 0, 0, 0, 0}})
 {
 }
 
@@ -45,7 +45,7 @@ SIMPLRange3D::SIMPLRange3D()
 //
 // -----------------------------------------------------------------------------
 SIMPLRange3D::SIMPLRange3D(size_t x, size_t y, size_t z)
-: m_Range({0, x, 0, y, 0, z})
+: m_Range({{0, x, 0, y, 0, z}})
 {
 }
 
@@ -53,7 +53,7 @@ SIMPLRange3D::SIMPLRange3D(size_t x, size_t y, size_t z)
 //
 // -----------------------------------------------------------------------------
 SIMPLRange3D::SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax)
-: m_Range({xMin, xMax, yMin, yMax, zMin, zMax})
+: m_Range({{xMin, xMax, yMin, yMax, zMin, zMax}})
 {
 }
 
@@ -62,7 +62,7 @@ SIMPLRange3D::SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, s
 //
 // -----------------------------------------------------------------------------
 SIMPLRange3D::SIMPLRange3D(const tbb::blocked_range3d<size_t>& r)
-: m_Range({r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end()})
+: m_Range({{r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end()}})
 {
 }
 #endif
@@ -80,7 +80,7 @@ SIMPLRange3D::RangeType SIMPLRange3D::getRange() const
 // -----------------------------------------------------------------------------
 SIMPLRange3D::DimensionRange SIMPLRange3D::getXRange() const
 {
-  return {m_Range[0], m_Range[1]};
+  return {{m_Range[0], m_Range[1]}};
 }
 
 // -----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ SIMPLRange3D::DimensionRange SIMPLRange3D::getXRange() const
 // -----------------------------------------------------------------------------
 SIMPLRange3D::DimensionRange SIMPLRange3D::getYRange() const
 {
-  return {m_Range[2], m_Range[3]};
+  return {{m_Range[2], m_Range[3]}};
 }
 
 // -----------------------------------------------------------------------------
@@ -96,7 +96,7 @@ SIMPLRange3D::DimensionRange SIMPLRange3D::getYRange() const
 // -----------------------------------------------------------------------------
 SIMPLRange3D::DimensionRange SIMPLRange3D::getZRange() const
 {
-  return {m_Range[4], m_Range[5]};
+  return {{m_Range[4], m_Range[5]}};
 }
 
 // -----------------------------------------------------------------------------

From e4fc032f17fe560914c6173d684c26ed26730a6b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 16 Aug 2019 11:54:00 -0400
Subject: [PATCH 143/397] Fix rendering issues with ColorTable dialog. Add Hot
 Iron color table

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../ColorTablePresets/ColorTablePresets.json  | 127 ++++++++++++++++++
 .../Testing/Cxx/GenerateColorTableTest.cpp    |  65 +++++++++
 Source/SIMPLib/Utilities/ColorTable.cpp       |   2 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp  |  22 +--
 4 files changed, 204 insertions(+), 12 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CoreResources/ColorTablePresets/ColorTablePresets.json b/Source/SIMPLib/CoreFilters/CoreResources/ColorTablePresets/ColorTablePresets.json
index b2b8fdc6ed..334dbfb59b 100644
--- a/Source/SIMPLib/CoreFilters/CoreResources/ColorTablePresets/ColorTablePresets.json
+++ b/Source/SIMPLib/CoreFilters/CoreResources/ColorTablePresets/ColorTablePresets.json
@@ -412,6 +412,133 @@
          0.301960784314
       ]
    },
+   {
+      "ColorSpace": "RGB",
+      "Name": "Hot Iron",
+      "NanColor": [1,1,1],
+      "RGBPoints": [
+         0,0,0,0,
+         0.0083999997,0,0,0.14117648,
+         0.016799999,0,0,0.2,
+         0.0252,0,0,0.25882354,
+         0.033599999,0,0,0.31764707,
+         0.041999999,0.0078431377,0,0.35294119,
+         0.0504,0.015686275,0,0.3882353,
+         0.058800001,0.027450981,0,0.41568628,
+         0.067199998,0.043137256,0,0.4509804,
+         0.075599998,0.054901961,0,0.46666667,
+         0.083999999,0.078431375,0,0.48235294,
+         0.092399999,0.10588235,0,0.50196081,
+         0.1008,0.12941177,0,0.52156866,
+         0.1092,0.16078432,0,0.53725493,
+         0.1176,0.1882353,0,0.54901963,
+         0.126,0.21568628,0,0.56078434,
+         0.1344,0.23921569,0,0.57254905,
+         0.1428,0.25882354,0,0.58431375,
+         0.1512,0.28235295,0,0.58823532,
+         0.1596,0.30588236,0,0.59215689,
+         0.168,0.32941177,0,0.59607846,
+         0.17640001,0.35686275,0,0.60000002,
+         0.1848,0.38039216,0,0.60784316,
+         0.19320001,0.40784314,0,0.60784316,
+         0.2016,0.43137255,0,0.61176473,
+         0.20999999,0.4509804,0,0.6156863,
+         0.2184,0.47843137,0,0.6156863,
+         0.22679999,0.50196081,0,0.6156863,
+         0.2352,0.52549022,0,0.6156863,
+         0.2436,0.54509807,0,0.6156863,
+         0.252,0.57254905,0,0.61176473,
+         0.2604,0.59607846,0,0.60784316,
+         0.26879999,0.6156863,0,0.60784316,
+         0.27720001,0.63529414,0,0.60784316,
+         0.28560001,0.65490198,0,0.60392159,
+         0.294,0.67058825,0,0.60000002,
+         0.30239999,0.68627453,0.0039215689,0.59607846,
+         0.31079999,0.69803923,0.0039215689,0.59215689,
+         0.31920001,0.71372551,0.0078431377,0.58431375,
+         0.3276,0.72549021,0.015686275,0.58431375,
+         0.336,0.73725492,0.019607844,0.57647061,
+         0.34439999,0.74901962,0.023529412,0.57254905,
+         0.35280001,0.75686276,0.031372551,0.56470591,
+         0.3612,0.7647059,0.043137256,0.55686277,
+         0.3696,0.7764706,0.050980393,0.54509807,
+         0.37799999,0.78823531,0.06666667,0.52941179,
+         0.38640001,0.79607844,0.078431375,0.51764709,
+         0.39480001,0.80784315,0.090196081,0.49803922,
+         0.4032,0.81568629,0.10196079,0.47450981,
+         0.41159999,0.82352942,0.11372549,0.45490196,
+         0.41999999,0.83137256,0.12941177,0.43529412,
+         0.42840001,0.8392157,0.14509805,0.40392157,
+         0.4368,0.8509804,0.16078432,0.38039216,
+         0.4452,0.85882354,0.18039216,0.34901962,
+         0.45359999,0.86666667,0.19215687,0.30588236,
+         0.46200001,0.87450981,0.20784314,0.25882354,
+         0.47040001,0.87843138,0.21960784,0.21176471,
+         0.4788,0.88627452,0.23529412,0.16470589,
+         0.48719999,0.89411765,0.25098041,0.11764706,
+         0.49559999,0.89803922,0.26666668,0.098039217,
+         0.50400001,0.90588236,0.28235295,0.078431375,
+         0.51239997,0.90980393,0.29803923,0.062745102,
+         0.52079999,0.91764706,0.30588236,0.047058824,
+         0.52920002,0.92156863,0.32156864,0.039215688,
+         0.53759998,0.9254902,0.33725491,0.031372551,
+         0.546,0.92941177,0.35294119,0.027450981,
+         0.55440003,0.93333334,0.36470589,0.019607844,
+         0.56279999,0.93725491,0.3764706,0.015686275,
+         0.57120001,0.94117647,0.39215687,0.011764706,
+         0.57959998,0.94509804,0.40392157,0.011764706,
+         0.588,0.94509804,0.41568628,0.0078431377,
+         0.59640002,0.94901961,0.42745098,0.0039215689,
+         0.60479999,0.95294118,0.44313726,0.0039215689,
+         0.61320001,0.95686275,0.45490196,0,
+         0.62159997,0.95686275,0.47058824,0,
+         0.63,0.96078432,0.49019608,0,
+         0.63840002,0.96470588,0.50588238,0,
+         0.64679998,0.96862745,0.52156866,0,
+         0.6552,0.97254902,0.53333336,0,
+         0.66360003,0.97254902,0.54509807,0,
+         0.67199999,0.97647059,0.55686277,0,
+         0.68040001,0.97647059,0.56862748,0,
+         0.68879998,0.98039216,0.58431375,0,
+         0.6972,0.98431373,0.60392159,0,
+         0.70560002,0.98823529,0.62352943,0,
+         0.71399999,0.99215686,0.63921571,0,
+         0.72240001,0.99215686,0.65882355,0,
+         0.73079997,0.99215686,0.67450982,0,
+         0.7392,0.99607843,0.6901961,0,
+         0.74760002,0.99607843,0.7019608,0,
+         0.75599998,0.99607843,0.72156864,0,
+         0.76440001,0.99607843,0.73333335,0,
+         0.77280003,0.99607843,0.74901962,0,
+         0.78119999,0.99607843,0.7647059,0,
+         0.78960001,0.99607843,0.78039217,0,
+         0.79799998,0.99607843,0.79215688,0.0039215689,
+         0.8064,0.99607843,0.80392158,0.0078431377,
+         0.81480002,0.99607843,0.81568629,0.019607844,
+         0.82319999,0.99607843,0.83137256,0.035294119,
+         0.83160001,0.99607843,0.84705883,0.047058824,
+         0.83999997,1,0.85882354,0.05882353,
+         0.8484,1,0.86666667,0.090196081,
+         0.85680002,1,0.87843138,0.1254902,
+         0.86519998,1,0.89019608,0.15294118,
+         0.87360001,1,0.89803922,0.19607843,
+         0.88200003,1,0.90980393,0.24705882,
+         0.89039999,1,0.92156863,0.29411766,
+         0.89880002,1,0.93333334,0.34509805,
+         0.90719998,1,0.93725491,0.40000001,
+         0.9156,1,0.94509804,0.45490196,
+         0.92400002,1,0.94901961,0.52549022,
+         0.93239999,1,0.95686275,0.58431375,
+         0.94080001,1,0.96078432,0.64313728,
+         0.94919997,1,0.96862745,0.7019608,
+         0.9576,1,0.97254902,0.75294119,
+         0.96600002,1,0.97647059,0.79607844,
+         0.97439998,1,0.98431373,0.84705883,
+         0.98280001,1,0.99215686,0.89411765,
+         0.99119997,1,0.99607843,0.93725491,
+         0.99959999,1,1,0.97647059
+      ]
+   },
    {
       "ColorSpace" : "RGB",
       "Name" : "Cold and Hot",
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 32d8f486b2..9d6c827e7c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -55,6 +55,70 @@
 
 #include "SIMPLib/CoreFilters/GenerateColorTable.h"
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString createErrorMessageFromJsonParseError(const QJsonParseError& parseError)
+{
+  QString msg;
+  QTextStream ss(&msg);
+
+  switch(parseError.error)
+  {
+  case QJsonParseError::NoError:
+    ss << "No Error";
+    break;
+  case QJsonParseError::UnterminatedObject:
+    ss << "Json Parsing Error: " << parseError.error << " of type UnterminatedObject. An object is not correctly terminated with a closing curly bracket";
+    break;
+  case QJsonParseError::MissingNameSeparator:
+    ss << "Json Parsing Error: " << parseError.error << " of type MissingNameSeparator. A comma separating different items is missing";
+    break;
+  case QJsonParseError::UnterminatedArray:
+    ss << "Json Parsing Error: " << parseError.error << " of type UnterminatedArray. The array is not correctly terminated with a closing square bracket";
+    break;
+  case QJsonParseError::MissingValueSeparator:
+    ss << "Json Parsing Error: " << parseError.error << " of type MissingValueSeparator. A colon separating keys from values inside objects is missing";
+    break;
+  case QJsonParseError::IllegalValue:
+    ss << "Json Parsing Error: " << parseError.error << " of type IllegalValue. The value is illegal";
+    break;
+  case QJsonParseError::TerminationByNumber:
+    ss << "Json Parsing Error: " << parseError.error << " of type TerminationByNumber. The input stream ended while parsing a number";
+    break;
+  case QJsonParseError::IllegalNumber:
+    ss << "Json Parsing Error: " << parseError.error << " of type IllegalNumber. The number is not well formed";
+    break;
+  case QJsonParseError::IllegalEscapeSequence:
+    ss << "Json Parsing Error: " << parseError.error << " of type IllegalEscapeSequence. An illegal escape sequence occurred in the input";
+    break;
+  case QJsonParseError::IllegalUTF8String:
+    ss << "Json Parsing Error: " << parseError.error << " of type IllegalUTF8String. An illegal UTF8 sequence occurred in the input";
+    break;
+  case QJsonParseError::UnterminatedString:
+    ss << "Json Parsing Error: " << parseError.error << " of type UnterminatedString. A string wasn't terminated with a quote";
+    break;
+  case QJsonParseError::MissingObject:
+    ss << "Json Parsing Error: " << parseError.error << " of type MissingObject. An object was expected but couldn't be found";
+    break;
+  case QJsonParseError::DeepNesting:
+    ss << "Json Parsing Error: " << parseError.error << " of type DeepNesting. The JSON document is too deeply nested for the parser to parse it";
+    break;
+  case QJsonParseError::DocumentTooLarge:
+    ss << "Json Parsing Error: " << parseError.error << " of type DocumentTooLarge. The JSON document is too large for the parser to parse it";
+    break;
+  case QJsonParseError::GarbageAtEnd:
+    ss << "Json Parsing Error: " << parseError.error << " of type GarbageAtEnd. The parsed document contains additional garbage characters at the end";
+    break;
+  default:
+    ss << "Json Parsing Error: " << parseError.error << " is of an unknown type.";
+    break;
+  }
+  ss << "\nThe error occurred at offset " << parseError.offset << ".\nReported error message is: " << parseError.errorString();
+
+  return msg;
+}
+
 class GenerateColorTableTest
 {
 
@@ -109,6 +173,7 @@ class GenerateColorTableTest
       QJsonDocument doc = QJsonDocument::fromJson(byteArray, &parseError);
       if(parseError.error != QJsonParseError::NoError)
       {
+        std::cout << createErrorMessageFromJsonParseError(parseError).toStdString() << std::endl;
         // "Failed to parse presets file" error
         DREAM3D_REQUIRE_EQUAL(0, -1);
       }
diff --git a/Source/SIMPLib/Utilities/ColorTable.cpp b/Source/SIMPLib/Utilities/ColorTable.cpp
index e458c075c6..620fad0bf4 100644
--- a/Source/SIMPLib/Utilities/ColorTable.cpp
+++ b/Source/SIMPLib/Utilities/ColorTable.cpp
@@ -166,7 +166,7 @@ std::vector<unsigned char> SIMPLColorTable::GetColorTable(size_t numColors, QJso
     unsigned char r = 0;
     unsigned char g = 0;
     unsigned char b = 0;
-    if(currentBinIndex < controlColorsCount - 2)
+    if(currentBinIndex < controlColorsCount - 1)
     {
       r = (controlPoints[currentBinIndex][1] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][1] * currFraction) * 255;
       g = (controlPoints[currentBinIndex][2] * (1.0 - currFraction) + controlPoints[currentBinIndex + 1][2] * currFraction) * 255;
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index 62c940a229..f2173c39c7 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -63,22 +63,22 @@ class ColorPresets::vtkInternals
   // -----------------------------------------------------------------------------
   QJsonArray GetPresets()
   {
-    if (this->Presets.empty())
+    if(this->m_Presets.empty())
     {
       this->LoadPresets();
     }
-    return this->Presets;
+    return this->m_Presets;
   }
 
 private:
-  QJsonArray Presets;
+  QJsonArray m_Presets;
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
   void LoadPresets()
   {
-    if(!Presets.empty())
+    if(!m_Presets.empty())
     {
       return;
     }
@@ -94,15 +94,16 @@ class ColorPresets::vtkInternals
         // "Failed to parse presets file" error
         return;
       }
-      Presets = doc.array();
 
-      for (int i=0; i<Presets.size(); i++)
+      QJsonArray allPresets = doc.array();
+      for(const auto& preset : allPresets)
       {
-        QJsonObject preset = Presets[i].toObject();
-        if (preset["ColorSpace"].toString() != "RGB")
+        QJsonObject obj = preset.toObject();
+        if((obj["ColorSpace"].toString() == "RGB")
+           //|| (obj["ColorSpace"].toString() == "HSV")
+        )
         {
-          Presets.removeAt(i);
-          i--;
+          m_Presets.append(preset);
         }
       }
     }
@@ -195,7 +196,6 @@ QPixmap ColorPresets::getPixmapFromPreset(unsigned int index)
   {
     return QPixmap();
   }
-
   if (presetObj.contains("RGBPoints") && presetObj["RGBPoints"].isArray())
   {
     QJsonArray presetArray = presetObj["RGBPoints"].toArray();

From 392e80fc2b1d0fdb1e9bcf6c9d62677021c4b932 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 16 Aug 2019 11:59:28 -0400
Subject: [PATCH 144/397] Updates python wrapping to integrate with numpy
 arrays (#375)

* WIP changes to how numpy arrays are converted to/from DataArrays

* Updates python wrapping to integrate with numpy arrays.

The changes include adding a small support library to fix cross-library symbol loading issues,
small fixes to some of the DataStructure classes, added a new example python code
that shows several use cases of integrating numpy arrays and simpl DataArray<T>.
Additional classes were either exposed to the python wrapping or updated to expose
needed methods of their classes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Observer.h              |   2 +-
 .../CoreFilters/DataContainerWriter.cpp       |   6 +-
 Source/SIMPLib/DataArrays/IDataArray.h        |   2 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   2 +-
 .../DataContainers/DataContainerArray.h       |   7 +-
 .../DataContainers/DataContainerArrayProxy.h  |   2 +
 .../DataContainers/IDataStructureNode.h       |   1 +
 Source/SIMPLib/Messages/AbstractMessage.h     |  46 +-
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   3 +
 .../Utilities/FileSystemPathHelper.cpp        |   2 +-
 Source/SIMPLib/Utilities/PythonSupport.cpp    |  88 ++++
 Source/SIMPLib/Utilities/PythonSupport.h      |  91 ++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   2 +
 Wrapping/Python/Pybind11/CMakeLists.txt       |   1 +
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  | 471 +++++++++++-------
 Wrapping/Python/SIMPL/simpl_helpers.py        | 115 ++---
 Wrapping/Python/Testing/ImageReadTest.py      |   2 +-
 Wrapping/Python/Testing/NumPy_Round_Trip.py   | 157 ++++++
 18 files changed, 702 insertions(+), 298 deletions(-)
 create mode 100644 Source/SIMPLib/Utilities/PythonSupport.cpp
 create mode 100644 Source/SIMPLib/Utilities/PythonSupport.h
 create mode 100644 Wrapping/Python/Testing/NumPy_Round_Trip.py

diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index 65d72672a8..0ef14e2d54 100755
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -59,7 +59,7 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
 
   public:
     Observer();
-    SIMPL_TYPE_MACRO_SUPER(Observer, IObserver)
+    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Observer, IObserver)
 
     ~Observer() override;
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 4997762092..a75acea154 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -239,13 +239,13 @@ void DataContainerWriter::execute()
     err = dc->writeAttributeMatricesToHDF5(dcGid);
     if(err < 0)
     {
-      setErrorCondition(-803, "Error writing DataContainer AttributeMatrices");
+      setErrorCondition(err, "Error writing DataContainer AttributeMatrices");
       return;
     }
     err = dc->writeMeshToHDF5(dcGid, m_WriteXdmfFile);
     if(err < 0)
     {
-      setErrorCondition(-804, "Error writing DataContainer Geometry");
+      setErrorCondition(err, "Error writing DataContainer Geometry");
       return;
     }
     if(m_WriteXdmfFile && geometry.get() != nullptr)
@@ -265,7 +265,7 @@ void DataContainerWriter::execute()
       err = dc->writeXdmf(xdmfOut, hdfFileName);
       if(err < 0)
       {
-        setErrorCondition(-805, "Error writing Xdmf File");
+        setErrorCondition(err, "Error writing Xdmf File");
         return;
       }
     }
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 08b5e5a9b0..57c5ab062a 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
 
   public:
     SIMPL_SHARED_POINTERS(IDataArray)
-    SIMPL_TYPE_MACRO(IDataArray)
+    SIMPL_TYPE_MACRO_SUPER(IDataArray, IDataStructureNode)
 
     /**
      * This templated method is used to get at the low level pointer that points
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 1c3dbea27c..5decf66d3b 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -526,7 +526,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       // Make sure the types are the same
       IDataArray::Pointer ida = getAttributeArray(arrayName);     
       typename ArrayType::Pointer targetDestArray = std::dynamic_pointer_cast< ArrayType >(ida);
-      if (targetDestArray.get() == 0)
+      if(targetDestArray.get() == nullptr)
       {
         if (nullptr != filter)
         {
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 8cf7765bee..c59bacd867 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -69,6 +69,10 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 
   PYB11_METHOD(bool addOrReplaceDataContainer ARGS DataContainer)
   PYB11_METHOD(bool insertOrAssign ARGS DataContainer)
+
+  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.QString.&,Name)
+  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.DataArrayPath.&,Path)
+
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
 
@@ -77,7 +81,6 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   PYB11_METHOD(bool renameDataContainer OVERLOAD const.DataArrayPath.&,OldPath const.DataArrayPath.&,NewPath )
 
   PYB11_METHOD(void clearDataContainers)
-  //PYB11_METHOD(XXXX getDataContainerNames)
   PYB11_METHOD(int getNumDataContainers)
   PYB11_METHOD(void duplicateDataContainer ARGS OldName, NewName)
 
@@ -90,7 +93,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 public:
   SIMPL_SHARED_POINTERS(DataContainerArray)
   SIMPL_STATIC_NEW_MACRO(DataContainerArray)
-  SIMPL_TYPE_MACRO(DataContainerArray)
+  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerArray, IDataStructureContainerNode<DataContainer>)
 
   using Container = ChildCollection;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index 0f0965887a..5b80892a3c 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -48,10 +48,12 @@ class DataContainerArray;
  */
 class SIMPLib_EXPORT DataContainerArrayProxy
 {
+  // clang-format off
   PYB11_CREATE_BINDINGS(DataContainerArrayProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType DataContainers READ getDataContainers WRITE setDataContainers CONST_GET_OVERLOAD)
   PYB11_METHOD(DataContainerProxy.& getDataContainerProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
+  // clang-format on
 
 public:
   using StorageType = QMap<QString, DataContainerProxy>;
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index 51f7419b72..149e95c764 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -56,6 +56,7 @@ class SIMPLib_EXPORT IDataStructureNode
 {
 public:
   SIMPL_SHARED_POINTERS(IDataStructureNode)
+  SIMPL_TYPE_MACRO(IDataStructureNode)
 
   using ParentType = AbstractDataStructureContainer;
   // using ParentWkPtr = std::weak_ptr<ParentType>;
diff --git a/Source/SIMPLib/Messages/AbstractMessage.h b/Source/SIMPLib/Messages/AbstractMessage.h
index cb9687723e..f3398a81ef 100755
--- a/Source/SIMPLib/Messages/AbstractMessage.h
+++ b/Source/SIMPLib/Messages/AbstractMessage.h
@@ -49,32 +49,38 @@ class AbstractMessageHandler;
  */
 class SIMPLib_EXPORT AbstractMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(AbstractMessage)
-    SIMPL_TYPE_MACRO(AbstractMessage)
+  // clang-format off
+  PYB11_CREATE_BINDINGS(AbstractMessage)
+  PYB11_PROPERTY(QString MessageText READ getMessageText WRITE setMessageText)
+  PYB11_METHOD(QString generateMessageString)
+  // clang-format on
 
-    virtual ~AbstractMessage();
+public:
+  SIMPL_SHARED_POINTERS(AbstractMessage)
+  SIMPL_TYPE_MACRO(AbstractMessage)
 
-    SIMPL_INSTANCE_STRING_PROPERTY(MessageText)
+  virtual ~AbstractMessage();
 
-    /**
-     * @brief This method creates and returns a message string
-     */
-    virtual QString generateMessageString() const = 0;
+  SIMPL_INSTANCE_STRING_PROPERTY(MessageText)
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
+  /**
+   * @brief This method creates and returns a message string
+   */
+  virtual QString generateMessageString() const = 0;
 
-  protected:
-    AbstractMessage();
-    AbstractMessage(const QString& msgText);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const = 0;
 
-  private:
+protected:
+  AbstractMessage();
+  AbstractMessage(const QString& msgText);
+
+private:
 
 };
 Q_DECLARE_METATYPE(AbstractMessage::Pointer)
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index 38338e6341..41a033bc26 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -26,6 +26,9 @@
 /* define to 1 if we are supporting ITK Filters */
 #cmakedefine SIMPL_USE_ITK
 
+/* define if Python wrapping is enabled through Pybind11 */
+#cmakedefine SIMPL_ENABLE_PYTHON
+
 /* define to 1 if we are checking relative paths */
 #cmakedefine SIMPL_RELATIVE_PATH_CHECK @SIMPL_RELATIVE_PATH_CHECK@
 
diff --git a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
index e12e9fdc9b..654564e411 100644
--- a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
+++ b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
@@ -91,7 +91,7 @@ void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter,
   if(!dirInfo.isWritable() && parentPath.exists())
   {
     QString ss = QObject::tr("The user does not have the proper permissions to write to the output file");
-    filter->setErrorCondition(-10002, ss);
+    filter->setErrorCondition(-10202, ss);
   }
 
 #ifdef _WIN32
diff --git a/Source/SIMPLib/Utilities/PythonSupport.cpp b/Source/SIMPLib/Utilities/PythonSupport.cpp
new file mode 100644
index 0000000000..5877c61d04
--- /dev/null
+++ b/Source/SIMPLib/Utilities/PythonSupport.cpp
@@ -0,0 +1,88 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "PythonSupport.h"
+
+PythonSupport::PythonSupport() = default;
+
+PythonSupport::~PythonSupport() = default;
+
+// -----------------------------------------------------------------------------
+// This section defines all the Wrapping methods, methods that will wrap an existing pointer to data
+
+#define PS_DEFINE_WRAP_METHOD(TYPE, NAME)                                                                                                                                                              \
+  NAME::Pointer PythonSupport::Wrap##NAME(TYPE* array, size_t numTuples, NAME::comp_dims_type& cDims, const QString& name, bool ownsData)                                                              \
+  {                                                                                                                                                                                                    \
+    return NAME::WrapPointer(array, numTuples, cDims, name, ownsData);                                                                                                                                 \
+  }
+
+PS_DEFINE_WRAP_METHOD(int8_t, Int8ArrayType);
+PS_DEFINE_WRAP_METHOD(uint8_t, UInt8ArrayType);
+
+PS_DEFINE_WRAP_METHOD(int16_t, Int16ArrayType);
+PS_DEFINE_WRAP_METHOD(uint16_t, UInt16ArrayType);
+
+PS_DEFINE_WRAP_METHOD(int32_t, Int32ArrayType);
+PS_DEFINE_WRAP_METHOD(uint32_t, UInt32ArrayType);
+
+PS_DEFINE_WRAP_METHOD(int64_t, Int64ArrayType);
+PS_DEFINE_WRAP_METHOD(uint64_t, UInt64ArrayType);
+
+PS_DEFINE_WRAP_METHOD(float, FloatArrayType);
+PS_DEFINE_WRAP_METHOD(double, DoubleArrayType);
+
+// -----------------------------------------------------------------------------
+// This section defines all the Create methods, methods that will simply create a DataArray<T> object and return it back to the caller
+
+#define PS_DEFINE_CREATE_METHOD(TYPE, NAME)                                                                                                                                                            \
+  NAME::Pointer PythonSupport::Create##NAME(size_t numTuples, const QString& name, TYPE initValue)                                                                                                     \
+  {                                                                                                                                                                                                    \
+    return std::shared_ptr<NAME>(new NAME(numTuples, name, initValue));                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  NAME::Pointer PythonSupport::Create##NAME(size_t numTuples, NAME::comp_dims_type& cDims, const QString& name, TYPE initValue)                                                                        \
+  {                                                                                                                                                                                                    \
+    return std::shared_ptr<NAME>(new NAME(numTuples, name, cDims, initValue));                                                                                                                         \
+  }
+
+PS_DEFINE_CREATE_METHOD(int8_t, Int8ArrayType);
+PS_DEFINE_CREATE_METHOD(uint8_t, UInt8ArrayType);
+
+PS_DEFINE_CREATE_METHOD(int16_t, Int16ArrayType);
+PS_DEFINE_CREATE_METHOD(uint16_t, UInt16ArrayType);
+
+PS_DEFINE_CREATE_METHOD(int32_t, Int32ArrayType);
+PS_DEFINE_CREATE_METHOD(uint32_t, UInt32ArrayType);
+
+PS_DEFINE_CREATE_METHOD(int64_t, Int64ArrayType);
+PS_DEFINE_CREATE_METHOD(uint64_t, UInt64ArrayType);
+
+PS_DEFINE_CREATE_METHOD(float, FloatArrayType);
+PS_DEFINE_CREATE_METHOD(double, DoubleArrayType);
diff --git a/Source/SIMPLib/Utilities/PythonSupport.h b/Source/SIMPLib/Utilities/PythonSupport.h
new file mode 100644
index 0000000000..42339aadd0
--- /dev/null
+++ b/Source/SIMPLib/Utilities/PythonSupport.h
@@ -0,0 +1,91 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+/**
+ * @brief This class is here for the sole reason of fixing dynamic_pointer_cast across library boundaries when the python
+ * wrapping is used. You really should NOT be using it for anything else.
+ */
+
+#define PS_DECLARE_WRAP_METHOD(TYPE, NAME) static NAME::Pointer Wrap##NAME(TYPE* array, size_t numTuples, NAME::comp_dims_type& cDims, const QString& name, bool ownsData);
+
+#define PS_DECLARE_CREATE_METHODS(TYPE, NAME)                                                                                                                                                          \
+  static NAME::Pointer Create##NAME(size_t numTuples, const QString& name, TYPE initValue);                                                                                                            \
+  static NAME::Pointer Create##NAME(size_t numTuples, NAME::comp_dims_type& cDims, const QString& name, TYPE initValue);
+
+class PythonSupport
+{
+
+public:
+  ~PythonSupport();
+
+  PythonSupport(const PythonSupport&) = delete;            // Copy Constructor Not Implemented
+  PythonSupport(PythonSupport&&) = delete;                 // Move Constructor Not Implemented
+  PythonSupport& operator=(const PythonSupport&) = delete; // Copy Assignment Not Implemented
+  PythonSupport& operator=(PythonSupport&&) = delete;      // Move Assignment Not Implemented
+
+  PS_DECLARE_WRAP_METHOD(int8_t, Int8ArrayType);
+  PS_DECLARE_WRAP_METHOD(uint8_t, UInt8ArrayType);
+
+  PS_DECLARE_WRAP_METHOD(int16_t, Int16ArrayType);
+  PS_DECLARE_WRAP_METHOD(uint16_t, UInt16ArrayType);
+
+  PS_DECLARE_WRAP_METHOD(int32_t, Int32ArrayType);
+  PS_DECLARE_WRAP_METHOD(uint32_t, UInt32ArrayType);
+
+  PS_DECLARE_WRAP_METHOD(int64_t, Int64ArrayType);
+  PS_DECLARE_WRAP_METHOD(uint64_t, UInt64ArrayType);
+
+  PS_DECLARE_WRAP_METHOD(float, FloatArrayType);
+  PS_DECLARE_WRAP_METHOD(double, DoubleArrayType);
+
+  PS_DECLARE_CREATE_METHODS(int8_t, Int8ArrayType);
+  PS_DECLARE_CREATE_METHODS(uint8_t, UInt8ArrayType);
+
+  PS_DECLARE_CREATE_METHODS(int16_t, Int16ArrayType);
+  PS_DECLARE_CREATE_METHODS(uint16_t, UInt16ArrayType);
+
+  PS_DECLARE_CREATE_METHODS(int32_t, Int32ArrayType);
+  PS_DECLARE_CREATE_METHODS(uint32_t, UInt32ArrayType);
+
+  PS_DECLARE_CREATE_METHODS(int64_t, Int64ArrayType);
+  PS_DECLARE_CREATE_METHODS(uint64_t, UInt64ArrayType);
+
+  PS_DECLARE_CREATE_METHODS(float, FloatArrayType);
+  PS_DECLARE_CREATE_METHODS(double, DoubleArrayType);
+
+protected:
+  PythonSupport();
+};
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index a0644f71c3..b62cffdde1 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -26,6 +26,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData2DAlgorithm.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData3DAlgorithm.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelTaskAlgorithm.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PythonSupport.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibEndian.h
@@ -44,6 +45,7 @@ set(SIMPLib_Utilities_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData2DAlgorithm.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData3DAlgorithm.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelTaskAlgorithm.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PythonSupport.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLDataPathValidator.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReader.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.cpp
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index 56ecb98dc5..c753e3f522 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -147,6 +147,7 @@ if(SIMPL_BUILD_TESTING)
     "Remove_Component_From_Array"
     "Rename_Attribute_Array"
     "Split_Attribute_Array"
+    "NumPy_Round_Trip"
   )
 
   foreach(test ${SIMPL_PYTHON_TESTS})
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 1f4ebff60d..ce9299082f 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -30,12 +30,14 @@ PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
 #endif
 
 #include <utility>
+#include <typeinfo>
 
 #include <QtCore/QDateTime>
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/Common/ShapeType.h"
+#include "SIMPLib/Utilities/PythonSupport.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
@@ -78,28 +80,114 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
   {                                                                                                                                                                                                    \
     using DataArrayType = DataArray<T>;                                                                                                                                                                \
     PySharedPtrClass<DataArrayType> instance(m, #NAME, parent, py::buffer_protocol());                                                                                                                 \
-    instance.def(py::init([](size_t numElements, QString name, T initValue) { return std::shared_ptr<DataArrayType>(new DataArrayType(numElements, name, initValue)); }))                                                    \
-        .def(py::init([](T* ptr, size_t numElements, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                                         \
-          return DataArrayType::WrapPointer(ptr, numElements, cDims, name, ownsData);                                                                                  \
-        }))                                                                                                                                                                                            \
-        .def(py::init([](py::array_t<T, py::array::c_style> b, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                               \
-          ssize_t numElements = 1;                                                                                                                                                                     \
-          ssize_t nDims = b.ndim();                                                                                                                                                                    \
-          for(ssize_t e = 0; e < nDims; e++)                                                                                                                                                           \
-          {                                                                                                                                                                                            \
-            numElements *= b.shape(e);                                                                                                                                                                 \
-          }                                                                                                                                                                                            \
-          numElements /= cDims[0];                                                                                                                                                                     \
-          return DataArrayType::WrapPointer(reinterpret_cast<T*>(b.mutable_data(0)), static_cast<size_t>(numElements), cDims, name, ownsData);                         \
-        })) /* Class instance method setValue */                                                                                                                                                       \
-        .def("setValue", &DataArrayType::setValue, py::arg("index"), py::arg("value"))                                                                                                                 \
-        .def("getValue", &DataArrayType::getValue, py::arg("index"))                                                                                                                                   \
-	      .def_property("Data", &DataArrayType::getArray, &DataArrayType::setArray, py::return_value_policy::reference)                                                                                  \
-        .def_property("Name", &DataArrayType::getName, &DataArrayType::setName)                                                                                                                        \
-        .def("Cleanup", []() { return DataArrayType::NullPointer(); });                                                                                                                                \
+    instance                                                                                                                                                                                          \
+      .def(py::init([](size_t numElements, QString name, T initValue) {                                                                                                                                 \
+        return PythonSupport::Create##NAME(numElements, name, initValue);            \
+      }))                                                                                                                      \
+      .def(py::init([](size_t numElements, std::vector<size_t> cDims, QString name, T initValue) {                                                                                                  \
+        return PythonSupport::Create##NAME(numElements, cDims, name, initValue);                                                                                                                   \
+      }))                                                                                                                                                                                              \
+      .def(py::init([](T* ptr, size_t numTuples, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                                         \
+        return PythonSupport::Wrap##NAME(ptr, numTuples, cDims, name, ownsData);                                                                                                                    \
+      }))                                                                                                                                                                                              \
+      .def(py::init([](py::array_t<T, py::array::c_style> b, QString name, bool ownsData) {                                                                                                          \
+        py::buffer_info buf = b.request();                                                                                                                                                           \
+        std::vector<ssize_t> shape = buf.shape;                                                                                                                                                      \
+        ssize_t ndim = buf.ndim;                                                                                                                                                                     \
+        size_t numTuples = 0;                                                                                                                                                                        \
+        std::vector<size_t> cDims;                                                                                                                                                                       \
+        if(ndim == 0)                                                                                                                                                                                \
+        {                                                                                                                                                                                            \
+          numTuples = 1;                                                                                                                                                                             \
+          cDims.resize(1);                                                                                                                                                                           \
+          cDims[0] = 1;                                                                                                                                                                              \
+        }                                                                                                                                                                                            \
+        else if(ndim == 1)                                                                                                                                                                           \
+        {                                                                                                                                                                                            \
+          numTuples = static_cast<size_t>(shape.front());                                                                                                                                            \
+          cDims.resize(1);                                                                                                                                                                           \
+          cDims[0] = 1;                                                                                                                                                                              \
+        }                                                                                                                                                                                            \
+        else                                                                                                                                                                                         \
+        {                                                                                                                                                                                            \
+          numTuples = static_cast<size_t>(shape.front());                                                                                                                                            \
+          cDims.resize(ndim - 1);                                                                                                                                                                    \
+          for(ssize_t e = 0; e < ndim - 1; e++)                                                                                                                                                      \
+          {                                                                                                                                                                                          \
+            cDims[e] = static_cast<size_t>(shape[e + 1]);                                                                                                                                            \
+          }                                                                                                                                                                                          \
+        }                                                                                                                                                                                            \
+          return PythonSupport::Wrap##NAME(reinterpret_cast<T*>(b.mutable_data(0)), numTuples, cDims, name, ownsData);                                                                                          \
+      })) /* Class instance method setValue */                                                                                                                                                       \
+      .def("setValue", &DataArrayType::setValue, py::arg("index"), py::arg("value"))                                                                                                                 \
+      .def("getValue", &DataArrayType::getValue, py::arg("index"))                                                                                                                                   \
+      .def_property("Data", &DataArrayType::getArray, &DataArrayType::setArray, py::return_value_policy::reference)                                                                                  \
+      .def_property("Name", &DataArrayType::getName, &DataArrayType::setName)                                                                                                                        \
+      .def("Cleanup", []() { return DataArrayType::NullPointer(); })                                                                                                                                 \
+      .def_buffer([](DataArrayType &m) -> py::buffer_info {                                                                                                                                          \
+        int nComp = m.getNumberOfComponents();                                                                                                                                                       \
+        size_t numTuples = m.getNumberOfTuples();                                                                                                                                                    \
+        ssize_t ndim = 0;                                                                                                                                                                            \
+        std::vector<ssize_t> shape;                                                                                                                                                                  \
+        std::vector<ssize_t> strides;                                                                                                                                                                \
+        if(nComp == 1)                                                                                                                                                                               \
+        {                                                                                                                                                                                            \
+          ndim = 1;                                                                                                                                                                                  \
+          shape.resize(ndim);                                                                                                                                                                        \
+          shape[0] = numTuples;                                                                                                                                                                      \
+          strides.resize(ndim);                                                                                                                                                                      \
+          strides[0] = sizeof(T);                                                                                                                                                                    \
+        }                                                                                                                                                                                            \
+        else                                                                                                                                                                                         \
+        {                                                                                                                                                                                            \
+          std::vector<size_t> cDims = m.getComponentDimensions();                                                                                                                                        \
+          ndim = static_cast<ssize_t>(cDims.size()) + 1;                                                                                                                                             \
+          shape.resize(ndim);                                                                                                                                                                        \
+          shape[0] = numTuples;                                                                                                                                                                      \
+          for(ssize_t e = 0; e < ndim - 1; e++)                                                                                                                                                      \
+          {                                                                                                                                                                                          \
+            shape[e + 1] = static_cast<ssize_t>(cDims[e]);                                                                                                                                           \
+          }                                                                                                                                                                                          \
+          ssize_t cur = 1;                                                                                                                                                                           \
+          std::vector<ssize_t> rshape(shape);                                                                                                                                                        \
+          std::reverse(std::begin(rshape), std::end(rshape));                                                                                                                                        \
+          for(auto val : rshape)                                                                                                                                                                     \
+          {                                                                                                                                                                                          \
+            strides.push_back(cur * val * sizeof(T));                                                                                                                                                \
+            cur *= val;                                                                                                                                                                              \
+          }                                                                                                                                                                                          \
+          strides.pop_back();                                                                                                                                                                        \
+          auto front = std::begin(strides);                                                                                                                                                          \
+          strides.insert(front, sizeof(T));                                                                                                                                                          \
+          std::reverse(std::begin(strides), std::end(strides));                                                                                                                                      \
+        }                                                                                                                                                                                            \
+        return py::buffer_info(                                                                                                                                                                      \
+          m.getPointer(0),                                                                                                                                                                           \
+          sizeof(T),                                                                                                                                                                                 \
+          py::format_descriptor<T>::format(),                                                                                                                                                        \
+          ndim,                                                                                                                                                                                      \
+          shape,                                                                                                                                                                                     \
+          strides                                                                                                                                                                                    \
+        );                                                                                                                                                                                           \
+      })                                \
+      .def("__repr__", [](DataArrayType &a)  {        \
+        std::stringstream ss;\
+        ss <<  "<'" << a.getFullNameOfClass().toStdString() << "  NAME=" << a.getName().toStdString() \
+        << ": TUPLES: " << a.getNumberOfTuples()\
+        << "  COMPONENTS: [";                     \
+        std::vector<size_t> comps = a.getComponentDimensions();  \
+        bool first = true;                            \
+        for(const auto& c : comps)  {             \
+          if(!first) { ss << ","; }                \
+          ss << c;         \
+          first = false;                           \
+        }                                          \
+        ss << "]'>";                \
+        return ss.str();           \
+      })   \
     ;                                                                                                                                                                                                  \
     return instance;                                                                                                                                                                                   \
-  }
+}
 
 PYB11_DEFINE_DATAARRAY_INIT(int8_t, Int8ArrayType);
 PYB11_DEFINE_DATAARRAY_INIT(uint8_t, UInt8ArrayType);
@@ -119,86 +207,86 @@ PYB11_DEFINE_DATAARRAY_INIT(double, DoubleArrayType);
 
 #define PYB11_DEFINE_SIMPLARRAY_2_INIT(T, NAME)\
   py::class_<NAME>(mod, #NAME)\
-	  .def(py::init<>([](py::list values) {\
+    .def(py::init<>([](py::list values) {\
       NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]));\
       return vec;\
     }))\
-	  .def("__repr__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
-		  return outValues;\
-	  })\
-	  .def("__str__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
+    .def("__repr__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
+      return outValues;\
+    })\
+    .def("__str__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
       return py::str(outValues);\
-	  })\
-	  .def("__getitem__", [](const NAME &values, int index) {\
-		  return values[index];\
-	  })\
+    })\
+    .def("__getitem__", [](const NAME &values, int index) {\
+      return values[index];\
+    })\
   ;
 
 #define PYB11_DEFINE_SIMPLARRAY_3_INIT(T, NAME)\
   py::class_<NAME>(mod, #NAME)\
-	  .def(py::init<>([](py::list values) {\
+    .def(py::init<>([](py::list values) {\
       NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]));\
       return vec;\
     }))\
-	  .def("__repr__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
-		  return outValues;\
-	  })\
-	  .def("__str__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
+    .def("__repr__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
+      return outValues;\
+    })\
+    .def("__str__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
       return py::str(outValues);\
-	  })\
-	  .def("__getitem__", [](const NAME &values, int index) {\
-		  return values[index];\
-	  })\
+    })\
+    .def("__getitem__", [](const NAME &values, int index) {\
+      return values[index];\
+    })\
   ;
 
 #define PYB11_DEFINE_SIMPLARRAY_4_INIT(T, NAME)\
   py::class_<NAME>(mod, #NAME)\
-	  .def(py::init<>([](py::list values) {\
+    .def(py::init<>([](py::list values) {\
       NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]));\
       return vec;\
     }))\
-	  .def("__repr__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
-		  return outValues;\
-	  })\
-	  .def("__str__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
+    .def("__repr__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
+      return outValues;\
+    })\
+    .def("__str__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
       return py::str(outValues);\
-	  })\
-	  .def("__getitem__", [](const NAME &values, int index) {\
-		  return values[index];\
-	  })\
+    })\
+    .def("__getitem__", [](const NAME &values, int index) {\
+      return values[index];\
+    })\
   ;
 
 #define PYB11_DEFINE_SIMPLARRAY_6_INIT(T, NAME)\
   py::class_<NAME>(mod, #NAME)\
-	  .def(py::init<>([](py::list values) {\
+    .def(py::init<>([](py::list values) {\
       NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]), py::cast<T>(values[4]), py::cast<T>(values[5]));\
       return vec;\
     }))\
-	  .def("__repr__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
-		  return outValues;\
-	  })\
-	  .def("__str__", [](const NAME &inValues) {\
-		  py::list outValues;\
-		  for (T value : inValues) { outValues.append(value); }\
+    .def("__repr__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
+      return outValues;\
+    })\
+    .def("__str__", [](const NAME &inValues) {\
+      py::list outValues;\
+      for (T value : inValues) { outValues.append(value); }\
       return py::str(outValues);\
-	  })\
-	  .def("__getitem__", [](const NAME &values, int index) {\
-		  return values[index];\
-	  })\
+    })\
+    .def("__getitem__", [](const NAME &values, int index) {\
+      return values[index];\
+    })\
   ;
 
 //------------------------------------------------------------------------------
@@ -237,110 +325,110 @@ PYBIND11_MODULE(dream3d, m)
   PYB11_DEFINE_SIMPLARRAY_6_INIT(int32_t, IntVec6Type)
 
   py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
-	  .def(py::init< const float &, const float &, const float &, const float &>())
+    .def(py::init< const float &, const float &, const float &, const float &>())
   ;
 
   py::class_<FileListInfo_t>(mod, "FileListInfo")
-	  .def(py::init <> ([] ( const int & paddingDigits, const unsigned int & ordering, const int & startIndex,
-		  const int & endIndex, const int & incrementIndex, const py::str & inputPath, const py::str & filePrefix,
-		  const py::str & fileSuffix, const py::str &fileExtension)
+    .def(py::init <> ([] ( const int & paddingDigits, const unsigned int & ordering, const int & startIndex,
+      const int & endIndex, const int & incrementIndex, const py::str & inputPath, const py::str & filePrefix,
+      const py::str & fileSuffix, const py::str &fileExtension)
       {
-				FileListInfo_t fileListInfo;
-				fileListInfo.PaddingDigits = paddingDigits;
-				fileListInfo.Ordering = ordering;
-				fileListInfo.StartIndex = startIndex;
-				fileListInfo.EndIndex = endIndex;
-				fileListInfo.IncrementIndex = incrementIndex;
-				QString InputPath = QString::fromStdString(py::cast<std::string>(inputPath));
-				QString FilePrefix = QString::fromStdString(py::cast<std::string>(filePrefix));
-				QString FileSuffix = QString::fromStdString(py::cast<std::string>(fileSuffix));
-				QString FileExtension = QString::fromStdString(py::cast<std::string>(fileExtension));
-				fileListInfo.InputPath = InputPath;
-				fileListInfo.FilePrefix = FilePrefix;
-				fileListInfo.FileSuffix = FileSuffix;
-				fileListInfo.FileExtension = FileExtension;
-				return fileListInfo;
+        FileListInfo_t fileListInfo;
+        fileListInfo.PaddingDigits = paddingDigits;
+        fileListInfo.Ordering = ordering;
+        fileListInfo.StartIndex = startIndex;
+        fileListInfo.EndIndex = endIndex;
+        fileListInfo.IncrementIndex = incrementIndex;
+        QString InputPath = QString::fromStdString(py::cast<std::string>(inputPath));
+        QString FilePrefix = QString::fromStdString(py::cast<std::string>(filePrefix));
+        QString FileSuffix = QString::fromStdString(py::cast<std::string>(fileSuffix));
+        QString FileExtension = QString::fromStdString(py::cast<std::string>(fileExtension));
+        fileListInfo.InputPath = InputPath;
+        fileListInfo.FilePrefix = FilePrefix;
+        fileListInfo.FileSuffix = FileSuffix;
+        fileListInfo.FileExtension = FileExtension;
+        return fileListInfo;
       }))
   ;
 
 #if 0
   // Handle QVector of size_t
   py::class_<std::vector<size_t>>(mod, "Dims")
-	  .def(py::init<>([](py::list dimensions) {
-	  std::vector<size_t> dims = std::vector<size_t>();
-	  for (auto dimension : dimensions)
-	  {
-		  dims.push_back(py::cast<size_t>(dimension));
-	  }
-	  return dims;
+    .def(py::init<>([](py::list dimensions) {
+    std::vector<size_t> dims = std::vector<size_t>();
+    for (auto dimension : dimensions)
+    {
+      dims.push_back(py::cast<size_t>(dimension));
+    }
+    return dims;
       }))
-	  .def("__repr__", [](const std::vector<size_t> &dims) {
-		  py::list dimensions;
-		  for (size_t dim : dims)
-		  {
-			  dimensions.append(dim);
-		  }
-		  return dimensions;
-	  })
-	  .def("__str__", [](const std::vector<size_t> &dims) {
-		  py::list dimensions;
-		  for (size_t dim : dims)
-		  {
-			  dimensions.append(dim);
-		  }
+    .def("__repr__", [](const std::vector<size_t> &dims) {
+      py::list dimensions;
+      for (size_t dim : dims)
+      {
+        dimensions.append(dim);
+      }
+      return dimensions;
+    })
+    .def("__str__", [](const std::vector<size_t> &dims) {
+      py::list dimensions;
+      for (size_t dim : dims)
+      {
+        dimensions.append(dim);
+      }
       return py::str(dimensions);
-	  })
-	  .def("__getitem__", [](const std::vector<size_t> &dims, int key) {
-		  return dims[key];
-	  })
+    })
+    .def("__getitem__", [](const std::vector<size_t> &dims, int key) {
+      return dims[key];
+    })
   ;
 #endif
 
   // Handle QSet of QString
   py::class_<QSet<QString>>(mod, "StringSet")
-	  .def(py::init<>([](py::set stringSet) {
-	  QSet<QString> newQStringSet = QSet<QString>();
-	  for (auto newString : stringSet)
-	  {
-		  newQStringSet.insert(py::cast<QString>(newString));
-	  }
-	  return newQStringSet;
+    .def(py::init<>([](py::set stringSet) {
+    QSet<QString> newQStringSet = QSet<QString>();
+    for (auto newString : stringSet)
+    {
+      newQStringSet.insert(py::cast<QString>(newString));
+    }
+    return newQStringSet;
       }))
   ;
 
   // Handle QDateTime
   py::class_<QDateTime>(mod, "DateTime")
-	  .def(py::init<>([](int year, int month, int day, int seconds) {
-	  QDateTime dateTime(QDate(year, month, day));
-	  dateTime.setTime_t(seconds);
-	  return dateTime;
+    .def(py::init<>([](int year, int month, int day, int seconds) {
+    QDateTime dateTime(QDate(year, month, day));
+    dateTime.setTime_t(seconds);
+    return dateTime;
       }))
   ;
 
   // Handle QJsonArray
   py::class_<QJsonArray>(mod, "JsonArray")
-	  .def(py::init<>([](py::list values) {
-	  QJsonArray qJsonArray;
-	  for (auto value : values) {
-		  QJsonValue qJsonValue(py::cast<double>(value));
-		  qJsonArray.push_back(qJsonValue);
-	  }
-	  return qJsonArray;
+    .def(py::init<>([](py::list values) {
+    QJsonArray qJsonArray;
+    for (auto value : values) {
+      QJsonValue qJsonValue(py::cast<double>(value));
+      qJsonArray.push_back(qJsonValue);
+    }
+    return qJsonArray;
       }))
   ;
 
   py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList")
      .def(py::init<>([](py::list values) {
-	  QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
-	  for (auto value : values) {
-		  py::list valueAsList = py::cast<py::list>(value);
-		  ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
-		  datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
-		  datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
-		  datasetImportInfoList.push_back(datasetImportInfo);
-	  }
-	  return datasetImportInfoList;
-	  }));
+    QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
+    for (auto value : values) {
+      py::list valueAsList = py::cast<py::list>(value);
+      ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
+      datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
+      datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
+      datasetImportInfoList.push_back(datasetImportInfo);
+    }
+    return datasetImportInfoList;
+    }));
 
   /* STL Binding code */
   py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8");
@@ -369,45 +457,45 @@ PYBIND11_MODULE(dream3d, m)
 
   /* Enumeration code for Comparison Operators */
   py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
-	  .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
-	  .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
-	  .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
-	  .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
-	  .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
-	  .export_values();
+    .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
+    .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
+    .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
+    .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
+    .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
+    .export_values();
 
   /* Enumeration code for Delimiter types */
   py::enum_<SIMPL::DelimiterTypes::Type>(mod, "DelimiterTypes")
-	  .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
-	  .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
-	  .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
-	  .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
-	  .value("Space", SIMPL::DelimiterTypes::Type::Space)
-	  .export_values();
+    .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
+    .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
+    .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
+    .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
+    .value("Space", SIMPL::DelimiterTypes::Type::Space)
+    .export_values();
 
   /* Enumeration code for PhaseType */
   py::enum_<PhaseType::Type>(mod, "PhaseType")
-	  .value("Primary", PhaseType::Type::Primary)
-	  .value("Precipitate", PhaseType::Type::Precipitate)
-	  .value("Transformation", PhaseType::Type::Transformation)
-	  .value("Matrix", PhaseType::Type::Matrix)
-	  .value("Boundary", PhaseType::Type::Boundary)
-	  .value("Unknown", PhaseType::Type::Unknown)
-	  .value("Any", PhaseType::Type::Any)
-	  .export_values();
+    .value("Primary", PhaseType::Type::Primary)
+    .value("Precipitate", PhaseType::Type::Precipitate)
+    .value("Transformation", PhaseType::Type::Transformation)
+    .value("Matrix", PhaseType::Type::Matrix)
+    .value("Boundary", PhaseType::Type::Boundary)
+    .value("Unknown", PhaseType::Type::Unknown)
+    .value("Any", PhaseType::Type::Any)
+    .export_values();
 
   /* Enumeration code for ShapeType */
   py::enum_<ShapeType::Type>(mod, "ShapeType")
-	  .value("Ellipsoid", ShapeType::Type::Ellipsoid)
-	  .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
-	  .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
-	  .value("CylinderA", ShapeType::Type::CylinderA)
-	  .value("CylinderB", ShapeType::Type::CylinderB)
-	  .value("CylinderC", ShapeType::Type::CylinderC)
-	  .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
-	  .value("Unknown", ShapeType::Type::Unknown)
-	  .value("Any", ShapeType::Type::Any)
-	  .export_values();
+    .value("Ellipsoid", ShapeType::Type::Ellipsoid)
+    .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
+    .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
+    .value("CylinderA", ShapeType::Type::CylinderA)
+    .value("CylinderB", ShapeType::Type::CylinderB)
+    .value("CylinderC", ShapeType::Type::CylinderC)
+    .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
+    .value("Unknown", ShapeType::Type::Unknown)
+    .value("Any", ShapeType::Type::Any)
+    .export_values();
 
   /* Enumeration code for Crystal Structures */
   py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
@@ -448,25 +536,25 @@ PYBIND11_MODULE(dream3d, m)
 
   /* Enumeration code for AngleUnits */
   py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits")
-	  .value("Radians", ArrayCalculator::AngleUnits::Radians)
-	  .value("Degrees", ArrayCalculator::AngleUnits::Degrees)
-	  .export_values();
+    .value("Radians", ArrayCalculator::AngleUnits::Radians)
+    .value("Degrees", ArrayCalculator::AngleUnits::Degrees)
+    .export_values();
 
   py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
-	  .value("Int8", SIMPL::NumericTypes::Type::Int8)
-	  .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
-	  .value("Int16", SIMPL::NumericTypes::Type::Int16)
-	  .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
-	  .value("Int32", SIMPL::NumericTypes::Type::Int32)
-	  .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
-	  .value("Int64", SIMPL::NumericTypes::Type::Int64)
-	  .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
-	  .value("Float", SIMPL::NumericTypes::Type::Float)
-	  .value("Double", SIMPL::NumericTypes::Type::Double)
-	  .value("Bool", SIMPL::NumericTypes::Type::Bool)
-	  .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
-	  .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType)
-	  .export_values();
+    .value("Int8", SIMPL::NumericTypes::Type::Int8)
+    .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
+    .value("Int16", SIMPL::NumericTypes::Type::Int16)
+    .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
+    .value("Int32", SIMPL::NumericTypes::Type::Int32)
+    .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
+    .value("Int64", SIMPL::NumericTypes::Type::Int64)
+    .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
+    .value("Float", SIMPL::NumericTypes::Type::Float)
+    .value("Double", SIMPL::NumericTypes::Type::Double)
+    .value("Bool", SIMPL::NumericTypes::Type::Bool)
+    .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
+    .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType)
+    .export_values();
 
 
   /* Init codes for classes in the Module */
@@ -474,6 +562,7 @@ PYBIND11_MODULE(dream3d, m)
 
   /* Init codes for the DataArray<T> classes */
   PySharedPtrClass<Int8ArrayType> @LIB_NAME@_Int8ArrayType = declareInt8ArrayType(mod, @LIB_NAME@_IDataArray);
+  
   PySharedPtrClass<UInt8ArrayType> @LIB_NAME@_UInt8ArrayType = declareUInt8ArrayType(mod, @LIB_NAME@_IDataArray);
 
   PySharedPtrClass<Int16ArrayType> @LIB_NAME@_Int16ArrayType = declareInt16ArrayType(mod, @LIB_NAME@_IDataArray);
diff --git a/Wrapping/Python/SIMPL/simpl_helpers.py b/Wrapping/Python/SIMPL/simpl_helpers.py
index 698892e7f3..3110aa5155 100644
--- a/Wrapping/Python/SIMPL/simpl_helpers.py
+++ b/Wrapping/Python/SIMPL/simpl_helpers.py
@@ -10,6 +10,30 @@
     raise RuntimeError("This module depends on the numpy module. Please make\
 sure that it is installed properly.")
 
+def ReadDREAM3DFile(data_container_array, input_file ):
+    '''
+    Executes the filter DataContainerReader and returns the error. This will read the entire
+    file into memory.
+
+    :param DataContainerArray data_container_array: The DataContainerArray that the filter will use.
+    :param QString input_file: Sets the InputFile value.
+    :return: ErrorCode produced by the filter
+    :rtype: int
+    '''
+    
+    # Create a DataContainerReader and read the DataStructure into a proxy
+    data_container_reader = simpl.DataContainerReader.New()
+    dcaProxy = data_container_reader.readDataContainerArrayStructure(input_file)
+
+    # Now that we have our DataContainerProxy, read the file
+    data_container_reader = simpl.DataContainerReader.New()
+    data_container_reader.setDataContainerArray(data_container_array)
+    data_container_reader.InputFile = input_file
+    data_container_reader.OverwriteExistingDataContainers = True
+    data_container_reader.InputFileDataContainerArrayProxy = dcaProxy
+    data_container_reader.execute()
+    executeError = data_container_reader.ErrorCode
+    return executeError
 
 def CreateDataContainerArray():
     """
@@ -75,108 +99,45 @@ def CreateDataArray(name, shape, cDims, type):
     type -- The numpy type of array to create: 8,16,32,64 signed/unsiged and 32/64 floats are supported
     """
     # Create a numpy array of ones to hold our data
-    num_array = np.ndarray(shape, dtype=type, order="C")
-
+    ashape = np.append([np.prod(shape)], cDims)
+    # Create a numpy array to hold our data
+    num_array = np.ndarray(ashape, dtype=type, order="C")
+    # Get the numpy array as contiguous
     z = np.asarray(num_array)
     if not z.flags.contiguous:
         z = np.ascontiguousarray(z)
     z.fill(0)
-
-    shape = z.shape
     assert z.flags.contiguous, 'Only contiguous arrays are supported.'
     assert not np.issubdtype(z.dtype, np.complex128), \
             "Complex numpy arrays cannot be converted to vtk arrays."\
             "Use real() or imag() to get a component of the array before"\
             " passing it to vtk."
-
-    # Get the Pointer to the numpy array
-    z_flat = np.ravel(z)
-    
-    #np.info(z)
     
     # Declare the number of components for the array
     if type == np.int8:
-        array = simpl.Int8ArrayType(z_flat, cDims, name, False)
+        array = simpl.Int8ArrayType(z, name, False)
     elif type == np.uint8:
-        array = simpl.UInt8ArrayType(z_flat, cDims, name, False)
+        array = simpl.UInt8ArrayType(z, name, False)
     elif type == np.int16:
-        array = simpl.Int16ArrayType(z_flat, cDims, name, False)
+        array = simpl.Int16ArrayType(z, name, False)
     elif type == np.uint16:
-        array = simpl.UInt16ArrayType(z_flat, cDims, name, False)
+        array = simpl.UInt16ArrayType(z, name, False)
     elif type == np.int32:
-        array = simpl.Int32ArrayType(z_flat, cDims, name, False)
+        array = simpl.Int32ArrayType(z, name, False)
     elif type == np.uint32:
-        array = simpl.UInt32ArrayType(z_flat, cDims, name, False)
+        array = simpl.UInt32ArrayType(z, name, False)
     elif type == np.int64:
-        array = simpl.Int64ArrayType(z_flat, cDims, name, False)
+        array = simpl.Int64ArrayType(z, name, False)
     elif type == np.uint64:
-        array = simpl.UInt64ArrayType(z_flat, cDims, name, False)
+        array = simpl.UInt64ArrayType(z, name, False)
     elif type == np.float32:
-        array = simpl.FloatArrayType(z_flat, cDims, name, False)
+        array = simpl.FloatArrayType(z, name, False)
     elif type == np.double:
-        array = simpl.DoubleArrayType(z_flat, cDims, name, False)     
+        array = simpl.DoubleArrayType(z, name, False)     
     
     # we need to return the 'z' numpy array so it does not go out of scope.
     return (z, array)
 
-
-def ConvertToDataArray(name, array, componentDimensions = 1):
-    """
-    Converts a numpy array into a Data Array for DREAM3D.
-    \nKeyword arguments:
-    \nname:  The name of the DataArray
-    \narray: The numpy array to be converted
-    """
-    # Make sure it is a numpy array
-    # array = np.asanyarray(array)
-    # Get shape
-    shape = array.shape
-    # Determine cDims
-    cDims = simpl.VectorSizeT([componentDimensions])  # Default is 1
-
-    # Determine type
-    type = array.dtype
-    # Make sure it is contiguous
-    z = np.asarray(array)
-    if not z.flags.contiguous:
-        z = np.ascontiguousarray(z)
-
-    shape = z.shape
-    assert z.flags.contiguous, 'Only contiguous arrays are supported.'
-    assert not np.issubdtype(z.dtype, np.complex128), \
-        'Complex numpy arrays cannot be converted to vtk arrays.' \
-        'Use real() or imag() to get a component of the array before' \
-        ' passing it to vtk.'
-
-    # Flatten
-    z_flat = np.ravel(z)
-
-    # Declare the number of components for the array
-    if type == np.int8:
-        da = simpl.Int8ArrayType(z_flat, cDims, name, False)
-    elif type == np.uint8:
-        da = simpl.UInt8ArrayType(z_flat, cDims, name, False)
-    elif type == np.int16:
-        da = simpl.Int16ArrayType(z_flat, cDims, name, False)
-    elif type == np.uint16:
-        da = simpl.UInt16ArrayType(z_flat, cDims, name, False)
-    elif type == np.int32:
-        da = simpl.Int32ArrayType(z_flat, cDims, name, False)
-    elif type == np.uint32:
-        da = simpl.UInt32ArrayType(z_flat, cDims, name, False)
-    elif type == np.int64:
-        da = simpl.Int64ArrayType(z_flat, cDims, name, False)
-    elif type == np.uint64:
-        da = simpl.UInt64ArrayType(z_flat, cDims, name, False)
-    elif type == np.float32:
-        da = simpl.FloatArrayType(z_flat, cDims, name, False)
-    elif type == np.double:
-        da = simpl.DoubleArrayType(z_flat, cDims, name, False)
-
-    # we need to return the 'z' numpy array so it does not go out of scope.
-    return (z_flat, da)
-
-
 def CreateDataContainerProxy(dca, data_array_paths):
     """
     Create a DataContainerProxy
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index b2f9f4cb58..2c7c9a3918 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -52,7 +52,7 @@ def ImageReadTest():
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
     cDims = simpl.VectorSizeT([1])
     name = "slice_11.tiff"
-    array = simpl.UInt8ArrayType(z_flat, cDims, name, False)
+    array = simpl.UInt8ArrayType(z_flat, name, False)
     cellAm.addOrReplaceAttributeArray(array)
 
     # Create a Geometry Object and store it in the DataContainer
diff --git a/Wrapping/Python/Testing/NumPy_Round_Trip.py b/Wrapping/Python/Testing/NumPy_Round_Trip.py
new file mode 100644
index 0000000000..e4253cbb63
--- /dev/null
+++ b/Wrapping/Python/Testing/NumPy_Round_Trip.py
@@ -0,0 +1,157 @@
+
+import time
+
+try:
+    import numpy as np
+except ImportError:
+    raise RuntimeError("This module depends on the numpy module. Please make\
+sure that it is installed properly.")
+
+# These are the SIMPL python modules
+from dream3d import simplpy
+from dream3d import simpl
+from dream3d import simpl_helpers as sc
+from dream3d import simpl_test_dirs as sd
+from dream3d import orientationanalysispy as orient
+
+def Test1():
+  """
+  This will test manually creating an numpy array, wrapping the numpy array with
+  a simpl.DataArray, running a filter to adjust those values, and then showing 
+  that the original numpy array has in fact been changed.
+  """
+  print("===================== Test 1 =====================")
+  shape = [4, 3, 2]
+  cDims = [3]
+  # Create a numpy array of ones to hold our data
+  ashape = np.append([np.prod(shape)], cDims)
+  # Create a numpy array to hold our data
+  num_array = np.ndarray(ashape, dtype=np.float32, order="C")
+  # Get the numpy array as contiguous
+  z = np.asarray(num_array)
+  if not z.flags.contiguous:
+      z = np.ascontiguousarray(z)
+  z.fill(3.1415927)
+  assert z.flags.contiguous, 'Only contiguous arrays are supported.'
+  print(z[0])
+
+  # Create the DataContainerArray
+  dca = sc.CreateDataContainerArray()
+  # Create and add a DataContainer to the DataContainerArray
+  dc = sc.CreateDataContainer("DC")
+  dca.addOrReplaceDataContainer(dc)
+  # Create and add an AttributeMatrix to the DataContainerArray
+  shape = simpl.VectorSizeT([4, 3, 2])
+  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  dc.addOrReplaceAttributeMatrix(cellAm)
+
+  # Create the wrapped DataArray<float> array
+  eulers = simpl.FloatArrayType(z, "Eulers", False)
+  # Add the DataArray to the AttributeMatrix
+  cellAm.addOrReplaceAttributeArray(eulers)
+
+  # Create a DataArrayPath
+  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
+  # Run the filter ChangeAngleRepresentation since this filter acts on data "in place"
+  err = orient.change_angle_representation(dca, 1, dap)
+  if err < 0:
+    print("change_angle_representation ErrorCondition: %d" % err)
+
+  roundtrip = np.asarray(eulers)
+
+  # print("--------------- roundtrip ---------------")
+  print(roundtrip.shape)
+  print(roundtrip[0])
+
+
+
+def Test2():
+  """
+  This is the Top level to test the creation of Data Arrays from numpy and placing those
+  arrays into a DREAM3D DataContainer heirarchy. The numpy array is created on the 
+  python side of things.
+  """
+  print("===================== Test 2 =====================")
+  dca = sc.CreateDataContainerArray()
+
+  dc = sc.CreateDataContainer("DC")
+  dca.addOrReplaceDataContainer(dc)
+
+  shape = simpl.VectorSizeT([4, 3, 2])
+  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  dc.addOrReplaceAttributeMatrix(cellAm)
+  # Create the Component Dimensions for the Array, 3 Component in this case
+  cDims = simpl.VectorSizeT([3])
+  # Create the array which wraps a Numpy contiguous array 
+  npyArray, eulers = sc.CreateDataArray("Eulers", shape, cDims, np.float32)
+  npyArray.fill(3.1415927)
+  # Add the DataArray to the AttributeMatrix
+  cellAm.addOrReplaceAttributeArray(eulers)
+
+  # Create a DataArrayPath
+  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
+  # Run the filter ChangeAngleRepresentation since this filter acts on data "in place"
+  err = orient.change_angle_representation(dca, 1, dap)
+  if err < 0:
+    print("change_angle_representation ErrorCondition: %d" % err)
+
+
+def Test3():
+  """
+  Create a simpl DataArray<T>, then convert that to a numpy array in place
+  and do numpy operations to create a new array, then wrote both arrays
+  to a .dream3d file
+  """
+  print("===================== Test 3 =====================")
+
+  dca = sc.CreateDataContainerArray()
+
+  dc = sc.CreateDataContainer("DC")
+  dca.addOrReplaceDataContainer(dc)
+  # The shape is in XYZ order
+  shape = simpl.VectorSizeT([4, 3, 2])
+  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  dc.addOrReplaceAttributeMatrix(cellAm)
+
+  # Create the Component Dimensions for the Array, 3 Component in this case
+  cDims = simpl.VectorSizeT([3])
+  eulers = simpl.FloatArrayType(24, cDims, "Eulers", 3.1415927)
+  cellAm.addOrReplaceAttributeArray(eulers)
+
+  # now build up a pipeline to act on the Data Structure that we just created
+  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
+  err = orient.change_angle_representation(dca, 1, dap)
+  if err < 0:
+    print("change_angle_representation ErrorCondition: %d" % err)
+
+  # Convert in-place to an numpy array
+  np_eulers = np.asarray(eulers)
+  print(np_eulers.shape)
+
+  # Create new numpy array with the result of the calculation
+  np_rads = np_eulers * 3.1415927 / 180.0
+
+  if not np_rads.flags.contiguous:
+    np_rads = np.ascontiguousarray(np_rads)
+  assert np_rads.flags.contiguous, 'Only contiguous arrays are supported.'
+  
+  # Create the wrapped DataArray<float> object
+  simpl_rads = simpl.FloatArrayType(np_rads, "Eulers as Rads", False)
+  # Add the DataArray to the AttributeMatrix
+  cellAm.addOrReplaceAttributeArray(simpl_rads)
+
+  # Write to DREAM3D file
+  err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/Python_RoundTrip/RoundTripTest.dream3d", dca)
+  if err < 0:
+      print("WriteDREAM3DFile ErrorCondition: %d" % err)
+ 
+
+
+"""
+Main entry point for python script
+"""
+if __name__ == "__main__":
+  Test1()
+  Test2()
+  Test3()
+  print("[NumPy_Round_Trip] Complete")

From 0b90e11c1133fb0d1a3283ca9ac2a38876335d50 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 16 Aug 2019 13:04:31 -0400
Subject: [PATCH 145/397] Add missing DECL Export macro to PythonSupport.h

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Utilities/PythonSupport.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Utilities/PythonSupport.h b/Source/SIMPLib/Utilities/PythonSupport.h
index 42339aadd0..2a6199cdf1 100644
--- a/Source/SIMPLib/Utilities/PythonSupport.h
+++ b/Source/SIMPLib/Utilities/PythonSupport.h
@@ -33,6 +33,7 @@
 #pragma once
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief This class is here for the sole reason of fixing dynamic_pointer_cast across library boundaries when the python
@@ -45,7 +46,7 @@
   static NAME::Pointer Create##NAME(size_t numTuples, const QString& name, TYPE initValue);                                                                                                            \
   static NAME::Pointer Create##NAME(size_t numTuples, NAME::comp_dims_type& cDims, const QString& name, TYPE initValue);
 
-class PythonSupport
+class SIMPLib_EXPORT PythonSupport
 {
 
 public:

From 196df67bee7b5c067dbfc62b01768f0b9fc7bbf3 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Mon, 26 Aug 2019 09:30:07 -0400
Subject: [PATCH 146/397] Feature/372 rename path (#373)

* Path renames are stopped when the original path is created again.
* Fixed cases where paths are infinitely renamed as one rename changed other paths created afterwards.
* Fixed a bug in SVPipelineView where getFilterPipeline() was not returning the expected result.
* Moved static rename functions from the DataArrayPath class to the RenameDataPath namespace.

fixes #372

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>
---
 .../CoreFilters/RenameAttributeArray.cpp      |   5 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |   2 +-
 .../CoreFilters/RenameDataContainer.cpp       |   2 +-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  | 132 +-----------
 Source/SIMPLib/DataContainers/DataArrayPath.h | 112 +++++-----
 .../SIMPLib/DataContainers/RenameDataPath.cpp | 197 ++++++++++++++++++
 .../SIMPLib/DataContainers/RenameDataPath.h   |  50 +++++
 .../FilterParameters/FilterParameter.cpp      |   4 +
 Source/SIMPLib/Filtering/AbstractFilter.cpp   | 116 +++++++----
 Source/SIMPLib/Filtering/AbstractFilter.h     |   6 +
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |  83 ++++----
 .../ReadASCIIDataWidget.cpp                   |   2 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   5 +-
 13 files changed, 451 insertions(+), 265 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 9ce24bcc63..2c3c8d7c8f 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -263,8 +263,9 @@ DataArrayPath::RenameContainer RenameAttributeArray::getRenamedPaths()
   DataArrayPath newPath = getSelectedArrayPath();
   newPath.setDataArrayName(getNewArrayName());
 
-  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
-  container.push_back(std::make_pair(oldPath, newPath));
+  DataArrayPath::RenameContainer container;
+  DataArrayPath::RenameType rename = { oldPath, newPath };
+  container.push_back(rename);
 
   return container;
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index baf43ebbc3..fe62c47601 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -247,7 +247,7 @@ DataArrayPath::RenameContainer RenameAttributeMatrix::getRenamedPaths()
   DataArrayPath newPath = getSelectedAttributeMatrixPath();
   newPath.setAttributeMatrixName(getNewAttributeMatrix());
 
-  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
+  DataArrayPath::RenameContainer container;
   container.push_back(std::make_pair(oldPath, newPath));
 
   return container;
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index df8efd2c5d..663f3831ce 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -229,7 +229,7 @@ DataArrayPath::RenameContainer RenameDataContainer::getRenamedPaths()
   DataArrayPath oldPath = getSelectedDataContainerName();
   DataArrayPath newPath = getNewDataContainerName();
 
-  DataArrayPath::RenameContainer container = AbstractFilter::getRenamedPaths();
+  DataArrayPath::RenameContainer container;
   container.push_back(std::make_pair(oldPath, newPath));
 
   return container;
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 220f96a8fa..66121c3e9d 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -46,6 +46,11 @@
 // -----------------------------------------------------------------------------
 DataArrayPath::HashType DataArrayPath::GetHash(const QString& name)
 {
+  if(name.isEmpty())
+  {
+    return 0;
+  }
+
   std::hash<std::string> hashFn;
   return hashFn(name.toStdString());
 }
@@ -269,133 +274,6 @@ void DataArrayPath::setDataArrayName(const QString& name)
   updateDataType();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool DataArrayPath::CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath)
-{
-  // If the paths are not possible renames, return false
-  if(!oldPath.possibleRename(newPath))
-  {
-    return false;
-  }
-
-  // Check that the DataArrayPath targets are compatibles
-  DataContainer::Pointer oldDc = oldDca->getDataContainer(oldPath.getDataContainerName());
-  DataContainer::Pointer newDc = newDca->getDataContainer(newPath.getDataContainerName());
-
-  // Data Container required
-  if(oldDc && newDc)
-  {
-    IGeometry::Pointer oldGeom = oldDc->getGeometry();
-    IGeometry::Pointer newGeom = newDc->getGeometry();
-
-    bool hasGeom = oldGeom && newGeom;
-    if((hasGeom && oldGeom->getGeometryType() == newGeom->getGeometryType()) || !hasGeom)
-    {
-      // No Attribute Matrix path
-      if(oldPath.getAttributeMatrixName().isEmpty() && newPath.getAttributeMatrixName().isEmpty())
-      {
-        return true;
-      }
-
-      AttributeMatrix::Pointer oldAm = oldDc->getAttributeMatrix(oldPath.getAttributeMatrixName());
-      AttributeMatrix::Pointer newAm = newDc->getAttributeMatrix(newPath.getAttributeMatrixName());
-
-      bool hasAttributeMatrix = oldAm && newAm;
-      if(hasAttributeMatrix && oldAm->getType() == newAm->getType() && oldAm->getNumberOfTuples() == newAm->getNumberOfTuples())
-      {
-        // No Data Array path
-        if(oldPath.getDataArrayName().isEmpty() && newPath.getDataArrayName().isEmpty())
-        {
-          return true;
-        }
-
-        IDataArray::Pointer oldDa = oldAm->getAttributeArray(oldPath.getDataArrayName());
-        IDataArray::Pointer newDa = newAm->getAttributeArray(newPath.getDataArrayName());
-
-        bool hasDataArray = oldDa && newDa;
-        bool hasSameType = oldDa->getTypeAsString() == newDa->getTypeAsString();
-        bool hasSameCompDims = oldDa->getComponentDimensions() == newDa->getComponentDimensions();
-        bool isNeighborList = hasSameType && newDa->getTypeAsString().startsWith("NeighborList");
-        if(hasDataArray && hasSameType  && (hasSameCompDims || isNeighborList))
-        {
-          return true;
-        }
-      }
-    }
-  }
-
-  return false;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-DataArrayPath::RenameContainer DataArrayPath::CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths)
-{
-  RenameContainer container;
-  std::list<DataArrayPath> duplicatedPaths;
-  std::list<DataArrayPath> usedNewPaths;
-
-  // For each older path, check for any matching new paths.  If only one new path matches, add it as a possibility
-  for(const DataArrayPath& oldPath : oldPaths)
-  {
-    // If the same path exists in both oldPaths and newPaths, it was not renamed
-    if(std::find(newPaths.begin(), newPaths.end(), oldPath) != newPaths.end())
-    {
-      continue;
-    }
-
-    // Find any potential renames in newPaths for the given oldPath
-    std::list<DataArrayPath> matches;
-    for(const DataArrayPath& newPath : newPaths)
-    {
-      // If the same path exists in both oldPaths and newPaths, it was not renamed
-      if(std::find(oldPaths.begin(), oldPaths.end(), newPath) != oldPaths.end())
-      {
-        continue;
-      }
-
-      // Check that all geometries, AttributeMatrices, and DataArrays are compatible
-      if(CheckRenamePath(oldDca, newDca, oldPath, newPath))
-      {
-        matches.push_back(newPath);
-      }
-    }
-    // If this path was already used, mark it as duplicate and move on
-    if(matches.size() == 1)
-    {
-      const DataArrayPath& newPath = matches.front();
-      if(usedNewPaths.end() != std::find(usedNewPaths.begin(), usedNewPaths.end(), newPath))
-      {
-        duplicatedPaths.push_back(newPath);
-      }
-      else
-      {
-        usedNewPaths.push_back(newPath);
-        container.push_back(std::make_pair(oldPath, newPath));
-      }
-    }
-  }
-
-  // Remove items with duplicated paths
-  for(auto iter = container.begin(); iter != container.end(); )
-  {
-    const DataArrayPath& checkPath = std::get<1>(*iter);
-    if(duplicatedPaths.end() != std::find(duplicatedPaths.begin(), duplicatedPaths.end(), checkPath))
-    {
-      iter = container.erase(iter);
-    }
-    else
-    {
-      iter++;
-    }
-  }
-
-  return container;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 1aa82e7905..6ccec6322e 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -135,23 +135,23 @@ class SIMPLib_EXPORT DataArrayPath
      */
     virtual ~DataArrayPath();
 
-        /**
-    * @brief checks that a vector of paths have the same data container and attribute matrix
-    * @return true if the paths in the vector have the same data container and attribute matrix, false otherwise
-    */
+    /**
+     * @brief checks that a vector of paths have the same data container and attribute matrix
+     * @return true if the paths in the vector have the same data container and attribute matrix, false otherwise
+     */
     static bool ValidateVector(const QVector<DataArrayPath>& other);
 
     /**
-    * @brief Gets the data array names from a QVector of DataArrayPaths.
-    * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
-    */
+     * @brief Gets the data array names from a QVector of DataArrayPaths.
+     * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
+     */
     static QList<QString> GetDataArrayNames(const QVector<DataArrayPath>& paths);
 
     /**
-    * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
-    * @return Returns the attribute matrix path as a DataArrayPath from a QVector
-    * of DataArrayPaths.
-    */
+     * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
+     * @return Returns the attribute matrix path as a DataArrayPath from a QVector
+     * of DataArrayPaths.
+     */
     static DataArrayPath GetAttributeMatrixPath(const QVector<DataArrayPath>& paths);
 
     /**
@@ -162,28 +162,11 @@ class SIMPLib_EXPORT DataArrayPath
     static QVector<DataArrayPath> ConvertToQVector(QStringList& paths);
 
     /**
-    * @brief serialize Deserializes the string into a DataArrayPath, using the specified delimiter.
-    * @param delimiter
-    * @return
-    */
-    static DataArrayPath Deserialize(const QString& str, const QString& delimiter);
-
-    /**
-     * @brief checks for and returns any updated DataArrayPaths between two sets
-     * @param oldPaths
-     * @param newPaths
+     * @brief serialize Deserializes the string into a DataArrayPath, using the specified delimiter.
+     * @param delimiter
      * @return
      */
-    static RenameContainer CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths);
-
-    /**
-     * @brief checks if the targets of the old DataArrayPath and new DataArrayPath are compatible in their given DataContainerArrays
-     * @param oldDca
-     * @param newDca
-     * @param oldPath
-     * @param newPath
-     */
-    static bool CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath);
+    static DataArrayPath Deserialize(const QString& str, const QString& delimiter);
 
     /**
      * @brief Returns the DataType matching the current path.
@@ -194,25 +177,49 @@ class SIMPLib_EXPORT DataArrayPath
       return m_DataType;
     }
 
+    /**
+     * @brief Returns the DataContainer name
+     * @return
+     */
     QString getDataContainerName() const
     {
       return m_DataContainerName;
     }
 
+    /**
+     * @brief Returns the AttributeMatrix name
+     * @return
+     */
     QString getAttributeMatrixName() const
     {
       return m_AttributeMatrixName;
     }
 
+    /**
+     * @brief Returns the DataArray name
+     * @return
+     */
     QString getDataArrayName() const
     {
       return m_DataArrayName;
     }
 
+    /**
+     * @brief Sets the DataContainer name and updates the hash
+     * @param name
+     */
     void setDataContainerName(const QString& name);
 
+    /**
+     * @brief Sets the AttributeMatrix name and updates the hash
+     * @param name
+     */
     void setAttributeMatrixName(const QString& name);
 
+    /**
+     * @brief Sets the DataArray name and updates the hash
+     * @param name
+     */
     void setDataArrayName(const QString& name);
 
     /**
@@ -298,10 +305,10 @@ class SIMPLib_EXPORT DataArrayPath
     bool hasSameDataContainer(const DataArrayPath& other) const;
 
     /**
-    * @brief checks that two paths share the same attribute matrix
-    * @param other The other path
-    * @return true if the two paths share the same attribute matrix, false otherwise
-    */
+     * @brief checks that two paths share the same attribute matrix
+     * @param other The other path
+     * @return true if the two paths share the same attribute matrix, false otherwise
+     */
     bool hasSameAttributeMatrix(const DataArrayPath& other) const;
 
     /**
@@ -422,16 +429,23 @@ class SIMPLib_EXPORT DataArrayPath
      */
     static std::pair<bool, RenameType> CreateLinkingRename(const RenameType& oldRename, const RenameType& newRename)
     {
-      const DataArrayPath& oldOldPath = std::get<0>(oldRename);
-      const DataArrayPath& oldNewPath = std::get<1>(oldRename);
+      const DataArrayPath& oldOldPath = oldRename.first;
+      const DataArrayPath& oldNewPath = oldRename.second;
+
+      const DataArrayPath& newOldPath = newRename.first;
+      const DataArrayPath& newNewPath = newRename.second;
 
-      const DataArrayPath& newOldPath = std::get<0>(newRename);
-      const DataArrayPath& newNewPath = std::get<1>(newRename);
+      // Handle renaming of the same path.
+      // Rename path should be removed if the path was recreated,
+      // thus this signifies that a filter's rename was changed.
+      if((newOldPath == oldOldPath) && (oldNewPath != newNewPath))
+      {
+        return std::make_pair(true, RenameType{ oldNewPath, newNewPath });
+      }
 
       // Require newOldPath to be a subset of oldNewPath
-      // Require newOldPath != oldNewPath
       const bool isSubset = newOldPath.isSubset(oldNewPath);
-      if(!isSubset || (newOldPath == oldNewPath))
+      if(!isSubset)
       {
         return std::make_pair(false, RenameType{});
       }
@@ -461,17 +475,17 @@ class SIMPLib_EXPORT DataArrayPath
     }
 
     /**
-    * @brief Writes the contents of the proxy to the json object 'json'
-    * @param json
-    * @return
-    */
+     * @brief Writes the contents of the proxy to the json object 'json'
+     * @param json
+     * @return
+     */
     void writeJson(QJsonObject& json) const;
 
     /**
-    * @brief Reads the contents of the the json object 'json' into the proxy
-    * @param json
-    * @return
-    */
+     * @brief Reads the contents of the the json object 'json' into the proxy
+     * @param json
+     * @return
+     */
     bool readJson(QJsonObject& json);
 
     /**
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.cpp b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
index 6ec872e03a..12db0762a8 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.cpp
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
@@ -35,6 +35,7 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -46,3 +47,199 @@ void RenameDataPath::AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id,
     filter->checkIfPathRenamed(id, path);
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool RenameDataPath::CanReplaceRenamePath(const DataArrayPath::RenameType& originalPair, const DataArrayPath::RenameType& newPair)
+{
+  return originalPair.first == newPair.first && originalPair.second != newPair.second;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool RenameDataPath::CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath)
+{
+  // If the paths are not possible renames, return false
+  if(!oldPath.possibleRename(newPath))
+  {
+    return false;
+  }
+
+  // Check that the DataArrayPath targets are compatibles
+  DataContainer::Pointer oldDc = oldDca->getDataContainer(oldPath.getDataContainerName());
+  DataContainer::Pointer newDc = newDca->getDataContainer(newPath.getDataContainerName());
+
+  // Data Container required
+  if(oldDc && newDc)
+  {
+    IGeometry::Pointer oldGeom = oldDc->getGeometry();
+    IGeometry::Pointer newGeom = newDc->getGeometry();
+
+    bool hasGeom = oldGeom && newGeom;
+    if((hasGeom && oldGeom->getGeometryType() == newGeom->getGeometryType()) || !hasGeom)
+    {
+      // No Attribute Matrix path
+      if(oldPath.getAttributeMatrixName().isEmpty() && newPath.getAttributeMatrixName().isEmpty())
+      {
+        return true;
+      }
+
+      AttributeMatrix::Pointer oldAm = oldDc->getAttributeMatrix(oldPath.getAttributeMatrixName());
+      AttributeMatrix::Pointer newAm = newDc->getAttributeMatrix(newPath.getAttributeMatrixName());
+
+      bool hasAttributeMatrix = oldAm && newAm;
+      if(hasAttributeMatrix && oldAm->getType() == newAm->getType() && oldAm->getNumberOfTuples() == newAm->getNumberOfTuples())
+      {
+        // No Data Array path
+        if(oldPath.getDataArrayName().isEmpty() && newPath.getDataArrayName().isEmpty())
+        {
+          return true;
+        }
+
+        IDataArray::Pointer oldDa = oldAm->getAttributeArray(oldPath.getDataArrayName());
+        IDataArray::Pointer newDa = newAm->getAttributeArray(newPath.getDataArrayName());
+
+        bool hasDataArray = oldDa && newDa;
+        bool hasSameType = oldDa->getTypeAsString() == newDa->getTypeAsString();
+        bool hasSameCompDims = oldDa->getComponentDimensions() == newDa->getComponentDimensions();
+        bool isNeighborList = hasSameType && newDa->getTypeAsString().startsWith("NeighborList");
+        if(hasDataArray && hasSameType && (hasSameCompDims || isNeighborList))
+        {
+          return true;
+        }
+      }
+    }
+  }
+
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArrayPath::RenameContainer RenameDataPath::CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths)
+{
+  DataArrayPath::RenameContainer container;
+  std::list<DataArrayPath> duplicatedPaths;
+  std::list<DataArrayPath> usedNewPaths;
+
+  // For each older path, check for any matching new paths.  If only one new path matches, add it as a possibility
+  for(const DataArrayPath& oldPath : oldPaths)
+  {
+    // If the same path exists in both oldPaths and newPaths, it was not renamed
+    if(std::find(newPaths.begin(), newPaths.end(), oldPath) != newPaths.end())
+    {
+      continue;
+    }
+
+    // Find any potential renames in newPaths for the given oldPath
+    std::list<DataArrayPath> matches;
+    for(const DataArrayPath& newPath : newPaths)
+    {
+      // If the same path exists in both oldPaths and newPaths, it was not renamed
+      if(std::find(oldPaths.begin(), oldPaths.end(), newPath) != oldPaths.end())
+      {
+        continue;
+      }
+
+      // Check that all geometries, AttributeMatrices, and DataArrays are compatible
+      if(CheckRenamePath(oldDca, newDca, oldPath, newPath))
+      {
+        matches.push_back(newPath);
+      }
+    }
+    // If this path was already used, mark it as duplicate and move on
+    if(matches.size() == 1)
+    {
+      const DataArrayPath& newPath = matches.front();
+      if(usedNewPaths.end() != std::find(usedNewPaths.begin(), usedNewPaths.end(), newPath))
+      {
+        duplicatedPaths.push_back(newPath);
+      }
+      else
+      {
+        usedNewPaths.push_back(newPath);
+        container.push_back(std::make_pair(oldPath, newPath));
+      }
+    }
+  }
+
+  // Remove items with duplicated paths
+  for(auto iter = container.begin(); iter != container.end(); )
+  {
+    const DataArrayPath& checkPath = std::get<1>(*iter);
+    if(duplicatedPaths.end() != std::find(duplicatedPaths.begin(), duplicatedPaths.end(), checkPath))
+    {
+      iter = container.erase(iter);
+    }
+    else
+    {
+      iter++;
+    }
+  }
+
+  return container;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RenameDataPath::CalculateRenamedPaths(const AbstractFilterShPtr& filter, DataArrayPath::RenameContainer& renamedPaths)
+{
+  const DataArrayPath::RenameContainer origRenamedPaths = filter->getRenamedPaths();
+  filter->preflight();
+  // Check if an existing renamed path was created by this filter
+  std::list<DataArrayPath> createdPaths = filter->getCreatedPaths();
+  for(const auto& origRenamedPath : origRenamedPaths)
+  {
+    createdPaths.push_back(origRenamedPath.second);
+  }
+  for(const DataArrayPath& createdPath : createdPaths)
+  {
+    // Using iterator over range-based for to utilize std::list.erase(iterator)
+    for(auto iter = renamedPaths.begin(); iter != renamedPaths.end(); iter++)
+    {
+      const DataArrayPath& originalPath = (*iter).first;
+      if(originalPath == createdPath)
+      {
+        renamedPaths.erase(iter);
+        break;
+      }
+    }
+  }
+
+  // Check for updated rename paths
+  MergeRenamedPaths(renamedPaths, origRenamedPaths);
+  const DataArrayPath::RenameContainer updatedRenamedPaths = filter->getRenamedPaths();
+  MergeRenamedPaths(renamedPaths, updatedRenamedPaths);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RenameDataPath::MergeRenamedPaths(RenameContainer& list, const RenameContainer& newRenames)
+{
+  for(const auto& newRename : newRenames)
+  {
+    bool added = false;
+    // Check if this updates an existing rename
+    for(auto iter = list.begin(); iter != list.end(); iter++)
+    {
+      const DataArrayPath::RenameType& renamedPath = *iter;
+      const auto& possibleRename = DataArrayPath::CreateLinkingRename(renamedPath, newRename);
+      if(possibleRename.first)
+      {
+        list.insert(iter, possibleRename.second);
+        added = true;
+        break;
+      }
+    }
+    // Path wasn't updated
+    if(!added)
+    {
+      list.push_back(newRename);
+    }
+  }
+}
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.h b/Source/SIMPLib/DataContainers/RenameDataPath.h
index c043fa4f5e..9cbef7f633 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.h
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.h
@@ -34,11 +34,17 @@
 #pragma once
 
 #include <cstddef>
+#include <memory>
+#include <utility>
 
 #include "SIMPLib/SIMPLib.h"
 
 class AbstractFilter;
 class DataArrayPath;
+class DataContainerArray;
+
+using AbstractFilterShPtr = std::shared_ptr<AbstractFilter>;
+using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
 
 /**
  * @brief RenameDataPath is used by DataContainerArray, DataContainer, and AttributeMatrix
@@ -49,6 +55,10 @@ class DataArrayPath;
  */
 namespace RenameDataPath
 {
+  using RenamePathType = std::pair<DataArrayPath, DataArrayPath>;
+  using RenameContainer = std::list<RenamePathType>;
+  using PossibleRename = std::pair<bool, RenamePathType>;
+
   /**
    * @brief DataID_t is used as the ID type when creating DataArrayPaths through 
    * createNonPrereq* methods inside AbstractFilter::dataCheck().  This ID is 
@@ -71,4 +81,44 @@ namespace RenameDataPath
    * @param path The new DataArrayPath
    */
   void SIMPLib_EXPORT AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id, const DataArrayPath& path);
+
+  /**
+   * @brief Checks if two rename values are compatible to be merged together.
+   * @param originalPair
+   * @param newPair
+   * @return
+   */
+  bool SIMPLib_EXPORT CanReplaceRenamePath(const RenamePathType& originalPair, const RenamePathType& newPair);
+
+  /**
+   * @brief checks if the targets of the old DataArrayPath and new DataArrayPath are compatible in their given DataContainerArrays
+   * @param oldDca
+   * @param newDca
+   * @param oldPath
+   * @param newPath
+   */
+  bool SIMPLib_EXPORT CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath);
+
+  /**
+   * @brief checks for and returns any updated DataArrayPaths between two sets
+   * @param oldPaths
+   * @param newPaths
+   * @return
+   */
+  RenameContainer SIMPLib_EXPORT CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths);
+  
+  /**
+   * @brief Calculate the rename paths for the given filter and removes rename paths as required by created paths.
+   * The updated rename paths are added to the list parameter.
+   * @param filter
+   * @param renamePaths
+   */
+  void SIMPLib_EXPORT CalculateRenamedPaths(const AbstractFilterShPtr& filter, RenameContainer& renamedPaths);
+
+  /**
+   * @brief Merges a list of DataArrayPath renames into an existing list.
+   * @param list
+   * @param newRenames
+   */
+  void SIMPLib_EXPORT MergeRenamedPaths(RenameContainer& list, const RenameContainer& newRenames);
 }
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 76acbb4616..2510b77a0b 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -87,6 +87,10 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
   if(var.canConvert<DataArrayPath>())
   {
     DataArrayPath path = var.value<DataArrayPath>();
+    if(path == renamePath.first)
+    {
+      return;
+    }
     if(path.updatePath(renamePath))
     {
       var.setValue(path);
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 9a38d0fac2..f91d0f41c2 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -1,52 +1,49 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractFilter.h"
 
-
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Filtering/IFilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Plugin/PluginManager.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -103,6 +100,15 @@ void AbstractFilter::setCancel(bool value)
 // -----------------------------------------------------------------------------
 void AbstractFilter::renameDataArrayPath(const DataArrayPath::RenameType& renamePath)
 {
+  // If the path is created here, do not rename
+  for(const auto& createdPath : m_CreatedPaths)
+  {
+    if(createdPath.second == renamePath.first)
+    {
+      return;
+    }
+  }
+
   // Some filter parameters handle paths as nothing but a QString (i.e. DataContainerSelectionFilterParameter)
   // This does not store data in a way that represents what is stored or in a consistent manner with anything else.
   // Because this format cannot be quieried nicely like the above code, filter parameters have to be able to update
@@ -269,10 +275,9 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
   }
   else
   {
+    // Add all paths if this is the first filter in the pipeline
     DataContainerArray::Pointer dca = getDataContainerArray();
-
-    // Check if the DataContainerArray is valid
-    if(dca)
+    if(nullptr != dca)
     {
       // Add all paths if there is no previous filter to compare to
       for(const DataContainer::Pointer& dc : dca->getDataContainers())
@@ -285,6 +290,26 @@ std::list<DataArrayPath> AbstractFilter::getCreatedPaths()
   return createdPaths;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::list<DataArrayPath> AbstractFilter::getCreatedPathsNotRenamed()
+{
+  std::list<DataArrayPath> createdPaths = getCreatedPaths();
+  const DataArrayPath::RenameContainer renamedPaths = getRenamedPaths();
+
+  for(const auto& renamedPath : renamedPaths)
+  {
+    auto iter = std::find(createdPaths.begin(), createdPaths.end(), std::get<0>(renamedPath));
+    if(iter != createdPaths.end())
+    {
+      createdPaths.erase(iter);
+    }
+  }
+
+  return createdPaths;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -471,9 +496,9 @@ const QUuid AbstractFilter::getUuid()
     uint l = 100;
     ushort w1 = 200;
     ushort w2 = 300;
-    
+
     QString libName = getCompiledLibraryName();
-    uchar b[8] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+    uchar b[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
     int32_t i = 0;
     while(i < 8 && i < libName.size())
     {
@@ -488,7 +513,6 @@ const QUuid AbstractFilter::getUuid()
   return m_Uuid;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -531,7 +555,7 @@ void AbstractFilter::cleanupFilter()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::setErrorCondition(int code, const QString &messageText)
+void AbstractFilter::setErrorCondition(int code, const QString& messageText)
 {
   m_ErrorCode = code;
   FilterErrorMessage::Pointer pm = FilterErrorMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, code);
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 8361bcdd52..fa046cb691 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -311,6 +311,12 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   std::list<DataArrayPath> getCreatedPaths();
 
+  /**
+   * @brief Returns a list of DataArrayPaths created but not renamed by the filter.
+   * @return
+   */
+  std::list<DataArrayPath> getCreatedPathsNotRenamed();
+
   /**
    * @brief Returns the list of deleted data paths.
    * @return
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 704e83fae2..93e9c5e04b 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -35,21 +35,22 @@
 
 #include "FilterPipeline.h"
 
+#include "SIMPLib/CoreFilters/EmptyFilter.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
-#include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
 #include "SIMPLib/Messages/PipelineProgressMessage.h"
 #include "SIMPLib/Messages/PipelineStatusMessage.h"
 #include "SIMPLib/Messages/PipelineWarningMessage.h"
-#include "SIMPLib/CoreFilters/EmptyFilter.h"
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterManager.h"
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 
 #define RENAME_ENABLED 1
@@ -59,31 +60,34 @@
  */
 class FilterPipelineMessageHandler : public AbstractMessageHandler
 {
-  public:
-    explicit FilterPipelineMessageHandler(FilterPipeline* pipeline) : m_Pipeline(pipeline) {}
+public:
+  explicit FilterPipelineMessageHandler(FilterPipeline* pipeline)
+  : m_Pipeline(pipeline)
+  {
+  }
 
-    /**
-     * @brief Converts filter progress messages into pipeline progress messages.  This enables the overall pipeline
-     * progress to update along with the filter's progress updates
-     */
-    void processMessage(const FilterProgressMessage* msg) const override
-    {
-      int filterProgress = msg->getProgressValue();
-      float filterProgressStep = (1.0f / m_Pipeline->size()) * filterProgress / 100.0f;
-      int pipelineProgress = static_cast<int>((static_cast<float>(msg->getPipelineIndex()) / (m_Pipeline->size()) + filterProgressStep) * 100.0f);
-      m_Pipeline->notifyProgressMessage(pipelineProgress, "");
-    }
+  /**
+   * @brief Converts filter progress messages into pipeline progress messages.  This enables the overall pipeline
+   * progress to update along with the filter's progress updates
+   */
+  void processMessage(const FilterProgressMessage* msg) const override
+  {
+    int filterProgress = msg->getProgressValue();
+    float filterProgressStep = (1.0f / m_Pipeline->size()) * filterProgress / 100.0f;
+    int pipelineProgress = static_cast<int>((static_cast<float>(msg->getPipelineIndex()) / (m_Pipeline->size()) + filterProgressStep) * 100.0f);
+    m_Pipeline->notifyProgressMessage(pipelineProgress, "");
+  }
 
-  private:
-    FilterPipeline* m_Pipeline = nullptr;
+private:
+  FilterPipeline* m_Pipeline = nullptr;
 };
 
 class PipelineIdleException : public std::exception
 {
-   const char* what () const noexcept
-   {
-      return "A pipeline that was finishing execution was marked as in the idle state.";
-   }
+  const char* what() const noexcept
+  {
+    return "A pipeline that was finishing execution was marked as in the idle state.";
+  }
 };
 
 // -----------------------------------------------------------------------------
@@ -612,7 +616,7 @@ void FilterPipeline::updatePrevNextFilters()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterPipeline::setErrorCondition(int code, const QString &messageText)
+void FilterPipeline::setErrorCondition(int code, const QString& messageText)
 {
   m_ErrorCode = code;
   PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(getName(), messageText, code);
@@ -691,7 +695,7 @@ void FilterPipeline::connectFilterNotifications(AbstractFilter* filter)
     connect(filter, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), messageReceiver, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   }
 
-  connect(filter, &AbstractFilter::messageGenerated, [=] (AbstractMessage::Pointer msg) {
+  connect(filter, &AbstractFilter::messageGenerated, [=](AbstractMessage::Pointer msg) {
     FilterPipelineMessageHandler msgHandler(this);
     msg->visit(&msgHandler);
   });
@@ -738,10 +742,20 @@ int FilterPipeline::preflightPipeline()
     // Do not preflight disabled filters
     if(filter->getEnabled())
     {
-      filter->setDataContainerArray(dca);
+      filter->setDataContainerArray(dca->deepCopy(true));
 #if RENAME_ENABLED
-      filter->renameDataArrayPaths(renamedPaths);
+      // Avoid renaming filters as soon as they are added to the pipeline
+      if(filter->property("HasRenameValues").toBool())
+      {
+        filter->renameDataArrayPaths(renamedPaths);
+        RenameDataPath::CalculateRenamedPaths(filter, renamedPaths);
+      }
+      else
+      {
+        filter->setProperty("HasRenameValues", true);
+      }
 #endif
+      filter->setDataContainerArray(dca);
       setCurrentFilter(filter);
       connectFilterNotifications(filter.get());
       filter->clearRenamedPaths();
@@ -752,14 +766,13 @@ int FilterPipeline::preflightPipeline()
       preflightError |= filter->getErrorCode();
       filter->setDataContainerArray(dca->deepCopy(false));
 #if RENAME_ENABLED
-      const std::list<DataArrayPath> deletedPaths = filter->getDeletedPaths();
-
       // Check if an existing renamed path was deleted by this filter
+      const std::list<DataArrayPath> deletedPaths = filter->getDeletedPaths();
       for(const DataArrayPath& deletedPath : deletedPaths)
       {
         for(const DataArrayPath::RenameType& rename : renamedPaths)
         {
-          const DataArrayPath& originalPath = std::get<0>(rename);
+          const DataArrayPath& originalPath = rename.first;
           // const DataArrayPath& renamePath = std::get<1>(rename);
           if(originalPath == deletedPath)
           {
@@ -800,8 +813,8 @@ int FilterPipeline::preflightPipeline()
       const DataArrayPath::RenameContainer filterRenamedPaths = filter->getRenamedPaths();
       for(const DataArrayPath::RenameType& renameType : filterRenamedPaths)
       {
-        const DataArrayPath& oldPath = std::get<0>(renameType);
-        const DataArrayPath& newPath = std::get<1>(renameType);
+        const DataArrayPath& oldPath = renameType.first;
+        const DataArrayPath& newPath = renameType.second;
 
         renamedPaths.push_back(std::make_pair(newPath, oldPath));
       }
@@ -850,7 +863,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
   for(const auto& filt : m_Pipeline)
   {
     int filtIndex = filt->getPipelineIndex();
-    QString ss = QObject::tr("[%1/%2] %3").arg(filtIndex+1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+    QString ss = QObject::tr("[%1/%2] %3").arg(filtIndex + 1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
     notifyStatusMessage(ss);
 
     emit filt->filterInProgress(filt.get());
@@ -858,7 +871,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
     // Do not execute disabled filters
     if(filt->getEnabled())
     {
-//      filt->setMessagePrefix(ss);
+      //      filt->setMessagePrefix(ss);
       connectFilterNotifications(filt.get());
       filt->setDataContainerArray(m_Dca);
       setCurrentFilter(filt);
@@ -868,7 +881,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
       err = filt->getErrorCode();
       if(err < 0)
       {
-        ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(filtIndex+1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
+        ss = QObject::tr("[%1/%2] %3 caused an error during execution.").arg(filtIndex + 1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
         setErrorCondition(err, ss);
 
         notifyProgressMessage(100, "");
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index f6bdac8eba..4582206ce8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -515,7 +515,7 @@ void ReadASCIIDataWidget::updateDataArrayPath(QString propertyName, const DataAr
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(m_ImportWizard != nullptr && propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
   {
     m_ImportWizard->updateDataArrayPath(renamePath);
   }
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 3551ea3a20..d090c971da 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -565,9 +565,8 @@ FilterPipeline::Pointer SVPipelineView::getFilterPipeline()
   {
     QModelIndex childIndex = model->index(i, PipelineItem::Contents);
 
-    PipelineItem::WidgetState wState = static_cast<PipelineItem::WidgetState>(model->data(childIndex, PipelineModel::WidgetStateRole).toInt());
     PipelineItem::AnimationType animationType = static_cast<PipelineItem::AnimationType>(model->data(childIndex, PipelineModel::Roles::AnimationTypeRole).toInt());
-    if(childIndex.isValid() && wState != PipelineItem::WidgetState::Disabled && (animationType == PipelineItem::AnimationType::None || animationType == PipelineItem::AnimationType::Add))
+    if(childIndex.isValid() && (animationType == PipelineItem::AnimationType::None || animationType == PipelineItem::AnimationType::Add))
     {
       AbstractFilter::Pointer filter = model->filter(childIndex);
       Breakpoint::Pointer breakpoint = std::dynamic_pointer_cast<Breakpoint>(filter);
@@ -576,7 +575,7 @@ FilterPipeline::Pointer SVPipelineView::getFilterPipeline()
         connect(pipeline.get(), SIGNAL(pipelineCanceled()), breakpoint.get(), SLOT(resumePipeline()));
       }
 
-      pipeline->pushBack(filter);
+      pipeline->pushBack(filter); 
     }
   }
 

From 53a7c93b565e4f573f431e919040ed5beaa78403 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 22 Aug 2019 14:35:33 -0400
Subject: [PATCH 147/397] Fixed several issues found during user testing

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  8 ++---
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |  9 ++++--
 .../MultiDataArraySelectionWidget.cpp         | 30 +++++--------------
 .../MultiDataArraySelectionWidget.h           |  8 ++---
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index f6f9bc47c5..6499ee3ee8 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -237,7 +237,7 @@ void ImportHDF5Dataset::dataCheck()
     stream << tr("HDF5 File Path: %1\n").arg(m_HDF5FilePath);
     stream << tr("HDF5 Dataset Path: %1\n").arg(datasetPath);
 
-    int hdf5TotalElements = 1;
+    size_t hdf5TotalElements = 1;
     stream << tr("    No. of Dimension(s): ") << locale.toString(dims.size()) << "\n";
     stream << tr("    Dimension Size(s): ");
     for(int i = 0; i < dims.size(); i++)
@@ -250,7 +250,7 @@ void ImportHDF5Dataset::dataCheck()
       }
     }
     stream << "\n";
-    stream << tr("    Total HDF5 Dataset Element Count: %1\n").arg(locale.toString(hdf5TotalElements));
+    stream << tr("    Total HDF5 Dataset Element Count: \n") << hdf5TotalElements << "\n";
     stream << "-------------------------------------------\n";
     stream << "Current Data Structure Information: \n";
 
@@ -307,9 +307,9 @@ void ImportHDF5Dataset::dataCheck()
                     .arg(locale.toString(numOfAMTuples))
                     .arg(locale.toString(totalComponents))
                     .arg(locale.toString(numOfAMTuples * totalComponents))
-                    .arg(locale.toString(hdf5TotalElements))
+                    .arg(locale.toString(static_cast<uint64_t>(hdf5TotalElements)))
                     .arg(locale.toString(numOfAMTuples * totalComponents))
-                    .arg(locale.toString(hdf5TotalElements));
+                    .arg(locale.toString(static_cast<uint64_t>(hdf5TotalElements)));
 
       setErrorCondition(-20008, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 6ddd4fd1ab..584dbcac20 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -197,10 +197,15 @@ void TetrahedralGeom::initializeWithZeros()
 // -----------------------------------------------------------------------------
 void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data)
 {
-  if((data->getType() != AttributeMatrix::Type::Vertex && data->getType() != AttributeMatrix::Type::Edge && data->getType() != AttributeMatrix::Type::Face) ||
-     data->getType() != AttributeMatrix::Type::Cell)
+  bool validType = false;
+  if(data->getType() == AttributeMatrix::Type::Vertex || data->getType() == AttributeMatrix::Type::Edge || data->getType() == AttributeMatrix::Type::Face ||
+     data->getType() == AttributeMatrix::Type::Cell)
   {
     // TetrahedralGeom can only accept vertex, edge, face or cell Attribute Matrices
+    validType = true;
+  }
+  if(!validType)
+  {
     return;
   }
   if(data->getType() == AttributeMatrix::Type::Vertex && static_cast<size_t>(data->getNumberOfTuples()) != getNumberOfVertices())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 6d900a67d6..5acdee6909 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -136,7 +136,7 @@ void MultiDataArraySelectionWidget::setupGui()
 
   connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SLOT(attributeMatrixPathUpdated()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
 
   connect(m_SelectedAttributeMatrixPath, SIGNAL(dataArrayPathSelectionLocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionLocked(QToolButton*)));
@@ -203,39 +203,26 @@ bool MultiDataArraySelectionWidget::eventFilter(QObject* obj, QEvent* event)
 }
 
 // -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataArraySelectionWidget::attributeMatrixSelected(QString path)
+void MultiDataArraySelectionWidget::attributeMatrixPathUpdated()
 {
-  setSelectedPath(path);
-
-  m_DidCausePreflight = true;
-  emit parametersChanged();
-  m_DidCausePreflight = false;
+  setSelectedPath(m_SelectedAttributeMatrixPath->getDataArrayPath());
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionWidget::setSelectedPath(QString path)
-{
-  DataArrayPath amPath = DataArrayPath::Deserialize(path, Detail::Delimiter);
-  setSelectedPath(amPath);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiDataArraySelectionWidget::setSelectedPath(DataArrayPath amPath)
+void MultiDataArraySelectionWidget::setSelectedPath(const DataArrayPath& amPath)
 {
   if(amPath.isEmpty())
   {
     return;
   }
 
-  m_SelectedAttributeMatrixPath->setDataArrayPath(amPath);
   availableArraysListWidget->clear();
   selectedArraysListWidget->clear();
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
 }
 
 // -----------------------------------------------------------------------------
@@ -285,7 +272,6 @@ void MultiDataArraySelectionWidget::on_selectBtn_clicked()
 // -----------------------------------------------------------------------------
 void MultiDataArraySelectionWidget::on_deselectBtn_clicked()
 {
-  // QModelIndexList indexList = selectedArraysListWidget->selectionModel()->selectedRows();
   QList<QListWidgetItem*> items = selectedArraysListWidget->selectedItems();
   foreach(QListWidgetItem* item, items)
   {
@@ -407,7 +393,7 @@ void MultiDataArraySelectionWidget::removeNonexistantPaths(QVector<DataArrayPath
 
   if(reloadPath && !amPath.isEmpty())
   {
-    setSelectedPath(amPath.serialize(Detail::Delimiter));
+    setSelectedPath(amPath);
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 583bed6404..56f80ca302 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -111,8 +111,6 @@ class SVWidgetsLib_EXPORT MultiDataArraySelectionWidget : public FilterParameter
     void afterPreflight();
     void filterNeedsInputParameters(AbstractFilter* filter);
 
-    void attributeMatrixSelected(QString path);
-
   protected slots:
     void on_upBtn_clicked();
     void on_downBtn_clicked();
@@ -128,14 +126,14 @@ class SVWidgetsLib_EXPORT MultiDataArraySelectionWidget : public FilterParameter
 
     void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
+    void attributeMatrixPathUpdated();
+
   private:
     bool m_DidCausePreflight;
 
     MultiDataArraySelectionFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
-
-    void setSelectedPath(DataArrayPath amPath);
+    void setSelectedPath(const DataArrayPath& amPath);
 
     void removeNonexistantPaths(QVector<DataArrayPath> &paths);
 

From 5bb1fe6f683ab7aad88505eaa2ebfd358fdcace0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 22 Aug 2019 13:54:52 -0400
Subject: [PATCH 148/397] Correct issue with static cast on Linux.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 6499ee3ee8..41c6b33b85 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -307,9 +307,9 @@ void ImportHDF5Dataset::dataCheck()
                     .arg(locale.toString(numOfAMTuples))
                     .arg(locale.toString(totalComponents))
                     .arg(locale.toString(numOfAMTuples * totalComponents))
-                    .arg(locale.toString(static_cast<uint64_t>(hdf5TotalElements)))
+                    .arg(locale.toString(static_cast<qulonglong>(hdf5TotalElements)))
                     .arg(locale.toString(numOfAMTuples * totalComponents))
-                    .arg(locale.toString(static_cast<uint64_t>(hdf5TotalElements)));
+                    .arg(locale.toString(static_cast<qulonglong>(hdf5TotalElements)));
 
       setErrorCondition(-20008, ss);
       m_DatasetPathsWithErrors.push_back(datasetPath);

From ec3980c0f93946ffe224e306545de2539df6f8cb Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 26 Aug 2019 10:17:12 -0400
Subject: [PATCH 149/397] Update/fix formatting inside ImportHDF5 Data set
 documentation

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/ImportHDF5Dataset.md          | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
index 736914a69e..d95f0922f4 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/ImportHDF5Dataset.md
@@ -1,5 +1,4 @@
-# Import HDF5 Dataset  #
-
+# Import HDF5 Dataset #
 
 ## Group (Subgroup) ##
 
@@ -10,33 +9,33 @@ Core (IO/Read)
 This **Filter** allows the user to import datasets from an HDF5 file and store them as attribute arrays in DREAM.3D.  This filter supports importing datasets with any number of dimensions, as long as the created attribute array's total number of components and the tuple count of the destination attribute matrix multiply together to match the HDF5 dataset's total number of elements.
 
 The component dimensions are input as a comma-delimited list of dimensional values.  For example:
+
 1. 3, 4 = 3x4
 2. 5, 2, 1 = 5x2x1
 3. 6 = 6
 
-### Examples ###    
+### Examples ###
+
 1. Suppose we have a 1D dataset in an HDF5 file with dimension **12,000**.
 	We can input component dimensions of **5, 2, 2** and set the destination attribute matrix tuple dimensions to **35 x 5 x 2 x 2**
-    
-    The total number of elements for the HDF5 dataset is 12,000.
-    The total number of tuples in the destination attribute matrix is 35\*5\*2\*2 = 700.
-    The total number of components for the created attribute array is 5\*2\*2 = 20.
-    The total number of elements for the created attribute array will be 700\*20 = 14,000.
-    
-    14,000 does not equal 12,000, so this will result in a preflight error.
-    
-1. Suppose we have a 3D dataset in an HDF5 file with dimensions **1 x 16 x 1001 x 1001**.
-
-	We can input component dimensions of **2** and set our destination attribute matrix tuple dimensions to **134 x 67**.
-
-    The total number of elements for the HDF5 dataset is 1\*16\*1001\*1001 = 16,032,016.
-    The total number of tuples in the destination attribute matrix is 8\*1001\*1001 = 8,016,008.
-    The total number of components for the created attribute array is 2.
-    The total number of elements for the created attribute array will be 8,016,008\*2 = 16,032,016.
-    
-    The total number of elements of the created attribute array (16,032,016) equals the total number of elements of the HDF5 dataset (16,032,016), so we can import this dataset without errors (see below).
-
-![](Images/ImportHDF5Dataset_ui.png)
+
++ The total number of elements for the HDF5 dataset is 12,000.
++ The total number of tuples in the destination attribute matrix is 35\*5\*2\*2 = 700.
++ The total number of components for the created attribute array is 5\*2\*2 = 20.
++ The total number of elements for the created attribute array will be 700\*20 = 14,000.
+
+14,000 does not equal 12,000, so this will result in a preflight error.
+
+2. Suppose we have a 3D dataset in an HDF5 file with dimensions **1 x 16 x 1001 x 1001**.
+We can input component dimensions of **2** and set our destination attribute matrix tuple dimensions to **134 x 67**.
+
++ The total number of elements for the HDF5 dataset is 1\*16\*1001\*1001 = 16,032,016.
++ The total number of tuples in the destination attribute matrix is 8\*1001\*1001 = 8,016,008.
++ The total number of components for the created attribute array is 2.
++ The total number of elements for the created attribute array will be 8,016,008\*2 = 16,032,016.
++ The total number of elements of the created attribute array (16,032,016) equals the total number of elements of the HDF5 dataset (16,032,016), so we can import this dataset without errors (see below).
+
+![Example Image](Images/ImportHDF5Dataset_ui.png)
 
 ## Parameters ##
 
@@ -46,7 +45,6 @@ The component dimensions are input as a comma-delimited list of dimensional valu
 | Checked Datasets | N/A | The checked datasets in the file tree to import |
 | Component Dimensions | QString | The component dimensions that the imported dataset will have.  This is a comma-delimited list of dimensional values |
 
-
 ## Required Geometry ##
 
 Not Applicable
@@ -65,11 +63,8 @@ Not Applicable
 
 ## Example Pipelines ##
 
-
-
 ## License & Copyright ##
 
 Please see the description file distributed with this **Plugin**
 
 ## DREAM.3D Mailing Lists ##
-

From 0c73a2b553d8b7e87f8316a3d08714f6058d9ab4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 11 Sep 2019 07:55:04 -0400
Subject: [PATCH 150/397] Fix ITK5 Symbol Loading on MacOS (#377)

* Replace malloc/free with new/delete[]
* Reintroduce SimpleITKExplicit library to solve symbol loading issues on macOS.
* Fix allocation errors in DataArray and StructArray

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                                |  25 +-
 Source/H5Support/Test/H5UtilitiesTest.cpp     |   4 +-
 Source/SIMPLib/CMakeLists.txt                 |   8 +
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  94 +--
 Source/SIMPLib/DataArrays/DataArray.hpp       |  73 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     | 185 ++---
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |   4 +-
 Source/SIMPLib/ITK/SourceList.cmake           |  10 +
 Source/SIMPLib/ITK/itkDream3DImage.h          | 292 --------
 Source/SIMPLib/ITK/itkDream3DImage.hxx        | 163 -----
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |  15 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.h     |  13 +-
 .../ITK/itkImportDream3DImageContainer.hxx    |   4 +-
 .../ITK/itkInPlaceDream3DDataToImageFilter.h  |  14 +-
 .../itkInPlaceDream3DDataToImageFilter.hxx    |   2 +
 .../ITK/itkInPlaceImageToDream3DDataFilter.h  |  32 +-
 .../itkInPlaceImageToDream3DDataFilter.hxx    |  10 +-
 Source/SIMPLib/ITK/itkReadImageImpl.hpp       |   2 +
 .../LineCounterObject.cpp                     |   9 +-
 .../CMake/sitkCheckCXX11.cmake                |  86 +++
 .../CMake/sitkCheckRequiredFlags.cmake        |  61 ++
 .../CMake/sitk_check_cxx11.cxx                | 165 +++++
 .../CMake/sitk_check_cxx11_required.cxx       |  14 +
 Source/SimpleITKExplicit/CMakeLists.txt       |  92 +++
 .../Common/src/sitkConfigure.h.in             |  78 +++
 .../SimpleITKExplicit/Explicit/CMakeLists.txt |   2 +
 .../Explicit/include/sitkExplicit.h           |  45 ++
 .../Explicit/include/sitkExplicitITK.h        |  55 ++
 .../sitkExplicitITKComposeImageFilter.h       |  49 ++
 .../sitkExplicitITKDefaultPixelAccessor.h     |  53 ++
 ...itkExplicitITKDefaultVectorPixelAccessor.h |  37 +
 .../Explicit/include/sitkExplicitITKImage.h   |  78 +++
 .../include/sitkExplicitITKImageBase.h        |  28 +
 .../sitkExplicitITKImageConstIterator.h       |  87 +++
 .../include/sitkExplicitITKImageRegion.h      |  28 +
 .../sitkExplicitITKImageRegionConstIterator.h |  85 +++
 ...itkExplicitITKImageScanlineConstIterator.h |  82 +++
 .../sitkExplicitITKImageScanlineIterator.h    |  80 +++
 .../include/sitkExplicitITKImageSource.h      | 106 +++
 .../sitkExplicitITKImageToImageFilter.h       | 645 ++++++++++++++++++
 .../sitkExplicitITKImportImageContainer.h     |  57 ++
 .../sitkExplicitITKInPlaceImageFilter.h       | 319 +++++++++
 .../include/sitkExplicitITKLabelMap.h         |  43 ++
 .../include/sitkExplicitITKVectorImage.h      |  49 ++
 ...itITKVectorIndexSelectionCastImageFilter.h |  49 ++
 .../Explicit/include/sitkMacro.h              |  95 +++
 .../Explicit/include/sitkVersionConfig.h      |  23 +
 .../Explicit/src/CMakeLists.txt               |  60 ++
 .../src/sitkExplicitITKComposeImageFilter.cxx |  46 ++
 .../sitkExplicitITKDefaultPixelAccessor.cxx   |  50 ++
 ...kExplicitITKDefaultVectorPixelAccessor.cxx |  34 +
 .../Explicit/src/sitkExplicitITKImage.cxx     |  75 ++
 .../Explicit/src/sitkExplicitITKImageBase.cxx |  25 +
 .../src/sitkExplicitITKImageConstIterator.cxx |  84 +++
 .../src/sitkExplicitITKImageRegion.cxx        |  25 +
 ...itkExplicitITKImageRegionConstIterator.cxx |  63 ++
 ...kExplicitITKImageScanlineConstIterator.cxx |  79 +++
 .../sitkExplicitITKImageScanlineIterator.cxx  |  77 +++
 .../src/sitkExplicitITKImageSource.cxx        | 103 +++
 .../src/sitkExplicitITKImageToImageFilter.cxx | 642 +++++++++++++++++
 .../sitkExplicitITKImportImageContainer.cxx   |  54 ++
 .../src/sitkExplicitITKInPlaceImageFilter.cxx | 316 +++++++++
 .../Explicit/src/sitkExplicitITKLabelMap.cxx  |  40 ++
 .../src/sitkExplicitITKVectorImage.cxx        |  46 ++
 ...ITKVectorIndexSelectionCastImageFilter.cxx |  46 ++
 65 files changed, 4687 insertions(+), 728 deletions(-)
 delete mode 100644 Source/SIMPLib/ITK/itkDream3DImage.h
 delete mode 100644 Source/SIMPLib/ITK/itkDream3DImage.hxx
 create mode 100644 Source/SimpleITKExplicit/CMake/sitkCheckCXX11.cmake
 create mode 100644 Source/SimpleITKExplicit/CMake/sitkCheckRequiredFlags.cmake
 create mode 100644 Source/SimpleITKExplicit/CMake/sitk_check_cxx11.cxx
 create mode 100644 Source/SimpleITKExplicit/CMake/sitk_check_cxx11_required.cxx
 create mode 100644 Source/SimpleITKExplicit/CMakeLists.txt
 create mode 100644 Source/SimpleITKExplicit/Common/src/sitkConfigure.h.in
 create mode 100644 Source/SimpleITKExplicit/Explicit/CMakeLists.txt
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/CMakeLists.txt
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKComposeImageFilter.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultPixelAccessor.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultVectorPixelAccessor.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImage.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageBase.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageConstIterator.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegion.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegionConstIterator.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineConstIterator.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineIterator.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageSource.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageToImageFilter.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImportImageContainer.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKInPlaceImageFilter.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKLabelMap.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorImage.cxx
 create mode 100644 Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorIndexSelectionCastImageFilter.cxx

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58cb3e05e3..f1e27d43aa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -376,11 +376,6 @@ install(
     Devel
 )
 
-
-# --------------------------------------------------------------------
-# Use ITK
-option(SIMPL_USE_ITK "Use ITK For Image Processing" ON)
-
 # -----------------------------------------------------------------------
 # Add in the Necessary HDF5 Support Sources into a library
 # -----------------------------------------------------------------------
@@ -391,7 +386,6 @@ add_subdirectory( ${SIMPLProj_SOURCE_DIR}/Source/H5Support ${PROJECT_BINARY_DIR}
 # -----------------------------------------------------------------------
 add_subdirectory(${SIMPLProj_SOURCE_DIR}/ThirdParty/QtWebApp )
 
-
 # -----------------------------------------------------------------------
 # This needs to be set here as we are going to look for files in this directory
 # -----------------------------------------------------------------------
@@ -399,6 +393,25 @@ if("${FilterWidgetsLib_BINARY_DIR}" STREQUAL "")
   set(FilterWidgetsLib_BINARY_DIR ${SIMPLProj_BINARY_DIR}/FilterWidgetsLib)
 endif()
 
+
+# --------------------------------------------------------------------
+# Use ITK
+option(SIMPL_USE_ITK "Use ITK For Image Processing" ON)
+if(SIMPL_USE_ITK)
+  # --------------------------------------------------------------------
+  # find ITK so that we can figure out the version of ITK the user has selected
+  # Does not register IO factories. It will be done by each plugin that needs it.
+  set(ITK_NO_IO_FACTORY_REGISTER_MANAGER TRUE)
+  find_package(ITK REQUIRED)
+  include(${CMP_SOURCE_DIR}/ITKSupport/IncludeITK.cmake)
+
+  # --- ONLY Mac OS using ITK 5 needs SimpleITKExplicit
+  get_property(ITK_VERSION_MAJOR GLOBAL PROPERTY ITK_VERSION_MAJOR)
+  if(APPLE AND "${ITK_VERSION_MAJOR}" STREQUAL "5")
+    add_subdirectory( ${SIMPLProj_SOURCE_DIR}/Source/SimpleITKExplicit ${PROJECT_BINARY_DIR}/SimpleITKExplicit)
+  endif()
+endif()
+
 # -----------------------------------------------------------------------
 # -- Add in the SIMPL Sources into a library
 add_subdirectory( ${SIMPLProj_SOURCE_DIR}/Source/SIMPLib ${PROJECT_BINARY_DIR}/SIMPLib)
diff --git a/Source/H5Support/Test/H5UtilitiesTest.cpp b/Source/H5Support/Test/H5UtilitiesTest.cpp
index 608e761e99..035522ebf5 100644
--- a/Source/H5Support/Test/H5UtilitiesTest.cpp
+++ b/Source/H5Support/Test/H5UtilitiesTest.cpp
@@ -459,7 +459,7 @@ class H5UtilitiesTest
     std::cout << "sizeof(ssize_t): " << sizeof(ssize_t);
     size_t dim1 = 3;
     size_t dim0 = 178956971;
-    int* data = (int*)(malloc(sizeof(int) * dim0 * dim1));
+    std::vector<int> data(dim0 * dim1);
 
     hid_t file_id;
     /* Create a new file using default properties. */
@@ -468,7 +468,7 @@ class H5UtilitiesTest
     int32_t rank = 2;
     hsize_t dims[2] = {dim0, dim1};
 
-    herr_t err = QH5Lite::writePointerDataset(file_id, "data", rank, dims, data);
+    herr_t err = QH5Lite::writePointerDataset(file_id, "data", rank, dims, data.data());
     DREAM3D_REQUIRE(err > -1);
   }
 #endif
diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index eb5f007ce2..b58571e3fe 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -178,6 +178,14 @@ if( "${SIMPL_USE_MULTITHREADED_ALGOS}" STREQUAL "ON")
   list(APPEND ${PROJECT_NAME}_LINK_LIBS TBB::tbb TBB::tbbmalloc)
 endif()
 
+#-----------------------------------------------------
+# --- ONLY Mac OS using ITK 5 needs SimpleITKExplicit
+get_property(ITK_VERSION_MAJOR GLOBAL PROPERTY ITK_VERSION_MAJOR)
+if(APPLE AND "${ITK_VERSION_MAJOR}" STREQUAL "5" AND SIMPL_USE_ITK)
+  message(STATUS "SimpleITKExplicit Enabled for APPLE build")
+  list(APPEND ${PROJECT_NAME}_LINK_LIBS SimpleITKExplicit)
+endif()
+
 #-- Add a library for the SIMPLib Code
 add_library(${PROJECT_NAME} ${LIB_TYPE} ${Project_SRCS} )
 CMP_AddDefinitions(TARGET ${PROJECT_NAME})
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index fc361be8e2..871bee6ba9 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -167,57 +167,57 @@
 
 /** Macro used to add standard methods to all classes, mainly type
  * information. */
-#define SIMPL_TYPE_MACRO(thisClass)\
-public:     \
-  virtual const QString getNameOfClass() const\
-  {  \
-    return QString(#thisClass);    \
-  }  \
-  static int IsTypeOf(const char* type)\
-  {  \
-    if(!strcmp(#thisClass, type))  \
-    {\
-      return 1;    \
-    }\
-    return 0;      \
+#define SIMPL_TYPE_MACRO(thisClass)                                                                                                                                                                    \
+public:                                                                                                                                                                                                \
+  virtual QString getNameOfClass() const                                                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    return QString(#thisClass);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  static int IsTypeOf(const char* type)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    if(!strcmp(#thisClass, type))                                                                                                                                                                      \
+    {                                                                                                                                                                                                  \
+      return 1;                                                                                                                                                                                        \
+    }                                                                                                                                                                                                  \
+    return 0;                                                                                                                                                                                          \
   }
 
-#define SIMPL_TYPE_MACRO_SUPER(thisClass, superclass)    \
-public:     \
-  virtual const QString getNameOfClass() const\
-  {  \
-    return QString(#thisClass);    \
-  }  \
-  static QString ClassName()\
-  {  \
-    return QString(#thisClass);    \
-  }  \
-  static int IsTypeOf(const char* type)\
-  {  \
-    if(!strcmp(#thisClass, type))  \
-    {\
-      return 1;    \
-    }\
-    return superclass::IsTypeOf(type); \
+#define SIMPL_TYPE_MACRO_SUPER(thisClass, superclass)                                                                                                                                                  \
+public:                                                                                                                                                                                                \
+  virtual QString getNameOfClass() const                                                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    return QString(#thisClass);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  static QString ClassName()                                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    return QString(#thisClass);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  static int IsTypeOf(const char* type)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    if(!strcmp(#thisClass, type))                                                                                                                                                                      \
+    {                                                                                                                                                                                                  \
+      return 1;                                                                                                                                                                                        \
+    }                                                                                                                                                                                                  \
+    return superclass::IsTypeOf(type);                                                                                                                                                                 \
   }
 
-#define SIMPL_TYPE_MACRO_SUPER_OVERRIDE(thisClass, superclass)  \
-public:     \
-  virtual const QString getNameOfClass() const override  \
-  {  \
-    return QString(#thisClass);    \
-  }  \
-  static QString ClassName()\
-  {  \
-    return QString(#thisClass);    \
-  }  \
-  static int IsTypeOf(const char* type)\
-  {  \
-    if(!strcmp(#thisClass, type))  \
-    {\
-      return 1;    \
-    }\
-    return superclass::IsTypeOf(type); \
+#define SIMPL_TYPE_MACRO_SUPER_OVERRIDE(thisClass, superclass)                                                                                                                                         \
+public:                                                                                                                                                                                                \
+  QString getNameOfClass() const override                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    return QString(#thisClass);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  static QString ClassName()                                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    return QString(#thisClass);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  static int IsTypeOf(const char* type)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    if(!strcmp(#thisClass, type))                                                                                                                                                                      \
+    {                                                                                                                                                                                                  \
+      return 1;                                                                                                                                                                                        \
+    }                                                                                                                                                                                                  \
+    return superclass::IsTypeOf(type);                                                                                                                                                                 \
   }
 
 #define SIMPL_CLASS_VERSION(vers)                                                                                                                                                                      \
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 8527baa79d..3a9dfdcbd5 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -684,11 +684,7 @@ template <typename T> class DataArray : public IDataArray
     }
 
     size_t newSize = m_Size;
-#if defined(AIM_USE_SSE) && defined(__SSE2__)
-    m_Array = static_cast<T*>(_mm_malloc(newSize * sizeof(T), 16));
-#else
-    m_Array = (T*)malloc(newSize * sizeof(T));
-#endif
+    m_Array = new T[newSize]();
     if(!m_Array)
     {
       qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
@@ -766,7 +762,8 @@ template <typename T> class DataArray : public IDataArray
     size_t newSize = (getNumberOfTuples() - idxs.size()) * m_NumComponents;
 
     // Create a new m_Array to copy into
-    T* newArray = (T*)malloc(newSize * sizeof(T));
+    T* newArray = new T[newSize]();
+
     // Splat AB across the array so we know if we are copying the values or not
     ::memset(newArray, 0xAB, newSize * sizeof(T));
 
@@ -2008,12 +2005,8 @@ template <typename T> class DataArray : public IDataArray
         Q_ASSERT(false);
       }
 #endif
+    delete[](m_Array);
 
-#if defined(AIM_USE_SSE) && defined(__SSE2__)
-    _mm_free(m_buffer);
-#else
-    free(m_Array);
-#endif
     m_Array = nullptr;
     m_IsAllocated = false;
   }
@@ -2046,9 +2039,9 @@ template <typename T> class DataArray : public IDataArray
    */
   virtual T* resizeAndExtend(size_t size)
   {
-    T* newArray;
-    size_t newSize;
-    size_t oldSize;
+    T* newArray = nullptr;
+    size_t newSize = 0;
+    size_t oldSize = 0;
 
     if(size == m_Size) // Requested size is equal to current size.  Do nothing.
     {
@@ -2063,53 +2056,23 @@ template <typename T> class DataArray : public IDataArray
       clear();
       return m_Array;
     }
-    // OS X's realloc does not free memory if the new block is smaller.  This
-    // is a very serious problem and causes huge amount of memory to be
-    // wasted. Do not use realloc on the Mac.
-    bool dontUseRealloc = false;
-#if defined __APPLE__
-    dontUseRealloc = true;
-#endif
 
-    // Allocate a new array if we DO NOT own the current array
-    if((nullptr != m_Array) && (false == m_OwnsData))
+    newArray = new T[newSize]();
+    if(!newArray)
     {
-      // The old array is owned by the user so we cannot try to
-      // reallocate it.  Just allocate new memory that we will own.
-      newArray = (T*)malloc(newSize * sizeof(T));
-      if(!newArray)
-      {
-        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-        return nullptr;
-      }
-
-      // Copy the data from the old array.
-      std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
+      qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+      return nullptr;
     }
-    else if(!dontUseRealloc)
+
+    // Copy the data from the old array.
+    if(m_Array != nullptr)
     {
-      // Try to reallocate with minimal memory usage and possibly avoid copying.
-      newArray = (T*)realloc(m_Array, newSize * sizeof(T));
-      if(!newArray)
-      {
-        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-        return nullptr;
-      }
+      std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
     }
-    else
-    {
-      newArray = (T*)malloc(newSize * sizeof(T));
-      if(!newArray)
-      {
-        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-        return nullptr;
-      }
 
-      // Copy the data from the old array.
-      if(m_Array != nullptr)
-      {
-        std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
-      }
+    // Allocate a new array if we DO NOT own the current array
+    if((nullptr != m_Array) && m_OwnsData)
+    {
       // Free the old array
       deallocate();
     }
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index eb38afe150..88211cf619 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -108,9 +108,9 @@ class StructArray : public IDataArray
     ~StructArray() override
     {
       //qDebug() << "~StructArrayTemplate '" << m_Name << "'" ;
-      if ((nullptr != m_Array) && (true == this->_ownsData))
+      if((nullptr != m_Array) && (true == m_OwnsData))
       {
-        _deallocate();
+        deallocate();
       }
     }
 
@@ -159,7 +159,7 @@ class StructArray : public IDataArray
      */
     void takeOwnership() override
     {
-      this->_ownsData = true;
+      m_OwnsData = true;
     }
 
     /**
@@ -169,7 +169,7 @@ class StructArray : public IDataArray
      */
     void releaseOwnership() override
     {
-      this->_ownsData = false;
+      m_OwnsData = false;
     }
 
     /**
@@ -178,34 +178,30 @@ class StructArray : public IDataArray
      */
     int32_t Allocate()
     {
-      if ((nullptr != m_Array) && (true == this->_ownsData))
+      if((nullptr != m_Array) && (true == m_OwnsData))
       {
-        _deallocate();
+        deallocate();
       }
       m_Array = nullptr;
-      this->_ownsData = true;
-      this->m_IsAllocated = false;
+      m_OwnsData = true;
+      m_IsAllocated = false;
 
-      if (this->m_Size == 0)
+      if(m_Size == 0)
       {
         initialize();
         return 1;
       }
 
+      size_t newSize = m_Size;
+      m_Array = new T[newSize]();
 
-      size_t newSize = this->m_Size;
-#if defined ( AIM_USE_SSE ) && defined ( __SSE2__ )
-      Array = static_cast<T*>( _mm_malloc (newSize * sizeof(T), 16) );
-#else
-      m_Array = (T*)malloc(newSize * sizeof(T));
-#endif
       if (!m_Array)
       {
         qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. " ;
         return -1;
       }
-      this->m_IsAllocated = true;
-      this->m_Size = newSize;
+      m_IsAllocated = true;
+      m_Size = newSize;
       return 1;
     }
 
@@ -214,15 +210,15 @@ class StructArray : public IDataArray
      */
     virtual void initialize()
     {
-      if (nullptr != m_Array && true == this->_ownsData)
+      if(nullptr != m_Array && true == m_OwnsData)
       {
-        _deallocate();
+        deallocate();
       }
       m_Array = nullptr;
-      this->m_Size = 0;
-      this->_ownsData = true;
-      this->m_MaxId = 0;
-      this->m_IsAllocated = false;
+      m_Size = 0;
+      m_OwnsData = true;
+      m_MaxId = 0;
+      m_IsAllocated = false;
     }
 
     /**
@@ -231,7 +227,7 @@ class StructArray : public IDataArray
     void initializeWithZeros() override
     {
       size_t typeSize = sizeof(T);
-      ::memset(m_Array, 0, this->m_Size * typeSize);
+      ::memset(m_Array, 0, m_Size * typeSize);
     }
 
     /**
@@ -239,7 +235,7 @@ class StructArray : public IDataArray
      */
     void initializeWithValue(T value, size_t offset = 0)
     {
-      for (size_t i = offset; i < this->m_Size; i++)
+      for(size_t i = offset; i < m_Size; i++)
       {
         m_Array[i] = value;
       }
@@ -275,7 +271,10 @@ class StructArray : public IDataArray
       // off the end of the array and return an error code.
       for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
       {
-        if (idxs[i] > this->m_MaxId) { return -100; }
+        if(idxs[i] > m_MaxId)
+        {
+          return -100;
+        }
       }
 
       // Calculate the new size of the array to copy into
@@ -283,14 +282,14 @@ class StructArray : public IDataArray
       T* currentSrc = nullptr;
 
       // Create a new Array to copy into
-      T* newArray = (T*)malloc(newSize * sizeof(T));
+      T* newArray = new T[newSize]();
       // Splat AB across the array so we know if we are copying the values or not
       ::memset(newArray, 0xAB, newSize * sizeof(T));
 
       // Keep the current Destination Pointer
       T* currentDest = newArray;
       size_t j = 0;
-      int k = 0;
+      size_t k = 0;
       // Find the first chunk to copy by walking the idxs array until we get an
       // index that is NOT a continuous increment from the start
       for (k = 0; k < idxs.size(); ++k)
@@ -309,11 +308,11 @@ class StructArray : public IDataArray
       {
         currentSrc = m_Array + (j);
         ::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * sizeof(T));
-        _deallocate(); // We are done copying - delete the current Array
-        this->m_Size = newSize;
+        deallocate(); // We are done copying - delete the current Array
+        m_Size = newSize;
         m_Array = newArray;
-        this->_ownsData = true;
-        this->m_MaxId = newSize - 1;
+        m_OwnsData = true;
+        m_MaxId = newSize - 1;
         return 0;
       }
 
@@ -324,7 +323,7 @@ class StructArray : public IDataArray
       destIdx[0] = 0;
       copyElements[0] = (idxs[0] - 0);
 
-      for (int i = 1; i < srcIdx.size(); ++i)
+      for(size_t i = 1; i < srcIdx.size(); ++i)
       {
         srcIdx[i] = (idxs[i - 1] + 1);
 
@@ -349,15 +348,15 @@ class StructArray : public IDataArray
       }
 
       // We are done copying - delete the current Array
-      _deallocate();
+      deallocate();
 
       // Allocation was successful.  Save it.
-      this->m_Size = newSize;
+      m_Size = newSize;
       m_Array = newArray;
       // This object has now allocated its memory and owns it.
-      this->_ownsData = true;
+      m_OwnsData = true;
 
-      this->m_MaxId = newSize - 1;
+      m_MaxId = newSize - 1;
 
       return err;
     }
@@ -370,7 +369,7 @@ class StructArray : public IDataArray
      */
     int copyTuple(size_t currentPos, size_t newPos) override
     {
-      size_t max =  ((this->m_MaxId + 1));
+      size_t max = ((m_MaxId + 1));
       if (currentPos >= max
           || newPos >= max )
       {return -1;}
@@ -465,7 +464,7 @@ class StructArray : public IDataArray
     size_t getNumberOfTuples() override
     {
       if (m_Size == 0) { return 0; }
-      return (this->m_MaxId + 1);
+      return (m_MaxId + 1);
     }
 
     /**
@@ -525,7 +524,7 @@ class StructArray : public IDataArray
     {
       if (i >= m_Size) { return nullptr;}
 
-      return (void*)(&(m_Array[i]));
+      return reinterpret_cast<void*>(m_Array + i);
     }
 
 
@@ -541,7 +540,7 @@ class StructArray : public IDataArray
 #ifndef NDEBUG
       if (m_Size > 0) { Q_ASSERT(i < m_Size);}
 #endif
-      return (T*)(&(m_Array[i]));
+      return reinterpret_cast<T*>(m_Array + i);
     }
 
     /**
@@ -587,7 +586,7 @@ class StructArray : public IDataArray
      */
     int32_t resizeTotalElements(size_t size) override
     {
-      if (this->resizeAndExtend(size) || size == 0)
+      if(resizeAndExtend(size) || size == 0)
       {
         return 1;
       }
@@ -722,11 +721,11 @@ class StructArray : public IDataArray
      * @param numElements The number of elements in the internal array.
      * @param takeOwnership Will the class clean up the memory. Default=true
      */
-    StructArray(size_t numElements, bool ownsData = true) :
-      m_Array(nullptr),
-      m_Size(numElements),
-      _ownsData(ownsData),
-      m_IsAllocated(false)
+    StructArray(size_t numElements, bool ownsData = true)
+    : m_Array(nullptr)
+    , m_Size(numElements)
+    , m_OwnsData(ownsData)
+    , m_IsAllocated(false)
     {
       m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
       //  MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
@@ -735,7 +734,7 @@ class StructArray : public IDataArray
     /**
      * @brief deallocates the memory block
      */
-    void _deallocate()
+    void deallocate()
     {
       // We are going to splat 0xABABAB across the first value of the array as a debugging aid
       unsigned char* cptr = reinterpret_cast<unsigned char*>(m_Array);
@@ -761,13 +760,10 @@ class StructArray : public IDataArray
       }
 #endif
 
-#if defined ( AIM_USE_SSE ) && defined ( __SSE2__ )
-      _mm_free( this->m_buffer );
-#else
-      free(m_Array);
-#endif
+      delete[](m_Array);
+
       m_Array = nullptr;
-      this->m_IsAllocated = false;
+      m_IsAllocated = false;
     }
 
     /**
@@ -777,87 +773,50 @@ class StructArray : public IDataArray
      */
     virtual T* resizeAndExtend(size_t size)
     {
-      T* newArray;
-      size_t newSize;
+      T* newArray = nullptr;
+      size_t newSize = 0;
 
-      if (size > this->m_Size)
-      {
-        newSize = size;
-      }
-      else if (size == this->m_Size) // Requested size is equal to current size.  Do nothing.
+      if(size == m_Size) // Requested size is equal to current size.  Do nothing.
       {
         return m_Array;
       }
-      else // Requested size is smaller than current size.  Squeeze the memory.
-      {
-        newSize = size;
-      }
+      newSize = size;
 
       // Wipe out the array completely if new size is zero.
       if (newSize == 0)
       {
-        this->initialize();
+        initialize();
         return m_Array;
       }
-      // OS X's realloc does not free memory if the new block is smaller.  This
-      // is a very serious problem and causes huge amount of memory to be
-      // wasted. Do not use realloc on the Mac.
-      bool dontUseRealloc = false;
-#if defined __APPLE__
-      dontUseRealloc = true;
-#endif
 
-      // Allocate a new array if we DO NOT own the current array
-      if ((nullptr != m_Array) && (false == this->_ownsData))
+      newArray = new T[newSize]();
+      if(!newArray)
       {
-        // The old array is owned by the user so we cannot try to
-        // reallocate it.  Just allocate new memory that we will own.
-        newArray = (T*)malloc(newSize * sizeof(T));
-        if (!newArray)
-        {
-          qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. " ;
-          return 0;
-        }
-
-        // Copy the data from the old array.
-        memcpy(newArray, m_Array, (newSize < this->m_Size ? newSize : this->m_Size) * sizeof(T));
+        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+        return nullptr;
       }
-      else if (!dontUseRealloc)
+
+      // Copy the data from the old array.
+      if(m_Array != nullptr)
       {
-        // Try to reallocate with minimal memory usage and possibly avoid copying.
-        newArray = (T*)realloc(m_Array, newSize * sizeof(T));
-        if (!newArray)
-        {
-          qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. " ;
-          return 0;
-        }
+        std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
       }
-      else
-      {
-        newArray = (T*)malloc(newSize * sizeof(T));
-        if (!newArray)
-        {
-          qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. " ;
-          return 0;
-        }
 
-        // Copy the data from the old array.
-        if (m_Array != nullptr)
-        {
-          memcpy(newArray, m_Array, (newSize < this->m_Size ? newSize : this->m_Size) * sizeof(T));
-        }
+      // Allocate a new array if we DO NOT own the current array
+      if((nullptr != m_Array) && m_OwnsData)
+      {
         // Free the old array
-        _deallocate();
+        deallocate();
       }
 
       // Allocation was successful.  Save it.
-      this->m_Size = newSize;
+      m_Size = newSize;
       m_Array = newArray;
       // This object has now allocated its memory and owns it.
-      this->_ownsData = true;
+      m_OwnsData = true;
 
-      this->m_MaxId = newSize - 1;
-      this->m_IsAllocated = true;
+      m_MaxId = newSize - 1;
+      m_IsAllocated = true;
 
       return m_Array;
     }
@@ -869,7 +828,7 @@ class StructArray : public IDataArray
     //  unsigned long long int MUD_FLAP_1;
     size_t m_Size;
     //  unsigned long long int MUD_FLAP_4;
-    bool _ownsData;
+    bool m_OwnsData;
     //  unsigned long long int MUD_FLAP_2;
     size_t m_MaxId;
 
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 4fe55969b4..7a5f8f75cf 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -215,8 +215,8 @@
 
 // 3 possible pixel type: C-type, InputImageType, and TImageType
 #define DefineInputImageType0(typeIN, dimension) // Do nothing, no type to defined
-#define DefineInputImageType1(typeIN, dimension) typedef itk::Dream3DImage<typeIN, dimension> InputImageType;
-#define DefineInputImageType2(typeIN, dimension) typedef itk::Dream3DImage<typeIN, dimension> TImageType;
+#define DefineInputImageType1(typeIN, dimension) typedef itk::Image<typeIN, dimension> InputImageType;
+#define DefineInputImageType2(typeIN, dimension) typedef itk::Image<typeIN, dimension> TImageType;
 ///////////////////////////////////////////////////////////////////////////////////////////////
 //        Handles scalar images      //
 ///////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Source/SIMPLib/ITK/SourceList.cmake b/Source/SIMPLib/ITK/SourceList.cmake
index 47a9a7303b..679aa78efb 100644
--- a/Source/SIMPLib/ITK/SourceList.cmake
+++ b/Source/SIMPLib/ITK/SourceList.cmake
@@ -1,5 +1,15 @@
 set(SUBDIR_NAME ITK)
 
+set(SIMPLib_${SUBDIR_NAME}_HDRS
+)
+
+set(SIMPLib_${SUBDIR_NAME}_SRCS
+)
+
+cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
+cmp_IDE_SOURCE_PROPERTIES( "Generated/${SUBDIR_NAME}" "" "${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}" "0")
+
+
 #-------------------------------------------------------------------------------
 # Add the unit testing sources
 # --------------------------------------------------------------------
diff --git a/Source/SIMPLib/ITK/itkDream3DImage.h b/Source/SIMPLib/ITK/itkDream3DImage.h
deleted file mode 100644
index 5f7affd33f..0000000000
--- a/Source/SIMPLib/ITK/itkDream3DImage.h
+++ /dev/null
@@ -1,292 +0,0 @@
-/*=========================================================================
- *
- *  Copyright Insight Software Consortium
- *
- *  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.
- *
- *=========================================================================*/
-#pragma once
-
-// ITK Includes
-#include "itkDefaultPixelAccessor.h"
-#include "itkDefaultPixelAccessorFunctor.h"
-#include "itkFixedArray.h"
-#include "itkImage.h"
-#include "itkImageRegion.h"
-#include "itkImportDream3DImageContainer.h"
-#include "itkNeighborhoodAccessorFunctor.h"
-#include "itkPoint.h"
-#include "itkWeakPointer.h"
-
-// SIMPLib/ITK includes
-#include "SIMPLib/ITK/itkSupportConstants.h"
-
-namespace itk
-{
-/** \class Dream3DImage
- *  \brief Templated n-dimensional Dream3DImage class that uses malloc/free.
- *
- * This class differs from itk::Image in its memory allocator. Memory is manage
- * with malloc and free instead of new and delete, respectively. This is useful
- * if one needs to import the data container from * or export the data to a
- * section of code that manages memory with malloc and free. The behavior of
- * mixing malloc/free and new/delete is undefined and should be avoided.
- *
- * Dream3DImages are templated over a pixel type (modeling the dependent
- * variables), and a dimension (number of independent variables).  The
- * container for the pixel data is the templated ImportImageContainer.
- *
- * Within the pixel container, Dream3DImages are modelled as arrays, defined by a
- * start index and a size.
- *
- * The superclass of Dream3DImage, Image, defines the geometry of the
- * image in terms of where the image sits in physical space, how the
- * image is oriented in physical space, the size of a pixel, and the
- * extent of the image itself.  ImageBase provides the methods to
- * convert between the index and physical space coordinate frames.
- *
- * Pixels can be accessed direcly using the SetPixel() and GetPixel()
- * methods or can be accessed via iterators that define the region of
- * the image they traverse.
- *
- * The pixel type may be one of the native types; a Insight-defined
- * class type such as Vector; or a user-defined type. Note that
- * depending on the type of pixel that you use, the process objects
- * (i.e., those filters processing data objects) may not operate on
- * the image and/or pixel type. This becomes apparent at compile-time
- * because operator overloading (for the pixel type) is not supported.
- *
- * The data in an image is arranged in a 1D array as [][][][slice][row][col]
- * with the column index varying most rapidly.  The Index type reverses
- * the order so that with Index[0] = col, Index[1] = row, Index[2] = slice,
- *
- * \sa Image
- * \sa ImageBase
- * \sa ImageContainerInterface
- *
- * \ingroup ImageObjects
- * \ingroup ITKCommon
- *
- * \wiki
- * \wikiexample{SimpleOperations/SetPixels,Set specified pixels to specified values}
- * \endwiki
- */
-template <typename TPixel, unsigned int VImageDimension = 2> class ITK_TEMPLATE_EXPORT Dream3DImage : public Image<TPixel, VImageDimension>
-{
-public:
-  /** Standard class typedefs */
-  typedef Dream3DImage Self;
-  typedef Image<TPixel, VImageDimension> Superclass;
-  typedef SmartPointer<Self> Pointer;
-  typedef SmartPointer<const Self> ConstPointer;
-  typedef WeakPointer<const Self> ConstWeakPointer;
-
-  /** Method for creation through the object factory. */
-  itkNewMacro(Self);
-
-  /** Run-time type information (and related methods). */
-  itkTypeMacro(Dream3DImage, Image);
-
-  /** Pixel typedef support. Used to declare pixel type in filters
-   * or other operations. */
-  typedef TPixel PixelType;
-
-  /** Typedef alias for PixelType */
-  typedef TPixel ValueType;
-
-  /** Internal Pixel representation. Used to maintain a uniform API
-   * with Image Adaptors and allow to keep a particular internal
-   * representation of data while showing a different external
-   * representation. */
-  typedef TPixel InternalPixelType;
-
-  typedef PixelType IOPixelType;
-
-  /** Accessor type that convert data between internal and external
-   *  representations.  */
-  typedef DefaultPixelAccessor<PixelType> AccessorType;
-  typedef DefaultPixelAccessorFunctor<Self> AccessorFunctorType;
-
-  /** Typedef for the functor used to access a neighborhood of pixel
-   * pointers. */
-  typedef NeighborhoodAccessorFunctor<Self> NeighborhoodAccessorFunctorType;
-
-  /** Type of image dimension */
-  typedef typename Superclass::ImageDimensionType ImageDimensionType;
-
-  /** Index typedef support. An index is used to access pixel values. */
-  typedef typename Superclass::IndexType IndexType;
-  typedef typename Superclass::IndexValueType IndexValueType;
-
-  /** Offset typedef support. An offset is used to access pixel values. */
-  typedef typename Superclass::OffsetType OffsetType;
-
-  /** Size typedef support. A size is used to define region bounds. */
-  typedef typename Superclass::SizeType SizeType;
-  typedef typename Superclass::SizeValueType SizeValueType;
-
-  /** Direction typedef support. A matrix of direction cosines. */
-  typedef typename Superclass::DirectionType DirectionType;
-
-  /** Region typedef support. A region is used to specify a subset of an image.
-   */
-  typedef typename Superclass::RegionType RegionType;
-
-  /** Spacing typedef support.  Spacing holds the size of a pixel.  The
-   * spacing is the geometric distance between image samples. */
-  typedef typename Superclass::SpacingType SpacingType;
-  typedef typename Superclass::SpacingValueType SpacingValueType;
-
-  /** Origin typedef support.  The origin is the geometric coordinates
-   * of the index (0,0). */
-  typedef typename Superclass::PointType PointType;
-
-  /** A pointer to the pixel container. */
-  typedef ImportDream3DImageContainer<itk::SizeValueType, TPixel> PixelContainerType;
-  typedef typename PixelContainerType::Pointer PixelContainerPointer;
-  typedef typename PixelContainerType::ConstPointer PixelContainerConstPointer;
-
-  /** Offset typedef (relative position between indices) */
-  typedef typename Superclass::OffsetValueType OffsetValueType;
-
-  /** Allocate the image memory. The size of the image must
-   * already be set, e.g. by calling SetRegions(). */
-  virtual void Allocate(bool initializePixels = false) override;
-
-  /** Restore the data object to its initial state. This means releasing
-   * memory. */
-  virtual void Initialize() override;
-
-  /** Fill the image buffer with a value.  Be sure to call Allocate()
-   * first. */
-  void FillBuffer(const TPixel& value);
-
-  /** \brief Set a pixel value.
-   *
-   * Allocate() needs to have been called first -- for efficiency,
-   * this function does not check that the image has actually been
-   * allocated yet. */
-  void SetPixel(const IndexType& index, const TPixel& value)
-  {
-    OffsetValueType offset = this->FastComputeOffset(index);
-    (*m_TemplatedBuffer)[offset] = value;
-  }
-
-  /** \brief Get a pixel (read only version).
-   *
-   * For efficiency, this function does not check that the
-   * image has actually been allocated yet. */
-  const TPixel& GetPixel(const IndexType& index) const
-  {
-    OffsetValueType offset = this->FastComputeOffset(index);
-    return ((*m_TemplatedBuffer)[offset]);
-  }
-
-  /** \brief Get a reference to a pixel (e.g. for editing).
-   *
-   * For efficiency, this function does not check that the
-   * image has actually been allocated yet. */
-  TPixel& GetPixel(const IndexType& index)
-  {
-    OffsetValueType offset = this->FastComputeOffset(index);
-    return ((*m_TemplatedBuffer)[offset]);
-  }
-
-  /** Return a pointer to the beginning of the buffer.  This is used by
-   * the image iterator class. */
-  virtual TPixel* GetBufferPointer() override
-  {
-    return m_TemplatedBuffer ? m_TemplatedBuffer->GetBufferPointer() : nullptr;
-  }
-  virtual const TPixel* GetBufferPointer() const override
-  {
-    return m_TemplatedBuffer ? m_TemplatedBuffer->GetBufferPointer() : nullptr;
-  }
-
-  /** Return a pointer to the container. */
-  PixelContainerType* GetPixelContainer()
-  {
-    return m_TemplatedBuffer.GetPointer();
-  }
-
-  const PixelContainerType* GetPixelContainer() const
-  {
-    return m_TemplatedBuffer.GetPointer();
-  }
-
-  /** Set the container to use. Note that this does not cause the
-   * DataObject to be modified. */
-  void SetPixelContainer(PixelContainerType* container);
-
-  /** Graft the data and information from one image to another. This
-   * is a convenience method to setup a second image with all the meta
-   * information of another image and use the same pixel
-   * container. Note that this method is different than just using two
-   * SmartPointers to the same image since separate DataObjects are
-   * still maintained. This method is similar to
-   * ImageSource::GraftOutput(). The implementation in ImageBase
-   * simply calls CopyInformation() and copies the region ivars.
-   * The implementation here refers to the superclass' implementation
-   * and then copies over the pixel container. */
-  virtual void Graft(const DataObject* data) override;
-
-  /** Return the Pixel Accessor object */
-  AccessorType GetPixelAccessor(void)
-  {
-    return AccessorType();
-  }
-
-  /** Return the Pixel Accesor object */
-  const AccessorType GetPixelAccessor(void) const
-  {
-    return AccessorType();
-  }
-
-  /** Return the NeighborhoodAccessor functor */
-  NeighborhoodAccessorFunctorType GetNeighborhoodAccessor()
-  {
-    return NeighborhoodAccessorFunctorType();
-  }
-
-  /** Return the NeighborhoodAccessor functor */
-  const NeighborhoodAccessorFunctorType GetNeighborhoodAccessor() const
-  {
-    return NeighborhoodAccessorFunctorType();
-  }
-
-#if ITK_VERSION_MAJOR == 5
-  /** Work around casting issue. */
-  void CopyInformation(const DataObject* data) override;
-#endif
-
-protected:
-  Dream3DImage();
-  void PrintSelf(std::ostream& os, Indent indent) const override;
-
-  virtual ~Dream3DImage()
-  {
-  }
-
-private:
-  Dream3DImage(const Self&) = delete;
-  void operator=(const Self&) = delete;
-
-  /** Memory for the current buffer. */
-  PixelContainerPointer m_TemplatedBuffer;
-};
-} // end namespace itk
-
-#ifndef ITK_MANUAL_INSTANTIATION
-#include "itkDream3DImage.hxx"
-#endif
-
diff --git a/Source/SIMPLib/ITK/itkDream3DImage.hxx b/Source/SIMPLib/ITK/itkDream3DImage.hxx
deleted file mode 100644
index 0821a58925..0000000000
--- a/Source/SIMPLib/ITK/itkDream3DImage.hxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
-/*=========================================================================
-*
-*  Portions of this file are subject to the VTK Toolkit Version 3 copyright.
-*
-*  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-*
-*  For complete copyright, license and disclaimer of warranty information
-*  please refer to the NOTICE file at the top of the ITK source tree.
-*
-*=========================================================================*/
-#pragma once
-
-#include "itkDream3DImage.h"
-#include "itkProcessObject.h"
-#include <algorithm>
-
-namespace itk
-{
-
-template <typename TPixel, unsigned int VImageDimension>
-Dream3DImage<TPixel, VImageDimension>
-::Dream3DImage()
-{
-  m_TemplatedBuffer = PixelContainerType::New();
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::Allocate(bool initializePixels)
-{
-  SizeValueType num;
-
-  this->ComputeOffsetTable();
-  num = static_cast<SizeValueType>(this->GetOffsetTable()[VImageDimension]);
-
-  m_TemplatedBuffer->Reserve(num, initializePixels);
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::Initialize()
-{
-  //
-  // We don't modify ourselves because the "ReleaseData" methods depend upon
-  // no modification when initialized.
-  //
-
-  // Call the superclass which should initialize the BufferedRegion ivar.
-  // Skip itk::Image::Initialize(), to overwrite it.
-  Superclass::Superclass::Initialize();
-
-  // Replace the handle to the buffer. This is the safest thing to do,
-  // since the same container can be shared by multiple images (e.g.
-  // Grafted outputs and in place filters).
-  m_TemplatedBuffer = PixelContainerType::New();
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::FillBuffer(const TPixel& value)
-{
-  const SizeValueType numberOfPixels = this->GetBufferedRegion().GetNumberOfPixels();
-
-  std::fill_n(&(*m_TemplatedBuffer)[0], numberOfPixels, value);
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::SetPixelContainer(PixelContainerType* container)
-{
-  if(m_TemplatedBuffer != container)
-  {
-    m_TemplatedBuffer = container;
-    this->Modified();
-  }
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::Graft(const DataObject* data)
-{
-  // call the superclass' implementation
-  Superclass::Superclass::Graft(data);
-
-  if(data)
-  {
-    // Attempt to cast data to an Image
-    const Self* const imgData = itkDynamicCastInDebugMode<const Self*>(data);
-
-    if(imgData != nullptr)
-    {
-      // Now copy anything remaining that is needed
-      this->SetPixelContainer(const_cast<PixelContainerType*>(imgData->GetPixelContainer()));
-    }
-    else
-    {
-      // pointer could not be cast back down
-      itkExceptionMacro(<< "itk::Image::Graft() cannot cast " << typeid(data).name() << " to " << typeid(const Self*).name());
-    }
-  }
-}
-
-
-template <typename TPixel, unsigned int VImageDimension>
-void
-Dream3DImage<TPixel, VImageDimension>
-::PrintSelf(std::ostream& os, Indent indent) const
-{
-  Superclass::PrintSelf(os, indent);
-
-  os << indent << "PixelContainer: " << std::endl;
-  m_TemplatedBuffer->Print(os, indent.GetNextIndent());
-
-  // m_Origin and m_Spacing are printed in the Superclass
-}
-
-#if(ITK_VERSION_MAJOR == 5)
-template <typename TPixel, unsigned int VImageDimension>
-void Dream3DImage<TPixel, VImageDimension>::CopyInformation(const DataObject* data)
-{
-  if(data)
-  {
-    const auto* const imgData = static_cast<const ImageBase<VImageDimension>*>(data);
-
-    // Copy the meta data for this data type
-    this->SetLargestPossibleRegion(imgData->GetLargestPossibleRegion());
-    this->SetSpacing(imgData->GetSpacing());
-    this->SetOrigin(imgData->GetOrigin());
-    this->SetDirection(imgData->GetDirection());
-    this->SetNumberOfComponentsPerPixel(imgData->GetNumberOfComponentsPerPixel());
-  }
-}
-#endif
-
-} // end namespace itk
-
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index b9a2fc05a7..e76cc104f4 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -17,9 +17,7 @@
 class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 {
 public:
-  ITK_IMAGE_READER_CLASS_NAME()
-  {
-  }
+  ITK_IMAGE_READER_CLASS_NAME() = deafult;
   ~ITK_IMAGE_READER_CLASS_NAME() = default;
 
 protected:
@@ -39,7 +37,7 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
   void readImage(const DataArrayPath& dataArrayPath, bool dataCheck);
 
   template <typename TPixel, unsigned int dimensions>
-  void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
+  void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
 };
 
 #endif
@@ -146,7 +144,7 @@ ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool da
     return;
   }
 
-  using ImageType = itk::Dream3DImage<TPixel, dimensions>;
+  using ImageType = itk::Image<TPixel, dimensions>;
   using ReaderType = itk::ImageFileReader<ImageType>;
   using ToDream3DType = itk::InPlaceImageToDream3DDataFilter<TPixel, dimensions>;
 
@@ -240,11 +238,10 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 //
 // -----------------------------------------------------------------------------
 template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container)
+void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader,
+                                                              DataContainer::Pointer& container)
 {
-  using ImageType = itk::Dream3DImage<TPixel, dimensions>;
+  using ImageType = itk::Image<TPixel, dimensions>;
   using ValueType = typename itk::NumericTraits<TPixel>::ValueType;
   reader->UpdateOutputInformation();
   const typename ImageType::PointType origin = reader->GetOutput()->GetOrigin();
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.h b/Source/SIMPLib/ITK/itkImageReaderHelper.h
index 25958a9388..469200f242 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.h
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "itkDream3DImage.h"
+#include "itkImage.h"
 
 #define ITK_IMAGE_READER_HELPER_ImageDataArrayName()                                                                                                                                                   \
 private:                                                                                                                                                                                               \
@@ -19,13 +19,16 @@ private:
   }
 
 #define ITK_IMAGE_READER_HELPER_DECL()                                                                                                                                                                 \
-  template <typename TComponent> void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);                                \
+  template <typename TComponent>                                                                                                                                                                       \
+  void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);                                                               \
                                                                                                                                                                                                        \
-  template <typename TComponent, unsigned int dimensions> void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);       \
+  template <typename TComponent, unsigned int dimensions>                                                                                                                                              \
+  void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);                                                               \
                                                                                                                                                                                                        \
-  template <typename TPixel, unsigned int> void readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck);                                                                \
+  template <typename TPixel, unsigned int>                                                                                                                                                             \
+  void readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck);                                                                                                         \
                                                                                                                                                                                                        \
   void readImage(const DataArrayPath& dataArrayPath, bool dataCheck);                                                                                                                                  \
                                                                                                                                                                                                        \
   template <typename TPixel, unsigned int dimensions>                                                                                                                                                  \
-  void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Dream3DImage<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
+  void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
diff --git a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.hxx b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.hxx
index 8c422fce0c..a61071a618 100644
--- a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.hxx
+++ b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.hxx
@@ -59,7 +59,7 @@ ImportDream3DImageContainer<TElementIdentifier, TElement>
 
   try
   {
-    data = (Element*)(malloc(sizeof(TElement) * size));
+    data = new TElement[size]();
     if(UseDefaultConstructor)
     {
       new(data) Element(); // POD types initialized to 0, others use default constructor.
@@ -88,7 +88,7 @@ ImportDream3DImageContainer<TElementIdentifier, TElement>
   {
     Element* data = this->GetBufferPointer();
     data->~Element();
-    free(data);
+    delete[](data);
     this->SetImportPointer(nullptr);
   }
   Superclass::DeallocateManagedMemory();
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 44b63b65de..a1cd9f7084 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -1,25 +1,29 @@
 #pragma once
 
-#include "itkDream3DImage.h"
 #include <itkImportImageFilter.h>
 #include <itkNumericTraits.h>
 #include <itkNumericTraitsRGBAPixel.h>
 #include <itkNumericTraitsRGBPixel.h>
 #include <itkNumericTraitsVectorPixel.h>
 
+#include "SIMPLib/ITK/itkImportDream3DImageContainer.h"
+
+class DataContainer;
+using DataContainerShPtr = std::shared_ptr<DataContainer>;
+
 namespace itk
 {
 
 template <typename PixelType, unsigned int VDimension>
-class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<PixelType, VDimension>>
+class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType, VDimension>>
 {
 public:
   /** Standard class typedefs. */
   using Self = InPlaceDream3DDataToImageFilter;
   using Pointer = SmartPointer<Self>;
 
-  using ImageType = typename itk::Dream3DImage<PixelType, VDimension>;
-  using ImportImageContainerType = typename ImageType::PixelContainerType;
+  using ImageType = typename itk::Image<PixelType, VDimension>;
+  using ImportImageContainerType = ImportDream3DImageContainer<itk::SizeValueType, PixelType>;
   using ImagePointer = typename ImageType::Pointer;
   using ValueType = typename itk::NumericTraits<PixelType>::ValueType;
   using DataArrayPixelType = typename ::DataArray<ValueType>;
@@ -53,7 +57,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Dream3DImage<Pix
 
   void GenerateOutputInformation() override;
   void GenerateData() override;
-  DataContainer::Pointer m_DataContainer = DataContainer::NullPointer();
+  DataContainerShPtr m_DataContainer;
 
 private:
   using Superclass::SetInput;
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 516965a117..3d7f6883ea 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "itkInPlaceDream3DDataToImageFilter.h"
+
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 
 namespace itk
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index c7697808b8..ee4dd307c8 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include "itkDream3DImage.h"
-#include "itkGetComponentsDimensions.h"
-
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-
-#include <itkProcessObject.h>
-#include <itkSimpleDataObjectDecorator.h>
-
+#include <itkImage.h>
 #include <itkNumericTraits.h>
 #include <itkNumericTraitsRGBAPixel.h>
 #include <itkNumericTraitsRGBPixel.h>
 #include <itkNumericTraitsVectorPixel.h>
+#include <itkProcessObject.h>
+#include <itkSimpleDataObjectDecorator.h>
+
+#include "SIMPLib/ITK/itkGetComponentsDimensions.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
+
 
 namespace itk
 {
@@ -24,7 +24,7 @@ class InPlaceImageToDream3DDataFilter : public ProcessObject
   using Superclass = ProcessObject;
   using Pointer = SmartPointer<Self>;
 
-  using ImageType = typename itk::Dream3DImage<PixelType, VDimension>;
+  using ImageType = typename itk::Image<PixelType, VDimension>;
   using ImagePointer = typename ImageType::Pointer;
   using ValueType = typename itk::NumericTraits<PixelType>::ValueType;
   using DataArrayPixelType = typename ::DataArray<ValueType>;
@@ -34,7 +34,10 @@ class InPlaceImageToDream3DDataFilter : public ProcessObject
   itkNewMacro(Self);
   itkTypeMacro(InPlaceImageToDream3DDataFilter, ProcessObject);
 
-  virtual void SetInput(const ImageType* image);
+  InPlaceImageToDream3DDataFilter(const InPlaceImageToDream3DDataFilter&) = delete; // Copy Constructor Not Implemented
+  void operator=(const InPlaceImageToDream3DDataFilter&) = delete;                  // Move assignment Not Implemented
+
+  virtual void SetInput(const ImageType* input);
 
   DecoratorType* GetOutput();
   const DecoratorType* GetOutput() const;
@@ -54,10 +57,10 @@ class InPlaceImageToDream3DDataFilter : public ProcessObject
 
 protected:
   InPlaceImageToDream3DDataFilter();
-  virtual ~InPlaceImageToDream3DDataFilter();
+  ~InPlaceImageToDream3DDataFilter() override;
 
-  virtual void VerifyPreconditions() ITKv5_CONST override;
-  ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
+  void VerifyPreconditions() ITKv5_CONST override;
+  ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType input) override;
 
   void GenerateData() override;
   void GenerateOutputInformation() override;
@@ -66,8 +69,7 @@ class InPlaceImageToDream3DDataFilter : public ProcessObject
 
 private:
   using Superclass::SetInput;
-  InPlaceImageToDream3DDataFilter(const InPlaceImageToDream3DDataFilter&) = delete; // Copy Constructor Not Implemented
-  void operator=(const InPlaceImageToDream3DDataFilter&) = delete;                  // Move assignment Not Implemented
+
   std::string m_DataArrayName;
   std::string m_AttributeMatrixArrayName;
   bool m_InPlace; // enable the possibility of in-place
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index d4e24d744a..2ab3b19300 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -35,12 +35,8 @@ InPlaceImageToDream3DDataFilter< PixelType, VDimension >
   outputPtr->Set(dc);
 }
 
-
-
-template< typename PixelType, unsigned int VDimension>
-ProcessObject::DataObjectPointer
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+template <typename PixelType, unsigned int VDimension>
+ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDimension>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType input)
 {
   return DecoratorType::New().GetPointer();
 }
@@ -177,7 +173,7 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
       ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
     }
   }
-  attrMat->insertOrAssign(data);
+  attrMat->addOrReplaceAttributeArray(data);
   outputPtr->Set(dataContainer);
 }
 
diff --git a/Source/SIMPLib/ITK/itkReadImageImpl.hpp b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
index 3134ee2167..4a32629aa4 100644
--- a/Source/SIMPLib/ITK/itkReadImageImpl.hpp
+++ b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
@@ -46,6 +46,8 @@
 // ImageProcessing Plugin
 #include "itkBridge.h"
 
+#error THIS FILE IS NOT USED
+
 /**
  * @brief This is a private implementation for the filter that handles the actual algorithm implementation details
  * for us like figuring out if we can use this private implementation with the data array that is assigned.
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
index 24b713a51b..5f3b63fbb4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
@@ -71,7 +71,7 @@ void LineCounterObject::run()
 {
   // Validate that the file is an ASCII file
   int64_t bufferSize = 262144;
-  char* buffer;
+  std::vector<char> buffer;
   int64_t result;
 
   // Obtain the file size
@@ -103,8 +103,8 @@ void LineCounterObject::run()
   }
 
   // Allocate the buffer
-  buffer = (char*)malloc(sizeof(char) * actualSize);
-  if(buffer == nullptr)
+  buffer.resize(actualSize);
+  if(buffer.data() == nullptr)
   {
     QString errorStr = "Error: Unable to allocate memory to read in data from \"" + m_FilePath + "\"";
     fputs(errorStr.toStdString().c_str(), stderr);
@@ -115,7 +115,7 @@ void LineCounterObject::run()
   while(!qFile.atEnd())
   {
     // Copy the file contents into the buffer
-    result = qFile.read(buffer, actualSize);
+    result = qFile.read(buffer.data(), actualSize);
 
     // Check the buffer for new lines and carriage returns
     int64_t fiveThresh = fileSize / 20.0;
@@ -145,7 +145,6 @@ void LineCounterObject::run()
 
   // Close the file and free the memory from the buffer
   qFile.close();
-  free(buffer);
 
   emit finished();
 }
diff --git a/Source/SimpleITKExplicit/CMake/sitkCheckCXX11.cmake b/Source/SimpleITKExplicit/CMake/sitkCheckCXX11.cmake
new file mode 100644
index 0000000000..d116d646e3
--- /dev/null
+++ b/Source/SimpleITKExplicit/CMake/sitkCheckCXX11.cmake
@@ -0,0 +1,86 @@
+#
+# CMake Module to check for TR1 and C++11 features
+#
+# SITK_HAS_CXX11_STATIC_ASSERT    - True if "static_assert" keyword is supported
+# SITK_HAS_CXX11_FUNCTIONAL       - True if functional header has C++11 features
+# SITK_HAS_CXX11_TYPE_TRAITS
+# SITK_HAS_CXX11_UNORDERED_MAP
+# SITK_HAS_CXX11_NULLPTR          - True if "nullptr" keyword is supported
+#
+# SITK_HAS_TR1_SUB_INCLUDE
+#
+# SITK_HAS_TR1_FUNCTIONAL
+# SITK_HAS_TR1_TYPE_TRAITS
+# SITK_HAS_TR1_UNORDERED_MAP
+
+#
+# Function to wrap try compiles on the aggregate cxx test file1
+#
+function(sitkCXX11Test VARIABLE)
+  # use the hash of the dependent cxx flags in the variable name to
+  # cache the results.
+  string(MD5 cmake_cxx_flags_hash "${CMAKE_CXX_FLAGS}")
+  set(cache_var "${VARIABLE}_${hash_cmake_cxx_flags_hash}")
+  if(NOT DEFINED "${cache_var}")
+    message(STATUS "Performing Test ${VARIABLE}")
+    set(requred_definitions "${CMAKE_REQUIRED_DEFINITIONS} -D${VARIABLE}")
+    try_compile(${VARIABLE}
+      ${SIMPLProj_BINARY_DIR}/CMakeTmp
+      ${SIMPLProj_SOURCE_DIR}/Source/SimpleITKExplicit/CMake/sitk_check_cxx11.cxx
+      CMAKE_FLAGS
+      -DCOMPILE_DEFINITIONS:STRING=${requred_definitions}
+      OUTPUT_VARIABLE output)
+    if(${VARIABLE})
+      set(${cache_var} 1 CACHE INTERNAL "SimpleITK test ${FUNCTION}")
+      message(STATUS "Performing Test ${VARIABLE} - Success")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+           "################################################################\nPerforming Test ${VARIABLE} SUCCEEDED with the following output:\n"
+           "${output}\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n")
+    else()
+      message(STATUS "Performing Test ${VARIABLE} - Failed")
+      set(${cache_var} 0 CACHE INTERNAL "SimpleITKTest ${FUNCTION}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+                 "################################################################\nPerforming Test ${VARIABLE} FAILED with the following output:\n"
+                 "${output}\n^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n")
+    endif()
+   endif()
+endfunction()
+
+#
+# Check for CXX11 Features
+#
+sitkCXX11Test(SITK_HAS_CXX11_STATIC_ASSERT)
+sitkCXX11Test(SITK_HAS_CXX11_FUNCTIONAL)
+sitkCXX11Test(SITK_HAS_CXX11_TYPE_TRAITS)
+sitkCXX11Test(SITK_HAS_CXX11_UNORDERED_MAP)
+sitkCXX11Test(SITK_HAS_CXX11_NULLPTR)
+
+# Microsoft Visual Studio 2008sp1,2010,2012 don't need tr1 as a path
+# prefix to tr1 headers, while libc++
+sitkCXX11Test(SITK_HAS_TR1_SUB_INCLUDE)
+
+set(CMAKE_REQUIRED_DEFINITIONS_SAVE ${CMAKE_REQUIRED_DEFINITIONS})
+if (SITK_HAS_TR1_SUB_INCLUDE)
+  list(APPEND CMAKE_REQUIRED_DEFINITIONS "-DHAS_TR1_SUB_INCLUDE")
+endif()
+
+#
+# Check for TR1 features
+#
+sitkCXX11Test(SITK_HAS_TR1_FUNCTIONAL)
+sitkCXX11Test(SITK_HAS_TR1_TYPE_TRAITS)
+sitkCXX11Test(SITK_HAS_TR1_UNORDERED_MAP)
+
+# restore varaible
+set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS_SAVE})
+
+
+if ( (NOT SITK_HAS_TR1_FUNCTIONAL AND NOT SITK_HAS_CXX11_FUNCTIONAL)
+    OR
+    (NOT SITK_HAS_TR1_TYPE_TRAITS AND NOT SITK_HAS_CXX11_TYPE_TRAITS) )
+  message( FATAL_ERROR
+    "SimpleITK requires usage of C++11 or C++ Technical Report 1 (TR1).\n"
+    "It may be available as an optional download for your compiler or difference CXX_FLAGS."
+    "Please see the FAQs for details."
+    "http://www.itk.org/Wiki/SimpleITK/FAQ#Do_I_need_to_download_an_option_package_for_TR1_support.3F\n" )
+endif ( )
diff --git a/Source/SimpleITKExplicit/CMake/sitkCheckRequiredFlags.cmake b/Source/SimpleITKExplicit/CMake/sitkCheckRequiredFlags.cmake
new file mode 100644
index 0000000000..eaeff97abd
--- /dev/null
+++ b/Source/SimpleITKExplicit/CMake/sitkCheckRequiredFlags.cmake
@@ -0,0 +1,61 @@
+#
+#
+#
+
+include(CheckCXXCompilerFlag)
+
+#
+# Search CMAKE_CXX_FLAGS for flags that should be considered required,
+# and propagated to other projects, via the
+# SimpleITK_REQUIRED_CXX_FLAGS variable.
+#
+
+string(REPLACE " " ";" cmake_cxx_flags_list "${CMAKE_CXX_FLAGS}")
+
+# list of regular expressions flags that are to be required flags for SimpleITK
+set(required_flags_regex_to_test
+  "^-std="
+  "^-stdlib="
+)
+
+foreach(f ${cmake_cxx_flags_list})
+  foreach( _r ${required_flags_regex_to_test} )
+    string(REGEX MATCH  ${_r} _HAS_FLAG ${f} )
+    if (_HAS_FLAG )
+      string(FIND "${SimpleITK_REQUIRED_CXX_FLAGS}" "${f}" required)
+      if(required LESS 0)
+        set(SimpleITK_REQUIRED_CXX_FLAGS "${SimpleITK_REQUIRED_CXX_FLAGS} ${f}")
+      endif()
+    endif()
+  endforeach()
+endforeach()
+
+#
+# Check if we need to enable C++11 with a compiler flag
+#
+
+
+string(FIND "${SimpleITK_REQUIRED_CXX_FLAGS}" "-std=c++11" required)
+if(required LESS 0)
+
+  check_cxx_compiler_flag( "-std=c++11" CXX_HAS_stdcxx11)
+  if (CXX_HAS_stdcxx11)
+
+    message(STATUS "Checking if c++11 is required...")
+    try_compile(SITK_CHECK_CXX11_REQUIRED
+      ${DREAM3DProj_BINARY_DIR}/CMakeFiles/CMakeTmp
+      ${PROJECT_CODE_DIR}/SimpleITKExplicit/CMake/sitk_check_cxx11_required.cxx
+      OUTPUT_VARIABLE OUTPUT)
+    if(${SITK_CHECK_CXX11_REQUIRED})
+      message(STATUS "Checking if c++11 is required... NO" )
+    else()
+      message(STATUS "Checking if c++11 is required... YES" )
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Checking if C++11 required try_compile failed with the following output:\n"
+        "${OUTPUT}\n")
+      set(SimpleITK_REQUIRED_CXX_FLAGS "${SimpleITK_REQUIRED_CXX_FLAGS} -std=c++11")
+    endif()
+
+  endif()
+
+endif()
diff --git a/Source/SimpleITKExplicit/CMake/sitk_check_cxx11.cxx b/Source/SimpleITKExplicit/CMake/sitk_check_cxx11.cxx
new file mode 100644
index 0000000000..861f00e1c6
--- /dev/null
+++ b/Source/SimpleITKExplicit/CMake/sitk_check_cxx11.cxx
@@ -0,0 +1,165 @@
+
+//-------------------------------------
+
+#ifdef SITK_HAS_CXX11_STATIC_ASSERT
+
+int main(void)
+{
+  static_assert( true, "this should compile with C++0x static_assert keyword support");
+  return 0;
+}
+
+#endif
+
+
+//-------------------------------------
+
+#ifdef SITK_HAS_CXX11_NULLPTR
+
+struct C {
+  void func();
+};
+
+int main(void)
+{
+  int *x = nullptr;
+  char *c = nullptr;
+  void (C::*pmf)() = nullptr;
+  if (nullptr==c) {}
+  if (nullptr==pmf) {}
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_CXX11_FUNCTIONAL
+
+#include <functional>
+
+void f(int,int) {}
+
+int main(void)
+{
+std::function<void(int,int)> g(f);
+using namespace std::placeholders;
+std::function<void(int)> h = std::bind(g,0,_1);
+return 0;
+}
+
+#endif
+
+
+//-------------------------------------
+
+#ifdef SITK_HAS_TR1_FUNCTIONAL
+
+#ifdef HAS_TR1_SUB_INCLUDE
+#include <tr1/functional>
+#else
+#include <functional>
+#endif
+
+void f(int,int) {}
+
+int main(void)
+{
+  std::tr1::function<void(int,int)> g(f);
+  using namespace std::tr1::placeholders;
+  std::tr1::function<void(int)> h = std::tr1::bind(g,0,_1);
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_CXX11_TYPE_TRAITS
+
+#include <type_traits>
+
+int main(void)
+{
+  std::integral_constant<int, 0> a;
+  std::true_type b;
+  std::false_type c;
+  std::is_same<int,int>::type d;
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_TR1_TYPE_TRAITS
+
+#ifdef HAS_TR1_SUB_INCLUDE
+#include <tr1/type_traits>
+#else
+#include <type_traits>
+#endif
+
+int main(void)
+{
+  std::tr1::integral_constant<int, 0> a;
+  std::tr1::true_type b;
+  std::tr1::false_type c;
+  std::tr1::is_same<int,int>::type d;
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_CXX11_UNORDERED_MAP
+
+#include <unordered_map>
+
+int main(void)
+{
+  // On OSX with gcc 4.0, there is an internal const correctness issue
+  // in the following.
+  std::unordered_map<int,int> s;
+  const std::unordered_map<int, int> &c_ref = s;
+  c_ref.find(1); // Problem is here.
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_TR1_UNORDERED_MAP
+
+
+#ifdef HAS_TR1_SUB_INCLUDE
+#include <tr1/unordered_map>
+#else
+#include <unordered_map>
+#endif
+
+int main(void)
+{
+  // On OSX with gcc 4.0, there is an internal const correctness issue
+  // in the following.
+  std::tr1::unordered_map<int,int> s;
+  const std::tr1::unordered_map<int, int> &c_ref = s;
+  c_ref.find(1); // Problem is here.
+  return 0;
+}
+
+#endif
+
+//-------------------------------------
+
+#ifdef SITK_HAS_TR1_SUB_INCLUDE
+
+#include <tr1/functional>
+#include <tr1/type_traits>
+#include <tr1/unordered_map>
+
+int main(void) { return 0; }
+
+#endif
diff --git a/Source/SimpleITKExplicit/CMake/sitk_check_cxx11_required.cxx b/Source/SimpleITKExplicit/CMake/sitk_check_cxx11_required.cxx
new file mode 100644
index 0000000000..7727d827e4
--- /dev/null
+++ b/Source/SimpleITKExplicit/CMake/sitk_check_cxx11_required.cxx
@@ -0,0 +1,14 @@
+#include <iostream>
+#if __cplusplus >= 201103L
+#else
+#if defined _LIBCPP_VERSION
+#error "libc++ is not supported without C++11"
+#endif
+#endif
+
+
+int main(void)
+{
+std::cout << "__cplusplus:" << __cplusplus << std::endl;
+return 0;
+}
diff --git a/Source/SimpleITKExplicit/CMakeLists.txt b/Source/SimpleITKExplicit/CMakeLists.txt
new file mode 100644
index 0000000000..892bafc6d9
--- /dev/null
+++ b/Source/SimpleITKExplicit/CMakeLists.txt
@@ -0,0 +1,92 @@
+
+
+PROJECT( SimpleITKExplicit VERSION 0.9.0)
+
+
+#-----------------------------------------------------------
+# Check and set required flags for compilation
+# This must be done before any other try compiles based tests are
+# done.
+# include(${PROJECT_SOURCE_DIR}/CMake/sitkCheckRequiredFlags.cmake)
+
+
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SimpleITKExplicit_REQUIRED_C_FLAGS}")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SimpleITKExplicit_REQUIRED_CXX_FLAGS}")
+# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${SimpleITKExplicit_REQUIRED_LINK_FLAGS}")
+# set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${SimpleITKExplicit_REQUIRED_LINK_FLAGS}")
+# set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${SimpleITKExplicit_REQUIRED_LINK_FLAGS}")
+
+# message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+# message(STATUS "CMAKE_EXE_LINKER_FLAGS: ${CMAKE_EXE_LINKER_FLAGS}")
+# message(STATUS "CMAKE_SHARED_LINKER_FLAGS: ${CMAKE_SHARED_LINKER_FLAGS}")
+# message(STATUS "CMAKE_MODULE_LINKER_FLAGS: ${CMAKE_MODULE_LINKER_FLAGS}")
+
+# include(${PROJECT_SOURCE_DIR}/CMake/sitkCheckCXX11.cmake)
+
+## YOU MUST INCLUDE THIS FILE TO USE ITK !!!
+## Then do not forget to add "${ITK_LIBRARIES}" to the target_link_libraries below
+include(${CMP_SOURCE_DIR}/ITKSupport/IncludeITK.cmake)
+#include_directories(${ITK_INCLUDE_DIRS})
+
+#----------------------------------------------------------
+# Place all options to go into sitkConfigure.h here
+set(SITK_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
+option(SITK_EXPLICIT_INSTANTIATION "Enable an ITK static library of explicitly instantiated templates." ON)
+if ( MSVC AND SITK_BUILD_SHARED_LIBS )
+  set( SITK_SimpleITKExplit_STATIC 1 )
+endif()
+
+set( SITK_INT64_PIXELIDS_DEFAULT ON )
+
+option( SITK_INT64_PIXELIDS "Instantiate 64-bit integer pixels, including unsigned, vector and label maps." ${SITK_INT64_PIXELIDS_DEFAULT} )
+# Setting this option will shorten compile times by reducing the
+# amount of pixel types and generated code.
+# NB: this option should _NOT_ be used for releases!
+option ( SITK_EXPRESS_INSTANTIATEDPIXELS "Instantiate very few pixel types ( for use for development only )" OFF )
+mark_as_advanced ( SITK_EXPRESS_INSTANTIATEDPIXELS )
+
+
+
+function(sitk_install_exported_target tgt)
+  # Remove the build tree's SimpleITKTargets file if this is the first call:
+  get_property(first_time GLOBAL PROPERTY SimpleITKExplicit_FIRST_EXPORTED_TARGET)
+  if(NOT first_time)
+    file(REMOVE ${CMAKE_BINARY_DIR}/SimpleITKTargets.cmake)
+    set_property(GLOBAL PROPERTY SimpleITKExplicit_FIRST_EXPORTED_TARGET 1)
+  endif()
+
+  set_property(TARGET ${tgt} PROPERTY VERSION 1)
+  set_property(TARGET ${tgt} PROPERTY SOVERSION 1)
+  set_property(TARGET ${tgt} PROPERTY
+    OUTPUT_NAME ${tgt}-${SimpleITKExplicit_VERSION_MAJOR}.${SimpleITKExplicit_VERSION_MINOR})
+
+  export(TARGETS ${tgt}
+    APPEND FILE "${CMAKE_BINARY_DIR}/SimpleITKTargets.cmake"
+    )
+  if(NOT MSVC)
+    install(TARGETS ${tgt}
+      EXPORT SimpleITKExplicit
+      RUNTIME DESTINATION ${SimpleITKExplicit_INSTALL_RUNTIME_DIR}
+      LIBRARY DESTINATION ${SimpleITKExplicit_INSTALL_LIBRARY_DIR}
+      ARCHIVE DESTINATION ${SimpleITKExplicit_INSTALL_ARCHIVE_DIR}
+      )
+  endif()
+endfunction()
+
+set(install_dir "bin")
+set(lib_install_dir "lib")
+if(WIN32)
+    set(install_dir ".")
+    set(lib_install_dir ".")
+endif()
+
+set(SimpleITKExplicit_INSTALL_RUNTIME_DIR "${install_dir}")
+set(SimpleITKExplicit_INSTALL_LIBRARY_DIR "${lib_install_dir}")
+set(SimpleITKExplicit_INSTALL_ARCHIVE_DIR "${lib_install_dir}")
+
+
+configure_file( "${SimpleITKExplicit_SOURCE_DIR}/Common/src/sitkConfigure.h.in"
+                "${SimpleITKExplicit_BINARY_DIR}/Common/include/sitkConfigure.h" )
+
+include( Explicit/src/CMakeLists.txt)
diff --git a/Source/SimpleITKExplicit/Common/src/sitkConfigure.h.in b/Source/SimpleITKExplicit/Common/src/sitkConfigure.h.in
new file mode 100644
index 0000000000..aceddbe496
--- /dev/null
+++ b/Source/SimpleITKExplicit/Common/src/sitkConfigure.h.in
@@ -0,0 +1,78 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 __sitkConfigure_h
+#define __sitkConfigure_h
+
+
+#cmakedefine SITK_BUILD_SHARED_LIBS
+#ifdef SITK_BUILD_SHARED_LIBS
+#define SITKDLL
+#else
+#define SITKSTATIC
+#endif
+#cmakedefine SITK_SimpleITKExplit_STATIC
+
+
+// defined if the system has C++0x "static_assert" keyword
+#cmakedefine SITK_HAS_CXX11_STATIC_ASSERT
+// defined if the compiler has C++11 "nullptr" keyword
+#cmakedefine SITK_HAS_CXX11_NULLPTR
+#cmakedefine SITK_HAS_CXX11_FUNCTIONAL
+#cmakedefine SITK_HAS_CXX11_TYPE_TRAITS
+#cmakedefine SITK_HAS_CXX11_UNORDERED_MAP
+
+#cmakedefine SITK_HAS_TR1_SUB_INCLUDE
+
+#cmakedefine SITK_HAS_TR1_FUNCTIONAL
+#cmakedefine SITK_HAS_TR1_TYPE_TRAITS
+#cmakedefine SITK_HAS_TR1_UNORDERED_MAP
+
+#cmakedefine SITK_INT64_PIXELIDS
+#cmakedefine SITK_4D_IMAGES
+
+#cmakedefine SITK_EXPLICIT_INSTANTIATION
+
+#cmakedefine SITK_EXPRESS_INSTANTIATEDPIXELS
+
+#if defined(__clang__)
+#define CLANG_TEMPLATE template
+#else
+#define CLANG_TEMPLATE
+#endif
+
+// Include ITK version reported in CMake with SITK prefix, so that
+// SimpleITK dosen't need ITK header in our headers.
+#define SITK_ITK_VERSION_MAJOR @ITK_VERSION_MAJOR@
+#define SITK_ITK_VERSION_MINOR @ITK_VERSION_MINOR@
+#define SITK_ITK_VERSION_PATCH @ITK_VERSION_PATCH@
+
+#cmakedefine SIMPL_DISABLE_MSVC_WARNINGS
+
+#if (_MSC_VER >= 1)
+
+  #pragma warning (error: 4715) /* Not all control points return a value */
+  #pragma warning (error: 4258) /* Nested Variable Definitions are ignored */
+    #ifdef SIMPL_DISABLE_MSVC_WARNINGS
+      #pragma warning(disable:4244)
+      #pragma warning(disable:4267)
+      #pragma warning(disable:4305)
+    #endif
+
+#endif
+
+#endif // __sitkConfigure_h
diff --git a/Source/SimpleITKExplicit/Explicit/CMakeLists.txt b/Source/SimpleITKExplicit/Explicit/CMakeLists.txt
new file mode 100644
index 0000000000..0b719487f6
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory( src )
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
new file mode 100644
index 0000000000..99d02cfc51
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
@@ -0,0 +1,45 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 __sitkExplicit_h
+#define __sitkExplicit_h
+
+#include "sitkMacro.h"
+#if defined( SITKDLL ) && !defined( SITK_SimpleITKExplit_STATIC )
+  #ifdef SimpleITKExplicit_EXPORTS
+    #define SITKExplicit_EXPORT SITK_ABI_EXPORT
+  #else
+    #define SITKExplicit_EXPORT SITK_ABI_IMPORT
+  #endif  /* SimpleITKExplicit_EXPORTS */
+#else
+  // Don't hide symbols in the static SimpleITKExplicit library in case
+  // -fvisibility=hidden is used
+  #define SITKExplicit_EXPORT
+#endif
+
+#define SITKExplicit_HIDDEN SITK_ABI_HIDDEN
+
+
+#if defined( SimpleITKExplicit_EXPORTS )
+// don't use export
+#define SITKExplicit_EXPORT_EXPLICIT
+#else
+// only import/hidden
+#define SITKExplicit_EXPORT_EXPLICIT SITKExplicit_EXPORT
+#endif
+
+#endif // __sitkExplicit_h
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
new file mode 100644
index 0000000000..3ef747718f
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
@@ -0,0 +1,55 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITK_h
+#define sitkExplicitITK_h
+
+#include <complex>
+
+#include "itkAttributeLabelObject.h"
+#include "itkShapeLabelObject.h"
+#include "itkVectorImage.h"
+
+#include "sitkExplicitITKImageRegion.h"
+
+
+#include "sitkExplicitITKDefaultPixelAccessor.h"
+#include "sitkExplicitITKDefaultVectorPixelAccessor.h"
+#include "sitkExplicitITKImportImageContainer.h"
+#include "sitkExplicitITKImageBase.h"
+#include "sitkExplicitITKImage.h"
+#include "sitkExplicitITKLabelMap.h"
+#include "sitkExplicitITKVectorImage.h"
+
+
+#include "sitkExplicitITKImageConstIterator.h"
+#include "sitkExplicitITKImageRegionConstIterator.h"
+#include "sitkExplicitITKImageScanlineConstIterator.h"
+#include "sitkExplicitITKImageScanlineIterator.h"
+
+#include "sitkExplicitITKImageSource.h"
+#include "sitkExplicitITKImageToImageFilter.h"
+#include "sitkExplicitITKInPlaceImageFilter.h"
+
+#include "sitkExplicitITKComposeImageFilter.h"
+#include "sitkExplicitITKVectorIndexSelectionCastImageFilter.h"
+
+
+
+
+
+#endif // sitkExplicitITK_h
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
new file mode 100644
index 0000000000..6d6142b073
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
@@ -0,0 +1,49 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKComposeImageFilter_h__
+#define sitkExplicitITKComposeImageFilter_h__
+#include "sitkExplicit.h"
+#include "itkComposeImageFilter.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 2u>, itk::VectorImage<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 3u>, itk::VectorImage<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 2u>, itk::VectorImage<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 3u>, itk::VectorImage<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKComposeImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
new file mode 100644
index 0000000000..00c70416c2
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
@@ -0,0 +1,53 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKDefaultPixelAccessor_h__
+#define sitkExplicitITKDefaultPixelAccessor_h__
+#include "sitkExplicit.h"
+#include "itkDefaultPixelAccessor.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<bool>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<double>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<float>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<short>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<signed char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<double> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<float> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned short>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKDefaultPixelAccessor_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
new file mode 100644
index 0000000000..05205fa9d5
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
@@ -0,0 +1,37 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKDefaultVectorPixelAccessor_h__
+#define sitkExplicitITKDefaultVectorPixelAccessor_h__
+#include "sitkExplicit.h"
+#include "itkDefaultVectorPixelAccessor.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<double>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<float>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<short>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<signed char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<unsigned char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<unsigned int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<unsigned long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<unsigned long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<unsigned short>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKDefaultVectorPixelAccessor_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
new file mode 100644
index 0000000000..9f17b31e76
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
@@ -0,0 +1,78 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImage_h__
+#define sitkExplicitITKImage_h__
+#include "sitkExplicit.h"
+#include "itkImage.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<bool, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<bool, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<char, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<char, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<double, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<double, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<double, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<float, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<float, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<float, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<int, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<int, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::CovariantVector<double, 2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::CovariantVector<double, 3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::CovariantVector<float, 2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::CovariantVector<float, 3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::FixedArray<float, 2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::FixedArray<float, 3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Offset<2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Offset<3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<double, 1u>, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<double, 2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<double, 3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<float, 1u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<float, 2u>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<itk::Vector<float, 3u>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long long, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<long long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<short, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<short, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<signed char, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<signed char, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<double>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<double>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<float>, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<float>, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > >, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > >, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned int, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned int, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned long long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned long long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned short, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned short, 3u>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImage_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
new file mode 100644
index 0000000000..7c97da93b1
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
@@ -0,0 +1,28 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageBase_h__
+#define sitkExplicitITKImageBase_h__
+#include "sitkExplicit.h"
+#include "itkImageBase.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageBase<1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageBase<2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageBase<3u>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageBase_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
new file mode 100644
index 0000000000..2a7f97296b
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
@@ -0,0 +1,87 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageConstIterator_h__
+#define sitkExplicitITKImageConstIterator_h__
+#include "sitkExplicit.h"
+#include "itkImageConstIterator.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<double, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<double, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<float, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<float, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<signed char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<signed char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageConstIterator_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
new file mode 100644
index 0000000000..8681381a3d
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
@@ -0,0 +1,28 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageRegion_h__
+#define sitkExplicitITKImageRegion_h__
+#include "sitkExplicit.h"
+#include "itkImageRegion.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegion<1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegion<2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegion<3u>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageRegion_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
new file mode 100644
index 0000000000..f62540f303
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
@@ -0,0 +1,85 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageRegionConstIterator_h__
+#define sitkExplicitITKImageRegionConstIterator_h__
+#include "sitkExplicit.h"
+#include "itkImageRegionConstIterator.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<double, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<double, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<float, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<float, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<signed char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<signed char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageRegionConstIterator_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
new file mode 100644
index 0000000000..867ea7a706
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
@@ -0,0 +1,82 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageScanlineConstIterator_h__
+#define sitkExplicitITKImageScanlineConstIterator_h__
+#include "sitkExplicit.h"
+#include "itkImageScanlineConstIterator.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<double, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<double, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<float, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<float, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<signed char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<signed char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageScanlineConstIterator_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
new file mode 100644
index 0000000000..ed703ebc51
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
@@ -0,0 +1,80 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageScanlineIterator_h__
+#define sitkExplicitITKImageScanlineIterator_h__
+#include "sitkExplicit.h"
+#include "itkImageScanlineIterator.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<double, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<double, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<float, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<float, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<short, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<signed char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<signed char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned char, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned char, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned int, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned int, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned long, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned long, 3u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned short, 2u> >;
+// extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageScanlineIterator_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
new file mode 100644
index 0000000000..f17fa58e72
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
@@ -0,0 +1,106 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageSource_h__
+#define sitkExplicitITKImageSource_h__
+#include "sitkExplicit.h"
+#include "itkImageSource.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 1u>, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageSource_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
new file mode 100644
index 0000000000..c0b2b182d0
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
@@ -0,0 +1,645 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImageToImageFilter_h__
+#define sitkExplicitITKImageToImageFilter_h__
+#include "sitkExplicit.h"
+#include "itkImageToImageFilter.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 2u>, itk::Image<bool, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 3u>, itk::Image<bool, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 2u>, 2u>, itk::Image<itk::Vector<float, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 3u>, 3u>, itk::Image<itk::Vector<float, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImageToImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
new file mode 100644
index 0000000000..0736708d1a
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
@@ -0,0 +1,57 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKImportImageContainer_h__
+#define sitkExplicitITKImportImageContainer_h__
+#include "sitkExplicit.h"
+#include "itkImportImageContainer.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, bool>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, double>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, float>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, short>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, signed char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<double> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<float> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned char>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned int>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned long long>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned short>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKImportImageContainer_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
new file mode 100644
index 0000000000..b1b03d97b3
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
@@ -0,0 +1,319 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKInPlaceImageFilter_h__
+#define sitkExplicitITKInPlaceImageFilter_h__
+#include "sitkExplicit.h"
+#include "itkInPlaceImageFilter.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKInPlaceImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
new file mode 100644
index 0000000000..297dbe4c7b
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
@@ -0,0 +1,43 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKLabelMap_h__
+#define sitkExplicitITKLabelMap_h__
+#include "sitkExplicit.h"
+#include "itkLabelMap.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKLabelMap_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
new file mode 100644
index 0000000000..28676580cf
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
@@ -0,0 +1,49 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKVectorImage_h__
+#define sitkExplicitITKVectorImage_h__
+#include "sitkExplicit.h"
+#include "itkVectorImage.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<double, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<double, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<float, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<float, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<int, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<int, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<long long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<long long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<short, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<short, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<signed char, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<signed char, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned char, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned char, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned int, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned int, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned long long, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned long long, 3u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned short, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<unsigned short, 3u>;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKVectorImage_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
new file mode 100644
index 0000000000..a7ed049760
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
@@ -0,0 +1,49 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
+#define sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
+#include "sitkExplicit.h"
+#include "itkVectorIndexSelectionCastImageFilter.h"
+
+#ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 2u>, itk::Image<long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 3u>, itk::Image<long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 2u>, itk::Image<unsigned long long, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 3u>, itk::Image<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+#endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#endif // sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
new file mode 100644
index 0000000000..c1f57bef15
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
@@ -0,0 +1,95 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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 __sitkMacro_h
+#define __sitkMacro_h
+
+#include <stdint.h>
+#include <stddef.h>
+#include <cassert>
+#include <sstream>
+#include <limits>
+
+#include "sitkConfigure.h"
+
+
+// Setup symbol exports
+//
+#if defined _WIN32 || defined __CYGWIN__
+   #ifdef __GNUC__
+    #define SITK_ABI_EXPORT __attribute__ ((dllexport))
+    #define SITK_ABI_IMPORT __attribute__ ((dllimport))
+    #define SITK_ABI_HIDDEN
+  #else
+    #define SITK_ABI_EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.
+    #define SITK_ABI_IMPORT __declspec(dllimport) // Note: actually gcc seems to also supports this syntax.
+    #define SITK_ABI_HIDDEN
+  #endif
+#else
+  #if __GNUC__ >= 4
+    #define SITK_ABI_EXPORT __attribute__ ((visibility ("default")))
+    #define SITK_ABI_IMPORT __attribute__ ((visibility ("default")))
+    #define SITK_ABI_HIDDEN  __attribute__ ((visibility ("hidden")))
+  #else
+    #define SITK_ABI_EXPORT
+    #define SITK_ABI_IMPORT
+    #define SITK_ABI_HIDDEN
+  #endif
+#endif
+
+namespace itk {
+
+namespace simple {
+
+class GenericException;
+
+#define sitkExceptionMacro(x)                                           \
+  {                                                                     \
+    std::ostringstream message;                                         \
+    message << "sitk::ERROR: " x;                                       \
+    throw ::itk::simple::GenericException(__FILE__, __LINE__, message.str().c_str()); \
+  }
+
+#if defined(SITK_HAS_CXX11_NULLPTR) && !defined(SITK_HAS_TR1_SUB_INCLUDE)
+#define SITK_NULLPTR nullptr
+#else
+#define SITK_NULLPTR nullptr
+#endif
+
+
+#ifdef SITK_HAS_CXX11_STATIC_ASSERT
+// utilize the c++11 static_assert if available
+#define sitkStaticAssert( expr, str) static_assert( expr, str )
+#else
+
+template<bool> struct StaticAssertFailure;
+template<> struct StaticAssertFailure<true>{ enum { Value = 1 }; };
+
+#define BOOST_JOIN( X, Y ) BOOST_DO_JOIN( X, Y )
+#define BOOST_DO_JOIN( X, Y ) BOOST_DO_JOIN2(X,Y)
+#define BOOST_DO_JOIN2( X, Y ) X##Y
+
+#define sitkStaticAssert( expr, str ) enum { BOOST_JOIN( static_assert_typedef, __LINE__) = sizeof( itk::simple::StaticAssertFailure<((expr) == 0 ? false : true )> ) };
+
+
+#endif
+
+
+}
+}
+
+#endif
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h b/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
new file mode 100644
index 0000000000..5cf6f649e2
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
@@ -0,0 +1,23 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+
+#define SimpleITK_VERSION_MAJOR 0
+#define SimpleITK_VERSION_MINOR 9
+#define SimpleITK_VERSION_PATCH 0
+#define SimpleITK_VERSION_TWEAK 
+#define SimpleITK_VERSION "0.9.0-g45317"
diff --git a/Source/SimpleITKExplicit/Explicit/src/CMakeLists.txt b/Source/SimpleITKExplicit/Explicit/src/CMakeLists.txt
new file mode 100644
index 0000000000..c9120c30a7
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/CMakeLists.txt
@@ -0,0 +1,60 @@
+set ( SimpleITKExplicitSource
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKComposeImageFilter.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKDefaultPixelAccessor.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKDefaultVectorPixelAccessor.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageBase.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImage.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageRegion.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageSource.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageToImageFilter.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImportImageContainer.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKInPlaceImageFilter.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKLabelMap.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKVectorImage.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKVectorIndexSelectionCastImageFilter.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageConstIterator.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageRegionConstIterator.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageScanlineConstIterator.cxx
+  ${SimpleITKExplicit_SOURCE_DIR}/Explicit/src/sitkExplicitITKImageScanlineIterator.cxx
+
+  )
+
+
+# these files are the instantiated ITK filter, but they do not do IO,
+# so we don't need to register the IO factoried here.
+set ( ITK_NO_IO_FACTORY_REGISTER_MANAGER 1 )
+include(${ITK_USE_FILE})
+
+if ( MSVC AND SITK_BUILD_SHARED_LIBS )
+  set( SimpleITKExplicit_FORCE_LIBRARY_TYPE "STATIC" )
+endif()
+
+add_library ( SimpleITKExplicit ${SimpleITKExplicit_FORCE_LIBRARY_TYPE} ${SimpleITKExplicitSource} )
+target_link_libraries ( SimpleITKExplicit 
+  ITKCommon  
+  # ${ITK_LIBRARIES} 
+  )
+#set_target_properties( SimpleITKExplicit PROPERTIES SKIP_BUILD_RPATH TRUE )
+sitk_install_exported_target( SimpleITKExplicit )
+
+LibraryProperties( SimpleITKExplicit  ${EXE_DEBUG_EXTENSION} )
+
+
+if(SIMPL_DISABLE_MSVC_WARNINGS)
+  target_compile_definitions(SimpleITKExplicit PRIVATE -D_SCL_SECURE_NO_WARNINGS)
+endif()
+target_include_directories(SimpleITKExplicit 
+                            PUBLIC
+                              ${SimpleITKExplicit_SOURCE_DIR}/Explicit/include
+                              ${SimpleITKExplicit_BINARY_DIR}/Common/include
+                          )
+
+if(NOT MSVC)
+    INSTALL(TARGETS SimpleITKExplicit
+        COMPONENT Applications
+        RUNTIME DESTINATION ${install_dir}
+        LIBRARY DESTINATION ${lib_install_dir}
+        ARCHIVE DESTINATION ${lib_install_dir}
+        BUNDLE DESTINATION "."
+    )
+endif()
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKComposeImageFilter.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKComposeImageFilter.cxx
new file mode 100644
index 0000000000..7ec917f56d
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKComposeImageFilter.cxx
@@ -0,0 +1,46 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKComposeImageFilter.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<long long, 2u>, itk::VectorImage<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<long long, 3u>, itk::VectorImage<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned long long, 2u>, itk::VectorImage<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned long long, 3u>, itk::VectorImage<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ComposeImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultPixelAccessor.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultPixelAccessor.cxx
new file mode 100644
index 0000000000..d525306ab8
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultPixelAccessor.cxx
@@ -0,0 +1,50 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKDefaultPixelAccessor.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<bool>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<char>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<double>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<float>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<int>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::CovariantVector<double, 2u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::CovariantVector<double, 3u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::CovariantVector<float, 2u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::CovariantVector<float, 3u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Offset<2u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Offset<3u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<double, 1u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<double, 2u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<double, 3u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<float, 1u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<float, 2u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<itk::Vector<float, 3u> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<long>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<long long>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<short>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<signed char>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<std::complex<double> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<std::complex<float> >;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<unsigned char>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<unsigned int>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<unsigned long>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<unsigned long long>;
+template class SITKExplicit_EXPORT itk::DefaultPixelAccessor<unsigned short>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultVectorPixelAccessor.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultVectorPixelAccessor.cxx
new file mode 100644
index 0000000000..992a6b2075
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKDefaultVectorPixelAccessor.cxx
@@ -0,0 +1,34 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKDefaultVectorPixelAccessor.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<double>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<float>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<int>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<long>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<long long>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<short>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<signed char>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<unsigned char>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<unsigned int>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<unsigned long>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<unsigned long long>;
+template class SITKExplicit_EXPORT itk::DefaultVectorPixelAccessor<unsigned short>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImage.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImage.cxx
new file mode 100644
index 0000000000..3525ab9f7c
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImage.cxx
@@ -0,0 +1,75 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImage.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::Image<bool, 2u>;
+template class SITKExplicit_EXPORT itk::Image<bool, 3u>;
+template class SITKExplicit_EXPORT itk::Image<char, 2u>;
+template class SITKExplicit_EXPORT itk::Image<char, 3u>;
+template class SITKExplicit_EXPORT itk::Image<double, 1u>;
+template class SITKExplicit_EXPORT itk::Image<double, 2u>;
+template class SITKExplicit_EXPORT itk::Image<double, 3u>;
+template class SITKExplicit_EXPORT itk::Image<float, 1u>;
+template class SITKExplicit_EXPORT itk::Image<float, 2u>;
+template class SITKExplicit_EXPORT itk::Image<float, 3u>;
+template class SITKExplicit_EXPORT itk::Image<int, 2u>;
+template class SITKExplicit_EXPORT itk::Image<int, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::CovariantVector<double, 2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::CovariantVector<double, 3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::CovariantVector<float, 2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::CovariantVector<float, 3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::FixedArray<float, 2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::FixedArray<float, 3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Offset<2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Offset<3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<double, 1u>, 1u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<double, 2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<double, 3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<float, 1u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<float, 2u>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<itk::Vector<float, 3u>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<long, 1u>;
+template class SITKExplicit_EXPORT itk::Image<long, 2u>;
+template class SITKExplicit_EXPORT itk::Image<long, 3u>;
+template class SITKExplicit_EXPORT itk::Image<long long, 1u>;
+template class SITKExplicit_EXPORT itk::Image<long long, 2u>;
+template class SITKExplicit_EXPORT itk::Image<long long, 3u>;
+template class SITKExplicit_EXPORT itk::Image<short, 2u>;
+template class SITKExplicit_EXPORT itk::Image<short, 3u>;
+template class SITKExplicit_EXPORT itk::Image<signed char, 2u>;
+template class SITKExplicit_EXPORT itk::Image<signed char, 3u>;
+template class SITKExplicit_EXPORT itk::Image<std::complex<double>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<std::complex<double>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<std::complex<float>, 2u>;
+template class SITKExplicit_EXPORT itk::Image<std::complex<float>, 3u>;
+template class SITKExplicit_EXPORT itk::Image<std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > >, 1u>;
+template class SITKExplicit_EXPORT itk::Image<std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > >, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned char, 1u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned char, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned char, 3u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned int, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned int, 3u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned long, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned long, 3u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned long long, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned long long, 3u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned short, 2u>;
+template class SITKExplicit_EXPORT itk::Image<unsigned short, 3u>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageBase.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageBase.cxx
new file mode 100644
index 0000000000..62d68c057e
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageBase.cxx
@@ -0,0 +1,25 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageBase.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageBase<1u>;
+template class SITKExplicit_EXPORT itk::ImageBase<2u>;
+template class SITKExplicit_EXPORT itk::ImageBase<3u>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageConstIterator.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageConstIterator.cxx
new file mode 100644
index 0000000000..0f946eee1c
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageConstIterator.cxx
@@ -0,0 +1,84 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageConstIterator.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<bool, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<bool, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<float, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::Image<unsigned short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<double, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<double, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<float, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<float, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<signed char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<signed char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageConstIterator<itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegion.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegion.cxx
new file mode 100644
index 0000000000..3981f642c0
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegion.cxx
@@ -0,0 +1,25 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageRegion.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageRegion<1u>;
+template class SITKExplicit_EXPORT itk::ImageRegion<2u>;
+template class SITKExplicit_EXPORT itk::ImageRegion<3u>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegionConstIterator.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegionConstIterator.cxx
new file mode 100644
index 0000000000..8dcd11702a
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageRegionConstIterator.cxx
@@ -0,0 +1,63 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageRegionConstIterator.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<bool, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<bool, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<float, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::Image<unsigned short, 3u> >;
+//template class SITKExplicit_EXPORT itk::ImageRegionConstIterator<itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineConstIterator.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineConstIterator.cxx
new file mode 100644
index 0000000000..b2c561c3ed
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineConstIterator.cxx
@@ -0,0 +1,79 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageScanlineConstIterator.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<double, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<double, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<float, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<float, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<signed char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<signed char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineConstIterator<itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineIterator.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineIterator.cxx
new file mode 100644
index 0000000000..75f4c1441a
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageScanlineIterator.cxx
@@ -0,0 +1,77 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageScanlineIterator.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::Image<unsigned short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<double, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<double, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<float, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<float, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<short, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<signed char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<signed char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned char, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned char, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned int, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned int, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned long, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned long, 3u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned short, 2u> >;
+// template class SITKExplicit_EXPORT itk::ImageScanlineIterator<itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageSource.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageSource.cxx
new file mode 100644
index 0000000000..2565031863
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageSource.cxx
@@ -0,0 +1,103 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageSource.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<bool, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<bool, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<double, 1u>, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<itk::Vector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageSource<itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageToImageFilter.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageToImageFilter.cxx
new file mode 100644
index 0000000000..c35b3dc563
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImageToImageFilter.cxx
@@ -0,0 +1,642 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImageToImageFilter.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<bool, 2u>, itk::Image<bool, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<bool, 3u>, itk::Image<bool, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 2u>, 2u>, itk::Image<itk::Vector<float, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 3u>, 3u>, itk::Image<itk::Vector<float, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImportImageContainer.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImportImageContainer.cxx
new file mode 100644
index 0000000000..a90b6708ef
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKImportImageContainer.cxx
@@ -0,0 +1,54 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKImportImageContainer.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, bool>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, char>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, double>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, float>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, int>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 1u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 1u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 2u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 3u> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, long>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, long long>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, short>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, signed char>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, std::complex<double> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, std::complex<float> >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > > >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > > >;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, unsigned char>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, unsigned int>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, unsigned long>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, unsigned long long>;
+template class SITKExplicit_EXPORT itk::ImportImageContainer<itk::SizeValueType, unsigned short>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKInPlaceImageFilter.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKInPlaceImageFilter.cxx
new file mode 100644
index 0000000000..8ec056ec09
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKInPlaceImageFilter.cxx
@@ -0,0 +1,316 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKInPlaceImageFilter.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
+template class SITKExplicit_EXPORT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKLabelMap.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKLabelMap.cxx
new file mode 100644
index 0000000000..36a2b1e9e3
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKLabelMap.cxx
@@ -0,0 +1,40 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKLabelMap.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::LabelObject<unsigned short, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorImage.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorImage.cxx
new file mode 100644
index 0000000000..88b6920dd6
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorImage.cxx
@@ -0,0 +1,46 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKVectorImage.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::VectorImage<double, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<double, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<float, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<float, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<int, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<int, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<long, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<long, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<long long, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<long long, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<short, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<short, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<signed char, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<signed char, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned char, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned char, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned int, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned int, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned long, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned long, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned long long, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned long long, 3u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned short, 2u>;
+template class SITKExplicit_EXPORT itk::VectorImage<unsigned short, 3u>;
diff --git a/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorIndexSelectionCastImageFilter.cxx b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorIndexSelectionCastImageFilter.cxx
new file mode 100644
index 0000000000..c5fa412a54
--- /dev/null
+++ b/Source/SimpleITKExplicit/Explicit/src/sitkExplicitITKVectorIndexSelectionCastImageFilter.cxx
@@ -0,0 +1,46 @@
+/*=========================================================================
+*
+*  Copyright Insight Software Consortium
+*
+*  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.
+*
+*=========================================================================*/
+#define  SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITKVectorIndexSelectionCastImageFilter.h"
+#undef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
+#include "sitkExplicitITK.h"
+
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 2u>, itk::Image<long long, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 3u>, itk::Image<long long, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 2u>, itk::Image<unsigned long long, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 3u>, itk::Image<unsigned long long, 3u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
+template class SITKExplicit_EXPORT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;

From b0dff13121e9459cd91757dcbdfd4e5beae929c3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 11 Sep 2019 08:24:36 -0400
Subject: [PATCH 151/397] Fix compiler error due to missing macro definition

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h | 3 ++-
 Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index a1cd9f7084..51b92ed095 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -7,6 +7,7 @@
 #include <itkNumericTraitsVectorPixel.h>
 
 #include "SIMPLib/ITK/itkImportDream3DImageContainer.h"
+#include "SIMPLib/ITK/itkSupportConstants.h"
 
 class DataContainer;
 using DataContainerShPtr = std::shared_ptr<DataContainer>;
@@ -28,7 +29,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType,
   using ValueType = typename itk::NumericTraits<PixelType>::ValueType;
   using DataArrayPixelType = typename ::DataArray<ValueType>;
   using Superclass = typename itk::ImageSource<ImageType>;
-  using SizeValueType = typename itk::SizeValueType;
+  //using SizeValueType = typename itk::SizeValueType;
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index ee4dd307c8..34127027af 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -10,6 +10,7 @@
 
 #include "SIMPLib/ITK/itkGetComponentsDimensions.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/ITK/itkSupportConstants.h"
 
 
 

From ec4ccce74d621e549d83515dd19cfd72aa3c5892 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 13 Sep 2019 08:45:40 -0400
Subject: [PATCH 152/397] Enable Double Precision computations in some base
 classes. (#376)

* Updates to codes to expose double precision versions where needed
* MatrixMath is now mostly templated to work on any POD.
* Fix return type in MatrixMath and remove spurious newline in ImportHDF5Dataset
* More Fixes and Updates to Quaternion related classes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp          |   1 -
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |   2 +-
 Source/SIMPLib/Math/ArrayHelpers.hpp          |  17 +-
 Source/SIMPLib/Math/GeometryMath.cpp          |  13 +-
 Source/SIMPLib/Math/GeometryMath.h            |   1 +
 Source/SIMPLib/Math/MatrixMath.cpp            | 461 +---------------
 Source/SIMPLib/Math/MatrixMath.h              | 442 ++++++++++++---
 Source/SIMPLib/Math/QuaternionMath.hpp        | 522 ------------------
 Source/SIMPLib/Math/SIMPLibMath.cpp           |  36 --
 Source/SIMPLib/Math/SIMPLibMath.h             |  23 +-
 Source/SIMPLib/Math/SourceList.cmake          |   1 -
 .../Math/Testing/Cxx/QuaternionMathTest.cpp   |   5 +-
 .../SIMPLib/Math/Testing/Cxx/SourceList.cmake |   1 -
 13 files changed, 412 insertions(+), 1113 deletions(-)
 delete mode 100755 Source/SIMPLib/Math/QuaternionMath.hpp

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 54dfd75f8b..485b967724 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -730,7 +730,6 @@ using FloatVec3Type = IVec3<float>;
 using IntVec3Type = IVec3<int>;
 using SizeVec3Type = IVec3<size_t>;
 
-using QuaternionType = IVec4<float>;
 using FloatVec4Type = IVec4<float>;
 using IntVec4Type = IVec4<int>;
 using SizeVec4Type = IVec4<size_t>;
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 41c6b33b85..2f6fd1564c 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -250,7 +250,7 @@ void ImportHDF5Dataset::dataCheck()
       }
     }
     stream << "\n";
-    stream << tr("    Total HDF5 Dataset Element Count: \n") << hdf5TotalElements << "\n";
+    stream << tr("    Total HDF5 Dataset Element Count: ") << hdf5TotalElements << "\n";
     stream << "-------------------------------------------\n";
     stream << "Current Data Structure Information: \n";
 
diff --git a/Source/SIMPLib/Math/ArrayHelpers.hpp b/Source/SIMPLib/Math/ArrayHelpers.hpp
index 6d9b5ecd0b..3e7de91f36 100755
--- a/Source/SIMPLib/Math/ArrayHelpers.hpp
+++ b/Source/SIMPLib/Math/ArrayHelpers.hpp
@@ -18,18 +18,17 @@
 template<typename T, typename K>
 class ArrayHelpers
 {
-  public:
+public:
+  virtual ~ArrayHelpers() = default;
 
-    virtual ~ArrayHelpers(){}
-
-    static void splat(T& a, const K val)
+  static void splat(T& a, const K val)
+  {
+    size_t size = a.size();
+    for(size_t i = 0; i < size; i++)
     {
-      size_t size = a.size();
-      for(size_t i = 0; i < size; i++)
-      {
-        a[i] = val;
-      }
+      a[i] = val;
     }
+  }
 
     static T multiply(const T& a, const T& b)
     {
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 98f9058c16..a937f7e5ef 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -67,7 +67,16 @@ float GeometryMath::CosThetaBetweenVectors(const float a[3], const float b[3])
   }
   return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]) / (norm1 * norm2);
 }
-
+double GeometryMath::CosThetaBetweenVectors(const double a[3], const double b[3])
+{
+  double norm1 = sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]);
+  double norm2 = sqrt(b[0] * b[0] + b[1] * b[1] + b[2] * b[2]);
+  if(norm1 == 0 || norm2 == 0)
+  {
+    return 1.0;
+  }
+  return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]) / (norm1 * norm2);
+}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -76,7 +85,7 @@ float GeometryMath::AngleBetweenVectors(const float a[3], const float b[3])
   float norm1 = sqrt(a[0] * a[0] + a[1] * a[1] + a[2] * a[2]);
   float norm2 = sqrt(b[0] * b[0] + b[1] * b[1] + b[2] * b[2]);
   float cosAng = (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]) / (norm1 * norm2);
-  SIMPLibMath::boundF(cosAng, -1, 1);
+  SIMPLibMath::bound(cosAng, -1.0f, 1.0f);
   return acos(cosAng);
 }
 
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 343dde836c..28f6546a9e 100755
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -68,6 +68,7 @@ class SIMPLib_EXPORT GeometryMath
      * @return
      */
     static float CosThetaBetweenVectors(const float a[3], const float b[3]);
+    static double CosThetaBetweenVectors(const double a[3], const double b[3]);
 
     /**
      * @brief Computes the angle in RADIANS between 2 vectors.
diff --git a/Source/SIMPLib/Math/MatrixMath.cpp b/Source/SIMPLib/Math/MatrixMath.cpp
index f463276d5e..5f979c9d8e 100644
--- a/Source/SIMPLib/Math/MatrixMath.cpp
+++ b/Source/SIMPLib/Math/MatrixMath.cpp
@@ -50,468 +50,9 @@ MatrixMath::~MatrixMath() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MatrixMath::CrossProduct(double a[3], double b[3], double c[3])
-{
-  c[0] = a[1] * b[2] - a[2] * b[1];
-  c[1] = a[2] * b[0] - a[0] * b[2];
-  c[2] = a[0] * b[1] - a[1] * b[0];
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::CrossProduct(float a[3], float b[3], float c[3])
-{
-  c[0] = a[1] * b[2] - a[2] * b[1];
-  c[1] = a[2] * b[0] - a[0] * b[2];
-  c[2] = a[0] * b[1] - a[1] * b[0];
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Normalize3x1(double& i, double& j, double& k)
-{
-  double denom;
-  denom = sqrt(((i * i) + (j * j) + (k * k)));
-  if(denom == 0)
-  {
-    return;
-  }
-  i = i / denom;
-  j = j / denom;
-  k = k / denom;
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Normalize3x1(float& i, float& j, float& k)
-{
-  float denom;
-  denom = sqrtf(((i * i) + (j * j) + (k * k)));
-  if(denom == 0)
-  {
-    return;
-  }
-  i = i / denom;
-  j = j / denom;
-  k = k / denom;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Multiply3x3with3x3(float g1[3][3], float g2[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g1[0][0] * g2[0][0] + g1[0][1] * g2[1][0] + g1[0][2] * g2[2][0];
-  outMat[0][1] = g1[0][0] * g2[0][1] + g1[0][1] * g2[1][1] + g1[0][2] * g2[2][1];
-  outMat[0][2] = g1[0][0] * g2[0][2] + g1[0][1] * g2[1][2] + g1[0][2] * g2[2][2];
-  outMat[1][0] = g1[1][0] * g2[0][0] + g1[1][1] * g2[1][0] + g1[1][2] * g2[2][0];
-  outMat[1][1] = g1[1][0] * g2[0][1] + g1[1][1] * g2[1][1] + g1[1][2] * g2[2][1];
-  outMat[1][2] = g1[1][0] * g2[0][2] + g1[1][1] * g2[1][2] + g1[1][2] * g2[2][2];
-  outMat[2][0] = g1[2][0] * g2[0][0] + g1[2][1] * g2[1][0] + g1[2][2] * g2[2][0];
-  outMat[2][1] = g1[2][0] * g2[0][1] + g1[2][1] * g2[1][1] + g1[2][2] * g2[2][1];
-  outMat[2][2] = g1[2][0] * g2[0][2] + g1[2][1] * g2[1][2] + g1[2][2] * g2[2][2];
-}
-
-void MatrixMath::Multiply3x3with3x1(const float g1[3][3], float g2[3], float outMat[3])
+void MatrixMath::Multiply3x3with3x1(const double g1[3][3], const double g2[3], float outMat[3])
 {
   outMat[0] = g1[0][0] * g2[0] + g1[0][1] * g2[1] + g1[0][2] * g2[2];
   outMat[1] = g1[1][0] * g2[0] + g1[1][1] * g2[1] + g1[1][2] * g2[2];
   outMat[2] = g1[2][0] * g2[0] + g1[2][1] * g2[1] + g1[2][2] * g2[2];
 }
-
-void MatrixMath::Multiply3x3with3x1(double g1[3][3], double g2[3], double outMat[3])
-{
-  outMat[0] = g1[0][0] * g2[0] + g1[0][1] * g2[1] + g1[0][2] * g2[2];
-  outMat[1] = g1[1][0] * g2[0] + g1[1][1] * g2[1] + g1[1][2] * g2[2];
-  outMat[2] = g1[2][0] * g2[0] + g1[2][1] * g2[1] + g1[2][2] * g2[2];
-}
-
-void MatrixMath::Add3x1s(const float g1[3], float g2[3], float outMat[3])
-{
-  outMat[0] = g1[0] + g2[0];
-  outMat[1] = g1[1] + g2[1];
-  outMat[2] = g1[2] + g2[2];
-}
-
-void MatrixMath::Subtract3x1s(const float g1[3], float g2[3], float outMat[3])
-{
-  outMat[0] = g1[0] - g2[0];
-  outMat[1] = g1[1] - g2[1];
-  outMat[2] = g1[2] - g2[2];
-}
-
-void MatrixMath::Add3x3s(const float g1[3][3], float g2[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g1[0][0] + g2[0][0];
-  outMat[0][1] = g1[0][1] + g2[0][1];
-  outMat[0][2] = g1[0][2] + g2[0][2];
-  outMat[1][0] = g1[1][0] + g2[1][0];
-  outMat[1][1] = g1[1][1] + g2[1][1];
-  outMat[1][2] = g1[1][2] + g2[1][2];
-  outMat[2][0] = g1[2][0] + g2[2][0];
-  outMat[2][1] = g1[2][1] + g2[2][1];
-  outMat[2][2] = g1[2][2] + g2[2][2];
-}
-
-void MatrixMath::Subtract3x3s(const float g1[3][3], float g2[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g1[0][0] - g2[0][0];
-  outMat[0][1] = g1[0][1] - g2[0][1];
-  outMat[0][2] = g1[0][2] - g2[0][2];
-  outMat[1][0] = g1[1][0] - g2[1][0];
-  outMat[1][1] = g1[1][1] - g2[1][1];
-  outMat[1][2] = g1[1][2] - g2[1][2];
-  outMat[2][0] = g1[2][0] - g2[2][0];
-  outMat[2][1] = g1[2][1] - g2[2][1];
-  outMat[2][2] = g1[2][2] - g2[2][2];
-}
-
-void MatrixMath::Multiply3x1withConstant(float g[3], float constant)
-{
-  g[0] *= constant;
-  g[1] *= constant;
-  g[2] *= constant;
-}
-
-void MatrixMath::Multiply3x3withConstant(float g[3][3], float constant)
-{
-  g[0][0] *= constant;
-  g[0][1] *= constant;
-  g[0][2] *= constant;
-  g[1][0] *= constant;
-  g[1][1] *= constant;
-  g[1][2] *= constant;
-  g[2][0] *= constant;
-  g[2][1] *= constant;
-  g[2][2] *= constant;
-}
-
-void MatrixMath::Invert3x3(float g[3][3], float outMat[3][3])
-{
-  Adjoint3x3(g, outMat);
-  float determinant = Determinant3x3(g);
-  float oneOverDeterminant = 1.0 / determinant;
-  Multiply3x3withConstant(outMat, oneOverDeterminant);
-}
-
-void MatrixMath::Adjoint3x3(float g[3][3], float outMat[3][3])
-{
-  float temp[3][3];
-  Cofactor3x3(g, temp);
-  Transpose3x3(temp, outMat);
-}
-
-void MatrixMath::Cofactor3x3(float g[3][3], float outMat[3][3])
-{
-  float temp[3][3];
-  Minors3x3(g, temp);
-  // Row 0
-  outMat[0][0] = temp[0][0];
-  outMat[0][1] = -temp[0][1];
-  outMat[0][2] = temp[0][2];
-  // Row 1
-  outMat[1][0] = -temp[1][0];
-  outMat[1][1] = temp[1][1];
-  outMat[1][2] = -temp[1][2];
-  // Row 2
-  outMat[2][0] = temp[2][0];
-  outMat[2][1] = -temp[2][1];
-  outMat[2][2] = temp[2][2];
-}
-
-void MatrixMath::Minors3x3(float g[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g[1][1] * g[2][2] - g[2][1] * g[1][2];
-  outMat[0][1] = g[1][0] * g[2][2] - g[2][0] * g[1][2];
-  outMat[0][2] = g[1][0] * g[2][1] - g[2][0] * g[1][1];
-  outMat[1][0] = g[0][1] * g[2][2] - g[2][1] * g[0][2];
-  outMat[1][1] = g[0][0] * g[2][2] - g[2][0] * g[0][2];
-  outMat[1][2] = g[0][0] * g[2][1] - g[2][0] * g[0][1];
-  outMat[2][0] = g[0][1] * g[1][2] - g[1][1] * g[0][2];
-  outMat[2][1] = g[0][0] * g[1][2] - g[1][0] * g[0][2];
-  outMat[2][2] = g[0][0] * g[1][1] - g[1][0] * g[0][1];
-}
-
-float MatrixMath::Determinant3x3(float g[3][3])
-{
-  return (g[0][0] * (g[1][1] * g[2][2] - g[1][2] * g[2][1])) - (g[0][1] * (g[1][0] * g[2][2] - g[1][2] * g[2][0])) + (g[0][2] * (g[1][0] * g[2][1] - g[1][1] * g[2][0]));
-}
-
-void MatrixMath::Transpose3x3(float g[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g[0][0];
-  outMat[0][1] = g[1][0];
-  outMat[0][2] = g[2][0];
-  outMat[1][0] = g[0][1];
-  outMat[1][1] = g[1][1];
-  outMat[1][2] = g[2][1];
-  outMat[2][0] = g[0][2];
-  outMat[2][1] = g[1][2];
-  outMat[2][2] = g[2][2];
-}
-
-void MatrixMath::Copy3x3(float g[3][3], float outMat[3][3])
-{
-  outMat[0][0] = g[0][0];
-  outMat[0][1] = g[0][1];
-  outMat[0][2] = g[0][2];
-  outMat[1][0] = g[1][0];
-  outMat[1][1] = g[1][1];
-  outMat[1][2] = g[1][2];
-  outMat[2][0] = g[2][0];
-  outMat[2][1] = g[2][1];
-  outMat[2][2] = g[2][2];
-}
-
-void MatrixMath::Copy3x1(float g[3], float outMat[3])
-{
-  outMat[0] = g[0];
-  outMat[1] = g[1];
-  outMat[2] = g[2];
-}
-
-void MatrixMath::Identity3x3(float g[3][3])
-{
-  g[0][0] = 1.0f;
-  g[0][1] = 0.0f;
-  g[0][2] = 0.0f;
-  g[1][0] = 0.0f;
-  g[1][1] = 1.0f;
-  g[1][2] = 0.0f;
-  g[2][0] = 0.0f;
-  g[2][1] = 0.0f;
-  g[2][2] = 1.0f;
-}
-
-void MatrixMath::Normalize3x3(float g[3][3])
-{
-  float denom;
-  denom = g[0][0] * g[0][0] + g[1][0] * g[1][0] + g[2][0] * g[2][0];
-  if(denom == 0.0)
-  {
-    return;
-  }
-  denom = sqrt(denom);
-  g[0][0] = g[0][0] / denom;
-  if(g[0][0] > 1)
-  {
-    g[0][0] = 1;
-  }
-  g[1][0] = g[1][0] / denom;
-  if(g[1][0] > 1)
-  {
-    g[1][0] = 1;
-  }
-  g[2][0] = g[2][0] / denom;
-  if(g[2][0] > 1)
-  {
-    g[2][0] = 1;
-  }
-  denom = g[0][1] * g[0][1] + g[1][1] * g[1][1] + g[2][1] * g[2][1];
-  if(denom == 0.0)
-  {
-    return;
-  }
-  denom = sqrt(denom);
-  g[0][1] = g[0][1] / denom;
-  if(g[0][1] > 1)
-  {
-    g[0][1] = 1;
-  }
-  g[1][1] = g[1][1] / denom;
-  if(g[1][1] > 1)
-  {
-    g[1][1] = 1;
-  }
-  g[2][1] = g[2][1] / denom;
-  if(g[2][1] > 1)
-  {
-    g[2][1] = 1;
-  }
-  denom = g[0][2] * g[0][2] + g[1][2] * g[1][2] + g[2][2] * g[2][2];
-  if(denom == 0.0)
-  {
-    return;
-  }
-  denom = sqrt(denom);
-  g[0][2] = g[0][2] / denom;
-  if(g[0][2] > 1)
-  {
-    g[0][2] = 1;
-  }
-  g[1][2] = g[1][2] / denom;
-  if(g[1][2] > 1)
-  {
-    g[1][2] = 1;
-  }
-  g[2][2] = g[2][2] / denom;
-  if(g[2][2] > 1)
-  {
-    g[2][2] = 1;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Normalize3x1(float g[3])
-{
-  float denom;
-  denom = g[0] * g[0] + g[1] * g[1] + g[2] * g[2];
-  if(denom == 0.0)
-  {
-    return;
-  }
-  denom = sqrt(denom);
-  g[0] = g[0] / denom;
-  if(g[0] > 1.0f)
-  {
-    g[0] = 1.0f;
-  }
-  g[1] = g[1] / denom;
-  if(g[1] > 1.0f)
-  {
-    g[1] = 1.0f;
-  }
-  g[2] = g[2] / denom;
-  if(g[2] > 1.0f)
-  {
-    g[2] = 1.0f;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int MatrixMath::FindIndexOfMaxVal3x1(float g[3])
-{
-  float a = fabs(g[0]);
-  float b = fabs(g[1]);
-  float c = fabs(g[2]);
-  if(a >= b && a >= c)
-  {
-    return 0;
-  }
-  if(b >= a && b >= c)
-  {
-    return 1;
-  }
-
-    return 2;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Sort3x1Ascending(float g[3])
-{
-  float temp;
-
-  if(g[0] <= g[1] && g[0] <= g[2])
-  {
-    if(g[1] <= g[2])
-    {
-      g[0] = g[0];
-      g[1] = g[1];
-      g[2] = g[2];
-    }
-    else
-    {
-      g[0] = g[0];
-      temp = g[1];
-      g[1] = g[2];
-      g[2] = temp;
-    }
-  }
-  else if(g[1] <= g[0] && g[1] <= g[2])
-  {
-    if(g[0] <= g[2])
-    {
-      temp = g[0];
-      g[0] = g[1];
-      g[1] = temp;
-      g[2] = g[2];
-    }
-    else
-    {
-      temp = g[0];
-      g[0] = g[1];
-      g[1] = g[2];
-      g[2] = temp;
-    }
-  }
-  else if(g[2] <= g[0] && g[2] <= g[1])
-  {
-    if(g[0] <= g[1])
-    {
-      temp = g[0];
-      g[0] = g[2];
-      g[2] = g[1];
-      g[1] = temp;
-    }
-    else
-    {
-      temp = g[0];
-      g[0] = g[2];
-      g[1] = g[1];
-      g[2] = temp;
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixMath::Normalize3x1(double g[3])
-{
-  double denom;
-  denom = g[0] * g[0] + g[1] * g[1] + g[2] * g[2];
-  denom = sqrt(denom);
-  g[0] = g[0] / denom;
-  if(g[0] > 1.0)
-  {
-    g[0] = 1.0;
-  }
-  g[1] = g[1] / denom;
-  if(g[1] > 1.0)
-  {
-    g[1] = 1.0;
-  }
-  g[2] = g[2] / denom;
-  if(g[2] > 1.0)
-  {
-    g[2] = 1.0;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-double MatrixMath::Magnitude4x1(double a[4])
-{
-  return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) + (a[3] * a[3])));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-float MatrixMath::Magnitude4x1(float a[4])
-{
-  return (sqrtf((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) + (a[3] * a[3])));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-float MatrixMath::DotProduct3x1(float a[3], float b[3])
-{
-  return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-float MatrixMath::DotProduct3x1(double a[3], double b[3])
-{
-  return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]);
-}
diff --git a/Source/SIMPLib/Math/MatrixMath.h b/Source/SIMPLib/Math/MatrixMath.h
index 0b63fab428..9111fb340f 100755
--- a/Source/SIMPLib/Math/MatrixMath.h
+++ b/Source/SIMPLib/Math/MatrixMath.h
@@ -36,6 +36,7 @@
 
 #pragma once
 
+#include <cmath>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
@@ -64,7 +65,19 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Multiply3x3with3x3(float g1[3][3], float g2[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Multiply3x3with3x3(T g1[3][3], T g2[3][3], T outMat[3][3])
+    {
+      outMat[0][0] = g1[0][0] * g2[0][0] + g1[0][1] * g2[1][0] + g1[0][2] * g2[2][0];
+      outMat[0][1] = g1[0][0] * g2[0][1] + g1[0][1] * g2[1][1] + g1[0][2] * g2[2][1];
+      outMat[0][2] = g1[0][0] * g2[0][2] + g1[0][1] * g2[1][2] + g1[0][2] * g2[2][2];
+      outMat[1][0] = g1[1][0] * g2[0][0] + g1[1][1] * g2[1][0] + g1[1][2] * g2[2][0];
+      outMat[1][1] = g1[1][0] * g2[0][1] + g1[1][1] * g2[1][1] + g1[1][2] * g2[2][1];
+      outMat[1][2] = g1[1][0] * g2[0][2] + g1[1][1] * g2[1][2] + g1[1][2] * g2[2][2];
+      outMat[2][0] = g1[2][0] * g2[0][0] + g1[2][1] * g2[1][0] + g1[2][2] * g2[2][0];
+      outMat[2][1] = g1[2][0] * g2[0][1] + g1[2][1] * g2[1][1] + g1[2][2] * g2[2][1];
+      outMat[2][2] = g1[2][0] * g2[0][2] + g1[2][1] * g2[1][2] + g1[2][2] * g2[2][2];
+    }
 
     /**
      * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Single Precision version)
@@ -72,15 +85,15 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Multiply3x3with3x1(const float g1[3][3], float g2[3], float outMat[3]);
+    template <typename T>
+    static void Multiply3x3with3x1(const T g1[3][3], const T* g2, T* outMat)
+    {
+      outMat[0] = g1[0][0] * g2[0] + g1[0][1] * g2[1] + g1[0][2] * g2[2];
+      outMat[1] = g1[1][0] * g2[0] + g1[1][1] * g2[1] + g1[1][2] * g2[2];
+      outMat[2] = g1[2][0] * g2[0] + g1[2][1] * g2[1] + g1[2][2] * g2[2];
+    }
 
-    /**
-     * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Double Precision Version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    static void Multiply3x3with3x1(double g1[3][3], double g2[3], double outMat[3]);
+    static void Multiply3x3with3x1(const double g1[3][3], const double g2[3], float outMat[3]);
 
     /**
      * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
@@ -88,7 +101,13 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Add3x1s(const float g1[3], float g2[3], float outMat[3]);
+    template <typename T>
+    static void Add3x1s(const T g1[3], const T g2[3], T outMat[3])
+    {
+      outMat[0] = g1[0] + g2[0];
+      outMat[1] = g1[1] + g2[1];
+      outMat[2] = g1[2] + g2[2];
+    }
 
     /**
      * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
@@ -96,7 +115,13 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Subtract3x1s(const float g1[3], float g2[3], float outMat[3]);
+    template <typename T>
+    static void Subtract3x1s(const T g1[3], const T g2[3], T outMat[3])
+    {
+      outMat[0] = g1[0] - g2[0];
+      outMat[1] = g1[1] - g2[1];
+      outMat[2] = g1[2] - g2[2];
+    }
 
     /**
      * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
@@ -104,7 +129,19 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Add3x3s(const float g1[3][3], float g2[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Add3x3s(const T g1[3][3], const T g2[3][3], float outMat[3][3])
+    {
+      outMat[0][0] = g1[0][0] + g2[0][0];
+      outMat[0][1] = g1[0][1] + g2[0][1];
+      outMat[0][2] = g1[0][2] + g2[0][2];
+      outMat[1][0] = g1[1][0] + g2[1][0];
+      outMat[1][1] = g1[1][1] + g2[1][1];
+      outMat[1][2] = g1[1][2] + g2[1][2];
+      outMat[2][0] = g1[2][0] + g2[2][0];
+      outMat[2][1] = g1[2][1] + g2[2][1];
+      outMat[2][2] = g1[2][2] + g2[2][2];
+    }
 
     /**
      * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
@@ -112,14 +149,32 @@ class SIMPLib_EXPORT MatrixMath
      * @param g2
      * @param outMat
      */
-    static void Subtract3x3s(const float g1[3][3], float g2[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Subtract3x3s(const T g1[3][3], const T g2[3][3], T outMat[3][3])
+    {
+      outMat[0][0] = g1[0][0] - g2[0][0];
+      outMat[0][1] = g1[0][1] - g2[0][1];
+      outMat[0][2] = g1[0][2] - g2[0][2];
+      outMat[1][0] = g1[1][0] - g2[1][0];
+      outMat[1][1] = g1[1][1] - g2[1][1];
+      outMat[1][2] = g1[1][2] - g2[1][2];
+      outMat[2][0] = g1[2][0] - g2[2][0];
+      outMat[2][1] = g1[2][1] - g2[2][1];
+      outMat[2][2] = g1[2][2] - g2[2][2];
+    }
 
     /**
      * @brief Multiplies each element of a 3x1 matrix by the value v.
      * @param g Input Matrix
      * @param v Value to mutliply each element by.
      */
-    static void Multiply3x1withConstant(float g[3], float v);
+    template <typename T>
+    static void Multiply3x1withConstant(T g[3], T constant)
+    {
+      g[0] *= constant;
+      g[1] *= constant;
+      g[2] *= constant;
+    }
 
     /**
      * @brief Multiplies each element of a 3x1 matrix by the value v.
@@ -141,99 +196,352 @@ class SIMPLib_EXPORT MatrixMath
      * @param g Input Matrix
      * @param v Value to mutliply each element by.
      */
-    static void Multiply3x3withConstant(float g[3][3], float v);
+    template <typename T>
+    static void Multiply3x3withConstant(T g[3][3], T constant)
+    {
+      g[0][0] *= constant;
+      g[0][1] *= constant;
+      g[0][2] *= constant;
+      g[1][0] *= constant;
+      g[1][1] *= constant;
+      g[1][2] *= constant;
+      g[2][0] *= constant;
+      g[2][1] *= constant;
+      g[2][2] *= constant;
+    }
 
     /**
      * @brief Transposes the 3x3 matrix and places the result into outMat
      * @param g
      * @param outMat
      */
-    static void Transpose3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Transpose3x3(const T g[3][3], T outMat[3][3])
+    {
+      outMat[0][0] = g[0][0];
+      outMat[0][1] = g[1][0];
+      outMat[0][2] = g[2][0];
+      outMat[1][0] = g[0][1];
+      outMat[1][1] = g[1][1];
+      outMat[1][2] = g[2][1];
+      outMat[2][0] = g[0][2];
+      outMat[2][1] = g[1][2];
+      outMat[2][2] = g[2][2];
+    }
 
     /**
      * @brief Inverts the 3x3 matrix and places the result into outMat
      * @param g
      * @param outMat
      */
-    static void Invert3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Invert3x3(T g[3][3], T outMat[3][3])
+    {
+      Adjoint3x3(g, outMat);
+      T determinant = Determinant3x3(g);
+      T oneOverDeterminant = 1.0 / determinant;
+      Multiply3x3withConstant(outMat, oneOverDeterminant);
+    }
 
     /**
      * @brief Calculates the Adjoint matrix of the 3x3 matrix and places the result into outMat
      * @param g
      * @param outMat
      */
-    static void Adjoint3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Adjoint3x3(T g[3][3], T outMat[3][3])
+    {
+      T temp[3][3];
+      Cofactor3x3(g, temp);
+      Transpose3x3(temp, outMat);
+    }
 
     /**
      * @brief Calculates the cofactor matrix of the 3x3 matrix and places the result into outMat
      * @param g
      * @param outMat
      */
-    static void Cofactor3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Cofactor3x3(T g[3][3], T outMat[3][3])
+    {
+      T temp[3][3];
+      Minors3x3(g, temp);
+      // Row 0
+      outMat[0][0] = temp[0][0];
+      outMat[0][1] = -temp[0][1];
+      outMat[0][2] = temp[0][2];
+      // Row 1
+      outMat[1][0] = -temp[1][0];
+      outMat[1][1] = temp[1][1];
+      outMat[1][2] = -temp[1][2];
+      // Row 2
+      outMat[2][0] = temp[2][0];
+      outMat[2][1] = -temp[2][1];
+      outMat[2][2] = temp[2][2];
+    }
 
     /**
      * @brief Calculates the matrix of minors of the 3x3 matrix and places the result into outMat
      * @param g
      * @param outMat
      */
-    static void Minors3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Minors3x3(const T g[3][3], T outMat[3][3])
+    {
+      outMat[0][0] = g[1][1] * g[2][2] - g[2][1] * g[1][2];
+      outMat[0][1] = g[1][0] * g[2][2] - g[2][0] * g[1][2];
+      outMat[0][2] = g[1][0] * g[2][1] - g[2][0] * g[1][1];
+      outMat[1][0] = g[0][1] * g[2][2] - g[2][1] * g[0][2];
+      outMat[1][1] = g[0][0] * g[2][2] - g[2][0] * g[0][2];
+      outMat[1][2] = g[0][0] * g[2][1] - g[2][0] * g[0][1];
+      outMat[2][0] = g[0][1] * g[1][2] - g[1][1] * g[0][2];
+      outMat[2][1] = g[0][0] * g[1][2] - g[1][0] * g[0][2];
+      outMat[2][2] = g[0][0] * g[1][1] - g[1][0] * g[0][1];
+    }
 
     /**
      * @brief The determinant of a 3x3 matrix
      * @param g 3x3 Vector
      * @return
      */
-    static float Determinant3x3(float g[3][3]);
+    template <typename T>
+    static float Determinant3x3(const T g[3][3])
+    {
+      return (g[0][0] * (g[1][1] * g[2][2] - g[1][2] * g[2][1])) - (g[0][1] * (g[1][0] * g[2][2] - g[1][2] * g[2][0])) + (g[0][2] * (g[1][0] * g[2][1] - g[1][1] * g[2][0]));
+    }
 
     /**
      * @brief Copies a 3x3 matrix into another 3x3 matrix
      * @param g
      * @param outMat
      */
-    static void Copy3x3(float g[3][3], float outMat[3][3]);
+    template <typename T>
+    static void Copy3x3(const T g[3][3], T outMat[3][3])
+    {
+      outMat[0][0] = g[0][0];
+      outMat[0][1] = g[0][1];
+      outMat[0][2] = g[0][2];
+      outMat[1][0] = g[1][0];
+      outMat[1][1] = g[1][1];
+      outMat[1][2] = g[1][2];
+      outMat[2][0] = g[2][0];
+      outMat[2][1] = g[2][1];
+      outMat[2][2] = g[2][2];
+    }
 
     /**
      * @brief Copies a 3x1 matrix into another 3x1 matrix
      * @param g
      * @param outMat
      */
-    static void Copy3x1(float g[3], float outMat[3]);
+    template <typename T>
+    static void Copy3x1(const T g[3], T outMat[3])
+    {
+      outMat[0] = g[0];
+      outMat[1] = g[1];
+      outMat[2] = g[2];
+    }
 
     /**
      * @brief Initializes the 3x3 matrix to the "Identity" matrix
      * @param g
      */
-    static void Identity3x3(float g[3][3]);
+    template <typename T>
+    static void Identity3x3(T g[3][3])
+    {
+      g[0][0] = 1.0f;
+      g[0][1] = 0.0f;
+      g[0][2] = 0.0f;
+      g[1][0] = 0.0f;
+      g[1][1] = 1.0f;
+      g[1][2] = 0.0f;
+      g[2][0] = 0.0f;
+      g[2][1] = 0.0f;
+      g[2][2] = 1.0f;
+    }
 
     /**
      * @brief Performs an "in place" normalization of the 3x1 vector.
      * @param g
      */
-    static void Normalize3x3(float g[3][3]);
+    template <typename T>
+    static void Normalize3x3(T g[3][3])
+    {
+      float denom;
+      denom = g[0][0] * g[0][0] + g[1][0] * g[1][0] + g[2][0] * g[2][0];
+      if(denom == 0.0)
+      {
+        return;
+      }
+      denom = sqrt(denom);
+      g[0][0] = g[0][0] / denom;
+      if(g[0][0] > 1)
+      {
+        g[0][0] = 1;
+      }
+      g[1][0] = g[1][0] / denom;
+      if(g[1][0] > 1)
+      {
+        g[1][0] = 1;
+      }
+      g[2][0] = g[2][0] / denom;
+      if(g[2][0] > 1)
+      {
+        g[2][0] = 1;
+      }
+      denom = g[0][1] * g[0][1] + g[1][1] * g[1][1] + g[2][1] * g[2][1];
+      if(denom == 0.0)
+      {
+        return;
+      }
+      denom = sqrt(denom);
+      g[0][1] = g[0][1] / denom;
+      if(g[0][1] > 1)
+      {
+        g[0][1] = 1;
+      }
+      g[1][1] = g[1][1] / denom;
+      if(g[1][1] > 1)
+      {
+        g[1][1] = 1;
+      }
+      g[2][1] = g[2][1] / denom;
+      if(g[2][1] > 1)
+      {
+        g[2][1] = 1;
+      }
+      denom = g[0][2] * g[0][2] + g[1][2] * g[1][2] + g[2][2] * g[2][2];
+      if(denom == 0.0)
+      {
+        return;
+      }
+      denom = sqrt(denom);
+      g[0][2] = g[0][2] / denom;
+      if(g[0][2] > 1)
+      {
+        g[0][2] = 1;
+      }
+      g[1][2] = g[1][2] / denom;
+      if(g[1][2] > 1)
+      {
+        g[1][2] = 1;
+      }
+      g[2][2] = g[2][2] / denom;
+      if(g[2][2] > 1)
+      {
+        g[2][2] = 1;
+      }
+    }
 
     /**
      * @brief Performs an "in place" normalization of the 3x1 vector. Single Precision Variant
      * @param g
      */
-    static void Normalize3x1(float g[3]);
+    template <typename T>
+    static void Normalize3x1(T g[3])
+    {
+      double denom;
+      denom = g[0] * g[0] + g[1] * g[1] + g[2] * g[2];
+      denom = sqrt(denom);
+      g[0] = g[0] / denom;
+      if(g[0] > 1.0)
+      {
+        g[0] = 1.0;
+      }
+      g[1] = g[1] / denom;
+      if(g[1] > 1.0)
+      {
+        g[1] = 1.0;
+      }
+      g[2] = g[2] / denom;
+      if(g[2] > 1.0)
+      {
+        g[2] = 1.0;
+      }
+    }
 
     /**
      * @brief Performs an "in place" sort of the 3x1 vector in ascending order. Single Precision Variant
      * @param g
      */
-    static void Sort3x1Ascending(float g[3]);
+    template <typename T>
+    static void Sort3x1Ascending(T g[3])
+    {
+      float temp;
+
+      if(g[0] <= g[1] && g[0] <= g[2])
+      {
+        if(g[1] <= g[2])
+        {
+          g[0] = g[0];
+          g[1] = g[1];
+          g[2] = g[2];
+        }
+        else
+        {
+          g[0] = g[0];
+          temp = g[1];
+          g[1] = g[2];
+          g[2] = temp;
+        }
+      }
+      else if(g[1] <= g[0] && g[1] <= g[2])
+      {
+        if(g[0] <= g[2])
+        {
+          temp = g[0];
+          g[0] = g[1];
+          g[1] = temp;
+          g[2] = g[2];
+        }
+        else
+        {
+          temp = g[0];
+          g[0] = g[1];
+          g[1] = g[2];
+          g[2] = temp;
+        }
+      }
+      else if(g[2] <= g[0] && g[2] <= g[1])
+      {
+        if(g[0] <= g[1])
+        {
+          temp = g[0];
+          g[0] = g[2];
+          g[2] = g[1];
+          g[1] = temp;
+        }
+        else
+        {
+          temp = g[0];
+          g[0] = g[2];
+          g[1] = g[1];
+          g[2] = temp;
+        }
+      }
+    }
 
     /**
      * @brief Returns index of maximum value. Single Precision Variant
      * @param g
      */
-    static int FindIndexOfMaxVal3x1(float g[3]);
-
-    /**
-    * @brief Performs an "in place" normalization of the 3x1 vector. Double Precision Variant
-    * @param g
-    */
-    static void Normalize3x1(double g[3]);
+    template <typename T>
+    static int FindIndexOfMaxVal3x1(const T g[3])
+    {
+      float a = fabs(g[0]);
+      float b = fabs(g[1]);
+      float c = fabs(g[2]);
+      if(a >= b && a >= c)
+      {
+        return 0;
+      }
+      if(b >= a && b >= c)
+      {
+        return 1;
+      }
+
+      return 2;
+    }
 
     /**
      * @brief Performs an "in place" normalization of the 3x1 vector. Double Precision Variant
@@ -241,15 +549,19 @@ class SIMPLib_EXPORT MatrixMath
      * @param j
      * @param k
      */
-    static void Normalize3x1(double& i, double& j, double& k);
-
-    /**
-     * @brief Performs an "in place" normalization of the 3x1 vector. Single Precision Variant
-     * @param i
-     * @param j
-     * @param k
-     */
-    static void Normalize3x1(float& i, float& j, float& k);
+    template <typename T>
+    static void Normalize3x1(T& i, T& j, T& k)
+    {
+      T denom;
+      denom = std::sqrt(((i * i) + (j * j) + (k * k)));
+      if(denom == 0)
+      {
+        return;
+      }
+      i = i / denom;
+      j = j / denom;
+      k = k / denom;
+    }
 
     /**
      * @brief Returns the magnitude of the 3x1 vector. Double Precision Variant
@@ -265,21 +577,11 @@ class SIMPLib_EXPORT MatrixMath
      * @brief Returns the magnitude of the 4x1 vector. Single Precision Variant
      * @param a
      */
-    static float Magnitude4x1(float a[4]);
-
-    /**
-     * @brief Returns the magnitude of the 4x1 vector. Single Precision Variant
-     * @param a
-     */
-    static double Magnitude4x1(double a[4]);
-
-    /**
-     * @brief The dot product of 2 vectors a & b. Double Precision Variant
-     * @param a 1x3 Vector
-     * @param b 1x3 Vector
-     * @return
-     */
-    static float DotProduct3x1(double a[3], double b[3]);
+    template <typename T>
+    static T Magnitude4x1(T a[4])
+    {
+      return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) + (a[3] * a[3])));
+    }
 
     /**
      * @brief The dot product of 2 vectors a & b. Single Precision Variant
@@ -287,7 +589,11 @@ class SIMPLib_EXPORT MatrixMath
      * @param b 1x3 Vector
      * @return
      */
-    static float DotProduct3x1(float a[3], float b[3]);
+    template <typename T>
+    static T DotProduct3x1(T a[3], T b[3])
+    {
+      return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]);
+    }
 
     /**
      * @brief Performs a Cross Product of "a into b" and places the result into c. Double Precision Variant
@@ -296,17 +602,13 @@ class SIMPLib_EXPORT MatrixMath
      * @param b
      * @param c
      */
-    static void CrossProduct(double a[3], double b[3], double c[3]);
-
-    /**
-     * @brief Performs a Cross Product of "a into b" and places the result into c. Single Precision Variant
-     * A X B = C
-     * @param a
-     * @param b
-     * @param c
-     */
-    static void CrossProduct(float a[3], float b[3], float c[3]);
-
+    template <typename T>
+    static void CrossProduct(const T a[3], const T b[3], T c[3])
+    {
+      c[0] = a[1] * b[2] - a[2] * b[1];
+      c[1] = a[2] * b[0] - a[0] * b[2];
+      c[2] = a[0] * b[1] - a[1] * b[0];
+    }
 
   protected:
     MatrixMath();
diff --git a/Source/SIMPLib/Math/QuaternionMath.hpp b/Source/SIMPLib/Math/QuaternionMath.hpp
deleted file mode 100755
index 8dc255c7b5..0000000000
--- a/Source/SIMPLib/Math/QuaternionMath.hpp
+++ /dev/null
@@ -1,522 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include <cassert>
-#include <cstdlib>
-
-#include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/Math/MatrixMath.h"
-
-/**
- * @brief This class performs calculations on a Quaternion or pair of Quaternions. The class is templated on the type
- * of primitive used and there are a few convenience typedefs for float and double Quaternions. Inside the class definition
- * is a typedef for the Quaternion struct itself. If you want to create a Quaternion there are a few ways to do it.
- * @code
- *  // As a normal stack allocated variable
- *  QuaternionMath<float>::Quaternion quat;
- *  quat.x = 0, quat.y = 0, quat.z = 0, quat.w = 1;
- *  // Inline using the static convenience constructor which initializes the quaternion with the arguments to the "New" method.
- *  QuaternionMath<float>::Quaternion quat = QuaternionMath::New(1, 2, 3, 4);
- * @endcode
- *
- * The memory layout for the quaternion is such that x, y, z, w is the order in memory.
- * @author Michael A. Jackson
- * @version 1.0
- */
-template<typename T>
-class QuaternionMath
-{
-  public:
-    using size_type = size_t;
-    using value_type = T;
-    using reference = T&;
-
-    /**
-    * @brief
-    */
-    using Quaternion = struct
-    {
-      T x;
-      T y;
-      T z;
-      T w;
-
-      inline reference operator[](size_type index)
-      {
-        switch(index)
-        {
-        case 0:
-          return x;
-        case 1:
-          return y;
-        case 2:
-          return z;
-        case 3:
-          return w;
-        default:
-          throw std::range_error("Invalid Quaternion index");
-        }
-      }
-
-      inline const T& operator[](size_type index) const
-      {
-        switch(index)
-        {
-        case 0:
-          return x;
-        case 1:
-          return y;
-        case 2:
-          return z;
-        case 3:
-          return w;
-        default:
-          throw std::range_error("Invalid Quaternion index");
-        }
-      }
-    };
-
-    enum Order
-    {
-      QuaternionScalarVector = 0,
-      QuaternionVectorScalar = 1
-    };
-
-    /**
-     * @brief QuaternionMath
-     */
-    QuaternionMath()
-    {
-      m_Quat.w = 0.0f;
-      m_Quat.x = 0.0f;
-      m_Quat.y = 0.0f;
-      m_Quat.z = 0.0f;
-    }
-
-    /**
-     * @brief ~QuaternionMath
-     */
-    virtual ~QuaternionMath() = default;
-
-    /**
-     * @brief QuaternionMath Copy Constructor
-     * @param rhs
-     */
-    QuaternionMath(const QuaternionMath& rhs)
-    {
-      m_Quat.w = rhs.w;
-      m_Quat.x = rhs.x;
-      m_Quat.y = rhs.y;
-      m_Quat.z = rhs.z;
-    }
-
-    /**
-     * @brief operator =
-     */
-    void operator=(const QuaternionMath& rhs)
-    {
-      m_Quat.w = rhs.w;
-      m_Quat.x = rhs.x;
-      m_Quat.y = rhs.y;
-      m_Quat.z = rhs.z;
-    }
-
-    /**
-     * @brief New
-     * @param x
-     * @param y
-     * @param z
-     * @param w
-     * @return
-     */
-    static Quaternion New(T x, T y, T z, T w)
-    {
-      Quaternion q;
-      q.x = x;
-      q.y = y;
-      q.z = z;
-      q.w = w;
-      return q;
-    }
-
-    /**
-     * @brief New
-     * @return
-     */
-    static Quaternion New()
-    {
-      Quaternion q;
-      q.x = 0.0;
-      q.y = 0.0;
-      q.z = 0.0;
-      q.w = 1.0;
-      return q;
-    }
-
-    /**
-     * @brief Identity Sets the quaternion q to the identity quaternion (<0,0,0>,1)
-     * @param q
-     */
-    static void Identity(Quaternion& q)
-    {
-      q.x = 0.0;
-      q.y = 0.0;
-      q.z = 0.0;
-      q.w = 1.0;
-    }
-
-    /**
-     * @brief Copy Copies the values from src into dest
-     * @param src
-     * @param dest
-     */
-    static void Copy(const Quaternion& src, Quaternion& dest)
-    {
-      dest.x = src.x;
-      dest.y = src.y;
-      dest.z = src.z;
-      dest.w = src.w;
-    }
-
-    /**
-     * @brief Copy
-     * @param src
-     * @return
-     */
-    static Quaternion Copy(const Quaternion& src)
-    {
-      Quaternion dest;
-      dest.x = src.x;
-      dest.y = src.y;
-      dest.z = src.z;
-      dest.w = src.w;
-      return dest;
-    }
-
-    /**
-     * @brief ElementWiseAbs inline assigns the absolute value of each element to itself
-     * @param q
-     */
-    static void ElementWiseAbs(Quaternion& q)
-    {
-      q.x = fabs(q.x);
-      q.y = fabs(q.y);
-      q.z = fabs(q.z);
-      q.w = fabs(q.w);
-    }
-
-    /**
-     * @brief ScalarMultiply Multiplies each element in the quaternion by the argument v
-     * @param q
-     * @param v
-     */
-    static void ScalarMultiply(Quaternion& q, T v)
-    {
-      q.x = q.x * v;
-      q.y = q.y * v;
-      q.z = q.z * v;
-      q.w = q.w * v;
-    }
-
-    /**
-     * @brief ScalarDivide Divides each element in the quaternion by the argument v
-     * @param q
-     * @param v
-     */
-    static void ScalarDivide(Quaternion& q, T v)
-    {
-      q.x = q.x / v;
-      q.y = q.y / v;
-      q.z = q.z / v;
-      q.w = q.w / v;
-    }
-
-
-    /**
-     * @brief ScalarAdd Adds value to each element of the vector and scalar part of the Quaternion
-     * @param q Quat that has values stored in it
-     * @param v Input Quat to add elements
-     */
-    static void ScalarAdd(Quaternion& q, T v)
-    {
-      q.x = q.x + v;
-      q.y = q.y + v;
-      q.z = q.z + v;
-      q.w = q.w + v;
-    }
-
-    /**
-     * @brief ElementWiseAssign Assigns each element in q a value of v and stores the results in q
-     * @param q Quat that has values stored in it
-     * @param v Input Quat to add elements
-     */
-
-    static void ElementWiseAssign(Quaternion& q, T v)
-    {
-      q.x = v;
-      q.y = v;
-      q.z = v;
-      q.w = v;
-    }
-
-    // ----------------------------------------------------------------------------
-
-    /**
-     * @brief Negate  −q = (−a, −v)
-     * @param q
-     */
-    static void Negate(Quaternion& q)
-    {
-      q.x = -q.x;
-      q.y = -q.y;
-      q.z = -q.z;
-      q.w = -q.w;
-    }
-
-
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief Add   q1 + q2 = (w1+w2, v1+v2)
-     * @param q1
-     * @param q2
-     * @param out
-     */
-    static void Add(const Quaternion& q1, const Quaternion& q2, Quaternion& out)
-    {
-      out.x = q2.x + q1.x;
-      out.y = q2.y + q1.y;
-      out.z = q2.z + q1.z;
-      out.w = q2.w + q1.w;
-    }
-
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief Add   q1 + q2 = (w1+w2, v1+v2)
-     * @param q1
-     * @param q2
-     * @param out
-     */
-    static void Subtract(const Quaternion& q1, const Quaternion& q2, Quaternion& out)
-    {
-      out.x = q2.x - q1.x;
-      out.y = q2.y - q1.y;
-      out.z = q2.z - q1.z;
-      out.w = q2.w - q1.w;
-    }
-
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief Multiply Multiplies 2 quaternions according to quaternion multiplication. Note that the order of the quaternions
-     * is critical as Quaternioin multiplication is NOT cummunitive i.e., A * B != B * A
-     * @param q1 Input Quaternion
-     * @param q2 Input Quaternion
-     * @param out Result
-     */
-    static void Multiply(const Quaternion& q1, const Quaternion& q2, Quaternion& out)
-    {
-      out.x = q2.x * q1.w + q2.w * q1.x + q2.z * q1.y - q2.y * q1.z;
-      out.y = q2.y * q1.w + q2.w * q1.y + q2.x * q1.z - q2.z * q1.x;
-      out.z = q2.z * q1.w + q2.w * q1.z + q2.y * q1.x - q2.x * q1.y;
-      /* Verified */
-      out.w = q2.w * q1.w - q2.x * q1.x - q2.y * q1.y - q2.z * q1.z;
-    }
-
-    /**
-     * @brief Multiply Multiplies 2 quaternions according to quaternion multiplication. Note that the order of the quaternions
-     * is critical as Quaternioin multiplication is NOT cummunitive i.e., A * B != B * A
-     * @param q1 Input Quaternion
-     * @param q2 Input Quaternion
-     * @return Result Quaternion
-     */
-    static Quaternion Multiply(const Quaternion& q1, const Quaternion& q2)
-    {
-      Quaternion out;
-      out.x = q2.x * q1.w + q2.w * q1.x + q2.z * q1.y - q2.y * q1.z;
-      out.y = q2.y * q1.w + q2.w * q1.y + q2.x * q1.z - q2.z * q1.x;
-      out.z = q2.z * q1.w + q2.w * q1.z + q2.y * q1.x - q2.x * q1.y;
-      out.w = q2.w * q1.w - q2.x * q1.x - q2.y * q1.y - q2.z * q1.z;
-      return out;
-    }
-
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief Conjugate Converts quaternion q into its conjugate in place.
-     * @param q
-     */
-    static void Conjugate(Quaternion& q)
-    {
-      q.x = -q.x;
-      q.y = -q.y;
-      q.z = -q.z;
-      q.w = q.w;
-    }
-
-    /**
-     * @brief Conjugate Converts quaternion q into its conjugate.
-     * @param in Input Quaternion
-     * @param out Output Quaternion (By Reference)
-     */
-    static void Conjugate(const Quaternion in, Quaternion& out)
-    {
-      out.x = -in.x;
-      out.y = -in.y;
-      out.z = -in.z;
-      out.w = in.w;
-    }
-
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief Norm Computes and returns the "norm" of the quaternion (x^2 + y^2 + z^2 + w^2)
-     * @param q
-     */
-    static T Norm(const Quaternion& q)
-    {
-      return q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w;
-    }
-
-
-    /**
-     * @brief Length Computes are returns the "length" of the quaternion which is the square root of the norm. SQRT (x^2 + y^2 + z^2 + w^2)
-     * @param q
-     */
-    static T Length(const Quaternion& q)
-    {
-      return sqrt(q.x * q.x + q.y * q.y + q.z * q.z + q.w * q.w);
-    }
-
-    /**
-    * @brief UnitQuaternion (Normalize) Converts the quaternion into its normalized values (x/L, y/L, z/L, w/L) where "L"
-    * is the "length" of the quaternion
-    * @param qr
-    */
-    static void UnitQuaternion(Quaternion& qr)
-    {
-      double length = Length(qr);
-      qr.x = static_cast<T>( qr.x / length );
-      qr.y = static_cast<T>( qr.y / length );
-      qr.z = static_cast<T>( qr.z / length );
-      qr.w = static_cast<T>( qr.w / length );
-    }
-
-    /**
-    * @brief GetMisorientationVector Converts the quaternion into a misorientation vector in the reference frame of the quaternion
-    * @param qr
-    * @param misoVec
-    */
-    static void GetMisorientationVector(Quaternion& qr, T misoVec[3])
-    {
-      T qw = qr.w;
-      SIMPLibMath::boundF(qw, -1.0, 1.0);
-      T constVal = 0.0;
-      if(qw == 1.0 || qw == -1.0) { constVal = 0.0; }
-      else { constVal = 2 * acos(qw) / (sqrt(1.0 - (qw * qw))); }
-      misoVec[0] = float( qr.x * constVal );
-      misoVec[1] = float( qr.y * constVal );
-      misoVec[2] = float( qr.z * constVal );
-    }
-
-    /**
-     * @brief MultiplyQuatVec Rotates a 3d vector 'v' by the quaternion 'q'
-     * @param q Input Quaternion
-     * @param v Input Vector
-     * @param out Output Vector
-     * SIMPLView uses
-     * PASSIVE rotations by default.
-     */
-    static void MultiplyQuatVec(const Quaternion q, T* v, T* out)
-    {
-      T qx2 = q.x * q.x;
-      T qy2 = q.y * q.y;
-      T qz2 = q.z * q.z;
-      T qw2 = q.w * q.w;
-
-      T qxy = q.x * q.y;
-      T qyz = q.y * q.z;
-      T qzx = q.z * q.x;
-
-      T qxw = q.x * q.w;
-      T qyw = q.y * q.w;
-      T qzw = q.z * q.w;
-
-      out[0] = v[0] * (qx2 - qy2 - qz2 + qw2) + 2 * ( v[1] * (qxy + qzw) + v[2] * (qzx - qyw) );
-      out[1] = v[1] * (qy2 - qx2 - qz2 + qw2) + 2 * ( v[2] * (qyz + qxw) + v[0] * (qxy - qzw) );
-      out[2] = v[2] * (qz2 - qx2 - qy2 + qw2) + 2 * ( v[0] * (qzx + qyw) + v[1] * (qyz - qxw) );
-
-    }
-
-    /**
-     * @brief Returns a copy of the internal quaternion representation
-     * @return
-     */
-    Quaternion quaternion() const
-    {
-      return m_Quat;
-    }
-
-  protected:
-
-
-  private:
-    Quaternion m_Quat;
-
-
-};
-
-/**
- * @brief QuaternionMathF Typedef for 32 bit floats for convenience
- */
-using QuaternionMathF = QuaternionMath<float>;
-
-/**
- * @brief QuaternionMathD Typedef for 64 bit floats for convenience
- */
-using QuaternionMathD = QuaternionMath<double>;
-
-/**
- * @brief QuatF 32 Bit Floating point Quaternion for convenience.
- */
-using QuatF = QuaternionMath<float>::Quaternion;
-
-/**
- * @brief QuatD 64 Bit Floating point Quaternion for convenience.
- */
-using QuatD = QuaternionMath<double>::Quaternion;
diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index 8f47c54020..21ce62e3d7 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -738,42 +738,6 @@ float SIMPLibMath::incompletebetaps(float a, float b, float x, float maxgam)
   return result;
 }
 
-void SIMPLibMath::boundD(double& val, double min, double max)
-{
-  if(val < min)
-  {
-    val = min;
-  }
-  else if(val > max)
-  {
-    val = max;
-  }
-}
-
-void SIMPLibMath::boundF(float& val, float min, float max)
-{
-  if(val < min)
-  {
-    val = min;
-  }
-  else if(val > max)
-  {
-    val = max;
-  }
-}
-
-void SIMPLibMath::boundI(int& val, int min, int max)
-{
-  if(val < min)
-  {
-    val = min;
-  }
-  else if(val > max)
-  {
-    val = max;
-  }
-}
-
 std::vector<double> SIMPLibMath::linspace(double minVal, double maxVal, int dim)
 {
   std::vector<double> result;
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index a3f0ae17f7..93f6612786 100755
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -156,6 +156,7 @@ namespace SIMPLib
     static const double k_360OverPi = 360.0 / M_PI;
     static const double k_180OverPi = 180.0 / M_PI;
     static const double k_PiOver2 = M_PI / 2.0;
+    static const double k_PiOver3 = M_PI / 3.0;
     static const double k_PiOver4 = M_PI / 4.0;
     static const double k_PiOver8 = M_PI / 8.0;
     static const double k_PiOver12 = M_PI / 12.0;
@@ -184,18 +185,26 @@ namespace SIMPLib
 }
 
 
-
-
-
 class SIMPLibMath
 {
   public:
     virtual ~SIMPLibMath();
 
     static SIMPLib_EXPORT float Gamma(float);
-    static SIMPLib_EXPORT void boundF(float& val, float min, float max);
-    static SIMPLib_EXPORT void boundI(int& val, int min, int max);
-    static SIMPLib_EXPORT void boundD(double& val, double min, double max);
+
+    template <typename T>
+    static void bound(T& val, T min, T max)
+    {
+      if(val < min)
+      {
+        val = min;
+      }
+      else if(val > max)
+      {
+        val = max;
+      }
+    }
+
     static SIMPLib_EXPORT float erf(float);
     static SIMPLib_EXPORT float erfc(float);
     static SIMPLib_EXPORT float gammastirf(float);
@@ -205,8 +214,6 @@ class SIMPLibMath
     static SIMPLib_EXPORT float incompletebetafe2(float, float, float, float, float);
     static SIMPLib_EXPORT float incompletebetaps(float, float, float, float);
 
-
-
     /**
      * @brief generates a linearly space array between 2 numbers (inclusive, assumes first number <= second number) [as matlabs linspace]
      * @param first number
diff --git a/Source/SIMPLib/Math/SourceList.cmake b/Source/SIMPLib/Math/SourceList.cmake
index a735f163d4..85dc748c33 100755
--- a/Source/SIMPLib/Math/SourceList.cmake
+++ b/Source/SIMPLib/Math/SourceList.cmake
@@ -5,7 +5,6 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ArrayHelpers.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GeometryMath.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MatrixMath.h
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QuaternionMath.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RadialDistributionFunction.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/RdfData.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibMath.h
diff --git a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
index 5b6de8d178..4f7165ecc9 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
@@ -42,7 +42,6 @@
 #include "SIMPLib/Math/MatrixMath.h"
 #include "SIMPLib/Math/QuaternionMath.hpp"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -84,7 +83,7 @@ class QuaternionMathTest
     {
       float dir[3] = {1.0f, 2.0f, 3.0f};
       MatrixMath::Normalize3x1(dir);
-      MatrixMath::Multiply3x1withConstant(dir, -1);
+      MatrixMath::Multiply3x1withConstant(dir, -1.0f);
     }
   }
 
@@ -93,6 +92,8 @@ class QuaternionMathTest
   // -----------------------------------------------------------------------------
   void TestQuat_t()
   {
+    using QuaternionMathF = QuaternionMath<float>;
+    using QuatF = QuaternionMathF::Quaternion;
     QuatF p = QuaternionMathF::New(1.0f, 0.0f, 0.0f, 1.0f);
     QuatF q = QuaternionMathF::New(0.0f, 1.0f, 0.0f, 2.0f);
     QuatF out = QuaternionMathF::New(0.0f, 0.0f, 0.0f, 0.0f);
diff --git a/Source/SIMPLib/Math/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/Math/Testing/Cxx/SourceList.cmake
index f54cf60dea..4e9f233cdb 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/Math/Testing/Cxx/SourceList.cmake
@@ -1,7 +1,6 @@
 
 set(TEST_${SUBDIR_NAME}_NAMES
   MatrixMathTest
-  QuaternionMathTest
 )
 
 SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")

From 7f1a7e8d7043b6712c4943b4eff2a96b621b6fe7 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Mon, 21 Oct 2019 09:10:52 -0400
Subject: [PATCH 153/397] Copying a DataContainerReader filter only copies that
 filter (#379)

Copying a DataContainerReader filter to the clipboard in SVPipelineView no longer copies the entire pipeline that was written instead. This is done by taking advantage of JsonFilterParametersWriter::setExpandReaderFilters(bool) to avoid modifying behavior used to write DREAM.3D files.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>
---
 .../FilterParameters/JsonFilterParametersWriter.cpp        | 7 +++----
 Source/SVWidgetsLib/Widgets/SVPipelineView.cpp             | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index cf3298966f..b93966a896 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -47,11 +47,9 @@
 //
 // -----------------------------------------------------------------------------
 JsonFilterParametersWriter::JsonFilterParametersWriter()
-:
- m_ExpandReaderFilters(true)
+: m_ExpandReaderFilters(true)
 , m_MaxFilterIndex(-1)
 , m_CurrentIndex(0)
-
 {
 }
 
@@ -59,7 +57,8 @@ JsonFilterParametersWriter::JsonFilterParametersWriter()
 //
 // -----------------------------------------------------------------------------
 JsonFilterParametersWriter::JsonFilterParametersWriter(QString& fileName, QString& pipelineName, int& numFilters)
-: m_MaxFilterIndex(-1)
+: m_ExpandReaderFilters(true)
+, m_MaxFilterIndex(-1)
 , m_CurrentIndex(0)
 {
   m_FileName = fileName;
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index d090c971da..7354d9dad6 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -714,6 +714,7 @@ void SVPipelineView::copySelectedFilters()
   }
 
   JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
+  jsonWriter->setExpandReaderFilters(false);
   QString jsonString = jsonWriter->writePipelineToString(pipeline, "Pipeline");
 
   QClipboard* clipboard = QApplication::clipboard();

From e39c824771830f22809d4d6984a91f6243f9eb6f Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Mon, 28 Oct 2019 12:58:13 -0400
Subject: [PATCH 154/397] Feature/const (#380)

* Added const to appropriate DataArray functions

* NeighborList::writeH5Data needed some additional changes since it was
trying to modify a member variable

* Added const to appropriate Geometry functions

* LinkedDataContainerSelectionWidget needed the IGeometry include to work

* Added const to DynamicTableData::getTableData()

* Added const to appropriate functions in AM, DC, and DCA classes
---
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  2 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       | 48 ++++++------
 .../SIMPLib/DataArrays/DynamicListArray.hpp   | 10 +--
 Source/SIMPLib/DataArrays/IDataArray.h        | 34 ++++-----
 Source/SIMPLib/DataArrays/NeighborList.hpp    | 76 +++++++++++--------
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  | 38 +++++-----
 Source/SIMPLib/DataArrays/StatsDataArray.h    | 38 +++++-----
 Source/SIMPLib/DataArrays/StringDataArray.cpp | 38 +++++-----
 Source/SIMPLib/DataArrays/StringDataArray.h   | 38 +++++-----
 Source/SIMPLib/DataArrays/StructArray.hpp     | 38 +++++-----
 .../DataContainers/AttributeMatrix.cpp        | 20 ++---
 .../SIMPLib/DataContainers/AttributeMatrix.h  | 32 ++++----
 .../SIMPLib/DataContainers/DataContainer.cpp  | 20 ++---
 Source/SIMPLib/DataContainers/DataContainer.h | 34 ++++-----
 .../DataContainers/DataContainerArray.cpp     | 33 ++++----
 .../DataContainers/DataContainerArray.h       | 32 ++++----
 .../FilterParameters/DynamicTableData.cpp     |  2 +-
 .../FilterParameters/DynamicTableData.h       |  2 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          | 22 +++---
 Source/SIMPLib/Geometry/EdgeGeom.h            | 40 +++++-----
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    | 26 +++----
 Source/SIMPLib/Geometry/HexahedralGeom.h      | 64 ++++++++--------
 Source/SIMPLib/Geometry/IGeometry.cpp         | 25 +++---
 Source/SIMPLib/Geometry/IGeometry.h           | 36 ++++-----
 Source/SIMPLib/Geometry/IGeometry2D.h         | 20 ++---
 Source/SIMPLib/Geometry/IGeometry3D.h         | 22 +++---
 Source/SIMPLib/Geometry/IGeometryGrid.h       | 30 ++++----
 Source/SIMPLib/Geometry/ImageGeom.cpp         | 54 ++++++-------
 Source/SIMPLib/Geometry/ImageGeom.h           | 54 ++++++-------
 Source/SIMPLib/Geometry/QuadGeom.cpp          | 24 +++---
 Source/SIMPLib/Geometry/QuadGeom.h            | 52 ++++++-------
 Source/SIMPLib/Geometry/RectGridGeom.cpp      | 52 ++++++-------
 Source/SIMPLib/Geometry/RectGridGeom.h        | 56 +++++++-------
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     | 10 +--
 Source/SIMPLib/Geometry/SharedHexOps.cpp      | 10 +--
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     | 10 +--
 Source/SIMPLib/Geometry/SharedTetOps.cpp      | 10 +--
 Source/SIMPLib/Geometry/SharedTriOps.cpp      | 10 +--
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |  8 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   | 26 +++----
 Source/SIMPLib/Geometry/TetrahedralGeom.h     | 64 ++++++++--------
 Source/SIMPLib/Geometry/TriangleGeom.cpp      | 24 +++---
 Source/SIMPLib/Geometry/TriangleGeom.h        | 52 ++++++-------
 Source/SIMPLib/Geometry/VertexGeom.cpp        | 22 +++---
 Source/SIMPLib/Geometry/VertexGeom.h          | 30 ++++----
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |  6 +-
 .../LinkedDataContainerSelectionWidget.cpp    |  5 +-
 47 files changed, 704 insertions(+), 695 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 871bee6ba9..43399803c1 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -221,7 +221,7 @@ public:
   }
 
 #define SIMPL_CLASS_VERSION(vers)                                                                                                                                                                      \
-  int getClassVersion() override                                                                                                                                                                       \
+  int getClassVersion() const override                                                                                                                                                                       \
   {                                                                                                                                                                                                    \
     return vers;                                                                                                                                                                                       \
   }
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 3a9dfdcbd5..a9fb9ac8eb 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -286,7 +286,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) override
+  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const override
   {
     IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
     return p;
@@ -300,7 +300,7 @@ template <typename T> class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) override
+  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) const override
   {
     IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
     return p;
@@ -394,7 +394,7 @@ template <typename T> class DataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
   {
     bool allocate = m_IsAllocated;
     if(forceNoAllocate)
@@ -418,7 +418,7 @@ template <typename T> class DataArray : public IDataArray
    * @return
    */
 
-  SIMPL::NumericTypes::Type getType()
+  SIMPL::NumericTypes::Type getType() const
   {
     T value = static_cast<T>(0x00);
     if(typeid(value) == typeid(int8_t))
@@ -479,7 +479,7 @@ template <typename T> class DataArray : public IDataArray
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
   {
     T value = static_cast<T>(0x00);
     xdmfTypeName = "UNKNOWN";
@@ -617,7 +617,7 @@ template <typename T> class DataArray : public IDataArray
    * @brief copyIntoArray
    * @param dest
    */
-  bool copyIntoArray(Pointer dest)
+  bool copyIntoArray(Pointer dest) const
   {
     if(m_IsAllocated && dest->isAllocated() && m_Array && dest->getPointer(0))
     {
@@ -632,7 +632,7 @@ template <typename T> class DataArray : public IDataArray
    * @brief isAllocated
    * @return
    */
-  bool isAllocated() override
+  bool isAllocated() const override
   {
     return m_IsAllocated;
   }
@@ -870,7 +870,7 @@ template <typename T> class DataArray : public IDataArray
    * 4 = 32 bit integer/Float
    * 8 = 64 bit integer/Double
    */
-  size_t getTypeSize() override
+  size_t getTypeSize() const override
   {
     return sizeof(T);
   }
@@ -878,7 +878,7 @@ template <typename T> class DataArray : public IDataArray
   /**
    * @brief Returns the number of elements in the internal array.
    */
-  size_t getNumberOfTuples() override
+  size_t getNumberOfTuples() const override
   {
     return m_NumTuples;
   }
@@ -886,7 +886,7 @@ template <typename T> class DataArray : public IDataArray
   /**
    * @brief Returns the total number of elements that make up this array. Equal to NumTuples * NumComponents
    */
-  size_t getSize() override
+  size_t getSize() const override
   {
     return m_Size;
   }
@@ -896,7 +896,7 @@ template <typename T> class DataArray : public IDataArray
    * at each tuple then this will return a single element QVector. If you have a 1x3 array (like EUler Angles) then
    * this will return a 3 Element QVector.
    */
-  comp_dims_type getComponentDimensions() override
+  comp_dims_type getComponentDimensions() const override
   {
     return m_CompDims;
   }
@@ -906,7 +906,7 @@ template <typename T> class DataArray : public IDataArray
    * 3 element component (vector) then this will be 3. If you are storing a small image of size 80x60
    * at each Tuple (like EBSD Kikuchi patterns) then the result would be 4800.
    */
-  int getNumberOfComponents() override
+  int getNumberOfComponents() const override
   {
     return m_NumComponents;
   }
@@ -932,7 +932,7 @@ template <typename T> class DataArray : public IDataArray
    * @brief Returns a list of the contents of DataArray (For Python Binding)
    * @return std::list. Possibly empty
    */
-  std::list<T> getArray()
+  std::list<T> getArray() const
   {
     return std::list<T>(m_Array, m_Array + (m_Size * sizeof(T)) / sizeof(T));
   }
@@ -961,7 +961,7 @@ template <typename T> class DataArray : public IDataArray
    * @param i The index to return the pointer to.
    * @return The pointer to the index
    */
-  virtual T* getPointer(size_t i)
+  virtual T* getPointer(size_t i) const
   {
 #ifndef NDEBUG
     if(m_Size > 0)
@@ -977,7 +977,7 @@ template <typename T> class DataArray : public IDataArray
    * @param i The index to return the value at
    * @return The value at index i
    */
-  virtual T getValue(size_t i)
+  virtual T getValue(size_t i) const
   {
 #ifndef NDEBUG
     if(m_Size > 0)
@@ -1006,7 +1006,7 @@ template <typename T> class DataArray : public IDataArray
 
   //----------------------------------------------------------------------------
   // These can be overridden for more efficiency
-  T getComponent(size_t i, int j)
+  T getComponent(size_t i, int j) const
   {
 #ifndef NDEBUG
     if(m_Size > 0)
@@ -1098,7 +1098,7 @@ template <typename T> class DataArray : public IDataArray
    * @brief getTuplePointer Returns the pointer to a specific tuple
    * @param tupleIndex The index of tuple
    */
-  T* getTuplePointer(size_t tupleIndex)
+  T* getTuplePointer(size_t tupleIndex) const
   {
 #ifndef NDEBUG
     if(m_Size > 0)
@@ -1129,7 +1129,7 @@ template <typename T> class DataArray : public IDataArray
    * @param i
    * @param delimiter
    */
-  void printTuple(QTextStream& out, size_t i, char delimiter = ',') override
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
   {
     int precision = out.realNumberPrecision();
     T value = static_cast<T>(0x00);
@@ -1159,7 +1159,7 @@ template <typename T> class DataArray : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) override
+  void printComponent(QTextStream& out, size_t i, int j) const override
   {
     out << m_Array[i * m_NumComponents + j];
   }
@@ -1170,7 +1170,7 @@ template <typename T> class DataArray : public IDataArray
    * from
    * @return The HDF5 native type for the value
    */
-  QString getFullNameOfClass()
+  QString getFullNameOfClass() const
   {
     QString theType = getTypeAsString();
     theType = "DataArray<" + theType + ">";
@@ -1181,7 +1181,7 @@ template <typename T> class DataArray : public IDataArray
    * @brief getTypeAsString
    * @return
    */
-  QString getTypeAsString() override
+  QString getTypeAsString() const override
   {
     T value = static_cast<T>(0);
     if(typeid(value) == typeid(float))
@@ -1336,7 +1336,7 @@ template <typename T> class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, comp_dims_type tDims) override
+  int writeH5Data(hid_t parentId, comp_dims_type tDims) const override
   {
     if(m_Array == nullptr)
     {
@@ -1351,7 +1351,7 @@ template <typename T> class DataArray : public IDataArray
    * @param volDims
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) override
+  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override
   {
     if(m_Array == nullptr)
     {
@@ -1410,7 +1410,7 @@ template <typename T> class DataArray : public IDataArray
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override
+  QString getInfoString(SIMPL::InfoStringFormat format) const override
   {
 
     QLocale usa(QLocale::English, QLocale::UnitedStates);
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 8a1823d85e..71cc1b4498 100755
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -83,7 +83,7 @@ template <typename T, typename K> class DynamicListArray
    * @brief size
    * @return
    */
-  size_t size()
+  size_t size() const
   {
     return m_Size;
   }
@@ -93,7 +93,7 @@ template <typename T, typename K> class DynamicListArray
    * @param forceNoAllocate
    * @return
    */
-  Pointer deepCopy(bool forceNoAllocate = false)
+  Pointer deepCopy(bool forceNoAllocate = false) const
   {
     DynamicListArray::Pointer copy = DynamicListArray::New();
     std::vector<T> linkCounts(m_Size, 0);
@@ -135,7 +135,7 @@ template <typename T, typename K> class DynamicListArray
    * @param ptId
    * @return
    */
-  ElementList& getElementList(size_t ptId)
+  ElementList& getElementList(size_t ptId) const
   {
     return this->m_Array[ptId];
   }
@@ -196,7 +196,7 @@ template <typename T, typename K> class DynamicListArray
    * @param ptId
    * @return
    */
-  T getNumberOfElements(size_t ptId)
+  T getNumberOfElements(size_t ptId) const
   {
     return this->m_Array[ptId].ncells;
   }
@@ -206,7 +206,7 @@ template <typename T, typename K> class DynamicListArray
    * @param ptId
    * @return
    */
-  K* getElementListPointer(size_t ptId)
+  K* getElementListPointer(size_t ptId) const
   {
     return this->m_Array[ptId].cells;
   }
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 57c5ab062a..1699bfee0d 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -78,8 +78,8 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
     IDataArray(const QString& name = "");
     ~IDataArray() override;
 
-    virtual Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) = 0;
-    virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) = 0;
+    virtual Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const = 0;
+    virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const = 0;
     // virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
 
     /**
@@ -88,12 +88,12 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      */
     DataArrayPath getDataArrayPath() const override;
 
-    virtual int getClassVersion() = 0;
+    virtual int getClassVersion() const = 0;
 
     /**
      * @brief Has all the memory needed for this class been allocated?
      */
-    virtual bool isAllocated() = 0;
+    virtual bool isAllocated() const = 0;
 
     /**
      * @brief Makes this class responsible for freeing the memory.
@@ -119,17 +119,17 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
     /**
     * @brief Returns the number of Tuples in the array.
     */
-    virtual size_t getNumberOfTuples () = 0;
+    virtual size_t getNumberOfTuples() const = 0;
 
 
     /**
      * @brief Return the number of elements in the array
      * @return
      */
-    virtual size_t getSize() = 0;
+    virtual size_t getSize() const = 0;
 
-    virtual int getNumberOfComponents() = 0;
-    virtual std::vector<size_t> getComponentDimensions() = 0;
+    virtual int getNumberOfComponents() const = 0;
+    virtual std::vector<size_t> getComponentDimensions() const = 0;
 
     /**
      * @brief Returns the number of bytes that make up the data type.
@@ -138,14 +138,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * 4 = 32 bit integer/Float
      * 8 = 64 bit integer/Double
      */
-    virtual size_t getTypeSize() = 0;
+    virtual size_t getTypeSize() const = 0;
 
     /**
      * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
      * can be a primitive like char, float, int or the name of a class.
      * @return
      */
-    virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) = 0;
+    virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const = 0;
 
     /**
      * @brief Erases tuples based on a list of specific Tuple indices
@@ -237,7 +237,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param i
      * @param delimiter
      */
-    virtual void printTuple(QTextStream& out, size_t i, char delimiter = ',') = 0;
+    virtual void printTuple(QTextStream& out, size_t i, char delimiter = ',') const = 0;
 
     /**
      * @brief printComponent
@@ -245,14 +245,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param i
      * @param j
      */
-    virtual void printComponent(QTextStream& out, size_t i, int j) = 0;
+    virtual void printComponent(QTextStream& out, size_t i, int j) const = 0;
 
     /**
      * @brief deepCopy
      * @param forceNoAllocate
      * @return
      */
-    virtual IDataArray::Pointer deepCopy(bool forceNoAllocate = false) = 0;
+    virtual IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const = 0;
 
     /**
      * @brief writeH5Data
@@ -260,7 +260,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param tDims
      * @return
      */
-    virtual int writeH5Data(hid_t parentId, std::vector<size_t> tDims) = 0;
+    virtual int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const = 0;
 
     /**
      * @brief readH5Data
@@ -278,20 +278,20 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param label
      * @return
      */
-    virtual int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) = 0;
+    virtual int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const = 0;
 
     /**
      * @brief getTypeAsString
      * @return
      */
-    virtual QString getTypeAsString() = 0;
+    virtual QString getTypeAsString() const = 0;
 
     /**
      * @brief getInfoString
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    virtual QString getInfoString(SIMPL::InfoStringFormat format) = 0;
+    virtual QString getInfoString(SIMPL::InfoStringFormat format) const = 0;
 
   protected:
 
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 782cf221d8..42a7d855f8 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -217,7 +217,7 @@ class NeighborList : public IDataArray
      * @param name
      * @return
      */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
     {
       return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
     }
@@ -229,7 +229,7 @@ class NeighborList : public IDataArray
      * @param name
      * @return
      */
-    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
     {
       return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
     }
@@ -256,7 +256,7 @@ class NeighborList : public IDataArray
      * @brief isAllocated
      * @return
      */
-    bool isAllocated() override { return true; }
+    bool isAllocated() const override { return true; }
 
     /**
      * @brief Gives this array a human readable name
@@ -280,7 +280,7 @@ class NeighborList : public IDataArray
      * can be a primitive like char, float, int or the name of a class.
      * @return
      */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override
+    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
     {
       T value = 0x00;
       xdmfTypeName = "UNKNOWN";
@@ -308,7 +308,7 @@ class NeighborList : public IDataArray
      * @brief getTypeAsString
      * @return
      */
-    QString getTypeAsString() override { return NeighborList<T>::ClassName();}
+    QString getTypeAsString() const override { return NeighborList<T>::ClassName();}
 
     /**
      * @brief takeOwnership
@@ -479,7 +479,7 @@ class NeighborList : public IDataArray
     /**
      * @brief Returns the number of elements in the internal array.
      */
-    size_t getNumberOfTuples() override
+    size_t getNumberOfTuples() const override
     {
       return m_NumTuples;
     }
@@ -490,7 +490,7 @@ class NeighborList : public IDataArray
      * of the internal storage arrays for this class.
      * @return
      */
-    size_t getSize() override
+    size_t getSize() const override
     {
       size_t total = 0;
       for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
@@ -510,13 +510,13 @@ class NeighborList : public IDataArray
      * @brief getNumberOfComponents
      * @return
      */
-    int getNumberOfComponents() override { return 1; }
+    int getNumberOfComponents() const override { return 1; }
 
     /**
      * @brief getComponentDimensions
      * @return
      */
-    std::vector<size_t> getComponentDimensions() override
+    std::vector<size_t> getComponentDimensions() const override
     {
       std::vector<size_t> dims = {1};
       return dims;
@@ -532,13 +532,13 @@ class NeighborList : public IDataArray
      * @brief getRank
      * @return
      */
-    int getRank() { return 1; }
+    int getRank() const { return 1; }
 
     /**
      * @brief getTypeSize
      * @return
      */
-    size_t getTypeSize() override  { return sizeof(SharedVectorType); }
+    size_t getTypeSize() const override  { return sizeof(SharedVectorType); }
 
     /**
      * @brief initializeWithZeros
@@ -552,7 +552,7 @@ class NeighborList : public IDataArray
      * @brief deepCopy
      * @return
      */
-    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
+    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
     {
       bool allocate = m_IsAllocated;
       if(forceNoAllocate)
@@ -605,7 +605,7 @@ class NeighborList : public IDataArray
     }
 
     //FIXME: These need to be implemented
-    void printTuple(QTextStream& out, size_t i, char delimiter = ',') override
+    void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
     {
       SharedVectorType sharedVec = m_Array[i];
       VectorType* vec = sharedVec.get();
@@ -623,7 +623,7 @@ class NeighborList : public IDataArray
      * @param i
      * @param j
      */
-    void printComponent(QTextStream& out, size_t i, int j) override
+    void printComponent(QTextStream& out, size_t i, int j) const override
     {
       Q_ASSERT(false);
     }
@@ -633,7 +633,7 @@ class NeighborList : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override
+    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override
     {
       int err = 0;
 
@@ -642,11 +642,15 @@ class NeighborList : public IDataArray
       // can compare this with what is written in the file. If they are
       // different we are going to overwrite what is in the file with what
       // we compute here.
-      if(m_NumNeighborsArrayName.isEmpty())
+
+      QString numNeighborsArrayName = m_NumNeighborsArrayName;
+
+      if(numNeighborsArrayName.isEmpty())
       {
-        m_NumNeighborsArrayName = getName() + "_NumNeighbors";
+        numNeighborsArrayName = getName() + "_NumNeighbors";
       }
-      Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), m_NumNeighborsArrayName, true);
+
+      Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), numNeighborsArrayName, true);
       int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
       size_t total = 0;
       for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
@@ -657,7 +661,7 @@ class NeighborList : public IDataArray
 
       // Check to see if the NumNeighbors is already written to the file
       bool rewrite = false;
-      if(!QH5Lite::datasetExists(parentId, m_NumNeighborsArrayName))
+      if(!QH5Lite::datasetExists(parentId, numNeighborsArrayName))
       {
         // The NumNeighbors Array is NOT already in the file so write it to the file
         numNeighborsPtr->writeH5Data(parentId, tDims);
@@ -667,7 +671,7 @@ class NeighborList : public IDataArray
         // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
         // we have in memory.
         std::vector<int32_t> fileNumNeigh(m_Array.size());
-        err = QH5Lite::readVectorDataset(parentId, m_NumNeighborsArrayName, fileNumNeigh);
+        err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, fileNumNeigh);
         if (err < 0)
         {
           return -602;
@@ -753,7 +757,7 @@ class NeighborList : public IDataArray
           return -610;
         }
 
-        err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", m_NumNeighborsArrayName);
+        err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
         if(err < 0)
         {
           return -608;
@@ -771,7 +775,7 @@ class NeighborList : public IDataArray
      * @return
      */
     int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName,
-                                   const QString& groupPath, const QString& label) override
+                                   const QString& groupPath, const QString& label) const override
     {
       int precision = 0;
       QString xdmfTypeName;
@@ -791,7 +795,7 @@ class NeighborList : public IDataArray
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    QString getInfoString(SIMPL::InfoStringFormat format) override
+    QString getInfoString(SIMPL::InfoStringFormat format) const override
     {
       QString info;
       QTextStream ss (&info);
@@ -837,8 +841,15 @@ class NeighborList : public IDataArray
         return err;
       }
 
+      QString numNeighborsArrayName = m_NumNeighborsArrayName;
+
+      if(numNeighborsArrayName.isEmpty())
+      {
+        numNeighborsArrayName = getName() + "_NumNeighbors";
+      }
+
       // Read the Attribute Off the data set to find the name of the array that holds all the sizes
-      err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", m_NumNeighborsArrayName);
+      err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
       if(err < 0)
       {
         return err;
@@ -848,9 +859,9 @@ class NeighborList : public IDataArray
       std::vector<int32_t> numNeighbors;
 
       // Check to see if the NumNeighbors exists in the file, which it must.
-      if(QH5Lite::datasetExists(parentId, m_NumNeighborsArrayName))
+      if(QH5Lite::datasetExists(parentId, numNeighborsArrayName))
       {
-        err = QH5Lite::readVectorDataset(parentId, m_NumNeighborsArrayName, numNeighbors);
+        err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, numNeighbors);
         if(err < 0)
         {
           return -702;
@@ -950,7 +961,7 @@ class NeighborList : public IDataArray
      * @param ok
      * @return
      */
-    T getValue(int grainId, int index, bool& ok)
+    T getValue(int grainId, int index, bool& ok) const
     {
 #ifndef NDEBUG
       if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
@@ -968,7 +979,7 @@ class NeighborList : public IDataArray
      * @brief getNumberOfLists
      * @return
      */
-    int getNumberOfLists()
+    int getNumberOfLists() const
     {
       return static_cast<int>(m_Array.size());
     }
@@ -978,7 +989,7 @@ class NeighborList : public IDataArray
      * @param grainId
      * @return
      */
-    int getListSize(int grainId)
+    int getListSize(int grainId) const
     {
 #ifndef NDEBUG
       if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
@@ -986,7 +997,7 @@ class NeighborList : public IDataArray
       return static_cast<int>(m_Array[grainId]->size());
     }
 
-    VectorType& getListReference(int grainId)
+    VectorType& getListReference(int grainId) const
     {
 #ifndef NDEBUG
       if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
@@ -999,7 +1010,7 @@ class NeighborList : public IDataArray
      * @param grainId
      * @return
      */
-    SharedVectorType getList(int grainId)
+    SharedVectorType getList(int grainId) const
     {
 #ifndef NDEBUG
       if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
@@ -1012,7 +1023,7 @@ class NeighborList : public IDataArray
      * @param grainId
      * @return
      */
-    VectorType copyOfList(int grainId)
+    VectorType copyOfList(int grainId) const
     {
 #ifndef NDEBUG
       if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
@@ -1056,7 +1067,6 @@ class NeighborList : public IDataArray
      */
     NeighborList(size_t numTuples, const QString name)
     : IDataArray(name)
-    , m_NumNeighborsArrayName("")
     , m_NumTuples(numTuples)
     , m_IsAllocated(false)
     {
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index c664f06981..9b61c2c4bf 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -147,7 +147,7 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(const std::vector<size_t>& t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate)
+IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate) const
 {
   return StatsDataArray::NullPointer();
 }
@@ -155,7 +155,7 @@ IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, int rank,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate)
+IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate) const
 {
   return StatsDataArray::NullPointer();
 }
@@ -163,7 +163,7 @@ IDataArray::Pointer StatsDataArray::createNewArray(size_t numElements, const std
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StatsDataArray::getFullNameOfClass()
+QString StatsDataArray::getFullNameOfClass() const
 {
   return QString("Statistics");
 }
@@ -203,7 +203,7 @@ void* StatsDataArray::getVoidPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StatsDataArray::getNumberOfTuples()
+size_t StatsDataArray::getNumberOfTuples() const
 {
   return m_StatsDataArray.size();
 }
@@ -211,7 +211,7 @@ size_t StatsDataArray::getNumberOfTuples()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StatsDataArray::getSize()
+size_t StatsDataArray::getSize() const
 {
   return m_StatsDataArray.size();
 }
@@ -219,7 +219,7 @@ size_t StatsDataArray::getSize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::getNumberOfComponents()
+int StatsDataArray::getNumberOfComponents() const
 {
   return 1;
 }
@@ -227,7 +227,7 @@ int StatsDataArray::getNumberOfComponents()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<size_t> StatsDataArray::getComponentDimensions()
+std::vector<size_t> StatsDataArray::getComponentDimensions() const
 {
   std::vector<size_t> dims = {1};
   return dims;
@@ -236,7 +236,7 @@ std::vector<size_t> StatsDataArray::getComponentDimensions()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StatsDataArray::getTypeSize()
+size_t StatsDataArray::getTypeSize() const
 {
   return sizeof(StatsData);
 }
@@ -372,7 +372,7 @@ void StatsDataArray::initializeWithZeros()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StatsDataArray::deepCopy(bool forceNoAllocate)
+IDataArray::Pointer StatsDataArray::deepCopy(bool forceNoAllocate) const
 {
   StatsDataArray::Pointer daCopyPtr = StatsDataArray::CreateArray(getNumberOfTuples() * getNumberOfComponents(), getName());
 
@@ -413,14 +413,14 @@ void StatsDataArray::resizeTuples(size_t numTuples)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StatsDataArray::printTuple(QTextStream& out, size_t i, char delimiter)
+void StatsDataArray::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   Q_ASSERT(false);
 }
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StatsDataArray::printComponent(QTextStream& out, size_t i, int j)
+void StatsDataArray::printComponent(QTextStream& out, size_t i, int j) const
 {
   Q_ASSERT(false);
 }
@@ -428,7 +428,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims)
+int StatsDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims) const
 {
   herr_t err = 0;
   hid_t gid = QH5Utilities::createGroup(parentId, getName());
@@ -541,7 +541,7 @@ int StatsDataArray::readH5Data(hid_t parentId)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeToJson(QJsonObject& jsonRoot, UInt32ArrayType::Pointer crystalStructures)
+int StatsDataArray::writeToJson(QJsonObject& jsonRoot, UInt32ArrayType::Pointer crystalStructures) const
 {
   int error = 0;
 
@@ -635,7 +635,7 @@ int StatsDataArray::readFromJson(const QJsonObject& jsonRoot)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb)
+int StatsDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
 {
   out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
   return -1;
@@ -644,7 +644,7 @@ int StatsDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StatsDataArray::getInfoString(SIMPL::InfoStringFormat format)
+QString StatsDataArray::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -676,7 +676,7 @@ QString StatsDataArray::getInfoString(SIMPL::InfoStringFormat format)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StatsDataArray::getTypeAsString()
+QString StatsDataArray::getTypeAsString() const
 {
   return "StatsDataArray";
 }
@@ -684,7 +684,7 @@ QString StatsDataArray::getTypeAsString()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StatsDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
+void StatsDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
 {
   xdmfTypeName = getNameOfClass();
   precision = 0;
@@ -693,7 +693,7 @@ void StatsDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool StatsDataArray::isAllocated()
+bool StatsDataArray::isAllocated() const
 {
   return m_IsAllocated;
 }
@@ -811,7 +811,7 @@ void StatsDataArray::fillArrayWithNewStatsData(size_t n, PhaseType::EnumType* ph
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsData::Pointer StatsDataArray::getStatsData(int idx)
+StatsData::Pointer StatsDataArray::getStatsData(int idx) const
 {
 #ifndef NDEBUG
   if(!m_StatsDataArray.empty())
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 6a25b8a316..cf30d1a0f8 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -112,24 +112,24 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override;
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
 
   /**
    * @brief getTypeAsString
    * @return
    */
-  QString getTypeAsString() override;
+  QString getTypeAsString() const override;
 
   SIMPL_INSTANCE_PROPERTY(QVector<StatsData::Pointer>, StatsDataArray)
 
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
 
-  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override;
 
   /**
    * @brief
    */
-  bool isAllocated() override;
+  bool isAllocated() const override;
 
   /**
    *
@@ -154,7 +154,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   /**
    *
    */
-  StatsData::Pointer getStatsData(int idx);
+  StatsData::Pointer getStatsData(int idx) const;
 
   /**
    * @brief operator []
@@ -170,7 +170,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @brief getFullNameOfClass
    * @return
    */
-  QString getFullNameOfClass();
+  QString getFullNameOfClass() const;
 
   /**
    * @brief Makes this class responsible for freeing the memory.
@@ -196,25 +196,25 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   /**
    * @brief Returns the number of Tuples in the array.
    */
-  size_t getNumberOfTuples() override;
+  size_t getNumberOfTuples() const override;
 
   /**
    * @brief Return the number of elements in the array
    * @return
    */
-  size_t getSize() override;
+  size_t getSize() const override;
 
   /**
    * @brief getNumberOfComponents
    * @return
    */
-  int getNumberOfComponents() override;
+  int getNumberOfComponents() const override;
 
   /**
    * @brief getComponentDimensions
    * @return
    */
-  std::vector<size_t> getComponentDimensions() override;
+  std::vector<size_t> getComponentDimensions() const override;
 
   /**
    * @brief Returns the number of bytes that make up the data type.
@@ -223,7 +223,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * 4 = 32 bit integer/Float
    * 8 = 64 bit integer/Double
    */
-  size_t getTypeSize() override;
+  size_t getTypeSize() const override;
 
   /**
    * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
@@ -285,7 +285,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief Reseizes the internal array
@@ -306,7 +306,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param i
    * @param delimiter
    */
-  void printTuple(QTextStream& out, size_t i, char delimiter = ',') override;
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override;
 
   /**
    * @brief printComponent
@@ -314,14 +314,14 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) override;
+  void printComponent(QTextStream& out, size_t i, int j) const override;
 
   /**
    *
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override;
+  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override;
 
   /**
    * @brief readH5Data
@@ -338,14 +338,14 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param groupPath
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) override;
+  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
 
   /**
    * @brief getInfoString
    * @param format
    * @return
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief StatsDataArray::readFromJson
@@ -360,7 +360,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param crystalStructures
    * @return
    */
-  int writeToJson(QJsonObject& jsonRoot, UInt32ArrayType::Pointer crystalStructures);
+  int writeToJson(QJsonObject& jsonRoot, UInt32ArrayType::Pointer crystalStructures) const;
 
 protected:
   StatsDataArray();
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index a101fc68c2..53e7989467 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -88,7 +88,7 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const st
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate)
+IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate) const
 {
   IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
   return p;
@@ -97,7 +97,7 @@ IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, int rank
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate)
+IDataArray::Pointer StringDataArray::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate) const
 {
   IDataArray::Pointer p = StringDataArray::CreateArray(numElements, name, allocate);
   return p;
@@ -118,7 +118,7 @@ StringDataArray::~StringDataArray() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool StringDataArray::isAllocated()
+bool StringDataArray::isAllocated() const
 {
   return true;
 }
@@ -142,7 +142,7 @@ void StringDataArray::setInitValue(const QString& initValue)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
+void StringDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
 {
   xdmfTypeName = getNameOfClass();
   precision = 0;
@@ -151,7 +151,7 @@ void StringDataArray::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StringDataArray::getTypeAsString()
+QString StringDataArray::getTypeAsString() const
 {
   return "StringDataArray";
 }
@@ -183,7 +183,7 @@ void* StringDataArray::getVoidPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StringDataArray::getNumberOfTuples()
+size_t StringDataArray::getNumberOfTuples() const
 {
   return m_Array.size();
 }
@@ -191,7 +191,7 @@ size_t StringDataArray::getNumberOfTuples()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StringDataArray::getSize()
+size_t StringDataArray::getSize() const
 {
   return m_Array.size();
 }
@@ -199,7 +199,7 @@ size_t StringDataArray::getSize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::getNumberOfComponents()
+int StringDataArray::getNumberOfComponents() const
 {
   return 1;
 }
@@ -207,7 +207,7 @@ int StringDataArray::getNumberOfComponents()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<size_t> StringDataArray::getComponentDimensions()
+std::vector<size_t> StringDataArray::getComponentDimensions() const
 {
   std::vector<size_t> dims = {1};
   return dims;
@@ -223,7 +223,7 @@ void StringDataArray::SetRank(int rnk)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::getRank()
+int StringDataArray::getRank() const
 {
   return 1;
 }
@@ -231,7 +231,7 @@ int StringDataArray::getRank()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t StringDataArray::getTypeSize()
+size_t StringDataArray::getTypeSize() const
 {
   return sizeof(QString);
 }
@@ -375,7 +375,7 @@ void StringDataArray::initializeWithValue(const std::string& value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer StringDataArray::deepCopy(bool forceNoAllocate)
+IDataArray::Pointer StringDataArray::deepCopy(bool forceNoAllocate) const
 {
   StringDataArray::Pointer daCopy = StringDataArray::CreateArray(getNumberOfTuples(), getName(), true);
   if(!forceNoAllocate)
@@ -420,7 +420,7 @@ void StringDataArray::initialize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringDataArray::printTuple(QTextStream& out, size_t i, char delimiter)
+void StringDataArray::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   out << m_Array[i];
 }
@@ -428,7 +428,7 @@ void StringDataArray::printTuple(QTextStream& out, size_t i, char delimiter)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringDataArray::printComponent(QTextStream& out, size_t i, int j)
+void StringDataArray::printComponent(QTextStream& out, size_t i, int j) const
 {
   out << m_Array[i];
 }
@@ -436,7 +436,7 @@ void StringDataArray::printComponent(QTextStream& out, size_t i, int j)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StringDataArray::getFullNameOfClass()
+QString StringDataArray::getFullNameOfClass() const
 {
   return "StringDataArray";
 }
@@ -444,7 +444,7 @@ QString StringDataArray::getFullNameOfClass()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims)
+int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims) const
 {
   return H5DataArrayWriter::writeStringDataArray<StringDataArray>(parentId, this);
 }
@@ -452,7 +452,7 @@ int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb)
+int StringDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
 {
   out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
   return -1;
@@ -461,7 +461,7 @@ int StringDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, cons
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StringDataArray::getInfoString(SIMPL::InfoStringFormat format)
+QString StringDataArray::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -529,7 +529,7 @@ void StringDataArray::setValue(size_t i, const QString& value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString StringDataArray::getValue(size_t i)
+QString StringDataArray::getValue(size_t i) const
 {
   return m_Array.at(i);
 }
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 5942ca92c5..00081cced1 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -97,7 +97,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param name
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
 
   /**
    * @brief createNewArray
@@ -107,7 +107,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param allocate
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override;
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override;
 
   /**
    * @brief createNewArray
@@ -128,7 +128,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @brief isAllocated
    * @return
    */
-  bool isAllocated() override;
+  bool isAllocated() const override;
 
   /**
    * @brief Gives this array a human readable name
@@ -147,12 +147,12 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override;
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
   /**
    * @brief getTypeAsString
    * @return
    */
-  QString getTypeAsString() override;
+  QString getTypeAsString() const override;
 
   /**
    * @brief
@@ -175,17 +175,17 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   /**
    * @brief Returns the number of Tuples in the array.
    */
-  size_t getNumberOfTuples() override;
+  size_t getNumberOfTuples() const override;
 
   /**
    * @brief Return the number of elements in the array
    * @return
    */
-  size_t getSize() override;
+  size_t getSize() const override;
 
-  int getNumberOfComponents() override;
+  int getNumberOfComponents() const override;
 
-  std::vector<size_t> getComponentDimensions() override;
+  std::vector<size_t> getComponentDimensions() const override;
 
   // Description:
   // Set/Get the dimension (n) of the rank. Must be >= 1. Make sure that
@@ -196,7 +196,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @brief getRank
    * @return
    */
-  int getRank();
+  int getRank() const;
 
   /**
    * @brief Returns the number of bytes that make up the data type.
@@ -205,7 +205,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * 4 = 32 bit integer/Float
    * 8 = 64 bit integer/Double
    */
-  size_t getTypeSize() override;
+  size_t getTypeSize() const override;
 
   /**
    * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
@@ -279,7 +279,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief Reseizes the internal array
@@ -305,7 +305,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param i
    * @param delimiter
    */
-  void printTuple(QTextStream& out, size_t i, char delimiter = ',') override;
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override;
 
   /**
    * @brief printComponent
@@ -313,20 +313,20 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) override;
+  void printComponent(QTextStream& out, size_t i, int j) const override;
 
   /**
    * @brief getFullNameOfClass
    * @return
    */
-  QString getFullNameOfClass();
+  QString getFullNameOfClass() const;
 
   /**
    *
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override;
+  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -336,14 +336,14 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param groupPath
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) override;
+  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
 
   /**
    * @brief getInfoString
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief readH5Data
@@ -364,7 +364,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param i
    * @return
    */
-  QString getValue(size_t i);
+  QString getValue(size_t i) const;
 
 protected:
   /**
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 88211cf619..c4db9ab650 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -90,13 +90,13 @@ class StructArray : public IDataArray
      * @param name The name of the array
      * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
      */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
     {
       IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
       return p;
     }
 
-    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) override
+    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
     {
       IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
       return p;
@@ -118,7 +118,7 @@ class StructArray : public IDataArray
      * @brief isAllocated
      * @return
      */
-    bool isAllocated() override
+    bool isAllocated() const override
     {
       return m_IsAllocated;
     }
@@ -129,7 +129,7 @@ class StructArray : public IDataArray
      * can be a primitive like char, float, int or the name of a class.
      * @return
      */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) override
+    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
     {
       xdmfTypeName = getNameOfClass();
       precision = 0;
@@ -139,7 +139,7 @@ class StructArray : public IDataArray
      * @brief getTypeAsString
      * @return
      */
-    QString getTypeAsString() override { return "struct"; }
+    QString getTypeAsString() const override { return "struct"; }
 
     /**
     * @brief Returns the HDF Type for a given primitive value.
@@ -147,7 +147,7 @@ class StructArray : public IDataArray
     * from
     * @return The HDF5 native type for the value
     */
-    virtual QString getFullNameOfClass()
+    virtual QString getFullNameOfClass() const
     {
       QString theType = getTypeAsString();
       theType = "StructArray<" + theType + ">";
@@ -453,7 +453,7 @@ class StructArray : public IDataArray
      * 4 = 32 bit integer/Float
      * 8 = 64 bit integer/Double
      */
-    size_t getTypeSize() override
+    size_t getTypeSize() const override
     {
       return sizeof(T);
     }
@@ -461,7 +461,7 @@ class StructArray : public IDataArray
     /**
      * @brief Returns the number of elements in the internal array.
      */
-    size_t getNumberOfTuples() override
+    size_t getNumberOfTuples() const override
     {
       if (m_Size == 0) { return 0; }
       return (m_MaxId + 1);
@@ -471,7 +471,7 @@ class StructArray : public IDataArray
      * @brief getSize
      * @return
      */
-    size_t getSize() override
+    size_t getSize() const override
     {
       return m_Size;
     }
@@ -480,7 +480,7 @@ class StructArray : public IDataArray
      * @brief getNumberOfComponents
      * @return
      */
-    int getNumberOfComponents() override
+    int getNumberOfComponents() const override
     {
       return 1;
     }
@@ -489,7 +489,7 @@ class StructArray : public IDataArray
      * @brief getNumberOfComponents
      * @return
      */
-    std::vector<size_t> getComponentDimensions() override
+    std::vector<size_t> getComponentDimensions() const override
     {
       std::vector<size_t> dims(1, 1);
       return dims;
@@ -507,7 +507,7 @@ class StructArray : public IDataArray
      * @brief getRank
      * @return
      */
-    int getRank()
+    int getRank() const
     {
       return 1;
     }
@@ -535,7 +535,7 @@ class StructArray : public IDataArray
      * @param i The index to return the pointer to.
      * @return The pointer to the index
      */
-    virtual T* getPointer(size_t i)
+    virtual T* getPointer(size_t i) const
     {
 #ifndef NDEBUG
       if (m_Size > 0) { Q_ASSERT(i < m_Size);}
@@ -561,7 +561,7 @@ class StructArray : public IDataArray
       }
     }
 
-    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) override
+    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
     {
       bool allocate = m_IsAllocated;
       if(forceNoAllocate)
@@ -608,7 +608,7 @@ class StructArray : public IDataArray
      * @param i
      * @param delimiter
      */
-    void printTuple(QTextStream& out, size_t i, char delimiter = ',') override
+    void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
     {
       Q_ASSERT(false);
       //        for(int j = 0; j < NumberOfComponents; ++j)
@@ -624,7 +624,7 @@ class StructArray : public IDataArray
      * @param i
      * @param j
      */
-    void printComponent(QTextStream& out, size_t i, int j) override
+    void printComponent(QTextStream& out, size_t i, int j) const override
     {
       Q_ASSERT(false);
       //        out << Array[i + j];
@@ -636,7 +636,7 @@ class StructArray : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) override
+    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override
     {
       Q_ASSERT(false);
       return -1;
@@ -652,7 +652,7 @@ class StructArray : public IDataArray
      * @return
      */
     int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName,
-                                   const QString& groupPath, const QString& labelb) override
+                                   const QString& groupPath, const QString& labelb) const override
     {
       out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
       return -1;
@@ -663,7 +663,7 @@ class StructArray : public IDataArray
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    QString getInfoString(SIMPL::InfoStringFormat format) override
+    QString getInfoString(SIMPL::InfoStringFormat format) const override
     {
       QString info;
       QTextStream ss (&info);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index fbd67b0a8a..f2610e996a 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -293,7 +293,7 @@ DataArrayPath AttributeMatrix::getDataArrayPath() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool AttributeMatrix::validateAttributeArraySizes()
+bool AttributeMatrix::validateAttributeArraySizes() const
 {
   int64_t arraySize = 0;
   int64_t matrixSize = getNumberOfTuples();
@@ -368,7 +368,7 @@ RenameErrorCodes AttributeMatrix::renameAttributeArray(const QString& oldname, c
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<size_t> AttributeMatrix::getTupleDimensions()
+std::vector<size_t> AttributeMatrix::getTupleDimensions() const
 {
   return m_TupleDims;
 }
@@ -384,7 +384,7 @@ void AttributeMatrix::setTupleDimensions(const std::vector<size_t>& tupleDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t AttributeMatrix::getNumberOfTuples()
+size_t AttributeMatrix::getNumberOfTuples() const
 {
   if(m_TupleDims.empty())
   {
@@ -501,7 +501,7 @@ void AttributeMatrix::clearAttributeArrays()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::NameList AttributeMatrix::getAttributeArrayNames()
+AttributeMatrix::NameList AttributeMatrix::getAttributeArrayNames() const
 {
   return getNamesOfChildren();
 }
@@ -509,7 +509,7 @@ AttributeMatrix::NameList AttributeMatrix::getAttributeArrayNames()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate)
+AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate) const
 {
   AttributeMatrix::Pointer newAttrMat = AttributeMatrix::New(getTupleDimensions(), getName(), getType());
 
@@ -529,7 +529,7 @@ AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AttributeMatrix::writeAttributeArraysToHDF5(hid_t parentId)
+int AttributeMatrix::writeAttributeArraysToHDF5(hid_t parentId) const
 {
   int err = 0;
 
@@ -656,7 +656,7 @@ int AttributeMatrix::readAttributeArraysFromHDF5(hid_t amGid, bool preflight, At
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString AttributeMatrix::generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType)
+QString AttributeMatrix::generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType) const
 {
   QString xdmfText;
   QString block;
@@ -674,7 +674,7 @@ QString AttributeMatrix::generateXdmfText(const QString& centering, const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
+QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -766,7 +766,7 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format)
 //
 // -----------------------------------------------------------------------------
 QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArray::Pointer& array, const QString& centering, int precision,
-                                                      const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType)
+                                                      const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType) const
 {
   QString buf;
   QTextStream out(&buf);
@@ -873,7 +873,7 @@ QString AttributeMatrix::writeXdmfAttributeDataHelper(int numComp, const QString
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString AttributeMatrix::writeXdmfAttributeData(const IDataArray::Pointer& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType)
+QString AttributeMatrix::writeXdmfAttributeData(const IDataArray::Pointer& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType) const
 {
   QString xdmfText;
   QTextStream out(&xdmfText);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 5decf66d3b..e11320baae 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -231,7 +231,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    * null pointer if the name does not exist.
    * @param name The name of the data array
    */
-  IDataArray::Pointer getAttributeArray(const QString& name)
+  IDataArray::Pointer getAttributeArray(const QString& name) const
   {
     return getChildByName(name);
   }
@@ -241,7 +241,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param path
      * @return
      */
-    IDataArray::Pointer getAttributeArray(const DataArrayPath& path)
+    IDataArray::Pointer getAttributeArray(const DataArrayPath& path) const
     {
       return getAttributeArray(path.getDataArrayName());
     }
@@ -252,7 +252,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * @param name The name of the array
     */
     template<class ArrayType>
-    typename ArrayType::Pointer getAttributeArrayAs(const QString& name)
+    typename ArrayType::Pointer getAttributeArrayAs(const QString& name) const
     {
       IDataArray::Pointer iDataArray = getAttributeArray(name);
       return std::dynamic_pointer_cast< ArrayType >(iDataArray);
@@ -303,7 +303,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * Cell (Formerly Cell) group
     * @return
     */
-    virtual NameList getAttributeArrayNames();
+    virtual NameList getAttributeArrayNames() const;
 
     /**
     * @brief Returns the total number of arrays that are stored in the Cell group
@@ -325,7 +325,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @brief Returns bool of whether a named array exists
      * @param name The name of the data array
      */
-    virtual bool validateAttributeArraySizes();
+    virtual bool validateAttributeArraySizes() const;
 
     /**
      * @brief getPrereqArray
@@ -337,7 +337,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @return A valid IDataArray Subclass if the array exists otherwise a null shared pointer.
      */
     template <class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArray(Filter* filter, QString attributeArrayName, int err, std::vector<size_t> cDims)
+    typename ArrayType::Pointer getPrereqArray(Filter* filter, QString attributeArrayName, int err, std::vector<size_t> cDims) const
     {
       QString ss;
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -389,7 +389,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param err
      * @return
      */
-    template <class ArrayType, class Filter> typename ArrayType::Pointer getPrereqIDataArray(Filter* filter, const QString& attributeArrayName, int err)
+    template <class ArrayType, class Filter> typename ArrayType::Pointer getPrereqIDataArray(Filter* filter, const QString& attributeArrayName, int err) const
     {
       QString ss;
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -521,7 +521,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @return
      */
     template<class ArrayType, class AbstractFilter>
-    bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter)
+    bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter) const
     {
       // Make sure the types are the same
       IDataArray::Pointer ida = getAttributeArray(arrayName);     
@@ -595,27 +595,27 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @brief Returns the Tuple Dimensions of the AttributeMatrix
      * @return
      */
-    std::vector<size_t> getTupleDimensions();
+    std::vector<size_t> getTupleDimensions() const;
 
     /**
     * @brief Returns the number of Tuples that the feature data has. For example if there are 32 features
     * in during a set of filtering operations then the a value of '32' would be returned.
     * @return
     */
-    size_t getNumberOfTuples();
+    size_t getNumberOfTuples() const;
 
     /**
     * @brief creates and returns a copy of the attribute matrix
     * @return On error, will return a null pointer.  It is the responsibility of the calling function to check for errors and return an error message using the PipelineMessage
     */
-    virtual AttributeMatrix::Pointer deepCopy(bool forceNoAllocate = false);
+    virtual AttributeMatrix::Pointer deepCopy(bool forceNoAllocate = false) const;
 
     /**
      * @brief writeAttributeArraysToHDF5
      * @param parentId
      * @return
      */
-    virtual int writeAttributeArraysToHDF5(hid_t parentId);
+    virtual int writeAttributeArraysToHDF5(hid_t parentId) const;
 
     /**
      * @brief addAttributeArrayFromHDF5Path
@@ -643,7 +643,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param gridType
      * @return
      */
-    virtual QString generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0);
+    virtual QString generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
 
     /**
      * @brief getInfoString Returns a text string in the given format that has information
@@ -651,7 +651,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param format A value from the SIMPL::InfoStringFormat enumeration
      * @return
      */
-    virtual QString getInfoString(SIMPL::InfoStringFormat format);
+    virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
 
   protected:
     AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
@@ -665,7 +665,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param gridType
      * @return
      */
-    virtual QString writeXdmfAttributeData(const IDataArray::Pointer& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType = 0);
+    virtual QString writeXdmfAttributeData(const IDataArray::Pointer& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType = 0) const;
 
     /**
      * @brief writeXdmfAttributeDataHelper
@@ -681,7 +681,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @return
      */
     virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArray::Pointer& array, const QString& centering, int precision,
-                                                 const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0);
+                                                 const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0) const;
 
   private:
     std::vector<size_t> m_TupleDims;
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 9c690bb5ee..d7f59e2cb0 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -173,7 +173,7 @@ void DataContainer::setGeometry(const IGeometry::Pointer& geometry)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer DataContainer::getGeometry()
+IGeometry::Pointer DataContainer::getGeometry() const
 {
   return m_Geometry;
 }
@@ -224,7 +224,7 @@ void DataContainer::clearAttributeMatrices()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainer::NameList DataContainer::getAttributeMatrixNames()
+DataContainer::NameList DataContainer::getAttributeMatrixNames() const
 {
   return getNamesOfChildren();
 }
@@ -232,7 +232,7 @@ DataContainer::NameList DataContainer::getAttributeMatrixNames()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainer::writeAttributeMatricesToHDF5(hid_t parentId)
+int DataContainer::writeAttributeMatricesToHDF5(hid_t parentId) const
 {
   int err;
   hid_t attributeMatrixId;
@@ -332,7 +332,7 @@ int DataContainer::readAttributeMatricesFromHDF5(bool preflight, hid_t dcGid, Da
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainer::Pointer DataContainer::deepCopy(bool forceNoAllocate)
+DataContainer::Pointer DataContainer::deepCopy(bool forceNoAllocate) const
 {
   DataContainer::Pointer dcCopy = DataContainer::New(getName());
   dcCopy->setName(getName());
@@ -356,7 +356,7 @@ DataContainer::Pointer DataContainer::deepCopy(bool forceNoAllocate)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainer::writeMeshToHDF5(hid_t dcGid, bool writeXdmf)
+int DataContainer::writeMeshToHDF5(hid_t dcGid, bool writeXdmf) const
 {
   int err;
   hid_t geometryId;
@@ -430,7 +430,7 @@ int DataContainer::writeMeshToHDF5(hid_t dcGid, bool writeXdmf)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainer::writeXdmf(QTextStream& out, const QString& hdfFileName)
+int DataContainer::writeXdmf(QTextStream& out, const QString& hdfFileName) const
 {
   if(nullptr == m_Geometry.get())
   {
@@ -615,7 +615,7 @@ int DataContainer::writeXdmf(QTextStream& out, const QString& hdfFileName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainer::writeXdmfFooter(QTextStream& xdmf)
+void DataContainer::writeXdmfFooter(QTextStream& xdmf) const
 {
   xdmf << "  </Grid>"
        << "\n";
@@ -725,7 +725,7 @@ int DataContainer::readMeshDataFromHDF5(hid_t dcGid, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> DataContainer::getAllDataArrayPaths()
+QVector<DataArrayPath> DataContainer::getAllDataArrayPaths() const
 {
   QVector<DataArrayPath> paths;
   const auto attributeMatrices = getChildren();
@@ -747,7 +747,7 @@ QVector<DataArrayPath> DataContainer::getAllDataArrayPaths()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataContainer::getInfoString(SIMPL::InfoStringFormat format)
+QString DataContainer::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -780,7 +780,7 @@ QString DataContainer::getInfoString(SIMPL::InfoStringFormat format)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, int err)
+AttributeMatrixShPtr DataContainer::getPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, int err) const
 {
   QString ss;
   AttributeMatrixShPtr attributeMatrix(nullptr);
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index b71a40978d..171aaf2179 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -163,12 +163,12 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Returns the geometry of the data container
    * @return
    */
-  virtual IGeometry::Pointer getGeometry();
+  virtual IGeometry::Pointer getGeometry() const;
 
   /**
    * @param format The format of the string to be returned.
    */
-  virtual QString getInfoString(SIMPL::InfoStringFormat format);
+  virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
 
   /**
    * @brief Adds the data for a named array. If an AttributeMatrix with the same
@@ -186,7 +186,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * null pointer if the name does not exist.
    * @param name The name of the data array
    */
-  AttributeMatrixShPtr getAttributeMatrix(const QString& name)
+  AttributeMatrixShPtr getAttributeMatrix(const QString& name) const
   {
     return getChildByName(name);
   }
@@ -196,7 +196,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * null pointer if the name does not exist.
    * @param name The Name of the AttributeMatrix will be extracted from the DataArratPath object
    */
-  AttributeMatrixShPtr getAttributeMatrix(const DataArrayPath& path)
+  AttributeMatrixShPtr getAttributeMatrix(const DataArrayPath& path) const
   {
     // Could this be sped-up if we hashed DataArrayPath as well?
     if(path.getDataContainerName() != getName())
@@ -210,7 +210,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Returns bool of whether a named array exists
    * @param name The name of the data array
    */
-  bool doesAttributeMatrixExist(const QString& name)
+  bool doesAttributeMatrixExist(const QString& name) const
   {
     return contains(name);
   }
@@ -234,7 +234,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    */
   virtual void clearAttributeMatrices();
 
-  Container_t getAttributeMatrices()
+  Container_t getAttributeMatrices() const
   {
     return getChildren();
   }
@@ -244,13 +244,13 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * Cell (Formerly Cell) group
    * @return
    */
-  virtual NameList getAttributeMatrixNames();
+  virtual NameList getAttributeMatrixNames() const;
 
   /**
    * @brief Returns the total number of arrays that are stored in the Cell group
    * @return
    */
-  int getNumAttributeMatrices()
+  int getNumAttributeMatrices() const
   {
     return static_cast<int>(size());
   }
@@ -259,7 +259,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief getAllDataArrayPaths
    * @return
    */
-  virtual QVector<DataArrayPath> getAllDataArrayPaths();
+  virtual QVector<DataArrayPath> getAllDataArrayPaths() const;
 
   /**
    * @brief This method will check for the existance of a named AttributeMatrix. If that AttributeMatrix with the
@@ -270,7 +270,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param err The unique error value to generate derived error values from. This helps debugging.
    * @return Shared Pointer to an AttributeMatrix object.
    */
-  AttributeMatrixShPtr getPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, int err);
+  AttributeMatrixShPtr getPrereqAttributeMatrix(AbstractFilter* filter, const QString& attributeMatrixName, int err) const;
 
   /**
    * @brief createNonPrereqAttributeMatrix This method will create a new AttributeMatrix with the given tuple dimensions
@@ -314,7 +314,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Returns the geometry as the templated type
    * @return
    */
-  template <typename GeometryType> typename GeometryType::Pointer getGeometryAs()
+  template <typename GeometryType> typename GeometryType::Pointer getGeometryAs() const
   {
     typename GeometryType::Pointer geom = std::dynamic_pointer_cast<GeometryType>(getGeometry());
     return geom;
@@ -325,7 +325,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param filter
    * @return
    */
-  template <typename GeometryType, typename Filter> typename GeometryType::Pointer getPrereqGeometry(Filter* filter)
+  template <typename GeometryType, typename Filter> typename GeometryType::Pointer getPrereqGeometry(Filter* filter) const
   {
     typename GeometryType::Pointer geom = GeometryType::NullPointer();
     IGeometry::Pointer igeom = getGeometry();
@@ -366,7 +366,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Writes all the Attribute Matrices to HDF5 file
    * @return
    */
-  virtual int writeAttributeMatricesToHDF5(hid_t parentId);
+  virtual int writeAttributeMatricesToHDF5(hid_t parentId) const;
 
   /**
    * @brief Reads desired Attribute Matrices from HDF5 file
@@ -378,14 +378,14 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief creates copy of dataContainer
    * @return
    */
-  virtual DataContainer::Pointer deepCopy(bool forceNoAllocate = false);
+  virtual DataContainer::Pointer deepCopy(bool forceNoAllocate = false) const;
 
   /**
    * @brief writeMeshToHDF5
    * @param dcGid
    * @return
    */
-  virtual int writeMeshToHDF5(hid_t dcGid, bool writeXdmf);
+  virtual int writeMeshToHDF5(hid_t dcGid, bool writeXdmf) const;
 
   /**
    * @brief writeXdmf
@@ -393,7 +393,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param hdfFileName
    * @return
    */
-  virtual int writeXdmf(QTextStream& out, const QString &hdfFileName);
+  virtual int writeXdmf(QTextStream& out, const QString &hdfFileName) const;
 
   /**
    * @brief readMeshDataFromHDF5
@@ -404,7 +404,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   virtual int readMeshDataFromHDF5(hid_t dcGid, bool preflight);
 
 protected:
-  virtual void writeXdmfFooter(QTextStream& xdmf);
+  virtual void writeXdmfFooter(QTextStream& xdmf) const;
 
   DataContainer();
   explicit DataContainer(const QString& name);
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index c9461d359c..29516d4c76 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -58,7 +58,7 @@ DataArrayPath DataContainerArray::getDataArrayPath() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainerArray::getNumDataContainers()
+int DataContainerArray::getNumDataContainers() const
 {
   return static_cast<int>(size());
 }
@@ -154,7 +154,7 @@ bool DataContainerArray::renameDataContainer(const DataArrayPath& oldName, const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainer::Pointer DataContainerArray::getDataContainer(const QString& name)
+DataContainer::Pointer DataContainerArray::getDataContainer(const QString& name) const
 {
   return getChildByName(name);
 }
@@ -162,7 +162,7 @@ DataContainer::Pointer DataContainerArray::getDataContainer(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainer::Pointer DataContainerArray::getDataContainer(const DataArrayPath& path)
+DataContainer::Pointer DataContainerArray::getDataContainer(const DataArrayPath& path) const
 {
   QString dcName = path.getDataContainerName();
   return getDataContainer(dcName);
@@ -171,7 +171,7 @@ DataContainer::Pointer DataContainerArray::getDataContainer(const DataArrayPath&
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Pointer DataContainerArray::getAttributeMatrix(const DataArrayPath& path)
+AttributeMatrix::Pointer DataContainerArray::getAttributeMatrix(const DataArrayPath& path) const
 {
   DataContainer::Pointer dc = getDataContainer(path);
   if(nullptr == dc.get())
@@ -201,7 +201,7 @@ void DataContainerArray::duplicateDataContainer(const QString& name, const QStri
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerArray::NameList DataContainerArray::getDataContainerNames()
+DataContainerArray::NameList DataContainerArray::getDataContainerNames() const
 {
   return getNamesOfChildren();
 }
@@ -209,7 +209,7 @@ DataContainerArray::NameList DataContainerArray::getDataContainerNames()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerArray::Container DataContainerArray::getDataContainers()
+DataContainerArray::Container DataContainerArray::getDataContainers() const
 {
   return getChildren();
 }
@@ -217,7 +217,7 @@ DataContainerArray::Container DataContainerArray::getDataContainers()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerArray::printDataContainerNames(QTextStream& out)
+void DataContainerArray::printDataContainerNames(QTextStream& out) const
 {
   out << "---------------------------------------------------------------------";
   Container dcArray = getDataContainers();
@@ -312,7 +312,7 @@ bool DataContainerArray::doesDataContainerExist(const QString& name) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataContainerArray::doesAttributeMatrixExist(const DataArrayPath& path)
+bool DataContainerArray::doesAttributeMatrixExist(const DataArrayPath& path) const
 {
   if(!doesDataContainerExist(path.getDataContainerName()))
   {
@@ -326,7 +326,7 @@ bool DataContainerArray::doesAttributeMatrixExist(const DataArrayPath& path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool DataContainerArray::doesAttributeArrayExist(const DataArrayPath& path)
+bool DataContainerArray::doesAttributeArrayExist(const DataArrayPath& path) const
 {
   if(!doesDataContainerExist(path.getDataContainerName()))
   {
@@ -360,16 +360,15 @@ QMap<QString, IDataContainerBundle::Pointer>& DataContainerArray::getDataContain
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataContainerBundle::Pointer DataContainerArray::getDataContainerBundle(const QString& name)
+IDataContainerBundle::Pointer DataContainerArray::getDataContainerBundle(const QString& name) const
 {
   IDataContainerBundle::Pointer f = IDataContainerBundle::NullPointer();
-  for(QMap<QString, IDataContainerBundle::Pointer>::iterator it = m_DataContainerBundles.begin(); it != m_DataContainerBundles.end(); ++it)
+
+  auto match = std::find_if(m_DataContainerBundles.cbegin(), m_DataContainerBundles.cend(), [&name](auto bundle) { return bundle->getName() == name; });
+
+  if(match != m_DataContainerBundles.cend())
   {
-    if((*it)->getName() == name)
-    {
-      f = *it;
-      break;
-    }
+    f = *match;
   }
 
   return f;
@@ -440,7 +439,7 @@ bool DataContainerArray::renameDataContainerBundle(const QString& oldName, const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerArray::Pointer DataContainerArray::deepCopy(bool forceNoAllocate)
+DataContainerArray::Pointer DataContainerArray::deepCopy(bool forceNoAllocate) const
 {
   DataContainerArray::Pointer dcaCopy = DataContainerArray::New();
   const Container dcs = getDataContainers();
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index c59bacd867..1445a37d01 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -118,20 +118,20 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param path Uses the DataContainerName from the DataArrayPath to return a data container
    * @return
    */
-  virtual DataContainerShPtr getDataContainer(const DataArrayPath& path);
+  virtual DataContainerShPtr getDataContainer(const DataArrayPath& path) const;
 
   /**
    * @brief getDataContainer
    * @param name
    * @return
    */
-  virtual DataContainerShPtr getDataContainer(const QString& name);
+  virtual DataContainerShPtr getDataContainer(const QString& name) const;
 
   /**
    * @brief getDataContainers
    * @return
    */
-  Container getDataContainers();
+  Container getDataContainers() const;
 
   /**
    * @brief Returns if a DataContainer with the give name is in the array
@@ -152,14 +152,14 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param path
    * @return
    */
-  virtual bool doesAttributeMatrixExist(const DataArrayPath& path);
+  virtual bool doesAttributeMatrixExist(const DataArrayPath& path) const;
 
   /**
    * @brief doesAttributeArrayExist
    * @param path
    * @return
    */
-  virtual bool doesAttributeArrayExist(const DataArrayPath& path);
+  virtual bool doesAttributeArrayExist(const DataArrayPath& path) const;
 
   /**
    * @brief
@@ -191,13 +191,13 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @brief getDataContainerNames
    * @return
    */
-  NameList getDataContainerNames();
+  NameList getDataContainerNames() const;
 
   /**
    * @brief Returns the number of DataContainers
    * @return
    */
-  virtual int getNumDataContainers();
+  virtual int getNumDataContainers() const;
 
   /**
    * @brief duplicateDataContainer
@@ -212,13 +212,13 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param path
    * @return
    */
-  virtual AttributeMatrix::Pointer getAttributeMatrix(const DataArrayPath& path);
+  virtual AttributeMatrix::Pointer getAttributeMatrix(const DataArrayPath& path) const;
 
   /**
    * @brief printDataContainerNames
    * @param out
    */
-  virtual void printDataContainerNames(QTextStream& out);
+  virtual void printDataContainerNames(QTextStream& out) const;
 
   /**
    * @brief Reads desired the DataContainers from HDF5 file
@@ -247,9 +247,9 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param name
    * @return
    */
-  IDataContainerBundle::Pointer getDataContainerBundle(const QString& name);
+  IDataContainerBundle::Pointer getDataContainerBundle(const QString& name) const;
 
-  template <typename BundleType> typename BundleType::Pointer getDataContainerBundleAs(const QString& name)
+  template <typename BundleType> typename BundleType::Pointer getDataContainerBundleAs(const QString& name) const
   {
     typename BundleType::Pointer dcb = std::dynamic_pointer_cast<BundleType>(getDataContainerBundle(name));
     return dcb;
@@ -446,7 +446,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @return Valid or nullptr shared pointer based on availability of the array
      */
     template <class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, std::vector<size_t> cDims)
+    typename ArrayType::Pointer getPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, std::vector<size_t> cDims) const
     {
 
       QString ss;
@@ -510,7 +510,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     * @return
     */
     template<class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqIDataArrayFromPath(Filter* filter, const DataArrayPath& path)
+    typename ArrayType::Pointer getPrereqIDataArrayFromPath(Filter* filter, const DataArrayPath& path) const
     {
 
       QString ss;
@@ -672,7 +672,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @return bool Validation check
      */
     template<typename Filter>
-    bool validateNumberOfTuples(Filter* filter, const QVector<DataArrayPath>& paths)
+    bool validateNumberOfTuples(Filter* filter, const QVector<DataArrayPath>& paths) const
     {
       if (paths.size() <= 1) { return false; }
       QVector<IDataArray::Pointer> dataArrays;
@@ -739,7 +739,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @return bool Validation check
      */
     template<typename Filter>
-    bool validateNumberOfTuples(Filter* filter, QVector<IDataArray::Pointer> dataArrays)
+    bool validateNumberOfTuples(Filter* filter, QVector<IDataArray::Pointer> dataArrays) const
     {
       if (dataArrays.size() <= 1) { return false; }
       bool valid = true;
@@ -772,7 +772,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param dca
      * @return
      */
-    DataContainerArray::Pointer deepCopy(bool forceNoAllocate = false);
+    DataContainerArray::Pointer deepCopy(bool forceNoAllocate = false) const;
 
   protected:
     DataContainerArray();
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index adf06fc4b1..35d44a821a 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -490,7 +490,7 @@ std::vector<std::vector<double>> DynamicTableData::readData(QJsonObject object)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<std::vector<double>> DynamicTableData::getTableData()
+std::vector<std::vector<double>> DynamicTableData::getTableData() const
 {
   return m_TableData;
 }
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index bc471ccca9..a7178bbac0 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -129,7 +129,7 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
     /**
     * @brief Table data getter and setter
     */
-    std::vector<std::vector<double>> getTableData();
+    std::vector<std::vector<double>> getTableData() const;
     void setTableData(const std::vector<std::vector<double>>& data);
 
     /**
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index d1fb082b58..55e0ddd99d 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -216,7 +216,7 @@ void EdgeGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t EdgeGeom::getNumberOfElements()
+size_t EdgeGeom::getNumberOfElements() const
 {
   return m_EdgeList->getNumberOfTuples();
 }
@@ -238,7 +238,7 @@ int EdgeGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer EdgeGeom::getElementsContainingVert()
+ElementDynamicList::Pointer EdgeGeom::getElementsContainingVert() const
 {
   return m_EdgesContainingVert;
 }
@@ -285,7 +285,7 @@ int EdgeGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer EdgeGeom::getElementNeighbors()
+ElementDynamicList::Pointer EdgeGeom::getElementNeighbors() const
 {
   return m_EdgeNeighbors;
 }
@@ -324,7 +324,7 @@ int EdgeGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer EdgeGeom::getElementCentroids()
+FloatArrayType::Pointer EdgeGeom::getElementCentroids() const
 {
   return m_EdgeCentroids;
 }
@@ -373,7 +373,7 @@ int EdgeGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer EdgeGeom::getElementSizes()
+FloatArrayType::Pointer EdgeGeom::getElementSizes() const
 {
   return m_EdgeSizes;
 }
@@ -397,7 +397,7 @@ void EdgeGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void EdgeGeom::getParametricCenter(double pCoords[3])
+void EdgeGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.5;
   pCoords[1] = 0.0;
@@ -407,7 +407,7 @@ void EdgeGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void EdgeGeom::getShapeFunctions(double pCoords[3], double* shape)
+void EdgeGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   (void)pCoords;
 
@@ -436,7 +436,7 @@ void EdgeGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int EdgeGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int EdgeGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
 
@@ -502,7 +502,7 @@ int EdgeGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int EdgeGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int EdgeGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -555,7 +555,7 @@ int EdgeGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString EdgeGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString EdgeGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -626,7 +626,7 @@ int EdgeGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer EdgeGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer EdgeGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
   SharedEdgeList::Pointer edges = std::dynamic_pointer_cast<SharedEdgeList>((getEdges().get() == nullptr) ? nullptr : getEdges()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 5a8038bf34..4ced8b0e5a 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -115,7 +115,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getVertices
    * @return
    */
-  SharedVertexList::Pointer getVertices();
+  SharedVertexList::Pointer getVertices() const;
 
   /**
    * @brief setCoords
@@ -129,20 +129,20 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param vertId
    * @param coords
    */
-  void getCoords(size_t vertId, float coords[3]);
+  void getCoords(size_t vertId, float coords[3]) const;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(size_t i);
+  float* getVertexPointer(size_t i) const;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  size_t getNumberOfVertices();
+  size_t getNumberOfVertices() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from SharedEdgeOps
@@ -171,7 +171,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getEdges
    * @return
    */
-  SharedEdgeList::Pointer getEdges();
+  SharedEdgeList::Pointer getEdges() const;
 
   /**
    * @brief setVerts
@@ -185,7 +185,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(size_t edgeId, size_t verts[2]);
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) const;
 
   /**
    * @brief getVertCoordsAtEdge
@@ -193,20 +193,20 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]);
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const;
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  size_t* getEdgePointer(size_t i);
+  size_t* getEdgePointer(size_t i) const;
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  size_t getNumberOfEdges();
+  size_t getNumberOfEdges() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -221,7 +221,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getNumberOfElements
    * @return
    */
-  size_t getNumberOfElements() override;
+  size_t getNumberOfElements() const override;
 
   /**
    * @brief findElementSizes
@@ -233,7 +233,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getElementSizes
    * @return
    */
-  FloatArrayType::Pointer getElementSizes() override;
+  FloatArrayType::Pointer getElementSizes() const override;
 
   /**
    * @brief deleteElementSizes
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getElementsContainingVert
    * @return
    */
-  ElementDynamicList::Pointer getElementsContainingVert() override;
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
 
   /**
    * @brief deleteElementsContainingVert
@@ -267,7 +267,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getElementNeighbors
    * @return
    */
-  ElementDynamicList::Pointer getElementNeighbors() override;
+  ElementDynamicList::Pointer getElementNeighbors() const override;
 
   /**
    * @brief deleteElementNeighbors
@@ -284,7 +284,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getElementCentroids
    * @return
    */
-  FloatArrayType::Pointer getElementCentroids() override;
+  FloatArrayType::Pointer getElementCentroids() const override;
 
   /**
    * @brief deleteElementCentroids
@@ -295,14 +295,14 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief getParametricCenter
    * @param pCoords
    */
-  void getParametricCenter(double pCoords[3]) override;
+  void getParametricCenter(double pCoords[3]) const override;
 
   /**
    * @brief getShapeFunctions
    * @param pCoords
    * @param shape
    */
-  void getShapeFunctions(double pCoords[3], double* shape) override;
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
 
   /**
    * @brief findDerivatives
@@ -316,7 +316,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief writeGeometryToHDF5
@@ -324,7 +324,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param writeXdmf
    * @return
    */
-  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
   /**
    * @brief writeXdmf
@@ -333,7 +333,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @param hdfFileName
    * @return
    */
-  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
   /**
    * @brief readGeometryFromHDF5
@@ -347,7 +347,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    * @brief deepCopy
    * @return
    */
-  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief addOrReplaceAttributeMatrix
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index fed27ff883..d537ecfe0a 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -194,7 +194,7 @@ void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeM
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t HexahedralGeom::getNumberOfElements()
+size_t HexahedralGeom::getNumberOfElements() const
 {
   return m_HexList->getNumberOfTuples();
 }
@@ -260,7 +260,7 @@ int HexahedralGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer HexahedralGeom::getElementsContainingVert()
+ElementDynamicList::Pointer HexahedralGeom::getElementsContainingVert() const
 {
   return m_HexasContainingVert;
 }
@@ -307,7 +307,7 @@ int HexahedralGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer HexahedralGeom::getElementNeighbors()
+ElementDynamicList::Pointer HexahedralGeom::getElementNeighbors() const
 {
   return m_HexNeighbors;
 }
@@ -346,7 +346,7 @@ int HexahedralGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer HexahedralGeom::getElementCentroids()
+FloatArrayType::Pointer HexahedralGeom::getElementCentroids() const
 {
   return m_HexCentroids;
 }
@@ -387,7 +387,7 @@ int HexahedralGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer HexahedralGeom::getElementSizes()
+FloatArrayType::Pointer HexahedralGeom::getElementSizes() const
 {
   return m_HexSizes;
 }
@@ -426,7 +426,7 @@ int HexahedralGeom::findUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer HexahedralGeom::getUnsharedEdges()
+SharedEdgeList::Pointer HexahedralGeom::getUnsharedEdges() const
 {
   return m_UnsharedEdgeList;
 }
@@ -465,7 +465,7 @@ int HexahedralGeom::findUnsharedFaces()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedQuadList::Pointer HexahedralGeom::getUnsharedFaces()
+SharedQuadList::Pointer HexahedralGeom::getUnsharedFaces() const
 {
   return m_UnsharedQuadList;
 }
@@ -489,7 +489,7 @@ void HexahedralGeom::deleteUnsharedFaces()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void HexahedralGeom::getParametricCenter(double pCoords[3])
+void HexahedralGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.5;
   pCoords[1] = 0.5;
@@ -499,7 +499,7 @@ void HexahedralGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void HexahedralGeom::getShapeFunctions(double pCoords[3], double* shape)
+void HexahedralGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   double rm = 0.0;
   double sm = 0.0;
@@ -561,7 +561,7 @@ void HexahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArray
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int HexahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int HexahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
 
@@ -663,7 +663,7 @@ int HexahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writ
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int HexahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int HexahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -716,7 +716,7 @@ int HexahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileN
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString HexahedralGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString HexahedralGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -814,7 +814,7 @@ int HexahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer HexahedralGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer HexahedralGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedHexList::Pointer hexas = std::dynamic_pointer_cast<SharedHexList>((getHexahedra().get() == nullptr) ? nullptr : getHexahedra()->deepCopy(forceNoAllocate));
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 32cfb35212..3b4d1cbe36 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -84,7 +84,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getQuads
      * @return
      */
-    SharedQuadList::Pointer getQuads();
+    SharedQuadList::Pointer getQuads() const;
 
     /**
      * @brief setVertsAtQuad
@@ -98,7 +98,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param quadId
      * @param verts
      */
-    void getVertsAtQuad(size_t quadId, size_t verts[4]);
+    void getVertsAtQuad(size_t quadId, size_t verts[4]) const;
 
     /**
      * @brief getVertCoordsAtQuad
@@ -108,20 +108,20 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert3
      * @param vert4
      */
-    void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+    void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
 
     /**
      * @brief getPointer
      * @param i
      * @return
      */
-    size_t* getQuadPointer(size_t i);
+    size_t* getQuadPointer(size_t i) const;
 
     /**
      * @brief getNumberOfQuads
      * @return
      */
-    size_t getNumberOfQuads();
+    size_t getNumberOfQuads() const;
 
     // -----------------------------------------------------------------------------
     // Inherited from SharedHexOps
@@ -150,7 +150,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
     * @brief getHexahedra
     * @return
     */
-    SharedHexList::Pointer getHexahedra();
+    SharedHexList::Pointer getHexahedra() const;
 
     /**
      * @brief setVertsAtHex
@@ -164,7 +164,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param hexId
      * @param verts
      */
-    void getVertsAtHex(size_t hexId, size_t verts[7]);
+    void getVertsAtHex(size_t hexId, size_t verts[7]) const;
 
     /**
      * @brief getVertCoordsAtHex
@@ -176,20 +176,20 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert5
      * @param vert6
      */
-    void getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]);
+    void getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]) const;
 
     /**
      * @brief getHexPointer
      * @param i
      * @return
      */
-    size_t* getHexPointer(size_t i);
+    size_t* getHexPointer(size_t i) const;
 
     /**
      * @brief getNumberOfHexas
      * @return
      */
-    size_t getNumberOfHexas();
+    size_t getNumberOfHexas() const;
 
     // -----------------------------------------------------------------------------
     // Inherited from IGeometry
@@ -204,7 +204,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getNumberOfElements
      * @return
      */
-    size_t getNumberOfElements() override;
+    size_t getNumberOfElements() const override;
 
     /**
      * @brief findElementSizes
@@ -216,7 +216,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getElementSizes
      * @return
      */
-    FloatArrayType::Pointer getElementSizes() override;
+    FloatArrayType::Pointer getElementSizes() const override;
 
     /**
      * @brief deleteElementSizes
@@ -233,7 +233,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getElementsContainingVert
      * @return
      */
-    ElementDynamicList::Pointer getElementsContainingVert() override;
+    ElementDynamicList::Pointer getElementsContainingVert() const override;
 
     /**
      * @brief deleteElementsContainingVert
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getElementNeighbors
      * @return
      */
-    ElementDynamicList::Pointer getElementNeighbors() override;
+    ElementDynamicList::Pointer getElementNeighbors() const override;
 
     /**
      * @brief deleteElementNeighbors
@@ -267,7 +267,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getElementCentroids
      * @return
      */
-    FloatArrayType::Pointer getElementCentroids() override;
+    FloatArrayType::Pointer getElementCentroids() const override;
 
     /**
      * @brief deleteElementCentroids
@@ -278,14 +278,14 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getParametricCenter
      * @param pCoords
      */
-    void getParametricCenter(double pCoords[3]) override;
+    void getParametricCenter(double pCoords[3]) const override;
 
     /**
      * @brief getShapeFunctions
      * @param pCoords
      * @param shape
      */
-    void getShapeFunctions(double pCoords[3], double* shape) override;
+    void getShapeFunctions(double pCoords[3], double* shape) const override;
 
     /**
      * @brief findDerivatives
@@ -299,7 +299,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    QString getInfoString(SIMPL::InfoStringFormat format) override;
+    QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
     /**
      * @brief writeGeometryToHDF5
@@ -307,7 +307,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param writeXdmf
      * @return
      */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
     /**
      * @brief writeXdmf
@@ -316,7 +316,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param hdfFileName
      * @return
      */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
     /**
      * @brief readGeometryFromHDF5
@@ -330,7 +330,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief deepCopy
      * @return
      */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
     /**
      * @brief addOrReplaceAttributeMatrix
@@ -357,7 +357,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getVertices
      * @return
      */
-    SharedVertexList::Pointer getVertices() override;
+    SharedVertexList::Pointer getVertices() const override;
 
     /**
      * @brief setCoords
@@ -371,20 +371,20 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vertId
      * @param coords
      */
-    void getCoords(size_t vertId, float coords[3]) override;
+    void getCoords(size_t vertId, float coords[3]) const override;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    float* getVertexPointer(size_t i) override;
+    float* getVertexPointer(size_t i) const override;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    size_t getNumberOfVertices() override;
+    size_t getNumberOfVertices() const override;
 
     /**
      * @brief resizeEdgeList
@@ -396,7 +396,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getEdges
      * @return
      */
-    SharedEdgeList::Pointer getEdges() override;
+    SharedEdgeList::Pointer getEdges() const override;
 
     /**
      * @brief setVerts
@@ -410,7 +410,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param edgeId
      * @param verts
      */
-    void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+    void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -418,20 +418,20 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @param vert1
      * @param vert2
      */
-    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
+    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    size_t* getEdgePointer(size_t i) override;
+    size_t* getEdgePointer(size_t i) const override;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    size_t getNumberOfEdges() override;
+    size_t getNumberOfEdges() const override;
 
     /**
      * @brief findElementEdges
@@ -464,7 +464,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getUnsharedEdges
      * @return
      */
-    SharedEdgeList::Pointer getUnsharedEdges() override;
+    SharedEdgeList::Pointer getUnsharedEdges() const override;
 
     /**
      * @brief deleteUnsharedEdges
@@ -480,7 +480,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      * @brief getUnsharedFaces
      * @return
      */
-    SharedEdgeList::Pointer getUnsharedFaces() override;
+    SharedEdgeList::Pointer getUnsharedFaces() const override;
 
     /**
      * @brief deleteUnsharedFaces
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index e0adf1efe5..86959e2adb 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -427,7 +427,7 @@ void IGeometry::setName(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString IGeometry::getName()
+QString IGeometry::getName() const
 {
   return m_Name;
 }
@@ -435,7 +435,7 @@ QString IGeometry::getName()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Type IGeometry::getGeometryType()
+IGeometry::Type IGeometry::getGeometryType() const
 {
   return m_GeometryType;
 }
@@ -443,7 +443,7 @@ IGeometry::Type IGeometry::getGeometryType()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString IGeometry::getGeometryTypeAsString()
+QString IGeometry::getGeometryTypeAsString() const
 {
   return m_GeometryTypeName;
 }
@@ -474,7 +474,7 @@ void IGeometry::sendThreadSafeProgressMessage(int64_t counter, int64_t max)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-unsigned int IGeometry::getXdmfGridType()
+unsigned int IGeometry::getXdmfGridType() const
 {
   return m_XdmfGridType;
 }
@@ -482,7 +482,7 @@ unsigned int IGeometry::getXdmfGridType()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-unsigned int IGeometry::getUnitDimensionality()
+unsigned int IGeometry::getUnitDimensionality() const
 {
   return m_UnitDimensionality;
 }
@@ -498,7 +498,7 @@ void IGeometry::setSpatialDimensionality(unsigned int spatialDims)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-unsigned int IGeometry::getSpatialDimensionality()
+unsigned int IGeometry::getSpatialDimensionality() const
 {
   return m_SpatialDimensionality;
 }
@@ -506,10 +506,9 @@ unsigned int IGeometry::getSpatialDimensionality()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Pointer IGeometry::getAttributeMatrix(const QString& name)
+AttributeMatrix::Pointer IGeometry::getAttributeMatrix(const QString& name) const
 {
-  AttributeMatrixMap_t::iterator it;
-  it = m_AttributeMatrices.find(name);
+  AttributeMatrixMap_t::const_iterator it = m_AttributeMatrices.find(name);
   if(it == m_AttributeMatrices.end())
   {
     return AttributeMatrix::NullPointer();
@@ -522,8 +521,7 @@ AttributeMatrix::Pointer IGeometry::getAttributeMatrix(const QString& name)
 // -----------------------------------------------------------------------------
 AttributeMatrix::Pointer IGeometry::removeAttributeMatrix(const QString& name)
 {
-  QMap<QString, AttributeMatrix::Pointer>::iterator it;
-  it = m_AttributeMatrices.find(name);
+  AttributeMatrixMap_t::iterator it = m_AttributeMatrices.find(name);
   if(it == m_AttributeMatrices.end())
   {
     // DO NOT return a NullPointer for any reason other than "Attribute Matrix was not found"
@@ -537,7 +535,7 @@ AttributeMatrix::Pointer IGeometry::removeAttributeMatrix(const QString& name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int IGeometry::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int IGeometry::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
   if(m_TransformContainer)
@@ -549,6 +547,9 @@ int IGeometry::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf
   return err;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 int IGeometry::readGeometryFromHDF5(hid_t parentId, bool preflight)
 {
   herr_t err = 0;
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index ee25214e98..3ceae2cc27 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -225,7 +225,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getElementsContainingVert
      * @return
      */
-    virtual ElementDynamicList::Pointer getElementsContainingVert() = 0;
+    virtual ElementDynamicList::Pointer getElementsContainingVert() const = 0;
 
     /**
      * @brief deleteElementsContainingVert
@@ -242,7 +242,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getElementNeighbors
      * @return
      */
-    virtual ElementDynamicList::Pointer getElementNeighbors() = 0;
+    virtual ElementDynamicList::Pointer getElementNeighbors() const = 0;
 
     /**
      * @brief deleteElementNeighbors
@@ -257,7 +257,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getNumberOfElements
      * @return
      */
-    virtual size_t getNumberOfElements() = 0;
+    virtual size_t getNumberOfElements() const = 0;
 
     /**
      * @brief findElementSizes
@@ -269,7 +269,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getElementSizes
      * @return
      */
-    virtual FloatArrayType::Pointer getElementSizes() = 0;
+    virtual FloatArrayType::Pointer getElementSizes() const = 0;
 
     /**
      * @brief deleteElementSizes
@@ -286,7 +286,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getElementCentroids
      * @return
      */
-    virtual FloatArrayType::Pointer getElementCentroids() = 0;
+    virtual FloatArrayType::Pointer getElementCentroids() const = 0;
 
     /**
      * @brief deleteElementCentroids
@@ -297,14 +297,14 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getParametricCenter
      * @param pCoords
      */
-    virtual void getParametricCenter(double pCoords[3]) = 0;
+    virtual void getParametricCenter(double pCoords[3]) const = 0;
 
     /**
      * @brief getShapeFunctions
      * @param pCoords
      * @param derivs
      */
-    virtual void getShapeFunctions(double pCoords[3], double* shape) = 0;
+    virtual void getShapeFunctions(double pCoords[3], double* shape) const = 0;
 
     /**
      * @brief findDerivatives
@@ -327,38 +327,38 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getName
      * @return
      */
-    virtual QString getName() final;
+    virtual QString getName() const final;
 
     /**
      * @brief getGeometryType
      * @return
      */
-    virtual Type getGeometryType() final;
+    virtual Type getGeometryType() const final;
 
     /**
      * @brief getGeometryTypeAsString
      * @return
      */
-    virtual QString getGeometryTypeAsString() final;
+    virtual QString getGeometryTypeAsString() const final;
 
     /**
      * @brief getInfoString
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    virtual QString getInfoString(SIMPL::InfoStringFormat) = 0;
+    virtual QString getInfoString(SIMPL::InfoStringFormat) const = 0;
 
     /**
      * @brief getXdmfGridType
      * @return
      */
-    virtual unsigned int getXdmfGridType() final;
+    virtual unsigned int getXdmfGridType() const final;
 
     /**
      * @brief getUnitDimensionality
      * @return
      */
-    virtual unsigned int getUnitDimensionality() final;
+    virtual unsigned int getUnitDimensionality() const final;
 
     /**
      * @brief setSpatialDimensionality
@@ -370,7 +370,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief getSpatialDimensionality
      * @return
      */
-    virtual unsigned int getSpatialDimensionality() final;
+    virtual unsigned int getSpatialDimensionality() const final;
 
     /**
      * @brief writeGeometryToHDF5
@@ -378,7 +378,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @param writeXdmf
      * @return
      */
-    virtual int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) = 0;
+    virtual int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const = 0;
 
     /**
      * @brief writeXdmf
@@ -387,7 +387,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @param hdfFileName
      * @return
      */
-    virtual int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) = 0;
+    virtual int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const = 0;
 
     /**
      * @brief readGeometryFromHDF5
@@ -401,7 +401,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @brief deepCopy
      * @return
      */
-    virtual Pointer deepCopy(bool forceNoAllocate = false) = 0;
+    virtual Pointer deepCopy(bool forceNoAllocate = false) const = 0;
 
     /**
      * @brief initializeWithZeros
@@ -418,7 +418,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
      * @param name
      * @return
      */
-    virtual AttributeMatrix::Pointer getAttributeMatrix(const QString& name) final;
+    virtual AttributeMatrix::Pointer getAttributeMatrix(const QString& name) const final;
 
     /**
      * @brief removeAttributeMatrix
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index 00ec23d7da..b1323c8f05 100755
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @brief getVertices
      * @return
      */
-    virtual SharedVertexList::Pointer getVertices() = 0;
+    virtual SharedVertexList::Pointer getVertices() const = 0;
 
     /**
      * @brief setCoords
@@ -87,20 +87,20 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param vertId
      * @param coords
      */
-    virtual void getCoords(size_t vertId, float coords[3]) = 0;
+    virtual void getCoords(size_t vertId, float coords[3]) const = 0;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    virtual float* getVertexPointer(size_t i) = 0;
+    virtual float* getVertexPointer(size_t i) const = 0;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    virtual size_t getNumberOfVertices() = 0;
+    virtual size_t getNumberOfVertices() const = 0;
 
     // -----------------------------------------------------------------------------
     // Inherited from SharedEdgeOps
@@ -116,7 +116,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @brief getEdges
      * @return
      */
-    virtual SharedEdgeList::Pointer getEdges() = 0;
+    virtual SharedEdgeList::Pointer getEdges() const = 0;
 
     /**
      * @brief setVerts
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param edgeId
      * @param verts
      */
-    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
+    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -138,20 +138,20 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @param vert1
      * @param vert2
      */
-    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) = 0;
+    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    virtual size_t* getEdgePointer(size_t i) = 0;
+    virtual size_t* getEdgePointer(size_t i) const = 0;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    virtual size_t getNumberOfEdges() = 0;
+    virtual size_t getNumberOfEdges() const = 0;
 
     // -----------------------------------------------------------------------------
     // Connectivity
@@ -181,7 +181,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
      * @brief getUnsharedEdges
      * @return
      */
-    virtual SharedEdgeList::Pointer getUnsharedEdges() = 0;
+    virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
 
     /**
      * @brief deleteUnsharedEdges
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
index 7dbdb747dd..f3e4171c23 100755
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @brief getVertices
      * @return
      */
-    virtual SharedVertexList::Pointer getVertices() = 0;
+    virtual SharedVertexList::Pointer getVertices() const = 0;
 
     /**
      * @brief setCoords
@@ -86,20 +86,20 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param vertId
      * @param coords
      */
-    virtual void getCoords(size_t vertId, float coords[3]) = 0;
+    virtual void getCoords(size_t vertId, float coords[3]) const = 0;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    virtual float* getVertexPointer(size_t i) = 0;
+    virtual float* getVertexPointer(size_t i) const = 0;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    virtual size_t getNumberOfVertices() = 0;
+    virtual size_t getNumberOfVertices() const = 0;
 
     // -----------------------------------------------------------------------------
     // Inherited from SharedEdgeOps
@@ -115,7 +115,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @brief getEdges
      * @return
      */
-    virtual SharedEdgeList::Pointer getEdges() = 0;
+    virtual SharedEdgeList::Pointer getEdges() const = 0;
 
     /**
      * @brief setVerts
@@ -129,7 +129,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param edgeId
      * @param verts
      */
-    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
+    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -137,20 +137,20 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @param vert1
      * @param vert2
      */
-    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) = 0;
+    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    virtual size_t* getEdgePointer(size_t i) = 0;
+    virtual size_t* getEdgePointer(size_t i) const = 0;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    virtual size_t getNumberOfEdges() = 0;
+    virtual size_t getNumberOfEdges() const = 0;
 
     // -----------------------------------------------------------------------------
     // Connectivity
@@ -191,7 +191,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @brief getUnsharedEdges
      * @return
      */
-    virtual SharedEdgeList::Pointer getUnsharedEdges() = 0;
+    virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
 
     /**
      * @brief deleteUnsharedEdges
@@ -207,7 +207,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
      * @brief getUnsharedFaces
      * @return
      */
-    virtual SharedEdgeList::Pointer getUnsharedFaces() = 0;
+    virtual SharedEdgeList::Pointer getUnsharedFaces() const = 0;
 
     /**
      * @brief deleteUnsharedFaces
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index f9925ea986..95fc2dacd1 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -60,25 +60,25 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
     virtual void setDimensions(const SizeVec3Type& dims) = 0;
     virtual SizeVec3Type getDimensions() const = 0;
 
-    virtual size_t getXPoints() = 0;
-    virtual size_t getYPoints() = 0;
-    virtual size_t getZPoints() = 0;
+    virtual size_t getXPoints() const = 0;
+    virtual size_t getYPoints() const = 0;
+    virtual size_t getZPoints() const = 0;
     
-    virtual void getPlaneCoords(size_t idx[3], float coords[3]) = 0;
-    virtual void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) = 0;
-    virtual void getPlaneCoords(size_t idx, float coords[3]) = 0;
+    virtual void getPlaneCoords(size_t idx[3], float coords[3]) const = 0;
+    virtual void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
+    virtual void getPlaneCoords(size_t idx, float coords[3]) const = 0;
     
-    virtual void getPlaneCoords(size_t idx[3], double coords[3]) = 0;
-    virtual void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) = 0;
-    virtual void getPlaneCoords(size_t idx, double coords[3]) = 0;
+    virtual void getPlaneCoords(size_t idx[3], double coords[3]) const = 0;
+    virtual void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
+    virtual void getPlaneCoords(size_t idx, double coords[3]) const = 0;
 
-    virtual void getCoords(size_t idx[3], float coords[3]) = 0;
-    virtual void getCoords(size_t x, size_t y, size_t z, float coords[3]) = 0;
-    virtual void getCoords(size_t idx, float coords[3]) = 0;
+    virtual void getCoords(size_t idx[3], float coords[3]) const = 0;
+    virtual void getCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
+    virtual void getCoords(size_t idx, float coords[3]) const = 0;
     
-    virtual void getCoords(size_t idx[3], double coords[3]) = 0;
-    virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) = 0;
-    virtual void getCoords(size_t idx, double coords[3]) = 0;
+    virtual void getCoords(size_t idx[3], double coords[3]) const = 0;
+    virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
+    virtual void getCoords(size_t idx, double coords[3]) const = 0;
 
   public:
     IGeometryGrid(const IGeometryGrid&) = delete;  // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 2acc0fbb61..00ed3c2864 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -509,7 +509,7 @@ void ImageGeom::getBoundingBox(float* boundingBox)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec6Type ImageGeom::getBoundingBox()
+FloatVec6Type ImageGeom::getBoundingBox() const
 {
   return FloatVec6Type(m_Origin[0], m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]), m_Origin[1], m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]), m_Origin[2],
                        m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]));
@@ -518,7 +518,7 @@ FloatVec6Type ImageGeom::getBoundingBox()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t ImageGeom::getXPoints() 
+size_t ImageGeom::getXPoints() const
 {
   return m_Dimensions[0];
 }
@@ -526,7 +526,7 @@ size_t ImageGeom::getXPoints()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t ImageGeom::getYPoints() 
+size_t ImageGeom::getYPoints() const
 { 
   return m_Dimensions[1];
 }
@@ -534,7 +534,7 @@ size_t ImageGeom::getYPoints()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t ImageGeom::getZPoints() 
+size_t ImageGeom::getZPoints() const
 {
   return m_Dimensions[2];
 }
@@ -542,7 +542,7 @@ size_t ImageGeom::getZPoints()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t idx[3], float coords[3])
+void ImageGeom::getPlaneCoords(size_t idx[3], float coords[3]) const
 {
   coords[0] = idx[0] * m_Spacing[0] + m_Origin[0];
   coords[1] = idx[1] * m_Spacing[1] + m_Origin[1];
@@ -552,7 +552,7 @@ void ImageGeom::getPlaneCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3])
+void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const
 {
   coords[0] = x * m_Spacing[0] + m_Origin[0];
   coords[1] = y * m_Spacing[1] + m_Origin[1];
@@ -562,7 +562,7 @@ void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t idx, float coords[3])
+void ImageGeom::getPlaneCoords(size_t idx, float coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -576,7 +576,7 @@ void ImageGeom::getPlaneCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
+void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3]) const
 {
   coords[0] = static_cast<double>(idx[0]) * m_Spacing[0] + m_Origin[0];
   coords[1] = static_cast<double>(idx[1]) * m_Spacing[1] + m_Origin[1];
@@ -586,7 +586,7 @@ void ImageGeom::getPlaneCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3])
+void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const
 {
   coords[0] = static_cast<double>(x) * m_Spacing[0] + m_Origin[0];
   coords[1] = static_cast<double>(y) * m_Spacing[1] + m_Origin[1];
@@ -596,7 +596,7 @@ void ImageGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getPlaneCoords(size_t idx, double coords[3])
+void ImageGeom::getPlaneCoords(size_t idx, double coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -610,7 +610,7 @@ void ImageGeom::getPlaneCoords(size_t idx, double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t idx[3], float coords[3])
+void ImageGeom::getCoords(size_t idx[3], float coords[3]) const
 {
   coords[0] = idx[0] * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]);
   coords[1] = idx[1] * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]);
@@ -620,7 +620,7 @@ void ImageGeom::getCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t x, size_t y, size_t z, float coords[3])
+void ImageGeom::getCoords(size_t x, size_t y, size_t z, float coords[3]) const
 {
   coords[0] = x * m_Spacing[0] + m_Origin[0] + (0.5f * m_Spacing[0]);
   coords[1] = y * m_Spacing[1] + m_Origin[1] + (0.5f * m_Spacing[1]);
@@ -630,7 +630,7 @@ void ImageGeom::getCoords(size_t x, size_t y, size_t z, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t idx, float coords[3])
+void ImageGeom::getCoords(size_t idx, float coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -644,7 +644,7 @@ void ImageGeom::getCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t idx[3], double coords[3])
+void ImageGeom::getCoords(size_t idx[3], double coords[3]) const
 {
   coords[0] = static_cast<double>(idx[0]) * m_Spacing[0] + m_Origin[0] + (0.5 * m_Spacing[0]);
   coords[1] = static_cast<double>(idx[1]) * m_Spacing[1] + m_Origin[1] + (0.5 * m_Spacing[1]);
@@ -654,7 +654,7 @@ void ImageGeom::getCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
+void ImageGeom::getCoords(size_t x, size_t y, size_t z, double coords[3]) const
 {
   coords[0] = static_cast<double>(x) * m_Spacing[0] + m_Origin[0] + (0.5 * m_Spacing[0]);
   coords[1] = static_cast<double>(y) * m_Spacing[1] + m_Origin[1] + (0.5 * m_Spacing[1]);
@@ -664,7 +664,7 @@ void ImageGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getCoords(size_t idx, double coords[3])
+void ImageGeom::getCoords(size_t idx, double coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -712,7 +712,7 @@ void ImageGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t ImageGeom::getNumberOfElements()
+size_t ImageGeom::getNumberOfElements() const
 {
   return (m_Dimensions[0] * m_Dimensions[1] * m_Dimensions[2]);
 }
@@ -728,7 +728,7 @@ int ImageGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer ImageGeom::getElementsContainingVert()
+ElementDynamicList::Pointer ImageGeom::getElementsContainingVert() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -758,7 +758,7 @@ int ImageGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer ImageGeom::getElementNeighbors()
+ElementDynamicList::Pointer ImageGeom::getElementNeighbors() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -788,7 +788,7 @@ int ImageGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer ImageGeom::getElementCentroids()
+FloatArrayType::Pointer ImageGeom::getElementCentroids() const
 {
   return FloatArrayType::NullPointer();
 }
@@ -826,7 +826,7 @@ int ImageGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer ImageGeom::getElementSizes()
+FloatArrayType::Pointer ImageGeom::getElementSizes() const
 {
   return m_VoxelSizes;
 }
@@ -850,7 +850,7 @@ void ImageGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getParametricCenter(double pCoords[3])
+void ImageGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.5;
   pCoords[1] = 0.5;
@@ -860,7 +860,7 @@ void ImageGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ImageGeom::getShapeFunctions(double pCoords[3], double* shape)
+void ImageGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   double rm = 0.0;
   double sm = 0.0;
@@ -930,7 +930,7 @@ void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType:
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
@@ -972,7 +972,7 @@ int ImageGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -1009,7 +1009,7 @@ int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -1077,7 +1077,7 @@ int ImageGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate) const
 {
   ImageGeom::Pointer imageCopy = ImageGeom::CreateGeometry(getName());
 
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index d4bf924c18..d778ca815a 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -121,7 +121,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @param boundingBox The bounding box will be stored in the input argument in the following order:
    * xMin, xMax, yMin, yMax, zMin, zMax
    */
-  FloatVec6Type getBoundingBox();
+  FloatVec6Type getBoundingBox() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getNumberOfElements
    * @return
    */
-  size_t getNumberOfElements() override;
+  size_t getNumberOfElements() const override;
 
   /**
    * @brief findElementSizes
@@ -148,7 +148,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getElementSizes
    * @return
    */
-  FloatArrayType::Pointer getElementSizes() override;
+  FloatArrayType::Pointer getElementSizes() const override;
 
   /**
    * @brief deleteElementSizes
@@ -165,7 +165,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getElementsContainingVert
    * @return
    */
-  ElementDynamicList::Pointer getElementsContainingVert() override;
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
 
   /**
    * @brief deleteElementsContainingVert
@@ -182,7 +182,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getElementNeighbors
    * @return
    */
-  ElementDynamicList::Pointer getElementNeighbors() override;
+  ElementDynamicList::Pointer getElementNeighbors() const override;
 
   /**
    * @brief deleteElementNeighbors
@@ -199,7 +199,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getElementCentroids
    * @return
    */
-  FloatArrayType::Pointer getElementCentroids() override;
+  FloatArrayType::Pointer getElementCentroids() const override;
 
   /**
    * @brief deleteElementCentroids
@@ -210,14 +210,14 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief getParametricCenter
    * @param pCoords
    */
-  void getParametricCenter(double pCoords[3]) override;
+  void getParametricCenter(double pCoords[3]) const override;
 
   /**
    * @brief getShapeFunctions
    * @param pCoords
    * @param shape
    */
-  void getShapeFunctions(double pCoords[3], double* shape) override;
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
 
   /**
    * @brief findDerivatives
@@ -231,7 +231,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief writeGeometryToHDF5
@@ -239,7 +239,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @param writeXdmf
    * @return
    */
-  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
   /**
    * @brief writeXdmf
@@ -248,7 +248,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @param hdfFileName
    * @return
    */
-  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
   /**
    * @brief readGeometryFromHDF5
@@ -262,7 +262,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    * @brief deepCopy
    * @return
    */
-  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief addOrReplaceAttributeMatrix
@@ -277,25 +277,25 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   void setDimensions(const SizeVec3Type& dims) override;
   void setDimensions(size_t x, size_t y, size_t z);
 
-  size_t getXPoints() override;
-  size_t getYPoints() override;
-  size_t getZPoints() override;
+  size_t getXPoints() const override;
+  size_t getYPoints() const override;
+  size_t getZPoints() const override;
 
-  void getPlaneCoords(size_t idx[3], float coords[3]) override;
-  void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) override;
-  void getPlaneCoords(size_t idx, float coords[3]) override;
+  void getPlaneCoords(size_t idx[3], float coords[3]) const override;
+  void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+  void getPlaneCoords(size_t idx, float coords[3]) const override;
 
-  void getPlaneCoords(size_t idx[3], double coords[3]) override;
-  void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) override;
-  void getPlaneCoords(size_t idx, double coords[3]) override;
+  void getPlaneCoords(size_t idx[3], double coords[3]) const override;
+  void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+  void getPlaneCoords(size_t idx, double coords[3]) const override;
 
-  void getCoords(size_t idx[3], float coords[3]) override;
-  void getCoords(size_t x, size_t y, size_t z, float coords[3]) override;
-  void getCoords(size_t idx, float coords[3]) override;
+  void getCoords(size_t idx[3], float coords[3]) const override;
+  void getCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+  void getCoords(size_t idx, float coords[3]) const override;
 
-  void getCoords(size_t idx[3], double coords[3]) override;
-  void getCoords(size_t x, size_t y, size_t z, double coords[3]) override;
-  void getCoords(size_t idx, double coords[3]) override;
+  void getCoords(size_t idx[3], double coords[3]) const override;
+  void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+  void getCoords(size_t idx, double coords[3]) const override;
 
   // -----------------------------------------------------------------------------
   // Misc. ImageGeometry Methods
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index acb32c0cf7..2981981201 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -223,7 +223,7 @@ void QuadGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t QuadGeom::getNumberOfElements()
+size_t QuadGeom::getNumberOfElements() const
 {
   return m_QuadList->getNumberOfTuples();
 }
@@ -267,7 +267,7 @@ int QuadGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer QuadGeom::getElementsContainingVert()
+ElementDynamicList::Pointer QuadGeom::getElementsContainingVert() const
 {
   return m_QuadsContainingVert;
 }
@@ -314,7 +314,7 @@ int QuadGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer QuadGeom::getElementNeighbors()
+ElementDynamicList::Pointer QuadGeom::getElementNeighbors() const
 {
   return m_QuadNeighbors;
 }
@@ -353,7 +353,7 @@ int QuadGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer QuadGeom::getElementCentroids()
+FloatArrayType::Pointer QuadGeom::getElementCentroids() const
 {
   return m_QuadCentroids;
 }
@@ -392,7 +392,7 @@ int QuadGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //z
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer QuadGeom::getElementSizes()
+FloatArrayType::Pointer QuadGeom::getElementSizes() const
 {
   return m_QuadSizes;
 }
@@ -431,7 +431,7 @@ int QuadGeom::findUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer QuadGeom::getUnsharedEdges()
+SharedEdgeList::Pointer QuadGeom::getUnsharedEdges() const
 {
   return m_UnsharedEdgeList;
 }
@@ -455,7 +455,7 @@ void QuadGeom::deleteUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QuadGeom::getParametricCenter(double pCoords[3])
+void QuadGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.5;
   pCoords[1] = 0.5;
@@ -465,7 +465,7 @@ void QuadGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QuadGeom::getShapeFunctions(double pCoords[3], double* shape)
+void QuadGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   double rm = 0.0;
   double sm = 0.0;
@@ -504,7 +504,7 @@ void QuadGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int QuadGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int QuadGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
 
@@ -588,7 +588,7 @@ int QuadGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int QuadGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int QuadGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -640,7 +640,7 @@ int QuadGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString QuadGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString QuadGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -724,7 +724,7 @@ int QuadGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer QuadGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer QuadGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedQuadList::Pointer quads = std::dynamic_pointer_cast<SharedQuadList>((getQuads().get() == nullptr) ? nullptr : getQuads()->deepCopy(forceNoAllocate));
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 4ca83633af..0d0e650f85 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -141,7 +141,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getQuads
    * @return
    */
-  SharedQuadList::Pointer getQuads();
+  SharedQuadList::Pointer getQuads() const;
 
   /**
    * @brief setVertsAtQuad
@@ -155,7 +155,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param quadId
    * @param verts
    */
-  void getVertsAtQuad(size_t quadId, size_t verts[4]);
+  void getVertsAtQuad(size_t quadId, size_t verts[4]) const;
 
   /**
    * @brief getVertCoordsAtQuad
@@ -165,20 +165,20 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vert3
    * @param vert4
    */
-  void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+  void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
 
   /**
    * @brief getPointer
    * @param i
    * @return
    */
-  size_t* getQuadPointer(size_t i);
+  size_t* getQuadPointer(size_t i) const;
 
   /**
    * @brief getNumberOfQuads
    * @return
    */
-  size_t getNumberOfQuads();
+  size_t getNumberOfQuads() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -193,7 +193,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getNumberOfElements
    * @return
    */
-  size_t getNumberOfElements() override;
+  size_t getNumberOfElements() const override;
 
   /**
    * @brief findElementSizes
@@ -205,7 +205,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getElementSizes
    * @return
    */
-  FloatArrayType::Pointer getElementSizes() override;
+  FloatArrayType::Pointer getElementSizes() const override;
 
   /**
    * @brief deleteElementSizes
@@ -222,7 +222,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getElementsContainingVert
    * @return
    */
-  ElementDynamicList::Pointer getElementsContainingVert() override;
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
 
   /**
    * @brief deleteElementsContainingVert
@@ -239,7 +239,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getElementNeighbors
    * @return
    */
-  ElementDynamicList::Pointer getElementNeighbors() override;
+  ElementDynamicList::Pointer getElementNeighbors() const override;
 
   /**
    * @brief deleteElementNeighbors
@@ -256,7 +256,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getElementCentroids
    * @return
    */
-  FloatArrayType::Pointer getElementCentroids() override;
+  FloatArrayType::Pointer getElementCentroids() const override;
 
   /**
    * @brief deleteElementCentroids
@@ -267,14 +267,14 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getParametricCenter
    * @param pCoords
    */
-  void getParametricCenter(double pCoords[3]) override;
+  void getParametricCenter(double pCoords[3]) const override;
 
   /**
    * @brief getShapeFunctions
    * @param pCoords
    * @param shape
    */
-  void getShapeFunctions(double pCoords[3], double* shape) override;
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
 
   /**
    * @brief findDerivatives
@@ -288,7 +288,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief writeGeometryToHDF5
@@ -296,7 +296,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param writeXdmf
    * @return
    */
-  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
   /**
    * @brief writeXdmf
@@ -305,7 +305,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param hdfFileName
    * @return
    */
-  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
   /**
    * @brief readGeometryFromHDF5
@@ -319,7 +319,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief deepCopy
    * @return
    */
-  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief addOrReplaceAttributeMatrix
@@ -346,7 +346,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getVertices
    * @return
    */
-  SharedVertexList::Pointer getVertices() override;
+  SharedVertexList::Pointer getVertices() const override;
 
   /**
    * @brief setCoords
@@ -360,20 +360,20 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vertId
    * @param coords
    */
-  void getCoords(size_t vertId, float coords[3]) override;
+  void getCoords(size_t vertId, float coords[3]) const override;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(size_t i) override;
+  float* getVertexPointer(size_t i) const override;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  size_t getNumberOfVertices() override;
+  size_t getNumberOfVertices() const override;
 
   /**
    * @brief resizeEdgeList
@@ -385,7 +385,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getEdges
    * @return
    */
-  SharedEdgeList::Pointer getEdges() override;
+  SharedEdgeList::Pointer getEdges() const override;
 
   /**
    * @brief setVerts
@@ -399,7 +399,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
 
   /**
    * @brief getVertCoordsAtEdge
@@ -407,20 +407,20 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  size_t* getEdgePointer(size_t i) override;
+  size_t* getEdgePointer(size_t i) const override;
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  size_t getNumberOfEdges() override;
+  size_t getNumberOfEdges() const override;
 
   /**
    * @brief findElementEdges
@@ -442,7 +442,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    * @brief getUnsharedEdges
    * @return
    */
-  SharedEdgeList::Pointer getUnsharedEdges() override;
+  SharedEdgeList::Pointer getUnsharedEdges() const override;
 
   /**
    * @brief deleteUnsharedEdges
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 95c31d4ad5..d1b4707989 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -511,17 +511,17 @@ FloatArrayType::Pointer RectGridGeom::getZBounds() const
 }
 
 // -----------------------------------------------------------------------------
-size_t RectGridGeom::getXPoints()
+size_t RectGridGeom::getXPoints() const
 {
   return m_Dimensions[0];
 }
 // -----------------------------------------------------------------------------
-size_t RectGridGeom::getYPoints()
+size_t RectGridGeom::getYPoints() const
 {
   return m_Dimensions[1];
 }
 // -----------------------------------------------------------------------------
-size_t RectGridGeom::getZPoints()
+size_t RectGridGeom::getZPoints() const
 {
   return m_Dimensions[2];
 }
@@ -529,7 +529,7 @@ size_t RectGridGeom::getZPoints()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t idx[3], float coords[3])
+void RectGridGeom::getPlaneCoords(size_t idx[3], float coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -543,7 +543,7 @@ void RectGridGeom::getPlaneCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3])
+void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -557,7 +557,7 @@ void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t idx, float coords[3])
+void RectGridGeom::getPlaneCoords(size_t idx, float coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -575,7 +575,7 @@ void RectGridGeom::getPlaneCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t idx[3], double coords[3])
+void RectGridGeom::getPlaneCoords(size_t idx[3], double coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -589,7 +589,7 @@ void RectGridGeom::getPlaneCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3])
+void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -603,7 +603,7 @@ void RectGridGeom::getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getPlaneCoords(size_t idx, double coords[3])
+void RectGridGeom::getPlaneCoords(size_t idx, double coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -621,7 +621,7 @@ void RectGridGeom::getPlaneCoords(size_t idx, double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t idx[3], float coords[3])
+void RectGridGeom::getCoords(size_t idx[3], float coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -635,7 +635,7 @@ void RectGridGeom::getCoords(size_t idx[3], float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t x, size_t y, size_t z, float coords[3])
+void RectGridGeom::getCoords(size_t x, size_t y, size_t z, float coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -649,7 +649,7 @@ void RectGridGeom::getCoords(size_t x, size_t y, size_t z, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t idx, float coords[3])
+void RectGridGeom::getCoords(size_t idx, float coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -667,7 +667,7 @@ void RectGridGeom::getCoords(size_t idx, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t idx[3], double coords[3])
+void RectGridGeom::getCoords(size_t idx[3], double coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -681,7 +681,7 @@ void RectGridGeom::getCoords(size_t idx[3], double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
+void RectGridGeom::getCoords(size_t x, size_t y, size_t z, double coords[3]) const
 {
   float* xBnds = m_xBounds->getPointer(0);
   float* yBnds = m_yBounds->getPointer(0);
@@ -695,7 +695,7 @@ void RectGridGeom::getCoords(size_t x, size_t y, size_t z, double coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getCoords(size_t idx, double coords[3])
+void RectGridGeom::getCoords(size_t idx, double coords[3]) const
 {
   size_t column = idx % m_Dimensions[0];
   size_t row = (idx / m_Dimensions[0]) % m_Dimensions[1];
@@ -748,7 +748,7 @@ void RectGridGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMat
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t RectGridGeom::getNumberOfElements()
+size_t RectGridGeom::getNumberOfElements() const
 {
   return (m_Dimensions[0] * m_Dimensions[1] * m_Dimensions[2]);
 }
@@ -764,7 +764,7 @@ int RectGridGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer RectGridGeom::getElementsContainingVert()
+ElementDynamicList::Pointer RectGridGeom::getElementsContainingVert() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -794,7 +794,7 @@ int RectGridGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer RectGridGeom::getElementNeighbors()
+ElementDynamicList::Pointer RectGridGeom::getElementNeighbors() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -824,7 +824,7 @@ int RectGridGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer RectGridGeom::getElementCentroids()
+FloatArrayType::Pointer RectGridGeom::getElementCentroids() const
 {
   return FloatArrayType::NullPointer();
 }
@@ -883,7 +883,7 @@ int RectGridGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer RectGridGeom::getElementSizes()
+FloatArrayType::Pointer RectGridGeom::getElementSizes() const
 {
   return m_VoxelSizes;
 }
@@ -907,7 +907,7 @@ void RectGridGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getParametricCenter(double pCoords[3])
+void RectGridGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.5;
   pCoords[1] = 0.5;
@@ -917,7 +917,7 @@ void RectGridGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RectGridGeom::getShapeFunctions(double pCoords[3], double* shape)
+void RectGridGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   double rm = 0.0;
   double sm = 0.0;
@@ -986,7 +986,7 @@ void RectGridGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int RectGridGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int RectGridGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
   int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
@@ -1040,7 +1040,7 @@ int RectGridGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int RectGridGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int RectGridGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -1082,7 +1082,7 @@ int RectGridGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileNam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -1124,7 +1124,7 @@ int RectGridGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer RectGridGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer RectGridGeom::deepCopy(bool forceNoAllocate) const
 {
   FloatArrayType::Pointer xBounds = std::dynamic_pointer_cast<FloatArrayType>((getXBounds().get() == nullptr) ? nullptr : getXBounds()->deepCopy(forceNoAllocate));
   FloatArrayType::Pointer yBounds = std::dynamic_pointer_cast<FloatArrayType>((getYBounds().get() == nullptr) ? nullptr : getYBounds()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 272965b88d..4f55bf9edc 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getNumberOfElements
      * @return
      */
-    size_t getNumberOfElements() override;
+    size_t getNumberOfElements() const override;
 
     /**
      * @brief findElementSizes
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getElementSizes
      * @return
      */
-    FloatArrayType::Pointer getElementSizes() override;
+    FloatArrayType::Pointer getElementSizes() const override;
 
     /**
      * @brief deleteElementSizes
@@ -107,7 +107,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getElementsContainingVert
      * @return
      */
-    ElementDynamicList::Pointer getElementsContainingVert() override;
+    ElementDynamicList::Pointer getElementsContainingVert() const override;
 
     /**
      * @brief deleteElementsContainingVert
@@ -124,7 +124,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getElementNeighbors
      * @return
      */
-    ElementDynamicList::Pointer getElementNeighbors() override;
+    ElementDynamicList::Pointer getElementNeighbors() const override;
 
     /**
      * @brief deleteElementNeighbors
@@ -141,7 +141,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getElementCentroids
      * @return
      */
-    FloatArrayType::Pointer getElementCentroids() override;
+    FloatArrayType::Pointer getElementCentroids() const override;
 
     /**
      * @brief deleteElementCentroids
@@ -152,14 +152,14 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief getParametricCenter
      * @param pCoords
      */
-    void getParametricCenter(double pCoords[3]) override;
+    void getParametricCenter(double pCoords[3]) const override;
 
     /**
      * @brief getShapeFunctions
      * @param pCoords
      * @param shape
      */
-    void getShapeFunctions(double pCoords[3], double* shape) override;
+    void getShapeFunctions(double pCoords[3], double* shape) const override;
 
     /**
      * @brief findDerivatives
@@ -173,7 +173,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    QString getInfoString(SIMPL::InfoStringFormat format) override;
+    QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
     /**
      * @brief writeGeometryToHDF5
@@ -181,7 +181,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @param writeXdmf
      * @return
      */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
     /**
      * @brief writeXdmf
@@ -190,7 +190,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @param hdfFileName
      * @return
      */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
     /**
      * @brief readGeometryFromHDF5
@@ -204,7 +204,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      * @brief deepCopy
      * @return
      */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
     /**
      * @brief addOrReplaceAttributeMatrix
@@ -217,23 +217,23 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
     void setDimensions(const SizeVec3Type& dims) override;
     SizeVec3Type getDimensions() const override;
 
-    size_t getXPoints() override;
-    size_t getYPoints() override;
-    size_t getZPoints() override;
-
-    void getPlaneCoords(size_t idx[3], float coords[3]) override;
-    void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) override;
-    void getPlaneCoords(size_t idx, float coords[3]) override;
-    void getPlaneCoords(size_t idx[3], double coords[3]) override;
-    void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) override;
-    void getPlaneCoords(size_t idx, double coords[3]) override;
-
-    void getCoords(size_t idx[3], float coords[3]) override;
-    void getCoords(size_t x, size_t y, size_t z, float coords[3]) override;
-    void getCoords(size_t idx, float coords[3]) override;
-    void getCoords(size_t idx[3], double coords[3]) override;
-    void getCoords(size_t x, size_t y, size_t z, double coords[3]) override;
-    void getCoords(size_t idx, double coords[3]) override;
+    size_t getXPoints() const override;
+    size_t getYPoints() const override;
+    size_t getZPoints() const override;
+
+    void getPlaneCoords(size_t idx[3], float coords[3]) const override;
+    void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+    void getPlaneCoords(size_t idx, float coords[3]) const override;
+    void getPlaneCoords(size_t idx[3], double coords[3]) const override;
+    void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+    void getPlaneCoords(size_t idx, double coords[3]) const override;
+
+    void getCoords(size_t idx[3], float coords[3]) const override;
+    void getCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+    void getCoords(size_t idx, float coords[3]) const override;
+    void getCoords(size_t idx[3], double coords[3]) const override;
+    void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+    void getCoords(size_t idx, double coords[3]) const override;
 
   protected:
 
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index 9ab7c9cad8..1a2cab361e 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -70,7 +70,7 @@ void GEOM_CLASS_NAME::setEdges(SharedEdgeList::Pointer edges)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer GEOM_CLASS_NAME::getEdges()
+SharedEdgeList::Pointer GEOM_CLASS_NAME::getEdges() const
 {
   return m_EdgeList;
 }
@@ -88,7 +88,7 @@ void GEOM_CLASS_NAME::setVertsAtEdge(size_t edgeId, size_t verts[2])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtEdge(size_t edgeId, size_t verts[2])
+void GEOM_CLASS_NAME::getVertsAtEdge(size_t edgeId, size_t verts[2]) const
 {
   size_t* Edge = m_EdgeList->getTuplePointer(edgeId);
   verts[0] = Edge[0];
@@ -98,7 +98,7 @@ void GEOM_CLASS_NAME::getVertsAtEdge(size_t edgeId, size_t verts[2])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3])
+void GEOM_CLASS_NAME::getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const
 {
   size_t* Edge = m_EdgeList->getTuplePointer(edgeId);
   float* tmp1 = m_VertexList->getTuplePointer(Edge[0]);
@@ -114,7 +114,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtEdge(size_t edgeId, float vert1[3], float v
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t* GEOM_CLASS_NAME::getEdgePointer(size_t i)
+size_t* GEOM_CLASS_NAME::getEdgePointer(size_t i) const
 {
   return m_EdgeList->getTuplePointer(i);
 }
@@ -122,7 +122,7 @@ size_t* GEOM_CLASS_NAME::getEdgePointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfEdges()
+size_t GEOM_CLASS_NAME::getNumberOfEdges() const
 {
   return m_EdgeList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedHexOps.cpp b/Source/SIMPLib/Geometry/SharedHexOps.cpp
index 50f21c42a5..7f5a15b424 100644
--- a/Source/SIMPLib/Geometry/SharedHexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedHexOps.cpp
@@ -35,7 +35,7 @@ void GEOM_CLASS_NAME::setHexahedra(SharedHexList::Pointer hexas)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedHexList::Pointer GEOM_CLASS_NAME::getHexahedra()
+SharedHexList::Pointer GEOM_CLASS_NAME::getHexahedra() const
 {
   return m_HexList;
 }
@@ -59,7 +59,7 @@ void GEOM_CLASS_NAME::setVertsAtHex(size_t hexId, size_t verts[8])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtHex(size_t hexId, size_t verts[8])
+void GEOM_CLASS_NAME::getVertsAtHex(size_t hexId, size_t verts[8]) const
 {
   size_t* hex = m_HexList->getTuplePointer(hexId);
   verts[0] = hex[0];
@@ -75,7 +75,7 @@ void GEOM_CLASS_NAME::getVertsAtHex(size_t hexId, size_t verts[8])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3])
+void GEOM_CLASS_NAME::getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]) const
 {
   size_t* hex = m_HexList->getTuplePointer(hexId);
   float* tmp1 = m_VertexList->getTuplePointer(hex[0]);
@@ -115,7 +115,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtHex(size_t hexId, float vert1[3], float ver
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t* GEOM_CLASS_NAME::getHexPointer(size_t i)
+size_t* GEOM_CLASS_NAME::getHexPointer(size_t i) const
 {
   return m_HexList->getTuplePointer(i);
 }
@@ -123,7 +123,7 @@ size_t* GEOM_CLASS_NAME::getHexPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfHexas()
+size_t GEOM_CLASS_NAME::getNumberOfHexas() const
 {
   return m_HexList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index c548d7657c..65fd75338e 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -70,7 +70,7 @@ void GEOM_CLASS_NAME::setQuads(SharedQuadList::Pointer quads)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedQuadList::Pointer GEOM_CLASS_NAME::getQuads()
+SharedQuadList::Pointer GEOM_CLASS_NAME::getQuads() const
 {
   return m_QuadList;
 }
@@ -90,7 +90,7 @@ void GEOM_CLASS_NAME::setVertsAtQuad(size_t quadId, size_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtQuad(size_t quadId, size_t verts[4])
+void GEOM_CLASS_NAME::getVertsAtQuad(size_t quadId, size_t verts[4]) const
 {
   size_t* Quad = m_QuadList->getTuplePointer(quadId);
   verts[0] = Quad[0];
@@ -102,7 +102,7 @@ void GEOM_CLASS_NAME::getVertsAtQuad(size_t quadId, size_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
+void GEOM_CLASS_NAME::getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const
 {
   size_t* Quad = m_QuadList->getTuplePointer(quadId);
   float* tmp1 = m_VertexList->getTuplePointer(Quad[0]);
@@ -126,7 +126,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtQuad(size_t quadId, float vert1[3], float v
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t* GEOM_CLASS_NAME::getQuadPointer(size_t i)
+size_t* GEOM_CLASS_NAME::getQuadPointer(size_t i) const
 {
   return m_QuadList->getTuplePointer(i);
 }
@@ -134,7 +134,7 @@ size_t* GEOM_CLASS_NAME::getQuadPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfQuads()
+size_t GEOM_CLASS_NAME::getNumberOfQuads() const
 {
   return m_QuadList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index b3bc6adfd4..a1b86373b5 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -70,7 +70,7 @@ void GEOM_CLASS_NAME::setTetrahedra(SharedTetList::Pointer tets)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedTetList::Pointer GEOM_CLASS_NAME::getTetrahedra()
+SharedTetList::Pointer GEOM_CLASS_NAME::getTetrahedra() const
 {
   return m_TetList;
 }
@@ -90,7 +90,7 @@ void GEOM_CLASS_NAME::setVertsAtTet(size_t tetId, size_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtTet(size_t tetId, size_t verts[4])
+void GEOM_CLASS_NAME::getVertsAtTet(size_t tetId, size_t verts[4]) const
 {
   size_t* tet = m_TetList->getTuplePointer(tetId);
   verts[0] = tet[0];
@@ -102,7 +102,7 @@ void GEOM_CLASS_NAME::getVertsAtTet(size_t tetId, size_t verts[4])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3])
+void GEOM_CLASS_NAME::getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const
 {
   size_t* tet = m_TetList->getTuplePointer(tetId);
   float* tmp1 = m_VertexList->getTuplePointer(tet[0]);
@@ -126,7 +126,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtTet(size_t tetId, float vert1[3], float ver
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t* GEOM_CLASS_NAME::getTetPointer(size_t i)
+size_t* GEOM_CLASS_NAME::getTetPointer(size_t i) const
 {
   return m_TetList->getTuplePointer(i);
 }
@@ -134,7 +134,7 @@ size_t* GEOM_CLASS_NAME::getTetPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfTets()
+size_t GEOM_CLASS_NAME::getNumberOfTets() const
 {
   return m_TetList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index 3fb684233a..7a94361269 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -70,7 +70,7 @@ void GEOM_CLASS_NAME::setTriangles(SharedTriList::Pointer triangles)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedTriList::Pointer GEOM_CLASS_NAME::getTriangles()
+SharedTriList::Pointer GEOM_CLASS_NAME::getTriangles() const
 {
   return m_TriList;
 }
@@ -89,7 +89,7 @@ void GEOM_CLASS_NAME::setVertsAtTri(size_t triId, size_t verts[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertsAtTri(size_t triId, size_t verts[3])
+void GEOM_CLASS_NAME::getVertsAtTri(size_t triId, size_t verts[3]) const
 {
   size_t* Tri = m_TriList->getTuplePointer(triId);
   verts[0] = Tri[0];
@@ -100,7 +100,7 @@ void GEOM_CLASS_NAME::getVertsAtTri(size_t triId, size_t verts[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3])
+void GEOM_CLASS_NAME::getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]) const
 {
   size_t* Tri = m_TriList->getTuplePointer(triId);
   float* tmp1 = m_VertexList->getTuplePointer(Tri[0]);
@@ -120,7 +120,7 @@ void GEOM_CLASS_NAME::getVertCoordsAtTri(size_t triId, float vert1[3], float ver
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t* GEOM_CLASS_NAME::getTriPointer(size_t i)
+size_t* GEOM_CLASS_NAME::getTriPointer(size_t i) const
 {
   return m_TriList->getTuplePointer(i);
 }
@@ -128,7 +128,7 @@ size_t* GEOM_CLASS_NAME::getTriPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfTris()
+size_t GEOM_CLASS_NAME::getNumberOfTris() const
 {
   return m_TriList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index cd9a323a80..7913453078 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -70,7 +70,7 @@ void GEOM_CLASS_NAME::setVertices(SharedVertexList::Pointer vertices)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedVertexList::Pointer GEOM_CLASS_NAME::getVertices()
+SharedVertexList::Pointer GEOM_CLASS_NAME::getVertices() const
 {
   return m_VertexList;
 }
@@ -89,7 +89,7 @@ void GEOM_CLASS_NAME::setCoords(size_t vertId, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GEOM_CLASS_NAME::getCoords(size_t vertId, float coords[3])
+void GEOM_CLASS_NAME::getCoords(size_t vertId, float coords[3]) const
 {
   float* Vert = m_VertexList->getTuplePointer(vertId);
   coords[0] = Vert[0];
@@ -100,7 +100,7 @@ void GEOM_CLASS_NAME::getCoords(size_t vertId, float coords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-float* GEOM_CLASS_NAME::getVertexPointer(size_t i)
+float* GEOM_CLASS_NAME::getVertexPointer(size_t i) const
 {
   return m_VertexList->getTuplePointer(i);
 }
@@ -108,7 +108,7 @@ float* GEOM_CLASS_NAME::getVertexPointer(size_t i)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t GEOM_CLASS_NAME::getNumberOfVertices()
+size_t GEOM_CLASS_NAME::getNumberOfVertices() const
 {
   return m_VertexList->getNumberOfTuples();
 }
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 584dbcac20..89c08da5a8 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -234,7 +234,7 @@ void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, Attribute
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t TetrahedralGeom::getNumberOfElements()
+size_t TetrahedralGeom::getNumberOfElements() const
 {
   return m_TetList->getNumberOfTuples();
 }
@@ -300,7 +300,7 @@ int TetrahedralGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer TetrahedralGeom::getElementsContainingVert()
+ElementDynamicList::Pointer TetrahedralGeom::getElementsContainingVert() const
 {
   return m_TetsContainingVert;
 }
@@ -347,7 +347,7 @@ int TetrahedralGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer TetrahedralGeom::getElementNeighbors()
+ElementDynamicList::Pointer TetrahedralGeom::getElementNeighbors() const
 {
   return m_TetNeighbors;
 }
@@ -386,7 +386,7 @@ int TetrahedralGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer TetrahedralGeom::getElementCentroids()
+FloatArrayType::Pointer TetrahedralGeom::getElementCentroids() const
 {
   return m_TetCentroids;
 }
@@ -426,7 +426,7 @@ int TetrahedralGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer TetrahedralGeom::getElementSizes()
+FloatArrayType::Pointer TetrahedralGeom::getElementSizes() const
 {
   return m_TetSizes;
 }
@@ -465,7 +465,7 @@ int TetrahedralGeom::findUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer TetrahedralGeom::getUnsharedEdges()
+SharedEdgeList::Pointer TetrahedralGeom::getUnsharedEdges() const
 {
   return m_UnsharedEdgeList;
 }
@@ -504,7 +504,7 @@ int TetrahedralGeom::findUnsharedFaces()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedTriList::Pointer TetrahedralGeom::getUnsharedFaces()
+SharedTriList::Pointer TetrahedralGeom::getUnsharedFaces() const
 {
   return m_UnsharedTriList;
 }
@@ -528,7 +528,7 @@ void TetrahedralGeom::deleteUnsharedFaces()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TetrahedralGeom::getParametricCenter(double pCoords[3])
+void TetrahedralGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.25;
   pCoords[1] = 0.25;
@@ -538,7 +538,7 @@ void TetrahedralGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TetrahedralGeom::getShapeFunctions(double pCoords[3], double* shape)
+void TetrahedralGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   (void)pCoords;
 
@@ -582,7 +582,7 @@ void TetrahedralGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArra
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int TetrahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int TetrahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
 
@@ -684,7 +684,7 @@ int TetrahedralGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(wri
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int TetrahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int TetrahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -737,7 +737,7 @@ int TetrahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFile
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString TetrahedralGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString TetrahedralGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -834,7 +834,7 @@ int TetrahedralGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer TetrahedralGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer TetrahedralGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedTetList::Pointer tets = std::dynamic_pointer_cast<SharedTetList>((getTetrahedra().get() == nullptr) ? nullptr : getTetrahedra()->deepCopy(forceNoAllocate));
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 23777f7d5a..20dfaca575 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -118,7 +118,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getTriangles
      * @return
      */
-    SharedTriList::Pointer getTriangles();
+    SharedTriList::Pointer getTriangles() const;
 
     /**
      * @brief setVertsAtTri
@@ -132,7 +132,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param triId
      * @param verts
      */
-    void getVertsAtTri(size_t triId, size_t verts[3]);
+    void getVertsAtTri(size_t triId, size_t verts[3]) const;
 
     /**
      * @brief getVertCoordsAtTri
@@ -141,20 +141,20 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert2
      * @param vert3
      */
-    void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]);
+    void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]) const;
 
     /**
      * @brief getTriPointer
      * @param i
      * @return
      */
-    size_t* getTriPointer(size_t i);
+    size_t* getTriPointer(size_t i) const;
 
     /**
      * @brief getNumberOfTris
      * @return
      */
-    size_t getNumberOfTris();
+    size_t getNumberOfTris() const;
 
     // -----------------------------------------------------------------------------
     // Inherited from SharedTetOps
@@ -183,7 +183,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
     * @brief getTetrahedra
     * @return
     */
-    SharedTetList::Pointer getTetrahedra();
+    SharedTetList::Pointer getTetrahedra() const;
 
     /**
      * @brief setVertsAtTet
@@ -197,7 +197,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param tetId
      * @param verts
      */
-    void getVertsAtTet(size_t tetId, size_t verts[4]);
+    void getVertsAtTet(size_t tetId, size_t verts[4]) const;
 
     /**
      * @brief getVertCoordsAtTet
@@ -206,20 +206,20 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert2
      * @param vert3
      */
-    void getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]);
+    void getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
 
     /**
      * @brief getTetPointer
      * @param i
      * @return
      */
-    size_t* getTetPointer(size_t i);
+    size_t* getTetPointer(size_t i) const;
 
     /**
      * @brief getNumberOfTets
      * @return
      */
-    size_t getNumberOfTets();
+    size_t getNumberOfTets() const;
 
     // -----------------------------------------------------------------------------
     // Inherited from IGeometry
@@ -234,7 +234,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getNumberOfElements
      * @return
      */
-    size_t getNumberOfElements() override;
+    size_t getNumberOfElements() const override;
 
     /**
      * @brief findElementSizes
@@ -246,7 +246,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getElementSizes
      * @return
      */
-    FloatArrayType::Pointer getElementSizes() override;
+    FloatArrayType::Pointer getElementSizes() const override;
 
     /**
      * @brief deleteElementSizes
@@ -263,7 +263,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getElementsContainingVert
      * @return
      */
-    ElementDynamicList::Pointer getElementsContainingVert() override;
+    ElementDynamicList::Pointer getElementsContainingVert() const override;
 
     /**
      * @brief deleteElementsContainingVert
@@ -280,7 +280,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getElementNeighbors
      * @return
      */
-    ElementDynamicList::Pointer getElementNeighbors() override;
+    ElementDynamicList::Pointer getElementNeighbors() const override;
 
     /**
      * @brief deleteElementNeighbors
@@ -297,7 +297,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getElementCentroids
      * @return
      */
-    FloatArrayType::Pointer getElementCentroids() override;
+    FloatArrayType::Pointer getElementCentroids() const override;
 
     /**
      * @brief deleteElementCentroids
@@ -308,14 +308,14 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getParametricCenter
      * @param pCoords
      */
-    void getParametricCenter(double pCoords[3]) override;
+    void getParametricCenter(double pCoords[3]) const override;
 
     /**
      * @brief getShapeFunctions
      * @param pCoords
      * @param shape
      */
-    void getShapeFunctions(double pCoords[3], double* shape) override;
+    void getShapeFunctions(double pCoords[3], double* shape) const override;
 
     /**
      * @brief findDerivatives
@@ -329,7 +329,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @return Returns a formatted string that contains general infomation about
      * the instance of the object.
      */
-    QString getInfoString(SIMPL::InfoStringFormat format) override;
+    QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
     /**
      * @brief writeGeometryToHDF5
@@ -337,7 +337,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param writeXdmf
      * @return
      */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
     /**
      * @brief writeXdmf
@@ -346,7 +346,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param hdfFileName
      * @return
      */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
     /**
      * @brief readGeometryFromHDF5
@@ -360,7 +360,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief deepCopy
      * @return
      */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
     /**
      * @brief addOrReplaceAttributeMatrix
@@ -387,7 +387,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getVertices
      * @return
      */
-    SharedVertexList::Pointer getVertices() override;
+    SharedVertexList::Pointer getVertices() const override;
 
     /**
      * @brief setCoords
@@ -401,20 +401,20 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vertId
      * @param coords
      */
-    void getCoords(size_t vertId, float coords[3]) override;
+    void getCoords(size_t vertId, float coords[3]) const override;
 
     /**
      * @brief getVertexPointer
      * @param i
      * @return
      */
-    float* getVertexPointer(size_t i) override;
+    float* getVertexPointer(size_t i) const override;
 
     /**
      * @brief getNumberOfVertices
      * @return
      */
-    size_t getNumberOfVertices() override;
+    size_t getNumberOfVertices() const override;
 
     /**
      * @brief resizeEdgeList
@@ -426,7 +426,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getEdges
      * @return
      */
-    SharedEdgeList::Pointer getEdges() override;
+    SharedEdgeList::Pointer getEdges() const override;
 
     /**
      * @brief setVerts
@@ -440,7 +440,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param edgeId
      * @param verts
      */
-    void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+    void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
 
     /**
      * @brief getVertCoordsAtEdge
@@ -448,20 +448,20 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @param vert1
      * @param vert2
      */
-    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
+    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
 
     /**
      * @brief getEdgePointer
      * @param i
      * @return
      */
-    size_t* getEdgePointer(size_t i) override;
+    size_t* getEdgePointer(size_t i) const override;
 
     /**
      * @brief getNumberOfEdges
      * @return
      */
-    size_t getNumberOfEdges() override;
+    size_t getNumberOfEdges() const override;
 
     /**
      * @brief findElementEdges
@@ -494,7 +494,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getUnsharedEdges
      * @return
      */
-    SharedEdgeList::Pointer getUnsharedEdges() override;
+    SharedEdgeList::Pointer getUnsharedEdges() const override;
 
     /**
      * @brief deleteUnsharedEdges
@@ -510,7 +510,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      * @brief getUnsharedFaces
      * @return
      */
-    SharedEdgeList::Pointer getUnsharedFaces() override;
+    SharedEdgeList::Pointer getUnsharedFaces() const override;
 
     /**
      * @brief deleteUnsharedFaces
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 9d68265240..1d25bcc3a8 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -222,7 +222,7 @@ void TriangleGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMat
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t TriangleGeom::getNumberOfElements()
+size_t TriangleGeom::getNumberOfElements() const
 {
   return m_TriList->getNumberOfTuples();
 }
@@ -266,7 +266,7 @@ int TriangleGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer TriangleGeom::getElementsContainingVert()
+ElementDynamicList::Pointer TriangleGeom::getElementsContainingVert() const
 {
   return m_TrianglesContainingVert;
 }
@@ -313,7 +313,7 @@ int TriangleGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer TriangleGeom::getElementNeighbors()
+ElementDynamicList::Pointer TriangleGeom::getElementNeighbors() const
 {
   return m_TriangleNeighbors;
 }
@@ -352,7 +352,7 @@ int TriangleGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer TriangleGeom::getElementCentroids()
+FloatArrayType::Pointer TriangleGeom::getElementCentroids() const
 {
   return m_TriangleCentroids;
 }
@@ -391,7 +391,7 @@ int TriangleGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer TriangleGeom::getElementSizes()
+FloatArrayType::Pointer TriangleGeom::getElementSizes() const
 {
   return m_TriangleSizes;
 }
@@ -430,7 +430,7 @@ int TriangleGeom::findUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SharedEdgeList::Pointer TriangleGeom::getUnsharedEdges()
+SharedEdgeList::Pointer TriangleGeom::getUnsharedEdges() const
 {
   return m_UnsharedEdgeList;
 }
@@ -454,7 +454,7 @@ void TriangleGeom::deleteUnsharedEdges()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TriangleGeom::getParametricCenter(double pCoords[3])
+void TriangleGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 1.0 / 3.0;
   pCoords[1] = 1.0 / 3.0;
@@ -464,7 +464,7 @@ void TriangleGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TriangleGeom::getShapeFunctions(double pCoords[3], double* shape)
+void TriangleGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   (void)pCoords;
 
@@ -500,7 +500,7 @@ void TriangleGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf))
+int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeXdmf)) const
 {
   herr_t err = 0;
 
@@ -585,7 +585,7 @@ int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int TriangleGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int TriangleGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -638,7 +638,7 @@ int TriangleGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileNam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString TriangleGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString TriangleGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -721,7 +721,7 @@ int TriangleGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer TriangleGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer TriangleGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedTriList::Pointer tris = std::dynamic_pointer_cast<SharedTriList>((getTriangles().get() == nullptr) ? nullptr : getTriangles()->deepCopy(forceNoAllocate));
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index c856382e25..091d3a6eb9 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getTriangles
    * @return
    */
-  SharedTriList::Pointer getTriangles();
+  SharedTriList::Pointer getTriangles() const;
 
   /**
    * @brief setVertsAtTri
@@ -150,7 +150,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param triId
    * @param verts
    */
-  void getVertsAtTri(size_t triId, size_t verts[3]);
+  void getVertsAtTri(size_t triId, size_t verts[3]) const;
 
   /**
    * @brief getVertCoordsAtTri
@@ -159,20 +159,20 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vert2
    * @param vert3
    */
-  void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]);
+  void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]) const;
 
   /**
    * @brief getPointer
    * @param i
    * @return
    */
-  size_t* getTriPointer(size_t i);
+  size_t* getTriPointer(size_t i) const;
 
   /**
    * @brief getNumberOfTris
    * @return
    */
-  size_t getNumberOfTris();
+  size_t getNumberOfTris() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -187,7 +187,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getNumberOfElements
    * @return
    */
-  size_t getNumberOfElements() override;
+  size_t getNumberOfElements() const override;
 
   /**
    * @brief findElementSizes
@@ -199,7 +199,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getElementSizes
    * @return
    */
-  FloatArrayType::Pointer getElementSizes() override;
+  FloatArrayType::Pointer getElementSizes() const override;
 
   /**
    * @brief deleteElementSizes
@@ -216,7 +216,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getElementsContainingVert
    * @return
    */
-  ElementDynamicList::Pointer getElementsContainingVert() override;
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
 
   /**
    * @brief deleteElementsContainingVert
@@ -233,7 +233,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getElementNeighbors
    * @return
    */
-  ElementDynamicList::Pointer getElementNeighbors() override;
+  ElementDynamicList::Pointer getElementNeighbors() const override;
 
   /**
    * @brief deleteElementNeighbors
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getElementCentroids
    * @return
    */
-  FloatArrayType::Pointer getElementCentroids() override;
+  FloatArrayType::Pointer getElementCentroids() const override;
 
   /**
    * @brief deleteElementCentroids
@@ -261,14 +261,14 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getParametricCenter
    * @param pCoords
    */
-  void getParametricCenter(double pCoords[3]) override;
+  void getParametricCenter(double pCoords[3]) const override;
 
   /**
    * @brief getShapeFunctions
    * @param pCoords
    * @param shape
    */
-  void getShapeFunctions(double pCoords[3], double* shape) override;
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
 
   /**
    * @brief findDerivatives
@@ -282,7 +282,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief writeGeometryToHDF5
@@ -290,7 +290,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param writeXdmf
    * @return
    */
-  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
   /**
    * @brief writeXdmf
@@ -299,7 +299,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param hdfFileName
    * @return
    */
-  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
   /**
    * @brief readGeometryFromHDF5
@@ -313,7 +313,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief deepCopy
    * @return
    */
-  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief addOrReplaceAttributeMatrix
@@ -340,7 +340,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getVertices
    * @return
    */
-  SharedVertexList::Pointer getVertices() override;
+  SharedVertexList::Pointer getVertices() const override;
 
   /**
    * @brief setCoords
@@ -354,20 +354,20 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vertId
    * @param coords
    */
-  void getCoords(size_t vertId, float coords[3]) override;
+  void getCoords(size_t vertId, float coords[3]) const override;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(size_t i) override;
+  float* getVertexPointer(size_t i) const override;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  size_t getNumberOfVertices() override;
+  size_t getNumberOfVertices() const override;
 
   /**
    * @brief resizeEdgeList
@@ -379,7 +379,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getEdges
    * @return
    */
-  SharedEdgeList::Pointer getEdges() override;
+  SharedEdgeList::Pointer getEdges() const override;
 
   /**
    * @brief setVerts
@@ -393,7 +393,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param edgeId
    * @param verts
    */
-  void getVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
 
   /**
    * @brief getVertCoordsAtEdge
@@ -401,20 +401,20 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @param vert1
    * @param vert2
    */
-  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) override;
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
 
   /**
    * @brief getEdgePointer
    * @param i
    * @return
    */
-  size_t* getEdgePointer(size_t i) override;
+  size_t* getEdgePointer(size_t i) const override;
 
   /**
    * @brief getNumberOfEdges
    * @return
    */
-  size_t getNumberOfEdges() override;
+  size_t getNumberOfEdges() const override;
 
   /**
    * @brief findElementEdges
@@ -436,7 +436,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    * @brief getUnsharedEdges
    * @return
    */
-  SharedEdgeList::Pointer getUnsharedEdges() override;
+  SharedEdgeList::Pointer getUnsharedEdges() const override;
 
   /**
    * @brief deleteUnsharedEdges
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index c18ca3be99..13000786b6 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -133,7 +133,7 @@ void VertexGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatri
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-size_t VertexGeom::getNumberOfElements()
+size_t VertexGeom::getNumberOfElements() const
 {
   return m_VertexList->getNumberOfTuples();
 }
@@ -149,7 +149,7 @@ int VertexGeom::findElementsContainingVert()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer VertexGeom::getElementsContainingVert()
+ElementDynamicList::Pointer VertexGeom::getElementsContainingVert() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -180,7 +180,7 @@ int VertexGeom::findElementNeighbors()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ElementDynamicList::Pointer VertexGeom::getElementNeighbors()
+ElementDynamicList::Pointer VertexGeom::getElementNeighbors() const
 {
   return ElementDynamicList::NullPointer();
 }
@@ -211,7 +211,7 @@ int VertexGeom::findElementCentroids()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer VertexGeom::getElementCentroids()
+FloatArrayType::Pointer VertexGeom::getElementCentroids() const
 {
   return FloatArrayType::NullPointer();
 }
@@ -246,7 +246,7 @@ int VertexGeom::findElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatArrayType::Pointer VertexGeom::getElementSizes()
+FloatArrayType::Pointer VertexGeom::getElementSizes() const
 {
   return m_VertexSizes;
 }
@@ -270,7 +270,7 @@ void VertexGeom::deleteElementSizes()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void VertexGeom::getParametricCenter(double pCoords[3])
+void VertexGeom::getParametricCenter(double pCoords[3]) const
 {
   pCoords[0] = 0.0;
   pCoords[1] = 0.0;
@@ -280,7 +280,7 @@ void VertexGeom::getParametricCenter(double pCoords[3])
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void VertexGeom::getShapeFunctions(double pCoords[3], double* shape)
+void VertexGeom::getShapeFunctions(double pCoords[3], double* shape) const
 {
   (void)pCoords;
 
@@ -302,7 +302,7 @@ void VertexGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
+int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const
 {
   herr_t err = 0;
   std::vector<size_t> tDims(1, 0);
@@ -342,7 +342,7 @@ int VertexGeom::writeGeometryToHDF5(hid_t parentId, bool writeXdmf)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int VertexGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
+int VertexGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const
 {
   herr_t err = 0;
 
@@ -403,7 +403,7 @@ int VertexGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString VertexGeom::getInfoString(SIMPL::InfoStringFormat format)
+QString VertexGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
   QString info;
   QTextStream ss(&info);
@@ -448,7 +448,7 @@ int VertexGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::Pointer VertexGeom::deepCopy(bool forceNoAllocate)
+IGeometry::Pointer VertexGeom::deepCopy(bool forceNoAllocate) const
 {
   SharedVertexList::Pointer verts = std::dynamic_pointer_cast<SharedVertexList>((getVertices().get() == nullptr) ? nullptr : getVertices()->deepCopy(forceNoAllocate));
   FloatArrayType::Pointer elementSizes = std::dynamic_pointer_cast<FloatArrayType>((getElementSizes().get() == nullptr) ? nullptr : getElementSizes()->deepCopy(forceNoAllocate));
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index decd5aeafd..863f12e1a8 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -113,7 +113,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getVertices
    * @return
    */
-  SharedVertexList::Pointer getVertices();
+  SharedVertexList::Pointer getVertices() const;
 
   /**
    * @brief setCoords
@@ -127,20 +127,20 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param vertId
    * @param coords
    */
-  void getCoords(size_t vertId, float coords[3]);
+  void getCoords(size_t vertId, float coords[3]) const;
 
   /**
    * @brief getVertexPointer
    * @param i
    * @return
    */
-  float* getVertexPointer(size_t i);
+  float* getVertexPointer(size_t i) const;
 
   /**
    * @brief getNumberOfVertices
    * @return
    */
-  size_t getNumberOfVertices();
+  size_t getNumberOfVertices() const;
 
   // -----------------------------------------------------------------------------
   // Inherited from IGeometry
@@ -155,7 +155,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getNumberOfElements
    * @return
    */
-  size_t getNumberOfElements() override;
+  size_t getNumberOfElements() const override;
 
   /**
    * @brief findElementSizes
@@ -167,7 +167,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getElementSizes
    * @return
    */
-  FloatArrayType::Pointer getElementSizes() override;
+  FloatArrayType::Pointer getElementSizes() const override;
 
   /**
    * @brief deleteElementSizes
@@ -184,7 +184,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getElementsContainingVert
    * @return
    */
-  ElementDynamicList::Pointer getElementsContainingVert() override;
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
 
   /**
    * @brief deleteElementsContainingVert
@@ -201,7 +201,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getElementNeighbors
    * @return
    */
-  ElementDynamicList::Pointer getElementNeighbors() override;
+  ElementDynamicList::Pointer getElementNeighbors() const override;
 
   /**
    * @brief deleteElementNeighbors
@@ -218,7 +218,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getElementCentroids
    * @return
    */
-  FloatArrayType::Pointer getElementCentroids() override;
+  FloatArrayType::Pointer getElementCentroids() const override;
 
   /**
    * @brief deleteElementCentroids
@@ -229,14 +229,14 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief getParametricCenter
    * @param pCoords
    */
-  void getParametricCenter(double pCoords[3]) override;
+  void getParametricCenter(double pCoords[3]) const override;
 
   /**
    * @brief getShapeFunctions
    * @param pCoords
    * @param shape
    */
-  void getShapeFunctions(double pCoords[3], double* shape) override;
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
 
   /**
    * @brief findDerivatives
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) override;
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief writeGeometryToHDF5
@@ -258,7 +258,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param writeXdmf
    * @return
    */
-  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) override;
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
 
   /**
    * @brief writeXdmf
@@ -267,7 +267,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @param hdfFileName
    * @return
    */
-  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) override;
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
 
   /**
    * @brief readGeometryFromHDF5
@@ -281,7 +281,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    * @brief deepCopy
    * @return
    */
-  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) override;
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief addOrReplaceAttributeMatrix
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
index 2df138f2aa..4a82f3252a 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -67,7 +67,7 @@ class H5DataArrayWriter
      * @return
      */
     template <typename IDataArrayType>
-    static int writeDataArrayAttributes(hid_t gid, IDataArrayType* dataArray, std::vector<size_t> tDims, std::vector<size_t> cDims)
+    static int writeDataArrayAttributes(hid_t gid, const IDataArrayType* dataArray, std::vector<size_t> tDims, std::vector<size_t> cDims)
     {
       int err = QH5Lite::writeScalarAttribute(gid, dataArray->getName(), SIMPL::HDF5::DataArrayVersion, dataArray->getClassVersion());
       if(err < 0)
@@ -116,7 +116,7 @@ class H5DataArrayWriter
      * @return
      */
     template <class T>
-    static int writeDataArray(hid_t gid, T* dataArray, std::vector<size_t> tDims)
+    static int writeDataArray(hid_t gid, const T* dataArray, std::vector<size_t> tDims)
     {
       int err = 0;
 
@@ -194,7 +194,7 @@ class H5DataArrayWriter
      * @return
      */
     template<class T>
-    static int writeStringDataArray(hid_t gid, T* dataArray)
+    static int writeStringDataArray(hid_t gid, const T* dataArray)
     {
       int err = 0;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index c344a611dd..bc85c767e3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -36,14 +36,13 @@
 #include "LinkedDataContainerSelectionWidget.h"
 
 #include <QtCore/QSignalMapper>
-
-
 #include <QtWidgets/QMenu>
 
+#include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
-
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
 

From c05565602f8257b6ddc7a48bee1f8ce1872a205d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 29 Oct 2019 08:18:24 -0400
Subject: [PATCH 155/397] Fix compiler errors due to PYBIND_11 macros not being
 updated to API changes

Methods exposed to Python bindings that were changed to be a "const" method needed
to have the CONST_METHOD argument added to the macro.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataContainers/AttributeMatrix.h  |  4 ++--
 Source/SIMPLib/DataContainers/DataContainer.h    |  4 ++--
 .../SIMPLib/DataContainers/DataContainerArray.h  |  4 ++--
 Source/SIMPLib/Geometry/ImageGeom.h              |  2 +-
 .../Templates/Pybind11CustomTypeCasts.in.h       | 16 ++++++++++------
 .../Pybind11/cmake/WrappingFunctions.cmake       |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index e11320baae..fdb1092b38 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -100,8 +100,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
 
   PYB11_METHOD(IDataArray removeAttributeArray ARGS Name)
   PYB11_METHOD(int renameAttributeArray ARGS OldName NewName OverWrite)
-  PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name)
-  PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.DataArrayPath.&,Path)
+  PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name CONST_METHOD)
+  PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 171aaf2179..10b982e4cf 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -79,8 +79,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   PYB11_METHOD(bool addOrReplaceAttributeMatrix ARGS AttributeMatrix)
   PYB11_METHOD(bool insertOrAssign ARGS AttributeMatrix)
 
-  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.QString.&,Name)
-  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.DataArrayPath.&,Path)
+  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.QString.&,Name CONST_METHOD)
+  PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
 
   PYB11_METHOD(AttributeMatrix removeAttributeMatrix ARGS Name)
   PYB11_METHOD(bool renameAttributeMatrix ARGS OldName NewName OverWrite)
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 1445a37d01..6176c15e6d 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -70,8 +70,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   PYB11_METHOD(bool addOrReplaceDataContainer ARGS DataContainer)
   PYB11_METHOD(bool insertOrAssign ARGS DataContainer)
 
-  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.QString.&,Name)
-  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.DataArrayPath.&,Path)
+  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.QString.&,Name CONST_METHOD)
+  PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
 
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index d778ca815a..94cdff6864 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   PYB11_METHOD(void setOrigin OVERLOAD float,x float,y float,z)
   PYB11_METHOD(FloatVec3Type getOrigin)
 
-  PYB11_METHOD(FloatVec6Type getBoundingBox OVERLOAD)
+  PYB11_METHOD(FloatVec6Type getBoundingBox OVERLOAD CONST_METHOD)
   // clang-format on
 
 public:
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
index a4437ed7d6..ba1669d018 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
@@ -6,10 +6,14 @@
 #include <pybind11/stl.h>
 #include <pybind11/stl_bind.h>
 
+namespace py = pybind11;
+
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
+#include "SIMPLib/Common/ShapeType.h"
+#include "SIMPLib/Common/PhaseType.h"
 
 using DataContainersMap = QMap<QString, DataContainerProxy>;
 using AttributeMatricesMap = QMap<QString, AttributeMatrixProxy>;
@@ -37,7 +41,7 @@ template <> struct type_caster<QString>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
@@ -249,7 +253,7 @@ template <> struct type_caster<QVector<DataArrayPath>>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
@@ -306,7 +310,7 @@ template <> struct type_caster<DataContainersMap>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
@@ -366,7 +370,7 @@ template <> struct type_caster<AttributeMatricesMap>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
@@ -426,7 +430,7 @@ template <> struct type_caster<QVector<ShapeType::Type>>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
@@ -543,7 +547,7 @@ template <> struct type_caster<VectorOfFloatArray>
    * @param src
    * @return boolean
    */
-  bool load(handle src, bool)
+  bool load(handle src, bool b)
   {
     if(!src)
     {
diff --git a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
index 7c6164dc5a..95cf0f92de 100644
--- a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
+++ b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
@@ -46,7 +46,7 @@ function(CreatePybind11Module)
       COMMAND GeneratePythonBindings "${ARGS_SOURCE_DIR}"
       "${ARGS_PATH_TO_STRIP}"
       "${pybind_module_name_CamelCase}"
-      "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore" 
+      "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
       "${ARGS_MODULE_TEMPLATE_FILE}"
       "${ARGS_SIMPLIB}"
       "${CMAKE_CFG_INTDIR}"

From 6f7c33aae213fedc10014f09fa2d419a8373d0d0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 30 Oct 2019 16:14:47 -0400
Subject: [PATCH 156/397] Update codes to remove use of macros, fix python
 errors, fix const issues

    commit 41661315b69c6eb20ee2708d4587e84c94e075c8
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Wed Oct 30 14:52:10 2019 -0400

        Fix bug using std::accumulate due to casting issue.

        Passing in "1" will force the computation to be done in int32_t. When using large
        Tuple dimensions we will over flow.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit b216f5a44fe24cb501dab75e94316169e73e54a6
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Tue Oct 29 17:05:05 2019 -0400

        Add missing include directive <memory> for shared_ptr<> access.

        Updated some other code areas with better documentation strings
        Updated some code sections to be more consistent with use of type aliases.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit d16dc3196c6c426314bddc6e7d3e7713bb740de8
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Tue Oct 29 13:37:16 2019 -0400

        Update codes to latest const correctness changes

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 643d99b28f8b1022aef94bdfab4e3f6444ad4da1
    Merge: f5958ad2a c05565602
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Tue Oct 29 09:11:37 2019 -0400

        Fix compiler errors due to PYBIND_11 macros not being updated to API changes

        * develop:
          Fix compiler errors due to PYBIND_11 macros not being updated to API changes
          Feature/const (#380)

        # Conflicts:
        #   Source/SIMPLib/DataArrays/StatsDataArray.h
        #   Source/SIMPLib/DataArrays/StringDataArray.h
        #   Source/SIMPLib/DataContainers/AttributeMatrix.h
        #   Source/SIMPLib/DataContainers/DataContainerArray.h
        #   Source/SIMPLib/Geometry/IGeometry.h
        #   Source/SIMPLib/Geometry/IGeometry2D.h
        #   Source/SIMPLib/Geometry/IGeometryGrid.h
        #   Source/SIMPLib/Geometry/ImageGeom.h
        #   Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp

    commit f5958ad2ade94775ec373999680d8dcc9b44fb74
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Mon Oct 28 13:37:21 2019 -0400

        Feature/const (#380)

        * Added const to appropriate DataArray functions

        * NeighborList::writeH5Data needed some additional changes since it was
        trying to modify a member variable

        * Added const to appropriate Geometry functions

        * LinkedDataContainerSelectionWidget needed the IGeometry include to work

        * Added const to DynamicTableData::getTableData()

        * Added const to appropriate functions in AM, DC, and DCA classes

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 4cb6eec893bef9a49e1dcbb8c4c67d85f43621ef
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Oct 25 15:18:25 2019 -0400

        Address feedback from code review.

        Remove static const from constants.h
        Fix duplicate variable names in experimental file.

    commit a292511ac9266ae3287903f87f9c6bc781c69174
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Oct 25 12:35:24 2019 -0400

        Add conditional #pragma for clang diagnostics

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 6f73a645a0fc68c62859c524c0de5baf0902b010
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Oct 25 12:12:57 2019 -0400

        Fixing compiler errors on MSVC Platform

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 316d3955f8697c48602dcf3ab3cc4f6ad1c7dd4a
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Oct 25 11:53:57 2019 -0400

        Fix DOxygen comments that got munged up in some find/replace operation

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 693c2fe9d43f5116b21c6bd1e577740b5ff8413f
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Oct 25 11:43:17 2019 -0400

        Fix compiler warnings about overriding a virtual method without using override keyword

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 7775443d8eb8fa4e865c848937c2d851aee3ecc3
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Oct 24 12:40:33 2019 -0400

        Improve generated CPP code to modern standards

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 4a50ac71eefb8c0f62d59860cb5d17e417caed99
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Oct 24 12:40:14 2019 -0400

        Add a clang pragma to quiet a warning about using std::move.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit ad86eb0ecfa9e937325a34f3bcd8ebf3166491b0
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Oct 24 09:24:09 2019 -0400

        Update Messages classes and remove Python Wrapping from pure virtual class

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 051a664036b57050e12ae6e6df67aa32bdad42cb
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Wed Oct 23 14:42:52 2019 -0400

        Fix warnings about returning const QString as a value instead of a reference.

        Warnings are fixed by changing from "const QString" to "QString"

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 66bf335554af687a269480bf167f47965171d282
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Wed Oct 23 14:03:47 2019 -0400

        Merge and Compile error fixes

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 453623316f1e2d42dc713c43fe4da21d31bcd143
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Jun 27 18:02:45 2019 -0400

        Fix more pass by reference for POD types

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 3fb6d313b1d6774fdedd9fbf40d735381104133e
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Jun 27 10:49:58 2019 -0400

        Resolving merge conflicts

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 8e6826d87503836510e57882a8bbc591ea951d1c
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Mon Jun 24 18:06:26 2019 -0400

        Fixing code based on feed back from PR

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 3995ead905bb4c09b667e535e05f06273103e57d
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Fri Jun 21 14:24:15 2019 -0400

        Fix pass by const reference for POD types

        In the last pass at removing the macros POD types were mistakenly passed by
        const reference instead of by value. These have all been fixed to pass by value.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 71df37a0c0db9ac7dfc0f5043cc24570036d21f5
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Jun 13 18:14:59 2019 -0400

        Massive code modifications to clean up and reduce macro clutter

        * Remove use of all SIMPL_* macros replacing with actual C++ code
        * Remove the include directive to DataContainerArray in AbstractFilter instead using a forward declaration and alias
        * Add needed include directives or forward declarations to all effected classes

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit f6ba40d8aca3ad785566c58b4e37131f3a74efe9
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Thu Jun 13 18:57:23 2019 -0400

        Transfer some SIMPL_* macros into the Pybind11 macro section

        This is needed because the codescraper algorithm looks for four specific macros in order
        to determine the proper c++ and python code to generate. The same macros have been
        defined in the SIMPLPythonMacros.h header file.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit 35b2d0e60a89f24003197c708f58a556dda508fd
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Tue Jun 11 18:19:16 2019 -0400

        Wrap the Python wrapping macros in a #define for SIMPL_ENABLE_PYTHON

        This is done because SIMPLibSetGetMacros is going away eventually and we need to separate
        out the still needed macros that help generate the python bindings.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    commit ca158c3d4d3af81ebebe3561e4c8a27ef4a71ba4
    Author: Michael Jackson <mike.jackson@bluequartz.net>
    Date:   Tue Jun 11 18:05:43 2019 -0400

        Add compiler define if SIMPL_ENABLE_PYTHON is turned on.

        Update clang-format to NOT sort the includes.

        Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

    Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .clang-format                                 |    4 +-
 Contributing.md                               |   19 +-
 .../FilterCallback/FilterParameter.cpp        |  112 +-
 .../FilterCallback/FilterParameter.h          |  142 +-
 .../Experimental/FilterCallback/IFilter.cpp   |   60 +
 Source/Experimental/FilterCallback/IFilter.h  |   68 +-
 Source/PipelineRunner/PipelineRunner.cpp      |    3 +
 Source/SIMPLib/Common/Constants.h             |   95 +-
 .../Common/CreatedArrayHelpIndexEntry.cpp     |  133 ++
 .../Common/CreatedArrayHelpIndexEntry.h       |  131 +-
 Source/SIMPLib/Common/EnsembleInfo.h          |    5 +-
 Source/SIMPLib/Common/IObserver.cpp           |   14 +
 Source/SIMPLib/Common/IObserver.h             |   11 +-
 Source/SIMPLib/Common/Observable.cpp          |   12 +
 Source/SIMPLib/Common/Observable.h            |   17 +-
 Source/SIMPLib/Common/Observer.cpp            |   12 +
 Source/SIMPLib/Common/Observer.h              |   12 +-
 Source/SIMPLib/Common/SIMPLArray.hpp          |    9 +
 Source/SIMPLib/Common/SIMPLPythonMacros.h     |  198 ++
 Source/SIMPLib/Common/SIMPLRange.h            |    2 +-
 Source/SIMPLib/Common/SIMPLRange2D.h          |    2 +-
 Source/SIMPLib/Common/SIMPLRange3D.h          |    2 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  110 -
 Source/SIMPLib/Common/TemplateHelpers.cpp     |    3 +
 Source/SIMPLib/Common/TemplateHelpers.h       |    1 +
 .../CoreFilters/ApplyImageTransforms.cpp      |   62 +-
 .../CoreFilters/ApplyImageTransforms.h        |   52 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  111 +-
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |  137 +-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   47 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h       |  313 +--
 .../CoreFilters/CombineAttributeArrays.cpp    |   98 +-
 .../CoreFilters/CombineAttributeArrays.h      |  362 ++--
 .../CoreFilters/CombineAttributeMatrices.cpp  |  121 +-
 .../CoreFilters/CombineAttributeMatrices.h    |  133 +-
 .../CoreFilters/ConditionalSetValue.cpp       |   85 +-
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |   89 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  134 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |  145 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   86 +-
 Source/SIMPLib/CoreFilters/ConvertData.h      |   86 +-
 .../CopyFeatureArrayToElementArray.cpp        |   85 +-
 .../CopyFeatureArrayToElementArray.h          |   94 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  110 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       |  120 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   86 +-
 .../CoreFilters/CreateAttributeMatrix.h       |   85 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |  120 +-
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |  129 +-
 .../CoreFilters/CreateDataContainer.cpp       |   62 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |   59 +-
 .../CreateFeatureArrayFromElementArray.cpp    |   97 +-
 .../CreateFeatureArrayFromElementArray.h      |  107 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  458 +++-
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |  521 ++++-
 .../CoreFilters/CreateImageGeometry.cpp       |   98 +-
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |   98 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   84 +-
 .../SIMPLib/CoreFilters/CreateStringArray.h   |   85 +-
 .../CoreFilters/CropVertexGeometry.cpp        |  146 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |  158 +-
 .../CoreFilters/DataContainerReader.cpp       |  117 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |  116 +-
 .../CoreFilters/DataContainerWriter.cpp       |  113 +-
 .../SIMPLib/CoreFilters/DataContainerWriter.h |  110 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   60 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |   56 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   60 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |  320 +--
 .../ExtractAttributeArraysFromGeometry.cpp    |  229 +-
 .../ExtractAttributeArraysFromGeometry.h      |  277 ++-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   85 +-
 .../CoreFilters/ExtractComponentAsArray.h     |   93 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |   98 +-
 .../CoreFilters/ExtractVertexGeometry.h       |  105 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   63 +-
 .../CoreFilters/FeatureCountDecision.h        |   71 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |  122 +-
 .../CoreFilters/FeatureDataCSVWriter.h        |  124 +-
 Source/SIMPLib/CoreFilters/FileReader.cpp     |   31 +
 Source/SIMPLib/CoreFilters/FileReader.h       |   25 +-
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |   43 +
 Source/SIMPLib/CoreFilters/FileWriter.h       |   47 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |   74 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |  186 +-
 .../CoreFilters/GenerateColorTable.cpp        |   96 +-
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |  317 +--
 .../CoreFilters/ImportAsciDataArray.cpp       |  185 +-
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |  176 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  107 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |  112 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |  183 +-
 Source/SIMPLib/CoreFilters/InitializeData.h   |  234 ++-
 .../LinkFeatureMapToElementArray.cpp          |   86 +-
 .../LinkFeatureMapToElementArray.h            |   91 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   63 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |   71 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |   61 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |  282 +--
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  110 +-
 Source/SIMPLib/CoreFilters/MoveData.h         |  111 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  110 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |  111 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   78 +-
 .../CoreFilters/MultiThresholdObjects.h       |   75 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   76 +-
 .../CoreFilters/MultiThresholdObjects2.h      |   75 +-
 .../CoreFilters/PipelineAnnotation.cpp        |   60 +-
 .../SIMPLib/CoreFilters/PipelineAnnotation.h  |   68 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |   96 +-
 Source/SIMPLib/CoreFilters/PostSlackMessage.h |  189 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |  124 +-
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |  129 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |   62 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |  146 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |   62 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |   58 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |  109 +-
 .../CoreFilters/RemoveComponentFromArray.h    |  119 +-
 .../CoreFilters/RenameAttributeArray.cpp      |   73 +-
 .../CoreFilters/RenameAttributeArray.h        |   71 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |   74 +-
 .../CoreFilters/RenameAttributeMatrix.h       |   71 +-
 .../CoreFilters/RenameDataContainer.cpp       |   74 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |   71 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |   86 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |   90 +-
 .../CoreFilters/RequiredZThickness.cpp        |   76 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |   83 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  110 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |  111 +-
 .../SetOriginResolutionImageGeom.cpp          |  109 +-
 .../SetOriginResolutionImageGeom.h            |  111 +-
 .../CoreFilters/SplitAttributeArray.cpp       |   74 +-
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |   91 +-
 .../Testing/Cxx/ApplyImageTransformsTest.cpp  |    2 -
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |   38 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   23 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |    5 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |    5 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |    8 +-
 .../Testing/Cxx/ConvertDataTest.cpp           |    5 +-
 .../CopyFeatureArrayToElementArrayTest.cpp    |    7 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |    4 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |    3 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       |    3 +-
 .../Testing/Cxx/CreateDataContainerTest.cpp   |    4 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |    5 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |    4 +-
 .../Testing/Cxx/CreateImageGeometryTest.cpp   |    2 +
 .../Testing/Cxx/CreateStringArrayTest.cpp     |    4 +-
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |    4 +-
 .../Testing/Cxx/DataContainerTest.cpp         |    1 -
 .../Testing/Cxx/ExecuteProcessTest.cpp        |   18 +-
 ...ExtractAttributeArraysFromGeometryTest.cpp |    4 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |    5 +-
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |    3 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |    3 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   21 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |    5 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |    4 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |    4 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   20 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   20 +-
 .../Testing/Cxx/PipelinePauseTest.cpp         |   19 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |    5 +
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |   23 +-
 .../Testing/Cxx/RemoveArraysObserver.h        |   37 +-
 .../Testing/Cxx/RemoveArraysTest.cpp          |    4 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |    5 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |    5 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |    5 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |    5 +-
 .../Testing/Cxx/ReplaceValueTest.cpp          |    5 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |    5 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |    5 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |    5 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |    4 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |    2 +
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |    6 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  135 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |  144 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   86 +-
 .../CoreFilters/WriteTriangleGeometry.h       |   84 +-
 .../SIMPLib/CoreFilters/util/ABSOperator.cpp  |   74 +-
 Source/SIMPLib/CoreFilters/util/ABSOperator.h |   11 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.cpp |    8 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.h   |   11 +-
 .../CoreFilters/util/ASCIIWizardData.hpp      |    7 +-
 .../SIMPLib/CoreFilters/util/ASinOperator.cpp |   74 +-
 .../SIMPLib/CoreFilters/util/ASinOperator.h   |   11 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.cpp |    8 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.h   |   11 +-
 .../CoreFilters/util/AbstractDataParser.hpp   |  111 +-
 .../CoreFilters/util/AdditionOperator.cpp     |    8 +-
 .../CoreFilters/util/AdditionOperator.h       |   11 +-
 .../CoreFilters/util/BinaryOperator.cpp       |    6 +
 .../SIMPLib/CoreFilters/util/BinaryOperator.h |   13 +-
 .../CoreFilters/util/CalculatorArray.hpp      |   26 +-
 .../CoreFilters/util/CalculatorItem.cpp       |    6 +
 .../SIMPLib/CoreFilters/util/CalculatorItem.h |   14 +-
 .../CoreFilters/util/CalculatorOperator.cpp   |    6 +
 .../CoreFilters/util/CalculatorOperator.h     |   10 +-
 .../CoreFilters/util/CalculatorSeparator.cpp  |    6 +
 .../CoreFilters/util/CalculatorSeparator.h    |   11 +-
 .../SIMPLib/CoreFilters/util/CeilOperator.cpp |   74 +-
 .../SIMPLib/CoreFilters/util/CeilOperator.h   |   11 +-
 .../CoreFilters/util/CommaSeparator.cpp       |    6 +
 .../SIMPLib/CoreFilters/util/CommaSeparator.h |   11 +-
 .../SIMPLib/CoreFilters/util/CosOperator.cpp  |    8 +-
 Source/SIMPLib/CoreFilters/util/CosOperator.h |   11 +-
 .../CoreFilters/util/DivisionOperator.cpp     |    8 +-
 .../CoreFilters/util/DivisionOperator.h       |   11 +-
 .../SIMPLib/CoreFilters/util/ExpOperator.cpp  |   74 +-
 Source/SIMPLib/CoreFilters/util/ExpOperator.h |   11 +-
 .../CoreFilters/util/FloorOperator.cpp        |    8 +-
 .../SIMPLib/CoreFilters/util/FloorOperator.h  |   11 +-
 .../CoreFilters/util/ICalculatorArray.cpp     |    6 +
 .../CoreFilters/util/ICalculatorArray.h       |   18 +-
 .../CoreFilters/util/LeftParenthesisItem.cpp  |    6 +
 .../CoreFilters/util/LeftParenthesisItem.h    |   20 +-
 .../SIMPLib/CoreFilters/util/LnOperator.cpp   |   74 +-
 Source/SIMPLib/CoreFilters/util/LnOperator.h  |   11 +-
 .../CoreFilters/util/Log10Operator.cpp        |   74 +-
 .../SIMPLib/CoreFilters/util/Log10Operator.h  |   11 +-
 .../SIMPLib/CoreFilters/util/LogOperator.cpp  |    6 +
 Source/SIMPLib/CoreFilters/util/LogOperator.h |    9 +-
 .../util/MultiplicationOperator.cpp           |    8 +-
 .../CoreFilters/util/MultiplicationOperator.h |   11 +-
 .../CoreFilters/util/NegativeOperator.cpp     |    6 +
 .../CoreFilters/util/NegativeOperator.h       |   11 +-
 .../SIMPLib/CoreFilters/util/PowOperator.cpp  |    8 +-
 Source/SIMPLib/CoreFilters/util/PowOperator.h |   11 +-
 .../CoreFilters/util/RightParenthesisItem.cpp |    6 +
 .../CoreFilters/util/RightParenthesisItem.h   |   20 +-
 .../SIMPLib/CoreFilters/util/RootOperator.cpp |    8 +-
 .../SIMPLib/CoreFilters/util/RootOperator.h   |   11 +-
 .../SIMPLib/CoreFilters/util/SinOperator.cpp  |    8 +-
 Source/SIMPLib/CoreFilters/util/SinOperator.h |   11 +-
 .../SIMPLib/CoreFilters/util/SqrtOperator.cpp |   74 +-
 .../SIMPLib/CoreFilters/util/SqrtOperator.h   |   11 +-
 .../CoreFilters/util/SubtractionOperator.cpp  |    8 +-
 .../CoreFilters/util/SubtractionOperator.h    |   11 +-
 .../SIMPLib/CoreFilters/util/TanOperator.cpp  |    8 +-
 Source/SIMPLib/CoreFilters/util/TanOperator.h |   11 +-
 .../CoreFilters/util/UnaryOperator.cpp        |    6 +
 .../SIMPLib/CoreFilters/util/UnaryOperator.h  |   19 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       |   51 +-
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |   73 +-
 Source/SIMPLib/DataArrays/IDataArray.cpp      |   18 +
 Source/SIMPLib/DataArrays/IDataArray.h        |  107 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |   48 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |   48 +
 Source/SIMPLib/DataArrays/StatsDataArray.h    |   54 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |   34 +
 Source/SIMPLib/DataArrays/StringDataArray.h   |   53 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |   42 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |    5 +
 .../DataContainers/AttributeMatrix.cpp        |   76 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  138 +-
 .../DataContainers/AttributeMatrixProxy.h     |    3 +
 .../SIMPLib/DataContainers/DataArrayPath.cpp  |    1 +
 Source/SIMPLib/DataContainers/DataArrayPath.h |    8 +-
 .../SIMPLib/DataContainers/DataArrayProxy.h   |    3 +
 .../SIMPLib/DataContainers/DataContainer.cpp  |   19 +
 Source/SIMPLib/DataContainers/DataContainer.h |   36 +-
 .../DataContainers/DataContainerArray.cpp     |   30 +
 .../DataContainers/DataContainerArray.h       |   47 +-
 .../DataContainerArrayProxy.cpp               |    3 +
 .../DataContainers/DataContainerArrayProxy.h  |    5 +-
 .../DataContainers/DataContainerBundle.cpp    |   46 +
 .../DataContainers/DataContainerBundle.h      |   43 +-
 .../DataContainers/DataContainerProxy.h       |    4 +-
 .../DataContainers/DataStructureUtilities.h   |    5 +-
 .../DataContainers/IDataContainerBundle.cpp   |   18 +
 .../DataContainers/IDataContainerBundle.h     |   23 +-
 .../IDataStructureContainerNode.hpp           |   20 +-
 .../DataContainers/IDataStructureNode.cpp     |   18 +
 .../DataContainers/IDataStructureNode.h       |   20 +-
 .../AbstractFilterParametersReader.cpp        |   88 +-
 .../AbstractFilterParametersReader.h          |   95 +-
 .../AbstractFilterParametersWriter.cpp        |   14 +
 .../AbstractFilterParametersWriter.h          |   15 +-
 ...AttributeMatrixCreationFilterParameter.cpp |   61 +
 .../AttributeMatrixCreationFilterParameter.h  |   57 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   73 +
 .../AttributeMatrixSelectionFilterParameter.h |   68 +-
 .../AxisAngleFilterParameter.cpp              |   49 +
 .../AxisAngleFilterParameter.h                |   47 +-
 .../SIMPLib/FilterParameters/AxisAngleInput.h |    1 +
 .../BooleanFilterParameter.cpp                |   49 +
 .../FilterParameters/BooleanFilterParameter.h |  156 +-
 .../CalculatorFilterParameter.cpp             |   49 +
 .../CalculatorFilterParameter.h               |   89 +-
 .../ChoiceFilterParameter.cpp                 |   75 +-
 .../FilterParameters/ChoiceFilterParameter.h  |   71 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   97 +
 ...mparisonSelectionAdvancedFilterParameter.h |   92 +-
 .../ComparisonSelectionFilterParameter.cpp    |   97 +
 .../ComparisonSelectionFilterParameter.h      |   92 +-
 .../ConstrainedDoubleFilterParameter.cpp      |   50 +-
 .../ConstrainedDoubleFilterParameter.h        |   71 +-
 .../ConstrainedFilterParameter.cpp            |   49 +
 .../ConstrainedFilterParameter.h              |   47 +-
 .../ConstrainedIntFilterParameter.cpp         |   50 +-
 .../ConstrainedIntFilterParameter.h           |   71 +-
 .../DataArrayCreationFilterParameter.cpp      |   73 +
 .../DataArrayCreationFilterParameter.h        |   68 +-
 .../DataArraySelectionFilterParameter.cpp     |   97 +
 .../DataArraySelectionFilterParameter.h       |   90 +-
 ...DataContainerArrayProxyFilterParameter.cpp |   73 +
 .../DataContainerArrayProxyFilterParameter.h  |   69 +-
 .../DataContainerCreationFilterParameter.cpp  |   49 +
 .../DataContainerCreationFilterParameter.h    |   46 +-
 .../DataContainerReaderFilterParameter.cpp    |   85 +
 .../DataContainerReaderFilterParameter.h      |   84 +-
 .../DataContainerSelectionFilterParameter.cpp |   61 +
 .../DataContainerSelectionFilterParameter.h   |   57 +-
 .../DoubleFilterParameter.cpp                 |   53 +-
 .../FilterParameters/DoubleFilterParameter.h  |   73 +-
 .../DynamicChoiceFilterParameter.cpp          |   73 +
 .../DynamicChoiceFilterParameter.h            |   69 +-
 .../FilterParameters/DynamicTableData.cpp     |   97 +
 .../FilterParameters/DynamicTableData.h       |  168 +-
 .../DynamicTableFilterParameter.cpp           |   87 +
 .../DynamicTableFilterParameter.h             |   82 +-
 .../SIMPLib/FilterParameters/FileListInfo.h   |    1 +
 .../FileListInfoFilterParameter.cpp           |   49 +
 .../FileListInfoFilterParameter.h             |   47 +-
 .../FilterParameters/FilterParameter.cpp      |   90 +
 .../FilterParameters/FilterParameter.h        |   94 +-
 .../FilterParameters/FloatFilterParameter.cpp |   51 +-
 .../FilterParameters/FloatFilterParameter.h   |   71 +-
 .../FloatVec2FilterParameter.cpp              |   49 +
 .../FloatVec2FilterParameter.h                |   88 +-
 .../FloatVec3FilterParameter.cpp              |   49 +
 .../FloatVec3FilterParameter.h                |   88 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |   49 +
 .../FourthOrderPolynomialFilterParameter.h    |  100 +-
 .../GenerateColorTableFilterParameter.cpp     |   37 +
 .../GenerateColorTableFilterParameter.h       |   35 +-
 .../H5FilterParametersReader.cpp              |  111 +-
 .../H5FilterParametersReader.h                |  247 ++-
 .../H5FilterParametersWriter.cpp              |   51 +
 .../H5FilterParametersWriter.h                |   47 +-
 .../ImportHDF5DatasetFilterParameter.cpp      |   43 +
 .../ImportHDF5DatasetFilterParameter.h        |   43 +-
 .../InputFileFilterParameter.cpp              |   73 +
 .../InputFileFilterParameter.h                |  198 +-
 .../InputPathFilterParameter.cpp              |   73 +
 .../InputPathFilterParameter.h                |  198 +-
 .../FilterParameters/IntFilterParameter.cpp   |   51 +-
 .../FilterParameters/IntFilterParameter.h     |   71 +-
 .../IntVec2FilterParameter.cpp                |   49 +
 .../FilterParameters/IntVec2FilterParameter.h |   46 +-
 .../IntVec3FilterParameter.cpp                |   49 +
 .../FilterParameters/IntVec3FilterParameter.h |   88 +-
 .../JsonFilterParametersReader.cpp            |   52 +
 .../JsonFilterParametersReader.h              |  275 +--
 .../JsonFilterParametersWriter.cpp            |   76 +
 .../JsonFilterParametersWriter.h              |   70 +-
 .../LinkedBooleanFilterParameter.cpp          |   61 +
 .../LinkedBooleanFilterParameter.h            |   58 +-
 .../LinkedChoicesFilterParameter.cpp          |   63 +-
 .../LinkedChoicesFilterParameter.h            |   60 +-
 ...dDataContainerSelectionFilterParameter.cpp |   73 +
 ...kedDataContainerSelectionFilterParameter.h |   81 +-
 .../LinkedPathCreationFilterParameter.cpp     |   49 +
 .../LinkedPathCreationFilterParameter.h       |   45 +-
 .../MontageSelectionFilterParameter.cpp       |   49 +
 .../MontageSelectionFilterParameter.h         |   46 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  113 +-
 ...iAttributeMatrixSelectionFilterParameter.h |  106 +-
 ...MultiDataArraySelectionFilterParameter.cpp |  113 +-
 .../MultiDataArraySelectionFilterParameter.h  |  106 +-
 ...iDataContainerSelectionFilterParameter.cpp |  109 +
 ...ltiDataContainerSelectionFilterParameter.h |  104 +-
 .../NumericTypeFilterParameter.cpp            |   49 +
 .../NumericTypeFilterParameter.h              |   46 +-
 .../OutputFileFilterParameter.cpp             |   73 +
 .../OutputFileFilterParameter.h               |   92 +-
 .../OutputPathFilterParameter.cpp             |   73 +
 .../OutputPathFilterParameter.h               |  201 +-
 .../ParagraphFilterParameter.cpp              |   61 +
 .../ParagraphFilterParameter.h                |   57 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |  133 ++
 .../PhaseTypeSelectionFilterParameter.h       |  128 +-
 .../PreflightUpdatedValueFilterParameter.cpp  |   37 +
 .../PreflightUpdatedValueFilterParameter.h    |   36 +-
 .../FilterParameters/RangeFilterParameter.cpp |   61 +
 .../FilterParameters/RangeFilterParameter.h   |  250 ++-
 .../ReadASCIIDataFilterParameter.cpp          |   25 +
 .../ReadASCIIDataFilterParameter.h            |   56 +-
 .../ScalarTypeFilterParameter.cpp             |   49 +
 .../ScalarTypeFilterParameter.h               |   46 +-
 .../SecondOrderPolynomialFilterParameter.cpp  |   49 +
 .../SecondOrderPolynomialFilterParameter.h    |   84 +-
 .../SeparatorFilterParameter.cpp              |   25 +
 .../SeparatorFilterParameter.h                |   24 +-
 .../ShapeTypeSelectionFilterParameter.cpp     |   73 +
 .../ShapeTypeSelectionFilterParameter.h       |   69 +-
 .../StringFilterParameter.cpp                 |   49 +
 .../FilterParameters/StringFilterParameter.h  |   69 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp    |  563 ++++-
 .../ThirdOrderPolynomialFilterParameter.cpp   |   49 +
 .../ThirdOrderPolynomialFilterParameter.h     |   46 +-
 .../UInt64FilterParameter.cpp                 |   49 +
 .../FilterParameters/UInt64FilterParameter.h  |   69 +-
 .../UnknownFilterParameter.cpp                |   25 +
 .../FilterParameters/UnknownFilterParameter.h |   49 +-
 .../SIMPLib/Filtering/AbstractComparison.cpp  |   19 +-
 Source/SIMPLib/Filtering/AbstractComparison.h |   29 +-
 .../Filtering/AbstractDecisionFilter.cpp      |   41 +-
 .../Filtering/AbstractDecisionFilter.h        |   44 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |  192 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |  160 +-
 Source/SIMPLib/Filtering/ComparisonInputs.h   |    9 +-
 .../Filtering/ComparisonInputsAdvanced.h      |    6 +-
 Source/SIMPLib/Filtering/ComparisonSet.cpp    |   25 +
 Source/SIMPLib/Filtering/ComparisonSet.h      |   29 +-
 Source/SIMPLib/Filtering/ComparisonValue.cpp  |   25 +
 Source/SIMPLib/Filtering/ComparisonValue.h    |   29 +-
 Source/SIMPLib/Filtering/CorePlugin.cpp       |    1 +
 Source/SIMPLib/Filtering/FilterFactory.hpp    |   33 +-
 Source/SIMPLib/Filtering/FilterManager.cpp    |   15 +-
 Source/SIMPLib/Filtering/FilterManager.h      |   10 +-
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |   72 +-
 Source/SIMPLib/Filtering/FilterPipeline.h     |   83 +-
 Source/SIMPLib/Filtering/IFilterFactory.hpp   |   26 +-
 .../Testing/Cxx/FilterPipelineTest.cpp        |    1 +
 .../Filtering/ThresholdFilterHelper.cpp       |    2 +-
 .../SIMPLib/Filtering/ThresholdFilterHelper.h |   30 +-
 .../Geometry/CompositeTransformContainer.cpp  |   38 +-
 .../Geometry/CompositeTransformContainer.h    |   37 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   27 +
 Source/SIMPLib/Geometry/EdgeGeom.h            |  101 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |    7 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |   27 +
 Source/SIMPLib/Geometry/HexahedralGeom.h      |   27 +-
 Source/SIMPLib/Geometry/IGeometry.cpp         |   75 +-
 Source/SIMPLib/Geometry/IGeometry.h           |  853 ++++----
 Source/SIMPLib/Geometry/IGeometry2D.cpp       |   18 +
 Source/SIMPLib/Geometry/IGeometry2D.h         |  344 +--
 Source/SIMPLib/Geometry/IGeometry3D.cpp       |   18 +
 Source/SIMPLib/Geometry/IGeometry3D.h         |   22 +-
 Source/SIMPLib/Geometry/IGeometryGrid.cpp     |   18 +
 Source/SIMPLib/Geometry/IGeometryGrid.h       |  147 +-
 .../SIMPLib/Geometry/ITransformContainer.cpp  |   18 +
 Source/SIMPLib/Geometry/ITransformContainer.h |   22 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |   27 +
 Source/SIMPLib/Geometry/ImageGeom.h           |  101 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   27 +
 Source/SIMPLib/Geometry/QuadGeom.h            |  102 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   27 +
 Source/SIMPLib/Geometry/RectGridGeom.h        |   28 +-
 .../Geometry/ShapeOps/CubeOctohedronOps.cpp   |   25 +
 .../Geometry/ShapeOps/CubeOctohedronOps.h     |   23 +-
 .../Geometry/ShapeOps/CylinderAOps.cpp        |   25 +
 .../SIMPLib/Geometry/ShapeOps/CylinderAOps.h  |   24 +-
 .../Geometry/ShapeOps/CylinderBOps.cpp        |   25 +
 .../SIMPLib/Geometry/ShapeOps/CylinderBOps.h  |   24 +-
 .../Geometry/ShapeOps/CylinderCOps.cpp        |   25 +
 .../SIMPLib/Geometry/ShapeOps/CylinderCOps.h  |   24 +-
 .../Geometry/ShapeOps/EllipsoidOps.cpp        |   25 +
 .../SIMPLib/Geometry/ShapeOps/EllipsoidOps.h  |   25 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp |   25 +
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h   |   24 +-
 .../Geometry/ShapeOps/SuperEllipsoidOps.cpp   |   25 +
 .../Geometry/ShapeOps/SuperEllipsoidOps.h     |   23 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   27 +
 Source/SIMPLib/Geometry/TetrahedralGeom.h     |   27 +-
 .../SIMPLib/Geometry/TransformContainer.cpp   |   88 +-
 Source/SIMPLib/Geometry/TransformContainer.h  |   83 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   27 +
 Source/SIMPLib/Geometry/TriangleGeom.h        |  102 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   27 +
 Source/SIMPLib/Geometry/VertexGeom.h          |   33 +-
 .../HDF5/H5BoundaryStatsDataDelegate.cpp      |   25 +
 .../HDF5/H5BoundaryStatsDataDelegate.h        |   25 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |    3 +
 Source/SIMPLib/HDF5/H5DataArrayReader.h       |   13 +-
 .../HDF5/H5MatrixStatsDataDelegate.cpp        |   25 +
 .../SIMPLib/HDF5/H5MatrixStatsDataDelegate.h  |   25 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp   |   60 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.h     |   25 +-
 .../HDF5/H5PrimaryStatsDataDelegate.cpp       |   34 +-
 .../SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h |   25 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp   |   25 +
 Source/SIMPLib/HDF5/H5StatsDataDelegate.h     |   25 +-
 .../H5TransformationStatsDataDelegate.cpp     |   32 +-
 .../HDF5/H5TransformationStatsDataDelegate.h  |   25 +-
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |   10 +-
 Source/SIMPLib/ITK/itkBridge.h                |   20 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |    3 +
 .../ITK/itkInPlaceDream3DDataToImageFilter.h  |   10 +-
 .../itkInPlaceDream3DDataToImageFilter.hxx    |    1 +
 Source/SIMPLib/ITK/itkProgressObserver.hpp    |   66 +-
 Source/SIMPLib/ITK/itkTemplateUtilities.h     |    2 +-
 Source/SIMPLib/Math/GeometryMath.cpp          |   18 +
 Source/SIMPLib/Math/GeometryMath.h            |   22 +-
 Source/SIMPLib/Math/MatrixMath.h              |   25 +-
 .../Math/RadialDistributionFunction.cpp       |    2 +-
 .../SIMPLib/Math/RadialDistributionFunction.h |    3 +-
 Source/SIMPLib/Math/RdfData.cpp               |  158 +-
 Source/SIMPLib/Math/RdfData.h                 |  124 +-
 Source/SIMPLib/Math/SIMPLibMath.h             |    4 +-
 .../SIMPLib/Messages/AbstractErrorMessage.cpp |   29 +
 .../SIMPLib/Messages/AbstractErrorMessage.h   |   30 +-
 Source/SIMPLib/Messages/AbstractMessage.cpp   |   36 +-
 Source/SIMPLib/Messages/AbstractMessage.h     |   40 +-
 .../Messages/AbstractProgressMessage.cpp      |   31 +-
 .../Messages/AbstractProgressMessage.h        |   30 +-
 .../Messages/AbstractStatusMessage.cpp        |   19 +-
 .../SIMPLib/Messages/AbstractStatusMessage.h  |   19 +-
 .../Messages/AbstractWarningMessage.cpp       |   30 +
 .../SIMPLib/Messages/AbstractWarningMessage.h |   30 +-
 .../SIMPLib/Messages/FilterErrorMessage.cpp   |   63 +
 Source/SIMPLib/Messages/FilterErrorMessage.h  |  109 +-
 .../Messages/FilterProgressMessage.cpp        |   63 +
 .../SIMPLib/Messages/FilterProgressMessage.h  |  109 +-
 .../SIMPLib/Messages/FilterStatusMessage.cpp  |   61 +
 Source/SIMPLib/Messages/FilterStatusMessage.h |  107 +-
 .../SIMPLib/Messages/FilterWarningMessage.cpp |   63 +
 .../SIMPLib/Messages/FilterWarningMessage.h   |  109 +-
 .../SIMPLib/Messages/GenericErrorMessage.cpp  |   27 +
 Source/SIMPLib/Messages/GenericErrorMessage.h |   70 +-
 .../Messages/GenericProgressMessage.cpp       |   27 +
 .../SIMPLib/Messages/GenericProgressMessage.h |   70 +-
 .../SIMPLib/Messages/GenericStatusMessage.cpp |   25 +
 .../SIMPLib/Messages/GenericStatusMessage.h   |   70 +-
 .../Messages/GenericWarningMessage.cpp        |   27 +
 .../SIMPLib/Messages/GenericWarningMessage.h  |   72 +-
 .../SIMPLib/Messages/PipelineErrorMessage.cpp |   39 +
 .../SIMPLib/Messages/PipelineErrorMessage.h   |   99 +-
 .../Messages/PipelineProgressMessage.cpp      |   39 +
 .../Messages/PipelineProgressMessage.h        |   99 +-
 .../Messages/PipelineStatusMessage.cpp        |   37 +
 .../SIMPLib/Messages/PipelineStatusMessage.h  |   97 +-
 .../Messages/PipelineWarningMessage.cpp       |   39 +
 .../SIMPLib/Messages/PipelineWarningMessage.h |   99 +-
 Source/SIMPLib/Plugin/ISIMPLibPlugin.h        |   11 +-
 Source/SIMPLib/Plugin/PluginManager.cpp       |   21 +-
 Source/SIMPLib/Plugin/PluginManager.h         |   14 +-
 Source/SIMPLib/Plugin/PluginProxy.cpp         |   25 +
 Source/SIMPLib/Plugin/PluginProxy.h           |   23 +-
 Source/SIMPLib/REST/PipelineListener.cpp      |   12 +
 Source/SIMPLib/REST/PipelineListener.h        |   10 +-
 .../REST/PipelineListenerMessageHandler.cpp   |    4 +-
 Source/SIMPLib/REST/SIMPLRequestMapper.h      |    2 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |    8 +-
 .../ExecutePipelineController.cpp             |    3 +
 .../PreflightPipelineController.cpp           |    1 +
 .../SIMPLStaticFileController.cpp             |    2 +
 .../REST/V1Controllers/V1RequestMapper.h      |    2 +-
 Source/SIMPLib/SIMPLibConfiguration.h.in      |    6 +
 .../SIMPLib/StatsData/BoundaryStatsData.cpp   |   49 +
 Source/SIMPLib/StatsData/BoundaryStatsData.h  |   47 +-
 Source/SIMPLib/StatsData/MatrixStatsData.cpp  |   25 +
 Source/SIMPLib/StatsData/MatrixStatsData.h    |   25 +-
 .../StatsData/PrecipitateStatsData.cpp        |  310 ++-
 .../SIMPLib/StatsData/PrecipitateStatsData.h  |  303 ++-
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp |  342 ++-
 Source/SIMPLib/StatsData/PrimaryStatsData.h   |  258 ++-
 Source/SIMPLib/StatsData/StatsData.cpp        |   53 +-
 Source/SIMPLib/StatsData/StatsData.h          |   59 +-
 .../Testing/Cxx/StatsDataJsonRWTest.cpp       |  163 +-
 .../StatsData/TransformationStatsData.cpp     |  288 ++-
 .../StatsData/TransformationStatsData.h       |  262 ++-
 .../TestFilters/ArraySelectionExample.cpp     |   54 +-
 .../TestFilters/ArraySelectionExample.h       |   64 +-
 .../TestFilters/DynamicTableExample.cpp       |  101 +-
 .../SIMPLib/TestFilters/DynamicTableExample.h |  117 +-
 .../TestFilters/ErrorWarningFilter.cpp        |  107 +-
 .../SIMPLib/TestFilters/ErrorWarningFilter.h  |  121 +-
 Source/SIMPLib/TestFilters/Filt0.cpp          |   80 +
 Source/SIMPLib/TestFilters/Filt0.h            |   85 +-
 Source/SIMPLib/TestFilters/Filt1.cpp          |   69 +
 Source/SIMPLib/TestFilters/Filt1.h            |   73 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |   69 +-
 Source/SIMPLib/TestFilters/FilterGroup00.h    |   58 +-
 Source/SIMPLib/TestFilters/FilterGroup01.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup01.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup02.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup03.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup04.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup05.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup06.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup07.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup08.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup09.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup10.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup12.h    |   48 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp  |   47 +-
 Source/SIMPLib/TestFilters/FilterGroup13.h    |   48 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  547 ++++-
 Source/SIMPLib/TestFilters/GenericExample.h   |  599 +++++-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |  164 +-
 .../SIMPLib/TestFilters/MakeDataContainer.h   |  190 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |   79 +-
 Source/SIMPLib/TestFilters/ThresholdExample.h |   87 +-
 Source/SIMPLib/Utilities/ColorTable.cpp       |    2 -
 Source/SIMPLib/Utilities/MontageSelection.h   |    4 +-
 .../SIMPLib/Utilities/ParallelTaskAlgorithm.h |    4 +-
 Source/SIMPLib/Utilities/PythonSupport.cpp    |    2 +
 .../Utilities/SIMPLDataPathValidator.cpp      |    6 +
 .../Utilities/SIMPLDataPathValidator.h        |   11 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |   17 +
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h  |   20 +-
 .../SIMPLH5DataReaderRequirements.cpp         |   48 +
 .../Utilities/SIMPLH5DataReaderRequirements.h |   67 +-
 Source/SIMPLib/Utilities/TestObserver.cpp     |   12 +
 Source/SIMPLib/Utilities/TestObserver.h       |   13 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |   96 +
 Source/SIMPLib/VTKUtils/VTKFileReader.h       |  119 +-
 .../SVWidgetsLib/Core/FilterWidgetManager.cpp |   14 +
 .../SVWidgetsLib/Core/FilterWidgetManager.h   |   11 +-
 .../Core/IFilterWidgetFactory.cpp             |   20 +
 .../SVWidgetsLib/Core/IFilterWidgetFactory.h  |   21 +-
 .../Core/PipelineFilterWidgetFactory.hpp      |  150 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp  |    3 +
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp  |   11 +
 Source/SVWidgetsLib/Dialogs/ColorPresets.h    |   13 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.cpp |   12 +
 Source/SVWidgetsLib/Dialogs/PluginDetails.h   |   15 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp   |    3 +
 Source/SVWidgetsLib/Dialogs/UpdateCheck.h     |    3 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheckData.h |    2 +-
 .../AttributeMatrixCreationWidget.cpp         |    2 +
 .../AttributeMatrixSelectionWidget.cpp        |    1 +
 .../CalculatorWidget.cpp                      |    4 +
 .../FilterParameterWidgets/CalculatorWidget.h |    8 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |    1 +
 .../ComparisonSelectionItemDelegate.h         |    2 +-
 .../ComparisonSelectionTableModel.h           |    3 +-
 .../ComparisonSelectionWidget.cpp             |   25 +
 .../ComparisonSelectionWidget.h               |   24 +-
 .../ComparisonValueWidget.h                   |    1 +
 .../DataArrayCreationWidget.cpp               |    2 +
 .../DataArrayInformationDisplayWidget.cpp     |   13 +
 .../DataArrayInformationDisplayWidget.h       |   14 +-
 .../DataArraySelectionWidget.cpp              |    2 +
 .../DataArraySelectionWidget.h                |    1 -
 .../DataContainerArrayProxyWidget.cpp         |    4 +-
 .../DataContainerReaderWidget.cpp             |    4 +
 .../DataContainerSelectionWidget.cpp          |    2 +
 .../DynamicChoiceWidget.cpp                   |    1 +
 .../DynamicTableItemDelegate.h                |    2 +-
 .../DynamicTableWidget.cpp                    |    3 +
 .../FileListInfoWidget.cpp                    |    3 +
 .../FileListInfoWidget.h                      |    1 -
 .../FilterParameterWidget.cpp                 |   42 +-
 .../FilterParameterWidget.h                   |   34 +-
 .../FilterParameterWidgetUtils.hpp            |    1 +
 .../ImportHDF5DatasetWidget.cpp               |    4 +
 .../LinkedDataContainerSelectionWidget.cpp    |    2 +
 .../MontageSelectionWidget.cpp                |    1 +
 .../MultiAttributeMatrixSelectionWidget.cpp   |    6 +
 .../MultiDataArraySelectionWidget.cpp         |    2 +
 .../MultiDataContainerSelectionWidget.cpp     |    2 +
 .../PhaseTypeSelectionWidget.cpp              |    2 +
 .../ReadASCIIDataWidget.cpp                   |    1 +
 .../ShapeTypeSelectionWidget.cpp              |    3 +
 .../FilterParameterWidgets/SourceList.cmake   |   22 +-
 .../SVWidgetsLib/QtSupport/QtSDocServer.cpp   |   17 +
 Source/SVWidgetsLib/QtSupport/QtSDocServer.h  |   13 +-
 .../QtSupport/QtSImageGraphicsDelegate.cpp    |   70 +
 .../QtSupport/QtSImageGraphicsDelegate.h      |   71 +-
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.h   |    1 -
 Source/SVWidgetsLib/QtSupport/QtSSettings.h   |    4 +-
 Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp |    1 -
 Source/SVWidgetsLib/Widgets/BookmarksItem.cpp |   90 +-
 Source/SVWidgetsLib/Widgets/BookmarksItem.h   |   79 +-
 .../Widgets/BookmarksItemDelegate.h           |    2 +-
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   15 +
 Source/SVWidgetsLib/Widgets/BookmarksModel.h  |   10 +-
 .../Widgets/BookmarksToolboxWidget.cpp        |    1 +
 .../Widgets/BookmarksToolboxWidget.h          |    1 -
 .../Widgets/BookmarksTreeView.cpp             |   54 +
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h  |   62 +-
 .../Widgets/DataArrayPathDisplay.cpp          |    2 +
 .../Widgets/DataArrayPathSelectionWidget.cpp  |    4 +
 .../Widgets/DataContainerArrayWidget.cpp      |    6 +
 .../SVWidgetsLib/Widgets/DataStructureItem.h  |    3 -
 .../Widgets/DataStructureItemDelegate.h       |    2 +-
 .../Widgets/DataStructureModel.cpp            |   11 +
 .../SVWidgetsLib/Widgets/DataStructureModel.h |   15 +-
 .../Widgets/DataStructureWidget.cpp           |    2 +
 .../Widgets/DataStructureWidget.h             |    9 +-
 .../Widgets/FilterInputWidget.cpp             |    7 +-
 .../Widgets/FilterLibraryToolboxWidget.cpp    |    3 +
 .../SVWidgetsLib/Widgets/FilterListItem.cpp   |   60 +
 Source/SVWidgetsLib/Widgets/FilterListItem.h  |   61 +-
 .../SVWidgetsLib/Widgets/FilterListModel.cpp  |   12 +
 Source/SVWidgetsLib/Widgets/FilterListModel.h |   10 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.cpp  |   32 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.h    |   25 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |    5 +
 .../ImportASCIIDataWizard/DataFormatPage.h    |   14 +-
 .../ImportASCIIDataWizard.cpp                 |    4 +
 .../ImportASCIIDataWizard.h                   |   19 +-
 .../TupleTableItemDelegate.h                  |    2 +-
 .../Widgets/ImportHDF5TreeModel.h             |    2 +-
 .../Widgets/ImportHDF5TreeModelItem.cpp       |   12 +
 .../Widgets/ImportHDF5TreeModelItem.h         |   13 +-
 .../Widgets/IssuesWidgetMessageHandler.cpp    |    1 +
 .../Widgets/PipelineFilterMimeData.cpp        |   12 +
 .../Widgets/PipelineFilterMimeData.h          |   14 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp  |  240 ++-
 Source/SVWidgetsLib/Widgets/PipelineItem.h    |  214 +-
 .../Widgets/PipelineItemDelegate.h            |    2 -
 Source/SVWidgetsLib/Widgets/PipelineModel.cpp |   24 +
 Source/SVWidgetsLib/Widgets/PipelineModel.h   |   24 +-
 Source/SVWidgetsLib/Widgets/PopUpWidget.cpp   |   36 +
 Source/SVWidgetsLib/Widgets/PopUpWidget.h     |   37 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   47 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   52 +-
 Source/SVWidgetsLib/Widgets/SVStyle.cpp       | 1482 +++++++++++++
 Source/SVWidgetsLib/Widgets/SVStyle.h         | 1845 ++++++++++++++---
 ThirdParty/QtWebApp/logging/dualfilelogger.h  |    2 +-
 ThirdParty/QtWebApp/logging/filelogger.h      |    2 +-
 ThirdParty/QtWebApp/logging/logger.h          |    2 +-
 .../QtWebApp/qtservice/qtunixserversocket.h   |    4 +-
 ThirdParty/QtWebApp/qtservice/qtunixsocket.h  |    2 +-
 .../QtWebApp/templateengine/templatecache.h   |    2 +-
 .../QtWebApp/templateengine/templateloader.h  |    2 +-
 .../CodeScraper/CodeScraperConstants.h        |   12 +-
 .../CodeScraper/PyBind11Generator.cpp         |    4 +
 .../Pybind11/CodeScraper/PyBind11Generator.h  |    2 -
 .../CodeScraper/PythonBindingClass.cpp        |    5 +
 .../DerivedSharedPointerClassInit.in.h        |    4 +
 .../Templates/PluginModuleCodeTemplate.in.cpp |    3 +-
 .../Templates/Pybind11CustomTypeCasts.in.h    |   10 +
 .../Pybind11/Templates/Pybind11TopMatter.in.h |    6 +
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |    2 +
 .../Templates/SharedPointerClassInit.in.h     |    4 +
 .../Pybind11/Templates/SimpleClassInit.in.h   |    4 +
 .../Pybind11/cmake/WrappingFunctions.cmake    |    2 +-
 747 files changed, 38505 insertions(+), 7318 deletions(-)
 create mode 100644 Source/SIMPLib/Common/SIMPLPythonMacros.h

diff --git a/.clang-format b/.clang-format
index fa7abd0654..d476640446 100644
--- a/.clang-format
+++ b/.clang-format
@@ -72,7 +72,7 @@ ConstructorInitializerIndentWidth: 0
 # PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 # ReflowComments:  true
-# SortIncludes:    true
+SortIncludes:    false
 # SpaceAfterCStyleCast: false
 # SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: Never
@@ -83,7 +83,7 @@ SpaceBeforeParens: Never
 # SpacesInCStyleCastParentheses: false
 # SpacesInParentheses: false
 # SpacesInSquareBrackets: false
-# Standard:        Cpp11
+Standard:        Cpp11
 TabWidth:        2
 UseTab:          Never
 ...
diff --git a/Contributing.md b/Contributing.md
index 3a58f1f03b..0ecf8e72ed 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -1,4 +1,4 @@
-## Contributing to DREAM.3D ##
+# Contributing to DREAM.3D #
 
 The DREAM.3D project embraces community contributions, and desires to keep the process of contributing changes as easy as possible.  There are a few guidelines contributors should follow; adhering to these guidelines will make the contribution process faster and easier.
 
@@ -8,15 +8,15 @@ The DREAM.3D project utilizes the [fork and pull](https://help.github.com/articl
 
 + Sign up for a [GitHub account](https://github.com/signup/free)
 + Create an issue on the DREAM.3D issue tracker for your expected contribution, if one does not already exist
-	+ In the issue, please describe the scope of the intended contribution and apply the proper label
-	+ If the issue is a bug, please include steps necessary to reproduce the bug
+  + In the issue, please describe the scope of the intended contribution and apply the proper label
+  + If the issue is a bug, please include steps necessary to reproduce the bug
 + Fork the DREAM.3D repository into your own GitHub workspace
 + Create a branch that will encapsulate the work that will address the issue
-	+ The branch should be named with reference to the number of the issue 
-	+ For example, for an issue about "Foo" with number "123", the branch should be named "123_foo"
+  + The branch should be named with reference to the number of the issue 
+  + For example, for an issue about "Foo" with number "123", the branch should be named "123_foo"
 + Make any commits to this branch to address the issue in logical, atomic units
-	+ Please follow established DREAM.3D style when writing your code for contribution
-	+ Primary DREAM.3D styles include tabs as two spaces, camel case for function naming, and the "m_" naming scheme for instance variables
+  + Please follow established DREAM.3D style when writing your code for contribution
+  + Primary DREAM.3D styles include tabs as two spaces, camel case for function naming, and the "m_" naming scheme for instance variables
 + Format your commit messages to reference the open issue
 + Add any necessary unit tests for your additions
 + Ensure that your changes compile on your development platform for the most recent HEAD of the DREAM.3D develop branch
@@ -24,13 +24,10 @@ The DREAM.3D project utilizes the [fork and pull](https://help.github.com/articl
 
 ## Submitting Contributions ##
 
-+ Sign the [Contributor License Agreement](http://dream3d.bluequartz.net/?page_id=448)
 + Submit a pull requests from your remote branch to the DREAM.3D project
-	+ If your pull request contains several commits, please squash them into a single commit
++ If your pull request contains several commits, please squash them into a single commit
 + Update the open issue with a link to the submitted pull request
 + Pull requests are reviewed bi-weekly by at least two core DREAM.3D developers.  The DREAM.3D development team will respond to the pull request with any questions or comments as required by the content of the pull request.  If no action is required, the pull request will be merged immediately.
 + After giving any feedback, the DREAM.3D developers will allow two weeks for response from the contributor.  If no further action is taken by the contributor, the DREAM.3D development team may close the pull request as inactive.
 
-
 ## Submission of Curated Plugins ##
-
diff --git a/Source/Experimental/FilterCallback/FilterParameter.cpp b/Source/Experimental/FilterCallback/FilterParameter.cpp
index ab7970341b..f5f16f93e6 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameter.cpp
@@ -26,7 +26,7 @@ IFilterParameter::~IFilterParameter() = default;
 
 Int32Parameter::Pointer Int32Parameter::New(const std::string& humanLabel,
                                                             const std::string& propertyName,
-                                                            const int& defaultValue,
+                                                            int defaultValue,
                                                             Category category,
                                                             Int32Parameter::SetterCallbackType setterCallback,
                                                             Int32Parameter::GetterCallbackType getterCallback,
@@ -74,7 +74,7 @@ Int32Parameter::Int32Parameter(const std::string& humanLabel, const std::string&
 // -----------------------------------------------------------------------------
 DoubleParameter::Pointer DoubleParameter::New(const std::string& humanLabel,
                                               const std::string& propertyName,
-                                              const double& defaultValue,
+                                              double defaultValue,
                                               Category category,
                                               DoubleParameter::SetterCallbackType setterCallback,
                                               DoubleParameter::GetterCallbackType getterCallback,
@@ -176,3 +176,111 @@ DataArrayPathParameter::DataArrayPathParameter(const std::string& humanLabel, co
   , m_GetterCallback(getterCallback)
 {
 }
+
+// -----------------------------------------------------------------------------
+FilterParameter::Pointer FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setHumanLabel(const std::string& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+std::string FilterParameter::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setPropertyName(const std::string& value)
+{
+  m_PropertyName = value;
+}
+
+// -----------------------------------------------------------------------------
+std::string FilterParameter::getPropertyName() const
+{
+  return m_PropertyName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setCategory(const Category& value)
+{
+  m_Category = value;
+}
+
+// -----------------------------------------------------------------------------
+Category FilterParameter::getCategory() const
+{
+  return m_Category;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setGroupIndex(int value)
+{
+  m_GroupIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterParameter::getGroupIndex() const
+{
+  return m_GroupIndex;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameter::Pointer FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setDefaultValue(int value)
+{
+  m_DefaultValue = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterParameter::getDefaultValue() const
+{
+  return m_DefaultValue;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameter::Pointer FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setDefaultValue(double value)
+{
+  m_DefaultValue = value;
+}
+
+// -----------------------------------------------------------------------------
+double FilterParameter::getDefaultValue() const
+{
+  return m_DefaultValue;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameter::Pointer FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setDefaultValue(const DataArrayPath& value)
+{
+  m_DefaultValue = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath FilterParameter::getDefaultValue() const
+{
+  return m_DefaultValue;
+}
diff --git a/Source/Experimental/FilterCallback/FilterParameter.h b/Source/Experimental/FilterCallback/FilterParameter.h
index 208e10eae3..318c9444c8 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.h
+++ b/Source/Experimental/FilterCallback/FilterParameter.h
@@ -4,6 +4,8 @@
 
 
 
+#include <memory>
+
 #include <functional>
 #include <iostream>
 #include <string>
@@ -11,7 +13,6 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 
@@ -113,8 +114,13 @@
 class IFilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(IFilterParameter)
-    
+    using Self = IFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
     using EnumType = unsigned int;
     
     enum class Category : EnumType
@@ -128,12 +134,47 @@ class IFilterParameter
     IFilterParameter(const std::string& humanLabel, const std::string& propertyName, Category category, int groupIndex);
     
     virtual ~IFilterParameter();
-    
-    SIMPL_INSTANCE_PROPERTY(std::string, HumanLabel)
-    SIMPL_INSTANCE_PROPERTY(std::string, PropertyName)
-    SIMPL_INSTANCE_PROPERTY(Category, Category)
-    SIMPL_INSTANCE_PROPERTY(int, GroupIndex)
-    
+
+    /**
+     * @brief Setter property for HumanLabel
+     */
+    void setHumanLabel(const std::string& value);
+    /**
+     * @brief Getter property for HumanLabel
+     * @return Value of HumanLabel
+     */
+    std::string getHumanLabel() const;
+
+    /**
+     * @brief Setter property for PropertyName
+     */
+    void setPropertyName(const std::string& value);
+    /**
+     * @brief Getter property for PropertyName
+     * @return Value of PropertyName
+     */
+    std::string getPropertyName() const;
+
+    /**
+     * @brief Setter property for Category
+     */
+    void setCategory(const Category& value);
+    /**
+     * @brief Getter property for Category
+     * @return Value of Category
+     */
+    Category getCategory() const;
+
+    /**
+     * @brief Setter property for GroupIndex
+     */
+    void setGroupIndex(int value);
+    /**
+     * @brief Getter property for GroupIndex
+     * @return Value of GroupIndex
+     */
+    int getGroupIndex() const;
+
     virtual void readJson(const QJsonObject& json) = 0;
     virtual void writeJson(QJsonObject& json) const = 0;
     
@@ -150,22 +191,35 @@ class Int32Parameter : public IFilterParameter
 {
     
   public:
-    SIMPL_SHARED_POINTERS(Int32Parameter)
-    
+    using Self = Int32Parameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
     using SetterCallbackType = std::function<void(int)>;
     using GetterCallbackType = std::function<int(void)>;
     
     
     static Pointer New(const std::string& humanLabel,
                        const std::string& propertyName,
-                       const int& defaultValue,
+                       int defaultValue,
                        Category category,
                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
     virtual ~Int32Parameter();
-    
-    SIMPL_INSTANCE_PROPERTY(int, DefaultValue)
-    
+
+    /**
+     * @brief Setter property for DefaultValue
+     */
+    void setDefaultValue(int value);
+    /**
+     * @brief Getter property for DefaultValue
+     * @return Value of DefaultValue
+     */
+    int getDefaultValue() const;
+
     SetterCallbackType getSetterCallback();
     GetterCallbackType getGetterCallback();
     
@@ -190,22 +244,34 @@ class Int32Parameter : public IFilterParameter
 class DoubleParameter : public IFilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DoubleParameter)
-    
+    using Self = DoubleParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
     using SetterCallbackType = std::function<void(double)>;
     using GetterCallbackType = std::function<double(void)>;
     
     static Pointer New(const std::string& humanLabel,
                        const std::string& propertyName,
-                       const double& defaultValue,
+                       double defaultValue,
                        Category category,
                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        int groupIndex = -1);
     virtual ~DoubleParameter();
-    
-    SIMPL_INSTANCE_PROPERTY(double, DefaultValue)
-    
-    
+
+    /**
+     * @brief Setter property for DefaultValue
+     */
+    void setDefaultValue(double value);
+    /**
+     * @brief Getter property for DefaultValue
+     * @return Value of DefaultValue
+     */
+    double getDefaultValue() const;
+
     SetterCallbackType getSetterCallback();
     GetterCallbackType getGetterCallback();
     
@@ -230,8 +296,13 @@ class DoubleParameter : public IFilterParameter
 class DataArrayPathParameter : public IFilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataArrayPathParameter)
-    
+    using Self = DataArrayPathParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
     
@@ -243,10 +314,17 @@ class DataArrayPathParameter : public IFilterParameter
                        int groupIndex = -1);
     
     virtual ~DataArrayPathParameter();
-    
-    SIMPL_INSTANCE_PROPERTY(DataArrayPath, DefaultValue)
-    
-    
+
+    /**
+     * @brief Setter property for DefaultValue
+     */
+    void setDefaultValue(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DefaultValue
+     * @return Value of DefaultValue
+     */
+    DataArrayPath getDefaultValue() const;
+
     SetterCallbackType getSetterCallback();
     GetterCallbackType getGetterCallback();
     
@@ -258,6 +336,14 @@ class DataArrayPathParameter : public IFilterParameter
     DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
     
   private:
+    std::string m_HumanLabel = {};
+    std::string m_PropertyName = {};
+    Category m_Category = {};
+    int m_GroupIndex = {};
+    int m_DefaultInt = {};
+    double m_DefaultDouble = {};
+    DataArrayPath m_DefaultDAP = {};
+
     DataArrayPathParameter(const DataArrayPathParameter&) = delete; // Copy Constructor Not Implemented
     void operator=(const DataArrayPathParameter&) = delete;         // Move assignment Not Implemented
 
diff --git a/Source/Experimental/FilterCallback/IFilter.cpp b/Source/Experimental/FilterCallback/IFilter.cpp
index e12862b5ea..68b1373c00 100644
--- a/Source/Experimental/FilterCallback/IFilter.cpp
+++ b/Source/Experimental/FilterCallback/IFilter.cpp
@@ -114,3 +114,63 @@ void IFilter::preflight()
 //  emit preflightExecuted();
 //  setInPreflight(false);
 }
+
+// -----------------------------------------------------------------------------
+void IFilter::setIndex(int value)
+{
+  m_Index = value;
+}
+
+// -----------------------------------------------------------------------------
+int IFilter::getIndex() const
+{
+  return m_Index;
+}
+
+// -----------------------------------------------------------------------------
+void IFilter::setParameter1(int value)
+{
+  m_Parameter1 = value;
+}
+
+// -----------------------------------------------------------------------------
+int IFilter::getParameter1() const
+{
+  return m_Parameter1;
+}
+
+// -----------------------------------------------------------------------------
+void IFilter::setParameter2(double value)
+{
+  m_Parameter2 = value;
+}
+
+// -----------------------------------------------------------------------------
+double IFilter::getParameter2() const
+{
+  return m_Parameter2;
+}
+
+// -----------------------------------------------------------------------------
+void IFilter::setFeatureIdsPath(const DataArrayPath& value)
+{
+  m_FeatureIdsPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath IFilter::getFeatureIdsPath() const
+{
+  return m_FeatureIdsPath;
+}
+
+// -----------------------------------------------------------------------------
+void IFilter::setInPreflight(bool value)
+{
+  m_InPreflight = value;
+}
+
+// -----------------------------------------------------------------------------
+bool IFilter::getInPreflight() const
+{
+  return m_InPreflight;
+}
diff --git a/Source/Experimental/FilterCallback/IFilter.h b/Source/Experimental/FilterCallback/IFilter.h
index adbb2050cd..6cf670275e 100644
--- a/Source/Experimental/FilterCallback/IFilter.h
+++ b/Source/Experimental/FilterCallback/IFilter.h
@@ -5,7 +5,6 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 
@@ -22,12 +21,47 @@ class IFilter
     virtual ~IFilter();
     
     void setupParameters();
-    
-    SIMPL_FILTER_PARAMETER(int, Index)
-    SIMPL_FILTER_PARAMETER(int, Parameter1)
-    SIMPL_FILTER_PARAMETER(double, Parameter2)
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FeatureIdsPath)
-    
+
+    /**
+     * @brief Setter property for Index
+     */
+    void setIndex(int value);
+    /**
+     * @brief Getter property for Index
+     * @return Value of Index
+     */
+    int getIndex() const;
+
+    /**
+     * @brief Setter property for Parameter1
+     */
+    void setParameter1(int value);
+    /**
+     * @brief Getter property for Parameter1
+     * @return Value of Parameter1
+     */
+    int getParameter1() const;
+
+    /**
+     * @brief Setter property for Parameter2
+     */
+    void setParameter2(double value);
+    /**
+     * @brief Getter property for Parameter2
+     * @return Value of Parameter2
+     */
+    double getParameter2() const;
+
+    /**
+     * @brief Setter property for FeatureIdsPath
+     */
+    void setFeatureIdsPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FeatureIdsPath
+     * @return Value of FeatureIdsPath
+     */
+    DataArrayPath getFeatureIdsPath() const;
+
     void readFilterParameters(QJsonObject& root);
     
     void writeParameters(QJsonObject& root);
@@ -35,9 +69,17 @@ class IFilter
     void printValues(std::ostream& out);
     
     std::string getName();
-    
-      SIMPL_INSTANCE_PROPERTY(bool, InPreflight)
-    
+
+    /**
+     * @brief Setter property for InPreflight
+     */
+    void setInPreflight(bool value);
+    /**
+     * @brief Getter property for InPreflight
+     * @return Value of InPreflight
+     */
+    bool getInPreflight() const;
+
     std::vector<IFilterParameter::Pointer> getFilterParameters();
     
     virtual void preflight();
@@ -79,6 +121,12 @@ class IFilter
     void dataCheck();
     
   private:
+    int m_Index = {};
+    int m_Parameter1 = {};
+    double m_Parameter2 = {};
+    DataArrayPath m_FeatureIdsPath = {};
+    bool m_InPreflight = {};
+
     std::vector<IFilterParameter::Pointer> m_FilterParameters;
 
   public:
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index f9a625e0d7..5cca769852 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -51,7 +51,10 @@
 #include <QtCore/QString>
 
 // DREAM3DLib includes
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index cb0958356a..cdf87f5a24 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -37,9 +37,21 @@
 
 #if defined(_MSC_VER)
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+
+/*
+  "It's a known, long-standing bug in the compiler system's headers.  For
+  some reason the manufacturer, in its infinite wisdom, chose to #define
+  macros min() and max() in violation of the upper-case convention and so
+  break any legitimate functions with those names, including those in the
+  standard C++ library."
+  */
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 #endif
 
 #include <limits>
+#include <cstdint>
 
 #include <QtCore/QString>
 
@@ -53,30 +65,29 @@
 namespace SIMPL
 {
 
-  typedef uint32_t Rgb;
-  const Rgb  RGB_MASK    = 0x00ffffff;                // masks RGB values
-  const QString PathSep("|");
-  static const uint8_t Unchecked = 0;
-  static const uint8_t PartiallyChecked = 1;
-  static const uint8_t Checked = 2;
-
-  enum InfoStringFormat
-  {
-    HtmlFormat = 0,
-//      JsonFormat,
-//      TextFormat,
-//      XmlFormat,
-    UnknownFormat
-  };
+using Rgb = uint32_t;
+const Rgb RGB_MASK = 0x00ffffff; // masks RGB values
+const QString PathSep("|");
+const uint8_t Unchecked = 0;
+const uint8_t PartiallyChecked = 1;
+const uint8_t Checked = 2;
 
+enum InfoStringFormat
+{
+  HtmlFormat = 0,
+  //      JsonFormat,
+  //      TextFormat,
+  //      XmlFormat,
+  UnknownFormat
+};
 
-  /** @brief Constants defined for the Stacking order of images into a 3D Volume */
-  namespace RefFrameZDir
-  {
-    static const unsigned int LowtoHigh = 0;
-    static const unsigned int HightoLow = 1;
-    static const unsigned int UnknownRefFrameZDirection = 2;
-  }
+/** @brief Constants defined for the Stacking order of images into a 3D Volume */
+namespace RefFrameZDir
+{
+const unsigned int LowtoHigh = 0;
+const unsigned int HightoLow = 1;
+const unsigned int UnknownRefFrameZDirection = 2;
+} // namespace RefFrameZDir
 
   namespace TypeNames
   {
@@ -104,22 +115,22 @@ namespace SIMPL
 
   namespace TypeEnums
   {
-    static const int Int8 = 0;
-    static const int UInt8 = 1;
-    static const int Int16 = 2;
-    static const int UInt16 = 3;
-    static const int Int32 = 4;
-    static const int UInt32 = 5;
-    static const int Int64 = 6;
-    static const int UInt64 = 7;
-    static const int Float = 8;
-    static const int Double = 9;
-    static const int Bool = 10;
-    static const int SizeT = 11;
-
-    static const int UnknownType = 12;
-    const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
-                                    TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
+  const int Int8 = 0;
+  const int UInt8 = 1;
+  const int Int16 = 2;
+  const int UInt16 = 3;
+  const int Int32 = 4;
+  const int UInt32 = 5;
+  const int Int64 = 6;
+  const int UInt64 = 7;
+  const int Float = 8;
+  const int Double = 9;
+  const int Bool = 10;
+  const int SizeT = 11;
+
+  const int UnknownType = 12;
+  const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
+                                  TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
   }
 
   namespace NumericTypes
@@ -203,9 +214,9 @@ namespace SIMPL
   {
     const QString None("None");
     const QString AnyPrimitive("Any");
-    static const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
-    //static const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
-    //static const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
+    const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
+    // const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
+    // const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
 
     const QString AttributeMatrixName("AttributeMatrix");
     const QString ElementAttributeMatrixName("ElementAttributeMatrix");
@@ -1060,7 +1071,7 @@ const signed int Horizontal = 0;
 const signed int Vertical = 1;
 const signed int Square = 2;
 };
-}
+} // namespace SIMPL
 
 namespace Core
 {
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
index e6becd2754..b383feda9c 100644
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
@@ -47,3 +47,136 @@ CreatedArrayHelpIndexEntry::CreatedArrayHelpIndexEntry()
 //
 // -----------------------------------------------------------------------------
 CreatedArrayHelpIndexEntry::~CreatedArrayHelpIndexEntry() = default;
+
+// -----------------------------------------------------------------------------
+CreatedArrayHelpIndexEntry::Pointer CreatedArrayHelpIndexEntry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+CreatedArrayHelpIndexEntry::Pointer CreatedArrayHelpIndexEntry::New()
+{
+  Pointer sharedPtr(new(CreatedArrayHelpIndexEntry));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getNameOfClass() const
+{
+  return QString("CreatedArrayHelpIndexEntry");
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::ClassName()
+{
+  return QString("CreatedArrayHelpIndexEntry");
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setFilterName(const QString& value)
+{
+  m_FilterName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getFilterName() const
+{
+  return m_FilterName;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setFilterHumanLabel(const QString& value)
+{
+  m_FilterHumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getFilterHumanLabel() const
+{
+  return m_FilterHumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setFilterGroup(const QString& value)
+{
+  m_FilterGroup = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getFilterGroup() const
+{
+  return m_FilterGroup;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setFilterSubGroup(const QString& value)
+{
+  m_FilterSubGroup = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getFilterSubGroup() const
+{
+  return m_FilterSubGroup;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setArrayDefaultName(const QString& value)
+{
+  m_ArrayDefaultName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getArrayDefaultName() const
+{
+  return m_ArrayDefaultName;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setArrayGroup(const QString& value)
+{
+  m_ArrayGroup = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getArrayGroup() const
+{
+  return m_ArrayGroup;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setArrayType(const QString& value)
+{
+  m_ArrayType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getArrayType() const
+{
+  return m_ArrayType;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setArrayNumComponents(int value)
+{
+  m_ArrayNumComponents = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreatedArrayHelpIndexEntry::getArrayNumComponents() const
+{
+  return m_ArrayNumComponents;
+}
+
+// -----------------------------------------------------------------------------
+void CreatedArrayHelpIndexEntry::setArrayDescription(const QString& value)
+{
+  m_ArrayDescription = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreatedArrayHelpIndexEntry::getArrayDescription() const
+{
+  return m_ArrayDescription;
+}
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
index ce17eeae9c..1b726d322c 100755
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -36,32 +36,126 @@
 #pragma once
 
 #include <vector>
+#include <memory>
+
+#include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 class SIMPLib_EXPORT CreatedArrayHelpIndexEntry
 {
   public:
-    SIMPL_SHARED_POINTERS(CreatedArrayHelpIndexEntry)
-    SIMPL_STATIC_NEW_MACRO(CreatedArrayHelpIndexEntry)
-    SIMPL_TYPE_MACRO(CreatedArrayHelpIndexEntry)
+    using Self = CreatedArrayHelpIndexEntry;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
+     */
+    static QString ClassName();
 
     typedef QVector<Pointer> VectorType;
 
     virtual ~CreatedArrayHelpIndexEntry();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterName)
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterHumanLabel)
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterGroup)
-    SIMPL_INSTANCE_STRING_PROPERTY(FilterSubGroup)
+    /**
+     * @brief Setter property for FilterName
+     */
+    void setFilterName(const QString& value);
+    /**
+     * @brief Getter property for FilterName
+     * @return Value of FilterName
+     */
+    QString getFilterName() const;
+
+    /**
+     * @brief Setter property for FilterHumanLabel
+     */
+    void setFilterHumanLabel(const QString& value);
+    /**
+     * @brief Getter property for FilterHumanLabel
+     * @return Value of FilterHumanLabel
+     */
+    QString getFilterHumanLabel() const;
+
+    /**
+     * @brief Setter property for FilterGroup
+     */
+    void setFilterGroup(const QString& value);
+    /**
+     * @brief Getter property for FilterGroup
+     * @return Value of FilterGroup
+     */
+    QString getFilterGroup() const;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ArrayDefaultName)
-    SIMPL_INSTANCE_STRING_PROPERTY(ArrayGroup)
-    SIMPL_INSTANCE_STRING_PROPERTY(ArrayType)
-    SIMPL_INSTANCE_PROPERTY(int, ArrayNumComponents)
-    SIMPL_INSTANCE_STRING_PROPERTY(ArrayDescription)
+    /**
+     * @brief Setter property for FilterSubGroup
+     */
+    void setFilterSubGroup(const QString& value);
+    /**
+     * @brief Getter property for FilterSubGroup
+     * @return Value of FilterSubGroup
+     */
+    QString getFilterSubGroup() const;
 
+    /**
+     * @brief Setter property for ArrayDefaultName
+     */
+    void setArrayDefaultName(const QString& value);
+    /**
+     * @brief Getter property for ArrayDefaultName
+     * @return Value of ArrayDefaultName
+     */
+    QString getArrayDefaultName() const;
+
+    /**
+     * @brief Setter property for ArrayGroup
+     */
+    void setArrayGroup(const QString& value);
+    /**
+     * @brief Getter property for ArrayGroup
+     * @return Value of ArrayGroup
+     */
+    QString getArrayGroup() const;
+
+    /**
+     * @brief Setter property for ArrayType
+     */
+    void setArrayType(const QString& value);
+    /**
+     * @brief Getter property for ArrayType
+     * @return Value of ArrayType
+     */
+    QString getArrayType() const;
+
+    /**
+     * @brief Setter property for ArrayNumComponents
+     */
+    void setArrayNumComponents(int value);
+    /**
+     * @brief Getter property for ArrayNumComponents
+     * @return Value of ArrayNumComponents
+     */
+    int getArrayNumComponents() const;
+
+    /**
+     * @brief Setter property for ArrayDescription
+     */
+    void setArrayDescription(const QString& value);
+    /**
+     * @brief Getter property for ArrayDescription
+     * @return Value of ArrayDescription
+     */
+    QString getArrayDescription() const;
 
   protected:
     CreatedArrayHelpIndexEntry();
@@ -71,6 +165,17 @@ class SIMPLib_EXPORT CreatedArrayHelpIndexEntry
     CreatedArrayHelpIndexEntry(CreatedArrayHelpIndexEntry&&) = delete;      // Move Constructor Not Implemented
     CreatedArrayHelpIndexEntry& operator=(const CreatedArrayHelpIndexEntry&) = delete; // Copy Assignment Not Implemented
     CreatedArrayHelpIndexEntry& operator=(CreatedArrayHelpIndexEntry&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_FilterName = {};
+    QString m_FilterHumanLabel = {};
+    QString m_FilterGroup = {};
+    QString m_FilterSubGroup = {};
+    QString m_ArrayDefaultName = {};
+    QString m_ArrayGroup = {};
+    QString m_ArrayType = {};
+    int m_ArrayNumComponents = {};
+    QString m_ArrayDescription = {};
 };
 
 
diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index 3089d41ef9..ea095c47d3 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QObject>
 
-#include "SIMPLib/SIMPLib.h"
 
 #include "SIMPLib/Common/PhaseType.h"
 
@@ -55,12 +54,16 @@ class SIMPLib_EXPORT EnsembleInfo : public QObject
 {
   Q_OBJECT
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(EnsembleInfo)
   PYB11_CREATION()
   PYB11_METHOD(void addValues ARGS const,CrystalStructure const,PhaseType::Type const,QString)
   PYB11_METHOD(void getValues ARGS size_t CrystalStructure& PhaseType::Type& QString&)
   PYB11_METHOD(void remove ARGS size_t)
   PYB11_METHOD(void clear)
+#endif
+
   // clang-format on
 public:
   using EnumType = uint32_t;
diff --git a/Source/SIMPLib/Common/IObserver.cpp b/Source/SIMPLib/Common/IObserver.cpp
index fdacb87c06..269fb09dda 100644
--- a/Source/SIMPLib/Common/IObserver.cpp
+++ b/Source/SIMPLib/Common/IObserver.cpp
@@ -35,6 +35,8 @@
 
 #include "IObserver.h"
 
+#include <QtCore/QTextStream>
+
 #include <iostream>
 
 // -----------------------------------------------------------------------------
@@ -57,3 +59,15 @@ void IObserver::processPipelineMessage(const AbstractMessage::Pointer& pm)
   ss << pm->generateMessageString();
   std::cout << str.toStdString() << std::endl;
 }
+
+// -----------------------------------------------------------------------------
+QString IObserver::getNameOfClass() const
+{
+  return QString("IObserver");
+}
+
+// -----------------------------------------------------------------------------
+QString IObserver::ClassName()
+{
+  return QString("IObserver");
+}
diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
index f55c2314ba..575298cc9a 100755
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -45,7 +45,14 @@ class SIMPLib_EXPORT IObserver
   public:
     IObserver();
     virtual ~IObserver();
-    SIMPL_TYPE_MACRO(IObserver)
+    /**
+     * @brief Returns the name of the class for IObserver
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for IObserver
+     */
+    static QString ClassName();
 
     virtual void processPipelineMessage(const AbstractMessage::Pointer& pm);
 
@@ -54,5 +61,7 @@ class SIMPLib_EXPORT IObserver
     IObserver(IObserver&&) = delete;           // Move Constructor Not Implemented
     IObserver& operator=(const IObserver&) = delete; // Copy Assignment Not Implemented
     IObserver& operator=(IObserver&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index 9ae0734723..88c281625a 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -146,3 +146,15 @@ void Observable::notifyProgressMessageWithPrefix(int progress, const QString &pr
 
   notifyProgressMessage(progress, msg);
 }
+
+// -----------------------------------------------------------------------------
+QString Observable::getNameOfClass() const
+{
+  return QString("Observable");
+}
+
+// -----------------------------------------------------------------------------
+QString Observable::ClassName()
+{
+  return QString("Observable");
+}
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index ec8fd5b679..e49d2184a5 100755
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -37,9 +37,8 @@
 #pragma once
 
 #include <QtCore/QString>
+#include <QtCore/QObject>
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 
@@ -54,6 +53,8 @@
 class SIMPLib_EXPORT Observable : public QObject
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(Observable)
     PYB11_METHOD(void setErrorCondition ARGS code messageText)
     PYB11_METHOD(void setErrorConditionWithPrefix ARGS code prefix messageText)
@@ -63,9 +64,17 @@ class SIMPLib_EXPORT Observable : public QObject
     PYB11_METHOD(void notifyStatusMessageWithPrefix ARGS prefix messageText)
     PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
     PYB11_METHOD(void notifyProgressMessageWithPrefix ARGS progress prefix messageText)
+#endif
 
   public:
-    SIMPL_TYPE_MACRO(Observable)
+    /**
+     * @brief Returns the name of the class for Observable
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for Observable
+     */
+    static QString ClassName();
 
     Observable();
 
@@ -101,6 +110,8 @@ class SIMPLib_EXPORT Observable : public QObject
      * @param msg
      */
     void messageGenerated(const AbstractMessage::Pointer& msg);
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Common/Observer.cpp b/Source/SIMPLib/Common/Observer.cpp
index e4e2f3125a..6e964fccb4 100644
--- a/Source/SIMPLib/Common/Observer.cpp
+++ b/Source/SIMPLib/Common/Observer.cpp
@@ -55,3 +55,15 @@ void Observer::processPipelineMessage(const AbstractMessage::Pointer& pm)
   // Just call the superclass
   IObserver::processPipelineMessage(pm);
 }
+
+// -----------------------------------------------------------------------------
+QString Observer::getNameOfClass() const
+{
+  return QString("_SUPERObserver");
+}
+
+// -----------------------------------------------------------------------------
+QString Observer::ClassName()
+{
+  return QString("_SUPERObserver");
+}
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index 0ef14e2d54..a4bcdcd0fb 100755
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -40,7 +40,6 @@
 #include <QtCore/QObject>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/IObserver.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
 
@@ -59,7 +58,14 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
 
   public:
     Observer();
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Observer, IObserver)
+    /**
+     * @brief Returns the name of the class for Observer
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for Observer
+     */
+    static QString ClassName();
 
     ~Observer() override;
 
@@ -71,6 +77,8 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
     Observer(Observer&&) = delete;            // Move Constructor Not Implemented
     Observer& operator=(const Observer&) = delete; // Copy Assignment Not Implemented
     Observer& operator=(Observer&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 485b967724..d488b324a1 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -199,6 +199,15 @@ class SIMPLArray
     return dest;
   }
 
+  /**
+   * @brief Returns a copy of the data as a std::array<T,Dimension>
+   * @return
+   */
+  std::array<T, Dimension> toArray() const
+  {
+    return m_Array;
+  }
+
 protected:
   void setValue(size_t i, value_type value)
   {
diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
new file mode 100644
index 0000000000..e4e8d40c7b
--- /dev/null
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -0,0 +1,198 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+/* *****************************************************************************
+ * *****************************************************************************
+ * *****************************************************************************
+ *
+ * PyBind11 Macros that we can use to explicitly define which setters & getters
+ * will be exposed to the Python library
+ */
+
+/**
+ * @brief PYB11_CREATE_BINDINGS This macro lets the wrapper know that we want to
+ * wrap this class with Python bindings. It should only take a single argument
+ * which is the name of the class. If this line is commented out using the standard
+ * C++ style of single line comment then <b>NO WRAPPING</b> will be performed
+ * on the class.
+ * @code
+ * PYB11_CREATE_BINDINGS(AbstractFilter)
+ * @endcode
+ */
+#define PYB11_CREATE_BINDINGS(...)
+
+/**
+ * @brief PYB11_STATIC_NEW_MACRO
+ *
+ */
+#define PYB11_STATIC_NEW_MACRO(...)
+
+/**
+ * @brief PYB11_FILTER_NEW_MACRO
+ *
+ */
+#define PYB11_FILTER_NEW_MACRO(...)
+
+/**
+ * @brief PYB11_SHARED_POINTERS
+ *
+ */
+#define PYB11_SHARED_POINTERS(...)
+
+/**
+ * @brief PYB11_FILTER_PARAMETER
+ *
+ */
+#define PYB11_FILTER_PARAMETER(...)
+
+/**
+ * @brief PYB11_NO_BINDINGS This macro will ensure that the class is NOT wrapped
+ * with python bindings. Only a single argument which is the name of the class
+ * should be used.
+ * @code
+ * PYB11_NO_BINDINGS(AbstractFilter)
+ * @endcode
+ */
+#define PYB11_NO_BINDINGS(...)
+
+/**
+ * @brief PYB11_STATIC_CREATION This macro will wrap the "static New()" function
+ * that most of the SIMPL classes implement as a way to instantiate the class in
+ * addition to other static methods that are used for a class. The argument types
+ * to the static method should be listed <b>WITHOUT</b> any spaces for each argument.
+ *
+ * @code
+ * PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
+ * @endcode
+ *
+ * If there are several static creation methods that overload each other then the following form can be used:
+ *
+ * @code
+ * PYB11_STATIC_CREATION(New OVERLOAD QString)
+ * PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
+ * @endcode
+ */
+#define PYB11_STATIC_CREATION(...)
+
+/**
+ * @brief PYB11_CREATION This macro is used for non-static constructors that need
+ * to be wrapped. The argument types need to be lists where each argument cannot
+ * containe spaces. Use a typedef if needed, but using a typedef also has its
+ * own issues. @see DataArrayPath for an example.
+ *
+ * @code
+ * PYB11_CREATION(ARGS QString QString QString)
+ * @endcode
+ */
+#define PYB11_CREATION(...)
+
+/**
+ * @brief PYB11_ENUMERATION This macro will allow a class enumeration to be wrapped
+ * in Python an available to the Python side. @see IGeoemtry for an example. The
+ * macro should only take a single argument.
+ * @code
+ * PYB11_ENUMERATION(Type)
+ * PYB11_ENUMERATION(VtkCellType)
+ * @endcode
+ */
+#define PYB11_ENUMERATION(...)
+
+/**
+* @brief PYB11_PROPERTY This macro is used to wrap a single class instance property
+* that is typically used as an input parameter for a filter. This macro should
+* <b>NOT</b> be used for just wrapping instance methods. Use the PYB11_METHOD for
+* that. @see AbstractFilter. There are number of arguments depending on if the
+* property is a read-only or read-write variable. At least 4 arguments to the
+* macro are required when the property is read only.
+* @code
+  PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)
+* @endcode
+* and 6 arguments when the property is read-write.
+* @code
+* PYB11_PROPERTY(bool Cancel READ getCancel WRITE setCancel)
+* @endcode
+*
+* and if there are additional overloads of the Getter that returns a const reference such as
+* @code
+* const QString& getFoo() const;
+* @endcode
+*
+* then you would add on the CONST_GET_OVERLOAD as the last argument to the macro.
+*/
+#define PYB11_PROPERTY(...)
+
+/**
+ * @brief This macro is used to expose a method to the Python bindings. The signature
+ * of the macro should be the following:
+ * PYB11_METHOD( _return_type_ _name_of_method_ [ARGS|OVERLOAD] ....)
+ * If the ARGS command is used then simply list the variable names for each argument.
+ * For example if you have a method "void getFoo(const QString &foo)" that you want
+ * to expose:
+ * @code
+ * PYB11_METHOD(void getFoo ARGS Foo)
+ * @endcode
+ *
+ * If your method does not take any arguments then leave out the ARGS keyword.
+ *
+ * If you are have overloads of the method that you want to expose to Python then
+ * the "OVERLOAD" version of the method should be used. Again, say we have two
+ * methods that we want to expose.
+ * @code
+ * void setPath(const QString &name)
+ * void setPath(const DataArrayPath &path)
+ * @endcode
+ *
+ * then we would use the following set of invocations:
+ * @code
+ * PYB11_METHOD(void setPath OVERLOAD const.QString.&,Name)
+ * PYB11_METHOD(void setPath OVERLOAD const.DataArrayPath.&,Path)
+ * @endcode
+ * Note that in order to get the (const QString &) correct we used the '.' charater
+ * to declare the type. This is required as the macro is split using spaces. When
+ * then end code is generated the '.' characters will be replaced with spaces.
+ *
+ * If the method that is being wrapped in python is a 'const' method then the last argument should be CONST_METHOD. In
+ * the example below there is a pair of overloaded methods that are both 'const'.
+ *
+ * @code
+ * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
+ * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
+ * @endcode
+ */
+#define PYB11_METHOD(...)
+
+// End of PYBIND11 Macro Definitions
+/* *****************************************************************************
+ * *****************************************************************************
+ * *****************************************************************************
+ */
diff --git a/Source/SIMPLib/Common/SIMPLRange.h b/Source/SIMPLib/Common/SIMPLRange.h
index cb97fb381f..afa2a2c7fb 100644
--- a/Source/SIMPLib/Common/SIMPLRange.h
+++ b/Source/SIMPLib/Common/SIMPLRange.h
@@ -36,7 +36,7 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.h b/Source/SIMPLib/Common/SIMPLRange2D.h
index d1f810c779..222f846478 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.h
+++ b/Source/SIMPLib/Common/SIMPLRange2D.h
@@ -36,7 +36,7 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
index 6199bd17df..b685fb802f 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.h
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -36,7 +36,7 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 43399803c1..d5071c9d57 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -531,107 +531,6 @@ public:
   public:\
   virtual bool is##prpty() { return m_##prpty; }
 
-/**
- * @brief
- */
-#define SIMPL_FILTER_NEW_MACRO(Class)                                                                                                                                                                  \
-  static std::shared_ptr<Class> New()                                                                                                                                                                  \
-  {                                                                                                                                                                                                    \
-    struct make_shared_enabler : public Class                                                                                                                                                          \
-    {                                                                                                                                                                                                  \
-    };                                                                                                                                                                                                 \
-    std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();                                                                                                                \
-    val->setupFilterParameters();                                                                                                                                                                      \
-    return val;                                                                                                                                                                                        \
-  }
-
-/**
-* @brief
-*/
-#define SIMPL_FILTER_PARAMETER(type, prpty)\
-  private:\
-  type   m_##prpty;\
-  public:\
-  void set##prpty(const type& value) { this->m_##prpty = value; }\
-  type get##prpty() const { return m_##prpty; }
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#define SIMPL_SET_2DVECTOR_PROPERTY(type, prpty, varname)\
-  void set##prpty(type value[2]) {\
-    (varname)[0] = value[0]; (varname)[1] = value[1]; }\
-  void set##prpty(const type& value_0, const type& value_1) {\
-    (varname)[0] = value_0; (varname)[1] = value_1; }\
-  void set##prpty(const std::tuple<type, type> &var) {\
-    (varname)[0] = std::get<0>(var); (varname)[1] = std::get<1>(var); }
-
-#define SIMPL_GET_2DVECTOR_PROPERTY(type, prpty, varname)\
-  void get##prpty(type value[2]) {\
-    value[0] = (varname)[0]; value[1] = (varname)[1]; }\
-  void get##prpty((type) &value_0, (type) &value_1) {\
-    value_0 = (varname)[0]; value_1 = (varname)[1]; }\
-  std::tuple<type, type> get##prpty() const {\
-    return std::make_tuple((varname)[0], (varname)[1]); }
-
-#define SIMPL_INSTANCE_VEC2_PROPERTY(type, prpty)\
-  private:\
-  type   m_##prpty[2];\
-  public:\
-  SIMPL_SET_2DVECTOR_PROPERTY(type, prpty, m_##prpty)\
-  SIMPL_GET_2DVECTOR_PROPERTY(type, prpty, m_##prpty)
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#define SIMPL_SET_VEC3_PROPERTY(type, prpty, varname)\
-  void set##prpty(type value[3]) {\
-    (varname)[0] = value[0]; (varname)[1] = value[1]; (varname)[2] = value[2]; }\
-  void set##prpty(type value_0, type value_1, type value_2) {\
-    (varname)[0] = value_0; (varname)[1] = value_1; (varname)[2] = value_2; }\
-  void set##prpty(const std::tuple<type, type, type> &var) {\
-    (varname)[0] = std::get<0>(var); (varname)[1] = std::get<1>(var); (varname)[2] = std::get<2>(var); }
-
-#define SIMPL_GET_VEC3_PROPERTY(type, prpty, varname)\
-  void get##prpty(type value[3]) {\
-    value[0] = (varname)[0]; value[1] = (varname)[1]; value[2] = (varname)[2]; }\
-  void get##prpty(type &value_0, type &value_1, type &value_2) {\
-    value_0 = (varname)[0]; value_1 = (varname)[1]; value_2 = (varname)[2]; }\
-  std::tuple<type, type, type> get##prpty() const {\
-    return std::make_tuple((varname)[0], (varname)[1], (varname)[2]); }
-
-#define SIMPL_INSTANCE_VEC3_PROPERTY(type, prpty)\
-  private:\
-  type   m_##prpty[3];\
-  public:\
-  SIMPL_SET_VEC3_PROPERTY(type, prpty, m_##prpty)\
-  SIMPL_GET_VEC3_PROPERTY(type, prpty, m_##prpty)
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-#define SIMPL_SET_VEC3_PROPERTY_VO(type, prpty, varname)\
-   void set##prpty(type value[3]) override {\
-    (varname)[0] = value[0]; (varname)[1] = value[1]; (varname)[2] = value[2]; }\
-   void set##prpty(type value_0, type value_1, type value_2) override {\
-    (varname)[0] = value_0; (varname)[1] = value_1; (varname)[2] = value_2; }\
-   void set##prpty(const std::tuple<type, type, type> &var) override {\
-    (varname)[0] = std::get<0>(var); (varname)[1] = std::get<1>(var); (varname)[2] = std::get<2>(var);}
-
-#define SIMPL_GET_VEC3_PROPERTY_VO(type, prpty, varname)\
-  virtual std::tuple<type, type, type> get##prpty() const override\
-  {\
-    return std::make_tuple((varname)[0], (varname)[1], (varname)[2]);\
-  }
-
-#define SIMPL_INSTANCE_VEC3_PROPERTY_VO(type, prpty)\
-  private:\
-  type   m_##prpty[3];\
-  public:\
-  SIMPL_SET_VEC3_PROPERTY_VO(type, prpty, m_##prpty)\
-  SIMPL_GET_VEC3_PROPERTY_VO(type, prpty, m_##prpty)
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -745,15 +644,6 @@ private:    \
 #define SIMPL_COPY_INSTANCEVAR(name)\
   filter->set##name(get##name());
 
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-/**
-* @brief Macro to silence compiler warnings for unused parameters in methods.
-*/
-#define SIMPL_NOT_USED(x)
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index aa0abc72bd..62e81cb40a 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -33,6 +33,9 @@
 
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 using namespace TemplateHelpers;
 
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 2ac5858ba5..45f5271b47 100755
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -42,6 +42,7 @@
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 class AbstractFilter;
 
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 0e2dc36811..29cc35f210 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -33,15 +33,22 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ApplyImageTransforms.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
 
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -189,7 +196,7 @@ AbstractFilter::Pointer ApplyImageTransforms::newFilterInstance(bool copyFilterP
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getCompiledLibraryName() const
+QString ApplyImageTransforms::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -197,7 +204,7 @@ const QString ApplyImageTransforms::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getBrandingString() const
+QString ApplyImageTransforms::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -205,7 +212,7 @@ const QString ApplyImageTransforms::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getFilterVersion() const
+QString ApplyImageTransforms::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -216,7 +223,7 @@ const QString ApplyImageTransforms::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getGroupName() const
+QString ApplyImageTransforms::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -224,7 +231,7 @@ const QString ApplyImageTransforms::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getSubGroupName() const
+QString ApplyImageTransforms::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ImageFilters;
 }
@@ -232,7 +239,7 @@ const QString ApplyImageTransforms::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ApplyImageTransforms::getHumanLabel() const
+QString ApplyImageTransforms::getHumanLabel() const
 {
   return "Apply Image Transforms";
 }
@@ -240,7 +247,48 @@ const QString ApplyImageTransforms::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ApplyImageTransforms::getUuid()
+QUuid ApplyImageTransforms::getUuid() const
 {
   return QUuid("{a4bd18bc-3306-5e41-bc41-4cb4248226bd}");
 }
+
+// -----------------------------------------------------------------------------
+ApplyImageTransforms::Pointer ApplyImageTransforms::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ApplyImageTransforms> ApplyImageTransforms::New()
+{
+  struct make_shared_enabler : public ApplyImageTransforms
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ApplyImageTransforms::getNameOfClass() const
+{
+  return QString("_SUPERApplyImageTransforms");
+}
+
+// -----------------------------------------------------------------------------
+QString ApplyImageTransforms::ClassName()
+{
+  return QString("_SUPERApplyImageTransforms");
+}
+
+// -----------------------------------------------------------------------------
+void ApplyImageTransforms::setImageDataContainers(const QStringList& value)
+{
+  m_ImageDataContainers = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList ApplyImageTransforms::getImageDataContainers() const
+{
+  return m_ImageDataContainers;
+}
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index 2ceeced4e2..48fd89f948 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -35,8 +35,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
@@ -47,33 +48,56 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
   Q_OBJECT
 
   public:
-    SIMPL_SHARED_POINTERS(ApplyImageTransforms)
-    SIMPL_FILTER_NEW_MACRO(ApplyImageTransforms)
-    SIMPL_TYPE_MACRO_SUPER(ApplyImageTransforms, AbstractFilter)
+    using Self = ApplyImageTransforms;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ApplyImageTransforms> New();
+
+    /**
+     * @brief Returns the name of the class for ApplyImageTransforms
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ApplyImageTransforms
+     */
+    static QString ClassName();
 
     ~ApplyImageTransforms() override;
 
-    SIMPL_FILTER_PARAMETER(QStringList, ImageDataContainers)
+    /**
+     * @brief Setter property for ImageDataContainers
+     */
+    void setImageDataContainers(const QStringList& value);
+    /**
+     * @brief Getter property for ImageDataContainers
+     * @return Value of ImageDataContainers
+     */
+    QStringList getImageDataContainers() const;
+
     Q_PROPERTY(QStringList ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -83,23 +107,23 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
-  
+    QUuid getUuid() const override;
+
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -152,8 +176,8 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
     */
     void initialize();
   private:
+    QStringList m_ImageDataContainers = {};
 
-  
   public:
     /* Rule of 5: All special member functions should be defined if any are defined.
     * https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c21-if-you-define-or-delete-any-default-operation-define-or-delete-them-all
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 2ef86974bc..9f7dfcb34a 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -33,11 +33,16 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ArrayCalculator.h"
 
 #include <QtCore/QRegularExpression>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
@@ -45,6 +50,7 @@
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/ScalarTypeFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "util/ABSOperator.h"
 #include "util/ACosOperator.h"
@@ -907,7 +913,7 @@ bool ArrayCalculator::parseCommaOperator(QString token, QVector<CalculatorItem::
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool ArrayCalculator::parseArray(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, AttributeMatrix::Pointer selectedAM)
+bool ArrayCalculator::parseArray(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, const AttributeMatrixShPtrType& selectedAM)
 {
   int firstArray_NumTuples = -1;
   QString firstArray_Name = "";
@@ -1072,7 +1078,7 @@ AbstractFilter::Pointer ArrayCalculator::newFilterInstance(bool copyFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getCompiledLibraryName() const
+QString ArrayCalculator::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -1080,7 +1086,7 @@ const QString ArrayCalculator::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getBrandingString() const
+QString ArrayCalculator::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -1088,7 +1094,7 @@ const QString ArrayCalculator::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getFilterVersion() const
+QString ArrayCalculator::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -1099,7 +1105,7 @@ const QString ArrayCalculator::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getGroupName() const
+QString ArrayCalculator::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -1107,7 +1113,7 @@ const QString ArrayCalculator::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ArrayCalculator::getUuid()
+QUuid ArrayCalculator::getUuid() const
 {
   return QUuid("{7ff0ebb3-7b0d-5ff7-b9d8-5147031aca10}");
 }
@@ -1115,7 +1121,7 @@ const QUuid ArrayCalculator::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getSubGroupName() const
+QString ArrayCalculator::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
@@ -1123,7 +1129,96 @@ const QString ArrayCalculator::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArrayCalculator::getHumanLabel() const
+QString ArrayCalculator::getHumanLabel() const
 {
   return "Attribute Array Calculator";
 }
+
+// -----------------------------------------------------------------------------
+ArrayCalculator::Pointer ArrayCalculator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ArrayCalculator> ArrayCalculator::New()
+{
+  struct make_shared_enabler : public ArrayCalculator
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ArrayCalculator::getNameOfClass() const
+{
+  return QString("ArrayCalculator");
+}
+
+// -----------------------------------------------------------------------------
+QString ArrayCalculator::ClassName()
+{
+  return QString("ArrayCalculator");
+}
+
+// -----------------------------------------------------------------------------
+void ArrayCalculator::setSelectedAttributeMatrix(const DataArrayPath& value)
+{
+  m_SelectedAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ArrayCalculator::getSelectedAttributeMatrix() const
+{
+  return m_SelectedAttributeMatrix;
+}
+
+// -----------------------------------------------------------------------------
+void ArrayCalculator::setInfixEquation(const QString& value)
+{
+  m_InfixEquation = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ArrayCalculator::getInfixEquation() const
+{
+  return m_InfixEquation;
+}
+
+// -----------------------------------------------------------------------------
+void ArrayCalculator::setCalculatedArray(const DataArrayPath& value)
+{
+  m_CalculatedArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ArrayCalculator::getCalculatedArray() const
+{
+  return m_CalculatedArray;
+}
+
+// -----------------------------------------------------------------------------
+void ArrayCalculator::setUnits(const ArrayCalculator::AngleUnits& value)
+{
+  m_Units = value;
+}
+
+// -----------------------------------------------------------------------------
+ArrayCalculator::AngleUnits ArrayCalculator::getUnits() const
+{
+  return m_Units;
+}
+
+// -----------------------------------------------------------------------------
+void ArrayCalculator::setScalarType(SIMPL::ScalarTypes::Type value)
+{
+  m_ScalarType = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPL::ScalarTypes::Type ArrayCalculator::getScalarType() const
+{
+  return m_ScalarType;
+}
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index f361983eb3..386edb161c 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -36,26 +36,45 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 #include "util/ICalculatorArray.h"
 
+class AttributeMatrix;
+using AttributeMatrixShPtrType = std::shared_ptr<AttributeMatrix>;
+class CalculatorItem;
+using CalculatorItemShPtrType = std::shared_ptr<CalculatorItem>;
+
 /**
  * @brief The ArrayCalculator class. See [Filter documentation](@ref createdatacontainer) for details.
  */
 class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ArrayCalculator)
+    PYB11_FILTER_NEW_MACRO(ArrayCalculator)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
+    PYB11_FILTER_PARAMETER(QString, InfixEquation)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CalculatedArray)
+    PYB11_FILTER_PARAMETER(ArrayCalculator::AngleUnits, Units)
+    PYB11_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
     PYB11_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
     PYB11_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
     PYB11_PROPERTY(ArrayCalculator::AngleUnits Units READ getUnits WRITE setUnits)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+#endif
 
   public:
     enum AngleUnits
@@ -66,23 +85,82 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
 
     Q_ENUMS(AngleUnits)
 
-    SIMPL_SHARED_POINTERS(ArrayCalculator)
-    SIMPL_FILTER_NEW_MACRO(ArrayCalculator)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ArrayCalculator, AbstractFilter)
+    using Self = ArrayCalculator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ArrayCalculator> New();
+
+    /**
+     * @brief Returns the name of the class for ArrayCalculator
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ArrayCalculator
+     */
+    static QString ClassName();
+
+    /**
+     * @brief Setter property for SelectedAttributeMatrix
+     */
+    void setSelectedAttributeMatrix(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedAttributeMatrix
+     * @return Value of SelectedAttributeMatrix
+     */
+    DataArrayPath getSelectedAttributeMatrix() const;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
     Q_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
 
-    SIMPL_FILTER_PARAMETER(QString, InfixEquation)
+    /**
+     * @brief Setter property for InfixEquation
+     */
+    void setInfixEquation(const QString& value);
+    /**
+     * @brief Getter property for InfixEquation
+     * @return Value of InfixEquation
+     */
+    QString getInfixEquation() const;
+
     Q_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CalculatedArray)
+    /**
+     * @brief Setter property for CalculatedArray
+     */
+    void setCalculatedArray(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CalculatedArray
+     * @return Value of CalculatedArray
+     */
+    DataArrayPath getCalculatedArray() const;
+
     Q_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
 
-    SIMPL_FILTER_PARAMETER(ArrayCalculator::AngleUnits, Units)
+    /**
+     * @brief Setter property for Units
+     */
+    void setUnits(const ArrayCalculator::AngleUnits& value);
+    /**
+     * @brief Getter property for Units
+     * @return Value of Units
+     */
+    ArrayCalculator::AngleUnits getUnits() const;
+
     Q_PROPERTY(AngleUnits Units READ getUnits WRITE setUnits)
 
-    SIMPL_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
+    /**
+     * @brief Setter property for ScalarType
+     */
+    void setScalarType(SIMPL::ScalarTypes::Type value);
+    /**
+     * @brief Getter property for ScalarType
+     * @return Value of ScalarType
+     */
+    SIMPL::ScalarTypes::Type getScalarType() const;
+
     Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
     ~ArrayCalculator() override;
@@ -90,21 +168,21 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -114,23 +192,23 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -205,17 +283,22 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param scalarType
      * @return
      */
-    IDataArray::Pointer convertArrayType(const IDataArray::Pointer &inputArray, SIMPL::ScalarTypes::Type scalarType);
-
+    IDataArrayShPtrType convertArrayType(const IDataArrayShPtrType& inputArray, SIMPL::ScalarTypes::Type scalarType);
 
   private:
-    QMap<QString, CalculatorItem::Pointer>                      m_SymbolMap;
+    DataArrayPath m_SelectedAttributeMatrix = {};
+    QString m_InfixEquation = {};
+    DataArrayPath m_CalculatedArray = {};
+    ArrayCalculator::AngleUnits m_Units = {};
+    SIMPL::ScalarTypes::Type m_ScalarType = {};
+
+    QMap<QString, CalculatorItemShPtrType> m_SymbolMap;
     QStack<ICalculatorArray::Pointer>                           m_ExecutionStack;
 
     void createSymbolMap();
 
-    QVector<CalculatorItem::Pointer> parseInfixEquation();
-    QVector<CalculatorItem::Pointer> toRPN(QVector<CalculatorItem::Pointer> infixEquation);
+    QVector<CalculatorItemShPtrType> parseInfixEquation();
+    QVector<CalculatorItemShPtrType> toRPN(QVector<CalculatorItemShPtrType> infixEquation);
 
     void checkForAmbiguousArrayName(QString itemStr, QString warningMsg);
 
@@ -230,7 +313,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param token
      * @param parsedInfix
      */
-    void parseNumericValue(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, double number);
+    void parseNumericValue(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, double number);
 
     /**
      * @brief parseMinusSign
@@ -238,7 +321,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param parsedInfix
      * @param loopIdx
      */
-    void parseMinusSign(QString strItem, QVector<CalculatorItem::Pointer>& parsedInfix, int loopIdx);
+    void parseMinusSign(QString strItem, QVector<CalculatorItemShPtrType>& parsedInfix, int loopIdx);
 
     /**
      * @brief parseIndexOperator
@@ -246,7 +329,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param parsedInfix
      * @param number
      */
-    bool parseIndexOperator(QString token, QVector<CalculatorItem::Pointer>& parsedInfix);
+    bool parseIndexOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
 
     /**
      * @brief parseCommaOperator
@@ -254,7 +337,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param parsedInfix
      * @return
      */
-    bool parseCommaOperator(QString token, QVector<CalculatorItem::Pointer>& parsedInfix);
+    bool parseCommaOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
 
     /**
      * @brief parseArray
@@ -263,7 +346,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      * @param selectedAM
      * @return
      */
-    bool parseArray(QString token, QVector<CalculatorItem::Pointer>& parsedInfix, AttributeMatrix::Pointer selectedAM);
+    bool parseArray(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, const AttributeMatrixShPtrType& selectedAM);
 
   public:
     ArrayCalculator(const ArrayCalculator&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 5325fad953..f990295052 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -33,10 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "Breakpoint.h"
 
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -149,7 +153,7 @@ AbstractFilter::Pointer Breakpoint::newFilterInstance(bool copyFilterParameters)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getCompiledLibraryName() const
+QString Breakpoint::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -157,7 +161,7 @@ const QString Breakpoint::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getBrandingString() const
+QString Breakpoint::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -165,7 +169,7 @@ const QString Breakpoint::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getFilterVersion() const
+QString Breakpoint::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -176,7 +180,7 @@ const QString Breakpoint::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getGroupName() const
+QString Breakpoint::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -184,7 +188,7 @@ const QString Breakpoint::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid Breakpoint::getUuid()
+QUuid Breakpoint::getUuid() const
 {
   return QUuid("{a6d82abf-7043-51c0-88ed-b8d0153bf8ab}");
 }
@@ -192,7 +196,7 @@ const QUuid Breakpoint::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getSubGroupName() const
+QString Breakpoint::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -200,7 +204,36 @@ const QString Breakpoint::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString Breakpoint::getHumanLabel() const
+QString Breakpoint::getHumanLabel() const
 {
   return "Breakpoint";
 }
+
+// -----------------------------------------------------------------------------
+Breakpoint::Pointer Breakpoint::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<Breakpoint> Breakpoint::New()
+{
+  struct make_shared_enabler : public Breakpoint
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString Breakpoint::getNameOfClass() const
+{
+  return QString("Breakpoint");
+}
+
+// -----------------------------------------------------------------------------
+QString Breakpoint::ClassName()
+{
+  return QString("Breakpoint");
+}
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 6be9c4091e..2a44d7ebfe 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -35,11 +35,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The Breakpoint class. See [Filter documentation](@ref breakpoint) for details.
@@ -47,145 +49,172 @@
 class SIMPLib_EXPORT Breakpoint : public AbstractFilter
 {
   Q_OBJECT
-    PYB11_CREATE_BINDINGS(Breakpoint SUPERCLASS AbstractFilter)
-
-  public:
-    SIMPL_SHARED_POINTERS(Breakpoint)
-    SIMPL_FILTER_NEW_MACRO(Breakpoint)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Breakpoint, AbstractFilter)
-
-    ~Breakpoint() override;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    const QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  public slots:
-    /**
-    * @brief resumePipeline Resumes the pipeline
-    */
-    void resumePipeline();
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer 
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
-    /**
-    * @brief pipelineHasPaused Emitted when the pipeline needs to be paused
-    */
-    void pipelineHasPaused();
-
-    /**
-    * @brief pipelineHasResumed Emitted when the pipeline needs to be resumed
-    */
-    void pipelineHasResumed();
-
-  protected:
-    Breakpoint();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck();
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief pause Pauses the pipeline
-     */
-    void pause();
-
-  private:
-    QWaitCondition                          m_WaitCondition;
-    QMutex                                  m_Mutex;
-
-  public:
-    Breakpoint(const Breakpoint&) = delete;     // Copy Constructor Not Implemented
-    Breakpoint(Breakpoint&&) = delete;          // Move Constructor Not Implemented
-    Breakpoint& operator=(const Breakpoint&) = delete; // Copy Assignment Not Implemented
-    Breakpoint& operator=(Breakpoint&&) = delete;      // Move Assignment Not Implemented
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(Breakpoint SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(Breakpoint)
+  PYB11_FILTER_NEW_MACRO(Breakpoint)
+#endif
+
+public:
+  using Self = Breakpoint;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for Breakpoint
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for Breakpoint
+   */
+  static QString ClassName();
+
+  ~Breakpoint() override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+public slots:
+  /**
+   * @brief resumePipeline Resumes the pipeline
+   */
+  void resumePipeline();
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+  /**
+   * @brief pipelineHasPaused Emitted when the pipeline needs to be paused
+   */
+  void pipelineHasPaused();
+
+  /**
+   * @brief pipelineHasResumed Emitted when the pipeline needs to be resumed
+   */
+  void pipelineHasResumed();
+
+protected:
+  Breakpoint();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief pause Pauses the pipeline
+   */
+  void pause();
+
+private:
+  QWaitCondition m_WaitCondition;
+  QMutex m_Mutex;
+
+public:
+  Breakpoint(const Breakpoint&) = delete;            // Copy Constructor Not Implemented
+  Breakpoint(Breakpoint&&) = delete;                 // Move Constructor Not Implemented
+  Breakpoint& operator=(const Breakpoint&) = delete; // Copy Assignment Not Implemented
+  Breakpoint& operator=(Breakpoint&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 90f211aa84..d92ce4d795 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -33,15 +33,22 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CombineAttributeArrays.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   CombinedArrayID = 1
@@ -368,7 +375,7 @@ AbstractFilter::Pointer CombineAttributeArrays::newFilterInstance(bool copyFilte
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getCompiledLibraryName() const
+QString CombineAttributeArrays::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -376,7 +383,7 @@ const QString CombineAttributeArrays::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getBrandingString() const
+QString CombineAttributeArrays::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -384,7 +391,7 @@ const QString CombineAttributeArrays::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getFilterVersion() const
+QString CombineAttributeArrays::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -395,7 +402,7 @@ const QString CombineAttributeArrays::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getGroupName() const
+QString CombineAttributeArrays::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -403,7 +410,7 @@ const QString CombineAttributeArrays::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CombineAttributeArrays::getUuid()
+QUuid CombineAttributeArrays::getUuid() const
 {
   return QUuid("{a6b50fb0-eb7c-5d9b-9691-825d6a4fe772}");
 }
@@ -411,7 +418,7 @@ const QUuid CombineAttributeArrays::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getSubGroupName() const
+QString CombineAttributeArrays::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -419,7 +426,84 @@ const QString CombineAttributeArrays::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeArrays::getHumanLabel() const
+QString CombineAttributeArrays::getHumanLabel() const
 {
   return "Combine Attribute Arrays";
 }
+
+// -----------------------------------------------------------------------------
+CombineAttributeArrays::Pointer CombineAttributeArrays::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CombineAttributeArrays> CombineAttributeArrays::New()
+{
+  struct make_shared_enabler : public CombineAttributeArrays
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeArrays::getNameOfClass() const
+{
+  return QString("CombineAttributeArrays");
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeArrays::ClassName()
+{
+  return QString("CombineAttributeArrays");
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeArrays::setSelectedDataArrayPaths(const QVector<DataArrayPath>& value)
+{
+  m_SelectedDataArrayPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> CombineAttributeArrays::getSelectedDataArrayPaths() const
+{
+  return m_SelectedDataArrayPaths;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeArrays::setStackedDataArrayName(const QString& value)
+{
+  m_StackedDataArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeArrays::getStackedDataArrayName() const
+{
+  return m_StackedDataArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeArrays::setNormalizeData(bool value)
+{
+  m_NormalizeData = value;
+}
+
+// -----------------------------------------------------------------------------
+bool CombineAttributeArrays::getNormalizeData() const
+{
+  return m_NormalizeData;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeArrays::setMoveValues(bool value)
+{
+  m_MoveValues = value;
+}
+
+// -----------------------------------------------------------------------------
+bool CombineAttributeArrays::getMoveValues() const
+{
+  return m_MoveValues;
+}
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 8bfde7fa5b..56dea07217 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -35,9 +35,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The CombineAttributeArrays class. See [Filter documentation](@ref combineattributearrays) for details.
@@ -45,146 +49,218 @@
 class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
 {
   Q_OBJECT
-    PYB11_CREATE_BINDINGS(CombineAttributeArrays SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
-    PYB11_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
-    PYB11_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
-
-  public:
-    SIMPL_SHARED_POINTERS(CombineAttributeArrays)
-    SIMPL_FILTER_NEW_MACRO(CombineAttributeArrays)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CombineAttributeArrays, AbstractFilter)
-
-    ~CombineAttributeArrays() override;
-
-    SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
-    Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
-
-    SIMPL_FILTER_PARAMETER(QString, StackedDataArrayName)
-    Q_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
-
-    SIMPL_FILTER_PARAMETER(bool, NormalizeData)
-    Q_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
-
-    SIMPL_FILTER_PARAMETER(bool, MoveValues)
-    Q_PROPERTY(bool MoveValues READ getMoveValues WRITE setMoveValues)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    const QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-    /**
-     * @brief Returns the list of deleted data paths.
-     * @return
-     */
-    std::list<DataArrayPath> getDeletedPaths() override;
-
-  signals:
-    /**
-      * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
-  protected:
-    CombineAttributeArrays();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck();
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    DEFINE_IDATAARRAY_WEAKPTR(StackedData)
-
-    QVector<IDataArray::WeakPointer> m_SelectedWeakPtrVector;
-
-  public:
-    CombineAttributeArrays(const CombineAttributeArrays&) = delete; // Copy Constructor Not Implemented
-    CombineAttributeArrays(CombineAttributeArrays&&) = delete;      // Move Constructor Not Implemented
-    CombineAttributeArrays& operator=(const CombineAttributeArrays&) = delete; // Copy Assignment Not Implemented
-    CombineAttributeArrays& operator=(CombineAttributeArrays&&) = delete;      // Move Assignment Not Implemented
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(CombineAttributeArrays SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(CombineAttributeArrays)
+  PYB11_FILTER_NEW_MACRO(CombineAttributeArrays)
+  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
+  PYB11_FILTER_PARAMETER(QString, StackedDataArrayName)
+  PYB11_FILTER_PARAMETER(bool, NormalizeData)
+  PYB11_FILTER_PARAMETER(bool, MoveValues)
+  PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  PYB11_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
+  PYB11_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
+#endif
+
+public:
+  using Self = CombineAttributeArrays;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CombineAttributeArrays
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CombineAttributeArrays
+   */
+  static QString ClassName();
+
+  ~CombineAttributeArrays() override;
+
+  /**
+   * @brief Setter property for SelectedDataArrayPaths
+   */
+  void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for SelectedDataArrayPaths
+   * @return Value of SelectedDataArrayPaths
+   */
+  QVector<DataArrayPath> getSelectedDataArrayPaths() const;
+
+  Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+
+  /**
+   * @brief Setter property for StackedDataArrayName
+   */
+  void setStackedDataArrayName(const QString& value);
+  /**
+   * @brief Getter property for StackedDataArrayName
+   * @return Value of StackedDataArrayName
+   */
+  QString getStackedDataArrayName() const;
+
+  Q_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
+
+  /**
+   * @brief Setter property for NormalizeData
+   */
+  void setNormalizeData(bool value);
+  /**
+   * @brief Getter property for NormalizeData
+   * @return Value of NormalizeData
+   */
+  bool getNormalizeData() const;
+
+  Q_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
+
+  /**
+   * @brief Setter property for MoveValues
+   */
+  void setMoveValues(bool value);
+  /**
+   * @brief Getter property for MoveValues
+   * @return Value of MoveValues
+   */
+  bool getMoveValues() const;
+
+  Q_PROPERTY(bool MoveValues READ getMoveValues WRITE setMoveValues)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+  /**
+   * @brief Returns the list of deleted data paths.
+   * @return
+   */
+  std::list<DataArrayPath> getDeletedPaths() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  CombineAttributeArrays();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  IDataArrayWkPtrType m_StackedDataPtr;
+
+  QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
+  QString m_StackedDataArrayName = {};
+  bool m_NormalizeData = {};
+  bool m_MoveValues = {};
+
+  QVector<IDataArrayWkPtrType> m_SelectedWeakPtrVector;
+
+public:
+  CombineAttributeArrays(const CombineAttributeArrays&) = delete;            // Copy Constructor Not Implemented
+  CombineAttributeArrays(CombineAttributeArrays&&) = delete;                 // Move Constructor Not Implemented
+  CombineAttributeArrays& operator=(const CombineAttributeArrays&) = delete; // Copy Assignment Not Implemented
+  CombineAttributeArrays& operator=(CombineAttributeArrays&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 70d94ea986..b1d9e22041 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -32,8 +32,12 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "CombineAttributeMatrices.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 
 #include "SIMPLib/Common/TemplateHelpers.h"
@@ -44,6 +48,8 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   CombinedMatrixID = 1
@@ -379,7 +385,7 @@ AbstractFilter::Pointer CombineAttributeMatrices::newFilterInstance(bool copyFil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getCompiledLibraryName() const
+QString CombineAttributeMatrices::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -387,7 +393,7 @@ const QString CombineAttributeMatrices::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getBrandingString() const
+QString CombineAttributeMatrices::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -395,7 +401,7 @@ const QString CombineAttributeMatrices::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getFilterVersion() const
+QString CombineAttributeMatrices::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -406,7 +412,7 @@ const QString CombineAttributeMatrices::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getGroupName() const
+QString CombineAttributeMatrices::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -414,7 +420,7 @@ const QString CombineAttributeMatrices::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CombineAttributeMatrices::getUuid()
+QUuid CombineAttributeMatrices::getUuid() const
 {
   return QUuid("{334034e9-405f-51a3-9c3c-8d9c955835d9}");
 }
@@ -422,7 +428,7 @@ const QUuid CombineAttributeMatrices::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getSubGroupName() const
+QString CombineAttributeMatrices::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -430,7 +436,108 @@ const QString CombineAttributeMatrices::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CombineAttributeMatrices::getHumanLabel() const
+QString CombineAttributeMatrices::getHumanLabel() const
 {
   return "Combine Feature/Ensemble Attribute Matrices";
 }
+
+// -----------------------------------------------------------------------------
+CombineAttributeMatrices::Pointer CombineAttributeMatrices::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CombineAttributeMatrices> CombineAttributeMatrices::New()
+{
+  struct make_shared_enabler : public CombineAttributeMatrices
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeMatrices::getNameOfClass() const
+{
+  return QString("CombineAttributeMatrices");
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeMatrices::ClassName()
+{
+  return QString("CombineAttributeMatrices");
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setFirstAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_FirstAttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CombineAttributeMatrices::getFirstAttributeMatrixPath() const
+{
+  return m_FirstAttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setSecondAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_SecondAttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CombineAttributeMatrices::getSecondAttributeMatrixPath() const
+{
+  return m_SecondAttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setFirstIndexArrayPath(const DataArrayPath& value)
+{
+  m_FirstIndexArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CombineAttributeMatrices::getFirstIndexArrayPath() const
+{
+  return m_FirstIndexArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setSecondIndexArrayPath(const DataArrayPath& value)
+{
+  m_SecondIndexArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CombineAttributeMatrices::getSecondIndexArrayPath() const
+{
+  return m_SecondIndexArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setCombinedAttributeMatrixName(const QString& value)
+{
+  m_CombinedAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeMatrices::getCombinedAttributeMatrixName() const
+{
+  return m_CombinedAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CombineAttributeMatrices::setNewIndexArrayName(const QString& value)
+{
+  m_NewIndexArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CombineAttributeMatrices::getNewIndexArrayName() const
+{
+  return m_NewIndexArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 22aa4df570..7e66485113 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -36,9 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The CombineAttributeMatrices class. See [Filter documentation](@ref CombineAttributeMatrices) for details.
@@ -46,57 +48,136 @@
 class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CombineAttributeMatrices)
+    PYB11_FILTER_NEW_MACRO(CombineAttributeMatrices)
+    PYB11_FILTER_PARAMETER(DataArrayPath, FirstAttributeMatrixPath)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SecondAttributeMatrixPath)
+    PYB11_FILTER_PARAMETER(DataArrayPath, FirstIndexArrayPath)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SecondIndexArrayPath)
+    PYB11_FILTER_PARAMETER(QString, CombinedAttributeMatrixName)
+    PYB11_FILTER_PARAMETER(QString, NewIndexArrayName)
     PYB11_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
     PYB11_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
     PYB11_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
     PYB11_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
     PYB11_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
     PYB11_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CombineAttributeMatrices)
-    SIMPL_FILTER_NEW_MACRO(CombineAttributeMatrices)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CombineAttributeMatrices, AbstractFilter)
+    using Self = CombineAttributeMatrices;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CombineAttributeMatrices> New();
+
+    /**
+     * @brief Returns the name of the class for CombineAttributeMatrices
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CombineAttributeMatrices
+     */
+    static QString ClassName();
 
     ~CombineAttributeMatrices() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FirstAttributeMatrixPath)
+    /**
+     * @brief Setter property for FirstAttributeMatrixPath
+     */
+    void setFirstAttributeMatrixPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FirstAttributeMatrixPath
+     * @return Value of FirstAttributeMatrixPath
+     */
+    DataArrayPath getFirstAttributeMatrixPath() const;
+
     Q_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SecondAttributeMatrixPath)
+    /**
+     * @brief Setter property for SecondAttributeMatrixPath
+     */
+    void setSecondAttributeMatrixPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SecondAttributeMatrixPath
+     * @return Value of SecondAttributeMatrixPath
+     */
+    DataArrayPath getSecondAttributeMatrixPath() const;
+
     Q_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FirstIndexArrayPath)
+    /**
+     * @brief Setter property for FirstIndexArrayPath
+     */
+    void setFirstIndexArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FirstIndexArrayPath
+     * @return Value of FirstIndexArrayPath
+     */
+    DataArrayPath getFirstIndexArrayPath() const;
+
     Q_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SecondIndexArrayPath)
+    /**
+     * @brief Setter property for SecondIndexArrayPath
+     */
+    void setSecondIndexArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SecondIndexArrayPath
+     * @return Value of SecondIndexArrayPath
+     */
+    DataArrayPath getSecondIndexArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
 
-    SIMPL_FILTER_PARAMETER(QString, CombinedAttributeMatrixName)
+    /**
+     * @brief Setter property for CombinedAttributeMatrixName
+     */
+    void setCombinedAttributeMatrixName(const QString& value);
+    /**
+     * @brief Getter property for CombinedAttributeMatrixName
+     * @return Value of CombinedAttributeMatrixName
+     */
+    QString getCombinedAttributeMatrixName() const;
+
     Q_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
 
-    SIMPL_FILTER_PARAMETER(QString, NewIndexArrayName)
+    /**
+     * @brief Setter property for NewIndexArrayName
+     */
+    void setNewIndexArrayName(const QString& value);
+    /**
+     * @brief Getter property for NewIndexArrayName
+     * @return Value of NewIndexArrayName
+     */
+    QString getNewIndexArrayName() const;
+
     Q_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -106,23 +187,23 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -191,9 +272,19 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
     void updateFeatureInstancePointers();
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(int32_t, FirstIndex)
-    DEFINE_DATAARRAY_VARIABLE(int32_t, SecondIndex)
-    DEFINE_DATAARRAY_VARIABLE(int32_t, NewIndex)
+    std::weak_ptr<DataArray<int32_t>> m_FirstIndexPtr;
+    int32_t* m_FirstIndex = nullptr;
+    std::weak_ptr<DataArray<int32_t>> m_SecondIndexPtr;
+    int32_t* m_SecondIndex = nullptr;
+    std::weak_ptr<DataArray<int32_t>> m_NewIndexPtr;
+    int32_t* m_NewIndex = nullptr;
+
+    DataArrayPath m_FirstAttributeMatrixPath = {};
+    DataArrayPath m_SecondAttributeMatrixPath = {};
+    DataArrayPath m_FirstIndexArrayPath = {};
+    DataArrayPath m_SecondIndexArrayPath = {};
+    QString m_CombinedAttributeMatrixName = {};
+    QString m_NewIndexArrayName = {};
 
   public:
     CombineAttributeMatrices(const CombineAttributeMatrices&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 10523a27d8..31a14d1210 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -33,14 +33,20 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ConditionalSetValue.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -290,7 +296,7 @@ AbstractFilter::Pointer ConditionalSetValue::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getCompiledLibraryName() const
+QString ConditionalSetValue::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -298,7 +304,7 @@ const QString ConditionalSetValue::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getBrandingString() const
+QString ConditionalSetValue::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -306,7 +312,7 @@ const QString ConditionalSetValue::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getFilterVersion() const
+QString ConditionalSetValue::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -317,7 +323,7 @@ const QString ConditionalSetValue::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getGroupName() const
+QString ConditionalSetValue::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -325,7 +331,7 @@ const QString ConditionalSetValue::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ConditionalSetValue::getUuid()
+QUuid ConditionalSetValue::getUuid() const
 {
   return QUuid("{47cafe63-83cc-5826-9521-4fb5bea684ef}");
 }
@@ -333,7 +339,7 @@ const QUuid ConditionalSetValue::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getSubGroupName() const
+QString ConditionalSetValue::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -341,7 +347,72 @@ const QString ConditionalSetValue::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConditionalSetValue::getHumanLabel() const
+QString ConditionalSetValue::getHumanLabel() const
 {
   return "Replace Value in Array (Conditional)";
 }
+
+// -----------------------------------------------------------------------------
+ConditionalSetValue::Pointer ConditionalSetValue::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ConditionalSetValue> ConditionalSetValue::New()
+{
+  struct make_shared_enabler : public ConditionalSetValue
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ConditionalSetValue::getNameOfClass() const
+{
+  return QString("ConditionalSetValue");
+}
+
+// -----------------------------------------------------------------------------
+QString ConditionalSetValue::ClassName()
+{
+  return QString("ConditionalSetValue");
+}
+
+// -----------------------------------------------------------------------------
+void ConditionalSetValue::setSelectedArrayPath(const DataArrayPath& value)
+{
+  m_SelectedArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ConditionalSetValue::getSelectedArrayPath() const
+{
+  return m_SelectedArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ConditionalSetValue::setConditionalArrayPath(const DataArrayPath& value)
+{
+  m_ConditionalArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ConditionalSetValue::getConditionalArrayPath() const
+{
+  return m_ConditionalArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ConditionalSetValue::setReplaceValue(double value)
+{
+  m_ReplaceValue = value;
+}
+
+// -----------------------------------------------------------------------------
+double ConditionalSetValue::getReplaceValue() const
+{
+  return m_ReplaceValue;
+}
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index 00d70a149f..c90f3c051b 100755
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -36,9 +36,12 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The ConditionalSetValue class. See [Filter documentation](@ref conditionalsetvalue) for details.
@@ -46,46 +49,94 @@
 class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ConditionalSetValue)
+    PYB11_FILTER_NEW_MACRO(ConditionalSetValue)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    PYB11_FILTER_PARAMETER(DataArrayPath, ConditionalArrayPath)
+    PYB11_FILTER_PARAMETER(double, ReplaceValue)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
     PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+#endif
 
   public:
+    using Self = ConditionalSetValue;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
-    SIMPL_SHARED_POINTERS(ConditionalSetValue)
-    SIMPL_FILTER_NEW_MACRO(ConditionalSetValue)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConditionalSetValue, AbstractFilter)
+    static std::shared_ptr<ConditionalSetValue> New();
+
+    /**
+     * @brief Returns the name of the class for ConditionalSetValue
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ConditionalSetValue
+     */
+    static QString ClassName();
 
     ~ConditionalSetValue() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    /**
+     * @brief Setter property for SelectedArrayPath
+     */
+    void setSelectedArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedArrayPath
+     * @return Value of SelectedArrayPath
+     */
+    DataArrayPath getSelectedArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, ConditionalArrayPath)
+    /**
+     * @brief Setter property for ConditionalArrayPath
+     */
+    void setConditionalArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for ConditionalArrayPath
+     * @return Value of ConditionalArrayPath
+     */
+    DataArrayPath getConditionalArrayPath() const;
+
     Q_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
 
-    SIMPL_FILTER_PARAMETER(double, ReplaceValue)
+    /**
+     * @brief Setter property for ReplaceValue
+     */
+    void setReplaceValue(double value);
+    /**
+     * @brief Getter property for ReplaceValue
+     * @return Value of ReplaceValue
+     */
+    double getReplaceValue() const;
+
     Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -95,23 +146,23 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -170,8 +221,14 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
 
 
   private:
+    std::weak_ptr<DataArray<bool>> m_ConditionalArrayPtr;
+    bool* m_ConditionalArray = nullptr;
+
+    DataArrayPath m_SelectedArrayPath = {};
+    DataArrayPath m_ConditionalArrayPath = {};
+    double m_ReplaceValue = {};
+
     IDataArray::WeakPointer m_ArrayPtr;
-    DEFINE_DATAARRAY_VARIABLE(bool, ConditionalArray)
 
   public:
     ConditionalSetValue(const ConditionalSetValue&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 48d8ea4d07..93bae1f2e5 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -36,11 +36,16 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ConvertColorToGrayScale.h"
 
 #include <algorithm>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -51,6 +56,8 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class LuminosityImpl
 {
@@ -430,7 +437,7 @@ AbstractFilter::Pointer ConvertColorToGrayScale::newFilterInstance(bool copyFilt
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getCompiledLibraryName() const
+QString ConvertColorToGrayScale::getCompiledLibraryName() const
 {
   return  Core::CoreBaseName;
 }
@@ -438,7 +445,7 @@ const QString ConvertColorToGrayScale::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getBrandingString() const
+QString ConvertColorToGrayScale::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -446,7 +453,7 @@ const QString ConvertColorToGrayScale::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getFilterVersion() const
+QString ConvertColorToGrayScale::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -457,7 +464,7 @@ const QString ConvertColorToGrayScale::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getGroupName() const
+QString ConvertColorToGrayScale::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -465,7 +472,7 @@ const QString ConvertColorToGrayScale::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ConvertColorToGrayScale::getUuid()
+QUuid ConvertColorToGrayScale::getUuid() const
 {
   return QUuid("{eb5a89c4-4e71-59b1-9719-d10a652d961e}");
 }
@@ -473,7 +480,7 @@ const QUuid ConvertColorToGrayScale::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getSubGroupName() const
+QString ConvertColorToGrayScale::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ImageFilters;
 }
@@ -481,7 +488,120 @@ const QString ConvertColorToGrayScale::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertColorToGrayScale::getHumanLabel() const
+QString ConvertColorToGrayScale::getHumanLabel() const
 {
   return "Color to GrayScale";
 }
+
+// -----------------------------------------------------------------------------
+ConvertColorToGrayScale::Pointer ConvertColorToGrayScale::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ConvertColorToGrayScale> ConvertColorToGrayScale::New()
+{
+  struct make_shared_enabler : public ConvertColorToGrayScale
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertColorToGrayScale::getNameOfClass() const
+{
+  return QString("ConvertColorToGrayScale");
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertColorToGrayScale::ClassName()
+{
+  return QString("ConvertColorToGrayScale");
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setConversionAlgorithm(int value)
+{
+  m_ConversionAlgorithm = value;
+}
+
+// -----------------------------------------------------------------------------
+int ConvertColorToGrayScale::getConversionAlgorithm() const
+{
+  return m_ConversionAlgorithm;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setColorWeights(const FloatVec3Type& value)
+{
+  m_ColorWeights = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type ConvertColorToGrayScale::getColorWeights() const
+{
+  return m_ColorWeights;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setColorChannel(int value)
+{
+  m_ColorChannel = value;
+}
+
+// -----------------------------------------------------------------------------
+int ConvertColorToGrayScale::getColorChannel() const
+{
+  return m_ColorChannel;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setInputDataArrayVector(const QVector<DataArrayPath>& value)
+{
+  m_InputDataArrayVector = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> ConvertColorToGrayScale::getInputDataArrayVector() const
+{
+  return m_InputDataArrayVector;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setCreateNewAttributeMatrix(bool value)
+{
+  m_CreateNewAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ConvertColorToGrayScale::getCreateNewAttributeMatrix() const
+{
+  return m_CreateNewAttributeMatrix;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setOutputAttributeMatrixName(const QString& value)
+{
+  m_OutputAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertColorToGrayScale::getOutputAttributeMatrixName() const
+{
+  return m_OutputAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertColorToGrayScale::setOutputArrayPrefix(const QString& value)
+{
+  m_OutputArrayPrefix = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertColorToGrayScale::getOutputArrayPrefix() const
+{
+  return m_OutputArrayPrefix;
+}
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 5135ba137b..ceba2b8dd9 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -34,10 +34,11 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The ConvertColorToGrayScale class. See [Filter documentation](@ref ConvertColorToGrayScale) for details.
@@ -45,7 +46,18 @@
 class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ConvertColorToGrayScale)
+  PYB11_FILTER_NEW_MACRO(ConvertColorToGrayScale)
+  PYB11_FILTER_PARAMETER(int, ConversionAlgorithm)
+  PYB11_FILTER_PARAMETER(FloatVec3Type, ColorWeights)
+  PYB11_FILTER_PARAMETER(int, ColorChannel)
+  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, InputDataArrayVector)
+  PYB11_FILTER_PARAMETER(bool, CreateNewAttributeMatrix)
+  PYB11_FILTER_PARAMETER(QString, OutputAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(QString, OutputArrayPrefix)
   PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
   PYB11_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
   PYB11_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
@@ -53,11 +65,35 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   PYB11_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
   PYB11_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
   PYB11_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ConvertColorToGrayScale)
-  SIMPL_FILTER_NEW_MACRO(ConvertColorToGrayScale)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConvertColorToGrayScale, AbstractFilter)
+  using Self = ConvertColorToGrayScale;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ConvertColorToGrayScale
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConvertColorToGrayScale
+   */
+  static QString ClassName();
 
   ~ConvertColorToGrayScale() override;
 
@@ -70,45 +106,108 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
     SingleChannel = 3
   };
 
-  SIMPL_FILTER_PARAMETER(int, ConversionAlgorithm)
+  /**
+   * @brief Setter property for ConversionAlgorithm
+   */
+  void setConversionAlgorithm(int value);
+  /**
+   * @brief Getter property for ConversionAlgorithm
+   * @return Value of ConversionAlgorithm
+   */
+  int getConversionAlgorithm() const;
+
   Q_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3Type, ColorWeights)
+  /**
+   * @brief Setter property for ColorWeights
+   */
+  void setColorWeights(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for ColorWeights
+   * @return Value of ColorWeights
+   */
+  FloatVec3Type getColorWeights() const;
+
   Q_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
 
-  SIMPL_FILTER_PARAMETER(int, ColorChannel)
+  /**
+   * @brief Setter property for ColorChannel
+   */
+  void setColorChannel(int value);
+  /**
+   * @brief Getter property for ColorChannel
+   * @return Value of ColorChannel
+   */
+  int getColorChannel() const;
+
   Q_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
 
-  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, InputDataArrayVector)
+  /**
+   * @brief Setter property for InputDataArrayVector
+   */
+  void setInputDataArrayVector(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for InputDataArrayVector
+   * @return Value of InputDataArrayVector
+   */
+  QVector<DataArrayPath> getInputDataArrayVector() const;
+
   Q_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
 
-  SIMPL_FILTER_PARAMETER(bool, CreateNewAttributeMatrix)
+  /**
+   * @brief Setter property for CreateNewAttributeMatrix
+   */
+  void setCreateNewAttributeMatrix(bool value);
+  /**
+   * @brief Getter property for CreateNewAttributeMatrix
+   * @return Value of CreateNewAttributeMatrix
+   */
+  bool getCreateNewAttributeMatrix() const;
+
   Q_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
 
-  SIMPL_FILTER_PARAMETER(QString, OutputAttributeMatrixName)
+  /**
+   * @brief Setter property for OutputAttributeMatrixName
+   */
+  void setOutputAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for OutputAttributeMatrixName
+   * @return Value of OutputAttributeMatrixName
+   */
+  QString getOutputAttributeMatrixName() const;
+
   Q_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(QString, OutputArrayPrefix)
+  /**
+   * @brief Setter property for OutputArrayPrefix
+   */
+  void setOutputArrayPrefix(const QString& value);
+  /**
+   * @brief Getter property for OutputArrayPrefix
+   * @return Value of OutputArrayPrefix
+   */
+  QString getOutputArrayPrefix() const;
+
   Q_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -118,23 +217,23 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -187,6 +286,14 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   void initialize();
 
 private:
+  int m_ConversionAlgorithm = {};
+  FloatVec3Type m_ColorWeights = {};
+  int m_ColorChannel = {};
+  QVector<DataArrayPath> m_InputDataArrayVector = {};
+  bool m_CreateNewAttributeMatrix = {};
+  QString m_OutputAttributeMatrixName = {};
+  QString m_OutputArrayPrefix = {};
+
   QVector<DataArrayPath> m_OutputArrayPaths;
 
 public:
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 254a665cd5..ea4ffb0620 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -33,17 +33,24 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ConvertData.h"
 
 #include <iostream>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define CHECK_AND_CONVERT(Type, DataContainer, ScalarType, Array, AttributeMatrixName, OutputName)                                                                                                     \
   if(false == completed)                                                                                                                                                                               \
@@ -385,7 +392,7 @@ AbstractFilter::Pointer ConvertData::newFilterInstance(bool copyFilterParameters
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getCompiledLibraryName() const
+QString ConvertData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -393,7 +400,7 @@ const QString ConvertData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getBrandingString() const
+QString ConvertData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -401,7 +408,7 @@ const QString ConvertData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getFilterVersion() const
+QString ConvertData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -412,7 +419,7 @@ const QString ConvertData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getGroupName() const
+QString ConvertData::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -420,7 +427,7 @@ const QString ConvertData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ConvertData::getUuid()
+QUuid ConvertData::getUuid() const
 {
   return QUuid("{f4ba5fa4-bb5c-5dd1-9429-0dd86d0ecb37}");
 }
@@ -428,7 +435,7 @@ const QUuid ConvertData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getSubGroupName() const
+QString ConvertData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ConversionFilters;
 }
@@ -436,7 +443,72 @@ const QString ConvertData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ConvertData::getHumanLabel() const
+QString ConvertData::getHumanLabel() const
 {
   return "Convert AttributeArray Data Type";
 }
+
+// -----------------------------------------------------------------------------
+ConvertData::Pointer ConvertData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ConvertData> ConvertData::New()
+{
+  struct make_shared_enabler : public ConvertData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertData::getNameOfClass() const
+{
+  return QString("ConvertData");
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertData::ClassName()
+{
+  return QString("ConvertData");
+}
+
+// -----------------------------------------------------------------------------
+void ConvertData::setScalarType(SIMPL::NumericTypes::Type value)
+{
+  m_ScalarType = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPL::NumericTypes::Type ConvertData::getScalarType() const
+{
+  return m_ScalarType;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertData::setOutputArrayName(const QString& value)
+{
+  m_OutputArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ConvertData::getOutputArrayName() const
+{
+  return m_OutputArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void ConvertData::setSelectedCellArrayPath(const DataArrayPath& value)
+{
+  m_SelectedCellArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ConvertData::getSelectedCellArrayPath() const
+{
+  return m_SelectedCellArrayPath;
+}
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 7f92b02a8b..4e5c4d30bc 100755
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -36,9 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Common/Constants.h"
 
 /**
  * @brief The ConvertData class. See [Filter documentation](@ref convertdata) for details.
@@ -46,45 +48,94 @@
 class SIMPLib_EXPORT ConvertData : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ConvertData)
+    PYB11_FILTER_NEW_MACRO(ConvertData)
+    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    PYB11_FILTER_PARAMETER(QString, OutputArrayName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(ConvertData)
-    SIMPL_FILTER_NEW_MACRO(ConvertData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConvertData, AbstractFilter)
+    using Self = ConvertData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ConvertData> New();
+
+    /**
+     * @brief Returns the name of the class for ConvertData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ConvertData
+     */
+    static QString ClassName();
 
     ~ConvertData() override;
 
-    SIMPL_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    /**
+     * @brief Setter property for ScalarType
+     */
+    void setScalarType(SIMPL::NumericTypes::Type value);
+    /**
+     * @brief Getter property for ScalarType
+     * @return Value of ScalarType
+     */
+    SIMPL::NumericTypes::Type getScalarType() const;
+
     Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
-    SIMPL_FILTER_PARAMETER(QString, OutputArrayName)
+    /**
+     * @brief Setter property for OutputArrayName
+     */
+    void setOutputArrayName(const QString& value);
+    /**
+     * @brief Getter property for OutputArrayName
+     * @return Value of OutputArrayName
+     */
+    QString getOutputArrayName() const;
+
     Q_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
+    /**
+     * @brief Setter property for SelectedCellArrayPath
+     */
+    void setSelectedCellArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedCellArrayPath
+     * @return Value of SelectedCellArrayPath
+     */
+    DataArrayPath getSelectedCellArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -94,23 +145,23 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -173,5 +224,10 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
     ConvertData(ConvertData&&) = delete;         // Move Constructor Not Implemented
     ConvertData& operator=(const ConvertData&) = delete; // Copy Assignment Not Implemented
     ConvertData& operator=(ConvertData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    SIMPL::NumericTypes::Type m_ScalarType = {};
+    QString m_OutputArrayName = {};
+    DataArrayPath m_SelectedCellArrayPath = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 2097519d80..69d7170f4d 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CopyFeatureArrayToElementArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -43,6 +48,7 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   ElementArrayID = 1
@@ -319,7 +325,7 @@ AbstractFilter::Pointer CopyFeatureArrayToElementArray::newFilterInstance(bool c
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getCompiledLibraryName() const
+QString CopyFeatureArrayToElementArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -327,7 +333,7 @@ const QString CopyFeatureArrayToElementArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getBrandingString() const
+QString CopyFeatureArrayToElementArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -335,7 +341,7 @@ const QString CopyFeatureArrayToElementArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getFilterVersion() const
+QString CopyFeatureArrayToElementArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -346,7 +352,7 @@ const QString CopyFeatureArrayToElementArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getGroupName() const
+QString CopyFeatureArrayToElementArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -354,7 +360,7 @@ const QString CopyFeatureArrayToElementArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CopyFeatureArrayToElementArray::getUuid()
+QUuid CopyFeatureArrayToElementArray::getUuid() const
 {
   return QUuid("{99836b75-144b-5126-b261-b411133b5e8a}");
 }
@@ -362,7 +368,7 @@ const QUuid CopyFeatureArrayToElementArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getSubGroupName() const
+QString CopyFeatureArrayToElementArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -370,7 +376,72 @@ const QString CopyFeatureArrayToElementArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyFeatureArrayToElementArray::getHumanLabel() const
+QString CopyFeatureArrayToElementArray::getHumanLabel() const
 {
   return "Create Element Array from Feature Array";
 }
+
+// -----------------------------------------------------------------------------
+CopyFeatureArrayToElementArray::Pointer CopyFeatureArrayToElementArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CopyFeatureArrayToElementArray> CopyFeatureArrayToElementArray::New()
+{
+  struct make_shared_enabler : public CopyFeatureArrayToElementArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CopyFeatureArrayToElementArray::getNameOfClass() const
+{
+  return QString("CopyFeatureArrayToElementArray");
+}
+
+// -----------------------------------------------------------------------------
+QString CopyFeatureArrayToElementArray::ClassName()
+{
+  return QString("CopyFeatureArrayToElementArray");
+}
+
+// -----------------------------------------------------------------------------
+void CopyFeatureArrayToElementArray::setSelectedFeatureArrayPath(const DataArrayPath& value)
+{
+  m_SelectedFeatureArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CopyFeatureArrayToElementArray::getSelectedFeatureArrayPath() const
+{
+  return m_SelectedFeatureArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CopyFeatureArrayToElementArray::setFeatureIdsArrayPath(const DataArrayPath& value)
+{
+  m_FeatureIdsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CopyFeatureArrayToElementArray::getFeatureIdsArrayPath() const
+{
+  return m_FeatureIdsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CopyFeatureArrayToElementArray::setCreatedArrayName(const QString& value)
+{
+  m_CreatedArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CopyFeatureArrayToElementArray::getCreatedArrayName() const
+{
+  return m_CreatedArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index a2c1c7882c..fa7c2e2ccd 100755
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -36,9 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The CopyFeatureArrayToElementArray class. See [Filter documentation](@ref copyfeaturearraytoelementArray) for details.
@@ -46,45 +51,94 @@
 class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CopyFeatureArrayToElementArray)
+    PYB11_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedFeatureArrayPath)
+    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+    PYB11_FILTER_PARAMETER(QString, CreatedArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
     PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CopyFeatureArrayToElementArray)
-    SIMPL_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CopyFeatureArrayToElementArray, AbstractFilter)
+    using Self = CopyFeatureArrayToElementArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CopyFeatureArrayToElementArray> New();
+
+    /**
+     * @brief Returns the name of the class for CopyFeatureArrayToElementArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CopyFeatureArrayToElementArray
+     */
+    static QString ClassName();
 
     ~CopyFeatureArrayToElementArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedFeatureArrayPath)
+    /**
+     * @brief Setter property for SelectedFeatureArrayPath
+     */
+    void setSelectedFeatureArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedFeatureArrayPath
+     * @return Value of SelectedFeatureArrayPath
+     */
+    DataArrayPath getSelectedFeatureArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+    /**
+     * @brief Setter property for FeatureIdsArrayPath
+     */
+    void setFeatureIdsArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FeatureIdsArrayPath
+     * @return Value of FeatureIdsArrayPath
+     */
+    DataArrayPath getFeatureIdsArrayPath() const;
+
     Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
 
-    SIMPL_FILTER_PARAMETER(QString, CreatedArrayName)
+    /**
+     * @brief Setter property for CreatedArrayName
+     */
+    void setCreatedArrayName(const QString& value);
+    /**
+     * @brief Getter property for CreatedArrayName
+     * @return Value of CreatedArrayName
+     */
+    QString getCreatedArrayName() const;
+
     Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -94,23 +148,23 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -169,8 +223,14 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(int32_t, FeatureIds)
-    DEFINE_IDATAARRAY_WEAKPTR(InArray)
+    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+    int32_t* m_FeatureIds = nullptr;
+
+    IDataArrayWkPtrType m_InArrayPtr;
+
+    DataArrayPath m_SelectedFeatureArrayPath = {};
+    DataArrayPath m_FeatureIdsArrayPath = {};
+    QString m_CreatedArrayName = {};
 
   public:
     CopyFeatureArrayToElementArray(const CopyFeatureArrayToElementArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index af8ebaa7b8..6281436262 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -33,9 +33,14 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CopyObject.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -44,6 +49,8 @@
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataContainerID = 1,
@@ -270,7 +277,7 @@ AbstractFilter::Pointer CopyObject::newFilterInstance(bool copyFilterParameters)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getCompiledLibraryName() const
+QString CopyObject::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -278,7 +285,7 @@ const QString CopyObject::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getBrandingString() const
+QString CopyObject::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -286,7 +293,7 @@ const QString CopyObject::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getFilterVersion() const
+QString CopyObject::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -296,7 +303,7 @@ const QString CopyObject::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getGroupName() const
+QString CopyObject::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -304,7 +311,7 @@ const QString CopyObject::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CopyObject::getUuid()
+QUuid CopyObject::getUuid() const
 {
   return QUuid("{088ef69b-ca98-51a9-97ac-369862015d71}");
 }
@@ -312,7 +319,7 @@ const QUuid CopyObject::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getSubGroupName() const
+QString CopyObject::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ConversionFilters;
 }
@@ -320,7 +327,96 @@ const QString CopyObject::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CopyObject::getHumanLabel() const
+QString CopyObject::getHumanLabel() const
 {
   return "Copy Object";
 }
+
+// -----------------------------------------------------------------------------
+CopyObject::Pointer CopyObject::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CopyObject> CopyObject::New()
+{
+  struct make_shared_enabler : public CopyObject
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CopyObject::getNameOfClass() const
+{
+  return QString("CopyObject");
+}
+
+// -----------------------------------------------------------------------------
+QString CopyObject::ClassName()
+{
+  return QString("CopyObject");
+}
+
+// -----------------------------------------------------------------------------
+void CopyObject::setObjectToCopy(int value)
+{
+  m_ObjectToCopy = value;
+}
+
+// -----------------------------------------------------------------------------
+int CopyObject::getObjectToCopy() const
+{
+  return m_ObjectToCopy;
+}
+
+// -----------------------------------------------------------------------------
+void CopyObject::setDataContainerToCopy(const DataArrayPath& value)
+{
+  m_DataContainerToCopy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CopyObject::getDataContainerToCopy() const
+{
+  return m_DataContainerToCopy;
+}
+
+// -----------------------------------------------------------------------------
+void CopyObject::setAttributeMatrixToCopy(const DataArrayPath& value)
+{
+  m_AttributeMatrixToCopy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CopyObject::getAttributeMatrixToCopy() const
+{
+  return m_AttributeMatrixToCopy;
+}
+
+// -----------------------------------------------------------------------------
+void CopyObject::setAttributeArrayToCopy(const DataArrayPath& value)
+{
+  m_AttributeArrayToCopy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CopyObject::getAttributeArrayToCopy() const
+{
+  return m_AttributeArrayToCopy;
+}
+
+// -----------------------------------------------------------------------------
+void CopyObject::setCopiedObjectName(const QString& value)
+{
+  m_CopiedObjectName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CopyObject::getCopiedObjectName() const
+{
+  return m_CopiedObjectName;
+}
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 2ab28c64f7..b1c97a2d7b 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The CopyObject class. See [Filter documentation](@ref copyobject) for details.
@@ -45,53 +46,131 @@
 class SIMPLib_EXPORT CopyObject : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(CopyObject SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(CopyObject)
+  PYB11_FILTER_NEW_MACRO(CopyObject)
+  PYB11_FILTER_PARAMETER(int, ObjectToCopy)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerToCopy)
+  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixToCopy)
+  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeArrayToCopy)
+  PYB11_FILTER_PARAMETER(QString, CopiedObjectName)
   PYB11_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
   PYB11_PROPERTY(DataArrayPath DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixToCopy READ getAttributeMatrixToCopy WRITE setAttributeMatrixToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeArrayToCopy READ getAttributeArrayToCopy WRITE setAttributeArrayToCopy)
   PYB11_PROPERTY(QString CopiedObjectName READ getCopiedObjectName WRITE setCopiedObjectName)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(CopyObject)
-  SIMPL_FILTER_NEW_MACRO(CopyObject)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CopyObject, AbstractFilter)
+  using Self = CopyObject;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CopyObject
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CopyObject
+   */
+  static QString ClassName();
 
   ~CopyObject() override;
 
-  SIMPL_FILTER_PARAMETER(int, ObjectToCopy)
+  /**
+   * @brief Setter property for ObjectToCopy
+   */
+  void setObjectToCopy(int value);
+  /**
+   * @brief Getter property for ObjectToCopy
+   * @return Value of ObjectToCopy
+   */
+  int getObjectToCopy() const;
+
   Q_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerToCopy)
+  /**
+   * @brief Setter property for DataContainerToCopy
+   */
+  void setDataContainerToCopy(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerToCopy
+   * @return Value of DataContainerToCopy
+   */
+  DataArrayPath getDataContainerToCopy() const;
+
   Q_PROPERTY(DataArrayPath DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixToCopy)
+  /**
+   * @brief Setter property for AttributeMatrixToCopy
+   */
+  void setAttributeMatrixToCopy(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixToCopy
+   * @return Value of AttributeMatrixToCopy
+   */
+  DataArrayPath getAttributeMatrixToCopy() const;
+
   Q_PROPERTY(DataArrayPath AttributeMatrixToCopy READ getAttributeMatrixToCopy WRITE setAttributeMatrixToCopy)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeArrayToCopy)
+  /**
+   * @brief Setter property for AttributeArrayToCopy
+   */
+  void setAttributeArrayToCopy(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeArrayToCopy
+   * @return Value of AttributeArrayToCopy
+   */
+  DataArrayPath getAttributeArrayToCopy() const;
+
   Q_PROPERTY(DataArrayPath AttributeArrayToCopy READ getAttributeArrayToCopy WRITE setAttributeArrayToCopy)
 
-  SIMPL_FILTER_PARAMETER(QString, CopiedObjectName)
+  /**
+   * @brief Setter property for CopiedObjectName
+   */
+  void setCopiedObjectName(const QString& value);
+  /**
+   * @brief Getter property for CopiedObjectName
+   * @return Value of CopiedObjectName
+   */
+  QString getCopiedObjectName() const;
+
   Q_PROPERTY(QString CopiedObjectName READ getCopiedObjectName WRITE setCopiedObjectName)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -101,23 +180,23 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -179,5 +258,12 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   CopyObject(CopyObject&&) = delete;                 // Move Constructor Not Implemented
   CopyObject& operator=(const CopyObject&) = delete; // Copy Assignment Not Implemented
   CopyObject& operator=(CopyObject&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  int m_ObjectToCopy = {};
+  DataArrayPath m_DataContainerToCopy = {};
+  DataArrayPath m_AttributeMatrixToCopy = {};
+  DataArrayPath m_AttributeArrayToCopy = {};
+  QString m_CopiedObjectName = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index c123816213..ebbd348a3d 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -33,14 +33,21 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateAttributeMatrix.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   AttributeMatrixID = 1
@@ -203,7 +210,7 @@ AbstractFilter::Pointer CreateAttributeMatrix::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getCompiledLibraryName() const
+QString CreateAttributeMatrix::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -211,7 +218,7 @@ const QString CreateAttributeMatrix::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getBrandingString() const
+QString CreateAttributeMatrix::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -219,7 +226,7 @@ const QString CreateAttributeMatrix::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getFilterVersion() const
+QString CreateAttributeMatrix::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -230,7 +237,7 @@ const QString CreateAttributeMatrix::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getGroupName() const
+QString CreateAttributeMatrix::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -238,7 +245,7 @@ const QString CreateAttributeMatrix::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getHumanLabel() const
+QString CreateAttributeMatrix::getHumanLabel() const
 {
   return "Create Attribute Matrix";
 }
@@ -246,7 +253,7 @@ const QString CreateAttributeMatrix::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateAttributeMatrix::getUuid()
+QUuid CreateAttributeMatrix::getUuid() const
 {
   return QUuid("{93375ef0-7367-5372-addc-baa019b1b341}");
 }
@@ -254,7 +261,72 @@ const QUuid CreateAttributeMatrix::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateAttributeMatrix::getSubGroupName() const
+QString CreateAttributeMatrix::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
+
+// -----------------------------------------------------------------------------
+CreateAttributeMatrix::Pointer CreateAttributeMatrix::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateAttributeMatrix> CreateAttributeMatrix::New()
+{
+  struct make_shared_enabler : public CreateAttributeMatrix
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateAttributeMatrix::getNameOfClass() const
+{
+  return QString("CreateAttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateAttributeMatrix::ClassName()
+{
+  return QString("CreateAttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+void CreateAttributeMatrix::setCreatedAttributeMatrix(const DataArrayPath& value)
+{
+  m_CreatedAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateAttributeMatrix::getCreatedAttributeMatrix() const
+{
+  return m_CreatedAttributeMatrix;
+}
+
+// -----------------------------------------------------------------------------
+void CreateAttributeMatrix::setAttributeMatrixType(int value)
+{
+  m_AttributeMatrixType = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreateAttributeMatrix::getAttributeMatrixType() const
+{
+  return m_AttributeMatrixType;
+}
+
+// -----------------------------------------------------------------------------
+void CreateAttributeMatrix::setTupleDimensions(const DynamicTableData& value)
+{
+  m_TupleDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData CreateAttributeMatrix::getTupleDimensions() const
+{
+  return m_TupleDimensions;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index 39481da307..55c2eced9d 100755
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The CreateAttributeMatrix class. See [Filter documentation](@ref createattributematrix) for details.
@@ -47,45 +48,94 @@
 class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateAttributeMatrix)
+    PYB11_FILTER_NEW_MACRO(CreateAttributeMatrix)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
+    PYB11_FILTER_PARAMETER(int, AttributeMatrixType)
+    PYB11_FILTER_PARAMETER(DynamicTableData, TupleDimensions)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
     PYB11_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
     PYB11_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateAttributeMatrix)
-    SIMPL_FILTER_NEW_MACRO(CreateAttributeMatrix)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateAttributeMatrix, AbstractFilter)
+    using Self = CreateAttributeMatrix;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateAttributeMatrix> New();
+
+    /**
+     * @brief Returns the name of the class for CreateAttributeMatrix
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateAttributeMatrix
+     */
+    static QString ClassName();
 
     ~CreateAttributeMatrix() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
+    /**
+     * @brief Setter property for CreatedAttributeMatrix
+     */
+    void setCreatedAttributeMatrix(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CreatedAttributeMatrix
+     * @return Value of CreatedAttributeMatrix
+     */
+    DataArrayPath getCreatedAttributeMatrix() const;
+
     Q_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
 
-    SIMPL_FILTER_PARAMETER(int, AttributeMatrixType)
+    /**
+     * @brief Setter property for AttributeMatrixType
+     */
+    void setAttributeMatrixType(int value);
+    /**
+     * @brief Getter property for AttributeMatrixType
+     * @return Value of AttributeMatrixType
+     */
+    int getAttributeMatrixType() const;
+
     Q_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
 
-    SIMPL_FILTER_PARAMETER(DynamicTableData, TupleDimensions)
+    /**
+     * @brief Setter property for TupleDimensions
+     */
+    void setTupleDimensions(const DynamicTableData& value);
+    /**
+     * @brief Getter property for TupleDimensions
+     * @return Value of TupleDimensions
+     */
+    DynamicTableData getTupleDimensions() const;
+
     Q_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -95,23 +145,23 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -174,5 +224,10 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
     CreateAttributeMatrix(CreateAttributeMatrix&&) = delete;      // Move Constructor Not Implemented
     CreateAttributeMatrix& operator=(const CreateAttributeMatrix&) = delete; // Copy Assignment Not Implemented
     CreateAttributeMatrix& operator=(CreateAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_CreatedAttributeMatrix = {};
+    int m_AttributeMatrixType = {};
+    DynamicTableData m_TupleDimensions = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 371d61bc71..b2ef5c9492 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateDataArray.h"
 
 
@@ -40,7 +42,10 @@
 #include <random>
 #include <chrono>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
@@ -544,7 +549,7 @@ AbstractFilter::Pointer CreateDataArray::newFilterInstance(bool copyFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getCompiledLibraryName() const
+QString CreateDataArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -552,7 +557,7 @@ const QString CreateDataArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getBrandingString() const
+QString CreateDataArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -560,7 +565,7 @@ const QString CreateDataArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getFilterVersion() const
+QString CreateDataArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -571,7 +576,7 @@ const QString CreateDataArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getGroupName() const
+QString CreateDataArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -579,7 +584,7 @@ const QString CreateDataArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateDataArray::getUuid()
+QUuid CreateDataArray::getUuid() const
 {
   return QUuid("{77f392fb-c1eb-57da-a1b1-e7acf9239fb8}");
 }
@@ -587,7 +592,7 @@ const QUuid CreateDataArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getSubGroupName() const
+QString CreateDataArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
@@ -595,7 +600,108 @@ const QString CreateDataArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataArray::getHumanLabel() const
+QString CreateDataArray::getHumanLabel() const
 {
   return "Create Data Array";
 }
+
+// -----------------------------------------------------------------------------
+CreateDataArray::Pointer CreateDataArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateDataArray> CreateDataArray::New()
+{
+  struct make_shared_enabler : public CreateDataArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateDataArray::getNameOfClass() const
+{
+  return QString("CreateDataArray");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateDataArray::ClassName()
+{
+  return QString("CreateDataArray");
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setScalarType(SIMPL::ScalarTypes::Type value)
+{
+  m_ScalarType = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPL::ScalarTypes::Type CreateDataArray::getScalarType() const
+{
+  return m_ScalarType;
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setNumberOfComponents(int value)
+{
+  m_NumberOfComponents = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreateDataArray::getNumberOfComponents() const
+{
+  return m_NumberOfComponents;
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setNewArray(const DataArrayPath& value)
+{
+  m_NewArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateDataArray::getNewArray() const
+{
+  return m_NewArray;
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setInitializationType(int value)
+{
+  m_InitializationType = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreateDataArray::getInitializationType() const
+{
+  return m_InitializationType;
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setInitializationValue(const QString& value)
+{
+  m_InitializationValue = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateDataArray::getInitializationValue() const
+{
+  return m_InitializationValue;
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataArray::setInitializationRange(const FPRangePair& value)
+{
+  m_InitializationRange = value;
+}
+
+// -----------------------------------------------------------------------------
+FPRangePair CreateDataArray::getInitializationRange() const
+{
+  return m_InitializationRange;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index f34639a867..f2f266a05a 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -36,10 +36,15 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The CreateDataArray class. See [Filter documentation](@ref createdataarray) for details.
@@ -47,18 +52,43 @@
 class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateDataArray)
+    PYB11_FILTER_NEW_MACRO(CreateDataArray)
+    PYB11_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
+    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
+    PYB11_FILTER_PARAMETER(DataArrayPath, NewArray)
+    PYB11_FILTER_PARAMETER(int, InitializationType)
+    PYB11_FILTER_PARAMETER(QString, InitializationValue)
+    PYB11_FILTER_PARAMETER(FPRangePair, InitializationRange)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
     PYB11_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
     PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
     PYB11_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateDataArray)
-    SIMPL_FILTER_NEW_MACRO(CreateDataArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateDataArray, AbstractFilter)
+    using Self = CreateDataArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateDataArray> New();
+
+    /**
+     * @brief Returns the name of the class for CreateDataArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateDataArray
+     */
+    static QString ClassName();
 
     ~CreateDataArray() override;
 
@@ -68,42 +98,96 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
       RandomWithRange
     };
 
-    SIMPL_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
+    /**
+     * @brief Setter property for ScalarType
+     */
+    void setScalarType(SIMPL::ScalarTypes::Type value);
+    /**
+     * @brief Getter property for ScalarType
+     * @return Value of ScalarType
+     */
+    SIMPL::ScalarTypes::Type getScalarType() const;
+
     Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
-    SIMPL_FILTER_PARAMETER(int, NumberOfComponents)
+    /**
+     * @brief Setter property for NumberOfComponents
+     */
+    void setNumberOfComponents(int value);
+    /**
+     * @brief Getter property for NumberOfComponents
+     * @return Value of NumberOfComponents
+     */
+    int getNumberOfComponents() const;
+
     Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, NewArray)
+    /**
+     * @brief Setter property for NewArray
+     */
+    void setNewArray(const DataArrayPath& value);
+    /**
+     * @brief Getter property for NewArray
+     * @return Value of NewArray
+     */
+    DataArrayPath getNewArray() const;
+
     Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
 
-    SIMPL_FILTER_PARAMETER(int, InitializationType)
+    /**
+     * @brief Setter property for InitializationType
+     */
+    void setInitializationType(int value);
+    /**
+     * @brief Getter property for InitializationType
+     * @return Value of InitializationType
+     */
+    int getInitializationType() const;
+
     Q_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
 
-    SIMPL_FILTER_PARAMETER(QString, InitializationValue)
+    /**
+     * @brief Setter property for InitializationValue
+     */
+    void setInitializationValue(const QString& value);
+    /**
+     * @brief Getter property for InitializationValue
+     * @return Value of InitializationValue
+     */
+    QString getInitializationValue() const;
+
     Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
 
-    SIMPL_FILTER_PARAMETER(FPRangePair, InitializationRange)
+    /**
+     * @brief Setter property for InitializationRange
+     */
+    void setInitializationRange(const FPRangePair& value);
+    /**
+     * @brief Getter property for InitializationRange
+     * @return Value of InitializationRange
+     */
+    FPRangePair getInitializationRange() const;
+
     Q_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -113,23 +197,23 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -188,7 +272,14 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
 
 
   private:
-    DEFINE_IDATAARRAY_WEAKPTR(OutputArray)
+    IDataArrayWkPtrType m_OutputArrayPtr;
+
+    SIMPL::ScalarTypes::Type m_ScalarType = {};
+    int m_NumberOfComponents = {};
+    DataArrayPath m_NewArray = {};
+    int m_InitializationType = {};
+    QString m_InitializationValue = {};
+    FPRangePair m_InitializationRange = {};
 
     /**
     * @brief checkInitialization Checks that the chosen initialization value/range is inside
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 4d0da26086..1759f119f7 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -33,12 +33,19 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateDataContainer.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataContainerID = 1
@@ -144,7 +151,7 @@ AbstractFilter::Pointer CreateDataContainer::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getCompiledLibraryName() const
+QString CreateDataContainer::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -152,7 +159,7 @@ const QString CreateDataContainer::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getBrandingString() const
+QString CreateDataContainer::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -160,7 +167,7 @@ const QString CreateDataContainer::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getFilterVersion() const
+QString CreateDataContainer::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -171,7 +178,7 @@ const QString CreateDataContainer::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getGroupName() const
+QString CreateDataContainer::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -179,7 +186,7 @@ const QString CreateDataContainer::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getHumanLabel() const
+QString CreateDataContainer::getHumanLabel() const
 {
   return "Create Data Container";
 }
@@ -187,7 +194,7 @@ const QString CreateDataContainer::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateDataContainer::getUuid()
+QUuid CreateDataContainer::getUuid() const
 {
   return QUuid("{816fbe6b-7c38-581b-b149-3f839fb65b93}");
 }
@@ -195,7 +202,48 @@ const QUuid CreateDataContainer::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateDataContainer::getSubGroupName() const
+QString CreateDataContainer::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
+
+// -----------------------------------------------------------------------------
+CreateDataContainer::Pointer CreateDataContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateDataContainer> CreateDataContainer::New()
+{
+  struct make_shared_enabler : public CreateDataContainer
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateDataContainer::getNameOfClass() const
+{
+  return QString("CreateDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateDataContainer::ClassName()
+{
+  return QString("CreateDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+void CreateDataContainer::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateDataContainer::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index 21af43793b..c80c1f7fb1 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The CreateDataContainer class. See [Filter documentation](@ref createdatacontainer) for details.
@@ -46,37 +47,66 @@
 class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateDataContainer)
+    PYB11_FILTER_NEW_MACRO(CreateDataContainer)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateDataContainer)
-    SIMPL_FILTER_NEW_MACRO(CreateDataContainer)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateDataContainer, AbstractFilter)
+    using Self = CreateDataContainer;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateDataContainer> New();
+
+    /**
+     * @brief Returns the name of the class for CreateDataContainer
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateDataContainer
+     */
+    static QString ClassName();
 
     ~CreateDataContainer() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    /**
+     * @brief Setter property for DataContainerName
+     */
+    void setDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerName
+     * @return Value of DataContainerName
+     */
+    DataArrayPath getDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -86,23 +116,23 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -165,5 +195,8 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
     CreateDataContainer(CreateDataContainer&&) = delete;      // Move Constructor Not Implemented
     CreateDataContainer& operator=(const CreateDataContainer&) = delete; // Copy Assignment Not Implemented
     CreateDataContainer& operator=(CreateDataContainer&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_DataContainerName = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 6d99d7f133..fadf6dd43e 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateFeatureArrayFromElementArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
@@ -44,6 +49,7 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   FeatureArrayID = 1
@@ -344,7 +350,7 @@ AbstractFilter::Pointer CreateFeatureArrayFromElementArray::newFilterInstance(bo
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getCompiledLibraryName() const
+QString CreateFeatureArrayFromElementArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -352,7 +358,7 @@ const QString CreateFeatureArrayFromElementArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getBrandingString() const
+QString CreateFeatureArrayFromElementArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -360,7 +366,7 @@ const QString CreateFeatureArrayFromElementArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getFilterVersion() const
+QString CreateFeatureArrayFromElementArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -371,7 +377,7 @@ const QString CreateFeatureArrayFromElementArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getGroupName() const
+QString CreateFeatureArrayFromElementArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -379,7 +385,7 @@ const QString CreateFeatureArrayFromElementArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateFeatureArrayFromElementArray::getUuid()
+QUuid CreateFeatureArrayFromElementArray::getUuid() const
 {
   return QUuid("{94438019-21bb-5b61-a7c3-66974b9a34dc}");
 }
@@ -387,7 +393,7 @@ const QUuid CreateFeatureArrayFromElementArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getSubGroupName() const
+QString CreateFeatureArrayFromElementArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -395,7 +401,84 @@ const QString CreateFeatureArrayFromElementArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateFeatureArrayFromElementArray::getHumanLabel() const
+QString CreateFeatureArrayFromElementArray::getHumanLabel() const
 {
   return "Create Feature Array from Element Array";
 }
+
+// -----------------------------------------------------------------------------
+CreateFeatureArrayFromElementArray::Pointer CreateFeatureArrayFromElementArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateFeatureArrayFromElementArray> CreateFeatureArrayFromElementArray::New()
+{
+  struct make_shared_enabler : public CreateFeatureArrayFromElementArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateFeatureArrayFromElementArray::getNameOfClass() const
+{
+  return QString("CreateFeatureArrayFromElementArray");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateFeatureArrayFromElementArray::ClassName()
+{
+  return QString("CreateFeatureArrayFromElementArray");
+}
+
+// -----------------------------------------------------------------------------
+void CreateFeatureArrayFromElementArray::setCellFeatureAttributeMatrixName(const DataArrayPath& value)
+{
+  m_CellFeatureAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateFeatureArrayFromElementArray::getCellFeatureAttributeMatrixName() const
+{
+  return m_CellFeatureAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateFeatureArrayFromElementArray::setSelectedCellArrayPath(const DataArrayPath& value)
+{
+  m_SelectedCellArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateFeatureArrayFromElementArray::getSelectedCellArrayPath() const
+{
+  return m_SelectedCellArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateFeatureArrayFromElementArray::setCreatedArrayName(const QString& value)
+{
+  m_CreatedArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateFeatureArrayFromElementArray::getCreatedArrayName() const
+{
+  return m_CreatedArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateFeatureArrayFromElementArray::setFeatureIdsArrayPath(const DataArrayPath& value)
+{
+  m_FeatureIdsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateFeatureArrayFromElementArray::getFeatureIdsArrayPath() const
+{
+  return m_FeatureIdsArrayPath;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 6c6022aa45..da83d944d8 100755
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -36,9 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The CreateFeatureArrayFromElementArray class. See [Filter documentation](@ref createfeaturearrayfromelementarray) for details.
@@ -46,49 +51,108 @@
 class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
+    PYB11_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
+    PYB11_FILTER_PARAMETER(QString, CreatedArrayName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
     PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
-    SIMPL_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateFeatureArrayFromElementArray, AbstractFilter)
+    using Self = CreateFeatureArrayFromElementArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateFeatureArrayFromElementArray> New();
+
+    /**
+     * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
+     */
+    static QString ClassName();
 
     ~CreateFeatureArrayFromElementArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixName)
+    /**
+     * @brief Setter property for CellFeatureAttributeMatrixName
+     */
+    void setCellFeatureAttributeMatrixName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CellFeatureAttributeMatrixName
+     * @return Value of CellFeatureAttributeMatrixName
+     */
+    DataArrayPath getCellFeatureAttributeMatrixName() const;
+
     Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
+    /**
+     * @brief Setter property for SelectedCellArrayPath
+     */
+    void setSelectedCellArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedCellArrayPath
+     * @return Value of SelectedCellArrayPath
+     */
+    DataArrayPath getSelectedCellArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
 
-    SIMPL_FILTER_PARAMETER(QString, CreatedArrayName)
+    /**
+     * @brief Setter property for CreatedArrayName
+     */
+    void setCreatedArrayName(const QString& value);
+    /**
+     * @brief Getter property for CreatedArrayName
+     * @return Value of CreatedArrayName
+     */
+    QString getCreatedArrayName() const;
+
     Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+    /**
+     * @brief Setter property for FeatureIdsArrayPath
+     */
+    void setFeatureIdsArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FeatureIdsArrayPath
+     * @return Value of FeatureIdsArrayPath
+     */
+    DataArrayPath getFeatureIdsArrayPath() const;
+
     Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -98,23 +162,23 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -173,8 +237,15 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(int32_t, FeatureIds)
-    DEFINE_IDATAARRAY_WEAKPTR(InArray)
+    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+    int32_t* m_FeatureIds = nullptr;
+
+    IDataArrayWkPtrType m_InArrayPtr;
+
+    DataArrayPath m_CellFeatureAttributeMatrixName = {};
+    DataArrayPath m_SelectedCellArrayPath = {};
+    QString m_CreatedArrayName = {};
+    DataArrayPath m_FeatureIdsArrayPath = {};
 
   public:
     CreateFeatureArrayFromElementArray(const CreateFeatureArrayFromElementArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 2b8a3cf1dd..2693bc187d 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -33,9 +33,14 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateGeometry.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
@@ -54,6 +59,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -920,7 +927,7 @@ AbstractFilter::Pointer CreateGeometry::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getCompiledLibraryName() const
+QString CreateGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -928,7 +935,7 @@ const QString CreateGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getBrandingString() const
+QString CreateGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -936,7 +943,7 @@ const QString CreateGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getFilterVersion() const
+QString CreateGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -947,7 +954,7 @@ const QString CreateGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getGroupName() const
+QString CreateGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -955,7 +962,7 @@ const QString CreateGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateGeometry::getUuid()
+QUuid CreateGeometry::getUuid() const
 {
   return QUuid("{9ac220b9-14f9-581a-9bac-5714467589cc}");
 }
@@ -963,7 +970,7 @@ const QUuid CreateGeometry::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getSubGroupName() const
+QString CreateGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GeometryFilters;
 }
@@ -971,7 +978,444 @@ const QString CreateGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateGeometry::getHumanLabel() const
+QString CreateGeometry::getHumanLabel() const
 {
   return "Create Geometry";
 }
+
+// -----------------------------------------------------------------------------
+CreateGeometry::Pointer CreateGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateGeometry> CreateGeometry::New()
+{
+  struct make_shared_enabler : public CreateGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getNameOfClass() const
+{
+  return QString("CreateGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::ClassName()
+{
+  return QString("CreateGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setGeometryType(int value)
+{
+  m_GeometryType = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreateGeometry::getGeometryType() const
+{
+  return m_GeometryType;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath0(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath0 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath0() const
+{
+  return m_SharedVertexListArrayPath0;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath1(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath1 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath1() const
+{
+  return m_SharedVertexListArrayPath1;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath2(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath2 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath2() const
+{
+  return m_SharedVertexListArrayPath2;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath3(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath3 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath3() const
+{
+  return m_SharedVertexListArrayPath3;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath4(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath4 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath4() const
+{
+  return m_SharedVertexListArrayPath4;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedVertexListArrayPath5(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath5 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedVertexListArrayPath5() const
+{
+  return m_SharedVertexListArrayPath5;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedEdgeListArrayPath(const DataArrayPath& value)
+{
+  m_SharedEdgeListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedEdgeListArrayPath() const
+{
+  return m_SharedEdgeListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedTriListArrayPath(const DataArrayPath& value)
+{
+  m_SharedTriListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedTriListArrayPath() const
+{
+  return m_SharedTriListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedQuadListArrayPath(const DataArrayPath& value)
+{
+  m_SharedQuadListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedQuadListArrayPath() const
+{
+  return m_SharedQuadListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedTetListArrayPath(const DataArrayPath& value)
+{
+  m_SharedTetListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedTetListArrayPath() const
+{
+  return m_SharedTetListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSharedHexListArrayPath(const DataArrayPath& value)
+{
+  m_SharedHexListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getSharedHexListArrayPath() const
+{
+  return m_SharedHexListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setXBoundsArrayPath(const DataArrayPath& value)
+{
+  m_XBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getXBoundsArrayPath() const
+{
+  return m_XBoundsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setYBoundsArrayPath(const DataArrayPath& value)
+{
+  m_YBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getYBoundsArrayPath() const
+{
+  return m_YBoundsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setZBoundsArrayPath(const DataArrayPath& value)
+{
+  m_ZBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateGeometry::getZBoundsArrayPath() const
+{
+  return m_ZBoundsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setDimensions(const IntVec3Type& value)
+{
+  m_Dimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec3Type CreateGeometry::getDimensions() const
+{
+  return m_Dimensions;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setOrigin(const FloatVec3Type& value)
+{
+  m_Origin = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type CreateGeometry::getOrigin() const
+{
+  return m_Origin;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setSpacing(const FloatVec3Type& value)
+{
+  m_Spacing = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type CreateGeometry::getSpacing() const
+{
+  return m_Spacing;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setImageCellAttributeMatrixName(const QString& value)
+{
+  m_ImageCellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getImageCellAttributeMatrixName() const
+{
+  return m_ImageCellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setRectGridCellAttributeMatrixName(const QString& value)
+{
+  m_RectGridCellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getRectGridCellAttributeMatrixName() const
+{
+  return m_RectGridCellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName0(const QString& value)
+{
+  m_VertexAttributeMatrixName0 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName0() const
+{
+  return m_VertexAttributeMatrixName0;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName1(const QString& value)
+{
+  m_VertexAttributeMatrixName1 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName1() const
+{
+  return m_VertexAttributeMatrixName1;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName2(const QString& value)
+{
+  m_VertexAttributeMatrixName2 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName2() const
+{
+  return m_VertexAttributeMatrixName2;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName3(const QString& value)
+{
+  m_VertexAttributeMatrixName3 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName3() const
+{
+  return m_VertexAttributeMatrixName3;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName4(const QString& value)
+{
+  m_VertexAttributeMatrixName4 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName4() const
+{
+  return m_VertexAttributeMatrixName4;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setVertexAttributeMatrixName5(const QString& value)
+{
+  m_VertexAttributeMatrixName5 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getVertexAttributeMatrixName5() const
+{
+  return m_VertexAttributeMatrixName5;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setEdgeAttributeMatrixName(const QString& value)
+{
+  m_EdgeAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getEdgeAttributeMatrixName() const
+{
+  return m_EdgeAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setFaceAttributeMatrixName0(const QString& value)
+{
+  m_FaceAttributeMatrixName0 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getFaceAttributeMatrixName0() const
+{
+  return m_FaceAttributeMatrixName0;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setFaceAttributeMatrixName1(const QString& value)
+{
+  m_FaceAttributeMatrixName1 = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getFaceAttributeMatrixName1() const
+{
+  return m_FaceAttributeMatrixName1;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setTetCellAttributeMatrixName(const QString& value)
+{
+  m_TetCellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getTetCellAttributeMatrixName() const
+{
+  return m_TetCellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setHexCellAttributeMatrixName(const QString& value)
+{
+  m_HexCellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateGeometry::getHexCellAttributeMatrixName() const
+{
+  return m_HexCellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setTreatWarningsAsErrors(bool value)
+{
+  m_TreatWarningsAsErrors = value;
+}
+
+// -----------------------------------------------------------------------------
+bool CreateGeometry::getTreatWarningsAsErrors() const
+{
+  return m_TreatWarningsAsErrors;
+}
+
+// -----------------------------------------------------------------------------
+void CreateGeometry::setArrayHandling(bool value)
+{
+  m_ArrayHandling = value;
+}
+
+// -----------------------------------------------------------------------------
+bool CreateGeometry::getArrayHandling() const
+{
+  return m_ArrayHandling;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 140651d1da..adf07b0568 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -33,11 +33,13 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The CreateGeometry class. See [Filter documentation](@ref creategeometry) for details.
@@ -45,7 +47,45 @@
 class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(CreateGeometry SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(CreateGeometry)
+  PYB11_FILTER_NEW_MACRO(CreateGeometry)
+  PYB11_FILTER_PARAMETER(int, GeometryType)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
+  PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
+  PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
+  PYB11_FILTER_PARAMETER(QString, ImageCellAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(QString, RectGridCellAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName0)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName1)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName2)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName3)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName4)
+  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName5)
+  PYB11_FILTER_PARAMETER(QString, EdgeAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(QString, FaceAttributeMatrixName0)
+  PYB11_FILTER_PARAMETER(QString, FaceAttributeMatrixName1)
+  PYB11_FILTER_PARAMETER(QString, TetCellAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(QString, HexCellAttributeMatrixName)
+  PYB11_FILTER_PARAMETER(bool, TreatWarningsAsErrors)
+  PYB11_FILTER_PARAMETER(bool, ArrayHandling)
   PYB11_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
@@ -76,117 +116,447 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   PYB11_PROPERTY(QString TetCellAttributeMatrixName READ getTetCellAttributeMatrixName WRITE setTetCellAttributeMatrixName)
   PYB11_PROPERTY(bool TreatWarningsAsErrors READ getTreatWarningsAsErrors WRITE setTreatWarningsAsErrors)
   PYB11_PROPERTY(bool ArrayHandling READ getArrayHandling WRITE setArrayHandling)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(CreateGeometry)
-  SIMPL_FILTER_NEW_MACRO(CreateGeometry)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateGeometry, AbstractFilter)
+  using Self = CreateGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CreateGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateGeometry
+   */
+  static QString ClassName();
 
   ~CreateGeometry() override;
 
   static const int k_CopyArrays = 0;
   static const int k_MoveArrays = 1;
 
-  SIMPL_FILTER_PARAMETER(int, GeometryType)
+  /**
+   * @brief Setter property for GeometryType
+   */
+  void setGeometryType(int value);
+  /**
+   * @brief Getter property for GeometryType
+   * @return Value of GeometryType
+   */
+  int getGeometryType() const;
+
   Q_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath0
+   */
+  void setSharedVertexListArrayPath0(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath0
+   * @return Value of SharedVertexListArrayPath0
+   */
+  DataArrayPath getSharedVertexListArrayPath0() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath1
+   */
+  void setSharedVertexListArrayPath1(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath1
+   * @return Value of SharedVertexListArrayPath1
+   */
+  DataArrayPath getSharedVertexListArrayPath1() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath2
+   */
+  void setSharedVertexListArrayPath2(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath2
+   * @return Value of SharedVertexListArrayPath2
+   */
+  DataArrayPath getSharedVertexListArrayPath2() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath2 READ getSharedVertexListArrayPath2 WRITE setSharedVertexListArrayPath2)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath3
+   */
+  void setSharedVertexListArrayPath3(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath3
+   * @return Value of SharedVertexListArrayPath3
+   */
+  DataArrayPath getSharedVertexListArrayPath3() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath3 READ getSharedVertexListArrayPath3 WRITE setSharedVertexListArrayPath3)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath4
+   */
+  void setSharedVertexListArrayPath4(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath4
+   * @return Value of SharedVertexListArrayPath4
+   */
+  DataArrayPath getSharedVertexListArrayPath4() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath4 READ getSharedVertexListArrayPath4 WRITE setSharedVertexListArrayPath4)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath5
+   */
+  void setSharedVertexListArrayPath5(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath5
+   * @return Value of SharedVertexListArrayPath5
+   */
+  DataArrayPath getSharedVertexListArrayPath5() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath5 READ getSharedVertexListArrayPath5 WRITE setSharedVertexListArrayPath5)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
+  /**
+   * @brief Setter property for SharedEdgeListArrayPath
+   */
+  void setSharedEdgeListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedEdgeListArrayPath
+   * @return Value of SharedEdgeListArrayPath
+   */
+  DataArrayPath getSharedEdgeListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedEdgeListArrayPath READ getSharedEdgeListArrayPath WRITE setSharedEdgeListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
+  /**
+   * @brief Setter property for SharedTriListArrayPath
+   */
+  void setSharedTriListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedTriListArrayPath
+   * @return Value of SharedTriListArrayPath
+   */
+  DataArrayPath getSharedTriListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedTriListArrayPath READ getSharedTriListArrayPath WRITE setSharedTriListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
+  /**
+   * @brief Setter property for SharedQuadListArrayPath
+   */
+  void setSharedQuadListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedQuadListArrayPath
+   * @return Value of SharedQuadListArrayPath
+   */
+  DataArrayPath getSharedQuadListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedQuadListArrayPath READ getSharedQuadListArrayPath WRITE setSharedQuadListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
+  /**
+   * @brief Setter property for SharedTetListArrayPath
+   */
+  void setSharedTetListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedTetListArrayPath
+   * @return Value of SharedTetListArrayPath
+   */
+  DataArrayPath getSharedTetListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedTetListArrayPath READ getSharedTetListArrayPath WRITE setSharedTetListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
+  /**
+   * @brief Setter property for SharedHexListArrayPath
+   */
+  void setSharedHexListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedHexListArrayPath
+   * @return Value of SharedHexListArrayPath
+   */
+  DataArrayPath getSharedHexListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedHexListArrayPath READ getSharedHexListArrayPath WRITE setSharedHexListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
+  /**
+   * @brief Setter property for XBoundsArrayPath
+   */
+  void setXBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for XBoundsArrayPath
+   * @return Value of XBoundsArrayPath
+   */
+  DataArrayPath getXBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath XBoundsArrayPath READ getXBoundsArrayPath WRITE setXBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
+  /**
+   * @brief Setter property for YBoundsArrayPath
+   */
+  void setYBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for YBoundsArrayPath
+   * @return Value of YBoundsArrayPath
+   */
+  DataArrayPath getYBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath YBoundsArrayPath READ getYBoundsArrayPath WRITE setYBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
+  /**
+   * @brief Setter property for ZBoundsArrayPath
+   */
+  void setZBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for ZBoundsArrayPath
+   * @return Value of ZBoundsArrayPath
+   */
+  DataArrayPath getZBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  /**
+   * @brief Setter property for Dimensions
+   */
+  void setDimensions(const IntVec3Type& value);
+  /**
+   * @brief Getter property for Dimensions
+   * @return Value of Dimensions
+   */
+  IntVec3Type getDimensions() const;
+
   Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+  /**
+   * @brief Setter property for Origin
+   */
+  void setOrigin(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Origin
+   * @return Value of Origin
+   */
+  FloatVec3Type getOrigin() const;
+
   Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+  /**
+   * @brief Setter property for Spacing
+   */
+  void setSpacing(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Spacing
+   * @return Value of Spacing
+   */
+  FloatVec3Type getSpacing() const;
+
   Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
-  SIMPL_FILTER_PARAMETER(QString, ImageCellAttributeMatrixName)
+  /**
+   * @brief Setter property for ImageCellAttributeMatrixName
+   */
+  void setImageCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for ImageCellAttributeMatrixName
+   * @return Value of ImageCellAttributeMatrixName
+   */
+  QString getImageCellAttributeMatrixName() const;
+
   Q_PROPERTY(QString ImageCellAttributeMatrixName READ getImageCellAttributeMatrixName WRITE setImageCellAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(QString, RectGridCellAttributeMatrixName)
+  /**
+   * @brief Setter property for RectGridCellAttributeMatrixName
+   */
+  void setRectGridCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for RectGridCellAttributeMatrixName
+   * @return Value of RectGridCellAttributeMatrixName
+   */
+  QString getRectGridCellAttributeMatrixName() const;
+
   Q_PROPERTY(QString RectGridCellAttributeMatrixName READ getRectGridCellAttributeMatrixName WRITE setRectGridCellAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName0)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName0
+   */
+  void setVertexAttributeMatrixName0(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName0
+   * @return Value of VertexAttributeMatrixName0
+   */
+  QString getVertexAttributeMatrixName0() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName0 READ getVertexAttributeMatrixName0 WRITE setVertexAttributeMatrixName0)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName1)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName1
+   */
+  void setVertexAttributeMatrixName1(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName1
+   * @return Value of VertexAttributeMatrixName1
+   */
+  QString getVertexAttributeMatrixName1() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName1 READ getVertexAttributeMatrixName1 WRITE setVertexAttributeMatrixName1)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName2)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName2
+   */
+  void setVertexAttributeMatrixName2(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName2
+   * @return Value of VertexAttributeMatrixName2
+   */
+  QString getVertexAttributeMatrixName2() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName2 READ getVertexAttributeMatrixName2 WRITE setVertexAttributeMatrixName2)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName3)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName3
+   */
+  void setVertexAttributeMatrixName3(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName3
+   * @return Value of VertexAttributeMatrixName3
+   */
+  QString getVertexAttributeMatrixName3() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName3 READ getVertexAttributeMatrixName3 WRITE setVertexAttributeMatrixName3)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName4)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName4
+   */
+  void setVertexAttributeMatrixName4(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName4
+   * @return Value of VertexAttributeMatrixName4
+   */
+  QString getVertexAttributeMatrixName4() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName4 READ getVertexAttributeMatrixName4 WRITE setVertexAttributeMatrixName4)
 
-  SIMPL_FILTER_PARAMETER(QString, VertexAttributeMatrixName5)
+  /**
+   * @brief Setter property for VertexAttributeMatrixName5
+   */
+  void setVertexAttributeMatrixName5(const QString& value);
+  /**
+   * @brief Getter property for VertexAttributeMatrixName5
+   * @return Value of VertexAttributeMatrixName5
+   */
+  QString getVertexAttributeMatrixName5() const;
+
   Q_PROPERTY(QString VertexAttributeMatrixName5 READ getVertexAttributeMatrixName5 WRITE setVertexAttributeMatrixName5)
 
-  SIMPL_FILTER_PARAMETER(QString, EdgeAttributeMatrixName)
+  /**
+   * @brief Setter property for EdgeAttributeMatrixName
+   */
+  void setEdgeAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for EdgeAttributeMatrixName
+   * @return Value of EdgeAttributeMatrixName
+   */
+  QString getEdgeAttributeMatrixName() const;
+
   Q_PROPERTY(QString EdgeAttributeMatrixName READ getEdgeAttributeMatrixName WRITE setEdgeAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(QString, FaceAttributeMatrixName0)
+  /**
+   * @brief Setter property for FaceAttributeMatrixName0
+   */
+  void setFaceAttributeMatrixName0(const QString& value);
+  /**
+   * @brief Getter property for FaceAttributeMatrixName0
+   * @return Value of FaceAttributeMatrixName0
+   */
+  QString getFaceAttributeMatrixName0() const;
+
   Q_PROPERTY(QString FaceAttributeMatrixName0 READ getFaceAttributeMatrixName0 WRITE setFaceAttributeMatrixName0)
 
-  SIMPL_FILTER_PARAMETER(QString, FaceAttributeMatrixName1)
+  /**
+   * @brief Setter property for FaceAttributeMatrixName1
+   */
+  void setFaceAttributeMatrixName1(const QString& value);
+  /**
+   * @brief Getter property for FaceAttributeMatrixName1
+   * @return Value of FaceAttributeMatrixName1
+   */
+  QString getFaceAttributeMatrixName1() const;
+
   Q_PROPERTY(QString FaceAttributeMatrixName1 READ getFaceAttributeMatrixName1 WRITE setFaceAttributeMatrixName1)
 
-  SIMPL_FILTER_PARAMETER(QString, TetCellAttributeMatrixName)
+  /**
+   * @brief Setter property for TetCellAttributeMatrixName
+   */
+  void setTetCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for TetCellAttributeMatrixName
+   * @return Value of TetCellAttributeMatrixName
+   */
+  QString getTetCellAttributeMatrixName() const;
+
   Q_PROPERTY(QString TetCellAttributeMatrixName READ getTetCellAttributeMatrixName WRITE setTetCellAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(QString, HexCellAttributeMatrixName)
+  /**
+   * @brief Setter property for HexCellAttributeMatrixName
+   */
+  void setHexCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for HexCellAttributeMatrixName
+   * @return Value of HexCellAttributeMatrixName
+   */
+  QString getHexCellAttributeMatrixName() const;
+
   Q_PROPERTY(QString HexCellAttributeMatrixName READ getHexCellAttributeMatrixName WRITE setHexCellAttributeMatrixName)
 
-  SIMPL_FILTER_PARAMETER(bool, TreatWarningsAsErrors)
+  /**
+   * @brief Setter property for TreatWarningsAsErrors
+   */
+  void setTreatWarningsAsErrors(bool value);
+  /**
+   * @brief Getter property for TreatWarningsAsErrors
+   * @return Value of TreatWarningsAsErrors
+   */
+  bool getTreatWarningsAsErrors() const;
+
   Q_PROPERTY(bool TreatWarningsAsErrors READ getTreatWarningsAsErrors WRITE setTreatWarningsAsErrors)
 
-  SIMPL_FILTER_PARAMETER(bool, ArrayHandling)
+  /**
+   * @brief Setter property for ArrayHandling
+   */
+  void setArrayHandling(bool value);
+  /**
+   * @brief Getter property for ArrayHandling
+   * @return Value of ArrayHandling
+   */
+  bool getArrayHandling() const;
+
   Q_PROPERTY(bool ArrayHandling READ getArrayHandling WRITE setArrayHandling)
 
   QString getBoxDimensions();
@@ -195,21 +565,21 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -219,23 +589,23 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -288,14 +658,57 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   void initialize();
 
 private:
-  DEFINE_DATAARRAY_VARIABLE(float, XBounds)
-  DEFINE_DATAARRAY_VARIABLE(float, YBounds)
-  DEFINE_DATAARRAY_VARIABLE(float, ZBounds)
-  DEFINE_DATAARRAY_VARIABLE(size_t, Edges)
-  DEFINE_DATAARRAY_VARIABLE(size_t, Tris)
-  DEFINE_DATAARRAY_VARIABLE(size_t, Quads)
-  DEFINE_DATAARRAY_VARIABLE(size_t, Tets)
-  DEFINE_DATAARRAY_VARIABLE(size_t, Hexes)
+  std::weak_ptr<DataArray<float>> m_XBoundsPtr;
+  float* m_XBounds = nullptr;
+  std::weak_ptr<DataArray<float>> m_YBoundsPtr;
+  float* m_YBounds = nullptr;
+  std::weak_ptr<DataArray<float>> m_ZBoundsPtr;
+  float* m_ZBounds = nullptr;
+  std::weak_ptr<DataArray<size_t>> m_EdgesPtr;
+  size_t* m_Edges = nullptr;
+  std::weak_ptr<DataArray<size_t>> m_TrisPtr;
+  size_t* m_Tris = nullptr;
+  std::weak_ptr<DataArray<size_t>> m_QuadsPtr;
+  size_t* m_Quads = nullptr;
+  std::weak_ptr<DataArray<size_t>> m_TetsPtr;
+  size_t* m_Tets = nullptr;
+  std::weak_ptr<DataArray<size_t>> m_HexesPtr;
+  size_t* m_Hexes = nullptr;
+
+  int m_GeometryType = {};
+  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_SharedVertexListArrayPath0 = {};
+  DataArrayPath m_SharedVertexListArrayPath1 = {};
+  DataArrayPath m_SharedVertexListArrayPath2 = {};
+  DataArrayPath m_SharedVertexListArrayPath3 = {};
+  DataArrayPath m_SharedVertexListArrayPath4 = {};
+  DataArrayPath m_SharedVertexListArrayPath5 = {};
+  DataArrayPath m_SharedEdgeListArrayPath = {};
+  DataArrayPath m_SharedTriListArrayPath = {};
+  DataArrayPath m_SharedQuadListArrayPath = {};
+  DataArrayPath m_SharedTetListArrayPath = {};
+  DataArrayPath m_SharedHexListArrayPath = {};
+  DataArrayPath m_XBoundsArrayPath = {};
+  DataArrayPath m_YBoundsArrayPath = {};
+  DataArrayPath m_ZBoundsArrayPath = {};
+  IntVec3Type m_Dimensions = {};
+  FloatVec3Type m_Origin = {};
+  FloatVec3Type m_Spacing = {};
+  QString m_ImageCellAttributeMatrixName = {};
+  QString m_RectGridCellAttributeMatrixName = {};
+  QString m_VertexAttributeMatrixName0 = {};
+  QString m_VertexAttributeMatrixName1 = {};
+  QString m_VertexAttributeMatrixName2 = {};
+  QString m_VertexAttributeMatrixName3 = {};
+  QString m_VertexAttributeMatrixName4 = {};
+  QString m_VertexAttributeMatrixName5 = {};
+  QString m_EdgeAttributeMatrixName = {};
+  QString m_FaceAttributeMatrixName0 = {};
+  QString m_FaceAttributeMatrixName1 = {};
+  QString m_TetCellAttributeMatrixName = {};
+  QString m_HexCellAttributeMatrixName = {};
+  bool m_TreatWarningsAsErrors = {};
+  bool m_ArrayHandling = {};
 
   size_t m_NumVerts;
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 58de5b0968..e115b7a139 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -32,9 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "CreateImageGeometry.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
@@ -43,6 +48,8 @@
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -207,7 +214,7 @@ AbstractFilter::Pointer CreateImageGeometry::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getCompiledLibraryName() const
+QString CreateImageGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -215,7 +222,7 @@ const QString CreateImageGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getBrandingString() const
+QString CreateImageGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -223,7 +230,7 @@ const QString CreateImageGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getFilterVersion() const
+QString CreateImageGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -234,7 +241,7 @@ const QString CreateImageGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getGroupName() const
+QString CreateImageGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -242,7 +249,7 @@ const QString CreateImageGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateImageGeometry::getUuid()
+QUuid CreateImageGeometry::getUuid() const
 {
   return QUuid("{f2132744-3abb-5d66-9cd9-c9a233b5c4aa}");
 }
@@ -250,7 +257,7 @@ const QUuid CreateImageGeometry::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getSubGroupName() const
+QString CreateImageGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
@@ -258,7 +265,84 @@ const QString CreateImageGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateImageGeometry::getHumanLabel() const
+QString CreateImageGeometry::getHumanLabel() const
 {
   return "Create Geometry (Image)";
 }
+
+// -----------------------------------------------------------------------------
+CreateImageGeometry::Pointer CreateImageGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateImageGeometry> CreateImageGeometry::New()
+{
+  struct make_shared_enabler : public CreateImageGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateImageGeometry::getNameOfClass() const
+{
+  return QString("CreateImageGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateImageGeometry::ClassName()
+{
+  return QString("CreateImageGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void CreateImageGeometry::setSelectedDataContainer(const DataArrayPath& value)
+{
+  m_SelectedDataContainer = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateImageGeometry::getSelectedDataContainer() const
+{
+  return m_SelectedDataContainer;
+}
+
+// -----------------------------------------------------------------------------
+void CreateImageGeometry::setDimensions(const IntVec3Type& value)
+{
+  m_Dimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec3Type CreateImageGeometry::getDimensions() const
+{
+  return m_Dimensions;
+}
+
+// -----------------------------------------------------------------------------
+void CreateImageGeometry::setOrigin(const FloatVec3Type& value)
+{
+  m_Origin = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type CreateImageGeometry::getOrigin() const
+{
+  return m_Origin;
+}
+
+// -----------------------------------------------------------------------------
+void CreateImageGeometry::setSpacing(const FloatVec3Type& value)
+{
+  m_Spacing = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type CreateImageGeometry::getSpacing() const
+{
+  return m_Spacing;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index 17af1eb371..dfdab9178a 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -36,11 +36,12 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The CreateImageGeometry class. See [Filter documentation](@ref adjustvolumeorigin) for details.
@@ -48,29 +49,88 @@
 class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateImageGeometry)
+    PYB11_FILTER_NEW_MACRO(CreateImageGeometry)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainer)
+    PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
+    PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
+    PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
     PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
     PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
     PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateImageGeometry)
-    SIMPL_FILTER_NEW_MACRO(CreateImageGeometry)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateImageGeometry, AbstractFilter)
+    using Self = CreateImageGeometry;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateImageGeometry> New();
+
+    /**
+     * @brief Returns the name of the class for CreateImageGeometry
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateImageGeometry
+     */
+    static QString ClassName();
 
     ~CreateImageGeometry() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainer)
+    /**
+     * @brief Setter property for SelectedDataContainer
+     */
+    void setSelectedDataContainer(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedDataContainer
+     * @return Value of SelectedDataContainer
+     */
+    DataArrayPath getSelectedDataContainer() const;
+
     Q_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
 
-    SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+    /**
+     * @brief Setter property for Dimensions
+     */
+    void setDimensions(const IntVec3Type& value);
+    /**
+     * @brief Getter property for Dimensions
+     * @return Value of Dimensions
+     */
+    IntVec3Type getDimensions() const;
+
     Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+    /**
+     * @brief Setter property for Origin
+     */
+    void setOrigin(const FloatVec3Type& value);
+    /**
+     * @brief Getter property for Origin
+     * @return Value of Origin
+     */
+    FloatVec3Type getOrigin() const;
+
     Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+    /**
+     * @brief Setter property for Spacing
+     */
+    void setSpacing(const FloatVec3Type& value);
+    /**
+     * @brief Getter property for Spacing
+     * @return Value of Spacing
+     */
+    FloatVec3Type getSpacing() const;
+
     Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
     QString getBoxDimensions();
@@ -79,21 +139,21 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -103,23 +163,23 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -188,5 +248,11 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
     CreateImageGeometry(CreateImageGeometry&&) = delete;      // Move Constructor Not Implemented
     CreateImageGeometry& operator=(const CreateImageGeometry&) = delete; // Copy Assignment Not Implemented
     CreateImageGeometry& operator=(CreateImageGeometry&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_SelectedDataContainer = {};
+    IntVec3Type m_Dimensions = {};
+    FloatVec3Type m_Origin = {};
+    FloatVec3Type m_Spacing = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 4c3293f4e3..73e5570f57 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -33,10 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CreateStringArray.h"
 
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
@@ -46,6 +50,7 @@
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   StringArrayID = 1
@@ -207,7 +212,7 @@ AbstractFilter::Pointer CreateStringArray::newFilterInstance(bool copyFilterPara
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getCompiledLibraryName() const
+QString CreateStringArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -215,7 +220,7 @@ const QString CreateStringArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getBrandingString() const
+QString CreateStringArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -223,7 +228,7 @@ const QString CreateStringArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getFilterVersion() const
+QString CreateStringArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -234,7 +239,7 @@ const QString CreateStringArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getGroupName() const
+QString CreateStringArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -242,7 +247,7 @@ const QString CreateStringArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CreateStringArray::getUuid()
+QUuid CreateStringArray::getUuid() const
 {
   return QUuid("{e6b9a566-c5eb-5e3a-87de-7fe65d1d12b6}");
 }
@@ -250,7 +255,7 @@ const QUuid CreateStringArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getSubGroupName() const
+QString CreateStringArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
@@ -258,7 +263,72 @@ const QString CreateStringArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CreateStringArray::getHumanLabel() const
+QString CreateStringArray::getHumanLabel() const
 {
   return "Create String Array";
 }
+
+// -----------------------------------------------------------------------------
+CreateStringArray::Pointer CreateStringArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CreateStringArray> CreateStringArray::New()
+{
+  struct make_shared_enabler : public CreateStringArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateStringArray::getNameOfClass() const
+{
+  return QString("CreateStringArray");
+}
+
+// -----------------------------------------------------------------------------
+QString CreateStringArray::ClassName()
+{
+  return QString("CreateStringArray");
+}
+
+// -----------------------------------------------------------------------------
+void CreateStringArray::setNumberOfComponents(int value)
+{
+  m_NumberOfComponents = value;
+}
+
+// -----------------------------------------------------------------------------
+int CreateStringArray::getNumberOfComponents() const
+{
+  return m_NumberOfComponents;
+}
+
+// -----------------------------------------------------------------------------
+void CreateStringArray::setNewArray(const DataArrayPath& value)
+{
+  m_NewArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CreateStringArray::getNewArray() const
+{
+  return m_NewArray;
+}
+
+// -----------------------------------------------------------------------------
+void CreateStringArray::setInitializationValue(const QString& value)
+{
+  m_InitializationValue = value;
+}
+
+// -----------------------------------------------------------------------------
+QString CreateStringArray::getInitializationValue() const
+{
+  return m_InitializationValue;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 55700ec9ec..95e1d3091e 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -36,9 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 /**
  * @brief The CreateStringArray class. See [Filter documentation](@ref CreateStringArray) for details.
@@ -46,45 +48,94 @@
 class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(CreateStringArray)
+    PYB11_FILTER_NEW_MACRO(CreateStringArray)
+    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
+    PYB11_FILTER_PARAMETER(DataArrayPath, NewArray)
+    PYB11_FILTER_PARAMETER(QString, InitializationValue)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
     PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(CreateStringArray)
-    SIMPL_FILTER_NEW_MACRO(CreateStringArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CreateStringArray, AbstractFilter)
+    using Self = CreateStringArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<CreateStringArray> New();
+
+    /**
+     * @brief Returns the name of the class for CreateStringArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CreateStringArray
+     */
+    static QString ClassName();
 
     ~CreateStringArray() override;
 
-    SIMPL_FILTER_PARAMETER(int, NumberOfComponents)
+    /**
+     * @brief Setter property for NumberOfComponents
+     */
+    void setNumberOfComponents(int value);
+    /**
+     * @brief Getter property for NumberOfComponents
+     * @return Value of NumberOfComponents
+     */
+    int getNumberOfComponents() const;
+
     Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, NewArray)
+    /**
+     * @brief Setter property for NewArray
+     */
+    void setNewArray(const DataArrayPath& value);
+    /**
+     * @brief Getter property for NewArray
+     * @return Value of NewArray
+     */
+    DataArrayPath getNewArray() const;
+
     Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
 
-    SIMPL_FILTER_PARAMETER(QString, InitializationValue)
+    /**
+     * @brief Setter property for InitializationValue
+     */
+    void setInitializationValue(const QString& value);
+    /**
+     * @brief Getter property for InitializationValue
+     * @return Value of InitializationValue
+     */
+    QString getInitializationValue() const;
+
     Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -94,23 +145,23 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -169,6 +220,10 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
 
 
   private:
+    int m_NumberOfComponents = {};
+    DataArrayPath m_NewArray = {};
+    QString m_InitializationValue = {};
+
     IDataArray::WeakPointer m_OutputArrayPtr;
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index b498c294a6..df2f6999ca 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -33,11 +33,16 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "CropVertexGeometry.h"
 
 #include <cassert>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
@@ -46,6 +51,8 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataContainerID = 1
@@ -335,7 +342,7 @@ AbstractFilter::Pointer CropVertexGeometry::newFilterInstance(bool copyFilterPar
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getCompiledLibraryName() const
+QString CropVertexGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -343,7 +350,7 @@ const QString CropVertexGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getBrandingString() const
+QString CropVertexGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -351,7 +358,7 @@ const QString CropVertexGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getFilterVersion() const
+QString CropVertexGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -362,7 +369,7 @@ const QString CropVertexGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getGroupName() const
+QString CropVertexGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -370,7 +377,7 @@ const QString CropVertexGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid CropVertexGeometry::getUuid()
+QUuid CropVertexGeometry::getUuid() const
 {
   return QUuid("{f28cbf07-f15a-53ca-8c7f-b41a11dae6cc}");
 }
@@ -378,7 +385,7 @@ const QUuid CropVertexGeometry::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getSubGroupName() const
+QString CropVertexGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::CropCutFilters;
 }
@@ -386,7 +393,132 @@ const QString CropVertexGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString CropVertexGeometry::getHumanLabel() const
+QString CropVertexGeometry::getHumanLabel() const
 {
   return "Crop Geometry (Vertex)";
 }
+
+// -----------------------------------------------------------------------------
+CropVertexGeometry::Pointer CropVertexGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<CropVertexGeometry> CropVertexGeometry::New()
+{
+  struct make_shared_enabler : public CropVertexGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString CropVertexGeometry::getNameOfClass() const
+{
+  return QString("CropVertexGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString CropVertexGeometry::ClassName()
+{
+  return QString("CropVertexGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CropVertexGeometry::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setCroppedDataContainerName(const DataArrayPath& value)
+{
+  m_CroppedDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath CropVertexGeometry::getCroppedDataContainerName() const
+{
+  return m_CroppedDataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setXMin(float value)
+{
+  m_XMin = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getXMin() const
+{
+  return m_XMin;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setYMin(float value)
+{
+  m_YMin = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getYMin() const
+{
+  return m_YMin;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setZMin(float value)
+{
+  m_ZMin = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getZMin() const
+{
+  return m_ZMin;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setXMax(float value)
+{
+  m_XMax = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getXMax() const
+{
+  return m_XMax;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setYMax(float value)
+{
+  m_YMax = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getYMax() const
+{
+  return m_YMax;
+}
+
+// -----------------------------------------------------------------------------
+void CropVertexGeometry::setZMax(float value)
+{
+  m_ZMax = value;
+}
+
+// -----------------------------------------------------------------------------
+float CropVertexGeometry::getZMax() const
+{
+  return m_ZMax;
+}
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index e3b082f62e..8dfe0780f1 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The CropVertexGeometry class. See [Filter documentation](@ref cropvertexgeometry) for details.
@@ -45,7 +46,19 @@
 class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(CropVertexGeometry SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(CropVertexGeometry)
+  PYB11_FILTER_NEW_MACRO(CropVertexGeometry)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  PYB11_FILTER_PARAMETER(DataArrayPath, CroppedDataContainerName)
+  PYB11_FILTER_PARAMETER(float, XMin)
+  PYB11_FILTER_PARAMETER(float, YMin)
+  PYB11_FILTER_PARAMETER(float, ZMin)
+  PYB11_FILTER_PARAMETER(float, XMax)
+  PYB11_FILTER_PARAMETER(float, YMax)
+  PYB11_FILTER_PARAMETER(float, ZMax)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
   PYB11_PROPERTY(float XMin READ getXMin WRITE setXMin)
@@ -54,56 +67,152 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   PYB11_PROPERTY(float XMax READ getXMax WRITE setXMax)
   PYB11_PROPERTY(float YMax READ getYMax WRITE setYMax)
   PYB11_PROPERTY(float ZMax READ getZMax WRITE setZMax)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(CropVertexGeometry)
-  SIMPL_FILTER_NEW_MACRO(CropVertexGeometry)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CropVertexGeometry, AbstractFilter)
+  using Self = CropVertexGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CropVertexGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CropVertexGeometry
+   */
+  static QString ClassName();
 
   ~CropVertexGeometry() override;
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, CroppedDataContainerName)
+  /**
+   * @brief Setter property for CroppedDataContainerName
+   */
+  void setCroppedDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CroppedDataContainerName
+   * @return Value of CroppedDataContainerName
+   */
+  DataArrayPath getCroppedDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(float, XMin)
+  /**
+   * @brief Setter property for XMin
+   */
+  void setXMin(float value);
+  /**
+   * @brief Getter property for XMin
+   * @return Value of XMin
+   */
+  float getXMin() const;
+
   Q_PROPERTY(float XMin READ getXMin WRITE setXMin)
 
-  SIMPL_FILTER_PARAMETER(float, YMin)
+  /**
+   * @brief Setter property for YMin
+   */
+  void setYMin(float value);
+  /**
+   * @brief Getter property for YMin
+   * @return Value of YMin
+   */
+  float getYMin() const;
+
   Q_PROPERTY(float YMin READ getYMin WRITE setYMin)
 
-  SIMPL_FILTER_PARAMETER(float, ZMin)
+  /**
+   * @brief Setter property for ZMin
+   */
+  void setZMin(float value);
+  /**
+   * @brief Getter property for ZMin
+   * @return Value of ZMin
+   */
+  float getZMin() const;
+
   Q_PROPERTY(float ZMin READ getZMin WRITE setZMin)
 
-  SIMPL_FILTER_PARAMETER(float, XMax)
+  /**
+   * @brief Setter property for XMax
+   */
+  void setXMax(float value);
+  /**
+   * @brief Getter property for XMax
+   * @return Value of XMax
+   */
+  float getXMax() const;
+
   Q_PROPERTY(float XMax READ getXMax WRITE setXMax)
 
-  SIMPL_FILTER_PARAMETER(float, YMax)
+  /**
+   * @brief Setter property for YMax
+   */
+  void setYMax(float value);
+  /**
+   * @brief Getter property for YMax
+   * @return Value of YMax
+   */
+  float getYMax() const;
+
   Q_PROPERTY(float YMax READ getYMax WRITE setYMax)
 
-  SIMPL_FILTER_PARAMETER(float, ZMax)
+  /**
+   * @brief Setter property for ZMax
+   */
+  void setZMax(float value);
+  /**
+   * @brief Getter property for ZMax
+   * @return Value of ZMax
+   */
+  float getZMax() const;
+
   Q_PROPERTY(float ZMax READ getZMax WRITE setZMax)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -113,23 +222,23 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -187,6 +296,15 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   void initialize();
 
 private:
+  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_CroppedDataContainerName = {};
+  float m_XMin = {};
+  float m_YMin = {};
+  float m_ZMin = {};
+  float m_XMax = {};
+  float m_YMax = {};
+  float m_ZMax = {};
+
   QList<QString> m_AttrMatList;
 
 public:
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 8515f4af66..37d3f3d3bd 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "DataContainerReader.h"
 
 #include <QtCore/QFileInfo>
@@ -40,7 +42,12 @@
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Utilities.h"
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
@@ -51,6 +58,7 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -247,7 +255,7 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
   clearWarningCode();
 
   SIMPLH5DataReader::Pointer simplReader = SIMPLH5DataReader::New();
-  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) { setErrorCondition(code, msg); });
+  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, int code) { setErrorCondition(code, msg); });
 
   if (!simplReader->openFile(getInputFile()))
   {
@@ -405,7 +413,7 @@ bool DataContainerReader::syncProxies()
   SIMPLH5DataReaderRequirements req(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
 
   SIMPLH5DataReader::Pointer simplReader = SIMPLH5DataReader::New();
-  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, const int& code) { setErrorCondition(code, msg); });
+  connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, int code) { setErrorCondition(code, msg); });
 
   if(!simplReader->openFile(getInputFile()))
   {
@@ -453,7 +461,7 @@ AbstractFilter::Pointer DataContainerReader::newFilterInstance(bool copyFilterPa
   {
     copyFilterParameterInstanceVariables(filter.get());
 
-    SIMPL_COPY_INSTANCEVAR(InputFile)
+    filter->setInputFile(getInputFile());
 
     filter->setInputFile(getInputFile());
 #if 0
@@ -467,7 +475,7 @@ AbstractFilter::Pointer DataContainerReader::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getCompiledLibraryName() const
+QString DataContainerReader::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -475,7 +483,7 @@ const QString DataContainerReader::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getBrandingString() const
+QString DataContainerReader::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -483,7 +491,7 @@ const QString DataContainerReader::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getFilterVersion() const
+QString DataContainerReader::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -494,7 +502,7 @@ const QString DataContainerReader::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getGroupName() const
+QString DataContainerReader::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -502,7 +510,7 @@ const QString DataContainerReader::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid DataContainerReader::getUuid()
+QUuid DataContainerReader::getUuid() const
 {
   return QUuid("{043cbde5-3878-5718-958f-ae75714df0df}");
 }
@@ -510,7 +518,7 @@ const QUuid DataContainerReader::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getSubGroupName() const
+QString DataContainerReader::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
@@ -518,7 +526,7 @@ const QString DataContainerReader::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerReader::getHumanLabel() const
+QString DataContainerReader::getHumanLabel() const
 {
   return "Read DREAM.3D Data File";
 }
@@ -530,3 +538,92 @@ void DataContainerReader::cleanupFilter()
 {
   m_PipelineFromFile->clear();
 }
+
+// -----------------------------------------------------------------------------
+DataContainerReader::Pointer DataContainerReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<DataContainerReader> DataContainerReader::New()
+{
+  struct make_shared_enabler : public DataContainerReader
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReader::getNameOfClass() const
+{
+  return QString("DataContainerReader");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReader::ClassName()
+{
+  return QString("DataContainerReader");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReader::setInputFile(const QString& value)
+{
+  m_InputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReader::getInputFile() const
+{
+  return m_InputFile;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReader::setOverwriteExistingDataContainers(bool value)
+{
+  m_OverwriteExistingDataContainers = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerReader::getOverwriteExistingDataContainers() const
+{
+  return m_OverwriteExistingDataContainers;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReader::setLastFileRead(const QString& value)
+{
+  m_LastFileRead = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReader::getLastFileRead() const
+{
+  return m_LastFileRead;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReader::setLastRead(const QDateTime& value)
+{
+  m_LastRead = value;
+}
+
+// -----------------------------------------------------------------------------
+QDateTime DataContainerReader::getLastRead() const
+{
+  return m_LastRead;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReader::setInputFileDataContainerArrayProxy(const DataContainerArrayProxy& value)
+{
+  m_InputFileDataContainerArrayProxy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxy DataContainerReader::getInputFileDataContainerArrayProxy() const
+{
+  return m_InputFileDataContainerArrayProxy;
+}
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 590265fa08..2e7ff2069c 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -36,14 +36,17 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QDateTime>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
-#include "SIMPLib/SIMPLib.h"
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 class SIMPLH5DataReader;
 
@@ -55,53 +58,122 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     Q_OBJECT
     
     // This line MUST be first when exposing a class and properties to Python
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(DataContainerReader)
+    PYB11_FILTER_NEW_MACRO(DataContainerReader)
+    PYB11_FILTER_PARAMETER(QString, InputFile)
+    PYB11_FILTER_PARAMETER(bool, OverwriteExistingDataContainers)
+    PYB11_FILTER_PARAMETER(QString, LastFileRead)
+    PYB11_FILTER_PARAMETER(QDateTime, LastRead)
+    PYB11_FILTER_PARAMETER(DataContainerArrayProxy, InputFileDataContainerArrayProxy)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
     PYB11_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
     PYB11_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
 
     PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS path)
-  
+#endif
+
   public:
-    SIMPL_SHARED_POINTERS(DataContainerReader)
-    SIMPL_FILTER_NEW_MACRO(DataContainerReader)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerReader, AbstractFilter)
+    using Self = DataContainerReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<DataContainerReader> New();
+
+    /**
+     * @brief Returns the name of the class for DataContainerReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerReader
+     */
+    static QString ClassName();
 
     ~DataContainerReader() override;
 
-    SIMPL_FILTER_PARAMETER(QString, InputFile)
+    /**
+     * @brief Setter property for InputFile
+     */
+    void setInputFile(const QString& value);
+    /**
+     * @brief Getter property for InputFile
+     * @return Value of InputFile
+     */
+    QString getInputFile() const;
+
     Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
 
-    SIMPL_FILTER_PARAMETER(bool, OverwriteExistingDataContainers)
+    /**
+     * @brief Setter property for OverwriteExistingDataContainers
+     */
+    void setOverwriteExistingDataContainers(bool value);
+    /**
+     * @brief Getter property for OverwriteExistingDataContainers
+     * @return Value of OverwriteExistingDataContainers
+     */
+    bool getOverwriteExistingDataContainers() const;
+
     Q_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
 
-    SIMPL_FILTER_PARAMETER(QString, LastFileRead)
+    /**
+     * @brief Setter property for LastFileRead
+     */
+    void setLastFileRead(const QString& value);
+    /**
+     * @brief Getter property for LastFileRead
+     * @return Value of LastFileRead
+     */
+    QString getLastFileRead() const;
+
     Q_PROPERTY(QString LastFileRead READ getLastFileRead WRITE setLastFileRead)
 
-    SIMPL_FILTER_PARAMETER(QDateTime, LastRead)
+    /**
+     * @brief Setter property for LastRead
+     */
+    void setLastRead(const QDateTime& value);
+    /**
+     * @brief Getter property for LastRead
+     * @return Value of LastRead
+     */
+    QDateTime getLastRead() const;
+
     Q_PROPERTY(QDateTime LastRead READ getLastRead WRITE setLastRead)
 
-    SIMPL_FILTER_PARAMETER(DataContainerArrayProxy, InputFileDataContainerArrayProxy)
+    /**
+     * @brief Setter property for InputFileDataContainerArrayProxy
+     */
+    void setInputFileDataContainerArrayProxy(const DataContainerArrayProxy& value);
+    /**
+     * @brief Getter property for InputFileDataContainerArrayProxy
+     * @return Value of InputFileDataContainerArrayProxy
+     */
+    DataContainerArrayProxy getInputFileDataContainerArrayProxy() const;
+
     Q_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -111,23 +183,23 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -237,7 +309,7 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
      * @param proxy
      * @return
      */
-    DataContainerArray::Pointer readData(DataContainerArrayProxy& proxy);
+    DataContainerArrayShPtrType readData(DataContainerArrayProxy& proxy);
 
   protected slots:
     /**
@@ -246,6 +318,12 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     void cleanupFilter() override;
 
   private:
+    QString m_InputFile = {};
+    bool m_OverwriteExistingDataContainers = {};
+    QString m_LastFileRead = {};
+    QDateTime m_LastRead = {};
+    DataContainerArrayProxy m_InputFileDataContainerArrayProxy = {};
+
     FilterPipeline::Pointer                     m_PipelineFromFile;
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index a75acea154..4172e78225 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "DataContainerWriter.h"
 
 #include <QtCore/QDir>
@@ -41,14 +43,20 @@
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
-
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef _WIN32
 extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
@@ -442,7 +450,7 @@ AbstractFilter::Pointer DataContainerWriter::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getCompiledLibraryName() const
+QString DataContainerWriter::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -450,7 +458,7 @@ const QString DataContainerWriter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getBrandingString() const
+QString DataContainerWriter::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -458,7 +466,7 @@ const QString DataContainerWriter::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getFilterVersion() const
+QString DataContainerWriter::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -469,7 +477,7 @@ const QString DataContainerWriter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getGroupName() const
+QString DataContainerWriter::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -477,7 +485,7 @@ const QString DataContainerWriter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid DataContainerWriter::getUuid()
+QUuid DataContainerWriter::getUuid() const
 {
   return QUuid("{3fcd4c43-9d75-5b86-aad4-4441bc914f37}");
 }
@@ -485,7 +493,7 @@ const QUuid DataContainerWriter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getSubGroupName() const
+QString DataContainerWriter::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::OutputFilters;
 }
@@ -493,7 +501,96 @@ const QString DataContainerWriter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DataContainerWriter::getHumanLabel() const
+QString DataContainerWriter::getHumanLabel() const
 {
   return "Write DREAM.3D Data File";
 }
+
+// -----------------------------------------------------------------------------
+DataContainerWriter::Pointer DataContainerWriter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<DataContainerWriter> DataContainerWriter::New()
+{
+  struct make_shared_enabler : public DataContainerWriter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerWriter::getNameOfClass() const
+{
+  return QString("DataContainerWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerWriter::ClassName()
+{
+  return QString("DataContainerWriter");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerWriter::setOutputFile(const QString& value)
+{
+  m_OutputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerWriter::getOutputFile() const
+{
+  return m_OutputFile;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerWriter::setWritePipeline(bool value)
+{
+  m_WritePipeline = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerWriter::getWritePipeline() const
+{
+  return m_WritePipeline;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerWriter::setWriteXdmfFile(bool value)
+{
+  m_WriteXdmfFile = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerWriter::getWriteXdmfFile() const
+{
+  return m_WriteXdmfFile;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerWriter::setWriteTimeSeries(bool value)
+{
+  m_WriteTimeSeries = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerWriter::getWriteTimeSeries() const
+{
+  return m_WriteTimeSeries;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerWriter::setAppendToExisting(bool value)
+{
+  m_AppendToExisting = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerWriter::getAppendToExisting() const
+{
+  return m_AppendToExisting;
+}
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index b6fd0a4548..284b02b32f 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -36,9 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
+#include <hdf5.h>
+
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The DataContainerWriter class. See [Filter documentation](@ref datacontainerwriter) for details.
@@ -48,49 +53,114 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
     Q_OBJECT
     
     // This line MUST be first when exposing a class and properties to Python
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(DataContainerWriter)
+    PYB11_FILTER_NEW_MACRO(DataContainerWriter)
+    PYB11_FILTER_PARAMETER(QString, OutputFile)
+    PYB11_FILTER_PARAMETER(bool, WriteXdmfFile)
+    PYB11_FILTER_PARAMETER(bool, WriteTimeSeries)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
     PYB11_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
     PYB11_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(DataContainerWriter)
-    SIMPL_FILTER_NEW_MACRO(DataContainerWriter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerWriter, AbstractFilter)
+    using Self = DataContainerWriter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<DataContainerWriter> New();
+
+    /**
+     * @brief Returns the name of the class for DataContainerWriter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerWriter
+     */
+    static QString ClassName();
 
     ~DataContainerWriter() override;
 
-    SIMPL_FILTER_PARAMETER(QString, OutputFile)
+    /**
+     * @brief Setter property for OutputFile
+     */
+    void setOutputFile(const QString& value);
+    /**
+     * @brief Getter property for OutputFile
+     * @return Value of OutputFile
+     */
+    QString getOutputFile() const;
+
     Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
 
-    SIMPL_INSTANCE_PROPERTY(bool, WritePipeline)
+    /**
+     * @brief Setter property for WritePipeline
+     */
+    void setWritePipeline(bool value);
+    /**
+     * @brief Getter property for WritePipeline
+     * @return Value of WritePipeline
+     */
+    bool getWritePipeline() const;
+
+    /**
+     * @brief Setter property for WriteXdmfFile
+     */
+    void setWriteXdmfFile(bool value);
+    /**
+     * @brief Getter property for WriteXdmfFile
+     * @return Value of WriteXdmfFile
+     */
+    bool getWriteXdmfFile() const;
 
-    SIMPL_FILTER_PARAMETER(bool, WriteXdmfFile)
     Q_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
 
-    SIMPL_FILTER_PARAMETER(bool, WriteTimeSeries)
+    /**
+     * @brief Setter property for WriteTimeSeries
+     */
+    void setWriteTimeSeries(bool value);
+    /**
+     * @brief Getter property for WriteTimeSeries
+     * @return Value of WriteTimeSeries
+     */
+    bool getWriteTimeSeries() const;
+
     Q_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
 
-    SIMPL_INSTANCE_PROPERTY(bool, AppendToExisting)
+    /**
+     * @brief Setter property for AppendToExisting
+     */
+    void setAppendToExisting(bool value);
+    /**
+     * @brief Getter property for AppendToExisting
+     * @return Value of AppendToExisting
+     */
+    bool getAppendToExisting() const;
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -100,23 +170,23 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -213,6 +283,12 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
     void writeXdmfFooter(QTextStream& out);
 
   private:
+    QString m_OutputFile = {};
+    bool m_WritePipeline = {};
+    bool m_WriteXdmfFile = {};
+    bool m_WriteTimeSeries = {};
+    bool m_AppendToExisting = {};
+
     hid_t m_FileId;
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 2cb41e3805..44bfd3a9f8 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "EmptyFilter.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -137,7 +142,7 @@ AbstractFilter::Pointer EmptyFilter::newFilterInstance(bool copyFilterParameters
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getCompiledLibraryName() const
+QString EmptyFilter::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -145,7 +150,7 @@ const QString EmptyFilter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getBrandingString() const
+QString EmptyFilter::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -153,7 +158,7 @@ const QString EmptyFilter::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getFilterVersion() const
+QString EmptyFilter::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -164,7 +169,7 @@ const QString EmptyFilter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getGroupName() const
+QString EmptyFilter::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -172,7 +177,7 @@ const QString EmptyFilter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid EmptyFilter::getUuid()
+QUuid EmptyFilter::getUuid() const
 {
   return QUuid("{0af0e81f-1f98-5734-a38a-74cfccd6e6f8}");
 }
@@ -180,7 +185,7 @@ const QUuid EmptyFilter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getSubGroupName() const
+QString EmptyFilter::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -188,7 +193,7 @@ const QString EmptyFilter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString EmptyFilter::getHumanLabel() const
+QString EmptyFilter::getHumanLabel() const
 {
   if(m_HumanLabel.isEmpty())
   {
@@ -205,3 +210,44 @@ void EmptyFilter::setHumanLabel(const QString& humanLabel)
 {
   m_HumanLabel = humanLabel;
 }
+
+// -----------------------------------------------------------------------------
+EmptyFilter::Pointer EmptyFilter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<EmptyFilter> EmptyFilter::New()
+{
+  struct make_shared_enabler : public EmptyFilter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString EmptyFilter::getNameOfClass() const
+{
+  return QString("EmptyFilter");
+}
+
+// -----------------------------------------------------------------------------
+QString EmptyFilter::ClassName()
+{
+  return QString("EmptyFilter");
+}
+
+// -----------------------------------------------------------------------------
+void EmptyFilter::setOriginalFilterName(const QString& value)
+{
+  m_OriginalFilterName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString EmptyFilter::getOriginalFilterName() const
+{
+  return m_OriginalFilterName;
+}
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 9091308cdd..42f9e9eabb 100755
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The EmptyFilter class serves as an empty, non-functional filter
@@ -46,35 +47,62 @@
 class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(EmptyFilter)
+    PYB11_FILTER_NEW_MACRO(EmptyFilter)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(EmptyFilter)
-    SIMPL_FILTER_NEW_MACRO(EmptyFilter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(EmptyFilter, AbstractFilter)
+    using Self = EmptyFilter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<EmptyFilter> New();
+
+    /**
+     * @brief Returns the name of the class for EmptyFilter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for EmptyFilter
+     */
+    static QString ClassName();
 
     ~EmptyFilter() override;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(OriginalFilterName)
+    /**
+     * @brief Setter property for OriginalFilterName
+     */
+    void setOriginalFilterName(const QString& value);
+    /**
+     * @brief Getter property for OriginalFilterName
+     * @return Value of OriginalFilterName
+     */
+    QString getOriginalFilterName() const;
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -84,23 +112,23 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -166,6 +194,8 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 
 
   private:
+    QString m_OriginalFilterName = {};
+
     QString m_HumanLabel;
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index b673e71caf..d569faf874 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -33,13 +33,18 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ExecuteProcess.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
@@ -330,7 +335,7 @@ AbstractFilter::Pointer ExecuteProcess::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getCompiledLibraryName() const
+QString ExecuteProcess::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -338,7 +343,7 @@ const QString ExecuteProcess::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getBrandingString() const
+QString ExecuteProcess::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -346,7 +351,7 @@ const QString ExecuteProcess::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getFilterVersion() const
+QString ExecuteProcess::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -357,7 +362,7 @@ const QString ExecuteProcess::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getGroupName() const
+QString ExecuteProcess::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -365,7 +370,7 @@ const QString ExecuteProcess::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ExecuteProcess::getUuid()
+QUuid ExecuteProcess::getUuid() const
 {
   return QUuid("{8a2308ec-86cd-5636-9a0a-6c7d383e9e7f}");
 }
@@ -373,7 +378,7 @@ const QUuid ExecuteProcess::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getSubGroupName() const
+QString ExecuteProcess::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -381,7 +386,48 @@ const QString ExecuteProcess::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExecuteProcess::getHumanLabel() const
+QString ExecuteProcess::getHumanLabel() const
 {
   return "Execute Process";
 }
+
+// -----------------------------------------------------------------------------
+ExecuteProcess::Pointer ExecuteProcess::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ExecuteProcess> ExecuteProcess::New()
+{
+  struct make_shared_enabler : public ExecuteProcess
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ExecuteProcess::getNameOfClass() const
+{
+  return QString("ExecuteProcess");
+}
+
+// -----------------------------------------------------------------------------
+QString ExecuteProcess::ClassName()
+{
+  return QString("ExecuteProcess");
+}
+
+// -----------------------------------------------------------------------------
+void ExecuteProcess::setArguments(const QString& value)
+{
+  m_Arguments = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ExecuteProcess::getArguments() const
+{
+  return m_Arguments;
+}
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 6b33e8dde2..10d810b756 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -35,14 +35,15 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QProcess>
 #include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
 #include <QtCore/QSharedPointer>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class QProcess;
 
@@ -52,143 +53,182 @@ class QProcess;
 class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
 {
   Q_OBJECT
-    PYB11_CREATE_BINDINGS(ExecuteProcess SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
-
-  public:
-    SIMPL_SHARED_POINTERS(ExecuteProcess)
-    SIMPL_FILTER_NEW_MACRO(ExecuteProcess)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ExecuteProcess, AbstractFilter)
-
-    SIMPL_FILTER_PARAMETER(QString, Arguments)
-    Q_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
-
-    ~ExecuteProcess() override;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    const QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer 
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
-  protected:
-    ExecuteProcess();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck();
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  protected slots:
-    void processHasFinished(int exitCode, QProcess::ExitStatus exitStatus);
-    void processHasErroredOut(QProcess::ProcessError error);
-    void sendErrorOutput();
-    void sendStandardOutput();
-
-  private:
-    QWaitCondition                                      m_WaitCondition;
-    QMutex                                              m_Mutex;
-    bool m_Pause = false;
-    QSharedPointer<QProcess>                            m_ProcessPtr;
-
-    /**
-     * @brief splitArgumentsString
-     * @param arguments
-     * @return
-     */
-    QStringList splitArgumentsString(QString arguments);
-
-  public:
-    ExecuteProcess(const ExecuteProcess&) = delete; // Copy Constructor Not Implemented
-    ExecuteProcess(ExecuteProcess&&) = delete;      // Move Constructor Not Implemented
-    ExecuteProcess& operator=(const ExecuteProcess&) = delete; // Copy Assignment Not Implemented
-    ExecuteProcess& operator=(ExecuteProcess&&) = delete;      // Move Assignment Not Implemented
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(ExecuteProcess SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ExecuteProcess)
+  PYB11_FILTER_NEW_MACRO(ExecuteProcess)
+  PYB11_FILTER_PARAMETER(QString, Arguments)
+  PYB11_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
+#endif
+
+public:
+  using Self = ExecuteProcess;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ExecuteProcess
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ExecuteProcess
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for Arguments
+   */
+  void setArguments(const QString& value);
+  /**
+   * @brief Getter property for Arguments
+   * @return Value of Arguments
+   */
+  QString getArguments() const;
+
+  Q_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
+
+  ~ExecuteProcess() override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  ExecuteProcess();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+protected slots:
+  void processHasFinished(int exitCode, QProcess::ExitStatus exitStatus);
+  void processHasErroredOut(QProcess::ProcessError error);
+  void sendErrorOutput();
+  void sendStandardOutput();
+
+private:
+  QString m_Arguments = {};
+
+  QWaitCondition m_WaitCondition;
+  QMutex m_Mutex;
+  bool m_Pause = false;
+  QSharedPointer<QProcess> m_ProcessPtr;
+
+  /**
+   * @brief splitArgumentsString
+   * @param arguments
+   * @return
+   */
+  QStringList splitArgumentsString(QString arguments);
+
+public:
+  ExecuteProcess(const ExecuteProcess&) = delete;            // Copy Constructor Not Implemented
+  ExecuteProcess(ExecuteProcess&&) = delete;                 // Move Constructor Not Implemented
+  ExecuteProcess& operator=(const ExecuteProcess&) = delete; // Copy Assignment Not Implemented
+  ExecuteProcess& operator=(ExecuteProcess&&) = delete;      // Move Assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index b153e7bf28..d201d6dd8b 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -33,12 +33,17 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ExtractAttributeArraysFromGeometry.h"
 
 #include <cassert>
 #include <cstring>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h"
@@ -51,6 +56,7 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   RectGrid_XBoundsID = 1,
@@ -668,7 +674,7 @@ AbstractFilter::Pointer ExtractAttributeArraysFromGeometry::newFilterInstance(bo
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getCompiledLibraryName() const
+QString ExtractAttributeArraysFromGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -676,7 +682,7 @@ const QString ExtractAttributeArraysFromGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getBrandingString() const
+QString ExtractAttributeArraysFromGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -684,7 +690,7 @@ const QString ExtractAttributeArraysFromGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getFilterVersion() const
+QString ExtractAttributeArraysFromGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -695,7 +701,7 @@ const QString ExtractAttributeArraysFromGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getGroupName() const
+QString ExtractAttributeArraysFromGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -703,7 +709,7 @@ const QString ExtractAttributeArraysFromGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ExtractAttributeArraysFromGeometry::getUuid()
+QUuid ExtractAttributeArraysFromGeometry::getUuid() const
 {
   return QUuid("{2060a933-b6f5-50fd-9382-a008a5cef17f}");
 }
@@ -711,7 +717,7 @@ const QUuid ExtractAttributeArraysFromGeometry::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getSubGroupName() const
+QString ExtractAttributeArraysFromGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GeometryFilters;
 }
@@ -719,7 +725,216 @@ const QString ExtractAttributeArraysFromGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractAttributeArraysFromGeometry::getHumanLabel() const
+QString ExtractAttributeArraysFromGeometry::getHumanLabel() const
 {
   return "Extract Attribute Arrays from Geometry";
 }
+
+// -----------------------------------------------------------------------------
+ExtractAttributeArraysFromGeometry::Pointer ExtractAttributeArraysFromGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ExtractAttributeArraysFromGeometry> ExtractAttributeArraysFromGeometry::New()
+{
+  struct make_shared_enabler : public ExtractAttributeArraysFromGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractAttributeArraysFromGeometry::getNameOfClass() const
+{
+  return QString("ExtractAttributeArraysFromGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractAttributeArraysFromGeometry::ClassName()
+{
+  return QString("ExtractAttributeArraysFromGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath0(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath0 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath0() const
+{
+  return m_SharedVertexListArrayPath0;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath1(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath1 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath1() const
+{
+  return m_SharedVertexListArrayPath1;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath2(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath2 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath2() const
+{
+  return m_SharedVertexListArrayPath2;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath3(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath3 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath3() const
+{
+  return m_SharedVertexListArrayPath3;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath4(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath4 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath4() const
+{
+  return m_SharedVertexListArrayPath4;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedVertexListArrayPath5(const DataArrayPath& value)
+{
+  m_SharedVertexListArrayPath5 = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedVertexListArrayPath5() const
+{
+  return m_SharedVertexListArrayPath5;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedEdgeListArrayPath(const DataArrayPath& value)
+{
+  m_SharedEdgeListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedEdgeListArrayPath() const
+{
+  return m_SharedEdgeListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedTriListArrayPath(const DataArrayPath& value)
+{
+  m_SharedTriListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedTriListArrayPath() const
+{
+  return m_SharedTriListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedQuadListArrayPath(const DataArrayPath& value)
+{
+  m_SharedQuadListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedQuadListArrayPath() const
+{
+  return m_SharedQuadListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedTetListArrayPath(const DataArrayPath& value)
+{
+  m_SharedTetListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedTetListArrayPath() const
+{
+  return m_SharedTetListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setSharedHexListArrayPath(const DataArrayPath& value)
+{
+  m_SharedHexListArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getSharedHexListArrayPath() const
+{
+  return m_SharedHexListArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setXBoundsArrayPath(const DataArrayPath& value)
+{
+  m_XBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getXBoundsArrayPath() const
+{
+  return m_XBoundsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setYBoundsArrayPath(const DataArrayPath& value)
+{
+  m_YBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getYBoundsArrayPath() const
+{
+  return m_YBoundsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractAttributeArraysFromGeometry::setZBoundsArrayPath(const DataArrayPath& value)
+{
+  m_ZBoundsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractAttributeArraysFromGeometry::getZBoundsArrayPath() const
+{
+  return m_ZBoundsArrayPath;
+}
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 6535c31fc1..bc6c4ef5d6 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -35,9 +35,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Geometry/IGeometry.h"
+
+using MeshIndexType = size_t;
 
 /**
  * @brief The ExtractAttributeArraysFromGeometry class. See [Filter documentation](@ref ExtractAttributeArraysFromGeometry) for details.
@@ -45,7 +50,26 @@
 class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ExtractAttributeArraysFromGeometry SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ExtractAttributeArraysFromGeometry)
+  PYB11_FILTER_NEW_MACRO(ExtractAttributeArraysFromGeometry)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
@@ -59,77 +83,236 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   PYB11_PROPERTY(DataArrayPath XBoundsArrayPath READ getXBoundsArrayPath WRITE setXBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath YBoundsArrayPath READ getYBoundsArrayPath WRITE setYBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ExtractAttributeArraysFromGeometry)
-  SIMPL_FILTER_NEW_MACRO(ExtractAttributeArraysFromGeometry)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ExtractAttributeArraysFromGeometry, AbstractFilter)
+  using Self = ExtractAttributeArraysFromGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ExtractAttributeArraysFromGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ExtractAttributeArraysFromGeometry
+   */
+  static QString ClassName();
 
   ~ExtractAttributeArraysFromGeometry() override;
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath0
+   */
+  void setSharedVertexListArrayPath0(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath0
+   * @return Value of SharedVertexListArrayPath0
+   */
+  DataArrayPath getSharedVertexListArrayPath0() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath1
+   */
+  void setSharedVertexListArrayPath1(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath1
+   * @return Value of SharedVertexListArrayPath1
+   */
+  DataArrayPath getSharedVertexListArrayPath1() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath2
+   */
+  void setSharedVertexListArrayPath2(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath2
+   * @return Value of SharedVertexListArrayPath2
+   */
+  DataArrayPath getSharedVertexListArrayPath2() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath2 READ getSharedVertexListArrayPath2 WRITE setSharedVertexListArrayPath2)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath3
+   */
+  void setSharedVertexListArrayPath3(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath3
+   * @return Value of SharedVertexListArrayPath3
+   */
+  DataArrayPath getSharedVertexListArrayPath3() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath3 READ getSharedVertexListArrayPath3 WRITE setSharedVertexListArrayPath3)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath4
+   */
+  void setSharedVertexListArrayPath4(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath4
+   * @return Value of SharedVertexListArrayPath4
+   */
+  DataArrayPath getSharedVertexListArrayPath4() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath4 READ getSharedVertexListArrayPath4 WRITE setSharedVertexListArrayPath4)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
+  /**
+   * @brief Setter property for SharedVertexListArrayPath5
+   */
+  void setSharedVertexListArrayPath5(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedVertexListArrayPath5
+   * @return Value of SharedVertexListArrayPath5
+   */
+  DataArrayPath getSharedVertexListArrayPath5() const;
+
   Q_PROPERTY(DataArrayPath SharedVertexListArrayPath5 READ getSharedVertexListArrayPath5 WRITE setSharedVertexListArrayPath5)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
+  /**
+   * @brief Setter property for SharedEdgeListArrayPath
+   */
+  void setSharedEdgeListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedEdgeListArrayPath
+   * @return Value of SharedEdgeListArrayPath
+   */
+  DataArrayPath getSharedEdgeListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedEdgeListArrayPath READ getSharedEdgeListArrayPath WRITE setSharedEdgeListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
+  /**
+   * @brief Setter property for SharedTriListArrayPath
+   */
+  void setSharedTriListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedTriListArrayPath
+   * @return Value of SharedTriListArrayPath
+   */
+  DataArrayPath getSharedTriListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedTriListArrayPath READ getSharedTriListArrayPath WRITE setSharedTriListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
+  /**
+   * @brief Setter property for SharedQuadListArrayPath
+   */
+  void setSharedQuadListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedQuadListArrayPath
+   * @return Value of SharedQuadListArrayPath
+   */
+  DataArrayPath getSharedQuadListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedQuadListArrayPath READ getSharedQuadListArrayPath WRITE setSharedQuadListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
+  /**
+   * @brief Setter property for SharedTetListArrayPath
+   */
+  void setSharedTetListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedTetListArrayPath
+   * @return Value of SharedTetListArrayPath
+   */
+  DataArrayPath getSharedTetListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedTetListArrayPath READ getSharedTetListArrayPath WRITE setSharedTetListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
+  /**
+   * @brief Setter property for SharedHexListArrayPath
+   */
+  void setSharedHexListArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SharedHexListArrayPath
+   * @return Value of SharedHexListArrayPath
+   */
+  DataArrayPath getSharedHexListArrayPath() const;
+
   Q_PROPERTY(DataArrayPath SharedHexListArrayPath READ getSharedHexListArrayPath WRITE setSharedHexListArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
+  /**
+   * @brief Setter property for XBoundsArrayPath
+   */
+  void setXBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for XBoundsArrayPath
+   * @return Value of XBoundsArrayPath
+   */
+  DataArrayPath getXBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath XBoundsArrayPath READ getXBoundsArrayPath WRITE setXBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
+  /**
+   * @brief Setter property for YBoundsArrayPath
+   */
+  void setYBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for YBoundsArrayPath
+   * @return Value of YBoundsArrayPath
+   */
+  DataArrayPath getYBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath YBoundsArrayPath READ getYBoundsArrayPath WRITE setYBoundsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
+  /**
+   * @brief Setter property for ZBoundsArrayPath
+   */
+  void setZBoundsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for ZBoundsArrayPath
+   * @return Value of ZBoundsArrayPath
+   */
+  DataArrayPath getZBoundsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -139,23 +322,23 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -214,14 +397,38 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   void initialize();
 
 private:
-  DEFINE_DATAARRAY_VARIABLE(float, XBounds)
-  DEFINE_DATAARRAY_VARIABLE(float, YBounds)
-  DEFINE_DATAARRAY_VARIABLE(float, ZBounds)
-  DEFINE_DATAARRAY_VARIABLE(float, Verts)
-  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Edges)
-  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Tris)
-  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Quads)
-  DEFINE_DATAARRAY_VARIABLE(MeshIndexType, Tets)
+  std::weak_ptr<DataArray<float>> m_XBoundsPtr;
+  float* m_XBounds = nullptr;
+  std::weak_ptr<DataArray<float>> m_YBoundsPtr;
+  float* m_YBounds = nullptr;
+  std::weak_ptr<DataArray<float>> m_ZBoundsPtr;
+  float* m_ZBounds = nullptr;
+  std::weak_ptr<DataArray<float>> m_VertsPtr;
+  float* m_Verts = nullptr;
+  std::weak_ptr<DataArray<MeshIndexType>> m_EdgesPtr;
+  MeshIndexType* m_Edges = nullptr;
+  std::weak_ptr<DataArray<MeshIndexType>> m_TrisPtr;
+  MeshIndexType* m_Tris = nullptr;
+  std::weak_ptr<DataArray<MeshIndexType>> m_QuadsPtr;
+  MeshIndexType* m_Quads = nullptr;
+  std::weak_ptr<DataArray<MeshIndexType>> m_TetsPtr;
+  MeshIndexType* m_Tets = nullptr;
+
+  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_SharedVertexListArrayPath0 = {};
+  DataArrayPath m_SharedVertexListArrayPath1 = {};
+  DataArrayPath m_SharedVertexListArrayPath2 = {};
+  DataArrayPath m_SharedVertexListArrayPath3 = {};
+  DataArrayPath m_SharedVertexListArrayPath4 = {};
+  DataArrayPath m_SharedVertexListArrayPath5 = {};
+  DataArrayPath m_SharedEdgeListArrayPath = {};
+  DataArrayPath m_SharedTriListArrayPath = {};
+  DataArrayPath m_SharedQuadListArrayPath = {};
+  DataArrayPath m_SharedTetListArrayPath = {};
+  DataArrayPath m_SharedHexListArrayPath = {};
+  DataArrayPath m_XBoundsArrayPath = {};
+  DataArrayPath m_YBoundsArrayPath = {};
+  DataArrayPath m_ZBoundsArrayPath = {};
 
 public:
   ExtractAttributeArraysFromGeometry(const ExtractAttributeArraysFromGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 7eb2654f6b..d837e5550f 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ExtractComponentAsArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -44,6 +49,7 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataArrayID = 1
@@ -225,7 +231,7 @@ AbstractFilter::Pointer ExtractComponentAsArray::newFilterInstance(bool copyFilt
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getCompiledLibraryName() const
+QString ExtractComponentAsArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -233,7 +239,7 @@ const QString ExtractComponentAsArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getBrandingString() const
+QString ExtractComponentAsArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -241,7 +247,7 @@ const QString ExtractComponentAsArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getFilterVersion() const
+QString ExtractComponentAsArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -252,7 +258,7 @@ const QString ExtractComponentAsArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getGroupName() const
+QString ExtractComponentAsArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -260,7 +266,7 @@ const QString ExtractComponentAsArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ExtractComponentAsArray::getUuid()
+QUuid ExtractComponentAsArray::getUuid() const
 {
   return QUuid("{79d59b85-01e8-5c4a-a6e1-3fd3e2ceffb4}");
 }
@@ -268,7 +274,7 @@ const QUuid ExtractComponentAsArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getSubGroupName() const
+QString ExtractComponentAsArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -276,7 +282,72 @@ const QString ExtractComponentAsArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractComponentAsArray::getHumanLabel() const
+QString ExtractComponentAsArray::getHumanLabel() const
 {
   return "Extract Component as Attribute Array";
 }
+
+// -----------------------------------------------------------------------------
+ExtractComponentAsArray::Pointer ExtractComponentAsArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ExtractComponentAsArray> ExtractComponentAsArray::New()
+{
+  struct make_shared_enabler : public ExtractComponentAsArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractComponentAsArray::getNameOfClass() const
+{
+  return QString("ExtractComponentAsArray");
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractComponentAsArray::ClassName()
+{
+  return QString("ExtractComponentAsArray");
+}
+
+// -----------------------------------------------------------------------------
+void ExtractComponentAsArray::setSelectedArrayPath(const DataArrayPath& value)
+{
+  m_SelectedArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractComponentAsArray::getSelectedArrayPath() const
+{
+  return m_SelectedArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractComponentAsArray::setCompNumber(int value)
+{
+  m_CompNumber = value;
+}
+
+// -----------------------------------------------------------------------------
+int ExtractComponentAsArray::getCompNumber() const
+{
+  return m_CompNumber;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractComponentAsArray::setNewArrayArrayName(const QString& value)
+{
+  m_NewArrayArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractComponentAsArray::getNewArrayArrayName() const
+{
+  return m_NewArrayArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index 0f52d499ad..ec943e5cd1 100755
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -36,9 +36,15 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
+
+class IDataArray;
 
 /**
  * @brief The ExtractComponentAsArray class. See [Filter documentation](@ref extractcomponentasarray) for details.
@@ -46,45 +52,94 @@
 class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ExtractComponentAsArray)
+    PYB11_FILTER_NEW_MACRO(ExtractComponentAsArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    PYB11_FILTER_PARAMETER(int, CompNumber)
+    PYB11_FILTER_PARAMETER(QString, NewArrayArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
     PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(ExtractComponentAsArray)
-    SIMPL_FILTER_NEW_MACRO(ExtractComponentAsArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ExtractComponentAsArray, AbstractFilter)
+    using Self = ExtractComponentAsArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ExtractComponentAsArray> New();
+
+    /**
+     * @brief Returns the name of the class for ExtractComponentAsArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ExtractComponentAsArray
+     */
+    static QString ClassName();
 
     ~ExtractComponentAsArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    /**
+     * @brief Setter property for SelectedArrayPath
+     */
+    void setSelectedArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedArrayPath
+     * @return Value of SelectedArrayPath
+     */
+    DataArrayPath getSelectedArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
 
-    SIMPL_FILTER_PARAMETER(int, CompNumber)
+    /**
+     * @brief Setter property for CompNumber
+     */
+    void setCompNumber(int value);
+    /**
+     * @brief Getter property for CompNumber
+     * @return Value of CompNumber
+     */
+    int getCompNumber() const;
+
     Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
 
-    SIMPL_FILTER_PARAMETER(QString, NewArrayArrayName)
+    /**
+     * @brief Setter property for NewArrayArrayName
+     */
+    void setNewArrayArrayName(const QString& value);
+    /**
+     * @brief Getter property for NewArrayArrayName
+     * @return Value of NewArrayArrayName
+     */
+    QString getNewArrayArrayName() const;
+
     Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -94,23 +149,23 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -169,8 +224,12 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
 
 
   private:
-    DEFINE_IDATAARRAY_WEAKPTR(InArray)
-    DEFINE_IDATAARRAY_WEAKPTR(NewArray)
+    IDataArrayWkPtrType m_InArrayPtr;
+    IDataArrayWkPtrType m_NewArrayPtr;
+
+    DataArrayPath m_SelectedArrayPath = {};
+    int m_CompNumber = {};
+    QString m_NewArrayArrayName = {};
 
   public:
     ExtractComponentAsArray(const ExtractComponentAsArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 26089f1816..8def235b75 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -33,17 +33,24 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ExtractVertexGeometry.h"
 
 #include <numeric>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataContainerID = 1,
@@ -309,7 +316,7 @@ AbstractFilter::Pointer ExtractVertexGeometry::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getCompiledLibraryName() const
+QString ExtractVertexGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -317,7 +324,7 @@ const QString ExtractVertexGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getBrandingString() const
+QString ExtractVertexGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -325,7 +332,7 @@ const QString ExtractVertexGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getFilterVersion() const
+QString ExtractVertexGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -336,7 +343,7 @@ const QString ExtractVertexGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getGroupName() const
+QString ExtractVertexGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -344,7 +351,7 @@ const QString ExtractVertexGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getSubGroupName() const
+QString ExtractVertexGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ConversionFilters;
 }
@@ -352,7 +359,7 @@ const QString ExtractVertexGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ExtractVertexGeometry::getHumanLabel() const
+QString ExtractVertexGeometry::getHumanLabel() const
 {
   return "Extract Vertex Geometry";
 }
@@ -360,7 +367,84 @@ const QString ExtractVertexGeometry::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ExtractVertexGeometry::getUuid()
+QUuid ExtractVertexGeometry::getUuid() const
 {
   return QUuid("{bc8a91ca-0cee-59c6-b5cb-acc1aab8617f}");
 }
+
+// -----------------------------------------------------------------------------
+ExtractVertexGeometry::Pointer ExtractVertexGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ExtractVertexGeometry> ExtractVertexGeometry::New()
+{
+  struct make_shared_enabler : public ExtractVertexGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractVertexGeometry::getNameOfClass() const
+{
+  return QString("_SUPERExtractVertexGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString ExtractVertexGeometry::ClassName()
+{
+  return QString("_SUPERExtractVertexGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void ExtractVertexGeometry::setArrayHandling(int value)
+{
+  m_ArrayHandling = value;
+}
+
+// -----------------------------------------------------------------------------
+int ExtractVertexGeometry::getArrayHandling() const
+{
+  return m_ArrayHandling;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractVertexGeometry::setSelectedDataContainerName(const DataArrayPath& value)
+{
+  m_SelectedDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractVertexGeometry::getSelectedDataContainerName() const
+{
+  return m_SelectedDataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractVertexGeometry::setIncludedDataArrayPaths(const QVector<DataArrayPath>& value)
+{
+  m_IncludedDataArrayPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> ExtractVertexGeometry::getIncludedDataArrayPaths() const
+{
+  return m_IncludedDataArrayPaths;
+}
+
+// -----------------------------------------------------------------------------
+void ExtractVertexGeometry::setVertexDataContainerName(const DataArrayPath& value)
+{
+  m_VertexDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ExtractVertexGeometry::getVertexDataContainerName() const
+{
+  return m_VertexDataContainerName;
+}
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index eb08a111b6..9fc223e4d9 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -35,12 +35,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/RectGridGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The ExtractVertexGeometry class. See [Filter documentation](@ref convertdatacontainergeometry) for details.
@@ -49,27 +50,94 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
 {
   Q_OBJECT
 
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ExtractVertexGeometry SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ExtractVertexGeometry)
+  PYB11_FILTER_NEW_MACRO(ExtractVertexGeometry)
+  PYB11_FILTER_PARAMETER(int, ArrayHandling)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, IncludedDataArrayPaths)
+  PYB11_FILTER_PARAMETER(DataArrayPath, VertexDataContainerName)
   PYB11_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
   PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
   PYB11_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
   PYB11_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ExtractVertexGeometry)
-  SIMPL_FILTER_NEW_MACRO(ExtractVertexGeometry)
-  SIMPL_TYPE_MACRO_SUPER(ExtractVertexGeometry, AbstractFilter)
+  using Self = ExtractVertexGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ExtractVertexGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ExtractVertexGeometry
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for ArrayHandling
+   */
+  void setArrayHandling(int value);
+  /**
+   * @brief Getter property for ArrayHandling
+   * @return Value of ArrayHandling
+   */
+  int getArrayHandling() const;
 
-  SIMPL_FILTER_PARAMETER(int, ArrayHandling)
   Q_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+  /**
+   * @brief Setter property for SelectedDataContainerName
+   */
+  void setSelectedDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedDataContainerName
+   * @return Value of SelectedDataContainerName
+   */
+  DataArrayPath getSelectedDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, IncludedDataArrayPaths)
+  /**
+   * @brief Setter property for IncludedDataArrayPaths
+   */
+  void setIncludedDataArrayPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for IncludedDataArrayPaths
+   * @return Value of IncludedDataArrayPaths
+   */
+  QVector<DataArrayPath> getIncludedDataArrayPaths() const;
+
   Q_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, VertexDataContainerName)
+  /**
+   * @brief Setter property for VertexDataContainerName
+   */
+  void setVertexDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for VertexDataContainerName
+   * @return Value of VertexDataContainerName
+   */
+  DataArrayPath getVertexDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
 
   ~ExtractVertexGeometry() override;
@@ -83,21 +151,21 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -107,23 +175,23 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -177,6 +245,11 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   void initialize();
 
 private:
+  int m_ArrayHandling = {};
+  DataArrayPath m_SelectedDataContainerName = {};
+  QVector<DataArrayPath> m_IncludedDataArrayPaths = {};
+  DataArrayPath m_VertexDataContainerName = {};
+
   QVector<QString> m_NewDCGeometryChoices;
   QVector<QString> m_ArrayHandlingChoices;
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index aafd582d1b..30f637035b 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -37,12 +37,16 @@
 
 #include <QtCore/QJsonDocument>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -201,7 +205,7 @@ AbstractFilter::Pointer FeatureCountDecision::newFilterInstance(bool copyFilterP
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureCountDecision::getCompiledLibraryName() const
+QString FeatureCountDecision::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -209,7 +213,7 @@ const QString FeatureCountDecision::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureCountDecision::getGroupName() const
+QString FeatureCountDecision::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -217,7 +221,7 @@ const QString FeatureCountDecision::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FeatureCountDecision::getUuid()
+QUuid FeatureCountDecision::getUuid() const
 {
   return QUuid("{64d1df13-17a2-56a2-90a5-4dfda442b144}");
 }
@@ -225,7 +229,7 @@ const QUuid FeatureCountDecision::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureCountDecision::getSubGroupName() const
+QString FeatureCountDecision::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -233,7 +237,56 @@ const QString FeatureCountDecision::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureCountDecision::getHumanLabel() const
+QString FeatureCountDecision::getHumanLabel() const
 {
   return "Feature Count Decision";
 }
+
+// -----------------------------------------------------------------------------
+FeatureCountDecision::Pointer FeatureCountDecision::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FeatureCountDecision::Pointer FeatureCountDecision::New()
+{
+  Pointer sharedPtr(new(FeatureCountDecision));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FeatureCountDecision::getNameOfClass() const
+{
+  return QString("FeatureCountDecision");
+}
+
+// -----------------------------------------------------------------------------
+QString FeatureCountDecision::ClassName()
+{
+  return QString("FeatureCountDecision");
+}
+
+// -----------------------------------------------------------------------------
+void FeatureCountDecision::setFeatureIdsArrayPath(const DataArrayPath& value)
+{
+  m_FeatureIdsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath FeatureCountDecision::getFeatureIdsArrayPath() const
+{
+  return m_FeatureIdsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureCountDecision::setMaxGrains(int value)
+{
+  m_MaxGrains = value;
+}
+
+// -----------------------------------------------------------------------------
+int FeatureCountDecision::getMaxGrains() const
+{
+  return m_MaxGrains;
+}
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 8266dc9f13..a93dd0e549 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -36,11 +36,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The FeatureCountDecision class. See [Filter documentation](@ref featurecountdecision) for details.
@@ -48,21 +50,60 @@
 class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(FeatureCountDecision)
+    PYB11_STATIC_NEW_MACRO(FeatureCountDecision)
+    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+    PYB11_FILTER_PARAMETER(int, MaxGrains)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
     PYB11_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(FeatureCountDecision)
-    SIMPL_STATIC_NEW_MACRO(FeatureCountDecision)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FeatureCountDecision, AbstractDecisionFilter)
+    using Self = FeatureCountDecision;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for FeatureCountDecision
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for FeatureCountDecision
+     */
+    static QString ClassName();
 
     ~FeatureCountDecision() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+    /**
+     * @brief Setter property for FeatureIdsArrayPath
+     */
+    void setFeatureIdsArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for FeatureIdsArrayPath
+     * @return Value of FeatureIdsArrayPath
+     */
+    DataArrayPath getFeatureIdsArrayPath() const;
+
     Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
 
-    SIMPL_FILTER_PARAMETER(int, MaxGrains)
+    /**
+     * @brief Setter property for MaxGrains
+     */
+    void setMaxGrains(int value);
+    /**
+     * @brief Getter property for MaxGrains
+     * @return Value of MaxGrains
+     */
+    int getMaxGrains() const;
+
     Q_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
 
     /**
@@ -74,7 +115,7 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -84,23 +125,23 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -136,7 +177,11 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(int32_t, FeatureIds)
+    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+    int32_t* m_FeatureIds = nullptr;
+
+    DataArrayPath m_FeatureIdsArrayPath = {};
+    int m_MaxGrains = {};
 
   public:
     FeatureCountDecision(const FeatureCountDecision&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 6f7891af1c..7ea611fe57 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -33,11 +33,16 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FeatureDataCSVWriter.h"
 
 #include <QtCore/QDir>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
@@ -47,6 +52,7 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -327,7 +333,7 @@ AbstractFilter::Pointer FeatureDataCSVWriter::newFilterInstance(bool copyFilterP
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getCompiledLibraryName() const
+QString FeatureDataCSVWriter::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -335,7 +341,7 @@ const QString FeatureDataCSVWriter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getBrandingString() const
+QString FeatureDataCSVWriter::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -343,7 +349,7 @@ const QString FeatureDataCSVWriter::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getFilterVersion() const
+QString FeatureDataCSVWriter::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -354,7 +360,7 @@ const QString FeatureDataCSVWriter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getGroupName() const
+QString FeatureDataCSVWriter::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -362,7 +368,7 @@ const QString FeatureDataCSVWriter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FeatureDataCSVWriter::getUuid()
+QUuid FeatureDataCSVWriter::getUuid() const
 {
   return QUuid("{737b8d5a-8622-50f9-9a8a-bfdb57608891}");
 }
@@ -370,7 +376,7 @@ const QUuid FeatureDataCSVWriter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getSubGroupName() const
+QString FeatureDataCSVWriter::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::OutputFilters;
 }
@@ -378,7 +384,7 @@ const QString FeatureDataCSVWriter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FeatureDataCSVWriter::getHumanLabel() const
+QString FeatureDataCSVWriter::getHumanLabel() const
 {
   return "Export Feature Data as CSV File";
 }
@@ -394,7 +400,7 @@ int FeatureDataCSVWriter::getDelimiterChoiceInt() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FeatureDataCSVWriter::setDelimiterChoiceInt(const int& value)
+void FeatureDataCSVWriter::setDelimiterChoiceInt(int value)
 {
   this->m_DelimiterChoice = 0; // Set the default and if the value falls within the correct range, use that.
   // Allowed integer values of the enum SIMPL::DelimiterTypes::Type; see defintion in Constants.h
@@ -404,3 +410,103 @@ void FeatureDataCSVWriter::setDelimiterChoiceInt(const int& value)
   }
 }
 
+// -----------------------------------------------------------------------------
+FeatureDataCSVWriter::Pointer FeatureDataCSVWriter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FeatureDataCSVWriter> FeatureDataCSVWriter::New()
+{
+  struct make_shared_enabler : public FeatureDataCSVWriter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FeatureDataCSVWriter::getNameOfClass() const
+{
+  return QString("FeatureDataCSVWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString FeatureDataCSVWriter::ClassName()
+{
+  return QString("FeatureDataCSVWriter");
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setCellFeatureAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_CellFeatureAttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath FeatureDataCSVWriter::getCellFeatureAttributeMatrixPath() const
+{
+  return m_CellFeatureAttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setFeatureDataFile(const QString& value)
+{
+  m_FeatureDataFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FeatureDataCSVWriter::getFeatureDataFile() const
+{
+  return m_FeatureDataFile;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setWriteNeighborListData(bool value)
+{
+  m_WriteNeighborListData = value;
+}
+
+// -----------------------------------------------------------------------------
+bool FeatureDataCSVWriter::getWriteNeighborListData() const
+{
+  return m_WriteNeighborListData;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setDelimiterChoice(int value)
+{
+  m_DelimiterChoice = value;
+}
+
+// -----------------------------------------------------------------------------
+int FeatureDataCSVWriter::getDelimiterChoice() const
+{
+  return m_DelimiterChoice;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setWriteNumFeaturesLine(bool value)
+{
+  m_WriteNumFeaturesLine = value;
+}
+
+// -----------------------------------------------------------------------------
+bool FeatureDataCSVWriter::getWriteNumFeaturesLine() const
+{
+  return m_WriteNumFeaturesLine;
+}
+
+// -----------------------------------------------------------------------------
+void FeatureDataCSVWriter::setDelimiter(char value)
+{
+  m_Delimiter = value;
+}
+
+// -----------------------------------------------------------------------------
+char FeatureDataCSVWriter::getDelimiter() const
+{
+  return m_Delimiter;
+}
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 24118caba4..f635853219 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SIMPLib/Common/Constants.h"
 
@@ -48,36 +49,113 @@
 class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(FeatureDataCSVWriter)
+    PYB11_FILTER_NEW_MACRO(FeatureDataCSVWriter)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixPath)
+    PYB11_FILTER_PARAMETER(QString, FeatureDataFile)
+    PYB11_FILTER_PARAMETER(bool, WriteNeighborListData)
+    PYB11_FILTER_PARAMETER(int, DelimiterChoice)
+    PYB11_FILTER_PARAMETER(bool, WriteNumFeaturesLine)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
     PYB11_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
     PYB11_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
     PYB11_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
     PYB11_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(FeatureDataCSVWriter)
-    SIMPL_FILTER_NEW_MACRO(FeatureDataCSVWriter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FeatureDataCSVWriter, AbstractFilter)
+    using Self = FeatureDataCSVWriter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<FeatureDataCSVWriter> New();
+
+    /**
+     * @brief Returns the name of the class for FeatureDataCSVWriter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for FeatureDataCSVWriter
+     */
+    static QString ClassName();
 
     ~FeatureDataCSVWriter() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixPath)
+    /**
+     * @brief Setter property for CellFeatureAttributeMatrixPath
+     */
+    void setCellFeatureAttributeMatrixPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CellFeatureAttributeMatrixPath
+     * @return Value of CellFeatureAttributeMatrixPath
+     */
+    DataArrayPath getCellFeatureAttributeMatrixPath() const;
+
     Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
 
-    SIMPL_FILTER_PARAMETER(QString, FeatureDataFile)
+    /**
+     * @brief Setter property for FeatureDataFile
+     */
+    void setFeatureDataFile(const QString& value);
+    /**
+     * @brief Getter property for FeatureDataFile
+     * @return Value of FeatureDataFile
+     */
+    QString getFeatureDataFile() const;
+
     Q_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
 
-    SIMPL_FILTER_PARAMETER(bool, WriteNeighborListData)
+    /**
+     * @brief Setter property for WriteNeighborListData
+     */
+    void setWriteNeighborListData(bool value);
+    /**
+     * @brief Getter property for WriteNeighborListData
+     * @return Value of WriteNeighborListData
+     */
+    bool getWriteNeighborListData() const;
+
     Q_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
 
-    SIMPL_FILTER_PARAMETER(int, DelimiterChoice)
+    /**
+     * @brief Setter property for DelimiterChoice
+     */
+    void setDelimiterChoice(int value);
+    /**
+     * @brief Getter property for DelimiterChoice
+     * @return Value of DelimiterChoice
+     */
+    int getDelimiterChoice() const;
+
     Q_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
 
-    SIMPL_FILTER_PARAMETER(bool, WriteNumFeaturesLine)
+    /**
+     * @brief Setter property for WriteNumFeaturesLine
+     */
+    void setWriteNumFeaturesLine(bool value);
+    /**
+     * @brief Getter property for WriteNumFeaturesLine
+     * @return Value of WriteNumFeaturesLine
+     */
+    bool getWriteNumFeaturesLine() const;
+
     Q_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
 
-    SIMPL_INSTANCE_PROPERTY(char, Delimiter)
+    /**
+     * @brief Setter property for Delimiter
+     */
+    void setDelimiter(char value);
+    /**
+     * @brief Getter property for Delimiter
+     * @return Value of Delimiter
+     */
+    char getDelimiter() const;
 
     /**
      * @brief getDelimiterChoiceInt Returns the corresponding int from the enum SIMPL::DelimiterTypes::Type for DelimiterChoice
@@ -87,26 +165,26 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
     /**
      * @brief setDelimiterChoiceInt Sets DelimiterChoice to the enum type from SIMPL::DelimiterTypes::Type corresponding to the int parameter
      */
-    void setDelimiterChoiceInt(const int& value);
+    void setDelimiterChoiceInt(int value);
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -116,23 +194,23 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -194,4 +272,12 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
     FeatureDataCSVWriter(FeatureDataCSVWriter&&) = delete;      // Move Constructor Not Implemented
     FeatureDataCSVWriter& operator=(const FeatureDataCSVWriter&) = delete; // Copy Assignment Not Implemented
     FeatureDataCSVWriter& operator=(FeatureDataCSVWriter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_CellFeatureAttributeMatrixPath = {};
+    QString m_FeatureDataFile = {};
+    bool m_WriteNeighborListData = {};
+    int m_DelimiterChoice = {};
+    bool m_WriteNumFeaturesLine = {};
+    char m_Delimiter = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index e32fe7a5a4..482846f74c 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FileReader.h"
 
 #include "SIMPLib/Common/Constants.h"
@@ -97,3 +99,32 @@ void FileReader::execute()
     return;
   }
 }
+
+// -----------------------------------------------------------------------------
+FileReader::Pointer FileReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FileReader> FileReader::New()
+{
+  struct make_shared_enabler : public FileReader
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FileReader::getNameOfClass() const
+{
+  return QString("FileReader");
+}
+
+// -----------------------------------------------------------------------------
+QString FileReader::ClassName()
+{
+  return QString("FileReader");
+}
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index a8b0e16c18..9d3521c2b9 100755
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -36,7 +36,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
@@ -49,9 +50,23 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
     Q_OBJECT
     
   public:
-    SIMPL_SHARED_POINTERS(FileReader)
-    SIMPL_FILTER_NEW_MACRO(FileReader)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FileReader, AbstractFilter)
+    using Self = FileReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<FileReader> New();
+
+    /**
+     * @brief Returns the name of the class for FileReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for FileReader
+     */
+    static QString ClassName();
 
     ~FileReader() override;
 
@@ -114,5 +129,7 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
     FileReader(FileReader&&) = delete;          // Move Constructor Not Implemented
     FileReader& operator=(const FileReader&) = delete; // Copy Assignment Not Implemented
     FileReader& operator=(FileReader&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index 4400da61e0..e71887f1f1 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FileWriter.h"
 
 #include <QtCore/QDir>
@@ -106,3 +108,44 @@ void FileWriter::execute()
     return;
   }
 }
+
+// -----------------------------------------------------------------------------
+FileWriter::Pointer FileWriter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FileWriter> FileWriter::New()
+{
+  struct make_shared_enabler : public FileWriter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FileWriter::getNameOfClass() const
+{
+  return QString("FileWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString FileWriter::ClassName()
+{
+  return QString("FileWriter");
+}
+
+// -----------------------------------------------------------------------------
+void FileWriter::setOutputFile(const QString& value)
+{
+  m_OutputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FileWriter::getOutputFile() const
+{
+  return m_OutputFile;
+}
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 5cc87554c1..28eac83f3d 100755
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FileWriter class serves as a superclass for writer filters
@@ -45,17 +46,46 @@
 class SIMPLib_EXPORT FileWriter : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(FileWriter)
+    PYB11_FILTER_NEW_MACRO(FileWriter)
+    PYB11_FILTER_PARAMETER(QString, OutputFile)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-    
+#endif
+
   public:
-    SIMPL_SHARED_POINTERS(FileWriter)
-    SIMPL_FILTER_NEW_MACRO(FileWriter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FileWriter, AbstractFilter)
+    using Self = FileWriter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<FileWriter> New();
+
+    /**
+     * @brief Returns the name of the class for FileWriter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for FileWriter
+     */
+    static QString ClassName();
 
     ~FileWriter() override;
 
-    SIMPL_FILTER_PARAMETER(QString, OutputFile)
+    /**
+     * @brief Setter property for OutputFile
+     */
+    void setOutputFile(const QString& value);
+    /**
+     * @brief Getter property for OutputFile
+     * @return Value of OutputFile
+     */
+    QString getOutputFile() const;
+
     Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
 
     void execute() override;
@@ -103,5 +133,8 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
     FileWriter(FileWriter&&) = delete;          // Move Constructor Not Implemented
     FileWriter& operator=(const FileWriter&) = delete; // Copy Assignment Not Implemented
     FileWriter& operator=(FileWriter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_OutputFile = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 2c9fd81ad3..b5ef389228 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FindDerivatives.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/TemplateHelpers.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -53,6 +58,8 @@
 #include "SIMPLib/Messages/GenericErrorMessage.h"
 #include "SIMPLib/Messages/GenericWarningMessage.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief This message handler is used by the FindDerivatives filter to re-emit incoming generic
@@ -444,7 +451,7 @@ AbstractFilter::Pointer FindDerivatives::newFilterInstance(bool copyFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getCompiledLibraryName() const
+QString FindDerivatives::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -452,7 +459,7 @@ const QString FindDerivatives::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getBrandingString() const
+QString FindDerivatives::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -460,7 +467,7 @@ const QString FindDerivatives::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getFilterVersion() const
+QString FindDerivatives::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -471,7 +478,7 @@ const QString FindDerivatives::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getGroupName() const
+QString FindDerivatives::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -479,7 +486,7 @@ const QString FindDerivatives::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FindDerivatives::getUuid()
+QUuid FindDerivatives::getUuid() const
 {
   return QUuid("{8ec1fc8e-6484-5412-a898-8079986c0a26}");
 }
@@ -487,7 +494,7 @@ const QUuid FindDerivatives::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getSubGroupName() const
+QString FindDerivatives::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GeometryFilters;
 }
@@ -495,7 +502,60 @@ const QString FindDerivatives::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FindDerivatives::getHumanLabel() const
+QString FindDerivatives::getHumanLabel() const
 {
   return "Find Derivatives";
 }
+
+// -----------------------------------------------------------------------------
+FindDerivatives::Pointer FindDerivatives::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FindDerivatives> FindDerivatives::New()
+{
+  struct make_shared_enabler : public FindDerivatives
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FindDerivatives::getNameOfClass() const
+{
+  return QString("FindDerivatives");
+}
+
+// -----------------------------------------------------------------------------
+QString FindDerivatives::ClassName()
+{
+  return QString("FindDerivatives");
+}
+
+// -----------------------------------------------------------------------------
+void FindDerivatives::setSelectedArrayPath(const DataArrayPath& value)
+{
+  m_SelectedArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath FindDerivatives::getSelectedArrayPath() const
+{
+  return m_SelectedArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void FindDerivatives::setDerivativesArrayPath(const DataArrayPath& value)
+{
+  m_DerivativesArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath FindDerivatives::getDerivativesArrayPath() const
+{
+  return m_DerivativesArrayPath;
+}
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 3e8c468376..08d8b5ad39 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -35,11 +35,16 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The FindDerivatives class. See [Filter documentation](@ref findderivatives) for details.
@@ -47,90 +52,138 @@
 class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(FindDerivatives SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(FindDerivatives)
+  PYB11_FILTER_NEW_MACRO(FindDerivatives)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DerivativesArrayPath)
   PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
   PYB11_PROPERTY(DataArrayPath DerivativesArrayPath READ getDerivativesArrayPath WRITE setDerivativesArrayPath)
+#endif
+
+public:
+  using Self = FindDerivatives;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
 
-  public:
-    SIMPL_SHARED_POINTERS(FindDerivatives)
-    SIMPL_FILTER_NEW_MACRO(FindDerivatives)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FindDerivatives, AbstractFilter)
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FindDerivatives
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FindDerivatives
+   */
+  static QString ClassName();
 
-    ~FindDerivatives() override;
+  ~FindDerivatives() override;
+
+  /**
+   * @brief Setter property for SelectedArrayPath
+   */
+  void setSelectedArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArrayPath
+   * @return Value of SelectedArrayPath
+   */
+  DataArrayPath getSelectedArrayPath() const;
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
   Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DerivativesArrayPath)
+  /**
+   * @brief Setter property for DerivativesArrayPath
+   */
+  void setDerivativesArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DerivativesArrayPath
+   * @return Value of DerivativesArrayPath
+   */
+  DataArrayPath getDerivativesArrayPath() const;
+
   Q_PROPERTY(DataArrayPath DerivativesArrayPath READ getDerivativesArrayPath WRITE setDerivativesArrayPath)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
 
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
 
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
 
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
 
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
 
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
 
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
 
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
 
-    /**
-    * @brief This method will read the options from a file
-    * @param reader The reader that is used to read the options from a file
-    * @param index The index to read the information from
-    */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+  /**
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   * @param index The index to read the information from
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
-    /**
-     * @brief Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
+  /**
+   * @brief Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
 
-    /**
-    * @brief This function runs some sanity checks on the DataContainer and inputs
-    * in an attempt to ensure the filter can process the inputs.
-    */
-    void preflight() override;
+  /**
+   * @brief This function runs some sanity checks on the DataContainer and inputs
+   * in an attempt to ensure the filter can process the inputs.
+   */
+  void preflight() override;
 
 signals:
   /**
@@ -176,8 +229,13 @@ protected slots:
   void processDerivativesMessage(const AbstractMessage::Pointer& msg);
 
 private:
-  DEFINE_IDATAARRAY_WEAKPTR(InArray)
-  DEFINE_DATAARRAY_VARIABLE(double, DerivativesArray)
+  std::weak_ptr<DataArray<double>> m_DerivativesArrayPtr;
+  double* m_DerivativesArray = nullptr;
+
+  IDataArrayWkPtrType m_InArrayPtr;
+
+  DataArrayPath m_SelectedArrayPath = {};
+  DataArrayPath m_DerivativesArrayPath = {};
 
   bool m_Interpolate;
 
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index f99bf5ff01..e29f0cdcbd 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -2,9 +2,14 @@
  * Your License or Copyright can go here
  */
 
+#include <memory>
+
 #include "GenerateColorTable.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
@@ -12,6 +17,7 @@
 #include "SIMPLib/Utilities/ColorTable.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   ColorArrayID = 1
@@ -365,13 +371,13 @@ AbstractFilter::Pointer GenerateColorTable::newFilterInstance(bool copyFilterPar
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getCompiledLibraryName() const
+QString GenerateColorTable::getCompiledLibraryName() const
 { return Core::CoreBaseName; }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getBrandingString() const
+QString GenerateColorTable::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -379,7 +385,7 @@ const QString GenerateColorTable::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getFilterVersion() const
+QString GenerateColorTable::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -390,13 +396,13 @@ const QString GenerateColorTable::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getGroupName() const
+QString GenerateColorTable::getGroupName() const
 { return SIMPL::FilterGroups::CoreFilters; }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid GenerateColorTable::getUuid()
+QUuid GenerateColorTable::getUuid() const
 {
   return QUuid("{0d0a6535-6565-51c5-a3fc-fbc00008606d}");
 }
@@ -404,12 +410,88 @@ const QUuid GenerateColorTable::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getSubGroupName() const
+QString GenerateColorTable::getSubGroupName() const
 { return SIMPL::FilterSubGroups::ImageFilters; }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenerateColorTable::getHumanLabel() const
+QString GenerateColorTable::getHumanLabel() const
 { return "Generate Color Table"; }
 
+// -----------------------------------------------------------------------------
+GenerateColorTable::Pointer GenerateColorTable::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<GenerateColorTable> GenerateColorTable::New()
+{
+  struct make_shared_enabler : public GenerateColorTable
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTable::getNameOfClass() const
+{
+  return QString("GenerateColorTable");
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTable::ClassName()
+{
+  return QString("GenerateColorTable");
+}
+
+// -----------------------------------------------------------------------------
+void GenerateColorTable::setSelectedPresetName(const QString& value)
+{
+  m_SelectedPresetName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTable::getSelectedPresetName() const
+{
+  return m_SelectedPresetName;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateColorTable::setSelectedPresetControlPoints(const QJsonArray& value)
+{
+  m_SelectedPresetControlPoints = value;
+}
+
+// -----------------------------------------------------------------------------
+QJsonArray GenerateColorTable::getSelectedPresetControlPoints() const
+{
+  return m_SelectedPresetControlPoints;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateColorTable::setSelectedDataArrayPath(const DataArrayPath& value)
+{
+  m_SelectedDataArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenerateColorTable::getSelectedDataArrayPath() const
+{
+  return m_SelectedDataArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateColorTable::setRgbArrayName(const QString& value)
+{
+  m_RgbArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTable::getRgbArrayName() const
+{
+  return m_RgbArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 780d71376b..31a49bfcc2 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -4,11 +4,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonArray>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The GenerateColorTable class. See [Filter documentation](@ref generatecolortable) for details.
@@ -16,131 +17,201 @@
 class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(GenerateColorTable SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(GenerateColorTable)
+  PYB11_FILTER_NEW_MACRO(GenerateColorTable)
   PYB11_PROPERTY(QString SelectedPresetName READ getSelectedPresetName WRITE setSelectedPresetName)
   PYB11_PROPERTY(QJsonArray SelectedPresetControlPoints READ getSelectedPresetControlPoints WRITE setSelectedPresetControlPoints)
   PYB11_PROPERTY(DataArrayPath SelectedDataArrayPath READ getSelectedDataArrayPath WRITE setSelectedDataArrayPath)
   PYB11_PROPERTY(QString RgbArrayName READ getRgbArrayName WRITE setRgbArrayName)
-
-  public:
-    SIMPL_SHARED_POINTERS(GenerateColorTable)
-    SIMPL_FILTER_NEW_MACRO(GenerateColorTable)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(GenerateColorTable, AbstractFilter)
-
-    ~GenerateColorTable() override;
-
-    SIMPL_INSTANCE_PROPERTY(QString, SelectedPresetName)
-    Q_PROPERTY(QString SelectedPresetName READ getSelectedPresetName WRITE setSelectedPresetName)
-
-    SIMPL_INSTANCE_PROPERTY(QJsonArray, SelectedPresetControlPoints)
-    Q_PROPERTY(QJsonArray SelectedPresetControlPoints READ getSelectedPresetControlPoints WRITE setSelectedPresetControlPoints)
-
-    SIMPL_INSTANCE_PROPERTY(DataArrayPath, SelectedDataArrayPath)
-    Q_PROPERTY(DataArrayPath SelectedDataArrayPath READ getSelectedDataArrayPath WRITE setSelectedDataArrayPath)
-
-    SIMPL_INSTANCE_PROPERTY(QString, RgbArrayName)
-    Q_PROPERTY(QString RgbArrayName READ getRgbArrayName WRITE setRgbArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    const QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer 
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
-  protected:
-    GenerateColorTable();
-
-    /**
-    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-    */
-    void dataCheck();
-
-    /**
-    * @brief Initializes all the private instance variables.
-    */
-    void initialize();
-
-  public:
-    GenerateColorTable(const GenerateColorTable&) = delete; // Copy Constructor Not Implemented
-    GenerateColorTable(GenerateColorTable&&) = delete;      // Move Constructor Not Implemented
-    GenerateColorTable& operator=(const GenerateColorTable&) = delete; // Copy Assignment Not Implemented
-    GenerateColorTable& operator=(GenerateColorTable&&) = delete;      // Move Assignment Not Implemented
+#endif
+
+public:
+  using Self = GenerateColorTable;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenerateColorTable
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenerateColorTable
+   */
+  static QString ClassName();
+
+  ~GenerateColorTable() override;
+
+  /**
+   * @brief Setter property for SelectedPresetName
+   */
+  void setSelectedPresetName(const QString& value);
+  /**
+   * @brief Getter property for SelectedPresetName
+   * @return Value of SelectedPresetName
+   */
+  QString getSelectedPresetName() const;
+
+  Q_PROPERTY(QString SelectedPresetName READ getSelectedPresetName WRITE setSelectedPresetName)
+
+  /**
+   * @brief Setter property for SelectedPresetControlPoints
+   */
+  void setSelectedPresetControlPoints(const QJsonArray& value);
+  /**
+   * @brief Getter property for SelectedPresetControlPoints
+   * @return Value of SelectedPresetControlPoints
+   */
+  QJsonArray getSelectedPresetControlPoints() const;
+
+  Q_PROPERTY(QJsonArray SelectedPresetControlPoints READ getSelectedPresetControlPoints WRITE setSelectedPresetControlPoints)
+
+  /**
+   * @brief Setter property for SelectedDataArrayPath
+   */
+  void setSelectedDataArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedDataArrayPath
+   * @return Value of SelectedDataArrayPath
+   */
+  DataArrayPath getSelectedDataArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedDataArrayPath READ getSelectedDataArrayPath WRITE setSelectedDataArrayPath)
+
+  /**
+   * @brief Setter property for RgbArrayName
+   */
+  void setRgbArrayName(const QString& value);
+  /**
+   * @brief Getter property for RgbArrayName
+   * @return Value of RgbArrayName
+   */
+  QString getRgbArrayName() const;
+
+  Q_PROPERTY(QString RgbArrayName READ getRgbArrayName WRITE setRgbArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  GenerateColorTable();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  GenerateColorTable(const GenerateColorTable&) = delete;            // Copy Constructor Not Implemented
+  GenerateColorTable(GenerateColorTable&&) = delete;                 // Move Constructor Not Implemented
+  GenerateColorTable& operator=(const GenerateColorTable&) = delete; // Copy Assignment Not Implemented
+  GenerateColorTable& operator=(GenerateColorTable&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_SelectedPresetName = {};
+  QJsonArray m_SelectedPresetControlPoints = {};
+  DataArrayPath m_SelectedDataArrayPath = {};
+  QString m_RgbArrayName = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index ec8113f0b1..4541c1faa8 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ImportAsciDataArray.h"
 
 #include <locale>
@@ -41,7 +43,10 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QDateTime>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -54,6 +59,8 @@
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   AsciiArrayID = 1
@@ -257,12 +264,8 @@ ImportAsciDataArrayPrivate::ImportAsciDataArrayPrivate(ImportAsciDataArray* ptr)
 ImportAsciDataArray::ImportAsciDataArray()
 : m_CreatedAttributeArrayPath("")
 , m_ScalarType(SIMPL::NumericTypes::Type::Int8)
-, m_NumberOfComponents(0)
-, m_SkipHeaderLines(0)
 , m_InputFile("")
-, m_Delimiter(0)
 , d_ptr(new ImportAsciDataArrayPrivate(this))
-
 {
 }
 
@@ -274,10 +277,61 @@ ImportAsciDataArray::~ImportAsciDataArray() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPL_PIMPL_PROPERTY_DEF(ImportAsciDataArray, QString, FirstLine)
-SIMPL_PIMPL_PROPERTY_DEF(ImportAsciDataArray, QString, InputFile_Cache)
-SIMPL_PIMPL_PROPERTY_DEF(ImportAsciDataArray, QDateTime, LastRead)
-SIMPL_PIMPL_PROPERTY_DEF(ImportAsciDataArray, int, HeaderLines)
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setFirstLine(const QString& value)
+{
+  Q_D(ImportAsciDataArray);
+  d->m_FirstLine = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportAsciDataArray::getFirstLine() const
+{
+  Q_D(const ImportAsciDataArray);
+  return d->m_FirstLine;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setInputFile_Cache(const QString& value)
+{
+  Q_D(ImportAsciDataArray);
+  d->m_InputFile_Cache = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportAsciDataArray::getInputFile_Cache() const
+{
+  Q_D(const ImportAsciDataArray);
+  return d->m_InputFile_Cache;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setLastRead(const QDateTime& value)
+{
+  Q_D(ImportAsciDataArray);
+  d->m_LastRead = value;
+}
+
+// -----------------------------------------------------------------------------
+QDateTime ImportAsciDataArray::getLastRead() const
+{
+  Q_D(const ImportAsciDataArray);
+  return d->m_LastRead;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setHeaderLines(int value)
+{
+  Q_D(ImportAsciDataArray);
+  d->m_HeaderLines = value;
+}
+
+// -----------------------------------------------------------------------------
+int ImportAsciDataArray::getHeaderLines() const
+{
+  Q_D(const ImportAsciDataArray);
+  return d->m_HeaderLines;
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -685,7 +739,7 @@ AbstractFilter::Pointer ImportAsciDataArray::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getCompiledLibraryName() const
+QString ImportAsciDataArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -693,7 +747,7 @@ const QString ImportAsciDataArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getBrandingString() const
+QString ImportAsciDataArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -701,7 +755,7 @@ const QString ImportAsciDataArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getFilterVersion() const
+QString ImportAsciDataArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -712,7 +766,7 @@ const QString ImportAsciDataArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getGroupName() const
+QString ImportAsciDataArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -720,7 +774,7 @@ const QString ImportAsciDataArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ImportAsciDataArray::getUuid()
+QUuid ImportAsciDataArray::getUuid() const
 {
   return QUuid("{a7007472-29e5-5d0a-89a6-1aed11b603f8}");
 }
@@ -728,7 +782,7 @@ const QUuid ImportAsciDataArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getSubGroupName() const
+QString ImportAsciDataArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
@@ -736,7 +790,108 @@ const QString ImportAsciDataArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportAsciDataArray::getHumanLabel() const
+QString ImportAsciDataArray::getHumanLabel() const
 {
   return "Import ASCII Attribute Array";
 }
+
+// -----------------------------------------------------------------------------
+ImportAsciDataArray::Pointer ImportAsciDataArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ImportAsciDataArray> ImportAsciDataArray::New()
+{
+  struct make_shared_enabler : public ImportAsciDataArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportAsciDataArray::getNameOfClass() const
+{
+  return QString("ImportAsciDataArray");
+}
+
+// -----------------------------------------------------------------------------
+QString ImportAsciDataArray::ClassName()
+{
+  return QString("ImportAsciDataArray");
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setCreatedAttributeArrayPath(const DataArrayPath& value)
+{
+  m_CreatedAttributeArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ImportAsciDataArray::getCreatedAttributeArrayPath() const
+{
+  return m_CreatedAttributeArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setScalarType(SIMPL::NumericTypes::Type value)
+{
+  m_ScalarType = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPL::NumericTypes::Type ImportAsciDataArray::getScalarType() const
+{
+  return m_ScalarType;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setNumberOfComponents(int value)
+{
+  m_NumberOfComponents = value;
+}
+
+// -----------------------------------------------------------------------------
+int ImportAsciDataArray::getNumberOfComponents() const
+{
+  return m_NumberOfComponents;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setSkipHeaderLines(int value)
+{
+  m_SkipHeaderLines = value;
+}
+
+// -----------------------------------------------------------------------------
+int ImportAsciDataArray::getSkipHeaderLines() const
+{
+  return m_SkipHeaderLines;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setInputFile(const QString& value)
+{
+  m_InputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportAsciDataArray::getInputFile() const
+{
+  return m_InputFile;
+}
+
+// -----------------------------------------------------------------------------
+void ImportAsciDataArray::setDelimiter(int value)
+{
+  m_Delimiter = value;
+}
+
+// -----------------------------------------------------------------------------
+int ImportAsciDataArray::getDelimiter() const
+{
+  return m_Delimiter;
+}
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 976846c3b8..7888c3fe14 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -35,11 +35,16 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QScopedPointer>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Common/Constants.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 // our PIMPL private class for caching
 class ImportAsciDataArrayPrivate;
@@ -51,47 +56,161 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(ImportAsciDataArray)
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ImportAsciDataArray)
+    PYB11_FILTER_NEW_MACRO(ImportAsciDataArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
+    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
+    PYB11_FILTER_PARAMETER(int, SkipHeaderLines)
+    PYB11_FILTER_PARAMETER(QString, InputFile)
+    PYB11_FILTER_PARAMETER(int, Delimiter)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
     PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(ImportAsciDataArray)
-    SIMPL_FILTER_NEW_MACRO(ImportAsciDataArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ImportAsciDataArray, AbstractFilter)
+    using Self = ImportAsciDataArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ImportAsciDataArray> New();
+
+    /**
+     * @brief Returns the name of the class for ImportAsciDataArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ImportAsciDataArray
+     */
+    static QString ClassName();
 
     ~ImportAsciDataArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
+    /**
+     * @brief Setter property for CreatedAttributeArrayPath
+     */
+    void setCreatedAttributeArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CreatedAttributeArrayPath
+     * @return Value of CreatedAttributeArrayPath
+     */
+    DataArrayPath getCreatedAttributeArrayPath() const;
+
     Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
 
-    SIMPL_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    /**
+     * @brief Setter property for ScalarType
+     */
+    void setScalarType(SIMPL::NumericTypes::Type value);
+    /**
+     * @brief Getter property for ScalarType
+     * @return Value of ScalarType
+     */
+    SIMPL::NumericTypes::Type getScalarType() const;
+
     Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
-    SIMPL_FILTER_PARAMETER(int, NumberOfComponents)
+    /**
+     * @brief Setter property for NumberOfComponents
+     */
+    void setNumberOfComponents(int value);
+    /**
+     * @brief Getter property for NumberOfComponents
+     * @return Value of NumberOfComponents
+     */
+    int getNumberOfComponents() const;
+
     Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
 
-    SIMPL_FILTER_PARAMETER(int, SkipHeaderLines)
+    /**
+     * @brief Setter property for SkipHeaderLines
+     */
+    void setSkipHeaderLines(int value);
+    /**
+     * @brief Getter property for SkipHeaderLines
+     * @return Value of SkipHeaderLines
+     */
+    int getSkipHeaderLines() const;
+
     Q_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
 
-    SIMPL_FILTER_PARAMETER(QString, InputFile)
+    /**
+     * @brief Setter property for InputFile
+     */
+    void setInputFile(const QString& value);
+    /**
+     * @brief Getter property for InputFile
+     * @return Value of InputFile
+     */
+    QString getInputFile() const;
+
     Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
 
-    SIMPL_FILTER_PARAMETER(int, Delimiter)
+    /**
+     * @brief Setter property for Delimiter
+     */
+    void setDelimiter(int value);
+    /**
+     * @brief Getter property for Delimiter
+     * @return Value of Delimiter
+     */
+    int getDelimiter() const;
+
     Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
     
     
     Q_PROPERTY(QString FirstLine READ getFirstLine)
-    
-    SIMPL_PIMPL_PROPERTY_DECL(QString, FirstLine)
-    SIMPL_PIMPL_PROPERTY_DECL(QString, InputFile_Cache)
-    SIMPL_PIMPL_PROPERTY_DECL(QDateTime, LastRead)
-    SIMPL_PIMPL_PROPERTY_DECL(int, HeaderLines)
-    
+
+    /**
+     * @brief Setter property for FirstLine
+     */
+    void setFirstLine(const QString& value);
+    /**
+     * @brief Getter property for FirstLine
+     * @return Value of FirstLine
+     */
+    QString getFirstLine() const;
+
+    /**
+     * @brief Setter property for InputFile_Cache
+     */
+    void setInputFile_Cache(const QString& value);
+    /**
+     * @brief Getter property for InputFile_Cache
+     * @return Value of InputFile_Cache
+     */
+    QString getInputFile_Cache() const;
+
+    /**
+     * @brief Setter property for LastRead
+     */
+    void setLastRead(const QDateTime& value);
+    /**
+     * @brief Getter property for LastRead
+     * @return Value of LastRead
+     */
+    QDateTime getLastRead() const;
+
+    /**
+     * @brief Setter property for HeaderLines
+     */
+    void setHeaderLines(int value);
+    /**
+     * @brief Getter property for HeaderLines
+     * @return Value of HeaderLines
+     */
+    int getHeaderLines() const;
+
     enum DelimeterType
     {
       Comma = 0,
@@ -104,21 +223,21 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -128,23 +247,23 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -210,9 +329,16 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     void readHeaderPortion();
 
   private:
+    DataArrayPath m_CreatedAttributeArrayPath = {};
+    SIMPL::NumericTypes::Type m_ScalarType = {};
+    int m_NumberOfComponents = {};
+    int m_SkipHeaderLines = {};
+    QString m_InputFile = {};
+    int m_Delimiter = {};
+
     QScopedPointer<ImportAsciDataArrayPrivate> const d_ptr;
 
-    IDataArray::Pointer m_Array;
+    IDataArrayShPtrType m_Array;
 
   public:
     ImportAsciDataArray(const ImportAsciDataArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 2f6fd1564c..5c4d4507c9 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -30,19 +30,25 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ImportHDF5Dataset.h"
 
 #include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
+
+#include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/H5Utilities.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
-#include "H5Support/H5ScopedSentinel.h"
-#include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Utilities.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 namespace Detail
 {
@@ -401,7 +407,7 @@ std::vector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString&
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IDataArray::Pointer ImportHDF5Dataset::readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, std::vector<size_t> cDims, bool metaDataOnly)
+IDataArrayShPtrType ImportHDF5Dataset::readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, const std::vector<size_t>& cDims, bool metaDataOnly)
 {
   herr_t err = -1;
   // herr_t retErr = 1;
@@ -593,7 +599,7 @@ AbstractFilter::Pointer ImportHDF5Dataset::newFilterInstance(bool copyFilterPara
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getCompiledLibraryName() const
+QString ImportHDF5Dataset::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -601,7 +607,7 @@ const QString ImportHDF5Dataset::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getBrandingString() const
+QString ImportHDF5Dataset::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -609,7 +615,7 @@ const QString ImportHDF5Dataset::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getFilterVersion() const
+QString ImportHDF5Dataset::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -620,7 +626,7 @@ const QString ImportHDF5Dataset::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getGroupName() const
+QString ImportHDF5Dataset::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -628,7 +634,7 @@ const QString ImportHDF5Dataset::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ImportHDF5Dataset::getUuid()
+QUuid ImportHDF5Dataset::getUuid() const
 {
   return QUuid("{9e98c3b0-5707-5a3b-b8b5-23ef83b02896}");
 }
@@ -636,7 +642,7 @@ const QUuid ImportHDF5Dataset::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getSubGroupName() const
+QString ImportHDF5Dataset::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
@@ -644,7 +650,84 @@ const QString ImportHDF5Dataset::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ImportHDF5Dataset::getHumanLabel() const
+QString ImportHDF5Dataset::getHumanLabel() const
 {
   return "Import HDF5 Dataset";
 }
+
+// -----------------------------------------------------------------------------
+ImportHDF5Dataset::Pointer ImportHDF5Dataset::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ImportHDF5Dataset> ImportHDF5Dataset::New()
+{
+  struct make_shared_enabler : public ImportHDF5Dataset
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportHDF5Dataset::getNameOfClass() const
+{
+  return QString("ImportHDF5Dataset");
+}
+
+// -----------------------------------------------------------------------------
+QString ImportHDF5Dataset::ClassName()
+{
+  return QString("ImportHDF5Dataset");
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5Dataset::setHDF5FilePath(const QString& value)
+{
+  m_HDF5FilePath = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportHDF5Dataset::getHDF5FilePath() const
+{
+  return m_HDF5FilePath;
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5Dataset::setDatasetImportInfoList(const QList<ImportHDF5Dataset::DatasetImportInfo>& value)
+{
+  m_DatasetImportInfoList = value;
+}
+
+// -----------------------------------------------------------------------------
+QList<ImportHDF5Dataset::DatasetImportInfo> ImportHDF5Dataset::getDatasetImportInfoList() const
+{
+  return m_DatasetImportInfoList;
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5Dataset::setSelectedAttributeMatrix(const DataArrayPath& value)
+{
+  m_SelectedAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ImportHDF5Dataset::getSelectedAttributeMatrix() const
+{
+  return m_SelectedAttributeMatrix;
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5Dataset::setDatasetPathsWithErrors(const QStringList& value)
+{
+  m_DatasetPathsWithErrors = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList ImportHDF5Dataset::getDatasetPathsWithErrors() const
+{
+  return m_DatasetPathsWithErrors;
+}
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 8d5532124b..b97021d4f3 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -32,11 +32,17 @@
 
 #pragma once
 
+#include <memory>
+
+#include <hdf5.h>
+
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
  * @brief The ImportHDF5Dataset class. See [Filter documentation](@ref readhdf5file) for details.
@@ -44,16 +50,48 @@
 class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ImportHDF5Dataset SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ImportHDF5Dataset)
+  PYB11_FILTER_NEW_MACRO(ImportHDF5Dataset)
+  PYB11_FILTER_PARAMETER(QString, HDF5FilePath)
+  PYB11_FILTER_PARAMETER(QList<ImportHDF5Dataset::DatasetImportInfo>, DatasetImportInfoList)
+  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
+  PYB11_FILTER_PARAMETER(QStringList, DatasetPathsWithErrors)
   PYB11_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
   PYB11_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
   PYB11_PROPERTY(QList<ImportHDF5Dataset::DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
   PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ImportHDF5Dataset)
-  SIMPL_FILTER_NEW_MACRO(ImportHDF5Dataset)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ImportHDF5Dataset, AbstractFilter)
+  using Self = ImportHDF5Dataset;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ImportHDF5Dataset
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ImportHDF5Dataset
+   */
+  static QString ClassName();
 
   ~ImportHDF5Dataset() override;
 
@@ -75,38 +113,73 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
     }
   };
 
-  SIMPL_FILTER_PARAMETER(QString, HDF5FilePath)
+  /**
+   * @brief Setter property for HDF5FilePath
+   */
+  void setHDF5FilePath(const QString& value);
+  /**
+   * @brief Getter property for HDF5FilePath
+   * @return Value of HDF5FilePath
+   */
+  QString getHDF5FilePath() const;
+
   Q_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
 
-  SIMPL_FILTER_PARAMETER(QList<ImportHDF5Dataset::DatasetImportInfo>, DatasetImportInfoList)
+  /**
+   * @brief Setter property for DatasetImportInfoList
+   */
+  void setDatasetImportInfoList(const QList<ImportHDF5Dataset::DatasetImportInfo>& value);
+  /**
+   * @brief Getter property for DatasetImportInfoList
+   * @return Value of DatasetImportInfoList
+   */
+  QList<ImportHDF5Dataset::DatasetImportInfo> getDatasetImportInfoList() const;
+
   Q_PROPERTY(QList<DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
 
   QString getHDF5Dimensions();
   Q_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
+  /**
+   * @brief Setter property for SelectedAttributeMatrix
+   */
+  void setSelectedAttributeMatrix(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedAttributeMatrix
+   * @return Value of SelectedAttributeMatrix
+   */
+  DataArrayPath getSelectedAttributeMatrix() const;
+
   Q_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
 
-  SIMPL_FILTER_PARAMETER(QStringList, DatasetPathsWithErrors)
+  /**
+   * @brief Setter property for DatasetPathsWithErrors
+   */
+  void setDatasetPathsWithErrors(const QStringList& value);
+  /**
+   * @brief Getter property for DatasetPathsWithErrors
+   * @return Value of DatasetPathsWithErrors
+   */
+  QStringList getDatasetPathsWithErrors() const;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -116,23 +189,23 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -186,9 +259,14 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   void initialize();
 
 private:
+  QString m_HDF5FilePath = {};
+  QList<ImportHDF5Dataset::DatasetImportInfo> m_DatasetImportInfoList = {};
+  DataArrayPath m_SelectedAttributeMatrix = {};
+  QStringList m_DatasetPathsWithErrors = {};
+
   QString m_HDF5Dimensions = "";
 
-  IDataArray::Pointer readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, std::vector<size_t> cDims, bool metaDataOnly);
+  IDataArrayShPtrType readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, const std::vector<size_t>& cDims, bool metaDataOnly);
 
   /**
    * @brief createComponentDimensions
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 685e69c0bc..afefcd820c 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "InitializeData.h"
 
 #include <random>
@@ -41,7 +43,10 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTime>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
@@ -50,7 +55,8 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -528,7 +534,7 @@ AbstractFilter::Pointer InitializeData::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getCompiledLibraryName() const
+QString InitializeData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -536,7 +542,7 @@ const QString InitializeData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getBrandingString() const
+QString InitializeData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -544,7 +550,7 @@ const QString InitializeData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getFilterVersion() const
+QString InitializeData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -554,7 +560,7 @@ const QString InitializeData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getGroupName() const
+QString InitializeData::getGroupName() const
 {
   return SIMPL::FilterGroups::ProcessingFilters;
 }
@@ -562,7 +568,7 @@ const QString InitializeData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid InitializeData::getUuid()
+QUuid InitializeData::getUuid() const
 {
   return QUuid("{dfab9921-fea3-521c-99ba-48db98e43ff8}");
 }
@@ -570,7 +576,7 @@ const QUuid InitializeData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getSubGroupName() const
+QString InitializeData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ConversionFilters;
 }
@@ -578,7 +584,168 @@ const QString InitializeData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString InitializeData::getHumanLabel() const
+QString InitializeData::getHumanLabel() const
 {
   return "Initialize Data";
 }
+
+// -----------------------------------------------------------------------------
+InitializeData::Pointer InitializeData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<InitializeData> InitializeData::New()
+{
+  struct make_shared_enabler : public InitializeData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString InitializeData::getNameOfClass() const
+{
+  return QString("InitializeData");
+}
+
+// -----------------------------------------------------------------------------
+QString InitializeData::ClassName()
+{
+  return QString("InitializeData");
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setCellAttributeMatrixPaths(const QVector<DataArrayPath>& value)
+{
+  m_CellAttributeMatrixPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> InitializeData::getCellAttributeMatrixPaths() const
+{
+  return m_CellAttributeMatrixPaths;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setXMin(int value)
+{
+  m_XMin = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getXMin() const
+{
+  return m_XMin;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setYMin(int value)
+{
+  m_YMin = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getYMin() const
+{
+  return m_YMin;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setZMin(int value)
+{
+  m_ZMin = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getZMin() const
+{
+  return m_ZMin;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setXMax(int value)
+{
+  m_XMax = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getXMax() const
+{
+  return m_XMax;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setYMax(int value)
+{
+  m_YMax = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getYMax() const
+{
+  return m_YMax;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setZMax(int value)
+{
+  m_ZMax = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getZMax() const
+{
+  return m_ZMax;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setInitType(int value)
+{
+  m_InitType = value;
+}
+
+// -----------------------------------------------------------------------------
+int InitializeData::getInitType() const
+{
+  return m_InitType;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setRandom(bool value)
+{
+  m_Random = value;
+}
+
+// -----------------------------------------------------------------------------
+bool InitializeData::getRandom() const
+{
+  return m_Random;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setInitValue(double value)
+{
+  m_InitValue = value;
+}
+
+// -----------------------------------------------------------------------------
+double InitializeData::getInitValue() const
+{
+  return m_InitValue;
+}
+
+// -----------------------------------------------------------------------------
+void InitializeData::setInitRange(const FPRangePair& value)
+{
+  m_InitRange = value;
+}
+
+// -----------------------------------------------------------------------------
+FPRangePair InitializeData::getInitRange() const
+{
+  return m_InitRange;
+}
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 04f7d6bbfa..f4118b4e6c 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -35,12 +35,16 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QVector>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
  * @brief The InitializeData class. See [Filter documentation](@ref initializedata) for details.
@@ -48,76 +52,215 @@
 class SIMPLib_EXPORT InitializeData : public AbstractFilter
 {
   Q_OBJECT
-    PYB11_CREATE_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
-    PYB11_PROPERTY(int XMin READ getXMin WRITE setXMin)
-    PYB11_PROPERTY(int YMin READ getYMin WRITE setYMin)
-    PYB11_PROPERTY(int ZMin READ getZMin WRITE setZMin)
-    PYB11_PROPERTY(int XMax READ getXMax WRITE setXMax)
-    PYB11_PROPERTY(int YMax READ getYMax WRITE setYMax)
-    PYB11_PROPERTY(int ZMax READ getZMax WRITE setZMax)
-    PYB11_PROPERTY(int InitType READ getInitType WRITE setInitType)
-    PYB11_PROPERTY(bool Random READ getRandom WRITE setRandom)
-    PYB11_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
-    PYB11_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(InitializeData)
+  PYB11_FILTER_NEW_MACRO(InitializeData)
+  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, CellAttributeMatrixPaths)
+  PYB11_FILTER_PARAMETER(int, XMin)
+  PYB11_FILTER_PARAMETER(int, YMin)
+  PYB11_FILTER_PARAMETER(int, ZMin)
+  PYB11_FILTER_PARAMETER(int, XMax)
+  PYB11_FILTER_PARAMETER(int, YMax)
+  PYB11_FILTER_PARAMETER(int, ZMax)
+  PYB11_FILTER_PARAMETER(int, InitType)
+  PYB11_FILTER_PARAMETER(bool, Random)
+  PYB11_FILTER_PARAMETER(double, InitValue)
+  PYB11_FILTER_PARAMETER(FPRangePair, InitRange)
+  PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
+  PYB11_PROPERTY(int XMin READ getXMin WRITE setXMin)
+  PYB11_PROPERTY(int YMin READ getYMin WRITE setYMin)
+  PYB11_PROPERTY(int ZMin READ getZMin WRITE setZMin)
+  PYB11_PROPERTY(int XMax READ getXMax WRITE setXMax)
+  PYB11_PROPERTY(int YMax READ getYMax WRITE setYMax)
+  PYB11_PROPERTY(int ZMax READ getZMax WRITE setZMax)
+  PYB11_PROPERTY(int InitType READ getInitType WRITE setInitType)
+  PYB11_PROPERTY(bool Random READ getRandom WRITE setRandom)
+  PYB11_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
+  PYB11_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
+#endif
+
 public:
-  SIMPL_SHARED_POINTERS(InitializeData)
-  SIMPL_FILTER_NEW_MACRO(InitializeData)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(InitializeData, AbstractFilter)
+  using Self = InitializeData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for InitializeData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for InitializeData
+   */
+  static QString ClassName();
 
   ~InitializeData() override;
 
-  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, CellAttributeMatrixPaths)
+  /**
+   * @brief Setter property for CellAttributeMatrixPaths
+   */
+  void setCellAttributeMatrixPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for CellAttributeMatrixPaths
+   * @return Value of CellAttributeMatrixPaths
+   */
+  QVector<DataArrayPath> getCellAttributeMatrixPaths() const;
+
   Q_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
 
-  SIMPL_FILTER_PARAMETER(int, XMin)
+  /**
+   * @brief Setter property for XMin
+   */
+  void setXMin(int value);
+  /**
+   * @brief Getter property for XMin
+   * @return Value of XMin
+   */
+  int getXMin() const;
+
   Q_PROPERTY(int XMin READ getXMin WRITE setXMin)
 
-  SIMPL_FILTER_PARAMETER(int, YMin)
+  /**
+   * @brief Setter property for YMin
+   */
+  void setYMin(int value);
+  /**
+   * @brief Getter property for YMin
+   * @return Value of YMin
+   */
+  int getYMin() const;
+
   Q_PROPERTY(int YMin READ getYMin WRITE setYMin)
 
-  SIMPL_FILTER_PARAMETER(int, ZMin)
+  /**
+   * @brief Setter property for ZMin
+   */
+  void setZMin(int value);
+  /**
+   * @brief Getter property for ZMin
+   * @return Value of ZMin
+   */
+  int getZMin() const;
+
   Q_PROPERTY(int ZMin READ getZMin WRITE setZMin)
 
-  SIMPL_FILTER_PARAMETER(int, XMax)
+  /**
+   * @brief Setter property for XMax
+   */
+  void setXMax(int value);
+  /**
+   * @brief Getter property for XMax
+   * @return Value of XMax
+   */
+  int getXMax() const;
+
   Q_PROPERTY(int XMax READ getXMax WRITE setXMax)
 
-  SIMPL_FILTER_PARAMETER(int, YMax)
+  /**
+   * @brief Setter property for YMax
+   */
+  void setYMax(int value);
+  /**
+   * @brief Getter property for YMax
+   * @return Value of YMax
+   */
+  int getYMax() const;
+
   Q_PROPERTY(int YMax READ getYMax WRITE setYMax)
 
-  SIMPL_FILTER_PARAMETER(int, ZMax)
+  /**
+   * @brief Setter property for ZMax
+   */
+  void setZMax(int value);
+  /**
+   * @brief Getter property for ZMax
+   * @return Value of ZMax
+   */
+  int getZMax() const;
+
   Q_PROPERTY(int ZMax READ getZMax WRITE setZMax)
 
-  SIMPL_FILTER_PARAMETER(int, InitType)
+  /**
+   * @brief Setter property for InitType
+   */
+  void setInitType(int value);
+  /**
+   * @brief Getter property for InitType
+   * @return Value of InitType
+   */
+  int getInitType() const;
+
   Q_PROPERTY(int InitType READ getInitType WRITE setInitType)
 
-  SIMPL_FILTER_PARAMETER(bool, Random)
+  /**
+   * @brief Setter property for Random
+   */
+  void setRandom(bool value);
+  /**
+   * @brief Getter property for Random
+   * @return Value of Random
+   */
+  bool getRandom() const;
+
   Q_PROPERTY(bool Random READ getRandom WRITE setRandom)
 
-  SIMPL_FILTER_PARAMETER(double, InitValue)
+  /**
+   * @brief Setter property for InitValue
+   */
+  void setInitValue(double value);
+  /**
+   * @brief Getter property for InitValue
+   * @return Value of InitValue
+   */
+  double getInitValue() const;
+
   Q_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
 
-  SIMPL_FILTER_PARAMETER(FPRangePair, InitRange)
+  /**
+   * @brief Setter property for InitRange
+   */
+  void setInitRange(const FPRangePair& value);
+  /**
+   * @brief Getter property for InitRange
+   * @return Value of InitRange
+   */
+  FPRangePair getInitRange() const;
+
   Q_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -127,23 +270,23 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -201,6 +344,18 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   void initialize();
 
 private:
+  QVector<DataArrayPath> m_CellAttributeMatrixPaths = {};
+  int m_XMin = {};
+  int m_YMin = {};
+  int m_ZMin = {};
+  int m_XMax = {};
+  int m_YMax = {};
+  int m_ZMax = {};
+  int m_InitType = {};
+  bool m_Random = {};
+  double m_InitValue = {};
+  FPRangePair m_InitRange = {};
+
   enum InitChoices
   {
     Manual,
@@ -216,7 +371,8 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   * @param p The array that will be initialized
   * @param dims The dimensions of the array p
   */
-  template <typename T> void initializeArrayWithInts(IDataArray::Pointer p, int64_t dims[3]);
+  template <typename T>
+  void initializeArrayWithInts(IDataArrayShPtrType p, int64_t dims[3]);
 
   /**
   * @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
@@ -227,13 +383,15 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   * @param p The array that will be initialized
   * @param dims The dimensions of the array p
   */
-  template <typename T> void initializeArrayWithReals(IDataArray::Pointer p, int64_t dims[3]);
+  template <typename T>
+  void initializeArrayWithReals(IDataArrayShPtrType p, int64_t dims[3]);
 
   /**
   * @brief checkInitialization Checks that the chosen initialization value/range is inside
   * the bounds of the array type
   */
-  template <typename T> void checkInitialization(IDataArray::Pointer p);
+  template <typename T>
+  void checkInitialization(IDataArrayShPtrType p);
 
 public:
   InitializeData(const InitializeData&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 98470ecc60..eb1d9cdc59 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "LinkFeatureMapToElementArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -43,6 +48,8 @@
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   AttributeMatrixID = 1,
@@ -223,7 +230,7 @@ AbstractFilter::Pointer LinkFeatureMapToElementArray::newFilterInstance(bool cop
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getCompiledLibraryName() const
+QString LinkFeatureMapToElementArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -231,7 +238,7 @@ const QString LinkFeatureMapToElementArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getBrandingString() const
+QString LinkFeatureMapToElementArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -239,7 +246,7 @@ const QString LinkFeatureMapToElementArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getFilterVersion() const
+QString LinkFeatureMapToElementArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -250,7 +257,7 @@ const QString LinkFeatureMapToElementArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getGroupName() const
+QString LinkFeatureMapToElementArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -258,7 +265,7 @@ const QString LinkFeatureMapToElementArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid LinkFeatureMapToElementArray::getUuid()
+QUuid LinkFeatureMapToElementArray::getUuid() const
 {
   return QUuid("{0e1c45f6-ed7a-5279-8a5c-a2d5cc6bfead}");
 }
@@ -266,7 +273,7 @@ const QUuid LinkFeatureMapToElementArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getSubGroupName() const
+QString LinkFeatureMapToElementArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -274,7 +281,72 @@ const QString LinkFeatureMapToElementArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString LinkFeatureMapToElementArray::getHumanLabel() const
+QString LinkFeatureMapToElementArray::getHumanLabel() const
 {
   return "Link Feature Attribute Matrix to Element Attribute Array";
 }
+
+// -----------------------------------------------------------------------------
+LinkFeatureMapToElementArray::Pointer LinkFeatureMapToElementArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<LinkFeatureMapToElementArray> LinkFeatureMapToElementArray::New()
+{
+  struct make_shared_enabler : public LinkFeatureMapToElementArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkFeatureMapToElementArray::getNameOfClass() const
+{
+  return QString("LinkFeatureMapToElementArray");
+}
+
+// -----------------------------------------------------------------------------
+QString LinkFeatureMapToElementArray::ClassName()
+{
+  return QString("LinkFeatureMapToElementArray");
+}
+
+// -----------------------------------------------------------------------------
+void LinkFeatureMapToElementArray::setCellFeatureAttributeMatrixName(const QString& value)
+{
+  m_CellFeatureAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkFeatureMapToElementArray::getCellFeatureAttributeMatrixName() const
+{
+  return m_CellFeatureAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void LinkFeatureMapToElementArray::setSelectedCellArrayPath(const DataArrayPath& value)
+{
+  m_SelectedCellArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath LinkFeatureMapToElementArray::getSelectedCellArrayPath() const
+{
+  return m_SelectedCellArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void LinkFeatureMapToElementArray::setActiveArrayName(const QString& value)
+{
+  m_ActiveArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkFeatureMapToElementArray::getActiveArrayName() const
+{
+  return m_ActiveArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index ceb91bb861..e0319b5014 100755
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -36,9 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The LinkFeatureMapToElementArray class. See [Filter documentation](@ref linkfeaturemaptoelementarray) for details.
@@ -46,45 +48,94 @@
 class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(LinkFeatureMapToElementArray)
+    PYB11_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
+    PYB11_FILTER_PARAMETER(QString, CellFeatureAttributeMatrixName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
+    PYB11_FILTER_PARAMETER(QString, ActiveArrayName)
     PYB11_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
     PYB11_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(LinkFeatureMapToElementArray)
-    SIMPL_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkFeatureMapToElementArray, AbstractFilter)
+    using Self = LinkFeatureMapToElementArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<LinkFeatureMapToElementArray> New();
+
+    /**
+     * @brief Returns the name of the class for LinkFeatureMapToElementArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for LinkFeatureMapToElementArray
+     */
+    static QString ClassName();
 
     ~LinkFeatureMapToElementArray() override;
 
-    SIMPL_FILTER_PARAMETER(QString, CellFeatureAttributeMatrixName)
+    /**
+     * @brief Setter property for CellFeatureAttributeMatrixName
+     */
+    void setCellFeatureAttributeMatrixName(const QString& value);
+    /**
+     * @brief Getter property for CellFeatureAttributeMatrixName
+     * @return Value of CellFeatureAttributeMatrixName
+     */
+    QString getCellFeatureAttributeMatrixName() const;
+
     Q_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
+    /**
+     * @brief Setter property for SelectedCellArrayPath
+     */
+    void setSelectedCellArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedCellArrayPath
+     * @return Value of SelectedCellArrayPath
+     */
+    DataArrayPath getSelectedCellArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
 
-    SIMPL_FILTER_PARAMETER(QString, ActiveArrayName)
+    /**
+     * @brief Setter property for ActiveArrayName
+     */
+    void setActiveArrayName(const QString& value);
+    /**
+     * @brief Getter property for ActiveArrayName
+     * @return Value of ActiveArrayName
+     */
+    QString getActiveArrayName() const;
+
     Q_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -94,23 +145,23 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -174,8 +225,14 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
     void updateFeatureInstancePointers();
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(int32_t, SelectedCellData)
-    DEFINE_DATAARRAY_VARIABLE(bool, Active)
+    std::weak_ptr<DataArray<int32_t>> m_SelectedCellDataPtr;
+    int32_t* m_SelectedCellData = nullptr;
+    std::weak_ptr<DataArray<bool>> m_ActivePtr;
+    bool* m_Active = nullptr;
+
+    QString m_CellFeatureAttributeMatrixName = {};
+    DataArrayPath m_SelectedCellArrayPath = {};
+    QString m_ActiveArrayName = {};
 
   public:
     LinkFeatureMapToElementArray(const LinkFeatureMapToElementArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 08fff67807..20df6b39a9 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -37,10 +37,14 @@
 
 #include <QtCore/QJsonDocument>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -215,7 +219,7 @@ AbstractFilter::Pointer MaskCountDecision::newFilterInstance(bool copyFilterPara
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MaskCountDecision::getCompiledLibraryName() const
+QString MaskCountDecision::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -223,7 +227,7 @@ const QString MaskCountDecision::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MaskCountDecision::getGroupName() const
+QString MaskCountDecision::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -231,7 +235,7 @@ const QString MaskCountDecision::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MaskCountDecision::getUuid()
+QUuid MaskCountDecision::getUuid() const
 {
   return QUuid("{34a19028-c50b-5dea-af0e-e06c798d3686}");
 }
@@ -239,7 +243,7 @@ const QUuid MaskCountDecision::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MaskCountDecision::getSubGroupName() const
+QString MaskCountDecision::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -247,7 +251,56 @@ const QString MaskCountDecision::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MaskCountDecision::getHumanLabel() const
+QString MaskCountDecision::getHumanLabel() const
 {
   return "Mask Count Decision";
 }
+
+// -----------------------------------------------------------------------------
+MaskCountDecision::Pointer MaskCountDecision::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MaskCountDecision::Pointer MaskCountDecision::New()
+{
+  Pointer sharedPtr(new(MaskCountDecision));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MaskCountDecision::getNameOfClass() const
+{
+  return QString("MaskCountDecision");
+}
+
+// -----------------------------------------------------------------------------
+QString MaskCountDecision::ClassName()
+{
+  return QString("MaskCountDecision");
+}
+
+// -----------------------------------------------------------------------------
+void MaskCountDecision::setMaskArrayPath(const DataArrayPath& value)
+{
+  m_MaskArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MaskCountDecision::getMaskArrayPath() const
+{
+  return m_MaskArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void MaskCountDecision::setNumberOfTrues(int value)
+{
+  m_NumberOfTrues = value;
+}
+
+// -----------------------------------------------------------------------------
+int MaskCountDecision::getNumberOfTrues() const
+{
+  return m_NumberOfTrues;
+}
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 4be2d1cd70..c6dc738887 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -36,11 +36,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The MaskCountDecision class. See [Filter documentation](@ref MaskCountDecision) for details.
@@ -48,21 +50,60 @@
 class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(MaskCountDecision)
+    PYB11_STATIC_NEW_MACRO(MaskCountDecision)
+    PYB11_FILTER_PARAMETER(DataArrayPath, MaskArrayPath)
+    PYB11_FILTER_PARAMETER(int, NumberOfTrues)
     PYB11_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
     PYB11_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(MaskCountDecision)
-    SIMPL_STATIC_NEW_MACRO(MaskCountDecision)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MaskCountDecision, AbstractDecisionFilter)
+    using Self = MaskCountDecision;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for MaskCountDecision
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MaskCountDecision
+     */
+    static QString ClassName();
 
     ~MaskCountDecision() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, MaskArrayPath)
+    /**
+     * @brief Setter property for MaskArrayPath
+     */
+    void setMaskArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for MaskArrayPath
+     * @return Value of MaskArrayPath
+     */
+    DataArrayPath getMaskArrayPath() const;
+
     Q_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
 
-    SIMPL_FILTER_PARAMETER(int, NumberOfTrues)
+    /**
+     * @brief Setter property for NumberOfTrues
+     */
+    void setNumberOfTrues(int value);
+    /**
+     * @brief Getter property for NumberOfTrues
+     * @return Value of NumberOfTrues
+     */
+    int getNumberOfTrues() const;
+
     Q_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
 
     /**
@@ -74,7 +115,7 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -84,23 +125,23 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -136,7 +177,11 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(bool, Mask)
+    std::weak_ptr<DataArray<bool>> m_MaskPtr;
+    bool* m_Mask = nullptr;
+
+    DataArrayPath m_MaskArrayPath = {};
+    int m_NumberOfTrues = {};
 
   public:
     MaskCountDecision(const MaskCountDecision&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index cc0291fe0c..8b782df75e 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -33,12 +33,18 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MassCreateData.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   DataContainerBaseID = 1
@@ -151,7 +157,7 @@ AbstractFilter::Pointer MassCreateData::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getCompiledLibraryName() const
+QString MassCreateData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -159,7 +165,7 @@ const QString MassCreateData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getBrandingString() const
+QString MassCreateData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -167,7 +173,7 @@ const QString MassCreateData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getFilterVersion() const
+QString MassCreateData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -178,7 +184,7 @@ const QString MassCreateData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getGroupName() const
+QString MassCreateData::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -186,7 +192,7 @@ const QString MassCreateData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getHumanLabel() const
+QString MassCreateData::getHumanLabel() const
 {
   return "Mass Create Data Containers";
 }
@@ -194,7 +200,7 @@ const QString MassCreateData::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MassCreateData::getUuid()
+QUuid MassCreateData::getUuid() const
 {
   return QUuid("{816fbe6b-7c38-581b-b149-3f839fb65b95}");
 }
@@ -202,7 +208,48 @@ const QUuid MassCreateData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MassCreateData::getSubGroupName() const
+QString MassCreateData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::GenerationFilters;
 }
+
+// -----------------------------------------------------------------------------
+MassCreateData::Pointer MassCreateData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MassCreateData> MassCreateData::New()
+{
+  struct make_shared_enabler : public MassCreateData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MassCreateData::getNameOfClass() const
+{
+  return QString("MassCreateData");
+}
+
+// -----------------------------------------------------------------------------
+QString MassCreateData::ClassName()
+{
+  return QString("MassCreateData");
+}
+
+// -----------------------------------------------------------------------------
+void MassCreateData::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MassCreateData::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index 78ce86849a..6c25f7e2e5 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The MassCreateData class. See [Filter documentation](@ref MassCreateData) for details.
@@ -46,123 +47,164 @@
 class SIMPLib_EXPORT MassCreateData : public AbstractFilter
 {
   Q_OBJECT
-    PYB11_CREATE_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
-    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-
-  public:
-    SIMPL_SHARED_POINTERS(MassCreateData)
-    SIMPL_FILTER_NEW_MACRO(MassCreateData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MassCreateData, AbstractFilter)
-
-    ~MassCreateData() override;
-
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    const QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    const QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-    /**
-     * @brief preflight Reimplemented from @see AbstractFilter class
-     */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
-  protected:
-    MassCreateData();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck();
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    MassCreateData(const MassCreateData&) = delete;            // Copy Constructor Not Implemented
-    MassCreateData(MassCreateData&&) = delete;                 // Move Constructor Not Implemented
-    MassCreateData& operator=(const MassCreateData&) = delete; // Copy Assignment Not Implemented
-    MassCreateData& operator=(MassCreateData&&) = delete;      // Move Assignment Not Implemented
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(MassCreateData)
+  PYB11_FILTER_NEW_MACRO(MassCreateData)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+#endif
+
+public:
+  using Self = MassCreateData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for MassCreateData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MassCreateData
+   */
+  static QString ClassName();
+
+  ~MassCreateData() override;
+
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  MassCreateData();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  MassCreateData(const MassCreateData&) = delete;            // Copy Constructor Not Implemented
+  MassCreateData(MassCreateData&&) = delete;                 // Move Constructor Not Implemented
+  MassCreateData& operator=(const MassCreateData&) = delete; // Copy Assignment Not Implemented
+  MassCreateData& operator=(MassCreateData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_DataContainerName = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index b4bc776ec4..e78d008bef 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MoveData.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -43,6 +48,8 @@
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace
 {
@@ -250,7 +257,7 @@ AbstractFilter::Pointer MoveData::newFilterInstance(bool copyFilterParameters) c
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getCompiledLibraryName() const
+QString MoveData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -258,7 +265,7 @@ const QString MoveData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getBrandingString() const
+QString MoveData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -266,7 +273,7 @@ const QString MoveData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getFilterVersion() const
+QString MoveData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -277,7 +284,7 @@ const QString MoveData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getGroupName() const
+QString MoveData::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -285,7 +292,7 @@ const QString MoveData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MoveData::getUuid()
+QUuid MoveData::getUuid() const
 {
   return QUuid("{fe2cbe09-8ae1-5bea-9397-fd5741091fdb}");
 }
@@ -293,7 +300,7 @@ const QUuid MoveData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getSubGroupName() const
+QString MoveData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -301,7 +308,96 @@ const QString MoveData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveData::getHumanLabel() const
+QString MoveData::getHumanLabel() const
 {
   return "Move Data";
 }
+
+// -----------------------------------------------------------------------------
+MoveData::Pointer MoveData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MoveData> MoveData::New()
+{
+  struct make_shared_enabler : public MoveData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MoveData::getNameOfClass() const
+{
+  return QString("MoveData");
+}
+
+// -----------------------------------------------------------------------------
+QString MoveData::ClassName()
+{
+  return QString("MoveData");
+}
+
+// -----------------------------------------------------------------------------
+void MoveData::setWhatToMove(int value)
+{
+  m_WhatToMove = value;
+}
+
+// -----------------------------------------------------------------------------
+int MoveData::getWhatToMove() const
+{
+  return m_WhatToMove;
+}
+
+// -----------------------------------------------------------------------------
+void MoveData::setDataContainerDestination(const DataArrayPath& value)
+{
+  m_DataContainerDestination = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveData::getDataContainerDestination() const
+{
+  return m_DataContainerDestination;
+}
+
+// -----------------------------------------------------------------------------
+void MoveData::setAttributeMatrixSource(const DataArrayPath& value)
+{
+  m_AttributeMatrixSource = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveData::getAttributeMatrixSource() const
+{
+  return m_AttributeMatrixSource;
+}
+
+// -----------------------------------------------------------------------------
+void MoveData::setAttributeMatrixDestination(const DataArrayPath& value)
+{
+  m_AttributeMatrixDestination = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveData::getAttributeMatrixDestination() const
+{
+  return m_AttributeMatrixDestination;
+}
+
+// -----------------------------------------------------------------------------
+void MoveData::setDataArraySource(const DataArrayPath& value)
+{
+  m_DataArraySource = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveData::getDataArraySource() const
+{
+  return m_DataArraySource;
+}
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index ace6546c88..f53d8b7795 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The MoveData class. See [Filter documentation](@ref movedata) for details.
@@ -46,53 +47,122 @@
 class SIMPLib_EXPORT MoveData : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(MoveData SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(MoveData)
+    PYB11_FILTER_NEW_MACRO(MoveData)
+    PYB11_FILTER_PARAMETER(int, WhatToMove)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixSource)
+    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataArraySource)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
     PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(MoveData)
-    SIMPL_FILTER_NEW_MACRO(MoveData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MoveData, AbstractFilter)
+    using Self = MoveData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<MoveData> New();
+
+    /**
+     * @brief Returns the name of the class for MoveData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MoveData
+     */
+    static QString ClassName();
 
     ~MoveData() override;
 
-    SIMPL_FILTER_PARAMETER(int, WhatToMove)
+    /**
+     * @brief Setter property for WhatToMove
+     */
+    void setWhatToMove(int value);
+    /**
+     * @brief Getter property for WhatToMove
+     * @return Value of WhatToMove
+     */
+    int getWhatToMove() const;
+
     Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    /**
+     * @brief Setter property for DataContainerDestination
+     */
+    void setDataContainerDestination(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerDestination
+     * @return Value of DataContainerDestination
+     */
+    DataArrayPath getDataContainerDestination() const;
+
     Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixSource)
+    /**
+     * @brief Setter property for AttributeMatrixSource
+     */
+    void setAttributeMatrixSource(const DataArrayPath& value);
+    /**
+     * @brief Getter property for AttributeMatrixSource
+     * @return Value of AttributeMatrixSource
+     */
+    DataArrayPath getAttributeMatrixSource() const;
+
     Q_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
+    /**
+     * @brief Setter property for AttributeMatrixDestination
+     */
+    void setAttributeMatrixDestination(const DataArrayPath& value);
+    /**
+     * @brief Getter property for AttributeMatrixDestination
+     * @return Value of AttributeMatrixDestination
+     */
+    DataArrayPath getAttributeMatrixDestination() const;
+
     Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataArraySource)
+    /**
+     * @brief Setter property for DataArraySource
+     */
+    void setDataArraySource(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataArraySource
+     * @return Value of DataArraySource
+     */
+    DataArrayPath getDataArraySource() const;
+
     Q_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -102,23 +172,23 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -181,5 +251,12 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     MoveData(MoveData&&) = delete;            // Move Constructor Not Implemented
     MoveData& operator=(const MoveData&) = delete; // Copy Assignment Not Implemented
     MoveData& operator=(MoveData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    int m_WhatToMove = {};
+    DataArrayPath m_DataContainerDestination = {};
+    DataArrayPath m_AttributeMatrixSource = {};
+    DataArrayPath m_AttributeMatrixDestination = {};
+    DataArrayPath m_DataArraySource = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 3969846edb..ed2dcea67e 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MoveMultiData.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -45,6 +50,8 @@
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace
 {
@@ -268,7 +275,7 @@ AbstractFilter::Pointer MoveMultiData::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getCompiledLibraryName() const
+QString MoveMultiData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -276,7 +283,7 @@ const QString MoveMultiData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getBrandingString() const
+QString MoveMultiData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -284,7 +291,7 @@ const QString MoveMultiData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getFilterVersion() const
+QString MoveMultiData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -295,7 +302,7 @@ const QString MoveMultiData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getGroupName() const
+QString MoveMultiData::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -303,7 +310,7 @@ const QString MoveMultiData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MoveMultiData::getUuid()
+QUuid MoveMultiData::getUuid() const
 {
   return QUuid("{e3702900-a6c1-59e1-9180-b57557a7b193}");
 }
@@ -311,7 +318,7 @@ const QUuid MoveMultiData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getSubGroupName() const
+QString MoveMultiData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -319,7 +326,96 @@ const QString MoveMultiData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MoveMultiData::getHumanLabel() const
+QString MoveMultiData::getHumanLabel() const
 {
   return "Move Multi Data";
 }
+
+// -----------------------------------------------------------------------------
+MoveMultiData::Pointer MoveMultiData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MoveMultiData> MoveMultiData::New()
+{
+  struct make_shared_enabler : public MoveMultiData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MoveMultiData::getNameOfClass() const
+{
+  return QString("MoveMultiData");
+}
+
+// -----------------------------------------------------------------------------
+QString MoveMultiData::ClassName()
+{
+  return QString("MoveMultiData");
+}
+
+// -----------------------------------------------------------------------------
+void MoveMultiData::setWhatToMove(int value)
+{
+  m_WhatToMove = value;
+}
+
+// -----------------------------------------------------------------------------
+int MoveMultiData::getWhatToMove() const
+{
+  return m_WhatToMove;
+}
+
+// -----------------------------------------------------------------------------
+void MoveMultiData::setDataContainerDestination(const DataArrayPath& value)
+{
+  m_DataContainerDestination = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveMultiData::getDataContainerDestination() const
+{
+  return m_DataContainerDestination;
+}
+
+// -----------------------------------------------------------------------------
+void MoveMultiData::setAttributeMatrixSources(const QVector<DataArrayPath>& value)
+{
+  m_AttributeMatrixSources = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> MoveMultiData::getAttributeMatrixSources() const
+{
+  return m_AttributeMatrixSources;
+}
+
+// -----------------------------------------------------------------------------
+void MoveMultiData::setAttributeMatrixDestination(const DataArrayPath& value)
+{
+  m_AttributeMatrixDestination = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath MoveMultiData::getAttributeMatrixDestination() const
+{
+  return m_AttributeMatrixDestination;
+}
+
+// -----------------------------------------------------------------------------
+void MoveMultiData::setDataArraySources(const QVector<DataArrayPath>& value)
+{
+  m_DataArraySources = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> MoveMultiData::getDataArraySources() const
+{
+  return m_DataArraySources;
+}
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 80b942c24b..eb1a6ebdc4 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The MoveMultiData class. See [Filter documentation](@ref MoveMultiData) for details.
@@ -46,53 +47,122 @@
 class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(MoveMultiData)
+    PYB11_FILTER_NEW_MACRO(MoveMultiData)
+    PYB11_FILTER_PARAMETER(int, WhatToMove)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, AttributeMatrixSources)
+    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
+    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, DataArraySources)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
     PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(MoveMultiData)
-    SIMPL_FILTER_NEW_MACRO(MoveMultiData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MoveMultiData, AbstractFilter)
+    using Self = MoveMultiData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<MoveMultiData> New();
+
+    /**
+     * @brief Returns the name of the class for MoveMultiData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MoveMultiData
+     */
+    static QString ClassName();
 
     ~MoveMultiData() override;
 
-    SIMPL_FILTER_PARAMETER(int, WhatToMove)
+    /**
+     * @brief Setter property for WhatToMove
+     */
+    void setWhatToMove(int value);
+    /**
+     * @brief Getter property for WhatToMove
+     * @return Value of WhatToMove
+     */
+    int getWhatToMove() const;
+
     Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
+    /**
+     * @brief Setter property for DataContainerDestination
+     */
+    void setDataContainerDestination(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerDestination
+     * @return Value of DataContainerDestination
+     */
+    DataArrayPath getDataContainerDestination() const;
+
     Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
 
-    SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, AttributeMatrixSources)
+    /**
+     * @brief Setter property for AttributeMatrixSources
+     */
+    void setAttributeMatrixSources(const QVector<DataArrayPath>& value);
+    /**
+     * @brief Getter property for AttributeMatrixSources
+     * @return Value of AttributeMatrixSources
+     */
+    QVector<DataArrayPath> getAttributeMatrixSources() const;
+
     Q_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
+    /**
+     * @brief Setter property for AttributeMatrixDestination
+     */
+    void setAttributeMatrixDestination(const DataArrayPath& value);
+    /**
+     * @brief Getter property for AttributeMatrixDestination
+     * @return Value of AttributeMatrixDestination
+     */
+    DataArrayPath getAttributeMatrixDestination() const;
+
     Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
 
-    SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, DataArraySources)
+    /**
+     * @brief Setter property for DataArraySources
+     */
+    void setDataArraySources(const QVector<DataArrayPath>& value);
+    /**
+     * @brief Getter property for DataArraySources
+     * @return Value of DataArraySources
+     */
+    QVector<DataArrayPath> getDataArraySources() const;
+
     Q_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -102,23 +172,23 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -181,5 +251,12 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     MoveMultiData(MoveMultiData&&) = delete;       // Move Constructor Not Implemented
     MoveMultiData& operator=(const MoveMultiData&) = delete; // Copy Assignment Not Implemented
     MoveMultiData& operator=(MoveMultiData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    int m_WhatToMove = {};
+    DataArrayPath m_DataContainerDestination = {};
+    QVector<DataArrayPath> m_AttributeMatrixSources = {};
+    DataArrayPath m_AttributeMatrixDestination = {};
+    QVector<DataArrayPath> m_DataArraySources = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index e943d2ca68..cb6bf421a8 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -33,15 +33,22 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MultiThresholdObjects.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   ThresholdArrayID = 1
@@ -209,7 +216,7 @@ void MultiThresholdObjects::execute()
   {
     ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(comp_0.compOperator), comp_0.compValue, m_DestinationPtr.lock().get());
     // Run the first threshold and store the results in our output array
-    int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comp_0.attributeArrayName).get(), m_DestinationPtr.lock().get());
+    int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comp_0.attributeArrayName), m_DestinationPtr.lock().get());
     if(err < 0)
     {
       DataArrayPath tempPath(comp_0.dataContainerName, comp_0.attributeMatrixName, comp_0.attributeArrayName);
@@ -237,7 +244,7 @@ void MultiThresholdObjects::execute()
 
       ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(compRef.compOperator), compRef.compValue, currentArrayPtr.get());
 
-      int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(compRef.attributeArrayName).get(), currentArrayPtr.get());
+      int32_t err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(compRef.attributeArrayName), currentArrayPtr.get());
       if(err < 0)
       {
         DataArrayPath tempPath(compRef.dataContainerName, compRef.attributeMatrixName, compRef.attributeArrayName);
@@ -272,7 +279,7 @@ AbstractFilter::Pointer MultiThresholdObjects::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getCompiledLibraryName() const
+QString MultiThresholdObjects::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -280,7 +287,7 @@ const QString MultiThresholdObjects::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getBrandingString() const
+QString MultiThresholdObjects::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -288,7 +295,7 @@ const QString MultiThresholdObjects::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getFilterVersion() const
+QString MultiThresholdObjects::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -298,7 +305,7 @@ const QString MultiThresholdObjects::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getGroupName() const
+QString MultiThresholdObjects::getGroupName() const
 {
   return SIMPL::FilterGroups::ProcessingFilters;
 }
@@ -306,7 +313,7 @@ const QString MultiThresholdObjects::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MultiThresholdObjects::getUuid()
+QUuid MultiThresholdObjects::getUuid() const
 {
   return QUuid("{014b7300-cf36-5ede-a751-5faf9b119dae}");
 }
@@ -314,7 +321,7 @@ const QUuid MultiThresholdObjects::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getSubGroupName() const
+QString MultiThresholdObjects::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ThresholdFilters;
 }
@@ -322,7 +329,60 @@ const QString MultiThresholdObjects::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects::getHumanLabel() const
+QString MultiThresholdObjects::getHumanLabel() const
 {
   return "Threshold Objects";
 }
+
+// -----------------------------------------------------------------------------
+MultiThresholdObjects::Pointer MultiThresholdObjects::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MultiThresholdObjects> MultiThresholdObjects::New()
+{
+  struct make_shared_enabler : public MultiThresholdObjects
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects::getNameOfClass() const
+{
+  return QString("MultiThresholdObjects");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects::ClassName()
+{
+  return QString("MultiThresholdObjects");
+}
+
+// -----------------------------------------------------------------------------
+void MultiThresholdObjects::setDestinationArrayName(const QString& value)
+{
+  m_DestinationArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects::getDestinationArrayName() const
+{
+  return m_DestinationArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MultiThresholdObjects::setSelectedThresholds(const ComparisonInputs& value)
+{
+  m_SelectedThresholds = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonInputs MultiThresholdObjects::getSelectedThresholds() const
+{
+  return m_SelectedThresholds;
+}
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index 6cc0dc3113..d433f8fe1b 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -36,10 +36,12 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The MultiThresholdObjects class. See [Filter documentation](@ref multithresholdobjects) for details.
@@ -47,41 +49,80 @@
 class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(MultiThresholdObjects)
+    PYB11_FILTER_NEW_MACRO(MultiThresholdObjects)
+    PYB11_FILTER_PARAMETER(QString, DestinationArrayName)
+    PYB11_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
     PYB11_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(MultiThresholdObjects)
-    SIMPL_FILTER_NEW_MACRO(MultiThresholdObjects)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiThresholdObjects, AbstractFilter)
+    using Self = MultiThresholdObjects;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<MultiThresholdObjects> New();
+
+    /**
+     * @brief Returns the name of the class for MultiThresholdObjects
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MultiThresholdObjects
+     */
+    static QString ClassName();
 
     ~MultiThresholdObjects() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DestinationArrayName)
+    /**
+     * @brief Setter property for DestinationArrayName
+     */
+    void setDestinationArrayName(const QString& value);
+    /**
+     * @brief Getter property for DestinationArrayName
+     * @return Value of DestinationArrayName
+     */
+    QString getDestinationArrayName() const;
+
     Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
 
-    SIMPL_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
+    /**
+     * @brief Setter property for SelectedThresholds
+     */
+    void setSelectedThresholds(const ComparisonInputs& value);
+    /**
+     * @brief Getter property for SelectedThresholds
+     * @return Value of SelectedThresholds
+     */
+    ComparisonInputs getSelectedThresholds() const;
+
     Q_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -91,23 +132,23 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -166,7 +207,11 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(bool, Destination)
+    std::weak_ptr<DataArray<bool>> m_DestinationPtr;
+    bool* m_Destination = nullptr;
+
+    QString m_DestinationArrayName = {};
+    ComparisonInputs m_SelectedThresholds = {};
 
   public:
     MultiThresholdObjects(const MultiThresholdObjects&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 8a94dcc47e..9a897416b2 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MultiThresholdObjects2.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
@@ -43,6 +48,8 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   ThresholdArrayID = 1
@@ -405,7 +412,7 @@ void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonV
 
   ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(compOperator), compValue, currentArrayPtr.get());
 
-  err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comparisonValue->getAttributeArrayName()).get(), currentArrayPtr.get());
+  err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comparisonValue->getAttributeArrayName()), currentArrayPtr.get());
   if (err < 0)
   {
     DataArrayPath tempPath(m_SelectedThresholds.getDataContainerName(), m_SelectedThresholds.getAttributeMatrixName(), comparisonValue->getAttributeArrayName());
@@ -445,7 +452,7 @@ AbstractFilter::Pointer MultiThresholdObjects2::newFilterInstance(bool copyFilte
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getCompiledLibraryName() const
+QString MultiThresholdObjects2::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -453,7 +460,7 @@ const QString MultiThresholdObjects2::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getBrandingString() const
+QString MultiThresholdObjects2::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -461,7 +468,7 @@ const QString MultiThresholdObjects2::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getFilterVersion() const
+QString MultiThresholdObjects2::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -471,7 +478,7 @@ const QString MultiThresholdObjects2::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getGroupName() const
+QString MultiThresholdObjects2::getGroupName() const
 {
   return SIMPL::FilterGroups::ProcessingFilters;
 }
@@ -479,7 +486,7 @@ const QString MultiThresholdObjects2::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MultiThresholdObjects2::getUuid()
+QUuid MultiThresholdObjects2::getUuid() const
 {
   return QUuid("{686d5393-2b02-5c86-b887-dd81a8ae80f2}");
 }
@@ -487,7 +494,7 @@ const QUuid MultiThresholdObjects2::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getSubGroupName() const
+QString MultiThresholdObjects2::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::ThresholdFilters;
 }
@@ -495,7 +502,60 @@ const QString MultiThresholdObjects2::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MultiThresholdObjects2::getHumanLabel() const
+QString MultiThresholdObjects2::getHumanLabel() const
 {
   return "Threshold Objects (Advanced)";
 }
+
+// -----------------------------------------------------------------------------
+MultiThresholdObjects2::Pointer MultiThresholdObjects2::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MultiThresholdObjects2> MultiThresholdObjects2::New()
+{
+  struct make_shared_enabler : public MultiThresholdObjects2
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects2::getNameOfClass() const
+{
+  return QString("MultiThresholdObjects2");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects2::ClassName()
+{
+  return QString("MultiThresholdObjects2");
+}
+
+// -----------------------------------------------------------------------------
+void MultiThresholdObjects2::setDestinationArrayName(const QString& value)
+{
+  m_DestinationArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiThresholdObjects2::getDestinationArrayName() const
+{
+  return m_DestinationArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MultiThresholdObjects2::setSelectedThresholds(const ComparisonInputsAdvanced& value)
+{
+  m_SelectedThresholds = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonInputsAdvanced MultiThresholdObjects2::getSelectedThresholds() const
+{
+  return m_SelectedThresholds;
+}
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index f0199ee439..3a80d2140f 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -36,12 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 #include "SIMPLib/Filtering/ComparisonSet.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The MultiThresholdObjects2 class. See [Filter documentation](@ref multithresholdobjects2) for details.
@@ -49,41 +51,80 @@
 class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(MultiThresholdObjects2)
+    PYB11_FILTER_NEW_MACRO(MultiThresholdObjects2)
+    PYB11_FILTER_PARAMETER(QString, DestinationArrayName)
+    PYB11_FILTER_PARAMETER(ComparisonInputsAdvanced, SelectedThresholds)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
     PYB11_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(MultiThresholdObjects2)
-    SIMPL_FILTER_NEW_MACRO(MultiThresholdObjects2)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiThresholdObjects2, AbstractFilter)
+    using Self = MultiThresholdObjects2;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<MultiThresholdObjects2> New();
+
+    /**
+     * @brief Returns the name of the class for MultiThresholdObjects2
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MultiThresholdObjects2
+     */
+    static QString ClassName();
 
     ~MultiThresholdObjects2() override;
 
-    SIMPL_FILTER_PARAMETER(QString, DestinationArrayName)
+    /**
+     * @brief Setter property for DestinationArrayName
+     */
+    void setDestinationArrayName(const QString& value);
+    /**
+     * @brief Getter property for DestinationArrayName
+     * @return Value of DestinationArrayName
+     */
+    QString getDestinationArrayName() const;
+
     Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
 
-    SIMPL_FILTER_PARAMETER(ComparisonInputsAdvanced, SelectedThresholds)
+    /**
+     * @brief Setter property for SelectedThresholds
+     */
+    void setSelectedThresholds(const ComparisonInputsAdvanced& value);
+    /**
+     * @brief Getter property for SelectedThresholds
+     * @return Value of SelectedThresholds
+     */
+    ComparisonInputsAdvanced getSelectedThresholds() const;
+
     Q_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -93,23 +134,23 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -210,7 +251,11 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
 
 
   private:
-    DEFINE_DATAARRAY_VARIABLE(bool, Destination)
+    std::weak_ptr<DataArray<bool>> m_DestinationPtr;
+    bool* m_Destination = nullptr;
+
+    QString m_DestinationArrayName = {};
+    ComparisonInputsAdvanced m_SelectedThresholds = {};
 
   public:
     MultiThresholdObjects2(const MultiThresholdObjects2&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index f5f228daea..a1d81e855a 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -31,9 +31,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "PipelineAnnotation.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ParagraphFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -120,7 +125,7 @@ AbstractFilter::Pointer PipelineAnnotation::newFilterInstance(bool copyFilterPar
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getCompiledLibraryName() const
+QString PipelineAnnotation::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -128,7 +133,7 @@ const QString PipelineAnnotation::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getBrandingString() const
+QString PipelineAnnotation::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -136,7 +141,7 @@ const QString PipelineAnnotation::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getFilterVersion() const
+QString PipelineAnnotation::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -147,7 +152,7 @@ const QString PipelineAnnotation::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getGroupName() const
+QString PipelineAnnotation::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -155,7 +160,7 @@ const QString PipelineAnnotation::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid PipelineAnnotation::getUuid()
+QUuid PipelineAnnotation::getUuid() const
 {
   return QUuid("{8cc2198b-6a9d-5bf4-b8c0-b0878bb57f10}");
 }
@@ -163,7 +168,7 @@ const QUuid PipelineAnnotation::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getSubGroupName() const
+QString PipelineAnnotation::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -171,7 +176,48 @@ const QString PipelineAnnotation::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PipelineAnnotation::getHumanLabel() const
+QString PipelineAnnotation::getHumanLabel() const
 {
   return "Pipeline Annotation";
 }
+
+// -----------------------------------------------------------------------------
+PipelineAnnotation::Pointer PipelineAnnotation::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<PipelineAnnotation> PipelineAnnotation::New()
+{
+  struct make_shared_enabler : public PipelineAnnotation
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineAnnotation::getNameOfClass() const
+{
+  return QString("PipelineAnnotation");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineAnnotation::ClassName()
+{
+  return QString("PipelineAnnotation");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineAnnotation::setSummary(const QString& value)
+{
+  m_Summary = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineAnnotation::getSummary() const
+{
+  return m_Summary;
+}
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index 7b2c0d2871..1d1ff6bb70 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -33,9 +33,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The PipelineAnnotation class. See [Filter documentation](@ref PipelineAnnotation) for details.
@@ -43,15 +44,53 @@
 class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(PipelineAnnotation SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(PipelineAnnotation)
+  PYB11_FILTER_NEW_MACRO(PipelineAnnotation)
+  PYB11_FILTER_PARAMETER(QString, Summary)
   PYB11_PROPERTY(QString Summary READ getSummary WRITE setSummary)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(PipelineAnnotation)
-  SIMPL_FILTER_NEW_MACRO(PipelineAnnotation)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PipelineAnnotation, AbstractFilter)
+  using Self = PipelineAnnotation;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineAnnotation
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineAnnotation
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for Summary
+   */
+  void setSummary(const QString& value);
+  /**
+   * @brief Getter property for Summary
+   * @return Value of Summary
+   */
+  QString getSummary() const;
 
-  SIMPL_FILTER_PARAMETER(QString, Summary)
   Q_PROPERTY(QString Summary READ getSummary WRITE setSummary)
 
   ~PipelineAnnotation() override;
@@ -59,21 +98,21 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -83,23 +122,23 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -156,5 +195,8 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   PipelineAnnotation(PipelineAnnotation&&) = delete;      // Move Constructor Not Implemented
   PipelineAnnotation& operator=(const PipelineAnnotation&) = delete; // Copy Assignment Not Implemented
   PipelineAnnotation& operator=(PipelineAnnotation&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_Summary = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index ce0cc08d75..c43a1c2673 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -30,6 +30,8 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "PostSlackMessage.h"
 
 #include <QtCore/QEventLoop>
@@ -40,7 +42,10 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -192,7 +197,7 @@ AbstractFilter::Pointer PostSlackMessage::newFilterInstance(bool copyFilterParam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getCompiledLibraryName() const
+QString PostSlackMessage::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -200,7 +205,7 @@ const QString PostSlackMessage::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getBrandingString() const
+QString PostSlackMessage::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -208,7 +213,7 @@ const QString PostSlackMessage::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getFilterVersion() const
+QString PostSlackMessage::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -219,7 +224,7 @@ const QString PostSlackMessage::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getGroupName() const
+QString PostSlackMessage::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -227,7 +232,7 @@ const QString PostSlackMessage::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid PostSlackMessage::getUuid()
+QUuid PostSlackMessage::getUuid() const
 {
   return QUuid("{0ca83462-8564-54ea-9f4e-e5141974f30b}");
 }
@@ -235,7 +240,7 @@ const QUuid PostSlackMessage::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getSubGroupName() const
+QString PostSlackMessage::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -243,7 +248,84 @@ const QString PostSlackMessage::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString PostSlackMessage::getHumanLabel() const
+QString PostSlackMessage::getHumanLabel() const
 {
   return "Post Slack Message";
 }
+
+// -----------------------------------------------------------------------------
+PostSlackMessage::Pointer PostSlackMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<PostSlackMessage> PostSlackMessage::New()
+{
+  struct make_shared_enabler : public PostSlackMessage
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString PostSlackMessage::getNameOfClass() const
+{
+  return QString("PostSlackMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString PostSlackMessage::ClassName()
+{
+  return QString("PostSlackMessage");
+}
+
+// -----------------------------------------------------------------------------
+void PostSlackMessage::setSlackUser(const QString& value)
+{
+  m_SlackUser = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PostSlackMessage::getSlackUser() const
+{
+  return m_SlackUser;
+}
+
+// -----------------------------------------------------------------------------
+void PostSlackMessage::setSlackUrl(const QString& value)
+{
+  m_SlackUrl = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PostSlackMessage::getSlackUrl() const
+{
+  return m_SlackUrl;
+}
+
+// -----------------------------------------------------------------------------
+void PostSlackMessage::setSlackMessage(const QString& value)
+{
+  m_SlackMessage = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PostSlackMessage::getSlackMessage() const
+{
+  return m_SlackMessage;
+}
+
+// -----------------------------------------------------------------------------
+void PostSlackMessage::setWarningsAsError(bool value)
+{
+  m_WarningsAsError = value;
+}
+
+// -----------------------------------------------------------------------------
+bool PostSlackMessage::getWarningsAsError() const
+{
+  return m_WarningsAsError;
+}
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index 7147ae61d0..0ce65485e1 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -32,11 +32,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QWaitCondition>
+#include <QtCore/QMutex>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
@@ -47,90 +49,158 @@ class QNetworkReply;
 class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(PostSlackMessage SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(PostSlackMessage)
+  PYB11_FILTER_NEW_MACRO(PostSlackMessage)
+  PYB11_FILTER_PARAMETER(QString, SlackUser)
+  PYB11_FILTER_PARAMETER(QString, SlackUrl)
+  PYB11_FILTER_PARAMETER(QString, SlackMessage)
+  PYB11_FILTER_PARAMETER(bool, WarningsAsError)
   PYB11_PROPERTY(QString SlackUser READ getSlackUser WRITE setSlackUser)
   PYB11_PROPERTY(QString SlackUrl READ getSlackUrl WRITE setSlackUrl)
   PYB11_PROPERTY(QString SlackMessage READ getSlackMessage WRITE setSlackMessage)
   PYB11_PROPERTY(bool WarningsAsError READ getWarningsAsError WRITE setWarningsAsError)
+#endif
+
+public:
+  using Self = PostSlackMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
 
-  public:
-    SIMPL_SHARED_POINTERS(PostSlackMessage)
-    SIMPL_FILTER_NEW_MACRO(PostSlackMessage)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PostSlackMessage, AbstractFilter)
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
 
-    ~PostSlackMessage() override;
+  /**
+   * @brief Returns the name of the class for PostSlackMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PostSlackMessage
+   */
+  static QString ClassName();
+
+  ~PostSlackMessage() override;
+
+  /**
+   * @brief Setter property for SlackUser
+   */
+  void setSlackUser(const QString& value);
+  /**
+   * @brief Getter property for SlackUser
+   * @return Value of SlackUser
+   */
+  QString getSlackUser() const;
 
-  SIMPL_FILTER_PARAMETER(QString, SlackUser)
   Q_PROPERTY(QString SlackUser READ getSlackUser WRITE setSlackUser)
 
-  SIMPL_FILTER_PARAMETER(QString, SlackUrl)
+  /**
+   * @brief Setter property for SlackUrl
+   */
+  void setSlackUrl(const QString& value);
+  /**
+   * @brief Getter property for SlackUrl
+   * @return Value of SlackUrl
+   */
+  QString getSlackUrl() const;
+
   Q_PROPERTY(QString SlackUrl READ getSlackUrl WRITE setSlackUrl)
 
-  SIMPL_FILTER_PARAMETER(QString, SlackMessage)
+  /**
+   * @brief Setter property for SlackMessage
+   */
+  void setSlackMessage(const QString& value);
+  /**
+   * @brief Getter property for SlackMessage
+   * @return Value of SlackMessage
+   */
+  QString getSlackMessage() const;
+
   Q_PROPERTY(QString SlackMessage READ getSlackMessage WRITE setSlackMessage)
 
-  SIMPL_FILTER_PARAMETER(bool, WarningsAsError)
+  /**
+   * @brief Setter property for WarningsAsError
+   */
+  void setWarningsAsError(bool value);
+  /**
+   * @brief Getter property for WarningsAsError
+   * @return Value of WarningsAsError
+   */
+  bool getWarningsAsError() const;
+
   Q_PROPERTY(bool WarningsAsError READ getWarningsAsError WRITE setWarningsAsError)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
 
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
 
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
 
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
 
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
 
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
 
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
 
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
 
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
 
 signals:
   /**
@@ -169,6 +239,11 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   void initialize();
 
 private:
+  QString m_SlackUser = {};
+  QString m_SlackUrl = {};
+  QString m_SlackMessage = {};
+  bool m_WarningsAsError = {};
+
   QWaitCondition m_WaitCondition;
   QMutex m_Mutex;
   QNetworkAccessManager* m_NetworkManager;
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 0f7f2412bd..fdade99e59 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -34,11 +34,16 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RawBinaryReader.h"
 
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -52,6 +57,8 @@
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/UInt64FilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define RBR_FILE_NOT_OPEN -1000
 #define RBR_FILE_TOO_SMALL -1010
@@ -273,7 +280,7 @@ void RawBinaryReader::dataCheck()
   }
 
   std::vector<size_t> tDims = attrMat->getTupleDimensions();
-  size_t totalDim = std::accumulate(tDims.begin(), tDims.end(), 1, std::multiplies<size_t>());
+  size_t totalDim = std::accumulate(tDims.begin(), tDims.end(), static_cast<size_t>(1), std::multiplies<size_t>());
 
   size_t allocatedBytes = 0;
   std::vector<size_t> cDims(1, m_NumberOfComponents);
@@ -456,7 +463,7 @@ AbstractFilter::Pointer RawBinaryReader::newFilterInstance(bool copyFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getCompiledLibraryName() const
+QString RawBinaryReader::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -464,7 +471,7 @@ const QString RawBinaryReader::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getBrandingString() const
+QString RawBinaryReader::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -472,7 +479,7 @@ const QString RawBinaryReader::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getFilterVersion() const
+QString RawBinaryReader::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -483,7 +490,7 @@ const QString RawBinaryReader::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getGroupName() const
+QString RawBinaryReader::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -491,7 +498,7 @@ const QString RawBinaryReader::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RawBinaryReader::getUuid()
+QUuid RawBinaryReader::getUuid() const
 {
   return QUuid("{0791f556-3d73-5b1e-b275-db3f7bb6850d}");
 }
@@ -499,7 +506,7 @@ const QUuid RawBinaryReader::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getSubGroupName() const
+QString RawBinaryReader::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
@@ -507,7 +514,108 @@ const QString RawBinaryReader::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RawBinaryReader::getHumanLabel() const
+QString RawBinaryReader::getHumanLabel() const
 {
   return "Raw Binary Importer";
 }
+
+// -----------------------------------------------------------------------------
+RawBinaryReader::Pointer RawBinaryReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RawBinaryReader> RawBinaryReader::New()
+{
+  struct make_shared_enabler : public RawBinaryReader
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RawBinaryReader::getNameOfClass() const
+{
+  return QString("RawBinaryReader");
+}
+
+// -----------------------------------------------------------------------------
+QString RawBinaryReader::ClassName()
+{
+  return QString("RawBinaryReader");
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setCreatedAttributeArrayPath(const DataArrayPath& value)
+{
+  m_CreatedAttributeArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RawBinaryReader::getCreatedAttributeArrayPath() const
+{
+  return m_CreatedAttributeArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setScalarType(SIMPL::NumericTypes::Type value)
+{
+  m_ScalarType = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPL::NumericTypes::Type RawBinaryReader::getScalarType() const
+{
+  return m_ScalarType;
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setEndian(int value)
+{
+  m_Endian = value;
+}
+
+// -----------------------------------------------------------------------------
+int RawBinaryReader::getEndian() const
+{
+  return m_Endian;
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setNumberOfComponents(int value)
+{
+  m_NumberOfComponents = value;
+}
+
+// -----------------------------------------------------------------------------
+int RawBinaryReader::getNumberOfComponents() const
+{
+  return m_NumberOfComponents;
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setSkipHeaderBytes(uint64_t value)
+{
+  m_SkipHeaderBytes = value;
+}
+
+// -----------------------------------------------------------------------------
+uint64_t RawBinaryReader::getSkipHeaderBytes() const
+{
+  return m_SkipHeaderBytes;
+}
+
+// -----------------------------------------------------------------------------
+void RawBinaryReader::setInputFile(const QString& value)
+{
+  m_InputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RawBinaryReader::getInputFile() const
+{
+  return m_InputFile;
+}
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index aa8d58e8e3..cbc72c6548 100755
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -36,9 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Common/Constants.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
  * @brief The RawBinaryReader class. See [Filter documentation](@ref rawbinaryreader) for details.
@@ -46,58 +51,137 @@
 class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RawBinaryReader)
+    PYB11_FILTER_NEW_MACRO(RawBinaryReader)
+    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
+    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    PYB11_FILTER_PARAMETER(int, Endian)
+    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
+    PYB11_FILTER_PARAMETER(uint64_t, SkipHeaderBytes)
+    PYB11_FILTER_PARAMETER(QString, InputFile)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int Endian READ getEndian WRITE setEndian)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RawBinaryReader)
-    SIMPL_FILTER_NEW_MACRO(RawBinaryReader)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RawBinaryReader, AbstractFilter)
+    using Self = RawBinaryReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RawBinaryReader> New();
+
+    /**
+     * @brief Returns the name of the class for RawBinaryReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RawBinaryReader
+     */
+    static QString ClassName();
 
     ~RawBinaryReader() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
+    /**
+     * @brief Setter property for CreatedAttributeArrayPath
+     */
+    void setCreatedAttributeArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for CreatedAttributeArrayPath
+     * @return Value of CreatedAttributeArrayPath
+     */
+    DataArrayPath getCreatedAttributeArrayPath() const;
+
     Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
 
-    SIMPL_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
+    /**
+     * @brief Setter property for ScalarType
+     */
+    void setScalarType(SIMPL::NumericTypes::Type value);
+    /**
+     * @brief Getter property for ScalarType
+     * @return Value of ScalarType
+     */
+    SIMPL::NumericTypes::Type getScalarType() const;
+
     Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
 
-    SIMPL_FILTER_PARAMETER(int, Endian)
+    /**
+     * @brief Setter property for Endian
+     */
+    void setEndian(int value);
+    /**
+     * @brief Getter property for Endian
+     * @return Value of Endian
+     */
+    int getEndian() const;
+
     Q_PROPERTY(int Endian READ getEndian WRITE setEndian)
 
-    SIMPL_FILTER_PARAMETER(int, NumberOfComponents)
+    /**
+     * @brief Setter property for NumberOfComponents
+     */
+    void setNumberOfComponents(int value);
+    /**
+     * @brief Getter property for NumberOfComponents
+     * @return Value of NumberOfComponents
+     */
+    int getNumberOfComponents() const;
+
     Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
 
-    SIMPL_FILTER_PARAMETER(uint64_t, SkipHeaderBytes)
+    /**
+     * @brief Setter property for SkipHeaderBytes
+     */
+    void setSkipHeaderBytes(uint64_t value);
+    /**
+     * @brief Getter property for SkipHeaderBytes
+     * @return Value of SkipHeaderBytes
+     */
+    uint64_t getSkipHeaderBytes() const;
+
     Q_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
 
-    SIMPL_FILTER_PARAMETER(QString, InputFile)
+    /**
+     * @brief Setter property for InputFile
+     */
+    void setInputFile(const QString& value);
+    /**
+     * @brief Getter property for InputFile
+     * @return Value of InputFile
+     */
+    QString getInputFile() const;
+
     Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
 
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -107,23 +191,23 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -183,7 +267,14 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
 
 
   private:
-    IDataArray::Pointer m_Array;
+    DataArrayPath m_CreatedAttributeArrayPath = {};
+    SIMPL::NumericTypes::Type m_ScalarType = {};
+    int m_Endian = {};
+    int m_NumberOfComponents = {};
+    uint64_t m_SkipHeaderBytes = {};
+    QString m_InputFile = {};
+
+    IDataArrayShPtrType m_Array;
 
   public:
     RawBinaryReader(const RawBinaryReader&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index bd006ec508..a2ec0ec7ce 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -2,11 +2,16 @@
  * Your License or Copyright can go here
  */
 
+#include <memory>
+
 #include "ReadASCIIData.h"
 
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
@@ -17,6 +22,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 
 #include "SIMPLib/CoreFilters/util/AbstractDataParser.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace {
    const QString k_Skip("Skip");
@@ -606,7 +613,7 @@ AbstractFilter::Pointer ReadASCIIData::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getCompiledLibraryName() const
+QString ReadASCIIData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -614,7 +621,7 @@ const QString ReadASCIIData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getBrandingString() const
+QString ReadASCIIData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -622,7 +629,7 @@ const QString ReadASCIIData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getFilterVersion() const
+QString ReadASCIIData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -633,7 +640,7 @@ const QString ReadASCIIData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getGroupName() const
+QString ReadASCIIData::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -641,7 +648,7 @@ const QString ReadASCIIData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ReadASCIIData::getUuid()
+QUuid ReadASCIIData::getUuid() const
 {
   return QUuid("{bdb978bc-96bf-5498-972c-b509c38b8d50}");
 }
@@ -649,7 +656,7 @@ const QUuid ReadASCIIData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getSubGroupName() const
+QString ReadASCIIData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
@@ -657,7 +664,48 @@ const QString ReadASCIIData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReadASCIIData::getHumanLabel() const
+QString ReadASCIIData::getHumanLabel() const
 {
   return "Import ASCII Data";
 }
+
+// -----------------------------------------------------------------------------
+ReadASCIIData::Pointer ReadASCIIData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ReadASCIIData> ReadASCIIData::New()
+{
+  struct make_shared_enabler : public ReadASCIIData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ReadASCIIData::getNameOfClass() const
+{
+  return QString("ReadASCIIData");
+}
+
+// -----------------------------------------------------------------------------
+QString ReadASCIIData::ClassName()
+{
+  return QString("ReadASCIIData");
+}
+
+// -----------------------------------------------------------------------------
+void ReadASCIIData::setWizardData(const ASCIIWizardData& value)
+{
+  m_WizardData = value;
+}
+
+// -----------------------------------------------------------------------------
+ASCIIWizardData ReadASCIIData::getWizardData() const
+{
+  return m_WizardData;
+}
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 371d03995e..393592d2b9 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -4,29 +4,71 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
 /**
  * @brief The ReadASCIIData class. See [Filter documentation](@ref ReadASCIIData) for details.
  */
 class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ReadASCIIData SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ReadASCIIData)
+  PYB11_FILTER_NEW_MACRO(ReadASCIIData)
+  PYB11_FILTER_PARAMETER(ASCIIWizardData, WizardData)
   PYB11_PROPERTY(ASCIIWizardData WizardData READ getWizardData WRITE setWizardData)
+#endif
+
+public:
+  using Self = ReadASCIIData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
 
-  public:
-    SIMPL_SHARED_POINTERS(ReadASCIIData)
-    SIMPL_FILTER_NEW_MACRO(ReadASCIIData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ReadASCIIData, AbstractFilter)
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ReadASCIIData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ReadASCIIData
+   */
+  static QString ClassName();
 
-    ~ReadASCIIData() override;
+  ~ReadASCIIData() override;
+
+  /**
+   * @brief Setter property for WizardData
+   */
+  void setWizardData(const ASCIIWizardData& value);
+  /**
+   * @brief Getter property for WizardData
+   * @return Value of WizardData
+   */
+  ASCIIWizardData getWizardData() const;
 
-  SIMPL_FILTER_PARAMETER(ASCIIWizardData, WizardData)
   Q_PROPERTY(ASCIIWizardData WizardData READ getWizardData WRITE setWizardData)
 
   enum ErrorCodes
@@ -43,57 +85,57 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    const QString getBrandingString() const override;
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
 
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    const QString getFilterVersion() const override;
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
 
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
 
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getGroupName() const override;
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
 
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    const QString getSubGroupName() const override;
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
 
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    const QUuid getUuid() override;
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
 
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    const QString getHumanLabel() const override;
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
 
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
 
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
   * @brief readFilterParametersFromJson Reads the filter parameters from a file
@@ -161,7 +203,9 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
 
 
   private:
-    QMap<int, IDataArray::Pointer>        m_ASCIIArrayMap;
+    ASCIIWizardData m_WizardData = {};
+
+    QMap<int, IDataArrayShPtrType> m_ASCIIArrayMap;
 
   public:
     ReadASCIIData(const ReadASCIIData&) = delete;  // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index a0239949ac..d2c30b1656 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -33,12 +33,19 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RemoveArrays.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -242,7 +249,7 @@ AbstractFilter::Pointer RemoveArrays::newFilterInstance(bool copyFilterParameter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getCompiledLibraryName() const
+QString RemoveArrays::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -250,7 +257,7 @@ const QString RemoveArrays::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getBrandingString() const
+QString RemoveArrays::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -258,7 +265,7 @@ const QString RemoveArrays::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getFilterVersion() const
+QString RemoveArrays::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -269,7 +276,7 @@ const QString RemoveArrays::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getGroupName() const
+QString RemoveArrays::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -277,7 +284,7 @@ const QString RemoveArrays::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RemoveArrays::getUuid()
+QUuid RemoveArrays::getUuid() const
 {
   return QUuid("{7b1c8f46-90dd-584a-b3ba-34e16958a7d0}");
 }
@@ -285,7 +292,7 @@ const QUuid RemoveArrays::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getSubGroupName() const
+QString RemoveArrays::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -293,7 +300,48 @@ const QString RemoveArrays::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveArrays::getHumanLabel() const
+QString RemoveArrays::getHumanLabel() const
 {
   return "Delete Data";
 }
+
+// -----------------------------------------------------------------------------
+RemoveArrays::Pointer RemoveArrays::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RemoveArrays> RemoveArrays::New()
+{
+  struct make_shared_enabler : public RemoveArrays
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveArrays::getNameOfClass() const
+{
+  return QString("RemoveArrays");
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveArrays::ClassName()
+{
+  return QString("RemoveArrays");
+}
+
+// -----------------------------------------------------------------------------
+void RemoveArrays::setDataArraysToRemove(const DataContainerArrayProxy& value)
+{
+  m_DataArraysToRemove = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxy RemoveArrays::getDataArraysToRemove() const
+{
+  return m_DataArraysToRemove;
+}
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index 6f3efa6849..a859396ae5 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The RemoveArrays class. See [Filter documentation](@ref removearrays) for details.
@@ -47,37 +48,66 @@
 class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RemoveArrays)
+    PYB11_FILTER_NEW_MACRO(RemoveArrays)
+    PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DataArraysToRemove)
     PYB11_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RemoveArrays)
-    SIMPL_FILTER_NEW_MACRO(RemoveArrays)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RemoveArrays, AbstractFilter)
+    using Self = RemoveArrays;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RemoveArrays> New();
+
+    /**
+     * @brief Returns the name of the class for RemoveArrays
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RemoveArrays
+     */
+    static QString ClassName();
 
     ~RemoveArrays() override;
 
-    SIMPL_FILTER_PARAMETER(DataContainerArrayProxy, DataArraysToRemove)
+    /**
+     * @brief Setter property for DataArraysToRemove
+     */
+    void setDataArraysToRemove(const DataContainerArrayProxy& value);
+    /**
+     * @brief Getter property for DataArraysToRemove
+     * @return Value of DataArraysToRemove
+     */
+    DataContainerArrayProxy getDataArraysToRemove() const;
+
     Q_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -87,23 +117,23 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -187,6 +217,8 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
     RemoveArrays& operator=(RemoveArrays&&) = delete;      // Move Assignment Not Implemented
 
   private:
+    DataContainerArrayProxy m_DataArraysToRemove = {};
+
     std::list<DataArrayPath> m_RemovedPaths;
 };
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 2e2f5f0a04..004bf760f6 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RemoveComponentFromArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -45,6 +50,7 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   NewDataArrayID = 1,
@@ -304,7 +310,7 @@ AbstractFilter::Pointer RemoveComponentFromArray::newFilterInstance(bool copyFil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getCompiledLibraryName() const
+QString RemoveComponentFromArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -312,7 +318,7 @@ const QString RemoveComponentFromArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getBrandingString() const
+QString RemoveComponentFromArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -320,7 +326,7 @@ const QString RemoveComponentFromArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getFilterVersion() const
+QString RemoveComponentFromArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -331,7 +337,7 @@ const QString RemoveComponentFromArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getGroupName() const
+QString RemoveComponentFromArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -339,7 +345,7 @@ const QString RemoveComponentFromArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RemoveComponentFromArray::getUuid()
+QUuid RemoveComponentFromArray::getUuid() const
 {
   return QUuid("{1b4b9941-62e4-52f2-9918-15d48147ab88}");
 }
@@ -347,7 +353,7 @@ const QUuid RemoveComponentFromArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getSubGroupName() const
+QString RemoveComponentFromArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -355,7 +361,96 @@ const QString RemoveComponentFromArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RemoveComponentFromArray::getHumanLabel() const
+QString RemoveComponentFromArray::getHumanLabel() const
 {
   return "Remove Component From Array";
 }
+
+// -----------------------------------------------------------------------------
+RemoveComponentFromArray::Pointer RemoveComponentFromArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RemoveComponentFromArray> RemoveComponentFromArray::New()
+{
+  struct make_shared_enabler : public RemoveComponentFromArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveComponentFromArray::getNameOfClass() const
+{
+  return QString("RemoveComponentFromArray");
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveComponentFromArray::ClassName()
+{
+  return QString("RemoveComponentFromArray");
+}
+
+// -----------------------------------------------------------------------------
+void RemoveComponentFromArray::setSelectedArrayPath(const DataArrayPath& value)
+{
+  m_SelectedArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RemoveComponentFromArray::getSelectedArrayPath() const
+{
+  return m_SelectedArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void RemoveComponentFromArray::setCompNumber(int value)
+{
+  m_CompNumber = value;
+}
+
+// -----------------------------------------------------------------------------
+int RemoveComponentFromArray::getCompNumber() const
+{
+  return m_CompNumber;
+}
+
+// -----------------------------------------------------------------------------
+void RemoveComponentFromArray::setSaveRemovedComponent(bool value)
+{
+  m_SaveRemovedComponent = value;
+}
+
+// -----------------------------------------------------------------------------
+bool RemoveComponentFromArray::getSaveRemovedComponent() const
+{
+  return m_SaveRemovedComponent;
+}
+
+// -----------------------------------------------------------------------------
+void RemoveComponentFromArray::setNewArrayArrayName(const QString& value)
+{
+  m_NewArrayArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveComponentFromArray::getNewArrayArrayName() const
+{
+  return m_NewArrayArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void RemoveComponentFromArray::setReducedArrayArrayName(const QString& value)
+{
+  m_ReducedArrayArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RemoveComponentFromArray::getReducedArrayArrayName() const
+{
+  return m_ReducedArrayArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index 950732d4de..4a243a0c52 100755
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -36,9 +36,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The RemoveComponentFromArray class. See [Filter documentation](@ref RemoveComponentFromArray) for details.
@@ -46,53 +50,122 @@
 class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RemoveComponentFromArray)
+    PYB11_FILTER_NEW_MACRO(RemoveComponentFromArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    PYB11_FILTER_PARAMETER(int, CompNumber)
+    PYB11_FILTER_PARAMETER(bool, SaveRemovedComponent)
+    PYB11_FILTER_PARAMETER(QString, NewArrayArrayName)
+    PYB11_FILTER_PARAMETER(QString, ReducedArrayArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
     PYB11_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
     PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
     PYB11_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RemoveComponentFromArray)
-    SIMPL_FILTER_NEW_MACRO(RemoveComponentFromArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RemoveComponentFromArray, AbstractFilter)
+    using Self = RemoveComponentFromArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RemoveComponentFromArray> New();
+
+    /**
+     * @brief Returns the name of the class for RemoveComponentFromArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RemoveComponentFromArray
+     */
+    static QString ClassName();
 
     ~RemoveComponentFromArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    /**
+     * @brief Setter property for SelectedArrayPath
+     */
+    void setSelectedArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedArrayPath
+     * @return Value of SelectedArrayPath
+     */
+    DataArrayPath getSelectedArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
 
-    SIMPL_FILTER_PARAMETER(int, CompNumber)
+    /**
+     * @brief Setter property for CompNumber
+     */
+    void setCompNumber(int value);
+    /**
+     * @brief Getter property for CompNumber
+     * @return Value of CompNumber
+     */
+    int getCompNumber() const;
+
     Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
 
-    SIMPL_FILTER_PARAMETER(bool, SaveRemovedComponent)
+    /**
+     * @brief Setter property for SaveRemovedComponent
+     */
+    void setSaveRemovedComponent(bool value);
+    /**
+     * @brief Getter property for SaveRemovedComponent
+     * @return Value of SaveRemovedComponent
+     */
+    bool getSaveRemovedComponent() const;
+
     Q_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
 
-    SIMPL_FILTER_PARAMETER(QString, NewArrayArrayName)
+    /**
+     * @brief Setter property for NewArrayArrayName
+     */
+    void setNewArrayArrayName(const QString& value);
+    /**
+     * @brief Getter property for NewArrayArrayName
+     * @return Value of NewArrayArrayName
+     */
+    QString getNewArrayArrayName() const;
+
     Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
 
-    SIMPL_FILTER_PARAMETER(QString, ReducedArrayArrayName)
+    /**
+     * @brief Setter property for ReducedArrayArrayName
+     */
+    void setReducedArrayArrayName(const QString& value);
+    /**
+     * @brief Getter property for ReducedArrayArrayName
+     * @return Value of ReducedArrayArrayName
+     */
+    QString getReducedArrayArrayName() const;
+
     Q_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -102,23 +175,23 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -177,9 +250,15 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
 
 
   private:
-    DEFINE_IDATAARRAY_WEAKPTR(InArray)
-    DEFINE_IDATAARRAY_WEAKPTR(NewArray)
-    DEFINE_IDATAARRAY_WEAKPTR(ReducedArray)
+    IDataArrayWkPtrType m_InArrayPtr;
+    IDataArrayWkPtrType m_NewArrayPtr;
+    IDataArrayWkPtrType m_ReducedArrayPtr;
+
+    DataArrayPath m_SelectedArrayPath = {};
+    int m_CompNumber = {};
+    bool m_SaveRemovedComponent = {};
+    QString m_NewArrayArrayName = {};
+    QString m_ReducedArrayArrayName = {};
 
   public:
     RemoveComponentFromArray(const RemoveComponentFromArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 2c3c8d7c8f..c82e22a7e6 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -33,13 +33,19 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RenameAttributeArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -198,7 +204,7 @@ AbstractFilter::Pointer RenameAttributeArray::newFilterInstance(bool copyFilterP
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getCompiledLibraryName() const
+QString RenameAttributeArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -206,7 +212,7 @@ const QString RenameAttributeArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getBrandingString() const
+QString RenameAttributeArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -214,7 +220,7 @@ const QString RenameAttributeArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getFilterVersion() const
+QString RenameAttributeArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -225,7 +231,7 @@ const QString RenameAttributeArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getGroupName() const
+QString RenameAttributeArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -233,7 +239,7 @@ const QString RenameAttributeArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RenameAttributeArray::getUuid()
+QUuid RenameAttributeArray::getUuid() const
 {
   return QUuid("{53a5f731-2858-5e3e-bd43-8f2cf45d90ec}");
 }
@@ -241,7 +247,7 @@ const QUuid RenameAttributeArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getSubGroupName() const
+QString RenameAttributeArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -249,7 +255,7 @@ const QString RenameAttributeArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeArray::getHumanLabel() const
+QString RenameAttributeArray::getHumanLabel() const
 {
   return "Rename Attribute Array";
 }
@@ -269,3 +275,56 @@ DataArrayPath::RenameContainer RenameAttributeArray::getRenamedPaths()
 
   return container;
 }
+
+// -----------------------------------------------------------------------------
+RenameAttributeArray::Pointer RenameAttributeArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RenameAttributeArray> RenameAttributeArray::New()
+{
+  struct make_shared_enabler : public RenameAttributeArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeArray::getNameOfClass() const
+{
+  return QString("RenameAttributeArray");
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeArray::ClassName()
+{
+  return QString("RenameAttributeArray");
+}
+
+// -----------------------------------------------------------------------------
+void RenameAttributeArray::setSelectedArrayPath(const DataArrayPath& value)
+{
+  m_SelectedArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RenameAttributeArray::getSelectedArrayPath() const
+{
+  return m_SelectedArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void RenameAttributeArray::setNewArrayName(const QString& value)
+{
+  m_NewArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeArray::getNewArrayName() const
+{
+  return m_NewArrayName;
+}
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index 79d1426f9e..f508d89343 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The RenameAttributeArray class. See [Filter documentation](@ref renameattributearray) for details.
@@ -46,41 +47,80 @@
 class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RenameAttributeArray)
+    PYB11_FILTER_NEW_MACRO(RenameAttributeArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    PYB11_FILTER_PARAMETER(QString, NewArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RenameAttributeArray)
-    SIMPL_FILTER_NEW_MACRO(RenameAttributeArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RenameAttributeArray, AbstractFilter)
+    using Self = RenameAttributeArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RenameAttributeArray> New();
+
+    /**
+     * @brief Returns the name of the class for RenameAttributeArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RenameAttributeArray
+     */
+    static QString ClassName();
 
     ~RenameAttributeArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
+    /**
+     * @brief Setter property for SelectedArrayPath
+     */
+    void setSelectedArrayPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedArrayPath
+     * @return Value of SelectedArrayPath
+     */
+    DataArrayPath getSelectedArrayPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
 
-    SIMPL_FILTER_PARAMETER(QString, NewArrayName)
+    /**
+     * @brief Setter property for NewArrayName
+     */
+    void setNewArrayName(const QString& value);
+    /**
+     * @brief Getter property for NewArrayName
+     * @return Value of NewArrayName
+     */
+    QString getNewArrayName() const;
+
     Q_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -90,23 +130,23 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -170,6 +210,9 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
     void initialize();
 
   private:
+    DataArrayPath m_SelectedArrayPath = {};
+    QString m_NewArrayName = {};
+
     QString m_LastArrayName = "";
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index fe62c47601..e5a476fef0 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -33,13 +33,20 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RenameAttributeMatrix.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -182,7 +189,7 @@ AbstractFilter::Pointer RenameAttributeMatrix::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getCompiledLibraryName() const
+QString RenameAttributeMatrix::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -190,7 +197,7 @@ const QString RenameAttributeMatrix::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getBrandingString() const
+QString RenameAttributeMatrix::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -198,7 +205,7 @@ const QString RenameAttributeMatrix::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getFilterVersion() const
+QString RenameAttributeMatrix::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -209,7 +216,7 @@ const QString RenameAttributeMatrix::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getGroupName() const
+QString RenameAttributeMatrix::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -217,7 +224,7 @@ const QString RenameAttributeMatrix::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RenameAttributeMatrix::getUuid()
+QUuid RenameAttributeMatrix::getUuid() const
 {
   return QUuid("{ee29e6d6-1f59-551b-9350-a696523261d5}");
 }
@@ -225,7 +232,7 @@ const QUuid RenameAttributeMatrix::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getSubGroupName() const
+QString RenameAttributeMatrix::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -233,7 +240,7 @@ const QString RenameAttributeMatrix::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameAttributeMatrix::getHumanLabel() const
+QString RenameAttributeMatrix::getHumanLabel() const
 {
   return "Rename Attribute Matrix";
 }
@@ -252,3 +259,56 @@ DataArrayPath::RenameContainer RenameAttributeMatrix::getRenamedPaths()
 
   return container;
 }
+
+// -----------------------------------------------------------------------------
+RenameAttributeMatrix::Pointer RenameAttributeMatrix::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RenameAttributeMatrix> RenameAttributeMatrix::New()
+{
+  struct make_shared_enabler : public RenameAttributeMatrix
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeMatrix::getNameOfClass() const
+{
+  return QString("RenameAttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeMatrix::ClassName()
+{
+  return QString("RenameAttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+void RenameAttributeMatrix::setSelectedAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_SelectedAttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RenameAttributeMatrix::getSelectedAttributeMatrixPath() const
+{
+  return m_SelectedAttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void RenameAttributeMatrix::setNewAttributeMatrix(const QString& value)
+{
+  m_NewAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RenameAttributeMatrix::getNewAttributeMatrix() const
+{
+  return m_NewAttributeMatrix;
+}
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index dc4d833372..e701d326e3 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The RenameAttributeMatrix class. See [Filter documentation](@ref renameattributematrix) for details.
@@ -46,41 +47,80 @@
 class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RenameAttributeMatrix)
+    PYB11_FILTER_NEW_MACRO(RenameAttributeMatrix)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrixPath)
+    PYB11_FILTER_PARAMETER(QString, NewAttributeMatrix)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
     PYB11_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RenameAttributeMatrix)
-    SIMPL_FILTER_NEW_MACRO(RenameAttributeMatrix)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RenameAttributeMatrix, AbstractFilter)
+    using Self = RenameAttributeMatrix;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RenameAttributeMatrix> New();
+
+    /**
+     * @brief Returns the name of the class for RenameAttributeMatrix
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RenameAttributeMatrix
+     */
+    static QString ClassName();
 
     ~RenameAttributeMatrix() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrixPath)
+    /**
+     * @brief Setter property for SelectedAttributeMatrixPath
+     */
+    void setSelectedAttributeMatrixPath(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedAttributeMatrixPath
+     * @return Value of SelectedAttributeMatrixPath
+     */
+    DataArrayPath getSelectedAttributeMatrixPath() const;
+
     Q_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
 
-    SIMPL_FILTER_PARAMETER(QString, NewAttributeMatrix)
+    /**
+     * @brief Setter property for NewAttributeMatrix
+     */
+    void setNewAttributeMatrix(const QString& value);
+    /**
+     * @brief Getter property for NewAttributeMatrix
+     * @return Value of NewAttributeMatrix
+     */
+    QString getNewAttributeMatrix() const;
+
     Q_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -90,23 +130,23 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -170,6 +210,9 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
     void initialize();
 
   private:
+    DataArrayPath m_SelectedAttributeMatrixPath = {};
+    QString m_NewAttributeMatrix = {};
+
     QString m_LastMatrixName = "";
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 663f3831ce..d278124e77 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -33,13 +33,20 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "RenameDataContainer.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -165,7 +172,7 @@ AbstractFilter::Pointer RenameDataContainer::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getCompiledLibraryName() const
+QString RenameDataContainer::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -173,7 +180,7 @@ const QString RenameDataContainer::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getBrandingString() const
+QString RenameDataContainer::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -181,7 +188,7 @@ const QString RenameDataContainer::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getFilterVersion() const
+QString RenameDataContainer::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -192,7 +199,7 @@ const QString RenameDataContainer::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getGroupName() const
+QString RenameDataContainer::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -200,7 +207,7 @@ const QString RenameDataContainer::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RenameDataContainer::getUuid()
+QUuid RenameDataContainer::getUuid() const
 {
   return QUuid("{d53c808f-004d-5fac-b125-0fffc8cc78d6}");
 }
@@ -208,7 +215,7 @@ const QUuid RenameDataContainer::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getSubGroupName() const
+QString RenameDataContainer::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -216,7 +223,7 @@ const QString RenameDataContainer::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RenameDataContainer::getHumanLabel() const
+QString RenameDataContainer::getHumanLabel() const
 {
   return "Rename Data Container";
 }
@@ -234,3 +241,56 @@ DataArrayPath::RenameContainer RenameDataContainer::getRenamedPaths()
 
   return container;
 }
+
+// -----------------------------------------------------------------------------
+RenameDataContainer::Pointer RenameDataContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RenameDataContainer> RenameDataContainer::New()
+{
+  struct make_shared_enabler : public RenameDataContainer
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RenameDataContainer::getNameOfClass() const
+{
+  return QString("RenameDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString RenameDataContainer::ClassName()
+{
+  return QString("RenameDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+void RenameDataContainer::setSelectedDataContainerName(const DataArrayPath& value)
+{
+  m_SelectedDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RenameDataContainer::getSelectedDataContainerName() const
+{
+  return m_SelectedDataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void RenameDataContainer::setNewDataContainerName(const DataArrayPath& value)
+{
+  m_NewDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RenameDataContainer::getNewDataContainerName() const
+{
+  return m_NewDataContainerName;
+}
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 324c3535df..308648ccb9 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -36,9 +36,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The RenameDataContainer class. See [Filter documentation](@ref renamedatacontainer) for details.
@@ -46,41 +47,80 @@
 class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RenameDataContainer)
+    PYB11_FILTER_NEW_MACRO(RenameDataContainer)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, NewDataContainerName)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
     PYB11_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RenameDataContainer)
-    SIMPL_FILTER_NEW_MACRO(RenameDataContainer)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RenameDataContainer, AbstractFilter)
+    using Self = RenameDataContainer;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<RenameDataContainer> New();
+
+    /**
+     * @brief Returns the name of the class for RenameDataContainer
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RenameDataContainer
+     */
+    static QString ClassName();
 
     ~RenameDataContainer() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
+    /**
+     * @brief Setter property for SelectedDataContainerName
+     */
+    void setSelectedDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedDataContainerName
+     * @return Value of SelectedDataContainerName
+     */
+    DataArrayPath getSelectedDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, NewDataContainerName)
+    /**
+     * @brief Setter property for NewDataContainerName
+     */
+    void setNewDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for NewDataContainerName
+     * @return Value of NewDataContainerName
+     */
+    DataArrayPath getNewDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -90,23 +130,23 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -165,6 +205,9 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
     void initialize();
 
   private:
+    DataArrayPath m_SelectedDataContainerName = {};
+    DataArrayPath m_NewDataContainerName = {};
+
     DataArrayPath m_LastContainerName;
 
   public:
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index a13fb64b43..54af86f145 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -33,14 +33,21 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ReplaceValueInArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -282,7 +289,7 @@ AbstractFilter::Pointer ReplaceValueInArray::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getCompiledLibraryName() const
+QString ReplaceValueInArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -290,7 +297,7 @@ const QString ReplaceValueInArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getBrandingString() const
+QString ReplaceValueInArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -298,7 +305,7 @@ const QString ReplaceValueInArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getFilterVersion() const
+QString ReplaceValueInArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -309,7 +316,7 @@ const QString ReplaceValueInArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getGroupName() const
+QString ReplaceValueInArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -317,7 +324,7 @@ const QString ReplaceValueInArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ReplaceValueInArray::getUuid()
+QUuid ReplaceValueInArray::getUuid() const
 {
   return QUuid("{a37f2e24-7400-5005-b9a7-b2224570cbe9}");
 }
@@ -325,7 +332,7 @@ const QUuid ReplaceValueInArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getSubGroupName() const
+QString ReplaceValueInArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -333,7 +340,72 @@ const QString ReplaceValueInArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ReplaceValueInArray::getHumanLabel() const
+QString ReplaceValueInArray::getHumanLabel() const
 {
   return "Replace Value in Array";
 }
+
+// -----------------------------------------------------------------------------
+ReplaceValueInArray::Pointer ReplaceValueInArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ReplaceValueInArray> ReplaceValueInArray::New()
+{
+  struct make_shared_enabler : public ReplaceValueInArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ReplaceValueInArray::getNameOfClass() const
+{
+  return QString("ReplaceValueInArray");
+}
+
+// -----------------------------------------------------------------------------
+QString ReplaceValueInArray::ClassName()
+{
+  return QString("ReplaceValueInArray");
+}
+
+// -----------------------------------------------------------------------------
+void ReplaceValueInArray::setSelectedArray(const DataArrayPath& value)
+{
+  m_SelectedArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ReplaceValueInArray::getSelectedArray() const
+{
+  return m_SelectedArray;
+}
+
+// -----------------------------------------------------------------------------
+void ReplaceValueInArray::setRemoveValue(double value)
+{
+  m_RemoveValue = value;
+}
+
+// -----------------------------------------------------------------------------
+double ReplaceValueInArray::getRemoveValue() const
+{
+  return m_RemoveValue;
+}
+
+// -----------------------------------------------------------------------------
+void ReplaceValueInArray::setReplaceValue(double value)
+{
+  m_ReplaceValue = value;
+}
+
+// -----------------------------------------------------------------------------
+double ReplaceValueInArray::getReplaceValue() const
+{
+  return m_ReplaceValue;
+}
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index ec16485633..e3a8d69972 100755
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -36,9 +36,15 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
+
+class IDataArray;
 
 /**
  * @brief The ReplaceValueInArray class. See [Filter documentation](@ref replacevalueinarray) for details.
@@ -46,46 +52,94 @@
 class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ReplaceValueInArray)
+    PYB11_FILTER_NEW_MACRO(ReplaceValueInArray)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArray)
+    PYB11_FILTER_PARAMETER(double, RemoveValue)
+    PYB11_FILTER_PARAMETER(double, ReplaceValue)
     PYB11_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
     PYB11_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
     PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+#endif
 
   public:
+    using Self = ReplaceValueInArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ReplaceValueInArray> New();
 
-    SIMPL_SHARED_POINTERS(ReplaceValueInArray)
-    SIMPL_FILTER_NEW_MACRO(ReplaceValueInArray)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ReplaceValueInArray, AbstractFilter)
+    /**
+     * @brief Returns the name of the class for ReplaceValueInArray
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ReplaceValueInArray
+     */
+    static QString ClassName();
 
     ~ReplaceValueInArray() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SelectedArray)
+    /**
+     * @brief Setter property for SelectedArray
+     */
+    void setSelectedArray(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SelectedArray
+     * @return Value of SelectedArray
+     */
+    DataArrayPath getSelectedArray() const;
+
     Q_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
 
-    SIMPL_FILTER_PARAMETER(double, RemoveValue)
+    /**
+     * @brief Setter property for RemoveValue
+     */
+    void setRemoveValue(double value);
+    /**
+     * @brief Getter property for RemoveValue
+     * @return Value of RemoveValue
+     */
+    double getRemoveValue() const;
+
     Q_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
 
-    SIMPL_FILTER_PARAMETER(double, ReplaceValue)
+    /**
+     * @brief Setter property for ReplaceValue
+     */
+    void setReplaceValue(double value);
+    /**
+     * @brief Getter property for ReplaceValue
+     * @return Value of ReplaceValue
+     */
+    double getReplaceValue() const;
+
     Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -95,23 +149,23 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -170,7 +224,11 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 
 
   private:
-    DEFINE_IDATAARRAY_WEAKPTR(Array)
+    IDataArrayWkPtrType m_ArrayPtr;
+
+    DataArrayPath m_SelectedArray = {};
+    double m_RemoveValue = {};
+    double m_ReplaceValue = {};
 
   public:
     ReplaceValueInArray(const ReplaceValueInArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 9a12b49d97..2678611050 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -35,7 +35,10 @@
 
 #include "RequiredZThickness.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -43,6 +46,8 @@
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -211,7 +216,7 @@ AbstractFilter::Pointer RequiredZThickness::newFilterInstance(bool copyFilterPar
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RequiredZThickness::getCompiledLibraryName() const
+QString RequiredZThickness::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -219,7 +224,7 @@ const QString RequiredZThickness::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RequiredZThickness::getGroupName() const
+QString RequiredZThickness::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -227,7 +232,7 @@ const QString RequiredZThickness::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid RequiredZThickness::getUuid()
+QUuid RequiredZThickness::getUuid() const
 {
   return QUuid("{1fe19578-6856-55f2-adc8-2236fac22c25}");
 }
@@ -235,7 +240,7 @@ const QUuid RequiredZThickness::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RequiredZThickness::getSubGroupName() const
+QString RequiredZThickness::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MiscFilters;
 }
@@ -243,7 +248,68 @@ const QString RequiredZThickness::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString RequiredZThickness::getHumanLabel() const
+QString RequiredZThickness::getHumanLabel() const
 {
   return "Required Z Dimension (Image Geometry)";
 }
+
+// -----------------------------------------------------------------------------
+RequiredZThickness::Pointer RequiredZThickness::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+RequiredZThickness::Pointer RequiredZThickness::New()
+{
+  Pointer sharedPtr(new(RequiredZThickness));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString RequiredZThickness::getNameOfClass() const
+{
+  return QString("RequiredZThickness");
+}
+
+// -----------------------------------------------------------------------------
+QString RequiredZThickness::ClassName()
+{
+  return QString("RequiredZThickness");
+}
+
+// -----------------------------------------------------------------------------
+void RequiredZThickness::setDataContainerSelection(const DataArrayPath& value)
+{
+  m_DataContainerSelection = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RequiredZThickness::getDataContainerSelection() const
+{
+  return m_DataContainerSelection;
+}
+
+// -----------------------------------------------------------------------------
+void RequiredZThickness::setNumZVoxels(int value)
+{
+  m_NumZVoxels = value;
+}
+
+// -----------------------------------------------------------------------------
+int RequiredZThickness::getNumZVoxels() const
+{
+  return m_NumZVoxels;
+}
+
+// -----------------------------------------------------------------------------
+void RequiredZThickness::setPreflightCheck(bool value)
+{
+  m_PreflightCheck = value;
+}
+
+// -----------------------------------------------------------------------------
+bool RequiredZThickness::getPreflightCheck() const
+{
+  return m_PreflightCheck;
+}
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 31f0048012..b1165b7689 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -36,11 +36,13 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The RequiredZThickness class. See [Filter documentation](@ref requiredzthickness) for details.
@@ -48,31 +50,80 @@
 class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(RequiredZThickness)
+    PYB11_STATIC_NEW_MACRO(RequiredZThickness)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    PYB11_FILTER_PARAMETER(int, NumZVoxels)
+    PYB11_FILTER_PARAMETER(bool, PreflightCheck)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
     PYB11_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(RequiredZThickness)
-    SIMPL_STATIC_NEW_MACRO(RequiredZThickness)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RequiredZThickness, AbstractDecisionFilter)
+    using Self = RequiredZThickness;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for RequiredZThickness
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RequiredZThickness
+     */
+    static QString ClassName();
 
     ~RequiredZThickness() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    /**
+     * @brief Setter property for DataContainerSelection
+     */
+    void setDataContainerSelection(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerSelection
+     * @return Value of DataContainerSelection
+     */
+    DataArrayPath getDataContainerSelection() const;
+
     Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
 
-    SIMPL_FILTER_PARAMETER(int, NumZVoxels)
+    /**
+     * @brief Setter property for NumZVoxels
+     */
+    void setNumZVoxels(int value);
+    /**
+     * @brief Getter property for NumZVoxels
+     * @return Value of NumZVoxels
+     */
+    int getNumZVoxels() const;
+
     Q_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
 
-    SIMPL_FILTER_PARAMETER(bool, PreflightCheck)
+    /**
+     * @brief Setter property for PreflightCheck
+     */
+    void setPreflightCheck(bool value);
+    /**
+     * @brief Getter property for PreflightCheck
+     * @return Value of PreflightCheck
+     */
+    bool getPreflightCheck() const;
+
     Q_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -82,23 +133,23 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -137,7 +188,11 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 
 
   private:
-    DEFINE_DATAARRAY_WEAKPTR(int32_t, FeatureIds)
+    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+
+    DataArrayPath m_DataContainerSelection = {};
+    int m_NumZVoxels = {};
+    bool m_PreflightCheck = {};
 
   public:
     RequiredZThickness(const RequiredZThickness&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index feecf1dbf9..23c98398b2 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ScaleVolume.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -45,6 +50,8 @@
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry2D.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief The CalculateCentroidsImpl class implements a threaded algorithm that scales the
@@ -283,7 +290,7 @@ AbstractFilter::Pointer ScaleVolume::newFilterInstance(bool copyFilterParameters
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getCompiledLibraryName() const
+QString ScaleVolume::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -291,7 +298,7 @@ const QString ScaleVolume::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getBrandingString() const
+QString ScaleVolume::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -299,7 +306,7 @@ const QString ScaleVolume::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getFilterVersion() const
+QString ScaleVolume::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -310,7 +317,7 @@ const QString ScaleVolume::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getGroupName() const
+QString ScaleVolume::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -318,7 +325,7 @@ const QString ScaleVolume::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ScaleVolume::getUuid()
+QUuid ScaleVolume::getUuid() const
 {
   return QUuid("{3cf44c27-9149-5548-945a-deef1dc994a8}");
 }
@@ -326,7 +333,7 @@ const QUuid ScaleVolume::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getSubGroupName() const
+QString ScaleVolume::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::SpatialFilters;
 }
@@ -334,7 +341,96 @@ const QString ScaleVolume::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ScaleVolume::getHumanLabel() const
+QString ScaleVolume::getHumanLabel() const
 {
   return "Change Scaling of Volume";
 }
+
+// -----------------------------------------------------------------------------
+ScaleVolume::Pointer ScaleVolume::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ScaleVolume> ScaleVolume::New()
+{
+  struct make_shared_enabler : public ScaleVolume
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ScaleVolume::getNameOfClass() const
+{
+  return QString("ScaleVolume");
+}
+
+// -----------------------------------------------------------------------------
+QString ScaleVolume::ClassName()
+{
+  return QString("ScaleVolume");
+}
+
+// -----------------------------------------------------------------------------
+void ScaleVolume::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ScaleVolume::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void ScaleVolume::setSurfaceDataContainerName(const DataArrayPath& value)
+{
+  m_SurfaceDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath ScaleVolume::getSurfaceDataContainerName() const
+{
+  return m_SurfaceDataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void ScaleVolume::setApplyToVoxelVolume(bool value)
+{
+  m_ApplyToVoxelVolume = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ScaleVolume::getApplyToVoxelVolume() const
+{
+  return m_ApplyToVoxelVolume;
+}
+
+// -----------------------------------------------------------------------------
+void ScaleVolume::setApplyToSurfaceMesh(bool value)
+{
+  m_ApplyToSurfaceMesh = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ScaleVolume::getApplyToSurfaceMesh() const
+{
+  return m_ApplyToSurfaceMesh;
+}
+
+// -----------------------------------------------------------------------------
+void ScaleVolume::setScaleFactor(const FloatVec3Type& value)
+{
+  m_ScaleFactor = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type ScaleVolume::getScaleFactor() const
+{
+  return m_ScaleFactor;
+}
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 341e624f88..3e4bfac6b6 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The ScaleVolume class. See [Filter documentation](@ref scalevolume) for details.
@@ -47,53 +48,122 @@
 class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(ScaleVolume)
+    PYB11_FILTER_NEW_MACRO(ScaleVolume)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    PYB11_FILTER_PARAMETER(DataArrayPath, SurfaceDataContainerName)
+    PYB11_FILTER_PARAMETER(bool, ApplyToVoxelVolume)
+    PYB11_FILTER_PARAMETER(bool, ApplyToSurfaceMesh)
+    PYB11_FILTER_PARAMETER(FloatVec3Type, ScaleFactor)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
     PYB11_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
     PYB11_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
     PYB11_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
     PYB11_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(ScaleVolume)
-    SIMPL_FILTER_NEW_MACRO(ScaleVolume)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ScaleVolume, AbstractFilter)
+    using Self = ScaleVolume;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<ScaleVolume> New();
+
+    /**
+     * @brief Returns the name of the class for ScaleVolume
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ScaleVolume
+     */
+    static QString ClassName();
 
     ~ScaleVolume() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    /**
+     * @brief Setter property for DataContainerName
+     */
+    void setDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerName
+     * @return Value of DataContainerName
+     */
+    DataArrayPath getDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, SurfaceDataContainerName)
+    /**
+     * @brief Setter property for SurfaceDataContainerName
+     */
+    void setSurfaceDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for SurfaceDataContainerName
+     * @return Value of SurfaceDataContainerName
+     */
+    DataArrayPath getSurfaceDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(bool, ApplyToVoxelVolume)
+    /**
+     * @brief Setter property for ApplyToVoxelVolume
+     */
+    void setApplyToVoxelVolume(bool value);
+    /**
+     * @brief Getter property for ApplyToVoxelVolume
+     * @return Value of ApplyToVoxelVolume
+     */
+    bool getApplyToVoxelVolume() const;
+
     Q_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
 
-    SIMPL_FILTER_PARAMETER(bool, ApplyToSurfaceMesh)
+    /**
+     * @brief Setter property for ApplyToSurfaceMesh
+     */
+    void setApplyToSurfaceMesh(bool value);
+    /**
+     * @brief Getter property for ApplyToSurfaceMesh
+     * @return Value of ApplyToSurfaceMesh
+     */
+    bool getApplyToSurfaceMesh() const;
+
     Q_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3Type, ScaleFactor)
+    /**
+     * @brief Setter property for ScaleFactor
+     */
+    void setScaleFactor(const FloatVec3Type& value);
+    /**
+     * @brief Getter property for ScaleFactor
+     * @return Value of ScaleFactor
+     */
+    FloatVec3Type getScaleFactor() const;
+
     Q_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -103,23 +173,23 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -187,5 +257,12 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
     ScaleVolume(ScaleVolume&&) = delete;         // Move Constructor Not Implemented
     ScaleVolume& operator=(const ScaleVolume&) = delete; // Copy Assignment Not Implemented
     ScaleVolume& operator=(ScaleVolume&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_DataContainerName = {};
+    DataArrayPath m_SurfaceDataContainerName = {};
+    bool m_ApplyToVoxelVolume = {};
+    bool m_ApplyToSurfaceMesh = {};
+    FloatVec3Type m_ScaleFactor = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index ce936a101f..5454a6868f 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -33,9 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "SetOriginResolutionImageGeom.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -44,6 +49,7 @@
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 /**
  * @brief The SetOriginResolutionImageUpdateVerticesImpl class implements a threaded algorithm that adjusts the
@@ -214,7 +220,7 @@ AbstractFilter::Pointer SetOriginResolutionImageGeom::newFilterInstance(bool cop
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getCompiledLibraryName() const
+QString SetOriginResolutionImageGeom::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -222,7 +228,7 @@ const QString SetOriginResolutionImageGeom::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getBrandingString() const
+QString SetOriginResolutionImageGeom::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -230,7 +236,7 @@ const QString SetOriginResolutionImageGeom::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getFilterVersion() const
+QString SetOriginResolutionImageGeom::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -241,7 +247,7 @@ const QString SetOriginResolutionImageGeom::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getGroupName() const
+QString SetOriginResolutionImageGeom::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -249,7 +255,7 @@ const QString SetOriginResolutionImageGeom::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid SetOriginResolutionImageGeom::getUuid()
+QUuid SetOriginResolutionImageGeom::getUuid() const
 {
   return QUuid("{6d3a3852-6251-5d2e-b749-6257fd0d8951}");
 }
@@ -257,7 +263,7 @@ const QUuid SetOriginResolutionImageGeom::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getSubGroupName() const
+QString SetOriginResolutionImageGeom::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::SpatialFilters;
 }
@@ -265,7 +271,96 @@ const QString SetOriginResolutionImageGeom::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SetOriginResolutionImageGeom::getHumanLabel() const
+QString SetOriginResolutionImageGeom::getHumanLabel() const
 {
   return "Set Origin & Spacing (Image)";
 }
+
+// -----------------------------------------------------------------------------
+SetOriginResolutionImageGeom::Pointer SetOriginResolutionImageGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<SetOriginResolutionImageGeom> SetOriginResolutionImageGeom::New()
+{
+  struct make_shared_enabler : public SetOriginResolutionImageGeom
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString SetOriginResolutionImageGeom::getNameOfClass() const
+{
+  return QString("SetOriginResolutionImageGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString SetOriginResolutionImageGeom::ClassName()
+{
+  return QString("SetOriginResolutionImageGeom");
+}
+
+// -----------------------------------------------------------------------------
+void SetOriginResolutionImageGeom::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath SetOriginResolutionImageGeom::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void SetOriginResolutionImageGeom::setChangeOrigin(bool value)
+{
+  m_ChangeOrigin = value;
+}
+
+// -----------------------------------------------------------------------------
+bool SetOriginResolutionImageGeom::getChangeOrigin() const
+{
+  return m_ChangeOrigin;
+}
+
+// -----------------------------------------------------------------------------
+void SetOriginResolutionImageGeom::setOrigin(const FloatVec3Type& value)
+{
+  m_Origin = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type SetOriginResolutionImageGeom::getOrigin() const
+{
+  return m_Origin;
+}
+
+// -----------------------------------------------------------------------------
+void SetOriginResolutionImageGeom::setChangeResolution(bool value)
+{
+  m_ChangeResolution = value;
+}
+
+// -----------------------------------------------------------------------------
+bool SetOriginResolutionImageGeom::getChangeResolution() const
+{
+  return m_ChangeResolution;
+}
+
+// -----------------------------------------------------------------------------
+void SetOriginResolutionImageGeom::setSpacing(const FloatVec3Type& value)
+{
+  m_Spacing = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type SetOriginResolutionImageGeom::getSpacing() const
+{
+  return m_Spacing;
+}
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index 9af2dc7a43..6a6fc3b84b 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The SetOriginResolutionImageGeom class. See [Filter documentation](@ref adjustvolumeorigin) for details.
@@ -47,53 +48,122 @@
 class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(SetOriginResolutionImageGeom)
+    PYB11_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    PYB11_FILTER_PARAMETER(bool, ChangeOrigin)
+    PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
+    PYB11_FILTER_PARAMETER(bool, ChangeResolution)
+    PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
     PYB11_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
     PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
     PYB11_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
     PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(SetOriginResolutionImageGeom)
-    SIMPL_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(SetOriginResolutionImageGeom, AbstractFilter)
+    using Self = SetOriginResolutionImageGeom;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<SetOriginResolutionImageGeom> New();
+
+    /**
+     * @brief Returns the name of the class for SetOriginResolutionImageGeom
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for SetOriginResolutionImageGeom
+     */
+    static QString ClassName();
 
     ~SetOriginResolutionImageGeom() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+    /**
+     * @brief Setter property for DataContainerName
+     */
+    void setDataContainerName(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerName
+     * @return Value of DataContainerName
+     */
+    DataArrayPath getDataContainerName() const;
+
     Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-    SIMPL_FILTER_PARAMETER(bool, ChangeOrigin)
+    /**
+     * @brief Setter property for ChangeOrigin
+     */
+    void setChangeOrigin(bool value);
+    /**
+     * @brief Getter property for ChangeOrigin
+     * @return Value of ChangeOrigin
+     */
+    bool getChangeOrigin() const;
+
     Q_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+    /**
+     * @brief Setter property for Origin
+     */
+    void setOrigin(const FloatVec3Type& value);
+    /**
+     * @brief Getter property for Origin
+     * @return Value of Origin
+     */
+    FloatVec3Type getOrigin() const;
+
     Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-    SIMPL_FILTER_PARAMETER(bool, ChangeResolution)
+    /**
+     * @brief Setter property for ChangeResolution
+     */
+    void setChangeResolution(bool value);
+    /**
+     * @brief Getter property for ChangeResolution
+     * @return Value of ChangeResolution
+     */
+    bool getChangeResolution() const;
+
     Q_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
 
-    SIMPL_FILTER_PARAMETER(FloatVec3Type, Spacing)
+    /**
+     * @brief Setter property for Spacing
+     */
+    void setSpacing(const FloatVec3Type& value);
+    /**
+     * @brief Getter property for Spacing
+     * @return Value of Spacing
+     */
+    FloatVec3Type getSpacing() const;
+
     Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
      */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -103,23 +173,23 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -187,5 +257,12 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
     SetOriginResolutionImageGeom(SetOriginResolutionImageGeom&&) = delete;      // Move Constructor Not Implemented
     SetOriginResolutionImageGeom& operator=(const SetOriginResolutionImageGeom&) = delete; // Copy Assignment Not Implemented
     SetOriginResolutionImageGeom& operator=(SetOriginResolutionImageGeom&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_DataContainerName = {};
+    bool m_ChangeOrigin = {};
+    FloatVec3Type m_Origin = {};
+    bool m_ChangeResolution = {};
+    FloatVec3Type m_Spacing = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 00c52a671d..74dcd31e7a 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -33,14 +33,21 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "SplitAttributeArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t {
   SplitArrayID = 1
@@ -220,7 +227,7 @@ AbstractFilter::Pointer SplitAttributeArray::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getCompiledLibraryName() const
+QString SplitAttributeArray::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -228,7 +235,7 @@ const QString SplitAttributeArray::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getBrandingString() const
+QString SplitAttributeArray::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -236,7 +243,7 @@ const QString SplitAttributeArray::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getFilterVersion() const
+QString SplitAttributeArray::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -247,7 +254,7 @@ const QString SplitAttributeArray::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getGroupName() const
+QString SplitAttributeArray::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -255,7 +262,7 @@ const QString SplitAttributeArray::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid SplitAttributeArray::getUuid()
+QUuid SplitAttributeArray::getUuid() const
 {
   return QUuid("{5ecf77f4-a38a-52ab-b4f6-0fb8a9c5cb9c}");
 }
@@ -263,7 +270,7 @@ const QUuid SplitAttributeArray::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getSubGroupName() const
+QString SplitAttributeArray::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::MemoryManagementFilters;
 }
@@ -271,7 +278,60 @@ const QString SplitAttributeArray::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString SplitAttributeArray::getHumanLabel() const
+QString SplitAttributeArray::getHumanLabel() const
 {
   return "Split Multicomponent Attribute Array";
 }
+
+// -----------------------------------------------------------------------------
+SplitAttributeArray::Pointer SplitAttributeArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<SplitAttributeArray> SplitAttributeArray::New()
+{
+  struct make_shared_enabler : public SplitAttributeArray
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString SplitAttributeArray::getNameOfClass() const
+{
+  return QString("SplitAttributeArray");
+}
+
+// -----------------------------------------------------------------------------
+QString SplitAttributeArray::ClassName()
+{
+  return QString("SplitAttributeArray");
+}
+
+// -----------------------------------------------------------------------------
+void SplitAttributeArray::setInputArrayPath(const DataArrayPath& value)
+{
+  m_InputArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath SplitAttributeArray::getInputArrayPath() const
+{
+  return m_InputArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void SplitAttributeArray::setSplitArraysSuffix(const QString& value)
+{
+  m_SplitArraysSuffix = value;
+}
+
+// -----------------------------------------------------------------------------
+QString SplitAttributeArray::getSplitArraysSuffix() const
+{
+  return m_SplitArraysSuffix;
+}
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 21988ea614..4d38297cbf 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -35,9 +35,16 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
+class IDataArray;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The SplitAttributeArray class. See [Filter documentation](@ref splitattributearray) for details.
@@ -45,41 +52,89 @@
 class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(SplitAttributeArray SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(SplitAttributeArray)
+  PYB11_FILTER_NEW_MACRO(SplitAttributeArray)
+  PYB11_FILTER_PARAMETER(DataArrayPath, InputArrayPath)
+  PYB11_FILTER_PARAMETER(QString, SplitArraysSuffix)
   PYB11_PROPERTY(DataArrayPath InputArrayPath READ getInputArrayPath WRITE setInputArrayPath)
   PYB11_PROPERTY(QString SplitArraysSuffix READ getSplitArraysSuffix WRITE setSplitArraysSuffix)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(SplitAttributeArray)
-  SIMPL_FILTER_NEW_MACRO(SplitAttributeArray)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(SplitAttributeArray, AbstractFilter)
+  using Self = SplitAttributeArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for SplitAttributeArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for SplitAttributeArray
+   */
+  static QString ClassName();
 
   ~SplitAttributeArray() override;
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, InputArrayPath)
+  /**
+   * @brief Setter property for InputArrayPath
+   */
+  void setInputArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for InputArrayPath
+   * @return Value of InputArrayPath
+   */
+  DataArrayPath getInputArrayPath() const;
+
   Q_PROPERTY(DataArrayPath InputArrayPath READ getInputArrayPath WRITE setInputArrayPath)
 
-  SIMPL_FILTER_PARAMETER(QString, SplitArraysSuffix)
+  /**
+   * @brief Setter property for SplitArraysSuffix
+   */
+  void setSplitArraysSuffix(const QString& value);
+  /**
+   * @brief Getter property for SplitArraysSuffix
+   * @return Value of SplitArraysSuffix
+   */
+  QString getSplitArraysSuffix() const;
+
   Q_PROPERTY(QString SplitArraysSuffix READ getSplitArraysSuffix WRITE setSplitArraysSuffix)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
    */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -89,23 +144,23 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -164,9 +219,13 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   void initialize();
 
 private:
-  DEFINE_IDATAARRAY_VARIABLE(InputArray)
+  IDataArrayWkPtrType m_InputArrayPtr;
+  void* m_InputArray = nullptr;
+
+  DataArrayPath m_InputArrayPath = {};
+  QString m_SplitArraysSuffix = {};
 
-  std::vector<IDataArray::Pointer> m_SplitArraysPtrVector;
+  std::vector<IDataArrayShPtrType> m_SplitArraysPtrVector;
 
 public:
   SplitAttributeArray(const SplitAttributeArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
index f2c72d30d5..4c1d0ade42 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -3,8 +3,6 @@
 // -----------------------------------------------------------------------------
 #pragma once
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/ApplyImageTransforms.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 584f0eb6f9..3ae814a52a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -53,13 +53,30 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/util/CalculatorOperator.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class DummyObserver : public Observer
 {
 public:
   DummyObserver() = default;
   ~DummyObserver() override = default;
-  SIMPL_TYPE_MACRO(DummyObserver)
+
+  /**
+   * @brief Returns the name of the class for DummyObserver
+   */
+  QString getNameOfClass() const
+  {
+    return QString("DummyObserver");
+  }
+
+  /**
+   * @brief Returns the name of the class for DummyObserver
+   */
+  QString ClassName()
+  {
+    return QString("DummyObserver");
+  }
 
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override
   {
@@ -78,7 +95,24 @@ class ArrayCalculatorTest
 public:
   ArrayCalculatorTest() = default;
   virtual ~ArrayCalculatorTest() = default;
-  SIMPL_TYPE_MACRO(ArrayCalculatorTest)
+  /**
+   * @brief Returns the name of the class for ArrayCalculatorTest
+   */
+  /**
+   * @brief Returns the name of the class for ArrayCalculatorTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("ArrayCalculatorTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for ArrayCalculatorTest
+   */
+  QString ClassName()
+  {
+    return QString("ArrayCalculatorTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index e87bd26608..3e01dff1f3 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -33,8 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QDebug>
 
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -46,6 +48,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
@@ -66,7 +70,24 @@ class CombineAttributeArraysTest
 public:
   CombineAttributeArraysTest() = default;
   virtual ~CombineAttributeArraysTest() = default;
-  SIMPL_TYPE_MACRO(CombineAttributeArraysTest)
+  /**
+   * @brief Returns the name of the class for CombineAttributeArraysTest
+   */
+  /**
+   * @brief Returns the name of the class for CombineAttributeArraysTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("CombineAttributeArraysTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for CombineAttributeArraysTest
+   */
+  QString ClassName()
+  {
+    return QString("CombineAttributeArraysTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 435d338a1d..b747e9ab91 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -33,9 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QDebug>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -45,6 +46,8 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 322ae029c9..4d98c861ba 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -33,9 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QDebug>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -45,6 +46,8 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index f9d5f5c4eb..92313d701d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -37,8 +37,12 @@
 #include <QTextStream>
 #include <QtCore/QFile>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -53,6 +57,8 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include <tbb/parallel_for.h>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index a973ccb2bb..ac45abe5ad 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -33,11 +33,12 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include <cassert>
 #include <cstdint>
 #include <vector>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/ConvertData.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -50,6 +51,8 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ConvertDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index 15f2e6e1a4..fe8065404b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -35,9 +35,12 @@
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -49,6 +52,8 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CopyFeatureArrayToElementArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 548d80233a..e6d03df13e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -60,6 +60,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CopyObjectTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 04a169015a..651b44a204 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -36,7 +36,6 @@
 
 #include <cassert>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,6 +49,8 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateAttributeMatrixTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 75faae5cff..09c170c149 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -33,8 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
@@ -48,6 +46,7 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class CreateDataArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index f658095933..e1d7d2ebaf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -36,8 +36,6 @@
 
 #include <assert.h>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,6 +48,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/CreateDataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateDataContainerTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 3c4172803e..1bf7f16fd7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -46,6 +43,8 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateFeatureArrayFromElementArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index aad7511a25..1f4792fa11 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -63,6 +63,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 793a7a7e4c..559cf3e7dd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -46,6 +46,8 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include <QVector>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index 2822db3e5c..fae53565a5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -35,8 +35,6 @@
 
 #pragma once
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -51,6 +49,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateStringArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index a791f7b21b..c8d29adfe2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -53,6 +53,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CropVertexGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index e6fe97aa5d..affc880474 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -52,7 +52,6 @@
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/CoreFilters/DataContainerWriter.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index f6a268d171..9696ca06af 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -35,8 +35,6 @@
 
 #include <QtCore/QObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -97,7 +95,6 @@ class ExecuteProcessObserver : public QObject, public IObserver
 
 public:
   ExecuteProcessObserver() = default;
-  SIMPL_TYPE_MACRO_SUPER(ExecuteProcessObserver, IObserver)
 
   ~ExecuteProcessObserver() override = default;
 
@@ -121,8 +118,11 @@ public slots:
 private:
   QString m_StdOutput;
 
-  ExecuteProcessObserver(const ExecuteProcessObserver&); // Copy Constructor Not Implemented
-  void operator=(const ExecuteProcessObserver&);         // Move assignment Not Implemented
+public:
+  ExecuteProcessObserver(const ExecuteProcessObserver&) = delete;            // Copy Constructor Not Implemented
+  ExecuteProcessObserver(ExecuteProcessObserver&&) = delete;                 // Move Constructor Not Implemented
+  ExecuteProcessObserver& operator=(const ExecuteProcessObserver&) = delete; // Copy Assignment Not Implemented
+  ExecuteProcessObserver& operator=(ExecuteProcessObserver&&) = delete;      // Move Assignment Not Implemented
 };
 
 #include "ExecuteProcessTest.moc"
@@ -229,7 +229,9 @@ class ExecuteProcessTest
     DREAM3D_REGISTER_TEST(TestExecuteProcess())
   }
 
-private:
-  ExecuteProcessTest(const ExecuteProcessTest&); // Copy Constructor Not Implemented
-  void operator=(const ExecuteProcessTest&);     // Move assignment Not Implemented
+public:
+  ExecuteProcessTest(const ExecuteProcessTest&) = delete;            // Copy Constructor Not Implemented
+  ExecuteProcessTest(ExecuteProcessTest&&) = delete;                 // Move Constructor Not Implemented
+  ExecuteProcessTest& operator=(const ExecuteProcessTest&) = delete; // Copy Assignment Not Implemented
+  ExecuteProcessTest& operator=(ExecuteProcessTest&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 2ae5053a77..5b85f8ec7f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -59,6 +59,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ExtractAttributeArraysFromGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 1dacc0199c..d2e7783ae5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -48,6 +45,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/ExtractComponentAsArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ExtractComponentAsArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 89476f2338..5490cf7273 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -8,7 +8,6 @@
 
 #include <QtCore/QFile>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -26,6 +25,8 @@
 
 // This header is auto-generated during cmake time
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ExtractVertexGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index d50f4dcc35..05dcaa5e1a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -37,7 +37,6 @@
 
 #include <QtCore/QFile>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -52,6 +51,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class FeatureDataCSVWriterTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 120ccfa8ab..ebcb4d515f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -56,6 +56,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define FDTEST_CREATE_DATA_CONTAINER(name, geom, dca)                                                                                                                                                  \
   DataContainer::Pointer _##geom##Container = DataContainer::New(#name);                                                                                                                               \
@@ -113,7 +115,24 @@ class FindDerivativesFilterTest
 public:
   FindDerivativesFilterTest() = default;
   virtual ~FindDerivativesFilterTest() = default;
-  SIMPL_TYPE_MACRO(FindDerivativesFilterTest)
+  /**
+   * @brief Returns the name of the class for FindDerivativesFilterTest
+   */
+  /**
+   * @brief Returns the name of the class for FindDerivativesFilterTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("FindDerivativesFilterTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for FindDerivativesFilterTest
+   */
+  QString ClassName()
+  {
+    return QString("FindDerivativesFilterTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 9d6c827e7c..48f46783cb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -40,9 +40,10 @@
 #include <QtCore/QJsonParseError>
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -54,6 +55,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/GenerateColorTable.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index ad2ba398fc..ae9228d0df 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -51,6 +51,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MoveDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index aefced0031..b6e46ad3bf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -35,8 +35,8 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -51,6 +51,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MoveMultiDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index ca7873d835..bdb0ecec49 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -35,7 +35,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 #include "SIMPLib/Filtering/ComparisonSet.h"
@@ -49,13 +48,30 @@
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MultiThresholdObjects2Test
 {
 public:
   MultiThresholdObjects2Test() = default;
   virtual ~MultiThresholdObjects2Test() = default;
-  SIMPL_TYPE_MACRO(MultiThresholdObjects2Test)
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects2Test
+   */
+  QString getNameOfClass() const
+  {
+    return QString("MultiThresholdObjects2Test");
+  }
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects2Test
+   */
+  QString ClassName()
+  {
+    return QString("MultiThresholdObjects2Test");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 6c9d316a85..cb9b180ee6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -35,7 +35,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -47,13 +46,30 @@
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MultiThresholdObjectsTest
 {
 public:
   MultiThresholdObjectsTest() = default;
   virtual ~MultiThresholdObjectsTest() = default;
-  SIMPL_TYPE_MACRO(MultiThresholdObjectsTest)
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjectsTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("MultiThresholdObjectsTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjectsTest
+   */
+  QString ClassName()
+  {
+    return QString("MultiThresholdObjectsTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index 9ccb4dc7b9..1d7278eda1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -71,7 +71,24 @@ class PipelinePauseTest : public QObject
   virtual ~PipelinePauseTest()
   {
   }
-  SIMPL_TYPE_MACRO(PipelinePauseTest)
+  /**
+   * @brief Returns the name of the class for PipelinePauseTest
+   */
+  /**
+   * @brief Returns the name of the class for PipelinePauseTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("PipelinePauseTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for PipelinePauseTest
+   */
+  QString ClassName()
+  {
+    return QString("PipelinePauseTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 390b96b80c..1a9d72477e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -41,12 +41,17 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
+
 #include "SIMPLib/CoreFilters/RawBinaryReader.h"
 #include "SIMPLib/SIMPLib.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 /* Testing Notes:
  *
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 2d2b388263..1e3ba3a51b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -37,8 +37,6 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -53,6 +51,8 @@
 
 #include "SIMPLib/CoreFilters/ReadASCIIData.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 const QString DataContainerName = "DataContainer";
 const QString AttributeMatrixName = "AttributeMatrix";
@@ -73,7 +73,24 @@ class ReadASCIIDataTest
 public:
   ReadASCIIDataTest() = default;
   virtual ~ReadASCIIDataTest() = default;
-  SIMPL_TYPE_MACRO(ReadASCIIDataTest)
+  /**
+   * @brief Returns the name of the class for ReadASCIIDataTest
+   */
+  /**
+   * @brief Returns the name of the class for ReadASCIIDataTest
+   */
+  QString getNameOfClass() const
+  {
+    return QString("ReadASCIIDataTest");
+  }
+
+  /**
+   * @brief Returns the name of the class for ReadASCIIDataTest
+   */
+  QString ClassName()
+  {
+    return QString("ReadASCIIDataTest");
+  }
 
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
index 2ce5451606..d51c6190da 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
@@ -1,10 +1,11 @@
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QList>
 #include <QtCore/QObject>
 
 #include "SIMPLib/Common/PipelineMessage.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -12,13 +13,36 @@ class RemoveArraysObserver : public QObject
 {
   Q_OBJECT
 
-  SIMPL_INSTANCE_PROPERTY(QList<PipelineMessage>, ErrorList)
+  /**
+   * @brief Setter property for ErrorList
+   */
+  void setErrorList(const QList<PipelineMessage>& value);
+  /**
+   * @brief Getter property for ErrorList
+   * @return Value of ErrorList
+   */
+  QList<PipelineMessage> getErrorList() const;
+
   Q_PROPERTY(QList<PipelineMessage> ErrorList READ getErrorList WRITE setErrorList)
 
 public:
-  SIMPL_SHARED_POINTERS(RemoveArraysObserver)
-  SIMPL_TYPE_MACRO(RemoveArraysObserver)
-  SIMPL_STATIC_NEW_MACRO(RemoveArraysObserver)
+  using Self = RemoveArraysObserver;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for RemoveArraysObserver
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RemoveArraysObserver
+   */
+  static QString ClassName();
+
+  static Pointer New();
 
   RemoveArraysObserver()
   {
@@ -38,5 +62,8 @@ public slots:
   RemoveArraysObserver(RemoveArraysObserver&&) = delete;      // Move Constructor Not Implemented
   RemoveArraysObserver& operator=(const RemoveArraysObserver&) = delete; // Copy Assignment Not Implemented
   RemoveArraysObserver& operator=(RemoveArraysObserver&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QList<PipelineMessage> m_ErrorList = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index a2b16abe43..55fec9f598 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -35,8 +35,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -49,6 +47,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/RemoveArrays.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RemoveArraysTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index 01e935c9f1..0392cae41e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -47,7 +44,7 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class RemoveComponentFromArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index 17ca9e6cac..c176e1e6b6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -48,6 +45,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/RenameAttributeArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameAttributeArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 95f8c3b76c..e6daaac196 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -48,6 +45,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/RenameAttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameAttributeMatrixTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 32b7fc99e7..f7e8a1e979 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -48,6 +45,8 @@
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 #include "SIMPLib/CoreFilters/RenameDataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameDataContainerTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 5d1943b922..38438375be 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -33,9 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QDebug>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -45,6 +46,8 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index d19399e99d..bc43d6ce8d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,6 +47,8 @@
 #include "SIMPLib/CoreFilters/RequiredZThickness.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RequiredZThicknessTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index dae35bef3a..683177cdaf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,6 +47,8 @@
 #include "SIMPLib/CoreFilters/ScaleVolume.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace ScaleVolumeTestConsts
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 9fec922182..b26a23d17a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -33,9 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,6 +47,8 @@
 #include "SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace SetOriginResolutionImageGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index b86c24ee4a..9d941bde45 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -33,8 +33,8 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -45,6 +45,8 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class SplitAttributeArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 7e19efea63..620cbee2dc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -53,6 +53,8 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief The WriteASCIIDataTest class
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 2dc9315c74..8151e9e67b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -37,8 +37,10 @@
 
 #include <QtCore/QFile>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -54,6 +56,8 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class WriteTriangleGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index a4e42f7e95..b0853c7a3a 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -33,11 +33,16 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "WriteASCIIData.h"
 
 #include <QtCore/QDir>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
@@ -50,7 +55,8 @@
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 /**
  * @brief The ExportDataPrivate class is a templated class that implements a method to generically
@@ -606,7 +612,7 @@ AbstractFilter::Pointer WriteASCIIData::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getCompiledLibraryName() const
+QString WriteASCIIData::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -614,7 +620,7 @@ const QString WriteASCIIData::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getBrandingString() const
+QString WriteASCIIData::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -622,7 +628,7 @@ const QString WriteASCIIData::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getFilterVersion() const
+QString WriteASCIIData::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -633,7 +639,7 @@ const QString WriteASCIIData::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getGroupName() const
+QString WriteASCIIData::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -641,7 +647,7 @@ const QString WriteASCIIData::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid WriteASCIIData::getUuid()
+QUuid WriteASCIIData::getUuid() const
 {
   return QUuid("{5fbf9204-2c6c-597b-856a-f4612adbac38}");
 }
@@ -649,7 +655,7 @@ const QUuid WriteASCIIData::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getSubGroupName() const
+QString WriteASCIIData::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::OutputFilters;
 }
@@ -657,7 +663,120 @@ const QString WriteASCIIData::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteASCIIData::getHumanLabel() const
+QString WriteASCIIData::getHumanLabel() const
 {
   return "Export ASCII Data";
 }
+
+// -----------------------------------------------------------------------------
+WriteASCIIData::Pointer WriteASCIIData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<WriteASCIIData> WriteASCIIData::New()
+{
+  struct make_shared_enabler : public WriteASCIIData
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteASCIIData::getNameOfClass() const
+{
+  return QString("WriteASCIIData");
+}
+
+// -----------------------------------------------------------------------------
+QString WriteASCIIData::ClassName()
+{
+  return QString("WriteASCIIData");
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setSelectedDataArrayPaths(const QVector<DataArrayPath>& value)
+{
+  m_SelectedDataArrayPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> WriteASCIIData::getSelectedDataArrayPaths() const
+{
+  return m_SelectedDataArrayPaths;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setOutputPath(const QString& value)
+{
+  m_OutputPath = value;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteASCIIData::getOutputPath() const
+{
+  return m_OutputPath;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setOutputFilePath(const QString& value)
+{
+  m_OutputFilePath = value;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteASCIIData::getOutputFilePath() const
+{
+  return m_OutputFilePath;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setDelimiter(int value)
+{
+  m_Delimiter = value;
+}
+
+// -----------------------------------------------------------------------------
+int WriteASCIIData::getDelimiter() const
+{
+  return m_Delimiter;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteASCIIData::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setMaxValPerLine(int value)
+{
+  m_MaxValPerLine = value;
+}
+
+// -----------------------------------------------------------------------------
+int WriteASCIIData::getMaxValPerLine() const
+{
+  return m_MaxValPerLine;
+}
+
+// -----------------------------------------------------------------------------
+void WriteASCIIData::setOutputStyle(int value)
+{
+  m_OutputStyle = value;
+}
+
+// -----------------------------------------------------------------------------
+int WriteASCIIData::getOutputStyle() const
+{
+  return m_OutputStyle;
+}
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index 61100e6400..f43f76b422 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -36,9 +36,14 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
 
 /**
  * @brief The WriteASCIIData class. See [Filter documentation](@ref writeasciidata) for details.
@@ -46,7 +51,18 @@
 class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(WriteASCIIData)
+    PYB11_FILTER_NEW_MACRO(WriteASCIIData)
+    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
+    PYB11_FILTER_PARAMETER(QString, OutputPath)
+    PYB11_FILTER_PARAMETER(QString, OutputFilePath)
+    PYB11_FILTER_PARAMETER(int, Delimiter)
+    PYB11_FILTER_PARAMETER(QString, FileExtension)
+    PYB11_FILTER_PARAMETER(int, MaxValPerLine)
+    PYB11_FILTER_PARAMETER(int, OutputStyle)
     PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
     PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
     PYB11_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
@@ -54,33 +70,111 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
     PYB11_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
     PYB11_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
     PYB11_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(WriteASCIIData)
-    SIMPL_FILTER_NEW_MACRO(WriteASCIIData)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(WriteASCIIData, AbstractFilter)
+    using Self = WriteASCIIData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<WriteASCIIData> New();
+
+    /**
+     * @brief Returns the name of the class for WriteASCIIData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for WriteASCIIData
+     */
+    static QString ClassName();
 
     ~WriteASCIIData() override;
 
-    SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
+    /**
+     * @brief Setter property for SelectedDataArrayPaths
+     */
+    void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
+    /**
+     * @brief Getter property for SelectedDataArrayPaths
+     * @return Value of SelectedDataArrayPaths
+     */
+    QVector<DataArrayPath> getSelectedDataArrayPaths() const;
+
     Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
 
-    SIMPL_FILTER_PARAMETER(QString, OutputPath)
+    /**
+     * @brief Setter property for OutputPath
+     */
+    void setOutputPath(const QString& value);
+    /**
+     * @brief Getter property for OutputPath
+     * @return Value of OutputPath
+     */
+    QString getOutputPath() const;
+
     Q_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
 
-    SIMPL_FILTER_PARAMETER(QString, OutputFilePath)
+    /**
+     * @brief Setter property for OutputFilePath
+     */
+    void setOutputFilePath(const QString& value);
+    /**
+     * @brief Getter property for OutputFilePath
+     * @return Value of OutputFilePath
+     */
+    QString getOutputFilePath() const;
+
     Q_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
 
-    SIMPL_FILTER_PARAMETER(int, Delimiter)
+    /**
+     * @brief Setter property for Delimiter
+     */
+    void setDelimiter(int value);
+    /**
+     * @brief Getter property for Delimiter
+     * @return Value of Delimiter
+     */
+    int getDelimiter() const;
+
     Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
 
-    SIMPL_FILTER_PARAMETER(QString, FileExtension)
+    /**
+     * @brief Setter property for FileExtension
+     */
+    void setFileExtension(const QString& value);
+    /**
+     * @brief Getter property for FileExtension
+     * @return Value of FileExtension
+     */
+    QString getFileExtension() const;
+
     Q_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
 
-    SIMPL_FILTER_PARAMETER(int, MaxValPerLine)
+    /**
+     * @brief Setter property for MaxValPerLine
+     */
+    void setMaxValPerLine(int value);
+    /**
+     * @brief Getter property for MaxValPerLine
+     * @return Value of MaxValPerLine
+     */
+    int getMaxValPerLine() const;
+
     Q_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
 
-    SIMPL_FILTER_PARAMETER(int, OutputStyle)
+    /**
+     * @brief Setter property for OutputStyle
+     */
+    void setOutputStyle(int value);
+    /**
+     * @brief Getter property for OutputStyle
+     * @return Value of OutputStyle
+     */
+    int getOutputStyle() const;
+
     Q_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
 
     enum DelimiterType
@@ -101,21 +195,21 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -125,23 +219,23 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -200,6 +294,14 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
 
 
   private:
+    QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
+    QString m_OutputPath = {};
+    QString m_OutputFilePath = {};
+    int m_Delimiter = {};
+    QString m_FileExtension = {};
+    int m_MaxValPerLine = {};
+    int m_OutputStyle = {};
+
     /**
      * @brief lookupDelimiter Returns the char representation for the
      * selected delimiter
@@ -211,12 +313,12 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
      * @brief Specific function to write string arrays to a text file
      * @param inputData
      */
-    void writeStringArray(const IDataArray::Pointer& inputData, const QString& outputFile, char delimiter);
+    void writeStringArray(const IDataArrayShPtrType& inputData, const QString& outputFile, char delimiter);
 
     /**
      * @brief m_SelectedWeakPtrVector
      */
-    QVector<IDataArray::WeakPointer> m_SelectedWeakPtrVector;
+    QVector<IDataArrayWkPtrType> m_SelectedWeakPtrVector;
 
     /**
      * @brief writeMultifileOutput
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 04787b1d4f..50632b0ba8 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -33,13 +33,18 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "WriteTriangleGeometry.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
@@ -47,6 +52,8 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define WRITE_EDGES_FILE 0
 
@@ -298,7 +305,7 @@ AbstractFilter::Pointer WriteTriangleGeometry::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getCompiledLibraryName() const
+QString WriteTriangleGeometry::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -306,7 +313,7 @@ const QString WriteTriangleGeometry::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getBrandingString() const
+QString WriteTriangleGeometry::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -314,7 +321,7 @@ const QString WriteTriangleGeometry::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getFilterVersion() const
+QString WriteTriangleGeometry::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -325,7 +332,7 @@ const QString WriteTriangleGeometry::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getGroupName() const
+QString WriteTriangleGeometry::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -333,7 +340,7 @@ const QString WriteTriangleGeometry::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid WriteTriangleGeometry::getUuid()
+QUuid WriteTriangleGeometry::getUuid() const
 {
   return QUuid("{5e523ec1-49ac-541e-a4ba-6fa725798b91}");
 }
@@ -341,7 +348,7 @@ const QUuid WriteTriangleGeometry::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getSubGroupName() const
+QString WriteTriangleGeometry::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::OutputFilters;
 }
@@ -349,7 +356,72 @@ const QString WriteTriangleGeometry::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString WriteTriangleGeometry::getHumanLabel() const
+QString WriteTriangleGeometry::getHumanLabel() const
 {
   return "Export Triangle Geometry";
 }
+
+// -----------------------------------------------------------------------------
+WriteTriangleGeometry::Pointer WriteTriangleGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<WriteTriangleGeometry> WriteTriangleGeometry::New()
+{
+  struct make_shared_enabler : public WriteTriangleGeometry
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteTriangleGeometry::getNameOfClass() const
+{
+  return QString("WriteTriangleGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString WriteTriangleGeometry::ClassName()
+{
+  return QString("WriteTriangleGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void WriteTriangleGeometry::setDataContainerSelection(const DataArrayPath& value)
+{
+  m_DataContainerSelection = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath WriteTriangleGeometry::getDataContainerSelection() const
+{
+  return m_DataContainerSelection;
+}
+
+// -----------------------------------------------------------------------------
+void WriteTriangleGeometry::setOutputNodesFile(const QString& value)
+{
+  m_OutputNodesFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteTriangleGeometry::getOutputNodesFile() const
+{
+  return m_OutputNodesFile;
+}
+
+// -----------------------------------------------------------------------------
+void WriteTriangleGeometry::setOutputTrianglesFile(const QString& value)
+{
+  m_OutputTrianglesFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString WriteTriangleGeometry::getOutputTrianglesFile() const
+{
+  return m_OutputTrianglesFile;
+}
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index ef8f476226..cbe8cd2b8d 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -36,11 +36,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -56,45 +56,94 @@
 class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(WriteTriangleGeometry)
+    PYB11_FILTER_NEW_MACRO(WriteTriangleGeometry)
+    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    PYB11_FILTER_PARAMETER(QString, OutputNodesFile)
+    PYB11_FILTER_PARAMETER(QString, OutputTrianglesFile)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
     PYB11_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
+#endif
 
   public:
-    SIMPL_SHARED_POINTERS(WriteTriangleGeometry)
-    SIMPL_FILTER_NEW_MACRO(WriteTriangleGeometry)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(WriteTriangleGeometry, AbstractFilter)
+    using Self = WriteTriangleGeometry;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static std::shared_ptr<WriteTriangleGeometry> New();
+
+    /**
+     * @brief Returns the name of the class for WriteTriangleGeometry
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for WriteTriangleGeometry
+     */
+    static QString ClassName();
 
     ~WriteTriangleGeometry() override;
 
-    SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
+    /**
+     * @brief Setter property for DataContainerSelection
+     */
+    void setDataContainerSelection(const DataArrayPath& value);
+    /**
+     * @brief Getter property for DataContainerSelection
+     * @return Value of DataContainerSelection
+     */
+    DataArrayPath getDataContainerSelection() const;
+
     Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
 
-    SIMPL_FILTER_PARAMETER(QString, OutputNodesFile)
+    /**
+     * @brief Setter property for OutputNodesFile
+     */
+    void setOutputNodesFile(const QString& value);
+    /**
+     * @brief Getter property for OutputNodesFile
+     * @return Value of OutputNodesFile
+     */
+    QString getOutputNodesFile() const;
+
     Q_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
 
-    SIMPL_FILTER_PARAMETER(QString, OutputTrianglesFile)
+    /**
+     * @brief Setter property for OutputTrianglesFile
+     */
+    void setOutputTrianglesFile(const QString& value);
+    /**
+     * @brief Getter property for OutputTrianglesFile
+     * @return Value of OutputTrianglesFile
+     */
+    QString getOutputTrianglesFile() const;
+
     Q_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
 
     /**
      * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
      */
-    const QString getCompiledLibraryName() const override;
+    QString getCompiledLibraryName() const override;
 
     /**
      * @brief getBrandingString Returns the branding string for the filter, which is a tag
      * used to denote the filter's association with specific plugins
      * @return Branding string
     */
-    const QString getBrandingString() const override;
+    QString getBrandingString() const override;
 
     /**
      * @brief getFilterVersion Returns a version string for this filter. Default
      * value is an empty string.
      * @return
      */
-    const QString getFilterVersion() const override;
+    QString getFilterVersion() const override;
 
     /**
      * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -104,23 +153,23 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
     /**
      * @brief getGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getGroupName() const override;
+    QString getGroupName() const override;
 
     /**
      * @brief getSubGroupName Reimplemented from @see AbstractFilter class
      */
-    const QString getSubGroupName() const override;
+    QString getSubGroupName() const override;
 
     /**
      * @brief getUuid Return the unique identifier for this filter.
      * @return A QUuid object.
      */
-    const QUuid getUuid() override;
+    QUuid getUuid() const override;
 
     /**
      * @brief getHumanLabel Reimplemented from @see AbstractFilter class
      */
-    const QString getHumanLabel() const override;
+    QString getHumanLabel() const override;
 
     /**
      * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -183,5 +232,10 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
     WriteTriangleGeometry(WriteTriangleGeometry&&) = delete;      // Move Constructor Not Implemented
     WriteTriangleGeometry& operator=(const WriteTriangleGeometry&) = delete; // Copy Assignment Not Implemented
     WriteTriangleGeometry& operator=(WriteTriangleGeometry&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataArrayPath m_DataContainerSelection = {};
+    QString m_OutputNodesFile = {};
+    QString m_OutputTrianglesFile = {};
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp b/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
index a4bfc97ec4..72b2fb171b 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ABSOperator.h"
 
@@ -60,5 +60,11 @@ ABSOperator::~ABSOperator() = default;
 // -----------------------------------------------------------------------------
 void ABSOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, fabs)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, fabs);
+}
+
+// -----------------------------------------------------------------------------
+ABSOperator::Pointer ABSOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.h b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
index 0ebfb880c4..8e2796eeeb 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT ABSOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(ABSOperator)
+    using Self = ABSOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT ABSOperator : public UnaryOperator
     ABSOperator(ABSOperator&&) = delete;         // Move Constructor Not Implemented
     ABSOperator& operator=(const ABSOperator&) = delete; // Copy Assignment Not Implemented
     ABSOperator& operator=(ABSOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
index 295192c0bf..ed41e66efa 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
@@ -58,7 +58,11 @@ ACosOperator::~ACosOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ACosOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void ACosOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                             QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, acos)}
+
+// -----------------------------------------------------------------------------
+ACosOperator::Pointer ACosOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, acos)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.h b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
index b45684e494..3c6cea1ba9 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT ACosOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(ACosOperator)
+    using Self = ACosOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT ACosOperator : public UnaryOperator
     ACosOperator(ACosOperator&&) = delete;        // Move Constructor Not Implemented
     ACosOperator& operator=(const ACosOperator&) = delete; // Copy Assignment Not Implemented
     ACosOperator& operator=(ACosOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 990846a75a..983ca8547a 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -47,15 +47,14 @@
 
 class ASCIIWizardData
 {
+#ifdef SIMPL_ENABLE_PYTHON
   // clang-format off
-  PYB11_CREATE_BINDINGS(ASCIIWizardData)
-  
+  PYB11_CREATE_BINDINGS(ASCIIWizardData) 
   PYB11_CREATION(ASCIIWizardData ARGS QString int int)
-
   PYB11_METHOD(void updateDataArrayPath ARGS DataArrayPath::RenameType,renamePath)
   PYB11_METHOD(bool isEmpty)
   // clang-format on
-
+#endif
 public:
   ASCIIWizardData() = default;
 
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp b/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
index d97a80bd0e..6a70ce0257 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ASinOperator.h"
 
@@ -58,7 +58,11 @@ ASinOperator::~ASinOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ASinOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void ASinOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                             QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, asin)}
+
+// -----------------------------------------------------------------------------
+ASinOperator::Pointer ASinOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, asin)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.h b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
index ff4d06e63e..1de09c0c19 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT ASinOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(ASinOperator)
+    using Self = ASinOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT ASinOperator : public UnaryOperator
     ASinOperator(ASinOperator&&) = delete;        // Move Constructor Not Implemented
     ASinOperator& operator=(const ASinOperator&) = delete; // Copy Assignment Not Implemented
     ASinOperator& operator=(ASinOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
index 759e672555..1459269948 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
@@ -58,7 +58,11 @@ ATanOperator::~ATanOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ATanOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void ATanOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                             QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, atan)}
+
+// -----------------------------------------------------------------------------
+ATanOperator::Pointer ATanOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, atan)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.h b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
index b2d5b9c884..1bfa530f18 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT ATanOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(ATanOperator)
+    using Self = ATanOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT ATanOperator : public UnaryOperator
     ATanOperator(ATanOperator&&) = delete;        // Move Constructor Not Implemented
     ATanOperator& operator=(const ATanOperator&) = delete; // Copy Assignment Not Implemented
     ATanOperator& operator=(ATanOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index a9ceac92fd..169086c31d 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -31,7 +31,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/SIMPLib.h"
@@ -41,14 +40,50 @@
 class AbstractDataParser
 {
 public:
-  SIMPL_SHARED_POINTERS(AbstractDataParser)
-  SIMPL_TYPE_MACRO(AbstractDataParser)
+  using Self = AbstractDataParser;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const
+  {
+    return QString("AbstractDataParser");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("AbstractDataParser");
+  }
 
   virtual ~AbstractDataParser() = default;
 
-  SIMPL_INSTANCE_STRING_PROPERTY(ColumnName)
-  SIMPL_INSTANCE_PROPERTY(int, ColumnIndex)
-  
+  void setColumnName(const QString& value)
+  {
+    m_ColumnName = value;
+  }
+  QString getColumnName()
+  {
+    return m_ColumnName;
+  }
+
+  void setColumnIndex(int32_t value)
+  {
+    m_ColumnIndex = value;
+  }
+  int32_t getColumnIndex()
+  {
+    return m_ColumnIndex;
+  }
+
   virtual void setDataArray(IDataArray::Pointer value)
   {
     m_DataArray = value;
@@ -67,14 +102,13 @@ class AbstractDataParser
   virtual ParserFunctor::ErrorObject parse(const QString& token, size_t index) = 0;
 
 protected:
-  AbstractDataParser() :
-  m_ColumnIndex(0)
-  {
-  }
+  AbstractDataParser() = default;
 
 private:
   IDataArray::Pointer m_DataArray;
-  
+  int32_t m_ColumnIndex = 0;
+  QString m_ColumnName = QString("");
+
   AbstractDataParser(const AbstractDataParser&); // Copy Constructor Not Implemented
   void operator=(const AbstractDataParser&);     // Move assignment Not Implemented
 };
@@ -82,13 +116,35 @@ class AbstractDataParser
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename ArrayType, class F> class Parser : public AbstractDataParser
+template <typename ArrayType, class F>
+class Parser : public AbstractDataParser
 {
 public:
-  typedef Parser<ArrayType, F> SelfType;
-
-  SIMPL_SHARED_POINTERS(SelfType)
-  SIMPL_TYPE_MACRO(SelfType)
+  using SelfType = Parser<ArrayType, F>;
+
+  using Self = SelfType;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const
+  {
+    return QString("Parser<ArrayType, F>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("Parser<ArrayType, F>");
+  }
 
   static Pointer New(typename ArrayType::Pointer ptr, const QString& name, int colIndex)
   {
@@ -142,20 +198,19 @@ template <typename ArrayType, class F> class Parser : public AbstractDataParser
   
 };
 
-typedef Parser<Int8ArrayType, Int8Functor> Int8ParserType;
-typedef Parser<UInt8ArrayType, UInt8Functor> UInt8ParserType;
-
-typedef Parser<Int16ArrayType, Int16Functor> Int16ParserType;
-typedef Parser<UInt16ArrayType, UInt16Functor> UInt16ParserType;
+using Int8ParserType = Parser<Int8ArrayType, Int8Functor>;
+using UInt8ParserType = Parser<UInt8ArrayType, UInt8Functor>;
 
-typedef Parser<Int32ArrayType, Int32Functor> Int32ParserType;
-typedef Parser<UInt32ArrayType, UInt32Functor> UInt32ParserType;
+using Int16ParserType = Parser<Int16ArrayType, Int16Functor>;
+using UInt16ParserType = Parser<UInt16ArrayType, UInt16Functor>;
 
-typedef Parser<Int64ArrayType, Int64Functor> Int64ParserType;
-typedef Parser<UInt64ArrayType, UInt64Functor> UInt64ParserType;
+using Int32ParserType = Parser<Int32ArrayType, Int32Functor>;
+using UInt32ParserType = Parser<UInt32ArrayType, UInt32Functor>;
 
-typedef Parser<FloatArrayType, FloatFunctor> FloatParserType;
-typedef Parser<DoubleArrayType, DoubleFunctor> DoubleParserType;
+using Int64ParserType = Parser<Int64ArrayType, Int64Functor>;
+using UInt64ParserType = Parser<UInt64ArrayType, UInt64Functor>;
 
-typedef Parser<StringDataArray, StringFunctor> StringParserType;
+using FloatParserType = Parser<FloatArrayType, FloatFunctor>;
+using DoubleParserType = Parser<DoubleArrayType, DoubleFunctor>;
 
+using StringParserType = Parser<StringDataArray, StringFunctor>;
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
index f12b0ee959..a730a466d2 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
@@ -58,7 +58,11 @@ AdditionOperator::~AdditionOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AdditionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void AdditionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                                 QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, +)}
+
+// -----------------------------------------------------------------------------
+AdditionOperator::Pointer AdditionOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, +)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
index 862c9bf2a1..1e2269d584 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT AdditionOperator : public BinaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(AdditionOperator)
+    using Self = AdditionOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT AdditionOperator : public BinaryOperator
     AdditionOperator(AdditionOperator&&) = delete;      // Move Constructor Not Implemented
     AdditionOperator& operator=(const AdditionOperator&) = delete; // Copy Assignment Not Implemented
     AdditionOperator& operator=(AdditionOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
index e6f6362878..87256f3a6b 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
@@ -88,3 +88,9 @@ CalculatorItem::ErrorCode BinaryOperator::checkValidity(QVector<CalculatorItem::
 
   return CalculatorItem::ErrorCode::SUCCESS;
 }
+
+// -----------------------------------------------------------------------------
+BinaryOperator::Pointer BinaryOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
index 0c157071b8..2436469cf6 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
@@ -35,12 +35,21 @@
 
 #pragma once
 
+#include <memory>
+
 #include "CalculatorOperator.h"
 
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(BinaryOperator)
+    using Self = BinaryOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -61,6 +70,8 @@ class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
     BinaryOperator(BinaryOperator&&) = delete;      // Move Constructor Not Implemented
     BinaryOperator& operator=(const BinaryOperator&) = delete; // Copy Assignment Not Implemented
     BinaryOperator& operator=(BinaryOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 #define CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, op)                                                                                                              \
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index e168e31b56..e999432364 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -45,8 +45,30 @@
 template <typename T>
 class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
 {
-  public:
-    SIMPL_SHARED_POINTERS(CalculatorArray)
+public:
+  using Self = CalculatorArray<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const
+  {
+    return QString("CalculatorArray<T>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("CalculatorArray<T>");
+  }
 
     static Pointer New(typename DataArray<T>::Pointer dataArray, ValueType type, bool allocate)
     {
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
index 6db25dbbd9..d68a85184d 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
@@ -98,3 +98,9 @@ bool CalculatorItem::isNumber()
 
   return false;
 }
+
+// -----------------------------------------------------------------------------
+CalculatorItem::Pointer CalculatorItem::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index d2e3b9dfaf..ea50f17d0a 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -35,14 +35,24 @@
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
+/**
+ * @brief The CalculatorItem class
+ */
 class SIMPLib_EXPORT CalculatorItem
 {
   public:
-    SIMPL_SHARED_POINTERS(CalculatorItem)
+    using Self = CalculatorItem;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     virtual ~CalculatorItem();
 
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
index 84696a0706..06fbd71b6d 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
@@ -118,3 +118,9 @@ double CalculatorOperator::root(double base, double root)
 
   return pow(base, 1 / root);
 }
+
+// -----------------------------------------------------------------------------
+CalculatorOperator::Pointer CalculatorOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index 5def7db93c..8459dacd8e 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -43,6 +45,7 @@
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
 {
@@ -53,7 +56,12 @@ class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
       Binary
     };
 
-    SIMPL_SHARED_POINTERS(CalculatorOperator)
+    using Self = CalculatorOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static double toDegrees(double radians);
     static double toRadians(double degrees);
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
index 80819db97e..5819696b10 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
@@ -44,3 +44,9 @@ CalculatorSeparator::CalculatorSeparator() = default;
 //
 // -----------------------------------------------------------------------------
 CalculatorSeparator::~CalculatorSeparator() = default;
+
+// -----------------------------------------------------------------------------
+CalculatorSeparator::Pointer CalculatorSeparator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
index e115cc734c..1d6e9c47b2 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "CalculatorItem.h"
@@ -42,7 +44,12 @@
 class SIMPLib_EXPORT CalculatorSeparator : public CalculatorItem
 {
   public:
-    SIMPL_SHARED_POINTERS(CalculatorSeparator)
+    using Self = CalculatorSeparator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     ~CalculatorSeparator() override;
 
@@ -54,5 +61,7 @@ class SIMPLib_EXPORT CalculatorSeparator : public CalculatorItem
     CalculatorSeparator(CalculatorSeparator&&) = delete;      // Move Constructor Not Implemented
     CalculatorSeparator& operator=(const CalculatorSeparator&) = delete; // Copy Assignment Not Implemented
     CalculatorSeparator& operator=(CalculatorSeparator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp b/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
index 165ce5a51f..a9775f7393 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CeilOperator.h"
 
@@ -60,5 +60,11 @@ CeilOperator::~CeilOperator() = default;
 // -----------------------------------------------------------------------------
 void CeilOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, ceil)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, ceil);
+}
+
+// -----------------------------------------------------------------------------
+CeilOperator::Pointer CeilOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.h b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
index 6a44ce2739..c3a647e7f2 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT CeilOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(CeilOperator)
+    using Self = CeilOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT CeilOperator : public UnaryOperator
     CeilOperator(CeilOperator&&) = delete;        // Move Constructor Not Implemented
     CeilOperator& operator=(const CeilOperator&) = delete; // Copy Assignment Not Implemented
     CeilOperator& operator=(CeilOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
index 2218772060..2968954548 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
@@ -76,3 +76,9 @@ CalculatorItem::ErrorCode CommaSeparator::checkValidity(QVector<CalculatorItem::
 
   return CalculatorItem::ErrorCode::SUCCESS;
 }
+
+// -----------------------------------------------------------------------------
+CommaSeparator::Pointer CommaSeparator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
index 718196716c..51e93ef0ae 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "CalculatorSeparator.h"
@@ -42,7 +44,12 @@
 class SIMPLib_EXPORT CommaSeparator : public CalculatorSeparator
 {
   public:
-    SIMPL_SHARED_POINTERS(CommaSeparator)
+    using Self = CommaSeparator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -61,5 +68,7 @@ class SIMPLib_EXPORT CommaSeparator : public CalculatorSeparator
     CommaSeparator(CommaSeparator&&) = delete;      // Move Constructor Not Implemented
     CommaSeparator& operator=(const CommaSeparator&) = delete; // Copy Assignment Not Implemented
     CommaSeparator& operator=(CommaSeparator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
index 3ee233c24d..4188724940 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
@@ -58,7 +58,11 @@ CosOperator::~CosOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void CosOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void CosOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                            QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, cos)}
+
+// -----------------------------------------------------------------------------
+CosOperator::Pointer CosOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, cos)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.h b/Source/SIMPLib/CoreFilters/util/CosOperator.h
index eaa424741e..a00566b73b 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT CosOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(CosOperator)
+    using Self = CosOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT CosOperator : public UnaryOperator
     CosOperator(CosOperator&&) = delete;         // Move Constructor Not Implemented
     CosOperator& operator=(const CosOperator&) = delete; // Copy Assignment Not Implemented
     CosOperator& operator=(CosOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
index 15af2a8bca..233ab78849 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
@@ -61,7 +61,11 @@ DivisionOperator::~DivisionOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DivisionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void DivisionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                                 QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, /)}
+
+// -----------------------------------------------------------------------------
+DivisionOperator::Pointer DivisionOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, /)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
index 521255b23d..a14de4e6e8 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -44,7 +46,12 @@
 class SIMPLib_EXPORT DivisionOperator : public BinaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(DivisionOperator)
+    using Self = DivisionOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -63,5 +70,7 @@ class SIMPLib_EXPORT DivisionOperator : public BinaryOperator
     DivisionOperator(DivisionOperator&&) = delete;      // Move Constructor Not Implemented
     DivisionOperator& operator=(const DivisionOperator&) = delete; // Copy Assignment Not Implemented
     DivisionOperator& operator=(DivisionOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp b/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
index ab774cdb0e..0849da3490 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ExpOperator.h"
 
@@ -60,5 +60,11 @@ ExpOperator::~ExpOperator() = default;
 // -----------------------------------------------------------------------------
 void ExpOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, exp)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, exp);
+}
+
+// -----------------------------------------------------------------------------
+ExpOperator::Pointer ExpOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.h b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
index 0a7cd90c35..b8bc3fce1c 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT ExpOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(ExpOperator)
+    using Self = ExpOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT ExpOperator : public UnaryOperator
     ExpOperator(ExpOperator&&) = delete;         // Move Constructor Not Implemented
     ExpOperator& operator=(const ExpOperator&) = delete; // Copy Assignment Not Implemented
     ExpOperator& operator=(ExpOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
index e5f153d277..d0307aefcb 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
@@ -58,7 +58,11 @@ FloorOperator::~FloorOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloorOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void FloorOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                              QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, floor)}
+
+// -----------------------------------------------------------------------------
+FloorOperator::Pointer FloorOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, floor)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.h b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
index 9ec56bd8d3..c28666a7ce 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT FloorOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(FloorOperator)
+    using Self = FloorOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT FloorOperator : public UnaryOperator
     FloorOperator(FloorOperator&&) = delete;       // Move Constructor Not Implemented
     FloorOperator& operator=(const FloorOperator&) = delete; // Copy Assignment Not Implemented
     FloorOperator& operator=(FloorOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
index d20b759f98..190705a2b6 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
@@ -44,3 +44,9 @@ ICalculatorArray::ICalculatorArray() = default;
 //
 // -----------------------------------------------------------------------------
 ICalculatorArray::~ICalculatorArray() = default;
+
+// -----------------------------------------------------------------------------
+ICalculatorArray::Pointer ICalculatorArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
index a1e4580d41..39a420df73 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
@@ -36,8 +36,13 @@
 #pragma once
 
 
-#include "SIMPLib/DataArrays/DataArray.hpp"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 #include "CalculatorItem.h"
 
@@ -51,11 +56,16 @@ class SIMPLib_EXPORT ICalculatorArray : public CalculatorItem
       Unknown
     };
 
-    SIMPL_SHARED_POINTERS(ICalculatorArray)
+    using Self = ICalculatorArray;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     ~ICalculatorArray() override;
 
-    virtual IDataArray::Pointer getArray() = 0;
+    virtual IDataArrayShPtrType getArray() = 0;
     virtual double getValue(int i) = 0;
     virtual void setValue(int i, double value) = 0;
     virtual ValueType getType() = 0;
@@ -70,5 +80,7 @@ class SIMPLib_EXPORT ICalculatorArray : public CalculatorItem
     ICalculatorArray(ICalculatorArray&&) = delete;      // Move Constructor Not Implemented
     ICalculatorArray& operator=(const ICalculatorArray&) = delete; // Copy Assignment Not Implemented
     ICalculatorArray& operator=(ICalculatorArray&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
index 6e41eba8f8..2c50dba0bd 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
@@ -79,3 +79,9 @@ CalculatorItem::ErrorCode LeftParenthesisItem::checkValidity(QVector<CalculatorI
 
   return LeftParenthesisItem::ErrorCode::MISMATCHED_PARENTHESES;
 }
+
+// -----------------------------------------------------------------------------
+LeftParenthesisItem::Pointer LeftParenthesisItem::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
index e68b6726ab..6dc981d821 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
@@ -35,6 +35,10 @@
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QVector>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "CalculatorItem.h"
@@ -42,7 +46,12 @@
 class SIMPLib_EXPORT LeftParenthesisItem : public CalculatorItem
 {
   public:
-    SIMPL_SHARED_POINTERS(LeftParenthesisItem)
+    using Self = LeftParenthesisItem;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -51,6 +60,13 @@ class SIMPLib_EXPORT LeftParenthesisItem : public CalculatorItem
 
     ~LeftParenthesisItem() override;
 
+    /**
+     * @brief checkValidity
+     * @param infixVector
+     * @param currentIndex
+     * @param msg
+     * @return
+     */
     CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
 
   protected:
@@ -61,5 +77,7 @@ class SIMPLib_EXPORT LeftParenthesisItem : public CalculatorItem
     LeftParenthesisItem(LeftParenthesisItem&&) = delete;      // Move Constructor Not Implemented
     LeftParenthesisItem& operator=(const LeftParenthesisItem&) = delete; // Copy Assignment Not Implemented
     LeftParenthesisItem& operator=(LeftParenthesisItem&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.cpp b/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
index 05b19ab172..1fe5aeb1a2 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LnOperator.h"
 
@@ -60,5 +60,11 @@ LnOperator::~LnOperator() = default;
 // -----------------------------------------------------------------------------
 void LnOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, log)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, log);
+}
+
+// -----------------------------------------------------------------------------
+LnOperator::Pointer LnOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.h b/Source/SIMPLib/CoreFilters/util/LnOperator.h
index 65b9e71a33..2a4c35bf1b 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT LnOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(LnOperator)
+    using Self = LnOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT LnOperator : public UnaryOperator
     LnOperator(LnOperator&&) = delete;          // Move Constructor Not Implemented
     LnOperator& operator=(const LnOperator&) = delete; // Copy Assignment Not Implemented
     LnOperator& operator=(LnOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp b/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
index ad5eca0f00..b04a03dc06 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "Log10Operator.h"
 
@@ -60,5 +60,11 @@ Log10Operator::~Log10Operator() = default;
 // -----------------------------------------------------------------------------
 void Log10Operator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, log10)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, log10);
+}
+
+// -----------------------------------------------------------------------------
+Log10Operator::Pointer Log10Operator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.h b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
index b636199a6e..1f75c657c0 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.h
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT Log10Operator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(Log10Operator)
+    using Self = Log10Operator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT Log10Operator : public UnaryOperator
     Log10Operator(Log10Operator&&) = delete;       // Move Constructor Not Implemented
     Log10Operator& operator=(const Log10Operator&) = delete; // Copy Assignment Not Implemented
     Log10Operator& operator=(Log10Operator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
index fe81fa42c3..0304409865 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
@@ -70,3 +70,9 @@ double LogOperator::log_arbitrary_base(double base, double value)
 {
   return log(value) / log(base);
 }
+
+// -----------------------------------------------------------------------------
+LogOperator::Pointer LogOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.h b/Source/SIMPLib/CoreFilters/util/LogOperator.h
index 721966d7ac..18141f3303 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT LogOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(LogOperator)
+    using Self = LogOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
index 261efcb4cc..4c4585e5fb 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
@@ -58,7 +58,11 @@ MultiplicationOperator::~MultiplicationOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiplicationOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void MultiplicationOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                                       QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, *)}
+
+// -----------------------------------------------------------------------------
+MultiplicationOperator::Pointer MultiplicationOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, *)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
index ca38a008ff..a8514bcad2 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -44,7 +46,12 @@
 class SIMPLib_EXPORT MultiplicationOperator : public BinaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(MultiplicationOperator)
+    using Self = MultiplicationOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -63,5 +70,7 @@ class SIMPLib_EXPORT MultiplicationOperator : public BinaryOperator
     MultiplicationOperator(MultiplicationOperator&&) = delete;      // Move Constructor Not Implemented
     MultiplicationOperator& operator=(const MultiplicationOperator&) = delete; // Copy Assignment Not Implemented
     MultiplicationOperator& operator=(MultiplicationOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
index 67edce8a30..7603cded2f 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
@@ -108,3 +108,9 @@ CalculatorItem::ErrorCode NegativeOperator::checkValidity(QVector<CalculatorItem
 
   return NegativeOperator::ErrorCode::SUCCESS;
 }
+
+// -----------------------------------------------------------------------------
+NegativeOperator::Pointer NegativeOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
index 5f2c031586..8fc88b0190 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -44,7 +46,12 @@
 class SIMPLib_EXPORT NegativeOperator : public CalculatorOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(NegativeOperator)
+    using Self = NegativeOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT NegativeOperator : public CalculatorOperator
     NegativeOperator(NegativeOperator&&) = delete;      // Move Constructor Not Implemented
     NegativeOperator& operator=(const NegativeOperator&) = delete; // Copy Assignment Not Implemented
     NegativeOperator& operator=(NegativeOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
index 7f8c71d0bc..10acf47e2d 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
@@ -58,7 +58,11 @@ PowOperator::~PowOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PowOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void PowOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                            QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_TWO_ARGUMENTS(filter, calculatedArrayPath, executionStack, pow)}
+
+// -----------------------------------------------------------------------------
+PowOperator::Pointer PowOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_TWO_ARGUMENTS(filter, calculatedArrayPath, executionStack, pow)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.h b/Source/SIMPLib/CoreFilters/util/PowOperator.h
index c6dfc62df3..02194669d0 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT PowOperator : public BinaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(PowOperator)
+    using Self = PowOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT PowOperator : public BinaryOperator
     PowOperator(PowOperator&&) = delete;         // Move Constructor Not Implemented
     PowOperator& operator=(const PowOperator&) = delete; // Copy Assignment Not Implemented
     PowOperator& operator=(PowOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
index 9382f662ed..0e6746d82b 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
@@ -79,3 +79,9 @@ CalculatorItem::ErrorCode RightParenthesisItem::checkValidity(QVector<Calculator
 
   return RightParenthesisItem::ErrorCode::MISMATCHED_PARENTHESES;
 }
+
+// -----------------------------------------------------------------------------
+RightParenthesisItem::Pointer RightParenthesisItem::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
index 596c9fce6d..6ed95ad6b8 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
@@ -35,6 +35,10 @@
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QVector>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "CalculatorItem.h"
@@ -42,7 +46,12 @@
 class SIMPLib_EXPORT RightParenthesisItem : public CalculatorItem
 {
   public:
-    SIMPL_SHARED_POINTERS(RightParenthesisItem)
+    using Self = RightParenthesisItem;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -51,6 +60,13 @@ class SIMPLib_EXPORT RightParenthesisItem : public CalculatorItem
 
     ~RightParenthesisItem() override;
 
+    /**
+     * @brief checkValidity
+     * @param infixVector
+     * @param currentIndex
+     * @param msg
+     * @return
+     */
     CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
 
   protected:
@@ -61,5 +77,7 @@ class SIMPLib_EXPORT RightParenthesisItem : public CalculatorItem
     RightParenthesisItem(RightParenthesisItem&&) = delete;      // Move Constructor Not Implemented
     RightParenthesisItem& operator=(const RightParenthesisItem&) = delete; // Copy Assignment Not Implemented
     RightParenthesisItem& operator=(RightParenthesisItem&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
index a3fa906541..4dc597f341 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
@@ -58,7 +58,11 @@ RootOperator::~RootOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RootOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void RootOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                             QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_TWO_ARGUMENTS(filter, calculatedArrayPath, executionStack, root)}
+
+// -----------------------------------------------------------------------------
+RootOperator::Pointer RootOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_TWO_ARGUMENTS(filter, calculatedArrayPath, executionStack, root)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.h b/Source/SIMPLib/CoreFilters/util/RootOperator.h
index 60907c9bde..3e4f37c2ee 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT RootOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(RootOperator)
+    using Self = RootOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT RootOperator : public UnaryOperator
     RootOperator(RootOperator&&) = delete;        // Move Constructor Not Implemented
     RootOperator& operator=(const RootOperator&) = delete; // Copy Assignment Not Implemented
     RootOperator& operator=(RootOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
index 9880a5be68..b58a2a9161 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
@@ -58,7 +58,11 @@ SinOperator::~SinOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SinOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void SinOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                            QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, sin)}
+
+// -----------------------------------------------------------------------------
+SinOperator::Pointer SinOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, sin)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.h b/Source/SIMPLib/CoreFilters/util/SinOperator.h
index 008e7f6833..dba79bcafd 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT SinOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(SinOperator)
+    using Self = SinOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT SinOperator : public UnaryOperator
     SinOperator(SinOperator&&) = delete;         // Move Constructor Not Implemented
     SinOperator& operator=(const SinOperator&) = delete; // Copy Assignment Not Implemented
     SinOperator& operator=(SinOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp b/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
index d4c06db11e..0ac4548b1a 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SqrtOperator.h"
 
@@ -60,5 +60,11 @@ SqrtOperator::~SqrtOperator() = default;
 // -----------------------------------------------------------------------------
 void SqrtOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
 {
-  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, sqrt)
+  CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, sqrt);
+}
+
+// -----------------------------------------------------------------------------
+SqrtOperator::Pointer SqrtOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
index 0c3ec2b1f5..0818fb082b 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT SqrtOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(SqrtOperator)
+    using Self = SqrtOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT SqrtOperator : public UnaryOperator
     SqrtOperator(SqrtOperator&&) = delete;        // Move Constructor Not Implemented
     SqrtOperator& operator=(const SqrtOperator&) = delete; // Copy Assignment Not Implemented
     SqrtOperator& operator=(SqrtOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
index 54b13f8d37..ac35eaf9a7 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
@@ -58,7 +58,11 @@ SubtractionOperator::~SubtractionOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SubtractionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void SubtractionOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                                    QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, -)}
+
+// -----------------------------------------------------------------------------
+SubtractionOperator::Pointer SubtractionOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, -)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
index 4429fcfe38..04c60df940 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -44,7 +46,12 @@
 class SIMPLib_EXPORT SubtractionOperator : public BinaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(SubtractionOperator)
+    using Self = SubtractionOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -63,5 +70,7 @@ class SIMPLib_EXPORT SubtractionOperator : public BinaryOperator
     SubtractionOperator(SubtractionOperator&&) = delete;      // Move Constructor Not Implemented
     SubtractionOperator& operator=(const SubtractionOperator&) = delete; // Copy Assignment Not Implemented
     SubtractionOperator& operator=(SubtractionOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
index c4324480aa..7c14a034f5 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
@@ -58,7 +58,11 @@ TanOperator::~TanOperator() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TanOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack)
+void TanOperator::calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath,
+                            QStack<ICalculatorArray::Pointer>& executionStack){CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, tan)}
+
+// -----------------------------------------------------------------------------
+TanOperator::Pointer TanOperator::NullPointer()
 {
-  CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, tan)
+  return Pointer(static_cast<Self*>(nullptr));
 }
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.h b/Source/SIMPLib/CoreFilters/util/TanOperator.h
index 98c68e1778..743d24b83c 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QStack>
 
 #include "SIMPLib/SIMPLib.h"
@@ -46,7 +48,12 @@ class CalculatorNumber;
 class SIMPLib_EXPORT TanOperator : public UnaryOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(TanOperator)
+    using Self = TanOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -65,5 +72,7 @@ class SIMPLib_EXPORT TanOperator : public UnaryOperator
     TanOperator(TanOperator&&) = delete;         // Move Constructor Not Implemented
     TanOperator& operator=(const TanOperator&) = delete; // Copy Assignment Not Implemented
     TanOperator& operator=(TanOperator&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
index 9df9402fcd..8dba912eb1 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
@@ -181,3 +181,9 @@ void UnaryOperator::setNumberOfArguments(int numOfArguments)
 {
   m_NumOfArguments = numOfArguments;
 }
+
+// -----------------------------------------------------------------------------
+UnaryOperator::Pointer UnaryOperator::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
index 3bc75cfc43..e2b24fab4e 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
@@ -35,12 +35,21 @@
 
 #pragma once
 
+#include <memory>
+
 #include "CalculatorOperator.h"
 
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
 {
   public:
-    SIMPL_SHARED_POINTERS(UnaryOperator)
+    using Self = UnaryOperator;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     static Pointer New()
     {
@@ -70,10 +79,10 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     UnaryOperator& operator=(UnaryOperator&&) = delete;      // Move Assignment Not Implemented
 };
 
-#define CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, func)                                                                                                             \
+#define CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, func)                                                                                                          \
   ArrayCalculator* calculatorFilter = dynamic_cast<ArrayCalculator*>(filter);                                                                                                                          \
                                                                                                                                                                                                        \
-  if(executionStack.size() >= 1 && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                     \
+  if(!executionStack.empty() && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                        \
   {                                                                                                                                                                                                    \
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
@@ -98,7 +107,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
 #define CREATE_NEW_ARRAY_TRIG(filter, calculatedArrayPath, executionStack, func)                                                                                                                       \
   ArrayCalculator* calculatorFilter = dynamic_cast<ArrayCalculator*>(filter);                                                                                                                          \
                                                                                                                                                                                                        \
-  if(executionStack.size() >= 1 && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                     \
+  if(!executionStack.empty() && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                        \
   {                                                                                                                                                                                                    \
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
@@ -131,7 +140,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
 #define CREATE_NEW_ARRAY_ARCTRIG(filter, calculatedArrayPath, executionStack, func)                                                                                                                    \
   ArrayCalculator* calculatorFilter = dynamic_cast<ArrayCalculator*>(filter);                                                                                                                          \
                                                                                                                                                                                                        \
-  if(executionStack.size() >= 1 && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                     \
+  if(!executionStack.empty() && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                        \
   {                                                                                                                                                                                                    \
     ICalculatorArray::Pointer arrayPtr = executionStack.pop();                                                                                                                                         \
                                                                                                                                                                                                        \
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index a9fb9ac8eb..10b97d4481 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -44,11 +44,13 @@
 #include <string>
 #include <vector>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
+
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
-#include "SIMPLib/SIMPLib.h"
 
 #define mxa_bswap(s, d, t)                                                                                                                                                                             \
   t[0] = ptr[s];                                                                                                                                                                                       \
@@ -59,13 +61,44 @@
  * @class DataArray
  * @brief Template class for wrapping raw arrays of data and is the basis for storing data within the SIMPL data structure.
  */
-template <typename T> class DataArray : public IDataArray
+template <typename T>
+class DataArray : public IDataArray
 {
 
 public:
-  SIMPL_SHARED_POINTERS(DataArray<T>)
-  SIMPL_TYPE_MACRO_SUPER(DataArray<T>, IDataArray)
-  SIMPL_CLASS_VERSION(2)
+  using Self = DataArray<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return QString("DataArray<T>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("DataArray<T>");
+  }
+
+  /**
+   * @brief Returns the version of this class.
+   * @return
+   */
+  int32_t getClassVersion() const override
+  {
+    return 2;
+  }
 
   DataArray(const DataArray&) = default;           // Copy Constructor default Implemented
   DataArray(DataArray&&) = delete;                 // Move Constructor Not Implemented
@@ -114,7 +147,7 @@ template <typename T> class DataArray : public IDataArray
   , m_NumTuples(numTuples)
   , m_CompDims(std::move(compDims))
   {
-    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<>());
+    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
     m_InitValue = initValue;
     m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
   }
@@ -132,7 +165,7 @@ template <typename T> class DataArray : public IDataArray
   , m_NumTuples(numTuples)
   , m_CompDims(std::move(compDims))
   {
-    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), 1, std::multiplies<>());
+    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
     m_InitValue = static_cast<T>(0);
     if(allocate)
     {
@@ -260,7 +293,7 @@ template <typename T> class DataArray : public IDataArray
       return NullPointer();
     }
 
-    size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), 1, std::multiplies<>());
+    size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), static_cast<size_t>(1), std::multiplies<>());
 
     auto d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
     if(allocate)
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 71cc1b4498..48dd73bc49 100755
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -36,21 +36,58 @@
 #pragma once
 
 #include <vector>
+#include <memory>
+
+#include <QtCore/QString>
 
-//-- DREAM3D Includes
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The MeshFaceNeighbors class contains arrays of Faces for each Node in the mesh. This allows quick query to the node
  * to determine what Cells the node is a part of.
  */
-template <typename T, typename K> class DynamicListArray
+template <typename T, typename K>
+class DynamicListArray
 {
 public:
-  SIMPL_SHARED_POINTERS(DynamicListArray)
-  SIMPL_STATIC_NEW_MACRO(DynamicListArray)
-  SIMPL_TYPE_MACRO(DynamicListArray)
+  using Self = DynamicListArray<T, K>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const
+  {
+    return QString("DynamicListArray<T, K>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("DynamicListArray<T, K>");
+  }
+
+  /**
+   * @brief Returns the version of this class.
+   * @return
+   */
+  int32_t getClassVersion()
+  {
+    return 1;
+  }
+
+  static Pointer New()
+  {
+    return std::shared_ptr<Self>(new DynamicListArray);
+  }
 
   class ElementList
   {
@@ -211,30 +248,6 @@ template <typename T, typename K> class DynamicListArray
     return this->m_Array[ptId].cells;
   }
 
-  /**
-   * @brief deserializeLinks
-   * @param buffer
-   * @param nElements
-   */
-  void deserializeLinks(QVector<uint8_t>& buffer, size_t nElements)
-  {
-    size_t offset = 0;
-    allocate(nElements); // Allocate all the links with 0 and nullptr;
-    uint8_t* bufPtr = buffer.data();
-
-    // Walk the array and allocate all the array links to Zero and nullptr
-    T* ncells = nullptr;
-    for(size_t i = 0; i < nElements; ++i)
-    {
-      ncells = reinterpret_cast<T*>(bufPtr + offset);
-      this->m_Array[i].ncells = *ncells; // Set the number of cells in this link
-      offset += 2;
-      this->m_Array[i].cells = new K[(*ncells)];                                // Allocate a new chunk of memory to store the list
-      ::memcpy(this->m_Array[i].cells, bufPtr + offset, (*ncells) * sizeof(K)); // Copy from the buffer into the new list memory
-      offset += (*ncells) * sizeof(K);                                          // Increment the offset
-    }
-  }
-
   /**
    * @brief deserializeLinks
    * @param buffer
diff --git a/Source/SIMPLib/DataArrays/IDataArray.cpp b/Source/SIMPLib/DataArrays/IDataArray.cpp
index ac0f629edd..e3a8198718 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArray.cpp
@@ -40,3 +40,21 @@ DataArrayPath IDataArray::getDataArrayPath() const
   path.setDataArrayName(getName());
   return path;
 }
+
+// -----------------------------------------------------------------------------
+IDataArray::Pointer IDataArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IDataArray::getNameOfClass() const
+{
+  return QString("IDataArray");
+}
+
+// -----------------------------------------------------------------------------
+QString IDataArray::ClassName()
+{
+  return QString("IDataArray");
+}
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 1699bfee0d..c5e16e670d 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -10,70 +10,68 @@
 ///////////////////////////////////////////////////////////////////////////////
 #pragma once
 
-
 //-- C++
+#include <memory>
+
 #include <vector>
 
 #include <hdf5.h>
 
 //--Qt Includes
-#include <QtCore/QDebug>
 #include <QtCore/QString>
+#include <QtCore/QtDebug>
+
+// SIMPLib Includes
+#include <QtCore/QTextStream>
 
-//SIMPLib Includes
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/DataContainers/IDataStructureNode.h"
 
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
-* @class IDataArray IDataArray.h PathToHeader/IDataArray.h
-* @brief This class holds a raw pointer to some allocated data that can be stored
-* into or read from an HDF5 data file.
-* The class design was borrowed heavily from the vtkDataArray class from www.vtk.org.
-* The work was all performed by those individuals. I have merely changed a few
-* methods to meet my specific needs.
-* @author mjackson
-* @date Jan 3, 2008
-* @version $Revision: 1.2 $
-*/
+ * @class IDataArray IDataArray.h PathToHeader/IDataArray.h
+ * @brief This class holds a raw pointer to some allocated data that can be stored
+ * into or read from an HDF5 data file.
+ * The class design was borrowed heavily from the vtkDataArray class from www.vtk.org.
+ * The work was all performed by those individuals. I have merely changed a few
+ * methods to meet my specific needs.
+ * @author mjackson
+ * @date Jan 3, 2008
+ * @version $Revision: 1.2 $
+ */
 class SIMPLib_EXPORT IDataArray : public IDataStructureNode
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(IDataArray)
+  PYB11_SHARED_POINTERS(IDataArray)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
 
   PYB11_METHOD(QString getTypeAsString)
   PYB11_METHOD(std::vector<size_t> getComponentDimensions)
   PYB11_METHOD(size_t getNumberOfTuples)
   PYB11_METHOD(int getNumberOfComponents)
-
-  public:
-    SIMPL_SHARED_POINTERS(IDataArray)
-    SIMPL_TYPE_MACRO_SUPER(IDataArray, IDataStructureNode)
-
-    /**
-     * This templated method is used to get at the low level pointer that points
-     * to the actual data by testing the conversion with dynamic_cast<> first to
-     * see if it can be done, the finally returns the low level pointer.
-     * @code
-     *    typedef DataArray<int32_t>  Int32ArrayType;
-     *    int32_t* iPtr = IDataArray::SafeReinterpretCast<IDataArray*, Int32ArrayType*, int32_t*>(ptr.get());
-     *    Q_ASSERT(nullptr != iPtr);
-     * @endcode
-     * @param x The Pointer to IDataArray
-     * @return
-     */
-    template <class Source, class Target, typename Raw>
-    static Raw SafeReinterpretCast(Source x)
-    {
-      if( dynamic_cast<Target>(x) != x )
-      {
-        return 0;
-      }
-      return reinterpret_cast<Raw>(x->getVoidPointer(0));
-    }
-
+#endif
+
+public:
+  using Self = IDataArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for IDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IDataArray
+   */
+  static QString ClassName();
 
     IDataArray(const QString& name = "");
     ~IDataArray() override;
@@ -301,26 +299,17 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
 
 };
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template<typename T>
+template <typename T>
 class CheckDataArrayType
 {
-  public:
-    CheckDataArrayType() = default;
-    virtual ~CheckDataArrayType() = default;
-    bool operator()(IDataArray::Pointer p)
-    {
-      return (std::dynamic_pointer_cast<T>(p).get() != nullptr);
-    }
+public:
+  CheckDataArrayType() = default;
+  virtual ~CheckDataArrayType() = default;
+  bool operator()(IDataArrayShPtrType p)
+  {
+    return (std::dynamic_pointer_cast<T>(p).get() != nullptr);
+  }
 };
-
-
-
-
-
-
-
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 42a7d855f8..d494ae9d2a 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -48,7 +48,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
@@ -64,11 +63,49 @@ template<typename T>
 class NeighborList : public IDataArray
 {
   public:
-    SIMPL_SHARED_POINTERS(NeighborList<T> )
-    SIMPL_TYPE_MACRO_SUPER(NeighborList<T>, IDataArray)
-    SIMPL_CLASS_VERSION(2)
+    using Self = NeighborList<T>;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer()
+    {
+      return Pointer(static_cast<Self*>(nullptr));
+    }
+
+    /**
+     * @brief Returns the name of the class for AbstractMessage
+     */
+    QString getNameOfClass() const override
+    {
+      return QString("NeighborList<T>");
+    }
+    /**
+     * @brief Returns the name of the class for AbstractMessage
+     */
+    static QString ClassName()
+    {
+      return QString("NeighborList<T>");
+    }
 
-    SIMPL_INSTANCE_STRING_PROPERTY(NumNeighborsArrayName)
+    /**
+     * @brief Returns the version of this class.
+     * @return
+     */
+    int32_t getClassVersion() const override
+    {
+      return 2;
+    }
+
+    void setNumNeighborsArrayName(const QString& name)
+    {
+      m_NumNeighborsArrayName = name;
+    }
+
+    QString getNumNeighborsArrayName()
+    {
+      return m_NumNeighborsArrayName;
+    }
 
     static Pointer New()
     {
@@ -1073,6 +1110,7 @@ class NeighborList : public IDataArray
     }
 
   private:
+    QString m_NumNeighborsArrayName;
     std::vector<SharedVectorType> m_Array;
     size_t m_NumTuples;
     bool m_IsAllocated;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 9b61c2c4bf..1aadb2f547 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -37,7 +37,12 @@
 
 #include <QtCore/QList>
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/PhaseType.h"
+
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
@@ -835,3 +840,46 @@ StatsData::Pointer StatsDataArray::operator[](int idx)
 #endif
   return m_StatsDataArray[idx];
 }
+
+// -----------------------------------------------------------------------------
+StatsDataArray::Pointer StatsDataArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+StatsDataArray::Pointer StatsDataArray::New()
+{
+  Pointer sharedPtr(new(StatsDataArray));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString StatsDataArray::getNameOfClass() const
+{
+  return QString("StatsDataArray");
+}
+
+// -----------------------------------------------------------------------------
+QString StatsDataArray::ClassName()
+{
+  return QString("StatsDataArray");
+}
+
+// -----------------------------------------------------------------------------
+void StatsDataArray::setStatsDataArray(const QVector<StatsData::Pointer>& value)
+{
+  m_StatsDataArray = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<StatsData::Pointer> StatsDataArray::getStatsDataArray() const
+{
+  return m_StatsDataArray;
+}
+
+// -----------------------------------------------------------------------------
+int StatsDataArray::getClassVersion() const
+{
+  return 2;
+}
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index cf30d1a0f8..6e3b5d1854 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -34,13 +34,16 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/StatsData/StatsData.h"
 
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The StatsDataArray class
@@ -48,7 +51,11 @@
 class SIMPLib_EXPORT StatsDataArray : public IDataArray
 {
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(StatsDataArray SUPER IDataArray)
+  PYB11_SHARED_POINTERS(StatsDataArray)
+  PYB11_STATIC_NEW_MACRO(StatsDataArray)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t int size_t* QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
@@ -58,13 +65,30 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   PYB11_METHOD(StatsData::Pointer getStatsData ARGS int,index)
   PYB11_METHOD(void fillArrayWithNewStatsData OVERLOAD size_t,n PhaseType::Type*,phase_types)
   PYB11_METHOD(void fillArrayWithNewStatsData OVERLOAD size_t,n PhaseType::EnumType*,phase_types)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(StatsDataArray)
-  SIMPL_STATIC_NEW_MACRO(StatsDataArray)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(StatsDataArray, IDataArray)
-  SIMPL_CLASS_VERSION(2)
+  using Self = StatsDataArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  static QString ClassName();
+
+  int getClassVersion() const override;
 
   ~StatsDataArray() override;
 
@@ -120,7 +144,15 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    */
   QString getTypeAsString() const override;
 
-  SIMPL_INSTANCE_PROPERTY(QVector<StatsData::Pointer>, StatsDataArray)
+  /**
+   * @brief Setter property for StatsDataArray
+   */
+  void setStatsDataArray(const QVector<StatsData::Pointer>& value);
+  /**
+   * @brief Getter property for StatsDataArray
+   * @return Value of StatsDataArray
+   */
+  QVector<StatsData::Pointer> getStatsDataArray() const;
 
   IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
 
@@ -266,7 +298,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
+  bool copyFromArray(size_t destTupleOffset, IDataArrayShPtrType sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief Splats the same value c across all values in the Tuple
@@ -285,7 +317,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
+  IDataArrayShPtrType deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief Reseizes the internal array
@@ -366,6 +398,8 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   StatsDataArray();
 
 private:
+  QVector<StatsData::Pointer> m_StatsDataArray = {};
+
   bool m_IsAllocated;
 
 public:
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index 53e7989467..ad6a38fca5 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -34,7 +34,10 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "StringDataArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
+
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
 
@@ -533,3 +536,34 @@ QString StringDataArray::getValue(size_t i) const
 {
   return m_Array.at(i);
 }
+
+// -----------------------------------------------------------------------------
+StringDataArray::Pointer StringDataArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+StringDataArray::Pointer StringDataArray::New()
+{
+  Pointer sharedPtr(new(StringDataArray));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString StringDataArray::getNameOfClass() const
+{
+  return QString("StringDataArray");
+}
+
+// -----------------------------------------------------------------------------
+QString StringDataArray::ClassName()
+{
+  return QString("StringDataArray");
+}
+
+// -----------------------------------------------------------------------------
+int StringDataArray::getClassVersion() const
+{
+  return 2;
+}
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 00081cced1..3d7773b438 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <string>
 #include <vector>
 
@@ -42,10 +44,12 @@
 
 #include "H5Support/H5Lite.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/SIMPLib.h"
 
+#include "SIMPLib/DataArrays/IDataArray.h"
+
 /**
  * @class StringDataArray StringDataArray.h DREAM3DLib/Common/StringDataArray.h
  * @brief Stores an array of QString objects
@@ -56,7 +60,11 @@
 class SIMPLib_EXPORT StringDataArray : public IDataArray
 {
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(StringDataArray SUPER IDataArray)
+  PYB11_SHARED_POINTERS(StringDataArray)
+  PYB11_STATIC_NEW_MACRO(StringDataArray)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
@@ -64,13 +72,30 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   PYB11_METHOD(void setValue ARGS size_t,i const.QString.&,value)
   PYB11_METHOD(size_t getSize)
   PYB11_METHOD(size_t getNumberOfTuples)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(StringDataArray)
-  SIMPL_STATIC_NEW_MACRO(StringDataArray)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(StringDataArray, IDataArray)
-  SIMPL_CLASS_VERSION(2)
+  using Self = StringDataArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StringDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for StringDataArray
+   */
+  static QString ClassName();
+
+  int getClassVersion() const override;
 
   /**
    * @brief CreateArray
@@ -97,7 +122,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param name
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
+  IDataArrayShPtrType createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
 
   /**
    * @brief createNewArray
@@ -109,16 +134,6 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    */
   IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override;
 
-  /**
-   * @brief createNewArray
-   * @param numElements
-   * @param dims
-   * @param name
-   * @param allocate
-   * @return
-   */
-  // IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override;
-
   /**
    * @brief ~StringDataArray
    */
@@ -248,7 +263,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
+  bool copyFromArray(size_t destTupleOffset, IDataArrayShPtrType sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief Does Nothing
@@ -279,7 +294,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
+  IDataArrayShPtrType deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief Reseizes the internal array
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index c4db9ab650..39fef534c5 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -43,18 +43,50 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/DataArrays/IDataArray.h"
+
 #include "SIMPLib/DataArrays/IDataArrayFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
 template<typename T>
 class StructArray : public IDataArray
 {
-  public:
-    SIMPL_SHARED_POINTERS(StructArray<T> )
-    SIMPL_TYPE_MACRO_SUPER(StructArray<T>, IDataArray)
-    SIMPL_CLASS_VERSION(2)
+public:
+  using Self = StructArray<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return QString("StructArray<T>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("StructArray<T>");
+  }
+
+  /**
+   * @brief Returns the version of this class.
+   * @return
+   */
+  int32_t getClassVersion() const override
+  {
+    return 2;
+  }
 
     /**
      * @brief Static constructor
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 3f1bcdc5eb..31523a695b 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -44,7 +44,12 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index f2610e996a..05d0adb8f9 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -33,6 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 // C Includes
@@ -61,8 +65,8 @@
 // -----------------------------------------------------------------------------
 AttributeMatrix::AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType)
 : IDataStructureContainerNode(name)
-, m_Type(attrType)
 , m_TupleDims(tDims)
+, m_Type(attrType)
 {
 }
 
@@ -498,6 +502,11 @@ void AttributeMatrix::clearAttributeArrays()
   clear();
 }
 
+AttributeMatrix::Container_t AttributeMatrix::getAttributeArrays() const
+{
+  return getChildren();
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -506,6 +515,11 @@ AttributeMatrix::NameList AttributeMatrix::getAttributeArrayNames() const
   return getNamesOfChildren();
 }
 
+int AttributeMatrix::getNumAttributeArrays() const
+{
+  return static_cast<int>(size());
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -918,3 +932,63 @@ QString AttributeMatrix::writeXdmfAttributeData(const IDataArray::Pointer& array
 
   return xdmfText;
 }
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Pointer AttributeMatrix::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrix::getNameOfClass() const
+{
+  return QString("AttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrix::ClassName()
+{
+  return QString("AttributeMatrix");
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrix::setType(const AttributeMatrix::Type& value)
+{
+  m_Type = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Type AttributeMatrix::getType() const
+{
+  return m_Type;
+}
+bool AttributeMatrix::addOrReplaceAttributeArray(const IDataArrayShPtrType& data)
+{
+  // Can not insert a null IDataArray object
+  if(data.get() == nullptr)
+  {
+    return false;
+  }
+  if(getNumberOfTuples() != data->getNumberOfTuples())
+  {
+    qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
+    qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
+  }
+  Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
+  return insertOrAssign(data);
+}
+
+IDataArrayShPtrType AttributeMatrix::getAttributeArray(const QString& name) const
+{
+  return getChildByName(name);
+}
+
+IDataArrayShPtrType AttributeMatrix::getAttributeArray(const DataArrayPath& path) const
+{
+  return getAttributeArray(path.getDataArrayName());
+}
+
+bool AttributeMatrix::doesAttributeArrayExist(const QString& name) const
+{
+  return contains(name);
+}
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index fdb1092b38..14eeb9466f 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -51,14 +51,13 @@
 #include <QtCore/QVector>
 
 //-- DREAM3D Includes
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/Observable.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 
 class AttributeMatrixProxy;
 class DataContainerProxy;
@@ -85,7 +84,9 @@ enum RenameErrorCodes
 class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureContainerNode<IDataArray>
 {
   // clang-format off
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(AttributeMatrix)
+  PYB11_SHARED_POINTERS(AttributeMatrix)
   PYB11_STATIC_CREATION(New ARGS std::vector<size_t> QString AttributeMatrix::Type)
   
   PYB11_ENUMERATION(Type)
@@ -95,18 +96,32 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
   PYB11_PROPERTY(std::vector<size_t> TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
 
   PYB11_METHOD(bool doesAttributeArrayExist ARGS Name)
-  PYB11_METHOD(bool addOrReplaceAttributeArray OVERLOAD const.IDataArray::Pointer.&,Data)
-  PYB11_METHOD(bool insertOrAssign ARGS IDataArray::Pointer)
+  PYB11_METHOD(bool addOrReplaceAttributeArray OVERLOAD const.IDataArrayShPtrType.&,Data)
+  PYB11_METHOD(bool insertOrAssign ARGS IDataArrayShPtrType)
 
   PYB11_METHOD(IDataArray removeAttributeArray ARGS Name)
   PYB11_METHOD(int renameAttributeArray ARGS OldName NewName OverWrite)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
   // clang-format on
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(AttributeMatrix)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AttributeMatrix, Observable)
+  using Self = AttributeMatrix;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AttributeMatrix
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AttributeMatrix
+   */
+  static QString ClassName();
 
   ~AttributeMatrix() override;
 
@@ -200,51 +215,39 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    */
   DataArrayPath getDataArrayPath() const override;
 
-  /**
-   * @brief Type
-   */
-  SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Type, Type)
+    /**
+    * @brief Type
+    */
+    /**
+     * @brief Setter property for Type
+     */
+    void setType(const AttributeMatrix::Type& value);
+    /**
+     * @brief Getter property for Type
+     * @return Value of Type
+     */
+    AttributeMatrix::Type getType() const;
 
-  /**
-   * @brief Adds the IDataArray to the AttributeMatrix.
-   * @param data The IDataArray::Pointer that will hold the data
-   * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
-   */
-  bool addOrReplaceAttributeArray(const IDataArray::Pointer& data)
-  {
-    // Can not insert a null IDataArray object
-    if(data.get() == nullptr)
-    {
-      return false;
-    }
-    if(getNumberOfTuples() != data->getNumberOfTuples())
-    {
-      qDebug() << "AttributeMatrix::Name: " << getName() << "  dataArray::name:  " << data->getName() << " Type: " << data->getTypeAsString();
-      qDebug() << "getNumberOfTuples(): " << getNumberOfTuples() << "  data->getNumberOfTuples(): " << data->getNumberOfTuples();
-    }
-    Q_ASSERT(getNumberOfTuples() == data->getNumberOfTuples());
-    return insertOrAssign(data);
-  }
+    /**
+     * @brief Adds the IDataArray to the AttributeMatrix.
+     * @param data The IDataArrayShPtrType that will hold the data
+     * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
+     */
+    bool addOrReplaceAttributeArray(const IDataArrayShPtrType& data);
 
-  /**
-   * @brief Returns the array for a given named array or the equivelant to a
-   * null pointer if the name does not exist.
-   * @param name The name of the data array
-   */
-  IDataArray::Pointer getAttributeArray(const QString& name) const
-  {
-    return getChildByName(name);
-  }
+    /**
+     * @brief Returns the array for a given named array or the equivelant to a
+     * null pointer if the name does not exist.
+     * @param name The name of the data array
+     */
+    IDataArrayShPtrType getAttributeArray(const QString& name) const;
 
     /**
      * @brief getAttributeArray
      * @param path
      * @return
      */
-    IDataArray::Pointer getAttributeArray(const DataArrayPath& path) const
-    {
-      return getAttributeArray(path.getDataArrayName());
-    }
+    IDataArrayShPtrType getAttributeArray(const DataArrayPath& path) const;
 
     /**
     * @brief returns a IDataArray based object that is stored in the attribute matrix by a
@@ -254,7 +257,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     template<class ArrayType>
     typename ArrayType::Pointer getAttributeArrayAs(const QString& name) const
     {
-      IDataArray::Pointer iDataArray = getAttributeArray(name);
+      IDataArrayShPtrType iDataArray = getAttributeArray(name);
       return std::dynamic_pointer_cast< ArrayType >(iDataArray);
     }
 
@@ -263,19 +266,15 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @brief Returns bool of whether a named array exists
      * @param name The name of the data array
      */
-    bool doesAttributeArrayExist(const QString& name) const
-    {
-      return contains(name);
-    }
-
+    bool doesAttributeArrayExist(const QString& name) const;
 
     /**
-    * @brief Removes the named data array from the Data Container and returns it to the calling
-    * method.
-    * @param name The name of the array
-    * @return
-    */
-    virtual IDataArray::Pointer removeAttributeArray(const QString& name);
+     * @brief Removes the named data array from the Data Container and returns it to the calling
+     * method.
+     * @param name The name of the array
+     * @return
+     */
+    virtual IDataArrayShPtrType removeAttributeArray(const QString& name);
 
     /**
     * @brief Renames a cell data array from the Data Container
@@ -293,10 +292,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @brief Returns the collection of contained DataArrays
      * @return
      */
-    Container_t getAttributeArrays() const
-    {
-      return getChildren();
-    }
+    Container_t getAttributeArrays() const;
 
     /**
     * @brief Returns a list that contains the names of all the arrays currently stored in the
@@ -309,11 +305,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * @brief Returns the total number of arrays that are stored in the Cell group
     * @return
     */
-    int getNumAttributeArrays() const
-    {
-      return static_cast<int>(size());
-    }
-
+    int getNumAttributeArrays() const;
 
     /**
     * @brief Resizes an array from the Attribute Matrix
@@ -372,7 +364,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       {
         return attributeArray;
       }
-      IDataArray::Pointer iDataArray = getAttributeArray(attributeArrayName);
+      IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
       attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
       if(nullptr == attributeArray.get() && filter)
       {
@@ -415,7 +407,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         return attributeArray;
       }
 
-      IDataArray::Pointer ptr = getAttributeArray(attributeArrayName);
+      IDataArrayShPtrType ptr = getAttributeArray(attributeArrayName);
       if(std::dynamic_pointer_cast<ArrayType>(ptr) != nullptr)
       {
         return std::dynamic_pointer_cast<ArrayType>(ptr);
@@ -453,7 +445,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         }
         return attributeArray;
       }
-      IDataArray::Pointer iDataArray = getAttributeArray(attributeArrayName);
+      IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
       if (nullptr == iDataArray.get())
       {
         createAndAddAttributeArray<ArrayType, Filter, T>(filter, attributeArrayName, initValue, compDims);
@@ -524,14 +516,14 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter) const
     {
       // Make sure the types are the same
-      IDataArray::Pointer ida = getAttributeArray(arrayName);     
+      IDataArrayShPtrType ida = getAttributeArray(arrayName);
       typename ArrayType::Pointer targetDestArray = std::dynamic_pointer_cast< ArrayType >(ida);
       if(targetDestArray.get() == nullptr)
       {
         if (nullptr != filter)
         {
           typename ArrayType::Pointer validTargetArray = ArrayType::CreateArray(1, "JUNK_INTERNAL_ARRAY", false);
-          IDataArray::Pointer srcArray = getAttributeArray(arrayName);
+          IDataArrayShPtrType srcArray = getAttributeArray(arrayName);
           QString srcDesc = srcArray->getTypeAsString();
           QString desc = validTargetArray->getTypeAsString();
           QString ss = QObject::tr("The Filter '%1' requires an array of type '%2' but the data array '%3' has a type of '%4'").arg(filter->getHumanLabel()).arg(desc).arg(srcArray->getName()).arg(srcDesc);
@@ -665,7 +657,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param gridType
      * @return
      */
-    virtual QString writeXdmfAttributeData(const IDataArray::Pointer& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, const uint8_t gridType = 0) const;
+    virtual QString writeXdmfAttributeData(const IDataArrayShPtrType& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
 
     /**
      * @brief writeXdmfAttributeDataHelper
@@ -680,11 +672,13 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param gridType
      * @return
      */
-    virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArray::Pointer& array, const QString& centering, int precision,
+    virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArrayShPtrType& array, const QString& centering, int precision,
                                                  const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0) const;
 
   private:
+
     std::vector<size_t> m_TupleDims;
+    AttributeMatrix::Type m_Type = {};
 
     AttributeMatrix(const AttributeMatrix&);
     void operator =(const AttributeMatrix&);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
index d2487e8396..9c04370fdd 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
@@ -38,11 +38,13 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayProxy.h"
 
 class SIMPLib_EXPORT AttributeMatrixProxy
 {
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(AttributeMatrixProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType DataArrays READ getDataArrays WRITE setDataArrays CONST_GET_OVERLOAD)
@@ -50,6 +52,7 @@ class SIMPLib_EXPORT AttributeMatrixProxy
   PYB11_PROPERTY(AMType AMType READ getAMType WRITE setAMType)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
   PYB11_METHOD(DataArrayProxy getDataArrayProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
+#endif
 
 public:
   // This enumeration is not a class enumeration because it is not possible to
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 66121c3e9d..15a6cef0e3 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 6ccec6322e..81bba3be70 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -43,9 +43,10 @@
 #include <list>
 #include <set>
 #include <utility>
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibDLLExport.h"     // for SIMPLib_EXPORT
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"  // for SIMPL_PIMPL_PROPERTY_DECL
+#include "SIMPLib/Common/SIMPLibDLLExport.h"
+#include "SIMPLib/SIMPLib.h"
 
 class DataContainerArray;
 using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
@@ -80,7 +81,7 @@ class SIMPLib_EXPORT DataArrayPathHelper final : public QObject
  */
 class SIMPLib_EXPORT DataArrayPath
 {
-
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DataArrayPath)
   PYB11_CREATION(ARGS QString QString QString)
   PYB11_CREATION(ARGS QString)
@@ -91,6 +92,7 @@ class SIMPLib_EXPORT DataArrayPath
   PYB11_METHOD(bool isEmpty)
   PYB11_METHOD(bool isValid)
   PYB11_METHOD(void update ARGS dcName amName daName)
+#endif
 
   using HashType = size_t;
 
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index eabddcf3b1..fe2287625d 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -43,6 +43,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
@@ -53,6 +54,7 @@ class SIMPLH5DataReaderRequirements;
  */
 class SIMPLib_EXPORT DataArrayProxy
 {
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DataArrayProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(std::vector<size_t> TupleDims READ getTupleDims WRITE setTupleDims)
@@ -60,6 +62,7 @@ class SIMPLib_EXPORT DataArrayProxy
   PYB11_PROPERTY(QString Path READ getPath WRITE setPath)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
+#endif
 public:
   using CompDimsVector = std::vector<std::vector<size_t>>;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index d7f59e2cb0..607cd4f45e 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -52,6 +52,7 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Utilities.h"
@@ -893,3 +894,21 @@ AttributeMatrixShPtr DataContainer::createNonPrereqAttributeMatrix(AbstractFilte
   }
   return attributeMatrix;
 }
+
+// -----------------------------------------------------------------------------
+DataContainer::Pointer DataContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainer::getNameOfClass() const
+{
+  return QString("DataContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainer::ClassName()
+{
+  return QString("DataContainer");
+}
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 10b982e4cf..dcd2dc4096 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -35,20 +35,28 @@
 
 #pragma once
 
+#include <memory>
+
 #include <cstddef>
 
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
+
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 class QTextStream;
 class DataArrayPath;
@@ -68,7 +76,10 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
 
   // This line MUST be first when exposing a class and properties to Python
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DataContainer)
+  PYB11_SHARED_POINTERS(DataContainer)
   PYB11_STATIC_CREATION(New OVERLOAD QString)
   PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
 
@@ -87,10 +98,25 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
 
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS Name)
   PYB11_METHOD(void setGeometry ARGS Geometry)
+#endif
+
   // clang-format on
 public:
-  SIMPL_SHARED_POINTERS(DataContainer)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainer, Observable)
+  using Self = DataContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for DataContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainer
+   */
+  static QString ClassName();
 
   ~DataContainer() override;
 
@@ -173,7 +199,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   /**
    * @brief Adds the data for a named array. If an AttributeMatrix with the same
    * name already exists in the DataContainer then the add will fail.
-   * @param matrix The IDataArray::Pointer that will hold the data
+   * @param matrix The IDataArrayShPtrType that will hold the data
    * @return Bool TRUE if the addition was successful, FALSE Otherwise.
    */
   bool addOrReplaceAttributeMatrix(const AttributeMatrixShPtr& matrix)
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 29516d4c76..696285d6f9 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -34,8 +34,13 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerArray.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -487,3 +492,28 @@ void DataContainerArray::renameDataArrayPaths(DataArrayPath::RenameContainer ren
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+DataContainerArray::Pointer DataContainerArray::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArray::Pointer DataContainerArray::New()
+{
+  Pointer sharedPtr(new(DataContainerArray));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerArray::getNameOfClass() const
+{
+  return QString("DataContainerArray");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerArray::ClassName()
+{
+  return QString("DataContainerArray");
+}
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 6176c15e6d..89a7934951 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -32,26 +32,27 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #pragma once
 
+#include <memory>
+
 #include <cstddef>       // for nullptr
 
 #include <QtCore/QObject> // for Q_OBJECT
 #include <QtCore/QString>
+#include <QtCore/QTextStream>
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/IDataContainerBundle.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
-
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 class DataContainer;
 using DataContainerShPtr = std::shared_ptr<DataContainer>;
 
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 /**
  * @class DataContainerArray DataContainerArray.h DREAM3DLib/Common/DataContainerArray.h
  * @brief  This class holds the list of filters that will be run. This should be
@@ -65,7 +66,11 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 {
   Q_OBJECT
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DataContainerArray)
+  PYB11_SHARED_POINTERS(DataContainerArray)
+  PYB11_STATIC_NEW_MACRO(DataContainerArray)
 
   PYB11_METHOD(bool addOrReplaceDataContainer ARGS DataContainer)
   PYB11_METHOD(bool insertOrAssign ARGS DataContainer)
@@ -88,12 +93,28 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS DataArrayPath)
 
   PYB11_METHOD(bool doesAttributeArrayExist ARGS DataArrayPath)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(DataContainerArray)
-  SIMPL_STATIC_NEW_MACRO(DataContainerArray)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerArray, IDataStructureContainerNode<DataContainer>)
+  using Self = DataContainerArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerArray
+   */
+  static QString ClassName();
 
   using Container = ChildCollection;
 
@@ -675,7 +696,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     bool validateNumberOfTuples(Filter* filter, const QVector<DataArrayPath>& paths) const
     {
       if (paths.size() <= 1) { return false; }
-      QVector<IDataArray::Pointer> dataArrays;
+      QVector<IDataArrayShPtrType> dataArrays;
       bool valid = true;
       QString ss;
       if (!paths.at(0).isValid() && nullptr != filter)
@@ -685,7 +706,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
         valid = false;
         return valid;
       }
-      IDataArray::Pointer array0 = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(0));
+      IDataArrayShPtrType array0 = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(0));
       if (nullptr == array0.get() && nullptr != filter)
       {
         ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
@@ -704,7 +725,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
           valid = false;
           return valid;
         }
-        IDataArray::Pointer nextArray = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(i));
+        IDataArrayShPtrType nextArray = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(i));
         if (nullptr == nextArray.get() && nullptr != filter)
         {
           ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
@@ -738,8 +759,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param paths The paths that should be checked
      * @return bool Validation check
      */
-    template<typename Filter>
-    bool validateNumberOfTuples(Filter* filter, QVector<IDataArray::Pointer> dataArrays) const
+    template <typename Filter>
+    bool validateNumberOfTuples(Filter* filter, QVector<IDataArrayShPtrType> dataArrays) const
     {
       if (dataArrays.size() <= 1) { return false; }
       bool valid = true;
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 25cccfaf55..30ca3f2ce7 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -37,7 +37,10 @@
 
 #include <iostream>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/DataArrays/IDataArray.h"
+
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index 5b80892a3c..3e12146458 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -38,8 +38,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerProxy.h"
 
 class DataContainerArray;
 
@@ -48,12 +48,15 @@ class DataContainerArray;
  */
 class SIMPLib_EXPORT DataContainerArrayProxy
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   // clang-format off
   PYB11_CREATE_BINDINGS(DataContainerArrayProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType DataContainers READ getDataContainers WRITE setDataContainers CONST_GET_OVERLOAD)
   PYB11_METHOD(DataContainerProxy.& getDataContainerProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
   // clang-format on
+#endif
 
 public:
   using StorageType = QMap<QString, DataContainerProxy>;
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index d850ceca08..b912f98cb6 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -38,8 +38,12 @@
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataArrays/StringDataArray.h"
+
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -261,3 +265,45 @@ int DataContainerBundle::readH5Data(hid_t groupId)
 
   return err;
 }
+
+// -----------------------------------------------------------------------------
+DataContainerBundle::Pointer DataContainerBundle::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerBundle::getNameOfClass() const
+{
+  return QString("DataContainerBundle");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerBundle::ClassName()
+{
+  return QString("DataContainerBundle");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerBundle::setName(const QString& value)
+{
+  m_Name = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerBundle::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerBundle::setMetaDataArrays(const QStringList& value)
+{
+  m_MetaDataArrays = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList DataContainerBundle::getMetaDataArrays() const
+{
+  return m_MetaDataArrays;
+}
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
index 674c83acd5..d63208e8ab 100755
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -36,18 +36,32 @@
 #pragma once
 
 
+#include <memory>
+
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/IDataContainerBundle.h"
 
 class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
 {
     Q_OBJECT
   public:
-    SIMPL_SHARED_POINTERS (DataContainerBundle)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerBundle, IDataContainerBundle)
+    using Self = DataContainerBundle;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for DataContainerBundle
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerBundle
+     */
+    static QString ClassName();
 
     ~DataContainerBundle() override;
 
@@ -73,7 +87,15 @@ class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
     /**
     * @brief The name of this DataContainerBundle
     */
-    SIMPL_INSTANCE_STRING_PROPERTY_OVERRIDE(Name)
+    /**
+     * @brief Setter property for Name
+     */
+    void setName(const QString& value) override;
+    /**
+     * @brief Getter property for Name
+     * @return Value of Name
+     */
+    QString getName() const override;
 
     /*
      * @brief This is the list of array names that reside inside the "Meta Data" attribute matrix that are the
@@ -84,7 +106,15 @@ class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
      * @li Time Index The raw index of the data, i.e., this is the actual ordering that could also be used as then index
      * into an array of data containers
      */
-    SIMPL_INSTANCE_PROPERTY(QStringList, MetaDataArrays)
+    /**
+     * @brief Setter property for MetaDataArrays
+     */
+    void setMetaDataArrays(const QStringList& value);
+    /**
+     * @brief Getter property for MetaDataArrays
+     * @return Value of MetaDataArrays
+     */
+    QStringList getMetaDataArrays() const;
 
     /**
      * @brief Sets All the DataContainers for this bundle
@@ -161,6 +191,9 @@ class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
     DataContainerBundle();
 
   private:
+    QString m_Name = {};
+    QStringList m_MetaDataArrays = {};
+
     QVector<DataContainer::Pointer>  m_DataContainers;
     QString m_MetaDataAMName;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.h b/Source/SIMPLib/DataContainers/DataContainerProxy.h
index 94142909ca..bb933f323e 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.h
@@ -39,10 +39,10 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/AttributeMatrixProxy.h"
 #include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The DataContainerProxy class
@@ -50,6 +50,7 @@
 class SIMPLib_EXPORT DataContainerProxy
 {
 
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DataContainerProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType AttributeMatricies READ getAttributeMatricies WRITE setAttributeMatricies CONST_GET_OVERLOAD)
@@ -57,6 +58,7 @@ class SIMPLib_EXPORT DataContainerProxy
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
   PYB11_METHOD(AttributeMatrixProxy getAttributeMatrixProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
   PYB11_METHOD(void toggleFlag)
+#endif
 
 public:
   // This enumeration is not a class enumeration because it is not possible to
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
index 26fc16da9e..1c0eb212f4 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.h
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -38,6 +38,9 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/SIMPLib.h"
 
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
 class DataContainerArray;
 using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
@@ -391,5 +394,5 @@ class SIMPLib_EXPORT DataStructureUtilities
    * @param paths The paths that should be checked
    * @return bool Validation check
    */
-  bool validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const std::vector<IDataArray::Pointer>& dataArrays);
+  bool validateNumberOfTuples(const DataContainerArrayShPtrType& dca, AbstractFilter* filter, const std::vector<IDataArrayShPtrType>& dataArrays);
 };
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
index b32ee4145a..aa26aa2f88 100644
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
@@ -43,3 +43,21 @@ IDataContainerBundle::IDataContainerBundle() = default;
 //
 // -----------------------------------------------------------------------------
 IDataContainerBundle::~IDataContainerBundle() = default;
+
+// -----------------------------------------------------------------------------
+IDataContainerBundle::Pointer IDataContainerBundle::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IDataContainerBundle::getNameOfClass() const
+{
+  return QString("IDataContainerBundle");
+}
+
+// -----------------------------------------------------------------------------
+QString IDataContainerBundle::ClassName()
+{
+  return QString("IDataContainerBundle");
+}
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.h b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
index c4f81fc845..102ce07e81 100755
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
@@ -35,21 +35,34 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
 class SIMPLib_EXPORT IDataContainerBundle : public QObject
 {
     Q_OBJECT
   public:
-    SIMPL_SHARED_POINTERS (IDataContainerBundle)
-    //SIMPL_STATIC_NEW_MACRO (IDataContainerBundle)
-    SIMPL_TYPE_MACRO(IDataContainerBundle)
+    using Self = IDataContainerBundle;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for IDataContainerBundle
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for IDataContainerBundle
+     */
+    static QString ClassName();
 
     ~IDataContainerBundle() override;
 
@@ -82,5 +95,7 @@ class SIMPLib_EXPORT IDataContainerBundle : public QObject
     IDataContainerBundle(IDataContainerBundle&&) = delete;      // Move Constructor Not Implemented
     IDataContainerBundle& operator=(const IDataContainerBundle&) = delete; // Copy Assignment Not Implemented
     IDataContainerBundle& operator=(IDataContainerBundle&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
index 6c81f94558..b8e1f8f23f 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
@@ -45,7 +45,11 @@
 template <class DerivedChild_t> class IDataStructureContainerNode : public AbstractDataStructureContainer
 {
 public:
-  SIMPL_SHARED_POINTERS(IDataStructureContainerNode<DerivedChild_t>)
+  using Self = IDataStructureContainerNode<DerivedChild_t>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
 
   using ChildShPtr = std::shared_ptr<DerivedChild_t>;
   using ChildCollection = std::vector<ChildShPtr>;
@@ -58,20 +62,6 @@ template <class DerivedChild_t> class IDataStructureContainerNode : public Abstr
 
 protected:
   
-
-  // void setParent(const ParentType& parent) override
-  //{
-  //  // Remove from parent's children
-  //  Pointer tempPtr;
-  //  Pointer parentPtr = m_Parent.lock();
-  //  if(nullptr != parentPtr)
-  //  {
-  //    tempPtr = parentPtr->removeChild(this);
-  //  }
-
-  //  m_Parent = parent;
-  //}
-
 public:
   IDataStructureContainerNode(const QString& name = "")
   : AbstractDataStructureContainer(name)
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
index e08076a22f..f9fd2e466c 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
@@ -145,6 +145,18 @@ void IDataStructureNode::setParentNode(ParentType* const parent)
   m_Parent = parent;
 }
 
+// -----------------------------------------------------------------------------
+QString IDataStructureNode::getNameOfClass() const
+{
+  return QString("IDataStructureNode");
+}
+
+// -----------------------------------------------------------------------------
+QString IDataStructureNode::ClassName()
+{
+  return QString("IDataStructureNode");
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -172,3 +184,9 @@ void AbstractDataStructureContainer::destroyParentConnection(IDataStructureNode*
 {
   child->clearParentNode();
 }
+
+// -----------------------------------------------------------------------------
+IDataStructureNode::Pointer IDataStructureNode::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index 149e95c764..db76f670bd 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -41,7 +41,6 @@
 
 #include <QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -55,8 +54,21 @@ class AbstractDataStructureContainer;
 class SIMPLib_EXPORT IDataStructureNode
 {
 public:
-  SIMPL_SHARED_POINTERS(IDataStructureNode)
-  SIMPL_TYPE_MACRO(IDataStructureNode)
+  using Self = IDataStructureNode;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName();
 
   using ParentType = AbstractDataStructureContainer;
   // using ParentWkPtr = std::weak_ptr<ParentType>;
@@ -205,7 +217,7 @@ class SIMPLib_EXPORT AbstractDataStructureContainer : public IDataStructureNode
    * @param parent
    */
   void createParentConnection(IDataStructureNode* child, AbstractDataStructureContainer* parent) const;
-  
+
   /**
    * @brief Clears the child's parent pointer.  This does not remove the child from the parent's collection.
    * THIS METHOD IS ONLY USED BY IDataStructureNode<T> AND SHOULD NOT BE USED BY ANY CLASS THAT DERIVES FROM IT.
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index 85d2e40c18..bdd7a82f5e 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -35,6 +35,8 @@
 
 #include "AbstractFilterParametersReader.h"
 
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -48,7 +50,7 @@ AbstractFilterParametersReader::~AbstractFilterParametersReader() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString AbstractFilterParametersReader::readString(const QString name, QString value)
+QString AbstractFilterParametersReader::readString(const QString& name, QString value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -60,7 +62,7 @@ QString AbstractFilterParametersReader::readString(const QString name, QString v
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<QString> AbstractFilterParametersReader::readStrings(const QString name, QVector<QString> value)
+QVector<QString> AbstractFilterParametersReader::readStrings(const QString& name, QVector<QString> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -72,7 +74,7 @@ QVector<QString> AbstractFilterParametersReader::readStrings(const QString name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QStringList AbstractFilterParametersReader::readStringList(const QString name, QStringList value)
+QStringList AbstractFilterParametersReader::readStringList(const QString& name, QStringList value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -84,7 +86,7 @@ QStringList AbstractFilterParametersReader::readStringList(const QString name, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int8_t AbstractFilterParametersReader::readValue(const QString name, int8_t value)
+int8_t AbstractFilterParametersReader::readValue(const QString& name, int8_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -96,7 +98,7 @@ int8_t AbstractFilterParametersReader::readValue(const QString name, int8_t valu
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int16_t AbstractFilterParametersReader::readValue(const QString name, int16_t value)
+int16_t AbstractFilterParametersReader::readValue(const QString& name, int16_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -108,7 +110,7 @@ int16_t AbstractFilterParametersReader::readValue(const QString name, int16_t va
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int32_t AbstractFilterParametersReader::readValue(const QString name, int32_t value)
+int32_t AbstractFilterParametersReader::readValue(const QString& name, int32_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -120,7 +122,7 @@ int32_t AbstractFilterParametersReader::readValue(const QString name, int32_t va
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t AbstractFilterParametersReader::readValue(const QString name, int64_t value)
+int64_t AbstractFilterParametersReader::readValue(const QString& name, int64_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -132,7 +134,7 @@ int64_t AbstractFilterParametersReader::readValue(const QString name, int64_t va
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint8_t AbstractFilterParametersReader::readValue(const QString name, uint8_t value)
+uint8_t AbstractFilterParametersReader::readValue(const QString& name, uint8_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -144,7 +146,7 @@ uint8_t AbstractFilterParametersReader::readValue(const QString name, uint8_t va
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint16_t AbstractFilterParametersReader::readValue(const QString name, uint16_t value)
+uint16_t AbstractFilterParametersReader::readValue(const QString& name, uint16_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -156,7 +158,7 @@ uint16_t AbstractFilterParametersReader::readValue(const QString name, uint16_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint32_t AbstractFilterParametersReader::readValue(const QString name, uint32_t value)
+uint32_t AbstractFilterParametersReader::readValue(const QString& name, uint32_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -168,7 +170,7 @@ uint32_t AbstractFilterParametersReader::readValue(const QString name, uint32_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint64_t AbstractFilterParametersReader::readValue(const QString name, uint64_t value)
+uint64_t AbstractFilterParametersReader::readValue(const QString& name, uint64_t value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -180,7 +182,7 @@ uint64_t AbstractFilterParametersReader::readValue(const QString name, uint64_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-float AbstractFilterParametersReader::readValue(const QString name, float value)
+float AbstractFilterParametersReader::readValue(const QString& name, float value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -192,7 +194,7 @@ float AbstractFilterParametersReader::readValue(const QString name, float value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-double AbstractFilterParametersReader::readValue(const QString name, double value)
+double AbstractFilterParametersReader::readValue(const QString& name, double value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -204,7 +206,7 @@ double AbstractFilterParametersReader::readValue(const QString name, double valu
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool AbstractFilterParametersReader::readValue(const QString name, bool value)
+bool AbstractFilterParametersReader::readValue(const QString& name, bool value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -216,7 +218,7 @@ bool AbstractFilterParametersReader::readValue(const QString name, bool value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Type AbstractFilterParametersReader::readValue(const QString name, AttributeMatrix::Type value)
+AttributeMatrix::Type AbstractFilterParametersReader::readValue(const QString& name, AttributeMatrix::Type value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -228,7 +230,7 @@ AttributeMatrix::Type AbstractFilterParametersReader::readValue(const QString na
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int8_t> AbstractFilterParametersReader::readArray(const QString name, QVector<int8_t> value)
+QVector<int8_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<int8_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -240,7 +242,7 @@ QVector<int8_t> AbstractFilterParametersReader::readArray(const QString name, QV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int16_t> AbstractFilterParametersReader::readArray(const QString name, QVector<int16_t> value)
+QVector<int16_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<int16_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -252,7 +254,7 @@ QVector<int16_t> AbstractFilterParametersReader::readArray(const QString name, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int32_t> AbstractFilterParametersReader::readArray(const QString name, QVector<int32_t> value)
+QVector<int32_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<int32_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -264,7 +266,7 @@ QVector<int32_t> AbstractFilterParametersReader::readArray(const QString name, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int64_t> AbstractFilterParametersReader::readArray(const QString name, QVector<int64_t> value)
+QVector<int64_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<int64_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -276,7 +278,7 @@ QVector<int64_t> AbstractFilterParametersReader::readArray(const QString name, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint8_t> AbstractFilterParametersReader::readArray(const QString name, QVector<uint8_t> value)
+QVector<uint8_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<uint8_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -288,7 +290,7 @@ QVector<uint8_t> AbstractFilterParametersReader::readArray(const QString name, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint16_t> AbstractFilterParametersReader::readArray(const QString name, QVector<uint16_t> value)
+QVector<uint16_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<uint16_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -300,7 +302,7 @@ QVector<uint16_t> AbstractFilterParametersReader::readArray(const QString name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint32_t> AbstractFilterParametersReader::readArray(const QString name, QVector<uint32_t> value)
+QVector<uint32_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<uint32_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -312,7 +314,7 @@ QVector<uint32_t> AbstractFilterParametersReader::readArray(const QString name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint64_t> AbstractFilterParametersReader::readArray(const QString name, QVector<uint64_t> value)
+QVector<uint64_t> AbstractFilterParametersReader::readArray(const QString& name, QVector<uint64_t> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -324,7 +326,7 @@ QVector<uint64_t> AbstractFilterParametersReader::readArray(const QString name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<float> AbstractFilterParametersReader::readArray(const QString name, QVector<float> value)
+QVector<float> AbstractFilterParametersReader::readArray(const QString& name, QVector<float> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -336,7 +338,7 @@ QVector<float> AbstractFilterParametersReader::readArray(const QString name, QVe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<double> AbstractFilterParametersReader::readArray(const QString name, QVector<double> value)
+QVector<double> AbstractFilterParametersReader::readArray(const QString& name, QVector<double> value)
 {
   Q_UNUSED(name)
   Q_UNUSED(value)
@@ -348,7 +350,7 @@ QVector<double> AbstractFilterParametersReader::readArray(const QString name, QV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3Type AbstractFilterParametersReader::readIntVec3(const QString name, IntVec3Type defaultValue)
+IntVec3Type AbstractFilterParametersReader::readIntVec3(const QString& name, IntVec3Type defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -360,7 +362,7 @@ IntVec3Type AbstractFilterParametersReader::readIntVec3(const QString name, IntV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3Type AbstractFilterParametersReader::readFloatVec3(const QString name, FloatVec3Type defaultValue)
+FloatVec3Type AbstractFilterParametersReader::readFloatVec3(const QString& name, FloatVec3Type defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -372,7 +374,7 @@ FloatVec3Type AbstractFilterParametersReader::readFloatVec3(const QString name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float2ndOrderPoly_t AbstractFilterParametersReader::readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t defaultValue)
+Float2ndOrderPoly_t AbstractFilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -384,7 +386,7 @@ Float2ndOrderPoly_t AbstractFilterParametersReader::readFloat2ndOrderPoly(const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float3rdOrderPoly_t AbstractFilterParametersReader::readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t defaultValue)
+Float3rdOrderPoly_t AbstractFilterParametersReader::readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -396,7 +398,7 @@ Float3rdOrderPoly_t AbstractFilterParametersReader::readFloat3rdOrderPoly(const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float4thOrderPoly_t AbstractFilterParametersReader::readFloat4thOrderPoly(const QString name, Float4thOrderPoly_t defaultValue)
+Float4thOrderPoly_t AbstractFilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -408,7 +410,7 @@ Float4thOrderPoly_t AbstractFilterParametersReader::readFloat4thOrderPoly(const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfo_t AbstractFilterParametersReader::readFileListInfo(const QString name, FileListInfo_t defaultValue)
+FileListInfo_t AbstractFilterParametersReader::readFileListInfo(const QString& name, FileListInfo_t defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -420,7 +422,7 @@ FileListInfo_t AbstractFilterParametersReader::readFileListInfo(const QString na
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInput_t AbstractFilterParametersReader::readComparisonInput(const QString name, ComparisonInput_t defaultValue, int vectorPos)
+ComparisonInput_t AbstractFilterParametersReader::readComparisonInput(const QString& name, ComparisonInput_t defaultValue, int vectorPos)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
@@ -433,7 +435,7 @@ ComparisonInput_t AbstractFilterParametersReader::readComparisonInput(const QStr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInputs AbstractFilterParametersReader::readComparisonInputs(const QString name, ComparisonInputs defValue)
+ComparisonInputs AbstractFilterParametersReader::readComparisonInputs(const QString& name, ComparisonInputs defValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defValue)
@@ -445,7 +447,7 @@ ComparisonInputs AbstractFilterParametersReader::readComparisonInputs(const QStr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInputsAdvanced AbstractFilterParametersReader::readComparisonInputsAdvanced(const QString name, ComparisonInputsAdvanced defValue)
+ComparisonInputsAdvanced AbstractFilterParametersReader::readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced defValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defValue)
@@ -457,7 +459,7 @@ ComparisonInputsAdvanced AbstractFilterParametersReader::readComparisonInputsAdv
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AxisAngleInput_t AbstractFilterParametersReader::readAxisAngle(const QString name, AxisAngleInput_t v, int vectorPos)
+AxisAngleInput_t AbstractFilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -470,7 +472,7 @@ AxisAngleInput_t AbstractFilterParametersReader::readAxisAngle(const QString nam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<AxisAngleInput_t> AbstractFilterParametersReader::readAxisAngles(const QString name, QVector<AxisAngleInput_t> v)
+QVector<AxisAngleInput_t> AbstractFilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -482,7 +484,7 @@ QVector<AxisAngleInput_t> AbstractFilterParametersReader::readAxisAngles(const Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QSet<QString> AbstractFilterParametersReader::readArraySelections(const QString name, QSet<QString> v)
+QSet<QString> AbstractFilterParametersReader::readArraySelections(const QString& name, QSet<QString> v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -550,3 +552,15 @@ QPair<double, double> AbstractFilterParametersReader::readPairOfDoubles(const QS
   // This should never be executed
   return QPair<double, double>();
 }
+
+// -----------------------------------------------------------------------------
+QString AbstractFilterParametersReader::getNameOfClass() const
+{
+  return QString("AbstractFilterParametersReader");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractFilterParametersReader::ClassName()
+{
+  return QString("AbstractFilterParametersReader");
+}
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 933db09602..3afb94604e 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -38,7 +38,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -71,56 +70,60 @@ class AbstractFilter;
 class SIMPLib_EXPORT AbstractFilterParametersReader
 {
   public:
-
-    SIMPL_TYPE_MACRO(AbstractFilterParametersReader)
-
+    /**
+     * @brief Returns the name of the class for AbstractFilterParametersReader
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for AbstractFilterParametersReader
+     */
+    static QString ClassName();
 
     virtual ~AbstractFilterParametersReader();
 
     virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
     virtual int closeFilterGroup() = 0;
 
-
-    virtual QString readString(const QString name, QString value);
-    virtual QVector<QString> readStrings(const QString name, QVector<QString> value);
-    virtual QStringList readStringList(const QString name, QStringList value);
-
-    virtual int8_t readValue(const QString name, int8_t value);
-    virtual int16_t readValue(const QString name, int16_t value);
-    virtual int32_t readValue(const QString name, int32_t value);
-    virtual int64_t readValue(const QString name, int64_t value);
-    virtual uint8_t readValue(const QString name, uint8_t value);
-    virtual uint16_t readValue(const QString name, uint16_t value);
-    virtual uint32_t readValue(const QString name, uint32_t value);
-    virtual uint64_t readValue(const QString name, uint64_t value);
-    virtual float readValue(const QString name, float value);
-    virtual double readValue(const QString name, double value);
-    virtual bool readValue(const QString name, bool value);
-    virtual AttributeMatrix::Type readValue(const QString name, AttributeMatrix::Type value);
-
-    virtual QVector<int8_t> readArray(const QString name, QVector<int8_t> value);
-    virtual QVector<int16_t> readArray(const QString name, QVector<int16_t> value);
-    virtual QVector<int32_t> readArray(const QString name, QVector<int32_t> value);
-    virtual QVector<int64_t> readArray(const QString name, QVector<int64_t> value);
-    virtual QVector<uint8_t> readArray(const QString name, QVector<uint8_t> value);
-    virtual QVector<uint16_t> readArray(const QString name, QVector<uint16_t> value);
-    virtual QVector<uint32_t> readArray(const QString name, QVector<uint32_t> value);
-    virtual QVector<uint64_t> readArray(const QString name, QVector<uint64_t> value);
-    virtual QVector<float> readArray(const QString name, QVector<float> value);
-    virtual QVector<double> readArray(const QString name, QVector<double> value);
-
-    virtual IntVec3Type readIntVec3(const QString name, IntVec3Type v);
-    virtual FloatVec3Type readFloatVec3(const QString name, FloatVec3Type v);
-    virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t v);
-    virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t v);
-    virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString name, Float4thOrderPoly_t v);
-    virtual FileListInfo_t readFileListInfo(const QString name, FileListInfo_t v);
-    virtual ComparisonInput_t readComparisonInput(const QString name, ComparisonInput_t v, int vectorPos);
-    virtual ComparisonInputs readComparisonInputs(const QString name, ComparisonInputs v);
-    virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString name, ComparisonInputsAdvanced v);
-    virtual AxisAngleInput_t readAxisAngle(const QString name, AxisAngleInput_t v, int vectorPos);
-    virtual QVector<AxisAngleInput_t> readAxisAngles(const QString name, QVector<AxisAngleInput_t> v);
-    virtual QSet<QString> readArraySelections(const QString name, QSet<QString> v);
+    virtual QString readString(const QString& name, QString value);
+    virtual QVector<QString> readStrings(const QString& name, QVector<QString> value);
+    virtual QStringList readStringList(const QString& name, QStringList value);
+
+    virtual int8_t readValue(const QString& name, int8_t value);
+    virtual int16_t readValue(const QString& name, int16_t value);
+    virtual int32_t readValue(const QString& name, int32_t value);
+    virtual int64_t readValue(const QString& name, int64_t value);
+    virtual uint8_t readValue(const QString& name, uint8_t value);
+    virtual uint16_t readValue(const QString& name, uint16_t value);
+    virtual uint32_t readValue(const QString& name, uint32_t value);
+    virtual uint64_t readValue(const QString& name, uint64_t value);
+    virtual float readValue(const QString& name, float value);
+    virtual double readValue(const QString& name, double value);
+    virtual bool readValue(const QString& name, bool value);
+    virtual AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value);
+
+    virtual QVector<int8_t> readArray(const QString& name, QVector<int8_t> value);
+    virtual QVector<int16_t> readArray(const QString& name, QVector<int16_t> value);
+    virtual QVector<int32_t> readArray(const QString& name, QVector<int32_t> value);
+    virtual QVector<int64_t> readArray(const QString& name, QVector<int64_t> value);
+    virtual QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value);
+    virtual QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value);
+    virtual QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value);
+    virtual QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value);
+    virtual QVector<float> readArray(const QString& name, QVector<float> value);
+    virtual QVector<double> readArray(const QString& name, QVector<double> value);
+
+    virtual IntVec3Type readIntVec3(const QString& name, IntVec3Type v);
+    virtual FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v);
+    virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v);
+    virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v);
+    virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v);
+    virtual FileListInfo_t readFileListInfo(const QString& name, FileListInfo_t v);
+    virtual ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos);
+    virtual ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v);
+    virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v);
+    virtual AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos);
+    virtual QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v);
+    virtual QSet<QString> readArraySelections(const QString& name, QSet<QString> v);
 
     virtual DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v);
 
@@ -139,6 +142,8 @@ class SIMPLib_EXPORT AbstractFilterParametersReader
     AbstractFilterParametersReader(AbstractFilterParametersReader&&) = delete;      // Move Constructor Not Implemented
     AbstractFilterParametersReader& operator=(const AbstractFilterParametersReader&) = delete; // Copy Assignment Not Implemented
     AbstractFilterParametersReader& operator=(AbstractFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index f0bc57d087..ae35851317 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -35,6 +35,8 @@
 
 #include "AbstractFilterParametersWriter.h"
 
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -524,3 +526,15 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, const QPair<
   // This should never be executed
   return -1;
 }
+
+// -----------------------------------------------------------------------------
+QString AbstractFilterParametersWriter::getNameOfClass() const
+{
+  return QString("AbstractFilterParametersWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractFilterParametersWriter::ClassName()
+{
+  return QString("AbstractFilterParametersWriter");
+}
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index 0b6cbfb3d5..7e71245282 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -40,7 +40,6 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
@@ -72,10 +71,14 @@ class AbstractFilter;
 class SIMPLib_EXPORT AbstractFilterParametersWriter
 {
   public:
-//   SIMPL_SHARED_POINTERS(AbstractFilterParametersWriter)
-    //  SIMPL_STATIC_NEW_MACRO(AbstractFilterParametersWriter)
-    SIMPL_TYPE_MACRO(AbstractFilterParametersWriter)
-
+    /**
+     * @brief Returns the name of the class for AbstractFilterParametersWriter
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for AbstractFilterParametersWriter
+     */
+    static QString ClassName();
 
     virtual ~AbstractFilterParametersWriter();
 
@@ -146,6 +149,8 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
     AbstractFilterParametersWriter(AbstractFilterParametersWriter&&) = delete;      // Move Constructor Not Implemented
     AbstractFilterParametersWriter& operator=(const AbstractFilterParametersWriter&) = delete; // Copy Assignment Not Implemented
     AbstractFilterParametersWriter& operator=(AbstractFilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index f58ef62787..0f4b2b2b33 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -124,3 +124,64 @@ void AttributeMatrixCreationFilterParameter::dataArrayPathRenamed(AbstractFilter
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+AttributeMatrixCreationFilterParameter::Pointer AttributeMatrixCreationFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixCreationFilterParameter::Pointer AttributeMatrixCreationFilterParameter::New()
+{
+  Pointer sharedPtr(new(AttributeMatrixCreationFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrixCreationFilterParameter::getNameOfClass() const
+{
+  return QString("AttributeMatrixCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrixCreationFilterParameter::ClassName()
+{
+  return QString("AttributeMatrixCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixCreationFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types AttributeMatrixCreationFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixCreationFilterParameter::setSetterCallback(const AttributeMatrixCreationFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixCreationFilterParameter::SetterCallbackType AttributeMatrixCreationFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixCreationFilterParameter::setGetterCallback(const AttributeMatrixCreationFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixCreationFilterParameter::GetterCallbackType AttributeMatrixCreationFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index c49547453c..0fc9ecfcd7 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -68,9 +70,23 @@ class AbstractFilter;
 class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(AttributeMatrixCreationFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(AttributeMatrixCreationFilterParameter)
-    SIMPL_TYPE_MACRO(AttributeMatrixCreationFilterParameter)
+    using Self = AttributeMatrixCreationFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
+     */
+    static QString ClassName();
 
     // Typedefs for this class's callback functions
     using SetterCallbackType = std::function<void(DataArrayPath)>;
@@ -129,21 +145,45 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
     * @param DefaultGeometryTypes Default geometry types required for Data Container selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const AttributeMatrixCreationFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    AttributeMatrixCreationFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const AttributeMatrixCreationFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    AttributeMatrixCreationFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -162,5 +202,10 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
     AttributeMatrixCreationFilterParameter(AttributeMatrixCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
     AttributeMatrixCreationFilterParameter& operator=(const AttributeMatrixCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
     AttributeMatrixCreationFilterParameter& operator=(AttributeMatrixCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    AttributeMatrixCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+    AttributeMatrixCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index 50a052c5e4..c02910f873 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -191,3 +191,76 @@ void AttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(AbstractFilte
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+AttributeMatrixSelectionFilterParameter::Pointer AttributeMatrixSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixSelectionFilterParameter::Pointer AttributeMatrixSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(AttributeMatrixSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrixSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("AttributeMatrixSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString AttributeMatrixSelectionFilterParameter::ClassName()
+{
+  return QString("AttributeMatrixSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types AttributeMatrixSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> AttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixSelectionFilterParameter::setSetterCallback(const AttributeMatrixSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixSelectionFilterParameter::SetterCallbackType AttributeMatrixSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void AttributeMatrixSelectionFilterParameter::setGetterCallback(const AttributeMatrixSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrixSelectionFilterParameter::GetterCallbackType AttributeMatrixSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index da6d0c8182..79d9aa4a9b 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -67,9 +69,23 @@
 class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(AttributeMatrixSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(AttributeMatrixSelectionFilterParameter)
-    SIMPL_TYPE_MACRO(AttributeMatrixSelectionFilterParameter)
+    using Self = AttributeMatrixSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
@@ -150,27 +166,59 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
     * @param DefaultGeometryTypes Default geometry types required for Data Container selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
     /**
     * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const AttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    AttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const AttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    AttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -189,5 +237,11 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
     AttributeMatrixSelectionFilterParameter(AttributeMatrixSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     AttributeMatrixSelectionFilterParameter& operator=(const AttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     AttributeMatrixSelectionFilterParameter& operator=(AttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    AttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    AttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 070490df4e..1ff150a2e0 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -101,3 +101,52 @@ void AxisAngleFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = axisObj;
   }
 }
+
+// -----------------------------------------------------------------------------
+AxisAngleFilterParameter::Pointer AxisAngleFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+AxisAngleFilterParameter::Pointer AxisAngleFilterParameter::New()
+{
+  Pointer sharedPtr(new(AxisAngleFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString AxisAngleFilterParameter::getNameOfClass() const
+{
+  return QString("AxisAngleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString AxisAngleFilterParameter::ClassName()
+{
+  return QString("AxisAngleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void AxisAngleFilterParameter::setSetterCallback(const AxisAngleFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AxisAngleFilterParameter::SetterCallbackType AxisAngleFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void AxisAngleFilterParameter::setGetterCallback(const AxisAngleFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+AxisAngleFilterParameter::GetterCallbackType AxisAngleFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index 280d46430a..7baed62724 100755
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
 
@@ -65,9 +66,23 @@
 class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(AxisAngleFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(AxisAngleFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AxisAngleFilterParameter, FilterParameter)
+    using Self = AxisAngleFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for AxisAngleFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for AxisAngleFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(AxisAngleInput_t)>;
     using GetterCallbackType = std::function<AxisAngleInput_t(void)>;
@@ -119,14 +134,30 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const AxisAngleFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    AxisAngleFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const AxisAngleFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    AxisAngleFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -140,5 +171,9 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
     AxisAngleFilterParameter(AxisAngleFilterParameter&&) = delete;      // Move Constructor Not Implemented
     AxisAngleFilterParameter& operator=(const AxisAngleFilterParameter&) = delete; // Copy Assignment Not Implemented
     AxisAngleFilterParameter& operator=(AxisAngleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    AxisAngleFilterParameter::SetterCallbackType m_SetterCallback = {};
+    AxisAngleFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleInput.h b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
index 0ee5e12e60..d27cfb5baf 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleInput.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
@@ -30,6 +30,7 @@
 #pragma once
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
 
 /**
 * @brief
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index fb6fa5aa92..77c31817ce 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -94,3 +94,52 @@ void BooleanFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
 }
+
+// -----------------------------------------------------------------------------
+BooleanFilterParameter::Pointer BooleanFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+BooleanFilterParameter::Pointer BooleanFilterParameter::New()
+{
+  Pointer sharedPtr(new(BooleanFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString BooleanFilterParameter::getNameOfClass() const
+{
+  return QString("BooleanFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString BooleanFilterParameter::ClassName()
+{
+  return QString("BooleanFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void BooleanFilterParameter::setSetterCallback(const BooleanFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+BooleanFilterParameter::SetterCallbackType BooleanFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void BooleanFilterParameter::setGetterCallback(const BooleanFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+BooleanFilterParameter::GetterCallbackType BooleanFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 6e2c18c609..9cb1b94c58 100755
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,66 +65,96 @@
 class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(BooleanFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(BooleanFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(BooleanFilterParameter, FilterParameter)
-
-    using SetterCallbackType = std::function<void(bool)>;
-    using GetterCallbackType = std::function<bool(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the BooleanFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_BOOL_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const bool& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~BooleanFilterParameter() override;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  using Self = BooleanFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for BooleanFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for BooleanFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(bool)>;
+  using GetterCallbackType = std::function<bool(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the BooleanFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_BOOL_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~BooleanFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const BooleanFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  BooleanFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const BooleanFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  BooleanFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
       /**
@@ -136,5 +168,9 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
   BooleanFilterParameter(BooleanFilterParameter&&) = delete;      // Move Constructor Not Implemented
   BooleanFilterParameter& operator=(const BooleanFilterParameter&) = delete; // Copy Assignment Not Implemented
   BooleanFilterParameter& operator=(BooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  BooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
+  BooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index 14628ed94c..f4f085701b 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -130,3 +130,52 @@ void CalculatorFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, con
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+CalculatorFilterParameter::Pointer CalculatorFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+CalculatorFilterParameter::Pointer CalculatorFilterParameter::New()
+{
+  Pointer sharedPtr(new(CalculatorFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString CalculatorFilterParameter::getNameOfClass() const
+{
+  return QString("CalculatorFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString CalculatorFilterParameter::ClassName()
+{
+  return QString("CalculatorFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void CalculatorFilterParameter::setSetterCallback(const CalculatorFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+CalculatorFilterParameter::SetterCallbackType CalculatorFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void CalculatorFilterParameter::setGetterCallback(const CalculatorFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+CalculatorFilterParameter::GetterCallbackType CalculatorFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index c6f7b34f09..4c9d90a11f 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,34 +65,47 @@
 class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(CalculatorFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(CalculatorFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CalculatorFilterParameter, FilterParameter)
+  using Self = CalculatorFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the CalculatorFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_CALC_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category,
-    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+  /**
+   * @brief Returns the name of the class for CalculatorFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CalculatorFilterParameter
+   */
+  static QString ClassName();
 
-    ~CalculatorFilterParameter() override;
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the CalculatorFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_CALC_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~CalculatorFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -116,14 +131,30 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const CalculatorFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    CalculatorFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const CalculatorFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    CalculatorFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handles DataArrayPath changes wwith the assumption that the DataContainer and AttributeMatrix both match the input
@@ -144,5 +175,9 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
   CalculatorFilterParameter(CalculatorFilterParameter&&) = delete;      // Move Constructor Not Implemented
   CalculatorFilterParameter& operator=(const CalculatorFilterParameter&) = delete; // Copy Assignment Not Implemented
   CalculatorFilterParameter& operator=(CalculatorFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  CalculatorFilterParameter::SetterCallbackType m_SetterCallback = {};
+  CalculatorFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index bd129d9740..b01b7ae590 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -51,7 +51,7 @@ ChoiceFilterParameter::~ChoiceFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
 
 {
   ChoiceFilterParameter::Pointer ptr = ChoiceFilterParameter::New();
@@ -98,3 +98,76 @@ void ChoiceFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::New()
+{
+  Pointer sharedPtr(new(ChoiceFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ChoiceFilterParameter::getNameOfClass() const
+{
+  return QString("ChoiceFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ChoiceFilterParameter::ClassName()
+{
+  return QString("ChoiceFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ChoiceFilterParameter::setChoices(const QVector<QString>& value)
+{
+  m_Choices = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> ChoiceFilterParameter::getChoices() const
+{
+  return m_Choices;
+}
+
+// -----------------------------------------------------------------------------
+void ChoiceFilterParameter::setEditable(bool value)
+{
+  m_Editable = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ChoiceFilterParameter::getEditable() const
+{
+  return m_Editable;
+}
+
+// -----------------------------------------------------------------------------
+void ChoiceFilterParameter::setSetterCallback(const ChoiceFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ChoiceFilterParameter::SetterCallbackType ChoiceFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ChoiceFilterParameter::setGetterCallback(const ChoiceFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ChoiceFilterParameter::GetterCallbackType ChoiceFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index dee4b0cba2..e12aa0f4b3 100755
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ChoiceFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ChoiceFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ChoiceFilterParameter, FilterParameter)
+    using Self = ChoiceFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ChoiceFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ChoiceFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(int)>;
     using GetterCallbackType = std::function<int(void)>;
@@ -89,15 +105,32 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category,
+                       int defaultValue, Category category,
                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        QVector<QString> choices, bool editable,
                        int groupIndex = -1);
 
     ~ChoiceFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, Choices)
-    SIMPL_INSTANCE_PROPERTY(bool, Editable)
+    /**
+     * @brief Setter property for Choices
+     */
+    void setChoices(const QVector<QString>& value);
+    /**
+     * @brief Getter property for Choices
+     * @return Value of Choices
+     */
+    QVector<QString> getChoices() const;
+
+    /**
+     * @brief Setter property for Editable
+     */
+    void setEditable(bool value);
+    /**
+     * @brief Getter property for Editable
+     * @return Value of Editable
+     */
+    bool getEditable() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -123,14 +156,30 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ChoiceFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ChoiceFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -144,5 +193,11 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
     ChoiceFilterParameter(ChoiceFilterParameter&&) = delete;      // Move Constructor Not Implemented
     ChoiceFilterParameter& operator=(const ChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
     ChoiceFilterParameter& operator=(ChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVector<QString> m_Choices = {};
+    bool m_Editable = {};
+    ChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
+    ChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index bde4ddc529..daa8c19d2c 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -159,3 +159,100 @@ void ComparisonSelectionAdvancedFilterParameter::dataArrayPathRenamed(AbstractFi
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::New()
+{
+  Pointer sharedPtr(new(ComparisonSelectionAdvancedFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSelectionAdvancedFilterParameter::getNameOfClass() const
+{
+  return QString("ComparisonSelectionAdvancedFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSelectionAdvancedFilterParameter::ClassName()
+{
+  return QString("ComparisonSelectionAdvancedFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setChoices(const QVector<QString>& value)
+{
+  m_Choices = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> ComparisonSelectionAdvancedFilterParameter::getChoices() const
+{
+  return m_Choices;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setShowOperators(bool value)
+{
+  m_ShowOperators = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ComparisonSelectionAdvancedFilterParameter::getShowOperators() const
+{
+  return m_ShowOperators;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types ComparisonSelectionAdvancedFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Types ComparisonSelectionAdvancedFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setSetterCallback(const ComparisonSelectionAdvancedFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionAdvancedFilterParameter::SetterCallbackType ComparisonSelectionAdvancedFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionAdvancedFilterParameter::setGetterCallback(const ComparisonSelectionAdvancedFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionAdvancedFilterParameter::GetterCallbackType ComparisonSelectionAdvancedFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index b2fce98646..889656db73 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
@@ -67,9 +69,23 @@
 class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ComparisonSelectionAdvancedFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ComparisonSelectionAdvancedFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ComparisonSelectionAdvancedFilterParameter, FilterParameter)
+    using Self = ComparisonSelectionAdvancedFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(ComparisonInputsAdvanced)>;
     using GetterCallbackType = std::function<ComparisonInputsAdvanced(void)>;
@@ -98,11 +114,45 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
 
     ~ComparisonSelectionAdvancedFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, Choices)
-    SIMPL_INSTANCE_PROPERTY(bool, ShowOperators)
+    /**
+     * @brief Setter property for Choices
+     */
+    void setChoices(const QVector<QString>& value);
+    /**
+     * @brief Getter property for Choices
+     * @return Value of Choices
+     */
+    QVector<QString> getChoices() const;
+
+    /**
+     * @brief Setter property for ShowOperators
+     */
+    void setShowOperators(bool value);
+    /**
+     * @brief Getter property for ShowOperators
+     * @return Value of ShowOperators
+     */
+    bool getShowOperators() const;
+
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, DefaultAttributeMatrixTypes)
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
     /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -128,14 +178,30 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ComparisonSelectionAdvancedFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ComparisonSelectionAdvancedFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ComparisonSelectionAdvancedFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ComparisonSelectionAdvancedFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -156,5 +222,13 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
     ComparisonSelectionAdvancedFilterParameter(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Constructor Not Implemented
     ComparisonSelectionAdvancedFilterParameter& operator=(const ComparisonSelectionAdvancedFilterParameter&) = delete; // Copy Assignment Not Implemented
     ComparisonSelectionAdvancedFilterParameter& operator=(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVector<QString> m_Choices = {};
+    bool m_ShowOperators = {};
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+    ComparisonSelectionAdvancedFilterParameter::SetterCallbackType m_SetterCallback = {};
+    ComparisonSelectionAdvancedFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index 10db67e04a..41031df3f4 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -174,3 +174,100 @@ void ComparisonSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fi
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(ComparisonSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("ComparisonSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSelectionFilterParameter::ClassName()
+{
+  return QString("ComparisonSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setChoices(const QVector<QString>& value)
+{
+  m_Choices = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> ComparisonSelectionFilterParameter::getChoices() const
+{
+  return m_Choices;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setShowOperators(bool value)
+{
+  m_ShowOperators = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ComparisonSelectionFilterParameter::getShowOperators() const
+{
+  return m_ShowOperators;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types ComparisonSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Types ComparisonSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setSetterCallback(const ComparisonSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionFilterParameter::SetterCallbackType ComparisonSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionFilterParameter::setGetterCallback(const ComparisonSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionFilterParameter::GetterCallbackType ComparisonSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index d30a3de297..6c0f8b255c 100755
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
@@ -66,9 +68,23 @@
 class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ComparisonSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ComparisonSelectionFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ComparisonSelectionFilterParameter, FilterParameter)
+    using Self = ComparisonSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ComparisonSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ComparisonSelectionFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(ComparisonInputs)>;
     using GetterCallbackType = std::function<ComparisonInputs(void)>;
@@ -97,11 +113,45 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
 
     ~ComparisonSelectionFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, Choices)
-    SIMPL_INSTANCE_PROPERTY(bool, ShowOperators)
+    /**
+     * @brief Setter property for Choices
+     */
+    void setChoices(const QVector<QString>& value);
+    /**
+     * @brief Getter property for Choices
+     * @return Value of Choices
+     */
+    QVector<QString> getChoices() const;
+
+    /**
+     * @brief Setter property for ShowOperators
+     */
+    void setShowOperators(bool value);
+    /**
+     * @brief Getter property for ShowOperators
+     * @return Value of ShowOperators
+     */
+    bool getShowOperators() const;
+
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, DefaultAttributeMatrixTypes)
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
     /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -127,14 +177,30 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ComparisonSelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ComparisonSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ComparisonSelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ComparisonSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -155,5 +221,13 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
     ComparisonSelectionFilterParameter(ComparisonSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     ComparisonSelectionFilterParameter& operator=(const ComparisonSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     ComparisonSelectionFilterParameter& operator=(ComparisonSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVector<QString> m_Choices = {};
+    bool m_ShowOperators = {};
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+    ComparisonSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    ComparisonSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index 79ce75c2c2..96072c1be1 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -49,7 +49,7 @@ ConstrainedDoubleFilterParameter::~ConstrainedDoubleFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+  double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ConstrainedDoubleFilterParameter::Pointer ptr = ConstrainedDoubleFilterParameter::New();
@@ -95,3 +95,51 @@ void ConstrainedDoubleFilterParameter::writeJson(QJsonObject &json)
   }
 }
 
+// -----------------------------------------------------------------------------
+ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New()
+{
+  Pointer sharedPtr(new(ConstrainedDoubleFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedDoubleFilterParameter::getNameOfClass() const
+{
+  return QString("ConstrainedDoubleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedDoubleFilterParameter::ClassName()
+{
+  return QString("ConstrainedDoubleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedDoubleFilterParameter::setSetterCallback(const ConstrainedDoubleFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedDoubleFilterParameter::SetterCallbackType ConstrainedDoubleFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedDoubleFilterParameter::setGetterCallback(const ConstrainedDoubleFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedDoubleFilterParameter::GetterCallbackType ConstrainedDoubleFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 92411048d9..118c9d1f77 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -64,9 +66,23 @@
 class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ConstrainedDoubleFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ConstrainedDoubleFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConstrainedDoubleFilterParameter, FilterParameter)
+    using Self = ConstrainedDoubleFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(double)>;
     using GetterCallbackType = std::function<double(void)>;
@@ -88,7 +104,7 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~ConstrainedDoubleFilterParameter() override;
 
@@ -116,27 +132,46 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ConstrainedDoubleFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ConstrainedDoubleFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ConstrainedDoubleFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ConstrainedDoubleFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief ConstrainedDoubleFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      ConstrainedDoubleFilterParameter();
+  protected:
+    /**
+     * @brief ConstrainedDoubleFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    ConstrainedDoubleFilterParameter();
 
-    public:
-      ConstrainedDoubleFilterParameter(const ConstrainedDoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      ConstrainedDoubleFilterParameter(ConstrainedDoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      ConstrainedDoubleFilterParameter& operator=(const ConstrainedDoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
-      ConstrainedDoubleFilterParameter& operator=(ConstrainedDoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    ConstrainedDoubleFilterParameter(const ConstrainedDoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    ConstrainedDoubleFilterParameter(ConstrainedDoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    ConstrainedDoubleFilterParameter& operator=(const ConstrainedDoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
+    ConstrainedDoubleFilterParameter& operator=(ConstrainedDoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    ConstrainedDoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
+    ConstrainedDoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
index c090a1e838..a456077ddf 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
@@ -34,3 +34,52 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedFilterParameter.h"
+
+// -----------------------------------------------------------------------------
+ConstrainedFilterParameter::Pointer ConstrainedFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedFilterParameter::Pointer ConstrainedFilterParameter::New()
+{
+  Pointer sharedPtr(new(ConstrainedFilterParameter<T>));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedFilterParameter::getNameOfClass() const
+{
+  return QString("ConstrainedFilterParameter<T>");
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedFilterParameter::ClassName()
+{
+  return QString("ConstrainedFilterParameter<T>");
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedFilterParameter::setMinimum(const T& value)
+{
+  m_Minimum = value;
+}
+
+// -----------------------------------------------------------------------------
+T ConstrainedFilterParameter::getMinimum() const
+{
+  return m_Minimum;
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedFilterParameter::setMaximum(const T& value)
+{
+  m_Maximum = value;
+}
+
+// -----------------------------------------------------------------------------
+T ConstrainedFilterParameter::getMaximum() const
+{
+  return m_Maximum;
+}
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
index 91d78b3429..7a23308a08 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -35,20 +35,53 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 template<typename T>
 class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ConstrainedFilterParameter<T>)
-    SIMPL_STATIC_NEW_MACRO(ConstrainedFilterParameter<T>)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConstrainedFilterParameter<T>, FilterParameter)
+    using Self = ConstrainedFilterParameter<T>;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ConstrainedFilterParameter<T>
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ConstrainedFilterParameter<T>
+     */
+    static QString ClassName();
 
     virtual ~ConstrainedFilterParameter() {}
 
-    SIMPL_INSTANCE_PROPERTY(T, Minimum)
-    SIMPL_INSTANCE_PROPERTY(T, Maximum)
+    /**
+     * @brief Setter property for Minimum
+     */
+    void setMinimum(const T& value);
+    /**
+     * @brief Getter property for Minimum
+     * @return Value of Minimum
+     */
+    T getMinimum() const;
+
+    /**
+     * @brief Setter property for Maximum
+     */
+    void setMaximum(const T& value);
+    /**
+     * @brief Getter property for Maximum
+     * @return Value of Maximum
+     */
+    T getMaximum() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -65,5 +98,9 @@ class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
     ConstrainedFilterParameter(ConstrainedFilterParameter&&) = delete;      // Move Constructor Not Implemented
     ConstrainedFilterParameter& operator=(const ConstrainedFilterParameter&) = delete; // Copy Assignment Not Implemented
     ConstrainedFilterParameter& operator=(ConstrainedFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    T m_Minimum = {};
+    T m_Maximum = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index c8c9797804..2aec88fb96 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -49,7 +49,7 @@ ConstrainedIntFilterParameter::~ConstrainedIntFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+  int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
   int groupIndex)
 {
 
@@ -96,3 +96,51 @@ void ConstrainedIntFilterParameter::writeJson(QJsonObject &json)
   }
 }
 
+// -----------------------------------------------------------------------------
+ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New()
+{
+  Pointer sharedPtr(new(ConstrainedIntFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedIntFilterParameter::getNameOfClass() const
+{
+  return QString("ConstrainedIntFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ConstrainedIntFilterParameter::ClassName()
+{
+  return QString("ConstrainedIntFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedIntFilterParameter::setSetterCallback(const ConstrainedIntFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedIntFilterParameter::SetterCallbackType ConstrainedIntFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ConstrainedIntFilterParameter::setGetterCallback(const ConstrainedIntFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ConstrainedIntFilterParameter::GetterCallbackType ConstrainedIntFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index cc06acf4ef..d7b44d677a 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(ConstrainedIntFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ConstrainedIntFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ConstrainedIntFilterParameter, FilterParameter)
+    using Self = ConstrainedIntFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for ConstrainedIntFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for ConstrainedIntFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(int)>;
     using GetterCallbackType = std::function<int(void)>;
@@ -87,7 +103,7 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~ConstrainedIntFilterParameter() override;
 
@@ -115,27 +131,46 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ConstrainedIntFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ConstrainedIntFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ConstrainedIntFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ConstrainedIntFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief ConstrainedIntFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      ConstrainedIntFilterParameter();
+  protected:
+    /**
+     * @brief ConstrainedIntFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    ConstrainedIntFilterParameter();
 
-    public:
-      ConstrainedIntFilterParameter(const ConstrainedIntFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      ConstrainedIntFilterParameter(ConstrainedIntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      ConstrainedIntFilterParameter& operator=(const ConstrainedIntFilterParameter&) = delete; // Copy Assignment Not Implemented
-      ConstrainedIntFilterParameter& operator=(ConstrainedIntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    ConstrainedIntFilterParameter(const ConstrainedIntFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    ConstrainedIntFilterParameter(ConstrainedIntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    ConstrainedIntFilterParameter& operator=(const ConstrainedIntFilterParameter&) = delete; // Copy Assignment Not Implemented
+    ConstrainedIntFilterParameter& operator=(ConstrainedIntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    ConstrainedIntFilterParameter::SetterCallbackType m_SetterCallback = {};
+    ConstrainedIntFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 2888a6b186..95c7ad09c9 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -177,3 +177,76 @@ void DataArrayCreationFilterParameter::dataArrayPathRenamed(AbstractFilter* filt
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+DataArrayCreationFilterParameter::Pointer DataArrayCreationFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataArrayCreationFilterParameter::Pointer DataArrayCreationFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataArrayCreationFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataArrayCreationFilterParameter::getNameOfClass() const
+{
+  return QString("DataArrayCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataArrayCreationFilterParameter::ClassName()
+{
+  return QString("DataArrayCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataArrayCreationFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types DataArrayCreationFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataArrayCreationFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> DataArrayCreationFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataArrayCreationFilterParameter::setSetterCallback(const DataArrayCreationFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayCreationFilterParameter::SetterCallbackType DataArrayCreationFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DataArrayCreationFilterParameter::setGetterCallback(const DataArrayCreationFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayCreationFilterParameter::GetterCallbackType DataArrayCreationFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 5819db1806..3ef5912603 100755
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -69,9 +71,23 @@ class AbstractFilter;
 class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataArrayCreationFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataArrayCreationFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataArrayCreationFilterParameter, FilterParameter)
+    using Self = DataArrayCreationFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DataArrayCreationFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataArrayCreationFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
@@ -148,27 +164,59 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
     * @param DefaultGeometryTypes Default geometry types required for Data Container selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
     /**
     * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DataArrayCreationFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DataArrayCreationFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DataArrayCreationFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DataArrayCreationFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -187,6 +235,12 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
     DataArrayCreationFilterParameter(DataArrayCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DataArrayCreationFilterParameter& operator=(const DataArrayCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
     DataArrayCreationFilterParameter& operator=(DataArrayCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    DataArrayCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DataArrayCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 64bf7330c4..f3d0fdd2a7 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -220,3 +220,100 @@ void DataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fil
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataArraySelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataArraySelectionFilterParameter::getNameOfClass() const
+{
+  return QString("DataArraySelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataArraySelectionFilterParameter::ClassName()
+{
+  return QString("DataArraySelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types DataArraySelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> DataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+{
+  m_DefaultAttributeArrayTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> DataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
+{
+  return m_DefaultAttributeArrayTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value)
+{
+  m_DefaultComponentDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<std::vector<size_t>> DataArraySelectionFilterParameter::getDefaultComponentDimensions() const
+{
+  return m_DefaultComponentDimensions;
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setSetterCallback(const DataArraySelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArraySelectionFilterParameter::SetterCallbackType DataArraySelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DataArraySelectionFilterParameter::setGetterCallback(const DataArraySelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArraySelectionFilterParameter::GetterCallbackType DataArraySelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 385f1fbac3..bc17e193c5 100755
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -69,9 +71,23 @@ class AbstractFilter;
 class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataArraySelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataArraySelectionFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataArraySelectionFilterParameter, FilterParameter)
+    using Self = DataArraySelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DataArraySelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataArraySelectionFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
@@ -165,39 +181,87 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     * @param DefaultGeometryTypes Default geometry types required for Data Container selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
     /**
     * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
     /**
     * @param DefaultAttributeArrayTypes Default attribute array types required for Attribute Array selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
+    /**
+     * @brief Setter property for DefaultAttributeArrayTypes
+     */
+    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+    /**
+     * @brief Getter property for DefaultAttributeArrayTypes
+     * @return Value of DefaultAttributeArrayTypes
+     */
+    QVector<QString> getDefaultAttributeArrayTypes() const;
 
     /**
     * @param DefaultComponentDimensions Default component dimensions required for Attribute Array selections
     * @return
     */
-    SIMPL_INSTANCE_PROPERTY(std::vector<std::vector<size_t>>, DefaultComponentDimensions)
+    /**
+     * @brief Setter property for DefaultComponentDimensions
+     */
+    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+    /**
+     * @brief Getter property for DefaultComponentDimensions
+     * @return Value of DefaultComponentDimensions
+     */
+    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DataArraySelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DataArraySelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -216,6 +280,14 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     DataArraySelectionFilterParameter(DataArraySelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DataArraySelectionFilterParameter& operator=(const DataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     DataArraySelectionFilterParameter& operator=(DataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    QVector<QString> m_DefaultAttributeArrayTypes = {};
+    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+    DataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index ffae612f70..6b1b54136c 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -125,3 +125,76 @@ void DataContainerArrayProxyFilterParameter::dataArrayPathRenamed(AbstractFilter
   }
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxyFilterParameter::Pointer DataContainerArrayProxyFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxyFilterParameter::Pointer DataContainerArrayProxyFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataContainerArrayProxyFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerArrayProxyFilterParameter::getNameOfClass() const
+{
+  return QString("DataContainerArrayProxyFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerArrayProxyFilterParameter::ClassName()
+{
+  return QString("DataContainerArrayProxyFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerArrayProxyFilterParameter::setDataContainerArrayProxy(const DataContainerArrayProxy& value)
+{
+  m_DataContainerArrayProxy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxy DataContainerArrayProxyFilterParameter::getDataContainerArrayProxy() const
+{
+  return m_DataContainerArrayProxy;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerArrayProxyFilterParameter::setDefaultFlagValue(const Qt::CheckState& value)
+{
+  m_DefaultFlagValue = value;
+}
+
+// -----------------------------------------------------------------------------
+Qt::CheckState DataContainerArrayProxyFilterParameter::getDefaultFlagValue() const
+{
+  return m_DefaultFlagValue;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerArrayProxyFilterParameter::setSetterCallback(const DataContainerArrayProxyFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxyFilterParameter::SetterCallbackType DataContainerArrayProxyFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerArrayProxyFilterParameter::setGetterCallback(const DataContainerArrayProxyFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxyFilterParameter::GetterCallbackType DataContainerArrayProxyFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 249109a6b1..6ceccee9b3 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -65,9 +67,23 @@
 class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataContainerArrayProxyFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataContainerArrayProxyFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerArrayProxyFilterParameter, FilterParameter)
+    using Self = DataContainerArrayProxyFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DataContainerArrayProxy)>;
     using GetterCallbackType = std::function<DataContainerArrayProxy(void)>;
@@ -96,8 +112,25 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
 
     ~DataContainerArrayProxyFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(DataContainerArrayProxy, DataContainerArrayProxy)
-    SIMPL_INSTANCE_PROPERTY(Qt::CheckState, DefaultFlagValue)
+    /**
+     * @brief Setter property for DataContainerArrayProxy
+     */
+    void setDataContainerArrayProxy(const DataContainerArrayProxy& value);
+    /**
+     * @brief Getter property for DataContainerArrayProxy
+     * @return Value of DataContainerArrayProxy
+     */
+    DataContainerArrayProxy getDataContainerArrayProxy() const;
+
+    /**
+     * @brief Setter property for DefaultFlagValue
+     */
+    void setDefaultFlagValue(const Qt::CheckState& value);
+    /**
+     * @brief Getter property for DefaultFlagValue
+     * @return Value of DefaultFlagValue
+     */
+    Qt::CheckState getDefaultFlagValue() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -123,14 +156,30 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DataContainerArrayProxyFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DataContainerArrayProxyFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DataContainerArrayProxyFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DataContainerArrayProxyFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -149,5 +198,11 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
     DataContainerArrayProxyFilterParameter(DataContainerArrayProxyFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DataContainerArrayProxyFilterParameter& operator=(const DataContainerArrayProxyFilterParameter&) = delete; // Copy Assignment Not Implemented
     DataContainerArrayProxyFilterParameter& operator=(DataContainerArrayProxyFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataContainerArrayProxy m_DataContainerArrayProxy = {};
+    Qt::CheckState m_DefaultFlagValue = {};
+    DataContainerArrayProxyFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DataContainerArrayProxyFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index a425e1f927..3bbf5d1b55 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -128,3 +128,52 @@ void DataContainerCreationFilterParameter::dataArrayPathRenamed(AbstractFilter*
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
+
+// -----------------------------------------------------------------------------
+DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataContainerCreationFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerCreationFilterParameter::getNameOfClass() const
+{
+  return QString("DataContainerCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerCreationFilterParameter::ClassName()
+{
+  return QString("DataContainerCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerCreationFilterParameter::setSetterCallback(const DataContainerCreationFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerCreationFilterParameter::SetterCallbackType DataContainerCreationFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerCreationFilterParameter::setGetterCallback(const DataContainerCreationFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerCreationFilterParameter::GetterCallbackType DataContainerCreationFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index e8fb33ef6d..73c0c2b79c 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -64,9 +66,23 @@
 class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(DataContainerCreationFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(DataContainerCreationFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerCreationFilterParameter, FilterParameter)
+  using Self = DataContainerCreationFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerCreationFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerCreationFilterParameter
+   */
+  static QString ClassName();
 
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
@@ -116,14 +132,30 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DataContainerCreationFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DataContainerCreationFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DataContainerCreationFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DataContainerCreationFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handles changes to the DataArrayPath
@@ -144,5 +176,9 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
   DataContainerCreationFilterParameter(DataContainerCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
   DataContainerCreationFilterParameter& operator=(const DataContainerCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
   DataContainerCreationFilterParameter& operator=(DataContainerCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataContainerCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DataContainerCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index ec29609a5e..cd4c219ead 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -105,3 +105,88 @@ void DataContainerReaderFilterParameter::writeJson(QJsonObject& json)
   json[getPropertyName()] = obj;
   json["InputFile"] = m_Filter->getInputFile();
 }
+
+// -----------------------------------------------------------------------------
+DataContainerReaderFilterParameter::Pointer DataContainerReaderFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataContainerReaderFilterParameter::Pointer DataContainerReaderFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataContainerReaderFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReaderFilterParameter::getNameOfClass() const
+{
+  return QString("DataContainerReaderFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReaderFilterParameter::ClassName()
+{
+  return QString("DataContainerReaderFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReaderFilterParameter::setDefaultFlagValue(const Qt::CheckState& value)
+{
+  m_DefaultFlagValue = value;
+}
+
+// -----------------------------------------------------------------------------
+Qt::CheckState DataContainerReaderFilterParameter::getDefaultFlagValue() const
+{
+  return m_DefaultFlagValue;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReaderFilterParameter::setInputFileProperty(const QString& value)
+{
+  m_InputFileProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReaderFilterParameter::getInputFileProperty() const
+{
+  return m_InputFileProperty;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReaderFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReaderFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReaderFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerReaderFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerReaderFilterParameter::setFilter(DataContainerReader* value)
+{
+  m_Filter = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerReader* DataContainerReaderFilterParameter::getFilter() const
+{
+  return m_Filter;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index 2a12544e94..ba3199916c 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
@@ -48,9 +50,23 @@
 class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataContainerReaderFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataContainerReaderFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerReaderFilterParameter, FilterParameter)
+    using Self = DataContainerReaderFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DataContainerReaderFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerReaderFilterParameter
+     */
+    static QString ClassName();
 
     /**
      * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
@@ -69,11 +85,55 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
 
     ~DataContainerReaderFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(Qt::CheckState, DefaultFlagValue)
-    SIMPL_INSTANCE_PROPERTY(QString, InputFileProperty)
-    SIMPL_INSTANCE_PROPERTY(QString, FileExtension)
-    SIMPL_INSTANCE_PROPERTY(QString, FileType)
-    SIMPL_POINTER_PROPERTY(DataContainerReader, Filter)
+    /**
+     * @brief Setter property for DefaultFlagValue
+     */
+    void setDefaultFlagValue(const Qt::CheckState& value);
+    /**
+     * @brief Getter property for DefaultFlagValue
+     * @return Value of DefaultFlagValue
+     */
+    Qt::CheckState getDefaultFlagValue() const;
+
+    /**
+     * @brief Setter property for InputFileProperty
+     */
+    void setInputFileProperty(const QString& value);
+    /**
+     * @brief Getter property for InputFileProperty
+     * @return Value of InputFileProperty
+     */
+    QString getInputFileProperty() const;
+
+    /**
+     * @brief Setter property for FileExtension
+     */
+    void setFileExtension(const QString& value);
+    /**
+     * @brief Getter property for FileExtension
+     * @return Value of FileExtension
+     */
+    QString getFileExtension() const;
+
+    /**
+     * @brief Setter property for FileType
+     */
+    void setFileType(const QString& value);
+    /**
+     * @brief Getter property for FileType
+     * @return Value of FileType
+     */
+    QString getFileType() const;
+
+    /**
+     * @brief Setter property for Filter
+     */
+    void setFilter(DataContainerReader* value);
+    /**
+     * @brief Getter property for Filter
+     * @return Value of Filter
+     */
+    DataContainerReader* getFilter() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -106,5 +166,13 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
     DataContainerReaderFilterParameter(DataContainerReaderFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DataContainerReaderFilterParameter& operator=(const DataContainerReaderFilterParameter&) = delete; // Copy Assignment Not Implemented
     DataContainerReaderFilterParameter& operator=(DataContainerReaderFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DataContainerReader* m_Filter = nullptr;
+
+    Qt::CheckState m_DefaultFlagValue = {};
+    QString m_InputFileProperty = {};
+    QString m_FileExtension = {};
+    QString m_FileType = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index 68f28cb04a..4c9f9ab411 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -140,3 +140,64 @@ DataContainerSelectionFilterParameter::RequirementType DataContainerSelectionFil
 
   return reqs;
 }
+
+// -----------------------------------------------------------------------------
+DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(DataContainerSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("DataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DataContainerSelectionFilterParameter::ClassName()
+{
+  return QString("DataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types DataContainerSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerSelectionFilterParameter::setSetterCallback(const DataContainerSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerSelectionFilterParameter::SetterCallbackType DataContainerSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DataContainerSelectionFilterParameter::setGetterCallback(const DataContainerSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerSelectionFilterParameter::GetterCallbackType DataContainerSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 15d2324d52..d0b6a07679 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -66,9 +68,23 @@
 class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DataContainerSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DataContainerSelectionFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DataContainerSelectionFilterParameter, FilterParameter)
+    using Self = DataContainerSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DataContainerSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DataContainerSelectionFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DataArrayPath)>;
     using GetterCallbackType = std::function<DataArrayPath(void)>;
@@ -127,21 +143,45 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
     */
     RequirementType getRequirements();
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DataContainerSelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DataContainerSelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handles changes to the DataArrayPath
@@ -162,5 +202,10 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
     DataContainerSelectionFilterParameter(DataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DataContainerSelectionFilterParameter& operator=(const DataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     DataContainerSelectionFilterParameter& operator=(DataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    DataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 5bcb37878e..234457f5f9 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -49,7 +49,7 @@ DoubleFilterParameter::~DoubleFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                          double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
@@ -69,7 +69,7 @@ DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLa
 //
 // -----------------------------------------------------------------------------
 DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                          float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
@@ -115,3 +115,52 @@ void DoubleFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+DoubleFilterParameter::Pointer DoubleFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DoubleFilterParameter::Pointer DoubleFilterParameter::New()
+{
+  Pointer sharedPtr(new(DoubleFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DoubleFilterParameter::getNameOfClass() const
+{
+  return QString("DoubleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DoubleFilterParameter::ClassName()
+{
+  return QString("DoubleFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DoubleFilterParameter::setSetterCallback(const DoubleFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DoubleFilterParameter::SetterCallbackType DoubleFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DoubleFilterParameter::setGetterCallback(const DoubleFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DoubleFilterParameter::GetterCallbackType DoubleFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index 64a96b1c37..b2f775294a 100755
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -64,9 +66,23 @@
 class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DoubleFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DoubleFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DoubleFilterParameter, FilterParameter)
+    using Self = DoubleFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DoubleFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DoubleFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(double)>;
     using GetterCallbackType = std::function<double(void)>;
@@ -88,7 +104,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const double& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     /**
      * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
@@ -107,7 +123,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~DoubleFilterParameter() override;
 
@@ -135,27 +151,46 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DoubleFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DoubleFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DoubleFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DoubleFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief DoubleFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      DoubleFilterParameter();
+  protected:
+    /**
+     * @brief DoubleFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    DoubleFilterParameter();
 
-    public:
-      DoubleFilterParameter(const DoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      DoubleFilterParameter(DoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      DoubleFilterParameter& operator=(const DoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
-      DoubleFilterParameter& operator=(DoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    DoubleFilterParameter(const DoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    DoubleFilterParameter(DoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    DoubleFilterParameter& operator=(const DoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
+    DoubleFilterParameter& operator=(DoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 8cdea5c579..71b3ffba71 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -93,3 +93,76 @@ void DynamicChoiceFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+DynamicChoiceFilterParameter::Pointer DynamicChoiceFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DynamicChoiceFilterParameter::Pointer DynamicChoiceFilterParameter::New()
+{
+  Pointer sharedPtr(new(DynamicChoiceFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicChoiceFilterParameter::getNameOfClass() const
+{
+  return QString("DynamicChoiceFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicChoiceFilterParameter::ClassName()
+{
+  return QString("DynamicChoiceFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DynamicChoiceFilterParameter::setListProperty(const QString& value)
+{
+  m_ListProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicChoiceFilterParameter::getListProperty() const
+{
+  return m_ListProperty;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicChoiceFilterParameter::setUnits(const QString& value)
+{
+  m_Units = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicChoiceFilterParameter::getUnits() const
+{
+  return m_Units;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicChoiceFilterParameter::setSetterCallback(const DynamicChoiceFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicChoiceFilterParameter::SetterCallbackType DynamicChoiceFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicChoiceFilterParameter::setGetterCallback(const DynamicChoiceFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicChoiceFilterParameter::GetterCallbackType DynamicChoiceFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index 19e9411d2c..597ae6e58c 100755
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DynamicChoiceFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DynamicChoiceFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DynamicChoiceFilterParameter, FilterParameter)
+    using Self = DynamicChoiceFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DynamicChoiceFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DynamicChoiceFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(QString)>;
     using GetterCallbackType = std::function<QString(void)>;
@@ -94,9 +110,25 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
 
     ~DynamicChoiceFilterParameter() override;
 
+    /**
+     * @brief Setter property for ListProperty
+     */
+    void setListProperty(const QString& value);
+    /**
+     * @brief Getter property for ListProperty
+     * @return Value of ListProperty
+     */
+    QString getListProperty() const;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ListProperty)
-    SIMPL_INSTANCE_STRING_PROPERTY(Units)
+    /**
+     * @brief Setter property for Units
+     */
+    void setUnits(const QString& value);
+    /**
+     * @brief Getter property for Units
+     * @return Value of Units
+     */
+    QString getUnits() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -122,15 +154,30 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DynamicChoiceFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DynamicChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DynamicChoiceFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DynamicChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -144,5 +191,11 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
     DynamicChoiceFilterParameter(DynamicChoiceFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DynamicChoiceFilterParameter& operator=(const DynamicChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
     DynamicChoiceFilterParameter& operator=(DynamicChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_ListProperty = {};
+    QString m_Units = {};
+    DynamicChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DynamicChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index 35d44a821a..ea733a1f0e 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -38,6 +38,7 @@
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtCore/QSize>
+#include <QtCore/QTextStream>
 
 // -----------------------------------------------------------------------------
 //
@@ -611,3 +612,99 @@ bool DynamicTableData::operator!=(const DynamicTableData& rhs) const
 
   return false;
 }
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setColHeaders(const QStringList& value)
+{
+  m_ColHeaders = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList DynamicTableData::getColHeaders() const
+{
+  return m_ColHeaders;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setRowHeaders(const QStringList& value)
+{
+  m_RowHeaders = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList DynamicTableData::getRowHeaders() const
+{
+  return m_RowHeaders;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setDynamicRows(bool value)
+{
+  m_DynamicRows = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DynamicTableData::getDynamicRows() const
+{
+  return m_DynamicRows;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setDynamicCols(bool value)
+{
+  m_DynamicCols = value;
+}
+
+// -----------------------------------------------------------------------------
+bool DynamicTableData::getDynamicCols() const
+{
+  return m_DynamicCols;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setMinRows(int value)
+{
+  m_MinRows = value;
+}
+
+// -----------------------------------------------------------------------------
+int DynamicTableData::getMinRows() const
+{
+  return m_MinRows;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setMinCols(int value)
+{
+  m_MinCols = value;
+}
+
+// -----------------------------------------------------------------------------
+int DynamicTableData::getMinCols() const
+{
+  return m_MinCols;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setDefaultRowCount(int value)
+{
+  m_DefaultRowCount = value;
+}
+
+// -----------------------------------------------------------------------------
+int DynamicTableData::getDefaultRowCount() const
+{
+  return m_DefaultRowCount;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableData::setDefaultColCount(int value)
+{
+  m_DefaultColCount = value;
+}
+
+// -----------------------------------------------------------------------------
+int DynamicTableData::getDefaultColCount() const
+{
+  return m_DefaultColCount;
+}
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index a7178bbac0..aff2982185 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -1,43 +1,42 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 
 #include <QtCore/QObject>
 
-
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
@@ -48,11 +47,14 @@
 class SIMPLib_EXPORT DynamicTableData : public QObject
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(DynamicTableData)
     PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
     PYB11_PROPERTY(QStringList ColHeaders READ getColHeaders WRITE setColHeaders)
     PYB11_PROPERTY(QStringList RowHeaders READ getRowHeaders WRITE setRowHeaders)
     PYB11_PROPERTY(std::vector<std::vector<double>> TableData READ getTableData WRITE setTableData)
+#endif
 
   public:
     DynamicTableData();
@@ -68,14 +70,85 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
                                   const std::list<std::string>& rHeaders, 
                                   const std::list<std::string>& cHeaders);
 
-    SIMPL_INSTANCE_PROPERTY(QStringList, ColHeaders)
-    SIMPL_INSTANCE_PROPERTY(QStringList, RowHeaders)
-    SIMPL_INSTANCE_PROPERTY(bool, DynamicRows)
-    SIMPL_INSTANCE_PROPERTY(bool, DynamicCols)
-    SIMPL_INSTANCE_PROPERTY(int, MinRows)
-    SIMPL_INSTANCE_PROPERTY(int, MinCols)
-    SIMPL_INSTANCE_PROPERTY(int, DefaultRowCount)
-    SIMPL_INSTANCE_PROPERTY(int, DefaultColCount)
+    /**
+     * @brief Setter property for ColHeaders
+     */
+    void setColHeaders(const QStringList& value);
+    /**
+     * @brief Getter property for ColHeaders
+     * @return Value of ColHeaders
+     */
+    QStringList getColHeaders() const;
+
+    /**
+     * @brief Setter property for RowHeaders
+     */
+    void setRowHeaders(const QStringList& value);
+    /**
+     * @brief Getter property for RowHeaders
+     * @return Value of RowHeaders
+     */
+    QStringList getRowHeaders() const;
+
+    /**
+     * @brief Setter property for DynamicRows
+     */
+    void setDynamicRows(bool value);
+    /**
+     * @brief Getter property for DynamicRows
+     * @return Value of DynamicRows
+     */
+    bool getDynamicRows() const;
+
+    /**
+     * @brief Setter property for DynamicCols
+     */
+    void setDynamicCols(bool value);
+    /**
+     * @brief Getter property for DynamicCols
+     * @return Value of DynamicCols
+     */
+    bool getDynamicCols() const;
+
+    /**
+     * @brief Setter property for MinRows
+     */
+    void setMinRows(int value);
+    /**
+     * @brief Getter property for MinRows
+     * @return Value of MinRows
+     */
+    int getMinRows() const;
+
+    /**
+     * @brief Setter property for MinCols
+     */
+    void setMinCols(int value);
+    /**
+     * @brief Getter property for MinCols
+     * @return Value of MinCols
+     */
+    int getMinCols() const;
+
+    /**
+     * @brief Setter property for DefaultRowCount
+     */
+    void setDefaultRowCount(int value);
+    /**
+     * @brief Getter property for DefaultRowCount
+     * @return Value of DefaultRowCount
+     */
+    int getDefaultRowCount() const;
+
+    /**
+     * @brief Setter property for DefaultColCount
+     */
+    void setDefaultColCount(int value);
+    /**
+     * @brief Getter property for DefaultColCount
+     * @return Value of DefaultColCount
+     */
+    int getDefaultColCount() const;
 
     /**
     * @brief This deserializes a string of data and returns the original 2D array.
@@ -153,6 +226,15 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
     bool operator!=(const DynamicTableData& rhs) const;
 
   private:
+    QStringList m_ColHeaders = {};
+    QStringList m_RowHeaders = {};
+    bool m_DynamicRows = {};
+    bool m_DynamicCols = {};
+    int m_MinRows = {};
+    int m_MinCols = {};
+    int m_DefaultRowCount = {};
+    int m_DefaultColCount = {};
+
     std::vector<std::vector<double> >       m_TableData;
 
     /**
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 4846ab4f54..2eb5ca42f6 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -35,6 +35,8 @@
 
 #include "DynamicTableFilterParameter.h"
 
+#include <QtCore/QSet>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -120,3 +122,88 @@ void DynamicTableFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = jsonObj;
   }
 }
+
+// -----------------------------------------------------------------------------
+DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New()
+{
+  Pointer sharedPtr(new(DynamicTableFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicTableFilterParameter::getNameOfClass() const
+{
+  return QString("DynamicTableFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicTableFilterParameter::ClassName()
+{
+  return QString("DynamicTableFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableFilterParameter::setDefaultTableData(const DynamicTableData& value)
+{
+  m_DefaultTableData = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableFilterParameter::getDefaultTableData() const
+{
+  return m_DefaultTableData;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableFilterParameter::setErrorCondition(int value)
+{
+  m_ErrorCondition = value;
+}
+
+// -----------------------------------------------------------------------------
+int DynamicTableFilterParameter::getErrorCondition() const
+{
+  return m_ErrorCondition;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableFilterParameter::setErrorMessage(const QString& value)
+{
+  m_ErrorMessage = value;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicTableFilterParameter::getErrorMessage() const
+{
+  return m_ErrorMessage;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableFilterParameter::setSetterCallback(const DynamicTableFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableFilterParameter::SetterCallbackType DynamicTableFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableFilterParameter::setGetterCallback(const DynamicTableFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableFilterParameter::GetterCallbackType DynamicTableFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index c6b39208ba..15d9544e7c 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -65,9 +67,23 @@
 class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(DynamicTableFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(DynamicTableFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DynamicTableFilterParameter, FilterParameter)
+    using Self = DynamicTableFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for DynamicTableFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for DynamicTableFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(DynamicTableData)>;
     using GetterCallbackType = std::function<DynamicTableData(void)>;
@@ -99,9 +115,35 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
 
     ~DynamicTableFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(DynamicTableData, DefaultTableData)
-    SIMPL_INSTANCE_PROPERTY(int, ErrorCondition)
-    SIMPL_INSTANCE_PROPERTY(QString, ErrorMessage)
+    /**
+     * @brief Setter property for DefaultTableData
+     */
+    void setDefaultTableData(const DynamicTableData& value);
+    /**
+     * @brief Getter property for DefaultTableData
+     * @return Value of DefaultTableData
+     */
+    DynamicTableData getDefaultTableData() const;
+
+    /**
+     * @brief Setter property for ErrorCondition
+     */
+    void setErrorCondition(int value);
+    /**
+     * @brief Getter property for ErrorCondition
+     * @return Value of ErrorCondition
+     */
+    int getErrorCondition() const;
+
+    /**
+     * @brief Setter property for ErrorMessage
+     */
+    void setErrorMessage(const QString& value);
+    /**
+     * @brief Getter property for ErrorMessage
+     * @return Value of ErrorMessage
+     */
+    QString getErrorMessage() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -127,15 +169,30 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const DynamicTableFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    DynamicTableFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const DynamicTableFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    DynamicTableFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -149,5 +206,12 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
     DynamicTableFilterParameter(DynamicTableFilterParameter&&) = delete;      // Move Constructor Not Implemented
     DynamicTableFilterParameter& operator=(const DynamicTableFilterParameter&) = delete; // Copy Assignment Not Implemented
     DynamicTableFilterParameter& operator=(DynamicTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    DynamicTableData m_DefaultTableData = {};
+    int m_ErrorCondition = {};
+    QString m_ErrorMessage = {};
+    DynamicTableFilterParameter::SetterCallbackType m_SetterCallback = {};
+    DynamicTableFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/FileListInfo.h b/Source/SIMPLib/FilterParameters/FileListInfo.h
index d4f841338e..a41530e342 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfo.h
@@ -31,6 +31,7 @@
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QString>
+#include <QtCore/QMetaType>
 
 typedef struct
 {
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 586f30b162..64a81c0263 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -104,3 +104,52 @@ void FileListInfoFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = jsonObj;
   }
 }
+
+// -----------------------------------------------------------------------------
+FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::New()
+{
+  Pointer sharedPtr(new(FileListInfoFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FileListInfoFilterParameter::getNameOfClass() const
+{
+  return QString("FileListInfoFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FileListInfoFilterParameter::ClassName()
+{
+  return QString("FileListInfoFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FileListInfoFilterParameter::setSetterCallback(const FileListInfoFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FileListInfoFilterParameter::SetterCallbackType FileListInfoFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void FileListInfoFilterParameter::setGetterCallback(const FileListInfoFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FileListInfoFilterParameter::GetterCallbackType FileListInfoFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 99d21a1e1f..932f9e09a7 100755
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -35,10 +35,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FileListInfo.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
@@ -64,9 +65,23 @@
 class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(FileListInfoFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(FileListInfoFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FileListInfoFilterParameter, FilterParameter)
+  using Self = FileListInfoFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FileListInfoFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FileListInfoFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(FileListInfo_t)> SetterCallbackType;
   typedef std::function<FileListInfo_t(void)> GetterCallbackType;
@@ -116,14 +131,30 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
    * that this FilterParameter subclass represents.
    * from the filter parameter.
    */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const FileListInfoFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  FileListInfoFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
    * that this FilterParameter subclass represents.
    * @return The GetterCallback
    */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const FileListInfoFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  FileListInfoFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -137,5 +168,9 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   FileListInfoFilterParameter(FileListInfoFilterParameter&&) = delete;      // Move Constructor Not Implemented
   FileListInfoFilterParameter& operator=(const FileListInfoFilterParameter&) = delete; // Copy Assignment Not Implemented
   FileListInfoFilterParameter& operator=(FileListInfoFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  FileListInfoFilterParameter::SetterCallbackType m_SetterCallback = {};
+  FileListInfoFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 2510b77a0b..03a832d94f 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -131,3 +131,93 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
+
+// -----------------------------------------------------------------------------
+FilterParameter::Pointer FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString FilterParameter::getNameOfClass() const
+{
+  return QString("FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterParameter::ClassName()
+{
+  return QString("FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setHumanLabel(const QString& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterParameter::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setPropertyName(const QString& value)
+{
+  m_PropertyName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterParameter::getPropertyName() const
+{
+  return m_PropertyName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setCategory(const FilterParameter::Category& value)
+{
+  m_Category = value;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameter::Category FilterParameter::getCategory() const
+{
+  return m_Category;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setReadOnly(bool value)
+{
+  m_ReadOnly = value;
+}
+
+// -----------------------------------------------------------------------------
+bool FilterParameter::getReadOnly() const
+{
+  return m_ReadOnly;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setGroupIndex(int value)
+{
+  m_GroupIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterParameter::getGroupIndex() const
+{
+  return m_GroupIndex;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameter::setDefaultValue(const QVariant& value)
+{
+  m_DefaultValue = value;
+}
+
+// -----------------------------------------------------------------------------
+QVariant FilterParameter::getDefaultValue() const
+{
+  return m_DefaultValue;
+}
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index d0da3ec272..72ea1784d3 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -37,13 +37,12 @@
 #pragma once
 
 #include <functional>
-
+#include <memory>
 
 #include <QtCore/QVariant>
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 class AbstractFilter;
@@ -59,8 +58,21 @@ class AbstractFilter;
 class SIMPLib_EXPORT FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(FilterParameter)
-    SIMPL_TYPE_MACRO(FilterParameter)
+    using Self = FilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for FilterParameter
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for FilterParameter
+     */
+    static QString ClassName();
 
     enum Category
     {
@@ -72,8 +84,25 @@ class SIMPLib_EXPORT FilterParameter
 
     virtual ~FilterParameter();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
-    SIMPL_INSTANCE_STRING_PROPERTY(PropertyName)
+    /**
+     * @brief Setter property for HumanLabel
+     */
+    void setHumanLabel(const QString& value);
+    /**
+     * @brief Getter property for HumanLabel
+     * @return Value of HumanLabel
+     */
+    QString getHumanLabel() const;
+
+    /**
+     * @brief Setter property for PropertyName
+     */
+    void setPropertyName(const QString& value);
+    /**
+     * @brief Getter property for PropertyName
+     * @return Value of PropertyName
+     */
+    QString getPropertyName() const;
 
     /**
      * @brief getWidgetType This is a pure virtual function. All subclasses need
@@ -82,10 +111,46 @@ class SIMPLib_EXPORT FilterParameter
      */
     virtual QString getWidgetType() const = 0;
 
-    SIMPL_VIRTUAL_INSTANCE_PROPERTY(QVariant, DefaultValue)
-    SIMPL_INSTANCE_PROPERTY(FilterParameter::Category, Category)
-    SIMPL_INSTANCE_PROPERTY(bool, ReadOnly)
-    SIMPL_INSTANCE_PROPERTY(int, GroupIndex)
+    /**
+     * @brief Setter property for DefaultValue
+     */
+    virtual void setDefaultValue(const QVariant& value);
+
+    /**
+     * @brief getDefaultValue
+     * @return
+     */
+    virtual QVariant getDefaultValue() const;
+
+    /**
+     * @brief Setter property for Category
+     */
+    void setCategory(const FilterParameter::Category& value);
+    /**
+     * @brief Getter property for Category
+     * @return Value of Category
+     */
+    FilterParameter::Category getCategory() const;
+
+    /**
+     * @brief Setter property for ReadOnly
+     */
+    void setReadOnly(bool value);
+    /**
+     * @brief Getter property for ReadOnly
+     * @return Value of ReadOnly
+     */
+    bool getReadOnly() const;
+
+    /**
+     * @brief Setter property for GroupIndex
+     */
+    void setGroupIndex(int value);
+    /**
+     * @brief Getter property for GroupIndex
+     * @return Value of GroupIndex
+     */
+    int getGroupIndex() const;
 
     /**
      * @brief readJson
@@ -114,6 +179,15 @@ class SIMPLib_EXPORT FilterParameter
     FilterParameter(FilterParameter&&) = delete;      // Move Constructor Not Implemented
     FilterParameter& operator=(const FilterParameter&) = delete; // Copy Assignment Not Implemented
     FilterParameter& operator=(FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVariant m_DefaultValue = {};
+
+    QString m_HumanLabel = {};
+    QString m_PropertyName = {};
+    FilterParameter::Category m_Category = {};
+    bool m_ReadOnly = {};
+    int m_GroupIndex = {};
 };
 
 using FilterParameterVectorType = std::vector<FilterParameter::Pointer>;
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index 24cebefee4..92bea953a2 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -45,7 +45,7 @@ FloatFilterParameter::~FloatFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 FloatFilterParameter::Pointer FloatFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                       const float& defaultValue, Category category, 
+                       float defaultValue, Category category, 
                        const SetterCallbackType& setterCallback, 
                        const GetterCallbackType& getterCallback, 
                        int groupIndex)
@@ -94,3 +94,52 @@ void FloatFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+FloatFilterParameter::Pointer FloatFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FloatFilterParameter::Pointer FloatFilterParameter::New()
+{
+  Pointer sharedPtr(new(FloatFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FloatFilterParameter::getNameOfClass() const
+{
+  return QString("FloatFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FloatFilterParameter::ClassName()
+{
+  return QString("FloatFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FloatFilterParameter::setSetterCallback(const FloatFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatFilterParameter::SetterCallbackType FloatFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void FloatFilterParameter::setGetterCallback(const FloatFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatFilterParameter::GetterCallbackType FloatFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 5f50095ec3..0961f592d6 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -64,9 +66,23 @@
 class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(FloatFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(FloatFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FloatFilterParameter, FilterParameter)
+    using Self = FloatFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for FloatFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for FloatFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(float)>;
     using GetterCallbackType = std::function<float(void)>;
@@ -88,7 +104,7 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const float& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~FloatFilterParameter() override;
 
@@ -116,27 +132,46 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const FloatFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    FloatFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const FloatFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    FloatFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief FloatFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      FloatFilterParameter();
+  protected:
+    /**
+     * @brief FloatFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    FloatFilterParameter();
 
-    public:
-      FloatFilterParameter(const FloatFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      FloatFilterParameter(FloatFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      FloatFilterParameter& operator=(const FloatFilterParameter&) = delete; // Copy Assignment Not Implemented
-      FloatFilterParameter& operator=(FloatFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    FloatFilterParameter(const FloatFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    FloatFilterParameter(FloatFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    FloatFilterParameter& operator=(const FloatFilterParameter&) = delete; // Copy Assignment Not Implemented
+    FloatFilterParameter& operator=(FloatFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    FloatFilterParameter::SetterCallbackType m_SetterCallback = {};
+    FloatFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 65c293e783..0dc45d096e 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -105,3 +105,52 @@ void FloatVec2FilterParameter::writeJson(QJsonObject& obj)
     obj[getPropertyName()] = json;
   }
 }
+
+// -----------------------------------------------------------------------------
+FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::New()
+{
+  Pointer sharedPtr(new(FloatVec2FilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FloatVec2FilterParameter::getNameOfClass() const
+{
+  return QString("FloatVec2FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FloatVec2FilterParameter::ClassName()
+{
+  return QString("FloatVec2FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FloatVec2FilterParameter::setSetterCallback(const FloatVec2FilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec2FilterParameter::SetterCallbackType FloatVec2FilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void FloatVec2FilterParameter::setGetterCallback(const FloatVec2FilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec2FilterParameter::GetterCallbackType FloatVec2FilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 6fab53ca5c..ad1aac627e 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <cmath>
 #include <functional>
 
@@ -42,7 +44,6 @@
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -70,32 +71,47 @@
 class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(FloatVec2FilterParameter)
-    SIMPL_STATIC_NEW_MACRO(FloatVec2FilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FloatVec2FilterParameter, FilterParameter)
+  using Self = FloatVec2FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(FloatVec2Type)>;
-    using GetterCallbackType = std::function<FloatVec2Type(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the FloatVec2FilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_VEC3_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+  /**
+   * @brief Returns the name of the class for FloatVec2FilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FloatVec2FilterParameter
+   */
+  static QString ClassName();
 
-    ~FloatVec2FilterParameter() override;
+  using SetterCallbackType = std::function<void(FloatVec2Type)>;
+  using GetterCallbackType = std::function<FloatVec2Type(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the FloatVec2FilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_VEC3_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~FloatVec2FilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -121,14 +137,30 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const FloatVec2FilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    FloatVec2FilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const FloatVec2FilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    FloatVec2FilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -142,6 +174,10 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
   FloatVec2FilterParameter(FloatVec2FilterParameter&&) = delete;      // Move Constructor Not Implemented
   FloatVec2FilterParameter& operator=(const FloatVec2FilterParameter&) = delete; // Copy Assignment Not Implemented
   FloatVec2FilterParameter& operator=(FloatVec2FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  FloatVec2FilterParameter::SetterCallbackType m_SetterCallback = {};
+  FloatVec2FilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 Q_DECLARE_METATYPE(FloatVec2Type)
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 4745e88ebd..80c4307ae8 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -109,3 +109,52 @@ void FloatVec3FilterParameter::writeJson(QJsonObject& obj)
     obj[getPropertyName()] = json;
   }
 }
+
+// -----------------------------------------------------------------------------
+FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::New()
+{
+  Pointer sharedPtr(new(FloatVec3FilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FloatVec3FilterParameter::getNameOfClass() const
+{
+  return QString("FloatVec3FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FloatVec3FilterParameter::ClassName()
+{
+  return QString("FloatVec3FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FloatVec3FilterParameter::setSetterCallback(const FloatVec3FilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3FilterParameter::SetterCallbackType FloatVec3FilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void FloatVec3FilterParameter::setGetterCallback(const FloatVec3FilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3FilterParameter::GetterCallbackType FloatVec3FilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 60e5d44de1..435c1526b4 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <cmath>
 #include <functional>
 
@@ -42,7 +44,6 @@
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 #include "SIMPLib/SIMPLib.h"
@@ -71,32 +72,47 @@
 class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(FloatVec3FilterParameter)
-    SIMPL_STATIC_NEW_MACRO(FloatVec3FilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FloatVec3FilterParameter, FilterParameter)
+  using Self = FloatVec3FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(FloatVec3Type)>;
-    using GetterCallbackType = std::function<FloatVec3Type(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the FloatVec3FilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_VEC3_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+  /**
+   * @brief Returns the name of the class for FloatVec3FilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FloatVec3FilterParameter
+   */
+  static QString ClassName();
 
-    ~FloatVec3FilterParameter() override;
+  using SetterCallbackType = std::function<void(FloatVec3Type)>;
+  using GetterCallbackType = std::function<FloatVec3Type(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the FloatVec3FilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_VEC3_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~FloatVec3FilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -122,14 +138,30 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const FloatVec3FilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    FloatVec3FilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const FloatVec3FilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    FloatVec3FilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -143,6 +175,10 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
   FloatVec3FilterParameter(FloatVec3FilterParameter&&) = delete;      // Move Constructor Not Implemented
   FloatVec3FilterParameter& operator=(const FloatVec3FilterParameter&) = delete; // Copy Assignment Not Implemented
   FloatVec3FilterParameter& operator=(FloatVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  FloatVec3FilterParameter::SetterCallbackType m_SetterCallback = {};
+  FloatVec3FilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 Q_DECLARE_METATYPE(FloatVec3Type)
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index c1dd595d00..84f1459dae 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -102,3 +102,52 @@ void FourthOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::New()
+{
+  Pointer sharedPtr(new(FourthOrderPolynomialFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FourthOrderPolynomialFilterParameter::getNameOfClass() const
+{
+  return QString("FourthOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString FourthOrderPolynomialFilterParameter::ClassName()
+{
+  return QString("FourthOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void FourthOrderPolynomialFilterParameter::setSetterCallback(const FourthOrderPolynomialFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FourthOrderPolynomialFilterParameter::SetterCallbackType FourthOrderPolynomialFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void FourthOrderPolynomialFilterParameter::setGetterCallback(const FourthOrderPolynomialFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+FourthOrderPolynomialFilterParameter::GetterCallbackType FourthOrderPolynomialFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 552311fbe1..b088374a74 100755
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -48,12 +50,12 @@ typedef struct
   float c21; float c12; float c20; float c02; 
   float c11; float c10; float c01; float c00;
   
-  void Float4thOrderPoly(const float& C40, const float& C04, 
-    const float& C31, const float& C13,
-    const float& C22,
-    const float& C30, const float& C03,
-    const float& C21, const float& C12, const float& C20, const float& C02,
-    const float& C11, const float& C10, const float& C01, const float& C00
+  void Float4thOrderPoly(float C40, float C04, 
+    float C31, float C13,
+    float C22,
+    float C30, float C03,
+    float C21, float C12, float C20, float C02,
+    float C11, float C10, float C01, float C00
   )
   {
   c40 = C40;
@@ -146,33 +148,47 @@ Q_DECLARE_METATYPE(Float4thOrderPoly_t)
 class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(FourthOrderPolynomialFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(FourthOrderPolynomialFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FourthOrderPolynomialFilterParameter, FilterParameter)
+  using Self = FourthOrderPolynomialFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(Float4thOrderPoly_t)>;
-    using GetterCallbackType = std::function<Float4thOrderPoly_t(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the FourthOrderPolynomialFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FourthO_POLY_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                       const GetterCallbackType& getterCallback, int groupIndex = -1);
+  using SetterCallbackType = std::function<void(Float4thOrderPoly_t)>;
+  using GetterCallbackType = std::function<Float4thOrderPoly_t(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the FourthOrderPolynomialFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FourthO_POLY_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  /**
+   * @brief Returns the name of the class for FourthOrderPolynomialFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FourthOrderPolynomialFilterParameter
+   */
+  static QString ClassName();
 
-    ~FourthOrderPolynomialFilterParameter() override;
+  ~FourthOrderPolynomialFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -198,14 +214,30 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const FourthOrderPolynomialFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    FourthOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const FourthOrderPolynomialFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    FourthOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -219,5 +251,9 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
   FourthOrderPolynomialFilterParameter(FourthOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
   FourthOrderPolynomialFilterParameter& operator=(const FourthOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   FourthOrderPolynomialFilterParameter& operator=(FourthOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  FourthOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
+  FourthOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
index 9c297b5fcd..676d53b53e 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
@@ -93,3 +93,40 @@ void GenerateColorTableFilterParameter::writeJson(QJsonObject& json)
   json["SelectedPresetName"] = presetName;
   json["SelectedPresetControlPoints"] = presetControlPoints;
 }
+
+// -----------------------------------------------------------------------------
+GenerateColorTableFilterParameter::Pointer GenerateColorTableFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+GenerateColorTableFilterParameter::Pointer GenerateColorTableFilterParameter::New()
+{
+  Pointer sharedPtr(new(GenerateColorTableFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTableFilterParameter::getNameOfClass() const
+{
+  return QString("GenerateColorTableFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateColorTableFilterParameter::ClassName()
+{
+  return QString("GenerateColorTableFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void GenerateColorTableFilterParameter::setFilter(GenerateColorTable* value)
+{
+  m_Filter = value;
+}
+
+// -----------------------------------------------------------------------------
+GenerateColorTable* GenerateColorTableFilterParameter::getFilter() const
+{
+  return m_Filter;
+}
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index be920e487d..16118c0bcc 100755
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/CoreFilters/GenerateColorTable.h"
@@ -48,9 +50,23 @@
 class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(GenerateColorTableFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(GenerateColorTableFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(GenerateColorTableFilterParameter, FilterParameter)
+    using Self = GenerateColorTableFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for GenerateColorTableFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for GenerateColorTableFilterParameter
+     */
+    static QString ClassName();
 
     /**
      * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
@@ -69,7 +85,15 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
 
     ~GenerateColorTableFilterParameter() override;
 
-    SIMPL_POINTER_PROPERTY(GenerateColorTable, Filter)
+    /**
+     * @brief Setter property for Filter
+     */
+    void setFilter(GenerateColorTable* value);
+    /**
+     * @brief Getter property for Filter
+     * @return Value of Filter
+     */
+    GenerateColorTable* getFilter() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -102,5 +126,8 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
     GenerateColorTableFilterParameter(GenerateColorTableFilterParameter&&) = delete;      // Move Constructor Not Implemented
     GenerateColorTableFilterParameter& operator=(const GenerateColorTableFilterParameter&) = delete; // Copy Assignment Not Implemented
     GenerateColorTableFilterParameter& operator=(GenerateColorTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    GenerateColorTable* m_Filter = nullptr;
 };
 
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 047f38a0d6..a478b1330a 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -358,7 +358,7 @@ int H5FilterParametersReader::closeFilterGroup()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString H5FilterParametersReader::readString(const QString name, QString value)
+QString H5FilterParametersReader::readString(const QString& name, QString value)
 {
   QString defaultStr = value;
   value.clear();
@@ -375,7 +375,7 @@ QString H5FilterParametersReader::readString(const QString name, QString value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<QString> H5FilterParametersReader::readStrings(const QString name, QVector<QString> value)
+QVector<QString> H5FilterParametersReader::readStrings(const QString& name, QVector<QString> value)
 {
   int vectorSize = 0;
   QString str = "";
@@ -396,7 +396,7 @@ QVector<QString> H5FilterParametersReader::readStrings(const QString name, QVect
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QStringList H5FilterParametersReader::readStringList(const QString name, QStringList value)
+QStringList H5FilterParametersReader::readStringList(const QString& name, QStringList value)
 {
   int vectorSize = 0;
   QString str = "";
@@ -417,7 +417,7 @@ QStringList H5FilterParametersReader::readStringList(const QString name, QString
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int8_t H5FilterParametersReader::readValue(const QString name, int8_t value)
+int8_t H5FilterParametersReader::readValue(const QString& name, int8_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -426,7 +426,7 @@ int8_t H5FilterParametersReader::readValue(const QString name, int8_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int16_t H5FilterParametersReader::readValue(const QString name, int16_t value)
+int16_t H5FilterParametersReader::readValue(const QString& name, int16_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -435,7 +435,7 @@ int16_t H5FilterParametersReader::readValue(const QString name, int16_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int32_t H5FilterParametersReader::readValue(const QString name, int32_t value)
+int32_t H5FilterParametersReader::readValue(const QString& name, int32_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -444,7 +444,7 @@ int32_t H5FilterParametersReader::readValue(const QString name, int32_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int64_t H5FilterParametersReader::readValue(const QString name, int64_t value)
+int64_t H5FilterParametersReader::readValue(const QString& name, int64_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -453,7 +453,7 @@ int64_t H5FilterParametersReader::readValue(const QString name, int64_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint8_t H5FilterParametersReader::readValue(const QString name, uint8_t value)
+uint8_t H5FilterParametersReader::readValue(const QString& name, uint8_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -462,7 +462,7 @@ uint8_t H5FilterParametersReader::readValue(const QString name, uint8_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint16_t H5FilterParametersReader::readValue(const QString name, uint16_t value)
+uint16_t H5FilterParametersReader::readValue(const QString& name, uint16_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -471,7 +471,7 @@ uint16_t H5FilterParametersReader::readValue(const QString name, uint16_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint32_t H5FilterParametersReader::readValue(const QString name, uint32_t value)
+uint32_t H5FilterParametersReader::readValue(const QString& name, uint32_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -480,7 +480,7 @@ uint32_t H5FilterParametersReader::readValue(const QString name, uint32_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-uint64_t H5FilterParametersReader::readValue(const QString name, uint64_t value)
+uint64_t H5FilterParametersReader::readValue(const QString& name, uint64_t value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -489,7 +489,7 @@ uint64_t H5FilterParametersReader::readValue(const QString name, uint64_t value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-float H5FilterParametersReader::readValue(const QString name, float value)
+float H5FilterParametersReader::readValue(const QString& name, float value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -498,7 +498,7 @@ float H5FilterParametersReader::readValue(const QString name, float value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-double H5FilterParametersReader::readValue(const QString name, double value)
+double H5FilterParametersReader::readValue(const QString& name, double value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -507,7 +507,7 @@ double H5FilterParametersReader::readValue(const QString name, double value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool H5FilterParametersReader::readValue(const QString name, bool value)
+bool H5FilterParametersReader::readValue(const QString& name, bool value)
 {
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, value);
   return value;
@@ -517,7 +517,7 @@ bool H5FilterParametersReader::readValue(const QString name, bool value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrix::Type H5FilterParametersReader::readValue(const QString name, AttributeMatrix::Type value)
+AttributeMatrix::Type H5FilterParametersReader::readValue(const QString& name, AttributeMatrix::Type value)
 {
   uint32_t v = static_cast<uint32_t>(value);
   QH5Lite::readScalarDataset(m_CurrentGroupId, name, v);
@@ -528,7 +528,7 @@ AttributeMatrix::Type H5FilterParametersReader::readValue(const QString name, At
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int8_t> H5FilterParametersReader::readArray(const QString name, QVector<int8_t> value)
+QVector<int8_t> H5FilterParametersReader::readArray(const QString& name, QVector<int8_t> value)
 {
   int vectorSize = 0;
   int8_t scalar = 0;
@@ -553,7 +553,7 @@ QVector<int8_t> H5FilterParametersReader::readArray(const QString name, QVector<
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int16_t> H5FilterParametersReader::readArray(const QString name, QVector<int16_t> value)
+QVector<int16_t> H5FilterParametersReader::readArray(const QString& name, QVector<int16_t> value)
 {
   int vectorSize = 0;
   int16_t scalar = 0;
@@ -578,7 +578,7 @@ QVector<int16_t> H5FilterParametersReader::readArray(const QString name, QVector
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int32_t> H5FilterParametersReader::readArray(const QString name, QVector<int32_t> value)
+QVector<int32_t> H5FilterParametersReader::readArray(const QString& name, QVector<int32_t> value)
 {
   int vectorSize = 0;
   int32_t scalar = 0;
@@ -604,7 +604,7 @@ QVector<int32_t> H5FilterParametersReader::readArray(const QString name, QVector
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<int64_t> H5FilterParametersReader::readArray(const QString name, QVector<int64_t> value)
+QVector<int64_t> H5FilterParametersReader::readArray(const QString& name, QVector<int64_t> value)
 {
   int vectorSize = 0;
   int64_t scalar = 0;
@@ -629,7 +629,7 @@ QVector<int64_t> H5FilterParametersReader::readArray(const QString name, QVector
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint8_t> H5FilterParametersReader::readArray(const QString name, QVector<uint8_t> value)
+QVector<uint8_t> H5FilterParametersReader::readArray(const QString& name, QVector<uint8_t> value)
 {
   int vectorSize = 0;
   uint8_t scalar = 0;
@@ -654,7 +654,7 @@ QVector<uint8_t> H5FilterParametersReader::readArray(const QString name, QVector
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint16_t> H5FilterParametersReader::readArray(const QString name, QVector<uint16_t> value)
+QVector<uint16_t> H5FilterParametersReader::readArray(const QString& name, QVector<uint16_t> value)
 {
   int vectorSize = 0;
   uint16_t scalar = 0;
@@ -679,7 +679,7 @@ QVector<uint16_t> H5FilterParametersReader::readArray(const QString name, QVecto
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint32_t> H5FilterParametersReader::readArray(const QString name, QVector<uint32_t> value)
+QVector<uint32_t> H5FilterParametersReader::readArray(const QString& name, QVector<uint32_t> value)
 {
   int vectorSize = 0;
   uint32_t scalar = 0;
@@ -704,7 +704,7 @@ QVector<uint32_t> H5FilterParametersReader::readArray(const QString name, QVecto
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<uint64_t> H5FilterParametersReader::readArray(const QString name, QVector<uint64_t> value)
+QVector<uint64_t> H5FilterParametersReader::readArray(const QString& name, QVector<uint64_t> value)
 {
   int vectorSize = 0;
   uint64_t scalar = 0;
@@ -729,7 +729,7 @@ QVector<uint64_t> H5FilterParametersReader::readArray(const QString name, QVecto
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<float> H5FilterParametersReader::readArray(const QString name, QVector<float> value)
+QVector<float> H5FilterParametersReader::readArray(const QString& name, QVector<float> value)
 {
   int vectorSize = 0;
   float scalar = 0.0f;
@@ -754,7 +754,7 @@ QVector<float> H5FilterParametersReader::readArray(const QString name, QVector<f
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<double> H5FilterParametersReader::readArray(const QString name, QVector<double> value)
+QVector<double> H5FilterParametersReader::readArray(const QString& name, QVector<double> value)
 {
   int vectorSize = 0;
   double scalar = 0.0;
@@ -779,7 +779,7 @@ QVector<double> H5FilterParametersReader::readArray(const QString name, QVector<
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3Type H5FilterParametersReader::readIntVec3(const QString name, IntVec3Type defaultValue)
+IntVec3Type H5FilterParametersReader::readIntVec3(const QString& name, IntVec3Type defaultValue)
 {
   int err = 0;
   IntVec3Type v;
@@ -795,7 +795,7 @@ IntVec3Type H5FilterParametersReader::readIntVec3(const QString name, IntVec3Typ
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3Type H5FilterParametersReader::readFloatVec3(const QString name, FloatVec3Type defaultValue)
+FloatVec3Type H5FilterParametersReader::readFloatVec3(const QString& name, FloatVec3Type defaultValue)
 {
   int err = 0;
   FloatVec3Type v;
@@ -810,7 +810,7 @@ FloatVec3Type H5FilterParametersReader::readFloatVec3(const QString name, FloatV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float2ndOrderPoly_t H5FilterParametersReader::readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t defaultValue)
+Float2ndOrderPoly_t H5FilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t defaultValue)
 {
   int err = 0;
   Float2ndOrderPoly_t v;
@@ -825,7 +825,7 @@ Float2ndOrderPoly_t H5FilterParametersReader::readFloat2ndOrderPoly(const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float3rdOrderPoly_t H5FilterParametersReader::readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t defaultValue)
+Float3rdOrderPoly_t H5FilterParametersReader::readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t defaultValue)
 {
   int err = 0;
   Float3rdOrderPoly_t v;
@@ -840,7 +840,7 @@ Float3rdOrderPoly_t H5FilterParametersReader::readFloat3rdOrderPoly(const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float4thOrderPoly_t H5FilterParametersReader::readFloat4thOrderPoly(const QString name, Float4thOrderPoly_t defaultValue)
+Float4thOrderPoly_t H5FilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t defaultValue)
 {
   int err = 0;
   Float4thOrderPoly_t v;
@@ -855,7 +855,7 @@ Float4thOrderPoly_t H5FilterParametersReader::readFloat4thOrderPoly(const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfo_t H5FilterParametersReader::readFileListInfo(const QString name, FileListInfo_t defaultValue)
+FileListInfo_t H5FilterParametersReader::readFileListInfo(const QString& name, FileListInfo_t defaultValue)
 {
 
   FileListInfo_t v;
@@ -909,7 +909,7 @@ FileListInfo_t H5FilterParametersReader::readFileListInfo(const QString name, Fi
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInput_t H5FilterParametersReader::readComparisonInput(const QString name, ComparisonInput_t defaultValue, int vectorPos)
+ComparisonInput_t H5FilterParametersReader::readComparisonInput(const QString& name, ComparisonInput_t defaultValue, int vectorPos)
 {
   // QVector<ComparisonInput_t> comps(1, defaultValue);
   ComparisonInputs comps;
@@ -924,7 +924,7 @@ ComparisonInput_t H5FilterParametersReader::readComparisonInput(const QString na
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString name, ComparisonInputs defValue)
+ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString& name, ComparisonInputs defValue)
 {
   int size = 0;
   QString strData = "";
@@ -986,7 +986,7 @@ ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString na
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(const QString name, ComparisonInputsAdvanced defValue)
+ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced defValue)
 {
     /*
     int size = 0;
@@ -1025,7 +1025,7 @@ ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString name, AxisAngleInput_t v, int vectorPos)
+AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos)
 {
   int err = 0;
 
@@ -1044,7 +1044,7 @@ AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString name, Axi
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<AxisAngleInput_t> H5FilterParametersReader::readAxisAngles(const QString name, QVector<AxisAngleInput_t> v)
+QVector<AxisAngleInput_t> H5FilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v)
 {
   QVector<AxisAngleInput_t> axisAngleInputsVector;
   AxisAngleInput_t axisAngleDummyInput;
@@ -1063,7 +1063,7 @@ QVector<AxisAngleInput_t> H5FilterParametersReader::readAxisAngles(const QString
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QSet<QString> H5FilterParametersReader::readArraySelections(const QString name, QSet<QString> v)
+QSet<QString> H5FilterParametersReader::readArraySelections(const QString& name, QSet<QString> v)
 {
   int size = 0;
   QString strData = "";
@@ -1263,3 +1263,40 @@ QPair<double, double> H5FilterParametersReader::readPairOfDoubles(const QString&
   value.second = max;
   return value;
 }
+
+// -----------------------------------------------------------------------------
+H5FilterParametersReader::Pointer H5FilterParametersReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5FilterParametersReader::Pointer H5FilterParametersReader::New()
+{
+  Pointer sharedPtr(new(H5FilterParametersReader));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5FilterParametersReader::getNameOfClass() const
+{
+  return QString("H5FilterParametersReader");
+}
+
+// -----------------------------------------------------------------------------
+QString H5FilterParametersReader::ClassName()
+{
+  return QString("H5FilterParametersReader");
+}
+
+// -----------------------------------------------------------------------------
+void H5FilterParametersReader::setPipelineGroupId(const hid_t& value)
+{
+  m_PipelineGroupId = value;
+}
+
+// -----------------------------------------------------------------------------
+hid_t H5FilterParametersReader::getPipelineGroupId() const
+{
+  return m_PipelineGroupId;
+}
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index a435a389a0..992e7bd796 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -35,11 +35,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "hdf5.h"
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
@@ -53,116 +54,140 @@
 class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersReader
 {
   public:
-    SIMPL_SHARED_POINTERS(H5FilterParametersReader)
-    SIMPL_STATIC_NEW_MACRO(H5FilterParametersReader)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5FilterParametersReader, AbstractFilterParametersReader)
-
-     ~H5FilterParametersReader() override;
-
-     /**
-      * @brief OpenDREAM3DFile This will open the HDF5 based DREAM3D file and open the proper HDF5 internal
-      * group that is associated with the pipeline storage
-      * @param filepath
-      * @param fid The HDF5 file Id that represents the open HDF5 file
-      * @return Return a pointer to a newly instantiated instance of this class. A Null Pointer will be returned if
-      * the file can not be opened or the group is missing.
-      */
-     static Pointer OpenDREAM3DFileForReadingPipeline(QString filePath, hid_t& fid);
-
-     SIMPL_INSTANCE_PROPERTY(hid_t, PipelineGroupId)
-
-     hid_t getCurrentGroupId() const;
-
-     int openFilterGroup(AbstractFilter* filter, int index) override;
-     int closeFilterGroup() override;
-
-     /**
-      * @brief ReadPipelineFromFile
-      * @param filePath
-      * @return
-      */
-     FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
-
-     /**
-      * @brief readPipelineFromFile
-      * @param fid
-      * @param obs
-      * @return
-      */
-     FilterPipeline::Pointer readPipelineFromFile(hid_t fid, IObserver* obs = nullptr);
-
-     /**
-      * @brief getJsonFromFile
-      * @param filePath
-      * @param obs
-      * @return
-      */
-     QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
-
-     QString readString(const QString name, QString value) override;
-     QVector<QString> readStrings(const QString name, QVector<QString> value) override;
-     QStringList readStringList(const QString name, QStringList value) override;
-
-     int8_t readValue(const QString name, int8_t value) override;
-     int16_t readValue(const QString name, int16_t value) override;
-     int32_t readValue(const QString name, int32_t value) override;
-     int64_t readValue(const QString name, int64_t value) override;
-     uint8_t readValue(const QString name, uint8_t value) override;
-     uint16_t readValue(const QString name, uint16_t value) override;
-     uint32_t readValue(const QString name, uint32_t value) override;
-     uint64_t readValue(const QString name, uint64_t value) override;
-     float readValue(const QString name, float value) override;
-     double readValue(const QString name, double value) override;
-     bool readValue(const QString name, bool value) override;
-     AttributeMatrix::Type readValue(const QString name, AttributeMatrix::Type value) override;
-
-     QVector<int8_t> readArray(const QString name, QVector<int8_t> value) override;
-     QVector<int16_t> readArray(const QString name, QVector<int16_t> value) override;
-     QVector<int32_t> readArray(const QString name, QVector<int32_t> value) override;
-     QVector<int64_t> readArray(const QString name, QVector<int64_t> value) override;
-     QVector<uint8_t> readArray(const QString name, QVector<uint8_t> value) override;
-     QVector<uint16_t> readArray(const QString name, QVector<uint16_t> value) override;
-     QVector<uint32_t> readArray(const QString name, QVector<uint32_t> value) override;
-     QVector<uint64_t> readArray(const QString name, QVector<uint64_t> value) override;
-     QVector<float> readArray(const QString name, QVector<float> value) override;
-     QVector<double> readArray(const QString name, QVector<double> value) override;
-
-     IntVec3Type readIntVec3(const QString name, IntVec3Type v) override;
-     FloatVec3Type readFloatVec3(const QString name, FloatVec3Type v) override;
-
-     Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString name, Float2ndOrderPoly_t v) override;
-     Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString name, Float3rdOrderPoly_t v) override;
-     Float4thOrderPoly_t readFloat4thOrderPoly(const QString name, Float4thOrderPoly_t v) override;
-     FileListInfo_t readFileListInfo(const QString name, FileListInfo_t v) override;
-     ComparisonInput_t readComparisonInput(const QString name, ComparisonInput_t v, int vectorPos) override;
-     ComparisonInputs readComparisonInputs(const QString name, ComparisonInputs v) override;
-     ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString name, ComparisonInputsAdvanced v) override;
-     AxisAngleInput_t readAxisAngle(const QString name, AxisAngleInput_t v, int vectorPos) override;
-     QVector<AxisAngleInput_t> readAxisAngles(const QString name, QVector<AxisAngleInput_t> defValue) override;
-     QSet<QString> readArraySelections(const QString name, QSet<QString> v) override;
-
-     DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v) override;
-     DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v) override;
-     QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> def) override;
-     DynamicTableData readDynamicTableData(const QString& name, DynamicTableData def) override;
-
-     QPair<double, double> readPairOfDoubles(const QString& name, QPair<double, double> v) override;
-
-   protected:
-     H5FilterParametersReader();
-
-   private:
-     hid_t m_CurrentGroupId = -1;
-     QJsonObject m_PipelineRoot;
-     QJsonObject m_CurrentFilterObject;
-     int m_Version = -1;
-     int m_CurrentIndex = -1;
-
-   public:
-     H5FilterParametersReader(const H5FilterParametersReader&) = delete;            // Copy Constructor Not Implemented
-     H5FilterParametersReader(H5FilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
-     H5FilterParametersReader& operator=(const H5FilterParametersReader&) = delete; // Copy Assignment Not Implemented
-     H5FilterParametersReader& operator=(H5FilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+    using Self = H5FilterParametersReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5FilterParametersReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5FilterParametersReader
+     */
+    static QString ClassName();
+
+    ~H5FilterParametersReader() override;
+
+    /**
+     * @brief OpenDREAM3DFile This will open the HDF5 based DREAM3D file and open the proper HDF5 internal
+     * group that is associated with the pipeline storage
+     * @param filepath
+     * @param fid The HDF5 file Id that represents the open HDF5 file
+     * @return Return a pointer to a newly instantiated instance of this class. A Null Pointer will be returned if
+     * the file can not be opened or the group is missing.
+     */
+    static Pointer OpenDREAM3DFileForReadingPipeline(QString filePath, hid_t& fid);
+
+    /**
+     * @brief Setter property for PipelineGroupId
+     */
+    void setPipelineGroupId(const hid_t& value);
+    /**
+     * @brief Getter property for PipelineGroupId
+     * @return Value of PipelineGroupId
+     */
+    hid_t getPipelineGroupId() const;
+
+    hid_t getCurrentGroupId() const;
+
+    int openFilterGroup(AbstractFilter* filter, int index) override;
+    int closeFilterGroup() override;
+
+    /**
+     * @brief ReadPipelineFromFile
+     * @param filePath
+     * @return
+     */
+    FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
+
+    /**
+     * @brief readPipelineFromFile
+     * @param fid
+     * @param obs
+     * @return
+     */
+    FilterPipeline::Pointer readPipelineFromFile(hid_t fid, IObserver* obs = nullptr);
+
+    /**
+     * @brief getJsonFromFile
+     * @param filePath
+     * @param obs
+     * @return
+     */
+    QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
+
+    QString readString(const QString& name, QString value) override;
+    QVector<QString> readStrings(const QString& name, QVector<QString> value) override;
+    QStringList readStringList(const QString& name, QStringList value) override;
+
+    int8_t readValue(const QString& name, int8_t value) override;
+    int16_t readValue(const QString& name, int16_t value) override;
+    int32_t readValue(const QString& name, int32_t value) override;
+    int64_t readValue(const QString& name, int64_t value) override;
+    uint8_t readValue(const QString& name, uint8_t value) override;
+    uint16_t readValue(const QString& name, uint16_t value) override;
+    uint32_t readValue(const QString& name, uint32_t value) override;
+    uint64_t readValue(const QString& name, uint64_t value) override;
+    float readValue(const QString& name, float value) override;
+    double readValue(const QString& name, double value) override;
+    bool readValue(const QString& name, bool value) override;
+    AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value) override;
+
+    QVector<int8_t> readArray(const QString& name, QVector<int8_t> value) override;
+    QVector<int16_t> readArray(const QString& name, QVector<int16_t> value) override;
+    QVector<int32_t> readArray(const QString& name, QVector<int32_t> value) override;
+    QVector<int64_t> readArray(const QString& name, QVector<int64_t> value) override;
+    QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value) override;
+    QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value) override;
+    QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value) override;
+    QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value) override;
+    QVector<float> readArray(const QString& name, QVector<float> value) override;
+    QVector<double> readArray(const QString& name, QVector<double> value) override;
+
+    IntVec3Type readIntVec3(const QString& name, IntVec3Type v) override;
+    FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v) override;
+
+    Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v) override;
+    Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v) override;
+    Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v) override;
+    FileListInfo_t readFileListInfo(const QString& name, FileListInfo_t v) override;
+    ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos) override;
+    ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v) override;
+    ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v) override;
+    AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos) override;
+    QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> defValue) override;
+    QSet<QString> readArraySelections(const QString& name, QSet<QString> v) override;
+
+    DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v) override;
+    DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v) override;
+    QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> def) override;
+    DynamicTableData readDynamicTableData(const QString& name, DynamicTableData def) override;
+
+    QPair<double, double> readPairOfDoubles(const QString& name, QPair<double, double> v) override;
+
+  protected:
+    H5FilterParametersReader();
+
+  private:
+    hid_t m_PipelineGroupId = {};
+
+    hid_t m_CurrentGroupId = -1;
+    QJsonObject m_PipelineRoot;
+    QJsonObject m_CurrentFilterObject;
+    int m_Version = -1;
+    int m_CurrentIndex = -1;
+
+  public:
+    H5FilterParametersReader(const H5FilterParametersReader&) = delete;            // Copy Constructor Not Implemented
+    H5FilterParametersReader(H5FilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
+    H5FilterParametersReader& operator=(const H5FilterParametersReader&) = delete; // Copy Assignment Not Implemented
+    H5FilterParametersReader& operator=(H5FilterParametersReader&&) = delete;      // Move Assignment Not Implemented
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 8fd9fd68d0..d321d75c26 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -42,8 +42,10 @@
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
 
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
@@ -823,3 +825,52 @@ int H5FilterParametersWriter::writeValue(const QString& name, const QPair<double
 
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5FilterParametersWriter::Pointer H5FilterParametersWriter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5FilterParametersWriter::Pointer H5FilterParametersWriter::New()
+{
+  Pointer sharedPtr(new(H5FilterParametersWriter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5FilterParametersWriter::getNameOfClass() const
+{
+  return QString("H5FilterParametersWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString H5FilterParametersWriter::ClassName()
+{
+  return QString("H5FilterParametersWriter");
+}
+
+// -----------------------------------------------------------------------------
+void H5FilterParametersWriter::setPipelineGroupId(const hid_t& value)
+{
+  m_PipelineGroupId = value;
+}
+
+// -----------------------------------------------------------------------------
+hid_t H5FilterParametersWriter::getPipelineGroupId() const
+{
+  return m_PipelineGroupId;
+}
+
+// -----------------------------------------------------------------------------
+void H5FilterParametersWriter::setGroupId(const hid_t& value)
+{
+  m_GroupId = value;
+}
+
+// -----------------------------------------------------------------------------
+hid_t H5FilterParametersWriter::getGroupId() const
+{
+  return m_GroupId;
+}
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index b58b9e486d..8c10bbc11e 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -35,11 +35,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include "hdf5.h"
 
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersWriter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -52,9 +53,23 @@
 class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersWriter
 {
   public:
-    SIMPL_SHARED_POINTERS(H5FilterParametersWriter)
-    SIMPL_STATIC_NEW_MACRO(H5FilterParametersWriter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5FilterParametersWriter, AbstractFilterParametersWriter)
+    using Self = H5FilterParametersWriter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5FilterParametersWriter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5FilterParametersWriter
+     */
+    static QString ClassName();
 
     /**
      * @brief WritePipelineToFile This function will write a pipeline to an HDF5 based
@@ -68,11 +83,28 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
      */
     int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver*> obs = QList<IObserver*>()) override;
 
-    SIMPL_INSTANCE_PROPERTY(hid_t, PipelineGroupId)
+    /**
+     * @brief Setter property for PipelineGroupId
+     */
+    void setPipelineGroupId(const hid_t& value);
+    /**
+     * @brief Getter property for PipelineGroupId
+     * @return Value of PipelineGroupId
+     */
+    hid_t getPipelineGroupId() const;
 
     ~H5FilterParametersWriter() override;
 
-    SIMPL_INSTANCE_PROPERTY(hid_t, GroupId)
+    /**
+     * @brief Setter property for GroupId
+     */
+    void setGroupId(const hid_t& value);
+    /**
+     * @brief Getter property for GroupId
+     * @return Value of GroupId
+     */
+    hid_t getGroupId() const;
+
     hid_t getCurrentGroupId() const;
 
     int openFilterGroup(AbstractFilter* filter, int index) override;
@@ -133,6 +165,9 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
 
   private:
+    hid_t m_PipelineGroupId = {};
+    hid_t m_GroupId = {};
+
     hid_t m_CurrentGroupId = -1;
 
   public:
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
index 41fce6826f..ebd3d4464e 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
@@ -117,3 +117,46 @@ void ImportHDF5DatasetFilterParameter::writeJson(QJsonObject& json)
   }
   json["Dataset Import Info Array"] = importInfoArray;
 }
+
+// -----------------------------------------------------------------------------
+ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::New()
+{
+  Pointer sharedPtr(new(ImportHDF5DatasetFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ImportHDF5DatasetFilterParameter::getNameOfClass() const
+{
+  return QString("ImportHDF5DatasetFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ImportHDF5DatasetFilterParameter::ClassName()
+{
+  return QString("ImportHDF5DatasetFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5DatasetFilterParameter::setFilter(ImportHDF5Dataset* value)
+{
+  m_Filter = value;
+}
+
+// -----------------------------------------------------------------------------
+ImportHDF5Dataset* ImportHDF5DatasetFilterParameter::getFilter() const
+{
+  return m_Filter;
+}
+
+// -----------------------------------------------------------------------------
+void ImportHDF5DatasetFilterParameter::setDataSetDefaultValue(const QVariant& value)
+{
+  m_DataSetDefaultValue = value;
+}
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index 65086bb4e3..f0dfdd09cf 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -32,6 +32,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 class ImportHDF5Dataset;
@@ -39,17 +41,43 @@ class ImportHDF5Dataset;
 class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ImportHDF5DatasetFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(ImportHDF5DatasetFilterParameter)
-  SIMPL_TYPE_MACRO(ImportHDF5DatasetFilterParameter)
+  using Self = ImportHDF5DatasetFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ImportHDF5DatasetFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ImportHDF5DatasetFilterParameter
+   */
+  static QString ClassName();
 
   static Pointer New(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue, const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter,
                      int groupIndex = -1);
 
   ~ImportHDF5DatasetFilterParameter() override;
 
-  SIMPL_VIRTUAL_INSTANCE_PROPERTY(QVariant, DataSetDefaultValue)
-  SIMPL_POINTER_PROPERTY(ImportHDF5Dataset, Filter)
+  /**
+   * @brief Setter property for DataSetDefaultValue
+   */
+  virtual void setDataSetDefaultValue(const QVariant& value);
+
+  /**
+   * @brief Setter property for Filter
+   */
+  void setFilter(ImportHDF5Dataset* value);
+  /**
+   * @brief Getter property for Filter
+   * @return Value of Filter
+   */
+  ImportHDF5Dataset* getFilter() const;
 
   QString getWidgetType() const override;
 
@@ -73,4 +101,9 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
   ImportHDF5DatasetFilterParameter(ImportHDF5DatasetFilterParameter&&) = delete;      // Move Constructor Not Implemented
   ImportHDF5DatasetFilterParameter& operator=(const ImportHDF5DatasetFilterParameter&) = delete; // Copy Assignment Not Implemented
   ImportHDF5DatasetFilterParameter& operator=(ImportHDF5DatasetFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QVariant m_DataSetDefaultValue = {};
+
+  ImportHDF5Dataset* m_Filter = nullptr;
 };
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index 846949fc0f..67fbb30f4a 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -100,3 +100,76 @@ void InputFileFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+InputFileFilterParameter::Pointer InputFileFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+InputFileFilterParameter::Pointer InputFileFilterParameter::New()
+{
+  Pointer sharedPtr(new(InputFileFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString InputFileFilterParameter::getNameOfClass() const
+{
+  return QString("InputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString InputFileFilterParameter::ClassName()
+{
+  return QString("InputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void InputFileFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString InputFileFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void InputFileFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString InputFileFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void InputFileFilterParameter::setSetterCallback(const InputFileFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+InputFileFilterParameter::SetterCallbackType InputFileFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void InputFileFilterParameter::setGetterCallback(const InputFileFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+InputFileFilterParameter::GetterCallbackType InputFileFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index 4645520887..07a08c0a26 100755
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,78 +65,124 @@
 class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(InputFileFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(InputFileFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(InputFileFilterParameter, FilterParameter)
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the InputFileFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_FILE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param fileExtension The possible file extensions that this InputFileWidget accepts.
-    * @param fileType The possible file types that this InputFileWidget accepts.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""),
-    const QString& fileType = QString(""), int groupIndex = -1);
-
-    ~InputFileFilterParameter() override;
-
-    SIMPL_INSTANCE_STRING_PROPERTY(FileExtension)
-      SIMPL_INSTANCE_STRING_PROPERTY(FileType)
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-      QString getWidgetType() const override;
-
-      /**
-       * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-       * @param json The QJsonObject that the filter parameter reads from.
-       */
-      void readJson(const QJsonObject& json) override;
-
-      /**
-       * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-       * @param json The QJsonObject that the filter parameter writes to.
-       */
-      void writeJson(QJsonObject& json) override;
-
-      /**
-      * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * from the filter parameter.
-      */
-      SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-      /**
-      * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * @return The GetterCallback
-      */
-      SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
-    protected:
-      /**
-       * @brief InputFileFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
+  using Self = InputFileFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for InputFileFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for InputFileFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the InputFileFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_FILE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param fileExtension The possible file extensions that this InputFileWidget accepts.
+  * @param fileType The possible file types that this InputFileWidget accepts.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+
+  ~InputFileFilterParameter() override;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const InputFileFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  InputFileFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const InputFileFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  InputFileFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief InputFileFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   InputFileFilterParameter();
 
 public:
@@ -142,5 +190,11 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
   InputFileFilterParameter(InputFileFilterParameter&&) = delete;      // Move Constructor Not Implemented
   InputFileFilterParameter& operator=(const InputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
   InputFileFilterParameter& operator=(InputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FileExtension = {};
+  QString m_FileType = {};
+  InputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
+  InputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index 35785a233b..808f680c50 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -96,3 +96,76 @@ void InputPathFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+InputPathFilterParameter::Pointer InputPathFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+InputPathFilterParameter::Pointer InputPathFilterParameter::New()
+{
+  Pointer sharedPtr(new(InputPathFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString InputPathFilterParameter::getNameOfClass() const
+{
+  return QString("InputPathFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString InputPathFilterParameter::ClassName()
+{
+  return QString("InputPathFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void InputPathFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString InputPathFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void InputPathFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString InputPathFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void InputPathFilterParameter::setSetterCallback(const InputPathFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+InputPathFilterParameter::SetterCallbackType InputPathFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void InputPathFilterParameter::setGetterCallback(const InputPathFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+InputPathFilterParameter::GetterCallbackType InputPathFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index 67a60bec56..6d9c98e686 100755
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,78 +65,124 @@
 class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(InputPathFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(InputPathFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(InputPathFilterParameter, FilterParameter)
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the InputPathFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_PATH_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param fileExtension The possible file extensions that this InputPathWidget accepts.
-    * @param fileType The possible file types that this InputPathWidget accepts.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""),
-    const QString& fileType = QString(""), int groupIndex = -1);
-
-    ~InputPathFilterParameter() override;
-
-    SIMPL_INSTANCE_STRING_PROPERTY(FileExtension)
-      SIMPL_INSTANCE_STRING_PROPERTY(FileType)
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-      QString getWidgetType() const override;
-
-      /**
-       * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-       * @param json The QJsonObject that the filter parameter reads from.
-       */
-      void readJson(const QJsonObject& json) override;
-
-      /**
-       * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-       * @param json The QJsonObject that the filter parameter writes to.
-       */
-      void writeJson(QJsonObject& json) override;
-
-      /**
-      * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * from the filter parameter.
-      */
-      SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-      /**
-      * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * @return The GetterCallback
-      */
-      SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
-    protected:
-      /**
-       * @brief InputPathFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
+  using Self = InputPathFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for InputPathFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for InputPathFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the InputPathFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_PATH_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param fileExtension The possible file extensions that this InputPathWidget accepts.
+  * @param fileType The possible file types that this InputPathWidget accepts.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+
+  ~InputPathFilterParameter() override;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const InputPathFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  InputPathFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const InputPathFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  InputPathFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief InputPathFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   InputPathFilterParameter();
 
 public:
@@ -142,5 +190,11 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   InputPathFilterParameter(InputPathFilterParameter&&) = delete;      // Move Constructor Not Implemented
   InputPathFilterParameter& operator=(const InputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   InputPathFilterParameter& operator=(InputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FileExtension = {};
+  QString m_FileType = {};
+  InputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
+  InputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index d1d4f74765..19ed92830d 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -48,7 +48,7 @@ IntFilterParameter::~IntFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntFilterParameter::Pointer IntFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category, const SetterCallbackType& setterCallback,
+IntFilterParameter::Pointer IntFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
                                                     const GetterCallbackType& getterCallback, int groupIndex)
 {
 
@@ -94,3 +94,52 @@ void IntFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+IntFilterParameter::Pointer IntFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+IntFilterParameter::Pointer IntFilterParameter::New()
+{
+  Pointer sharedPtr(new(IntFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString IntFilterParameter::getNameOfClass() const
+{
+  return QString("IntFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString IntFilterParameter::ClassName()
+{
+  return QString("IntFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void IntFilterParameter::setSetterCallback(const IntFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntFilterParameter::SetterCallbackType IntFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void IntFilterParameter::setGetterCallback(const IntFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntFilterParameter::GetterCallbackType IntFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 76d6cc2be3..0da929c20d 100755
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(IntFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(IntFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IntFilterParameter, FilterParameter)
+    using Self = IntFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for IntFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for IntFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(int)>;
     using GetterCallbackType = std::function<int(void)>;
@@ -87,7 +103,7 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+                       int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
 
     ~IntFilterParameter() override;
 
@@ -115,27 +131,46 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const IntFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    IntFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const IntFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    IntFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief IntFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      IntFilterParameter();
+  protected:
+    /**
+     * @brief IntFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    IntFilterParameter();
 
-    public:
-      IntFilterParameter(const IntFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      IntFilterParameter(IntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      IntFilterParameter& operator=(const IntFilterParameter&) = delete; // Copy Assignment Not Implemented
-      IntFilterParameter& operator=(IntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    IntFilterParameter(const IntFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    IntFilterParameter(IntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    IntFilterParameter& operator=(const IntFilterParameter&) = delete; // Copy Assignment Not Implemented
+    IntFilterParameter& operator=(IntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    IntFilterParameter::SetterCallbackType m_SetterCallback = {};
+    IntFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
index 747c5ae7b0..8e723e510d 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -105,3 +105,52 @@ void IntVec2FilterParameter::writeJson(QJsonObject& obj)
     obj[getPropertyName()] = json;
   }
 }
+
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::Pointer IntVec2FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::Pointer IntVec2FilterParameter::New()
+{
+  Pointer sharedPtr(new(IntVec2FilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString IntVec2FilterParameter::getNameOfClass() const
+{
+  return QString("IntVec2FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString IntVec2FilterParameter::ClassName()
+{
+  return QString("IntVec2FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void IntVec2FilterParameter::setSetterCallback(const IntVec2FilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::SetterCallbackType IntVec2FilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void IntVec2FilterParameter::setGetterCallback(const IntVec2FilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec2FilterParameter::GetterCallbackType IntVec2FilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index cd7a1cb161..d1ef9a8e3c 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <functional>
 
 #include <QtCore/QJsonObject>
@@ -62,9 +64,23 @@
 class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(IntVec2FilterParameter)
-  SIMPL_STATIC_NEW_MACRO(IntVec2FilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IntVec2FilterParameter, FilterParameter)
+  using Self = IntVec2FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for IntVec2FilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IntVec2FilterParameter
+   */
+  static QString ClassName();
 
   using SetterCallbackType = std::function<void(IntVec2Type)>;
   using GetterCallbackType = std::function<IntVec2Type(void)>;
@@ -114,14 +130,30 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
    * that this FilterParameter subclass represents.
    * @return The SetterCallback
    */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const IntVec2FilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  IntVec2FilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
    * that this FilterParameter subclass represents.
    * @return The GetterCallback
    */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const IntVec2FilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  IntVec2FilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -135,6 +167,10 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
   IntVec2FilterParameter(IntVec2FilterParameter&&) = delete;                 // Move Constructor Not Implemented
   IntVec2FilterParameter& operator=(const IntVec2FilterParameter&) = delete; // Copy Assignment Not Implemented
   IntVec2FilterParameter& operator=(IntVec2FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IntVec2FilterParameter::SetterCallbackType m_SetterCallback = {};
+  IntVec2FilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 Q_DECLARE_METATYPE(IntVec2Type)
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index 7246caffe7..16865c14b5 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -109,3 +109,52 @@ void IntVec3FilterParameter::writeJson(QJsonObject& obj)
     obj[getPropertyName()] = json;
   }
 }
+
+// -----------------------------------------------------------------------------
+IntVec3FilterParameter::Pointer IntVec3FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+IntVec3FilterParameter::Pointer IntVec3FilterParameter::New()
+{
+  Pointer sharedPtr(new(IntVec3FilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString IntVec3FilterParameter::getNameOfClass() const
+{
+  return QString("IntVec3FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString IntVec3FilterParameter::ClassName()
+{
+  return QString("IntVec3FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void IntVec3FilterParameter::setSetterCallback(const IntVec3FilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec3FilterParameter::SetterCallbackType IntVec3FilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void IntVec3FilterParameter::setGetterCallback(const IntVec3FilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec3FilterParameter::GetterCallbackType IntVec3FilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index 3b82413057..d1c7883297 100755
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <functional>
 
 #include <QtCore/QJsonObject>
@@ -66,33 +68,47 @@
 class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(IntVec3FilterParameter)
-    SIMPL_STATIC_NEW_MACRO(IntVec3FilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IntVec3FilterParameter, FilterParameter)
+  using Self = IntVec3FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(IntVec3Type)>;
-    using GetterCallbackType = std::function<IntVec3Type(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the IntVec3FilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INT_VEC3_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                       const GetterCallbackType& getterCallback, int groupIndex = -1);
+  /**
+   * @brief Returns the name of the class for IntVec3FilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IntVec3FilterParameter
+   */
+  static QString ClassName();
 
-    ~IntVec3FilterParameter() override;
+  using SetterCallbackType = std::function<void(IntVec3Type)>;
+  using GetterCallbackType = std::function<IntVec3Type(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the IntVec3FilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INT_VEC3_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~IntVec3FilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -118,14 +134,30 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const IntVec3FilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    IntVec3FilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const IntVec3FilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    IntVec3FilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -139,6 +171,10 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
   IntVec3FilterParameter(IntVec3FilterParameter&&) = delete;      // Move Constructor Not Implemented
   IntVec3FilterParameter& operator=(const IntVec3FilterParameter&) = delete; // Copy Assignment Not Implemented
   IntVec3FilterParameter& operator=(IntVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IntVec3FilterParameter::SetterCallbackType m_SetterCallback = {};
+  IntVec3FilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 Q_DECLARE_METATYPE(IntVec3Type)
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 8a2c5361f3..65163e098d 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -38,7 +38,10 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QStringList>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/CoreFilters/EmptyFilter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -674,3 +677,52 @@ int JsonFilterParametersReader::closeGroup()
   m_CurrentFilterIndex = QJsonObject();
   return 0;
 }
+
+// -----------------------------------------------------------------------------
+JsonFilterParametersReader::Pointer JsonFilterParametersReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+JsonFilterParametersReader::Pointer JsonFilterParametersReader::New()
+{
+  Pointer sharedPtr(new(JsonFilterParametersReader));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersReader::getNameOfClass() const
+{
+  return QString("JsonFilterParametersReader");
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersReader::ClassName()
+{
+  return QString("JsonFilterParametersReader");
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersReader::setFileName(const QString& value)
+{
+  m_FileName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersReader::getFileName() const
+{
+  return m_FileName;
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersReader::setMaxFilterIndex(int value)
+{
+  m_MaxFilterIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int JsonFilterParametersReader::getMaxFilterIndex() const
+{
+  return m_MaxFilterIndex;
+}
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index f8e813ed19..9b43e86edc 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -34,10 +34,11 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonParseError>
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -51,125 +52,159 @@
 class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParametersReader
 {
   public:
-    SIMPL_SHARED_POINTERS(JsonFilterParametersReader)
-    SIMPL_STATIC_NEW_MACRO(JsonFilterParametersReader)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(JsonFilterParametersReader, AbstractFilterParametersReader)
-
-     ~JsonFilterParametersReader() override;
-
-     SIMPL_INSTANCE_PROPERTY(QString, FileName)
-     SIMPL_INSTANCE_PROPERTY(int, MaxFilterIndex)
-
-     /**
-      * @brief ReadPipelineFromFile Reads the Json formatted file and returns a FilterPipeline object
-      * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-      * If the IObserver is NON-Null then an error message will be passed to it with an error message
-      * @param filePath The path to the INI formatted file
-      * @param format The format of the file which is anything that QSettings understands
-      * @param obs An IObserver object to report errors.
-      * @return Shared Pointer to a FilterPipeline Instance
-      */
-     FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
-
-     /**
-      * @brief getJsonFromFile Reads the Json formatted file and returns a json string
-      * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-      * If the IObserver is NON-Null then an error message will be passed to it with an error message
-      * @param filePath The path to the INI formatted file
-      * @param format The format of the file which is anything that QSettings understands
-      * @param obs An IObserver object to report errors.
-      * @return Shared Pointer to a FilterPipeline Instance
-      */
-     QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
-
-     /**
-      * @brief ReadPipelineFromString Reads the Json formatted file and returns a FilterPipeline object
-      * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-      * If the IObserver is NON-Null then an error message will be passed to it with an error message
-      * @param filePath The path to the INI formatted file
-      * @param format The format of the file which is anything that QSettings understands
-      * @param obs An IObserver object to report errors.
-      * @return Shared Pointer to a FilterPipeline Instance
-      */
-     FilterPipeline::Pointer readPipelineFromString(QString contents, IObserver* obs = nullptr);
-
-     /**
-      * @brief Gets the name of the pipeline from a pipeline file
-      * @param filePath The absolute path to the pipeline file.
-      * @param name Sets the name of the pipeline into this variable
-      * @param version Sets the DREAM3D Version into this variable.
-      * @param obs Any observer that needs to know about errors.
-      * @return
-      */
-     void readNameOfPipelineFromFile(QString filePath, QString& name, QString& version, IObserver* obs = nullptr);
-
-     /**
-      * @brief Generate an html formatted string that summarizes the pipeline file by listing
-      * each filter by it's human name and C++ class name.
-      * @param filePath The path to the pipeline file
-      * @param obs Any observer that needs to know about errors.
-      * @return html formatted string
-      */
-     static QString HtmlSummaryFromFile(QString filePath, IObserver* obs);
-
-     /**
-      * @brief Opens the pipeline file for operations
-      * @param filePath The path to the pipeline file
-      * @return
-      */
-     QJsonParseError openFile(QString filePath);
-
-     /**
-      * @brief setPipelineContents
-      * @param contents
-      * @return
-      */
-     int setPipelineContents(QString contents);
-
-     /**
-      * @brief closeFile
-      */
-     void closeFile();
-
-     /**
-      * @brief openFilterGroup
-      * @param unused
-      * @param index
-      * @return
-      */
-     int openFilterGroup(AbstractFilter* unused, int index) override;
-
-     /**
-      * @brief closeFilterGroup
-      * @return
-      */
-     int closeFilterGroup() override;
-
-     /*
-      * @brief getCurrentGroupObject
-      * @return
-      */
-     QJsonObject& getCurrentGroupObject();
-
-     bool containsGroup(QString key);
-
-     int openGroup(QString key);
-     int closeGroup();
-
-   protected:
-     JsonFilterParametersReader();
-
-   private:
-     QJsonObject m_Root;
-     QJsonObject m_CurrentFilterIndex;
-
-     FilterPipeline::Pointer readPipeline(IObserver* obs);
-
-   public:
-     JsonFilterParametersReader(const JsonFilterParametersReader&) = delete;            // Copy Constructor Not Implemented
-     JsonFilterParametersReader(JsonFilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
-     JsonFilterParametersReader& operator=(const JsonFilterParametersReader&) = delete; // Copy Assignment Not Implemented
-     JsonFilterParametersReader& operator=(JsonFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+    using Self = JsonFilterParametersReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for JsonFilterParametersReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for JsonFilterParametersReader
+     */
+    static QString ClassName();
+
+    ~JsonFilterParametersReader() override;
+
+    /**
+     * @brief Setter property for FileName
+     */
+    void setFileName(const QString& value);
+    /**
+     * @brief Getter property for FileName
+     * @return Value of FileName
+     */
+    QString getFileName() const;
+
+    /**
+     * @brief Setter property for MaxFilterIndex
+     */
+    void setMaxFilterIndex(int value);
+    /**
+     * @brief Getter property for MaxFilterIndex
+     * @return Value of MaxFilterIndex
+     */
+    int getMaxFilterIndex() const;
+
+    /**
+     * @brief ReadPipelineFromFile Reads the Json formatted file and returns a FilterPipeline object
+     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+     * If the IObserver is NON-Null then an error message will be passed to it with an error message
+     * @param filePath The path to the INI formatted file
+     * @param format The format of the file which is anything that QSettings understands
+     * @param obs An IObserver object to report errors.
+     * @return Shared Pointer to a FilterPipeline Instance
+     */
+    FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
+
+    /**
+     * @brief getJsonFromFile Reads the Json formatted file and returns a json string
+     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+     * If the IObserver is NON-Null then an error message will be passed to it with an error message
+     * @param filePath The path to the INI formatted file
+     * @param format The format of the file which is anything that QSettings understands
+     * @param obs An IObserver object to report errors.
+     * @return Shared Pointer to a FilterPipeline Instance
+     */
+    QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
+
+    /**
+     * @brief ReadPipelineFromString Reads the Json formatted file and returns a FilterPipeline object
+     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+     * If the IObserver is NON-Null then an error message will be passed to it with an error message
+     * @param filePath The path to the INI formatted file
+     * @param format The format of the file which is anything that QSettings understands
+     * @param obs An IObserver object to report errors.
+     * @return Shared Pointer to a FilterPipeline Instance
+     */
+    FilterPipeline::Pointer readPipelineFromString(QString contents, IObserver* obs = nullptr);
+
+    /**
+     * @brief Gets the name of the pipeline from a pipeline file
+     * @param filePath The absolute path to the pipeline file.
+     * @param name Sets the name of the pipeline into this variable
+     * @param version Sets the DREAM3D Version into this variable.
+     * @param obs Any observer that needs to know about errors.
+     * @return
+     */
+    void readNameOfPipelineFromFile(QString filePath, QString& name, QString& version, IObserver* obs = nullptr);
+
+    /**
+     * @brief Generate an html formatted string that summarizes the pipeline file by listing
+     * each filter by it's human name and C++ class name.
+     * @param filePath The path to the pipeline file
+     * @param obs Any observer that needs to know about errors.
+     * @return html formatted string
+     */
+    static QString HtmlSummaryFromFile(QString filePath, IObserver* obs);
+
+    /**
+     * @brief Opens the pipeline file for operations
+     * @param filePath The path to the pipeline file
+     * @return
+     */
+    QJsonParseError openFile(QString filePath);
+
+    /**
+     * @brief setPipelineContents
+     * @param contents
+     * @return
+     */
+    int setPipelineContents(QString contents);
+
+    /**
+     * @brief closeFile
+     */
+    void closeFile();
+
+    /**
+     * @brief openFilterGroup
+     * @param unused
+     * @param index
+     * @return
+     */
+    int openFilterGroup(AbstractFilter* unused, int index) override;
+
+    /**
+     * @brief closeFilterGroup
+     * @return
+     */
+    int closeFilterGroup() override;
+
+    /*
+     * @brief getCurrentGroupObject
+     * @return
+     */
+    QJsonObject& getCurrentGroupObject();
+
+    bool containsGroup(QString key);
+
+    int openGroup(QString key);
+    int closeGroup();
+
+  protected:
+    JsonFilterParametersReader();
+
+  private:
+    QString m_FileName = {};
+    int m_MaxFilterIndex = {};
+
+    QJsonObject m_Root;
+    QJsonObject m_CurrentFilterIndex;
+
+    FilterPipeline::Pointer readPipeline(IObserver* obs);
+
+  public:
+    JsonFilterParametersReader(const JsonFilterParametersReader&) = delete;            // Copy Constructor Not Implemented
+    JsonFilterParametersReader(JsonFilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
+    JsonFilterParametersReader& operator=(const JsonFilterParametersReader&) = delete; // Copy Assignment Not Implemented
+    JsonFilterParametersReader& operator=(JsonFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index b93966a896..f1987aa917 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -39,7 +39,10 @@
 #include <QtCore/QJsonObject>
 
 #include "JsonFilterParametersWriter.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
 
@@ -310,3 +313,76 @@ QString JsonFilterParametersWriter::generateIndexString(int currentIndex)
   }
   return numStr;
 }
+
+// -----------------------------------------------------------------------------
+JsonFilterParametersWriter::Pointer JsonFilterParametersWriter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+JsonFilterParametersWriter::Pointer JsonFilterParametersWriter::New()
+{
+  Pointer sharedPtr(new(JsonFilterParametersWriter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersWriter::getNameOfClass() const
+{
+  return QString("JsonFilterParametersWriter");
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersWriter::ClassName()
+{
+  return QString("JsonFilterParametersWriter");
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersWriter::setFileName(const QString& value)
+{
+  m_FileName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersWriter::getFileName() const
+{
+  return m_FileName;
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersWriter::setPipelineName(const QString& value)
+{
+  m_PipelineName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString JsonFilterParametersWriter::getPipelineName() const
+{
+  return m_PipelineName;
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersWriter::setExpandReaderFilters(bool value)
+{
+  m_ExpandReaderFilters = value;
+}
+
+// -----------------------------------------------------------------------------
+bool JsonFilterParametersWriter::getExpandReaderFilters() const
+{
+  return m_ExpandReaderFilters;
+}
+
+// -----------------------------------------------------------------------------
+void JsonFilterParametersWriter::setMaxFilterIndex(int value)
+{
+  m_MaxFilterIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int JsonFilterParametersWriter::getMaxFilterIndex() const
+{
+  return m_MaxFilterIndex;
+}
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index 62f3df79aa..a868f1d7b9 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -55,13 +56,53 @@
 class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParametersWriter
 {
   public:
-    SIMPL_SHARED_POINTERS(JsonFilterParametersWriter)
-    SIMPL_STATIC_NEW_MACRO(JsonFilterParametersWriter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(JsonFilterParametersWriter, AbstractFilterParametersWriter)
+    using Self = JsonFilterParametersWriter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for JsonFilterParametersWriter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for JsonFilterParametersWriter
+     */
+    static QString ClassName();
+
+    /**
+     * @brief Setter property for FileName
+     */
+    void setFileName(const QString& value);
+    /**
+     * @brief Getter property for FileName
+     * @return Value of FileName
+     */
+    QString getFileName() const;
+
+    /**
+     * @brief Setter property for PipelineName
+     */
+    void setPipelineName(const QString& value);
+    /**
+     * @brief Getter property for PipelineName
+     * @return Value of PipelineName
+     */
+    QString getPipelineName() const;
 
-    SIMPL_INSTANCE_PROPERTY(QString, FileName)
-    SIMPL_INSTANCE_PROPERTY(QString, PipelineName)
-    SIMPL_INSTANCE_PROPERTY(bool, ExpandReaderFilters)
+    /**
+     * @brief Setter property for ExpandReaderFilters
+     */
+    void setExpandReaderFilters(bool value);
+    /**
+     * @brief Getter property for ExpandReaderFilters
+     * @return Value of ExpandReaderFilters
+     */
+    bool getExpandReaderFilters() const;
 
     JsonFilterParametersWriter(QString& fileName, QString& pipelineName, int& numFilters);
 
@@ -109,12 +150,25 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
      */
     QJsonObject& getCurrentGroupObject();
 
-    SIMPL_INSTANCE_PROPERTY(int, MaxFilterIndex)
+    /**
+     * @brief Setter property for MaxFilterIndex
+     */
+    void setMaxFilterIndex(int value);
+    /**
+     * @brief Getter property for MaxFilterIndex
+     * @return Value of MaxFilterIndex
+     */
+    int getMaxFilterIndex() const;
 
   protected:
     JsonFilterParametersWriter();
 
   private:
+    QString m_FileName = {};
+    QString m_PipelineName = {};
+    bool m_ExpandReaderFilters = {};
+    int m_MaxFilterIndex = {};
+
     QJsonObject m_Root;
     QJsonObject m_CurrentFilterIndex;
     int         m_CurrentIndex;
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 859389b151..c10625c877 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -94,3 +94,64 @@ void LinkedBooleanFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
 }
+
+// -----------------------------------------------------------------------------
+LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::New()
+{
+  Pointer sharedPtr(new(LinkedBooleanFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedBooleanFilterParameter::getNameOfClass() const
+{
+  return QString("LinkedBooleanFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedBooleanFilterParameter::ClassName()
+{
+  return QString("LinkedBooleanFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void LinkedBooleanFilterParameter::setConditionalProperties(const QStringList& value)
+{
+  m_ConditionalProperties = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList LinkedBooleanFilterParameter::getConditionalProperties() const
+{
+  return m_ConditionalProperties;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedBooleanFilterParameter::setSetterCallback(const LinkedBooleanFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedBooleanFilterParameter::SetterCallbackType LinkedBooleanFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedBooleanFilterParameter::setGetterCallback(const LinkedBooleanFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedBooleanFilterParameter::GetterCallbackType LinkedBooleanFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index 09cc14e948..c273ea03c1 100755
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(LinkedBooleanFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(LinkedBooleanFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedBooleanFilterParameter, FilterParameter)
+    using Self = LinkedBooleanFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for LinkedBooleanFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for LinkedBooleanFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(bool)>;
     using GetterCallbackType = std::function<bool(void)>;
@@ -94,7 +110,15 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
 
     ~LinkedBooleanFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(QStringList, ConditionalProperties)
+    /**
+     * @brief Setter property for ConditionalProperties
+     */
+    void setConditionalProperties(const QStringList& value);
+    /**
+     * @brief Getter property for ConditionalProperties
+     * @return Value of ConditionalProperties
+     */
+    QStringList getConditionalProperties() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -120,15 +144,30 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const LinkedBooleanFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    LinkedBooleanFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const LinkedBooleanFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    LinkedBooleanFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -142,5 +181,10 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
     LinkedBooleanFilterParameter(LinkedBooleanFilterParameter&&) = delete;      // Move Constructor Not Implemented
     LinkedBooleanFilterParameter& operator=(const LinkedBooleanFilterParameter&) = delete; // Copy Assignment Not Implemented
     LinkedBooleanFilterParameter& operator=(LinkedBooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QStringList m_ConditionalProperties = {};
+    LinkedBooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
+    LinkedBooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 0ab0ae4681..a031b0e679 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -48,7 +48,7 @@ LinkedChoicesFilterParameter::~LinkedChoicesFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New(const QString& humanLabel, const QString& propertyName, const int& defaultValue, Category category,
+LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
                                                                         const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, QStringList linkedProperties,
                                                                         int groupIndex)
 {
@@ -97,3 +97,64 @@ void LinkedChoicesFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New()
+{
+  Pointer sharedPtr(new(LinkedChoicesFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedChoicesFilterParameter::getNameOfClass() const
+{
+  return QString("LinkedChoicesFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedChoicesFilterParameter::ClassName()
+{
+  return QString("LinkedChoicesFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void LinkedChoicesFilterParameter::setLinkedProperties(const QStringList& value)
+{
+  m_LinkedProperties = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList LinkedChoicesFilterParameter::getLinkedProperties() const
+{
+  return m_LinkedProperties;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedChoicesFilterParameter::setSetterCallback(const LinkedChoicesFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedChoicesFilterParameter::SetterCallbackType LinkedChoicesFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedChoicesFilterParameter::setGetterCallback(const LinkedChoicesFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedChoicesFilterParameter::GetterCallbackType LinkedChoicesFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index cf67344198..03956428aa 100755
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -47,9 +49,23 @@
 class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(LinkedChoicesFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(LinkedChoicesFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedChoicesFilterParameter, FilterParameter)
+    using Self = LinkedChoicesFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for LinkedChoicesFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for LinkedChoicesFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(int)>;
     using GetterCallbackType = std::function<int(void)>;
@@ -73,14 +89,22 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
      * @return
      */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const int& defaultValue, Category category,
+                       int defaultValue, Category category,
                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                        QVector<QString> choices, QStringList linkedProperties,
                        int groupIndex = -1);
 
     ~LinkedChoicesFilterParameter() override;
 
-    SIMPL_INSTANCE_PROPERTY(QStringList, LinkedProperties)
+    /**
+     * @brief Setter property for LinkedProperties
+     */
+    void setLinkedProperties(const QStringList& value);
+    /**
+     * @brief Getter property for LinkedProperties
+     * @return Value of LinkedProperties
+     */
+    QStringList getLinkedProperties() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -106,15 +130,30 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const LinkedChoicesFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    LinkedChoicesFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const LinkedChoicesFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    LinkedChoicesFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -128,5 +167,10 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
     LinkedChoicesFilterParameter(LinkedChoicesFilterParameter&&) = delete;      // Move Constructor Not Implemented
     LinkedChoicesFilterParameter& operator=(const LinkedChoicesFilterParameter&) = delete; // Copy Assignment Not Implemented
     LinkedChoicesFilterParameter& operator=(LinkedChoicesFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QStringList m_LinkedProperties = {};
+    LinkedChoicesFilterParameter::SetterCallbackType m_SetterCallback = {};
+    LinkedChoicesFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index f6dfc0d500..9de90f1626 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -130,3 +130,76 @@ void LinkedDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractF
     emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
+
+// -----------------------------------------------------------------------------
+LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(LinkedDataContainerSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedDataContainerSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("LinkedDataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedDataContainerSelectionFilterParameter::ClassName()
+{
+  return QString("LinkedDataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void LinkedDataContainerSelectionFilterParameter::setLinkedProperties(const QStringList& value)
+{
+  m_LinkedProperties = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList LinkedDataContainerSelectionFilterParameter::getLinkedProperties() const
+{
+  return m_LinkedProperties;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedDataContainerSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types LinkedDataContainerSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedDataContainerSelectionFilterParameter::setSetterCallback(const LinkedDataContainerSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedDataContainerSelectionFilterParameter::SetterCallbackType LinkedDataContainerSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedDataContainerSelectionFilterParameter::setGetterCallback(const LinkedDataContainerSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedDataContainerSelectionFilterParameter::GetterCallbackType LinkedDataContainerSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index 9a96e89c6e..c46d557ddc 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -62,17 +64,31 @@ class AbstractFilter;
 class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(LinkedDataContainerSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(LinkedDataContainerSelectionFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedDataContainerSelectionFilterParameter, FilterParameter)
+    using Self = LinkedDataContainerSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
+     */
+    static QString ClassName();
 
-     using SetterCallbackType = std::function<void(DataArrayPath)>;
-     using GetterCallbackType = std::function<DataArrayPath(void)>;
+    using SetterCallbackType = std::function<void(DataArrayPath)>;
+    using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-     using RequirementType = struct
-     {
-       IGeometry::Types dcGeometryTypes;
-     };
+    using RequirementType = struct
+    {
+      IGeometry::Types dcGeometryTypes;
+    };
 
     /**
      * @brief New This function instantiates an instance of the LinkedDataContainerSelectionFilterParameter. This function must be used to instantiate the class; the 
@@ -97,8 +113,25 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
 
      ~LinkedDataContainerSelectionFilterParameter() override;
 
-     SIMPL_INSTANCE_PROPERTY(QStringList, LinkedProperties)
-     SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
+     /**
+      * @brief Setter property for LinkedProperties
+      */
+     void setLinkedProperties(const QStringList& value);
+     /**
+      * @brief Getter property for LinkedProperties
+      * @return Value of LinkedProperties
+      */
+     QStringList getLinkedProperties() const;
+
+     /**
+      * @brief Setter property for DefaultGeometryTypes
+      */
+     void setDefaultGeometryTypes(const IGeometry::Types& value);
+     /**
+      * @brief Getter property for DefaultGeometryTypes
+      * @return Value of DefaultGeometryTypes
+      */
+     IGeometry::Types getDefaultGeometryTypes() const;
 
      /**
       * @brief getWidgetType Returns the type of widget that displays and controls
@@ -124,14 +157,30 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
       * that this FilterParameter subclass represents.
       * from the filter parameter.
       */
-     SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+     /**
+      * @brief Setter property for SetterCallback
+      */
+     void setSetterCallback(const LinkedDataContainerSelectionFilterParameter::SetterCallbackType& value);
+     /**
+      * @brief Getter property for SetterCallback
+      * @return Value of SetterCallback
+      */
+     LinkedDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
      /**
       * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
       * that this FilterParameter subclass represents.
       * @return The GetterCallback
       */
-     SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+     /**
+      * @brief Setter property for GetterCallback
+      */
+     void setGetterCallback(const LinkedDataContainerSelectionFilterParameter::GetterCallbackType& value);
+     /**
+      * @brief Getter property for GetterCallback
+      * @return Value of GetterCallback
+      */
+     LinkedDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
      /**
       * @brief Handle DataArrayPath changes if necessary
@@ -150,5 +199,11 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
      LinkedDataContainerSelectionFilterParameter(LinkedDataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
      LinkedDataContainerSelectionFilterParameter& operator=(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
      LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+   private:
+     QStringList m_LinkedProperties = {};
+     IGeometry::Types m_DefaultGeometryTypes = {};
+     LinkedDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+     LinkedDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index aff4abde92..44b56b7658 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -319,3 +319,52 @@ DataArrayPath LinkedPathCreationFilterParameter::getLinkedDataArrayPath() const
   }
   return DataArrayPath("", "", "");
 }
+
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New()
+{
+  Pointer sharedPtr(new(LinkedPathCreationFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedPathCreationFilterParameter::getNameOfClass() const
+{
+  return QString("LinkedPathCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString LinkedPathCreationFilterParameter::ClassName()
+{
+  return QString("LinkedPathCreationFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void LinkedPathCreationFilterParameter::setSetterCallback(const LinkedPathCreationFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::SetterCallbackType LinkedPathCreationFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void LinkedPathCreationFilterParameter::setGetterCallback(const LinkedPathCreationFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+LinkedPathCreationFilterParameter::GetterCallbackType LinkedPathCreationFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index fc82214d79..e6e736a04a 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -120,9 +122,23 @@
 class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(LinkedPathCreationFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(LinkedPathCreationFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(LinkedPathCreationFilterParameter, FilterParameter)
+  using Self = LinkedPathCreationFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for LinkedPathCreationFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for LinkedPathCreationFilterParameter
+   */
+  static QString ClassName();
 
   using SetterCallbackType = std::function<void(QString)>;
   using GetterCallbackType = std::function<QString(void)>;
@@ -323,14 +339,30 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * that this FilterParameter subclass represents.
    * from the filter parameter.
    */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const LinkedPathCreationFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  LinkedPathCreationFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
    * that this FilterParameter subclass represents.
    * @return The GetterCallback
    */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const LinkedPathCreationFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  LinkedPathCreationFilterParameter::GetterCallbackType getGetterCallback() const;
 
   /**
    * @brief Set the ILinkedPath for determining what the parent container is
@@ -352,6 +384,9 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
   LinkedPathCreationFilterParameter();
 
 private:
+  LinkedPathCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+  LinkedPathCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
+
   ILinkedPath* m_LinkedPath = nullptr;
 
 public:
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index d1aa10e5e4..3efef7acf7 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -96,3 +96,52 @@ void MontageSelectionFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = values.toJson();
   }
 }
+
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::Pointer MontageSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::Pointer MontageSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(MontageSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MontageSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("MontageSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString MontageSelectionFilterParameter::ClassName()
+{
+  return QString("MontageSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void MontageSelectionFilterParameter::setSetterCallback(const MontageSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::SetterCallbackType MontageSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void MontageSelectionFilterParameter::setGetterCallback(const MontageSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MontageSelectionFilterParameter::GetterCallbackType MontageSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index c8beeca5a7..16cf9cf354 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -34,6 +34,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -61,9 +63,23 @@
 class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(MontageSelectionFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(MontageSelectionFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MontageSelectionFilterParameter, FilterParameter)
+  using Self = MontageSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for MontageSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MontageSelectionFilterParameter
+   */
+  static QString ClassName();
 
   using SetterCallbackType = std::function<void(MontageSelection)>;
   using GetterCallbackType = std::function<MontageSelection(void)>;
@@ -113,14 +129,30 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
    * that this FilterParameter subclass represents.
    * from the filter parameter.
    */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const MontageSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  MontageSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
    * that this FilterParameter subclass represents.
    * @return The GetterCallback
    */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const MontageSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  MontageSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -134,4 +166,8 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
   MontageSelectionFilterParameter(MontageSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   MontageSelectionFilterParameter& operator=(const MontageSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
   MontageSelectionFilterParameter& operator=(MontageSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  MontageSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  MontageSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 40a9eb0086..c2c7c58879 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -124,7 +124,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   //  if(IGeometry::Type::Unknown != geometryType)
   //  {
@@ -147,7 +147,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
@@ -230,3 +230,112 @@ void MultiAttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(Abstract
   m_SetterCallback(paths);
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
+
+// -----------------------------------------------------------------------------
+MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(MultiAttributeMatrixSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiAttributeMatrixSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("MultiAttributeMatrixSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiAttributeMatrixSelectionFilterParameter::ClassName()
+{
+  return QString("MultiAttributeMatrixSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultPaths(const QVector<DataArrayPath>& value)
+{
+  m_DefaultPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> MultiAttributeMatrixSelectionFilterParameter::getDefaultPaths() const
+{
+  return m_DefaultPaths;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types MultiAttributeMatrixSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+{
+  m_DefaultAttributeArrayTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeArrayTypes() const
+{
+  return m_DefaultAttributeArrayTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value)
+{
+  m_DefaultComponentDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<std::vector<size_t>> MultiAttributeMatrixSelectionFilterParameter::getDefaultComponentDimensions() const
+{
+  return m_DefaultComponentDimensions;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setSetterCallback(const MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType MultiAttributeMatrixSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void MultiAttributeMatrixSelectionFilterParameter::setGetterCallback(const MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType MultiAttributeMatrixSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 677fb5866d..b19e75cb9a 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -67,9 +69,23 @@
 class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(MultiAttributeMatrixSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(MultiAttributeMatrixSelectionFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiAttributeMatrixSelectionFilterParameter, FilterParameter)
+    using Self = MultiAttributeMatrixSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
+     */
+    static QString ClassName();
 
     typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
     typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
@@ -79,7 +95,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector< std::vector<size_t> > componentDimensions;
+      std::vector<std::vector<size_t>> componentDimensions;
     } RequirementType;
 
     /**
@@ -133,7 +149,15 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
-    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+    /**
+     * @brief Setter property for DefaultPaths
+     */
+    void setDefaultPaths(const QVector<DataArrayPath>& value);
+    /**
+     * @brief Getter property for DefaultPaths
+     * @return Value of DefaultPaths
+     */
+    QVector<DataArrayPath> getDefaultPaths() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -154,24 +178,75 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
      */
     void writeJson(QJsonObject& json) override;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< std::vector<size_t> >, DefaultComponentDimensions)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeArrayTypes
+     */
+    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+    /**
+     * @brief Getter property for DefaultAttributeArrayTypes
+     * @return Value of DefaultAttributeArrayTypes
+     */
+    QVector<QString> getDefaultAttributeArrayTypes() const;
+
+    /**
+     * @brief Setter property for DefaultComponentDimensions
+     */
+    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+    /**
+     * @brief Getter property for DefaultComponentDimensions
+     * @return Value of DefaultComponentDimensions
+     */
+    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -192,5 +267,14 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
     MultiAttributeMatrixSelectionFilterParameter(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     MultiAttributeMatrixSelectionFilterParameter& operator=(const MultiAttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiAttributeMatrixSelectionFilterParameter& operator=(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVector<DataArrayPath> m_DefaultPaths = {};
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    QVector<QString> m_DefaultAttributeArrayTypes = {};
+    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+    MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index c5c54856ba..1f08a73e10 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -124,7 +124,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   //  if(IGeometry::Type::Unknown != geometryType)
   //  {
@@ -147,7 +147,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
-    req.componentDimensions = QVector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
@@ -230,3 +230,112 @@ void MultiDataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter
   m_SetterCallback(paths);
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
+
+// -----------------------------------------------------------------------------
+MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(MultiDataArraySelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiDataArraySelectionFilterParameter::getNameOfClass() const
+{
+  return QString("MultiDataArraySelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiDataArraySelectionFilterParameter::ClassName()
+{
+  return QString("MultiDataArraySelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setDefaultPaths(const QVector<DataArrayPath>& value)
+{
+  m_DefaultPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> MultiDataArraySelectionFilterParameter::getDefaultPaths() const
+{
+  return m_DefaultPaths;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types MultiDataArraySelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> MultiDataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+{
+  m_DefaultAttributeArrayTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> MultiDataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
+{
+  return m_DefaultAttributeArrayTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value)
+{
+  m_DefaultComponentDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<std::vector<size_t>> MultiDataArraySelectionFilterParameter::getDefaultComponentDimensions() const
+{
+  return m_DefaultComponentDimensions;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setSetterCallback(const MultiDataArraySelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiDataArraySelectionFilterParameter::SetterCallbackType MultiDataArraySelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataArraySelectionFilterParameter::setGetterCallback(const MultiDataArraySelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiDataArraySelectionFilterParameter::GetterCallbackType MultiDataArraySelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 1f28131207..e4c4ca23bd 100755
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -67,9 +69,23 @@
 class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(MultiDataArraySelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(MultiDataArraySelectionFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataArraySelectionFilterParameter, FilterParameter)
+    using Self = MultiDataArraySelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
+     */
+    static QString ClassName();
 
     typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
     typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
@@ -79,7 +95,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
       IGeometry::Types dcGeometryTypes;
       AttributeMatrix::Types amTypes;
       QVector<QString> daTypes;
-      QVector< std::vector<size_t> > componentDimensions;
+      std::vector<std::vector<size_t>> componentDimensions;
     } RequirementType;
 
     /**
@@ -133,7 +149,15 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
-    SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DefaultPaths)
+    /**
+     * @brief Setter property for DefaultPaths
+     */
+    void setDefaultPaths(const QVector<DataArrayPath>& value);
+    /**
+     * @brief Getter property for DefaultPaths
+     * @return Value of DefaultPaths
+     */
+    QVector<DataArrayPath> getDefaultPaths() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -154,24 +178,75 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
      */
     void writeJson(QJsonObject& json) override;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector< std::vector<size_t> >, DefaultComponentDimensions)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeArrayTypes
+     */
+    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+    /**
+     * @brief Getter property for DefaultAttributeArrayTypes
+     * @return Value of DefaultAttributeArrayTypes
+     */
+    QVector<QString> getDefaultAttributeArrayTypes() const;
+
+    /**
+     * @brief Setter property for DefaultComponentDimensions
+     */
+    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+    /**
+     * @brief Getter property for DefaultComponentDimensions
+     * @return Value of DefaultComponentDimensions
+     */
+    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const MultiDataArraySelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    MultiDataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const MultiDataArraySelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    MultiDataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -192,5 +267,14 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
     MultiDataArraySelectionFilterParameter(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     MultiDataArraySelectionFilterParameter& operator=(const MultiDataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataArraySelectionFilterParameter& operator=(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QVector<DataArrayPath> m_DefaultPaths = {};
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    QVector<QString> m_DefaultAttributeArrayTypes = {};
+    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+    MultiDataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    MultiDataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 7215ba01e7..de8ea77e84 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -227,3 +227,112 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   m_SetterCallback(dcList);
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
+
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(MultiDataContainerSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("MultiDataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiDataContainerSelectionFilterParameter::ClassName()
+{
+  return QString("MultiDataContainerSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setDefaultNames(const QStringList& value)
+{
+  m_DefaultNames = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList MultiDataContainerSelectionFilterParameter::getDefaultNames() const
+{
+  return m_DefaultNames;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types MultiDataContainerSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<AttributeMatrix::Type> MultiDataContainerSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+{
+  m_DefaultAttributeArrayTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> MultiDataContainerSelectionFilterParameter::getDefaultAttributeArrayTypes() const
+{
+  return m_DefaultAttributeArrayTypes;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value)
+{
+  m_DefaultComponentDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<std::vector<size_t>> MultiDataContainerSelectionFilterParameter::getDefaultComponentDimensions() const
+{
+  return m_DefaultComponentDimensions;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setSetterCallback(const MultiDataContainerSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::SetterCallbackType MultiDataContainerSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void MultiDataContainerSelectionFilterParameter::setGetterCallback(const MultiDataContainerSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiDataContainerSelectionFilterParameter::GetterCallbackType MultiDataContainerSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index ee9763290a..3c89324b74 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -67,9 +69,23 @@
 class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(MultiDataContainerSelectionFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MultiDataContainerSelectionFilterParameter, FilterParameter)
+    using Self = MultiDataContainerSelectionFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(QStringList)>;
     using GetterCallbackType = std::function<QStringList(void)>;
@@ -131,7 +147,15 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
-    SIMPL_INSTANCE_PROPERTY(QStringList, DefaultNames)
+    /**
+     * @brief Setter property for DefaultNames
+     */
+    void setDefaultNames(const QStringList& value);
+    /**
+     * @brief Getter property for DefaultNames
+     * @return Value of DefaultNames
+     */
+    QStringList getDefaultNames() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -152,24 +176,75 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
      */
     void writeJson(QJsonObject& json) override;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<AttributeMatrix::Type>, DefaultAttributeMatrixTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DefaultAttributeArrayTypes)
-    SIMPL_INSTANCE_PROPERTY(std::vector<std::vector<size_t>>, DefaultComponentDimensions)
+    /**
+     * @brief Setter property for DefaultGeometryTypes
+     */
+    void setDefaultGeometryTypes(const IGeometry::Types& value);
+    /**
+     * @brief Getter property for DefaultGeometryTypes
+     * @return Value of DefaultGeometryTypes
+     */
+    IGeometry::Types getDefaultGeometryTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeMatrixTypes
+     */
+    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    /**
+     * @brief Getter property for DefaultAttributeMatrixTypes
+     * @return Value of DefaultAttributeMatrixTypes
+     */
+    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+
+    /**
+     * @brief Setter property for DefaultAttributeArrayTypes
+     */
+    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+    /**
+     * @brief Getter property for DefaultAttributeArrayTypes
+     * @return Value of DefaultAttributeArrayTypes
+     */
+    QVector<QString> getDefaultAttributeArrayTypes() const;
+
+    /**
+     * @brief Setter property for DefaultComponentDimensions
+     */
+    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+    /**
+     * @brief Getter property for DefaultComponentDimensions
+     * @return Value of DefaultComponentDimensions
+     */
+    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
     /**
     * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const MultiDataContainerSelectionFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    MultiDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const MultiDataContainerSelectionFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    MultiDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
     /**
      * @brief Handle DataArrayPath changes if necessary
@@ -190,5 +265,14 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     MultiDataContainerSelectionFilterParameter(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
     MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QStringList m_DefaultNames = {};
+    IGeometry::Types m_DefaultGeometryTypes = {};
+    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    QVector<QString> m_DefaultAttributeArrayTypes = {};
+    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+    MultiDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+    MultiDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 2d900b963c..044b7842b3 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -96,3 +96,52 @@ void NumericTypeFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
 }
+
+// -----------------------------------------------------------------------------
+NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::New()
+{
+  Pointer sharedPtr(new(NumericTypeFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString NumericTypeFilterParameter::getNameOfClass() const
+{
+  return QString("NumericTypeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString NumericTypeFilterParameter::ClassName()
+{
+  return QString("NumericTypeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void NumericTypeFilterParameter::setSetterCallback(const NumericTypeFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+NumericTypeFilterParameter::SetterCallbackType NumericTypeFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void NumericTypeFilterParameter::setGetterCallback(const NumericTypeFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+NumericTypeFilterParameter::GetterCallbackType NumericTypeFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index baa047ca3c..c62889cb06 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(NumericTypeFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(NumericTypeFilterParameter)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(NumericTypeFilterParameter, FilterParameter)
+  using Self = NumericTypeFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for NumericTypeFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for NumericTypeFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(SIMPL::NumericTypes::Type)> SetterCallbackType;
   typedef std::function<SIMPL::NumericTypes::Type(void)> GetterCallbackType;
@@ -117,14 +133,30 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
   * @return The SetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const NumericTypeFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  NumericTypeFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The GetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const NumericTypeFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  NumericTypeFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -138,5 +170,9 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   NumericTypeFilterParameter(NumericTypeFilterParameter&&) = delete;      // Move Constructor Not Implemented
   NumericTypeFilterParameter& operator=(const NumericTypeFilterParameter&) = delete; // Copy Assignment Not Implemented
   NumericTypeFilterParameter& operator=(NumericTypeFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  NumericTypeFilterParameter::SetterCallbackType m_SetterCallback = {};
+  NumericTypeFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index 6e8bd0115f..62659e3964 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -96,3 +96,76 @@ void OutputFileFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+OutputFileFilterParameter::Pointer OutputFileFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+OutputFileFilterParameter::Pointer OutputFileFilterParameter::New()
+{
+  Pointer sharedPtr(new(OutputFileFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputFileFilterParameter::getNameOfClass() const
+{
+  return QString("OutputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString OutputFileFilterParameter::ClassName()
+{
+  return QString("OutputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void OutputFileFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputFileFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void OutputFileFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputFileFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void OutputFileFilterParameter::setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+OutputFileFilterParameter::SetterCallbackType OutputFileFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void OutputFileFilterParameter::setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+OutputFileFilterParameter::GetterCallbackType OutputFileFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index 94a94a7abd..6ea8bad962 100755
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(OutputFileFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(OutputFileFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(OutputFileFilterParameter, FilterParameter)
+    using Self = OutputFileFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for OutputFileFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for OutputFileFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(QString)>;
     using GetterCallbackType = std::function<QString(void)>;
@@ -97,8 +113,25 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 
     ~OutputFileFilterParameter() override;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(FileExtension)
-    SIMPL_INSTANCE_STRING_PROPERTY(FileType)
+    /**
+     * @brief Setter property for FileExtension
+     */
+    void setFileExtension(const QString& value);
+    /**
+     * @brief Getter property for FileExtension
+     * @return Value of FileExtension
+     */
+    QString getFileExtension() const;
+
+    /**
+     * @brief Setter property for FileType
+     */
+    void setFileType(const QString& value);
+    /**
+     * @brief Getter property for FileType
+     * @return Value of FileType
+     */
+    QString getFileType() const;
 
     /**
      * @brief getWidgetType Returns the type of widget that displays and controls
@@ -124,27 +157,48 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    OutputFileFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    OutputFileFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-         * @brief OutputFileFilterParameter The default constructor.  It is protected because this
-         * filter parameter should only be instantiated using its New(...) function or short-form macro.
-         */
-      OutputFileFilterParameter();
+  protected:
+    /**
+     * @brief OutputFileFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    OutputFileFilterParameter();
 
-    public:
-      OutputFileFilterParameter(const OutputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      OutputFileFilterParameter(OutputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      OutputFileFilterParameter& operator=(const OutputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
-      OutputFileFilterParameter& operator=(OutputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    OutputFileFilterParameter(const OutputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    OutputFileFilterParameter(OutputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    OutputFileFilterParameter& operator=(const OutputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
+    OutputFileFilterParameter& operator=(OutputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_FileExtension = {};
+    QString m_FileType = {};
+    OutputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
+    OutputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index 61ef3ec7d9..9bd463f8e5 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -96,3 +96,76 @@ void OutputPathFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+OutputPathFilterParameter::Pointer OutputPathFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+OutputPathFilterParameter::Pointer OutputPathFilterParameter::New()
+{
+  Pointer sharedPtr(new(OutputPathFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputPathFilterParameter::getNameOfClass() const
+{
+  return QString("OutputPathFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString OutputPathFilterParameter::ClassName()
+{
+  return QString("OutputPathFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void OutputPathFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputPathFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void OutputPathFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString OutputPathFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void OutputPathFilterParameter::setSetterCallback(const OutputPathFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+OutputPathFilterParameter::SetterCallbackType OutputPathFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void OutputPathFilterParameter::setGetterCallback(const OutputPathFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+OutputPathFilterParameter::GetterCallbackType OutputPathFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index 6406b17c90..a79e6a12c8 100755
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,81 +65,124 @@
 class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(OutputPathFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(OutputPathFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(OutputPathFilterParameter, FilterParameter)
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the OutputPathFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_PATH_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param fileExtension The possible file extensions that this OutputPathWidget accepts.
-    * @param fileType The possible file types that this OutputPathWidget accepts.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const QString& defaultValue, Category category,
-    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-    const QString& fileExtension = QString(""),
-    const QString& fileType = QString(""),
-    int groupIndex = -1);
-
-    ~OutputPathFilterParameter() override;
-
-    SIMPL_INSTANCE_STRING_PROPERTY(FileExtension)
-      SIMPL_INSTANCE_STRING_PROPERTY(FileType)
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-      QString getWidgetType() const override;
-
-      /**
-       * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-       * @param json The QJsonObject that the filter parameter reads from.
-       */
-      void readJson(const QJsonObject& json) override;
-
-      /**
-       * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-       * @param json The QJsonObject that the filter parameter writes to.
-       */
-      void writeJson(QJsonObject& json) override;
-
-      /**
-      * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * from the filter parameter.
-      */
-      SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-      /**
-      * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * @return The GetterCallback
-      */
-      SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
-    protected:
-      /**
-       * @brief OutputPathFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
+  using Self = OutputPathFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for OutputPathFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for OutputPathFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the OutputPathFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_PATH_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param fileExtension The possible file extensions that this OutputPathWidget accepts.
+  * @param fileType The possible file types that this OutputPathWidget accepts.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+
+  ~OutputPathFilterParameter() override;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const OutputPathFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  OutputPathFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const OutputPathFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  OutputPathFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief OutputPathFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   OutputPathFilterParameter();
 
 public:
@@ -145,5 +190,11 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   OutputPathFilterParameter(OutputPathFilterParameter&&) = delete;      // Move Constructor Not Implemented
   OutputPathFilterParameter& operator=(const OutputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   OutputPathFilterParameter& operator=(OutputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FileExtension = {};
+  QString m_FileType = {};
+  OutputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
+  OutputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index 789efad259..fd225ddd64 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -93,3 +93,64 @@ void ParagraphFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+ParagraphFilterParameter::Pointer ParagraphFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ParagraphFilterParameter::Pointer ParagraphFilterParameter::New()
+{
+  Pointer sharedPtr(new(ParagraphFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ParagraphFilterParameter::getNameOfClass() const
+{
+  return QString("ParagraphFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ParagraphFilterParameter::ClassName()
+{
+  return QString("ParagraphFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ParagraphFilterParameter::setSetterCallback(const ParagraphFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ParagraphFilterParameter::SetterCallbackType ParagraphFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ParagraphFilterParameter::setGetterCallback(const ParagraphFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ParagraphFilterParameter::GetterCallbackType ParagraphFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ParagraphFilterParameter::setAllowPreflight(bool value)
+{
+  m_AllowPreflight = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ParagraphFilterParameter::getAllowPreflight() const
+{
+  return m_AllowPreflight;
+}
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index 5f3ebb57a1..6c134ac712 100755
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -59,9 +61,23 @@
 class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ParagraphFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(ParagraphFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ParagraphFilterParameter, FilterParameter)
+  using Self = ParagraphFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ParagraphFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ParagraphFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(QString)> SetterCallbackType;
   typedef std::function<QString(void)> GetterCallbackType;
@@ -111,16 +127,40 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
   * from the filter parameter.
   */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ParagraphFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ParagraphFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
   * @brief GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The GetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ParagraphFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ParagraphFilterParameter::GetterCallbackType getGetterCallback() const;
 
-  SIMPL_INSTANCE_PROPERTY(bool, AllowPreflight)
+  /**
+   * @brief Setter property for AllowPreflight
+   */
+  void setAllowPreflight(bool value);
+  /**
+   * @brief Getter property for AllowPreflight
+   * @return Value of AllowPreflight
+   */
+  bool getAllowPreflight() const;
 
 protected:
   /**
@@ -134,5 +174,10 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   ParagraphFilterParameter(ParagraphFilterParameter&&) = delete;      // Move Constructor Not Implemented
   ParagraphFilterParameter& operator=(const ParagraphFilterParameter&) = delete; // Copy Assignment Not Implemented
   ParagraphFilterParameter& operator=(ParagraphFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  ParagraphFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ParagraphFilterParameter::GetterCallbackType m_GetterCallback = {};
+  bool m_AllowPreflight = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 26d81d10f0..a12710f907 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -135,3 +135,136 @@ void PhaseTypeSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fil
     }
   }
 }
+
+// -----------------------------------------------------------------------------
+PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(PhaseTypeSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PhaseTypeSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("PhaseTypeSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString PhaseTypeSelectionFilterParameter::ClassName()
+{
+  return QString("PhaseTypeSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setPhaseTypeCountProperty(const QString& value)
+{
+  m_PhaseTypeCountProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PhaseTypeSelectionFilterParameter::getPhaseTypeCountProperty() const
+{
+  return m_PhaseTypeCountProperty;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setPhaseTypeDataProperty(const QString& value)
+{
+  m_PhaseTypeDataProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PhaseTypeSelectionFilterParameter::getPhaseTypeDataProperty() const
+{
+  return m_PhaseTypeDataProperty;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setAttributeMatrixPathProperty(const QString& value)
+{
+  m_AttributeMatrixPathProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PhaseTypeSelectionFilterParameter::getAttributeMatrixPathProperty() const
+{
+  return m_AttributeMatrixPathProperty;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setAttributeMatrixPathDefault(const DataArrayPath& value)
+{
+  m_AttributeMatrixPathDefault = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath PhaseTypeSelectionFilterParameter::getAttributeMatrixPathDefault() const
+{
+  return m_AttributeMatrixPathDefault;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setPhaseListChoices(const QStringList& value)
+{
+  m_PhaseListChoices = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList PhaseTypeSelectionFilterParameter::getPhaseListChoices() const
+{
+  return m_PhaseListChoices;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setDefaultGeometryTypes(const IGeometry::Types& value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types PhaseTypeSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
+{
+  m_DefaultAttributeMatrixTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Types PhaseTypeSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+{
+  return m_DefaultAttributeMatrixTypes;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setSetterCallback(const PhaseTypeSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+PhaseTypeSelectionFilterParameter::SetterCallbackType PhaseTypeSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void PhaseTypeSelectionFilterParameter::setGetterCallback(const PhaseTypeSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+PhaseTypeSelectionFilterParameter::GetterCallbackType PhaseTypeSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index ce28201a75..197a1a8910 100755
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/PhaseType.h"
@@ -61,9 +63,23 @@
 class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(PhaseTypeSelectionFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(PhaseTypeSelectionFilterParameter)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PhaseTypeSelectionFilterParameter, FilterParameter)
+  using Self = PhaseTypeSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PhaseTypeSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PhaseTypeSelectionFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(PhaseType::Types)> SetterCallbackType;
   typedef std::function<PhaseType::Types(void)> GetterCallbackType;
@@ -94,11 +110,55 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 
   ~PhaseTypeSelectionFilterParameter() override;
 
-  SIMPL_INSTANCE_PROPERTY(QString, PhaseTypeCountProperty)
-  SIMPL_INSTANCE_PROPERTY(QString, PhaseTypeDataProperty)
-  SIMPL_INSTANCE_PROPERTY(QString, AttributeMatrixPathProperty)
-  SIMPL_INSTANCE_PROPERTY(DataArrayPath, AttributeMatrixPathDefault)
-  SIMPL_INSTANCE_PROPERTY(QStringList, PhaseListChoices)
+  /**
+   * @brief Setter property for PhaseTypeCountProperty
+   */
+  void setPhaseTypeCountProperty(const QString& value);
+  /**
+   * @brief Getter property for PhaseTypeCountProperty
+   * @return Value of PhaseTypeCountProperty
+   */
+  QString getPhaseTypeCountProperty() const;
+
+  /**
+   * @brief Setter property for PhaseTypeDataProperty
+   */
+  void setPhaseTypeDataProperty(const QString& value);
+  /**
+   * @brief Getter property for PhaseTypeDataProperty
+   * @return Value of PhaseTypeDataProperty
+   */
+  QString getPhaseTypeDataProperty() const;
+
+  /**
+   * @brief Setter property for AttributeMatrixPathProperty
+   */
+  void setAttributeMatrixPathProperty(const QString& value);
+  /**
+   * @brief Getter property for AttributeMatrixPathProperty
+   * @return Value of AttributeMatrixPathProperty
+   */
+  QString getAttributeMatrixPathProperty() const;
+
+  /**
+   * @brief Setter property for AttributeMatrixPathDefault
+   */
+  void setAttributeMatrixPathDefault(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixPathDefault
+   * @return Value of AttributeMatrixPathDefault
+   */
+  DataArrayPath getAttributeMatrixPathDefault() const;
+
+  /**
+   * @brief Setter property for PhaseListChoices
+   */
+  void setPhaseListChoices(const QStringList& value);
+  /**
+   * @brief Getter property for PhaseListChoices
+   * @return Value of PhaseListChoices
+   */
+  QStringList getPhaseListChoices() const;
 
   /**
   * @brief getWidgetType Returns the type of widget that displays and controls
@@ -119,22 +179,55 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   */
   void writeJson(QJsonObject& json) override;
 
-  SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DefaultGeometryTypes)
-  SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, DefaultAttributeMatrixTypes)
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The SetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const PhaseTypeSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  PhaseTypeSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The GetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const PhaseTypeSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  PhaseTypeSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
   /**
    * @brief Handle DataArrayPath changes if necessary
@@ -153,5 +246,16 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   PhaseTypeSelectionFilterParameter(PhaseTypeSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
   PhaseTypeSelectionFilterParameter& operator=(const PhaseTypeSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
   PhaseTypeSelectionFilterParameter& operator=(PhaseTypeSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_PhaseTypeCountProperty = {};
+  QString m_PhaseTypeDataProperty = {};
+  QString m_AttributeMatrixPathProperty = {};
+  DataArrayPath m_AttributeMatrixPathDefault = {};
+  QStringList m_PhaseListChoices = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  PhaseTypeSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  PhaseTypeSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index e338f66e76..8ca75e8486 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -69,3 +69,40 @@ QString PreflightUpdatedValueFilterParameter::getWidgetType() const
 {
   return QString("PreflightUpdatedValueWidget");
 }
+
+// -----------------------------------------------------------------------------
+PreflightUpdatedValueFilterParameter::Pointer PreflightUpdatedValueFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PreflightUpdatedValueFilterParameter::Pointer PreflightUpdatedValueFilterParameter::New()
+{
+  Pointer sharedPtr(new(PreflightUpdatedValueFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PreflightUpdatedValueFilterParameter::getNameOfClass() const
+{
+  return QString("PreflightUpdatedValueFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString PreflightUpdatedValueFilterParameter::ClassName()
+{
+  return QString("PreflightUpdatedValueFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void PreflightUpdatedValueFilterParameter::setGetterCallback(const PreflightUpdatedValueFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+PreflightUpdatedValueFilterParameter::GetterCallbackType PreflightUpdatedValueFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 1b97aa7f1f..268439aaa3 100755
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -36,6 +36,8 @@
 #pragma once
 
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
@@ -62,9 +64,23 @@
 class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(PreflightUpdatedValueFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(PreflightUpdatedValueFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PreflightUpdatedValueFilterParameter, FilterParameter)
+    using Self = PreflightUpdatedValueFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(QString)>;
     using GetterCallbackType = std::function<QString(void)>;
@@ -102,8 +118,15 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const PreflightUpdatedValueFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    PreflightUpdatedValueFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
       /**
@@ -117,5 +140,8 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
     PreflightUpdatedValueFilterParameter(PreflightUpdatedValueFilterParameter&&) = delete;      // Move Constructor Not Implemented
     PreflightUpdatedValueFilterParameter& operator=(const PreflightUpdatedValueFilterParameter&) = delete; // Copy Assignment Not Implemented
     PreflightUpdatedValueFilterParameter& operator=(PreflightUpdatedValueFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    PreflightUpdatedValueFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index b9e194dc79..7db891e3eb 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -106,3 +106,64 @@ void RangeFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+RangeFilterParameter::Pointer RangeFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+RangeFilterParameter::Pointer RangeFilterParameter::New()
+{
+  Pointer sharedPtr(new(RangeFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString RangeFilterParameter::getNameOfClass() const
+{
+  return QString("RangeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString RangeFilterParameter::ClassName()
+{
+  return QString("RangeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void RangeFilterParameter::setDefaultPair(const FPRangePair& value)
+{
+  m_DefaultPair = value;
+}
+
+// -----------------------------------------------------------------------------
+FPRangePair RangeFilterParameter::getDefaultPair() const
+{
+  return m_DefaultPair;
+}
+
+// -----------------------------------------------------------------------------
+void RangeFilterParameter::setSetterCallback(const RangeFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+RangeFilterParameter::SetterCallbackType RangeFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void RangeFilterParameter::setGetterCallback(const RangeFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+RangeFilterParameter::GetterCallbackType RangeFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 838add02f3..f6cbe7907e 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -1,46 +1,48 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 #include <QtCore/QPair>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
-typedef QPair <double, double> FPRangePair;
+typedef QPair<double, double> FPRangePair;
 
 /**
  * @brief SIMPL_NEW_RANGE_FP This macro is a short-form way of instantiating an instance of
@@ -54,10 +56,8 @@ typedef QPair <double, double> FPRangePair;
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_RANGE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (RangeFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_RANGE_FP(...)                                                                                                                                                                        \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(RangeFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The RangeFilterParameter class is used by filters to instantiate an RangeWidget.  By instantiating an instance of
@@ -66,82 +66,122 @@ typedef QPair <double, double> FPRangePair;
 class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(RangeFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(RangeFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RangeFilterParameter, FilterParameter)
-
-    typedef std::function<void(QPair<double, double>)> SetterCallbackType;
-    typedef std::function<QPair<double, double>(void)> GetterCallbackType;
-
-    /**
-     * @brief New This function instantiates an instance of the RangeFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_RANGE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                      const QPair<double, double>& defaultPair, Category category,
-                      const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                      int groupIndex = -1);
-
-    ~RangeFilterParameter() override;
+  using Self = RangeFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  typedef std::function<void(QPair<double, double>)> SetterCallbackType;
+  typedef std::function<QPair<double, double>(void)> GetterCallbackType;
+
+  /**
+   * @brief New This function instantiates an instance of the RangeFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_RANGE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QPair<double, double>& defaultPair, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  /**
+   * @brief Returns the name of the class for RangeFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RangeFilterParameter
+   */
+  static QString ClassName();
+
+  ~RangeFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    SIMPL_INSTANCE_PROPERTY(FPRangePair, DefaultPair)
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
-  protected:
-    /**
-     * @brief RangeFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Setter property for DefaultPair
+   */
+  void setDefaultPair(const FPRangePair& value);
+  /**
+   * @brief Getter property for DefaultPair
+   * @return Value of DefaultPair
+   */
+  FPRangePair getDefaultPair() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const RangeFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  RangeFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const RangeFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  RangeFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief RangeFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   RangeFilterParameter();
 
 public:
-  RangeFilterParameter(const RangeFilterParameter&) = delete; // Copy Constructor Not Implemented
-  RangeFilterParameter(RangeFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  RangeFilterParameter(const RangeFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  RangeFilterParameter(RangeFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   RangeFilterParameter& operator=(const RangeFilterParameter&) = delete; // Copy Assignment Not Implemented
   RangeFilterParameter& operator=(RangeFilterParameter&&) = delete;      // Move Assignment Not Implemented
-};
 
+private:
+  FPRangePair m_DefaultPair = {};
+  RangeFilterParameter::SetterCallbackType m_SetterCallback = {};
+  RangeFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index 630dd8c062..64f3bfd66b 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -82,3 +82,28 @@ void ReadASCIIDataFilterParameter::dataArrayPathRenamed(AbstractFilter* filter,
 
   emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
+
+// -----------------------------------------------------------------------------
+ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::New()
+{
+  Pointer sharedPtr(new(ReadASCIIDataFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ReadASCIIDataFilterParameter::getNameOfClass() const
+{
+  return QString("ReadASCIIDataFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ReadASCIIDataFilterParameter::ClassName()
+{
+  return QString("ReadASCIIDataFilterParameter");
+}
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 0609b7c381..2703a1d3a1 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 class ASCIIWizardData;
@@ -42,30 +44,46 @@ class ASCIIWizardData;
 class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ReadASCIIDataFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(ReadASCIIDataFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ReadASCIIDataFilterParameter, FilterParameter)
+  using Self = ReadASCIIDataFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ReadASCIIDataFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ReadASCIIDataFilterParameter
+   */
+  static QString ClassName();
 
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex = -1);
 
-    ~ReadASCIIDataFilterParameter() override;
+  ~ReadASCIIDataFilterParameter() override;
 
-    QString getWidgetType() const override;
+  QString getWidgetType() const override;
 
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
-  protected:
-    ReadASCIIDataFilterParameter();
+protected:
+  ReadASCIIDataFilterParameter();
+
+public:
+  ReadASCIIDataFilterParameter(const ReadASCIIDataFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ReadASCIIDataFilterParameter(ReadASCIIDataFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ReadASCIIDataFilterParameter& operator=(const ReadASCIIDataFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ReadASCIIDataFilterParameter& operator=(ReadASCIIDataFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  public:
-    ReadASCIIDataFilterParameter(const ReadASCIIDataFilterParameter&) = delete; // Copy Constructor Not Implemented
-    ReadASCIIDataFilterParameter(ReadASCIIDataFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    ReadASCIIDataFilterParameter& operator=(const ReadASCIIDataFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ReadASCIIDataFilterParameter& operator=(ReadASCIIDataFilterParameter&&) = delete;      // Move Assignment Not Implemented
+private:
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index 36609a75b3..a16c11bd86 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -96,3 +96,52 @@ void ScalarTypeFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
 }
+
+// -----------------------------------------------------------------------------
+ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::New()
+{
+  Pointer sharedPtr(new(ScalarTypeFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ScalarTypeFilterParameter::getNameOfClass() const
+{
+  return QString("ScalarTypeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ScalarTypeFilterParameter::ClassName()
+{
+  return QString("ScalarTypeFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ScalarTypeFilterParameter::setSetterCallback(const ScalarTypeFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ScalarTypeFilterParameter::SetterCallbackType ScalarTypeFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ScalarTypeFilterParameter::setGetterCallback(const ScalarTypeFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ScalarTypeFilterParameter::GetterCallbackType ScalarTypeFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index dcc623b12e..fcb7a162e3 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ScalarTypeFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(ScalarTypeFilterParameter)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ScalarTypeFilterParameter, FilterParameter)
+  using Self = ScalarTypeFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ScalarTypeFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ScalarTypeFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(SIMPL::ScalarTypes::Type)> SetterCallbackType;
   typedef std::function<SIMPL::ScalarTypes::Type(void)> GetterCallbackType;
@@ -117,14 +133,30 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
   * @return The SetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ScalarTypeFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ScalarTypeFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The GetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ScalarTypeFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ScalarTypeFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -138,5 +170,9 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   ScalarTypeFilterParameter(ScalarTypeFilterParameter&&) = delete;      // Move Constructor Not Implemented
   ScalarTypeFilterParameter& operator=(const ScalarTypeFilterParameter&) = delete; // Copy Assignment Not Implemented
   ScalarTypeFilterParameter& operator=(ScalarTypeFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  ScalarTypeFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ScalarTypeFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index bfc958e956..8f441ce021 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -102,3 +102,52 @@ void SecondOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::New()
+{
+  Pointer sharedPtr(new(SecondOrderPolynomialFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString SecondOrderPolynomialFilterParameter::getNameOfClass() const
+{
+  return QString("SecondOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString SecondOrderPolynomialFilterParameter::ClassName()
+{
+  return QString("SecondOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void SecondOrderPolynomialFilterParameter::setSetterCallback(const SecondOrderPolynomialFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+SecondOrderPolynomialFilterParameter::SetterCallbackType SecondOrderPolynomialFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void SecondOrderPolynomialFilterParameter::setGetterCallback(const SecondOrderPolynomialFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+SecondOrderPolynomialFilterParameter::GetterCallbackType SecondOrderPolynomialFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index fe1db9c2cb..b21824cb11 100755
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -96,35 +98,49 @@ Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
 class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(SecondOrderPolynomialFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(SecondOrderPolynomialFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(SecondOrderPolynomialFilterParameter, FilterParameter)
+  using Self = SecondOrderPolynomialFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    using SetterCallbackType = std::function<void(Float2ndOrderPoly_t)>;
-    using GetterCallbackType = std::function<Float2ndOrderPoly_t(void)>;
+  static Pointer New();
 
-    /**
-     * @brief New This function instantiates an instance of the SecondOrderPolynomialFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_SecondO_POLY_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
+  /**
+   * @brief Returns the name of the class for SecondOrderPolynomialFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for SecondOrderPolynomialFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(Float2ndOrderPoly_t)>;
+  using GetterCallbackType = std::function<Float2ndOrderPoly_t(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the SecondOrderPolynomialFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_SecondO_POLY_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
     static Pointer New(const QString& humanLabel, const QString& propertyName,
     const Float2ndOrderPoly_t& defaultValue, Category category,
      const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
      int groupIndex = -1);
 
-    ~SecondOrderPolynomialFilterParameter() override;
+  ~SecondOrderPolynomialFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -150,14 +166,30 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const SecondOrderPolynomialFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    SecondOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const SecondOrderPolynomialFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    SecondOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -171,5 +203,9 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
   SecondOrderPolynomialFilterParameter(SecondOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
   SecondOrderPolynomialFilterParameter& operator=(const SecondOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   SecondOrderPolynomialFilterParameter& operator=(SecondOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  SecondOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
+  SecondOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
index d4fbb580be..4b9bea0e2d 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
@@ -66,3 +66,28 @@ QString SeparatorFilterParameter::getWidgetType() const
 {
   return QString("SeparatorWidget");
 }
+
+// -----------------------------------------------------------------------------
+SeparatorFilterParameter::Pointer SeparatorFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+SeparatorFilterParameter::Pointer SeparatorFilterParameter::New()
+{
+  Pointer sharedPtr(new(SeparatorFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString SeparatorFilterParameter::getNameOfClass() const
+{
+  return QString("SeparatorFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString SeparatorFilterParameter::ClassName()
+{
+  return QString("SeparatorFilterParameter");
+}
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
index 9ed0662e49..884ecb9bc7 100755
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
@@ -44,9 +46,23 @@
 class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(SeparatorFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(SeparatorFilterParameter)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(SeparatorFilterParameter, FilterParameter)
+    using Self = SeparatorFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for SeparatorFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for SeparatorFilterParameter
+     */
+    static QString ClassName();
 
     /**
      * @brief New This function instantiates an instance of the SeparatorFilterParameter.
@@ -79,5 +95,7 @@ class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
     SeparatorFilterParameter(SeparatorFilterParameter&&) = delete;      // Move Constructor Not Implemented
     SeparatorFilterParameter& operator=(const SeparatorFilterParameter&) = delete; // Copy Assignment Not Implemented
     SeparatorFilterParameter& operator=(SeparatorFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 20f9f1d721..77e0609990 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -114,3 +114,76 @@ void ShapeTypeSelectionFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = jsonArray;
   }
 }
+
+// -----------------------------------------------------------------------------
+ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::New()
+{
+  Pointer sharedPtr(new(ShapeTypeSelectionFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeTypeSelectionFilterParameter::getNameOfClass() const
+{
+  return QString("ShapeTypeSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeTypeSelectionFilterParameter::ClassName()
+{
+  return QString("ShapeTypeSelectionFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ShapeTypeSelectionFilterParameter::setPhaseTypeCountProperty(const QString& value)
+{
+  m_PhaseTypeCountProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeTypeSelectionFilterParameter::getPhaseTypeCountProperty() const
+{
+  return m_PhaseTypeCountProperty;
+}
+
+// -----------------------------------------------------------------------------
+void ShapeTypeSelectionFilterParameter::setPhaseTypeArrayPathProperty(const QString& value)
+{
+  m_PhaseTypeArrayPathProperty = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeTypeSelectionFilterParameter::getPhaseTypeArrayPathProperty() const
+{
+  return m_PhaseTypeArrayPathProperty;
+}
+
+// -----------------------------------------------------------------------------
+void ShapeTypeSelectionFilterParameter::setSetterCallback(const ShapeTypeSelectionFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ShapeTypeSelectionFilterParameter::SetterCallbackType ShapeTypeSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ShapeTypeSelectionFilterParameter::setGetterCallback(const ShapeTypeSelectionFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ShapeTypeSelectionFilterParameter::GetterCallbackType ShapeTypeSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index f4232ce7f1..d552e6daee 100755
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ShapeTypeSelectionFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(ShapeTypeSelectionFilterParameter)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ShapeTypeSelectionFilterParameter, FilterParameter)
+  using Self = ShapeTypeSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ShapeTypeSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ShapeTypeSelectionFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(ShapeType::Types)> SetterCallbackType;
   typedef std::function<ShapeType::Types(void)> GetterCallbackType;
@@ -93,8 +109,25 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 
   ~ShapeTypeSelectionFilterParameter() override;
 
-  SIMPL_INSTANCE_PROPERTY(QString, PhaseTypeCountProperty)
-  SIMPL_INSTANCE_PROPERTY(QString, PhaseTypeArrayPathProperty)
+  /**
+   * @brief Setter property for PhaseTypeCountProperty
+   */
+  void setPhaseTypeCountProperty(const QString& value);
+  /**
+   * @brief Getter property for PhaseTypeCountProperty
+   * @return Value of PhaseTypeCountProperty
+   */
+  QString getPhaseTypeCountProperty() const;
+
+  /**
+   * @brief Setter property for PhaseTypeArrayPathProperty
+   */
+  void setPhaseTypeArrayPathProperty(const QString& value);
+  /**
+   * @brief Getter property for PhaseTypeArrayPathProperty
+   * @return Value of PhaseTypeArrayPathProperty
+   */
+  QString getPhaseTypeArrayPathProperty() const;
 
   /**
   * @brief getWidgetType Returns the type of widget that displays and controls
@@ -120,14 +153,30 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
   * @return The SetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ShapeTypeSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ShapeTypeSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
   * that this FilterParameter subclass represents.
   * @return The GetterCallback
   */
-  SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ShapeTypeSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ShapeTypeSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
   /**
@@ -141,5 +190,11 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   ShapeTypeSelectionFilterParameter(ShapeTypeSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
   ShapeTypeSelectionFilterParameter& operator=(const ShapeTypeSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
   ShapeTypeSelectionFilterParameter& operator=(ShapeTypeSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_PhaseTypeCountProperty = {};
+  QString m_PhaseTypeArrayPathProperty = {};
+  ShapeTypeSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ShapeTypeSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index a816440448..ffcf977623 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -93,3 +93,52 @@ void StringFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = m_GetterCallback();
   }
 }
+
+// -----------------------------------------------------------------------------
+StringFilterParameter::Pointer StringFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+StringFilterParameter::Pointer StringFilterParameter::New()
+{
+  Pointer sharedPtr(new(StringFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString StringFilterParameter::getNameOfClass() const
+{
+  return QString("StringFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString StringFilterParameter::ClassName()
+{
+  return QString("StringFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void StringFilterParameter::setSetterCallback(const StringFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+StringFilterParameter::SetterCallbackType StringFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void StringFilterParameter::setGetterCallback(const StringFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+StringFilterParameter::GetterCallbackType StringFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index f2e0afbfe9..48c0eb3ed8 100755
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -63,9 +65,23 @@
 class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(StringFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(StringFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(StringFilterParameter, FilterParameter)
+    using Self = StringFilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for StringFilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for StringFilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(QString)>;
     using GetterCallbackType = std::function<QString(void)>;
@@ -115,28 +131,47 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const StringFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    StringFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const StringFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    StringFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief StringFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      StringFilterParameter();
+  protected:
+    /**
+     * @brief StringFilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    StringFilterParameter();
 
-    public:
-      StringFilterParameter(const StringFilterParameter&) = delete;            // Copy Constructor Not Implemented
-      StringFilterParameter(StringFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      StringFilterParameter& operator=(const StringFilterParameter&) = delete; // Copy Assignment Not Implemented
-      StringFilterParameter& operator=(StringFilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    StringFilterParameter(const StringFilterParameter&) = delete;            // Copy Constructor Not Implemented
+    StringFilterParameter(StringFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    StringFilterParameter& operator=(const StringFilterParameter&) = delete; // Copy Assignment Not Implemented
+    StringFilterParameter& operator=(StringFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    StringFilterParameter::SetterCallbackType m_SetterCallback = {};
+    StringFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
 
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 1d6be2ede2..4198711063 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -36,7 +36,7 @@
 #include <QtCore/QPair>
 
 #include "SIMPLib/Common/PhaseType.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -230,99 +230,517 @@ class FilterParametersRWTest
   }
   virtual ~FilterParametersRWTest() = default;
 
-  SIMPL_INSTANCE_PROPERTY(bool, Bool1)
+  // -----------------------------------------------------------------------------
+  void setBool1(bool value)
+  {
+    m_Bool1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  bool getBool1() const
+  {
+    return m_Bool1;
+  }
+
   Q_PROPERTY(bool Bool1 READ getBool1 WRITE setBool1)
-  SIMPL_INSTANCE_PROPERTY(bool, Bool2)
+  // -----------------------------------------------------------------------------
+  void setBool2(bool value)
+  {
+    m_Bool2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  bool getBool2() const
+  {
+    return m_Bool2;
+  }
+
   Q_PROPERTY(bool Bool2 READ getBool2 WRITE setBool2)
 
-  SIMPL_INSTANCE_PROPERTY(int, Int1)
+  // -----------------------------------------------------------------------------
+  void setInt1(int value)
+  {
+    m_Int1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  int getInt1() const
+  {
+    return m_Int1;
+  }
+
   Q_PROPERTY(int Int1 READ getInt1 WRITE setInt1)
-  SIMPL_INSTANCE_PROPERTY(int, Int2)
+  // -----------------------------------------------------------------------------
+  void setInt2(int value)
+  {
+    m_Int2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  int getInt2() const
+  {
+    return m_Int2;
+  }
+
   Q_PROPERTY(int Int2 READ getInt2 WRITE setInt2)
 
-  SIMPL_INSTANCE_PROPERTY(double, Double1)
+  // -----------------------------------------------------------------------------
+  void setDouble1(double value)
+  {
+    m_Double1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  double getDouble1() const
+  {
+    return m_Double1;
+  }
+
   Q_PROPERTY(double Double1 READ getDouble1 WRITE setDouble1)
-  SIMPL_INSTANCE_PROPERTY(double, Double2)
+  // -----------------------------------------------------------------------------
+  void setDouble2(double value)
+  {
+    m_Double2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  double getDouble2() const
+  {
+    return m_Double2;
+  }
+
   Q_PROPERTY(double Double2 READ getDouble2 WRITE setDouble2)
 
-  SIMPL_INSTANCE_PROPERTY(QString, String1)
+  // -----------------------------------------------------------------------------
+  void setString1(const QString& value)
+  {
+    m_String1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getString1() const
+  {
+    return m_String1;
+  }
+
   Q_PROPERTY(QString String1 READ getString1 WRITE setString1)
-  SIMPL_INSTANCE_PROPERTY(QString, String2)
+  // -----------------------------------------------------------------------------
+  void setString2(const QString& value)
+  {
+    m_String2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getString2() const
+  {
+    return m_String2;
+  }
+
   Q_PROPERTY(QString String2 READ getString2 WRITE setString2)
 
-  SIMPL_INSTANCE_PROPERTY(DataArrayPath, Path1)
+  // -----------------------------------------------------------------------------
+  void setPath1(const DataArrayPath& value)
+  {
+    m_Path1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataArrayPath getPath1() const
+  {
+    return m_Path1;
+  }
+
   Q_PROPERTY(DataArrayPath Path1 READ getPath1 WRITE setPath1)
-  SIMPL_INSTANCE_PROPERTY(DataArrayPath, Path2)
+  // -----------------------------------------------------------------------------
+  void setPath2(const DataArrayPath& value)
+  {
+    m_Path2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataArrayPath getPath2() const
+  {
+    return m_Path2;
+  }
+
   Q_PROPERTY(DataArrayPath Path2 READ getPath2 WRITE setPath2)
 
-  SIMPL_INSTANCE_PROPERTY(DataArrayPath, ArrayPath1)
+  // -----------------------------------------------------------------------------
+  void setArrayPath1(const DataArrayPath& value)
+  {
+    m_ArrayPath1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataArrayPath getArrayPath1() const
+  {
+    return m_ArrayPath1;
+  }
+
   Q_PROPERTY(DataArrayPath ArrayPath1 READ getArrayPath1 WRITE setArrayPath1)
-  SIMPL_INSTANCE_PROPERTY(DataArrayPath, ArrayPath2)
+  // -----------------------------------------------------------------------------
+  void setArrayPath2(const DataArrayPath& value)
+  {
+    m_ArrayPath2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataArrayPath getArrayPath2() const
+  {
+    return m_ArrayPath2;
+  }
+
   Q_PROPERTY(DataArrayPath ArrayPath2 READ getArrayPath2 WRITE setArrayPath2)
 
-  SIMPL_INSTANCE_PROPERTY(AxisAngleInput_t, AxisAngle1)
+  // -----------------------------------------------------------------------------
+  void setAxisAngle1(const AxisAngleInput_t& value)
+  {
+    m_AxisAngle1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  AxisAngleInput_t getAxisAngle1() const
+  {
+    return m_AxisAngle1;
+  }
+
   Q_PROPERTY(AxisAngleInput_t AxisAngle1 READ getAxisAngle1 WRITE setAxisAngle1)
-  SIMPL_INSTANCE_PROPERTY(AxisAngleInput_t, AxisAngle2)
+  // -----------------------------------------------------------------------------
+  void setAxisAngle2(const AxisAngleInput_t& value)
+  {
+    m_AxisAngle2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  AxisAngleInput_t getAxisAngle2() const
+  {
+    return m_AxisAngle2;
+  }
+
   Q_PROPERTY(AxisAngleInput_t AxisAngle2 READ getAxisAngle2 WRITE setAxisAngle2)
 
-  SIMPL_INSTANCE_PROPERTY(ComparisonInputs, ComparisonInputs1)
+  // -----------------------------------------------------------------------------
+  void setComparisonInputs1(const ComparisonInputs& value)
+  {
+    m_ComparisonInputs1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  ComparisonInputs getComparisonInputs1() const
+  {
+    return m_ComparisonInputs1;
+  }
+
   Q_PROPERTY(ComparisonInputs ComparisonInputs1 READ getComparisonInputs1 WRITE setComparisonInputs1)
-  SIMPL_INSTANCE_PROPERTY(ComparisonInputs, ComparisonInputs2)
+  // -----------------------------------------------------------------------------
+  void setComparisonInputs2(const ComparisonInputs& value)
+  {
+    m_ComparisonInputs2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  ComparisonInputs getComparisonInputs2() const
+  {
+    return m_ComparisonInputs2;
+  }
+
   Q_PROPERTY(ComparisonInputs ComparisonInputs2 READ getComparisonInputs2 WRITE setComparisonInputs2)
 
-  SIMPL_INSTANCE_PROPERTY(DataContainerArrayProxy, DcaProxy1)
+  // -----------------------------------------------------------------------------
+  void setDcaProxy1(const DataContainerArrayProxy& value)
+  {
+    m_DcaProxy1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataContainerArrayProxy getDcaProxy1() const
+  {
+    return m_DcaProxy1;
+  }
+
   Q_PROPERTY(DataContainerArrayProxy DcaProxy1 READ getDcaProxy1 WRITE setDcaProxy1)
-  SIMPL_INSTANCE_PROPERTY(DataContainerArrayProxy, DcaProxy2)
+  // -----------------------------------------------------------------------------
+  void setDcaProxy2(const DataContainerArrayProxy& value)
+  {
+    m_DcaProxy2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DataContainerArrayProxy getDcaProxy2() const
+  {
+    return m_DcaProxy2;
+  }
+
   Q_PROPERTY(DataContainerArrayProxy DcaProxy2 READ getDcaProxy2 WRITE setDcaProxy2)
 
-  SIMPL_INSTANCE_PROPERTY(DynamicTableData, DynamicData1)
+  // -----------------------------------------------------------------------------
+  void setDynamicData1(const DynamicTableData& value)
+  {
+    m_DynamicData1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DynamicTableData getDynamicData1() const
+  {
+    return m_DynamicData1;
+  }
+
   Q_PROPERTY(DynamicTableData DynamicData1 READ getDynamicData1 WRITE setDynamicData1)
-  SIMPL_INSTANCE_PROPERTY(DynamicTableData, DynamicData2)
+  // -----------------------------------------------------------------------------
+  void setDynamicData2(const DynamicTableData& value)
+  {
+    m_DynamicData2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DynamicTableData getDynamicData2() const
+  {
+    return m_DynamicData2;
+  }
+
   Q_PROPERTY(DynamicTableData DynamicData2 READ getDynamicData2 WRITE setDynamicData2)
 
-  SIMPL_INSTANCE_PROPERTY(FileListInfo_t, FileListInfo1)
+  // -----------------------------------------------------------------------------
+  void setFileListInfo1(const FileListInfo_t& value)
+  {
+    m_FileListInfo1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  FileListInfo_t getFileListInfo1() const
+  {
+    return m_FileListInfo1;
+  }
+
   Q_PROPERTY(FileListInfo_t FileListInfo1 READ getFileListInfo1 WRITE setFileListInfo1)
-  SIMPL_INSTANCE_PROPERTY(FileListInfo_t, FileListInfo2)
+  // -----------------------------------------------------------------------------
+  void setFileListInfo2(const FileListInfo_t& value)
+  {
+    m_FileListInfo2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  FileListInfo_t getFileListInfo2() const
+  {
+    return m_FileListInfo2;
+  }
+
   Q_PROPERTY(FileListInfo_t FileListInfo2 READ getFileListInfo2 WRITE setFileListInfo2)
 
-  SIMPL_INSTANCE_PROPERTY(IntVec3Type, IntVec3_1)
+  // -----------------------------------------------------------------------------
+  void setIntVec3_1(const IntVec3Type& value)
+  {
+    m_IntVec3_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  IntVec3Type getIntVec3_1() const
+  {
+    return m_IntVec3_1;
+  }
+
   Q_PROPERTY(IntVec3Type IntVec3_1 READ getIntVec3_1 WRITE setIntVec3_1)
-  SIMPL_INSTANCE_PROPERTY(IntVec3Type, IntVec3_2)
+  // -----------------------------------------------------------------------------
+  void setIntVec3_2(const IntVec3Type& value)
+  {
+    m_IntVec3_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  IntVec3Type getIntVec3_2() const
+  {
+    return m_IntVec3_2;
+  }
+
   Q_PROPERTY(IntVec3Type IntVec3_2 READ getIntVec3_2 WRITE setIntVec3_2)
 
-  SIMPL_INSTANCE_PROPERTY(FloatVec3Type, FloatVec3_1)
+  // -----------------------------------------------------------------------------
+  void setFloatVec3_1(const FloatVec3Type& value)
+  {
+    m_FloatVec3_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  FloatVec3Type getFloatVec3_1() const
+  {
+    return m_FloatVec3_1;
+  }
+
   Q_PROPERTY(FloatVec3Type FloatVec3_1 READ getFloatVec3_1 WRITE setFloatVec3_1)
-  SIMPL_INSTANCE_PROPERTY(FloatVec3Type, FloatVec3_2)
+  // -----------------------------------------------------------------------------
+  void setFloatVec3_2(const FloatVec3Type& value)
+  {
+    m_FloatVec3_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  FloatVec3Type getFloatVec3_2() const
+  {
+    return m_FloatVec3_2;
+  }
+
   Q_PROPERTY(FloatVec3Type FloatVec3_2 READ getFloatVec3_2 WRITE setFloatVec3_2)
 
-  SIMPL_INSTANCE_PROPERTY(Float2ndOrderPoly_t, Float2ndOrderPoly_1)
+  // -----------------------------------------------------------------------------
+  void setFloat2ndOrderPoly_1(const Float2ndOrderPoly_t& value)
+  {
+    m_Float2ndOrderPoly_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float2ndOrderPoly_t getFloat2ndOrderPoly_1() const
+  {
+    return m_Float2ndOrderPoly_1;
+  }
+
   Q_PROPERTY(Float2ndOrderPoly_t Float2ndOrderPoly_1 READ getFloat2ndOrderPoly_1 WRITE setFloat2ndOrderPoly_1)
-  SIMPL_INSTANCE_PROPERTY(Float2ndOrderPoly_t, Float2ndOrderPoly_2)
+  // -----------------------------------------------------------------------------
+  void setFloat2ndOrderPoly_2(const Float2ndOrderPoly_t& value)
+  {
+    m_Float2ndOrderPoly_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float2ndOrderPoly_t getFloat2ndOrderPoly_2() const
+  {
+    return m_Float2ndOrderPoly_2;
+  }
+
   Q_PROPERTY(Float2ndOrderPoly_t Float2ndOrderPoly_2 READ getFloat2ndOrderPoly_2 WRITE setFloat2ndOrderPoly_2)
 
-  SIMPL_INSTANCE_PROPERTY(Float3rdOrderPoly_t, Float3rdOrderPoly_1)
+  // -----------------------------------------------------------------------------
+  void setFloat3rdOrderPoly_1(const Float3rdOrderPoly_t& value)
+  {
+    m_Float3rdOrderPoly_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float3rdOrderPoly_t getFloat3rdOrderPoly_1() const
+  {
+    return m_Float3rdOrderPoly_1;
+  }
+
   Q_PROPERTY(Float3rdOrderPoly_t Float3rdOrderPoly_1 READ getFloat3rdOrderPoly_1 WRITE setFloat3rdOrderPoly_1)
-  SIMPL_INSTANCE_PROPERTY(Float3rdOrderPoly_t, Float3rdOrderPoly_2)
+  // -----------------------------------------------------------------------------
+  void setFloat3rdOrderPoly_2(const Float3rdOrderPoly_t& value)
+  {
+    m_Float3rdOrderPoly_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float3rdOrderPoly_t getFloat3rdOrderPoly_2() const
+  {
+    return m_Float3rdOrderPoly_2;
+  }
+
   Q_PROPERTY(Float3rdOrderPoly_t Float3rdOrderPoly_2 READ getFloat3rdOrderPoly_2 WRITE setFloat3rdOrderPoly_2)
 
-  SIMPL_INSTANCE_PROPERTY(Float4thOrderPoly_t, Float4thOrderPoly_1)
+  // -----------------------------------------------------------------------------
+  void setFloat4thOrderPoly_1(const Float4thOrderPoly_t& value)
+  {
+    m_Float4thOrderPoly_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float4thOrderPoly_t getFloat4thOrderPoly_1() const
+  {
+    return m_Float4thOrderPoly_1;
+  }
+
   Q_PROPERTY(Float4thOrderPoly_t Float4thOrderPoly_1 READ getFloat4thOrderPoly_1 WRITE setFloat4thOrderPoly_1)
-  SIMPL_INSTANCE_PROPERTY(Float4thOrderPoly_t, Float4thOrderPoly_2)
+  // -----------------------------------------------------------------------------
+  void setFloat4thOrderPoly_2(const Float4thOrderPoly_t& value)
+  {
+    m_Float4thOrderPoly_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  Float4thOrderPoly_t getFloat4thOrderPoly_2() const
+  {
+    return m_Float4thOrderPoly_2;
+  }
+
   Q_PROPERTY(Float4thOrderPoly_t Float4thOrderPoly_2 READ getFloat4thOrderPoly_2 WRITE setFloat4thOrderPoly_2)
 
-  SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DataArrayPaths1)
+  // -----------------------------------------------------------------------------
+  void setDataArrayPaths1(const QVector<DataArrayPath>& value)
+  {
+    m_DataArrayPaths1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QVector<DataArrayPath> getDataArrayPaths1() const
+  {
+    return m_DataArrayPaths1;
+  }
+
   Q_PROPERTY(QVector<DataArrayPath> DataArrayPaths1 READ getDataArrayPaths1 WRITE setDataArrayPaths1)
-  SIMPL_INSTANCE_PROPERTY(QVector<DataArrayPath>, DataArrayPaths2)
+  // -----------------------------------------------------------------------------
+  void setDataArrayPaths2(const QVector<DataArrayPath>& value)
+  {
+    m_DataArrayPaths2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QVector<DataArrayPath> getDataArrayPaths2() const
+  {
+    return m_DataArrayPaths2;
+  }
+
   Q_PROPERTY(QVector<DataArrayPath> DataArrayPaths2 READ getDataArrayPaths2 WRITE setDataArrayPaths2)
 
-  SIMPL_INSTANCE_PROPERTY(ShapeType::Types, ShapeTypeVector_1)
+  // -----------------------------------------------------------------------------
+  void setShapeTypeVector_1(const ShapeType::Types& value)
+  {
+    m_ShapeTypeVector_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  ShapeType::Types getShapeTypeVector_1() const
+  {
+    return m_ShapeTypeVector_1;
+  }
+
   Q_PROPERTY(ShapeType::Types ShapeTypeVector_1 READ getShapeTypeVector_1 WRITE setShapeTypeVector_1)
-  SIMPL_INSTANCE_PROPERTY(ShapeType::Types, ShapeTypeVector_2)
+  // -----------------------------------------------------------------------------
+  void setShapeTypeVector_2(const ShapeType::Types& value)
+  {
+    m_ShapeTypeVector_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  ShapeType::Types getShapeTypeVector_2() const
+  {
+    return m_ShapeTypeVector_2;
+  }
+
   Q_PROPERTY(ShapeType::Types ShapeTypeVector_2 READ getShapeTypeVector_2 WRITE setShapeTypeVector_2)
 
-  SIMPL_INSTANCE_PROPERTY(PhaseType::Types, PhaseTypeVector_1)
+  // -----------------------------------------------------------------------------
+  void setPhaseTypeVector_1(const PhaseType::Types& value)
+  {
+    m_PhaseTypeVector_1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  PhaseType::Types getPhaseTypeVector_1() const
+  {
+    return m_PhaseTypeVector_1;
+  }
+
   Q_PROPERTY(PhaseType::Types::Types PhaseTypeVector_1 READ getPhaseTypeVector_1 WRITE setPhaseTypeVector_1)
-  SIMPL_INSTANCE_PROPERTY(PhaseType::Types, PhaseTypeVector_2)
+  // -----------------------------------------------------------------------------
+  void setPhaseTypeVector_2(const PhaseType::Types& value)
+  {
+    m_PhaseTypeVector_2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  PhaseType::Types getPhaseTypeVector_2() const
+  {
+    return m_PhaseTypeVector_2;
+  }
+
   Q_PROPERTY(PhaseType::Types PhaseTypeVector_2 READ getPhaseTypeVector_2 WRITE setPhaseTypeVector_2)
 
   //  SIMPL_INSTANCE_PROPERTY(UInt32Vector_t, UInt32Vector_1)
@@ -332,9 +750,31 @@ class FilterParametersRWTest
 
   typedef QPair<double, double> DoublesPair;
 
-  SIMPL_INSTANCE_PROPERTY(DoublesPair, Pair1)
+  // -----------------------------------------------------------------------------
+  void setPair1(const DoublesPair& value)
+  {
+    m_Pair1 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DoublesPair getPair1() const
+  {
+    return m_Pair1;
+  }
+
   Q_PROPERTY(DoublesPair Pair1 READ getPair1 WRITE setPair1)
-  SIMPL_INSTANCE_PROPERTY(DoublesPair, Pair2)
+  // -----------------------------------------------------------------------------
+  void setPair2(const DoublesPair& value)
+  {
+    m_Pair2 = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  DoublesPair getPair2() const
+  {
+    return m_Pair2;
+  }
+
   Q_PROPERTY(DoublesPair Pair2 READ getPair2 WRITE setPair2)
 
   // -----------------------------------------------------------------------------
@@ -973,6 +1413,47 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   }
 
 private:
+  bool m_Bool1 = {};
+  bool m_Bool2 = {};
+  int m_Int1 = {};
+  int m_Int2 = {};
+  double m_Double1 = {};
+  double m_Double2 = {};
+  QString m_String1 = {};
+  QString m_String2 = {};
+  DataArrayPath m_Path1 = {};
+  DataArrayPath m_Path2 = {};
+  DataArrayPath m_ArrayPath1 = {};
+  DataArrayPath m_ArrayPath2 = {};
+  AxisAngleInput_t m_AxisAngle1 = {};
+  AxisAngleInput_t m_AxisAngle2 = {};
+  ComparisonInputs m_ComparisonInputs1 = {};
+  ComparisonInputs m_ComparisonInputs2 = {};
+  DataContainerArrayProxy m_DcaProxy1 = {};
+  DataContainerArrayProxy m_DcaProxy2 = {};
+  DynamicTableData m_DynamicData1 = {};
+  DynamicTableData m_DynamicData2 = {};
+  FileListInfo_t m_FileListInfo1 = {};
+  FileListInfo_t m_FileListInfo2 = {};
+  IntVec3Type m_IntVec3_1 = {};
+  IntVec3Type m_IntVec3_2 = {};
+  FloatVec3Type m_FloatVec3_1 = {};
+  FloatVec3Type m_FloatVec3_2 = {};
+  Float2ndOrderPoly_t m_Float2ndOrderPoly_1 = {};
+  Float2ndOrderPoly_t m_Float2ndOrderPoly_2 = {};
+  Float3rdOrderPoly_t m_Float3rdOrderPoly_1 = {};
+  Float3rdOrderPoly_t m_Float3rdOrderPoly_2 = {};
+  Float4thOrderPoly_t m_Float4thOrderPoly_1 = {};
+  Float4thOrderPoly_t m_Float4thOrderPoly_2 = {};
+  QVector<DataArrayPath> m_DataArrayPaths1 = {};
+  QVector<DataArrayPath> m_DataArrayPaths2 = {};
+  ShapeType::Types m_ShapeTypeVector_1 = {};
+  ShapeType::Types m_ShapeTypeVector_2 = {};
+  PhaseType::Types m_PhaseTypeVector_1 = {};
+  PhaseType::Types m_PhaseTypeVector_2 = {};
+  DoublesPair m_Pair1 = {};
+  DoublesPair m_Pair2 = {};
+
   FilterParametersRWTest(const FilterParametersRWTest&); // Copy Constructor Not Implemented
   void operator=(const FilterParametersRWTest&);         // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index 954d3a86eb..6b94f4ad14 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -102,3 +102,52 @@ void ThirdOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = obj;
   }
 }
+
+// -----------------------------------------------------------------------------
+ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::New()
+{
+  Pointer sharedPtr(new(ThirdOrderPolynomialFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ThirdOrderPolynomialFilterParameter::getNameOfClass() const
+{
+  return QString("ThirdOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString ThirdOrderPolynomialFilterParameter::ClassName()
+{
+  return QString("ThirdOrderPolynomialFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void ThirdOrderPolynomialFilterParameter::setSetterCallback(const ThirdOrderPolynomialFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ThirdOrderPolynomialFilterParameter::SetterCallbackType ThirdOrderPolynomialFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void ThirdOrderPolynomialFilterParameter::setGetterCallback(const ThirdOrderPolynomialFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+ThirdOrderPolynomialFilterParameter::GetterCallbackType ThirdOrderPolynomialFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index 2bb3a1061e..70ba6446a6 100755
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -64,9 +66,23 @@
 class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(ThirdOrderPolynomialFilterParameter)
-  SIMPL_STATIC_NEW_MACRO(ThirdOrderPolynomialFilterParameter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ThirdOrderPolynomialFilterParameter, FilterParameter)
+  using Self = ThirdOrderPolynomialFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ThirdOrderPolynomialFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ThirdOrderPolynomialFilterParameter
+   */
+  static QString ClassName();
 
   typedef std::function<void(Float3rdOrderPoly_t)> SetterCallbackType;
   typedef std::function<Float3rdOrderPoly_t(void)> GetterCallbackType;
@@ -118,14 +134,30 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
     * that this FilterParameter subclass represents.
     * @return The SetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const ThirdOrderPolynomialFilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    ThirdOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const ThirdOrderPolynomialFilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    ThirdOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
 
   protected:
     /**
@@ -139,5 +171,9 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
   ThirdOrderPolynomialFilterParameter(ThirdOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
   ThirdOrderPolynomialFilterParameter& operator=(const ThirdOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   ThirdOrderPolynomialFilterParameter& operator=(ThirdOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  ThirdOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ThirdOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 7a54c001e9..2f59acf008 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -95,3 +95,52 @@ void UInt64FilterParameter::writeJson(QJsonObject& json)
     json[getPropertyName()] = strvalue; // Store the value as a string so we maintain all the fidelity of the value
   }
 }
+
+// -----------------------------------------------------------------------------
+UInt64FilterParameter::Pointer UInt64FilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+UInt64FilterParameter::Pointer UInt64FilterParameter::New()
+{
+  Pointer sharedPtr(new(UInt64FilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString UInt64FilterParameter::getNameOfClass() const
+{
+  return QString("UInt64FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString UInt64FilterParameter::ClassName()
+{
+  return QString("UInt64FilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void UInt64FilterParameter::setSetterCallback(const UInt64FilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+UInt64FilterParameter::SetterCallbackType UInt64FilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void UInt64FilterParameter::setGetterCallback(const UInt64FilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+UInt64FilterParameter::GetterCallbackType UInt64FilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 41f8f04894..8639a80f29 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -61,9 +63,23 @@
 class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
 {
   public:
-    SIMPL_SHARED_POINTERS(UInt64FilterParameter)
-    SIMPL_STATIC_NEW_MACRO(UInt64FilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(UInt64FilterParameter, FilterParameter)
+    using Self = UInt64FilterParameter;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for UInt64FilterParameter
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for UInt64FilterParameter
+     */
+    static QString ClassName();
 
     using SetterCallbackType = std::function<void(uint64_t)>;
     using GetterCallbackType = std::function<uint64_t(void)>;
@@ -113,27 +129,46 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
     * that this FilterParameter subclass represents.
     * from the filter parameter.
     */
-    SIMPL_INSTANCE_PROPERTY(SetterCallbackType, SetterCallback)
+    /**
+     * @brief Setter property for SetterCallback
+     */
+    void setSetterCallback(const UInt64FilterParameter::SetterCallbackType& value);
+    /**
+     * @brief Getter property for SetterCallback
+     * @return Value of SetterCallback
+     */
+    UInt64FilterParameter::SetterCallbackType getSetterCallback() const;
 
     /**
     * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
     * that this FilterParameter subclass represents.
     * @return The GetterCallback
     */
-    SIMPL_INSTANCE_PROPERTY(GetterCallbackType, GetterCallback)
-
+    /**
+     * @brief Setter property for GetterCallback
+     */
+    void setGetterCallback(const UInt64FilterParameter::GetterCallbackType& value);
+    /**
+     * @brief Getter property for GetterCallback
+     * @return Value of GetterCallback
+     */
+    UInt64FilterParameter::GetterCallbackType getGetterCallback() const;
 
-    protected:
-      /**
-       * @brief UInt64FilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-      UInt64FilterParameter();
+  protected:
+    /**
+     * @brief UInt64FilterParameter The default constructor.  It is protected because this
+     * filter parameter should only be instantiated using its New(...) function or short-form macro.
+     */
+    UInt64FilterParameter();
 
-    public:
-      UInt64FilterParameter(const UInt64FilterParameter&) = delete;            // Copy Constructor Not Implemented
-      UInt64FilterParameter(UInt64FilterParameter&&) = delete;                 // Move Constructor Not Implemented
-      UInt64FilterParameter& operator=(const UInt64FilterParameter&) = delete; // Copy Assignment Not Implemented
-      UInt64FilterParameter& operator=(UInt64FilterParameter&&) = delete;      // Move Assignment Not Implemented
+  public:
+    UInt64FilterParameter(const UInt64FilterParameter&) = delete;            // Copy Constructor Not Implemented
+    UInt64FilterParameter(UInt64FilterParameter&&) = delete;                 // Move Constructor Not Implemented
+    UInt64FilterParameter& operator=(const UInt64FilterParameter&) = delete; // Copy Assignment Not Implemented
+    UInt64FilterParameter& operator=(UInt64FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    UInt64FilterParameter::SetterCallbackType m_SetterCallback = {};
+    UInt64FilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
index 1510d55779..ab021eeccf 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
@@ -66,3 +66,28 @@ QString UnknownFilterParameter::getWidgetType() const
 {
   return QString("UnknownWidget");
 }
+
+// -----------------------------------------------------------------------------
+UnknownFilterParameter::Pointer UnknownFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+UnknownFilterParameter::Pointer UnknownFilterParameter::New()
+{
+  Pointer sharedPtr(new(UnknownFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString UnknownFilterParameter::getNameOfClass() const
+{
+  return QString("UnknownFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString UnknownFilterParameter::ClassName()
+{
+  return QString("UnknownFilterParameter");
+}
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index e6b2121b17..5e08eb38b6 100755
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -36,6 +36,8 @@
 #pragma once
 
 
+#include <memory>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
@@ -45,25 +47,38 @@
 class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
 {
 public:
-  SIMPL_SHARED_POINTERS(UnknownFilterParameter)
-    SIMPL_STATIC_NEW_MACRO(UnknownFilterParameter)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(UnknownFilterParameter, FilterParameter)
+  using Self = UnknownFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief New This function instantiates an instance of the UnknownFilterParameter.
+  static Pointer New();
 
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category, int groupIndex = -1);
+  /**
+   * @brief Returns the name of the class for UnknownFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for UnknownFilterParameter
+   */
+  static QString ClassName();
 
-    ~UnknownFilterParameter() override;
+  /**
+   * @brief New This function instantiates an instance of the UnknownFilterParameter.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex = -1);
+
+  ~UnknownFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -84,5 +99,7 @@ class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
     UnknownFilterParameter(UnknownFilterParameter&&) = delete;      // Move Constructor Not Implemented
     UnknownFilterParameter& operator=(const UnknownFilterParameter&) = delete; // Copy Assignment Not Implemented
     UnknownFilterParameter& operator=(UnknownFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.cpp b/Source/SIMPLib/Filtering/AbstractComparison.cpp
index fe47c30cab..7adc279a44 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.cpp
+++ b/Source/SIMPLib/Filtering/AbstractComparison.cpp
@@ -87,4 +87,21 @@ int AbstractComparison::getUnionOperator()
 void AbstractComparison::setUnionOperator(int unionOperator)
 {
   m_unionOperator = unionOperator;
-}
\ No newline at end of file
+}
+// -----------------------------------------------------------------------------
+AbstractComparison::Pointer AbstractComparison::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractComparison::getNameOfClass() const
+{
+  return QString("AbstractComparison");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractComparison::ClassName()
+{
+  return QString("AbstractComparison");
+}
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index 63295e2846..7a20e51683 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -35,9 +35,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
 #include <QtCore/QJsonObject>
 
@@ -47,11 +48,29 @@
 */
 class SIMPLib_EXPORT AbstractComparison
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(AbstractComparison)
+  PYB11_SHARED_POINTERS(AbstractComparison)
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
+#endif
+
 public:
-  SIMPL_SHARED_POINTERS(AbstractComparison)
-  SIMPL_TYPE_MACRO(AbstractComparison)
+  using Self = AbstractComparison;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractComparison
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for AbstractComparison
+   */
+  static QString ClassName();
 
   virtual ~AbstractComparison();
 
@@ -94,5 +113,7 @@ class SIMPLib_EXPORT AbstractComparison
   int m_unionOperator;
 
   AbstractComparison();
+
+private:
 };
 
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index a08d2d1338..06e81d41f2 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -33,6 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "AbstractDecisionFilter.h"
 
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
@@ -133,7 +135,7 @@ AbstractFilter::Pointer AbstractDecisionFilter::newFilterInstance(bool copyFilte
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractDecisionFilter::getCompiledLibraryName() const
+QString AbstractDecisionFilter::getCompiledLibraryName() const
 {
   return "";
 }
@@ -141,7 +143,7 @@ const QString AbstractDecisionFilter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractDecisionFilter::getGroupName() const
+QString AbstractDecisionFilter::getGroupName() const
 {
   return "";
 }
@@ -149,7 +151,7 @@ const QString AbstractDecisionFilter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid AbstractDecisionFilter::getUuid()
+QUuid AbstractDecisionFilter::getUuid() const
 {
   return QUuid("{e4fcd394-6ac6-5559-98a1-1945a0da3427}");
 }
@@ -157,7 +159,7 @@ const QUuid AbstractDecisionFilter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractDecisionFilter::getSubGroupName() const
+QString AbstractDecisionFilter::getSubGroupName() const
 {
   return "";
 }
@@ -165,7 +167,36 @@ const QString AbstractDecisionFilter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractDecisionFilter::getHumanLabel() const
+QString AbstractDecisionFilter::getHumanLabel() const
 {
   return "";
 }
+
+// -----------------------------------------------------------------------------
+AbstractDecisionFilter::Pointer AbstractDecisionFilter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<AbstractDecisionFilter> AbstractDecisionFilter::New()
+{
+  struct make_shared_enabler : public AbstractDecisionFilter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractDecisionFilter::getNameOfClass() const
+{
+  return QString("AbstractDecisionFilter");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractDecisionFilter::ClassName()
+{
+  return QString("AbstractDecisionFilter");
+}
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index 704a7bedf4..f76d8a16ef 100755
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -35,7 +35,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -47,9 +48,32 @@ class AbstractDecisionFilter : public AbstractFilter
 {
   Q_OBJECT
 public:
-  SIMPL_SHARED_POINTERS(AbstractDecisionFilter)
-  SIMPL_FILTER_NEW_MACRO(AbstractDecisionFilter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractDecisionFilter, AbstractFilter)
+  using Self = AbstractDecisionFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for AbstractDecisionFilter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractDecisionFilter
+   */
+  static QString ClassName();
 
   ~AbstractDecisionFilter() override;
 
@@ -62,7 +86,7 @@ class AbstractDecisionFilter : public AbstractFilter
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -72,23 +96,23 @@ class AbstractDecisionFilter : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -153,5 +177,7 @@ class AbstractDecisionFilter : public AbstractFilter
   AbstractDecisionFilter(AbstractDecisionFilter&&) = delete;      // Move Constructor Not Implemented
   AbstractDecisionFilter& operator=(const AbstractDecisionFilter&) = delete; // Copy Assignment Not Implemented
   AbstractDecisionFilter& operator=(AbstractDecisionFilter&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index f91d0f41c2..9b3bf2410e 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -35,14 +35,18 @@
 
 #include "AbstractFilter.h"
 
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/Filtering/IFilterFactory.hpp"
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
 #include "SIMPLib/Plugin/PluginManager.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/FilterManager.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -441,7 +445,7 @@ void AbstractFilter::copyFilterParameterInstanceVariables(AbstractFilter* filter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getGroupName() const
+QString AbstractFilter::getGroupName() const
 {
   return "YOUR CLASS SHOULD IMPLEMENT THIS";
 }
@@ -449,7 +453,7 @@ const QString AbstractFilter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getSubGroupName() const
+QString AbstractFilter::getSubGroupName() const
 {
   return "YOUR CLASS SHOULD IMPLEMENT THIS";
 }
@@ -457,7 +461,7 @@ const QString AbstractFilter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getHumanLabel() const
+QString AbstractFilter::getHumanLabel() const
 {
   return "YOUR CLASS SHOULD IMPLEMENT THIS";
 }
@@ -465,7 +469,7 @@ const QString AbstractFilter::getHumanLabel() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getBrandingString() const
+QString AbstractFilter::getBrandingString() const
 {
   return "";
 }
@@ -473,7 +477,7 @@ const QString AbstractFilter::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getCompiledLibraryName() const
+QString AbstractFilter::getCompiledLibraryName() const
 {
   return "";
 }
@@ -481,7 +485,7 @@ const QString AbstractFilter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::getFilterVersion() const
+QString AbstractFilter::getFilterVersion() const
 {
   return QString("0.0.0");
 }
@@ -489,26 +493,27 @@ const QString AbstractFilter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid AbstractFilter::getUuid()
+QUuid AbstractFilter::getUuid() const
 {
   if(m_Uuid.isNull())
   {
-    uint l = 100;
-    ushort w1 = 200;
-    ushort w2 = 300;
-
-    QString libName = getCompiledLibraryName();
-    uchar b[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    int32_t i = 0;
-    while(i < 8 && i < libName.size())
-    {
-      b[i] = static_cast<uint8_t>(libName.at(i).toLatin1());
-      i++;
-    }
-    QUuid uuid = QUuid(l, w1, w2, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
-    QString nameSpace = QString("%1 %2").arg(getNameOfClass()).arg(getHumanLabel());
-    QUuid p1 = QUuid::createUuidV5(uuid, nameSpace);
-    m_Uuid = p1;
+    // We cannot actually set the internal m_Uuid because the method is marked const.
+    //    uint l = 100;
+    //    ushort w1 = 200;
+    //    ushort w2 = 300;
+
+    //    QString libName = getCompiledLibraryName();
+    //    uchar b[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    //    int32_t i = 0;
+    //    while(i < 8 && i < libName.size())
+    //    {
+    //      b[i] = static_cast<uint8_t>(libName.at(i).toLatin1());
+    //      i++;
+    //    }
+    //    QUuid uuid = QUuid(l, w1, w2, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
+    //    QString nameSpace = QString("%1 %2").arg(getNameOfClass()).arg(getHumanLabel());
+    //    QUuid p1 = QUuid::createUuidV5(uuid, nameSpace);
+    //    m_Uuid = p1;
   }
   return m_Uuid;
 }
@@ -516,7 +521,7 @@ const QUuid AbstractFilter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString AbstractFilter::generateHtmlSummary() const
+QString AbstractFilter::generateHtmlSummary() const
 {
   QString html;
   QTextStream ss(&html);
@@ -659,3 +664,136 @@ void AbstractFilter::addPathRename(const DataArrayPath& oldPath, const DataArray
 {
   m_RenamedPaths.push_back(std::make_pair(oldPath, newPath));
 }
+
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer AbstractFilter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractFilter::getNameOfClass() const
+{
+  return QString("AbstractFilter");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractFilter::ClassName()
+{
+  return QString("AbstractFilter");
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer AbstractFilter::New()
+{
+  Pointer sharedPtr(new(AbstractFilter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setDataContainerArray(const DataContainerArray::Pointer& value)
+{
+  m_DataContainerArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArray::Pointer AbstractFilter::getDataContainerArray() const
+{
+  return m_DataContainerArray;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setFilterParameters(const FilterParameterVectorType& value)
+{
+  m_FilterParameters = value;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameterVectorType AbstractFilter::getFilterParameters() const
+{
+  return m_FilterParameters;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setInPreflight(bool value)
+{
+  m_InPreflight = value;
+}
+
+// -----------------------------------------------------------------------------
+bool AbstractFilter::getInPreflight() const
+{
+  return m_InPreflight;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setEnabled(bool value)
+{
+  m_Enabled = value;
+}
+
+// -----------------------------------------------------------------------------
+bool AbstractFilter::getEnabled() const
+{
+  return m_Enabled;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setRemoving(bool value)
+{
+  m_Removing = value;
+}
+
+// -----------------------------------------------------------------------------
+bool AbstractFilter::getRemoving() const
+{
+  return m_Removing;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setPipelineIndex(int value)
+{
+  m_PipelineIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractFilter::getPipelineIndex() const
+{
+  return m_PipelineIndex;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setPreviousFilter(const AbstractFilter::WeakPointer& value)
+{
+  m_PreviousFilter = value;
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter::WeakPointer AbstractFilter::getPreviousFilter() const
+{
+  return m_PreviousFilter;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractFilter::setNextFilter(const AbstractFilter::WeakPointer& value)
+{
+  m_NextFilter = value;
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter::WeakPointer AbstractFilter::getNextFilter() const
+{
+  return m_NextFilter;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractFilter::getErrorCode() const
+{
+  return m_ErrorCode;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractFilter::getWarningCode() const
+{
+  return m_WarningCode;
+}
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index fa046cb691..f513e0063b 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -35,20 +35,23 @@
 
 #pragma once
 
+#include <memory>
+
 #include <map>
 
 #include <QtCore/QString>
 #include <QtCore/QUuid>
+#include <QtCore/QJsonObject>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/SIMPLib.h"
 
 class AbstractFilterParametersReader;
 class ISIMPLibPlugin;
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 /**
  * @class AbstractFilter AbstractFilter.h DREAM3DLib/Common/AbstractFilter.h
@@ -76,7 +79,11 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   Q_PROPERTY(bool Removing READ getRemoving WRITE setRemoving)
   
   // This line MUST be first when exposing a class and properties to Python
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(AbstractFilter)
+  PYB11_SHARED_POINTERS(AbstractFilter)
+  PYB11_STATIC_NEW_MACRO(AbstractFilter)
   PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)  
   PYB11_PROPERTY(QString GroupName READ getGroupName)
   PYB11_PROPERTY(QString SubGroupName READ getSubGroupName)
@@ -100,15 +107,30 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
-  
+#endif
+
   // Friend declarations for RenameDataPath so that it can set and check the instance's created data by ID.
   friend void RenameDataPath::AlertFilterCreatedPath(AbstractFilter*, RenameDataPath::DataID_t, const DataArrayPath&);
 
 public:
-  SIMPL_SHARED_POINTERS(AbstractFilter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractFilter, Observable)
-  SIMPL_STATIC_NEW_MACRO(AbstractFilter)
-    
+  using Self = AbstractFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractFilter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractFilter
+   */
+  static QString ClassName();
+
+  static Pointer New();
+
   ~AbstractFilter() override;
 
   /**
@@ -123,34 +145,34 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * top level sorting in the GUI
    * @return Group name
    */
-  virtual const QString getGroupName() const;
+  virtual QString getGroupName() const;
 
   /**
    * @brief getSubGroupName Returns the subgroup name for the filter, which determines its
    * second level sorting in the GUI
    * @return Subgroup name
    */
-  virtual const QString getSubGroupName() const;
+  virtual QString getSubGroupName() const;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  virtual const QUuid getUuid();
-  
+  virtual QUuid getUuid() const;
+
   /**
    * @brief getHumanLabel Returns the human label for the filter, which determines its
    * primary labeling inthe GUI
    * @return Human lable
    */
-  virtual const QString getHumanLabel() const;
+  virtual QString getHumanLabel() const;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with a specific plugin
    * @return Branding string
    */
-  virtual const QString getBrandingString() const;
+  virtual QString getBrandingString() const;
 
   /**
    * @brief getCompiledLibraryName Returns the library name for the filter, which is the
@@ -158,13 +180,13 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * plugin
    * @return Compiled library name
    */
-  virtual const QString getCompiledLibraryName() const;
+  virtual QString getCompiledLibraryName() const;
 
   /**
    * @brief generateHtmlSummary Generates a brief HTML summary of the filter
    * @return HTML summary
    */
-  virtual const QString generateHtmlSummary() const;
+  virtual QString generateHtmlSummary() const;
 
   /**
    * @brief setupFilterParameters Instantiates the filter parameters that are allowed
@@ -242,21 +264,69 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * value is an empty string.
    * @return
    */
-  virtual const QString getFilterVersion() const;
+  virtual QString getFilterVersion() const;
 
-  SIMPL_INSTANCE_PROPERTY(DataContainerArray::Pointer, DataContainerArray)
+  /**
+   * @brief Setter property for DataContainerArray
+   */
+  void setDataContainerArray(const DataContainerArrayShPtrType& value);
+  /**
+   * @brief Getter property for DataContainerArray
+   * @return Value of DataContainerArray
+   */
+  DataContainerArrayShPtrType getDataContainerArray() const;
 
-  SIMPL_INSTANCE_PROPERTY(FilterParameterVectorType, FilterParameters)
+  /**
+   * @brief Setter property for FilterParameters
+   */
+  void setFilterParameters(const FilterParameterVectorType& value);
+  /**
+   * @brief Getter property for FilterParameters
+   * @return Value of FilterParameters
+   */
+  FilterParameterVectorType getFilterParameters() const;
 
-  SIMPL_GET_PROPERTY(int, ErrorCode)
+  /**
+   * @brief Getter property for ErrorCode
+   * @return Value of ErrorCode
+   */
+  int getErrorCode() const;
 
-  SIMPL_GET_PROPERTY(int, WarningCode)
+  /**
+   * @brief Getter property for WarningCode
+   * @return Value of WarningCode
+   */
+  int getWarningCode() const;
 
-  SIMPL_INSTANCE_PROPERTY(bool, InPreflight)
+  /**
+   * @brief Setter property for InPreflight
+   */
+  void setInPreflight(bool value);
+  /**
+   * @brief Getter property for InPreflight
+   * @return Value of InPreflight
+   */
+  bool getInPreflight() const;
 
-  SIMPL_INSTANCE_PROPERTY(bool, Enabled)
+  /**
+   * @brief Setter property for Enabled
+   */
+  void setEnabled(bool value);
+  /**
+   * @brief Getter property for Enabled
+   * @return Value of Enabled
+   */
+  bool getEnabled() const;
 
-  SIMPL_INSTANCE_PROPERTY(bool, Removing)
+  /**
+   * @brief Setter property for Removing
+   */
+  void setRemoving(bool value);
+  /**
+   * @brief Getter property for Removing
+   * @return Value of Removing
+   */
+  bool getRemoving() const;
 
   // ------------------------------
   // These functions allow interogating the position the filter is in the pipeline and the previous and next filters
@@ -265,16 +335,41 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   /**
   * @brief This property tells which index the filter is in a pipeline
   */
-  SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+  /**
+   * @brief Setter property for PipelineIndex
+   */
+  void setPipelineIndex(int value);
+  /**
+   * @brief Getter property for PipelineIndex
+   * @return Value of PipelineIndex
+   */
+  int getPipelineIndex() const;
 
   /**
   * @brief Returns the previous filter
   */
-  SIMPL_INSTANCE_PROPERTY(AbstractFilter::WeakPointer, PreviousFilter)
+  /**
+   * @brief Setter property for PreviousFilter
+   */
+  void setPreviousFilter(const AbstractFilter::WeakPointer& value);
+  /**
+   * @brief Getter property for PreviousFilter
+   * @return Value of PreviousFilter
+   */
+  AbstractFilter::WeakPointer getPreviousFilter() const;
+
   /**
   * @brief Returns the next filter in the pipeline
   */
-  SIMPL_INSTANCE_PROPERTY(AbstractFilter::WeakPointer, NextFilter)
+  /**
+   * @brief Setter property for NextFilter
+   */
+  void setNextFilter(const AbstractFilter::WeakPointer& value);
+  /**
+   * @brief Getter property for NextFilter
+   * @return Value of NextFilter
+   */
+  AbstractFilter::WeakPointer getNextFilter() const;
 
   /**
    * @brief clearErrorCondition
@@ -443,7 +538,7 @@ public slots:
    * the ID is used and the paths match, return false.  If the ID has not been used, add the path
    * to the createdPaths map.
    */
-  bool checkIfPathRenamed(const RenameDataPath::DataID_t id, const DataArrayPath& path);
+  bool checkIfPathRenamed(RenameDataPath::DataID_t id, const DataArrayPath& path);
 
   /**
    * @brief Adds the specified change to the list of renamed DataArrayPaths.
@@ -460,6 +555,15 @@ protected slots:
   virtual void cleanupFilter();
 
 private:
+  DataContainerArrayShPtrType m_DataContainerArray = {};
+  FilterParameterVectorType m_FilterParameters = {};
+  bool m_InPreflight = {};
+  bool m_Enabled = {};
+  bool m_Removing = {};
+  int m_PipelineIndex = {};
+  AbstractFilter::WeakPointer m_PreviousFilter = {};
+  AbstractFilter::WeakPointer m_NextFilter = {};
+
   bool m_Cancel;
   QUuid m_Uuid;
   int m_ErrorCode = 0;
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index 60c61b65fe..b61e347fcb 100755
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -40,10 +40,10 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"  // for SIMPL_PIMPL_PROPERTY_DECL
 
 typedef struct
 {
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ComparisonInput_t)
 
   PYB11_PROPERTY(QString dataContainerName)
@@ -51,6 +51,7 @@ typedef struct
   PYB11_PROPERTY(QString attributeArrayName)
   PYB11_PROPERTY(int compOperator) 
   PYB11_PROPERTY(double compValue)
+#endif
 
   QString dataContainerName;
   QString attributeMatrixName;
@@ -84,8 +85,6 @@ typedef struct
 
 } ComparisonInput_t;
 
-
-
 /**
  * @class ComparisonInputs ComparisonInputs.h DREAM3DLib/Common/ComparisonInputs.h
  * @brief  This class
@@ -97,6 +96,8 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
 {
   Q_OBJECT
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ComparisonInputs)
   PYB11_CREATION()  
   PYB11_PROPERTY(QVector<ComparisonInput_t> Inputs READ getInputs)
@@ -105,6 +106,8 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
   //PYB11_METHOD(ComparisonInput_t& getInput ARGS index)
   //PYB11_METHOD(ComparisonInput_t& operator[] ARGS index)
   PYB11_METHOD(int size)
+#endif
+
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index cce38c20e9..8cb4908a5e 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -41,8 +41,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 
 #include "SIMPLib/Filtering/AbstractComparison.h"
 
@@ -58,6 +58,8 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   Q_OBJECT
   // clang-format off
 
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ComparisonInputsAdvanced)
 
   PYB11_CREATION()
@@ -70,6 +72,8 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   PYB11_METHOD(void addInput OVERLOAD int,unionOperator bool,invertComparison QVector<AbstractComparison::Pointer>,comparisons)
   PYB11_METHOD(void addInput OVERLOAD AbstractComparison::Pointer,input)
   PYB11_METHOD(int size)
+#endif
+
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.cpp b/Source/SIMPLib/Filtering/ComparisonSet.cpp
index ebf9320c60..573106545c 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonSet.cpp
@@ -251,3 +251,28 @@ bool ComparisonSet::renameDataArrayPath(DataArrayPath::RenameType renamePath)
 
   return updated;
 }
+
+// -----------------------------------------------------------------------------
+ComparisonSet::Pointer ComparisonSet::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSet::Pointer ComparisonSet::New()
+{
+  Pointer sharedPtr(new(ComparisonSet));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSet::getNameOfClass() const
+{
+  return QString("ComparisonSet");
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonSet::ClassName()
+{
+  return QString("ComparisonSet");
+}
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 5a1fc4ed0b..a86e23ef91 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "AbstractComparison.h"
 
 #include <QtCore/QVector>
@@ -46,8 +48,11 @@
 class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
 {
   using AbstractComparisonPtr = AbstractComparison::Pointer;
+#ifdef SIMPL_ENABLE_PYTHON
   // clang-format off
   PYB11_CREATE_BINDINGS(ComparisonSet SUPERCLASS AbstractComparison)
+  PYB11_SHARED_POINTERS(ComparisonSet)
+  PYB11_STATIC_NEW_MACRO(ComparisonSet)
   PYB11_CREATION()
   PYB11_PROPERTY(QVector<AbstractComparison::Pointer> Comparisons READ getComparisons WRITE setComparisons)
   PYB11_PROPERTY(bool InvertComparison READ getInvertComparison WRITE setInvertComparison)
@@ -55,10 +60,26 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   PYB11_METHOD(void addComparison ARGS AbstractComparisonPtr,comparison)
   PYB11_METHOD(void insertComparison ARGS int,index AbstractComparisonPtr,comparison)
   // clang-format on
+#endif
+
 public:
-  SIMPL_SHARED_POINTERS(ComparisonSet)
-  SIMPL_STATIC_NEW_MACRO(ComparisonSet)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ComparisonSet, AbstractComparison)
+  using Self = ComparisonSet;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ComparisonSet
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ComparisonSet
+   */
+  static QString ClassName();
 
   ~ComparisonSet() override;
 
@@ -130,5 +151,7 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   QVector<AbstractComparison::Pointer> m_comparisons;
 
   ComparisonSet();
+
+private:
 };
 
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.cpp b/Source/SIMPLib/Filtering/ComparisonValue.cpp
index 9d69cf533d..e7e137b271 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonValue.cpp
@@ -174,3 +174,28 @@ bool ComparisonValue::renameDataArrayPath(DataArrayPath::RenameType renamePath)
 
   return false;
 }
+
+// -----------------------------------------------------------------------------
+ComparisonValue::Pointer ComparisonValue::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ComparisonValue::Pointer ComparisonValue::New()
+{
+  Pointer sharedPtr(new(ComparisonValue));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonValue::getNameOfClass() const
+{
+  return QString("ComparisonValue");
+}
+
+// -----------------------------------------------------------------------------
+QString ComparisonValue::ClassName()
+{
+  return QString("ComparisonValue");
+}
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index ccf27d745b..5b5fb5f930 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include "SIMPLib/Filtering/AbstractComparison.h"
@@ -46,17 +48,35 @@
 */
 class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
 {
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ComparisonValue SUPERCLASS AbstractComparison)
+  PYB11_SHARED_POINTERS(ComparisonValue)
+  PYB11_STATIC_NEW_MACRO(ComparisonValue)
   PYB11_CREATION()
   PYB11_PROPERTY(QString AttributeArrayName READ getAttributeArrayName WRITE setAttributeArrayName)
   PYB11_PROPERTY(int CompOperator READ getCompOperator WRITE setCompOperator)
   PYB11_PROPERTY(double CompValue READ getCompValue WRITE setCompValue)
   PYB11_PROPERTY(ComparisonSet::Pointer ParentSet READ getParentSet WRITE setParentSet)
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
+#endif
 public:
-  SIMPL_SHARED_POINTERS(ComparisonValue)
-  SIMPL_STATIC_NEW_MACRO(ComparisonValue)
-   SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ComparisonValue, AbstractComparison)
+  using Self = ComparisonValue;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ComparisonValue
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ComparisonValue
+   */
+  static QString ClassName();
 
   ~ComparisonValue() override;
 
@@ -134,5 +154,6 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
   ComparisonSet::Pointer m_parentSet;
 
   ComparisonValue();
-};
 
+private:
+};
diff --git a/Source/SIMPLib/Filtering/CorePlugin.cpp b/Source/SIMPLib/Filtering/CorePlugin.cpp
index 6b5105694e..66df9134bc 100644
--- a/Source/SIMPLib/Filtering/CorePlugin.cpp
+++ b/Source/SIMPLib/Filtering/CorePlugin.cpp
@@ -34,6 +34,7 @@
 
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Filtering/CoreConstants.h"
diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
index 12be5acc3d..b11288d84c 100755
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/SIMPLib.h"
@@ -43,10 +42,36 @@
 template <class T> class FilterFactory : public IFilterFactory
 {
 public:
-  SIMPL_SHARED_POINTERS(FilterFactory<T>)
-  SIMPL_TYPE_MACRO_SUPER(FilterFactory<T>, IFilterFactory)
-  SIMPL_STATIC_NEW_MACRO(FilterFactory<T>)
+  using Self = FilterFactory<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
 
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return QString("FilterFactory<T>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("FilterFactory<T>");
+  }
+
+  static Pointer New()
+  {
+    Pointer sharedPtr(new(Self));
+    return sharedPtr;
+  }
   /**
    * @brief Creates a new  for this filter. The Calling method MUST set
    * a parent  OR take responsibility for deleting this object.
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 770dc1bffb..3bfe029cdb 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -36,10 +36,11 @@
 #include "FilterManager.h"
 
 #include <QtCore/QJsonObject>
+#include <QtCore/QDebug>
+#include <QtCore/QSet>
 
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/CorePlugin.h"
-
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 
 FilterManager* FilterManager::s_Self = nullptr;
@@ -270,3 +271,15 @@ QJsonArray FilterManager::toJsonArray() const
   }
   return filterArray;
 }
+
+// -----------------------------------------------------------------------------
+QString FilterManager::getNameOfClass() const
+{
+  return QString("FilterManager");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterManager::ClassName()
+{
+  return QString("FilterManager");
+}
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
index fe86d471df..a62f22f799 100755
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -41,7 +41,6 @@
 #include <QtCore/QUuid>
 #include <QtCore/QJsonArray>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/SIMPLib.h"
 
@@ -53,7 +52,14 @@
 class SIMPLib_EXPORT FilterManager
 {
 public:
-  SIMPL_TYPE_MACRO(FilterManager)
+  /**
+   * @brief Returns the name of the class for FilterManager
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for FilterManager
+   */
+  static QString ClassName();
 
   virtual ~FilterManager();
 
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 93e9c5e04b..4f93a14db1 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -35,10 +35,10 @@
 
 #include "FilterPipeline.h"
 
-#include "SIMPLib/CoreFilters/EmptyFilter.h"
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterManager.h"
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
@@ -47,11 +47,14 @@
 #include "SIMPLib/Messages/PipelineProgressMessage.h"
 #include "SIMPLib/Messages/PipelineStatusMessage.h"
 #include "SIMPLib/Messages/PipelineWarningMessage.h"
-
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Utilities/StringOperations.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/CoreFilters/EmptyFilter.h"
 
 #define RENAME_ENABLED 1
 
@@ -998,3 +1001,64 @@ DataContainerArray::Pointer FilterPipeline::getDataContainerArray()
 {
   return m_Dca;
 }
+
+// -----------------------------------------------------------------------------
+FilterPipeline::Pointer FilterPipeline::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString FilterPipeline::getNameOfClass() const
+{
+  return QString("FilterPipeline");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterPipeline::ClassName()
+{
+  return QString("FilterPipeline");
+}
+
+// -----------------------------------------------------------------------------
+FilterPipeline::Pointer FilterPipeline::New()
+{
+  Pointer sharedPtr(new(FilterPipeline));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+void FilterPipeline::setCurrentFilter(const AbstractFilter::Pointer& value)
+{
+  m_CurrentFilter = value;
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer FilterPipeline::getCurrentFilter() const
+{
+  return m_CurrentFilter;
+}
+
+// -----------------------------------------------------------------------------
+FilterPipeline::ExecutionResult FilterPipeline::getExecutionResult() const
+{
+  return m_ExecutionResult;
+}
+
+// -----------------------------------------------------------------------------
+FilterPipeline::State FilterPipeline::getState() const
+{
+  return m_State;
+}
+
+// -----------------------------------------------------------------------------
+int FilterPipeline::getErrorCode() const
+{
+  return m_ErrorCode;
+}
+
+// -----------------------------------------------------------------------------
+int FilterPipeline::getWarningCode() const
+{
+  return m_WarningCode;
+}
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index ee5ec97802..184292c5ef 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -35,19 +35,22 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QJsonObject>
 #include <QtCore/QList>
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 class IObserver;
 class FilterPipelineMessageHandler;
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 /**
  * @class FilterPipeline FilterPipeline.h DREAM3DLib/Common/FilterPipeline.h
@@ -62,7 +65,10 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
 {
   Q_OBJECT
 
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(FilterPipeline)
+  PYB11_SHARED_POINTERS(FilterPipeline)
+  PYB11_STATIC_NEW_MACRO(FilterPipeline)
   PYB11_PROPERTY(int ErrorCode READ getErrorCode)
   PYB11_PROPERTY(int WarningCode READ getWarningCode)
   PYB11_PROPERTY(AbstractFilter CurrentFilter READ getCurrentFilter WRITE setCurrentFilter)
@@ -70,7 +76,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   PYB11_PROPERTY(ExecutionResult ExecutionResult READ getExecutionResult)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
 
-  PYB11_METHOD(DataContainerArray::Pointer run)
+  PYB11_METHOD(DataContainerArrayShPtrType run)
   PYB11_METHOD(void preflightPipeline)
   PYB11_METHOD(bool pushFront ARGS AbstractFilter)
   PYB11_METHOD(bool pushBack ARGS AbstractFilter)
@@ -81,11 +87,26 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   PYB11_METHOD(bool empty)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(FilterPipeline)
-  SIMPL_TYPE_MACRO(FilterPipeline)
-  SIMPL_STATIC_NEW_MACRO(FilterPipeline)
+  using Self = FilterPipeline;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for FilterPipeline
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterPipeline
+   */
+  static QString ClassName();
+
+  static Pointer New();
 
   ~FilterPipeline() override;
 
@@ -108,11 +129,39 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
 
   typedef QList<AbstractFilter::Pointer> FilterContainerType;
 
-  SIMPL_GET_PROPERTY(FilterPipeline::ExecutionResult, ExecutionResult)
-  SIMPL_GET_PROPERTY(FilterPipeline::State, State)
-  SIMPL_GET_PROPERTY(int, ErrorCode)
-  SIMPL_GET_PROPERTY(int, WarningCode)
-  SIMPL_INSTANCE_PROPERTY(AbstractFilter::Pointer, CurrentFilter)
+  /**
+   * @brief Getter property for ExecutionResult
+   * @return Value of ExecutionResult
+   */
+  FilterPipeline::ExecutionResult getExecutionResult() const;
+
+  /**
+   * @brief Getter property for State
+   * @return Value of State
+   */
+  FilterPipeline::State getState() const;
+
+  /**
+   * @brief Getter property for ErrorCode
+   * @return Value of ErrorCode
+   */
+  int getErrorCode() const;
+
+  /**
+   * @brief Getter property for WarningCode
+   * @return Value of WarningCode
+   */
+  int getWarningCode() const;
+
+  /**
+   * @brief Setter property for CurrentFilter
+   */
+  void setCurrentFilter(const AbstractFilter::Pointer& value);
+  /**
+   * @brief Getter property for CurrentFilter
+   * @return Value of CurrentFilter
+   */
+  AbstractFilter::Pointer getCurrentFilter() const;
 
   /**
    * @brief Returns true if the pipeline is executing
@@ -136,12 +185,12 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
    * @brief A pure virtual function that gets called from the "run()" method. Subclasses
    * are expected to create a concrete implementation of this method.
    */
-  virtual DataContainerArray::Pointer execute();
+  virtual DataContainerArrayShPtrType execute();
 
   /**
    * @brief An execute method using an existing data container array
    */
-  DataContainerArray::Pointer execute(DataContainerArray::Pointer dca);
+  DataContainerArrayShPtrType execute(DataContainerArrayShPtrType dca);
 
   /**
    * @brief This will preflight the pipeline and report any errors that would occur during
@@ -164,7 +213,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
 
   virtual FilterContainerType& getFilterContainer();
 
-  virtual DataContainerArray::Pointer getDataContainerArray();
+  virtual DataContainerArrayShPtrType getDataContainerArray();
 
   /**
    * @brief
@@ -254,7 +303,7 @@ public slots:
   /**
    * @brief This method is called to start the pipeline for a plugin
    */
-  virtual DataContainerArray::Pointer run();
+  virtual DataContainerArrayShPtrType run();
 
   /**
    * @brief cancel
@@ -300,6 +349,8 @@ public slots:
   void pipelineNameChanged(QString oldName, QString newName);
 
 private:
+  AbstractFilter::Pointer m_CurrentFilter = {};
+
   FilterContainerType m_Pipeline;
   QString m_PipelineName;
 
@@ -308,7 +359,7 @@ public slots:
 
   QVector<QObject*> m_MessageReceivers;
 
-  DataContainerArray::Pointer m_Dca;
+  DataContainerArrayShPtrType m_Dca;
 
   int m_ErrorCode = 0;
   int m_WarningCode = 0;
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index 601f16d942..d10c95cd99 100755
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -37,7 +37,6 @@
 
 #include <QtCore/QUuid>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -48,8 +47,29 @@
 class IFilterFactory
 {
 public:
-  SIMPL_SHARED_POINTERS(IFilterFactory)
-  SIMPL_TYPE_MACRO(IFilterFactory)
+  using Self = IFilterFactory;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const
+  {
+    return QString("IFilterFactory");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("IFilterFactory");
+  }
 
   virtual ~IFilterFactory() = default;
 
diff --git a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
index 977dcd0009..9c7dca3fa8 100644
--- a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
+++ b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
@@ -53,6 +53,7 @@
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 class FilterPipelineTest
 {
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
index 3884adc31a..a65a7f86de 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
@@ -70,7 +70,7 @@ ThresholdFilterHelper::~ThresholdFilterHelper() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int ThresholdFilterHelper::execute(IDataArray* input, IDataArray* output)
+int ThresholdFilterHelper::execute(const IDataArray::Pointer& input, IDataArray* output)
 {
   if(nullptr == input)
   {
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
index 47154ca28a..d0c48e37cc 100755
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
@@ -54,11 +54,14 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   /**
    *
    */
-  template <typename T> void filterDataLessThan(IDataArray* m_Input)
+  template <typename T>
+  void filterDataLessThan(const IDataArray::Pointer& m_Input)
   {
     size_t m_NumValues = m_Input->getNumberOfTuples();
     T v = static_cast<T>(comparisonValue);
-    T* data = IDataArray::SafeReinterpretCast<IDataArray*, DataArray<T>*, T*>(m_Input);
+    using DataArrayType = DataArray<T>;
+    typename DataArrayType::Pointer dataPtr = std::dynamic_pointer_cast<DataArrayType>(m_Input);
+    T* data = dataPtr->getTuplePointer(0);
     for(size_t i = 0; i < m_NumValues; ++i)
     {
       bool b = (data[i] < v);
@@ -69,11 +72,14 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   /**
    *
    */
-  template <typename T> void filterDataGreaterThan(IDataArray* m_Input)
+  template <typename T>
+  void filterDataGreaterThan(const IDataArray::Pointer& m_Input)
   {
     size_t m_NumValues = m_Input->getNumberOfTuples();
     T v = static_cast<T>(comparisonValue);
-    T* data = IDataArray::SafeReinterpretCast<IDataArray*, DataArray<T>*, T*>(m_Input);
+    using DataArrayType = DataArray<T>;
+    typename DataArrayType::Pointer dataPtr = std::dynamic_pointer_cast<DataArrayType>(m_Input);
+    T* data = dataPtr->getTuplePointer(0);
     for(size_t i = 0; i < m_NumValues; ++i)
     {
       bool b = (data[i] > v);
@@ -84,11 +90,14 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   /**
    *
    */
-  template <typename T> void filterDataEqualTo(IDataArray* m_Input)
+  template <typename T>
+  void filterDataEqualTo(const IDataArray::Pointer& m_Input)
   {
     size_t m_NumValues = m_Input->getNumberOfTuples();
     T v = static_cast<T>(comparisonValue);
-    T* data = IDataArray::SafeReinterpretCast<IDataArray*, DataArray<T>*, T*>(m_Input);
+    using DataArrayType = DataArray<T>;
+    typename DataArrayType::Pointer dataPtr = std::dynamic_pointer_cast<DataArrayType>(m_Input);
+    T* data = dataPtr->getTuplePointer(0);
     for(size_t i = 0; i < m_NumValues; ++i)
     {
       bool b = (data[i] == v);
@@ -99,11 +108,14 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   /**
   *
   */
-  template <typename T> void filterDataNotEqualTo(IDataArray* m_Input)
+  template <typename T>
+  void filterDataNotEqualTo(const IDataArray::Pointer& m_Input)
   {
     size_t m_NumValues = m_Input->getNumberOfTuples();
     T v = static_cast<T>(comparisonValue);
-    T* data = IDataArray::SafeReinterpretCast<IDataArray*, DataArray<T>*, T*>(m_Input);
+    using DataArrayType = DataArray<T>;
+    typename DataArrayType::Pointer dataPtr = std::dynamic_pointer_cast<DataArrayType>(m_Input);
+    T* data = dataPtr->getTuplePointer(0);
     for(size_t i = 0; i < m_NumValues; ++i)
     {
       bool b = (data[i] != v);
@@ -117,7 +129,7 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   * @param output
   * @return
   */
-  int execute(IDataArray* input, IDataArray* output);
+  int execute(const IDataArray::Pointer& input, IDataArray* output);
 
 private:
   SIMPL::Comparison::Enumeration comparisonOperator;
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index 94bbc8e1e0..afddd97261 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -154,4 +154,40 @@ CompositeTransformContainer& CompositeTransformContainer::operator=(const Compos
 void CompositeTransformContainer::addTransformContainer(ITransformContainer::Pointer transformContainer)
 {
   this->m_TransformContainers.push_back(transformContainer);
-}
\ No newline at end of file
+}
+// -----------------------------------------------------------------------------
+CompositeTransformContainer::Pointer CompositeTransformContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+CompositeTransformContainer::Pointer CompositeTransformContainer::New()
+{
+  Pointer sharedPtr(new(CompositeTransformContainer));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString CompositeTransformContainer::getNameOfClass() const
+{
+  return QString("CompositeTransformContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString CompositeTransformContainer::ClassName()
+{
+  return QString("CompositeTransformContainer");
+}
+
+// -----------------------------------------------------------------------------
+void CompositeTransformContainer::setTransformContainers(const std::vector<ITransformContainer::Pointer>& value)
+{
+  m_TransformContainers = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<ITransformContainer::Pointer> CompositeTransformContainer::getTransformContainers() const
+{
+  return m_TransformContainers;
+}
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index e99a143ab9..d4b361ac91 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -41,14 +43,41 @@
 class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
 {
 public:
-  SIMPL_SHARED_POINTERS(CompositeTransformContainer)
-  SIMPL_STATIC_NEW_MACRO(CompositeTransformContainer)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(CompositeTransformContainer, ITransformContainer)
+  using Self = CompositeTransformContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CompositeTransformContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CompositeTransformContainer
+   */
+  static QString ClassName();
+
   CompositeTransformContainer();
   ~CompositeTransformContainer() override;
   CompositeTransformContainer& operator=(const CompositeTransformContainer&);
   int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
   int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
-  SIMPL_INSTANCE_PROPERTY(std::vector<ITransformContainer::Pointer>, TransformContainers)
+  /**
+   * @brief Setter property for TransformContainers
+   */
+  void setTransformContainers(const std::vector<ITransformContainer::Pointer>& value);
+  /**
+   * @brief Getter property for TransformContainers
+   * @return Value of TransformContainers
+   */
+  std::vector<ITransformContainer::Pointer> getTransformContainers() const;
+
   void addTransformContainer(ITransformContainer::Pointer transformContainer);
+
+private:
+  std::vector<ITransformContainer::Pointer> m_TransformContainers = {};
 };
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 55e0ddd99d..fa9dcebd3b 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -44,6 +44,8 @@
  *     EdgeGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/EdgeGeom.h"
 
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
@@ -658,3 +660,28 @@ IGeometry::Pointer EdgeGeom::deepCopy(bool forceNoAllocate) const
 #define GEOM_CLASS_NAME EdgeGeom
 #include "SIMPLib/Geometry/SharedEdgeOps.cpp"
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+EdgeGeom::Pointer EdgeGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+EdgeGeom::Pointer EdgeGeom::New()
+{
+  Pointer sharedPtr(new(EdgeGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString EdgeGeom::getNameOfClass() const
+{
+  return QString("EdgeGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString EdgeGeom::ClassName()
+{
+  return QString("EdgeGeom");
+}
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 4ced8b0e5a..bf09363154 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -1,42 +1,47 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The EdgeGeom class represents a collection of line segments
@@ -44,7 +49,11 @@
 class SIMPLib_EXPORT EdgeGeom : public IGeometry
 {
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(EdgeGeom SUPERCLASS IGeometry)
+  PYB11_SHARED_POINTERS(EdgeGeom)
+  PYB11_STATIC_NEW_MACRO(EdgeGeom)
 
   PYB11_CREATION(CreateGeometry ARGS size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedEdgeList::Pointer SharedVertexList::Pointer QString)
@@ -61,12 +70,28 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_METHOD(size_t getNumberOfElements)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(EdgeGeom)
-  SIMPL_STATIC_NEW_MACRO(EdgeGeom)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(EdgeGeom, Observable)
+  using Self = EdgeGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for EdgeGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for EdgeGeom
+   */
+  static QString ClassName();
 
   ~EdgeGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index ee0950de9b..4337e3de26 100755
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -31,6 +31,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <cmath>
 #include <map>
 #include <set>
@@ -47,6 +49,9 @@
 #include "SIMPLib/Math/GeometryMath.h"
 #include "SIMPLib/Math/MatrixMath.h"
 
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
 /**
 * @brief This file contains a namespace with classes for manipulating IGeometry objects
 */
@@ -76,7 +81,7 @@ class GeomIO
     QVector<hsize_t> dims;
     H5T_class_t type_class;
     size_t type_size;
-    IDataArray::Pointer mesh = IDataArray::NullPointer();
+    IDataArrayShPtrType mesh = IDataArray::NullPointer();
     H5ScopedErrorHandler errorHandler;
     err = QH5Lite::getDatasetInfo(parentId, listName, dims, type_class, type_size);
     if(err < 0)
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index d537ecfe0a..a3b547bb94 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -9,6 +9,8 @@
  *     HexahedralGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
@@ -856,3 +858,28 @@ IGeometry::Pointer HexahedralGeom::deepCopy(bool forceNoAllocate) const
 #include "SIMPLib/Geometry/SharedHexOps.cpp"
 #include "SIMPLib/Geometry/SharedQuadOps.cpp"
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+HexahedralGeom::Pointer HexahedralGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+HexahedralGeom::Pointer HexahedralGeom::New()
+{
+  Pointer sharedPtr(new(HexahedralGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString HexahedralGeom::getNameOfClass() const
+{
+  return QString("HexahedralGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString HexahedralGeom::ClassName()
+{
+  return QString("HexahedralGeom");
+}
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 3b4d1cbe36..96cb3519c3 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -1,19 +1,38 @@
 #ifndef _hexahedralgeom_h_
 #define _hexahedralgeom_h_
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/IGeometry3D.h"
 
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 /**
  * @brief The HexahedralGeom class represents a collection of hexahedra
  */
 class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
 {
   public:
+    using Self = HexahedralGeom;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
 
-    SIMPL_SHARED_POINTERS(HexahedralGeom)
-    SIMPL_STATIC_NEW_MACRO(HexahedralGeom)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(HexahedralGeom, Observable)
+    /**
+     * @brief Returns the name of the class for HexahedralGeom
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for HexahedralGeom
+     */
+    static QString ClassName();
 
     ~HexahedralGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index 86959e2adb..40484c7eaa 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -38,17 +38,12 @@
 #include "H5Support/QH5Utilities.h"
 #include "SIMPLib/Geometry/CompositeTransformContainer.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IGeometry::IGeometry()
-: m_TimeValue(0.0f)
-, m_EnableTimeSeries(false)
-, m_Units(LengthUnit::Unspecified)
-, m_ProgressCounter(0)
-{
-}
+IGeometry::IGeometry() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -590,3 +585,69 @@ int IGeometry::readGeometryFromHDF5(hid_t parentId, bool preflight)
 
   return err;
 }
+
+// -----------------------------------------------------------------------------
+IGeometry::Pointer IGeometry::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry::getNameOfClass() const
+{
+  return QString("IGeometry");
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry::ClassName()
+{
+  return QString("IGeometry");
+}
+
+// -----------------------------------------------------------------------------
+void IGeometry::setTimeValue(float value)
+{
+  m_TimeValue = value;
+}
+
+// -----------------------------------------------------------------------------
+float IGeometry::getTimeValue() const
+{
+  return m_TimeValue;
+}
+
+// -----------------------------------------------------------------------------
+void IGeometry::setEnableTimeSeries(bool value)
+{
+  m_EnableTimeSeries = value;
+}
+
+// -----------------------------------------------------------------------------
+bool IGeometry::getEnableTimeSeries() const
+{
+  return m_EnableTimeSeries;
+}
+
+// -----------------------------------------------------------------------------
+void IGeometry::setTransformContainer(const ITransformContainer::Pointer& value)
+{
+  m_TransformContainer = value;
+}
+
+// -----------------------------------------------------------------------------
+ITransformContainer::Pointer IGeometry::getTransformContainer() const
+{
+  return m_TransformContainer;
+}
+
+// -----------------------------------------------------------------------------
+void IGeometry::setUnits(const IGeometry::LengthUnit& value)
+{
+  m_Units = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::LengthUnit IGeometry::getUnits() const
+{
+  return m_Units;
+}
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 3ceae2cc27..3721a8ddb0 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -35,19 +35,23 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QMutex>
 #include <QtCore/QMap>
 #include <QtCore/QString>
 
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/DynamicListArray.hpp"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/ITransformContainer.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
-class QTextStream;
+class AttributeMatrix;
+using AttributeMatrixShPtrType = std::shared_ptr<AttributeMatrix>;
 
 // -----------------------------------------------------------------------------
 // Typedefs
@@ -63,13 +67,21 @@ using SharedHexList = MeshIndexArrayType;
 using SharedFaceList = MeshIndexArrayType;
 using ElementDynamicList = DynamicListArray<uint16_t, MeshIndexType>;
 
+/**
+ * @brief Macro to silence compiler warnings for unused parameters in methods.
+ */
+#define SIMPL_NOT_USED(x)
+
 /**
  * @brief The IGeometry class
  */
 class SIMPLib_EXPORT IGeometry : public Observable
 {
   // This line MUST be first when exposing a class and properties to Python
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(IGeometry)
+  PYB11_SHARED_POINTERS(IGeometry)
 
   PYB11_ENUMERATION(Type)
   PYB11_ENUMERATION(VtkCellType)
@@ -87,393 +99,448 @@ class SIMPLib_EXPORT IGeometry : public Observable
   PYB11_METHOD(void addOrReplaceAttributeMatrix ARGS Name AttributeMatrix)
   PYB11_METHOD(AttributeMatrix getAttributeMatrix ARGS Name)
   PYB11_METHOD(AttributeMatrix removeAttributeMatrix ARGS Name)
-
-  public:
-    SIMPL_SHARED_POINTERS(IGeometry)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IGeometry, Observable)
-
-    IGeometry();
-    ~IGeometry() override;
-
-    using EnumType = unsigned int;
-
-    /**
-     * @brief The VtkCellType enum
-     */
-    enum class VtkCellType : EnumType
-    {
-       Image = 11,
-       RectGrid = 11,
-       Vertex = 1,
-       Edge = 3,
-       Triangle = 5,
-       Quad = 9,
-       Tetrahedral = 10,
-       Hexahedral = 12,
-       Unknown = 999,
-       Any = 4294967295U
-    };
-
-    /**
-     * @ brief The Type enum
-     */
-    enum class Type : EnumType
-    {
-      Image,
-      RectGrid,
-      Vertex,
-      Edge,
-      Triangle,
-      Quad,
-      Tetrahedral,
-      Hexahedral,
-      Unknown = 999,
-      Any = 4294967295U
-    };
-
-    enum class LengthUnit : EnumType
-    {
-      Yoctometer,
-      Zeptometer,
-      Attometer,
-      Femtometer,
-      Picometer,
-      Nanometer,
-      Micrometer,
-      Millimeter,
-      Centimeter,
-      Decimeter,
-      Meter,
-      Decameter,
-      Hectometer,
-      Kilometer,
-      Megameter,
-      Gigameter,
-      Terameter,
-      Petameter,
-      Exameter,
-      Zettameter,
-      Yottameter,
-      Angstrom,
-      Mil,
-      Inch,
-      Foot,
-      Mile,
-      Fathom,
-      Unspecified = 100U,
-      Unknown = 101U
-    };
-
-    using VtkCellTypes = QVector <VtkCellType>;
-    using Types = QVector<Type>;
-
-    /**
-     * @brief AttributeMatrixMap_t
-     */
-    using AttributeMatrixMap_t = QMap<QString, AttributeMatrix::Pointer>;
-
-    /**
-     * @brief stringToType
-     * @param str
-     * @return
-     */
-    static IGeometry::Type StringToType(const QString& str);
-
-    /**
-     * @brief typeToString
-     * @param t
-     * @return
-     */
-    static QString TypeToString(IGeometry::Type t);
-
-    /**
-     * @brief stringToLengthUnit
-     * @param str
-     * @return
-     */
-    static IGeometry::LengthUnit StringToLengthUnit(const QString& str);
-
-    /**
-     * @brief lengthUnitToString
-     * @param t
-     * @return
-     */
-    static QString LengthUnitToString(IGeometry::LengthUnit t);
-
-    /**
-     * @brief GetAllLengthUnitStrings Returns all the Length Units as a vector of strings. This would be suitable to display as a list to a user.
-     * @return
-     */
-    static QVector<QString> GetAllLengthUnitStrings();
-
-    SIMPL_INSTANCE_PROPERTY(float, TimeValue)
-    SIMPL_INSTANCE_PROPERTY(bool, EnableTimeSeries)
-    SIMPL_INSTANCE_PROPERTY(ITransformContainer::Pointer, TransformContainer)
-    SIMPL_INSTANCE_PROPERTY(IGeometry::LengthUnit, Units)
-
-    // -----------------------------------------------------------------------------
-    // Connectivity
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief findElementsContainingVert
-     * @return
-     */
-    virtual int findElementsContainingVert() = 0;
-
-    /**
-     * @brief getElementsContainingVert
-     * @return
-     */
-    virtual ElementDynamicList::Pointer getElementsContainingVert() const = 0;
-
-    /**
-     * @brief deleteElementsContainingVert
-     */
-    virtual void deleteElementsContainingVert() = 0;
-
-    /**
-     * @brief findElementNeighbors
-     * @return
-     */
-    virtual int findElementNeighbors() = 0;
-
-    /**
-     * @brief getElementNeighbors
-     * @return
-     */
-    virtual ElementDynamicList::Pointer getElementNeighbors() const = 0;
-
-    /**
-     * @brief deleteElementNeighbors
-     */
-    virtual void deleteElementNeighbors() = 0;
-
-// -----------------------------------------------------------------------------
-// Topology
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief getNumberOfElements
-     * @return
-     */
-    virtual size_t getNumberOfElements() const = 0;
-
-    /**
-     * @brief findElementSizes
-     * @return
-     */
-    virtual int findElementSizes() = 0;
-
-    /**
-     * @brief getElementSizes
-     * @return
-     */
-    virtual FloatArrayType::Pointer getElementSizes() const = 0;
-
-    /**
-     * @brief deleteElementSizes
-     */
-    virtual void deleteElementSizes() = 0;
-
-    /**
-     * @brief findElementCentroids
-     * @return
-     */
-    virtual int findElementCentroids() = 0;
-
-    /**
-     * @brief getElementCentroids
-     * @return
-     */
-    virtual FloatArrayType::Pointer getElementCentroids() const = 0;
-
-    /**
-     * @brief deleteElementCentroids
-     */
-    virtual void deleteElementCentroids() = 0;
-
-    /**
-     * @brief getParametricCenter
-     * @param pCoords
-     */
-    virtual void getParametricCenter(double pCoords[3]) const = 0;
-
-    /**
-     * @brief getShapeFunctions
-     * @param pCoords
-     * @param derivs
-     */
-    virtual void getShapeFunctions(double pCoords[3], double* shape) const = 0;
-
-    /**
-     * @brief findDerivatives
-     * @param field
-     * @param derivatives
-     */
-    virtual void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable) = 0;
-
-// -----------------------------------------------------------------------------
-// Generic
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief setName
-     * @param name
-     */
-    virtual void setName(const QString& name) final;
-
-    /**
-     * @brief getName
-     * @return
-     */
-    virtual QString getName() const final;
-
-    /**
-     * @brief getGeometryType
-     * @return
-     */
-    virtual Type getGeometryType() const final;
-
-    /**
-     * @brief getGeometryTypeAsString
-     * @return
-     */
-    virtual QString getGeometryTypeAsString() const final;
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    virtual QString getInfoString(SIMPL::InfoStringFormat) const = 0;
-
-    /**
-     * @brief getXdmfGridType
-     * @return
-     */
-    virtual unsigned int getXdmfGridType() const final;
-
-    /**
-     * @brief getUnitDimensionality
-     * @return
-     */
-    virtual unsigned int getUnitDimensionality() const final;
-
-    /**
-     * @brief setSpatialDimensionality
-     * @param spatialDims
-     */
-    virtual void setSpatialDimensionality(unsigned int spatialDims) final;
-
-    /**
-     * @brief getSpatialDimensionality
-     * @return
-     */
-    virtual unsigned int getSpatialDimensionality() const final;
-
-    /**
-     * @brief writeGeometryToHDF5
-     * @param parentId
-     * @param writeXdmf
-     * @return
-     */
-    virtual int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const = 0;
-
-    /**
-     * @brief writeXdmf
-     * @param out
-     * @param dcName
-     * @param hdfFileName
-     * @return
-     */
-    virtual int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const = 0;
-
-    /**
-     * @brief readGeometryFromHDF5
-     * @param parentId
-     * @param preflight
-     * @return
-     */
-    virtual int readGeometryFromHDF5(hid_t parentId, bool preflight) = 0;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    virtual Pointer deepCopy(bool forceNoAllocate = false) const = 0;
-
-    /**
-     * @brief initializeWithZeros
-     */
-    virtual void initializeWithZeros() = 0;
-
-    /**
-     * @brief addOrReplaceAttributeMatrix
-     */
-    virtual void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) = 0;
-
-    /**
-     * @brief getAttributeMatrix
-     * @param name
-     * @return
-     */
-    virtual AttributeMatrix::Pointer getAttributeMatrix(const QString& name) const final;
-
-    /**
-     * @brief removeAttributeMatrix
-     * @param name
-     * @return
-     */
-    virtual AttributeMatrix::Pointer removeAttributeMatrix(const QString& name) final;
-
-  protected:
-    QString m_Name;
-    QString m_GeometryTypeName;
-    Type m_GeometryType = Type::Unknown;
-    unsigned int m_XdmfGridType = SIMPL::XdmfGridType::UnknownGrid;
-    unsigned int m_UnitDimensionality = 0;
-    unsigned int m_SpatialDimensionality = 0;
-
-    AttributeMatrixMap_t m_AttributeMatrices;
-
-    QMutex m_Mutex;
-    int64_t m_ProgressCounter;
-
-    /**
-     * @brief sendThreadSafeProgressMessage
-     * @param counter
-     * @param max
-     */
-    virtual void sendThreadSafeProgressMessage(int64_t counter, int64_t max) final;
-
-    /**
-     * @brief setElementsContaingVert
-     * @param elementsContaingVert
-     */
-    virtual void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) = 0;
-
-    /**
-     * @brief setElementNeighbors
-     * @param elementNeighbors
-     */
-    virtual void setElementNeighbors(ElementDynamicList::Pointer elementsNeighbors) = 0;
-
-    /**
-     * @brief setElementCentroids
-     * @param elementCentroids
-     */
-    virtual void setElementCentroids(FloatArrayType::Pointer elementCentroids) = 0;
-
-    /**
-     * @brief setElementSizes
-     * @param elementSizes
-     */
-    virtual void setElementSizes(FloatArrayType::Pointer elementSizes) = 0;
-
-  public:
-    IGeometry(const IGeometry&) = delete;      // Copy Constructor Not Implemented
-    IGeometry(IGeometry&&) = delete;           // Move Constructor Not Implemented
-    IGeometry& operator=(const IGeometry&) = delete; // Copy Assignment Not Implemented
-    IGeometry& operator=(IGeometry&&) = delete;      // Move Assignment Not Implemented
+#endif
+
+public:
+  using Self = IGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for IGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IGeometry
+   */
+  static QString ClassName();
+
+  IGeometry();
+  ~IGeometry() override;
+
+  using EnumType = unsigned int;
+
+  /**
+   * @brief The VtkCellType enum
+   */
+  enum class VtkCellType : EnumType
+  {
+    Image = 11,
+    RectGrid = 11,
+    Vertex = 1,
+    Edge = 3,
+    Triangle = 5,
+    Quad = 9,
+    Tetrahedral = 10,
+    Hexahedral = 12,
+    Unknown = 999,
+    Any = 4294967295U
+  };
+
+  /**
+   * @ brief The Type enum
+   */
+  enum class Type : EnumType
+  {
+    Image,
+    RectGrid,
+    Vertex,
+    Edge,
+    Triangle,
+    Quad,
+    Tetrahedral,
+    Hexahedral,
+    Unknown = 999,
+    Any = 4294967295U
+  };
+
+  enum class LengthUnit : EnumType
+  {
+    Yoctometer,
+    Zeptometer,
+    Attometer,
+    Femtometer,
+    Picometer,
+    Nanometer,
+    Micrometer,
+    Millimeter,
+    Centimeter,
+    Decimeter,
+    Meter,
+    Decameter,
+    Hectometer,
+    Kilometer,
+    Megameter,
+    Gigameter,
+    Terameter,
+    Petameter,
+    Exameter,
+    Zettameter,
+    Yottameter,
+    Angstrom,
+    Mil,
+    Inch,
+    Foot,
+    Mile,
+    Fathom,
+    Unspecified = 100U,
+    Unknown = 101U
+  };
+
+  using VtkCellTypes = QVector<VtkCellType>;
+  using Types = QVector<Type>;
+
+  /**
+   * @brief AttributeMatrixMap_t
+   */
+  using AttributeMatrixMap_t = QMap<QString, AttributeMatrixShPtrType>;
+
+  /**
+   * @brief stringToType
+   * @param str
+   * @return
+   */
+  static IGeometry::Type StringToType(const QString& str);
+
+  /**
+   * @brief typeToString
+   * @param t
+   * @return
+   */
+  static QString TypeToString(IGeometry::Type t);
+
+  /**
+   * @brief stringToLengthUnit
+   * @param str
+   * @return
+   */
+  static IGeometry::LengthUnit StringToLengthUnit(const QString& str);
+
+  /**
+   * @brief lengthUnitToString
+   * @param t
+   * @return
+   */
+  static QString LengthUnitToString(IGeometry::LengthUnit t);
+
+  /**
+   * @brief GetAllLengthUnitStrings Returns all the Length Units as a vector of strings. This would be suitable to display as a list to a user.
+   * @return
+   */
+  static QVector<QString> GetAllLengthUnitStrings();
+
+  /**
+   * @brief Setter property for TimeValue
+   */
+  void setTimeValue(float value);
+  /**
+   * @brief Getter property for TimeValue
+   * @return Value of TimeValue
+   */
+  float getTimeValue() const;
+
+  /**
+   * @brief Setter property for EnableTimeSeries
+   */
+  void setEnableTimeSeries(bool value);
+  /**
+   * @brief Getter property for EnableTimeSeries
+   * @return Value of EnableTimeSeries
+   */
+  bool getEnableTimeSeries() const;
+
+  /**
+   * @brief Setter property for TransformContainer
+   */
+  void setTransformContainer(const ITransformContainer::Pointer& value);
+  /**
+   * @brief Getter property for TransformContainer
+   * @return Value of TransformContainer
+   */
+  ITransformContainer::Pointer getTransformContainer() const;
+
+  /**
+   * @brief Setter property for Units
+   */
+  void setUnits(const IGeometry::LengthUnit& value);
+  /**
+   * @brief Getter property for Units
+   * @return Value of Units
+   */
+  IGeometry::LengthUnit getUnits() const;
+
+  // -----------------------------------------------------------------------------
+  // Connectivity
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief findElementsContainingVert
+   * @return
+   */
+  virtual int findElementsContainingVert() = 0;
+
+  /**
+   * @brief getElementsContainingVert
+   * @return
+   */
+  virtual ElementDynamicList::Pointer getElementsContainingVert() const = 0;
+
+  /**
+   * @brief deleteElementsContainingVert
+   */
+  virtual void deleteElementsContainingVert() = 0;
+
+  /**
+   * @brief findElementNeighbors
+   * @return
+   */
+  virtual int findElementNeighbors() = 0;
+
+  /**
+   * @brief getElementNeighbors
+   * @return
+   */
+  virtual ElementDynamicList::Pointer getElementNeighbors() const = 0;
+
+  /**
+   * @brief deleteElementNeighbors
+   */
+  virtual void deleteElementNeighbors() = 0;
+
+  // -----------------------------------------------------------------------------
+  // Topology
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief getNumberOfElements
+   * @return
+   */
+  virtual size_t getNumberOfElements() const = 0;
+
+  /**
+   * @brief findElementSizes
+   * @return
+   */
+  virtual int findElementSizes() = 0;
+
+  /**
+   * @brief getElementSizes
+   * @return
+   */
+  virtual FloatArrayType::Pointer getElementSizes() const = 0;
+
+  /**
+   * @brief deleteElementSizes
+   */
+  virtual void deleteElementSizes() = 0;
+
+  /**
+   * @brief findElementCentroids
+   * @return
+   */
+  virtual int findElementCentroids() = 0;
+
+  /**
+   * @brief getElementCentroids
+   * @return
+   */
+  virtual FloatArrayType::Pointer getElementCentroids() const = 0;
+
+  /**
+   * @brief deleteElementCentroids
+   */
+  virtual void deleteElementCentroids() = 0;
+
+  /**
+   * @brief getParametricCenter
+   * @param pCoords
+   */
+  virtual void getParametricCenter(double pCoords[3]) const = 0;
+
+  /**
+   * @brief getShapeFunctions
+   * @param pCoords
+   * @param derivs
+   */
+  virtual void getShapeFunctions(double pCoords[3], double* shape) const = 0;
+
+  /**
+   * @brief findDerivatives
+   * @param field
+   * @param derivatives
+   */
+  virtual void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable) = 0;
+
+  // -----------------------------------------------------------------------------
+  // Generic
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief setName
+   * @param name
+   */
+  virtual void setName(const QString& name) final;
+
+  /**
+   * @brief getName
+   * @return
+   */
+  virtual QString getName() const final;
+
+  /**
+   * @brief getGeometryType
+   * @return
+   */
+  virtual Type getGeometryType() const final;
+
+  /**
+   * @brief getGeometryTypeAsString
+   * @return
+   */
+  virtual QString getGeometryTypeAsString() const final;
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  virtual QString getInfoString(SIMPL::InfoStringFormat) const = 0;
+
+  /**
+   * @brief getXdmfGridType
+   * @return
+   */
+  virtual unsigned int getXdmfGridType() const final;
+
+  /**
+   * @brief getUnitDimensionality
+   * @return
+   */
+  virtual unsigned int getUnitDimensionality() const final;
+
+  /**
+   * @brief setSpatialDimensionality
+   * @param spatialDims
+   */
+  virtual void setSpatialDimensionality(unsigned int spatialDims) final;
+
+  /**
+   * @brief getSpatialDimensionality
+   * @return
+   */
+  virtual unsigned int getSpatialDimensionality() const final;
+
+  /**
+   * @brief writeGeometryToHDF5
+   * @param parentId
+   * @param writeXdmf
+   * @return
+   */
+  virtual int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const = 0;
+
+  /**
+   * @brief writeXdmf
+   * @param out
+   * @param dcName
+   * @param hdfFileName
+   * @return
+   */
+  virtual int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const = 0;
+
+  /**
+   * @brief readGeometryFromHDF5
+   * @param parentId
+   * @param preflight
+   * @return
+   */
+  virtual int readGeometryFromHDF5(hid_t parentId, bool preflight) = 0;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  virtual Pointer deepCopy(bool forceNoAllocate = false) const = 0;
+
+  /**
+   * @brief initializeWithZeros
+   */
+  virtual void initializeWithZeros() = 0;
+
+  /**
+   * @brief addOrReplaceAttributeMatrix
+   */
+  virtual void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrixShPtrType data) = 0;
+
+  /**
+   * @brief getAttributeMatrix
+   * @param name
+   * @return
+   */
+  virtual AttributeMatrixShPtrType getAttributeMatrix(const QString& name) const final;
+
+  /**
+   * @brief removeAttributeMatrix
+   * @param name
+   * @return
+   */
+  virtual AttributeMatrixShPtrType removeAttributeMatrix(const QString& name) final;
+
+protected:
+
+  /**
+   * @brief sendThreadSafeProgressMessage
+   * @param counter
+   * @param max
+   */
+  virtual void sendThreadSafeProgressMessage(int64_t counter, int64_t max) final;
+
+  /**
+   * @brief setElementsContaingVert
+   * @param elementsContaingVert
+   */
+  virtual void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) = 0;
+
+  /**
+   * @brief setElementNeighbors
+   * @param elementNeighbors
+   */
+  virtual void setElementNeighbors(ElementDynamicList::Pointer elementsNeighbors) = 0;
+
+  /**
+   * @brief setElementCentroids
+   * @param elementCentroids
+   */
+  virtual void setElementCentroids(FloatArrayType::Pointer elementCentroids) = 0;
+
+  /**
+   * @brief setElementSizes
+   * @param elementSizes
+   */
+  virtual void setElementSizes(FloatArrayType::Pointer elementSizes) = 0;
+
+public:
+  IGeometry(const IGeometry&) = delete;            // Copy Constructor Not Implemented
+  IGeometry(IGeometry&&) = delete;                 // Move Constructor Not Implemented
+  IGeometry& operator=(const IGeometry&) = delete; // Copy Assignment Not Implemented
+  IGeometry& operator=(IGeometry&&) = delete;      // Move Assignment Not Implemented
+
+protected:
+  QString m_GeometryTypeName;
+  Type m_GeometryType = Type::Unknown;
+  unsigned int m_XdmfGridType = SIMPL::XdmfGridType::UnknownGrid;
+  unsigned int m_UnitDimensionality = 0;
+  unsigned int m_SpatialDimensionality = 0;
+  int64_t m_ProgressCounter = 0;
+  AttributeMatrixMap_t m_AttributeMatrices;
+
+private:
+  float m_TimeValue = 0.0f;
+  bool m_EnableTimeSeries = false;
+  ITransformContainer::Pointer m_TransformContainer = {};
+  IGeometry::LengthUnit m_Units = LengthUnit::Unspecified;
+  QString m_Name;
+  QMutex m_Mutex;
 };
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.cpp b/Source/SIMPLib/Geometry/IGeometry2D.cpp
index 3fcb8bf827..a9ecd00423 100644
--- a/Source/SIMPLib/Geometry/IGeometry2D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry2D.cpp
@@ -44,3 +44,21 @@ IGeometry2D::IGeometry2D() = default;
 //
 // -----------------------------------------------------------------------------
 IGeometry2D::~IGeometry2D() = default;
+
+// -----------------------------------------------------------------------------
+IGeometry2D::Pointer IGeometry2D::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry2D::getNameOfClass() const
+{
+  return QString("IGeometry2D");
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry2D::ClassName()
+{
+  return QString("IGeometry2D");
+}
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index b1323c8f05..52f2c72736 100755
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -35,8 +35,9 @@
 
 #pragma once
 
+#include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
@@ -44,169 +45,182 @@
  */
 class SIMPLib_EXPORT IGeometry2D : public IGeometry
 {
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(IGeometry2D SUPERCLASS IGeometry)
-
-  public:
-    SIMPL_SHARED_POINTERS(IGeometry2D)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IGeometry2D, Observable)
-
-    IGeometry2D();
-    ~IGeometry2D() override;
-
-// -----------------------------------------------------------------------------
-// Inherited from SharedVertexOps
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeVertexList
-     * @param newNumVertices
-     */
-    virtual void resizeVertexList(size_t newNumVertices) = 0;
-
-    /**
-     * @brief setVertices
-     * @param vertices
-     */
-    virtual void setVertices(SharedVertexList::Pointer vertices) = 0;
-
-    /**
-     * @brief getVertices
-     * @return
-     */
-    virtual SharedVertexList::Pointer getVertices() const = 0;
-
-    /**
-     * @brief setCoords
-     * @param vertId
-     * @param coords
-     */
-    virtual void setCoords(size_t vertId, float coords[3]) = 0;
-
-    /**
-     * @brief getCoords
-     * @param vertId
-     * @param coords
-     */
-    virtual void getCoords(size_t vertId, float coords[3]) const = 0;
-
-    /**
-     * @brief getVertexPointer
-     * @param i
-     * @return
-     */
-    virtual float* getVertexPointer(size_t i) const = 0;
-
-    /**
-     * @brief getNumberOfVertices
-     * @return
-     */
-    virtual size_t getNumberOfVertices() const = 0;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedEdgeOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeEdgeList
-     * @param newNumEdges
-     */
-    virtual void resizeEdgeList(size_t newNumEdges) = 0;
-
-    /**
-     * @brief getEdges
-     * @return
-     */
-    virtual SharedEdgeList::Pointer getEdges() const = 0;
-
-    /**
-     * @brief setVerts
-     * @param edgeId
-     * @param verts
-     */
-    virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
-
-    /**
-     * @brief getVerts
-     * @param edgeId
-     * @param verts
-     */
-    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
-
-    /**
-     * @brief getVertCoordsAtEdge
-     * @param edgeId
-     * @param vert1
-     * @param vert2
-     */
-    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
-
-    /**
-     * @brief getEdgePointer
-     * @param i
-     * @return
-     */
-    virtual size_t* getEdgePointer(size_t i) const = 0;
-
-    /**
-     * @brief getNumberOfEdges
-     * @return
-     */
-    virtual size_t getNumberOfEdges() const = 0;
-
-    // -----------------------------------------------------------------------------
-    // Connectivity
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief findElementEdges
-     * @return
-     */
-    virtual int findEdges() = 0;
-
-    /**
-     * @brief deleteElementEdges
-     */
-    virtual void deleteEdges() = 0;
-
-// -----------------------------------------------------------------------------
-// Topology
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief findUnsharedEdges
-     */
-    virtual int findUnsharedEdges() = 0;
-
-    /**
-     * @brief getUnsharedEdges
-     * @return
-     */
-    virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
-
-    /**
-     * @brief deleteUnsharedEdges
-     */
-    virtual void deleteUnsharedEdges() = 0;
-
-  protected:
-
-    /**
-     * @brief setEdges
-     * @param edges
-     */
-    virtual void setEdges(SharedEdgeList::Pointer edges) = 0;
-
-    /**
-     * @brief setUnsharedEdges
-     * @param bEdgeList
-     */
-    virtual void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) = 0;
-
-  public:
-    IGeometry2D(const IGeometry2D&) = delete;    // Copy Constructor Not Implemented
-    IGeometry2D(IGeometry2D&&) = delete;         // Move Constructor Not Implemented
-    IGeometry2D& operator=(const IGeometry2D&) = delete; // Copy Assignment Not Implemented
-    IGeometry2D& operator=(IGeometry2D&&) = delete;      // Move Assignment Not Implemented
+  PYB11_SHARED_POINTERS(IGeometry2D)
+#endif
+
+public:
+  using Self = IGeometry2D;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for IGeometry2D
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IGeometry2D
+   */
+  static QString ClassName();
+
+  IGeometry2D();
+  ~IGeometry2D() override;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedVertexOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeVertexList
+   * @param newNumVertices
+   */
+  virtual void resizeVertexList(size_t newNumVertices) = 0;
+
+  /**
+   * @brief setVertices
+   * @param vertices
+   */
+  virtual void setVertices(SharedVertexList::Pointer vertices) = 0;
+
+  /**
+   * @brief getVertices
+   * @return
+   */
+  virtual SharedVertexList::Pointer getVertices() const = 0;
+
+  /**
+   * @brief setCoords
+   * @param vertId
+   * @param coords
+   */
+  virtual void setCoords(size_t vertId, float coords[3]) = 0;
+
+  /**
+   * @brief getCoords
+   * @param vertId
+   * @param coords
+   */
+  virtual void getCoords(size_t vertId, float coords[3]) const = 0;
+
+  /**
+   * @brief getVertexPointer
+   * @param i
+   * @return
+   */
+  virtual float* getVertexPointer(size_t i) const = 0;
+
+  /**
+   * @brief getNumberOfVertices
+   * @return
+   */
+  virtual size_t getNumberOfVertices() const = 0;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedEdgeOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeEdgeList
+   * @param newNumEdges
+   */
+  virtual void resizeEdgeList(size_t newNumEdges) = 0;
+
+  /**
+   * @brief getEdges
+   * @return
+   */
+  virtual SharedEdgeList::Pointer getEdges() const = 0;
+
+  /**
+   * @brief setVerts
+   * @param edgeId
+   * @param verts
+   */
+  virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
+
+  /**
+   * @brief getVerts
+   * @param edgeId
+   * @param verts
+   */
+  virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
+
+  /**
+   * @brief getVertCoordsAtEdge
+   * @param edgeId
+   * @param vert1
+   * @param vert2
+   */
+  virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
+
+  /**
+   * @brief getEdgePointer
+   * @param i
+   * @return
+   */
+  virtual size_t* getEdgePointer(size_t i) const = 0;
+
+  /**
+   * @brief getNumberOfEdges
+   * @return
+   */
+  virtual size_t getNumberOfEdges() const = 0;
+
+  // -----------------------------------------------------------------------------
+  // Connectivity
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief findElementEdges
+   * @return
+   */
+  virtual int findEdges() = 0;
+
+  /**
+   * @brief deleteElementEdges
+   */
+  virtual void deleteEdges() = 0;
+
+  // -----------------------------------------------------------------------------
+  // Topology
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief findUnsharedEdges
+   */
+  virtual int findUnsharedEdges() = 0;
+
+  /**
+   * @brief getUnsharedEdges
+   * @return
+   */
+  virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
+
+  /**
+   * @brief deleteUnsharedEdges
+   */
+  virtual void deleteUnsharedEdges() = 0;
+
+protected:
+  /**
+   * @brief setEdges
+   * @param edges
+   */
+  virtual void setEdges(SharedEdgeList::Pointer edges) = 0;
+
+  /**
+   * @brief setUnsharedEdges
+   * @param bEdgeList
+   */
+  virtual void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) = 0;
+
+public:
+  IGeometry2D(const IGeometry2D&) = delete;            // Copy Constructor Not Implemented
+  IGeometry2D(IGeometry2D&&) = delete;                 // Move Constructor Not Implemented
+  IGeometry2D& operator=(const IGeometry2D&) = delete; // Copy Assignment Not Implemented
+  IGeometry2D& operator=(IGeometry2D&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.cpp b/Source/SIMPLib/Geometry/IGeometry3D.cpp
index 49ca9f4f24..85fe790594 100644
--- a/Source/SIMPLib/Geometry/IGeometry3D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry3D.cpp
@@ -44,3 +44,21 @@ IGeometry3D::IGeometry3D() = default;
 //
 // -----------------------------------------------------------------------------
 IGeometry3D::~IGeometry3D() = default;
+
+// -----------------------------------------------------------------------------
+IGeometry3D::Pointer IGeometry3D::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry3D::getNameOfClass() const
+{
+  return QString("IGeometry3D");
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometry3D::ClassName()
+{
+  return QString("IGeometry3D");
+}
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
index f3e4171c23..6e5fca8b93 100755
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -35,8 +35,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
@@ -46,8 +47,21 @@
 class SIMPLib_EXPORT IGeometry3D : public IGeometry
 {
   public:
-    SIMPL_SHARED_POINTERS(IGeometry3D)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IGeometry3D, Observable)
+    using Self = IGeometry3D;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for IGeometry3D
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for IGeometry3D
+     */
+    static QString ClassName();
 
     IGeometry3D();
     ~IGeometry3D() override;
@@ -239,6 +253,8 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
     IGeometry3D(IGeometry3D&&) = delete;         // Move Constructor Not Implemented
     IGeometry3D& operator=(const IGeometry3D&) = delete; // Copy Assignment Not Implemented
     IGeometry3D& operator=(IGeometry3D&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.cpp b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
index 78b6795aa3..181d0ee595 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.cpp
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
@@ -44,3 +44,21 @@ IGeometryGrid::IGeometryGrid() = default;
 //
 // -----------------------------------------------------------------------------
 IGeometryGrid::~IGeometryGrid() = default;
+
+// -----------------------------------------------------------------------------
+IGeometryGrid::Pointer IGeometryGrid::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometryGrid::getNameOfClass() const
+{
+  return QString("IGeometryGrid");
+}
+
+// -----------------------------------------------------------------------------
+QString IGeometryGrid::ClassName()
+{
+  return QString("IGeometryGrid");
+}
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 95fc2dacd1..4ec39d7701 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -1,44 +1,45 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
+#include <memory>
+
 #include <tuple>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 
@@ -48,43 +49,59 @@
 class SIMPLib_EXPORT IGeometryGrid : public IGeometry
 {
   // This class needs to be wrapped so Python/Pybind11 can do the proper casting
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(IGeometryGrid SUPERCLASS IGeometry)
+  PYB11_SHARED_POINTERS(IGeometryGrid)
+#endif
+
+public:
+  using Self = IGeometryGrid;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-  public:
-    SIMPL_SHARED_POINTERS(IGeometryGrid)
-    SIMPL_TYPE_MACRO_SUPER_OVERRIDE(IGeometryGrid, Observable)
+  /**
+   * @brief Returns the name of the class for IGeometryGrid
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IGeometryGrid
+   */
+  static QString ClassName();
 
-    IGeometryGrid();
-    ~IGeometryGrid() override;
+  IGeometryGrid();
+  ~IGeometryGrid() override;
 
-    virtual void setDimensions(const SizeVec3Type& dims) = 0;
-    virtual SizeVec3Type getDimensions() const = 0;
+  virtual void setDimensions(const SizeVec3Type& dims) = 0;
+  virtual SizeVec3Type getDimensions() const = 0;
 
-    virtual size_t getXPoints() const = 0;
-    virtual size_t getYPoints() const = 0;
-    virtual size_t getZPoints() const = 0;
-    
-    virtual void getPlaneCoords(size_t idx[3], float coords[3]) const = 0;
-    virtual void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
-    virtual void getPlaneCoords(size_t idx, float coords[3]) const = 0;
-    
-    virtual void getPlaneCoords(size_t idx[3], double coords[3]) const = 0;
-    virtual void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
-    virtual void getPlaneCoords(size_t idx, double coords[3]) const = 0;
+  virtual size_t getXPoints() const = 0;
+  virtual size_t getYPoints() const = 0;
+  virtual size_t getZPoints() const = 0;
+  
+  virtual void getPlaneCoords(size_t idx[3], float coords[3]) const = 0;
+  virtual void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
+  virtual void getPlaneCoords(size_t idx, float coords[3]) const = 0;
+  
+  virtual void getPlaneCoords(size_t idx[3], double coords[3]) const = 0;
+  virtual void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
+  virtual void getPlaneCoords(size_t idx, double coords[3]) const = 0;
 
-    virtual void getCoords(size_t idx[3], float coords[3]) const = 0;
-    virtual void getCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
-    virtual void getCoords(size_t idx, float coords[3]) const = 0;
-    
-    virtual void getCoords(size_t idx[3], double coords[3]) const = 0;
-    virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
-    virtual void getCoords(size_t idx, double coords[3]) const = 0;
+  virtual void getCoords(size_t idx[3], float coords[3]) const = 0;
+  virtual void getCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
+  virtual void getCoords(size_t idx, float coords[3]) const = 0;
+  
+  virtual void getCoords(size_t idx[3], double coords[3]) const = 0;
+  virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
+  virtual void getCoords(size_t idx, double coords[3]) const = 0;
 
-  public:
-    IGeometryGrid(const IGeometryGrid&) = delete;  // Copy Constructor Not Implemented
-    IGeometryGrid(IGeometryGrid&&) = delete;       // Move Constructor Not Implemented
-    IGeometryGrid& operator=(const IGeometryGrid&) = delete; // Copy Assignment Not Implemented
-    IGeometryGrid& operator=(IGeometryGrid&&) = delete;      // Move Assignment Not Implemented
+public:
+  IGeometryGrid(const IGeometryGrid&) = delete;            // Copy Constructor Not Implemented
+  IGeometryGrid(IGeometryGrid&&) = delete;                 // Move Constructor Not Implemented
+  IGeometryGrid& operator=(const IGeometryGrid&) = delete; // Copy Assignment Not Implemented
+  IGeometryGrid& operator=(IGeometryGrid&&) = delete;      // Move Assignment Not Implemented
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.cpp b/Source/SIMPLib/Geometry/ITransformContainer.cpp
index 5c42d0c530..06769369c9 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/ITransformContainer.cpp
@@ -35,3 +35,21 @@
 ITransformContainer::ITransformContainer() = default;
 
 ITransformContainer::~ITransformContainer() = default;
+
+// -----------------------------------------------------------------------------
+ITransformContainer::Pointer ITransformContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString ITransformContainer::getNameOfClass() const
+{
+  return QString("ITransformContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString ITransformContainer::ClassName()
+{
+  return QString("ITransformContainer");
+}
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index c5968824a4..0c71418e77 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -32,6 +32,8 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -40,9 +42,22 @@
 class SIMPLib_EXPORT ITransformContainer : public Observable
 {
 public:
-  SIMPL_SHARED_POINTERS(ITransformContainer)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ITransformContainer, Observable)
-  
+  using Self = ITransformContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for ITransformContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ITransformContainer
+   */
+  static QString ClassName();
+
   ITransformContainer();
   ~ITransformContainer() override;
 
@@ -56,4 +71,5 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
   ITransformContainer& operator=(const ITransformContainer&) = delete; // Copy Assignment Not Implemented
   ITransformContainer& operator=(ITransformContainer&&) = delete;      // Move Assignment Not Implemented
 
+private:
 };
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 00ed3c2864..6a64daca47 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -43,6 +43,8 @@
  *     ImageGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/ImageGeom.h"
 
 #include "H5Support/H5Lite.h"
@@ -1180,3 +1182,28 @@ ImageGeom::ErrorType ImageGeom::computeCellIndex(const float coords[], size_t& i
   }
   return err;
 }
+
+// -----------------------------------------------------------------------------
+ImageGeom::Pointer ImageGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+ImageGeom::Pointer ImageGeom::New()
+{
+  Pointer sharedPtr(new(ImageGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString ImageGeom::getNameOfClass() const
+{
+  return QString("ImageGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString ImageGeom::ClassName()
+{
+  return QString("ImageGeom");
+}
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 94cdff6864..6760a050fa 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -1,43 +1,49 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
+
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Geometry/IGeometryGrid.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The ImageGeom class represents a structured rectlinear grid
@@ -45,8 +51,10 @@
 class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
 {
   // clang-format off
-
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ImageGeom SUPERCLASS IGeometryGrid)
+  PYB11_SHARED_POINTERS(ImageGeom)
+  PYB11_STATIC_NEW_MACRO(ImageGeom)
   PYB11_STATIC_CREATION(CreateGeometry ARGS QString)
 
   PYB11_ENUMERATION(ErrorType)
@@ -65,12 +73,27 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   PYB11_METHOD(FloatVec3Type getOrigin)
 
   PYB11_METHOD(FloatVec6Type getBoundingBox OVERLOAD CONST_METHOD)
+#endif
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(ImageGeom)
-  SIMPL_STATIC_NEW_MACRO(ImageGeom)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ImageGeom, Observable)
+  using Self = ImageGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ImageGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ImageGeom
+   */
+  static QString ClassName();
 
   ~ImageGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 2981981201..022dd3a7e9 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -44,6 +44,8 @@
  *     QuadGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/QuadGeom.h"
 
 #if defined SIMPL_USE_EIGEN
@@ -761,3 +763,28 @@ IGeometry::Pointer QuadGeom::deepCopy(bool forceNoAllocate) const
 #include "SIMPLib/Geometry/SharedEdgeOps.cpp"
 #include "SIMPLib/Geometry/SharedQuadOps.cpp"
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+QuadGeom::Pointer QuadGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QuadGeom::Pointer QuadGeom::New()
+{
+  Pointer sharedPtr(new(QuadGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString QuadGeom::getNameOfClass() const
+{
+  return QString("QuadGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString QuadGeom::ClassName()
+{
+  return QString("QuadGeom");
+}
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 0d0e650f85..66b257e58f 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -1,42 +1,48 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
+
 #include "SIMPLib/Geometry/IGeometry2D.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The QuadGeom class represents a collection of quadrilaterals
@@ -44,7 +50,11 @@
 class SIMPLib_EXPORT QuadGeom : public IGeometry2D
 {
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(QuadGeom SUPERCLASS IGeometry2D)
+  PYB11_SHARED_POINTERS(QuadGeom)
+  PYB11_STATIC_NEW_MACRO(QuadGeom)
 
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedQuadList::Pointer SharedVertexList::Pointer QString)
@@ -65,12 +75,28 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_METHOD(size_t getNumberOfQuads)
   PYB11_METHOD(size_t getNumberOfElements)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(QuadGeom)
-  SIMPL_STATIC_NEW_MACRO(QuadGeom)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(QuadGeom, Observable)
+  using Self = QuadGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for QuadGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for QuadGeom
+   */
+  static QString ClassName();
 
   ~QuadGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index d1b4707989..a21356342a 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -43,6 +43,8 @@
  *     RectGridGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/RectGridGeom.h"
 
 #include "H5Support/H5Lite.h"
@@ -1182,3 +1184,28 @@ int RectGridGeom::gatherMetaData(hid_t parentId, size_t volDims[3], bool preflig
 
   return err;
 }
+
+// -----------------------------------------------------------------------------
+RectGridGeom::Pointer RectGridGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+RectGridGeom::Pointer RectGridGeom::New()
+{
+  Pointer sharedPtr(new(RectGridGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString RectGridGeom::getNameOfClass() const
+{
+  return QString("RectGridGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString RectGridGeom::ClassName()
+{
+  return QString("RectGridGeom");
+}
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 4f55bf9edc..ba0c344f0c 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -35,18 +35,38 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/IGeometryGrid.h"
 
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 /**
  * @brief The RectGridGeom class represents a structured rectlinear grid
  */
 class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
 {
   public:
-    SIMPL_SHARED_POINTERS(RectGridGeom)
-    SIMPL_STATIC_NEW_MACRO(RectGridGeom)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(RectGridGeom, Observable)
+    using Self = RectGridGeom;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for RectGridGeom
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for RectGridGeom
+     */
+    static QString ClassName();
 
     ~RectGridGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
index eecdddf8a3..50543bb81b 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
@@ -169,3 +169,28 @@ float CubeOctohedronOps::inside(float axis1comp, float axis2comp, float axis3com
   }
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+CubeOctohedronOps::Pointer CubeOctohedronOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString CubeOctohedronOps::getNameOfClass() const
+{
+  return QString("CubeOctohedronOps");
+}
+
+// -----------------------------------------------------------------------------
+QString CubeOctohedronOps::ClassName()
+{
+  return QString("CubeOctohedronOps");
+}
+
+// -----------------------------------------------------------------------------
+CubeOctohedronOps::Pointer CubeOctohedronOps::New()
+{
+  Pointer sharedPtr(new(CubeOctohedronOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
index c7e67c94da..50cdd856c6 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
@@ -36,8 +36,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 
@@ -47,9 +48,23 @@
 class SIMPLib_EXPORT CubeOctohedronOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(CubeOctohedronOps)
-    SIMPL_TYPE_MACRO(CubeOctohedronOps)
-    SIMPL_STATIC_NEW_MACRO(CubeOctohedronOps)
+    using Self = CubeOctohedronOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for CubeOctohedronOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CubeOctohedronOps
+     */
+    static QString ClassName();
+
+    static Pointer New();
 
     ~CubeOctohedronOps() override;
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
index 3bbd4d50ec..56f2daac9b 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
@@ -83,3 +83,28 @@ float CylinderAOps::inside(float axis1comp, float axis2comp, float axis3comp)
   }
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+CylinderAOps::Pointer CylinderAOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderAOps::getNameOfClass() const
+{
+  return QString("CylinderAOps");
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderAOps::ClassName()
+{
+  return QString("CylinderAOps");
+}
+
+// -----------------------------------------------------------------------------
+CylinderAOps::Pointer CylinderAOps::New()
+{
+  Pointer sharedPtr(new(CylinderAOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
index 2ba6e012f1..904d1044b5 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
@@ -36,8 +36,9 @@
 #pragma once
 
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 /*
@@ -46,10 +47,23 @@
 class SIMPLib_EXPORT CylinderAOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(CylinderAOps)
-    SIMPL_TYPE_MACRO(CylinderAOps)
-    SIMPL_STATIC_NEW_MACRO(CylinderAOps)
+    using Self = CylinderAOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for CylinderAOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CylinderAOps
+     */
+    static QString ClassName();
 
+    static Pointer New();
 
     ~CylinderAOps() override;
 
@@ -65,6 +79,8 @@ class SIMPLib_EXPORT CylinderAOps : public ShapeOps
     CylinderAOps(CylinderAOps&&) = delete;        // Move Constructor Not Implemented
     CylinderAOps& operator=(const CylinderAOps&) = delete; // Copy Assignment Not Implemented
     CylinderAOps& operator=(CylinderAOps&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
index f9d9a504d8..613397c1a4 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
@@ -83,3 +83,28 @@ float CylinderBOps::inside(float axis1comp, float axis2comp, float axis3comp)
   }
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+CylinderBOps::Pointer CylinderBOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderBOps::getNameOfClass() const
+{
+  return QString("CylinderBOps");
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderBOps::ClassName()
+{
+  return QString("CylinderBOps");
+}
+
+// -----------------------------------------------------------------------------
+CylinderBOps::Pointer CylinderBOps::New()
+{
+  Pointer sharedPtr(new(CylinderBOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
index e001e00bab..b81eef6d00 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
@@ -36,8 +36,9 @@
 #pragma once
 
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 /*
@@ -46,10 +47,23 @@
 class SIMPLib_EXPORT CylinderBOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(CylinderBOps)
-    SIMPL_TYPE_MACRO(CylinderBOps)
-    SIMPL_STATIC_NEW_MACRO(CylinderBOps)
+    using Self = CylinderBOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for CylinderBOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CylinderBOps
+     */
+    static QString ClassName();
 
+    static Pointer New();
 
     ~CylinderBOps() override;
 
@@ -65,6 +79,8 @@ class SIMPLib_EXPORT CylinderBOps : public ShapeOps
     CylinderBOps(CylinderBOps&&) = delete;        // Move Constructor Not Implemented
     CylinderBOps& operator=(const CylinderBOps&) = delete; // Copy Assignment Not Implemented
     CylinderBOps& operator=(CylinderBOps&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
index f12d52ce43..83aad1b57d 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
@@ -83,3 +83,28 @@ float CylinderCOps::inside(float axis1comp, float axis2comp, float axis3comp)
   }
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+CylinderCOps::Pointer CylinderCOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderCOps::getNameOfClass() const
+{
+  return QString("CylinderCOps");
+}
+
+// -----------------------------------------------------------------------------
+QString CylinderCOps::ClassName()
+{
+  return QString("CylinderCOps");
+}
+
+// -----------------------------------------------------------------------------
+CylinderCOps::Pointer CylinderCOps::New()
+{
+  Pointer sharedPtr(new(CylinderCOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
index 283c541b14..760a68a96c 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
@@ -36,8 +36,9 @@
 #pragma once
 
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 /*
@@ -46,10 +47,23 @@
 class SIMPLib_EXPORT CylinderCOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(CylinderCOps)
-    SIMPL_TYPE_MACRO(CylinderCOps)
-    SIMPL_STATIC_NEW_MACRO(CylinderCOps)
+    using Self = CylinderCOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for CylinderCOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for CylinderCOps
+     */
+    static QString ClassName();
 
+    static Pointer New();
 
     ~CylinderCOps() override;
 
@@ -65,6 +79,8 @@ class SIMPLib_EXPORT CylinderCOps : public ShapeOps
     CylinderCOps(CylinderCOps&&) = delete;        // Move Constructor Not Implemented
     CylinderCOps& operator=(const CylinderCOps&) = delete; // Copy Assignment Not Implemented
     CylinderCOps& operator=(CylinderCOps&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
index d083aeb940..1d2fe9f318 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
@@ -78,3 +78,28 @@ float EllipsoidOps::inside(float axis1comp, float axis2comp, float axis3comp)
   inside = 1.0f - axis1comp - axis2comp - axis3comp;
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+EllipsoidOps::Pointer EllipsoidOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString EllipsoidOps::getNameOfClass() const
+{
+  return QString("EllipsoidOps");
+}
+
+// -----------------------------------------------------------------------------
+QString EllipsoidOps::ClassName()
+{
+  return QString("EllipsoidOps");
+}
+
+// -----------------------------------------------------------------------------
+EllipsoidOps::Pointer EllipsoidOps::New()
+{
+  Pointer sharedPtr(new(EllipsoidOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
index 12d1c92d17..9ee1a5e240 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
@@ -36,8 +36,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 /*
  *
@@ -45,9 +46,23 @@
 class SIMPLib_EXPORT EllipsoidOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(EllipsoidOps)
-    SIMPL_TYPE_MACRO(EllipsoidOps)
-    SIMPL_STATIC_NEW_MACRO(EllipsoidOps)
+    using Self = EllipsoidOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for EllipsoidOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for EllipsoidOps
+     */
+    static QString ClassName();
+
+    static Pointer New();
 
     ~EllipsoidOps() override;
 
@@ -62,6 +77,8 @@ class SIMPLib_EXPORT EllipsoidOps : public ShapeOps
     EllipsoidOps(EllipsoidOps&&) = delete;        // Move Constructor Not Implemented
     EllipsoidOps& operator=(const EllipsoidOps&) = delete; // Copy Assignment Not Implemented
     EllipsoidOps& operator=(EllipsoidOps&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
index 947a7d29d9..b0249afe54 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
@@ -110,3 +110,28 @@ float ShapeOps::inside(float axis1comp, float axis2comp, float axis3comp)
 void ShapeOps::init()
 {
 }
+
+// -----------------------------------------------------------------------------
+ShapeOps::Pointer ShapeOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeOps::getNameOfClass() const
+{
+  return QString("ShapeOps");
+}
+
+// -----------------------------------------------------------------------------
+QString ShapeOps::ClassName()
+{
+  return QString("ShapeOps");
+}
+
+// -----------------------------------------------------------------------------
+ShapeOps::Pointer ShapeOps::New()
+{
+  Pointer sharedPtr(new(ShapeOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
index 5b25315780..08bb81d452 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
@@ -37,12 +37,12 @@
 #pragma once
 
 #include <vector>
+#include <memory>
 
 #include <QtCore/QMap>
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 /**
  * @brief The ShapeOps class
@@ -50,9 +50,23 @@
 class SIMPLib_EXPORT ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(ShapeOps)
-    SIMPL_TYPE_MACRO(ShapeOps)
-    SIMPL_STATIC_NEW_MACRO(ShapeOps)
+    using Self = ShapeOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for ShapeOps
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for ShapeOps
+     */
+    static QString ClassName();
+
+    static Pointer New();
 
     virtual ~ShapeOps();
 
@@ -94,6 +108,8 @@ class SIMPLib_EXPORT ShapeOps
     ShapeOps(ShapeOps&&) = delete;            // Move Constructor Not Implemented
     ShapeOps& operator=(const ShapeOps&) = delete; // Copy Assignment Not Implemented
     ShapeOps& operator=(ShapeOps&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
index e0054317a0..f94f3f313c 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
@@ -113,3 +113,28 @@ float SuperEllipsoidOps::inside(float axis1comp, float axis2comp, float axis3com
   inside = 1.0f - axis1comp - axis2comp - axis3comp;
   return inside;
 }
+
+// -----------------------------------------------------------------------------
+SuperEllipsoidOps::Pointer SuperEllipsoidOps::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString SuperEllipsoidOps::getNameOfClass() const
+{
+  return QString("SuperEllipsoidOps");
+}
+
+// -----------------------------------------------------------------------------
+QString SuperEllipsoidOps::ClassName()
+{
+  return QString("SuperEllipsoidOps");
+}
+
+// -----------------------------------------------------------------------------
+SuperEllipsoidOps::Pointer SuperEllipsoidOps::New()
+{
+  Pointer sharedPtr(new(SuperEllipsoidOps));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
index 1560b1ad0c..6c008ab268 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
@@ -35,8 +35,9 @@
 
 #pragma once
 
+#include <memory>
+
 #include "ShapeOps.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 /*
@@ -45,9 +46,23 @@
 class SIMPLib_EXPORT SuperEllipsoidOps : public ShapeOps
 {
   public:
-    SIMPL_SHARED_POINTERS(SuperEllipsoidOps)
-    SIMPL_TYPE_MACRO(SuperEllipsoidOps)
-    SIMPL_STATIC_NEW_MACRO(SuperEllipsoidOps)
+    using Self = SuperEllipsoidOps;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for SuperEllipsoidOps
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for SuperEllipsoidOps
+     */
+    static QString ClassName();
+
+    static Pointer New();
 
     ~SuperEllipsoidOps() override;
 
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 89c08da5a8..563eb2bae8 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -44,6 +44,8 @@
  *     TetrahedralGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
@@ -875,3 +877,28 @@ IGeometry::Pointer TetrahedralGeom::deepCopy(bool forceNoAllocate) const
 #include "SIMPLib/Geometry/SharedTetOps.cpp"
 #include "SIMPLib/Geometry/SharedTriOps.cpp"
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+TetrahedralGeom::Pointer TetrahedralGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+TetrahedralGeom::Pointer TetrahedralGeom::New()
+{
+  Pointer sharedPtr(new(TetrahedralGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString TetrahedralGeom::getNameOfClass() const
+{
+  return QString("TetrahedralGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString TetrahedralGeom::ClassName()
+{
+  return QString("TetrahedralGeom");
+}
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 20dfaca575..8c2d826505 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -35,19 +35,38 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/IGeometry3D.h"
 
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 /**
  * @brief The TetrahedralGeom class represents a collection of tetrahedra
  */
 class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
 {
   public:
+    using Self = TetrahedralGeom;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
 
-    SIMPL_SHARED_POINTERS(TetrahedralGeom)
-    SIMPL_STATIC_NEW_MACRO(TetrahedralGeom)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TetrahedralGeom, Observable)
+    /**
+     * @brief Returns the name of the class for TetrahedralGeom
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for TetrahedralGeom
+     */
+    static QString ClassName();
 
     ~TetrahedralGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/TransformContainer.cpp b/Source/SIMPLib/Geometry/TransformContainer.cpp
index dfe7886571..2606af7be8 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/TransformContainer.cpp
@@ -99,7 +99,7 @@ int TransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std:
   return err;
 }
 
-int TransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool SIMPL_NOT_USED(metaDataOnly), const std::string& transformName)
+int TransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformName)
 {
   herr_t err = 0;
   err = H5Utilities::createGroupsFromPath(transformName, parentId);
@@ -163,4 +163,88 @@ TransformContainer& TransformContainer::operator=(const TransformContainer& old)
     this->m_ReferenceName = old.m_ReferenceName;
   }
   return *this;
-}
\ No newline at end of file
+}
+// -----------------------------------------------------------------------------
+TransformContainer::Pointer TransformContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+TransformContainer::Pointer TransformContainer::New()
+{
+  Pointer sharedPtr(new(TransformContainer));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString TransformContainer::getNameOfClass() const
+{
+  return QString("TransformContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString TransformContainer::ClassName()
+{
+  return QString("TransformContainer");
+}
+
+// -----------------------------------------------------------------------------
+void TransformContainer::setParameters(const TransformContainer::TransformParametersType& value)
+{
+  m_Parameters = value;
+}
+
+// -----------------------------------------------------------------------------
+TransformContainer::TransformParametersType TransformContainer::getParameters() const
+{
+  return m_Parameters;
+}
+
+// -----------------------------------------------------------------------------
+void TransformContainer::setFixedParameters(const TransformContainer::TransformFixedParametersType& value)
+{
+  m_FixedParameters = value;
+}
+
+// -----------------------------------------------------------------------------
+TransformContainer::TransformFixedParametersType TransformContainer::getFixedParameters() const
+{
+  return m_FixedParameters;
+}
+
+// -----------------------------------------------------------------------------
+void TransformContainer::setTransformTypeAsString(const std::string& value)
+{
+  m_TransformTypeAsString = value;
+}
+
+// -----------------------------------------------------------------------------
+std::string TransformContainer::getTransformTypeAsString() const
+{
+  return m_TransformTypeAsString;
+}
+
+// -----------------------------------------------------------------------------
+void TransformContainer::setMovingName(const std::string& value)
+{
+  m_MovingName = value;
+}
+
+// -----------------------------------------------------------------------------
+std::string TransformContainer::getMovingName() const
+{
+  return m_MovingName;
+}
+
+// -----------------------------------------------------------------------------
+void TransformContainer::setReferenceName(const std::string& value)
+{
+  m_ReferenceName = value;
+}
+
+// -----------------------------------------------------------------------------
+std::string TransformContainer::getReferenceName() const
+{
+  return m_ReferenceName;
+}
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index ab76eb6cca..5fc7d01d68 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -49,19 +51,84 @@ class SIMPLib_EXPORT TransformContainer : public ITransformContainer
   TransformContainer();
   ~TransformContainer() override;
 
-  SIMPL_SHARED_POINTERS(TransformContainer)
-  SIMPL_STATIC_NEW_MACRO(TransformContainer)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TransformContainer, ITransformContainer)
+  using Self = TransformContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for TransformContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for TransformContainer
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for Parameters
+   */
+  void setParameters(const TransformContainer::TransformParametersType& value);
+  /**
+   * @brief Getter property for Parameters
+   * @return Value of Parameters
+   */
+  TransformContainer::TransformParametersType getParameters() const;
 
-  SIMPL_INSTANCE_PROPERTY(TransformContainer::TransformParametersType, Parameters)
-  SIMPL_INSTANCE_PROPERTY(TransformContainer::TransformFixedParametersType, FixedParameters)
-  SIMPL_INSTANCE_PROPERTY(std::string, TransformTypeAsString)
-  SIMPL_INSTANCE_PROPERTY(std::string, MovingName)
-  SIMPL_INSTANCE_PROPERTY(std::string, ReferenceName)
+  /**
+   * @brief Setter property for FixedParameters
+   */
+  void setFixedParameters(const TransformContainer::TransformFixedParametersType& value);
+  /**
+   * @brief Getter property for FixedParameters
+   * @return Value of FixedParameters
+   */
+  TransformContainer::TransformFixedParametersType getFixedParameters() const;
+
+  /**
+   * @brief Setter property for TransformTypeAsString
+   */
+  void setTransformTypeAsString(const std::string& value);
+  /**
+   * @brief Getter property for TransformTypeAsString
+   * @return Value of TransformTypeAsString
+   */
+  std::string getTransformTypeAsString() const;
+
+  /**
+   * @brief Setter property for MovingName
+   */
+  void setMovingName(const std::string& value);
+  /**
+   * @brief Getter property for MovingName
+   * @return Value of MovingName
+   */
+  std::string getMovingName() const;
+
+  /**
+   * @brief Setter property for ReferenceName
+   */
+  void setReferenceName(const std::string& value);
+  /**
+   * @brief Getter property for ReferenceName
+   * @return Value of ReferenceName
+   */
+  std::string getReferenceName() const;
 
   TransformContainer& operator=(const TransformContainer&);
 
   int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
   
   int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
+
+private:
+  TransformContainer::TransformParametersType m_Parameters = {};
+  TransformContainer::TransformFixedParametersType m_FixedParameters = {};
+  std::string m_TransformTypeAsString = {};
+  std::string m_MovingName = {};
+  std::string m_ReferenceName = {};
 };
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 1d25bcc3a8..be2f5eacd0 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -44,6 +44,8 @@
  *     TriangleGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/TriangleGeom.h"
 
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
@@ -758,3 +760,28 @@ IGeometry::Pointer TriangleGeom::deepCopy(bool forceNoAllocate) const
 #include "SIMPLib/Geometry/SharedEdgeOps.cpp"
 #include "SIMPLib/Geometry/SharedTriOps.cpp"
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+TriangleGeom::Pointer TriangleGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+TriangleGeom::Pointer TriangleGeom::New()
+{
+  Pointer sharedPtr(new(TriangleGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString TriangleGeom::getNameOfClass() const
+{
+  return QString("TriangleGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString TriangleGeom::ClassName()
+{
+  return QString("TriangleGeom");
+}
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 091d3a6eb9..49943f0c99 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -1,42 +1,48 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLib.h"
+
 #include "SIMPLib/Geometry/IGeometry2D.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The TriangleGeom class represents a collection of triangles
@@ -44,7 +50,11 @@
 class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
 {
   // clang-format off
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(TriangleGeom SUPERCLASS IGeometry2D)
+  PYB11_SHARED_POINTERS(TriangleGeom)
+  PYB11_STATIC_NEW_MACRO(TriangleGeom)
 	  
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedTriList::Pointer SharedVertexList::Pointer QString)
@@ -60,12 +70,28 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
 
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(TriangleGeom)
-  SIMPL_STATIC_NEW_MACRO(TriangleGeom)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TriangleGeom, Observable)
+  using Self = TriangleGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for TriangleGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for TriangleGeom
+   */
+  static QString ClassName();
 
   ~TriangleGeom() override;
 
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 13000786b6..0db63f4505 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -42,6 +42,8 @@
  *   - re-implemented vtkVertex::Derivatives to VertexGeom::findDerivatives
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 // -----------------------------------------------------------------------------
@@ -471,3 +473,28 @@ IGeometry::Pointer VertexGeom::deepCopy(bool forceNoAllocate) const
 
 #define GEOM_CLASS_NAME VertexGeom
 #include "SIMPLib/Geometry/SharedVertexOps.cpp"
+
+// -----------------------------------------------------------------------------
+VertexGeom::Pointer VertexGeom::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+VertexGeom::Pointer VertexGeom::New()
+{
+  Pointer sharedPtr(new(VertexGeom));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString VertexGeom::getNameOfClass() const
+{
+  return QString("VertexGeom");
+}
+
+// -----------------------------------------------------------------------------
+QString VertexGeom::ClassName()
+{
+  return QString("VertexGeom");
+}
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 863f12e1a8..6285556e11 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -35,11 +35,16 @@
 
 #pragma once
 
+#include <memory>
+
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The VertexGeom class represents a point cloud
@@ -48,7 +53,11 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
 {
   // clang-format off
 
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(VertexGeom SUPERCLASS IGeometry)
+  PYB11_SHARED_POINTERS(VertexGeom)
+  PYB11_STATIC_NEW_MACRO(VertexGeom)
   
   PYB11_CREATION(CreateGeometry ARGS size_t QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedVertexList::Pointer QString)
@@ -61,12 +70,28 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
 
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfElements)
+#endif
+
   // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(VertexGeom)
-  SIMPL_STATIC_NEW_MACRO(VertexGeom)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(VertexGeom, Observable)
+  using Self = VertexGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for VertexGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for VertexGeom
+   */
+  static QString ClassName();
 
   ~VertexGeom() override;
 
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
index a2e5899b72..d7f4a25b0d 100644
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
@@ -166,3 +166,28 @@ int H5BoundaryStatsDataDelegate::readParentPhase(BoundaryStatsData* data, hid_t
   data->setParentPhase(static_cast<float>(parentPhase));
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5BoundaryStatsDataDelegate::Pointer H5BoundaryStatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5BoundaryStatsDataDelegate::Pointer H5BoundaryStatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5BoundaryStatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5BoundaryStatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5BoundaryStatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5BoundaryStatsDataDelegate::ClassName()
+{
+  return QString("H5BoundaryStatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
index 4b77e9cb01..0f3650e4c1 100755
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -37,11 +37,12 @@
 #pragma once
 
 
+#include <memory>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
@@ -57,10 +58,24 @@
 class SIMPLib_EXPORT H5BoundaryStatsDataDelegate : public H5StatsDataDelegate
 {
   public:
+    using Self = H5BoundaryStatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5BoundaryStatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5BoundaryStatsDataDelegate)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5BoundaryStatsDataDelegate, H5StatsDataDelegate)
     ~H5BoundaryStatsDataDelegate() override;
 
     int writeBoundaryStatsData(BoundaryStatsData* data, hid_t groupId);
@@ -83,6 +98,8 @@ class SIMPLib_EXPORT H5BoundaryStatsDataDelegate : public H5StatsDataDelegate
     H5BoundaryStatsDataDelegate(H5BoundaryStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5BoundaryStatsDataDelegate& operator=(const H5BoundaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5BoundaryStatsDataDelegate& operator=(H5BoundaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index 63f1c8b063..33bc1e6bd6 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -40,7 +40,10 @@
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.h b/Source/SIMPLib/HDF5/H5DataArrayReader.h
index eb1e42fdc8..fcf98a2cd1 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.h
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.h
@@ -38,11 +38,15 @@
 
 #include <hdf5.h>
 
+#include <memory>
+
 #include <QtCore/QString>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
  * @class H5DataArrayReader H5DataArrayReader.h DREAM3DLib/HDF5/H5DataArrayReader.h
@@ -74,7 +78,7 @@ class SIMPLib_EXPORT H5DataArrayReader
      * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
      * @return
      */
-    static IDataArray::Pointer ReadIDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
+    static IDataArrayShPtrType ReadIDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
 
     /**
      * @brief ReadNeighborListData
@@ -83,7 +87,7 @@ class SIMPLib_EXPORT H5DataArrayReader
      * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
      * @return
      */
-    static IDataArray::Pointer ReadNeighborListData(hid_t gid, const QString& name, bool metaDataOnly = false);
+    static IDataArrayShPtrType ReadNeighborListData(hid_t gid, const QString& name, bool metaDataOnly = false);
 
     /**
      * @brief readStringDataArray
@@ -92,8 +96,7 @@ class SIMPLib_EXPORT H5DataArrayReader
      * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
      * @return
      */
-    static IDataArray::Pointer ReadStringDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
-
+    static IDataArrayShPtrType ReadStringDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
 
   protected:
     H5DataArrayReader();
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
index 5b4674594a..747d76487b 100644
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
@@ -106,3 +106,28 @@ int H5MatrixStatsDataDelegate::readPhaseFraction(MatrixStatsData* data, hid_t pi
   data->setPhaseFraction(phaseFraction);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5MatrixStatsDataDelegate::Pointer H5MatrixStatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5MatrixStatsDataDelegate::Pointer H5MatrixStatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5MatrixStatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5MatrixStatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5MatrixStatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5MatrixStatsDataDelegate::ClassName()
+{
+  return QString("H5MatrixStatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
index 261c2dedea..91959c7a4c 100755
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -37,11 +37,12 @@
 #pragma once
 
 
+#include <memory>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
@@ -56,10 +57,24 @@
 class SIMPLib_EXPORT H5MatrixStatsDataDelegate : public H5StatsDataDelegate
 {
   public:
+    using Self = H5MatrixStatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5MatrixStatsDataDelegate
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5MatrixStatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5MatrixStatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5MatrixStatsDataDelegate)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5MatrixStatsDataDelegate, H5StatsDataDelegate)
     ~H5MatrixStatsDataDelegate() override;
 
     int writeMatrixStatsData(MatrixStatsData* data, hid_t groupId);
@@ -76,6 +91,8 @@ class SIMPLib_EXPORT H5MatrixStatsDataDelegate : public H5StatsDataDelegate
     H5MatrixStatsDataDelegate(H5MatrixStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5MatrixStatsDataDelegate& operator=(const H5MatrixStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5MatrixStatsDataDelegate& operator=(H5MatrixStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index 96d077b0d5..f5042f0642 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -339,10 +339,10 @@ int H5PrecipitateStatsDataDelegate::writeVectorOfArrays(hid_t pid, VectorOfFloat
 int H5PrecipitateStatsDataDelegate::readVectorOfArrays(hid_t pid, VectorOfFloatArray colData)
 {
   int err = 0;
-
-  for(VectorOfFloatArray::iterator iter = colData.begin(); iter != colData.end(); ++iter)
+  for(auto& d : colData)
+  // for(VectorOfFloatArray::iterator iter = colData.begin(); iter != colData.end(); ++iter)
   {
-    FloatArrayType::Pointer d = *iter;
+    // FloatArrayType::Pointer d = *iter;
     err = d->readH5Data(pid);
     if(err < 0)
     {
@@ -564,17 +564,15 @@ int H5PrecipitateStatsDataDelegate::writeRDFDistributionData(hid_t pid, RdfData:
       }
       int32_t rank = 1;
       dims[0] = 3;
-      float boxRes[3] = {0.0f, 0.0f, 0.0f};
-      std::tie(boxRes[0], boxRes[1], boxRes[2]) = rdfData->getBoxResolution();
-      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxRes.toStdString(), rank, dims.data(), boxRes);
+      std::array<float, 3> boxRes = rdfData->getBoxResolution();
+      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxRes.toStdString(), rank, dims.data(), boxRes.data());
       if(err < 0)
       {
         return err;
       }
 
-      float boxDims[3] = {0.0f, 0.0f, 0.0f};
-      std::tie(boxDims[0], boxDims[1], boxDims[2]) = rdfData->getBoxSize();
-      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxDims.toStdString(), rank, dims.data(), boxDims);
+      std::array<float, 3> boxDims = rdfData->getBoxSize();
+      err = H5Lite::writePointerDataset(disId, SIMPL::StringConstants::RdfBoxDims.toStdString(), rank, dims.data(), boxDims.data());
       if(err < 0)
       {
         return err;
@@ -679,21 +677,21 @@ int H5PrecipitateStatsDataDelegate::readRDFDistributionData(hid_t pid, const QSt
   }
   rdfData->setMinDistance(val);
 
-  float boxDims[3] = {0.0f, 0.0f, 0.0f};
-  err = QH5Lite::readPointerDataset(disId, SIMPL::StringConstants::RdfBoxDims, boxDims);
+  std::array<float, 3> boxDims = {0.0f, 0.0f, 0.0f};
+  err = QH5Lite::readPointerDataset(disId, SIMPL::StringConstants::RdfBoxDims, boxDims.data());
   if(err < 0)
   {
     return err;
   }
-  rdfData->setBoxSize(std::make_tuple(boxDims[0], boxDims[1], boxDims[2]));
+  rdfData->setBoxSize(boxDims);
 
-  float boxRes[3] = {0.0f, 0.0f, 0.0f};
-  err = QH5Lite::readPointerDataset(disId, SIMPL::StringConstants::RdfBoxRes, boxRes);
+  std::array<float, 3> boxRes = {0.0f, 0.0f, 0.0f};
+  err = QH5Lite::readPointerDataset(disId, SIMPL::StringConstants::RdfBoxRes, boxRes.data());
   if(err < 0)
   {
     return err;
   }
-  rdfData->setBoxResolution(std::make_tuple(boxRes[0], boxRes[1], boxRes[2]));
+  rdfData->setBoxResolution(boxRes);
 
   err = QH5Utilities::closeHDF5Object(disId);
   return err;
@@ -769,10 +767,9 @@ int H5PrecipitateStatsDataDelegate::writeFeatureDiameterInfo(PrecipitateStatsDat
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3];
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = data->getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = data->getFeatureDiameterInfo();
 
-  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo);
+  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo.data());
 }
 
 // -----------------------------------------------------------------------------
@@ -787,7 +784,7 @@ int H5PrecipitateStatsDataDelegate::readFeatureDiameterInfo(PrecipitateStatsData
   float featureDiameterInfo[3] = {0.0f, 0.0f, 0.0f};
 
   err = QH5Lite::readPointerDataset(groupId, SIMPL::StringConstants::Feature_Diameter_Info, featureDiameterInfo);
-  data->setFeatureDiameterInfo(std::make_tuple(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]));
+  data->setFeatureDiameterInfo(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]);
   return err;
 }
 
@@ -816,3 +813,28 @@ int H5PrecipitateStatsDataDelegate::readBinNumbers(PrecipitateStatsData* data, h
   data->setBinNumbers(p);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5PrecipitateStatsDataDelegate::Pointer H5PrecipitateStatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5PrecipitateStatsDataDelegate::Pointer H5PrecipitateStatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5PrecipitateStatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5PrecipitateStatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5PrecipitateStatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5PrecipitateStatsDataDelegate::ClassName()
+{
+  return QString("H5PrecipitateStatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
index 6f529d4897..86275afb61 100755
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
@@ -36,13 +36,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
@@ -57,10 +58,24 @@
 class SIMPLib_EXPORT H5PrecipitateStatsDataDelegate : public H5StatsDataDelegate
 {
   public:
+    using Self = H5PrecipitateStatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5PrecipitateStatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5PrecipitateStatsDataDelegate)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5PrecipitateStatsDataDelegate, H5StatsDataDelegate)
     ~H5PrecipitateStatsDataDelegate() override;
 
     int writePrecipitateStatsData(PrecipitateStatsData* data, hid_t groupId);
@@ -128,6 +143,8 @@ class SIMPLib_EXPORT H5PrecipitateStatsDataDelegate : public H5StatsDataDelegate
     H5PrecipitateStatsDataDelegate(H5PrecipitateStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5PrecipitateStatsDataDelegate& operator=(const H5PrecipitateStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5PrecipitateStatsDataDelegate& operator=(H5PrecipitateStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
index 5abb03c139..3343f765ad 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
@@ -585,10 +585,9 @@ int H5PrimaryStatsDataDelegate::writeFeatureDiameterInfo(PrimaryStatsData* data,
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3];
-  data->getFeatureDiameterInfo(featureDiameterInfo);
+  std::array<float, 3> featureDiameterInfo = data->getFeatureDiameterInfo();
 
-  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo);
+  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo.data());
 }
 
 // -----------------------------------------------------------------------------
@@ -600,9 +599,9 @@ int H5PrimaryStatsDataDelegate::readFeatureDiameterInfo(PrimaryStatsData* data,
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> featureDiameterInfo = {0.0f, 0.0f, 0.0f};
 
-  err = QH5Lite::readPointerDataset(groupId, SIMPL::StringConstants::Feature_Diameter_Info, featureDiameterInfo);
+  err = QH5Lite::readPointerDataset(groupId, SIMPL::StringConstants::Feature_Diameter_Info, featureDiameterInfo.data());
   data->setFeatureDiameterInfo(featureDiameterInfo);
   return err;
 }
@@ -632,3 +631,28 @@ int H5PrimaryStatsDataDelegate::readBinNumbers(PrimaryStatsData* data, hid_t gro
   data->setBinNumbers(p);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5PrimaryStatsDataDelegate::Pointer H5PrimaryStatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5PrimaryStatsDataDelegate::Pointer H5PrimaryStatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5PrimaryStatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5PrimaryStatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5PrimaryStatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5PrimaryStatsDataDelegate::ClassName()
+{
+  return QString("H5PrimaryStatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
index dabb203a4a..ddac6fd47f 100755
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
@@ -36,13 +36,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
@@ -57,10 +58,24 @@
 class SIMPLib_EXPORT H5PrimaryStatsDataDelegate : public H5StatsDataDelegate
 {
   public:
+    using Self = H5PrimaryStatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5PrimaryStatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5PrimaryStatsDataDelegate)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5PrimaryStatsDataDelegate, H5StatsDataDelegate)
     ~H5PrimaryStatsDataDelegate() override;
 
     int writePrimaryStatsData(PrimaryStatsData* data, hid_t groupId);
@@ -116,6 +131,8 @@ class SIMPLib_EXPORT H5PrimaryStatsDataDelegate : public H5StatsDataDelegate
     H5PrimaryStatsDataDelegate(H5PrimaryStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5PrimaryStatsDataDelegate& operator=(const H5PrimaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5PrimaryStatsDataDelegate& operator=(H5PrimaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
index ee385cfedf..6f6b7698b9 100644
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
@@ -76,3 +76,28 @@ int H5StatsDataDelegate::readStatsDataName(StatsData* data, hid_t groupId)
   data->setName(name);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5StatsDataDelegate::Pointer H5StatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5StatsDataDelegate::Pointer H5StatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5StatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5StatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5StatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5StatsDataDelegate::ClassName()
+{
+  return QString("H5StatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
index ccc4cab06c..00d3df2a80 100755
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
@@ -37,11 +37,12 @@
 #pragma once
 
 
+#include <memory>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/StatsData.h"
 
 /**
@@ -55,10 +56,24 @@
 class SIMPLib_EXPORT H5StatsDataDelegate
 {
   public:
+    using Self = H5StatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5StatsDataDelegate
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for H5StatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5StatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5StatsDataDelegate)
-    SIMPL_TYPE_MACRO(H5StatsDataDelegate)
     virtual ~H5StatsDataDelegate();
 
     int writeStatsData(StatsData* data, hid_t groupId);
@@ -74,6 +89,8 @@ class SIMPLib_EXPORT H5StatsDataDelegate
     H5StatsDataDelegate(H5StatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5StatsDataDelegate& operator=(const H5StatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5StatsDataDelegate& operator=(H5StatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
index cfa70cece6..9ab0a3791e 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
@@ -607,10 +607,9 @@ int H5TransformationStatsDataDelegate::writeFeatureDiameterInfo(TransformationSt
   /*
    * Feature Diameter Info is encode as 3 floats: BinStepSize, MaxDiameter, MinDiameter
    */
-  float featureDiameterInfo[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = data->getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = data->getFeatureDiameterInfo();
 
-  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo);
+  return QH5Lite::writePointerDataset(pid, SIMPL::StringConstants::Feature_Diameter_Info, rank, dims, featureDiameterInfo.data());
 }
 
 // -----------------------------------------------------------------------------
@@ -625,7 +624,7 @@ int H5TransformationStatsDataDelegate::readFeatureDiameterInfo(TransformationSta
   float featureDiameterInfo[3] = {0.0f, 0.0f, 0.0f};
 
   err = QH5Lite::readPointerDataset(groupId, SIMPL::StringConstants::Feature_Diameter_Info, featureDiameterInfo);
-  data->setFeatureDiameterInfo(std::make_tuple(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[1]));
+  data->setFeatureDiameterInfo(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[1]);
   return err;
 }
 
@@ -654,3 +653,28 @@ int H5TransformationStatsDataDelegate::readBinNumbers(TransformationStatsData* d
   data->setBinNumbers(p);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+H5TransformationStatsDataDelegate::Pointer H5TransformationStatsDataDelegate::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+H5TransformationStatsDataDelegate::Pointer H5TransformationStatsDataDelegate::New()
+{
+  Pointer sharedPtr(new(H5TransformationStatsDataDelegate));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString H5TransformationStatsDataDelegate::getNameOfClass() const
+{
+  return QString("H5TransformationStatsDataDelegate");
+}
+
+// -----------------------------------------------------------------------------
+QString H5TransformationStatsDataDelegate::ClassName()
+{
+  return QString("H5TransformationStatsDataDelegate");
+}
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
index 482189ab65..05c76aa8e0 100755
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
@@ -36,13 +36,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/StatsData/TransformationStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
@@ -57,10 +58,24 @@
 class SIMPLib_EXPORT H5TransformationStatsDataDelegate : public H5StatsDataDelegate
 {
   public:
+    using Self = H5TransformationStatsDataDelegate;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for H5TransformationStatsDataDelegate
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for H5TransformationStatsDataDelegate
+     */
+    static QString ClassName();
 
-    SIMPL_SHARED_POINTERS(H5TransformationStatsDataDelegate)
-    SIMPL_STATIC_NEW_MACRO(H5TransformationStatsDataDelegate)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(H5TransformationStatsDataDelegate, H5StatsDataDelegate)
     ~H5TransformationStatsDataDelegate() override;
 
     int writeTransformationStatsData(TransformationStatsData* data, hid_t groupId);
@@ -119,6 +134,8 @@ class SIMPLib_EXPORT H5TransformationStatsDataDelegate : public H5StatsDataDeleg
     H5TransformationStatsDataDelegate(H5TransformationStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
     H5TransformationStatsDataDelegate& operator=(const H5TransformationStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
     H5TransformationStatsDataDelegate& operator=(H5TransformationStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 7a5f8f75cf..18bc752ccb 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -76,7 +76,13 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
+
+class IDataArray;
+using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
 #include <QString>
 #include <itkImageIOBase.h>
 #include <itkRGBAPixel.h>
@@ -338,7 +344,7 @@
 // which is saved in the filter's data container array.
 #define Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, isTypeOUT, typeOUTTypename)                                                                                         \
   {                                                                                                                                                                                                    \
-    IDataArray::Pointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);                                                                            \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);                                                                            \
     if(nullptr != ptr)                                                                                                                                                                                 \
     {                                                                                                                                                                                                  \
       ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());                                    \
@@ -435,7 +441,7 @@
 //
 #define Dream3DArrayOutputComponentFromDataMacro(call, input2_path, input1_path, errorCondition)                                                                                                       \
   {                                                                                                                                                                                                    \
-    IDataArray::Pointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, input2_path);                                                                     \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, input2_path);                                                                     \
     if(ptr.get() != nullptr)                                                                                                                                                                           \
     {                                                                                                                                                                                                  \
       ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, input2_path.getDataContainerName());                             \
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 11c0babea9..196d5dd3e4 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -36,12 +36,13 @@
 #pragma once
 
 // ITK Includes first
+#include <memory>
+
 #include "itkExtractImageFilter.h"
 #include "itkRGBAPixel.h"
 #include "itkRGBPixel.h"
 
 // DREAM3D Includes next
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
@@ -291,8 +292,21 @@ template <typename ComponentType>
 class ItkBridge
 {
 public:
-  SIMPL_SHARED_POINTERS(ItkBridge<ComponentType>)
-  SIMPL_TYPE_MACRO(ItkBridge<ComponentType>)
+  using Self = ItkBridge<ComponentType>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for ItkBridge<ComponentType>
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for ItkBridge<ComponentType>
+   */
+  static QString ClassName();
 
   virtual ~ItkBridge() = default;
   //*! Define all the Typedefs for this class
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index e76cc104f4..f003701e03 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -12,6 +12,9 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/ITK/itkGetComponentsDimensions.h"
 #include "SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+
 #include <itkImageFileReader.h>
 
 class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 51b92ed095..c417e5ec3a 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <memory>
+
 #include <itkImportImageFilter.h>
 #include <itkNumericTraits.h>
 #include <itkNumericTraitsRGBAPixel.h>
@@ -7,10 +9,10 @@
 #include <itkNumericTraitsVectorPixel.h>
 
 #include "SIMPLib/ITK/itkImportDream3DImageContainer.h"
-#include "SIMPLib/ITK/itkSupportConstants.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 class DataContainer;
-using DataContainerShPtr = std::shared_ptr<DataContainer>;
+using DataContainerShPtrType = std::shared_ptr<DataContainer>;
 
 namespace itk
 {
@@ -35,7 +37,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType,
   itkNewMacro(Self);
   itkTypeMacro(InPlaceDream3DDataToImageFilter, ImportImageFilter);
 
-  virtual void SetInput(DataContainer::Pointer& dc);
+  virtual void SetInput(DataContainerShPtrType& dc);
 
   itkSetMacro(DataArrayName, std::string);
   itkGetMacro(DataArrayName, std::string);
@@ -58,7 +60,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType,
 
   void GenerateOutputInformation() override;
   void GenerateData() override;
-  DataContainerShPtr m_DataContainer;
+  DataContainerShPtrType m_DataContainer;
 
 private:
   using Superclass::SetInput;
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
index 3d7f6883ea..17feed5eed 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.hxx
@@ -4,6 +4,7 @@
 
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace itk
 {
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 6d8e5174e7..49da1a935b 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/ITK/itkTemplateUtilities.h b/Source/SIMPLib/ITK/itkTemplateUtilities.h
index 1fd11cb895..d20c929223 100644
--- a/Source/SIMPLib/ITK/itkTemplateUtilities.h
+++ b/Source/SIMPLib/ITK/itkTemplateUtilities.h
@@ -38,7 +38,7 @@
 #if 0
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index a937f7e5ef..45bd024055 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -1176,3 +1176,21 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
 
     return 'o';
 }
+
+// -----------------------------------------------------------------------------
+GeometryMath::Pointer GeometryMath::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString GeometryMath::getNameOfClass() const
+{
+  return QString("GeometryMath");
+}
+
+// -----------------------------------------------------------------------------
+QString GeometryMath::ClassName()
+{
+  return QString("GeometryMath");
+}
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 28f6546a9e..c400a6dd0a 100755
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -37,8 +37,9 @@
 #pragma once
 
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DynamicListArray.hpp"
 
 class VertexGeom;
@@ -55,8 +56,21 @@ class TriangleGeom;
 class SIMPLib_EXPORT GeometryMath
 {
   public:
-    SIMPL_SHARED_POINTERS(GeometryMath)
-    SIMPL_TYPE_MACRO(GeometryMath)
+    using Self = GeometryMath;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for GeometryMath
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for GeometryMath
+     */
+    static QString ClassName();
 
     virtual ~GeometryMath();
 
@@ -361,6 +375,8 @@ class SIMPLib_EXPORT GeometryMath
     GeometryMath(GeometryMath&&) = delete;        // Move Constructor Not Implemented
     GeometryMath& operator=(const GeometryMath&) = delete; // Copy Assignment Not Implemented
     GeometryMath& operator=(GeometryMath&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Math/MatrixMath.h b/Source/SIMPLib/Math/MatrixMath.h
index 9111fb340f..3f1d2326ea 100755
--- a/Source/SIMPLib/Math/MatrixMath.h
+++ b/Source/SIMPLib/Math/MatrixMath.h
@@ -32,14 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #pragma once
 
 #include <cmath>
+#include <memory>
+
+#include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
 
 /*
@@ -54,8 +54,21 @@
 class SIMPLib_EXPORT MatrixMath
 {
   public:
-    SIMPL_SHARED_POINTERS(MatrixMath)
-    SIMPL_TYPE_MACRO(MatrixMath)
+    using Self = MatrixMath;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for MatrixMath
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for MatrixMath
+     */
+    static QString ClassName();
 
     virtual ~MatrixMath();
 
@@ -618,6 +631,8 @@ class SIMPLib_EXPORT MatrixMath
     MatrixMath(MatrixMath&&) = delete;          // Move Constructor Not Implemented
     MatrixMath& operator=(const MatrixMath&) = delete; // Copy Assignment Not Implemented
     MatrixMath& operator=(MatrixMath&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.cpp b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
index e191b19bf0..8efe337cc9 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.cpp
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
@@ -52,7 +52,7 @@ RadialDistributionFunction::~RadialDistributionFunction() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-std::vector<float> RadialDistributionFunction::GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::vector<float> boxdims, std::vector<float> boxres)
+std::vector<float> RadialDistributionFunction::GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::array<float, 3>& boxdims, std::array<float, 3>& boxres)
 {
   std::vector<float> freq(numBins, 0);
   std::vector<float> randomCentroids;
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.h b/Source/SIMPLib/Math/RadialDistributionFunction.h
index 0099259606..ce98ce9723 100755
--- a/Source/SIMPLib/Math/RadialDistributionFunction.h
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <vector>
+#include <array>
 
 #include "SIMPLib/SIMPLib.h"
 
@@ -59,7 +60,7 @@ class SIMPLib_EXPORT RadialDistributionFunction
      * @param boxres
      * @return An array of values that are the frequency values for the histogram
      */
-    static std::vector<float> GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::vector<float> boxdims, std::vector<float> boxres);
+    static std::vector<float> GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::array<float, 3>& boxdims, std::array<float, 3>& boxres);
 
   protected:
     RadialDistributionFunction();
diff --git a/Source/SIMPLib/Math/RdfData.cpp b/Source/SIMPLib/Math/RdfData.cpp
index dbed968b00..533b5e062e 100644
--- a/Source/SIMPLib/Math/RdfData.cpp
+++ b/Source/SIMPLib/Math/RdfData.cpp
@@ -42,19 +42,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RdfData::RdfData()
-: m_MinDistance(0.0f)
-, m_MaxDistance(0.0f)
-, m_NumberOfBins(50)
-, m_DistributionType(SIMPL::StringConstants::UnknownDistribution)
-{
-  m_BoxResolution[0] = 0.1f;
-  m_BoxResolution[1] = 0.1f;
-  m_BoxResolution[2] = 0.1f;
-  m_BoxSize[0] = 100;
-  m_BoxSize[1] = 100;
-  m_BoxSize[2] = 100;
-}
+RdfData::RdfData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -79,10 +67,10 @@ RdfData::Pointer RdfData::deepCopy()
   ptr->setMinDistance(getMinDistance());
   ptr->setMaxDistance(getMaxDistance());
   ptr->setDistributionType(getDistributionType());
-  float temp[3] = {0.0f, 0.0f, 0.0f};
-  getBoxSize(temp);
+  std::array<float, 3> temp = {0.0f, 0.0f, 0.0f};
+  temp = getBoxSize();
   ptr->setBoxSize(temp);
-  getBoxResolution(temp);
+  temp = getBoxResolution();
   ptr->setBoxResolution(temp);
   return ptr;
 }
@@ -93,7 +81,7 @@ RdfData::Pointer RdfData::deepCopy()
 int RdfData::readJson(const QJsonObject& json)
 {
   int err = 0;
-  float boxDims[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> boxDims = {0.0f, 0.0f, 0.0f};
 
   QJsonObject rdfJson = json[SIMPL::StringConstants::RadialDistFunc].toObject();
 
@@ -114,7 +102,7 @@ int RdfData::readJson(const QJsonObject& json)
   }
   setBoxSize(boxDims);
 
-  float boxRes[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> boxRes = {0.0f, 0.0f, 0.0f};
 
   if(StatsData::ParseFloat3Vec(rdfJson, SIMPL::StringConstants::RdfBoxRes, boxRes, 0.0) == 0)
   {
@@ -130,8 +118,8 @@ int RdfData::readJson(const QJsonObject& json)
   }
   setNumberOfBins(numBins);
 
-  std::vector<float> bd = {boxDims[0], boxDims[1], boxDims[2]};
-  std::vector<float> br = {boxRes[0], boxRes[1], boxRes[2]};
+  std::array<float, 3> bd = {boxDims[0], boxDims[1], boxDims[2]};
+  std::array<float, 3> br = {boxRes[0], boxRes[1], boxRes[2]};
   std::vector<float> freqs = RadialDistributionFunction::GenerateRandomDistribution(m_MinDistance, m_MaxDistance, numBins, bd, br);
   setFrequencies(freqs);
 
@@ -149,15 +137,14 @@ int RdfData::writeJson(QJsonObject& json)
   rdfJson.insert(SIMPL::StringConstants::RdfMinDistance, getMinDistance());
   rdfJson.insert(SIMPL::StringConstants::RdfMaxDistance, getMaxDistance());
   QJsonArray boxArray;
-  float boxDims[3];
-  getBoxSize(boxDims);
+  std::array<float, 3> boxDims = getBoxSize();
   for(int i = 0; i < 3; i++)
   {
     boxArray.insert(i, boxDims[i]);
   }
   rdfJson.insert(SIMPL::StringConstants::RdfBoxDims, boxArray);
 
-  getBoxResolution(boxDims);
+  boxDims = getBoxResolution();
   for(int i = 0; i < 3; i++)
   {
     boxArray.replace(i, boxDims[i]);
@@ -167,3 +154,128 @@ int RdfData::writeJson(QJsonObject& json)
   json.insert(SIMPL::StringConstants::RadialDistFunc, rdfJson);
   return err;
 }
+
+// -----------------------------------------------------------------------------
+RdfData::Pointer RdfData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+RdfData::Pointer RdfData::New()
+{
+  Pointer sharedPtr(new(RdfData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString RdfData::getNameOfClass() const
+{
+  return QString("RdfData");
+}
+
+// -----------------------------------------------------------------------------
+QString RdfData::ClassName()
+{
+  return QString("RdfData");
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setFrequencies(const std::vector<float>& value)
+{
+  m_Frequencies = value;
+}
+
+// -----------------------------------------------------------------------------
+std::vector<float> RdfData::getFrequencies() const
+{
+  return m_Frequencies;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setMinDistance(float value)
+{
+  m_MinDistance = value;
+}
+
+// -----------------------------------------------------------------------------
+float RdfData::getMinDistance() const
+{
+  return m_MinDistance;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setMaxDistance(float value)
+{
+  m_MaxDistance = value;
+}
+
+// -----------------------------------------------------------------------------
+float RdfData::getMaxDistance() const
+{
+  return m_MaxDistance;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setNumberOfBins(int value)
+{
+  m_NumberOfBins = value;
+}
+
+// -----------------------------------------------------------------------------
+int RdfData::getNumberOfBins() const
+{
+  return m_NumberOfBins;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setDistributionType(const QString& value)
+{
+  m_DistributionType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString RdfData::getDistributionType() const
+{
+  return m_DistributionType;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setBoxSize(const std::array<float, 3>& value)
+{
+  m_BoxSize = value;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setBoxSize(float v0, float v1, float v2)
+{
+  m_BoxSize[0] = v0;
+  m_BoxSize[1] = v1;
+  m_BoxSize[2] = v2;
+}
+
+// -----------------------------------------------------------------------------
+std::array<float, 3> RdfData::getBoxSize() const
+{
+  return m_BoxSize;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setBoxResolution(const std::array<float, 3>& value)
+{
+  m_BoxResolution = value;
+}
+
+// -----------------------------------------------------------------------------
+void RdfData::setBoxResolution(float v0, float v1, float v2)
+{
+  m_BoxResolution[0] = v0;
+  m_BoxResolution[1] = v1;
+  m_BoxResolution[2] = v2;
+}
+
+// -----------------------------------------------------------------------------
+std::array<float, 3> RdfData::getBoxResolution() const
+{
+  return m_BoxResolution;
+}
diff --git a/Source/SIMPLib/Math/RdfData.h b/Source/SIMPLib/Math/RdfData.h
index b85e4affc4..606ab615da 100644
--- a/Source/SIMPLib/Math/RdfData.h
+++ b/Source/SIMPLib/Math/RdfData.h
@@ -35,32 +35,119 @@
 
 #pragma once
 
+#include <memory>
+
+#include <array>
 #include <vector>
 
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
-
-
+#include "SIMPLib/Common/Constants.h"
 
+/**
+ * @brief The RdfData class
+ */
 class SIMPLib_EXPORT RdfData
 {
   public:
-    SIMPL_SHARED_POINTERS(RdfData)
-    SIMPL_STATIC_NEW_MACRO(RdfData)
-    SIMPL_TYPE_MACRO(RdfData)
+    using Self = RdfData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for RdfData
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for RdfData
+     */
+    static QString ClassName();
 
     virtual ~RdfData();
 
-    SIMPL_INSTANCE_PROPERTY(std::vector<float>, Frequencies)
-    SIMPL_INSTANCE_PROPERTY(float, MinDistance)
-    SIMPL_INSTANCE_PROPERTY(float, MaxDistance)
-    SIMPL_INSTANCE_PROPERTY(int, NumberOfBins)
-    SIMPL_INSTANCE_STRING_PROPERTY(DistributionType)
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxSize)
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, BoxResolution)
+    /**
+     * @brief Setter property for Frequencies
+     */
+    void setFrequencies(const std::vector<float>& value);
+    /**
+     * @brief Getter property for Frequencies
+     * @return Value of Frequencies
+     */
+    std::vector<float> getFrequencies() const;
+
+    /**
+     * @brief Setter property for MinDistance
+     */
+    void setMinDistance(float value);
+    /**
+     * @brief Getter property for MinDistance
+     * @return Value of MinDistance
+     */
+    float getMinDistance() const;
+
+    /**
+     * @brief Setter property for MaxDistance
+     */
+    void setMaxDistance(float value);
+    /**
+     * @brief Getter property for MaxDistance
+     * @return Value of MaxDistance
+     */
+    float getMaxDistance() const;
+
+    /**
+     * @brief Setter property for NumberOfBins
+     */
+    void setNumberOfBins(int value);
+    /**
+     * @brief Getter property for NumberOfBins
+     * @return Value of NumberOfBins
+     */
+    int getNumberOfBins() const;
+
+    /**
+     * @brief Setter property for DistributionType
+     */
+    void setDistributionType(const QString& value);
+    /**
+     * @brief Getter property for DistributionType
+     * @return Value of DistributionType
+     */
+    QString getDistributionType() const;
+
+    /**
+     * @brief Setter property for BoxSize
+     */
+    void setBoxSize(const std::array<float, 3>& value);
+    /**
+     * @brief Setter property for BoxSize
+     */
+    void setBoxSize(float v0, float v1, float v2);
+    /**
+     * @brief Getter property for BoxSize
+     * @return Value of BoxSize
+     */
+    std::array<float, 3> getBoxSize() const;
+
+    /**
+     * @brief Setter property for BoxResolution
+     */
+    void setBoxResolution(const std::array<float, 3>& value);
+    /**
+     * @brief Setter property for BoxResolution
+     */
+    void setBoxResolution(float v0, float v1, float v2);
+    /**
+     * @brief Getter property for BoxResolution
+     * @return Value of BoxResolution
+     */
+    std::array<float, 3> getBoxResolution() const;
 
     int getFrequencyCount();
 
@@ -88,6 +175,15 @@ class SIMPLib_EXPORT RdfData
     RdfData();
 
   private:
+    std::array<float, 3> m_BoxSize = {100.0f, 100.0f, 100.0f};
+    std::array<float, 3> m_BoxResolution{0.1f, 0.1f, 0.1f};
+
+    std::vector<float> m_Frequencies = {};
+    float m_MinDistance = 0.0f;
+    float m_MaxDistance = 0.0f;
+    int m_NumberOfBins = 50;
+    QString m_DistributionType = SIMPL::StringConstants::UnknownDistribution;
+
     RdfData(const RdfData&) = delete;        // Copy Constructor Not Implemented
     void operator=(const RdfData&) = delete; // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index 93f6612786..b52e28f51a 100755
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -76,8 +76,8 @@
 
 #endif
 
-#include <stddef.h>
-#include <math.h>
+#include <cstddef>
+#include <cmath>
 
 #include <vector>
 #include <limits>
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.cpp b/Source/SIMPLib/Messages/AbstractErrorMessage.cpp
index 94a3f2f729..10ca94462f 100644
--- a/Source/SIMPLib/Messages/AbstractErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.cpp
@@ -42,3 +42,32 @@ AbstractErrorMessage::AbstractErrorMessage(const QString& msgText, int code)
 
 AbstractErrorMessage::~AbstractErrorMessage() = default;
 
+// -----------------------------------------------------------------------------
+AbstractErrorMessage::Pointer AbstractErrorMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractErrorMessage::getNameOfClass() const
+{
+  return QString("AbstractErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractErrorMessage::ClassName()
+{
+  return QString("AbstractErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+void AbstractErrorMessage::setCode(int value)
+{
+  m_Code = value;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractErrorMessage::getCode() const
+{
+  return m_Code;
+}
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.h b/Source/SIMPLib/Messages/AbstractErrorMessage.h
index 63b80a26a8..7a3ae121c3 100755
--- a/Source/SIMPLib/Messages/AbstractErrorMessage.h
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 /**
@@ -42,12 +44,33 @@
 class SIMPLib_EXPORT AbstractErrorMessage : public AbstractMessage
 {
 public:
-  SIMPL_SHARED_POINTERS(AbstractErrorMessage)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractErrorMessage, AbstractMessage)
+  using Self = AbstractErrorMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractErrorMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractErrorMessage
+   */
+  static QString ClassName();
 
   ~AbstractErrorMessage() override;
 
-  SIMPL_INSTANCE_PROPERTY(int, Code)
+  /**
+   * @brief Setter property for Code
+   */
+  void setCode(int value);
+  /**
+   * @brief Getter property for Code
+   * @return Value of Code
+   */
+  int getCode() const;
 
 protected:
   AbstractErrorMessage();
@@ -55,5 +78,6 @@ class SIMPLib_EXPORT AbstractErrorMessage : public AbstractMessage
   AbstractErrorMessage(const QString& msgText, int code);
 
 private:
+  int m_Code = {};
 };
 Q_DECLARE_METATYPE(AbstractErrorMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/AbstractMessage.cpp b/Source/SIMPLib/Messages/AbstractMessage.cpp
index f81d56bf0d..05252da17d 100644
--- a/Source/SIMPLib/Messages/AbstractMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractMessage.cpp
@@ -39,14 +39,12 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AbstractMessage::AbstractMessage()
-{
-}
+AbstractMessage::AbstractMessage() = default;
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AbstractMessage::AbstractMessage(const QString &msgText)
+AbstractMessage::AbstractMessage(const QString& msgText)
 : m_MessageText(msgText)
 {
 }
@@ -55,3 +53,33 @@ AbstractMessage::AbstractMessage(const QString &msgText)
 //
 // -----------------------------------------------------------------------------
 AbstractMessage::~AbstractMessage() = default;
+
+// -----------------------------------------------------------------------------
+AbstractMessage::Pointer AbstractMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractMessage::getNameOfClass() const
+{
+  return QString("AbstractMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractMessage::ClassName()
+{
+  return QString("AbstractMessage");
+}
+
+// -----------------------------------------------------------------------------
+void AbstractMessage::setMessageText(const QString& value)
+{
+  m_MessageText = value;
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractMessage::getMessageText() const
+{
+  return m_MessageText;
+}
diff --git a/Source/SIMPLib/Messages/AbstractMessage.h b/Source/SIMPLib/Messages/AbstractMessage.h
index f3398a81ef..4e98c647b8 100755
--- a/Source/SIMPLib/Messages/AbstractMessage.h
+++ b/Source/SIMPLib/Messages/AbstractMessage.h
@@ -36,10 +36,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 class AbstractMessageHandler;
 
@@ -49,19 +50,34 @@ class AbstractMessageHandler;
  */
 class SIMPLib_EXPORT AbstractMessage
 {
-  // clang-format off
-  PYB11_CREATE_BINDINGS(AbstractMessage)
-  PYB11_PROPERTY(QString MessageText READ getMessageText WRITE setMessageText)
-  PYB11_METHOD(QString generateMessageString)
-  // clang-format on
 
 public:
-  SIMPL_SHARED_POINTERS(AbstractMessage)
-  SIMPL_TYPE_MACRO(AbstractMessage)
+  using Self = AbstractMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
 
-  virtual ~AbstractMessage();
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName();
 
-  SIMPL_INSTANCE_STRING_PROPERTY(MessageText)
+  virtual ~AbstractMessage();
+  /**
+   * @brief Setter property for MessageText
+   */
+  void setMessageText(const QString& value);
+  /**
+   * @brief Getter property for MessageText
+   * @return Value of MessageText
+   */
+  QString getMessageText() const;
 
   /**
    * @brief This method creates and returns a message string
@@ -81,8 +97,6 @@ class SIMPLib_EXPORT AbstractMessage
   AbstractMessage(const QString& msgText);
 
 private:
-
+  QString m_MessageText = {};
 };
 Q_DECLARE_METATYPE(AbstractMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.cpp b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
index 982176e511..77b2243591 100644
--- a/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
@@ -40,4 +40,33 @@ AbstractProgressMessage::  AbstractProgressMessage(const QString& msgText, int p
 {
 }
 
-  AbstractProgressMessage::~AbstractProgressMessage() = default;
\ No newline at end of file
+AbstractProgressMessage::~AbstractProgressMessage() = default;
+// -----------------------------------------------------------------------------
+AbstractProgressMessage::Pointer AbstractProgressMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractProgressMessage::getNameOfClass() const
+{
+  return QString("AbstractProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractProgressMessage::ClassName()
+{
+  return QString("AbstractProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+void AbstractProgressMessage::setProgressValue(int value)
+{
+  m_ProgressValue = value;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractProgressMessage::getProgressValue() const
+{
+  return m_ProgressValue;
+}
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.h b/Source/SIMPLib/Messages/AbstractProgressMessage.h
index b50484a231..6273798bae 100755
--- a/Source/SIMPLib/Messages/AbstractProgressMessage.h
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 class AbstractMessageHandler;
@@ -44,12 +46,33 @@ class AbstractMessageHandler;
 class SIMPLib_EXPORT AbstractProgressMessage : public AbstractMessage
 {
 public:
-  SIMPL_SHARED_POINTERS(AbstractProgressMessage)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractProgressMessage, AbstractMessage)
+  using Self = AbstractProgressMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractProgressMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractProgressMessage
+   */
+  static QString ClassName();
 
   ~AbstractProgressMessage() override;
 
-  SIMPL_INSTANCE_PROPERTY(int, ProgressValue)
+  /**
+   * @brief Setter property for ProgressValue
+   */
+  void setProgressValue(int value);
+  /**
+   * @brief Getter property for ProgressValue
+   * @return Value of ProgressValue
+   */
+  int getProgressValue() const;
 
 protected:
   AbstractProgressMessage();
@@ -57,5 +80,6 @@ class SIMPLib_EXPORT AbstractProgressMessage : public AbstractMessage
   AbstractProgressMessage(const QString& msgText, int progress);
 
 private:
+  int m_ProgressValue = {};
 };
 Q_DECLARE_METATYPE(AbstractProgressMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.cpp b/Source/SIMPLib/Messages/AbstractStatusMessage.cpp
index 01ef1a5e86..e6c4f57064 100644
--- a/Source/SIMPLib/Messages/AbstractStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.cpp
@@ -39,4 +39,21 @@ AbstractStatusMessage::AbstractStatusMessage(const QString& msgText)
 {
 }
 
-AbstractStatusMessage::~AbstractStatusMessage() = default;
\ No newline at end of file
+AbstractStatusMessage::~AbstractStatusMessage() = default;
+// -----------------------------------------------------------------------------
+AbstractStatusMessage::Pointer AbstractStatusMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractStatusMessage::getNameOfClass() const
+{
+  return QString("AbstractStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractStatusMessage::ClassName()
+{
+  return QString("AbstractStatusMessage");
+}
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.h b/Source/SIMPLib/Messages/AbstractStatusMessage.h
index 5c8474556e..9d8a9a3d48 100755
--- a/Source/SIMPLib/Messages/AbstractStatusMessage.h
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.h
@@ -33,6 +33,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include "SIMPLib/Messages/AbstractMessage.h"
@@ -46,8 +48,21 @@ class AbstractMessageHandler;
 class SIMPLib_EXPORT AbstractStatusMessage : public AbstractMessage
 {
 public:
-  SIMPL_SHARED_POINTERS(AbstractStatusMessage)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractStatusMessage, AbstractMessage)
+  using Self = AbstractStatusMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractStatusMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractStatusMessage
+   */
+  static QString ClassName();
 
   ~AbstractStatusMessage() override;
 
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.cpp b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
index 63d52b5661..815117c07d 100644
--- a/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
@@ -41,3 +41,33 @@ AbstractWarningMessage::AbstractWarningMessage(const QString& msgText, int32_t c
 }
 
 AbstractWarningMessage::~AbstractWarningMessage() = default;
+
+// -----------------------------------------------------------------------------
+AbstractWarningMessage::Pointer AbstractWarningMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractWarningMessage::getNameOfClass() const
+{
+  return QString("AbstractWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString AbstractWarningMessage::ClassName()
+{
+  return QString("AbstractWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+void AbstractWarningMessage::setCode(int value)
+{
+  m_Code = value;
+}
+
+// -----------------------------------------------------------------------------
+int AbstractWarningMessage::getCode() const
+{
+  return m_Code;
+}
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.h b/Source/SIMPLib/Messages/AbstractWarningMessage.h
index a16f6086ba..aa9903718d 100755
--- a/Source/SIMPLib/Messages/AbstractWarningMessage.h
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 class AbstractMessageHandler;
@@ -47,12 +49,33 @@ class AbstractMessageHandler;
 class SIMPLib_EXPORT AbstractWarningMessage : public AbstractMessage
 {
 public:
-  SIMPL_SHARED_POINTERS(AbstractWarningMessage)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(AbstractWarningMessage, AbstractMessage)
+  using Self = AbstractWarningMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for AbstractWarningMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AbstractWarningMessage
+   */
+  static QString ClassName();
 
   ~AbstractWarningMessage() override;
 
-  SIMPL_INSTANCE_PROPERTY(int, Code)
+  /**
+   * @brief Setter property for Code
+   */
+  void setCode(int value);
+  /**
+   * @brief Getter property for Code
+   * @return Value of Code
+   */
+  int getCode() const;
 
 protected:
   AbstractWarningMessage();
@@ -60,5 +83,6 @@ class SIMPLib_EXPORT AbstractWarningMessage : public AbstractMessage
   AbstractWarningMessage(const QString& msgText, int code);
 
 private:
+  int m_Code = {};
 };
 Q_DECLARE_METATYPE(AbstractWarningMessage::Pointer)
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.cpp b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
index d05e72c024..df48decb22 100644
--- a/Source/SIMPLib/Messages/FilterErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "FilterErrorMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -87,3 +89,64 @@ void FilterErrorMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+FilterErrorMessage::Pointer FilterErrorMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FilterErrorMessage::Pointer FilterErrorMessage::New()
+{
+  Pointer sharedPtr(new(FilterErrorMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterErrorMessage::getNameOfClass() const
+{
+  return QString("FilterErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterErrorMessage::ClassName()
+{
+  return QString("FilterErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+void FilterErrorMessage::setClassName(const QString& value)
+{
+  m_ClassName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterErrorMessage::getClassName() const
+{
+  return m_ClassName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterErrorMessage::setHumanLabel(const QString& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterErrorMessage::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterErrorMessage::setPipelineIndex(int value)
+{
+  m_PipelineIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterErrorMessage::getPipelineIndex() const
+{
+  return m_PipelineIndex;
+}
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.h b/Source/SIMPLib/Messages/FilterErrorMessage.h
index 5f8e63f745..3a90b1fed0 100755
--- a/Source/SIMPLib/Messages/FilterErrorMessage.h
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractErrorMessage.h"
 
 /**
@@ -45,49 +47,90 @@
  */
 class SIMPLib_EXPORT FilterErrorMessage : public AbstractErrorMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(FilterErrorMessage)
-    SIMPL_STATIC_NEW_MACRO(FilterErrorMessage)
-    SIMPL_TYPE_MACRO(FilterErrorMessage)
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+public:
+  using Self = FilterErrorMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterErrorMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterErrorMessage
+   */
+  static QString ClassName();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+  /**
+   * @brief Setter property for ClassName
+   */
+  void setClassName(const QString& value);
+  /**
+   * @brief Getter property for ClassName
+   * @return Value of ClassName
+   */
+  QString getClassName() const;
 
-    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  QString getHumanLabel() const;
 
-    virtual ~FilterErrorMessage();
+  /**
+   * @brief Setter property for PipelineIndex
+   */
+  void setPipelineIndex(int value);
+  /**
+   * @brief Getter property for PipelineIndex
+   * @return Value of PipelineIndex
+   */
+  int getPipelineIndex() const;
 
-    /**
-     * @brief New
-     * @param className
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+  ~FilterErrorMessage() override;
 
-    /**
-     * @brief This method creates and returns a string for filter error messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param className
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for filter error messages
+   */
+  virtual QString generateMessageString() const override;
 
-  protected:
-    FilterErrorMessage();
-    FilterErrorMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  virtual void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  FilterErrorMessage();
+  FilterErrorMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
 
+private:
+  QString m_ClassName = {};
+  QString m_HumanLabel = {};
+  int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterErrorMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.cpp b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
index 25084c8dfe..2c5bf57550 100644
--- a/Source/SIMPLib/Messages/FilterProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "FilterProgressMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -87,3 +89,64 @@ void FilterProgressMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+FilterProgressMessage::Pointer FilterProgressMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FilterProgressMessage::Pointer FilterProgressMessage::New()
+{
+  Pointer sharedPtr(new(FilterProgressMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterProgressMessage::getNameOfClass() const
+{
+  return QString("FilterProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterProgressMessage::ClassName()
+{
+  return QString("FilterProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+void FilterProgressMessage::setClassName(const QString& value)
+{
+  m_ClassName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterProgressMessage::getClassName() const
+{
+  return m_ClassName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterProgressMessage::setHumanLabel(const QString& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterProgressMessage::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterProgressMessage::setPipelineIndex(int value)
+{
+  m_PipelineIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterProgressMessage::getPipelineIndex() const
+{
+  return m_PipelineIndex;
+}
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.h b/Source/SIMPLib/Messages/FilterProgressMessage.h
index 2e7ae820c8..dff52434c8 100755
--- a/Source/SIMPLib/Messages/FilterProgressMessage.h
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractProgressMessage.h"
 
 /**
@@ -45,49 +47,90 @@
  */
 class SIMPLib_EXPORT FilterProgressMessage : public AbstractProgressMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(FilterProgressMessage)
-    SIMPL_STATIC_NEW_MACRO(FilterProgressMessage)
-    SIMPL_TYPE_MACRO(FilterProgressMessage)
 
-    virtual ~FilterProgressMessage();
+public:
+  using Self = FilterProgressMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterProgressMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterProgressMessage
+   */
+  static QString ClassName();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+  ~FilterProgressMessage() override;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+  /**
+   * @brief Setter property for ClassName
+   */
+  void setClassName(const QString& value);
+  /**
+   * @brief Getter property for ClassName
+   * @return Value of ClassName
+   */
+  QString getClassName() const;
 
-    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  QString getHumanLabel() const;
 
-    /**
-     * @brief New
-     * @param className
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+  /**
+   * @brief Setter property for PipelineIndex
+   */
+  void setPipelineIndex(int value);
+  /**
+   * @brief Getter property for PipelineIndex
+   * @return Value of PipelineIndex
+   */
+  int getPipelineIndex() const;
 
-    /**
-     * @brief This method creates and returns a string for filter progress messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param className
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for filter progress messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    FilterProgressMessage();
-    FilterProgressMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  FilterProgressMessage();
+  FilterProgressMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress);
 
+private:
+  QString m_ClassName = {};
+  QString m_HumanLabel = {};
+  int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterProgressMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.cpp b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
index 8e39526491..46b46454b3 100644
--- a/Source/SIMPLib/Messages/FilterStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
@@ -86,3 +86,64 @@ void FilterStatusMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+FilterStatusMessage::Pointer FilterStatusMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FilterStatusMessage::Pointer FilterStatusMessage::New()
+{
+  Pointer sharedPtr(new(FilterStatusMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterStatusMessage::getNameOfClass() const
+{
+  return QString("FilterStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterStatusMessage::ClassName()
+{
+  return QString("FilterStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+void FilterStatusMessage::setClassName(const QString& value)
+{
+  m_ClassName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterStatusMessage::getClassName() const
+{
+  return m_ClassName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterStatusMessage::setHumanLabel(const QString& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterStatusMessage::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterStatusMessage::setPipelineIndex(int value)
+{
+  m_PipelineIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterStatusMessage::getPipelineIndex() const
+{
+  return m_PipelineIndex;
+}
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.h b/Source/SIMPLib/Messages/FilterStatusMessage.h
index 442117fe96..1e15b8baa9 100755
--- a/Source/SIMPLib/Messages/FilterStatusMessage.h
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractStatusMessage.h"
 
 /**
@@ -45,48 +47,89 @@
  */
 class SIMPLib_EXPORT FilterStatusMessage : public AbstractStatusMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(FilterStatusMessage)
-    SIMPL_STATIC_NEW_MACRO(FilterStatusMessage)
-    SIMPL_TYPE_MACRO(FilterStatusMessage)
 
-    virtual ~FilterStatusMessage();
+public:
+  using Self = FilterStatusMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterStatusMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterStatusMessage
+   */
+  static QString ClassName();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+  virtual ~FilterStatusMessage();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+  /**
+   * @brief Setter property for ClassName
+   */
+  void setClassName(const QString& value);
+  /**
+   * @brief Getter property for ClassName
+   * @return Value of ClassName
+   */
+  QString getClassName() const;
 
-    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  QString getHumanLabel() const;
 
-    /**
-     * @brief New
-     * @param className
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @return
-     */
-    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
+  /**
+   * @brief Setter property for PipelineIndex
+   */
+  void setPipelineIndex(int value);
+  /**
+   * @brief Getter property for PipelineIndex
+   * @return Value of PipelineIndex
+   */
+  int getPipelineIndex() const;
 
-    /**
-     * @brief This method creates and returns a string for filter status messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param className
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @return
+   */
+  static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for filter status messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    FilterStatusMessage();
-    FilterStatusMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  FilterStatusMessage();
+  FilterStatusMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText);
 
+private:
+  QString m_ClassName = {};
+  QString m_HumanLabel = {};
+  int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterStatusMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.cpp b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
index 785461466d..343dc5b597 100644
--- a/Source/SIMPLib/Messages/FilterWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "FilterWarningMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -87,3 +89,64 @@ void FilterWarningMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+FilterWarningMessage::Pointer FilterWarningMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+FilterWarningMessage::Pointer FilterWarningMessage::New()
+{
+  Pointer sharedPtr(new(FilterWarningMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterWarningMessage::getNameOfClass() const
+{
+  return QString("FilterWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterWarningMessage::ClassName()
+{
+  return QString("FilterWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+void FilterWarningMessage::setClassName(const QString& value)
+{
+  m_ClassName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterWarningMessage::getClassName() const
+{
+  return m_ClassName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterWarningMessage::setHumanLabel(const QString& value)
+{
+  m_HumanLabel = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterWarningMessage::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+void FilterWarningMessage::setPipelineIndex(int value)
+{
+  m_PipelineIndex = value;
+}
+
+// -----------------------------------------------------------------------------
+int FilterWarningMessage::getPipelineIndex() const
+{
+  return m_PipelineIndex;
+}
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.h b/Source/SIMPLib/Messages/FilterWarningMessage.h
index c72b0e4454..478ff25aa7 100755
--- a/Source/SIMPLib/Messages/FilterWarningMessage.h
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractWarningMessage.h"
 
 /**
@@ -45,49 +47,90 @@
  */
 class SIMPLib_EXPORT FilterWarningMessage : public AbstractWarningMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(FilterWarningMessage)
-    SIMPL_STATIC_NEW_MACRO(FilterWarningMessage)
-    SIMPL_TYPE_MACRO(FilterWarningMessage)
 
-    virtual ~FilterWarningMessage();
+public:
+  using Self = FilterWarningMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterWarningMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterWarningMessage
+   */
+  static QString ClassName();
 
-    SIMPL_INSTANCE_STRING_PROPERTY(ClassName)
+  ~FilterWarningMessage() override;
 
-    SIMPL_INSTANCE_STRING_PROPERTY(HumanLabel)
+  /**
+   * @brief Setter property for ClassName
+   */
+  void setClassName(const QString& value);
+  /**
+   * @brief Getter property for ClassName
+   * @return Value of ClassName
+   */
+  QString getClassName() const;
 
-    SIMPL_INSTANCE_PROPERTY(int, PipelineIndex)
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  QString getHumanLabel() const;
 
-    /**
-     * @brief New
-     * @param className
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+  /**
+   * @brief Setter property for PipelineIndex
+   */
+  void setPipelineIndex(int value);
+  /**
+   * @brief Getter property for PipelineIndex
+   * @return Value of PipelineIndex
+   */
+  int getPipelineIndex() const;
 
-    /**
-     * @brief This method creates and returns a string for filter warning messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param className
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for filter warning messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    FilterWarningMessage();
-    FilterWarningMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  FilterWarningMessage();
+  FilterWarningMessage(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code);
 
+private:
+  QString m_ClassName = {};
+  QString m_HumanLabel = {};
+  int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterWarningMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.cpp b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
index 5f304d0fee..ff6533be8d 100644
--- a/Source/SIMPLib/Messages/GenericErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "GenericErrorMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -84,3 +86,28 @@ void GenericErrorMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+GenericErrorMessage::Pointer GenericErrorMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+GenericErrorMessage::Pointer GenericErrorMessage::New()
+{
+  Pointer sharedPtr(new(GenericErrorMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericErrorMessage::getNameOfClass() const
+{
+  return QString("GenericErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString GenericErrorMessage::ClassName()
+{
+  return QString("GenericErrorMessage");
+}
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.h b/Source/SIMPLib/Messages/GenericErrorMessage.h
index 5721f10867..c315f870ca 100755
--- a/Source/SIMPLib/Messages/GenericErrorMessage.h
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractErrorMessage.h"
 
 /**
@@ -45,40 +47,54 @@
  */
 class SIMPLib_EXPORT GenericErrorMessage : public AbstractErrorMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(GenericErrorMessage)
-    SIMPL_STATIC_NEW_MACRO(GenericErrorMessage)
-    SIMPL_TYPE_MACRO(GenericErrorMessage)
 
-    virtual ~GenericErrorMessage();
+public:
+  using Self = GenericErrorMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenericErrorMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenericErrorMessage
+   */
+  static QString ClassName();
 
-    /**
-     * @brief New
-     * @param msgText
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString& msgText, int code);
+  ~GenericErrorMessage() override;
 
-    /**
-     * @brief This method creates and returns a string for generic error messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param msgText
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& msgText, int code);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for generic error messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    GenericErrorMessage();
-    GenericErrorMessage(const QString& msgText, int code);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  GenericErrorMessage();
+  GenericErrorMessage(const QString& msgText, int code);
 
+private:
 };
 Q_DECLARE_METATYPE(GenericErrorMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.cpp b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
index c9ca9deee3..2ce235cfdc 100644
--- a/Source/SIMPLib/Messages/GenericProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "GenericProgressMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -84,3 +86,28 @@ void GenericProgressMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+GenericProgressMessage::Pointer GenericProgressMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+GenericProgressMessage::Pointer GenericProgressMessage::New()
+{
+  Pointer sharedPtr(new(GenericProgressMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericProgressMessage::getNameOfClass() const
+{
+  return QString("GenericProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString GenericProgressMessage::ClassName()
+{
+  return QString("GenericProgressMessage");
+}
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.h b/Source/SIMPLib/Messages/GenericProgressMessage.h
index 7f79663708..c0e3c1bd82 100755
--- a/Source/SIMPLib/Messages/GenericProgressMessage.h
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractProgressMessage.h"
 
 /**
@@ -45,40 +47,54 @@
  */
 class SIMPLib_EXPORT GenericProgressMessage : public AbstractProgressMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(GenericProgressMessage)
-    SIMPL_STATIC_NEW_MACRO(GenericProgressMessage)
-    SIMPL_TYPE_MACRO(GenericProgressMessage)
 
-    virtual ~GenericProgressMessage();
+public:
+  using Self = GenericProgressMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenericProgressMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenericProgressMessage
+   */
+  static QString ClassName();
 
-    /**
-     * @brief New
-     * @param msgText
-     * @param progress
-     * @return
-     */
-    static Pointer New(const QString& msgText, int progress);
+  ~GenericProgressMessage() override;
 
-    /**
-     * @brief This method creates and returns a string for generic progress messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param msgText
+   * @param progress
+   * @return
+   */
+  static Pointer New(const QString& msgText, int progress);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for generic progress messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    GenericProgressMessage();
-    GenericProgressMessage(const QString& msgText, int progress);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  GenericProgressMessage();
+  GenericProgressMessage(const QString& msgText, int progress);
 
+private:
 };
 Q_DECLARE_METATYPE(GenericProgressMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.cpp b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
index 6bde8f89f4..794b225d69 100644
--- a/Source/SIMPLib/Messages/GenericStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
@@ -83,3 +83,28 @@ void GenericStatusMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+GenericStatusMessage::Pointer GenericStatusMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+GenericStatusMessage::Pointer GenericStatusMessage::New()
+{
+  Pointer sharedPtr(new(GenericStatusMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericStatusMessage::getNameOfClass() const
+{
+  return QString("GenericStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString GenericStatusMessage::ClassName()
+{
+  return QString("GenericStatusMessage");
+}
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.h b/Source/SIMPLib/Messages/GenericStatusMessage.h
index d8b53bfc1b..1c55195737 100755
--- a/Source/SIMPLib/Messages/GenericStatusMessage.h
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractStatusMessage.h"
 
 /**
@@ -45,40 +47,54 @@
  */
 class SIMPLib_EXPORT GenericStatusMessage : public AbstractStatusMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(GenericStatusMessage)
-    SIMPL_STATIC_NEW_MACRO(GenericStatusMessage)
-    SIMPL_TYPE_MACRO(GenericStatusMessage)
 
-    virtual ~GenericStatusMessage();
+public:
+  using Self = GenericStatusMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenericStatusMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenericStatusMessage
+   */
+  static QString ClassName();
 
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param msg
-     * @return
-     */
-    static Pointer New(const QString& msgText);
+  ~GenericStatusMessage() override;
 
-    /**
-     * @brief This method creates and returns a string for generic status messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param msg
+   * @return
+   */
+  static Pointer New(const QString& msgText);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for generic status messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    GenericStatusMessage();
-    GenericStatusMessage(const QString& msgText);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  GenericStatusMessage();
+  GenericStatusMessage(const QString& msgText);
 
+private:
 };
 Q_DECLARE_METATYPE(GenericStatusMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.cpp b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
index f57cfe8b74..bb012cd0fc 100644
--- a/Source/SIMPLib/Messages/GenericWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "GenericWarningMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -84,3 +86,28 @@ void GenericWarningMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+GenericWarningMessage::Pointer GenericWarningMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+GenericWarningMessage::Pointer GenericWarningMessage::New()
+{
+  Pointer sharedPtr(new(GenericWarningMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericWarningMessage::getNameOfClass() const
+{
+  return QString("GenericWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString GenericWarningMessage::ClassName()
+{
+  return QString("GenericWarningMessage");
+}
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.h b/Source/SIMPLib/Messages/GenericWarningMessage.h
index eb7cd73c42..cf805683b3 100755
--- a/Source/SIMPLib/Messages/GenericWarningMessage.h
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractWarningMessage.h"
 
 /**
@@ -45,41 +47,55 @@
  */
 class SIMPLib_EXPORT GenericWarningMessage : public AbstractWarningMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(GenericWarningMessage)
-    SIMPL_STATIC_NEW_MACRO(GenericWarningMessage)
-    SIMPL_TYPE_MACRO(GenericWarningMessage)
 
-    virtual ~GenericWarningMessage();
+public:
+  using Self = GenericWarningMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenericWarningMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenericWarningMessage
+   */
+  static QString ClassName();
 
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString& msgText, int code);
+  ~GenericWarningMessage() override;
 
-    /**
-     * @brief This method creates and returns a string for generic warning messages
-     */
-    virtual QString generateMessageString() const override;
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& msgText, int code);
 
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
+  /**
+   * @brief This method creates and returns a string for generic warning messages
+   */
+  QString generateMessageString() const override;
 
-  protected:
-    GenericWarningMessage();
-    GenericWarningMessage(const QString& msgText, int code);
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
 
-  private:
+protected:
+  GenericWarningMessage();
+  GenericWarningMessage(const QString& msgText, int code);
 
+private:
 };
 Q_DECLARE_METATYPE(GenericWarningMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.cpp b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
index a007331989..12a0ca8989 100644
--- a/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "PipelineErrorMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -86,3 +88,40 @@ void PipelineErrorMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::Pointer PipelineErrorMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PipelineErrorMessage::Pointer PipelineErrorMessage::New()
+{
+  Pointer sharedPtr(new(PipelineErrorMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineErrorMessage::getNameOfClass() const
+{
+  return QString("PipelineErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineErrorMessage::ClassName()
+{
+  return QString("PipelineErrorMessage");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineErrorMessage::setPipelineName(const QString& value)
+{
+  m_PipelineName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineErrorMessage::getPipelineName() const
+{
+  return m_PipelineName;
+}
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.h b/Source/SIMPLib/Messages/PipelineErrorMessage.h
index 0f45094a9d..4688d14c3b 100755
--- a/Source/SIMPLib/Messages/PipelineErrorMessage.h
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractErrorMessage.h"
 
 /**
@@ -45,44 +47,67 @@
  */
 class SIMPLib_EXPORT PipelineErrorMessage : public AbstractErrorMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(PipelineErrorMessage)
-    SIMPL_STATIC_NEW_MACRO(PipelineErrorMessage)
-    SIMPL_TYPE_MACRO(PipelineErrorMessage)
-
-    virtual ~PipelineErrorMessage();
-
-    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
-
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString &pipelineName, const QString& msgText, int code);
-
-    /**
-     * @brief This method creates and returns a string for pipeline error messages
-     */
-    virtual QString generateMessageString() const override;
-
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
-
-  protected:
-    PipelineErrorMessage();
-    PipelineErrorMessage(const QString &pipelineName, const QString& msgText, int code);
-
-  private:
 
+public:
+  using Self = PipelineErrorMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineErrorMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineErrorMessage
+   */
+  static QString ClassName();
+
+  ~PipelineErrorMessage() override;
+
+  /**
+   * @brief Setter property for PipelineName
+   */
+  void setPipelineName(const QString& value);
+  /**
+   * @brief Getter property for PipelineName
+   * @return Value of PipelineName
+   */
+  QString getPipelineName() const;
+
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& pipelineName, const QString& msgText, int code);
+
+  /**
+   * @brief This method creates and returns a string for pipeline error messages
+   */
+  QString generateMessageString() const override;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
+
+protected:
+  PipelineErrorMessage();
+  PipelineErrorMessage(const QString& pipelineName, const QString& msgText, int code);
+
+private:
+  QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineErrorMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
index 0495ef1351..622363e656 100644
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "PipelineProgressMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -85,3 +87,40 @@ void PipelineProgressMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::Pointer PipelineProgressMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PipelineProgressMessage::Pointer PipelineProgressMessage::New()
+{
+  Pointer sharedPtr(new(PipelineProgressMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineProgressMessage::getNameOfClass() const
+{
+  return QString("PipelineProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineProgressMessage::ClassName()
+{
+  return QString("PipelineProgressMessage");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineProgressMessage::setPipelineName(const QString& value)
+{
+  m_PipelineName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineProgressMessage::getPipelineName() const
+{
+  return m_PipelineName;
+}
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.h b/Source/SIMPLib/Messages/PipelineProgressMessage.h
index f6d92cf799..30199d4a17 100755
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.h
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractProgressMessage.h"
 
 /**
@@ -45,44 +47,67 @@
  */
 class SIMPLib_EXPORT PipelineProgressMessage : public AbstractProgressMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(PipelineProgressMessage)
-    SIMPL_STATIC_NEW_MACRO(PipelineProgressMessage)
-    SIMPL_TYPE_MACRO(PipelineProgressMessage)
-
-    virtual ~PipelineProgressMessage();
-
-    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
-
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param progress
-     * @return
-     */
-    static Pointer New(const QString &pipelineName, const QString& msgText, int progress);
-
-    /**
-     * @brief This method creates and returns a string for pipeline progress messages
-     */
-    virtual QString generateMessageString() const override;
-
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
-
-  protected:
-    PipelineProgressMessage();
-    PipelineProgressMessage(const QString &pipelineName, const QString& msgText, int progress);
-
-  private:
 
+public:
+  using Self = PipelineProgressMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineProgressMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineProgressMessage
+   */
+  static QString ClassName();
+
+  ~PipelineProgressMessage() override;
+
+  /**
+   * @brief Setter property for PipelineName
+   */
+  void setPipelineName(const QString& value);
+  /**
+   * @brief Getter property for PipelineName
+   * @return Value of PipelineName
+   */
+  QString getPipelineName() const;
+
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param progress
+   * @return
+   */
+  static Pointer New(const QString& pipelineName, const QString& msgText, int progress);
+
+  /**
+   * @brief This method creates and returns a string for pipeline progress messages
+   */
+  QString generateMessageString() const override;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
+
+protected:
+  PipelineProgressMessage();
+  PipelineProgressMessage(const QString& pipelineName, const QString& msgText, int progress);
+
+private:
+  QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineProgressMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.cpp b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
index 046cc033c6..fc1fe203c1 100644
--- a/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
@@ -84,3 +84,40 @@ void PipelineStatusMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::Pointer PipelineStatusMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PipelineStatusMessage::Pointer PipelineStatusMessage::New()
+{
+  Pointer sharedPtr(new(PipelineStatusMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineStatusMessage::getNameOfClass() const
+{
+  return QString("PipelineStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineStatusMessage::ClassName()
+{
+  return QString("PipelineStatusMessage");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineStatusMessage::setPipelineName(const QString& value)
+{
+  m_PipelineName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineStatusMessage::getPipelineName() const
+{
+  return m_PipelineName;
+}
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.h b/Source/SIMPLib/Messages/PipelineStatusMessage.h
index cea626353e..b09692435c 100755
--- a/Source/SIMPLib/Messages/PipelineStatusMessage.h
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractStatusMessage.h"
 
 /**
@@ -45,43 +47,66 @@
  */
 class SIMPLib_EXPORT PipelineStatusMessage : public AbstractStatusMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(PipelineStatusMessage)
-    SIMPL_STATIC_NEW_MACRO(PipelineStatusMessage)
-    SIMPL_TYPE_MACRO(PipelineStatusMessage)
-
-    virtual ~PipelineStatusMessage();
-
-    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
-
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @return
-     */
-    static Pointer New(const QString &pipelineName, const QString& msgText);
-
-    /**
-     * @brief This method creates and returns a string for pipeline status messages
-     */
-    virtual QString generateMessageString() const override;
-
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
-
-  protected:
-    PipelineStatusMessage();
-    PipelineStatusMessage(const QString &pipelineName, const QString& msgText);
-
-  private:
 
+public:
+  using Self = PipelineStatusMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineStatusMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineStatusMessage
+   */
+  static QString ClassName();
+
+  ~PipelineStatusMessage() override;
+
+  /**
+   * @brief Setter property for PipelineName
+   */
+  void setPipelineName(const QString& value);
+  /**
+   * @brief Getter property for PipelineName
+   * @return Value of PipelineName
+   */
+  QString getPipelineName() const;
+
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @return
+   */
+  static Pointer New(const QString& pipelineName, const QString& msgText);
+
+  /**
+   * @brief This method creates and returns a string for pipeline status messages
+   */
+  QString generateMessageString() const override;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
+
+protected:
+  PipelineStatusMessage();
+  PipelineStatusMessage(const QString& pipelineName, const QString& msgText);
+
+private:
+  QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineStatusMessage::Pointer)
 
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.cpp b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
index 45412526ee..5080536040 100644
--- a/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
@@ -36,6 +36,8 @@
 
 #include "PipelineWarningMessage.h"
 
+#include <QtCore/QObject>
+
 #include "AbstractMessageHandler.h"
 
 // -----------------------------------------------------------------------------
@@ -85,3 +87,40 @@ void PipelineWarningMessage::visit(AbstractMessageHandler* msgHandler) const
 {
   msgHandler->processMessage(this);
 }
+
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::Pointer PipelineWarningMessage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PipelineWarningMessage::Pointer PipelineWarningMessage::New()
+{
+  Pointer sharedPtr(new(PipelineWarningMessage));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineWarningMessage::getNameOfClass() const
+{
+  return QString("PipelineWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineWarningMessage::ClassName()
+{
+  return QString("PipelineWarningMessage");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineWarningMessage::setPipelineName(const QString& value)
+{
+  m_PipelineName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineWarningMessage::getPipelineName() const
+{
+  return m_PipelineName;
+}
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.h b/Source/SIMPLib/Messages/PipelineWarningMessage.h
index e02a86d636..0bd5f3f227 100755
--- a/Source/SIMPLib/Messages/PipelineWarningMessage.h
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/Messages/AbstractWarningMessage.h"
 
 /**
@@ -45,44 +47,67 @@
  */
 class SIMPLib_EXPORT PipelineWarningMessage : public AbstractWarningMessage
 {
-  public:
-    SIMPL_SHARED_POINTERS(PipelineWarningMessage)
-    SIMPL_STATIC_NEW_MACRO(PipelineWarningMessage)
-    SIMPL_TYPE_MACRO(PipelineWarningMessage)
-
-    virtual ~PipelineWarningMessage();
-
-    SIMPL_INSTANCE_STRING_PROPERTY(PipelineName)
-
-    /**
-     * @brief New
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @return
-     */
-    static Pointer New(const QString &pipelineName, const QString& msgText, int code);
-
-    /**
-     * @brief This method creates and returns a string for pipeline warning messages
-     */
-    virtual QString generateMessageString() const override;
-
-    /**
-     * @brief Method that allows the visitation of a message by a message handler.  This
-     * is part of the double-dispatch API that allows observers to be able to perform
-     * subclass specific operations on messages that they receive.
-     * @param msgHandler The observer's message handler
-     */
-    virtual void visit(AbstractMessageHandler* msgHandler) const override final;
-
-  protected:
-    PipelineWarningMessage();
-    PipelineWarningMessage(const QString &pipelineName, const QString& msgText, int code);
-
-  private:
 
+public:
+  using Self = PipelineWarningMessage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineWarningMessage
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineWarningMessage
+   */
+  static QString ClassName();
+
+  ~PipelineWarningMessage() override;
+
+  /**
+   * @brief Setter property for PipelineName
+   */
+  void setPipelineName(const QString& value);
+  /**
+   * @brief Getter property for PipelineName
+   * @return Value of PipelineName
+   */
+  QString getPipelineName() const;
+
+  /**
+   * @brief New
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @return
+   */
+  static Pointer New(const QString& pipelineName, const QString& msgText, int code);
+
+  /**
+   * @brief This method creates and returns a string for pipeline warning messages
+   */
+  QString generateMessageString() const override;
+
+  /**
+   * @brief Method that allows the visitation of a message by a message handler.  This
+   * is part of the double-dispatch API that allows observers to be able to perform
+   * subclass specific operations on messages that they receive.
+   * @param msgHandler The observer's message handler
+   */
+  void visit(AbstractMessageHandler* msgHandler) const override final;
+
+protected:
+  PipelineWarningMessage();
+  PipelineWarningMessage(const QString& pipelineName, const QString& msgText, int code);
+
+private:
+  QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineWarningMessage::Pointer)
 
diff --git a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
index 74a73665ba..92226cc043 100755
--- a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
@@ -35,11 +35,12 @@
 #pragma once
 
 
+#include <memory>
+
 #include <QtCore/QSettings>
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 
 #ifdef NDEBUG
@@ -140,7 +141,12 @@ class FilterWidgetManager;
 class SIMPLib_EXPORT ISIMPLibPlugin
 {
   public:
-    SIMPL_SHARED_POINTERS(ISIMPLibPlugin)
+    using Self = ISIMPLibPlugin;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
     virtual ~ISIMPLibPlugin() = default;
 
@@ -257,6 +263,7 @@ class SIMPLib_EXPORT ISIMPLibPlugin
      */
     virtual void readSettings(QSettings& prefs) = 0;
 
+  private:
 };
 
 
diff --git a/Source/SIMPLib/Plugin/PluginManager.cpp b/Source/SIMPLib/Plugin/PluginManager.cpp
index 92c59c5612..e607441e95 100644
--- a/Source/SIMPLib/Plugin/PluginManager.cpp
+++ b/Source/SIMPLib/Plugin/PluginManager.cpp
@@ -37,11 +37,11 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+#include <QtCore/QDebug>
 
 #include "SIMPLib/Filtering/CorePlugin.h"
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
-
-
+#include "ISIMPLibPlugin.h"
 
 PluginManager* PluginManager::m_Self = nullptr;
 
@@ -58,10 +58,7 @@ PluginManager::PluginManager()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PluginManager::~PluginManager()
-{
-  //  qDebug() << "~PluginManager()" << this;
-}
+PluginManager::~PluginManager() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -186,3 +183,15 @@ QJsonArray PluginManager::toJsonArray() const
   }
   return plugArray;
 }
+
+// -----------------------------------------------------------------------------
+QString PluginManager::getNameOfClass() const
+{
+  return QString("PluginManager");
+}
+
+// -----------------------------------------------------------------------------
+QString PluginManager::ClassName()
+{
+  return QString("PluginManager");
+}
diff --git a/Source/SIMPLib/Plugin/PluginManager.h b/Source/SIMPLib/Plugin/PluginManager.h
index 236b3d53ca..28cbb968ec 100755
--- a/Source/SIMPLib/Plugin/PluginManager.h
+++ b/Source/SIMPLib/Plugin/PluginManager.h
@@ -37,11 +37,11 @@
 
 
 #include <QtCore/QString>
+#include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
-#include "ISIMPLibPlugin.h"
+class ISIMPLibPlugin;
 
 /**
  * @brief The PluginManager class manages instances of plugins and is mainly used to keep
@@ -51,7 +51,14 @@ class SIMPLib_EXPORT PluginManager
 {
   public:
 //    SIMPL_SHARED_POINTERS(PluginManager)
-    SIMPL_TYPE_MACRO(PluginManager)
+    /**
+     * @brief Returns the name of the class for PluginManager
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for PluginManager
+     */
+    static QString ClassName();
 
     virtual ~PluginManager();
 
@@ -110,7 +117,6 @@ class SIMPLib_EXPORT PluginManager
     PluginManager();
 
   private:
-
     QVector<ISIMPLibPlugin*> m_Plugins;
     static PluginManager* m_Self;
 
diff --git a/Source/SIMPLib/Plugin/PluginProxy.cpp b/Source/SIMPLib/Plugin/PluginProxy.cpp
index dc88a4d314..8b8aed2781 100644
--- a/Source/SIMPLib/Plugin/PluginProxy.cpp
+++ b/Source/SIMPLib/Plugin/PluginProxy.cpp
@@ -100,3 +100,28 @@ bool PluginProxy::getEnabled()
 {
   return m_Enabled;
 }
+
+// -----------------------------------------------------------------------------
+PluginProxy::Pointer PluginProxy::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PluginProxy::Pointer PluginProxy::New()
+{
+  Pointer sharedPtr(new(PluginProxy));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PluginProxy::getNameOfClass() const
+{
+  return QString("PluginProxy");
+}
+
+// -----------------------------------------------------------------------------
+QString PluginProxy::ClassName()
+{
+  return QString("PluginProxy");
+}
diff --git a/Source/SIMPLib/Plugin/PluginProxy.h b/Source/SIMPLib/Plugin/PluginProxy.h
index d77598678d..acbc8af4b5 100755
--- a/Source/SIMPLib/Plugin/PluginProxy.h
+++ b/Source/SIMPLib/Plugin/PluginProxy.h
@@ -36,10 +36,11 @@
 #pragma once
 
 
+#include <memory>
+
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 /**
  * @brief The PluginProxy class is a wrapper class for important plugin information.
@@ -47,9 +48,23 @@
 class SIMPLib_EXPORT PluginProxy
 {
   public:
-    SIMPL_SHARED_POINTERS(PluginProxy)
-    SIMPL_STATIC_NEW_MACRO(PluginProxy)
-    SIMPL_TYPE_MACRO(PluginProxy)
+    using Self = PluginProxy;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for PluginProxy
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for PluginProxy
+     */
+    static QString ClassName();
 
     PluginProxy();
     virtual ~PluginProxy();
diff --git a/Source/SIMPLib/REST/PipelineListener.cpp b/Source/SIMPLib/REST/PipelineListener.cpp
index 59f3baff28..b36f4ec728 100644
--- a/Source/SIMPLib/REST/PipelineListener.cpp
+++ b/Source/SIMPLib/REST/PipelineListener.cpp
@@ -196,3 +196,15 @@ void PipelineListener::closeFiles()
     m_StandardOutputLog->close();
   }
 }
+
+// -----------------------------------------------------------------------------
+QString PipelineListener::getNameOfClass() const
+{
+  return QString("_SUPERPipelineListener");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineListener::ClassName()
+{
+  return QString("_SUPERPipelineListener");
+}
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index 8287bb64ad..6cd336d138 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -6,7 +6,6 @@
 
 #include "SIMPLib/Common/IObserver.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 
 class PipelineListenerMessageHandler;
@@ -20,7 +19,14 @@ class SIMPLib_EXPORT PipelineListener : public QObject, public IObserver
 {
   Q_OBJECT
 public:
-  SIMPL_TYPE_MACRO_SUPER(PipelineListener, IObserver)
+  /**
+   * @brief Returns the name of the class for PipelineListener
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineListener
+   */
+  static QString ClassName();
 
   PipelineListener(QObject* parent);
   virtual ~PipelineListener();
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
index 5c9398ca30..35048002ff 100644
--- a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
@@ -36,6 +36,8 @@
 
 #include "PipelineListenerMessageHandler.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Messages/GenericErrorMessage.h"
 #include "SIMPLib/Messages/GenericWarningMessage.h"
 #include "SIMPLib/Messages/GenericStatusMessage.h"
@@ -157,7 +159,7 @@ void PipelineListenerMessageHandler::streamToLog(const QString &msgString, QFile
   {
     QTextStream stream(log);
     stream.readAll();
-    stream << msgString << endl;
+    stream << msgString << "\n";
     log->close();
   }
 }
diff --git a/Source/SIMPLib/REST/SIMPLRequestMapper.h b/Source/SIMPLib/REST/SIMPLRequestMapper.h
index 1e906013f4..72b58366df 100644
--- a/Source/SIMPLib/REST/SIMPLRequestMapper.h
+++ b/Source/SIMPLib/REST/SIMPLRequestMapper.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT SIMPLRequestMapper : public HttpRequestHandler
     Constructor.
     @param parent Parent object
   */
-  SIMPLRequestMapper(QObject* parent = 0);
+  SIMPLRequestMapper(QObject* parent = nullptr);
 
   /**
     Destructor.
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 427c9230fb..5597eaa71a 100755
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -52,8 +52,12 @@
 #include "QtWebApp/httpserver/httplistener.h"
 #include "QtWebApp/httpserver/httpsessionstore.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
+
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -79,6 +83,8 @@
 #include "RESTClient/SIMPLRestClient.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 9cc9247920..2afae85e30 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -37,7 +37,10 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QProcess>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
+
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
index 81903a17de..fbe3c5bb3b 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
@@ -45,6 +45,7 @@
 
 #include "QtWebApp/httpserver/httplistener.h"
 #include "QtWebApp/httpserver/httpsessionstore.h"
+
 #include "SIMPLib/REST/PipelineListener.h"
 #include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
 #include "SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
index 4fbe9657b2..cdba0e74c4 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
@@ -4,6 +4,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 
 #include "SIMPLib/REST/SIMPLDirectoryListing.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
index 42efb88a24..7a378a2d39 100644
--- a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
+++ b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT V1RequestMapper : public HttpRequestHandler
     Constructor.
     @param parent Parent object
   */
-  V1RequestMapper(QObject* parent = 0);
+  V1RequestMapper(QObject* parent = nullptr);
 
   /**
     Destructor.
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index 41a033bc26..019198be88 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -39,6 +39,8 @@
 /* define to 1 if we are enabling NTFS file checking */
 #cmakedefine SIMPL_NTFS_FILE_CHECK @SIMPL_NTFS_FILE_CHECK@
 
+/* define to 1 if we are enabling Python Wrapping through Pybind11 */
+#cmakedefine SIMPL_ENABLE_PYTHON
 
 /* ****************************************************************************
 * These define what source groups are being compiled
@@ -78,6 +80,10 @@
 /* Include the DLL export preprocessor defines */
 #include "SIMPLib/Common/SIMPLibDLLExport.h"
 
+#ifdef SIMPL_ENABLE_PYTHON
+#include "SIMPLib/Common/SIMPLPythonMacros.h"
+#endif
+
 /* We are going to disable some warnings just to get a grip on all the warnings that get produced
 * during an MSVC build */
 #cmakedefine SIMPLib_DISABLE_MSVC_WARNINGS @SIMPLib_DISABLE_MSVC_WARNINGS@
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
index 4437c64e2c..fa0c0698e8 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
@@ -164,3 +164,52 @@ void BoundaryStatsData::readJson(const QJsonObject& json)
   }
 
 }
+
+// -----------------------------------------------------------------------------
+BoundaryStatsData::Pointer BoundaryStatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+BoundaryStatsData::Pointer BoundaryStatsData::New()
+{
+  Pointer sharedPtr(new(BoundaryStatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString BoundaryStatsData::getNameOfClass() const
+{
+  return QString("BoundaryStatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString BoundaryStatsData::ClassName()
+{
+  return QString("BoundaryStatsData");
+}
+
+// -----------------------------------------------------------------------------
+void BoundaryStatsData::setBoundaryArea(float value)
+{
+  m_BoundaryArea = value;
+}
+
+// -----------------------------------------------------------------------------
+float BoundaryStatsData::getBoundaryArea() const
+{
+  return m_BoundaryArea;
+}
+
+// -----------------------------------------------------------------------------
+void BoundaryStatsData::setParentPhase(float value)
+{
+  m_ParentPhase = value;
+}
+
+// -----------------------------------------------------------------------------
+float BoundaryStatsData::getParentPhase() const
+{
+  return m_ParentPhase;
+}
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index 22ae003d74..42543c0327 100755
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -36,11 +36,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
 #include "SIMPLib/Common/PhaseType.h"
@@ -83,9 +84,23 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 class SIMPLib_EXPORT BoundaryStatsData : public StatsData
 {
   public:
-    SIMPL_SHARED_POINTERS(BoundaryStatsData)
-    SIMPL_STATIC_NEW_MACRO(BoundaryStatsData)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(BoundaryStatsData, StatsData)
+    using Self = BoundaryStatsData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for BoundaryStatsData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for BoundaryStatsData
+     */
+    static QString ClassName();
 
     ~BoundaryStatsData() override;
 
@@ -112,9 +127,25 @@ class SIMPLib_EXPORT BoundaryStatsData : public StatsData
     static VectorOfFloatArray CreateCorrelatedDistributionArrays(uint32_t distributionType, size_t numBins);
     static FloatArrayType::Pointer CreateDistributionArrays(uint32_t distributionType);
 
+    /**
+     * @brief Setter property for BoundaryArea
+     */
+    void setBoundaryArea(float value);
+    /**
+     * @brief Getter property for BoundaryArea
+     * @return Value of BoundaryArea
+     */
+    float getBoundaryArea() const;
 
-    SIMPL_INSTANCE_PROPERTY(float, BoundaryArea)
-    SIMPL_INSTANCE_PROPERTY(float, ParentPhase)
+    /**
+     * @brief Setter property for ParentPhase
+     */
+    void setParentPhase(float value);
+    /**
+     * @brief Getter property for ParentPhase
+     * @return Value of ParentPhase
+     */
+    float getParentPhase() const;
 
     /**
      * @brief getStatsType
@@ -173,6 +204,10 @@ class SIMPLib_EXPORT BoundaryStatsData : public StatsData
     BoundaryStatsData(BoundaryStatsData&&) = delete;      // Move Constructor Not Implemented
     BoundaryStatsData& operator=(const BoundaryStatsData&) = delete; // Copy Assignment Not Implemented
     BoundaryStatsData& operator=(BoundaryStatsData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    float m_BoundaryArea = {};
+    float m_ParentPhase = {};
 };
 
 
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.cpp b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
index 97a1dd0186..4f563c060a 100644
--- a/Source/SIMPLib/StatsData/MatrixStatsData.cpp
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
@@ -144,3 +144,28 @@ void MatrixStatsData::readJson(const QJsonObject& json)
   }
 
 }
+
+// -----------------------------------------------------------------------------
+MatrixStatsData::Pointer MatrixStatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MatrixStatsData::Pointer MatrixStatsData::New()
+{
+  Pointer sharedPtr(new(MatrixStatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MatrixStatsData::getNameOfClass() const
+{
+  return QString("MatrixStatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString MatrixStatsData::ClassName()
+{
+  return QString("MatrixStatsData");
+}
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.h b/Source/SIMPLib/StatsData/MatrixStatsData.h
index 2388c6fdc4..49e7d271eb 100755
--- a/Source/SIMPLib/StatsData/MatrixStatsData.h
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.h
@@ -36,11 +36,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
@@ -83,9 +84,23 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 class SIMPLib_EXPORT MatrixStatsData : public StatsData
 {
   public:
-    SIMPL_SHARED_POINTERS(MatrixStatsData)
-    SIMPL_STATIC_NEW_MACRO(MatrixStatsData)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MatrixStatsData, StatsData)
+    using Self = MatrixStatsData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for MatrixStatsData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for MatrixStatsData
+     */
+    static QString ClassName();
 
     ~MatrixStatsData() override;
 
@@ -158,6 +173,8 @@ class SIMPLib_EXPORT MatrixStatsData : public StatsData
     MatrixStatsData(MatrixStatsData&&) = delete;      // Move Constructor Not Implemented
     MatrixStatsData& operator=(const MatrixStatsData&) = delete; // Copy Assignment Not Implemented
     MatrixStatsData& operator=(MatrixStatsData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index e7cde1a118..b85ea53898 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -40,6 +40,8 @@
 
 #include "H5Support/H5Utilities.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h"
 
 // -----------------------------------------------------------------------------
@@ -76,8 +78,7 @@ PhaseType::Type PrecipitateStatsData::getPhaseType()
 // -----------------------------------------------------------------------------
 FloatArrayType::Pointer PrecipitateStatsData::generateBinNumbers()
 {
-  float featureDiameterInfo[3];
-  std::tie(featureDiameterInfo[0], featureDiameterInfo[1], featureDiameterInfo[2]) = getFeatureDiameterInfo();
+  std::array<float, 3> featureDiameterInfo = getFeatureDiameterInfo();
   QVector<float> bins;
   float d = featureDiameterInfo[2];
   while(d <= featureDiameterInfo[1])
@@ -106,9 +107,8 @@ StatsData::Pointer PrecipitateStatsData::deepCopy()
   ptr->setPrecipBoundaryFraction(getPrecipBoundaryFraction());
   ptr->setName(getName());
 
-  float diamInfo[3] = {0.0f, 0.0f, 0.0f};
-  std::tie(diamInfo[0], diamInfo[1], diamInfo[2]) = getFeatureDiameterInfo();
-  ptr->setFeatureDiameterInfo(std::make_tuple(diamInfo[0], diamInfo[1], diamInfo[2]));
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
+  ptr->setFeatureDiameterInfo(diamInfo[0], diamInfo[1], diamInfo[2]);
 
   SD_DEEP_COPY_VECTOR(FeatureSizeDistribution);
 
@@ -216,8 +216,7 @@ void PrecipitateStatsData::writeJson(QJsonObject& json)
   json.insert(SIMPL::StringConstants::PrecipitateBoundaryFraction, getPrecipBoundaryFraction());
 
   // Write the Feature Diameter Info
-  float diamInfo[3];
-  std::tie(diamInfo[0], diamInfo[1], diamInfo[2]) = getFeatureDiameterInfo();
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
   QJsonArray diamInfoArray = {diamInfo[0], diamInfo[1], diamInfo[2]};
   json.insert(SIMPL::StringConstants::Feature_Diameter_Info, diamInfoArray);
 
@@ -300,12 +299,12 @@ void PrecipitateStatsData::readJson(const QJsonObject& json)
   }
 
   // Read the Feature Diameter Info
-  float fVec3[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> fVec3 = {0.0f, 0.0f, 0.0f};
   if(ParseFloat3Vec(json, SIMPL::StringConstants::Feature_Diameter_Info, fVec3, 0.0) == -1)
   {
     // Throw warning
   }
-  setFeatureDiameterInfo(std::make_tuple(fVec3[0], fVec3[1], fVec3[2]));
+  setFeatureDiameterInfo(fVec3[0], fVec3[1], fVec3[2]);
 
   // Read the Feature Size Distribution
   jsonValue = json[SIMPL::StringConstants::Feature_Size_Distribution];
@@ -369,3 +368,296 @@ void PrecipitateStatsData::readJson(const QJsonObject& json)
   arrays = ReadJsonVectorOfFloatsArrays(json, SIMPL::StringConstants::AxisODFWeights);
   setAxisODF_Weights(arrays);
 }
+
+// -----------------------------------------------------------------------------
+PrecipitateStatsData::Pointer PrecipitateStatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PrecipitateStatsData::Pointer PrecipitateStatsData::New()
+{
+  Pointer sharedPtr(new(PrecipitateStatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PrecipitateStatsData::getNameOfClass() const
+{
+  return QString("PrecipitateStatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString PrecipitateStatsData::ClassName()
+{
+  return QString("PrecipitateStatsData");
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setBoundaryArea(float value)
+{
+  m_BoundaryArea = value;
+}
+
+// -----------------------------------------------------------------------------
+float PrecipitateStatsData::getBoundaryArea() const
+{
+  return m_BoundaryArea;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setPrecipBoundaryFraction(float value)
+{
+  m_PrecipBoundaryFraction = value;
+}
+
+// -----------------------------------------------------------------------------
+float PrecipitateStatsData::getPrecipBoundaryFraction() const
+{
+  return m_PrecipBoundaryFraction;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSizeDistribution(const VectorOfFloatArray& value)
+{
+  m_FeatureSizeDistribution = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getFeatureSizeDistribution() const
+{
+  return m_FeatureSizeDistribution;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSize_DistType(uint32_t value)
+{
+  m_FeatureSize_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrecipitateStatsData::getFeatureSize_DistType() const
+{
+  return m_FeatureSize_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setRadialDistFunction(const RdfData::Pointer& value)
+{
+  m_RadialDistFunction = value;
+}
+
+// -----------------------------------------------------------------------------
+RdfData::Pointer PrecipitateStatsData::getRadialDistFunction() const
+{
+  return m_RadialDistFunction;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setBinNumbers(const FloatArrayType::Pointer& value)
+{
+  m_BinNumbers = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrecipitateStatsData::getBinNumbers() const
+{
+  return m_BinNumbers;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSize_BOverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_BOverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getFeatureSize_BOverA() const
+{
+  return m_FeatureSize_BOverA;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setBOverA_DistType(uint32_t value)
+{
+  m_BOverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrecipitateStatsData::getBOverA_DistType() const
+{
+  return m_BOverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSize_COverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_COverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getFeatureSize_COverA() const
+{
+  return m_FeatureSize_COverA;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setCOverA_DistType(uint32_t value)
+{
+  m_COverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrecipitateStatsData::getCOverA_DistType() const
+{
+  return m_COverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSize_Clustering(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Clustering = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getFeatureSize_Clustering() const
+{
+  return m_FeatureSize_Clustering;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setClustering_DistType(uint32_t value)
+{
+  m_Clustering_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrecipitateStatsData::getClustering_DistType() const
+{
+  return m_Clustering_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureSize_Omegas(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Omegas = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getFeatureSize_Omegas() const
+{
+  return m_FeatureSize_Omegas;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setOmegas_DistType(uint32_t value)
+{
+  m_Omegas_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrecipitateStatsData::getOmegas_DistType() const
+{
+  return m_Omegas_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setMisorientationBins(const FloatArrayType::Pointer& value)
+{
+  m_MisorientationBins = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrecipitateStatsData::getMisorientationBins() const
+{
+  return m_MisorientationBins;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setMDF_Weights(const VectorOfFloatArray& value)
+{
+  m_MDF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getMDF_Weights() const
+{
+  return m_MDF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setODF(const FloatArrayType::Pointer& value)
+{
+  m_ODF = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrecipitateStatsData::getODF() const
+{
+  return m_ODF;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setODF_Weights(const VectorOfFloatArray& value)
+{
+  m_ODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getODF_Weights() const
+{
+  return m_ODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setAxisOrientation(const FloatArrayType::Pointer& value)
+{
+  m_AxisOrientation = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrecipitateStatsData::getAxisOrientation() const
+{
+  return m_AxisOrientation;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setAxisODF_Weights(const VectorOfFloatArray& value)
+{
+  m_AxisODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrecipitateStatsData::getAxisODF_Weights() const
+{
+  return m_AxisODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureDiameterInfo(const std::array<float, 3>& value)
+{
+  m_FeatureDiameterInfo = value;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::setFeatureDiameterInfo(float v0, float v1, float v2)
+{
+  m_FeatureDiameterInfo[0] = v0;
+  m_FeatureDiameterInfo[1] = v1;
+  m_FeatureDiameterInfo[2] = v2;
+}
+
+// -----------------------------------------------------------------------------
+std::array<float, 3> PrecipitateStatsData::getFeatureDiameterInfo() const
+{
+  return m_FeatureDiameterInfo;
+}
+
+// -----------------------------------------------------------------------------
+void PrecipitateStatsData::getFeatureDiameterInfo(float* data) const
+{
+  data[0] = m_FeatureDiameterInfo[0];
+  data[1] = m_FeatureDiameterInfo[1];
+  data[2] = m_FeatureDiameterInfo[2];
+}
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index ff9824f2f5..9156f35202 100755
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -36,11 +36,13 @@
 
 #pragma once
 
+#include <memory>
+
+#include <array>
+
 #include <hdf5.h>
 
 
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
@@ -85,7 +87,11 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(PrecipitateStatsData SUPERCLASS StatsData)
+  PYB11_SHARED_POINTERS(PrecipitateStatsData)
+  PYB11_STATIC_NEW_MACRO(PrecipitateStatsData)
   PYB11_STATIC_CREATION(initialize)
 
   PYB11_PROPERTY(float BinStepSize READ getBinStepSize WRITE setBinStepSize)
@@ -99,11 +105,26 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
   PYB11_PROPERTY(float BoundaryArea READ getBoundaryArea WRITE setBoundaryArea)
   PYB11_PROPERTY(float PrecipBoundaryFraction READ getPrecipBoundaryFraction WRITE setPrecipBoundaryFraction)
   PYB11_METHOD(QString getStatsType)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(PrecipitateStatsData)
-  SIMPL_STATIC_NEW_MACRO(PrecipitateStatsData)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PrecipitateStatsData, StatsData)
+  using Self = PrecipitateStatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PrecipitateStatsData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PrecipitateStatsData
+   */
+  static QString ClassName();
 
   ~PrecipitateStatsData() override;
 
@@ -118,21 +139,55 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     precision = 0;
   }
 
-    SIMPL_INSTANCE_PROPERTY(float, BoundaryArea)
-    SIMPL_INSTANCE_PROPERTY(float, PrecipBoundaryFraction)
+  /**
+   * @brief Setter property for BoundaryArea
+   */
+  void setBoundaryArea(float value);
+  /**
+   * @brief Getter property for BoundaryArea
+   * @return Value of BoundaryArea
+   */
+  float getBoundaryArea() const;
 
-    QString getStatsType() override;
-    PhaseType::Type getPhaseType() override;
+  /**
+   * @brief Setter property for PrecipBoundaryFraction
+   */
+  void setPrecipBoundaryFraction(float value);
+  /**
+   * @brief Getter property for PrecipBoundaryFraction
+   * @return Value of PrecipBoundaryFraction
+   */
+  float getPrecipBoundaryFraction() const;
 
-    /**
-      * @breif this will generate the Bin Numbers values;
-      */
-    FloatArrayType::Pointer generateBinNumbers();
-    /**
-     * @brief The values are encoded into 3 floats: Average, Max, Min
-     */
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, FeatureDiameterInfo)
-    void setBinStepSize(float v) { m_FeatureDiameterInfo[0] = v;}
+  QString getStatsType() override;
+  PhaseType::Type getPhaseType() override;
+
+  /**
+   * @breif this will generate the Bin Numbers values;
+   */
+  FloatArrayType::Pointer generateBinNumbers();
+  /**
+   * @brief The values are encoded into 3 floats: Average, Max, Min
+   */
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(const std::array<float, 3>& value);
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(float v0, float v1, float v2);
+  /**
+   * @brief Getter property for FeatureDiameterInfo
+   * @return Value of FeatureDiameterInfo
+   */
+  std::array<float, 3> getFeatureDiameterInfo() const;
+  void getFeatureDiameterInfo(float* data) const;
+
+  void setBinStepSize(float v)
+  {
+    m_FeatureDiameterInfo[0] = v;
+  }
     float getBinStepSize() { return m_FeatureDiameterInfo[0]; }
 
     void setMaxFeatureDiameter(float v) { m_FeatureDiameterInfo[1] = v;}
@@ -144,41 +199,193 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     /**
       * @brief The values are encoded into float arrays
       */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSizeDistribution)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, FeatureSize_DistType)
-    SIMPL_INSTANCE_PROPERTY(RdfData::Pointer, RadialDistFunction)
+    /**
+     * @brief Setter property for FeatureSizeDistribution
+     */
+    void setFeatureSizeDistribution(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSizeDistribution
+     * @return Value of FeatureSizeDistribution
+     */
+    VectorOfFloatArray getFeatureSizeDistribution() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, BinNumbers)
+    /**
+     * @brief Setter property for FeatureSize_DistType
+     */
+    void setFeatureSize_DistType(uint32_t value);
+    /**
+     * @brief Getter property for FeatureSize_DistType
+     * @return Value of FeatureSize_DistType
+     */
+    uint32_t getFeatureSize_DistType() const;
+
+    /**
+     * @brief Setter property for RadialDistFunction
+     */
+    void setRadialDistFunction(const RdfData::Pointer& value);
+    /**
+     * @brief Getter property for RadialDistFunction
+     * @return Value of RadialDistFunction
+     */
+    RdfData::Pointer getRadialDistFunction() const;
+
+    /**
+     * @brief Setter property for BinNumbers
+     */
+    void setBinNumbers(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for BinNumbers
+     * @return Value of BinNumbers
+     */
+    FloatArrayType::Pointer getBinNumbers() const;
 
     size_t getNumberOfBins()
     {
       return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
     }
 
+    /**
+     * @brief Setter property for FeatureSize_BOverA
+     */
+    void setFeatureSize_BOverA(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_BOverA
+     * @return Value of FeatureSize_BOverA
+     */
+    VectorOfFloatArray getFeatureSize_BOverA() const;
+
+    /**
+     * @brief Setter property for BOverA_DistType
+     */
+    void setBOverA_DistType(uint32_t value);
+    /**
+     * @brief Getter property for BOverA_DistType
+     * @return Value of BOverA_DistType
+     */
+    uint32_t getBOverA_DistType() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_BOverA)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, BOverA_DistType)
+    /**
+     * @brief Setter property for FeatureSize_COverA
+     */
+    void setFeatureSize_COverA(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_COverA
+     * @return Value of FeatureSize_COverA
+     */
+    VectorOfFloatArray getFeatureSize_COverA() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_COverA)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, COverA_DistType)
+    /**
+     * @brief Setter property for COverA_DistType
+     */
+    void setCOverA_DistType(uint32_t value);
+    /**
+     * @brief Getter property for COverA_DistType
+     * @return Value of COverA_DistType
+     */
+    uint32_t getCOverA_DistType() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Clustering)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, Clustering_DistType)
+    /**
+     * @brief Setter property for FeatureSize_Clustering
+     */
+    void setFeatureSize_Clustering(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_Clustering
+     * @return Value of FeatureSize_Clustering
+     */
+    VectorOfFloatArray getFeatureSize_Clustering() const;
+
+    /**
+     * @brief Setter property for Clustering_DistType
+     */
+    void setClustering_DistType(uint32_t value);
+    /**
+     * @brief Getter property for Clustering_DistType
+     * @return Value of Clustering_DistType
+     */
+    uint32_t getClustering_DistType() const;
+
+    /**
+     * @brief Setter property for FeatureSize_Omegas
+     */
+    void setFeatureSize_Omegas(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_Omegas
+     * @return Value of FeatureSize_Omegas
+     */
+    VectorOfFloatArray getFeatureSize_Omegas() const;
+
+    /**
+     * @brief Setter property for Omegas_DistType
+     */
+    void setOmegas_DistType(uint32_t value);
+    /**
+     * @brief Getter property for Omegas_DistType
+     * @return Value of Omegas_DistType
+     */
+    uint32_t getOmegas_DistType() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Omegas)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, Omegas_DistType)
+    /**
+     * @brief Setter property for MisorientationBins
+     */
+    void setMisorientationBins(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for MisorientationBins
+     * @return Value of MisorientationBins
+     */
+    FloatArrayType::Pointer getMisorientationBins() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, MisorientationBins)
     /* 3 Vectors: Angles, Axis, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, MDF_Weights)
+    /**
+     * @brief Setter property for MDF_Weights
+     */
+    void setMDF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for MDF_Weights
+     * @return Value of MDF_Weights
+     */
+    VectorOfFloatArray getMDF_Weights() const;
+
+    /**
+     * @brief Setter property for ODF
+     */
+    void setODF(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for ODF
+     * @return Value of ODF
+     */
+    FloatArrayType::Pointer getODF() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, ODF)
     /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, ODF_Weights)
+    /**
+     * @brief Setter property for ODF_Weights
+     */
+    void setODF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for ODF_Weights
+     * @return Value of ODF_Weights
+     */
+    VectorOfFloatArray getODF_Weights() const;
+
+    /**
+     * @brief Setter property for AxisOrientation
+     */
+    void setAxisOrientation(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for AxisOrientation
+     * @return Value of AxisOrientation
+     */
+    FloatArrayType::Pointer getAxisOrientation() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, AxisOrientation)
     /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, AxisODF_Weights)
+    /**
+     * @brief Setter property for AxisODF_Weights
+     */
+    void setAxisODF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for AxisODF_Weights
+     * @return Value of AxisODF_Weights
+     */
+    VectorOfFloatArray getAxisODF_Weights() const;
 
     /**
      * @brief deepCopy
@@ -225,6 +432,30 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     PrecipitateStatsData(PrecipitateStatsData&&) = delete;      // Move Constructor Not Implemented
     PrecipitateStatsData& operator=(const PrecipitateStatsData&) = delete; // Copy Assignment Not Implemented
     PrecipitateStatsData& operator=(PrecipitateStatsData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    std::array<float, 3> m_FeatureDiameterInfo;
+
+    float m_BoundaryArea = {};
+    float m_PrecipBoundaryFraction = {};
+    VectorOfFloatArray m_FeatureSizeDistribution = {};
+    uint32_t m_FeatureSize_DistType = {};
+    RdfData::Pointer m_RadialDistFunction = {};
+    FloatArrayType::Pointer m_BinNumbers = {};
+    VectorOfFloatArray m_FeatureSize_BOverA = {};
+    uint32_t m_BOverA_DistType = {};
+    VectorOfFloatArray m_FeatureSize_COverA = {};
+    uint32_t m_COverA_DistType = {};
+    VectorOfFloatArray m_FeatureSize_Clustering = {};
+    uint32_t m_Clustering_DistType = {};
+    VectorOfFloatArray m_FeatureSize_Omegas = {};
+    uint32_t m_Omegas_DistType = {};
+    FloatArrayType::Pointer m_MisorientationBins = {};
+    VectorOfFloatArray m_MDF_Weights = {};
+    FloatArrayType::Pointer m_ODF = {};
+    VectorOfFloatArray m_ODF_Weights = {};
+    FloatArrayType::Pointer m_AxisOrientation = {};
+    VectorOfFloatArray m_AxisODF_Weights = {};
 };
 
 
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index 3dc8c10890..9cee4ee907 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PrimaryStatsData.h"
 
@@ -42,6 +42,8 @@
 
 #include "H5Support/H5Utilities.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h"
 
 // -----------------------------------------------------------------------------
@@ -83,8 +85,7 @@ StatsData::Pointer PrimaryStatsData::deepCopy()
   ptr->setPhaseFraction(getPhaseFraction());
   ptr->setName(getName());
 
-  float diamInfo[3] = {0.0f, 0.0f, 0.0f};
-  getFeatureDiameterInfo(diamInfo);
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
   ptr->setFeatureDiameterInfo(diamInfo);
 
   SD_DEEP_COPY_VECTOR(FeatureSizeDistribution);
@@ -280,7 +281,7 @@ void PrimaryStatsData::readJson(const QJsonObject& json)
     setPhaseFraction(jsonValue.toDouble(0.0));
   }
   // Read the Feature Diameter Info
-  float fVec3[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> fVec3 = {0.0f, 0.0f, 0.0f};
   if(ParseFloat3Vec(json, SIMPL::StringConstants::Feature_Diameter_Info, fVec3, 0.0) == -1)
   {
     // Throw warning
@@ -351,3 +352,272 @@ void PrimaryStatsData::readJson(const QJsonObject& json)
   arrays = ReadJsonVectorOfFloatsArrays(json, SIMPL::StringConstants::AxisODFWeights);
   setAxisODF_Weights(arrays);
 }
+
+// -----------------------------------------------------------------------------
+PrimaryStatsData::Pointer PrimaryStatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+PrimaryStatsData::Pointer PrimaryStatsData::New()
+{
+  Pointer sharedPtr(new(PrimaryStatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString PrimaryStatsData::getNameOfClass() const
+{
+  return QString("PrimaryStatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString PrimaryStatsData::ClassName()
+{
+  return QString("PrimaryStatsData");
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setBoundaryArea(float value)
+{
+  m_BoundaryArea = value;
+}
+
+// -----------------------------------------------------------------------------
+float PrimaryStatsData::getBoundaryArea() const
+{
+  return m_BoundaryArea;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSizeDistribution(const VectorOfFloatArray& value)
+{
+  m_FeatureSizeDistribution = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getFeatureSizeDistribution() const
+{
+  return m_FeatureSizeDistribution;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSize_DistType(uint32_t value)
+{
+  m_FeatureSize_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrimaryStatsData::getFeatureSize_DistType() const
+{
+  return m_FeatureSize_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setBinNumbers(const FloatArrayType::Pointer& value)
+{
+  m_BinNumbers = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrimaryStatsData::getBinNumbers() const
+{
+  return m_BinNumbers;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSize_BOverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_BOverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getFeatureSize_BOverA() const
+{
+  return m_FeatureSize_BOverA;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setBOverA_DistType(uint32_t value)
+{
+  m_BOverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrimaryStatsData::getBOverA_DistType() const
+{
+  return m_BOverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSize_COverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_COverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getFeatureSize_COverA() const
+{
+  return m_FeatureSize_COverA;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setCOverA_DistType(uint32_t value)
+{
+  m_COverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrimaryStatsData::getCOverA_DistType() const
+{
+  return m_COverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSize_Neighbors(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Neighbors = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getFeatureSize_Neighbors() const
+{
+  return m_FeatureSize_Neighbors;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setNeighbors_DistType(uint32_t value)
+{
+  m_Neighbors_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrimaryStatsData::getNeighbors_DistType() const
+{
+  return m_Neighbors_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureSize_Omegas(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Omegas = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getFeatureSize_Omegas() const
+{
+  return m_FeatureSize_Omegas;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setOmegas_DistType(uint32_t value)
+{
+  m_Omegas_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t PrimaryStatsData::getOmegas_DistType() const
+{
+  return m_Omegas_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setMisorientationBins(const FloatArrayType::Pointer& value)
+{
+  m_MisorientationBins = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrimaryStatsData::getMisorientationBins() const
+{
+  return m_MisorientationBins;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setMDF_Weights(const VectorOfFloatArray& value)
+{
+  m_MDF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getMDF_Weights() const
+{
+  return m_MDF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setODF(const FloatArrayType::Pointer& value)
+{
+  m_ODF = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrimaryStatsData::getODF() const
+{
+  return m_ODF;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setODF_Weights(const VectorOfFloatArray& value)
+{
+  m_ODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getODF_Weights() const
+{
+  return m_ODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setAxisOrientation(const FloatArrayType::Pointer& value)
+{
+  m_AxisOrientation = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer PrimaryStatsData::getAxisOrientation() const
+{
+  return m_AxisOrientation;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setAxisODF_Weights(const VectorOfFloatArray& value)
+{
+  m_AxisODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray PrimaryStatsData::getAxisODF_Weights() const
+{
+  return m_AxisODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureDiameterInfo(const std::array<float, 3>& value)
+{
+  m_FeatureDiameterInfo = value;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::setFeatureDiameterInfo(float v0, float v1, float v2)
+{
+  m_FeatureDiameterInfo[0] = v0;
+  m_FeatureDiameterInfo[1] = v1;
+  m_FeatureDiameterInfo[2] = v2;
+}
+
+// -----------------------------------------------------------------------------
+std::array<float, 3> PrimaryStatsData::getFeatureDiameterInfo() const
+{
+  return m_FeatureDiameterInfo;
+}
+
+// -----------------------------------------------------------------------------
+void PrimaryStatsData::getFeatureDiameterInfo(float* data) const
+{
+  data[0] = m_FeatureDiameterInfo[0];
+  data[1] = m_FeatureDiameterInfo[1];
+  data[2] = m_FeatureDiameterInfo[2];
+}
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
index 968c0b8759..ef6aa32826 100755
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.h
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -35,12 +35,15 @@
 
 #pragma once
 
+#include <memory>
+
+#include <array>
+
 #include <hdf5.h>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/PhaseType.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/StatsData.h"
 
 typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
@@ -80,7 +83,11 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT PrimaryStatsData : public StatsData
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(PrimaryStatsData SUPER StatsData)
+  PYB11_SHARED_POINTERS(PrimaryStatsData)
+  PYB11_STATIC_NEW_MACRO(PrimaryStatsData)
   PYB11_STATIC_CREATION(initialize)
 
   PYB11_PROPERTY(float BinStepSize READ getBinStepSize WRITE setBinStepSize)
@@ -92,11 +99,26 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   PYB11_METHOD(FloatArrayType::Pointer generateBinNumbers)
   PYB11_PROPERTY(float PhaseFraction READ getPhaseFraction WRITE setPhaseFraction)
   PYB11_PROPERTY(float BoundaryArea READ getBoundaryArea WRITE setBoundaryArea)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(PrimaryStatsData)
-  SIMPL_STATIC_NEW_MACRO(PrimaryStatsData)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(PrimaryStatsData, StatsData)
+  using Self = PrimaryStatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PrimaryStatsData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PrimaryStatsData
+   */
+  static QString ClassName();
 
   ~PrimaryStatsData() override;
 
@@ -114,7 +136,15 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   QString getStatsType() override;
   PhaseType::Type getPhaseType() override;
 
-  SIMPL_INSTANCE_PROPERTY(float, BoundaryArea)
+  /**
+   * @brief Setter property for BoundaryArea
+   */
+  void setBoundaryArea(float value);
+  /**
+   * @brief Getter property for BoundaryArea
+   * @return Value of BoundaryArea
+   */
+  float getBoundaryArea() const;
 
   /**
    * @breif this will generate the Bin Numbers values;
@@ -123,7 +153,21 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   /**
    * @brief The values are encoded into 3 floats: Average, Max, Min
    */
-  SIMPL_INSTANCE_VEC3_PROPERTY(float, FeatureDiameterInfo)
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(const std::array<float, 3>& value);
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(float v0, float v1, float v2);
+  /**
+   * @brief Getter property for FeatureDiameterInfo
+   * @return Value of FeatureDiameterInfo
+   */
+  std::array<float, 3> getFeatureDiameterInfo() const;
+  void getFeatureDiameterInfo(float* data) const;
+
   void setBinStepSize(float v)
   {
     m_FeatureDiameterInfo[0] = v;
@@ -154,39 +198,183 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   /**
    * @brief The values are encoded into float arrays
    */
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSizeDistribution)
-  SIMPL_INSTANCE_PROPERTY(uint32_t, FeatureSize_DistType)
+  /**
+   * @brief Setter property for FeatureSizeDistribution
+   */
+  void setFeatureSizeDistribution(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSizeDistribution
+   * @return Value of FeatureSizeDistribution
+   */
+  VectorOfFloatArray getFeatureSizeDistribution() const;
 
-  SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, BinNumbers)
+  /**
+   * @brief Setter property for FeatureSize_DistType
+   */
+  void setFeatureSize_DistType(uint32_t value);
+  /**
+   * @brief Getter property for FeatureSize_DistType
+   * @return Value of FeatureSize_DistType
+   */
+  uint32_t getFeatureSize_DistType() const;
+
+  /**
+   * @brief Setter property for BinNumbers
+   */
+  void setBinNumbers(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for BinNumbers
+   * @return Value of BinNumbers
+   */
+  FloatArrayType::Pointer getBinNumbers() const;
 
   size_t getNumberOfBins()
   {
     return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
   }
 
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_BOverA)
-  SIMPL_INSTANCE_PROPERTY(uint32_t, BOverA_DistType)
+  /**
+   * @brief Setter property for FeatureSize_BOverA
+   */
+  void setFeatureSize_BOverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_BOverA
+   * @return Value of FeatureSize_BOverA
+   */
+  VectorOfFloatArray getFeatureSize_BOverA() const;
 
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_COverA)
-  SIMPL_INSTANCE_PROPERTY(uint32_t, COverA_DistType)
+  /**
+   * @brief Setter property for BOverA_DistType
+   */
+  void setBOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for BOverA_DistType
+   * @return Value of BOverA_DistType
+   */
+  uint32_t getBOverA_DistType() const;
 
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Neighbors)
-  SIMPL_INSTANCE_PROPERTY(uint32_t, Neighbors_DistType)
+  /**
+   * @brief Setter property for FeatureSize_COverA
+   */
+  void setFeatureSize_COverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_COverA
+   * @return Value of FeatureSize_COverA
+   */
+  VectorOfFloatArray getFeatureSize_COverA() const;
 
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Omegas)
-  SIMPL_INSTANCE_PROPERTY(uint32_t, Omegas_DistType)
+  /**
+   * @brief Setter property for COverA_DistType
+   */
+  void setCOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for COverA_DistType
+   * @return Value of COverA_DistType
+   */
+  uint32_t getCOverA_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Neighbors
+   */
+  void setFeatureSize_Neighbors(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Neighbors
+   * @return Value of FeatureSize_Neighbors
+   */
+  VectorOfFloatArray getFeatureSize_Neighbors() const;
+
+  /**
+   * @brief Setter property for Neighbors_DistType
+   */
+  void setNeighbors_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Neighbors_DistType
+   * @return Value of Neighbors_DistType
+   */
+  uint32_t getNeighbors_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Omegas
+   */
+  void setFeatureSize_Omegas(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Omegas
+   * @return Value of FeatureSize_Omegas
+   */
+  VectorOfFloatArray getFeatureSize_Omegas() const;
+
+  /**
+   * @brief Setter property for Omegas_DistType
+   */
+  void setOmegas_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Omegas_DistType
+   * @return Value of Omegas_DistType
+   */
+  uint32_t getOmegas_DistType() const;
+
+  /**
+   * @brief Setter property for MisorientationBins
+   */
+  void setMisorientationBins(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for MisorientationBins
+   * @return Value of MisorientationBins
+   */
+  FloatArrayType::Pointer getMisorientationBins() const;
 
-  SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, MisorientationBins)
   /* 3 Vectors: Angles, Axis, Weights */
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, MDF_Weights)
+  /**
+   * @brief Setter property for MDF_Weights
+   */
+  void setMDF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for MDF_Weights
+   * @return Value of MDF_Weights
+   */
+  VectorOfFloatArray getMDF_Weights() const;
+
+  /**
+   * @brief Setter property for ODF
+   */
+  void setODF(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for ODF
+   * @return Value of ODF
+   */
+  FloatArrayType::Pointer getODF() const;
 
-  SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, ODF)
   /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, ODF_Weights)
+  /**
+   * @brief Setter property for ODF_Weights
+   */
+  void setODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for ODF_Weights
+   * @return Value of ODF_Weights
+   */
+  VectorOfFloatArray getODF_Weights() const;
+
+  /**
+   * @brief Setter property for AxisOrientation
+   */
+  void setAxisOrientation(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for AxisOrientation
+   * @return Value of AxisOrientation
+   */
+  FloatArrayType::Pointer getAxisOrientation() const;
 
-  SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, AxisOrientation)
   /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-  SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, AxisODF_Weights)
+  /**
+   * @brief Setter property for AxisODF_Weights
+   */
+  void setAxisODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for AxisODF_Weights
+   * @return Value of AxisODF_Weights
+   */
+  VectorOfFloatArray getAxisODF_Weights() const;
 
   /**
    * @brief deepCopy
@@ -233,4 +421,26 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   PrimaryStatsData(PrimaryStatsData&&) = delete;                 // Move Constructor Not Implemented
   PrimaryStatsData& operator=(const PrimaryStatsData&) = delete; // Copy Assignment Not Implemented
   PrimaryStatsData& operator=(PrimaryStatsData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  std::array<float, 3> m_FeatureDiameterInfo;
+
+  float m_BoundaryArea = {};
+  VectorOfFloatArray m_FeatureSizeDistribution = {};
+  uint32_t m_FeatureSize_DistType = {};
+  FloatArrayType::Pointer m_BinNumbers = {};
+  VectorOfFloatArray m_FeatureSize_BOverA = {};
+  uint32_t m_BOverA_DistType = {};
+  VectorOfFloatArray m_FeatureSize_COverA = {};
+  uint32_t m_COverA_DistType = {};
+  VectorOfFloatArray m_FeatureSize_Neighbors = {};
+  uint32_t m_Neighbors_DistType = {};
+  VectorOfFloatArray m_FeatureSize_Omegas = {};
+  uint32_t m_Omegas_DistType = {};
+  FloatArrayType::Pointer m_MisorientationBins = {};
+  VectorOfFloatArray m_MDF_Weights = {};
+  FloatArrayType::Pointer m_ODF = {};
+  VectorOfFloatArray m_ODF_Weights = {};
+  FloatArrayType::Pointer m_AxisOrientation = {};
+  VectorOfFloatArray m_AxisODF_Weights = {};
 };
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 34e954dcde..170d3747b6 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -35,7 +35,7 @@
 
 #include "StatsData.h"
 
-#include <QtCore/QString>
+#include <array>
 #include <vector>
 
 #include "H5Support/H5Utilities.h"
@@ -396,7 +396,7 @@ VectorOfFloatArray StatsData::ReadJsonVectorOfFloatsArrays(const QJsonObject& js
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsData::ParseFloat3Vec(const QJsonObject& json, const QString key, float* values, float defaultValue)
+int StatsData::ParseFloat3Vec(const QJsonObject& json, const QString& key, std::array<float, 3>& values, float defaultValue)
 {
   QJsonValue jsonValue = json[key];
   if(!jsonValue.isUndefined() && jsonValue.isArray())
@@ -414,3 +414,52 @@ int StatsData::ParseFloat3Vec(const QJsonObject& json, const QString key, float*
 
   return -1;
 }
+
+// -----------------------------------------------------------------------------
+StatsData::Pointer StatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+StatsData::Pointer StatsData::New()
+{
+  Pointer sharedPtr(new(StatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString StatsData::getNameOfClass() const
+{
+  return QString("StatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString StatsData::ClassName()
+{
+  return QString("StatsData");
+}
+
+// -----------------------------------------------------------------------------
+void StatsData::setName(const QString& value)
+{
+  m_Name = value;
+}
+
+// -----------------------------------------------------------------------------
+QString StatsData::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+void StatsData::setPhaseFraction(float value)
+{
+  m_PhaseFraction = value;
+}
+
+// -----------------------------------------------------------------------------
+float StatsData::getPhaseFraction() const
+{
+  return m_PhaseFraction;
+}
diff --git a/Source/SIMPLib/StatsData/StatsData.h b/Source/SIMPLib/StatsData/StatsData.h
index 840c354c72..80b81573e4 100755
--- a/Source/SIMPLib/StatsData/StatsData.h
+++ b/Source/SIMPLib/StatsData/StatsData.h
@@ -34,17 +34,19 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <hdf5.h>
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/PhaseType.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/SIMPLib.h"
 
-typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
+using VectorOfFloatArray = QVector<FloatArrayType::Pointer>;
 
 #define SD_DEEP_COPY_VECTOR(func)                                                                                                                                                                      \
   {                                                                                                                                                                                                    \
@@ -88,23 +90,58 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT StatsData
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(StatsData)
+  PYB11_SHARED_POINTERS(StatsData)
+  PYB11_STATIC_NEW_MACRO(StatsData)
   PYB11_METHOD(QString getStatsType)
   PYB11_METHOD(PhaseType::Type getPhaseType)
   PYB11_PROPERTY(float PhaseFraction READ getPhaseFraction WRITE setPhaseFraction)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(StatsData)
-  SIMPL_STATIC_NEW_MACRO(StatsData)
-  SIMPL_TYPE_MACRO(StatsData)
+  using Self = StatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StatsData
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for StatsData
+   */
+  static QString ClassName();
 
   virtual ~StatsData();
 
   /** Allow users to give each StatsData object a custom name
    */
-  SIMPL_INSTANCE_STRING_PROPERTY(Name)
+  /**
+   * @brief Setter property for Name
+   */
+  void setName(const QString& value);
+  /**
+   * @brief Getter property for Name
+   * @return Value of Name
+   */
+  QString getName() const;
 
-  SIMPL_INSTANCE_PROPERTY(float, PhaseFraction)
+  /**
+   * @brief Setter property for PhaseFraction
+   */
+  void setPhaseFraction(float value);
+  /**
+   * @brief Getter property for PhaseFraction
+   * @return Value of PhaseFraction
+   */
+  float getPhaseFraction() const;
 
   /**
    * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
@@ -247,7 +284,7 @@ class SIMPLib_EXPORT StatsData
    * @param defaultValue
    * @return
    */
-  static int ParseFloat3Vec(const QJsonObject& json, const QString key, float* values, float defaultValue = 0.0f);
+  static int ParseFloat3Vec(const QJsonObject& json, const QString& key, std::array<float, 3>& values, float defaultValue = 0.0f);
 
   /**
    * @brief ReadJsonDistributionArrays
@@ -280,4 +317,8 @@ class SIMPLib_EXPORT StatsData
   StatsData(StatsData&&) = delete;                 // Move Constructor Not Implemented
   StatsData& operator=(const StatsData&) = delete; // Copy Assignment Not Implemented
   StatsData& operator=(StatsData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_Name = {};
+  float m_PhaseFraction = {};
 };
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index 83e53d9662..9820456ae7 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <cmath>
 
@@ -38,7 +38,10 @@
 #include <QtCore/QDir>
 #include <QtCore/QJsonDocument>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
@@ -46,7 +49,6 @@
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/StatsData/TransformationStatsData.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -64,11 +66,65 @@ class StatsDataJsonRWTest
 
   virtual ~StatsDataJsonRWTest() = default;
 
-  SIMPL_INSTANCE_STRING_PROPERTY(BoundaryStatsFileName)
-  SIMPL_INSTANCE_STRING_PROPERTY(MatrixStatsFileName)
-  SIMPL_INSTANCE_STRING_PROPERTY(PrecipitateStatsFileName)
-  SIMPL_INSTANCE_STRING_PROPERTY(PrimaryStatsFileName)
-  SIMPL_INSTANCE_STRING_PROPERTY(TransformationStatsFileName)
+  // -----------------------------------------------------------------------------
+  void setBoundaryStatsFileName(const QString& value)
+  {
+    m_BoundaryStatsFileName = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getBoundaryStatsFileName() const
+  {
+    return m_BoundaryStatsFileName;
+  }
+
+  // -----------------------------------------------------------------------------
+  void setMatrixStatsFileName(const QString& value)
+  {
+    m_MatrixStatsFileName = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getMatrixStatsFileName() const
+  {
+    return m_MatrixStatsFileName;
+  }
+
+  // -----------------------------------------------------------------------------
+  void setPrecipitateStatsFileName(const QString& value)
+  {
+    m_PrecipitateStatsFileName = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getPrecipitateStatsFileName() const
+  {
+    return m_PrecipitateStatsFileName;
+  }
+
+  // -----------------------------------------------------------------------------
+  void setPrimaryStatsFileName(const QString& value)
+  {
+    m_PrimaryStatsFileName = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getPrimaryStatsFileName() const
+  {
+    return m_PrimaryStatsFileName;
+  }
+
+  // -----------------------------------------------------------------------------
+  void setTransformationStatsFileName(const QString& value)
+  {
+    m_TransformationStatsFileName = value;
+  }
+
+  // -----------------------------------------------------------------------------
+  QString getTransformationStatsFileName() const
+  {
+    return m_TransformationStatsFileName;
+  }
 
   /**
    * @brief Removes any test files that were created during this test
@@ -163,7 +219,8 @@ class StatsDataJsonRWTest
     }
   }
 
-  template <typename T> void ConfigureStatsData(typename T::Pointer statsData)
+  template <typename T>
+  void ConfigureStatsData(typename T::Pointer statsData)
   {
 
     statsData->setPhaseFraction(0.1f);
@@ -249,7 +306,8 @@ class StatsDataJsonRWTest
   /**
    * @brief ValidateStatsData
    */
-  template <typename T> void ValidateStatsData(typename T::Pointer statsData)
+  template <typename T>
+  void ValidateStatsData(typename T::Pointer statsData)
   {
     float epsilon = 0.00001f;
 
@@ -392,13 +450,13 @@ class StatsDataJsonRWTest
     ConfigureStatsData<PrecipitateStatsData>(statsData);
 
     // Write RDF Distribution Data
-    std::vector<float> boxDims(3, 98.0f);
-    std::vector<float> boxRes(3, 0.1f);
+    std::array<float, 3> boxDims = {98.0f, 98.0f, 98.0f};
+    std::array<float, 3> boxRes = {0.1f, 0.1f, 0.1f};
     std::vector<float> frequencies = RadialDistributionFunction::GenerateRandomDistribution(8, 93, 55, boxDims, boxRes);
     RdfData::Pointer rdf = RdfData::New();
     rdf->setFrequencies(frequencies);
-    rdf->setBoxResolution(boxRes.data());
-    rdf->setBoxSize(boxDims.data());
+    rdf->setBoxResolution(boxRes);
+    rdf->setBoxSize(boxDims);
     rdf->setMinDistance(8.0f);
     rdf->setMaxDistance(98);
     statsData->setRadialDistFunction(rdf);
@@ -426,10 +484,8 @@ class StatsDataJsonRWTest
     DREAM3D_REQUIRED(std::abs(statsData->getPrecipBoundaryFraction() - 0.01), <, epsilon);
 
     RdfData::Pointer rdf = statsData->getRadialDistFunction();
-    float boxRes[3] = {0.0f, 0.0f, 0.0f};
-    rdf->getBoxResolution(boxRes);
-    float boxSize[3] = {0, 0, 0};
-    rdf->getBoxSize(boxSize);
+    //    std::array<float, 3> boxRes = rdf->getBoxResolution();
+    //    std::array<float, 3> boxSize = rdf->getBoxSize();
     DREAM3D_REQUIRED(std::abs(rdf->getMinDistance() - 8.0f), <, epsilon);
     DREAM3D_REQUIRED(std::abs(rdf->getMaxDistance() - 98.0f), <, epsilon);
   }
@@ -560,7 +616,16 @@ class StatsDataJsonRWTest
 #endif
   }
 
+public:
+  StatsDataJsonRWTest(const StatsDataJsonRWTest&) = delete;            // Copy Constructor Not Implemented
+  StatsDataJsonRWTest(StatsDataJsonRWTest&&) = delete;                 // Move Constructor Not Implemented
+  StatsDataJsonRWTest& operator=(const StatsDataJsonRWTest&) = delete; // Copy Assignment Not Implemented
+  StatsDataJsonRWTest& operator=(StatsDataJsonRWTest&&) = delete;      // Move Assignment Not Implemented
+
 private:
-  StatsDataJsonRWTest(const StatsDataJsonRWTest&); // Copy Constructor Not Implemented
-  void operator=(const StatsDataJsonRWTest&);      // Move assignment Not Implemented
+  QString m_BoundaryStatsFileName = {};
+  QString m_MatrixStatsFileName = {};
+  QString m_PrecipitateStatsFileName = {};
+  QString m_PrimaryStatsFileName = {};
+  QString m_TransformationStatsFileName = {};
 };
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index 65158f75fa..7f5b3ff1d0 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -40,6 +40,8 @@
 
 #include "H5Support/H5Utilities.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/HDF5/H5TransformationStatsDataDelegate.h"
 
 // -----------------------------------------------------------------------------
@@ -82,8 +84,7 @@ StatsData::Pointer TransformationStatsData::deepCopy()
   ptr->setParentPhase(getParentPhase());
   ptr->setName(getName());
 
-  float diamInfo[3] = {0.0f, 0.0f, 0.0f};
-  getFeatureDiameterInfo(diamInfo);
+  std::array<float, 3> diamInfo = getFeatureDiameterInfo();
   ptr->setFeatureDiameterInfo(diamInfo);
 
   SD_DEEP_COPY_VECTOR(FeatureSizeDistribution);
@@ -290,7 +291,7 @@ void TransformationStatsData::readJson(const QJsonObject& json)
   }
 
   // Read the Feature Diameter Info
-  float fVec3[3] = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> fVec3 = {0.0f, 0.0f, 0.0f};
   if(ParseFloat3Vec(json, SIMPL::StringConstants::Feature_Diameter_Info, fVec3, 0.0) == -1)
   {
     // Throw warning
@@ -361,3 +362,284 @@ void TransformationStatsData::readJson(const QJsonObject& json)
   arrays = ReadJsonVectorOfFloatsArrays(json, SIMPL::StringConstants::AxisODFWeights);
   setAxisODF_Weights(arrays);
 }
+
+// -----------------------------------------------------------------------------
+TransformationStatsData::Pointer TransformationStatsData::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+TransformationStatsData::Pointer TransformationStatsData::New()
+{
+  Pointer sharedPtr(new(TransformationStatsData));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString TransformationStatsData::getNameOfClass() const
+{
+  return QString("TransformationStatsData");
+}
+
+// -----------------------------------------------------------------------------
+QString TransformationStatsData::ClassName()
+{
+  return QString("TransformationStatsData");
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setBoundaryArea(float value)
+{
+  m_BoundaryArea = value;
+}
+
+// -----------------------------------------------------------------------------
+float TransformationStatsData::getBoundaryArea() const
+{
+  return m_BoundaryArea;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setParentPhase(float value)
+{
+  m_ParentPhase = value;
+}
+
+// -----------------------------------------------------------------------------
+float TransformationStatsData::getParentPhase() const
+{
+  return m_ParentPhase;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSizeDistribution(const VectorOfFloatArray& value)
+{
+  m_FeatureSizeDistribution = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getFeatureSizeDistribution() const
+{
+  return m_FeatureSizeDistribution;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSize_DistType(uint32_t value)
+{
+  m_FeatureSize_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t TransformationStatsData::getFeatureSize_DistType() const
+{
+  return m_FeatureSize_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setBinNumbers(const FloatArrayType::Pointer& value)
+{
+  m_BinNumbers = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer TransformationStatsData::getBinNumbers() const
+{
+  return m_BinNumbers;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSize_BOverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_BOverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getFeatureSize_BOverA() const
+{
+  return m_FeatureSize_BOverA;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setBOverA_DistType(uint32_t value)
+{
+  m_BOverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t TransformationStatsData::getBOverA_DistType() const
+{
+  return m_BOverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSize_COverA(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_COverA = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getFeatureSize_COverA() const
+{
+  return m_FeatureSize_COverA;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setCOverA_DistType(uint32_t value)
+{
+  m_COverA_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t TransformationStatsData::getCOverA_DistType() const
+{
+  return m_COverA_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSize_Neighbors(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Neighbors = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getFeatureSize_Neighbors() const
+{
+  return m_FeatureSize_Neighbors;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setNeighbors_DistType(uint32_t value)
+{
+  m_Neighbors_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t TransformationStatsData::getNeighbors_DistType() const
+{
+  return m_Neighbors_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureSize_Omegas(const VectorOfFloatArray& value)
+{
+  m_FeatureSize_Omegas = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getFeatureSize_Omegas() const
+{
+  return m_FeatureSize_Omegas;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setOmegas_DistType(uint32_t value)
+{
+  m_Omegas_DistType = value;
+}
+
+// -----------------------------------------------------------------------------
+uint32_t TransformationStatsData::getOmegas_DistType() const
+{
+  return m_Omegas_DistType;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setMisorientationBins(const FloatArrayType::Pointer& value)
+{
+  m_MisorientationBins = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer TransformationStatsData::getMisorientationBins() const
+{
+  return m_MisorientationBins;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setMDF_Weights(const VectorOfFloatArray& value)
+{
+  m_MDF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getMDF_Weights() const
+{
+  return m_MDF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setODF(const FloatArrayType::Pointer& value)
+{
+  m_ODF = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer TransformationStatsData::getODF() const
+{
+  return m_ODF;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setODF_Weights(const VectorOfFloatArray& value)
+{
+  m_ODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getODF_Weights() const
+{
+  return m_ODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setAxisOrientation(const FloatArrayType::Pointer& value)
+{
+  m_AxisOrientation = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatArrayType::Pointer TransformationStatsData::getAxisOrientation() const
+{
+  return m_AxisOrientation;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setAxisODF_Weights(const VectorOfFloatArray& value)
+{
+  m_AxisODF_Weights = value;
+}
+
+// -----------------------------------------------------------------------------
+VectorOfFloatArray TransformationStatsData::getAxisODF_Weights() const
+{
+  return m_AxisODF_Weights;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureDiameterInfo(const std::array<float, 3>& value)
+{
+  m_FeatureDiameterInfo = value;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::setFeatureDiameterInfo(float v0, float v1, float v2)
+{
+  m_FeatureDiameterInfo[0] = v0;
+  m_FeatureDiameterInfo[1] = v1;
+  m_FeatureDiameterInfo[2] = v2;
+}
+
+// -----------------------------------------------------------------------------
+std::array<float, 3> TransformationStatsData::getFeatureDiameterInfo() const
+{
+  return m_FeatureDiameterInfo;
+}
+
+// -----------------------------------------------------------------------------
+void TransformationStatsData::getFeatureDiameterInfo(float* data) const
+{
+  data[0] = m_FeatureDiameterInfo[0];
+  data[1] = m_FeatureDiameterInfo[1];
+  data[2] = m_FeatureDiameterInfo[2];
+}
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.h b/Source/SIMPLib/StatsData/TransformationStatsData.h
index 4f7831a0cf..d0cf2550e5 100755
--- a/Source/SIMPLib/StatsData/TransformationStatsData.h
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.h
@@ -36,11 +36,14 @@
 
 #pragma once
 
+#include <memory>
+
+#include <array>
+
 #include <hdf5.h>
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
 
@@ -82,9 +85,23 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 class SIMPLib_EXPORT TransformationStatsData : public StatsData
 {
   public:
-    SIMPL_SHARED_POINTERS(TransformationStatsData)
-    SIMPL_STATIC_NEW_MACRO(TransformationStatsData)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TransformationStatsData, StatsData)
+    using Self = TransformationStatsData;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
+
+    /**
+     * @brief Returns the name of the class for TransformationStatsData
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for TransformationStatsData
+     */
+    static QString ClassName();
 
     ~TransformationStatsData() override;
 
@@ -102,8 +119,25 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
     QString getStatsType() override;
     PhaseType::Type getPhaseType() override;
 
-    SIMPL_INSTANCE_PROPERTY(float, BoundaryArea)
-    SIMPL_INSTANCE_PROPERTY(float, ParentPhase)
+    /**
+     * @brief Setter property for BoundaryArea
+     */
+    void setBoundaryArea(float value);
+    /**
+     * @brief Getter property for BoundaryArea
+     * @return Value of BoundaryArea
+     */
+    float getBoundaryArea() const;
+
+    /**
+     * @brief Setter property for ParentPhase
+     */
+    void setParentPhase(float value);
+    /**
+     * @brief Getter property for ParentPhase
+     * @return Value of ParentPhase
+     */
+    float getParentPhase() const;
 
     /**
       * @breif this will generate the Bin Numbers values;
@@ -112,7 +146,21 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
     /**
      * @brief The values are encoded into 3 floats: Average, Max, Min
      */
-    SIMPL_INSTANCE_VEC3_PROPERTY(float, FeatureDiameterInfo)
+    /**
+     * @brief Setter property for FeatureDiameterInfo
+     */
+    void setFeatureDiameterInfo(const std::array<float, 3>& value);
+    /**
+     * @brief Setter property for FeatureDiameterInfo
+     */
+    void setFeatureDiameterInfo(float v0, float v1, float v2);
+    /**
+     * @brief Getter property for FeatureDiameterInfo
+     * @return Value of FeatureDiameterInfo
+     */
+    std::array<float, 3> getFeatureDiameterInfo() const;
+    void getFeatureDiameterInfo(float* data) const;
+
     void setBinStepSize(float v) { m_FeatureDiameterInfo[0] = v;}
     float getBinStepSize() { return m_FeatureDiameterInfo[0]; }
 
@@ -125,40 +173,183 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
     /**
       * @brief The values are encoded into float arrays
       */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSizeDistribution)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, FeatureSize_DistType)
+    /**
+     * @brief Setter property for FeatureSizeDistribution
+     */
+    void setFeatureSizeDistribution(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSizeDistribution
+     * @return Value of FeatureSizeDistribution
+     */
+    VectorOfFloatArray getFeatureSizeDistribution() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, BinNumbers)
+    /**
+     * @brief Setter property for FeatureSize_DistType
+     */
+    void setFeatureSize_DistType(uint32_t value);
+    /**
+     * @brief Getter property for FeatureSize_DistType
+     * @return Value of FeatureSize_DistType
+     */
+    uint32_t getFeatureSize_DistType() const;
+
+    /**
+     * @brief Setter property for BinNumbers
+     */
+    void setBinNumbers(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for BinNumbers
+     * @return Value of BinNumbers
+     */
+    FloatArrayType::Pointer getBinNumbers() const;
 
     size_t getNumberOfBins()
     {
       return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
     }
 
+    /**
+     * @brief Setter property for FeatureSize_BOverA
+     */
+    void setFeatureSize_BOverA(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_BOverA
+     * @return Value of FeatureSize_BOverA
+     */
+    VectorOfFloatArray getFeatureSize_BOverA() const;
+
+    /**
+     * @brief Setter property for BOverA_DistType
+     */
+    void setBOverA_DistType(uint32_t value);
+    /**
+     * @brief Getter property for BOverA_DistType
+     * @return Value of BOverA_DistType
+     */
+    uint32_t getBOverA_DistType() const;
+
+    /**
+     * @brief Setter property for FeatureSize_COverA
+     */
+    void setFeatureSize_COverA(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_COverA
+     * @return Value of FeatureSize_COverA
+     */
+    VectorOfFloatArray getFeatureSize_COverA() const;
+
+    /**
+     * @brief Setter property for COverA_DistType
+     */
+    void setCOverA_DistType(uint32_t value);
+    /**
+     * @brief Getter property for COverA_DistType
+     * @return Value of COverA_DistType
+     */
+    uint32_t getCOverA_DistType() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_BOverA)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, BOverA_DistType)
+    /**
+     * @brief Setter property for FeatureSize_Neighbors
+     */
+    void setFeatureSize_Neighbors(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_Neighbors
+     * @return Value of FeatureSize_Neighbors
+     */
+    VectorOfFloatArray getFeatureSize_Neighbors() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_COverA)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, COverA_DistType)
+    /**
+     * @brief Setter property for Neighbors_DistType
+     */
+    void setNeighbors_DistType(uint32_t value);
+    /**
+     * @brief Getter property for Neighbors_DistType
+     * @return Value of Neighbors_DistType
+     */
+    uint32_t getNeighbors_DistType() const;
+
+    /**
+     * @brief Setter property for FeatureSize_Omegas
+     */
+    void setFeatureSize_Omegas(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for FeatureSize_Omegas
+     * @return Value of FeatureSize_Omegas
+     */
+    VectorOfFloatArray getFeatureSize_Omegas() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Neighbors)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, Neighbors_DistType)
+    /**
+     * @brief Setter property for Omegas_DistType
+     */
+    void setOmegas_DistType(uint32_t value);
+    /**
+     * @brief Getter property for Omegas_DistType
+     * @return Value of Omegas_DistType
+     */
+    uint32_t getOmegas_DistType() const;
 
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSize_Omegas)
-    SIMPL_INSTANCE_PROPERTY(uint32_t, Omegas_DistType)
+    /**
+     * @brief Setter property for MisorientationBins
+     */
+    void setMisorientationBins(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for MisorientationBins
+     * @return Value of MisorientationBins
+     */
+    FloatArrayType::Pointer getMisorientationBins() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, MisorientationBins)
     /* 3 Vectors: Angles, Axis, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, MDF_Weights)
+    /**
+     * @brief Setter property for MDF_Weights
+     */
+    void setMDF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for MDF_Weights
+     * @return Value of MDF_Weights
+     */
+    VectorOfFloatArray getMDF_Weights() const;
+
+    /**
+     * @brief Setter property for ODF
+     */
+    void setODF(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for ODF
+     * @return Value of ODF
+     */
+    FloatArrayType::Pointer getODF() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, ODF)
     /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, ODF_Weights)
+    /**
+     * @brief Setter property for ODF_Weights
+     */
+    void setODF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for ODF_Weights
+     * @return Value of ODF_Weights
+     */
+    VectorOfFloatArray getODF_Weights() const;
+
+    /**
+     * @brief Setter property for AxisOrientation
+     */
+    void setAxisOrientation(const FloatArrayType::Pointer& value);
+    /**
+     * @brief Getter property for AxisOrientation
+     * @return Value of AxisOrientation
+     */
+    FloatArrayType::Pointer getAxisOrientation() const;
 
-    SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, AxisOrientation)
     /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, AxisODF_Weights)
+    /**
+     * @brief Setter property for AxisODF_Weights
+     */
+    void setAxisODF_Weights(const VectorOfFloatArray& value);
+    /**
+     * @brief Getter property for AxisODF_Weights
+     * @return Value of AxisODF_Weights
+     */
+    VectorOfFloatArray getAxisODF_Weights() const;
 
     /**
      * @brief deepCopy
@@ -205,6 +396,29 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
     TransformationStatsData(TransformationStatsData&&) = delete;      // Move Constructor Not Implemented
     TransformationStatsData& operator=(const TransformationStatsData&) = delete; // Copy Assignment Not Implemented
     TransformationStatsData& operator=(TransformationStatsData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    std::array<float, 3> m_FeatureDiameterInfo;
+
+    float m_BoundaryArea = {};
+    float m_ParentPhase = {};
+    VectorOfFloatArray m_FeatureSizeDistribution = {};
+    uint32_t m_FeatureSize_DistType = {};
+    FloatArrayType::Pointer m_BinNumbers = {};
+    VectorOfFloatArray m_FeatureSize_BOverA = {};
+    uint32_t m_BOverA_DistType = {};
+    VectorOfFloatArray m_FeatureSize_COverA = {};
+    uint32_t m_COverA_DistType = {};
+    VectorOfFloatArray m_FeatureSize_Neighbors = {};
+    uint32_t m_Neighbors_DistType = {};
+    VectorOfFloatArray m_FeatureSize_Omegas = {};
+    uint32_t m_Omegas_DistType = {};
+    FloatArrayType::Pointer m_MisorientationBins = {};
+    VectorOfFloatArray m_MDF_Weights = {};
+    FloatArrayType::Pointer m_ODF = {};
+    VectorOfFloatArray m_ODF_Weights = {};
+    FloatArrayType::Pointer m_AxisOrientation = {};
+    VectorOfFloatArray m_AxisODF_Weights = {};
 };
 
 
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index d2f8483a44..189c948aea 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -29,10 +29,13 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ArraySelectionExample.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -144,7 +147,7 @@ AbstractFilter::Pointer ArraySelectionExample::newFilterInstance(bool copyFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArraySelectionExample::getCompiledLibraryName() const
+QString ArraySelectionExample::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -152,7 +155,7 @@ const QString ArraySelectionExample::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArraySelectionExample::getGroupName() const
+QString ArraySelectionExample::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -160,7 +163,7 @@ const QString ArraySelectionExample::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ArraySelectionExample::getUuid()
+QUuid ArraySelectionExample::getUuid() const
 {
   return QUuid("{1a9b7e20-6f6f-50b8-bbfa-8117450919a5}");
 }
@@ -168,7 +171,7 @@ const QUuid ArraySelectionExample::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArraySelectionExample::getSubGroupName() const
+QString ArraySelectionExample::getSubGroupName() const
 {
   return "Test";
 }
@@ -176,7 +179,48 @@ const QString ArraySelectionExample::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ArraySelectionExample::getHumanLabel() const
+QString ArraySelectionExample::getHumanLabel() const
 {
   return "DataContainerArrayProxy Example";
 }
+
+// -----------------------------------------------------------------------------
+ArraySelectionExample::Pointer ArraySelectionExample::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ArraySelectionExample> ArraySelectionExample::New()
+{
+  struct make_shared_enabler : public ArraySelectionExample
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ArraySelectionExample::getNameOfClass() const
+{
+  return QString("ArraySelectionExample");
+}
+
+// -----------------------------------------------------------------------------
+QString ArraySelectionExample::ClassName()
+{
+  return QString("ArraySelectionExample");
+}
+
+// -----------------------------------------------------------------------------
+void ArraySelectionExample::setDataContainerArrayProxy(const DataContainerArrayProxy& value)
+{
+  m_DataContainerArrayProxy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxy ArraySelectionExample::getDataContainerArrayProxy() const
+{
+  return m_DataContainerArrayProxy;
+}
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index 8baab666a3..26958800a5 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -35,13 +35,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @class ArraySelectionExample ArraySelectionExample.h ExamplePlugin/Code/ExamplePluginFilters/ArraySelectionExample.h
@@ -53,14 +54,43 @@
 class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ArraySelectionExample SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ArraySelectionExample)
+  PYB11_FILTER_NEW_MACRO(ArraySelectionExample)
+  PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DataContainerArrayProxy)
 
   PYB11_PROPERTY(DataContainerArrayProxy DataContainerArrayProxy READ getDataContainerArrayProxy WRITE setDataContainerArrayProxy)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ArraySelectionExample)
-  SIMPL_FILTER_NEW_MACRO(ArraySelectionExample)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ArraySelectionExample, AbstractFilter)
+  using Self = ArraySelectionExample;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ArraySelectionExample
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ArraySelectionExample
+   */
+  static QString ClassName();
 
   ~ArraySelectionExample() override;
 
@@ -69,7 +99,16 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
    * as input parameters
    */
 
-  SIMPL_FILTER_PARAMETER(DataContainerArrayProxy, DataContainerArrayProxy)
+  /**
+   * @brief Setter property for DataContainerArrayProxy
+   */
+  void setDataContainerArrayProxy(const DataContainerArrayProxy& value);
+  /**
+   * @brief Getter property for DataContainerArrayProxy
+   * @return Value of DataContainerArrayProxy
+   */
+  DataContainerArrayProxy getDataContainerArrayProxy() const;
+
   Q_PROPERTY(DataContainerArrayProxy DataContainerArrayProxy READ getDataContainerArrayProxy WRITE setDataContainerArrayProxy)
 
   /**
@@ -77,27 +116,27 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   * a different group if you want. The string returned here will be displayed
   * in the GUI for the filter
   */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
   * @brief This method will instantiate all the end user settable options/parameters
@@ -146,5 +185,8 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   ArraySelectionExample(ArraySelectionExample&&) = delete;      // Move Constructor Not Implemented
   ArraySelectionExample& operator=(const ArraySelectionExample&) = delete; // Copy Assignment Not Implemented
   ArraySelectionExample& operator=(ArraySelectionExample&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataContainerArrayProxy m_DataContainerArrayProxy = {};
 };
 
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index 4eb4b191f1..a224931fb5 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -32,6 +32,8 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "DynamicTableExample.h"
 
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
@@ -200,7 +202,7 @@ AbstractFilter::Pointer DynamicTableExample::newFilterInstance(bool copyFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DynamicTableExample::getCompiledLibraryName() const
+QString DynamicTableExample::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -208,7 +210,7 @@ const QString DynamicTableExample::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DynamicTableExample::getGroupName() const
+QString DynamicTableExample::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -216,7 +218,7 @@ const QString DynamicTableExample::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid DynamicTableExample::getUuid()
+QUuid DynamicTableExample::getUuid() const
 {
   return QUuid("{7baae579-69bf-5559-a876-d0ef1cab77eb}");
 }
@@ -224,7 +226,7 @@ const QUuid DynamicTableExample::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DynamicTableExample::getSubGroupName() const
+QString DynamicTableExample::getSubGroupName() const
 {
   return "Test";
 }
@@ -232,7 +234,96 @@ const QString DynamicTableExample::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString DynamicTableExample::getHumanLabel() const
+QString DynamicTableExample::getHumanLabel() const
 {
   return "Dynamic Table Example";
 }
+
+// -----------------------------------------------------------------------------
+DynamicTableExample::Pointer DynamicTableExample::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<DynamicTableExample> DynamicTableExample::New()
+{
+  struct make_shared_enabler : public DynamicTableExample
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicTableExample::getNameOfClass() const
+{
+  return QString("DynamicTableExample");
+}
+
+// -----------------------------------------------------------------------------
+QString DynamicTableExample::ClassName()
+{
+  return QString("DynamicTableExample");
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableExample::setDynamicData1(const DynamicTableData& value)
+{
+  m_DynamicData1 = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableExample::getDynamicData1() const
+{
+  return m_DynamicData1;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableExample::setDynamicData2(const DynamicTableData& value)
+{
+  m_DynamicData2 = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableExample::getDynamicData2() const
+{
+  return m_DynamicData2;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableExample::setDynamicData3(const DynamicTableData& value)
+{
+  m_DynamicData3 = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableExample::getDynamicData3() const
+{
+  return m_DynamicData3;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableExample::setDynamicData4(const DynamicTableData& value)
+{
+  m_DynamicData4 = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableExample::getDynamicData4() const
+{
+  return m_DynamicData4;
+}
+
+// -----------------------------------------------------------------------------
+void DynamicTableExample::setDynamicData5(const DynamicTableData& value)
+{
+  m_DynamicData5 = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData DynamicTableExample::getDynamicData5() const
+{
+  return m_DynamicData5;
+}
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index 40c0090cd6..a0cf29fb72 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -35,10 +35,11 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
 * @class DynamicTableExample DynamicTableExample.h ExamplePlugin/Code/ExamplePluginFilters/DynamicTableExample.h
@@ -50,57 +51,136 @@
 class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(DynamicTableExample SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(DynamicTableExample)
+  PYB11_FILTER_NEW_MACRO(DynamicTableExample)
+  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData1)
+  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData2)
+  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData3)
+  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData4)
+  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData5)
 
   PYB11_PROPERTY(DynamicTableData DynamicData1 READ getDynamicData1 WRITE setDynamicData1)
   PYB11_PROPERTY(DynamicTableData DynamicData2 READ getDynamicData2 WRITE setDynamicData2)
   PYB11_PROPERTY(DynamicTableData DynamicData3 READ getDynamicData3 WRITE setDynamicData3)
   PYB11_PROPERTY(DynamicTableData DynamicData4 READ getDynamicData4 WRITE setDynamicData4)
   PYB11_PROPERTY(DynamicTableData DynamicData5 READ getDynamicData5 WRITE setDynamicData5)
+#endif
+
 public:
-  SIMPL_SHARED_POINTERS(DynamicTableExample)
-  SIMPL_FILTER_NEW_MACRO(DynamicTableExample)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(DynamicTableExample, AbstractFilter)
+  using Self = DynamicTableExample;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DynamicTableExample
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DynamicTableExample
+   */
+  static QString ClassName();
 
   ~DynamicTableExample() override;
 
   /* Place your input parameters here. You can use some of the DREAM3D Macros if you want to */
-  SIMPL_FILTER_PARAMETER(DynamicTableData, DynamicData1)
+  /**
+   * @brief Setter property for DynamicData1
+   */
+  void setDynamicData1(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DynamicData1
+   * @return Value of DynamicData1
+   */
+  DynamicTableData getDynamicData1() const;
+
   Q_PROPERTY(DynamicTableData DynamicData1 READ getDynamicData1 WRITE setDynamicData1)
 
-  SIMPL_FILTER_PARAMETER(DynamicTableData, DynamicData2)
+  /**
+   * @brief Setter property for DynamicData2
+   */
+  void setDynamicData2(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DynamicData2
+   * @return Value of DynamicData2
+   */
+  DynamicTableData getDynamicData2() const;
+
   Q_PROPERTY(DynamicTableData DynamicData2 READ getDynamicData2 WRITE setDynamicData2)
 
-  SIMPL_FILTER_PARAMETER(DynamicTableData, DynamicData3)
+  /**
+   * @brief Setter property for DynamicData3
+   */
+  void setDynamicData3(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DynamicData3
+   * @return Value of DynamicData3
+   */
+  DynamicTableData getDynamicData3() const;
+
   Q_PROPERTY(DynamicTableData DynamicData3 READ getDynamicData3 WRITE setDynamicData3)
 
-  SIMPL_FILTER_PARAMETER(DynamicTableData, DynamicData4)
+  /**
+   * @brief Setter property for DynamicData4
+   */
+  void setDynamicData4(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DynamicData4
+   * @return Value of DynamicData4
+   */
+  DynamicTableData getDynamicData4() const;
+
   Q_PROPERTY(DynamicTableData DynamicData4 READ getDynamicData4 WRITE setDynamicData4)
 
-  SIMPL_FILTER_PARAMETER(DynamicTableData, DynamicData5)
+  /**
+   * @brief Setter property for DynamicData5
+   */
+  void setDynamicData5(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DynamicData5
+   * @return Value of DynamicData5
+   */
+  DynamicTableData getDynamicData5() const;
+
   Q_PROPERTY(DynamicTableData DynamicData5 READ getDynamicData5 WRITE setDynamicData5)
 
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
   * @brief This method will instantiate all the end user settable options/parameters
@@ -149,5 +229,12 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   DynamicTableExample(DynamicTableExample&&) = delete;      // Move Constructor Not Implemented
   DynamicTableExample& operator=(const DynamicTableExample&) = delete; // Copy Assignment Not Implemented
   DynamicTableExample& operator=(DynamicTableExample&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DynamicTableData m_DynamicData1 = {};
+  DynamicTableData m_DynamicData2 = {};
+  DynamicTableData m_DynamicData3 = {};
+  DynamicTableData m_DynamicData4 = {};
+  DynamicTableData m_DynamicData5 = {};
 };
 
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 45e3907fa9..20627a23ad 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ErrorWarningFilter.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
@@ -161,7 +165,7 @@ AbstractFilter::Pointer ErrorWarningFilter::newFilterInstance(bool copyFilterPar
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getCompiledLibraryName() const
+QString ErrorWarningFilter::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -169,7 +173,7 @@ const QString ErrorWarningFilter::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getBrandingString() const
+QString ErrorWarningFilter::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -177,7 +181,7 @@ const QString ErrorWarningFilter::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getFilterVersion() const
+QString ErrorWarningFilter::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -188,7 +192,7 @@ const QString ErrorWarningFilter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getGroupName() const
+QString ErrorWarningFilter::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -196,7 +200,7 @@ const QString ErrorWarningFilter::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ErrorWarningFilter::getUuid()
+QUuid ErrorWarningFilter::getUuid() const
 {
   return QUuid("{c367f998-3cc8-5a24-8616-70b659c5ce46}");
 }
@@ -204,7 +208,7 @@ const QUuid ErrorWarningFilter::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getSubGroupName() const
+QString ErrorWarningFilter::getSubGroupName() const
 {
   return "Test";
 }
@@ -212,7 +216,96 @@ const QString ErrorWarningFilter::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ErrorWarningFilter::getHumanLabel() const
+QString ErrorWarningFilter::getHumanLabel() const
 {
   return "Error Warning and Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+ErrorWarningFilter::Pointer ErrorWarningFilter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ErrorWarningFilter> ErrorWarningFilter::New()
+{
+  struct make_shared_enabler : public ErrorWarningFilter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ErrorWarningFilter::getNameOfClass() const
+{
+  return QString("ErrorWarningFilter");
+}
+
+// -----------------------------------------------------------------------------
+QString ErrorWarningFilter::ClassName()
+{
+  return QString("ErrorWarningFilter");
+}
+
+// -----------------------------------------------------------------------------
+void ErrorWarningFilter::setPreflightWarning(bool value)
+{
+  m_PreflightWarning = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ErrorWarningFilter::getPreflightWarning() const
+{
+  return m_PreflightWarning;
+}
+
+// -----------------------------------------------------------------------------
+void ErrorWarningFilter::setPreflightError(bool value)
+{
+  m_PreflightError = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ErrorWarningFilter::getPreflightError() const
+{
+  return m_PreflightError;
+}
+
+// -----------------------------------------------------------------------------
+void ErrorWarningFilter::setExecuteWarning(bool value)
+{
+  m_ExecuteWarning = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ErrorWarningFilter::getExecuteWarning() const
+{
+  return m_ExecuteWarning;
+}
+
+// -----------------------------------------------------------------------------
+void ErrorWarningFilter::setExecuteError(bool value)
+{
+  m_ExecuteError = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ErrorWarningFilter::getExecuteError() const
+{
+  return m_ExecuteError;
+}
+
+// -----------------------------------------------------------------------------
+void ErrorWarningFilter::setPropertyError(bool value)
+{
+  m_PropertyError = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ErrorWarningFilter::getPropertyError() const
+{
+  return m_PropertyError;
+}
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
index 07955b5c7d..b1341ee02b 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
@@ -32,9 +32,10 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The ErrorWarningFilter class. See [Filter documentation](@ref ErrorWarningFilter) for details.
@@ -42,52 +43,131 @@
 class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ErrorWarningFilter SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ErrorWarningFilter)
+  PYB11_FILTER_NEW_MACRO(ErrorWarningFilter)
+  PYB11_FILTER_PARAMETER(bool, PreflightWarning)
+  PYB11_FILTER_PARAMETER(bool, PreflightError)
+  PYB11_FILTER_PARAMETER(bool, ExecuteWarning)
+  PYB11_FILTER_PARAMETER(bool, ExecuteError)
+  PYB11_FILTER_PARAMETER(bool, PropertyError)
   PYB11_PROPERTY(bool PreflightWarning READ getPreflightWarning WRITE setPreflightWarning)
   PYB11_PROPERTY(bool PreflightError READ getPreflightError WRITE setPreflightError)
   PYB11_PROPERTY(bool ExecuteWarning READ getExecuteWarning WRITE setExecuteWarning)
   PYB11_PROPERTY(bool ExecuteError READ getExecuteError WRITE setExecuteError)
   PYB11_PROPERTY(bool PropertyError READ getPropertyError WRITE setPropertyError)
+#endif
+
 public:
-  SIMPL_SHARED_POINTERS(ErrorWarningFilter)
-  SIMPL_FILTER_NEW_MACRO(ErrorWarningFilter)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ErrorWarningFilter, AbstractFilter)
+  using Self = ErrorWarningFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ErrorWarningFilter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ErrorWarningFilter
+   */
+  static QString ClassName();
 
   ~ErrorWarningFilter() override;
 
-  SIMPL_FILTER_PARAMETER(bool, PreflightWarning)
+  /**
+   * @brief Setter property for PreflightWarning
+   */
+  void setPreflightWarning(bool value);
+  /**
+   * @brief Getter property for PreflightWarning
+   * @return Value of PreflightWarning
+   */
+  bool getPreflightWarning() const;
+
   Q_PROPERTY(bool PreflightWarning READ getPreflightWarning WRITE setPreflightWarning)
 
-  SIMPL_FILTER_PARAMETER(bool, PreflightError)
+  /**
+   * @brief Setter property for PreflightError
+   */
+  void setPreflightError(bool value);
+  /**
+   * @brief Getter property for PreflightError
+   * @return Value of PreflightError
+   */
+  bool getPreflightError() const;
+
   Q_PROPERTY(bool PreflightError READ getPreflightError WRITE setPreflightError)
 
-  SIMPL_FILTER_PARAMETER(bool, ExecuteWarning)
+  /**
+   * @brief Setter property for ExecuteWarning
+   */
+  void setExecuteWarning(bool value);
+  /**
+   * @brief Getter property for ExecuteWarning
+   * @return Value of ExecuteWarning
+   */
+  bool getExecuteWarning() const;
+
   Q_PROPERTY(bool ExecuteWarning READ getExecuteWarning WRITE setExecuteWarning)
 
-  SIMPL_FILTER_PARAMETER(bool, ExecuteError)
+  /**
+   * @brief Setter property for ExecuteError
+   */
+  void setExecuteError(bool value);
+  /**
+   * @brief Getter property for ExecuteError
+   * @return Value of ExecuteError
+   */
+  bool getExecuteError() const;
+
   Q_PROPERTY(bool ExecuteError READ getExecuteError WRITE setExecuteError)
 
-  SIMPL_FILTER_PARAMETER(bool, PropertyError)
+  /**
+   * @brief Setter property for PropertyError
+   */
+  void setPropertyError(bool value);
+  /**
+   * @brief Getter property for PropertyError
+   * @return Value of PropertyError
+   */
+  bool getPropertyError() const;
+
   Q_PROPERTY(bool PropertyError READ getPropertyError WRITE setPropertyError)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -97,23 +177,23 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -171,5 +251,12 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   ErrorWarningFilter(ErrorWarningFilter&&) = delete;      // Move Constructor Not Implemented
   ErrorWarningFilter& operator=(const ErrorWarningFilter&) = delete; // Copy Assignment Not Implemented
   ErrorWarningFilter& operator=(ErrorWarningFilter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  bool m_PreflightWarning = {};
+  bool m_PreflightError = {};
+  bool m_ExecuteWarning = {};
+  bool m_ExecuteError = {};
+  bool m_PropertyError = {};
 };
 
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index a0bb1b2d93..e5059e205b 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -2,10 +2,14 @@
  * Your License or Copyright Information can go here
  */
 
+#include <memory>
+
 #include "Filt0.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -101,3 +105,79 @@ void Filt0::execute()
   /* Place all your code to execute your filter here. */
 }
 
+// -----------------------------------------------------------------------------
+Filt0::Pointer Filt0::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<Filt0> Filt0::New()
+{
+  struct make_shared_enabler : public Filt0
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString Filt0::getNameOfClass() const
+{
+  return QString("Filt0");
+}
+
+// -----------------------------------------------------------------------------
+QString Filt0::ClassName()
+{
+  return QString("Filt0");
+}
+
+// -----------------------------------------------------------------------------
+void Filt0::setDataContainerName(const QString& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString Filt0::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void Filt0::setCellAttributeMatrixName(const QString& value)
+{
+  m_CellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString Filt0::getCellAttributeMatrixName() const
+{
+  return m_CellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void Filt0::setFilt0_Float(float value)
+{
+  m_Filt0_Float = value;
+}
+
+// -----------------------------------------------------------------------------
+float Filt0::getFilt0_Float() const
+{
+  return m_Filt0_Float;
+}
+
+// -----------------------------------------------------------------------------
+void Filt0::setFilt0_Integer(int32_t value)
+{
+  m_Filt0_Integer = value;
+}
+
+// -----------------------------------------------------------------------------
+int32_t Filt0::getFilt0_Integer() const
+{
+  return m_Filt0_Integer;
+}
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index cbbcb3f576..a32eb7efb5 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
@@ -18,23 +19,80 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
 {
   Q_OBJECT
 public:
-  SIMPL_SHARED_POINTERS(Filt0)
-  SIMPL_FILTER_NEW_MACRO(Filt0)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Filt0, AbstractFilter)
+  using Self = Filt0;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for Filt0
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for Filt0
+   */
+  static QString ClassName();
 
   ~Filt0() override;
-  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-  SIMPL_INSTANCE_STRING_PROPERTY(CellAttributeMatrixName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const QString& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  QString getDataContainerName() const;
 
-  SIMPL_INSTANCE_PROPERTY(float, Filt0_Float)
-  SIMPL_INSTANCE_PROPERTY(int32_t, Filt0_Integer)
+  /**
+   * @brief Setter property for CellAttributeMatrixName
+   */
+  void setCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CellAttributeMatrixName
+   * @return Value of CellAttributeMatrixName
+   */
+  QString getCellAttributeMatrixName() const;
+
+  /**
+   * @brief Setter property for Filt0_Float
+   */
+  void setFilt0_Float(float value);
+  /**
+   * @brief Getter property for Filt0_Float
+   * @return Value of Filt0_Float
+   */
+  float getFilt0_Float() const;
+
+  /**
+   * @brief Setter property for Filt0_Integer
+   */
+  void setFilt0_Integer(int32_t value);
+  /**
+   * @brief Getter property for Filt0_Integer
+   * @return Value of Filt0_Integer
+   */
+  int32_t getFilt0_Integer() const;
 
   /**
   * @brief This returns the group that the filter belonds to. You can select
   * a different group if you want. The string returned here will be displayed
   * in the GUI for the filter
   */
-  const QString getGroupName() const override
+  QString getGroupName() const override
   {
     return SIMPL::FilterGroups::Generic;
   }
@@ -43,7 +101,7 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override
+  QString getHumanLabel() const override
   {
     return "Filt0";
   }
@@ -52,7 +110,7 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override
+  QString getSubGroupName() const override
   {
     return "Misc";
   }
@@ -100,6 +158,11 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   void initialize();
 
 private:
+  QString m_DataContainerName = {};
+  QString m_CellAttributeMatrixName = {};
+  float m_Filt0_Float = {};
+  int32_t m_Filt0_Integer = {};
+
   Filt0(const Filt0&) = delete;          // Copy Constructor Not Implemented
   void operator=(const Filt0&) = delete; // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index a48d0f4cfb..e205f6df87 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -2,10 +2,14 @@
  * Your License or Copyright Information can go here
  */
 
+#include <memory>
+
 #include "Filt1.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -100,3 +104,68 @@ void Filt1::execute()
 
   /* Place all your code to execute your filter here. */
 }
+
+// -----------------------------------------------------------------------------
+Filt1::Pointer Filt1::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<Filt1> Filt1::New()
+{
+  struct make_shared_enabler : public Filt1
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString Filt1::getNameOfClass() const
+{
+  return QString("Filt1");
+}
+
+// -----------------------------------------------------------------------------
+QString Filt1::ClassName()
+{
+  return QString("Filt1");
+}
+
+// -----------------------------------------------------------------------------
+void Filt1::setDataContainerName(const QString& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString Filt1::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void Filt1::setFilt1_Float(float value)
+{
+  m_Filt1_Float = value;
+}
+
+// -----------------------------------------------------------------------------
+float Filt1::getFilt1_Float() const
+{
+  return m_Filt1_Float;
+}
+
+// -----------------------------------------------------------------------------
+void Filt1::setFilt1_Integer(int32_t value)
+{
+  m_Filt1_Integer = value;
+}
+
+// -----------------------------------------------------------------------------
+int32_t Filt1::getFilt1_Integer() const
+{
+  return m_Filt1_Integer;
+}
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index 5433f090a4..fc6affcd46 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
@@ -19,22 +20,70 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
 {
   Q_OBJECT
 public:
-  SIMPL_SHARED_POINTERS(Filt1)
-  SIMPL_FILTER_NEW_MACRO(Filt1)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(Filt1, AbstractFilter)
+  using Self = Filt1;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for Filt1
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for Filt1
+   */
+  static QString ClassName();
 
   ~Filt1() override;
-  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const QString& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  QString getDataContainerName() const;
+
+  /**
+   * @brief Setter property for Filt1_Float
+   */
+  void setFilt1_Float(float value);
+  /**
+   * @brief Getter property for Filt1_Float
+   * @return Value of Filt1_Float
+   */
+  float getFilt1_Float() const;
 
-  SIMPL_INSTANCE_PROPERTY(float, Filt1_Float)
-  SIMPL_INSTANCE_PROPERTY(int32_t, Filt1_Integer)
+  /**
+   * @brief Setter property for Filt1_Integer
+   */
+  void setFilt1_Integer(int32_t value);
+  /**
+   * @brief Getter property for Filt1_Integer
+   * @return Value of Filt1_Integer
+   */
+  int32_t getFilt1_Integer() const;
 
   /**
   * @brief This returns the group that the filter belonds to. You can select
   * a different group if you want. The string returned here will be displayed
   * in the GUI for the filter
   */
-  const QString getGroupName() const override
+  QString getGroupName() const override
   {
     return "TestFilters";
   }
@@ -43,7 +92,7 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override
+  QString getHumanLabel() const override
   {
     return "Filt1";
   }
@@ -52,7 +101,7 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override
+  QString getSubGroupName() const override
   {
     return "Test";
   }
@@ -100,6 +149,10 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   void initialize();
 
 private:
+  QString m_DataContainerName = {};
+  float m_Filt1_Float = {};
+  int32_t m_Filt1_Integer = {};
+
   Filt1(const Filt1&) = delete;          // Copy Constructor Not Implemented
   void operator=(const Filt1&) = delete; // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index 6b4f5368cb..7ba34a1e16 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -29,14 +29,18 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include "TESTCLASSNAME.h"
+#include <memory>
+
+#include "FilterGroup00.h"
+
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TESTCLASSNAME::TESTCLASSNAME()
+FilterGroup00::FilterGroup00()
 {
   initialize();
   setupFilterParameters();
@@ -45,12 +49,12 @@ TESTCLASSNAME::TESTCLASSNAME()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TESTCLASSNAME::~TESTCLASSNAME() = default;
+FilterGroup00::~FilterGroup00() = default;
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TESTCLASSNAME::initialize()
+void FilterGroup00::initialize()
 {
   clearErrorCode();
   clearWarningCode();
@@ -60,7 +64,7 @@ void TESTCLASSNAME::initialize()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TESTCLASSNAME::setupFilterParameters()
+void FilterGroup00::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
@@ -70,7 +74,7 @@ void TESTCLASSNAME::setupFilterParameters()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TESTCLASSNAME::dataCheck()
+void FilterGroup00::dataCheck()
 {
   clearErrorCode();
   clearWarningCode();
@@ -79,7 +83,7 @@ void TESTCLASSNAME::dataCheck()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TESTCLASSNAME::preflight()
+void FilterGroup00::preflight()
 {
   // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
   setInPreflight(true);              // Set the fact that we are preflighting.
@@ -93,7 +97,7 @@ void TESTCLASSNAME::preflight()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void TESTCLASSNAME::execute()
+void FilterGroup00::execute()
 {
   initialize();
   dataCheck();
@@ -119,9 +123,9 @@ void TESTCLASSNAME::execute()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AbstractFilter::Pointer TESTCLASSNAME::newFilterInstance(bool copyFilterParameters) const
+AbstractFilter::Pointer FilterGroup00::newFilterInstance(bool copyFilterParameters) const
 {
-  TESTCLASSNAME::Pointer filter = TESTCLASSNAME::New();
+  FilterGroup00::Pointer filter = FilterGroup00::New();
   if(copyFilterParameters)
   {
     copyFilterParameterInstanceVariables(filter.get());
@@ -132,7 +136,7 @@ AbstractFilter::Pointer TESTCLASSNAME::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getCompiledLibraryName() const
+QString FilterGroup00::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString TESTCLASSNAME::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getBrandingString() const
+QString FilterGroup00::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString TESTCLASSNAME::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getFilterVersion() const
+QString FilterGroup00::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString TESTCLASSNAME::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getGroupName() const
+QString FilterGroup00::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -167,7 +171,7 @@ const QString TESTCLASSNAME::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup00::getUuid()
+QUuid FilterGroup00::getUuid() const
 {
   return QUuid("{17ca59f3-f409-51cd-a4f6-49aa1e85a538}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup00::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getSubGroupName() const
+QString FilterGroup00::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString TESTCLASSNAME::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString TESTCLASSNAME::getHumanLabel() const
+QString FilterGroup00::getHumanLabel() const
+{
+  return "FilterGroup00";
+}
+
+// -----------------------------------------------------------------------------
+FilterGroup00::Pointer FilterGroup00::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup00> FilterGroup00::New()
+{
+  struct make_shared_enabler : public FilterGroup00
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup00::getNameOfClass() const
+{
+  return QString("FilterGroup00");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup00::ClassName()
 {
-  return "TESTCLASSNAME";
+  return QString("FilterGroup00");
 }
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.h b/Source/SIMPLib/TestFilters/FilterGroup00.h
index 076ea8ffec..b3e90244f3 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.h
@@ -31,42 +31,66 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
 /**
- * @brief The TESTCLASSNAME class. See [Filter documentation](@ref TESTCLASSNAME) for details.
+ * @brief The FilterGroup00 class. See [Filter documentation](@ref FilterGroup00) for details.
  */
-class TESTCLASSNAME : public AbstractFilter
+class FilterGroup00 : public AbstractFilter
 {
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(TESTCLASSNAME)
-  SIMPL_FILTER_NEW_MACRO(TESTCLASSNAME)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TESTCLASSNAME, AbstractFilter)
+  using Self = FilterGroup00;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup00
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup00
+   */
+  static QString ClassName();
 
-  ~TESTCLASSNAME() override;
+  ~FilterGroup00() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class TESTCLASSNAME : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -133,7 +157,7 @@ class TESTCLASSNAME : public AbstractFilter
   void preflightExecuted();
 
 protected:
-  TESTCLASSNAME();
+  FilterGroup00();
 
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
@@ -146,7 +170,7 @@ class TESTCLASSNAME : public AbstractFilter
   void initialize();
 
 private:
-  TESTCLASSNAME(const TESTCLASSNAME&) = delete;  // Copy Constructor Not Implemented
-  void operator=(const TESTCLASSNAME&) = delete; // Move assignment Not Implemented
+  FilterGroup00(const FilterGroup00&) = delete;  // Copy Constructor Not Implemented
+  void operator=(const FilterGroup00&) = delete; // Move assignment Not Implemented
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index e42f083ef2..6ff1ef4612 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup01.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup01::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getCompiledLibraryName() const
+QString FilterGroup01::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup01::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getBrandingString() const
+QString FilterGroup01::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup01::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getFilterVersion() const
+QString FilterGroup01::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup01::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getGroupName() const
+QString FilterGroup01::getGroupName() const
 {
   return SIMPL::FilterGroups::CoreFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup01::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup01::getUuid()
+QUuid FilterGroup01::getUuid() const
 {
   return QUuid("{b84c6096-db4c-568a-ad35-eef8151589aa}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup01::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getSubGroupName() const
+QString FilterGroup01::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup01::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup01::getHumanLabel() const
+QString FilterGroup01::getHumanLabel() const
 {
   return "Core Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup01::Pointer FilterGroup01::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup01> FilterGroup01::New()
+{
+  struct make_shared_enabler : public FilterGroup01
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup01::getNameOfClass() const
+{
+  return QString("FilterGroup01");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup01::ClassName()
+{
+  return QString("FilterGroup01");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.h b/Source/SIMPLib/TestFilters/FilterGroup01.h
index 8958424956..4142785369 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup01 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup01)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup01)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup01, AbstractFilter)
+  using Self = FilterGroup01;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup01
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup01
+   */
+  static QString ClassName();
 
   ~FilterGroup01() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup01 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup01 : public AbstractFilter
   FilterGroup01(FilterGroup01&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup01& operator=(const FilterGroup01&) = delete; // Copy Assignment Not Implemented
   FilterGroup01& operator=(FilterGroup01&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index de668a0bc9..84f739e3fa 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup02.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup02::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getCompiledLibraryName() const
+QString FilterGroup02::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup02::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getBrandingString() const
+QString FilterGroup02::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup02::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getFilterVersion() const
+QString FilterGroup02::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup02::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getGroupName() const
+QString FilterGroup02::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup02::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup02::getUuid()
+QUuid FilterGroup02::getUuid() const
 {
   return QUuid("{8380d722-9b65-5ca8-9027-93b7ab52158e}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup02::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getSubGroupName() const
+QString FilterGroup02::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup02::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup02::getHumanLabel() const
+QString FilterGroup02::getHumanLabel() const
 {
   return "GenericFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup02::Pointer FilterGroup02::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup02> FilterGroup02::New()
+{
+  struct make_shared_enabler : public FilterGroup02
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup02::getNameOfClass() const
+{
+  return QString("FilterGroup02");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup02::ClassName()
+{
+  return QString("FilterGroup02");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.h b/Source/SIMPLib/TestFilters/FilterGroup02.h
index 7b9ae49ec6..0779caa944 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup02 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup02)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup02)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup02, AbstractFilter)
+  using Self = FilterGroup02;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup02
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup02
+   */
+  static QString ClassName();
 
   ~FilterGroup02() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup02 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup02 : public AbstractFilter
   FilterGroup02(FilterGroup02&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup02& operator=(const FilterGroup02&) = delete; // Copy Assignment Not Implemented
   FilterGroup02& operator=(FilterGroup02&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index b683c0a174..01533610a4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup03.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup03::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getCompiledLibraryName() const
+QString FilterGroup03::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup03::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getBrandingString() const
+QString FilterGroup03::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup03::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getFilterVersion() const
+QString FilterGroup03::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup03::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getGroupName() const
+QString FilterGroup03::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup03::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup03::getUuid()
+QUuid FilterGroup03::getUuid() const
 {
   return QUuid("{f9dab3d7-ed4b-5af0-89b2-442592297374}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup03::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getSubGroupName() const
+QString FilterGroup03::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup03::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup03::getHumanLabel() const
+QString FilterGroup03::getHumanLabel() const
 {
   return "IOFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup03::Pointer FilterGroup03::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup03> FilterGroup03::New()
+{
+  struct make_shared_enabler : public FilterGroup03
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup03::getNameOfClass() const
+{
+  return QString("FilterGroup03");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup03::ClassName()
+{
+  return QString("FilterGroup03");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.h b/Source/SIMPLib/TestFilters/FilterGroup03.h
index 190ccdc07c..ffc1c9ba4c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup03 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup03)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup03)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup03, AbstractFilter)
+  using Self = FilterGroup03;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup03
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup03
+   */
+  static QString ClassName();
 
   ~FilterGroup03() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup03 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup03 : public AbstractFilter
   FilterGroup03(FilterGroup03&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup03& operator=(const FilterGroup03&) = delete; // Copy Assignment Not Implemented
   FilterGroup03& operator=(FilterGroup03&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index f00e7e17bf..b46ab500c8 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup04.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup04::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getCompiledLibraryName() const
+QString FilterGroup04::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup04::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getBrandingString() const
+QString FilterGroup04::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup04::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getFilterVersion() const
+QString FilterGroup04::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup04::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getGroupName() const
+QString FilterGroup04::getGroupName() const
 {
   return SIMPL::FilterGroups::ProcessingFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup04::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup04::getUuid()
+QUuid FilterGroup04::getUuid() const
 {
   return QUuid("{15277d03-a2fa-544d-be95-213fa8942c3e}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup04::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getSubGroupName() const
+QString FilterGroup04::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup04::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup04::getHumanLabel() const
+QString FilterGroup04::getHumanLabel() const
 {
   return "ProcessingFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup04::Pointer FilterGroup04::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup04> FilterGroup04::New()
+{
+  struct make_shared_enabler : public FilterGroup04
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup04::getNameOfClass() const
+{
+  return QString("FilterGroup04");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup04::ClassName()
+{
+  return QString("FilterGroup04");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.h b/Source/SIMPLib/TestFilters/FilterGroup04.h
index eff17fc068..970beb084e 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup04 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup04)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup04)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup04, AbstractFilter)
+  using Self = FilterGroup04;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup04
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup04
+   */
+  static QString ClassName();
 
   ~FilterGroup04() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup04 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup04 : public AbstractFilter
   FilterGroup04(FilterGroup04&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup04& operator=(const FilterGroup04&) = delete; // Copy Assignment Not Implemented
   FilterGroup04& operator=(FilterGroup04&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index a152c12dd7..4f934bbd55 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup05.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup05::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getCompiledLibraryName() const
+QString FilterGroup05::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup05::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getBrandingString() const
+QString FilterGroup05::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup05::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getFilterVersion() const
+QString FilterGroup05::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup05::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getGroupName() const
+QString FilterGroup05::getGroupName() const
 {
   return SIMPL::FilterGroups::ReconstructionFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup05::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup05::getUuid()
+QUuid FilterGroup05::getUuid() const
 {
   return QUuid("{e1c8e9d8-8e74-5ff7-9e1c-afa7a94eae82}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup05::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getSubGroupName() const
+QString FilterGroup05::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup05::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup05::getHumanLabel() const
+QString FilterGroup05::getHumanLabel() const
 {
   return "ReconstructionFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup05::Pointer FilterGroup05::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup05> FilterGroup05::New()
+{
+  struct make_shared_enabler : public FilterGroup05
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup05::getNameOfClass() const
+{
+  return QString("FilterGroup05");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup05::ClassName()
+{
+  return QString("FilterGroup05");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.h b/Source/SIMPLib/TestFilters/FilterGroup05.h
index d2c4429084..a63c482207 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup05 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup05)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup05)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup05, AbstractFilter)
+  using Self = FilterGroup05;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup05
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup05
+   */
+  static QString ClassName();
 
   ~FilterGroup05() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup05 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup05 : public AbstractFilter
   FilterGroup05(FilterGroup05&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup05& operator=(const FilterGroup05&) = delete; // Copy Assignment Not Implemented
   FilterGroup05& operator=(FilterGroup05&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index d687616ffb..474c012af1 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup06.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup06::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getCompiledLibraryName() const
+QString FilterGroup06::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup06::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getBrandingString() const
+QString FilterGroup06::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup06::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getFilterVersion() const
+QString FilterGroup06::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup06::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getGroupName() const
+QString FilterGroup06::getGroupName() const
 {
   return SIMPL::FilterGroups::SamplingFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup06::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup06::getUuid()
+QUuid FilterGroup06::getUuid() const
 {
   return QUuid("{bed5f283-bc93-58a5-a538-6835e23f7c4f}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup06::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getSubGroupName() const
+QString FilterGroup06::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup06::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup06::getHumanLabel() const
+QString FilterGroup06::getHumanLabel() const
 {
   return "SamplingFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup06::Pointer FilterGroup06::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup06> FilterGroup06::New()
+{
+  struct make_shared_enabler : public FilterGroup06
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup06::getNameOfClass() const
+{
+  return QString("FilterGroup06");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup06::ClassName()
+{
+  return QString("FilterGroup06");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.h b/Source/SIMPLib/TestFilters/FilterGroup06.h
index ea8e4e4c5a..60fa36bc64 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup06 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup06)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup06)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup06, AbstractFilter)
+  using Self = FilterGroup06;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup06
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup06
+   */
+  static QString ClassName();
 
   ~FilterGroup06() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup06 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup06 : public AbstractFilter
   FilterGroup06(FilterGroup06&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup06& operator=(const FilterGroup06&) = delete; // Copy Assignment Not Implemented
   FilterGroup06& operator=(FilterGroup06&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index e2896d23f1..a281d8f899 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup07.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup07::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getCompiledLibraryName() const
+QString FilterGroup07::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup07::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getBrandingString() const
+QString FilterGroup07::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup07::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getFilterVersion() const
+QString FilterGroup07::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup07::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getGroupName() const
+QString FilterGroup07::getGroupName() const
 {
   return SIMPL::FilterGroups::StatisticsFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup07::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup07::getUuid()
+QUuid FilterGroup07::getUuid() const
 {
   return QUuid("{c2f6d537-2dc5-51cd-af13-21fd4905184c}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup07::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getSubGroupName() const
+QString FilterGroup07::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup07::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup07::getHumanLabel() const
+QString FilterGroup07::getHumanLabel() const
 {
   return "StatisticsFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup07::Pointer FilterGroup07::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup07> FilterGroup07::New()
+{
+  struct make_shared_enabler : public FilterGroup07
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup07::getNameOfClass() const
+{
+  return QString("FilterGroup07");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup07::ClassName()
+{
+  return QString("FilterGroup07");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.h b/Source/SIMPLib/TestFilters/FilterGroup07.h
index 596bf83f9b..9234e43cae 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup07 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup07)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup07)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup07, AbstractFilter)
+  using Self = FilterGroup07;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup07
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup07
+   */
+  static QString ClassName();
 
   ~FilterGroup07() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup07 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup07 : public AbstractFilter
   FilterGroup07(FilterGroup07&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup07& operator=(const FilterGroup07&) = delete; // Copy Assignment Not Implemented
   FilterGroup07& operator=(FilterGroup07&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index 6eb0ef2766..731d6c823c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup08.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup08::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getCompiledLibraryName() const
+QString FilterGroup08::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup08::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getBrandingString() const
+QString FilterGroup08::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup08::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getFilterVersion() const
+QString FilterGroup08::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup08::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getGroupName() const
+QString FilterGroup08::getGroupName() const
 {
   return SIMPL::FilterGroups::SyntheticBuildingFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup08::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup08::getUuid()
+QUuid FilterGroup08::getUuid() const
 {
   return QUuid("{13961f3a-a66e-5949-a656-77af0234c336}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup08::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getSubGroupName() const
+QString FilterGroup08::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup08::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup08::getHumanLabel() const
+QString FilterGroup08::getHumanLabel() const
 {
   return "SyntheticBuildingFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup08::Pointer FilterGroup08::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup08> FilterGroup08::New()
+{
+  struct make_shared_enabler : public FilterGroup08
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup08::getNameOfClass() const
+{
+  return QString("FilterGroup08");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup08::ClassName()
+{
+  return QString("FilterGroup08");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.h b/Source/SIMPLib/TestFilters/FilterGroup08.h
index 39b44ef42e..73d1748cf9 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup08 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup08)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup08)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup08, AbstractFilter)
+  using Self = FilterGroup08;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup08
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup08
+   */
+  static QString ClassName();
 
   ~FilterGroup08() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup08 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup08 : public AbstractFilter
   FilterGroup08(FilterGroup08&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup08& operator=(const FilterGroup08&) = delete; // Copy Assignment Not Implemented
   FilterGroup08& operator=(FilterGroup08&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index dd82f0f9ef..c4d2e79fb4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup09.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup09::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getCompiledLibraryName() const
+QString FilterGroup09::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup09::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getBrandingString() const
+QString FilterGroup09::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup09::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getFilterVersion() const
+QString FilterGroup09::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup09::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getGroupName() const
+QString FilterGroup09::getGroupName() const
 {
   return SIMPL::FilterGroups::SurfaceMeshingFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup09::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup09::getUuid()
+QUuid FilterGroup09::getUuid() const
 {
   return QUuid("{30b7d2a0-6e92-506c-bbbe-3d4c948679b8}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup09::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getSubGroupName() const
+QString FilterGroup09::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup09::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup09::getHumanLabel() const
+QString FilterGroup09::getHumanLabel() const
 {
   return "SurfaceMeshingFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup09::Pointer FilterGroup09::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup09> FilterGroup09::New()
+{
+  struct make_shared_enabler : public FilterGroup09
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup09::getNameOfClass() const
+{
+  return QString("FilterGroup09");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup09::ClassName()
+{
+  return QString("FilterGroup09");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.h b/Source/SIMPLib/TestFilters/FilterGroup09.h
index b2c2ee8104..0e6cc2c37d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup09 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup09)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup09)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup09, AbstractFilter)
+  using Self = FilterGroup09;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup09
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup09
+   */
+  static QString ClassName();
 
   ~FilterGroup09() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup09 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup09 : public AbstractFilter
   FilterGroup09(FilterGroup09&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup09& operator=(const FilterGroup09&) = delete; // Copy Assignment Not Implemented
   FilterGroup09& operator=(FilterGroup09&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index c89e755291..c1bd05144d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup10.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup10::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getCompiledLibraryName() const
+QString FilterGroup10::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup10::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getBrandingString() const
+QString FilterGroup10::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup10::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getFilterVersion() const
+QString FilterGroup10::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup10::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getGroupName() const
+QString FilterGroup10::getGroupName() const
 {
   return SIMPL::FilterGroups::Utilities;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup10::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup10::getUuid()
+QUuid FilterGroup10::getUuid() const
 {
   return QUuid("{f259fade-f69b-5da7-916e-3826fcef15a6}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup10::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getSubGroupName() const
+QString FilterGroup10::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup10::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup10::getHumanLabel() const
+QString FilterGroup10::getHumanLabel() const
 {
   return "Utilities Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup10::Pointer FilterGroup10::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup10> FilterGroup10::New()
+{
+  struct make_shared_enabler : public FilterGroup10
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup10::getNameOfClass() const
+{
+  return QString("FilterGroup10");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup10::ClassName()
+{
+  return QString("FilterGroup10");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.h b/Source/SIMPLib/TestFilters/FilterGroup10.h
index d0c9ed5346..11271f7f85 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup10 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup10)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup10)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup10, AbstractFilter)
+  using Self = FilterGroup10;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup10
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup10
+   */
+  static QString ClassName();
 
   ~FilterGroup10() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup10 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup10 : public AbstractFilter
   FilterGroup10(FilterGroup10&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup10& operator=(const FilterGroup10&) = delete; // Copy Assignment Not Implemented
   FilterGroup10& operator=(FilterGroup10&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index cfc51da8bf..b2db2bd990 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup12.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup12::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getCompiledLibraryName() const
+QString FilterGroup12::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup12::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getBrandingString() const
+QString FilterGroup12::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup12::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getFilterVersion() const
+QString FilterGroup12::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup12::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getGroupName() const
+QString FilterGroup12::getGroupName() const
 {
   return SIMPL::FilterGroups::CustomFilters;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup12::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup12::getUuid()
+QUuid FilterGroup12::getUuid() const
 {
   return QUuid("{1ee03bab-fc8a-5d07-98eb-af08e2322bb9}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup12::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getSubGroupName() const
+QString FilterGroup12::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup12::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup12::getHumanLabel() const
+QString FilterGroup12::getHumanLabel() const
 {
   return "CustomFilters Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup12::Pointer FilterGroup12::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup12> FilterGroup12::New()
+{
+  struct make_shared_enabler : public FilterGroup12
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup12::getNameOfClass() const
+{
+  return QString("FilterGroup12");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup12::ClassName()
+{
+  return QString("FilterGroup12");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.h b/Source/SIMPLib/TestFilters/FilterGroup12.h
index b688a6098c..b9975f3ec4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup12 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup12)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup12)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup12, AbstractFilter)
+  using Self = FilterGroup12;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup12
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup12
+   */
+  static QString ClassName();
 
   ~FilterGroup12() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup12 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup12 : public AbstractFilter
   FilterGroup12(FilterGroup12&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup12& operator=(const FilterGroup12&) = delete; // Copy Assignment Not Implemented
   FilterGroup12& operator=(FilterGroup12&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index 950d6be12d..30060fffc7 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -29,8 +29,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "FilterGroup13.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -132,7 +136,7 @@ AbstractFilter::Pointer FilterGroup13::newFilterInstance(bool copyFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getCompiledLibraryName() const
+QString FilterGroup13::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -140,7 +144,7 @@ const QString FilterGroup13::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getBrandingString() const
+QString FilterGroup13::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
@@ -148,7 +152,7 @@ const QString FilterGroup13::getBrandingString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getFilterVersion() const
+QString FilterGroup13::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
@@ -159,7 +163,7 @@ const QString FilterGroup13::getFilterVersion() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getGroupName() const
+QString FilterGroup13::getGroupName() const
 {
   return SIMPL::FilterGroups::Unsupported;
 }
@@ -167,7 +171,7 @@ const QString FilterGroup13::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid FilterGroup13::getUuid()
+QUuid FilterGroup13::getUuid() const
 {
   return QUuid("{3eeb0c3a-905a-5e12-9fae-ad73dadf1ef6}");
 }
@@ -175,7 +179,7 @@ const QUuid FilterGroup13::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getSubGroupName() const
+QString FilterGroup13::getSubGroupName() const
 {
   return "Test";
 }
@@ -183,7 +187,36 @@ const QString FilterGroup13::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString FilterGroup13::getHumanLabel() const
+QString FilterGroup13::getHumanLabel() const
 {
   return "Unsupported Test Filter";
 }
+
+// -----------------------------------------------------------------------------
+FilterGroup13::Pointer FilterGroup13::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<FilterGroup13> FilterGroup13::New()
+{
+  struct make_shared_enabler : public FilterGroup13
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup13::getNameOfClass() const
+{
+  return QString("FilterGroup13");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterGroup13::ClassName()
+{
+  return QString("FilterGroup13");
+}
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.h b/Source/SIMPLib/TestFilters/FilterGroup13.h
index d2faf4c7d0..8e91e5a432 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.h
@@ -31,7 +31,8 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -43,30 +44,53 @@ class FilterGroup13 : public AbstractFilter
   Q_OBJECT
 
 public:
-  SIMPL_SHARED_POINTERS(FilterGroup13)
-  SIMPL_FILTER_NEW_MACRO(FilterGroup13)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(FilterGroup13, AbstractFilter)
+  using Self = FilterGroup13;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FilterGroup13
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FilterGroup13
+   */
+  static QString ClassName();
 
   ~FilterGroup13() override;
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
    */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
 
   /**
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
   */
-  const QString getBrandingString() const override;
+  QString getBrandingString() const override;
 
   /**
    * @brief getFilterVersion Returns a version string for this filter. Default
    * value is an empty string.
    * @return
    */
-  const QString getFilterVersion() const override;
+  QString getFilterVersion() const override;
 
   /**
    * @brief newFilterInstance Reimplemented from @see AbstractFilter class
@@ -76,23 +100,23 @@ class FilterGroup13 : public AbstractFilter
   /**
    * @brief getGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
    * @brief getSubGroupName Reimplemented from @see AbstractFilter class
    */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
    * @brief getHumanLabel Reimplemented from @see AbstractFilter class
    */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
    * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
@@ -150,5 +174,7 @@ class FilterGroup13 : public AbstractFilter
   FilterGroup13(FilterGroup13&&) = delete;                 // Move Constructor Not Implemented
   FilterGroup13& operator=(const FilterGroup13&) = delete; // Copy Assignment Not Implemented
   FilterGroup13& operator=(FilterGroup13&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
 
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index cdd1a9fe15..23ae0e7f8a 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -33,8 +33,12 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "GenericExample.h"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
@@ -440,7 +444,7 @@ AbstractFilter::Pointer GenericExample::newFilterInstance(bool copyFilterParamet
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenericExample::getCompiledLibraryName() const
+QString GenericExample::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -448,7 +452,7 @@ const QString GenericExample::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenericExample::getGroupName() const
+QString GenericExample::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -456,7 +460,7 @@ const QString GenericExample::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid GenericExample::getUuid()
+QUuid GenericExample::getUuid() const
 {
   return QUuid("{b1b9da5c-4ad8-5b61-9615-2a3e17b38970}");
 }
@@ -464,7 +468,7 @@ const QUuid GenericExample::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenericExample::getSubGroupName() const
+QString GenericExample::getSubGroupName() const
 {
   return "Test";
 }
@@ -472,7 +476,540 @@ const QString GenericExample::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString GenericExample::getHumanLabel() const
+QString GenericExample::getHumanLabel() const
 {
   return "Generic Example";
 }
+
+// -----------------------------------------------------------------------------
+GenericExample::Pointer GenericExample::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<GenericExample> GenericExample::New()
+{
+  struct make_shared_enabler : public GenericExample
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getNameOfClass() const
+{
+  return QString("GenericExample");
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::ClassName()
+{
+  return QString("GenericExample");
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setStlFilePrefix(const QString& value)
+{
+  m_StlFilePrefix = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getStlFilePrefix() const
+{
+  return m_StlFilePrefix;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setShowPrefix(bool value)
+{
+  m_ShowPrefix = value;
+}
+
+// -----------------------------------------------------------------------------
+bool GenericExample::getShowPrefix() const
+{
+  return m_ShowPrefix;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setMaxIterations(int value)
+{
+  m_MaxIterations = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getMaxIterations() const
+{
+  return m_MaxIterations;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setSecondOrderACoeff(const Float2ndOrderPoly_t& value)
+{
+  m_SecondOrderACoeff = value;
+}
+
+// -----------------------------------------------------------------------------
+Float2ndOrderPoly_t GenericExample::getSecondOrderACoeff() const
+{
+  return m_SecondOrderACoeff;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setThirdOrderACoeff(const Float3rdOrderPoly_t& value)
+{
+  m_ThirdOrderACoeff = value;
+}
+
+// -----------------------------------------------------------------------------
+Float3rdOrderPoly_t GenericExample::getThirdOrderACoeff() const
+{
+  return m_ThirdOrderACoeff;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setFourthOrderACoeff(const Float4thOrderPoly_t& value)
+{
+  m_FourthOrderACoeff = value;
+}
+
+// -----------------------------------------------------------------------------
+Float4thOrderPoly_t GenericExample::getFourthOrderACoeff() const
+{
+  return m_FourthOrderACoeff;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setMisorientationTolerance(double value)
+{
+  m_MisorientationTolerance = value;
+}
+
+// -----------------------------------------------------------------------------
+double GenericExample::getMisorientationTolerance() const
+{
+  return m_MisorientationTolerance;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setInputPhaseTypesArrayPath(const DataArrayPath& value)
+{
+  m_InputPhaseTypesArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getInputPhaseTypesArrayPath() const
+{
+  return m_InputPhaseTypesArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setShapeTypeData(const ShapeType::Types& value)
+{
+  m_ShapeTypeData = value;
+}
+
+// -----------------------------------------------------------------------------
+ShapeType::Types GenericExample::getShapeTypeData() const
+{
+  return m_ShapeTypeData;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setPhaseCount(int value)
+{
+  m_PhaseCount = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getPhaseCount() const
+{
+  return m_PhaseCount;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setInitRange(const FPRangePair& value)
+{
+  m_InitRange = value;
+}
+
+// -----------------------------------------------------------------------------
+FPRangePair GenericExample::getInitRange() const
+{
+  return m_InitRange;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setEstimatedPrimaryFeatures(const QString& value)
+{
+  m_EstimatedPrimaryFeatures = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getEstimatedPrimaryFeatures() const
+{
+  return m_EstimatedPrimaryFeatures;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setInputFile(const QString& value)
+{
+  m_InputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getInputFile() const
+{
+  return m_InputFile;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setInputFileListInfo(const FileListInfo_t& value)
+{
+  m_InputFileListInfo = value;
+}
+
+// -----------------------------------------------------------------------------
+FileListInfo_t GenericExample::getInputFileListInfo() const
+{
+  return m_InputFileListInfo;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setSelectedXCoordArrayName(const QString& value)
+{
+  m_SelectedXCoordArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getSelectedXCoordArrayName() const
+{
+  return m_SelectedXCoordArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDataArrayList(const QStringList& value)
+{
+  m_DataArrayList = value;
+}
+
+// -----------------------------------------------------------------------------
+QStringList GenericExample::getDataArrayList() const
+{
+  return m_DataArrayList;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setCreatedDataContainer(const DataArrayPath& value)
+{
+  m_CreatedDataContainer = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getCreatedDataContainer() const
+{
+  return m_CreatedDataContainer;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDcaProxy(const DataContainerArrayProxy& value)
+{
+  m_DcaProxy = value;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerArrayProxy GenericExample::getDcaProxy() const
+{
+  return m_DcaProxy;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setInputPath(const QString& value)
+{
+  m_InputPath = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getInputPath() const
+{
+  return m_InputPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setOutputFile(const QString& value)
+{
+  m_OutputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getOutputFile() const
+{
+  return m_OutputFile;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setOutputPath(const QString& value)
+{
+  m_OutputPath = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getOutputPath() const
+{
+  return m_OutputPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setSelectedMultiArrayPaths(const QVector<DataArrayPath>& value)
+{
+  m_SelectedMultiArrayPaths = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<DataArrayPath> GenericExample::getSelectedMultiArrayPaths() const
+{
+  return m_SelectedMultiArrayPaths;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setWriteAlignmentShifts(bool value)
+{
+  m_WriteAlignmentShifts = value;
+}
+
+// -----------------------------------------------------------------------------
+bool GenericExample::getWriteAlignmentShifts() const
+{
+  return m_WriteAlignmentShifts;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setConversionType(int value)
+{
+  m_ConversionType = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getConversionType() const
+{
+  return m_ConversionType;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDimensions(const IntVec3Type& value)
+{
+  m_Dimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec3Type GenericExample::getDimensions() const
+{
+  return m_Dimensions;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setRange(const IntVec2Type& value)
+{
+  m_Range = value;
+}
+
+// -----------------------------------------------------------------------------
+IntVec2Type GenericExample::getRange() const
+{
+  return m_Range;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setOrigin(const FloatVec3Type& value)
+{
+  m_Origin = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type GenericExample::getOrigin() const
+{
+  return m_Origin;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setCrystalSymmetryRotations(const AxisAngleInput_t& value)
+{
+  m_CrystalSymmetryRotations = value;
+}
+
+// -----------------------------------------------------------------------------
+AxisAngleInput_t GenericExample::getCrystalSymmetryRotations() const
+{
+  return m_CrystalSymmetryRotations;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setFeatureIdsArrayPath(const DataArrayPath& value)
+{
+  m_FeatureIdsArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getFeatureIdsArrayPath() const
+{
+  return m_FeatureIdsArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_AttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getAttributeMatrixPath() const
+{
+  return m_AttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setCreatedAttributeMatrix(const DataArrayPath& value)
+{
+  m_CreatedAttributeMatrix = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getCreatedAttributeMatrix() const
+{
+  return m_CreatedAttributeMatrix;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDataContainerName(const DataArrayPath& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setSizeDistributionFitType(int value)
+{
+  m_SizeDistributionFitType = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getSizeDistributionFitType() const
+{
+  return m_SizeDistributionFitType;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setSelectedThresholds(const ComparisonInputs& value)
+{
+  m_SelectedThresholds = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonInputs GenericExample::getSelectedThresholds() const
+{
+  return m_SelectedThresholds;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setCalcExpression(const QString& value)
+{
+  m_CalcExpression = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenericExample::getCalcExpression() const
+{
+  return m_CalcExpression;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setCreatedDataArray(const DataArrayPath& value)
+{
+  m_CreatedDataArray = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenericExample::getCreatedDataArray() const
+{
+  return m_CreatedDataArray;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setBool1(bool value)
+{
+  m_Bool1 = value;
+}
+
+// -----------------------------------------------------------------------------
+bool GenericExample::getBool1() const
+{
+  return m_Bool1;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDouble2(double value)
+{
+  m_Double2 = value;
+}
+
+// -----------------------------------------------------------------------------
+double GenericExample::getDouble2() const
+{
+  return m_Double2;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setBool2(bool value)
+{
+  m_Bool2 = value;
+}
+
+// -----------------------------------------------------------------------------
+bool GenericExample::getBool2() const
+{
+  return m_Bool2;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setAlgorithmSelection(int value)
+{
+  m_AlgorithmSelection = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getAlgorithmSelection() const
+{
+  return m_AlgorithmSelection;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setDistanceMetric(int value)
+{
+  m_DistanceMetric = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenericExample::getDistanceMetric() const
+{
+  return m_DistanceMetric;
+}
+
+// -----------------------------------------------------------------------------
+void GenericExample::setMontageSelection(const MontageSelection& value)
+{
+  m_MontageSelection = value;
+}
+
+// -----------------------------------------------------------------------------
+MontageSelection GenericExample::getMontageSelection() const
+{
+  return m_MontageSelection;
+}
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 914a21e3c7..871292d575 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -35,9 +35,11 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
@@ -52,7 +54,6 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @class GenericExample GenericExample.h ExamplePlugin/Code/ExamplePluginFilters/GenericExample.h
@@ -64,7 +65,53 @@
 class SIMPLib_EXPORT GenericExample : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(GenericExample SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(GenericExample)
+  PYB11_FILTER_NEW_MACRO(GenericExample)
+  PYB11_FILTER_PARAMETER(QString, StlFilePrefix)
+  PYB11_FILTER_PARAMETER(bool, ShowPrefix)
+  PYB11_FILTER_PARAMETER(int, MaxIterations)
+  PYB11_FILTER_PARAMETER(Float2ndOrderPoly_t, SecondOrderACoeff)
+  PYB11_FILTER_PARAMETER(Float3rdOrderPoly_t, ThirdOrderACoeff)
+  PYB11_FILTER_PARAMETER(Float4thOrderPoly_t, FourthOrderACoeff)
+  PYB11_FILTER_PARAMETER(double, MisorientationTolerance)
+  PYB11_FILTER_PARAMETER(DataArrayPath, InputPhaseTypesArrayPath)
+  PYB11_FILTER_PARAMETER(ShapeType::Types, ShapeTypeData)
+  PYB11_FILTER_PARAMETER(int, PhaseCount)
+  PYB11_FILTER_PARAMETER(FPRangePair, InitRange)
+  PYB11_FILTER_PARAMETER(QString, EstimatedPrimaryFeatures)
+  PYB11_FILTER_PARAMETER(QString, InputFile)
+  PYB11_FILTER_PARAMETER(FileListInfo_t, InputFileListInfo)
+  PYB11_FILTER_PARAMETER(QString, SelectedXCoordArrayName)
+  PYB11_FILTER_PARAMETER(QStringList, DataArrayList)
+  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedDataContainer)
+  PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DcaProxy)
+  PYB11_FILTER_PARAMETER(QString, InputPath)
+  PYB11_FILTER_PARAMETER(QString, OutputFile)
+  PYB11_FILTER_PARAMETER(QString, OutputPath)
+  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedMultiArrayPaths)
+  PYB11_FILTER_PARAMETER(bool, WriteAlignmentShifts)
+  PYB11_FILTER_PARAMETER(int, ConversionType)
+  PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  PYB11_FILTER_PARAMETER(IntVec2Type, Range)
+  PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
+  PYB11_FILTER_PARAMETER(AxisAngleInput_t, CrystalSymmetryRotations)
+  PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixPath)
+  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
+  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  PYB11_FILTER_PARAMETER(int, SizeDistributionFitType)
+  PYB11_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
+  PYB11_FILTER_PARAMETER(QString, CalcExpression)
+  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedDataArray)
+  PYB11_FILTER_PARAMETER(bool, Bool1)
+  PYB11_FILTER_PARAMETER(double, Double2)
+  PYB11_FILTER_PARAMETER(bool, Bool2)
+  PYB11_FILTER_PARAMETER(int, AlgorithmSelection)
+  PYB11_FILTER_PARAMETER(int, DistanceMetric)
+  PYB11_FILTER_PARAMETER(MontageSelection, MontageSelection)
 
   PYB11_PROPERTY(QString StlFilePrefix READ getStlFilePrefix WRITE setStlFilePrefix)
   PYB11_PROPERTY(bool ShowPrefix READ getShowPrefix WRITE setShowPrefix)
@@ -108,163 +155,565 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(int AlgorithmSelection READ getAlgorithmSelection WRITE setAlgorithmSelection)
   PYB11_PROPERTY(int DistanceMetric READ getDistanceMetric WRITE setDistanceMetric)
   PYB11_PROPERTY(MontageSelection MontageSelection READ getMontageSelection WRITE setMontageSelection)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(GenericExample)
-  SIMPL_FILTER_NEW_MACRO(GenericExample)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(GenericExample, AbstractFilter)
+  using Self = GenericExample;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenericExample
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenericExample
+   */
+  static QString ClassName();
 
   ~GenericExample() override;
 
   /* Place your input parameters here. You can use some of the DREAM3D Macros if you want to */
-  SIMPL_FILTER_PARAMETER(QString, StlFilePrefix)
+  /**
+   * @brief Setter property for StlFilePrefix
+   */
+  void setStlFilePrefix(const QString& value);
+  /**
+   * @brief Getter property for StlFilePrefix
+   * @return Value of StlFilePrefix
+   */
+  QString getStlFilePrefix() const;
+
   Q_PROPERTY(QString StlFilePrefix READ getStlFilePrefix WRITE setStlFilePrefix)
 
-  SIMPL_FILTER_PARAMETER(bool, ShowPrefix)
+  /**
+   * @brief Setter property for ShowPrefix
+   */
+  void setShowPrefix(bool value);
+  /**
+   * @brief Getter property for ShowPrefix
+   * @return Value of ShowPrefix
+   */
+  bool getShowPrefix() const;
+
   Q_PROPERTY(bool ShowPrefix READ getShowPrefix WRITE setShowPrefix)
 
-  SIMPL_FILTER_PARAMETER(int, MaxIterations)
+  /**
+   * @brief Setter property for MaxIterations
+   */
+  void setMaxIterations(int value);
+  /**
+   * @brief Getter property for MaxIterations
+   * @return Value of MaxIterations
+   */
+  int getMaxIterations() const;
+
   Q_PROPERTY(int MaxIterations READ getMaxIterations WRITE setMaxIterations)
 
-  SIMPL_FILTER_PARAMETER(Float2ndOrderPoly_t, SecondOrderACoeff)
+  /**
+   * @brief Setter property for SecondOrderACoeff
+   */
+  void setSecondOrderACoeff(const Float2ndOrderPoly_t& value);
+  /**
+   * @brief Getter property for SecondOrderACoeff
+   * @return Value of SecondOrderACoeff
+   */
+  Float2ndOrderPoly_t getSecondOrderACoeff() const;
+
   Q_PROPERTY(Float2ndOrderPoly_t SecondOrderACoeff READ getSecondOrderACoeff WRITE setSecondOrderACoeff)
 
-  SIMPL_FILTER_PARAMETER(Float3rdOrderPoly_t, ThirdOrderACoeff)
+  /**
+   * @brief Setter property for ThirdOrderACoeff
+   */
+  void setThirdOrderACoeff(const Float3rdOrderPoly_t& value);
+  /**
+   * @brief Getter property for ThirdOrderACoeff
+   * @return Value of ThirdOrderACoeff
+   */
+  Float3rdOrderPoly_t getThirdOrderACoeff() const;
+
   Q_PROPERTY(Float3rdOrderPoly_t ThirdOrderACoeff READ getThirdOrderACoeff WRITE setThirdOrderACoeff)
 
-  SIMPL_FILTER_PARAMETER(Float4thOrderPoly_t, FourthOrderACoeff)
+  /**
+   * @brief Setter property for FourthOrderACoeff
+   */
+  void setFourthOrderACoeff(const Float4thOrderPoly_t& value);
+  /**
+   * @brief Getter property for FourthOrderACoeff
+   * @return Value of FourthOrderACoeff
+   */
+  Float4thOrderPoly_t getFourthOrderACoeff() const;
+
   Q_PROPERTY(Float4thOrderPoly_t FourthOrderACoeff READ getFourthOrderACoeff WRITE setFourthOrderACoeff)
 
-  SIMPL_FILTER_PARAMETER(double, MisorientationTolerance)
+  /**
+   * @brief Setter property for MisorientationTolerance
+   */
+  void setMisorientationTolerance(double value);
+  /**
+   * @brief Getter property for MisorientationTolerance
+   * @return Value of MisorientationTolerance
+   */
+  double getMisorientationTolerance() const;
+
   Q_PROPERTY(double MisorientationTolerance READ getMisorientationTolerance WRITE setMisorientationTolerance)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, InputPhaseTypesArrayPath)
+  /**
+   * @brief Setter property for InputPhaseTypesArrayPath
+   */
+  void setInputPhaseTypesArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for InputPhaseTypesArrayPath
+   * @return Value of InputPhaseTypesArrayPath
+   */
+  DataArrayPath getInputPhaseTypesArrayPath() const;
+
   Q_PROPERTY(DataArrayPath InputPhaseTypesArrayPath READ getInputPhaseTypesArrayPath WRITE setInputPhaseTypesArrayPath)
 
-  SIMPL_FILTER_PARAMETER(ShapeType::Types, ShapeTypeData)
+  /**
+   * @brief Setter property for ShapeTypeData
+   */
+  void setShapeTypeData(const ShapeType::Types& value);
+  /**
+   * @brief Getter property for ShapeTypeData
+   * @return Value of ShapeTypeData
+   */
+  ShapeType::Types getShapeTypeData() const;
+
   Q_PROPERTY(ShapeType::Types ShapeTypeData READ getShapeTypeData WRITE setShapeTypeData)
 
-  SIMPL_FILTER_PARAMETER(int, PhaseCount)
+  /**
+   * @brief Setter property for PhaseCount
+   */
+  void setPhaseCount(int value);
+  /**
+   * @brief Getter property for PhaseCount
+   * @return Value of PhaseCount
+   */
+  int getPhaseCount() const;
+
   Q_PROPERTY(int PhaseCount READ getPhaseCount WRITE setPhaseCount)
 
   typedef QPair<double, double> FPRangePair;
-  SIMPL_FILTER_PARAMETER(FPRangePair, InitRange)
+  /**
+   * @brief Setter property for InitRange
+   */
+  void setInitRange(const FPRangePair& value);
+  /**
+   * @brief Getter property for InitRange
+   * @return Value of InitRange
+   */
+  FPRangePair getInitRange() const;
+
   Q_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
 
-  SIMPL_FILTER_PARAMETER(QString, EstimatedPrimaryFeatures)
+  /**
+   * @brief Setter property for EstimatedPrimaryFeatures
+   */
+  void setEstimatedPrimaryFeatures(const QString& value);
+  /**
+   * @brief Getter property for EstimatedPrimaryFeatures
+   * @return Value of EstimatedPrimaryFeatures
+   */
+  QString getEstimatedPrimaryFeatures() const;
+
   Q_PROPERTY(QString EstimatedPrimaryFeatures READ getEstimatedPrimaryFeatures WRITE setEstimatedPrimaryFeatures)
 
-  SIMPL_FILTER_PARAMETER(QString, InputFile)
+  /**
+   * @brief Setter property for InputFile
+   */
+  void setInputFile(const QString& value);
+  /**
+   * @brief Getter property for InputFile
+   * @return Value of InputFile
+   */
+  QString getInputFile() const;
+
   Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
 
-  SIMPL_FILTER_PARAMETER(FileListInfo_t, InputFileListInfo)
+  /**
+   * @brief Setter property for InputFileListInfo
+   */
+  void setInputFileListInfo(const FileListInfo_t& value);
+  /**
+   * @brief Getter property for InputFileListInfo
+   * @return Value of InputFileListInfo
+   */
+  FileListInfo_t getInputFileListInfo() const;
+
   Q_PROPERTY(FileListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
 
-  SIMPL_FILTER_PARAMETER(QString, SelectedXCoordArrayName)
+  /**
+   * @brief Setter property for SelectedXCoordArrayName
+   */
+  void setSelectedXCoordArrayName(const QString& value);
+  /**
+   * @brief Getter property for SelectedXCoordArrayName
+   * @return Value of SelectedXCoordArrayName
+   */
+  QString getSelectedXCoordArrayName() const;
+
   Q_PROPERTY(QString SelectedXCoordArrayName READ getSelectedXCoordArrayName WRITE setSelectedXCoordArrayName)
 
-  SIMPL_FILTER_PARAMETER(QStringList, DataArrayList)
+  /**
+   * @brief Setter property for DataArrayList
+   */
+  void setDataArrayList(const QStringList& value);
+  /**
+   * @brief Getter property for DataArrayList
+   * @return Value of DataArrayList
+   */
+  QStringList getDataArrayList() const;
+
   Q_PROPERTY(QStringList DataArrayList READ getDataArrayList WRITE setDataArrayList)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedDataContainer)
+  /**
+   * @brief Setter property for CreatedDataContainer
+   */
+  void setCreatedDataContainer(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedDataContainer
+   * @return Value of CreatedDataContainer
+   */
+  DataArrayPath getCreatedDataContainer() const;
+
   Q_PROPERTY(DataArrayPath CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
 
-  SIMPL_FILTER_PARAMETER(DataContainerArrayProxy, DcaProxy)
+  /**
+   * @brief Setter property for DcaProxy
+   */
+  void setDcaProxy(const DataContainerArrayProxy& value);
+  /**
+   * @brief Getter property for DcaProxy
+   * @return Value of DcaProxy
+   */
+  DataContainerArrayProxy getDcaProxy() const;
+
   Q_PROPERTY(DataContainerArrayProxy DcaProxy READ getDcaProxy WRITE setDcaProxy)
 
-  SIMPL_FILTER_PARAMETER(QString, InputPath)
+  /**
+   * @brief Setter property for InputPath
+   */
+  void setInputPath(const QString& value);
+  /**
+   * @brief Getter property for InputPath
+   * @return Value of InputPath
+   */
+  QString getInputPath() const;
+
   Q_PROPERTY(QString InputPath READ getInputPath WRITE setInputPath)
 
-  SIMPL_FILTER_PARAMETER(QString, OutputFile)
+  /**
+   * @brief Setter property for OutputFile
+   */
+  void setOutputFile(const QString& value);
+  /**
+   * @brief Getter property for OutputFile
+   * @return Value of OutputFile
+   */
+  QString getOutputFile() const;
+
   Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
 
-  SIMPL_FILTER_PARAMETER(QString, OutputPath)
+  /**
+   * @brief Setter property for OutputPath
+   */
+  void setOutputPath(const QString& value);
+  /**
+   * @brief Getter property for OutputPath
+   * @return Value of OutputPath
+   */
+  QString getOutputPath() const;
+
   Q_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
 
-  SIMPL_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedMultiArrayPaths)
+  /**
+   * @brief Setter property for SelectedMultiArrayPaths
+   */
+  void setSelectedMultiArrayPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for SelectedMultiArrayPaths
+   * @return Value of SelectedMultiArrayPaths
+   */
+  QVector<DataArrayPath> getSelectedMultiArrayPaths() const;
+
   Q_PROPERTY(QVector<DataArrayPath> SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
 
-  SIMPL_FILTER_PARAMETER(bool, WriteAlignmentShifts)
+  /**
+   * @brief Setter property for WriteAlignmentShifts
+   */
+  void setWriteAlignmentShifts(bool value);
+  /**
+   * @brief Getter property for WriteAlignmentShifts
+   * @return Value of WriteAlignmentShifts
+   */
+  bool getWriteAlignmentShifts() const;
+
   Q_PROPERTY(bool WriteAlignmentShifts READ getWriteAlignmentShifts WRITE setWriteAlignmentShifts)
 
-  SIMPL_FILTER_PARAMETER(int, ConversionType)
+  /**
+   * @brief Setter property for ConversionType
+   */
+  void setConversionType(int value);
+  /**
+   * @brief Getter property for ConversionType
+   * @return Value of ConversionType
+   */
+  int getConversionType() const;
+
   Q_PROPERTY(int ConversionType READ getConversionType WRITE setConversionType)
 
-  SIMPL_FILTER_PARAMETER(IntVec3Type, Dimensions)
+  /**
+   * @brief Setter property for Dimensions
+   */
+  void setDimensions(const IntVec3Type& value);
+  /**
+   * @brief Getter property for Dimensions
+   * @return Value of Dimensions
+   */
+  IntVec3Type getDimensions() const;
+
   Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
 
-  SIMPL_FILTER_PARAMETER(IntVec2Type, Range)
+  /**
+   * @brief Setter property for Range
+   */
+  void setRange(const IntVec2Type& value);
+  /**
+   * @brief Getter property for Range
+   * @return Value of Range
+   */
+  IntVec2Type getRange() const;
+
   Q_PROPERTY(IntVec2Type Range READ getRange WRITE setRange)
 
-  SIMPL_FILTER_PARAMETER(FloatVec3Type, Origin)
+  /**
+   * @brief Setter property for Origin
+   */
+  void setOrigin(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Origin
+   * @return Value of Origin
+   */
+  FloatVec3Type getOrigin() const;
+
   Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
 
-  SIMPL_FILTER_PARAMETER(AxisAngleInput_t, CrystalSymmetryRotations)
+  /**
+   * @brief Setter property for CrystalSymmetryRotations
+   */
+  void setCrystalSymmetryRotations(const AxisAngleInput_t& value);
+  /**
+   * @brief Getter property for CrystalSymmetryRotations
+   * @return Value of CrystalSymmetryRotations
+   */
+  AxisAngleInput_t getCrystalSymmetryRotations() const;
+
   Q_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
+  /**
+   * @brief Setter property for FeatureIdsArrayPath
+   */
+  void setFeatureIdsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FeatureIdsArrayPath
+   * @return Value of FeatureIdsArrayPath
+   */
+  DataArrayPath getFeatureIdsArrayPath() const;
+
   Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, AttributeMatrixPath)
+  /**
+   * @brief Setter property for AttributeMatrixPath
+   */
+  void setAttributeMatrixPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixPath
+   * @return Value of AttributeMatrixPath
+   */
+  DataArrayPath getAttributeMatrixPath() const;
+
   Q_PROPERTY(DataArrayPath AttributeMatrixPath READ getAttributeMatrixPath WRITE setAttributeMatrixPath)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
+  /**
+   * @brief Setter property for CreatedAttributeMatrix
+   */
+  void setCreatedAttributeMatrix(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedAttributeMatrix
+   * @return Value of CreatedAttributeMatrix
+   */
+  DataArrayPath getCreatedAttributeMatrix() const;
+
   Q_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, DataContainerName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
   Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
 
-  SIMPL_FILTER_PARAMETER(int, SizeDistributionFitType)
+  /**
+   * @brief Setter property for SizeDistributionFitType
+   */
+  void setSizeDistributionFitType(int value);
+  /**
+   * @brief Getter property for SizeDistributionFitType
+   * @return Value of SizeDistributionFitType
+   */
+  int getSizeDistributionFitType() const;
+
   Q_PROPERTY(int SizeDistributionFitType READ getSizeDistributionFitType WRITE setSizeDistributionFitType)
 
-  SIMPL_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
+  /**
+   * @brief Setter property for SelectedThresholds
+   */
+  void setSelectedThresholds(const ComparisonInputs& value);
+  /**
+   * @brief Getter property for SelectedThresholds
+   * @return Value of SelectedThresholds
+   */
+  ComparisonInputs getSelectedThresholds() const;
+
   Q_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
 
-  SIMPL_FILTER_PARAMETER(QString, CalcExpression)
+  /**
+   * @brief Setter property for CalcExpression
+   */
+  void setCalcExpression(const QString& value);
+  /**
+   * @brief Getter property for CalcExpression
+   * @return Value of CalcExpression
+   */
+  QString getCalcExpression() const;
+
   Q_PROPERTY(QString CalcExpression READ getCalcExpression WRITE setCalcExpression)
 
-  SIMPL_FILTER_PARAMETER(DataArrayPath, CreatedDataArray)
+  /**
+   * @brief Setter property for CreatedDataArray
+   */
+  void setCreatedDataArray(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedDataArray
+   * @return Value of CreatedDataArray
+   */
+  DataArrayPath getCreatedDataArray() const;
+
   Q_PROPERTY(DataArrayPath CreatedDataArray READ getCreatedDataArray WRITE setCreatedDataArray)
 
-  SIMPL_FILTER_PARAMETER(bool, Bool1)
+  /**
+   * @brief Setter property for Bool1
+   */
+  void setBool1(bool value);
+  /**
+   * @brief Getter property for Bool1
+   * @return Value of Bool1
+   */
+  bool getBool1() const;
+
   Q_PROPERTY(bool Bool1 READ getBool1 WRITE setBool1)
 
-  SIMPL_FILTER_PARAMETER(double, Double2)
+  /**
+   * @brief Setter property for Double2
+   */
+  void setDouble2(double value);
+  /**
+   * @brief Getter property for Double2
+   * @return Value of Double2
+   */
+  double getDouble2() const;
+
   Q_PROPERTY(double Double2 READ getDouble2 WRITE setDouble2)
 
-  SIMPL_FILTER_PARAMETER(bool, Bool2)
+  /**
+   * @brief Setter property for Bool2
+   */
+  void setBool2(bool value);
+  /**
+   * @brief Getter property for Bool2
+   * @return Value of Bool2
+   */
+  bool getBool2() const;
+
   Q_PROPERTY(bool Bool2 READ getBool2 WRITE setBool2)
 
-  SIMPL_FILTER_PARAMETER(int, AlgorithmSelection)
+  /**
+   * @brief Setter property for AlgorithmSelection
+   */
+  void setAlgorithmSelection(int value);
+  /**
+   * @brief Getter property for AlgorithmSelection
+   * @return Value of AlgorithmSelection
+   */
+  int getAlgorithmSelection() const;
+
   Q_PROPERTY(int AlgorithmSelection READ getAlgorithmSelection WRITE setAlgorithmSelection)
 
-  SIMPL_FILTER_PARAMETER(int, DistanceMetric)
+  /**
+   * @brief Setter property for DistanceMetric
+   */
+  void setDistanceMetric(int value);
+  /**
+   * @brief Getter property for DistanceMetric
+   * @return Value of DistanceMetric
+   */
+  int getDistanceMetric() const;
+
   Q_PROPERTY(int DistanceMetric READ getDistanceMetric WRITE setDistanceMetric)
-    
-  SIMPL_FILTER_PARAMETER(MontageSelection, MontageSelection)
+
+  /**
+   * @brief Setter property for MontageSelection
+   */
+  void setMontageSelection(const MontageSelection& value);
+  /**
+   * @brief Getter property for MontageSelection
+   * @return Value of MontageSelection
+   */
+  MontageSelection getMontageSelection() const;
+
   Q_PROPERTY(MontageSelection MontageSelection READ getMontageSelection WRITE setMontageSelection)
 
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
   * @brief This method will instantiate all the end user settable options/parameters
@@ -325,5 +774,49 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   GenericExample(GenericExample&&) = delete;      // Move Constructor Not Implemented
   GenericExample& operator=(const GenericExample&) = delete; // Copy Assignment Not Implemented
   GenericExample& operator=(GenericExample&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_StlFilePrefix = {};
+  bool m_ShowPrefix = {};
+  int m_MaxIterations = {};
+  Float2ndOrderPoly_t m_SecondOrderACoeff = {};
+  Float3rdOrderPoly_t m_ThirdOrderACoeff = {};
+  Float4thOrderPoly_t m_FourthOrderACoeff = {};
+  double m_MisorientationTolerance = {};
+  DataArrayPath m_InputPhaseTypesArrayPath = {};
+  ShapeType::Types m_ShapeTypeData = {};
+  int m_PhaseCount = {};
+  FPRangePair m_InitRange = {};
+  QString m_EstimatedPrimaryFeatures = {};
+  QString m_InputFile = {};
+  FileListInfo_t m_InputFileListInfo = {};
+  QString m_SelectedXCoordArrayName = {};
+  QStringList m_DataArrayList = {};
+  DataArrayPath m_CreatedDataContainer = {};
+  DataContainerArrayProxy m_DcaProxy = {};
+  QString m_InputPath = {};
+  QString m_OutputFile = {};
+  QString m_OutputPath = {};
+  QVector<DataArrayPath> m_SelectedMultiArrayPaths = {};
+  bool m_WriteAlignmentShifts = {};
+  int m_ConversionType = {};
+  IntVec3Type m_Dimensions = {};
+  IntVec2Type m_Range = {};
+  FloatVec3Type m_Origin = {};
+  AxisAngleInput_t m_CrystalSymmetryRotations = {};
+  DataArrayPath m_FeatureIdsArrayPath = {};
+  DataArrayPath m_AttributeMatrixPath = {};
+  DataArrayPath m_CreatedAttributeMatrix = {};
+  DataArrayPath m_DataContainerName = {};
+  int m_SizeDistributionFitType = {};
+  ComparisonInputs m_SelectedThresholds = {};
+  QString m_CalcExpression = {};
+  DataArrayPath m_CreatedDataArray = {};
+  bool m_Bool1 = {};
+  double m_Double2 = {};
+  bool m_Bool2 = {};
+  int m_AlgorithmSelection = {};
+  int m_DistanceMetric = {};
+  MontageSelection m_MontageSelection = {};
 };
 
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index f18409e9d6..ac312d52cc 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -33,16 +33,19 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "MakeDataContainer.h"
 
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -225,7 +228,7 @@ AbstractFilter::Pointer MakeDataContainer::newFilterInstance(bool copyFilterPara
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MakeDataContainer::getCompiledLibraryName() const
+QString MakeDataContainer::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -233,7 +236,7 @@ const QString MakeDataContainer::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MakeDataContainer::getGroupName() const
+QString MakeDataContainer::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -241,7 +244,7 @@ const QString MakeDataContainer::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid MakeDataContainer::getUuid()
+QUuid MakeDataContainer::getUuid() const
 {
   return QUuid("{9df9906c-1db6-5ecf-a85c-c4ef1a484c05}");
 }
@@ -249,7 +252,7 @@ const QUuid MakeDataContainer::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MakeDataContainer::getSubGroupName() const
+QString MakeDataContainer::getSubGroupName() const
 {
   return "Test";
 }
@@ -257,7 +260,156 @@ const QString MakeDataContainer::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString MakeDataContainer::getHumanLabel() const
+QString MakeDataContainer::getHumanLabel() const
 {
   return "Make DataContainer";
 }
+
+// -----------------------------------------------------------------------------
+MakeDataContainer::Pointer MakeDataContainer::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<MakeDataContainer> MakeDataContainer::New()
+{
+  struct make_shared_enabler : public MakeDataContainer
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getNameOfClass() const
+{
+  return QString("MakeDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::ClassName()
+{
+  return QString("MakeDataContainer");
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setDataContainerName(const QString& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setCellEnsembleAttributeMatrixName(const QString& value)
+{
+  m_CellEnsembleAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getCellEnsembleAttributeMatrixName() const
+{
+  return m_CellEnsembleAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setCellAttributeMatrixName(const QString& value)
+{
+  m_CellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getCellAttributeMatrixName() const
+{
+  return m_CellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setPhaseNameArrayName(const QString& value)
+{
+  m_PhaseNameArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getPhaseNameArrayName() const
+{
+  return m_PhaseNameArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setMaterialNameArrayName(const QString& value)
+{
+  m_MaterialNameArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getMaterialNameArrayName() const
+{
+  return m_MaterialNameArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setFeatureIdsArrayName(const QString& value)
+{
+  m_FeatureIdsArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getFeatureIdsArrayName() const
+{
+  return m_FeatureIdsArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setCellEulerAnglesArrayName(const QString& value)
+{
+  m_CellEulerAnglesArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getCellEulerAnglesArrayName() const
+{
+  return m_CellEulerAnglesArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setCellPhasesArrayName(const QString& value)
+{
+  m_CellPhasesArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getCellPhasesArrayName() const
+{
+  return m_CellPhasesArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setCrystalStructuresArrayName(const QString& value)
+{
+  m_CrystalStructuresArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getCrystalStructuresArrayName() const
+{
+  return m_CrystalStructuresArrayName;
+}
+
+// -----------------------------------------------------------------------------
+void MakeDataContainer::setLatticeConstantsArrayName(const QString& value)
+{
+  m_LatticeConstantsArrayName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MakeDataContainer::getLatticeConstantsArrayName() const
+{
+  return m_LatticeConstantsArrayName;
+}
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index e05d93f90e..4a3549b2ee 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -34,11 +34,13 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
 * @class ReadOrientationData ReadOrientationData.h /FilterCategoryFilters/ReadOrientationData.h
@@ -50,54 +52,176 @@
 class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(MakeDataContainer SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(MakeDataContainer)
+  PYB11_FILTER_NEW_MACRO(MakeDataContainer)
+  PYB11_FILTER_PARAMETER(QString, FeatureIdsArrayName)
+  PYB11_FILTER_PARAMETER(QString, CellEulerAnglesArrayName)
+  PYB11_FILTER_PARAMETER(QString, CellPhasesArrayName)
+  PYB11_FILTER_PARAMETER(QString, CrystalStructuresArrayName)
+  PYB11_FILTER_PARAMETER(QString, LatticeConstantsArrayName)
   PYB11_PROPERTY(QString FeatureIdsArrayName READ getFeatureIdsArrayName WRITE setFeatureIdsArrayName)
   PYB11_PROPERTY(QString CellEulerAnglesArrayName READ getCellEulerAnglesArrayName WRITE setCellEulerAnglesArrayName)
   PYB11_PROPERTY(QString CellPhasesArrayName READ getCellPhasesArrayName WRITE setCellPhasesArrayName)
   PYB11_PROPERTY(QString CrystalStructuresArrayName READ getCrystalStructuresArrayName WRITE setCrystalStructuresArrayName)
   PYB11_PROPERTY(QString LatticeConstantsArrayName READ getLatticeConstantsArrayName WRITE setLatticeConstantsArrayName)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(MakeDataContainer)
-  SIMPL_FILTER_NEW_MACRO(MakeDataContainer)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(MakeDataContainer, AbstractFilter)
+  using Self = MakeDataContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for MakeDataContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MakeDataContainer
+   */
+  static QString ClassName();
 
   ~MakeDataContainer() override;
-  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-  SIMPL_INSTANCE_STRING_PROPERTY(CellEnsembleAttributeMatrixName)
-  SIMPL_INSTANCE_STRING_PROPERTY(CellAttributeMatrixName)
-  SIMPL_INSTANCE_STRING_PROPERTY(PhaseNameArrayName)
-  SIMPL_INSTANCE_STRING_PROPERTY(MaterialNameArrayName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const QString& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  QString getDataContainerName() const;
+
+  /**
+   * @brief Setter property for CellEnsembleAttributeMatrixName
+   */
+  void setCellEnsembleAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CellEnsembleAttributeMatrixName
+   * @return Value of CellEnsembleAttributeMatrixName
+   */
+  QString getCellEnsembleAttributeMatrixName() const;
+
+  /**
+   * @brief Setter property for CellAttributeMatrixName
+   */
+  void setCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CellAttributeMatrixName
+   * @return Value of CellAttributeMatrixName
+   */
+  QString getCellAttributeMatrixName() const;
+
+  /**
+   * @brief Setter property for PhaseNameArrayName
+   */
+  void setPhaseNameArrayName(const QString& value);
+  /**
+   * @brief Getter property for PhaseNameArrayName
+   * @return Value of PhaseNameArrayName
+   */
+  QString getPhaseNameArrayName() const;
+
+  /**
+   * @brief Setter property for MaterialNameArrayName
+   */
+  void setMaterialNameArrayName(const QString& value);
+  /**
+   * @brief Getter property for MaterialNameArrayName
+   * @return Value of MaterialNameArrayName
+   */
+  QString getMaterialNameArrayName() const;
 
   /**
   * @brief This returns the group that the filter belonds to. You can select
   * a different group if you want. The string returned here will be displayed
   * in the GUI for the filter
   */
-  SIMPL_FILTER_PARAMETER(QString, FeatureIdsArrayName)
+  /**
+   * @brief Setter property for FeatureIdsArrayName
+   */
+  void setFeatureIdsArrayName(const QString& value);
+  /**
+   * @brief Getter property for FeatureIdsArrayName
+   * @return Value of FeatureIdsArrayName
+   */
+  QString getFeatureIdsArrayName() const;
+
   Q_PROPERTY(QString FeatureIdsArrayName READ getFeatureIdsArrayName WRITE setFeatureIdsArrayName)
 
-  SIMPL_FILTER_PARAMETER(QString, CellEulerAnglesArrayName)
+  /**
+   * @brief Setter property for CellEulerAnglesArrayName
+   */
+  void setCellEulerAnglesArrayName(const QString& value);
+  /**
+   * @brief Getter property for CellEulerAnglesArrayName
+   * @return Value of CellEulerAnglesArrayName
+   */
+  QString getCellEulerAnglesArrayName() const;
+
   Q_PROPERTY(QString CellEulerAnglesArrayName READ getCellEulerAnglesArrayName WRITE setCellEulerAnglesArrayName)
 
-  SIMPL_FILTER_PARAMETER(QString, CellPhasesArrayName)
+  /**
+   * @brief Setter property for CellPhasesArrayName
+   */
+  void setCellPhasesArrayName(const QString& value);
+  /**
+   * @brief Getter property for CellPhasesArrayName
+   * @return Value of CellPhasesArrayName
+   */
+  QString getCellPhasesArrayName() const;
+
   Q_PROPERTY(QString CellPhasesArrayName READ getCellPhasesArrayName WRITE setCellPhasesArrayName)
 
-  SIMPL_FILTER_PARAMETER(QString, CrystalStructuresArrayName)
+  /**
+   * @brief Setter property for CrystalStructuresArrayName
+   */
+  void setCrystalStructuresArrayName(const QString& value);
+  /**
+   * @brief Getter property for CrystalStructuresArrayName
+   * @return Value of CrystalStructuresArrayName
+   */
+  QString getCrystalStructuresArrayName() const;
+
   Q_PROPERTY(QString CrystalStructuresArrayName READ getCrystalStructuresArrayName WRITE setCrystalStructuresArrayName)
 
-  SIMPL_FILTER_PARAMETER(QString, LatticeConstantsArrayName)
+  /**
+   * @brief Setter property for LatticeConstantsArrayName
+   */
+  void setLatticeConstantsArrayName(const QString& value);
+  /**
+   * @brief Getter property for LatticeConstantsArrayName
+   * @return Value of LatticeConstantsArrayName
+   */
+  QString getLatticeConstantsArrayName() const;
+
   Q_PROPERTY(QString LatticeConstantsArrayName READ getLatticeConstantsArrayName WRITE setLatticeConstantsArrayName)
 
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
   * @brief This method will instantiate all the end user settable options/parameters
@@ -107,13 +231,13 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
 *@brief This returns a string that is displayed in the GUI and helps to sort the filters into
 *a subgroup. It should be readable and understandable by humans.
 */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
   * @brief This method will read the options from a file
@@ -152,11 +276,27 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   void initialize();
 
 private:
-  DEFINE_DATAARRAY_VARIABLE(int32_t, FeatureIds)
-  DEFINE_DATAARRAY_VARIABLE(int32_t, CellPhases)
-  DEFINE_DATAARRAY_VARIABLE(float, CellEulerAngles)
-  DEFINE_DATAARRAY_VARIABLE(uint32_t, CrystalStructures)
-  DEFINE_DATAARRAY_VARIABLE(float, LatticeConstants)
+  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+  int32_t* m_FeatureIds = nullptr;
+  std::weak_ptr<DataArray<int32_t>> m_CellPhasesPtr;
+  int32_t* m_CellPhases = nullptr;
+  std::weak_ptr<DataArray<float>> m_CellEulerAnglesPtr;
+  float* m_CellEulerAngles = nullptr;
+  std::weak_ptr<DataArray<uint32_t>> m_CrystalStructuresPtr;
+  uint32_t* m_CrystalStructures = nullptr;
+  std::weak_ptr<DataArray<float>> m_LatticeConstantsPtr;
+  float* m_LatticeConstants = nullptr;
+
+  QString m_DataContainerName = {};
+  QString m_CellEnsembleAttributeMatrixName = {};
+  QString m_CellAttributeMatrixName = {};
+  QString m_PhaseNameArrayName = {};
+  QString m_MaterialNameArrayName = {};
+  QString m_FeatureIdsArrayName = {};
+  QString m_CellEulerAnglesArrayName = {};
+  QString m_CellPhasesArrayName = {};
+  QString m_CrystalStructuresArrayName = {};
+  QString m_LatticeConstantsArrayName = {};
 
 public:
   MakeDataContainer(const MakeDataContainer&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index eba289ac98..479e54433e 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -33,9 +33,13 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <memory>
+
 #include "ThresholdExample.h"
 
 #include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -207,7 +211,7 @@ AbstractFilter::Pointer ThresholdExample::newFilterInstance(bool copyFilterParam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ThresholdExample::getCompiledLibraryName() const
+QString ThresholdExample::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
@@ -215,7 +219,7 @@ const QString ThresholdExample::getCompiledLibraryName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ThresholdExample::getGroupName() const
+QString ThresholdExample::getGroupName() const
 {
   return SIMPL::FilterGroups::Generic;
 }
@@ -223,7 +227,7 @@ const QString ThresholdExample::getGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QUuid ThresholdExample::getUuid()
+QUuid ThresholdExample::getUuid() const
 {
   return QUuid("{bd013013-ba0f-52be-a7b7-187665c92a9e}");
 }
@@ -231,7 +235,7 @@ const QUuid ThresholdExample::getUuid()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ThresholdExample::getSubGroupName() const
+QString ThresholdExample::getSubGroupName() const
 {
   return "Test";
 }
@@ -239,7 +243,72 @@ const QString ThresholdExample::getSubGroupName() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const QString ThresholdExample::getHumanLabel() const
+QString ThresholdExample::getHumanLabel() const
 {
   return "Threshold Example";
 }
+
+// -----------------------------------------------------------------------------
+ThresholdExample::Pointer ThresholdExample::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<ThresholdExample> ThresholdExample::New()
+{
+  struct make_shared_enabler : public ThresholdExample
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString ThresholdExample::getNameOfClass() const
+{
+  return QString("ThresholdExample");
+}
+
+// -----------------------------------------------------------------------------
+QString ThresholdExample::ClassName()
+{
+  return QString("ThresholdExample");
+}
+
+// -----------------------------------------------------------------------------
+void ThresholdExample::setDataContainerName(const QString& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ThresholdExample::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void ThresholdExample::setCellAttributeMatrixName(const QString& value)
+{
+  m_CellAttributeMatrixName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString ThresholdExample::getCellAttributeMatrixName() const
+{
+  return m_CellAttributeMatrixName;
+}
+
+// -----------------------------------------------------------------------------
+void ThresholdExample::setCellComparisonInputs(const ComparisonInputs& value)
+{
+  m_CellComparisonInputs = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonInputs ThresholdExample::getCellComparisonInputs() const
+{
+  return m_CellComparisonInputs;
+}
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index 3431874ee0..6926d5d0d5 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -35,13 +35,14 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @class ThresholdExample ThresholdExample.h ExamplePlugin/Code/ExamplePluginFilters/ThresholdExample.h
@@ -53,23 +54,78 @@
 class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
 {
   Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(ThresholdExample SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(ThresholdExample)
+  PYB11_FILTER_NEW_MACRO(ThresholdExample)
+  PYB11_FILTER_PARAMETER(ComparisonInputs, CellComparisonInputs)
   PYB11_PROPERTY(ComparisonInputs CellComparisonInputs READ getCellComparisonInputs WRITE setCellComparisonInputs)
+#endif
 
 public:
-  SIMPL_SHARED_POINTERS(ThresholdExample)
-  SIMPL_FILTER_NEW_MACRO(ThresholdExample)
-  SIMPL_TYPE_MACRO_SUPER_OVERRIDE(ThresholdExample, AbstractFilter)
+  using Self = ThresholdExample;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ThresholdExample
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ThresholdExample
+   */
+  static QString ClassName();
 
   ~ThresholdExample() override;
-  SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-  SIMPL_INSTANCE_STRING_PROPERTY(CellAttributeMatrixName)
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const QString& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  QString getDataContainerName() const;
+
+  /**
+   * @brief Setter property for CellAttributeMatrixName
+   */
+  void setCellAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CellAttributeMatrixName
+   * @return Value of CellAttributeMatrixName
+   */
+  QString getCellAttributeMatrixName() const;
 
   /* Place your input parameters here. You can use some of the DREAM3D Macros if you want to */
 
   // -----------------------------------------------------------------------------
   /* Each Filter can ONLY have ONE of each of these types of widgets */
-  SIMPL_FILTER_PARAMETER(ComparisonInputs, CellComparisonInputs)
+  /**
+   * @brief Setter property for CellComparisonInputs
+   */
+  void setCellComparisonInputs(const ComparisonInputs& value);
+  /**
+   * @brief Getter property for CellComparisonInputs
+   * @return Value of CellComparisonInputs
+   */
+  ComparisonInputs getCellComparisonInputs() const;
+
   Q_PROPERTY(ComparisonInputs CellComparisonInputs READ getCellComparisonInputs WRITE setCellComparisonInputs)
 
   /**
@@ -77,27 +133,27 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   * a different group if you want. The string returned here will be displayed
   * in the GUI for the filter
   */
-  const QString getCompiledLibraryName() const override;
+  QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-  const QString getGroupName() const override;
+  QString getGroupName() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI. It should be readable
   * and understandable by humans.
   */
-  const QString getHumanLabel() const override;
+  QString getHumanLabel() const override;
 
   /**
   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
   * a subgroup. It should be readable and understandable by humans.
   */
-  const QString getSubGroupName() const override;
+  QString getSubGroupName() const override;
 
   /**
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  const QUuid getUuid() override;
+  QUuid getUuid() const override;
 
   /**
   * @brief This method will instantiate all the end user settable options/parameters
@@ -146,5 +202,10 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   ThresholdExample(ThresholdExample&&) = delete;      // Move Constructor Not Implemented
   ThresholdExample& operator=(const ThresholdExample&) = delete; // Copy Assignment Not Implemented
   ThresholdExample& operator=(ThresholdExample&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_DataContainerName = {};
+  QString m_CellAttributeMatrixName = {};
+  ComparisonInputs m_CellComparisonInputs = {};
 };
 
diff --git a/Source/SIMPLib/Utilities/ColorTable.cpp b/Source/SIMPLib/Utilities/ColorTable.cpp
index 620fad0bf4..bb445ddb1b 100644
--- a/Source/SIMPLib/Utilities/ColorTable.cpp
+++ b/Source/SIMPLib/Utilities/ColorTable.cpp
@@ -40,8 +40,6 @@
 
 #include <QtCore/QJsonArray>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Utilities/MontageSelection.h b/Source/SIMPLib/Utilities/MontageSelection.h
index 85f4a7dbd6..d36136b45f 100644
--- a/Source/SIMPLib/Utilities/MontageSelection.h
+++ b/Source/SIMPLib/Utilities/MontageSelection.h
@@ -38,7 +38,6 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 
 /**
@@ -50,6 +49,8 @@
  */
 class SIMPLib_EXPORT MontageSelection
 {
+
+#ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(MontageSelection)
   PYB11_STATIC_CREATION(Create ARGS std::string std::string int int int int int)
   PYB11_PROPERTY(QString Prefix READ getPrefix WRITE setPrefix)
@@ -59,6 +60,7 @@ class SIMPLib_EXPORT MontageSelection
   PYB11_PROPERTY(int RowEnd READ getRowEnd WRITE setRowEnd)
   PYB11_PROPERTY(int ColStart READ getColStart WRITE setColStart)
   PYB11_PROPERTY(int ColEnd READ getColEnd WRITE setColEnd)
+#endif
 
 public:
   MontageSelection();
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
index a7cd12e7b3..03b2fc9d02 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
@@ -34,6 +34,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Utilities/PythonSupport.cpp b/Source/SIMPLib/Utilities/PythonSupport.cpp
index 5877c61d04..b72c06a8a0 100644
--- a/Source/SIMPLib/Utilities/PythonSupport.cpp
+++ b/Source/SIMPLib/Utilities/PythonSupport.cpp
@@ -29,6 +29,8 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "PythonSupport.h"
 
 PythonSupport::PythonSupport() = default;
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
index 3b4707dda9..e8c11fb450 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
@@ -118,3 +118,9 @@ void SIMPLDataPathValidator::setSIMPLDataDirectory(const QString &path)
 
   emit dataDirectoryChanged(path);
 }
+
+// -----------------------------------------------------------------------------
+QString SIMPLDataPathValidator::getSIMPLDataDirectory() const
+{
+  return m_SIMPLDataDirectory;
+}
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
index 93872e0e68..92b660d740 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
@@ -32,9 +32,10 @@
 
 #pragma once
 
-#include "SIMPLib/SIMPLib.h"
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The SIMPLDataPathValidator class
@@ -48,7 +49,11 @@ class SIMPLib_EXPORT SIMPLDataPathValidator : public QObject
 
     static SIMPLDataPathValidator* Instance();
 
-    SIMPL_GET_PROPERTY(QString, SIMPLDataDirectory)
+    /**
+     * @brief Getter property for SIMPLDataDirectory
+     * @return Value of SIMPLDataDirectory
+     */
+    QString getSIMPLDataDirectory() const;
 
     /**
      * @brief setSIMPLDataDirectory
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 47f99d05ea..7e241cabc6 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -34,10 +34,14 @@
 
 #include <sstream>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/IObserver.h"
+
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
@@ -359,3 +363,16 @@ void SIMPLH5DataReader::setErrorCondition(int code, const QString& str)
 {
   emit errorGenerated(Title, str, code);
 }
+
+// -----------------------------------------------------------------------------
+SIMPLH5DataReader::Pointer SIMPLH5DataReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+SIMPLH5DataReader::Pointer SIMPLH5DataReader::New()
+{
+  Pointer sharedPtr(new(SIMPLH5DataReader));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index 64caa244b2..941402cdd7 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -31,9 +31,10 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <memory>
+
 #include <hdf5.h>
 
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
@@ -50,15 +51,26 @@ using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
 {
     Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(SIMPLH5DataReader)
+    PYB11_SHARED_POINTERS(SIMPLH5DataReader)
+    PYB11_STATIC_NEW_MACRO(SIMPLH5DataReader)
 
     PYB11_METHOD(bool openFile ARGS filePath)
     PYB11_METHOD(bool closeFile)
     PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS SIMPLH5DataReaderRequirements err)
-    
+#endif
+
   public:
-    SIMPL_SHARED_POINTERS(SIMPLH5DataReader)
-    SIMPL_STATIC_NEW_MACRO(SIMPLH5DataReader)
+    using Self = SIMPLH5DataReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
 
     SIMPLH5DataReader();
     ~SIMPLH5DataReader() override;
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
index d4e5847e0e..902ba45b2c 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
@@ -69,3 +69,51 @@ SIMPLH5DataReaderRequirements::SIMPLH5DataReaderRequirements(const QString &prim
 //
 // -----------------------------------------------------------------------------
 SIMPLH5DataReaderRequirements::~SIMPLH5DataReaderRequirements() = default;
+
+// -----------------------------------------------------------------------------
+void SIMPLH5DataReaderRequirements::setDCGeometryTypes(const IGeometry::Types& value)
+{
+  m_DCGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+IGeometry::Types SIMPLH5DataReaderRequirements::getDCGeometryTypes() const
+{
+  return m_DCGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+void SIMPLH5DataReaderRequirements::setAMTypes(const AttributeMatrix::Types& value)
+{
+  m_AMTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Types SIMPLH5DataReaderRequirements::getAMTypes() const
+{
+  return m_AMTypes;
+}
+
+// -----------------------------------------------------------------------------
+void SIMPLH5DataReaderRequirements::setDATypes(const QVector<QString>& value)
+{
+  m_DATypes = value;
+}
+
+// -----------------------------------------------------------------------------
+QVector<QString> SIMPLH5DataReaderRequirements::getDATypes() const
+{
+  return m_DATypes;
+}
+
+// -----------------------------------------------------------------------------
+void SIMPLH5DataReaderRequirements::setComponentDimensions(const SIMPLH5DataReaderRequirements::QVectorSizeT& value)
+{
+  m_ComponentDimensions = value;
+}
+
+// -----------------------------------------------------------------------------
+SIMPLH5DataReaderRequirements::QVectorSizeT SIMPLH5DataReaderRequirements::getComponentDimensions() const
+{
+  return m_ComponentDimensions;
+}
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
index 8b161942e0..d74f717c8c 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
@@ -34,9 +34,8 @@
 
 #include <vector>
 
-#include "SIMPLib/SIMPLib.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
@@ -46,23 +45,63 @@
 class SIMPLib_EXPORT SIMPLH5DataReaderRequirements
 {
 
-    PYB11_CREATE_BINDINGS(SIMPLH5DataReaderRequirements)
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(SIMPLH5DataReaderRequirements)
+#endif
+
+public:
+  SIMPLH5DataReaderRequirements();
+  SIMPLH5DataReaderRequirements(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
+
+  virtual ~SIMPLH5DataReaderRequirements();
+
+  using QVectorSizeT = std::vector<std::vector<size_t>>;
 
-  public:
-    SIMPLH5DataReaderRequirements();
-    SIMPLH5DataReaderRequirements(const QString &primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
-    
-    virtual ~SIMPLH5DataReaderRequirements();
+  /**
+   * @brief Setter property for DCGeometryTypes
+   */
+  void setDCGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DCGeometryTypes
+   * @return Value of DCGeometryTypes
+   */
+  IGeometry::Types getDCGeometryTypes() const;
 
-    using QVectorSizeT = std::vector<std::vector<size_t>>;
+  /**
+   * @brief Setter property for AMTypes
+   */
+  void setAMTypes(const AttributeMatrix::Types& value);
+  /**
+   * @brief Getter property for AMTypes
+   * @return Value of AMTypes
+   */
+  AttributeMatrix::Types getAMTypes() const;
 
-    SIMPL_INSTANCE_PROPERTY(IGeometry::Types, DCGeometryTypes)
-    SIMPL_INSTANCE_PROPERTY(AttributeMatrix::Types, AMTypes)
-    SIMPL_INSTANCE_PROPERTY(QVector<QString>, DATypes)
-    SIMPL_INSTANCE_PROPERTY(SIMPLH5DataReaderRequirements::QVectorSizeT, ComponentDimensions)
+  /**
+   * @brief Setter property for DATypes
+   */
+  void setDATypes(const QVector<QString>& value);
+  /**
+   * @brief Getter property for DATypes
+   * @return Value of DATypes
+   */
+  QVector<QString> getDATypes() const;
 
-  private:
+  /**
+   * @brief Setter property for ComponentDimensions
+   */
+  void setComponentDimensions(const SIMPLH5DataReaderRequirements::QVectorSizeT& value);
+  /**
+   * @brief Getter property for ComponentDimensions
+   * @return Value of ComponentDimensions
+   */
+  SIMPLH5DataReaderRequirements::QVectorSizeT getComponentDimensions() const;
 
+private:
+  IGeometry::Types m_DCGeometryTypes = {};
+  AttributeMatrix::Types m_AMTypes = {};
+  QVector<QString> m_DATypes = {};
+  SIMPLH5DataReaderRequirements::QVectorSizeT m_ComponentDimensions = {};
 };
 
 
diff --git a/Source/SIMPLib/Utilities/TestObserver.cpp b/Source/SIMPLib/Utilities/TestObserver.cpp
index 0597bf6490..f0503b24e6 100644
--- a/Source/SIMPLib/Utilities/TestObserver.cpp
+++ b/Source/SIMPLib/Utilities/TestObserver.cpp
@@ -50,3 +50,15 @@ void TestObserver::processPipelineMessage(const AbstractMessage::Pointer& pm)
 {
   std::cout << pm->generateMessageString().toStdString() << std::endl;
 }
+
+// -----------------------------------------------------------------------------
+QString TestObserver::getNameOfClass() const
+{
+  return QString("TestObserver");
+}
+
+// -----------------------------------------------------------------------------
+QString TestObserver::ClassName()
+{
+  return QString("TestObserver");
+}
diff --git a/Source/SIMPLib/Utilities/TestObserver.h b/Source/SIMPLib/Utilities/TestObserver.h
index 75fdcdc67b..60c0d6058b 100755
--- a/Source/SIMPLib/Utilities/TestObserver.h
+++ b/Source/SIMPLib/Utilities/TestObserver.h
@@ -34,7 +34,6 @@
 #include <QtCore/QObject>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/IObserver.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
 
@@ -44,7 +43,15 @@ class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
 
   public:
     TestObserver();
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(TestObserver, IObserver)
+    /**
+     * @brief Returns the name of the class for TestObserver
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for TestObserver
+     */
+    static QString ClassName();
+
     ~TestObserver() override;
 
  public slots:
@@ -55,6 +62,8 @@ class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
    TestObserver(TestObserver&&) = delete;                 // Move Constructor Not Implemented
    TestObserver& operator=(const TestObserver&) = delete; // Copy Assignment Not Implemented
    TestObserver& operator=(TestObserver&&) = delete;      // Move Assignment Not Implemented
+
+ private:
 };
 
 
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index fcd1b411fe..aad536f348 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -32,6 +32,8 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "VTKFileReader.h"
 
 #include <cstring>
@@ -42,8 +44,13 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QFile>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Geometry/ImageGeom.h"
+
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define kBufferSize 1024
 
@@ -296,3 +303,92 @@ int VTKFileReader::readHeader()
 
   return err;
 }
+
+// -----------------------------------------------------------------------------
+VTKFileReader::Pointer VTKFileReader::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::getNameOfClass() const
+{
+  return QString("VTKFileReader");
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::ClassName()
+{
+  return QString("VTKFileReader");
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<VTKFileReader> VTKFileReader::New()
+{
+  struct make_shared_enabler : public VTKFileReader
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+void VTKFileReader::setDataContainerName(const QString& value)
+{
+  m_DataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::getDataContainerName() const
+{
+  return m_DataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void VTKFileReader::setInputFile(const QString& value)
+{
+  m_InputFile = value;
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::getInputFile() const
+{
+  return m_InputFile;
+}
+
+// -----------------------------------------------------------------------------
+void VTKFileReader::setComment(const QString& value)
+{
+  m_Comment = value;
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::getComment() const
+{
+  return m_Comment;
+}
+
+// -----------------------------------------------------------------------------
+void VTKFileReader::setDatasetType(const QString& value)
+{
+  m_DatasetType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString VTKFileReader::getDatasetType() const
+{
+  return m_DatasetType;
+}
+
+// -----------------------------------------------------------------------------
+void VTKFileReader::setFileIsBinary(bool value)
+{
+  m_FileIsBinary = value;
+}
+
+// -----------------------------------------------------------------------------
+bool VTKFileReader::getFileIsBinary() const
+{
+  return m_FileIsBinary;
+}
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
index 9f07035b31..e7440fa226 100755
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -36,12 +36,15 @@
 
 #pragma once
 
+#include <memory>
+
 #include <fstream>
 
+#include <QtCore/QDebug>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/CoreFilters/FileReader.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @class VTKFileReader VTKFileReader.h PathToHeader/VTKFileReader.h
@@ -87,31 +90,88 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
 {
     Q_OBJECT
   public:
-    SIMPL_SHARED_POINTERS(VTKFileReader)
-     SIMPL_TYPE_MACRO_SUPER_OVERRIDE(VTKFileReader, FileReader)
-     SIMPL_FILTER_NEW_MACRO(VTKFileReader)
-
-     ~VTKFileReader() override;
-
-     SIMPL_INSTANCE_STRING_PROPERTY(DataContainerName)
-
-     SIMPL_INSTANCE_STRING_PROPERTY(InputFile)
-     SIMPL_INSTANCE_STRING_PROPERTY(Comment)
-     SIMPL_INSTANCE_STRING_PROPERTY(DatasetType)
-     SIMPL_INSTANCE_PROPERTY(bool, FileIsBinary)
-
-     /**
-      * @brief Reads the VTK header and sets the values that are described in the header
-      * @return Error Condition. Negative is Error.
-      */
-     int readHeader() override;
-
-     /**
-      * @brief This method should be re-implemented in a subclass
-      */
-     int readFile() override
-     {
-       return -1;
+    using Self = VTKFileReader;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    /**
+     * @brief Returns the name of the class for VTKFileReader
+     */
+    QString getNameOfClass() const override;
+    /**
+     * @brief Returns the name of the class for VTKFileReader
+     */
+    static QString ClassName();
+
+    static std::shared_ptr<VTKFileReader> New();
+
+    ~VTKFileReader() override;
+
+    /**
+     * @brief Setter property for DataContainerName
+     */
+    void setDataContainerName(const QString& value);
+    /**
+     * @brief Getter property for DataContainerName
+     * @return Value of DataContainerName
+     */
+    QString getDataContainerName() const;
+
+    /**
+     * @brief Setter property for InputFile
+     */
+    void setInputFile(const QString& value);
+    /**
+     * @brief Getter property for InputFile
+     * @return Value of InputFile
+     */
+    QString getInputFile() const;
+
+    /**
+     * @brief Setter property for Comment
+     */
+    void setComment(const QString& value);
+    /**
+     * @brief Getter property for Comment
+     * @return Value of Comment
+     */
+    QString getComment() const;
+
+    /**
+     * @brief Setter property for DatasetType
+     */
+    void setDatasetType(const QString& value);
+    /**
+     * @brief Getter property for DatasetType
+     * @return Value of DatasetType
+     */
+    QString getDatasetType() const;
+
+    /**
+     * @brief Setter property for FileIsBinary
+     */
+    void setFileIsBinary(bool value);
+    /**
+     * @brief Getter property for FileIsBinary
+     * @return Value of FileIsBinary
+     */
+    bool getFileIsBinary() const;
+
+    /**
+     * @brief Reads the VTK header and sets the values that are described in the header
+     * @return Error Condition. Negative is Error.
+     */
+    int readHeader() override;
+
+    /**
+     * @brief This method should be re-implemented in a subclass
+     */
+    int readFile() override
+    {
+      return -1;
     }
 
     /**
@@ -218,6 +278,13 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
     VTKFileReader(VTKFileReader&&) = delete;       // Move Constructor Not Implemented
     VTKFileReader& operator=(const VTKFileReader&) = delete; // Copy Assignment Not Implemented
     VTKFileReader& operator=(VTKFileReader&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_DataContainerName = {};
+    QString m_InputFile = {};
+    QString m_Comment = {};
+    QString m_DatasetType = {};
+    bool m_FileIsBinary = {};
 };
 
 
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
index 5c0d8f449f..55335f8dd9 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
@@ -37,6 +37,8 @@
 
 #include "PipelineFilterWidgetFactory.hpp"
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 
 #include "SVWidgetsLib/FilterWidgetHeaders.h"
@@ -128,3 +130,15 @@ QWidget* FilterWidgetManager::createWidget(FilterParameter* parameter, AbstractF
   UnknownWidget* unknownWidget = new UnknownWidget(parameter, filter, parent);
   return unknownWidget;
 }
+
+// -----------------------------------------------------------------------------
+QString FilterWidgetManager::getNameOfClass() const
+{
+  return QString("FilterWidgetManager");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterWidgetManager::ClassName()
+{
+  return QString("FilterWidgetManager");
+}
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.h b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
index a866be4ae3..8188e8c7eb 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.h
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
@@ -39,7 +39,6 @@
 #include <QtCore/QString>
 #include <QtCore/QMap>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Core/IFilterWidgetFactory.h"
@@ -57,7 +56,14 @@ class SVWidgetsLib_EXPORT FilterWidgetManager
 {
   public:
     //SIMPL_SHARED_POINTERS(FilterWidgetManager)
-    SIMPL_TYPE_MACRO(FilterWidgetManager)
+    /**
+     * @brief Returns the name of the class for FilterWidgetManager
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for FilterWidgetManager
+     */
+    static QString ClassName();
 
     virtual ~FilterWidgetManager();
 
@@ -106,7 +112,6 @@ class SVWidgetsLib_EXPORT FilterWidgetManager
     FilterWidgetManager();
 
   private:
-
     Collection m_Factories;
 
     static FilterWidgetManager* self;
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
index 157e7eac1c..22caf1481d 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
@@ -37,6 +37,8 @@
 
 #include <QtWidgets/QWidget>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 // -----------------------------------------------------------------------------
@@ -60,3 +62,21 @@ QWidget* IFilterWidgetFactory::createWidget(FilterParameter* parameter, Abstract
   Q_ASSERT(false);
   return nullptr;
 }
+
+// -----------------------------------------------------------------------------
+IFilterWidgetFactory::Pointer IFilterWidgetFactory::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+QString IFilterWidgetFactory::getNameOfClass() const
+{
+  return QString("IFilterWidgetFactory");
+}
+
+// -----------------------------------------------------------------------------
+QString IFilterWidgetFactory::ClassName()
+{
+  return QString("IFilterWidgetFactory");
+}
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
index 75a5eb6559..b52df37b9c 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
@@ -37,7 +37,8 @@
 #pragma once
 
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <memory>
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -53,9 +54,21 @@ class QWidget;
 class SVWidgetsLib_EXPORT IFilterWidgetFactory
 {
   public:
-    SIMPL_SHARED_POINTERS(IFilterWidgetFactory)
-    SIMPL_TYPE_MACRO(IFilterWidgetFactory)
+    using Self = IFilterWidgetFactory;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
 
+    /**
+     * @brief Returns the name of the class for IFilterWidgetFactory
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for IFilterWidgetFactory
+     */
+    static QString ClassName();
 
     virtual ~IFilterWidgetFactory();
 
@@ -79,6 +92,8 @@ class SVWidgetsLib_EXPORT IFilterWidgetFactory
     IFilterWidgetFactory(IFilterWidgetFactory&&) = delete;      // Move Constructor Not Implemented
     IFilterWidgetFactory& operator=(const IFilterWidgetFactory&) = delete; // Copy Assignment Not Implemented
     IFilterWidgetFactory& operator=(IFilterWidgetFactory&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
index 6a48765a26..3e6fa508fc 100644
--- a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
+++ b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
@@ -1,77 +1,103 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SVWidgetsLib/Core/IFilterWidgetFactory.h"
 
-
 template <class Widget>
 class PipelineFilterWidgetFactory : public IFilterWidgetFactory
 {
-  public:
-    SIMPL_SHARED_POINTERS(PipelineFilterWidgetFactory<Widget> )
-    SIMPL_TYPE_MACRO_SUPER(PipelineFilterWidgetFactory<Widget>, IFilterWidgetFactory)
-    SIMPL_STATIC_NEW_MACRO(PipelineFilterWidgetFactory<Widget>)
+public:
+  using Self = PipelineFilterWidgetFactory<Widget>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
 
-    ~PipelineFilterWidgetFactory() override = default;
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return QString("PipelineFilterWidgetFactory<Widget>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("PipelineFilterWidgetFactory<Widget>");
+  }
 
-    /**
-     * @brief Creates a new widget for this filter. The Calling method MUST set
-     * a parent Widget OR take responsibility for deleting this object.
-     * @return
-     */
-    QWidget* createWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr) override
-    {
-      auto* w = new Widget(parameter, filter, parent);
-      QString str = QString("%1_FilterParameter").arg(parameter->getPropertyName());
-      w->setObjectName(str);
-      w->loadData();
-      return w;
-    }
+  /**
+   * @brief New
+   * @return
+   */
+  static Pointer New()
+  {
+    Pointer sharedPtr(new(Self));
+    return sharedPtr;
+  }
 
+  ~PipelineFilterWidgetFactory() override = default;
 
-  protected:
-    PipelineFilterWidgetFactory() = default;
+  /**
+   * @brief Creates a new widget for this filter. The Calling method MUST set
+   * a parent Widget OR take responsibility for deleting this object.
+   * @return
+   */
+  QWidget* createWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr) override
+  {
+    auto* w = new Widget(parameter, filter, parent);
+    QString str = QString("%1_FilterParameter").arg(parameter->getPropertyName());
+    w->setObjectName(str);
+    w->loadData();
+    return w;
+  }
 
-  public:
-    PipelineFilterWidgetFactory(const PipelineFilterWidgetFactory&) = delete;            // Copy Constructor Not Implemented
-    PipelineFilterWidgetFactory(PipelineFilterWidgetFactory&&) = delete;                 // Move Constructor
-    PipelineFilterWidgetFactory& operator=(const PipelineFilterWidgetFactory&) = delete; // Copy Assignment Not Implemented
-    PipelineFilterWidgetFactory& operator=(PipelineFilterWidgetFactory&&) = delete;      // Move Assignment Not Implemented
-};
+protected:
+  PipelineFilterWidgetFactory() = default;
 
+public:
+  PipelineFilterWidgetFactory(const PipelineFilterWidgetFactory&) = delete;            // Copy Constructor Not Implemented
+  PipelineFilterWidgetFactory(PipelineFilterWidgetFactory&&) = delete;                 // Move Constructor
+  PipelineFilterWidgetFactory& operator=(const PipelineFilterWidgetFactory&) = delete; // Copy Assignment Not Implemented
+  PipelineFilterWidgetFactory& operator=(PipelineFilterWidgetFactory&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
index b957134417..dc35795401 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
@@ -35,11 +35,14 @@
 #include "AboutPlugins.h"
 
 #include <QtCore/QPluginLoader>
+#include <QtCore/QTextStream>
 
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QAction>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Filtering/FilterManager.h"
 
 #include "SVWidgetsLib/Core/FilterWidgetManager.h"
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index f2173c39c7..2375ffcc63 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -248,4 +248,15 @@ bool ColorPresets::GetPresetHasAnnotations(const QJsonObject& preset)
   return (!preset.isEmpty() && preset.keys().contains("Annotations"));
 }
 
+// -----------------------------------------------------------------------------
+ColorPresets::Pointer ColorPresets::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
 
+// -----------------------------------------------------------------------------
+ColorPresets::Pointer ColorPresets::New()
+{
+  Pointer sharedPtr(new(ColorPresets));
+  return sharedPtr;
+}
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index 2c212c864d..108f07c2cb 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -46,10 +46,11 @@
 // have multiple instances alive at the same time.
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 class QPixmap;
 class vtkPVXMLElement;
@@ -57,8 +58,14 @@ class vtkPVXMLElement;
 class ColorPresets
 {
 public:
-  SIMPL_SHARED_POINTERS(ColorPresets)
-  SIMPL_STATIC_NEW_MACRO(ColorPresets)
+  using Self = ColorPresets;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
 
   ~ColorPresets();
 
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
index 5867c6405f..dd25e56d38 100644
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
@@ -101,3 +101,15 @@ void PluginDetails::loadPluginDetails()
   statusLabel->setHidden(true);
 #endif
 }
+
+// -----------------------------------------------------------------------------
+void PluginDetails::setPluginName(const QString& value)
+{
+  m_PluginName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PluginDetails::getPluginName() const
+{
+  return m_PluginName;
+}
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.h b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
index b0fb45a6c0..84b2c7c2ff 100755
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.h
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
@@ -54,8 +54,16 @@ class PluginDetails : public QWidget, private Ui::PluginDetails
     PluginDetails(QWidget* parent = nullptr);
     ~PluginDetails() override;
 
-    SIMPL_INSTANCE_PROPERTY(QString, PluginName)
-  
+    /**
+     * @brief Setter property for PluginName
+     */
+    void setPluginName(const QString& value);
+    /**
+     * @brief Getter property for PluginName
+     * @return Value of PluginName
+     */
+    QString getPluginName() const;
+
     /**
      * @brief Load the details for the plugin name stored in the PluginName property
      */
@@ -72,5 +80,8 @@ class PluginDetails : public QWidget, private Ui::PluginDetails
     PluginDetails(PluginDetails&&) = delete;       // Move Constructor Not Implemented
     PluginDetails& operator=(const PluginDetails&) = delete; // Copy Assignment Not Implemented
     PluginDetails& operator=(PluginDetails&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    QString m_PluginName = {};
 };
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index 82ea443e4b..8170350337 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -45,7 +45,10 @@
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/AppVersion.h"
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
index afca888d59..20eb5077ba 100755
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
@@ -66,8 +66,7 @@ class SVWidgetsLib_EXPORT UpdateCheck : public QObject
       QString appName;
     } SIMPLVersionData_t;
 
-
-    UpdateCheck(SIMPLVersionData_t versionData, QObject* parent = 0);
+    UpdateCheck(SIMPLVersionData_t versionData, QObject* parent = nullptr);
     ~UpdateCheck() override;
 
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
index 53cb8a5cdc..fef2b9df65 100755
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
@@ -54,7 +54,7 @@ class SVWidgetsLib_EXPORT UpdateCheckData : public QObject
     Q_OBJECT
 
   public:
-    UpdateCheckData(QObject* parent = 0);
+    UpdateCheckData(QObject* parent = nullptr);
     UpdateCheckData(const UpdateCheckData&);
     void operator=(const UpdateCheckData&);
     bool operator==(const UpdateCheckData&);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index f188d9102b..b26439b347 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -39,6 +39,8 @@
 
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index 0dab130f4c..d7a117fdd6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -40,6 +40,7 @@
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index c615431c68..b638891e9e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -37,6 +37,10 @@
 
 
 #include <QtWidgets/QMenu>
+#include <QtCore/QDebug>
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index 9c5963f74d..cae064947d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -35,21 +35,15 @@
 
 #pragma once
 
-
-
-
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
-
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/FilterParameters/CalculatorFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
-
-
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/ui_CalculatorWidget.h"
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 5e997875c6..86fd484460 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -43,6 +43,7 @@
 #include "FilterParameterWidgetsDialogs.h"
 
 #include "SIMPLib/Filtering/ComparisonValue.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
index 4f9cb3fd65..4f34e397a5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
@@ -58,7 +58,7 @@ class SVWidgetsLib_EXPORT ComparisonSelectionItemDelegate : public QStyledItemDe
     Q_OBJECT
 
   public:
-    explicit ComparisonSelectionItemDelegate(QStringList possibleFeatures, int numPhases, QObject* parent = 0);
+    explicit ComparisonSelectionItemDelegate(QStringList possibleFeatures, int numPhases, QObject* parent = nullptr);
 
     ~ComparisonSelectionItemDelegate() override;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
index dfeef2a4f5..971f86b019 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
@@ -64,8 +64,7 @@ class SVWidgetsLib_EXPORT ComparisonSelectionTableModel : public QAbstractTableM
       ColumnCount
     };
 
-
-    ComparisonSelectionTableModel(bool showOperators, QObject* parent = 0);
+    ComparisonSelectionTableModel(bool showOperators, QObject* parent = nullptr);
 
     ~ComparisonSelectionTableModel() override;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 6136944953..2d880c5be6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -40,6 +40,7 @@
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
@@ -589,3 +590,27 @@ void ComparisonSelectionWidget::updateDataArrayPath(const QString& propertyName,
     blockSignals(false);
   }
 }
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionWidget::setArrayListType(const ComparisonSelectionWidget::ArrayListType& value)
+{
+  m_ArrayListType = value;
+}
+
+// -----------------------------------------------------------------------------
+ComparisonSelectionWidget::ArrayListType ComparisonSelectionWidget::getArrayListType() const
+{
+  return m_ArrayListType;
+}
+
+// -----------------------------------------------------------------------------
+void ComparisonSelectionWidget::setShowOperators(bool value)
+{
+  m_ShowOperators = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ComparisonSelectionWidget::getShowOperators() const
+{
+  return m_ShowOperators;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index fbc6c94feb..38bfe71d16 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -85,8 +85,25 @@ class ComparisonSelectionWidget : public FilterParameterWidget, private Ui::Comp
       FaceListType,
     };
 
-    SIMPL_INSTANCE_PROPERTY(ComparisonSelectionWidget::ArrayListType, ArrayListType)
-    SIMPL_INSTANCE_PROPERTY(bool, ShowOperators)
+    /**
+     * @brief Setter property for ArrayListType
+     */
+    void setArrayListType(const ComparisonSelectionWidget::ArrayListType& value);
+    /**
+     * @brief Getter property for ArrayListType
+     * @return Value of ArrayListType
+     */
+    ComparisonSelectionWidget::ArrayListType getArrayListType() const;
+
+    /**
+     * @brief Setter property for ShowOperators
+     */
+    void setShowOperators(bool value);
+    /**
+     * @brief Getter property for ShowOperators
+     * @return Value of ShowOperators
+     */
+    bool getShowOperators() const;
 
     /**
      * @brief setupGui Initializes some of the GUI elements with selections or other GUI related items
@@ -205,6 +222,9 @@ class ComparisonSelectionWidget : public FilterParameterWidget, private Ui::Comp
     void attributeMatrixUpdated();
 
   private:
+    ComparisonSelectionWidget::ArrayListType m_ArrayListType = {};
+    bool m_ShowOperators = {};
+
     DataContainerArrayProxy m_DcaProxy;
 
     bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
index 19ff5ddd2e..e3b7134acf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
@@ -38,6 +38,7 @@
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/ComparisonValue.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 2df2d32087..881d0e982b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -39,6 +39,8 @@
 
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
index 9e905feccf..b3f865a856 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
@@ -108,3 +108,16 @@ void DataArrayInformationDisplayWidget::setPathText(QString path)
 {
   pathText->setText(path);
 }
+
+// -----------------------------------------------------------------------------
+DataArrayInformationDisplayWidget::Pointer DataArrayInformationDisplayWidget::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+DataArrayInformationDisplayWidget::Pointer DataArrayInformationDisplayWidget::New()
+{
+  Pointer sharedPtr(new(DataArrayInformationDisplayWidget));
+  return sharedPtr;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index ccf74fe64f..64be848075 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -36,6 +36,8 @@
 #pragma once
 
 
+#include <memory>
+
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -59,8 +61,14 @@ class SVWidgetsLib_EXPORT DataArrayInformationDisplayWidget : public FilterParam
     Q_OBJECT
 
   public:
-    SIMPL_SHARED_POINTERS(DataArrayInformationDisplayWidget)
-    SIMPL_STATIC_NEW_MACRO(DataArrayInformationDisplayWidget)
+    using Self = DataArrayInformationDisplayWidget;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<Self>;
+    static Pointer NullPointer();
+
+    static Pointer New();
 
     /**
     * @brief Constructor
@@ -90,6 +98,8 @@ class SVWidgetsLib_EXPORT DataArrayInformationDisplayWidget : public FilterParam
     DataArrayInformationDisplayWidget(DataArrayInformationDisplayWidget&&) = delete;      // Move Constructor Not Implemented
     DataArrayInformationDisplayWidget& operator=(const DataArrayInformationDisplayWidget&) = delete; // Copy Assignment Not Implemented
     DataArrayInformationDisplayWidget& operator=(DataArrayInformationDisplayWidget&&) = delete;      // Move Assignment Not Implemented
+
+  private:
 };
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 5c93d2517b..828c1bb8f5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -35,8 +35,10 @@
 
 #include "DataArraySelectionWidget.h"
 
+#include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index b66f7063dd..1e9f290989 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -39,7 +39,6 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 358add76cc..778e33b9af 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -37,10 +37,12 @@
 
 #include <cassert>
 
-
 #include <QtGui/QBrush>
 #include <QtGui/QColor>
 #include <QtGui/QFont>
+#include <QtCore/QDebug>
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index b96bf288fb..b086085d71 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -46,8 +46,12 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
+
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 6ddedaad5d..d675e62079 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -39,6 +39,8 @@
 
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index a21e660433..86000cbaf8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -35,6 +35,7 @@
 
 #include "DynamicChoiceWidget.h"
 
+#include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
index 75d6950eb6..05ac9cbae7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
@@ -46,7 +46,7 @@ class DynamicTableItemDelegate : public QStyledItemDelegate
     Q_OBJECT
 
   public:
-    explicit DynamicTableItemDelegate(QObject* parent = 0);
+    explicit DynamicTableItemDelegate(QObject* parent = nullptr);
 
     ~DynamicTableItemDelegate() override;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index efbd56cf98..6e987c9dd4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -36,7 +36,10 @@
 
 #include <QtWidgets/QMessageBox>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
+
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index a62046abbf..51834ef45b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -42,7 +42,10 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 #include "SIMPLib/Utilities/FilePathGenerator.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 2757342d37..0e5c6f56c6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -38,7 +38,6 @@
 #include <QtCore/QString>
 #include <QtWidgets/QButtonGroup>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 
 #include "SVWidgetsLib/QtSupport/QtSPluginFrame.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 529c5325f2..a5873d515d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -43,7 +43,12 @@
 #include <QtWidgets/QGraphicsOpacityEffect>
 #include <QtWidgets/QMenu>
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
+
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -61,7 +66,6 @@ static const int Duration = 400;
 // -----------------------------------------------------------------------------
 FilterParameterWidget::FilterParameterWidget(QWidget* parent)
 : QFrame(parent)
-, m_WidgetIsExpanding(false)
 , animation(nullptr)
 , effect(nullptr)
 {
@@ -75,7 +79,6 @@ FilterParameterWidget::FilterParameterWidget(FilterParameter* parameter, Abstrac
 : QFrame(parent)
 , m_Filter(filter)
 , m_FilterParameter(parameter)
-, m_WidgetIsExpanding(false)
 , animation(nullptr)
 , effect(nullptr)
 {
@@ -453,3 +456,38 @@ void FilterParameterWidget::showFileInFileSystem()
 void FilterParameterWidget::loadData()
 {
 }
+
+// -----------------------------------------------------------------------------
+void FilterParameterWidget::setFilter(AbstractFilter* value)
+{
+  m_Filter = value;
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter* FilterParameterWidget::getFilter() const
+{
+  return m_Filter;
+}
+// -----------------------------------------------------------------------------
+void FilterParameterWidget::setFilterParameter(FilterParameter* value)
+{
+  m_FilterParameter = value;
+}
+
+// -----------------------------------------------------------------------------
+FilterParameter* FilterParameterWidget::getFilterParameter() const
+{
+  return m_FilterParameter;
+}
+
+// -----------------------------------------------------------------------------
+void FilterParameterWidget::setWidgetIsExpanding(bool value)
+{
+  m_WidgetIsExpanding = value;
+}
+
+// -----------------------------------------------------------------------------
+bool FilterParameterWidget::isWidgetExpanding() const
+{
+  return m_WidgetIsExpanding;
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index aede0f0a71..b57e3fac10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -43,7 +43,6 @@
 
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
@@ -88,9 +87,31 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
       FS_WARNING_STYLE = 3
     };
 
-    SIMPL_POINTER_PROPERTY(AbstractFilter, Filter)
-    SIMPL_POINTER_PROPERTY(FilterParameter, FilterParameter)
-    SIMPL_VIRTUAL_INSTANCE_PROPERTY(bool, WidgetIsExpanding)
+    /**
+     * @brief Setter property for Filter
+     */
+    void setFilter(AbstractFilter* value);
+    /**
+     * @brief Getter property for Filter
+     * @return Value of Filter
+     */
+    AbstractFilter* getFilter() const;
+
+    /**
+     * @brief Setter property for FilterParameter
+     */
+    void setFilterParameter(FilterParameter* value);
+    /**
+     * @brief Getter property for FilterParameter
+     * @return Value of FilterParameter
+     */
+    FilterParameter* getFilterParameter() const;
+
+    /**
+     * @brief Setter property for WidgetIsExpanding
+     */
+    virtual void setWidgetIsExpanding(bool value);
+    virtual bool isWidgetExpanding() const;
 
     void setValidFilePath(const QString& filePath);
 
@@ -154,6 +175,11 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
     void hideBorder();
 
   private:
+    bool m_WidgetIsExpanding = {};
+
+    AbstractFilter* m_Filter = nullptr;
+    FilterParameter* m_FilterParameter = nullptr;
+
     QPointer<QtSFaderWidget>         m_FaderWidget;
 
     float startValue;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
index b319759c96..4a42b2c7b2 100755
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -12,6 +12,7 @@
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 /**
  * @brief The FilterParameterWidgetUtils class implements some common methods that
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index a4ac449ebd..85a84612fa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -50,9 +50,13 @@
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Utilities.h"
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
+
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index bc85c767e3..9fd520bb4d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -40,6 +40,8 @@
 
 #include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index a3d618d905..657f8fa62d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -36,6 +36,7 @@
 #include "MontageSelectionWidget.h"
 
 #include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/ui_MontageSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index e464ab79c2..e85c7c0d34 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -40,10 +40,16 @@
 
 #include <QtWidgets/QListWidgetItem>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 5acdee6909..7f597af7bf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -44,6 +44,8 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index bbcde43f16..9b915a29b9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -44,6 +44,8 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 5e4395a4a5..2d2b148127 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -44,6 +44,8 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 4582206ce8..1e074895ce 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -47,6 +47,7 @@
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "Widgets/ImportASCIIDataWizard/DataFormatPage.h"
 #include "Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index 45605a9e42..27fb51c9e8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -44,6 +44,9 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index d79d772678..e5616514a0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -74,11 +74,11 @@ set(FILTER_PARAMETER_CODEGEN_INCLUDES_FILE ${SVWidgetsLib_BINARY_DIR}/Filter_Par
 set(FILTER_PARAMETER_TYPELIST_FILE ${SVWidgetsLib_BINARY_DIR}/Filter_Parameter_TypeList.cpp)
 set(FILTER_WIDGET_HEADERS ${SVWidgetsLib_BINARY_DIR}/FilterWidgetHeaders_tmp.h)
 
-file(WRITE ${REGISTER_KNOWN_WIDGETS}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written */\n\n")
-file(WRITE ${FILTER_PARAMETER_CODEGEN_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written */\n\n")
-file(WRITE ${FILTER_PARAMETER_CODEGEN_INCLUDES_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written */\n\n")
-file(WRITE ${FILTER_PARAMETER_TYPELIST_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written */\n\n")
-file(WRITE ${FILTER_WIDGET_HEADERS}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written */\n\n")
+file(WRITE ${REGISTER_KNOWN_WIDGETS}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written.\n* Contents Generated at ${CMAKE_CURRENT_LIST_FILE}:(${CMAKE_CURRENT_LIST_LINE})  */\n\n")
+file(WRITE ${FILTER_PARAMETER_CODEGEN_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written.\n* Contents Generated at ${CMAKE_CURRENT_LIST_FILE}:(${CMAKE_CURRENT_LIST_LINE}) */\n\n")
+file(WRITE ${FILTER_PARAMETER_CODEGEN_INCLUDES_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written.\n* Contents Generated at ${CMAKE_CURRENT_LIST_FILE}:(${CMAKE_CURRENT_LIST_LINE})  */\n\n")
+file(WRITE ${FILTER_PARAMETER_TYPELIST_FILE}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written.\n* Contents Generated at ${CMAKE_CURRENT_LIST_FILE}:(${CMAKE_CURRENT_LIST_LINE})  */\n\n")
+file(WRITE ${FILTER_WIDGET_HEADERS}  "/* This file is automatically generated. DO NOT EDIT this file. It will be over written.\n* Contents Generated at ${CMAKE_CURRENT_LIST_FILE}:(${CMAKE_CURRENT_LIST_LINE})  */\n\n")
 
 file(APPEND  ${FILTER_PARAMETER_TYPELIST_FILE} "QList<QString> list;\n")
 
@@ -113,8 +113,8 @@ foreach(FPW ${SIMPLView_PARAMETER_WIDGETS})
     file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "else if (fpType == \"${FPW}\") {\n")
   endif()
 
-  file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  ${FPW}CodeGenerator::Pointer ptr = ${FPW}CodeGenerator::New(humanLabel, propertyName, fpCategory, initValue);\n")
-      file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
+  file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return {${FPW}CodeGenerator::New(humanLabel, propertyName, fpCategory, initValue)};\n}\n")
+  #file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
 
   set(loopCounter loopCounter+1)
 endforeach()
@@ -139,8 +139,8 @@ foreach(FPW ${SIMPLView_PARAMETER_WIDGETS_NO_UI})
     file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "else if (fpType == \"${FPW}\") {\n")
   endif()
 
-  file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  ${FPW}CodeGenerator::Pointer ptr = ${FPW}CodeGenerator::New(humanLabel, propertyName, fpCategory, initValue);\n")
-      file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
+  file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return {${FPW}CodeGenerator::New(humanLabel, propertyName, fpCategory, initValue)};\n}\n")
+  #file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
 
   set(loopCounter loopCounter+1)
 endforeach()
@@ -159,8 +159,8 @@ foreach(FPW ${SIMPLView_PARAMETER_WIDGETS_NO_CODEGEN})
 endforeach()
 
 file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "else {\n")
-file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  FPCodeGenerator::Pointer ptr = FPCodeGenerator::New(humanLabel, propertyName, fpCategory, initValue);\n")
-file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
+file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return  {FPCodeGenerator::New(humanLabel, propertyName, fpCategory, initValue)};\n}\n")
+#file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
 
 file(APPEND  ${FILTER_PARAMETER_TYPELIST_FILE} "qSort(list.begin(), list.end());\nreturn list;\n")
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
index 22ebca5e98..2e364b6a50 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
@@ -28,13 +28,18 @@
 *
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include <memory>
+
 #include "QtSDocServer.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QUrl>
 #include <QtWidgets/QApplication>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Filtering/FilterManager.h"
+
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 
 #include "QtWebApp/httpserver/httplistener.h"
@@ -231,3 +236,15 @@ QUrl QtSDocServer::GenerateHTMLUrl(const QString &className)
 
   return QUrl(s);
 }
+
+// -----------------------------------------------------------------------------
+QString QtSDocServer::getNameOfClass() const
+{
+  return QString("QtSDocServer");
+}
+
+// -----------------------------------------------------------------------------
+QString QtSDocServer::ClassName()
+{
+  return QString("QtSDocServer");
+}
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.h b/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
index c1124c76ad..19a18e52e1 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
@@ -32,7 +32,9 @@
 
 #include <memory>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
 #include "SIMPLib/SIMPLib.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -48,7 +50,14 @@ class SVWidgetsLib_EXPORT QtSDocServer : public QObject
 
 public:
   // SIMPL_SHARED_POINTERS(QtSDocServer)
-  SIMPL_TYPE_MACRO(QtSDocServer)
+  /**
+   * @brief Returns the name of the class for QtSDocServer
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for QtSDocServer
+   */
+  static QString ClassName();
 
   ~QtSDocServer() override;
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
index 23ef7d3f28..0a80af2d6a 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
@@ -347,3 +347,73 @@ void QtSImageGraphicsDelegate::_displayTextMessage(QString message)
   m_GraphicsView->centerOn(tItem);
   m_GraphicsScene->update(rect);
 }
+
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setCachedImage(const QImage& value)
+{
+  m_CachedImage = value;
+}
+
+// -----------------------------------------------------------------------------
+QImage QtSImageGraphicsDelegate::getCachedImage() const
+{
+  return m_CachedImage;
+}
+
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setOverlayImage(const QImage& value)
+{
+  m_OverlayImage = value;
+}
+
+// -----------------------------------------------------------------------------
+QImage QtSImageGraphicsDelegate::getOverlayImage() const
+{
+  return m_OverlayImage;
+}
+
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setCompositeImages(bool value)
+{
+  m_CompositeImages = value;
+}
+
+// -----------------------------------------------------------------------------
+bool QtSImageGraphicsDelegate::getCompositeImages() const
+{
+  return m_CompositeImages;
+}
+
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setMainWindow(QMainWindow* value)
+{
+  m_MainWindow = value;
+}
+
+// -----------------------------------------------------------------------------
+QMainWindow* QtSImageGraphicsDelegate::getMainWindow() const
+{
+  return m_MainWindow;
+}
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setGraphicsView(QGraphicsView* value)
+{
+  m_GraphicsView = value;
+}
+
+// -----------------------------------------------------------------------------
+QGraphicsView* QtSImageGraphicsDelegate::getGraphicsView() const
+{
+  return m_GraphicsView;
+}
+// -----------------------------------------------------------------------------
+void QtSImageGraphicsDelegate::setGraphicsScene(QGraphicsScene* value)
+{
+  m_GraphicsScene = value;
+}
+
+// -----------------------------------------------------------------------------
+QGraphicsScene* QtSImageGraphicsDelegate::getGraphicsScene() const
+{
+  return m_GraphicsScene;
+}
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
index c18366cc3d..86af561503 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 //-- Qt Includes
 #include <QtCore/QObject>
@@ -66,19 +65,68 @@ class SVWidgetsLib_EXPORT QtSImageGraphicsDelegate : public QObject
     Q_OBJECT
 
   public:
-    QtSImageGraphicsDelegate(QObject* parent = 0);
+    QtSImageGraphicsDelegate(QObject* parent = nullptr);
     ~QtSImageGraphicsDelegate() override;
 
+    /**
+     * @brief Setter property for MainWindow
+     */
+    void setMainWindow(QMainWindow* value);
+    /**
+     * @brief Getter property for MainWindow
+     * @return Value of MainWindow
+     */
+    QMainWindow* getMainWindow() const;
 
-    SIMPL_POINTER_PROPERTY(QMainWindow, MainWindow)
-    SIMPL_POINTER_PROPERTY(QGraphicsView, GraphicsView)
-    SIMPL_POINTER_PROPERTY(QGraphicsScene, GraphicsScene)
+    /**
+     * @brief Setter property for GraphicsView
+     */
+    void setGraphicsView(QGraphicsView* value);
+    /**
+     * @brief Getter property for GraphicsView
+     * @return Value of GraphicsView
+     */
+    QGraphicsView* getGraphicsView() const;
+
+    /**
+     * @brief Setter property for GraphicsScene
+     */
+    void setGraphicsScene(QGraphicsScene* value);
+    /**
+     * @brief Getter property for GraphicsScene
+     * @return Value of GraphicsScene
+     */
+    QGraphicsScene* getGraphicsScene() const;
 
+    /**
+     * @brief Setter property for CachedImage
+     */
+    void setCachedImage(const QImage& value);
+    /**
+     * @brief Getter property for CachedImage
+     * @return Value of CachedImage
+     */
+    QImage getCachedImage() const;
 
-    SIMPL_INSTANCE_PROPERTY(QImage, CachedImage)
-    SIMPL_INSTANCE_PROPERTY(QImage, OverlayImage)
-    SIMPL_INSTANCE_PROPERTY(bool, CompositeImages)
+    /**
+     * @brief Setter property for OverlayImage
+     */
+    void setOverlayImage(const QImage& value);
+    /**
+     * @brief Getter property for OverlayImage
+     * @return Value of OverlayImage
+     */
+    QImage getOverlayImage() const;
 
+    /**
+     * @brief Setter property for CompositeImages
+     */
+    void setCompositeImages(bool value);
+    /**
+     * @brief Getter property for CompositeImages
+     * @return Value of CompositeImages
+     */
+    bool getCompositeImages() const;
 
     /**
      * @brief Displays a Text message in the graphics view. This is typically used
@@ -141,6 +189,13 @@ class SVWidgetsLib_EXPORT QtSImageGraphicsDelegate : public QObject
     void setExclusionMode() { m_composition_mode = QPainter::CompositionMode_Exclusion;  }
 
   private:
+    QMainWindow* m_MainWindow = nullptr;
+    QGraphicsView* m_GraphicsView = nullptr;
+    QGraphicsScene* m_GraphicsScene = nullptr;
+
+    QImage m_CachedImage = {};
+    QImage m_OverlayImage = {};
+    bool m_CompositeImages = {};
 
     QGraphicsPixmapItem*    m_CurrentGraphicsItem;
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
index 390893168e..c653629caf 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
@@ -33,7 +33,6 @@
 
 #include <QtWidgets/QAbstractButton>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.h b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
index 4239aa68c4..8a05b5d8b3 100755
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
@@ -66,8 +66,8 @@ class SVWidgetsLib_EXPORT QtSSettings : public QObject
     Q_OBJECT
 
   public:
-    QtSSettings(QObject* parent = 0);
-    QtSSettings(const QString& filePath, QObject* parent = 0);
+    QtSSettings(QObject* parent = nullptr);
+    QtSSettings(const QString& filePath, QObject* parent = nullptr);
     ~QtSSettings() override;
 
     QString fileName();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
index 2544a5141e..9571893a30 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
@@ -38,7 +38,6 @@
 
 #include "SVWidgetsLib/QtSupport/QtSSplitterHandle.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/SIMPLib.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
index fefa2d5e97..11a60d0209 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
@@ -38,11 +38,9 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-BookmarksItem::BookmarksItem(const QString &name, const QString &path, BookmarksItem* parent)
-: m_Expanded(false)
-, m_Name(name)
+BookmarksItem::BookmarksItem(const QString& name, const QString& path, BookmarksItem* parent)
+: m_Name(name)
 , m_Path(path)
-, m_HasErrors(false)
 , m_ItemTooltip("")
 , m_Icon(QIcon())
 , m_ParentItem(parent)
@@ -164,3 +162,87 @@ void BookmarksItem::setParent(BookmarksItem* parent)
 {
   m_ParentItem = parent;
 }
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setName(const QString& value)
+{
+  m_Name = value;
+}
+
+// -----------------------------------------------------------------------------
+QString BookmarksItem::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setPath(const QString& value)
+{
+  m_Path = value;
+}
+
+// -----------------------------------------------------------------------------
+QString BookmarksItem::getPath() const
+{
+  return m_Path;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setHasErrors(bool value)
+{
+  m_HasErrors = value;
+}
+
+// -----------------------------------------------------------------------------
+bool BookmarksItem::getHasErrors() const
+{
+  return m_HasErrors;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setItemTooltip(const QString& value)
+{
+  m_ItemTooltip = value;
+}
+
+// -----------------------------------------------------------------------------
+QString BookmarksItem::getItemTooltip() const
+{
+  return m_ItemTooltip;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setIcon(const QIcon& value)
+{
+  m_Icon = value;
+}
+
+// -----------------------------------------------------------------------------
+QIcon BookmarksItem::getIcon() const
+{
+  return m_Icon;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setItemType(const BookmarksItem::ItemType& value)
+{
+  m_ItemType = value;
+}
+
+// -----------------------------------------------------------------------------
+BookmarksItem::ItemType BookmarksItem::getItemType() const
+{
+  return m_ItemType;
+}
+
+// -----------------------------------------------------------------------------
+void BookmarksItem::setExpanded(bool value)
+{
+  m_Expanded = value;
+}
+
+// -----------------------------------------------------------------------------
+bool BookmarksItem::isExpanded() const
+{
+  return m_Expanded;
+}
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.h b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
index 8b4f3660dd..7c3fc46ae6 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
@@ -39,7 +39,6 @@
 
 #include <QtGui/QIcon>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -60,16 +59,70 @@ class SVWidgetsLib_EXPORT BookmarksItem
       Bookmark
     };
 
-    SIMPL_BOOL_PROPERTY(Expanded)
-    SIMPL_INSTANCE_PROPERTY(QString, Name)
-    SIMPL_INSTANCE_PROPERTY(QString, Path)
+    void setExpanded(bool value);
+    bool isExpanded() const;
+
+    /**
+     * @brief Setter property for Name
+     */
+    void setName(const QString& value);
+    /**
+     * @brief Getter property for Name
+     * @return Value of Name
+     */
+    QString getName() const;
+
+    /**
+     * @brief Setter property for Path
+     */
+    void setPath(const QString& value);
+    /**
+     * @brief Getter property for Path
+     * @return Value of Path
+     */
+    QString getPath() const;
+
+    /**
+     * @brief Setter property for HasErrors
+     */
+    void setHasErrors(bool value);
+    /**
+     * @brief Getter property for HasErrors
+     * @return Value of HasErrors
+     */
+    bool getHasErrors() const;
 
-    SIMPL_INSTANCE_PROPERTY(bool, HasErrors)
     Q_PROPERTY(bool HasErrors READ getHasErrors WRITE setHasErrors)
 
-    SIMPL_INSTANCE_PROPERTY(QString, ItemTooltip)
-    SIMPL_INSTANCE_PROPERTY(QIcon, Icon)
-    SIMPL_INSTANCE_PROPERTY(BookmarksItem::ItemType, ItemType)
+    /**
+     * @brief Setter property for ItemTooltip
+     */
+    void setItemTooltip(const QString& value);
+    /**
+     * @brief Getter property for ItemTooltip
+     * @return Value of ItemTooltip
+     */
+    QString getItemTooltip() const;
+
+    /**
+     * @brief Setter property for Icon
+     */
+    void setIcon(const QIcon& value);
+    /**
+     * @brief Getter property for Icon
+     * @return Value of Icon
+     */
+    QIcon getIcon() const;
+
+    /**
+     * @brief Setter property for ItemType
+     */
+    void setItemType(const BookmarksItem::ItemType& value);
+    /**
+     * @brief Getter property for ItemType
+     * @return Value of ItemType
+     */
+    BookmarksItem::ItemType getItemType() const;
 
     BookmarksItem* child(int number);
     BookmarksItem* parent();
@@ -89,7 +142,15 @@ class SVWidgetsLib_EXPORT BookmarksItem
     static QString TopLevelString();
 
   private:
-    QList<BookmarksItem*>               m_ChildItems;
+    QString m_Name = {};
+    QString m_Path = {};
+    bool m_HasErrors = {};
+    QString m_ItemTooltip = {};
+    QIcon m_Icon = {};
+    BookmarksItem::ItemType m_ItemType = {};
+    bool m_Expanded = false;
+
+    QList<BookmarksItem*> m_ChildItems;
     BookmarksItem*                      m_ParentItem;
 
   public:
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
index 47072584db..d319c21175 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
@@ -44,7 +44,7 @@ class BookmarksItemDelegate : public QStyledItemDelegate
     Q_OBJECT
 
   public:
-    explicit BookmarksItemDelegate(QObject* parent = 0);
+    explicit BookmarksItemDelegate(QObject* parent = nullptr);
 
     ~BookmarksItemDelegate() override;
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index 24c9cf4e3d..c4c2e74dc2 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -33,7 +33,10 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
+#include "SIMPLib/Common/Constants.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
@@ -1002,3 +1005,15 @@ QString BookmarksModel::getBookmarksPrefsPath()
 
   return bookmarksPrefsPath;
 }
+
+// -----------------------------------------------------------------------------
+QString BookmarksModel::getNameOfClass() const
+{
+  return QString("BookmarksModel");
+}
+
+// -----------------------------------------------------------------------------
+QString BookmarksModel::ClassName()
+{
+  return QString("BookmarksModel");
+}
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.h b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
index 75a48747af..6ae9086fbd 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
@@ -41,7 +41,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileSystemWatcher>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
@@ -61,7 +60,14 @@ class SVWidgetsLib_EXPORT BookmarksModel : public QAbstractItemModel
     Q_OBJECT
 
   public:
-    SIMPL_TYPE_MACRO(BookmarksModel)
+    /**
+     * @brief Returns the name of the class for BookmarksModel
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for BookmarksModel
+     */
+    static QString ClassName();
 
     enum ErrorCodes
     {
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index d2a39b14c3..fdeb09e08b 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -47,6 +47,7 @@
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Common/Constants.h"
 
 #include "SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
index 7167318c8b..d4fbde2720 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
@@ -41,7 +41,6 @@
 #include "SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Common/Constants.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index 607df690eb..d10dffe4bd 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -901,3 +901,57 @@ void BookmarksTreeView::currentChanged(const QModelIndex& current, const QModelI
 {
   emit currentIndexChanged(current, previous);
 }
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionRenameBookmark() const
+{
+  return m_ActionRenameBookmark;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionRemoveBookmark() const
+{
+  return m_ActionRemoveBookmark;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionShowBookmarkInFileSystem() const
+{
+  return m_ActionShowBookmarkInFileSystem;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionClearBookmarks() const
+{
+  return m_ActionClearBookmarks;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionAddBookmark() const
+{
+  return m_ActionAddBookmark;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionAddBookmarkFolder() const
+{
+  return m_ActionAddBookmarkFolder;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionLocateFile() const
+{
+  return m_ActionLocateFile;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionOpenBookmark() const
+{
+  return m_ActionOpenBookmark;
+}
+
+// -----------------------------------------------------------------------------
+QAction* BookmarksTreeView::getActionExecuteBookmark() const
+{
+  return m_ActionExecuteBookmark;
+}
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
index 91162d63cb..91684cb0f8 100755
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -64,15 +64,59 @@ class SVWidgetsLib_EXPORT BookmarksTreeView : public QTreeView
       Unknown_Item_Type = 3
     };
 
-    SIMPL_GET_PROPERTY(QAction*, ActionRenameBookmark)
-    SIMPL_GET_PROPERTY(QAction*, ActionRemoveBookmark)
-    SIMPL_GET_PROPERTY(QAction*, ActionShowBookmarkInFileSystem)
-    SIMPL_GET_PROPERTY(QAction*, ActionClearBookmarks)
-    SIMPL_GET_PROPERTY(QAction*, ActionAddBookmark)
-    SIMPL_GET_PROPERTY(QAction*, ActionAddBookmarkFolder)
-    SIMPL_GET_PROPERTY(QAction*, ActionLocateFile)
-    SIMPL_GET_PROPERTY(QAction*, ActionOpenBookmark)
-    SIMPL_GET_PROPERTY(QAction*, ActionExecuteBookmark)
+    /**
+     * @brief Getter property for ActionRenameBookmark
+     * @return Value of ActionRenameBookmark
+     */
+    QAction* getActionRenameBookmark() const;
+
+    /**
+     * @brief Getter property for ActionRemoveBookmark
+     * @return Value of ActionRemoveBookmark
+     */
+    QAction* getActionRemoveBookmark() const;
+
+    /**
+     * @brief Getter property for ActionShowBookmarkInFileSystem
+     * @return Value of ActionShowBookmarkInFileSystem
+     */
+    QAction* getActionShowBookmarkInFileSystem() const;
+
+    /**
+     * @brief Getter property for ActionClearBookmarks
+     * @return Value of ActionClearBookmarks
+     */
+    QAction* getActionClearBookmarks() const;
+
+    /**
+     * @brief Getter property for ActionAddBookmark
+     * @return Value of ActionAddBookmark
+     */
+    QAction* getActionAddBookmark() const;
+
+    /**
+     * @brief Getter property for ActionAddBookmarkFolder
+     * @return Value of ActionAddBookmarkFolder
+     */
+    QAction* getActionAddBookmarkFolder() const;
+
+    /**
+     * @brief Getter property for ActionLocateFile
+     * @return Value of ActionLocateFile
+     */
+    QAction* getActionLocateFile() const;
+
+    /**
+     * @brief Getter property for ActionOpenBookmark
+     * @return Value of ActionOpenBookmark
+     */
+    QAction* getActionOpenBookmark() const;
+
+    /**
+     * @brief Getter property for ActionExecuteBookmark
+     * @return Value of ActionExecuteBookmark
+     */
+    QAction* getActionExecuteBookmark() const;
 
     /**
     * @brief BookmarksTreeView
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
index 84f3c8e35a..8909d97178 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
@@ -33,6 +33,8 @@
 
 #include "DataArrayPathDisplay.h"
 
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index ca72028f21..3e436240c6 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -40,6 +40,10 @@
 #include <QtGui/QPainter>
 #include <QtGui/QTextDocument>
 #include <QtWidgets/QApplication>
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 9062e77955..0e27ec56e1 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -34,6 +34,12 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerArrayWidget.h"
 
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+
 #include <QtGui/QStandardItem>
 #include <QtGui/QStandardItemModel>
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.h b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
index 1bdf7f6032..74decf90f5 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
@@ -41,9 +41,6 @@
 
 #include <QtGui/QIcon>
 
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
index c40430e94e..e84d1d9e5f 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
@@ -50,7 +50,7 @@ class DataStructureItemDelegate : public QStyledItemDelegate
   Q_OBJECT
 
 public:
-  explicit DataStructureItemDelegate(QObject* parent = 0);
+  explicit DataStructureItemDelegate(QObject* parent = nullptr);
 
   ~DataStructureItemDelegate() override;
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index 1f325466d8..b929ff0b37 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -36,6 +36,7 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Widgets/DataStructureModel.h"
 #include "SVWidgetsLib/Widgets/DataStructureTreeView.h"
@@ -507,4 +508,14 @@ QModelIndex DataStructureModel::sibling(int row, int column, const QModelIndex&
 
 #endif
 
+// -----------------------------------------------------------------------------
+QString DataStructureModel::getNameOfClass() const
+{
+  return QString("DataStructureModel");
+}
 
+// -----------------------------------------------------------------------------
+QString DataStructureModel::ClassName()
+{
+  return QString("DataStructureModel");
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index e267d412f8..55ff94caa2 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -40,8 +40,6 @@
 #include <QtCore/QVariant>
 #include <QtGui/QStandardItemModel>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
@@ -56,9 +54,16 @@ class SVWidgetsLib_EXPORT DataStructureModel : public QStandardItemModel
     Q_OBJECT
 
   public:
-    SIMPL_TYPE_MACRO(DataStructureModel)
+    /**
+     * @brief Returns the name of the class for DataStructureModel
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for DataStructureModel
+     */
+    static QString ClassName();
 
-    DataStructureModel(QObject* parent = 0);
+    DataStructureModel(QObject* parent = nullptr);
     ~DataStructureModel() override;
 
     using EnumType = unsigned int;
@@ -107,7 +112,7 @@ the setData() and setHeaderData() functions, respectively.
      * @brief syncDataModel
      * @param dca
      */
-    void syncDataModel(DataContainerArray::Pointer dca);
+    void syncDataModel(DataContainerArrayShPtrType dca);
 
     bool needsToBeExpanded(const QModelIndex& index);
     void setNeedsToBeExpanded(const QModelIndex& index, bool value);
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index bef67c3ff7..f4faf0ac96 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -40,6 +40,8 @@
 #include <QtGui/QStandardItemModel>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index ae5cba2eb6..44dcecfe32 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -35,16 +35,19 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtGui/QIcon>
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -99,7 +102,7 @@ public slots:
    * @brief Updates the internal DataContainerArray copy from the input DataContainerArray
    * @param dca
    */
-  void updateDataContainerArray(DataContainerArray::Pointer dca);
+  void updateDataContainerArray(DataContainerArrayShPtrType dca);
 
   /**
    * @brief Updates the DataStructureWidget with the latest DataContainerArray from
@@ -179,7 +182,7 @@ public slots:
   QStandardItem* findItemByPath(DataArrayPath path);
 
 private:
-  DataContainerArray::Pointer  m_Dca = nullptr;
+  DataContainerArrayShPtrType m_Dca = nullptr;
   QSharedPointer<Ui::DataStructureWidget>       m_Ui;
   QIcon m_ImageGeomIcon = QIcon(SIMPLView::GeometryIcons::Image);
   QIcon m_VertexGeomIcon = QIcon(SIMPLView::GeometryIcons::Vertex);
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 8c66658416..8c05a68803 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -42,7 +42,12 @@
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QVBoxLayout>
 
+#include <QtCore/QTextStream>
+
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/DocRequestManager.h"
+
 #include "SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
@@ -356,7 +361,7 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
     FilterParameterWidget* fpwPtr = qobject_cast<FilterParameterWidget*>(filterParameterWidget);
     if(nullptr != fpwPtr)
     {
-      if(fpwPtr->getWidgetIsExpanding())
+      if(fpwPtr->isWidgetExpanding())
       {
         addSpacer = false;
       }
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index 0adba9ddf7..fba7f013f3 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -36,9 +36,12 @@
 
 #include <QtCore/QFileInfo>
 
+#include <QtCore/QDebug>
 
 #include "SIMPLib/Common/DocRequestManager.h"
+
 #include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Common/Constants.h"
 
 #include "FilterListToolboxWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
index e30f7e92b8..46e9edf3e9 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
@@ -153,3 +153,63 @@ void FilterListItem::setParent(FilterListItem* parent)
 {
   m_ParentItem = parent;
 }
+
+// -----------------------------------------------------------------------------
+void FilterListItem::setName(const QString& value)
+{
+  m_Name = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterListItem::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+void FilterListItem::setItemTooltip(const QString& value)
+{
+  m_ItemTooltip = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterListItem::getItemTooltip() const
+{
+  return m_ItemTooltip;
+}
+
+// -----------------------------------------------------------------------------
+void FilterListItem::setClassName(const QString& value)
+{
+  m_ClassName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterListItem::getClassName() const
+{
+  return m_ClassName;
+}
+
+// -----------------------------------------------------------------------------
+void FilterListItem::setIcon(const QIcon& value)
+{
+  m_Icon = value;
+}
+
+// -----------------------------------------------------------------------------
+QIcon FilterListItem::getIcon() const
+{
+  return m_Icon;
+}
+
+// -----------------------------------------------------------------------------
+void FilterListItem::setItemType(const FilterListItem::ItemType& value)
+{
+  m_ItemType = value;
+}
+
+// -----------------------------------------------------------------------------
+FilterListItem::ItemType FilterListItem::getItemType() const
+{
+  return m_ItemType;
+}
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.h b/Source/SVWidgetsLib/Widgets/FilterListItem.h
index 266e1526e5..1a85c7a43e 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.h
@@ -39,7 +39,6 @@
 
 #include <QtGui/QIcon>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -56,11 +55,55 @@ class SVWidgetsLib_EXPORT FilterListItem
       Unknown
     };
 
-    SIMPL_INSTANCE_PROPERTY(QString, Name)
-    SIMPL_INSTANCE_PROPERTY(QString, ItemTooltip)
-    SIMPL_INSTANCE_PROPERTY(QString, ClassName)
-    SIMPL_INSTANCE_PROPERTY(QIcon, Icon)
-    SIMPL_INSTANCE_PROPERTY(FilterListItem::ItemType, ItemType)
+    /**
+     * @brief Setter property for Name
+     */
+    void setName(const QString& value);
+    /**
+     * @brief Getter property for Name
+     * @return Value of Name
+     */
+    QString getName() const;
+
+    /**
+     * @brief Setter property for ItemTooltip
+     */
+    void setItemTooltip(const QString& value);
+    /**
+     * @brief Getter property for ItemTooltip
+     * @return Value of ItemTooltip
+     */
+    QString getItemTooltip() const;
+
+    /**
+     * @brief Setter property for ClassName
+     */
+    void setClassName(const QString& value);
+    /**
+     * @brief Getter property for ClassName
+     * @return Value of ClassName
+     */
+    QString getClassName() const;
+
+    /**
+     * @brief Setter property for Icon
+     */
+    void setIcon(const QIcon& value);
+    /**
+     * @brief Getter property for Icon
+     * @return Value of Icon
+     */
+    QIcon getIcon() const;
+
+    /**
+     * @brief Setter property for ItemType
+     */
+    void setItemType(const FilterListItem::ItemType& value);
+    /**
+     * @brief Getter property for ItemType
+     * @return Value of ItemType
+     */
+    FilterListItem::ItemType getItemType() const;
 
     FilterListItem* child(int number);
     FilterListItem* parent();
@@ -78,6 +121,12 @@ class SVWidgetsLib_EXPORT FilterListItem
     void setParent(FilterListItem* parent);
 
   private:
+    QString m_Name = {};
+    QString m_ItemTooltip = {};
+    QString m_ClassName = {};
+    QIcon m_Icon = {};
+    FilterListItem::ItemType m_ItemType = {};
+
     QList<FilterListItem*>               m_ChildItems;
     FilterListItem*                      m_ParentItem;
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
index b450ab09d0..88ba8d6402 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
@@ -313,3 +313,15 @@ bool FilterListModel::isEmpty()
 {
   return rowCount(QModelIndex()) <= 0;
 }
+
+// -----------------------------------------------------------------------------
+QString FilterListModel::getNameOfClass() const
+{
+  return QString("FilterListModel");
+}
+
+// -----------------------------------------------------------------------------
+QString FilterListModel::ClassName()
+{
+  return QString("FilterListModel");
+}
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.h b/Source/SVWidgetsLib/Widgets/FilterListModel.h
index 75b8f4321c..5c6d63a244 100755
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QAbstractItemModel>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -51,7 +50,14 @@ class SVWidgetsLib_EXPORT FilterListModel : public QAbstractItemModel
     Q_OBJECT
 
   public:
-    SIMPL_TYPE_MACRO(FilterListModel)
+    /**
+     * @brief Returns the name of the class for FilterListModel
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for FilterListModel
+     */
+    static QString ClassName();
 
     enum Column
     {
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
index 7cdaca3334..6a09e96fe3 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
@@ -301,7 +301,7 @@ QStringList ASCIIDataModel::originalStrings()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString ASCIIDataModel::originalString(const int row) const
+QString ASCIIDataModel::originalString(int row) const
 {
   return m_TableItems[row]->originalString();
 }
@@ -309,7 +309,7 @@ QString ASCIIDataModel::originalString(const int row) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ASCIIDataModel::setOriginalString(const int row, const QString& value)
+void ASCIIDataModel::setOriginalString(int row, const QString& value)
 {
   m_TableItems[row]->setOriginalString(value);
 }
@@ -317,7 +317,7 @@ void ASCIIDataModel::setOriginalString(const int row, const QString& value)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString ASCIIDataModel::columnDataType(const int column) const
+QString ASCIIDataModel::columnDataType(int column) const
 {
   return m_ColumnDataType[column];
 }
@@ -325,7 +325,7 @@ QString ASCIIDataModel::columnDataType(const int column) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ASCIIDataModel::setColumnDataType(const int column, const QString& type)
+void ASCIIDataModel::setColumnDataType(int column, const QString& type)
 {
   m_ColumnDataType[column] = type;
 
@@ -336,7 +336,7 @@ void ASCIIDataModel::setColumnDataType(const int column, const QString& type)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool ASCIIDataModel::columnHasErrors(const int column) const
+bool ASCIIDataModel::columnHasErrors(int column) const
 {
   return m_ColumnHasErrors[column];
 }
@@ -344,7 +344,7 @@ bool ASCIIDataModel::columnHasErrors(const int column) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ASCIIDataModel::setColumnHasErrors(const int column, const bool& value)
+void ASCIIDataModel::setColumnHasErrors(int column, bool value)
 {
   m_ColumnHasErrors[column] = value;
 }
@@ -392,18 +392,30 @@ void ASCIIDataModel::clearHeaders(Qt::Orientation orientation)
 {
   if(orientation == Qt::Horizontal)
   {
-    for(int i = 0; i < m_HorizontalHeaders.size(); i++)
+    for(auto& header : m_HorizontalHeaders)
     {
-      m_HorizontalHeaders[i] = "";
+      header = "";
     }
     emit headerDataChanged(Qt::Horizontal, 0, m_HorizontalHeaders.size() - 1);
   }
   else if(orientation == Qt::Vertical)
   {
-    for(int i = 0; i < m_VerticalHeaders.size(); i++)
+    for(auto& header : m_VerticalHeaders)
     {
-      m_VerticalHeaders[i] = "";
+      header = "";
     }
     emit headerDataChanged(Qt::Vertical, 0, m_VerticalHeaders.size() - 1);
   }
 }
+
+// -----------------------------------------------------------------------------
+QString ASCIIDataModel::getNameOfClass() const
+{
+  return QString("ASCIIDataModel");
+}
+
+// -----------------------------------------------------------------------------
+QString ASCIIDataModel::ClassName()
+{
+  return QString("ASCIIDataModel");
+}
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
index a3d8f593d5..b82d5fbfad 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
@@ -37,7 +37,6 @@
 
 #include <QtCore/QAbstractTableModel>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 class ASCIIDataItem;
 
@@ -46,8 +45,16 @@ class ASCIIDataModel : public QAbstractTableModel
   Q_OBJECT
 
 public:
-  SIMPL_TYPE_MACRO(ASCIIDataModel)
-  ASCIIDataModel(QObject* parent = 0);
+  /**
+   * @brief Returns the name of the class for ASCIIDataModel
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for ASCIIDataModel
+   */
+  static QString ClassName();
+
+  ASCIIDataModel(QObject* parent = nullptr);
 
   ~ASCIIDataModel() override;
 
@@ -73,16 +80,16 @@ class ASCIIDataModel : public QAbstractTableModel
 
   bool setData(const QModelIndex& index, const QVariant& value, int role) override;
 
-  QString columnDataType(const int column) const;
-  void setColumnDataType(const int column, const QString &type);
+  QString columnDataType(int column) const;
+  void setColumnDataType(int column, const QString& type);
 
-  bool columnHasErrors(const int column) const;
-  void setColumnHasErrors(const int column, const bool &value);
+  bool columnHasErrors(int column) const;
+  void setColumnHasErrors(int column, bool value);
 
   QStringList originalStrings();
 
-  QString originalString(const int row) const;
-  void setOriginalString(const int row, const QString& value);
+  QString originalString(int row) const;
+  void setOriginalString(int row, const QString& value);
 
 protected:
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 4e421365c5..2ad37f1953 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -40,8 +40,13 @@
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QMenu>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/Constants.h"
+
 #include "SIMPLib/Utilities/StringOperations.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index 71b269198f..80dbdce621 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -36,9 +36,12 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtCore/QPointer>
+#include <QtCore/QObject>
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
 #include "AbstractWizardPage.h"
 
@@ -48,7 +51,12 @@ class ASCIIDataModel;
 class EditHeadersDialog;
 class QSignalMapper;
 class QtSFaderWidget;
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
+/**
+ * @brief The DataFormatPage class
+ */
 class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
 {
   Q_OBJECT
@@ -60,7 +68,7 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
     * @param filter The instance of the filter that this parameter is a part of
     * @param parent The parent QWidget for this Widget
     */
-    DataFormatPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, DataContainerArray::Pointer dca, QWidget* parent = nullptr);
+    DataFormatPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
 
     ~DataFormatPage() override;
 
@@ -273,7 +281,7 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
   private:
     int                                             m_NumLines = -1;
     EditHeadersDialog*                              m_EditHeadersDialog = nullptr;
-    DataContainerArray::Pointer                     m_Dca;
+    DataContainerArrayShPtrType m_Dca;
     QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
     QSignalMapper*                                  m_AMMenuMapper = nullptr;
     QSignalMapper*                                  m_DCMenuMapper = nullptr;
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index 984ab0a244..26355e648c 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -37,9 +37,13 @@
 
 #include <QtCore/QFile>
 
+#include <QtCore/QTextStream>
+
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "ASCIIDataModel.h"
 #include "DataFormatPage.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
index 8f4c6d1bf4..e40ab305b6 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
@@ -36,10 +36,15 @@
 
 #pragma once
 
+#include <memory>
+
 #include <QtWidgets/QWizard>
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
+/**
+ * @brief The ImportASCIIDataBundle struct
+ */
 struct ImportASCIIDataBundle
 {
   QVector<QString>                            m_ColumnTypes;
@@ -54,6 +59,12 @@ Q_DECLARE_METATYPE(ImportASCIIDataBundle)
 class ASCIIDataModel;
 class ASCIIWizardData;
 
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
+
+/**
+ * @brief The ImportASCIIDataWizard class
+ */
 class ImportASCIIDataWizard : public QWizard
 {
   Q_OBJECT
@@ -71,13 +82,13 @@ class ImportASCIIDataWizard : public QWizard
     * @param filter The instance of the filter that this parameter is a part of
     * @param parent The parent QWidget for this Widget
     */
-    ImportASCIIDataWizard(const QString &inputFilePath, int numLines, DataContainerArray::Pointer dca, QWidget* parent = nullptr);
+    ImportASCIIDataWizard(const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
 
     /**
      * @brief ImportASCIIDataWizard
      * @param wizardData
      */
-    ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataContainerArray::Pointer dca, QWidget* parent = nullptr);
+    ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
 
     ~ImportASCIIDataWizard() override;
 
@@ -153,7 +164,7 @@ class ImportASCIIDataWizard : public QWizard
     QString                                             m_InputFilePath;
     int                                                 m_NumLines = -1;
     bool                                                m_EditSettings = false;
-    DataContainerArray::Pointer                         m_Dca = DataContainerArray::NullPointer();
+    DataContainerArrayShPtrType m_Dca = nullptr;
 
     QPushButton*                                        m_RefreshBtn = nullptr;
     QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
index 0b69da7619..51d8dce30f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
@@ -46,7 +46,7 @@ class TupleTableItemDelegate : public QStyledItemDelegate
     Q_OBJECT
 
   public:
-    explicit TupleTableItemDelegate(QObject* parent = 0);
+    explicit TupleTableItemDelegate(QObject* parent = nullptr);
 
     ~TupleTableItemDelegate() override;
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
index 37bdcddc75..3853c68fd7 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
@@ -48,7 +48,7 @@ class SVWidgetsLib_EXPORT ImportHDF5TreeModel : public QAbstractItemModel
   Q_OBJECT
 
 public:
-  ImportHDF5TreeModel(hid_t fileId, QObject* parent = 0);
+  ImportHDF5TreeModel(hid_t fileId, QObject* parent = nullptr);
   ~ImportHDF5TreeModel() override;
 
   enum Roles
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
index 42ca9c9adc..a5fe53bad4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
@@ -404,3 +404,15 @@ QString ImportHDF5TreeModelItem::generateHDFPath()
   }
   return path;
 }
+
+// -----------------------------------------------------------------------------
+void ImportHDF5TreeModelItem::setHasErrors(bool value)
+{
+  m_HasErrors = value;
+}
+
+// -----------------------------------------------------------------------------
+bool ImportHDF5TreeModelItem::getHasErrors() const
+{
+  return m_HasErrors;
+}
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
index ccd092a338..7ec7ab9aa2 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
@@ -38,7 +38,6 @@
 
 #include <hdf5.h>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -48,7 +47,15 @@ class SVWidgetsLib_EXPORT ImportHDF5TreeModelItem
   ImportHDF5TreeModelItem(hid_t fileId, const QString& data, ImportHDF5TreeModelItem* parent = 0);
   ~ImportHDF5TreeModelItem();
 
-  SIMPL_INSTANCE_PROPERTY(bool, HasErrors)
+  /**
+   * @brief Setter property for HasErrors
+   */
+  void setHasErrors(bool value);
+  /**
+   * @brief Getter property for HasErrors
+   * @return Value of HasErrors
+   */
+  bool getHasErrors() const;
 
   void appendChild(ImportHDF5TreeModelItem* child);
 
@@ -79,6 +86,8 @@ class SVWidgetsLib_EXPORT ImportHDF5TreeModelItem
   void initializeChildCount();
 
 private:
+  bool m_HasErrors = {};
+
   QList<ImportHDF5TreeModelItem*> m_ChildItems;
   int m_ChildItemsInitialized = 0;
   int m_ChildCount = -1;
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
index 5d70e7025e..fae522a46a 100755
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -36,6 +36,7 @@
 #include "IssuesWidgetMessageHandler.h"
 
 #include <QtCore/QUrl>
+#include <QtCore/QTextStream>
 
 #include <QtWidgets/QTableWidgetItem>
 #include <QtWidgets/QLabel>
diff --git a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
index ea4420abd1..7afd7c000f 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
@@ -38,3 +38,15 @@ PipelineFilterMimeData::PipelineFilterMimeData() = default;
 //
 // -----------------------------------------------------------------------------
 PipelineFilterMimeData::~PipelineFilterMimeData() = default;
+
+// -----------------------------------------------------------------------------
+void PipelineFilterMimeData::setFilterDragData(const PipelineFilterMimeData::FilterDragMetadataContainer& value)
+{
+  m_FilterDragData = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineFilterMimeData::FilterDragMetadataContainer PipelineFilterMimeData::getFilterDragData() const
+{
+  return m_FilterDragData;
+}
diff --git a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
index 0c3a49fa54..1c1d9bd987 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
@@ -31,7 +31,6 @@
 
 #include <QtCore/QMimeData>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -47,11 +46,22 @@ class SVWidgetsLib_EXPORT PipelineFilterMimeData : public QMimeData
     using FilterDragMetadata = std::pair<AbstractFilter::Pointer, int>;
     using FilterDragMetadataContainer = std::vector<PipelineFilterMimeData::FilterDragMetadata>;
 
-    SIMPL_INSTANCE_PROPERTY(PipelineFilterMimeData::FilterDragMetadataContainer, FilterDragData)
+    /**
+     * @brief Setter property for FilterDragData
+     */
+    void setFilterDragData(const PipelineFilterMimeData::FilterDragMetadataContainer& value);
+    /**
+     * @brief Getter property for FilterDragData
+     * @return Value of FilterDragData
+     */
+    PipelineFilterMimeData::FilterDragMetadataContainer getFilterDragData() const;
 
   public:
     PipelineFilterMimeData(const PipelineFilterMimeData&) = delete; // Copy Constructor Not Implemented
     PipelineFilterMimeData(PipelineFilterMimeData&&) = delete;      // Move Constructor Not Implemented
     PipelineFilterMimeData& operator=(const PipelineFilterMimeData&) = delete; // Copy Assignment Not Implemented
     PipelineFilterMimeData& operator=(PipelineFilterMimeData&&) = delete;      // Move Assignment Not Implemented
+
+  private:
+    PipelineFilterMimeData::FilterDragMetadataContainer m_FilterDragData = {};
 };
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index 865ce57420..8e59fe327c 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -38,19 +38,7 @@
 //
 // -----------------------------------------------------------------------------
 PipelineItem::PipelineItem(const QVector<QVariant>& data, PipelineItem* parent)
-: m_FilterEnabled(true)
-, m_ActivePipeline(false)
-, m_PipelineSaved(true)
-, m_Icon(QIcon())
-, m_Expanded(false)
-, m_ItemTooltip("")
-, m_BorderSize(0)
-, m_Size(QSize(0, MaxHeight))
-, m_Height(0)
-, m_Width(0)
-, m_XOffset(0)
-, m_YOffset(0)
-, m_WidgetState(PipelineItem::WidgetState::Ready)
+: m_WidgetState(PipelineItem::WidgetState::Ready)
 , m_PipelineState(PipelineItem::PipelineState::Stopped)
 , m_ErrorState(PipelineItem::ErrorState::Ok)
 , m_ItemType(PipelineItem::ItemType::Unknown)
@@ -285,3 +273,229 @@ void PipelineItem::setupFilterInputWidget()
 
   m_FilterInputWidget->displayFilterParameters(m_Filter);
 }
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setFilterEnabled(bool value)
+{
+  m_FilterEnabled = value;
+}
+
+// -----------------------------------------------------------------------------
+bool PipelineItem::getFilterEnabled() const
+{
+  return m_FilterEnabled;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setIcon(const QIcon& value)
+{
+  m_Icon = value;
+}
+
+// -----------------------------------------------------------------------------
+QIcon PipelineItem::getIcon() const
+{
+  return m_Icon;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setExpanded(bool value)
+{
+  m_Expanded = value;
+}
+
+// -----------------------------------------------------------------------------
+bool PipelineItem::getExpanded() const
+{
+  return m_Expanded;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setItemTooltip(const QString& value)
+{
+  m_ItemTooltip = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineItem::getItemTooltip() const
+{
+  return m_ItemTooltip;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setDropIndicatorText(const QString& value)
+{
+  m_DropIndicatorText = value;
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineItem::getDropIndicatorText() const
+{
+  return m_DropIndicatorText;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setBorderSize(int value)
+{
+  m_BorderSize = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineItem::getBorderSize() const
+{
+  return m_BorderSize;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setSize(const QSize& value)
+{
+  m_Size = value;
+}
+
+// -----------------------------------------------------------------------------
+QSize PipelineItem::getSize() const
+{
+  return m_Size;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setHeight(int value)
+{
+  m_Height = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineItem::getHeight() const
+{
+  return m_Height;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setWidth(int value)
+{
+  m_Width = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineItem::getWidth() const
+{
+  return m_Width;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setXOffset(int value)
+{
+  m_XOffset = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineItem::getXOffset() const
+{
+  return m_XOffset;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setYOffset(int value)
+{
+  m_YOffset = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineItem::getYOffset() const
+{
+  return m_YOffset;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setCurrentAnimationType(const PipelineItem::AnimationType& value)
+{
+  m_CurrentAnimationType = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineItem::AnimationType PipelineItem::getCurrentAnimationType() const
+{
+  return m_CurrentAnimationType;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setWidgetState(const PipelineItem::WidgetState& value)
+{
+  m_WidgetState = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineItem::WidgetState PipelineItem::getWidgetState() const
+{
+  return m_WidgetState;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setPipelineState(const PipelineItem::PipelineState& value)
+{
+  m_PipelineState = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineItem::PipelineState PipelineItem::getPipelineState() const
+{
+  return m_PipelineState;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setErrorState(const PipelineItem::ErrorState& value)
+{
+  m_ErrorState = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineItem::ErrorState PipelineItem::getErrorState() const
+{
+  return m_ErrorState;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setItemType(const PipelineItem::ItemType& value)
+{
+  m_ItemType = value;
+}
+
+// -----------------------------------------------------------------------------
+PipelineItem::ItemType PipelineItem::getItemType() const
+{
+  return m_ItemType;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setFilterInputWidget(FilterInputWidget* value)
+{
+  m_FilterInputWidget = value;
+}
+
+// -----------------------------------------------------------------------------
+FilterInputWidget* PipelineItem::getFilterInputWidget() const
+{
+  return m_FilterInputWidget;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setActivePipeline(bool value)
+{
+  m_ActivePipeline = value;
+}
+// -----------------------------------------------------------------------------
+bool PipelineItem::isActivePipeline() const
+{
+  return m_ActivePipeline;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineItem::setPipelineSaved(bool value)
+{
+  m_PipelineSaved = value;
+}
+// -----------------------------------------------------------------------------
+bool PipelineItem::isPipelineSaved() const
+{
+  return m_PipelineSaved;
+}
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.h b/Source/SVWidgetsLib/Widgets/PipelineItem.h
index 46e03e6ac3..133c95cf31 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.h
@@ -37,7 +37,6 @@
 
 #include <QtGui/QIcon>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -50,20 +49,131 @@ class SVWidgetsLib_EXPORT PipelineItem
     PipelineItem(const QVector<QVariant>& data, PipelineItem* parent = nullptr);
     virtual ~PipelineItem();
 
-    SIMPL_POINTER_PROPERTY(FilterInputWidget, FilterInputWidget)
-    SIMPL_INSTANCE_PROPERTY(bool, FilterEnabled)
-    SIMPL_BOOL_PROPERTY(ActivePipeline)
-    SIMPL_BOOL_PROPERTY(PipelineSaved)
-    SIMPL_INSTANCE_PROPERTY(QIcon, Icon)
-    SIMPL_INSTANCE_PROPERTY(bool, Expanded)
-    SIMPL_INSTANCE_PROPERTY(QString, ItemTooltip)
-    SIMPL_INSTANCE_PROPERTY(QString, DropIndicatorText)
-    SIMPL_INSTANCE_PROPERTY(int, BorderSize)
-    SIMPL_INSTANCE_PROPERTY(QSize, Size)
-    SIMPL_INSTANCE_PROPERTY(int, Height)
-    SIMPL_INSTANCE_PROPERTY(int, Width)
-    SIMPL_INSTANCE_PROPERTY(int, XOffset)
-    SIMPL_INSTANCE_PROPERTY(int, YOffset)
+    /**
+     * @brief Setter property for FilterInputWidget
+     */
+    void setFilterInputWidget(FilterInputWidget* value);
+    /**
+     * @brief Getter property for FilterInputWidget
+     * @return Value of FilterInputWidget
+     */
+    FilterInputWidget* getFilterInputWidget() const;
+
+    /**
+     * @brief Setter property for FilterEnabled
+     */
+    void setFilterEnabled(bool value);
+    /**
+     * @brief Getter property for FilterEnabled
+     * @return Value of FilterEnabled
+     */
+    bool getFilterEnabled() const;
+
+    void setActivePipeline(bool value);
+    bool isActivePipeline() const;
+
+    void setPipelineSaved(bool value);
+    bool isPipelineSaved() const;
+
+    /**
+     * @brief Setter property for Icon
+     */
+    void setIcon(const QIcon& value);
+    /**
+     * @brief Getter property for Icon
+     * @return Value of Icon
+     */
+    QIcon getIcon() const;
+
+    /**
+     * @brief Setter property for Expanded
+     */
+    void setExpanded(bool value);
+    /**
+     * @brief Getter property for Expanded
+     * @return Value of Expanded
+     */
+    bool getExpanded() const;
+
+    /**
+     * @brief Setter property for ItemTooltip
+     */
+    void setItemTooltip(const QString& value);
+    /**
+     * @brief Getter property for ItemTooltip
+     * @return Value of ItemTooltip
+     */
+    QString getItemTooltip() const;
+
+    /**
+     * @brief Setter property for DropIndicatorText
+     */
+    void setDropIndicatorText(const QString& value);
+    /**
+     * @brief Getter property for DropIndicatorText
+     * @return Value of DropIndicatorText
+     */
+    QString getDropIndicatorText() const;
+
+    /**
+     * @brief Setter property for BorderSize
+     */
+    void setBorderSize(int value);
+    /**
+     * @brief Getter property for BorderSize
+     * @return Value of BorderSize
+     */
+    int getBorderSize() const;
+
+    /**
+     * @brief Setter property for Size
+     */
+    void setSize(const QSize& value);
+    /**
+     * @brief Getter property for Size
+     * @return Value of Size
+     */
+    QSize getSize() const;
+
+    /**
+     * @brief Setter property for Height
+     */
+    void setHeight(int value);
+    /**
+     * @brief Getter property for Height
+     * @return Value of Height
+     */
+    int getHeight() const;
+
+    /**
+     * @brief Setter property for Width
+     */
+    void setWidth(int value);
+    /**
+     * @brief Getter property for Width
+     * @return Value of Width
+     */
+    int getWidth() const;
+
+    /**
+     * @brief Setter property for XOffset
+     */
+    void setXOffset(int value);
+    /**
+     * @brief Getter property for XOffset
+     * @return Value of XOffset
+     */
+    int getXOffset() const;
+
+    /**
+     * @brief Setter property for YOffset
+     */
+    void setYOffset(int value);
+    /**
+     * @brief Getter property for YOffset
+     * @return Value of YOffset
+     */
+    int getYOffset() const;
 
     static const int MaxHeight = 28;
 
@@ -74,7 +184,15 @@ class SVWidgetsLib_EXPORT PipelineItem
       Remove
     };
 
-    SIMPL_INSTANCE_PROPERTY(PipelineItem::AnimationType, CurrentAnimationType)
+    /**
+     * @brief Setter property for CurrentAnimationType
+     */
+    void setCurrentAnimationType(const PipelineItem::AnimationType& value);
+    /**
+     * @brief Getter property for CurrentAnimationType
+     * @return Value of CurrentAnimationType
+     */
+    PipelineItem::AnimationType getCurrentAnimationType() const;
 
     enum PipelineItemData
     {
@@ -90,7 +208,15 @@ class SVWidgetsLib_EXPORT PipelineItem
       Completed = 2, //!<
       Disabled = 3
     };
-    SIMPL_INSTANCE_PROPERTY(PipelineItem::WidgetState, WidgetState)
+    /**
+     * @brief Setter property for WidgetState
+     */
+    void setWidgetState(const PipelineItem::WidgetState& value);
+    /**
+     * @brief Getter property for WidgetState
+     * @return Value of WidgetState
+     */
+    PipelineItem::WidgetState getWidgetState() const;
 
     enum class PipelineState : EnumType
     {
@@ -98,7 +224,15 @@ class SVWidgetsLib_EXPORT PipelineItem
       Stopped = 1,
       Paused = 4,
     };
-    SIMPL_INSTANCE_PROPERTY(PipelineItem::PipelineState, PipelineState)
+    /**
+     * @brief Setter property for PipelineState
+     */
+    void setPipelineState(const PipelineItem::PipelineState& value);
+    /**
+     * @brief Getter property for PipelineState
+     * @return Value of PipelineState
+     */
+    PipelineItem::PipelineState getPipelineState() const;
 
     enum class ErrorState : EnumType
     {
@@ -106,7 +240,15 @@ class SVWidgetsLib_EXPORT PipelineItem
       Error = 1,
       Warning = 2,
     };
-    SIMPL_INSTANCE_PROPERTY(PipelineItem::ErrorState, ErrorState)
+    /**
+     * @brief Setter property for ErrorState
+     */
+    void setErrorState(const PipelineItem::ErrorState& value);
+    /**
+     * @brief Getter property for ErrorState
+     * @return Value of ErrorState
+     */
+    PipelineItem::ErrorState getErrorState() const;
 
     enum class ItemType : EnumType
     {
@@ -115,7 +257,15 @@ class SVWidgetsLib_EXPORT PipelineItem
       DropIndicator,
       Unknown
     };
-    SIMPL_INSTANCE_PROPERTY(PipelineItem::ItemType, ItemType)
+    /**
+     * @brief Setter property for ItemType
+     */
+    void setItemType(const PipelineItem::ItemType& value);
+    /**
+     * @brief Getter property for ItemType
+     * @return Value of ItemType
+     */
+    PipelineItem::ItemType getItemType() const;
 
     PipelineItem* child(int number);
     PipelineItem* parent();
@@ -144,10 +294,32 @@ class SVWidgetsLib_EXPORT PipelineItem
     static QString TopLevelString();
 
   private:
+    FilterInputWidget* m_FilterInputWidget = nullptr;
+
+    bool m_FilterEnabled = true;
+    QIcon m_Icon;
+    bool m_Expanded = false;
+    QString m_ItemTooltip = "";
+    QString m_DropIndicatorText = "";
+    int m_BorderSize = 0;
+    QSize m_Size = QSize(0, MaxHeight);
+    int m_Height = 0;
+    int m_Width = 0;
+    int m_XOffset = 0;
+    int m_YOffset = 0;
+    PipelineItem::AnimationType m_CurrentAnimationType = {};
+    PipelineItem::WidgetState m_WidgetState = {};
+    PipelineItem::PipelineState m_PipelineState = {};
+    PipelineItem::ErrorState m_ErrorState = {};
+    PipelineItem::ItemType m_ItemType = {};
+
     QList<PipelineItem*>                    m_ChildItems;
     QVector<QVariant>                       m_ItemData;
     AbstractFilter::Pointer                 m_Filter = nullptr;
-    PipelineItem*                           m_ParentItem;
+    PipelineItem* m_ParentItem = nullptr;
+
+    bool m_ActivePipeline = false;
+    bool m_PipelineSaved = false;
 
     void setupFilterInputWidget();
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
index 37a80f0ca2..73f7f52c40 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
@@ -35,8 +35,6 @@
 
 #include <QtWidgets/QStyledItemDelegate>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class SVPipelineView;
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
index 006df3e3be..09155fec0c 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
@@ -816,3 +816,27 @@ QColor PipelineModel::getForegroundColor(const QModelIndex &index) const
 
   return fgColor;
 }
+
+// -----------------------------------------------------------------------------
+QString PipelineModel::getNameOfClass() const
+{
+  return QString("PipelineModel");
+}
+
+// -----------------------------------------------------------------------------
+QString PipelineModel::ClassName()
+{
+  return QString("PipelineModel");
+}
+
+// -----------------------------------------------------------------------------
+void PipelineModel::setMaxNumberOfPipelines(int value)
+{
+  m_MaxNumberOfPipelines = value;
+}
+
+// -----------------------------------------------------------------------------
+int PipelineModel::getMaxNumberOfPipelines() const
+{
+  return m_MaxNumberOfPipelines;
+}
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.h b/Source/SVWidgetsLib/Widgets/PipelineModel.h
index 647402eeac..07cf8c1caa 100755
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.h
@@ -36,7 +36,6 @@
 #include <QtCore/QVariant>
 
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 
@@ -51,9 +50,16 @@ class SVWidgetsLib_EXPORT PipelineModel : public QAbstractItemModel
     Q_OBJECT
 
   public:
-    SIMPL_TYPE_MACRO(PipelineModel)
+    /**
+     * @brief Returns the name of the class for PipelineModel
+     */
+    QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for PipelineModel
+     */
+    static QString ClassName();
 
-    PipelineModel(QObject* parent = 0);
+    PipelineModel(QObject* parent = nullptr);
 
     ~PipelineModel() override;
 
@@ -72,7 +78,15 @@ class SVWidgetsLib_EXPORT PipelineModel : public QAbstractItemModel
       AnimationTypeRole
     };
 
-    SIMPL_INSTANCE_PROPERTY(int, MaxNumberOfPipelines)
+    /**
+     * @brief Setter property for MaxNumberOfPipelines
+     */
+    void setMaxNumberOfPipelines(int value);
+    /**
+     * @brief Getter property for MaxNumberOfPipelines
+     * @return Value of MaxNumberOfPipelines
+     */
+    int getMaxNumberOfPipelines() const;
 
     /**
      * @brief updateActivePipeline
@@ -140,6 +154,8 @@ class SVWidgetsLib_EXPORT PipelineModel : public QAbstractItemModel
     void standardOutputMessageGenerated(const QString &msg);
 
   private:
+    int m_MaxNumberOfPipelines = {};
+
     PipelineItem*                       m_RootItem;
 
     QPersistentModelIndex               m_ActivePipelineIndex;
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
index 7b49443ccf..426d79e3e9 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
@@ -153,3 +153,39 @@ void PopUpWidget::setArrowOrientation(ArrowOrientation orientation)
 {
   m_ArrowOrientation = orientation;
 }
+
+// -----------------------------------------------------------------------------
+void PopUpWidget::setArrowHeight(int value)
+{
+  m_ArrowHeight = value;
+}
+
+// -----------------------------------------------------------------------------
+int PopUpWidget::getArrowHeight() const
+{
+  return m_ArrowHeight;
+}
+
+// -----------------------------------------------------------------------------
+void PopUpWidget::setArrowWidth(int value)
+{
+  m_ArrowWidth = value;
+}
+
+// -----------------------------------------------------------------------------
+int PopUpWidget::getArrowWidth() const
+{
+  return m_ArrowWidth;
+}
+
+// -----------------------------------------------------------------------------
+void PopUpWidget::setArrowOffset(int value)
+{
+  m_ArrowOffset = value;
+}
+
+// -----------------------------------------------------------------------------
+int PopUpWidget::getArrowOffset() const
+{
+  return m_ArrowOffset;
+}
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.h b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
index c06f7e0393..a6c889e3f6 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
@@ -33,7 +33,6 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -61,9 +60,35 @@ class SVWidgetsLib_EXPORT PopUpWidget : public QWidget, private Ui::PopUpWidget
       None
     };
 
-    SIMPL_INSTANCE_PROPERTY(int, ArrowHeight)
-    SIMPL_INSTANCE_PROPERTY(int, ArrowWidth)
-    SIMPL_INSTANCE_PROPERTY(int, ArrowOffset)
+    /**
+     * @brief Setter property for ArrowHeight
+     */
+    void setArrowHeight(int value);
+    /**
+     * @brief Getter property for ArrowHeight
+     * @return Value of ArrowHeight
+     */
+    int getArrowHeight() const;
+
+    /**
+     * @brief Setter property for ArrowWidth
+     */
+    void setArrowWidth(int value);
+    /**
+     * @brief Getter property for ArrowWidth
+     * @return Value of ArrowWidth
+     */
+    int getArrowWidth() const;
+
+    /**
+     * @brief Setter property for ArrowOffset
+     */
+    void setArrowOffset(int value);
+    /**
+     * @brief Getter property for ArrowOffset
+     * @return Value of ArrowOffset
+     */
+    int getArrowOffset() const;
 
     /**
      * @brief setupGui
@@ -86,6 +111,10 @@ class SVWidgetsLib_EXPORT PopUpWidget : public QWidget, private Ui::PopUpWidget
     void paintEvent(QPaintEvent* event) override;
 
   private:
+    int m_ArrowHeight = {};
+    int m_ArrowWidth = {};
+    int m_ArrowOffset = {};
+
     ArrowOrientation                    m_ArrowOrientation;
 
   public:
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 7354d9dad6..6ef252608d 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -57,14 +57,17 @@
 #include <QtWidgets/QMenu>
 #include <QtWidgets/QMessageBox>
 
+#include <QtCore/QDebug>
+
 #include "SIMPLib/Common/DocRequestManager.h"
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
 #include "SIMPLib/CoreFilters/Breakpoint.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h"
 
@@ -2231,3 +2234,45 @@ QPixmap SVPipelineView::setPixmapColor(const QPixmap& pixmap, const QColor& pixm
 
   return QPixmap::fromImage(image);
 }
+
+// -----------------------------------------------------------------------------
+void SVPipelineView::setPipelineState(const SVPipelineView::PipelineViewState& value)
+{
+  m_PipelineState = value;
+}
+
+// -----------------------------------------------------------------------------
+SVPipelineView::PipelineViewState SVPipelineView::getPipelineState() const
+{
+  return m_PipelineState;
+}
+
+// -----------------------------------------------------------------------------
+QAction* SVPipelineView::getActionEnableFilter() const
+{
+  return m_ActionEnableFilter;
+}
+
+// -----------------------------------------------------------------------------
+QAction* SVPipelineView::getActionCut() const
+{
+  return m_ActionCut;
+}
+
+// -----------------------------------------------------------------------------
+QAction* SVPipelineView::getActionCopy() const
+{
+  return m_ActionCopy;
+}
+
+// -----------------------------------------------------------------------------
+QAction* SVPipelineView::getActionPaste() const
+{
+  return m_ActionPaste;
+}
+
+// -----------------------------------------------------------------------------
+QAction* SVPipelineView::getActionClearPipeline() const
+{
+  return m_ActionClearPipeline;
+}
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index d3a7858ffb..19a021de57 100755
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -35,6 +35,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include <stack>
 #include <vector>
 
@@ -48,6 +50,8 @@
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+class DataContainerArray;
+using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/PipelineView.h"
@@ -82,13 +86,45 @@ class SVWidgetsLib_EXPORT SVPipelineView : public QListView, public PipelineView
 
   using IndexedFilterObject = std::pair<int, PipelineFilterObject*>;
 
-  SIMPL_INSTANCE_PROPERTY(SVPipelineView::PipelineViewState, PipelineState)
+  /**
+   * @brief Setter property for PipelineState
+   */
+  void setPipelineState(const SVPipelineView::PipelineViewState& value);
+  /**
+   * @brief Getter property for PipelineState
+   * @return Value of PipelineState
+   */
+  SVPipelineView::PipelineViewState getPipelineState() const;
+
+  /**
+   * @brief Getter property for ActionEnableFilter
+   * @return Value of ActionEnableFilter
+   */
+  QAction* getActionEnableFilter() const;
+
+  /**
+   * @brief Getter property for ActionCut
+   * @return Value of ActionCut
+   */
+  QAction* getActionCut() const;
+
+  /**
+   * @brief Getter property for ActionCopy
+   * @return Value of ActionCopy
+   */
+  QAction* getActionCopy() const;
+
+  /**
+   * @brief Getter property for ActionPaste
+   * @return Value of ActionPaste
+   */
+  QAction* getActionPaste() const;
 
-  SIMPL_GET_PROPERTY(QAction*, ActionEnableFilter)
-  SIMPL_GET_PROPERTY(QAction*, ActionCut)
-  SIMPL_GET_PROPERTY(QAction*, ActionCopy)
-  SIMPL_GET_PROPERTY(QAction*, ActionPaste)
-  SIMPL_GET_PROPERTY(QAction*, ActionClearPipeline)
+  /**
+   * @brief Getter property for ActionClearPipeline
+   * @return Value of ActionClearPipeline
+   */
+  QAction* getActionClearPipeline() const;
 
   SVPipelineView(QWidget* parent = nullptr);
   ~SVPipelineView() override;
@@ -413,9 +449,11 @@ private slots:
   void finishPipeline();
 
 private:
+  SVPipelineView::PipelineViewState m_PipelineState = {};
+
   QThread* m_WorkerThread = nullptr;
   FilterPipeline::Pointer m_PipelineInFlight;
-  QVector<DataContainerArray::Pointer> m_PreflightDataContainerArrays;
+  QVector<DataContainerArrayShPtrType> m_PreflightDataContainerArrays;
   QList<QObject*> m_PipelineMessageObservers;
 
   QUndoCommand* m_MoveCommand = nullptr;
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index de09ab20d2..f35639ca2c 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -772,3 +772,1485 @@ QString SVStyle::WrapTextWithHtmlStyle(const QString& msg, bool bold) const
   }
   return formattedMessage;
 }
+
+// -----------------------------------------------------------------------------
+QString SVStyle::getNameOfClass() const
+{
+  return QString("SVStyle");
+}
+
+// -----------------------------------------------------------------------------
+QString SVStyle::ClassName()
+{
+  return QString("SVStyle");
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFader_color(const QColor& value)
+{
+  m_Fader_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFader_color() const
+{
+  return m_Fader_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setWidget_Error_color(const QColor& value)
+{
+  m_Widget_Error_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getWidget_Error_color() const
+{
+  return m_Widget_Error_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setText_Error_color(const QColor& value)
+{
+  m_Text_Error_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getText_Error_color() const
+{
+  return m_Text_Error_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setCentralWidget_background_color(const QColor& value)
+{
+  m_CentralWidget_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getCentralWidget_background_color() const
+{
+  return m_CentralWidget_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLabel_color(const QColor& value)
+{
+  m_QLabel_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLabel_color() const
+{
+  return m_QLabel_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterInputWidget_background_color(const QColor& value)
+{
+  m_FilterInputWidget_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterInputWidget_background_color() const
+{
+  return m_FilterInputWidget_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQScrollArea_background_color(const QColor& value)
+{
+  m_QScrollArea_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQScrollArea_background_color() const
+{
+  return m_QScrollArea_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setVariablesTabContents_background_color(const QColor& value)
+{
+  m_VariablesTabContents_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getVariablesTabContents_background_color() const
+{
+  return m_VariablesTabContents_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterParameterWidget_background_color(const QColor& value)
+{
+  m_FilterParameterWidget_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterParameterWidget_background_color() const
+{
+  return m_FilterParameterWidget_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterParameterWidget_border_color(const QColor& value)
+{
+  m_FilterParameterWidget_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterParameterWidget_border_color() const
+{
+  return m_FilterParameterWidget_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQGroupBoxTitle_background_color(const QColor& value)
+{
+  m_QGroupBoxTitle_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQGroupBoxTitle_background_color() const
+{
+  return m_QGroupBoxTitle_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQGroupBox_background_color(const QColor& value)
+{
+  m_QGroupBox_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQGroupBox_background_color() const
+{
+  return m_QGroupBox_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQDockWidget_border_color(const QColor& value)
+{
+  m_QDockWidget_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQDockWidget_border_color() const
+{
+  return m_QDockWidget_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQDockWidget_color(const QColor& value)
+{
+  m_QDockWidget_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQDockWidget_color() const
+{
+  return m_QDockWidget_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQDockWidgetTitle_background_color(const QColor& value)
+{
+  m_QDockWidgetTitle_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQDockWidgetTitle_background_color() const
+{
+  return m_QDockWidgetTitle_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQDockWidgetTitle_color(const QColor& value)
+{
+  m_QDockWidgetTitle_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQDockWidgetTitle_color() const
+{
+  return m_QDockWidgetTitle_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListView_background_color(const QColor& value)
+{
+  m_QListView_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListView_background_color() const
+{
+  return m_QListView_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListView_color(const QColor& value)
+{
+  m_QListView_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListView_color() const
+{
+  return m_QListView_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListViewItemHover_background_color(const QColor& value)
+{
+  m_QListViewItemHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListViewItemHover_background_color() const
+{
+  return m_QListViewItemHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListViewItemHover_color(const QColor& value)
+{
+  m_QListViewItemHover_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListViewItemHover_color() const
+{
+  return m_QListViewItemHover_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListViewItemSelected_background_color(const QColor& value)
+{
+  m_QListViewItemSelected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListViewItemSelected_background_color() const
+{
+  return m_QListViewItemSelected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQListViewItemSelected_color(const QColor& value)
+{
+  m_QListViewItemSelected_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQListViewItemSelected_color() const
+{
+  return m_QListViewItemSelected_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMainWindowSeparator_background_color(const QColor& value)
+{
+  m_QMainWindowSeparator_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMainWindowSeparator_background_color() const
+{
+  return m_QMainWindowSeparator_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuBar_background_color(const QColor& value)
+{
+  m_QMenuBar_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuBar_background_color() const
+{
+  return m_QMenuBar_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuBarItem_color(const QColor& value)
+{
+  m_QMenuBarItem_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuBarItem_color() const
+{
+  return m_QMenuBarItem_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuBarItemPressed_color(const QColor& value)
+{
+  m_QMenuBarItemPressed_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuBarItemPressed_color() const
+{
+  return m_QMenuBarItemPressed_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuBarItemSelected_background_color(const QColor& value)
+{
+  m_QMenuBarItemSelected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuBarItemSelected_background_color() const
+{
+  return m_QMenuBarItemSelected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuBarItemSelected_color(const QColor& value)
+{
+  m_QMenuBarItemSelected_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuBarItemSelected_color() const
+{
+  return m_QMenuBarItemSelected_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenu_background_color(const QColor& value)
+{
+  m_QMenu_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenu_background_color() const
+{
+  return m_QMenu_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenu_color(const QColor& value)
+{
+  m_QMenu_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenu_color() const
+{
+  return m_QMenu_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuItemSelected_background_color(const QColor& value)
+{
+  m_QMenuItemSelected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuItemSelected_background_color() const
+{
+  return m_QMenuItemSelected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuItemSelected_color(const QColor& value)
+{
+  m_QMenuItemSelected_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuItemSelected_color() const
+{
+  return m_QMenuItemSelected_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQMenuItemDisabled_background_color(const QColor& value)
+{
+  m_QMenuItemDisabled_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQMenuItemDisabled_background_color() const
+{
+  return m_QMenuItemDisabled_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButton_background_color(const QColor& value)
+{
+  m_QPushButton_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButton_background_color() const
+{
+  return m_QPushButton_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButton_border_color(const QColor& value)
+{
+  m_QPushButton_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButton_border_color() const
+{
+  return m_QPushButton_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonHover_background_color(const QColor& value)
+{
+  m_QPushButtonHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonHover_background_color() const
+{
+  return m_QPushButtonHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonPressed_background_color(const QColor& value)
+{
+  m_QPushButtonPressed_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonPressed_background_color() const
+{
+  return m_QPushButtonPressed_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonDefault_background_color(const QColor& value)
+{
+  m_QPushButtonDefault_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonDefault_background_color() const
+{
+  return m_QPushButtonDefault_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonDefaultPressed_background_color(const QColor& value)
+{
+  m_QPushButtonDefaultPressed_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonDefaultPressed_background_color() const
+{
+  return m_QPushButtonDefaultPressed_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonDefaultHover_background_color(const QColor& value)
+{
+  m_QPushButtonDefaultHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonDefaultHover_background_color() const
+{
+  return m_QPushButtonDefaultHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonDefault_border_color(const QColor& value)
+{
+  m_QPushButtonDefault_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonDefault_border_color() const
+{
+  return m_QPushButtonDefault_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQPushButtonDefault_text_color(const QColor& value)
+{
+  m_QPushButtonDefault_text_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQPushButtonDefault_text_color() const
+{
+  return m_QPushButtonDefault_text_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQSplitter_handle_start_color(const QColor& value)
+{
+  m_QSplitter_handle_start_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQSplitter_handle_start_color() const
+{
+  return m_QSplitter_handle_start_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQSplitter_handle_end_color(const QColor& value)
+{
+  m_QSplitter_handle_end_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQSplitter_handle_end_color() const
+{
+  return m_QSplitter_handle_end_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButton_background_color(const QColor& value)
+{
+  m_QToolButton_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButton_background_color() const
+{
+  return m_QToolButton_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButton_color(const QColor& value)
+{
+  m_QToolButton_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButton_color() const
+{
+  return m_QToolButton_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButton_border_color(const QColor& value)
+{
+  m_QToolButton_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButton_border_color() const
+{
+  return m_QToolButton_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButtonChecked_background_color(const QColor& value)
+{
+  m_QToolButtonChecked_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButtonChecked_background_color() const
+{
+  return m_QToolButtonChecked_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButtonDisabled_background_color(const QColor& value)
+{
+  m_QToolButtonDisabled_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButtonDisabled_background_color() const
+{
+  return m_QToolButtonDisabled_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolButtonDisabled_color(const QColor& value)
+{
+  m_QToolButtonDisabled_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolButtonDisabled_color() const
+{
+  return m_QToolButtonDisabled_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQStatusBar_border_color(const QColor& value)
+{
+  m_QStatusBar_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQStatusBar_border_color() const
+{
+  return m_QStatusBar_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTableWidget_color(const QColor& value)
+{
+  m_QTableWidget_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTableWidget_color() const
+{
+  return m_QTableWidget_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTableWidget_selected_background_color(const QColor& value)
+{
+  m_QTableWidget_selected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTableWidget_selected_background_color() const
+{
+  return m_QTableWidget_selected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderView_background_color(const QColor& value)
+{
+  m_QHeaderView_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderView_background_color() const
+{
+  return m_QHeaderView_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderView_border_color(const QColor& value)
+{
+  m_QHeaderView_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderView_border_color() const
+{
+  return m_QHeaderView_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderView_color(const QColor& value)
+{
+  m_QHeaderView_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderView_color() const
+{
+  return m_QHeaderView_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderViewDisabled_background_color(const QColor& value)
+{
+  m_QHeaderViewDisabled_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderViewDisabled_background_color() const
+{
+  return m_QHeaderViewDisabled_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderViewDisabled_border_color(const QColor& value)
+{
+  m_QHeaderViewDisabled_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderViewDisabled_border_color() const
+{
+  return m_QHeaderViewDisabled_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQHeaderViewDisabled_color(const QColor& value)
+{
+  m_QHeaderViewDisabled_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQHeaderViewDisabled_color() const
+{
+  return m_QHeaderViewDisabled_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabWidgetPane_border_color(const QColor& value)
+{
+  m_QTabWidgetPane_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabWidgetPane_border_color() const
+{
+  return m_QTabWidgetPane_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabWidgetPane_background_color(const QColor& value)
+{
+  m_QTabWidgetPane_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabWidgetPane_background_color() const
+{
+  return m_QTabWidgetPane_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabBarTab_border_color(const QColor& value)
+{
+  m_QTabBarTab_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabBarTab_border_color() const
+{
+  return m_QTabBarTab_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabBarTabSelected_background_color(const QColor& value)
+{
+  m_QTabBarTabSelected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabBarTabSelected_background_color() const
+{
+  return m_QTabBarTabSelected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabBarTabSelected_color(const QColor& value)
+{
+  m_QTabBarTabSelected_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabBarTabSelected_color() const
+{
+  return m_QTabBarTabSelected_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabBarTabNotSelected_background_color(const QColor& value)
+{
+  m_QTabBarTabNotSelected_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabBarTabNotSelected_background_color() const
+{
+  return m_QTabBarTabNotSelected_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTabBarTabNotSelectedHover_background_color(const QColor& value)
+{
+  m_QTabBarTabNotSelectedHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTabBarTabNotSelectedHover_background_color() const
+{
+  return m_QTabBarTabNotSelectedHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTextEdit_background_color(const QColor& value)
+{
+  m_QTextEdit_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTextEdit_background_color() const
+{
+  return m_QTextEdit_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTextEdit_color(const QColor& value)
+{
+  m_QTextEdit_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTextEdit_color() const
+{
+  return m_QTextEdit_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLineEdit_color(const QColor& value)
+{
+  m_QLineEdit_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLineEdit_color() const
+{
+  return m_QLineEdit_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLineEdit_background_color(const QColor& value)
+{
+  m_QLineEdit_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLineEdit_background_color() const
+{
+  return m_QLineEdit_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLineEdit_border_color(const QColor& value)
+{
+  m_QLineEdit_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLineEdit_border_color() const
+{
+  return m_QLineEdit_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLineEditDisabled_background_color(const QColor& value)
+{
+  m_QLineEditDisabled_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLineEditDisabled_background_color() const
+{
+  return m_QLineEditDisabled_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQLineEditError_background_color(const QColor& value)
+{
+  m_QLineEditError_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQLineEditError_background_color() const
+{
+  return m_QLineEditError_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQSpinBoxArrow_background_color(const QColor& value)
+{
+  m_QSpinBoxArrow_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQSpinBoxArrow_background_color() const
+{
+  return m_QSpinBoxArrow_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQSpinBoxArrow_hover_background_color(const QColor& value)
+{
+  m_QSpinBoxArrow_hover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQSpinBoxArrow_hover_background_color() const
+{
+  return m_QSpinBoxArrow_hover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBox_border_color(const QColor& value)
+{
+  m_QComboBox_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBox_border_color() const
+{
+  return m_QComboBox_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBox_background_color(const QColor& value)
+{
+  m_QComboBox_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBox_background_color() const
+{
+  return m_QComboBox_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxArrow_background_color(const QColor& value)
+{
+  m_QComboBoxArrow_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxArrow_background_color() const
+{
+  return m_QComboBoxArrow_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxArrow_hover_background_color(const QColor& value)
+{
+  m_QComboBoxArrow_hover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxArrow_hover_background_color() const
+{
+  return m_QComboBoxArrow_hover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxItem_border_color(const QColor& value)
+{
+  m_QComboBoxItem_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxItem_border_color() const
+{
+  return m_QComboBoxItem_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxItem_selection_color(const QColor& value)
+{
+  m_QComboBoxItem_selection_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxItem_selection_color() const
+{
+  return m_QComboBoxItem_selection_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxItem_background_color(const QColor& value)
+{
+  m_QComboBoxItem_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxItem_background_color() const
+{
+  return m_QComboBoxItem_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxDisabled_background_color(const QColor& value)
+{
+  m_QComboBoxDisabled_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxDisabled_background_color() const
+{
+  return m_QComboBoxDisabled_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQComboBoxDisabled_color(const QColor& value)
+{
+  m_QComboBoxDisabled_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQComboBoxDisabled_color() const
+{
+  return m_QComboBoxDisabled_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolBar_background_color(const QColor& value)
+{
+  m_QToolBar_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolBar_background_color() const
+{
+  return m_QToolBar_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQToolBar_border_color(const QColor& value)
+{
+  m_QToolBar_border_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQToolBar_border_color() const
+{
+  return m_QToolBar_border_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeView_background_color(const QColor& value)
+{
+  m_QTreeView_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeView_background_color() const
+{
+  return m_QTreeView_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItem_background_color(const QColor& value)
+{
+  m_QTreeViewItem_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItem_background_color() const
+{
+  return m_QTreeViewItem_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItem_error_background_color(const QColor& value)
+{
+  m_QTreeViewItem_error_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItem_error_background_color() const
+{
+  return m_QTreeViewItem_error_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItem_color(const QColor& value)
+{
+  m_QTreeViewItem_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItem_color() const
+{
+  return m_QTreeViewItem_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItem_error_color(const QColor& value)
+{
+  m_QTreeViewItem_error_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItem_error_color() const
+{
+  return m_QTreeViewItem_error_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItem_font_size(int value)
+{
+  m_QTreeViewItem_font_size = value;
+}
+
+// -----------------------------------------------------------------------------
+int SVStyle::getQTreeViewItem_font_size() const
+{
+  return m_QTreeViewItem_font_size;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemHover_background_color(const QColor& value)
+{
+  m_QTreeViewItemHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemHover_background_color() const
+{
+  return m_QTreeViewItemHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemHover_color(const QColor& value)
+{
+  m_QTreeViewItemHover_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemHover_color() const
+{
+  return m_QTreeViewItemHover_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemSelectedActive_background_color(const QColor& value)
+{
+  m_QTreeViewItemSelectedActive_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemSelectedActive_background_color() const
+{
+  return m_QTreeViewItemSelectedActive_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemSelectedActive_color(const QColor& value)
+{
+  m_QTreeViewItemSelectedActive_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemSelectedActive_color() const
+{
+  return m_QTreeViewItemSelectedActive_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemSelectedNotActive_background_color(const QColor& value)
+{
+  m_QTreeViewItemSelectedNotActive_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemSelectedNotActive_background_color() const
+{
+  return m_QTreeViewItemSelectedNotActive_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewItemSelectedNotActive_color(const QColor& value)
+{
+  m_QTreeViewItemSelectedNotActive_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewItemSelectedNotActive_color() const
+{
+  return m_QTreeViewItemSelectedNotActive_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewBranch_background_color(const QColor& value)
+{
+  m_QTreeViewBranch_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewBranch_background_color() const
+{
+  return m_QTreeViewBranch_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewBranchHover_background_color(const QColor& value)
+{
+  m_QTreeViewBranchHover_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewBranchHover_background_color() const
+{
+  return m_QTreeViewBranchHover_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewBranchHover_color(const QColor& value)
+{
+  m_QTreeViewBranchHover_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewBranchHover_color() const
+{
+  return m_QTreeViewBranchHover_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewBranchSelectedActive_background_color(const QColor& value)
+{
+  m_QTreeViewBranchSelectedActive_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewBranchSelectedActive_background_color() const
+{
+  return m_QTreeViewBranchSelectedActive_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setQTreeViewBranchSelectedNotActive_background_color(const QColor& value)
+{
+  m_QTreeViewBranchSelectedNotActive_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getQTreeViewBranchSelectedNotActive_background_color() const
+{
+  return m_QTreeViewBranchSelectedNotActive_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterBackgroundColor(const QColor& value)
+{
+  m_FilterBackgroundColor = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterBackgroundColor() const
+{
+  return m_FilterBackgroundColor;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterSelectionColor(const QColor& value)
+{
+  m_FilterSelectionColor = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterSelectionColor() const
+{
+  return m_FilterSelectionColor;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setFilterFontColor(const QColor& value)
+{
+  m_FilterFontColor = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getFilterFontColor() const
+{
+  return m_FilterFontColor;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_DataContainer_color(const QColor& value)
+{
+  m_DataArrayPath_DataContainer_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_DataContainer_color() const
+{
+  return m_DataArrayPath_DataContainer_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_AttributeMatrix_color(const QColor& value)
+{
+  m_DataArrayPath_AttributeMatrix_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_AttributeMatrix_color() const
+{
+  return m_DataArrayPath_AttributeMatrix_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_DataArray_color(const QColor& value)
+{
+  m_DataArrayPath_DataArray_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_DataArray_color() const
+{
+  return m_DataArrayPath_DataArray_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_Invalid_color(const QColor& value)
+{
+  m_DataArrayPath_Invalid_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_Invalid_color() const
+{
+  return m_DataArrayPath_Invalid_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_DataContainer_background_color(const QColor& value)
+{
+  m_DataArrayPath_DataContainer_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_DataContainer_background_color() const
+{
+  return m_DataArrayPath_DataContainer_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_AttributeMatrix_background_color(const QColor& value)
+{
+  m_DataArrayPath_AttributeMatrix_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_AttributeMatrix_background_color() const
+{
+  return m_DataArrayPath_AttributeMatrix_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_DataArray_background_color(const QColor& value)
+{
+  m_DataArrayPath_DataArray_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_DataArray_background_color() const
+{
+  return m_DataArrayPath_DataArray_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_Invalid_background_color(const QColor& value)
+{
+  m_DataArrayPath_Invalid_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_Invalid_background_color() const
+{
+  return m_DataArrayPath_Invalid_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_border_normal(const QColor& value)
+{
+  m_DataArrayPath_border_normal = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_border_normal() const
+{
+  return m_DataArrayPath_border_normal;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_border_not_found(const QColor& value)
+{
+  m_DataArrayPath_border_not_found = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_border_not_found() const
+{
+  return m_DataArrayPath_border_not_found;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_border_drag_enabled(const QColor& value)
+{
+  m_DataArrayPath_border_drag_enabled = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_border_drag_enabled() const
+{
+  return m_DataArrayPath_border_drag_enabled;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataArrayPath_border_drag_disabled(const QColor& value)
+{
+  m_DataArrayPath_border_drag_disabled = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataArrayPath_border_drag_disabled() const
+{
+  return m_DataArrayPath_border_drag_disabled;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataPathLabel_color(const QColor& value)
+{
+  m_DataPathLabel_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataPathLabel_color() const
+{
+  return m_DataPathLabel_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setDataPathLabel_Disabled_color(const QColor& value)
+{
+  m_DataPathLabel_Disabled_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getDataPathLabel_Disabled_color() const
+{
+  return m_DataPathLabel_Disabled_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setSIMPLViewPipelineDockWidgetTitle_inactive_background_color(const QColor& value)
+{
+  m_SIMPLViewPipelineDockWidgetTitle_inactive_background_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getSIMPLViewPipelineDockWidgetTitle_inactive_background_color() const
+{
+  return m_SIMPLViewPipelineDockWidgetTitle_inactive_background_color;
+}
+
+// -----------------------------------------------------------------------------
+void SVStyle::setSIMPLViewPipelineDockWidgetTitle_inactive_text_color(const QColor& value)
+{
+  m_SIMPLViewPipelineDockWidgetTitle_inactive_text_color = value;
+}
+
+// -----------------------------------------------------------------------------
+QColor SVStyle::getSIMPLViewPipelineDockWidgetTitle_inactive_text_color() const
+{
+  return m_SIMPLViewPipelineDockWidgetTitle_inactive_text_color;
+}
+
+// -----------------------------------------------------------------------------
+QString SVStyle::getCurrentThemeFilePath() const
+{
+  return m_CurrentThemeFilePath;
+}
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index ff760da81c..52d48ab1d9 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -41,7 +41,6 @@
 #include <QtGui/QFont>
 #include <QtGui/QIcon>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
@@ -71,8 +70,15 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
 {
     Q_OBJECT
   public:
-    SIMPL_TYPE_MACRO(SVStyle)
-    
+    /**
+     * @brief Returns the name of the class for SVStyle
+     */
+    virtual QString getNameOfClass() const;
+    /**
+     * @brief Returns the name of the class for SVStyle
+     */
+    static QString ClassName();
+
     ~SVStyle() override;
     
     /**
@@ -81,392 +87,1470 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
      */
     static SVStyle* Instance();
 
-    SIMPL_GET_PROPERTY(QString, CurrentThemeFilePath)
+    QString getCurrentThemeFilePath() const;
 
+    /**
+     * @brief Setter property for Fader_color
+     */
+    void setFader_color(const QColor& value);
+    /**
+     * @brief Getter property for Fader_color
+     * @return Value of Fader_color
+     */
+    QColor getFader_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, Fader_color)
     Q_PROPERTY(QColor Fader_color READ getFader_color WRITE setFader_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, Widget_Error_color)    
-    Q_PROPERTY(QColor Widget_Error_color READ getWidget_Error_color WRITE setWidget_Error_color)    
+    /**
+     * @brief Setter property for Widget_Error_color
+     */
+    void setWidget_Error_color(const QColor& value);
+    /**
+     * @brief Getter property for Widget_Error_color
+     * @return Value of Widget_Error_color
+     */
+    QColor getWidget_Error_color() const;
+
+    Q_PROPERTY(QColor Widget_Error_color READ getWidget_Error_color WRITE setWidget_Error_color)
+
+    /**
+     * @brief Setter property for Text_Error_color
+     */
+    void setText_Error_color(const QColor& value);
+    /**
+     * @brief Getter property for Text_Error_color
+     * @return Value of Text_Error_color
+     */
+    QColor getText_Error_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, Text_Error_color)    
     Q_PROPERTY(QColor Text_Error_color READ getText_Error_color WRITE setText_Error_color)
-        
-    SIMPL_INSTANCE_PROPERTY(QColor, CentralWidget_background_color)    
-    Q_PROPERTY(QColor CentralWidget_background_color READ getCentralWidget_background_color WRITE setCentralWidget_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QLabel_color)    
-    Q_PROPERTY(QColor QLabel_color READ getQLabel_color WRITE setQLabel_color)    
 
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterInputWidget_background_color)    
-    Q_PROPERTY(QColor FilterInputWidget_background_color READ getFilterInputWidget_background_color WRITE setFilterInputWidget_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QScrollArea_background_color)    
-    Q_PROPERTY(QColor QScrollArea_background_color READ getQScrollArea_background_color WRITE setQScrollArea_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, VariablesTabContents_background_color)    
-    Q_PROPERTY(QColor VariablesTabContents_background_color READ getVariablesTabContents_background_color WRITE setVariablesTabContents_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterParameterWidget_background_color)    
-    Q_PROPERTY(QColor FilterParameterWidget_background_color READ getFilterParameterWidget_background_color WRITE setFilterParameterWidget_background_color)    
+    /**
+     * @brief Setter property for CentralWidget_background_color
+     */
+    void setCentralWidget_background_color(const QColor& value);
+    /**
+     * @brief Getter property for CentralWidget_background_color
+     * @return Value of CentralWidget_background_color
+     */
+    QColor getCentralWidget_background_color() const;
+
+    Q_PROPERTY(QColor CentralWidget_background_color READ getCentralWidget_background_color WRITE setCentralWidget_background_color)
+
+    /**
+     * @brief Setter property for QLabel_color
+     */
+    void setQLabel_color(const QColor& value);
+    /**
+     * @brief Getter property for QLabel_color
+     * @return Value of QLabel_color
+     */
+    QColor getQLabel_color() const;
+
+    Q_PROPERTY(QColor QLabel_color READ getQLabel_color WRITE setQLabel_color)
+
+    /**
+     * @brief Setter property for FilterInputWidget_background_color
+     */
+    void setFilterInputWidget_background_color(const QColor& value);
+    /**
+     * @brief Getter property for FilterInputWidget_background_color
+     * @return Value of FilterInputWidget_background_color
+     */
+    QColor getFilterInputWidget_background_color() const;
+
+    Q_PROPERTY(QColor FilterInputWidget_background_color READ getFilterInputWidget_background_color WRITE setFilterInputWidget_background_color)
+
+    /**
+     * @brief Setter property for QScrollArea_background_color
+     */
+    void setQScrollArea_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QScrollArea_background_color
+     * @return Value of QScrollArea_background_color
+     */
+    QColor getQScrollArea_background_color() const;
+
+    Q_PROPERTY(QColor QScrollArea_background_color READ getQScrollArea_background_color WRITE setQScrollArea_background_color)
+
+    /**
+     * @brief Setter property for VariablesTabContents_background_color
+     */
+    void setVariablesTabContents_background_color(const QColor& value);
+    /**
+     * @brief Getter property for VariablesTabContents_background_color
+     * @return Value of VariablesTabContents_background_color
+     */
+    QColor getVariablesTabContents_background_color() const;
+
+    Q_PROPERTY(QColor VariablesTabContents_background_color READ getVariablesTabContents_background_color WRITE setVariablesTabContents_background_color)
+
+    /**
+     * @brief Setter property for FilterParameterWidget_background_color
+     */
+    void setFilterParameterWidget_background_color(const QColor& value);
+    /**
+     * @brief Getter property for FilterParameterWidget_background_color
+     * @return Value of FilterParameterWidget_background_color
+     */
+    QColor getFilterParameterWidget_background_color() const;
+
+    Q_PROPERTY(QColor FilterParameterWidget_background_color READ getFilterParameterWidget_background_color WRITE setFilterParameterWidget_background_color)
+
+    /**
+     * @brief Setter property for FilterParameterWidget_border_color
+     */
+    void setFilterParameterWidget_border_color(const QColor& value);
+    /**
+     * @brief Getter property for FilterParameterWidget_border_color
+     * @return Value of FilterParameterWidget_border_color
+     */
+    QColor getFilterParameterWidget_border_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterParameterWidget_border_color)
     Q_PROPERTY(QColor FilterParameterWidget_border_color READ getFilterParameterWidget_border_color WRITE setFilterParameterWidget_border_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QGroupBoxTitle_background_color)    
-    Q_PROPERTY(QColor QGroupBoxTitle_background_color READ getQGroupBoxTitle_background_color WRITE setQGroupBoxTitle_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QGroupBox_background_color)    
-    Q_PROPERTY(QColor QGroupBox_background_color READ getQGroupBox_background_color WRITE setQGroupBox_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QDockWidget_border_color)    
-    Q_PROPERTY(QColor QDockWidget_border_color READ getQDockWidget_border_color WRITE setQDockWidget_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QDockWidget_color)    
-    Q_PROPERTY(QColor QDockWidget_color READ getQDockWidget_color WRITE setQDockWidget_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QDockWidgetTitle_background_color)    
-    Q_PROPERTY(QColor QDockWidgetTitle_background_color READ getQDockWidgetTitle_background_color WRITE setQDockWidgetTitle_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QDockWidgetTitle_color)    
-    Q_PROPERTY(QColor QDockWidgetTitle_color READ getQDockWidgetTitle_color WRITE setQDockWidgetTitle_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListView_background_color)    
-    Q_PROPERTY(QColor QListView_background_color READ getQListView_background_color WRITE setQListView_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListView_color)    
-    Q_PROPERTY(QColor QListView_color READ getQListView_color WRITE setQListView_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListViewItemHover_background_color)    
-    Q_PROPERTY(QColor QListViewItemHover_background_color READ getQListViewItemHover_background_color WRITE setQListViewItemHover_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListViewItemHover_color)    
-    Q_PROPERTY(QColor QListViewItemHover_color READ getQListViewItemHover_color WRITE setQListViewItemHover_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListViewItemSelected_background_color)    
-    Q_PROPERTY(QColor QListViewItemSelected_background_color READ getQListViewItemSelected_background_color WRITE setQListViewItemSelected_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QListViewItemSelected_color)    
-    Q_PROPERTY(QColor QListViewItemSelected_color READ getQListViewItemSelected_color WRITE setQListViewItemSelected_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMainWindowSeparator_background_color)    
-    Q_PROPERTY(QColor QMainWindowSeparator_background_color READ getQMainWindowSeparator_background_color WRITE setQMainWindowSeparator_background_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuBar_background_color)    
-    Q_PROPERTY(QColor QMenuBar_background_color READ getQMenuBar_background_color WRITE setQMenuBar_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuBarItem_color )
-    Q_PROPERTY(QColor QMenuBarItem_color READ getQMenuBarItem_color WRITE setQMenuBarItem_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuBarItemPressed_color)    
-    Q_PROPERTY(QColor QMenuBarItemPressed_color READ getQMenuBarItemPressed_color WRITE setQMenuBarItemPressed_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuBarItemSelected_background_color)    
-    Q_PROPERTY(QColor QMenuBarItemSelected_background_color READ getQMenuBarItemSelected_background_color WRITE setQMenuBarItemSelected_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuBarItemSelected_color)    
-    Q_PROPERTY(QColor QMenuBarItemSelected_color READ getQMenuBarItemSelected_color WRITE setQMenuBarItemSelected_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenu_background_color)    
-    Q_PROPERTY(QColor QMenu_background_color READ getQMenu_background_color WRITE setQMenu_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenu_color)    
-    Q_PROPERTY(QColor QMenu_color READ getQMenu_color WRITE setQMenu_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuItemSelected_background_color)    
-    Q_PROPERTY(QColor QMenuItemSelected_background_color READ getQMenuItemSelected_background_color WRITE setQMenuItemSelected_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuItemSelected_color)    
-    Q_PROPERTY(QColor QMenuItemSelected_color READ getQMenuItemSelected_color WRITE setQMenuItemSelected_color)    
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QMenuItemDisabled_background_color)
-    Q_PROPERTY(QColor QMenuItemDisabled_background_color READ getQMenuItemDisabled_background_color WRITE setQMenuItemDisabled_background_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButton_background_color)    
-    Q_PROPERTY(QColor QPushButton_background_color READ getQPushButton_background_color WRITE setQPushButton_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButton_border_color)    
-    Q_PROPERTY(QColor QPushButton_border_color READ getQPushButton_border_color WRITE setQPushButton_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonHover_background_color)    
-    Q_PROPERTY(QColor QPushButtonHover_background_color READ getQPushButtonHover_background_color WRITE setQPushButtonHover_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonPressed_background_color)
-    Q_PROPERTY(QColor QPushButtonPressed_background_color READ getQPushButtonPressed_background_color WRITE setQPushButtonPressed_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonDefault_background_color)
-    Q_PROPERTY(QColor QPushButtonDefault_background_color READ getQPushButtonDefault_background_color WRITE setQPushButtonDefault_background_color)
+    /**
+     * @brief Setter property for QGroupBoxTitle_background_color
+     */
+    void setQGroupBoxTitle_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QGroupBoxTitle_background_color
+     * @return Value of QGroupBoxTitle_background_color
+     */
+    QColor getQGroupBoxTitle_background_color() const;
+
+    Q_PROPERTY(QColor QGroupBoxTitle_background_color READ getQGroupBoxTitle_background_color WRITE setQGroupBoxTitle_background_color)
+
+    /**
+     * @brief Setter property for QGroupBox_background_color
+     */
+    void setQGroupBox_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QGroupBox_background_color
+     * @return Value of QGroupBox_background_color
+     */
+    QColor getQGroupBox_background_color() const;
+
+    Q_PROPERTY(QColor QGroupBox_background_color READ getQGroupBox_background_color WRITE setQGroupBox_background_color)
+
+    /**
+     * @brief Setter property for QDockWidget_border_color
+     */
+    void setQDockWidget_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QDockWidget_border_color
+     * @return Value of QDockWidget_border_color
+     */
+    QColor getQDockWidget_border_color() const;
+
+    Q_PROPERTY(QColor QDockWidget_border_color READ getQDockWidget_border_color WRITE setQDockWidget_border_color)
+
+    /**
+     * @brief Setter property for QDockWidget_color
+     */
+    void setQDockWidget_color(const QColor& value);
+    /**
+     * @brief Getter property for QDockWidget_color
+     * @return Value of QDockWidget_color
+     */
+    QColor getQDockWidget_color() const;
+
+    Q_PROPERTY(QColor QDockWidget_color READ getQDockWidget_color WRITE setQDockWidget_color)
+
+    /**
+     * @brief Setter property for QDockWidgetTitle_background_color
+     */
+    void setQDockWidgetTitle_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QDockWidgetTitle_background_color
+     * @return Value of QDockWidgetTitle_background_color
+     */
+    QColor getQDockWidgetTitle_background_color() const;
+
+    Q_PROPERTY(QColor QDockWidgetTitle_background_color READ getQDockWidgetTitle_background_color WRITE setQDockWidgetTitle_background_color)
+
+    /**
+     * @brief Setter property for QDockWidgetTitle_color
+     */
+    void setQDockWidgetTitle_color(const QColor& value);
+    /**
+     * @brief Getter property for QDockWidgetTitle_color
+     * @return Value of QDockWidgetTitle_color
+     */
+    QColor getQDockWidgetTitle_color() const;
+
+    Q_PROPERTY(QColor QDockWidgetTitle_color READ getQDockWidgetTitle_color WRITE setQDockWidgetTitle_color)
+
+    /**
+     * @brief Setter property for QListView_background_color
+     */
+    void setQListView_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QListView_background_color
+     * @return Value of QListView_background_color
+     */
+    QColor getQListView_background_color() const;
+
+    Q_PROPERTY(QColor QListView_background_color READ getQListView_background_color WRITE setQListView_background_color)
+
+    /**
+     * @brief Setter property for QListView_color
+     */
+    void setQListView_color(const QColor& value);
+    /**
+     * @brief Getter property for QListView_color
+     * @return Value of QListView_color
+     */
+    QColor getQListView_color() const;
+
+    Q_PROPERTY(QColor QListView_color READ getQListView_color WRITE setQListView_color)
+
+    /**
+     * @brief Setter property for QListViewItemHover_background_color
+     */
+    void setQListViewItemHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QListViewItemHover_background_color
+     * @return Value of QListViewItemHover_background_color
+     */
+    QColor getQListViewItemHover_background_color() const;
+
+    Q_PROPERTY(QColor QListViewItemHover_background_color READ getQListViewItemHover_background_color WRITE setQListViewItemHover_background_color)
+
+    /**
+     * @brief Setter property for QListViewItemHover_color
+     */
+    void setQListViewItemHover_color(const QColor& value);
+    /**
+     * @brief Getter property for QListViewItemHover_color
+     * @return Value of QListViewItemHover_color
+     */
+    QColor getQListViewItemHover_color() const;
+
+    Q_PROPERTY(QColor QListViewItemHover_color READ getQListViewItemHover_color WRITE setQListViewItemHover_color)
+
+    /**
+     * @brief Setter property for QListViewItemSelected_background_color
+     */
+    void setQListViewItemSelected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QListViewItemSelected_background_color
+     * @return Value of QListViewItemSelected_background_color
+     */
+    QColor getQListViewItemSelected_background_color() const;
+
+    Q_PROPERTY(QColor QListViewItemSelected_background_color READ getQListViewItemSelected_background_color WRITE setQListViewItemSelected_background_color)
+
+    /**
+     * @brief Setter property for QListViewItemSelected_color
+     */
+    void setQListViewItemSelected_color(const QColor& value);
+    /**
+     * @brief Getter property for QListViewItemSelected_color
+     * @return Value of QListViewItemSelected_color
+     */
+    QColor getQListViewItemSelected_color() const;
+
+    Q_PROPERTY(QColor QListViewItemSelected_color READ getQListViewItemSelected_color WRITE setQListViewItemSelected_color)
+
+    /**
+     * @brief Setter property for QMainWindowSeparator_background_color
+     */
+    void setQMainWindowSeparator_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMainWindowSeparator_background_color
+     * @return Value of QMainWindowSeparator_background_color
+     */
+    QColor getQMainWindowSeparator_background_color() const;
+
+    Q_PROPERTY(QColor QMainWindowSeparator_background_color READ getQMainWindowSeparator_background_color WRITE setQMainWindowSeparator_background_color)
+
+    /**
+     * @brief Setter property for QMenuBar_background_color
+     */
+    void setQMenuBar_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuBar_background_color
+     * @return Value of QMenuBar_background_color
+     */
+    QColor getQMenuBar_background_color() const;
+
+    Q_PROPERTY(QColor QMenuBar_background_color READ getQMenuBar_background_color WRITE setQMenuBar_background_color)
+
+    /**
+     * @brief Setter property for QMenuBarItem_color
+     */
+    void setQMenuBarItem_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuBarItem_color
+     * @return Value of QMenuBarItem_color
+     */
+    QColor getQMenuBarItem_color() const;
+
+    Q_PROPERTY(QColor QMenuBarItem_color READ getQMenuBarItem_color WRITE setQMenuBarItem_color)
+
+    /**
+     * @brief Setter property for QMenuBarItemPressed_color
+     */
+    void setQMenuBarItemPressed_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuBarItemPressed_color
+     * @return Value of QMenuBarItemPressed_color
+     */
+    QColor getQMenuBarItemPressed_color() const;
+
+    Q_PROPERTY(QColor QMenuBarItemPressed_color READ getQMenuBarItemPressed_color WRITE setQMenuBarItemPressed_color)
+
+    /**
+     * @brief Setter property for QMenuBarItemSelected_background_color
+     */
+    void setQMenuBarItemSelected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuBarItemSelected_background_color
+     * @return Value of QMenuBarItemSelected_background_color
+     */
+    QColor getQMenuBarItemSelected_background_color() const;
+
+    Q_PROPERTY(QColor QMenuBarItemSelected_background_color READ getQMenuBarItemSelected_background_color WRITE setQMenuBarItemSelected_background_color)
+
+    /**
+     * @brief Setter property for QMenuBarItemSelected_color
+     */
+    void setQMenuBarItemSelected_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuBarItemSelected_color
+     * @return Value of QMenuBarItemSelected_color
+     */
+    QColor getQMenuBarItemSelected_color() const;
+
+    Q_PROPERTY(QColor QMenuBarItemSelected_color READ getQMenuBarItemSelected_color WRITE setQMenuBarItemSelected_color)
+
+    /**
+     * @brief Setter property for QMenu_background_color
+     */
+    void setQMenu_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenu_background_color
+     * @return Value of QMenu_background_color
+     */
+    QColor getQMenu_background_color() const;
+
+    Q_PROPERTY(QColor QMenu_background_color READ getQMenu_background_color WRITE setQMenu_background_color)
+
+    /**
+     * @brief Setter property for QMenu_color
+     */
+    void setQMenu_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenu_color
+     * @return Value of QMenu_color
+     */
+    QColor getQMenu_color() const;
+
+    Q_PROPERTY(QColor QMenu_color READ getQMenu_color WRITE setQMenu_color)
+
+    /**
+     * @brief Setter property for QMenuItemSelected_background_color
+     */
+    void setQMenuItemSelected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuItemSelected_background_color
+     * @return Value of QMenuItemSelected_background_color
+     */
+    QColor getQMenuItemSelected_background_color() const;
+
+    Q_PROPERTY(QColor QMenuItemSelected_background_color READ getQMenuItemSelected_background_color WRITE setQMenuItemSelected_background_color)
+
+    /**
+     * @brief Setter property for QMenuItemSelected_color
+     */
+    void setQMenuItemSelected_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuItemSelected_color
+     * @return Value of QMenuItemSelected_color
+     */
+    QColor getQMenuItemSelected_color() const;
+
+    Q_PROPERTY(QColor QMenuItemSelected_color READ getQMenuItemSelected_color WRITE setQMenuItemSelected_color)
+
+    /**
+     * @brief Setter property for QMenuItemDisabled_background_color
+     */
+    void setQMenuItemDisabled_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QMenuItemDisabled_background_color
+     * @return Value of QMenuItemDisabled_background_color
+     */
+    QColor getQMenuItemDisabled_background_color() const;
+
+    Q_PROPERTY(QColor QMenuItemDisabled_background_color READ getQMenuItemDisabled_background_color WRITE setQMenuItemDisabled_background_color)
+
+    /**
+     * @brief Setter property for QPushButton_background_color
+     */
+    void setQPushButton_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButton_background_color
+     * @return Value of QPushButton_background_color
+     */
+    QColor getQPushButton_background_color() const;
+
+    Q_PROPERTY(QColor QPushButton_background_color READ getQPushButton_background_color WRITE setQPushButton_background_color)
+
+    /**
+     * @brief Setter property for QPushButton_border_color
+     */
+    void setQPushButton_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButton_border_color
+     * @return Value of QPushButton_border_color
+     */
+    QColor getQPushButton_border_color() const;
+
+    Q_PROPERTY(QColor QPushButton_border_color READ getQPushButton_border_color WRITE setQPushButton_border_color)
+
+    /**
+     * @brief Setter property for QPushButtonHover_background_color
+     */
+    void setQPushButtonHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonHover_background_color
+     * @return Value of QPushButtonHover_background_color
+     */
+    QColor getQPushButtonHover_background_color() const;
+
+    Q_PROPERTY(QColor QPushButtonHover_background_color READ getQPushButtonHover_background_color WRITE setQPushButtonHover_background_color)
+
+    /**
+     * @brief Setter property for QPushButtonPressed_background_color
+     */
+    void setQPushButtonPressed_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonPressed_background_color
+     * @return Value of QPushButtonPressed_background_color
+     */
+    QColor getQPushButtonPressed_background_color() const;
+
+    Q_PROPERTY(QColor QPushButtonPressed_background_color READ getQPushButtonPressed_background_color WRITE setQPushButtonPressed_background_color)
+
+    /**
+     * @brief Setter property for QPushButtonDefault_background_color
+     */
+    void setQPushButtonDefault_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonDefault_background_color
+     * @return Value of QPushButtonDefault_background_color
+     */
+    QColor getQPushButtonDefault_background_color() const;
+
+    Q_PROPERTY(QColor QPushButtonDefault_background_color READ getQPushButtonDefault_background_color WRITE setQPushButtonDefault_background_color)
+
+    /**
+     * @brief Setter property for QPushButtonDefaultPressed_background_color
+     */
+    void setQPushButtonDefaultPressed_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonDefaultPressed_background_color
+     * @return Value of QPushButtonDefaultPressed_background_color
+     */
+    QColor getQPushButtonDefaultPressed_background_color() const;
+
+    Q_PROPERTY(QColor QPushButtonDefaultPressed_background_color READ getQPushButtonDefaultPressed_background_color WRITE setQPushButtonDefaultPressed_background_color)
+
+    /**
+     * @brief Setter property for QPushButtonDefaultHover_background_color
+     */
+    void setQPushButtonDefaultHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonDefaultHover_background_color
+     * @return Value of QPushButtonDefaultHover_background_color
+     */
+    QColor getQPushButtonDefaultHover_background_color() const;
+
+    Q_PROPERTY(QColor QPushButtonDefaultHover_background_color READ getQPushButtonDefaultHover_background_color WRITE setQPushButtonDefaultHover_background_color)
+
+    /**
+     * @brief Setter property for QPushButtonDefault_border_color
+     */
+    void setQPushButtonDefault_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonDefault_border_color
+     * @return Value of QPushButtonDefault_border_color
+     */
+    QColor getQPushButtonDefault_border_color() const;
+
+    Q_PROPERTY(QColor QPushButtonDefault_border_color READ getQPushButtonDefault_border_color WRITE setQPushButtonDefault_border_color)
+
+    /**
+     * @brief Setter property for QPushButtonDefault_text_color
+     */
+    void setQPushButtonDefault_text_color(const QColor& value);
+    /**
+     * @brief Getter property for QPushButtonDefault_text_color
+     * @return Value of QPushButtonDefault_text_color
+     */
+    QColor getQPushButtonDefault_text_color() const;
+
+    Q_PROPERTY(QColor QPushButtonDefault_text_color READ getQPushButtonDefault_text_color WRITE setQPushButtonDefault_text_color)
+
+    /**
+     * @brief Setter property for QSplitter_handle_start_color
+     */
+    void setQSplitter_handle_start_color(const QColor& value);
+    /**
+     * @brief Getter property for QSplitter_handle_start_color
+     * @return Value of QSplitter_handle_start_color
+     */
+    QColor getQSplitter_handle_start_color() const;
+
+    Q_PROPERTY(QColor QSplitter_handle_start_color READ getQSplitter_handle_start_color WRITE setQSplitter_handle_start_color)
+
+    /**
+     * @brief Setter property for QSplitter_handle_end_color
+     */
+    void setQSplitter_handle_end_color(const QColor& value);
+    /**
+     * @brief Getter property for QSplitter_handle_end_color
+     * @return Value of QSplitter_handle_end_color
+     */
+    QColor getQSplitter_handle_end_color() const;
+
+    Q_PROPERTY(QColor QSplitter_handle_end_color READ getQSplitter_handle_end_color WRITE setQSplitter_handle_end_color)
+
+    /**
+     * @brief Setter property for QToolButton_background_color
+     */
+    void setQToolButton_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButton_background_color
+     * @return Value of QToolButton_background_color
+     */
+    QColor getQToolButton_background_color() const;
+
+    Q_PROPERTY(QColor QToolButton_background_color READ getQToolButton_background_color WRITE setQToolButton_background_color)
+
+    /**
+     * @brief Setter property for QToolButton_color
+     */
+    void setQToolButton_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButton_color
+     * @return Value of QToolButton_color
+     */
+    QColor getQToolButton_color() const;
+
+    Q_PROPERTY(QColor QToolButton_color READ getQToolButton_color WRITE setQToolButton_color)
+
+    /**
+     * @brief Setter property for QToolButton_border_color
+     */
+    void setQToolButton_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButton_border_color
+     * @return Value of QToolButton_border_color
+     */
+    QColor getQToolButton_border_color() const;
+
+    Q_PROPERTY(QColor QToolButton_border_color READ getQToolButton_border_color WRITE setQToolButton_border_color)
+
+    /**
+     * @brief Setter property for QToolButtonChecked_background_color
+     */
+    void setQToolButtonChecked_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButtonChecked_background_color
+     * @return Value of QToolButtonChecked_background_color
+     */
+    QColor getQToolButtonChecked_background_color() const;
+
+    Q_PROPERTY(QColor QToolButtonChecked_background_color READ getQToolButtonChecked_background_color WRITE setQToolButtonChecked_background_color)
+
+    /**
+     * @brief Setter property for QToolButtonDisabled_background_color
+     */
+    void setQToolButtonDisabled_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButtonDisabled_background_color
+     * @return Value of QToolButtonDisabled_background_color
+     */
+    QColor getQToolButtonDisabled_background_color() const;
+
+    Q_PROPERTY(QColor QToolButtonDisabled_background_color READ getQToolButtonDisabled_background_color WRITE setQToolButtonDisabled_background_color)
+
+    /**
+     * @brief Setter property for QToolButtonDisabled_color
+     */
+    void setQToolButtonDisabled_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolButtonDisabled_color
+     * @return Value of QToolButtonDisabled_color
+     */
+    QColor getQToolButtonDisabled_color() const;
+
+    Q_PROPERTY(QColor QToolButtonDisabled_color READ getQToolButtonDisabled_color WRITE setQToolButtonDisabled_color)
+
+    /**
+     * @brief Setter property for QStatusBar_border_color
+     */
+    void setQStatusBar_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QStatusBar_border_color
+     * @return Value of QStatusBar_border_color
+     */
+    QColor getQStatusBar_border_color() const;
+
+    Q_PROPERTY(QColor QStatusBar_border_color READ getQStatusBar_border_color WRITE setQStatusBar_border_color)
+
+    /**
+     * @brief Setter property for QTableWidget_color
+     */
+    void setQTableWidget_color(const QColor& value);
+    /**
+     * @brief Getter property for QTableWidget_color
+     * @return Value of QTableWidget_color
+     */
+    QColor getQTableWidget_color() const;
+
+    Q_PROPERTY(QColor QTableWidget_color READ getQTableWidget_color WRITE setQTableWidget_color)
+
+    /**
+     * @brief Setter property for QTableWidget_selected_background_color
+     */
+    void setQTableWidget_selected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTableWidget_selected_background_color
+     * @return Value of QTableWidget_selected_background_color
+     */
+    QColor getQTableWidget_selected_background_color() const;
+
+    Q_PROPERTY(QColor QTableWidget_selected_background_color READ getQTableWidget_selected_background_color WRITE setQTableWidget_selected_background_color)
+
+    /**
+     * @brief Setter property for QHeaderView_background_color
+     */
+    void setQHeaderView_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderView_background_color
+     * @return Value of QHeaderView_background_color
+     */
+    QColor getQHeaderView_background_color() const;
+
+    Q_PROPERTY(QColor QHeaderView_background_color READ getQHeaderView_background_color WRITE setQHeaderView_background_color)
+
+    /**
+     * @brief Setter property for QHeaderView_border_color
+     */
+    void setQHeaderView_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderView_border_color
+     * @return Value of QHeaderView_border_color
+     */
+    QColor getQHeaderView_border_color() const;
+
+    Q_PROPERTY(QColor QHeaderView_border_color READ getQHeaderView_border_color WRITE setQHeaderView_border_color)
+
+    /**
+     * @brief Setter property for QHeaderView_color
+     */
+    void setQHeaderView_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderView_color
+     * @return Value of QHeaderView_color
+     */
+    QColor getQHeaderView_color() const;
+
+    Q_PROPERTY(QColor QHeaderView_color READ getQHeaderView_color WRITE setQHeaderView_color)
+
+    /**
+     * @brief Setter property for QHeaderViewDisabled_background_color
+     */
+    void setQHeaderViewDisabled_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderViewDisabled_background_color
+     * @return Value of QHeaderViewDisabled_background_color
+     */
+    QColor getQHeaderViewDisabled_background_color() const;
+
+    Q_PROPERTY(QColor QHeaderViewDisabled_background_color READ getQHeaderViewDisabled_background_color WRITE setQHeaderViewDisabled_background_color)
+
+    /**
+     * @brief Setter property for QHeaderViewDisabled_border_color
+     */
+    void setQHeaderViewDisabled_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderViewDisabled_border_color
+     * @return Value of QHeaderViewDisabled_border_color
+     */
+    QColor getQHeaderViewDisabled_border_color() const;
+
+    Q_PROPERTY(QColor QHeaderViewDisabled_border_color READ getQHeaderViewDisabled_border_color WRITE setQHeaderViewDisabled_border_color)
+
+    /**
+     * @brief Setter property for QHeaderViewDisabled_color
+     */
+    void setQHeaderViewDisabled_color(const QColor& value);
+    /**
+     * @brief Getter property for QHeaderViewDisabled_color
+     * @return Value of QHeaderViewDisabled_color
+     */
+    QColor getQHeaderViewDisabled_color() const;
+
+    Q_PROPERTY(QColor QHeaderViewDisabled_color READ getQHeaderViewDisabled_color WRITE setQHeaderViewDisabled_color)
+
+    /**
+     * @brief Setter property for QTabWidgetPane_border_color
+     */
+    void setQTabWidgetPane_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabWidgetPane_border_color
+     * @return Value of QTabWidgetPane_border_color
+     */
+    QColor getQTabWidgetPane_border_color() const;
+
+    Q_PROPERTY(QColor QTabWidgetPane_border_color READ getQTabWidgetPane_border_color WRITE setQTabWidgetPane_border_color)
+
+    /**
+     * @brief Setter property for QTabWidgetPane_background_color
+     */
+    void setQTabWidgetPane_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabWidgetPane_background_color
+     * @return Value of QTabWidgetPane_background_color
+     */
+    QColor getQTabWidgetPane_background_color() const;
+
+    Q_PROPERTY(QColor QTabWidgetPane_background_color READ getQTabWidgetPane_background_color WRITE setQTabWidgetPane_background_color)
+
+    /**
+     * @brief Setter property for QTabBarTab_border_color
+     */
+    void setQTabBarTab_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabBarTab_border_color
+     * @return Value of QTabBarTab_border_color
+     */
+    QColor getQTabBarTab_border_color() const;
+
+    Q_PROPERTY(QColor QTabBarTab_border_color READ getQTabBarTab_border_color WRITE setQTabBarTab_border_color)
+
+    /**
+     * @brief Setter property for QTabBarTabSelected_background_color
+     */
+    void setQTabBarTabSelected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabBarTabSelected_background_color
+     * @return Value of QTabBarTabSelected_background_color
+     */
+    QColor getQTabBarTabSelected_background_color() const;
+
+    Q_PROPERTY(QColor QTabBarTabSelected_background_color READ getQTabBarTabSelected_background_color WRITE setQTabBarTabSelected_background_color)
+
+    /**
+     * @brief Setter property for QTabBarTabSelected_color
+     */
+    void setQTabBarTabSelected_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabBarTabSelected_color
+     * @return Value of QTabBarTabSelected_color
+     */
+    QColor getQTabBarTabSelected_color() const;
+
+    Q_PROPERTY(QColor QTabBarTabSelected_color READ getQTabBarTabSelected_color WRITE setQTabBarTabSelected_color)
+
+    /**
+     * @brief Setter property for QTabBarTabNotSelected_background_color
+     */
+    void setQTabBarTabNotSelected_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabBarTabNotSelected_background_color
+     * @return Value of QTabBarTabNotSelected_background_color
+     */
+    QColor getQTabBarTabNotSelected_background_color() const;
+
+    Q_PROPERTY(QColor QTabBarTabNotSelected_background_color READ getQTabBarTabNotSelected_background_color WRITE setQTabBarTabNotSelected_background_color)
+
+    /**
+     * @brief Setter property for QTabBarTabNotSelectedHover_background_color
+     */
+    void setQTabBarTabNotSelectedHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTabBarTabNotSelectedHover_background_color
+     * @return Value of QTabBarTabNotSelectedHover_background_color
+     */
+    QColor getQTabBarTabNotSelectedHover_background_color() const;
+
+    Q_PROPERTY(QColor QTabBarTabNotSelectedHover_background_color READ getQTabBarTabNotSelectedHover_background_color WRITE setQTabBarTabNotSelectedHover_background_color)
+
+    /**
+     * @brief Setter property for QTextEdit_background_color
+     */
+    void setQTextEdit_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTextEdit_background_color
+     * @return Value of QTextEdit_background_color
+     */
+    QColor getQTextEdit_background_color() const;
+
+    Q_PROPERTY(QColor QTextEdit_background_color READ getQTextEdit_background_color WRITE setQTextEdit_background_color)
+
+    /**
+     * @brief Setter property for QTextEdit_color
+     */
+    void setQTextEdit_color(const QColor& value);
+    /**
+     * @brief Getter property for QTextEdit_color
+     * @return Value of QTextEdit_color
+     */
+    QColor getQTextEdit_color() const;
+
+    Q_PROPERTY(QColor QTextEdit_color READ getQTextEdit_color WRITE setQTextEdit_color)
+
+    /**
+     * @brief Setter property for QLineEdit_color
+     */
+    void setQLineEdit_color(const QColor& value);
+    /**
+     * @brief Getter property for QLineEdit_color
+     * @return Value of QLineEdit_color
+     */
+    QColor getQLineEdit_color() const;
+
+    Q_PROPERTY(QColor QLineEdit_color READ getQLineEdit_color WRITE setQLineEdit_color)
+
+    /**
+     * @brief Setter property for QLineEdit_background_color
+     */
+    void setQLineEdit_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QLineEdit_background_color
+     * @return Value of QLineEdit_background_color
+     */
+    QColor getQLineEdit_background_color() const;
+
+    Q_PROPERTY(QColor QLineEdit_background_color READ getQLineEdit_background_color WRITE setQLineEdit_background_color)
+
+    /**
+     * @brief Setter property for QLineEdit_border_color
+     */
+    void setQLineEdit_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QLineEdit_border_color
+     * @return Value of QLineEdit_border_color
+     */
+    QColor getQLineEdit_border_color() const;
+
+    Q_PROPERTY(QColor QLineEdit_border_color READ getQLineEdit_border_color WRITE setQLineEdit_border_color)
+
+    /**
+     * @brief Setter property for QLineEditDisabled_background_color
+     */
+    void setQLineEditDisabled_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QLineEditDisabled_background_color
+     * @return Value of QLineEditDisabled_background_color
+     */
+    QColor getQLineEditDisabled_background_color() const;
+
+    Q_PROPERTY(QColor QLineEditDisabled_background_color READ getQLineEditDisabled_background_color WRITE setQLineEditDisabled_background_color)
+
+    /**
+     * @brief Setter property for QLineEditError_background_color
+     */
+    void setQLineEditError_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QLineEditError_background_color
+     * @return Value of QLineEditError_background_color
+     */
+    QColor getQLineEditError_background_color() const;
+
+    Q_PROPERTY(QColor QLineEditError_background_color READ getQLineEditError_background_color WRITE setQLineEditError_background_color)
+
+    /**
+     * @brief Setter property for QSpinBoxArrow_background_color
+     */
+    void setQSpinBoxArrow_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QSpinBoxArrow_background_color
+     * @return Value of QSpinBoxArrow_background_color
+     */
+    QColor getQSpinBoxArrow_background_color() const;
+
+    Q_PROPERTY(QColor QSpinBoxArrow_background_color READ getQSpinBoxArrow_background_color WRITE setQSpinBoxArrow_background_color)
+
+    /**
+     * @brief Setter property for QSpinBoxArrow_hover_background_color
+     */
+    void setQSpinBoxArrow_hover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QSpinBoxArrow_hover_background_color
+     * @return Value of QSpinBoxArrow_hover_background_color
+     */
+    QColor getQSpinBoxArrow_hover_background_color() const;
+
+    Q_PROPERTY(QColor QSpinBoxArrow_hover_background_color READ getQSpinBoxArrow_hover_background_color WRITE setQSpinBoxArrow_hover_background_color)
+
+    /**
+     * @brief Setter property for QComboBox_border_color
+     */
+    void setQComboBox_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBox_border_color
+     * @return Value of QComboBox_border_color
+     */
+    QColor getQComboBox_border_color() const;
+
+    Q_PROPERTY(QColor QComboBox_border_color READ getQComboBox_border_color WRITE setQComboBox_border_color)
+
+    /**
+     * @brief Setter property for QComboBox_background_color
+     */
+    void setQComboBox_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBox_background_color
+     * @return Value of QComboBox_background_color
+     */
+    QColor getQComboBox_background_color() const;
+
+    Q_PROPERTY(QColor QComboBox_background_color READ getQComboBox_background_color WRITE setQComboBox_background_color)
+
+    /**
+     * @brief Setter property for QComboBoxArrow_background_color
+     */
+    void setQComboBoxArrow_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxArrow_background_color
+     * @return Value of QComboBoxArrow_background_color
+     */
+    QColor getQComboBoxArrow_background_color() const;
+
+    Q_PROPERTY(QColor QComboBoxArrow_background_color READ getQComboBoxArrow_background_color WRITE setQComboBoxArrow_background_color)
+
+    /**
+     * @brief Setter property for QComboBoxArrow_hover_background_color
+     */
+    void setQComboBoxArrow_hover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxArrow_hover_background_color
+     * @return Value of QComboBoxArrow_hover_background_color
+     */
+    QColor getQComboBoxArrow_hover_background_color() const;
+
+    Q_PROPERTY(QColor QComboBoxArrow_hover_background_color READ getQComboBoxArrow_hover_background_color WRITE setQComboBoxArrow_hover_background_color)
+
+    /**
+     * @brief Setter property for QComboBoxItem_border_color
+     */
+    void setQComboBoxItem_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxItem_border_color
+     * @return Value of QComboBoxItem_border_color
+     */
+    QColor getQComboBoxItem_border_color() const;
+
+    Q_PROPERTY(QColor QComboBoxItem_border_color READ getQComboBoxItem_border_color WRITE setQComboBoxItem_border_color)
+
+    /**
+     * @brief Setter property for QComboBoxItem_selection_color
+     */
+    void setQComboBoxItem_selection_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxItem_selection_color
+     * @return Value of QComboBoxItem_selection_color
+     */
+    QColor getQComboBoxItem_selection_color() const;
+
+    Q_PROPERTY(QColor QComboBoxItem_selection_color READ getQComboBoxItem_selection_color WRITE setQComboBoxItem_selection_color)
+
+    /**
+     * @brief Setter property for QComboBoxItem_background_color
+     */
+    void setQComboBoxItem_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxItem_background_color
+     * @return Value of QComboBoxItem_background_color
+     */
+    QColor getQComboBoxItem_background_color() const;
+
+    Q_PROPERTY(QColor QComboBoxItem_background_color READ getQComboBoxItem_background_color WRITE setQComboBoxItem_background_color)
+
+    /**
+     * @brief Setter property for QComboBoxDisabled_background_color
+     */
+    void setQComboBoxDisabled_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxDisabled_background_color
+     * @return Value of QComboBoxDisabled_background_color
+     */
+    QColor getQComboBoxDisabled_background_color() const;
+
+    Q_PROPERTY(QColor QComboBoxDisabled_background_color READ getQComboBoxDisabled_background_color WRITE setQComboBoxDisabled_background_color)
+
+    /**
+     * @brief Setter property for QComboBoxDisabled_color
+     */
+    void setQComboBoxDisabled_color(const QColor& value);
+    /**
+     * @brief Getter property for QComboBoxDisabled_color
+     * @return Value of QComboBoxDisabled_color
+     */
+    QColor getQComboBoxDisabled_color() const;
+
+    Q_PROPERTY(QColor QComboBoxDisabled_color READ getQComboBoxDisabled_color WRITE setQComboBoxDisabled_color)
+
+    /**
+     * @brief Setter property for QToolBar_background_color
+     */
+    void setQToolBar_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolBar_background_color
+     * @return Value of QToolBar_background_color
+     */
+    QColor getQToolBar_background_color() const;
+
+    Q_PROPERTY(QColor QToolBar_background_color READ getQToolBar_background_color WRITE setQToolBar_background_color)
+
+    /**
+     * @brief Setter property for QToolBar_border_color
+     */
+    void setQToolBar_border_color(const QColor& value);
+    /**
+     * @brief Getter property for QToolBar_border_color
+     * @return Value of QToolBar_border_color
+     */
+    QColor getQToolBar_border_color() const;
+
+    Q_PROPERTY(QColor QToolBar_border_color READ getQToolBar_border_color WRITE setQToolBar_border_color)
+
+    /**
+     * @brief Setter property for QTreeView_background_color
+     */
+    void setQTreeView_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeView_background_color
+     * @return Value of QTreeView_background_color
+     */
+    QColor getQTreeView_background_color() const;
+
+    Q_PROPERTY(QColor QTreeView_background_color READ getQTreeView_background_color WRITE setQTreeView_background_color)
+
+    /**
+     * @brief Setter property for QTreeViewItem_background_color
+     */
+    void setQTreeViewItem_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItem_background_color
+     * @return Value of QTreeViewItem_background_color
+     */
+    QColor getQTreeViewItem_background_color() const;
+
+    Q_PROPERTY(QColor QTreeViewItem_background_color READ getQTreeViewItem_background_color WRITE setQTreeViewItem_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonDefaultPressed_background_color)
-    Q_PROPERTY(QColor QPushButtonDefaultPressed_background_color READ getQPushButtonDefaultPressed_background_color WRITE setQPushButtonDefaultPressed_background_color)
+    /**
+     * @brief Setter property for QTreeViewItem_error_background_color
+     */
+    void setQTreeViewItem_error_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItem_error_background_color
+     * @return Value of QTreeViewItem_error_background_color
+     */
+    QColor getQTreeViewItem_error_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonDefaultHover_background_color)
-    Q_PROPERTY(QColor QPushButtonDefaultHover_background_color READ getQPushButtonDefaultHover_background_color WRITE setQPushButtonDefaultHover_background_color)
+    Q_PROPERTY(QColor QTreeViewItem_error_background_color READ getQTreeViewItem_error_background_color WRITE setQTreeViewItem_error_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonDefault_border_color)
-    Q_PROPERTY(QColor QPushButtonDefault_border_color READ getQPushButtonDefault_border_color WRITE setQPushButtonDefault_border_color)
+    /**
+     * @brief Setter property for QTreeViewItem_color
+     */
+    void setQTreeViewItem_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItem_color
+     * @return Value of QTreeViewItem_color
+     */
+    QColor getQTreeViewItem_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QPushButtonDefault_text_color)
-    Q_PROPERTY(QColor QPushButtonDefault_text_color READ getQPushButtonDefault_text_color WRITE setQPushButtonDefault_text_color)
+    Q_PROPERTY(QColor QTreeViewItem_color READ getQTreeViewItem_color WRITE setQTreeViewItem_color)
 
+    /**
+     * @brief Setter property for QTreeViewItem_error_color
+     */
+    void setQTreeViewItem_error_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItem_error_color
+     * @return Value of QTreeViewItem_error_color
+     */
+    QColor getQTreeViewItem_error_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QSplitter_handle_start_color)
-    Q_PROPERTY(QColor QSplitter_handle_start_color READ getQSplitter_handle_start_color WRITE setQSplitter_handle_start_color)
+    Q_PROPERTY(QColor QTreeViewItem_error_color READ getQTreeViewItem_error_color WRITE setQTreeViewItem_error_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QSplitter_handle_end_color)
-    Q_PROPERTY(QColor QSplitter_handle_end_color READ getQSplitter_handle_end_color WRITE setQSplitter_handle_end_color)
+    /**
+     * @brief Setter property for QTreeViewItem_font_size
+     */
+    void setQTreeViewItem_font_size(int value);
+    /**
+     * @brief Getter property for QTreeViewItem_font_size
+     * @return Value of QTreeViewItem_font_size
+     */
+    int getQTreeViewItem_font_size() const;
 
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButton_background_color)    
-    Q_PROPERTY(QColor QToolButton_background_color READ getQToolButton_background_color WRITE setQToolButton_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButton_color)    
-    Q_PROPERTY(QColor QToolButton_color READ getQToolButton_color WRITE setQToolButton_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButton_border_color)    
-    Q_PROPERTY(QColor QToolButton_border_color READ getQToolButton_border_color WRITE setQToolButton_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButtonChecked_background_color)    
-    Q_PROPERTY(QColor QToolButtonChecked_background_color READ getQToolButtonChecked_background_color WRITE setQToolButtonChecked_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButtonDisabled_background_color)
-    Q_PROPERTY(QColor QToolButtonDisabled_background_color READ getQToolButtonDisabled_background_color WRITE setQToolButtonDisabled_background_color)
+    Q_PROPERTY(int QTreeViewItem_font_size READ getQTreeViewItem_font_size WRITE setQTreeViewItem_font_size)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolButtonDisabled_color)
-    Q_PROPERTY(QColor QToolButtonDisabled_color READ getQToolButtonDisabled_color WRITE setQToolButtonDisabled_color)
+    /**
+     * @brief Setter property for QTreeViewItemHover_background_color
+     */
+    void setQTreeViewItemHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemHover_background_color
+     * @return Value of QTreeViewItemHover_background_color
+     */
+    QColor getQTreeViewItemHover_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QStatusBar_border_color)    
-    Q_PROPERTY(QColor QStatusBar_border_color READ getQStatusBar_border_color WRITE setQStatusBar_border_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTableWidget_color)    
-    Q_PROPERTY(QColor QTableWidget_color READ getQTableWidget_color WRITE setQTableWidget_color)
+    Q_PROPERTY(QColor QTreeViewItemHover_background_color READ getQTreeViewItemHover_background_color WRITE setQTreeViewItemHover_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QTableWidget_selected_background_color)
-    Q_PROPERTY(QColor QTableWidget_selected_background_color READ getQTableWidget_selected_background_color WRITE setQTableWidget_selected_background_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderView_background_color)    
-    Q_PROPERTY(QColor QHeaderView_background_color READ getQHeaderView_background_color WRITE setQHeaderView_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderView_border_color)    
-    Q_PROPERTY(QColor QHeaderView_border_color READ getQHeaderView_border_color WRITE setQHeaderView_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderView_color)    
-    Q_PROPERTY(QColor QHeaderView_color READ getQHeaderView_color WRITE setQHeaderView_color)   
+    /**
+     * @brief Setter property for QTreeViewItemHover_color
+     */
+    void setQTreeViewItemHover_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemHover_color
+     * @return Value of QTreeViewItemHover_color
+     */
+    QColor getQTreeViewItemHover_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderViewDisabled_background_color)
-    Q_PROPERTY(QColor QHeaderViewDisabled_background_color READ getQHeaderViewDisabled_background_color WRITE setQHeaderViewDisabled_background_color)
+    Q_PROPERTY(QColor QTreeViewItemHover_color READ getQTreeViewItemHover_color WRITE setQTreeViewItemHover_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderViewDisabled_border_color)
-    Q_PROPERTY(QColor QHeaderViewDisabled_border_color READ getQHeaderViewDisabled_border_color WRITE setQHeaderViewDisabled_border_color)
+    /**
+     * @brief Setter property for QTreeViewItemSelectedActive_background_color
+     */
+    void setQTreeViewItemSelectedActive_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemSelectedActive_background_color
+     * @return Value of QTreeViewItemSelectedActive_background_color
+     */
+    QColor getQTreeViewItemSelectedActive_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QHeaderViewDisabled_color)
-    Q_PROPERTY(QColor QHeaderViewDisabled_color READ getQHeaderViewDisabled_color WRITE setQHeaderViewDisabled_color)
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabWidgetPane_border_color)    
-    Q_PROPERTY(QColor QTabWidgetPane_border_color READ getQTabWidgetPane_border_color WRITE setQTabWidgetPane_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabWidgetPane_background_color)    
-    Q_PROPERTY(QColor QTabWidgetPane_background_color READ getQTabWidgetPane_background_color WRITE setQTabWidgetPane_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabBarTab_border_color)    
-    Q_PROPERTY(QColor QTabBarTab_border_color READ getQTabBarTab_border_color WRITE setQTabBarTab_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabBarTabSelected_background_color)    
-    Q_PROPERTY(QColor QTabBarTabSelected_background_color READ getQTabBarTabSelected_background_color WRITE setQTabBarTabSelected_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabBarTabSelected_color)    
-    Q_PROPERTY(QColor QTabBarTabSelected_color READ getQTabBarTabSelected_color WRITE setQTabBarTabSelected_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabBarTabNotSelected_background_color)    
-    Q_PROPERTY(QColor QTabBarTabNotSelected_background_color READ getQTabBarTabNotSelected_background_color WRITE setQTabBarTabNotSelected_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTabBarTabNotSelectedHover_background_color)    
-    Q_PROPERTY(QColor QTabBarTabNotSelectedHover_background_color READ getQTabBarTabNotSelectedHover_background_color WRITE setQTabBarTabNotSelectedHover_background_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTextEdit_background_color)    
-    Q_PROPERTY(QColor QTextEdit_background_color READ getQTextEdit_background_color WRITE setQTextEdit_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTextEdit_color)    
-    Q_PROPERTY(QColor QTextEdit_color READ getQTextEdit_color WRITE setQTextEdit_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QLineEdit_color)    
-    Q_PROPERTY(QColor QLineEdit_color READ getQLineEdit_color WRITE setQLineEdit_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QLineEdit_background_color)    
-    Q_PROPERTY(QColor QLineEdit_background_color READ getQLineEdit_background_color WRITE setQLineEdit_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QLineEdit_border_color)    
-    Q_PROPERTY(QColor QLineEdit_border_color READ getQLineEdit_border_color WRITE setQLineEdit_border_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QLineEditDisabled_background_color)    
-    Q_PROPERTY(QColor QLineEditDisabled_background_color READ getQLineEditDisabled_background_color WRITE setQLineEditDisabled_background_color)    
+    Q_PROPERTY(QColor QTreeViewItemSelectedActive_background_color READ getQTreeViewItemSelectedActive_background_color WRITE setQTreeViewItemSelectedActive_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QLineEditError_background_color)    
-    Q_PROPERTY(QColor QLineEditError_background_color READ getQLineEditError_background_color WRITE setQLineEditError_background_color)    
-        
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QSpinBoxArrow_background_color)
-    Q_PROPERTY(QColor QSpinBoxArrow_background_color READ getQSpinBoxArrow_background_color WRITE setQSpinBoxArrow_background_color)
+    /**
+     * @brief Setter property for QTreeViewItemSelectedActive_color
+     */
+    void setQTreeViewItemSelectedActive_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemSelectedActive_color
+     * @return Value of QTreeViewItemSelectedActive_color
+     */
+    QColor getQTreeViewItemSelectedActive_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QSpinBoxArrow_hover_background_color)
-    Q_PROPERTY(QColor QSpinBoxArrow_hover_background_color READ getQSpinBoxArrow_hover_background_color WRITE setQSpinBoxArrow_hover_background_color)
+    Q_PROPERTY(QColor QTreeViewItemSelectedActive_color READ getQTreeViewItemSelectedActive_color WRITE setQTreeViewItemSelectedActive_color)
 
+    /**
+     * @brief Setter property for QTreeViewItemSelectedNotActive_background_color
+     */
+    void setQTreeViewItemSelectedNotActive_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemSelectedNotActive_background_color
+     * @return Value of QTreeViewItemSelectedNotActive_background_color
+     */
+    QColor getQTreeViewItemSelectedNotActive_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBox_border_color)
-    Q_PROPERTY(QColor QComboBox_border_color READ getQComboBox_border_color WRITE setQComboBox_border_color)
+    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_background_color READ getQTreeViewItemSelectedNotActive_background_color WRITE setQTreeViewItemSelectedNotActive_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBox_background_color)
-    Q_PROPERTY(QColor QComboBox_background_color READ getQComboBox_background_color WRITE setQComboBox_background_color)
+    /**
+     * @brief Setter property for QTreeViewItemSelectedNotActive_color
+     */
+    void setQTreeViewItemSelectedNotActive_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewItemSelectedNotActive_color
+     * @return Value of QTreeViewItemSelectedNotActive_color
+     */
+    QColor getQTreeViewItemSelectedNotActive_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxArrow_background_color)
-    Q_PROPERTY(QColor QComboBoxArrow_background_color READ getQComboBoxArrow_background_color WRITE setQComboBoxArrow_background_color)
+    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_color READ getQTreeViewItemSelectedNotActive_color WRITE setQTreeViewItemSelectedNotActive_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxArrow_hover_background_color)
-    Q_PROPERTY(QColor QComboBoxArrow_hover_background_color READ getQComboBoxArrow_hover_background_color WRITE setQComboBoxArrow_hover_background_color)
+    /**
+     * @brief Setter property for QTreeViewBranch_background_color
+     */
+    void setQTreeViewBranch_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewBranch_background_color
+     * @return Value of QTreeViewBranch_background_color
+     */
+    QColor getQTreeViewBranch_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxItem_border_color)
-    Q_PROPERTY(QColor QComboBoxItem_border_color READ getQComboBoxItem_border_color WRITE setQComboBoxItem_border_color)
+    Q_PROPERTY(QColor QTreeViewBranch_background_color READ getQTreeViewBranch_background_color WRITE setQTreeViewBranch_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxItem_selection_color)
-    Q_PROPERTY(QColor QComboBoxItem_selection_color READ getQComboBoxItem_selection_color WRITE setQComboBoxItem_selection_color)
+    /**
+     * @brief Setter property for QTreeViewBranchHover_background_color
+     */
+    void setQTreeViewBranchHover_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewBranchHover_background_color
+     * @return Value of QTreeViewBranchHover_background_color
+     */
+    QColor getQTreeViewBranchHover_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxItem_background_color)
-    Q_PROPERTY(QColor QComboBoxItem_background_color READ getQComboBoxItem_background_color WRITE setQComboBoxItem_background_color)
+    Q_PROPERTY(QColor QTreeViewBranchHover_background_color READ getQTreeViewBranchHover_background_color WRITE setQTreeViewBranchHover_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxDisabled_background_color)
-    Q_PROPERTY(QColor QComboBoxDisabled_background_color READ getQComboBoxDisabled_background_color WRITE setQComboBoxDisabled_background_color)
+    /**
+     * @brief Setter property for QTreeViewBranchHover_color
+     */
+    void setQTreeViewBranchHover_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewBranchHover_color
+     * @return Value of QTreeViewBranchHover_color
+     */
+    QColor getQTreeViewBranchHover_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QComboBoxDisabled_color)
-    Q_PROPERTY(QColor QComboBoxDisabled_color READ getQComboBoxDisabled_color WRITE setQComboBoxDisabled_color)
+    Q_PROPERTY(QColor QTreeViewBranchHover_color READ getQTreeViewBranchHover_color WRITE setQTreeViewBranchHover_color)
 
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolBar_background_color)    
-    Q_PROPERTY(QColor QToolBar_background_color READ getQToolBar_background_color WRITE setQToolBar_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QToolBar_border_color)    
-    Q_PROPERTY(QColor QToolBar_border_color READ getQToolBar_border_color WRITE setQToolBar_border_color)
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeView_background_color)    
-    Q_PROPERTY(QColor QTreeView_background_color READ getQTreeView_background_color WRITE setQTreeView_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItem_background_color)    
-    Q_PROPERTY(QColor QTreeViewItem_background_color READ getQTreeViewItem_background_color WRITE setQTreeViewItem_background_color)    
+    /**
+     * @brief Setter property for QTreeViewBranchSelectedActive_background_color
+     */
+    void setQTreeViewBranchSelectedActive_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewBranchSelectedActive_background_color
+     * @return Value of QTreeViewBranchSelectedActive_background_color
+     */
+    QColor getQTreeViewBranchSelectedActive_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItem_error_background_color)
-    Q_PROPERTY(QColor QTreeViewItem_error_background_color READ getQTreeViewItem_error_background_color WRITE setQTreeViewItem_error_background_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItem_color)
-    Q_PROPERTY(QColor QTreeViewItem_color READ getQTreeViewItem_color WRITE setQTreeViewItem_color)
+    Q_PROPERTY(QColor QTreeViewBranchSelectedActive_background_color READ getQTreeViewBranchSelectedActive_background_color WRITE setQTreeViewBranchSelectedActive_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItem_error_color)
-    Q_PROPERTY(QColor QTreeViewItem_error_color READ getQTreeViewItem_error_color WRITE setQTreeViewItem_error_color)
+    /**
+     * @brief Setter property for QTreeViewBranchSelectedNotActive_background_color
+     */
+    void setQTreeViewBranchSelectedNotActive_background_color(const QColor& value);
+    /**
+     * @brief Getter property for QTreeViewBranchSelectedNotActive_background_color
+     * @return Value of QTreeViewBranchSelectedNotActive_background_color
+     */
+    QColor getQTreeViewBranchSelectedNotActive_background_color() const;
 
-    SIMPL_INSTANCE_PROPERTY(int, QTreeViewItem_font_size)
-    Q_PROPERTY(int QTreeViewItem_font_size READ getQTreeViewItem_font_size WRITE setQTreeViewItem_font_size)
+    Q_PROPERTY(QColor QTreeViewBranchSelectedNotActive_background_color READ getQTreeViewBranchSelectedNotActive_background_color WRITE setQTreeViewBranchSelectedNotActive_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemHover_background_color)    
-    Q_PROPERTY(QColor QTreeViewItemHover_background_color READ getQTreeViewItemHover_background_color WRITE setQTreeViewItemHover_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemHover_color)    
-    Q_PROPERTY(QColor QTreeViewItemHover_color READ getQTreeViewItemHover_color WRITE setQTreeViewItemHover_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemSelectedActive_background_color)    
-    Q_PROPERTY(QColor QTreeViewItemSelectedActive_background_color READ getQTreeViewItemSelectedActive_background_color WRITE setQTreeViewItemSelectedActive_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemSelectedActive_color)    
-    Q_PROPERTY(QColor QTreeViewItemSelectedActive_color READ getQTreeViewItemSelectedActive_color WRITE setQTreeViewItemSelectedActive_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemSelectedNotActive_background_color)    
-    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_background_color READ getQTreeViewItemSelectedNotActive_background_color WRITE setQTreeViewItemSelectedNotActive_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewItemSelectedNotActive_color)    
-    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_color READ getQTreeViewItemSelectedNotActive_color WRITE setQTreeViewItemSelectedNotActive_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewBranch_background_color)    
-    Q_PROPERTY(QColor QTreeViewBranch_background_color READ getQTreeViewBranch_background_color WRITE setQTreeViewBranch_background_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewBranchHover_background_color)    
-    Q_PROPERTY(QColor QTreeViewBranchHover_background_color READ getQTreeViewBranchHover_background_color WRITE setQTreeViewBranchHover_background_color)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewBranchHover_color)    
-    Q_PROPERTY(QColor QTreeViewBranchHover_color READ getQTreeViewBranchHover_color WRITE setQTreeViewBranchHover_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewBranchSelectedActive_background_color)    
-    Q_PROPERTY(QColor QTreeViewBranchSelectedActive_background_color READ getQTreeViewBranchSelectedActive_background_color WRITE setQTreeViewBranchSelectedActive_background_color)    
+    /**
+     * @brief Setter property for FilterBackgroundColor
+     */
+    void setFilterBackgroundColor(const QColor& value);
+    /**
+     * @brief Getter property for FilterBackgroundColor
+     * @return Value of FilterBackgroundColor
+     */
+    QColor getFilterBackgroundColor() const;
+
+    Q_PROPERTY(QColor FilterBackgroundColor READ getFilterBackgroundColor WRITE setFilterBackgroundColor)
+
+    /**
+     * @brief Setter property for FilterSelectionColor
+     */
+    void setFilterSelectionColor(const QColor& value);
+    /**
+     * @brief Getter property for FilterSelectionColor
+     * @return Value of FilterSelectionColor
+     */
+    QColor getFilterSelectionColor() const;
+
+    Q_PROPERTY(QColor FilterSelectionColor READ getFilterSelectionColor WRITE setFilterSelectionColor)
+
+    /**
+     * @brief Setter property for FilterFontColor
+     */
+    void setFilterFontColor(const QColor& value);
+    /**
+     * @brief Getter property for FilterFontColor
+     * @return Value of FilterFontColor
+     */
+    QColor getFilterFontColor() const;
+
+    Q_PROPERTY(QColor FilterFontColor READ getFilterFontColor WRITE setFilterFontColor)
+
+    /**
+     * @brief Setter property for DataArrayPath_DataContainer_color
+     */
+    void setDataArrayPath_DataContainer_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_DataContainer_color
+     * @return Value of DataArrayPath_DataContainer_color
+     */
+    QColor getDataArrayPath_DataContainer_color() const;
 
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, QTreeViewBranchSelectedNotActive_background_color)    
-    Q_PROPERTY(QColor QTreeViewBranchSelectedNotActive_background_color READ getQTreeViewBranchSelectedNotActive_background_color WRITE setQTreeViewBranchSelectedNotActive_background_color)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterBackgroundColor)    
-    Q_PROPERTY(QColor FilterBackgroundColor READ getFilterBackgroundColor WRITE setFilterBackgroundColor)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterSelectionColor)    
-    Q_PROPERTY(QColor FilterSelectionColor READ getFilterSelectionColor WRITE setFilterSelectionColor)    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, FilterFontColor)    
-    Q_PROPERTY(QColor FilterFontColor READ getFilterFontColor WRITE setFilterFontColor)    
-    
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataContainer_color)
     Q_PROPERTY(QColor DataArrayPath_DataContainer_color READ getDataArrayPath_DataContainer_color WRITE setDataArrayPath_DataContainer_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_AttributeMatrix_color)
+    /**
+     * @brief Setter property for DataArrayPath_AttributeMatrix_color
+     */
+    void setDataArrayPath_AttributeMatrix_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_AttributeMatrix_color
+     * @return Value of DataArrayPath_AttributeMatrix_color
+     */
+    QColor getDataArrayPath_AttributeMatrix_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_color READ getDataArrayPath_AttributeMatrix_color WRITE setDataArrayPath_AttributeMatrix_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataArray_color)
+    /**
+     * @brief Setter property for DataArrayPath_DataArray_color
+     */
+    void setDataArrayPath_DataArray_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_DataArray_color
+     * @return Value of DataArrayPath_DataArray_color
+     */
+    QColor getDataArrayPath_DataArray_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_DataArray_color READ getDataArrayPath_DataArray_color WRITE setDataArrayPath_DataArray_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_Invalid_color)
+    /**
+     * @brief Setter property for DataArrayPath_Invalid_color
+     */
+    void setDataArrayPath_Invalid_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_Invalid_color
+     * @return Value of DataArrayPath_Invalid_color
+     */
+    QColor getDataArrayPath_Invalid_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_Invalid_color READ getDataArrayPath_Invalid_color WRITE setDataArrayPath_Invalid_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataContainer_background_color)
+    /**
+     * @brief Setter property for DataArrayPath_DataContainer_background_color
+     */
+    void setDataArrayPath_DataContainer_background_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_DataContainer_background_color
+     * @return Value of DataArrayPath_DataContainer_background_color
+     */
+    QColor getDataArrayPath_DataContainer_background_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_DataContainer_background_color READ getDataArrayPath_DataContainer_background_color WRITE setDataArrayPath_DataContainer_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_AttributeMatrix_background_color)
+    /**
+     * @brief Setter property for DataArrayPath_AttributeMatrix_background_color
+     */
+    void setDataArrayPath_AttributeMatrix_background_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_AttributeMatrix_background_color
+     * @return Value of DataArrayPath_AttributeMatrix_background_color
+     */
+    QColor getDataArrayPath_AttributeMatrix_background_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_background_color READ getDataArrayPath_AttributeMatrix_background_color WRITE setDataArrayPath_AttributeMatrix_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_DataArray_background_color)
+    /**
+     * @brief Setter property for DataArrayPath_DataArray_background_color
+     */
+    void setDataArrayPath_DataArray_background_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_DataArray_background_color
+     * @return Value of DataArrayPath_DataArray_background_color
+     */
+    QColor getDataArrayPath_DataArray_background_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_DataArray_background_color READ getDataArrayPath_DataArray_background_color WRITE setDataArrayPath_DataArray_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_Invalid_background_color)
+    /**
+     * @brief Setter property for DataArrayPath_Invalid_background_color
+     */
+    void setDataArrayPath_Invalid_background_color(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_Invalid_background_color
+     * @return Value of DataArrayPath_Invalid_background_color
+     */
+    QColor getDataArrayPath_Invalid_background_color() const;
+
     Q_PROPERTY(QColor DataArrayPath_Invalid_background_color READ getDataArrayPath_Invalid_background_color WRITE setDataArrayPath_Invalid_background_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_normal)
+    /**
+     * @brief Setter property for DataArrayPath_border_normal
+     */
+    void setDataArrayPath_border_normal(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_border_normal
+     * @return Value of DataArrayPath_border_normal
+     */
+    QColor getDataArrayPath_border_normal() const;
+
     Q_PROPERTY(QColor DataArrayPath_border_normal READ getDataArrayPath_border_normal WRITE setDataArrayPath_border_normal)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_not_found)
+    /**
+     * @brief Setter property for DataArrayPath_border_not_found
+     */
+    void setDataArrayPath_border_not_found(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_border_not_found
+     * @return Value of DataArrayPath_border_not_found
+     */
+    QColor getDataArrayPath_border_not_found() const;
+
     Q_PROPERTY(QColor DataArrayPath_border_not_found READ getDataArrayPath_border_not_found WRITE setDataArrayPath_border_not_found)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_drag_enabled)
+    /**
+     * @brief Setter property for DataArrayPath_border_drag_enabled
+     */
+    void setDataArrayPath_border_drag_enabled(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_border_drag_enabled
+     * @return Value of DataArrayPath_border_drag_enabled
+     */
+    QColor getDataArrayPath_border_drag_enabled() const;
+
     Q_PROPERTY(QColor DataArrayPath_border_drag_enabled READ getDataArrayPath_border_drag_enabled WRITE setDataArrayPath_border_drag_enabled)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataArrayPath_border_drag_disabled)
+    /**
+     * @brief Setter property for DataArrayPath_border_drag_disabled
+     */
+    void setDataArrayPath_border_drag_disabled(const QColor& value);
+    /**
+     * @brief Getter property for DataArrayPath_border_drag_disabled
+     * @return Value of DataArrayPath_border_drag_disabled
+     */
+    QColor getDataArrayPath_border_drag_disabled() const;
+
     Q_PROPERTY(QColor DataArrayPath_border_drag_disabled READ getDataArrayPath_border_drag_disabled WRITE setDataArrayPath_border_drag_disabled)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataPathLabel_color)
+    /**
+     * @brief Setter property for DataPathLabel_color
+     */
+    void setDataPathLabel_color(const QColor& value);
+    /**
+     * @brief Getter property for DataPathLabel_color
+     * @return Value of DataPathLabel_color
+     */
+    QColor getDataPathLabel_color() const;
+
     Q_PROPERTY(QColor DataPathLabel_color READ getDataPathLabel_color WRITE setDataPathLabel_color)
 
-    SIMPL_INSTANCE_PROPERTY(QColor, DataPathLabel_Disabled_color)
+    /**
+     * @brief Setter property for DataPathLabel_Disabled_color
+     */
+    void setDataPathLabel_Disabled_color(const QColor& value);
+    /**
+     * @brief Getter property for DataPathLabel_Disabled_color
+     * @return Value of DataPathLabel_Disabled_color
+     */
+    QColor getDataPathLabel_Disabled_color() const;
+
     Q_PROPERTY(QColor DataPathLabel_Disabled_color READ getDataPathLabel_Disabled_color WRITE setDataPathLabel_Disabled_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, SIMPLViewPipelineDockWidgetTitle_inactive_background_color)
+
+    /**
+     * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+     */
+    void setSIMPLViewPipelineDockWidgetTitle_inactive_background_color(const QColor& value);
+    /**
+     * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+     * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+     */
+    QColor getSIMPLViewPipelineDockWidgetTitle_inactive_background_color() const;
+
     Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_background_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_background_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_background_color)
-    
-    SIMPL_INSTANCE_PROPERTY(QColor, SIMPLViewPipelineDockWidgetTitle_inactive_text_color)
+
+    /**
+     * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+     */
+    void setSIMPLViewPipelineDockWidgetTitle_inactive_text_color(const QColor& value);
+    /**
+     * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+     * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+     */
+    QColor getSIMPLViewPipelineDockWidgetTitle_inactive_text_color() const;
+
     Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_text_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_text_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_text_color)
         
     /**
@@ -591,6 +1675,129 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
     void styleSheetLoaded(const QString &styleFilePath);
     
   private:
+    QColor m_Fader_color = {};
+    QColor m_Widget_Error_color = {};
+    QColor m_Text_Error_color = {};
+    QColor m_CentralWidget_background_color = {};
+    QColor m_QLabel_color = {};
+    QColor m_FilterInputWidget_background_color = {};
+    QColor m_QScrollArea_background_color = {};
+    QColor m_VariablesTabContents_background_color = {};
+    QColor m_FilterParameterWidget_background_color = {};
+    QColor m_FilterParameterWidget_border_color = {};
+    QColor m_QGroupBoxTitle_background_color = {};
+    QColor m_QGroupBox_background_color = {};
+    QColor m_QDockWidget_border_color = {};
+    QColor m_QDockWidget_color = {};
+    QColor m_QDockWidgetTitle_background_color = {};
+    QColor m_QDockWidgetTitle_color = {};
+    QColor m_QListView_background_color = {};
+    QColor m_QListView_color = {};
+    QColor m_QListViewItemHover_background_color = {};
+    QColor m_QListViewItemHover_color = {};
+    QColor m_QListViewItemSelected_background_color = {};
+    QColor m_QListViewItemSelected_color = {};
+    QColor m_QMainWindowSeparator_background_color = {};
+    QColor m_QMenuBar_background_color = {};
+    QColor m_QMenuBarItem_color = {};
+    QColor m_QMenuBarItemPressed_color = {};
+    QColor m_QMenuBarItemSelected_background_color = {};
+    QColor m_QMenuBarItemSelected_color = {};
+    QColor m_QMenu_background_color = {};
+    QColor m_QMenu_color = {};
+    QColor m_QMenuItemSelected_background_color = {};
+    QColor m_QMenuItemSelected_color = {};
+    QColor m_QMenuItemDisabled_background_color = {};
+    QColor m_QPushButton_background_color = {};
+    QColor m_QPushButton_border_color = {};
+    QColor m_QPushButtonHover_background_color = {};
+    QColor m_QPushButtonPressed_background_color = {};
+    QColor m_QPushButtonDefault_background_color = {};
+    QColor m_QPushButtonDefaultPressed_background_color = {};
+    QColor m_QPushButtonDefaultHover_background_color = {};
+    QColor m_QPushButtonDefault_border_color = {};
+    QColor m_QPushButtonDefault_text_color = {};
+    QColor m_QSplitter_handle_start_color = {};
+    QColor m_QSplitter_handle_end_color = {};
+    QColor m_QToolButton_background_color = {};
+    QColor m_QToolButton_color = {};
+    QColor m_QToolButton_border_color = {};
+    QColor m_QToolButtonChecked_background_color = {};
+    QColor m_QToolButtonDisabled_background_color = {};
+    QColor m_QToolButtonDisabled_color = {};
+    QColor m_QStatusBar_border_color = {};
+    QColor m_QTableWidget_color = {};
+    QColor m_QTableWidget_selected_background_color = {};
+    QColor m_QHeaderView_background_color = {};
+    QColor m_QHeaderView_border_color = {};
+    QColor m_QHeaderView_color = {};
+    QColor m_QHeaderViewDisabled_background_color = {};
+    QColor m_QHeaderViewDisabled_border_color = {};
+    QColor m_QHeaderViewDisabled_color = {};
+    QColor m_QTabWidgetPane_border_color = {};
+    QColor m_QTabWidgetPane_background_color = {};
+    QColor m_QTabBarTab_border_color = {};
+    QColor m_QTabBarTabSelected_background_color = {};
+    QColor m_QTabBarTabSelected_color = {};
+    QColor m_QTabBarTabNotSelected_background_color = {};
+    QColor m_QTabBarTabNotSelectedHover_background_color = {};
+    QColor m_QTextEdit_background_color = {};
+    QColor m_QTextEdit_color = {};
+    QColor m_QLineEdit_color = {};
+    QColor m_QLineEdit_background_color = {};
+    QColor m_QLineEdit_border_color = {};
+    QColor m_QLineEditDisabled_background_color = {};
+    QColor m_QLineEditError_background_color = {};
+    QColor m_QSpinBoxArrow_background_color = {};
+    QColor m_QSpinBoxArrow_hover_background_color = {};
+    QColor m_QComboBox_border_color = {};
+    QColor m_QComboBox_background_color = {};
+    QColor m_QComboBoxArrow_background_color = {};
+    QColor m_QComboBoxArrow_hover_background_color = {};
+    QColor m_QComboBoxItem_border_color = {};
+    QColor m_QComboBoxItem_selection_color = {};
+    QColor m_QComboBoxItem_background_color = {};
+    QColor m_QComboBoxDisabled_background_color = {};
+    QColor m_QComboBoxDisabled_color = {};
+    QColor m_QToolBar_background_color = {};
+    QColor m_QToolBar_border_color = {};
+    QColor m_QTreeView_background_color = {};
+    QColor m_QTreeViewItem_background_color = {};
+    QColor m_QTreeViewItem_error_background_color = {};
+    QColor m_QTreeViewItem_color = {};
+    QColor m_QTreeViewItem_error_color = {};
+    int m_QTreeViewItem_font_size = {};
+    QColor m_QTreeViewItemHover_background_color = {};
+    QColor m_QTreeViewItemHover_color = {};
+    QColor m_QTreeViewItemSelectedActive_background_color = {};
+    QColor m_QTreeViewItemSelectedActive_color = {};
+    QColor m_QTreeViewItemSelectedNotActive_background_color = {};
+    QColor m_QTreeViewItemSelectedNotActive_color = {};
+    QColor m_QTreeViewBranch_background_color = {};
+    QColor m_QTreeViewBranchHover_background_color = {};
+    QColor m_QTreeViewBranchHover_color = {};
+    QColor m_QTreeViewBranchSelectedActive_background_color = {};
+    QColor m_QTreeViewBranchSelectedNotActive_background_color = {};
+    QColor m_FilterBackgroundColor = {};
+    QColor m_FilterSelectionColor = {};
+    QColor m_FilterFontColor = {};
+    QColor m_DataArrayPath_DataContainer_color = {};
+    QColor m_DataArrayPath_AttributeMatrix_color = {};
+    QColor m_DataArrayPath_DataArray_color = {};
+    QColor m_DataArrayPath_Invalid_color = {};
+    QColor m_DataArrayPath_DataContainer_background_color = {};
+    QColor m_DataArrayPath_AttributeMatrix_background_color = {};
+    QColor m_DataArrayPath_DataArray_background_color = {};
+    QColor m_DataArrayPath_Invalid_background_color = {};
+    QColor m_DataArrayPath_border_normal = {};
+    QColor m_DataArrayPath_border_not_found = {};
+    QColor m_DataArrayPath_border_drag_enabled = {};
+    QColor m_DataArrayPath_border_drag_disabled = {};
+    QColor m_DataPathLabel_color = {};
+    QColor m_DataPathLabel_Disabled_color = {};
+    QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_background_color = {};
+    QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_text_color = {};
+
     static SVStyle* self;
 
     QString m_CurrentThemeFilePath = ":/SIMPL/StyleSheets/Default.json";
diff --git a/ThirdParty/QtWebApp/logging/dualfilelogger.h b/ThirdParty/QtWebApp/logging/dualfilelogger.h
index 23c6a73ee7..47ede3b1a0 100644
--- a/ThirdParty/QtWebApp/logging/dualfilelogger.h
+++ b/ThirdParty/QtWebApp/logging/dualfilelogger.h
@@ -34,7 +34,7 @@ class QtWebAppLib_EXPORT DualFileLogger : public Logger
     @param refreshInterval Interval of checking for changed config settings in msec, or 0=disabled
     @param parent Parent object.
   */
-  DualFileLogger(QSettings* firstSettings, QSettings* secondSettings, const int refreshInterval = 10000, QObject* parent = 0);
+  DualFileLogger(QSettings* firstSettings, QSettings* secondSettings, const int refreshInterval = 10000, QObject* parent = nullptr);
 
   /**
     Decorate and log the message, if type>=minLevel.
diff --git a/ThirdParty/QtWebApp/logging/filelogger.h b/ThirdParty/QtWebApp/logging/filelogger.h
index 7b563c03bf..335060c6e2 100644
--- a/ThirdParty/QtWebApp/logging/filelogger.h
+++ b/ThirdParty/QtWebApp/logging/filelogger.h
@@ -59,7 +59,7 @@ class QtWebAppLib_EXPORT FileLogger : public Logger
     @param refreshInterval Interval of checking for changed config settings in msec, or 0=disabled
     @param parent Parent object
   */
-  FileLogger(QSettings* settings, const int refreshInterval = 10000, QObject* parent = 0);
+  FileLogger(QSettings* settings, const int refreshInterval = 10000, QObject* parent = nullptr);
 
   /**
     Destructor. Closes the file.
diff --git a/ThirdParty/QtWebApp/logging/logger.h b/ThirdParty/QtWebApp/logging/logger.h
index 3f13fec1fb..7bac445255 100644
--- a/ThirdParty/QtWebApp/logging/logger.h
+++ b/ThirdParty/QtWebApp/logging/logger.h
@@ -66,7 +66,7 @@ class QtWebAppLib_EXPORT Logger : public QObject
     @see LogMessage for a description of the message decoration.
   */
   Logger(const QString msgFormat = "{timestamp} {type} {msg}", const QString timestampFormat = "dd.MM.yyyy hh:mm:ss.zzz", const QtMsgType minLevel = QtDebugMsg, const int bufferSize = 0,
-         QObject* parent = 0);
+         QObject* parent = nullptr);
 
   /** Destructor */
   ~Logger() override;
diff --git a/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h b/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
index 30c3c4be00..57f61ba980 100644
--- a/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
+++ b/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
@@ -46,8 +46,8 @@ class QtUnixServerSocket : public QTcpServer
 {
   Q_OBJECT
 public:
-  QtUnixServerSocket(const QString& path, QObject* parent = 0);
-  QtUnixServerSocket(QObject* parent = 0);
+  QtUnixServerSocket(const QString& path, QObject* parent = nullptr);
+  QtUnixServerSocket(QObject* parent = nullptr);
 
   void setPath(const QString& path);
   void close();
diff --git a/ThirdParty/QtWebApp/qtservice/qtunixsocket.h b/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
index 337cec615c..b61611a2db 100644
--- a/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
+++ b/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
@@ -46,7 +46,7 @@ class QtUnixSocket : public QTcpSocket
 {
   Q_OBJECT
 public:
-  QtUnixSocket(QObject* parent = 0);
+  QtUnixSocket(QObject* parent = nullptr);
 
   bool connectTo(const QString& path);
 };
diff --git a/ThirdParty/QtWebApp/templateengine/templatecache.h b/ThirdParty/QtWebApp/templateengine/templatecache.h
index db68360324..46e7e0d728 100644
--- a/ThirdParty/QtWebApp/templateengine/templatecache.h
+++ b/ThirdParty/QtWebApp/templateengine/templatecache.h
@@ -48,7 +48,7 @@ class QtWebAppLib_EXPORT TemplateCache : public TemplateLoader
     @param settings configurations settings
     @param parent Parent object
   */
-  TemplateCache(QSettings* settings, QObject* parent = 0);
+  TemplateCache(QSettings* settings, QObject* parent = nullptr);
 
 protected:
   /**
diff --git a/ThirdParty/QtWebApp/templateengine/templateloader.h b/ThirdParty/QtWebApp/templateengine/templateloader.h
index 38bd9b4815..0dc69fdf3b 100644
--- a/ThirdParty/QtWebApp/templateengine/templateloader.h
+++ b/ThirdParty/QtWebApp/templateengine/templateloader.h
@@ -44,7 +44,7 @@ class QtWebAppLib_EXPORT TemplateLoader : public QObject
     @param settings configurations settings
     @param parent parent object
   */
-  TemplateLoader(QSettings* settings, QObject* parent = 0);
+  TemplateLoader(QSettings* settings, QObject* parent = nullptr);
 
   /** Destructor */
   virtual ~TemplateLoader();
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
index b6a3cc9aa4..6222c17b21 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
@@ -30,15 +30,15 @@ const QString kConstGetOverload("CONST_GET_OVERLOAD");
 
 /* These are for the macros that appear in the header files */
 const QString kPYB11_CREATE_BINDINGS("PYB11_CREATE_BINDINGS");
-const QString kSIMPL_STATIC_NEW_MACRO("SIMPL_STATIC_NEW_MACRO");
-const QString kSIMPL_FILTER_NEW_MACRO("SIMPL_FILTER_NEW_MACRO");
-const QString kSIMPL_SHARED_POINTERS("SIMPL_SHARED_POINTERS");
 const QString kPYB11_PROPERTY("PYB11_PROPERTY");
 const QString kPYB11_METHOD("PYB11_METHOD");
 const QString kPYB11_STATIC_CREATION("PYB11_STATIC_CREATION");
 const QString kPYB11_CREATION("PYB11_CREATION");
 const QString kPYB11_ENUMERATION("PYB11_ENUMERATION");
 
-/* */
-const QString kSIMPL_FILTER_PARAMETER("SIMPL_FILTER_PARAMETER");
-}
+const QString kSIMPL_STATIC_NEW_MACRO("PYB11_STATIC_NEW_MACRO");
+const QString kSIMPL_FILTER_NEW_MACRO("PYB11_FILTER_NEW_MACRO");
+const QString kSIMPL_SHARED_POINTERS("PYB11_SHARED_POINTERS");
+const QString kSIMPL_FILTER_PARAMETER("PYB11_FILTER_PARAMETER");
+
+} // namespace
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index dd21ee8fd9..d2e96de4e2 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -313,6 +313,10 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
   {
     return;
   }
+  if(fi.baseName() == "SIMPLPythonMacros")
+  {
+    return;
+  }
 
   {
     // Read the Source File
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
index 1033eab4f6..eebe908e0e 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
@@ -4,8 +4,6 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "PythonBindingsModule.h"
 /* *****************************************************************************
  *
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
index ea5da4645d..cb3696740d 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
@@ -1,5 +1,7 @@
 #include "PythonBindingClass.h"
 
+#include <memory>
+
 #include <iostream>
 
 #include <QtCore/QCryptographicHash>
@@ -801,5 +803,8 @@ QString PythonBindingClass::generateFooterCode()
 
   // Close up the Anonymous namespace
   out << "} /* End anonymous namespace */\n\n";
+  out << "#if !defined(_MSC_VER)\n";
+  out << "#pragma clang diagnostic pop\n";
+  out << "#endif\n";
   return code;
 }
diff --git a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
index 079737d8ec..efec8b3de4 100644
--- a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
@@ -1,3 +1,7 @@
+#include <memory>
+
+#include <memory>
+
 /* Template file used is called DerivedSharedPointerClassInit.in.h */
 // clang-format off
 /**
diff --git a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
index be932bbfdb..5d3e41d9ca 100644
--- a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
@@ -2,6 +2,8 @@
  * then edit the template file.
  */
 // clang-format off
+#include <memory>
+
 #include <pybind11/pybind11.h>
 
 #include <utility>
@@ -62,4 +64,3 @@ void Init_@LIB_NAME@(py::module& parentModule)
 }
 
 #undef @FULL_LIB_NAME@_PYBIND_11_HEADER
-// clang-format on
\ No newline at end of file
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
index ba1669d018..657597fe63 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
@@ -1,3 +1,9 @@
+
+#if !defined(_MSC_VER)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreturn-std-move"
+#endif
+
 // clang-format off
 #include <QtCore/QString>
 
@@ -631,3 +637,7 @@ template <> struct type_caster<VectorOfFloatArray>
 } // namespace detail
 } // namespace pybind11
 // clang-format on
+
+#if !defined(_MSC_VER)
+#pragma clang diagnostic pop
+#endif
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
index b42dff760a..40b5cb5608 100644
--- a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
+++ b/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
@@ -1,4 +1,10 @@
 #pragma once
+
+#if !defined(_MSC_VER)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreturn-std-move"
+#endif
+
 // clang-format off
 /* =============================================================================
  * BEGIN Template file Pybind11TopMatter.in.h
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index ce9299082f..1feec519b9 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -3,6 +3,8 @@
  * BEGIN Template file SIMPLModuleCodeTemplate.in.cpp
  * ========================================================================== */
 
+#include <memory>
+
 #include <pybind11/numpy.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl_bind.h>
diff --git a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
index 749defb095..46e8162feb 100644
--- a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
@@ -1,3 +1,7 @@
+#include <memory>
+
+#include <memory>
+
 // clang-format off
 /* =============================================================================
  * BEGIN Template file SharedPointerClassInit.in.h
diff --git a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
index 2f5959d089..0e214352c6 100644
--- a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
+++ b/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
@@ -1,3 +1,7 @@
+#include <memory>
+
+#include <memory>
+
 // clang-format off
 /* =============================================================================
  * BEGIN Template file SimpleClassInit.in.h
diff --git a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
index 95cf0f92de..39a277fe56 100644
--- a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
+++ b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
@@ -51,7 +51,7 @@ function(CreatePybind11Module)
       "${ARGS_SIMPLIB}"
       "${CMAKE_CFG_INTDIR}"
       DEPENDS GeneratePythonBindings ${COPY_LIBRARY_TARGETS}
-      COMMENT "GeneratePythonBindings: Creating Python Bindings for ${ARGS_MODULE_NAME} using pybind11"
+      COMMENT " ${ARGS_MODULE_NAME}: Creating Python Bindings using pybind11"
     )
 
   # --------------------------------------------------------------------------

From 12cfa13fcf1bd373a77779794554fa4b54261696 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 31 Oct 2019 15:19:37 -0400
Subject: [PATCH 157/397] Add include directive to ensure that ITK_v5CONST is
 properly defined.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkImportDream3DImageContainer.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
index aac20a91be..771e462e4e 100644
--- a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
+++ b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
@@ -17,6 +17,8 @@
  *=========================================================================*/
 #pragma once
 
+#include "SIMPLib/ITK/itkSupportConstants.h"
+
 #include "itkImportImageContainer.h"
 
 namespace itk

From 3a1935b04054fe0675e79d7445d93fa72f946107 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Tue, 5 Nov 2019 16:45:35 -0500
Subject: [PATCH 158/397] Reverted a change to JsonFilterParametersWriter
 constructor

* Default constructor still expands reader filters.
* The constructor accepting filename, pipeline name, and number of filters once again does not expand reader filters.  Booleans default construct to false.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>
---
 Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index f1987aa917..6ebc051086 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -60,8 +60,7 @@ JsonFilterParametersWriter::JsonFilterParametersWriter()
 //
 // -----------------------------------------------------------------------------
 JsonFilterParametersWriter::JsonFilterParametersWriter(QString& fileName, QString& pipelineName, int& numFilters)
-: m_ExpandReaderFilters(true)
-, m_MaxFilterIndex(-1)
+: m_MaxFilterIndex(-1)
 , m_CurrentIndex(0)
 {
   m_FileName = fileName;

From 2b175dd9c99f548e1c0acfc656d77835c909d043 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 13 Nov 2019 08:18:24 -0500
Subject: [PATCH 159/397] Add filter that generates a tilt series of images
 from an ImageGeom (#378)

* Add filter that generates a tilt series of images from an ImageGeom

* Creating Unit test that only tests the basic functionality

A deeper unit test that has exemplar output images needs to be created.

* Address use of static const.

updates #378

* Added check to prevent accessing unallocated array elements

* GenerateTiltSeries::generateGrid() could try to create a grid
coordinates array with 0 elements and then access it depending on
the user input for the spacing.
* Changed the axis constants in GenerateTiltSeries to be static
constexpr

* Add another array to the debugged vertex array that stores the FeatureIds.

This allows the developer to more easily debug the rotated geometries
complete with the proper data.

* Added parameter for the prefix of the output data containers

* Changed constants to be constexpr

* Ran clang-format

* Update codes to latest API Changes.

* Adjusted some debugging data arrays that get created.

* Rewrite Grid generation be specific for X, Y or Z Axis.

The generic versions were to difficult and obtuse to get working.

* Added test for GenerateTiltSeries filter

* Compares against GenerateTiltSeriesTest.dream3d from DREAM3D_Data repo

* Added copyright notice

* Ran clang-format

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/GenerateTiltSeries.cpp        | 1001 +++++++++++++++++
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  |  262 +++++
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |   36 +-
 Source/SIMPLib/CoreFilters/SourceList.cmake   |    1 +
 .../Testing/Cxx/GenerateTiltSeriesTest.cpp    |  179 +++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |    1 +
 .../CoreFilters/GenerateTiltSeries.md         |   52 +
 .../CoreFilters/Images/GenerateTiltSeries.png |  Bin 0 -> 1278711 bytes
 Source/SIMPLib/Filtering/FilterPipeline.h     |    4 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |   20 +-
 Source/SIMPLib/Testing/TestFileLocations.h.in |    5 +
 11 files changed, 1540 insertions(+), 21 deletions(-)
 create mode 100644 Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/GenerateTiltSeries.png

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
new file mode 100644
index 0000000000..91802ad2c2
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -0,0 +1,1001 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "GenerateTiltSeries.h"
+
+#include <thread>
+#include <cmath>
+
+#define GTS_GENERATE_DEBUG_ARRAYS 0
+// If we are writing out all the arrays for debugging then we MUST be single threaded.
+#if(GTS_GENERATE_DEBUG_ARRAYS == 1)
+#undef SIMPL_USE_PARALLEL_ALGORITHMS
+#endif
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+#include <tbb/task_group.h>
+#include <tbb/task_scheduler_init.h>
+#endif
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
+#include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
+#include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/FloatFilterParameter.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/VertexGeom.h"
+#include "SIMPLib/ITK/Dream3DTemplateAliasMacro.h"
+#include "SIMPLib/ITK/SimpleITKEnums.h"
+#include "SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h"
+#include "SIMPLib/Math/SIMPLibMath.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+#ifndef DREAM3D_PASSIVE_ROTATION
+#define DREAM3D_PASSIVE_ROTATION 1
+#endif
+
+#ifndef ROTATIONS_CONSTANTS
+#define ROTATIONS_CONSTANTS
+namespace Rotations
+{
+namespace Constants
+{
+#if DREAM3D_PASSIVE_ROTATION
+constexpr float epsijk = 1.0f;
+// static const double epsijkd = 1.0;
+#elif DREAM3D_ACTIVE_ROTATION
+constexpr float epsijk = -1.0f;
+constexpr double epsijkd = -1.0;
+#endif
+} // namespace Constants
+} // namespace Rotations
+
+#endif
+
+namespace Detail
+{
+
+const QString k_AttributeMatrixName("Slice Data");
+
+class ResampleGrid
+{
+public:
+  using AxisAngleType = std::array<float, 4>;
+  using CoordinateType = FloatVec3Type;
+  using OrientationMatrixType = std::vector<float>;
+
+  ResampleGrid(GenerateTiltSeries* filter, const FloatArrayType::Pointer& inputGrid, const DataContainer::Pointer& outDc, const AxisAngleType& rotationAxis, size_t gridIndex)
+  : m_Filter(filter)
+  , m_Coords(inputGrid)
+  , m_OutputDC(outDc)
+  , m_RotationAxis(rotationAxis)
+  , m_GridIndex(gridIndex)
+  {
+  }
+  ~ResampleGrid() = default;
+
+  ResampleGrid(const ResampleGrid&) = default;
+  ResampleGrid(ResampleGrid&&) noexcept = default;
+  ResampleGrid& operator=(const ResampleGrid&) = delete; // Copy Assignment Not Implemented
+  ResampleGrid& operator=(ResampleGrid&&) = delete;      // Move Assignment Not Implemented
+
+  void operator()() const
+  {
+
+    //========= Input Data Structure Elements
+    DataContainerArray::Pointer dca = m_Filter->getDataContainerArray();
+    IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath<IDataArray>(m_Filter, m_Filter->getInputDataArrayPath());
+    DataArrayPath inputDataArrayPath = m_Filter->getInputDataArrayPath();
+    DataContainer::Pointer inputDC = dca->getDataContainer(inputDataArrayPath.getDataContainerName());
+    ImageGeom::Pointer inputImageGeom = inputDC->getGeometryAs<ImageGeom>();
+    FloatVec6Type inBounds = inputImageGeom->getBoundingBox();
+    FloatVec3Type inCenter = {(inBounds[1] - inBounds[0]) / 2.0f + inBounds[0], (inBounds[3] - inBounds[2]) / 2.0f + inBounds[2], (inBounds[5] - inBounds[4]) / 2.0f + inBounds[4]};
+
+    //  printf("inCenter %f %f %f\n", inCenter[0], inCenter[1], inCenter[2]);
+
+    //========= Output Data Structure Elements
+    ImageGeom::Pointer outputImageGeom = m_OutputDC->getGeometryAs<ImageGeom>();
+    FloatVec6Type bounds = outputImageGeom->getBoundingBox();
+    FloatVec3Type center = {(bounds[1] - bounds[0]) / 2.0f + bounds[0], (bounds[3] - bounds[2]) / 2.0f + bounds[2], (bounds[5] - bounds[4]) / 2.0f + bounds[4]};
+
+    //  printf("outCenter %f %f %f\n", center[0], center[1], center[2]);
+
+    AttributeMatrix::Pointer attrMat = m_OutputDC->getAttributeMatrix(Detail::k_AttributeMatrixName);
+    IDataArray::Pointer outputData = attrMat->getAttributeArray(m_Filter->getInputDataArrayPath().getDataArrayName());
+    outputData->initializeWithZeros();
+#if GTS_GENERATE_DEBUG_ARRAYS
+    SizeTArrayType::Pointer inputVoxIndexXYZ = SizeTArrayType::CreateArray(outputData->getNumberOfTuples(), {3}, "Input Voxel XYZ Index", true);
+    inputVoxIndexXYZ->initializeWithZeros();
+    attrMat->insertOrAssign(inputVoxIndexXYZ);
+
+    SizeTArrayType::Pointer inputVoxIndex = SizeTArrayType::CreateArray(outputData->getNumberOfTuples(), {1}, "Input Voxel Index", true);
+    inputVoxIndex->initializeWithZeros();
+    attrMat->insertOrAssign(inputVoxIndex);
+
+    FloatArrayType::Pointer inputVoxCoord = FloatArrayType::CreateArray(outputData->getNumberOfTuples(), {3}, "Input Voxel Coord", true);
+    inputVoxCoord->initializeWithZeros();
+    attrMat->insertOrAssign(inputVoxCoord);
+
+#endif
+    // Generate the Rotation Matrix
+    OrientationMatrixType om = ax2om<AxisAngleType, OrientationMatrixType>(m_RotationAxis);
+#if GTS_GENERATE_DEBUG_ARRAYS
+    FloatArrayType::Pointer copyOfGrid = std::dynamic_pointer_cast<FloatArrayType>(m_Coords->deepCopy());
+    IDataArray::Pointer vertexOutputData = outputData->createNewArray(copyOfGrid->getNumberOfTuples(), outputData->getComponentDimensions(), outputData->getName(), true);
+    vertexOutputData->initializeWithZeros();
+#endif
+    ImageGeom::ErrorType err;
+    size_t numTuples = m_Coords->getNumberOfTuples();
+    //  int32_t numComp = m_Coords->getNumberOfComponents();
+    for(size_t tupleIndex = 0; tupleIndex < numTuples; tupleIndex++)
+    {
+      size_t outputVoxelIndex = 0;
+      size_t inputVoxelIndex = 0;
+
+      // Get the original point as a copy
+      FloatVec3Type inCoord(m_Coords->getComponent(tupleIndex, 0), m_Coords->getComponent(tupleIndex, 1), m_Coords->getComponent(tupleIndex, 2));
+#if GTS_GENERATE_DEBUG_ARRAYS
+      inputVoxCoord->setTuple(tupleIndex, inCoord.data());
+#endif
+      // Find the voxel that data will be copied into
+      err = outputImageGeom->computeCellIndex(inCoord.data(), outputVoxelIndex);
+      if(err != ImageGeom::ErrorType::NoError)
+      {
+        continue;
+      }
+      //   std::cout << tupleIndex << "\tCoord:" << inCoord[0] << ", " << inCoord[1] << ", " << inCoord[2];
+
+      // Transform the Point via translation to move it to a relative position to (0,0,0)
+      inCoord[0] = inCoord[0] - center[0];
+      inCoord[1] = inCoord[1] - center[1];
+      inCoord[2] = inCoord[2] - center[2];
+
+      // Transform the point using the Orientation Matrix
+      CoordinateType outCoord = transformCoordinate<OrientationMatrixType, FloatVec3Type>(om, inCoord);
+
+      // Translate back to the actual grid
+      outCoord[0] = outCoord[0] + center[0];
+      outCoord[1] = outCoord[1] + center[1];
+      outCoord[2] = outCoord[2] + center[2];
+
+// Set the transformed coordinate into the copy of the grid Vertex List
+#if GTS_GENERATE_DEBUG_ARRAYS
+      copyOfGrid->setTuple(tupleIndex, outCoord.data());
+#endif
+
+      //    std::cout << "\t InputVoxelIndex: " << inputVoxelIndices[0] << ", " << inputVoxelIndices[1] << ", " << inputVoxelIndices[2] << std::endl;
+#if GTS_GENERATE_DEBUG_ARRAYS
+      SizeVec3Type inputVoxelIndices;
+      err = inputImageGeom->computeCellIndex(outCoord.data(), inputVoxelIndices.data());
+      inputVoxIndexXYZ->setTuple(tupleIndex, inputVoxelIndices.data());
+#endif
+      err = inputImageGeom->computeCellIndex(outCoord.data(), inputVoxelIndex);
+
+#if GTS_GENERATE_DEBUG_ARRAYS
+      // This line is OK to have before the error condition is checked because we are writing the value not
+      // using it to step into an array. This also allows us to debug the data coming out of this
+      // algorithm
+      inputVoxIndex->setTuple(tupleIndex, &inputVoxelIndex);
+#endif
+      if(err != ImageGeom::ErrorType::NoError)
+      {
+        continue;
+      }
+      outputData->copyFromArray(outputVoxelIndex, inputData, inputVoxelIndex, 1);
+#if GTS_GENERATE_DEBUG_ARRAYS
+      // Write the selected cell value array from the input data onto the Vertex Cell Array
+      // This allows us to visualize the data more easily in ParaView
+      vertexOutputData->copyFromArray(tupleIndex, inputData, inputVoxelIndex, 1);
+#endif
+    }
+
+#if GTS_GENERATE_DEBUG_ARRAYS
+    // Write out the sampling grid
+    DataContainer::Pointer gridGeomDC = DataContainer::New(QString("Vertex Grid %1").arg(m_GridIndex));
+    VertexGeom::Pointer gridVertGeom = VertexGeom::CreateGeometry(copyOfGrid->getNumberOfTuples(), "Grid Geometry", true);
+    gridVertGeom->setVertices(copyOfGrid);
+    gridGeomDC->setGeometry(gridVertGeom);
+    dca->insertOrAssign(gridGeomDC);
+    AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New({copyOfGrid->getNumberOfTuples()}, Detail::k_AttributeMatrixName, AttributeMatrix::Type::Vertex);
+    gridGeomDC->insertOrAssign(cellAttrMat);
+    cellAttrMat->insertOrAssign(vertexOutputData);
+#endif
+  }
+
+  template <typename T, typename K>
+  K transformCoordinate(const T& orientationMatrix, const K& coord) const
+  {
+    K outCoord = {0, 0, 0};
+
+    outCoord[0] = orientationMatrix[0] * coord[0] + orientationMatrix[1] * coord[1] + orientationMatrix[2] * coord[2];
+    outCoord[1] = orientationMatrix[3] * coord[0] + orientationMatrix[4] * coord[1] + orientationMatrix[5] * coord[2];
+    outCoord[2] = orientationMatrix[6] * coord[0] + orientationMatrix[7] * coord[1] + orientationMatrix[8] * coord[2];
+
+    return outCoord;
+  }
+
+  template <typename InputType, typename OutputType>
+  OutputType ax2om(const InputType& a) const
+  {
+    OutputType res(9);
+    typename OutputType::value_type q = 0.0L;
+    typename OutputType::value_type c = 0.0L;
+    typename OutputType::value_type s = 0.0L;
+    typename OutputType::value_type omc = 0.0L;
+
+    c = cos(a[3]);
+    s = sin(a[3]);
+
+    omc = 1.0f - c;
+
+    res[0] = a[0] * a[0] * omc + c;
+    res[4] = a[1] * a[1] * omc + c;
+    res[8] = a[2] * a[2] * omc + c;
+    size_t _01 = 1;
+    size_t _10 = 3;
+    size_t _12 = 5;
+    size_t _21 = 7;
+    size_t _02 = 2;
+    size_t _20 = 6;
+    // Check to see if we need to transpose
+    if(Rotations::Constants::epsijk == 1.0f)
+    {
+      _01 = 3;
+      _10 = 1;
+      _12 = 7;
+      _21 = 5;
+      _02 = 6;
+      _20 = 2;
+    }
+
+    q = omc * a[0] * a[1];
+    res[_01] = q + s * a[2];
+    res[_10] = q - s * a[2];
+    q = omc * a[1] * a[2];
+    res[_12] = q + s * a[0];
+    res[_21] = q - s * a[0];
+    q = omc * a[2] * a[0];
+    res[_02] = q - s * a[1];
+    res[_20] = q + s * a[1];
+
+    return res;
+  }
+
+private:
+  GenerateTiltSeries* m_Filter = nullptr;
+  FloatArrayType::Pointer m_Coords;
+  DataContainer::Pointer m_OutputDC;
+  std::array<float, 4> m_RotationAxis;
+  size_t m_GridIndex = 0;
+};
+
+} // namespace Detail
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenerateTiltSeries::GenerateTiltSeries()
+{
+  initialize();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenerateTiltSeries::~GenerateTiltSeries() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::initialize()
+{
+  clearErrorCode();
+  clearWarningCode();
+  setCancel(false);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+  {
+    ChoiceFilterParameter::Pointer parameter = ChoiceFilterParameter::New();
+    parameter->setHumanLabel("Rotation Axis");
+    parameter->setPropertyName("RotationAxis");
+
+    QVector<QString> choices; // Please add choices to the choices QVector to finish this widget
+    choices << "X Axis"
+            << "Y Axis"
+            << "Z Axis";
+    parameter->setChoices(choices);
+    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setSetterCallback(SIMPL_BIND_SETTER(GenerateTiltSeries, this, RotationAxis));
+    parameter->setGetterCallback(SIMPL_BIND_GETTER(GenerateTiltSeries, this, RotationAxis));
+    parameters.push_back(parameter);
+  }
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Rotation Increment (Deg)", Increment, FilterParameter::Parameter, GenerateTiltSeries));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resample Spacing", Spacing, FilterParameter::Parameter, GenerateTiltSeries));
+  //  DataArrayCreationFilterParameter::RequirementType dacReq;
+  //  parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Array Path", CreatedArrayPath, FilterParameter::Parameter, GenerateTiltSeries, dacReq));
+  DataArraySelectionFilterParameter::RequirementType dasReq;
+  dasReq.dcGeometryTypes = {IGeometry::Type::Image};
+  dasReq.amTypes = {AttributeMatrix::Type::Cell};
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Input Data Array Path", InputDataArrayPath, FilterParameter::Parameter, GenerateTiltSeries, dasReq));
+  parameters.push_back(SIMPL_NEW_STRING_FP("DataContainer Prefix", OutputPrefix, FilterParameter::Category::Parameter, GenerateTiltSeries));
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  // Validate ImageGeometry and Cell Type for attribute matrix
+
+  // Validate correct range of Rotation Axis (0|1|2)
+  DataContainerArray::Pointer dca = getDataContainerArray();
+  IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath<IDataArray>(this, getInputDataArrayPath());
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  // Generate Data Structure
+  std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> gridPair;
+  if(getRotationAxis() == k_XAxis)
+  {
+    gridPair = generateXAxisGrid();
+  }
+  else if(getRotationAxis() == k_YAxis)
+  {
+    gridPair = generateYAxisGrid();
+  }
+  else if(getRotationAxis() == k_ZAxis)
+  {
+    gridPair = generateZAxisGrid();
+  }
+  if(nullptr == gridPair.first)
+  {
+    return;
+  }
+  FloatArrayType::Pointer gridCoords = gridPair.first;
+  ImageGeom::Pointer gridGeometry = gridPair.second;
+  SizeVec3Type gridDims = gridGeometry->getDimensions();
+
+  float increment = getIncrement();
+  size_t gridIndex = 0;
+
+  for(float currentDeg = 0.0f; currentDeg < 180.0f; currentDeg += increment)
+  {
+    QString gridDCName = m_OutputPrefix + QString::number(gridIndex);
+    DataContainer::Pointer gridDC = DataContainer::New(gridDCName);
+    ImageGeom::Pointer gridImageGeom = std::dynamic_pointer_cast<ImageGeom>(gridGeometry->deepCopy());
+    gridDC->setGeometry(gridImageGeom);
+
+    AttributeMatrix::Pointer cellAttr = AttributeMatrix::New({gridDims[0], gridDims[1], gridDims[2]}, Detail::k_AttributeMatrixName, AttributeMatrix::Type::Cell);
+    gridDC->insertOrAssign(cellAttr);
+
+    IDataArray::Pointer outputData =
+        inputData->createNewArray(gridDims[0] * gridDims[1] * gridDims[2], inputData->getComponentDimensions(), getInputDataArrayPath().getDataArrayName(), !getInPreflight());
+    cellAttr->insertOrAssign(outputData);
+    getDataContainerArray()->insertOrAssign(gridDC);
+
+    gridIndex++;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::preflight()
+{
+  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
+  setInPreflight(true);              // Set the fact that we are preflighting.
+  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
+  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
+  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
+  emit preflightExecuted();          // We are done preflighting this filter
+  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::execute()
+{
+  initialize();
+  dataCheck();
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  if(getCancel())
+  {
+    return;
+  }
+
+  // Compute a grid that forms a plane parallel to the rotation axis and centered halfway back in the volume
+  std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> gridPair;
+  if(getRotationAxis() == k_XAxis)
+  {
+    gridPair = generateXAxisGrid();
+  }
+  else if(getRotationAxis() == k_YAxis)
+  {
+    gridPair = generateYAxisGrid();
+  }
+  else if(getRotationAxis() == k_ZAxis)
+  {
+    gridPair = generateZAxisGrid();
+  }
+  FloatArrayType::Pointer gridCoords = gridPair.first;
+  ImageGeom::Pointer gridGeometry = gridPair.second;
+  DataContainerArray::Pointer dca = getDataContainerArray();
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::task_scheduler_init init;
+  std::shared_ptr<tbb::task_group> g(new tbb::task_group);
+  // C++11 RIGHT HERE....
+  int32_t nthreads = static_cast<int32_t>(std::thread::hardware_concurrency()); // Returns ZERO if not defined on this platform
+  int32_t threadCount = 0;
+#endif
+  int32_t rotAxisSelection = getRotationAxis();
+
+  // Now Start Rotating the grid around the axis
+  float increment = getIncrement();
+  size_t gridIndex = 0;
+  for(float currentDeg = 0.0f; currentDeg < 180.0f; currentDeg += increment)
+  {
+    QString msg;
+    QTextStream out(&msg);
+    out << "Generating Tilt " << currentDeg << " (Deg)";
+    notifyStatusMessage(msg);
+    QString gridDCName = m_OutputPrefix + QString::number(gridIndex);
+    DataContainer::Pointer gridDC = dca->getDataContainer(gridDCName);
+
+    std::array<float, 4> rotationAxis = {0.0f, 0.0f, 0.0f, 0.0f};
+    float radians = currentDeg * SIMPLib::Constants::k_PiOver180;
+    if(k_XAxis == rotAxisSelection)
+    {
+      rotationAxis = {1.0f, 0.0f, 0.0f, radians};
+    }
+    else if(k_YAxis == rotAxisSelection)
+    {
+      rotationAxis = {0.0f, 1.0f, 0.0f, radians};
+    }
+    else if(k_ZAxis == rotAxisSelection)
+    {
+      rotationAxis = {0.0f, 0.0f, 1.0f, radians};
+    }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    g->run(Detail::ResampleGrid(this, gridCoords, gridDC, rotationAxis, gridIndex));
+    threadCount++;
+    if(threadCount == nthreads)
+    {
+      g->wait();
+      threadCount = 0;
+    }
+#else
+    //    std::cout << "Resample Deg = " << currentDeg << std::endl;
+    Detail::ResampleGrid impl(this, gridCoords, gridDC, rotationAxis, gridIndex);
+    impl();
+#endif
+
+    gridIndex++;
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  // This will spill over if the number of files to process does not divide evenly by the number of threads.
+  g->wait();
+#endif
+
+#if GTS_GENERATE_DEBUG_ARRAYS
+  // Write out the sampling grid
+  {
+    DataContainer::Pointer gridGeomDC = DataContainer::New("Grid Geom (Vertex)");
+    VertexGeom::Pointer gridVertGeom = VertexGeom::CreateGeometry(gridCoords->getNumberOfTuples(), "Grid Geometry", true);
+    gridVertGeom->setVertices(gridCoords);
+    gridGeomDC->setGeometry(gridVertGeom);
+    getDataContainerArray()->insertOrAssign(gridGeomDC);
+  }
+  {
+    DataContainer::Pointer gridGeomDC = DataContainer::New("Grid Geom (Image)");
+    gridGeomDC->setGeometry(gridGeometry);
+    getDataContainerArray()->insertOrAssign(gridGeomDC);
+  }
+#endif
+}
+
+// -----------------------------------------------------------------------------
+std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::generateZAxisGrid()
+{
+  DataContainer::Pointer inputDC = getDataContainerArray()->getDataContainer(getInputDataArrayPath().getDataContainerName());
+  if(nullptr == inputDC.get())
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+  ImageGeom::Pointer inputImageGeom = inputDC->getGeometryAs<ImageGeom>();
+  FloatVec3Type origin = inputImageGeom->getOrigin();
+  FloatVec3Type spacing = inputImageGeom->getSpacing();
+  FloatVec6Type bounds = inputImageGeom->getBoundingBox();
+  FloatVec3Type center((bounds[1] - bounds[0]) / 2.0f + bounds[0], (bounds[3] - bounds[2]) / 2.0f + bounds[2], (bounds[5] - bounds[4]) / 2.0f + bounds[4]);
+
+  size_t xAxis = 0;
+  size_t yAxis = 1;
+  size_t zAxis = 2;
+  float diagonalDistance = 0.0;
+
+  // Compute the total number of points along each axis
+  FloatVec3Type resampleSpacing = getSpacing();
+
+  std::array<float, 3> axisLength = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> newOrigin = {0.0f, 0.0f, 0.0f};
+
+  float iStart = bounds[zAxis * 2];
+  float iEnd = bounds[zAxis * 2 + 1];
+  float iIncr = spacing[zAxis];
+
+  float jStart = newOrigin[xAxis];
+  float jEnd = newOrigin[xAxis] + diagonalDistance;
+  float jIncr = resampleSpacing[xAxis];
+
+  axisLength = {bounds[2 * xAxis + 1] - bounds[2 * xAxis], bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis]};
+  diagonalDistance = std::sqrtf(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
+
+  newOrigin[xAxis] = center[xAxis] - diagonalDistance / 2.0f;
+  newOrigin[yAxis] = center[yAxis];
+  newOrigin[zAxis] = bounds[zAxis * 2]; // Use the original origin for the 3rd Axis
+
+  iStart = bounds[zAxis * 2];
+  iEnd = bounds[zAxis * 2 + 1];
+  iIncr = resampleSpacing[zAxis];
+
+  jStart = newOrigin[xAxis];
+  jEnd = newOrigin[xAxis] + diagonalDistance;
+  jIncr = resampleSpacing[xAxis];
+
+  size_t gridPrimAxisDim = static_cast<size_t>(std::ceil((iEnd - iStart) / iIncr));
+  size_t gridSecondAxisDim = static_cast<size_t>(std::ceil((jEnd - jStart) / jIncr));
+  size_t totalElements = gridPrimAxisDim * gridSecondAxisDim;
+  if(totalElements == 0)
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+
+  std::array<float, 2> halfSpacing = {resampleSpacing[xAxis] / 2.0f, resampleSpacing[yAxis] / 2.0f};
+
+  ImageGeom::Pointer newGridGeom = ImageGeom::CreateGeometry("Grid Geometry");
+
+  SizeVec3Type newGridGeomDims;
+  newGridGeomDims[xAxis] = gridSecondAxisDim;
+  newGridGeomDims[yAxis] = 1;
+  newGridGeomDims[zAxis] = gridPrimAxisDim;
+
+  FloatVec3Type newGridGeomSpacing;
+  newGridGeomSpacing[xAxis] = jIncr;
+  newGridGeomSpacing[yAxis] = spacing[yAxis];
+  newGridGeomSpacing[zAxis] = iIncr;
+
+  FloatVec3Type newGridGeomOrigin;
+  newGridGeomOrigin[xAxis] = center[xAxis] - diagonalDistance / 2.0f;
+  newGridGeomOrigin[yAxis] = center[yAxis];
+  newGridGeomOrigin[zAxis] = bounds[zAxis * 2];
+
+  newGridGeom->setDimensions(newGridGeomDims);
+  newGridGeom->setSpacing(newGridGeomSpacing);
+  newGridGeom->setOrigin(newGridGeomOrigin);
+
+  FloatArrayType::Pointer gridCoords = FloatArrayType::CreateArray(totalElements, {3}, "Grid Coords", !getInPreflight());
+  if(!getInPreflight())
+  {
+    size_t tupleIndex = 0;
+    for(float i = iStart; i < iEnd; i += iIncr)
+    {
+      for(float j = jStart; j < jEnd; j += jIncr)
+      {
+        std::array<float, 3> coords;
+
+        coords[xAxis] = j + halfSpacing[0];
+        coords[zAxis] = i + halfSpacing[1];
+        coords[yAxis] = origin[yAxis] + axisLength[yAxis] / 2.0f + spacing[yAxis] / 2.0f;
+
+        gridCoords->setTuple(tupleIndex, coords.data());
+
+        tupleIndex++;
+      }
+    }
+  }
+  return {gridCoords, newGridGeom};
+}
+
+// -----------------------------------------------------------------------------
+std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::generateYAxisGrid()
+{
+  DataContainer::Pointer inputDC = getDataContainerArray()->getDataContainer(getInputDataArrayPath().getDataContainerName());
+  if(nullptr == inputDC.get())
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+  ImageGeom::Pointer inputImageGeom = inputDC->getGeometryAs<ImageGeom>();
+  FloatVec3Type origin = inputImageGeom->getOrigin();
+  FloatVec3Type spacing = inputImageGeom->getSpacing();
+  FloatVec6Type bounds = inputImageGeom->getBoundingBox();
+  FloatVec3Type center((bounds[1] - bounds[0]) / 2.0f + bounds[0], (bounds[3] - bounds[2]) / 2.0f + bounds[2], (bounds[5] - bounds[4]) / 2.0f + bounds[4]);
+
+  size_t xAxis = 0;
+  size_t yAxis = 1;
+  size_t zAxis = 2;
+  float diagonalDistance = 0.0;
+
+  // Compute the total number of points along each axis
+  FloatVec3Type resampleSpacing = getSpacing();
+
+  std::array<float, 3> axisLength = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> newOrigin = {0.0f, 0.0f, 0.0f};
+
+  axisLength = {bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis], bounds[2 * xAxis + 1] - bounds[2 * xAxis]};
+  diagonalDistance = std::sqrtf(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
+
+  newOrigin[xAxis] = center[xAxis];
+  newOrigin[yAxis] = bounds[yAxis * 2];
+  newOrigin[zAxis] = center[zAxis] - diagonalDistance / 2.0f;
+
+  float iStart = newOrigin[yAxis];
+  float iEnd = bounds[yAxis * 2 + 1];
+  float iIncr = resampleSpacing[yAxis];
+
+  float jStart = newOrigin[zAxis];
+  float jEnd = newOrigin[zAxis] + diagonalDistance;
+  float jIncr = resampleSpacing[zAxis];
+
+  size_t gridPrimAxisDim = static_cast<size_t>(std::ceil((iEnd - iStart) / iIncr));
+  size_t gridSecondAxisDim = static_cast<size_t>(std::ceil((jEnd - jStart) / jIncr));
+  size_t totalElements = gridPrimAxisDim * gridSecondAxisDim;
+  if(totalElements == 0)
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+
+  std::array<float, 2> halfSpacing = {resampleSpacing[yAxis] / 2.0f, resampleSpacing[zAxis] / 2.0f};
+
+  ImageGeom::Pointer newGridGeom = ImageGeom::CreateGeometry("Grid Geometry");
+
+  SizeVec3Type newGridGeomDims;
+  newGridGeomDims[xAxis] = 1;
+  ;
+  newGridGeomDims[yAxis] = gridPrimAxisDim;
+  newGridGeomDims[zAxis] = gridSecondAxisDim;
+
+  FloatVec3Type newGridGeomSpacing;
+  newGridGeomSpacing[xAxis] = spacing[xAxis];
+  newGridGeomSpacing[yAxis] = iIncr;
+  newGridGeomSpacing[zAxis] = jIncr;
+
+  FloatVec3Type newGridGeomOrigin;
+  newGridGeomOrigin[xAxis] = newOrigin[xAxis];
+  newGridGeomOrigin[yAxis] = newOrigin[yAxis];
+  newGridGeomOrigin[zAxis] = newOrigin[zAxis];
+
+  newGridGeom->setDimensions(newGridGeomDims);
+  newGridGeom->setSpacing(newGridGeomSpacing);
+  newGridGeom->setOrigin(newGridGeomOrigin);
+
+  FloatArrayType::Pointer gridCoords = FloatArrayType::CreateArray(totalElements, {3}, "Grid Coords", !getInPreflight());
+  if(!getInPreflight())
+  {
+    size_t tupleIndex = 0;
+    for(float i = iStart; i < iEnd; i += iIncr)
+    {
+      for(float j = jStart; j < jEnd; j += jIncr)
+      {
+        std::array<float, 3> coords;
+
+        coords[xAxis] = origin[xAxis] + axisLength[2] / 2.0f + spacing[xAxis] / 2.0f;
+        coords[yAxis] = i + halfSpacing[0];
+        coords[zAxis] = j + halfSpacing[1];
+
+        gridCoords->setTuple(tupleIndex, coords.data());
+
+        tupleIndex++;
+      }
+    }
+  }
+  return {gridCoords, newGridGeom};
+}
+
+// -----------------------------------------------------------------------------
+std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::generateXAxisGrid()
+{
+  DataContainer::Pointer inputDC = getDataContainerArray()->getDataContainer(getInputDataArrayPath().getDataContainerName());
+  if(nullptr == inputDC.get())
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+  ImageGeom::Pointer inputImageGeom = inputDC->getGeometryAs<ImageGeom>();
+  FloatVec3Type origin = inputImageGeom->getOrigin();
+  FloatVec3Type spacing = inputImageGeom->getSpacing();
+  FloatVec6Type bounds = inputImageGeom->getBoundingBox();
+  FloatVec3Type center((bounds[1] - bounds[0]) / 2.0f + bounds[0], (bounds[3] - bounds[2]) / 2.0f + bounds[2], (bounds[5] - bounds[4]) / 2.0f + bounds[4]);
+
+  size_t xAxis = 0;
+  size_t yAxis = 1;
+  size_t zAxis = 2;
+  float diagonalDistance = 0.0;
+
+  // Compute the total number of points along each axis
+  FloatVec3Type resampleSpacing = getSpacing();
+
+  std::array<float, 3> axisLength = {0.0f, 0.0f, 0.0f};
+  std::array<float, 3> newOrigin = {0.0f, 0.0f, 0.0f};
+
+  axisLength = {bounds[2 * xAxis + 1] - bounds[2 * xAxis], bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis]};
+  diagonalDistance = std::sqrtf(axisLength[xAxis] * axisLength[xAxis] + axisLength[yAxis] * axisLength[yAxis]);
+
+  newOrigin[xAxis] = bounds[xAxis]; // xMin
+  newOrigin[yAxis] = center[yAxis] - diagonalDistance / 2.0f;
+  newOrigin[zAxis] = center[zAxis];
+
+  float iStart = newOrigin[xAxis];
+  float iEnd = bounds[xAxis * 2 + 1];
+  float iIncr = resampleSpacing[xAxis];
+
+  float jStart = newOrigin[yAxis];
+  float jEnd = newOrigin[yAxis] + diagonalDistance;
+  float jIncr = resampleSpacing[yAxis];
+
+  size_t gridPrimAxisDim = static_cast<size_t>(std::ceil((iEnd - iStart) / iIncr));
+  size_t gridSecondAxisDim = static_cast<size_t>(std::ceil((jEnd - jStart) / jIncr));
+  size_t totalElements = gridPrimAxisDim * gridSecondAxisDim;
+  if(totalElements == 0)
+  {
+    return {FloatArrayType::NullPointer(), ImageGeom::NullPointer()};
+  }
+
+  std::array<float, 2> halfSpacing = {resampleSpacing[xAxis] / 2.0f, resampleSpacing[yAxis] / 2.0f};
+
+  ImageGeom::Pointer newGridGeom = ImageGeom::CreateGeometry("Grid Geometry");
+
+  SizeVec3Type newGridGeomDims;
+  newGridGeomDims[xAxis] = gridPrimAxisDim;
+  ;
+  newGridGeomDims[yAxis] = gridSecondAxisDim;
+  newGridGeomDims[zAxis] = 1;
+
+  FloatVec3Type newGridGeomSpacing;
+  newGridGeomSpacing[xAxis] = iIncr;
+  newGridGeomSpacing[yAxis] = jIncr;
+  newGridGeomSpacing[zAxis] = spacing[zAxis];
+
+  FloatVec3Type newGridGeomOrigin;
+  newGridGeomOrigin[xAxis] = newOrigin[xAxis];
+  newGridGeomOrigin[yAxis] = newOrigin[yAxis];
+  newGridGeomOrigin[zAxis] = newOrigin[zAxis];
+
+  newGridGeom->setDimensions(newGridGeomDims);
+  newGridGeom->setSpacing(newGridGeomSpacing);
+  newGridGeom->setOrigin(newGridGeomOrigin);
+
+  FloatArrayType::Pointer gridCoords = FloatArrayType::CreateArray(totalElements, {3}, "Grid Coords", !getInPreflight());
+  if(!getInPreflight())
+  {
+    size_t tupleIndex = 0;
+    for(float i = iStart; i < iEnd; i += iIncr)
+    {
+      for(float j = jStart; j < jEnd; j += jIncr)
+      {
+        std::array<float, 3> coords;
+
+        coords[xAxis] = i + halfSpacing[0];
+        coords[yAxis] = j + halfSpacing[1];
+        coords[zAxis] = origin[zAxis] + axisLength[zAxis] / 2.0f + spacing[zAxis] / 2.0f;
+
+        gridCoords->setTuple(tupleIndex, coords.data());
+
+        tupleIndex++;
+      }
+    }
+  }
+  return {gridCoords, newGridGeom};
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer GenerateTiltSeries::newFilterInstance(bool copyFilterParameters) const
+{
+  GenerateTiltSeries::Pointer filter = GenerateTiltSeries::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getGroupName() const
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::CropCutFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getHumanLabel() const
+{
+  return "Generate Tilt Series";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QUuid GenerateTiltSeries::getUuid() const
+{
+  return QUuid("{829da805-6d7c-5106-8209-aae1c207de15}");
+}
+
+// -----------------------------------------------------------------------------
+GenerateTiltSeries::Pointer GenerateTiltSeries::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<GenerateTiltSeries> GenerateTiltSeries::New()
+{
+  struct make_shared_enabler : public GenerateTiltSeries
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getNameOfClass() const
+{
+  return QString("GenerateTiltSeries");
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::ClassName()
+{
+  return QString("GenerateTiltSeries");
+}
+
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setRotationAxis(const int& value)
+{
+  m_RotationAxis = value;
+}
+
+// -----------------------------------------------------------------------------
+int GenerateTiltSeries::getRotationAxis() const
+{
+  return m_RotationAxis;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setIncrement(const float& value)
+{
+  m_Increment = value;
+}
+
+// -----------------------------------------------------------------------------
+float GenerateTiltSeries::getIncrement() const
+{
+  return m_Increment;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setSpacing(const FloatVec3Type& value)
+{
+  m_Spacing = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type GenerateTiltSeries::getSpacing() const
+{
+  return m_Spacing;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setInputDataArrayPath(const DataArrayPath& value)
+{
+  m_InputDataArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenerateTiltSeries::getInputDataArrayPath() const
+{
+  return m_InputDataArrayPath;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateTiltSeries::setOutputPrefix(const QString& value)
+{
+  m_OutputPrefix = value;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateTiltSeries::getOutputPrefix() const
+{
+  return m_OutputPrefix;
+}
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
new file mode 100644
index 0000000000..8fdd86c3c0
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -0,0 +1,262 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+#include <utility>
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @brief The GenerateTiltSeries class. See [Filter documentation](@ref GenerateTiltSeries) for details.
+ */
+class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
+{
+  Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
+  // clang-format off
+    PYB11_CREATE_BINDINGS(GenerateTiltSeries SUPERCLASS AbstractFilter)
+    PYB11_SHARED_POINTERS(GenerateTiltSeries)
+    PYB11_STATIC_NEW_MACRO(GenerateTiltSeries)
+    PYB11_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
+    PYB11_PROPERTY(float Increment READ getIncrement WRITE setIncrement)
+    PYB11_PROPERTY(float Spacing READ getSpacing WRITE setSpacing)
+    PYB11_PROPERTY(DataArrayPath InputDataArrayPath READ getInputDataArrayPath WRITE setInputDataArrayPath)
+    PYB11_PROPERTY(QString OutputPrefix READ getOutputPrefix WRITE setOutputPrefix)
+  // clang-format on
+#endif
+
+public:
+  using Self = GenerateTiltSeries;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<GenerateTiltSeries> New();
+
+  /**
+   * @brief Returns the name of the class for GenerateTiltSeries
+   */
+  QString getNameOfClass() const override;
+
+  /**
+   * @brief Returns the name of the class for GenerateTiltSeries
+   */
+  static QString ClassName();
+
+  ~GenerateTiltSeries() override;
+
+  static constexpr int32_t k_XAxis = 0;
+  static constexpr int32_t k_YAxis = 1;
+  static constexpr int32_t k_ZAxis = 2;
+
+  /**
+   * @brief Setter property for RotationAxis
+   */
+  void setRotationAxis(const int& value);
+  /**
+   * @brief Getter property for RotationAxis
+   * @return Value of RotationAxis
+   */
+  int getRotationAxis() const;
+
+  Q_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
+
+  /**
+   * @brief Setter property for Increment
+   */
+  void setIncrement(const float& value);
+  /**
+   * @brief Getter property for Increment
+   * @return Value of Increment
+   */
+  float getIncrement() const;
+
+  Q_PROPERTY(float Increment READ getIncrement WRITE setIncrement)
+
+  /**
+   * @brief Setter property for Spacing
+   */
+  void setSpacing(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Spacing
+   * @return Value of Spacing
+   */
+  FloatVec3Type getSpacing() const;
+
+  Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+
+  /**
+   * @brief Setter property for InputDataArrayPath
+   */
+  void setInputDataArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for InputDataArrayPath
+   * @return Value of InputDataArrayPath
+   */
+  DataArrayPath getInputDataArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath InputDataArrayPath READ getInputDataArrayPath WRITE setInputDataArrayPath)
+
+  /**
+   * @brief Setter property for OutputPrefix
+   */
+  void setOutputPrefix(const QString& value);
+  /**
+   * @brief Getter property for OutputPrefix
+   * @return Value of OutputPrefix
+   */
+  QString getOutputPrefix() const;
+
+  Q_PROPERTY(QString OutputPrefix READ getOutputPrefix WRITE setOutputPrefix)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  GenerateTiltSeries();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> generateXAxisGrid();
+  std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> generateYAxisGrid();
+  std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> generateZAxisGrid();
+
+private:
+  int m_RotationAxis = 0;
+  float m_Increment = 1.0f;
+  FloatVec3Type m_Spacing = FloatVec3Type(1.0, 1.0, 1.0);
+  DataArrayPath m_InputDataArrayPath = DataArrayPath("DataContainer", "AttributeMatrix", "FeatureIds");
+  QString m_OutputPrefix = {"Rotation_"};
+
+  static constexpr unsigned Dimension = 3;
+
+public:
+  GenerateTiltSeries(const GenerateTiltSeries&) = delete;            // Copy Constructor Not Implemented
+  GenerateTiltSeries& operator=(const GenerateTiltSeries&) = delete; // Copy Assignment Not Implemented
+  GenerateTiltSeries(GenerateTiltSeries&&) = delete;                 // Move Constructor Not Implemented
+  GenerateTiltSeries& operator=(GenerateTiltSeries&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 393592d2b9..2f140aec7c 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -1,6 +1,35 @@
-/*
- * Your License or Copyright can go here
- */
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -8,7 +37,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 
 class IDataArray;
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index a7719ebcde..13a038a6d9 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -50,6 +50,7 @@ set(_PublicFilters
   FeatureDataCSVWriter
   FindDerivatives
   GenerateColorTable
+  GenerateTiltSeries
   ImportAsciDataArray
   ImportHDF5Dataset
   InitializeData
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
new file mode 100644
index 0000000000..cd91b43be8
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
@@ -0,0 +1,179 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/CoreFilters/GenerateTiltSeries.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+#include "SIMPLib/SIMPLib.h"
+
+// These Headers are generated into the build directory
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+template <class T>
+bool dataArrayEqual(const T& a, const T& b)
+{
+  std::vector<size_t> aDims = a.getComponentDimensions();
+  size_t aSize = a.getNumberOfTuples();
+
+  std::vector<size_t> bDims = b.getComponentDimensions();
+  size_t bSize = b.getNumberOfTuples();
+
+  if(aDims != bDims)
+  {
+    return false;
+  }
+
+  if(aSize != bSize)
+  {
+    return false;
+  }
+
+  return std::equal(a.begin(), a.end(), b.begin(), b.end());
+}
+
+// -----------------------------------------------------------------------------
+class GenerateTiltSeriesTest
+{
+  const DataArrayPath k_CellDataArray = DataArrayPath("SyntheticVolumeDataContainer", "CellData", "FeatureIds");
+  const QString k_RotationBaseString = QString("Rotation_%1_%2");
+  const QString k_FeatureIdsName = QString("FeatureIds");
+  const QString k_SliceDataName = QString("Slice Data");
+  static constexpr int k_NumRotations = 12;
+  static constexpr float k_Increment = 15.0f;
+
+public:
+  GenerateTiltSeriesTest() = default;
+  ~GenerateTiltSeriesTest() = default;
+  GenerateTiltSeriesTest(const GenerateTiltSeriesTest&) = delete;            // Copy Constructor
+  GenerateTiltSeriesTest(GenerateTiltSeriesTest&&) = delete;                 // Move Constructor
+  GenerateTiltSeriesTest& operator=(const GenerateTiltSeriesTest&) = delete; // Copy Assignment
+  GenerateTiltSeriesTest& operator=(GenerateTiltSeriesTest&&) = delete;      // Move Assignment
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void RemoveTestFiles()
+  {
+#if REMOVE_TEST_FILES
+    // QFile::remove(UnitTest::GenerateTiltSeriesTest::TestFile1);
+#endif
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestGenerateTiltSeriesTest()
+  {
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+
+    DataContainerReader::Pointer dataContainerReader = DataContainerReader::New();
+    dataContainerReader->setDataContainerArray(dca);
+    dataContainerReader->setInputFile(UnitTest::GenerateTiltSeriesTest::TestFile1);
+    DataContainerArrayProxy proxy = dataContainerReader->readDataContainerArrayStructure(UnitTest::GenerateTiltSeriesTest::TestFile1);
+    dataContainerReader->setInputFileDataContainerArrayProxy(proxy);
+
+    dataContainerReader->execute();
+    int err = dataContainerReader->getErrorCode();
+    DREAM3D_REQUIRED(err, >=, 0)
+
+    DataArrayPath featureIdsPath("", k_SliceDataName, k_FeatureIdsName);
+
+    const std::map<QString, int> rotations = {{"X", 0}, {"Y", 1}, {"Z", 2}};
+
+    GenerateTiltSeries::Pointer generateTiltSeries = GenerateTiltSeries::New();
+    generateTiltSeries->setDataContainerArray(dca);
+    generateTiltSeries->setIncrement(k_Increment);
+    generateTiltSeries->setInputDataArrayPath(k_CellDataArray);
+
+    for(const auto& rotation : rotations)
+    {
+      QString rotationString = rotation.first;
+      int rotationValue = rotation.second;
+      QString outputDc = QString("Rotation_Test_%1_").arg(rotationString);
+
+      generateTiltSeries->setOutputPrefix(outputDc);
+      generateTiltSeries->setRotationAxis(rotationValue);
+
+      for(int i = 0; i < k_NumRotations; i++)
+      {
+        DataArrayPath outputFeatureIdsPath(outputDc + QString::number(i), k_SliceDataName, k_FeatureIdsName);
+
+        QString rotationDc = QString(k_RotationBaseString).arg(rotationString).arg(i);
+        featureIdsPath.setDataContainerName(rotationDc);
+        Int8ArrayType::Pointer dataArray = dca->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, featureIdsPath);
+        DREAM3D_REQUIRE_VALID_POINTER(dataArray)
+
+        ImageGeom::Pointer imageGeom = dca->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(nullptr, featureIdsPath);
+        DREAM3D_REQUIRE_VALID_POINTER(imageGeom)
+
+        FloatVec3Type spacing = imageGeom->getSpacing();
+        generateTiltSeries->setSpacing(spacing);
+
+        generateTiltSeries->preflight();
+        err = generateTiltSeries->getErrorCode();
+        DREAM3D_REQUIRED(err, >=, 0)
+
+        generateTiltSeries->execute();
+        err = generateTiltSeries->getErrorCode();
+        DREAM3D_REQUIRED(err, >=, 0)
+
+        Int8ArrayType::Pointer testArray = dca->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, outputFeatureIdsPath);
+        DREAM3D_REQUIRE_VALID_POINTER(testArray)
+
+        DREAM3D_REQUIRE(dataArrayEqual(*testArray, *dataArray))
+      }
+    }
+
+    return EXIT_SUCCESS;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    int err = EXIT_SUCCESS;
+
+    DREAM3D_REGISTER_TEST(TestGenerateTiltSeriesTest())
+
+    DREAM3D_REGISTER_TEST(RemoveTestFiles())
+  }
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index 16a27426fe..e87665fed8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -28,6 +28,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   FindDerivativesFilterTest
   FeatureDataCSVWriterTest
   GenerateColorTableTest
+  GenerateTiltSeriesTest
   ImportAsciDataArrayTest
   ImportHDF5DatasetTest
   MoveDataTest
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
new file mode 100644
index 0000000000..04a6cebbd8
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
@@ -0,0 +1,52 @@
+# Generate Tilt Series #
+
+## Group (Subgroup) ##
+
+Core Filters (SIMPLib)
+
+## Description ##
+
+This **Filter** creates a series of slices through the Image Geometry where each slice is rotated around the axis selected by the user.
+
+![images/GenerateTiltSeries.](Images/GenerateTiltSeries.png)
+
+Each Slice is saved as a new DataContainer with a Cell Attribute Matrix. The user will select which Cell Level Data Array to resample using a simple nearest neighbor algorithm. The filter will only rotation from Zero to **less than** 180 Degrees.
+
+## Parameters ##
+
+| Name | Type | Description |
+|------|------|------|
+| Rotation Axis | Int | 0=<100>, 1=<010>, 2=<001> |
+| Rotation Increment | Float | The number of degrees of rotation between each slice |
+| Resample Spacing | Float Vec 3 | The Spacing in the X, Y, Z direction for the resampling |
+| Input Data Array Path | DataArrayPath | The path to the Cell level data array to resample |
+
+## Required Geometry ##
+
+Required Geometry Type: Image Geometry
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|-----|
+
+
+## Created Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|------|----------------------|-------------|
+| **Data Container** | Name suffixed with the rotation index | DataContainer | N/A | A new DataContainer for each rotation is created |
+
+
+## Example Pipelines ##
+
+List the names of the example pipelines where this filter is used.
+
+## License & Copyright ##
+
+Please see the description file distributed with this plugin.
+
+## DREAM3D Mailing Lists ##
+
+If you need more help with a filter, please consider asking your question on the DREAM3D Users mailing list:
+https://groups.google.com/forum/?hl=en#!forum/dream3d-users
\ No newline at end of file
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/GenerateTiltSeries.png b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/GenerateTiltSeries.png
new file mode 100644
index 0000000000000000000000000000000000000000..328ba891d04088ba193520282ce84b642997997f
GIT binary patch
literal 1278711
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%0AyPD*Ezjo9e&$=y2OwOH7IGTqGIF0QbAFB!50-W
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
V$5|zBj%<bZNpdDT73^c2`5z=DR^$Kx

literal 0
HcmV?d00001

diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 184292c5ef..a2d35ffe26 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -262,7 +262,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
    * @param progress
    * @param messageText
    */
-  void notifyProgressMessage(int progress, const QString& messageText);
+  void notifyProgressMessage(int progress, const QString& messageText) override;
 
   /**
    * @brief clearErrorCondition
@@ -318,7 +318,7 @@ public slots:
   void updatePrevNextFilters();
 
 signals:
-  void messageGenerated(AbstractMessage::Pointer message);
+  //  void messageGenerated(AbstractMessage::Pointer message);
 
   /**
    * @brief This method is emitted from the pipeline and signals a pipeline pause
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 6a64daca47..fb68cce25b 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -1160,26 +1160,16 @@ ImageGeom::ErrorType ImageGeom::computeCellIndex(const float coords[3], size_t i
 // -----------------------------------------------------------------------------
 ImageGeom::ErrorType ImageGeom::computeCellIndex(const float coords[], size_t& index)
 {
-  ImageGeom::ErrorType err = ImageGeom::ErrorType::NoError;
   size_t cell[3] = {0, 0, 0};
-  for(size_t i = 0; i < 3; i++)
+  ImageGeom::ErrorType err = computeCellIndex(coords, cell);
+  if(err == ImageGeom::ErrorType::NoError)
   {
-    if(coords[i] < m_Origin[i])
-    {
-      return static_cast<ImageGeom::ErrorType>(i * 2);
-    }
-    cell[i] = static_cast<size_t>((coords[i] - m_Origin[i]) / m_Spacing[i]);
-    if(cell[i] > m_Dimensions[i])
+    index = (m_Dimensions[0] * m_Dimensions[1] * cell[2]) + (m_Dimensions[0] * cell[1]) + cell[0];
+    if(index > getNumberOfElements())
     {
-      return static_cast<ImageGeom::ErrorType>(i * 2 + 1);
+      err = ImageGeom::ErrorType::IndexOutOfBounds;
     }
   }
-
-  index = (m_Dimensions[0] * m_Dimensions[1] * cell[2]) + (m_Dimensions[0] * cell[1]) + cell[0];
-  if(index > getNumberOfElements())
-  {
-    err = ImageGeom::ErrorType::IndexOutOfBounds;
-  }
   return err;
 }
 
diff --git a/Source/SIMPLib/Testing/TestFileLocations.h.in b/Source/SIMPLib/Testing/TestFileLocations.h.in
index c73b22b3d9..2321f18ac3 100644
--- a/Source/SIMPLib/Testing/TestFileLocations.h.in
+++ b/Source/SIMPLib/Testing/TestFileLocations.h.in
@@ -20,6 +20,11 @@ namespace UnitTest
   const QString TestTempDir("@TEST_TEMP_DIR@");
   const QString DREAM3DProjDir("@DREAM3DProj_SOURCE_DIR@");
 
+  namespace GenerateTiltSeriesTest
+  {
+  const QString TestFile1("@DREAM3D_DATA_DIR@/Data/GenerateTiltSeries/GenerateTiltSeriesTest.dream3d");
+  } // namespace GenerateTiltSeriesTest
+
   namespace RecursivePipelineTest
   {
     const QString TestDir("@TEST_TEMP_DIR@");

From a29be0968226c4d107f4adc5d29712566666aff3 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 13 Nov 2019 16:20:31 -0500
Subject: [PATCH 160/397] Allow user to set the start, stop and increment for
 the tilt series generation (#383)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/GenerateTiltSeries.cpp        | 29 ++++++++++---------
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  | 19 ++++++------
 .../Testing/Cxx/GenerateTiltSeriesTest.cpp    |  4 ++-
 .../CoreFilters/GenerateTiltSeries.md         |  4 +--
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 91802ad2c2..6729f0e455 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -35,7 +35,7 @@
 #include <thread>
 #include <cmath>
 
-#define GTS_GENERATE_DEBUG_ARRAYS 0
+#define GTS_GENERATE_DEBUG_ARRAYS 1
 // If we are writing out all the arrays for debugging then we MUST be single threaded.
 #if(GTS_GENERATE_DEBUG_ARRAYS == 1)
 #undef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -225,7 +225,8 @@ class ResampleGrid
 
 #if GTS_GENERATE_DEBUG_ARRAYS
     // Write out the sampling grid
-    DataContainer::Pointer gridGeomDC = DataContainer::New(QString("Vertex Grid %1").arg(m_GridIndex));
+    QString dcName = QString("%1 Vertex Grid %2").arg(m_Filter->getOutputPrefix()).arg(m_GridIndex);
+    DataContainer::Pointer gridGeomDC = DataContainer::New(dcName);
     VertexGeom::Pointer gridVertGeom = VertexGeom::CreateGeometry(copyOfGrid->getNumberOfTuples(), "Grid Geometry", true);
     gridVertGeom->setVertices(copyOfGrid);
     gridGeomDC->setGeometry(gridVertGeom);
@@ -349,7 +350,7 @@ void GenerateTiltSeries::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(GenerateTiltSeries, this, RotationAxis));
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Rotation Increment (Deg)", Increment, FilterParameter::Parameter, GenerateTiltSeries));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Limits (Start, Stop, Increment) Degrees", RotationLimits, FilterParameter::Parameter, GenerateTiltSeries));
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resample Spacing", Spacing, FilterParameter::Parameter, GenerateTiltSeries));
   //  DataArrayCreationFilterParameter::RequirementType dacReq;
   //  parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Array Path", CreatedArrayPath, FilterParameter::Parameter, GenerateTiltSeries, dacReq));
@@ -401,10 +402,9 @@ void GenerateTiltSeries::dataCheck()
   ImageGeom::Pointer gridGeometry = gridPair.second;
   SizeVec3Type gridDims = gridGeometry->getDimensions();
 
-  float increment = getIncrement();
   size_t gridIndex = 0;
 
-  for(float currentDeg = 0.0f; currentDeg < 180.0f; currentDeg += increment)
+  for(float currentDeg = m_RotationLimits[0]; currentDeg < m_RotationLimits[1]; currentDeg += m_RotationLimits[2])
   {
     QString gridDCName = m_OutputPrefix + QString::number(gridIndex);
     DataContainer::Pointer gridDC = DataContainer::New(gridDCName);
@@ -482,9 +482,8 @@ void GenerateTiltSeries::execute()
   int32_t rotAxisSelection = getRotationAxis();
 
   // Now Start Rotating the grid around the axis
-  float increment = getIncrement();
   size_t gridIndex = 0;
-  for(float currentDeg = 0.0f; currentDeg < 180.0f; currentDeg += increment)
+  for(float currentDeg = m_RotationLimits[0]; currentDeg < m_RotationLimits[1]; currentDeg += m_RotationLimits[2])
   {
     QString msg;
     QTextStream out(&msg);
@@ -533,14 +532,16 @@ void GenerateTiltSeries::execute()
 #if GTS_GENERATE_DEBUG_ARRAYS
   // Write out the sampling grid
   {
-    DataContainer::Pointer gridGeomDC = DataContainer::New("Grid Geom (Vertex)");
+    QString dcName = QString("%1 Grid Geom (Vertex)").arg(getOutputPrefix());
+    DataContainer::Pointer gridGeomDC = DataContainer::New(dcName);
     VertexGeom::Pointer gridVertGeom = VertexGeom::CreateGeometry(gridCoords->getNumberOfTuples(), "Grid Geometry", true);
     gridVertGeom->setVertices(gridCoords);
     gridGeomDC->setGeometry(gridVertGeom);
     getDataContainerArray()->insertOrAssign(gridGeomDC);
   }
   {
-    DataContainer::Pointer gridGeomDC = DataContainer::New("Grid Geom (Image)");
+    QString dcName = QString("%1 Grid Geom (Image)").arg(getOutputPrefix());
+    DataContainer::Pointer gridGeomDC = DataContainer::New(dcName);
     gridGeomDC->setGeometry(gridGeometry);
     getDataContainerArray()->insertOrAssign(gridGeomDC);
   }
@@ -941,7 +942,7 @@ QString GenerateTiltSeries::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void GenerateTiltSeries::setRotationAxis(const int& value)
+void GenerateTiltSeries::setRotationAxis(int value)
 {
   m_RotationAxis = value;
 }
@@ -953,15 +954,15 @@ int GenerateTiltSeries::getRotationAxis() const
 }
 
 // -----------------------------------------------------------------------------
-void GenerateTiltSeries::setIncrement(const float& value)
+void GenerateTiltSeries::setRotationLimits(const FloatVec3Type& value)
 {
-  m_Increment = value;
+  m_RotationLimits = value;
 }
 
 // -----------------------------------------------------------------------------
-float GenerateTiltSeries::getIncrement() const
+FloatVec3Type GenerateTiltSeries::getRotationLimits() const
 {
-  return m_Increment;
+  return m_RotationLimits;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 8fdd86c3c0..db5c3cdfd5 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -38,6 +38,7 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 /**
  * @brief The GenerateTiltSeries class. See [Filter documentation](@ref GenerateTiltSeries) for details.
@@ -52,7 +53,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
     PYB11_SHARED_POINTERS(GenerateTiltSeries)
     PYB11_STATIC_NEW_MACRO(GenerateTiltSeries)
     PYB11_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
-    PYB11_PROPERTY(float Increment READ getIncrement WRITE setIncrement)
+    PYB11_PROPERTY(float RotationLimits READ getRotationLimits WRITE setRotationLimits)
     PYB11_PROPERTY(float Spacing READ getSpacing WRITE setSpacing)
     PYB11_PROPERTY(DataArrayPath InputDataArrayPath READ getInputDataArrayPath WRITE setInputDataArrayPath)
     PYB11_PROPERTY(QString OutputPrefix READ getOutputPrefix WRITE setOutputPrefix)
@@ -88,7 +89,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
   /**
    * @brief Setter property for RotationAxis
    */
-  void setRotationAxis(const int& value);
+  void setRotationAxis(int value);
   /**
    * @brief Getter property for RotationAxis
    * @return Value of RotationAxis
@@ -98,16 +99,16 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
   Q_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
 
   /**
-   * @brief Setter property for Increment
+   * @brief Setter property for RotationLimits
    */
-  void setIncrement(const float& value);
+  void setRotationLimits(const FloatVec3Type& value);
   /**
-   * @brief Getter property for Increment
-   * @return Value of Increment
+   * @brief Getter property for RotationLimits
+   * @return Value of RotationLimits
    */
-  float getIncrement() const;
+  FloatVec3Type getRotationLimits() const;
 
-  Q_PROPERTY(float Increment READ getIncrement WRITE setIncrement)
+  Q_PROPERTY(FloatVec3Type RotationLimits READ getRotationLimits WRITE setRotationLimits)
 
   /**
    * @brief Setter property for Spacing
@@ -247,7 +248,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
 
 private:
   int m_RotationAxis = 0;
-  float m_Increment = 1.0f;
+  FloatVec3Type m_RotationLimits = FloatVec3Type{0.0f, 180.f, 10.0f};
   FloatVec3Type m_Spacing = FloatVec3Type(1.0, 1.0, 1.0);
   DataArrayPath m_InputDataArrayPath = DataArrayPath("DataContainer", "AttributeMatrix", "FeatureIds");
   QString m_OutputPrefix = {"Rotation_"};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
index cd91b43be8..a20d324804 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
@@ -32,6 +32,7 @@
 
 #pragma once
 
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/CoreFilters/GenerateTiltSeries.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -120,7 +121,8 @@ class GenerateTiltSeriesTest
 
     GenerateTiltSeries::Pointer generateTiltSeries = GenerateTiltSeries::New();
     generateTiltSeries->setDataContainerArray(dca);
-    generateTiltSeries->setIncrement(k_Increment);
+    FloatVec3Type rotationLimits = {0.0f, 180.0f, k_Increment};
+    generateTiltSeries->setRotationLimits(rotationLimits);
     generateTiltSeries->setInputDataArrayPath(k_CellDataArray);
 
     for(const auto& rotation : rotations)
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
index 04a6cebbd8..cdb1ef1ed0 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateTiltSeries.md
@@ -10,14 +10,14 @@ This **Filter** creates a series of slices through the Image Geometry where each
 
 ![images/GenerateTiltSeries.](Images/GenerateTiltSeries.png)
 
-Each Slice is saved as a new DataContainer with a Cell Attribute Matrix. The user will select which Cell Level Data Array to resample using a simple nearest neighbor algorithm. The filter will only rotation from Zero to **less than** 180 Degrees.
+Each Slice is saved as a new DataContainer with a Cell Attribute Matrix. The user will select which Cell Level Data Array to resample using a simple nearest neighbor algorithm. The user can change the default rotation limits of 0.0 < 180.0 (increments of 10.0) degrees by setting the *Rotation Limits* input parameter.
 
 ## Parameters ##
 
 | Name | Type | Description |
 |------|------|------|
 | Rotation Axis | Int | 0=<100>, 1=<010>, 2=<001> |
-| Rotation Increment | Float | The number of degrees of rotation between each slice |
+| Rotation Limits | Float Vec 3 | The minimum, maximum and increment angle in degrees |
 | Resample Spacing | Float Vec 3 | The Spacing in the X, Y, Z direction for the resampling |
 | Input Data Array Path | DataArrayPath | The path to the Cell level data array to resample |
 

From 799983b5142b2bd4fd45bffa0211de0b7b55770c Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Wed, 13 Nov 2019 16:20:41 -0500
Subject: [PATCH 161/397] Feature/generate tilt series fix (#382)

* Fix compile bug on gcc where sqrtf isn't in std namespace

* For gcc, sqrtf is not in the std namespace but sqrt is

* Fixed compile bug for gcc with static constexpr variable
---
 Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp           | 6 +++---
 .../CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 6729f0e455..4274b226a6 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -582,7 +582,7 @@ std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::gener
   float jIncr = resampleSpacing[xAxis];
 
   axisLength = {bounds[2 * xAxis + 1] - bounds[2 * xAxis], bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis]};
-  diagonalDistance = std::sqrtf(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
+  diagonalDistance = std::sqrt(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
 
   newOrigin[xAxis] = center[xAxis] - diagonalDistance / 2.0f;
   newOrigin[yAxis] = center[yAxis];
@@ -676,7 +676,7 @@ std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::gener
   std::array<float, 3> newOrigin = {0.0f, 0.0f, 0.0f};
 
   axisLength = {bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis], bounds[2 * xAxis + 1] - bounds[2 * xAxis]};
-  diagonalDistance = std::sqrtf(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
+  diagonalDistance = std::sqrt(axisLength[0] * axisLength[0] + axisLength[1] * axisLength[1]);
 
   newOrigin[xAxis] = center[xAxis];
   newOrigin[yAxis] = bounds[yAxis * 2];
@@ -771,7 +771,7 @@ std::pair<FloatArrayType::Pointer, ImageGeom::Pointer> GenerateTiltSeries::gener
   std::array<float, 3> newOrigin = {0.0f, 0.0f, 0.0f};
 
   axisLength = {bounds[2 * xAxis + 1] - bounds[2 * xAxis], bounds[2 * yAxis + 1] - bounds[2 * yAxis], bounds[2 * zAxis + 1] - bounds[2 * zAxis]};
-  diagonalDistance = std::sqrtf(axisLength[xAxis] * axisLength[xAxis] + axisLength[yAxis] * axisLength[yAxis]);
+  diagonalDistance = std::sqrt(axisLength[xAxis] * axisLength[xAxis] + axisLength[yAxis] * axisLength[yAxis]);
 
   newOrigin[xAxis] = bounds[xAxis]; // xMin
   newOrigin[yAxis] = center[yAxis] - diagonalDistance / 2.0f;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
index a20d324804..3f54698473 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
@@ -77,8 +77,8 @@ class GenerateTiltSeriesTest
   const QString k_RotationBaseString = QString("Rotation_%1_%2");
   const QString k_FeatureIdsName = QString("FeatureIds");
   const QString k_SliceDataName = QString("Slice Data");
-  static constexpr int k_NumRotations = 12;
-  static constexpr float k_Increment = 15.0f;
+  const int k_NumRotations = 12;
+  const float k_Increment = 15.0f;
 
 public:
   GenerateTiltSeriesTest() = default;

From bad4728396a8d73c6867de9d20ef1fe3a6685a67 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 14 Nov 2019 16:45:44 -0500
Subject: [PATCH 162/397] Remove Debug Data Containers that get generated.

These were meant for debugging only but may be used in a future version as a user option

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 4274b226a6..bbb64cfe41 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -35,7 +35,7 @@
 #include <thread>
 #include <cmath>
 
-#define GTS_GENERATE_DEBUG_ARRAYS 1
+#define GTS_GENERATE_DEBUG_ARRAYS 0
 // If we are writing out all the arrays for debugging then we MUST be single threaded.
 #if(GTS_GENERATE_DEBUG_ARRAYS == 1)
 #undef SIMPL_USE_PARALLEL_ALGORITHMS

From 5654242c3da1407ea0dcf63f825e76c268070854 Mon Sep 17 00:00:00 2001
From: Matthew Marine <matthew.marine@bluequartz.net>
Date: Fri, 15 Nov 2019 09:36:37 -0500
Subject: [PATCH 163/397] Fixed DataArray constructor not using initValue
 parameter

* m_InitValue is now set to the initValue parameter instead of static_cast<T>(0)

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 10b97d4481..6e84938760 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -166,7 +166,7 @@ class DataArray : public IDataArray
   , m_CompDims(std::move(compDims))
   {
     m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
-    m_InitValue = static_cast<T>(0);
+    m_InitValue = initValue;
     if(allocate)
     {
       resizeTuples(numTuples);

From f8a8e2c500cbd0def52ad102eb24d2da92b90c17 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Mon, 18 Nov 2019 15:53:26 -0500
Subject: [PATCH 164/397] Add
 DataArraySelectionFilterParameter::CreateRequirement for vector of strings
 (#384)

* Added static function for creating a Requirement with a vector of strings

* Changed usage of QVector<AttributeMatrix::Type> to AttributeMatrix::Types
---
 .../DataArraySelectionFilterParameter.cpp     | 39 +++++++++++++++++--
 .../DataArraySelectionFilterParameter.h       | 15 +++++--
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index f3d0fdd2a7..7a25e21331 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -148,7 +148,40 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+    AttributeMatrix::Types amTypes(1, attributeMatrixType);
+    req.amTypes = amTypes;
+  }
+  if(IGeometry::Type::Any != geometryType)
+  {
+    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+  }
+  return req;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParameter::CreateRequirement(const QVector<QString>& primitiveTypes, size_t allowedCompDim,
+                                                                                                        AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
+{
+  using SizeTVectorType = std::vector<size_t>;
+  DataArraySelectionFilterParameter::RequirementType req;
+
+  for(const auto& type : primitiveTypes)
+  {
+    if(type.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+    {
+      req.daTypes.push_back(type);
+    }
+  }
+
+  if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
+  {
+    req.componentDimensions = std::vector<SizeTVectorType>(1, SizeTVectorType(1, allowedCompDim));
+  }
+  if(AttributeMatrix::Type::Any != attributeMatrixType)
+  {
+    AttributeMatrix::Types amTypes(1, attributeMatrixType);
     req.amTypes = amTypes;
   }
   if(IGeometry::Type::Any != geometryType)
@@ -259,13 +292,13 @@ IGeometry::Types DataArraySelectionFilterParameter::getDefaultGeometryTypes() co
 }
 
 // -----------------------------------------------------------------------------
-void DataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void DataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> DataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types DataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index bc17e193c5..b2658a460d 100755
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -151,6 +151,15 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
                                              AttributeMatrix::Type attributeMatrixType,
                                              IGeometry::Type geometryType);
 
+    /**
+     * @brief CreateRequirement
+     * @param primitiveTypes
+     * @param allowedCompDim
+     * @param attributeMatrixType
+     * @param geometryType
+     * @return
+     */
+    static RequirementType CreateRequirement(const QVector<QString>& primitiveTypes, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
 
     /**
     * @brief getWidgetType Returns the type of widget that displays and controls
@@ -198,12 +207,12 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     /**
      * @brief Setter property for DefaultAttributeMatrixTypes
      */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
     /**
      * @brief Getter property for DefaultAttributeMatrixTypes
      * @return Value of DefaultAttributeMatrixTypes
      */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
     /**
     * @param DefaultAttributeArrayTypes Default attribute array types required for Attribute Array selections
@@ -283,7 +292,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 
   private:
     IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
     QVector<QString> m_DefaultAttributeArrayTypes = {};
     std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
     DataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};

From 3a22864ec91f352d7c7d589a68e07fa4de12af33 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 22 Nov 2019 10:01:59 -0500
Subject: [PATCH 165/397] Remove use of macro for Math defines since we define
 them all.

This change removes compiler warnings about redeclaring some of the macros. In order to truly
fix the issue the developers would need to understand that there is an exact order
when including <math.h> or <cmath>. With this change we can just include SIMPLibMath.h
and not have to worry about the proper include order

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Math/SIMPLibMath.h | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index b52e28f51a..919462639f 100755
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -59,26 +59,27 @@
      Microsoft doesn't define M_2PI ever, other compilers may lack some of these
      too, hence the sequence as it is: load math.h, then see what's lacking still.
   */
-  #ifndef _USE_MATH_DEFINES
-   #define _USE_MATH_DEFINES 1
-  #endif
-
-  /*
-  "It's a known, long-standing bug in the compiler system's headers.  For
-  some reason the manufacturer, in its infinite wisdom, chose to #define
-  macros min() and max() in violation of the upper-case convention and so
-  break any legitimate functions with those names, including those in the
-  standard C++ library."
-  */
-  #ifndef NOMINMAX
-    #define NOMINMAX
-  #endif
+//  #ifndef _USE_MATH_DEFINES
+//   #define _USE_MATH_DEFINES 1
+//  #endif
+
+/*
+"It's a known, long-standing bug in the compiler system's headers.  For
+some reason the manufacturer, in its infinite wisdom, chose to #define
+macros min() and max() in violation of the upper-case convention and so
+break any legitimate functions with those names, including those in the
+standard C++ library."
+*/
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
 
 #endif
 
-#include <cstddef>
 #include <cmath>
 
+#include <cstddef>
+
 #include <vector>
 #include <limits>
 

From 14d1dda3a678941aa145b31e3b4ae5bb23ddc92f Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 26 Nov 2019 15:44:00 -0500
Subject: [PATCH 166/397] Convert FileListInfo into a superclass with
 subclasses.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>
---
 .../AbstractFilterParametersReader.cpp        |  4 +-
 .../AbstractFilterParametersReader.h          |  2 +-
 .../AbstractFilterParametersWriter.cpp        |  2 +-
 .../AbstractFilterParametersWriter.h          |  2 +-
 .../SIMPLib/FilterParameters/FileListInfo.cpp | 69 +++++++++++++++
 .../SIMPLib/FilterParameters/FileListInfo.h   | 86 ++++++++++---------
 .../FileListInfoFilterParameter.cpp           |  6 +-
 .../FileListInfoFilterParameter.h             |  8 +-
 .../H5FilterParametersReader.cpp              |  4 +-
 .../H5FilterParametersReader.h                |  2 +-
 .../H5FilterParametersWriter.cpp              |  2 +-
 .../H5FilterParametersWriter.h                |  2 +-
 .../FilterParameters/MontageFileListInfo.cpp  | 70 +++++++++++++++
 .../FilterParameters/MontageFileListInfo.h    | 71 +++++++++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |  5 ++
 .../FilterParameters/StackFileListInfo.cpp    | 66 ++++++++++++++
 .../FilterParameters/StackFileListInfo.h      | 69 +++++++++++++++
 .../Testing/Cxx/FilterParametersRWTest.cpp    | 20 ++---
 Source/SIMPLib/TestFilters/GenericExample.cpp |  6 +-
 Source/SIMPLib/TestFilters/GenericExample.h   | 12 +--
 .../FileListInfoWidget.cpp                    |  6 +-
 21 files changed, 435 insertions(+), 79 deletions(-)
 create mode 100644 Source/SIMPLib/FilterParameters/FileListInfo.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MontageFileListInfo.h
 create mode 100644 Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/StackFileListInfo.h

diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index bdd7a82f5e..414581959d 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -410,13 +410,13 @@ Float4thOrderPoly_t AbstractFilterParametersReader::readFloat4thOrderPoly(const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfo_t AbstractFilterParametersReader::readFileListInfo(const QString& name, FileListInfo_t defaultValue)
+StackFileListInfo AbstractFilterParametersReader::readFileListInfo(const QString& name, StackFileListInfo defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
 
   // This should never be executed
-  return FileListInfo_t();
+  return StackFileListInfo();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 3afb94604e..34dc1eebec 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -117,7 +117,7 @@ class SIMPLib_EXPORT AbstractFilterParametersReader
     virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v);
     virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v);
     virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v);
-    virtual FileListInfo_t readFileListInfo(const QString& name, FileListInfo_t v);
+    virtual StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v);
     virtual ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos);
     virtual ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v);
     virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v);
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index ae35851317..3c2f281f28 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -386,7 +386,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, Float4thOrde
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, FileListInfo_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, StackFileListInfo v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index 7e71245282..73eb55a112 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -118,7 +118,7 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
     virtual int writeValue(const QString& name, Float2ndOrderPoly_t v);
     virtual int writeValue(const QString& name, Float3rdOrderPoly_t v);
     virtual int writeValue(const QString& name, Float4thOrderPoly_t v);
-    virtual int writeValue(const QString& name, FileListInfo_t v);
+    virtual int writeValue(const QString& name, StackFileListInfo v);
 
     virtual int writeValue(const QString& name, ComparisonInput_t v);
     virtual int writeValue(const QString& name, ComparisonInputs v);
diff --git a/Source/SIMPLib/FilterParameters/FileListInfo.cpp b/Source/SIMPLib/FilterParameters/FileListInfo.cpp
new file mode 100644
index 0000000000..609b7762dd
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/FileListInfo.cpp
@@ -0,0 +1,69 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "FileListInfo.h"
+
+// -----------------------------------------------------------------------------
+FileListInfo::FileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+FileListInfo::~FileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+void FileListInfo::writeSuperclassJson(QJsonObject& json) const
+{
+  json["PaddingDigits"] = static_cast<qint32>(PaddingDigits);
+  json["Ordering"] = static_cast<qint32>(Ordering);
+  json["IncrementIndex"] = static_cast<qint32>(IncrementIndex);
+  json["InputPath"] = InputPath;
+  json["FilePrefix"] = FilePrefix;
+  json["FileSuffix"] = FileSuffix;
+  json["FileExtension"] = FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+bool FileListInfo::readSuperclassJson(QJsonObject& json)
+{
+  if(json["PaddingDigits"].isDouble() && json["Ordering"].isDouble() && json["RowStart"].isDouble() && json["ColStart"].isDouble() && json["IncrementIndex"].isDouble() &&
+     json["InputPath"].isString() && json["FilePrefix"].isString() && json["FileSuffix"].isString() && json["FileExtension"].isString())
+  {
+    PaddingDigits = static_cast<qint32>(json["PaddingDigits"].toInt());
+    Ordering = static_cast<quint32>(json["Ordering"].toInt());
+    IncrementIndex = static_cast<qint32>(json["IncrementIndex"].toInt());
+    InputPath = json["InputPath"].toString();
+    FilePrefix = json["FilePrefix"].toString();
+    FileSuffix = json["FileSuffix"].toString();
+    FileExtension = json["FileExtension"].toString();
+    return true;
+  }
+  return false;
+}
diff --git a/Source/SIMPLib/FilterParameters/FileListInfo.h b/Source/SIMPLib/FilterParameters/FileListInfo.h
index a41530e342..6d93131885 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfo.h
@@ -1,5 +1,6 @@
 /* ============================================================================
  * Copyright (c) 2019 BlueQuartz Software, LLC
+ * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -11,9 +12,9 @@
  * list of conditions and the following disclaimer in the documentation and/or
  * other materials provided with the distribution.
  *
- * Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
- * contributors may be used to endorse or promote products derived from this software
- * without specific prior written permission.
+ * Neither the names of any of the BlueQuartz Software 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
@@ -26,56 +27,61 @@
  * 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.
  *
+ *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <QtCore/QJsonObject>
-#include <QtCore/QString>
 #include <QtCore/QMetaType>
+#include <QtCore/QString>
+
+#include "SIMPLib/SIMPLib.h"
 
-typedef struct
+class SIMPLib_EXPORT FileListInfo
 {
+public:
+  virtual ~FileListInfo();
+
   qint32 PaddingDigits = 3;
-  quint32 Ordering = 0; /* Ordering=0 = Ascending, Ordering=1 = Descending */
-  qint32 StartIndex = 0;
-  qint32 EndIndex = 1;
+  quint32 Ordering = 0; /* Ordering=0 = RowColumn, Ordering=1 = ColumnRow */
   qint32 IncrementIndex = 1;
   QString InputPath;
   QString FilePrefix;
   QString FileSuffix;
   QString FileExtension;
 
-  void writeJson(QJsonObject& json)
-  {
-    json["PaddingDigits"] = static_cast<double>(PaddingDigits);
-    json["Ordering"] = static_cast<double>(Ordering);
-    json["StartIndex"] = static_cast<double>(StartIndex);
-    json["EndIndex"] = static_cast<double>(EndIndex);
-    json["IncrementIndex"] = static_cast<double>(IncrementIndex);
-    json["InputPath"] = InputPath;
-    json["FilePrefix"] = FilePrefix;
-    json["FileSuffix"] = FileSuffix;
-    json["FileExtension"] = FileExtension;
-  }
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  virtual void writeJson(QJsonObject& json) const = 0;
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  virtual bool readJson(QJsonObject& json) = 0;
+
+protected:
+  FileListInfo();
+
+  /**
+   * @brief writeSuperclassJson
+   * @param json
+   */
+  void writeSuperclassJson(QJsonObject& json) const;
 
-  bool readJson(QJsonObject& json)
-  {
-    if(json["PaddingDigits"].isDouble() && json["Ordering"].isDouble() && json["StartIndex"].isDouble() && json["EndIndex"].isDouble() && json["IncrementIndex"].isDouble() &&
-       json["InputPath"].isString() && json["FilePrefix"].isString() && json["FileSuffix"].isString() && json["FileExtension"].isString())
-    {
-      PaddingDigits = static_cast<qint32>(json["PaddingDigits"].toDouble());
-      Ordering = static_cast<quint32>(json["Ordering"].toDouble());
-      StartIndex = static_cast<qint32>(json["StartIndex"].toDouble());
-      EndIndex = static_cast<qint32>(json["EndIndex"].toDouble());
-      IncrementIndex = static_cast<qint32>(json["IncrementIndex"].toDouble());
-      InputPath = json["InputPath"].toString();
-      FilePrefix = json["FilePrefix"].toString();
-      FileSuffix = json["FileSuffix"].toString();
-      FileExtension = json["FileExtension"].toString();
-      return true;
-    }
-    return false;
-  }
-} FileListInfo_t;
+  /**
+   * @brief readSuperclassJson
+   * @param json
+   * @return
+   */
+  bool readSuperclassJson(QJsonObject& json);
 
-Q_DECLARE_METATYPE(FileListInfo_t)
+public:
+  FileListInfo(const FileListInfo&) = default;            // Copy Constructor Not Implemented
+  FileListInfo(FileListInfo&&) = default;                 // Move Constructor Not Implemented
+  FileListInfo& operator=(const FileListInfo&) = default; // Copy Assignment Not Implemented
+  FileListInfo& operator=(FileListInfo&&) = default;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 64a81c0263..4f387746d5 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -51,7 +51,7 @@ FileListInfoFilterParameter::~FileListInfoFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::New(const QString& humanLabel, const QString& propertyName, const FileListInfo_t& defaultValue, FilterParameter::Category category,
+FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::New(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue, FilterParameter::Category category,
                                                                       SetterCallbackType setterCallback, GetterCallbackType getterCallback)
 {
 
@@ -85,7 +85,7 @@ void FileListInfoFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject jsonObj = jsonValue.toObject();
-    FileListInfo_t fileListInfo;
+    StackFileListInfo fileListInfo;
     fileListInfo.readJson(jsonObj);
     m_SetterCallback(fileListInfo);
   }
@@ -98,7 +98,7 @@ void FileListInfoFilterParameter::writeJson(QJsonObject& json)
 {
   if (m_GetterCallback)
   {
-    FileListInfo_t fileListInfo = m_GetterCallback();
+    StackFileListInfo fileListInfo = m_GetterCallback();
     QJsonObject jsonObj;
     fileListInfo.writeJson(jsonObj);
     json[getPropertyName()] = jsonObj;
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 932f9e09a7..78821e3942 100755
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -40,7 +40,7 @@
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FileListInfo.h"
+#include "SIMPLib/FilterParameters/StackFileListInfo.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
 
@@ -83,8 +83,8 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
    */
   static QString ClassName();
 
-  typedef std::function<void(FileListInfo_t)> SetterCallbackType;
-  typedef std::function<FileListInfo_t(void)> GetterCallbackType;
+  typedef std::function<void(StackFileListInfo)> SetterCallbackType;
+  typedef std::function<StackFileListInfo(void)> GetterCallbackType;
 
   /**
    * @brief New This function instantiates an instance of the FileListInfoFilterParameter. Although this
@@ -102,7 +102,7 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const FileListInfo_t& defaultValue, Category category, SetterCallbackType setterCallback,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue, Category category, SetterCallbackType setterCallback,
                      GetterCallbackType getterCallback);
 
   ~FileListInfoFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index a478b1330a..85baafebfe 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -855,10 +855,10 @@ Float4thOrderPoly_t H5FilterParametersReader::readFloat4thOrderPoly(const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfo_t H5FilterParametersReader::readFileListInfo(const QString& name, FileListInfo_t defaultValue)
+StackFileListInfo H5FilterParametersReader::readFileListInfo(const QString& name, StackFileListInfo defaultValue)
 {
 
-  FileListInfo_t v;
+  StackFileListInfo v;
 
   hid_t gid = QH5Utilities::openHDF5Object(m_CurrentGroupId, name);
   if(gid < 0)
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index 992e7bd796..987ced26c5 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -156,7 +156,7 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
     Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v) override;
     Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v) override;
     Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v) override;
-    FileListInfo_t readFileListInfo(const QString& name, FileListInfo_t v) override;
+    StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v) override;
     ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos) override;
     ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v) override;
     ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v) override;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index d321d75c26..9f3b534bab 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -538,7 +538,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, Float4thOrderPoly_
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, FileListInfo_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, StackFileListInfo v)
 {
   int err = 0;
   hid_t dcaGid = QH5Utilities::createGroup(m_CurrentGroupId, name);
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index 8c10bbc11e..8c9293e51b 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -142,7 +142,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     int writeValue(const QString& name, Float2ndOrderPoly_t v) override;
     int writeValue(const QString& name, Float3rdOrderPoly_t v) override;
     int writeValue(const QString& name, Float4thOrderPoly_t v) override;
-    int writeValue(const QString& name, FileListInfo_t v) override;
+    int writeValue(const QString& name, StackFileListInfo v) override;
 
     int writeValue(const QString& name, ComparisonInput_t v) override;
     int writeValue(const QString& name, ComparisonInputs v) override;
diff --git a/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp b/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
new file mode 100644
index 0000000000..3e5eef2af7
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
@@ -0,0 +1,70 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "MontageFileListInfo.h"
+
+// -----------------------------------------------------------------------------
+MontageFileListInfo::MontageFileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+MontageFileListInfo::~MontageFileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+void MontageFileListInfo::writeJson(QJsonObject& json) const
+{
+  writeSuperclassJson(json);
+
+  json["RowStart"] = static_cast<qint32>(RowStart);
+  json["RowEnd"] = static_cast<qint32>(RowEnd);
+  json["ColStart"] = static_cast<qint32>(ColStart);
+  json["ColEnd"] = static_cast<qint32>(ColEnd);
+}
+
+// -----------------------------------------------------------------------------
+bool MontageFileListInfo::readJson(QJsonObject& json)
+{
+  bool result = readSuperclassJson(json);
+  if(!result)
+  {
+    return false;
+  }
+
+  if(json["RowStart"].isDouble() && json["RowEnd"].isDouble() && json["ColStart"].isDouble() && json["ColEnd"].isDouble())
+  {
+    RowStart = static_cast<qint32>(json["RowStart"].toInt());
+    RowEnd = static_cast<quint32>(json["RowEnd"].toInt());
+    ColStart = static_cast<qint32>(json["ColStart"].toInt());
+    ColEnd = static_cast<qint32>(json["ColEnd"].toInt());
+    return true;
+  }
+  return false;
+}
diff --git a/Source/SIMPLib/FilterParameters/MontageFileListInfo.h b/Source/SIMPLib/FilterParameters/MontageFileListInfo.h
new file mode 100644
index 0000000000..9b0afa5c70
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageFileListInfo.h
@@ -0,0 +1,71 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QString>
+
+#include "SIMPLib/FilterParameters/FileListInfo.h"
+
+class SIMPLib_EXPORT MontageFileListInfo : public FileListInfo
+{
+public:
+  MontageFileListInfo();
+  ~MontageFileListInfo() override;
+
+  qint32 RowStart = 0;
+  qint32 RowEnd = 2;
+  qint32 ColStart = 0;
+  qint32 ColEnd = 2;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) const override;
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  bool readJson(QJsonObject& json) override;
+
+public:
+  MontageFileListInfo(const MontageFileListInfo&) = default;            // Copy Constructor Not Implemented
+  MontageFileListInfo(MontageFileListInfo&&) = default;                 // Move Constructor Not Implemented
+  MontageFileListInfo& operator=(const MontageFileListInfo&) = default; // Copy Assignment Not Implemented
+  MontageFileListInfo& operator=(MontageFileListInfo&&) = default;      // Move Assignment Not Implemented
+};
+
+Q_DECLARE_METATYPE(MontageFileListInfo)
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index ea3d4de836..4f4d756c7f 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -58,6 +58,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageFileListInfo.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
@@ -74,6 +75,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SecondOrderPolynomialFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SeparatorFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeTypeSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StackFileListInfo.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ThirdOrderPolynomial.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ThirdOrderPolynomialFilterParameter.h
@@ -104,6 +106,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DynamicChoiceFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DynamicTableData.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DynamicTableFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileListInfo.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileListInfoFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatFilterParameter.cpp
@@ -124,6 +127,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedChoicesFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageFileListInfo.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
@@ -141,6 +145,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SecondOrderPolynomialFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SeparatorFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ShapeTypeSelectionFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StackFileListInfo.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ThirdOrderPolynomialFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UInt64FilterParameter.cpp
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
new file mode 100644
index 0000000000..708c8600b9
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
@@ -0,0 +1,66 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "StackFileListInfo.h"
+
+// -----------------------------------------------------------------------------
+StackFileListInfo::StackFileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+StackFileListInfo::~StackFileListInfo() = default;
+
+// -----------------------------------------------------------------------------
+void StackFileListInfo::writeJson(QJsonObject& json) const
+{
+  writeSuperclassJson(json);
+
+  json["StartIndex"] = static_cast<qint32>(StartIndex);
+  json["EndIndex"] = static_cast<qint32>(EndIndex);
+}
+
+// -----------------------------------------------------------------------------
+bool StackFileListInfo::readJson(QJsonObject& json)
+{
+  bool result = readSuperclassJson(json);
+  if(!result)
+  {
+    return false;
+  }
+
+  if(json["RowStart"].isDouble() && json["RowEnd"].isDouble() && json["ColStart"].isDouble() && json["ColEnd"].isDouble())
+  {
+    StartIndex = static_cast<qint32>(json["StartIndex"].toInt());
+    EndIndex = static_cast<quint32>(json["EndIndex"].toInt());
+    return true;
+  }
+  return false;
+}
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.h b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
new file mode 100644
index 0000000000..191c76003a
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
@@ -0,0 +1,69 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QString>
+
+#include "SIMPLib/FilterParameters/FileListInfo.h"
+
+class SIMPLib_EXPORT StackFileListInfo : public FileListInfo
+{
+public:
+  StackFileListInfo();
+  ~StackFileListInfo() override;
+
+  qint32 StartIndex = 0;
+  qint32 EndIndex = 1;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) const override;
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  bool readJson(QJsonObject& json) override;
+
+public:
+  StackFileListInfo(const StackFileListInfo&) = default;            // Copy Constructor Not Implemented
+  StackFileListInfo(StackFileListInfo&&) = default;                 // Move Constructor Not Implemented
+  StackFileListInfo& operator=(const StackFileListInfo&) = default; // Copy Assignment Not Implemented
+  StackFileListInfo& operator=(StackFileListInfo&&) = default;      // Move Assignment Not Implemented
+};
+
+Q_DECLARE_METATYPE(StackFileListInfo)
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 4198711063..d59b29085c 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -501,31 +501,31 @@ class FilterParametersRWTest
   Q_PROPERTY(DynamicTableData DynamicData2 READ getDynamicData2 WRITE setDynamicData2)
 
   // -----------------------------------------------------------------------------
-  void setFileListInfo1(const FileListInfo_t& value)
+  void setFileListInfo1(const StackFileListInfo& value)
   {
     m_FileListInfo1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  FileListInfo_t getFileListInfo1() const
+  StackFileListInfo getFileListInfo1() const
   {
     return m_FileListInfo1;
   }
 
-  Q_PROPERTY(FileListInfo_t FileListInfo1 READ getFileListInfo1 WRITE setFileListInfo1)
+  Q_PROPERTY(StackFileListInfo FileListInfo1 READ getFileListInfo1 WRITE setFileListInfo1)
   // -----------------------------------------------------------------------------
-  void setFileListInfo2(const FileListInfo_t& value)
+  void setFileListInfo2(const StackFileListInfo& value)
   {
     m_FileListInfo2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  FileListInfo_t getFileListInfo2() const
+  StackFileListInfo getFileListInfo2() const
   {
     return m_FileListInfo2;
   }
 
-  Q_PROPERTY(FileListInfo_t FileListInfo2 READ getFileListInfo2 WRITE setFileListInfo2)
+  Q_PROPERTY(StackFileListInfo FileListInfo2 READ getFileListInfo2 WRITE setFileListInfo2)
 
   // -----------------------------------------------------------------------------
   void setIntVec3_1(const IntVec3Type& value)
@@ -1028,7 +1028,7 @@ class FilterParametersRWTest
 
     {
       FileListInfoFilterParameter::Pointer fp =
-          FileListInfoFilterParameter::New("Test", "FileListInfo1", FileListInfo_t(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, FileListInfo2),
+          FileListInfoFilterParameter::New("Test", "FileListInfo1", StackFileListInfo(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, FileListInfo2),
                                            SIMPL_BIND_GETTER(FilterParametersRWTest, this, FileListInfo1));
 
       QJsonObject obj;
@@ -1044,7 +1044,7 @@ class FilterParametersRWTest
       DREAM3D_REQUIRE_EQUAL(m_FileListInfo1.PaddingDigits, m_FileListInfo2.PaddingDigits)
       DREAM3D_REQUIRE_EQUAL(m_FileListInfo1.StartIndex, m_FileListInfo2.StartIndex)
 
-      m_FileListInfo2 = FileListInfo_t();
+      m_FileListInfo2 = StackFileListInfo();
     }
 
     {
@@ -1433,8 +1433,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   DataContainerArrayProxy m_DcaProxy2 = {};
   DynamicTableData m_DynamicData1 = {};
   DynamicTableData m_DynamicData2 = {};
-  FileListInfo_t m_FileListInfo1 = {};
-  FileListInfo_t m_FileListInfo2 = {};
+  StackFileListInfo m_FileListInfo1 = {};
+  StackFileListInfo m_FileListInfo2 = {};
   IntVec3Type m_IntVec3_1 = {};
   IntVec3Type m_IntVec3_2 = {};
   FloatVec3Type m_FloatVec3_1 = {};
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 23ae0e7f8a..a7225372e3 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -104,7 +104,7 @@ GenericExample::GenericExample()
   m_Origin[1] = 0.0;
   m_Origin[2] = 0.0;
 
-  FileListInfo_t flInfo;
+  StackFileListInfo flInfo;
   flInfo.PaddingDigits = 2;
   flInfo.Ordering = 0;
   flInfo.StartIndex = 0;
@@ -667,13 +667,13 @@ QString GenericExample::getInputFile() const
 }
 
 // -----------------------------------------------------------------------------
-void GenericExample::setInputFileListInfo(const FileListInfo_t& value)
+void GenericExample::setInputFileListInfo(const StackFileListInfo& value)
 {
   m_InputFileListInfo = value;
 }
 
 // -----------------------------------------------------------------------------
-FileListInfo_t GenericExample::getInputFileListInfo() const
+StackFileListInfo GenericExample::getInputFileListInfo() const
 {
   return m_InputFileListInfo;
 }
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 871292d575..6dc37aac83 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -83,7 +83,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_FILTER_PARAMETER(FPRangePair, InitRange)
   PYB11_FILTER_PARAMETER(QString, EstimatedPrimaryFeatures)
   PYB11_FILTER_PARAMETER(QString, InputFile)
-  PYB11_FILTER_PARAMETER(FileListInfo_t, InputFileListInfo)
+  PYB11_FILTER_PARAMETER(StackFileListInfo, InputFileListInfo)
   PYB11_FILTER_PARAMETER(QString, SelectedXCoordArrayName)
   PYB11_FILTER_PARAMETER(QStringList, DataArrayList)
   PYB11_FILTER_PARAMETER(DataArrayPath, CreatedDataContainer)
@@ -126,7 +126,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
   PYB11_PROPERTY(QString EstimatedPrimaryFeatures READ getEstimatedPrimaryFeatures WRITE setEstimatedPrimaryFeatures)
   PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-  PYB11_PROPERTY(FileListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
+  PYB11_PROPERTY(StackFileListInfo InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
   PYB11_PROPERTY(QString SelectedXCoordArrayName READ getSelectedXCoordArrayName WRITE setSelectedXCoordArrayName)
   PYB11_PROPERTY(QStringList DataArrayList READ getDataArrayList WRITE setDataArrayList)
   PYB11_PROPERTY(DataArrayPath CreatedDataContainer READ getCreatedDataContainer WRITE setCreatedDataContainer)
@@ -348,14 +348,14 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief Setter property for InputFileListInfo
    */
-  void setInputFileListInfo(const FileListInfo_t& value);
+  void setInputFileListInfo(const StackFileListInfo& value);
   /**
    * @brief Getter property for InputFileListInfo
    * @return Value of InputFileListInfo
    */
-  FileListInfo_t getInputFileListInfo() const;
+  StackFileListInfo getInputFileListInfo() const;
 
-  Q_PROPERTY(FileListInfo_t InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
+  Q_PROPERTY(StackFileListInfo InputFileListInfo READ getInputFileListInfo WRITE setInputFileListInfo)
 
   /**
    * @brief Setter property for SelectedXCoordArrayName
@@ -789,7 +789,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   FPRangePair m_InitRange = {};
   QString m_EstimatedPrimaryFeatures = {};
   QString m_InputFile = {};
-  FileListInfo_t m_InputFileListInfo = {};
+  StackFileListInfo m_InputFileListInfo = {};
   QString m_SelectedXCoordArrayName = {};
   QStringList m_DataArrayList = {};
   DataArrayPath m_CreatedDataContainer = {};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 51834ef45b..ef49c7e1a9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -267,7 +267,7 @@ void FileListInfoWidget::getGuiParametersFromFilter()
 {
   blockSignals(true);
 
-  FileListInfo_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FileListInfo_t>();
+  StackFileListInfo data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<StackFileListInfo>();
 
   m_Ui->inputDir->setText(data.InputPath);
 
@@ -290,7 +290,7 @@ void FileListInfoWidget::getGuiParametersFromFilter()
 // -----------------------------------------------------------------------------
 void FileListInfoWidget::validateInputFile()
 {
-  FileListInfo_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FileListInfo_t>();
+  StackFileListInfo data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<StackFileListInfo>();
 
   QString currentPath = data.InputPath;
   QFileInfo fi(currentPath);
@@ -605,7 +605,7 @@ void FileListInfoWidget::filterNeedsInputParameters(AbstractFilter* filter)
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString inputPath = validator->convertToAbsolutePath(m_Ui->inputDir->text());
 
-  FileListInfo_t data;
+  StackFileListInfo data;
   data.IncrementIndex = m_Ui->increment->value();
   data.EndIndex = m_Ui->endIndex->value();
   data.FileExtension = m_Ui->fileExt->text();

From 31c25abaa545ee590971e159dcb0e8b46e8834d5 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Wed, 27 Nov 2019 12:32:21 -0500
Subject: [PATCH 167/397] Fixing compile errors and test failures.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>
---
 Source/SIMPLib/FilterParameters/FileListInfo.cpp            | 4 ++--
 Source/SIMPLib/FilterParameters/StackFileListInfo.cpp       | 2 +-
 .../Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp       | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/FileListInfo.cpp b/Source/SIMPLib/FilterParameters/FileListInfo.cpp
index 609b7762dd..8a3662a1e2 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfo.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfo.cpp
@@ -53,8 +53,8 @@ void FileListInfo::writeSuperclassJson(QJsonObject& json) const
 // -----------------------------------------------------------------------------
 bool FileListInfo::readSuperclassJson(QJsonObject& json)
 {
-  if(json["PaddingDigits"].isDouble() && json["Ordering"].isDouble() && json["RowStart"].isDouble() && json["ColStart"].isDouble() && json["IncrementIndex"].isDouble() &&
-     json["InputPath"].isString() && json["FilePrefix"].isString() && json["FileSuffix"].isString() && json["FileExtension"].isString())
+  if(json["PaddingDigits"].isDouble() && json["Ordering"].isDouble() && json["IncrementIndex"].isDouble() && json["InputPath"].isString() && json["FilePrefix"].isString() &&
+     json["FileSuffix"].isString() && json["FileExtension"].isString())
   {
     PaddingDigits = static_cast<qint32>(json["PaddingDigits"].toInt());
     Ordering = static_cast<quint32>(json["Ordering"].toInt());
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
index 708c8600b9..1d08cb78f6 100644
--- a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
@@ -56,7 +56,7 @@ bool StackFileListInfo::readJson(QJsonObject& json)
     return false;
   }
 
-  if(json["RowStart"].isDouble() && json["RowEnd"].isDouble() && json["ColStart"].isDouble() && json["ColEnd"].isDouble())
+  if(json["StartIndex"].isDouble() && json["EndIndex"].isDouble())
   {
     StartIndex = static_cast<qint32>(json["StartIndex"].toInt());
     EndIndex = static_cast<quint32>(json["EndIndex"].toInt());
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 1feec519b9..3331de4abd 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -43,7 +43,7 @@ PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
-#include "SIMPLib/FilterParameters/FileListInfo.h"
+#include "SIMPLib/FilterParameters/StackFileListInfo.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
 
 namespace py = pybind11;
@@ -330,12 +330,12 @@ PYBIND11_MODULE(dream3d, m)
     .def(py::init< const float &, const float &, const float &, const float &>())
   ;
 
-  py::class_<FileListInfo_t>(mod, "FileListInfo")
+  py::class_<StackFileListInfo>(mod, "FileListInfo")
     .def(py::init <> ([] ( const int & paddingDigits, const unsigned int & ordering, const int & startIndex,
       const int & endIndex, const int & incrementIndex, const py::str & inputPath, const py::str & filePrefix,
       const py::str & fileSuffix, const py::str &fileExtension)
       {
-        FileListInfo_t fileListInfo;
+        StackFileListInfo fileListInfo;
         fileListInfo.PaddingDigits = paddingDigits;
         fileListInfo.Ordering = ordering;
         fileListInfo.StartIndex = startIndex;

From 1c28c2083b7ed8f6948644f6bde824ca5fe133c6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 27 Nov 2019 11:25:42 -0500
Subject: [PATCH 168/397] Fix alias to use a const where appropriate

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/Experimental/FilterCallback/FilterParameter.h      | 8 ++++----
 Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h        | 2 +-
 Source/SIMPLib/CoreFilters/ApplyImageTransforms.h         | 2 +-
 Source/SIMPLib/CoreFilters/ArrayCalculator.h              | 2 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h                   | 2 +-
 Source/SIMPLib/CoreFilters/CombineAttributeArrays.h       | 2 +-
 Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h     | 2 +-
 Source/SIMPLib/CoreFilters/ConditionalSetValue.h          | 2 +-
 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h      | 2 +-
 Source/SIMPLib/CoreFilters/ConvertData.h                  | 2 +-
 .../SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h  | 2 +-
 Source/SIMPLib/CoreFilters/CopyObject.h                   | 2 +-
 Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h        | 2 +-
 Source/SIMPLib/CoreFilters/CreateDataArray.h              | 2 +-
 Source/SIMPLib/CoreFilters/CreateDataContainer.h          | 2 +-
 .../CoreFilters/CreateFeatureArrayFromElementArray.h      | 2 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.h               | 2 +-
 Source/SIMPLib/CoreFilters/CreateImageGeometry.h          | 2 +-
 Source/SIMPLib/CoreFilters/CreateStringArray.h            | 2 +-
 Source/SIMPLib/CoreFilters/CropVertexGeometry.h           | 2 +-
 Source/SIMPLib/CoreFilters/DataContainerReader.h          | 2 +-
 Source/SIMPLib/CoreFilters/DataContainerWriter.h          | 2 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h                  | 2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h               | 2 +-
 .../CoreFilters/ExtractAttributeArraysFromGeometry.h      | 2 +-
 Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h      | 2 +-
 Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h        | 2 +-
 Source/SIMPLib/CoreFilters/FeatureCountDecision.h         | 2 +-
 Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h         | 2 +-
 Source/SIMPLib/CoreFilters/FileReader.h                   | 2 +-
 Source/SIMPLib/CoreFilters/FileWriter.h                   | 2 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h              | 2 +-
 Source/SIMPLib/CoreFilters/GenerateColorTable.h           | 2 +-
 Source/SIMPLib/CoreFilters/GenerateTiltSeries.h           | 2 +-
 Source/SIMPLib/CoreFilters/ImportAsciDataArray.h          | 2 +-
 Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h            | 2 +-
 Source/SIMPLib/CoreFilters/InitializeData.h               | 2 +-
 Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h | 2 +-
 Source/SIMPLib/CoreFilters/MaskCountDecision.h            | 2 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h               | 2 +-
 Source/SIMPLib/CoreFilters/MoveData.h                     | 2 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h                | 2 +-
 Source/SIMPLib/CoreFilters/MultiThresholdObjects.h        | 2 +-
 Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h       | 2 +-
 Source/SIMPLib/CoreFilters/PipelineAnnotation.h           | 2 +-
 Source/SIMPLib/CoreFilters/PostSlackMessage.h             | 2 +-
 Source/SIMPLib/CoreFilters/RawBinaryReader.h              | 2 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.h                | 2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h                 | 2 +-
 Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h     | 2 +-
 Source/SIMPLib/CoreFilters/RenameAttributeArray.h         | 2 +-
 Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h        | 2 +-
 Source/SIMPLib/CoreFilters/RenameDataContainer.h          | 2 +-
 Source/SIMPLib/CoreFilters/ReplaceValueInArray.h          | 2 +-
 Source/SIMPLib/CoreFilters/RequiredZThickness.h           | 2 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h                  | 2 +-
 Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h | 2 +-
 Source/SIMPLib/CoreFilters/SplitAttributeArray.h          | 2 +-
 .../CoreFilters/Testing/Cxx/RemoveArraysObserver.h        | 2 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.h               | 2 +-
 Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h        | 2 +-
 Source/SIMPLib/CoreFilters/util/ABSOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/ACosOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/ASinOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/ATanOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp    | 4 ++--
 Source/SIMPLib/CoreFilters/util/AdditionOperator.h        | 2 +-
 Source/SIMPLib/CoreFilters/util/BinaryOperator.h          | 2 +-
 Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp       | 2 +-
 Source/SIMPLib/CoreFilters/util/CalculatorItem.h          | 2 +-
 Source/SIMPLib/CoreFilters/util/CalculatorOperator.h      | 2 +-
 Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h     | 2 +-
 Source/SIMPLib/CoreFilters/util/CeilOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/CommaSeparator.h          | 2 +-
 Source/SIMPLib/CoreFilters/util/CosOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/DivisionOperator.h        | 2 +-
 Source/SIMPLib/CoreFilters/util/ExpOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/FloorOperator.h           | 2 +-
 Source/SIMPLib/CoreFilters/util/ICalculatorArray.h        | 2 +-
 Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h     | 2 +-
 Source/SIMPLib/CoreFilters/util/LnOperator.h              | 2 +-
 Source/SIMPLib/CoreFilters/util/Log10Operator.h           | 2 +-
 Source/SIMPLib/CoreFilters/util/LogOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h  | 2 +-
 Source/SIMPLib/CoreFilters/util/NegativeOperator.h        | 2 +-
 Source/SIMPLib/CoreFilters/util/PowOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h    | 2 +-
 Source/SIMPLib/CoreFilters/util/RootOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/SinOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/SqrtOperator.h            | 2 +-
 Source/SIMPLib/CoreFilters/util/SubtractionOperator.h     | 2 +-
 Source/SIMPLib/CoreFilters/util/TanOperator.h             | 2 +-
 Source/SIMPLib/CoreFilters/util/UnaryOperator.h           | 2 +-
 Source/SIMPLib/DataArrays/DataArray.hpp                   | 2 +-
 Source/SIMPLib/DataArrays/DynamicListArray.hpp            | 2 +-
 Source/SIMPLib/DataArrays/IDataArray.h                    | 2 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp                | 2 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h                | 2 +-
 Source/SIMPLib/DataArrays/StringDataArray.h               | 2 +-
 Source/SIMPLib/DataArrays/StructArray.hpp                 | 2 +-
 Source/SIMPLib/DataContainers/AttributeMatrix.h           | 2 +-
 Source/SIMPLib/DataContainers/DataContainer.h             | 2 +-
 Source/SIMPLib/DataContainers/DataContainerArray.h        | 2 +-
 Source/SIMPLib/DataContainers/DataContainerBundle.h       | 2 +-
 Source/SIMPLib/DataContainers/IDataContainerBundle.h      | 2 +-
 .../DataContainers/IDataStructureContainerNode.hpp        | 2 +-
 Source/SIMPLib/DataContainers/IDataStructureNode.h        | 2 +-
 .../AttributeMatrixCreationFilterParameter.h              | 2 +-
 .../AttributeMatrixSelectionFilterParameter.h             | 2 +-
 .../SIMPLib/FilterParameters/AxisAngleFilterParameter.h   | 2 +-
 Source/SIMPLib/FilterParameters/BooleanFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/CalculatorFilterParameter.h  | 2 +-
 Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h   | 2 +-
 .../ComparisonSelectionAdvancedFilterParameter.h          | 2 +-
 .../FilterParameters/ComparisonSelectionFilterParameter.h | 2 +-
 .../FilterParameters/ConstrainedDoubleFilterParameter.h   | 2 +-
 .../SIMPLib/FilterParameters/ConstrainedFilterParameter.h | 2 +-
 .../FilterParameters/ConstrainedIntFilterParameter.h      | 2 +-
 .../FilterParameters/DataArrayCreationFilterParameter.h   | 2 +-
 .../FilterParameters/DataArraySelectionFilterParameter.h  | 2 +-
 .../DataContainerArrayProxyFilterParameter.h              | 2 +-
 .../DataContainerCreationFilterParameter.h                | 2 +-
 .../FilterParameters/DataContainerReaderFilterParameter.h | 2 +-
 .../DataContainerSelectionFilterParameter.h               | 2 +-
 Source/SIMPLib/FilterParameters/DoubleFilterParameter.h   | 2 +-
 .../FilterParameters/DynamicChoiceFilterParameter.h       | 2 +-
 .../FilterParameters/DynamicTableFilterParameter.h        | 2 +-
 .../FilterParameters/FileListInfoFilterParameter.h        | 2 +-
 Source/SIMPLib/FilterParameters/FilterParameter.h         | 2 +-
 Source/SIMPLib/FilterParameters/FloatFilterParameter.h    | 2 +-
 .../SIMPLib/FilterParameters/FloatVec2FilterParameter.h   | 2 +-
 .../SIMPLib/FilterParameters/FloatVec3FilterParameter.h   | 2 +-
 .../FourthOrderPolynomialFilterParameter.h                | 2 +-
 .../FilterParameters/GenerateColorTableFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/H5FilterParametersReader.h   | 2 +-
 .../SIMPLib/FilterParameters/H5FilterParametersWriter.h   | 2 +-
 .../FilterParameters/ImportHDF5DatasetFilterParameter.h   | 2 +-
 .../SIMPLib/FilterParameters/InputFileFilterParameter.h   | 2 +-
 .../SIMPLib/FilterParameters/InputPathFilterParameter.h   | 2 +-
 Source/SIMPLib/FilterParameters/IntFilterParameter.h      | 2 +-
 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h  | 2 +-
 Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/JsonFilterParametersReader.h | 2 +-
 .../SIMPLib/FilterParameters/JsonFilterParametersWriter.h | 2 +-
 .../FilterParameters/LinkedBooleanFilterParameter.h       | 2 +-
 .../FilterParameters/LinkedChoicesFilterParameter.h       | 2 +-
 .../LinkedDataContainerSelectionFilterParameter.h         | 2 +-
 .../FilterParameters/LinkedPathCreationFilterParameter.h  | 2 +-
 .../FilterParameters/MontageSelectionFilterParameter.h    | 2 +-
 .../MultiAttributeMatrixSelectionFilterParameter.h        | 2 +-
 .../MultiDataArraySelectionFilterParameter.h              | 2 +-
 .../MultiDataContainerSelectionFilterParameter.h          | 2 +-
 .../SIMPLib/FilterParameters/NumericTypeFilterParameter.h | 2 +-
 .../SIMPLib/FilterParameters/OutputFileFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/OutputPathFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/ParagraphFilterParameter.h   | 2 +-
 .../FilterParameters/PhaseTypeSelectionFilterParameter.h  | 2 +-
 .../PreflightUpdatedValueFilterParameter.h                | 2 +-
 Source/SIMPLib/FilterParameters/RangeFilterParameter.h    | 2 +-
 .../FilterParameters/ReadASCIIDataFilterParameter.h       | 2 +-
 .../SIMPLib/FilterParameters/ScalarTypeFilterParameter.h  | 2 +-
 .../SecondOrderPolynomialFilterParameter.h                | 2 +-
 .../SIMPLib/FilterParameters/SeparatorFilterParameter.h   | 2 +-
 .../FilterParameters/ShapeTypeSelectionFilterParameter.h  | 2 +-
 Source/SIMPLib/FilterParameters/StringFilterParameter.h   | 2 +-
 .../ThirdOrderPolynomialFilterParameter.h                 | 2 +-
 Source/SIMPLib/FilterParameters/UInt64FilterParameter.h   | 2 +-
 Source/SIMPLib/FilterParameters/UnknownFilterParameter.h  | 2 +-
 Source/SIMPLib/Filtering/AbstractComparison.h             | 2 +-
 Source/SIMPLib/Filtering/AbstractDecisionFilter.h         | 2 +-
 Source/SIMPLib/Filtering/AbstractFilter.h                 | 2 +-
 Source/SIMPLib/Filtering/ComparisonSet.h                  | 2 +-
 Source/SIMPLib/Filtering/ComparisonValue.h                | 2 +-
 Source/SIMPLib/Filtering/FilterFactory.hpp                | 2 +-
 Source/SIMPLib/Filtering/FilterPipeline.h                 | 2 +-
 Source/SIMPLib/Filtering/IFilterFactory.hpp               | 2 +-
 Source/SIMPLib/Geometry/CompositeTransformContainer.h     | 2 +-
 Source/SIMPLib/Geometry/EdgeGeom.h                        | 2 +-
 Source/SIMPLib/Geometry/HexahedralGeom.h                  | 2 +-
 Source/SIMPLib/Geometry/IGeometry.h                       | 2 +-
 Source/SIMPLib/Geometry/IGeometry2D.h                     | 2 +-
 Source/SIMPLib/Geometry/IGeometry3D.h                     | 2 +-
 Source/SIMPLib/Geometry/IGeometryGrid.h                   | 2 +-
 Source/SIMPLib/Geometry/ITransformContainer.h             | 2 +-
 Source/SIMPLib/Geometry/ImageGeom.h                       | 2 +-
 Source/SIMPLib/Geometry/QuadGeom.h                        | 2 +-
 Source/SIMPLib/Geometry/RectGridGeom.h                    | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h      | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h           | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h           | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h           | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h           | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h               | 2 +-
 Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h      | 2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h                 | 2 +-
 Source/SIMPLib/Geometry/TransformContainer.h              | 2 +-
 Source/SIMPLib/Geometry/TriangleGeom.h                    | 2 +-
 Source/SIMPLib/Geometry/VertexGeom.h                      | 2 +-
 Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h         | 2 +-
 Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h           | 2 +-
 Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h      | 2 +-
 Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h          | 2 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.h                 | 2 +-
 Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h   | 2 +-
 Source/SIMPLib/ITK/itkBridge.h                            | 2 +-
 Source/SIMPLib/Math/GeometryMath.h                        | 2 +-
 Source/SIMPLib/Math/MatrixMath.h                          | 2 +-
 Source/SIMPLib/Math/RdfData.h                             | 2 +-
 Source/SIMPLib/Messages/AbstractErrorMessage.h            | 2 +-
 Source/SIMPLib/Messages/AbstractMessage.h                 | 2 +-
 Source/SIMPLib/Messages/AbstractProgressMessage.h         | 2 +-
 Source/SIMPLib/Messages/AbstractStatusMessage.h           | 2 +-
 Source/SIMPLib/Messages/AbstractWarningMessage.h          | 2 +-
 Source/SIMPLib/Messages/FilterErrorMessage.h              | 2 +-
 Source/SIMPLib/Messages/FilterProgressMessage.h           | 2 +-
 Source/SIMPLib/Messages/FilterStatusMessage.h             | 2 +-
 Source/SIMPLib/Messages/FilterWarningMessage.h            | 2 +-
 Source/SIMPLib/Messages/GenericErrorMessage.h             | 2 +-
 Source/SIMPLib/Messages/GenericProgressMessage.h          | 2 +-
 Source/SIMPLib/Messages/GenericStatusMessage.h            | 2 +-
 Source/SIMPLib/Messages/GenericWarningMessage.h           | 2 +-
 Source/SIMPLib/Messages/PipelineErrorMessage.h            | 2 +-
 Source/SIMPLib/Messages/PipelineProgressMessage.h         | 2 +-
 Source/SIMPLib/Messages/PipelineStatusMessage.h           | 2 +-
 Source/SIMPLib/Messages/PipelineWarningMessage.h          | 2 +-
 Source/SIMPLib/Plugin/ISIMPLibPlugin.h                    | 2 +-
 Source/SIMPLib/Plugin/PluginProxy.h                       | 2 +-
 Source/SIMPLib/StatsData/BoundaryStatsData.h              | 2 +-
 Source/SIMPLib/StatsData/MatrixStatsData.h                | 2 +-
 Source/SIMPLib/StatsData/PrecipitateStatsData.h           | 2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.h               | 2 +-
 Source/SIMPLib/StatsData/StatsData.h                      | 2 +-
 Source/SIMPLib/StatsData/TransformationStatsData.h        | 2 +-
 Source/SIMPLib/TestFilters/ArraySelectionExample.h        | 2 +-
 Source/SIMPLib/TestFilters/DynamicTableExample.h          | 2 +-
 Source/SIMPLib/TestFilters/ErrorWarningFilter.h           | 2 +-
 Source/SIMPLib/TestFilters/Filt0.h                        | 2 +-
 Source/SIMPLib/TestFilters/Filt1.h                        | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup00.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup01.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup02.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup03.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup04.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup05.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup06.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup07.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup08.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup09.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup10.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup12.h                | 2 +-
 Source/SIMPLib/TestFilters/FilterGroup13.h                | 2 +-
 Source/SIMPLib/TestFilters/GenericExample.h               | 2 +-
 Source/SIMPLib/TestFilters/MakeDataContainer.h            | 2 +-
 Source/SIMPLib/TestFilters/ThresholdExample.h             | 2 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h              | 2 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.h                   | 2 +-
 Source/SVWidgetsLib/Core/IFilterWidgetFactory.h           | 2 +-
 Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp  | 2 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.h                | 2 +-
 .../DataArrayInformationDisplayWidget.h                   | 2 +-
 260 files changed, 264 insertions(+), 264 deletions(-)

diff --git a/Source/Experimental/FilterCallback/FilterParameter.h b/Source/Experimental/FilterCallback/FilterParameter.h
index 318c9444c8..3b4da6c710 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.h
+++ b/Source/Experimental/FilterCallback/FilterParameter.h
@@ -118,7 +118,7 @@ class IFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     using EnumType = unsigned int;
@@ -195,7 +195,7 @@ class Int32Parameter : public IFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     using SetterCallbackType = std::function<void(int)>;
@@ -248,7 +248,7 @@ class DoubleParameter : public IFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     using SetterCallbackType = std::function<void(double)>;
@@ -300,7 +300,7 @@ class DataArrayPathParameter : public IFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     using SetterCallbackType = std::function<void(DataArrayPath)>;
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
index 1b726d322c..19f502fe27 100755
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -49,7 +49,7 @@ class SIMPLib_EXPORT CreatedArrayHelpIndexEntry
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index 48fd89f948..c6d2811a8f 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ApplyImageTransforms> New();
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 386edb161c..24813a84b2 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ArrayCalculator> New();
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 2a44d7ebfe..0046d9c33d 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 56dea07217..df451cec95 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 7e66485113..e2812c3f76 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CombineAttributeMatrices> New();
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index c90f3c051b..2e7339f78b 100755
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ConditionalSetValue> New();
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index ceba2b8dd9..dea91671ca 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 4e5c4d30bc..2fa0799b04 100755
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ConvertData> New();
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index fa7c2e2ccd..56709af3a4 100755
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CopyFeatureArrayToElementArray> New();
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index b1c97a2d7b..ca0a7c2034 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index 55c2eced9d..a58ac45b87 100755
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateAttributeMatrix> New();
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index f2f266a05a..8974f058f9 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -76,7 +76,7 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateDataArray> New();
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index c80c1f7fb1..78e0bb0849 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateDataContainer> New();
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index da83d944d8..c5c8a8a0e5 100755
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -71,7 +71,7 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateFeatureArrayFromElementArray> New();
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index adf07b0568..6b334742da 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -123,7 +123,7 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index dfdab9178a..93069f08aa 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateImageGeometry> New();
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 95e1d3091e..15f8359c78 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<CreateStringArray> New();
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index 8dfe0780f1..6ae720500b 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 2e7ff2069c..09420d3589 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -80,7 +80,7 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<DataContainerReader> New();
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 284b02b32f..ac2768ae8a 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -71,7 +71,7 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<DataContainerWriter> New();
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 42f9e9eabb..6af2d69772 100755
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -59,7 +59,7 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<EmptyFilter> New();
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 10d810b756..bfb9aafad9 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index bc6c4ef5d6..dd0f77976b 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -90,7 +90,7 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index ec943e5cd1..ee1bec1e4e 100755
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ExtractComponentAsArray> New();
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 9fc223e4d9..209fc64204 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index a93dd0e549..ce42681a53 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index f635853219..51fbc7df89 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -71,7 +71,7 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<FeatureDataCSVWriter> New();
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index 9d3521c2b9..6c3dd510b4 100755
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<FileReader> New();
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 28eac83f3d..0ece1ccf7b 100755
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<FileWriter> New();
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 08d8b5ad39..4029c88e9e 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 31a49bfcc2..450914cc08 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -33,7 +33,7 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index db5c3cdfd5..3b9a617949 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static std::shared_ptr<GenerateTiltSeries> New();
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 7888c3fe14..12ba823931 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -80,7 +80,7 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ImportAsciDataArray> New();
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index b97021d4f3..1e6dc34a12 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index f4118b4e6c..36037eb773 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -86,7 +86,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index e0319b5014..2ee283be62 100755
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<LinkFeatureMapToElementArray> New();
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index c6dc738887..deeb5fd53f 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index 6c25f7e2e5..fc38f67045 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index f53d8b7795..65d27df05e 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<MoveData> New();
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index eb1a6ebdc4..96cc7bf38c 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<MoveMultiData> New();
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index d433f8fe1b..c898fa862b 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<MultiThresholdObjects> New();
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 3a80d2140f..e892b1d249 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -67,7 +67,7 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<MultiThresholdObjects2> New();
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index 1d1ff6bb70..22a0bc44f7 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index 0ce65485e1..a2c3917ca7 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index cbc72c6548..dc7b20824f 100755
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -75,7 +75,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RawBinaryReader> New();
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 2f140aec7c..495c1562fe 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index a859396ae5..127d3b92e1 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RemoveArrays> New();
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index 4a243a0c52..68e8d84637 100755
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RemoveComponentFromArray> New();
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index f508d89343..70506dfceb 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -63,7 +63,7 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RenameAttributeArray> New();
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index e701d326e3..e72e396881 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -63,7 +63,7 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RenameAttributeMatrix> New();
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 308648ccb9..9b6f1a4ca7 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -63,7 +63,7 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<RenameDataContainer> New();
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index e3a8d69972..ea1574e7a6 100755
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ReplaceValueInArray> New();
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index b1165b7689..2d7c3a1f5f 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 3e4bfac6b6..71ec964551 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<ScaleVolume> New();
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index 6a6fc3b84b..f61417b603 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<SetOriginResolutionImageGeom> New();
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 4d38297cbf..12d9a71c4a 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
index d51c6190da..efe4032b83 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
@@ -30,7 +30,7 @@ class RemoveArraysObserver : public QObject
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index f43f76b422..f29f728995 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -77,7 +77,7 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<WriteASCIIData> New();
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index cbe8cd2b8d..32c02f0c16 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static std::shared_ptr<WriteTriangleGeometry> New();
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.h b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
index 8e2796eeeb..48b71819c5 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ABSOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.h b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
index 3c6cea1ba9..b9ebed2e73 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ACosOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.h b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
index 1de09c0c19..3de00a923c 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ASinOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.h b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
index 1bfa530f18..69288e7d02 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ATanOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index 169086c31d..31cf367932 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -44,7 +44,7 @@ class AbstractDataParser
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
@@ -126,7 +126,7 @@ class Parser : public AbstractDataParser
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
index 1e2269d584..b89e6d1cd6 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT AdditionOperator : public BinaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
index 2436469cf6..2a6b19b560 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index e999432364..207ccef0f5 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index ea50f17d0a..53dd10479e 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     virtual ~CalculatorItem();
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index 8459dacd8e..ea7406324f 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static double toDegrees(double radians);
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
index 1d6e9c47b2..df9f7e6735 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT CalculatorSeparator : public CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     ~CalculatorSeparator() override;
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.h b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
index c3a647e7f2..43f1a40491 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT CeilOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
index 51e93ef0ae..db1ad3cef5 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT CommaSeparator : public CalculatorSeparator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.h b/Source/SIMPLib/CoreFilters/util/CosOperator.h
index a00566b73b..3e88a93bd5 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT CosOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
index a14de4e6e8..8eee80f91a 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT DivisionOperator : public BinaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.h b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
index b8bc3fce1c..4632b59d1b 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT ExpOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.h b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
index c28666a7ce..d41a5fb281 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT FloorOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
index 39a420df73..f294883a4d 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT ICalculatorArray : public CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     ~ICalculatorArray() override;
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
index 6dc981d821..467ffcfa05 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT LeftParenthesisItem : public CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.h b/Source/SIMPLib/CoreFilters/util/LnOperator.h
index 2a4c35bf1b..9463ec6523 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT LnOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.h b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
index 1f75c657c0..64bd09d4c2 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.h
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT Log10Operator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.h b/Source/SIMPLib/CoreFilters/util/LogOperator.h
index 18141f3303..7cb0c4e1f8 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT LogOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
index a8514bcad2..b9ede408e1 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT MultiplicationOperator : public BinaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
index 8fc88b0190..8a39156165 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT NegativeOperator : public CalculatorOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.h b/Source/SIMPLib/CoreFilters/util/PowOperator.h
index 02194669d0..2742de4e6a 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT PowOperator : public BinaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
index 6ed95ad6b8..fcc631aae3 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT RightParenthesisItem : public CalculatorItem
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.h b/Source/SIMPLib/CoreFilters/util/RootOperator.h
index 3e4f37c2ee..c826f7ed89 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT RootOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.h b/Source/SIMPLib/CoreFilters/util/SinOperator.h
index dba79bcafd..f927ce571d 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT SinOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
index 0818fb082b..5be9da5693 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT SqrtOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
index 04c60df940..8950dfdd31 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT SubtractionOperator : public BinaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.h b/Source/SIMPLib/CoreFilters/util/TanOperator.h
index 743d24b83c..a843dbc88c 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT TanOperator : public UnaryOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
index e2b24fab4e..ec1053bb98 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New()
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 6e84938760..4d9a7cb961 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -70,7 +70,7 @@ class DataArray : public IDataArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 48dd73bc49..5e017db5f5 100755
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -54,7 +54,7 @@ class DynamicListArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index c5e16e670d..7e033b2942 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index d494ae9d2a..7babf51ab5 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -67,7 +67,7 @@ class NeighborList : public IDataArray
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer()
     {
       return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 6e3b5d1854..9a1ddea4eb 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 3d7773b438..76c63c979e 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -81,7 +81,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 39fef534c5..b9de8d6cdf 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -58,7 +58,7 @@ class StructArray : public IDataArray
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 14eeb9466f..01370386e5 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -111,7 +111,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index dcd2dc4096..83411dfb45 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -106,7 +106,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 89a7934951..e3c2335c3e 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -102,7 +102,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
index d63208e8ab..5eb4e860cf 100755
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.h b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
index 102ce07e81..2edfadf56e 100755
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT IDataContainerBundle : public QObject
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
index b8e1f8f23f..66162767be 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
@@ -49,7 +49,7 @@ template <class DerivedChild_t> class IDataStructureContainerNode : public Abstr
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
 
   using ChildShPtr = std::shared_ptr<DerivedChild_t>;
   using ChildCollection = std::vector<ChildShPtr>;
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index db76f670bd..42869b4c0f 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT IDataStructureNode
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 0fc9ecfcd7..9b657bd5c0 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index 79d9aa4a9b..ded6fb323d 100755
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index 7baed62724..b589bc739d 100755
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 9cb1b94c58..8d50ada61a 100755
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 4c9d90a11f..03ee63ddf8 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index e12aa0f4b3..bc80a597bd 100755
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 889656db73..e9c1016e54 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index 6c0f8b255c..c6d0ebde75 100755
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 118c9d1f77..c081a9ab4a 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
index 7a23308a08..7e1bd3de67 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index d7b44d677a..a48b609b0d 100755
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 3ef5912603..ae92b05bba 100755
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -75,7 +75,7 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index b2658a460d..3fd891d43a 100755
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -75,7 +75,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 6ceccee9b3..0206e79a40 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -71,7 +71,7 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index 73c0c2b79c..789d0ad7d5 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index ba3199916c..b70f93b1f5 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index d0b6a07679..1d4cd81e9d 100755
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index b2f775294a..bc2b64738f 100755
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index 597ae6e58c..4bc758cde5 100755
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 15d9544e7c..54210056d3 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -71,7 +71,7 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 78821e3942..60ed824246 100755
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 72ea1784d3..99e8504f7c 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 0961f592d6..199f7063e6 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index ad1aac627e..6cfae140d4 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -75,7 +75,7 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 435c1526b4..258311ffb7 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -76,7 +76,7 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index b088374a74..b2052e444e 100755
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -152,7 +152,7 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index 16118c0bcc..666f156e6f 100755
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index 987ced26c5..f364e62fb5 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index 8c9293e51b..b4e8410a5f 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -57,7 +57,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index f0dfdd09cf..dc4a1b8727 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -45,7 +45,7 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index 07a08c0a26..3fd4007428 100755
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index 6d9c98e686..a96e2cb78f 100755
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 0da929c20d..a68c6b1824 100755
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index d1ef9a8e3c..a88bc08f1a 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index d1c7883297..13a0d40fb1 100755
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 9b43e86edc..c0cdfe590a 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -56,7 +56,7 @@ class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index a868f1d7b9..d263df3351 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index c273ea03c1..6494b5090f 100755
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index 03956428aa..a432622e3a 100755
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index c46d557ddc..1ab8f7283d 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index e6e736a04a..bcd5633d7d 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -126,7 +126,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index 16cf9cf354..d9043f8483 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index b19e75cb9a..fff0d0461c 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index e4c4ca23bd..38216ab9a8 100755
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 3c89324b74..5841e04bb7 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index c62889cb06..ccda2fd640 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index 6ea8bad962..6baf8931d6 100755
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index a79e6a12c8..103a3ecd20 100755
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index 6c134ac712..1ee49e777e 100755
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 197a1a8910..478d406d01 100755
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 268439aaa3..f63271eeb7 100755
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index f6cbe7907e..4f08db3fd8 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 2703a1d3a1..85478f6f5a 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index fcb7a162e3..5608df3499 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index b21824cb11..5eda683f04 100755
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -102,7 +102,7 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
index 884ecb9bc7..b3bb1c5578 100755
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index d552e6daee..3e7ce2f923 100755
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 48c0eb3ed8..05ddcaa202 100755
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index 70ba6446a6..6b1325cc77 100755
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 8639a80f29..507cbd5779 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index 5e08eb38b6..509d1c1642 100755
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index 7a20e51683..a87bab0ea3 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT AbstractComparison
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index f76d8a16ef..76a894252b 100755
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -52,7 +52,7 @@ class AbstractDecisionFilter : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index f513e0063b..93e823033f 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -117,7 +117,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index a86e23ef91..2f5be6a68c 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 5b5fb5f930..1abaa1f30e 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
index b11288d84c..e94722e017 100755
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -46,7 +46,7 @@ template <class T> class FilterFactory : public IFilterFactory
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index a2d35ffe26..4d13cc2378 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -94,7 +94,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index d10c95cd99..e4d180b536 100755
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -51,7 +51,7 @@ class IFilterFactory
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index d4b361ac91..f0c76c7d31 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -47,7 +47,7 @@ class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index bf09363154..251a2c188f 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 96cb3519c3..14ca567793 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -20,7 +20,7 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 3721a8ddb0..b66a99d3cf 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -106,7 +106,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index 52f2c72736..77838c015c 100755
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -55,7 +55,7 @@ class SIMPLib_EXPORT IGeometry2D : public IGeometry
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
index 6e5fca8b93..fe70b3ffde 100755
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT IGeometry3D : public IGeometry
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 4ec39d7701..63e14aae2a 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -59,7 +59,7 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index 0c71418e77..33f67e4d4b 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -46,7 +46,7 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 6760a050fa..6d4c050b57 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -81,7 +81,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 66b257e58f..d887b1287e 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -84,7 +84,7 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index ba0c344f0c..8c3fae278f 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
index 50cdd856c6..f838915813 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT CubeOctohedronOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
index 904d1044b5..fab7d99a33 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT CylinderAOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
index b81eef6d00..27a3e7c53f 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT CylinderBOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
index 760a68a96c..4959a055fc 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
@@ -51,7 +51,7 @@ class SIMPLib_EXPORT CylinderCOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
index 9ee1a5e240..49ea3db4fb 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT EllipsoidOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
index 08bb81d452..d7512204d0 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
index 6c008ab268..f145033e0b 100755
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT SuperEllipsoidOps : public ShapeOps
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 8c2d826505..e492ce4946 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index 5fc7d01d68..b0f446950e 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -55,7 +55,7 @@ class SIMPLib_EXPORT TransformContainer : public ITransformContainer
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 49943f0c99..aa3a4e2d28 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 6285556e11..1139180b0b 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
index 0f3650e4c1..838f71c632 100755
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT H5BoundaryStatsDataDelegate : public H5StatsDataDelegate
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
index 91959c7a4c..ae43c7805d 100755
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT H5MatrixStatsDataDelegate : public H5StatsDataDelegate
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
index 86275afb61..858bb02129 100755
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT H5PrecipitateStatsDataDelegate : public H5StatsDataDelegate
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
index ddac6fd47f..034d7c9c1e 100755
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT H5PrimaryStatsDataDelegate : public H5StatsDataDelegate
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
index 00d3df2a80..f97e1770a8 100755
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT H5StatsDataDelegate
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
index 05c76aa8e0..0d5daa0532 100755
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT H5TransformationStatsDataDelegate : public H5StatsDataDeleg
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 196d5dd3e4..63eba8b39d 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -296,7 +296,7 @@ class ItkBridge
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index c400a6dd0a..3fa6bf6799 100755
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT GeometryMath
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Math/MatrixMath.h b/Source/SIMPLib/Math/MatrixMath.h
index 3f1d2326ea..55776ab0d3 100755
--- a/Source/SIMPLib/Math/MatrixMath.h
+++ b/Source/SIMPLib/Math/MatrixMath.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT MatrixMath
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SIMPLib/Math/RdfData.h b/Source/SIMPLib/Math/RdfData.h
index 606ab615da..f6a17541d0 100644
--- a/Source/SIMPLib/Math/RdfData.h
+++ b/Source/SIMPLib/Math/RdfData.h
@@ -55,7 +55,7 @@ class SIMPLib_EXPORT RdfData
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/Messages/AbstractErrorMessage.h b/Source/SIMPLib/Messages/AbstractErrorMessage.h
index 7a3ae121c3..949a40b1e4 100755
--- a/Source/SIMPLib/Messages/AbstractErrorMessage.h
+++ b/Source/SIMPLib/Messages/AbstractErrorMessage.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT AbstractErrorMessage : public AbstractMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Messages/AbstractMessage.h b/Source/SIMPLib/Messages/AbstractMessage.h
index 4e98c647b8..83a3cc9239 100755
--- a/Source/SIMPLib/Messages/AbstractMessage.h
+++ b/Source/SIMPLib/Messages/AbstractMessage.h
@@ -56,7 +56,7 @@ class SIMPLib_EXPORT AbstractMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.h b/Source/SIMPLib/Messages/AbstractProgressMessage.h
index 6273798bae..030a7074db 100755
--- a/Source/SIMPLib/Messages/AbstractProgressMessage.h
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.h
@@ -50,7 +50,7 @@ class SIMPLib_EXPORT AbstractProgressMessage : public AbstractMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Messages/AbstractStatusMessage.h b/Source/SIMPLib/Messages/AbstractStatusMessage.h
index 9d8a9a3d48..c6c8db23c6 100755
--- a/Source/SIMPLib/Messages/AbstractStatusMessage.h
+++ b/Source/SIMPLib/Messages/AbstractStatusMessage.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT AbstractStatusMessage : public AbstractMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.h b/Source/SIMPLib/Messages/AbstractWarningMessage.h
index aa9903718d..8e6848ad5c 100755
--- a/Source/SIMPLib/Messages/AbstractWarningMessage.h
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT AbstractWarningMessage : public AbstractMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   /**
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.h b/Source/SIMPLib/Messages/FilterErrorMessage.h
index 3a90b1fed0..364c6d2e59 100755
--- a/Source/SIMPLib/Messages/FilterErrorMessage.h
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT FilterErrorMessage : public AbstractErrorMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.h b/Source/SIMPLib/Messages/FilterProgressMessage.h
index dff52434c8..aedccfb7b2 100755
--- a/Source/SIMPLib/Messages/FilterProgressMessage.h
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT FilterProgressMessage : public AbstractProgressMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.h b/Source/SIMPLib/Messages/FilterStatusMessage.h
index 1e15b8baa9..8b19b806b5 100755
--- a/Source/SIMPLib/Messages/FilterStatusMessage.h
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT FilterStatusMessage : public AbstractStatusMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.h b/Source/SIMPLib/Messages/FilterWarningMessage.h
index 478ff25aa7..075a3af2d6 100755
--- a/Source/SIMPLib/Messages/FilterWarningMessage.h
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT FilterWarningMessage : public AbstractWarningMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.h b/Source/SIMPLib/Messages/GenericErrorMessage.h
index c315f870ca..ce257c4203 100755
--- a/Source/SIMPLib/Messages/GenericErrorMessage.h
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT GenericErrorMessage : public AbstractErrorMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.h b/Source/SIMPLib/Messages/GenericProgressMessage.h
index c0e3c1bd82..d34c393601 100755
--- a/Source/SIMPLib/Messages/GenericProgressMessage.h
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT GenericProgressMessage : public AbstractProgressMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.h b/Source/SIMPLib/Messages/GenericStatusMessage.h
index 1c55195737..3ecb019640 100755
--- a/Source/SIMPLib/Messages/GenericStatusMessage.h
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT GenericStatusMessage : public AbstractStatusMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.h b/Source/SIMPLib/Messages/GenericWarningMessage.h
index cf805683b3..81ae8a06de 100755
--- a/Source/SIMPLib/Messages/GenericWarningMessage.h
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT GenericWarningMessage : public AbstractWarningMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.h b/Source/SIMPLib/Messages/PipelineErrorMessage.h
index 4688d14c3b..07a86f5fd2 100755
--- a/Source/SIMPLib/Messages/PipelineErrorMessage.h
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT PipelineErrorMessage : public AbstractErrorMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.h b/Source/SIMPLib/Messages/PipelineProgressMessage.h
index 30199d4a17..87a6bb7bcc 100755
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.h
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT PipelineProgressMessage : public AbstractProgressMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.h b/Source/SIMPLib/Messages/PipelineStatusMessage.h
index b09692435c..f12052fecd 100755
--- a/Source/SIMPLib/Messages/PipelineStatusMessage.h
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT PipelineStatusMessage : public AbstractStatusMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.h b/Source/SIMPLib/Messages/PipelineWarningMessage.h
index 0bd5f3f227..6e1abbff89 100755
--- a/Source/SIMPLib/Messages/PipelineWarningMessage.h
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.h
@@ -53,7 +53,7 @@ class SIMPLib_EXPORT PipelineWarningMessage : public AbstractWarningMessage
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
index 92226cc043..6ab34792a8 100755
--- a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
@@ -145,7 +145,7 @@ class SIMPLib_EXPORT ISIMPLibPlugin
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     virtual ~ISIMPLibPlugin() = default;
diff --git a/Source/SIMPLib/Plugin/PluginProxy.h b/Source/SIMPLib/Plugin/PluginProxy.h
index acbc8af4b5..720c6f4607 100755
--- a/Source/SIMPLib/Plugin/PluginProxy.h
+++ b/Source/SIMPLib/Plugin/PluginProxy.h
@@ -52,7 +52,7 @@ class SIMPLib_EXPORT PluginProxy
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index 42543c0327..c113257149 100755
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT BoundaryStatsData : public StatsData
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.h b/Source/SIMPLib/StatsData/MatrixStatsData.h
index 49e7d271eb..b9710f42a6 100755
--- a/Source/SIMPLib/StatsData/MatrixStatsData.h
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.h
@@ -88,7 +88,7 @@ class SIMPLib_EXPORT MatrixStatsData : public StatsData
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index 9156f35202..8ecfffe665 100755
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -112,7 +112,7 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
index ef6aa32826..9077d2e670 100755
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.h
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -106,7 +106,7 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/StatsData/StatsData.h b/Source/SIMPLib/StatsData/StatsData.h
index 80b81573e4..c0ada585f7 100755
--- a/Source/SIMPLib/StatsData/StatsData.h
+++ b/Source/SIMPLib/StatsData/StatsData.h
@@ -105,7 +105,7 @@ class SIMPLib_EXPORT StatsData
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.h b/Source/SIMPLib/StatsData/TransformationStatsData.h
index d0cf2550e5..3de8047596 100755
--- a/Source/SIMPLib/StatsData/TransformationStatsData.h
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index 26958800a5..6b28128093 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index a0cf29fb72..75132073a4 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
index b1341ee02b..51b97c6ce4 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
@@ -65,7 +65,7 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index a32eb7efb5..85ab8e75c2 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -23,7 +23,7 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index fc6affcd46..07c43c75cf 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -24,7 +24,7 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.h b/Source/SIMPLib/TestFilters/FilterGroup00.h
index b3e90244f3..6fdb4d2f8b 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.h
@@ -48,7 +48,7 @@ class FilterGroup00 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.h b/Source/SIMPLib/TestFilters/FilterGroup01.h
index 4142785369..d414ef9c7f 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.h
@@ -48,7 +48,7 @@ class FilterGroup01 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.h b/Source/SIMPLib/TestFilters/FilterGroup02.h
index 0779caa944..020f06f48d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.h
@@ -48,7 +48,7 @@ class FilterGroup02 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.h b/Source/SIMPLib/TestFilters/FilterGroup03.h
index ffc1c9ba4c..bb8e906f29 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.h
@@ -48,7 +48,7 @@ class FilterGroup03 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.h b/Source/SIMPLib/TestFilters/FilterGroup04.h
index 970beb084e..2533a69f21 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.h
@@ -48,7 +48,7 @@ class FilterGroup04 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.h b/Source/SIMPLib/TestFilters/FilterGroup05.h
index a63c482207..8a31edb885 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.h
@@ -48,7 +48,7 @@ class FilterGroup05 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.h b/Source/SIMPLib/TestFilters/FilterGroup06.h
index 60fa36bc64..e2762efb58 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.h
@@ -48,7 +48,7 @@ class FilterGroup06 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.h b/Source/SIMPLib/TestFilters/FilterGroup07.h
index 9234e43cae..ebab0baae4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.h
@@ -48,7 +48,7 @@ class FilterGroup07 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.h b/Source/SIMPLib/TestFilters/FilterGroup08.h
index 73d1748cf9..ddd8539818 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.h
@@ -48,7 +48,7 @@ class FilterGroup08 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.h b/Source/SIMPLib/TestFilters/FilterGroup09.h
index 0e6cc2c37d..e7eb755469 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.h
@@ -48,7 +48,7 @@ class FilterGroup09 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.h b/Source/SIMPLib/TestFilters/FilterGroup10.h
index 11271f7f85..1720f83bfa 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.h
@@ -48,7 +48,7 @@ class FilterGroup10 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.h b/Source/SIMPLib/TestFilters/FilterGroup12.h
index b9975f3ec4..23e2f34fa7 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.h
@@ -48,7 +48,7 @@ class FilterGroup12 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.h b/Source/SIMPLib/TestFilters/FilterGroup13.h
index 8e91e5a432..bace09a8c4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.h
@@ -48,7 +48,7 @@ class FilterGroup13 : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 6dc37aac83..2331fc4219 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -162,7 +162,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index 4a3549b2ee..7c98771609 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -74,7 +74,7 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index 6926d5d0d5..8137304764 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index 941402cdd7..1c08d76759 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
index e7440fa226..32751bce53 100755
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -94,7 +94,7 @@ class SIMPLib_EXPORT VTKFileReader : public FileReader
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
index b52df37b9c..fc22c7e42e 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
@@ -58,7 +58,7 @@ class SVWidgetsLib_EXPORT IFilterWidgetFactory
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     /**
diff --git a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
index 3e6fa508fc..baa8db9c46 100644
--- a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
+++ b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
@@ -45,7 +45,7 @@ class PipelineFilterWidgetFactory : public IFilterWidgetFactory
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer()
   {
     return Pointer(static_cast<Self*>(nullptr));
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index 108f07c2cb..aeb8395177 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -62,7 +62,7 @@ class ColorPresets
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
   static Pointer NullPointer();
 
   static Pointer New();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index 64be848075..ec58ce46a0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -65,7 +65,7 @@ class SVWidgetsLib_EXPORT DataArrayInformationDisplayWidget : public FilterParam
     using Pointer = std::shared_ptr<Self>;
     using ConstPointer = std::shared_ptr<const Self>;
     using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
     static Pointer New();

From fc766d5a008fc36aaab2dbf8cbf871d66095d675 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 2 Dec 2019 14:17:57 -0500
Subject: [PATCH 169/397] Montage file lists with one row and/or one column can
 now be generated.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>
---
 Source/SIMPLib/Utilities/FilePathGenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.cpp b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
index c41117b3ae..2c85bc18ec 100644
--- a/Source/SIMPLib/Utilities/FilePathGenerator.cpp
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
@@ -150,10 +150,10 @@ FilePathGenerator::TileRCIncexLayout2D FilePathGenerator::GenerateRCIndexMontage
 
   bool missingFiles = false;
 
-  for(int r = rowStart; r < rowEnd; r++)
+  for(int r = rowStart; r <= rowEnd; r++)
   {
     TileRCIndexRow2D tileRow2D;
-    for(int c = colStart; c < colEnd; c++)
+    for(int c = colStart; c <= colEnd; c++)
     {
       TileRCIndex2D tile2D;
 

From cdbc0448ff9ebe57c7dbe72130899193d27087cc Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Mon, 2 Dec 2019 14:20:10 -0500
Subject: [PATCH 170/397] Declaring DataContainerArray::Pointer as a Qt
 metatype.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>
---
 Source/SIMPLib/DataContainers/DataContainerArray.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index e3c2335c3e..f3849beb8b 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -807,5 +807,4 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     DataContainerArray& operator=(const DataContainerArray&) = delete; // Copy Assignment Not Implemented
     DataContainerArray& operator=(DataContainerArray&&) = delete;      // Move Assignment Not Implemented
 };
-
-
+Q_DECLARE_METATYPE(DataContainerArray::Pointer);

From 641c371b1373e977221ca416e193ac0af7e6693c Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 3 Dec 2019 11:35:17 -0500
Subject: [PATCH 171/397] Revert "Montage file lists with one row and/or one
 column can now be generated."

This reverts commit fc766d5a008fc36aaab2dbf8cbf871d66095d675.
---
 Source/SIMPLib/Utilities/FilePathGenerator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.cpp b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
index 2c85bc18ec..c41117b3ae 100644
--- a/Source/SIMPLib/Utilities/FilePathGenerator.cpp
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
@@ -150,10 +150,10 @@ FilePathGenerator::TileRCIncexLayout2D FilePathGenerator::GenerateRCIndexMontage
 
   bool missingFiles = false;
 
-  for(int r = rowStart; r <= rowEnd; r++)
+  for(int r = rowStart; r < rowEnd; r++)
   {
     TileRCIndexRow2D tileRow2D;
-    for(int c = colStart; c <= colEnd; c++)
+    for(int c = colStart; c < colEnd; c++)
     {
       TileRCIndex2D tile2D;
 

From a505d9e036243467f8db175fc45c5ea13a601684 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Tue, 17 Dec 2019 09:33:39 -0500
Subject: [PATCH 172/397] Feature/move rotate filter (#385)

* Moved RotateSampleRefFrame filter to SIMPL Core Filters

* Fixed include error

* Fixed compile error for GCC

* Fix Python binding compile error

* Updated copyright info

* Add missing include directives (strictly)

Cleanup warnings on change of precision casts.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/RotateSampleRefFrame.cpp      | 821 ++++++++++++++++++
 .../CoreFilters/RotateSampleRefFrame.h        | 327 +++++++
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../Testing/Cxx/RotateSampleRefFrameTest.cpp  | 479 ++++++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 .../CoreFilters/RotateSampleRefFrame.md       |  57 ++
 Source/SIMPLib/Testing/TestFileLocations.h.in |   5 +
 7 files changed, 1691 insertions(+)
 create mode 100644 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md

diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
new file mode 100644
index 0000000000..df01ddce1a
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -0,0 +1,821 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "RotateSampleRefFrame.h"
+
+#include <cmath>
+#include <memory>
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+#include <tbb/blocked_range3d.h>
+#include <tbb/parallel_for.h>
+#include <tbb/partitioner.h>
+#include <tbb/task_scheduler_init.h>
+#endif
+
+#include <QtCore/QTextStream>
+
+#include <Eigen/Dense>
+
+#include "SIMPLib/Common/Constants.h"
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
+#include "SIMPLib/FilterParameters/FloatFilterParameter.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
+#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Math/MatrixMath.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+namespace
+{
+struct RotateArgs
+{
+  int64_t xp = 0;
+  int64_t yp = 0;
+  int64_t zp = 0;
+  float xRes = 0.0f;
+  float yRes = 0.0f;
+  float zRes = 0.0f;
+  int64_t xpNew = 0;
+  int64_t ypNew = 0;
+  int64_t zpNew = 0;
+  float xResNew = 0.0f;
+  float yResNew = 0.0f;
+  float zResNew = 0.0f;
+  float xMinNew = 0.0f;
+  float yMinNew = 0.0f;
+  float zMinNew = 0.0f;
+};
+
+using Matrix3fR = Eigen::Matrix<float, 3, 3, Eigen::RowMajor>;
+
+constexpr float k_Threshold = 0.0001f;
+
+const Eigen::Vector3f k_XAxis = Eigen::Vector3f::UnitX();
+const Eigen::Vector3f k_YAxis = Eigen::Vector3f::UnitY();
+const Eigen::Vector3f k_ZAxis = Eigen::Vector3f::UnitZ();
+
+// Requires table to be 3 x 3
+Matrix3fR tableToMatrix(const std::vector<std::vector<double>>& table)
+{
+  Matrix3fR matrix;
+
+  for(size_t i = 0; i < table.size(); i++)
+  {
+    const auto& row = table[i];
+    for(size_t j = 0; j < row.size(); j++)
+    {
+      matrix(i, j) = row[j];
+    }
+  }
+
+  return matrix;
+}
+
+void determineMinMax(const Matrix3fR& rotationMatrix, const FloatVec3Type& spacing, size_t col, size_t row, size_t plane, float& xMin, float& xMax, float& yMin, float& yMax, float& zMin, float& zMax)
+{
+  Eigen::Vector3f coords(static_cast<float>(col) * spacing[0], static_cast<float>(row) * spacing[1], static_cast<float>(plane) * spacing[2]);
+
+  Eigen::Vector3f newCoords = rotationMatrix * coords;
+
+  xMin = std::min(newCoords[0], xMin);
+  xMax = std::max(newCoords[0], xMax);
+
+  yMin = std::min(newCoords[1], yMin);
+  yMax = std::max(newCoords[1], yMax);
+
+  zMin = std::min(newCoords[2], zMin);
+  zMax = std::max(newCoords[2], zMax);
+}
+
+float cosBetweenVectors(const Eigen::Vector3f& a, const Eigen::Vector3f& b)
+{
+  float normA = a.norm();
+  float normB = b.norm();
+
+  if(normA == 0.0f || normB == 0.0f)
+  {
+    return 1.0f;
+  }
+
+  return a.dot(b) / (normA * normB);
+}
+
+float determineSpacing(const FloatVec3Type& spacing, const Eigen::Vector3f& axisNew)
+{
+  float xAngle = std::abs(cosBetweenVectors(k_XAxis, axisNew));
+  float yAngle = std::abs(cosBetweenVectors(k_YAxis, axisNew));
+  float zAngle = std::abs(cosBetweenVectors(k_ZAxis, axisNew));
+
+  std::array<float, 3> axes = {xAngle, yAngle, zAngle};
+
+  auto iter = std::max_element(axes.cbegin(), axes.cend());
+
+  size_t index = std::distance(axes.cbegin(), iter);
+
+  return spacing[index];
+}
+
+RotateArgs createRotateParams(const ImageGeom& imageGeom, const Matrix3fR& rotationMatrix)
+{
+  const SizeVec3Type origDims = imageGeom.getDimensions();
+  const FloatVec3Type spacing = imageGeom.getSpacing();
+  const FloatVec3Type origin = imageGeom.getOrigin();
+
+  float xMin = std::numeric_limits<float>::max();
+  float xMax = std::numeric_limits<float>::min();
+  float yMin = std::numeric_limits<float>::max();
+  float yMax = std::numeric_limits<float>::min();
+  float zMin = std::numeric_limits<float>::max();
+  float zMax = std::numeric_limits<float>::min();
+
+  const std::vector<std::vector<size_t>> coords{{0, 0, 0},
+                                                {origDims[0] - 1, 0, 0},
+                                                {0, origDims[1] - 1, 0},
+                                                {origDims[0] - 1, origDims[1] - 1, 0},
+                                                {0, 0, origDims[2] - 1},
+                                                {origDims[0] - 1, 0, origDims[2] - 1},
+                                                {0, origDims[1] - 1, origDims[2] - 1},
+                                                {origDims[0] - 1, origDims[1] - 1, origDims[2] - 1}};
+
+  for(const auto& item : coords)
+  {
+    determineMinMax(rotationMatrix, spacing, item[0], item[1], item[2], xMin, xMax, yMin, yMax, zMin, zMax);
+  }
+
+  Eigen::Vector3f xAxisNew = rotationMatrix * k_XAxis;
+  Eigen::Vector3f yAxisNew = rotationMatrix * k_YAxis;
+  Eigen::Vector3f zAxisNew = rotationMatrix * k_ZAxis;
+
+  float xResNew = determineSpacing(spacing, xAxisNew);
+  float yResNew = determineSpacing(spacing, yAxisNew);
+  float zResNew = determineSpacing(spacing, zAxisNew);
+
+  MeshIndexType xpNew = static_cast<int64_t>(std::nearbyint((xMax - xMin) / xResNew) + 1);
+  MeshIndexType ypNew = static_cast<int64_t>(std::nearbyint((yMax - yMin) / yResNew) + 1);
+  MeshIndexType zpNew = static_cast<int64_t>(std::nearbyint((zMax - zMin) / zResNew) + 1);
+
+  RotateArgs params;
+
+  params.xp = origDims[0];
+  params.xRes = spacing[0];
+  params.yp = origDims[1];
+  params.yRes = spacing[1];
+  params.zp = origDims[2];
+  params.zRes = spacing[2];
+
+  params.xpNew = xpNew;
+  params.xResNew = xResNew;
+  params.xMinNew = xMin;
+  params.ypNew = ypNew;
+  params.yResNew = yResNew;
+  params.yMinNew = yMin;
+  params.zpNew = zpNew;
+  params.zResNew = zResNew;
+  params.zMinNew = zMin;
+
+  return params;
+}
+
+void updateGeometry(ImageGeom& imageGeom, const RotateArgs& params)
+{
+  FloatVec3Type origin = imageGeom.getOrigin();
+
+  imageGeom.setSpacing(params.xResNew, params.yResNew, params.zResNew);
+  imageGeom.setDimensions(params.xpNew, params.ypNew, params.zpNew);
+  origin[0] += params.xMinNew;
+  origin[1] += params.yMinNew;
+  origin[2] += params.zMinNew;
+  imageGeom.setOrigin(origin);
+}
+
+/**
+ * @brief The RotateSampleRefFrameImpl class implements a threaded algorithm to do the
+ * actual computation of the rotation by applying the rotation to each Euler angle
+ */
+class SampleRefFrameRotator
+{
+  DataArray<int64_t>::Pointer m_NewIndicesPtr;
+  float m_RotMatrixInv[3][3] = {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}};
+  bool m_SliceBySlice = false;
+  RotateArgs m_Params;
+
+public:
+  SampleRefFrameRotator(DataArray<int64_t>::Pointer newindices, const RotateArgs& args, const Matrix3fR& rotationMatrix, bool sliceBySlice)
+  : m_NewIndicesPtr(newindices)
+  , m_SliceBySlice(sliceBySlice)
+  , m_Params(args)
+  {
+    // We have to inline the 3x3 Maxtrix transpose here because of the "const" nature of the 'convert' function
+    Matrix3fR transpose = rotationMatrix.transpose();
+    // Need to use row based Eigen matrix so that the values get mapped to the right place in the raw array
+    // Raw array is faster than Eigen
+    Eigen::Map<Matrix3fR>(&m_RotMatrixInv[0][0], transpose.rows(), transpose.cols()) = transpose;
+  }
+
+  ~SampleRefFrameRotator() = default;
+
+  void convert(int64_t zStart, int64_t zEnd, int64_t yStart, int64_t yEnd, int64_t xStart, int64_t xEnd) const
+  {
+    int64_t* newindicies = m_NewIndicesPtr->getPointer(0);
+
+    for(int64_t k = zStart; k < zEnd; k++)
+    {
+      int64_t ktot = (m_Params.xpNew * m_Params.ypNew) * k;
+      for(int64_t j = yStart; j < yEnd; j++)
+      {
+        int64_t jtot = (m_Params.xpNew) * j;
+        for(int64_t i = xStart; i < xEnd; i++)
+        {
+          int64_t index = ktot + jtot + i;
+          newindicies[index] = -1;
+
+          float coords[3] = {0.0f, 0.0f, 0.0f};
+          float coordsNew[3] = {0.0f, 0.0f, 0.0f};
+
+          coords[0] = (static_cast<float>(i) * m_Params.xResNew) + m_Params.xMinNew;
+          coords[1] = (static_cast<float>(j) * m_Params.yResNew) + m_Params.yMinNew;
+          coords[2] = (static_cast<float>(k) * m_Params.zResNew) + m_Params.zMinNew;
+
+          MatrixMath::Multiply3x3with3x1(m_RotMatrixInv, coords, coordsNew);
+
+          int64_t colOld = static_cast<int64_t>(std::nearbyint(coordsNew[0] / m_Params.xRes));
+          int64_t rowOld = static_cast<int64_t>(std::nearbyint(coordsNew[1] / m_Params.yRes));
+          int64_t planeOld = static_cast<int64_t>(std::nearbyint(coordsNew[2] / m_Params.zRes));
+
+          if(m_SliceBySlice)
+          {
+            planeOld = k;
+          }
+
+          if(colOld >= 0 && colOld < m_Params.xp && rowOld >= 0 && rowOld < m_Params.yp && planeOld >= 0 && planeOld < m_Params.zp)
+          {
+            newindicies[index] = (m_Params.xp * m_Params.yp * planeOld) + (m_Params.xp * rowOld) + colOld;
+          }
+        }
+      }
+    }
+  }
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  void operator()(const tbb::blocked_range3d<int64_t, int64_t, int64_t>& r) const
+  {
+    convert(r.pages().begin(), r.pages().end(), r.rows().begin(), r.rows().end(), r.cols().begin(), r.cols().end());
+  }
+#endif
+};
+
+} // namespace
+
+struct RotateSampleRefFrame::Impl
+{
+  Matrix3fR m_RotationMatrix = Matrix3fR::Zero();
+  RotateArgs m_Params;
+
+  void reset()
+  {
+    m_RotationMatrix.setZero();
+
+    m_Params = RotateArgs();
+  }
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+RotateSampleRefFrame::RotateSampleRefFrame()
+: m_CellAttributeMatrixPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "")
+, p_Impl(std::make_unique<Impl>())
+{
+  std::vector<std::vector<double>> defaultTable{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
+  m_RotationTable.setTableData(defaultTable);
+  m_RotationTable.setDynamicRows(false);
+  m_RotationTable.setDynamicCols(false);
+  m_RotationTable.setDefaultColCount(3);
+  m_RotationTable.setDefaultRowCount(3);
+  m_RotationTable.setMinCols(3);
+  m_RotationTable.setMinRows(3);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+RotateSampleRefFrame::~RotateSampleRefFrame() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+
+  {
+    LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
+    parameter->setHumanLabel("Rotation Representation");
+    parameter->setPropertyName("RotationRepresentation");
+    parameter->setSetterCallback(SIMPL_BIND_SETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
+    parameter->setGetterCallback(SIMPL_BIND_GETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
+    QVector<QString> choices{"Axis Angle", "Rotation Matrix"};
+    parameter->setChoices(choices);
+    QStringList linkedProps{"RotationAngle", "RotationAxis", "RotationTable"};
+    parameter->setLinkedProperties(linkedProps);
+    parameter->setEditable(false);
+    parameter->setCategory(FilterParameter::Category::Parameter);
+    parameters.push_back(parameter);
+  }
+
+  // Axis Angle Parameters
+
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Rotation Angle (Degrees)", RotationAngle, FilterParameter::Parameter, RotateSampleRefFrame, 0));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Axis (ijk)", RotationAxis, FilterParameter::Parameter, RotateSampleRefFrame, 0));
+
+  // Rotation Matrix Parameters
+
+  parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Rotation Matrix", RotationTable, FilterParameter::Parameter, RotateSampleRefFrame, 1));
+
+  // Required Arrays
+
+  parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
+  {
+    AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::Cell, IGeometry::Type::Image);
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", CellAttributeMatrixPath, FilterParameter::RequiredArray, RotateSampleRefFrame, req));
+  }
+
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::readFilterParameters(AbstractFilterParametersReader* reader, int index)
+{
+  reader->openFilterGroup(this, index);
+  setCellAttributeMatrixPath(reader->readDataArrayPath("CellAttributeMatrixPath", getCellAttributeMatrixPath()));
+  setRotationAxis(reader->readFloatVec3("RotationAxis", getRotationAxis()));
+  setRotationAngle(reader->readValue("RotationAngle", getRotationAngle()));
+  reader->closeFilterGroup();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  p_Impl->reset();
+
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  if(!isRotationRepresentationValid(m_RotationRepresentationChoice))
+  {
+    QString ss = QObject::tr("Invalid rotation representation");
+    setErrorCondition(-45001, ss);
+    return;
+  }
+
+  getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getCellAttributeMatrixPath().getDataContainerName());
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellAttributeMatrixPath(), -301);
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getCellAttributeMatrixPath().getDataContainerName());
+
+  if(m == nullptr)
+  {
+    QString ss = QObject::tr("Failed to get DataContainer '%1'").arg(getCellAttributeMatrixPath().getDataContainerName());
+    setErrorCondition(-45002, ss);
+    return;
+  }
+
+  ImageGeom::Pointer imageGeom = m->getGeometryAs<ImageGeom>();
+
+  if(imageGeom == nullptr)
+  {
+    QString ss = QObject::tr("Failed to get Image Geometry from '%1'").arg(getCellAttributeMatrixPath().getDataContainerName());
+    setErrorCondition(-45002, ss);
+    return;
+  }
+
+  const RotationRepresentation representation = getRotationRepresentation();
+
+  switch(representation)
+  {
+  case RotationRepresentation::AxisAngle:
+  {
+    const Eigen::Vector3f rotationAxis(m_RotationAxis.data());
+    float norm = rotationAxis.norm();
+    if(!SIMPLibMath::closeEnough(rotationAxis.norm(), 1.0f, k_Threshold))
+    {
+      QString ss = QObject::tr("Axis angle is not normalized (norm is %1). Filter will automatically normalize the value.").arg(norm);
+      setWarningCondition(-45003, ss);
+    }
+
+    float rotationAngleRadians = m_RotationAngle * SIMPLib::Constants::k_DegToRad;
+
+    Eigen::AngleAxisf axisAngle(rotationAngleRadians, rotationAxis.normalized());
+
+    p_Impl->m_RotationMatrix = axisAngle.toRotationMatrix();
+  }
+  break;
+  case RotationRepresentation::RotationMatrix:
+  {
+    auto rotationMatrixTable = m_RotationTable.getTableData();
+
+    if(rotationMatrixTable.size() != 3)
+    {
+      QString ss = QObject::tr("Rotation Matrix must be 3 x 3");
+      setErrorCondition(-45004, ss);
+      return;
+    }
+
+    for(const auto& row : rotationMatrixTable)
+    {
+      if(row.size() != 3)
+      {
+        QString ss = QObject::tr("Rotation Matrix must be 3 x 3");
+        setErrorCondition(-45005, ss);
+        return;
+      }
+    }
+
+    Matrix3fR rotationMatrix = tableToMatrix(rotationMatrixTable);
+
+    float determinant = rotationMatrix.determinant();
+
+    if(!SIMPLibMath::closeEnough(determinant, 1.0f, k_Threshold))
+    {
+      QString ss = QObject::tr("Rotation Matrix must have a determinant of 1 (is %1)").arg(determinant);
+      setErrorCondition(-45006, ss);
+      return;
+    }
+
+    Matrix3fR transpose = rotationMatrix.transpose();
+    Matrix3fR inverse = rotationMatrix.inverse();
+
+    if(!transpose.isApprox(inverse, k_Threshold))
+    {
+      QString ss = QObject::tr("Rotation Matrix's inverse and transpose must be equal");
+      setErrorCondition(-45007, ss);
+      return;
+    }
+
+    p_Impl->m_RotationMatrix = rotationMatrix;
+  }
+  break;
+  default:
+  {
+    QString ss = QObject::tr("Invalid rotation representation");
+    setErrorCondition(-45008, ss);
+    return;
+  }
+  }
+
+  p_Impl->m_Params = createRotateParams(*imageGeom, p_Impl->m_RotationMatrix);
+
+  updateGeometry(*imageGeom, p_Impl->m_Params);
+
+  // Resize attribute matrix
+
+  std::vector<size_t> tDims(3);
+  tDims[0] = p_Impl->m_Params.xpNew;
+  tDims[1] = p_Impl->m_Params.ypNew;
+  tDims[2] = p_Impl->m_Params.zpNew;
+  QString attrMatName = getCellAttributeMatrixPath().getAttributeMatrixName();
+  m->getAttributeMatrix(attrMatName)->resizeAttributeArrays(tDims);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::preflight()
+{
+  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
+  setInPreflight(true);              // Set the fact that we are preflighting.
+  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
+  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
+  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
+  emit preflightExecuted();          // We are done preflighting this filter
+  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::execute()
+{
+  clearErrorCode();
+  clearWarningCode();
+  dataCheck();
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getCellAttributeMatrixPath().getDataContainerName());
+
+  if(m == nullptr)
+  {
+    QString ss = QObject::tr("Failed to get DataContainer '%1'").arg(getCellAttributeMatrixPath().getDataContainerName());
+    setErrorCondition(-45101, ss);
+    return;
+  }
+
+  int64_t newNumCellTuples = p_Impl->m_Params.xpNew * p_Impl->m_Params.ypNew * p_Impl->m_Params.zpNew;
+
+  DataArray<int64_t>::Pointer newIndiciesPtr = DataArray<int64_t>::CreateArray(newNumCellTuples, "_INTERNAL_USE_ONLY_RotateSampleRef_NewIndicies", true);
+  newIndiciesPtr->initializeWithValue(-1);
+  int64_t* newindicies = newIndiciesPtr->getPointer(0);
+
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+  tbb::parallel_for(tbb::blocked_range3d<int64_t, int64_t, int64_t>(0, p_Impl->m_Params.zpNew, 0, p_Impl->m_Params.ypNew, 0, p_Impl->m_Params.xpNew),
+                    SampleRefFrameRotator(newIndiciesPtr, p_Impl->m_Params, p_Impl->m_RotationMatrix, m_SliceBySlice), tbb::auto_partitioner());
+#else
+  {
+    SampleRefFrameRotator serial(newIndiciesPtr, p_Impl->m_Params, p_Impl->m_RotationMatrix, m_SliceBySlice);
+    serial.convert(0, p_Impl->m_Params.zpNew, 0, p_Impl->m_Params.ypNew, 0, p_Impl->m_Params.xpNew);
+  }
+#endif
+
+  // This could technically be parallelized also where each thread takes an array to adjust. Except
+  // that the DataContainer is NOT thread safe or re-entrant so that would actually be a BAD idea.
+
+  QString attrMatName = getCellAttributeMatrixPath().getAttributeMatrixName();
+  QList<QString> voxelArrayNames = m->getAttributeMatrix(attrMatName)->getAttributeArrayNames();
+
+  for(const auto& attrArrayName : voxelArrayNames)
+  {
+    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(attrArrayName);
+
+    // Make a copy of the 'p' array that has the same name. When placed into
+    // the data container this will over write the current array with
+    // the same name.
+
+    IDataArray::Pointer data = p->createNewArray(newNumCellTuples, p->getComponentDimensions(), p->getName());
+    int64_t newIndicies_I = 0;
+    for(size_t i = 0; i < static_cast<size_t>(newNumCellTuples); i++)
+    {
+      newIndicies_I = newindicies[i];
+      if(newIndicies_I >= 0)
+      {
+        if(!data->copyFromArray(i, p, newIndicies_I, 1))
+        {
+          QString ss = QObject::tr("copyFromArray Failed: ");
+          QTextStream out(&ss);
+          out << "Source Array Name: " << p->getName() << " Source Tuple Index: " << newIndicies_I << "\n";
+          out << "Dest Array Name: " << data->getName() << "  Dest. Tuple Index: " << i << "\n";
+          setErrorCondition(-45102, ss);
+          return;
+        }
+      }
+      else
+      {
+        int var = 0;
+        data->initializeTuple(i, &var);
+      }
+    }
+    m->getAttributeMatrix(attrMatName)->insertOrAssign(data);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer RotateSampleRefFrame::newFilterInstance(bool copyFilterParameters) const
+{
+  RotateSampleRefFrame::Pointer filter = RotateSampleRefFrame::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getGroupName() const
+{
+  return SIMPL::FilterGroups::SamplingFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QUuid RotateSampleRefFrame::getUuid() const
+{
+  return QUuid("{e25d9b4c-2b37-578c-b1de-cf7032b5ef19}");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::RotationTransformationFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getHumanLabel() const
+{
+  return "Rotate Sample Reference Frame";
+}
+
+// -----------------------------------------------------------------------------
+RotateSampleRefFrame::Pointer RotateSampleRefFrame::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<RotateSampleRefFrame> RotateSampleRefFrame::New()
+{
+  struct make_shared_enabler : public RotateSampleRefFrame
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::getNameOfClass() const
+{
+  return QString("RotateSampleRefFrame");
+}
+
+// -----------------------------------------------------------------------------
+QString RotateSampleRefFrame::ClassName()
+{
+  return QString("RotateSampleRefFrame");
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setCellAttributeMatrixPath(const DataArrayPath& value)
+{
+  m_CellAttributeMatrixPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath RotateSampleRefFrame::getCellAttributeMatrixPath() const
+{
+  return m_CellAttributeMatrixPath;
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setRotationAxis(const FloatVec3Type& value)
+{
+  m_RotationAxis = value;
+}
+
+// -----------------------------------------------------------------------------
+FloatVec3Type RotateSampleRefFrame::getRotationAxis() const
+{
+  return m_RotationAxis;
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setRotationAngle(float value)
+{
+  m_RotationAngle = value;
+}
+
+// -----------------------------------------------------------------------------
+float RotateSampleRefFrame::getRotationAngle() const
+{
+  return m_RotationAngle;
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setSliceBySlice(bool value)
+{
+  m_SliceBySlice = value;
+}
+
+// -----------------------------------------------------------------------------
+bool RotateSampleRefFrame::getSliceBySlice() const
+{
+  return m_SliceBySlice;
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setRotationTable(const DynamicTableData& value)
+{
+  m_RotationTable = value;
+}
+
+// -----------------------------------------------------------------------------
+DynamicTableData RotateSampleRefFrame::getRotationTable() const
+{
+  return m_RotationTable;
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setRotationRepresentationChoice(int value)
+{
+  m_RotationRepresentationChoice = value;
+}
+
+// -----------------------------------------------------------------------------
+int RotateSampleRefFrame::getRotationRepresentationChoice() const
+{
+  return m_RotationRepresentationChoice;
+}
+
+// -----------------------------------------------------------------------------
+RotateSampleRefFrame::RotationRepresentation RotateSampleRefFrame::getRotationRepresentation() const
+{
+  return static_cast<RotationRepresentation>(m_RotationRepresentationChoice);
+}
+
+// -----------------------------------------------------------------------------
+void RotateSampleRefFrame::setRotationRepresentation(RotationRepresentation value)
+{
+  m_RotationRepresentationChoice = static_cast<int>(value);
+}
+
+// -----------------------------------------------------------------------------
+bool RotateSampleRefFrame::isRotationRepresentationValid(int value) const
+{
+  return (value >= 0) && (value <= 1);
+}
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
new file mode 100644
index 0000000000..4bca48c7e9
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -0,0 +1,327 @@
+/* ============================================================================
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/FilterParameters/DynamicTableData.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+/**
+ * @brief The RotateSampleRefFrame class. See [Filter documentation](@ref rotatesamplerefframe) for details.
+ */
+class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
+{
+  Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(RotateSampleRefFrame SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(RotateSampleRefFrame)
+  PYB11_FILTER_NEW_MACRO(RotateSampleRefFrame)
+  PYB11_ENUMERATION(RotationRepresentation)
+  PYB11_FILTER_PARAMETER(DataArrayPath, CellAttributeMatrixPath)
+  PYB11_FILTER_PARAMETER(FloatVec3Type, RotationAxis)
+  PYB11_FILTER_PARAMETER(float, RotationAngle)
+  PYB11_FILTER_PARAMETER(bool, SliceBySlice)
+  PYB11_PROPERTY(DataArrayPath CellAttributeMatrixPath READ getCellAttributeMatrixPath WRITE setCellAttributeMatrixPath)
+  PYB11_PROPERTY(FloatVec3Type RotationAxis READ getRotationAxis WRITE setRotationAxis)
+  PYB11_PROPERTY(float RotationAngle READ getRotationAngle WRITE setRotationAngle)
+  PYB11_PROPERTY(bool SliceBySlice READ getSliceBySlice WRITE setSliceBySlice)
+  PYB11_PROPERTY(DynamicTableData RotationTable READ getRotationTable WRITE setRotationTable)
+  PYB11_PROPERTY(int RotationRepresentationChoice READ getRotationRepresentationChoice WRITE setRotationRepresentationChoice)
+  PYB11_METHOD(RotationRepresentation getRotationRepresentation)
+  PYB11_METHOD(void setRotationRepresentation ARGS value)
+  PYB11_METHOD(bool isRotationRepresentationValid ARGS value)
+#endif
+
+public:
+  using Self = RotateSampleRefFrame;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for RotateSampleRefFrame
+   */
+  QString getNameOfClass() const override;
+
+  /**
+   * @brief Returns the name of the class for RotateSampleRefFrame
+   */
+  static QString ClassName();
+
+  ~RotateSampleRefFrame() override;
+
+  enum class RotationRepresentation : int
+  {
+    AxisAngle = 0,
+    RotationMatrix = 1
+  };
+
+  /**
+   * @brief Returns the current rotation representation in enum form.
+   * @return
+   */
+  RotationRepresentation getRotationRepresentation() const;
+
+  /**
+   * @brief Sets the rotation representation value to the given enum value
+   * @param value
+   */
+  void setRotationRepresentation(RotationRepresentation value);
+
+  /**
+   * @brief Returns true if the selected index for the rotation representation choice widget is a valid enum value.
+   * @param value
+   * @return
+   */
+  bool isRotationRepresentationValid(int value) const;
+
+  /**
+   * @brief Setter property for CellAttributeMatrixPath
+   */
+  void setCellAttributeMatrixPath(const DataArrayPath& value);
+
+  /**
+   * @brief Getter property for CellAttributeMatrixPath
+   * @return Value of CellAttributeMatrixPath
+   */
+  DataArrayPath getCellAttributeMatrixPath() const;
+
+  Q_PROPERTY(DataArrayPath CellAttributeMatrixPath READ getCellAttributeMatrixPath WRITE setCellAttributeMatrixPath)
+
+  /**
+   * @brief Setter property for RotationAxis
+   */
+  void setRotationAxis(const FloatVec3Type& value);
+
+  /**
+   * @brief Getter property for RotationAxis
+   * @return Value of RotationAxis
+   */
+  FloatVec3Type getRotationAxis() const;
+
+  Q_PROPERTY(FloatVec3Type RotationAxis READ getRotationAxis WRITE setRotationAxis)
+
+  /**
+   * @brief Setter property for RotationAngle
+   */
+  void setRotationAngle(float value);
+
+  /**
+   * @brief Getter property for RotationAngle
+   * @return Value of RotationAngle
+   */
+  float getRotationAngle() const;
+
+  Q_PROPERTY(float RotationAngle READ getRotationAngle WRITE setRotationAngle)
+
+  // This is getting exposed because other filters that are calling this filter needs to set this value
+  /**
+   * @brief Setter property for SliceBySlice
+   */
+  void setSliceBySlice(bool value);
+
+  /**
+   * @brief Getter property for SliceBySlice
+   * @return Value of SliceBySlice
+   */
+  bool getSliceBySlice() const;
+
+  Q_PROPERTY(bool SliceBySlice READ getSliceBySlice WRITE setSliceBySlice)
+
+  /**
+   * @brief Setter property for RotationTable
+   * @param value
+   */
+  void setRotationTable(const DynamicTableData& value);
+
+  /**
+   * @brief Setter property for RotationRepresentationChoice
+   * @param value
+   */
+  void setRotationRepresentationChoice(int value);
+
+  /**
+   * @brief Getter property for RotationRepresentationChoice
+   * @return
+   */
+  int getRotationRepresentationChoice() const;
+
+  Q_PROPERTY(int RotationRepresentationChoice READ getRotationRepresentationChoice WRITE setRotationRepresentationChoice)
+
+  /**
+   * @brief Getter property for RotationTable
+   * @return
+   */
+  DynamicTableData getRotationTable() const;
+
+  Q_PROPERTY(DynamicTableData RotationTable READ getRotationTable WRITE setRotationTable)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief preflight Reimplemented from @see AbstractFilter class
+   */
+  void preflight() override;
+
+signals:
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
+protected:
+  RotateSampleRefFrame();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck();
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  RotateSampleRefFrame(const RotateSampleRefFrame&) = delete;            // Copy Constructor Not Implemented
+  RotateSampleRefFrame(RotateSampleRefFrame&&) = delete;                 // Move Constructor Not Implemented
+  RotateSampleRefFrame& operator=(const RotateSampleRefFrame&) = delete; // Copy Assignment Not Implemented
+  RotateSampleRefFrame& operator=(RotateSampleRefFrame&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> p_Impl;
+
+  DataArrayPath m_CellAttributeMatrixPath = {};
+  FloatVec3Type m_RotationAxis = {0.0f, 0.0f, 1.0f};
+  float m_RotationAngle = 0.0f;
+  bool m_SliceBySlice = false;
+  DynamicTableData m_RotationTable;
+  int m_RotationRepresentationChoice = 0;
+};
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 13a038a6d9..05f721f58f 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -71,6 +71,7 @@ set(_PublicFilters
   RenameDataContainer
   ReplaceValueInArray
   RequiredZThickness
+  RotateSampleRefFrame
   ScaleVolume
   SetOriginResolutionImageGeom
   SplitAttributeArray
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
new file mode 100644
index 0000000000..506b947f4b
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
@@ -0,0 +1,479 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <QtCore/QFile>
+
+#include <Eigen/Dense>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/DynamicTableData.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Math/SIMPLibMath.h"
+
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+
+class RotateSampleRefFrameTest
+{
+private:
+  const QString k_FilterName = "RotateSampleRefFrame";
+  const QString k_RotationAngleName = "RotationAngle";
+  const QString k_RotationAxisName = "RotationAxis";
+  const QString k_RotationTableName = "RotationTable";
+  const QString k_RotationRepresentationChoiceName = "RotationRepresentationChoice";
+  const QString k_CellAttributeMatrixPathName = "CellAttributeMatrixPath";
+  const int k_AxisAngle = 0;
+  const int k_RotationMatrix = 1;
+
+  template <class T>
+  static bool dataArrayEqual(const DataArray<T>& a, const DataArray<T>& b)
+  {
+    if(a.getNumberOfComponents() != b.getNumberOfComponents())
+    {
+      return false;
+    }
+
+    if(a.getNumberOfTuples() != b.getNumberOfTuples())
+    {
+      return false;
+    }
+
+    return std::equal(a.begin(), a.end(), b.begin(), b.end());
+  }
+
+  static bool imageGeomEqual(const ImageGeom& a, const ImageGeom& b)
+  {
+    SizeVec3Type dimsA = a.getDimensions();
+    FloatVec3Type originA = a.getOrigin();
+    FloatVec3Type spacingA = a.getSpacing();
+
+    SizeVec3Type dimsB = b.getDimensions();
+    FloatVec3Type originB = b.getOrigin();
+    FloatVec3Type spacingB = b.getSpacing();
+
+    return (dimsA == dimsB) && (originA == originB) && (spacingA == spacingB);
+  }
+
+  static bool matrixEqual(const AttributeMatrix& a, const AttributeMatrix& b)
+  {
+    return a.getTupleDimensions() == b.getTupleDimensions();
+  }
+
+  static void dataContainerEqual(const DataContainerArray& dca, const DataArrayPath& testPath, const DataArrayPath& expectedPath)
+  {
+    // Get test
+
+    DataContainer::Pointer testContainer = dca.getDataContainer(testPath);
+    DREAM3D_REQUIRE_VALID_POINTER(testContainer)
+
+    ImageGeom::Pointer testGeom = testContainer->getGeometryAs<ImageGeom>();
+    DREAM3D_REQUIRE_VALID_POINTER(testGeom)
+
+    AttributeMatrix::Pointer testMatrix = testContainer->getAttributeMatrix(testPath);
+    DREAM3D_REQUIRE_VALID_POINTER(testMatrix)
+
+    UInt8ArrayType::Pointer testArray = testMatrix->getAttributeArrayAs<UInt8ArrayType>(testPath.getDataArrayName());
+    DREAM3D_REQUIRE_VALID_POINTER(testArray)
+
+    // Get expected
+
+    DataContainer::Pointer expectedContainer = dca.getDataContainer(expectedPath);
+    DREAM3D_REQUIRE_VALID_POINTER(expectedContainer)
+
+    ImageGeom::Pointer expectedGeom = expectedContainer->getGeometryAs<ImageGeom>();
+    DREAM3D_REQUIRE_VALID_POINTER(expectedGeom)
+
+    AttributeMatrix::Pointer expectedMatrix = expectedContainer->getAttributeMatrix(expectedPath);
+    DREAM3D_REQUIRE_VALID_POINTER(expectedMatrix)
+
+    UInt8ArrayType::Pointer expectedArray = testMatrix->getAttributeArrayAs<UInt8ArrayType>(expectedPath.getDataArrayName());
+    DREAM3D_REQUIRE_VALID_POINTER(expectedArray)
+
+    // Compare
+
+    bool geometryEqual = imageGeomEqual(*testGeom, *expectedGeom);
+    DREAM3D_REQUIRE(geometryEqual)
+
+    bool attributeMatrixEqual = matrixEqual(*testMatrix, *expectedMatrix);
+    DREAM3D_REQUIRE(attributeMatrixEqual)
+
+    bool arraysEqual = dataArrayEqual(*testArray, *expectedArray);
+    DREAM3D_REQUIRE(arraysEqual)
+  }
+
+  static void resetGeometry(AttributeMatrix::Pointer matrix, ImageGeom::Pointer imageGeom, const std::vector<size_t>& tDims)
+  {
+    matrix->resizeAttributeArrays(tDims);
+    imageGeom->setDimensions(tDims);
+    imageGeom->setOrigin(0.0f, 0.0f, 0.0f);
+    imageGeom->setSpacing(1.0f, 1.0f, 1.0f);
+  }
+
+  AbstractFilter::Pointer createFilter() const
+  {
+    FilterManager* fm = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(k_FilterName);
+    DREAM3D_REQUIRE_VALID_POINTER(filterFactory)
+
+    AbstractFilter::Pointer rotateFilter = filterFactory->create();
+    DREAM3D_REQUIRE_VALID_POINTER(rotateFilter)
+
+    return rotateFilter;
+  }
+
+  template <class T>
+  static void setProperty(AbstractFilter::Pointer filter, const QString& property, const T& value)
+  {
+    QVariant variant;
+    variant.setValue(value);
+    bool propWasSet = filter->setProperty(property.toStdString().c_str(), variant);
+    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+  }
+
+public:
+  RotateSampleRefFrameTest() = default;
+  ~RotateSampleRefFrameTest() = default;
+  RotateSampleRefFrameTest(const RotateSampleRefFrameTest&) = delete;            // Copy Constructor Not Implemented
+  RotateSampleRefFrameTest(RotateSampleRefFrameTest&&) = delete;                 // Move Constructor Not Implemented
+  RotateSampleRefFrameTest& operator=(const RotateSampleRefFrameTest&) = delete; // Copy Assignment Not Implemented
+  RotateSampleRefFrameTest& operator=(RotateSampleRefFrameTest&&) = delete;      // Move Assignment Not Implemented
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void RemoveTestFiles()
+  {
+#if REMOVE_TEST_FILES
+#endif
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestFilterAvailability()
+  {
+    // Now instantiate the SampleSurfaceMeshSpecifiedPointsTest Filter from the FilterManager
+    FilterManager* filterManager = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = filterManager->getFactoryFromClassName(k_FilterName);
+    if(filterFactory == nullptr)
+    {
+      std::stringstream ss;
+      ss << "The RotateSampleRefFrameTest Requires the use of the " << k_FilterName.toStdString() << " filter which is found in the Sampling Plugin";
+      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
+    }
+    return 0;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestFilterParameters()
+  {
+    const std::vector<size_t> tDims{10, 20, 30};
+    const DataArrayPath path("DataContainer", "AttributeMatrix", "DataArray");
+
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+
+    DataContainer::Pointer dc = DataContainer::New(path.getDataContainerName());
+
+    ImageGeom::Pointer imageGeom = ImageGeom::New();
+
+    imageGeom->setDimensions(tDims);
+
+    dc->setGeometry(imageGeom);
+
+    dca->addOrReplaceDataContainer(dc);
+
+    AttributeMatrix::Pointer matrix = dc->createNonPrereqAttributeMatrix(nullptr, path.getAttributeMatrixName(), tDims, AttributeMatrix::Type::Cell);
+
+    AbstractFilter::Pointer rotateFilter = createFilter();
+    rotateFilter->setDataContainerArray(dca);
+
+    setProperty(rotateFilter, k_CellAttributeMatrixPathName, path);
+    setProperty(rotateFilter, k_RotationRepresentationChoiceName, k_AxisAngle);
+
+    // Correct axis angle inputs
+
+    setProperty(rotateFilter, k_RotationAxisName, FloatVec3Type(0.0f, 1.0f, 0.0f));
+    setProperty(rotateFilter, k_RotationAngleName, 90.0f);
+
+    rotateFilter->preflight();
+    int error = rotateFilter->getErrorCode();
+    DREAM3D_REQUIRED(error, >=, 0)
+
+    resetGeometry(matrix, imageGeom, tDims);
+
+    // Non-normalized rotation axis should generate a warning
+
+    setProperty(rotateFilter, k_RotationAxisName, FloatVec3Type(1.0f, 1.0f, 0.0f));
+
+    rotateFilter->preflight();
+    int warning = rotateFilter->getWarningCode();
+    DREAM3D_REQUIRED(warning, <, 0)
+
+    resetGeometry(matrix, imageGeom, tDims);
+
+    // Correct rotation matrix inputs
+
+    setProperty(rotateFilter, k_RotationRepresentationChoiceName, k_RotationMatrix);
+
+    //  0 0 1
+    //  0 1 0
+    // -1 0 0
+
+    std::vector<std::vector<double>> table = {{0.0, 0.0, 1.0}, {0.0, 1.0, 0.0}, {-1.0, 0.0, 0.0}};
+
+    DynamicTableData tableData(table);
+
+    setProperty(rotateFilter, k_RotationTableName, tableData);
+
+    rotateFilter->preflight();
+    error = rotateFilter->getErrorCode();
+    DREAM3D_REQUIRED(error, >=, 0)
+
+    resetGeometry(matrix, imageGeom, tDims);
+
+    // Inverse != Transpose error
+
+    // 1 0 1
+    // 0 1 0
+    // 0 0 1
+
+    table = {{1.0, 0.0, 1.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
+
+    tableData.setTableData(table);
+
+    setProperty(rotateFilter, k_RotationTableName, tableData);
+
+    rotateFilter->preflight();
+    error = rotateFilter->getErrorCode();
+    DREAM3D_REQUIRED(error, <, 0)
+
+    resetGeometry(matrix, imageGeom, tDims);
+
+    // Determinant != 1 error
+
+    // 1 0 1
+    // 0 1 0
+    // 1 0 1
+
+    table = {{1.0, 0.0, 1.0}, {0.0, 1.0, 0.0}, {1.0, 0.0, 1.0}};
+
+    tableData.setTableData(table);
+
+    setProperty(rotateFilter, k_RotationTableName, tableData);
+
+    rotateFilter->preflight();
+    error = rotateFilter->getErrorCode();
+    DREAM3D_REQUIRED(error, <, 0)
+
+    resetGeometry(matrix, imageGeom, tDims);
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestRotateSampleRefFrameTest()
+  {
+    const DataArrayPath basePath("", "CellData", "Data");
+
+    // Read test file
+
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+
+    DataContainerReader::Pointer dataContainerReader = DataContainerReader::New();
+    dataContainerReader->setDataContainerArray(dca);
+    dataContainerReader->setInputFile(UnitTest::RotateSampleRefFrameTest::TestFile1);
+    DataContainerArrayProxy proxy = dataContainerReader->readDataContainerArrayStructure(UnitTest::RotateSampleRefFrameTest::TestFile1);
+    dataContainerReader->setInputFileDataContainerArrayProxy(proxy);
+
+    dataContainerReader->execute();
+    int error = dataContainerReader->getErrorCode();
+    DREAM3D_REQUIRED(error, >=, 0)
+
+    QList<QString> dcNames = dca->getDataContainerNames();
+
+    bool hasOriginal = dcNames.contains("Original");
+
+    DREAM3D_REQUIRE(hasOriginal)
+
+    AbstractFilter::Pointer rotateFilter = createFilter();
+    rotateFilter->setDataContainerArray(dca);
+
+    DataArrayPath originalPath = basePath;
+    originalPath.setDataContainerName("Original");
+    DataContainer::Pointer dcOriginal = dca->getDataContainer(originalPath);
+    DREAM3D_REQUIRE_VALID_POINTER(dcOriginal)
+
+    bool foundRotated = false;
+
+    for(const auto& name : dcNames)
+    {
+      bool isRotated = name.startsWith("Rotate");
+      foundRotated = isRotated ? true : foundRotated;
+      if(!isRotated)
+      {
+        continue;
+      }
+
+      DataArrayPath expectedPath = basePath;
+      expectedPath.setDataContainerName(name);
+
+      QStringList parts = name.split("_");
+      int size = parts.size();
+      DREAM3D_REQUIRED(size, ==, 5)
+
+      bool conversionSuccess = false;
+
+      float x = parts[1].toFloat(&conversionSuccess);
+      DREAM3D_REQUIRE(conversionSuccess)
+      float y = parts[2].toFloat(&conversionSuccess);
+      DREAM3D_REQUIRE(conversionSuccess)
+      float z = parts[3].toFloat(&conversionSuccess);
+      DREAM3D_REQUIRE(conversionSuccess)
+      float angle = parts[4].toFloat(&conversionSuccess);
+      DREAM3D_REQUIRE(conversionSuccess)
+
+      {
+        // Set to axis angle representation
+        setProperty(rotateFilter, k_RotationRepresentationChoiceName, k_AxisAngle);
+
+        // Copy original data for rotation
+
+        DataContainer::Pointer dcCopy = dcOriginal->deepCopy();
+        dcCopy->setName(name + "_Copy");
+        dca->addOrReplaceDataContainer(dcCopy);
+
+        DataArrayPath testPath = basePath;
+        testPath.setDataContainerName(dcCopy->getName());
+
+        setProperty(rotateFilter, k_CellAttributeMatrixPathName, testPath);
+
+        // Set properties
+
+        setProperty(rotateFilter, k_RotationAngleName, angle);
+        setProperty(rotateFilter, k_RotationAxisName, FloatVec3Type(x, y, z));
+
+        // Execute
+
+        rotateFilter->execute();
+        int error = rotateFilter->getErrorCode();
+        DREAM3D_REQUIRED(error, >=, 0)
+
+        // Compare
+
+        dataContainerEqual(*dca, testPath, expectedPath);
+      }
+
+      {
+        // Set to rotation matrix representation
+        setProperty(rotateFilter, k_RotationRepresentationChoiceName, k_RotationMatrix);
+
+        // Copy original data for rotation
+
+        DataContainer::Pointer dcCopy = dcOriginal->deepCopy();
+        dcCopy->setName(name + "_Copy_Matrix");
+        dca->addOrReplaceDataContainer(dcCopy);
+
+        DataArrayPath testPath = basePath;
+        testPath.setDataContainerName(dcCopy->getName());
+
+        setProperty(rotateFilter, k_CellAttributeMatrixPathName, testPath);
+
+        // Set properties
+
+        Eigen::Vector3f axis(x, y, z);
+        float angleRadians = angle * static_cast<float>(SIMPLib::Constants::k_DegToRad);
+        Eigen::AngleAxisf axisAngle(angleRadians, axis);
+
+        Eigen::Matrix3f rotationMatrix = axisAngle.toRotationMatrix();
+
+        std::vector<std::vector<double>> data;
+
+        for(int i = 0; i < rotationMatrix.rows(); i++)
+        {
+          std::vector<double> row;
+          for(int j = 0; j < rotationMatrix.cols(); j++)
+          {
+            row.push_back(static_cast<double>(rotationMatrix(i, j)));
+          }
+          data.push_back(row);
+        }
+
+        DynamicTableData tableData(data);
+
+        setProperty(rotateFilter, k_RotationTableName, tableData);
+
+        // Execute
+
+        rotateFilter->execute();
+        int error = rotateFilter->getErrorCode();
+        DREAM3D_REQUIRED(error, >=, 0)
+
+        // Compare
+
+        dataContainerEqual(*dca, testPath, expectedPath);
+      }
+    }
+
+    DREAM3D_REQUIRE(foundRotated)
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    std::cout << "----Start RotateSampleRefFrameTest----\n";
+
+    int err = EXIT_SUCCESS;
+    DREAM3D_REGISTER_TEST(TestFilterAvailability())
+
+    DREAM3D_REGISTER_TEST(TestFilterParameters())
+    DREAM3D_REGISTER_TEST(TestRotateSampleRefFrameTest())
+
+    DREAM3D_REGISTER_TEST(RemoveTestFiles())
+
+    std::cout << "----End RotateSampleRefFrameTest----\n";
+  }
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index e87665fed8..800e172278 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -45,6 +45,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   # RenameTimingTest
   ReplaceValueTest
   RequiredZThicknessTest
+  RotateSampleRefFrameTest
   ScaleVolumeTest
   SetOriginResolutionImageGeomTest
   SplitAttributeArrayTest
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md
new file mode 100644
index 0000000000..1ef88bb969
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md
@@ -0,0 +1,57 @@
+# Rotate Sample Reference Frame  #
+
+## Group (Subgroup) ##
+
+Sampling (Rotating/Transforming)
+
+## Description ##
+
+This **Filter** will rotate the *spatial reference frame* around a user defined axis, by a user defined angle.  The **Filter** will modify the (X, Y, Z) positions of each **Cell** to correctly represent where the **Cell** sits in the newly defined reference frame. For example, if a user selected a *rotation angle* of 90<sup>o</sup> and a *rotation axis* of (001), then a **Cell** sitting at (10, 0, 0) would be transformed to (0, -10, 0), since the new *reference frame* would have x'=y and y'=-x.
+
+The equivalent rotation matrix for the above rotation would be the following:
+
+|   |   |   |
+| - | - | - |
+| 0 | -1 | 0 |
+| 1 | 0 | 0 |
+| 0 | 0 | 1 |
+
+## Parameters ##
+
+| Name | Type | Description |
+|------|------|-------------|
+| Rotation Representation | Enumeration | Which form used to represent rotation (**axis angle** or **rotation matrix)** |
+| Rotation Axis (ijk) | float (3x) | Axis in sample reference frame to rotate about (if **axis angle**) |
+| Rotation Angle (Degrees) | float | Magnitude of rotation (in degrees) about the rotation axis (if **axis angle**) |
+| Rotation Matrix | float (3x3) | Axis in sample reference frame to rotate about (if **rotation matrix**) |
+
+## Required Geometry ##
+
+Image
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|------|----------------------|-------------|
+| **Attribute Matrix** | CellData | Cell | N/A | **Cell Attribute Matrix** that holds the data to rotate |
+
+## Created Objects ##
+
+None
+
+## Example Pipelines ##
+
++ INL Export
++ Export Small IN100 ODF Data (StatsGenerator)
++ TxCopper_Exposed
++ TxCopper_Unexposed
++ Edax IPF Colors
++ Confidence Index Histogram
+
+## License & Copyright ##
+
+Please see the description file distributed with this **Plugin**
+
+## DREAM.3D Mailing Lists ##
+
+If you need more help with a **Filter**, please consider asking your question on the [DREAM.3D Users Google group!](https://groups.google.com/forum/?hl=en#!forum/dream3d-users)
diff --git a/Source/SIMPLib/Testing/TestFileLocations.h.in b/Source/SIMPLib/Testing/TestFileLocations.h.in
index 2321f18ac3..6e8f079de0 100644
--- a/Source/SIMPLib/Testing/TestFileLocations.h.in
+++ b/Source/SIMPLib/Testing/TestFileLocations.h.in
@@ -214,6 +214,11 @@ namespace UnitTest
    const QString OutputFile("@TEST_TEMP_DIR@/FeatureDataCSVOutputTestFile.txt");
   }
 
+  namespace RotateSampleRefFrameTest
+  {
+    const QString TestFile1("@DREAM3D_DATA_DIR@/Data/RotateSampleRefFrame/RotateSampleRefFrameTest.dream3d");
+  }
+
   namespace RestUnitTest
   {
     // Server Configuration File

From b2a046f69f85a292d7184dd4178e4e1fe4f3c05b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 19 Dec 2019 10:40:06 -0500
Subject: [PATCH 173/397] Fixed bug where the wrong property name was used for
 RotateSampleRefFrame

---
 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index df01ddce1a..2018ff3677 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -351,7 +351,7 @@ void RotateSampleRefFrame::setupFilterParameters()
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Rotation Representation");
-    parameter->setPropertyName("RotationRepresentation");
+    parameter->setPropertyName("RotationRepresentationChoice");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
     QVector<QString> choices{"Axis Angle", "Rotation Matrix"};

From 9aa77d575ea8ac52da58eb37d9fc6f78e01eb1f1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 31 Dec 2019 13:40:06 -0500
Subject: [PATCH 174/397] Add MarkDown to InfoStringFormat

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Constants.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index cdf87f5a24..6f8139bc26 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -75,6 +75,7 @@ const uint8_t Checked = 2;
 enum InfoStringFormat
 {
   HtmlFormat = 0,
+  MarkDown = 1,
   //      JsonFormat,
   //      TextFormat,
   //      XmlFormat,

From 6911da6caf041d8f9dd93021f3e9688ec3dece34 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 6 Jan 2020 13:30:04 -0500
Subject: [PATCH 175/397] Update Filter Parameter Widgets to use std::function
 callbacks instead of QMetaProperty (#386)

* Update Filter Parameter Widgets to use std::function callbacks instead of QMetaProperty

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../AttributeMatrixCreationWidget.cpp         | 13 ++--
 .../AttributeMatrixSelectionWidget.cpp        | 13 ++--
 .../AxisAngleWidget.cpp                       | 20 +++---
 .../FilterParameterWidgets/BooleanWidget.cpp  | 12 ++--
 .../CalculatorWidget.cpp                      |  8 ++-
 .../FilterParameterWidgets/ChoiceWidget.cpp   | 12 ++--
 .../ComparisonSelectionAdvancedWidget.cpp     | 14 ++--
 .../ComparisonSelectionWidget.cpp             | 14 ++--
 .../ConstrainedDoubleWidget.cpp               | 11 ++--
 .../ConstrainedIntWidget.cpp                  | 12 ++--
 .../DataArrayCreationWidget.cpp               | 13 ++--
 .../DataArraySelectionWidget.cpp              | 14 ++--
 .../DataContainerArrayProxyWidget.cpp         | 15 ++---
 .../DataContainerCreationWidget.cpp           |  4 ++
 .../DataContainerReaderWidget.cpp             |  2 +-
 .../DataContainerSelectionWidget.cpp          |  4 ++
 .../FilterParameterWidgets/DoubleWidget.cpp   | 11 ++--
 .../DynamicChoiceWidget.cpp                   | 14 ++--
 .../DynamicTableWidget.cpp                    | 14 ++--
 .../FileListInfoWidget.cpp                    | 18 ++---
 .../FileListInfoWidget.h                      |  1 +
 .../FloatVec2Widget.cpp                       | 11 ++--
 .../FloatVec3Widget.cpp                       | 11 ++--
 .../FilterParameterWidgets/FloatWidget.cpp    | 12 ++--
 .../FourthOrderPolynomialWidget.cpp           | 11 ++--
 .../FilterParameterWidgets/IntVec2Widget.cpp  | 11 ++--
 .../FilterParameterWidgets/IntVec3Widget.cpp  | 11 ++--
 .../FilterParameterWidgets/IntWidget.cpp      | 10 ++-
 .../LinkedBooleanWidget.cpp                   | 11 ++--
 .../LinkedDataContainerSelectionWidget.cpp    | 15 ++---
 .../LinkedPathCreationWidget.cpp              |  9 ++-
 .../MontageSelectionWidget.cpp                | 14 ++--
 .../MultiAttributeMatrixSelectionWidget.cpp   | 14 ++--
 .../MultiDataArraySelectionWidget.cpp         | 14 ++--
 .../MultiDataContainerSelectionWidget.cpp     | 21 +++---
 .../NumericTypeWidget.cpp                     | 14 ++--
 .../ParagraphWidget.cpp                       |  9 ++-
 .../PhaseTypeSelectionWidget.cpp              | 14 ++--
 .../PreflightUpdatedValueWidget.cpp           |  1 +
 .../FilterParameterWidgets/RangeWidget.cpp    | 12 ++--
 .../ReadASCIIDataWidget.cpp                   | 66 +++++++++----------
 .../ScalarTypeWidget.cpp                      | 14 ++--
 .../SecondOrderPolynomialWidget.cpp           | 11 ++--
 .../ShapeTypeSelectionWidget.cpp              | 13 ++--
 .../FilterParameterWidgets/StringWidget.cpp   |  9 ++-
 .../ThirdOrderPolynomialWidget.cpp            | 11 ++--
 .../FilterParameterWidgets/UInt64Widget.cpp   | 10 ++-
 47 files changed, 346 insertions(+), 252 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index b26439b347..d3ecc52d1a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -274,15 +274,16 @@ void AttributeMatrixCreationWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void AttributeMatrixCreationWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
   // Generate the path to the AttributeArray
   DataArrayPath selectedPath = m_SelectedDataContainerPath->getDataArrayPath();
   selectedPath.setAttributeMatrixName(stringEdit->getText());
-  QVariant var;
-  var.setValue(selectedPath);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  AttributeMatrixCreationFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selectedPath);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index d7a117fdd6..b5f1f9f7cc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -250,14 +250,15 @@ void AttributeMatrixSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void AttributeMatrixSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
   // Geenerate the path to the AttributeArray
   DataArrayPath selectedPath = m_SelectedAttributeMatrixPath->getDataArrayPath();
-  QVariant var;
-  var.setValue(selectedPath);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  AttributeMatrixSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selectedPath);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index 700c1aec65..cc1b5f92c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -113,6 +113,8 @@ void AxisAngleWidget::widgetChanged(const QString& text)
 // -----------------------------------------------------------------------------
 void AxisAngleWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
+
   bool ok = false;
   AxisAngleInput_t data;
   AxisAngleInput_t defValue = m_FilterParameter->getDefaultValue().value<AxisAngleInput_t>();
@@ -120,15 +122,17 @@ void AxisAngleWidget::filterNeedsInputParameters(AbstractFilter* filter)
   QLabel* errorLabel = nullptr;
   QLocale loc;
 
-  FOPW_EXTRACT_VALUE(angle);
-  FOPW_EXTRACT_VALUE(h);
-  FOPW_EXTRACT_VALUE(k);
-  FOPW_EXTRACT_VALUE(l);
+  FOPW_EXTRACT_VALUE(angle)
+  FOPW_EXTRACT_VALUE(h)
+  FOPW_EXTRACT_VALUE(k)
+  FOPW_EXTRACT_VALUE(l)
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  AxisAngleFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index 339b824bab..725e3b3f25 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -98,6 +98,7 @@ void BooleanWidget::setupGui()
 // -----------------------------------------------------------------------------
 void BooleanWidget::widgetChanged(int state)
 {
+  Q_UNUSED(state)
   emit parametersChanged();
 }
 
@@ -106,10 +107,13 @@ void BooleanWidget::widgetChanged(int state)
 // -----------------------------------------------------------------------------
 void BooleanWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-
-  QVariant var(value->isChecked());
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  BooleanFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(value->isChecked());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index b638891e9e..ef914e0bb7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -409,8 +409,12 @@ void CalculatorWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void CalculatorWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, equation->text());
-  if(!ok)
+  CalculatorFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(equation->text());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index 497d702278..3f160dd186 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -133,11 +133,13 @@ void ChoiceWidget::widgetChanged(int index, bool emitParametersChanged)
 // -----------------------------------------------------------------------------
 void ChoiceWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  int index = value->currentIndex();
-  QVariant v(index);
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-
-  if(!ok)
+  Q_UNUSED(filter)
+  ChoiceFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(value->currentIndex());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 86fd484460..9e04c31aa5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -279,13 +279,13 @@ void ComparisonSelectionAdvancedWidget::setComparisons(QVector<AbstractCompariso
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QVariant var;
-  ComparisonInputsAdvanced comps = getComparisonInputs();
-  var.setValue(comps);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if (!ok)
+  Q_UNUSED(filter)
+  ComparisonSelectionAdvancedFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(getComparisonInputs());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 2d880c5be6..36431314b0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -342,13 +342,13 @@ void ComparisonSelectionWidget::setComparisons(QVector<ComparisonInput_t> compar
 // -----------------------------------------------------------------------------
 void ComparisonSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QVariant var;
-  ComparisonInputs comps = getComparisonInputs();
-  var.setValue(comps);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  ComparisonSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(getComparisonInputs());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index a716843615..6f8b311552 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -104,10 +104,13 @@ void ConstrainedDoubleWidget::widgetChanged(double d)
 // -----------------------------------------------------------------------------
 void ConstrainedDoubleWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = false;
-  QVariant v(spinBox->value());
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  ConstrainedDoubleFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(spinBox->value());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index f359bf2b56..a297a08868 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -103,14 +103,16 @@ void ConstrainedIntWidget::widgetChanged(int i)
 // -----------------------------------------------------------------------------
 void ConstrainedIntWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = true;
-  QVariant v(spinBox->value());
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  ConstrainedIntFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(spinBox->value());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 881d0e982b..201bb24478 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -275,12 +275,13 @@ void DataArrayCreationWidget::filterNeedsInputParameters(AbstractFilter* filter)
   // Generate the path to the AttributeArray
   DataArrayPath selectedPath = m_SelectedAttributeMatrixPath->getDataArrayPath();
   selectedPath.setDataArrayName(stringEdit->getText());
-  QVariant var;
-  var.setValue(selectedPath);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  DataArrayCreationFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selectedPath);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 828c1bb8f5..f01473da46 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -267,12 +267,14 @@ void DataArraySelectionWidget::filterNeedsInputParameters(AbstractFilter* filter
   QString da = selectedPath.getDataArrayName();
 
   DataArrayPath path(dc, am, da);
-  QVariant var;
-  var.setValue(path);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+
+  Q_UNUSED(filter)
+  DataArraySelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(path);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 778e33b9af..fdecf6f83f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -443,14 +443,13 @@ void DataContainerArrayProxyWidget::updateDataArrayPath(QString propertyName, co
 // -----------------------------------------------------------------------------
 void DataContainerArrayProxyWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  // qDebug() << "DataContainerArrayProxyWidget::filterNeedsInputParameters(AbstractFilter* filter)";
-
-  QVariant var;
-  var.setValue(m_DcaProxy);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  DataContainerArrayProxyFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(m_DcaProxy);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index 90ff99680a..fe32ab0b52 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -127,6 +127,10 @@ void DataContainerCreationWidget::filterNeedsInputParameters(AbstractFilter* fil
   {
     setter(dap);
   }
+  else
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index b086085d71..a6eaa284d0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -588,7 +588,7 @@ void DataContainerReaderWidget::beforePreflight()
 // -----------------------------------------------------------------------------
 void DataContainerReaderWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  // qDebug() << "DataContainerReaderWidget::filterNeedsInputParameters()";
+  Q_UNUSED(filter)
 
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString path = validator->convertToAbsolutePath(m_LineEdit->text());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index d675e62079..5ee673e91d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -269,4 +269,8 @@ void DataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* fi
   {
     setter(dap);
   }
+  else
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index c567545115..54526d0d9d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -139,10 +139,13 @@ void DoubleWidget::filterNeedsInputParameters(AbstractFilter* filter)
     errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
   }
-
-  QVariant v(i);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  DoubleFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(i);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index 86000cbaf8..d8e8449e13 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -167,16 +167,18 @@ void DynamicChoiceWidget::widgetChanged(int index)
 // -----------------------------------------------------------------------------
 void DynamicChoiceWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
   QString index = value->currentText();
-
   if(!index.isEmpty())
   {
-    QVariant v(index);
-    bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-
-    if(!ok)
+    DynamicChoiceFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+    if(setter)
+    {
+      setter(index);
+    }
+    else
     {
-      FilterParameterWidgetsDialogs::ShowCouldNotSetFilterParameter(getFilter(), m_FilterParameter);
+      getFilter()->notifyMissingProperty(getFilterParameter());
     }
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 6e987c9dd4..9db3534f80 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -188,13 +188,15 @@ void DynamicTableWidget::filterNeedsInputParameters(AbstractFilter* filter)
   data.setRowHeaders(rHeaders);
   data.setColHeaders(cHeaders);
 
-  QVariant v;
-  v.setValue(data);
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-
-  if(!ok)
+  Q_UNUSED(filter)
+  DynamicTableFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
-    FilterParameterWidgetsDialogs::ShowCouldNotSetFilterParameter(getFilter(), m_FilterParameter);
+    getFilter()->notifyMissingProperty(getFilterParameter());
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index ef49c7e1a9..69dbe41ac6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -68,15 +68,15 @@ FileListInfoWidget::FileListInfoWidget(FilterParameter* parameter, AbstractFilte
 : FilterParameterWidget(parameter, filter, parent)
 , m_Ui(new Ui::FileListInfoWidget)
 {
-  FileListInfoFilterParameter* fli = dynamic_cast<FileListInfoFilterParameter*>(parameter);
-  if(nullptr == fli)
+  m_FilterParameter = dynamic_cast<FileListInfoFilterParameter*>(parameter);
+  if(nullptr == m_FilterParameter)
   {
     QString msg;
     QTextStream ss(&msg);
     ss << "FileListInfoWidget can ONLY be used with FileListInfoFilterParameter objects. The programmer of the filter has a bug.";
     ss << " The name of the filter was " << filter->getHumanLabel() << " and the name of the Filter Parameter was " << parameter->getHumanLabel();
     ss << " and is trying to get the propery " << parameter->getPropertyName() << " in the filter";
-    Q_ASSERT_X(nullptr != fli, msg.toLatin1().constData(), __FILE__);
+    Q_ASSERT_X(nullptr != m_FilterParameter, msg.toLatin1().constData(), __FILE__);
   }
   m_Ui->setupUi(this);
   setupGui();
@@ -600,8 +600,6 @@ void FileListInfoWidget::filterNeedsInputParameters(AbstractFilter* filter)
     emit errorSettingFilterParameter(ss);
     return;
   }
-  bool ok = false;
-
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString inputPath = validator->convertToAbsolutePath(m_Ui->inputDir->text());
 
@@ -616,10 +614,12 @@ void FileListInfoWidget::filterNeedsInputParameters(AbstractFilter* filter)
   data.PaddingDigits = m_Ui->totalDigits->value();
   data.StartIndex = m_Ui->startIndex->value();
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  FileListInfoFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 0e5c6f56c6..97a606f775 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -161,6 +161,7 @@ protected slots:
   QAction* m_ShowFileAction = nullptr;
   QString m_CurrentText = "";
   bool m_DidCausePreflight = false;
+  FileListInfoFilterParameter* m_FilterParameter = nullptr;
 
   /**
    * @brief connectSignalsSlots
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index 09b2cb6cfb..f0e65e2934 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -173,10 +173,13 @@ void FloatVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
     data[1] = defValue[1];
   }
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  FloatVec2FilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index e6e6f623f5..aa5507e4ff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -193,10 +193,13 @@ void FloatVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
     data[2] = defValue[2];
   }
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  FloatVec3FilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index 9e06e15d5d..4b47ae6c1d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -139,10 +139,14 @@ void FloatWidget::filterNeedsInputParameters(AbstractFilter* filter)
     errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
   }
-  
-  QVariant v(i);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+
+  Q_UNUSED(filter)
+  FloatFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(i);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index 2e01b2ffb4..c05511be74 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -172,10 +172,13 @@ void FourthOrderPolynomialWidget::filterNeedsInputParameters(AbstractFilter* fil
   FOPW_EXTRACT_VALUE(c01)
   FOPW_EXTRACT_VALUE(c00)
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  FourthOrderPolynomialFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 4108173a3b..6b56e98196 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -108,10 +108,13 @@ void IntVec2Widget::filterNeedsInputParameters(AbstractFilter* filter)
   data[0] = xData->text().toInt(&ok);
   data[1] = yData->text().toInt(&ok);
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  IntVec2FilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index 10ca233742..1d6ec39d75 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -115,10 +115,13 @@ void IntVec3Widget::filterNeedsInputParameters(AbstractFilter* filter)
   data[1] = yData->text().toInt(&ok);
   data[2] = zData->text().toInt(&ok);
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  IntVec3FilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 6a8b768fa7..7fb7b6d91e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -132,9 +132,13 @@ void IntWidget::filterNeedsInputParameters(AbstractFilter* filter)
     errorLabel->show();
   }
 
-  QVariant v(i);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  IntFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(i);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index fde8540702..4e87773526 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -126,10 +126,13 @@ void LinkedBooleanWidget::widgetChanged(int state)
 // -----------------------------------------------------------------------------
 void LinkedBooleanWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-
-  QVariant var(value->isChecked());
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  LinkedBooleanFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(value->isChecked());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 9fd520bb4d..1ab6ca34cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -333,14 +333,13 @@ void LinkedDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void LinkedDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  // Generate the path to the AttributeArray
-  // DataArrayPath path(dataContainerList->currentText(), attributeMatrixList->currentText(), attributeArrayList->currentText());
-  QVariant var(m_SelectedDataContainerPath->text());
-  // var.setValue(path);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  LinkedDataContainerSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(DataArrayPath(m_SelectedDataContainerPath->text()));
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 7da12bdbd5..45fb52e452 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -129,8 +129,13 @@ int LinkedPathCreationWidget::getDataTypei() const
 // -----------------------------------------------------------------------------
 void LinkedPathCreationWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, stringEdit->getText());
-  if(!ok)
+  Q_UNUSED(filter)
+  LinkedPathCreationFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(stringEdit->getText());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index 657f8fa62d..c1b5ea19f2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -208,13 +208,13 @@ void MontageSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   MontageSelection selection = getMontageSelection();
 
-  QVariant var;
-  var.setValue(selection);
-  bool ok = false;
-
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  MontageSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selection);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index e85c7c0d34..31679b5184 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -560,13 +560,13 @@ void MultiAttributeMatrixSelectionWidget::filterNeedsInputParameters(AbstractFil
     selectedPaths.push_back(path);
   }
 
-  // Generate the path to the AttributeArray
-  QVariant var;
-  var.setValue(selectedPaths);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selectedPaths);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 7f597af7bf..69a1335e91 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -547,13 +547,13 @@ void MultiDataArraySelectionWidget::filterNeedsInputParameters(AbstractFilter* f
     selectedPaths.push_back(path);
   }
 
-  // Generate the path to the AttributeArray
-  QVariant var;
-  var.setValue(selectedPaths);
-  bool ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  MultiDataArraySelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(selectedPaths);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9b915a29b9..9ea0f74594 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -467,17 +467,16 @@ void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilte
 	{
     dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
 	}
-
-	// Generate the path to the AttributeArray
-	QVariant var;
-  var.setValue(dcNames);
-	bool ok = false;
-	// Set the value into the Filter
-	ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-	if (!ok)
-	{
-		getFilter()->notifyMissingProperty(getFilterParameter());
-	}
+  Q_UNUSED(filter)
+  MultiDataContainerSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(dcNames);
+  }
+  else
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index 51400f14a9..1e36993ed3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -98,7 +98,6 @@ void NumericTypeWidget::widgetChanged(int index)
 // -----------------------------------------------------------------------------
 void NumericTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = true;
   int defValue = getFilterParameter()->getDefaultValue().toInt();
   int i = defValue;
 
@@ -117,12 +116,13 @@ void NumericTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
     errorLabel->hide();
   }
 
-  SIMPL::NumericTypes::Type type = static_cast<SIMPL::NumericTypes::Type>(i);
-  QVariant v;
-  v.setValue(type);
-
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  NumericTypeFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(static_cast<SIMPL::NumericTypes::Type>(i));
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index 03ae75a90d..a37a7e36a7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -108,8 +108,13 @@ void ParagraphWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void ParagraphWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, textEdit->toHtml());
-  if(!ok)
+  Q_UNUSED(filter)
+  ParagraphFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(textEdit->toHtml());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 2d2b148127..4e43bb26ea 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -367,18 +367,18 @@ void PhaseTypeSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter
     phaseTypes[i + 1] = static_cast<PhaseType::Type>(cb->itemData(cb->currentIndex(), Qt::UserRole).toUInt(&ok));
   }
 
-  var.setValue(phaseTypes);
-  ok = false;
-
-  // Set the value into the Filter
-  ok = filter->setProperty(m_FilterParameter->getPhaseTypeDataProperty().toLatin1().constData(), var);
-  if(!ok)
+  Q_UNUSED(filter)
+  PhaseTypeSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(phaseTypes);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
 
   DataArrayPath path = m_SelectedAttributeMatrixPath->getDataArrayPath();
-
   var.setValue(path);
   ok = false;
   // Set the value into the Filter
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index 08ff321094..c0724a6543 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -89,6 +89,7 @@ void PreflightUpdatedValueWidget::setupGui()
 // -----------------------------------------------------------------------------
 void PreflightUpdatedValueWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index 23767d1ef1..dc4bae1e36 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -126,11 +126,13 @@ void RangeWidget::filterNeedsInputParameters(AbstractFilter* filter)
   pair.first = minValue->text().toDouble();
   pair.second = maxValue->text().toDouble();
 
-  QVariant var;
-  var.setValue(pair);
-  QString propertyName = PROPERTY_NAME_AS_CHAR;
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  RangeFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(pair);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 1e074895ce..dec6e0a0fe 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ReadASCIIDataWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index 8134280a96..6a6fcbe6d0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -98,7 +98,6 @@ void ScalarTypeWidget::widgetChanged(int index)
 // -----------------------------------------------------------------------------
 void ScalarTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = true;
   int defValue = getFilterParameter()->getDefaultValue().toInt();
   int i = defValue;
 
@@ -117,12 +116,13 @@ void ScalarTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
     errorLabel->hide();
   }
 
-  SIMPL::ScalarTypes::Type type = static_cast<SIMPL::ScalarTypes::Type>(i);
-  QVariant v;
-  v.setValue(type);
-
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  ScalarTypeFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(static_cast<SIMPL::ScalarTypes::Type>(i));
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index 9912185671..424949a8cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -143,10 +143,13 @@ void SecondOrderPolynomialWidget::filterNeedsInputParameters(AbstractFilter* fil
   FOPW_EXTRACT_VALUE(c01)
   FOPW_EXTRACT_VALUE(c00)
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  SecondOrderPolynomialFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index 27fb51c9e8..f64a49d8f6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -295,12 +295,13 @@ void ShapeTypeSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter
     shapeTypes[i + 1] = sType;
   }
 
-  QVariant var;
-  var.setValue(shapeTypes);
-  ok = false;
-  // Set the value into the Filter
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, var);
-  if(!ok)
+  Q_UNUSED(filter)
+  ShapeTypeSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(shapeTypes);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index 4070a9321e..712a5b1702 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -107,8 +107,13 @@ void StringWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void StringWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, stringEdit->getText());
-  if(!ok)
+  Q_UNUSED(filter)
+  StringFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(stringEdit->getText());
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index cc8e3704ce..378cbf9eec 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -151,10 +151,13 @@ void ThirdOrderPolynomialWidget::filterNeedsInputParameters(AbstractFilter* filt
   FOPW_EXTRACT_VALUE(c01)
   FOPW_EXTRACT_VALUE(c00)
 
-  QVariant v;
-  v.setValue(data);
-  ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, v);
-  if(!ok)
+  Q_UNUSED(filter)
+  ThirdOrderPolynomialFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(data);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 9f27657b9d..9ad5e59a32 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -100,9 +100,11 @@ void UInt64Widget::widgetChanged(const QString& text)
 // -----------------------------------------------------------------------------
 void UInt64Widget::filterNeedsInputParameters(AbstractFilter* filter)
 {
+  Q_UNUSED(filter)
+
   bool ok = true;
   int defValue = getFilterParameter()->getDefaultValue().toInt();
-  uint64_t i = defValue;
+  uint64_t i = static_cast<uint64_t>(defValue);
 
   // Next make sure there is something in the
   if(!value->text().isEmpty())
@@ -115,7 +117,7 @@ void UInt64Widget::filterNeedsInputParameters(AbstractFilter* filter)
       SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
       errorLabel->setText("Value entered is beyond the representable range for a 64 bit integer. The filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
       errorLabel->show();
-      i = defValue;
+      i = static_cast<uint64_t>(defValue);
     }
     else
     {
@@ -136,6 +138,10 @@ void UInt64Widget::filterNeedsInputParameters(AbstractFilter* filter)
   {
     setter(i);
   }
+  else
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
 }
 
 // -----------------------------------------------------------------------------

From f76e6665128b10034d54495d22772f2501b54327 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 7 Jan 2020 07:38:47 -0500
Subject: [PATCH 176/397] Use explicit Instantiated Templates for DataArray<>
 (#387)

Explicitly instantiating each variation of DataArray<T>

This should cut down on compile times (somewhat).
Add MarkDown as supported InfoStringFormat for DataArray<>
Fixing some typos in the Float Comparison Macros

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Resources/UnitTestSupport.hpp                 |    4 +-
 .../CoreFilters/DataContainerReader.cpp       |   11 +-
 .../CoreFilters/DataContainerWriter.cpp       |   11 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |    1 +
 .../CoreFilters/RotateSampleRefFrame.cpp      |    6 +-
 Source/SIMPLib/DataArrays/DataArray.cpp       | 1661 +++++++++++++++++
 Source/SIMPLib/DataArrays/DataArray.hpp       | 1426 ++------------
 Source/SIMPLib/DataArrays/SourceList.cmake    |    1 +
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |   11 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |    9 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |   17 +-
 .../DataContainers/DataContainerBundle.cpp    |    6 +-
 .../Filtering/ThresholdFilterHelper.cpp       |   91 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |   48 +-
 .../itkInPlaceImageToDream3DDataFilter.hxx    |  179 +-
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   11 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |    8 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |   16 +-
 .../ImportHDF5DatasetWidget.cpp               |    5 +-
 19 files changed, 2007 insertions(+), 1515 deletions(-)
 create mode 100755 Source/SIMPLib/DataArrays/DataArray.cpp

diff --git a/Resources/UnitTestSupport.hpp b/Resources/UnitTestSupport.hpp
index 44022760a3..495d497d56 100755
--- a/Resources/UnitTestSupport.hpp
+++ b/Resources/UnitTestSupport.hpp
@@ -428,8 +428,8 @@ bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
     QString buf;                                                                                                                                                                                       \
     QTextStream ss(&buf);                                                                                                                                                                              \
     ss << "Your test required the following\n            '";                                                                                                                                           \
-    ss << "AlmostEqualUlpsFinal(" << #L << ", " << #R << ", " << #Ulps << "'\n             but this condition was not met with MaxUlps=" << Ulps << "\n";                                              \
-    ss << "             " << L << "==" << R;                                                                                                                                                           \
+    ss << "AlmostEqualUlpsFinal(" << #L << ", " << #R << ", " << #Ulps << ")'\n             but this condition was not met with MaxUlps=" << Ulps << "\n";                                              \
+    ss << "             " << *L << "==" << *R;                                                                                                                                                           \
     DREAM3D_TEST_THROW_EXCEPTION(buf.toStdString())                                                                                                                                                    \
   }
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 37d3f3d3bd..7b7304cad1 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -32,22 +32,19 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "DataContainerReader.h"
 
 #include <memory>
 
-#include "DataContainerReader.h"
-
 #include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Utilities.h"
-
-#include <QtCore/QTextStream>
-
-#include <QtCore/QDebug>
+#include "H5Support/QH5Lite.h"
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 4172e78225..d267792954 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -32,23 +32,20 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "DataContainerWriter.h"
 
 #include <memory>
 
-#include "DataContainerWriter.h"
-
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
-
-#include <QtCore/QTextStream>
-
-#include <QtCore/QDebug>
+#include "H5Support/QH5Lite.h"
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 5c4d4507c9..689cad740f 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -41,6 +41,7 @@
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Utilities.h"
+#include "H5Support/QH5Lite.h"
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 2018ff3677..d982613851 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -159,7 +159,7 @@ RotateArgs createRotateParams(const ImageGeom& imageGeom, const Matrix3fR& rotat
 {
   const SizeVec3Type origDims = imageGeom.getDimensions();
   const FloatVec3Type spacing = imageGeom.getSpacing();
-  const FloatVec3Type origin = imageGeom.getOrigin();
+  //const FloatVec3Type origin = imageGeom.getOrigin();
 
   float xMin = std::numeric_limits<float>::max();
   float xMax = std::numeric_limits<float>::min();
@@ -323,8 +323,8 @@ struct RotateSampleRefFrame::Impl
 //
 // -----------------------------------------------------------------------------
 RotateSampleRefFrame::RotateSampleRefFrame()
-: m_CellAttributeMatrixPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "")
-, p_Impl(std::make_unique<Impl>())
+: p_Impl(std::make_unique<Impl>())
+, m_CellAttributeMatrixPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "")
 {
   std::vector<std::vector<double>> defaultTable{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
   m_RotationTable.setTableData(defaultTable);
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
new file mode 100755
index 0000000000..a899c3d15d
--- /dev/null
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -0,0 +1,1661 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataArray.hpp"
+
+#include <string>
+#include <cstring>
+#include <functional>
+#include <iostream>
+#include <numeric>
+
+#include "SIMPLib/HDF5/H5DataArrayReader.h"
+#include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
+
+#define DA_BYTE_SWAP(s, d, t)                                                                                                                                                                          \
+  t[0] = ptr[s];                                                                                                                                                                                       \
+  ptr[s] = ptr[d];                                                                                                                                                                                     \
+  ptr[d] = t[0];
+
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+template <typename T>
+QString DataArray<T>::getNameOfClass() const
+{
+  return QString("DataArray<T>");
+}
+
+template <typename T>
+QString DataArray<T>::ClassName()
+{
+  return QString("DataArray<T>");
+}
+
+template <typename T>
+int32_t DataArray<T>::getClassVersion() const
+{
+  return 2;
+}
+
+//========================================= Constructing DataArray Objects =================================
+template <typename T>
+DataArray<T>::DataArray() = default;
+
+/**
+ * @brief Constructor
+ * @param numTuples The number of Tuples in the DataArray
+ * @param name The name of the DataArray
+ * @param initValue The value to use when initializing each element of the array
+ */
+template <typename T>
+DataArray<T>::DataArray(size_t numTuples, const QString& name, T initValue)
+: IDataArray(name)
+, m_InitValue(initValue)
+{
+  resizeTuples(numTuples);
+}
+
+/**
+ * @brief DataArray
+ * @param numTuples The number of Tuples in the DataArray
+ * @param name The name of the DataArray
+ * @param compDims The number of elements in each axis dimension.
+ * @param initValue The value to use when initializing each element of the array
+ *
+ * For example if you have a 2D image dimensions of 80(w) x 60(h) then the "cdims" would be [80][60]
+ */
+template <typename T>
+DataArray<T>::DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue)
+: IDataArray(name)
+, m_NumTuples(numTuples)
+, m_CompDims(std::move(compDims))
+{
+  m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
+  m_InitValue = initValue;
+  m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
+}
+
+/**
+ * @brief Protected Constructor
+ * @param numTuples The number of Tuples in the DataArray
+ * @param name The name of the DataArray
+ * @param compDims The number of elements in each axis dimension.
+ * @param initValue The value to use when initializing each element of the array
+ * @param allocate Will all the memory be allocated at time of construction
+ */
+template <typename T>
+DataArray<T>::DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate)
+: IDataArray(name)
+, m_NumTuples(numTuples)
+, m_CompDims(std::move(compDims))
+{
+  m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
+  m_InitValue = initValue;
+  if(allocate)
+  {
+    resizeTuples(numTuples);
+  }
+  else
+  {
+    m_Size = m_NumTuples * m_NumComponents;
+    m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
+  }
+#if 0
+      MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
+#endif
+}
+
+template <typename T>
+DataArray<T>::~DataArray()
+{
+  clear();
+}
+
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  comp_dims_type cDims = {1};
+  auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
+  if(allocate)
+  {
+    if(d->allocate() < 0)
+    {
+      // Could not allocate enough memory, reset the pointer to null and return
+      delete d;
+      return DataArray<T>::NullPointer();
+    }
+  }
+  Pointer ptr(d);
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  comp_dims_type cDims(static_cast<size_t>(rank));
+  for(size_t i = 0; i < static_cast<size_t>(rank); i++)
+  {
+    cDims[i] = dims[i];
+  }
+  auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
+  if(allocate)
+  {
+    if(d->allocate() < 0)
+    {
+      // Could not allocate enough memory, reset the pointer to null and return
+      delete d;
+      return DataArray<T>::NullPointer();
+    }
+  }
+  Pointer ptr(d);
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
+  if(allocate)
+  {
+    if(d->allocate() < 0)
+    {
+      // Could not allocate enough memory, reset the pointer to null and return
+      delete d;
+      return DataArray<T>::NullPointer();
+    }
+  }
+  Pointer ptr(d);
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+
+  size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), static_cast<size_t>(1), std::multiplies<>());
+
+  auto d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
+  if(allocate)
+  {
+    if(d->allocate() < 0)
+    {
+      // Could not allocate enough memory, reset the pointer to null and return
+      delete d;
+      return DataArray<T>::NullPointer();
+    }
+  }
+  Pointer ptr(d);
+  return ptr;
+}
+
+template <typename T>
+IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const
+{
+  IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
+  return p;
+}
+
+template <typename T>
+IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) const
+{
+  IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
+  return p;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::FromQVector(QVector<T>& vec, const QString& name)
+{
+
+  Pointer p = CreateArray(static_cast<size_t>(vec.size()), name, true);
+  if(nullptr != p.get())
+  {
+    std::memcpy(p->getPointer(0), vec.data(), static_cast<size_t>(vec.size()) * sizeof(T));
+  }
+  return p;
+}
+
+// -----------------------------------------------------------------------------
+template <>
+typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(std::vector<bool>& vec, const QString& name)
+{
+  comp_dims_type cDims = {1};
+  Pointer p = CreateArray(vec.size(), cDims, name, true);
+  if(nullptr != p.get())
+  {
+    size_t i = 0;
+    for(const auto value : vec)
+    {
+      p->setValue(i, value);
+      i++;
+    }
+  }
+  return p;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::FromStdVector(std::vector<T>& vec, const QString& name)
+{
+  comp_dims_type cDims = {1};
+  Pointer p = CreateArray(vec.size(), cDims, name, true);
+  if(nullptr != p.get())
+  {
+    std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
+  }
+  return p;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CopyFromPointer(T* data, size_t size, const QString& name)
+{
+  Pointer p = CreateArray(size, name, true);
+  if(nullptr != p.get())
+  {
+    std::memcpy(p->getPointer(0), data, size * sizeof(T));
+  }
+  return p;
+}
+
+/**
+ * @brief WrapPointer Creates a DataArray<T> object that references the pointer. The original caller can
+ * set if the memory should be "free()'ed" when the object goes away. The original memory MUST have been
+ * "alloc()'ed" and <b>NOT</b> new 'ed.
+ * @param data
+ * @param numTuples
+ * @param cDims
+ * @param name
+ * @param ownsData
+ * @return
+ */
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
+{
+  // Allocate on the heap
+  auto d = new DataArray(numTuples, name, compDims, static_cast<T>(0), false);
+  // Wrap that heap pointer with a shared_pointer to make it reference counted
+  Pointer p(d);
+
+  p->m_Array = data;        // Now set the internal array to the raw pointer
+  p->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
+  if(nullptr != data)
+  {
+    p->m_IsAllocated = true;
+  }
+
+  return p;
+}
+
+//========================================= Begin API =================================
+template <typename T>
+IDataArray::Pointer DataArray<T>::deepCopy(bool forceNoAllocate) const
+{
+  bool allocate = m_IsAllocated;
+  if(forceNoAllocate)
+  {
+    allocate = false;
+  }
+  IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
+  if(m_IsAllocated && !forceNoAllocate)
+  {
+    T* src = getPointer(0);
+    void* dest = daCopy->getVoidPointer(0);
+    size_t totalBytes = (getNumberOfTuples() * static_cast<size_t>(getNumberOfComponents()) * sizeof(T));
+    std::memcpy(dest, src, totalBytes);
+  }
+  return daCopy;
+}
+
+/**
+ * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+ * can be a primitive like char, float, int or the name of a class.
+ * @return
+ */
+template <typename T>
+SIMPL::NumericTypes::Type DataArray<T>::getType() const
+{
+  T value = static_cast<T>(0x00);
+  if(typeid(value) == typeid(int8_t))
+  {
+    return SIMPL::NumericTypes::Type::Int8;
+  }
+  if(typeid(value) == typeid(uint8_t))
+  {
+    return SIMPL::NumericTypes::Type::UInt8;
+  }
+
+  if(typeid(value) == typeid(int16_t))
+  {
+    return SIMPL::NumericTypes::Type::Int16;
+  }
+  if(typeid(value) == typeid(uint16_t))
+  {
+    return SIMPL::NumericTypes::Type::UInt16;
+  }
+
+  if(typeid(value) == typeid(int32_t))
+  {
+    return SIMPL::NumericTypes::Type::Int32;
+  }
+  if(typeid(value) == typeid(uint32_t))
+  {
+    return SIMPL::NumericTypes::Type::UInt32;
+  }
+
+  if(typeid(value) == typeid(int64_t))
+  {
+    return SIMPL::NumericTypes::Type::Int64;
+  }
+  if(typeid(value) == typeid(uint64_t))
+  {
+    return SIMPL::NumericTypes::Type::UInt64;
+  }
+
+  if(typeid(value) == typeid(float))
+  {
+    return SIMPL::NumericTypes::Type::Float;
+  }
+  if(typeid(value) == typeid(double))
+  {
+    return SIMPL::NumericTypes::Type::Double;
+  }
+
+  if(typeid(value) == typeid(bool))
+  {
+    return SIMPL::NumericTypes::Type::Bool;
+  }
+
+  return SIMPL::NumericTypes::Type::UnknownNumType;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
+{
+  T value = static_cast<T>(0x00);
+  xdmfTypeName = "UNKNOWN";
+  precision = 0;
+  if(typeid(value) == typeid(int8_t))
+  {
+    xdmfTypeName = "Char";
+    precision = 1;
+  }
+  if(typeid(value) == typeid(uint8_t))
+  {
+    xdmfTypeName = "UChar";
+    precision = 1;
+  }
+
+  if(typeid(value) == typeid(int16_t))
+  {
+    xdmfTypeName = "Int";
+    precision = 2;
+  }
+  if(typeid(value) == typeid(uint16_t))
+  {
+    xdmfTypeName = "UInt";
+    precision = 2;
+  }
+
+  if(typeid(value) == typeid(int32_t))
+  {
+    xdmfTypeName = "Int";
+    precision = 4;
+  }
+  if(typeid(value) == typeid(uint32_t))
+  {
+    xdmfTypeName = "UInt";
+    precision = 4;
+  }
+
+  if(typeid(value) == typeid(int64_t))
+  {
+    xdmfTypeName = "Int";
+    precision = 8;
+  }
+  if(typeid(value) == typeid(uint64_t))
+  {
+    xdmfTypeName = "UInt";
+    precision = 8;
+  }
+
+  if(typeid(value) == typeid(float))
+  {
+    xdmfTypeName = "Float";
+    precision = 4;
+  }
+  if(typeid(value) == typeid(double))
+  {
+    xdmfTypeName = "Float";
+    precision = 8;
+  }
+
+  if(typeid(value) == typeid(bool))
+  {
+    xdmfTypeName = "uchar";
+    precision = 1;
+  }
+}
+// This line must be here, because we are overloading the copyData pure  function in IDataArray.
+// This is required so that other classes can call this version of copyData from the subclasses.
+// using IDataArray::copyFromArray;
+
+// -----------------------------------------------------------------------------
+template <typename T>
+bool DataArray<T>::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
+{
+  if(!m_IsAllocated)
+  {
+    return false;
+  }
+  if(nullptr == m_Array)
+  {
+    return false;
+  }
+  if(destTupleOffset > m_MaxId)
+  {
+    return false;
+  }
+  if(!sourceArray->isAllocated())
+  {
+    return false;
+  }
+  Self* source = dynamic_cast<Self*>(sourceArray.get());
+  if(nullptr == source->getPointer(0))
+  {
+    return false;
+  }
+
+  if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
+  {
+    return false;
+  }
+
+  if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
+  {
+    return false;
+  }
+
+  if(totalSrcTuples * static_cast<size_t>(sourceArray->getNumberOfComponents()) + destTupleOffset * static_cast<size_t>(getNumberOfComponents()) > m_Size)
+  {
+    return false;
+  }
+
+  size_t elementStart = destTupleOffset * static_cast<size_t>(getNumberOfComponents());
+  size_t totalBytes = (totalSrcTuples * static_cast<size_t>(sourceArray->getNumberOfComponents())) * sizeof(T);
+  std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * static_cast<size_t>(sourceArray->getNumberOfComponents())), totalBytes);
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+bool DataArray<T>::copyIntoArray(Pointer dest) const
+{
+  if(m_IsAllocated && dest->isAllocated() && m_Array && dest->getPointer(0))
+  {
+    size_t totalBytes = m_Size * sizeof(T);
+    std::memcpy(dest->getPointer(0), m_Array, totalBytes);
+    return true;
+  }
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+bool DataArray<T>::isAllocated() const
+{
+  return m_IsAllocated;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setInitValue(T initValue)
+{
+  m_InitValue = initValue;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::takeOwnership()
+{
+  m_OwnsData = true;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::releaseOwnership()
+{
+  m_OwnsData = false;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int32_t DataArray<T>::allocate()
+{
+  if((nullptr != m_Array) && (true == m_OwnsData))
+  {
+    deallocate();
+  }
+  m_Array = nullptr;
+  m_OwnsData = true;
+  m_IsAllocated = false;
+  if(m_Size == 0)
+  {
+    clear();
+    return 1;
+  }
+
+  size_t newSize = m_Size;
+  m_Array = new T[newSize]();
+  if(!m_Array)
+  {
+    qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+    return -1;
+  }
+  m_Size = newSize;
+  m_IsAllocated = true;
+
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::initializeWithZeros()
+{
+  if(!m_IsAllocated || nullptr == m_Array)
+  {
+    return;
+  }
+  size_t typeSize = sizeof(T);
+  ::memset(m_Array, 0, m_Size * typeSize);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::initializeWithValue(T initValue, size_t offset)
+{
+  if(!m_IsAllocated || nullptr == m_Array)
+  {
+    return;
+  }
+  for(size_t i = offset; i < m_Size; i++)
+  {
+    m_Array[i] = initValue;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int DataArray<T>::eraseTuples(comp_dims_type& idxs)
+{
+  int err = 0;
+
+  // If nothing is to be erased just return
+  if(idxs.empty())
+  {
+    return 0;
+  }
+  auto idxs_size = static_cast<size_t>(idxs.size());
+  if(idxs_size >= getNumberOfTuples())
+  {
+    resizeTuples(0);
+    return 0;
+  }
+
+  // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
+  // off the end of the array and return an error code.
+  for(size_t& idx : idxs)
+  {
+    if(idx * m_NumComponents > m_MaxId)
+    {
+      return -100;
+    }
+  }
+
+  // Calculate the new size of the array to copy into
+  size_t newSize = (getNumberOfTuples() - idxs.size()) * m_NumComponents;
+
+  // Create a new m_Array to copy into
+  T* newArray = new T[newSize]();
+
+  // Splat AB across the array so we know if we are copying the values or not
+  ::memset(newArray, 0xAB, newSize * sizeof(T));
+
+  // Keep the current Destination Pointer
+  T* currentDest = newArray;
+  size_t j = 0;
+  size_t k = 0;
+  // Find the first chunk to copy by walking the idxs array until we get an
+  // index that is NOT a continuous increment from the start
+  for(k = 0; k < idxs.size(); ++k)
+  {
+    if(j == idxs[k])
+    {
+      ++j;
+    }
+    else
+    {
+      break;
+    }
+  }
+
+  if(k == idxs.size()) // Only front elements are being dropped
+  {
+    T* currentSrc = m_Array + (j * m_NumComponents);
+    std::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * m_NumComponents * sizeof(T));
+    deallocate(); // We are done copying - delete the current m_Array
+    m_Size = newSize;
+    m_Array = newArray;
+    m_OwnsData = true;
+    m_MaxId = newSize - 1;
+    m_IsAllocated = true;
+    return 0;
+  }
+
+  comp_dims_type srcIdx(idxs.size() + 1);
+  comp_dims_type destIdx(idxs.size() + 1);
+  comp_dims_type copyElements(idxs.size() + 1);
+  srcIdx[0] = 0;
+  destIdx[0] = 0;
+  copyElements[0] = (idxs[0] - 0) * m_NumComponents;
+
+  for(size_t i = 1; i < srcIdx.size(); ++i)
+  {
+    srcIdx[i] = (idxs[i - 1] + 1) * m_NumComponents;
+
+    if(i < srcIdx.size() - 1)
+    {
+      copyElements[i] = (idxs[i] - idxs[i - 1] - 1) * m_NumComponents;
+    }
+    else
+    {
+      copyElements[i] = (getNumberOfTuples() - idxs[i - 1] - 1) * m_NumComponents;
+    }
+    destIdx[i] = copyElements[i - 1] + destIdx[i - 1];
+  }
+
+  // Copy the data
+  for(size_t i = 0; i < srcIdx.size(); ++i)
+  {
+    currentDest = newArray + destIdx[i];
+    T* currentSrc = m_Array + srcIdx[i];
+    size_t bytes = copyElements[i] * sizeof(T);
+    std::memcpy(currentDest, currentSrc, bytes);
+  }
+
+  // We are done copying - delete the current m_Array
+  deallocate();
+
+  // Allocation was successful.  Save it.
+  m_Size = newSize;
+  m_Array = newArray;
+  // This object has now allocated its memory and owns it.
+  m_OwnsData = true;
+  m_IsAllocated = true;
+  m_MaxId = newSize - 1;
+
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int DataArray<T>::copyTuple(size_t currentPos, size_t newPos)
+{
+  size_t max = ((m_MaxId + 1) / m_NumComponents);
+  if(currentPos >= max || newPos >= max)
+  {
+    return -1;
+  }
+  T* src = m_Array + (currentPos * m_NumComponents);
+  T* dest = m_Array + (newPos * m_NumComponents);
+  size_t bytes = sizeof(T) * m_NumComponents;
+  std::memcpy(dest, src, bytes);
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t DataArray<T>::getTypeSize() const
+{
+  return sizeof(T);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t DataArray<T>::getNumberOfTuples() const
+{
+  return m_NumTuples;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t DataArray<T>::getSize() const
+{
+  return m_Size;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::comp_dims_type DataArray<T>::getComponentDimensions() const
+{
+  return m_CompDims;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int32_t DataArray<T>::getNumberOfComponents() const
+{
+  return static_cast<int32_t>(m_NumComponents);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void* DataArray<T>::getVoidPointer(size_t i)
+{
+  if(i >= m_Size)
+  {
+    return nullptr;
+  }
+
+  return reinterpret_cast<void*>(&(m_Array[i]));
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+std::list<T> DataArray<T>::getArray() const
+{
+  return std::list<T>(m_Array, m_Array + (m_Size * sizeof(T)) / sizeof(T));
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setArray(std::list<T> newArray)
+{
+  if(newArray.size() != m_Size)
+  {
+    return;
+  }
+  int i = 0;
+  for(auto elem : newArray)
+  {
+    m_Array[i++] = elem;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T* DataArray<T>::getPointer(size_t i) const
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i < m_Size);
+  }
+#endif
+  return m_Array + i;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T DataArray<T>::getValue(size_t i) const
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i < m_Size);
+  }
+#endif
+  return m_Array[i];
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setValue(size_t i, T value)
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i < m_Size);
+  }
+#endif
+  m_Array[i] = value;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T DataArray<T>::getComponent(size_t i, int32_t j) const
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i * m_NumComponents + static_cast<size_t>(j) < m_Size);
+  }
+#endif
+  return m_Array[i * m_NumComponents + static_cast<size_t>(j)];
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setComponent(size_t i, int32_t j, T c)
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i * m_NumComponents + static_cast<size_t>(j) < m_Size);
+  }
+#endif
+  m_Array[i * m_NumComponents + static_cast<size_t>(j)] = c;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setTuple(size_t tupleIndex, T* data)
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
+  }
+#endif
+  std::memcpy(getTuplePointer(tupleIndex), data, m_NumComponents * sizeof(T));
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::setTuple(size_t tupleIndex, const std::vector<T>& data)
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
+  }
+#endif
+  std::memcpy(getTuplePointer(tupleIndex), data.data(), m_NumComponents * sizeof(T));
+}
+// -----------------------------------------------------------------------------
+template <>
+void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data)
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
+  }
+#endif
+  bool* ptr = getTuplePointer(tupleIndex);
+  size_t i = 0;
+  for(const auto value : data)
+  {
+    ptr[i] = value;
+    i++;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::initializeTuple(size_t i, void* p)
+{
+  if(!m_IsAllocated)
+  {
+    return;
+  }
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(i * m_NumComponents < m_Size);
+  }
+#endif
+  if(nullptr == p)
+  {
+    return;
+  }
+  T* c = reinterpret_cast<T*>(p);
+  for(size_t j = 0; j < m_NumComponents; ++j)
+  {
+    m_Array[i * m_NumComponents + j] = *c;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T* DataArray<T>::getTuplePointer(size_t tupleIndex) const
+{
+#ifndef NDEBUG
+  if(m_Size > 0)
+  {
+    Q_ASSERT(tupleIndex * m_NumComponents < m_Size);
+  }
+#endif
+  return m_Array + (tupleIndex * m_NumComponents);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::resizeTuples(size_t numTuples)
+{
+  T* ptr = resizeAndExtend(numTuples * m_NumComponents);
+  if(nullptr != ptr)
+  {
+    m_NumTuples = numTuples;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
+{
+  int precision = out.realNumberPrecision();
+  T value = static_cast<T>(0x00);
+  if(typeid(value) == typeid(float))
+  {
+    out.setRealNumberPrecision(8);
+  }
+  if(typeid(value) == typeid(double))
+  {
+    out.setRealNumberPrecision(16);
+  }
+
+  for(size_t j = 0; j < m_NumComponents; ++j)
+  {
+    if(j != 0)
+    {
+      out << delimiter;
+    }
+    out << m_Array[i * m_NumComponents + j];
+  }
+  out.setRealNumberPrecision(precision);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::printComponent(QTextStream& out, size_t i, int32_t j) const
+{
+  out << m_Array[i * m_NumComponents + static_cast<size_t>(j)];
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString DataArray<T>::getFullNameOfClass() const
+{
+  QString theType = getTypeAsString();
+  theType = "DataArray<" + theType + ">";
+  return theType;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString DataArray<T>::getTypeAsString() const
+{
+  T value = static_cast<T>(0);
+  if(typeid(value) == typeid(float))
+  {
+    return "float";
+  }
+  if(typeid(value) == typeid(double))
+  {
+    return "double";
+  }
+
+  if(typeid(value) == typeid(int8_t))
+  {
+    return "int8_t";
+  }
+  if(typeid(value) == typeid(uint8_t))
+  {
+    return "uint8_t";
+  }
+#if CMP_TYPE_CHAR_IS_SIGNED
+  if(typeid(value) == typeid(char))
+  {
+    return "int8_t";
+  }
+#else
+  if(typeid(value) == typeid(char))
+  {
+    return "int8_t";
+  }
+#endif
+  if(typeid(value) == typeid(signed char))
+  {
+    return "int8_t";
+  }
+  if(typeid(value) == typeid(unsigned char))
+  {
+    return "uint8_t";
+  }
+
+  if(typeid(value) == typeid(int16_t))
+  {
+    return "int16_t";
+  }
+  if(typeid(value) == typeid(short))
+  {
+    return "int16_t";
+  }
+  if(typeid(value) == typeid(signed short))
+  {
+    return "int16_t";
+  }
+  if(typeid(value) == typeid(uint16_t))
+  {
+    return "uint16_t";
+  }
+  if(typeid(value) == typeid(unsigned short))
+  {
+    return "uint16_t";
+  }
+
+  if(typeid(value) == typeid(int32_t))
+  {
+    return "int32_t";
+  }
+  if(typeid(value) == typeid(uint32_t))
+  {
+    return "uint32_t";
+  }
+#if(CMP_SIZEOF_INT == 4)
+  if(typeid(value) == typeid(int))
+  {
+    return "int32_t";
+  }
+  if(typeid(value) == typeid(signed int))
+  {
+    return "int32_t";
+  }
+  if(typeid(value) == typeid(unsigned int))
+  {
+    return "uint32_t";
+  }
+#endif
+
+  if(typeid(value) == typeid(int64_t))
+  {
+    return "int64_t";
+  }
+  if(typeid(value) == typeid(uint64_t))
+  {
+    return "uint64_t";
+  }
+
+#if(CMP_SIZEOF_LONG == 4)
+  if(typeid(value) == typeid(long int))
+  {
+    return "long int";
+  }
+  if(typeid(value) == typeid(signed long int))
+  {
+    return "signed long int";
+  }
+  if(typeid(value) == typeid(unsigned long int))
+  {
+    return "unsigned long int";
+  }
+#elif(CMP_SIZEOF_LONG == 8)
+  if(typeid(value) == typeid(long int))
+  {
+    return "int64_t";
+  }
+  if(typeid(value) == typeid(signed long int))
+  {
+    return "int64_t";
+  }
+  if(typeid(value) == typeid(unsigned long int))
+  {
+    return "uint64_t";
+  }
+#endif
+
+#if(CMP_SIZEOF_LONG_LONG == 8)
+  if(typeid(value) == typeid(long long int))
+  {
+    return "int64_t";
+  }
+  if(typeid(value) == typeid(signed long long int))
+  {
+    return "int64_t";
+  }
+  if(typeid(value) == typeid(unsigned long long int))
+  {
+    return "uint64_t";
+  }
+#endif
+
+  if(typeid(value) == typeid(bool))
+  {
+    return "bool";
+  }
+
+  // qDebug()  << "Error: HDFTypeForPrimitive - Unknown Type: " << (typeid(value).name()) ;
+  const char* name = typeid(value).name();
+  if(nullptr != name && name[0] == 'l')
+  {
+    qDebug() << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t.";
+  }
+  return "UnknownType";
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int DataArray<T>::writeH5Data(hid_t parentId, comp_dims_type tDims) const
+{
+  if(m_Array == nullptr)
+  {
+    return -85648;
+  }
+  return H5DataArrayWriter::writeDataArray<Self>(parentId, this, tDims);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int DataArray<T>::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const
+{
+  if(m_Array == nullptr)
+  {
+    return -85648;
+  }
+  QString dimStr;
+  int precision = 0;
+  QString xdmfTypeName;
+  getXdmfTypeAndSize(xdmfTypeName, precision);
+  if(0 == precision)
+  {
+    out << "<!-- " << getName() << " has unknown type or unsupported type or precision for XDMF to understand"
+        << " -->"
+        << "\n";
+    return -100;
+  }
+
+  int numComp = getNumberOfComponents();
+  out << "    <Attribute Name=\"" << getName() << label << "\" ";
+  if(numComp == 1)
+  {
+    out << "AttributeType=\"Scalar\" ";
+    dimStr = QString("%1 %2 %3 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]);
+  }
+  else if(numComp == 6)
+  {
+    out << "AttributeType=\"Tensor6\" ";
+    dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
+  }
+  else if(numComp == 9)
+  {
+    out << "AttributeType=\"Tensor\" ";
+    dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
+  }
+  else
+  {
+    out << "AttributeType=\"Vector\" ";
+    dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
+  }
+  out << "Center=\"Cell\">\n";
+  // Open the <DataItem> Tag
+  out << R"(      <DataItem Format="HDF" Dimensions=")" << dimStr << R"(" )";
+  out << "NumberType=\"" << xdmfTypeName << "\" "
+      << "Precision=\"" << precision << "\" >\n";
+
+  out << "        " << hdfFileName << groupPath << "/" << getName() << "\n";
+  out << "      </DataItem>"
+      << "\n";
+  out << "    </Attribute>"
+      << "\n";
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
+{
+
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  QString info;
+  QTextStream ss(&info);
+  if(format == SIMPL::HtmlFormat)
+  {
+    ss << "<html><head></head>\n";
+    ss << "<body>\n";
+    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
+    ss << "<tbody>\n";
+    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
+
+    ss << R"(<tr bgcolor="#E9E7D6"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
+
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type:</th><td> DataArray&lt;)" << getTypeAsString() << "&gt;</td></tr>";
+    QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Tuples:</th><td>)" << numStr << "</td></tr>";
+
+    QString compDimStr = "(";
+    for(size_t i = 0; i < m_CompDims.size(); i++)
+    {
+      compDimStr = compDimStr + QString::number(m_CompDims[i]);
+      if(i < m_CompDims.size() - 1)
+      {
+        compDimStr = compDimStr + QString(", ");
+      }
+    }
+    compDimStr = compDimStr + ")";
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Component Dimensions:</th><td>)" << compDimStr << "</td></tr>";
+    numStr = usa.toString(static_cast<qlonglong>(m_Size));
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Total Elements:</th><td>)" << numStr << "</td></tr>";
+    numStr = usa.toString(static_cast<qlonglong>(m_Size * sizeof(T)));
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Total Memory Required:</th><td>)" << numStr << "</td></tr>";
+    ss << "</tbody></table>\n";
+    ss << "</body></html>";
+  }
+  else if(format == SIMPL::MarkDown)
+  {
+    ss << "+ Name: " << getName() << "\n";
+    ss << "+ Type: " << getTypeAsString() << "\n";
+    ss << "+ Num. Tuple: " << getNumberOfTuples() << "\n";
+    QString compDimStr = "(";
+    for(size_t i = 0; i < m_CompDims.size(); i++)
+    {
+      compDimStr = compDimStr + QString::number(m_CompDims[i]);
+      if(i < m_CompDims.size() - 1)
+      {
+        compDimStr = compDimStr + QString(", ");
+      }
+    }
+    compDimStr = compDimStr + ")";
+    ss << "+ Comp. Dims: " << compDimStr << "\n";
+    ss << "+ Total Elements:  " << m_Size << "\n";
+    ss << "+ Total Memory: " << (m_Size * sizeof(T)) << "\n";
+  }
+  return info;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int DataArray<T>::readH5Data(hid_t parentId)
+{
+  int err = 0;
+
+  resizeTuples(0);
+  IDataArray::Pointer p = H5DataArrayReader::ReadIDataArray(parentId, getName());
+  if(p.get() == nullptr)
+  {
+    return -1;
+  }
+  m_Array = reinterpret_cast<T*>(p->getVoidPointer(0));
+  m_Size = p->getSize();
+  m_OwnsData = true;
+  m_MaxId = (m_Size == 0) ? 0 : m_Size - 1;
+  m_IsAllocated = true;
+  setName(p->getName());
+  m_NumTuples = p->getNumberOfTuples();
+  m_CompDims = p->getComponentDimensions();
+  m_NumComponents = static_cast<size_t>(p->getNumberOfComponents());
+
+  // Tell the intermediate DataArray to release ownership of the data as we are going to be responsible
+  // for deleting the memory
+  p->releaseOwnership();
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::byteSwapElements()
+{
+  char* ptr = reinterpret_cast<char*>(m_Array);
+  char t[8];
+  size_t size = getTypeSize();
+  for(uint64_t var = 0; var < m_Size; ++var)
+  {
+    if(sizeof(T) == 2)
+    {
+      DA_BYTE_SWAP(0, 1, t)
+    }
+    else if(sizeof(T) == 4)
+    {
+      DA_BYTE_SWAP(0, 3, t) DA_BYTE_SWAP(1, 2, t)
+    }
+    else if(sizeof(T) == 8)
+    {
+      DA_BYTE_SWAP(0, 7, t) DA_BYTE_SWAP(1, 6, t) DA_BYTE_SWAP(2, 5, t) DA_BYTE_SWAP(3, 4, t)
+    }
+    ptr += size; // increment the pointer
+  }
+}
+
+template <typename T>
+typename DataArray<T>::iterator DataArray<T>::begin()
+{
+  return iterator(m_Array);
+}
+
+template <typename T>
+typename DataArray<T>::iterator DataArray<T>::end()
+{
+  return iterator(m_Array + m_Size);
+}
+
+template <typename T>
+typename DataArray<T>::const_iterator DataArray<T>::begin() const
+{
+  return const_iterator(m_Array);
+}
+template <typename T>
+typename DataArray<T>::const_iterator DataArray<T>::end() const
+{
+  return const_iterator(m_Array + m_Size);
+}
+
+// rbegin
+// rend
+// cbegin
+// cend
+// crbegin
+// crend
+
+// ######### Capacity #########
+template <typename T>
+typename DataArray<T>::size_type DataArray<T>::size() const
+{
+  return m_Size;
+}
+template <typename T>
+typename DataArray<T>::size_type DataArray<T>::max_size() const
+{
+  return m_Size;
+}
+//  void resize(size_type n)
+//  {
+//    resizeAndExtend(n);
+//  }
+// void resize (size_type n, const value_type& val);
+template <typename T>
+typename DataArray<T>::size_type DataArray<T>::capacity() const noexcept
+{
+  return m_Size;
+}
+
+template <typename T>
+bool DataArray<T>::empty() const noexcept
+{
+  return (m_Size == 0);
+}
+// reserve()
+// shrink_to_fit()
+
+// ######### Element Access #########
+
+// ######### Modifiers #########
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::assign(size_type n, const value_type& val) // fill (2)
+{
+  resizeAndExtend(n);
+  for(size_t i = 0; i < n; i++)
+  {
+    m_Array[i] = val;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::assign(std::initializer_list<value_type> il) //  initializer list (3)
+{
+  assign(il.begin(), il.end());
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::push_back(const value_type& val)
+{
+  resizeAndExtend(m_Size + 1);
+  m_Array[m_MaxId] = val;
+}
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::push_back(value_type&& val)
+{
+  resizeAndExtend(m_Size + 1);
+  m_Array[m_MaxId] = val;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::pop_back()
+{
+  resizeAndExtend(m_Size - 1);
+}
+// insert
+// iterator erase (const_iterator position)
+// iterator erase (const_iterator first, const_iterator last);
+// swap
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::clear()
+{
+  if(nullptr != m_Array && m_OwnsData)
+  {
+    deallocate();
+  }
+  m_Array = nullptr;
+  m_Size = 0;
+  m_OwnsData = true;
+  m_MaxId = 0;
+  m_IsAllocated = false;
+  m_NumTuples = 0;
+}
+// emplace
+// emplace_back
+
+// =================================== END STL COMPATIBLE INTERFACe ===================================================
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::deallocate()
+{
+  // We are going to splat 0xABABAB across the first value of the array as a debugging aid
+  auto cptr = reinterpret_cast<unsigned char*>(m_Array);
+  if(nullptr != cptr)
+  {
+    if(m_Size > 0)
+    {
+      if(sizeof(T) >= 1)
+      {
+        cptr[0] = 0xAB;
+      }
+      if(sizeof(T) >= 2)
+      {
+        cptr[1] = 0xAB;
+      }
+      if(sizeof(T) >= 4)
+      {
+        cptr[2] = 0xAB;
+        cptr[3] = 0xAB;
+      }
+      if(sizeof(T) >= 8)
+      {
+        cptr[4] = 0xAB;
+        cptr[5] = 0xAB;
+        cptr[6] = 0xAB;
+        cptr[7] = 0xAB;
+      }
+    }
+  }
+#if 0
+      if (MUD_FLAP_0 != 0xABABABABABABABABul
+          || MUD_FLAP_1 != 0xABABABABABABABABul
+          || MUD_FLAP_2 != 0xABABABABABABABABul
+          || MUD_FLAP_3 != 0xABABABABABABABABul
+          || MUD_FLAP_4 != 0xABABABABABABABABul
+          || MUD_FLAP_5 != 0xABABABABABABABABul)
+      {
+        Q_ASSERT(false);
+      }
+#endif
+  delete[](m_Array);
+
+  m_Array = nullptr;
+  m_IsAllocated = false;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int32_t DataArray<T>::resizeTotalElements(size_t size)
+{
+  // std::cout << "DataArray::resizeTotalElements(" << size << ")" << std::endl;
+  if(size == 0)
+  {
+    clear();
+    return 1;
+  }
+  T* ptr = resizeAndExtend(size);
+  if(nullptr != ptr)
+  {
+    return 1;
+  }
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T* DataArray<T>::resizeAndExtend(size_t size)
+{
+  T* newArray = nullptr;
+  size_t newSize = 0;
+  size_t oldSize = 0;
+
+  if(size == m_Size) // Requested size is equal to current size.  Do nothing.
+  {
+    return m_Array;
+  }
+  newSize = size;
+  oldSize = m_Size;
+
+  // Wipe out the array completely if new size is zero.
+  if(newSize == 0)
+  {
+    clear();
+    return m_Array;
+  }
+
+  newArray = new T[newSize]();
+  if(!newArray)
+  {
+    qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+    return nullptr;
+  }
+
+  // Copy the data from the old array.
+  if(m_Array != nullptr)
+  {
+    std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
+  }
+
+  // Allocate a new array if we DO NOT own the current array
+  if((nullptr != m_Array) && m_OwnsData)
+  {
+    // Free the old array
+    deallocate();
+  }
+
+  // Allocation was successful.  Save it.
+  m_Size = newSize;
+  m_Array = newArray;
+
+  // This object has now allocated its memory and owns it.
+  m_OwnsData = true;
+
+  m_MaxId = newSize - 1;
+  m_IsAllocated = true;
+
+  // Initialize the new tuples if newSize is larger than old size
+  if(newSize > oldSize)
+  {
+    initializeWithValue(m_InitValue, oldSize);
+  }
+
+  return m_Array;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+#if !defined(__APPLE__) && !defined(_MSC_VER)
+#undef SIMPLib_EXPORT
+#define SIMPLib_EXPORT
+#endif
+
+template class SIMPLib_EXPORT DataArray<bool>;
+
+template class SIMPLib_EXPORT DataArray<char>;
+
+template class SIMPLib_EXPORT DataArray<int8_t>;
+template class SIMPLib_EXPORT DataArray<uint8_t>;
+
+template class SIMPLib_EXPORT DataArray<int16_t>;
+template class SIMPLib_EXPORT DataArray<uint16_t>;
+
+template class SIMPLib_EXPORT DataArray<int32_t>;
+template class SIMPLib_EXPORT DataArray<uint32_t>;
+
+template class SIMPLib_EXPORT DataArray<int64_t>;
+template class SIMPLib_EXPORT DataArray<uint64_t>;
+
+template class SIMPLib_EXPORT DataArray<float>;
+template class SIMPLib_EXPORT DataArray<double>;
+
+#if defined(__APPLE__) || defined(_MSC_VER)
+template class SIMPLib_EXPORT DataArray<size_t>;
+#endif
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 4d9a7cb961..0ad3af5c11 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -35,27 +35,20 @@
 
 #pragma once
 
+#include <hdf5.h>
+
 // STL Includes
 #include <cassert>
-#include <cstring>
-#include <functional>
-#include <iostream>
-#include <numeric>
-#include <string>
 #include <vector>
+#include <iterator>
+#include <memory>
 
+#include <QtCore/QString>
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
-#include "SIMPLib/HDF5/H5DataArrayReader.h"
-#include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
-
-#define mxa_bswap(s, d, t)                                                                                                                                                                             \
-  t[0] = ptr[s];                                                                                                                                                                                       \
-  ptr[s] = ptr[d];                                                                                                                                                                                     \
-  ptr[d] = t[0];
 
 /**
  * @class DataArray
@@ -71,34 +64,23 @@ class DataArray : public IDataArray
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  static Pointer NullPointer()
-  {
-    return Pointer(static_cast<Self*>(nullptr));
-  }
+
+  static Pointer NullPointer();
 
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
-  QString getNameOfClass() const override
-  {
-    return QString("DataArray<T>");
-  }
+  QString getNameOfClass() const override;
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
-  static QString ClassName()
-  {
-    return QString("DataArray<T>");
-  }
+  static QString ClassName();
 
   /**
    * @brief Returns the version of this class.
    * @return
    */
-  int32_t getClassVersion() const override
-  {
-    return 2;
-  }
+  int32_t getClassVersion() const override;
 
   DataArray(const DataArray&) = default;           // Copy Constructor default Implemented
   DataArray(DataArray&&) = delete;                 // Move Constructor Not Implemented
@@ -118,7 +100,7 @@ class DataArray : public IDataArray
   using ContainterType = std::vector<Pointer>;
 
   //========================================= Constructing DataArray Objects =================================
-  DataArray() = default;
+  DataArray();
 
   /**
    * @brief Constructor
@@ -126,13 +108,7 @@ class DataArray : public IDataArray
    * @param name The name of the DataArray
    * @param initValue The value to use when initializing each element of the array
    */
-  DataArray(size_t numTuples, const QString& name, T initValue)
-  : IDataArray(name)
-  , m_InitValue(initValue)
-  {
-    resizeTuples(numTuples);
-  }
-
+  DataArray(size_t numTuples, const QString& name, T initValue);
   /**
    * @brief DataArray
    * @param numTuples The number of Tuples in the DataArray
@@ -142,15 +118,7 @@ class DataArray : public IDataArray
    *
    * For example if you have a 2D image dimensions of 80(w) x 60(h) then the "cdims" would be [80][60]
    */
-  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue)
-  : IDataArray(name)
-  , m_NumTuples(numTuples)
-  , m_CompDims(std::move(compDims))
-  {
-    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
-    m_InitValue = initValue;
-    m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
-  }
+  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue);
 
   /**
    * @brief Protected Constructor
@@ -160,31 +128,9 @@ class DataArray : public IDataArray
    * @param initValue The value to use when initializing each element of the array
    * @param allocate Will all the memory be allocated at time of construction
    */
-  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate)
-  : IDataArray(name)
-  , m_NumTuples(numTuples)
-  , m_CompDims(std::move(compDims))
-  {
-    m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
-    m_InitValue = initValue;
-    if(allocate)
-    {
-      resizeTuples(numTuples);
-    }
-    else
-    {
-      m_Size = m_NumTuples * m_NumComponents;
-      m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
-    }
-#if 0
-      MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
-#endif
-  }
+  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate);
 
-  ~DataArray() override
-  {
-    clear();
-  }
+  ~DataArray() override;
 
   //========================================= Static Constructing DataArray Objects =================================
   /**
@@ -194,26 +140,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    comp_dims_type cDims = {1};
-    auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate);
 
   /**
    * @brief Static constructor
@@ -224,30 +151,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    comp_dims_type cDims(rank);
-    for(int i = 0; i < rank; i++)
-    {
-      cDims[i] = dims[i];
-    }
-    auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate);
 
   /**
    * @brief Static constructor
@@ -257,25 +161,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate);
 
   /**
    * @brief Static constructor
@@ -286,28 +172,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-
-    size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), static_cast<size_t>(1), std::multiplies<>());
-
-    auto d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
-    if(allocate)
-    {
-      if(d->allocate() < 0)
-      {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return DataArray<T>::NullPointer();
-      }
-    }
-    Pointer ptr(d);
-    return ptr;
-  }
+  static Pointer CreateArray(const comp_dims_type& tupleDims, const comp_dims_type& compDims, const QString& name, bool allocate);
 
   //========================================= Instance Constructing DataArray Objects =================================
   /**
@@ -319,11 +184,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const override
-  {
-    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
-    return p;
-  }
+  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const override;
 
   /**
    * @brief createNewArray
@@ -333,11 +194,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) const override
-  {
-    IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
-    return p;
-  }
+  IDataArray::Pointer createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) const override;
 
   /**
    * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
@@ -346,16 +203,7 @@ class DataArray : public IDataArray
    * @param name The name of the array
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer FromQVector(QVector<T>& vec, const QString& name)
-  {
-
-    Pointer p = CreateArray(vec.size(), name, true);
-    if(nullptr != p.get())
-    {
-      std::memcpy(p->getPointer(0), vec.data(), vec.size() * sizeof(T));
-    }
-    return p;
-  }
+  static Pointer FromQVector(QVector<T>& vec, const QString& name);
 
   /**
    * @brief Static Method to create a DataArray from a std::vector through a deep copy of the data
@@ -364,16 +212,7 @@ class DataArray : public IDataArray
    * @param name The name of the array
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer FromStdVector(std::vector<T>& vec, const QString& name)
-  {
-    comp_dims_type cDims = {1};
-    Pointer p = CreateArray(vec.size(), cDims, name, true);
-    if(nullptr != p.get())
-    {
-      std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
-    }
-    return p;
-  }
+  static Pointer FromStdVector(std::vector<T>& vec, const QString& name);
 
   /**
    * @brief FromPointer Creates a DataArray<T> object with a <b>DEEP COPY</b> of the data
@@ -382,15 +221,7 @@ class DataArray : public IDataArray
    * @param name
    * @return
    */
-  static Pointer CopyFromPointer(T* data, size_t size, const QString& name)
-  {
-    Pointer p = CreateArray(size, name, true);
-    if(nullptr != p.get())
-    {
-      std::memcpy(p->getPointer(0), data, size * sizeof(T));
-    }
-    return p;
-  }
+  static Pointer CopyFromPointer(T* data, size_t size, const QString& name);
 
   /**
    * @brief WrapPointer Creates a DataArray<T> object that references the pointer. The original caller can
@@ -403,22 +234,7 @@ class DataArray : public IDataArray
    * @param ownsData
    * @return
    */
-  static Pointer WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
-  {
-    // Allocate on the heap
-    auto d = new DataArray(numTuples, name, compDims, static_cast<T>(0), false);
-    // Wrap that heap pointer with a shared_pointer to make it reference counted
-    Pointer p(d);
-
-    p->m_Array = data;        // Now set the internal array to the raw pointer
-    p->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
-    if(nullptr != data)
-    {
-      p->m_IsAllocated = true;
-    }
-
-    return p;
-  }
+  static Pointer WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData);
 
   //========================================= Begin API =================================
 
@@ -427,23 +243,7 @@ class DataArray : public IDataArray
    * @param forceNoAllocate
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
-  {
-    bool allocate = m_IsAllocated;
-    if(forceNoAllocate)
-    {
-      allocate = false;
-    }
-    IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
-    if(m_IsAllocated && !forceNoAllocate)
-    {
-      T* src = getPointer(0);
-      void* dest = daCopy->getVoidPointer(0);
-      size_t totalBytes = (getNumberOfTuples() * getNumberOfComponents() * sizeof(T));
-      std::memcpy(dest, src, totalBytes);
-    }
-    return daCopy;
-  }
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
@@ -451,133 +251,14 @@ class DataArray : public IDataArray
    * @return
    */
 
-  SIMPL::NumericTypes::Type getType() const
-  {
-    T value = static_cast<T>(0x00);
-    if(typeid(value) == typeid(int8_t))
-    {
-      return SIMPL::NumericTypes::Type::Int8;
-    }
-    if(typeid(value) == typeid(uint8_t))
-    {
-      return SIMPL::NumericTypes::Type::UInt8;
-    }
-
-    if(typeid(value) == typeid(int16_t))
-    {
-      return SIMPL::NumericTypes::Type::Int16;
-    }
-    if(typeid(value) == typeid(uint16_t))
-    {
-      return SIMPL::NumericTypes::Type::UInt16;
-    }
-
-    if(typeid(value) == typeid(int32_t))
-    {
-      return SIMPL::NumericTypes::Type::Int32;
-    }
-    if(typeid(value) == typeid(uint32_t))
-    {
-      return SIMPL::NumericTypes::Type::UInt32;
-    }
-
-    if(typeid(value) == typeid(int64_t))
-    {
-      return SIMPL::NumericTypes::Type::Int64;
-    }
-    if(typeid(value) == typeid(uint64_t))
-    {
-      return SIMPL::NumericTypes::Type::UInt64;
-    }
-
-    if(typeid(value) == typeid(float))
-    {
-      return SIMPL::NumericTypes::Type::Float;
-    }
-    if(typeid(value) == typeid(double))
-    {
-      return SIMPL::NumericTypes::Type::Double;
-    }
-
-    if(typeid(value) == typeid(bool))
-    {
-      return SIMPL::NumericTypes::Type::Bool;
-    }
-
-    return SIMPL::NumericTypes::Type::UnknownNumType;
-  }
+  SIMPL::NumericTypes::Type getType() const;
 
   /**
    * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
-  {
-    T value = static_cast<T>(0x00);
-    xdmfTypeName = "UNKNOWN";
-    precision = 0;
-    if(typeid(value) == typeid(int8_t))
-    {
-      xdmfTypeName = "Char";
-      precision = 1;
-    }
-    if(typeid(value) == typeid(uint8_t))
-    {
-      xdmfTypeName = "UChar";
-      precision = 1;
-    }
-
-    if(typeid(value) == typeid(int16_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 2;
-    }
-    if(typeid(value) == typeid(uint16_t))
-    {
-      xdmfTypeName = "UInt";
-      precision = 2;
-    }
-
-    if(typeid(value) == typeid(int32_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 4;
-    }
-    if(typeid(value) == typeid(uint32_t))
-    {
-      xdmfTypeName = "UInt";
-      precision = 4;
-    }
-
-    if(typeid(value) == typeid(int64_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 8;
-    }
-    if(typeid(value) == typeid(uint64_t))
-    {
-      xdmfTypeName = "UInt";
-      precision = 8;
-    }
-
-    if(typeid(value) == typeid(float))
-    {
-      xdmfTypeName = "Float";
-      precision = 4;
-    }
-    if(typeid(value) == typeid(double))
-    {
-      xdmfTypeName = "Float";
-      precision = 8;
-    }
-
-    if(typeid(value) == typeid(bool))
-    {
-      xdmfTypeName = "uchar";
-      precision = 1;
-    }
-  }
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
   // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
   // This is required so that other classes can call this version of copyData from the subclasses.
   using IDataArray::copyFromArray;
@@ -601,161 +282,52 @@ class DataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
-  {
-    if(!m_IsAllocated)
-    {
-      return false;
-    }
-    if(nullptr == m_Array)
-    {
-      return false;
-    }
-    if(destTupleOffset > m_MaxId)
-    {
-      return false;
-    }
-    if(!sourceArray->isAllocated())
-    {
-      return false;
-    }
-    Self* source = dynamic_cast<Self*>(sourceArray.get());
-    if(nullptr == source->getPointer(0))
-    {
-      return false;
-    }
-
-    if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
-    {
-      return false;
-    }
-
-    if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
-    {
-      return false;
-    }
-
-    if(totalSrcTuples * sourceArray->getNumberOfComponents() + destTupleOffset * getNumberOfComponents() > m_Size)
-    {
-      return false;
-    }
-
-    size_t elementStart = destTupleOffset * getNumberOfComponents();
-    size_t totalBytes = (totalSrcTuples * sourceArray->getNumberOfComponents()) * sizeof(T);
-    std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * sourceArray->getNumberOfComponents()), totalBytes);
-    return true;
-  }
+  bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief copyIntoArray
    * @param dest
    */
-  bool copyIntoArray(Pointer dest) const
-  {
-    if(m_IsAllocated && dest->isAllocated() && m_Array && dest->getPointer(0))
-    {
-      size_t totalBytes = m_Size * sizeof(T);
-      std::memcpy(dest->getPointer(0), m_Array, totalBytes);
-      return true;
-    }
-    return false;
-  }
+  bool copyIntoArray(Pointer dest) const;
 
   /**
    * @brief isAllocated
    * @return
    */
-  bool isAllocated() const override
-  {
-    return m_IsAllocated;
-  }
-
+  bool isAllocated() const override;
   /**
    * @brief Gives this array a human readable name
    * @param name The name of this array
    */
-  virtual void setInitValue(T initValue)
-  {
-    m_InitValue = initValue;
-  }
+  virtual void setInitValue(T initValue);
 
   /**
    * @brief Makes this class responsible for freeing the memory
    */
-  void takeOwnership() override
-  {
-    m_OwnsData = true;
-  }
+  void takeOwnership() override;
 
   /**
    * @brief This class will NOT free the memory associated with the internal pointer.
    * This can be useful if the user wishes to keep the data around after this
    * class goes out of scope.
    */
-  void releaseOwnership() override
-  {
-    m_OwnsData = false;
-  }
+  void releaseOwnership() override;
 
   /**
    * @brief Allocates the memory needed for this class
    * @return 1 on success, -1 on failure
    */
-  virtual int32_t allocate()
-  {
-    if((nullptr != m_Array) && (true == m_OwnsData))
-    {
-      deallocate();
-    }
-    m_Array = nullptr;
-    m_OwnsData = true;
-    m_IsAllocated = false;
-    if(m_Size == 0)
-    {
-      clear();
-      return 1;
-    }
-
-    size_t newSize = m_Size;
-    m_Array = new T[newSize]();
-    if(!m_Array)
-    {
-      qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-      return -1;
-    }
-    m_Size = newSize;
-    m_IsAllocated = true;
-
-    return 1;
-  }
+  virtual int32_t allocate();
 
   /**
    * @brief Sets all the values to zero.
    */
-  void initializeWithZeros() override
-  {
-    if(!m_IsAllocated || nullptr == m_Array)
-    {
-      return;
-    }
-    size_t typeSize = sizeof(T);
-    ::memset(m_Array, 0, m_Size * typeSize);
-  }
+  void initializeWithZeros() override;
 
   /**
    * @brief Sets all the values to value.
    */
-  virtual void initializeWithValue(T initValue, size_t offset = 0)
-  {
-    if(!m_IsAllocated || nullptr == m_Array)
-    {
-      return;
-    }
-    for(size_t i = offset; i < m_Size; i++)
-    {
-      m_Array[i] = initValue;
-    }
-  }
+  virtual void initializeWithValue(T initValue, size_t offset = 0);
 
   /**
    * @brief Removes Tuples from the m_Array. If the size of the vector is Zero nothing is done. If the size of the
@@ -765,116 +337,7 @@ class DataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(comp_dims_type& idxs) override
-  {
-    int err = 0;
-
-    // If nothing is to be erased just return
-    if(idxs.empty())
-    {
-      return 0;
-    }
-    auto idxs_size = static_cast<size_t>(idxs.size());
-    if(idxs_size >= getNumberOfTuples())
-    {
-      resizeTuples(0);
-      return 0;
-    }
-
-    // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
-    // off the end of the array and return an error code.
-    for(size_t& idx : idxs)
-    {
-      if(idx * m_NumComponents > m_MaxId)
-      {
-        return -100;
-      }
-    }
-
-    // Calculate the new size of the array to copy into
-    size_t newSize = (getNumberOfTuples() - idxs.size()) * m_NumComponents;
-
-    // Create a new m_Array to copy into
-    T* newArray = new T[newSize]();
-
-    // Splat AB across the array so we know if we are copying the values or not
-    ::memset(newArray, 0xAB, newSize * sizeof(T));
-
-    // Keep the current Destination Pointer
-    T* currentDest = newArray;
-    size_t j = 0;
-    int k = 0;
-    // Find the first chunk to copy by walking the idxs array until we get an
-    // index that is NOT a continuous increment from the start
-    for(k = 0; k < idxs.size(); ++k)
-    {
-      if(j == idxs[k])
-      {
-        ++j;
-      }
-      else
-      {
-        break;
-      }
-    }
-
-    if(k == idxs.size()) // Only front elements are being dropped
-    {
-      T* currentSrc = m_Array + (j * m_NumComponents);
-      std::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * m_NumComponents * sizeof(T));
-      deallocate(); // We are done copying - delete the current m_Array
-      m_Size = newSize;
-      m_Array = newArray;
-      m_OwnsData = true;
-      m_MaxId = newSize - 1;
-      m_IsAllocated = true;
-      return 0;
-    }
-
-    comp_dims_type srcIdx(idxs.size() + 1);
-    comp_dims_type destIdx(idxs.size() + 1);
-    comp_dims_type copyElements(idxs.size() + 1);
-    srcIdx[0] = 0;
-    destIdx[0] = 0;
-    copyElements[0] = (idxs[0] - 0) * m_NumComponents;
-
-    for(int i = 1; i < srcIdx.size(); ++i)
-    {
-      srcIdx[i] = (idxs[i - 1] + 1) * m_NumComponents;
-
-      if(i < srcIdx.size() - 1)
-      {
-        copyElements[i] = (idxs[i] - idxs[i - 1] - 1) * m_NumComponents;
-      }
-      else
-      {
-        copyElements[i] = (getNumberOfTuples() - idxs[i - 1] - 1) * m_NumComponents;
-      }
-      destIdx[i] = copyElements[i - 1] + destIdx[i - 1];
-    }
-
-    // Copy the data
-    for(int i = 0; i < srcIdx.size(); ++i)
-    {
-      currentDest = newArray + destIdx[i];
-      T* currentSrc = m_Array + srcIdx[i];
-      size_t bytes = copyElements[i] * sizeof(T);
-      std::memcpy(currentDest, currentSrc, bytes);
-    }
-
-    // We are done copying - delete the current m_Array
-    deallocate();
-
-    // Allocation was successful.  Save it.
-    m_Size = newSize;
-    m_Array = newArray;
-    // This object has now allocated its memory and owns it.
-    m_OwnsData = true;
-    m_IsAllocated = true;
-    m_MaxId = newSize - 1;
-
-    return err;
-  }
+  int eraseTuples(comp_dims_type& idxs) override;
 
   /**
    * @brief
@@ -882,19 +345,7 @@ class DataArray : public IDataArray
    * @param newPos
    * @return
    */
-  int copyTuple(size_t currentPos, size_t newPos) override
-  {
-    size_t max = ((m_MaxId + 1) / m_NumComponents);
-    if(currentPos >= max || newPos >= max)
-    {
-      return -1;
-    }
-    T* src = m_Array + (currentPos * m_NumComponents);
-    T* dest = m_Array + (newPos * m_NumComponents);
-    size_t bytes = sizeof(T) * m_NumComponents;
-    std::memcpy(dest, src, bytes);
-    return 0;
-  }
+  int copyTuple(size_t currentPos, size_t newPos) override;
 
   /**
    * @brief Returns the number of bytes that make up the data type.
@@ -903,46 +354,31 @@ class DataArray : public IDataArray
    * 4 = 32 bit integer/Float
    * 8 = 64 bit integer/Double
    */
-  size_t getTypeSize() const override
-  {
-    return sizeof(T);
-  }
+  size_t getTypeSize() const override;
 
   /**
    * @brief Returns the number of elements in the internal array.
    */
-  size_t getNumberOfTuples() const override
-  {
-    return m_NumTuples;
-  }
+  size_t getNumberOfTuples() const override;
 
   /**
    * @brief Returns the total number of elements that make up this array. Equal to NumTuples * NumComponents
    */
-  size_t getSize() const override
-  {
-    return m_Size;
-  }
+  size_t getSize() const override;
 
   /**
    * @brief Returns the dimensions for the data residing at each Tuple. For example if you have a simple Scalar value
    * at each tuple then this will return a single element QVector. If you have a 1x3 array (like EUler Angles) then
    * this will return a 3 Element QVector.
    */
-  comp_dims_type getComponentDimensions() const override
-  {
-    return m_CompDims;
-  }
+  comp_dims_type getComponentDimensions() const override;
 
   /**
    * @brief Returns the number component values at each Tuple location. For example if you have a
    * 3 element component (vector) then this will be 3. If you are storing a small image of size 80x60
    * at each Tuple (like EBSD Kikuchi patterns) then the result would be 4800.
    */
-  int getNumberOfComponents() const override
-  {
-    return m_NumComponents;
-  }
+  int getNumberOfComponents() const override;
 
   /**
    * @brief Returns a void pointer pointing to the index of the array. nullptr
@@ -951,41 +387,19 @@ class DataArray : public IDataArray
    * @param i The index to have the returned pointer pointing to.
    * @return Void Pointer. Possibly nullptr.
    */
-  void* getVoidPointer(size_t i) override
-  {
-    if(i >= m_Size)
-    {
-      return nullptr;
-    }
-
-    return (void*)(&(m_Array[i]));
-  }
+  void* getVoidPointer(size_t i) override;
 
   /**
    * @brief Returns a list of the contents of DataArray (For Python Binding)
    * @return std::list. Possibly empty
    */
-  std::list<T> getArray() const
-  {
-    return std::list<T>(m_Array, m_Array + (m_Size * sizeof(T)) / sizeof(T));
-  }
+  std::list<T> getArray() const;
 
   /**
    * @brief Sets the contents of the array to the list (For Python Binding)
    * @param std::list. New array contents
    */
-  void setArray(std::list<T> newArray)
-  {
-    if(newArray.size() != m_Size)
-    {
-      return;
-    }
-    int i = 0;
-    for(auto elem : newArray)
-    {
-      m_Array[i++] = elem;
-    }
-  }
+  void setArray(std::list<T> newArray);
 
   /**
    * @brief Returns the pointer to a specific index into the array. No checks are made
@@ -993,62 +407,26 @@ class DataArray : public IDataArray
    * then end of the array they you will likely cause your program to abort.
    * @param i The index to return the pointer to.
    * @return The pointer to the index
-   */
-  virtual T* getPointer(size_t i) const
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i < m_Size);
-    }
-#endif
-    return (T*)(&(m_Array[i]));
-  }
+   */
+  virtual T* getPointer(size_t i) const;
 
   /**
    * @brief Returns the value for a given index
    * @param i The index to return the value at
    * @return The value at index i
    */
-  virtual T getValue(size_t i) const
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i < m_Size);
-    }
-#endif
-    return m_Array[i];
-  }
+  virtual T getValue(size_t i) const;
 
   /**
    * @brief Sets a specific value in the array
    * @param i The index of the value to set
    * @param value The new value to be set at the specified index
    */
-  void setValue(size_t i, T value)
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i < m_Size);
-    }
-#endif
-    m_Array[i] = value;
-  }
+  void setValue(size_t i, T value);
 
   //----------------------------------------------------------------------------
   // These can be overridden for more efficiency
-  T getComponent(size_t i, int j) const
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i * m_NumComponents + j < m_Size);
-    }
-#endif
-    return m_Array[i * m_NumComponents + j];
-  }
+  T getComponent(size_t i, int j) const;
 
   /**
    * @brief Sets a specific component of the Tuple located at i
@@ -1056,105 +434,41 @@ class DataArray : public IDataArray
    * @param j The Component index into the Tuple
    * @param c The value to set
    */
-  void setComponent(size_t i, int j, T c)
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i * m_NumComponents + j < m_Size);
-    }
-#endif
-    m_Array[i * m_NumComponents + j] = c;
-  }
+  void setComponent(size_t i, int j, T c);
 
   /**
    * @brief setTuple
    * @param tupleIndex
    * @param data
    */
-  void setTuple(size_t tupleIndex, T* data)
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
-    }
-#endif
-    std::memcpy(getTuplePointer(tupleIndex), data, m_NumComponents * sizeof(T));
-  }
+  void setTuple(size_t tupleIndex, T* data);
 
   /**
    * @brief setTuple
    * @param tupleIndex
    * @param data
    */
-  void setTuple(size_t tupleIndex, const std::vector<T>& data)
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
-    }
-#endif
-    std::memcpy(getTuplePointer(tupleIndex), data.data(), m_NumComponents * sizeof(T));
-  }
+  void setTuple(size_t tupleIndex, const std::vector<T>& data);
 
   /**
    * @brief Splats the same value c across all values in the Tuple
    * @param i The index of the Tuple
    * @param c The value to splat across all components in the tuple
    */
-  void initializeTuple(size_t i, void* p) override
-  {
-    if(!m_IsAllocated)
-    {
-      return;
-    }
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(i * m_NumComponents < m_Size);
-    }
-#endif
-    if(nullptr == p)
-    {
-      return;
-    }
-    T* c = reinterpret_cast<T*>(p);
-    for(size_t j = 0; j < m_NumComponents; ++j)
-    {
-      m_Array[i * m_NumComponents + j] = *c;
-    }
-  }
+  void initializeTuple(size_t i, void* p) override;
 
   /**
    * @brief getTuplePointer Returns the pointer to a specific tuple
    * @param tupleIndex The index of tuple
    */
-  T* getTuplePointer(size_t tupleIndex) const
-  {
-#ifndef NDEBUG
-    if(m_Size > 0)
-    {
-      Q_ASSERT(tupleIndex * m_NumComponents < m_Size);
-    }
-#endif
-    return m_Array + (tupleIndex * m_NumComponents);
-  }
+  T* getTuplePointer(size_t tupleIndex) const;
 
   /**
    * @brief resize
    * @param numTuples
    * @return
    */
-  void resizeTuples(size_t numTuples) override
-  {
-    T* ptr = resizeAndExtend(numTuples * m_NumComponents);
-    if(nullptr != ptr)
-    {
-      m_NumTuples = numTuples;
-    }
-  }
+  void resizeTuples(size_t numTuples) override;
 
   /**
    * @brief printTuple
@@ -1162,29 +476,7 @@ class DataArray : public IDataArray
    * @param i
    * @param delimiter
    */
-  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
-  {
-    int precision = out.realNumberPrecision();
-    T value = static_cast<T>(0x00);
-    if(typeid(value) == typeid(float))
-    {
-      out.setRealNumberPrecision(8);
-    }
-    if(typeid(value) == typeid(double))
-    {
-      out.setRealNumberPrecision(16);
-    }
-
-    for(size_t j = 0; j < m_NumComponents; ++j)
-    {
-      if(j != 0)
-      {
-        out << delimiter;
-      }
-      out << m_Array[i * m_NumComponents + j];
-    }
-    out.setRealNumberPrecision(precision);
-  }
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override;
 
   /**
    * @brief printComponent
@@ -1192,10 +484,7 @@ class DataArray : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) const override
-  {
-    out << m_Array[i * m_NumComponents + j];
-  }
+  void printComponent(QTextStream& out, size_t i, int j) const override;
 
   /**
    * @brief Returns the HDF Type for a given primitive value.
@@ -1203,180 +492,20 @@ class DataArray : public IDataArray
    * from
    * @return The HDF5 native type for the value
    */
-  QString getFullNameOfClass() const
-  {
-    QString theType = getTypeAsString();
-    theType = "DataArray<" + theType + ">";
-    return theType;
-  }
+  QString getFullNameOfClass() const;
 
   /**
    * @brief getTypeAsString
    * @return
    */
-  QString getTypeAsString() const override
-  {
-    T value = static_cast<T>(0);
-    if(typeid(value) == typeid(float))
-    {
-      return "float";
-    }
-    if(typeid(value) == typeid(double))
-    {
-      return "double";
-    }
-
-    if(typeid(value) == typeid(int8_t))
-    {
-      return "int8_t";
-    }
-    if(typeid(value) == typeid(uint8_t))
-    {
-      return "uint8_t";
-    }
-#if CMP_TYPE_CHAR_IS_SIGNED
-    if(typeid(value) == typeid(char))
-    {
-      return "char";
-    }
-#else
-    if(typeid(value) == typeid(char))
-    {
-      return "char";
-    }
-#endif
-    if(typeid(value) == typeid(signed char))
-    {
-      return "signed char";
-    }
-    if(typeid(value) == typeid(unsigned char))
-    {
-      return "unsigned char";
-    }
-
-    if(typeid(value) == typeid(int16_t))
-    {
-      return "int16_t";
-    }
-    if(typeid(value) == typeid(short))
-    {
-      return "short";
-    }
-    if(typeid(value) == typeid(signed short))
-    {
-      return "signed short";
-    }
-    if(typeid(value) == typeid(uint16_t))
-    {
-      return "uint16_t";
-    }
-    if(typeid(value) == typeid(unsigned short))
-    {
-      return "unsigned short";
-    }
-
-    if(typeid(value) == typeid(int32_t))
-    {
-      return "int32_t";
-    }
-    if(typeid(value) == typeid(uint32_t))
-    {
-      return "uint32_t";
-    }
-#if(CMP_SIZEOF_INT == 4)
-    if(typeid(value) == typeid(int))
-    {
-      return "int";
-    }
-    if(typeid(value) == typeid(signed int))
-    {
-      return "signed int";
-    }
-    if(typeid(value) == typeid(unsigned int))
-    {
-      return "unsigned int";
-    }
-#endif
-
-    if(typeid(value) == typeid(int64_t))
-    {
-      return "int64_t";
-    }
-    if(typeid(value) == typeid(uint64_t))
-    {
-      return "uint64_t";
-    }
-
-#if(CMP_SIZEOF_LONG == 4)
-    if(typeid(value) == typeid(long int))
-    {
-      return "long int";
-    }
-    if(typeid(value) == typeid(signed long int))
-    {
-      return "signed long int";
-    }
-    if(typeid(value) == typeid(unsigned long int))
-    {
-      return "unsigned long int";
-    }
-#elif(CMP_SIZEOF_LONG == 8)
-    if(typeid(value) == typeid(long int))
-    {
-      return "long int";
-    }
-    if(typeid(value) == typeid(signed long int))
-    {
-      return "signed long int";
-    }
-    if(typeid(value) == typeid(unsigned long int))
-    {
-      return "unsigned long int";
-    }
-#endif
-
-#if(CMP_SIZEOF_LONG_LONG == 8)
-    if(typeid(value) == typeid(long long int))
-    {
-      return "long long int";
-    }
-    if(typeid(value) == typeid(signed long long int))
-    {
-      return "signed long long int";
-    }
-    if(typeid(value) == typeid(unsigned long long int))
-    {
-      return "unsigned long long int";
-    }
-#endif
-
-    if(typeid(value) == typeid(bool))
-    {
-      return "bool";
-    }
-
-    // qDebug()  << "Error: HDFTypeForPrimitive - Unknown Type: " << (typeid(value).name()) ;
-    const char* name = typeid(value).name();
-    if(nullptr != name && name[0] == 'l')
-    {
-      qDebug() << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t.";
-    }
-    return "UnknownType";
-  }
+  QString getTypeAsString() const override;
 
   /**
    *
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, comp_dims_type tDims) const override
-  {
-    if(m_Array == nullptr)
-    {
-      return -85648;
-    }
-    return H5DataArrayWriter::writeDataArray<Self>(parentId, this, tDims);
-  }
+  int writeH5Data(hid_t parentId, comp_dims_type tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -1384,170 +513,26 @@ class DataArray : public IDataArray
    * @param volDims
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override
-  {
-    if(m_Array == nullptr)
-    {
-      return -85648;
-    }
-    QString dimStr;
-    int precision = 0;
-    QString xdmfTypeName;
-    getXdmfTypeAndSize(xdmfTypeName, precision);
-    if(0 == precision)
-    {
-      out << "<!-- " << getName() << " has unknown type or unsupported type or precision for XDMF to understand"
-          << " -->"
-          << "\n";
-      return -100;
-    }
-
-    int numComp = getNumberOfComponents();
-    out << "    <Attribute Name=\"" << getName() << label << "\" ";
-    if(numComp == 1)
-    {
-      out << "AttributeType=\"Scalar\" ";
-      dimStr = QString("%1 %2 %3 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]);
-    }
-    else if(numComp == 6)
-    {
-      out << "AttributeType=\"Tensor6\" ";
-      dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
-    }
-    else if(numComp == 9)
-    {
-      out << "AttributeType=\"Tensor\" ";
-      dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
-    }
-    else
-    {
-      out << "AttributeType=\"Vector\" ";
-      dimStr = QString("%1 %2 %3 %4 ").arg(volDims[2]).arg(volDims[1]).arg(volDims[0]).arg(numComp);
-    }
-    out << "Center=\"Cell\">\n";
-    // Open the <DataItem> Tag
-    out << R"(      <DataItem Format="HDF" Dimensions=")" << dimStr << R"(" )";
-    out << "NumberType=\"" << xdmfTypeName << "\" "
-        << "Precision=\"" << precision << "\" >\n";
-
-    out << "        " << hdfFileName << groupPath << "/" << getName() << "\n";
-    out << "      </DataItem>"
-        << "\n";
-    out << "    </Attribute>"
-        << "\n";
-    return 1;
-  }
+  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override;
 
   /**
    * @brief getInfoString
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) const override
-  {
-
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-
-    QString info;
-    QTextStream ss(&info);
-    if(format == SIMPL::HtmlFormat)
-    {
-      ss << "<html><head></head>\n";
-      ss << "<body>\n";
-      ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-      ss << "<tbody>\n";
-      ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-
-      ss << R"(<tr bgcolor="#E9E7D6"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
-
-      ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type:</th><td> DataArray&lt;)" << getTypeAsString() << "&gt;</td></tr>";
-      QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-      ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Tuples:</th><td>)" << numStr << "</td></tr>";
-
-      QString compDimStr = "(";
-      for(int i = 0; i < m_CompDims.size(); i++)
-      {
-        compDimStr = compDimStr + QString::number(m_CompDims[i]);
-        if(i < m_CompDims.size() - 1)
-        {
-          compDimStr = compDimStr + QString(", ");
-        }
-      }
-      compDimStr = compDimStr + ")";
-      ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Component Dimensions:</th><td>)" << compDimStr << "</td></tr>";
-      numStr = usa.toString(static_cast<qlonglong>(m_Size));
-      ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Total Elements:</th><td>)" << numStr << "</td></tr>";
-      numStr = usa.toString(static_cast<qlonglong>(m_Size * sizeof(T)));
-      ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Total Memory Required:</th><td>)" << numStr << "</td></tr>";
-      ss << "</tbody></table>\n";
-      ss << "</body></html>";
-    }
-    else
-    {
-    }
-    return info;
-  }
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
   /**
    * @brief
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override
-  {
-    int err = 0;
-
-    resizeTuples(0);
-    IDataArray::Pointer p = H5DataArrayReader::ReadIDataArray(parentId, getName());
-    if(p.get() == nullptr)
-    {
-      return -1;
-    }
-    m_Array = reinterpret_cast<T*>(p->getVoidPointer(0));
-    m_Size = p->getSize();
-    m_OwnsData = true;
-    m_MaxId = (m_Size == 0) ? 0 : m_Size - 1;
-    m_IsAllocated = true;
-    setName(p->getName());
-    m_NumTuples = p->getNumberOfTuples();
-    m_CompDims = p->getComponentDimensions();
-    m_NumComponents = p->getNumberOfComponents();
-
-    // Tell the intermediate DataArray to release ownership of the data as we are going to be responsible
-    // for deleting the memory
-    p->releaseOwnership();
-    return err;
-  }
+  int readH5Data(hid_t parentId) override;
 
   /**
    * @brief
    */
-  virtual void byteSwapElements()
-  {
-    char* ptr = (char*)(m_Array);
-    char t[8];
-    size_t size = getTypeSize();
-    for(uint64_t var = 0; var < m_Size; ++var)
-    {
-      if(sizeof(T) == 2)
-      {
-        mxa_bswap(0, 1, t);
-      }
-      else if(sizeof(T) == 4)
-      {
-        mxa_bswap(0, 3, t);
-        mxa_bswap(1, 2, t);
-      }
-      else if(sizeof(T) == 8)
-      {
-        mxa_bswap(0, 7, t);
-        mxa_bswap(1, 6, t);
-        mxa_bswap(2, 5, t);
-        mxa_bswap(3, 4, t);
-      }
-      ptr += size; // increment the pointer
-    }
-  }
+  virtual void byteSwapElements();
 
   //========================================= STL INTERFACE COMPATIBILITY =================================
 
@@ -1571,8 +556,9 @@ class DataArray : public IDataArray
       ptr_ = ptr_ + num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int junk)
+    self_type operator++(int ununsed)
     {
+      std::ignore = ununsed;
       self_type i = *this;
       ptr_ = ptr_ + num_comps_;
       return i;
@@ -1623,8 +609,9 @@ class DataArray : public IDataArray
       ptr_ = ptr_ + num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int junk)
+    self_type operator++(int ununsed)
     {
+      std::ignore = ununsed;
       self_type i = *this;
       ptr_ = ptr_ + num_comps_;
       return i;
@@ -1672,6 +659,7 @@ class DataArray : public IDataArray
     iterator(pointer ptr, size_type ununsed)
     : ptr_(ptr)
     {
+      std::ignore = ununsed;
     }
 
     self_type operator++()
@@ -1679,8 +667,9 @@ class DataArray : public IDataArray
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int junk)
+    self_type operator++(int ununsed)
     {
+      std::ignore = ununsed;
       self_type i = *this;
       ptr_++;
       return i;
@@ -1767,34 +756,42 @@ class DataArray : public IDataArray
   };
 
   // ######### Iterators #########
-
+  /**
+   *
+   */
   template <typename IteratorType> IteratorType begin()
   {
     return IteratorType(m_Array, m_NumComponents);
   }
-  iterator begin()
-  {
-    return iterator(m_Array);
-  }
+
+  /**
+   * @brief begin
+   * @return
+   */
+  iterator begin();
 
   template <typename IteratorType> IteratorType end()
   {
     return IteratorType(m_Array + m_Size, m_NumComponents);
   }
-  iterator end()
-  {
-    return iterator(m_Array + m_Size);
-  }
 
-  const_iterator begin() const
-  {
-    return const_iterator(m_Array);
-  }
+  /**
+   * @brief end
+   * @return
+   */
+  iterator end();
 
-  const_iterator end() const
-  {
-    return const_iterator(m_Array + m_Size);
-  }
+  /**
+   * @brief begin
+   * @return
+   */
+  const_iterator begin() const;
+
+  /**
+   * @brief end
+   * @return
+   */
+  const_iterator end() const;
 
   // rbegin
   // rend
@@ -1805,28 +802,16 @@ class DataArray : public IDataArray
 
   // ######### Capacity #########
 
-  size_type size() const
-  {
-    return m_Size;
-  }
+  size_type size() const;
 
-  size_type max_size() const
-  {
-    return m_Size;
-  }
+  size_type max_size() const;
   //  void resize(size_type n) override
   //  {
   //    resizeAndExtend(n);
   //  }
   // void resize (size_type n, const value_type& val);
-  size_type capacity() const noexcept
-  {
-    return m_Size;
-  }
-  bool empty() const noexcept
-  {
-    return (m_Size == 0);
-  }
+  size_type capacity() const noexcept;
+  bool empty() const noexcept;
   // reserve()
   // shrink_to_fit()
 
@@ -1889,7 +874,8 @@ class DataArray : public IDataArray
    * @brief In the range version (1), the new contents are elements constructed from each of the elements in the range
    * between first and last, in the same order.
    */
-  template <class InputIterator> void assign(InputIterator first, InputIterator last) // range (1)
+  template <class InputIterator>
+  void assign(InputIterator first, InputIterator last) // range (1)
   {
     size_type size = last - first;
     resizeAndExtend(size);
@@ -1906,50 +892,29 @@ class DataArray : public IDataArray
    * @param n
    * @param val
    */
-  void assign(size_type n, const value_type& val) // fill (2)
-  {
-    resizeAndExtend(n);
-    for(size_t i = 0; i < n; i++)
-    {
-      m_Array[i] = val;
-    }
-  }
+  void assign(size_type n, const value_type& val);
 
   /**
    * @brief In the initializer list version (3), the new contents are copies of the values passed as initializer list, in the same order.
    * @param il
    */
-  void assign(std::initializer_list<value_type> il) //  initializer list (3)
-  {
-    assign(il.begin(), il.end());
-  }
+  void assign(std::initializer_list<value_type> il);
 
   /**
    * @brief push_back
    * @param val
    */
-  void push_back(const value_type& val)
-  {
-    resizeAndExtend(m_Size + 1);
-    m_Array[m_MaxId] = val;
-  }
+  void push_back(const value_type& val);
   /**
    * @brief push_back
    * @param val
    */
-  void push_back(value_type&& val)
-  {
-    resizeAndExtend(m_Size + 1);
-    m_Array[m_MaxId] = val;
-  }
+  void push_back(value_type&& val);
 
   /**
    * @brief pop_back
    */
-  void pop_back()
-  {
-    resizeAndExtend(m_Size - 1);
-  }
+  void pop_back();
   // insert
   // iterator erase (const_iterator position)
   // iterator erase (const_iterator first, const_iterator last);
@@ -1958,19 +923,7 @@ class DataArray : public IDataArray
   /**
    * @brief Removes all elements from the array (which are destroyed), leaving the container with a size of 0.
    */
-  void clear()
-  {
-    if(nullptr != m_Array && m_OwnsData)
-    {
-      deallocate();
-    }
-    m_Array = nullptr;
-    m_Size = 0;
-    m_OwnsData = true;
-    m_MaxId = 0;
-    m_IsAllocated = false;
-    m_NumTuples = 0;
-  }
+  void clear();
   // emplace
   // emplace_back
 
@@ -1980,7 +933,8 @@ class DataArray : public IDataArray
    * @param range2
    * @return
    */
-  template <typename Range1, typename Range2> bool equal(Range1 const& range1, Range2 const& range2)
+  template <typename Range1, typename Range2>
+  bool equal(Range1 const& range1, Range2 const& range2)
   {
     if(range1.size() != range2.size())
     {
@@ -1997,137 +951,21 @@ class DataArray : public IDataArray
   /**
    * @brief deallocates the memory block
    */
-  void deallocate()
-  {
-    // We are going to splat 0xABABAB across the first value of the array as a debugging aid
-    auto cptr = reinterpret_cast<unsigned char*>(m_Array);
-    if(nullptr != cptr)
-    {
-      if(m_Size > 0)
-      {
-        if(sizeof(T) >= 1)
-        {
-          cptr[0] = 0xAB;
-        }
-        if(sizeof(T) >= 2)
-        {
-          cptr[1] = 0xAB;
-        }
-        if(sizeof(T) >= 4)
-        {
-          cptr[2] = 0xAB;
-          cptr[3] = 0xAB;
-        }
-        if(sizeof(T) >= 8)
-        {
-          cptr[4] = 0xAB;
-          cptr[5] = 0xAB;
-          cptr[6] = 0xAB;
-          cptr[7] = 0xAB;
-        }
-      }
-    }
-#if 0
-      if (MUD_FLAP_0 != 0xABABABABABABABABul
-          || MUD_FLAP_1 != 0xABABABABABABABABul
-          || MUD_FLAP_2 != 0xABABABABABABABABul
-          || MUD_FLAP_3 != 0xABABABABABABABABul
-          || MUD_FLAP_4 != 0xABABABABABABABABul
-          || MUD_FLAP_5 != 0xABABABABABABABABul)
-      {
-        Q_ASSERT(false);
-      }
-#endif
-    delete[](m_Array);
-
-    m_Array = nullptr;
-    m_IsAllocated = false;
-  }
+  void deallocate();
 
   /**
    * @brief Resizes the internal array
    * @param size The new size of the internal array
    * @return 1 on success, 0 on failure
    */
-  int32_t resizeTotalElements(size_t size) override
-  {
-    // std::cout << "DataArray::resizeTotalElements(" << size << ")" << std::endl;
-    if(size == 0)
-    {
-      clear();
-      return 1;
-    }
-    T* ptr = resizeAndExtend(size);
-    if(nullptr != ptr)
-    {
-      return 1;
-    }
-    return 0;
-  }
+  int32_t resizeTotalElements(size_t size) override;
 
   /**
    * @brief resizes the internal array to be 'size' elements in length
    * @param size
    * @return Pointer to the internal array
    */
-  virtual T* resizeAndExtend(size_t size)
-  {
-    T* newArray = nullptr;
-    size_t newSize = 0;
-    size_t oldSize = 0;
-
-    if(size == m_Size) // Requested size is equal to current size.  Do nothing.
-    {
-      return m_Array;
-    }
-    newSize = size;
-    oldSize = m_Size;
-
-    // Wipe out the array completely if new size is zero.
-    if(newSize == 0)
-    {
-      clear();
-      return m_Array;
-    }
-
-    newArray = new T[newSize]();
-    if(!newArray)
-    {
-      qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-      return nullptr;
-    }
-
-    // Copy the data from the old array.
-    if(m_Array != nullptr)
-    {
-      std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
-    }
-
-    // Allocate a new array if we DO NOT own the current array
-    if((nullptr != m_Array) && m_OwnsData)
-    {
-      // Free the old array
-      deallocate();
-    }
-
-    // Allocation was successful.  Save it.
-    m_Size = newSize;
-    m_Array = newArray;
-
-    // This object has now allocated its memory and owns it.
-    m_OwnsData = true;
-
-    m_MaxId = newSize - 1;
-    m_IsAllocated = true;
-
-    // Initialize the new tuples if newSize is larger than old size
-    if(newSize > oldSize)
-    {
-      initializeWithValue(m_InitValue, oldSize);
-    }
-
-    return m_Array;
-  }
+  virtual T* resizeAndExtend(size_t size);
 
 private:
   T* m_Array = nullptr;
@@ -2142,11 +980,39 @@ class DataArray : public IDataArray
 };
 
 // -----------------------------------------------------------------------------
-//
+// These are specialized for bool type as std::vector<bool> uses bits instead of bytes
+template <>
+typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(std::vector<bool>& vec, const QString& name);
+
+template <>
+void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data);
+
 // -----------------------------------------------------------------------------
+// Declare our extern templates
+extern template class DataArray<bool>;
+
+extern template class DataArray<char>;
+extern template class DataArray<unsigned char>;
 
+extern template class DataArray<int8_t>;
+extern template class DataArray<uint8_t>;
+extern template class DataArray<int16_t>;
+extern template class DataArray<uint16_t>;
+extern template class DataArray<int32_t>;
+extern template class DataArray<uint32_t>;
+extern template class DataArray<int64_t>;
+extern template class DataArray<uint64_t>;
+
+extern template class DataArray<float>;
+extern template class DataArray<double>;
+
+extern template class DataArray<size_t>;
+
+// -----------------------------------------------------------------------------
+// Declare our aliases
 using BoolArrayType = DataArray<bool>;
 
+using CharArrayType = DataArray<char>;
 using UCharArrayType = DataArray<unsigned char>;
 
 using Int8ArrayType = DataArray<int8_t>;
diff --git a/Source/SIMPLib/DataArrays/SourceList.cmake b/Source/SIMPLib/DataArrays/SourceList.cmake
index 3dabfff1fc..1e5be31f3e 100755
--- a/Source/SIMPLib/DataArrays/SourceList.cmake
+++ b/Source/SIMPLib/DataArrays/SourceList.cmake
@@ -14,6 +14,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
 )
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataArray.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataArray.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataArrayFilter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StatsDataArray.cpp
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 1aadb2f547..934cdd61b4 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -36,21 +36,20 @@
 #include "StatsDataArray.h"
 
 #include <QtCore/QList>
-
 #include <QtCore/QTextStream>
-
 #include <QtCore/QDebug>
 
-#include "SIMPLib/Common/PhaseType.h"
+#include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/QH5Utilities.h"
+#include "H5Support/QH5Lite.h"
 
+#include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/StatsData/TransformationStatsData.h"
-
-#include "H5Support/H5ScopedSentinel.h"
-#include "H5Support/QH5Utilities.h"
+#include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index b9de8d6cdf..14ff69bcdf 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -37,18 +37,17 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #pragma once
 
-#include <QtCore/QString>
+#include <cstring>
 
+#include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
-
 #include "SIMPLib/DataArrays/IDataArrayFilter.h"
-#include "SIMPLib/SIMPLib.h"
+
 
 template<typename T>
 class StructArray : public IDataArray
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 31523a695b..57cba4375b 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -435,8 +435,6 @@ class DataArrayTest
     TEST_TYPE_STRING(quint16)
     TEST_TYPE_STRING(qint32)
     TEST_TYPE_STRING(quint32)
-    TEST_TYPE_STRING(qint64)
-    TEST_TYPE_STRING(quint64)
 
     TEST_TYPE_STRING(int8_t)
     TEST_TYPE_STRING(uint8_t)
@@ -448,11 +446,7 @@ class DataArrayTest
     TEST_TYPE_STRING(uint64_t)
     TEST_TYPE_STRING(float)
     TEST_TYPE_STRING(double)
-    //   long long int myint = 50;
-    //   std::cout << "myint has type: " << typeid(myint).name() << '\n';
-
-    //   qDebug() << typeid(int64_t).name() << " " << typeid(qint64).name() << " " << typeid(signed long long int).name() << " " << typeid(long long int).name() << " " << typeid(long long).name();
-  }
+}
 
   // -----------------------------------------------------------------------------
   //
@@ -1016,8 +1010,8 @@ true);
 
     typename DataArray<T>::Pointer copy = DataArray<T>::CreateArray(numTuples, cDims, name, false);
 
-    DREAM3D_REQUIRED(copy->getNumberOfTuples(), ==, src->getNumberOfTuples());
-    DREAM3D_REQUIRED(copy->isAllocated(), ==, src->isAllocated());
+    DREAM3D_REQUIRED(copy->getNumberOfTuples(), ==, src->getNumberOfTuples())
+    DREAM3D_REQUIRED(copy->isAllocated(), ==, src->isAllocated())
 
     // Create the array again, this time allocating the data and putting in some known data
     src = DataArray<T>::CreateArray(numTuples, cDims, name, true);
@@ -1195,7 +1189,7 @@ true);
   template <typename T> void TestSetTupleForType()
   {
     size_t numTuples = 10;
-    std::vector<size_t> cDims(1, 5);
+    std::vector<size_t> cDims = {5};
     QString name("Source Array");
 
     // Each index of the vector is a tuple with a vector containing the components for that tuple
@@ -1229,6 +1223,9 @@ true);
       {
         T val = src->getComponent(i, j);
         DREAM3D_REQUIRE_EQUAL(data[i][j], val)
+
+        T* ptr = src->getPointer((cDims[0] * i) + j);
+        DREAM3D_REQUIRE_EQUAL(*ptr, val);
       }
     }
   }
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index b912f98cb6..2614d5c7df 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -35,13 +35,13 @@
 
 #include "DataContainerBundle.h"
 
+#include <QtCore/QDebug>
+
 #include "H5Support/QH5Utilities.h"
+#include "H5Support/QH5Lite.h"
 #include "H5Support/H5ScopedSentinel.h"
 
-#include <QtCore/QDebug>
-
 #include "SIMPLib/DataArrays/StringDataArray.h"
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
index a65a7f86de..187e9e2dfe 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
@@ -54,16 +54,24 @@ ThresholdFilterHelper::~ThresholdFilterHelper() = default;
 //
 // -----------------------------------------------------------------------------
 #define FILTER_DATA_HELPER(dType, ops, Type)                                                                                                                                                           \
-  if(dType.compare(#Type) == 0)                                                                                                                                                                        \
+  if(dType == #Type)                                                                                                                                                                                   \
   {                                                                                                                                                                                                    \
     if(ops == SIMPL::Comparison::Operator_LessThan)                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
       filterDataLessThan<Type>(input);                                                                                                                                                                 \
+    }                                                                                                                                                                                                  \
     else if(ops == SIMPL::Comparison::Operator_GreaterThan)                                                                                                                                            \
+    {                                                                                                                                                                                                  \
       filterDataGreaterThan<Type>(input);                                                                                                                                                              \
+    }                                                                                                                                                                                                  \
     else if(ops == SIMPL::Comparison::Operator_Equal)                                                                                                                                                  \
+    {                                                                                                                                                                                                  \
       filterDataEqualTo<Type>(input);                                                                                                                                                                  \
+    }                                                                                                                                                                                                  \
     else if(ops == SIMPL::Comparison::Operator_NotEqual)                                                                                                                                               \
+    {                                                                                                                                                                                                  \
       filterDataNotEqualTo<Type>(input);                                                                                                                                                               \
+    }                                                                                                                                                                                                  \
     return 1;                                                                                                                                                                                          \
   }
 
@@ -79,52 +87,53 @@ int ThresholdFilterHelper::execute(const IDataArray::Pointer& input, IDataArray*
   m_Output->initializeWithZeros();
   QString dType = input->getTypeAsString();
 
-  FILTER_DATA_HELPER(dType, comparisonOperator, float);
-  FILTER_DATA_HELPER(dType, comparisonOperator, double);
+  FILTER_DATA_HELPER(dType, comparisonOperator, float)
+  FILTER_DATA_HELPER(dType, comparisonOperator, double)
 
-  FILTER_DATA_HELPER(dType, comparisonOperator, int8_t);
-  FILTER_DATA_HELPER(dType, comparisonOperator, uint8_t);
-#if CMP_TYPE_CHAR_IS_SIGNED
-  FILTER_DATA_HELPER(dType, comparisonOperator, char);
-#else
-  FILTER_DATA_HELPER(dType, comparisonOperator, char);
-#endif
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed char);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned char);
+  FILTER_DATA_HELPER(dType, comparisonOperator, int8_t)
+  FILTER_DATA_HELPER(dType, comparisonOperator, uint8_t)
+  //#if CMP_TYPE_CHAR_IS_SIGNED
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, char);
+  //#else
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, char);
+  //#endif
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed char)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned char)
 
-  FILTER_DATA_HELPER(dType, comparisonOperator, int16_t);
-  FILTER_DATA_HELPER(dType, comparisonOperator, short);
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed short);
-  FILTER_DATA_HELPER(dType, comparisonOperator, uint16_t);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned short);
+  FILTER_DATA_HELPER(dType, comparisonOperator, int16_t)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, short)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed short)
+  FILTER_DATA_HELPER(dType, comparisonOperator, uint16_t)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned short)
 
-  FILTER_DATA_HELPER(dType, comparisonOperator, int32_t);
-  FILTER_DATA_HELPER(dType, comparisonOperator, uint32_t);
-#if(CMP_SIZEOF_INT == 4)
-  FILTER_DATA_HELPER(dType, comparisonOperator, int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned int);
-#endif
+  FILTER_DATA_HELPER(dType, comparisonOperator, int32_t)
+  FILTER_DATA_HELPER(dType, comparisonOperator, uint32_t)
+  //#if(CMP_SIZEOF_INT == 4)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned int)
+  //#endif
 
-#if(CMP_SIZEOF_LONG == 4)
-  FILTER_DATA_HELPER(dType, comparisonOperator, long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long int);
-#elif(CMP_SIZEOF_LONG == 8)
-  FILTER_DATA_HELPER(dType, comparisonOperator, long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long int);
-#endif
+  //#if(CMP_SIZEOF_LONG == 4)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long int)
+  //#elif(CMP_SIZEOF_LONG == 8)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long int)
+  //#endif
 
-#if(CMP_SIZEOF_LONG_LONG == 8)
-  FILTER_DATA_HELPER(dType, comparisonOperator, long long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, signed long long int);
-  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long long int);
-#endif
-  FILTER_DATA_HELPER(dType, comparisonOperator, int64_t);
-  FILTER_DATA_HELPER(dType, comparisonOperator, uint64_t);
+  //#if(CMP_SIZEOF_LONG_LONG == 8)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, long long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, signed long long int)
+  //  FILTER_DATA_HELPER(dType, comparisonOperator, unsigned long long int)
+  //#endif
 
-  FILTER_DATA_HELPER(dType, comparisonOperator, bool);
+  FILTER_DATA_HELPER(dType, comparisonOperator, int64_t)
+  FILTER_DATA_HELPER(dType, comparisonOperator, uint64_t)
+
+  FILTER_DATA_HELPER(dType, comparisonOperator, bool)
 
   return -1;
 }
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index f003701e03..34623c89f4 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -20,7 +20,7 @@
 class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 {
 public:
-  ITK_IMAGE_READER_CLASS_NAME() = deafult;
+  ITK_IMAGE_READER_CLASS_NAME() = default;
   ~ITK_IMAGE_READER_CLASS_NAME() = default;
 
 protected:
@@ -31,15 +31,15 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 
   template <typename TComponent>
   void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);
-  template <typename TComponent, unsigned int dimensions>
+  template <typename TComponent, uint32_t dimensions>
   void readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck);
 
-  template <typename TPixel, unsigned int dimensions>
+  template <typename TPixel, uint32_t dimensions>
   void readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck);
 
   void readImage(const DataArrayPath& dataArrayPath, bool dataCheck);
 
-  template <typename TPixel, unsigned int dimensions>
+  template <typename TPixel, uint32_t dimensions>
   void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
 };
 
@@ -53,7 +53,7 @@ void
 ITK_IMAGE_READER_CLASS_NAME
 ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
-  const unsigned int dimensions = imageIO->GetNumberOfDimensions();
+  const uint32_t dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
   {
   case 1:
@@ -77,15 +77,13 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename TComponent, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+template <typename TComponent, uint32_t dimensions>
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   using PixelTypeType = itk::ImageIOBase::IOPixelType;
   PixelTypeType pixel = imageIO->GetPixelType();
 
-  const unsigned int nbComponents = imageIO->GetNumberOfComponents();
+  const uint32_t nbComponents = imageIO->GetNumberOfComponents();
   switch(pixel)
   {
   case itk::ImageIOBase::SCALAR:
@@ -135,10 +133,8 @@ ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer&
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename TPixel, unsigned int dimensions>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
+template <typename TPixel, uint32_t dimensions>
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const QString& filename, bool dataCheck)
 {
   DataContainer::Pointer container = getDataContainerArray()->getDataContainer(dataArrayPath.getDataContainerName());
   if(nullptr == container.get())
@@ -195,28 +191,28 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
     switch(component)
     {
     case itk::ImageIOBase::UCHAR:
-      readImage<unsigned char>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<uint8_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::CHAR:
-      readImage<char>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<int8_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::USHORT:
-      readImage<unsigned short>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<uint16_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::SHORT:
-      readImage<short>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<int16_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::UINT:
-      readImage<unsigned int>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<uint32_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::INT:
-      readImage<int>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<int32_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::ULONG:
-      readImage<unsigned long>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<uint64_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::LONG:
-      readImage<long>(dataArrayPath, imageIO, filename, dataCheck);
+      readImage<int64_t>(dataArrayPath, imageIO, filename, dataCheck);
       break;
     case itk::ImageIOBase::FLOAT:
       readImage<float>(dataArrayPath, imageIO, filename, dataCheck);
@@ -240,7 +236,7 @@ ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename TPixel, unsigned int dimensions>
+template <typename TPixel, uint32_t dimensions>
 void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader,
                                                               DataContainer::Pointer& container)
 {
@@ -256,9 +252,9 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
   SizeVec3Type tDims = {1, 1, 1};
   for(size_t i = 0; i < dimensions; i++)
   {
-    torigin[i] = origin[i];
-    tspacing[i] = spacing[i];
-    tDims[i] = size[i];
+    torigin[i] = static_cast<float>(origin[i]);
+    tspacing[i] = static_cast<float>(spacing[i]);
+    tDims[i] = static_cast<float>(size[i]);
   }
   ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
   image->setDimensions(tDims);
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
index 2ab3b19300..ce2924d19a 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.hxx
@@ -8,16 +8,14 @@
 namespace itk
 {
 
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType,VDimension>
-::InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::InPlaceImageToDream3DDataFilter()
 {
   m_DataArrayName = (SIMPL::Defaults::CellAttributeMatrixName).toStdString();
   m_AttributeMatrixArrayName = (SIMPL::CellData::ImageData).toStdString();
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
-  typename DecoratorType::Pointer output =
-    static_cast< DecoratorType * >(this->MakeOutput(0).GetPointer());
+  typename DecoratorType::Pointer output = static_cast<DecoratorType*>(this->MakeOutput(0).GetPointer());
   this->ProcessObject::SetNumberOfRequiredOutputs(1);
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
   this->SetNumberOfRequiredInputs(1);
@@ -25,13 +23,10 @@ InPlaceImageToDream3DDataFilter<PixelType,VDimension>
   m_InPlace = true;
 }
 
-
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetDataContainer(DataContainer::Pointer dc)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetDataContainer(DataContainer::Pointer dc)
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   outputPtr->Set(dc);
 }
 
@@ -41,32 +36,24 @@ ProcessObject::DataObjectPointer InPlaceImageToDream3DDataFilter<PixelType, VDim
   return DecoratorType::New().GetPointer();
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::~InPlaceImageToDream3DDataFilter()
+template <typename PixelType, unsigned int VDimension>
+InPlaceImageToDream3DDataFilter<PixelType, VDimension>::~InPlaceImageToDream3DDataFilter()
 {
 }
 
-template< typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter< PixelType, VDimension >
-::SetInput(const ImageType *input)
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::SetInput(const ImageType* input)
 {
   // Process object is not const-correct so the const_cast is required here
-  this->ProcessObject::SetNthInput(0,
-    const_cast< ImageType * >(input));
+  this->ProcessObject::SetNthInput(0, const_cast<ImageType*>(input));
 }
 
-
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateOutputInformation()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateOutputInformation()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
-  //float tol = 0.000001;
+  // float tol = 0.000001;
   QVector<float> torigin(3, 0);
   QVector<float> tspacing(3, 1);
   std::vector<size_t> tDims(3, 1);
@@ -78,10 +65,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   //// Create image geometry (data container)
   ImageGeom::Pointer imageGeom;
   IGeometry::Pointer geom = dataContainer->getGeometry();
-  if (geom)
+  if(geom)
   {
     imageGeom = std::dynamic_pointer_cast<ImageGeom>(geom);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Data container contains a geometry that is not ImageGeometry");
     }
@@ -89,16 +76,16 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   else
   {
     imageGeom = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
-    if (!imageGeom)
+    if(!imageGeom)
     {
       itkExceptionMacro("Could not create image geometry");
     }
   }
-  for (size_t i = 0; i < VDimension; i++)
+  for(size_t i = 0; i < VDimension; i++)
   {
-	  torigin[i] = origin[i];
-	  tspacing[i] = spacing[i];
-	  tDims[i] = size[i];
+    torigin[i] = origin[i];
+    tspacing[i] = spacing[i];
+    tDims[i] = size[i];
   }
   imageGeom->setOrigin(FloatVec3Type(torigin[0], torigin[1], torigin[2]));
   imageGeom->setSpacing(FloatVec3Type(tspacing[0], tspacing[1], tspacing[2]));
@@ -106,12 +93,10 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   dataContainer->setGeometry(imageGeom);
 }
 
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GenerateData()
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GenerateData()
 {
-  DecoratorType *outputPtr = this->GetOutput();
+  DecoratorType* outputPtr = this->GetOutput();
   DataContainer::Pointer dataContainer = outputPtr->Get();
   ImagePointer inputPtr = dynamic_cast<ImageType*>(this->GetInput(0));
   // Create data array
@@ -121,54 +106,52 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
   std::vector<size_t> tDims = imageGeom->getDimensions().toContainer<std::vector<size_t>>();
 
   AttributeMatrix::Pointer attrMat;
-  if( dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
+  if(dataContainer->doesAttributeMatrixExist(m_AttributeMatrixArrayName.c_str()))
   {
-	attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-	// Check that attribute matrix type is 'cell'
-	if (attrMat->getType() != AttributeMatrix::Type::Cell)
-	{
-		itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
-	}
-	// Check that if size does not match, there are no other data array than the one we expect.
-	// That makes it possible to modify the attribute matrix without having to worry.
-	std::vector<size_t> matDims = attrMat->getTupleDimensions();
-	if (matDims != tDims)
-	{
-    if (! ((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1)
-      || ! (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)) )
-		{
-			itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
-		}
-		dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
-		attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
-	}
+    attrMat = dataContainer->getAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+    // Check that attribute matrix type is 'cell'
+    if(attrMat->getType() != AttributeMatrix::Type::Cell)
+    {
+      itkExceptionMacro("Attribute matrix is not of type AttributeMatrix::Type::Cell.");
+    }
+    // Check that if size does not match, there are no other data array than the one we expect.
+    // That makes it possible to modify the attribute matrix without having to worry.
+    std::vector<size_t> matDims = attrMat->getTupleDimensions();
+    if(matDims != tDims)
+    {
+      if(!((attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 1) ||
+           !(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()) && attrMat->getNumAttributeArrays() == 0)))
+      {
+        itkExceptionMacro("Tuples dimension of existing matrix array do not match image size and other attribute arrays are contained in this attribute matrix.");
+      }
+      dataContainer->removeAttributeMatrix(m_AttributeMatrixArrayName.c_str());
+      attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
+    }
   }
   else
   {
     attrMat = dataContainer->createAndAddAttributeMatrix(tDims, m_AttributeMatrixArrayName.c_str(), AttributeMatrix::Type::Cell);
   }
   // Checks if doesAttributeArray exists and remove it if it is the case
-  if (attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
+  if(attrMat->doesAttributeArrayExist(m_DataArrayName.c_str()))
   {
-	  IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
-	  if (attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
-	  {
-		  attrMat->removeAttributeArray(m_DataArrayName.c_str());
-	  }
+    IDataArray::Pointer attrArray = attrMat->getAttributeArray(m_DataArrayName.c_str());
+    if(attrArray->getNumberOfTuples() != imageGeom->getNumberOfElements())
+    {
+      attrMat->removeAttributeArray(m_DataArrayName.c_str());
+    }
   }
   typename DataArrayPixelType::Pointer data;
-  inputPtr->SetBufferedRegion( inputPtr->GetLargestPossibleRegion() );
-  if( m_InPlace )
+  inputPtr->SetBufferedRegion(inputPtr->GetLargestPossibleRegion());
+  if(m_InPlace)
   {
-    inputPtr->GetPixelContainer()->SetContainerManageMemory( false );
-    data = DataArrayPixelType::WrapPointer( reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()),
-              imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true );
+    inputPtr->GetPixelContainer()->SetContainerManageMemory(false);
+    data = DataArrayPixelType::WrapPointer(reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements(), cDims, this->GetDataArrayName().c_str(), true);
   }
   else
   {
-    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims,
-              m_DataArrayName.c_str(), true);
-    if (nullptr != data.get())
+    data = DataArrayPixelType::CreateArray(imageGeom->getNumberOfElements(), cDims, m_DataArrayName.c_str(), true);
+    if(nullptr != data.get())
     {
       ::memcpy(data->getPointer(0), reinterpret_cast<ValueType*>(inputPtr->GetBufferPointer()), imageGeom->getNumberOfElements() * sizeof(ValueType));
     }
@@ -178,38 +161,33 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 // Check that names has been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::CheckValidArrayPathComponentName(std::string var) const
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::CheckValidArrayPathComponentName(std::string var) const
 {
-  if (var.find('/') != std::string::npos)
+  if(var.find('/') != std::string::npos)
   {
     itkExceptionMacro("Name contains a '/'");
   }
-  if (var.empty())
+  if(var.empty())
   {
     itkExceptionMacro("Name is empty");
   }
 }
 
-
 // Check that the inputs have been initialized correctly
-template<typename PixelType, unsigned int VDimension>
-void
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::VerifyPreconditions() ITKv5_CONST
+template <typename PixelType, unsigned int VDimension>
+void InPlaceImageToDream3DDataFilter<PixelType, VDimension>::VerifyPreconditions() ITKv5_CONST
 {
-  //Test only works if image if of dimension 2 or 3
-  if (VDimension != 2 && VDimension != 3)
+  // Test only works if image if of dimension 2 or 3
+  if(VDimension != 2 && VDimension != 3)
   {
     itkExceptionMacro("Dimension must be 2 or 3.");
   }
   CheckValidArrayPathComponentName(m_AttributeMatrixArrayName);
   CheckValidArrayPathComponentName(m_DataArrayName);
   // Verify data container
-  const DecoratorType *outputPtr = this->GetOutput();
-  if (!outputPtr->Get())
+  const DecoratorType* outputPtr = this->GetOutput();
+  if(!outputPtr->Get())
   {
     itkExceptionMacro("Data container not set");
   }
@@ -218,23 +196,18 @@ InPlaceImageToDream3DDataFilter<PixelType, VDimension>
 }
 
 /**
-*
-*/
-template<typename PixelType, unsigned int VDimension>
-typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput()
+ *
+ */
+template <typename PixelType, unsigned int VDimension>
+typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput()
 {
-  return itkDynamicCastInDebugMode< DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-template<typename PixelType, unsigned int VDimension>
-const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType*
-InPlaceImageToDream3DDataFilter<PixelType, VDimension>
-::GetOutput() const
+template <typename PixelType, unsigned int VDimension>
+const typename InPlaceImageToDream3DDataFilter<PixelType, VDimension>::DecoratorType* InPlaceImageToDream3DDataFilter<PixelType, VDimension>::GetOutput() const
 {
-  return itkDynamicCastInDebugMode< const DecoratorType * >(this->GetPrimaryOutput());
+  return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
-
+} // namespace itk
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index 019198be88..a4b9edd8a4 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -26,12 +26,6 @@
 /* define to 1 if we are supporting ITK Filters */
 #cmakedefine SIMPL_USE_ITK
 
-/* define if Python wrapping is enabled through Pybind11 */
-#cmakedefine SIMPL_ENABLE_PYTHON
-
-/* define to 1 if we are checking relative paths */
-#cmakedefine SIMPL_RELATIVE_PATH_CHECK @SIMPL_RELATIVE_PATH_CHECK@
-
 /* ****************************************************************************
 * These define features that SIMPL will have when compiled.
 **************************************************************************** */
@@ -39,9 +33,12 @@
 /* define to 1 if we are enabling NTFS file checking */
 #cmakedefine SIMPL_NTFS_FILE_CHECK @SIMPL_NTFS_FILE_CHECK@
 
-/* define to 1 if we are enabling Python Wrapping through Pybind11 */
+/* define if Python wrapping is enabled through Pybind11 */
 #cmakedefine SIMPL_ENABLE_PYTHON
 
+/* define to 1 if we are checking relative paths */
+#cmakedefine SIMPL_RELATIVE_PATH_CHECK @SIMPL_RELATIVE_PATH_CHECK@
+
 /* ****************************************************************************
 * These define what source groups are being compiled
 **************************************************************************** */
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 7e241cabc6..6200a89021 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -36,16 +36,16 @@
 
 #include <QtCore/QDebug>
 
-#include "SIMPLib/Common/IObserver.h"
+#include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
+#include "H5Support/H5ScopedSentinel.h"
 
+#include "SIMPLib/Common/IObserver.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-#include "H5Support/QH5Utilities.h"
-#include "H5Support/H5ScopedSentinel.h"
-
 const QString Title = "HDF5 Read Error";
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index aad536f348..80b98016a7 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -146,35 +146,35 @@ int VTKFileReader::ignoreData(std::ifstream& in, int byteSize, char* text, int x
   int err = 0;
   if(strcmp(text, cunsigned_char) == 0)
   {
-    err |= skipVolume<unsigned char>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<uint8_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cchar) == 0)
   {
-    err |= skipVolume<char>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<int8_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cunsigned_short) == 0)
   {
-    err |= skipVolume<unsigned short>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<uint16_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cshort) == 0)
   {
-    err |= skipVolume<short>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<int16_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cunsigned_int) == 0)
   {
-    err |= skipVolume<unsigned int>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<uint32_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cint) == 0)
   {
-    err |= skipVolume<int>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<int32_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cunsigned_long) == 0)
   {
-    err |= skipVolume<unsigned long long int>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<uint64_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, clong) == 0)
   {
-    err |= skipVolume<long long int>(in, byteSize, xDim, yDim, zDim);
+    err |= skipVolume<int64_t>(in, byteSize, xDim, yDim, zDim);
   }
   if(strcmp(text, cfloat) == 0)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 85a84612fa..ddbdd98de6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -42,6 +42,7 @@
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QPainter>
+#include <QtCore/QTextStream>
 
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
@@ -49,11 +50,9 @@
 #include "H5Support/H5Lite.h"
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Utilities.h"
-
-#include <QtCore/QTextStream>
+#include "H5Support/QH5Lite.h"
 
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
-
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"

From 424185ed9c83bebd1afe285dce4c857dfbbb7e5d Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 13 Jan 2020 15:16:13 -0500
Subject: [PATCH 177/397] Fixed filter parameter requirement for CreateGeometry
 filter

* CreateGeometry uses uint64 arrays for Edge List, Triangle List, etc.
* datacheck() searched for uint64 arrays, but the GUI only allowed the user
to input int64 arrays
---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 2693bc187d..0b44de238b 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -202,7 +202,7 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::RequiredArray, CreateGeometry, req, 3));
-    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 2, AttributeMatrix::Category::Any);
+    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 2, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 3));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Edge Attribute Matrix", EdgeAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
@@ -210,7 +210,7 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::RequiredArray, CreateGeometry, req, 4));
-    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 3, AttributeMatrix::Category::Any);
+    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 4));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName2, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName0, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
@@ -218,7 +218,7 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::RequiredArray, CreateGeometry, req, 5));
-    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 4, AttributeMatrix::Category::Any);
+    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 4, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 5));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName3, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
@@ -226,7 +226,7 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::RequiredArray, CreateGeometry, req, 6));
-    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 4, AttributeMatrix::Category::Any);
+    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 4, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 6));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName4, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", TetCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
@@ -234,7 +234,7 @@ void CreateGeometry::setupFilterParameters()
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::RequiredArray, CreateGeometry, req, 7));
-    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int64, 8, AttributeMatrix::Category::Any);
+    req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 8, AttributeMatrix::Category::Any);
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 7));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName5, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", HexCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));

From 525782d09f281af977745a3e25d8d20e699cd0cc Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Mon, 13 Jan 2020 16:37:25 -0500
Subject: [PATCH 178/397] Fixed bug where LinkedChoicesFilterParameter wouldn't
 get values from GUI (#388)

* Removed LinkedChoicesFilterParameter's Setter and Getter callback
functions which shadowed the ChoiceFilterParameter functions
* ChoiceWidget casts to ChoiceFilterParameter not
LinkedChoicesFilterParameter
---
 .../LinkedChoicesFilterParameter.cpp          | 32 +++--------------
 .../LinkedChoicesFilterParameter.h            | 35 -------------------
 2 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index a031b0e679..0e40edf781 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -81,9 +81,9 @@ QString LinkedChoicesFilterParameter::getWidgetType() const
 void LinkedChoicesFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
-  if(!jsonValue.isUndefined() && m_SetterCallback)
+  if(!jsonValue.isUndefined() && getSetterCallback())
   {
-    m_SetterCallback(jsonValue.toInt(0.0));
+    getSetterCallback()(jsonValue.toInt(0.0));
   }
 }
 
@@ -92,9 +92,9 @@ void LinkedChoicesFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void LinkedChoicesFilterParameter::writeJson(QJsonObject& json)
 {
-  if(m_GetterCallback)
+  if(getGetterCallback())
   {
-    json[getPropertyName()] = m_GetterCallback();
+    json[getPropertyName()] = getGetterCallback()();
   }
 }
 
@@ -134,27 +134,3 @@ QStringList LinkedChoicesFilterParameter::getLinkedProperties() const
 {
   return m_LinkedProperties;
 }
-
-// -----------------------------------------------------------------------------
-void LinkedChoicesFilterParameter::setSetterCallback(const LinkedChoicesFilterParameter::SetterCallbackType& value)
-{
-  m_SetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-LinkedChoicesFilterParameter::SetterCallbackType LinkedChoicesFilterParameter::getSetterCallback() const
-{
-  return m_SetterCallback;
-}
-
-// -----------------------------------------------------------------------------
-void LinkedChoicesFilterParameter::setGetterCallback(const LinkedChoicesFilterParameter::GetterCallbackType& value)
-{
-  m_GetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-LinkedChoicesFilterParameter::GetterCallbackType LinkedChoicesFilterParameter::getGetterCallback() const
-{
-  return m_GetterCallback;
-}
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index a432622e3a..d5674d9598 100755
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -67,9 +67,6 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
      */
     static QString ClassName();
 
-    using SetterCallbackType = std::function<void(int)>;
-    using GetterCallbackType = std::function<int(void)>;
-
     /**
      * @brief New This function instantiates an instance of the LinkedChoicesFilterParameter. Although this function is available to be used,
      * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_LINKED_CHOICES_FP(...) macro at the top of this file.
@@ -125,36 +122,6 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
      */
     void writeJson(QJsonObject& json) override;
 
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const LinkedChoicesFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    LinkedChoicesFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const LinkedChoicesFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    LinkedChoicesFilterParameter::GetterCallbackType getGetterCallback() const;
-
   protected:
       /**
        * @brief LinkedChoicesFilterParameter The default constructor.  It is protected because this
@@ -170,7 +137,5 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
 
   private:
     QStringList m_LinkedProperties = {};
-    LinkedChoicesFilterParameter::SetterCallbackType m_SetterCallback = {};
-    LinkedChoicesFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
 

From 5b67dd050fc5dc29db979497119ff6271ae59064 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 18 Jan 2020 10:20:07 -0500
Subject: [PATCH 179/397] Fix:Saving Pipelines to JSON does not expand prior
 pipelines.

If a "Read DREAM3D File" filter was used within a pipeline, the pipeline
is executed and then the pipeline is saved the resulting JSON file will
have the current pipeline filters in addition to any previous pipeline that
is stored in the .dream3d file. This is unexpected behavior and is fixed
with this commit.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/DataContainerWriter.cpp       |   5 +-
 .../Testing/Cxx/DataContainerTest.cpp         | 107 +++++++++---------
 .../AbstractFilterParametersWriter.h          |   2 +-
 .../H5FilterParametersReader.cpp              |   6 +-
 .../H5FilterParametersWriter.cpp              |  10 +-
 .../H5FilterParametersWriter.h                |   2 +-
 .../JsonFilterParametersWriter.cpp            |  46 +++-----
 .../JsonFilterParametersWriter.h              | 107 ++++++++++--------
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   7 +-
 9 files changed, 144 insertions(+), 148 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index d267792954..abc91528a2 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -381,8 +381,7 @@ int DataContainerWriter::writePipeline()
     {
       break;
     }
-
-      previousFilter = previousFilter->getPreviousFilter().lock();
+    previousFilter = previousFilter->getPreviousFilter().lock();
   }
 
   FilterPipeline::Pointer pipeline = FilterPipeline::New();
@@ -397,7 +396,7 @@ int DataContainerWriter::writePipeline()
     currentFilter = nextFilter;
   }
 
-  return writer->writePipelineToFile(pipeline, m_OutputFile, SIMPL::StringConstants::PipelineGroupName);
+  return writer->writePipelineToFile(pipeline, m_OutputFile, SIMPL::StringConstants::PipelineGroupName, true);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index affc880474..7a9790e097 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -33,7 +33,8 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <tuple>
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -43,7 +44,6 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/StructArray.hpp"
@@ -51,7 +51,6 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/CoreFilters/DataContainerWriter.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
@@ -61,7 +60,6 @@
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -184,7 +182,7 @@ class DataContainerTest
   void CreateDataArray(AttributeMatrix::Pointer attrMat, std::vector<size_t> compDims)
   {
     QString name("[");
-    for(int i = 0; i < compDims.size(); i++)
+    for(size_t i = 0; i < compDims.size(); i++)
     {
       name = name + QString::number(compDims[i]);
       if(i < compDims.size() - 1)
@@ -207,6 +205,7 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   void CreateStringArray(AttributeMatrix::Pointer attrMat, std::vector<size_t> compDims)
   {
+    std::ignore = compDims;
     QString name("ExampleStringDataArray");
     StringDataArray::Pointer data = StringDataArray::CreateArray(attrMat->getNumberOfTuples(), name, true);
     for(size_t i = 0; i < attrMat->getNumberOfTuples(); i++)
@@ -320,16 +319,16 @@ class DataContainerTest
     AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(tupleDims, getCellFeatureAttributeMatrixName(), AttributeMatrix::Type::CellFeature);
     m->addOrReplaceAttributeMatrix(attrMatrix);
 
-    int size = nx * ny * nz;
+    size_t size = static_cast<size_t>(nx * ny * nz);
     Int32ArrayType::Pointer featureIds = Int32ArrayType::CreateArray(size, SIMPL::CellData::FeatureIds, true);
-    for(int i = 0; i < size; ++i)
+    for(size_t i = 0; i < size; ++i)
     {
-      featureIds->setValue(i, i + DataContainerIOTest::Offset);
+      featureIds->setValue(i, static_cast<int32_t>(i + DataContainerIOTest::Offset));
     }
     attrMatrix->insertOrAssign(featureIds);
 
     BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(size, SIMPL::CellData::BoundaryCells, true);
-    for(int i = 0; i < size; ++i)
+    for(size_t i = 0; i < size; ++i)
     {
       boolArray->setValue(i, i + DataContainerIOTest::Offset);
     }
@@ -337,7 +336,7 @@ class DataContainerTest
 
     std::vector<size_t> dims(1, 3);
     FloatArrayType::Pointer avgEuler = FloatArrayType::CreateArray(size, dims, SIMPL::FeatureData::AxisEulerAngles, true);
-    for(int32_t i = 0; i < size; ++i)
+    for(size_t i = 0; i < size; ++i)
     {
       avgEuler->setComponent(i, 0, i * 0.665f);
       avgEuler->setComponent(i, 1, i * 0.325f);
@@ -351,7 +350,7 @@ class DataContainerTest
     m->addOrReplaceAttributeMatrix(ensemAttrMat);
 
     FloatArrayType::Pointer surfArea = FloatArrayType::CreateArray(4, SIMPL::EnsembleData::TotalSurfaceAreas, true);
-    for(int i = 0; i < 4; ++i)
+    for(size_t i = 0; i < 4; ++i)
     {
       surfArea->setValue(i, i + 41.2f);
     }
@@ -374,7 +373,7 @@ class DataContainerTest
     writer->execute();
     int err = writer->getErrorCode();
 
-    DREAM3D_REQUIRE_EQUAL(err, 0);
+    DREAM3D_REQUIRE_EQUAL(err, 0)
   }
 
   // -----------------------------------------------------------------------------
@@ -413,7 +412,7 @@ class DataContainerTest
 
     writer->execute();
     err = writer->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, 0);
+    DREAM3D_REQUIRE_EQUAL(err, 0)
 
     QMap<QString, DataContainerProxy>& dcsToRead = dcaProxy.getDataContainers();
     // uint32_t dcType = SIMPL::DataContainerType::UnknownDataContainer;
@@ -467,7 +466,7 @@ class DataContainerTest
 
     writer2->execute();
     err = writer2->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, 0);
+    DREAM3D_REQUIRE_EQUAL(err, 0)
   }
 
   // -----------------------------------------------------------------------------
@@ -498,25 +497,25 @@ class DataContainerTest
 
     // get the array as an IDataArray
     IDataArray::Pointer ida = attrMat->getAttributeArray("Test");
-    DREAM3D_REQUIRE_VALID_POINTER(ida.get());
+    DREAM3D_REQUIRE_VALID_POINTER(ida.get())
 
     std::vector<size_t> dims(1, 1);
     t = attrMat->getPrereqArray<T, AbstractFilter>(nullptr, "Test", -723, dims);
-    DREAM3D_REQUIRE_VALID_POINTER(ida.get());
+    DREAM3D_REQUIRE_VALID_POINTER(ida.get())
 
     // Remove the AttributeArray from the AttributeMatrix
     ida = attrMat->removeAttributeArray("Test");
-    DREAM3D_REQUIRE_VALID_POINTER(ida.get());
+    DREAM3D_REQUIRE_VALID_POINTER(ida.get())
 
     // Now try and get the array again. we should fail
     t = attrMat->getAttributeArrayAs<T>("Test");
-    DREAM3D_REQUIRE_NULL_POINTER(t.get());
+    DREAM3D_REQUIRE_NULL_POINTER(t.get())
     // Try to get it as an IDataArray. We should fail
     ida = attrMat->getAttributeArray("Test");
-    DREAM3D_REQUIRE_NULL_POINTER(ida.get());
+    DREAM3D_REQUIRE_NULL_POINTER(ida.get())
 
     t = attrMat->getPrereqArray<T, AbstractFilter>(nullptr, "Test", -723, dims);
-    DREAM3D_REQUIRE_NULL_POINTER(t.get());
+    DREAM3D_REQUIRE_NULL_POINTER(t.get())
 
     // Remove the AttributeMatrix to setup for the next test.
     m->removeAttributeMatrix(getCellAttributeMatrixName());
@@ -549,7 +548,7 @@ class DataContainerTest
       }
 
       JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
-      jsonWriter->writePipelineToFile(pipeline, jsonFile, nullptr);
+      jsonWriter->writePipelineToFile(pipeline, jsonFile, {"TEST PIPELINE"}, false);
 
       JsonFilterParametersReader::Pointer jsonReader = JsonFilterParametersReader::New();
       pipeline = jsonReader->readPipelineFromFile(jsonFile, nullptr);
@@ -574,7 +573,7 @@ class DataContainerTest
       }
 
       H5FilterParametersWriter::Pointer h5Writer = H5FilterParametersWriter::New();
-      h5Writer->writePipelineToFile(pipeline, h5File, "Pipeline");
+      h5Writer->writePipelineToFile(pipeline, h5File, "Pipeline", false);
 
       H5FilterParametersReader::Pointer h5Reader = H5FilterParametersReader::New();
       pipeline = h5Reader->readPipelineFromFile(h5File, nullptr);
@@ -916,20 +915,20 @@ class DataContainerTest
     DataContainer::Pointer dc1 = DataContainer::New(k_DC1);
 
     result = dca->addOrReplaceDataContainer(dc0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 1)
 
     // Add the same DataContainer a second time. Still returns true. Size stays at 1
     result = dca->insertOrAssign(dc0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 1)
 
     result = dca->push_back(dc0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 1)
 
     result = dca->addOrReplaceDataContainer(dc1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 2)
 
     dc0 = dca->removeDataContainer(k_DC0);
@@ -941,15 +940,15 @@ class DataContainerTest
     DREAM3D_REQUIRED(dca->empty(), ==, true)
 
     result = dca->addOrReplaceDataContainer(dc0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 1)
 
     result = dca->push_back(dc0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 1)
 
     result = dca->addOrReplaceDataContainer(dc1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 2)
 
     // getDataContainers
@@ -965,7 +964,7 @@ class DataContainerTest
     DREAM3D_REQUIRED(dca->size(), ==, 2)
     dca->clear();
     DREAM3D_REQUIRED(dca->empty(), ==, true)
-    for(int i = 0; i < 10; i++)
+    for(size_t i = 0; i < 10; i++)
     {
       DataContainer::Pointer dc = DataContainer::New("Foo" + QString::number(i));
       dca->addOrReplaceDataContainer(dc);
@@ -974,14 +973,14 @@ class DataContainerTest
     }
 
     result = dca->insertOrAssign(dc0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 11)
 
     result = dca->insertOrAssign(dc0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 11)
     result = dca->insertOrAssign(dc1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dca->size(), ==, 12)
   }
 
@@ -1009,20 +1008,20 @@ class DataContainerTest
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(tDims, k_DC1, AttributeMatrix::Type::Generic);
 
     result = dc->addOrReplaceAttributeMatrix(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 1)
 
     // Add the same AttributeMatrix a second time. Still returns true. Size stays at 1
     result = dc->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 1)
 
     result = dc->push_back(am0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 1)
 
     result = dc->addOrReplaceAttributeMatrix(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 2)
 
     am0 = dc->removeAttributeMatrix(k_DC0);
@@ -1034,15 +1033,15 @@ class DataContainerTest
     DREAM3D_REQUIRED(dc->empty(), ==, true)
 
     result = dc->addOrReplaceAttributeMatrix(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 1)
 
     result = dc->push_back(am0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 1)
 
     result = dc->addOrReplaceAttributeMatrix(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 2)
 
     // getDataContainers
@@ -1058,7 +1057,7 @@ class DataContainerTest
     DREAM3D_REQUIRED(dc->size(), ==, 2)
     dc->clear();
     DREAM3D_REQUIRED(dc->empty(), ==, true)
-    for(int i = 0; i < 10; i++)
+    for(size_t i = 0; i < 10; i++)
     {
       AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Foo" + QString::number(i), AttributeMatrix::Type::Generic);
       dc->addOrReplaceAttributeMatrix(am);
@@ -1067,14 +1066,14 @@ class DataContainerTest
     }
 
     result = dc->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 11)
 
     result = dc->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 11)
     result = dc->insertOrAssign(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(dc->size(), ==, 12)
   }
 
@@ -1102,20 +1101,20 @@ class DataContainerTest
     Int32ArrayType::Pointer am1 = Int32ArrayType::CreateArray(100, k_DC1, true);
 
     result = am->addOrReplaceAttributeArray(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 1)
 
     // Add the same AttributeMatrix a second time. Still returns true. Size stays at 1
     result = am->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 1)
 
     result = am->push_back(am0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 1)
 
     result = am->addOrReplaceAttributeArray(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 2)
 
     IDataArray::Pointer da0 = am->removeAttributeArray(k_DC0);
@@ -1127,15 +1126,15 @@ class DataContainerTest
     DREAM3D_REQUIRED(am->empty(), ==, true)
 
     result = am->addOrReplaceAttributeArray(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 1)
 
     result = am->push_back(am0);
-    DREAM3D_REQUIRED(false, ==, result);
+    DREAM3D_REQUIRED(false, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 1)
 
     result = am->addOrReplaceAttributeArray(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 2)
 
     // getDataContainers
@@ -1160,14 +1159,14 @@ class DataContainerTest
     }
 
     result = am->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 11)
 
     result = am->insertOrAssign(am0);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 11)
     result = am->insertOrAssign(am1);
-    DREAM3D_REQUIRED(true, ==, result);
+    DREAM3D_REQUIRED(true, ==, result)
     DREAM3D_REQUIRED(am->size(), ==, 12)
   }
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index 73eb55a112..e96fab709d 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -85,7 +85,7 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
     virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
     virtual int closeFilterGroup() = 0;
 
-    virtual int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver*> obs = QList<IObserver*>()) = 0;
+    virtual int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) = 0;
 
     virtual int writeValue(const QString& name, const QString& value);
     virtual int writeValue(const QString& name, const QVector<QString>& value);
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 85baafebfe..0e79a8d6e5 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -292,8 +292,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
     }
 
     JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
-    jsonWriter->setExpandReaderFilters(false);
-    jsonString = jsonWriter->writePipelineToString(pipeline, "");
+    jsonString = jsonWriter->writePipelineToString(pipeline, "", false);
   }
 
   return jsonString;
@@ -305,7 +304,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
 int H5FilterParametersReader::openFilterGroup(AbstractFilter* filter, int index)
 {
   int err = 0;
-
+  std::ignore = filter;
   if(m_Version < 0)
   {
     if(m_PipelineGroupId <= 0)
@@ -1046,6 +1045,7 @@ AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString& name, Ax
 // -----------------------------------------------------------------------------
 QVector<AxisAngleInput_t> H5FilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v)
 {
+  std::ignore = v;
   QVector<AxisAngleInput_t> axisAngleInputsVector;
   AxisAngleInput_t axisAngleDummyInput;
   axisAngleDummyInput.angle = 0.0f;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 9f3b534bab..9a65002c2a 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -35,17 +35,17 @@
 
 #include "H5FilterParametersWriter.h"
 
+#include <tuple>
+
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
 
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
 
-#include <QtCore/QTextStream>
-
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
@@ -73,7 +73,7 @@ hid_t H5FilterParametersWriter::getCurrentGroupId() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver *> obs)
+int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs)
 {
   if(nullptr == pipeline.get())
   {
@@ -140,7 +140,7 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
   QH5Lite::writeStringAttribute(pipelineGroupId, "/" + SIMPL::StringConstants::PipelineGroupName, SIMPL::StringConstants::PipelineCurrentName, pipelineName);
 
   JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
-  QString jsonString = jsonWriter->writePipelineToString(pipeline, pipelineName, obs);
+  QString jsonString = jsonWriter->writePipelineToString(pipeline, pipelineName, expandPipeline, obs);
   QH5Lite::writeStringDataset(pipelineGroupId, pipelineName, jsonString);
 
   return 0;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index b4e8410a5f..b9a954aa84 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -81,7 +81,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
      * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
      * @return
      */
-    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver*> obs = QList<IObserver*>()) override;
+    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) override;
 
     /**
      * @brief Setter property for PipelineGroupId
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 6ebc051086..50836daf48 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -49,22 +49,15 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-JsonFilterParametersWriter::JsonFilterParametersWriter()
-: m_ExpandReaderFilters(true)
-, m_MaxFilterIndex(-1)
-, m_CurrentIndex(0)
-{
-}
+JsonFilterParametersWriter::JsonFilterParametersWriter() = default;
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-JsonFilterParametersWriter::JsonFilterParametersWriter(QString& fileName, QString& pipelineName, int& numFilters)
-: m_MaxFilterIndex(-1)
-, m_CurrentIndex(0)
+JsonFilterParametersWriter::JsonFilterParametersWriter(QString& fileName, QString& pipelineName)
+: m_FileName(fileName)
+, m_PipelineName(pipelineName)
 {
-  m_FileName = fileName;
-  m_PipelineName = pipelineName;
 }
 
 // -----------------------------------------------------------------------------
@@ -75,10 +68,10 @@ JsonFilterParametersWriter::~JsonFilterParametersWriter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int JsonFilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver *> obs)
+int JsonFilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs)
 {
   int err = 0;
-  err = populateWriter(pipeline, pipelineName, obs);
+  err = populateWriter(pipeline, pipelineName, expandPipeline, obs);
   if(err < 0)
   {
     return err;
@@ -93,9 +86,14 @@ int JsonFilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString JsonFilterParametersWriter::writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, QList<IObserver*> obs)
+QString JsonFilterParametersWriter::writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs)
 {
-  populateWriter(pipeline, pipelineName, obs);
+  int err = 0;
+  err = populateWriter(pipeline, pipelineName, expandPipeline, obs);
+  if(err < 0)
+  {
+    return {""};
+  }
 
   QJsonDocument doc = toDocument();
   QString contents = QString::fromStdString(doc.toJson().toStdString());
@@ -108,7 +106,7 @@ QString JsonFilterParametersWriter::writePipelineToString(FilterPipeline::Pointe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, QList<IObserver*> obs)
+int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs)
 {
   if(nullptr == pipeline.get())
   {
@@ -145,7 +143,7 @@ int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline,
     if(nullptr != filter.get())
     {
       DataContainerReader::Pointer reader = std::dynamic_pointer_cast<DataContainerReader>(filter);
-      if((reader.get() != nullptr) && m_ExpandReaderFilters)
+      if((reader.get() != nullptr) && expandPipeline)
       {
         offset = reader->writeExistingPipelineToFile(m_Root, i);
       }
@@ -292,7 +290,7 @@ int JsonFilterParametersWriter::closeFilterGroup()
 // -----------------------------------------------------------------------------
 QString JsonFilterParametersWriter::generateIndexString(int currentIndex)
 {
-  Q_UNUSED(currentIndex);
+  Q_UNUSED(currentIndex)
   QString numStr = QString::number(m_CurrentIndex);
 
   if(m_MaxFilterIndex > 10)
@@ -362,18 +360,6 @@ QString JsonFilterParametersWriter::getPipelineName() const
   return m_PipelineName;
 }
 
-// -----------------------------------------------------------------------------
-void JsonFilterParametersWriter::setExpandReaderFilters(bool value)
-{
-  m_ExpandReaderFilters = value;
-}
-
-// -----------------------------------------------------------------------------
-bool JsonFilterParametersWriter::getExpandReaderFilters() const
-{
-  return m_ExpandReaderFilters;
-}
-
 // -----------------------------------------------------------------------------
 void JsonFilterParametersWriter::setMaxFilterIndex(int value)
 {
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index d263df3351..bafaf6c1a0 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -65,6 +65,15 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
 
     static Pointer New();
 
+    /**
+     * @brief JsonFilterParametersWriter
+     * @param fileName
+     * @param pipelineName
+     */
+    JsonFilterParametersWriter(QString& fileName, QString& pipelineName);
+
+    ~JsonFilterParametersWriter() override;
+
     /**
      * @brief Returns the name of the class for JsonFilterParametersWriter
      */
@@ -95,39 +104,27 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
     QString getPipelineName() const;
 
     /**
-     * @brief Setter property for ExpandReaderFilters
-     */
-    void setExpandReaderFilters(bool value);
-    /**
-     * @brief Getter property for ExpandReaderFilters
-     * @return Value of ExpandReaderFilters
+     * @brief WritePipelineToFile This function will write a pipeline to a
+     * JSON file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
+     * function <b>WITHOUT WARNING</b>
+     * @param pipeline The pipeline to be written
+     * @param filePath The file path to write
+     * @param pipelineName The name of the pipeline (Typically the name of the file)
+     * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
+     * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+     * @return
      */
-    bool getExpandReaderFilters() const;
-
-    JsonFilterParametersWriter(QString& fileName, QString& pipelineName, int& numFilters);
-
-    ~JsonFilterParametersWriter() override;
-
-    /**
-    * @brief WritePipelineToFile This function will write a pipeline to a
-    * JSON file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
-    * function <b>WITHOUT WARNING</b>
-    * @param pipeline The pipeline to be written
-    * @param filePath The file path to write
-    * @param pipelineName The name of the pipeline (Typically the name of the file)
-    * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
-    * @return
-    */
-    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, QList<IObserver*> obs = QList<IObserver*>()) override;
+    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipelines, QList<IObserver*> obs = QList<IObserver*>()) override;
 
     /**
-    * @brief WritePipelineToString This function will write a pipeline to a QString.
-    * @param pipeline The pipeline to be written
-    * @param pipelineName The name of the pipeline (Typically the name of the file)
-    * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
-    * @return The pipeline as a QString
-    */
-    QString writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, QList<IObserver *> obs = QList<IObserver*>());
+     * @brief WritePipelineToString This function will write a pipeline to a QString.
+     * @param pipeline The pipeline to be written
+     * @param pipelineName The name of the pipeline (Typically the name of the file)
+     * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
+     * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+     * @return The pipeline as a QString
+     */
+    QString writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>());
 
     /**
      * @brief openFilterGroup
@@ -143,12 +140,16 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
      */
     int closeFilterGroup() override;
 
+  protected:
+    JsonFilterParametersWriter();
 
-    /**
-     * @brief getCurrentGroupObject
-     * @return
-     */
-    QJsonObject& getCurrentGroupObject();
+  private:
+    int m_CurrentIndex = 0;
+    int m_MaxFilterIndex = -1;
+    QString m_FileName = {};
+    QString m_PipelineName = {};
+    QJsonObject m_Root;
+    QJsonObject m_CurrentFilterIndex;
 
     /**
      * @brief Setter property for MaxFilterIndex
@@ -160,23 +161,35 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
      */
     int getMaxFilterIndex() const;
 
-  protected:
-    JsonFilterParametersWriter();
-
-  private:
-    QString m_FileName = {};
-    QString m_PipelineName = {};
-    bool m_ExpandReaderFilters = {};
-    int m_MaxFilterIndex = {};
+    /**
+     * @brief getCurrentGroupObject
+     * @return
+     */
+    QJsonObject& getCurrentGroupObject();
 
-    QJsonObject m_Root;
-    QJsonObject m_CurrentFilterIndex;
-    int         m_CurrentIndex;
+    /**
+     * @brief populateWriter
+     * @param pipeline
+     * @param pipelineName
+     * @param obs
+     * @return
+     */
+    int populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs);
 
-    int populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, QList<IObserver *> obs);
+    /**
+     * @brief writePipeline
+     */
     void writePipeline();
+
+    /**
+     * @brief clearWriter
+     */
     void clearWriter();
 
+    /**
+     * @brief toDocument
+     * @return
+     */
     QJsonDocument toDocument();
 
     /**
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 6ef252608d..d10baa2909 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -634,7 +634,7 @@ int SVPipelineView::writePipeline(const QString& outputPath)
     }
 
     H5FilterParametersWriter::Pointer dream3dWriter = H5FilterParametersWriter::New();
-    err = dream3dWriter->writePipelineToFile(pipeline, fi.absoluteFilePath(), fi.fileName(), observers);
+    err = dream3dWriter->writePipelineToFile(pipeline, fi.absoluteFilePath(), fi.fileName(), false, observers);
   }
   else if(ext == "json")
   {
@@ -645,7 +645,7 @@ int SVPipelineView::writePipeline(const QString& outputPath)
     }
 
     JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
-    jsonWriter->writePipelineToFile(pipeline, fi.absoluteFilePath(), fi.fileName(), observers);
+    jsonWriter->writePipelineToFile(pipeline, fi.absoluteFilePath(), fi.fileName(), false, observers);
   }
   else
   {
@@ -717,8 +717,7 @@ void SVPipelineView::copySelectedFilters()
   }
 
   JsonFilterParametersWriter::Pointer jsonWriter = JsonFilterParametersWriter::New();
-  jsonWriter->setExpandReaderFilters(false);
-  QString jsonString = jsonWriter->writePipelineToString(pipeline, "Pipeline");
+  QString jsonString = jsonWriter->writePipelineToString(pipeline, "Pipeline", false);
 
   QClipboard* clipboard = QApplication::clipboard();
   clipboard->setText(jsonString);

From 6d8b4a4a9dad4654da561a1a0e0fb1ae02c7ccb7 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 21 Jan 2020 13:39:57 -0500
Subject: [PATCH 180/397] Fix install rules for itkExplicit library

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SimpleITKExplicit/CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Source/SimpleITKExplicit/CMakeLists.txt b/Source/SimpleITKExplicit/CMakeLists.txt
index 892bafc6d9..dbe90ff9c2 100644
--- a/Source/SimpleITKExplicit/CMakeLists.txt
+++ b/Source/SimpleITKExplicit/CMakeLists.txt
@@ -74,11 +74,17 @@ function(sitk_install_exported_target tgt)
   endif()
 endfunction()
 
-set(install_dir "bin")
+#-- Configure Target Installation Rules
+set(install_dir "tools")
 set(lib_install_dir "lib")
-if(WIN32)
-    set(install_dir ".")
-    set(lib_install_dir ".")
+
+if(APPLE)
+  get_property(DREAM3D_PACKAGE_DEST_PREFIX GLOBAL PROPERTY DREAM3D_PACKAGE_DEST_PREFIX)
+  set(install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}bin")
+  set(lib_install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}lib")
+elseif(WIN32)
+  set(install_dir ".")
+  set(lib_install_dir ".")
 endif()
 
 set(SimpleITKExplicit_INSTALL_RUNTIME_DIR "${install_dir}")

From 0273758ad9ac0ebd711b29011a75a1ca5f2dd859 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 21 Feb 2020 15:29:34 -0500
Subject: [PATCH 181/397] Updating macros to use the enumeration values
 directly.

It is up to the developer/consumer of the macro to take into account
that the enumerations start at 1.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 18bc752ccb..7f34e2f3b0 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -396,38 +396,44 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 #define Dream3DArraySwitchOutputComponentMacro(call, type, path, errorCondition)                                                                                                                       \
   switch(type)                                                                                                                                                                                         \
   {                                                                                                                                                                                                    \
-  case itk::ImageIOBase::IOComponentType::UCHAR - 1:                                                                                                                                                   \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint8_t, 0);                                                                                                                                     \
+  case itk::ImageIOBase::IOComponentType::UCHAR:                                                                                                                                                       \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint8_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::CHAR - 1:                                                                                                                                                    \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int8_t, 0);                                                                                                                                      \
+  case itk::ImageIOBase::IOComponentType::CHAR:                                                                                                                                                        \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int8_t, 0);                                                                                                                          \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::USHORT - 1:                                                                                                                                                  \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint16_t, 0);                                                                                                                                    \
+  case itk::ImageIOBase::IOComponentType::USHORT:                                                                                                                                                      \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint16_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::SHORT - 1:                                                                                                                                                   \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int16_t, 0);                                                                                                                                     \
+  case itk::ImageIOBase::IOComponentType::SHORT:                                                                                                                                                       \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int16_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::UINT - 1:                                                                                                                                                    \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint32_t, 0);                                                                                                                                    \
+  case itk::ImageIOBase::IOComponentType::UINT:                                                                                                                                                        \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint32_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::INT - 1:                                                                                                                                                     \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int32_t, 0);                                                                                                                                     \
+  case itk::ImageIOBase::IOComponentType::INT:                                                                                                                                                         \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int32_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::ULONG - 1:                                                                                                                                                   \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                                    \
+  case itk::ImageIOBase::IOComponentType::ULONG:                                                                                                                                                       \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::LONG - 1:                                                                                                                                                    \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                                     \
+  case itk::ImageIOBase::IOComponentType::LONG:                                                                                                                                                        \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::FLOAT - 1:                                                                                                                                                   \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, float, 0);                                                                                                                                       \
+  case itk::ImageIOBase::IOComponentType::ULONGLONG:                                                                                                                                                   \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::DOUBLE - 1:                                                                                                                                                  \
-    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, double, 0);                                                                                                                                      \
+  case itk::ImageIOBase::IOComponentType::LONGLONG:                                                                                                                                                    \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                         \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::FLOAT:                                                                                                                                                       \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, float, 0);                                                                                                                           \
+    break;                                                                                                                                                                                             \
+  case itk::ImageIOBase::IOComponentType::DOUBLE:                                                                                                                                                      \
+    Dream3DArraySwitchMacroOutputType(call, path, errorCondition, double, 0);                                                                                                                          \
     break;                                                                                                                                                                                             \
   default:                                                                                                                                                                                             \
-    setErrorCondition(errorCondition, "Unsupported pixel component");                                                                                                                                 \
+    setErrorCondition(errorCondition, "Unsupported pixel component");                                                                                                                                  \
     break;                                                                                                                                                                                             \
   }
 

From b7fb4125c24c5dc14c66c6003cbe007592b19988 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 25 Feb 2020 09:18:44 -0500
Subject: [PATCH 182/397] Allow users to select multi-component arrays to
 conditionally set values

The current implementation will set the same value across all tuple values

updates #389

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/ConditionalSetValue.cpp       | 44 +++++++------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 31a14d1210..7b88b66313 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -32,15 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "ConditionalSetValue.h"
 
 #include <memory>
-
-#include "ConditionalSetValue.h"
+#include <tuple>
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -76,7 +75,7 @@ void ConditionalSetValue::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Conditional Array", ConditionalArrayPath, FilterParameter::RequiredArray, ConditionalSetValue, req));
   }
   {
-    DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, 1, AttributeMatrix::Category::Any);
+    DataArraySelectionFilterParameter::RequirementType req;
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, ConditionalSetValue, req));
   }
   setFilterParameters(parameters);
@@ -97,7 +96,8 @@ void ConditionalSetValue::readFilterParameters(AbstractFilterParametersReader* r
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void checkValuesInt(AbstractFilter* filter, double replaceValue, QString strType)
+template <typename T>
+void checkValuesInt(AbstractFilter* filter, double replaceValue, QString strType)
 {
   QString ss;
 
@@ -111,7 +111,8 @@ template <typename T> void checkValuesInt(AbstractFilter* filter, double replace
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double replaceValue, QString strType)
+template <typename T>
+void checkValuesFloatDouble(AbstractFilter* filter, double replaceValue, QString strType)
 {
   QString ss;
 
@@ -127,13 +128,14 @@ template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double
 //
 // -----------------------------------------------------------------------------
 
-template <typename T> void replaceValue(AbstractFilter* filter, IDataArray::Pointer inDataPtr, BoolArrayType::Pointer condDataPtr, double replaceValue)
+template <typename T>
+void replaceValue(AbstractFilter* filter, IDataArray::Pointer inDataPtr, BoolArrayType::Pointer condDataPtr, double replaceValue)
 {
+  std::ignore = filter;
   typename DataArray<T>::Pointer inputArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(inDataPtr);
 
   T replaceVal = static_cast<T>(replaceValue);
 
-  T* inData = inputArrayPtr->getPointer(0);
   bool* condData = condDataPtr->getPointer(0);
   size_t numTuples = inputArrayPtr->getNumberOfTuples();
 
@@ -141,7 +143,7 @@ template <typename T> void replaceValue(AbstractFilter* filter, IDataArray::Poin
   {
     if(condData[iter])
     {
-      inData[iter] = replaceVal;
+      inputArrayPtr->initializeTuple(iter, &replaceVal);
     }
   }
 }
@@ -168,31 +170,19 @@ void ConditionalSetValue::dataCheck()
   {
     return;
   }
-  if(getErrorCode() >= 0)
-  {
-    dataArrayPaths.push_back(getSelectedArrayPath());
-  }
+  dataArrayPaths.push_back(getSelectedArrayPath());
 
-  if(m_ArrayPtr.lock()->getNumberOfComponents() > 1)
+  std::vector<size_t> cDims(1, 1);
+  m_ConditionalArrayPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getConditionalArrayPath(), cDims);
+  if(getErrorCode() < 0)
   {
-    QString ss = QObject::tr("Selected array '%1' must be a scalar array (1 component). The number of components is %2")
-                     .arg(getSelectedArrayPath().getDataArrayName())
-                     .arg(m_ArrayPtr.lock()->getNumberOfComponents());
-    setErrorCondition(-11002, ss);
     return;
   }
-
-  std::vector<size_t> cDims(1, 1);
-  m_ConditionalArrayPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getConditionalArrayPath(),
-                                                                                                           cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_ConditionalArrayPtr.lock())                                                                      /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  if(nullptr != m_ConditionalArrayPtr.lock())
   {
     m_ConditionalArray = m_ConditionalArrayPtr.lock()->getPointer(0);
-  } /* Now assign the raw pointer to data from the DataArray<T> object */
-  if(getErrorCode() >= 0)
-  {
-    dataArrayPaths.push_back(getConditionalArrayPath());
   }
+  dataArrayPaths.push_back(getConditionalArrayPath());
 
   getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, dataArrayPaths);
 

From 54878ca0e47c13c7beb12077145df058fcd40d4d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 25 Feb 2020 15:52:25 -0500
Subject: [PATCH 183/397] Fix unit test failure for ConditionalSetValueUnitTest

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Testing/Cxx/ConditionalSetValueTest.cpp   | 95 +++++++++++--------
 1 file changed, 58 insertions(+), 37 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 4d98c861ba..111d5788cd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -35,15 +35,15 @@
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/CoreFilters/ConditionalSetValue.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
@@ -209,7 +209,8 @@ class ConditionalSetValueTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void validateReplacedValues(IDataArray::Pointer iArray, IDataArray::Pointer cArray)
+  template <typename T>
+  void validateReplacedValues(IDataArray::Pointer iArray, IDataArray::Pointer cArray)
   {
     typename DataArray<T>::Pointer dataArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(iArray);
     typename DataArray<bool>::Pointer condArrayPtr = std::dynamic_pointer_cast<DataArray<bool>>(cArray);
@@ -239,14 +240,42 @@ class ConditionalSetValueTest
   }
 
   // -----------------------------------------------------------------------------
-  //
+  void setPropertyAndCheckNE(ConditionalSetValue* filter, double replaceValue, const DataArrayPath& selectedArrayPath, const DataArrayPath& conditionalArrayPath, int32_t errCompare)
+  {
+    filter->setSelectedArrayPath(selectedArrayPath);
+
+    filter->setConditionalArrayPath(conditionalArrayPath);
+
+    filter->setReplaceValue(replaceValue);
+
+    filter->execute();
+    int32_t err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, errCompare);
+  }
+
   // -----------------------------------------------------------------------------
-  void validateReplaceValue(AbstractFilter::Pointer filter, DataContainerArray::Pointer dca)
+  template <typename T>
+  void setPropertyAndCheckEQ(ConditionalSetValue* filter, DataContainer::Pointer dc, double replaceValue, const DataArrayPath& selectedArrayPath, const DataArrayPath& conditionalArrayPath)
   {
-    QVariant var;
-    bool propWasSet;
-    int err = 0;
+    filter->setSelectedArrayPath(selectedArrayPath);
+
+    filter->setConditionalArrayPath(conditionalArrayPath);
 
+    filter->setReplaceValue(replaceValue);
+    filter->execute();
+    int32_t err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    IDataArray::Pointer dataArray = dc->getAttributeMatrix(selectedArrayPath.getAttributeMatrixName())->getAttributeArray(selectedArrayPath.getDataArrayName());
+    IDataArray::Pointer condArray = dc->getAttributeMatrix(conditionalArrayPath.getAttributeMatrixName())->getAttributeArray(conditionalArrayPath.getDataArrayName());
+    validateReplacedValues<T>(dataArray, condArray);
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void validateReplaceValue(ConditionalSetValue* filter, DataContainerArray::Pointer dca)
+  {
     DataContainer::Pointer dc = dca->getDataContainer("ConditionalSetValueTest");
     IDataArray::Pointer dataArray;
     IDataArray::Pointer condArray;
@@ -277,32 +306,29 @@ class ConditionalSetValueTest
 
     DataArrayPath conditionalArray("ConditionalSetValueTest", "ConditionalSetValueAttrMat", "ConditionalArray");
 
-    // Fail if an input array is not scalar
-    SET_PROPERTIES_AND_CHECK_NE(filter, 5.0, attrMat_uint8_3, conditionalArray, -11002)
-
     // Fail if the replace value is out of range
-    SET_PROPERTIES_AND_CHECK_NE(filter, 256.0, attrMat_uint8_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 128.0, attrMat_int8_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 65536.0, attrMat_uint16_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 32768.0, attrMat_int16_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 4294967296.0, attrMat_uint32_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 2147483648.0, attrMat_int32_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 20000000000000000000.0, attrMat_uint64_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 10000000000000000000.0, attrMat_int64_1, conditionalArray, -100)
-    SET_PROPERTIES_AND_CHECK_NE(filter, 3.41e38, attrMat_float_1, conditionalArray, -101)
+    setPropertyAndCheckNE(filter, 256.0, attrMat_uint8_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 128.0, attrMat_int8_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 65536.0, attrMat_uint16_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 32768.0, attrMat_int16_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 4294967296.0, attrMat_uint32_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 2147483648.0, attrMat_int32_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 20000000000000000000.0, attrMat_uint64_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 10000000000000000000.0, attrMat_int64_1, conditionalArray, -100);
+    setPropertyAndCheckNE(filter, 3.41e38, attrMat_float_1, conditionalArray, -101);
     // not checking double, because cannot make a value outside of the range
 
     // Succeed for all possible test combinations
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_uint8_1, conditionalArray, dataArray, condArray, uint8_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_int8_1, conditionalArray, dataArray, condArray, int8_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_uint16_1, conditionalArray, dataArray, condArray, uint16_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_int16_1, conditionalArray, dataArray, condArray, int16_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_uint32_1, conditionalArray, dataArray, condArray, uint32_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_int32_1, conditionalArray, dataArray, condArray, int32_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_uint64_1, conditionalArray, dataArray, condArray, uint64_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_int64_1, conditionalArray, dataArray, condArray, int64_t)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_float_1, conditionalArray, dataArray, condArray, float)
-    SET_PROPERTIES_AND_CHECK_EQ(filter, 5.0, attrMat_double_1, conditionalArray, dataArray, condArray, double)
+    setPropertyAndCheckEQ<uint8_t>(filter, dc, 5.0, attrMat_uint8_1, conditionalArray);
+    setPropertyAndCheckEQ<int8_t>(filter, dc, 5.0, attrMat_int8_1, conditionalArray);
+    setPropertyAndCheckEQ<uint16_t>(filter, dc, 5.0, attrMat_uint16_1, conditionalArray);
+    setPropertyAndCheckEQ<int16_t>(filter, dc, 5.0, attrMat_int16_1, conditionalArray);
+    setPropertyAndCheckEQ<uint32_t>(filter, dc, 5.0, attrMat_uint32_1, conditionalArray);
+    setPropertyAndCheckEQ<int32_t>(filter, dc, 5.0, attrMat_int32_1, conditionalArray);
+    setPropertyAndCheckEQ<uint64_t>(filter, dc, 5.0, attrMat_uint64_1, conditionalArray);
+    setPropertyAndCheckEQ<int64_t>(filter, dc, 5.0, attrMat_int64_1, conditionalArray);
+    setPropertyAndCheckEQ<float>(filter, dc, 5.0, attrMat_float_1, conditionalArray);
+    setPropertyAndCheckEQ<double>(filter, dc, 5.0, attrMat_double_1, conditionalArray);
   }
 
   // -----------------------------------------------------------------------------
@@ -312,17 +338,12 @@ class ConditionalSetValueTest
   {
     DataContainerArray::Pointer dca = initializeDataContainerArray();
 
-    QString filtName = "ConditionalSetValue";
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer factory = fm->getFactoryFromClassName(filtName);
-    DREAM3D_REQUIRE(factory.get() != nullptr)
-
-    AbstractFilter::Pointer conditionalSetValueFilter = factory->create();
+    ConditionalSetValue::Pointer conditionalSetValueFilter = ConditionalSetValue::New();
     DREAM3D_REQUIRE(conditionalSetValueFilter.get() != nullptr)
 
     conditionalSetValueFilter->setDataContainerArray(dca);
 
-    validateReplaceValue(conditionalSetValueFilter, dca);
+    validateReplaceValue(conditionalSetValueFilter.get(), dca);
 
     return EXIT_SUCCESS;
   }

From b23516fd76aad79309ad9a12f47d3509b7131359 Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Thu, 27 Feb 2020 10:07:14 -0500
Subject: [PATCH 184/397] Adding missing GeometryMath function from Mike
 Groeber.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>
---
 Source/SIMPLib/Math/GeometryMath.cpp | 55 ++++++++++++++++++++++++++++
 Source/SIMPLib/Math/GeometryMath.h   | 14 ++++++-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 45bd024055..c5a7167e5d 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -129,6 +129,61 @@ bool GeometryMath::RayIntersectsBox(const float* p, const float* q, const float*
   return true;
 }
 
+// -----------------------------------------------------------------------------
+bool GeometryMath::FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2)
+{
+  // initialize t1 and t2 to -1 - means no intersection
+  t1 = -1.0f;
+  t2 = -1.0f;
+
+  // determine distance (tc) to where perpendicular distance will be calculated
+  float Lx = c[0] - p[0];
+  float Ly = c[1] - p[1];
+  float Lz = c[2] - p[2];
+  float L2 = (Lx * Lx + Ly * Ly + Lz * Lz);
+  float radius2 = radius * radius;
+  float tc = Lx * R[0] + Ly * R[1] + Lz * R[2];
+
+  // check1 if ray intersects sphere
+  if(tc < 0.0 && L2 > radius2)
+  {
+    return false;
+  }
+
+  // determine perpendicular distance (d) squared from sphere center to ray
+  float d2 = L2 - (tc * tc);
+
+  // check2 if ray intersects sphere
+  if(d2 > radius2)
+  {
+    return false;
+  }
+
+  // determine distance along ray from where perpendicular distance is calculated to point on sphere
+  float t1c = sqrt(radius2 - d2);
+
+  // determine intersection points on sphere by combining tc and t1c
+  t1 = tc - t1c;
+  t2 = tc + t1c;
+
+  // check3 if ray intersects sphere
+  if(t1 > length)
+  {
+    return false;
+  }
+
+  if(t1 < 0.0f)
+  {
+    t1 = 0.0f;
+  }
+  if(t2 > length)
+  {
+    t2 = length;
+  }
+
+  return true;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 3fa6bf6799..013f04068b 100755
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -257,6 +257,19 @@ class SIMPLib_EXPORT GeometryMath
      */
     static bool RayIntersectsBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
 
+    /**
+     * @brief FindRayIntersectionsWithSphere
+     * @param p
+     * @param R
+     * @param length
+     * @param c
+     * @param radius
+     * @param t1
+     * @param t2
+     * @return
+     */
+    static bool FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2);
+
     /**
      * @brief Determines length of a segment between two points that lies within a box defined by the lower left and upper right corners
      * @param p
@@ -375,7 +388,6 @@ class SIMPLib_EXPORT GeometryMath
     GeometryMath(GeometryMath&&) = delete;        // Move Constructor Not Implemented
     GeometryMath& operator=(const GeometryMath&) = delete; // Copy Assignment Not Implemented
     GeometryMath& operator=(GeometryMath&&) = delete;      // Move Assignment Not Implemented
-
   private:
 };
 

From 084c86dc32dd5c72f7a1088f3ecc723342cc04c2 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 2 Mar 2020 15:16:46 -0500
Subject: [PATCH 185/397] Fixed ClassName and getNameOfClass functions

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/Observer.cpp                   | 4 ++--
 Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp  | 4 ++--
 Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp | 4 ++--
 Source/SIMPLib/REST/PipelineListener.cpp             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Source/SIMPLib/Common/Observer.cpp b/Source/SIMPLib/Common/Observer.cpp
index 6e964fccb4..fd907128e2 100644
--- a/Source/SIMPLib/Common/Observer.cpp
+++ b/Source/SIMPLib/Common/Observer.cpp
@@ -59,11 +59,11 @@ void Observer::processPipelineMessage(const AbstractMessage::Pointer& pm)
 // -----------------------------------------------------------------------------
 QString Observer::getNameOfClass() const
 {
-  return QString("_SUPERObserver");
+  return QString("Observer");
 }
 
 // -----------------------------------------------------------------------------
 QString Observer::ClassName()
 {
-  return QString("_SUPERObserver");
+  return QString("Observer");
 }
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 29cc35f210..1f12a63648 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -272,13 +272,13 @@ std::shared_ptr<ApplyImageTransforms> ApplyImageTransforms::New()
 // -----------------------------------------------------------------------------
 QString ApplyImageTransforms::getNameOfClass() const
 {
-  return QString("_SUPERApplyImageTransforms");
+  return QString("ApplyImageTransforms");
 }
 
 // -----------------------------------------------------------------------------
 QString ApplyImageTransforms::ClassName()
 {
-  return QString("_SUPERApplyImageTransforms");
+  return QString("ApplyImageTransforms");
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 8def235b75..e421e2a286 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -392,13 +392,13 @@ std::shared_ptr<ExtractVertexGeometry> ExtractVertexGeometry::New()
 // -----------------------------------------------------------------------------
 QString ExtractVertexGeometry::getNameOfClass() const
 {
-  return QString("_SUPERExtractVertexGeometry");
+  return QString("ExtractVertexGeometry");
 }
 
 // -----------------------------------------------------------------------------
 QString ExtractVertexGeometry::ClassName()
 {
-  return QString("_SUPERExtractVertexGeometry");
+  return QString("ExtractVertexGeometry");
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/REST/PipelineListener.cpp b/Source/SIMPLib/REST/PipelineListener.cpp
index b36f4ec728..cdd777ecae 100644
--- a/Source/SIMPLib/REST/PipelineListener.cpp
+++ b/Source/SIMPLib/REST/PipelineListener.cpp
@@ -200,11 +200,11 @@ void PipelineListener::closeFiles()
 // -----------------------------------------------------------------------------
 QString PipelineListener::getNameOfClass() const
 {
-  return QString("_SUPERPipelineListener");
+  return QString("PipelineListener");
 }
 
 // -----------------------------------------------------------------------------
 QString PipelineListener::ClassName()
 {
-  return QString("_SUPERPipelineListener");
+  return QString("PipelineListener");
 }

From 8ef532bae6456bb8033d0847e28192f7ec12d3fe Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <43142415+JDuffeyBQ@users.noreply.github.com>
Date: Tue, 17 Mar 2020 12:04:40 -0400
Subject: [PATCH 186/397] Changes to data structure and AbstractFilter API
 (#390)

* Removed unnecessary template parameters

* Updated filters to match template function changes

* Updated SVWidgetsLib to match template changes

* Updated to match template changes

* More template changes

* Changed cDims to be an optional parameter to getPrereqArrayFromPath

* Replaced improper uses of getPrereqIDataArrayFromPath with
getPrereqArrayFromPath

* Added const to getPrereqArray

* Moved common signal definitions from filters to AbstractFilter

* Converted some connections to new signal/slot style

* Changed dataCheck to be virtual and preflight to be non-virtual

* Made AbstractFilter abstract
* Removed unused m_Uuid variable from AbstractFilter
* Added BadFilter class to replace concrete uses of AbstractFilter

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fix preflight special cases

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed bug where derived dataCheck was called instead of the intermediate

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Remove use of AbstractFilter::New() in Python bindings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added bounds checking to DataArray::at()

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Removed #cmakedefine SIMPL_ENABLE_PYTHON to prevent full recompile

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/TemplateHelpers.cpp     |  72 ++---
 .../CoreFilters/ApplyImageTransforms.cpp      |  15 +-
 .../CoreFilters/ApplyImageTransforms.h        |  29 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  40 +--
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |  29 +-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |  13 -
 Source/SIMPLib/CoreFilters/Breakpoint.h       |  28 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |  14 +-
 .../CoreFilters/CombineAttributeArrays.h      |  29 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |  22 +-
 .../CoreFilters/CombineAttributeMatrices.h    |  29 +-
 .../CoreFilters/ConditionalSetValue.cpp       |  18 +-
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |  29 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  14 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |  29 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |  16 +-
 Source/SIMPLib/CoreFilters/ConvertData.h      |  29 +-
 .../CopyFeatureArrayToElementArray.cpp        |  18 +-
 .../CopyFeatureArrayToElementArray.h          |  29 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  17 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       |  29 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |  13 -
 .../CoreFilters/CreateAttributeMatrix.h       |  29 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |  12 -
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |  29 +-
 .../CoreFilters/CreateDataContainer.cpp       |  15 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |  29 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  18 +-
 .../CreateFeatureArrayFromElementArray.h      |  29 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  41 +--
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |  29 +-
 .../CoreFilters/CreateImageGeometry.cpp       |  12 -
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |  29 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |  14 +-
 .../SIMPLib/CoreFilters/CreateStringArray.h   |  29 +-
 .../CoreFilters/CropVertexGeometry.cpp        |  19 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |  29 +-
 .../CoreFilters/DataContainerReader.cpp       |  19 --
 .../SIMPLib/CoreFilters/DataContainerReader.h |  29 +-
 .../CoreFilters/DataContainerWriter.cpp       |  12 -
 .../SIMPLib/CoreFilters/DataContainerWriter.h |  29 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   9 -
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |  29 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |  13 -
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |  29 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |  73 ++---
 .../ExtractAttributeArraysFromGeometry.h      |  29 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |  14 +-
 .../CoreFilters/ExtractComponentAsArray.h     |  29 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |  17 +-
 .../CoreFilters/ExtractVertexGeometry.h       |  29 +-
 .../CoreFilters/FeatureCountDecision.cpp      |  16 +-
 .../CoreFilters/FeatureCountDecision.h        |   6 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |  14 +-
 .../CoreFilters/FeatureDataCSVWriter.h        |  29 +-
 Source/SIMPLib/CoreFilters/FileReader.cpp     |  29 --
 Source/SIMPLib/CoreFilters/FileReader.h       |  31 +--
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |  29 --
 Source/SIMPLib/CoreFilters/FileWriter.h       |  30 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  18 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |  30 +-
 .../CoreFilters/GenerateColorTable.cpp        |  64 ++---
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |  29 +-
 .../CoreFilters/GenerateTiltSeries.cpp        |  17 +-
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  |  29 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |  58 ++--
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |  29 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  15 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |  29 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |  16 +-
 Source/SIMPLib/CoreFilters/InitializeData.h   |  29 +-
 .../LinkFeatureMapToElementArray.cpp          |  16 +-
 .../LinkFeatureMapToElementArray.h            |  29 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |  14 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |   6 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |  15 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |  29 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  20 +-
 Source/SIMPLib/CoreFilters/MoveData.h         |  29 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  20 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |  29 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |  16 +-
 .../CoreFilters/MultiThresholdObjects.h       |  29 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |  16 +-
 .../CoreFilters/MultiThresholdObjects2.h      |  29 +-
 .../CoreFilters/PipelineAnnotation.cpp        |  13 -
 .../SIMPLib/CoreFilters/PipelineAnnotation.h  |  29 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |  13 -
 Source/SIMPLib/CoreFilters/PostSlackMessage.h |  29 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |  65 ++---
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |  29 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |  35 +--
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |  29 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |  12 -
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |  29 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |  14 +-
 .../CoreFilters/RemoveComponentFromArray.h    |  29 +-
 .../CoreFilters/RenameAttributeArray.cpp      |  14 +-
 .../CoreFilters/RenameAttributeArray.h        |  29 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |  14 +-
 .../CoreFilters/RenameAttributeMatrix.h       |  29 +-
 .../CoreFilters/RenameDataContainer.cpp       |  12 -
 .../SIMPLib/CoreFilters/RenameDataContainer.h |  29 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |  14 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |  29 +-
 .../CoreFilters/RequiredZThickness.cpp        |  12 -
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |   6 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |  17 +-
 .../CoreFilters/RotateSampleRefFrame.h        |  29 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  16 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |  29 +-
 .../SetOriginResolutionImageGeom.cpp          |  14 +-
 .../SetOriginResolutionImageGeom.h            |  29 +-
 .../CoreFilters/SplitAttributeArray.cpp       |  15 +-
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |  29 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |  60 ++--
 .../Testing/Cxx/DataContainerTest.cpp         |  12 +-
 .../Testing/Cxx/ErrorMessageTest.cpp          |   4 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   4 +-
 .../Testing/Cxx/GenerateTiltSeriesTest.cpp    |   6 +-
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |   2 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |  12 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  14 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |  29 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |  14 +-
 .../CoreFilters/WriteTriangleGeometry.h       |  29 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       |  12 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |   2 +
 Source/SIMPLib/DataArrays/StringDataArray.h   |   2 +
 .../DataContainers/AttributeMatrix.cpp        |  39 +++
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  75 ++---
 Source/SIMPLib/DataContainers/DataContainer.h |   2 +-
 .../DataContainers/DataContainerArray.cpp     | 251 +++++++++++++++++
 .../DataContainers/DataContainerArray.h       | 257 ++----------------
 .../DataContainers/DataStructureUtilities.cpp |   4 +-
 .../JsonFilterParametersWriter.cpp            |   3 +-
 .../Filtering/AbstractDecisionFilter.cpp      |  12 -
 .../Filtering/AbstractDecisionFilter.h        |  28 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |  43 +--
 Source/SIMPLib/Filtering/AbstractFilter.h     |  33 ++-
 Source/SIMPLib/Filtering/BadFilter.cpp        | 165 +++++++++++
 Source/SIMPLib/Filtering/BadFilter.h          | 146 ++++++++++
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |   3 +-
 Source/SIMPLib/Filtering/SourceList.cmake     |   2 +
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |   8 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |   2 +-
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   5 -
 .../TestFilters/ArraySelectionExample.h       |   8 +-
 .../TestFilters/DynamicTableExample.cpp       |  12 -
 .../SIMPLib/TestFilters/DynamicTableExample.h |  13 +-
 .../TestFilters/ErrorWarningFilter.cpp        |  13 -
 .../SIMPLib/TestFilters/ErrorWarningFilter.h  |  29 +-
 Source/SIMPLib/TestFilters/Filt0.cpp          |   9 -
 Source/SIMPLib/TestFilters/Filt0.h            |  13 +-
 Source/SIMPLib/TestFilters/Filt1.cpp          |   9 -
 Source/SIMPLib/TestFilters/Filt1.h            |  13 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup00.h    |  27 --
 Source/SIMPLib/TestFilters/FilterGroup01.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup01.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup02.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup03.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup04.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup05.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup06.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup07.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup08.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup09.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup10.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup12.h    |  29 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp  |  13 -
 Source/SIMPLib/TestFilters/FilterGroup13.h    |  29 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  12 -
 Source/SIMPLib/TestFilters/GenericExample.h   |  13 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |  16 +-
 .../SIMPLib/TestFilters/MakeDataContainer.h   |  13 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |  12 -
 Source/SIMPLib/TestFilters/ThresholdExample.h |  13 +-
 .../AbstractIOFileWidget.cpp                  |   6 +-
 .../AttributeMatrixCreationWidget.cpp         |   6 +-
 .../AttributeMatrixSelectionWidget.cpp        |   4 +-
 .../AxisAngleWidget.cpp                       |   6 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |   6 +-
 .../CalculatorWidget.cpp                      |   6 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   6 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |   6 +-
 .../ComparisonSelectionWidget.cpp             |   6 +-
 .../ConstrainedDoubleWidget.cpp               |   9 +-
 .../ConstrainedIntWidget.cpp                  |   9 +-
 .../DataArrayCreationWidget.cpp               |   6 +-
 .../DataArraySelectionWidget.cpp              |   6 +-
 .../DataContainerArrayProxyWidget.cpp         |   6 +-
 .../DataContainerCreationWidget.cpp           |   6 +-
 .../DataContainerReaderWidget.cpp             |   6 +-
 .../DataContainerSelectionWidget.cpp          |   6 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |   6 +-
 .../DynamicChoiceWidget.cpp                   |   6 +-
 .../DynamicTableWidget.cpp                    |   6 +-
 .../FileListInfoWidget.cpp                    |   6 +-
 .../FilterParameterWidgetUtils.hpp            |   4 +-
 .../FloatVec2Widget.cpp                       |   6 +-
 .../FloatVec3Widget.cpp                       |   6 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |   6 +-
 .../FourthOrderPolynomialWidget.cpp           |   6 +-
 .../GenerateColorTableWidget.cpp              |   6 +-
 .../ImportHDF5DatasetWidget.cpp               |   6 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |   6 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   6 +-
 .../FilterParameterWidgets/IntWidget.cpp      |   6 +-
 .../LinkedBooleanWidget.cpp                   |   6 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   8 +-
 .../LinkedPathCreationWidget.cpp              |   6 +-
 .../MontageSelectionWidget.cpp                |   6 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |   6 +-
 .../MultiDataArraySelectionWidget.cpp         |   6 +-
 .../MultiDataContainerSelectionWidget.cpp     |   6 +-
 .../NumericTypeWidget.cpp                     |   6 +-
 .../ParagraphWidget.cpp                       |   6 +-
 .../PhaseTypeSelectionWidget.cpp              |   6 +-
 .../PreflightUpdatedValueWidget.cpp           |   6 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |   6 +-
 .../ReadASCIIDataWidget.cpp                   |   6 +-
 .../ScalarTypeWidget.cpp                      |   6 +-
 .../SecondOrderPolynomialWidget.cpp           |   6 +-
 .../SeparatorWidget.cpp                       |   6 +-
 .../ShapeTypeSelectionWidget.cpp              |   6 +-
 .../FilterParameterWidgets/StringWidget.cpp   |   6 +-
 .../ThirdOrderPolynomialWidget.cpp            |   6 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |   6 +-
 .../FilterParameterWidgets/UnknownWidget.cpp  |   6 +-
 .../Widgets/DataContainerArrayWidget.cpp      |   2 +-
 Wrapping/Python/Testing/AbstractFilterTest.py |  12 +-
 Wrapping/Python/Testing/TestBindings.py       |   6 -
 243 files changed, 1248 insertions(+), 3930 deletions(-)
 create mode 100644 Source/SIMPLib/Filtering/BadFilter.cpp
 create mode 100644 Source/SIMPLib/Filtering/BadFilter.h

diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index 62e81cb40a..ac750538f3 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -48,51 +48,51 @@ IDataArrayWkPtr CreateNonPrereqArrayFromArrayType::operator()(AbstractFilter* f,
 
   if(CanDynamicCast<FloatArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, 0.0f, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(f, arrayPath, 0.0f, compDims, "", id);
   }
   else if(CanDynamicCast<DoubleArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, 0.0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(f, arrayPath, 0.0, compDims, "", id);
   }
   else if(CanDynamicCast<Int8ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt8ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int16ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt16ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int32ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt32ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<Int64ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<UInt64ArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>>(f, arrayPath, 0, compDims, "", id);
   }
   else if(CanDynamicCast<BoolArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(f, arrayPath, false, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType>(f, arrayPath, false, compDims, "", id);
   }
   else if(CanDynamicCast<SizeTArrayType>()(sourceArrayType))
   {
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, 0, compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType>(f, arrayPath, 0, compDims, "", id);
   }
   else
   {
@@ -111,40 +111,40 @@ IDataArrayWkPtr CreateNonPrereqArrayFromTypeEnum::operator()(AbstractFilter* f,
   switch(arrayType)
   {
   case SIMPL::TypeEnums::Int8:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter, int8_t>(f, arrayPath, static_cast<int8_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int8_t>>(f, arrayPath, static_cast<int8_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt8:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(f, arrayPath, static_cast<uint8_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>>(f, arrayPath, static_cast<uint8_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int16:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter, int16_t>(f, arrayPath, static_cast<int16_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int16_t>>(f, arrayPath, static_cast<int16_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt16:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter, uint16_t>(f, arrayPath, static_cast<uint16_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint16_t>>(f, arrayPath, static_cast<uint16_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int32:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(f, arrayPath, static_cast<int32_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>>(f, arrayPath, static_cast<int32_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt32:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter, uint32_t>(f, arrayPath, static_cast<uint32_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint32_t>>(f, arrayPath, static_cast<uint32_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Int64:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter, int64_t>(f, arrayPath, static_cast<int64_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int64_t>>(f, arrayPath, static_cast<int64_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::UInt64:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter, uint64_t>(f, arrayPath, static_cast<uint64_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint64_t>>(f, arrayPath, static_cast<uint64_t>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Float:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(f, arrayPath, static_cast<float>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(f, arrayPath, static_cast<float>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Double:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(f, arrayPath, static_cast<double>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(f, arrayPath, static_cast<double>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::Bool:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(f, arrayPath, static_cast<bool>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(f, arrayPath, static_cast<bool>(initValue), compDims, "", id);
     break;
   case SIMPL::TypeEnums::SizeT:
-    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType, AbstractFilter, size_t>(f, arrayPath, static_cast<size_t>(initValue), compDims, "", id);
+    ptr = f->getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType>(f, arrayPath, static_cast<size_t>(initValue), compDims, "", id);
     break;
   default:
     QString msg = QObject::tr("The created array '%1' is of unsupported type. The following types are supported: %3").arg(arrayPath.getDataArrayName()).arg(SIMPL::TypeEnums::SupportedTypeList);
@@ -325,51 +325,51 @@ IDataArrayWkPtr GetPrereqArrayFromPath::operator()(AbstractFilter* f, const Data
   IDataArrayShPtr i_data_array = cell_attr_matrix->getAttributeArray(arrayPath.getDataArrayName());
   if(CanDynamicCast<Int8ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int8_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int8_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<UInt8ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint8_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<Int16ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int16_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int16_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<UInt16ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint16_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint16_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<Int32ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int32_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<UInt32ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint32_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint32_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<Int64ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int64_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<int64_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<UInt64ArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint64_t>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<uint64_t>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<FloatArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<float>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<DoubleArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<double>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<double>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<BoolArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<DataArray<bool>>(f, arrayPath, compDims);
   }
   else if(CanDynamicCast<SizeTArrayType>()(i_data_array))
   {
-    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<SizeTArrayType, AbstractFilter>(f, arrayPath, compDims);
+    retPtr = f->getDataContainerArray()->template getPrereqArrayFromPath<SizeTArrayType>(f, arrayPath, compDims);
   }
   else
   {
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 1f12a63648..4968e126d9 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -110,7 +110,7 @@ void ApplyImageTransforms::dataCheck()
   {
     QString dcName = m_ImageDataContainers[i];
 
-    ImageGeom::Pointer imageGeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, dcName);
+    ImageGeom::Pointer imageGeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, dcName);
     if(getErrorCode() < 0)
     {
       return;
@@ -118,19 +118,6 @@ void ApplyImageTransforms::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ApplyImageTransforms::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index c6d2811a8f..1bb3553d22 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -135,33 +135,6 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer 
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ApplyImageTransforms();
@@ -169,7 +142,7 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
     /**
     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
     */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
     * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 9f7dfcb34a..944423569a 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -230,7 +230,7 @@ void ArrayCalculator::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedAttributeMatrix, -301);
   if(getErrorCode() < 0)
   {
     return;
@@ -351,37 +351,37 @@ void ArrayCalculator::dataCheck()
   switch(m_ScalarType)
   {
   case SIMPL::ScalarTypes::Type::Int8:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt8:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int16:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt16:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int32:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt32:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Int64:
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::UInt64:
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Float:
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Double:
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   case SIMPL::ScalarTypes::Type::Bool:
-    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, double>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType>(this, m_CalculatedArray, 0, cDims, "", DataArrayID);
     break;
   default:
     QString ss = QObject::tr("The output array type is not valid.  No DataArray could be created.");
@@ -390,18 +390,6 @@ void ArrayCalculator::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ArrayCalculator::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -683,7 +671,7 @@ QVector<CalculatorItem::Pointer> ArrayCalculator::parseInfixEquation()
 {
   int err = 0;
 
-  AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, err);
+  AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedAttributeMatrix, err);
 
   QVector<QString> itemList = getRegularExpressionMatches();
 
@@ -1046,7 +1034,7 @@ void ArrayCalculator::checkForAmbiguousArrayName(QString strItem, QString warnin
   if(getInPreflight())
   {
     int err = 0;
-    AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, err);
+    AttributeMatrix::Pointer selectedAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedAttributeMatrix, err);
     if(getErrorCode() < 0)
     {
       return;
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 24813a84b2..ae2b9e2f46 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -237,40 +237,13 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ArrayCalculator();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index f990295052..8a42166f2e 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -90,19 +90,6 @@ void Breakpoint::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Breakpoint::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 0046d9c33d..5fda1e31a6 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -146,10 +146,6 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
 
 public slots:
   /**
@@ -158,28 +154,6 @@ public slots:
   void resumePipeline();
 
 signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
-
   /**
    * @brief pipelineHasPaused Emitted when the pipeline needs to be paused
    */
@@ -195,7 +169,7 @@ public slots:
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index d92ce4d795..73d18d1307 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -275,7 +275,7 @@ void CombineAttributeArrays::dataCheck()
   for(int32_t i = 0; i < paths.count(); i++)
   {
     DataArrayPath path = paths.at(i);
-    IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);
+    IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);
     if(nullptr != ptr.lock())
     {
       m_SelectedWeakPtrVector.push_back(ptr);
@@ -308,18 +308,6 @@ void CombineAttributeArrays::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CombineAttributeArrays::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index df451cec95..32ab23b27f 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -201,10 +201,6 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
 
   /**
    * @brief Returns the list of deleted data paths.
@@ -212,35 +208,12 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
    */
   std::list<DataArrayPath> getDeletedPaths() override;
 
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
-
 protected:
   CombineAttributeArrays();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index b1d9e22041..e52d4e7d14 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -212,7 +212,7 @@ void CombineAttributeMatrices::dataCheck()
   AttributeMatrix::Pointer combinedAttrMat = m->getAttributeMatrix(getCombinedAttributeMatrixName());
 
   std::vector<size_t> cDims(1, 1);
-  m_FirstIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFirstIndexArrayPath(),
+  m_FirstIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FirstIndexPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -223,7 +223,7 @@ void CombineAttributeMatrices::dataCheck()
     return;
   }
 
-  m_SecondIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getSecondIndexArrayPath(),
+  m_SecondIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(),
                                                                                                          cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_SecondIndexPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -239,7 +239,7 @@ void CombineAttributeMatrices::dataCheck()
   for(QList<QString>::iterator iter = fArrayNames.begin(); iter != fArrayNames.end(); ++iter)
   {
     tempPath.update(getFirstAttributeMatrixPath().getDataContainerName(), getCombinedAttributeMatrixName(), *iter);
-    IDataArray::Pointer tmpDataArray = firstAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, *iter, -90001);
+    IDataArray::Pointer tmpDataArray = firstAttrMat->getPrereqIDataArray(this, *iter, -90001);
     if(getErrorCode() >= 0)
     {
       std::vector<size_t> cDims = tmpDataArray->getComponentDimensions();
@@ -250,7 +250,7 @@ void CombineAttributeMatrices::dataCheck()
   for(QList<QString>::iterator iter = sArrayNames.begin(); iter != sArrayNames.end(); ++iter)
   {
     tempPath.update(getSecondAttributeMatrixPath().getDataContainerName(), getCombinedAttributeMatrixName(), *iter);
-    IDataArray::Pointer tmpDataArray = secondAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, *iter, -90001);
+    IDataArray::Pointer tmpDataArray = secondAttrMat->getPrereqIDataArray(this, *iter, -90001);
     if(getErrorCode() >= 0)
     {
       if(!fArrayNames.contains(*iter))
@@ -262,7 +262,7 @@ void CombineAttributeMatrices::dataCheck()
   }
 
   tempPath.update(getFirstIndexArrayPath().getDataContainerName(), getFirstIndexArrayPath().getAttributeMatrixName(), getNewIndexArrayName());
-  m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter, int32_t>(this, tempPath, 0, cDims);
+  m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>>(this, tempPath, 0, cDims);
   if(nullptr != m_NewIndexPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_NewIndex = m_NewIndexPtr.lock()->getPointer(0);
@@ -273,18 +273,6 @@ void CombineAttributeMatrices::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CombineAttributeMatrices::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 template <typename T> void copyData(IDataArray::Pointer fromData, IDataArray::Pointer toData, size_t location)
 {
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index e2812c3f76..dc6f1585b8 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -220,10 +220,6 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
      */
     void execute() override;
 
-    /**
-     * @brief preflight Reimplemented from @see AbstractFilter class
-     */
-    void preflight() override;
 
     /**
      * @brief Returns the list of deleted data paths.
@@ -231,35 +227,12 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
      */
     std::list<DataArrayPath> getDeletedPaths();
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     CombineAttributeMatrices();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 7b88b66313..4b67dd7e86 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -165,7 +165,7 @@ void ConditionalSetValue::dataCheck()
 
   QVector<DataArrayPath> dataArrayPaths;
 
-  m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
+  m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedArrayPath());
   if(getErrorCode() < 0)
   {
     return;
@@ -173,7 +173,7 @@ void ConditionalSetValue::dataCheck()
   dataArrayPaths.push_back(getSelectedArrayPath());
 
   std::vector<size_t> cDims(1, 1);
-  m_ConditionalArrayPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getConditionalArrayPath(), cDims);
+  m_ConditionalArrayPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getConditionalArrayPath(), cDims);
   if(getErrorCode() < 0)
   {
     return;
@@ -184,7 +184,7 @@ void ConditionalSetValue::dataCheck()
   }
   dataArrayPaths.push_back(getConditionalArrayPath());
 
-  getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, dataArrayPaths);
+  getDataContainerArray()->validateNumberOfTuples(this, dataArrayPaths);
 
   QString dType = m_ArrayPtr.lock()->getTypeAsString();
   if(dType.compare(SIMPL::TypeNames::Int8) == 0)
@@ -241,18 +241,6 @@ void ConditionalSetValue::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ConditionalSetValue::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index 2e7339f78b..5579f4cbfb 100755
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -179,40 +179,13 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ConditionalSetValue();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 93bae1f2e5..58ab6b6b44 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -279,7 +279,7 @@ void ConvertColorToGrayScale::dataCheck()
 
   DataArrayPath inputAMPath = DataArrayPath::GetAttributeMatrixPath(getInputDataArrayVector());
 
-  AttributeMatrix::Pointer inAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, inputAMPath, -301);
+  AttributeMatrix::Pointer inAM = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, inputAMPath, -301);
   if(getErrorCode() < 0 || nullptr == inAM.get())
   {
     return;
@@ -336,18 +336,6 @@ void ConvertColorToGrayScale::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ConvertColorToGrayScale::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index dea91671ca..d484f224d7 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -245,40 +245,13 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ConvertColorToGrayScale();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index ea4ffb0620..b7346a4119 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -263,13 +263,13 @@ void ConvertData::dataCheck()
 
   if(getInPreflight())
   {
-    AttributeMatrix::Pointer cellAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedCellArrayPath, -301);
+    AttributeMatrix::Pointer cellAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedCellArrayPath, -301);
     if(getErrorCode() < 0)
     {
       return;
     }
 
-    IDataArray::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedCellArrayPath());
+    IDataArray::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedCellArrayPath());
     if(getErrorCode() < 0)
     {
       return;
@@ -325,18 +325,6 @@ void ConvertData::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ConvertData::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 2fa0799b04..9bb47afc2a 100755
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -178,40 +178,13 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ConvertData();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 69d7170f4d..cdafc30e9e 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -128,7 +128,7 @@ void CopyFeatureArrayToElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -136,10 +136,10 @@ void CopyFeatureArrayToElementArray::dataCheck()
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
   m_InArrayPtr =
-      getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedFeatureArrayPath()); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+      getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
 
   DataArrayPath tempPath(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), "");
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, tempPath, -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, tempPath, -301);
 
   if(getErrorCode() < 0)
   {
@@ -150,18 +150,6 @@ void CopyFeatureArrayToElementArray::dataCheck()
   TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), ElementArrayID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CopyFeatureArrayToElementArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 56709af3a4..2cef49682c 100755
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -181,40 +181,13 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CopyFeatureArrayToElementArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 6281436262..84c4ebde01 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -187,7 +187,7 @@ void CopyObject::dataCheck()
       setErrorCondition(-11001, ss);
     }
 
-    AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getAttributeMatrixToCopy(), -301);
+    AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getAttributeMatrixToCopy(), -301);
 
     if(getErrorCode() < 0)
     {
@@ -211,7 +211,7 @@ void CopyObject::dataCheck()
       setErrorCondition(-11001, ss);
     }
 
-    IDataArray::Pointer array = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getAttributeArrayToCopy());
+    IDataArray::Pointer array = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getAttributeArrayToCopy());
 
     if(getErrorCode() < 0)
     {
@@ -232,19 +232,6 @@ void CopyObject::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CopyObject::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index ca0a7c2034..efdd14c828 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -213,40 +213,13 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   CopyObject();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index ebbd348a3d..129e7c3052 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -160,19 +160,6 @@ void CreateAttributeMatrix::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateAttributeMatrix::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index a58ac45b87..fdc2c7d507 100755
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -178,40 +178,13 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateAttributeMatrix();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index b2ef5c9492..f6abe28c9e 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -413,18 +413,6 @@ void CreateDataArray::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateDataArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index 8974f058f9..06026bef77 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -230,40 +230,13 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateDataArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 1759f119f7..8725bcab3f 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -98,22 +98,9 @@ void CreateDataContainer::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
+  getDataContainerArray()->createNonPrereqDataContainer(this, getDataContainerName(), DataContainerID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateDataContainer::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index 78e0bb0849..d392870063 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -149,40 +149,13 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateDataContainer();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index fadf6dd43e..93d7f857a4 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -131,16 +131,16 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedCellArrayPath());
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedCellArrayPath());
 
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellFeatureAttributeMatrixName(), -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCellFeatureAttributeMatrixName(), -301);
 
   if(getErrorCode() < 0)
   {
@@ -151,18 +151,6 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), FeatureArrayID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateFeatureArrayFromElementArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index c5c8a8a0e5..12d73cddd1 100755
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -195,40 +195,13 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateFeatureArrayFromElementArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 0b44de238b..83ec06248c 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -306,17 +306,17 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 1);
 
-    m_XBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getXBoundsArrayPath(), cDims);
+    m_XBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getXBoundsArrayPath(), cDims);
     if(m_XBoundsPtr.lock())
     {
       m_XBounds = m_XBoundsPtr.lock()->getPointer(0);
     }
-    m_YBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getYBoundsArrayPath(), cDims);
+    m_YBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getYBoundsArrayPath(), cDims);
     if(m_YBoundsPtr.lock())
     {
       m_YBounds = m_YBoundsPtr.lock()->getPointer(0);
     }
-    m_ZBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getZBoundsArrayPath(), cDims);
+    m_ZBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getZBoundsArrayPath(), cDims);
     if(m_ZBoundsPtr.lock())
     {
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
@@ -370,7 +370,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath0(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath0(), cDims);
 
     if(getErrorCode() < 0)
     {
@@ -399,9 +399,9 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath1(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath1(), cDims);
     cDims[0] = 2;
-    m_EdgesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedEdgeList, AbstractFilter>(this, getSharedEdgeListArrayPath(), cDims);
+    m_EdgesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedEdgeList>(this, getSharedEdgeListArrayPath(), cDims);
     if(m_EdgesPtr.lock())
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
@@ -440,8 +440,8 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath2(), cDims);
-    m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTriList, AbstractFilter>(this, getSharedTriListArrayPath(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath2(), cDims);
+    m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTriList>(this, getSharedTriListArrayPath(), cDims);
     if(m_TrisPtr.lock())
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
@@ -480,9 +480,9 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath3(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath3(), cDims);
     cDims[0] = 4;
-    m_QuadsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedQuadList, AbstractFilter>(this, getSharedQuadListArrayPath(), cDims);
+    m_QuadsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedQuadList>(this, getSharedQuadListArrayPath(), cDims);
     if(m_QuadsPtr.lock())
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
@@ -521,9 +521,9 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath4(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath4(), cDims);
     cDims[0] = 4;
-    m_TetsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTetList, AbstractFilter>(this, getSharedTetListArrayPath(), cDims);
+    m_TetsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTetList>(this, getSharedTetListArrayPath(), cDims);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -563,9 +563,9 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>, AbstractFilter>(this, getSharedVertexListArrayPath5(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath5(), cDims);
     cDims[0] = 8;
-    m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedHexList, AbstractFilter>(this, getSharedHexListArrayPath(), cDims);
+    m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedHexList>(this, getSharedHexListArrayPath(), cDims);
     if (m_HexesPtr.lock())
     {
       m_Hexes = m_HexesPtr.lock()->getPointer(0);
@@ -611,19 +611,6 @@ void CreateGeometry::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateGeometry::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 6b334742da..2592638b57 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -617,40 +617,13 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   CreateGeometry();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index e115b7a139..d0a8695390 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -151,18 +151,6 @@ void CreateImageGeometry::dataCheck()
   m->setGeometry(image);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateImageGeometry::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index 93069f08aa..aa3a434163 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -196,33 +196,6 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateImageGeometry();
@@ -230,7 +203,7 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 73e5570f57..351b48ee13 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -164,21 +164,9 @@ void CreateStringArray::dataCheck()
   }
   
   // Create the data array and initialize it to a placeholder value
-  m_OutputArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, getNewArray(), m_InitializationValue, cDims, "", StringArrayID);
+  m_OutputArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray>(this, getNewArray(), m_InitializationValue, cDims, "", StringArrayID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CreateStringArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 15f8359c78..5fcdb25f24 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -178,40 +178,13 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     CreateStringArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index df2f6999ca..1e7488300a 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -135,7 +135,7 @@ void CropVertexGeometry::dataCheck()
   clearWarningCode();
   initialize();
 
-  getDataContainerArray()->getPrereqGeometryFromDataContainer<VertexGeom, AbstractFilter>(this, getDataContainerName());
+  getDataContainerArray()->getPrereqGeometryFromDataContainer<VertexGeom>(this, getDataContainerName());
 
   if(getXMax() < getXMin())
   {
@@ -153,7 +153,7 @@ void CropVertexGeometry::dataCheck()
     setErrorCondition(-5550, ss);
   }
 
-  DataContainer::Pointer dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getCroppedDataContainerName(), DataContainerID);
+  DataContainer::Pointer dc = getDataContainerArray()->createNonPrereqDataContainer(this, getCroppedDataContainerName(), DataContainerID);
 
   if(getErrorCode() < 0)
   {
@@ -193,7 +193,7 @@ void CropVertexGeometry::dataCheck()
         for(auto&& data_array : tempDataArrayList)
         {
           tempPath.update(getCroppedDataContainerName().getDataContainerName(), tmpAttrMat->getName(), data_array);
-          IDataArray::Pointer tmpDataArray = tmpAttrMat->getPrereqIDataArray<IDataArray, AbstractFilter>(this, data_array, -90002);
+          IDataArray::Pointer tmpDataArray = tmpAttrMat->getPrereqIDataArray(this, data_array, -90002);
           if(getErrorCode() >= 0)
           {
             std::vector<size_t> cDims = tmpDataArray->getComponentDimensions();
@@ -205,19 +205,6 @@ void CropVertexGeometry::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CropVertexGeometry::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index 6ae720500b..c3738eba0b 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -255,40 +255,13 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   CropVertexGeometry();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 7b7304cad1..e0ab97bd3f 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -211,25 +211,6 @@ void DataContainerReader::dataCheck()
   dca->setDataContainerBundles(bundles);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataContainerReader::preflight()
-{
-  setInPreflight(true);
-  // Annouce we are about to preflight
-  // The GUI will pick up the structure
-  emit preflightAboutToExecute();
-  // The Gui sends down any changes to the Proxy (which for preflight we don't care about)
-  emit updateFilterParameters(this);
-  // to the read here because this will populate the DataContainerArray with our DataContainer
-  dataCheck();
-  // The GUI needs to send down the selections that were made by the user and we need to update
-  // DataContainerArray->DataContainer object so the rest of the pipeline has the proper information
-  emit preflightExecuted(); // Done executing
-  setInPreflight(false);
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 09420d3589..89d54e363f 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -233,10 +233,6 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
      * @brief readExistingPipelineFromFile Reads the existing pipeline that is stored in the file and store it
@@ -269,35 +265,12 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     */
     bool syncProxies();
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     DataContainerReader();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index abc91528a2..503f9eb3a8 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -134,18 +134,6 @@ void DataContainerWriter::dataCheck()
 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataContainerWriter::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index ac2768ae8a..6b38fe4957 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -203,40 +203,13 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     DataContainerWriter();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 44bfd3a9f8..c508712c76 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -108,15 +108,6 @@ void EmptyFilter::dataCheck()
   setErrorCondition(-9999, ss);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void EmptyFilter::preflight()
-{
-  setInPreflight(true);
-  dataCheck();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 6af2d69772..44fe429b71 100755
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -145,10 +145,6 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
      * @brief This is overloaded from the super class for this particular filter.
@@ -157,35 +153,12 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
      */
     void setHumanLabel(const QString& humanLabel);
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     EmptyFilter();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index d569faf874..8e3350a9e6 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -118,19 +118,6 @@ void ExecuteProcess::dataCheck()
   //  }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExecuteProcess::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index bfb9aafad9..46f0d15586 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -164,40 +164,13 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ExecuteProcess();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index d201d6dd8b..bf672374a8 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -230,7 +230,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
   clearWarningCode();
   initialize();
 
-  IGeometry::Pointer igeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry, AbstractFilter>(this, getDataContainerName());
+  IGeometry::Pointer igeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry>(this, getDataContainerName());
 
   if(getErrorCode() < 0)
   {
@@ -254,7 +254,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 1);
 
-    m_XBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getXBoundsArrayPath(), 0, cDims, "", RectGrid_XBoundsID);
+    m_XBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getXBoundsArrayPath(), 0, cDims, "", RectGrid_XBoundsID);
     if(m_XBoundsPtr.lock())
     {
       m_XBounds = m_XBoundsPtr.lock()->getPointer(0);
@@ -264,7 +264,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       xarrays.push_back(m_XBoundsPtr.lock());
     }
 
-    m_YBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getYBoundsArrayPath(), 0, cDims, "", RectGrid_YBoundsID);
+    m_YBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getYBoundsArrayPath(), 0, cDims, "", RectGrid_YBoundsID);
     if(m_YBoundsPtr.lock())
     {
       m_YBounds = m_YBoundsPtr.lock()->getPointer(0);
@@ -274,7 +274,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       yarrays.push_back(m_YBoundsPtr.lock());
     }
 
-    m_ZBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getZBoundsArrayPath(), 0, cDims, "", RectGrid_ZBoundsID);
+    m_ZBoundsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getZBoundsArrayPath(), 0, cDims, "", RectGrid_ZBoundsID);
     if(m_ZBoundsPtr.lock())
     {
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
@@ -284,9 +284,9 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       zarrays.push_back(m_ZBoundsPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, xarrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, yarrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, zarrays);
+    getDataContainerArray()->validateNumberOfTuples(this, xarrays);
+    getDataContainerArray()->validateNumberOfTuples(this, yarrays);
+    getDataContainerArray()->validateNumberOfTuples(this, zarrays);
 
     break;
   }
@@ -299,7 +299,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath0(), 0, cDims, "", Vert_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath0(), 0, cDims, "", Vert_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -309,7 +309,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       arrays.push_back(m_VertsPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, arrays);
+    getDataContainerArray()->validateNumberOfTuples(this, arrays);
 
     break;
   }
@@ -324,7 +324,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath1(), 0, cDims, "", Edge_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath1(), 0, cDims, "", Edge_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -336,7 +336,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 2;
 
-    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedEdgeList, AbstractFilter, MeshIndexType>(this, getSharedEdgeListArrayPath(), 0, cDims, "", Edge_SharedEdgeID);
+    m_EdgesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedEdgeList>(this, getSharedEdgeListArrayPath(), 0, cDims, "", Edge_SharedEdgeID);
     if(m_EdgesPtr.lock())
     {
       m_Edges = m_EdgesPtr.lock()->getPointer(0);
@@ -346,8 +346,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       earrays.push_back(m_EdgesPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, varrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, earrays);
+    getDataContainerArray()->validateNumberOfTuples(this, varrays);
+    getDataContainerArray()->validateNumberOfTuples(this, earrays);
 
     break;
   }
@@ -362,7 +362,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath2(), 0, cDims, "", Tri_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath2(), 0, cDims, "", Tri_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -372,7 +372,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       varrays.push_back(m_VertsPtr.lock());
     }
 
-    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTriList, AbstractFilter, MeshIndexType>(this, getSharedTriListArrayPath(), 0, cDims, "", Tri_SharedTriangleID);
+    m_TrisPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTriList>(this, getSharedTriListArrayPath(), 0, cDims, "", Tri_SharedTriangleID);
     if(m_TrisPtr.lock())
     {
       m_Tris = m_TrisPtr.lock()->getPointer(0);
@@ -382,8 +382,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       earrays.push_back(m_TrisPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, varrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, earrays);
+    getDataContainerArray()->validateNumberOfTuples(this, varrays);
+    getDataContainerArray()->validateNumberOfTuples(this, earrays);
 
     break;
   }
@@ -398,7 +398,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath3(), 0, cDims, "", Quad_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath3(), 0, cDims, "", Quad_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -410,7 +410,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedQuadList, AbstractFilter, MeshIndexType>(this, getSharedQuadListArrayPath(), 0, cDims, "", Quad_SharedQuadID);
+    m_QuadsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedQuadList>(this, getSharedQuadListArrayPath(), 0, cDims, "", Quad_SharedQuadID);
     if(m_QuadsPtr.lock())
     {
       m_Quads = m_QuadsPtr.lock()->getPointer(0);
@@ -420,8 +420,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       earrays.push_back(m_QuadsPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, varrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, earrays);
+    getDataContainerArray()->validateNumberOfTuples(this, varrays);
+    getDataContainerArray()->validateNumberOfTuples(this, earrays);
 
     break;
   }
@@ -436,7 +436,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath4(), 0, cDims, "", Tet_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath4(), 0, cDims, "", Tet_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -448,7 +448,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 4;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTetList, AbstractFilter, MeshIndexType>(this, getSharedTetListArrayPath(), 0, cDims, "", Tet_SharedTetID);
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedTetList>(this, getSharedTetListArrayPath(), 0, cDims, "", Tet_SharedTetID);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -458,8 +458,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       earrays.push_back(m_TetsPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, varrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, earrays);
+    getDataContainerArray()->validateNumberOfTuples(this, varrays);
+    getDataContainerArray()->validateNumberOfTuples(this, earrays);
 
     break;
   }
@@ -474,7 +474,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     std::vector<size_t> cDims(1, 3);
 
-    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>, AbstractFilter, float>(this, getSharedVertexListArrayPath5(), 0, cDims, "", Hex_SharedVertexID);
+    m_VertsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath5(), 0, cDims, "", Hex_SharedVertexID);
     if(m_VertsPtr.lock())
     {
       m_Verts = m_VertsPtr.lock()->getPointer(0);
@@ -486,7 +486,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     cDims[0] = 8;
 
-    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedHexList, AbstractFilter, MeshIndexType>(this, getSharedHexListArrayPath(), 0, cDims, "", Hex_SharedHexID);
+    m_TetsPtr = getDataContainerArray()->createNonPrereqArrayFromPath<SharedHexList>(this, getSharedHexListArrayPath(), 0, cDims, "", Hex_SharedHexID);
     if(m_TetsPtr.lock())
     {
       m_Tets = m_TetsPtr.lock()->getPointer(0);
@@ -496,8 +496,8 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
       earrays.push_back(m_TetsPtr.lock());
     }
 
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, varrays);
-    getDataContainerArray()->validateNumberOfTuples<AbstractFilter>(this, earrays);
+    getDataContainerArray()->validateNumberOfTuples(this, varrays);
+    getDataContainerArray()->validateNumberOfTuples(this, earrays);
 
     break;
   }
@@ -514,19 +514,6 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExtractAttributeArraysFromGeometry::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -540,7 +527,7 @@ void ExtractAttributeArraysFromGeometry::execute()
     return;
   }
 
-  IGeometry::Pointer igeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry, AbstractFilter>(this, getDataContainerName());
+  IGeometry::Pointer igeom = getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry>(this, getDataContainerName());
   IGeometry::Type geomType = igeom->getGeometryType();
 
   switch(geomType)
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index dd0f77976b..27e783cd6f 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -355,33 +355,6 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ExtractAttributeArraysFromGeometry();
@@ -389,7 +362,7 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index d837e5550f..b477f681e4 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -116,7 +116,7 @@ void ExtractComponentAsArray::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedArrayPath());
 
   if(m_NewArrayArrayName.isEmpty())
   {
@@ -161,18 +161,6 @@ void ExtractComponentAsArray::dataCheck()
   m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), DataArrayID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExtractComponentAsArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index ee1bec1e4e..197d0d18dd 100755
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -182,40 +182,13 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ExtractComponentAsArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index e421e2a286..efff990608 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -186,7 +186,7 @@ void ExtractVertexGeometry::dataCheck()
   size_t elementCount = 0;
   if(IGeometry::Type::Image == geomType || IGeometry::Type::RectGrid == geomType)
   {
-    vertexDataContainer = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getVertexDataContainerName(), DataContainerID);
+    vertexDataContainer = getDataContainerArray()->createNonPrereqDataContainer(this, getVertexDataContainerName(), DataContainerID);
     IGeometryGrid::Pointer imageGeom = std::dynamic_pointer_cast<IGeometryGrid>(fromGeometry);
     SizeVec3Type imageDims = imageGeom->getDimensions();
     VertexGeom::Pointer vertexGeom = VertexGeom::CreateGeometry(imageDims[0] * imageDims[1] * imageDims[2], "VertexGeometry", !getInPreflight());
@@ -225,7 +225,7 @@ void ExtractVertexGeometry::dataCheck()
       return;
     }
 
-    IDataArray::Pointer iDataArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, dap);
+    IDataArray::Pointer iDataArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, dap);
     if(getErrorCode() < 0)
     {
       return;
@@ -255,19 +255,6 @@ void ExtractVertexGeometry::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ExtractVertexGeometry::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 209fc64204..71d36345a2 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -203,33 +203,6 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ExtractVertexGeometry();
@@ -237,7 +210,7 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 30f637035b..0b18924914 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -105,11 +105,11 @@ void FeatureCountDecision::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getFeatureIdsArrayPath().getDataContainerName());
+  getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, getFeatureIdsArrayPath().getDataContainerName());
 
   std::vector<size_t> cDims(1, 1);
 
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getFeatureIdsArrayPath(),
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -117,18 +117,6 @@ void FeatureCountDecision::dataCheck()
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FeatureCountDecision::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index ce42681a53..6601870c44 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -158,17 +158,13 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
   protected:
     FeatureCountDecision();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 7ea611fe57..cd69574af4 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -128,7 +128,7 @@ void FeatureDataCSVWriter::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellFeatureAttributeMatrixPath(), -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCellFeatureAttributeMatrixPath(), -301);
 
   QFileInfo fi(getFeatureDataFile());
   if(fi.suffix().compare("") == 0)
@@ -161,18 +161,6 @@ void FeatureDataCSVWriter::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FeatureDataCSVWriter::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 51fbc7df89..64f4289d76 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -227,40 +227,13 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     FeatureDataCSVWriter();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index 482846f74c..3cd8b30bbe 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -64,24 +64,6 @@ void FileReader::dataCheck()
 {
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t FileReader::readHeader()
-{
-  setErrorCondition(-1, "FileReader should be subclassed and functionality implemented there");
-  return -1;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t FileReader::readFile()
-{
-  setErrorCondition(-1, "FileReader should be subclassed and functionality implemented there");
-  return -1;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -106,17 +88,6 @@ FileReader::Pointer FileReader::NullPointer()
   return Pointer(static_cast<Self*>(nullptr));
 }
 
-// -----------------------------------------------------------------------------
-std::shared_ptr<FileReader> FileReader::New()
-{
-  struct make_shared_enabler : public FileReader
-  {
-  };
-  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
-  val->setupFilterParameters();
-  return val;
-}
-
 // -----------------------------------------------------------------------------
 QString FileReader::getNameOfClass() const
 {
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index 6c3dd510b4..ded10e79c4 100755
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -57,8 +57,6 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
     using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
-    static std::shared_ptr<FileReader> New();
-
     /**
      * @brief Returns the name of the class for FileReader
      */
@@ -76,29 +74,6 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
      */
     void execute() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     FileReader();
 
@@ -106,18 +81,18 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
      * @brief readHeader Reads the header of the input file
      * @return Integer error value
      */
-    virtual int32_t readHeader();
+    virtual int32_t readHeader() = 0;
 
     /**
      * @brief readFile Reads the contents of the input file
      * @return Integer error value
      */
-    virtual int32_t readFile();
+    virtual int32_t readFile() = 0;
 
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    virtual void dataCheck();
+    virtual void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index e71887f1f1..871e87b660 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -55,24 +55,6 @@ FileWriter::FileWriter()
 // -----------------------------------------------------------------------------
 FileWriter::~FileWriter() = default;
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t FileWriter::writeHeader()
-{
-  setErrorCondition(-1, "FileWriter should be subclassed and functionality implemented there");
-  return -1;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t FileWriter::writeFile()
-{
-  setErrorCondition(-1, "FileWriter should be subclassed and functionality implemented there");
-  return -1;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -115,17 +97,6 @@ FileWriter::Pointer FileWriter::NullPointer()
   return Pointer(static_cast<Self*>(nullptr));
 }
 
-// -----------------------------------------------------------------------------
-std::shared_ptr<FileWriter> FileWriter::New()
-{
-  struct make_shared_enabler : public FileWriter
-  {
-  };
-  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
-  val->setupFilterParameters();
-  return val;
-}
-
 // -----------------------------------------------------------------------------
 QString FileWriter::getNameOfClass() const
 {
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 0ece1ccf7b..1fa6c0a8ca 100755
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -50,7 +50,6 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
 #ifdef SIMPL_ENABLE_PYTHON
     PYB11_CREATE_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(FileWriter)
-    PYB11_FILTER_NEW_MACRO(FileWriter)
     PYB11_FILTER_PARAMETER(QString, OutputFile)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
 #endif
@@ -63,8 +62,6 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
     using ConstWeakPointer = std::weak_ptr<const Self>;
     static Pointer NullPointer();
 
-    static std::shared_ptr<FileWriter> New();
-
     /**
      * @brief Returns the name of the class for FileWriter
      */
@@ -90,29 +87,6 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
 
     void execute() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     FileWriter();
 
@@ -120,13 +94,13 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
      * @brief writeHeader Writes the header of the output file
      * @return Integer error value
      */
-    virtual int32_t writeHeader();
+    virtual int32_t writeHeader() = 0;
 
     /**
      * @brief writeFile Writes the contents of the output file
      * @return Integer error value
      */
-    virtual int32_t writeFile();
+    virtual int32_t writeFile() = 0;
 
   public:
     FileWriter(const FileWriter&) = delete;     // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index b5ef389228..91e63237a6 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -285,7 +285,7 @@ void FindDerivatives::dataCheck()
     return;
   }
 
-  AttributeMatrix::Pointer inAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedArrayPath, -301);
+  AttributeMatrix::Pointer inAttrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedArrayPath, -301);
   AttributeMatrix::Pointer destAttrMat = m->getPrereqAttributeMatrix(this, getDerivativesArrayPath().getAttributeMatrixName(), -301);
 
   if(getErrorCode() < 0)
@@ -365,7 +365,7 @@ void FindDerivatives::dataCheck()
     }
   }
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedArrayPath());
   if(getErrorCode() < 0)
   {
     return;
@@ -375,7 +375,7 @@ void FindDerivatives::dataCheck()
   cDims *= 3;
   std::vector<size_t> dims(1, cDims);
 
-  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>, AbstractFilter, double>(
+  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(
       this, getDerivativesArrayPath(), 0, dims, "", DerivativesArrayID);    /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_DerivativesArrayPtr.lock())       /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -383,18 +383,6 @@ void FindDerivatives::dataCheck()
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FindDerivatives::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 4029c88e9e..dbde6a283c 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -179,34 +179,6 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief This function runs some sanity checks on the DataContainer and inputs
-   * in an attempt to ensure the filter can process the inputs.
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters This is emitted when the filter requests all the latest Filter Parameters need to be
-   * pushed from a user facing control such as the FilterParameter Widget
-   * @param filter The filter to push the values into
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged This signal can be emitted when any of the filter parameters are changed internally.
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before the dataCheck() is called. This can change if needed.
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after the dataCheck() is called. Typically. This can change if needed.
-   */
-  void preflightExecuted();
 
 protected:
   FindDerivatives();
@@ -214,7 +186,7 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index e29f0cdcbd..928b691ebd 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -188,7 +188,7 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   DataArrayPath tmpPath = selectedDAP;
   tmpPath.setDataArrayName(rgbArrayName);
 
-  UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, tmpPath, std::vector<size_t>(1, 3));
+  UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType>(nullptr, tmpPath, std::vector<size_t>(1, 3));
   if (colorArray.get() == nullptr) { return; }
 
   ParallelDataAlgorithm dataAlg;
@@ -257,26 +257,12 @@ void GenerateColorTable::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedDataArrayPath());
+  getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedDataArrayPath());
 
   DataArrayPath tmpPath = getSelectedDataArrayPath();
   tmpPath.setDataArrayName(getRgbArrayName());
 
-  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>, AbstractFilter, uint8_t>(this, tmpPath, 0, std::vector<size_t>(1, 3), "", ColorArrayID);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenerateColorTable::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true); // Set the fact that we are preflighting.
-  emit preflightAboutToExecute(); // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck(); // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted(); // We are done preflighting this filter
-  setInPreflight(false); // Inform the system this filter is NOT in preflight mode anymore.
+  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<uint8_t>>(this, tmpPath, 0, std::vector<size_t>(1, 3), "", ColorArrayID);
 }
 
 // -----------------------------------------------------------------------------
@@ -291,59 +277,59 @@ void GenerateColorTable::execute()
     return;
   }
 
-  if(getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  if(getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    Int8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int8_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    UInt8ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint8_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    Int16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int16_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    UInt16ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint16_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    Int32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int32_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    UInt32ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint32_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    Int64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    Int64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<int64_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    UInt64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    UInt64ArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<uint64_t>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    DoubleArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    DoubleArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<double>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    FloatArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    FloatArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<float>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
-  else if(getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
+  else if(getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType>(nullptr, getSelectedDataArrayPath(), {static_cast<size_t>(1)}).get() != nullptr)
   {
-    BoolArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType, AbstractFilter>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
+    BoolArrayType::Pointer ptr = getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType>(this, getSelectedDataArrayPath(), {static_cast<size_t>(1)});
     generateColorArray<bool>(ptr, getSelectedPresetControlPoints(), getSelectedDataArrayPath(), getRgbArrayName(), getDataContainerArray());
   }
   else
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 450914cc08..e417353699 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -161,33 +161,6 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   GenerateColorTable();
@@ -195,7 +168,7 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index bbb64cfe41..416c036dca 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -118,7 +118,7 @@ class ResampleGrid
 
     //========= Input Data Structure Elements
     DataContainerArray::Pointer dca = m_Filter->getDataContainerArray();
-    IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath<IDataArray>(m_Filter, m_Filter->getInputDataArrayPath());
+    IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath(m_Filter, m_Filter->getInputDataArrayPath());
     DataArrayPath inputDataArrayPath = m_Filter->getInputDataArrayPath();
     DataContainer::Pointer inputDC = dca->getDataContainer(inputDataArrayPath.getDataContainerName());
     ImageGeom::Pointer inputImageGeom = inputDC->getGeometryAs<ImageGeom>();
@@ -374,7 +374,7 @@ void GenerateTiltSeries::dataCheck()
 
   // Validate correct range of Rotation Axis (0|1|2)
   DataContainerArray::Pointer dca = getDataContainerArray();
-  IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath<IDataArray>(this, getInputDataArrayPath());
+  IDataArray::Pointer inputData = dca->getPrereqIDataArrayFromPath(this, getInputDataArrayPath());
   if(getErrorCode() < 0)
   {
     return;
@@ -423,19 +423,6 @@ void GenerateTiltSeries::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenerateTiltSeries::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 3b9a617949..5acc263b36 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -201,33 +201,6 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   GenerateTiltSeries();
@@ -235,7 +208,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 4541c1faa8..522afd54b3 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -476,7 +476,7 @@ void ImportAsciDataArray::dataCheck()
     setErrorCondition(-391, ss);
   }
 
-  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCreatedAttributeArrayPath(), -30003);
+  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCreatedAttributeArrayPath(), -30003);
   if(getErrorCode() < 0)
   {
     return;
@@ -492,47 +492,47 @@ void ImportAsciDataArray::dataCheck()
   std::vector<size_t> cDims(1, m_NumberOfComponents);
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, uint8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, int16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, uint16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, int32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, uint32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, int64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, uint64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, float>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Bool)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType, AbstractFilter, bool>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+    getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
 
   readHeaderPortion();
@@ -540,18 +540,6 @@ void ImportAsciDataArray::dataCheck()
   
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImportAsciDataArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -575,7 +563,7 @@ void ImportAsciDataArray::execute()
   int32_t err = 0;
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    Int8ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    Int8ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int8ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<int8_t, int32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -584,7 +572,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    UInt8ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<UInt8ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    UInt8ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt8ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<uint8_t, uint32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -593,7 +581,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    Int16ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<Int16ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    Int16ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<int16_t,int16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -602,7 +590,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    UInt16ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<UInt16ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    UInt16ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<uint16_t,uint16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -611,7 +599,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    Int32ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<Int32ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    Int32ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<int32_t,int32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -620,7 +608,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    UInt32ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    UInt32ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<uint32_t,uint32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -629,7 +617,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    Int64ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<Int64ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    Int64ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<int64_t,int64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -638,7 +626,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    UInt64ArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<UInt64ArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    UInt64ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<uint64_t,uint64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -647,7 +635,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
-    FloatArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<FloatArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    FloatArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<float,float>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -656,7 +644,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
-    DoubleArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    DoubleArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<double,double>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
@@ -665,7 +653,7 @@ void ImportAsciDataArray::execute()
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Bool)
   {
-    BoolArrayType::Pointer p = getDataContainerArray()->getPrereqIDataArrayFromPath<BoolArrayType, AbstractFilter>(this, getCreatedAttributeArrayPath());
+    BoolArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<BoolArrayType>(this, getCreatedAttributeArrayPath(), cDims);
     err = readAsciFile<bool, bool>(p, m_InputFile, m_SkipHeaderLines, delimiter, true);
     if(err >= 0)
     {
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 12ba823931..2281c217ba 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -275,33 +275,6 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ImportAsciDataArray();
@@ -309,7 +282,7 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 689cad740f..25cc90a45a 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -159,7 +159,7 @@ void ImportHDF5Dataset::dataCheck()
   }
 
   int err = 0;
-  AttributeMatrix::Pointer am = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, m_SelectedAttributeMatrix, err);
+  AttributeMatrix::Pointer am = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, m_SelectedAttributeMatrix, err);
   if(getErrorCode() < 0)
   {
     return;
@@ -352,19 +352,6 @@ void ImportHDF5Dataset::dataCheck()
   // The sentinel will close the HDF5 File and any groups that were open.
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ImportHDF5Dataset::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 1e6dc34a12..4435eef4d7 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -217,33 +217,6 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ImportHDF5Dataset();
@@ -251,7 +224,7 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index afefcd820c..96853ccd1a 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -179,9 +179,9 @@ void InitializeData::dataCheck()
   }
 
   DataArrayPath attributeMatrixPath(m_CellAttributeMatrixPaths[0].getDataContainerName(), m_CellAttributeMatrixPaths[0].getAttributeMatrixName(), "");
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, attributeMatrixPath, -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, attributeMatrixPath, -301);
 
-  ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, attributeMatrixPath.getDataContainerName());
+  ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, attributeMatrixPath.getDataContainerName());
   if(nullptr == image.get())
   {
     return;
@@ -335,18 +335,6 @@ template <typename T> void InitializeData::checkInitialization(IDataArray::Point
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InitializeData::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 36037eb773..28b02c83e7 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -303,40 +303,13 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   InitializeData();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index eb1d9cdc59..d125cde656 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -141,7 +141,7 @@ void LinkFeatureMapToElementArray::dataCheck()
   m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature, AttributeMatrixID);
 
   std::vector<size_t> cDims(1, 1);
-  m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>, AbstractFilter>(this, getSelectedCellArrayPath(),
+  m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(),
                                                                                                               cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_SelectedCellDataPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
@@ -154,25 +154,13 @@ void LinkFeatureMapToElementArray::dataCheck()
   }
 
   tempPath.update(getSelectedCellArrayPath().getDataContainerName(), getCellFeatureAttributeMatrixName(), getActiveArrayName());
-  m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, false, cDims, "", DataArrayID);
+  m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, false, cDims, "", DataArrayID);
   if(nullptr != m_ActivePtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void LinkFeatureMapToElementArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index 2ee283be62..83f110343b 100755
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -178,40 +178,13 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     LinkFeatureMapToElementArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 20df6b39a9..729a30cfbc 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -103,25 +103,13 @@ void MaskCountDecision::dataCheck()
   std::vector<size_t> cDims(1, 1);
 
   m_MaskPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>, AbstractFilter>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_MaskPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_Mask = m_MaskPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MaskCountDecision::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index deeb5fd53f..6cbacc2b42 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -158,17 +158,13 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
   protected:
     MaskCountDecision();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 8b782df75e..09cf843c14 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -101,23 +101,10 @@ void MassCreateData::dataCheck()
   const int iterations = 4000;
   for(int i = 0; i < iterations; i++)
   {
-    DataContainerShPtr dc = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName().getDataContainerName() + QString::number(i), DataContainerBaseID + i);
+    DataContainerShPtr dc = getDataContainerArray()->createNonPrereqDataContainer(this, getDataContainerName().getDataContainerName() + QString::number(i), DataContainerBaseID + i);
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MassCreateData::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index fc38f67045..e6e10c5135 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -158,40 +158,13 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   MassCreateData();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index e78d008bef..72836b7ec0 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -156,7 +156,7 @@ void MoveData::dataCheck()
   {
     DataContainer::Pointer amDestDataContainer = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerDestination());
     DataContainer::Pointer amSrcDataContainer = getDataContainerArray()->getPrereqDataContainer(this, amSrcPath.getDataContainerName());
-    AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amSrcPath, -301);
+    AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amSrcPath, -301);
 
     if(getErrorCode() < 0)
     {
@@ -176,9 +176,9 @@ void MoveData::dataCheck()
   }
   else if(getWhatToMove() == k_MoveDataArray)
   {
-    AttributeMatrix::Pointer daSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, daSrcPath, -301);
-    AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amDestPath, -301);
-    IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, daSrcPath);
+    AttributeMatrix::Pointer daSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, daSrcPath, -301);
+    AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amDestPath, -301);
+    IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath(this, daSrcPath);
 
     if(getErrorCode() < 0)
     {
@@ -212,18 +212,6 @@ void MoveData::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MoveData::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index 65d27df05e..4d55a90c8d 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -205,33 +205,6 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     MoveData();
@@ -239,7 +212,7 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index ed2dcea67e..1fc8d0c537 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -163,7 +163,7 @@ void MoveMultiData::dataCheck()
     for(int i = 0; i < amSrcPaths.size(); i++)
     {
       DataContainer::Pointer amSrcDataContainer = getDataContainerArray()->getPrereqDataContainer(this, amSrcPaths[i].getDataContainerName());
-      AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amSrcPaths[i], -301);
+      AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amSrcPaths[i], -301);
 
       if(getErrorCode() < 0)
       {
@@ -186,13 +186,13 @@ void MoveMultiData::dataCheck()
   }
   else if(getWhatToMove() == k_MoveMultiDataArray)
   {
-    AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, amDestPath, -301);
+    AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amDestPath, -301);
     
     // Repeat for each DataArray
     for(int i = 0; i < daSrcPaths.size(); i++)
     {
-      AttributeMatrix::Pointer daSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, daSrcPaths[i], -301);
-      IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, daSrcPaths[i]);
+      AttributeMatrix::Pointer daSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, daSrcPaths[i], -301);
+      IDataArray::Pointer daSrcDataArray = getDataContainerArray()->getPrereqIDataArrayFromPath(this, daSrcPaths[i]);
 
       if(getErrorCode() < 0)
       {
@@ -230,18 +230,6 @@ void MoveMultiData::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MoveMultiData::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 96cc7bf38c..256c6dd0c0 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -205,33 +205,6 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     MoveMultiData();
@@ -239,7 +212,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index cb6bf421a8..789d706dab 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -147,7 +147,7 @@ void MultiThresholdObjects::dataCheck()
     ComparisonInput_t comp = m_SelectedThresholds[0];
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(comp.dataContainerName, comp.attributeMatrixName, getDestinationArrayName());
-    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
+    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
@@ -158,7 +158,7 @@ void MultiThresholdObjects::dataCheck()
     {
       ComparisonInput_t comp = m_SelectedThresholds[i];
       tempPath.update(comp.dataContainerName, comp.attributeMatrixName, comp.attributeArrayName);
-      IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, tempPath);
+      IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath(this, tempPath);
       if(getErrorCode() >= 0)
       {
         cDims = inputData->getComponentDimensions();
@@ -177,18 +177,6 @@ void MultiThresholdObjects::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiThresholdObjects::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index c898fa862b..0ab9b849fc 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -165,40 +165,13 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     MultiThresholdObjects();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 9a897416b2..532efe4df3 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -142,7 +142,7 @@ void MultiThresholdObjects2::dataCheck()
     //AbstractComparison::Pointer comp = m_SelectedThresholds[0];
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
-    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>, AbstractFilter, bool>(this, tempPath, true, cDims, "", ThresholdArrayID);
+    m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
     if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
@@ -156,7 +156,7 @@ void MultiThresholdObjects2::dataCheck()
       if (nullptr != comp)
       {
         tempPath.update(dcName, amName, comp->getAttributeArrayName());
-        IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, tempPath);
+        IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath(this, tempPath);
         if(getErrorCode() >= 0)
         {
           cDims = inputData->getComponentDimensions();
@@ -176,18 +176,6 @@ void MultiThresholdObjects2::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MultiThresholdObjects2::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index e892b1d249..26ca4f95fa 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -167,40 +167,13 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     MultiThresholdObjects2();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index a1d81e855a..459740f330 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -81,19 +81,6 @@ void PipelineAnnotation::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PipelineAnnotation::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index 22a0bc44f7..ef67ae514c 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -150,40 +150,13 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   PipelineAnnotation();
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index c43a1c2673..82a145ff9d 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -106,19 +106,6 @@ void PostSlackMessage::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PostSlackMessage::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index a2c3917ca7..9ae88ebdaf 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -197,33 +197,6 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   PostSlackMessage();
@@ -231,7 +204,7 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index fdade99e59..a49ed9d35d 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -102,10 +102,9 @@ int32_t SanityCheckFileSizeVersusAllocatedSize(size_t allocatedBytes, size_t fil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> int32_t readBinaryFile(RawBinaryReader* filter)
+template <typename T> int32_t readBinaryFile(RawBinaryReader* filter, const std::vector<size_t>& cDims)
 {
-
-  typename DataArray<T>::Pointer p = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(filter, filter->getCreatedAttributeArrayPath());
+  typename DataArray<T>::Pointer p = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter, filter->getCreatedAttributeArrayPath(), cDims);
   QString filename = filter->getInputFile();
   int64_t skipHeaderBytes = filter->getSkipHeaderBytes();
 
@@ -273,7 +272,7 @@ void RawBinaryReader::dataCheck()
     setErrorCondition(-391, ss);
   }
 
-  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCreatedAttributeArrayPath(), -30003);
+  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCreatedAttributeArrayPath(), -30003);
   if(getErrorCode() < 0)
   {
     return;
@@ -286,52 +285,52 @@ void RawBinaryReader::dataCheck()
   std::vector<size_t> cDims(1, m_NumberOfComponents);
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter, int8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(int8_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter, uint8_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(uint8_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter, int16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(int16_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter, uint16_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(uint16_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter, int32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(int32_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter, uint32_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(uint32_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter, int64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(int64_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter, uint64_t>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(uint64_t) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter, float>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(float) * m_NumberOfComponents * totalDim;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter, double>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
     allocatedBytes = sizeof(double) * m_NumberOfComponents * totalDim;
   }
 
@@ -358,18 +357,6 @@ void RawBinaryReader::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RawBinaryReader::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
@@ -386,44 +373,46 @@ void RawBinaryReader::execute()
 
   DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getCreatedAttributeArrayPath().getDataContainerName());
 
+  std::vector<size_t> cDims(1, m_NumberOfComponents);
+
   int32_t err = 0;
   switch(m_ScalarType)
   {
   case SIMPL::NumericTypes::Type::Int8:
-    err = readBinaryFile<int8_t>(this);
+    err = readBinaryFile<int8_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::UInt8:
-    err = readBinaryFile<uint8_t>(this);
+    err = readBinaryFile<uint8_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Int16:
-    err = readBinaryFile<int16_t>(this);
+    err = readBinaryFile<int16_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::UInt16:
-    err = readBinaryFile<uint16_t>(this);
+    err = readBinaryFile<uint16_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Int32:
-    err = readBinaryFile<int32_t>(this);
+    err = readBinaryFile<int32_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::UInt32:
-    err = readBinaryFile<uint32_t>(this);
+    err = readBinaryFile<uint32_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Int64:
-    err = readBinaryFile<int64_t>(this);
+    err = readBinaryFile<int64_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::UInt64:
-    err = readBinaryFile<uint64_t>(this);
+    err = readBinaryFile<uint64_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Float:
-    err = readBinaryFile<float>(this);
+    err = readBinaryFile<float>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Double:
-    err = readBinaryFile<double>(this);
+    err = readBinaryFile<double>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::Bool:
-    err = readBinaryFile<uint8_t>(this);
+    err = readBinaryFile<uint8_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::SizeT:
-    err = readBinaryFile<size_t>(this);
+    err = readBinaryFile<size_t>(this, cDims);
     break;
   case SIMPL::NumericTypes::Type::UnknownNumType:
     break;
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index dc7b20824f..f637a073a9 100755
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -224,33 +224,6 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     RawBinaryReader();
@@ -258,7 +231,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index a2ec0ec7ce..f989be48b0 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -352,57 +352,57 @@ void ReadASCIIData::dataCheck()
 
     if(dataType == SIMPL::TypeNames::Double)
     {
-      DoubleArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      DoubleArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Float)
     {
-      FloatArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      FloatArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int8)
     {
-      Int8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      Int8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int16)
     {
-      Int16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      Int16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int32)
     {
-      Int32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      Int32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::Int64)
     {
-      Int64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      Int64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt8)
     {
-      UInt8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      UInt8ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt16)
     {
-      UInt16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      UInt16ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt32)
     {
-      UInt32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      UInt32ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::UInt64)
     {
-      UInt64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType, AbstractFilter>(this, arrayPath, 0, cDims, "");
+      UInt64ArrayType::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType>(this, arrayPath, 0, cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else if(dataType == SIMPL::TypeNames::String)
     {
-      StringDataArray::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray, AbstractFilter, QString>(this, arrayPath, "", cDims, "");
+      StringDataArray::Pointer ptr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray>(this, arrayPath, "", cDims, "");
       m_ASCIIArrayMap.insert(i, ptr);
     }
     else
@@ -414,19 +414,6 @@ void ReadASCIIData::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ReadASCIIData::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 495c1562fe..1076357926 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -182,10 +182,6 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
     * @brief Updates any DataArrayPath properties from the old path to a new path
@@ -194,35 +190,12 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     */
     void renameDataArrayPath(const DataArrayPath::RenameType& renamePath) override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer 
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     ReadASCIIData();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index d2c30b1656..77fab21fbd 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -111,18 +111,6 @@ void RemoveArrays::dataCheck()
   removeSelectionsFromDataContainerArray(getDataContainerArray().get(), Qt::Checked);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveArrays::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index 127d3b92e1..0c5e9df09d 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -150,10 +150,6 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
      * @brief removeSelectionsFromDataContainerArray Attempts to remove those DataContainers, AttributeMatrices, and DataArrays selected by the user.
@@ -169,35 +165,12 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
      */
     std::list<DataArrayPath> getDeletedPaths() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     RemoveArrays();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 004bf760f6..2a6087e8c5 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -127,7 +127,7 @@ void RemoveComponentFromArray::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArrayPath());
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedArrayPath());
 
   if(m_SaveRemovedComponent)
   {
@@ -180,18 +180,6 @@ void RemoveComponentFromArray::dataCheck()
   m_ReducedArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath2, cDims, m_InArrayPtr.lock(), ReducedDataArrayID);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RemoveComponentFromArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index 68e8d84637..7617373769 100755
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -208,40 +208,13 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     RemoveComponentFromArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index c82e22a7e6..52962d0ef0 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -122,7 +122,7 @@ void RenameAttributeArray::dataCheck()
     m_LastArrayName = getNewArrayName();
   }
 
-  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedArrayPath(), -301);
+  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getSelectedArrayPath(), -301);
   if(getErrorCode() < 0)
   {
     return;
@@ -161,18 +161,6 @@ void RenameAttributeArray::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RenameAttributeArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index 70506dfceb..c66589b048 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -163,10 +163,6 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
      * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
@@ -174,35 +170,12 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
      */
     DataArrayPath::RenameContainer getRenamedPaths() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     RenameAttributeArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index e5a476fef0..e014020eb3 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -125,7 +125,7 @@ void RenameAttributeMatrix::dataCheck()
   }
 
   DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedAttributeMatrixPath().getDataContainerName());
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getSelectedAttributeMatrixPath(), -301);
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getSelectedAttributeMatrixPath(), -301);
 
   if(getErrorCode() < 0)
   {
@@ -146,18 +146,6 @@ void RenameAttributeMatrix::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RenameAttributeMatrix::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index e72e396881..7b27145a4e 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -163,10 +163,6 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
     * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
@@ -174,35 +170,12 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
     */
     DataArrayPath::RenameContainer getRenamedPaths() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     RenameAttributeMatrix();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index d278124e77..6ef6b882d2 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -129,18 +129,6 @@ void RenameDataContainer::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RenameDataContainer::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 9b6f1a4ca7..6d39ef13fc 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -158,10 +158,6 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     /**
     * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
@@ -169,35 +165,12 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
     */
     DataArrayPath::RenameContainer getRenamedPaths() override;
 
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
-
   protected:
     RenameDataContainer();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 54af86f145..6e2b79cf4b 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -170,7 +170,7 @@ void ReplaceValueInArray::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getSelectedArray());
+  m_ArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedArray());
   if(getErrorCode() < 0)
   {
     return;
@@ -244,18 +244,6 @@ void ReplaceValueInArray::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ReplaceValueInArray::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index ea1574e7a6..8556c896ed 100755
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -182,40 +182,13 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ReplaceValueInArray();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 2678611050..9b597e34c3 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -149,18 +149,6 @@ void RequiredZThickness::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RequiredZThickness::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 2d7c3a1f5f..e1605d8756 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -166,10 +166,6 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
 
     //  signals:
     //    void decisionMade(bool& dm);
@@ -179,7 +175,7 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index d982613851..0de2edacee 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -424,8 +424,8 @@ void RotateSampleRefFrame::dataCheck()
     return;
   }
 
-  getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getCellAttributeMatrixPath().getDataContainerName());
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath<AbstractFilter>(this, getCellAttributeMatrixPath(), -301);
+  getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, getCellAttributeMatrixPath().getDataContainerName());
+  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCellAttributeMatrixPath(), -301);
   if(getErrorCode() < 0)
   {
     return;
@@ -537,19 +537,6 @@ void RotateSampleRefFrame::dataCheck()
   m->getAttributeMatrix(attrMatName)->resizeAttributeArrays(tDims);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RotateSampleRefFrame::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index 4bca48c7e9..ba670424a3 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -267,33 +267,6 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   RotateSampleRefFrame();
@@ -301,7 +274,7 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 23c98398b2..0317f9fd63 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -169,27 +169,15 @@ void ScaleVolume::dataCheck()
 
   if(m_ApplyToVoxelVolume)
   {
-    getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getDataContainerName());
+    getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, getDataContainerName());
   }
 
   if(m_ApplyToSurfaceMesh)
   {
-    getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry2D, AbstractFilter>(this, getSurfaceDataContainerName());
+    getDataContainerArray()->getPrereqGeometryFromDataContainer<IGeometry2D>(this, getSurfaceDataContainerName());
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ScaleVolume::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 71ec964551..19def52d3f 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -206,40 +206,13 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     ScaleVolume();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 5454a6868f..e274862ecd 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -161,7 +161,7 @@ void SetOriginResolutionImageGeom::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, getDataContainerName());
+  ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, getDataContainerName());
   if(getErrorCode() < 0)
   {
     return;
@@ -176,18 +176,6 @@ void SetOriginResolutionImageGeom::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SetOriginResolutionImageGeom::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index f61417b603..280153ceec 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -206,40 +206,13 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     SetOriginResolutionImageGeom();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 74dcd31e7a..22d6858559 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -109,7 +109,7 @@ void SplitAttributeArray::dataCheck()
   clearWarningCode();
   initialize();
 
-  m_InputArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, getInputArrayPath());
+  m_InputArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getInputArrayPath());
 
   if(getErrorCode() < 0)
   {
@@ -152,19 +152,6 @@ void SplitAttributeArray::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SplitAttributeArray::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 12d9a71c4a..830c94e939 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -177,33 +177,6 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
    */
   void execute() override;
 
-  /**
-   * @brief preflight Reimplemented from @see AbstractFilter class
-   */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   SplitAttributeArray();
@@ -211,7 +184,7 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 3ae814a52a..e064774532 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -224,7 +224,7 @@ class ArrayCalculatorTest
     DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(expectedErrorCondition));
     DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(expectedWarningCondition));
 
-    DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), targetArrayPath);
+    DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), targetArrayPath);
 
     if(nullptr != expectedNumberOfTuples)
     {
@@ -259,16 +259,16 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer mcArray1 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array1"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array1"));
 
       UInt32ArrayType::Pointer mcArray2 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array2"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array2"));
 
       propWasSet = filter->setProperty("InfixEquation", "MultiComponent Array1 + MultiComponent Array2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == mcArray1->getNumberOfComponents());
       for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++)
@@ -285,16 +285,16 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer mcArray1 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array1"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array1"));
 
       UInt32ArrayType::Pointer mcArray2 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array2"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array2"));
 
       propWasSet = filter->setProperty("InfixEquation", "MultiComponent Array1[1] + MultiComponent Array2[0]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == mcArray1->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == 1);
       for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++)
@@ -310,16 +310,16 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
       UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + 2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents());
       for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++)
@@ -336,16 +336,16 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
       UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == nArray->getNumberOfComponents());
       for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++)
@@ -362,16 +362,16 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
       UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == nArray->getNumberOfTuples());
       DREAM3D_REQUIRE(arrayPtr->getNumberOfComponents() == 1);
       for(int t = 0; t < arrayPtr->getNumberOfTuples(); t++)
@@ -387,10 +387,10 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
       UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -403,10 +403,10 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
       UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[3]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -480,13 +480,13 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<FloatArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
       propWasSet = filter->setProperty("InfixEquation", "-InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray1->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
       {
@@ -497,13 +497,13 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       UInt32ArrayType::Pointer inputArray2 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
 
       propWasSet = filter->setProperty("InfixEquation", "InputArray2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
       {
@@ -516,17 +516,17 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<FloatArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
       UInt32ArrayType::Pointer spacedArray =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "Spaced Array"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "Spaced Array"));
 
       propWasSet = filter->setProperty("InfixEquation", "Spaced Array + InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(CalculatorItem::WarningCode::NONE));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == spacedArray->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
       {
@@ -537,17 +537,17 @@ class ArrayCalculatorTest
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
       FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<FloatArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
       UInt32ArrayType::Pointer inputArray2 =
-          filter->getDataContainerArray()->getPrereqIDataArrayFromPath<UInt32ArrayType, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
+          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
 
       propWasSet = filter->setProperty("InfixEquation", "sqrt((InputArray1^2)+(InputArray2^2))");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
       filter->execute();
       DREAM3D_REQUIRE_EQUAL(filter->getErrorCode(), static_cast<int>(CalculatorItem::ErrorCode::SUCCESS));
       DREAM3D_REQUIRE_EQUAL(filter->getWarningCode(), static_cast<int>(CalculatorItem::WarningCode::NONE));
-      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DoubleArrayType, AbstractFilter>(filter.get(), arrayPath);
+      DoubleArrayType::Pointer arrayPtr = filter->getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(filter.get(), arrayPath);
       DREAM3D_REQUIRE(arrayPtr->getNumberOfTuples() == inputArray2->getNumberOfTuples());
       for(int i = 0; i < arrayPtr->getNumberOfTuples(); i++)
       {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index 7a9790e097..16432b092d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -197,7 +197,7 @@ class DataContainerTest
     attrMat->insertOrAssign(foo);
 
     QString autoName = foo->getName() + "_Auto";
-    attrMat->createNonPrereqArray<DataArray<T>, AbstractFilter, T>(nullptr, autoName, static_cast<T>(10), compDims);
+    attrMat->createNonPrereqArray<DataArray<T>>(nullptr, autoName, static_cast<T>(10), compDims);
   }
 
   // -----------------------------------------------------------------------------
@@ -293,21 +293,21 @@ class DataContainerTest
     // 1D VolumeDataContainer
     tupleDims.push_back(nx);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "1D_VolumeDataContainer", DataContainerID1);
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer(nullptr, "1D_VolumeDataContainer", DataContainerID1);
       PopulateVolumeDataContainer(dc, tupleDims, "1D_AttributeMatrix");
     }
 
     // 2D VolumeDataContainer
     tupleDims.push_back(ny);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "2D_VolumeDataContainer", DataContainerID2);
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer(nullptr, "2D_VolumeDataContainer", DataContainerID2);
       PopulateVolumeDataContainer(dc, tupleDims, "2D_AttributeMatrix");
     }
 
     // 3D VolumeDataContainer
     tupleDims.push_back(nz);
     {
-      DataContainer::Pointer dc = dca->createNonPrereqDataContainer<AbstractFilter>(nullptr, "3D_VolumeDataContainer", DataContainerID3);
+      DataContainer::Pointer dc = dca->createNonPrereqDataContainer(nullptr, "3D_VolumeDataContainer", DataContainerID3);
       PopulateVolumeDataContainer(dc, tupleDims, "3D_AttributeMatrix");
     }
 
@@ -500,7 +500,7 @@ class DataContainerTest
     DREAM3D_REQUIRE_VALID_POINTER(ida.get())
 
     std::vector<size_t> dims(1, 1);
-    t = attrMat->getPrereqArray<T, AbstractFilter>(nullptr, "Test", -723, dims);
+    t = attrMat->getPrereqArray<T>(nullptr, "Test", -723, dims);
     DREAM3D_REQUIRE_VALID_POINTER(ida.get())
 
     // Remove the AttributeArray from the AttributeMatrix
@@ -514,7 +514,7 @@ class DataContainerTest
     ida = attrMat->getAttributeArray("Test");
     DREAM3D_REQUIRE_NULL_POINTER(ida.get())
 
-    t = attrMat->getPrereqArray<T, AbstractFilter>(nullptr, "Test", -723, dims);
+    t = attrMat->getPrereqArray<T>(nullptr, "Test", -723, dims);
     DREAM3D_REQUIRE_NULL_POINTER(t.get())
 
     // Remove the AttributeMatrix to setup for the next test.
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index b2f44591a7..52ad1e0351 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -40,7 +40,7 @@
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
@@ -63,7 +63,7 @@ class ErrorMessageTest
   // -----------------------------------------------------------------------------
   void TestErrorMessage()
   {
-    AbstractFilter::Pointer f = AbstractFilter::New();
+    AbstractFilter::Pointer f = BadFilter::New();
     f->setErrorCondition(-10, "Description");
 
     FilterProgressMessage::Pointer progressMessage = FilterProgressMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Warning Message...", -23);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 48f46783cb..2cd90ecbf8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -233,7 +233,7 @@ class GenerateColorTableTest
     // Validate Results
     {
       DataArrayPath daPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "CI_RGB");
-      UInt8ArrayType::Pointer da = dca->getPrereqArrayFromPath<UInt8ArrayType, AbstractFilter>(nullptr, daPath, std::vector<size_t>(1, 3));
+      UInt8ArrayType::Pointer da = dca->getPrereqArrayFromPath<UInt8ArrayType>(nullptr, daPath, std::vector<size_t>(1, 3));
       if(da.get() != nullptr)
       {
         QFile file(presetFilePath);
@@ -260,7 +260,7 @@ class GenerateColorTableTest
     }
 
     DataArrayPath amPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "");
-    AttributeMatrix::Pointer am = dca->getPrereqAttributeMatrixFromPath<AbstractFilter>(nullptr, amPath, -300);
+    AttributeMatrix::Pointer am = dca->getPrereqAttributeMatrixFromPath(nullptr, amPath, -300);
     am->removeAttributeArray("CI_RGB");
   }
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
index 3f54698473..0199468fe2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
@@ -140,10 +140,10 @@ class GenerateTiltSeriesTest
 
         QString rotationDc = QString(k_RotationBaseString).arg(rotationString).arg(i);
         featureIdsPath.setDataContainerName(rotationDc);
-        Int8ArrayType::Pointer dataArray = dca->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, featureIdsPath);
+        Int8ArrayType::Pointer dataArray = dca->getPrereqArrayFromPath<Int8ArrayType>(nullptr, featureIdsPath);
         DREAM3D_REQUIRE_VALID_POINTER(dataArray)
 
-        ImageGeom::Pointer imageGeom = dca->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(nullptr, featureIdsPath);
+        ImageGeom::Pointer imageGeom = dca->getPrereqGeometryFromDataContainer<ImageGeom>(nullptr, featureIdsPath);
         DREAM3D_REQUIRE_VALID_POINTER(imageGeom)
 
         FloatVec3Type spacing = imageGeom->getSpacing();
@@ -157,7 +157,7 @@ class GenerateTiltSeriesTest
         err = generateTiltSeries->getErrorCode();
         DREAM3D_REQUIRED(err, >=, 0)
 
-        Int8ArrayType::Pointer testArray = dca->getPrereqIDataArrayFromPath<Int8ArrayType, AbstractFilter>(nullptr, outputFeatureIdsPath);
+        Int8ArrayType::Pointer testArray = dca->getPrereqArrayFromPath<Int8ArrayType>(nullptr, outputFeatureIdsPath);
         DREAM3D_REQUIRE_VALID_POINTER(testArray)
 
         DREAM3D_REQUIRE(dataArrayEqual(*testArray, *dataArray))
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index 2388e52035..bdb58386fe 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -442,7 +442,7 @@ class ImportHDF5DatasetTest
 
         QString dsetPath = dsetInfoList[i].dataSetPath;
         QString dsetName = dsetPath.remove("/Pointer/");
-        typename DataArray<T>::Pointer da = dca->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", dsetName));
+        typename DataArray<T>::Pointer da = dca->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", dsetName));
         size_t totalArrayValues = da->getNumberOfTuples() * da->getNumberOfComponents();
         DREAM3D_REQUIRE_EQUAL(totalArrayValues, tDimsProduct * cDimsProduct);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 9d941bde45..5727ff3a97 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -250,22 +250,22 @@ class SplitAttributeArrayTest
     DREAM3D_REQUIRED(err, >=, 0)
     using DataArrayPtrType = std::shared_ptr<DataArray<T>>;
     DataArrayPtrType mcArray_original =
-        filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType));
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType));
 
     std::vector<DataArrayPtrType> mcArraysAfterSplit;
-    DataArrayPtrType mcArray0 = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(
+    DataArrayPtrType mcArray0 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
         filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component0"));
     mcArraysAfterSplit.push_back(mcArray0);
-    DataArrayPtrType mcArray1 = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(
+    DataArrayPtrType mcArray1 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
         filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component1"));
     mcArraysAfterSplit.push_back(mcArray1);
-    DataArrayPtrType mcArray2 = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(
+    DataArrayPtrType mcArray2 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
         filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component2"));
     mcArraysAfterSplit.push_back(mcArray2);
-    DataArrayPtrType mcArray3 = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(
+    DataArrayPtrType mcArray3 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
         filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component3"));
     mcArraysAfterSplit.push_back(mcArray3);
-    DataArrayPtrType mcArray4 = filter->getDataContainerArray()->getPrereqIDataArrayFromPath<DataArray<T>, AbstractFilter>(
+    DataArrayPtrType mcArray4 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
         filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component4"));
     mcArraysAfterSplit.push_back(mcArray4);
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index b0853c7a3a..a5c24d3748 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -300,7 +300,7 @@ void WriteASCIIData::dataCheck()
 
   for(auto const& path : paths)
   {
-    IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);
+    IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);
 
     if(getErrorCode() < 0)
     {
@@ -327,18 +327,6 @@ void WriteASCIIData::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void WriteASCIIData::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index f29f728995..c4077e5734 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -252,40 +252,13 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     WriteASCIIData();
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 50632b0ba8..31e7a9e79d 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -138,7 +138,7 @@ void WriteTriangleGeometry::dataCheck()
     return;
   }
 
-  TriangleGeom::Pointer triangles = dataContainer->getPrereqGeometry<TriangleGeom, AbstractFilter>(this);
+  TriangleGeom::Pointer triangles = dataContainer->getPrereqGeometry<TriangleGeom>(this);
   if(getErrorCode() < 0)
   {
     return;
@@ -156,18 +156,6 @@ void WriteTriangleGeometry::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void WriteTriangleGeometry::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index 32c02f0c16..427a2b8ebe 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -186,33 +186,6 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
      */
     void execute() override;
 
-    /**
-    * @brief preflight Reimplemented from @see AbstractFilter class
-    */
-    void preflight() override;
-
-  signals:
-    /**
-     * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-     * be pushed from a user-facing control (such as a widget)
-     * @param filter Filter instance pointer
-     */
-    void updateFilterParameters(AbstractFilter* filter);
-
-    /**
-     * @brief parametersChanged Emitted when any Filter parameter is changed internally
-     */
-    void parametersChanged();
-
-    /**
-     * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-     */
-    void preflightAboutToExecute();
-
-    /**
-     * @brief preflightExecuted Emitted just after calling dataCheck()
-     */
-    void preflightExecuted();
 
   protected:
     WriteTriangleGeometry();
@@ -220,7 +193,7 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
     /**
      * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
      */
-    void dataCheck();
+    void dataCheck() override;
 
     /**
      * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 0ad3af5c11..ce8eed82c6 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -819,25 +819,29 @@ class DataArray : public IDataArray
 
   inline reference operator[](size_type index)
   {
-    // assert(index < m_Size);
     return m_Array[index];
   }
 
   inline const T& operator[](size_type index) const
   {
-    // assert(index < m_Size);
     return m_Array[index];
   }
 
   inline reference at(size_type index)
   {
-    assert(index < m_Size);
+    if(index >= m_Size)
+    {
+      throw std::out_of_range("DataArray subscript out of range");
+    }
     return m_Array[index];
   }
 
   inline const T& at(size_type index) const
   {
-    assert(index < m_Size);
+    if(index >= m_Size)
+    {
+      throw std::out_of_range("DataArray subscript out of range");
+    }
     return m_Array[index];
   }
 
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 7babf51ab5..b686c088be 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -73,6 +73,8 @@ class NeighborList : public IDataArray
       return Pointer(static_cast<Self*>(nullptr));
     }
 
+    using value_type = T;
+
     /**
      * @brief Returns the name of the class for AbstractMessage
      */
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 76c63c979e..0e9fe38d6b 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -86,6 +86,8 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
 
   static Pointer New();
 
+  using value_type = QString;
+
   /**
    * @brief Returns the name of the class for StringDataArray
    */
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 05d0adb8f9..96ec067e33 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -992,3 +992,42 @@ bool AttributeMatrix::doesAttributeArrayExist(const QString& name) const
 {
   return contains(name);
 }
+
+// -----------------------------------------------------------------------------
+IDataArray::Pointer AttributeMatrix::getPrereqIDataArray(AbstractFilter* filter, const QString& attributeArrayName, int err) const
+{
+  QString ss;
+  IDataArray::Pointer attributeArray = nullptr;
+  // Make sure the name is not empty for the AttributeArrayName. This would be detected below
+  // in the call to get either one BUT the reason for the failure would not be evident so we make these explicit checks
+  // here and send back nice error messages to ther user/programmer.
+  if(attributeArrayName.isEmpty())
+  {
+    if(filter)
+    {
+      ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
+      filter->setErrorCondition(err, ss);
+    }
+    return attributeArray;
+  }
+  // Now ask for the actual AttributeArray from the AttributeMatrix
+  if(!doesAttributeArrayExist(attributeArrayName))
+  {
+    if(filter)
+    {
+      ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
+      filter->setErrorCondition(err, ss);
+    }
+    return attributeArray;
+  }
+
+  attributeArray = getAttributeArray(attributeArrayName);
+
+  if(attributeArray == nullptr)
+  {
+    ss = QObject::tr("Unable to cast input array %1 to the necessary type.").arg(attributeArrayName);
+    filter->setErrorCondition(err, ss);
+  }
+
+  return attributeArray;
+}
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 01370386e5..075b7296fe 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -58,6 +58,7 @@
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class AttributeMatrixProxy;
 class DataContainerProxy;
@@ -322,14 +323,14 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     /**
      * @brief getPrereqArray
      * @param filter An instance of an AbstractFilter that is calling this function. Can be nullptr in which case
-     * no error message will be returned if there is an error.
+     * no error message will be returned if there is an error. Will only check component dims if cDims is not empty.
      * @param attributeArrayName The name of the Attribute Array
      * @param err The error code to set into the filter if there is an error
      * @param cDims The component Dimensions of the Data Array
      * @return A valid IDataArray Subclass if the array exists otherwise a null shared pointer.
      */
-    template <class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArray(Filter* filter, QString attributeArrayName, int err, std::vector<size_t> cDims) const
+    template <class ArrayType>
+    typename ArrayType::Pointer getPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, int err, const std::vector<size_t>& cDims = {}) const
     {
       QString ss;
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -354,16 +355,18 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
         }
         return attributeArray;
       }
-      int NumComp = cDims[0];
-      for(int i = 1; i < cDims.size(); i++)
-      {
-        NumComp *= cDims[i];
-      }
-      // Check to make sure the AttributeArray we have is of the proper type, size and number of components
-      if(false == dataArrayCompatibility<ArrayType, Filter>(attributeArrayName, NumComp, filter) )
+
+      if(!cDims.empty())
       {
-        return attributeArray;
+        size_t numComp = std::accumulate(cDims.cbegin(), cDims.cend(), static_cast<size_t>(1), std::multiplies<size_t>());
+
+        // Check to make sure the AttributeArray we have is of the proper type, size and number of components
+        if(false == dataArrayCompatibility<ArrayType>(attributeArrayName, numComp, filter))
+        {
+          return attributeArray;
+        }
       }
+
       IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
       attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
       if(nullptr == attributeArray.get() && filter)
@@ -381,43 +384,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param err
      * @return
      */
-    template <class ArrayType, class Filter> typename ArrayType::Pointer getPrereqIDataArray(Filter* filter, const QString& attributeArrayName, int err) const
-    {
-      QString ss;
-      typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
-      // Make sure the name is not empty for the AttributeArrayName. This would be detected below
-      // in the call to get either one BUT the reason for the failure would not be evident so we make these explicit checks
-      // here and send back nice error messages to ther user/programmer.
-      if(attributeArrayName.isEmpty())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
-          filter->setErrorCondition(err, ss);
-        }
-      }
-      // Now ask for the actual AttributeArray from the AttributeMatrix
-      if(!doesAttributeArrayExist(attributeArrayName))
-      {
-        if(filter)
-        {
-          ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
-          filter->setErrorCondition(err, ss);
-        }
-        return attributeArray;
-      }
-
-      IDataArrayShPtrType ptr = getAttributeArray(attributeArrayName);
-      if(std::dynamic_pointer_cast<ArrayType>(ptr) != nullptr)
-      {
-        return std::dynamic_pointer_cast<ArrayType>(ptr);
-      }
-
-      ss = QObject::tr("Unable to cast input array %1 to the necessary type.").arg(attributeArrayName);
-      filter->setErrorCondition(err, ss);
-
-      return attributeArray;
-    }
+    IDataArray::Pointer getPrereqIDataArray(AbstractFilter* filter, const QString& attributeArrayName, int err) const;
 
     /**
      * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The condition for this
@@ -429,8 +396,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param dims The dimensions of the components of the AttributeArray
      * @return A Shared Pointer to the newly created array
      */
-    template <class ArrayType, class Filter, typename T>
-    typename ArrayType::Pointer createNonPrereqArray(Filter* filter, const QString& attributeArrayName, T initValue, const std::vector<size_t>& compDims,
+    template <class ArrayType>
+    typename ArrayType::Pointer createNonPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims,
                                                      RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
@@ -448,7 +415,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
       IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
       if (nullptr == iDataArray.get())
       {
-        createAndAddAttributeArray<ArrayType, Filter, T>(filter, attributeArrayName, initValue, compDims);
+        createAndAddAttributeArray<ArrayType>(filter, attributeArrayName, initValue, compDims);
       }
       else if (filter)
       {
@@ -483,8 +450,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     * @param name The name that the array will be known by
     * @param dims The size the data on each tuple
     */
-    template <class ArrayType, class Filter, typename T>
-    void createAndAddAttributeArray(Filter* filter, const QString& name, T initValue, std::vector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+    template <class ArrayType>
+    void createAndAddAttributeArray(AbstractFilter* filter, const QString& name, typename ArrayType::value_type initValue, std::vector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       bool allocateData = false;
       if(nullptr == filter) { allocateData = true; }
@@ -512,7 +479,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      * @param filter
      * @return
      */
-    template<class ArrayType, class AbstractFilter>
+    template<class ArrayType>
     bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter) const
     {
       // Make sure the types are the same
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 83411dfb45..05489f3ae7 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -351,7 +351,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param filter
    * @return
    */
-  template <typename GeometryType, typename Filter> typename GeometryType::Pointer getPrereqGeometry(Filter* filter) const
+  template <typename GeometryType> typename GeometryType::Pointer getPrereqGeometry(AbstractFilter* filter) const
   {
     typename GeometryType::Pointer geom = GeometryType::NullPointer();
     IGeometry::Pointer igeom = getGeometry();
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 696285d6f9..8f14e97a4f 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -517,3 +517,254 @@ QString DataContainerArray::ClassName()
 {
   return QString("DataContainerArray");
 }
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataContainerArray::getPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists)
+{
+  return getPrereqDataContainer(filter, dap.getDataContainerName(), createIfNotExists);
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataContainerArray::getPrereqDataContainer(AbstractFilter* filter, const QString& name, bool createIfNotExists)
+{
+  DataContainerShPtr dc = getDataContainer(name);
+  if(nullptr == dc.get() && !createIfNotExists)
+  {
+    if(filter)
+    {
+      QString ss = "The DataContainer Object with the specific name '" + name + "' was not available.";
+      filter->setErrorCondition(-999, ss);
+    }
+    return dc;
+  }
+
+  if(nullptr != dc && createIfNotExists)
+  {
+    DataContainerShPtr dataContainer = DataContainer::New(name); // Create a new Data Container
+    addOrReplaceDataContainer(dataContainer);                    // Put the new DataContainer into the array
+    return dataContainer;                                        // Return the wrapped pointer
+  }
+  // The DataContainer we asked for was present and NON Null so return that.
+  return dc;
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataContainerArray::createNonPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id)
+{
+  return createNonPrereqDataContainer(filter, dap.getDataContainerName(), id);
+}
+
+// -----------------------------------------------------------------------------
+DataContainerShPtr DataContainerArray::createNonPrereqDataContainer(AbstractFilter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id)
+{
+  if(dataContainerName.isEmpty())
+  {
+    if(filter)
+    {
+      QString ss = QObject::tr("The DataContainer Object must have a name to be created.");
+      filter->setErrorCondition(-887, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  if(dataContainerName.contains('/'))
+  {
+    if(filter)
+    {
+      QString ss = QObject::tr("The DataContainer Object has forward slashes in its name.");
+      filter->setErrorCondition(-888, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  DataContainerShPtr dataContainer = DataContainer::New(dataContainerName);
+  bool dcExists = !push_back(dataContainer);
+  if(dcExists)
+  {
+    if(filter)
+    {
+      QString ss = QObject::tr("The DataContainer Object with the specific name '%1' already exists.").arg(dataContainerName);
+      filter->setErrorCondition(-889, ss);
+      return DataContainer::NullPointer();
+    }
+  }
+
+  RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(dataContainerName, "", ""));
+  return dataContainer;
+}
+
+// -----------------------------------------------------------------------------
+AttributeMatrix::Pointer DataContainerArray::getPrereqAttributeMatrixFromPath(AbstractFilter* filter, const DataArrayPath& path, int err)
+{
+  // First try to get the Parent DataContainer. If an error occurs the error message will have been set
+  // so just return a nullptr shared pointer
+  DataContainerShPtr dc = getPrereqDataContainer(filter, path.getDataContainerName(), false);
+  if(nullptr == dc)
+  {
+    return AttributeMatrix::NullPointer();
+  }
+
+  // Now just return what ever the DataContainer gives us. if the AttributeMatrix was not available then an
+  // error message and code will have been set into the "filter" object if that object was non-null itself.
+  return dc->getPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), err);
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerArray::validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const
+{
+  if(paths.size() <= 1)
+  {
+    return false;
+  }
+  QVector<IDataArrayShPtrType> dataArrays;
+  bool valid = true;
+  QString ss;
+  if(!paths.at(0).isValid() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+             .arg(__LINE__)
+             .arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10000, ss);
+    valid = false;
+    return valid;
+  }
+  IDataArrayShPtrType array0 = getPrereqIDataArrayFromPath(filter, paths.at(0));
+  if(nullptr == array0.get() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10100, ss);
+    valid = false;
+    return valid;
+  }
+
+  dataArrays.push_back(array0);
+  for(int32_t i = 1; i < paths.size(); i++)
+  {
+    if(!paths.at(i).isValid() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+               .arg(__LINE__)
+               .arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10000, ss);
+      valid = false;
+      return valid;
+    }
+    IDataArrayShPtrType nextArray = getPrereqIDataArrayFromPath(filter, paths.at(i));
+    if(nullptr == nextArray.get() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10100, ss);
+      valid = false;
+      return valid;
+    }
+
+    dataArrays.push_back(nextArray);
+  }
+  size_t numTuples = dataArrays[0]->getNumberOfTuples();
+  for(int32_t i = 1; i < dataArrays.size(); i++)
+  {
+    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
+    {
+      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
+               .arg(dataArrays[0]->getName())
+               .arg(dataArrays[0]->getNumberOfTuples())
+               .arg(dataArrays[i]->getName())
+               .arg(dataArrays[i]->getNumberOfTuples());
+      filter->setErrorCondition(-10200, ss);
+      valid = false;
+    }
+  }
+  return valid;
+}
+
+// -----------------------------------------------------------------------------
+bool DataContainerArray::validateNumberOfTuples(AbstractFilter* filter, QVector<IDataArrayShPtrType> dataArrays) const
+{
+  if(dataArrays.size() <= 1)
+  {
+    return false;
+  }
+  bool valid = true;
+  QString ss;
+  for(const auto& dataArray : dataArrays)
+  {
+    if(nullptr == dataArray && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available").arg(__LINE__);
+      filter->setErrorCondition(-10100, ss);
+      valid = false;
+    }
+  }
+  size_t numTuples = dataArrays[0]->getNumberOfTuples();
+  for(int32_t i = 1; i < dataArrays.size(); i++)
+  {
+    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
+    {
+      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
+               .arg(dataArrays[i - 1]->getName())
+               .arg(dataArrays[i - 1]->getNumberOfTuples())
+               .arg(dataArrays[i]->getName())
+               .arg(dataArrays[i]->getNumberOfTuples());
+      filter->setErrorCondition(-10200, ss);
+      valid = false;
+    }
+  }
+  return valid;
+}
+
+// -----------------------------------------------------------------------------
+IDataArray::Pointer DataContainerArray::getPrereqIDataArrayFromPath(AbstractFilter* filter, const DataArrayPath& path) const
+{
+  QString ss;
+  IDataArray::Pointer dataArray = nullptr;
+
+  if(path.isEmpty())
+  {
+    if(filter)
+    {
+      ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
+      filter->setErrorCondition(-90000, ss);
+    }
+    return dataArray;
+  }
+
+  if(!path.isValid())
+  {
+    if(filter)
+    {
+      ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
+      filter->setErrorCondition(-90001, ss);
+    }
+    return dataArray;
+  }
+
+  QString dcName = path.getDataContainerName();
+  QString amName = path.getAttributeMatrixName();
+  QString daName = path.getDataArrayName();
+
+
+  DataContainerShPtr dc = getDataContainer(dcName);
+  if(nullptr == dc.get())
+  {
+    if(filter)
+    {
+      ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
+      filter->setErrorCondition(-999, ss);
+    }
+    return dataArray;
+  }
+
+  AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(amName);
+  if(nullptr == attrMat.get())
+  {
+    if(filter)
+    {
+      ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
+      filter->setErrorCondition(-307020, ss);
+    }
+    return dataArray;
+  }
+
+  dataArray = attrMat->getPrereqIDataArray(filter, daName, -90002); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  return dataArray;
+}
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index f3849beb8b..b46b231b99 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -47,6 +47,7 @@
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class DataContainer;
 using DataContainerShPtr = std::shared_ptr<DataContainer>;
@@ -308,10 +309,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     */
     void renameDataArrayPaths(DataArrayPath::RenameContainer renamePaths);
 
-    template <class Filter> DataContainerShPtr getPrereqDataContainer(Filter* filter, const DataArrayPath& dap, bool createIfNotExists = false)
-    {
-      return getPrereqDataContainer(filter, dap.getDataContainerName(), createIfNotExists);
-    }
+    DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists = false);
 
     /**
      * @brief getPrereqDataContainer
@@ -319,29 +317,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param createIfNotExists
      * @return
      */
-    template<typename Filter>
-    DataContainerShPtr getPrereqDataContainer(Filter* filter, const QString& name, bool createIfNotExists = false)
-    {
-      DataContainerShPtr dc = getDataContainer(name);
-      if(nullptr == dc.get() && !createIfNotExists)
-      {
-        if (filter)
-        {
-          QString ss = "The DataContainer Object with the specific name '" + name + "' was not available.";
-          filter->setErrorCondition(-999, ss);
-        }
-        return dc;
-      }
-
-      if(nullptr != dc && createIfNotExists)
-      {
-        DataContainerShPtr dataContainer = DataContainer::New(name); // Create a new Data Container
-        addOrReplaceDataContainer(dataContainer); // Put the new DataContainer into the array
-        return dataContainer; // Return the wrapped pointer
-      }
-      // The DataContainer we asked for was present and NON Null so return that.
-      return dc;
-    }
+    DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const QString& name, bool createIfNotExists = false);
 
     /**
      * @brief createNonPrereqDataContainer
@@ -350,10 +326,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param id
      * @return
      */
-    template <class Filter> DataContainerShPtr createNonPrereqDataContainer(Filter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
-    {
-      return createNonPrereqDataContainer<Filter>(filter, dap.getDataContainerName(), id);
-    }
+    DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 
     /**
      * @brief This function will create a new DataContainer of type <T>
@@ -361,45 +334,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @return Valid DataContainer Object UNLESS the DataContainer with the given name already exists or the
      * dataContainerName is empty in which case a Null DataContainer will be returned.
      */
-    template<typename Filter>
-    DataContainerShPtr createNonPrereqDataContainer(Filter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
-    {
-      if(dataContainerName.isEmpty())
-      {
-        if (filter)
-        {
-          QString ss = QObject::tr("The DataContainer Object must have a name to be created.");
-          filter->setErrorCondition(-887, ss);
-          return DataContainer::NullPointer();
-        }
-      }
-
-      if (dataContainerName.contains('/'))
-      {
-        if (filter)
-        {
-          QString ss = QObject::tr("The DataContainer Object has forward slashes in its name.");
-          filter->setErrorCondition(-888, ss);
-          return DataContainer::NullPointer();
-        }
-      }
-
-      
-      DataContainerShPtr dataContainer = DataContainer::New(dataContainerName);
-      bool dcExists = !push_back(dataContainer);
-      if(dcExists)
-      {
-        if(filter)
-        {
-          QString ss = QObject::tr("The DataContainer Object with the specific name '%1' already exists.").arg(dataContainerName);
-          filter->setErrorCondition(-889, ss);
-          return DataContainer::NullPointer();
-        }
-      }
-
-      RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(dataContainerName, "", ""));
-      return dataContainer;
-    }
+    DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
 
 
     /**
@@ -409,11 +344,11 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param dcName
      * @return
      */
-    template<typename GeometryType, typename Filter>
-    typename GeometryType::Pointer getPrereqGeometryFromDataContainer(Filter* filter, const QString& dcName)
+    template<typename GeometryType>
+    typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const QString& dcName)
     {
       typename GeometryType::Pointer geom = GeometryType::NullPointer();
-      DataContainerShPtr dc = getPrereqDataContainer<Filter>(filter, dcName, false);
+      DataContainerShPtr dc = getPrereqDataContainer(filter, dcName, false);
       if(nullptr == dc) { return geom; }
 
       return dc->getPrereqGeometry<GeometryType>(filter);
@@ -426,10 +361,11 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param path
      * @return
      */
-    template <typename GeometryType, typename Filter> typename GeometryType::Pointer getPrereqGeometryFromDataContainer(Filter* filter, const DataArrayPath& path)
+    template <typename GeometryType>
+    typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const DataArrayPath& path)
     {
       typename GeometryType::Pointer geom = GeometryType::NullPointer();
-      DataContainerShPtr dc = getPrereqDataContainer<Filter>(filter, path.getDataContainerName(), false);
+      DataContainerShPtr dc = getPrereqDataContainer(filter, path.getDataContainerName(), false);
       if(nullptr == dc)
       {
         return geom;
@@ -446,18 +382,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param err The error code to display to the user
      * @return
      */
-    template<typename Filter>
-    AttributeMatrix::Pointer getPrereqAttributeMatrixFromPath(Filter* filter, const DataArrayPath& path, int err)
-    {
-      // First try to get the Parent DataContainer. If an error occurs the error message will have been set
-      // so just return a nullptr shared pointer
-      DataContainerShPtr dc = getPrereqDataContainer<Filter>(filter, path.getDataContainerName(), false);
-      if(nullptr == dc) { return AttributeMatrix::NullPointer(); }
-
-      // Now just return what ever the DataContainer gives us. if the AttributeMatrix was not available then an
-      // error message and code will have been set into the "filter" object if that object was non-null itself.
-      return dc->getPrereqAttributeMatrix(filter, path.getAttributeMatrixName(), err);
-    }
+    AttributeMatrix::Pointer getPrereqAttributeMatrixFromPath(AbstractFilter* filter, const DataArrayPath& path, int err);
 
     /**
      * @brief getPrereqArrayFromPath
@@ -466,10 +391,9 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param cDims The component dimensions of the IDataArray subclass
      * @return Valid or nullptr shared pointer based on availability of the array
      */
-    template <class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, std::vector<size_t> cDims) const
+    template <class ArrayType>
+    typename ArrayType::Pointer getPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, const std::vector<size_t>& cDims = {}) const
     {
-
       QString ss;
       typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
 
@@ -520,7 +444,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
         return dataArray;
       }
 
-      dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+      dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
       return dataArray;
     }
 
@@ -530,63 +454,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     * @param path
     * @return
     */
-    template<class ArrayType, class Filter>
-    typename ArrayType::Pointer getPrereqIDataArrayFromPath(Filter* filter, const DataArrayPath& path) const
-    {
-
-      QString ss;
-      typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
-
-      if(path.isEmpty())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
-          filter->setErrorCondition(-90000, ss);
-        }
-        return dataArray;
-      }
-
-      if(!path.isValid())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
-          filter->setErrorCondition(-90001, ss);
-        }
-        return dataArray;
-      }
-
-      QString dcName = path.getDataContainerName();
-      QString amName = path.getAttributeMatrixName();
-      QString daName = path.getDataArrayName();
-
-
-      DataContainerShPtr dc = getDataContainer(dcName);
-      if(nullptr == dc.get())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
-          filter->setErrorCondition(-999, ss);
-        }
-        return dataArray;
-      }
-
-      AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(amName);
-      if(nullptr == attrMat.get())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
-          filter->setErrorCondition(-307020, ss);
-        }
-        return dataArray;
-      }
-
-      dataArray = attrMat->getPrereqIDataArray<ArrayType, Filter>(filter, daName, -90002); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-      return dataArray;
-    }
+    IDataArray::Pointer getPrereqIDataArrayFromPath(AbstractFilter* filter, const DataArrayPath& path) const;
 
     /**
      * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The conditions for this
@@ -599,8 +467,8 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param dims The dimensions of the components of the AttributeArray
      * @return A Shared Pointer to the newly created array
      */
-    template <class ArrayType, class Filter, typename T>
-    typename ArrayType::Pointer createNonPrereqArrayFromPath(Filter* filter, const DataArrayPath& path, T initValue, const std::vector<size_t>& compDims, const QString& property = "",
+    template <class ArrayType>
+    typename ArrayType::Pointer createNonPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims, const QString& property = "",
                                                              RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
     {
       typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
@@ -679,7 +547,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 
       // If something goes wrong at this point the error message will be directly set in the 'filter' object so we just
       // simply return what ever is given to us.
-      dataArray = attrMat->createNonPrereqArray<ArrayType, Filter, T>(filter, path.getDataArrayName(), initValue, compDims, id);
+      dataArray = attrMat->createNonPrereqArray<ArrayType>(filter, path.getDataArrayName(), initValue, compDims, id);
       return dataArray;
     }
 
@@ -692,63 +560,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param paths The paths that should be checked
      * @return bool Validation check
      */
-    template<typename Filter>
-    bool validateNumberOfTuples(Filter* filter, const QVector<DataArrayPath>& paths) const
-    {
-      if (paths.size() <= 1) { return false; }
-      QVector<IDataArrayShPtrType> dataArrays;
-      bool valid = true;
-      QString ss;
-      if (!paths.at(0).isValid() && nullptr != filter)
-      {
-        ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
-        filter->setErrorCondition(-10000, ss);
-        valid = false;
-        return valid;
-      }
-      IDataArrayShPtrType array0 = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(0));
-      if (nullptr == array0.get() && nullptr != filter)
-      {
-        ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
-        filter->setErrorCondition(-10100, ss);
-        valid = false;
-        return valid;
-      }
-
-      dataArrays.push_back(array0);
-      for (int32_t i = 1; i < paths.size(); i++)
-      {
-        if (!paths.at(i).isValid() && nullptr != filter)
-        {
-          ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
-          filter->setErrorCondition(-10000, ss);
-          valid = false;
-          return valid;
-        }
-        IDataArrayShPtrType nextArray = getPrereqIDataArrayFromPath<IDataArray, Filter>(filter, paths.at(i));
-        if (nullptr == nextArray.get() && nullptr != filter)
-        {
-          ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
-          filter->setErrorCondition(-10100, ss);
-          valid = false;
-          return valid;
-        }
-
-        dataArrays.push_back(nextArray);
-      }
-      size_t numTuples = dataArrays[0]->getNumberOfTuples();
-      for (int32_t i = 1; i < dataArrays.size(); i++)
-      {
-        if (numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
-        {
-          ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
-               .arg(dataArrays[0]->getName()).arg(dataArrays[0]->getNumberOfTuples()).arg(dataArrays[i]->getName()).arg(dataArrays[i]->getNumberOfTuples());
-          filter->setErrorCondition(-10200, ss);
-          valid = false;
-        }
-      }
-      return valid;
-    }
+    bool validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const;
 
     /**
      * @brief validateNumberOfTuples This method will validate that all of the DataArray
@@ -759,34 +571,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
      * @param paths The paths that should be checked
      * @return bool Validation check
      */
-    template <typename Filter>
-    bool validateNumberOfTuples(Filter* filter, QVector<IDataArrayShPtrType> dataArrays) const
-    {
-      if (dataArrays.size() <= 1) { return false; }
-      bool valid = true;
-      QString ss;
-      for (const auto & dataArray : dataArrays)
-      {
-        if (nullptr == dataArray && nullptr != filter)
-        {
-          ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available").arg(__LINE__);
-          filter->setErrorCondition(-10100, ss);
-          valid = false;
-        }
-      }
-      size_t numTuples = dataArrays[0]->getNumberOfTuples();
-      for (int32_t i = 1; i < dataArrays.size(); i++)
-      {
-        if (numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
-        {
-          ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
-               .arg(dataArrays[i - 1]->getName()).arg(dataArrays[i - 1]->getNumberOfTuples()).arg(dataArrays[i]->getName()).arg(dataArrays[i]->getNumberOfTuples());
-          filter->setErrorCondition(-10200, ss);
-          valid = false;
-        }
-      }
-      return valid;
-    }
+    bool validateNumberOfTuples(AbstractFilter* filter, QVector<IDataArrayShPtrType> dataArrays) const;
 
     /**
      * @brief deepCopy
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
index c3c47ed290..cc747f51a5 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
@@ -151,7 +151,7 @@ bool DataStructureUtilities::validateNumberOfTuples(const DataContainerArrayShPt
     valid = false;
     return valid;
   }
-  IDataArray::Pointer array0 = getPrereqIDataArrayFromPath<IDataArray>(filter, paths.at(0));
+  IDataArray::Pointer array0 = getPrereqIDataArrayFromPath(filter, paths.at(0));
   if(nullptr == array0.get() && nullptr != filter)
   {
     ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
@@ -172,7 +172,7 @@ bool DataStructureUtilities::validateNumberOfTuples(const DataContainerArrayShPt
       valid = false;
       return valid;
     }
-    IDataArray::Pointer nextArray = getPrereqIDataArrayFromPath<IDataArray>(filter, paths.at(i));
+    IDataArray::Pointer nextArray = getPrereqIDataArrayFromPath(filter, paths.at(i));
     if(nullptr == nextArray.get() && nullptr != filter)
     {
       ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 50836daf48..745044dc14 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -43,6 +43,7 @@
 
 #include "SIMPLib/Common/Constants.h"
 
+#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
 
@@ -153,7 +154,7 @@ int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline,
     }
     else
     {
-      AbstractFilter::Pointer badFilter = AbstractFilter::New();
+      AbstractFilter::Pointer badFilter = BadFilter::New();
       openFilterGroup(badFilter.get(), i + offset);
       m_CurrentFilterIndex["Unknown Filter"] = "ERROR: Filter instance was nullptr within the SVPipelineFilterWidget instance. Report this error to the DREAM3D Developers";
       closeFilterGroup();
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index 06e81d41f2..fe4256e69b 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -85,18 +85,6 @@ void AbstractDecisionFilter::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void AbstractDecisionFilter::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index 76a894252b..aa9d36990a 100755
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -129,34 +129,8 @@ class AbstractDecisionFilter : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
 
 signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
-
   void decisionMade(bool& dm);
   void targetValue(int& value);
 
@@ -165,7 +139,7 @@ class AbstractDecisionFilter : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 9b3bf2410e..d825fde299 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -142,21 +142,17 @@ void AbstractFilter::setupFilterParameters()
 {
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void AbstractFilter::execute()
-{
-  setErrorCondition(-3015, "QAbstractFilter does not implement an execute method. Please use a subclass instead.");
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void AbstractFilter::preflight()
 {
   setInPreflight(true);
-  setErrorCondition(-3016, "AbstractFilter does not implement a preflight method. Please use a subclass instead.");
+  emit preflightAboutToExecute();
+  emit updateFilterParameters(this);
+  dataCheck();
+  emit preflightExecuted();
+  setInPreflight(false);
 }
 
 // -----------------------------------------------------------------------------
@@ -495,27 +491,7 @@ QString AbstractFilter::getFilterVersion() const
 // -----------------------------------------------------------------------------
 QUuid AbstractFilter::getUuid() const
 {
-  if(m_Uuid.isNull())
-  {
-    // We cannot actually set the internal m_Uuid because the method is marked const.
-    //    uint l = 100;
-    //    ushort w1 = 200;
-    //    ushort w2 = 300;
-
-    //    QString libName = getCompiledLibraryName();
-    //    uchar b[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-    //    int32_t i = 0;
-    //    while(i < 8 && i < libName.size())
-    //    {
-    //      b[i] = static_cast<uint8_t>(libName.at(i).toLatin1());
-    //      i++;
-    //    }
-    //    QUuid uuid = QUuid(l, w1, w2, b[0], b[1], b[2], b[3], b[4], b[5], b[6], b[7]);
-    //    QString nameSpace = QString("%1 %2").arg(getNameOfClass()).arg(getHumanLabel());
-    //    QUuid p1 = QUuid::createUuidV5(uuid, nameSpace);
-    //    m_Uuid = p1;
-  }
-  return m_Uuid;
+  return QUuid();
 }
 
 // -----------------------------------------------------------------------------
@@ -683,13 +659,6 @@ QString AbstractFilter::ClassName()
   return QString("AbstractFilter");
 }
 
-// -----------------------------------------------------------------------------
-AbstractFilter::Pointer AbstractFilter::New()
-{
-  Pointer sharedPtr(new(AbstractFilter));
-  return sharedPtr;
-}
-
 // -----------------------------------------------------------------------------
 void AbstractFilter::setDataContainerArray(const DataContainerArray::Pointer& value)
 {
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 93e823033f..741183c28a 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -83,7 +83,6 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
 #ifdef SIMPL_ENABLE_PYTHON
   PYB11_CREATE_BINDINGS(AbstractFilter)
   PYB11_SHARED_POINTERS(AbstractFilter)
-  PYB11_STATIC_NEW_MACRO(AbstractFilter)
   PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)  
   PYB11_PROPERTY(QString GroupName READ getGroupName)
   PYB11_PROPERTY(QString SubGroupName READ getSubGroupName)
@@ -129,8 +128,6 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   static QString ClassName();
 
-  static Pointer New();
-
   ~AbstractFilter() override;
 
   /**
@@ -235,7 +232,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   /**
    * @brief execute Implements the main functionality of the filter
    */
-  virtual void execute();
+  virtual void execute() = 0;
 
   /**
    * @brief preflight Communicates with the GUI to request user settings for the filter and
@@ -501,6 +498,28 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   */
   void dataArrayPathUpdated(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
+  /**
+   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
+   * be pushed from a user-facing control (such as a widget)
+   * @param filter Filter instance pointer
+   */
+  void updateFilterParameters(AbstractFilter* filter);
+
+  /**
+   * @brief parametersChanged Emitted when any Filter parameter is changed internally
+   */
+  void parametersChanged();
+
+  /**
+   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
+   */
+  void preflightAboutToExecute();
+
+  /**
+   * @brief preflightExecuted Emitted just after calling dataCheck()
+   */
+  void preflightExecuted();
+
 public slots:
 
   /**
@@ -531,6 +550,11 @@ public slots:
 protected:
   AbstractFilter();
 
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  virtual void dataCheck() = 0;
+
   /**
    * @brief Checks if the path matches the one saved with the specified ID.  Index 0 is used for
    * non-renamable DataArrayPaths, and any DataID 0 value will bypass the check and return false.
@@ -565,7 +589,6 @@ protected slots:
   AbstractFilter::WeakPointer m_NextFilter = {};
 
   bool m_Cancel;
-  QUuid m_Uuid;
   int m_ErrorCode = 0;
   int m_WarningCode = 0;
 
diff --git a/Source/SIMPLib/Filtering/BadFilter.cpp b/Source/SIMPLib/Filtering/BadFilter.cpp
new file mode 100644
index 0000000000..9465148e70
--- /dev/null
+++ b/Source/SIMPLib/Filtering/BadFilter.cpp
@@ -0,0 +1,165 @@
+/* ============================================================================
+ * Copyright (c) 2020 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "BadFilter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+BadFilter::BadFilter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+BadFilter::~BadFilter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void BadFilter::setupFilterParameters()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void BadFilter::dataCheck()
+{
+  setErrorCondition(-3016, "BadFilter is not meant to be run.");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void BadFilter::execute()
+{
+  setErrorCondition(-3016, "BadFilter is not meant to be run.");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer BadFilter::newFilterInstance(bool copyFilterParameters) const
+{
+  BadFilter::Pointer filter = BadFilter::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getCompiledLibraryName() const
+{
+  return "";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getBrandingString() const
+{
+  return "";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getFilterVersion() const
+{
+  return "0.0.0";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getGroupName() const
+{
+  return "";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QUuid BadFilter::getUuid() const
+{
+  return QUuid();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getSubGroupName() const
+{
+  return "";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString BadFilter::getHumanLabel() const
+{
+  return "";
+}
+
+// -----------------------------------------------------------------------------
+BadFilter::Pointer BadFilter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<BadFilter> BadFilter::New()
+{
+  struct make_shared_enabler : public BadFilter
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString BadFilter::getNameOfClass() const
+{
+  return QString("BadFilter");
+}
+
+// -----------------------------------------------------------------------------
+QString BadFilter::ClassName()
+{
+  return QString("BadFilter");
+}
diff --git a/Source/SIMPLib/Filtering/BadFilter.h b/Source/SIMPLib/Filtering/BadFilter.h
new file mode 100644
index 0000000000..27e7c86a7b
--- /dev/null
+++ b/Source/SIMPLib/Filtering/BadFilter.h
@@ -0,0 +1,146 @@
+/* ============================================================================
+ * Copyright (c) 2020 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+/**
+ * @brief The BadFilter class. See [Filter documentation](@ref BadFilter) for details.
+ */
+class SIMPLib_EXPORT BadFilter : public AbstractFilter
+{
+  Q_OBJECT
+
+public:
+  using Self = BadFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+
+  ~BadFilter() override;
+
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PipelineAnnotation
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PipelineAnnotation
+   */
+  static QString ClassName();
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  BadFilter();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+public:
+  BadFilter(const BadFilter&) = delete;            // Copy Constructor Not Implemented
+  BadFilter(BadFilter&&) = delete;                 // Move Constructor Not Implemented
+  BadFilter& operator=(const BadFilter&) = delete; // Copy Assignment Not Implemented
+  BadFilter& operator=(BadFilter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 4f93a14db1..aceaf08ad6 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -52,6 +52,7 @@
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/CoreFilters/EmptyFilter.h"
@@ -171,7 +172,7 @@ QJsonObject FilterPipeline::toJson()
     }
     else
     {
-      AbstractFilter::Pointer badFilter = AbstractFilter::New();
+      AbstractFilter::Pointer badFilter = BadFilter::New();
 
       QJsonObject badFilterJson = badFilter->toJson();
       badFilterJson["Unknown Filter"] = "ERROR: Filter instance was nullptr within the FilterPipeline instance. Report this error to the DREAM3D Developers";
diff --git a/Source/SIMPLib/Filtering/SourceList.cmake b/Source/SIMPLib/Filtering/SourceList.cmake
index fef8ac33fb..3527261e6a 100755
--- a/Source/SIMPLib/Filtering/SourceList.cmake
+++ b/Source/SIMPLib/Filtering/SourceList.cmake
@@ -6,6 +6,7 @@ set(SUBDIR_NAME Filtering)
 set(SIMPLib_${SUBDIR_NAME}_Moc_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractDecisionFilter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractFilter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/BadFilter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonInputs.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonInputsAdvanced.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterPipeline.h
@@ -35,6 +36,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractComparison.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractDecisionFilter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractFilter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/BadFilter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonInputs.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonInputsAdvanced.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonSet.cpp
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 7f34e2f3b0..297aab4cc1 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -344,10 +344,10 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 // which is saved in the filter's data container array.
 #define Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, isTypeOUT, typeOUTTypename)                                                                                         \
   {                                                                                                                                                                                                    \
-    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, path);                                                                            \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);                                                                            \
     if(nullptr != ptr)                                                                                                                                                                                 \
     {                                                                                                                                                                                                  \
-      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, path.getDataContainerName());                                    \
+      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, path.getDataContainerName());                                    \
       if(nullptr != imageGeometry)                                                                                                                                                                     \
       {                                                                                                                                                                                                \
         std::vector<size_t> tDims = imageGeometry->getDimensions().toContainer<std::vector<size_t>>();                                                                                                     \
@@ -447,10 +447,10 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 //
 #define Dream3DArrayOutputComponentFromDataMacro(call, input2_path, input1_path, errorCondition)                                                                                                       \
   {                                                                                                                                                                                                    \
-    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(this, input2_path);                                                                     \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, input2_path);                                                                     \
     if(ptr.get() != nullptr)                                                                                                                                                                           \
     {                                                                                                                                                                                                  \
-      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom, AbstractFilter>(this, input2_path.getDataContainerName());                             \
+      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, input2_path.getDataContainerName());                             \
       if(imageGeometry.get() != nullptr)                                                                                                                                                               \
       {                                                                                                                                                                                                \
         std::vector<size_t> tDims(3, 0);                                                                                                                                                               \
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 34623c89f4..691207facf 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -270,5 +270,5 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImageOutputInformation(const DataArrayPat
     return;
   }
 
-  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<ValueType>, AbstractFilter, ValueType>(this, dataArrayPath, 0, cDims);
+  getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<ValueType>>(this, dataArrayPath, 0, cDims);
 }
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index a4b9edd8a4..ef11c335e3 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -33,9 +33,6 @@
 /* define to 1 if we are enabling NTFS file checking */
 #cmakedefine SIMPL_NTFS_FILE_CHECK @SIMPL_NTFS_FILE_CHECK@
 
-/* define if Python wrapping is enabled through Pybind11 */
-#cmakedefine SIMPL_ENABLE_PYTHON
-
 /* define to 1 if we are checking relative paths */
 #cmakedefine SIMPL_RELATIVE_PATH_CHECK @SIMPL_RELATIVE_PATH_CHECK@
 
@@ -77,9 +74,7 @@
 /* Include the DLL export preprocessor defines */
 #include "SIMPLib/Common/SIMPLibDLLExport.h"
 
-#ifdef SIMPL_ENABLE_PYTHON
 #include "SIMPLib/Common/SIMPLPythonMacros.h"
-#endif
 
 /* We are going to disable some warnings just to get a grip on all the warnings that get produced
 * during an MSVC build */
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index 6b28128093..a2e82ed67d 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -161,19 +161,13 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   */
   void preflight() override;
 
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
-
 protected:
   ArraySelectionExample();
 
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index a224931fb5..9210bbb115 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -165,18 +165,6 @@ void DynamicTableExample::dataCheck()
   // This filter does nothing during the dataCheck!
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DynamicTableExample::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index 75132073a4..f55ec6a71d 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -199,17 +199,6 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   DynamicTableExample();
@@ -217,7 +206,7 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 20627a23ad..4757aa3c24 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -105,19 +105,6 @@ void ErrorWarningFilter::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ErrorWarningFilter::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
index 51b97c6ce4..e23273d86b 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
@@ -205,33 +205,6 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   ErrorWarningFilter();
@@ -239,7 +212,7 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index e5059e205b..727280b760 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -76,15 +76,6 @@ void Filt0::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt0::preflight()
-{
-
-  dataCheck();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index 85ab8e75c2..af36031cbd 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -132,17 +132,6 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   Filt0();
@@ -150,7 +139,7 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index e205f6df87..fc27b8479c 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -76,15 +76,6 @@ void Filt1::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void Filt1::preflight()
-{
-
-  dataCheck();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index 07c43c75cf..5146223ccd 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -123,17 +123,6 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   Filt1();
@@ -141,7 +130,7 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index 7ba34a1e16..d432725561 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -80,19 +80,6 @@ void FilterGroup00::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup00::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.h b/Source/SIMPLib/TestFilters/FilterGroup00.h
index 6fdb4d2f8b..cbb81bcbd4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.h
@@ -128,33 +128,6 @@ class FilterGroup00 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup00();
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index 6ff1ef4612..d3bdd7d4e5 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -80,19 +80,6 @@ void FilterGroup01::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup01::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.h b/Source/SIMPLib/TestFilters/FilterGroup01.h
index d414ef9c7f..47f8d5fac6 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.h
@@ -128,33 +128,6 @@ class FilterGroup01 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup01();
@@ -162,7 +135,7 @@ class FilterGroup01 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index 84f739e3fa..42bb2e3a64 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -80,19 +80,6 @@ void FilterGroup02::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup02::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.h b/Source/SIMPLib/TestFilters/FilterGroup02.h
index 020f06f48d..2ce8d9ccf2 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.h
@@ -128,33 +128,6 @@ class FilterGroup02 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup02();
@@ -162,7 +135,7 @@ class FilterGroup02 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index 01533610a4..f7fa0b30aa 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -80,19 +80,6 @@ void FilterGroup03::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup03::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.h b/Source/SIMPLib/TestFilters/FilterGroup03.h
index bb8e906f29..cd4b6d3dd4 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.h
@@ -128,33 +128,6 @@ class FilterGroup03 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup03();
@@ -162,7 +135,7 @@ class FilterGroup03 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index b46ab500c8..4508248550 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -80,19 +80,6 @@ void FilterGroup04::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup04::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.h b/Source/SIMPLib/TestFilters/FilterGroup04.h
index 2533a69f21..6991047479 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.h
@@ -128,33 +128,6 @@ class FilterGroup04 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup04();
@@ -162,7 +135,7 @@ class FilterGroup04 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index 4f934bbd55..dace241b6f 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -80,19 +80,6 @@ void FilterGroup05::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup05::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.h b/Source/SIMPLib/TestFilters/FilterGroup05.h
index 8a31edb885..f61b288da9 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.h
@@ -128,33 +128,6 @@ class FilterGroup05 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup05();
@@ -162,7 +135,7 @@ class FilterGroup05 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index 474c012af1..928a2e275c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -80,19 +80,6 @@ void FilterGroup06::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup06::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.h b/Source/SIMPLib/TestFilters/FilterGroup06.h
index e2762efb58..bed793cb94 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.h
@@ -128,33 +128,6 @@ class FilterGroup06 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup06();
@@ -162,7 +135,7 @@ class FilterGroup06 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index a281d8f899..c5c7c45b23 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -80,19 +80,6 @@ void FilterGroup07::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup07::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.h b/Source/SIMPLib/TestFilters/FilterGroup07.h
index ebab0baae4..1dbbf27aca 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.h
@@ -128,33 +128,6 @@ class FilterGroup07 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup07();
@@ -162,7 +135,7 @@ class FilterGroup07 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index 731d6c823c..fd7c9a0883 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -80,19 +80,6 @@ void FilterGroup08::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup08::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.h b/Source/SIMPLib/TestFilters/FilterGroup08.h
index ddd8539818..17a389cd1d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.h
@@ -128,33 +128,6 @@ class FilterGroup08 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup08();
@@ -162,7 +135,7 @@ class FilterGroup08 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index c4d2e79fb4..1185a7da56 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -80,19 +80,6 @@ void FilterGroup09::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup09::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.h b/Source/SIMPLib/TestFilters/FilterGroup09.h
index e7eb755469..2bf2bd6c23 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.h
@@ -128,33 +128,6 @@ class FilterGroup09 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup09();
@@ -162,7 +135,7 @@ class FilterGroup09 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index c1bd05144d..625bd89b94 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -80,19 +80,6 @@ void FilterGroup10::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup10::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.h b/Source/SIMPLib/TestFilters/FilterGroup10.h
index 1720f83bfa..d4ea7e7507 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.h
@@ -128,33 +128,6 @@ class FilterGroup10 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup10();
@@ -162,7 +135,7 @@ class FilterGroup10 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index b2db2bd990..3d19957a4c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -80,19 +80,6 @@ void FilterGroup12::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup12::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.h b/Source/SIMPLib/TestFilters/FilterGroup12.h
index 23e2f34fa7..3f361b496d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.h
@@ -128,33 +128,6 @@ class FilterGroup12 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup12();
@@ -162,7 +135,7 @@ class FilterGroup12 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index 30060fffc7..33b1fb1dcd 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -80,19 +80,6 @@ void FilterGroup13::dataCheck()
   clearWarningCode();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterGroup13::preflight()
-{
-  // These are the REQUIRED lines of CODE to make sure the filter behaves correctly
-  setInPreflight(true);              // Set the fact that we are preflighting.
-  emit preflightAboutToExecute();    // Emit this signal so that other widgets can do one file update
-  emit updateFilterParameters(this); // Emit this signal to have the widgets push their values down to the filter
-  dataCheck();                       // Run our DataCheck to make sure everthing is setup correctly
-  emit preflightExecuted();          // We are done preflighting this filter
-  setInPreflight(false);             // Inform the system this filter is NOT in preflight mode anymore.
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.h b/Source/SIMPLib/TestFilters/FilterGroup13.h
index bace09a8c4..9068e4ce8b 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.h
@@ -128,33 +128,6 @@ class FilterGroup13 : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief preflight Reimplemented from @see AbstractFilter class
-  */
-  void preflight() override;
-
-signals:
-  /**
-   * @brief updateFilterParameters Emitted when the Filter requests all the latest Filter parameters
-   * be pushed from a user-facing control (such as a widget)
-   * @param filter Filter instance pointer
-   */
-  void updateFilterParameters(AbstractFilter* filter);
-
-  /**
-   * @brief parametersChanged Emitted when any Filter parameter is changed internally
-   */
-  void parametersChanged();
-
-  /**
-   * @brief preflightAboutToExecute Emitted just before calling dataCheck()
-   */
-  void preflightAboutToExecute();
-
-  /**
-   * @brief preflightExecuted Emitted just after calling dataCheck()
-   */
-  void preflightExecuted();
 
 protected:
   FilterGroup13();
@@ -162,7 +135,7 @@ class FilterGroup13 : public AbstractFilter
   /**
   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
   */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
   * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index a7225372e3..a9534dbd12 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -390,18 +390,6 @@ void GenericExample::dataCheck()
 
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenericExample::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 2331fc4219..810b563f33 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -744,17 +744,6 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   GenericExample();
@@ -762,7 +751,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index ac312d52cc..89ce6a763e 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -111,7 +111,7 @@ void MakeDataContainer::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-  DataContainer::Pointer m = getDataContainerArray()->createNonPrereqDataContainer<AbstractFilter>(this, getDataContainerName(), DataContainerID);
+  DataContainer::Pointer m = getDataContainerArray()->createNonPrereqDataContainer(this, getDataContainerName(), DataContainerID);
   if(getErrorCode() < 0)
   {
     return;
@@ -132,7 +132,7 @@ void MakeDataContainer::dataCheck()
 
   std::vector<size_t> dims(1, 1);
   m_FeatureIdsPtr =
-      cellAttrMat->createNonPrereqArray<DataArray<int32_t>, AbstractFilter, int32_t>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+      cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
   if(nullptr != m_FeatureIdsPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -159,18 +159,6 @@ void MakeDataContainer::dataCheck()
   m->setGeometry(vertices);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MakeDataContainer::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index 7c98771609..73cc4f0c56 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -250,17 +250,6 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   MakeDataContainer();
@@ -268,7 +257,7 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  void dataCheck();
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index 479e54433e..e1ded700dc 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -165,18 +165,6 @@ void ThresholdExample::dataCheck()
   */
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void ThresholdExample::preflight()
-{
-  setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
-  dataCheck();
-  emit preflightExecuted();
-  setInPreflight(false);
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index 8137304764..eeebce0b73 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -172,17 +172,6 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
    */
   void execute() override;
 
-  /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
-  void preflight() override;
-
-signals:
-  void updateFilterParameters(AbstractFilter* filter);
-  void parametersChanged();
-  void preflightAboutToExecute();
-  void preflightExecuted();
 
 protected:
   ThresholdExample();
@@ -190,7 +179,7 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  virtual void dataCheck();
+  virtual void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 981a0c833d..11ae033170 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -108,13 +108,13 @@ QPixmap AbstractIOFileWidget::getIcon()
 void AbstractIOFileWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &AbstractIOFileWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &AbstractIOFileWidget::afterPreflight);
 
   // Catch when the filter wants its m_LineEdits updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &AbstractIOFileWidget::filterNeedsInputParameters);
 
   QtSFileCompleter* com = new QtSFileCompleter(this, false);
   m_LineEdit->setCompleter(com);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index d3ecc52d1a..26de071419 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -112,13 +112,13 @@ void AttributeMatrixCreationWidget::setupGui()
   m_SelectedDataContainerPath->setFilter(getFilter());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &AttributeMatrixCreationWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &AttributeMatrixCreationWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &AttributeMatrixCreationWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index b5f1f9f7cc..d1ce4228e0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -96,10 +96,10 @@ void AttributeMatrixSelectionWidget::setupGui()
   label->setText(getFilterParameter()->getHumanLabel());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &AttributeMatrixSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &AttributeMatrixSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
   connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index cc1b5f92c2..cc56854106 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -68,13 +68,13 @@ void AxisAngleWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &AxisAngleWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &AxisAngleWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &AxisAngleWidget::filterNeedsInputParameters);
 
   connect(angle, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
   connect(h, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index 725e3b3f25..5dc66480c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -65,13 +65,13 @@ void BooleanWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &BooleanWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &BooleanWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &BooleanWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(stateChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index ef914e0bb7..9eb04198db 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -86,13 +86,13 @@ void CalculatorWidget::setupGui()
   blockSignals(false);
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &CalculatorWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &CalculatorWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &CalculatorWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index 3f160dd186..c65e209f1b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -68,13 +68,13 @@ void ChoiceWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ChoiceWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ChoiceWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ChoiceWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 9e04c31aa5..6b28dbad8b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -114,13 +114,13 @@ void ComparisonSelectionAdvancedWidget::setupGui()
   m_SelectedAttributeMatrixPath->setFilter(getFilter());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ComparisonSelectionAdvancedWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ComparisonSelectionAdvancedWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ComparisonSelectionAdvancedWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 36431314b0..5417582891 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -119,13 +119,13 @@ void ComparisonSelectionWidget::setupGui()
   m_SelectedAttributeMatrixPath->setFilter(getFilter());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ComparisonSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ComparisonSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ComparisonSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index 6f8b311552..fa982dce55 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -66,16 +66,13 @@ ConstrainedDoubleWidget::~ConstrainedDoubleWidget() = default;
 void ConstrainedDoubleWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()),
-          this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ConstrainedDoubleWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()),
-          this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ConstrainedDoubleWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)),
-          this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ConstrainedDoubleWidget::filterNeedsInputParameters);
 
   connect(spinBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
           this, &ConstrainedDoubleWidget::widgetChanged);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index a297a08868..c1b8f87896 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -66,16 +66,13 @@ ConstrainedIntWidget::~ConstrainedIntWidget() = default;
 void ConstrainedIntWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()),
-          this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ConstrainedIntWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()),
-          this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ConstrainedIntWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)),
-          this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ConstrainedIntWidget::filterNeedsInputParameters);
 
   connect(spinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
           this, &ConstrainedIntWidget::widgetChanged);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 201bb24478..2c0ab745e1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -111,13 +111,13 @@ void DataArrayCreationWidget::setupGui()
   m_SelectedAttributeMatrixPath->setFilter(getFilter());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataArrayCreationWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataArrayCreationWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataArrayCreationWidget::filterNeedsInputParameters);
 
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index f01473da46..0e9ae0f3ea 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -113,13 +113,13 @@ void DataArraySelectionWidget::setupGui()
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataArraySelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataArraySelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataArraySelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index fdecf6f83f..271f241169 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -102,11 +102,11 @@ FilterParameter* DataContainerArrayProxyWidget::getFilterParameter() const
 void DataContainerArrayProxyWidget::setupGui()
 {
 
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataContainerArrayProxyWidget::beforePreflight);
 
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataContainerArrayProxyWidget::afterPreflight);
 
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerArrayProxyWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index fe32ab0b52..f829176ea1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -85,13 +85,13 @@ void DataContainerCreationWidget::setupGui()
   stringEdit->setValidator(new QRegularExpressionValidator(QRegularExpression("[^/]*"), this));
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataContainerCreationWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataContainerCreationWidget::afterPreflight);
 
   // Catch when the filter wants its dataContainerNames updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerCreationWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index a6eaa284d0..c8fd98b804 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -318,11 +318,11 @@ FilterParameter* DataContainerReaderWidget::getFilterParameter() const
 void DataContainerReaderWidget::setupGui()
 {
 
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataContainerReaderWidget::beforePreflight);
 
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataContainerReaderWidget::afterPreflight);
 
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerReaderWidget::filterNeedsInputParameters);
 
   // Put in a QStandardItemModel
   QAbstractItemModel* oldModel = dcaProxyView->model();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 5ee673e91d..419885e140 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -101,13 +101,13 @@ void DataContainerSelectionWidget::setupGui()
   m_SelectedDataContainerPath->setFilter(getFilter());
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DataContainerSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DataContainerSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index 54526d0d9d..c8a9a15880 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -66,13 +66,13 @@ DoubleWidget::~DoubleWidget() = default;
 void DoubleWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DoubleWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DoubleWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DoubleWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index d8e8449e13..171f8099a6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -84,13 +84,13 @@ void DynamicChoiceWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DynamicChoiceWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DynamicChoiceWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DynamicChoiceWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 9db3534f80..dac8eaf0c8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -109,13 +109,13 @@ FilterParameter* DynamicTableWidget::getFilterParameter() const
 void DynamicTableWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &DynamicTableWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &DynamicTableWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DynamicTableWidget::filterNeedsInputParameters);
 
   tableLabel->setText(m_FilterParameter->getHumanLabel());
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 69dbe41ac6..bb04c300c7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -143,13 +143,13 @@ void FileListInfoWidget::setupGui()
 void FileListInfoWidget::connectSignalsSlots()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &FileListInfoWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &FileListInfoWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &FileListInfoWidget::filterNeedsInputParameters);
 
   // Connections for the various ui widgets
   connect(m_Ui->inputDirBtn, &QPushButton::clicked, this, &FileListInfoWidget::inputDirBtn_clicked);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
index 4a42b2c7b2..17e5cee8f6 100755
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -189,7 +189,7 @@ class FilterParameterWidgetUtils
               for(auto& daProxy : dataArrays)
               {
                 QString daName = daProxy.getName();
-                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
+                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
                 aaCombo->addItem(daName);
 
                 if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.empty() && !VectorContains<size_t>(cDims, da->getComponentDimensions()))))
@@ -293,7 +293,7 @@ class FilterParameterWidgetUtils
                   }
                 }
 
-                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath<IDataArray, AbstractFilter>(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
+                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
                 attributeArraysWidget->addItem(daItem);
 
                 if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.isEmpty() && !cDims.contains(da->getComponentDimensions()))))
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index f0e65e2934..3ccd8c2316 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -68,13 +68,13 @@ FloatVec2Widget::~FloatVec2Widget() = default;
 void FloatVec2Widget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &FloatVec2Widget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &FloatVec2Widget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &FloatVec2Widget::filterNeedsInputParameters);
 
   connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(xDataChanged(const QString&)));
   connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(yDataChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index aa5507e4ff..daf430ad28 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -68,13 +68,13 @@ FloatVec3Widget::~FloatVec3Widget() = default;
 void FloatVec3Widget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &FloatVec3Widget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &FloatVec3Widget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &FloatVec3Widget::filterNeedsInputParameters);
 
   connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(xDataChanged(const QString&)));
   connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(yDataChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index 4b47ae6c1d..8440a54cad 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -66,13 +66,13 @@ FloatWidget::~FloatWidget() = default;
 void FloatWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &FloatWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &FloatWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &FloatWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index c05511be74..5e33dac19e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -67,13 +67,13 @@ FourthOrderPolynomialWidget::~FourthOrderPolynomialWidget() = default;
 void FourthOrderPolynomialWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &FourthOrderPolynomialWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &FourthOrderPolynomialWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &FourthOrderPolynomialWidget::filterNeedsInputParameters);
 
   QLocale loc = QLocale::system();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
index 41d812194f..78e09b71f5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
@@ -113,11 +113,11 @@ FilterParameter* GenerateColorTableWidget::getFilterParameter() const
 void GenerateColorTableWidget::setupGui()
 {
 
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &GenerateColorTableWidget::beforePreflight);
 
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &GenerateColorTableWidget::afterPreflight);
 
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &GenerateColorTableWidget::filterNeedsInputParameters);
 
   if(getFilterParameter() != nullptr)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index ddbdd98de6..73bab534a0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -145,13 +145,13 @@ void ImportHDF5DatasetWidget::setupGui()
 {
   setErrorText("");
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ImportHDF5DatasetWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ImportHDF5DatasetWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ImportHDF5DatasetWidget::filterNeedsInputParameters);
 
   QtSFileCompleter* com = new QtSFileCompleter(this, false);
   value->setCompleter(com);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 6b56e98196..8a844c626c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -64,13 +64,13 @@ IntVec2Widget::~IntVec2Widget() = default;
 void IntVec2Widget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &IntVec2Widget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &IntVec2Widget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &IntVec2Widget::filterNeedsInputParameters);
 
   connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
   connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index 1d6ec39d75..afb0caf326 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -66,13 +66,13 @@ IntVec3Widget::~IntVec3Widget() = default;
 void IntVec3Widget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &IntVec3Widget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &IntVec3Widget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &IntVec3Widget::filterNeedsInputParameters);
 
   connect(xData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
   connect(yData, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 7fb7b6d91e..6abb9bce71 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -66,13 +66,13 @@ IntWidget::~IntWidget() = default;
 void IntWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &IntWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &IntWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &IntWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 4e87773526..42bb12f5b7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -65,13 +65,13 @@ void LinkedBooleanWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &LinkedBooleanWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &LinkedBooleanWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &LinkedBooleanWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(stateChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 1ab6ca34cf..9aa4ea32fb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -98,13 +98,13 @@ void LinkedDataContainerSelectionWidget::setupGui()
     return;
   }
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &LinkedDataContainerSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &LinkedDataContainerSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &LinkedDataContainerSelectionWidget::filterNeedsInputParameters);
 
   if(getFilterParameter() == nullptr)
   {
@@ -131,7 +131,7 @@ void LinkedDataContainerSelectionWidget::widgetChanged()
 {
   int index = -1;
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  IGeometry::Pointer igeom = dca->getPrereqGeometryFromDataContainer<IGeometry, AbstractFilter>(nullptr, m_SelectedDataContainerPath->text());
+  IGeometry::Pointer igeom = dca->getPrereqGeometryFromDataContainer<IGeometry>(nullptr, m_SelectedDataContainerPath->text());
   
   if(igeom)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 45fb52e452..619acbe003 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -76,13 +76,13 @@ void LinkedPathCreationWidget::setupGui()
   stringEdit->hideButtons();
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &LinkedPathCreationWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &LinkedPathCreationWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &LinkedPathCreationWidget::filterNeedsInputParameters);
 
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index c1b5ea19f2..ae50108d1b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -93,13 +93,13 @@ void MontageSelectionWidget::setupGui()
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &MontageSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &MontageSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MontageSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 31679b5184..039fa613a4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -124,13 +124,13 @@ void MultiAttributeMatrixSelectionWidget::setupGui()
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &MultiAttributeMatrixSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &MultiAttributeMatrixSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiAttributeMatrixSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 69a1335e91..71537e7519 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -119,13 +119,13 @@ void MultiDataArraySelectionWidget::setupGui()
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &MultiDataArraySelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &MultiDataArraySelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiDataArraySelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9ea0f74594..1cdf4733ba 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -115,13 +115,13 @@ void MultiDataContainerSelectionWidget::setupGui()
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &MultiDataContainerSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &MultiDataContainerSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiDataContainerSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index 1e36993ed3..b609dee473 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -66,13 +66,13 @@ NumericTypeWidget::~NumericTypeWidget() = default;
 void NumericTypeWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &NumericTypeWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &NumericTypeWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &NumericTypeWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index a37a7e36a7..13c1017951 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -70,13 +70,13 @@ void ParagraphWidget::setupGui()
   blockSignals(false);
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ParagraphWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ParagraphWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ParagraphWidget::filterNeedsInputParameters);
 
   connect(textEdit, &QTextEdit::textChanged, [=]() {
     AbstractFilter* filter = this->getFilter();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 4e43bb26ea..1a8f24ea3c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -101,13 +101,13 @@ void PhaseTypeSelectionWidget::setupGui()
   //connect(m_MenuMapper, SIGNAL(mapped(QString)), this, SLOT(attributeMatrixSelected(QString)));
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &PhaseTypeSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &PhaseTypeSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &PhaseTypeSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index c0724a6543..19e49dd281 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -65,13 +65,13 @@ void PreflightUpdatedValueWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &PreflightUpdatedValueWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &PreflightUpdatedValueWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &PreflightUpdatedValueWidget::filterNeedsInputParameters);
 
   blockSignals(true);
   if(getFilterParameter() != nullptr)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index dc4bae1e36..f9727994c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -78,13 +78,13 @@ void RangeWidget::setupGui()
   maxValue->setValidator(new QDoubleValidator(maxValue));
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &RangeWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &RangeWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &RangeWidget::filterNeedsInputParameters);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index dec6e0a0fe..f9a4d281a3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -98,13 +98,13 @@ ReadASCIIDataWidget::~ReadASCIIDataWidget()
 void ReadASCIIDataWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ReadASCIIDataWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ReadASCIIDataWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ReadASCIIDataWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index 6a6fcbe6d0..42f55b27fc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -66,13 +66,13 @@ ScalarTypeWidget::~ScalarTypeWidget() = default;
 void ScalarTypeWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ScalarTypeWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ScalarTypeWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ScalarTypeWidget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(currentIndexChanged(int)), this, SLOT(widgetChanged(int)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index 424949a8cf..ab1b4c68c3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -67,13 +67,13 @@ SecondOrderPolynomialWidget::~SecondOrderPolynomialWidget() = default;
 void SecondOrderPolynomialWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &SecondOrderPolynomialWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &SecondOrderPolynomialWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &SecondOrderPolynomialWidget::filterNeedsInputParameters);
 
   connect(c20, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
   connect(c02, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
index 633309632d..bf58138e46 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
@@ -68,13 +68,13 @@ void SeparatorWidget::setupGui()
 {
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &SeparatorWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &SeparatorWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &SeparatorWidget::filterNeedsInputParameters);
 
   blockSignals(true);
   if(getFilterParameter() != nullptr)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index f64a49d8f6..dbdc3e883a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -91,13 +91,13 @@ void ShapeTypeSelectionWidget::setupGui()
     return;
   }
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ShapeTypeSelectionWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ShapeTypeSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ShapeTypeSelectionWidget::filterNeedsInputParameters);
 
   if(getFilterParameter() == nullptr)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index 712a5b1702..8291da4b6a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -77,13 +77,13 @@ void StringWidget::setupGui()
   stringEdit->hideButtons();
 
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &StringWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &StringWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &StringWidget::filterNeedsInputParameters);
 
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index 378cbf9eec..5354920db9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -67,13 +67,13 @@ ThirdOrderPolynomialWidget::~ThirdOrderPolynomialWidget() = default;
 void ThirdOrderPolynomialWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &ThirdOrderPolynomialWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &ThirdOrderPolynomialWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ThirdOrderPolynomialWidget::filterNeedsInputParameters);
 
   QLocale loc = QLocale::system();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 9ad5e59a32..157284d0bd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -65,13 +65,13 @@ UInt64Widget::~UInt64Widget() = default;
 void UInt64Widget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &UInt64Widget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &UInt64Widget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &UInt64Widget::filterNeedsInputParameters);
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
index f94a81b34a..5f5d2b24eb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
@@ -61,13 +61,13 @@ UnknownWidget::~UnknownWidget() = default;
 void UnknownWidget::setupGui()
 {
   // Catch when the filter is about to execute the preflight
-  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &UnknownWidget::beforePreflight);
 
   // Catch when the filter is finished running the preflight
-  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &UnknownWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &UnknownWidget::filterNeedsInputParameters);
 
   if(getFilterParameter() != nullptr)
   {
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 0e27ec56e1..f36038048e 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -107,7 +107,7 @@ void DataContainerArrayWidget::setupGui()
 
   if(nullptr != m_Filter)
   {
-    connect(m_Filter, SIGNAL(preflightExecuted()), this, SLOT(updateView()));
+    connect(m_Filter, &AbstractFilter::preflightExecuted, this, &DataContainerArrayWidget::updateView);
   }
 }
 
diff --git a/Wrapping/Python/Testing/AbstractFilterTest.py b/Wrapping/Python/Testing/AbstractFilterTest.py
index dbbc3ca61e..6762936572 100644
--- a/Wrapping/Python/Testing/AbstractFilterTest.py
+++ b/Wrapping/Python/Testing/AbstractFilterTest.py
@@ -12,22 +12,22 @@ def BasicTest():
     """
     This will test the basic AbstractFilter methods
     """
-    filter = simpl.AbstractFilter.New()
+    filter = simpl.EmptyFilter.New()
 
     groupName = filter.GroupName
-    assert groupName == "YOUR CLASS SHOULD IMPLEMENT THIS"
+    assert groupName == "Core"
 
     subGroupName = filter.SubGroupName
-    assert subGroupName == "YOUR CLASS SHOULD IMPLEMENT THIS"
+    assert subGroupName == "Misc"
 
     humanLabel = filter.HumanLabel
-    assert humanLabel == "YOUR CLASS SHOULD IMPLEMENT THIS"
+    assert humanLabel == "Unknown Filter: "
 
     filterVersion = filter.FilterVersion
-    assert filterVersion == "0.0.0"
+    assert filterVersion != "0.0.0"
 
     compiledLibraryName = filter.CompiledLibraryName
-    assert compiledLibraryName == ""
+    assert compiledLibraryName == "Core"
 
     filter.Cancel = False
     b = filter.Cancel
diff --git a/Wrapping/Python/Testing/TestBindings.py b/Wrapping/Python/Testing/TestBindings.py
index f7fbffaf95..22fb361cb9 100644
--- a/Wrapping/Python/Testing/TestBindings.py
+++ b/Wrapping/Python/Testing/TestBindings.py
@@ -54,12 +54,6 @@ def PipelineTest():
   filterCount = pipeline.size()
   print("Filter Count: %d" % filterCount)
 
-  pipeline = simpl.FilterPipeline.New()
-  print("Pipeline to Null")
-  reader = simpl.AbstractFilter.New()
-  writer = simpl.AbstractFilter.New()
-  print("Filter to null")
-
   time.sleep(2)
 
 

From 3a300c0b4918bac2fd6c449d25c05740a24a9374 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <jared.duffey@bluequartz.net>
Date: Wed, 18 Mar 2020 12:16:17 -0400
Subject: [PATCH 187/397] Backward compatibility Macro for Qt 5.9 to 5.14
 (#392)

* Update codes to copmile against from Qt 5.9.x to Qt 5.14.x

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated Macro header file to include the proper definitions based on  ITK Version

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* The backward compatibility macro should check for versions earlier that 5.14

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix conversion from list to set

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

Co-authored-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/H5Support/QH5Lite.cpp                  |   9 +-
 .../Common/QtBackwardCompatibilityMacro.h     |  41 +++++
 Source/SIMPLib/Common/SourceList.cmake        |   1 +
 .../CoreFilters/CombineAttributeArrays.cpp    |   3 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   2 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |   1 -
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 101 +++++++++---
 .../ITK/itkDream3DFilterInterruption.h        |   9 ++
 .../ITK/itkInPlaceDream3DDataToImageFilter.h  |   8 +
 .../ITK/itkInPlaceImageToDream3DDataFilter.h  |   8 +
 Source/SIMPLib/ITK/itkTemplateUtilities.h     | 147 ------------------
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   6 +
 Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp  |  16 +-
 .../FilterParameterWidgets/AxisAngleWidget.h  |   7 +-
 .../ComparisonSelectionTableModel.cpp         |   2 +-
 .../FilterParameterWidget.cpp                 |  66 ++++----
 .../MultiAttributeMatrixSelectionWidget.cpp   |   6 +-
 .../MultiDataArraySelectionWidget.cpp         |   2 +-
 .../MultiDataContainerSelectionWidget.cpp     |   2 +-
 .../QtSupport/QRoundProgressBar.cpp           |   8 +-
 .../SVWidgetsLib/QtSupport/QtSFileUtils.cpp   |  68 ++++----
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   2 +-
 .../Widgets/BookmarksTreeView.cpp             |  10 +-
 .../Widgets/DataArrayPathDisplay.cpp          |   2 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  |   2 +-
 .../Widgets/DataStructureItemDelegate.cpp     |   4 +-
 .../Widgets/FilterLibraryToolboxWidget.cpp    |   4 +-
 .../Widgets/PipelineItemDelegate.cpp          |   6 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |  12 +-
 .../Widgets/StatusBarIssuesButton.cpp         |   6 +-
 30 files changed, 273 insertions(+), 288 deletions(-)
 create mode 100644 Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h

diff --git a/Source/H5Support/QH5Lite.cpp b/Source/H5Support/QH5Lite.cpp
index db12545cab..11bf40a01c 100644
--- a/Source/H5Support/QH5Lite.cpp
+++ b/Source/H5Support/QH5Lite.cpp
@@ -381,6 +381,13 @@ herr_t QH5Lite::getDatasetInfo(hid_t loc_id, const QString& dsetName, QVector<hs
   return err;
 }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+#define QVECTOR_FROM_STD_VECTOR(def, qvector, svector) def qvector = def::fromStdVector(svector);
+#define QVECTOR_TO_STD_VECTOR(def, qvector, svector) def svector = qvector.toStdVector();
+#else
+#define QVECTOR_TO_STD_VECTOR(def, qvecVarName, svector) def svector(qvecVarName.begin(), qvecVarName.end());
+#endif
+
 // -----------------------------------------------------------------------------
 //  You must close the attributeType argument or resource leaks will occur. Use
 //  H5Tclose(tid); after your call to this method if you do not need the id for
@@ -388,7 +395,7 @@ herr_t QH5Lite::getDatasetInfo(hid_t loc_id, const QString& dsetName, QVector<hs
 // -----------------------------------------------------------------------------
 herr_t QH5Lite::getAttributeInfo(hid_t loc_id, const QString& objName, const QString& attrName, QVector<hsize_t>& dims, H5T_class_t& type_class, size_t& type_size, hid_t& tid)
 {
-  std::vector<hsize_t> rDims = dims.toStdVector();
+  QVECTOR_TO_STD_VECTOR(std::vector<hsize_t>, dims, rDims)
   herr_t err = H5Lite::getAttributeInfo(loc_id, objName.toStdString(), attrName.toStdString(), rDims, type_class, type_size, tid);
   dims.resize(static_cast<qint32>(rDims.size()));
   for(std::vector<hsize_t>::size_type i = 0; i < rDims.size(); ++i)
diff --git a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
new file mode 100644
index 0000000000..610f7a5fa6
--- /dev/null
+++ b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
@@ -0,0 +1,41 @@
+
+
+#pragma once
+
+#include <QtCore/QtGlobal>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
+#define QFONTMETRICS_WIDTH width
+#else
+#define QFONTMETRICS_WIDTH horizontalAdvance
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+
+#ifndef QVECTOR_FROM_STD_VECTOR
+#define QVECTOR_FROM_STD_VECTOR(def, qvector, other) def qvector = def::fromStdVector(other);
+#endif
+
+#ifndef QVECTOR_TO_STD_VECTOR
+#define QVECTOR_TO_STD_VECTOR(def, qvector, other) def other = qvector.toStdVector();
+#endif
+
+#ifndef QLIST_FROM_QSET
+#define QLIST_FROM_QSET(def, qlist, other) def qlist = other.toList();
+#endif
+
+#else
+
+#ifndef QVECTOR_FROM_STD_VECTOR
+#define QVECTOR_FROM_STD_VECTOR(def, qvecVarName, svector) def qvecVarName(svector.begin(), svector.end());
+#endif
+
+#ifndef QVECTOR_TO_STD_VECTOR
+#define QVECTOR_TO_STD_VECTOR(def, qvecVarName, svector) def svector(qvecVarName.begin(), qvecVarName.end());
+#endif
+
+#ifndef QLIST_FROM_QSET
+#define QLIST_FROM_QSET(def, qlist, other) def qlist = other.values();
+#endif
+
+#endif
diff --git a/Source/SIMPLib/Common/SourceList.cmake b/Source/SIMPLib/Common/SourceList.cmake
index 7157abbc28..4011283f72 100755
--- a/Source/SIMPLib/Common/SourceList.cmake
+++ b/Source/SIMPLib/Common/SourceList.cmake
@@ -23,6 +23,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/CreatedArrayHelpIndexEntry.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IObserver.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QtBackwardCompatibilityMacro.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibDLLExport.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibSetGetMacros.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ScopedFileMonitor.hpp
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 73d18d1307..c9193f2698 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -342,7 +342,8 @@ std::list<DataArrayPath> CombineAttributeArrays::getDeletedPaths()
 {
   if(getMoveValues())
   {
-    return getSelectedDataArrayPaths().toList().toStdList();
+    QList<DataArrayPath> tList = getSelectedDataArrayPaths().toList();
+    return std::list<DataArrayPath>(tList.begin(), tList.end());
   }
   return std::list<DataArrayPath>();
 }
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 31e7a9e79d..ca6abc41de 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -234,7 +234,7 @@ void WriteTriangleGeometry::execute()
 
   notifyStatusMessage("Writing Triangles Text File");
   QFileInfo triFI(getOutputTrianglesFile());
-  parentPath = triFI.path();
+  parentPath.setPath(triFI.path());
 
   if(!parentPath.mkpath("."))
   {
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 741183c28a..6b2082f695 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <memory>
-
 #include <map>
 
 #include <QtCore/QString>
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 297aab4cc1..5ee15bcda4 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -76,18 +76,63 @@
 
 #pragma once
 
-#include <memory>
+#include <itkConfigure.h>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
-
-class IDataArray;
-using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
-
-#include <QString>
+#if(ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1)
+#include <itkCommonEnums.h>
+#else
 #include <itkImageIOBase.h>
-#include <itkRGBAPixel.h>
-#include <itkRGBPixel.h>
-#include <itkVector.h>
+#endif
+
+#define EXECUTE_FUNCTION_TEMPLATE_NO_BOOL(observableObj, templateName, inputData, ...)                                                                                                                 \
+  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
+  {                                                                                                                                                                                                    \
+    templateName<float>(__VA_ARGS__);                                                                                                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    templateName<double>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    templateName<int8_t>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    templateName<uint8_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    templateName<int16_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    templateName<uint16_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    templateName<int32_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    templateName<uint32_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    templateName<int64_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    templateName<uint64_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<SizeTArrayType>()(inputData))                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    templateName<size_t>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    observableObj->setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "The input array was of unsupported type");                                                                         \
+  }
 
 //--------------------------------------------------------------------------
 // Allow individual switching of support for each scalar size/signedness and
@@ -390,46 +435,54 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 ///////////////////////////////////////////////////////////////////////////////////////
 //
 // Subtract 1 to enum values because 'type' values are expected to start at 0 while
-// itk::ImageIOBase::IOComponentType '0' value is UNKNOWNCOMPONENTTYPE and therefore
+// itk::ITK_IOCOMPONENT_CLASS::IOComponentType '0' value is UNKNOWNCOMPONENTTYPE and therefore
 // should be skipped.
 //
+#if(ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1)
+#define ITK_IOCOMPONENT_CLASS CommonEnums
+#define ITK_IOCOMPONENT_TYPE IOComponent
+#else
+#define ITK_IOCOMPONENT_CLASS ImageIOBase
+#define ITK_IOCOMPONENT_TYPE IOComponentType
+#endif
+
 #define Dream3DArraySwitchOutputComponentMacro(call, type, path, errorCondition)                                                                                                                       \
   switch(type)                                                                                                                                                                                         \
   {                                                                                                                                                                                                    \
-  case itk::ImageIOBase::IOComponentType::UCHAR:                                                                                                                                                       \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::UCHAR:                                                                                                                                        \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint8_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::CHAR:                                                                                                                                                        \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::CHAR:                                                                                                                                         \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int8_t, 0);                                                                                                                          \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::USHORT:                                                                                                                                                      \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::USHORT:                                                                                                                                       \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint16_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::SHORT:                                                                                                                                                       \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::SHORT:                                                                                                                                        \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int16_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::UINT:                                                                                                                                                        \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::UINT:                                                                                                                                         \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint32_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::INT:                                                                                                                                                         \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::INT:                                                                                                                                          \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int32_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::ULONG:                                                                                                                                                       \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::ULONG:                                                                                                                                        \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::LONG:                                                                                                                                                        \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::LONG:                                                                                                                                         \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::ULONGLONG:                                                                                                                                                   \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::ULONGLONG:                                                                                                                                    \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, uint64_t, 0);                                                                                                                        \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::LONGLONG:                                                                                                                                                    \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::LONGLONG:                                                                                                                                     \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, int64_t, 0);                                                                                                                         \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::FLOAT:                                                                                                                                                       \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::FLOAT:                                                                                                                                        \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, float, 0);                                                                                                                           \
     break;                                                                                                                                                                                             \
-  case itk::ImageIOBase::IOComponentType::DOUBLE:                                                                                                                                                      \
+  case itk::ITK_IOCOMPONENT_CLASS::ITK_IOCOMPONENT_TYPE::DOUBLE:                                                                                                                                       \
     Dream3DArraySwitchMacroOutputType(call, path, errorCondition, double, 0);                                                                                                                          \
     break;                                                                                                                                                                                             \
   default:                                                                                                                                                                                             \
@@ -458,7 +511,7 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
         if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
           QString str_type = ptr->getTypeAsString();                                                                                                                                                   \
-          itk::ImageIOBase::IOComponentType type = itk::ImageIOBase::GetComponentTypeFromString(str_type.toStdString());                                                                               \
+          itk::ITK_IOCOMPONENT_CLASS::IOComponentType type = itk::ITK_IOCOMPONENT_CLASS::GetComponentTypeFromString(str_type.toStdString());                                                           \
           Dream3DArraySwitchOutputComponentMacro(call, type, input1_path, errorCondition)                                                                                                              \
         }                                                                                                                                                                                              \
       }                                                                                                                                                                                                \
diff --git a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
index 702a97a9ee..0dcfe4f76f 100644
--- a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
+++ b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
@@ -1,5 +1,14 @@
 #pragma once
 
+#include "itkConfigure.h"
+
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
+
 #include <itkCommand.h>
 #include <itkProcessObject.h>
 
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index c417e5ec3a..609b04af39 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -2,6 +2,14 @@
 
 #include <memory>
 
+#include "itkConfigure.h"
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
+
 #include <itkImportImageFilter.h>
 #include <itkNumericTraits.h>
 #include <itkNumericTraitsRGBAPixel.h>
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index 34127027af..48380472b1 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -1,5 +1,13 @@
 #pragma once
 
+#include "itkConfigure.h"
+#if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
+
 #include <itkImage.h>
 #include <itkNumericTraits.h>
 #include <itkNumericTraitsRGBAPixel.h>
diff --git a/Source/SIMPLib/ITK/itkTemplateUtilities.h b/Source/SIMPLib/ITK/itkTemplateUtilities.h
index d20c929223..fd22b7b0aa 100644
--- a/Source/SIMPLib/ITK/itkTemplateUtilities.h
+++ b/Source/SIMPLib/ITK/itkTemplateUtilities.h
@@ -35,150 +35,3 @@
 
 #pragma once
 
-#if 0
-
-#include "SIMPLib/Common/Constants.h"
-
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-
-namespace TemplateConstants
-{
-
-  enum Types
-  {
-    UnknownType = 0,
-    Bool,
-    Int8,
-    UInt8,
-    Int16,
-    UInt16,
-    Int32,
-    UInt32,
-    Int64,
-    UInt64,
-    Float,
-    Double
-  };
-
-}
-
-
-class TemplateUtilities
-{
-  public:
-    TemplateUtilities() {}
-    virtual ~TemplateUtilities();
-
-    static QString getTypeNameFromType(int type)
-    {
-      if(TemplateConstants::Bool == type)
-      {
-        return SIMPL::TypeNames::Bool;
-      }
-      else if(TemplateConstants::Int8 == type)
-      {
-        return SIMPL::TypeNames::Int8;
-      }
-      else if(TemplateConstants::UInt8 == type)
-      {
-        return SIMPL::TypeNames::UInt8;
-      }
-      else if(TemplateConstants::Int16 == type)
-      {
-        return SIMPL::TypeNames::Int16;
-      }
-      else if(TemplateConstants::UInt16 == type)
-      {
-        return SIMPL::TypeNames::UInt16;
-      }
-      else if(TemplateConstants::Int32 == type)
-      {
-        return SIMPL::TypeNames::Int32;
-      }
-      else if(TemplateConstants::UInt32 == type)
-      {
-        return SIMPL::TypeNames::UInt32;
-      }
-      else if(TemplateConstants::Int64 == type)
-      {
-        return SIMPL::TypeNames::Int64;
-      }
-      else if(TemplateConstants::UInt64 == type)
-      {
-        return SIMPL::TypeNames::UInt64;
-      }
-      else if(TemplateConstants::Float == type)
-      {
-        return SIMPL::TypeNames::Float;
-      }
-      else if(TemplateConstants::Double == type)
-      {
-        return SIMPL::TypeNames::Double;
-      }
-      else
-      {
-        return SIMPL::Defaults::Any;
-      }
-    }
-
-    static int getTypeFromTypeName(QString type)
-    {
-      if(0 == type.compare(SIMPL::TypeNames::Bool))
-      {
-        return TemplateConstants::Bool;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Int8))
-      {
-        return TemplateConstants::Int8;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::UInt8))
-      {
-        return TemplateConstants::UInt8;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Int16))
-      {
-        return TemplateConstants::Int16;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::UInt16))
-      {
-        return TemplateConstants::UInt16;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Int32))
-      {
-        return TemplateConstants::Int32;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::UInt32))
-      {
-        return TemplateConstants::UInt32;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Int64))
-      {
-        return TemplateConstants::Int64;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::UInt64))
-      {
-        return TemplateConstants::UInt64;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Float))
-      {
-        return TemplateConstants::Float;
-      }
-      else if(0 == type.compare(SIMPL::TypeNames::Double))
-      {
-        return TemplateConstants::Double;
-      }
-      else
-      {
-        return TemplateConstants::UnknownType;
-      }
-    }
-
-  private:
-    TemplateUtilities(const TemplateUtilities&) = delete; // Copy Constructor Not Implemented
-    void operator=(const TemplateUtilities&) = delete; // Move assignment Not Implemented
-};
-
-#endif
-
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index ef11c335e3..2bae925cff 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -74,6 +74,7 @@
 /* Include the DLL export preprocessor defines */
 #include "SIMPLib/Common/SIMPLibDLLExport.h"
 
+
 #include "SIMPLib/Common/SIMPLPythonMacros.h"
 
 /* We are going to disable some warnings just to get a grip on all the warnings that get produced
@@ -93,6 +94,10 @@
 #endif
 
 #ifdef QT_CORE_LIB
+
+/* Include the QtBackwardCompatibility Macros */
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
+
 #include <QtCore/QMetaType>
 Q_DECLARE_METATYPE(uint8_t)
 Q_DECLARE_METATYPE(int8_t)
@@ -102,4 +107,5 @@ Q_DECLARE_METATYPE(uint32_t)
 Q_DECLARE_METATYPE(int32_t)
 Q_DECLARE_METATYPE(uint64_t)
 Q_DECLARE_METATYPE(int64_t)
+
 #endif
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
index dc35795401..9066de2ee1 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
@@ -190,12 +190,12 @@ void AboutPlugins::addPluginToTable(ISIMPLibPlugin* plugin, int row)
 
   // Add name of plugin to the row
   QTableWidgetItem* nameItem = new QTableWidgetItem(plugin->getPluginBaseName());
-  nameItem->setBackgroundColor(defaultColor);
+  nameItem->setBackground(defaultColor);
   pluginsTable->setItem(row, NAME_INDEX, nameItem);
 
   // Set checkbox cell to default settings
   QTableWidgetItem* enabledItem = new QTableWidgetItem();
-  enabledItem->setBackgroundColor(defaultColor);
+  enabledItem->setBackground(defaultColor);
   pluginsTable->setItem(row, ENABLED_INDEX, enabledItem);
 
   // Add check box that is centered in the cell
@@ -223,12 +223,12 @@ void AboutPlugins::addPluginToTable(ISIMPLibPlugin* plugin, int row)
   {
     statusItem = new QTableWidgetItem("Disabled");
   }
-  statusItem->setBackgroundColor(Qt::white);
+  statusItem->setBackground(Qt::white);
   pluginsTable->setItem(row, STATUS_INDEX, statusItem);
 
   // Add version information
   QTableWidgetItem* versionItem = new QTableWidgetItem(plugin->getVersion());
-  versionItem->setBackgroundColor(Qt::white);
+  versionItem->setBackground(Qt::white);
   pluginsTable->setItem(row, VERSION_INDEX, versionItem);
 }
 
@@ -248,23 +248,23 @@ void AboutPlugins::addPlaceHolderToTable(SIMPLibPlugin* plugin, int row)
   // Add name of plugin to the row
   QTableWidgetItem* nameItem = new QTableWidgetItem(plugin->getPluginName());
   nameItem->setFont(errorFont);
-  nameItem->setBackgroundColor(errorColor);
+  nameItem->setBackground(errorColor);
   pluginsTable->setItem(row, NAME_INDEX, nameItem);
 
   // Add empty checkbox item to the row
   QTableWidgetItem* enabledItem = new QTableWidgetItem();
-  enabledItem->setBackgroundColor(errorColor);
+  enabledItem->setBackground(errorColor);
   pluginsTable->setItem(row, ENABLED_INDEX, enabledItem);
 
   // Add status to the row
   QTableWidgetItem* statusItem = new QTableWidgetItem(NOT_FOUND_STRING);
-  statusItem->setBackgroundColor(errorColor);
+  statusItem->setBackground(errorColor);
   statusItem->setFont(errorFont);
   pluginsTable->setItem(row, STATUS_INDEX, statusItem);
 
   // Add version information
   QTableWidgetItem* versionItem = new QTableWidgetItem(plugin->getVersion());
-  versionItem->setBackgroundColor(errorColor);
+  versionItem->setBackground(errorColor);
   pluginsTable->setItem(row, VERSION_INDEX, versionItem);
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index b1f4bf2675..0373f5f633 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -38,15 +38,12 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
-
-#include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
-
-
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/ui_AxisAngleWidget.h"
 
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
index a4f374a40c..90cdc91bb8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
@@ -158,7 +158,7 @@ QVariant ComparisonSelectionTableModel::data(const QModelIndex& index, qint32 ro
     }
     QFontMetrics fontMetrics(data(index, Qt::FontRole).value<QFont>());
     comboBox.fontMetrics = fontMetrics;
-    QSize size(fontMetrics.width(comboBox.currentText), fontMetrics.height());
+    QSize size(fontMetrics.QFONTMETRICS_WIDTH(comboBox.currentText), fontMetrics.height());
     // FIXME: Is this size correct? Can we get a more accurate size without using QApplication
     return size;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index a5873d515d..13912fe23f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterParameterWidget.h"
 
 #include <QtCore/QPropertyAnimation>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 039fa613a4..5ed80c4fc1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -448,7 +448,7 @@ void MultiAttributeMatrixSelectionWidget::selectionChanged()
     for (int i=0; i<orderSize; i++)
     {
       int row = attributeMatricesOrderWidget->selectionModel()->selectedRows()[i].row();
-      if (attributeMatricesOrderWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      if(attributeMatricesOrderWidget->item(row)->background() != QColor(235, 110, 110))
       {
         allErrorRows = false;
       }
@@ -516,11 +516,11 @@ void MultiAttributeMatrixSelectionWidget::beforePreflight()
         if(!matrixNames.contains(name))
         {
           //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-          item->setBackgroundColor(QColor(235, 110, 110));
+          item->setBackground(QColor(235, 110, 110));
         }
         else
         {
-          item->setBackgroundColor(QColor(255, 255, 255));
+          item->setBackground(QColor(255, 255, 255));
         }
       }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 71537e7519..1e00fdd4b5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -432,7 +432,7 @@ void MultiDataArraySelectionWidget::selectionChanged()
     for (int i=0; i<orderSize; i++)
     {
       int row = selectedArraysListWidget->selectionModel()->selectedRows()[i].row();
-      if(selectedArraysListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      if(selectedArraysListWidget->item(row)->background() != QColor(235, 110, 110))
       {
         allErrorRows = false;
       }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 1cdf4733ba..191b8a9428 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -331,7 +331,7 @@ void MultiDataContainerSelectionWidget::selectionChanged()
     for (int i=0; i<orderSize; i++)
     {
       int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
-      if(selectedDataContainersListWidget->item(row)->backgroundColor() != QColor(235, 110, 110))
+      if(selectedDataContainersListWidget->item(row)->background() != QColor(235, 110, 110))
       {
         allErrorRows = false;
       }
diff --git a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
index c5fe452033..d332fef578 100644
--- a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
@@ -167,9 +167,9 @@ void QRoundProgressBar::setFormat(const QString &format)
 
 void QRoundProgressBar::resetFormat()
 {
-    m_format = QString::null;
+  m_format = QString();
 
-    valueFormatChanged();
+  valueFormatChanged();
 }
 
 void QRoundProgressBar::setDecimals(int count)
@@ -218,13 +218,13 @@ void QRoundProgressBar::paintEvent(QPaintEvent* /*event*/)
     p.end();
 
     QPainter painter(this);
-    painter.fillRect(baseRect, palette().background());
+    painter.fillRect(baseRect, palette().window());
     painter.drawImage(0,0, buffer);
 }
 
 void QRoundProgressBar::drawBackground(QPainter &p, const QRectF &baseRect)
 {
-    p.fillRect(baseRect, palette().background());
+  p.fillRect(baseRect, palette().window());
 }
 
 void QRoundProgressBar::drawBase(QPainter &p, const QRectF &baseRect)
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index 398b825fc4..dfc0b41c00 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -99,12 +99,11 @@ QString QtSFileUtils::GenerateFileSystemPath(const QString& pathEnding)
 // -----------------------------------------------------------------------------
 QString QtSFileUtils::GetPathSeperator()
 {
-  QString sep(":"); // Assume : on Linux and macOS and unix
-  if(QSysInfo::windowsVersion() != QSysInfo::WV_None)
-  {
-    sep = QString(";");
-  }
-  return sep;
+#if defined(Q_OS_WIN)
+  return QString(";");
+#else
+  return QString(":");
+#endif
 }
 
 // -----------------------------------------------------------------------------
@@ -144,38 +143,39 @@ QString QtSFileUtils::FindInPath(const QString& exe)
 void QtSFileUtils::ShowPathInGui(QWidget* parent, const QString& pathIn)
 {
   const QFileInfo fileInfo(pathIn);
-  if(QSysInfo::windowsVersion() != QSysInfo::WV_None)
-  {
-    const QString explorer = FindInPath(QLatin1String("explorer.exe"));
-    if(explorer.isEmpty())
-    {
-      QMessageBox::warning(parent, QString("Launching Windows Explorer Failed"), QString("Could not find explorer.exe in path to launch Windows Explorer."));
-      return;
-    }
-    QStringList param;
-    if(!fileInfo.isDir())
-    {
-      param += QLatin1String("/select,");
-    }
-    param += QDir::toNativeSeparators(fileInfo.canonicalFilePath());
-    QProcess::startDetached(explorer, param);
-  }
-  else if(QSysInfo::MacVersion() != QSysInfo::MV_None)
+#if defined(Q_OS_WIN)
+
+  const QString explorer = FindInPath(QLatin1String("explorer.exe"));
+  if(explorer.isEmpty())
   {
-    QStringList scriptArgs;
-    scriptArgs << QLatin1String("-e") << QString::fromLatin1("tell application \"Finder\" to reveal POSIX file \"%1\"").arg(fileInfo.absoluteFilePath());
-    QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
-    scriptArgs.clear();
-    scriptArgs << QLatin1String("-e") << QLatin1String("tell application \"Finder\" to activate");
-    QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
+    QMessageBox::warning(parent, QString("Launching Windows Explorer Failed"), QString("Could not find explorer.exe in path to launch Windows Explorer."));
+    return;
   }
-  else
+  QStringList param;
+  if(!fileInfo.isDir())
   {
-    // we cannot select a file here, because no file browser really supports it...
-    QString s("file://");
-    s = s + pathIn;
-    QDesktopServices::openUrl(s);
+    param += QLatin1String("/select,");
   }
+  param += QDir::toNativeSeparators(fileInfo.canonicalFilePath());
+  QProcess::startDetached(explorer, param);
+
+#elif defined(Q_OS_MAC)
+
+  QStringList scriptArgs;
+  scriptArgs << QLatin1String("-e") << QString::fromLatin1("tell application \"Finder\" to reveal POSIX file \"%1\"").arg(fileInfo.absoluteFilePath());
+  QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
+  scriptArgs.clear();
+  scriptArgs << QLatin1String("-e") << QLatin1String("tell application \"Finder\" to activate");
+  QProcess::execute(QLatin1String("/usr/bin/osascript"), scriptArgs);
+
+#else
+
+  // we cannot select a file here, because no file browser really supports it...
+  QString s("file://");
+  s = s + pathIn;
+  QDesktopServices::openUrl(s);
+
+#endif
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index c4c2e74dc2..24530c4b1a 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -863,7 +863,7 @@ QDir BookmarksModel::findPipelinesDirectory()
 
 #endif
 
-  pipelinesDir = pipelinesDir.absolutePath() + QDir::separator() + dirName;
+  pipelinesDir.setPath(pipelinesDir.absolutePath() + QDir::separator() + dirName);
   return pipelinesDir;
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index d10dffe4bd..1cf863a95a 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -226,7 +226,7 @@ void BookmarksTreeView::listenRemoveBookmarkTriggered()
   BookmarksModel* model = BookmarksModel::Instance();
 
   QModelIndexList indexList = selectionModel()->selectedRows(BookmarksItem::Contents);
-  qSort(indexList);
+  std::sort(indexList.begin(), indexList.end());
 
   indexList = filterOutDescendants(indexList);
 
@@ -290,7 +290,7 @@ void BookmarksTreeView::listenOpenBookmarkTriggered()
   BookmarksModel* model = BookmarksModel::Instance();
 
   QModelIndexList indexList = selectionModel()->selectedRows(BookmarksItem::Contents);
-  qSort(indexList);
+  std::sort(indexList.begin(), indexList.end());
 
   QModelIndex index = indexList.at(0);
 
@@ -318,7 +318,7 @@ void BookmarksTreeView::listenExecuteBookmarkTriggered()
   BookmarksModel* model = BookmarksModel::Instance();
 
   QModelIndexList indexList = selectionModel()->selectedRows(BookmarksItem::Contents);
-  qSort(indexList);
+  std::sort(indexList.begin(), indexList.end());
 
   QModelIndex index = indexList.at(0);
 
@@ -442,7 +442,7 @@ void BookmarksTreeView::requestContextMenu(const QPoint& pos)
   BookmarksModel* model = BookmarksModel::Instance();
 
   QModelIndexList indexList = selectionModel()->selectedRows(BookmarksItem::Contents);
-  qSort(indexList);
+  std::sort(indexList.begin(), indexList.end());
 
   QMenu menu;
   if(!index.isValid())
@@ -568,7 +568,7 @@ void BookmarksTreeView::performDrag()
   m_IndexesBeingDragged.clear();
 
   QModelIndexList list = selectionModel()->selectedRows();
-  qSort(list);
+  std::sort(list.begin(), list.end());
 
   // We need to filter out all indexes that already have parents/ancestors selected
   list = filterOutDescendants(list);
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
index 8909d97178..cedb81a645 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
@@ -359,7 +359,7 @@ QSize DataArrayPathDisplay::updatedSizeHint(QSize sizeHint) const
   // Check Width
   QFontMetrics fm(font());
   int textPadding = xMargin;
-  int textWidth = fm.width(getDataArrayPath().serialize()) + textPadding;
+  int textWidth = fm.QFONTMETRICS_WIDTH(getDataArrayPath().serialize()) + textPadding;
   int minWidth = textWidth + xMargin + (2 * sizeHint.height());
   if(sizeHint.width() < minWidth)
   {
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 3e436240c6..da26b682b2 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -1402,7 +1402,7 @@ QSize DataArrayPathSelectionWidget::updatedSizeHint(QSize sizeHint) const
   // Check Width
   QFontMetrics fm(font());
   int textPadding = xMargin;
-  int textWidth = fm.width(text()) + textPadding;
+  int textWidth = fm.QFONTMETRICS_WIDTH(text()) + textPadding;
   int minWidth = textWidth + xMargin + (2 * sizeHint.height());
   if(sizeHint.width() < minWidth)
   {
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index c6715d2442..f3e0f85f88 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -368,7 +368,7 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
   }
 
   QFontMetrics fm(op.font);
-  int textWidth = fm.width(text);
+  int textWidth = fm.QFONTMETRICS_WIDTH(text);
 
   // Highlight the path
   if(pathHighlighted)
@@ -406,7 +406,7 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
   // Draw icon for created paths
   if(isCreatedPath)
   {
-    int textWidth = fm.width(text);
+    int textWidth = fm.QFONTMETRICS_WIDTH(text);
 
     QRect imgRect;
     int xOffset = 5;
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index fba7f013f3..c3b711ea8d 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -88,8 +88,8 @@ void FilterLibraryToolboxWidget::refreshFilterGroups()
   FilterManager* fm = FilterManager::Instance();
   QSet<QString> grpNames = fm->getGroupNames();
 
-  QList<QString> grpNameSorted = grpNames.toList();
-  qSort(grpNameSorted);
+  QLIST_FROM_QSET(QList<QString>, grpNameSorted, grpNames)
+  std::sort(grpNameSorted.begin(), grpNameSorted.end());
 
   // Clear out the default stuff
   filterLibrary->clear();
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
index 6eecac2336..9a3b078264 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
@@ -213,7 +213,7 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   int fontHeight = fontMetrics.height();
   int fontMargin = ((option.rect.height() - fontHeight) / 2) - 1;
 
-  int indexFontWidth = fontMetrics.width(QString::number(model->getMaxFilterCount()));
+  int indexFontWidth = fontMetrics.QFONTMETRICS_WIDTH(QString::number(model->getMaxFilterCount()));
 
   painter->setFont(font);
 
@@ -342,11 +342,11 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   if (itemType == PipelineItem::ItemType::DropIndicator)
   {
     QString dropIndicatorText = model->dropIndicatorText(index);
-    humanLabelWidth = fontMetrics.width(dropIndicatorText);
+    humanLabelWidth = fontMetrics.QFONTMETRICS_WIDTH(dropIndicatorText);
   }
   else
   {
-    humanLabelWidth = fontMetrics.width(filter->getHumanLabel());
+    humanLabelWidth = fontMetrics.QFONTMETRICS_WIDTH(filter->getHumanLabel());
   }
 
   // Draw the filter human label
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index d10baa2909..eadc128432 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -34,6 +34,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SVPipelineView.h"
 
+#include <algorithm>
 #include <iostream>
 #include <utility>
 
@@ -729,7 +730,7 @@ void SVPipelineView::copySelectedFilters()
 std::vector<AbstractFilter::Pointer> SVPipelineView::getSelectedFilters()
 {
   QModelIndexList selectedIndexes = selectionModel()->selectedRows();
-  qSort(selectedIndexes);
+  std::sort(selectedIndexes.begin(), selectedIndexes.end());
 
   std::vector<AbstractFilter::Pointer> filters;
   PipelineModel* model = getPipelineModel();
@@ -760,8 +761,7 @@ void SVPipelineView::listenDeleteKeyTriggered()
   {
     return;
   }
-
-  qSort(selectedIndexes);
+  std::sort(selectedIndexes.begin(), selectedIndexes.end());
 
   PipelineModel* model = getPipelineModel();
 
@@ -883,7 +883,7 @@ void SVPipelineView::beginDrag(QMouseEvent* event)
     return;
   }
 
-  qSort(selectedIndexes);
+  std::sort(selectedIndexes.begin(), selectedIndexes.end());
 
   QPixmap dragPixmap = getDraggingPixmap(selectedIndexes);
 
@@ -1418,7 +1418,7 @@ void SVPipelineView::setFiltersEnabled(QModelIndexList indexes, bool enabled)
 void SVPipelineView::setSelectedFiltersEnabled(bool enabled)
 {
   QModelIndexList indexes = selectionModel()->selectedRows();
-  qSort(indexes);
+  std::sort(indexes.begin(), indexes.end());
   setFiltersEnabled(indexes, enabled);
 }
 
@@ -1676,7 +1676,7 @@ void SVPipelineView::requestFilterItemContextMenu(const QPoint& pos, const QMode
 {
   PipelineModel* model = getPipelineModel();
   QModelIndexList selectedIndexes = selectionModel()->selectedRows();
-  qSort(selectedIndexes);
+  std::sort(selectedIndexes.begin(), selectedIndexes.end());
 
   QMenu menu;
 
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
index 62975c19ed..6268a0480f 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
@@ -5,6 +5,8 @@
 #include <QtGui/QPainter>
 #include <QtWidgets/QStyleOption>
 
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
@@ -39,7 +41,7 @@ void StatusBarIssuesButton::updateMinimumWidth()
 
     QFontMetrics fontMetrics(font);
     QString number = QString::number(m_ErrorBadgeCount + m_WarningBadgeCount);
-    int fw = fontMetrics.width(number);
+    int fw = fontMetrics.QFONTMETRICS_WIDTH(number);
 
     m_BadgeWidth = fw + (2 * m_BadgeMargin);
     setMinimumWidth(110 + m_BadgeWidth);
@@ -114,7 +116,7 @@ void StatusBarIssuesButton::paintEvent(QPaintEvent* event)
   {
 
     QString number = QString::number(m_ErrorBadgeCount + m_WarningBadgeCount);
-    int fw = fontMetrics.width(number);
+    int fw = fontMetrics.QFONTMETRICS_WIDTH(number);
 
     QPainterPath badgePath;
     badgePath.addRoundedRect(rect.width() - m_BadgeWidth - getTextMargin(), // X

From 4e185e16f241e082e05619ff24ab9d107965e4a0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 20 Mar 2020 10:17:29 -0400
Subject: [PATCH 188/397] Marking methods const that should not be changing the
 object (#393)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Observable.cpp        |  8 ++++----
 Source/SIMPLib/Common/Observable.h          | 10 +++++-----
 Source/SIMPLib/Filtering/AbstractFilter.cpp |  6 +++---
 Source/SIMPLib/Filtering/AbstractFilter.h   |  6 +++---
 Source/SIMPLib/Filtering/FilterPipeline.cpp |  6 +++---
 Source/SIMPLib/Filtering/FilterPipeline.h   |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index 88c281625a..3aa037ec92 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -110,7 +110,7 @@ void Observable::setWarningConditionWithPrefix(int code, const QString &prefix,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyStatusMessage(const QString& messageText)
+void Observable::notifyStatusMessage(const QString& messageText) const
 {
   GenericStatusMessage::Pointer pm = GenericStatusMessage::New(messageText);
   emit messageGenerated(pm);
@@ -119,7 +119,7 @@ void Observable::notifyStatusMessage(const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyStatusMessageWithPrefix(const QString &prefix, const QString &messageText)
+void Observable::notifyStatusMessageWithPrefix(const QString& prefix, const QString& messageText) const
 {
   QString msg = messageText;
   msg.prepend(tr("%1 - ").arg(prefix));
@@ -130,7 +130,7 @@ void Observable::notifyStatusMessageWithPrefix(const QString &prefix, const QStr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyProgressMessage(int progress, const QString& messageText)
+void Observable::notifyProgressMessage(int progress, const QString& messageText) const
 {
   GenericProgressMessage::Pointer pm = GenericProgressMessage::New(messageText, progress);
   emit messageGenerated(pm);
@@ -139,7 +139,7 @@ void Observable::notifyProgressMessage(int progress, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::notifyProgressMessageWithPrefix(int progress, const QString &prefix, const QString &messageText)
+void Observable::notifyProgressMessageWithPrefix(int progress, const QString& prefix, const QString& messageText) const
 {
   QString msg = messageText;
   msg.prepend(tr("%1: ").arg(prefix));
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index e49d2184a5..713f0ccc30 100755
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -95,13 +95,13 @@ class SIMPLib_EXPORT Observable : public QObject
 
     void setWarningConditionWithPrefix(int code, const QString &prefix, const QString& messageText);
 
-    virtual void notifyStatusMessage(const QString& messageText);
+    virtual void notifyStatusMessage(const QString& messageText) const;
 
-    void notifyStatusMessageWithPrefix(const QString &prefix, const QString& messageText);
+    void notifyStatusMessageWithPrefix(const QString& prefix, const QString& messageText) const;
 
-    virtual void notifyProgressMessage(int progress, const QString& messageText);
+    virtual void notifyProgressMessage(int progress, const QString& messageText) const;
 
-    void notifyProgressMessageWithPrefix(int progress, const QString &prefix, const QString& messageText);
+    void notifyProgressMessageWithPrefix(int progress, const QString& prefix, const QString& messageText) const;
 
   signals:
 
@@ -109,7 +109,7 @@ class SIMPLib_EXPORT Observable : public QObject
      * @brief messageGenerated This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
      * @param msg
      */
-    void messageGenerated(const AbstractMessage::Pointer& msg);
+    void messageGenerated(const AbstractMessage::Pointer& msg) const;
 
   private:
 };
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index d825fde299..0607cb3558 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -404,7 +404,7 @@ QJsonObject AbstractFilter::toJson()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool AbstractFilter::getCancel()
+bool AbstractFilter::getCancel() const
 {
   return m_Cancel;
 }
@@ -546,7 +546,7 @@ void AbstractFilter::setErrorCondition(int code, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyStatusMessage(const QString& messageText)
+void AbstractFilter::notifyStatusMessage(const QString& messageText) const
 {
   FilterStatusMessage::Pointer pm = FilterStatusMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText);
   emit messageGenerated(pm);
@@ -565,7 +565,7 @@ void AbstractFilter::setWarningCondition(int code, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractFilter::notifyProgressMessage(int progress, const QString& messageText)
+void AbstractFilter::notifyProgressMessage(int progress, const QString& messageText) const
 {
   FilterProgressMessage::Pointer pm = FilterProgressMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, progress);
   emit messageGenerated(pm);
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 6b2082f695..0a7a1b9a3c 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -438,14 +438,14 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * @brief notifyStatusMessage
    * @param messageText
    */
-  void notifyStatusMessage(const QString& messageText) override;
+  void notifyStatusMessage(const QString& messageText) const override;
 
   /**
    * @brief notifyProgressMessage
    * @param progress
    * @param messageText
    */
-  void notifyProgressMessage(int progress, const QString& messageText) override;
+  void notifyProgressMessage(int progress, const QString& messageText) const override;
 
   /**
    * @brief notifyMissingProperty
@@ -466,7 +466,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * @brief getCancel Returns if the filter has been cancelled.
    * @return
    */
-  virtual bool getCancel();
+  virtual bool getCancel() const;
 
   /**
    * @brief copyFilterParameterInstanceVariables
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index aceaf08ad6..78ea29c745 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -111,7 +111,7 @@ FilterPipeline::~FilterPipeline() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString FilterPipeline::getName()
+QString FilterPipeline::getName() const
 {
   return m_PipelineName;
 }
@@ -630,7 +630,7 @@ void FilterPipeline::setErrorCondition(int code, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterPipeline::notifyStatusMessage(const QString& messageText)
+void FilterPipeline::notifyStatusMessage(const QString& messageText) const
 {
   PipelineStatusMessage::Pointer pm = PipelineStatusMessage::New(getName(), messageText);
   emit messageGenerated(pm);
@@ -649,7 +649,7 @@ void FilterPipeline::setWarningCondition(int code, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterPipeline::notifyProgressMessage(int progress, const QString& messageText)
+void FilterPipeline::notifyProgressMessage(int progress, const QString& messageText) const
 {
   PipelineProgressMessage::Pointer pm = PipelineProgressMessage::New(getName(), messageText, progress);
   emit messageGenerated(pm);
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 4d13cc2378..1c10f1da53 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -235,7 +235,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   void connectFilterNotifications(AbstractFilter* filter);
   void disconnectFilterNotifications(AbstractFilter* filter);
 
-  QString getName();
+  QString getName() const;
 
   /**
    * @brief setErrorCondition
@@ -255,14 +255,14 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
    * @brief notifyStatusMessage
    * @param messageText
    */
-  void notifyStatusMessage(const QString& messageText) override;
+  void notifyStatusMessage(const QString& messageText) const override;
 
   /**
    * @brief notifyProgressMessage
    * @param progress
    * @param messageText
    */
-  void notifyProgressMessage(int progress, const QString& messageText) override;
+  void notifyProgressMessage(int progress, const QString& messageText) const override;
 
   /**
    * @brief clearErrorCondition

From e440f87877dc4b158e36d322318a75dab9fca286 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 20 Mar 2020 14:09:56 -0400
Subject: [PATCH 189/397] Code cleanup of H5Lite::writeVectorDataset for const
 correctness.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/H5Support/H5Lite.h              | 16 ++++------------
 Source/SIMPLib/DataArrays/IDataArray.h |  4 ----
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Source/H5Support/H5Lite.h b/Source/H5Support/H5Lite.h
index 4a716b3e49..98212f7de2 100644
--- a/Source/H5Support/H5Lite.h
+++ b/Source/H5Support/H5Lite.h
@@ -257,10 +257,7 @@ namespace H5Support_NAMESPACE
        * pass H5T_NATIVE_UINT8 as the dataType.
        */
       template <typename T>
-      static herr_t writeVectorDataset (hid_t loc_id,
-                                        const std::string& dsetName,
-                                        std::vector<hsize_t>& dims,
-                                        std::vector<T>& data)
+      static herr_t writeVectorDataset(hid_t loc_id, const std::string& dsetName, const std::vector<hsize_t>& dims, const std::vector<T>& data)
       {
         H5SUPPORT_MUTEX_LOCK()
 
@@ -276,13 +273,8 @@ namespace H5Support_NAMESPACE
         }
         //Create the DataSpace
         std::vector<uint64_t>::size_type size = dims.size();
-        //std::vector<hsize_t> _dims(size, 0);
-        std::vector<hsize_t> _dims(size, 0);
-        for (std::vector<uint64_t>::size_type i = 0; i < size; ++i)
-        {
-          _dims[i] = static_cast<hsize_t>(dims[i]);
-        }
-        sid = H5Screate_simple( static_cast<int>(size), &(_dims.front()), nullptr );
+
+        sid = H5Screate_simple(static_cast<int>(size), dims.data(), nullptr);
         if (sid < 0)
         {
           return -101;
@@ -291,7 +283,7 @@ namespace H5Support_NAMESPACE
         did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
         if ( did >= 0 )
         {
-          err = H5Dwrite( did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &(data.front()) );
+          err = H5Dwrite(did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data.data());
           if (err < 0 )
           {
             std::cout << "Error Writing Data" << std::endl;
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 7e033b2942..4030f9a275 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -12,7 +12,6 @@
 
 //-- C++
 #include <memory>
-
 #include <vector>
 
 #include <hdf5.h>
@@ -20,12 +19,9 @@
 //--Qt Includes
 #include <QtCore/QString>
 #include <QtCore/QtDebug>
-
-// SIMPLib Includes
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataContainers/IDataStructureNode.h"
 
 class IDataArray;

From af4140bc946fef11d1cd7364d764bd94aaf5894e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 27 Mar 2020 14:55:39 -0400
Subject: [PATCH 190/397] # Merge Python wrapping macro changes

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/EnsembleInfo.h          |  9 +-
 Source/SIMPLib/Common/Observable.h            |  7 +-
 Source/SIMPLib/Common/SIMPLPythonMacros.h     | 20 ++--
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   | 20 ++--
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  | 12 +--
 Source/SIMPLib/CoreFilters/Breakpoint.h       |  7 +-
 .../CoreFilters/CombineAttributeArrays.h      | 11 +--
 .../CoreFilters/CombineAttributeMatrices.h    | 13 +--
 .../SIMPLib/CoreFilters/ConditionalSetValue.h | 10 +-
 .../CoreFilters/ConvertColorToGrayScale.h     | 14 +--
 Source/SIMPLib/CoreFilters/ConvertData.h      | 10 +-
 .../CopyFeatureArrayToElementArray.h          | 10 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       | 12 +--
 .../CoreFilters/CreateAttributeMatrix.h       | 10 +-
 Source/SIMPLib/CoreFilters/CreateDataArray.h  | 13 +--
 .../SIMPLib/CoreFilters/CreateDataContainer.h |  8 +-
 .../CreateFeatureArrayFromElementArray.h      | 11 +--
 Source/SIMPLib/CoreFilters/CreateGeometry.h   | 41 +-------
 .../SIMPLib/CoreFilters/CreateImageGeometry.h | 11 +--
 .../SIMPLib/CoreFilters/CreateStringArray.h   | 10 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  | 15 +--
 .../SIMPLib/CoreFilters/DataContainerReader.h | 13 +--
 .../SIMPLib/CoreFilters/DataContainerWriter.h | 10 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |  7 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |  8 +-
 .../ExtractAttributeArraysFromGeometry.h      | 22 +----
 .../CoreFilters/ExtractComponentAsArray.h     | 10 +-
 .../CoreFilters/ExtractVertexGeometry.h       | 11 +--
 .../CoreFilters/FeatureCountDecision.h        |  9 +-
 .../CoreFilters/FeatureDataCSVWriter.h        | 12 +--
 Source/SIMPLib/CoreFilters/FileWriter.h       |  8 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |  9 +-
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |  7 +-
 .../CoreFilters/GenerateTiltSeries.cpp        |  3 -
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  | 21 ++--
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h | 13 +--
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   | 11 +--
 Source/SIMPLib/CoreFilters/InitializeData.h   | 18 +---
 .../LinkFeatureMapToElementArray.h            | 10 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |  9 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |  8 +-
 Source/SIMPLib/CoreFilters/MoveData.h         | 12 +--
 Source/SIMPLib/CoreFilters/MoveMultiData.h    | 12 +--
 .../CoreFilters/MultiThresholdObjects.h       |  9 +-
 .../CoreFilters/MultiThresholdObjects2.h      |  9 +-
 .../SIMPLib/CoreFilters/PipelineAnnotation.h  |  8 +-
 Source/SIMPLib/CoreFilters/PostSlackMessage.h | 11 +--
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  | 13 +--
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |  8 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |  8 +-
 .../CoreFilters/RemoveComponentFromArray.h    | 12 +--
 .../CoreFilters/RenameAttributeArray.h        |  9 +-
 .../CoreFilters/RenameAttributeMatrix.h       |  9 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |  9 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h | 10 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  | 10 +-
 .../CoreFilters/RotateSampleRefFrame.h        | 11 +--
 Source/SIMPLib/CoreFilters/ScaleVolume.h      | 12 +--
 .../SetOriginResolutionImageGeom.h            | 12 +--
 Source/SIMPLib/CoreFilters/SourceList.cmake   |  5 +
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |  9 +-
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |  8 ++
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   | 14 +--
 .../CoreFilters/WriteTriangleGeometry.h       | 10 +-
 .../CoreFilters/util/ASCIIWizardData.hpp      |  2 +-
 Source/SIMPLib/DataArrays/IDataArray.h        |  8 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  | 72 +++++++-------
 Source/SIMPLib/DataArrays/StatsDataArray.h    | 10 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |  9 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  9 +-
 .../DataContainers/AttributeMatrixProxy.h     |  7 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h |  8 +-
 .../SIMPLib/DataContainers/DataArrayProxy.h   |  8 +-
 Source/SIMPLib/DataContainers/DataContainer.h | 14 +--
 .../DataContainers/DataContainerArray.h       | 16 +--
 .../DataContainers/DataContainerArrayProxy.h  |  7 +-
 .../DataContainers/DataContainerProxy.h       |  7 +-
 .../FilterParameters/DynamicTableData.h       |  7 +-
 Source/SIMPLib/Filtering/AbstractComparison.h |  7 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |  8 +-
 Source/SIMPLib/Filtering/ComparisonInputs.h   | 17 ++--
 .../Filtering/ComparisonInputsAdvanced.h      | 13 +--
 Source/SIMPLib/Filtering/ComparisonSet.h      |  7 +-
 Source/SIMPLib/Filtering/ComparisonValue.h    |  8 +-
 Source/SIMPLib/Filtering/FilterPipeline.h     |  8 +-
 Source/SIMPLib/Geometry/EdgeGeom.h            | 14 +--
 Source/SIMPLib/Geometry/IGeometry.h           |  9 +-
 Source/SIMPLib/Geometry/IGeometry2D.h         |  7 +-
 Source/SIMPLib/Geometry/IGeometryGrid.h       |  7 +-
 Source/SIMPLib/Geometry/ImageGeom.h           | 13 +--
 Source/SIMPLib/Geometry/QuadGeom.h            | 15 +--
 Source/SIMPLib/Geometry/TriangleGeom.h        | 13 +--
 Source/SIMPLib/Geometry/VertexGeom.h          | 13 +--
 Source/SIMPLib/SIMPLibMacros.cmake            |  2 +-
 .../SIMPLib/StatsData/BoundaryStatsData.cpp   | 12 +--
 Source/SIMPLib/StatsData/BoundaryStatsData.h  |  5 -
 Source/SIMPLib/StatsData/MatrixStatsData.cpp  | 12 +--
 Source/SIMPLib/StatsData/MatrixStatsData.h    |  5 -
 .../StatsData/PrecipitateStatsData.cpp        | 22 +----
 .../SIMPLib/StatsData/PrecipitateStatsData.h  | 97 +++++++++----------
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp | 16 +--
 Source/SIMPLib/StatsData/PrimaryStatsData.h   | 24 ++---
 Source/SIMPLib/StatsData/StatsData.cpp        | 14 +--
 Source/SIMPLib/StatsData/StatsData.h          | 20 ++--
 .../StatsData/TransformationStatsData.cpp     | 17 +---
 .../StatsData/TransformationStatsData.h       | 27 +++---
 .../TestFilters/ArraySelectionExample.h       |  9 +-
 .../SIMPLib/TestFilters/DynamicTableExample.h | 13 +--
 .../SIMPLib/TestFilters/ErrorWarningFilter.h  | 12 +--
 Source/SIMPLib/TestFilters/GenericExample.h   | 50 +---------
 .../SIMPLib/TestFilters/MakeDataContainer.h   | 12 +--
 Source/SIMPLib/TestFilters/ThresholdExample.h |  8 +-
 Source/SIMPLib/Utilities/MontageSelection.h   |  7 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h  |  8 +-
 .../Utilities/SIMPLH5DataReaderRequirements.h |  7 +-
 Wrapping/Python/Pybind11/CMakeLists.txt       |  4 -
 .../CodeScraper/CodeScraperConstants.h        |  2 +-
 .../CodeScraper/PyBind11Generator.cpp         |  2 +-
 118 files changed, 544 insertions(+), 929 deletions(-)

diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index ea095c47d3..0f28331e06 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -54,16 +54,15 @@ class SIMPLib_EXPORT EnsembleInfo : public QObject
 {
   Q_OBJECT
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(EnsembleInfo)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(EnsembleInfo)
   PYB11_CREATION()
   PYB11_METHOD(void addValues ARGS const,CrystalStructure const,PhaseType::Type const,QString)
   PYB11_METHOD(void getValues ARGS size_t CrystalStructure& PhaseType::Type& QString&)
   PYB11_METHOD(void remove ARGS size_t)
   PYB11_METHOD(void clear)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 public:
   using EnumType = uint32_t;
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index 713f0ccc30..d01f4d0efd 100755
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -54,8 +54,8 @@ class SIMPLib_EXPORT Observable : public QObject
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(Observable)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(Observable)
     PYB11_METHOD(void setErrorCondition ARGS code messageText)
     PYB11_METHOD(void setErrorConditionWithPrefix ARGS code prefix messageText)
     PYB11_METHOD(void setWarningCondition ARGS code messageText)
@@ -64,7 +64,8 @@ class SIMPLib_EXPORT Observable : public QObject
     PYB11_METHOD(void notifyStatusMessageWithPrefix ARGS prefix messageText)
     PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
     PYB11_METHOD(void notifyProgressMessageWithPrefix ARGS progress prefix messageText)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     /**
diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
index e4e8d40c7b..6018d60698 100644
--- a/Source/SIMPLib/Common/SIMPLPythonMacros.h
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -40,16 +40,24 @@
  */
 
 /**
- * @brief PYB11_CREATE_BINDINGS This macro lets the wrapper know that we want to
+ * @brief PYB11_BEGIN_BINDINGS This macro lets the wrapper know that we want to
  * wrap this class with Python bindings. It should only take a single argument
  * which is the name of the class. If this line is commented out using the standard
  * C++ style of single line comment then <b>NO WRAPPING</b> will be performed
  * on the class.
  * @code
- * PYB11_CREATE_BINDINGS(AbstractFilter)
+ * PYB11_BEGIN_BINDINGS(AbstractFilter)
  * @endcode
  */
-#define PYB11_CREATE_BINDINGS(...)
+#define PYB11_BEGIN_BINDINGS(...)
+
+/**
+ * @brief PYB11_END_BINDINGS This macro is used to define the end of the python bindings section
+ * @code
+ * PYB11_END_BINDINGS(AbstractFilter)
+ * @endcode
+ */
+#define PYB11_END_BINDINGS(...)
 
 /**
  * @brief PYB11_STATIC_NEW_MACRO
@@ -69,12 +77,6 @@
  */
 #define PYB11_SHARED_POINTERS(...)
 
-/**
- * @brief PYB11_FILTER_PARAMETER
- *
- */
-#define PYB11_FILTER_PARAMETER(...)
-
 /**
  * @brief PYB11_NO_BINDINGS This macro will ensure that the class is NOT wrapped
  * with python bindings. Only a single argument which is the name of the class
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index d5071c9d57..23207ce62f 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -342,16 +342,16 @@ public:
  */
 
 /**
-* @brief PYB11_CREATE_BINDINGS This macro lets the wrapper know that we want to
-* wrap this class with Python bindings. It should only take a single argument
-* which is the name of the class. If this line is commented out using the standard
-* C++ style of single line comment then <b>NO WRAPPING</b> will be performed
-* on the class.
-* @code
-* PYB11_CREATE_BINDINGS(AbstractFilter)
-* @endcode
-*/
-#define PYB11_CREATE_BINDINGS(...)
+ * @brief PYB11_BEGIN_BINDINGS This macro lets the wrapper know that we want to
+ * wrap this class with Python bindings. It should only take a single argument
+ * which is the name of the class. If this line is commented out using the standard
+ * C++ style of single line comment then <b>NO WRAPPING</b> will be performed
+ * on the class.
+ * @code
+ * PYB11_BEGIN_BINDINGS(AbstractFilter)
+ * @endcode
+ */
+#define PYB11_BEGIN_BINDINGS(...)
 
 /**
 * @brief PYB11_NO_BINDINGS This macro will ensure that the class is NOT wrapped
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index ae2b9e2f46..5e25620331 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -60,21 +60,17 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ArrayCalculator)
     PYB11_FILTER_NEW_MACRO(ArrayCalculator)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
-    PYB11_FILTER_PARAMETER(QString, InfixEquation)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CalculatedArray)
-    PYB11_FILTER_PARAMETER(ArrayCalculator::AngleUnits, Units)
-    PYB11_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
     PYB11_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
     PYB11_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
     PYB11_PROPERTY(ArrayCalculator::AngleUnits Units READ getUnits WRITE setUnits)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     enum AngleUnits
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 5fda1e31a6..aec1bc5b43 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -50,11 +50,12 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(Breakpoint SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(Breakpoint SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(Breakpoint)
   PYB11_FILTER_NEW_MACRO(Breakpoint)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = Breakpoint;
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 32ab23b27f..aaf454c68e 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -50,18 +50,15 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(CombineAttributeArrays SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CombineAttributeArrays SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(CombineAttributeArrays)
   PYB11_FILTER_NEW_MACRO(CombineAttributeArrays)
-  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
-  PYB11_FILTER_PARAMETER(QString, StackedDataArrayName)
-  PYB11_FILTER_PARAMETER(bool, NormalizeData)
-  PYB11_FILTER_PARAMETER(bool, MoveValues)
   PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
   PYB11_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
   PYB11_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = CombineAttributeArrays;
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index dc6f1585b8..5d82ede71d 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -49,23 +49,18 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CombineAttributeMatrices)
     PYB11_FILTER_NEW_MACRO(CombineAttributeMatrices)
-    PYB11_FILTER_PARAMETER(DataArrayPath, FirstAttributeMatrixPath)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SecondAttributeMatrixPath)
-    PYB11_FILTER_PARAMETER(DataArrayPath, FirstIndexArrayPath)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SecondIndexArrayPath)
-    PYB11_FILTER_PARAMETER(QString, CombinedAttributeMatrixName)
-    PYB11_FILTER_PARAMETER(QString, NewIndexArrayName)
     PYB11_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
     PYB11_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
     PYB11_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
     PYB11_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
     PYB11_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
     PYB11_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CombineAttributeMatrices;
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index 5579f4cbfb..cdd7b464c0 100755
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -50,17 +50,15 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ConditionalSetValue)
     PYB11_FILTER_NEW_MACRO(ConditionalSetValue)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
-    PYB11_FILTER_PARAMETER(DataArrayPath, ConditionalArrayPath)
-    PYB11_FILTER_PARAMETER(double, ReplaceValue)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
     PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ConditionalSetValue;
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index d484f224d7..e99cc546c2 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -47,17 +47,10 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ConvertColorToGrayScale)
   PYB11_FILTER_NEW_MACRO(ConvertColorToGrayScale)
-  PYB11_FILTER_PARAMETER(int, ConversionAlgorithm)
-  PYB11_FILTER_PARAMETER(FloatVec3Type, ColorWeights)
-  PYB11_FILTER_PARAMETER(int, ColorChannel)
-  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, InputDataArrayVector)
-  PYB11_FILTER_PARAMETER(bool, CreateNewAttributeMatrix)
-  PYB11_FILTER_PARAMETER(QString, OutputAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(QString, OutputArrayPrefix)
   PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
   PYB11_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
   PYB11_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
@@ -65,7 +58,8 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   PYB11_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
   PYB11_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
   PYB11_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ConvertColorToGrayScale;
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 9bb47afc2a..164033ed83 100755
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -49,17 +49,15 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ConvertData)
     PYB11_FILTER_NEW_MACRO(ConvertData)
-    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
-    PYB11_FILTER_PARAMETER(QString, OutputArrayName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ConvertData;
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 2cef49682c..6277787d26 100755
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -52,17 +52,15 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CopyFeatureArrayToElementArray)
     PYB11_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedFeatureArrayPath)
-    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
-    PYB11_FILTER_PARAMETER(QString, CreatedArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
     PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CopyFeatureArrayToElementArray;
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index efdd14c828..74facf9878 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -47,21 +47,17 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(CopyObject SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CopyObject SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(CopyObject)
   PYB11_FILTER_NEW_MACRO(CopyObject)
-  PYB11_FILTER_PARAMETER(int, ObjectToCopy)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerToCopy)
-  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixToCopy)
-  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeArrayToCopy)
-  PYB11_FILTER_PARAMETER(QString, CopiedObjectName)
   PYB11_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
   PYB11_PROPERTY(DataArrayPath DataContainerToCopy READ getDataContainerToCopy WRITE setDataContainerToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixToCopy READ getAttributeMatrixToCopy WRITE setAttributeMatrixToCopy)
   PYB11_PROPERTY(DataArrayPath AttributeArrayToCopy READ getAttributeArrayToCopy WRITE setAttributeArrayToCopy)
   PYB11_PROPERTY(QString CopiedObjectName READ getCopiedObjectName WRITE setCopiedObjectName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = CopyObject;
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index fdc2c7d507..8983cca7e4 100755
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -49,17 +49,15 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateAttributeMatrix)
     PYB11_FILTER_NEW_MACRO(CreateAttributeMatrix)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
-    PYB11_FILTER_PARAMETER(int, AttributeMatrixType)
-    PYB11_FILTER_PARAMETER(DynamicTableData, TupleDimensions)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
     PYB11_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
     PYB11_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateAttributeMatrix;
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index 06026bef77..0c47d2b820 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -53,23 +53,18 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateDataArray)
     PYB11_FILTER_NEW_MACRO(CreateDataArray)
-    PYB11_FILTER_PARAMETER(SIMPL::ScalarTypes::Type, ScalarType)
-    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
-    PYB11_FILTER_PARAMETER(DataArrayPath, NewArray)
-    PYB11_FILTER_PARAMETER(int, InitializationType)
-    PYB11_FILTER_PARAMETER(QString, InitializationValue)
-    PYB11_FILTER_PARAMETER(FPRangePair, InitializationRange)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
     PYB11_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
     PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
     PYB11_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateDataArray;
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index d392870063..d57f384fd5 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -48,13 +48,13 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateDataContainer)
     PYB11_FILTER_NEW_MACRO(CreateDataContainer)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateDataContainer;
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 12d73cddd1..35b20d8352 100755
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -52,19 +52,16 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
     PYB11_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
-    PYB11_FILTER_PARAMETER(QString, CreatedArrayName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
     PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateFeatureArrayFromElementArray;
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 2592638b57..540d995c6d 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -48,44 +48,10 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(CreateGeometry SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateGeometry SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(CreateGeometry)
   PYB11_FILTER_NEW_MACRO(CreateGeometry)
-  PYB11_FILTER_PARAMETER(int, GeometryType)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
-  PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
-  PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
-  PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
-  PYB11_FILTER_PARAMETER(QString, ImageCellAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(QString, RectGridCellAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName0)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName1)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName2)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName3)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName4)
-  PYB11_FILTER_PARAMETER(QString, VertexAttributeMatrixName5)
-  PYB11_FILTER_PARAMETER(QString, EdgeAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(QString, FaceAttributeMatrixName0)
-  PYB11_FILTER_PARAMETER(QString, FaceAttributeMatrixName1)
-  PYB11_FILTER_PARAMETER(QString, TetCellAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(QString, HexCellAttributeMatrixName)
-  PYB11_FILTER_PARAMETER(bool, TreatWarningsAsErrors)
-  PYB11_FILTER_PARAMETER(bool, ArrayHandling)
   PYB11_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
@@ -116,7 +82,8 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   PYB11_PROPERTY(QString TetCellAttributeMatrixName READ getTetCellAttributeMatrixName WRITE setTetCellAttributeMatrixName)
   PYB11_PROPERTY(bool TreatWarningsAsErrors READ getTreatWarningsAsErrors WRITE setTreatWarningsAsErrors)
   PYB11_PROPERTY(bool ArrayHandling READ getArrayHandling WRITE setArrayHandling)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = CreateGeometry;
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index aa3a434163..86e95ceb62 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -50,19 +50,16 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateImageGeometry)
     PYB11_FILTER_NEW_MACRO(CreateImageGeometry)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainer)
-    PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
-    PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
-    PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
     PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
     PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
     PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateImageGeometry;
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 5fcdb25f24..b11bbf4a34 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -49,17 +49,15 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(CreateStringArray)
     PYB11_FILTER_NEW_MACRO(CreateStringArray)
-    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
-    PYB11_FILTER_PARAMETER(DataArrayPath, NewArray)
-    PYB11_FILTER_PARAMETER(QString, InitializationValue)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
     PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = CreateStringArray;
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index c3738eba0b..ea93504aaa 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -47,18 +47,10 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(CropVertexGeometry SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CropVertexGeometry SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(CropVertexGeometry)
   PYB11_FILTER_NEW_MACRO(CropVertexGeometry)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-  PYB11_FILTER_PARAMETER(DataArrayPath, CroppedDataContainerName)
-  PYB11_FILTER_PARAMETER(float, XMin)
-  PYB11_FILTER_PARAMETER(float, YMin)
-  PYB11_FILTER_PARAMETER(float, ZMin)
-  PYB11_FILTER_PARAMETER(float, XMax)
-  PYB11_FILTER_PARAMETER(float, YMax)
-  PYB11_FILTER_PARAMETER(float, ZMax)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath CroppedDataContainerName READ getCroppedDataContainerName WRITE setCroppedDataContainerName)
   PYB11_PROPERTY(float XMin READ getXMin WRITE setXMin)
@@ -67,7 +59,8 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   PYB11_PROPERTY(float XMax READ getXMax WRITE setXMax)
   PYB11_PROPERTY(float YMax READ getYMax WRITE setYMax)
   PYB11_PROPERTY(float ZMax READ getZMax WRITE setZMax)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = CropVertexGeometry;
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 89d54e363f..4873e9e80e 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -59,21 +59,16 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
     
     // This line MUST be first when exposing a class and properties to Python
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(DataContainerReader)
     PYB11_FILTER_NEW_MACRO(DataContainerReader)
-    PYB11_FILTER_PARAMETER(QString, InputFile)
-    PYB11_FILTER_PARAMETER(bool, OverwriteExistingDataContainers)
-    PYB11_FILTER_PARAMETER(QString, LastFileRead)
-    PYB11_FILTER_PARAMETER(QDateTime, LastRead)
-    PYB11_FILTER_PARAMETER(DataContainerArrayProxy, InputFileDataContainerArrayProxy)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
     PYB11_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
     PYB11_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
-
     PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS path)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = DataContainerReader;
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 6b38fe4957..3b2953ac32 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -54,17 +54,15 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
     
     // This line MUST be first when exposing a class and properties to Python
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(DataContainerWriter)
     PYB11_FILTER_NEW_MACRO(DataContainerWriter)
-    PYB11_FILTER_PARAMETER(QString, OutputFile)
-    PYB11_FILTER_PARAMETER(bool, WriteXdmfFile)
-    PYB11_FILTER_PARAMETER(bool, WriteTimeSeries)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
     PYB11_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
     PYB11_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = DataContainerWriter;
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 44fe429b71..a65770595c 100755
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -48,11 +48,12 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(EmptyFilter)
     PYB11_FILTER_NEW_MACRO(EmptyFilter)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = EmptyFilter;
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 46f0d15586..833fa8e288 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -54,13 +54,13 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ExecuteProcess SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ExecuteProcess SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ExecuteProcess)
   PYB11_FILTER_NEW_MACRO(ExecuteProcess)
-  PYB11_FILTER_PARAMETER(QString, Arguments)
   PYB11_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ExecuteProcess;
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 27e783cd6f..74ab153b1a 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -51,25 +51,10 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ExtractAttributeArraysFromGeometry SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ExtractAttributeArraysFromGeometry SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ExtractAttributeArraysFromGeometry)
   PYB11_FILTER_NEW_MACRO(ExtractAttributeArraysFromGeometry)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath0)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath1)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath2)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath3)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath4)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedVertexListArrayPath5)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedEdgeListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTriListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedQuadListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedTetListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SharedHexListArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, XBoundsArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, YBoundsArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, ZBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath0 READ getSharedVertexListArrayPath0 WRITE setSharedVertexListArrayPath0)
   PYB11_PROPERTY(DataArrayPath SharedVertexListArrayPath1 READ getSharedVertexListArrayPath1 WRITE setSharedVertexListArrayPath1)
@@ -83,7 +68,8 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   PYB11_PROPERTY(DataArrayPath XBoundsArrayPath READ getXBoundsArrayPath WRITE setXBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath YBoundsArrayPath READ getYBoundsArrayPath WRITE setYBoundsArrayPath)
   PYB11_PROPERTY(DataArrayPath ZBoundsArrayPath READ getZBoundsArrayPath WRITE setZBoundsArrayPath)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ExtractAttributeArraysFromGeometry;
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index 197d0d18dd..fd32477efc 100755
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -53,17 +53,15 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ExtractComponentAsArray)
     PYB11_FILTER_NEW_MACRO(ExtractComponentAsArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
-    PYB11_FILTER_PARAMETER(int, CompNumber)
-    PYB11_FILTER_PARAMETER(QString, NewArrayArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
     PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ExtractComponentAsArray;
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 71d36345a2..71818d3014 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -50,19 +50,16 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ExtractVertexGeometry SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ExtractVertexGeometry SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ExtractVertexGeometry)
   PYB11_FILTER_NEW_MACRO(ExtractVertexGeometry)
-  PYB11_FILTER_PARAMETER(int, ArrayHandling)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
-  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, IncludedDataArrayPaths)
-  PYB11_FILTER_PARAMETER(DataArrayPath, VertexDataContainerName)
   PYB11_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
   PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
   PYB11_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
   PYB11_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ExtractVertexGeometry;
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 6601870c44..6123168119 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -51,15 +51,14 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(FeatureCountDecision)
     PYB11_STATIC_NEW_MACRO(FeatureCountDecision)
-    PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
-    PYB11_FILTER_PARAMETER(int, MaxGrains)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
     PYB11_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = FeatureCountDecision;
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 64f4289d76..2bf0017d18 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -50,21 +50,17 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(FeatureDataCSVWriter)
     PYB11_FILTER_NEW_MACRO(FeatureDataCSVWriter)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CellFeatureAttributeMatrixPath)
-    PYB11_FILTER_PARAMETER(QString, FeatureDataFile)
-    PYB11_FILTER_PARAMETER(bool, WriteNeighborListData)
-    PYB11_FILTER_PARAMETER(int, DelimiterChoice)
-    PYB11_FILTER_PARAMETER(bool, WriteNumFeaturesLine)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
     PYB11_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
     PYB11_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
     PYB11_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
     PYB11_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = FeatureDataCSVWriter;
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 1fa6c0a8ca..f3c2239c2f 100755
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -47,12 +47,12 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(FileWriter)
-    PYB11_FILTER_PARAMETER(QString, OutputFile)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = FileWriter;
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index dbde6a283c..d6c030a88f 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -53,15 +53,14 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(FindDerivatives SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FindDerivatives SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(FindDerivatives)
   PYB11_FILTER_NEW_MACRO(FindDerivatives)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DerivativesArrayPath)
   PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
   PYB11_PROPERTY(DataArrayPath DerivativesArrayPath READ getDerivativesArrayPath WRITE setDerivativesArrayPath)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = FindDerivatives;
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index e417353699..5e9f989928 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -18,15 +18,16 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(GenerateColorTable SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(GenerateColorTable SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(GenerateColorTable)
   PYB11_FILTER_NEW_MACRO(GenerateColorTable)
   PYB11_PROPERTY(QString SelectedPresetName READ getSelectedPresetName WRITE setSelectedPresetName)
   PYB11_PROPERTY(QJsonArray SelectedPresetControlPoints READ getSelectedPresetControlPoints WRITE setSelectedPresetControlPoints)
   PYB11_PROPERTY(DataArrayPath SelectedDataArrayPath READ getSelectedDataArrayPath WRITE setSelectedDataArrayPath)
   PYB11_PROPERTY(QString RgbArrayName READ getRgbArrayName WRITE setRgbArrayName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = GenerateColorTable;
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 416c036dca..162039f294 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -58,9 +58,6 @@
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/ITK/Dream3DTemplateAliasMacro.h"
-#include "SIMPLib/ITK/SimpleITKEnums.h"
-#include "SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 5acc263b36..56e23ef992 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -47,18 +47,19 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
+  // Start Python bindings declarations
   // clang-format off
-    PYB11_CREATE_BINDINGS(GenerateTiltSeries SUPERCLASS AbstractFilter)
-    PYB11_SHARED_POINTERS(GenerateTiltSeries)
-    PYB11_STATIC_NEW_MACRO(GenerateTiltSeries)
-    PYB11_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
-    PYB11_PROPERTY(float RotationLimits READ getRotationLimits WRITE setRotationLimits)
-    PYB11_PROPERTY(float Spacing READ getSpacing WRITE setSpacing)
-    PYB11_PROPERTY(DataArrayPath InputDataArrayPath READ getInputDataArrayPath WRITE setInputDataArrayPath)
-    PYB11_PROPERTY(QString OutputPrefix READ getOutputPrefix WRITE setOutputPrefix)
+  PYB11_BEGIN_BINDINGS(GenerateTiltSeries SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(GenerateTiltSeries)
+  PYB11_STATIC_NEW_MACRO(GenerateTiltSeries)
+  PYB11_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
+  PYB11_PROPERTY(float RotationLimits READ getRotationLimits WRITE setRotationLimits)
+  PYB11_PROPERTY(float Spacing READ getSpacing WRITE setSpacing)
+  PYB11_PROPERTY(DataArrayPath InputDataArrayPath READ getInputDataArrayPath WRITE setInputDataArrayPath)
+  PYB11_PROPERTY(QString OutputPrefix READ getOutputPrefix WRITE setOutputPrefix)
+  PYB11_END_BINDINGS()
   // clang-format on
-#endif
+  // End Python bindings declarations
 
 public:
   using Self = GenerateTiltSeries;
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 2281c217ba..ef0143e5bb 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -57,23 +57,18 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
     Q_OBJECT
     Q_DECLARE_PRIVATE(ImportAsciDataArray)
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ImportAsciDataArray)
     PYB11_FILTER_NEW_MACRO(ImportAsciDataArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
-    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
-    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
-    PYB11_FILTER_PARAMETER(int, SkipHeaderLines)
-    PYB11_FILTER_PARAMETER(QString, InputFile)
-    PYB11_FILTER_PARAMETER(int, Delimiter)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
     PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ImportAsciDataArray;
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 4435eef4d7..5768162fcb 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -51,19 +51,16 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ImportHDF5Dataset SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ImportHDF5Dataset SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ImportHDF5Dataset)
   PYB11_FILTER_NEW_MACRO(ImportHDF5Dataset)
-  PYB11_FILTER_PARAMETER(QString, HDF5FilePath)
-  PYB11_FILTER_PARAMETER(QList<ImportHDF5Dataset::DatasetImportInfo>, DatasetImportInfoList)
-  PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrix)
-  PYB11_FILTER_PARAMETER(QStringList, DatasetPathsWithErrors)
   PYB11_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
   PYB11_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
   PYB11_PROPERTY(QList<ImportHDF5Dataset::DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
   PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ImportHDF5Dataset;
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 28b02c83e7..5e0e89f0ac 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -53,21 +53,10 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(InitializeData)
   PYB11_FILTER_NEW_MACRO(InitializeData)
-  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, CellAttributeMatrixPaths)
-  PYB11_FILTER_PARAMETER(int, XMin)
-  PYB11_FILTER_PARAMETER(int, YMin)
-  PYB11_FILTER_PARAMETER(int, ZMin)
-  PYB11_FILTER_PARAMETER(int, XMax)
-  PYB11_FILTER_PARAMETER(int, YMax)
-  PYB11_FILTER_PARAMETER(int, ZMax)
-  PYB11_FILTER_PARAMETER(int, InitType)
-  PYB11_FILTER_PARAMETER(bool, Random)
-  PYB11_FILTER_PARAMETER(double, InitValue)
-  PYB11_FILTER_PARAMETER(FPRangePair, InitRange)
   PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
   PYB11_PROPERTY(int XMin READ getXMin WRITE setXMin)
   PYB11_PROPERTY(int YMin READ getYMin WRITE setYMin)
@@ -79,7 +68,8 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   PYB11_PROPERTY(bool Random READ getRandom WRITE setRandom)
   PYB11_PROPERTY(double InitValue READ getInitValue WRITE setInitValue)
   PYB11_PROPERTY(FPRangePair InitRange READ getInitRange WRITE setInitRange)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = InitializeData;
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index 83f110343b..6a56571b84 100755
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -49,17 +49,15 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(LinkFeatureMapToElementArray)
     PYB11_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
-    PYB11_FILTER_PARAMETER(QString, CellFeatureAttributeMatrixName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedCellArrayPath)
-    PYB11_FILTER_PARAMETER(QString, ActiveArrayName)
     PYB11_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
     PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
     PYB11_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = LinkFeatureMapToElementArray;
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 6cbacc2b42..3b417e228c 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -51,15 +51,14 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(MaskCountDecision)
     PYB11_STATIC_NEW_MACRO(MaskCountDecision)
-    PYB11_FILTER_PARAMETER(DataArrayPath, MaskArrayPath)
-    PYB11_FILTER_PARAMETER(int, NumberOfTrues)
     PYB11_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
     PYB11_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = MaskCountDecision;
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index e6e10c5135..e8c77f40e0 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -48,13 +48,13 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(MassCreateData)
   PYB11_FILTER_NEW_MACRO(MassCreateData)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = MassCreateData;
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index 4d55a90c8d..47f451e8bb 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -48,21 +48,17 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(MoveData SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(MoveData SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(MoveData)
     PYB11_FILTER_NEW_MACRO(MoveData)
-    PYB11_FILTER_PARAMETER(int, WhatToMove)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
-    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixSource)
-    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataArraySource)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
     PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = MoveData;
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 256c6dd0c0..0e609c0b19 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -48,21 +48,17 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(MoveMultiData)
     PYB11_FILTER_NEW_MACRO(MoveMultiData)
-    PYB11_FILTER_PARAMETER(int, WhatToMove)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerDestination)
-    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, AttributeMatrixSources)
-    PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixDestination)
-    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, DataArraySources)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
     PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
     PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
     PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = MoveMultiData;
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index 0ab9b849fc..bef9b525b3 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -50,15 +50,14 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(MultiThresholdObjects)
     PYB11_FILTER_NEW_MACRO(MultiThresholdObjects)
-    PYB11_FILTER_PARAMETER(QString, DestinationArrayName)
-    PYB11_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
     PYB11_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = MultiThresholdObjects;
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 26ca4f95fa..8c7581a416 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -52,15 +52,14 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(MultiThresholdObjects2)
     PYB11_FILTER_NEW_MACRO(MultiThresholdObjects2)
-    PYB11_FILTER_PARAMETER(QString, DestinationArrayName)
-    PYB11_FILTER_PARAMETER(ComparisonInputsAdvanced, SelectedThresholds)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
     PYB11_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = MultiThresholdObjects2;
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index ef67ae514c..58cb61f45d 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -45,13 +45,13 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(PipelineAnnotation SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(PipelineAnnotation SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(PipelineAnnotation)
   PYB11_FILTER_NEW_MACRO(PipelineAnnotation)
-  PYB11_FILTER_PARAMETER(QString, Summary)
   PYB11_PROPERTY(QString Summary READ getSummary WRITE setSummary)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = PipelineAnnotation;
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index 9ae88ebdaf..e8a9f47e5b 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -50,19 +50,16 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(PostSlackMessage SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(PostSlackMessage SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(PostSlackMessage)
   PYB11_FILTER_NEW_MACRO(PostSlackMessage)
-  PYB11_FILTER_PARAMETER(QString, SlackUser)
-  PYB11_FILTER_PARAMETER(QString, SlackUrl)
-  PYB11_FILTER_PARAMETER(QString, SlackMessage)
-  PYB11_FILTER_PARAMETER(bool, WarningsAsError)
   PYB11_PROPERTY(QString SlackUser READ getSlackUser WRITE setSlackUser)
   PYB11_PROPERTY(QString SlackUrl READ getSlackUrl WRITE setSlackUrl)
   PYB11_PROPERTY(QString SlackMessage READ getSlackMessage WRITE setSlackMessage)
   PYB11_PROPERTY(bool WarningsAsError READ getWarningsAsError WRITE setWarningsAsError)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = PostSlackMessage;
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index f637a073a9..9e7e39fac8 100755
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -52,23 +52,18 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RawBinaryReader)
     PYB11_FILTER_NEW_MACRO(RawBinaryReader)
-    PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeArrayPath)
-    PYB11_FILTER_PARAMETER(SIMPL::NumericTypes::Type, ScalarType)
-    PYB11_FILTER_PARAMETER(int, Endian)
-    PYB11_FILTER_PARAMETER(int, NumberOfComponents)
-    PYB11_FILTER_PARAMETER(uint64_t, SkipHeaderBytes)
-    PYB11_FILTER_PARAMETER(QString, InputFile)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
     PYB11_PROPERTY(int Endian READ getEndian WRITE setEndian)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
     PYB11_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RawBinaryReader;
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 1076357926..c1fc128be4 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -49,13 +49,13 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ReadASCIIData SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ReadASCIIData SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ReadASCIIData)
   PYB11_FILTER_NEW_MACRO(ReadASCIIData)
-  PYB11_FILTER_PARAMETER(ASCIIWizardData, WizardData)
   PYB11_PROPERTY(ASCIIWizardData WizardData READ getWizardData WRITE setWizardData)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ReadASCIIData;
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index 0c5e9df09d..e94910dd39 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -49,13 +49,13 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RemoveArrays)
     PYB11_FILTER_NEW_MACRO(RemoveArrays)
-    PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DataArraysToRemove)
     PYB11_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RemoveArrays;
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index 7617373769..cc2c144a2d 100755
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -51,21 +51,17 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RemoveComponentFromArray)
     PYB11_FILTER_NEW_MACRO(RemoveComponentFromArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
-    PYB11_FILTER_PARAMETER(int, CompNumber)
-    PYB11_FILTER_PARAMETER(bool, SaveRemovedComponent)
-    PYB11_FILTER_PARAMETER(QString, NewArrayArrayName)
-    PYB11_FILTER_PARAMETER(QString, ReducedArrayArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
     PYB11_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
     PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
     PYB11_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RemoveComponentFromArray;
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index c66589b048..e5b69aee6e 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -48,15 +48,14 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RenameAttributeArray)
     PYB11_FILTER_NEW_MACRO(RenameAttributeArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArrayPath)
-    PYB11_FILTER_PARAMETER(QString, NewArrayName)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
     PYB11_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RenameAttributeArray;
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index 7b27145a4e..f1480716df 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -48,15 +48,14 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RenameAttributeMatrix)
     PYB11_FILTER_NEW_MACRO(RenameAttributeMatrix)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedAttributeMatrixPath)
-    PYB11_FILTER_PARAMETER(QString, NewAttributeMatrix)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
     PYB11_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RenameAttributeMatrix;
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 6d39ef13fc..699261fab4 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -48,15 +48,14 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RenameDataContainer)
     PYB11_FILTER_NEW_MACRO(RenameDataContainer)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedDataContainerName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, NewDataContainerName)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
     PYB11_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RenameDataContainer;
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index 8556c896ed..2f9de7d942 100755
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -53,17 +53,15 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ReplaceValueInArray)
     PYB11_FILTER_NEW_MACRO(ReplaceValueInArray)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SelectedArray)
-    PYB11_FILTER_PARAMETER(double, RemoveValue)
-    PYB11_FILTER_PARAMETER(double, ReplaceValue)
     PYB11_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
     PYB11_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
     PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ReplaceValueInArray;
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index e1605d8756..bb58886b03 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -51,17 +51,15 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(RequiredZThickness)
     PYB11_STATIC_NEW_MACRO(RequiredZThickness)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
-    PYB11_FILTER_PARAMETER(int, NumZVoxels)
-    PYB11_FILTER_PARAMETER(bool, PreflightCheck)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
     PYB11_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = RequiredZThickness;
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index ba670424a3..1e12def1e5 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -50,15 +50,11 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(RotateSampleRefFrame SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RotateSampleRefFrame SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(RotateSampleRefFrame)
   PYB11_FILTER_NEW_MACRO(RotateSampleRefFrame)
   PYB11_ENUMERATION(RotationRepresentation)
-  PYB11_FILTER_PARAMETER(DataArrayPath, CellAttributeMatrixPath)
-  PYB11_FILTER_PARAMETER(FloatVec3Type, RotationAxis)
-  PYB11_FILTER_PARAMETER(float, RotationAngle)
-  PYB11_FILTER_PARAMETER(bool, SliceBySlice)
   PYB11_PROPERTY(DataArrayPath CellAttributeMatrixPath READ getCellAttributeMatrixPath WRITE setCellAttributeMatrixPath)
   PYB11_PROPERTY(FloatVec3Type RotationAxis READ getRotationAxis WRITE setRotationAxis)
   PYB11_PROPERTY(float RotationAngle READ getRotationAngle WRITE setRotationAngle)
@@ -68,7 +64,8 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
   PYB11_METHOD(RotationRepresentation getRotationRepresentation)
   PYB11_METHOD(void setRotationRepresentation ARGS value)
   PYB11_METHOD(bool isRotationRepresentationValid ARGS value)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = RotateSampleRefFrame;
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 19def52d3f..973806c985 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -49,21 +49,17 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(ScaleVolume)
     PYB11_FILTER_NEW_MACRO(ScaleVolume)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-    PYB11_FILTER_PARAMETER(DataArrayPath, SurfaceDataContainerName)
-    PYB11_FILTER_PARAMETER(bool, ApplyToVoxelVolume)
-    PYB11_FILTER_PARAMETER(bool, ApplyToSurfaceMesh)
-    PYB11_FILTER_PARAMETER(FloatVec3Type, ScaleFactor)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
     PYB11_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
     PYB11_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
     PYB11_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
     PYB11_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = ScaleVolume;
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index 280153ceec..49645d9bea 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -49,21 +49,17 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(SetOriginResolutionImageGeom)
     PYB11_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-    PYB11_FILTER_PARAMETER(bool, ChangeOrigin)
-    PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
-    PYB11_FILTER_PARAMETER(bool, ChangeResolution)
-    PYB11_FILTER_PARAMETER(FloatVec3Type, Spacing)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
     PYB11_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
     PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
     PYB11_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
     PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = SetOriginResolutionImageGeom;
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 05f721f58f..92c6bd707d 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -79,6 +79,11 @@ set(_PublicFilters
   WriteTriangleGeometry
 )
 
+if( SIMPL_USE_ITK )
+  set(_PublicFilters ${_PublicFilters}
+    
+  )
+endif()
 
 
 list(LENGTH _PublicFilters PluginNumFilters)
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 830c94e939..93d2a69110 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -53,15 +53,14 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(SplitAttributeArray SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(SplitAttributeArray SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(SplitAttributeArray)
   PYB11_FILTER_NEW_MACRO(SplitAttributeArray)
-  PYB11_FILTER_PARAMETER(DataArrayPath, InputArrayPath)
-  PYB11_FILTER_PARAMETER(QString, SplitArraysSuffix)
   PYB11_PROPERTY(DataArrayPath InputArrayPath READ getInputArrayPath WRITE setInputArrayPath)
   PYB11_PROPERTY(QString SplitArraysSuffix READ getSplitArraysSuffix WRITE setSplitArraysSuffix)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = SplitAttributeArray;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index 800e172278..7549683d5b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -53,6 +53,14 @@ set(TEST_${SUBDIR_NAME}_NAMES
   WriteTriangleGeometryTest
 )
 
+
+if( SIMPL_USE_ITK )
+  set(TEST_${SUBDIR_NAME}_NAMES ${TEST_${SUBDIR_NAME}_NAMES}
+  )
+endif()
+
+
+
 SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
 SIMPL_ADD_UNIT_TEST_MOC_FILE(ExecuteProcessTest "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index c4077e5734..100b6cbabd 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -52,17 +52,10 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(WriteASCIIData)
     PYB11_FILTER_NEW_MACRO(WriteASCIIData)
-    PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedDataArrayPaths)
-    PYB11_FILTER_PARAMETER(QString, OutputPath)
-    PYB11_FILTER_PARAMETER(QString, OutputFilePath)
-    PYB11_FILTER_PARAMETER(int, Delimiter)
-    PYB11_FILTER_PARAMETER(QString, FileExtension)
-    PYB11_FILTER_PARAMETER(int, MaxValPerLine)
-    PYB11_FILTER_PARAMETER(int, OutputStyle)
     PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
     PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
     PYB11_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
@@ -70,7 +63,8 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
     PYB11_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
     PYB11_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
     PYB11_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = WriteASCIIData;
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index 427a2b8ebe..74045daf23 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -57,17 +57,15 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
     PYB11_SHARED_POINTERS(WriteTriangleGeometry)
     PYB11_FILTER_NEW_MACRO(WriteTriangleGeometry)
-    PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerSelection)
-    PYB11_FILTER_PARAMETER(QString, OutputNodesFile)
-    PYB11_FILTER_PARAMETER(QString, OutputTrianglesFile)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
     PYB11_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
     PYB11_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = WriteTriangleGeometry;
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 983ca8547a..071ef2c8a1 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -49,7 +49,7 @@ class ASCIIWizardData
 {
 #ifdef SIMPL_ENABLE_PYTHON
   // clang-format off
-  PYB11_CREATE_BINDINGS(ASCIIWizardData) 
+  PYB11_BEGIN_BINDINGS(ASCIIWizardData) 
   PYB11_CREATION(ASCIIWizardData ARGS QString int int)
   PYB11_METHOD(void updateDataArrayPath ARGS DataArrayPath::RenameType,renamePath)
   PYB11_METHOD(bool isEmpty)
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 4030f9a275..5582707563 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -41,16 +41,16 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 class SIMPLib_EXPORT IDataArray : public IDataStructureNode
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(IDataArray)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(IDataArray)
   PYB11_SHARED_POINTERS(IDataArray)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
-
   PYB11_METHOD(QString getTypeAsString)
   PYB11_METHOD(std::vector<size_t> getComponentDimensions)
   PYB11_METHOD(size_t getNumberOfTuples)
   PYB11_METHOD(int getNumberOfComponents)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = IDataArray;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 934cdd61b4..4d66c7f452 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StatsDataArray.h"
 
@@ -366,11 +366,7 @@ void StatsDataArray::initializeTuple(size_t i, void* p)
 // -----------------------------------------------------------------------------
 void StatsDataArray::initializeWithZeros()
 {
-
-  for(qint32 i = 0; i < m_StatsDataArray.size(); ++i)
-  {
-    m_StatsDataArray[i]->initialize();
-  }
+  Q_ASSERT(false);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 9a1ddea4eb..8511b45af4 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -51,11 +51,11 @@
 class SIMPLib_EXPORT StatsDataArray : public IDataArray
 {
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(StatsDataArray SUPER IDataArray)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(StatsDataArray SUPER IDataArray)
   PYB11_SHARED_POINTERS(StatsDataArray)
   PYB11_STATIC_NEW_MACRO(StatsDataArray)
+  PYB11_STATIC_CREATION(New)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t int size_t* QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
@@ -65,8 +65,8 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   PYB11_METHOD(StatsData::Pointer getStatsData ARGS int,index)
   PYB11_METHOD(void fillArrayWithNewStatsData OVERLOAD size_t,n PhaseType::Type*,phase_types)
   PYB11_METHOD(void fillArrayWithNewStatsData OVERLOAD size_t,n PhaseType::EnumType*,phase_types)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 0e9fe38d6b..c372a4e191 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -60,9 +60,8 @@
 class SIMPLib_EXPORT StringDataArray : public IDataArray
 {
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(StringDataArray SUPER IDataArray)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(StringDataArray SUPER IDataArray)
   PYB11_SHARED_POINTERS(StringDataArray)
   PYB11_STATIC_NEW_MACRO(StringDataArray)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
@@ -72,8 +71,8 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
   PYB11_METHOD(void setValue ARGS size_t,i const.QString.&,value)
   PYB11_METHOD(size_t getSize)
   PYB11_METHOD(size_t getNumberOfTuples)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 075b7296fe..9eb3f05bbb 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -85,8 +85,8 @@ enum RenameErrorCodes
 class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureContainerNode<IDataArray>
 {
   // clang-format off
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(AttributeMatrix)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(AttributeMatrix)
   PYB11_SHARED_POINTERS(AttributeMatrix)
   PYB11_STATIC_CREATION(New ARGS std::vector<size_t> QString AttributeMatrix::Type)
   
@@ -95,17 +95,16 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
  
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(std::vector<size_t> TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
-
   PYB11_METHOD(bool doesAttributeArrayExist ARGS Name)
   PYB11_METHOD(bool addOrReplaceAttributeArray OVERLOAD const.IDataArrayShPtrType.&,Data)
   PYB11_METHOD(bool insertOrAssign ARGS IDataArrayShPtrType)
-
   PYB11_METHOD(IDataArray removeAttributeArray ARGS Name)
   PYB11_METHOD(int renameAttributeArray ARGS OldName NewName OverWrite)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
+  PYB11_END_BINDINGS()
   // clang-format on
-#endif
+  // End Python bindings declarations
 
 public:
   using Self = AttributeMatrix;
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
index 9c04370fdd..8dc17ea6fc 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
@@ -44,15 +44,16 @@
 
 class SIMPLib_EXPORT AttributeMatrixProxy
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(AttributeMatrixProxy)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(AttributeMatrixProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType DataArrays READ getDataArrays WRITE setDataArrays CONST_GET_OVERLOAD)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(AMType AMType READ getAMType WRITE setAMType)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
   PYB11_METHOD(DataArrayProxy getDataArrayProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   // This enumeration is not a class enumeration because it is not possible to
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 81bba3be70..6f0fb1b1c7 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -81,18 +81,18 @@ class SIMPLib_EXPORT DataArrayPathHelper final : public QObject
  */
 class SIMPLib_EXPORT DataArrayPath
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DataArrayPath)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataArrayPath)
   PYB11_CREATION(ARGS QString QString QString)
   PYB11_CREATION(ARGS QString)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
   PYB11_PROPERTY(QString DataArrayName READ getDataArrayName WRITE setDataArrayName)
-
   PYB11_METHOD(bool isEmpty)
   PYB11_METHOD(bool isValid)
   PYB11_METHOD(void update ARGS dcName amName daName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
   using HashType = size_t;
 
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index fe2287625d..02c6ce1d7d 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -54,15 +54,17 @@ class SIMPLH5DataReaderRequirements;
  */
 class SIMPLib_EXPORT DataArrayProxy
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DataArrayProxy)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataArrayProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(std::vector<size_t> TupleDims READ getTupleDims WRITE setTupleDims)
   PYB11_PROPERTY(std::vector<size_t> CompDims READ getCompDims WRITE setCompDims)
   PYB11_PROPERTY(QString Path READ getPath WRITE setPath)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   using CompDimsVector = std::vector<std::vector<size_t>>;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 05489f3ae7..a07f8048f9 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -76,30 +76,24 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
 
   // This line MUST be first when exposing a class and properties to Python
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DataContainer)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataContainer)
   PYB11_SHARED_POINTERS(DataContainer)
   PYB11_STATIC_CREATION(New OVERLOAD QString)
   PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
-
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(IGeometry Geometry READ getGeometry WRITE setGeometry)
-
   PYB11_METHOD(QString getInfoString ARGS InfoStringFormat)
   PYB11_METHOD(bool addOrReplaceAttributeMatrix ARGS AttributeMatrix)
   PYB11_METHOD(bool insertOrAssign ARGS AttributeMatrix)
-
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
-
   PYB11_METHOD(AttributeMatrix removeAttributeMatrix ARGS Name)
   PYB11_METHOD(bool renameAttributeMatrix ARGS OldName NewName OverWrite)
-
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS Name)
   PYB11_METHOD(void setGeometry ARGS Geometry)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 public:
   using Self = DataContainer;
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index b46b231b99..a094bbc57a 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -67,35 +67,27 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 {
   Q_OBJECT
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DataContainerArray)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataContainerArray)
   PYB11_SHARED_POINTERS(DataContainerArray)
   PYB11_STATIC_NEW_MACRO(DataContainerArray)
-
   PYB11_METHOD(bool addOrReplaceDataContainer ARGS DataContainer)
   PYB11_METHOD(bool insertOrAssign ARGS DataContainer)
-
   PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(DataContainer::Pointer getDataContainer OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
-
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
-
   PYB11_METHOD(DataContainer::Pointer removeDataContainer ARGS Name)
   PYB11_METHOD(bool renameDataContainer OVERLOAD const.QString.&,OldName const.QString.&,NewName)
   PYB11_METHOD(bool renameDataContainer OVERLOAD const.DataArrayPath.&,OldPath const.DataArrayPath.&,NewPath )
-
   PYB11_METHOD(void clearDataContainers)
   PYB11_METHOD(int getNumDataContainers)
   PYB11_METHOD(void duplicateDataContainer ARGS OldName, NewName)
-
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix ARGS DataArrayPath)
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS DataArrayPath)
-
   PYB11_METHOD(bool doesAttributeArrayExist ARGS DataArrayPath)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index 3e12146458..faaafc0756 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -49,14 +49,15 @@ class DataContainerArray;
 class SIMPLib_EXPORT DataContainerArrayProxy
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
+  // Start Python bindings declarations
   // clang-format off
-  PYB11_CREATE_BINDINGS(DataContainerArrayProxy)
+  PYB11_BEGIN_BINDINGS(DataContainerArrayProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType DataContainers READ getDataContainers WRITE setDataContainers CONST_GET_OVERLOAD)
   PYB11_METHOD(DataContainerProxy.& getDataContainerProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
+  PYB11_END_BINDINGS()
   // clang-format on
-#endif
+  // End Python bindings declarations
 
 public:
   using StorageType = QMap<QString, DataContainerProxy>;
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.h b/Source/SIMPLib/DataContainers/DataContainerProxy.h
index bb933f323e..d5f5d2c608 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.h
@@ -50,15 +50,16 @@
 class SIMPLib_EXPORT DataContainerProxy
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DataContainerProxy)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataContainerProxy)
   PYB11_CREATION()
   PYB11_PROPERTY(StorageType AttributeMatricies READ getAttributeMatricies WRITE setAttributeMatricies CONST_GET_OVERLOAD)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_PROPERTY(uint8_t Flag READ getFlag WRITE setFlag)
   PYB11_METHOD(AttributeMatrixProxy getAttributeMatrixProxy ARGS name RETURN_VALUE_POLICY py::return_value_policy::reference)
   PYB11_METHOD(void toggleFlag)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   // This enumeration is not a class enumeration because it is not possible to
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index aff2982185..bc3b86c674 100755
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -48,13 +48,14 @@ class SIMPLib_EXPORT DynamicTableData : public QObject
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(DynamicTableData)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(DynamicTableData)
     PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
     PYB11_PROPERTY(QStringList ColHeaders READ getColHeaders WRITE setColHeaders)
     PYB11_PROPERTY(QStringList RowHeaders READ getRowHeaders WRITE setRowHeaders)
     PYB11_PROPERTY(std::vector<std::vector<double>> TableData READ getTableData WRITE setTableData)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     DynamicTableData();
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index a87bab0ea3..f2b05860da 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -49,11 +49,12 @@
 class SIMPLib_EXPORT AbstractComparison
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(AbstractComparison)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(AbstractComparison)
   PYB11_SHARED_POINTERS(AbstractComparison)
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = AbstractComparison;
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 0a7a1b9a3c..d81ae4226f 100755
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -79,8 +79,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   
   // This line MUST be first when exposing a class and properties to Python
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(AbstractFilter)
   PYB11_SHARED_POINTERS(AbstractFilter)
   PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)  
   PYB11_PROPERTY(QString GroupName READ getGroupName)
@@ -94,7 +94,6 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_PROPERTY(int WarningCode READ getWarningCode)
   PYB11_PROPERTY(bool InPreflight READ getInPreflight WRITE setInPreflight)
   PYB11_PROPERTY(int PipelineIndex READ getPipelineIndex WRITE setPipelineIndex)
-
   PYB11_METHOD(void generateHtmlSummary)
   PYB11_METHOD(void execute)
   PYB11_METHOD(void preflight)
@@ -105,7 +104,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
   // Friend declarations for RenameDataPath so that it can set and check the instance's created data by ID.
   friend void RenameDataPath::AlertFilterCreatedPath(AbstractFilter*, RenameDataPath::DataID_t, const DataArrayPath&);
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index b61e347fcb..73573865e7 100755
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -43,15 +43,15 @@
 
 typedef struct
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ComparisonInput_t)
-
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ComparisonInput_t)
   PYB11_PROPERTY(QString dataContainerName)
   PYB11_PROPERTY(QString attributeMatrixName)
   PYB11_PROPERTY(QString attributeArrayName)
   PYB11_PROPERTY(int compOperator) 
   PYB11_PROPERTY(double compValue)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
   QString dataContainerName;
   QString attributeMatrixName;
@@ -96,9 +96,8 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
 {
   Q_OBJECT
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ComparisonInputs)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ComparisonInputs)
   PYB11_CREATION()  
   PYB11_PROPERTY(QVector<ComparisonInput_t> Inputs READ getInputs)
   PYB11_METHOD(void addInput OVERLOAD const.QString,dataContainerName const.QString,attributeMatrixName const.QString,arrayName int,compOperator double,compValue)
@@ -106,8 +105,8 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
   //PYB11_METHOD(ComparisonInput_t& getInput ARGS index)
   //PYB11_METHOD(ComparisonInput_t& operator[] ARGS index)
   PYB11_METHOD(int size)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index 8cb4908a5e..7b2e682640 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -57,23 +57,18 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
 {
   Q_OBJECT
   // clang-format off
-
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ComparisonInputsAdvanced)
-
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ComparisonInputsAdvanced)
   PYB11_CREATION()
- 
   PYB11_PROPERTY(QVector<AbstractComparison::Pointer> Inputs READ getInputs)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
-
   PYB11_METHOD(void addInput OVERLOAD int,unionOperator const.QString,arrayName int,compOperator double,compValue)
   PYB11_METHOD(void addInput OVERLOAD int,unionOperator bool,invertComparison QVector<AbstractComparison::Pointer>,comparisons)
   PYB11_METHOD(void addInput OVERLOAD AbstractComparison::Pointer,input)
   PYB11_METHOD(int size)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 2f5be6a68c..62d3d7861d 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -48,9 +48,9 @@
 class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
 {
   using AbstractComparisonPtr = AbstractComparison::Pointer;
-#ifdef SIMPL_ENABLE_PYTHON
+  // Start Python bindings declarations
   // clang-format off
-  PYB11_CREATE_BINDINGS(ComparisonSet SUPERCLASS AbstractComparison)
+  PYB11_BEGIN_BINDINGS(ComparisonSet SUPERCLASS AbstractComparison)
   PYB11_SHARED_POINTERS(ComparisonSet)
   PYB11_STATIC_NEW_MACRO(ComparisonSet)
   PYB11_CREATION()
@@ -59,8 +59,9 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
   PYB11_METHOD(void addComparison ARGS AbstractComparisonPtr,comparison)
   PYB11_METHOD(void insertComparison ARGS int,index AbstractComparisonPtr,comparison)
+  PYB11_END_BINDINGS()
   // clang-format on
-#endif
+  // End Python bindings declarations
 
 public:
   using Self = ComparisonSet;
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 1abaa1f30e..189da0d10a 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -48,8 +48,8 @@
 */
 class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ComparisonValue SUPERCLASS AbstractComparison)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ComparisonValue SUPERCLASS AbstractComparison)
   PYB11_SHARED_POINTERS(ComparisonValue)
   PYB11_STATIC_NEW_MACRO(ComparisonValue)
   PYB11_CREATION()
@@ -58,7 +58,9 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
   PYB11_PROPERTY(double CompValue READ getCompValue WRITE setCompValue)
   PYB11_PROPERTY(ComparisonSet::Pointer ParentSet READ getParentSet WRITE setParentSet)
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   using Self = ComparisonValue;
   using Pointer = std::shared_ptr<Self>;
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 1c10f1da53..769ab6e4e7 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -65,8 +65,8 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(FilterPipeline)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FilterPipeline)
   PYB11_SHARED_POINTERS(FilterPipeline)
   PYB11_STATIC_NEW_MACRO(FilterPipeline)
   PYB11_PROPERTY(int ErrorCode READ getErrorCode)
@@ -75,7 +75,6 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   PYB11_PROPERTY(State State READ getState)
   PYB11_PROPERTY(ExecutionResult ExecutionResult READ getExecutionResult)
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
-
   PYB11_METHOD(DataContainerArrayShPtrType run)
   PYB11_METHOD(void preflightPipeline)
   PYB11_METHOD(bool pushFront ARGS AbstractFilter)
@@ -87,7 +86,8 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   PYB11_METHOD(bool empty)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = FilterPipeline;
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 251a2c188f..3bd45ac3ac 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -49,29 +49,23 @@
 class SIMPLib_EXPORT EdgeGeom : public IGeometry
 {
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(EdgeGeom SUPERCLASS IGeometry)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(EdgeGeom SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(EdgeGeom)
   PYB11_STATIC_NEW_MACRO(EdgeGeom)
-
   PYB11_CREATION(CreateGeometry ARGS size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedEdgeList::Pointer SharedVertexList::Pointer QString)
-
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertexList::Pointer getVertices)
-
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
-
   PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
   PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
-
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_METHOD(size_t getNumberOfElements)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index b66a99d3cf..3e80b9b4d0 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -79,14 +79,12 @@ class SIMPLib_EXPORT IGeometry : public Observable
 {
   // This line MUST be first when exposing a class and properties to Python
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(IGeometry)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(IGeometry)
   PYB11_SHARED_POINTERS(IGeometry)
-
   PYB11_ENUMERATION(Type)
   PYB11_ENUMERATION(VtkCellType)
   PYB11_ENUMERATION(LengthUnit)
-
   PYB11_PROPERTY(QString Name READ getName WRITE setName)
   PYB11_METHOD(Type getGeometryType)
   PYB11_METHOD(QString getGeometryTypeAsString)
@@ -99,7 +97,8 @@ class SIMPLib_EXPORT IGeometry : public Observable
   PYB11_METHOD(void addOrReplaceAttributeMatrix ARGS Name AttributeMatrix)
   PYB11_METHOD(AttributeMatrix getAttributeMatrix ARGS Name)
   PYB11_METHOD(AttributeMatrix removeAttributeMatrix ARGS Name)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = IGeometry;
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index 77838c015c..74c2427949 100755
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -45,10 +45,11 @@
  */
 class SIMPLib_EXPORT IGeometry2D : public IGeometry
 {
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(IGeometry2D SUPERCLASS IGeometry)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(IGeometry2D SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(IGeometry2D)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = IGeometry2D;
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 63e14aae2a..0352d259a4 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -49,10 +49,11 @@
 class SIMPLib_EXPORT IGeometryGrid : public IGeometry
 {
   // This class needs to be wrapped so Python/Pybind11 can do the proper casting
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(IGeometryGrid SUPERCLASS IGeometry)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(IGeometryGrid SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(IGeometryGrid)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = IGeometryGrid;
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 6d4c050b57..33432dccf5 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -51,29 +51,24 @@
 class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
 {
   // clang-format off
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ImageGeom SUPERCLASS IGeometryGrid)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ImageGeom SUPERCLASS IGeometryGrid)
   PYB11_SHARED_POINTERS(ImageGeom)
   PYB11_STATIC_NEW_MACRO(ImageGeom)
   PYB11_STATIC_CREATION(CreateGeometry ARGS QString)
-
   PYB11_ENUMERATION(ErrorType)
-
   PYB11_METHOD(void setDimensions OVERLOAD size_t,x size_t,y size_t,z)
   PYB11_METHOD(SizeVec3Type getDimensions)
-
   PYB11_METHOD(void setSpacing OVERLOAD float,x float,y float,z)
   PYB11_METHOD(FloatVec3Type getSpacing)
-
   PYB11_METHOD(size_t getXPoints)
   PYB11_METHOD(size_t getYPoints)
   PYB11_METHOD(size_t getZPoints)
-
   PYB11_METHOD(void setOrigin OVERLOAD float,x float,y float,z)
   PYB11_METHOD(FloatVec3Type getOrigin)
-
   PYB11_METHOD(FloatVec6Type getBoundingBox OVERLOAD CONST_METHOD)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index d887b1287e..f7c7a4cb62 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -50,33 +50,26 @@
 class SIMPLib_EXPORT QuadGeom : public IGeometry2D
 {
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(QuadGeom SUPERCLASS IGeometry2D)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(QuadGeom SUPERCLASS IGeometry2D)
   PYB11_SHARED_POINTERS(QuadGeom)
   PYB11_STATIC_NEW_MACRO(QuadGeom)
-
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedQuadList::Pointer SharedVertexList::Pointer QString)
-
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertextList::Pointer getVertices)
-
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
-
   PYB11_METHOD(void setQuads SharedQuadList::Pointer,quads)
   PYB11_METHOD(SharedQuadList::Pointer getQuads)
-
   PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
   PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
-
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_METHOD(size_t getNumberOfQuads)
   PYB11_METHOD(size_t getNumberOfElements)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index aa3a4e2d28..1f14f50dd6 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -50,28 +50,23 @@
 class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
 {
   // clang-format off
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(TriangleGeom SUPERCLASS IGeometry2D)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(TriangleGeom SUPERCLASS IGeometry2D)
   PYB11_SHARED_POINTERS(TriangleGeom)
   PYB11_STATIC_NEW_MACRO(TriangleGeom)
 	  
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
   PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedTriList::Pointer SharedVertexList::Pointer QString)
-
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertextList::Pointer getVertices)
-
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
-
   PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
   PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
-
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 1139180b0b..011b40d107 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -52,26 +52,21 @@
 class SIMPLib_EXPORT VertexGeom : public IGeometry
 {
   // clang-format off
-
-
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(VertexGeom SUPERCLASS IGeometry)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(VertexGeom SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(VertexGeom)
   PYB11_STATIC_NEW_MACRO(VertexGeom)
   
   PYB11_CREATION(CreateGeometry ARGS size_t QString bool)
   PYB11_CREATION(CreateGeometry ARGS SharedVertexList::Pointer QString)
-
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertexList::Pointer getVertices)
-
   PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
   PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
-
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfElements)
-#endif
-
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
   // clang-format on
 
 public:
diff --git a/Source/SIMPLib/SIMPLibMacros.cmake b/Source/SIMPLib/SIMPLibMacros.cmake
index 76cc9d8d38..9ee40caaff 100755
--- a/Source/SIMPLib/SIMPLibMacros.cmake
+++ b/Source/SIMPLib/SIMPLibMacros.cmake
@@ -272,7 +272,7 @@ macro(ADD_SIMPL_FILTER FilterLib WidgetLib filterGroup filterName filterDocPath
 
       #-- Check to make sure we have a Documentation file for the filter
       if(NOT EXISTS ${filterDocPath} )
-        message(FATAL_ERROR "*** Missing Documenation File for ${filterDocPath}")
+        message(FATAL_ERROR "*** Missing Documentation File for ${filterDocPath}")
       endif()
 
       get_property(DREAM3DDocRoot GLOBAL PROPERTY DREAM3DDocRoot)
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
index fa0c0698e8..8cf89cc946 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
@@ -45,10 +45,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-BoundaryStatsData::BoundaryStatsData()
-{
-  initialize();
-}
+BoundaryStatsData::BoundaryStatsData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -68,13 +65,6 @@ StatsData::Pointer BoundaryStatsData::deepCopy()
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void BoundaryStatsData::initialize()
-{
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index c113257149..5fbb02ecfb 100755
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -165,11 +165,6 @@ class SIMPLib_EXPORT BoundaryStatsData : public StatsData
      */
     StatsData::Pointer deepCopy() override;
 
-    /**
-     * @brief initialize
-     */
-    void initialize() override;
-
     /**
      * @brief writeHDF5Data
      * @param groupId
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.cpp b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
index 4f563c060a..9912e3acaf 100644
--- a/Source/SIMPLib/StatsData/MatrixStatsData.cpp
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
@@ -45,11 +45,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MatrixStatsData::MatrixStatsData()
-{
-  initialize();
-}
-
+MatrixStatsData::MatrixStatsData() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -66,12 +62,6 @@ StatsData::Pointer MatrixStatsData::deepCopy()
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MatrixStatsData::initialize()
-{
-}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.h b/Source/SIMPLib/StatsData/MatrixStatsData.h
index b9710f42a6..8480095c46 100755
--- a/Source/SIMPLib/StatsData/MatrixStatsData.h
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.h
@@ -134,11 +134,6 @@ class SIMPLib_EXPORT MatrixStatsData : public StatsData
      */
     StatsData::Pointer deepCopy() override;
 
-    /**
-     * @brief initialize
-     */
-    void initialize() override;
-
     /**
      * @brief writeHDF5Data
      * @param groupId
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index b85ea53898..0fab5a7cd9 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -47,10 +47,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PrecipitateStatsData::PrecipitateStatsData()
-{
-  initialize();
-}
+PrecipitateStatsData::PrecipitateStatsData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -160,23 +157,6 @@ StatsData::Pointer PrecipitateStatsData::deepCopy()
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PrecipitateStatsData::initialize()
-{
-  m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
-  //  m_RadialDistFunctionType = SIMPL::DistributionType::UnknownDistributionType;
-  m_BOverA_DistType = SIMPL::DistributionType::Beta;
-  m_COverA_DistType = SIMPL::DistributionType::Beta;
-  m_Clustering_DistType = SIMPL::DistributionType::LogNormal;
-  m_Omegas_DistType = SIMPL::DistributionType::Beta;
-  m_PrecipBoundaryFraction = 0.0;
-  m_FeatureDiameterInfo[0] = 0.1f; // Bin Step Size
-  m_FeatureDiameterInfo[1] = 1.0f; // MaxFeatureDiameter
-  m_FeatureDiameterInfo[2] = 0.1f; // MinFeatureDiameter
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index 8ecfffe665..989a8c3128 100755
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -88,12 +87,10 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(PrecipitateStatsData SUPERCLASS StatsData)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(PrecipitateStatsData SUPERCLASS StatsData)
   PYB11_SHARED_POINTERS(PrecipitateStatsData)
   PYB11_STATIC_NEW_MACRO(PrecipitateStatsData)
-  PYB11_STATIC_CREATION(initialize)
-
   PYB11_PROPERTY(float BinStepSize READ getBinStepSize WRITE setBinStepSize)
   PYB11_PROPERTY(float MaxFeatureDiameter READ getMaxFeatureDiameter WRITE setMaxFeatureDiameter)
   PYB11_PROPERTY(float MinFeatureDiameter READ getMinFeatureDiameter WRITE setMinFeatureDiameter)
@@ -105,7 +102,8 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
   PYB11_PROPERTY(float BoundaryArea READ getBoundaryArea WRITE setBoundaryArea)
   PYB11_PROPERTY(float PrecipBoundaryFraction READ getPrecipBoundaryFraction WRITE setPrecipBoundaryFraction)
   PYB11_METHOD(QString getStatsType)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = PrecipitateStatsData;
@@ -393,11 +391,6 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
      */
     StatsData::Pointer deepCopy() override;
 
-    /**
-     * @brief initialize
-     */
-    void initialize() override;
-
     /**
      * @brief writeHDF5Data
      * @param groupId
@@ -434,22 +427,22 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     PrecipitateStatsData& operator=(PrecipitateStatsData&&) = delete;      // Move Assignment Not Implemented
 
   private:
-    std::array<float, 3> m_FeatureDiameterInfo;
+    std::array<float, 3> m_FeatureDiameterInfo = {0.1f, 1.0f, 0.1f};
 
     float m_BoundaryArea = {};
-    float m_PrecipBoundaryFraction = {};
+    float m_PrecipBoundaryFraction = 0.0f;
     VectorOfFloatArray m_FeatureSizeDistribution = {};
-    uint32_t m_FeatureSize_DistType = {};
+    uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
     RdfData::Pointer m_RadialDistFunction = {};
     FloatArrayType::Pointer m_BinNumbers = {};
     VectorOfFloatArray m_FeatureSize_BOverA = {};
-    uint32_t m_BOverA_DistType = {};
+    uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
     VectorOfFloatArray m_FeatureSize_COverA = {};
-    uint32_t m_COverA_DistType = {};
+    uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
     VectorOfFloatArray m_FeatureSize_Clustering = {};
-    uint32_t m_Clustering_DistType = {};
+    uint32_t m_Clustering_DistType = SIMPL::DistributionType::LogNormal;
     VectorOfFloatArray m_FeatureSize_Omegas = {};
-    uint32_t m_Omegas_DistType = {};
+    uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
     FloatArrayType::Pointer m_MisorientationBins = {};
     VectorOfFloatArray m_MDF_Weights = {};
     FloatArrayType::Pointer m_ODF = {};
@@ -457,5 +450,3 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     FloatArrayType::Pointer m_AxisOrientation = {};
     VectorOfFloatArray m_AxisODF_Weights = {};
 };
-
-
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index 9cee4ee907..b17a27d9de 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -49,10 +49,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PrimaryStatsData::PrimaryStatsData()
-{
-  initialize();
-}
+PrimaryStatsData::PrimaryStatsData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -136,17 +133,6 @@ StatsData::Pointer PrimaryStatsData::deepCopy()
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PrimaryStatsData::initialize()
-{
-  m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
-  m_BOverA_DistType = SIMPL::DistributionType::Beta;
-  m_COverA_DistType = SIMPL::DistributionType::Beta;
-  m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
-  m_Omegas_DistType = SIMPL::DistributionType::Beta;
-}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
index 9077d2e670..4964e6e4c1 100755
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.h
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -84,12 +84,10 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 class SIMPLib_EXPORT PrimaryStatsData : public StatsData
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(PrimaryStatsData SUPER StatsData)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(PrimaryStatsData SUPER StatsData)
   PYB11_SHARED_POINTERS(PrimaryStatsData)
   PYB11_STATIC_NEW_MACRO(PrimaryStatsData)
-  PYB11_STATIC_CREATION(initialize)
-
   PYB11_PROPERTY(float BinStepSize READ getBinStepSize WRITE setBinStepSize)
   PYB11_PROPERTY(float MaxFeatureDiameter READ getMaxFeatureDiameter WRITE setMaxFeatureDiameter)
   PYB11_PROPERTY(float MinFeatureDiameter READ getMinFeatureDiameter WRITE setMinFeatureDiameter)
@@ -99,7 +97,8 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
   PYB11_METHOD(FloatArrayType::Pointer generateBinNumbers)
   PYB11_PROPERTY(float PhaseFraction READ getPhaseFraction WRITE setPhaseFraction)
   PYB11_PROPERTY(float BoundaryArea READ getBoundaryArea WRITE setBoundaryArea)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = PrimaryStatsData;
@@ -382,11 +381,6 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
    */
   StatsData::Pointer deepCopy() override;
 
-  /**
-   * @brief initialize
-   */
-  void initialize() override;
-
   /**
    * @brief writeHDF5Data
    * @param groupId
@@ -427,16 +421,16 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
 
   float m_BoundaryArea = {};
   VectorOfFloatArray m_FeatureSizeDistribution = {};
-  uint32_t m_FeatureSize_DistType = {};
+  uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
   FloatArrayType::Pointer m_BinNumbers = {};
   VectorOfFloatArray m_FeatureSize_BOverA = {};
-  uint32_t m_BOverA_DistType = {};
+  uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
   VectorOfFloatArray m_FeatureSize_COverA = {};
-  uint32_t m_COverA_DistType = {};
+  uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
   VectorOfFloatArray m_FeatureSize_Neighbors = {};
-  uint32_t m_Neighbors_DistType = {};
+  uint32_t m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
   VectorOfFloatArray m_FeatureSize_Omegas = {};
-  uint32_t m_Omegas_DistType = {};
+  uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
   FloatArrayType::Pointer m_MisorientationBins = {};
   VectorOfFloatArray m_MDF_Weights = {};
   FloatArrayType::Pointer m_ODF = {};
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 170d3747b6..8b3cfd1641 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -45,11 +45,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsData::StatsData() :
-m_Name("StatsData")
-{
-  initialize();
-}
+StatsData::StatsData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -159,14 +155,6 @@ StatsData::Pointer StatsData::deepCopy()
   return StatsData::NullPointer();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void StatsData::initialize()
-{
-  // These should be implemented in the subclasses.
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/StatsData.h b/Source/SIMPLib/StatsData/StatsData.h
index c0ada585f7..36097216ff 100755
--- a/Source/SIMPLib/StatsData/StatsData.h
+++ b/Source/SIMPLib/StatsData/StatsData.h
@@ -91,14 +91,15 @@ using VectorOfFloatArray = QVector<FloatArrayType::Pointer>;
 class SIMPLib_EXPORT StatsData
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(StatsData)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(StatsData)
   PYB11_SHARED_POINTERS(StatsData)
   PYB11_STATIC_NEW_MACRO(StatsData)
   PYB11_METHOD(QString getStatsType)
   PYB11_METHOD(PhaseType::Type getPhaseType)
   PYB11_PROPERTY(float PhaseFraction READ getPhaseFraction WRITE setPhaseFraction)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = StatsData;
@@ -179,11 +180,6 @@ class SIMPLib_EXPORT StatsData
    */
   static FloatArrayType::Pointer CreateDistributionArrays(uint32_t distributionType);
 
-  /**
-   * @brief initialize
-   */
-  virtual void initialize();
-
   /**
    * @brief deepCopy
    * @return
@@ -312,13 +308,13 @@ class SIMPLib_EXPORT StatsData
 protected:
   StatsData();
 
+private:
+  QString m_Name = "StatsData";
+  float m_PhaseFraction = 0.0f;
+
 public:
   StatsData(const StatsData&) = delete;            // Copy Constructor Not Implemented
   StatsData(StatsData&&) = delete;                 // Move Constructor Not Implemented
   StatsData& operator=(const StatsData&) = delete; // Copy Assignment Not Implemented
   StatsData& operator=(StatsData&&) = delete;      // Move Assignment Not Implemented
-
-private:
-  QString m_Name = {};
-  float m_PhaseFraction = {};
 };
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index 7f5b3ff1d0..74db13d66d 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -47,10 +47,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-TransformationStatsData::TransformationStatsData()
-{
-  initialize();
-}
+TransformationStatsData::TransformationStatsData() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -135,18 +132,6 @@ StatsData::Pointer TransformationStatsData::deepCopy()
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void TransformationStatsData::initialize()
-{
-  m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
-  m_BOverA_DistType = SIMPL::DistributionType::Beta;
-  m_COverA_DistType = SIMPL::DistributionType::Beta;
-  m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
-  m_Omegas_DistType = SIMPL::DistributionType::Beta;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.h b/Source/SIMPLib/StatsData/TransformationStatsData.h
index 3de8047596..388d6076c3 100755
--- a/Source/SIMPLib/StatsData/TransformationStatsData.h
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.h
@@ -357,11 +357,6 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
      */
     StatsData::Pointer deepCopy() override;
 
-    /**
-     * @brief initialize
-     */
-    void initialize() override;
-
     /**
      * @brief writeHDF5Data
      * @param groupId
@@ -391,34 +386,34 @@ class SIMPLib_EXPORT TransformationStatsData : public StatsData
   protected:
     TransformationStatsData();
 
-  public:
-    TransformationStatsData(const TransformationStatsData&) = delete; // Copy Constructor Not Implemented
-    TransformationStatsData(TransformationStatsData&&) = delete;      // Move Constructor Not Implemented
-    TransformationStatsData& operator=(const TransformationStatsData&) = delete; // Copy Assignment Not Implemented
-    TransformationStatsData& operator=(TransformationStatsData&&) = delete;      // Move Assignment Not Implemented
-
   private:
     std::array<float, 3> m_FeatureDiameterInfo;
 
     float m_BoundaryArea = {};
     float m_ParentPhase = {};
     VectorOfFloatArray m_FeatureSizeDistribution = {};
-    uint32_t m_FeatureSize_DistType = {};
+    uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
     FloatArrayType::Pointer m_BinNumbers = {};
     VectorOfFloatArray m_FeatureSize_BOverA = {};
-    uint32_t m_BOverA_DistType = {};
+    uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
     VectorOfFloatArray m_FeatureSize_COverA = {};
-    uint32_t m_COverA_DistType = {};
+    uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
     VectorOfFloatArray m_FeatureSize_Neighbors = {};
-    uint32_t m_Neighbors_DistType = {};
+    uint32_t m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
     VectorOfFloatArray m_FeatureSize_Omegas = {};
-    uint32_t m_Omegas_DistType = {};
+    uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
     FloatArrayType::Pointer m_MisorientationBins = {};
     VectorOfFloatArray m_MDF_Weights = {};
     FloatArrayType::Pointer m_ODF = {};
     VectorOfFloatArray m_ODF_Weights = {};
     FloatArrayType::Pointer m_AxisOrientation = {};
     VectorOfFloatArray m_AxisODF_Weights = {};
+
+  public:
+    TransformationStatsData(const TransformationStatsData&) = delete;            // Copy Constructor Not Implemented
+    TransformationStatsData(TransformationStatsData&&) = delete;                 // Move Constructor Not Implemented
+    TransformationStatsData& operator=(const TransformationStatsData&) = delete; // Copy Assignment Not Implemented
+    TransformationStatsData& operator=(TransformationStatsData&&) = delete;      // Move Assignment Not Implemented
 };
 
 
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index a2e82ed67d..f31cc8a907 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -55,14 +55,13 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ArraySelectionExample SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ArraySelectionExample SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ArraySelectionExample)
   PYB11_FILTER_NEW_MACRO(ArraySelectionExample)
-  PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DataContainerArrayProxy)
-
   PYB11_PROPERTY(DataContainerArrayProxy DataContainerArrayProxy READ getDataContainerArrayProxy WRITE setDataContainerArrayProxy)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ArraySelectionExample;
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index f55ec6a71d..bdb3b43ab3 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -52,22 +52,17 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(DynamicTableExample SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DynamicTableExample SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(DynamicTableExample)
   PYB11_FILTER_NEW_MACRO(DynamicTableExample)
-  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData1)
-  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData2)
-  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData3)
-  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData4)
-  PYB11_FILTER_PARAMETER(DynamicTableData, DynamicData5)
-
   PYB11_PROPERTY(DynamicTableData DynamicData1 READ getDynamicData1 WRITE setDynamicData1)
   PYB11_PROPERTY(DynamicTableData DynamicData2 READ getDynamicData2 WRITE setDynamicData2)
   PYB11_PROPERTY(DynamicTableData DynamicData3 READ getDynamicData3 WRITE setDynamicData3)
   PYB11_PROPERTY(DynamicTableData DynamicData4 READ getDynamicData4 WRITE setDynamicData4)
   PYB11_PROPERTY(DynamicTableData DynamicData5 READ getDynamicData5 WRITE setDynamicData5)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = DynamicTableExample;
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
index e23273d86b..8b8313ee06 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
@@ -44,21 +44,17 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ErrorWarningFilter SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ErrorWarningFilter SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ErrorWarningFilter)
   PYB11_FILTER_NEW_MACRO(ErrorWarningFilter)
-  PYB11_FILTER_PARAMETER(bool, PreflightWarning)
-  PYB11_FILTER_PARAMETER(bool, PreflightError)
-  PYB11_FILTER_PARAMETER(bool, ExecuteWarning)
-  PYB11_FILTER_PARAMETER(bool, ExecuteError)
-  PYB11_FILTER_PARAMETER(bool, PropertyError)
   PYB11_PROPERTY(bool PreflightWarning READ getPreflightWarning WRITE setPreflightWarning)
   PYB11_PROPERTY(bool PreflightError READ getPreflightError WRITE setPreflightError)
   PYB11_PROPERTY(bool ExecuteWarning READ getExecuteWarning WRITE setExecuteWarning)
   PYB11_PROPERTY(bool ExecuteError READ getExecuteError WRITE setExecuteError)
   PYB11_PROPERTY(bool PropertyError READ getPropertyError WRITE setPropertyError)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ErrorWarningFilter;
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 810b563f33..60bafb2982 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -66,53 +66,10 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(GenericExample SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(GenericExample SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(GenericExample)
   PYB11_FILTER_NEW_MACRO(GenericExample)
-  PYB11_FILTER_PARAMETER(QString, StlFilePrefix)
-  PYB11_FILTER_PARAMETER(bool, ShowPrefix)
-  PYB11_FILTER_PARAMETER(int, MaxIterations)
-  PYB11_FILTER_PARAMETER(Float2ndOrderPoly_t, SecondOrderACoeff)
-  PYB11_FILTER_PARAMETER(Float3rdOrderPoly_t, ThirdOrderACoeff)
-  PYB11_FILTER_PARAMETER(Float4thOrderPoly_t, FourthOrderACoeff)
-  PYB11_FILTER_PARAMETER(double, MisorientationTolerance)
-  PYB11_FILTER_PARAMETER(DataArrayPath, InputPhaseTypesArrayPath)
-  PYB11_FILTER_PARAMETER(ShapeType::Types, ShapeTypeData)
-  PYB11_FILTER_PARAMETER(int, PhaseCount)
-  PYB11_FILTER_PARAMETER(FPRangePair, InitRange)
-  PYB11_FILTER_PARAMETER(QString, EstimatedPrimaryFeatures)
-  PYB11_FILTER_PARAMETER(QString, InputFile)
-  PYB11_FILTER_PARAMETER(StackFileListInfo, InputFileListInfo)
-  PYB11_FILTER_PARAMETER(QString, SelectedXCoordArrayName)
-  PYB11_FILTER_PARAMETER(QStringList, DataArrayList)
-  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedDataContainer)
-  PYB11_FILTER_PARAMETER(DataContainerArrayProxy, DcaProxy)
-  PYB11_FILTER_PARAMETER(QString, InputPath)
-  PYB11_FILTER_PARAMETER(QString, OutputFile)
-  PYB11_FILTER_PARAMETER(QString, OutputPath)
-  PYB11_FILTER_PARAMETER(QVector<DataArrayPath>, SelectedMultiArrayPaths)
-  PYB11_FILTER_PARAMETER(bool, WriteAlignmentShifts)
-  PYB11_FILTER_PARAMETER(int, ConversionType)
-  PYB11_FILTER_PARAMETER(IntVec3Type, Dimensions)
-  PYB11_FILTER_PARAMETER(IntVec2Type, Range)
-  PYB11_FILTER_PARAMETER(FloatVec3Type, Origin)
-  PYB11_FILTER_PARAMETER(AxisAngleInput_t, CrystalSymmetryRotations)
-  PYB11_FILTER_PARAMETER(DataArrayPath, FeatureIdsArrayPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, AttributeMatrixPath)
-  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedAttributeMatrix)
-  PYB11_FILTER_PARAMETER(DataArrayPath, DataContainerName)
-  PYB11_FILTER_PARAMETER(int, SizeDistributionFitType)
-  PYB11_FILTER_PARAMETER(ComparisonInputs, SelectedThresholds)
-  PYB11_FILTER_PARAMETER(QString, CalcExpression)
-  PYB11_FILTER_PARAMETER(DataArrayPath, CreatedDataArray)
-  PYB11_FILTER_PARAMETER(bool, Bool1)
-  PYB11_FILTER_PARAMETER(double, Double2)
-  PYB11_FILTER_PARAMETER(bool, Bool2)
-  PYB11_FILTER_PARAMETER(int, AlgorithmSelection)
-  PYB11_FILTER_PARAMETER(int, DistanceMetric)
-  PYB11_FILTER_PARAMETER(MontageSelection, MontageSelection)
-
   PYB11_PROPERTY(QString StlFilePrefix READ getStlFilePrefix WRITE setStlFilePrefix)
   PYB11_PROPERTY(bool ShowPrefix READ getShowPrefix WRITE setShowPrefix)
   PYB11_PROPERTY(int MaxIterations READ getMaxIterations WRITE setMaxIterations)
@@ -155,7 +112,8 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(int AlgorithmSelection READ getAlgorithmSelection WRITE setAlgorithmSelection)
   PYB11_PROPERTY(int DistanceMetric READ getDistanceMetric WRITE setDistanceMetric)
   PYB11_PROPERTY(MontageSelection MontageSelection READ getMontageSelection WRITE setMontageSelection)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = GenericExample;
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index 73cc4f0c56..8eacda7674 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -53,21 +53,17 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(MakeDataContainer SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MakeDataContainer SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(MakeDataContainer)
   PYB11_FILTER_NEW_MACRO(MakeDataContainer)
-  PYB11_FILTER_PARAMETER(QString, FeatureIdsArrayName)
-  PYB11_FILTER_PARAMETER(QString, CellEulerAnglesArrayName)
-  PYB11_FILTER_PARAMETER(QString, CellPhasesArrayName)
-  PYB11_FILTER_PARAMETER(QString, CrystalStructuresArrayName)
-  PYB11_FILTER_PARAMETER(QString, LatticeConstantsArrayName)
   PYB11_PROPERTY(QString FeatureIdsArrayName READ getFeatureIdsArrayName WRITE setFeatureIdsArrayName)
   PYB11_PROPERTY(QString CellEulerAnglesArrayName READ getCellEulerAnglesArrayName WRITE setCellEulerAnglesArrayName)
   PYB11_PROPERTY(QString CellPhasesArrayName READ getCellPhasesArrayName WRITE setCellPhasesArrayName)
   PYB11_PROPERTY(QString CrystalStructuresArrayName READ getCrystalStructuresArrayName WRITE setCrystalStructuresArrayName)
   PYB11_PROPERTY(QString LatticeConstantsArrayName READ getLatticeConstantsArrayName WRITE setLatticeConstantsArrayName)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = MakeDataContainer;
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index eeebce0b73..1847b95468 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -55,13 +55,13 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(ThresholdExample SUPERCLASS AbstractFilter)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ThresholdExample SUPERCLASS AbstractFilter)
   PYB11_SHARED_POINTERS(ThresholdExample)
   PYB11_FILTER_NEW_MACRO(ThresholdExample)
-  PYB11_FILTER_PARAMETER(ComparisonInputs, CellComparisonInputs)
   PYB11_PROPERTY(ComparisonInputs CellComparisonInputs READ getCellComparisonInputs WRITE setCellComparisonInputs)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   using Self = ThresholdExample;
diff --git a/Source/SIMPLib/Utilities/MontageSelection.h b/Source/SIMPLib/Utilities/MontageSelection.h
index d36136b45f..5dde0cd87e 100644
--- a/Source/SIMPLib/Utilities/MontageSelection.h
+++ b/Source/SIMPLib/Utilities/MontageSelection.h
@@ -50,8 +50,8 @@
 class SIMPLib_EXPORT MontageSelection
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(MontageSelection)
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MontageSelection)
   PYB11_STATIC_CREATION(Create ARGS std::string std::string int int int int int)
   PYB11_PROPERTY(QString Prefix READ getPrefix WRITE setPrefix)
   PYB11_PROPERTY(QString Suffix READ getSuffix WRITE setSuffix)
@@ -60,7 +60,8 @@ class SIMPLib_EXPORT MontageSelection
   PYB11_PROPERTY(int RowEnd READ getRowEnd WRITE setRowEnd)
   PYB11_PROPERTY(int ColStart READ getColStart WRITE setColStart)
   PYB11_PROPERTY(int ColEnd READ getColEnd WRITE setColEnd)
-#endif
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   MontageSelection();
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index 1c08d76759..c6edb4736a 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -52,15 +52,15 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
 {
     Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-    PYB11_CREATE_BINDINGS(SIMPLH5DataReader)
+    // Start Python bindings declarations
+    PYB11_BEGIN_BINDINGS(SIMPLH5DataReader)
     PYB11_SHARED_POINTERS(SIMPLH5DataReader)
     PYB11_STATIC_NEW_MACRO(SIMPLH5DataReader)
-
     PYB11_METHOD(bool openFile ARGS filePath)
     PYB11_METHOD(bool closeFile)
     PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS SIMPLH5DataReaderRequirements err)
-#endif
+    PYB11_END_BINDINGS()
+    // End Python bindings declarations
 
   public:
     using Self = SIMPLH5DataReader;
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
index d74f717c8c..dcf40b6f01 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
@@ -45,9 +45,10 @@
 class SIMPLib_EXPORT SIMPLH5DataReaderRequirements
 {
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(SIMPLH5DataReaderRequirements)
-#endif
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(SIMPLH5DataReaderRequirements)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
 public:
   SIMPLH5DataReaderRequirements();
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index c753e3f522..e1dbcbff0f 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -245,8 +245,4 @@ if (SIMPL_ENABLE_ANACONDA_PACKAGE)
   #     COMMENT "Installing the dream3d Conda package")
   # endif()
 
-
-
 endif()
-
-
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
index 6222c17b21..4dc3a6c7e2 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
@@ -29,7 +29,7 @@ const QString kReturnValuePolicy("RETURN_VALUE_POLICY");
 const QString kConstGetOverload("CONST_GET_OVERLOAD");
 
 /* These are for the macros that appear in the header files */
-const QString kPYB11_CREATE_BINDINGS("PYB11_CREATE_BINDINGS");
+const QString kPYB11_BEGIN_BINDINGS("PYB11_BEGIN_BINDINGS");
 const QString kPYB11_PROPERTY("PYB11_PROPERTY");
 const QString kPYB11_METHOD("PYB11_METHOD");
 const QString kPYB11_STATIC_CREATION("PYB11_STATIC_CREATION");
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index d2e96de4e2..fc008b15c9 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -369,7 +369,7 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
       tokens = tokens[1].replace(")", "").trimmed().split(" ");
       enumerations << tokens[0];
     }
-    else if(line.contains(kPYB11_CREATE_BINDINGS))
+    else if(line.contains(kPYB11_BEGIN_BINDINGS))
     {
       bindingClass.setNeedsWrapping(true);
       line = line.trimmed();

From 1db53461a0ab054cdd08482df4e67fa3a364d9f7 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <jared.duffey@bluequartz.net>
Date: Sat, 28 Mar 2020 09:03:49 -0400
Subject: [PATCH 191/397] Montage Data Structure (#394)

* Added header file that allows simpler coding for parallel algorithms

* Added SIMPLibParallelAlgorithm.hpp with macros defined for several parts required for running algorithms in parallel.  Alternate versions are available for uses where SIMPL_USE_PARALLEL_ALGORITHMS is not defined.

* Added version 2 of parallel algorithms for data and task

* ParallelDataAlgorithm requires a range and function operator taking the beginning and end.
* ParallelTaskAlgorithm requires only the object for execution.
* Removed SIMPLibParallelAlgorithm.hpp and its macros.
* Added SIMPLRange class that stores a given range, either from manually entered values, SIMPLArray, or tbb::blocked_range<size_t>.  This can be used for function operators instead of diverging tbb::blocked_range<size_t> and size_t versions.

* Updated copyright headers

* Added SIMPLRange3D and ParallelData3DAlgorithm for 3D geometries

* Changed SIMPLRange's  array operator to be const.
* Updated ParallelDataAlgorithm to allow accepting SIMPLRange as a parameter when setting the algorithm's range.

* Updated SIMPLib parallel algorithms to use new ParallelData classes

* Removed several SIMPL_USE_PARALLEL_ALGORITHMS checks and replaced them with ParallelDataAlgorithm or ParallelData3DAlgorithm objects.  This reduced the line count and improved readability.

* Updated the prime contract number for new files

* Updated ParallelTaskAlgorithm checks and destructor

* This prevents crashes and better falls in line with RAII principles.
* Updated ParallelTaskAlgorithm num threads check for >= max threads instead of == max threads

* Added ParallelData2DAlgorithm and SIMPLRange2D

* Split SIMPLRange classes into .h and .cpp

* Split SIMPLRange, SIMPLRange2D, and SIMPLRange3D files and updated their references.

* Added missing const to tbb::blocked_range parameters in SIMPLRange

* All constructors added const to the tbb range references, whether they be tbb::blocked_range, tbb::blocked_range2d, or tbb::blocked_range3d.

* Added explaination as to why TBB is included after SIMPLib

* Added clang-format guards around TBB includes.
* Ran clang-format on affected files.

* Added PyBind11 support to SIMPLRanges

* Additional methods required to get dimensional ranges for SIMPLRange3D.

* Added SIMPLRange3D's range getter methods to PyBind11 support

* Removed Python binding from SIMPLRange classes

* Added Montage support to DataContainerArray

* Added GridMontage and its base class AbstractMontage to hold an organized collection of DataContainers.
* Added INamedObject, INamedCollection, and NamedCollection<T> for tracking a collection of named object where no object in a collection can share a name with another object.  Names are treated like keys where a collection can be searched for an object with a given name, and objects know about the collections they are in so that they do not rename themselves to share a name with another object.  This is similar to the DataStructure nodes except that each INamedObject can be a part of multiple parent collections instead of only one.
* Changed the DataStructureWidget so that it includes both the normal DataStructure view and a Montage view that lists the Montages and their DataContainer list.
* Added GridTileIndex and its base class AbstractTileIndex for looking up DataContainers in a montage.  These act in the same way as QModelIndex in Qt models.
* Abstracted the HTML tooltips from the DataStructureWidget to create ToolTipGenerator that accepts data points row by row to create a uniform HTML tooltip that follows the same pattern as existing tooltips.  Existing tooltips were not updated to use this new class.

* Updated HTML tooltip generation and DataStructureTreeView montages

* Geometry tooltips are generated with ToolTipGenerator and now have methods to create and return a ToolTipGenerator using an IGeometry's current values.
* Added an append method to ToolTipGenerator to append the values in one ToolTipGenerator onto the end of another.
* Updated DataContainer tooltips in DataStructureTreeView Montage display to show the AbstractTileIndex's position as well within each Montage.
* DataContainer now uses ToolTipGenerator to create HTML tooltips.  A public getter is available to create and return a new ToolTipGenerator based on the current values.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Updated GridMontage and DataStructureTreeView to handle null DataCon

* Fixed a bug that caused GridMontage and DataSructureTreeView to crash when a Montage DataContainer was null.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Added getToolTipGenerator() to DataArrays and AttributeMatrix

* IDataArray::getToolTipGenerator() is pure virtual.  IDataArray header includes ToolTipGenerator.h
* DataArray, NeighborList, StatsDataArray, StringDataArray all implement getToolTipGenerator().
* Added getToolTipGenerator() to AttributeMatrix.
* Updated getInfoString(SIMPL::InfoStringFormat) to use getToolTipGenerator() when requesting HTML format.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* WIP: Create Grid Montage filter

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Added CreateGridMontage filter and read/write AbstractMontage

* Added CreateGridMontage filter to create GridMontages from a collection of DataContainers.
* Added DataContainerGridSelectionModel and DataContainerGrid to handle 3D grids of DataContainers.
* Added DataContainerGridSelectionWidget to allow the user to drag and drop DataContainers into a DataContainerGridSelectionModel, control the size of the grid, and control the depth at which the grid is displaying.
* Added the ability to read and write a DataContainerArray's Montage collection in DREAM.3D files.
* Added MontageSupport namespace to handle reading an AbstractMontage::Pointer or MontageCollection from HDF5.  The correct montage type will be instantiated based on values inside the HDF5 group.

* Added DataContainerGridView

* Added DataContainerGridView class derived from QTableView for use with DataContainerGridModel.  This class allows QDragEnterEvents regardless of where the drag enters from as long as it has a DataContainer name under the correct QMimeData dataType.  QTableView would only accept a dragEnter if it entered on an item region.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* WIP: Move montage classes to new Montages module

* Moved AbstractMontage, AbstractTileIndex, DataContainerGrid, GridMontage, GridTileIndex, and MontageSupport from the DataContainers module to Montages module.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Finished changing include paths after creating Montages module

* Fixed AbstractTileIndex include in DataStructureTreeView to use the Montages module instead of DataContainers module.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Added missing closing parenthesis in DataArray HTML tooltip

* Added missing parenthesis to DataArray HTML tooltip when displaying component dimensions.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Added STL iterator support to AbstractMontage through pure virtual

* Support added using pure virtual methods.
* using Iterator and ConstIterator declarations moved to AbstractMontage.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Fixed a check in MontageStructureSelectionFilterParameter readJson()

* Check now requires that jsonValue to be a string instead of requiring it to not be a string.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* MontageStructureSelectionWidget no longer preflights on construction

* Added signal blocker in setupGui() to prevent the signal from being emitted immediately after connecting the signal and slot.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Update MontageStructureSelectionWidget::afterPreflight()

* MontageStructureSelectionWidget now updates the current montage name from the FilterParameter instead of the UI when changing the combo box.

* Fixing invalid characters in software licenses so that file can be decoded as UTF-8.

Clang formatting.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Fixing compiler errors on MacOS. (#9)

* Fixing compiler errors on MacOS.
* Clang formatting.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Added ability to create grid montages with different collection methods.

Added Row-By-Row, Column-By-Column, Snake By Rows, and Snake By Columns collection methods.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Clang format.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Adding missing break statements and removing unneeded curly brackets.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Changing RowByRow and ColumnByColumn to CombByRows and CombByColumns.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Adding missing enumerations.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* Removing CombByColumns and SnakeByColumns enumeration values.

* Changing CombByRows and SnakeByRows to CombOrder and SnakeOrder.

Signed-off-by: Joey Kleingers <joey.kleingers@bluequartz.net>

* MontageStructureSelectionWidget preserves selection from json

* Loading a pipeline from json now adds the selected montage to the selection combo box long enough to avoid loading a modified pipeline.  Previously, the selection would be cleared when loading the pipeline as there were no montages while the pipeline was being loaded.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Removed unused source file

* NamedCollection.cpp was created to work alongside NamedCollection.h, which was replaced with the templated NamedCollection.hpp

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Updates to allow compiling on clang/gcc (#11)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix possible crashing bug due to not updating the filter instance with an error code.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix spelling error in TileRCIndexLayout2D

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed DataArray constructor not using initValue parameter

* m_InitValue is now set to initValue parameter instead of static_cast<T>(0)

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Added getter for DataArray<T> InitValue property

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Add a FloatVec7Type for use in by other codes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed IVec7Type array constructor with correct size and indices

* Requires std::array<T,7> instead of std::array<T,6> to avoid going out of bounds
* Now sets index 6 instead of overwriting index 5.

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Changed return type DataContainerArray::createNonPrereqGridMontage

* Changed the return type from AbstractMontageShPtr to GridMontageShPtr

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Fix issue when closing HDF5 files that have a montage.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix issue loading CSS customer properties for Geometry icons

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Enable Python for the CreateGridMontage filter

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed ImageGeom tooltip generation by adding missing ')' for Extents

Signed-off-by: Matthew Marine <matthew.marine@bluequartz.net>

* Create 'LegacyPropertyName' in FilterParameter

This can be optionally used by filters that have been around for a while
and that need to change a filter parameter property name. This only allows
for a single property name change for a given filter parameter.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Update the Montage Selection Widget to list columns first

This makes it more consistent with other areas of the UI

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix compile error on GCC due to missing include directive

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fix to GCC Compiler error due to ambiguous casting

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Updated filters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

Co-authored-by: Matthew Marine <matthew.marine@bluequartz.net>
Co-authored-by: Joey Kleingers <joey.kleingers@bluequartz.net>
Co-authored-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CMakeLists.txt                 |   2 +-
 Source/SIMPLib/Common/Constants.h             |   1 +
 Source/SIMPLib/Common/INamedCollection.cpp    |  63 ++
 Source/SIMPLib/Common/INamedCollection.h      | 120 ++++
 Source/SIMPLib/Common/INamedObject.cpp        | 142 ++++
 Source/SIMPLib/Common/INamedObject.h          | 167 +++++
 Source/SIMPLib/Common/NamedCollection.hpp     | 272 ++++++++
 Source/SIMPLib/Common/SIMPLArray.hpp          | 139 ++++
 Source/SIMPLib/Common/SourceList.cmake        |   5 +
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |   1 +
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp | 282 ++++++++
 .../SIMPLib/CoreFilters/CreateGridMontage.h   | 199 ++++++
 .../CoreFilters/CreateImageGeometry.cpp       |   1 +
 .../CoreFilters/DataContainerReader.cpp       |  36 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |   8 +
 .../CoreFilters/DataContainerWriter.cpp       |  39 ++
 .../SIMPLib/CoreFilters/DataContainerWriter.h |   7 +
 .../SetOriginResolutionImageGeom.cpp          |   1 +
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 Source/SIMPLib/DataArrays/DataArray.hpp       |  41 ++
 Source/SIMPLib/DataArrays/IDataArray.h        |   8 +
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  41 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |  37 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |   7 +
 Source/SIMPLib/DataArrays/StringDataArray.cpp |  34 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |   7 +
 Source/SIMPLib/DataArrays/StructArray.hpp     |  36 +-
 .../DataContainers/AttributeMatrix.cpp        | 153 ++--
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   9 +
 .../SIMPLib/DataContainers/DataContainer.cpp  |  42 +-
 Source/SIMPLib/DataContainers/DataContainer.h |   9 +
 .../DataContainers/DataContainerArray.cpp     | 225 +++++-
 .../DataContainers/DataContainerArray.h       |  86 ++-
 .../DataContainers/IDataStructureNode.cpp     |   4 +-
 .../CoreFilters/CreateGridMontage.md          |  44 ++
 ...AttributeMatrixCreationFilterParameter.cpp |   4 +
 ...ttributeMatrixSelectionFilterParameter.cpp |   4 +
 .../AxisAngleFilterParameter.cpp              |   4 +
 .../BooleanFilterParameter.cpp                |   4 +
 .../CalculatorFilterParameter.cpp             |   4 +
 .../ChoiceFilterParameter.cpp                 |   4 +
 ...arisonSelectionAdvancedFilterParameter.cpp |   4 +
 .../ComparisonSelectionFilterParameter.cpp    |   4 +
 .../DataArrayCreationFilterParameter.cpp      |   4 +
 .../DataArraySelectionFilterParameter.cpp     |   4 +
 ...DataContainerArrayProxyFilterParameter.cpp |   4 +
 .../DataContainerCreationFilterParameter.cpp  |   4 +
 ...aContainerGridSelectionFilterParameter.cpp | 215 ++++++
 ...ataContainerGridSelectionFilterParameter.h | 190 +++++
 .../DataContainerReaderFilterParameter.cpp    |   4 +
 .../DataContainerSelectionFilterParameter.cpp |   4 +
 .../DoubleFilterParameter.cpp                 |   4 +
 .../DynamicChoiceFilterParameter.cpp          |   4 +
 .../DynamicTableFilterParameter.cpp           |   4 +
 .../FileListInfoFilterParameter.cpp           |   4 +
 .../FilterParameters/FilterParameter.cpp      |  12 +
 .../FilterParameters/FilterParameter.h        |  15 +
 .../FilterParameters/FloatFilterParameter.cpp |   4 +
 .../FloatVec2FilterParameter.cpp              |   8 +-
 Source/SIMPLib/FilterParameters/FloatVec3.h   |   0
 .../FloatVec3FilterParameter.cpp              |   8 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |   4 +
 .../InputFileFilterParameter.cpp              |   4 +
 .../InputPathFilterParameter.cpp              |   4 +
 .../FilterParameters/IntFilterParameter.cpp   |   4 +
 .../IntVec2FilterParameter.cpp                |   8 +-
 .../IntVec3FilterParameter.cpp                |   8 +-
 .../LinkedBooleanFilterParameter.cpp          |   4 +
 ...dDataContainerSelectionFilterParameter.cpp |   4 +
 .../LinkedPathCreationFilterParameter.cpp     |   4 +
 ...ntageStructureSelectionFilterParameter.cpp | 184 +++++
 ...MontageStructureSelectionFilterParameter.h | 164 +++++
 ...ttributeMatrixSelectionFilterParameter.cpp |   4 +
 ...MultiDataArraySelectionFilterParameter.cpp |   4 +
 ...iDataContainerSelectionFilterParameter.cpp |   4 +
 .../NumericTypeFilterParameter.cpp            |   4 +
 .../OutputFileFilterParameter.cpp             |   4 +
 .../OutputPathFilterParameter.cpp             |   4 +
 .../ParagraphFilterParameter.cpp              |   4 +
 .../PhaseTypeSelectionFilterParameter.cpp     |   4 +
 .../FilterParameters/RangeFilterParameter.cpp |   4 +
 .../ScalarTypeFilterParameter.cpp             |   4 +
 .../SecondOrderPolynomialFilterParameter.cpp  |   4 +
 .../ShapeTypeSelectionFilterParameter.cpp     |   4 +
 .../SIMPLib/FilterParameters/SourceList.cmake |   4 +
 .../StringFilterParameter.cpp                 |   4 +
 .../ThirdOrderPolynomialFilterParameter.cpp   |   4 +
 .../UInt64FilterParameter.cpp                 |   4 +
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |  32 +-
 Source/SIMPLib/Geometry/EdgeGeom.h            |   7 +
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |  31 +-
 Source/SIMPLib/Geometry/HexahedralGeom.h      |   7 +
 Source/SIMPLib/Geometry/IGeometry.h           |  76 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  73 +-
 Source/SIMPLib/Geometry/ImageGeom.h           |   7 +
 Source/SIMPLib/Geometry/QuadGeom.cpp          |  32 +-
 Source/SIMPLib/Geometry/QuadGeom.h            |   7 +
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |  37 +-
 Source/SIMPLib/Geometry/RectGridGeom.h        |   7 +
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |  31 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h     |   7 +
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |  31 +-
 Source/SIMPLib/Geometry/TriangleGeom.h        |   7 +
 Source/SIMPLib/Geometry/VertexGeom.cpp        |  30 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |   7 +
 Source/SIMPLib/Montages/AbstractMontage.cpp   |  86 +++
 Source/SIMPLib/Montages/AbstractMontage.h     | 174 +++++
 Source/SIMPLib/Montages/AbstractTileIndex.cpp |  72 ++
 Source/SIMPLib/Montages/AbstractTileIndex.h   |  97 +++
 Source/SIMPLib/Montages/DataContainerGrid.cpp | 195 ++++++
 Source/SIMPLib/Montages/DataContainerGrid.h   | 112 +++
 Source/SIMPLib/Montages/GridMontage.cpp       | 657 ++++++++++++++++++
 Source/SIMPLib/Montages/GridMontage.h         | 275 ++++++++
 Source/SIMPLib/Montages/GridTileIndex.cpp     | 139 ++++
 Source/SIMPLib/Montages/GridTileIndex.h       | 114 +++
 Source/SIMPLib/Montages/MontageSupport.cpp    | 140 ++++
 Source/SIMPLib/Montages/MontageSupport.h      |  53 ++
 Source/SIMPLib/Montages/SourceList.cmake      |  86 +++
 .../Montages/Testing/Cxx/SourceList.cmake     |   4 +
 .../SIMPLib/Utilities/FilePathGenerator.cpp   |   4 +-
 Source/SIMPLib/Utilities/FilePathGenerator.h  |   4 +-
 .../Utilities/ParallelData2DAlgorithm.cpp     |   2 +-
 .../Utilities/ParallelData2DAlgorithm.h       |   2 +-
 .../Utilities/ParallelData3DAlgorithm.cpp     |   2 +-
 .../Utilities/ParallelData3DAlgorithm.h       |   2 +-
 .../Utilities/ParallelDataAlgorithm.cpp       |   2 +-
 .../SIMPLib/Utilities/ParallelDataAlgorithm.h |   2 +-
 .../Utilities/ParallelTaskAlgorithm.cpp       |   2 +-
 .../SIMPLib/Utilities/ParallelTaskAlgorithm.h |   2 +-
 Source/SIMPLib/Utilities/SourceList.cmake     |   2 +
 Source/SIMPLib/Utilities/ToolTipGenerator.cpp | 170 +++++
 Source/SIMPLib/Utilities/ToolTipGenerator.h   | 127 ++++
 .../DataContainerGridModel.cpp                | 315 +++++++++
 .../DataContainerGridModel.h                  | 215 ++++++
 .../DataContainerGridSelectionWidget.cpp      | 287 ++++++++
 .../DataContainerGridSelectionWidget.h        | 116 ++++
 .../MontageStructureSelectionWidget.cpp       | 227 ++++++
 .../MontageStructureSelectionWidget.h         | 114 +++
 .../FilterParameterWidgets/SourceList.cmake   |   4 +
 .../DataContainerGridSelectionWidget.ui       | 269 +++++++
 .../UI_Files/MontageSelectionWidget.ui        | 128 ++--
 .../MontageStructureSelectionWidget.ui        |  63 ++
 .../Widgets/DataContainerGridView.cpp         |  66 ++
 .../Widgets/DataContainerGridView.h           |  61 ++
 .../Widgets/DataStructureTreeView.cpp         | 569 +++++++++++++--
 .../Widgets/DataStructureTreeView.h           | 125 +++-
 .../Widgets/DataStructureWidget.cpp           | 365 ++--------
 .../Widgets/DataStructureWidget.h             |  55 +-
 Source/SVWidgetsLib/Widgets/SourceList.cmake  |   2 +
 .../Widgets/UI_Files/DataStructureWidget.ui   | 248 +++++--
 150 files changed, 8528 insertions(+), 906 deletions(-)
 create mode 100644 Source/SIMPLib/Common/INamedCollection.cpp
 create mode 100644 Source/SIMPLib/Common/INamedCollection.h
 create mode 100644 Source/SIMPLib/Common/INamedObject.cpp
 create mode 100644 Source/SIMPLib/Common/INamedObject.h
 create mode 100644 Source/SIMPLib/Common/NamedCollection.hpp
 create mode 100644 Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/CreateGridMontage.h
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGridMontage.md
 create mode 100644 Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
 delete mode 100644 Source/SIMPLib/FilterParameters/FloatVec3.h
 create mode 100644 Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
 create mode 100644 Source/SIMPLib/Montages/AbstractMontage.cpp
 create mode 100644 Source/SIMPLib/Montages/AbstractMontage.h
 create mode 100644 Source/SIMPLib/Montages/AbstractTileIndex.cpp
 create mode 100644 Source/SIMPLib/Montages/AbstractTileIndex.h
 create mode 100644 Source/SIMPLib/Montages/DataContainerGrid.cpp
 create mode 100644 Source/SIMPLib/Montages/DataContainerGrid.h
 create mode 100644 Source/SIMPLib/Montages/GridMontage.cpp
 create mode 100644 Source/SIMPLib/Montages/GridMontage.h
 create mode 100644 Source/SIMPLib/Montages/GridTileIndex.cpp
 create mode 100644 Source/SIMPLib/Montages/GridTileIndex.h
 create mode 100644 Source/SIMPLib/Montages/MontageSupport.cpp
 create mode 100644 Source/SIMPLib/Montages/MontageSupport.h
 create mode 100644 Source/SIMPLib/Montages/SourceList.cmake
 create mode 100644 Source/SIMPLib/Montages/Testing/Cxx/SourceList.cmake
 create mode 100644 Source/SIMPLib/Utilities/ToolTipGenerator.cpp
 create mode 100644 Source/SIMPLib/Utilities/ToolTipGenerator.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/DataContainerGridSelectionWidget.ui
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageStructureSelectionWidget.ui
 create mode 100644 Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
 create mode 100644 Source/SVWidgetsLib/Widgets/DataContainerGridView.h

diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index b58571e3fe..9e7b0d077c 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -87,7 +87,7 @@ endMacro()
 
 #------------------------------------------------------------------------------
 # Set up the directories that are used for each Group
-set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages StatsData Utilities)
+set(SIMPL_Group_BASE_MODULES Common DataArrays DataContainers Geometry HDF5 Math Messages Montages StatsData Utilities)
 if (SIMPL_USE_ITK)
   set(SIMPL_Group_BASE_MODULES ${SIMPL_Group_BASE_MODULES} ITK)
 endif()
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 6f8139bc26..690733b951 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -598,6 +598,7 @@ const unsigned int UnknownRefFrameZDirection = 2;
     const QString DataContainerBundleGroupName("DataContainerBundles");
     const QString DataContainerNames("DataContainerNames");
     const QString MetaDataArrays("MetaDataArrays");
+    const QString MontageGroupName("Montages");
     const QString DataContainerType("DataContainerType");
     const QString AttributeMatrixType("AttributeMatrixType");
 
diff --git a/Source/SIMPLib/Common/INamedCollection.cpp b/Source/SIMPLib/Common/INamedCollection.cpp
new file mode 100644
index 0000000000..e0db1805ec
--- /dev/null
+++ b/Source/SIMPLib/Common/INamedCollection.cpp
@@ -0,0 +1,63 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "INamedCollection.h"
+
+#include "SIMPLib/Common/INamedObject.h"
+
+INamedCollection::INamedCollection() = default;
+
+INamedCollection::~INamedCollection() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void INamedCollection::handleAddingObject(INamedObject* obj)
+{
+  obj->addToCollection(this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void INamedCollection::handleRemovingObject(INamedObject* obj)
+{
+  obj->removeFromCollection(this);
+}
+
+// -----------------------------------------------------------------------------
+INamedCollection::Pointer INamedCollection::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+
diff --git a/Source/SIMPLib/Common/INamedCollection.h b/Source/SIMPLib/Common/INamedCollection.h
new file mode 100644
index 0000000000..4963206d84
--- /dev/null
+++ b/Source/SIMPLib/Common/INamedCollection.h
@@ -0,0 +1,120 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
+
+class INamedObject;
+
+/**
+ * @class INamedCollection INamedCollection.h SIMPLib/Common/INamedCollection.h
+ * @brief The INamedCollection class is used as an interface for INamedObject collections.
+ * Adding to or removing from the collection should alert the INamedObject to the action
+ * so that the INamedObject can check if it can be renamed.  This also adds extended support
+ * for graph theory implementations as INamedObjects can have and keep track of multiple parents.
+ */
+class SIMPLib_EXPORT INamedCollection
+{
+public:
+    using Self = INamedCollection;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
+    static Pointer NullPointer();
+
+    INamedCollection();
+    virtual ~INamedCollection();
+
+    INamedCollection(const INamedCollection&) = default;            // Copy Constructor Not Implemented
+    INamedCollection(INamedCollection&&) = default;                 // Move Constructor Not Implemented
+    INamedCollection& operator=(const INamedCollection&) = default; // Copy Assignment Not Implemented
+    INamedCollection& operator=(INamedCollection&&) = default;      // Move Assignment Not Implemented
+
+    using NameList = QStringList;
+
+    /**
+     * @brief Returns the number of items in the collection.
+     * @return
+     */
+    virtual size_t size() const = 0;
+
+    /**
+     * @brief Returns true if the collection is empty.  Returns false otherwise.
+     * @return
+     */
+    virtual bool isEmpty() const = 0;
+
+    /**
+     * @brief Clears the collection of all items.
+     */
+    virtual void clear() = 0;
+
+    /**
+     * @brief Erases any item with the given name.
+     * @param name
+     */
+    virtual void erase(const QString& name) = 0;
+
+    /**
+     * @brief Returns true if the collection contains an item with the given name.
+     * Returns false otherwise.
+     * @param name
+     * @return
+     */
+    virtual bool contains(const QString& name) const = 0;
+
+    /**
+     * @brief Returns a list of all names in the collection.
+     * @return
+     */
+    virtual NameList getNameList() const = 0;
+
+  protected:
+    /**
+     * @brief Alerts the INamedObject that it has been added to a collection.
+     * @param obj
+     */
+    void handleAddingObject(INamedObject* obj);
+
+    /**
+     * @brief Alerts the INamedObject that it has been removed from a collection.
+     * @param obj
+     */
+    void handleRemovingObject(INamedObject* obj);
+
+  private:
+
+};
diff --git a/Source/SIMPLib/Common/INamedObject.cpp b/Source/SIMPLib/Common/INamedObject.cpp
new file mode 100644
index 0000000000..ce6c13ffca
--- /dev/null
+++ b/Source/SIMPLib/Common/INamedObject.cpp
@@ -0,0 +1,142 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "INamedObject.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+INamedObject::HashType INamedObject::CreateHash(const QString& string)
+{
+  return std::hash<std::string>()(string.toStdString());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+INamedObject::INamedObject(const QString& name)
+: m_Name(name)
+, m_NameHash(CreateHash(name))
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+INamedObject::~INamedObject()
+{
+  ParentCollectionType collections = getParentCollections();
+  for(const auto& collection : collections)
+  {
+    collection->erase(getName());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString INamedObject::getName() const
+{
+  return m_Name;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool INamedObject::setName(const QString& name)
+{
+  for(const auto& collection : m_ParentCollctions)
+  {
+    // If collection does not exist, something has else gone wrong and requires attention.
+    if(collection->contains(name))
+    {
+      return false;
+    }
+  }
+
+  m_NameHash = CreateHash(name);
+  m_Name = name;
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+INamedObject::HashType INamedObject::getNameHash() const
+{
+  return m_NameHash;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+INamedObject::ParentCollectionType INamedObject::getParentCollections() const
+{
+  return m_ParentCollctions;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void INamedObject::addToCollection(INamedCollection* collection)
+{
+  m_ParentCollctions.insert(collection);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void INamedObject::removeFromCollection(INamedCollection* collection)
+{
+  m_ParentCollctions.erase(collection);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool INamedObject::operator<(const INamedObject& other) const
+{
+  return getNameHash() < other.getNameHash();
+}
+
+bool INamedObject::operator==(const INamedObject& other) const
+{
+  return getNameHash() == other.getNameHash();
+}
+
+// -----------------------------------------------------------------------------
+INamedObject::Pointer INamedObject::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+
diff --git a/Source/SIMPLib/Common/INamedObject.h b/Source/SIMPLib/Common/INamedObject.h
new file mode 100644
index 0000000000..b94cd379f5
--- /dev/null
+++ b/Source/SIMPLib/Common/INamedObject.h
@@ -0,0 +1,167 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <functional>
+#include <set>
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+
+#include "SIMPLib/Common/INamedCollection.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @class INamedObject INamedObject.h SIMPLib/Common/INamedObject.h
+ * @brief The INamedObject is a base class for named objects in SIMPL, allowing
+ * them to be placed in special containers that key off of the object's name
+ * instead of requiring the key and value to be updated separately.  An added
+ * bonus is the ability to keep track of any naming conflicts that could occur
+ * when renaming an object when it is contained by multiple collections. This
+ * also offers the ability to track parent collections in a bi-directional graph.
+ */
+class SIMPLib_EXPORT INamedObject
+{
+  friend INamedCollection;
+
+public:
+    using Self = INamedObject;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
+    static Pointer NullPointer();
+
+
+  using HashType = size_t;
+  using ParentCollectionType = std::set<INamedCollection*>;
+
+  /**
+   * @brief Remove this object from its parent containers upon deletion.
+   */
+  virtual ~INamedObject();
+
+  /**
+   * @brief Method for creating hashes from QString values.
+   * @param string
+   * @return
+   */
+  static HashType CreateHash(const QString& string);
+
+  /**
+   * @brief Returns the object's name value.
+   * @return
+   */
+  QString getName() const;
+
+  /**
+   * @brief Attempts to set the object's name value.
+   * Returns true if the operation succeded.  Returns false otherwise.
+   * @param newName
+   * @return
+   */
+  bool setName(const QString& newName);
+
+  /**
+   * @brief Returns the hash value for the current name.
+   * This value should be set when the name is changed so that it does not
+   * have to be calculated every time this method is called.
+   * @return
+   */
+  HashType getNameHash() const;
+
+  /**
+   * @brief Returns a set with all parent collections.
+   * @return
+   */
+  ParentCollectionType getParentCollections() const;
+
+  /**
+   * @brief Compares the hash value between two INamedObjects and returns if this
+   * object's value is less than the other.
+   * @param other
+   * @return
+   */
+  bool operator<(const INamedObject& other) const;
+
+  /**
+   * @brief Compares the hash value of two INamedObjects for equality.
+   * Returns true if both are equal.  Returns false otherwise.
+   * @param other
+   * @return
+   */
+  bool operator==(const INamedObject& other) const;
+
+protected:
+  INamedObject(const QString& name);
+
+private:
+
+  /**
+   * @brief Adds the collection to the list of parents.
+   * @param collection
+   */
+  void addToCollection(INamedCollection* collection);
+
+  /**
+   * @brief Removed the collection from the list of parents.
+   * @param collection
+   */
+  void removeFromCollection(INamedCollection* collection);
+
+  ParentCollectionType m_ParentCollctions;
+  QString m_Name;
+  HashType m_NameHash;
+};
+
+/**
+ * @brief Compares two INamedObject shared pointers based on the less than operator of their base pointers.
+ * @param lhs
+ * @param rhs
+ * @return
+ */
+inline bool operator<(const INamedObject::Pointer& lhs, const INamedObject::Pointer& rhs)
+{
+  return (*lhs) < (*rhs);
+}
+
+/**
+ * @brief Compares two INamedObject shared pointers based on the equality operator of their base pointers.
+ * @param lhs
+ * @param rhs
+ * @return
+ */
+inline bool operator==(const INamedObject::Pointer& lhs, const INamedObject::Pointer& rhs)
+{
+  return (*lhs) == (*rhs);
+}
diff --git a/Source/SIMPLib/Common/NamedCollection.hpp b/Source/SIMPLib/Common/NamedCollection.hpp
new file mode 100644
index 0000000000..b7863406de
--- /dev/null
+++ b/Source/SIMPLib/Common/NamedCollection.hpp
@@ -0,0 +1,272 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+#include <set>
+#include <type_traits>
+
+#include <QtCore/QString>
+
+#include "SIMPLib/Common/INamedObject.h"
+
+//#include "SIMPLib/Montages/AbstractMontage.h"
+
+/**
+ * @class NamedCollection NamedCollection.hpp SIMPLib/Common/NamedCollection.hpp
+ * @brief NamedCollection is a templated set of named objects of a certain type.
+ * By deriving from INamedCollection, the items in the collection can keep track
+ * of what collections they are in.  This, along with the custom hashing in
+ * INamedObject, allows the collection to be treated like a map without separating
+ * the key and value.
+ */
+template <class T>
+class NamedCollection : public INamedCollection
+{
+  using Self = NamedCollection<T>;
+
+public:
+  using ChildType = typename std::shared_ptr<T>;
+  using Collection = typename std::set<ChildType>;
+  using Iterator = typename Collection::iterator;
+  // using ConstIterator = typename Collection::const_iterator;
+
+private:
+  Collection m_Items;
+
+public:
+  /* --------------- Begin STL iterator support ------------------ */
+  /**
+   * @brief Returns an iterator to the first item in the collection.
+   * @return
+   */
+  Iterator begin()
+  {
+    return m_Items.begin();
+  }
+
+  /**
+   * @brief Returns an iterator to the last item in the collection.
+   * @return
+   */
+  Iterator end()
+  {
+    return m_Items.end();
+  }
+
+  /**
+   * @brief Returns a const iterator to the first item in the collection.
+   * @return
+   */
+  Iterator begin() const
+  {
+    return m_Items.begin();
+  }
+
+  /**
+   * @brief Returns a const iterator to the last item in the collection.
+   * @return
+   */
+  Iterator end() const
+  {
+    return m_Items.end();
+  }
+  /* --------------- End STL iterator support ------------------ */
+
+  /**
+   * @brief Removes all items from the collection.
+   */
+  void clear() override
+  {
+    for(const auto& item : m_Items)
+    {
+      handleRemovingObject(item.get());
+    }
+    m_Items.clear();
+  }
+
+  /**
+   * @brief Default constructor
+   */
+  NamedCollection()
+  {
+  }
+
+  // NamedCollection(const NamedCollection<T>& other)
+  //: m_Items(other.m_Items)
+  //{
+  //  for(const auto& item : *this)
+  //  {
+  //    handleAddingObject(item);
+  //  }
+  //}
+
+  /**
+   * @brief Remove all children from the collection before it is destroyed.
+   */
+  virtual ~NamedCollection()
+  {
+    clear();
+  }
+
+  /**
+   * @brief Returns the size of the collection.
+   * @return
+   */
+  size_t size() const override
+  {
+    return m_Items.size();
+  }
+
+  /**
+   * @brief Returns true if the collection is empty.
+   * @return
+   */
+  bool isEmpty() const override
+  {
+    return m_Items.empty();
+  }
+
+  /**
+   * @brief Searches the collection for an object with the given name.
+   * @param name
+   * @return
+   */
+  Iterator find(const QString& name) const
+  {
+    // Hash the target name to reduce the time required for each item
+    INamedObject::HashType targetHash = INamedObject::CreateHash(name);
+    auto unaryPredicate = [name, targetHash](const ChildType& obj) {
+      if(obj->getNameHash() == targetHash)
+      {
+        return true;
+      }
+      return false;
+    };
+
+    return std::find_if(begin(), end(), unaryPredicate);
+  }
+
+  /**
+   * @brief Erases any item with the given name.
+   * @param name
+   */
+  void erase(const QString& name) override
+  {
+    Iterator iter = find(name);
+    if(iter == end())
+    {
+      return;
+    }
+
+    handleRemovingObject((*iter).get());
+    m_Items.erase(iter);
+  }
+
+  /**
+   * @brief Attempts to insert the given item into the collection.
+   * This will fail if an item with the same name already exists in the collection.
+   * @return
+   */
+  bool insert(const ChildType& newItem)
+  {
+    if(nullptr == newItem)
+    {
+      return false;
+    }
+    if(!m_Items.insert(newItem).second)
+    {
+      return false;
+    }
+
+    handleAddingObject(newItem.get());
+    return true;
+  }
+
+  /**
+   * @brief Adds the given item to the collection. If an item with the same name already exists, it is removed.
+   * @param newItem
+   */
+  void addOrReplace(const ChildType& newItem)
+  {
+    erase(newItem->getName());
+    insert(newItem);
+  }
+
+  /**
+   * @brief Returns true if the collection contains an object with the given name.  Returns false otherwise.
+   * @param name
+   * @return
+   */
+  bool contains(const QString& name) const override
+  {
+    return find(name) != end();
+  }
+
+  /**
+   * @brief Returns a list of all the names used in the collection.
+   * @return
+   */
+  NameList getNameList() const override
+  {
+    NameList names;
+    for(const auto& obj : m_Items)
+    {
+      names.push_back(obj->getName());
+    }
+
+    return names;
+  }
+
+  /**
+   * @brief Lexicographically compares collections.  Returns true if the items in
+   * this collection are less than the other's.  Returns false otherwise.
+   * @param other
+   * @return
+   */
+  bool operator<(const Self& other) const
+  {
+    return m_Items < other.m_Items;
+  }
+
+  /**
+   * @brief Lexicographically compares collections.  Returns true if the items in
+   * this collection are equal to the other's.  Returns false otherwise.
+   * @param other
+   * @return
+   */
+  bool operator==(const Self& other) const
+  {
+    return m_Items == other.m_Items;
+  }
+};
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index d488b324a1..848cf798c8 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -735,6 +735,142 @@ class IVec6 : public SIMPLArray<T, 6>
   }
 };
 
+// -----------------------------------------------------------------------------
+template <typename T>
+class IVec7 : public SIMPLArray<T, 7>
+{
+  using ParentType = SIMPLArray<T, 7>;
+
+public:
+  IVec7(const IVec7&) = default;
+  IVec7(IVec7&&) noexcept = default;
+  IVec7& operator=(const IVec7&) = default;
+  IVec7& operator=(IVec7&&) noexcept = default;
+  ~IVec7() = default;
+
+  /**
+   * @brief IVec6 Default constructor initializes all values to ZERO.
+   */
+  IVec7()
+  {
+    (*this)[0] = static_cast<T>(0);
+    (*this)[1] = static_cast<T>(0);
+    (*this)[2] = static_cast<T>(0);
+    (*this)[3] = static_cast<T>(0);
+    (*this)[4] = static_cast<T>(0);
+    (*this)[5] = static_cast<T>(0);
+    (*this)[6] = static_cast<T>(0);
+  }
+  /**
+   * @brief IVec6
+   * @param x
+   * @param y
+   * @param z
+   * @param a
+   * @param b
+   * @param c
+   */
+  IVec7(T x, T y, T z, T a, T b, T c, T d)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = a;
+    (*this)[4] = b;
+    (*this)[5] = c;
+    (*this)[6] = d;
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec7(const std::array<T, 7>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+    (*this)[6] = data[6];
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec7(const std::tuple<T, T, T, T, T, T, T>& data)
+  {
+    (*this)[0] = std::get<0>(data);
+    (*this)[1] = std::get<1>(data);
+    (*this)[2] = std::get<2>(data);
+    (*this)[3] = std::get<3>(data);
+    (*this)[4] = std::get<4>(data);
+    (*this)[5] = std::get<5>(data);
+    (*this)[6] = std::get<6>(data);
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec7(const T* data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+    (*this)[6] = data[6];
+  }
+  /**
+   * @brief IVec6
+   * @param data
+   */
+  IVec7(const std::vector<T>& data)
+  {
+    (*this)[0] = data[0];
+    (*this)[1] = data[1];
+    (*this)[2] = data[2];
+    (*this)[3] = data[3];
+    (*this)[4] = data[4];
+    (*this)[5] = data[5];
+    (*this)[6] = data[6];
+  }
+
+  /**
+   * @brief this is a convenience function that helps with the python bindings
+   */
+  inline void setValues(const T& x, const T& y, const T& z, const T& i, const T& j, const T& k, const T& l)
+  {
+    (*this)[0] = x;
+    (*this)[1] = y;
+    (*this)[2] = z;
+    (*this)[3] = i;
+    (*this)[4] = j;
+    (*this)[5] = k;
+    (*this)[6] = l;
+  }
+
+  /**
+   * @brief toTuple Converts the internal data structure to a std::tuple<T, T, T>
+   * @return
+   */
+  std::tuple<T, T, T, T, T, T, T> toTuple() const
+  {
+    return std::make_tuple((*this)[0], (*this)[1], (*this)[2], (*this)[3], (*this)[4], (*this)[5], (*this)[6]);
+  }
+
+  /**
+   * @brief Converts this array into another array using a static_cast<OutType> mechanism
+   */
+  template <typename OutType>
+  IVec7<OutType> convertType()
+  {
+    return IVec6<OutType>(static_cast<OutType>((*this)[0]), static_cast<OutType>((*this)[1]), static_cast<OutType>((*this)[2]), static_cast<OutType>((*this)[3]), static_cast<OutType>((*this)[4]),
+                          static_cast<OutType>((*this)[5]), static_cast<OutType>((*this)[6]));
+  }
+};
+
 using FloatVec3Type = IVec3<float>;
 using IntVec3Type = IVec3<int>;
 using SizeVec3Type = IVec3<size_t>;
@@ -745,3 +881,6 @@ using SizeVec4Type = IVec4<size_t>;
 
 using FloatVec6Type = IVec6<float>;
 using IntVec6Type = IVec6<int32_t>;
+
+using FloatVec7Type = IVec7<float>;
+using IntVec7Type = IVec7<int32_t>;
diff --git a/Source/SIMPLib/Common/SourceList.cmake b/Source/SIMPLib/Common/SourceList.cmake
index 4011283f72..59e92de368 100755
--- a/Source/SIMPLib/Common/SourceList.cmake
+++ b/Source/SIMPLib/Common/SourceList.cmake
@@ -22,6 +22,9 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Constants.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/CreatedArrayHelpIndexEntry.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IObserver.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/INamedCollection.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/INamedObject.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NamedCollection.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QtBackwardCompatibilityMacro.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibDLLExport.h
@@ -42,6 +45,8 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DocRequestManager.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/EnsembleInfo.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IObserver.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/INamedCollection.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/INamedObject.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Observable.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Observer.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/PhaseType.cpp
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 83ec06248c..030022350b 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -180,6 +180,7 @@ void CreateGeometry::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateGeometry, 0));
     parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateGeometry, 0));
+    parameters.back()->setLegacyPropertyName("Resolution");
     parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 0));
   }
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
new file mode 100644
index 0000000000..782e05d798
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -0,0 +1,282 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "CreateGridMontage.h"
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
+#include "SIMPLib/SIMPLibVersion.h"
+
+enum createdPathID : RenameDataPath::DataID_t
+{
+  DataContainerID = 1
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+CreateGridMontage::CreateGridMontage()
+: m_MontageName("Grid Montage")
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+CreateGridMontage::~CreateGridMontage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+  parameters.push_back(SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container Grid", GridSelection, FilterParameter::Parameter, CreateGridMontage));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Created Montage Name", MontageName, FilterParameter::CreatedArray, CreateGridMontage));
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::readFilterParameters(AbstractFilterParametersReader* reader, int index)
+{
+  reader->openFilterGroup(this, index);
+  reader->closeFilterGroup();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::initialize()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  getDataContainerArray()->createNonPrereqGridMontage(this, getMontageName(), m_GridSelection.getDimensions(), m_GridSelection.getDataContainerNames());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::execute()
+{
+  clearErrorCode();
+  clearWarningCode();
+  dataCheck();
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  if(getCancel())
+  {
+    return;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer CreateGridMontage::newFilterInstance(bool copyFilterParameters) const
+{
+  CreateGridMontage::Pointer filter = CreateGridMontage::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getGroupName() const
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getHumanLabel() const
+{
+  return "Create Grid Montage";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QUuid CreateGridMontage::getUuid() const
+{
+  return QUuid("{c5bb92df-c1bb-5e57-a2bf-280303a81935}");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::GenerationFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getMontageName() const
+{
+  return m_MontageName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::setMontageName(const QString& value)
+{
+  m_MontageName = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGrid CreateGridMontage::getGridSelection() const
+{
+  return m_GridSelection;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::setGridSelection(const DataContainerGrid& value)
+{
+  m_GridSelection = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList CreateGridMontage::getDataContainerNameList() const
+{
+  return m_DataContainerNameList;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void CreateGridMontage::setDataContainerNameList(const QStringList& value)
+{
+  m_DataContainerNameList = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::getNameOfClass() const
+{
+  return QString("CreateGridMontage");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString CreateGridMontage::ClassName()
+{
+  return QString("CreateGridMontage");
+}
+
+#if 0
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int CreateGridMontage::IsTypeOf(const char* type)
+{
+  if(!strcmp("CreateGridMontage", type))
+  {
+    return 1;
+  }
+  return AbstractFilter::IsTypeOf(type);
+}
+#endif
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+CreateGridMontage::Pointer CreateGridMontage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+CreateGridMontage::Pointer CreateGridMontage::New()
+{
+  Pointer sharedPtr(new(CreateGridMontage));
+  return sharedPtr;
+}
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
new file mode 100644
index 0000000000..179befa70e
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -0,0 +1,199 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QString>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Montages/DataContainerGrid.h"
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @brief The CreateGridMontage class. See [Filter documentation](@ref CreateGridMontage) for details.
+ */
+class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
+{
+  Q_OBJECT
+
+#ifdef SIMPL_ENABLE_PYTHON
+  PYB11_CREATE_BINDINGS(CreateGridMontage SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(CreateGridMontage)
+  PYB11_FILTER_NEW_MACRO(CreateGridMontage)
+
+  PYB11_PROPERTY(QString MontageName READ getMontageName WRITE setMontageName)
+  PYB11_PROPERTY(DataContainerGrid GridSelection READ getGridSelection WRITE setGridSelection)
+  PYB11_PROPERTY(QStringList DataContainerNameList READ getDataContainerNameList WRITE setDataContainerNameList)
+#endif
+
+public:
+  using Self = CreateGridMontage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  QString getNameOfClass() const override;
+  static QString ClassName();
+  //static int CreateGridMontage::IsTypeOf(const char* type);
+
+  ~CreateGridMontage() override;
+
+  /**
+   * @brief Getter for the MontageName property
+   * @return
+   */
+  QString getMontageName() const;
+  
+  /**
+   * @brief Setter for the MontageName property
+   * @param value
+   */
+  void setMontageName(const QString& value);
+
+  Q_PROPERTY(QString MontageName READ getMontageName WRITE setMontageName)
+
+  /**
+   * @brief Getter for the GridSelection property.
+   * @return
+   */
+  DataContainerGrid getGridSelection() const;
+
+  /**
+   * @brief Setter for the GridSelection property.
+   * @param value
+   */
+  void setGridSelection(const DataContainerGrid& value);
+
+  Q_PROPERTY(DataContainerGrid GridSelection READ getGridSelection WRITE setGridSelection)
+
+  /**
+    * @brief Getter for the DataContainerNameList property
+    * @return
+    */
+  QStringList getDataContainerNameList() const;
+
+  /**
+   * @brief Setter for the DataContainerNameList property
+   * @param value
+   */
+  void setDataContainerNameList(const QStringList& value);
+
+  Q_PROPERTY(QStringList DataContainerNameList READ getDataContainerNameList WRITE setDataContainerNameList)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateGridMontage();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  QString m_MontageName;
+  DataContainerGrid m_GridSelection;
+  QStringList m_DataContainerNameList;
+
+public:
+  CreateGridMontage(const CreateGridMontage&) = delete;            // Copy Constructor Not Implemented
+  CreateGridMontage(CreateGridMontage&&) = delete;                 // Move Constructor Not Implemented
+  CreateGridMontage& operator=(const CreateGridMontage&) = delete; // Copy Assignment Not Implemented
+  CreateGridMontage& operator=(CreateGridMontage&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index d0a8695390..14e04c1197 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -89,6 +89,7 @@ void CreateImageGeometry::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateImageGeometry));
 
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateImageGeometry));
+  parameters.back()->setLegacyPropertyName("Resolution");
 
   PreflightUpdatedValueFilterParameter::Pointer param =
              SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateImageGeometry);
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index e0ab97bd3f..3b3ab74086 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -52,6 +52,7 @@
 #include "SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Montages/MontageSupport.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
@@ -209,6 +210,12 @@ void DataContainerReader::dataCheck()
   }
   QMap<QString, IDataContainerBundle::Pointer> bundles = tempDCA->getDataContainerBundles();
   dca->setDataContainerBundles(bundles);
+
+  DataContainerArray::MontageCollection montageGroup = readMontageGroup(dca);
+  for(const auto& montage : montageGroup)
+  {
+    dca->addMontage(montage);
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -221,7 +228,6 @@ void DataContainerReader::execute()
    * will be passed up the chain if something goes wrong.
    */
   dataCheck();
-
 }
 
 // -----------------------------------------------------------------------------
@@ -235,7 +241,7 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
   SIMPLH5DataReader::Pointer simplReader = SIMPLH5DataReader::New();
   connect(simplReader.get(), &SIMPLH5DataReader::errorGenerated, [=](const QString& title, const QString& msg, int code) { setErrorCondition(code, msg); });
 
-  if (!simplReader->openFile(getInputFile()))
+  if(!simplReader->openFile(getInputFile()))
   {
     return DataContainerArray::New();
   }
@@ -269,6 +275,32 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
   return dca;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerArray::MontageCollection DataContainerReader::readMontageGroup(const DataContainerArray::Pointer& dca)
+{
+  hid_t fileId = QH5Utilities::openFile(getInputFile(), true); // Open the file Read Only
+  if(fileId < 0)
+  {
+    QString ss = QObject::tr("Error opening input file '%1'").arg(getInputFile());
+    setErrorCondition(-155, ss);
+    return DataContainerArray::MontageCollection();
+  }
+  H5ScopedFileSentinel sentinel(&fileId, true);
+
+  hid_t groupId = QH5Utilities::openHDF5Object(fileId, SIMPL::StringConstants::MontageGroupName);
+  sentinel.addGroupId(&groupId);
+  int err = 0;
+  DataContainerArray::MontageCollection montages = MontageSupport::IO::ReadMontagesFromHDF5(groupId, dca, err);
+  if(err < 0)
+  {
+    QString ss = QObject::tr("Error reading montage collection");
+    setErrorCondition(-160, ss);
+  }
+  return montages;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 4873e9e80e..32ca697e8b 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -42,6 +42,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
@@ -279,6 +280,13 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
      */
     DataContainerArrayShPtrType readData(DataContainerArrayProxy& proxy);
 
+    /**
+     * @brief readMontageGroup
+     * @param dca
+     * @return
+     */
+    DataContainerArray::MontageCollection readMontageGroup(const DataContainerArray::Pointer& dca);
+
   protected slots:
     /**
     * @brief Cleans up the filter after execution
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 503f9eb3a8..cf9d505033 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -273,6 +273,15 @@ void DataContainerWriter::execute()
     return;
   }
 
+  // Write Montages
+  err = writeMontages(m_FileId);
+  if(err < 0)
+  {
+    QString ss = QObject::tr("Error writing montages");
+    setErrorCondition(-11113, ss);
+    return;
+  }
+
   // Write the XDMF File
   if(m_WriteXdmfFile)
   {
@@ -318,6 +327,36 @@ int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
   return 0;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataContainerWriter::writeMontages(hid_t fileId)
+{
+  int err = QH5Utilities::createGroupsFromPath(SIMPL::StringConstants::MontageGroupName, m_FileId);
+  if(err < 0)
+  {
+    QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::MontageGroupName);
+    setErrorCondition(-62, ss);
+    return -1;
+  }
+  hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::MontageGroupName.toLatin1().data(), H5P_DEFAULT);
+
+  H5GroupAutoCloser groupCloser(&dcbGid);
+
+  DataContainerArray::MontageCollection montages = getDataContainerArray()->getMontageCollection();
+  for(const auto& montage : montages)
+  {
+    err = montage->writeH5Data(dcbGid);
+    if(err < 0)
+    {
+      return err;
+    }
+  }
+  H5Gclose(dcbGid);
+  dcbGid = -1;
+  return 0;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 3b2953ac32..1bce2ea7c8 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -241,6 +241,13 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
      */
     int writeDataContainerBundles(hid_t fileId);
 
+    /**
+     * @brief writeMontages Writes any existing Montages to the HDF5 file
+     * @param fileId Group Id for the Montages
+     * @return
+     */
+    int writeMontages(hid_t fileId);
+
     /**
      * @brief writeXdmfHeader Writes the Xdmf header
      * @param out QTextStream for output
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index e274862ecd..71dbea0aa1 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -128,6 +128,7 @@ void SetOriginResolutionImageGeom::setupFilterParameters()
   linkedProps << "Spacing";
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Spacing", ChangeResolution, FilterParameter::Parameter, SetOriginResolutionImageGeom, linkedProps));
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, SetOriginResolutionImageGeom));
+  parameters.back()->setLegacyPropertyName("Resolution");
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 92c6bd707d..0e1154fd00 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -37,6 +37,7 @@ set(_PublicFilters
   CreateDataContainer
   CreateFeatureArrayFromElementArray
   CreateImageGeometry
+  CreateGridMontage
   CreateStringArray
   CopyObject
   CreateGeometry
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index ce8eed82c6..922e70f29f 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -301,6 +301,15 @@ class DataArray : public IDataArray
    */
   virtual void setInitValue(T initValue);
 
+  /**
+   * @brief Returns the initial value for the array.
+   * @return
+   */
+  virtual T getInitValue() const
+  {
+    return m_InitValue;
+  }
+
   /**
    * @brief Makes this class responsible for freeing the memory
    */
@@ -515,6 +524,38 @@ class DataArray : public IDataArray
    */
   int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override
+  {
+    ToolTipGenerator toolTipGen;
+    QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+    toolTipGen.addTitle("Attribute Array Info");
+    toolTipGen.addValue("Name", getName());
+    toolTipGen.addValue("Type", getTypeAsString());
+    toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+
+    QString compDimStr = "(";
+    for(int i = 0; i < m_CompDims.size(); i++)
+    {
+      compDimStr = compDimStr + QString::number(m_CompDims[i]);
+      if(i < m_CompDims.size() - 1)
+      {
+        compDimStr = compDimStr + QString(", ");
+      }
+    }
+    compDimStr += ")";
+    toolTipGen.addValue("Component Dimensions", compDimStr);
+    toolTipGen.addValue("Total Elements", usa.toString(static_cast<qlonglong>(m_Size)));
+    toolTipGen.addValue("Total Memory Required", usa.toString(static_cast<qlonglong>(m_Size * sizeof(T))));
+
+    return toolTipGen;
+  }
+
   /**
    * @brief getInfoString
    * @return Returns a formatted string that contains general infomation about
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 5582707563..6d80bc4d1a 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -23,6 +23,7 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/IDataStructureNode.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
@@ -287,6 +288,13 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      */
     virtual QString getInfoString(SIMPL::InfoStringFormat format) const = 0;
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the current DataArray.
+     * @return
+     */
+    virtual ToolTipGenerator getToolTipGenerator() const = 0;
+
   protected:
 
   private:
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index b686c088be..a18bf6a057 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -829,6 +829,25 @@ class NeighborList : public IDataArray
       return 1;
     }
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the current DataArray.
+     * @return
+     */
+    ToolTipGenerator getToolTipGenerator() const override
+    {
+      ToolTipGenerator toolTipGen;
+      QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+      toolTipGen.addTitle("Attribute Array Info");
+      toolTipGen.addValue("Name", getName());
+      toolTipGen.addValue("Type", getTypeAsString());
+      toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+      toolTipGen.addValue("Number of Lists", usa.toString(static_cast<qlonglong>(getNumberOfLists())));
+
+      return toolTipGen;
+    }
+
     /**
      * @brief getInfoString
      * @return Returns a formatted string that contains general infomation about
@@ -836,33 +855,15 @@ class NeighborList : public IDataArray
      */
     QString getInfoString(SIMPL::InfoStringFormat format) const override
     {
-      QString info;
-      QTextStream ss (&info);
       if(format == SIMPL::HtmlFormat)
       {
-        ss << "<html><head></head>\n";
-        ss << "<body>\n";
-        ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-        ss << "<tbody>\n";
-        ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-
-        ss << "<tr bgcolor=\"#E9E7D6\"><th align=\"right\">Name:</th><td>" << getName() << "</td></tr>";
-
-        ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << "</td></tr>";
-        QLocale usa(QLocale::English, QLocale::UnitedStates);
-        QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-        ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>" << numStr << "</td></tr>";
-        ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Lists:</th><td>" << getNumberOfLists() << "</td></tr>";
-
-        ss << "</tbody></table>\n";
-        ss << "<br/>";
-        ss << "</body></html>";
+        return getToolTipGenerator().generateHTML();
       }
       else
       {
 
       }
-      return info;
+      return QString();
     }
     /**
      *
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 4d66c7f452..abd794b9fd 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -646,31 +646,30 @@ int StatsDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const
 // -----------------------------------------------------------------------------
 QString StatsDataArray::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<html><head></head>\n";
-    ss << "<body>\n";
-    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-    ss << "<tbody>\n";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-
-    ss << "<tr bgcolor=\"#E9E7D6\"><th align=\"right\">Name:</th><td>" << getName() << "</td></tr>";
-
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << "</td></tr>";
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-    QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>" << numStr << "</td></tr>";
-
-    ss << "</tbody></table>\n";
-    ss << "<br/>";
-    ss << "</body></html>";
+    return getToolTipGenerator().generateHTML();
   }
   else
   {
   }
-  return info;
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator StatsDataArray::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  toolTipGen.addTitle("Attribute Array Info");
+  toolTipGen.addValue("Name", getName());
+  toolTipGen.addValue("Type", getTypeAsString());
+  toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 8511b45af4..bfc29fdf4d 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -379,6 +379,13 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief StatsDataArray::readFromJson
    * @param jsonRoot
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index ad6a38fca5..a697a47548 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -466,28 +466,30 @@ int StringDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, cons
 // -----------------------------------------------------------------------------
 QString StringDataArray::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<html><head></head>\n";
-    ss << "<body>\n";
-    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-    ss << "<tbody>\n";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Name:</th><td>)" << getName() << R"(</td></tr>)";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << R"(</td></tr>)";
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-    QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-    ss << R"(<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>)" << numStr << R"(</td></tr>)";
-    ss << "</tbody></table>\n";
-    ss << "<br/>";
-    ss << "</body></html>";
+    return getToolTipGenerator().generateHTML();
   }
   else
   {
   }
-  return info;
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator StringDataArray::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  toolTipGen.addTitle("Attribute Array Info");
+  toolTipGen.addValue("Name", getName());
+  toolTipGen.addValue("Type", getTypeAsString());
+  toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index c372a4e191..d4ed674fe2 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -361,6 +361,13 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief readH5Data
    * @param parentId
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 14ff69bcdf..059b552923 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -689,6 +689,24 @@ class StructArray : public IDataArray
       return -1;
     }
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the current DataArray.
+     * @return
+     */
+    ToolTipGenerator getToolTipGenerator() const override
+    {
+      ToolTipGenerator toolTipGen;
+      QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+      toolTipGen.addTitle("Attribute Array Info");
+      toolTipGen.addValue("Name", getName());
+      toolTipGen.addValue("Type", getTypeAsString());
+      toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+
+      return toolTipGen;
+    }
+
     /**
      * @brief getInfoString
      * @return Returns a formatted string that contains general infomation about
@@ -696,29 +714,15 @@ class StructArray : public IDataArray
      */
     QString getInfoString(SIMPL::InfoStringFormat format) const override
     {
-      QString info;
-      QTextStream ss (&info);
       if(format == SIMPL::HtmlFormat)
       {
-        ss << "<html><head></head>\n";
-        ss << "<body>\n";
-        ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-        ss << "<tbody>\n";
-        ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
-        ss << "<tr bgcolor=\"#E9E7D6\"><th align=\"right\">Name:</th><td>" << getName() << "</td></tr>";
-        ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Type:</th><td>" << getTypeAsString() << "</td></tr>";
-        QLocale usa(QLocale::English, QLocale::UnitedStates);
-        QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
-        ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Number of Tuples:</th><td>" << numStr << "</td></tr>";
-        ss << "</tbody></table>\n";
-        ss << "<br/>";
-        ss << "</body></html>";
+        return getToolTipGenerator().generateHTML();
       }
       else
       {
 
       }
-      return info;
+      return QString();
     }
 
     /**
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 96ec067e33..a1d7054a93 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -694,88 +694,91 @@ QString AttributeMatrix::getInfoString(SIMPL::InfoStringFormat format) const
   QTextStream ss(&info);
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<html><head></head>\n";
-    ss << "<body>\n";
-    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-    ss << "<tbody>\n";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Matrix Info</th></tr>";
+    return getToolTipGenerator().generateHTML();
+  }
+  else
+  {
+  }
+  return info;
+}
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator AttributeMatrix::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
 
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
+  toolTipGen.addTitle("Attribute Matrix Info");
+  toolTipGen.addValue("Name", getName());
 
-    QString typeString;
-    switch(m_Type)
-    {
-    case AttributeMatrix::Type::Vertex:
-      typeString = "Vertex";
-      break;
-    case AttributeMatrix::Type::Edge:
-      typeString = "Edge";
-      break;
-    case AttributeMatrix::Type::Face:
-      typeString = "Face";
-      break;
-    case AttributeMatrix::Type::Cell:
-      typeString = "Cell";
-      break;
-    case AttributeMatrix::Type::VertexFeature:
-      typeString = "Vertex Feature";
-      break;
-    case AttributeMatrix::Type::EdgeFeature:
-      typeString = "Edge Feature";
-      break;
-    case AttributeMatrix::Type::FaceFeature:
-      typeString = "Face Feature";
-      break;
-    case AttributeMatrix::Type::CellFeature:
-      typeString = "Cell Feature";
-      break;
-    case AttributeMatrix::Type::VertexEnsemble:
-      typeString = "Vertex Ensemble";
-      break;
-    case AttributeMatrix::Type::EdgeEnsemble:
-      typeString = "Edge Ensemble";
-      break;
-    case AttributeMatrix::Type::FaceEnsemble:
-      typeString = "Face Ensemble";
-      break;
-    case AttributeMatrix::Type::CellEnsemble:
-      typeString = "Cell Ensemble";
-      break;
-    case AttributeMatrix::Type::MetaData:
-      typeString = "MetaData";
-      break;
-    case AttributeMatrix::Type::Generic:
-      typeString = "Generic";
-      break;
-    default:
-      typeString = "Unknown";
-      break;
-    }
+  QString typeString;
+  switch(m_Type)
+  {
+  case AttributeMatrix::Type::Vertex:
+    typeString = "Vertex";
+    break;
+  case AttributeMatrix::Type::Edge:
+    typeString = "Edge";
+    break;
+  case AttributeMatrix::Type::Face:
+    typeString = "Face";
+    break;
+  case AttributeMatrix::Type::Cell:
+    typeString = "Cell";
+    break;
+  case AttributeMatrix::Type::VertexFeature:
+    typeString = "Vertex Feature";
+    break;
+  case AttributeMatrix::Type::EdgeFeature:
+    typeString = "Edge Feature";
+    break;
+  case AttributeMatrix::Type::FaceFeature:
+    typeString = "Face Feature";
+    break;
+  case AttributeMatrix::Type::CellFeature:
+    typeString = "Cell Feature";
+    break;
+  case AttributeMatrix::Type::VertexEnsemble:
+    typeString = "Vertex Ensemble";
+    break;
+  case AttributeMatrix::Type::EdgeEnsemble:
+    typeString = "Edge Ensemble";
+    break;
+  case AttributeMatrix::Type::FaceEnsemble:
+    typeString = "Face Ensemble";
+    break;
+  case AttributeMatrix::Type::CellEnsemble:
+    typeString = "Cell Ensemble";
+    break;
+  case AttributeMatrix::Type::MetaData:
+    typeString = "MetaData";
+    break;
+  case AttributeMatrix::Type::Generic:
+    typeString = "Generic";
+    break;
+  default:
+    typeString = "Unknown";
+    break;
+  }
+  toolTipGen.addValue("Type", typeString);
 
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type:</th><td>)" << typeString << "</td></tr>";
-    QString tupleStr = "(";
-    for(int i = 0; i < m_TupleDims.size(); i++)
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+  QString tupleStr = "(";
+  for(int i = 0; i < m_TupleDims.size(); i++)
+  {
+    QString numStr = usa.toString(static_cast<qlonglong>(m_TupleDims[i]));
+    tupleStr = tupleStr + numStr;
+    if(i < m_TupleDims.size() - 1)
     {
-      QString numStr = usa.toString(static_cast<qlonglong>(m_TupleDims[i]));
-      tupleStr = tupleStr + numStr;
-      if(i < m_TupleDims.size() - 1)
-      {
-        tupleStr = tupleStr + QString(" x ");
-      }
+      tupleStr = tupleStr + QString(" x ");
     }
-    tupleStr = tupleStr + ")";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Tuple Dimensions:</th><td>)" << tupleStr << "</td></tr>";
-
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Attribute Array Count:</th><td>)" << getNumAttributeArrays() << "</td></tr>";
-    ss << "</tbody></table>\n";
-    ss << "</body></html>";
   }
-  else
-  {
-  }
-  return info;
+  tupleStr = tupleStr + ")";
+  toolTipGen.addValue("Tuple Dimensions", tupleStr);
+
+  return toolTipGen;
 }
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 9eb3f05bbb..69109c252d 100755
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -57,6 +57,8 @@
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
@@ -611,6 +613,13 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
      */
     virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the current AttributeMatrix.
+     * @return
+     */
+    virtual ToolTipGenerator getToolTipGenerator() const;
+
   protected:
     AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
 
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 607cd4f45e..451e444060 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -750,32 +750,34 @@ QVector<DataArrayPath> DataContainer::getAllDataArrayPaths() const
 // -----------------------------------------------------------------------------
 QString DataContainer::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<html><head></head>\n";
-    ss << "<body>\n";
-    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
-    ss << "<tbody>\n";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Data Container Info</th></tr>";
+    return getToolTipGenerator().generateHTML();
+  }
+  
+  QString info;
+  QTextStream ss(&info);
+  ss << "Requested InfoStringFormat is not supported. " << format;
+  return info;
+}
 
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Attribute Matrix Count:</th><td>)" << getNumAttributeMatrices() << "</td></tr>";
-    ss << "<tr><td></td><td></td></tr>";
-    if(getGeometry().get() != nullptr)
-    {
-      ss << getGeometry()->getInfoString(SIMPL::HtmlFormat);
-    }
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator DataContainer::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
 
-    ss << "</tbody></table>\n";
-    ss << "</body></html>";
-  }
-  else
+  toolTipGen.addTitle("Data Container Info");
+  toolTipGen.addValue("Name", getName());
+  toolTipGen.addValue("Attribute Matrix Count", QString::number(getNumAttributeMatrices()));
+
+  if(getGeometry().get() != nullptr)
   {
-    ss << "Requested InfoStringFormat is not supported. " << format;
+    toolTipGen.append(getGeometry()->getToolTipGenerator());
   }
-  return info;
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index a07f8048f9..719a6b3246 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -53,6 +53,8 @@
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 class IDataArray;
@@ -190,6 +192,13 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    */
   virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataContainer.
+   * @return
+   */
+  virtual ToolTipGenerator getToolTipGenerator() const;
+
   /**
    * @brief Adds the data for a named array. If an AttributeMatrix with the same
    * name already exists in the DataContainer then the add will fail.
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 8f14e97a4f..8112412842 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -1,37 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #include "DataContainerArray.h"
 
 #include <QtCore/QTextStream>
@@ -39,8 +40,10 @@
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Montages/AbstractMontage.h"
+#include "SIMPLib/Montages/GridMontage.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -441,6 +444,152 @@ bool DataContainerArray::renameDataContainerBundle(const QString& oldName, const
   return false;
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerArray::MontageCollection DataContainerArray::getMontageCollection() const
+{
+  return m_MontageCollection;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerArray::addMontage(const AbstractMontageShPtr& montage)
+{
+  return m_MontageCollection.insert(montage);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerArray::addOrReplaceMontage(const AbstractMontageShPtr& montage)
+{
+  m_MontageCollection.erase(montage->getName());
+  m_MontageCollection.insert(montage);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerArray::removeMontage(const QString& name)
+{
+  m_MontageCollection.erase(name);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontageShPtr DataContainerArray::getMontage(const QString& name) const
+{
+  auto iter = m_MontageCollection.find(name);
+  if(m_MontageCollection.end() == iter)
+  {
+    return nullptr;
+  }
+  return (*iter);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList DataContainerArray::getMontageNames() const
+{
+  QStringList names;
+  for(const auto& montage : m_MontageCollection)
+  {
+    names.push_back(montage->getName());
+  }
+
+  return names;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontageShPtr DataContainerArray::getPrereqMontage(AbstractFilter* filter, const QString& name)
+{
+  AbstractMontageShPtr montage = getMontage(name);
+  if(nullptr == montage)
+  {
+    filter->setErrorCondition(-4950, "The prerequisite montage '" + name + "' could not be found.");
+  }
+  return montage;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontageShPtr DataContainerArray::createNonPrereqGridMontage(AbstractFilter* filter, const QString& montageName, SizeVec3Type size, const QStringList& dcNames,
+                                                                    GridMontage::CollectionMethod collectionMethod)
+{
+  GridMontage::Pointer montage = GridMontage::New(montageName, size[0], size[1], size[2]);
+
+  if(nullptr == montage)
+  {
+    filter->setErrorCondition(-4965, "The montage '" + montageName + "' could not be instantiated");
+    return nullptr;
+  }
+
+  QStringListIterator dcNameIter(dcNames);
+
+  switch(collectionMethod)
+  {
+  case GridMontage::CollectionMethod::CombOrder:
+    for(size_t depth = 0; depth < size[2] && dcNameIter.hasNext(); depth++)
+    {
+      for(size_t row = 0; row < size[0] && dcNameIter.hasNext(); row++)
+      {
+        for(size_t col = 0; col < size[1] && dcNameIter.hasNext(); col++)
+        {
+          setMontageTileFromDataContainerName(filter, row, col, depth, montage, dcNameIter.next());
+        }
+      }
+    }
+    break;
+  case GridMontage::CollectionMethod::SnakeOrder:
+    for(size_t depth = 0; depth < size[2] && dcNameIter.hasNext(); depth++)
+    {
+      for(size_t row = 0; row < size[0] && dcNameIter.hasNext(); row++)
+      {
+        if(row % 2 == 0)
+        {
+          for(size_t col = 0; col < size[1] && dcNameIter.hasNext(); col++)
+          {
+            setMontageTileFromDataContainerName(filter, row, col, depth, montage, dcNameIter.next());
+          }
+        }
+        else
+        {
+          for(int64_t col = static_cast<int64_t>(size[1] - 1); col >= 0 && dcNameIter.hasNext(); col--)
+          {
+            setMontageTileFromDataContainerName(filter, row, col, depth, montage, dcNameIter.next());
+          }
+        }
+      }
+    }
+    break;
+  }
+
+  if(!addMontage(montage))
+  {
+    filter->setErrorCondition(-4960, "The montage '" + montageName + "' could not be added to the Data Structure");
+    return nullptr;
+  }
+
+  return montage;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerArray::setMontageTileFromDataContainerName(AbstractFilter* filter, size_t row, size_t col, size_t depth, const GridMontage::Pointer& montage, const QString& dcName)
+{
+  GridTileIndex index = montage->getTileIndex(row, col, depth);
+  DataContainer::Pointer dc = getPrereqDataContainer(filter, dcName);
+  montage->setDataContainer(index, dc);
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -456,6 +605,14 @@ DataContainerArray::Pointer DataContainerArray::deepCopy(bool forceNoAllocate) c
     dcaCopy->push_back(dcCopy);
   }
 
+  const MontageCollection montageCollection = getMontageCollection();
+  MontageCollection mccopy = MontageCollection();
+  for(const auto& montage : montageCollection)
+  {
+    AbstractMontage::Pointer montageCopy = montage->propagate(dcaCopy);
+    dcaCopy->addMontage(montageCopy);
+  }
+
   return dcaCopy;
 }
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index a094bbc57a..5cc7dea5a6 100755
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -42,11 +42,14 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/Common/NamedCollection.hpp"
 #include "SIMPLib/DataContainers/IDataContainerBundle.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Montages/AbstractMontage.h"
+#include "SIMPLib/Montages/GridMontage.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 class DataContainer;
@@ -54,6 +57,10 @@ using DataContainerShPtr = std::shared_ptr<DataContainer>;
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
+
+class GridMontage;
+using GridMontageShPtr = std::shared_ptr<GridMontage>;
+
 /**
  * @class DataContainerArray DataContainerArray.h DREAM3DLib/Common/DataContainerArray.h
  * @brief  This class holds the list of filters that will be run. This should be
@@ -110,6 +117,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   static QString ClassName();
 
   using Container = ChildCollection;
+  using MontageCollection = NamedCollection<AbstractMontage>;
 
   ~DataContainerArray() override;
 
@@ -296,13 +304,75 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
     void removeDataContainerFromBundles(const QString& name);
 
     /**
-    * @brief renameDataArrayPaths
-    * @param renamePaths
-    */
+     * @brief Returns a copy of the Montage collection.
+     * @return
+     */
+    MontageCollection getMontageCollection() const;
+
+    /**
+     * @brief Attempts to add the given montage to the collection.
+     * This will fail if a montage by the same name already exists in the collection.
+     * Returns true if it succeded.  Returns false otherwise.
+     * @param montage
+     * @return
+     */
+    bool addMontage(const AbstractMontageShPtr& montage);
+
+    /**
+     * @brief Adds the given montage to the collection if no montages of the same name exist yet.
+     * Otherwise, the current montage is replaced with the one provided.
+     * @param montage
+     */
+    void addOrReplaceMontage(const AbstractMontageShPtr& montage);
+
+    /**
+     * @brief Removes any montage of the given name from the collection.
+     * @param name
+     */
+    void removeMontage(const QString& name);
+
+    /**
+     * @brief Finds and returns a shared pointer to a montage with the given name.
+     * If none are found, this returns nullptr.
+     * @param name
+     * @return
+     */
+    AbstractMontageShPtr getMontage(const QString& name) const;
+
+    /**
+     * @brief Returns a list of names for all montages in the collection.
+     * @return
+     */
+    QStringList getMontageNames() const;
+
+    /**
+     * @brief createNonPrereqGridMontage
+     * @param filter
+     * @param montageName
+     * @param size
+     * @param dcNames
+     * @param collectionType
+     * @return
+     */
+    GridMontageShPtr createNonPrereqGridMontage(AbstractFilter* filter, const QString& montageName, SizeVec3Type size, const QStringList& dcNames = QStringList(),
+      GridMontage::CollectionMethod collectionMethod = GridMontage::CollectionMethod::CombOrder);
+
+
+    /**
+     * @brief renameDataArrayPaths
+     * @param renamePaths
+     */
     void renameDataArrayPaths(DataArrayPath::RenameContainer renamePaths);
 
     DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists = false);
 
+    /**
+     * @brief getPrereqMontage
+     * @param filter
+     * @param name
+     */
+    AbstractMontageShPtr getPrereqMontage(AbstractFilter* filter, const QString& name);
+
     /**
      * @brief getPrereqDataContainer
      * @param name
@@ -577,6 +647,16 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
 
   private:
     QMap<QString, IDataContainerBundle::Pointer> m_DataContainerBundles;
+    MontageCollection m_MontageCollection;
+
+    /**
+     * @brief setMontageTileFromDataContainerName
+     * @param row
+     * @param col
+     * @param depth
+     * @param dcName
+     */
+    void setMontageTileFromDataContainerName(AbstractFilter* filter, size_t row, size_t col, size_t depth, const GridMontage::Pointer& montage, const QString& dcName);
 
   public:
     DataContainerArray(const DataContainerArray&) = delete; // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
index f9fd2e466c..de4e0a4f4c 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
@@ -45,7 +45,9 @@
 IDataStructureNode::HashType IDataStructureNode::CreateStringHash(const QString& string)
 {
   std::hash<std::string> hashFn;
-  return hashFn(string.toStdString());
+  std::string stdStr = std::string(string.toStdString());
+  HashType hash = hashFn(stdStr);
+  return hash;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGridMontage.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGridMontage.md
new file mode 100644
index 0000000000..7cdbed8272
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateGridMontage.md
@@ -0,0 +1,44 @@
+# Create Grid Montage  #
+
+
+## Group (Subgroup) ##
+
+Core (Generation)
+
+## Description ##
+
+This **Filter** creates a new **Grid Montage**.
+
+## Parameters ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|----------------|
+| **Int Vec 3** | Dims | N/A | N/A | **Grid Montage** dimensions |
+| **DataContainerGrid** | GridSelection | N/A | N/A | **Data Container** grid |
+
+## Required Geometry ##
+
+Not Applicable
+
+## Required Objects ##
+
+Not Applicable
+
+## Created Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|----------------|
+| **Grid Montage** | Grid Montage | N/A | N/A | Created **Grid Montage** name |
+
+
+## Example Pipelines ##
+
+
+
+## License & Copyright ##
+
+Please see the description file distributed with this **Plugin**
+
+## DREAM.3D Mailing Lists ##
+
+If you need more help with a **Filter**, please consider asking your question on the [DREAM.3D Users Google group!](https://groups.google.com/forum/?hl=en#!forum/dream3d-users)
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 0f4b2b2b33..31fcb7344c 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -82,6 +82,10 @@ QString AttributeMatrixCreationFilterParameter::getWidgetType() const
 void AttributeMatrixCreationFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index c02910f873..b7d239cd1d 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -137,6 +137,10 @@ AttributeMatrixSelectionFilterParameter::RequirementType AttributeMatrixSelectio
 void AttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 1ff150a2e0..42b246acc6 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -79,6 +79,10 @@ QString AxisAngleFilterParameter::getWidgetType() const
 void AxisAngleFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject axisObj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index 77c31817ce..33ab34de29 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -78,6 +78,10 @@ QString BooleanFilterParameter::getWidgetType() const
 void BooleanFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(static_cast<bool>(jsonValue.toInt()));
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index f4f085701b..51873f7e2c 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -81,6 +81,10 @@ QString CalculatorFilterParameter::getWidgetType() const
 void CalculatorFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index b01b7ae590..abf9d1501d 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -82,6 +82,10 @@ QString ChoiceFilterParameter::getWidgetType() const
 void ChoiceFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toInt(0.0));
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index daa8c19d2c..3b612db77b 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -89,6 +89,10 @@ QString ComparisonSelectionAdvancedFilterParameter::getWidgetType() const
 void ComparisonSelectionAdvancedFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject jsonObject = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index 41031df3f4..a04f1d7998 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -89,6 +89,10 @@ QString ComparisonSelectionFilterParameter::getWidgetType() const
 void ComparisonSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray jsonArray = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 95c7ad09c9..94272f1f1e 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -135,6 +135,10 @@ DataArrayCreationFilterParameter::RequirementType DataArrayCreationFilterParamet
 void DataArrayCreationFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 7a25e21331..86d077da74 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -197,6 +197,10 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
 void DataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 6b1b54136c..77667f285d 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -87,6 +87,10 @@ QString DataContainerArrayProxyFilterParameter::getWidgetType() const
 void DataContainerArrayProxyFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject jsonObject = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 3bbf5d1b55..44a8126f72 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -82,6 +82,10 @@ QString DataContainerCreationFilterParameter::getWidgetType() const
 void DataContainerCreationFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
new file mode 100644
index 0000000000..9ddf2a1a1a
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -0,0 +1,215 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataContainerGridSelectionFilterParameter.h"
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::DataContainerGridSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::~DataContainerGridSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::Pointer DataContainerGridSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue,
+                                                                                                  Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                                  int groupIndex)
+{
+  DataContainerGridSelectionFilterParameter::Pointer ptr = DataContainerGridSelectionFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
+  ptr->setCategory(category);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataContainerGridSelectionFilterParameter::getWidgetType() const
+{
+  return QString("DataContainerGridSelectionWidget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    QJsonObject obj = jsonValue.toObject();
+    DataArrayPath dap;
+    if(dap.readJson(obj))
+    {
+      //m_SetterCallback(dap);
+    }
+    else // this is in here for historical where we used to save the value as a string
+    {
+      QString dcName = jsonValue.toString("");
+      DataArrayPath dap(dcName, "", "");
+      //m_SetterCallback(dap);
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    /*
+    DataArrayPath dap = m_GetterCallback();
+    QJsonObject obj;
+    dap.writeJson(obj);
+    json[getPropertyName()] = obj;
+    */
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  /*
+  if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
+  {
+    m_SetterCallback(newPath);
+    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  }
+  */
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::Pointer DataContainerGridSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::Pointer DataContainerGridSelectionFilterParameter::New()
+{
+  return Pointer(new DataContainerGridSelectionFilterParameter());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataContainerGridSelectionFilterParameter::getNameOfClass() const
+{
+  return "DataContainerGridSelectionFilterParameter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataContainerGridSelectionFilterParameter::ClassName()
+{
+  return "DataContainerGridSelectionFilterParameter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IGeometry::Types DataContainerGridSelectionFilterParameter::getDefaultGeometryTypes() const
+{
+  return m_DefaultGeometryTypes;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::setDefaultGeometryTypes(IGeometry::Types value)
+{
+  m_DefaultGeometryTypes = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::SetterCallbackType DataContainerGridSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::setSetterCallback(const SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionFilterParameter::GetterCallbackType DataContainerGridSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionFilterParameter::setGetterCallback(const GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
new file mode 100644
index 0000000000..aa94e43d88
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -0,0 +1,190 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <utility>
+#include <vector>
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/Montages/DataContainerGrid.h"
+
+/**
+ * @brief SIMPL_NEW_DC_GRID_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * DataContainerGridSelectionFilterParameter. There are 5 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), RequirementType, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_DC_GRID_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, RequirementType, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
+ * DataContainerGridSelectionFilterParameter::RequirementType req;
+ * SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Parameter, GenericExample, req, 2);
+ */
+#define SIMPL_NEW_DC_GRID_SELECTION_FP(...)                                                                                                                                                            \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerGridSelectionFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The DataContainerGridSelectionFilterParameter class is used by filters to instantiate an DataContainerSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a DataContainerSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterParameter
+{
+public:
+  using Self = DataContainerGridSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataContainerGrid)>;
+  using GetterCallbackType = std::function<DataContainerGrid(void)>;
+
+  // using RequirementType = struct
+  //{
+  //  IGeometry::Types dcGeometryTypes;
+  //};
+
+  /**
+   * @brief New This function instantiates an instance of the DataContainerGridSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_DC_GRID_SELECTION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue, Category category, SetterCallbackType setterCallback,
+                     GetterCallbackType getterCallback, int groupIndex = -1);
+
+  ~DataContainerGridSelectionFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   * @param value
+   */
+  void setDefaultGeometryTypes(IGeometry::Types value);
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  SetterCallbackType getSetterCallback() const;
+  void setSetterCallback(const SetterCallbackType& value);
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  GetterCallbackType getGetterCallback() const;
+  void setGetterCallback(const GetterCallbackType& value);
+
+  /**
+   * @brief Handles changes to the DataArrayPath
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataContainerGridSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataContainerGridSelectionFilterParameter();
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes;
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
+
+public:
+  DataContainerGridSelectionFilterParameter(const DataContainerGridSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerGridSelectionFilterParameter(DataContainerGridSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerGridSelectionFilterParameter& operator=(const DataContainerGridSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataContainerGridSelectionFilterParameter& operator=(DataContainerGridSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index cd4c219ead..bcbfa78aa1 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -83,6 +83,10 @@ QString DataContainerReaderFilterParameter::getWidgetType() const
 void DataContainerReaderFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined())
   {
     QJsonObject jsonObject = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index 4c9f9ab411..128aa6e813 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -83,6 +83,10 @@ QString DataContainerSelectionFilterParameter::getWidgetType() const
 void DataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 234457f5f9..34adf18fc1 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -99,6 +99,10 @@ QString DoubleFilterParameter::getWidgetType() const
 void DoubleFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toDouble());
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 71b3ffba71..360cb82b77 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -77,6 +77,10 @@ QString DynamicChoiceFilterParameter::getWidgetType() const
 void DynamicChoiceFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 2eb5ca42f6..e3b91dd777 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -100,6 +100,10 @@ QString DynamicTableFilterParameter::getWidgetType() const
 void DynamicTableFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject jsonObj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 4f387746d5..18c4f4de6d 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -82,6 +82,10 @@ QString FileListInfoFilterParameter::getWidgetType() const
 void FileListInfoFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject jsonObj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 03a832d94f..ae1c3ce1f0 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -174,6 +174,18 @@ QString FilterParameter::getPropertyName() const
   return m_PropertyName;
 }
 
+// -----------------------------------------------------------------------------
+void FilterParameter::setLegacyPropertyName(const QString& value)
+{
+  m_LegacyPropertyName = value;
+}
+
+// -----------------------------------------------------------------------------
+QString FilterParameter::getLegacyPropertyName() const
+{
+  return m_LegacyPropertyName;
+}
+
 // -----------------------------------------------------------------------------
 void FilterParameter::setCategory(const FilterParameter::Category& value)
 {
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 99e8504f7c..c6d88b33cb 100755
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -104,6 +104,20 @@ class SIMPLib_EXPORT FilterParameter
      */
     QString getPropertyName() const;
 
+    /**
+     * @brief This sets an alternate or legacy property name that was used in past versions of a filter.
+     *
+     * This can be useful if the filter changed the name of the property and to keep old pipeline files working
+     * @param value
+     */
+    void setLegacyPropertyName(const QString& value);
+
+    /**
+     * @brief Returns the legacy property name
+     * @return
+     */
+    QString getLegacyPropertyName() const;
+
     /**
      * @brief getWidgetType This is a pure virtual function. All subclasses need
      * to implement this function.
@@ -185,6 +199,7 @@ class SIMPLib_EXPORT FilterParameter
 
     QString m_HumanLabel = {};
     QString m_PropertyName = {};
+    QString m_LegacyPropertyName = {};
     FilterParameter::Category m_Category = {};
     bool m_ReadOnly = {};
     int m_GroupIndex = {};
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index 92bea953a2..2c6c03bd59 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -77,6 +77,10 @@ QString FloatFilterParameter::getWidgetType() const
 void FloatFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     float f = static_cast<float>(jsonValue.toDouble());
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 0dc45d096e..1e7b0609bc 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -75,9 +75,13 @@ QString FloatVec2FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec2FilterParameter::readJson(const QJsonObject& obj)
+void FloatVec2FilterParameter::readJson(const QJsonObject& json)
 {
-  QJsonValue jsonValue = obj[getPropertyName()];
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject json = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3.h b/Source/SIMPLib/FilterParameters/FloatVec3.h
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 80c4307ae8..b3eb89d28a 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -77,9 +77,13 @@ QString FloatVec3FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec3FilterParameter::readJson(const QJsonObject& obj)
+void FloatVec3FilterParameter::readJson(const QJsonObject& json)
 {
-  QJsonValue jsonValue = obj[getPropertyName()];
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject json = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index 84f1459dae..b473e89584 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -80,6 +80,10 @@ QString FourthOrderPolynomialFilterParameter::getWidgetType() const
 void FourthOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index 67fbb30f4a..7f0b040b66 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -84,6 +84,10 @@ QString InputFileFilterParameter::getWidgetType() const
 void InputFileFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index 808f680c50..e5e6e55421 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -80,6 +80,10 @@ QString InputPathFilterParameter::getWidgetType() const
 void InputPathFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index 19ed92830d..a10504c36f 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -78,6 +78,10 @@ QString IntFilterParameter::getWidgetType() const
 void IntFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toInt(0.0));
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
index 8e723e510d..9e657da8e4 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -75,9 +75,13 @@ QString IntVec2FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec2FilterParameter::readJson(const QJsonObject& obj)
+void IntVec2FilterParameter::readJson(const QJsonObject& json)
 {
-  QJsonValue jsonValue = obj[getPropertyName()];
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject json = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index 16865c14b5..3c6f901ab1 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -77,9 +77,13 @@ QString IntVec3FilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec3FilterParameter::readJson(const QJsonObject& obj)
+void IntVec3FilterParameter::readJson(const QJsonObject& json)
 {
-  QJsonValue jsonValue = obj[getPropertyName()];
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject json = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index c10625c877..d0f427a1c3 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -78,6 +78,10 @@ QString LinkedBooleanFilterParameter::getWidgetType() const
 void LinkedBooleanFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(static_cast<bool>(jsonValue.toInt()));
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index 9de90f1626..06ac694af7 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -84,6 +84,10 @@ QString LinkedDataContainerSelectionFilterParameter::getWidgetType() const
 void LinkedDataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 44b56b7658..04cc2e1a6e 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -137,6 +137,10 @@ QString LinkedPathCreationFilterParameter::getWidgetType() const
 void LinkedPathCreationFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
new file mode 100644
index 0000000000..70ad5fcd69
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -0,0 +1,184 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MontageStructureSelectionFilterParameter.h"
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::MontageStructureSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::~MontageStructureSelectionFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue,
+                                                                                                Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                                int groupIndex)
+{
+  MontageStructureSelectionFilterParameter::Pointer ptr = MontageStructureSelectionFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  QVariant v;
+  v.setValue(defaultValue);
+  ptr->setDefaultValue(v);
+  ptr->setCategory(category);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageStructureSelectionFilterParameter::getWidgetType() const
+{
+  return QString("MontageStructureSelectionWidget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
+  if(jsonValue.isString() && m_SetterCallback)
+  {
+    m_SetterCallback(jsonValue.toString());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    QString montageName = m_GetterCallback();
+    json[getPropertyName()] = montageName;
+  }
+}
+
+#if 0
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath)
+{
+  DataArrayPath oldPath;
+  DataArrayPath newPath;
+  std::tie(oldPath, newPath) = renamePath;
+
+  if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
+  {
+    m_SetterCallback(newPath);
+    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  }
+}
+#endif
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::New()
+{
+  return Pointer(new MontageStructureSelectionFilterParameter());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::SetterCallbackType MontageStructureSelectionFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionFilterParameter::setSetterCallback(const SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionFilterParameter::GetterCallbackType MontageStructureSelectionFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionFilterParameter::setGetterCallback(const GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageStructureSelectionFilterParameter::getNameOfClass() const
+{
+  return "MontageStructureSelectionFilterParameter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageStructureSelectionFilterParameter::ClassName()
+{
+  return "MontageStructureSelectionFilterParameter";
+}
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
new file mode 100644
index 0000000000..87dbb006b8
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
@@ -0,0 +1,164 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QJsonObject>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+
+/**
+ * @brief SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * MontageStructureSelectionFilterParameter. There are 4 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
+ * SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP("Montage", NameName, FilterParameter::Parameter, GenericExample, 2);
+ */
+#define SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP(...)                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MontageStructureSelectionFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The MontageStructureSelectionFilterParameter class is used by filters to instantiate an DataContainerSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a DataContainerSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT MontageStructureSelectionFilterParameter : public FilterParameter
+{
+public:
+  using Self = MontageStructureSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for StatsDataArray
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(const QString&)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the MontageStructureSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_DC_SELECTION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                     int groupIndex = -1);
+
+  ~MontageStructureSelectionFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  SetterCallbackType getSetterCallback() const;
+  void setSetterCallback(const SetterCallbackType& value);
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  GetterCallbackType getGetterCallback() const;
+  void setGetterCallback(const GetterCallbackType& value);
+
+  /**
+   * @brief Handles changes to the DataArrayPath
+   * @param filter
+   * @param renamePath
+   */
+  // void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief MontageStructureSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MontageStructureSelectionFilterParameter();
+
+private:
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
+
+public:
+  MontageStructureSelectionFilterParameter(const MontageStructureSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MontageStructureSelectionFilterParameter(MontageStructureSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MontageStructureSelectionFilterParameter& operator=(const MontageStructureSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MontageStructureSelectionFilterParameter& operator=(MontageStructureSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index c2c7c58879..5e21529dbc 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -167,6 +167,10 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
 void MultiAttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index 1f08a73e10..b08b247845 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -167,6 +167,10 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
 void MultiDataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index de8ea77e84..949200587c 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -168,6 +168,10 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 044b7842b3..42a1cd1e62 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -80,6 +80,10 @@ QString NumericTypeFilterParameter::getWidgetType() const
 void NumericTypeFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(static_cast<SIMPL::NumericTypes::Type>(jsonValue.toInt(0.0)));
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index 62659e3964..eb5fd55089 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -80,6 +80,10 @@ QString OutputFileFilterParameter::getWidgetType() const
 void OutputFileFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index 9bd463f8e5..1288b07679 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -80,6 +80,10 @@ QString OutputPathFilterParameter::getWidgetType() const
 void OutputPathFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index fd225ddd64..e374ad53fc 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -77,6 +77,10 @@ QString ParagraphFilterParameter::getWidgetType() const
 void ParagraphFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index a12710f907..63a8a99db8 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -87,6 +87,10 @@ QString PhaseTypeSelectionFilterParameter::getWidgetType() const
 void PhaseTypeSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray jsonArray = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 7db891e3eb..3602e58b3b 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -78,6 +78,10 @@ QString RangeFilterParameter::getWidgetType() const
 void RangeFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index a16c11bd86..1fb0fc4f38 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -80,6 +80,10 @@ QString ScalarTypeFilterParameter::getWidgetType() const
 void ScalarTypeFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(static_cast<SIMPL::ScalarTypes::Type>(jsonValue.toInt(0.0)));
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 8f441ce021..24390e963e 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -80,6 +80,10 @@ QString SecondOrderPolynomialFilterParameter::getWidgetType() const
 void SecondOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 77e0609990..52addb3070 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -84,6 +84,10 @@ QString ShapeTypeSelectionFilterParameter::getWidgetType() const
 void ShapeTypeSelectionFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray jsonArray = jsonValue.toArray();
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index 4f4d756c7f..dd326e67d4 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -30,6 +30,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataArraySelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerArrayProxyFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerCreationFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerGridSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerReaderFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DoubleFilterParameter.h
@@ -60,6 +61,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageFileListInfo.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageStructureSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.h
@@ -100,6 +102,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataArraySelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerArrayProxyFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerCreationFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerGridSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerReaderFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DoubleFilterParameter.cpp
@@ -129,6 +132,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/LinkedPathCreationFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageFileListInfo.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelectionFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageStructureSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiAttributeMatrixSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataContainerSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiDataArraySelectionFilterParameter.cpp
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index ffcf977623..99f9e13162 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -77,6 +77,10 @@ QString StringFilterParameter::getWidgetType() const
 void StringFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     m_SetterCallback(jsonValue.toString(""));
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index 6b94f4ad14..9f0943198c 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -80,6 +80,10 @@ QString ThirdOrderPolynomialFilterParameter::getWidgetType() const
 void ThirdOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 2f59acf008..c49447fb19 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -75,6 +75,10 @@ QString UInt64FilterParameter::getWidgetType() const
 void UInt64FilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     bool ok = false;
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index fa9dcebd3b..05f0eabdd6 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -559,22 +559,28 @@ int EdgeGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) c
 // -----------------------------------------------------------------------------
 QString EdgeGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Edges</th><td>)" << getNumberOfEdges() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-    ss << "</tbody></table>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+  
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator EdgeGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Edges", QString::number(getNumberOfEdges()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 3bd45ac3ac..59105c9199 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -337,6 +337,13 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief writeGeometryToHDF5
    * @param parentId
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index a3b547bb94..e46e3a38ad 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -720,21 +720,28 @@ int HexahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileN
 // -----------------------------------------------------------------------------
 QString HexahedralGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Hexahedra</th><td>)" << getNumberOfHexas() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+  
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator HexahedralGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Hexahedra", QString::number(getNumberOfHexas()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 14ca567793..b5e898e0c4 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -320,6 +320,13 @@ class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
      */
     QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the geometry.
+     * @return
+     */
+    ToolTipGenerator getToolTipGenerator() const override;
+
     /**
      * @brief writeGeometryToHDF5
      * @param parentId
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 3e80b9b4d0..f07f6a084d 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,7 +48,7 @@
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/DynamicListArray.hpp"
 #include "SIMPLib/Geometry/ITransformContainer.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
 
 class AttributeMatrix;
 using AttributeMatrixShPtrType = std::shared_ptr<AttributeMatrix>;
@@ -408,6 +408,13 @@ class SIMPLib_EXPORT IGeometry : public Observable
    */
   virtual QString getInfoString(SIMPL::InfoStringFormat) const = 0;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  virtual ToolTipGenerator getToolTipGenerator() const = 0;
+
   /**
    * @brief getXdmfGridType
    * @return
@@ -488,7 +495,6 @@ class SIMPLib_EXPORT IGeometry : public Observable
   virtual AttributeMatrixShPtrType removeAttributeMatrix(const QString& name) final;
 
 protected:
-
   /**
    * @brief sendThreadSafeProgressMessage
    * @param counter
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index fb68cce25b..2c299805f5 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -1013,47 +1013,50 @@ int ImageGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
+  if(format == SIMPL::HtmlFormat)
+  {
+    return getToolTipGenerator().generateHTML();
+  }
+  
   QString info;
   QTextStream ss(&info);
-  QString lengthUnit = IGeometry::LengthUnitToString(static_cast<IGeometry::LengthUnit>(getUnits()));
+  ss << "Requested InfoStringFormat is not supported. " << format;
 
-  int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
+  return info;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator ImageGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  QString lengthUnit = IGeometry::LengthUnitToString(static_cast<IGeometry::LengthUnit>(getUnits()));
+  int64_t volDims[3] = { static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints()) };
   FloatVec3Type spacing = getSpacing();
   FloatVec3Type origin = getOrigin();
 
-  float halfRes[3] = {spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f};
-
-  if(format == SIMPL::HtmlFormat)
-  {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Extents:</th><td>)"
-       << "<p>X Extent: 0 to " << volDims[0] - 1 << " (dimension: " << volDims[0] << ")</p>"
-       << "<p>Y Extent: 0 to " << volDims[1] - 1 << " (dimension: " << volDims[1] << ")</p>"
-       << "<p>Z Extent: 0 to " << volDims[2] - 1 << " (dimension: " << volDims[2] << ")</p>"
-       << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Origin:</th><td>)" << origin[0] << ", " << origin[1] << ", " << origin[2] << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing:</th><td>)" << spacing[0] << ", " << spacing[1] << ", " << spacing[2] << "</td></tr>";
-
-    float vol = (volDims[0] * spacing[0]) * (volDims[1] * spacing[1]) * (volDims[2] * spacing[2]);
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Volume:</th><td>)" << usa.toString(vol) << " " << lengthUnit
-       << "s ^3"
-          "</td></tr>";
-
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Bounds (Cell Centered):</th><td>)"
-       << "<p>X Range: " << (origin[0] - halfRes[0]) << " to " << (origin[0] - halfRes[0] + volDims[0] * spacing[0]) << " (delta: " << (volDims[0] * spacing[0]) << ")</p>"
-       << "<p>Y Range: " << (origin[1] - halfRes[1]) << " to " << (origin[1] - halfRes[1] + volDims[1] * spacing[1]) << " (delta: " << (volDims[1] * spacing[1]) << ")</p>"
-       << "<p>Z Range: " << (origin[2] - halfRes[2]) << " to " << (origin[2] - halfRes[2] + volDims[2] * spacing[2]) << " (delta: " << (volDims[2] * spacing[2]) << ")</p>"
-       << "</td></tr>";
-  }
-  else
-  {
-    ss << "Requested InfoStringFormat is not supported. " << format;
-  }
-  return info;
+  float halfRes[3] = { spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f };
+  float vol = (volDims[0] * spacing[0]) * (volDims[1] * spacing[1]) * (volDims[2] * spacing[2]);
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addTitle("Extents");
+  toolTipGen.addValue("X", "0 to " + QString::number(volDims[0] - 1) + " (dimension: " + QString::number(volDims[0]) + ")");
+  toolTipGen.addValue("Y", "0 to " + QString::number(volDims[1] - 1) + " (dimension: " + QString::number(volDims[1]) + ")");
+  toolTipGen.addValue("Z", "0 to " + QString::number(volDims[2] - 1) + " (dimension: " + QString::number(volDims[2]) + ")");
+  toolTipGen.addValue("Origin", QString::number(origin[0]) + ", " + QString::number(origin[1]) + ", " + QString::number(origin[2]));
+  toolTipGen.addValue("Spacing", QString::number(spacing[0]) + ", " + QString::number(spacing[1]) + ", " + QString::number(spacing[2]));
+  toolTipGen.addValue("Volume", usa.toString(vol) + " " + lengthUnit + "s ^3");
+  toolTipGen.addTitle("Bounds (Cell Centered)");
+  toolTipGen.addValue("X Range", QString::number(origin[0] - halfRes[0]) + " to " + QString::number(origin[0] - halfRes[0] + volDims[0] * spacing[0]) + " (delta: " + QString::number(volDims[0] * spacing[0]) + ")");
+  toolTipGen.addValue("Y Range", QString::number(origin[1] - halfRes[1]) + " to " + QString::number(origin[1] - halfRes[1] + volDims[1] * spacing[1]) + " (delta: " + QString::number(volDims[1] * spacing[1]) + ")");
+  toolTipGen.addValue("Z Range", QString::number(origin[2] - halfRes[2]) + " to " + QString::number(origin[2] - halfRes[2] + volDims[2] * spacing[2]) + " (delta: " + QString::number(volDims[2] * spacing[2]) + ")");
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 33432dccf5..ad161ecf47 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -251,6 +251,13 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief writeGeometryToHDF5
    * @param parentId
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index 022dd3a7e9..c1e4171bcd 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -644,22 +644,28 @@ int QuadGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) c
 // -----------------------------------------------------------------------------
 QString QuadGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Quads</th><td>)" << getNumberOfQuads() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-    ss << "</tbody></table>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+  
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator QuadGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Quads", QString::number(getNumberOfQuads()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index f7c7a4cb62..5c9d4912df 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -309,6 +309,13 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief writeGeometryToHDF5
    * @param parentId
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index a21356342a..b40267b31a 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -1086,25 +1086,30 @@ int RectGridGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileNam
 // -----------------------------------------------------------------------------
 QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
-  int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << "<tr bgcolor=\"#FFFCEA\"><th align=\"right\">Dimensions:</th><td>" << volDims[0] << " x " << volDims[1] << " x " << volDims[2] << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Spacing:</th><td>)"
-       << "Variable"
-       << "</td></tr>";
+    return getToolTipGenerator().generateHTML();
   }
-  else
-  {
-  }
-  return info;
+  
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator RectGridGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  int64_t volDims[3] = { static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints()) };
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Dimmensions", QString::number(volDims[0]) + " x " + QString::number(volDims[1]) + " x " + QString::number(volDims[2]));
+  toolTipGen.addValue("Spacing", "Variable");
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 8c3fae278f..5e2eaff0ec 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -195,6 +195,13 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
      */
     QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the geometry.
+     * @return
+     */
+    ToolTipGenerator getToolTipGenerator() const override;
+
     /**
      * @brief writeGeometryToHDF5
      * @param parentId
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 563eb2bae8..b72d3f51a4 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -741,21 +741,28 @@ int TetrahedralGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFile
 // -----------------------------------------------------------------------------
 QString TetrahedralGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Tetrahedra</th><td>)" << getNumberOfTets() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator TetrahedralGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Tetrahedra", QString::number(getNumberOfTets()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index e492ce4946..00b894a7e5 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -350,6 +350,13 @@ class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
      */
     QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+    /**
+     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+     * with values populated to match the geometry.
+     * @return
+     */
+    ToolTipGenerator getToolTipGenerator() const override;
+
     /**
      * @brief writeGeometryToHDF5
      * @param parentId
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index be2f5eacd0..41b7ea4d18 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -642,21 +642,28 @@ int TriangleGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileNam
 // -----------------------------------------------------------------------------
 QString TriangleGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Triangles</th><td>)" << getNumberOfTris() << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator TriangleGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Triangles", QString::number(getNumberOfTris()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 1f14f50dd6..a85f608b23 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -305,6 +305,13 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief writeGeometryToHDF5
    * @param parentId
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 0db63f4505..110f374c40 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -407,21 +407,27 @@ int VertexGeom::writeXdmf(QTextStream& out, QString dcName, QString hdfFileName)
 // -----------------------------------------------------------------------------
 QString VertexGeom::getInfoString(SIMPL::InfoStringFormat format) const
 {
-  QString info;
-  QTextStream ss(&info);
-
   if(format == SIMPL::HtmlFormat)
   {
-    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Geometry Info</th></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type</th><td>)" << TypeToString(getGeometryType()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Units</th><td>)" << LengthUnitToString(getUnits()) << "</td></tr>";
-    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Vertices</th><td>)" << getNumberOfVertices() << "</td></tr>";
-    ss << "</tbody></table>";
-  }
-  else
-  {
+    return getToolTipGenerator().generateHTML();
   }
-  return info;
+
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator VertexGeom::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  toolTipGen.addTitle("Geometry Info");
+  toolTipGen.addValue("Type", TypeToString(getGeometryType()));
+  toolTipGen.addValue("Units", LengthUnitToString(getUnits()));
+  toolTipGen.addValue("Number of Vertices", QString::number(getNumberOfVertices()));
+
+  return toolTipGen;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 011b40d107..2ee3c9d20b 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -272,6 +272,13 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
    */
   QString getInfoString(SIMPL::InfoStringFormat format) const override;
 
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
   /**
    * @brief writeGeometryToHDF5
    * @param parentId
diff --git a/Source/SIMPLib/Montages/AbstractMontage.cpp b/Source/SIMPLib/Montages/AbstractMontage.cpp
new file mode 100644
index 0000000000..dd93ec3917
--- /dev/null
+++ b/Source/SIMPLib/Montages/AbstractMontage.cpp
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "AbstractMontage.h"
+
+#include "SIMPLib/DataContainers/DataContainer.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontage::AbstractMontage(const QString& name)
+: INamedObject(name)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontage::~AbstractMontage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList AbstractMontage::getDataContainerNames() const
+{
+  CollectionType dataContainers = getDataContainers();
+  QStringList dcNames;
+  for(const auto& dc : dataContainers)
+  {
+    dcNames.push_back(dc->getName());
+  }
+
+  return dcNames;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::vector<DataArrayPath> AbstractMontage::getDataArrayPaths() const
+{
+  std::vector<DataArrayPath> paths;
+  CollectionType dataContainers = getDataContainers();
+  for(const auto& dc : dataContainers)
+  {
+    paths.push_back(DataArrayPath(dc->getName(), "", ""));
+  }
+
+  return paths;
+}
+
+// -----------------------------------------------------------------------------
+AbstractMontage::Pointer AbstractMontage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
new file mode 100644
index 0000000000..121958bd30
--- /dev/null
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -0,0 +1,174 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QString>
+
+#include "SIMPLib/Common/INamedObject.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/SIMPLib.h"
+
+#include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/QH5Utilities.h"
+
+class AbstractTileIndex;
+using AbstractTileIndexShPtr = std::shared_ptr<AbstractTileIndex>;
+
+class DataContainer;
+using DataContainerShPtr = std::shared_ptr<DataContainer>;
+
+class DataContainerArray;
+using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
+
+/**
+ * @brief The AbstractMontage class is the base for the various types of montages and
+ * contains the common API between the types.  It does not have access to individual tiles,
+ * as those require Montage-specific Index types.  AbstractMontage is derived from
+ * INamedObject in order to take advantage of NamedCollection<AbstractMontage>.  This
+ * custom collection allows items to be searched for by name and prevents multiple items
+ * from having the same name.
+ */
+class SIMPLib_EXPORT AbstractMontage : public INamedObject
+{
+public:
+    using Self = AbstractMontage;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
+    static Pointer NullPointer();
+
+
+  using CollectionType = std::vector<DataContainerShPtr>;
+  using Iterator = CollectionType::iterator;
+  using ConstIterator = CollectionType::const_iterator;
+
+  virtual ~AbstractMontage();
+
+  /**
+   * @brief Checks if the montage's values are valid.
+   * @return
+   */
+  virtual bool isValid() const = 0;
+
+  /**
+   * @brief Returns the number of tiles in the montage.
+   * @return
+   */
+  virtual size_t getTileCount() const = 0;
+
+  /**
+   * @brief Returns the collection of DataContainers used by the montage.
+   * @return
+   */
+  virtual CollectionType getDataContainers() const = 0;
+
+  /**
+   * @brief Returns a QStringList of the DataContainer names in the montage.
+   * @return
+   */
+  QStringList getDataContainerNames() const;
+
+  /**
+   * @brief Returns a vector of DataArrayPaths for the Montage.
+   * @return
+   */
+  std::vector<DataArrayPath> getDataArrayPaths() const;
+
+  /**
+   * @brief Returns an HTML string containing information about the montage.
+   * @return
+   */
+  virtual QString getInfoString() const = 0;
+
+  /**
+   * @brief Returns a shared_ptr for the tile index for the given DataContainer.
+   * @param dc
+   * @return
+   */
+  virtual AbstractTileIndexShPtr getTileIndexFor(const DataContainerShPtr& dc) const = 0;
+
+  /**
+   * @brief Creates and returns a copy of the montage with all DataContainer references
+   * updated to the provided DataContainerArray.  If a DataContainer cannot be found,
+   * it is set to nullptr.
+   * @param dca
+   * @return
+   */
+  virtual Pointer propagate(const DataContainerArrayShPtr& dca) const = 0;
+
+  /**
+   * @brief Write the montage to an HDF5 file.
+   * @param groupId
+   * @return error code
+   */
+  virtual int writeH5Data(hid_t groupId) const = 0;
+
+  /* -------- Begin iterator support -------- */
+  /**
+   * @brief STL begin iterator required in all derived classes.
+   * @return
+   */
+  virtual Iterator begin() = 0;
+
+  /**
+   * @brief STL end iterator required in all derived classes.
+   * @return
+   */
+  virtual Iterator end() = 0;
+
+  /**
+   * @brief STL begin const_iterator required in all derived classes.
+   * @return
+   */
+  virtual ConstIterator begin() const = 0;
+
+  /**
+   * @brief STL end const_iterator required in all derived classes.
+   * @return
+   */
+  virtual ConstIterator end() const = 0;
+  /* -------- End iterator support -------- */
+
+protected:
+  /**
+   * @brief Constructor is only available to derived classes.
+   * @param name
+   */
+  AbstractMontage(const QString& name);
+
+  private:
+
+};
+
+using AbstractMontageShPtr = std::shared_ptr<AbstractMontage>;
diff --git a/Source/SIMPLib/Montages/AbstractTileIndex.cpp b/Source/SIMPLib/Montages/AbstractTileIndex.cpp
new file mode 100644
index 0000000000..cc43bf55c6
--- /dev/null
+++ b/Source/SIMPLib/Montages/AbstractTileIndex.cpp
@@ -0,0 +1,72 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "AbstractTileIndex.h"
+
+#include "SIMPLib/Montages/AbstractMontage.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractTileIndex::AbstractTileIndex()
+: m_Montage(nullptr)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractTileIndex::AbstractTileIndex(const AbstractMontage* montage)
+: m_Montage(montage)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractTileIndex::~AbstractTileIndex() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+const AbstractMontage* AbstractTileIndex::getMontage() const
+{
+  return m_Montage;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool AbstractTileIndex::isValid() const
+{
+  return (nullptr != m_Montage);
+}
diff --git a/Source/SIMPLib/Montages/AbstractTileIndex.h b/Source/SIMPLib/Montages/AbstractTileIndex.h
new file mode 100644
index 0000000000..51d028b665
--- /dev/null
+++ b/Source/SIMPLib/Montages/AbstractTileIndex.h
@@ -0,0 +1,97 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include <QtCore/QString>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
+
+class AbstractMontage;
+
+class DataContainer;
+using DataContainerShPtr = std::shared_ptr<DataContainer>;
+
+/**
+ * @class AbstractTileIndex AbstractTileIndex.h SIMPLib/DataContainers/AbstractTileIndex.h
+ * @brief The AbstractTileIndex class is the base class for other index classes used
+ * by each of the Montage collections.  The common requirements between these is the
+ * ability to get the montage the index is for, the DataContainer it points to, and
+ * a validity check.
+ */
+class SIMPLib_EXPORT AbstractTileIndex
+{
+public:
+  /**
+   * @brief The default constructor creates invalid indices.
+   */
+  AbstractTileIndex();
+
+  /**
+   * @brief Destructor
+   */
+  virtual ~AbstractTileIndex();
+
+  /**
+   * @brief Returns a const pointer to the Montage this index is valid for.
+   * If no montage was assigned, this returns nullptr.
+   * @return
+   */
+  const AbstractMontage* getMontage() const;
+
+  /**
+   * @brief Returns the DataContainer this index points to.  If the index is invalid, this returns nullptr.
+   * @return
+   */
+  virtual DataContainerShPtr getDataContainer() const = 0;
+
+  /**
+   * @brief Returns true if this index is valid.  Returns false otherwise.
+   * @return
+   */
+  virtual bool isValid() const;
+
+  /**
+   * @brief Creates and returns a ToolTipGenerator with the relevant values set for the tile index.
+   * @return
+   */
+  virtual ToolTipGenerator getToolTipGenerator() const = 0;
+
+protected:
+  AbstractTileIndex(const AbstractMontage* montage);
+
+private:
+  const AbstractMontage* m_Montage;
+};
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.cpp b/Source/SIMPLib/Montages/DataContainerGrid.cpp
new file mode 100644
index 0000000000..b56d056736
--- /dev/null
+++ b/Source/SIMPLib/Montages/DataContainerGrid.cpp
@@ -0,0 +1,195 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataContainerGrid.h"
+
+#include <algorithm>
+
+ // -----------------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------------
+DataContainerGrid::DataContainerGrid(SizeVec3Type dims)
+: m_Dims(dims)
+, m_DataContainerNames(dims[0] * dims[1] * dims[2])
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGrid::DataContainerGrid(SizeVec3Type dims, const std::vector<QString>& dcList)
+: m_Dims(dims)
+, m_DataContainerNames(dims[0] * dims[1] * dims[2])
+{
+  size_t size = std::min(dcList.size(), m_DataContainerNames.size());
+  for(size_t i = 0; i < size; i++)
+  {
+    m_DataContainerNames[i] = dcList[i];
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGrid::DataContainerGrid(const DataContainerGrid& other)
+: m_Dims(other.m_Dims)
+, m_DataContainerNames(other.m_DataContainerNames)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGrid::~DataContainerGrid() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t getOffsetForSize(SizeVec3Type pos, SizeVec3Type size)
+{
+  size_t row = pos[0];
+  size_t col = pos[1];
+  size_t depth = pos[2];
+
+  size_t rowCount = size[0];
+  size_t colCount = size[1];
+
+  size_t offset = row + col * rowCount + depth * rowCount * colCount;
+  return offset;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t DataContainerGrid::getOffset(SizeVec3Type pos) const
+{
+  return getOffsetForSize(pos, m_Dims);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t DataContainerGrid::size() const
+{
+  return m_Dims[0] * m_Dims[1] * m_Dims[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SizeVec3Type DataContainerGrid::getDimensions() const
+{
+  return m_Dims;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGrid::resizeDimensions(SizeVec3Type newSize)
+{
+  const SizeVec3Type oldSize = m_Dims;
+  const NameCollectionType oldNames = m_DataContainerNames;
+
+  m_Dims = newSize;
+  m_DataContainerNames.clear();
+  m_DataContainerNames.resize(newSize[0] * newSize[1] * newSize[2]);
+
+  for(size_t row = 0; row < newSize[0] && row < oldSize[0]; row++)
+  {
+    for(size_t col = 0; col < newSize[1] && col < oldSize[1]; col++)
+    {
+      for(size_t depth = 0; depth < newSize[2] && depth < oldSize[2]; depth++)
+      {
+        SizeVec3Type pos(row, col, depth);
+        size_t oldOffset = getOffsetForSize(pos, oldSize);
+        size_t newOffset = getOffsetForSize(pos, newSize);
+        m_DataContainerNames[newOffset] = oldNames[oldOffset];
+      }
+    }
+  }
+
+  emit dimensionsChanged(newSize);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataContainerGrid::getDataContainerName(SizeVec3Type pos) const
+{
+  size_t offset = getOffset(pos);
+  return m_DataContainerNames[offset];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGrid::setDataContainerName(SizeVec3Type pos, const QString& name)
+{
+  size_t offset = getOffset(pos);
+  m_DataContainerNames[offset] = name;
+
+  emit dataContainerNameChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStringList DataContainerGrid::getDataContainerNames() const
+{
+  QStringList dcNames;
+
+  for(size_t depth = 0; depth < m_Dims[2]; depth++)
+  {
+    for(size_t row = 0; row < m_Dims[0]; row++)
+    {
+      for(size_t col = 0; col < m_Dims[1]; col++)
+      {
+        size_t offset = getOffset(SizeVec3Type(row, col, depth));
+        dcNames.push_back(m_DataContainerNames[offset]);
+      }
+    }
+  }
+
+  return dcNames;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGrid& DataContainerGrid::operator=(const DataContainerGrid& other)
+{
+  m_Dims = other.m_Dims;
+  m_DataContainerNames = other.m_DataContainerNames;
+  
+  emit dimensionsChanged(m_Dims);
+  return *this;
+}
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.h b/Source/SIMPLib/Montages/DataContainerGrid.h
new file mode 100644
index 0000000000..4450bad1c7
--- /dev/null
+++ b/Source/SIMPLib/Montages/DataContainerGrid.h
@@ -0,0 +1,112 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <vector>
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/SIMPLib.h"
+
+class SIMPLib_EXPORT DataContainerGrid : public QObject
+{
+  Q_OBJECT
+
+public:
+  using NameCollectionType = std::vector<QString>;
+
+  DataContainerGrid(SizeVec3Type dims = SizeVec3Type());
+  DataContainerGrid(SizeVec3Type dims, const std::vector<QString>& dcList);
+  virtual ~DataContainerGrid();
+
+  /**
+   * @brief Returns the number of items in the grid.
+   * @return
+   */
+  size_t size() const;
+
+  /**
+   * @brief Returns the grid's dimensions.
+   * @return
+   */
+  SizeVec3Type getDimensions() const;
+
+  /**
+   * @brief Resizes the grid to the given dimensions.
+   * @param newSize
+   */
+  void resizeDimensions(SizeVec3Type newSize);
+
+  /**
+   * @brief Returns the DataContainer name at the given position.
+   * @param pos
+   * @return
+   */
+  QString getDataContainerName(SizeVec3Type pos) const;
+
+  /**
+   * @brief Sets the DataContainer name for the given position.
+   * @param pos
+   * @param name
+   */
+  void setDataContainerName(SizeVec3Type pos, const QString& name);
+
+  /**
+   * @brief Returns a list of DataContainer names.
+   * @return
+   */
+  QStringList getDataContainerNames() const;
+
+signals:
+  void dimensionsChanged(SizeVec3Type newDims);
+  void dataContainerNameChanged();
+
+private:
+  /**
+   * @brief Returns the vector offset for the given position
+   * @param pos
+   * @return
+   */
+  size_t getOffset(SizeVec3Type pos) const;
+
+  SizeVec3Type m_Dims;
+  NameCollectionType m_DataContainerNames;
+
+public:
+  DataContainerGrid(const DataContainerGrid& other);
+  DataContainerGrid& operator=(const DataContainerGrid& other);
+};
+
+Q_DECLARE_METATYPE(DataContainerGrid)
diff --git a/Source/SIMPLib/Montages/GridMontage.cpp b/Source/SIMPLib/Montages/GridMontage.cpp
new file mode 100644
index 0000000000..8046bb5fb1
--- /dev/null
+++ b/Source/SIMPLib/Montages/GridMontage.cpp
@@ -0,0 +1,657 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "GridMontage.h"
+
+#include <memory>
+#include <typeinfo>
+
+#include "H5Support/QH5Lite.h"
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Geometry/IGeometry3D.h"
+#include "SIMPLib/Geometry/IGeometryGrid.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::GridMontage(const QString& name, size_t row, size_t col, size_t depth)
+: AbstractMontage(name)
+, m_Size(SizeVec3Type(row, col, depth))
+{
+  m_DataContainers.resize(getTileCount());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::Pointer GridMontage::New(const QString& name, size_t row, size_t col, size_t depth)
+{
+  if(name.isEmpty() || row == 0 || col == 0 || depth == 0)
+  {
+    return nullptr;
+  }
+
+  Pointer ptr = Pointer(new GridMontage(name, row, col, depth));
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::~GridMontage() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool GridMontage::isValid() const
+{
+  const size_t tileCount = getTileCount();
+  if(tileCount == 0)
+  {
+    return false;
+  }
+
+  IGeometry::LengthUnit lengthUnit;
+  IGeometry* geomType = nullptr;
+  for(size_t i = 0; i < tileCount; i++)
+  {
+    if(nullptr == m_DataContainers[i])
+    {
+      return false;
+    }
+    // Geometries Required
+    if(nullptr == m_DataContainers[i]->getGeometry())
+    {
+      return false;
+    }
+    // Identical length units and GeometryType required
+    if(i == 0)
+    {
+      lengthUnit = m_DataContainers[i]->getGeometry()->getUnits();
+      geomType = m_DataContainers[i]->getGeometry().get();
+    }
+    else if(lengthUnit != m_DataContainers[i]->getGeometry()->getUnits())
+    {
+      return false;
+    }
+    else if(typeid(geomType) != typeid(m_DataContainers[i]->getGeometry().get()))
+    {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridMontage::getRowCount() const
+{
+  return m_Size[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridMontage::getColumnCount() const
+{
+  return m_Size[1];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridMontage::getDepthCount() const
+{
+  return m_Size[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::SizeType GridMontage::getGridSize() const
+{
+  return m_Size;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridMontage::getTileCount() const
+{
+  return getRowCount() * getColumnCount() * getDepthCount();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridTileIndex GridMontage::getTileIndex(size_t row, size_t col, size_t depth) const
+{
+  if(row > m_Size[0])
+  {
+    return GridTileIndex();
+  }
+  if(col > m_Size[1])
+  {
+    return GridTileIndex();
+  }
+  if(depth > m_Size[2])
+  {
+    return GridTileIndex();
+  }
+
+  TileIdType tileID(row, col, depth);
+  return GridTileIndex(this, tileID);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridTileIndex GridMontage::getTileIndexForDataContainer(const DataContainerShPtr& dc) const
+{
+  const size_t rowCount = getRowCount();
+  const size_t colCount = getColumnCount();
+  const size_t depthCount = getDepthCount();
+
+  for(size_t row = 0; row < rowCount; row++)
+  {
+    for(size_t col = 0; col < colCount; col++)
+    {
+      for(size_t depth = 0; depth < depthCount; depth++)
+      {
+        GridTileIndex index = getTileIndex(row, col, depth);
+        DataContainer::Pointer d = getDataContainer(index);
+        if(dc == d)
+        {
+          return index;
+        }
+      }
+    }
+  }
+
+  return GridTileIndex();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractTileIndexShPtr GridMontage::getTileIndexFor(const DataContainerShPtr& dc) const
+{
+  GridTileIndex gridIndex = getTileIndexForDataContainer(dc);
+  GridTileIndex* indexPtr = new GridTileIndex(gridIndex);
+  return AbstractTileIndexShPtr(indexPtr);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontage::CollectionType GridMontage::getDataContainers() const
+{
+  return m_DataContainers;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainer::Pointer GridMontage::getDataContainer(GridTileIndex index) const
+{
+  if(!index.isValid())
+  {
+    return nullptr;
+  }
+
+  size_t offset = getOffsetFromTileId(index.getTilePos());
+  if(offset >= m_DataContainers.size())
+  {
+    return nullptr;
+  }
+  return m_DataContainers[offset];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GridMontage::setDataContainer(GridTileIndex index, const DataContainerShPtr& dc)
+{
+  if(!index.isValid())
+  {
+    return;
+  }
+
+  size_t offset = getOffsetFromTileId(index.getTilePos());
+  if(offset >= m_DataContainers.size())
+  {
+    return;
+  }
+  m_DataContainers[offset] = dc;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool checkTileIdValid(GridMontage::TileIdType tileID, GridMontage::SizeType gridSize)
+{
+  bool sizeCheck = true;
+  for(size_t i = 0; i < 3; i++)
+  {
+    sizeCheck &= tileID[i] <= gridSize[i];
+  }
+
+  return sizeCheck;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t getOffsetFromTileIdAndSize(GridMontage::TileIdType tileID, GridMontage::SizeType size)
+{
+  size_t row = tileID[0];
+  size_t col = tileID[1];
+  size_t depth = tileID[2];
+
+  size_t rowCount = size[0];
+  size_t colCount = size[1];
+
+  size_t offset = row + col * rowCount + depth * rowCount * colCount;
+  return offset;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridMontage::getOffsetFromTileId(TileIdType tileID) const
+{
+  return getOffsetFromTileIdAndSize(tileID, getGridSize());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GridMontage::resizeTileDims(size_t row, size_t col, size_t depth)
+{
+  const SizeType oldSize = getGridSize();
+  const CollectionType oldCollection = m_DataContainers;
+
+  m_DataContainers.resize(row * col * depth);
+  std::fill(m_DataContainers.begin(), m_DataContainers.end(), nullptr);
+
+  const SizeType newSize = getGridSize();
+  for(size_t r = 0; r < oldSize[0]; r++)
+  {
+    for(size_t c = 0; c < oldSize[1]; c++)
+    {
+      for(size_t d = 0; d < oldSize[2]; d++)
+      {
+        TileIdType oldId(r, c, d);
+        if(checkTileIdValid(oldId, newSize))
+        {
+          size_t oldOffset = getOffsetFromTileIdAndSize(oldId, oldSize);
+          size_t newOffset = getOffsetFromTileId(oldId);
+          m_DataContainers[newOffset] = oldCollection[oldOffset];
+        }
+      }
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::Pointer GridMontage::deepCopy() const
+{
+  Pointer ptr = Pointer(new GridMontage(getName(), getRowCount(), getColumnCount(), getDepthCount()));
+  const size_t tileCount = m_DataContainers.size();
+  for(size_t i = 0; i < tileCount; i++)
+  {
+    ptr->m_DataContainers[i] = m_DataContainers[i];
+  }
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontage::Pointer GridMontage::propagate(const DataContainerArrayShPtr& dca) const
+{
+  Pointer ptr = deepCopy();
+
+  // Use the DataContainer of the same name in the new DataContainerArray
+  const size_t tileCount = m_DataContainers.size();
+  for(size_t i = 0; i < tileCount; i++)
+  {
+    if(nullptr == m_DataContainers[i])
+    {
+      continue;
+    }
+    QString dcName = m_DataContainers[i]->getName();
+    ptr->m_DataContainers[i] = dca->getDataContainer(dcName);
+  }
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::Iterator GridMontage::begin()
+{
+  return m_DataContainers.begin();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::ConstIterator GridMontage::begin() const
+{
+  return m_DataContainers.begin();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::Iterator GridMontage::end()
+{
+  return m_DataContainers.end();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::ConstIterator GridMontage::end() const
+{
+  return m_DataContainers.end();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+IGeometry::LengthUnit GridMontage::getLengthUnit() const
+{
+  for(const auto& dc : m_DataContainers)
+  {
+    if(nullptr == dc || nullptr == dc->getGeometry())
+    {
+      continue;
+    }
+    return dc->getGeometry()->getUnits();
+  }
+
+  return IGeometry::LengthUnit::Unknown;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GridMontage::getLenthUnitString() const
+{
+  return IGeometry::LengthUnitToString(getLengthUnit());
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::DimensionsType GridMontage::getDimensions() const
+{
+  BoundsType bounds = getBounds();
+  DimensionsType dims;
+  dims[0] = bounds[1] - bounds[0];
+  dims[1] = bounds[3] - bounds[2];
+  dims[2] = bounds[5] - bounds[4];
+  return dims;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::BoundsType GridMontage::getBounds() const
+{
+  double minX = 0.0;
+  double maxX = 0.0;
+  double minY = 0.0;
+  double maxY = 0.0;
+  double minZ = 0.0;
+  double maxZ = 0.0;
+  bool hasValues = false;
+
+  for(const auto& dc : m_DataContainers)
+  {
+    if(nullptr == dc)
+    {
+      continue;
+    }
+    IGeometry::Pointer geom = dc->getGeometry();
+    if(nullptr == geom)
+    {
+      continue;
+    }
+
+    if(nullptr != std::dynamic_pointer_cast<IGeometryGrid>(geom))
+    {
+      IGeometryGrid::Pointer grid = std::dynamic_pointer_cast<IGeometryGrid>(geom);
+      size_t xPoints = grid->getXPoints();
+      size_t yPoints = grid->getYPoints();
+      size_t zPoints = grid->getZPoints();
+
+      double coords[3];
+
+      // float halfRes[3] = { 0, 0, 0 };
+      // float spacing[3] = { 1, 1, 1 };
+
+      // calculate origin point
+      {
+        grid->getCoords(0, 0, 0, coords);
+
+        if(!hasValues)
+        {
+          minX = coords[0];
+          minY = coords[1];
+          minZ = coords[2];
+
+          maxX = coords[0];
+          maxY = coords[1];
+          maxZ = coords[2];
+
+          hasValues = true;
+        }
+        else
+        {
+          // Find min
+          minX = std::min(minX, coords[0]);
+          minY = std::min(minY, coords[1]);
+          minZ = std::min(minZ, coords[2]);
+          // Find max
+          maxX = std::max(maxX, coords[0]);
+          maxY = std::max(maxY, coords[1]);
+          maxZ = std::max(maxZ, coords[2]);
+        }
+      }
+
+      // calculate opposite corner
+      {
+        grid->getCoords(xPoints, yPoints, zPoints, coords);
+
+        // Find min
+        minX = std::min(minX, coords[0]);
+        minY = std::min(minY, coords[1]);
+        minZ = std::min(minZ, coords[2]);
+        // Find max
+        maxX = std::max(maxX, coords[0]);
+        maxY = std::max(maxY, coords[1]);
+        maxZ = std::max(maxZ, coords[2]);
+      }
+
+      // minX -= halfRes[0];
+      // maxX -= halfRes[0];
+      // minY -= halfRes[1];
+      // maxY -= halfRes[1];
+      // minZ -= halfRes[2];
+      // minZ -= halfRes[2];
+    }
+  }
+
+  BoundsType extent;
+  extent[0] = minX;
+  extent[1] = maxX;
+  extent[2] = minY;
+  extent[3] = maxY;
+  extent[4] = minZ;
+  extent[5] = maxZ;
+
+  return extent;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GridMontage::getInfoString() const
+{
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  QString info;
+  QTextStream ss(&info);
+
+  ToolTipGenerator htmlGenerator;
+
+  htmlGenerator.addTitle("Montage Info");
+  htmlGenerator.addValue("Name", getName());
+  htmlGenerator.addValue("Type", "Grid");
+  htmlGenerator.addValue("Number of Tiles", usa.toString(static_cast<quint64>(getTileCount())));
+  htmlGenerator.addSpacer();
+  htmlGenerator.addTitle("Tile Dimensions");
+  htmlGenerator.addValue("Rows", usa.toString(static_cast<quint64>(getRowCount())));
+  htmlGenerator.addValue("Columns", usa.toString(static_cast<quint64>(getColumnCount())));
+  htmlGenerator.addValue("Depth", usa.toString(static_cast<quint64>(getDepthCount())));
+
+  htmlGenerator.addSpacer();
+
+  htmlGenerator.addTitle("Geometry Info");
+  const QString lengthUnitStr = getLenthUnitString();
+  htmlGenerator.addValue("Length Unit", lengthUnitStr);
+  const BoundsType bounds = getBounds();
+  const DimensionsType dims = getDimensions();
+  htmlGenerator.addValue("X", usa.toString(bounds[0]) + " to " + usa.toString(bounds[1]) + " (dimension: " + usa.toString(dims[0]) + ")");
+  htmlGenerator.addValue("Y", usa.toString(bounds[2]) + " to " + usa.toString(bounds[3]) + " (dimension: " + usa.toString(dims[1]) + ")");
+  htmlGenerator.addValue("Z", usa.toString(bounds[4]) + " to " + usa.toString(bounds[5]) + " (dimension: " + usa.toString(dims[2]) + ")");
+
+  return htmlGenerator.generateHTML();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int GridMontage::writeH5Data(hid_t groupId) const
+{
+  hid_t montageId = QH5Utilities::createGroup(groupId, getName());
+  // This object will make sure the HDF5 Group id is closed when it goes out of scope.
+  H5GroupAutoCloser bundleIdClose(&montageId);
+
+  int err = QH5Lite::writeStringDataset(montageId, "Montage Type", "GridMontage");
+  if(err < 0)
+  {
+    return err;
+  }
+
+  err = QH5Lite::writeStringDataset(montageId, SIMPL::StringConstants::Name, getName());
+  if(err < 0)
+  {
+    return err;
+  }
+
+  // Write Dimensions
+  const SizeVec3Type dims = getGridSize();
+  err = QH5Lite::writeScalarDataset(montageId, "X Dim", dims[0]);
+  if(err < 0)
+  {
+    return err;
+  }
+  err = QH5Lite::writeScalarDataset(montageId, "Y Dim", dims[1]);
+  if(err < 0)
+  {
+    return err;
+  }
+  err = QH5Lite::writeScalarDataset(montageId, "Z Dim", dims[2]);
+  if(err < 0)
+  {
+    return err;
+  }
+
+  // size_t count = static_cast<size_t>(m_DataContainers.size());
+  QStringList dcNameList;
+
+  for(const auto& dc : m_DataContainers)
+  {
+    if(nullptr == dc)
+    {
+      dcNameList << "";
+    }
+    else
+    {
+      dcNameList << dc->getName();
+    }
+  }
+
+  char sep = 0x1E; // Use the ASCII 'record separator' value (Decimal value 30) to separate the names
+  // Write the Names of the Data Containers that this bundle holds
+  QString nameList = dcNameList.join(QString(sep));
+  err = QH5Lite::writeStringDataset(montageId, SIMPL::StringConstants::DataContainerNames, nameList);
+  if(err < 0)
+  {
+    return err;
+  }
+
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool GridMontage::setDataContainers(std::vector<DataContainerShPtr> dataContainers)
+{
+  if(dataContainers.size() != m_DataContainers.size())
+  {
+    return false;
+  }
+  m_DataContainers = dataContainers;
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+GridMontage::Pointer GridMontage::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+
diff --git a/Source/SIMPLib/Montages/GridMontage.h b/Source/SIMPLib/Montages/GridMontage.h
new file mode 100644
index 0000000000..9789fc77a0
--- /dev/null
+++ b/Source/SIMPLib/Montages/GridMontage.h
@@ -0,0 +1,275 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <vector>
+
+#include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/Montages/AbstractMontage.h"
+#include "SIMPLib/Montages/GridTileIndex.h"
+
+/**
+ * @class GridMontage GridMontage.h SIMPLib/DataContainers/GridMontage.h
+ * @brief The GridMontage class handles DataContainer montages arranged in a 3D grid.
+ * Tiles are saved in a vector with GridTileIndices used as a means to lookup a DataContainer.
+ * The montage does not assign the origin of each DataContainer geometry based on
+ * the tile's position in the montage.
+ */
+class SIMPLib_EXPORT GridMontage : public AbstractMontage
+{
+public:
+  using SizeType = SizeVec3Type;
+  using TileIdType = SizeVec3Type;
+  using DimensionsType = IVec3<double>;
+  using BoundsType = IVec6<double>;
+
+  using EnumType = uint32_t;
+  enum class CollectionMethod : EnumType
+  {
+    CombOrder = 0,
+    SnakeOrder
+  };
+
+    using Self = GridMontage;
+    using Pointer = std::shared_ptr<Self>;
+    using ConstPointer = std::shared_ptr<const Self>;
+    using WeakPointer = std::weak_ptr<Self>;
+    using ConstWeakPointer = std::weak_ptr<const Self>;
+    static Pointer NullPointer();
+
+
+  /**
+   * @brief Creates a new GridMontage with the specified name and size.
+   * @param name
+   * @param row
+   * @param col
+   * @param depth
+   */
+  static Pointer New(const QString& name, size_t row, size_t col, size_t depth = 1);
+
+  /**
+   * @brief Destructor
+   */
+  ~GridMontage() override;
+
+  /**
+   * @brief Checks and returns the validity of the montage.
+   * Each tile must have a DataContainer and Geometry.
+   * The units and geometry type must match between all geometries.
+   * @return
+   */
+  bool isValid() const override;
+
+  /**
+   * @brief Returns the number of rows in the geometry.
+   * @return
+   */
+  size_t getRowCount() const;
+
+  /**
+   * @brief Returns the number of columns in the geometry.
+   * @return
+   */
+  size_t getColumnCount() const;
+
+  /**
+   * @brief Returns the depth of the geometry.
+   * @return
+   */
+  size_t getDepthCount() const;
+
+  /**
+   * @brief Returns the size of the grid by the number of tiles.
+   * @return
+   */
+  SizeType getGridSize() const;
+
+  /**
+   * @brief Returns the number of tiles in the montage.
+   * @return
+   */
+  size_t getTileCount() const override;
+
+  /**
+   * @brief Resizes the montage to a new set of row, column, and depth values.
+   * @param row
+   * @param col
+   * @param depth
+   */
+  void resizeTileDims(size_t row, size_t col, size_t depth);
+
+  /**
+   * @brief Returns the GridTileIndex for the specified position.
+   * If the target position is invalid, return an invalid GridTileIndex.
+   * @param row
+   * @param col
+   * @param depth
+   * @return
+   */
+  GridTileIndex getTileIndex(size_t row, size_t col, size_t depth = 0) const;
+
+  /**
+   * @brief Searches for and returns the GridTileIndex for the specified DataContainer.
+   * If the DataContainer could not be found, return an invalid GridTileIndex.
+   * @param dc
+   * @return
+   */
+  GridTileIndex getTileIndexForDataContainer(const DataContainerShPtr& dc) const;
+
+  /**
+   * @brief Returns a shared_ptr for the tile index for the given DataContainer.
+   * @param dc
+   * @return
+   */
+  AbstractTileIndexShPtr getTileIndexFor(const DataContainerShPtr& dc) const override;
+
+  /**
+   * @brief Returns a collection of DataContainers in the montage
+   * @return
+   */
+  CollectionType getDataContainers() const override;
+
+  /**
+   * @brief Returns the DataContainer with the given GridTileIndex.
+   * If the DataContainer is not found, return nullptr.
+   * @param index
+   * @return
+   */
+  DataContainerShPtr getDataContainer(GridTileIndex index) const;
+
+  /**
+   * @brief Sets the DataContainer at the given index.
+   * @param index
+   * @param dc
+   */
+  void setDataContainer(GridTileIndex index, const DataContainerShPtr& dc);
+
+  /**
+   * @brief Performs a deep copy of the current values.
+   * @return
+   */
+  Pointer deepCopy() const;
+
+  /**
+   * @brief Creates a copy of the current montage and reassigns references
+   * to the given DataContainerArray's values.
+   * @param dca
+   */
+  AbstractMontage::Pointer propagate(const DataContainerArrayShPtr& dca) const override;
+
+  /**
+   * @brief Returns an HTML string with information about the montage with data laid out in a table.
+   * @return
+   */
+  QString getInfoString() const override;
+
+  /* -------- Begin iterator support -------- */
+  /**
+   * @brief Returns an iterator to the first item in the montage.
+   * @return
+   */
+  Iterator begin() override;
+
+  /**
+   * @brief Returns a const iterator to the first item in the montage.
+   * @return
+   */
+  ConstIterator begin() const override;
+
+  /**
+   * @brief Returns an iterator to the last item in the montage.
+   * @return
+   */
+  Iterator end() override;
+
+  /**
+   * @brief Returns a const iterator to the last item in the montage.
+   * @return
+   */
+  ConstIterator end() const override;
+  /* -------- End iterator support -------- */
+
+  /**
+   * @brief Returns the length unit used by the montage
+   * @return
+   */
+  IGeometry::LengthUnit getLengthUnit() const;
+
+  /**
+   * @brief Returns a QString representation of the length unit used by the montage.
+   * @return
+   */
+  QString getLenthUnitString() const;
+
+  /**
+   * @brief Returns the montage's dimensions as { X, Y, Z } values
+   * @return
+   */
+  DimensionsType getDimensions() const;
+
+  /**
+   * @brief Returns the montage's bounds as { minX, maxX, minY, maxY, minZ, maxZ } values.
+   * @return
+   */
+  BoundsType getBounds() const;
+
+  /**
+   * @brief Write the montage to an HDF5 file.
+   * @param groupId
+   * @return error code
+   */
+  int writeH5Data(hid_t groupId) const override;
+
+  /**
+   * @brief Sets the DataContainer vector for the montage.
+   * Returns true on success. Returns false otherwise.
+   * @param dataContainers
+   * @return
+   */
+  bool setDataContainers(std::vector<DataContainerShPtr> dataContainers);
+
+protected:
+  GridMontage(const QString& name, size_t row, size_t col, size_t depth);
+
+  /**
+   * @brief Returns a size_t index from the given TileIdType.
+   * @param tileID
+   * @return
+   */
+  size_t getOffsetFromTileId(TileIdType tileID) const;
+
+private:
+
+  SizeType m_Size;
+  CollectionType m_DataContainers;
+};
diff --git a/Source/SIMPLib/Montages/GridTileIndex.cpp b/Source/SIMPLib/Montages/GridTileIndex.cpp
new file mode 100644
index 0000000000..091c46c50c
--- /dev/null
+++ b/Source/SIMPLib/Montages/GridTileIndex.cpp
@@ -0,0 +1,139 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "GridTileIndex.h"
+
+#include "SIMPLib/Montages/GridMontage.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridTileIndex::GridTileIndex()
+: AbstractTileIndex()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridTileIndex::GridTileIndex(const GridMontage* montage, SizeVec3Type pos)
+: AbstractTileIndex(montage)
+, m_TilePos(pos)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridTileIndex::~GridTileIndex() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridTileIndex::getRow() const
+{
+  return m_TilePos[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridTileIndex::getCol() const
+{
+  return m_TilePos[1];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+size_t GridTileIndex::getDepth() const
+{
+  return m_TilePos[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+SizeVec3Type GridTileIndex::getTilePos() const
+{
+  return m_TilePos;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerShPtr GridTileIndex::getDataContainer() const
+{
+  const GridMontage* montage = dynamic_cast<const GridMontage*>(getMontage());
+  if(nullptr == montage)
+  {
+    return nullptr;
+  }
+
+  return montage->getDataContainer(*this);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool GridTileIndex::isValid() const
+{
+  const GridMontage* montage = dynamic_cast<const GridMontage*>(getMontage());
+  if(nullptr == montage)
+  {
+    return false;
+  }
+
+  SizeVec3Type gridSize = montage->getGridSize();
+  bool sizeCheck = true;
+  for(size_t i = 0; i < 3; i++)
+  {
+    sizeCheck &= m_TilePos[i] <= gridSize[i];
+  }
+  
+  return AbstractTileIndex::isValid() && sizeCheck;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator GridTileIndex::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+
+  SizeVec3Type tilePos = getTilePos();
+
+  toolTipGen.addTitle("Grid Tile Index");
+  toolTipGen.addValue("Index", "(" + QString::number(tilePos[0]) + ", " + QString::number(tilePos[1]) + ", " + QString::number(tilePos[2]) + ")");
+
+  return toolTipGen;
+}
diff --git a/Source/SIMPLib/Montages/GridTileIndex.h b/Source/SIMPLib/Montages/GridTileIndex.h
new file mode 100644
index 0000000000..83e6a17cb6
--- /dev/null
+++ b/Source/SIMPLib/Montages/GridTileIndex.h
@@ -0,0 +1,114 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "AbstractTileIndex.h"
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+
+class GridMontage;
+
+/**
+ * @class GridTileIndex GridTileIndex.h SIMPLib/DataContainers/GridTileIndex.h
+ * @brief The GridTileIndex class is used to reference specific DataContainers
+ * inside a GridMontage using the tile's row, column, and depth.
+ */
+class SIMPLib_EXPORT GridTileIndex : public AbstractTileIndex
+{
+  friend GridMontage;
+
+public:
+  /**
+   * @brief The default constructor creates invalid indices.
+   */
+  GridTileIndex();
+
+  /**
+   * @brief Destructor
+   */
+  ~GridTileIndex() override;
+
+  /**
+   * @brief Returns the tile row within the target montage.
+   * @return
+   */
+  size_t getRow() const;
+
+  /**
+   * @brief Returns the tile column within the target montage.
+   * @return
+   */
+  size_t getCol() const;
+
+  /**
+   * @brief Returns the tile depth within the target montage.
+   * @return
+   */
+  size_t getDepth() const;
+
+  /**
+   * @brief Returns the tile position within the target montage as { Row, Column, Depth }
+   * @return
+   */
+  SizeVec3Type getTilePos() const;
+
+  /**
+   * @brief Retuns the target DataContainer.
+   * Returns nullptr if it could not be found or the index is invalid.
+   * @return
+   */
+  DataContainerShPtr getDataContainer() const override;
+
+  /**
+   * @brief Checks if the index is valid.
+   * @return
+   */
+  bool isValid() const override;
+
+  /**
+   * @brief Creates and returns a ToolTipGenerator with the relevant values set for the tile index.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
+protected:
+  /**
+   * @param "Valid" constructor is only accessible from within GridMontage.
+   * @param montage
+   * @param pos
+   */
+  GridTileIndex(const GridMontage* montage, SizeVec3Type pos);
+
+private:
+  SizeVec3Type m_TilePos;
+};
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
new file mode 100644
index 0000000000..aea1887382
--- /dev/null
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -0,0 +1,140 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "MontageSupport.h"
+
+#include <QtCore/QString>
+
+#include "H5Support/H5Utilities.h"
+
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/Montages/GridMontage.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GridMontage::Pointer readGridMontageFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err)
+{
+  QString name;
+  err = QH5Lite::readStringDataset(parentId, SIMPL::StringConstants::Name, name);
+  if(err < 0)
+  {
+    return nullptr;
+  }
+
+  SizeVec3Type dims;
+  err = QH5Lite::readScalarDataset(parentId, "X Dim", dims[0]);
+  if(err < 0)
+  {
+    return nullptr;
+  }
+  err = QH5Lite::readScalarDataset(parentId, "Y Dim", dims[1]);
+  if(err < 0)
+  {
+    return nullptr;
+  }
+  err = QH5Lite::readScalarDataset(parentId, "Z Dim", dims[2]);
+  if(err < 0)
+  {
+    return nullptr;
+  }
+
+  GridMontage::Pointer montage = GridMontage::New(name, dims[0], dims[1], dims[2]);
+  if(nullptr == dca)
+  {
+    return montage;
+  }
+
+  // Set Montage DataContainers
+  char sep = 0x1E; // Use the ASCII 'record separator' value (Decimal value 30) to separate the names
+  QString dcNameCollection;
+  err = QH5Lite::readStringDataset(parentId, SIMPL::StringConstants::DataContainerNames, dcNameCollection);
+  QStringList dcNames = dcNameCollection.split(sep, QString::KeepEmptyParts);
+
+  std::vector<DataContainerShPtr> dataContainers;
+  for(const QString& dcName : dcNames)
+  {
+    dataContainers.push_back(dca->getDataContainer(dcName));
+  }
+  montage->setDataContainers(dataContainers);
+
+  return montage;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractMontageShPtr MontageSupport::IO::ReadMontageFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err)
+{
+  QString typeName;
+  err = QH5Lite::readStringDataset(parentId, "Montage Type", typeName);
+  if(err < 0)
+  {
+    return nullptr;
+  }
+
+  // Create Montage of the correct type
+  if(typeName == "GridMontage")
+  {
+    return readGridMontageFromHDF5(parentId, dca, err);
+  }
+
+  return nullptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerArray::MontageCollection MontageSupport::IO::ReadMontagesFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err)
+{
+  DataContainerArray::MontageCollection montageCollection;
+
+  // Get list of montages
+  int filter = H5Utilities::H5Support_ANY;
+  QStringList names;
+  QH5Utilities::getGroupObjects(parentId, filter, names);
+
+  for(const QString& name : names)
+  {
+    hid_t montageId = QH5Utilities::openHDF5Object(parentId, name);
+    // This object will make sure the HDF5 Group id is closed when it goes out of scope.
+    H5GroupAutoCloser bundleIdClose(&montageId);
+
+    if(!montageCollection.insert(ReadMontageFromHDF5(montageId, dca, err)))
+    {
+      return montageCollection;
+    }
+  }
+
+  return montageCollection;
+}
diff --git a/Source/SIMPLib/Montages/MontageSupport.h b/Source/SIMPLib/Montages/MontageSupport.h
new file mode 100644
index 0000000000..a84297839d
--- /dev/null
+++ b/Source/SIMPLib/Montages/MontageSupport.h
@@ -0,0 +1,53 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "H5Support/QH5Lite.h"
+#include "H5Support/H5ScopedErrorHandler.h"
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
+class AbstractMontage;
+using AbstractMontageShPtr = std::shared_ptr<AbstractMontage>;
+
+namespace MontageSupport
+{
+  namespace IO
+  {
+    AbstractMontageShPtr ReadMontageFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
+
+    DataContainerArray::MontageCollection ReadMontagesFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
+  }
+}
diff --git a/Source/SIMPLib/Montages/SourceList.cmake b/Source/SIMPLib/Montages/SourceList.cmake
new file mode 100644
index 0000000000..819fecfed9
--- /dev/null
+++ b/Source/SIMPLib/Montages/SourceList.cmake
@@ -0,0 +1,86 @@
+# ============================================================================
+# Copyright (c) 2019-2019 BlueQuartz Software, LLC
+#
+# 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+# 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 COPYRIGHT HOLDER 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.
+#
+# The code contained herein was partially funded by the followig contracts:
+#    United States Air Force Prime Contract FA8650-07-D-5800
+#    United States Air Force Prime Contract FA8650-10-D-5210
+#    United States Prime Contract Navy N00173-07-C-2068
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+set(SUBDIR_NAME Montages)
+
+# --------------------------------------------------------------------
+# Any Class that inherits from QObject, either directly or through the heirarchy needs to have its header listed here
+set(SIMPLib_${SUBDIR_NAME}_Moc_HDRS
+  )
+# --------------------------------------------------------------------
+# Run Qts automoc program to generate some source files that get compiled
+# QT5_WRAP_CPP( SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS ${SIMPLib_${SUBDIR_NAME}_Moc_HDRS})
+set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPERTIES GENERATED TRUE)
+set_source_files_properties( ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+set(SIMPLib_${SUBDIR_NAME}_HDRS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMontage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractTileIndex.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerGrid.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GridMontage.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GridTileIndex.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSupport.h
+)
+
+set(SIMPLib_${SUBDIR_NAME}_SRCS
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractMontage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractTileIndex.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataContainerGrid.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GridMontage.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GridTileIndex.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSupport.cpp
+)
+
+cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
+cmp_IDE_SOURCE_PROPERTIES( "Generated/${SUBDIR_NAME}" "" "${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}" "0")
+
+set(SIMPLib_${SUBDIR_NAME}_HDRS
+  ${SIMPLib_${SUBDIR_NAME}_HDRS}
+  ${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}  # Add the headers that get Moc'ed here so they show up in solutions/IDEs/Project files
+)
+
+set(SIMPLib_${SUBDIR_NAME}_SRCS
+  ${SIMPLib_${SUBDIR_NAME}_SRCS}
+  ${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}
+)
+
+#-------------------------------------------------------------------------------
+# Add the unit testing sources
+# -------------------------------------------------------------------- 
+# If Testing is enabled, turn on the Unit Tests 
+if(SIMPL_BUILD_TESTING)
+  include(${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx/SourceList.cmake)
+endif()
+
diff --git a/Source/SIMPLib/Montages/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/Montages/Testing/Cxx/SourceList.cmake
new file mode 100644
index 0000000000..7fabe81ab0
--- /dev/null
+++ b/Source/SIMPLib/Montages/Testing/Cxx/SourceList.cmake
@@ -0,0 +1,4 @@
+set(TEST_${SUBDIR_NAME}_NAMES
+)
+
+SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")
diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.cpp b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
index c41117b3ae..b54849df40 100644
--- a/Source/SIMPLib/Utilities/FilePathGenerator.cpp
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
@@ -136,11 +136,11 @@ QVector<QString> FilePathGenerator::GenerateVectorFileList(int start, int end, i
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FilePathGenerator::TileRCIncexLayout2D FilePathGenerator::GenerateRCIndexMontageFileList(int rowStart, int rowEnd, int colStart, int colEnd, bool& hasMissingFiles, bool rcOrdering,
+FilePathGenerator::TileRCIndexLayout2D FilePathGenerator::GenerateRCIndexMontageFileList(int rowStart, int rowEnd, int colStart, int colEnd, bool& hasMissingFiles, bool rcOrdering,
                                                                                          const QString& inputPath, const QString& filePrefix, const QString& fileSuffix, const QString& fileExtension,
                                                                                          int paddingDigits)
 {
-  TileRCIncexLayout2D tileLayout2D;
+  TileRCIndexLayout2D tileLayout2D;
 
   QDir dir(inputPath);
   if(!dir.exists())
diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.h b/Source/SIMPLib/Utilities/FilePathGenerator.h
index 1c2d5293ca..7eb3797dd2 100755
--- a/Source/SIMPLib/Utilities/FilePathGenerator.h
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.h
@@ -56,7 +56,7 @@ class SIMPLib_EXPORT FilePathGenerator
 
   using TileRCIndex2D = Tile<2, int32_t, QString>;
   using TileRCIndexRow2D = std::vector<TileRCIndex2D>;
-  using TileRCIncexLayout2D = std::vector<TileRCIndexRow2D>;
+  using TileRCIndexLayout2D = std::vector<TileRCIndexRow2D>;
 
   /**
    * @brief This struct is used to hold actual coordinates of each tile. Where those coordinates reference is left
@@ -111,7 +111,7 @@ class SIMPLib_EXPORT FilePathGenerator
    * @param paddingDigits The number of padding digits (ZERO character) to use for each of the indices.
    * @return
    */
-  static TileRCIncexLayout2D GenerateRCIndexMontageFileList(int rowStart, int rowEnd, int colStart, int colEnd, bool& hasMissingFiles, bool rcOrdering, const QString& inputPath,
+  static TileRCIndexLayout2D GenerateRCIndexMontageFileList(int rowStart, int rowEnd, int colStart, int colEnd, bool& hasMissingFiles, bool rcOrdering, const QString& inputPath,
                                                             const QString& filePrefix, const QString& fileSuffix, const QString& fileExtension, int paddingDigits);
 
 protected:
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
index 07eefc1da8..42b4a94867 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
index 2b94f08e87..5c3a6f5276 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
index 9ea43ea1dd..7d84b21714 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
index 36659e6753..a962403c5e 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
index 0c349fa9e1..c215820083 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
index 578ffe5dcd..986ce69c67 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
index 5f3f8f20ff..e10459c7dc 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
@@ -16,7 +16,7 @@
  * 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”
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
index 03b2fc9d02..9f620ec5e2 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -16,7 +16,7 @@
  * 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�
+ * 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 HOLDER OR CONTRIBUTORS BE LIABLE
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index b62cffdde1..36b010d362 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -32,6 +32,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLibEndian.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringOperations.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TimeUtilities.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ToolTipGenerator.h
 )
 
 set(SIMPLib_Utilities_SRCS
@@ -51,6 +52,7 @@ set(SIMPLib_Utilities_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/SIMPLH5DataReaderRequirements.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringOperations.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TestObserver.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ToolTipGenerator.cpp
 )
 
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
diff --git a/Source/SIMPLib/Utilities/ToolTipGenerator.cpp b/Source/SIMPLib/Utilities/ToolTipGenerator.cpp
new file mode 100644
index 0000000000..8baa8320ae
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ToolTipGenerator.cpp
@@ -0,0 +1,170 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "ToolTipGenerator.h"
+
+#include <QtCore/QTextStream>
+
+ // -----------------------------------------------------------------------------
+ //
+ // -----------------------------------------------------------------------------
+ToolTipGenerator::ToolTipGenerator()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+ToolTipGenerator::~ToolTipGenerator()
+{
+  clear();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::addTitle(const QString& title)
+{
+  RowItem titleRow;
+  titleRow.type = RowItem::Type::Title;
+  titleRow.name = title;
+  m_Rows.push_back(titleRow);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::addValue(const QString& name, const QString& value)
+{
+  RowItem valueRow;
+  valueRow.type = RowItem::Type::Value;
+  valueRow.name = name;
+  valueRow.value = value;
+  m_Rows.push_back(valueRow);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::addSpacer()
+{
+  RowItem spacer;
+  spacer.type = RowItem::Type::Spacer;
+  m_Rows.push_back(spacer);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::append(const ToolTipGenerator& other)
+{
+  addSpacer();
+  for(const auto& row : other.m_Rows)
+  {
+    m_Rows.push_back(row);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::clear()
+{
+  m_Rows.clear();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString ToolTipGenerator::getRowColorStr() const
+{
+  return m_RowColorStr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void ToolTipGenerator::setRowColorStr(const QString& color)
+{
+  m_RowColorStr = color;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString ToolTipGenerator::generateHTML() const
+{
+  RowItem spacer;
+  spacer.type = RowItem::Type::Spacer;
+
+  QString html;
+  QTextStream ss(&html);
+
+  ss << "<html><head></head>\n";
+  ss << "<body>\n";
+  ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
+  ss << "<tbody>\n";
+
+  for(const auto& row : m_Rows)
+  {
+    ss << rowToHTML(row);
+  }
+
+  ss << rowToHTML(spacer);
+  ss << "</tbody></table>\n";
+  ss << "</body></html>";
+  return html;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString ToolTipGenerator::rowToHTML(const RowItem& row) const
+{
+  QString html;
+  QTextStream ss(&html);
+
+  switch(row.type)
+  {
+  case RowItem::Type::Title:
+    ss << R"(<tr bgcolor=")" << m_RowColorStr << R"("><th align="center" colspan=2>)" << row.name << "</th></tr>";
+    break;
+  case RowItem::Type::Value:
+    ss << R"(<tr bgcolor=")" << m_RowColorStr << R"("><th align="right">)" << row.name << ":</th><td>" << row.value << "</td></tr>";
+    break;
+  case RowItem::Type::Spacer:
+    ss << R"(<tr bgcolor=")" << m_RowColorStr << R"("><td></td><td></td></tr>)";
+    break;
+  }
+  
+  return html;
+}
diff --git a/Source/SIMPLib/Utilities/ToolTipGenerator.h b/Source/SIMPLib/Utilities/ToolTipGenerator.h
new file mode 100644
index 0000000000..28af076e51
--- /dev/null
+++ b/Source/SIMPLib/Utilities/ToolTipGenerator.h
@@ -0,0 +1,127 @@
+/* ============================================================================
+ * Copyright (c) 2019 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <vector>
+
+#include <QtCore/QString>
+
+#include "SIMPLib/SIMPLib.h"
+
+/**
+ * @class ToolTipGenerator ToolTipGenerator.h SIMPLib/Utilities/ToolTipGenerator.h
+ * @brief The ToolTipGenerator class is used for generating HTML table strings.
+ * Data is added one row at a time, and then data is converted into HTML upon request.
+ * The default backround color is based on existing tool tips at the time the class
+ * is created, but it can be freely changed up to HTML generation.
+ */
+class SIMPLib_EXPORT ToolTipGenerator
+{
+  struct SIMPLib_EXPORT RowItem
+  {
+    enum class Type { Title, Value, Spacer };
+    Type type = Type::Spacer;
+    QString name;
+    QString value;
+  };
+
+public:
+  /**
+   * @brief Default constructor
+   */
+  ToolTipGenerator();
+
+  /**
+   * @brief Destructor
+   */
+  virtual ~ToolTipGenerator();
+
+  /**
+   * @brief Adds a new title row.
+   * @param title
+   */
+  void addTitle(const QString& title);
+
+  /**
+   * @brief Adds a new value row.
+   * @param name
+   * @param value
+   */
+  void addValue(const QString& name, const QString& value);
+
+  /**
+   * @brief Adds a new spacer row
+   */
+  void addSpacer();
+
+  /**
+   * @brief Append the rows from another ToolTipGenerator to the end of this generator.
+   * @param other
+   */
+  void append(const ToolTipGenerator& other);
+
+  /**
+   * @brief Clears the row data.
+   */
+  void clear();
+
+  /**
+   * @brief Returns the color name string.
+   * @return
+   */
+  QString getRowColorStr() const;
+
+  /**
+   * @brief Sets the color name string.
+   * @param colorStr
+   */
+  void setRowColorStr(const QString& colorStr);
+
+  /**
+   * @brief Generates and returns an HTML string representation.
+   * @return
+   */
+  QString generateHTML() const;
+
+protected:
+  /**
+   * @brief Creates and returns an HTML string for the given table row.
+   * @param row
+   * @return
+   */
+  QString rowToHTML(const RowItem& row) const;
+
+private:
+  QString m_RowColorStr = "#FFFCEA";
+  std::vector<RowItem> m_Rows;
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
new file mode 100644
index 0000000000..b507bb1e9b
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
@@ -0,0 +1,315 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataContainerGridModel.h"
+
+#include <QtCore/QDebug>
+#include <QtCore/QMimeData>
+#include <QtWidgets/QAbstractItemDelegate>
+#include <QtWidgets/QStyleOptionComboBox>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridModel::DataContainerGridModel(const DataContainerGrid& grid, QObject* parent)
+: QAbstractTableModel(parent)
+, m_DCGrid(grid)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridModel::~DataContainerGridModel() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+Qt::ItemFlags DataContainerGridModel::flags(const QModelIndex& index) const
+{
+  //  qDebug() << "DataContainerGridModel::flags" << "\n";
+  if(!index.isValid())
+  {
+    return Qt::NoItemFlags;
+  }
+  if(!index.isValid())
+  {
+    return QAbstractTableModel::flags(index);
+  }
+
+  Qt::ItemFlags flags = QAbstractTableModel::flags(index);
+  flags |= Qt::ItemIsDropEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+  return flags;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QVariant DataContainerGridModel::data(const QModelIndex& index, int role) const
+{
+  if(!index.isValid())
+  {
+    return QVariant();
+  }
+
+  switch(role)
+  {
+  case Qt::TextAlignmentRole:
+    return int(Qt::AlignRight | Qt::AlignVCenter);
+  case Qt::DisplayRole:
+  {
+    int col = index.column();
+    int row = index.row();
+    SizeVec3Type pos(row, col, m_CurrentDepth);
+    return m_DCGrid.getDataContainerName(pos);
+  }
+  }
+
+  return QVariant();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataContainerGridModel::rowCount(const QModelIndex& index) const
+{
+  return index.isValid() ? 0 : m_DCGrid.getDimensions()[0];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataContainerGridModel::columnCount(const QModelIndex& index) const
+{
+  return index.isValid() ? 0 : m_DCGrid.getDimensions()[1];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataContainerGridModel::depthCount() const
+{
+  return m_DCGrid.getDimensions()[2];
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+int DataContainerGridModel::getCurrentDepth() const
+{
+  return m_CurrentDepth;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridModel::setCurrentDepth(int depth)
+{
+  if(depth < 0 || depth > depthCount())
+  {
+    return;
+  }
+  m_CurrentDepth = depth;
+  
+  QModelIndex index;
+  emit dataChanged(index, index);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::setHeaderData(int col, Qt::Orientation o, const QVariant& var, int role)
+{
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+  if(!index.isValid() || index.row() < 0 || index.row() >= rowCount() || index.column() < 0 || index.column() >= columnCount())
+  {
+    return false;
+  }
+  
+  if(role == Qt::DisplayRole)
+  {
+    SizeVec3Type pos(index.row(), index.column(), m_CurrentDepth);
+    m_DCGrid.setDataContainerName(pos, value.toString());
+    emit dataChanged(index, index);
+    emit modelChanged();
+    return true;
+  }
+
+  return false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::insertRows(int row, int count, const QModelIndex& index)
+{
+  beginInsertRows(QModelIndex(), row, row + count - 1);
+  endInsertRows();
+  emit dataChanged(index, index);
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::removeRows(int row, int count, const QModelIndex& index)
+{
+  if(count < 1)
+  {
+    return true;
+  } // No Rows to remove
+  beginRemoveRows(QModelIndex(), row, row + count - 1);
+  endRemoveRows();
+  emit dataChanged(index, index);
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::insertColumns(int col, int count, const QModelIndex& index)
+{
+  beginInsertColumns(QModelIndex(), col, col + count - 1);
+  endInsertColumns();
+  emit dataChanged(index, index);
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::removeColumns(int col, int count, const QModelIndex& index)
+{
+  if(count < 1)
+  {
+    return true;
+  } // No Rows to remove
+  beginRemoveColumns(QModelIndex(), col, col + count - 1);
+  endRemoveColumns();
+  emit dataChanged(index, index);
+  return true;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+Qt::DropActions DataContainerGridModel::supportedDropActions() const
+{
+  return Qt::CopyAction;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
+{
+  //QModelIndex targetIndex = index(row, column, parent);
+  if(!parent.isValid())
+  {
+    return false;
+  }
+
+  DataArrayPath dap = DataArrayPath::Deserialize(data->data(SIMPLView::DragAndDrop::DataArrayPath), "|");
+  return !dap.getDataContainerName().isEmpty();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+bool DataContainerGridModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
+{
+  //QModelIndex targetIndex = index(row, column, parent);
+  if(!parent.isValid())
+  {
+    return false;
+  }
+
+  DataArrayPath dap = DataArrayPath::Deserialize(data->data(SIMPLView::DragAndDrop::DataArrayPath), "|");
+  QString dcName = dap.getDataContainerName();
+  return setData(parent, dcName, Qt::DisplayRole);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridModel::setGridData(DataContainerGrid& grid)
+{
+  size_t count = grid.size();
+  int32_t rows = grid.getDimensions()[0] - 1;
+  int32_t cols = grid.getDimensions()[1] - 1;
+  // Remove all the current rows in the table model
+  removeRows(0, rowCount());
+  removeColumns(0, columnCount());
+  // Check to make sure we have data to insert.
+  if(count == 0)
+  {
+    return;
+  }
+  // Now mass insert the data to the table then emit that the data has changed
+  beginInsertRows(QModelIndex(), 0, rows);
+  beginInsertColumns(QModelIndex(), 0, cols);
+  m_DCGrid = grid;
+  endInsertColumns();
+  endInsertRows();
+  QModelIndex topLeft = createIndex(0, 0);
+  QModelIndex botRight = createIndex(rows, cols);
+  emit dataChanged(topLeft, botRight);
+  emit modelChanged();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridModel::getGridData(DataContainerGrid& grid)
+{
+  grid = m_DCGrid;
+}
+
+#if 0
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QAbstractItemDelegate* DataContainerGridModel::getItemDelegate()
+{
+  return new DataContainerGridItemDelegate(m_CurrentDepth, this);
+}
+#endif
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
new file mode 100644
index 0000000000..67e97b983d
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
@@ -0,0 +1,215 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QAbstractTableModel>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+
+#include "SIMPLib/Montages/DataContainerGrid.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+class QAbstractItemDelegate;
+class DataContainerGrid;
+
+/*
+ *
+ */
+class SVWidgetsLib_EXPORT DataContainerGridModel : public QAbstractTableModel
+{
+  Q_OBJECT
+
+public:
+  DataContainerGridModel(const DataContainerGrid& dcGrid, QObject* parent = 0);
+
+  ~DataContainerGridModel() override;
+
+  /**
+   *
+   * @param index
+   * @return
+   */
+  Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+  /**
+   *
+   * @param index
+   * @param role
+   * @return
+   */
+  QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+  /**
+   *
+   * @param parent
+   * @return
+   */
+  int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+  /**
+   *
+   * @param parent
+   * @return
+   */
+  int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+
+  /**
+   * @brief depthCount
+   * @return
+   */
+  int depthCount() const;
+
+  /**
+   * @brief setCurrentDepth
+   * @return
+   */
+  int getCurrentDepth() const;
+
+  /**
+   * @brief setCurrentDepth
+   * @param depth
+   */
+  void setCurrentDepth(int depth);
+
+  /**
+   *
+   * @param index
+   * @param value
+   * @param role
+   * @return
+   */
+  bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+
+  /**
+   *
+   * @param col
+   * @param orientation
+   * @param data
+   * @param role
+   * @return
+   */
+  bool setHeaderData(int col, Qt::Orientation orientation, const QVariant& data, int role = Qt::EditRole) override;
+
+  /**
+   *
+   * @param row
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   *
+   * @param row
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   *
+   * @param col
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool insertColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   *
+   * @param col
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool removeColumns(int col, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   * @brief supportedDropActions
+   * @return
+   */
+  Qt::DropActions supportedDropActions() const override;
+
+  /**
+   * @brief canDropMimeData
+   * @param data
+   * @param action
+   * @param row
+   * @param column
+   * @param parent
+   */
+  bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const override;
+
+  /**
+   * @brief dropMineData
+   * @param data
+   * @param action
+   * @param row
+   * @param column
+   * @param parent
+   */
+  bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
+
+  /**
+   *
+   * @return
+   */
+  // virtual QAbstractItemDelegate* getItemDelegate();
+
+  /**
+   * @brief setTableData
+   * @param grid
+   */
+  void setGridData(DataContainerGrid& grid);
+
+  /**
+   * @brief getTableData
+   * @param grid
+   */
+  void getGridData(DataContainerGrid& grid);
+
+signals:
+  void modelChanged();
+
+private:
+  DataContainerGrid m_DCGrid;
+  int m_CurrentDepth = 0;
+
+public:
+  DataContainerGridModel(const DataContainerGridModel&) = delete;            // Copy Constructor Not Implemented
+  DataContainerGridModel(DataContainerGridModel&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerGridModel& operator=(const DataContainerGridModel&) = delete; // Copy Assignment Not Implemented
+  DataContainerGridModel& operator=(DataContainerGridModel&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
new file mode 100644
index 0000000000..d0ce1b5c10
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
@@ -0,0 +1,287 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataContainerGridSelectionWidget.h"
+
+#include <QtCore/QSignalBlocker>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
+#include "SVWidgetsLib/ui_DataContainerGridSelectionWidget.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionWidget::DataContainerGridSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_Ui(new Ui::DataContainerGridSelectionWidget)
+, m_DidCausePreflight(false)
+{
+  m_FilterParameter = dynamic_cast<DataContainerGridSelectionFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerGridSelectionWidget can ONLY be used with a DataContainerGridSelectionFilterParameter object");
+
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionWidget::DataContainerGridSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_Ui(new Ui::DataContainerGridSelectionWidget)
+, m_DidCausePreflight(false)
+{
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridSelectionWidget::~DataContainerGridSelectionWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::setupGui()
+{
+  if(getFilter() == nullptr)
+  {
+    return;
+  }
+
+  QIntValidator* intValidator = new QIntValidator(this);
+  intValidator->setBottom(1);
+  m_Ui->xDimEdit->setValidator(intValidator);
+  m_Ui->yDimEdit->setValidator(intValidator);
+  m_Ui->zDimEdit->setValidator(intValidator);
+  connect(m_Ui->xDimEdit, &QLineEdit::textChanged, this, &DataContainerGridSelectionWidget::updateDimensions);
+  connect(m_Ui->yDimEdit, &QLineEdit::textChanged, this, &DataContainerGridSelectionWidget::updateDimensions);
+  connect(m_Ui->zDimEdit, &QLineEdit::textChanged, this, &DataContainerGridSelectionWidget::updateDimensions);
+
+  connect(m_Ui->upBtn, &QPushButton::clicked, this, &DataContainerGridSelectionWidget::increaseDepth);
+  connect(m_Ui->downBtn, &QPushButton::clicked, this, &DataContainerGridSelectionWidget::decreaseDepth);
+
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  // If the DataArrayPath is updated in the filter, update the widget
+  connect(getFilter(), &AbstractFilter::dataArrayPathUpdated, this, &DataContainerGridSelectionWidget::updateDataArrayPath);
+
+  if(getFilterParameter() == nullptr)
+  {
+    return;
+  }
+  m_Ui->propertyLabel->setText(getFilterParameter()->getHumanLabel());
+
+  m_GridModel = new DataContainerGridModel(m_FilterParameter->getGetterCallback()());
+  m_Ui->dataContainerGridTableView->setModel(m_GridModel);
+  checkDepth();
+
+  connect(m_GridModel, SIGNAL(modelChanged()), this, SIGNAL(parametersChanged()));
+
+  DataContainerGrid grid;
+  m_GridModel->getGridData(grid);
+  QSignalBlocker xDimBlocker(m_Ui->xDimEdit);
+  QSignalBlocker yDimBlocker(m_Ui->yDimEdit);
+  QSignalBlocker zDimBlocker(m_Ui->zDimEdit);
+  m_Ui->xDimEdit->setText(QString::number(grid.getDimensions()[0]));
+  m_Ui->yDimEdit->setText(QString::number(grid.getDimensions()[1]));
+  m_Ui->zDimEdit->setText(QString::number(grid.getDimensions()[2]));
+
+  changeStyleSheet(Style::FS_STANDARD_STYLE);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString DataContainerGridSelectionWidget::checkStringValues(const QString& curDcName, const QString& filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
+{
+  DataContainerGridSelectionFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+  if(getter)
+  {
+    QSignalBlocker blocker(this);
+    // setSelectedPath(getter());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::updateDimensions()
+{
+  SizeVec3Type dims;
+  dims[0] = m_Ui->xDimEdit->text().toInt();
+  dims[1] = m_Ui->yDimEdit->text().toInt();
+  dims[2] = m_Ui->zDimEdit->text().toInt();
+
+  DataContainerGrid grid;
+  m_GridModel->getGridData(grid);
+  grid.resizeDimensions(dims);
+  m_GridModel->setGridData(grid);
+
+  checkDepth();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::checkDepth()
+{
+  int depth = m_GridModel->getCurrentDepth();
+  const int maxDepth = m_GridModel->depthCount() - 1;
+
+  if(depth >= maxDepth)
+  {
+    depth = maxDepth;
+    m_GridModel->setCurrentDepth(depth);
+  }
+
+  m_Ui->zDepthLabel->setText(QString::number(depth + 1));
+
+  bool isMaxDepth = (depth >= maxDepth);
+  m_Ui->upBtn->setEnabled(!isMaxDepth);
+
+  bool isMinDepth = (depth <= 0);
+  m_Ui->downBtn->setEnabled(!isMinDepth);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::increaseDepth()
+{
+  int depth = m_GridModel->getCurrentDepth() + 1;
+  m_GridModel->setCurrentDepth(depth);
+  
+  checkDepth();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::decreaseDepth()
+{
+  int depth = m_GridModel->getCurrentDepth() - 1;
+  m_GridModel->setCurrentDepth(depth);
+ 
+  checkDepth();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+  if(m_DidCausePreflight)
+  {
+    // std::cout << "***  DataContainerGridSelectionWidget already caused a preflight, just returning" << std::endl;
+    return;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::afterPreflight()
+{
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  DataContainerGrid dcg;
+  DataContainerGridModel* model = dynamic_cast<DataContainerGridModel*>(m_Ui->dataContainerGridTableView->model());
+  model->getGridData(dcg);
+
+  DataContainerGridSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(dcg);
+  }
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
new file mode 100644
index 0000000000..e0d941def8
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
@@ -0,0 +1,116 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QSharedPointer>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+class AbstractFilter;
+class DataContainerGridModel;
+class DataContainerGridSelectionFilterParameter;
+
+namespace Ui
+{
+class DataContainerGridSelectionWidget;
+}
+
+/**
+ * @brief
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT DataContainerGridSelectionWidget : public FilterParameterWidget
+{
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataContainerGridSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  DataContainerGridSelectionWidget(QWidget* parent = nullptr);
+
+  ~DataContainerGridSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(const QString& current, const QString& filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected:
+  void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+  void updateDimensions();
+  void checkDepth();
+  void increaseDepth();
+  void decreaseDepth();
+
+private:
+  QSharedPointer<Ui::DataContainerGridSelectionWidget> m_Ui;
+  bool m_DidCausePreflight;
+
+  DataContainerGridSelectionFilterParameter* m_FilterParameter;
+  DataContainerGridModel* m_GridModel = nullptr;
+
+public:
+  DataContainerGridSelectionWidget(const DataContainerGridSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerGridSelectionWidget(DataContainerGridSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerGridSelectionWidget& operator=(const DataContainerGridSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerGridSelectionWidget& operator=(DataContainerGridSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
new file mode 100644
index 0000000000..ab1f32d678
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
@@ -0,0 +1,227 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MontageStructureSelectionWidget.h"
+
+#include <QtCore/QSignalBlocker>
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "FilterParameterWidgetUtils.hpp"
+#include "FilterParameterWidgetsDialogs.h"
+
+#include "SVWidgetsLib/ui_MontageStructureSelectionWidget.h"
+
+namespace
+{
+  const QString SelectItemText = "-- Select Montage --";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionWidget::MontageStructureSelectionWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_Ui(new Ui::MontageStructureSelectionWidget)
+, m_DidCausePreflight(false)
+{
+  m_FilterParameter = dynamic_cast<MontageStructureSelectionFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MontageStructureSelectionWidget can ONLY be used with a MontageStructureSelectionFilterParameter object");
+
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionWidget::MontageStructureSelectionWidget(QWidget* parent)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_Ui(new Ui::MontageStructureSelectionWidget)
+, m_DidCausePreflight(false)
+{
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MontageStructureSelectionWidget::~MontageStructureSelectionWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::initializeWidget(FilterParameter* parameter, AbstractFilter* filter)
+{
+  setFilter(filter);
+  setFilterParameter(parameter);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::setupGui()
+{
+  if(getFilter() == nullptr)
+  {
+    return;
+  }
+
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), SIGNAL(preflightAboutToExecute()), this, SLOT(beforePreflight()));
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), SIGNAL(preflightExecuted()), this, SLOT(afterPreflight()));
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+
+  connect(m_Ui->montageSelectionComboBox, &QComboBox::currentTextChanged, this, &MontageStructureSelectionWidget::setMontageName);
+
+  if(getFilterParameter() == nullptr)
+  {
+    return;
+  }
+  m_Ui->label->setText(getFilterParameter()->getHumanLabel());
+
+  MontageStructureSelectionFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+  if(getter)
+  {
+    QString montageName = getter();
+    QSignalBlocker selectionBlocker(m_Ui->montageSelectionComboBox);
+    if(m_Ui->montageSelectionComboBox->findText(montageName) == -1)
+    {
+      m_Ui->montageSelectionComboBox->addItem(montageName);
+    }
+    m_Ui->montageSelectionComboBox->setCurrentText(montageName);
+  }
+
+  changeStyleSheet(Style::FS_STANDARD_STYLE);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MontageStructureSelectionWidget::checkStringValues(const QString& curDcName, const QString& filtDcName)
+{
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
+  {
+    return filtDcName;
+  }
+  if(!curDcName.isEmpty() && filtDcName.isEmpty())
+  {
+    return curDcName;
+  }
+  if(!curDcName.isEmpty() && !filtDcName.isEmpty() && m_DidCausePreflight)
+  {
+    return curDcName;
+  }
+
+  return filtDcName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::setMontageName(const QString& montage)
+{
+  if(m_Ui->montageSelectionComboBox->findText(montage) == -1)
+  {
+    m_Ui->montageSelectionComboBox->addItem(montage);
+  }
+  m_Ui->montageSelectionComboBox->setCurrentText(montage);
+
+  m_DidCausePreflight = true;
+  emit parametersChanged();
+  m_DidCausePreflight = false;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::beforePreflight()
+{
+  if(nullptr == getFilter())
+  {
+    return;
+  }
+  if(m_DidCausePreflight)
+  {
+    // std::cout << "***  MontageStructureSelectionWidget already caused a preflight, just returning" << std::endl;
+    return;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::afterPreflight()
+{
+  DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
+  if(nullptr == dca.get())
+  {
+    return;
+  }
+
+  QString currentName = m_FilterParameter->getGetterCallback()();
+  QStringList montageNames = dca->getMontageCollection().getNameList();
+  
+  QSignalBlocker blocker(m_Ui->montageSelectionComboBox);
+  m_Ui->montageSelectionComboBox->clear();
+  m_Ui->montageSelectionComboBox->addItem(::SelectItemText);
+  m_Ui->montageSelectionComboBox->addItems(montageNames);
+  m_Ui->montageSelectionComboBox->setCurrentText(currentName);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MontageStructureSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  QString name = m_Ui->montageSelectionComboBox->currentText();
+  // The selection string is not a valid montage name
+  if(m_Ui->montageSelectionComboBox->currentIndex() == 0 && ::SelectItemText == name)
+  {
+    name = QString();
+  }
+
+  MontageStructureSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(name);
+  }
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
new file mode 100644
index 0000000000..ba24e7ea33
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
@@ -0,0 +1,114 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QSharedPointer>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+
+#include "SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h"
+
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+class AbstractFilter;
+using AbstractFilterShPtr = std::shared_ptr<AbstractFilter>;
+
+namespace Ui
+{
+class MontageStructureSelectionWidget;
+}
+
+/**
+ * @brief
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT MontageStructureSelectionWidget : public FilterParameterWidget
+{
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MontageStructureSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  MontageStructureSelectionWidget(QWidget* parent = nullptr);
+
+  ~MontageStructureSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(const QString& current, const QString& filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void setMontageName(const QString& name);
+
+private:
+  QSharedPointer<Ui::MontageStructureSelectionWidget> m_Ui;
+
+  bool m_DidCausePreflight;
+
+  MontageStructureSelectionFilterParameter* m_FilterParameter;
+
+public:
+  MontageStructureSelectionWidget(const MontageStructureSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MontageStructureSelectionWidget(MontageStructureSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MontageStructureSelectionWidget& operator=(const MontageStructureSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MontageStructureSelectionWidget& operator=(MontageStructureSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index e5616514a0..0a98c38461 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -18,6 +18,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     DataArraySelectionWidget
     DataContainerArrayProxyWidget
     DataContainerCreationWidget
+    DataContainerGridSelectionWidget
     DataContainerReaderWidget
     DataContainerSelectionWidget
     DoubleWidget
@@ -35,6 +36,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     LinkedBooleanWidget
     LinkedPathCreationWidget
     MontageSelectionWidget
+    MontageStructureSelectionWidget
     MultiAttributeMatrixSelectionWidget
     MultiDataContainerSelectionWidget
     MultiDataArraySelectionWidget
@@ -177,6 +179,7 @@ set(SVWidgetsLib_FilterParameterWidgets_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/FilterParameterWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonSelectionTableModel.h
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
+  ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/DataContainerGridModel.h
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/DynamicTableItemDelegate.h
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonContainerWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/IComparisonWidget.h
@@ -196,6 +199,7 @@ set(SVWidgetsLib_FilterParameterWidgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/FilterParameterWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/DataContainerGridModel.cpp
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/DynamicTableItemDelegate.cpp
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
   ${SVWidgetsLib_SOURCE_DIR}/FilterParameterWidgets/ComparisonContainerWidget.cpp
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/DataContainerGridSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/DataContainerGridSelectionWidget.ui
new file mode 100644
index 0000000000..5bc6423525
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/DataContainerGridSelectionWidget.ui
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DataContainerGridSelectionWidget</class>
+ <widget class="QFrame" name="DataContainerGridSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>551</width>
+    <height>202</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="propertyLabel">
+     <property name="text">
+      <string>Property</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="3" rowspan="2">
+    <widget class="QWidget" name="gridControlWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QGridLayout" name="centerGridLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <item row="2" column="0" colspan="2">
+       <widget class="DataContainerGridView" name="dataContainerGridTableView">
+        <property name="dragDropMode">
+         <enum>QAbstractItemView::DropOnly</enum>
+        </property>
+        <property name="defaultDropAction">
+         <enum>Qt::CopyAction</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" rowspan="2" colspan="2">
+       <widget class="QWidget" name="dimensionControlWidget" native="true">
+        <layout class="QHBoxLayout" name="dimensionLayout">
+         <property name="spacing">
+          <number>4</number>
+         </property>
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="SVLineEdit" name="xDimEdit"/>
+         </item>
+         <item>
+          <widget class="SVLineEdit" name="yDimEdit"/>
+         </item>
+         <item>
+          <widget class="SVLineEdit" name="zDimEdit"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="2">
+       <widget class="QLabel" name="instructionLabel">
+        <property name="font">
+         <font>
+          <italic>true</italic>
+         </font>
+        </property>
+        <property name="text">
+         <string>Drag and Drop Data Containers from the Data Structure</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QWidget" name="depthControlWidget" native="true">
+        <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="maximumSize">
+         <size>
+          <width>30</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <layout class="QGridLayout" name="depthControlLayout">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <property name="horizontalSpacing">
+          <number>4</number>
+         </property>
+         <item row="3" column="0">
+          <spacer name="depthSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>150</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="2" column="0">
+          <widget class="SVIconPushButton" name="downBtn">
+           <property name="minimumSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="../../../../Resources/SIMPL.qrc">
+             <normaloff>:/SIMPL/icons/images/arrow_down.png</normaloff>:/SIMPL/icons/images/arrow_down.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="flat">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="zDepthLabel">
+           <property name="text">
+            <string>1</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="0">
+          <widget class="SVIconPushButton" name="upBtn">
+           <property name="minimumSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="../../../../Resources/SIMPL.qrc">
+             <normaloff>:/SIMPL/icons/images/arrow_up.png</normaloff>:/SIMPL/icons/images/arrow_up.png</iconset>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>24</width>
+             <height>24</height>
+            </size>
+           </property>
+           <property name="flat">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SVLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+  <customwidget>
+   <class>SVIconPushButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+  <customwidget>
+   <class>DataContainerGridView</class>
+   <extends>QTableView</extends>
+   <header location="global">DataContainerGridView.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>xDimEdit</tabstop>
+  <tabstop>yDimEdit</tabstop>
+  <tabstop>zDimEdit</tabstop>
+  <tabstop>dataContainerGridTableView</tabstop>
+  <tabstop>upBtn</tabstop>
+  <tabstop>downBtn</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui
index 3f2c180f80..a9e4529014 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageSelectionWidget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>198</height>
+    <width>494</width>
+    <height>258</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -32,7 +32,7 @@
    <item row="1" column="1">
     <widget class="QSpinBox" name="paddingSpinBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -42,34 +42,14 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QSpinBox" name="colStartSpinBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="maximum">
-      <number>999</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_7">
-     <property name="text">
-      <string>Padding Digits:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="label_3">
+   <item row="3" column="3">
+    <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>Row Start:</string>
+      <string>Row End:</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="5">
+   <item row="1" column="5" rowspan="5">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -82,10 +62,40 @@
      </property>
     </spacer>
    </item>
-   <item row="2" column="1">
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_7">
+     <property name="text">
+      <string>Padding Digits:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
     <widget class="QSpinBox" name="rowStartSpinBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximum">
+      <number>999</number>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="6">
+    <widget class="QTableWidget" name="dataContainerTableWidget">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>90</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="4">
+    <widget class="QSpinBox" name="rowEndSpinBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -95,6 +105,19 @@
      </property>
     </widget>
    </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_8">
+     <property name="font">
+      <font>
+       <weight>75</weight>
+       <bold>true</bold>
+      </font>
+     </property>
+     <property name="text">
+      <string>Data Containers:</string>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="6">
     <widget class="QWidget" name="widget_3" native="true">
      <property name="sizePolicy">
@@ -157,23 +180,23 @@
     </widget>
    </item>
    <item row="3" column="0">
-    <widget class="QLabel" name="label_5">
+    <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>Columnn Start:</string>
+      <string>Row Start:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="3">
-    <widget class="QLabel" name="label_6">
+   <item row="2" column="0">
+    <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Column End:</string>
+      <string>Columnn Start:</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="4">
-    <widget class="QSpinBox" name="colEndSpinBox">
+   <item row="2" column="1">
+    <widget class="QSpinBox" name="colStartSpinBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -184,16 +207,16 @@
     </widget>
    </item>
    <item row="2" column="3">
-    <widget class="QLabel" name="label_4">
+    <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Row End:</string>
+      <string>Column End:</string>
      </property>
     </widget>
    </item>
    <item row="2" column="4">
-    <widget class="QSpinBox" name="rowEndSpinBox">
+    <widget class="QSpinBox" name="colEndSpinBox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -203,29 +226,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QLabel" name="label_8">
-     <property name="font">
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Data Containers:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="6">
-    <widget class="QTableWidget" name="dataContainerTableWidget">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>90</height>
-      </size>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageStructureSelectionWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageStructureSelectionWidget.ui
new file mode 100644
index 0000000000..f4d1f7cc90
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MontageStructureSelectionWidget.ui
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MontageStructureSelectionWidget</class>
+ <widget class="QFrame" name="MontageStructureSelectionWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>551</width>
+    <height>33</height>
+   </rect>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Property</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="montageSelectionComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="sizeAdjustPolicy">
+      <enum>QComboBox::AdjustToContents</enum>
+     </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>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp b/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
new file mode 100644
index 0000000000..f1d24da7a2
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
@@ -0,0 +1,66 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "DataContainerGridView.h"
+
+#include <QtCore/QMimeData>
+#include <QtCore/QString>
+#include <QtGui/QDragEnterEvent>
+
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridView::DataContainerGridView(QWidget* parent)
+: QTableView(parent)
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+DataContainerGridView::~DataContainerGridView() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataContainerGridView::dragEnterEvent(QDragEnterEvent* event)
+{
+  const QMimeData* data = event->mimeData();
+  DataArrayPath dap = DataArrayPath::Deserialize(data->data(SIMPLView::DragAndDrop::DataArrayPath), "|");
+  if(!dap.getDataContainerName().isEmpty())
+  {
+    event->accept();
+  }
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerGridView.h b/Source/SVWidgetsLib/Widgets/DataContainerGridView.h
new file mode 100644
index 0000000000..f9eeef4449
--- /dev/null
+++ b/Source/SVWidgetsLib/Widgets/DataContainerGridView.h
@@ -0,0 +1,61 @@
+/* ============================================================================
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtWidgets/QTableView>
+
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+/**
+ * @class DataContainerGridView DataContainerGridView.h SVWidgetsLib/Widgets/DataContainerGridView.h
+ * @brief DataContainerGridView class overrides QTableView to allow dragEnterEvent
+ * to work as expected regardless of where the drag enters from.
+ */
+class SVWidgetsLib_EXPORT DataContainerGridView : public QTableView
+{
+  Q_OBJECT
+
+public:
+  DataContainerGridView(QWidget* parent = nullptr);
+  virtual ~DataContainerGridView();
+
+protected:
+  /**
+   * @brief Override dragEnterEvent so that the point of entry does not have to
+   * be a valid dropping place for the drag enter to be accepted. The only requirement
+   * is to have a DataContainer name in the correct mimeType slot. This requirement is
+   * fulfilled when dragging DataContainers from the DataStructure.
+   * @param event
+   */
+  void dragEnterEvent(QDragEnterEvent* event) override;
+};
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 337fec8864..225ea0d7ce 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -1,38 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2009-2019 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Air Force Prime Contract FA8650-15-D-5280
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Air Force Prime Contract FA8650-15-D-5280
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataStructureTreeView.h"
 
@@ -44,11 +44,21 @@
 #include <QtGui/QStandardItemModel>
 #include <QtWidgets/QApplication>
 
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Montages/AbstractTileIndex.h"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
 #include "SVWidgetsLib/Widgets/DataStructureItemDelegate.h"
 #include "SVWidgetsLib/Widgets/DataStructureProxyModel.h"
 
+namespace
+{
+  const int InfoStringRole = Qt::UserRole + 1;
+  const int MontageRole = Qt::UserRole + 2;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -64,7 +74,7 @@ DataStructureTreeView::DataStructureTreeView(QWidget* parent)
   DataStructureProxyModel* proxyModel = new DataStructureProxyModel(this);
   proxyModel->setSourceModel(model);
   setModel(proxyModel);
-  
+
   m_Delegate = new DataStructureItemDelegate(this);
   setItemDelegate(m_Delegate);
 }
@@ -144,7 +154,7 @@ DataArrayPath DataStructureTreeView::getDataArrayPath(const QModelIndex& index)
   DataArrayPath path;
   DataStructureProxyModel* proxyModel = dynamic_cast<DataStructureProxyModel*>(getProxyModel());
   QStandardItemModel* stdModel = dynamic_cast<QStandardItemModel*>(getStandardModel());
-  
+
   if(nullptr == proxyModel || nullptr == stdModel)
   {
     return path;
@@ -271,6 +281,10 @@ void DataStructureTreeView::performDrag()
   }
 
   DataArrayPath path = getDataArrayPath(index);
+  if(nullptr == m_Filter)
+  {
+    return;
+  }
 
   // Do not allow dragging paths created by the current filter
   std::list<DataArrayPath> createdPaths = m_Filter->getCreatedPaths();
@@ -489,9 +503,7 @@ void DataStructureTreeView::contextMenuEvent(QContextMenuEvent* event)
   {
     menu.addSeparator();
     QAction* collapseAllButAction = menu.addAction("Collapse All But This");
-    connect(collapseAllButAction, &QAction::triggered, [=]{
-      collapseAllBut(index);
-    });
+    connect(collapseAllButAction, &QAction::triggered, [=] { collapseAllBut(index); });
   }
 
   menu.exec(event->globalPos());
@@ -513,6 +525,320 @@ void DataStructureTreeView::search(const QString& name)
   update();
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::findChildByName(QStandardItem* rootItem, const QString& name, int column)
+{
+  if(nullptr == rootItem)
+  {
+    return nullptr;
+  }
+
+  QStandardItem* item = nullptr;
+  int rowCount = rootItem->rowCount();
+  for(int row = 0; row < rowCount; ++row)
+  {
+    QStandardItem* anItem = rootItem->child(row, column);
+    if(anItem->text().compare(name) == 0)
+    {
+      item = anItem;
+      break;
+    }
+  }
+  return item;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::findItemByPath(const DataArrayPath& path)
+{
+  DataArrayPathHelper::DataType dataType = path.getDataType();
+  if(dataType == DataArrayPathHelper::DataType::None)
+  {
+    return nullptr;
+  }
+
+  QStandardItemModel* model = getStandardModel();
+  if(model == nullptr)
+  {
+    Q_ASSERT_X(model, "Model was not a QStandardItemModel in QColumnView", "");
+    return nullptr;
+  }
+
+  QStandardItem* rootItem = model->invisibleRootItem();
+  QStandardItem* targetItem = nullptr;
+  QStandardItem* dcItem = findChildByName(rootItem, path.getDataContainerName(), 0);
+  if(dataType == DataArrayPathHelper::DataType::DataContainer)
+  {
+    targetItem = dcItem;
+  }
+  else
+  {
+    QStandardItem* amItem = findChildByName(dcItem, path.getAttributeMatrixName(), 0);
+    if(dataType == DataArrayPathHelper::DataType::AttributeMatrix)
+    {
+      targetItem = amItem;
+    }
+    else
+    {
+      targetItem = findChildByName(amItem, path.getDataArrayName(), 0);
+    }
+  }
+
+  return targetItem;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::removeNonexistingEntries(QStandardItem* rootItem, const QStringList& existingItems, int column)
+{
+  int rowCount = rootItem->rowCount();
+  for(int row = rowCount - 1; row >= 0; row--)
+  {
+    QStandardItem* anItem = rootItem->child(row, column);
+    if(!existingItems.contains(anItem->text()))
+    {
+      rootItem->removeRow(row);
+    }
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::displayDataContainers(const DataContainerArray::Pointer& dca)
+{
+  if(nullptr == dca)
+  {
+    getStandardModel()->clear();
+    return;
+  }
+
+  QStandardItemModel* model = getStandardModel();
+  QVector<QString> path;
+  {
+    QModelIndex currIndex = currentIndex();
+    QStandardItem* item = model->itemFromIndex(currIndex);
+    // Get what is selected and save it
+    while(nullptr != item)
+    {
+      path.push_front(item->text());
+      item = item->parent();
+    }
+  }
+
+  // Sanity check model
+  if(model == nullptr)
+  {
+    Q_ASSERT_X(model, "Model was not a QStandardItemModel in QColumnView", "");
+    return;
+  }
+
+  // Loop over the data containers
+  DataContainerArray::Container containers = dca->getDataContainers();
+  QStandardItem* rootItem = model->invisibleRootItem();
+
+  for(DataContainer::Pointer dc : containers)
+  {
+    QStandardItem* dcItem = generateDataContainerItem(rootItem, dc);
+
+    if(!path.empty() && dc->getName().compare(path[0]) == 0)
+    {
+      setCurrentIndex(model->indexFromItem(dcItem));
+    }
+
+    // We found the proper Data Container, now populate the AttributeMatrix List
+    for(const auto& am : dc->getChildren())
+    {
+      QStandardItem* amItem = generateAttrMatrixItem(dcItem, am);
+
+      if(path.size() > 1 && am->getName().compare(path[1]) == 0)
+      {
+        setCurrentIndex(model->indexFromItem(amItem));
+      }
+
+      // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
+      QList<QString> attrArrayNames = am->getAttributeArrayNames();
+      for(const QString& attrArrayName : attrArrayNames)
+      {
+        QStandardItem* aaItem = generateDataArrayItem(amItem, am, attrArrayName);
+
+        if(path.size() > 2 && attrArrayName.compare(path[2]) == 0)
+        {
+          QModelIndex idx = model->indexFromItem(aaItem);
+          setCurrentIndex(idx);
+        }
+      }
+      removeNonexistingEntries(amItem, attrArrayNames, 0);
+    }
+    removeNonexistingEntries(dcItem, dc->getAttributeMatrixNames(), 0);
+  }
+  removeNonexistingEntries(rootItem, dca->getDataContainerNames(), 0);
+
+  // repaint the DataStructureTreeView
+  repaint();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::displayMontages(const DataContainerArray::Pointer& dca)
+{
+  if(dca.get() == nullptr)
+  {
+    QStandardItemModel* model = getStandardModel();
+    QStandardItem* rootItem = model->invisibleRootItem();
+    removeNonexistingEntries(rootItem, QStringList(), 0);
+    return;
+  }
+
+  QStandardItemModel* model = getStandardModel();
+  QVector<QString> path;
+  {
+    QModelIndex currIndex = currentIndex();
+    QStandardItem* item = model->itemFromIndex(currIndex);
+    // Get what is selected and save it
+    while(nullptr != item)
+    {
+      path.push_front(item->text());
+      item = item->parent();
+    }
+  }
+
+  // Sanity check model
+  if(model == nullptr)
+  {
+    Q_ASSERT_X(model, "Model was not a QStandardItemModel in QColumnView", "");
+    return;
+  }
+
+  QStandardItem* rootItem = model->invisibleRootItem();
+  DataContainerArray::MontageCollection montageCollection = dca->getMontageCollection();
+
+  for(const auto& montage : montageCollection)
+  {
+    QStandardItem* montageItem = generateMontageItem(rootItem, montage);
+    montageItem->setData(true, ::MontageRole);
+
+    // Loop over the data containers
+    DataContainerArray::Container containers = montage->getDataContainers();
+    for(DataContainer::Pointer dc : containers)
+    {
+      QStandardItem* dcItem;
+      if(nullptr == dc)
+      {
+        dcItem = new QStandardItem("[Missing Data Container]");
+        montageItem->appendRow(dcItem);
+      }
+      else
+      {
+        dcItem = generateDataContainerItem(montageItem, dc);
+        dcItem->setData(false, ::MontageRole);
+
+        AbstractTileIndexShPtr dcIndex = montage->getTileIndexFor(dc);
+        ToolTipGenerator dcToolTip = dcIndex->getToolTipGenerator();
+        dcToolTip.append(dc->getToolTipGenerator());
+        dcItem->setToolTip(dcToolTip.generateHTML());
+      }
+
+      if(!path.empty() && dc->getName().compare(path[0]) == 0)
+      {
+        setCurrentIndex(model->indexFromItem(dcItem));
+      }
+    }
+    removeNonexistingEntries(montageItem, dca->getDataContainerNames(), 0);
+  }
+  removeNonexistingEntries(rootItem, dca->getMontageNames(), 0);
+
+  update();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::generateMontageItem(QStandardItem* rootItem, const AbstractMontage::Pointer& montage)
+{
+  QStandardItem* montageItem = getOrCreateItem(rootItem, montage->getName());
+  montageItem->setData(montage->getInfoString(), ::InfoStringRole);
+  montageItem->setToolTip(montage->getInfoString());
+  if(montage->isValid())
+  {
+    montageItem->setIcon(QIcon());
+  }
+  else
+  {
+    montageItem->setIcon(QIcon(":SIMPL/icons/images/warning.png"));
+  }
+
+  return montageItem;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::generateDataContainerItem(QStandardItem* rootItem, const DataContainer::Pointer& dc)
+{
+  QStandardItem* dcItem = getOrCreateItem(rootItem, dc->getName());
+  dcItem->setData(dc->getInfoString(SIMPL::HtmlFormat), ::InfoStringRole);
+  dcItem->setToolTip(dc->getInfoString(SIMPL::HtmlFormat));
+  if(dc->getGeometry())
+  {
+    IGeometry::Type geomType = dc->getGeometry()->getGeometryType();
+    dcItem->setIcon(getDataContainerIcon(geomType));
+  }
+  else
+  {
+    dcItem->setIcon(QIcon());
+  }
+
+  return dcItem;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::generateAttrMatrixItem(QStandardItem* dcItem, const AttributeMatrix::Pointer& am)
+{
+  QStandardItem* amItem = getOrCreateItem(dcItem, am->getName());
+  amItem->setData(am->getInfoString(SIMPL::HtmlFormat), ::InfoStringRole);
+  amItem->setToolTip(am->getInfoString(SIMPL::HtmlFormat));
+  amItem->setIcon(QIcon());
+
+  return amItem;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::generateDataArrayItem(QStandardItem* amItem, const AttributeMatrix::Pointer& am, const QString& name)
+{
+  IDataArray::Pointer attrArray = am->getAttributeArray(name);
+
+  QStandardItem* aaItem = getOrCreateItem(amItem, attrArray->getName());
+  aaItem->setData(attrArray->getInfoString(SIMPL::HtmlFormat), ::InfoStringRole);
+  aaItem->setToolTip(attrArray->getInfoString(SIMPL::HtmlFormat));
+  aaItem->setIcon(QIcon());
+
+  return aaItem;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QStandardItem* DataStructureTreeView::getOrCreateItem(QStandardItem* parentItem, const QString& name)
+{
+  QStandardItem* targetItem = findChildByName(parentItem, name, 0);
+  if(targetItem == nullptr)
+  {
+    targetItem = new QStandardItem(name);
+    parentItem->appendRow(targetItem);
+  }
+  return targetItem;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -526,3 +852,168 @@ void DataStructureTreeView::rowsInserted(const QModelIndex& parent, int start, i
     expand(parent);
   }
 }
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setImageGeomIcon(const QIcon& path)
+{
+  m_ImageGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setVertexGeomIcon(const QIcon& path)
+{
+  m_VertexGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setEdgeGeomIcon(const QIcon& path)
+{
+  m_EdgeGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setTriangleGeomIcon(const QIcon& path)
+{
+  m_TriangleGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setQuadGeomIcon(const QIcon& path)
+{
+  m_QuadGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setTetrahedralGeomIcon(const QIcon& path)
+{
+  m_TetrahedralGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setHexahedralGeomIcon(const QIcon& path)
+{
+  m_HexahedralGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void DataStructureTreeView::setRectilinearGeomIcon(const QIcon& path)
+{
+  m_RectilinearGeomIcon = path;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getImageGeomIcon() const
+{
+  return m_ImageGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getVertexGeomIcon() const
+{
+  return m_VertexGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getEdgeGeomIcon() const
+{
+  return m_EdgeGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getTriangleGeomIcon() const
+{
+  return m_TriangleGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getQuadGeomIcon() const
+{
+  return m_QuadGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getTetrahedralGeomIcon() const
+{
+  return m_TetrahedralGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getHexahedralGeomIcon() const
+{
+  return m_HexahedralGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getRectilinearGeomIcon() const
+{
+  return m_RectilinearGeomIcon;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QIcon DataStructureTreeView::getDataContainerIcon(IGeometry::Type type) const
+{
+  switch(type)
+  {
+  case IGeometry::Type::Image:
+    return m_ImageGeomIcon;
+    break;
+  case IGeometry::Type::Vertex:
+    return m_VertexGeomIcon;
+    break;
+  case IGeometry::Type::Edge:
+    return m_EdgeGeomIcon;
+    break;
+  case IGeometry::Type::Triangle:
+    return m_TriangleGeomIcon;
+    break;
+  case IGeometry::Type::Quad:
+    return m_QuadGeomIcon;
+    break;
+  case IGeometry::Type::Tetrahedral:
+    return m_TetrahedralGeomIcon;
+    break;
+  case IGeometry::Type::Hexahedral:
+    return m_HexahedralGeomIcon;
+    break;
+  case IGeometry::Type::RectGrid:
+    return m_RectilinearGeomIcon;
+    break;
+  default:
+    return QIcon();
+    break;
+  }
+}
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index 1d6dfc588b..fb7456a9f3 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -36,31 +36,49 @@
 
 #pragma once
 
-
+#include <memory>
 
 #include <QtCore/QModelIndex>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragMoveEvent>
 #include <QtGui/QDropEvent>
 #include <QtGui/QMouseEvent>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QTreeView>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Montages/AbstractMontage.h"
 
-#include "SVWidgetsLib/Widgets/DataStructureItemDelegate.h"
-
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
+#include "SVWidgetsLib/Widgets/DataStructureItemDelegate.h"
 
 class QAbstractItemModel;
 class QStandardItemModel;
+class QStandardItem;
+class DataContainerArray;
 class DataStructureProxyModel;
 
+using AttributeMatrixShPtr = std::shared_ptr<AttributeMatrix>;
+using DataContainerShPtr = std::shared_ptr<DataContainer>;
+using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
+
 class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
 {
   Q_OBJECT
 
 public:
+  //-------- Setup some QProperties that we can use from the CSS theme files to set the proper icon
+  Q_PROPERTY(QIcon ImageGeomIcon READ getImageGeomIcon WRITE setImageGeomIcon)
+  Q_PROPERTY(QIcon VertexGeomIcon READ getVertexGeomIcon WRITE setVertexGeomIcon)
+  Q_PROPERTY(QIcon EdgeGeomIcon READ getEdgeGeomIcon WRITE setEdgeGeomIcon)
+  Q_PROPERTY(QIcon TriangleGeomIcon READ getTriangleGeomIcon WRITE setTriangleGeomIcon)
+  Q_PROPERTY(QIcon QuadGeomIcon READ getQuadGeomIcon WRITE setQuadGeomIcon)
+  Q_PROPERTY(QIcon TetrahedralGeomIcon READ getTetrahedralGeomIcon WRITE setTetrahedralGeomIcon)
+  Q_PROPERTY(QIcon HexahedralGeomIcon READ getHexahedralGeomIcon WRITE setHexahedralGeomIcon)
+  Q_PROPERTY(QIcon RectilinearGeomIcon READ getRectilinearGeomIcon WRITE setRectilinearGeomIcon)
+
   /**
    * @brief DataStructureTreeView
    * @param parent
@@ -100,9 +118,9 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
   void setActiveFilter(AbstractFilter::Pointer filter);
 
   /**
-  * @brief Sets the filter requirements and forces a repaint
-  * @param reqs
-  */
+   * @brief Sets the filter requirements and forces a repaint
+   * @param reqs
+   */
   void setViewRequirements(DataContainerSelectionFilterParameter::RequirementType reqs);
 
   /**
@@ -123,6 +141,8 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void clearViewRequirements();
 
+  QIcon getDataContainerIcon(IGeometry::Type type) const;
+
   /**
    * @brief Returns a QVector of QModelIndex for all expanded children
    * @param index
@@ -141,6 +161,27 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void search(const QString& name);
 
+public slots:
+  void displayDataContainers(const DataContainerArrayShPtr& dca);
+  void displayMontages(const DataContainerArrayShPtr& dca);
+
+  void setImageGeomIcon(const QIcon& path);
+  void setVertexGeomIcon(const QIcon& path);
+  void setEdgeGeomIcon(const QIcon& path);
+  void setTriangleGeomIcon(const QIcon& path);
+  void setQuadGeomIcon(const QIcon& path);
+  void setTetrahedralGeomIcon(const QIcon& path);
+  void setHexahedralGeomIcon(const QIcon& path);
+  void setRectilinearGeomIcon(const QIcon& path);
+  QIcon getImageGeomIcon() const;
+  QIcon getVertexGeomIcon() const;
+  QIcon getEdgeGeomIcon() const;
+  QIcon getTriangleGeomIcon() const;
+  QIcon getQuadGeomIcon() const;
+  QIcon getTetrahedralGeomIcon() const;
+  QIcon getHexahedralGeomIcon() const;
+  QIcon getRectilinearGeomIcon() const;
+
 signals:
   void filterPath(DataArrayPath path);
   void endDataStructureFiltering();
@@ -202,6 +243,69 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void findExpandedChildren(QAbstractItemModel* model, const QModelIndex& index, QVector<QModelIndex>& expandedVector);
 
+  /**
+   * @brief findChildByName
+   * @param rootItem
+   * @param name
+   * @param column
+   */
+  QStandardItem* findChildByName(QStandardItem* rootItem, const QString& name, int column);
+
+  /**
+   * @brief findItemByPath
+   * @param path
+   * @return
+   */
+  QStandardItem* findItemByPath(const DataArrayPath& path);
+
+  /**
+   * @brief getOrCreateItem
+   * @param parentItem
+   * @param name
+   * @return
+   */
+  QStandardItem* getOrCreateItem(QStandardItem* parentItem, const QString& name);
+
+  /**
+   * @brief generateMontageItem
+   * @param rootItem
+   * @param montage
+   * @return
+   */
+  QStandardItem* generateMontageItem(QStandardItem* rootItem, const AbstractMontage::Pointer& montage);
+
+  /**
+   * @brief generateDataContainerItem
+   * @param rootItem
+   * @param dc
+   */
+  QStandardItem* generateDataContainerItem(QStandardItem* rootItem, const DataContainerShPtr& dc);
+
+  /**
+   * @brief generateAttrMatrixItem
+   * @param dcItem
+   * @param am
+   * @return
+   */
+  QStandardItem* generateAttrMatrixItem(QStandardItem* dcItem, const AttributeMatrixShPtr& am);
+
+  /**
+   * @brief generateDataArrayItem
+   * @param amItem
+   * @param am
+   * @param name
+   * @return
+   */
+  QStandardItem* generateDataArrayItem(QStandardItem* amItem, const AttributeMatrixShPtr& am, const QString& name);
+
+  /**
+   * @brief removeNonexistingEntries
+   * @param rootItem
+   * @param existingItems
+   * @param column
+   */
+  void removeNonexistingEntries(QStandardItem* rootItem, const QStringList& existingItems, int column);
+
   /**
    * @brief rowsInserted
    * @param parent
@@ -228,10 +332,17 @@ private slots:
   bool m_Dragging = false;
   AbstractFilter::Pointer m_Filter = nullptr;
   DataStructureItemDelegate* m_Delegate = nullptr;
+  QIcon m_ImageGeomIcon = QIcon(SIMPLView::GeometryIcons::Image);
+  QIcon m_VertexGeomIcon = QIcon(SIMPLView::GeometryIcons::Vertex);
+  QIcon m_EdgeGeomIcon = QIcon(SIMPLView::GeometryIcons::Edge);
+  QIcon m_TriangleGeomIcon = QIcon(SIMPLView::GeometryIcons::Triangle);
+  QIcon m_QuadGeomIcon = QIcon(SIMPLView::GeometryIcons::Quad);
+  QIcon m_TetrahedralGeomIcon = QIcon(SIMPLView::GeometryIcons::Tetetrahedral);
+  QIcon m_HexahedralGeomIcon = QIcon(SIMPLView::GeometryIcons::Hexahedral);
+  QIcon m_RectilinearGeomIcon = QIcon(SIMPLView::GeometryIcons::Rectilinear);
 
   /**
    * @brief performDrag
    */
   void performDrag();
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index f4faf0ac96..43a7ab9eb6 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -65,442 +65,223 @@ DataStructureWidget::~DataStructureWidget() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setImageGeomIcon(const QIcon& path)
-{
-  m_ImageGeomIcon = path;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataStructureWidget::setVertexGeomIcon(const QIcon& path)
+void DataStructureWidget::setupGui()
 {
-  m_VertexGeomIcon = path;
-}
+  connect(m_Ui->dataBrowserTreeView, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
+  connect(m_Ui->dataBrowserTreeView, SIGNAL(endDataStructureFiltering()), this, SIGNAL(endDataStructureFiltering()));
+  connect(m_Ui->dataBrowserTreeView, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)));
+  
+  connect(m_Ui->collapseAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::collapseAll);
+  connect(m_Ui->expandAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::expandAll);
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataStructureWidget::setEdgeGeomIcon(const QIcon& path)
-{
-  m_EdgeGeomIcon = path;
+  // Search
+  connect(m_Ui->dataStructureSearch, &QLineEdit::textChanged, m_Ui->dataBrowserTreeView, &DataStructureTreeView::search);
+  connect(m_Ui->dataStructureSearch, &QLineEdit::textChanged, m_Ui->montageTreeView, &DataStructureTreeView::search);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setTriangleGeomIcon(const QIcon& path)
+void DataStructureWidget::updateDataContainerArray(DataContainerArray::Pointer dca)
 {
-  m_TriangleGeomIcon = path;
+  m_Dca = dca->deepCopy(true);
+  refreshData();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setQuadGeomIcon(const QIcon& path)
+void DataStructureWidget::refreshData()
 {
-  m_QuadGeomIcon = path;
+  m_Ui->dataBrowserTreeView->displayDataContainers(m_Dca);
+  m_Ui->montageTreeView->displayMontages(m_Dca);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setTetrahedralGeomIcon(const QIcon& path)
+void DataStructureWidget::filterActivated(AbstractFilter::Pointer filter)
 {
-  m_TetrahedralGeomIcon = path;
-}
+  m_Dca = DataContainerArray::NullPointer();
+  m_Ui->dataBrowserTreeView->setActiveFilter(filter);
+  m_Ui->montageTreeView->setActiveFilter(filter);
+  if(filter.get() != nullptr)
+  {
+    DataContainerArray::Pointer dca = filter->getDataContainerArray();
+    if(dca.get() != nullptr)
+    {
+      m_Dca = dca->deepCopy(true);
+    }
+  }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void DataStructureWidget::setHexahedralGeomIcon(const QIcon& path)
-{
-  m_HexahedralGeomIcon = path;
+  refreshData();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setRectilinearGeomIcon(const QIcon &path)
+void DataStructureWidget::handleFilterRemoved(PipelineFilterObject* object)
 {
-  m_RectilinearGeomIcon = path;
+  Q_UNUSED(object);
+  m_Dca = DataContainerArray::NullPointer();
+  refreshData();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getImageGeomIcon()
+void DataStructureWidget::setViewReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs)
 {
-  return m_ImageGeomIcon;
+  m_Ui->dataBrowserTreeView->setViewRequirements(dcReqs);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getVertexGeomIcon()
+void DataStructureWidget::setViewReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs)
 {
-  return m_VertexGeomIcon;
+  m_Ui->dataBrowserTreeView->setViewRequirements(amReqs);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getEdgeGeomIcon()
+void DataStructureWidget::setViewReqs(DataArraySelectionFilterParameter::RequirementType daReqs)
 {
-  return m_EdgeGeomIcon;
+  m_Ui->dataBrowserTreeView->setViewRequirements(daReqs);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getTriangleGeomIcon()
+void DataStructureWidget::clearViewRequirements()
 {
-  return m_TriangleGeomIcon;
+  m_Ui->dataBrowserTreeView->clearViewRequirements();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getQuadGeomIcon()
+void DataStructureWidget::setImageGeomIcon(const QIcon& path)
 {
-  return m_QuadGeomIcon;
+  m_Ui->dataBrowserTreeView->setImageGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getTetrahedralGeomIcon()
+void DataStructureWidget::setVertexGeomIcon(const QIcon& path)
 {
-  return m_TetrahedralGeomIcon;
+  m_Ui->dataBrowserTreeView->setVertexGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getHexahedralGeomIcon()
+void DataStructureWidget::setEdgeGeomIcon(const QIcon& path)
 {
-  return m_HexahedralGeomIcon;
+  m_Ui->dataBrowserTreeView->setEdgeGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon DataStructureWidget::getRectilinearGeomIcon()
+void DataStructureWidget::setTriangleGeomIcon(const QIcon& path)
 {
-  return m_RectilinearGeomIcon;
+  m_Ui->dataBrowserTreeView->setTriangleGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setupGui()
+void DataStructureWidget::setQuadGeomIcon(const QIcon& path)
 {
-  connect(m_Ui->dataBrowserTreeView, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
-  connect(m_Ui->dataBrowserTreeView, SIGNAL(endDataStructureFiltering()), this, SIGNAL(endDataStructureFiltering()));
-  connect(m_Ui->dataBrowserTreeView, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)));
-  
-  connect(m_Ui->collapseAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::collapseAll);
-  connect(m_Ui->expandAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::expandAll);
-
-  // Search
-  connect(m_Ui->dataStructureSearch, &QLineEdit::textChanged, m_Ui->dataBrowserTreeView, &DataStructureTreeView::search);
+  m_Ui->dataBrowserTreeView->setQuadGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::updateDataContainerArray(DataContainerArray::Pointer dca)
+void DataStructureWidget::setTetrahedralGeomIcon(const QIcon& path)
 {
-  m_Dca = dca->deepCopy(true);
-  refreshData();
+  m_Ui->dataBrowserTreeView->setTetrahedralGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::refreshData()
+void DataStructureWidget::setHexahedralGeomIcon(const QIcon& path)
 {
-  // Get the DataContainerArray object
-  if(m_Dca.get() == nullptr)
-  {
-    QStandardItemModel* model = m_Ui->dataBrowserTreeView->getStandardModel();
-    QStandardItem* rootItem = model->invisibleRootItem();
-    removeNonexistingEntries(rootItem, QStringList(), 0);
-    return;
-  }
-
-  QStandardItemModel* model = m_Ui->dataBrowserTreeView->getStandardModel();
-  QVector<QString> path;
-  {
-    QModelIndex currIndex = m_Ui->dataBrowserTreeView->currentIndex();
-    QStandardItem* item = model->itemFromIndex(currIndex);
-    // Get what is selected and save it
-    while(nullptr != item)
-    {
-      path.push_front(item->text());
-      item = item->parent();
-    }
-  }
-
-  model = m_Ui->dataBrowserTreeView->getStandardModel();
-
-  // Sanity check model
-  if(model == nullptr)
-  {
-    Q_ASSERT_X(model, "Model was not a QStandardItemModel in QColumnView", "");
-    return;
-  }
-
-  // Loop over the data containers
-  DataContainerArray::Container containers = m_Dca->getDataContainers();
-  QStandardItem* rootItem = model->invisibleRootItem();
-
-  for(DataContainer::Pointer dc : containers)
-  {
-    QStandardItem* dcItem = findChildByName(rootItem, dc->getName(), 0);
-    if(dcItem == nullptr)
-    {
-      dcItem = new QStandardItem(dc->getName());
-      model->appendRow(dcItem);
-      m_Ui->dataBrowserTreeView->expand(dcItem->index());
-    }
-    dcItem->setData(dc->getInfoString(SIMPL::HtmlFormat), Qt::UserRole + 1);
-    dcItem->setToolTip(dc->getInfoString(SIMPL::HtmlFormat));
-    if(dc->getGeometry())
-    {
-      switch(dc->getGeometry()->getGeometryType())
-      {
-      case IGeometry::Type::Image:
-        dcItem->setIcon(m_ImageGeomIcon);
-        break;
-      case IGeometry::Type::Vertex:
-        dcItem->setIcon(m_VertexGeomIcon);
-        break;
-      case IGeometry::Type::Edge:
-        dcItem->setIcon(m_EdgeGeomIcon);
-        break;
-      case IGeometry::Type::Triangle:
-        dcItem->setIcon(m_TriangleGeomIcon);
-        break;
-      case IGeometry::Type::Quad:
-        dcItem->setIcon(m_QuadGeomIcon);
-        break;
-      case IGeometry::Type::Tetrahedral:
-        dcItem->setIcon(m_TetrahedralGeomIcon);
-        break;
-      case IGeometry::Type::Hexahedral:
-        dcItem->setIcon(m_HexahedralGeomIcon);
-        break;
-      case IGeometry::Type::RectGrid:
-        dcItem->setIcon(m_RectilinearGeomIcon);
-        break;
-      default:
-        dcItem->setIcon(QIcon());
-        break;
-      }
-    }
-    else
-    {
-      dcItem->setIcon(QIcon());
-    }
-
-    if(!path.empty() && dc->getName().compare(path[0]) == 0)
-    {
-      m_Ui->dataBrowserTreeView->setCurrentIndex(model->indexFromItem(dcItem));
-    }
-
-    // We found the proper Data Container, now populate the AttributeMatrix List
-    for(const auto& am : dc->getChildren())
-    {
-      QStandardItem* amItem = findChildByName(dcItem, am->getName(), 0);
-      if(amItem == nullptr)
-      {
-        amItem = new QStandardItem(am->getName());
-        dcItem->appendRow(amItem);
-        m_Ui->dataBrowserTreeView->expand(amItem->index());
-      }
-      amItem->setData(am->getInfoString(SIMPL::HtmlFormat), Qt::UserRole + 1);
-      amItem->setToolTip(am->getInfoString(SIMPL::HtmlFormat));
-      amItem->setIcon(QIcon());
-
-      if(path.size() > 1 && am->getName().compare(path[1]) == 0)
-      {
-        m_Ui->dataBrowserTreeView->setCurrentIndex(model->indexFromItem(amItem));
-      }
-
-      // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
-      QList<QString> attrArrayNames = am->getAttributeArrayNames();
-      QListIterator<QString> dataArraysIter(attrArrayNames);
-      while(dataArraysIter.hasNext())
-      {
-        QString attrArrayName = dataArraysIter.next();
-        IDataArray::Pointer attrArray = am->getAttributeArray(attrArrayName);
-
-        QStandardItem* aaItem = findChildByName(amItem, attrArray->getName(), 0);
-        if(aaItem == nullptr)
-        {
-          aaItem = new QStandardItem(attrArrayName);
-          amItem->appendRow(aaItem);
-        }
-        aaItem->setData(attrArray->getInfoString(SIMPL::HtmlFormat), Qt::UserRole + 1);
-        aaItem->setToolTip(attrArray->getInfoString(SIMPL::HtmlFormat));
-        aaItem->setIcon(QIcon());
-
-        if(path.size() > 2 && attrArrayName.compare(path[2]) == 0)
-        {
-          QModelIndex idx = model->indexFromItem(aaItem);
-          m_Ui->dataBrowserTreeView->setCurrentIndex(idx);
-        }
-      }
-      removeNonexistingEntries(amItem, attrArrayNames, 0);
-    }
-    removeNonexistingEntries(dcItem, dc->getAttributeMatrixNames(), 0);
-  }
-  removeNonexistingEntries(rootItem, m_Dca->getDataContainerNames(), 0);
-
-  // repaint the DataStructureTreeView
-  m_Ui->dataBrowserTreeView->repaint();
+  m_Ui->dataBrowserTreeView->setHexahedralGeomIcon(path);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::filterActivated(AbstractFilter::Pointer filter)
+void DataStructureWidget::setRectilinearGeomIcon(const QIcon &path)
 {
-  m_Dca = DataContainerArray::NullPointer();
-  m_Ui->dataBrowserTreeView->setActiveFilter(filter);
-  if(filter.get() != nullptr)
-  {
-    DataContainerArray::Pointer dca = filter->getDataContainerArray();
-    if(dca.get() != nullptr)
-    {
-      m_Dca = dca->deepCopy(true);
-    }
-  }
-
-  refreshData();
+  m_Ui->dataBrowserTreeView->setRectilinearGeomIcon(path);
 }
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::handleFilterRemoved(PipelineFilterObject* object)
+QIcon DataStructureWidget::getImageGeomIcon()
 {
-  Q_UNUSED(object);
-  m_Dca = DataContainerArray::NullPointer();
-  refreshData();
+  return m_Ui->dataBrowserTreeView->getImageGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QStandardItem* DataStructureWidget::findChildByName(QStandardItem* rootItem, const QString &name, int column)
+QIcon DataStructureWidget::getVertexGeomIcon()
 {
-  if(nullptr == rootItem)
-  {
-    return nullptr;
-  }
-
-  QStandardItem* item = nullptr;
-  int rowCount = rootItem->rowCount();
-  for (int row = 0; row < rowCount; ++row)
-  {
-    QStandardItem* anItem = rootItem->child(row, column);
-    if(anItem->text().compare(name) == 0)
-    {
-      item = anItem;
-      break;
-    }
-  }
-  return item;
+  return m_Ui->dataBrowserTreeView->getVertexGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QStandardItem* DataStructureWidget::findItemByPath(DataArrayPath path)
+QIcon DataStructureWidget::getEdgeGeomIcon()
 {
-  DataArrayPathHelper::DataType dataType = path.getDataType();
-  if(dataType == DataArrayPathHelper::DataType::None)
-  {
-    return nullptr;
-  }
-
-  QStandardItemModel* model = qobject_cast<QStandardItemModel*>(m_Ui->dataBrowserTreeView->model());
-  if(model == nullptr)
-  {
-    Q_ASSERT_X(model, "Model was not a QStandardItemModel in QColumnView", "");
-    return nullptr;
-  }
-
-  QStandardItem* rootItem = model->invisibleRootItem();
-  QStandardItem* targetItem = nullptr;
-  QStandardItem* dcItem = findChildByName(rootItem, path.getDataContainerName(), 0);
-  if(dataType == DataArrayPathHelper::DataType::DataContainer)
-  {
-    targetItem = dcItem;
-  }
-  else
-  {
-    QStandardItem* amItem = findChildByName(dcItem, path.getAttributeMatrixName(), 0);
-    if(dataType == DataArrayPathHelper::DataType::AttributeMatrix)
-    {
-      targetItem = amItem;
-    }
-    else
-    {
-      targetItem = findChildByName(amItem, path.getDataArrayName(), 0);
-    }
-  }
-
-  return targetItem;
+  return m_Ui->dataBrowserTreeView->getEdgeGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::removeNonexistingEntries(QStandardItem* rootItem, QList<QString> existing, int column)
+QIcon DataStructureWidget::getTriangleGeomIcon()
 {
-  int rowCount = rootItem->rowCount();
-  for (int row = rowCount-1; row >= 0; row--)
-  {
-    QStandardItem* anItem = rootItem->child(row, column);
-    if(!existing.contains(anItem->text()))
-    {
-      rootItem->removeRow(row);
-    }
-  }
+  return m_Ui->dataBrowserTreeView->getTriangleGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setViewReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs)
+QIcon DataStructureWidget::getQuadGeomIcon()
 {
-  m_Ui->dataBrowserTreeView->setViewRequirements(dcReqs);
+  return m_Ui->dataBrowserTreeView->getQuadGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setViewReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs)
+QIcon DataStructureWidget::getTetrahedralGeomIcon()
 {
-  m_Ui->dataBrowserTreeView->setViewRequirements(amReqs);
+  return m_Ui->dataBrowserTreeView->getTetrahedralGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setViewReqs(DataArraySelectionFilterParameter::RequirementType daReqs)
+QIcon DataStructureWidget::getHexahedralGeomIcon()
 {
-  m_Ui->dataBrowserTreeView->setViewRequirements(daReqs);
+  return m_Ui->dataBrowserTreeView->getHexahedralGeomIcon();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::clearViewRequirements()
+QIcon DataStructureWidget::getRectilinearGeomIcon()
 {
-  m_Ui->dataBrowserTreeView->clearViewRequirements();
+  return m_Ui->dataBrowserTreeView->getRectilinearGeomIcon();
 }
-
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index 44dcecfe32..d05cfc30f0 100755
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -49,7 +49,6 @@
 class DataContainerArray;
 using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
-#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "ui_DataStructureWidget.h"
@@ -69,16 +68,7 @@ class SVWidgetsLib_EXPORT DataStructureWidget : public QWidget, public IObserver
   DataStructureWidget(QWidget* parent = nullptr);
   ~DataStructureWidget() override;
 
-  //-------- Setup some QProperties that we can use from the CSS theme files to set the proper icon
-  Q_PROPERTY(QIcon ImageGeomIcon READ getImageGeomIcon WRITE setImageGeomIcon)
-  Q_PROPERTY(QIcon VertexGeomIcon READ getVertexGeomIcon WRITE setVertexGeomIcon)
-  Q_PROPERTY(QIcon EdgeGeomIcon READ getEdgeGeomIcon WRITE setEdgeGeomIcon)
-  Q_PROPERTY(QIcon TriangleGeomIcon READ getTriangleGeomIcon WRITE setTriangleGeomIcon)
-  Q_PROPERTY(QIcon QuadGeomIcon READ getQuadGeomIcon WRITE setQuadGeomIcon)
-  Q_PROPERTY(QIcon TetrahedralGeomIcon READ getTetrahedralGeomIcon WRITE setTetrahedralGeomIcon)
-  Q_PROPERTY(QIcon HexahedralGeomIcon READ getHexahedralGeomIcon WRITE setHexahedralGeomIcon)
-  Q_PROPERTY(QIcon RectilinearGeomIcon READ getRectilinearGeomIcon WRITE setRectilinearGeomIcon)
-
+  // These are needed for the CSS properties
   void setImageGeomIcon(const QIcon& path);
   void setVertexGeomIcon(const QIcon& path);
   void setEdgeGeomIcon(const QIcon& path);
@@ -97,6 +87,16 @@ class SVWidgetsLib_EXPORT DataStructureWidget : public QWidget, public IObserver
   QIcon getHexahedralGeomIcon();
   QIcon getRectilinearGeomIcon();
 
+  //-------- Setup some QProperties that we can use from the CSS theme files to set the proper icon
+  Q_PROPERTY(QIcon ImageGeomIcon READ getImageGeomIcon WRITE setImageGeomIcon)
+  Q_PROPERTY(QIcon VertexGeomIcon READ getVertexGeomIcon WRITE setVertexGeomIcon)
+  Q_PROPERTY(QIcon EdgeGeomIcon READ getEdgeGeomIcon WRITE setEdgeGeomIcon)
+  Q_PROPERTY(QIcon TriangleGeomIcon READ getTriangleGeomIcon WRITE setTriangleGeomIcon)
+  Q_PROPERTY(QIcon QuadGeomIcon READ getQuadGeomIcon WRITE setQuadGeomIcon)
+  Q_PROPERTY(QIcon TetrahedralGeomIcon READ getTetrahedralGeomIcon WRITE setTetrahedralGeomIcon)
+  Q_PROPERTY(QIcon HexahedralGeomIcon READ getHexahedralGeomIcon WRITE setHexahedralGeomIcon)
+  Q_PROPERTY(QIcon RectilinearGeomIcon READ getRectilinearGeomIcon WRITE setRectilinearGeomIcon)
+
 public slots:
   /**
    * @brief Updates the internal DataContainerArray copy from the input DataContainerArray
@@ -157,41 +157,10 @@ public slots:
    */
   void setupGui();
 
-  /**
-   * @brief findChildByName
-   * @param rootItem
-   * @param name
-   * @param column
-   * @return
-   */
-  QStandardItem* findChildByName(QStandardItem* rootItem, const QString& name, int column);
-
-  /**
-   * @brief Syncs up the QTreeView with the heirarchy from the DataContainerArray
-   * @param rootItem RootItem to start the sync
-   * @param existing List of existing objects
-   * @param column Column to update
-   */
-  void removeNonexistingEntries(QStandardItem* rootItem, QList<QString> existing, int column);
-
-  /**
-   * @brief Returns a QStandardItem from the given DataArrayPath
-   * @param path
-   * @return
-   */
-  QStandardItem* findItemByPath(DataArrayPath path);
-
 private:
   DataContainerArrayShPtrType m_Dca = nullptr;
   QSharedPointer<Ui::DataStructureWidget>       m_Ui;
-  QIcon m_ImageGeomIcon = QIcon(SIMPLView::GeometryIcons::Image);
-  QIcon m_VertexGeomIcon = QIcon(SIMPLView::GeometryIcons::Vertex);
-  QIcon m_EdgeGeomIcon = QIcon(SIMPLView::GeometryIcons::Edge);
-  QIcon m_TriangleGeomIcon = QIcon(SIMPLView::GeometryIcons::Triangle);
-  QIcon m_QuadGeomIcon = QIcon(SIMPLView::GeometryIcons::Quad);
-  QIcon m_TetrahedralGeomIcon = QIcon(SIMPLView::GeometryIcons::Tetetrahedral);
-  QIcon m_HexahedralGeomIcon = QIcon(SIMPLView::GeometryIcons::Hexahedral);
-  QIcon m_RectilinearGeomIcon = QIcon(SIMPLView::GeometryIcons::Rectilinear);
+  
 public:
   DataStructureWidget(const DataStructureWidget&) = delete; // Copy Constructor Not Implemented
   DataStructureWidget(DataStructureWidget&&) = delete;      // Move Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/Widgets/SourceList.cmake b/Source/SVWidgetsLib/Widgets/SourceList.cmake
index d0da615b41..ecefa3080e 100755
--- a/Source/SVWidgetsLib/Widgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/Widgets/SourceList.cmake
@@ -23,6 +23,7 @@ set(SVWidgetsLib_Widgets_MOC_HDRS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathSelectionWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataPathLabel.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerArrayWidget.h
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerGridView.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryToolboxWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryTreeWidget.h
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterListToolboxWidget.h
@@ -77,6 +78,7 @@ set(SVWidgetsLib_Widgets_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathDisplay.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataArrayPathSelectionWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerArrayWidget.cpp
+  ${SVWidgetsLib_SOURCE_DIR}/Widgets/DataContainerGridView.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryToolboxWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterLibraryTreeWidget.cpp
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/FilterListToolboxWidget.cpp
diff --git a/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui b/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
index 0205f5f3a5..70bb7bfc07 100755
--- a/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
+++ b/Source/SVWidgetsLib/Widgets/UI_Files/DataStructureWidget.ui
@@ -32,80 +32,6 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="1" column="0">
-    <widget class="QtSLineEdit" name="dataStructureSearch">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>30</height>
-      </size>
-     </property>
-     <property name="placeholderText">
-      <string>Search Data Structure</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3">
-    <widget class="DataStructureTreeView" name="dataBrowserTreeView">
-     <property name="acceptDrops">
-      <bool>true</bool>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="dragEnabled">
-      <bool>false</bool>
-     </property>
-     <property name="dragDropOverwriteMode">
-      <bool>true</bool>
-     </property>
-     <property name="dragDropMode">
-      <enum>QAbstractItemView::DropOnly</enum>
-     </property>
-     <property name="alternatingRowColors">
-      <bool>false</bool>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::SingleSelection</enum>
-     </property>
-     <property name="textElideMode">
-      <enum>Qt::ElideMiddle</enum>
-     </property>
-     <property name="verticalScrollMode">
-      <enum>QAbstractItemView::ScrollPerPixel</enum>
-     </property>
-     <property name="uniformRowHeights">
-      <bool>true</bool>
-     </property>
-     <property name="animated">
-      <bool>true</bool>
-     </property>
-     <property name="allColumnsShowFocus">
-      <bool>true</bool>
-     </property>
-     <property name="expandsOnDoubleClick">
-      <bool>false</bool>
-     </property>
-     <attribute name="headerVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
    <item row="1" column="2">
     <widget class="SVIconPushButton" name="collapseAllBtn">
      <property name="sizePolicy">
@@ -147,6 +73,31 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QtSLineEdit" name="dataStructureSearch">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>16777215</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="placeholderText">
+      <string>Search Data Structure</string>
+     </property>
+    </widget>
+   </item>
    <item row="1" column="1">
     <widget class="SVIconPushButton" name="expandAllBtn">
      <property name="sizePolicy">
@@ -188,6 +139,155 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QTabWidget" name="dataStructureTabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="dataContainersTreeView">
+      <attribute name="title">
+       <string>Data Containers</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <property name="spacing">
+        <number>4</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="DataStructureTreeView" name="dataBrowserTreeView">
+         <property name="acceptDrops">
+          <bool>true</bool>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>false</bool>
+         </property>
+         <property name="dragDropOverwriteMode">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DropOnly</enum>
+         </property>
+         <property name="alternatingRowColors">
+          <bool>false</bool>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::SingleSelection</enum>
+         </property>
+         <property name="textElideMode">
+          <enum>Qt::ElideMiddle</enum>
+         </property>
+         <property name="verticalScrollMode">
+          <enum>QAbstractItemView::ScrollPerPixel</enum>
+         </property>
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+         <property name="animated">
+          <bool>true</bool>
+         </property>
+         <property name="allColumnsShowFocus">
+          <bool>true</bool>
+         </property>
+         <property name="expandsOnDoubleClick">
+          <bool>false</bool>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="montageView">
+      <attribute name="title">
+       <string>Montage View</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <property name="spacing">
+        <number>4</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="DataStructureTreeView" name="montageTreeView">
+         <property name="acceptDrops">
+          <bool>true</bool>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::StyledPanel</enum>
+         </property>
+         <property name="editTriggers">
+          <set>QAbstractItemView::NoEditTriggers</set>
+         </property>
+         <property name="dragEnabled">
+          <bool>false</bool>
+         </property>
+         <property name="dragDropOverwriteMode">
+          <bool>true</bool>
+         </property>
+         <property name="dragDropMode">
+          <enum>QAbstractItemView::DropOnly</enum>
+         </property>
+         <property name="alternatingRowColors">
+          <bool>false</bool>
+         </property>
+         <property name="selectionMode">
+          <enum>QAbstractItemView::SingleSelection</enum>
+         </property>
+         <property name="textElideMode">
+          <enum>Qt::ElideMiddle</enum>
+         </property>
+         <property name="verticalScrollMode">
+          <enum>QAbstractItemView::ScrollPerPixel</enum>
+         </property>
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+         <property name="animated">
+          <bool>true</bool>
+         </property>
+         <property name="allColumnsShowFocus">
+          <bool>true</bool>
+         </property>
+         <property name="expandsOnDoubleClick">
+          <bool>false</bool>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>

From 505152075b3e43000b232c15d30ce5d873a903fc Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sun, 29 Mar 2020 16:47:12 -0400
Subject: [PATCH 192/397] Various small updates to allow users to import data
 as size_t type (#395)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  2 +-
 .../CoreFilters/ImportAsciDataArray.cpp       | 14 +++-
 Source/SIMPLib/DataArrays/DataArray.cpp       | 79 ++++++++++++++++++
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  | 80 +++++++++++++++++++
 .../UI_Files/NumericTypeWidget.ui             |  5 ++
 5 files changed, 178 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 030022350b..aa0236fe5b 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -456,7 +456,7 @@ void CreateGeometry::dataCheck()
     TriangleGeom::Pointer triangle = TriangleGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
-      triangle = TriangleGeom::CreateGeometry(std::static_pointer_cast<SizeTArrayType>(m_TrisPtr.lock()->deepCopy(getInPreflight())),
+      triangle = TriangleGeom::CreateGeometry(std::static_pointer_cast<SharedTriList>(m_TrisPtr.lock()->deepCopy(getInPreflight())),
                                               std::static_pointer_cast<FloatArrayType>(verts->deepCopy(getInPreflight())), SIMPL::Geometry::TriangleGeometry);
     }
     else
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 522afd54b3..29594ec33f 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -534,7 +534,10 @@ void ImportAsciDataArray::dataCheck()
   {
     getDataContainerArray()->createNonPrereqArrayFromPath<BoolArrayType>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
-
+  else if(m_ScalarType == SIMPL::NumericTypes::Type::SizeT)
+  {
+    getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
+  }
   readHeaderPortion();
   
   
@@ -660,6 +663,15 @@ void ImportAsciDataArray::execute()
       m_Array = p;
     }
   }
+  else if(m_ScalarType == SIMPL::NumericTypes::Type::SizeT)
+  {
+    SizeTArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<SizeTArrayType>(this, getCreatedAttributeArrayPath(), cDims);
+    err = readAsciFile<size_t, size_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    if(err >= 0)
+    {
+      m_Array = p;
+    }
+  }
 
   if(err == RBR_FILE_NOT_OPEN)
   {
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index a899c3d15d..fd2777e91e 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -35,6 +35,58 @@
 
 #include "DataArray.hpp"
 
+//  Allow user to force SIMPL_ENDIAN_NO_INTRINSICS in case they aren't available for a
+//  particular platform/compiler combination.
+#ifndef SIMPL_ENDIAN_NO_INTRINSICS
+
+#ifndef __has_builtin      // Optional of course
+#define __has_builtin(x) 0 // Compatibility with non-clang compilers
+#endif
+
+#if defined(_MSC_VER)
+//  Microsoft documents these as being compatible since Windows 95 and specifically
+//  lists runtime library support since Visual Studio 2003 (aka 7.1).
+//  Clang/c2 uses the Microsoft rather than GCC intrinsics, so we check for
+//  defined(_MSC_VER) before defined(__clang__)
+#define SIMPL_ENDIAN_INTRINSIC_MSG "cstdlib _byteswap_ushort, etc."
+#include <cstdlib>
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) _byteswap_ushort(x)
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) _byteswap_ulong(x)
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) _byteswap_uint64(x)
+
+//  GCC and Clang recent versions provide intrinsic byte swaps via builtins
+#elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+#define SIMPL_ENDIAN_INTRINSIC_MSG "__builtin_bswap16, etc."
+// prior to 4.8, gcc did not provide __builtin_bswap16 on some platforms so we emulate it
+// see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
+// Clang has a similar problem, but their feature test macros make it easier to detect
+#if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap16(x)
+#else
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap32((x) << 16)
+#endif
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) __builtin_bswap32(x)
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) __builtin_bswap64(x)
+
+//  Linux systems provide the byteswap.h header, with
+#elif defined(__linux__)
+//  don't check for obsolete forms defined(linux) and defined(__linux) on the theory that
+//  compilers that predefine only these are so old that byteswap.h probably isn't present.
+#define SIMPL_ENDIAN_INTRINSIC_MSG "byteswap.h bswap_16, etc."
+#include <byteswap.h>
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) bswap_16(x)
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) bswap_32(x)
+#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) bswap_64(x)
+
+#else
+#define SIMPL_ENDIAN_NO_INTRINSICS
+#define SIMPL_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
+#endif
+
+#elif !defined(SIMPL_ENDIAN_INTRINSIC_MSG)
+#define SIMPL_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
+#endif // SIMPL_ENDIAN_NO_INTRINSICS
+
 #include <string>
 #include <cstring>
 #include <functional>
@@ -1348,6 +1400,7 @@ int DataArray<T>::readH5Data(hid_t parentId)
   return err;
 }
 
+#if 0
 // -----------------------------------------------------------------------------
 template <typename T>
 void DataArray<T>::byteSwapElements()
@@ -1373,6 +1426,32 @@ void DataArray<T>::byteSwapElements()
   }
 }
 
+#else
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::byteSwapElements()
+{
+  for(size_t i = 0; i < m_Size; ++i)
+  {
+    if(sizeof(T) == 2)
+    {
+      m_Array[i] = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(m_Array[i]);
+    }
+    else if(sizeof(T) == 4)
+    {
+      uint32_t* ptr = reinterpret_cast<uint32_t*>(m_Array + i);
+      *ptr = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(*ptr);
+    }
+    else if(sizeof(T) == 8)
+    {
+      uint64_t* ptr = reinterpret_cast<uint64_t*>(m_Array + i);
+      *ptr = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(*ptr);
+    }
+  }
+}
+
+#endif
+
 template <typename T>
 typename DataArray<T>::iterator DataArray<T>::begin()
 {
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 57cba4375b..2a79043fac 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -38,6 +38,8 @@
 #include <iostream>
 #include <map>
 #include <vector>
+#include <cstring>
+#include <array>
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -1391,6 +1393,83 @@ true);
     }
   }
 
+  template <typename T>
+  void TestByteSwapElementType(T init)
+  {
+    using DataArrayType = DataArray<T>;
+
+    DataArrayType array(8, QString("Test Array"), init);
+
+#if 0
+    std::cout << array.getTypeAsString().toStdString() << std::endl;
+    std::cout << "Input: " << init << "\t Compare Value: " << compare << std::endl;
+    uint8_t* ptr = reinterpret_cast<uint8_t*>(array.getVoidPointer(0));
+    for(size_t i = 0; i < 8 * sizeof(T); i++)
+    {
+      if(i % sizeof(T) == 0)
+      {
+        printf(" ");
+      }
+      printf("%0x", ptr[i]);
+    }
+    printf("\n");
+#endif
+
+    std::array<uint8_t, sizeof(T)> in;
+    ::memcpy(in.data(), &init, sizeof(T));
+
+    // Reverse the bytes into the comparison
+    std::array<uint8_t, sizeof(T)> comp;
+    for(size_t i = 0; i < sizeof(T); i++)
+    {
+      comp[i] = in[sizeof(T) - 1 - i];
+    }
+
+    uint8_t* ptr = reinterpret_cast<uint8_t*>(array.getVoidPointer(0));
+    size_t size = sizeof(T);
+
+    array.byteSwapElements();
+
+    for(size_t i = 0; i < 8; i++)
+    {
+      int result = std::memcmp(comp.data(), ptr, size);
+      DREAM3D_REQUIRED(result, ==, 0)
+      ptr = ptr + size;
+    }
+
+#if 0
+    for(size_t i = 0; i < 8 * sizeof(T); i++)
+    {
+      if(i % sizeof(T) == 0)
+      {
+        printf(" ");
+      }
+      printf("%0x", ptr[i]);
+    }
+    printf("\n");
+    printf("---------------\n");
+#endif
+  }
+
+  // -----------------------------------------------------------------------------
+  void TestByteSwapElements()
+  {
+    TestByteSwapElementType<uint8_t>(0xAB);
+    TestByteSwapElementType<int8_t>(0xAB);
+
+    TestByteSwapElementType<uint16_t>(0xABCD);
+    TestByteSwapElementType<int16_t>(0xABCD);
+
+    TestByteSwapElementType<uint32_t>(0x55ABCDEF);
+    TestByteSwapElementType<int32_t>(0x55ABCDEF);
+
+    TestByteSwapElementType<uint64_t>(0x5566778899ABCDEF);
+    TestByteSwapElementType<int64_t>(0x5566778899ABCDEF);
+
+    TestByteSwapElementType<float>(-151057.0f);
+    TestByteSwapElementType<double>(0x412abe865d8413c8);
+  }
+
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -1415,6 +1494,7 @@ true);
     DREAM3D_REGISTER_TEST(TestWrapPointer())
     DREAM3D_REGISTER_TEST(TestPrintDataArray())
     DREAM3D_REGISTER_TEST(TestSetTuple())
+    DREAM3D_REGISTER_TEST(TestByteSwapElements())
 
 #if REMOVE_TEST_FILES
     DREAM3D_REGISTER_TEST(RemoveTestFiles())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/NumericTypeWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/NumericTypeWidget.ui
index 3c3dd7c16f..5b7d00b0f7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/NumericTypeWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/NumericTypeWidget.ui
@@ -105,6 +105,11 @@
        <string>Bool</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Size_t</string>
+      </property>
+     </item>
     </widget>
    </item>
    <item>

From 3031713e5e422522d18a73fe74af31935cf0baed Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 13 Apr 2020 08:29:46 -0400
Subject: [PATCH 193/397] # Merge H5Support and EbsdLib stand alone libraries

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                                |   17 +-
 Source/H5Support/CMakeLists.txt               |  240 ---
 Source/H5Support/H5Functions.cpp              |   36 -
 Source/H5Support/H5Lite.cpp                   | 1395 --------------
 Source/H5Support/H5Lite.h                     | 1623 -----------------
 Source/H5Support/H5Macros.h                   |   94 -
 Source/H5Support/H5ScopedErrorHandler.cpp     |   50 -
 Source/H5Support/H5ScopedErrorHandler.h       |   41 -
 Source/H5Support/H5ScopedSentinel.cpp         |  202 --
 Source/H5Support/H5ScopedSentinel.h           |  121 --
 Source/H5Support/H5SupportConfiguration.h.in  |   46 -
 Source/H5Support/H5SupportDLLExport.h         |  105 --
 Source/H5Support/H5Utilities.cpp              |  775 --------
 Source/H5Support/H5Utilities.h                |  235 ---
 Source/H5Support/QH5Lite.cpp                  |  406 -----
 Source/H5Support/QH5Lite.h                    |  708 -------
 Source/H5Support/QH5Utilities.cpp             |  289 ---
 Source/H5Support/QH5Utilities.h               |  241 ---
 Source/H5Support/Test/BigHDF5DatasetTest.cpp  |   64 -
 Source/H5Support/Test/CMakeLists.txt          |  105 --
 Source/H5Support/Test/H5LiteTest.cpp          | 1354 --------------
 .../H5Support/Test/H5SupportTestMain.cpp.in   |   53 -
 Source/H5Support/Test/H5UtilitiesTest.cpp     |  535 ------
 Source/H5Support/Test/TestFileLocations.h.in  |   47 -
 Source/H5Support/Test/TestMain.cpp.in         |   54 -
 Source/SIMPLib/CMakeLists.txt                 |   33 +-
 .../CoreFilters/DataContainerReader.cpp       |   13 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       |    3 +
 Source/SIMPLib/DataArrays/NeighborList.hpp    |    2 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |    2 +-
 .../DataContainers/AttributeMatrix.cpp        |    2 +-
 .../SIMPLib/DataContainers/DataArrayProxy.cpp |    2 +-
 .../SIMPLib/DataContainers/DataContainer.cpp  |    2 +-
 .../H5FilterParametersReader.cpp              |    8 +-
 Source/SIMPLib/Geometry/ITransformContainer.h |    2 +-
 Source/SIMPLib/Math/MatrixMath.h              | 1115 ++++++-----
 Source/SIMPLib/Montages/MontageSupport.cpp    |    3 +-
 .../SIMPLib/StatsData/BoundaryStatsData.cpp   |    3 +-
 Source/SIMPLib/StatsData/BoundaryStatsData.h  |    3 -
 Source/SIMPLib/Testing/CMakeLists.txt         |    1 -
 Source/SIMPLib/Utilities/ColorTable.h         |    3 +-
 .../SIMPLib/Utilities/GenericDataParser.hpp   |  339 ++++
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |    2 +-
 Source/SIMPLib/Utilities/SourceList.cmake     |    1 +
 .../Widgets/ImportHDF5TreeModelItem.cpp       |    2 +-
 Wrapping/Python/Pybind11/CMakeLists.txt       |    5 +-
 .../CodeScraper/PythonBindingClass.cpp        |    3 +-
 .../Templates/PluginModuleCodeTemplate.in.cpp |    2 +-
 48 files changed, 975 insertions(+), 9412 deletions(-)
 delete mode 100755 Source/H5Support/CMakeLists.txt
 delete mode 100644 Source/H5Support/H5Functions.cpp
 delete mode 100644 Source/H5Support/H5Lite.cpp
 delete mode 100644 Source/H5Support/H5Lite.h
 delete mode 100755 Source/H5Support/H5Macros.h
 delete mode 100644 Source/H5Support/H5ScopedErrorHandler.cpp
 delete mode 100644 Source/H5Support/H5ScopedErrorHandler.h
 delete mode 100644 Source/H5Support/H5ScopedSentinel.cpp
 delete mode 100644 Source/H5Support/H5ScopedSentinel.h
 delete mode 100755 Source/H5Support/H5SupportConfiguration.h.in
 delete mode 100755 Source/H5Support/H5SupportDLLExport.h
 delete mode 100644 Source/H5Support/H5Utilities.cpp
 delete mode 100644 Source/H5Support/H5Utilities.h
 delete mode 100644 Source/H5Support/QH5Lite.cpp
 delete mode 100644 Source/H5Support/QH5Lite.h
 delete mode 100644 Source/H5Support/QH5Utilities.cpp
 delete mode 100644 Source/H5Support/QH5Utilities.h
 delete mode 100644 Source/H5Support/Test/BigHDF5DatasetTest.cpp
 delete mode 100755 Source/H5Support/Test/CMakeLists.txt
 delete mode 100644 Source/H5Support/Test/H5LiteTest.cpp
 delete mode 100644 Source/H5Support/Test/H5SupportTestMain.cpp.in
 delete mode 100644 Source/H5Support/Test/H5UtilitiesTest.cpp
 delete mode 100755 Source/H5Support/Test/TestFileLocations.h.in
 delete mode 100644 Source/H5Support/Test/TestMain.cpp.in
 create mode 100644 Source/SIMPLib/Utilities/GenericDataParser.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1e27d43aa..2bee24a483 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,18 @@ if(NOT EXISTS "${CMP_SOURCE_DIR}")
   message(FATAL_ERROR "CMP_SOURCE_DIR does not exist at '${CMP_SOURCE_DIR}'")
 endif()
 
+#------------------------------------------------------------------------------
+# If the developer has set another H5Support directory then use that, otherwise look
+# for the H5Support directory at the same level as the SIMPL directory
+if("${H5Support_SOURCE_DIR}" STREQUAL "")
+  set(H5Support_SOURCE_DIR ${SIMPL_PARENT}/H5Support)
+  message(STATUS "H5Support_SOURCE_DIR: ${H5Support_SOURCE_DIR}")
+endif()
+
+if(NOT EXISTS "${H5Support_SOURCE_DIR}")
+  message(FATAL_ERROR "H5Support_SOURCE_DIR does not exist at '${H5Support_SOURCE_DIR}'")
+endif()
+
 
 #------------------------------------------------------------------------------
 # There are several different Release Types that we are going to use.
@@ -376,11 +388,6 @@ install(
     Devel
 )
 
-# -----------------------------------------------------------------------
-# Add in the Necessary HDF5 Support Sources into a library
-# -----------------------------------------------------------------------
-add_subdirectory( ${SIMPLProj_SOURCE_DIR}/Source/H5Support ${PROJECT_BINARY_DIR}/H5Support)
-
 # -----------------------------------------------------------------------
 # Add in the support to host the documentation over a thin-http server
 # -----------------------------------------------------------------------
diff --git a/Source/H5Support/CMakeLists.txt b/Source/H5Support/CMakeLists.txt
deleted file mode 100755
index 46c9f85f8f..0000000000
--- a/Source/H5Support/CMakeLists.txt
+++ /dev/null
@@ -1,240 +0,0 @@
-# ============================================================================
-# Copyright (c) 2009-2015 BlueQuartz Software, LLC
-#
-# 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-# 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 COPYRIGHT HOLDER 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.
-#
-# The code contained herein was partially funded by the followig contracts:
-#    United States Air Force Prime Contract FA8650-07-D-5800
-#    United States Air Force Prime Contract FA8650-10-D-5210
-#    United States Prime Contract Navy N00173-07-C-2068
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-# set project's name
-PROJECT( H5Support VERSION ${SIMPLProj_VERSION_MAJOR}.${SIMPLProj_VERSION_MINOR})
-
-set(PROJECT_CODE_DIR ${PROJECT_SOURCE_DIR}/Source)
-if(NOT PROJECT_RESOURCES_DIR)
-  set(PROJECT_RESOURCES_DIR ${H5Support_SOURCE_DIR}/Resources)
-endif()
-if(NOT DEFINED CMP_SOURCE_DIR)
-  set(CMP_SOURCE_DIR ${H5Support_SOURCE_DIR}/Support/cmp)
-endif()
-
-set(PROJECT_PREFIX "H5Support" CACHE STRING "The Prefix to be used for Preprocessor definitions")
-set(H5Support_INSTALL_FILES 0)
-# -----------------------------------------------------------------------
-# The project generally does NOT want to install headers. See if another
-# project has over ridden that property
-get_property(CMP_PROJECT_INSTALL_HEADERS GLOBAL PROPERTY CMP_PROJECT_INSTALL_HEADERS)
-if("${CMP_PROJECT_INSTALL_HEADERS}" STREQUAL "")
-  set_property(GLOBAL PROPERTY CMP_PROJECT_INSTALL_HEADERS "0")
-  get_property(CMP_PROJECT_INSTALL_HEADERS GLOBAL PROPERTY CMP_PROJECT_INSTALL_HEADERS)
-endif()
-set(H5Support_INSTALL_FILES "${CMP_PROJECT_INSTALL_HEADERS}")
-
-set(H5Support_BUILT_AS_DYNAMIC_LIB)
-if(BUILD_SHARED_LIBS)
-    set(H5Support_BUILT_AS_DYNAMIC_LIB 1)
-endif(BUILD_SHARED_LIBS)
-
-#-------------------------------------------------------------------------------
-# Include the cmp project to perform all the basic configuration tests for the
-# project.
-#-------------------------------------------------------------------------------
-set(CMP_HEADER_DIR ${${PROJECT_NAME}_BINARY_DIR})
-set(CMP_CONFIGURATION_FILE_NAME "${PROJECT_NAME}Configuration.h")
-set(CMP_EXPORT_FILE_NAME "${PROJECT_NAME}DLLExport.h")
-set(CMP_TYPES_FILE_NAME "${PROJECT_NAME}Types.h")
-set(CMP_VERSION_HEADER_FILE_NAME "${PROJECT_NAME}Version.h")
-set(CMP_VERSION_SOURCE_FILE_NAME "${PROJECT_NAME}Version.cpp")
-set(CMP_TOP_HEADER_FILE "${PROJECT_NAME}.h")
-set(CMP_PROJECT_NAMESPACE "${PROJECT_NAME}")
-set(CMP_PROJECT_NAME "${PROJECT_NAME}")
-set(CMP_ENABLE_PLUGINS "0")
-set(CMP_LIB_SEARCH_DIRS "")
-set(CMP_GENERATE_VERSION_STRING 1)
-set(PROJECT_INSTALL_HEADERS "${CMP_PROJECT_INSTALL_HEADERS}")
-
-INCLUDE (${CMP_SOURCE_DIR}/cmpProject.cmake)
-
-#-------------------------------------------------------------------------------
-# Set our H5Lite codes to also compile the Qt API version of H5Lite
-#-------------------------------------------------------------------------------
-set(H5Support_USE_QT 0)
-option(H5Support_INCLUDE_QT_API "Include support for using Qt classes with H5Lite" ON)
-if(H5Support_INCLUDE_QT_API)
-  set(H5Support_USE_QT 1)
-endif()
-MARK_AS_ADVANCED(H5Support_INCLUDE_QT_API)
-MARK_AS_ADVANCED(H5Support_USE_QT)
-
-set(H5Support_SRCS
-    ${H5Support_SOURCE_DIR}/H5Lite.cpp
-    ${H5Support_SOURCE_DIR}/H5Utilities.cpp
-    ${H5Support_SOURCE_DIR}/H5ScopedSentinel.cpp
-    ${H5Support_SOURCE_DIR}/H5ScopedErrorHandler.cpp
-  )
-
-set(H5Support_HDRS
-    ${H5Support_SOURCE_DIR}/H5Lite.h
-    ${H5Support_SOURCE_DIR}/H5Utilities.h
-    ${H5Support_SOURCE_DIR}/H5ScopedSentinel.h
-    ${H5Support_SOURCE_DIR}/H5ScopedErrorHandler.h
-    ${H5Support_SOURCE_DIR}/H5Macros.h
-    ${H5Support_SOURCE_DIR}/H5SupportDLLExport.h
-)
-
-if(H5Support_USE_QT)
-  set(H5Support_SRCS
-    ${H5Support_SRCS}
-    ${H5Support_SOURCE_DIR}/QH5Lite.cpp
-    ${H5Support_SOURCE_DIR}/QH5Utilities.cpp
-  )
-  set(H5Support_HDRS
-    ${H5Support_HDRS}
-    ${H5Support_SOURCE_DIR}/QH5Lite.h
-    ${H5Support_SOURCE_DIR}/QH5Utilities.h
-  )
-endif()
-
-
-#---------------------------------
-# Now configure the main header file.
-configure_file(${H5Support_SOURCE_DIR}/H5SupportConfiguration.h.in
-               ${H5Support_BINARY_DIR}/${CMP_TOP_HEADER_FILE})
-
-cmp_IDE_SOURCE_PROPERTIES( "" "${H5Support_HDRS}" "${H5Support_SRCS}" ${PROJECT_INSTALL_HEADERS})
-
-# --------------------------------------------------------------------
-# Generate a Header file with Compile Version variables
-# --------------------------------------------------------------------
-# set(VERSION_GEN_NAME "H5Support")
-# set(VERSION_GEN_NAMESPACE "H5Support")
-# set(PROJECT_PREFIX "H5Support")
-# set(VERSION_GEN_COMPLETE  "1.0.0")
-# set(VERSION_GEN_VER_MAJOR "1")
-# set(VERSION_GEN_VER_MINOR "0")
-# set(VERSION_GEN_VER_PATCH "0")
-# set(VERSION_GEN_HEADER_FILE_NAME "H5SupportVersion.h")
-
-# configure_file(${CMP_CONFIGURED_FILES_SOURCE_DIR}/cmpVersion.h.in
-#                ${H5Support_BINARY_DIR}/${PROJECT_NAME}/H5SupportVersion.h  )
-# configure_file(${CMP_CONFIGURED_FILES_SOURCE_DIR}/cmpVersion.cpp.in
-#                ${H5Support_BINARY_DIR}/${PROJECT_NAME}/H5SupportVersion.cpp  )
-
-
-set(PROJECT_SRCS
-    ${H5Support_SRCS}
-    ${H5Support_HDRS}
-    ${H5Support_BINARY_DIR}/${CMP_VERSION_SOURCE_FILE_NAME}
-)
-
-add_library(${PROJECT_NAME} ${LIB_TYPE} ${PROJECT_SRCS})
-CMP_AddDefinitions(TARGET ${PROJECT_NAME})
-LibraryProperties( ${PROJECT_NAME}  ${EXE_DEBUG_EXTENSION} )
-CMP_MODULE_INCLUDE_DIRS (TARGET ${PROJECT_NAME} LIBVARS HDF5 Qt5Core)
-
-get_filename_component(TARGET_BINARY_DIR_PARENT ${H5Support_BINARY_DIR} PATH)
-get_filename_component(TARGET_SOURCE_DIR_PARENT ${H5Support_SOURCE_DIR} PATH)
-
-
-TARGET_INCLUDE_DIRECTORIES( ${PROJECT_NAME} PUBLIC
-                              $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
-                              $<BUILD_INTERFACE:${TARGET_SOURCE_DIR_PARENT}>
-                              $<BUILD_INTERFACE:${TARGET_BINARY_DIR_PARENT}>
-                              )
-
-if(BUILD_SHARED_LIBS)
-  if(WIN32)
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "-DH5Support_BUILT_AS_DYNAMIC_LIB")
-  endif(WIN32)
-endif(BUILD_SHARED_LIBS)
-target_link_libraries(${PROJECT_NAME} ${HDF5_C_TARGET_NAME} Qt5::Core )
-
-
-set(install_dir "bin")
-set(lib_install_dir "lib")
-
-if(APPLE)
-  get_property(DREAM3D_PACKAGE_DEST_PREFIX GLOBAL PROPERTY DREAM3D_PACKAGE_DEST_PREFIX)
-  set(install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}bin")
-  set(lib_install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}lib")
-elseif(WIN32)
-  set(install_dir ".")
-  set(lib_install_dir ".")
-endif()
-
-
-INSTALL(TARGETS ${PROJECT_NAME}
-    EXPORT H5SupportTargets
-    COMPONENT Applications
-    RUNTIME DESTINATION ${install_dir}
-    LIBRARY DESTINATION ${lib_install_dir}
-    ARCHIVE DESTINATION lib
-    BUNDLE DESTINATION "."
-)
-
-
-# --------------------------------------------------------------------
-# Allow the generation and installation of a CMake configuration file
-# which makes using SIMPL from another project easier.
-# --------------------------------------------------------------------
-export(EXPORT H5SupportTargets
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
-  NAMESPACE H5Support::
-)
-
-if (H5Support_INSTALL_FILES)
-  install(EXPORT H5SupportTargets
-    FILE
-      ${PROJECT_NAME}Targets.cmake
-    NAMESPACE
-      ${PROJECT_NAME}::
-    DESTINATION
-      ${ConfigPackageLocation}
-  )
-
-  install(FILES 
-      ${CMP_HEADER_DIR}/${CMP_TOP_HEADER_FILE}
-      ${CMP_HEADER_DIR}/${CMP_TYPES_FILE_NAME}
-      ${CMP_HEADER_DIR}/${CMP_CONFIGURATION_FILE_NAME}
-      ${CMP_HEADER_DIR}/${CMP_VERSION_HEADER_FILE_NAME}
-    DESTINATION
-      include/${PROJECT_NAME}
-  )
-
-endif()
-
-
-# ------- Enable the CTest testing. ---------------
-# -------------------------------------------------------------------- 
-# If Testing is enabled, turn on the Unit Tests 
-if(SIMPL_BUILD_TESTING)
-    include(${H5Support_SOURCE_DIR}/Test/CMakeLists.txt)
-endif()
-
-
diff --git a/Source/H5Support/H5Functions.cpp b/Source/H5Support/H5Functions.cpp
deleted file mode 100644
index daee2a72e6..0000000000
--- a/Source/H5Support/H5Functions.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <string.h>
diff --git a/Source/H5Support/H5Lite.cpp b/Source/H5Support/H5Lite.cpp
deleted file mode 100644
index 2753b7a8e3..0000000000
--- a/Source/H5Support/H5Lite.cpp
+++ /dev/null
@@ -1,1395 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <H5Support/H5Lite.h>
-
-#include <cstring>
-
-#if defined(H5Support_NAMESPACE)
-using namespace H5Support_NAMESPACE;
-#endif
-
-/*-------------------------------------------------------------------------
- * Function: find_dataset
- *
- * Purpose: operator function used by H5LTfind_dataset
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: June 21, 2001
- *
- * Comments:
- *
- * Modifications:
- *
- *-------------------------------------------------------------------------
- */
-herr_t find_dataset(hid_t  /*loc_id*/, const char* name, void* op_data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-  /* Define a default zero value for return. This will cause the iterator to continue if
-   * the dataset is not found yet.
-   */
-
-  int32_t ret = 0;
-
-  char* dset_name = reinterpret_cast<char*>(op_data);
-
-  /* Shut the compiler up */
-  // loc_id=loc_id;
-
-  /* Define a positive value for return value if the dataset was found. This will
-   * cause the iterator to immediately return that positive value,
-   * indicating short-circuit success
-   */
-
-  if(strcmp(name, dset_name) == 0)
-  {
-    ret = 1;
-  }
-
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t find_attr(hid_t  /*loc_id*/, const char* name, const H5A_info_t*  /*info*/, void* op_data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-  /* Define a default zero value for return. This will cause the iterator to continue if
-   * the palette attribute is not found yet.
-   */
-
-  int32_t ret = 0;
-
-  char* attr_name = reinterpret_cast<char*>(op_data);
-
-  /* Shut the compiler up */
-  // loc_id=loc_id;
-
-  /* Define a positive value for return value if the attribute was found. This will
-   * cause the iterator to immediately return that positive value,
-   * indicating short-circuit success
-   */
-
-  if(strcmp(name, attr_name) == 0)
-  {
-    ret = 1;
-  }
-
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-//  Protected Constructor
-// -----------------------------------------------------------------------------
-H5Lite::H5Lite()
-= default;
-
-// -----------------------------------------------------------------------------
-//  Protected Destructor
-// -----------------------------------------------------------------------------
-H5Lite::~H5Lite()
-= default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5Lite::disableErrorHandlers()
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  HDF_ERROR_HANDLER_OFF;
-}
-
-// -----------------------------------------------------------------------------
-//  Opens an ID for HDF5 operations
-// -----------------------------------------------------------------------------
-hid_t H5Lite::openId(hid_t loc_id, const std::string& obj_name, H5O_type_t obj_type)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t obj_id = -1;
-
-  switch(obj_type)
-  {
-  case H5O_TYPE_DATASET:
-
-    /* Open the dataset. */
-    if((obj_id = H5Dopen(loc_id, obj_name.c_str(), H5P_DEFAULT)) < 0)
-    {
-      return -1;
-    }
-    break;
-
-  case H5O_TYPE_GROUP:
-
-    /* Open the group. */
-    if((obj_id = H5Gopen(loc_id, obj_name.c_str(), H5P_DEFAULT)) < 0)
-    {
-      return -1;
-    }
-    break;
-
-  default:
-    return -1;
-  }
-
-  return obj_id;
-}
-
-// -----------------------------------------------------------------------------
-//  Closes the given ID
-// -----------------------------------------------------------------------------
-herr_t H5Lite::closeId(hid_t obj_id, int32_t obj_type)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  switch(obj_type)
-  {
-  case H5O_TYPE_DATASET:
-    /* Close the dataset. */
-    if(H5Dclose(obj_id) < 0)
-    {
-      return -1;
-    }
-    break;
-
-  case H5O_TYPE_GROUP:
-    /* Close the group. */
-    if(H5Gclose(obj_id) < 0)
-    {
-      return -1;
-    }
-    break;
-
-  default:
-    return -1;
-  }
-
-  return 1;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Lite::StringForHDFClassType(H5T_class_t classType)
-{
-  if(classType == H5T_NO_CLASS)
-  {
-    return "H5T_NO_CLASS";
-  }
-  if(classType == H5T_INTEGER)
-  {
-    return "H5T_INTEGER";
-  }
-  if(classType == H5T_FLOAT)
-  {
-    return "H5T_FLOAT";
-  }
-  if(classType == H5T_TIME)
-  {
-    return "H5T_TIME";
-  }
-  if(classType == H5T_STRING)
-  {
-    return "H5T_STRING";
-  }
-  if(classType == H5T_BITFIELD)
-  {
-    return "H5T_BITFIELD";
-  }
-  if(classType == H5T_OPAQUE)
-  {
-    return "H5T_OPAQUE";
-  }
-  if(classType == H5T_COMPOUND)
-  {
-    return "H5T_COMPOUND";
-  }
-  if(classType == H5T_REFERENCE)
-  {
-    return "H5T_REFERENCE";
-  }
-  if(classType == H5T_ENUM)
-  {
-    return "H5T_ENUM";
-  }
-  if(classType == H5T_VLEN)
-  {
-    return "H5T_VLEN";
-  }
-  if(classType == H5T_ARRAY)
-  {
-    return "H5T_ARRAY";
-  }
-
-  return "UNKNOWN";
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t H5Lite::HDFTypeFromString(const std::string& value)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  if(value == "H5T_STRING")
-  {
-    return H5T_STRING;
-  }
-
-  if(value == "H5T_NATIVE_INT8")
-  {
-    return H5T_NATIVE_INT8;
-  }
-  if(value == "H5T_NATIVE_UINT8")
-  {
-    return H5T_NATIVE_UINT8;
-  }
-
-  if(value == "H5T_NATIVE_INT16")
-  {
-    return H5T_NATIVE_INT16;
-  }
-  if(value == "H5T_NATIVE_UINT16")
-  {
-    return H5T_NATIVE_UINT16;
-  }
-
-  if(value == "H5T_NATIVE_INT32")
-  {
-    return H5T_NATIVE_INT32;
-  }
-  if(value == "H5T_NATIVE_UINT32")
-  {
-    return H5T_NATIVE_UINT32;
-  }
-
-  if(value == "H5T_NATIVE_INT64")
-  {
-    return H5T_NATIVE_INT64;
-  }
-  if(value == "H5T_NATIVE_UINT64")
-  {
-    return H5T_NATIVE_UINT64;
-  }
-
-  if(value == "H5T_NATIVE_FLOAT")
-  {
-    return H5T_NATIVE_FLOAT;
-  }
-  if(value == "H5T_NATIVE_DOUBLE")
-  {
-    return H5T_NATIVE_DOUBLE;
-  }
-
-  std::cout << "Error: HDFTypeFromString - Unknown Type: " << value << std::endl;
-  return -1;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Lite::StringForHDFType(hid_t dataTypeIdentifier)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  if(dataTypeIdentifier == H5T_STRING)
-  {
-    return "H5T_STRING";
-  }
-
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_INT8) != 0)
-  {
-    return "H5T_NATIVE_INT8";
-  }
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_UINT8) != 0)
-  {
-    return "H5T_NATIVE_UINT8";
-  }
-
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_INT16) != 0)
-  {
-    return "H5T_NATIVE_INT16";
-  }
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_UINT16) != 0)
-  {
-    return "H5T_NATIVE_UINT16";
-  }
-
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_INT32) != 0)
-  {
-    return "H5T_NATIVE_INT32";
-  }
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_UINT32) != 0)
-  {
-    return "H5T_NATIVE_UINT32";
-  }
-
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_INT64) != 0)
-  {
-    return "H5T_NATIVE_INT64";
-  }
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_UINT64) != 0)
-  {
-    return "H5T_NATIVE_UINT64";
-  }
-
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_FLOAT) != 0)
-  {
-    return "H5T_NATIVE_FLOAT";
-  }
-  if(H5Tequal(dataTypeIdentifier, H5T_NATIVE_DOUBLE) != 0)
-  {
-    return "H5T_NATIVE_DOUBLE";
-  }
-
-  std::cout << "Error: HDFTypeForPrimitiveAsStr - Unknown Type: " << dataTypeIdentifier << std::endl;
-  return "Unknown";
-}
-
-// -----------------------------------------------------------------------------
-//  Finds an Attribute given an object to look in
-// -----------------------------------------------------------------------------
-herr_t H5Lite::findAttribute(hid_t loc_id, const std::string& attrName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hsize_t attr_num;
-  herr_t ret = 0;
-
-  attr_num = 0;
-  ret = H5Aiterate(loc_id, H5_INDEX_NAME, H5_ITER_INC, &attr_num, find_attr, (void*)(attrName.c_str()));
-
-  return ret;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool H5Lite::datasetExists(hid_t loc_id, const std::string& dsetName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  H5O_info_t ginfo{};
-  HDF_ERROR_HANDLER_OFF
-  herr_t err = H5Oget_info_by_name(loc_id, dsetName.c_str(), &ginfo, H5P_DEFAULT);
-  HDF_ERROR_HANDLER_ON
-  return err >= 0;
-}
-
-// -----------------------------------------------------------------------------
-//  We assume a null terminated string
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeStringDataset(hid_t loc_id, const std::string& dsetName, size_t size, const char* data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did = -1;
-  hid_t sid = -1;
-  hid_t tid = -1;
-  // size_t  size = 0;
-  herr_t err = -1;
-  herr_t retErr = 0;
-
-  /* create a string data type */
-  if((tid = H5Tcopy(H5T_C_S1)) >= 0)
-  {
-    if(H5Tset_size(tid, size) >= 0)
-    {
-      if(H5Tset_strpad(tid, H5T_STR_NULLTERM) >= 0)
-      {
-        /* Create the data space for the dataset. */
-        if((sid = H5Screate(H5S_SCALAR)) >= 0)
-        {
-          /* Create the dataset. */
-          if((did = H5Dcreate(loc_id, dsetName.c_str(), tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0)
-          {
-            if(nullptr != data)
-            {
-              err = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
-              if(err < 0)
-              {
-                std::cout << "Error Writing String Data" << std::endl;
-                retErr = err;
-              }
-            }
-          }
-          else
-          {
-            //retErr = did;
-            retErr = 0;
-          }
-          CloseH5D(did, err, retErr);
-        }
-        CloseH5S(sid, err, retErr);
-      }
-    }
-    CloseH5T(tid, err, retErr);
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeVectorOfStringsDataset(hid_t loc_id, const std::string& dsetName, const std::vector<std::string>& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t sid = -1;
-  hid_t memspace = -1;
-  hid_t datatype = -1;
-  hid_t did = -1;
-  herr_t err = -1;
-  herr_t retErr = 0;
-
-  hsize_t dims[1] = {data.size()};
-  if((sid = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr)) >= 0)
-  {
-    dims[0] = 1;
-
-    if((memspace = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr)) >= 0)
-    {
-
-      datatype = H5Tcopy(H5T_C_S1);
-      H5Tset_size(datatype, H5T_VARIABLE);
-
-      if((did = H5Dcreate(loc_id, dsetName.c_str(), datatype, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0)
-      {
-
-        //
-        // Select the "memory" to be written out - just 1 record.
-        hsize_t offset[] = {0};
-        hsize_t count[] = {1};
-        H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset, nullptr, count, nullptr);
-        hsize_t m_pos = 0;
-        for(auto v : data)
-        {
-          // Select the file position, 1 record at position 'pos'
-          hsize_t count[] = {1};
-          hsize_t offset[] = {m_pos++};
-          H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, nullptr, count, nullptr);
-          const char* s = v.c_str();
-          err = H5Dwrite(did, datatype, memspace, sid, H5P_DEFAULT, &s);
-          if(err < 0)
-          {
-            std::cout << "Error Writing String Data: " __FILE__ << "(" << __LINE__ << ")" << std::endl;
-            retErr = err;
-          }
-        }
-        CloseH5D(did, err, retErr);
-      }
-      H5Tclose(datatype);
-      CloseH5S(memspace, err, retErr);
-    }
-
-    CloseH5S(sid, err, retErr);
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Writes a string to a HDF5 dataset
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeStringDataset(hid_t loc_id, const std::string& dsetName, const std::string& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did = -1;
-  hid_t sid = -1;
-  hid_t tid = -1;
-  size_t size = 0;
-  herr_t err = -1;
-  herr_t retErr = 0;
-
-  /* create a string data type */
-  if((tid = H5Tcopy(H5T_C_S1)) >= 0)
-  {
-    size = data.size() + 1;
-    if(H5Tset_size(tid, size) >= 0)
-    {
-      if(H5Tset_strpad(tid, H5T_STR_NULLTERM) >= 0)
-      {
-        /* Create the data space for the dataset. */
-        if((sid = H5Screate(H5S_SCALAR)) >= 0)
-        {
-          /* Create or open the dataset. */
-          HDF_ERROR_HANDLER_OFF
-          did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT);
-          HDF_ERROR_HANDLER_ON
-          if(did < 0) // dataset does not exist so create it
-          {
-            did = H5Dcreate(loc_id, dsetName.c_str(), tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-          }
-
-          if(did >= 0)
-          {
-            if(!data.empty())
-            {
-              err = H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data.c_str());
-              if(err < 0)
-              {
-                std::cout << "Error Writing String Data" << std::endl;
-                retErr = err;
-              }
-            }
-          }
-          else
-          {
-            //retErr = did;
-            retErr = 0;
-          }
-          CloseH5D(did, err, retErr);
-          //          err = H5Dclose(did);
-          //          if (err < 0) {
-          //            std::cout << "Error Closing Dataset." << std::endl;
-          //            retErr = err;
-          //          }
-        }
-        CloseH5S(sid, err, retErr);
-        //        err = H5Sclose(sid);
-        //        if ( err < 0) {
-        //          std::cout << "Error closing Dataspace." << std::endl;
-        //          retErr = err;
-        //        }
-      }
-    }
-    CloseH5T(tid, err, retErr);
-    //    err = H5Tclose(tid);
-    //    if (err < 0 ) {
-    //     std::cout << "Error closing DataType" << std::endl;
-    //     retErr = err;
-    //    }
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeStringAttributes(hid_t loc_id, const std::string& objName, const std::map<std::string, std::string>& attributes)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 0;
-  for(const auto & attribute : attributes)
-  {
-    err = H5Lite::writeStringAttribute(loc_id, objName, attribute.first, attribute.second);
-    if(err < 0)
-    {
-      return err;
-    }
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hsize_t H5Lite::getNumberOfElements(hid_t loc_id, const std::string& dsetName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hid_t spaceId;
-  hsize_t numElements = 0;
-  did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT);
-  if(did < 0)
-  {
-    std::cout << "H5Lite.cpp::getNumberOfElements(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-    return -1;
-  }
-  if(did >= 0)
-  {
-    spaceId = H5Dget_space(did);
-    if(spaceId > 0)
-    {
-      int32_t rank = H5Sget_simple_extent_ndims(spaceId);
-      if(rank > 0)
-      {
-        std::vector<hsize_t> dims;
-        dims.resize(rank); // Allocate enough room for the dims
-        err = H5Sget_simple_extent_dims(spaceId, &(dims.front()), nullptr);
-        numElements = 1;
-        for(auto iter = dims.begin(); iter < dims.end(); ++iter)
-        {
-          numElements = numElements * (*iter);
-        }
-      }
-      err = H5Sclose(spaceId);
-      if(err < 0)
-      {
-        std::cout << "Error Closing Data Space" << std::endl;
-        retErr = err;
-      }
-    }
-    else
-    {
-      std::cout << "Error Opening SpaceID" << std::endl;
-      //retErr = spaceId;
-    }
-    err = H5Dclose(did);
-    if(err < 0)
-    {
-      std::cout << "Error Closing Dataset" << std::endl;
-      retErr = err;
-    }
-  }
-  return numElements;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeStringAttribute(hid_t loc_id, const std::string& objName, const std::string& attrName, hsize_t size, const char* data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t attr_type;
-  hid_t attr_space_id;
-  hid_t attr_id;
-  hid_t obj_id;
-  int32_t has_attr;
-  H5O_info_t statbuf{};
-  size_t attr_size;
-  herr_t err = 0;
-  herr_t retErr = 0;
-
-  /* Get the type of object */
-  retErr = H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(retErr >= 0)
-  {
-    /* Open the object */
-    obj_id = H5Lite::openId(loc_id, objName, statbuf.type);
-    if(obj_id >= 0)
-    {
-      /* Create the attribute */
-      attr_type = H5Tcopy(H5T_C_S1);
-      if(attr_type >= 0)
-      {
-        attr_size = size; /* extra null term */
-        err = H5Tset_size(attr_type, attr_size);
-        if(err < 0)
-        {
-          std::cout << "Error Setting H5T Size" << std::endl;
-          retErr = err;
-        }
-        if(err >= 0)
-        {
-          err = H5Tset_strpad(attr_type, H5T_STR_NULLTERM);
-          if(err < 0)
-          {
-            std::cout << "Error adding a null terminator." << std::endl;
-            retErr = err;
-          }
-          if(err >= 0)
-          {
-            attr_space_id = H5Screate(H5S_SCALAR);
-            if(attr_space_id >= 0)
-            {
-              /* Verify if the attribute already exists */
-              has_attr = H5Lite::findAttribute(obj_id, attrName);
-              /* The attribute already exists, delete it */
-              if(has_attr == 1)
-              {
-                err = H5Adelete(obj_id, attrName.c_str());
-                if(err < 0)
-                {
-                  std::cout << "Error Deleting Attribute '" << attrName << "' from Object '" << objName << "'" << std::endl;
-                  retErr = err;
-                }
-              }
-              if(err >= 0)
-              {
-                /* Create and write the attribute */
-                attr_id = H5Acreate(obj_id, attrName.c_str(), attr_type, attr_space_id, H5P_DEFAULT, H5P_DEFAULT);
-                if(attr_id >= 0)
-                {
-                  err = H5Awrite(attr_id, attr_type, data);
-                  if(err < 0)
-                  {
-                    std::cout << "Error Writing String attribute." << std::endl;
-
-                    retErr = err;
-                  }
-                }
-                CloseH5A(attr_id, err, retErr);
-              }
-              CloseH5S(attr_space_id, err, retErr);
-            }
-          }
-        }
-        CloseH5T(attr_type, err, retErr);
-      }
-      else
-      {
-        //retErr = attr_type;
-      }
-      /* Close the object */
-      err = H5Lite::closeId(obj_id, statbuf.type);
-      if(err < 0)
-      {
-        std::cout << "Error Closing Object Id" << std::endl;
-        retErr = err;
-      }
-    }
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Writes a string to an HDF5 Attribute
-// -----------------------------------------------------------------------------
-herr_t H5Lite::writeStringAttribute(hid_t loc_id, const std::string& objName, const std::string& attrName, const std::string& data)
-{
-  return H5Lite::writeStringAttribute(loc_id, objName, attrName, data.size() + 1, data.data());
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a String dataset into a std::string
-// -----------------------------------------------------------------------------
-herr_t H5Lite::readStringDataset(hid_t loc_id, const std::string& dsetName, std::string& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did; // dataset id
-  hid_t tid; // type id
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hsize_t size;
-  data.clear();
-  did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT);
-  if(did < 0)
-  {
-    std::cout << "H5Lite.cpp::readStringDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-    return -1;
-  }
-  /*
-  * Get the datatype.
-  */
-  tid = H5Dget_type(did);
-  if(tid >= 0)
-  {
-    htri_t isVariableString = H5Tis_variable_str(tid); // Test if the string is variable length
-
-    if(isVariableString == 1)
-    {
-      std::vector<std::string> strings;
-      err = readVectorOfStringDataset(loc_id, dsetName, strings); // Read the string
-      if(err < 0 || (strings.size() > 1 && !strings.empty()))
-      {
-        std::cout << "Error Reading string dataset. There were multiple Strings and the program asked for a single string." << std::endl;
-        retErr = err;
-      }
-      else
-      {
-        data.assign(strings[0]);
-      }
-    }
-    else
-    {
-      size = H5Dget_storage_size(did);
-      std::vector<char> buf(static_cast<int>(size + 1), 0x00); // Allocate and Zero and array
-      err = H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, &(buf.front()));
-      if(err < 0)
-      {
-        std::cout << "Error Reading string dataset." << std::endl;
-        retErr = err;
-      }
-      else
-      {
-        data.append(&(buf.front())); // Append the string to the given string
-      }
-    }
-  }
-  CloseH5D(did, err, retErr);
-  CloseH5T(tid, err, retErr);
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::readStringDataset(hid_t loc_id, const std::string& dsetName, char* data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did; // dataset id
-  hid_t tid; // type id
-  herr_t err = 0;
-  herr_t retErr = 0;
-
-  did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT);
-  if(did < 0)
-  {
-    std::cout << "H5Lite.cpp::readStringDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-    return -1;
-  }
-  tid = H5Dget_type(did);
-  if(tid >= 0)
-  {
-    err = H5Dread(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, data);
-    if(err < 0)
-    {
-      std::cout << "Error Reading string dataset." << std::endl;
-      retErr = err;
-    }
-    CloseH5T(tid, err, retErr);
-  }
-  CloseH5D(did, err, retErr);
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::readVectorOfStringDataset(hid_t loc_id, const std::string& dsetName, std::vector<std::string>& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did; // dataset id
-  hid_t tid; // type id
-  herr_t err = 0;
-  herr_t retErr = 0;
-
-  did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT);
-  if(did < 0)
-  {
-    std::cout << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-    return -1;
-  }
-  /*
-  * Get the datatype.
-  */
-  tid = H5Dget_type(did);
-  if(tid >= 0)
-  {
-    hsize_t dims[1] = {0};
-    /*
-    * Get dataspace and allocate memory for read buffer.
-    */
-    hid_t sid = H5Dget_space(did);
-    int ndims = H5Sget_simple_extent_dims(sid, dims, nullptr);
-    if(ndims != 1)
-    {
-      CloseH5S(sid, err, retErr);
-      CloseH5T(tid, err, retErr);
-      std::cout << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Number of dims should be 1 but it was " << ndims << ". Returning early. Is your data file correct?" << std::endl;
-      return -2;
-    }
-    std::vector<char*> rdata(dims[0]);
-    for(int i = 0; i < dims[0]; i++)
-    {
-      rdata[i] = nullptr;
-    }
-
-    /*
-    * Create the memory datatype.
-    */
-    hid_t memtype = H5Tcopy(H5T_C_S1);
-    herr_t status = H5Tset_size(memtype, H5T_VARIABLE);
-
-    /*
-    * Read the data.
-    */
-    status = H5Dread(did, memtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, &(rdata.front()));
-    if(status < 0)
-    {
-      status = H5Dvlen_reclaim(memtype, sid, H5P_DEFAULT, &(rdata.front()));
-      CloseH5S(sid, err, retErr);
-      CloseH5T(tid, err, retErr);
-      CloseH5T(memtype, err, retErr);
-      std::cout << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Error reading Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-      return -3;
-    }
-    /*
-    * copy the data into the vector of strings
-    */
-    data.resize(dims[0]);
-    for(int i = 0; i < dims[0]; i++)
-    {
-      // printf("%s[%d]: %s\n", "VlenStrings", i, rdata[i].p);
-      std::string str = std::string(rdata[i]);
-      data[i] = str;
-    }
-    /*
-    * Close and release resources.  Note that H5Dvlen_reclaim works
-    * for variable-length strings as well as variable-length arrays.
-    * Also note that we must still free the array of pointers stored
-    * in rdata, as H5Tvlen_reclaim only frees the data these point to.
-    */
-    status = H5Dvlen_reclaim(memtype, sid, H5P_DEFAULT, &(rdata.front()));
-    CloseH5S(sid, err, retErr);
-    CloseH5T(tid, err, retErr);
-    CloseH5T(memtype, err, retErr);
-  }
-
-  CloseH5D(did, err, retErr);
-
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a string Attribute from the HDF file
-// -----------------------------------------------------------------------------
-herr_t H5Lite::readStringAttribute(hid_t loc_id, const std::string& objName, const std::string& attrName, std::string& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  /* identifiers */
-  hid_t obj_id;
-  H5O_info_t statbuf{};
-  hid_t attr_id;
-  hid_t attr_type;
-  std::vector<char> attr_out;
-  hsize_t size;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  data.clear();
-  HDF_ERROR_HANDLER_OFF;
-
-  /* Get the type of object */
-  err = H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  /* Open the object */
-  obj_id = H5Lite::openId(loc_id, objName, statbuf.type);
-  if(obj_id >= 0)
-  {
-    attr_id = H5Aopen_by_name(loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT);
-    hid_t attrTypeId = H5Aget_type(attr_id);
-    htri_t isVariableString = H5Tis_variable_str(attrTypeId); // Test if the string is variable length
-    H5Tclose(attrTypeId);
-    if(isVariableString == 1)
-    {
-      data.clear();
-      retErr = -1;
-      CloseH5A(attr_id, err, retErr);
-      return retErr;
-    }
-    if(attr_id >= 0)
-    {
-      size = H5Aget_storage_size(attr_id);
-      attr_out.resize(static_cast<int>(size)); // Resize the vector to the proper length
-      attr_type = H5Aget_type(attr_id);
-      if(attr_type >= 0)
-      {
-        err = H5Aread(attr_id, attr_type, &(attr_out.front()));
-        if(err < 0)
-        {
-          std::cout << "Error Reading Attribute." << std::endl;
-          retErr = err;
-        }
-        else
-        {
-          if(attr_out[size - 1] == 0) // nullptr Terminated string
-          {
-            size = size - 1;
-          }
-          data.append(&(attr_out.front()), size); // Append the data to the passed in string
-        }
-        CloseH5T(attr_type, err, retErr);
-      }
-      CloseH5A(attr_id, err, retErr);
-    }
-    else
-    {
-      //retErr = attr_id;
-    }
-    err = H5Lite::closeId(obj_id, statbuf.type);
-    if(err < 0)
-    {
-      std::cout << "Error Closing Object ID" << std::endl;
-      retErr = err;
-    }
-  }
-  HDF_ERROR_HANDLER_ON;
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a string Attribute from the HDF file
-// -----------------------------------------------------------------------------
-herr_t H5Lite::readStringAttribute(hid_t loc_id, const std::string& objName, const std::string& attrName, char* data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  /* identifiers */
-  hid_t obj_id;
-  H5O_info_t statbuf{};
-  hid_t attr_id;
-  hid_t attr_type;
-  herr_t err = 0;
-  herr_t retErr = 0;
-
-  HDF_ERROR_HANDLER_OFF;
-
-  /* Get the type of object */
-  err = H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  /* Open the object */
-  obj_id = H5Lite::openId(loc_id, objName, statbuf.type);
-  if(obj_id >= 0)
-  {
-    attr_id = H5Aopen_by_name(loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT);
-    if(attr_id >= 0)
-    {
-      attr_type = H5Aget_type(attr_id);
-      if(attr_type >= 0)
-      {
-        err = H5Aread(attr_id, attr_type, data);
-        if(err < 0)
-        {
-          std::cout << "Error Reading Attribute." << std::endl;
-          retErr = err;
-        }
-        CloseH5T(attr_type, err, retErr);
-      }
-      CloseH5A(attr_id, err, retErr);
-    }
-    else
-    {
-      //retErr = attr_id;
-    }
-    err = H5Lite::closeId(obj_id, statbuf.type);
-    if(err < 0)
-    {
-      std::cout << "Error Closing Object ID" << std::endl;
-      retErr = err;
-    }
-  }
-  HDF_ERROR_HANDLER_ON;
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::getDatasetNDims(hid_t loc_id, const std::string& dsetName, hid_t& rank)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did;
-  hid_t sid;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  rank = 0;
-
-  /* Open the dataset. */
-  if((did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT)) < 0)
-  {
-    return -1;
-  }
-
-  /* Get the dataspace handle */
-  sid = H5Dget_space(did);
-  if(sid >= 0)
-  {
-
-    /* Get rank */
-    rank = H5Sget_simple_extent_ndims(sid);
-    if(rank < 0)
-    {
-      //retErr = rank;
-      rank = 0;
-      std::cout << "Error Getting the rank of the dataset:" << std::endl;
-    }
-
-    /* Terminate access to the dataspace */
-    CloseH5S(sid, err, retErr);
-  }
-
-  /* End access to the dataset */
-  err = H5Dclose(did);
-  if(err < 0)
-  {
-    retErr = err;
-    rank = 0;
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Lite::getAttributeNDims(hid_t loc_id, const std::string& objName, const std::string& attrName, hid_t& rank)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  /* identifiers */
-  hid_t obj_id;
-  H5O_info_t statbuf{};
-  hid_t attr_id;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hid_t sid;
-  rank = -1;
-  /* Get the type of object */
-  err = H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(err < 0)
-  {
-    return err;
-  }
-  /* Open the object */
-  obj_id = H5Lite::openId(loc_id, objName, statbuf.type);
-  if(obj_id >= 0)
-  {
-    attr_id = H5Aopen_by_name(loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT);
-    if(attr_id >= 0)
-    {
-      sid = H5Aget_space(attr_id);
-      if(sid >= 0)
-      {
-        rank = H5Sget_simple_extent_ndims(sid);
-        CloseH5S(sid, err, retErr);
-      }
-      CloseH5A(attr_id, err, retErr);
-    }
-    else
-    {
-      //retErr = attr_id;
-    }
-    err = H5Lite::closeId(obj_id, statbuf.type);
-    if(err < 0)
-    {
-      std::cout << "Error Closing Object ID" << std::endl;
-      retErr = err;
-    }
-  }
-
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Returns the type of data stored in the dataset. You MUST use H5Tclose(tid)
-//  on the returned value or resource leaks will occur.
-// -----------------------------------------------------------------------------
-hid_t H5Lite::getDatasetType(hid_t loc_id, const std::string& dsetName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hid_t did = -1;
-  /* Open the dataset. */
-  if((did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT)) < 0)
-  {
-    return -1;
-  }
-  /* Get an identifier for the datatype. */
-  hid_t tid = H5Dget_type(did);
-  CloseH5D(did, err, retErr);
-  if(retErr < 0)
-  {
-    return static_cast<hid_t>(retErr);
-  }
-  return tid;
-}
-
-// -----------------------------------------------------------------------------
-//  Get the dataset information
-// -----------------------------------------------------------------------------
-herr_t H5Lite::getDatasetInfo(hid_t loc_id, const std::string& dsetName, std::vector<hsize_t>& dims, H5T_class_t& classType, size_t& sizeType)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did;
-  hid_t tid;
-  hid_t sid;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hid_t rank = 0;
-
-  /* Open the dataset. */
-  if((did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT)) < 0)
-  {
-    return -1;
-  }
-
-  /* Get an identifier for the datatype. */
-  tid = H5Dget_type(did);
-  if(tid >= 0)
-  {
-    /* Get the class. */
-    classType = H5Tget_class(tid);
-    /* Get the size. */
-    sizeType = H5Tget_size(tid);
-    /* Release the datatype. */
-    err = H5Tclose(tid);
-    if(err < 0)
-    {
-      std::cout << "Error Closing H5Type" << std::endl;
-      retErr = err;
-    }
-  }
-  /* Get the dataspace handle */
-  sid = H5Dget_space(did);
-  if(sid >= 0)
-  {
-    /* Get the Number of Dimensions */
-    rank = H5Sget_simple_extent_ndims(sid);
-    if(rank > 0)
-    {
-      // hsize_t _dims[rank]; // allocate space for the dimensions
-      std::vector<hsize_t> _dims(rank, 0);
-      /* Get dimensions */
-      err = H5Sget_simple_extent_dims(sid, &(_dims.front()), nullptr);
-      if(err < 0)
-      {
-        std::cout << "Error Getting Simple Extents for dataset" << std::endl;
-        retErr = err;
-      }
-      // Copy the dimensions into the dims vector
-      dims.clear(); // Erase everything in the Vector
-      dims.resize(rank);
-      for(hid_t i = 0; i < rank; ++i)
-      {
-        dims[i] = static_cast<uint64_t>(_dims[i]);
-      }
-    }
-    else if(classType == H5T_STRING)
-    {
-      dims.clear(); // Erase everything in the Vector
-      dims.resize(1);
-      dims[0] = sizeType;
-    }
-    /* Terminate access to the dataspace */
-    CloseH5S(sid, err, retErr);
-  }
-
-  /* End access to the dataset */
-  CloseH5D(did, err, retErr);
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  You must close the attributeType argument or resource leaks will occur. Use
-//  H5Tclose(tid); after your call to this method if you do not need the id for
-//   anything.
-// -----------------------------------------------------------------------------
-herr_t H5Lite::getAttributeInfo(hid_t loc_id, const std::string& objName, const std::string& attrName, std::vector<hsize_t>& dims, H5T_class_t& type_class, size_t& type_size, hid_t& tid)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  /* identifiers */
-  hid_t obj_id;
-  H5O_info_t statbuf{};
-  hid_t attr_id;
-  herr_t err = 0;
-  herr_t retErr = 0;
-  hid_t sid;
-  hid_t rank = -1;
-
-  err = H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  /* Open the object */
-  obj_id = H5Lite::openId(loc_id, objName, statbuf.type);
-  if(obj_id >= 0)
-  {
-    attr_id = H5Aopen_by_name(loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT);
-    if(attr_id >= 0)
-    {
-      /* Get an identifier for the datatype. */
-      tid = H5Aget_type(attr_id);
-      if(tid > 0)
-      {
-        /* Get the class. */
-        type_class = H5Tget_class(tid);
-        /* Get the size. */
-        type_size = H5Tget_size(tid);
-        sid = H5Aget_space(attr_id);
-        if(sid >= 0)
-        {
-          if(type_class == H5T_STRING)
-          {
-            rank = 1;
-            dims.resize(1);
-            dims[0] = type_size;
-          }
-          else
-          {
-            rank = H5Sget_simple_extent_ndims(sid);
-            std::vector<hsize_t> _dims(rank, 0);
-            /* Get dimensions */
-            err = H5Sget_simple_extent_dims(sid, &(_dims.front()), nullptr);
-            if(err < 0)
-            {
-              std::cout << "Error Getting Attribute dims" << std::endl;
-              retErr = err;
-            }
-            // Copy the dimensions into the dims vector
-            dims.clear(); // Erase everything in the Vector
-            dims.resize(rank);
-            for(hid_t i = 0; i < rank; ++i)
-            {
-              dims[i] = static_cast<uint64_t>(_dims[i]);
-            }
-          }
-          CloseH5S(sid, err, retErr);
-          sid = 0;
-        }
-      }
-      CloseH5A(attr_id, err, retErr);
-      attr_id = 0;
-    }
-    else
-    {
-      retErr = -1;
-    }
-    err = H5Lite::closeId(obj_id, statbuf.type);
-    if(err < 0)
-    {
-      std::cout << "Error Closing Object ID" << std::endl;
-      retErr = err;
-    }
-  }
-  return retErr;
-}
diff --git a/Source/H5Support/H5Lite.h b/Source/H5Support/H5Lite.h
deleted file mode 100644
index 98212f7de2..0000000000
--- a/Source/H5Support/H5Lite.h
+++ /dev/null
@@ -1,1623 +0,0 @@
-
-//
-//  Copyright (c) 2007, 2010 Michael A. Jackson for BlueQuartz Software
-//  All rights reserved.
-//  BSD License: http://www.opensource.org/licenses/bsd-license.html
-//
-//  This code was written under United States Air Force Contract number
-//                           FA8650-04-C-5229
-//
-
-#pragma once
-
-//--C++ Headers
-#include <typeinfo>
-
-//-- STL Headers
-#include <string>
-#include <iostream>
-#include <vector>
-#include <map>
-#include <mutex>
-
-//-- HDF Headers
-#include <hdf5.h>
-
-//-- H5Support Headers
-#include "H5Support/H5Support.h"
-#include "H5Support/H5Macros.h"
-
-#ifdef H5Support_USE_MUTEX
-#define H5SUPPORT_MUTEX_LOCK()\
-  static std::mutex mutex;\
-  std::lock_guard<std::mutex> lock(mutex);
-#else
-#define H5SUPPORT_MUTEX_LOCK()
-
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-herr_t H5Support_EXPORT find_attr( hid_t loc_id, const char* name, void* op_data);
-
-herr_t H5Support_EXPORT find_dataset( hid_t loc_id, const char* name, void* op_data);
-
-#ifdef __cplusplus
-}
-#endif
-
-#if defined (H5Support_NAMESPACE)
-namespace H5Support_NAMESPACE
-{
-#endif
-
-  /**
-   * @brief Class to bring together some high level methods to read/write data to HDF5 files.
-   * @class H5Lite
-   * @author Mike Jackson
-   * @date April 2007
-   * @version $Revision: 1.3 $
-   */
-  class H5Lite
-  {
-    public:
-      /**
-       * @brief Turns off the global error handler/reporting objects. Note that once
-       * they are turned off using this method they CAN NOT be turned back on. If you
-       * would like to turn them off for a piece of code then surround your code with
-       * the HDF_ERROR_HANDLER_OFF and HDF_ERROR_HANDLER_ON macros defined in
-       * H5Lite.h
-       */
-      static H5Support_EXPORT void disableErrorHandlers();
-
-      /**
-       * @brief Opens an object for HDF5 operations
-       * @param loc_id The parent object that holds the true object we want to open
-       * @param objName The string name of the object
-       * @param obj_type The HDF5_TYPE of object
-       * @return Standard HDF5 Error Conditions
-       */
-      static H5Support_EXPORT hid_t openId( hid_t loc_id, const std::string& obj_name, H5O_type_t obj_type);
-
-      /**
-       * @brief Opens an HDF5 Object
-       * @param obj_id The Object id
-       * @param obj_type Basic Object Type
-       * @return Standard HDF5 Error Conditions
-       */
-      static H5Support_EXPORT herr_t closeId( hid_t obj_id, int32_t obj_type );
-
-      /**
-       * @brief StringForHDFClassType
-       * @param classType
-       * @return
-       */
-      static H5Support_EXPORT std::string StringForHDFClassType(H5T_class_t classType);
-
-      /**
-       * @brief Given one of the HDF Types as a string, this will return the HDF Type
-       * as an hid_t value.
-       * @param value The HDF_Type as a string
-       * @return the hid_t value for the given type. -1 if the string does not match a type.
-       */
-      static H5Support_EXPORT hid_t HDFTypeFromString(const std::string& value);
-
-      /**
-       * @brief Returns a string version of the HDF Type
-       * @param type The HDF5 Type to query
-       * @return
-       */
-      static H5Support_EXPORT std::string StringForHDFType(hid_t dataTypeIdentifier);
-
-      /**
-      * @brief Returns the HDF Type for a given primitive value.
-       * @param value A value to use. Can be anything. Just used to get the type info
-       * from
-       * @return A std::string representing the HDF5 Type
-       */
-      template<typename T>
-      static std::string HDFTypeForPrimitiveAsStr(T value)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        if (typeid(value) == typeid(int8_t)) { return "H5T_NATIVE_INT8"; }
-        if (typeid(value) == typeid(uint8_t)) { return "H5T_NATIVE_UINT8"; }
-
-        if (typeid(value) == typeid(int16_t)) { return "H5T_NATIVE_INT16"; }
-        if (typeid(value) == typeid(uint16_t)) { return "H5T_NATIVE_UINT16"; }
-
-        if (typeid(value) == typeid(int32_t)) { return "H5T_NATIVE_INT32"; }
-        if (typeid(value) == typeid(uint32_t)) { return "H5T_NATIVE_UINT32"; }
-
-        if (typeid(value) == typeid(int64_t)) { return "H5T_NATIVE_INT64"; }
-        if (typeid(value) == typeid(uint64_t)) { return "H5T_NATIVE_UINT64"; }
-
-        if (typeid(value) == typeid(float)) { return "H5T_NATIVE_FLOAT"; }
-        if (typeid(value) == typeid(double)) { return "H5T_NATIVE_DOUBLE"; }
-
-        //if (typeid(value) == typeid(bool)) return "H5T_NATIVE_UINT8";
-
-        std::cout  << "Error: HDFTypeForPrimitiveAsStr - Unknown Type: " << typeid(value).name() << std::endl;
-        return "";
-      }
-
-      /**
-      * @brief Returns the HDF Type for a given primitive value.
-       * @param value A value to use. Can be anything. Just used to get the type info
-       * from
-       * @return The HDF5 native type for the value
-       */
-      template<typename T>
-      static hid_t HDFTypeForPrimitive(T value)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        if (typeid(value) == typeid(float)) { return H5T_NATIVE_FLOAT; }
-        if (typeid(value) == typeid(double)) { return H5T_NATIVE_DOUBLE; }
-
-        if (typeid(value) == typeid(int8_t)) { return H5T_NATIVE_INT8; }
-        if (typeid(value) == typeid(uint8_t)) { return H5T_NATIVE_UINT8; }
-# if CMP_TYPE_CHAR_IS_SIGNED
-        if (typeid(value) == typeid(char)) { return H5T_NATIVE_INT8; }
-#else
-        if (typeid(value) == typeid(char)) { return H5T_NATIVE_UINT8; }
-#endif
-        if (typeid(value) == typeid(signed char)) { return H5T_NATIVE_INT8; }
-        if (typeid(value) == typeid(unsigned char)) { return H5T_NATIVE_UINT8; }
-
-
-        if (typeid(value) == typeid(int16_t)) { return H5T_NATIVE_INT16; }
-        if (typeid(value) == typeid(short)) { return H5T_NATIVE_INT16; }
-        if (typeid(value) == typeid(signed short)) { return H5T_NATIVE_INT16; }
-        if (typeid(value) == typeid(uint16_t)) { return H5T_NATIVE_UINT16; }
-        if (typeid(value) == typeid(unsigned short)) { return H5T_NATIVE_UINT16; }
-
-
-        if (typeid(value) == typeid(int32_t)) { return H5T_NATIVE_INT32; }
-        if (typeid(value) == typeid(uint32_t)) { return H5T_NATIVE_UINT32; }
-#if (CMP_SIZEOF_INT == 4)
-        if (typeid(value) == typeid(int)) { return H5T_NATIVE_INT32; }
-        if (typeid(value) == typeid(signed int)) { return H5T_NATIVE_INT32; }
-        if (typeid(value) == typeid(unsigned int)) { return H5T_NATIVE_UINT32; }
-#endif
-
-
-#if (CMP_SIZEOF_LONG == 4)
-        if (typeid(value) == typeid(long int)) { return H5T_NATIVE_INT32; }
-        if (typeid(value) == typeid(signed long int)) { return H5T_NATIVE_INT32; }
-        if (typeid(value) == typeid(unsigned long int)) { return H5T_NATIVE_UINT32; }
-#elif (CMP_SIZEOF_LONG == 8)
-        if (typeid(value) == typeid(long int)) { return H5T_NATIVE_INT64; }
-        if (typeid(value) == typeid(signed long int)) { return H5T_NATIVE_INT64; }
-        if (typeid(value) == typeid(unsigned long int)) { return H5T_NATIVE_UINT64; }
-#endif
-
-
-#if (CMP_SIZEOF_LONG_LONG == 8)
-        if (typeid(value) == typeid(long long int)) { return H5T_NATIVE_INT64; }
-        if (typeid(value) == typeid(signed long long int)) { return H5T_NATIVE_INT64; }
-        if (typeid(value) == typeid(unsigned long long int)) { return H5T_NATIVE_UINT64; }
-#endif
-        if (typeid(value) == typeid(int64_t)) { return H5T_NATIVE_INT64; }
-        if (typeid(value) == typeid(uint64_t)) { return H5T_NATIVE_UINT64; }
-
-        if (typeid(value) == typeid(bool)) { return H5T_NATIVE_UINT8; }
-
-        std::cout  << "Error: HDFTypeForPrimitive - Unknown Type: " << (typeid(value).name()) << std::endl;
-        const char* name = typeid(value).name();
-        if (nullptr != name && name[0] == 'l' )
-        {
-          std::cout << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t." << std::endl;
-        }
-        return -1;
-      }
-
-
-
-      /**
-       * @brief Inquires if an attribute named attr_name exists attached to the object loc_id.
-       * @param loc_id The location to search
-       * @param attrName The attribute to search for
-       * @return Standard HDF5 Error condition
-       */
-      static H5Support_EXPORT herr_t findAttribute( hid_t loc_id, const std::string& attrName );
-
-      /**
-       * @brief Finds a Data set given a data set name
-       * @param loc_id The location to search
-       * @param name The dataset to search for
-       * @return Standard HDF5 Error condition. Negative=DataSet
-       */
-      static H5Support_EXPORT bool datasetExists( hid_t loc_id, const std::string& dsetName );
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id
-       *
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param dims The dimensions of the dataset
-       * @param data The data to write to the file
-       * @return Standard HDF5 error conditions
-       *
-       * The dimensions of the data sets are usually passed as both a "rank" and
-       * dimensions array. By using a std::vector<hsize_t> that stores the values of
-       * each of the dimensions we can reduce the number of arguments to this method as
-       * the value of the "rank" simply becomes dims.length(). So to create a Dims variable
-       * for a 3D data space of size(x,y,z) = {10,20,30} I would use the following code:
-       * <code>
-       * std::vector<hsize_t> dims;
-       * dims.push_back(10);
-       * dims.push_back(20);
-       * dims.push_back(30);
-       * </code>
-       *
-       * Also when passing data BE SURE that the type of data and the data type match.
-       * For example if I create some data in a std::vector<UInt8Type> I would need to
-       * pass H5T_NATIVE_UINT8 as the dataType.
-       */
-      template <typename T>
-      static herr_t writeVectorDataset(hid_t loc_id, const std::string& dsetName, const std::vector<hsize_t>& dims, const std::vector<T>& data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        herr_t err = -1;
-        hid_t did = -1;
-        hid_t sid = -1;
-        herr_t retErr = 0;
-        if(data.size() == 0) { return 0; }
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data.front());
-        if(dataType == -1)
-        {
-          return -100;
-        }
-        //Create the DataSpace
-        std::vector<uint64_t>::size_type size = dims.size();
-
-        sid = H5Screate_simple(static_cast<int>(size), dims.data(), nullptr);
-        if (sid < 0)
-        {
-          return -101;
-        }
-        // Create the Dataset
-        did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        if ( did >= 0 )
-        {
-          err = H5Dwrite(did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data.data());
-          if (err < 0 )
-          {
-            std::cout << "Error Writing Data" << std::endl;
-            retErr = -102;
-          }
-          err = H5Dclose( did );
-          if (err < 0)
-          {
-            std::cout << "Error Closing Dataset." << std::endl;
-            retErr = -103;
-          }
-        }
-        else
-        {
-          retErr = -104;
-        }
-        /* Terminate access to the data space. */
-        err = H5Sclose( sid );
-        if (err < 0)
-        {
-          std::cout << "Error Closing Dataspace" << std::endl;
-          retErr = -105;
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Writes the data of a pointer to an HDF5 file
-       * @param loc_id The hdf5 object id of the parent
-       * @param dsetName The name of the dataset to write to. This can be a name of Path
-       * @param rank The number of dimensions
-       * @param dims The sizes of each dimension
-       * @param data The data to be written.
-       * @return Standard hdf5 error condition.
-       */
-      template <typename T>
-      static herr_t writePointerDataset (hid_t loc_id,
-                                         const std::string& dsetName,
-                                         int32_t   rank,
-                                         hsize_t* dims,
-                                         T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        herr_t err    = -1;
-        hid_t did     = -1;
-        hid_t sid     = -1;
-        herr_t retErr = 0;
-
-        if(nullptr == data) { return -2;}
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data[0]);
-        if(dataType == -1)
-        {
-          return -1;
-        }
-        //Create the DataSpace
-        std::vector<uint64_t>::size_type size = static_cast<std::vector<uint64_t>::size_type>(rank);
-
-        std::vector<hsize_t> _dims(size, 0);
-        for (int32_t i = 0; i < rank; ++i)
-        {
-          _dims[i] = static_cast<hsize_t>(dims[i]);
-        }
-//  sid = H5Screate_simple( size, &(_dims.front()), nullptr );
-        sid = H5Screate_simple( rank, dims, nullptr);
-        if (sid < 0)
-        {
-          return sid;
-        }
-        // Create the Dataset
-        // This will fail if dsetName contains a "/"!
-        did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        if ( did >= 0 )
-        {
-          err = H5Dwrite( did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data );
-          if (err < 0 )
-          {
-            std::cout << "Error Writing Data '" << dsetName << "'" << std::endl;
-            std::cout << "    rank=" << rank << std::endl;
-            uint64_t totalSize = 1;
-            for(size_t i = 0; i < _dims.size(); ++i)
-            {
-              std::cout << "    dim[" << i << "]=" << _dims[i] << std::endl;
-              totalSize = totalSize * _dims[i];
-            }
-            std::cout << "    TotalElements=" << totalSize << std::endl;
-            std::cout << "    Size of Type (Bytes):" << sizeof(T) << std::endl;
-            std::cout << "    TotalBytes to Write: " << (sizeof(T) * totalSize) << std::endl;
-            retErr = err;
-          }
-          err = H5Dclose( did );
-          if (err < 0)
-          {
-            std::cout << "Error Closing Dataset." << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = did;
-        }
-        /* Terminate access to the data space. */
-        err = H5Sclose( sid );
-        if (err < 0)
-        {
-          std::cout << "Error Closing Dataspace" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief replacePointerDataset
-       * @param loc_id
-       * @param dsetName
-       * @param rank
-       * @param dims
-       * @param data
-       * @return
-       */
-      template <typename T>
-      static herr_t replacePointerDataset (hid_t loc_id,
-                                           const std::string& dsetName,
-                                           int32_t   rank,
-                                           hsize_t* dims,
-                                           T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        herr_t err    = -1;
-        hid_t did     = -1;
-        hid_t sid     = -1;
-        herr_t retErr = 0;
-
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data[0]);
-        if(dataType == -1)
-        {
-          return -1;
-        }
-        //Create the DataSpace
-        std::vector<uint64_t>::size_type size = static_cast<std::vector<uint64_t>::size_type>(rank);
-
-        std::vector<hsize_t> _dims(size, 0);
-        for (int32_t i = 0; i < rank; ++i)
-        {
-          _dims[i] = static_cast<hsize_t>(dims[i]);
-        }
-//  sid = H5Screate_simple( size, &(_dims.front()), nullptr );
-        sid = H5Screate_simple( rank, dims, nullptr);
-        if (sid < 0)
-        {
-          return sid;
-        }
-
-        HDF_ERROR_HANDLER_OFF
-        did = H5Dopen(loc_id, dsetName.c_str(), H5P_DEFAULT );
-        HDF_ERROR_HANDLER_ON
-        if ( did < 0 ) // dataset does not exist so create it
-        {
-          did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        }
-        if ( did >= 0 )
-        {
-          err = H5Dwrite( did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data );
-          if (err < 0 )
-          {
-            std::cout << "Error Writing Data" << std::endl;
-            retErr = err;
-          }
-          err = H5Dclose( did );
-          if (err < 0)
-          {
-            std::cout << "Error Closing Dataset." << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = did;
-        }
-        /* Terminate access to the data space. */
-        err = H5Sclose( sid );
-        if (err < 0)
-        {
-          std::cout << "Error Closing Dataspace" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param dims The dimensions of the dataset
-       * @param rank The number of dimensions to the dataset
-       * @param data The data to write to the file
-       * @return Standard HDF5 error conditions
-       *
-       * The dimensions of the data sets are usually passed as both a "rank" and
-       * dimensions array. By using a std::vector<hsize_t> that stores the values of
-       * each of the dimensions we can reduce the number of arguments to this method as
-       * the value of the "rank" simply becomes dims.length(). So to create a Dims variable
-       * for a 3D data space of size(x,y,z) = {10,20,30} I would use the following code:
-       * <code>
-       * std::vector<hsize_t> dims;
-       * dims.push_back(10);
-       * dims.push_back(20);
-       * dims.push_back(30);
-       * </code>
-       *
-       */
-      template<typename T>
-      static herr_t writeDataset(hid_t loc_id,
-                                 const std::string& dsetName,
-                                 int32_t& rank,
-                                 hsize_t* dims,
-                                 T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        herr_t err = -1;
-        hid_t did = -1;
-        hid_t sid = -1;
-        herr_t retErr = 0;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data[0]);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //Create the DataSpace
-        sid = H5Screate_simple( rank, dims, nullptr );
-        if (sid < 0)
-        {
-          return sid;
-        }
-        // Create the Dataset
-        did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        if ( did >= 0 )
-        {
-          err = H5Dwrite( did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data );
-          if (err < 0 )
-          {
-            std::cout << "Error Writing Data" << std::endl;
-            retErr = err;
-          }
-          err = H5Dclose( did );
-          if (err < 0)
-          {
-            std::cout << "Error Closing Dataset." << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = did;
-        }
-        /* Terminate access to the data space. */
-        err = H5Sclose( sid );
-        if (err < 0)
-        {
-          std::cout << "Error Closing Dataspace" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id.
-       * This version of writeDataset should be used with a single scalar value. If you
-       * need to write an array of values, use the form that takes an std::vector<>
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param value The value to write to the HDF5 dataset
-       * @return Standard HDF5 error conditions
-       */
-      template <typename T>
-      static herr_t writeScalarDataset (hid_t loc_id,
-                                        const std::string& dsetName,
-                                        T& value)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        herr_t err = -1;
-        hid_t did = -1;
-        hid_t sid = -1;
-        herr_t retErr = 0;
-        hsize_t dims = 1;
-        hid_t rank = 1;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(value);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //Create the DataSpace
-        sid = H5Screate_simple( rank, &(dims), nullptr );
-        if (sid < 0)
-        {
-          return sid;
-        }
-        // Create the Dataset
-        did = H5Dcreate (loc_id, dsetName.c_str(), dataType, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-        if ( did >= 0 )
-        {
-          err = H5Dwrite( did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &value );
-          if (err < 0 )
-          {
-            std::cout << "Error Writing Data" << std::endl;
-            retErr = err;
-          }
-          err = H5Dclose( did );
-          if (err < 0)
-          {
-            std::cout << "Error Closing Dataset." << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = did;
-        }
-        /* Terminate access to the data space. */
-        err = H5Sclose( sid );
-        if (err < 0)
-        {
-          std::cout << "Error Closing Dataspace" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Writes a std::string as a HDF Dataset.
-       * @param loc_id The Parent location to write the dataset
-       * @param dsetName The Name to use for the dataset
-       * @param data The actual data to write as a null terminated string
-       * @return Standard HDF5 error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringDataset (hid_t loc_id,
-                                                          const std::string& dsetName,
-                                                          const std::string& data);
-
-      /**
-       * @brief Writes a null terminated 'C String' to an HDF Dataset.
-       * @param loc_id The Parent location to write the dataset
-       * @param dsetName The Name to use for the dataset
-       * @param data const char pointer to write as a null terminated string
-       * @param size The number of characters in the string
-       * @return Standard HDF5 error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringDataset (hid_t loc_id,
-                                                          const std::string& dsetName,
-                                                          size_t size,
-                                                          const char* data);
-
-      /**
-      * @brief
-      * @param loc_id
-      * @param dsetName
-      * @param size
-      * @param data
-      * @return
-      */
-      static H5Support_EXPORT herr_t writeVectorOfStringsDataset(hid_t loc_id,
-                                                                 const std::string& dsetName,
-                                                                 const std::vector<std::string>& data);
-      /**
-       * @brief Writes an Attribute to an HDF5 Object
-       * @param loc_id The Parent Location of the HDFobject that is getting the attribute
-       * @param objName The Name of Object to write the attribute into.
-       * @param attrName The Name of the Attribute
-       * @param rank The number of dimensions in the attribute data
-       * @param dims The Dimensions of the attribute data
-       * @param data The Attribute Data to write as a pointer
-       * @return Standard HDF Error Condition
-       */
-      template <typename T>
-      static herr_t writePointerAttribute(hid_t loc_id,
-                                          const std::string& objName,
-                                          const std::string& attrName,
-                                          int32_t   rank,
-                                          hsize_t* dims,
-                                          T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t      obj_id, sid, attr_id;
-        int32_t        has_attr;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        T test = 0x00;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          std::cout  << "dataType was unknown" << std::endl;
-          return -1;
-        }
-        /* Get the type of object */
-
-        if (H5Oget_info_by_name(loc_id, objName.c_str(), &statbuf, H5P_DEFAULT) < 0)
-        {
-          std::cout << "Error getting object info at loc_id (" << loc_id << ") with object name (" << objName << ")" << std::endl;
-          return -1;
-        }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type );
-        if ( obj_id < 0)
-        {
-          std::cout << "Error opening Object for Attribute operations." << std::endl;
-          return -1;
-        }
-
-        /* Create the data space for the attribute. */
-        hsize_t* dimsPtr = nullptr;
-// size mismatch between hsize_t and size_t
-        std::vector<hsize_t> _dims(rank, 0);
-        for (int32_t i = 0; i < rank; ++i)
-        {
-          _dims[i] = static_cast<hsize_t>(dims[i]);
-        }
-        dimsPtr = &(_dims.front() );
-
-        sid = H5Screate_simple( rank, dimsPtr, nullptr );
-        if ( sid >= 0 )
-        {
-          /* Verify if the attribute already exists */
-          has_attr = H5Lite::findAttribute( obj_id, attrName );
-
-          /* The attribute already exists, delete it */
-          if ( has_attr == 1 )
-          {
-            err = H5Adelete( obj_id, attrName.c_str() );
-            if (err < 0)
-            {
-              std::cout << "Error Deleting Existing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-
-          if ( err >= 0 )
-          {
-            /* Create the attribute. */
-            attr_id = H5Acreate( obj_id, attrName.c_str() , dataType, sid, H5P_DEFAULT, H5P_DEFAULT );
-            if ( attr_id >= 0 )
-            {
-              /* Write the attribute data. */
-              err = H5Awrite( attr_id, dataType, data );
-              if ( err < 0 )
-              {
-                std::cout << "Error Writing Attribute" << std::endl;
-                retErr = err;
-              }
-            }
-            /* Close the attribute. */
-            err = H5Aclose( attr_id );
-            if (err < 0)
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          /* Close the dataspace. */
-          err = H5Sclose( sid );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Dataspace" << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = sid;
-        }
-        /* Close the object */
-        err = H5Lite::closeId( obj_id, statbuf.type );
-        if ( err < 0 )
-        {
-          std::cout << "Error Closing HDF5 Object ID" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-
-      /**
-       * @brief Writes an Attribute to an HDF5 Object
-       * @param loc_id The Parent Location of the HDFobject that is getting the attribute
-       * @param objName The Name of Object to write the attribute into.
-       * @param attrName The Name of the Attribute
-       * @param dims The Dimensions of the data set
-       * @param data The Attribute Data to write
-       * @return Standard HDF Error Condition
-       *
-       */
-      template <typename T>
-      static herr_t writeVectorAttribute(hid_t loc_id,
-                                         const std::string& objName,
-                                         const std::string& attrName,
-                                         std::vector<hsize_t>& dims,
-                                         std::vector<T>& data )
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t      obj_id, sid, attr_id;
-        //hsize_t    dim_size = data.size();
-        int32_t        has_attr;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data.front());
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        /* Get the type of object */
-        if (H5Oget_info_by_name(loc_id, objName.c_str(),  &statbuf, H5P_DEFAULT) < 0)
-        {
-          std::cout << "Error getting object info at loc_id (" << loc_id << ") with object name (" << objName << ")" << std::endl;
-          return -1;
-        }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type );
-        if ( obj_id < 0)
-        {
-          std::cout << "Error opening Object for Attribute operations." << std::endl;
-          return -1;
-        }
-
-        /* Create the data space for the attribute. */
-        hsize_t* dimsPtr = nullptr;
-        //size mismatch between hsize_t and size_t
-        std::vector<uint64_t>::size_type _size = dims.size();
-        //hsize_t _dims[ _size ];
-        std::vector<hsize_t> _dims(_size, 0);
-        for (std::vector<uint64_t>::size_type i = 0; i < _size; ++i)
-        {
-          _dims[i] = static_cast<hsize_t>(dims[i]);
-        }
-        dimsPtr = &(_dims.front() );
-
-        sid = H5Screate_simple( static_cast<int>(dims.size()), dimsPtr, nullptr );
-        if ( sid >= 0 )
-        {
-          /* Verify if the attribute already exists */
-          has_attr = H5Lite::findAttribute( obj_id, attrName );
-
-          /* The attribute already exists, delete it */
-          if ( has_attr == 1 )
-          {
-            err = H5Adelete( obj_id, attrName.c_str() );
-            if (err < 0)
-            {
-              std::cout << "Error Deleting Existing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-
-          if ( err >= 0 )
-          {
-            /* Create the attribute. */
-            attr_id = H5Acreate( obj_id, attrName.c_str() , dataType, sid, H5P_DEFAULT, H5P_DEFAULT );
-            if ( attr_id >= 0 )
-            {
-              /* Write the attribute data. */
-              err = H5Awrite( attr_id, dataType, &(data.front()) );
-              if ( err < 0 )
-              {
-                std::cout << "Error Writing Attribute" << std::endl;
-                retErr = err;
-              }
-            }
-            /* Close the attribute. */
-            err = H5Aclose( attr_id );
-            if (err < 0)
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          /* Close the dataspace. */
-          err = H5Sclose( sid );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Dataspace" << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = sid;
-        }
-        /* Close the object */
-        err = H5Lite::closeId( obj_id, statbuf.type );
-        if ( err < 0 )
-        {
-          std::cout << "Error Closing HDF5 Object ID" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Writes a string as a null terminated attribute.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The name of the Attribute
-       * @param data The string to write as the attribute
-       * @return Standard HDF error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringAttribute(hid_t loc_id,
-                                                           const std::string& objName,
-                                                           const std::string& attrName,
-                                                           const std::string& data);
-      /**
-       * @brief Writes a null terminated string as an attribute
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The name of the Attribute
-       * @param size The number of characters  in the string
-       * @param data pointer to a const char array
-       * @return Standard HDF error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringAttribute(hid_t loc_id,
-                                                           const std::string& objName,
-                                                           const std::string& attrName,
-                                                           hsize_t size,
-                                                           const char* data);
-
-
-      /**
-       * @brief Writes attributes that all have a data type of STRING. The first value
-       * in each set is the key, the second is the actual value of the attribute.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attributes The attributes to be written where the first value is the name
-       * of the attribute, and the second is the actual value of the attribute.
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t writeStringAttributes(hid_t loc_id,
-                                                           const std::string& objName,
-                                                           const std::map<std::string, std::string>& attributes);
-
-      /**
-       * @brief Returns the total number of elements in the supplied dataset
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A std::vector<T>. Note the vector WILL be resized to fit the data.
-       * The best idea is to just allocate the vector but not to size it. The method
-       * will size it for you.
-       * @return Number of elements in dataset
-       */
-      static H5Support_EXPORT hsize_t getNumberOfElements(hid_t loc_id,
-                                      const std::string& dsetName);
-
-      /**
-       * @brief Writes an attribute to the given object. This method is designed with
-       * a Template parameter that represents a primitive value. If you need to write
-       * an array, please use the other over loaded method that takes a vector.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The  name of the attribute
-       * @param data The data to be written as the attribute
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t  writeScalarAttribute(hid_t loc_id,
-                                          const std::string& objName,
-                                          const std::string& attrName,
-                                          T data )
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t      obj_id, sid, attr_id;
-        int32_t        has_attr;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hsize_t dims = 1;
-        hid_t rank = 1;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.c_str(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        {
-          std::cout << "Error getting object info at loc_id (" << loc_id << ") with object name (" << objName << ")" << std::endl;
-          return err;
-        }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type );
-        if ( obj_id < 0)
-        {
-          std::cout << "Error opening Object for Attribute operations." << std::endl;
-          return obj_id;
-        }
-
-        /* Create the data space for the attribute. */
-        sid = H5Screate_simple( rank, &dims, nullptr );
-        if ( sid >= 0 )
-        {
-          /* Verify if the attribute already exists */
-          has_attr = H5Lite::findAttribute( obj_id, attrName );
-
-          /* The attribute already exists, delete it */
-          if ( has_attr == 1 )
-          {
-            err = H5Adelete( obj_id, attrName.c_str() );
-            if (err < 0)
-            {
-              std::cout << "Error Deleting Existing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-
-          if ( err >= 0 )
-          {
-            /* Create the attribute. */
-            attr_id = H5Acreate( obj_id, attrName.c_str() , dataType, sid, H5P_DEFAULT, H5P_DEFAULT );
-            if ( attr_id >= 0 )
-            {
-              /* Write the attribute data. */
-              err = H5Awrite( attr_id, dataType, &data );
-              if ( err < 0 )
-              {
-                std::cout << "Error Writing Attribute" << std::endl;
-                retErr = err;
-              }
-            }
-            /* Close the attribute. */
-            err = H5Aclose( attr_id );
-            if (err < 0)
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          /* Close the dataspace. */
-          err = H5Sclose( sid );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Dataspace" << std::endl;
-            retErr = err;
-          }
-        }
-        else
-        {
-          retErr = sid;
-        }
-
-        /* Close the object */
-        err = H5Lite::closeId( obj_id, statbuf.type );
-        if ( err < 0 )
-        {
-          std::cout << "Error Closing HDF5 Object ID" << std::endl;
-          retErr = err;
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads data from the HDF5 File into a preallocated array.
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A Pointer to the PreAllocated Array of Data
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t readPointerDataset(hid_t loc_id,
-                                       const std::string& dsetName,
-                                       T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t did;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t dataType = 0;
-        T test = 0x00;
-        dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          std::cout  << "dataType was not supported." << std::endl;
-          return -10;
-        }
-        if (loc_id < 0)
-        {
-          std::cout  << "loc_id was Negative: This is not allowed." << std::endl;
-          return -2;
-        }
-        if (nullptr == data)
-        {
-          std::cout  << "The Pointer to hold the data is nullptr. This is NOT allowed." << std::endl;
-          return -3;
-        }
-        did = H5Dopen( loc_id, dsetName.c_str(), H5P_DEFAULT );
-        if ( did < 0 )
-        {
-          std::cout  << " Error opening Dataset: " << did << std::endl;
-          return -1;
-        }
-        if ( did >= 0 )
-        {
-          err = H5Dread(did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, data );
-          if (err < 0)
-          {
-            std::cout  << "Error Reading Data." << std::endl;
-            retErr = err;
-          }
-          err = H5Dclose( did );
-          if (err < 0 )
-          {
-            std::cout  << "Error Closing Dataset id" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads data from the HDF5 File into an std::vector<T> object. If the dataset
-       * is very large this can be an expensive method to use. It is here for convenience
-       * using STL with hdf5.
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A std::vector<T>. Note the vector WILL be resized to fit the data.
-       * The best idea is to just allocate the vector but not to size it. The method
-       * will size it for you.
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t readVectorDataset(hid_t loc_id,
-                                      const std::string& dsetName,
-                                      std::vector<T>& data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t   did;
-        herr_t  err = 0;
-        herr_t retErr = 0;
-        hid_t spaceId;
-        hid_t dataType;
-        T test = static_cast<T>(0x00);
-        dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        did = H5Dopen( loc_id, dsetName.c_str(), H5P_DEFAULT);
-        if ( did < 0 )
-        {
-          std::cout << "H5Lite.h::readVectorDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-          return -1;
-        }
-        if ( did >= 0 )
-        {
-          spaceId = H5Dget_space(did);
-          if ( spaceId > 0 )
-          {
-            int32_t rank = H5Sget_simple_extent_ndims(spaceId);
-            if (rank > 0)
-            {
-              std::vector<hsize_t> dims;
-              dims.resize(rank);// Allocate enough room for the dims
-              err = H5Sget_simple_extent_dims(spaceId, &(dims.front()), nullptr);
-              hsize_t numElements = 1;
-              for (std::vector<hsize_t>::iterator iter = dims.begin(); iter < dims.end(); ++iter )
-              {
-                numElements = numElements * (*iter);
-              }
-              // std::cout << "NumElements: " << numElements << std::endl;
-              //Resize the vector
-              data.resize( static_cast<int>(numElements) );
-              // for (uint32_t i = 0; i<numElements; ++i) { data[i] = 55555555;  }
-              err = H5Dread(did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &( data.front() ) );
-              if (err < 0)
-              {
-                std::cout << "Error Reading Data.'" << dsetName << "'" << std::endl;
-                retErr = err;
-              }
-            }
-            err = H5Sclose(spaceId);
-            if (err < 0 )
-            {
-              std::cout << "Error Closing Data Space" << std::endl;
-              retErr = err;
-            }
-          }
-          else
-          {
-            std::cout << "Error Opening SpaceID" << std::endl;
-            retErr = spaceId;
-          }
-          err = H5Dclose( did );
-          if (err < 0 )
-          {
-            std::cout << "Error Closing Dataset" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads a dataset that consists of a single scalar value
-       * @param loc_id The HDF5 file or group id
-       * @param dsetName The name or path to the dataset to read
-       * @param data The variable to store the data into
-       * @return HDF error condition.
-       */
-      template <typename T>
-      static herr_t readScalarDataset(hid_t loc_id,
-                                      const std::string& dsetName,
-                                      T& data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        hid_t did = 0;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t spaceId = 0;
-
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(data);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        /* Open the dataset. */
-        did = H5Dopen( loc_id, dsetName.c_str(), H5P_DEFAULT );
-        if ( did < 0 )
-        {
-          std::cout << "H5Lite.h::readScalarDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-          return -1;
-        }
-        if ( did >= 0 )
-        {
-          spaceId = H5Dget_space(did);
-          if ( spaceId > 0 )
-          {
-            err = H5Dread(did, dataType, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data );
-            if (err < 0)
-            {
-              std::cout << "Error Reading Data at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-              retErr = err;
-            }
-
-            err = H5Sclose(spaceId);
-            if (err < 0 )
-            {
-              std::cout << "Error Closing Data Space at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = spaceId;
-          }
-          err = H5Dclose( did );
-          if (err < 0 )
-          {
-            std::cout << "Error Closing Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-
-      /**
-       * @brief Reads a string dataset into the supplied string. Any data currently in the 'data' variable
-       * is cleared first before the new data is read into the string.
-       * @param loc_id The parent group that holds the data object to read
-       * @param dsetName The name of the dataset.
-       * @param data The std::string to hold the data
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t readStringDataset(hid_t loc_id,
-                                                       const std::string& dsetName,
-                                                       std::string& data);
-
-
-
-      /**
-       * @brief reads a null terminated string dataset into the supplied buffer. The buffer
-       * should be already preallocated.
-       * @param loc_id The parent group that holds the data object to read
-       * @param dsetName The name of the dataset.
-       * @param data pointer to the buffer
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t readStringDataset(hid_t loc_id,
-                                                       const std::string& dsetName,
-                                                       char* data);
-      /**
-        * @brief
-        * @param loc_id
-        * @param dsetName
-        * @param data
-        * @return
-        */
-      static H5Support_EXPORT herr_t readVectorOfStringDataset(hid_t loc_id,
-                                                               const std::string& dsetName,
-                                                               std::vector<std::string>& data);
-      /**
-       * @brief Reads an Attribute from an HDF5 Object.
-       *
-       * Use this method if you already know the datatype of the attribute. If you do
-       * not know this already then use another form of this method.
-       *
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data
-       * @return Standard HDF Error condition
-       */
-      template <typename T>
-      static herr_t readVectorAttribute(hid_t loc_id,
-                                        const std::string& objName,
-                                        const std::string& attrName,
-                                        std::vector<T>& data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        hid_t tid;
-        T test = 0x00;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //std::cout << "   Reading Vector Attribute at Path '" << objName << "' with Key: '" << attrName << "'" << std::endl;
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.c_str(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            //Need to allocate the array size
-            H5T_class_t type_class;
-            size_t type_size;
-            std::vector<hsize_t> dims;
-            err = H5Lite::getAttributeInfo(loc_id, objName, attrName, dims, type_class, type_size, tid);
-            hsize_t numElements = 1;
-            for (std::vector<hsize_t>::iterator iter = dims.begin(); iter < dims.end(); ++iter )
-            {
-              numElements *= *(iter);
-            }
-            //std::cout << "    Vector Attribute has " << numElements << " elements." << std::endl;
-            data.resize( static_cast<signed int>(numElements) );
-            err = H5Aread( attr_id, dataType, &(data.front()) );
-            if ( err < 0 )
-            {
-              std::cout << "Error Reading Attribute." << err << std::endl;
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = attr_id;
-          }
-          err = H5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Object" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads a scalar attribute value from a dataset
-       * @param loc_id
-       * @param objName The name of the dataset
-       * @param attrName The name of the Attribute
-       * @param data The preallocated memory for the variable to be stored into
-       * @return Standard HDF5 error condition
-       */
-      template <typename T>
-      static herr_t  readScalarAttribute(hid_t loc_id,
-                                         const std::string& objName,
-                                         const std::string& attrName,
-                                         T& data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        T test = 0x00;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //std::cout << "Reading Scalar style Attribute at Path '" << objName << "' with Key: '" << attrName << "'" << std::endl;
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.c_str(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            err = H5Aread( attr_id, dataType, &data );
-            if ( err < 0 )
-            {
-              std::cout << "Error Reading Attribute." << std::endl;
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = attr_id;
-          }
-          err = H5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Object" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads the Attribute into a pre-allocated pointer
-       * @param loc_id
-       * @param objName The name of the dataset
-       * @param attrName The name of the Attribute
-       * @param data The preallocated memory for the variable to be stored into
-       * @return Standard HDF5 error condition
-       */
-      template <typename T>
-      static herr_t readPointerAttribute(hid_t loc_id,
-                                         const std::string& objName,
-                                         const std::string& attrName,
-                                         T* data)
-      {
-        H5SUPPORT_MUTEX_LOCK()
-
-        /* identifiers */
-        hid_t      obj_id;
-        H5O_info_t statbuf;
-        herr_t err = 0;
-        herr_t retErr = 0;
-        hid_t attr_id;
-        T test = 0x00;
-        hid_t dataType = H5Lite::HDFTypeForPrimitive(test);
-        if (dataType == -1)
-        {
-          return -1;
-        }
-        //std::cout << "   Reading Vector Attribute at Path '" << objName << "' with Key: '" << attrName << "'" << std::endl;
-        /* Get the type of object */
-        err = H5Oget_info_by_name(loc_id, objName.c_str(),  &statbuf, H5P_DEFAULT);
-        if (err < 0)
-        { return err; }
-        /* Open the object */
-        obj_id = H5Lite::openId( loc_id, objName, statbuf.type);
-        if ( obj_id >= 0)
-        {
-          attr_id = H5Aopen_by_name( loc_id, objName.c_str(), attrName.c_str(), H5P_DEFAULT, H5P_DEFAULT );
-          if ( attr_id >= 0 )
-          {
-            err = H5Aread( attr_id, dataType, data);
-            if ( err < 0 )
-            {
-              std::cout << "Error Reading Attribute." << err << std::endl;
-              retErr = err;
-            }
-            err = H5Aclose( attr_id );
-            if ( err < 0 )
-            {
-              std::cout << "Error Closing Attribute" << std::endl;
-              retErr = err;
-            }
-          }
-          else
-          {
-            retErr = attr_id;
-          }
-          err = H5Lite::closeId( obj_id, statbuf.type );
-          if ( err < 0 )
-          {
-            std::cout << "Error Closing Object" << std::endl;
-            retErr = err;
-          }
-        }
-        return retErr;
-      }
-
-      /**
-       * @brief Reads a string attribute from an HDF object
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data
-       * @return Standard HDF Error condition
-       */
-      static H5Support_EXPORT herr_t readStringAttribute(hid_t loc_id,
-                                                         const std::string& objName,
-                                                         const std::string& attrName,
-                                                         std::string& data);
-
-      /**
-       * @brief Reads a string attribute from an HDF object into a precallocated buffer
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data into
-       * @return Standard HDF Error condition
-       */
-      static H5Support_EXPORT herr_t readStringAttribute(hid_t loc_id,
-                                                         const std::string& objName,
-                                                         const std::string& attrName,
-                                                         char* data);
-      /**
-       * @brief Returns the number of dimensions for a given attribute
-       * @param loc_id The HDF5 id of the parent group/file for the objName
-       * @param objName The name of the dataset
-       * @param attrName The name of the attribute
-       * @param rank (out) Number of dimensions is store into this variable
-       */
-      static H5Support_EXPORT herr_t getAttributeNDims(hid_t loc_id, const std::string& objName, const std::string& attrName, hid_t& rank);
-
-      /**
-       * @brief Returns the number of dimensions for a given dataset
-       * @param loc_id The HDF5 id of the parent group/file for the objName
-       * @param objName The name of the dataset
-       * @param rank (out) Number of dimensions is store into this variable
-       */
-      static H5Support_EXPORT herr_t getDatasetNDims(hid_t loc_id, const std::string& objName, hid_t& rank);
-
-      /**
-       * @brief Returns the H5T value for a given dataset.
-       *
-       * Returns the type of data stored in the dataset. You MUST use H5Tclose(tid)
-       * on the returned value or resource leaks will occur.
-       * @param loc_id A Valid HDF5 file or group id.
-       * @param dsetName Path to the dataset
-       * @return
-       */
-      static H5Support_EXPORT hid_t getDatasetType(hid_t loc_id, const std::string& dsetName);
-
-      /**
-       * @brief Get the information about a dataset.
-       *
-       * @param loc_id The parent location of the Dataset
-       * @param dsetName The name of the dataset
-       * @param dims A std::vector that will hold the sizes of the dimensions
-       * @param type_class The HDF5 class type
-       * @param type_size THe HDF5 size of the data
-       * @return Negative value is Failure. Zero or Positive is success;
-       */
-      static H5Support_EXPORT herr_t getDatasetInfo( hid_t loc_id,
-                                                     const std::string& dsetName,
-                                                     std::vector<hsize_t>& dims,
-                                                     H5T_class_t& classType,
-                                                     size_t& sizeType );
-
-      /**
-       * @brief Returns the information about an attribute.
-       * You must close the attributeType argument or resource leaks will occur. Use
-       *  H5Tclose(attr_type); after your call to this method if you do not need the id for
-       *   anything.
-       * @param loc_id The parent location of the Dataset
-       * @param objName The name of the dataset
-       * @param attr_name The name of the attribute
-       * @param dims A std::vector that will hold the sizes of the dimensions
-       * @param type_class The HDF5 class type
-       * @param type_size THe HDF5 size of the data
-       * @param attr_type The Attribute ID - which needs to be closed after you are finished with the data
-       * @return
-       */
-      static H5Support_EXPORT herr_t getAttributeInfo(hid_t loc_id,
-                                                      const std::string& objName,
-                                                      const std::string& attrName,
-                                                      std::vector<hsize_t>& dims,
-                                                      H5T_class_t& type_class,
-                                                      size_t& type_size,
-                                                      hid_t& tid);
-
-
-
-
-// -----------------------------------------------------------------------------
-    protected:
-      H5Lite();
-      ~H5Lite();
-
-
-    private:
-
-  };
-
-
-#if defined (H5Support_NAMESPACE)
-}
-#endif
-
diff --git a/Source/H5Support/H5Macros.h b/Source/H5Support/H5Macros.h
deleted file mode 100755
index 3f1c7d5d27..0000000000
--- a/Source/H5Support/H5Macros.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-
-//-- HDF Headers
-#include <hdf5.h>
-
-#include "H5Support/H5Support.h"
-#include "H5Support/H5SupportDLLExport.h"
-
-
-#define CloseH5A(aid, err, retError)\
-  err = H5Aclose( attr_id );\
-  if (err<0) {std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): " << "Error Closing Attribute." << std::endl;retErr = err;}
-
-#define CloseH5D(did, err, retError)\
-  err = H5Dclose(did);\
-  if (err < 0) { std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error Closing Dataset: " << dsetName << " did=" << did << " retError=" << retError << std::endl; retError = err;}
-
-#define CloseH5S(sid, err, retError)\
-  err = H5Sclose(sid); \
-  if ( err < 0) {std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error closing Dataspace." << std::endl;retErr = err;}
-
-#define CloseH5T(tid, err, re)\
-  err = H5Tclose(tid);\
-  if (err < 0 ) {std::cout << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error closing DataType" << std::endl; re = err;}
-
-#define HDF_ERROR_HANDLER_OFF\
-  herr_t (*_oldHDF_error_func)(hid_t, void *);\
-  void *_oldHDF_error_client_data;\
-  H5Eget_auto(H5E_DEFAULT, &_oldHDF_error_func, &_oldHDF_error_client_data);\
-  H5Eset_auto(H5E_DEFAULT, nullptr, nullptr);
-
-#define HDF_ERROR_HANDLER_ON  H5Eset_auto(H5E_DEFAULT, _oldHDF_error_func, _oldHDF_error_client_data);
-
-
-#define UNUSED(x) ((void)(x));
-
-
-#define QCloseH5A(aid, err, retError)\
-  err = H5Aclose( attr_id );\
-  if (err<0) {qDebug() << "File: " << __FILE__ << "(" << __LINE__ << "): " << "Error Closing Attribute.";retErr = err;}
-
-#define QCloseH5D(did, err, retError)\
-  err = H5Dclose(did);\
-  if (err < 0) { qDebug()  << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error Closing Dataset: " << dsetName << " did=" << did << " retError=" << retError; retError = err;}
-
-#define QCloseH5S(sid, err, retError)\
-  err = H5Sclose(sid); \
-  if ( err < 0) {qDebug()  << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error closing Dataspace.";retErr = err;}
-
-#define QCloseH5T(tid, err, re)\
-  err = H5Tclose(tid);\
-  if (err < 0 ) {qDebug() << "File: " << __FILE__ << "(" << __LINE__ << "): "<< "Error closing DataType"; re = err;}
-
-
-
-
-
-
diff --git a/Source/H5Support/H5ScopedErrorHandler.cpp b/Source/H5Support/H5ScopedErrorHandler.cpp
deleted file mode 100644
index 71e11219fe..0000000000
--- a/Source/H5Support/H5ScopedErrorHandler.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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 "H5ScopedErrorHandler.h"
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedErrorHandler::H5ScopedErrorHandler()
-{
-	H5Eget_auto(H5E_DEFAULT, &_oldHDF_error_func, &_oldHDF_error_client_data);
-	H5Eset_auto(H5E_DEFAULT, nullptr, nullptr);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedErrorHandler::~H5ScopedErrorHandler()
-{
-	H5Eset_auto(H5E_DEFAULT, _oldHDF_error_func, _oldHDF_error_client_data);
-}
\ No newline at end of file
diff --git a/Source/H5Support/H5ScopedErrorHandler.h b/Source/H5Support/H5ScopedErrorHandler.h
deleted file mode 100644
index 18a0413bd1..0000000000
--- a/Source/H5Support/H5ScopedErrorHandler.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#pragma once
-
-#include <hdf5.h>
-
-#include "H5Support/H5Support.h"
-
-#if defined (H5Support_NAMESPACE)
-namespace H5Support_NAMESPACE
-{
-#endif
-
-/**
-* @brief This class is meant to disable the normal HDF5 error handlers until the
-* instance goes out of scope the original error handlers will be put back in
-* place
-*/
-class H5Support_EXPORT H5ScopedErrorHandler
-{
-
-  public:
-  
-    H5ScopedErrorHandler();
-    
-    ~H5ScopedErrorHandler();
-    
-  private:
-    herr_t (*_oldHDF_error_func)(hid_t, void *);
-    void *_oldHDF_error_client_data;
-
-  public:
-    H5ScopedErrorHandler(const H5ScopedErrorHandler&) = delete; // Copy Constructor Not Implemented
-    H5ScopedErrorHandler(H5ScopedErrorHandler&&) = delete;      // Move Constructor Not Implemented
-    H5ScopedErrorHandler& operator=(const H5ScopedErrorHandler&) = delete; // Copy Assignment Not Implemented
-    H5ScopedErrorHandler& operator=(H5ScopedErrorHandler&&) = delete;      // Move Assignment Not Implemented
-};
-
-
-#if defined (H5Support_NAMESPACE)
-}
-#endif
-
diff --git a/Source/H5Support/H5ScopedSentinel.cpp b/Source/H5Support/H5ScopedSentinel.cpp
deleted file mode 100644
index 2405d49390..0000000000
--- a/Source/H5Support/H5ScopedSentinel.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "H5ScopedSentinel.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedFileSentinel::H5ScopedFileSentinel(hid_t* fileId, bool turnOffErrors)
-: m_FileId(fileId)
-, m_TurnOffErrors(turnOffErrors)
-{
-  if(m_TurnOffErrors)
-  {
-    H5Eget_auto(H5E_DEFAULT, &_oldHDF_error_func, &_oldHDF_error_client_data);
-    H5Eset_auto(H5E_DEFAULT, nullptr, nullptr);
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedFileSentinel::~H5ScopedFileSentinel()
-{
-  if(m_TurnOffErrors)
-  {
-    H5Eset_auto(H5E_DEFAULT, _oldHDF_error_func, _oldHDF_error_client_data);
-  }
-  for(auto temp : m_Groups)
-  {
-    if(*temp > 0)
-    {
-      H5Gclose(*temp);
-      *temp = -1;
-    }
-  }
-
-  if(*m_FileId > 0)
-  {
-    H5Utilities::closeFile(*m_FileId);
-    *m_FileId = -1;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5ScopedFileSentinel::setFileId(hid_t* fileId)
-{
-  m_FileId = fileId;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t* H5ScopedFileSentinel::getFileId()
-{
-  return m_FileId;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5ScopedFileSentinel::addGroupId(hid_t* gid)
-{
-  m_Groups.push_back(gid);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedGroupSentinel::H5ScopedGroupSentinel(hid_t* gid, bool turnOffErrors)
-: m_TurnOffErrors(turnOffErrors)
-{
-  m_Groups.push_back(gid);
-  if(m_TurnOffErrors)
-  {
-    H5Eget_auto(H5E_DEFAULT, &_oldHDF_error_func, &_oldHDF_error_client_data);
-    H5Eset_auto(H5E_DEFAULT, nullptr, nullptr);
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedGroupSentinel::~H5ScopedGroupSentinel()
-{
-  if(m_TurnOffErrors)
-  {
-    H5Eset_auto(H5E_DEFAULT, _oldHDF_error_func, _oldHDF_error_client_data);
-  }
-  for(auto temp : m_Groups)
-  {
-    if(*temp > 0)
-    {
-      H5Gclose(*temp);
-      *temp = -1;
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5ScopedGroupSentinel::addGroupId(hid_t* gid)
-{
-  m_Groups.push_back(gid);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedObjectSentinel::H5ScopedObjectSentinel(hid_t* gid, bool turnOffErrors)
-: m_TurnOffErrors(turnOffErrors)
-{
-  m_Groups.push_back(gid);
-  if(m_TurnOffErrors)
-  {
-    H5Eget_auto(H5E_DEFAULT, &_oldHDF_error_func, &_oldHDF_error_client_data);
-    H5Eset_auto(H5E_DEFAULT, nullptr, nullptr);
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5ScopedObjectSentinel::~H5ScopedObjectSentinel()
-{
-  if(m_TurnOffErrors)
-  {
-    H5Eset_auto(H5E_DEFAULT, _oldHDF_error_func, _oldHDF_error_client_data);
-  }
-  for(auto temp : m_Groups)
-  {
-    if(*temp > 0)
-    {
-      H5Utilities::closeHDF5Object(*temp);
-      *temp = -1;
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5ScopedObjectSentinel::addGroupId(hid_t* gid)
-{
-  m_Groups.push_back(gid);
-}
-
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5GroupAutoCloser::H5GroupAutoCloser(hid_t* groupId)
-: gid(groupId)
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-H5GroupAutoCloser::~H5GroupAutoCloser()
-{
-  if(*gid > 0)
-  {
-    H5Gclose(*gid);
-  }
-}
-
diff --git a/Source/H5Support/H5ScopedSentinel.h b/Source/H5Support/H5ScopedSentinel.h
deleted file mode 100644
index 10c50d2cf0..0000000000
--- a/Source/H5Support/H5ScopedSentinel.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-
-#include "H5Support/H5Utilities.h"
-#include "H5Support/H5Lite.h"
-
-#include "H5Support/H5Support.h"
-
-#if defined (H5Support_NAMESPACE)
-namespace H5Support_NAMESPACE
-{
-#endif
-
-
-/**
- * @brief The HDF5FileSentinel class ensures the HDF5 file that is currently open
- * is closed when the variable goes out of Scope
- */
-class H5Support_EXPORT H5ScopedFileSentinel
-{
-  public:
-    H5ScopedFileSentinel(hid_t* fileId, bool turnOffErrors);
-    virtual ~H5ScopedFileSentinel();
-
-    void setFileId(hid_t* fileId);
-    hid_t* getFileId();
-    void addGroupId(hid_t* gid);
-
-  private:
-    hid_t* m_FileId;
-    bool m_TurnOffErrors;
-    std::vector<hid_t*> m_Groups;
-
-    herr_t (*_oldHDF_error_func)(hid_t, void*){};
-    void* _oldHDF_error_client_data{};
-};
-
-class H5Support_EXPORT H5ScopedGroupSentinel
-{
-  public:
-    H5ScopedGroupSentinel(hid_t* gid, bool turnOffErrors);
-    virtual ~H5ScopedGroupSentinel();
-    void addGroupId(hid_t* gid);
-
-  private:
-    bool m_TurnOffErrors;
-    std::vector<hid_t*> m_Groups;
-
-    herr_t (*_oldHDF_error_func)(hid_t, void*){};
-    void* _oldHDF_error_client_data{};
-};
-
-
-class H5Support_EXPORT H5ScopedObjectSentinel
-{
-  public:
-    H5ScopedObjectSentinel(hid_t* gid, bool turnOffErrors);
-    virtual ~H5ScopedObjectSentinel();
-    void addGroupId(hid_t* gid);
-
-  private:
-    bool m_TurnOffErrors;
-    std::vector<hid_t*> m_Groups;
-
-    herr_t (*_oldHDF_error_func)(hid_t, void*){};
-    void* _oldHDF_error_client_data{};
-};
-
-class H5Support_EXPORT H5GroupAutoCloser
-{
-public:
-  H5GroupAutoCloser(hid_t* groupId);
-
-  virtual ~H5GroupAutoCloser();
-private:
-  hid_t* gid = nullptr;
-};
-
-
-#if defined (H5Support_NAMESPACE)
-}
-#endif
-
-
-
-
diff --git a/Source/H5Support/H5SupportConfiguration.h.in b/Source/H5Support/H5SupportConfiguration.h.in
deleted file mode 100755
index 8ec9439a61..0000000000
--- a/Source/H5Support/H5SupportConfiguration.h.in
+++ /dev/null
@@ -1,46 +0,0 @@
-/* This file is auto generated. DO NOT EDIT THIS FILE. Edit the original template file and then rerun CMake
-* again to regenerate this file.
-*/
-
-#ifndef _H5SUPPORT_H_
-#define _H5SUPPORT_H_
-
-
-/* Define to 1 if H5Support was built as a dynamic library */
-#cmakedefine H5Support_BUILT_AS_DYNAMIC_LIB @H5Support_BUILT_AS_DYNAMIC_LIB@
-
-/* Define the namespace we are going to use for the H5Support Codes */
-#cmakedefine H5Support_NAMESPACE @H5Support_NAMESPACE@
-
-/* Define if H5Support is using Qt classes in addition to STL classes */
-#cmakedefine H5Support_USE_QT @H5Support_USE_QT@
-
-/* Include the Overall Configuration header file */
-#include "@PROJECT_NAME@/@CMP_CONFIGURATION_FILE_NAME@"
-
-/* Include the Typedefs Header */
-#include "@PROJECT_NAME@/@CMP_TYPES_FILE_NAME@"
-
-/* Include the DLL export preprocessor defines */
-#include "@PROJECT_NAME@/@PROJECT_NAME@DLLExport.h"
-
-/* We are going to disable some warnings just to get a grip on all the warnings that get produced
-* during an MSVC build */
-#cmakedefine DREAM3D_DISABLE_MSVC_WARNINGS
-
-#define H5Support_USE_MUTEX
-
-#if (_MSC_VER >= 1)
-
-  #pragma warning (error: 4715) /* Not all control points return a value */
-
-  #ifdef DREAM3D_DISABLE_MSVC_WARNINGS
-    #pragma warning(disable:4244)
-    #pragma warning(disable:4267)
-    #pragma warning(disable:4305)
-  #endif
-
-#endif
-
-
-#endif
diff --git a/Source/H5Support/H5SupportDLLExport.h b/Source/H5Support/H5SupportDLLExport.h
deleted file mode 100755
index 0afa357c92..0000000000
--- a/Source/H5Support/H5SupportDLLExport.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
-
-
-
-#pragma once
-
-
-#if defined (_MSC_VER)
-#pragma warning(disable: 4251)
-#pragma warning(disable: 4710)
-#pragma warning(disable: 4820)
-#pragma warning(disable: 4668)
-#pragma warning(disable: 4265)
-#pragma warning(disable: 4189)
-#pragma warning(disable: 4640)
-#pragma warning(disable: 4996)
-#pragma warning(disable: 4548)
-#endif
-
-/* Cmake will define H5Support_EXPORTS on Windows when it
-configures to build a shared library. If you are going to use
-another build system on windows or create the visual studio
-projects by hand you need to define H5Support_EXPORTS when
-building the H5SupportDatModel DLL on windows.
-*/
-
-#if defined (H5Support_BUILT_AS_DYNAMIC_LIB)
-
-#if defined (H5Support_EXPORTS)  /* Compiling the H5Support DLL/Dylib */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  H5Support_EXPORT __declspec(dllexport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define H5Support_EXPORT __attribute__ ((visibility("default")))
-#endif
-#else  /* Importing the DLL into another project */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  H5Support_EXPORT __declspec(dllimport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define H5Support_EXPORT __attribute__ ((visibility("default")))
-#endif
-#endif
-#endif
-
-/* If H5Support_EXPORT was never defined, define it here */
-#ifndef _h5supportdllexport_h_
-#define _h5supportdllexport_h_
-#endif
-
-#if 0
-#if defined (_WIN32) || defined __CYGWIN__
-
-#if defined (H5Support_BUILT_AS_DYNAMIC_LIB)
-#if defined(H5Support_EXPORTS)
-#define  H5Support_EXPORT __declspec(dllexport)
-#else
-#define  H5Support_EXPORT __declspec(dllimport)
-#endif /* H5Support_EXPORTS */
-
-#else
-#define H5Support_EXPORT
-#endif
-#elif __GNUC__ >= 4
-#define FLOW_DLL __attribute__ ((visibility("default")))
-#define DLL_LOCAL  __attribute__ ((visibility("hidden")
-#else /* defined (_WIN32) && defined (H5Support_BUILD_SHARED_LIBS)  */
-#define H5Support_EXPORT
-#endif
-#endif
-
-
diff --git a/Source/H5Support/H5Utilities.cpp b/Source/H5Support/H5Utilities.cpp
deleted file mode 100644
index 326ce3e56b..0000000000
--- a/Source/H5Support/H5Utilities.cpp
+++ /dev/null
@@ -1,775 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <H5Support/H5Utilities.h>
-
-#include "H5Fpublic.h"
-
-// C Includes
-#include <cstring>
-
-// C++ Includes
-#include <iostream>
-
-#define CheckValidLocId(locId)                                                                                                                                                                         \
-  if((locId) < 0)                                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    std::cout << "Invalid HDF Location ID: " << (locId) << std::endl;                                                                                                                                    \
-    return -1;                                                                                                                                                                                         \
-  }
-
-#if defined(H5Support_NAMESPACE)
-using namespace H5Support_NAMESPACE;
-#endif
-
-
-/**
- * Define the libraries features and file compatibility that will be used when opening
- * or creating a file
- */
-#if (H5_VERS_MINOR == 8)
-#define HDF5_VERSION_LIB_LOWER_BOUNDS        H5F_LIBVER_18
-#define HDF5_VERSION_LIB_UPPER_BOUNDS        H5F_LIBVER_LATEST
-#endif
-
-#if (H5_VERS_MINOR == 10)
-#define HDF5_VERSION_LIB_LOWER_BOUNDS        H5F_LIBVER_V18
-#define HDF5_VERSION_LIB_UPPER_BOUNDS        H5F_LIBVER_V18
-#endif
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t H5Utilities::createFile(const std::string& filename)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  /* Create a file access property list */
-  hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
-
-  /* Set the fapl */
-  H5Pset_libver_bounds(fapl, HDF5_VERSION_LIB_LOWER_BOUNDS, HDF5_VERSION_LIB_UPPER_BOUNDS);
-
-  /* Create a file with this fapl */
-  hid_t fileId = H5Fcreate(filename.c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, fapl);
-
-  /* Close the apl object */
-  H5Pclose(fapl);
-
-  return fileId;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t H5Utilities::openFile(const std::string& filename, bool readOnly)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  HDF_ERROR_HANDLER_OFF
-  hid_t fileId = -1;
-  if(readOnly)
-  {
-    fileId = H5Fopen(filename.c_str(), H5F_ACC_RDONLY, H5P_DEFAULT);
-  }
-  else
-  {
-    /* Create a file access property list */
-    hid_t fapl = H5Pcreate(H5P_FILE_ACCESS);
-
-    /* Set the fapl */
-    H5Pset_libver_bounds(fapl, HDF5_VERSION_LIB_LOWER_BOUNDS, HDF5_VERSION_LIB_UPPER_BOUNDS);
-    fileId = H5Fopen(filename.c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
-
-    /* Close the apl object */
-    H5Pclose(fapl);
-  }
-
-  HDF_ERROR_HANDLER_ON
-  return fileId;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Utilities::closeFile(hid_t& fileId)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 1;
-  if(fileId < 0) // fileId isn't open
-  {
-    return 1;
-  }
-
-  // Get the number of open identifiers of all types
-  //  except files
-  ssize_t num_open = H5Fget_obj_count(fileId, H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_DATATYPE | H5F_OBJ_ATTR | H5F_OBJ_LOCAL);
-  if(num_open > 0)
-  {
-    std::cout << "WARNING: Some IDs weren't closed. Closing them." << std::endl;
-    std::vector<hid_t> attr_ids(num_open, 0);
-    H5Fget_obj_ids(fileId, H5F_OBJ_DATASET | H5F_OBJ_GROUP | H5F_OBJ_DATATYPE | H5F_OBJ_ATTR, num_open, &(attr_ids.front()));
-    for(int i = 0; i < num_open; i++)
-    {
-      char name[1024];
-      ::memset(name, 0, 1024);
-      // hid_t obj_type = H5Iget_type(attr_ids[i]);
-      ssize_t charsRead = H5Iget_name(attr_ids[i], name, 1024);
-      if(charsRead < 0)
-      {
-        std::cout << "Error Trying to get the name of an hdf object that was not closed. This is probably pretty bad. " << __FILE__ << "(" << __LINE__ << ")" << std::endl;
-        return -1;
-      }
-      std::cout << "H5 Object left open. Id=" << attr_ids[i] << " Name='" << name << "'" << std::endl;
-      H5Utilities::closeHDF5Object(attr_ids[i]);
-    }
-  }
-
-  err = H5Fclose(fileId);
-  if(err < 0)
-  {
-    std::cout << "Error Closing HDF5 File. " << err << std::endl;
-  }
-  fileId = -1;
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//  Returns the full path to the object referred to by the
-// -----------------------------------------------------------------------------
-std::string H5Utilities::getObjectPath(hid_t loc_id, bool  /*trim*/)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  // char *obj_name;
-  size_t name_size;
-  name_size = 1 + H5Iget_name(loc_id, nullptr, 0);
-  std::vector<char> obj_name(name_size, 0);
-  H5Iget_name(loc_id, &(obj_name.front()), name_size);
-  std::string objPath(&(obj_name.front()));
-
-  if((objPath != "/") && (objPath.at(0) == '/'))
-  {
-    objPath.erase(0, 1);
-  }
-
-  return objPath;
-}
-
-// -----------------------------------------------------------------------------
-// @brief Retrieves the HDF object type for obj_name at loc_id and stores
-//    it in the parameter obj_type passed in.
-// -----------------------------------------------------------------------------
-herr_t H5Utilities::getObjectType(hid_t objId, const std::string& objName, int32_t* objType)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 1;
-  H5O_info_t obj_info{};
-
-  err = H5Oget_info_by_name(objId, objName.c_str(), &obj_info, H5P_DEFAULT);
-  if(err < 0)
-  {
-    return err;
-  }
-
-  (*objType) = obj_info.type;
-
-  return err;
-}
-
-// Opens and returns the HDF object (since the HDF api requires
-//  different open and close methods for different types of objects
-hid_t H5Utilities::openHDF5Object(hid_t loc_id, const std::string& objName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  int32_t obj_type;
-  hid_t obj_id;
-  herr_t err = 0;
-  HDF_ERROR_HANDLER_OFF;
-  err = getObjectType(loc_id, objName, &obj_type);
-  if(err < 0)
-  {
-    // std::cout << "Error: Unable to get object type for object: " << objName << std::endl;
-    HDF_ERROR_HANDLER_ON;
-    return -1;
-  }
-
-  switch(obj_type)
-  {
-  case H5O_TYPE_GROUP:
-    obj_id = H5Gopen(loc_id, objName.c_str(), H5P_DEFAULT);
-    break;
-  case H5O_TYPE_DATASET:
-    obj_id = H5Dopen(loc_id, objName.c_str(), H5P_DEFAULT);
-    break;
-  default:
-    std::cout << "Unknonwn HDF Type: " << obj_type << std::endl;
-    obj_id = -1;
-  }
-  HDF_ERROR_HANDLER_ON;
-  return obj_id;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Utilities::getParentPath(hid_t objId)
-{
-  std::string objPath = getObjectPath(objId);
-  return getParentPath(objPath);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Utilities::getParentPath(const std::string& objectPath)
-{
-  std::string parentPath = objectPath;
-  size_t start = parentPath.find_last_of('/');
-  parentPath.erase(start, parentPath.size() - start);
-  return parentPath;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Utilities::getObjectNameFromPath(const std::string& objectPath)
-{
-  std::string str = objectPath;
-  size_t end = str.find_last_of('/');
-  str.erase(0, end+1);
-  return str;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Utilities::closeHDF5Object(hid_t obj_id)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  if(obj_id < 0) // Object was not valid.
-  {
-    return 0;
-  }
-  H5I_type_t obj_type;
-  herr_t err = -1; // default to an error
-  char name[1024];
-  ::memset(name, 0, 1024);
-  obj_type = H5Iget_type(obj_id);
-  ssize_t charsRead = H5Iget_name(obj_id, name, 1024);
-  if(charsRead < 0)
-  {
-    std::cout << "Error Trying to get the name of an hdf object that was not closed. This is probably pretty bad. " << __FILE__ << "(" << __LINE__ << ")" << std::endl;
-    return -1;
-  }
-
-  switch(obj_type)
-  {
-  case H5I_FILE:
-    err = H5Fclose(obj_id);
-    break;
-  case H5I_GROUP:
-    // std::cout << "H5 Group Object left open. Id=" << obj_id  << " Name='" << name << "'" << std::endl;
-    err = H5Gclose(obj_id);
-    break;
-  case H5I_DATASET:
-    // std::cout << "H5 Dataset Object left open. Id=" << obj_id << " Name='" << name << "'" << std::endl;
-    err = H5Dclose(obj_id);
-    break;
-  case H5I_ATTR:
-    // std::cout << "H5 Attribute Object left open. Id=" << obj_id << " Name='" << name << "'" << std::endl;
-    err = H5Aclose(obj_id);
-    break;
-  case H5I_DATATYPE:
-    // std::cout << "H5 DataType Object left open. Id=" << obj_id << " Name='" << name << "'" << std::endl;
-    err = H5Tclose(obj_id);
-    break;
-  case H5I_DATASPACE:
-    // std::cout << "H5 Data Space Object left open. Id=" << obj_id << " Name='" << name << "'" << std::endl;
-    err = H5Sclose(obj_id);
-    break;
-  default:
-    // std::cout << "Error unknown HDF object for closing: " << " Name='" << name << "'" << " Object Type=" << obj_type << std::endl;
-    err = -1;
-  }
-
-  return err;
-}
-
-//--------------------------------------------------------------------//
-// HDF Group Methods
-//--------------------------------------------------------------------//
-
-/*! @brief Returns a std::list of std::strings containing the names
- *   of all objects attached to the group referred to by loc_id
- *
- * @parameter typeFilter is one of H5Support_GROUP, H5Support_DATASET, HDF5_TYPE,
- *  or HDF5_LINK or any combination of these using the bitwise or |
- *  command.  Or you can pass in HDF5_ANY to not filter at all
- */
-herr_t H5Utilities::getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 0;
-  hsize_t numObjs = 0;
-  H5G_info_t group_info{};
-  err = H5Gget_info(loc_id, &group_info);
-  if(err < 0)
-  {
-    // std::cout << "Error getting number of objects for group: " << loc_id << std::endl;
-    return err;
-  }
-  numObjs = group_info.nlinks;
-
-  if(numObjs <= 0)
-  {
-    return 0; // no objects in group
-  }
-
-  size_t size = 0;
-  H5O_type_t type = H5O_TYPE_NTYPES;
-
-  for(hsize_t i = 0; i < numObjs; i++)
-  {
-    size = 1 + H5Lget_name_by_idx(loc_id, ".", H5_INDEX_NAME, H5_ITER_INC, i, nullptr, 0, H5P_DEFAULT);
-
-    std::vector<char> name(size * sizeof(char), 0);
-
-    H5Lget_name_by_idx(loc_id, ".", H5_INDEX_NAME, H5_ITER_INC, i, &(name.front()), size, H5P_DEFAULT);
-    if(typeFilter == H5Support_ANY)
-    {
-      std::string objName(&(name.front()));
-      names.push_back(objName);
-    }
-    else
-    {
-      H5O_info_t object_info{};
-      err = H5Oget_info_by_name(loc_id, &(name.front()), &object_info, H5P_DEFAULT);
-      if(err >= 0)
-      {
-        type = object_info.type;
-        if(((type == H5O_TYPE_GROUP) && ((H5Support_GROUP & typeFilter) != 0)) || ((type == H5O_TYPE_DATASET) && ((H5Support_DATASET & typeFilter) != 0)))
-        {
-          std::string objName(&(name.front()));
-          names.push_back(objName);
-        }
-      }
-    }
-  }
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-// HDF Creation/Modification Methods
-// -----------------------------------------------------------------------------
-hid_t H5Utilities::createGroup(hid_t loc_id, const std::string& group)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t grp_id = -1;
-  herr_t err = -1;
-  H5O_info_t obj_info{};
-  HDF_ERROR_HANDLER_OFF
-
-  err = H5Oget_info_by_name(loc_id, group.c_str(), &obj_info, H5P_DEFAULT);
-  //  std::cout << "H5Gget_objinfo = " << err << " for " << group << std::endl;
-  if(err == 0)
-  {
-    grp_id = H5Gopen(loc_id, group.c_str(), H5P_DEFAULT);
-  }
-  else
-  {
-    grp_id = H5Gcreate(loc_id, group.c_str(), H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-  }
-  // Turn the HDF Error handlers back on
-  HDF_ERROR_HANDLER_ON
-
-  return grp_id;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t H5Utilities::createGroupsForDataset(const std::string& datasetPath, hid_t parent)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  // Generate the internal HDF dataset path and create all the groups necessary to write the dataset
-  std::string::size_type pos = 0;
-  pos = datasetPath.find_last_of('/');
-  // std::string parentPath;
-  if(pos != 0 && pos != std::string::npos)
-  {
-    std::string parentPath(datasetPath.substr(0, pos));
-    return H5Utilities::createGroupsFromPath(parentPath, parent);
-  }
-  // Make sure all the intermediary groups are in place in the HDF5 File
-  return 1;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t H5Utilities::createGroupsFromPath(const std::string& pathToCheck, hid_t parent)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t gid = 1;
-  herr_t err = -1;
-  std::string first;
-  std::string second;
-  std::string path(pathToCheck); // make a copy of the input
-
-  if(parent <= 0)
-  {
-    std::cout << "Bad parent Id. Returning from createGroupsFromPath" << std::endl;
-    return -1;
-  }
-  // remove any front slash
-  std::string::size_type pos = path.find_first_of('/', 0);
-  if(0 == pos)
-  {
-    path = path.substr(1, path.size());
-  }
-  else if(pos == std::string::npos) // Path contains only one element
-  {
-    gid = H5Utilities::createGroup(parent, path);
-    if(gid < 0)
-    {
-      std::cout << "Error creating group: " << path << " err:" << gid << std::endl;
-      return gid;
-    }
-    err = H5Gclose(gid);
-    if(err < 0)
-    {
-      std::cout << "Error closing group during group creation." << std::endl;
-      return err;
-    }
-    return err; // Now return here as this was a special case.
-  }
-
-  // Remove any trailing slash
-  pos = path.find_last_of('/');
-  if(pos == (path.size() - 1)) // slash was in the last position
-  {
-    path = path.substr(0, pos);
-  }
-
-  if(path.empty())
-  {
-    return -1; // The path that was passed in was only a slash..
-  }
-
-  pos = path.find_first_of('/', 0);
-  if(pos == std::string::npos) // Only one element in the path
-  {
-    gid = H5Utilities::createGroup(parent, path);
-    if(gid < 0)
-    {
-      std::cout << "Error creating group '" << path << "' for group id " << gid << std::endl;
-      return gid;
-    }
-    err = H5Gclose(gid);
-    return err;
-  }
-
-  while(pos != std::string::npos)
-  {
-    first = path.substr(0, pos);
-    second = path.substr(pos + 1, path.length());
-    gid = H5Utilities::createGroup(parent, first);
-    if(gid < 0)
-    {
-      std::cout << "Error creating group:" << gid << std::endl;
-      return gid;
-    }
-    err = H5Gclose(gid);
-    pos = path.find_first_of('/', pos + 1);
-    if(pos == std::string::npos)
-    {
-      first += "/" + second;
-      gid = createGroup(parent, first);
-      if(gid < 0)
-      {
-        std::cout << "Error creating group:" << gid << std::endl;
-        return gid;
-      }
-      err = H5Gclose(gid);
-    }
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Utilities::extractObjectName(const std::string& path)
-{
-  std::string::size_type pos;
-  pos = path.find_last_of('/');
-  if(pos == std::string::npos || path == "/")
-  {
-    return path;
-  }
-  return path.substr(pos+1);
-}
-
-//--------------------------------------------------------------------//
-// HDF Attribute Methods
-//--------------------------------------------------------------------//
-bool H5Utilities::probeForAttribute(hid_t loc_id, const std::string& obj_name, const std::string& attr_name)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  herr_t err = 0;
-  hid_t rank;
-  HDF_ERROR_HANDLER_OFF
-  err = H5Lite::getAttributeNDims(loc_id, obj_name, attr_name, rank);
-  HDF_ERROR_HANDLER_ON
-  return err >= 0;
-}
-
-//--------------------------------------------------------------------//
-// Returns a std::list of all attribute names attached to the object
-//  referred to by obj_id
-//--------------------------------------------------------------------//
-herr_t H5Utilities::getAllAttributeNames(hid_t obj_id, std::list<std::string>& results)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  if(obj_id < 0)
-  {
-    return -1;
-  }
-  herr_t err = -1;
-  hsize_t num_attrs;
-  hid_t attr_id;
-  size_t name_size;
-  H5O_info_t object_info{};
-  err = H5Oget_info(obj_id, &object_info);
-  num_attrs = object_info.num_attrs;
-
-  for(hsize_t i = 0; i < num_attrs; i++)
-  {
-    attr_id = H5Aopen_by_idx(obj_id, ".", H5_INDEX_NAME, H5_ITER_INC, i, H5P_DEFAULT, H5P_DEFAULT);
-    name_size = 1 + H5Aget_name(attr_id, 0, nullptr);
-    std::vector<char> attr_name(name_size * sizeof(char), 0);
-    H5Aget_name(attr_id, name_size, &(attr_name.front()));
-    results.emplace_back(&(attr_name.front()));
-    err = H5Aclose(attr_id);
-  }
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t H5Utilities::getAllAttributeNames(hid_t loc_id, const std::string& obj_name, std::list<std::string>& names)
-{
-
-  hid_t obj_id = -1;
-  herr_t err = -1;
-  names.clear();
-
-  obj_id = openHDF5Object(loc_id, obj_name);
-  if(obj_id < 0)
-  {
-    return static_cast<herr_t>(obj_id);
-  }
-  err = getAllAttributeNames(obj_id, names);
-  err = closeHDF5Object(obj_id);
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-std::string H5Utilities::HDFClassTypeAsStr(hid_t class_type)
-{
-  switch(class_type)
-  {
-  case H5T_INTEGER:
-    return "H5T_INTEGER";
-    break;
-  case H5T_FLOAT:
-    return "H5T_FLOAT";
-    break;
-  case H5T_STRING:
-    return "H5T_STRING";
-    break;
-  case H5T_TIME:
-    return "H5T_TIME";
-    break;
-  case H5T_BITFIELD:
-    return "H5T_BITFIELD";
-    break;
-  case H5T_OPAQUE:
-    return "H5T_OPAQUE";
-    break;
-  case H5T_COMPOUND:
-    return "H5T_COMPOUND";
-    break;
-  case H5T_REFERENCE:
-    return "H5T_REFERENCE";
-    break;
-  case H5T_ENUM:
-    return "H5T_ENUM";
-    break;
-  case H5T_VLEN:
-    return "H5T_VLEN";
-    break;
-  case H5T_ARRAY:
-    return "H5T_ARRAY";
-    break;
-  default:
-    return "OTHER";
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void H5Utilities::printHDFClassType(H5T_class_t class_type)
-{
-  switch(class_type)
-  {
-  case H5T_INTEGER:
-    std::cout << "H5T_INTEGER" << std::endl;
-    break;
-  case H5T_FLOAT:
-    std::cout << "H5T_FLOAT" << std::endl;
-    break;
-  case H5T_STRING:
-    std::cout << "H5T_STRING" << std::endl;
-    break;
-  case H5T_TIME:
-    std::cout << "H5T_TIME" << std::endl;
-    break;
-  case H5T_BITFIELD:
-    std::cout << "H5T_BITFIELD" << std::endl;
-    break;
-  case H5T_OPAQUE:
-    std::cout << "H5T_OPAQUE" << std::endl;
-    break;
-  case H5T_COMPOUND:
-    std::cout << "H5T_COMPOUND" << std::endl;
-    break;
-  case H5T_REFERENCE:
-    std::cout << "H5T_REFERENCE" << std::endl;
-    break;
-  case H5T_ENUM:
-    std::cout << "H5T_ENUM" << std::endl;
-    break;
-  case H5T_VLEN:
-    std::cout << "H5T_VLEN" << std::endl;
-    break;
-  case H5T_ARRAY:
-    std::cout << "H5T_ARRAY" << std::endl;
-    break;
-  default:
-    std::cout << "OTHER" << std::endl;
-  }
-}
-
-// -----------------------------------------------------------------------------
-//  Returns a std::string that is the name of the object at the given index
-// -----------------------------------------------------------------------------
-herr_t H5Utilities::objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  ssize_t err = -1;
-  // call H5Gget_objname_by_idx with name as nullptr to get its length
-  ssize_t name_len = H5Lget_name_by_idx(fileId, ".", H5_INDEX_NAME, H5_ITER_NATIVE, static_cast<hsize_t>(idx), nullptr, 0, H5P_DEFAULT);
-  if(name_len < 0)
-  {
-    name.clear();
-    return -1;
-  }
-
-  std::vector<char> buf(name_len + 1, 0);
-  err = H5Lget_name_by_idx(fileId, ".", H5_INDEX_NAME, H5_ITER_NATIVE, static_cast<hsize_t>(idx), &(buf.front()), name_len + 1, H5P_DEFAULT);
-  if(err < 0)
-  {
-    std::cout << "Error Trying to get the dataset name for index " << idx << std::endl;
-    name.clear(); // Make an empty string if this fails
-  }
-  else
-  {
-    name.append(&(buf.front())); // Append the string to the given string
-  }
-  return static_cast<herr_t>(err);
-}
-
-// -----------------------------------------------------------------------------
-// Checks the given name object to see what type of HDF5 object it is.
-// -----------------------------------------------------------------------------
-bool H5Utilities::isGroup(hid_t nodeId, const std::string& objName)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  bool isGroup = true;
-  herr_t err = -1;
-  H5O_info_t statbuf{};
-  err = H5Oget_info_by_name(nodeId, objName.c_str(), &statbuf, H5P_DEFAULT);
-  if(err < 0)
-  {
-    std::cout << "Error in methd H5Gget_objinfo" << std::endl;
-    return false;
-  }
-  switch(statbuf.type)
-  {
-  case H5O_TYPE_GROUP:
-    isGroup = true;
-    break;
-  case H5O_TYPE_DATASET:
-    isGroup = false;
-    break;
-  case H5O_TYPE_NAMED_DATATYPE:
-    isGroup = false;
-    break;
-  default:
-    isGroup = false;
-  }
-  return isGroup;
-}
diff --git a/Source/H5Support/H5Utilities.h b/Source/H5Support/H5Utilities.h
deleted file mode 100644
index 7b1355386f..0000000000
--- a/Source/H5Support/H5Utilities.h
+++ /dev/null
@@ -1,235 +0,0 @@
-
-//
-//  Copyright (c) 2007, 2010 Michael A. Jackson for BlueQuartz Software
-//  All rights reserved.
-//  BSD License: http://www.opensource.org/licenses/bsd-license.html
-//
-//  This code was written under United States Air Force Contract number
-//                           FA8650-04-C-5229
-//
-
-#pragma once
-
-
-// C++ Includes
-#include <map>
-#include <list>
-#include <string>
-
-//-- HDF Headers
-#include <hdf5.h>
-
-#include "H5Support/H5Support.h"
-#include "H5Support/H5Lite.h"
-
-/* H5LITE_USE_H5Support_CONSTRUCTS is used to include H5SupportDataModel Specific classes in
- * this class. If this is being compiled as part of H5SupportDataModel this should
- * _always_ be defined. If this code is being used as part of another project
- * then this should probably NOT be defined.
- */
-
-#if defined (H5Support_NAMESPACE)
-namespace H5Support_NAMESPACE
-{
-#endif
-
-  /**
-   * @brief General Utilities for working with the HDF5 data files and API
-   */
-  class H5Support_EXPORT H5Utilities
-  {
-
-    public:
-
-      virtual ~H5Utilities() = default;
-
-      enum CustomHDFDataTypes
-      {
-        H5Support_GROUP = 1,
-        H5Support_DATASET = 2,
-        H5Support_TYPE = 4,
-        H5Support_LINK = 8,
-        H5Support_ANY = 15
-      };
-
-      // -----------HDF5 File Operations
-      static hid_t openFile(const std::string& filename, bool readOnly = false);
-
-      static hid_t createFile(const std::string& filename);
-
-      static herr_t closeFile(hid_t& fileId);
-
-      // -------------- HDF Indentifier Methods ----------------------------
-      /**
-      * @brief Retuirns the path to an object
-      * @param objId The HDF5 id of the object
-      * @param trim set to False to trim the path
-      * @return  The path to the object relative to the objId
-      */
-      static std::string getObjectPath(hid_t loc_id, bool trim = false);
-
-      /**
-      * @brief Returns the hdf object type
-      * @param objId The hdf5 object id
-      * @param objName The path to the data set
-      * @param objType The type of the object
-      * @return  Negative value on error
-      */
-      static herr_t getObjectType(hid_t objId, const std::string& objName, int32_t* objType);
-
-      /**
-      * @brief Retrieves the object name for a given index
-      * @param fileId The hdf5 object id
-      * @param idx The index to retrieve the name for
-      * @param name The variable to store the name
-      * @return Negative value is error
-      */
-      static herr_t objectNameAtIndex(hid_t fileId, int32_t idx, std::string& name);
-
-      /**
-      * @brief Returns the path to an object's parent
-      * @param objId The HDF5 id of the object
-      * @param trim set to False to trim the path
-      * @return  The path to the object relative to the objId
-      */
-      static std::string getParentPath(hid_t objId);
-
-      /**
-      * @brief Returns the path to an object's parent
-      * @param objectPath The HDF5 path to the object
-      * @param trim set to False to trim the path
-      * @return  The path to the object relative to the objId
-      */
-      static std::string getParentPath(const std::string& objectPath);
-
-      /**
-      * @brief Returns the object's name from object path
-      * @param objectPath The HDF5 path to the object
-      * @return  The object name
-      */
-      static std::string getObjectNameFromPath(const std::string& objectPath);
-
-      /**
-      * @brief Returns if a given hdf5 object is a group
-      * @param objId The hdf5 object that contains an object with name objName
-      * @param objName The name of the object to check
-      * @return True if the given hdf5 object id is a group
-      */
-      static bool isGroup(hid_t nodeId, const std::string& objName);
-
-
-      /**
-      * @brief Opens an HDF5 object for hdf5 operations
-      * @param locId the Object id of the parent
-      * @param objectPath The path of the object to open
-      * @return The hdf5 id of the opened object. Negative value is error.
-      */
-      static hid_t openHDF5Object(hid_t loc_id, const std::string& objName);
-
-      /**
-      * @brief Closes the object id
-      * @param locId The object id to close
-      * @return Negative value is error.
-      */
-      static herr_t closeHDF5Object(hid_t obj_id);
-
-
-      static std::string HDFClassTypeAsStr(hid_t class_type);
-
-      /**
-      * @brief prints the class type of the given class
-      * @param classT The Class Type to print
-      */
-      static void printHDFClassType(H5T_class_t class_type);
-
-      // -------------- HDF Group Methods ----------------------------
-      /**
-      * @brief Returns a list of child hdf5 objects for a given object id
-      * @param loc_id The parent hdf5 id
-      * @param typeFilter A filter to apply to the list
-      * @param names Variable to store the list
-      * @return
-      */
-      static herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, std::list<std::string>& names);
-
-      /**
-       * @brief Creates a HDF Group by checking if the group already exists. If the
-       * group already exists then that group is returned otherwise a new group is
-       * created.
-       * @param loc_id The HDF unique id given to files or groups
-       * @param group The name of the group to create. Note that this group name should
-       * not be any sort of 'path'. It should be a single group.
-       */
-      static hid_t createGroup(hid_t loc_id, const std::string& group);
-
-      /**
-       * @brief Given a path relative to the Parent ID, this method will create all
-       * the intermediate groups if necessary.
-       * @param pathToCheck The path to either create or ensure exists.
-       * @param parent The HDF unique id for the parent
-       * @return Error Condition: Negative is error. Positive is success.
-       */
-      static hid_t  createGroupsFromPath(const std::string& pathToCheck, hid_t parent);
-
-      /**
-       * @brief Given a path relative to the Parent ID, this method will create all
-       * the intermediate groups if necessary.
-       * @param datasetPath The path to the dataset that you want to make all the intermediate groups for
-       * @param parent The HDF unique id for the parent
-       * @return Error Condition: Negative is error. Positive is success.
-       */
-      static hid_t createGroupsForDataset(const std::string& datasetPath, hid_t parent);
-
-      /**
-      * @brief Extracts the object name from a given path
-      * @param path The path which to extract the object name
-      * @return The name of the object
-      */
-      static std::string extractObjectName(const std::string& path);
-
-      // -------------- HDF Attribute Methods ----------------------------
-      /**
-      * @brief Looks for an attribute with a given name
-      * @param loc_id The objects Parent id
-      * @param obj_name The name of the object
-      * @param attr_name The attribute to look for (by name)
-      * @return True if the attribute exists.
-      */
-      static bool probeForAttribute(hid_t loc_id,
-                                                     const std::string& obj_name,
-                                                     const std::string& attr_name);
-
-
-      /**
-      * @brief Returns a list of all the attribute names
-      * @param objId The parent object
-      * @param names Variable to hold the list of attribute names
-      * @return Negate value is error
-      */
-      static herr_t getAllAttributeNames(hid_t obj_id, std::list<std::string>& results);
-
-      /**
-      * @brief Returns a list of all the attribute names
-      * @param objId The parent object
-      * @param obj_name The name of the object whose attribute names you want a list
-      * @param names Variable to hold the list of attribute names
-      * @return Negative value is error
-      */
-      static herr_t getAllAttributeNames(hid_t loc_id, const std::string& obj_name,
-                                                          std::list<std::string>& names);
-
-
-    protected:
-      H5Utilities() = default; // This is just a bunch of Static methods
-
-    private:
-      H5Utilities(const H5Utilities&);   //Copy Constructor Not Implemented
-      void operator=(const H5Utilities&); //Copy Assignment Not Implemented
-  };
-
-#if defined (H5Support_NAMESPACE)
-}
-#endif
-
-
-
diff --git a/Source/H5Support/QH5Lite.cpp b/Source/H5Support/QH5Lite.cpp
deleted file mode 100644
index 11bf40a01c..0000000000
--- a/Source/H5Support/QH5Lite.cpp
+++ /dev/null
@@ -1,406 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <H5Support/QH5Lite.h>
-
-#include <cstring>
-#include <string>
-
-#if defined(H5Support_NAMESPACE)
-using namespace H5Support_NAMESPACE;
-#endif
-
-// -----------------------------------------------------------------------------
-//  Protected Constructor
-// -----------------------------------------------------------------------------
-QH5Lite::QH5Lite()
-= default;
-
-// -----------------------------------------------------------------------------
-//  Protected Destructor
-// -----------------------------------------------------------------------------
-QH5Lite::~QH5Lite()
-= default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void QH5Lite::disableErrorHandlers()
-{
-  HDF_ERROR_HANDLER_OFF;
-}
-
-// -----------------------------------------------------------------------------
-//  Opens an ID for HDF5 operations
-// -----------------------------------------------------------------------------
-hid_t QH5Lite::openId(hid_t loc_id, const QString& obj_name, H5O_type_t obj_type)
-{
-  return H5Lite::openId(loc_id, obj_name.toStdString(), obj_type);
-}
-
-// -----------------------------------------------------------------------------
-//  Closes the given ID
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::closeId(hid_t obj_id, int32_t obj_type)
-{
-  return H5Lite::closeId(obj_id, obj_type);
-}
-
-// -----------------------------------------------------------------------------
-//  Finds an Attribute given an object to look in
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::findAttribute(hid_t loc_id, const QString& attrName)
-{
-  return H5Lite::findAttribute(loc_id, attrName.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool QH5Lite::datasetExists(hid_t loc_id, const QString& name)
-{
-  return H5Lite::datasetExists(loc_id, name.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//  We assume a null terminated string
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeStringDataset(hid_t loc_id, const QString& dsetName, size_t size, const char* data)
-{
-  return H5Lite::writeStringDataset(loc_id, dsetName.toStdString(), size, data);
-}
-
-// -----------------------------------------------------------------------------
-//  Writes a string to a HDF5 dataset
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeStringDataset(hid_t loc_id, const QString& dsetName, const QString& data)
-{
-  return H5Lite::writeStringDataset(loc_id, dsetName.toStdString(), data.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeVectorOfStringsDataset(hid_t loc_id, const QString& dsetName, const QVector<QString>& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t sid = -1;
-  hid_t memspace = -1;
-  hid_t datatype = -1;
-  hid_t did = -1;
-  herr_t err = -1;
-  herr_t retErr = 0;
-
-  hsize_t dims[1] = {static_cast<hsize_t>(data.size())};
-  if((sid = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr)) >= 0)
-  {
-    dims[0] = 1;
-
-    if((memspace = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr)) >= 0)
-    {
-
-      datatype = H5Tcopy(H5T_C_S1);
-      H5Tset_size(datatype, H5T_VARIABLE);
-
-      if((did = H5Dcreate(loc_id, dsetName.toLocal8Bit().constData(), datatype, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) >= 0)
-      {
-
-        //
-        // Select the "memory" to be written out - just 1 record.
-        hsize_t offset_[] = {0};
-        hsize_t count_[] = {1};
-        H5Sselect_hyperslab(memspace, H5S_SELECT_SET, offset_, nullptr, count_, nullptr);
-        hsize_t m_pos = 0;
-        for(const auto & i : data)
-        {
-          // Select the file position, 1 record at position 'pos'
-          hsize_t count[] = {1};
-          hsize_t offset[] = {m_pos++};
-          H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, nullptr, count, nullptr);
-          std::string v = i.toStdString(); // MUST be a C String, i.e., null terminated
-          const char* s = v.c_str();
-          err = H5Dwrite(did, datatype, memspace, sid, H5P_DEFAULT, s);
-          if(err < 0)
-          {
-            qDebug() << "Error Writing String Data: " __FILE__ << "(" << __LINE__ << ")";
-            retErr = err;
-          }
-        }
-        QCloseH5D(did, err, retErr);
-      }
-      H5Tclose(datatype);
-      QCloseH5S(memspace, err, retErr);
-    }
-
-    QCloseH5S(sid, err, retErr);
-  }
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeStringAttributes(hid_t loc_id, const QString& objName, const QMap<QString, QString>& attributes)
-{
-  herr_t err = 0;
-  QMapIterator<QString, QString> i(attributes);
-  while(i.hasNext())
-  {
-    i.next();
-    err = H5Lite::writeStringAttribute(loc_id, objName.toStdString(), i.key().toStdString(), i.value().toStdString());
-    if(err < 0)
-    {
-      return err;
-    }
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hsize_t QH5Lite::getNumberOfElements(hid_t loc_id, const QString& dsetName)
-{
-  return H5Lite::getNumberOfElements(loc_id, dsetName.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//  Writes a string to an HDF5 Attribute
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeStringAttribute(hid_t loc_id, const QString& objName, const QString& attrName, hsize_t size, const char* data)
-{
-  return H5Lite::writeStringAttribute(loc_id, objName.toStdString(), attrName.toStdString(), size, data);
-}
-
-// -----------------------------------------------------------------------------
-//  Writes a string to an HDF5 Attribute
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::writeStringAttribute(hid_t loc_id, const QString& objName, const QString& attrName, const QString& data)
-{
-  return H5Lite::writeStringAttribute(loc_id, objName.toStdString(), attrName.toStdString(), data.size() + 1, data.toLatin1().data());
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a String dataset into a QString
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::readStringDataset(hid_t loc_id, const QString& dsetName, QString& data)
-{
-  std::string readValue;
-  herr_t err = H5Lite::readStringDataset(loc_id, dsetName.toStdString(), readValue);
-  data = QString::fromStdString(readValue);
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::readStringDataset(hid_t loc_id, const QString& dsetName, char* data)
-{
-  return H5Lite::readStringDataset(loc_id, dsetName.toStdString(), data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::readVectorOfStringDataset(hid_t loc_id, const QString& dsetName, QVector<QString>& data)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  hid_t did; // dataset id
-  hid_t tid; // type id
-  herr_t err = 0;
-  herr_t retErr = 0;
-
-  did = H5Dopen(loc_id, dsetName.toLocal8Bit().constData(), H5P_DEFAULT);
-  if(did < 0)
-  {
-    qDebug() << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Error opening Dataset at loc_id (" << loc_id << ") with object name (" << dsetName << ")";
-    return -1;
-  }
-  /*
-  * Get the datatype.
-  */
-  tid = H5Dget_type(did);
-  if(tid >= 0)
-  {
-    hsize_t dims[1] = {0};
-    /*
-    * Get dataspace and allocate memory for read buffer.
-    */
-    hid_t sid = H5Dget_space(did);
-    int ndims = H5Sget_simple_extent_dims(sid, dims, nullptr);
-    if(ndims != 1)
-    {
-      CloseH5S(sid, err, retErr);
-      CloseH5T(tid, err, retErr);
-      std::cout << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Number of dims should be 1 but it was " << ndims << ". Returning early. Is your data file correct?" << std::endl;
-      return -2;
-    }
-    std::vector<char*> rdata(dims[0]);
-    for(int i = 0; i < dims[0]; i++)
-    {
-      rdata[i] = nullptr;
-    }
-
-    /*
-    * Create the memory datatype.
-    */
-    hid_t memtype = H5Tcopy(H5T_C_S1);
-    herr_t status = H5Tset_size(memtype, H5T_VARIABLE);
-
-    /*
-    * Read the data.
-    */
-    status = H5Dread(did, memtype, H5S_ALL, H5S_ALL, H5P_DEFAULT, &(rdata.front()));
-    if(status < 0)
-    {
-      status = H5Dvlen_reclaim(memtype, sid, H5P_DEFAULT, &(rdata.front()));
-      CloseH5S(sid, err, retErr);
-      CloseH5T(tid, err, retErr);
-      CloseH5T(memtype, err, retErr);
-      std::cout << "H5Lite.cpp::readVectorOfStringDataset(" << __LINE__ << ") Error reading Dataset at loc_id (" << loc_id << ") with object name (" << dsetName.toStdString() << ")" << std::endl;
-      return -3;
-    }
-    data.resize(dims[0]);
-    /*
-    * copy the data into the vector of strings
-    */
-    for(int i = 0; i < dims[0]; i++)
-    {
-      // printf("%s[%d]: %s\n", "VlenStrings", i, rdata[i].p);
-      QString str = QString::fromLatin1(rdata[i]);
-      data[i] = str;
-    }
-    /*
-    * Close and release resources.  Note that H5Dvlen_reclaim works
-    * for variable-length strings as well as variable-length arrays.
-    * Also note that we must still free the array of pointers stored
-    * in rdata, as H5Tvlen_reclaim only frees the data these point to.
-    */
-    status = H5Dvlen_reclaim(memtype, sid, H5P_DEFAULT, &(rdata.front()));
-    QCloseH5S(sid, err, retErr);
-    QCloseH5T(tid, err, retErr);
-    QCloseH5T(memtype, err, retErr);
-  }
-
-  QCloseH5D(did, err, retErr);
-
-  return retErr;
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a string Attribute from the HDF file
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::readStringAttribute(hid_t loc_id, const QString& objName, const QString& attrName, QString& data)
-{
-  std::string sValue;
-  herr_t err = H5Lite::readStringAttribute(loc_id, objName.toStdString(), attrName.toStdString(), sValue);
-  data = QString::fromStdString(sValue);
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//  Reads a string Attribute from the HDF file
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::readStringAttribute(hid_t loc_id, const QString& objName, const QString& attrName, char* data)
-{
-  return H5Lite::readStringAttribute(loc_id, objName.toStdString(), attrName.toStdString(), data);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::getDatasetNDims(hid_t loc_id, const QString& dsetName, hid_t& rank)
-{
-  return H5Lite::getDatasetNDims(loc_id, dsetName.toStdString(), rank);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::getAttributeNDims(hid_t loc_id, const QString& objName, const QString& attrName, hid_t& rank)
-{
-  return H5Lite::getAttributeNDims(loc_id, objName.toStdString(), attrName.toStdString(), rank);
-}
-
-// -----------------------------------------------------------------------------
-//  Returns the type of data stored in the dataset. You MUST use H5Tclose(tid)
-//  on the returned value or resource leaks will occur.
-// -----------------------------------------------------------------------------
-hid_t QH5Lite::getDatasetType(hid_t loc_id, const QString& dsetName)
-{
-  return H5Lite::getDatasetType(loc_id, dsetName.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//  Get the dataset information
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::getDatasetInfo(hid_t loc_id, const QString& dsetName, QVector<hsize_t>& dims, H5T_class_t& classType, size_t& sizeType)
-{
-  // Since this is a wrapper we need to pass a std::vector() then copy the values from that into our 'dims' argument
-  std::vector<hsize_t> rDims;
-  herr_t err = H5Lite::getDatasetInfo(loc_id, dsetName.toStdString(), rDims, classType, sizeType);
-  dims.resize(static_cast<qint32>(rDims.size()));
-  for(std::vector<hsize_t>::size_type i = 0; i < rDims.size(); ++i)
-  {
-    dims[static_cast<qint32>(i)] = rDims[i];
-  }
-  return err;
-}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-#define QVECTOR_FROM_STD_VECTOR(def, qvector, svector) def qvector = def::fromStdVector(svector);
-#define QVECTOR_TO_STD_VECTOR(def, qvector, svector) def svector = qvector.toStdVector();
-#else
-#define QVECTOR_TO_STD_VECTOR(def, qvecVarName, svector) def svector(qvecVarName.begin(), qvecVarName.end());
-#endif
-
-// -----------------------------------------------------------------------------
-//  You must close the attributeType argument or resource leaks will occur. Use
-//  H5Tclose(tid); after your call to this method if you do not need the id for
-//   anything.
-// -----------------------------------------------------------------------------
-herr_t QH5Lite::getAttributeInfo(hid_t loc_id, const QString& objName, const QString& attrName, QVector<hsize_t>& dims, H5T_class_t& type_class, size_t& type_size, hid_t& tid)
-{
-  QVECTOR_TO_STD_VECTOR(std::vector<hsize_t>, dims, rDims)
-  herr_t err = H5Lite::getAttributeInfo(loc_id, objName.toStdString(), attrName.toStdString(), rDims, type_class, type_size, tid);
-  dims.resize(static_cast<qint32>(rDims.size()));
-  for(std::vector<hsize_t>::size_type i = 0; i < rDims.size(); ++i)
-  {
-    dims[static_cast<qint32>(i)] = rDims[i];
-  }
-  return err;
-}
diff --git a/Source/H5Support/QH5Lite.h b/Source/H5Support/QH5Lite.h
deleted file mode 100644
index c19079b53e..0000000000
--- a/Source/H5Support/QH5Lite.h
+++ /dev/null
@@ -1,708 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-
-//--C++ Headers
-#include <typeinfo>
-
-//-- HDF Headers
-#include <hdf5.h>
-#include <H5Tpublic.h>
-
-#include <vector>
-#include <limits>
-
-#include "H5Support/H5Support.h"
-#include "H5Support/H5SupportDLLExport.h"
-#include "H5Support/H5Lite.h"
-
-#if !defined (H5Support_USE_QT)
-#error THIS FILE SHOULD NOT BE INCLUDED UNLESS THE H5Support_USE_QT is also defined
-#endif
-
-#include <QtCore/QDebug>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-
-
-#if defined (H5Support_NAMESPACE)
-namespace H5Support_NAMESPACE
-{
-#endif
-
-  /**
-   * @brief Class to bring together some high level methods to read/write data to HDF5 files.
-   * @class QH5Lite
-   * @author Mike Jackson
-   * @date April 2007
-   * @version $Revision: 1.3 $
-   */
-  class QH5Lite
-  {
-    public:
-      /**
-       * @brief Turns off the global error handler/reporting objects. Note that once
-       * they are turned off using this method they CAN NOT be turned back on. If you
-       * would like to turn them off for a piece of code then surround your code with
-       * the HDF_ERROR_HANDLER_OFF and HDF_ERROR_HANDLER_ON macros defined in
-       * QH5Lite.h
-       */
-      static H5Support_EXPORT void disableErrorHandlers();
-
-      /**
-       * @brief Opens an object for HDF5 operations
-       * @param loc_id The parent object that holds the true object we want to open
-       * @param objName The string name of the object
-       * @param obj_type The HDF5_TYPE of object
-       * @return Standard HDF5 Error Conditions
-       */
-      static H5Support_EXPORT hid_t openId(hid_t loc_id, const QString& obj_name, H5O_type_t obj_type);
-
-      /**
-       * @brief Opens an HDF5 Object
-       * @param obj_id The Object id
-       * @param obj_type Basic Object Type
-       * @return Standard HDF5 Error Conditions
-       */
-      static H5Support_EXPORT herr_t closeId( hid_t obj_id, int32_t obj_type );
-
-      /**
-       * @brief Given one of the HDF Types as a string, this will return the HDF Type
-       * as an hid_t value.
-       * @param value The HDF_Type as a string
-       * @return the hid_t value for the given type. -1 if the string does not match a type.
-       */
-      static hid_t HDFTypeFromString(const QString& value)
-      {
-        return H5Lite::HDFTypeFromString(value.toStdString());
-      }
-
-
-      /**
-       * @brief Returns a string version of the HDF Type
-       * @param type The HDF5 Type to query
-       * @return
-       */
-      static QString StringForHDFType(hid_t type)
-      {
-        return QString::fromStdString(H5Lite::StringForHDFType(type));
-      }
-
-      /**
-      * @brief Returns the HDF Type for a given primitive value.
-       * @param value A value to use. Can be anything. Just used to get the type info
-       * from
-       * @return A QString representing the HDF5 Type
-       */
-      template<typename T>
-      static QString HDFTypeForPrimitiveAsStr(T value)
-      {
-        return QString::fromStdString(H5Lite::HDFTypeForPrimitiveAsStr(value));
-      }
-
-      /**
-      * @brief Returns the HDF Type for a given primitive value.
-       * @param value A value to use. Can be anything. Just used to get the type info
-       * from
-       * @return The HDF5 native type for the value
-       */
-      template<typename T>
-      static hid_t HDFTypeForPrimitive(T value)
-      {
-        return H5Lite::HDFTypeForPrimitive(value);
-      }
-
-
-
-      /**
-       * @brief Inquires if an attribute named attr_name exists attached to the object loc_id.
-       * @param loc_id The location to search
-       * @param attrName The attribute to search for
-       * @return Standard HDF5 Error condition
-       */
-      static H5Support_EXPORT herr_t findAttribute( hid_t loc_id, const QString& attrName );
-
-      /**
-       * @brief Finds a Data set given a data set name
-       * @param loc_id The location to search
-       * @param name The dataset to search for
-       * @return Standard HDF5 Error condition. Negative=DataSet
-       */
-      static H5Support_EXPORT bool datasetExists( hid_t loc_id, const QString& name );
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id
-       *
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param dims The dimensions of the dataset
-       * @param data The data to write to the file
-       * @return Standard HDF5 error conditions
-       *
-       * The dimensions of the data sets are usually passed as both a "rank" and
-       * dimensions array. By using a QVector<hsize_t> that stores the values of
-       * each of the dimensions we can reduce the number of arguments to this method as
-       * the value of the "rank" simply becomes dims.length(). So to create a Dims variable
-       * for a 3D data space of size(x,y,z) = {10,20,30} I would use the following code:
-       * <code>
-       * QVector<hsize_t> dims;
-       * dims.push_back(10);
-       * dims.push_back(20);
-       * dims.push_back(30);
-       * </code>
-       *
-       * Also when passing data BE SURE that the type of data and the data type match.
-       * For example if I create some data in a QVector<UInt8Type> you would need to
-       * pass H5T_NATIVE_UINT8 as the dataType.
-       *
-       * Also note that QVector is 32 bit limited in that the most data that it can hold is 2^31 elements. If you
-       * are trying to write a data set that has more than 2^31 elements then use the H5Lite::writeVectorDataset()
-       * instead which takes a std::vector() and is probably more suited for large data.
-       */
-      template <typename T>
-      static herr_t writeVectorDataset (hid_t loc_id,
-                                        const QString& dsetName,
-                                        QVector<hsize_t>& dims,
-                                        QVector<T>& data)
-      {
-        return H5Lite::writePointerDataset(loc_id, dsetName.toStdString(), dims.size(), dims.data(), data.data());
-      }
-
-      /**
-       * @brief Writes the data of a pointer to an HDF5 file
-       * @param loc_id The hdf5 object id of the parent
-       * @param dsetName The name of the dataset to write to. This can be a name of Path
-       * @param rank The number of dimensions
-       * @param dims The sizes of each dimension
-       * @param data The data to be written.
-       * @return Standard hdf5 error condition.
-       */
-      template <typename T>
-      static herr_t writePointerDataset (hid_t loc_id,
-                                         const QString& dsetName,
-                                         int32_t   rank,
-                                         hsize_t* dims,
-                                         T* data)
-      {
-        return H5Lite::writePointerDataset(loc_id, dsetName.toStdString(), rank, dims, data);
-      }
-
-      /**
-       * @brief replacePointerDataset
-       * @param loc_id
-       * @param dsetName
-       * @param rank
-       * @param dims
-       * @param data
-       * @return
-       */
-      template <typename T>
-      static herr_t replacePointerDataset (hid_t loc_id,
-                                           const QString& dsetName,
-                                           int32_t   rank,
-                                           hsize_t* dims,
-                                           T* data)
-      {
-        return H5Lite::replacePointerDataset(loc_id, dsetName.toStdString(), rank, dims, data);
-      }
-
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param dims The dimensions of the dataset
-       * @param rank The number of dimensions to the dataset
-       * @param data The data to write to the file
-       * @return Standard HDF5 error conditions
-       *
-       * The dimensions of the data sets are usually passed as both a "rank" and
-       * dimensions array. By using a QVector<hsize_t> that stores the values of
-       * each of the dimensions we can reduce the number of arguments to this method as
-       * the value of the "rank" simply becomes dims.length(). So to create a Dims variable
-       * for a 3D data space of size(x,y,z) = {10,20,30} I would use the following code:
-       * <code>
-       * QVector<hsize_t> dims;
-       * dims.push_back(10);
-       * dims.push_back(20);
-       * dims.push_back(30);
-       * </code>
-       *
-       */
-      template<typename T>
-      static herr_t writeDataset(hid_t loc_id,
-                                 const QString& dsetName,
-                                 int32_t& rank,
-                                 hsize_t* dims,
-                                 T* data)
-      {
-        return H5Lite::writeDataset(loc_id, dsetName.toStdString(), rank, dims, data);
-      }
-
-
-      /**
-       * @brief Creates a Dataset with the given name at the location defined by loc_id.
-       * This version of writeDataset should be used with a single scalar value. If you
-       * need to write an array of values, use the form that takes an QVector<>
-       *
-       * @param loc_id The Parent location to store the data
-       * @param dsetName The name of the dataset
-       * @param value The value to write to the HDF5 dataset
-       * @return Standard HDF5 error conditions
-       */
-      template <typename T>
-      static herr_t writeScalarDataset (hid_t loc_id,
-                                        const QString& dsetName,
-                                        T& value)
-      {
-        return H5Lite::writeScalarDataset(loc_id, dsetName.toStdString(), value);
-      }
-
-      /**
-       * @brief Writes a QString as a HDF Dataset.
-       * @param loc_id The Parent location to write the dataset
-       * @param dsetName The Name to use for the dataset
-       * @param data The actual data to write as a null terminated string
-       * @return Standard HDF5 error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringDataset (hid_t loc_id,
-                                                          const QString& dsetName,
-                                                          const QString& data);
-
-      /**
-       * @brief Writes a null terminated 'C String' to an HDF Dataset.
-       * @param loc_id The Parent location to write the dataset
-       * @param dsetName The Name to use for the dataset
-       * @param data const char pointer to write as a null terminated string
-       * @param size The number of characters in the string
-       * @return Standard HDF5 error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringDataset (hid_t loc_id,
-                                                          const QString& dsetName,
-                                                          size_t size,
-                                                          const char* data);
-
-      /**
-      * @brief
-      * @param loc_id
-      * @param dsetName
-      * @param size
-      * @param data
-      * @return
-      */
-      static H5Support_EXPORT herr_t writeVectorOfStringsDataset(hid_t loc_id,
-                                                                 const QString& dsetName,
-                                                                 const QVector<QString>& data);
-      /**
-       * @brief Writes an Attribute to an HDF5 Object
-       * @param loc_id The Parent Location of the HDFobject that is getting the attribute
-       * @param objName The Name of Object to write the attribute into.
-       * @param attrName The Name of the Attribute
-       * @param rank The number of dimensions in the attribute data
-       * @param dims The Dimensions of the attribute data
-       * @param data The Attribute Data to write as a pointer
-       * @return Standard HDF Error Condition
-       */
-      template <typename T>
-      static herr_t writePointerAttribute(hid_t loc_id,
-                                          const QString& objName,
-                                          const QString& attrName,
-                                          int32_t  rank,
-                                          hsize_t* dims,
-                                          T* data)
-      {
-        return H5Lite::writePointerAttribute(loc_id, objName.toStdString(), attrName.toStdString(), rank, dims, data);
-      }
-
-
-      /**
-       * @brief Writes an Attribute to an HDF5 Object
-       * @param loc_id The Parent Location of the HDFobject that is getting the attribute
-       * @param objName The Name of Object to write the attribute into.
-       * @param attrName The Name of the Attribute
-       * @param dims The Dimensions of the data set
-       * @param data The Attribute Data to write
-       * @return Standard HDF Error Condition
-       *
-       */
-      template <typename T>
-      static herr_t writeVectorAttribute(hid_t loc_id,
-                                         const QString& objName,
-                                         const QString& attrName,
-                                         QVector<hsize_t>& dims,
-                                         QVector<T>& data )
-      {
-        return H5Lite::writePointerAttribute(loc_id, objName.toStdString(), attrName.toStdString(), dims.size(), dims.data(), data.data());
-      }
-
-      /**
-       * @brief Writes a string as a null terminated attribute.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The name of the Attribute
-       * @param data The string to write as the attribute
-       * @return Standard HDF error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringAttribute(hid_t loc_id,
-                                                           const QString& objName,
-                                                           const QString& attrName,
-                                                           const QString& data);
-      /**
-       * @brief Writes a null terminated string as an attribute
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The name of the Attribute
-       * @param size The number of characters  in the string
-       * @param data pointer to a const char array
-       * @return Standard HDF error conditions
-       */
-      static H5Support_EXPORT herr_t  writeStringAttribute(hid_t loc_id,
-                                                           const QString& objName,
-                                                           const QString& attrName,
-                                                           hsize_t size,
-                                                           const char* data);
-
-
-      /**
-       * @brief Writes attributes that all have a data type of STRING. The first value
-       * in each set is the key, the second is the actual value of the attribute.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attributes The attributes to be written where the first value is the name
-       * of the attribute, and the second is the actual value of the attribute.
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t writeStringAttributes(hid_t loc_id,
-                                                           const QString& objName,
-                                                           const QMap<QString, QString>& attributes);
-
-      /**
-       * @brief Returns the total number of elements in the supplied dataset
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A std::vector<T>. Note the vector WILL be resized to fit the data.
-       * The best idea is to just allocate the vector but not to size it. The method
-       * will size it for you.
-       * @return Number of elements in dataset
-       */
-      static H5Support_EXPORT hsize_t getNumberOfElements(hid_t loc_id,
-                                      const QString& dsetName);
-
-      /**
-       * @brief Writes an attribute to the given object. This method is designed with
-       * a Template parameter that represents a primitive value. If you need to write
-       * an array, please use the other over loaded method that takes a vector.
-       * @param loc_id The location to look for objName
-       * @param objName The Object to write the attribute to
-       * @param attrName The  name of the attribute
-       * @param data The data to be written as the attribute
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t writeScalarAttribute(hid_t loc_id,
-                                         const QString& objName,
-                                         const QString& attrName,
-                                         T data )
-      {
-        return H5Lite::writeScalarAttribute(loc_id, objName.toStdString(), attrName.toStdString(), data);
-      }
-
-      /**
-       * @brief Reads data from the HDF5 File into a preallocated array.
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A Pointer to the PreAllocated Array of Data
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t readPointerDataset(hid_t loc_id,
-                                       const QString& dsetName,
-                                       T* data)
-      {
-        return H5Lite::readPointerDataset(loc_id, dsetName.toStdString(), data);
-      }
-
-
-      /**
-       * @brief Reads data from the HDF5 File into an QVector<T> object. If the dataset
-       * is very large this can be an expensive method to use. It is here for convenience
-       * using STL with hdf5.
-       * @param loc_id The parent location that contains the dataset to read
-       * @param dsetName The name of the dataset to read
-       * @param data A QVector<T>. Note the vector WILL be resized to fit the data.
-       * The best idea is to just allocate the vector but not to size it. The method
-       * will size it for you.
-       * @return Standard HDF error condition
-       */
-      template <typename T>
-      static herr_t readVectorDataset(hid_t loc_id,
-                                      const QString& dsetName,
-                                      std::vector<T>& data)
-      {
-        std::string dsetNameStr = dsetName.toStdString();
-        herr_t  err = H5Lite::readVectorDataset(loc_id, dsetNameStr, data);
-        return err;
-      }
-
-
-      /**
-       * @brief Reads a dataset that consists of a single scalar value
-       * @param loc_id The HDF5 file or group id
-       * @param dsetName The name or path to the dataset to read
-       * @param data The variable to store the data into
-       * @return HDF error condition.
-       */
-      template <typename T>
-      static herr_t readScalarDataset(hid_t loc_id,
-                                      const QString& dsetName,
-                                      T& data)
-      {
-        std::string dsetNameStr = dsetName.toStdString();
-        herr_t  err = H5Lite::readScalarDataset(loc_id, dsetNameStr, data);
-        return err;
-      }
-
-
-      /**
-       * @brief Reads a string dataset into the supplied string. Any data currently in the 'data' variable
-       * is cleared first before the new data is read into the string.
-       * @param loc_id The parent group that holds the data object to read
-       * @param dsetName The name of the dataset.
-       * @param data The QString to hold the data
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t readStringDataset(hid_t loc_id,
-                                                       const QString& dsetName,
-                                                       QString& data);
-
-
-      /**
-        * @brief
-        * @param loc_id
-        * @param dsetName
-        * @param data
-        * @return
-        */
-      static H5Support_EXPORT herr_t readVectorOfStringDataset(hid_t loc_id,
-                                                               const QString& dsetName,
-                                                               QVector<QString>& data);
-      /**
-       * @brief reads a null terminated string dataset into the supplied buffer. The buffer
-       * should be already preallocated.
-       * @param loc_id The parent group that holds the data object to read
-       * @param dsetName The name of the dataset.
-       * @param data pointer to the buffer
-       * @return Standard HDF error condition
-       */
-      static H5Support_EXPORT herr_t readStringDataset(hid_t loc_id,
-                                                       const QString& dsetName,
-                                                       char* data);
-
-      /**
-       * @brief Reads an Attribute from an HDF5 Object.
-       *
-       * Use this method if you already know the datatype of the attribute. If you do
-       * not know this already then use another form of this method.
-       *
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data
-       * @return Standard HDF Error condition
-       */
-      template <typename T>
-      static herr_t readVectorAttribute(hid_t loc_id, const QString& objName, const QString& attrName, std::vector<T>& data)
-      {
-
-        std::string objNameStr = objName.toStdString();
-        std::string attrNameStr = attrName.toStdString();
-        std::vector<T> dataV;
-        herr_t  err = H5Lite::readVectorAttribute(loc_id, objNameStr, attrNameStr, dataV);
-        data.resize(dataV.size());
-        std::copy(dataV.begin(), dataV.end(), data.begin());
-        return err;
-      }
-
-      /**
-       * @brief Reads a scalar attribute value from a dataset
-       * @param loc_id
-       * @param objName The name of the dataset
-       * @param attrName The name of the Attribute
-       * @param data The preallocated memory for the variable to be stored into
-       * @return Standard HDF5 error condition
-       */
-      template <typename T>
-      static herr_t  readScalarAttribute(hid_t loc_id,
-                                         const QString& objName,
-                                         const QString& attrName,
-                                         T& data)
-      {
-        std::string objNameStr = objName.toStdString();
-        std::string attrNameStr = attrName.toStdString();
-        herr_t  err = H5Lite::readScalarAttribute(loc_id, objNameStr, attrNameStr, data);
-        return err;
-      }
-
-      /**
-       * @brief Reads the Attribute into a pre-allocated pointer
-       * @param loc_id
-       * @param objName The name of the dataset
-       * @param attrName The name of the Attribute
-       * @param data The preallocated memory for the variable to be stored into
-       * @return Standard HDF5 error condition
-       */
-      template <typename T>
-      static herr_t readPointerAttribute(hid_t loc_id,
-                                         const QString& objName,
-                                         const QString& attrName,
-                                         T* data)
-      {
-        std::string objNameStr = objName.toStdString();
-        std::string attrNameStr = attrName.toStdString();
-        herr_t  err = H5Lite::readPointerAttribute(loc_id, objNameStr, attrNameStr, data);
-        return err;
-      }
-
-      /**
-       * @brief Reads a string attribute from an HDF object
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data
-       * @return Standard HDF Error condition
-       */
-      static H5Support_EXPORT herr_t readStringAttribute(hid_t loc_id,
-                                                         const QString& objName,
-                                                         const QString& attrName,
-                                                         QString& data);
-
-      /**
-       * @brief Reads a string attribute from an HDF object into a precallocated buffer
-       * @param loc_id The Parent object that holds the object to which you want to read an attribute
-       * @param objName The name of the object to which the attribute is to be read
-       * @param attrName The name of the Attribute to read
-       * @param data The memory to store the data into
-       * @return Standard HDF Error condition
-       */
-      static H5Support_EXPORT herr_t readStringAttribute(hid_t loc_id,
-                                                         const QString& objName,
-                                                         const QString& attrName,
-                                                         char* data);
-      /**
-       * @brief Returns the number of dimensions for a given attribute
-       * @param loc_id The HDF5 id of the parent group/file for the objName
-       * @param objName The name of the dataset
-       * @param attrName The name of the attribute
-       * @param rank (out) Number of dimensions is store into this variable
-       */
-      static H5Support_EXPORT herr_t getAttributeNDims(hid_t loc_id, const QString& objName, const QString& attrName, hid_t& rank);
-
-      /**
-       * @brief Returns the number of dimensions for a given dataset
-       * @param loc_id The HDF5 id of the parent group/file for the objName
-       * @param objName The name of the dataset
-       * @param rank (out) Number of dimensions is store into this variable
-       */
-      static H5Support_EXPORT herr_t getDatasetNDims(hid_t loc_id, const QString& dsetName, hid_t& rank);
-
-      /**
-       * @brief Returns the H5T value for a given dataset.
-       *
-       * Returns the type of data stored in the dataset. You MUST use H5Tclose(tid)
-       * on the returned value or resource leaks will occur.
-       * @param loc_id A Valid HDF5 file or group id.
-       * @param dsetName Path to the dataset
-       * @return
-       */
-      static H5Support_EXPORT hid_t getDatasetType(hid_t loc_id, const QString& dsetName);
-
-      /**
-       * @brief Get the information about a dataset.
-       *
-       * @param loc_id The parent location of the Dataset
-       * @param dsetName The name of the dataset
-       * @param dims A QVector that will hold the sizes of the dimensions
-       * @param type_class The HDF5 class type
-       * @param type_size THe HDF5 size of the data
-       * @return Negative value is Failure. Zero or Positive is success;
-       */
-      static H5Support_EXPORT herr_t getDatasetInfo( hid_t loc_id,
-                                                     const QString& dsetName,
-                                                     QVector<hsize_t>& dims,
-                                                     H5T_class_t& classType,
-                                                     size_t& sizeType );
-
-      /**
-       * @brief Returns the information about an attribute.
-       * You must close the attributeType argument or resource leaks will occur. Use
-       *  H5Tclose(attr_type); after your call to this method if you do not need the id for
-       *   anything.
-       * @param loc_id The parent location of the Dataset
-       * @param objName The name of the dataset
-       * @param attr_name The name of the attribute
-       * @param dims A QVector that will hold the sizes of the dimensions
-       * @param type_class The HDF5 class type
-       * @param type_size THe HDF5 size of the data
-       * @param attr_type The Attribute ID - which needs to be closed after you are finished with the data
-       * @return
-       */
-      static H5Support_EXPORT herr_t getAttributeInfo(hid_t loc_id,
-                                                      const QString& objName,
-                                                      const QString& attrName,
-                                                      QVector<hsize_t>& dims,
-                                                      H5T_class_t& type_class,
-                                                      size_t& type_size,
-                                                      hid_t& tid);
-
-
-// -----------------------------------------------------------------------------
-    protected:
-      QH5Lite();
-      ~QH5Lite();
-
-
-    private:
-
-  };
-
-
-#if defined (H5Support_NAMESPACE)
-}
-#endif
-
diff --git a/Source/H5Support/QH5Utilities.cpp b/Source/H5Support/QH5Utilities.cpp
deleted file mode 100644
index 701606c6f5..0000000000
--- a/Source/H5Support/QH5Utilities.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <H5Support/QH5Utilities.h>
-
-#include <QtCore/QFileInfo>
-#include <QtCore/QtDebug>
-
-#define CheckValidLocId(locId)                                                                                                                                                                         \
-  if((locId) < 0)                                                                                                                                                                                        \
-  {                                                                                                                                                                                                    \
-    qDebug() << "Invalid HDF Location ID: " << (locId);                                                                                                                                                  \
-    return -1;                                                                                                                                                                                         \
-  }
-
-#if defined(H5Support_NAMESPACE)
-using namespace H5Support_NAMESPACE;
-#endif
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t QH5Utilities::createFile(const QString& filename)
-{
-  return H5Utilities::createFile(filename.toStdString());
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t QH5Utilities::openFile(const QString& filename, bool readOnly)
-{
-  return H5Utilities::openFile(filename.toStdString(), readOnly);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Utilities::closeFile(hid_t& fileId)
-{
-  return H5Utilities::closeFile(fileId);
-}
-
-// -----------------------------------------------------------------------------
-//  Returns the full path to the object referred to by the
-// -----------------------------------------------------------------------------
-QString QH5Utilities::getObjectPath(hid_t loc_id, bool trim)
-{
-  return QString::fromStdString(H5Utilities::getObjectPath(loc_id, trim));
-}
-
-// -----------------------------------------------------------------------------
-// @brief Retrieves the HDF object type for obj_name at loc_id and stores
-//    it in the parameter obj_type passed in.
-// -----------------------------------------------------------------------------
-herr_t QH5Utilities::getObjectType(hid_t objId, const QString& objName, int32_t* objType)
-{
-  return H5Utilities::getObjectType(objId, objName.toStdString(), objType);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::getParentPath(hid_t objId)
-{
-  return QString::fromStdString(H5Utilities::getParentPath(objId));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::getParentPath(const QString& objectPath)
-{
-  return QString::fromStdString(H5Utilities::getParentPath(objectPath.toStdString()));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::getObjectNameFromPath(const QString& objectPath)
-{
-  return QString::fromStdString(H5Utilities::getObjectNameFromPath(objectPath.toStdString()));
-}
-
-// Opens and returns the HDF object (since the HDF api requires
-//  different open and close methods for different types of objects
-hid_t QH5Utilities::openHDF5Object(hid_t loc_id, const QString& objName)
-{
-  return H5Utilities::openHDF5Object(loc_id, objName.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Utilities::closeHDF5Object(hid_t obj_id)
-{
-  return H5Utilities::closeHDF5Object(obj_id);
-}
-
-//--------------------------------------------------------------------//
-// HDF Group Methods
-//--------------------------------------------------------------------//
-herr_t QH5Utilities::getGroupObjects(hid_t loc_id, int32_t typeFilter, QList<QString>& names)
-{
-
-  std::list<std::string> sNames;
-  herr_t err = H5Utilities::getGroupObjects(loc_id, typeFilter, sNames);
-
-  names.clear();
-  for(auto & sName : sNames)
-  {
-    names.push_back(QString::fromStdString(sName));
-  }
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-// HDF Creation/Modification Methods
-// -----------------------------------------------------------------------------
-hid_t QH5Utilities::createGroup(hid_t loc_id, const QString& group)
-{
-  return H5Utilities::createGroup(loc_id, group.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t QH5Utilities::createGroupsForDataset(const QString& datasetPath, hid_t parent)
-{
-  return H5Utilities::createGroupsForDataset(datasetPath.toStdString(), parent);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int32_t QH5Utilities::createGroupsFromPath(const QString& pathToCheck, hid_t parent)
-{
-  return H5Utilities::createGroupsFromPath(pathToCheck.toStdString(), parent);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::extractObjectName(const QString& path)
-{
-  return QString::fromStdString(H5Utilities::extractObjectName(path.toStdString()));
-}
-
-//--------------------------------------------------------------------//
-// HDF Attribute Methods
-//--------------------------------------------------------------------//
-bool QH5Utilities::probeForAttribute(hid_t loc_id, const QString& obj_name, const QString& attr_name)
-{
-  return H5Utilities::probeForAttribute(loc_id, obj_name.toStdString(), attr_name.toStdString());
-}
-
-//--------------------------------------------------------------------//
-// Returns a QList of all attribute names attached to the object
-//  referred to by obj_id
-//--------------------------------------------------------------------//
-herr_t QH5Utilities::getAllAttributeNames(hid_t obj_id, QList<QString>& names)
-{
-  names.clear();
-  std::list<std::string> sResults;
-  herr_t err = H5Utilities::getAllAttributeNames(obj_id, sResults);
-  for(auto & sResult : sResults)
-  {
-    names.push_back(QString::fromStdString(sResult));
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t QH5Utilities::getAllAttributeNames(hid_t loc_id, const QString& obj_name, QList<QString>& names)
-{
-  names.clear();
-  std::list<std::string> sResults;
-  herr_t err = H5Utilities::getAllAttributeNames(loc_id, obj_name.toStdString(), sResults);
-  for(auto & sResult : sResults)
-  {
-    names.push_back(QString::fromStdString(sResult));
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::HDFClassTypeAsStr(hid_t class_type)
-{
-  return QString::fromStdString(H5Utilities::HDFClassTypeAsStr(class_type));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void QH5Utilities::printHDFClassType(H5T_class_t class_type)
-{
-  std::string hType = H5Utilities::HDFClassTypeAsStr(class_type);
-  qDebug() << QString::fromStdString(hType);
-}
-
-// -----------------------------------------------------------------------------
-//  Returns a QString that is the name of the object at the given index
-// -----------------------------------------------------------------------------
-herr_t QH5Utilities::objectNameAtIndex(hid_t fileId, int32_t idx, QString& name)
-{
-  std::string sName;
-  herr_t err = H5Utilities::objectNameAtIndex(fileId, idx, sName);
-  name = QString::fromStdString(sName);
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-// Checks the given name object to see what type of HDF5 object it is.
-// -----------------------------------------------------------------------------
-bool QH5Utilities::isGroup(hid_t nodeId, const QString& objName)
-{
-  return H5Utilities::isGroup(nodeId, objName.toStdString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::fileNameFromFileId(hid_t fileId)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  // Get the name of the .dream3d file that we are writing to:
-  ssize_t nameSize = H5Fget_name(fileId, nullptr, 0) + 1;
-  QByteArray nameBuffer(nameSize, 0);
-  nameSize = H5Fget_name(fileId, nameBuffer.data(), nameSize);
-
-  QString hdfFileName(nameBuffer);
-  QFileInfo fi(hdfFileName);
-  hdfFileName = fi.fileName();
-  return hdfFileName;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString QH5Utilities::absoluteFilePathFromFileId(hid_t fileId)
-{
-  H5SUPPORT_MUTEX_LOCK()
-
-  // Get the name of the .dream3d file that we are writing to:
-  ssize_t nameSize = H5Fget_name(fileId, nullptr, 0) + 1;
-  QByteArray nameBuffer(nameSize, 0);
-  nameSize = H5Fget_name(fileId, nameBuffer.data(), nameSize);
-
-  QString hdfFileName(nameBuffer);
-  QFileInfo fi(hdfFileName);
-  return fi.absoluteFilePath();
-}
diff --git a/Source/H5Support/QH5Utilities.h b/Source/H5Support/QH5Utilities.h
deleted file mode 100644
index d5c7240cd6..0000000000
--- a/Source/H5Support/QH5Utilities.h
+++ /dev/null
@@ -1,241 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-
-#include "H5Support/H5Support.h"
-#include "H5Support/H5Utilities.h"
-
-#if !defined (H5Support_USE_QT)
-#error THIS FILE SHOULD NOT BE INCLUDED UNLESS THE H5Support_USE_QT is also defined
-#endif
-
-
-#include <QtCore/QString>
-#include <QtCore/QList>
-
-
-/**
- * @brief General Utilities for working with the HDF5 data files and API
- */
-class QH5Utilities
-{
-
-  public:
-
-    virtual ~QH5Utilities();
-
-
-    static H5Support_EXPORT hid_t openFile(const QString& filename, bool readOnly = false);
-
-    static H5Support_EXPORT hid_t createFile(const QString& filename);
-
-
-    static H5Support_EXPORT herr_t closeFile(hid_t& fileId);
-
-    // -------------- HDF Indentifier Methods ----------------------------
-    /**
-    * @brief Retuirns the path to an object
-    * @param objId The HDF5 id of the object
-    * @param trim set to False to trim the path
-    * @return  The path to the object relative to the objId
-    */
-    static H5Support_EXPORT QString getObjectPath(hid_t loc_id, bool trim = false);
-
-    /**
-    * @brief Returns the hdf object type
-    * @param objId The hdf5 object id
-    * @param objName The path to the data set
-    * @param objType The type of the object
-    * @return  Negative value on error
-    */
-    static H5Support_EXPORT herr_t getObjectType(hid_t objId, const QString& objName, int32_t* objType);
-
-    /**
-    * @brief Retrieves the object name for a given index
-    * @param fileId The hdf5 object id
-    * @param idx The index to retrieve the name for
-    * @param name The variable to store the name
-    * @return Negative value is error
-    */
-    static H5Support_EXPORT herr_t objectNameAtIndex(hid_t fileId, int32_t idx, QString& name);
-
-    /**
-    * @brief Returns the path to an object's parent
-    * @param objId The HDF5 id of the object
-    * @param trim set to False to trim the path
-    * @return  The path to the object relative to the objId
-    */
-    static H5Support_EXPORT QString getParentPath(hid_t objId);
-
-    /**
-    * @brief Returns the path to an object's parent
-    * @param objectPath The HDF5 path to the object
-    * @param trim set to False to trim the path
-    * @return  The path to the object relative to the objId
-    */
-    static H5Support_EXPORT QString getParentPath(const QString& objectPath);
-
-    /**
-    * @brief Returns the object name from the object's path
-    * @param objectPath The HDF5 path to the object
-    * @return  The object name
-    */
-    static H5Support_EXPORT QString getObjectNameFromPath(const QString& objectPath);
-
-    /**
-    * @brief Returns if a given hdf5 object is a group
-    * @param objId The hdf5 object that contains an object with name objName
-    * @param objName The name of the object to check
-    * @return True if the given hdf5 object id is a group
-    */
-    static H5Support_EXPORT bool isGroup(hid_t nodeId, const QString& objName);
-
-
-    /**
-    * @brief Opens an HDF5 object for hdf5 operations
-    * @param locId the Object id of the parent
-    * @param objectPath The path of the object to open
-    * @return The hdf5 id of the opened object. Negative value is error.
-    */
-    static H5Support_EXPORT hid_t openHDF5Object(hid_t loc_id, const QString& objName);
-
-    /**
-    * @brief Closes the object id
-    * @param locId The object id to close
-    * @return Negative value is error.
-    */
-    static H5Support_EXPORT herr_t closeHDF5Object(hid_t obj_id);
-
-
-    static H5Support_EXPORT QString HDFClassTypeAsStr(hid_t class_type);
-
-    /**
-    * @brief prints the class type of the given class
-    * @param classT The Class Type to print
-    */
-    static H5Support_EXPORT void printHDFClassType(H5T_class_t class_type);
-
-    // -------------- HDF Group Methods ----------------------------
-    /**
-    * @brief Returns a list of child hdf5 objects for a given object id
-    * @param loc_id The parent hdf5 id
-    * @param typeFilter A filter to apply to the list
-    * @param names Variable to store the list
-    * @return
-    */
-    static H5Support_EXPORT herr_t getGroupObjects(hid_t loc_id, int32_t typeFilter, QList<QString>& names);
-
-    /**
-     * @brief Creates a HDF Group by checking if the group already exists. If the
-     * group already exists then that group is returned otherwise a new group is
-     * created.
-     * @param loc_id The HDF unique id given to files or groups
-     * @param group The name of the group to create. Note that this group name should
-     * not be any sort of 'path'. It should be a single group.
-     */
-    static H5Support_EXPORT hid_t createGroup(hid_t loc_id, const QString& group);
-
-    /**
-     * @brief Given a path relative to the Parent ID, this method will create all
-     * the intermediate groups if necessary.
-     * @param pathToCheck The path to either create or ensure exists.
-     * @param parent The HDF unique id for the parent
-     * @return Error Condition: Negative is error. Positive is success.
-     */
-    static H5Support_EXPORT herr_t  createGroupsFromPath(const QString& pathToCheck, hid_t parent);
-
-    /**
-     * @brief Given a path relative to the Parent ID, this method will create all
-     * the intermediate groups if necessary.
-     * @param datasetPath The path to the dataset that you want to make all the intermediate groups for
-     * @param parent The HDF unique id for the parent
-     * @return Error Condition: Negative is error. Positive is success.
-     */
-    static H5Support_EXPORT herr_t createGroupsForDataset(const QString& datasetPath, hid_t parent);
-
-    /**
-    * @brief Extracts the object name from a given path
-    * @param path The path which to extract the object name
-    * @return The name of the object
-    */
-    static H5Support_EXPORT QString extractObjectName(const QString& path);
-
-    // -------------- HDF Attribute Methods ----------------------------
-    /**
-    * @brief Looks for an attribute with a given name
-    * @param loc_id The objects Parent id
-    * @param obj_name The name of the object
-    * @param attr_name The attribute to look for (by name)
-    * @return True if the attribute exists.
-    */
-    static H5Support_EXPORT bool probeForAttribute(hid_t loc_id,
-                                                   const QString& obj_name,
-                                                   const QString& attr_name);
-
-
-    /**
-    * @brief Returns a list of all the attribute names
-    * @param objId The parent object
-    * @param names Variable to hold the list of attribute names
-    * @return Negate value is error
-    */
-    static H5Support_EXPORT herr_t getAllAttributeNames(hid_t obj_id, QList<QString>& names);
-
-    /**
-    * @brief Returns a list of all the attribute names
-    * @param objId The parent object
-    * @param obj_name The name of the object whose attribute names you want a list
-    * @param names Variable to hold the list of attribute names
-    * @return Negative value is error
-    */
-    static H5Support_EXPORT herr_t getAllAttributeNames(hid_t loc_id, const QString& obj_name,
-                                                        QList<QString>& names);
-
-
-    static H5Support_EXPORT QString fileNameFromFileId(hid_t fileId);
-    static H5Support_EXPORT QString absoluteFilePathFromFileId(hid_t fileId);
-
-
-  protected:
-    QH5Utilities() = default; // This is just a bunch of Static methods
-
-  private:
-    QH5Utilities(const QH5Utilities&);   //Copy Constructor Not Implemented
-    void operator=(const QH5Utilities&); //Copy Assignment Not Implemented
-};
-
-
diff --git a/Source/H5Support/Test/BigHDF5DatasetTest.cpp b/Source/H5Support/Test/BigHDF5DatasetTest.cpp
deleted file mode 100644
index 7d97c7d766..0000000000
--- a/Source/H5Support/Test/BigHDF5DatasetTest.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include <iostream>
-
-#include "H5Support/H5Lite.h"
-#include "H5Support/H5Utilities.h"
-
-int main(int argc, char** argv)
-{
-  std::cout << "Test starting" << std::endl;
-  hsize_t size = 5294967296ull;
-  unsigned char* data = reinterpret_cast<unsigned char*>(malloc(size));
-
-  hid_t fileId = H5Utilities::createFile("/tmp/BIG_HDF5_DATASET.h5");
-  hid_t groupId = H5Utilities::createGroup(fileId, "big_data");
-  if(groupId < 0)
-  {
-    std::cout << "Error creating Group" << std::endl;
-    return EXIT_FAILURE;
-  }
-
-  hsize_t dims[2] = {size, 0};
-  herr_t err = H5Lite::writePointerDataset(groupId, "TEST", 1, dims, data);
-  if(err < 0)
-  {
-    return EXIT_FAILURE;
-  }
-  H5Utilities::closeHDF5Object(groupId);
-  H5Utilities::closeFile(fileId);
-  return EXIT_SUCCESS;
-}
diff --git a/Source/H5Support/Test/CMakeLists.txt b/Source/H5Support/Test/CMakeLists.txt
deleted file mode 100755
index 990e1bb40c..0000000000
--- a/Source/H5Support/Test/CMakeLists.txt
+++ /dev/null
@@ -1,105 +0,0 @@
-#--////////////////////////////////////////////////////////////////////////////
-#--
-#--  Copyright (c) 2015, BlueQuartz Software
-#--  All rights reserved.
-#--  BSD License: http://www.opensource.org/licenses/bsd-license.html
-#--
-#-- This code was partly written under US Air Force Contract FA8650-07-D-5800
-#--
-#--////////////////////////////////////////////////////////////////////////////
-
-# project(H5SupportTest)
-set(PLUGIN_NAME "H5Support")
-set(${PLUGIN_NAME}Test_SOURCE_DIR ${${PLUGIN_NAME}_SOURCE_DIR}/Test)
-set(${PLUGIN_NAME}Test_BINARY_DIR ${${PLUGIN_NAME}_BINARY_DIR}/Test)
-
-include(${CMP_SOURCE_DIR}/cmpCMakeMacros.cmake)
-
-
-
-
-set(TEST_TEMP_DIR ${${PLUGIN_NAME}Test_BINARY_DIR}/Test/Temp)
-# Make sure the directory is created during CMake time
-file(MAKE_DIRECTORY ${TEST_TEMP_DIR})
-
-configure_file(${${PLUGIN_NAME}_SOURCE_DIR}/Test/TestFileLocations.h.in
-          ${${PLUGIN_NAME}_BINARY_DIR}/Test/${PLUGIN_NAME}TestFileLocations.h @ONLY IMMEDIATE)
-
-configure_file(${SIMPLProj_SOURCE_DIR}/Resources/UnitTestSupport.hpp
-          ${${PLUGIN_NAME}_BINARY_DIR}/Test/UnitTestSupport.hpp COPYONLY IMMEDIATE)
-
-set(TEST_NAMES
-  H5LiteTest
-  H5UtilitiesTest
-  )
-
-
-set( ${PLUGIN_NAME}_TEST_SRCS )
-set(FilterTestIncludes "")
-set(TestMainFunctors "")
-
-foreach(name  ${TEST_NAMES})
-  set( ${PLUGIN_NAME}_TEST_SRCS
-    ${${PLUGIN_NAME}_TEST_SRCS}
-    "${${PLUGIN_NAME}_SOURCE_DIR}/Test/${name}.cpp"
-    )
-  string(CONCAT
-    FilterTestIncludes
-    ${FilterTestIncludes}
-    "#include \"${${PLUGIN_NAME}_SOURCE_DIR}/Test/${name}.cpp\"\n"
-    )
-
-  string(CONCAT
-    TestMainFunctors
-   ${TestMainFunctors}
-   "  ${name}()()|\n")
-endforeach()
-
-STRING(REPLACE "|" ";" TestMainFunctors ${TestMainFunctors}   )
-
-configure_file(${${PLUGIN_NAME}_SOURCE_DIR}/Test/${PLUGIN_NAME}TestMain.cpp.in
-               ${${PLUGIN_NAME}Test_BINARY_DIR}/${PLUGIN_NAME}UnitTest.cpp @ONLY)
-
-# Set the source files properties on each source file.
-foreach(f ${${PLUGIN_NAME}_TEST_SRCS})
-  set_source_files_properties( ${f} PROPERTIES HEADER_FILE_ONLY TRUE)
-endforeach()
-
-get_filename_component(TARGET_SOURCE_DIR_PARENT ${${PLUGIN_NAME}_SOURCE_DIR} PATH)
-get_filename_component(TARGET_BINARY_DIR_PARENT ${${PLUGIN_NAME}_BINARY_DIR} PATH)
-
-
-AddSIMPLUnitTest(TESTNAME H5SupportUnitTest
-  SOURCES 
-    ${${PLUGIN_NAME}Test_BINARY_DIR}/${PLUGIN_NAME}UnitTest.cpp 
-    ${${PLUGIN_NAME}_TEST_SRCS}
-  FOLDER 
-    "H5SupportProj/Test"
-  LINK_LIBRARIES 
-    Qt5::Core 
-    H5Support 
-    SIMPLib
-  INCLUDE_DIRS 
-    ${TARGET_SOURCE_DIR_PARENT} 
-    ${TARGET_BINARY_DIR_PARENT} 
-    ${${PLUGIN_NAME}_SOURCE_DIR}/Test 
-    ${${PLUGIN_NAME}_BINARY_DIR}/Test 
-    ${${PLUGIN_NAME}Test_BINARY_DIR}
-    ${SIMPLProj_SOURCE_DIR}/Source
-  )
-
-if(MSVC)
-  set_source_files_properties( ${${PLUGIN_NAME}Test_BINARY_DIR}/${PLUGIN_NAME}UnitTest.cpp PROPERTIES COMPILE_FLAGS /bigobj)
-endif()
-
-
-if(0)
-  # This is just a quick test to make sure that the latest HDF5 can actually write data
-  # sets that are larger than 4GB in size
-  add_executable(BigHDF5DatasetTest ${DREAM3DTest_SOURCE_DIR}/BigHDF5DatasetTest.cpp)
-  target_link_libraries(BigHDF5DatasetTest Qt5::Core H5Support )
-  set_target_properties(BigHDF5DatasetTest PROPERTIES FOLDER Test)
-  add_test(BigHDF5DatasetTest ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/BigHDF5DatasetTest)
-
-
-endif()
diff --git a/Source/H5Support/Test/H5LiteTest.cpp b/Source/H5Support/Test/H5LiteTest.cpp
deleted file mode 100644
index bd0540ac67..0000000000
--- a/Source/H5Support/Test/H5LiteTest.cpp
+++ /dev/null
@@ -1,1354 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (c) 2007, 2010 Michael A. Jackson for BlueQuartz Software
-//  All rights reserved.
-//  BSD License: http://www.opensource.org/licenses/bsd-license.html
-//
-//  This code was written under United States Air Force Contract number
-//                           FA8650-04-C-5229
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <iostream>
-#include <stdlib.h>
-#include <string>
-
-#include <QtCore/QByteArray>
-#include <QtCore/QFile>
-#include <QtCore/QString>
-#include <QtCore/QtDebug>
-
-#include "H5Support/H5Lite.h"
-#include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Lite.h"
-#include "H5Support/QH5Utilities.h"
-
-// THIS IS REALLY DANGEROUS AS IT COULD SETUP A CIRCULAR REFERENCE WITH LIBRARY DEPENDECIES.
-#include "UnitTestSupport.hpp"
-
-#include "H5SupportTestFileLocations.h"
-
-#define DSET0_NAME "2D int32_t array"
-#define DSET1_NAME "dataset char"
-#define DSET2_NAME "dataset short"
-#define DSET3_NAME "dataset int"
-#define DSET4_NAME "dataset long"
-#define DSET5_NAME "dataset float"
-#define DSET6_NAME "dataset double"
-#define DSET7_NAME "dataset string"
-
-#define DIM 6
-#define DIM0 4
-#define DIM1 3
-#define DIM2 2
-
-#define RANK_1D 1
-#define RANK_2D 2
-#define RANK_3D 3
-
-#define H5ATTRIBUTE_INSTANCE(m_msgType, Suffix, key)                                                                                                                                                   \
-  Suffix##H5Attribute::Pointer m_msgType##_attr = Suffix##H5Attribute::New();                                                                                                                          \
-  m_msgType##_attr->setKey(key);
-
-/* Methods to test
- *
- * HDFTypeFromString
- * HDFTypeForPrimitiveAsStr
- * HDFTypeForPrimitive
- * writeVectorDataset - DONE
- * writePointerDataset - DONE
- * writeScalarDataset - DONE
- * writeStringDataset - DONE
- * writeStringDataset - DONE
- * writePointerAttribute - DONE
- * writeVectorAttribute - DONE
- * writeStringAttribute - DONE
- * writeStringAttribute - DONE
- * writeStringAttributes - DONE
- * writeScalarAttribute - DONE
- * readPointerDataset - DONE
- * readVectorDataset - DONE
- * readScalarDataset - DONE
- * readStringDataset - DONE
- * readStringDataset - DONE
- * readVectorAttribute - DONE
- * readScalarAttribute - DONE
- * readPointerAttribute - DONE
- * readStringAttribute - DONE
- * readStringAttribute - DONE
- * getAttributeNDims - DONE
- * getDatasetNDims - DONE
- * getDatasetType
- * getDatasetInfo - DONE
- * getAttributeInfo - DONE
- */
-
-herr_t testMakeStringDataset(hid_t file_id);
-herr_t testMakeStringAttribute(hid_t file_id);
-void QH5LiteTest();
-template <typename T> herr_t testWritePointer1DArrayAttribute(hid_t file_id, const QString& dsetName);
-
-class H5LiteTest
-{
-public:
-  H5LiteTest() = default;
-  virtual ~H5LiteTest() = default;
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void RemoveTestFiles()
-  {
-#if REMOVE_TEST_FILES
-    QFile::remove(UnitTest::H5LiteTest::FileName);
-    QFile::remove(UnitTest::H5LiteTest::LargeFile);
-#endif
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer1DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "1DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = 1;
-    T data[DIM0];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      data[i] = (T)(i);
-    }
-    hsize_t dims[1];
-    dims[0] = DIM0;
-
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadPointer1DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    herr_t retErr = err;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "1DArrayAttribute<" + attributeKey + ">";
-    QVector<T> referenceData(DIM0, 0);
-    for(int i = 0; i < DIM0; ++i)
-    {
-      referenceData[i] = (T)(i);
-    }
-
-    H5T_class_t attr_type;
-    size_t attr_size;
-    hid_t typeId = -1;
-    QVector<hsize_t> dims; // Reusable for the loop
-    err = QH5Lite::getAttributeInfo(file_id, dsetName, attributeKey, dims, attr_type, attr_size, typeId);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(dims.size() == 1);
-    DREAM3D_REQUIRE(attr_size == sizeof(T));
-    hid_t rank = 0;
-    err = QH5Lite::getAttributeNDims(file_id, dsetName, attributeKey, rank);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(rank == 1);
-    CloseH5T(typeId, err, retErr); // Close the H5A type Id that was retrieved during the loop
-    typename QVector<T>::size_type numElements = 1;
-    for(QVector<uint64_t>::size_type i = 0; i < dims.size(); ++i)
-    {
-      numElements = numElements * dims[i];
-    }
-    QVector<T> data(numElements, 0);
-    err = QH5Lite::readPointerAttribute<T>(file_id, dsetName, attributeKey, data.data());
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(data == referenceData);
-
-    return retErr;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer2DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    // qDebug() << DEBUG_OUT(logTime) << "testWritePointer2DArrayAttribute" << "\n";
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-
-    attributeKey = "2DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = RANK_2D;
-    T data[DIM0][DIM1];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        data[i][j] = (T)(i * j);
-      }
-    }
-    hsize_t dims[RANK_2D];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadPointer2DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    herr_t retErr = err;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "2DArrayAttribute<" + attributeKey + ">";
-    T referenceData[DIM0][DIM1];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        referenceData[i][j] = (T)(i * j);
-      }
-    }
-    H5T_class_t attr_type;
-    size_t attr_size;
-    hid_t typeId = -1;
-    QVector<hsize_t> dims; // Reusable for the loop
-    err = QH5Lite::getAttributeInfo(file_id, dsetName, attributeKey, dims, attr_type, attr_size, typeId);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(dims.size() == 2);
-    DREAM3D_REQUIRE(attr_size == sizeof(T));
-    hid_t rank = 0;
-    err = QH5Lite::getAttributeNDims(file_id, dsetName, attributeKey, rank);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(rank == 2);
-
-    CloseH5T(typeId, err, retErr); // Close the H5A type Id that was retrieved during the loop
-    typename QVector<T>::size_type numElements = 1;
-    for(QVector<uint64_t>::size_type i = 0; i < dims.size(); ++i)
-    {
-      numElements = numElements * dims[i];
-    }
-    QVector<T> data(numElements, 0);
-    err = QH5Lite::readPointerAttribute<T>(file_id, dsetName, attributeKey, data.data());
-    DREAM3D_REQUIRE(err >= 0);
-
-    DREAM3D_REQUIRE(::memcmp(data.data(), referenceData, sizeof(T) * numElements) == 0);
-    return retErr;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer3DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "3DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = RANK_3D;
-    T data[DIM0][DIM1][DIM2];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        for(int k = 0; k < DIM2; ++k)
-        {
-          data[i][j][k] = (T)(i * j * k);
-        }
-      }
-    }
-    hsize_t dims[RANK_3D];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    dims[2] = DIM2;
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadPointer3DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    herr_t retErr = err;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "3DArrayAttribute<" + attributeKey + ">";
-    T referenceData[DIM0][DIM1][DIM2];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        for(int k = 0; k < DIM2; ++k)
-        {
-          referenceData[i][j][k] = (T)(i * j * k);
-        }
-      }
-    }
-    H5T_class_t attr_type;
-    size_t attr_size;
-    hid_t typeId = -1;
-    QVector<hsize_t> dims; // Reusable for the loop
-    err = QH5Lite::getAttributeInfo(file_id, dsetName, attributeKey, dims, attr_type, attr_size, typeId);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(dims.size() == 3);
-    DREAM3D_REQUIRE(attr_size == sizeof(T));
-    hid_t rank = 0;
-    err = QH5Lite::getAttributeNDims(file_id, dsetName, attributeKey, rank);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(rank == 3);
-    CloseH5T(typeId, err, retErr); // Close the H5A type Id that was retrieved during the loop
-    typename QVector<T>::size_type numElements = 1;
-    for(QVector<uint64_t>::size_type i = 0; i < dims.size(); ++i)
-    {
-      numElements = numElements * dims[i];
-    }
-    QVector<T> data(numElements, 0);
-    err = QH5Lite::readPointerAttribute<T>(file_id, dsetName, attributeKey, data.data());
-    DREAM3D_REQUIRE(err >= 0);
-
-    DREAM3D_REQUIRE(::memcmp(data.data(), referenceData, sizeof(T) * numElements) == 0);
-    return retErr;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteVectorAttribute(hid_t file_id, QString dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "VectorAttribute<" + attributeKey + ">";
-
-    int32_t numElements = DIM0;
-    QVector<hsize_t> dims(1, DIM0);
-
-    /* Make dataset */
-    QVector<T> data(DIM0, 0);
-    for(int i = 0; i < numElements; ++i)
-    {
-      data[i] = (T)(i);
-    }
-    // qDebug() << "Attribute->Write: " << objName;
-    err = QH5Lite::writeVectorAttribute(file_id, dsetName, attributeKey, dims, data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadVectorAttribute(hid_t file_id, QString dsetName)
-  {
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "VectorAttribute<" + attributeKey + ">";
-
-    int32_t numElements = DIM0;
-    std::vector<hsize_t> dims(1, DIM0);
-
-    std::vector<T> data(DIM0, 0);
-    for(int i = 0; i < numElements; ++i)
-    {
-      data[i] = (T)(i);
-    }
-    std::vector<T> rData(numElements, 0); // allocate and zero out the memory
-    err = QH5Lite::readVectorAttribute(file_id, dsetName, attributeKey, rData);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(data == rData);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteScalarAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0F;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "ScalarAttribute<" + attributeKey + ">";
-    err = QH5Lite::writeScalarAttribute(file_id, dsetName, attributeKey, value);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadScalarAttribute(hid_t file_id, const QString& dsetName)
-  {
-    T value = 0x0F;
-    T refValue = value;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "ScalarAttribute<" + attributeKey + ">";
-
-    err = QH5Lite::readScalarAttribute(file_id, dsetName, attributeKey, value);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refValue == value);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //  Uses Raw Pointers to save data to the data file
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer2DArrayDataset(hid_t file_id)
-  {
-
-    T value = 0x0;
-    herr_t err = 1;
-    int32_t rank = 2;
-    // Create the Dimensions
-    hsize_t dims[2];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-
-    /* Make dataset char */
-    int32_t tSize = dims[0] * dims[1];
-    // T data[dimx*dimy];
-    QVector<T> data(tSize);
-    for(int32_t i = 0; i < tSize; ++i)
-    {
-      data[i] = static_cast<T>(i * 5);
-    }
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    dsetName = "Pointer2DArrayDataset<" + dsetName + ">";
-    qDebug() << "Running " << dsetName << " ... ";
-    err = QH5Lite::writePointerDataset(file_id, dsetName, rank, dims, &(data.front()));
-    DREAM3D_REQUIRE(err >= 0);
-    err = testWritePointer1DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWritePointer2DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWritePointer3DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWriteVectorAttribute<int8_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint8_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int16_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint16_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int32_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint32_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int64_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint64_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<float32>(file_id, dsetName);
-    err = testWriteVectorAttribute<float64>(file_id, dsetName);
-
-    err = testWriteScalarAttribute<int8_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint8_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int16_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint16_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int32_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint32_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int64_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint64_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<float32>(file_id, dsetName);
-    err = testWriteScalarAttribute<float64>(file_id, dsetName);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteVectorDataset(hid_t file_id)
-  {
-    T value = 0x0;
-    herr_t err = 1;
-
-    QVector<hsize_t> dims(RANK_1D, DIM0);
-    /* Make dataset char */
-    QVector<T> data(DIM0, 0);
-    for(int32_t i = 0; i < DIM0; ++i)
-    {
-      data[i] = static_cast<T>(i * 5);
-    }
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    dsetName = "VectorDataset<" + dsetName + ">";
-    qDebug() << "Running " << dsetName << " ... ";
-    err = QH5Lite::writeVectorDataset<T>(file_id, dsetName, dims, data);
-    DREAM3D_REQUIRE(err >= 0);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadVectorDataset(hid_t file_id)
-  {
-    T value = 0x0;
-    herr_t err = 1;
-
-    std::vector<hsize_t> dims(RANK_1D, DIM0);
-    std::vector<T> referenceData(DIM0, 0);
-    for(int32_t i = 0; i < DIM0; ++i)
-    {
-      referenceData[i] = static_cast<T>(i * 5);
-    }
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    qDebug() << "Running testReadVectorDataset <" + dsetName + "> ... ";
-    dsetName = "VectorDataset<" + dsetName + ">";
-
-    std::vector<T> data;
-    err = QH5Lite::readVectorDataset(file_id, dsetName, data);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(data == referenceData);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteScalarDataset(hid_t file_id)
-  {
-    T value = 0x0F;
-    herr_t err = 1;
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    dsetName = "ScalarDataset<" + dsetName + ">";
-    qDebug() << "Running " << dsetName << " ... ";
-    err = QH5Lite::writeScalarDataset(file_id, dsetName, value);
-    DREAM3D_REQUIRE(err >= 0);
-
-    bool exists = QH5Lite::datasetExists(file_id, dsetName);
-    DREAM3D_REQUIRE_EQUAL(exists, true);
-
-    exists = QH5Lite::datasetExists(file_id, QString("DOES_NOT_EXIST"));
-    DREAM3D_REQUIRE_EQUAL(exists, false);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadScalarDataset(hid_t file_id)
-  {
-    T value = 0x0F;
-    T refValue = value;
-    herr_t err = 1;
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>(value);
-    qDebug() << "Running testReadScalarDataset <" + dsetName + "> ... ";
-    dsetName = "ScalarDataset<" + dsetName + ">";
-
-    err = QH5Lite::readScalarDataset(file_id, dsetName, value);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refValue == value);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  herr_t testWriteStringDatasetAndAttributes(hid_t file_id)
-  {
-    qDebug() << "Running testWriteStringDatasetAndAttributes ......";
-    herr_t err = 0;
-    QString dsetName("QString");
-    QString dsetNameBytes("c_string");
-    QString attributeKey("QString");
-
-    QString strData("THIS IS THE DATA");
-    QByteArray strDataBytes("THIS IS THE DATA AS BYTES");
-    QString attrData("THIS IS THE ATTRIBUTE DATA");
-    QByteArray attrDataBytes("THIS IS THE ATTRIBUTE DATA AS BYTES");
-
-    // Write a String Data set using a QString as the data source
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Over Write the data from Above but with different values
-    strData = "THIS IS XXX DATA";
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Over Write the data from Above but with longer string
-    strData = "THIS IS LONGER DATA";
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Over Write the data from Above but with shorter string
-    strData = "THIS IS LESS DATA";
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Over Write the data from Above but with even shorter string
-    strData = "Even LESS DATA";
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Over Write the data from Above but with even shorter string
-    strData = "THIS IS THE DATA";
-    err = QH5Lite::writeStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Write a String attribute using a QString as the data source
-    err = QH5Lite::writeStringAttribute(file_id, dsetName, attributeKey, attrData);
-    DREAM3D_REQUIRE(err >= 0);
-
-    attributeKey = "c_string";
-    err = QH5Lite::writeStringAttribute(file_id, dsetName, attributeKey, attrDataBytes.size() + 1, attrDataBytes.data());
-
-    // Write a String data set using char* as data source
-    err = QH5Lite::writeStringDataset(file_id, dsetNameBytes, strDataBytes.size() + 1, strDataBytes.data());
-    DREAM3D_REQUIRE(err >= 0);
-
-    // Write a bunch of Attributes using a Map structure.
-    QMap<QString, QString> attrMap;
-    attrMap[attributeKey] = attrData;
-    attributeKey = "QString";
-    attrMap[attributeKey] = attrData;
-
-    err = QH5Lite::writeStringAttributes(file_id, dsetNameBytes, attrMap);
-    DREAM3D_REQUIRE(err >= 0);
-
-    qDebug() << " Passed";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  herr_t HDF5Dump_datatype(hid_t dataset_id, std::ostream& iostr)
-  {
-    herr_t status = 0;
-
-    hid_t type_id = H5Dget_type(dataset_id);
-
-    iostr << "    ";
-    iostr << "DATATYPE \"";
-
-    switch(H5Tget_class(type_id))
-    {
-    case H5T_INTEGER:
-      iostr << "Integer";
-      break;
-
-    case H5T_FLOAT:
-      if(H5Tequal(type_id, H5T_IEEE_F32BE) || H5Tequal(type_id, H5T_IEEE_F32LE) || H5Tequal(type_id, H5T_NATIVE_FLOAT))
-      {
-        // Float
-        iostr << "Float";
-      }
-      else if(H5Tequal(type_id, H5T_IEEE_F64BE) || H5Tequal(type_id, H5T_IEEE_F64LE) || H5Tequal(type_id, H5T_NATIVE_DOUBLE) || H5Tequal(type_id, H5T_NATIVE_LDOUBLE))
-      {
-        // Double
-        iostr << "Double";
-      }
-      else
-      {
-        iostr << "Undefined HDF5 float.";
-      }
-      break;
-
-    case H5T_STRING:
-      iostr << "String - Unsupported";
-      break;
-
-    case H5T_COMPOUND:
-      iostr << "Compound - Unsupported";
-      break;
-
-    default:
-      iostr << "Unsupported or unknown data type";
-      break;
-    }
-
-    iostr << "\""
-          << "\n";
-
-    status = H5Tclose(type_id);
-
-    return status;
-  }
-
-  // -----------------------------------------------------------------------------
-  //  Uses Raw Pointers to read data from the data file
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testReadPointer2DArrayDataset(hid_t file_id)
-  {
-    // Create the reference data
-    T value = 0x0;
-    herr_t err = 1;
-    QVector<hsize_t> dims(2, 0);
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-
-    int32_t tSize = dims[0] * dims[1];
-    QVector<T> referenceData(tSize);
-    for(int32_t i = 0; i < tSize; ++i)
-    {
-      referenceData[i] = static_cast<T>(i * 5);
-    }
-    // Generate the data set name
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    qDebug() << "Running testReadPointer2DArrayDataset<" << dsetName << "> ... ";
-    dsetName = "Pointer2DArrayDataset<" + dsetName + ">";
-
-    H5T_class_t attr_type;
-    size_t attr_size;
-
-    err = QH5Lite::getDatasetInfo(file_id, "FOOBAR", dims, attr_type, attr_size);
-    DREAM3D_REQUIRE(err < 0);
-
-    err = QH5Lite::getDatasetInfo(file_id, dsetName, dims, attr_type, attr_size);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(dims.size() == 2);
-    DREAM3D_REQUIRE(attr_size == sizeof(T));
-    hid_t rank = 0;
-    err = QH5Lite::getDatasetNDims(file_id, dsetName, rank);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(rank == 2);
-    typename QVector<T>::size_type numElements = 1;
-    for(QVector<hsize_t>::size_type i = 0; i < dims.size(); ++i)
-    {
-      numElements = numElements * dims[i];
-    }
-
-    herr_t retErr = 0;
-    hid_t did = -1;
-    /* Open the dataset. */
-    if((did = H5Dopen(file_id, dsetName.toLatin1().data(), H5P_DEFAULT)) < 0)
-    {
-      return -2;
-    }
-    /* Get an identifier for the datatype. */
-    hid_t tid = H5Dget_type(did);
-
-    err = H5Dclose(did);
-    if(err < 0)
-    {
-      qDebug() << "File: " << __FILE__ << "(" << __LINE__ << "): "
-               << "Error Closing Dataset."
-               << "\n";
-      retErr = err;
-    }
-    if(retErr < 0)
-    {
-      return retErr;
-    }
-
-    DREAM3D_REQUIRE(tid > 0);
-    //  qDebug() << QH5Lite::StringForHDFType(tid) << "\n";
-    err = H5Tclose(tid);
-    DREAM3D_REQUIRE(err >= 0);
-
-    hid_t dsType = QH5Lite::getDatasetType(file_id, dsetName);
-    DREAM3D_REQUIRE(dsType > 0);
-    //  qDebug() << QH5Lite::StringForHDFType(dsType) << "\n";
-
-    err = H5Tclose(dsType);
-    DREAM3D_REQUIRE(err >= 0);
-
-    QVector<T> data(numElements, 0);
-    err = QH5Lite::readPointerDataset(file_id, dsetName, data.data());
-    DREAM3D_REQUIRE(err >= 0);
-    // Compare the data...
-    DREAM3D_REQUIRE(data == referenceData);
-
-    // Read all the attributes
-    err = testReadPointer1DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<float32>(file_id, dsetName);
-    err = testReadPointer1DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testReadPointer2DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<float32>(file_id, dsetName);
-    err = testReadPointer2DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testReadPointer3DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<float32>(file_id, dsetName);
-    err = testReadPointer3DArrayAttribute<float64>(file_id, dsetName);
-    //
-    err = testReadVectorAttribute<int8_t>(file_id, dsetName);
-    err = testReadVectorAttribute<uint8_t>(file_id, dsetName);
-    err = testReadVectorAttribute<int16_t>(file_id, dsetName);
-    err = testReadVectorAttribute<uint16_t>(file_id, dsetName);
-    err = testReadVectorAttribute<int32_t>(file_id, dsetName);
-    err = testReadVectorAttribute<uint32_t>(file_id, dsetName);
-    err = testReadVectorAttribute<int64_t>(file_id, dsetName);
-    err = testReadVectorAttribute<uint64_t>(file_id, dsetName);
-    err = testReadVectorAttribute<float32>(file_id, dsetName);
-    err = testReadVectorAttribute<float64>(file_id, dsetName);
-
-    err = testReadScalarAttribute<int8_t>(file_id, dsetName);
-    err = testReadScalarAttribute<uint8_t>(file_id, dsetName);
-    err = testReadScalarAttribute<int16_t>(file_id, dsetName);
-    err = testReadScalarAttribute<uint16_t>(file_id, dsetName);
-    err = testReadScalarAttribute<int32_t>(file_id, dsetName);
-    err = testReadScalarAttribute<uint32_t>(file_id, dsetName);
-    err = testReadScalarAttribute<int64_t>(file_id, dsetName);
-    err = testReadScalarAttribute<uint64_t>(file_id, dsetName);
-    err = testReadScalarAttribute<float32>(file_id, dsetName);
-    err = testReadScalarAttribute<float64>(file_id, dsetName);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> void printData(QVector<T>& data, QVector<T>& rData)
-  {
-    // qDebug() << "Wrote/Read" << "\n";
-    for(typename QVector<T>::iterator iter = data.begin(); iter < data.end(); ++iter)
-    {
-      qDebug() << *iter << " ";
-    }
-    qDebug() << "\n";
-
-    for(typename QVector<T>::iterator iter = rData.begin(); iter < rData.end(); ++iter)
-    {
-      qDebug() << *iter << " ";
-    }
-
-    qDebug() << "\n";
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  herr_t testReadStringDatasetAndAttributes(hid_t file_id)
-  {
-    qDebug() << "Running testReadStringDatasetAndAttributes ......";
-    herr_t err = 0;
-
-    QString dsetName("QString");
-    QString dsetNameBytes("c_string");
-    QString attributeKey("QString");
-
-    QString refData("THIS IS THE DATA");
-    QByteArray refDataBytes("THIS IS THE DATA AS BYTES");
-    QString refAttrData("THIS IS THE ATTRIBUTE DATA");
-    QByteArray refAttrDataBytes("THIS IS THE ATTRIBUTE DATA AS BYTES");
-
-    QString strData("");
-    // Read the string as a QString from the file
-    err = QH5Lite::readStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refData.compare(strData) == 0);
-
-    // Read the string again this time passing in a QString that has data in it which should get cleared
-    strData = "FooBarJunk";
-    err = QH5Lite::readStringDataset(file_id, dsetName, strData);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refData.compare(strData) == 0);
-
-    // Read the Attributes
-    QString attrData("");
-    // Read the Attribute as a QString and compare to the reference
-    err = QH5Lite::readStringAttribute(file_id, dsetName, attributeKey, attrData);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refAttrData.compare(attrData) == 0);
-
-    // Read the attribute as a byte array (US ASCII nullptr TERM)
-    QByteArray attrDataPtr(refAttrDataBytes.size(), 0); // Create a null terminated string initialized to all zeros
-    attributeKey = "c_string";
-    err = QH5Lite::readStringAttribute(file_id, dsetName, attributeKey, attrDataPtr.data());
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(::memcmp(attrDataPtr.data(), refAttrDataBytes.data(), refAttrDataBytes.size()) == 0);
-
-    // Read a string data set which was written as a QByteArray into a QByteArray
-    QByteArray strDataBytes(refDataBytes.size(), 0);
-    err = QH5Lite::readStringDataset(file_id, dsetNameBytes, strDataBytes.data());
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(strDataBytes == refDataBytes);
-
-    QString mapString;
-    err = QH5Lite::readStringAttribute(file_id, dsetNameBytes, dsetNameBytes, mapString);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refAttrData.compare(mapString) == 0);
-
-    err = QH5Lite::readStringAttribute(file_id, dsetNameBytes, attributeKey, mapString);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(refAttrData.compare(mapString) == 0);
-
-    qDebug() << " Passed"
-             << "\n";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void QH5LiteTest()
-  {
-    // herr_t err = -1;
-    hid_t file_id = 0;
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate(UnitTest::H5LiteTest::FileName.toLatin1().data(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-    // Create the Extra Groups
-    hid_t sintGid = H5Gcreate(file_id, "Signed Int", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    hid_t uintGid = H5Gcreate(file_id, "Unsigned Int", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    hid_t pointer = H5Gcreate(file_id, "Pointer", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    herr_t err = H5Gclose(sintGid);
-    if(err < 0)
-    {
-      qDebug() << "Error closing Group sintGid"
-               << "\n";
-      return;
-    }
-    err = H5Gclose(uintGid);
-    if(err < 0)
-    {
-      qDebug() << "Error closing Group uintGid"
-               << "\n";
-      return;
-    }
-    err = H5Gclose(pointer);
-    if(err < 0)
-    {
-      qDebug() << "Error closing Group c99Gid"
-               << "\n";
-      return;
-    }
-
-    // qDebug() << logTime() << "----------- Testing Writing/Reading of Datasets using Raw Pointers -----------" << "\n";
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<float64>(file_id) >= 0);
-
-    DREAM3D_REQUIRE(testWriteVectorDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteVectorDataset<float64>(file_id) >= 0);
-
-    DREAM3D_REQUIRE(testWriteScalarDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testWriteScalarDataset<float64>(file_id) >= 0);
-
-    DREAM3D_REQUIRE(testWriteStringDatasetAndAttributes(file_id) >= 0);
-
-    // ******************* Test Reading Data *************************************
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadPointer2DArrayDataset<float64>(file_id) >= 0);
-
-    DREAM3D_REQUIRE(testReadVectorDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadVectorDataset<float64>(file_id) >= 0);
-    //
-    DREAM3D_REQUIRE(testReadScalarDataset<int8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<uint8_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<int16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<uint16_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<int32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<uint32_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<int64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<uint64_t>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<float32>(file_id) >= 0);
-    DREAM3D_REQUIRE(testReadScalarDataset<float64>(file_id) >= 0);
-
-    DREAM3D_REQUIRE(testReadStringDatasetAndAttributes(file_id) >= 0);
-
-    /* Close the file. */
-    H5Fclose(file_id);
-    // qDebug() << logTime() << "Testing Complete" << "\n";
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void TestLargeFileSupport()
-  {
-    // herr_t err = -1;
-    hid_t file_id;
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate(UnitTest::H5LiteTest::LargeFile.toLatin1().data(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-    QVector<int> buffer(1000000); // Create a 4 MegaByte Buffer
-    int32_t rank = 1;
-    QVector<hsize_t> dims(1, 1000000);
-    QString dsetName;
-    for(int i = 0; i < 1000; ++i)
-    {
-      dsetName = "/" + QString::number(i);
-      QH5Lite::writePointerDataset<int>(file_id, dsetName, rank, &(dims.front()), &(buffer.front()));
-      qDebug() << "Large File " << i << "/1000"
-               << "\n";
-    }
-
-    herr_t err = H5Fclose(file_id);
-    DREAM3D_REQUIRE(err >= 0);
-  }
-
-#define TYPE_DETECTION(m_msgType, check)                                                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    m_msgType v = 0x00;                                                                                                                                                                                \
-    hid_t t = QH5Lite::HDFTypeForPrimitive<m_msgType>(v);                                                                                                                                              \
-    DREAM3D_REQUIRE_EQUAL(t, check);                                                                                                                                                                   \
-  }
-
-  template <typename T> hid_t _testTypeName()
-  {
-    T v = 0x00;
-    return QH5Lite::HDFTypeForPrimitive<T>(v);
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void TestTypeDetection()
-  {
-
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<int8_t>(), H5T_NATIVE_INT8)
-#if CMP_TYPE_CHAR_IS_SIGNED
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<char>(), H5T_NATIVE_INT8)
-#else
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<char>(), H5T_NATIVE_UINT8)
-#endif
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<signed char>(), H5T_NATIVE_INT8)
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<unsigned char>(), H5T_NATIVE_UINT8)
-    DREAM3D_REQUIRE_EQUAL(_testTypeName<uint8_t>(), H5T_NATIVE_UINT8)
-
-    //  TYPE_DETECTION(uint8_t, H5T_NATIVE_UINT8);
-    //
-    //  TYPE_DETECTION(char, H5T_NATIVE_INT8);
-    //  TYPE_DETECTION(signed char, H5T_NATIVE_INT8);
-  }
-
-#if 0
-    class WriteString
-    {
-      public:
-        WriteString (hid_t dataset, hid_t datatype
-                     , hid_t dataspace, hid_t memspace)
-          : m_dataset (dataset), m_datatype (datatype)
-          , m_dataspace (dataspace), m_memspace (memspace)
-          , m_pos () {}
-
-      private:
-        hid_t m_dataset;
-        hid_t m_datatype;
-        hid_t m_dataspace;
-        hid_t m_memspace;
-        int m_pos;
-        //...
-
-      public:
-        void operator ()(std::vector<std::string>::value_type const& v)
-        {
-          // Select the file position, 1 record at position 'pos'
-          hsize_t count[] = { 1 } ;
-          hsize_t offset[] = { m_pos++ } ;
-          H5Sselect_hyperslab( m_dataspace
-                               , H5S_SELECT_SET
-                               , offset
-                               , nullptr
-                               , count
-                               , nullptr );
-
-          const char* s = v.c_str ();
-          H5Dwrite (m_dataset
-                    , m_datatype
-                    , m_memspace
-                    , m_dataspace
-                    , H5P_DEFAULT
-                    , &s );
-        }
-    };
-
-    void writeVector (hid_t group, std::vector<std::string> const& v)
-    {
-      hsize_t     dims[] = { v.size ()  } ;
-      hid_t dataspace = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr);
-
-      dims[0] = 1;
-      hid_t memspace = H5Screate_simple(sizeof(dims) / sizeof(*dims), dims, nullptr);
-
-      hid_t datatype = H5Tcopy (H5T_C_S1);
-      H5Tset_size (datatype, H5T_VARIABLE);
-
-      hid_t dataset = H5Dcreate(group, "files", datatype, dataspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-
-      //
-      // Select the "memory" to be written out - just 1 record.
-      hsize_t offset[] = { 0 } ;
-      hsize_t count[] = { 1 } ;
-      H5Sselect_hyperslab( memspace, H5S_SELECT_SET, offset, nullptr, count, nullptr );
-
-      std::for_each (v.begin (), v.end (), WriteString (dataset, datatype, dataspace, memspace));
-
-      H5Dclose (dataset);
-      H5Sclose (dataspace);
-      H5Sclose (memspace);
-      H5Tclose (datatype);
-    }
-
-
-    // -----------------------------------------------------------------------------
-    //
-    // -----------------------------------------------------------------------------
-    void TestVLength()
-    {
-      std::string data_set_name("Variable Length String Array");
-      std::vector<std::string> strings;
-      strings.push_back("A Test");
-      strings.push_back("Another Test with \n a new line");
-      strings.push_back("Some other string thing");
-
-      hid_t file_id = H5Utilities::createFile(UnitTest::H5LiteTest::VLengthFile.toStdString());
-
-      writeVector(file_id, strings);
-
-      H5Utilities::closeFile(file_id);
-
-      file_id = -1;
-
-    }
-
-#else
-
-  class WriteString
-  {
-  public:
-    WriteString(hid_t dataset, hid_t datatype, hid_t dataspace, hid_t memspace)
-    : m_dataset(dataset)
-    , m_datatype(datatype)
-    , m_dataspace(dataspace)
-    , m_memspace(memspace)
-    , m_pos()
-    {
-    }
-
-  private:
-    hid_t m_dataset;
-    hid_t m_datatype;
-    hid_t m_dataspace;
-    hid_t m_memspace;
-    int m_pos;
-    //...
-
-  public:
-    void operator()(std::vector<std::string>::value_type const& v)
-    {
-      // Select the file position, 1 record at position 'pos'
-      hsize_t count[] = {1};
-      hsize_t offset[] = {static_cast<hsize_t>(m_pos++)};
-      H5Sselect_hyperslab(m_dataspace, H5S_SELECT_SET, offset, nullptr, count, nullptr);
-
-      const char* s = v.c_str();
-      H5Dwrite(m_dataset, m_datatype, m_memspace, m_dataspace, H5P_DEFAULT, &s);
-    }
-  };
-
-  // -----------------------------------------------------------------------------
-  //  Use unit test framework
-  // -----------------------------------------------------------------------------
-  void TestVLengStringReadWrite()
-  {
-    // Write a Single String as a VLength String and read back as a normal string.
-    {
-      hid_t file_id = H5Utilities::createFile(UnitTest::H5LiteTest::VLengthFile.toStdString());
-
-      std::vector<std::string> strings;
-      strings.push_back("Testing 1 2 3");
-      herr_t err = H5Lite::writeVectorOfStringsDataset(file_id, "VlenStrings", strings);
-      DREAM3D_REQUIRE(err >= 0)
-      H5Utilities::closeFile(file_id);
-
-      file_id = QH5Utilities::openFile(UnitTest::H5LiteTest::VLengthFile, true);
-
-      std::string data;
-      err = H5Lite::readStringDataset(file_id, "VlenStrings", data);
-      DREAM3D_REQUIRE(err > -1)
-      DREAM3D_REQUIRE(data.size() == 13)
-
-      QH5Utilities::closeFile(file_id);
-    }
-
-    {
-      hid_t file_id = H5Utilities::createFile(UnitTest::H5LiteTest::VLengthFile.toStdString());
-
-      std::vector<std::string> strings;
-      strings.push_back("Testing 1 2 3");
-      strings.push_back("String with a\n   newline");
-      strings.push_back("Some other String");
-      strings.push_back("Titanium");
-      strings.push_back("Nickel");
-
-      herr_t err = H5Lite::writeVectorOfStringsDataset(file_id, "VlenStrings", strings);
-      DREAM3D_REQUIRE(err >= 0)
-
-      H5Utilities::closeFile(file_id);
-    }
-
-    {
-
-      hid_t file_id = H5Utilities::openFile(UnitTest::H5LiteTest::VLengthFile.toStdString(), true);
-
-      std::vector<std::string> data;
-      H5Lite::readVectorOfStringDataset(file_id, "VlenStrings", data);
-      DREAM3D_REQUIRE(data.size() == 5)
-    }
-
-    {
-      hid_t file_id = QH5Utilities::createFile(UnitTest::H5LiteTest::VLengthFile);
-
-      QVector<QString> strings;
-      strings.push_back("Testing 1 2 3");
-      strings.push_back("String with a\n   newline");
-      strings.push_back("Some other String");
-      strings.push_back("Titanium");
-      strings.push_back("Nickel");
-
-      herr_t err = QH5Lite::writeVectorOfStringsDataset(file_id, "VlenStrings", strings);
-      DREAM3D_REQUIRE(err >= 0)
-
-      QH5Utilities::closeFile(file_id);
-    }
-
-    {
-
-      hid_t file_id = QH5Utilities::openFile(UnitTest::H5LiteTest::VLengthFile, true);
-
-      QVector<QString> data;
-      QH5Lite::readVectorOfStringDataset(file_id, "VlenStrings", data);
-      DREAM3D_REQUIRE(data.size() == 5)
-
-      QH5Utilities::closeFile(file_id);
-    }
-  }
-
-#endif
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void operator()()
-  {
-    int err = EXIT_SUCCESS;
-
-    DREAM3D_REGISTER_TEST(TestVLengStringReadWrite())
-
-    DREAM3D_REGISTER_TEST(TestTypeDetection())
-    DREAM3D_REGISTER_TEST(QH5LiteTest())
-    DREAM3D_REGISTER_TEST(RemoveTestFiles())
-  }
-
-private:
-  H5LiteTest(const H5LiteTest&);     // Copy Constructor Not Implemented
-  void operator=(const H5LiteTest&); // Move assignment Not Implemented
-};
diff --git a/Source/H5Support/Test/H5SupportTestMain.cpp.in b/Source/H5Support/Test/H5SupportTestMain.cpp.in
deleted file mode 100644
index ce151a5403..0000000000
--- a/Source/H5Support/Test/H5SupportTestMain.cpp.in
+++ /dev/null
@@ -1,53 +0,0 @@
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#endif
-
-
-#include <QtCore/QCoreApplication>
-
-#if 0
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
-#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/Utilities/UnitTestSupport.hpp"
-#include "SIMPLib/Utilities/QMetaObjectUtilities.h"
-#endif
-
-@FilterTestIncludes@
-
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-  // Instantiate the QCoreApplication that we need to get the current path and load plugins.
-  QCoreApplication app(argc, argv);
-  QCoreApplication::setOrganizationName("Your Company");
-  QCoreApplication::setOrganizationDomain("Your Domain");
-  QCoreApplication::setApplicationName("@PluginName@");
-  
-  // Register all the filters including trying to load those from Plugins
- // FilterManager* fm = FilterManager::Instance();
- // SIMPLibPluginLoader::LoadPluginFilters(fm);
-
-  // Send progress messages from PipelineBuilder to this object for display
- // QMetaObjectUtilities::RegisterMetaTypes();
-
-
-  @TestMainFunctors@
-
-
-  PRINT_TEST_SUMMARY();
-
-  return err;
-}
-
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
diff --git a/Source/H5Support/Test/H5UtilitiesTest.cpp b/Source/H5Support/Test/H5UtilitiesTest.cpp
deleted file mode 100644
index 035522ebf5..0000000000
--- a/Source/H5Support/Test/H5UtilitiesTest.cpp
+++ /dev/null
@@ -1,535 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//  Copyright (c) 2007, 2010 Michael A. Jackson for BlueQuartz Software
-//  All rights reserved.
-//  BSD License: http://www.opensource.org/licenses/bsd-license.html
-//
-//  This code was written under United States Air Force Contract number
-//                           FA8650-04-C-5229
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#ifdef _MSC_VER
-#include <cstdlib>
-
-/*
-"It's a known, long-standing bug in the compiler system's headers.  For
-some reason the manufacturer, in its infinite wisdom, chose to #define
-macros min() and max() in violation of the upper-case convention and so
-break any legitimate functions with those names, including those in the
-standard C++ library."
-*/
-
-#ifndef NOMINMAX
-#define NOMINMAX
-#endif
-
-#define WINDOWS_LARGE_FILE_SUPPORT
-#if _MSC_VER < 1400
-#define snprintf _snprintf
-#else
-#define snprintf sprintf_s
-#endif
-
-#endif
-
-//-- C++ includes
-#include <iostream>
-#include <list>
-#include <string>
-
-#include <QtCore/QDateTime>
-#include <QtCore/QFile>
-#include <QtCore/QtDebug>
-
-#include "H5Support/QH5Lite.h"
-#include "H5Support/QH5Utilities.h"
-#include "H5SupportTestFileLocations.h"
-
-// THIS IS REALLY DANGEROUS AS IT COULD SETUP A CIRCULAR REFERENCE WITH LIBRARY DEPENDECIES.
-#include "UnitTestSupport.hpp"
-
-#define DIM 6
-#define DIM0 4
-#define DIM1 3
-#define DIM2 2
-
-#define RANK_1D 1
-#define RANK_2D 2
-#define RANK_3D 3
-
-class H5UtilitiesTest
-{
-public:
-  H5UtilitiesTest() = default;
-  virtual ~H5UtilitiesTest() = default;
-
-  int32_t AttrSize = 0;
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void RemoveTestFiles()
-  {
-#if REMOVE_TEST_FILES
-    QFile::remove(UnitTest::H5UtilTest::FileName);
-#endif
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer1DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    AttrSize++;
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "1DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = 1;
-    T data[DIM0];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      data[i] = (T)(i);
-    }
-    hsize_t dims[1];
-    dims[0] = DIM0;
-
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer2DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    // std::cout << DEBUG_OUT(logTime) << "testWritePointer2DArrayAttribute";
-    AttrSize++;
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-
-    attributeKey = "2DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = RANK_2D;
-    T data[DIM0][DIM1];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        data[i][j] = (T)(i * j);
-      }
-    }
-    hsize_t dims[RANK_2D];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer3DArrayAttribute(hid_t file_id, const QString& dsetName)
-  {
-    AttrSize++;
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "3DArrayAttribute<" + attributeKey + ">";
-    int32_t rank = RANK_3D;
-    T data[DIM0][DIM1][DIM2];
-    for(int i = 0; i < DIM0; ++i)
-    {
-      for(int j = 0; j < DIM1; ++j)
-      {
-        for(int k = 0; k < DIM2; ++k)
-        {
-          data[i][j][k] = (T)(i * j * k);
-        }
-      }
-    }
-    hsize_t dims[RANK_3D];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-    dims[2] = DIM2;
-    err = QH5Lite::writePointerAttribute<T>(file_id, dsetName, attributeKey, rank, dims, (T*)data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteVectorAttribute(hid_t file_id, QString dsetName)
-  {
-    AttrSize++;
-    T value = 0x0;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "VectorAttribute<" + attributeKey + ">";
-
-    int32_t numElements = DIM0;
-    QVector<hsize_t> dims(1, DIM0);
-
-    /* Make dataset */
-    QVector<T> data(DIM0, 0);
-    for(int i = 0; i < numElements; ++i)
-    {
-      data[i] = (T)(i);
-    }
-    // std::cout << "Attribute->Write: " << objName;
-    err = QH5Lite::writeVectorAttribute(file_id, dsetName, attributeKey, dims, data);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWriteScalarAttribute(hid_t file_id, const QString& dsetName)
-  {
-    AttrSize++;
-    T value = 0x0F;
-    herr_t err = -1;
-    QString attributeKey = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    DREAM3D_REQUIRE(attributeKey.isEmpty() == false);
-    attributeKey = "ScalarAttribute<" + attributeKey + ">";
-    err = QH5Lite::writeScalarAttribute(file_id, dsetName, attributeKey, value);
-    DREAM3D_REQUIRE(err >= 0);
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //  Uses Raw Pointers to save data to the data file
-  // -----------------------------------------------------------------------------
-  template <typename T> herr_t testWritePointer2DArrayDataset(hid_t file_id)
-  {
-
-    T value = 0x0;
-    herr_t err = 1;
-    int32_t rank = 2;
-    // Create the Dimensions
-    hsize_t dims[2];
-    dims[0] = DIM0;
-    dims[1] = DIM1;
-
-    /* Make dataset char */
-    int32_t tSize = dims[0] * dims[1];
-    // T data[dimx*dimy];
-    std::vector<T> data(tSize);
-    for(int32_t i = 0; i < tSize; ++i)
-    {
-      data[i] = static_cast<T>(i * 5);
-    }
-
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
-    dsetName = "Pointer2DArrayDataset<" + dsetName + ">";
-    qDebug() << "Running " << dsetName << " ... ";
-    err = QH5Lite::writePointerDataset(file_id, dsetName, rank, dims, &(data.front()));
-    DREAM3D_REQUIRE(err >= 0);
-
-    err = testWritePointer3DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer3DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWritePointer1DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer1DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWritePointer2DArrayAttribute<int8_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint8_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int16_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint16_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int32_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint32_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<int64_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<uint64_t>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<float32>(file_id, dsetName);
-    err = testWritePointer2DArrayAttribute<float64>(file_id, dsetName);
-
-    err = testWriteVectorAttribute<int8_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint8_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int16_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint16_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int32_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint32_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<int64_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<uint64_t>(file_id, dsetName);
-    err = testWriteVectorAttribute<float32>(file_id, dsetName);
-    err = testWriteVectorAttribute<float64>(file_id, dsetName);
-
-    err = testWriteScalarAttribute<int8_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint8_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int16_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint16_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int32_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint32_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<int64_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<uint64_t>(file_id, dsetName);
-    err = testWriteScalarAttribute<float32>(file_id, dsetName);
-    err = testWriteScalarAttribute<float64>(file_id, dsetName);
-
-    std::cout << " Passed";
-    return err;
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void QH5UtilitiesTest()
-  {
-    // herr_t err = -1;
-    hid_t file_id;
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate(UnitTest::H5UtilTest::FileName.toStdString().c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-
-    // std::cout << logTime() << "----------- Testing Writing/Reading of Datasets using Raw Pointers -----------";
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int32_t>(file_id) >= 0);
-
-    hid_t dsetId = QH5Utilities::openHDF5Object(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>");
-    DREAM3D_REQUIRE(dsetId > 0);
-
-    DREAM3D_REQUIRE(QH5Utilities::isGroup(file_id, "/") == true);
-    DREAM3D_REQUIRE(QH5Utilities::isGroup(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>") == false);
-
-    QString objName;
-    int32_t err = QH5Utilities::objectNameAtIndex(file_id, 0, objName);
-    DREAM3D_REQUIRE(objName.compare("Pointer2DArrayDataset<H5T_NATIVE_INT32>") == 0);
-
-    int32_t objType = -1;
-    err = QH5Utilities::getObjectType(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>", &objType);
-    DREAM3D_REQUIRE(objType == H5O_TYPE_DATASET);
-    DREAM3D_REQUIRE(err >= 0);
-
-    err = QH5Utilities::getObjectType(file_id, "/", &objType);
-    DREAM3D_REQUIRE(objType == H5O_TYPE_GROUP);
-    DREAM3D_REQUIRE(err >= 0);
-
-    QString objPath = QH5Utilities::getObjectPath(dsetId, false);
-    DREAM3D_REQUIRE(objPath.compare("Pointer2DArrayDataset<H5T_NATIVE_INT32>") == 0);
-
-    err = QH5Utilities::closeHDF5Object(dsetId);
-    DREAM3D_REQUIRE(err >= 0);
-
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 1", file_id) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 2/", file_id) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("Test Path 3/", file_id) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/", file_id) < 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 4/Test Path 7", file_id) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 5/Test Path 8/", file_id) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("Test Path 6/Test Path 9/", file_id) >= 0);
-
-    hid_t grpId = QH5Utilities::openHDF5Object(file_id, "Test Path 1");
-    DREAM3D_REQUIRE(grpId > 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 1", grpId) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 2/", grpId) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("Test Path 3/", grpId) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/", grpId) < 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 4/Test Path 7", grpId) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("/Test Path 5/Test Path 8/", grpId) >= 0);
-    DREAM3D_REQUIRE(QH5Utilities::createGroupsFromPath("Test Path 6/Test Path 9/", grpId) >= 0);
-    err = H5Gclose(grpId);
-    DREAM3D_REQUIRE(err >= 0);
-
-    hid_t gid = QH5Utilities::createGroup(file_id, "test group");
-    DREAM3D_REQUIRE(gid >= 0);
-    err = QH5Utilities::closeHDF5Object(gid);
-
-    QList<QString> groups;
-    err = QH5Utilities::getGroupObjects(file_id, H5Utilities::H5Support_ANY, groups);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(groups.size() == 8);
-
-    err = QH5Utilities::createGroupsForDataset("/group1/group2/group3/data", file_id);
-    DREAM3D_REQUIRE(err >= 0);
-    gid = QH5Utilities::openHDF5Object(file_id, "/group1/group2");
-    DREAM3D_REQUIRE(gid >= 0);
-    err = QH5Utilities::closeHDF5Object(gid);
-
-#if 0
-      bool success = QH5Utilities::probeForAttribute(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>", "ScalarAttribute<H5T_NATIVE_INT32>" );
-      DREAM3D_REQUIRE(success == true);
-
-      success = QH5Utilities::probeForAttribute(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>", "ScalarAttribute<>" );
-      DREAM3D_REQUIRE(success == false);
-#endif
-
-    QList<QString> attributes;
-    err = QH5Utilities::getAllAttributeNames(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>", attributes);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(attributes.size() == AttrSize);
-
-    dsetId = QH5Utilities::openHDF5Object(file_id, "Pointer2DArrayDataset<H5T_NATIVE_INT32>");
-    DREAM3D_REQUIRE(dsetId > 0);
-    attributes.clear();
-    err = QH5Utilities::getAllAttributeNames(dsetId, attributes);
-    DREAM3D_REQUIRE(err >= 0);
-    DREAM3D_REQUIRE(attributes.size() == AttrSize);
-    err = QH5Utilities::closeHDF5Object(dsetId);
-    DREAM3D_REQUIRE(err >= 0);
-
-    err = QH5Utilities::closeFile(file_id);
-    DREAM3D_REQUIRE(err >= 0);
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void StressTestCreateGroups()
-  {
-    qDebug() << QDateTime::currentDateTime() << " Starting StressTestCreateGroups()";
-    char path[64];
-    ::memset(path, 0, 64);
-    int err = 0;
-    hid_t file_id;
-    hid_t grpId;
-
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate(UnitTest::H5UtilTest::GroupTest.toStdString().c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-
-    for(int i = 0; i < 100; ++i)
-    {
-      qDebug() << QDateTime::currentDateTime() << "Outer Loop: " << i;
-      ::memset(path, 0, 64);
-      snprintf(path, 64, "/%03d", i);
-      grpId = QH5Utilities::createGroup(file_id, path);
-      DREAM3D_REQUIRE(grpId > 0);
-      err = H5Gclose(grpId);
-      DREAM3D_REQUIRE(err >= 0);
-
-      for(int j = 0; j < 100; ++j)
-      {
-
-        snprintf(path, 64, "/%03d/%03d", i, j);
-        grpId = QH5Utilities::createGroup(file_id, path);
-        DREAM3D_REQUIRE(grpId > 0);
-        DREAM3D_REQUIRE(grpId > 0);
-        err = H5Gclose(grpId);
-        DREAM3D_REQUIRE(err >= 0);
-
-        for(int k = 0; k < 100; ++k)
-        {
-
-          snprintf(path, 64, "/%03d/%03d/%03d", i, j, k);
-          grpId = QH5Utilities::createGroup(file_id, path);
-          DREAM3D_REQUIRE(grpId >= 0);
-          DREAM3D_REQUIRE(grpId > 0);
-          err = H5Gclose(grpId);
-          DREAM3D_REQUIRE(err >= 0);
-        }
-      }
-    }
-    err = H5Fclose(file_id);
-    DREAM3D_REQUIRE(err >= 0);
-  }
-
-// -----------------------------------------------------------------------------
-//  This function tests if we can write a data set larger than 2GB on Darwin/Apple
-//  systems. There is a bug in HDF5 versions up to and including 1.8.9 where this
-//  type of write will fail. This was used to report the bug to HDFGroup and should
-//  NOT be used for any test. At least not yet.
-// -----------------------------------------------------------------------------
-#if __APPLE__
-  void HDF5Darwin2GBWriteTest()
-  {
-    std::cout << "sizeof(ssize_t): " << sizeof(ssize_t);
-    size_t dim1 = 3;
-    size_t dim0 = 178956971;
-    std::vector<int> data(dim0 * dim1);
-
-    hid_t file_id;
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate("/tmp/HDF5_LARGE_WRITE_BUG.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-    int32_t rank = 2;
-    hsize_t dims[2] = {dim0, dim1};
-
-    herr_t err = QH5Lite::writePointerDataset(file_id, "data", rank, dims, data.data());
-    DREAM3D_REQUIRE(err > -1);
-  }
-#endif
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void TestOpenSameFile2x()
-  {
-
-    herr_t err = -1;
-    hid_t file_id;
-    /* Create a new file using default properties. */
-    file_id = H5Fcreate(UnitTest::H5UtilTest::FileName.toStdString().c_str(), H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
-    DREAM3D_REQUIRE(file_id > 0);
-
-    hid_t gid = H5Utilities::createGroup(file_id, "TestGroup");
-    hid_t gid2 = H5Utilities::createGroup(file_id, "TestGroup2");
-
-    // std::cout << logTime() << "----------- Testing Writing/Reading of Datasets using Raw Pointers -----------";
-    DREAM3D_REQUIRE(testWritePointer2DArrayDataset<int32_t>(gid) >= 0);
-    err = H5Gclose(gid);
-    err = H5Gclose(gid2);
-    gid = 0;
-
-    err = H5Fclose(file_id);
-    file_id = 0;
-
-    hid_t fileId = QH5Utilities::openFile(UnitTest::H5UtilTest::FileName.toStdString().c_str(), true); // Open the file Read Only
-    hid_t dcaGid = H5Gopen(fileId, "TestGroup", 0);
-
-    {
-      hid_t fileId2 = QH5Utilities::openFile(UnitTest::H5UtilTest::FileName.toStdString().c_str(), true); // Open the file Read Only
-      hid_t dcaGid2 = H5Gopen(fileId2, "TestGroup2", 0);
-      err = H5Gclose(dcaGid2);
-      dcaGid2 = 0;
-      err = H5Utilities::closeFile(fileId2);
-      DREAM3D_REQUIRE(err == 0);
-    }
-
-    err = H5Gclose(dcaGid);
-    DREAM3D_REQUIRE(err == 0);
-
-    err = H5Utilities::closeFile(fileId);
-    DREAM3D_REQUIRE(err == 0);
-  }
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  void operator()()
-  {
-
-    int err = EXIT_SUCCESS;
-
-    DREAM3D_REGISTER_TEST(QH5UtilitiesTest())
-    DREAM3D_REGISTER_TEST(TestOpenSameFile2x())
-    DREAM3D_REGISTER_TEST(RemoveTestFiles())
-  }
-
-private:
-  H5UtilitiesTest(const H5UtilitiesTest&); // Copy Constructor Not Implemented
-  void operator=(const H5UtilitiesTest&);  // Move assignment Not Implemented
-};
diff --git a/Source/H5Support/Test/TestFileLocations.h.in b/Source/H5Support/Test/TestFileLocations.h.in
deleted file mode 100755
index f4ef4aa24a..0000000000
--- a/Source/H5Support/Test/TestFileLocations.h.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef _TestFileLocation_h_
-#define _TestFileLocation_h_
-
-#include <QtCore/QString>
-
-#define REMOVE_TEST_FILES 1
-
-/* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- *
- * THIS FILE IS AUTO GENERATED AT CMAKE TIME. DO NOT EDIT THIS FILE. EDIT THE ORIGINAL TEMPLATE FILE
- * LOCATED AT @DREAM3DProj_SOURCE_DIR@/Test/TestFileLocations.h.in
- *
- *
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  */
-
-
-namespace UnitTest
-{
-
-  const QString DataDir("@DREAM3D_DATA_DIR@");
-  const QString TestTempDir("@TEST_TEMP_DIR@");
-  const QString DREAM3DProjDir("@DREAM3DProj_SOURCE_DIR@");
-
-  // -----------------------------------------------------------------------------
-  //  Define where to put our temporary files for the H5Utilities Test
-  // -----------------------------------------------------------------------------
-  namespace H5UtilTest
-  {
-    const QString TestDir("H5UtilTest");
-    const QString FileName("@TEST_TEMP_DIR@/H5Utilities_Test.h5");
-    const QString GroupTest("@TEST_TEMP_DIR@/H5Utilities_GroupTest.h5");
-  }
-
-  // -----------------------------------------------------------------------------
-  //  Define where to put our temporary files for the H5Lite Test
-  // -----------------------------------------------------------------------------
-  namespace H5LiteTest
-  {
-    const QString TestDir("@TEST_TEMP_DIR@/H5LiteTest");
-    const QString FileName("@TEST_TEMP_DIR@/H5Lite_Test.h5");
-    const QString LargeFile("@TEST_TEMP_DIR@/H5Lite_LargeFile_Test.h5");
-    const QString VLengthFile("@TEST_TEMP_DIR@/H5Lite_VLength.h5");
-  }
- 
-}
-
-#endif
diff --git a/Source/H5Support/Test/TestMain.cpp.in b/Source/H5Support/Test/TestMain.cpp.in
deleted file mode 100644
index 2faf05901e..0000000000
--- a/Source/H5Support/Test/TestMain.cpp.in
+++ /dev/null
@@ -1,54 +0,0 @@
-
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Winconsistent-missing-override"
-#endif
-
-#if 0
-#include <QtCore/QCoreApplication>
-
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
-#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/Utilities/UnitTestSupport.hpp"
-#include "SIMPLib/Utilities/QMetaObjectUtilities.h"
-
-#endif
-
-@FilterTestIncludes@
-
-
-// -----------------------------------------------------------------------------
-//  Use test framework
-// -----------------------------------------------------------------------------
-int main(int argc, char** argv)
-{
-  int err = EXIT_SUCCESS;
-
-#if 0
-  // Instantiate the QCoreApplication that we need to get the current path and load plugins.
-  QCoreApplication app(argc, argv);
-  QCoreApplication::setOrganizationName("Your Company");
-  QCoreApplication::setOrganizationDomain("Your Domain");
-  QCoreApplication::setApplicationName("@PluginName@");
-  // Register all the filters including trying to load those from Plugins
-  FilterManager* fm = FilterManager::Instance();
-  SIMPLibPluginLoader::LoadPluginFilters(fm);
-
-  // Send progress messages from PipelineBuilder to this object for display
-  QMetaObjectUtilities::RegisterMetaTypes();
-#endif
-
-  @TestMainFunctors@
-
-
-  PRINT_TEST_SUMMARY();
-
-  return err;
-}
-
-
-#ifdef __clang__
-#pragma clang diagnostic pop
-#endif
diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index 9e7b0d077c..a082075729 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -173,7 +173,8 @@ cmpReplaceFileIfDifferent(OLD_FILE_PATH  ${SIMPLib_BINARY_DIR}/CoreFilters/Regis
                           NEW_FILE_PATH  ${RegisterKnownFiltersFile} )
 
 
-set(${PROJECT_NAME}_LINK_LIBS Qt5::Core Qt5::Network H5Support)
+set(${PROJECT_NAME}_LINK_LIBS Qt5::Core Qt5::Network)
+
 if( "${SIMPL_USE_MULTITHREADED_ALGOS}" STREQUAL "ON")
   list(APPEND ${PROJECT_NAME}_LINK_LIBS TBB::tbb TBB::tbbmalloc)
 endif()
@@ -186,13 +187,33 @@ if(APPLE AND "${ITK_VERSION_MAJOR}" STREQUAL "5" AND SIMPL_USE_ITK)
   list(APPEND ${PROJECT_NAME}_LINK_LIBS SimpleITKExplicit)
 endif()
 
-#-- Add a library for the SIMPLib Code
+#-------------------------------------------------------------------------------
+# Add the SIMPLib Library
 add_library(${PROJECT_NAME} ${LIB_TYPE} ${Project_SRCS} )
 CMP_AddDefinitions(TARGET ${PROJECT_NAME})
 
+#-------------------------------------------------------------------------------
+# Add in the H5Support Header Only Library
+set(H5Support_HDRS
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Lite.h       
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Macros.h   
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5ScopedErrorHandler.h 
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5ScopedSentinel.h   
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Support.h         
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5SupportVersion.h   
+  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Utilities.h     
+  ${H5Support_SOURCE_DIR}/Source/H5Support/QH5Lite.h          
+  ${H5Support_SOURCE_DIR}/Source/H5Support/QH5Utilities.h
+)
+target_sources(${PROJECT_NAME}  PUBLIC ${H5Support_HDRS})
+source_group("${SIMPLibPRoj_SOURCE_DIR}/H5Support" FILES ${H5Support_HDRS})
+list(APPEND ${PROJECT_NAME}_LINK_LIBS ${HDF5_C_TARGET_NAME})
+target_compile_definitions( ${PROJECT_NAME} PUBLIC -DH5Support_USE_QT)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${H5Support_SOURCE_DIR}/Source>)
+
 #-- Add Target specific definitions
 if(WIN32 AND BUILD_SHARED_LIBS)
-      target_compile_definitions(${PROJECT_NAME} PUBLIC "-DSIMPLib_BUILT_AS_DYNAMIC_LIB")
+  target_compile_definitions(${PROJECT_NAME} PUBLIC "-DSIMPLib_BUILT_AS_DYNAMIC_LIB")
 endif()
 
 #-- Configure Target Specific Include Directories
@@ -204,8 +225,14 @@ target_include_directories(${PROJECT_NAME}
                               $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
                               $<BUILD_INTERFACE:${TARGET_SOURCE_DIR_PARENT}>
                               $<BUILD_INTERFACE:${TARGET_BINARY_DIR_PARENT}>
+)
+
+if( "${SIMPL_USE_MULTITHREADED_ALGOS}" STREQUAL "ON")
+  target_include_directories(${PROJECT_NAME} 
+                            PUBLIC
                               $<BUILD_INTERFACE:${TBB_INCLUDE_DIRS}>
 )
+endif()
 
 if(SIMPL_USE_EIGEN)
   target_include_directories(${PROJECT_NAME} 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 3b3ab74086..c8a4239fe8 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -147,6 +147,7 @@ void DataContainerReader::initialize()
 // -----------------------------------------------------------------------------
 void DataContainerReader::dataCheck()
 {
+
   // Sync the file proxy and cached proxy if the time stamps are different
   QFileInfo fi(getInputFile());
   if(getInputFile() == getLastFileRead() && getLastRead() < fi.lastModified())
@@ -177,6 +178,16 @@ void DataContainerReader::dataCheck()
 
   DataContainerArray::Pointer dca = getDataContainerArray();
 
+  if(m_InputFileDataContainerArrayProxy.getDataContainers().empty())
+  {
+    QString msg = "The DataContainerArrayProxy object is empty. Nothing will be read from the input file. If you are programmatically calling " + getNameOfClass() +
+                  " you may need to insert a line such as \n\
+    DataContainerArrayProxy proxy = reader->readDataContainerArrayStructure(inputFile);\n\
+    reader->setInputFileDataContainerArrayProxy(proxy);\n"
+                  " into your code before calling preflight or execute on the filter or pipeline";
+    setWarningCondition(1000, msg);
+  }
+
   // Read either the structure or all the data depending on the preflight status
   DataContainerArray::Pointer tempDCA = readData(m_InputFileDataContainerArrayProxy);
   if(tempDCA.get() == nullptr)
@@ -348,7 +359,7 @@ int DataContainerReader::readExistingPipelineFromFile(hid_t fileId)
 
   // Use QH5Lite to ask how many "groups" are in the "Pipeline Group"
   QList<QString> groupList;
-  err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::H5Support_GROUP, groupList);
+  err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::CustomHDFDataTypes::Group, groupList);
 
   // Loop over the items getting the "ClassName" attribute from each group
   QString classNameStr = "";
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 922e70f29f..0e3ab6e474 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -1053,6 +1053,8 @@ extern template class DataArray<double>;
 
 extern template class DataArray<size_t>;
 
+#ifndef SIMPL_DATA_ARRAY_ALIAS
+#define SIMPL_DATA_ARRAY_ALIAS
 // -----------------------------------------------------------------------------
 // Declare our aliases
 using BoolArrayType = DataArray<bool>;
@@ -1076,3 +1078,4 @@ using FloatArrayType = DataArray<float>;
 using DoubleArrayType = DataArray<double>;
 
 using SizeTArrayType = DataArray<size_t>;
+#endif
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index a18bf6a057..a5d85825c2 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -710,7 +710,7 @@ class NeighborList : public IDataArray
         // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
         // we have in memory.
         std::vector<int32_t> fileNumNeigh(m_Array.size());
-        err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, fileNumNeigh);
+        err = H5Lite::readVectorDataset(parentId, numNeighborsArrayName.toStdString(), fileNumNeigh);
         if (err < 0)
         {
           return -602;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index abd794b9fd..07a5042b4c 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -474,7 +474,7 @@ int StatsDataArray::readH5Data(hid_t parentId)
   }
 
   QList<QString> names;
-  err = QH5Utilities::getGroupObjects(gid, H5Utilities::H5Support_GROUP, names);
+  err = QH5Utilities::getGroupObjects(gid, H5Utilities::CustomHDFDataTypes::Group, names);
   if(err < 0)
   {
     err |= QH5Utilities::closeHDF5Object(gid);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index a1d7054a93..05ea0b2100 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -236,7 +236,7 @@ QVector<QString> AttributeMatrix::GetTypesAsStrings()
 void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString &h5InternalPath)
 {
   QList<QString> attributeMatrixNames;
-  QH5Utilities::getGroupObjects(containerId, H5Utilities::H5Support_GROUP, attributeMatrixNames);
+  QH5Utilities::getGroupObjects(containerId, H5Utilities::CustomHDFDataTypes::Group, attributeMatrixNames);
   foreach(QString attributeMatrixName, attributeMatrixNames)
   {
     if(attributeMatrixName.compare(SIMPL::Geometry::Geometry) != 0)
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index 1664f916f7..3eedd0134a 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -118,7 +118,7 @@ void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, Data
 {
 
   QList<QString> dataArrayNames;
-  QH5Utilities::getGroupObjects(attrMatGid, H5Utilities::H5Support_DATASET | H5Utilities::H5Support_GROUP, dataArrayNames);
+  QH5Utilities::getGroupObjects(attrMatGid, H5Utilities::CustomHDFDataTypes::Dataset | H5Utilities::CustomHDFDataTypes::Group, dataArrayNames);
   for(const auto& dataArrayName : dataArrayNames)
   {
     DataArrayProxy proxy(h5InternalPath, dataArrayName, SIMPL::Unchecked);
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 451e444060..7f177be955 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -116,7 +116,7 @@ DataContainer::Pointer DataContainer::createNewDataContainer(const QString& name
 void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContainerArrayProxy& proxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath)
 {
   QList<QString> dataContainers;
-  QH5Utilities::getGroupObjects(dcArrayGroupId, H5Utilities::H5Support_GROUP, dataContainers);
+  QH5Utilities::getGroupObjects(dcArrayGroupId, H5Utilities::CustomHDFDataTypes::Group, dataContainers);
   foreach(QString dataContainerName, dataContainers)
   {
     hid_t containerGid = H5Gopen(dcArrayGroupId, dataContainerName.toLatin1().constData(), H5P_DEFAULT);
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 0e79a8d6e5..fa32d1c971 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -153,7 +153,7 @@ FilterPipeline::Pointer H5FilterParametersReader::readPipelineFromFile(hid_t fid
   {
     // Use QH5Lite to ask how many "groups" are in the "Pipeline Group"
     QList<QString> groupList;
-    herr_t err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::H5Support_GROUP, groupList);
+    herr_t err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::CustomHDFDataTypes::Group, groupList);
 
     // Get a FilterManager Instance
     FilterManager* filterManager = FilterManager::Instance();
@@ -261,7 +261,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
   {
     // Use QH5Lite to ask how many "groups" are in the "Pipeline Group"
     QList<QString> groupList;
-    herr_t err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::H5Support_GROUP, groupList);
+    herr_t err = QH5Utilities::getGroupObjects(pipelineGroupId, H5Utilities::CustomHDFDataTypes::Group, groupList);
 
     // Get a FilterManager Instance
     FilterManager* filterManager = FilterManager::Instance();
@@ -1112,7 +1112,7 @@ DataContainerArrayProxy H5FilterParametersReader::readDataContainerArrayProxy(co
     return defValue;
   }
   QList<QString> dcaNames;
-  int err = QH5Utilities::getGroupObjects(dcaGid, H5Utilities::H5Support_GROUP, dcaNames);
+  int err = QH5Utilities::getGroupObjects(dcaGid, H5Utilities::CustomHDFDataTypes::Group, dcaNames);
   if(err < 0)
   {
     return defValue;
@@ -1127,7 +1127,7 @@ DataContainerArrayProxy H5FilterParametersReader::readDataContainerArrayProxy(co
     dcProxy.setFlag(Qt::Checked);
     // Loop over the attribute Matrices
     QList<QString> amNames;
-    err = QH5Utilities::getGroupObjects(dcGid, H5Utilities::H5Support_GROUP, amNames);
+    err = QH5Utilities::getGroupObjects(dcGid, H5Utilities::CustomHDFDataTypes::Group, amNames);
     if(err < 0)
     {
       return defValue;
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index 33f67e4d4b..db88d2c758 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -37,7 +37,7 @@
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/SIMPLib.h"
 
-#include "H5Support/H5Lite.h"
+#include <hdf5.h>
 
 class SIMPLib_EXPORT ITransformContainer : public Observable
 {
diff --git a/Source/SIMPLib/Math/MatrixMath.h b/Source/SIMPLib/Math/MatrixMath.h
index 55776ab0d3..37ce356423 100755
--- a/Source/SIMPLib/Math/MatrixMath.h
+++ b/Source/SIMPLib/Math/MatrixMath.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <cmath>
@@ -53,586 +53,581 @@
  */
 class SIMPLib_EXPORT MatrixMath
 {
-  public:
-    using Self = MatrixMath;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for MatrixMath
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for MatrixMath
-     */
-    static QString ClassName();
-
-    virtual ~MatrixMath();
-
-    /**
-     * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Multiply3x3with3x3(T g1[3][3], T g2[3][3], T outMat[3][3])
+public:
+  using Self = MatrixMath;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for MatrixMath
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for MatrixMath
+   */
+  static QString ClassName();
+
+  virtual ~MatrixMath();
+
+  /**
+   * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Multiply3x3with3x3(T g1[3][3], T g2[3][3], T outMat[3][3])
+  {
+    outMat[0][0] = g1[0][0] * g2[0][0] + g1[0][1] * g2[1][0] + g1[0][2] * g2[2][0];
+    outMat[0][1] = g1[0][0] * g2[0][1] + g1[0][1] * g2[1][1] + g1[0][2] * g2[2][1];
+    outMat[0][2] = g1[0][0] * g2[0][2] + g1[0][1] * g2[1][2] + g1[0][2] * g2[2][2];
+    outMat[1][0] = g1[1][0] * g2[0][0] + g1[1][1] * g2[1][0] + g1[1][2] * g2[2][0];
+    outMat[1][1] = g1[1][0] * g2[0][1] + g1[1][1] * g2[1][1] + g1[1][2] * g2[2][1];
+    outMat[1][2] = g1[1][0] * g2[0][2] + g1[1][1] * g2[1][2] + g1[1][2] * g2[2][2];
+    outMat[2][0] = g1[2][0] * g2[0][0] + g1[2][1] * g2[1][0] + g1[2][2] * g2[2][0];
+    outMat[2][1] = g1[2][0] * g2[0][1] + g1[2][1] * g2[1][1] + g1[2][2] * g2[2][1];
+    outMat[2][2] = g1[2][0] * g2[0][2] + g1[2][1] * g2[1][2] + g1[2][2] * g2[2][2];
+  }
+
+  /**
+   * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Multiply3x3with3x1(const T g1[3][3], const T* g2, T* outMat)
+  {
+    outMat[0] = g1[0][0] * g2[0] + g1[0][1] * g2[1] + g1[0][2] * g2[2];
+    outMat[1] = g1[1][0] * g2[0] + g1[1][1] * g2[1] + g1[1][2] * g2[2];
+    outMat[2] = g1[2][0] * g2[0] + g1[2][1] * g2[1] + g1[2][2] * g2[2];
+  }
+
+  static void Multiply3x3with3x1(const double g1[3][3], const double g2[3], float outMat[3]);
+
+  /**
+   * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Add3x1s(const T g1[3], const T g2[3], T outMat[3])
+  {
+    outMat[0] = g1[0] + g2[0];
+    outMat[1] = g1[1] + g2[1];
+    outMat[2] = g1[2] + g2[2];
+  }
+
+  /**
+   * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Subtract3x1s(const T g1[3], const T g2[3], T outMat[3])
+  {
+    outMat[0] = g1[0] - g2[0];
+    outMat[1] = g1[1] - g2[1];
+    outMat[2] = g1[2] - g2[2];
+  }
+
+  /**
+   * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Add3x3s(const T g1[3][3], const T g2[3][3], float outMat[3][3])
+  {
+    outMat[0][0] = g1[0][0] + g2[0][0];
+    outMat[0][1] = g1[0][1] + g2[0][1];
+    outMat[0][2] = g1[0][2] + g2[0][2];
+    outMat[1][0] = g1[1][0] + g2[1][0];
+    outMat[1][1] = g1[1][1] + g2[1][1];
+    outMat[1][2] = g1[1][2] + g2[1][2];
+    outMat[2][0] = g1[2][0] + g2[2][0];
+    outMat[2][1] = g1[2][1] + g2[2][1];
+    outMat[2][2] = g1[2][2] + g2[2][2];
+  }
+
+  /**
+   * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
+   * @param g1
+   * @param g2
+   * @param outMat
+   */
+  template <typename T>
+  static void Subtract3x3s(const T g1[3][3], const T g2[3][3], T outMat[3][3])
+  {
+    outMat[0][0] = g1[0][0] - g2[0][0];
+    outMat[0][1] = g1[0][1] - g2[0][1];
+    outMat[0][2] = g1[0][2] - g2[0][2];
+    outMat[1][0] = g1[1][0] - g2[1][0];
+    outMat[1][1] = g1[1][1] - g2[1][1];
+    outMat[1][2] = g1[1][2] - g2[1][2];
+    outMat[2][0] = g1[2][0] - g2[2][0];
+    outMat[2][1] = g1[2][1] - g2[2][1];
+    outMat[2][2] = g1[2][2] - g2[2][2];
+  }
+
+  /**
+   * @brief Multiplies each element of a 3x1 matrix by the value v.
+   * @param g Input Matrix
+   * @param v Value to mutliply each element by.
+   */
+  template <typename T>
+  static void Multiply3x1withConstant(T g[3], T constant)
+  {
+    g[0] *= constant;
+    g[1] *= constant;
+    g[2] *= constant;
+  }
+
+  /**
+   * @brief Multiplies each element of a 3x1 matrix by the value v.
+   * @param g Input Matrix
+   * @param v Value to mutliply each element by.
+   */
+  template <typename T>
+  static void Divide4x1withConstant(T g[4], T v)
+  {
+    g[0] = g[0] / v;
+    g[1] = g[1] / v;
+    g[2] = g[2] / v;
+    g[3] = g[3] / v;
+  }
+
+  /**
+   * @brief Multiplies each element of a 3x1 matrix by the value v.
+   * @param g Input Matrix
+   * @param v Value to mutliply each element by.
+   */
+  template <typename T>
+  static void Multiply3x3withConstant(T g[3][3], T constant)
+  {
+    g[0][0] *= constant;
+    g[0][1] *= constant;
+    g[0][2] *= constant;
+    g[1][0] *= constant;
+    g[1][1] *= constant;
+    g[1][2] *= constant;
+    g[2][0] *= constant;
+    g[2][1] *= constant;
+    g[2][2] *= constant;
+  }
+
+  /**
+   * @brief Transposes the 3x3 matrix and places the result into outMat
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Transpose3x3(const T g[3][3], T outMat[3][3])
+  {
+    outMat[0][0] = g[0][0];
+    outMat[0][1] = g[1][0];
+    outMat[0][2] = g[2][0];
+    outMat[1][0] = g[0][1];
+    outMat[1][1] = g[1][1];
+    outMat[1][2] = g[2][1];
+    outMat[2][0] = g[0][2];
+    outMat[2][1] = g[1][2];
+    outMat[2][2] = g[2][2];
+  }
+
+  /**
+   * @brief Inverts the 3x3 matrix and places the result into outMat
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Invert3x3(T g[3][3], T outMat[3][3])
+  {
+    Adjoint3x3(g, outMat);
+    T determinant = Determinant3x3(g);
+    T oneOverDeterminant = 1.0 / determinant;
+    Multiply3x3withConstant(outMat, oneOverDeterminant);
+  }
+
+  /**
+   * @brief Calculates the Adjoint matrix of the 3x3 matrix and places the result into outMat
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Adjoint3x3(T g[3][3], T outMat[3][3])
+  {
+    T temp[3][3];
+    Cofactor3x3(g, temp);
+    Transpose3x3(temp, outMat);
+  }
+
+  /**
+   * @brief Calculates the cofactor matrix of the 3x3 matrix and places the result into outMat
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Cofactor3x3(T g[3][3], T outMat[3][3])
+  {
+    T temp[3][3];
+    Minors3x3(g, temp);
+    // Row 0
+    outMat[0][0] = temp[0][0];
+    outMat[0][1] = -temp[0][1];
+    outMat[0][2] = temp[0][2];
+    // Row 1
+    outMat[1][0] = -temp[1][0];
+    outMat[1][1] = temp[1][1];
+    outMat[1][2] = -temp[1][2];
+    // Row 2
+    outMat[2][0] = temp[2][0];
+    outMat[2][1] = -temp[2][1];
+    outMat[2][2] = temp[2][2];
+  }
+
+  /**
+   * @brief Calculates the matrix of minors of the 3x3 matrix and places the result into outMat
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Minors3x3(const T g[3][3], T outMat[3][3])
+  {
+    outMat[0][0] = g[1][1] * g[2][2] - g[2][1] * g[1][2];
+    outMat[0][1] = g[1][0] * g[2][2] - g[2][0] * g[1][2];
+    outMat[0][2] = g[1][0] * g[2][1] - g[2][0] * g[1][1];
+    outMat[1][0] = g[0][1] * g[2][2] - g[2][1] * g[0][2];
+    outMat[1][1] = g[0][0] * g[2][2] - g[2][0] * g[0][2];
+    outMat[1][2] = g[0][0] * g[2][1] - g[2][0] * g[0][1];
+    outMat[2][0] = g[0][1] * g[1][2] - g[1][1] * g[0][2];
+    outMat[2][1] = g[0][0] * g[1][2] - g[1][0] * g[0][2];
+    outMat[2][2] = g[0][0] * g[1][1] - g[1][0] * g[0][1];
+  }
+
+  /**
+   * @brief The determinant of a 3x3 matrix
+   * @param g 3x3 Vector
+   * @return
+   */
+  template <typename T>
+  static float Determinant3x3(const T g[3][3])
+  {
+    return (g[0][0] * (g[1][1] * g[2][2] - g[1][2] * g[2][1])) - (g[0][1] * (g[1][0] * g[2][2] - g[1][2] * g[2][0])) + (g[0][2] * (g[1][0] * g[2][1] - g[1][1] * g[2][0]));
+  }
+
+  /**
+   * @brief Copies a 3x3 matrix into another 3x3 matrix
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Copy3x3(const T g[3][3], T outMat[3][3])
+  {
+    outMat[0][0] = g[0][0];
+    outMat[0][1] = g[0][1];
+    outMat[0][2] = g[0][2];
+    outMat[1][0] = g[1][0];
+    outMat[1][1] = g[1][1];
+    outMat[1][2] = g[1][2];
+    outMat[2][0] = g[2][0];
+    outMat[2][1] = g[2][1];
+    outMat[2][2] = g[2][2];
+  }
+
+  /**
+   * @brief Copies a 3x1 matrix into another 3x1 matrix
+   * @param g
+   * @param outMat
+   */
+  template <typename T>
+  static void Copy3x1(const T g[3], T outMat[3])
+  {
+    outMat[0] = g[0];
+    outMat[1] = g[1];
+    outMat[2] = g[2];
+  }
+
+  /**
+   * @brief Initializes the 3x3 matrix to the "Identity" matrix
+   * @param g
+   */
+  template <typename T>
+  static void Identity3x3(T g[3][3])
+  {
+    g[0][0] = 1.0f;
+    g[0][1] = 0.0f;
+    g[0][2] = 0.0f;
+    g[1][0] = 0.0f;
+    g[1][1] = 1.0f;
+    g[1][2] = 0.0f;
+    g[2][0] = 0.0f;
+    g[2][1] = 0.0f;
+    g[2][2] = 1.0f;
+  }
+
+  /**
+   * @brief Performs an "in place" normalization of the 3x1 vector.
+   * @param g
+   */
+  template <typename T>
+  static void Normalize3x3(T g[3][3])
+  {
+    float denom;
+    denom = g[0][0] * g[0][0] + g[1][0] * g[1][0] + g[2][0] * g[2][0];
+    if(denom == 0.0)
     {
-      outMat[0][0] = g1[0][0] * g2[0][0] + g1[0][1] * g2[1][0] + g1[0][2] * g2[2][0];
-      outMat[0][1] = g1[0][0] * g2[0][1] + g1[0][1] * g2[1][1] + g1[0][2] * g2[2][1];
-      outMat[0][2] = g1[0][0] * g2[0][2] + g1[0][1] * g2[1][2] + g1[0][2] * g2[2][2];
-      outMat[1][0] = g1[1][0] * g2[0][0] + g1[1][1] * g2[1][0] + g1[1][2] * g2[2][0];
-      outMat[1][1] = g1[1][0] * g2[0][1] + g1[1][1] * g2[1][1] + g1[1][2] * g2[2][1];
-      outMat[1][2] = g1[1][0] * g2[0][2] + g1[1][1] * g2[1][2] + g1[1][2] * g2[2][2];
-      outMat[2][0] = g1[2][0] * g2[0][0] + g1[2][1] * g2[1][0] + g1[2][2] * g2[2][0];
-      outMat[2][1] = g1[2][0] * g2[0][1] + g1[2][1] * g2[1][1] + g1[2][2] * g2[2][1];
-      outMat[2][2] = g1[2][0] * g2[0][2] + g1[2][1] * g2[1][2] + g1[2][2] * g2[2][2];
+      return;
     }
-
-    /**
-     * @brief Performs the Matrix Multiplication of g1 and g2 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Multiply3x3with3x1(const T g1[3][3], const T* g2, T* outMat)
-    {
-      outMat[0] = g1[0][0] * g2[0] + g1[0][1] * g2[1] + g1[0][2] * g2[2];
-      outMat[1] = g1[1][0] * g2[0] + g1[1][1] * g2[1] + g1[1][2] * g2[2];
-      outMat[2] = g1[2][0] * g2[0] + g1[2][1] * g2[1] + g1[2][2] * g2[2];
-    }
-
-    static void Multiply3x3with3x1(const double g1[3][3], const double g2[3], float outMat[3]);
-
-    /**
-     * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Add3x1s(const T g1[3], const T g2[3], T outMat[3])
+    denom = sqrt(denom);
+    g[0][0] = g[0][0] / denom;
+    if(g[0][0] > 1)
     {
-      outMat[0] = g1[0] + g2[0];
-      outMat[1] = g1[1] + g2[1];
-      outMat[2] = g1[2] + g2[2];
+      g[0][0] = 1;
     }
-
-    /**
-     * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Subtract3x1s(const T g1[3], const T g2[3], T outMat[3])
+    g[1][0] = g[1][0] / denom;
+    if(g[1][0] > 1)
     {
-      outMat[0] = g1[0] - g2[0];
-      outMat[1] = g1[1] - g2[1];
-      outMat[2] = g1[2] - g2[2];
+      g[1][0] = 1;
     }
-
-    /**
-     * @brief Performs the Matrix Addition of g1 and g2 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Add3x3s(const T g1[3][3], const T g2[3][3], float outMat[3][3])
+    g[2][0] = g[2][0] / denom;
+    if(g[2][0] > 1)
     {
-      outMat[0][0] = g1[0][0] + g2[0][0];
-      outMat[0][1] = g1[0][1] + g2[0][1];
-      outMat[0][2] = g1[0][2] + g2[0][2];
-      outMat[1][0] = g1[1][0] + g2[1][0];
-      outMat[1][1] = g1[1][1] + g2[1][1];
-      outMat[1][2] = g1[1][2] + g2[1][2];
-      outMat[2][0] = g1[2][0] + g2[2][0];
-      outMat[2][1] = g1[2][1] + g2[2][1];
-      outMat[2][2] = g1[2][2] + g2[2][2];
+      g[2][0] = 1;
     }
-
-    /**
-     * @brief Performs the Matrix Subtraction of g2 from g1 and puts the result into outMat. (Single Precision version)
-     * @param g1
-     * @param g2
-     * @param outMat
-     */
-    template <typename T>
-    static void Subtract3x3s(const T g1[3][3], const T g2[3][3], T outMat[3][3])
+    denom = g[0][1] * g[0][1] + g[1][1] * g[1][1] + g[2][1] * g[2][1];
+    if(denom == 0.0)
     {
-      outMat[0][0] = g1[0][0] - g2[0][0];
-      outMat[0][1] = g1[0][1] - g2[0][1];
-      outMat[0][2] = g1[0][2] - g2[0][2];
-      outMat[1][0] = g1[1][0] - g2[1][0];
-      outMat[1][1] = g1[1][1] - g2[1][1];
-      outMat[1][2] = g1[1][2] - g2[1][2];
-      outMat[2][0] = g1[2][0] - g2[2][0];
-      outMat[2][1] = g1[2][1] - g2[2][1];
-      outMat[2][2] = g1[2][2] - g2[2][2];
+      return;
     }
-
-    /**
-     * @brief Multiplies each element of a 3x1 matrix by the value v.
-     * @param g Input Matrix
-     * @param v Value to mutliply each element by.
-     */
-    template <typename T>
-    static void Multiply3x1withConstant(T g[3], T constant)
-    {
-      g[0] *= constant;
-      g[1] *= constant;
-      g[2] *= constant;
-    }
-
-    /**
-     * @brief Multiplies each element of a 3x1 matrix by the value v.
-     * @param g Input Matrix
-     * @param v Value to mutliply each element by.
-     */
-    template<typename T>
-    static void Divide4x1withConstant(T g[4], T v)
-    {
-      g[0] = g[0] / v;
-      g[1] = g[1] / v;
-      g[2] = g[2] / v;
-      g[3] = g[3] / v;
-    }
-
-
-    /**
-     * @brief Multiplies each element of a 3x1 matrix by the value v.
-     * @param g Input Matrix
-     * @param v Value to mutliply each element by.
-     */
-    template <typename T>
-    static void Multiply3x3withConstant(T g[3][3], T constant)
-    {
-      g[0][0] *= constant;
-      g[0][1] *= constant;
-      g[0][2] *= constant;
-      g[1][0] *= constant;
-      g[1][1] *= constant;
-      g[1][2] *= constant;
-      g[2][0] *= constant;
-      g[2][1] *= constant;
-      g[2][2] *= constant;
-    }
-
-    /**
-     * @brief Transposes the 3x3 matrix and places the result into outMat
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Transpose3x3(const T g[3][3], T outMat[3][3])
+    denom = sqrt(denom);
+    g[0][1] = g[0][1] / denom;
+    if(g[0][1] > 1)
     {
-      outMat[0][0] = g[0][0];
-      outMat[0][1] = g[1][0];
-      outMat[0][2] = g[2][0];
-      outMat[1][0] = g[0][1];
-      outMat[1][1] = g[1][1];
-      outMat[1][2] = g[2][1];
-      outMat[2][0] = g[0][2];
-      outMat[2][1] = g[1][2];
-      outMat[2][2] = g[2][2];
+      g[0][1] = 1;
     }
-
-    /**
-     * @brief Inverts the 3x3 matrix and places the result into outMat
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Invert3x3(T g[3][3], T outMat[3][3])
+    g[1][1] = g[1][1] / denom;
+    if(g[1][1] > 1)
     {
-      Adjoint3x3(g, outMat);
-      T determinant = Determinant3x3(g);
-      T oneOverDeterminant = 1.0 / determinant;
-      Multiply3x3withConstant(outMat, oneOverDeterminant);
+      g[1][1] = 1;
     }
-
-    /**
-     * @brief Calculates the Adjoint matrix of the 3x3 matrix and places the result into outMat
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Adjoint3x3(T g[3][3], T outMat[3][3])
+    g[2][1] = g[2][1] / denom;
+    if(g[2][1] > 1)
     {
-      T temp[3][3];
-      Cofactor3x3(g, temp);
-      Transpose3x3(temp, outMat);
+      g[2][1] = 1;
     }
-
-    /**
-     * @brief Calculates the cofactor matrix of the 3x3 matrix and places the result into outMat
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Cofactor3x3(T g[3][3], T outMat[3][3])
+    denom = g[0][2] * g[0][2] + g[1][2] * g[1][2] + g[2][2] * g[2][2];
+    if(denom == 0.0)
     {
-      T temp[3][3];
-      Minors3x3(g, temp);
-      // Row 0
-      outMat[0][0] = temp[0][0];
-      outMat[0][1] = -temp[0][1];
-      outMat[0][2] = temp[0][2];
-      // Row 1
-      outMat[1][0] = -temp[1][0];
-      outMat[1][1] = temp[1][1];
-      outMat[1][2] = -temp[1][2];
-      // Row 2
-      outMat[2][0] = temp[2][0];
-      outMat[2][1] = -temp[2][1];
-      outMat[2][2] = temp[2][2];
+      return;
     }
-
-    /**
-     * @brief Calculates the matrix of minors of the 3x3 matrix and places the result into outMat
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Minors3x3(const T g[3][3], T outMat[3][3])
+    denom = sqrt(denom);
+    g[0][2] = g[0][2] / denom;
+    if(g[0][2] > 1)
     {
-      outMat[0][0] = g[1][1] * g[2][2] - g[2][1] * g[1][2];
-      outMat[0][1] = g[1][0] * g[2][2] - g[2][0] * g[1][2];
-      outMat[0][2] = g[1][0] * g[2][1] - g[2][0] * g[1][1];
-      outMat[1][0] = g[0][1] * g[2][2] - g[2][1] * g[0][2];
-      outMat[1][1] = g[0][0] * g[2][2] - g[2][0] * g[0][2];
-      outMat[1][2] = g[0][0] * g[2][1] - g[2][0] * g[0][1];
-      outMat[2][0] = g[0][1] * g[1][2] - g[1][1] * g[0][2];
-      outMat[2][1] = g[0][0] * g[1][2] - g[1][0] * g[0][2];
-      outMat[2][2] = g[0][0] * g[1][1] - g[1][0] * g[0][1];
+      g[0][2] = 1;
     }
-
-    /**
-     * @brief The determinant of a 3x3 matrix
-     * @param g 3x3 Vector
-     * @return
-     */
-    template <typename T>
-    static float Determinant3x3(const T g[3][3])
+    g[1][2] = g[1][2] / denom;
+    if(g[1][2] > 1)
     {
-      return (g[0][0] * (g[1][1] * g[2][2] - g[1][2] * g[2][1])) - (g[0][1] * (g[1][0] * g[2][2] - g[1][2] * g[2][0])) + (g[0][2] * (g[1][0] * g[2][1] - g[1][1] * g[2][0]));
+      g[1][2] = 1;
     }
-
-    /**
-     * @brief Copies a 3x3 matrix into another 3x3 matrix
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Copy3x3(const T g[3][3], T outMat[3][3])
+    g[2][2] = g[2][2] / denom;
+    if(g[2][2] > 1)
     {
-      outMat[0][0] = g[0][0];
-      outMat[0][1] = g[0][1];
-      outMat[0][2] = g[0][2];
-      outMat[1][0] = g[1][0];
-      outMat[1][1] = g[1][1];
-      outMat[1][2] = g[1][2];
-      outMat[2][0] = g[2][0];
-      outMat[2][1] = g[2][1];
-      outMat[2][2] = g[2][2];
+      g[2][2] = 1;
     }
-
-    /**
-     * @brief Copies a 3x1 matrix into another 3x1 matrix
-     * @param g
-     * @param outMat
-     */
-    template <typename T>
-    static void Copy3x1(const T g[3], T outMat[3])
+  }
+
+  /**
+   * @brief Performs an "in place" normalization of the 3x1 vector. Single Precision Variant
+   * @param g
+   */
+  template <typename T>
+  static void Normalize3x1(T g[3])
+  {
+    double denom;
+    denom = g[0] * g[0] + g[1] * g[1] + g[2] * g[2];
+    denom = sqrt(denom);
+    g[0] = g[0] / denom;
+    if(g[0] > 1.0)
     {
-      outMat[0] = g[0];
-      outMat[1] = g[1];
-      outMat[2] = g[2];
+      g[0] = 1.0;
     }
-
-    /**
-     * @brief Initializes the 3x3 matrix to the "Identity" matrix
-     * @param g
-     */
-    template <typename T>
-    static void Identity3x3(T g[3][3])
+    g[1] = g[1] / denom;
+    if(g[1] > 1.0)
     {
-      g[0][0] = 1.0f;
-      g[0][1] = 0.0f;
-      g[0][2] = 0.0f;
-      g[1][0] = 0.0f;
-      g[1][1] = 1.0f;
-      g[1][2] = 0.0f;
-      g[2][0] = 0.0f;
-      g[2][1] = 0.0f;
-      g[2][2] = 1.0f;
+      g[1] = 1.0;
     }
-
-    /**
-     * @brief Performs an "in place" normalization of the 3x1 vector.
-     * @param g
-     */
-    template <typename T>
-    static void Normalize3x3(T g[3][3])
+    g[2] = g[2] / denom;
+    if(g[2] > 1.0)
     {
-      float denom;
-      denom = g[0][0] * g[0][0] + g[1][0] * g[1][0] + g[2][0] * g[2][0];
-      if(denom == 0.0)
-      {
-        return;
-      }
-      denom = sqrt(denom);
-      g[0][0] = g[0][0] / denom;
-      if(g[0][0] > 1)
-      {
-        g[0][0] = 1;
-      }
-      g[1][0] = g[1][0] / denom;
-      if(g[1][0] > 1)
-      {
-        g[1][0] = 1;
-      }
-      g[2][0] = g[2][0] / denom;
-      if(g[2][0] > 1)
-      {
-        g[2][0] = 1;
-      }
-      denom = g[0][1] * g[0][1] + g[1][1] * g[1][1] + g[2][1] * g[2][1];
-      if(denom == 0.0)
-      {
-        return;
-      }
-      denom = sqrt(denom);
-      g[0][1] = g[0][1] / denom;
-      if(g[0][1] > 1)
-      {
-        g[0][1] = 1;
-      }
-      g[1][1] = g[1][1] / denom;
-      if(g[1][1] > 1)
-      {
-        g[1][1] = 1;
-      }
-      g[2][1] = g[2][1] / denom;
-      if(g[2][1] > 1)
-      {
-        g[2][1] = 1;
-      }
-      denom = g[0][2] * g[0][2] + g[1][2] * g[1][2] + g[2][2] * g[2][2];
-      if(denom == 0.0)
-      {
-        return;
-      }
-      denom = sqrt(denom);
-      g[0][2] = g[0][2] / denom;
-      if(g[0][2] > 1)
-      {
-        g[0][2] = 1;
-      }
-      g[1][2] = g[1][2] / denom;
-      if(g[1][2] > 1)
-      {
-        g[1][2] = 1;
-      }
-      g[2][2] = g[2][2] / denom;
-      if(g[2][2] > 1)
-      {
-        g[2][2] = 1;
-      }
+      g[2] = 1.0;
     }
-
-    /**
-     * @brief Performs an "in place" normalization of the 3x1 vector. Single Precision Variant
-     * @param g
-     */
-    template <typename T>
-    static void Normalize3x1(T g[3])
+  }
+
+  /**
+   * @brief Performs an "in place" sort of the 3x1 vector in ascending order. Single Precision Variant
+   * @param g
+   */
+  template <typename T>
+  static void Sort3x1Ascending(T g[3])
+  {
+    float temp;
+
+    if(g[0] <= g[1] && g[0] <= g[2])
     {
-      double denom;
-      denom = g[0] * g[0] + g[1] * g[1] + g[2] * g[2];
-      denom = sqrt(denom);
-      g[0] = g[0] / denom;
-      if(g[0] > 1.0)
+      if(g[1] <= g[2])
       {
-        g[0] = 1.0;
+        g[0] = g[0];
+        g[1] = g[1];
+        g[2] = g[2];
       }
-      g[1] = g[1] / denom;
-      if(g[1] > 1.0)
+      else
       {
-        g[1] = 1.0;
-      }
-      g[2] = g[2] / denom;
-      if(g[2] > 1.0)
-      {
-        g[2] = 1.0;
+        g[0] = g[0];
+        temp = g[1];
+        g[1] = g[2];
+        g[2] = temp;
       }
     }
-
-    /**
-     * @brief Performs an "in place" sort of the 3x1 vector in ascending order. Single Precision Variant
-     * @param g
-     */
-    template <typename T>
-    static void Sort3x1Ascending(T g[3])
+    else if(g[1] <= g[0] && g[1] <= g[2])
     {
-      float temp;
-
-      if(g[0] <= g[1] && g[0] <= g[2])
+      if(g[0] <= g[2])
       {
-        if(g[1] <= g[2])
-        {
-          g[0] = g[0];
-          g[1] = g[1];
-          g[2] = g[2];
-        }
-        else
-        {
-          g[0] = g[0];
-          temp = g[1];
-          g[1] = g[2];
-          g[2] = temp;
-        }
+        temp = g[0];
+        g[0] = g[1];
+        g[1] = temp;
+        g[2] = g[2];
       }
-      else if(g[1] <= g[0] && g[1] <= g[2])
+      else
       {
-        if(g[0] <= g[2])
-        {
-          temp = g[0];
-          g[0] = g[1];
-          g[1] = temp;
-          g[2] = g[2];
-        }
-        else
-        {
-          temp = g[0];
-          g[0] = g[1];
-          g[1] = g[2];
-          g[2] = temp;
-        }
-      }
-      else if(g[2] <= g[0] && g[2] <= g[1])
-      {
-        if(g[0] <= g[1])
-        {
-          temp = g[0];
-          g[0] = g[2];
-          g[2] = g[1];
-          g[1] = temp;
-        }
-        else
-        {
-          temp = g[0];
-          g[0] = g[2];
-          g[1] = g[1];
-          g[2] = temp;
-        }
+        temp = g[0];
+        g[0] = g[1];
+        g[1] = g[2];
+        g[2] = temp;
       }
     }
-
-    /**
-     * @brief Returns index of maximum value. Single Precision Variant
-     * @param g
-     */
-    template <typename T>
-    static int FindIndexOfMaxVal3x1(const T g[3])
+    else if(g[2] <= g[0] && g[2] <= g[1])
     {
-      float a = fabs(g[0]);
-      float b = fabs(g[1]);
-      float c = fabs(g[2]);
-      if(a >= b && a >= c)
+      if(g[0] <= g[1])
       {
-        return 0;
+        temp = g[0];
+        g[0] = g[2];
+        g[2] = g[1];
+        g[1] = temp;
       }
-      if(b >= a && b >= c)
+      else
       {
-        return 1;
+        temp = g[0];
+        g[0] = g[2];
+        g[1] = g[1];
+        g[2] = temp;
       }
-
-      return 2;
     }
-
-    /**
-     * @brief Performs an "in place" normalization of the 3x1 vector. Double Precision Variant
-     * @param i
-     * @param j
-     * @param k
-     */
-    template <typename T>
-    static void Normalize3x1(T& i, T& j, T& k)
+  }
+
+  /**
+   * @brief Returns index of maximum value. Single Precision Variant
+   * @param g
+   */
+  template <typename T>
+  static int FindIndexOfMaxVal3x1(const T g[3])
+  {
+    float a = fabs(g[0]);
+    float b = fabs(g[1]);
+    float c = fabs(g[2]);
+    if(a >= b && a >= c)
     {
-      T denom;
-      denom = std::sqrt(((i * i) + (j * j) + (k * k)));
-      if(denom == 0)
-      {
-        return;
-      }
-      i = i / denom;
-      j = j / denom;
-      k = k / denom;
+      return 0;
     }
-
-    /**
-     * @brief Returns the magnitude of the 3x1 vector. Double Precision Variant
-     * @param a
-     */
-    template<typename T>
-    static T Magnitude3x1(T a[3])
+    if(b >= a && b >= c)
     {
-      return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2])));
+      return 1;
     }
 
-    /**
-     * @brief Returns the magnitude of the 4x1 vector. Single Precision Variant
-     * @param a
-     */
-    template <typename T>
-    static T Magnitude4x1(T a[4])
+    return 2;
+  }
+
+  /**
+   * @brief Performs an "in place" normalization of the 3x1 vector. Double Precision Variant
+   * @param i
+   * @param j
+   * @param k
+   */
+  template <typename T>
+  static void Normalize3x1(T& i, T& j, T& k)
+  {
+    T denom;
+    denom = std::sqrt(((i * i) + (j * j) + (k * k)));
+    if(denom == 0)
     {
-      return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) + (a[3] * a[3])));
+      return;
     }
-
-    /**
-     * @brief The dot product of 2 vectors a & b. Single Precision Variant
-     * @param a 1x3 Vector
-     * @param b 1x3 Vector
-     * @return
-     */
-    template <typename T>
-    static T DotProduct3x1(T a[3], T b[3])
-    {
-      return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]);
-    }
-
-    /**
-     * @brief Performs a Cross Product of "a into b" and places the result into c. Double Precision Variant
-     * A X B = C
-     * @param a
-     * @param b
-     * @param c
-     */
-    template <typename T>
-    static void CrossProduct(const T a[3], const T b[3], T c[3])
-    {
-      c[0] = a[1] * b[2] - a[2] * b[1];
-      c[1] = a[2] * b[0] - a[0] * b[2];
-      c[2] = a[0] * b[1] - a[1] * b[0];
-    }
-
-  protected:
-    MatrixMath();
-
-  public:
-    MatrixMath(const MatrixMath&) = delete;     // Copy Constructor Not Implemented
-    MatrixMath(MatrixMath&&) = delete;          // Move Constructor Not Implemented
-    MatrixMath& operator=(const MatrixMath&) = delete; // Copy Assignment Not Implemented
-    MatrixMath& operator=(MatrixMath&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+    i = i / denom;
+    j = j / denom;
+    k = k / denom;
+  }
+
+  /**
+   * @brief Returns the magnitude of the 3x1 vector. Double Precision Variant
+   * @param a
+   */
+  template <typename T>
+  static T Magnitude3x1(T a[3])
+  {
+    return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2])));
+  }
+
+  /**
+   * @brief Returns the magnitude of the 4x1 vector. Single Precision Variant
+   * @param a
+   */
+  template <typename T>
+  static T Magnitude4x1(T a[4])
+  {
+    return (sqrt((a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) + (a[3] * a[3])));
+  }
+
+  /**
+   * @brief The dot product of 2 vectors a & b. Single Precision Variant
+   * @param a 1x3 Vector
+   * @param b 1x3 Vector
+   * @return
+   */
+  template <typename T>
+  static T DotProduct3x1(T a[3], T b[3])
+  {
+    return (a[0] * b[0] + a[1] * b[1] + a[2] * b[2]);
+  }
+
+  /**
+   * @brief Performs a Cross Product of "a into b" and places the result into c. Double Precision Variant
+   * A X B = C
+   * @param a
+   * @param b
+   * @param c
+   */
+  template <typename T>
+  static void CrossProduct(const T a[3], const T b[3], T c[3])
+  {
+    c[0] = a[1] * b[2] - a[2] * b[1];
+    c[1] = a[2] * b[0] - a[0] * b[2];
+    c[2] = a[0] * b[1] - a[1] * b[0];
+  }
+
+protected:
+  MatrixMath();
+
+public:
+  MatrixMath(const MatrixMath&) = delete;            // Copy Constructor Not Implemented
+  MatrixMath(MatrixMath&&) = delete;                 // Move Constructor Not Implemented
+  MatrixMath& operator=(const MatrixMath&) = delete; // Copy Assignment Not Implemented
+  MatrixMath& operator=(MatrixMath&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
index aea1887382..2b420fc236 100644
--- a/Source/SIMPLib/Montages/MontageSupport.cpp
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -120,9 +120,8 @@ DataContainerArray::MontageCollection MontageSupport::IO::ReadMontagesFromHDF5(h
   DataContainerArray::MontageCollection montageCollection;
 
   // Get list of montages
-  int filter = H5Utilities::H5Support_ANY;
   QStringList names;
-  QH5Utilities::getGroupObjects(parentId, filter, names);
+  QH5Utilities::getGroupObjects(parentId, H5Utilities::CustomHDFDataTypes::Any, names);
 
   for(const QString& name : names)
   {
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
index 8cf89cc946..be6a42a949 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
@@ -35,9 +35,10 @@
 
 #include "BoundaryStatsData.h"
 
-#include <QtCore/QString>
 #include <vector>
 
+#include <QtCore/QString>
+
 #include "H5Support/H5Utilities.h"
 
 #include "SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h"
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index 5fbb02ecfb..2dbf47c0d7 100755
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -32,15 +32,12 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #pragma once
 
 #include <memory>
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
diff --git a/Source/SIMPLib/Testing/CMakeLists.txt b/Source/SIMPLib/Testing/CMakeLists.txt
index 2fdb1fc682..16649b0b97 100644
--- a/Source/SIMPLib/Testing/CMakeLists.txt
+++ b/Source/SIMPLib/Testing/CMakeLists.txt
@@ -44,7 +44,6 @@ endforeach()
 
 set(LINKED_LIBRARIES
   Qt5::Core
-  H5Support
   SIMPLib
   ${ITK_LIBRARIES}
 )
diff --git a/Source/SIMPLib/Utilities/ColorTable.h b/Source/SIMPLib/Utilities/ColorTable.h
index 61f08ab8bd..5af582460f 100755
--- a/Source/SIMPLib/Utilities/ColorTable.h
+++ b/Source/SIMPLib/Utilities/ColorTable.h
@@ -36,10 +36,11 @@
 #pragma once
 
 #include <iostream>
+#include <vector>
 
 #include <QtCore/QVector>
 
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibDLLExport.h"
 #include "SIMPLib/Common/Constants.h"
 
 class SIMPLib_EXPORT RgbColor
diff --git a/Source/SIMPLib/Utilities/GenericDataParser.hpp b/Source/SIMPLib/Utilities/GenericDataParser.hpp
new file mode 100644
index 0000000000..1d08dc0941
--- /dev/null
+++ b/Source/SIMPLib/Utilities/GenericDataParser.hpp
@@ -0,0 +1,339 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QString>
+
+#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+
+class GenericDataParser
+{
+public:
+  using Self = GenericDataParser;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  const QString getNameOfClass() const
+  {
+    return QString("GenericDataParser");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("GenericDataParser");
+  }
+
+  /**
+   * @brief IsA
+   * @return
+   */
+  virtual int32_t IsA() const
+  {
+    return 0;
+  }
+
+  virtual ~GenericDataParser() = default;
+
+  virtual bool allocateArray(size_t numberOfElements)
+  {
+    (void)(numberOfElements);
+    return false;
+  }
+  virtual void* getVoidPointer()
+  {
+    return nullptr;
+  }
+  virtual void setVoidPointer(void* p)
+  {
+  }
+
+  SIMPL_INSTANCE_PROPERTY(bool, ManageMemory)
+  SIMPL_INSTANCE_PROPERTY(size_t, Size)
+  SIMPL_INSTANCE_STRING_PROPERTY(ColumnName)
+  SIMPL_INSTANCE_PROPERTY(int, ColumnIndex)
+
+  virtual void parse(const QByteArray& token, size_t index)
+  {
+  }
+
+protected:
+  GenericDataParser()
+  : m_ManageMemory(false)
+  , m_Size(0)
+  , m_ColumnName("")
+  , m_ColumnIndex(0)
+  {
+  }
+
+public:
+  GenericDataParser(const GenericDataParser&) = delete;            // Copy Constructor Not Implemented
+  GenericDataParser(GenericDataParser&&) = delete;                 // Move Constructor Not Implemented
+  GenericDataParser& operator=(const GenericDataParser&) = delete; // Copy Assignment Not Implemented
+  GenericDataParser& operator=(GenericDataParser&&) = delete;      // Move Assignment Not Implemented
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+class Int32DataParser : public GenericDataParser
+{
+public:
+  using Self = Int32DataParser;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  const QString getNameOfClass() const
+  {
+    return QString("Int32DataParser");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("Int32DataParser");
+  }
+
+  int32_t IsA() const override
+  {
+    return 1;
+  }
+
+  static Pointer New(int32_t* ptr, size_t size, const QString& name, int index)
+  {
+    Pointer sharedPtr(new Int32DataParser(ptr, size, name, index));
+    return sharedPtr;
+  }
+
+  ~Int32DataParser() override
+  {
+    if(m_Ptr != nullptr && getManageMemory())
+    {
+      delete[](m_Ptr);
+
+      m_Ptr = nullptr;
+    }
+  }
+
+  void setPtr(int32_t* value)
+  {
+    this->m_Ptr = value;
+  }
+  int32_t* getPtr()
+  {
+    return m_Ptr;
+  }
+
+  bool allocateArray(size_t numberOfElements) override
+  {
+    m_Ptr = new int32_t[numberOfElements]();
+    return (m_Ptr != nullptr);
+  }
+
+  void* getVoidPointer() override
+  {
+    return reinterpret_cast<void*>(m_Ptr);
+  }
+  void setVoidPointer(void* p) override
+  {
+    m_Ptr = reinterpret_cast<int32_t*>(p);
+  }
+
+  int32_t* getPointer(size_t offset)
+  {
+    return m_Ptr + offset;
+  }
+
+  void parse(const QByteArray& token, size_t index) override
+  {
+    if(index >= getSize())
+    {
+      throw std::out_of_range("Int32DataParser subscript out of range");
+    }
+    bool ok = false;
+    m_Ptr[index] = token.toInt(&ok, 10);
+  }
+
+protected:
+  Int32DataParser(int32_t* ptr, size_t size, const QString& name, int index)
+  : m_Ptr(ptr)
+  {
+    setManageMemory(true);
+    setSize(size);
+    setColumnName(name);
+    setColumnIndex(index);
+  }
+
+private:
+  int32_t* m_Ptr;
+
+public:
+  Int32DataParser(const Int32DataParser&) = delete;            // Copy Constructor Not Implemented
+  Int32DataParser(Int32DataParser&&) = delete;                 // Move Constructor Not Implemented
+  Int32DataParser& operator=(const Int32DataParser&) = delete; // Copy Assignment Not Implemented
+  Int32DataParser& operator=(Int32DataParser&&) = delete;      // Move Assignment Not Implemented
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+class FloatDataParser : public GenericDataParser
+{
+public:
+  using Self = FloatDataParser;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  const QString getNameOfClass() const
+  {
+    return QString("FloatDataParser");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("FloatDataParser");
+  }
+
+  int32_t IsA() const override
+  {
+    return 2;
+  }
+
+  static Pointer New(float* ptr, size_t size, const QString& name, int index)
+  {
+    Pointer sharedPtr(new FloatDataParser(ptr, size, name, index));
+    return sharedPtr;
+  }
+
+  ~FloatDataParser() override
+  {
+    if(m_Ptr != nullptr && getManageMemory())
+    {
+      delete[](m_Ptr);
+
+      m_Ptr = nullptr;
+    }
+  }
+
+  void setPtr(float* value)
+  {
+    this->m_Ptr = value;
+  }
+  float* getPtr()
+  {
+    return m_Ptr;
+  }
+
+  bool allocateArray(size_t numberOfElements) override
+  {
+    m_Ptr = new float[numberOfElements]();
+    return (m_Ptr != nullptr);
+  }
+
+  void* getVoidPointer() override
+  {
+    return reinterpret_cast<void*>(m_Ptr);
+  }
+  void setVoidPointer(void* p) override
+  {
+    m_Ptr = reinterpret_cast<float*>(p);
+  }
+
+  float* getPointer(size_t offset)
+  {
+    return m_Ptr + offset;
+  }
+
+  void parse(const QByteArray& token, size_t index) override
+  {
+    if(index >= getSize())
+    {
+      throw std::out_of_range("FloatDataParser subscript out of range");
+    }
+    bool ok = false;
+    m_Ptr[index] = token.toFloat(&ok);
+  }
+
+protected:
+  FloatDataParser(float* ptr, size_t size, const QString& name, int index)
+  : m_Ptr(ptr)
+  {
+    setManageMemory(true);
+    setSize(size);
+    setColumnName(name);
+    setColumnIndex(index);
+  }
+
+private:
+  float* m_Ptr;
+
+public:
+  FloatDataParser(const FloatDataParser&) = delete;            // Copy Constructor Not Implemented
+  FloatDataParser(FloatDataParser&&) = delete;                 // Move Constructor Not Implemented
+  FloatDataParser& operator=(const FloatDataParser&) = delete; // Copy Assignment Not Implemented
+  FloatDataParser& operator=(FloatDataParser&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 6200a89021..bf169ab8d3 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -295,7 +295,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
   H5ScopedGroupSentinel sentinel(&dcbGroupId, false);
 
   QList<QString> groupNames;
-  err = QH5Utilities::getGroupObjects(dcbGroupId, H5Utilities::H5Support_GROUP, groupNames);
+  err = QH5Utilities::getGroupObjects(dcbGroupId, H5Utilities::CustomHDFDataTypes::Group, groupNames);
   if(err < 0)
   {
     QString ss = QObject::tr("Error getting group objects from HDF5 group '%1' ").arg(SIMPL::StringConstants::DataContainerBundleGroupName);
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index 36b010d362..116454d1f9 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -21,6 +21,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilePathGenerator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FileSystemPathHelper.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FloatSummation.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/GenericDataParser.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MontageSelection.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelDataAlgorithm.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ParallelData2DAlgorithm.h
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
index a5fe53bad4..91ec93f030 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
@@ -300,7 +300,7 @@ void ImportHDF5TreeModelItem::initializeChildItems()
     m_NumAttrs = object_info.num_attrs;
 
     std::list<std::string> itemList;
-    herr_t err = H5Utilities::getGroupObjects(groupId, H5Utilities::H5Support_ANY, itemList);
+    herr_t err = H5Utilities::getGroupObjects(groupId, H5Utilities::CustomHDFDataTypes::Any, itemList);
     if(err < 0)
     {
       std::cout << "Error getting group objects. " << __FILE__ << ":" << __LINE__ << std::endl;
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
index e1dbcbff0f..8a0d44aacd 100644
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ b/Wrapping/Python/Pybind11/CMakeLists.txt
@@ -114,7 +114,7 @@ if(SIMPL_BUILD_TESTING)
     message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
   endif()
   if(NOT SIMPL_ENABLE_ANACONDA_PACKAGE)
-    message(FATAL_ERROR "Please SIMPL_ENABLE_ANACONDA_PACKAGE=ON in order for the Python unit tests to execute correctly.")
+    message(FATAL_ERROR "Please -DSIMPL_ENABLE_ANACONDA_PACKAGE=ON in order for the Python unit tests to execute correctly.")
   endif()
 
   #------------------------------
@@ -176,6 +176,9 @@ if (SIMPL_ENABLE_ANACONDA_PACKAGE)
     ANACONDA_ENVIRONMENT_NAME is the virtual environment name. Leaving this blank might work....\n\
     SIMPL_ENABLE_ANACONDA_PACKAGE This will enable the creation of a script that will create an Anaconda3 package for DREAM3D/SIMPL\n\
     SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL Will install the python package to the ANACONDA_ENVIRONMENT_NAME name on your local computer. Use this with caution.\n\
+    \n\
+    The complete CMake configure arguments would be:\n\
+    -DSIMPL_ENABLE_PYTHON=ON -DANACONDA_DIR=  -DANACONDA_ENVIRONMENT_NAME=  -DSIMPL_ENABLE_ANACONDA_PACKAGE=ON -DSIMPL_ENABLE_ANACONDA_LOCAL_INSTALL=OFF
     ")
   endif()
   #if()
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
index cb3696740d..2c12de4bf8 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
@@ -590,8 +590,7 @@ QString PythonBindingClass::generatePropertiesCode()
     else if(tokens.size() == 6)
     {
       out << TAB << "/* Property accessors for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property(\"" << varName << "\", &" << getClassName() << "::get" << varName << ", &" << getClassName() << "::set" << varName << ")" << NEWLINE_SIMPL;
-
+      out << TAB << ".def_property(\"" << varName << "\", &" << getClassName() << "::" << tokens[3] << ", &" << getClassName() << "::" << tokens[5] << ")" << NEWLINE_SIMPL;
       argCode << SIMPL::Python::fromCamelCase(varName);
       docCode << "    :param " << pyType << " " << SIMPL::Python::fromCamelCase(varName) << ": Sets the " << varName << " value.\n";
 
diff --git a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
index 5d3e41d9ca..82209461ca 100644
--- a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
@@ -23,7 +23,7 @@ template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>
  * These are Plugin specific Headers. Yep sort of hard coded and brittle.
  ******************************************************************************/
 #ifdef ORIENTATIONANALYSIS_PYBIND_11_HEADER
-#include "OrientationLib/OrientationMath/OrientationConverter.hpp"
+#include "EbsdLib/OrientationMath/OrientationConverter.hpp"
 #endif
 
 /******************************************************************************

From 78936ac87c90685acc848df8cc3103fb252f228d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 13 Apr 2020 09:51:34 -0400
Subject: [PATCH 194/397] Minimum CMake version is set to 3.14

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                       | 2 +-
 Source/PipelineRunner/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2bee24a483..5cf8705557 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_EXTENSIONS False)
 
-cmake_minimum_required(VERSION 3.13.0)
+cmake_minimum_required(VERSION 3.14.0)
 
 #------------------------------------------------------------------------------
 # Create the Top level Project
diff --git a/Source/PipelineRunner/CMakeLists.txt b/Source/PipelineRunner/CMakeLists.txt
index ada9817e71..75c70f69f6 100644
--- a/Source/PipelineRunner/CMakeLists.txt
+++ b/Source/PipelineRunner/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 # set project's name
 PROJECT( SIMPLTools )
-cmake_minimum_required(VERSION 3.8.0)
+cmake_minimum_required(VERSION 3.14.0)
 
 # --------------------------------------------------------------------
 # Setup the install rules for the various platforms

From 5d0b967ddeb9842a443c49101bcc40d9f7bb2955 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 20 Apr 2020 17:02:07 -0400
Subject: [PATCH 195/397] Remove uses of tbb::task_scheduler_init from all
 codes

+ Replace with C++ 'thread' class
+ Rewrite sections of code that depend on #define for parallel algorithms and replace
with simpler codes.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp   | 2 --
 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp | 1 -
 Source/SIMPLib/Geometry/ImageGeom.cpp               | 4 +++-
 Source/SIMPLib/Geometry/RectGridGeom.cpp            | 4 +++-
 Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h  | 1 -
 Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h  | 1 -
 Source/SIMPLib/Utilities/ParallelDataAlgorithm.h    | 1 -
 Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h    | 4 ----
 8 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 162039f294..4ef2e9b5a1 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -43,7 +43,6 @@
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
 #include <tbb/task_group.h>
-#include <tbb/task_scheduler_init.h>
 #endif
 
 #include "SIMPLib/Common/Constants.h"
@@ -457,7 +456,6 @@ void GenerateTiltSeries::execute()
   DataContainerArray::Pointer dca = getDataContainerArray();
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-  tbb::task_scheduler_init init;
   std::shared_ptr<tbb::task_group> g(new tbb::task_group);
   // C++11 RIGHT HERE....
   int32_t nthreads = static_cast<int32_t>(std::thread::hardware_concurrency()); // Returns ZERO if not defined on this platform
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 0de2edacee..f445bdc1d7 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -43,7 +43,6 @@
 #include <tbb/blocked_range3d.h>
 #include <tbb/parallel_for.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 #endif
 
 #include <QtCore/QTextStream>
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 2c299805f5..0584f17cb3 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -45,6 +45,8 @@
 
 #include <QtCore/QTextStream>
 
+#include <thread>
+
 #include "SIMPLib/Geometry/ImageGeom.h"
 
 #include "H5Support/H5Lite.h"
@@ -916,7 +918,7 @@ void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType:
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-  size_t grain = dims[2] == 1 ? 1 : dims[2] / tbb::task_scheduler_init::default_num_threads();
+  size_t grain = dims[2] == 1 ? 1 : dims[2] / std::thread::hardware_concurrency();
 
   if(grain == 0) // This can happen if dims[2] > number of processors
   {
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index b40267b31a..6612bfd1e2 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -45,6 +45,8 @@
 
 #include <QtCore/QTextStream>
 
+#include <thread>
+
 #include "SIMPLib/Geometry/RectGridGeom.h"
 
 #include "H5Support/H5Lite.h"
@@ -973,7 +975,7 @@ void RectGridGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayTy
     connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), observable, SLOT(processDerivativesMessage(const AbstractMessage::Pointer&)));
   }
 
-  size_t grain = dims[2] == 1 ? 1 : dims[2] / tbb::task_scheduler_init::default_num_threads();
+  size_t grain = dims[2] == 1 ? 1 : dims[2] / std::thread::hardware_concurrency();
   if(grain == 0)
   {
     grain = 1;
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
index 5c3a6f5276..299269e925 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
@@ -47,7 +47,6 @@
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 // clang-format on
 #endif
 
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
index a962403c5e..b9f14ceb40 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
@@ -47,7 +47,6 @@
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 // clang-format on
 #endif
 
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
index 986ce69c67..fa3476a7f8 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -47,7 +47,6 @@
 #include <tbb/blocked_range.h>
 #include <tbb/parallel_for.h>
 #include <tbb/partitioner.h>
-#include <tbb/task_scheduler_init.h>
 // clang-format on
 #endif
 
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
index 9f620ec5e2..7b8e32b81c 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -42,10 +42,7 @@
 // This is consistent with previous behavior, only earlier parallelization split the includes between
 // the corresponding .h and .cpp files.
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-// clang-format off
 #include <tbb/task_group.h>
-#include <tbb/task_scheduler_init.h>
-// clang-format on
 #endif
 
 /**
@@ -122,7 +119,6 @@ class SIMPLib_EXPORT ParallelTaskAlgorithm
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   uint32_t m_MaxThreads = 1;
   uint32_t m_CurThreads = 0;
-  tbb::task_scheduler_init init;
   std::shared_ptr<tbb::task_group> m_TaskGroup;
 #endif
 };

From ee67faecfc20ad375ee0d3a79f1785d2dfb2aae0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 21 Apr 2020 18:01:21 -0400
Subject: [PATCH 196/397] Minor changes to the unit test report to conform to
 Markdown formatting rules

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/SIMPLibMacros.cmake | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Source/SIMPLib/SIMPLibMacros.cmake b/Source/SIMPLib/SIMPLibMacros.cmake
index 9ee40caaff..36134acd30 100755
--- a/Source/SIMPLib/SIMPLibMacros.cmake
+++ b/Source/SIMPLib/SIMPLibMacros.cmake
@@ -98,18 +98,16 @@ function(SIMPL_GenerateUnitTestFile)
   endforeach()
   file(APPEND ${UnitTestAnalysisFile} "| TotalFilters: ${totalFilters} | Num Tested: ${numTests} |\n")
 
-  file(APPEND ${UnitTestAnalysisFile} "\n### Non-Matching Unit Test Names ###\n")
-  foreach(ut ${P_SOURCES})
-    file(APPEND ${UnitTestAnalysisFile} "+ ${ut}\n")
-  endforeach()
-
-
+  list(LENGTH P_SOURCES list_size)
+  if(NOT ${list_size} EQUAL 0)
+    file(APPEND ${UnitTestAnalysisFile} "\n### Non-Matching Unit Test Names (${P_PLUGIN_NAME}) ###\n\n")
+    foreach(ut ${P_SOURCES})
+      file(APPEND ${UnitTestAnalysisFile} "+ ${ut}\n")
+    endforeach()
+  endif()
 
 endfunction()
 
-
-
-
 #-------------------------------------------------------------------------------
 # SIMPL_ADD_UNIT_TEST
 # 

From 19cadecb1eb3309d92cf50a67026f1a38fddf8e9 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <jared.duffey@bluequartz.net>
Date: Wed, 22 Apr 2020 17:11:53 -0400
Subject: [PATCH 197/397] New Python bindings generator (#397)

* Fixed issues with Python bindings

* Removed duplicate definitions of pybind11 macros

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed more DataArray API to be const correct

* Changed uses of int to int32_t
* Removed getArray() and setArray()
* Removed unnecessary virtual keywords
* Changed some functions to use modern C++ idioms

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed AxisAngleInput_t to be const correct

* Added default values for public members

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added PYB11_FILTER macro to flag a class as a filter

* The Python generator will create a Pythonic interface for those
filters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Removed unused property from ImportHDF5Dataset

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Updated .gitignore to include Python cache folders

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Revert some DataArray changes due to crash in Python test

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added new Python binding generator

* Changed Python tests to work with new bindings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed compile error for gcc

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed clang warnings about copy/move

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed DataArray implementation to use more modern C++

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* More DataArray changes

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added fallback byte swap functions

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed to use int32_t

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .gitignore                                    |   2 +
 CMakeLists.txt                                |  79 ++-
 Source/SIMPLib/Common/SIMPLPythonMacros.h     |   6 +
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   | 144 ----
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |   1 +
 Source/SIMPLib/CoreFilters/Breakpoint.h       |   1 +
 .../CoreFilters/CombineAttributeArrays.h      |   1 +
 .../CoreFilters/CombineAttributeMatrices.h    |   1 +
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |   1 +
 .../CoreFilters/ConvertColorToGrayScale.h     |   1 +
 Source/SIMPLib/CoreFilters/ConvertData.h      |   1 +
 .../CopyFeatureArrayToElementArray.h          |   1 +
 Source/SIMPLib/CoreFilters/CopyObject.h       |   1 +
 .../CoreFilters/CreateAttributeMatrix.h       |   1 +
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |   1 +
 .../SIMPLib/CoreFilters/CreateDataContainer.h |   1 +
 .../CreateFeatureArrayFromElementArray.h      |   1 +
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |   1 +
 .../SIMPLib/CoreFilters/CreateGridMontage.h   |   8 +-
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |   1 +
 .../SIMPLib/CoreFilters/CreateStringArray.h   |   1 +
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |   1 +
 .../SIMPLib/CoreFilters/DataContainerReader.h |   1 +
 .../SIMPLib/CoreFilters/DataContainerWriter.h |   1 +
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |   1 +
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |   1 +
 .../ExtractAttributeArraysFromGeometry.h      |   1 +
 .../CoreFilters/ExtractComponentAsArray.h     |   1 +
 .../CoreFilters/ExtractVertexGeometry.h       |   1 +
 .../CoreFilters/FeatureCountDecision.h        |   1 +
 .../CoreFilters/FeatureDataCSVWriter.h        |   1 +
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |   1 +
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |   1 +
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  |   1 +
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |   1 +
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |   8 -
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |   7 +-
 Source/SIMPLib/CoreFilters/InitializeData.h   |   1 +
 .../LinkFeatureMapToElementArray.h            |   1 +
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |   1 +
 Source/SIMPLib/CoreFilters/MassCreateData.h   |   1 +
 Source/SIMPLib/CoreFilters/MoveData.h         |   1 +
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |   1 +
 .../CoreFilters/MultiThresholdObjects.h       |   1 +
 .../CoreFilters/MultiThresholdObjects2.h      |   1 +
 .../SIMPLib/CoreFilters/PipelineAnnotation.h  |   1 +
 Source/SIMPLib/CoreFilters/PostSlackMessage.h |   1 +
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |   1 +
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |   1 +
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |   1 +
 .../CoreFilters/RemoveComponentFromArray.h    |   1 +
 .../CoreFilters/RenameAttributeArray.h        |   1 +
 .../CoreFilters/RenameAttributeMatrix.h       |   1 +
 .../SIMPLib/CoreFilters/RenameDataContainer.h |   1 +
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |   1 +
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |   1 +
 .../CoreFilters/RotateSampleRefFrame.h        |   1 +
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |   1 +
 .../SetOriginResolutionImageGeom.h            |   1 +
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |   1 +
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |   1 +
 .../CoreFilters/WriteTriangleGeometry.h       |   1 +
 .../CoreFilters/util/ASCIIWizardData.hpp      |   6 +-
 Source/SIMPLib/DataArrays/DataArray.cpp       | 509 +++++---------
 Source/SIMPLib/DataArrays/DataArray.hpp       |  84 +--
 Source/SIMPLib/DataArrays/IDataArray.cpp      |   2 +-
 Source/SIMPLib/DataArrays/IDataArray.h        |  28 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  17 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |  19 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |  15 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |  18 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |  12 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |  16 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h |   4 +-
 .../SIMPLib/FilterParameters/AxisAngleInput.h |  28 +-
 Source/SIMPLib/Filtering/ComparisonSet.h      |   5 +-
 Source/SIMPLib/Filtering/ComparisonValue.h    |   1 -
 Source/SIMPLib/Geometry/EdgeGeom.h            |   2 -
 Source/SIMPLib/Geometry/QuadGeom.h            |   4 +-
 Source/SIMPLib/Geometry/TriangleGeom.h        |  11 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |   3 -
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |   4 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.h   |   2 +-
 .../Python/Binding/CreatePybind11Module.cmake | 137 ++++
 .../Python/Binding/Pybind11CustomTypeCasts.h  | 643 ++++++++++++++++++
 .../Binding/generate_python_bindings.py       | 611 +++++++++++++++++
 Wrapping/Python/Binding/pySIMPLBody.cpp       | 227 +++++++
 Wrapping/Python/Binding/pySIMPLHeader.cpp     |  47 ++
 Wrapping/Python/Binding/pySupport.h           | 185 +++++
 Wrapping/Python/SIMPL/simpl_helpers.py        | 279 ++++----
 Wrapping/Python/SIMPL/simpl_test_dirs.in.py   |  13 +-
 Wrapping/Python/Testing/AbstractFilterTest.py |  54 +-
 .../Python/Testing/Array_Calculator_Test.py   |  39 +-
 .../Python/Testing/AttributeMatrixTest.py     |  27 +-
 .../Convert_Attribute_Array_Data_Type.py      |  34 +-
 Wrapping/Python/Testing/Copy_Object_Test.py   |  41 +-
 .../Python/Testing/Create_Edge_Geometry.py    | 102 ++-
 .../Python/Testing/Create_Quad_Geometry.py    | 137 ++--
 .../Python/Testing/Create_RectilinearGrid.py  |  64 +-
 .../Testing/Create_Triangle_Geometry.py       | 131 ++--
 .../Python/Testing/Create_Vertex_Geometry.py  |  87 ++-
 .../Python/Testing/Crop_Vertex_Geometry.py    |  99 ++-
 Wrapping/Python/Testing/DataArrayTest.py      |  50 +-
 .../Python/Testing/DataContainerArrayTest.py  |  85 +--
 Wrapping/Python/Testing/DataContainerTest.py  |  50 +-
 .../Testing/Export_Triangle_Geometry.py       | 145 ++--
 Wrapping/Python/Testing/GeometryTest.py       |  48 +-
 Wrapping/Python/Testing/ImageReadTest.py      |  55 +-
 .../Python/Testing/Import_Ascii_Data_Array.py |  41 +-
 .../Python/Testing/Import_Hdf5_Dataset.py     |  51 +-
 Wrapping/Python/Testing/NumPy_Round_Trip.py   |  93 ++-
 .../Testing/Remove_Component_From_Array.py    | 235 ++++---
 .../Python/Testing/Rename_Attribute_Array.py  | 231 +++----
 .../Python/Testing/Split_Attribute_Array.py   | 231 +++----
 Wrapping/Python/Testing/TestBindings.py       |  65 +-
 115 files changed, 3408 insertions(+), 2028 deletions(-)
 create mode 100644 Wrapping/Python/Binding/CreatePybind11Module.cmake
 create mode 100644 Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
 create mode 100644 Wrapping/Python/Binding/generate_python_bindings.py
 create mode 100644 Wrapping/Python/Binding/pySIMPLBody.cpp
 create mode 100644 Wrapping/Python/Binding/pySIMPLHeader.cpp
 create mode 100644 Wrapping/Python/Binding/pySupport.h

diff --git a/.gitignore b/.gitignore
index 65f085a816..de4437846f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ Support/Scripts/GMT/gmt.history
 .vscode
 /ExternalProjects
 .DS_Store
+**/.mypy_cache/**
+**/__pycache__/**
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cf8705557..a2200f6622 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,13 +464,84 @@ include(${PROJECT_RESOURCES_DIR}/CPack/PackageProject.cmake)
 # Include any Support related CMake codes
 include(${SIMPLProj_SOURCE_DIR}/Support/Support.cmake)
 
+option(SIMPL_BYTE_SWAP_NO_INTRINSICS "Disable use of compiler intrinsics for byte swapping" OFF)
+
+if(SIMPL_BYTE_SWAP_NO_INTRINSICS)
+  target_compile_definitions(SIMPLib
+    PRIVATE
+      SIMPL_BYTE_SWAP_NO_INTRINSICS
+  )
+endif()
+
 # --------------------------------------------------------------------------
 # Find the Pybind11 installation
 option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
 if(SIMPL_ENABLE_PYTHON)
+  include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/CreatePybind11Module.cmake)
 
-  # --------------------------------------------------------------------
-  # add the Pybind11 Python Wrapping
-  add_subdirectory(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11 ${PROJECT_BINARY_DIR}/Pybind11)
- # include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing/SourceList.cmake)
+  get_target_property(SIMPL_PY_SOURCES SIMPLib SOURCES)
+
+  set(SIMPL_PY_SOURCES_FILE ${SIMPLProj_BINARY_DIR}/SIMPL_py_sources.txt)
+
+  file(WRITE ${SIMPL_PY_SOURCES_FILE} "${SIMPL_PY_SOURCES}")
+
+  CreatePybind11Module(MODULE_NAME "simpl"
+    OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
+    FILE_LIST_PATH ${SIMPL_PY_SOURCES_FILE}
+    SOURCE_DIR "${SIMPLProj_SOURCE_DIR}/Source"
+    HEADER_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLHeader.cpp"
+    BODY_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBody.cpp"
+    PYTHON_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
+    LINK_LIBRARIES SIMPLib
+    INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
+  )
+
+  if(SIMPL_BUILD_TESTING)
+    file(READ ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_test_dirs.in.py SIMPL_TEST_DIRS_FILE)
+
+    string(REPLACE "\${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $<TARGET_FILE_DIR:simpl> SIMPL_TEST_DIRS_FILE ${SIMPL_TEST_DIRS_FILE})
+    string(REPLACE "\${SIMPLProj_BINARY_DIR}" ${SIMPLProj_BINARY_DIR} SIMPL_TEST_DIRS_FILE ${SIMPL_TEST_DIRS_FILE})
+    string(REPLACE "\${DREAM3D_DATA_DIR}" ${DREAM3D_DATA_DIR} SIMPL_TEST_DIRS_FILE ${SIMPL_TEST_DIRS_FILE})
+
+    file(GENERATE
+      OUTPUT ${SIMPLProj_BINARY_DIR}/Wrapping/dream3d/$<CONFIG>/simpl_test_dirs.py
+      CONTENT ${SIMPL_TEST_DIRS_FILE}
+    )
+
+    set(PYTHON_TEST_INPUT_DIR "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing")
+
+    set(SIMPL_PYTHON_TESTS
+      "AbstractFilterTest"
+      "AttributeMatrixTest"
+      "DataArrayTest"
+      "DataContainerArrayTest"
+      "DataContainerTest"
+      "GeometryTest"
+      "ImageReadTest"
+      "TestBindings"
+
+      "Create_Edge_Geometry"
+      "Create_Quad_Geometry"
+      "Create_RectilinearGrid"
+      "Create_Triangle_Geometry"
+      "Create_Vertex_Geometry"
+      
+      "Array_Calculator_Test"
+      "Convert_Attribute_Array_Data_Type"
+      "Copy_Object_Test"
+      "Crop_Vertex_Geometry"
+      "Export_Triangle_Geometry"
+      "Import_Ascii_Data_Array"
+      "Import_Hdf5_Dataset"
+      "Remove_Component_From_Array"
+      "Rename_Attribute_Array"
+      "Split_Attribute_Array"
+      "NumPy_Round_Trip"
+    )
+
+    CreatePythonTests(PREFIX "PY_SIMPL"
+      INPUT_DIR ${PYTHON_TEST_INPUT_DIR}
+      TEST_NAMES ${SIMPL_PYTHON_TESTS}
+    )
+  endif()
 endif()
diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
index 6018d60698..eaa848d7e4 100644
--- a/Source/SIMPLib/Common/SIMPLPythonMacros.h
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -193,6 +193,12 @@
  */
 #define PYB11_METHOD(...)
 
+/**
+* @brief PYB11_FILTER This macro is used to flag the class as being a filter class.
+* This will make the generator create a Pythonic interface for this filter.
+*/
+#define PYB11_FILTER(...)
+
 // End of PYBIND11 Macro Definitions
 /* *****************************************************************************
  * *****************************************************************************
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 23207ce62f..5188d70e2e 100755
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -333,150 +333,6 @@ private:
 public:                                                                                                                                                                                                \
   SIMPL_GET_PROPERTY(type, prpty)
 
-/* *****************************************************************************
- * *****************************************************************************
- * *****************************************************************************
- *
- * PyBind11 Macros that we can use to explicitly define which setters & getters
- * will be exposed to the Python library
- */
-
-/**
- * @brief PYB11_BEGIN_BINDINGS This macro lets the wrapper know that we want to
- * wrap this class with Python bindings. It should only take a single argument
- * which is the name of the class. If this line is commented out using the standard
- * C++ style of single line comment then <b>NO WRAPPING</b> will be performed
- * on the class.
- * @code
- * PYB11_BEGIN_BINDINGS(AbstractFilter)
- * @endcode
- */
-#define PYB11_BEGIN_BINDINGS(...)
-
-/**
-* @brief PYB11_NO_BINDINGS This macro will ensure that the class is NOT wrapped
-* with python bindings. Only a single argument which is the name of the class
-* should be used.
-* @code
-* PYB11_NO_BINDINGS(AbstractFilter)
-* @endcode
-*/
-#define PYB11_NO_BINDINGS(...)
-
-/**
- * @brief PYB11_STATIC_CREATION This macro will wrap the "static New()" function
- * that most of the SIMPL classes implement as a way to instantiate the class in
- * addition to other static methods that are used for a class. The argument types
- * to the static method should be listed <b>WITHOUT</b> any spaces for each argument.
- *
- * @code
- * PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
- * @endcode
- *
- * If there are several static creation methods that overload each other then the following form can be used:
- *
- * @code
- * PYB11_STATIC_CREATION(New OVERLOAD QString)
- * PYB11_STATIC_CREATION(New OVERLOAD DataArrayPath)
- * @endcode
- */
-#define PYB11_STATIC_CREATION(...)
-
-/**
- * @brief PYB11_CREATION This macro is used for non-static constructors that need
- * to be wrapped. The argument types need to be lists where each argument cannot
- * containe spaces. Use a typedef if needed, but using a typedef also has its
- * own issues. @see DataArrayPath for an example.
- *
- * @code
- * PYB11_CREATION(ARGS QString QString QString)
- * @endcode
- */
-#define PYB11_CREATION(...)
-
-/**
-* @brief PYB11_ENUMERATION This macro will allow a class enumeration to be wrapped
-* in Python an available to the Python side. @see IGeoemtry for an example. The
-* macro should only take a single argument.
-* @code
-* PYB11_ENUMERATION(Type)
-* PYB11_ENUMERATION(VtkCellType)
-* @endcode
-*/
-#define PYB11_ENUMERATION(...)
-
-/**
-* @brief PYB11_PROPERTY This macro is used to wrap a single class instance property
-* that is typically used as an input parameter for a filter. This macro should
-* <b>NOT</b> be used for just wrapping instance methods. Use the PYB11_METHOD for
-* that. @see AbstractFilter. There are number of arguments depending on if the
-* property is a read-only or read-write variable. At least 4 arguments to the
-* macro are required when the property is read only.
-* @code
-  PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)
-* @endcode
-* and 6 arguments when the property is read-write.
-* @code
-* PYB11_PROPERTY(bool Cancel READ getCancel WRITE setCancel)
-* @endcode
-*
-* and if there are additional overloads of the Getter that returns a const reference such as
-* @code
-* const QString& getFoo() const;
-* @endcode
-*
-* then you would add on the CONST_GET_OVERLOAD as the last argument to the macro.
-*/
-#define PYB11_PROPERTY(...)
-
-/**
- * @brief This macro is used to expose a method to the Python bindings. The signature
- * of the macro should be the following:
- * PYB11_METHOD( _return_type_ _name_of_method_ [ARGS|OVERLOAD] ....)
- * If the ARGS command is used then simply list the variable names for each argument.
- * For example if you have a method "void getFoo(const QString &foo)" that you want
- * to expose:
- * @code
- * PYB11_METHOD(void getFoo ARGS Foo)
- * @endcode
- *
- * If your method does not take any arguments then leave out the ARGS keyword.
- *
- * If you are have overloads of the method that you want to expose to Python then
- * the "OVERLOAD" version of the method should be used. Again, say we have two
- * methods that we want to expose.
- * @code
- * void setPath(const QString &name)
- * void setPath(const DataArrayPath &path)
- * @endcode
- *
- * then we would use the following set of invocations:
- * @code
- * PYB11_METHOD(void setPath OVERLOAD const.QString.&,Name)
- * PYB11_METHOD(void setPath OVERLOAD const.DataArrayPath.&,Path)
- * @endcode
- * Note that in order to get the (const QString &) correct we used the '.' charater
- * to declare the type. This is required as the macro is split using spaces. When
- * then end code is generated the '.' characters will be replaced with spaces.
- *
- * If the method that is being wrapped in python is a 'const' method then the last argument should be CONST_METHOD. In
- * the example below there is a pair of overloaded methods that are both 'const'.
- *
- * @code
- * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.QString.&,Name CONST_METHOD)
- * PYB11_METHOD(bool doesDataContainerExist OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
- * @endcode
- */
-#define PYB11_METHOD(...)
-
-// End of PYBIND11 Macro Definitions
-/* *****************************************************************************
- * *****************************************************************************
- * *****************************************************************************
- */
-
-
-
 #define SIMPL_SET_PROPERTY_DECL(type, prpty)\
   void set##prpty(type value);
 
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 5e25620331..f8a1e239a5 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -62,6 +62,7 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ArrayCalculator)
     PYB11_FILTER_NEW_MACRO(ArrayCalculator)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index aec1bc5b43..0796c5babc 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(Breakpoint SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(Breakpoint)
   PYB11_FILTER_NEW_MACRO(Breakpoint)
   PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index aaf454c68e..febd7f6613 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(CombineAttributeArrays SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(CombineAttributeArrays)
   PYB11_FILTER_NEW_MACRO(CombineAttributeArrays)
   PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 5d82ede71d..dc015b90b3 100755
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CombineAttributeMatrices)
     PYB11_FILTER_NEW_MACRO(CombineAttributeMatrices)
     PYB11_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index cdd7b464c0..6fc4a29080 100755
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ConditionalSetValue)
     PYB11_FILTER_NEW_MACRO(ConditionalSetValue)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index e99cc546c2..77fe4fbdda 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -49,6 +49,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ConvertColorToGrayScale SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ConvertColorToGrayScale)
   PYB11_FILTER_NEW_MACRO(ConvertColorToGrayScale)
   PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 164033ed83..964b11980b 100755
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ConvertData)
     PYB11_FILTER_NEW_MACRO(ConvertData)
     PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 6277787d26..f0d6dda540 100755
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -54,6 +54,7 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CopyFeatureArrayToElementArray)
     PYB11_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
     PYB11_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 74facf9878..8e6cf97d8d 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -49,6 +49,7 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(CopyObject SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(CopyObject)
   PYB11_FILTER_NEW_MACRO(CopyObject)
   PYB11_PROPERTY(int ObjectToCopy READ getObjectToCopy WRITE setObjectToCopy)
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index 8983cca7e4..d6896b3198 100755
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateAttributeMatrix)
     PYB11_FILTER_NEW_MACRO(CreateAttributeMatrix)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index 0c47d2b820..a79e0e94ce 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateDataArray)
     PYB11_FILTER_NEW_MACRO(CreateDataArray)
     PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index d57f384fd5..055631da9b 100755
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateDataContainer)
     PYB11_FILTER_NEW_MACRO(CreateDataContainer)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 35b20d8352..1755976206 100755
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -54,6 +54,7 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
     PYB11_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 540d995c6d..1701b203bd 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(CreateGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(CreateGeometry)
   PYB11_FILTER_NEW_MACRO(CreateGeometry)
   PYB11_PROPERTY(int GeometryType READ getGeometryType WRITE setGeometryType)
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
index 179befa70e..10114ca5f6 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.h
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -46,15 +46,17 @@ class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
 {
   Q_OBJECT
 
-#ifdef SIMPL_ENABLE_PYTHON
-  PYB11_CREATE_BINDINGS(CreateGridMontage SUPERCLASS AbstractFilter)
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(CreateGridMontage SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(CreateGridMontage)
   PYB11_FILTER_NEW_MACRO(CreateGridMontage)
 
   PYB11_PROPERTY(QString MontageName READ getMontageName WRITE setMontageName)
   PYB11_PROPERTY(DataContainerGrid GridSelection READ getGridSelection WRITE setGridSelection)
   PYB11_PROPERTY(QStringList DataContainerNameList READ getDataContainerNameList WRITE setDataContainerNameList)
-#endif
+  PYB11_END_BINDINGS()
+  // clang-format on
 
 public:
   using Self = CreateGridMontage;
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index 86e95ceb62..40dae91adf 100755
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateImageGeometry)
     PYB11_FILTER_NEW_MACRO(CreateImageGeometry)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index b11bbf4a34..6ad35e520c 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(CreateStringArray)
     PYB11_FILTER_NEW_MACRO(CreateStringArray)
     PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index ea93504aaa..c5fd515dce 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -49,6 +49,7 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(CropVertexGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(CropVertexGeometry)
   PYB11_FILTER_NEW_MACRO(CropVertexGeometry)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 32ca697e8b..0223c0a172 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -62,6 +62,7 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(DataContainerReader)
     PYB11_FILTER_NEW_MACRO(DataContainerReader)
     PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 1bce2ea7c8..5c7ba12c4f 100755
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -56,6 +56,7 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(DataContainerWriter)
     PYB11_FILTER_NEW_MACRO(DataContainerWriter)
     PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index a65770595c..7dc108bdb2 100755
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(EmptyFilter)
     PYB11_FILTER_NEW_MACRO(EmptyFilter)
     PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 833fa8e288..cb159d678a 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -56,6 +56,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ExecuteProcess SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ExecuteProcess)
   PYB11_FILTER_NEW_MACRO(ExecuteProcess)
   PYB11_PROPERTY(QString Arguments READ getArguments WRITE setArguments)
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 74ab153b1a..9a43eb2c83 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -53,6 +53,7 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ExtractAttributeArraysFromGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ExtractAttributeArraysFromGeometry)
   PYB11_FILTER_NEW_MACRO(ExtractAttributeArraysFromGeometry)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index fd32477efc..59bed2fa3b 100755
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ExtractComponentAsArray)
     PYB11_FILTER_NEW_MACRO(ExtractComponentAsArray)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 71818d3014..f9ae6a72e5 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ExtractVertexGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ExtractVertexGeometry)
   PYB11_FILTER_NEW_MACRO(ExtractVertexGeometry)
   PYB11_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 6123168119..aef6fd321d 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -53,6 +53,7 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(FeatureCountDecision)
     PYB11_STATIC_NEW_MACRO(FeatureCountDecision)
     PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 2bf0017d18..55bdcf9f64 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -52,6 +52,7 @@ class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(FeatureDataCSVWriter)
     PYB11_FILTER_NEW_MACRO(FeatureDataCSVWriter)
     PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index d6c030a88f..f27a555744 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(FindDerivatives SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(FindDerivatives)
   PYB11_FILTER_NEW_MACRO(FindDerivatives)
   PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 5e9f989928..30f5dda3f4 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -20,6 +20,7 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(GenerateColorTable SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(GenerateColorTable)
   PYB11_FILTER_NEW_MACRO(GenerateColorTable)
   PYB11_PROPERTY(QString SelectedPresetName READ getSelectedPresetName WRITE setSelectedPresetName)
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 56e23ef992..621256050b 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
   // Start Python bindings declarations
   // clang-format off
   PYB11_BEGIN_BINDINGS(GenerateTiltSeries SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(GenerateTiltSeries)
   PYB11_STATIC_NEW_MACRO(GenerateTiltSeries)
   PYB11_PROPERTY(int RotationAxis READ getRotationAxis WRITE setRotationAxis)
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index ef0143e5bb..c92f8d2098 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -59,6 +59,7 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ImportAsciDataArray)
     PYB11_FILTER_NEW_MACRO(ImportAsciDataArray)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 25cc90a45a..59f8e6846a 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -560,14 +560,6 @@ IDataArrayShPtrType ImportHDF5Dataset::readIDataArray(hid_t gid, const QString&
   return ptr;
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString ImportHDF5Dataset::getHDF5Dimensions()
-{
-  return m_HDF5Dimensions;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index 5768162fcb..dc6308c28e 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -53,10 +53,10 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ImportHDF5Dataset SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ImportHDF5Dataset)
   PYB11_FILTER_NEW_MACRO(ImportHDF5Dataset)
   PYB11_PROPERTY(QString HDF5FilePath READ getHDF5FilePath WRITE setHDF5FilePath)
-  PYB11_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
   PYB11_PROPERTY(QList<ImportHDF5Dataset::DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
   PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
   PYB11_END_BINDINGS()
@@ -134,9 +134,6 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
 
   Q_PROPERTY(QList<DatasetImportInfo> DatasetImportInfoList READ getDatasetImportInfoList WRITE setDatasetImportInfoList)
 
-  QString getHDF5Dimensions();
-  Q_PROPERTY(QString HDF5Dimensions READ getHDF5Dimensions)
-
   /**
    * @brief Setter property for SelectedAttributeMatrix
    */
@@ -234,8 +231,6 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   DataArrayPath m_SelectedAttributeMatrix = {};
   QStringList m_DatasetPathsWithErrors = {};
 
-  QString m_HDF5Dimensions = "";
-
   IDataArrayShPtrType readIDataArray(hid_t gid, const QString& name, size_t numOfTuples, const std::vector<size_t>& cDims, bool metaDataOnly);
 
   /**
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 5e0e89f0ac..87f97f06f0 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(InitializeData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(InitializeData)
   PYB11_FILTER_NEW_MACRO(InitializeData)
   PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index 6a56571b84..3c47024d42 100755
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(LinkFeatureMapToElementArray)
     PYB11_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
     PYB11_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 3b417e228c..87833686fe 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -53,6 +53,7 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(MaskCountDecision)
     PYB11_STATIC_NEW_MACRO(MaskCountDecision)
     PYB11_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index e8c77f40e0..9dd1624d62 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(MassCreateData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(MassCreateData)
   PYB11_FILTER_NEW_MACRO(MassCreateData)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index 47f451e8bb..8a31059dfa 100755
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT MoveData : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(MoveData SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(MoveData)
     PYB11_FILTER_NEW_MACRO(MoveData)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 0e609c0b19..edd23f9de9 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(MoveMultiData)
     PYB11_FILTER_NEW_MACRO(MoveMultiData)
     PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index bef9b525b3..64a5b22022 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(MultiThresholdObjects)
     PYB11_FILTER_NEW_MACRO(MultiThresholdObjects)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 8c7581a416..6f0d749749 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -54,6 +54,7 @@ class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(MultiThresholdObjects2)
     PYB11_FILTER_NEW_MACRO(MultiThresholdObjects2)
     PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index 58cb61f45d..ff52ee2a0c 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -47,6 +47,7 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(PipelineAnnotation SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(PipelineAnnotation)
   PYB11_FILTER_NEW_MACRO(PipelineAnnotation)
   PYB11_PROPERTY(QString Summary READ getSummary WRITE setSummary)
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index e8a9f47e5b..4269c6bd7a 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(PostSlackMessage SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(PostSlackMessage)
   PYB11_FILTER_NEW_MACRO(PostSlackMessage)
   PYB11_PROPERTY(QString SlackUser READ getSlackUser WRITE setSlackUser)
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index 9e7e39fac8..0db86dd788 100755
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -54,6 +54,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RawBinaryReader)
     PYB11_FILTER_NEW_MACRO(RawBinaryReader)
     PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index c1fc128be4..c652d0c2af 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ReadASCIIData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(ReadASCIIData)
   PYB11_FILTER_NEW_MACRO(ReadASCIIData)
   PYB11_PROPERTY(ASCIIWizardData WizardData READ getWizardData WRITE setWizardData)
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index e94910dd39..edae794040 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RemoveArrays)
     PYB11_FILTER_NEW_MACRO(RemoveArrays)
     PYB11_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index cc2c144a2d..80fd04d322 100755
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -53,6 +53,7 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RemoveComponentFromArray)
     PYB11_FILTER_NEW_MACRO(RemoveComponentFromArray)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index e5b69aee6e..0ab2990490 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RenameAttributeArray)
     PYB11_FILTER_NEW_MACRO(RenameAttributeArray)
     PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index f1480716df..e7e1f7e5e2 100755
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RenameAttributeMatrix)
     PYB11_FILTER_NEW_MACRO(RenameAttributeMatrix)
     PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 699261fab4..0e60942b11 100755
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -50,6 +50,7 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RenameDataContainer)
     PYB11_FILTER_NEW_MACRO(RenameDataContainer)
     PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index 2f9de7d942..6b66026e96 100755
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ReplaceValueInArray)
     PYB11_FILTER_NEW_MACRO(ReplaceValueInArray)
     PYB11_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index bb58886b03..7da1c76e2b 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -53,6 +53,7 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(RequiredZThickness)
     PYB11_STATIC_NEW_MACRO(RequiredZThickness)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index 1e12def1e5..c22307267f 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -52,6 +52,7 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(RotateSampleRefFrame SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(RotateSampleRefFrame)
   PYB11_FILTER_NEW_MACRO(RotateSampleRefFrame)
   PYB11_ENUMERATION(RotationRepresentation)
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 973806c985..ed7bd7c189 100755
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(ScaleVolume)
     PYB11_FILTER_NEW_MACRO(ScaleVolume)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index 49645d9bea..9ebe5a8484 100755
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -51,6 +51,7 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(SetOriginResolutionImageGeom)
     PYB11_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
     PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 93d2a69110..7a9bfe5ae4 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -55,6 +55,7 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(SplitAttributeArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
   PYB11_SHARED_POINTERS(SplitAttributeArray)
   PYB11_FILTER_NEW_MACRO(SplitAttributeArray)
   PYB11_PROPERTY(DataArrayPath InputArrayPath READ getInputArrayPath WRITE setInputArrayPath)
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index 100b6cbabd..c8aff9537e 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -54,6 +54,7 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(WriteASCIIData)
     PYB11_FILTER_NEW_MACRO(WriteASCIIData)
     PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index 74045daf23..53cb037809 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -59,6 +59,7 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 
     // Start Python bindings declarations
     PYB11_BEGIN_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
+    PYB11_FILTER()
     PYB11_SHARED_POINTERS(WriteTriangleGeometry)
     PYB11_FILTER_NEW_MACRO(WriteTriangleGeometry)
     PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 071ef2c8a1..629d9580a8 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -47,14 +47,14 @@
 
 class ASCIIWizardData
 {
-#ifdef SIMPL_ENABLE_PYTHON
   // clang-format off
   PYB11_BEGIN_BINDINGS(ASCIIWizardData) 
-  PYB11_CREATION(ASCIIWizardData ARGS QString int int)
+  PYB11_CREATION()
   PYB11_METHOD(void updateDataArrayPath ARGS DataArrayPath::RenameType,renamePath)
   PYB11_METHOD(bool isEmpty)
+  PYB11_END_BINDINGS()
   // clang-format on
-#endif
+
 public:
   ASCIIWizardData() = default;
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index fd2777e91e..b608d5a6dc 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -35,57 +35,62 @@
 
 #include "DataArray.hpp"
 
-//  Allow user to force SIMPL_ENDIAN_NO_INTRINSICS in case they aren't available for a
-//  particular platform/compiler combination.
-#ifndef SIMPL_ENDIAN_NO_INTRINSICS
+namespace
+{
+uint16_t byteSwap16(uint16_t value)
+{
+  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);
+}
+
+uint32_t byteSwap32(uint32_t value)
+{
+  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);
+}
+
+uint64_t byteSwap64(uint64_t value)
+{
+  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |
+         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);
+}
+
+}
 
-#ifndef __has_builtin      // Optional of course
-#define __has_builtin(x) 0 // Compatibility with non-clang compilers
+#ifndef SIMPL_BYTE_SWAP_NO_INTRINSICS
+
+#ifndef __has_builtin
+#define __has_builtin(x) 0
 #endif
 
 #if defined(_MSC_VER)
-//  Microsoft documents these as being compatible since Windows 95 and specifically
-//  lists runtime library support since Visual Studio 2003 (aka 7.1).
-//  Clang/c2 uses the Microsoft rather than GCC intrinsics, so we check for
-//  defined(_MSC_VER) before defined(__clang__)
-#define SIMPL_ENDIAN_INTRINSIC_MSG "cstdlib _byteswap_ushort, etc."
 #include <cstdlib>
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) _byteswap_ushort(x)
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) _byteswap_ulong(x)
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) _byteswap_uint64(x)
+#define SIMPL_BYTE_SWAP_16(x) _byteswap_ushort(x)
+#define SIMPL_BYTE_SWAP_32(x) _byteswap_ulong(x)
+#define SIMPL_BYTE_SWAP_64(x) _byteswap_uint64(x)
 
-//  GCC and Clang recent versions provide intrinsic byte swaps via builtins
 #elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
-#define SIMPL_ENDIAN_INTRINSIC_MSG "__builtin_bswap16, etc."
-// prior to 4.8, gcc did not provide __builtin_bswap16 on some platforms so we emulate it
-// see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
-// Clang has a similar problem, but their feature test macros make it easier to detect
 #if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap16(x)
+#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap16(x)
 #else
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap32((x) << 16)
+#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap32((x) << 16)
 #endif
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) __builtin_bswap32(x)
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) __builtin_bswap64(x)
-
-//  Linux systems provide the byteswap.h header, with
+#define SIMPL_BYTE_SWAP_32(x) __builtin_bswap32(x)
+#define SIMPL_BYTE_SWAP_64(x) __builtin_bswap64(x)
 #elif defined(__linux__)
-//  don't check for obsolete forms defined(linux) and defined(__linux) on the theory that
-//  compilers that predefine only these are so old that byteswap.h probably isn't present.
-#define SIMPL_ENDIAN_INTRINSIC_MSG "byteswap.h bswap_16, etc."
 #include <byteswap.h>
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) bswap_16(x)
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) bswap_32(x)
-#define SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) bswap_64(x)
-
+#define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
+#define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
+#define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
 #else
-#define SIMPL_ENDIAN_NO_INTRINSICS
-#define SIMPL_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
+#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
 #endif
 
-#elif !defined(SIMPL_ENDIAN_INTRINSIC_MSG)
-#define SIMPL_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
-#endif // SIMPL_ENDIAN_NO_INTRINSICS
+#else
+#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
+#endif // SIMPL_BYTE_SWAP_NO_INTRINSICS
 
 #include <string>
 #include <cstring>
@@ -96,27 +101,51 @@
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
-#define DA_BYTE_SWAP(s, d, t)                                                                                                                                                                          \
-  t[0] = ptr[s];                                                                                                                                                                                       \
-  ptr[s] = ptr[d];                                                                                                                                                                                     \
-  ptr[d] = t[0];
+namespace
+{
+template <class T>
+T byteSwap(T value)
+{
+  static_assert(std::is_arithmetic<T>::value, "T must be an arithmetic type");
+  static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8, "sizeof(T) must be 1, 2, 4, or 8");
+
+  if(sizeof(T) == 2)
+  {
+    return SIMPL_BYTE_SWAP_16(value);
+  }
+  else if(sizeof(T) == 4)
+  {
+    uint32_t* ptr = reinterpret_cast<uint32_t*>(&value);
+    uint32_t result = SIMPL_BYTE_SWAP_32(*ptr);
+    return *reinterpret_cast<T*>(&result);
+  }
+  else if(sizeof(T) == 8)
+  {
+    uint64_t* ptr = reinterpret_cast<uint64_t*>(&value);
+    uint64_t result = SIMPL_BYTE_SWAP_64(*ptr);
+    return *reinterpret_cast<T*>(&result);
+  }
+
+  return value;
+}
+} // namespace
 
 template <typename T>
 typename DataArray<T>::Pointer DataArray<T>::NullPointer()
 {
-  return Pointer(static_cast<Self*>(nullptr));
+  return nullptr;
 }
 
 template <typename T>
 QString DataArray<T>::getNameOfClass() const
 {
-  return QString("DataArray<T>");
+  return ClassName();
 }
 
 template <typename T>
 QString DataArray<T>::ClassName()
 {
-  return QString("DataArray<T>");
+  return "DataArray<T>";
 }
 
 template <typename T>
@@ -153,13 +182,13 @@ DataArray<T>::DataArray(size_t numTuples, const QString& name, T initValue)
  * For example if you have a 2D image dimensions of 80(w) x 60(h) then the "cdims" would be [80][60]
  */
 template <typename T>
-DataArray<T>::DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue)
+DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(std::move(compDims))
+, m_CompDims(compDims)
+, m_InitValue(initValue)
 {
-  m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
-  m_InitValue = initValue;
+  m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
 }
 
@@ -172,13 +201,13 @@ DataArray<T>::DataArray(size_t numTuples, const QString& name, comp_dims_type co
  * @param allocate Will all the memory be allocated at time of construction
  */
 template <typename T>
-DataArray<T>::DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate)
+DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue, bool allocate)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(std::move(compDims))
+, m_CompDims(compDims)
+, m_InitValue(initValue)
 {
-  m_NumComponents = std::accumulate(m_CompDims.begin(), m_CompDims.end(), static_cast<size_t>(1), std::multiplies<>());
-  m_InitValue = initValue;
+  m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   if(allocate)
   {
     resizeTuples(numTuples);
@@ -204,48 +233,44 @@ typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const
 {
   if(name.isEmpty())
   {
-    return NullPointer();
+    return nullptr;
   }
   comp_dims_type cDims = {1};
-  auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
+  auto d = std::make_shared<DataArray<T>>(numTuples, name, cDims, static_cast<T>(0), allocate);
   if(allocate)
   {
     if(d->allocate() < 0)
     {
       // Could not allocate enough memory, reset the pointer to null and return
-      delete d;
-      return DataArray<T>::NullPointer();
+      return nullptr;
     }
   }
-  Pointer ptr(d);
-  return ptr;
+  return d;
 }
 
 // -----------------------------------------------------------------------------
 template <typename T>
-typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, int32_t rank, const size_t* dims, const QString& name, bool allocate)
 {
   if(name.isEmpty())
   {
-    return NullPointer();
+    return nullptr;
   }
   comp_dims_type cDims(static_cast<size_t>(rank));
   for(size_t i = 0; i < static_cast<size_t>(rank); i++)
   {
     cDims[i] = dims[i];
   }
-  auto d = new DataArray<T>(numTuples, name, cDims, static_cast<T>(0), allocate);
+  auto d = std::make_shared<DataArray<T>>(numTuples, name, cDims, static_cast<T>(0), allocate);
   if(allocate)
   {
     if(d->allocate() < 0)
     {
       // Could not allocate enough memory, reset the pointer to null and return
-      delete d;
-      return DataArray<T>::NullPointer();
+      return nullptr;
     }
   }
-  Pointer ptr(d);
-  return ptr;
+  return d;
 }
 
 // -----------------------------------------------------------------------------
@@ -254,20 +279,18 @@ typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const
 {
   if(name.isEmpty())
   {
-    return NullPointer();
+    return nullptr;
   }
-  DataArray<T>* d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
+  auto d = std::make_shared<DataArray<T>>(numTuples, name, compDims, static_cast<T>(0), allocate);
   if(allocate)
   {
     if(d->allocate() < 0)
     {
       // Could not allocate enough memory, reset the pointer to null and return
-      delete d;
-      return DataArray<T>::NullPointer();
+      return nullptr;
     }
   }
-  Pointer ptr(d);
-  return ptr;
+  return d;
 }
 
 // -----------------------------------------------------------------------------
@@ -276,46 +299,42 @@ typename DataArray<T>::Pointer DataArray<T>::CreateArray(const comp_dims_type& t
 {
   if(name.isEmpty())
   {
-    return NullPointer();
+    return nullptr;
   }
 
-  size_t numTuples = std::accumulate(tupleDims.begin(), tupleDims.end(), static_cast<size_t>(1), std::multiplies<>());
+  size_t numTuples = std::accumulate(tupleDims.cbegin(), tupleDims.cend(), static_cast<size_t>(1), std::multiplies<>());
 
-  auto d = new DataArray<T>(numTuples, name, compDims, static_cast<T>(0), allocate);
+  auto d = std::make_shared<DataArray<T>>(numTuples, name, compDims, static_cast<T>(0), allocate);
   if(allocate)
   {
     if(d->allocate() < 0)
     {
       // Could not allocate enough memory, reset the pointer to null and return
-      delete d;
-      return DataArray<T>::NullPointer();
+      return nullptr;
     }
   }
-  Pointer ptr(d);
-  return ptr;
+  return d;
 }
 
 template <typename T>
-IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const
+IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, int32_t rank, const size_t* compDims, const QString& name, bool allocate) const
 {
-  IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
-  return p;
+  return DataArray<T>::CreateArray(numTuples, rank, compDims, name, allocate);
 }
 
 template <typename T>
 IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, const comp_dims_type& compDims, const QString& name, bool allocate) const
 {
-  IDataArray::Pointer p = DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
-  return p;
+  return DataArray<T>::CreateArray(numTuples, compDims, name, allocate);
 }
 
 // -----------------------------------------------------------------------------
 template <typename T>
-typename DataArray<T>::Pointer DataArray<T>::FromQVector(QVector<T>& vec, const QString& name)
+typename DataArray<T>::Pointer DataArray<T>::FromQVector(const QVector<T>& vec, const QString& name)
 {
 
   Pointer p = CreateArray(static_cast<size_t>(vec.size()), name, true);
-  if(nullptr != p.get())
+  if(nullptr != p)
   {
     std::memcpy(p->getPointer(0), vec.data(), static_cast<size_t>(vec.size()) * sizeof(T));
   }
@@ -324,11 +343,11 @@ typename DataArray<T>::Pointer DataArray<T>::FromQVector(QVector<T>& vec, const
 
 // -----------------------------------------------------------------------------
 template <>
-typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(std::vector<bool>& vec, const QString& name)
+typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(const std::vector<bool>& vec, const QString& name)
 {
   comp_dims_type cDims = {1};
   Pointer p = CreateArray(vec.size(), cDims, name, true);
-  if(nullptr != p.get())
+  if(nullptr != p)
   {
     size_t i = 0;
     for(const auto value : vec)
@@ -342,11 +361,11 @@ typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(std::vector<boo
 
 // -----------------------------------------------------------------------------
 template <typename T>
-typename DataArray<T>::Pointer DataArray<T>::FromStdVector(std::vector<T>& vec, const QString& name)
+typename DataArray<T>::Pointer DataArray<T>::FromStdVector(const std::vector<T>& vec, const QString& name)
 {
   comp_dims_type cDims = {1};
   Pointer p = CreateArray(vec.size(), cDims, name, true);
-  if(nullptr != p.get())
+  if(nullptr != p)
   {
     std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
   }
@@ -355,10 +374,10 @@ typename DataArray<T>::Pointer DataArray<T>::FromStdVector(std::vector<T>& vec,
 
 // -----------------------------------------------------------------------------
 template <typename T>
-typename DataArray<T>::Pointer DataArray<T>::CopyFromPointer(T* data, size_t size, const QString& name)
+typename DataArray<T>::Pointer DataArray<T>::CopyFromPointer(const T* data, size_t size, const QString& name)
 {
   Pointer p = CreateArray(size, name, true);
-  if(nullptr != p.get())
+  if(nullptr != p)
   {
     std::memcpy(p->getPointer(0), data, size * sizeof(T));
   }
@@ -380,18 +399,16 @@ template <typename T>
 typename DataArray<T>::Pointer DataArray<T>::WrapPointer(T* data, size_t numTuples, const comp_dims_type& compDims, const QString& name, bool ownsData)
 {
   // Allocate on the heap
-  auto d = new DataArray(numTuples, name, compDims, static_cast<T>(0), false);
-  // Wrap that heap pointer with a shared_pointer to make it reference counted
-  Pointer p(d);
+  auto d = std::make_shared<DataArray<T>>(numTuples, name, compDims, static_cast<T>(0), false);
 
-  p->m_Array = data;        // Now set the internal array to the raw pointer
-  p->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
+  d->m_Array = data;        // Now set the internal array to the raw pointer
+  d->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
   if(nullptr != data)
   {
-    p->m_IsAllocated = true;
+    d->m_IsAllocated = true;
   }
 
-  return p;
+  return d;
 }
 
 //========================================= Begin API =================================
@@ -422,53 +439,47 @@ IDataArray::Pointer DataArray<T>::deepCopy(bool forceNoAllocate) const
 template <typename T>
 SIMPL::NumericTypes::Type DataArray<T>::getType() const
 {
-  T value = static_cast<T>(0x00);
-  if(typeid(value) == typeid(int8_t))
+  if(std::is_same<T, int8_t>::value)
   {
     return SIMPL::NumericTypes::Type::Int8;
   }
-  if(typeid(value) == typeid(uint8_t))
+  else if(std::is_same<T, uint8_t>::value)
   {
     return SIMPL::NumericTypes::Type::UInt8;
   }
-
-  if(typeid(value) == typeid(int16_t))
+  else if(std::is_same<T, int16_t>::value)
   {
     return SIMPL::NumericTypes::Type::Int16;
   }
-  if(typeid(value) == typeid(uint16_t))
+  else if(std::is_same<T, uint16_t>::value)
   {
     return SIMPL::NumericTypes::Type::UInt16;
   }
-
-  if(typeid(value) == typeid(int32_t))
+  else if(std::is_same<T, int32_t>::value)
   {
     return SIMPL::NumericTypes::Type::Int32;
   }
-  if(typeid(value) == typeid(uint32_t))
+  else if(std::is_same<T, uint32_t>::value)
   {
     return SIMPL::NumericTypes::Type::UInt32;
   }
-
-  if(typeid(value) == typeid(int64_t))
+  else if(std::is_same<T, int64_t>::value)
   {
     return SIMPL::NumericTypes::Type::Int64;
   }
-  if(typeid(value) == typeid(uint64_t))
+  else if(std::is_same<T, uint64_t>::value)
   {
     return SIMPL::NumericTypes::Type::UInt64;
   }
-
-  if(typeid(value) == typeid(float))
+  else if(std::is_same<T, float>::value)
   {
     return SIMPL::NumericTypes::Type::Float;
   }
-  if(typeid(value) == typeid(double))
+  else if(std::is_same<T, double>::value)
   {
     return SIMPL::NumericTypes::Type::Double;
   }
-
-  if(typeid(value) == typeid(bool))
+  else if(std::is_same<T, bool>::value)
   {
     return SIMPL::NumericTypes::Type::Bool;
   }
@@ -478,69 +489,64 @@ SIMPL::NumericTypes::Type DataArray<T>::getType() const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
+void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision) const
 {
-  T value = static_cast<T>(0x00);
   xdmfTypeName = "UNKNOWN";
   precision = 0;
-  if(typeid(value) == typeid(int8_t))
+
+  if(std::is_same<T, int8_t>::value)
   {
     xdmfTypeName = "Char";
     precision = 1;
   }
-  if(typeid(value) == typeid(uint8_t))
+  else if(std::is_same<T, uint8_t>::value)
   {
     xdmfTypeName = "UChar";
     precision = 1;
   }
-
-  if(typeid(value) == typeid(int16_t))
+  else if(std::is_same<T, int16_t>::value)
   {
     xdmfTypeName = "Int";
     precision = 2;
   }
-  if(typeid(value) == typeid(uint16_t))
+  else if(std::is_same<T, uint16_t>::value)
   {
     xdmfTypeName = "UInt";
     precision = 2;
   }
-
-  if(typeid(value) == typeid(int32_t))
+  else if(std::is_same<T, int32_t>::value)
   {
     xdmfTypeName = "Int";
     precision = 4;
   }
-  if(typeid(value) == typeid(uint32_t))
+  else if(std::is_same<T, uint32_t>::value)
   {
     xdmfTypeName = "UInt";
     precision = 4;
   }
-
-  if(typeid(value) == typeid(int64_t))
+  else if(std::is_same<T, int64_t>::value)
   {
     xdmfTypeName = "Int";
     precision = 8;
   }
-  if(typeid(value) == typeid(uint64_t))
+  else if(std::is_same<T, uint64_t>::value)
   {
     xdmfTypeName = "UInt";
     precision = 8;
   }
-
-  if(typeid(value) == typeid(float))
+  else if(std::is_same<T, float>::value)
   {
     xdmfTypeName = "Float";
     precision = 4;
   }
-  if(typeid(value) == typeid(double))
+  else if(std::is_same<T, double>::value)
   {
     xdmfTypeName = "Float";
     precision = 8;
   }
-
-  if(typeid(value) == typeid(bool))
+  else if(std::is_same<T, bool>::value)
   {
-    xdmfTypeName = "uchar";
+    xdmfTypeName = "UChar";
     precision = 1;
   }
 }
@@ -550,7 +556,7 @@ void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) con
 
 // -----------------------------------------------------------------------------
 template <typename T>
-bool DataArray<T>::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
+bool DataArray<T>::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
 {
   if(!m_IsAllocated)
   {
@@ -568,7 +574,11 @@ bool DataArray<T>::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sou
   {
     return false;
   }
-  Self* source = dynamic_cast<Self*>(sourceArray.get());
+  const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+  if(source == nullptr)
+  {
+    return false;
+  }
   if(nullptr == source->getPointer(0))
   {
     return false;
@@ -694,9 +704,9 @@ void DataArray<T>::initializeWithValue(T initValue, size_t offset)
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int DataArray<T>::eraseTuples(comp_dims_type& idxs)
+int32_t DataArray<T>::eraseTuples(const comp_dims_type& idxs)
 {
-  int err = 0;
+  int32_t err = 0;
 
   // If nothing is to be erased just return
   if(idxs.empty())
@@ -712,7 +722,7 @@ int DataArray<T>::eraseTuples(comp_dims_type& idxs)
 
   // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
   // off the end of the array and return an error code.
-  for(size_t& idx : idxs)
+  for(const size_t& idx : idxs)
   {
     if(idx * m_NumComponents > m_MaxId)
     {
@@ -807,7 +817,7 @@ int DataArray<T>::eraseTuples(comp_dims_type& idxs)
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int DataArray<T>::copyTuple(size_t currentPos, size_t newPos)
+int32_t DataArray<T>::copyTuple(size_t currentPos, size_t newPos)
 {
   size_t max = ((m_MaxId + 1) / m_NumComponents);
   if(currentPos >= max || newPos >= max)
@@ -868,28 +878,6 @@ void* DataArray<T>::getVoidPointer(size_t i)
   return reinterpret_cast<void*>(&(m_Array[i]));
 }
 
-// -----------------------------------------------------------------------------
-template <typename T>
-std::list<T> DataArray<T>::getArray() const
-{
-  return std::list<T>(m_Array, m_Array + (m_Size * sizeof(T)) / sizeof(T));
-}
-
-// -----------------------------------------------------------------------------
-template <typename T>
-void DataArray<T>::setArray(std::list<T> newArray)
-{
-  if(newArray.size() != m_Size)
-  {
-    return;
-  }
-  int i = 0;
-  for(auto elem : newArray)
-  {
-    m_Array[i++] = elem;
-  }
-}
-
 // -----------------------------------------------------------------------------
 template <typename T>
 T* DataArray<T>::getPointer(size_t i) const
@@ -957,7 +945,7 @@ void DataArray<T>::setComponent(size_t i, int32_t j, T c)
 
 // -----------------------------------------------------------------------------
 template <typename T>
-void DataArray<T>::setTuple(size_t tupleIndex, T* data)
+void DataArray<T>::setTuple(size_t tupleIndex, const T* data)
 {
 #ifndef NDEBUG
   if(m_Size > 0)
@@ -1001,7 +989,7 @@ void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data)
 
 // -----------------------------------------------------------------------------
 template <typename T>
-void DataArray<T>::initializeTuple(size_t i, void* p)
+void DataArray<T>::initializeTuple(size_t i, const void* p)
 {
   if(!m_IsAllocated)
   {
@@ -1017,7 +1005,7 @@ void DataArray<T>::initializeTuple(size_t i, void* p)
   {
     return;
   }
-  T* c = reinterpret_cast<T*>(p);
+  const T* c = reinterpret_cast<const T*>(p);
   for(size_t j = 0; j < m_NumComponents; ++j)
   {
     m_Array[i * m_NumComponents + j] = *c;
@@ -1052,13 +1040,13 @@ void DataArray<T>::resizeTuples(size_t numTuples)
 template <typename T>
 void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
-  int precision = out.realNumberPrecision();
+  int32_t precision = out.realNumberPrecision();
   T value = static_cast<T>(0x00);
-  if(typeid(value) == typeid(float))
+  if(std::is_same<T, float>::value)
   {
     out.setRealNumberPrecision(8);
   }
-  if(typeid(value) == typeid(double))
+  else if(std::is_same<T, double>::value)
   {
     out.setRealNumberPrecision(16);
   }
@@ -1094,157 +1082,57 @@ QString DataArray<T>::getFullNameOfClass() const
 template <typename T>
 QString DataArray<T>::getTypeAsString() const
 {
-  T value = static_cast<T>(0);
-  if(typeid(value) == typeid(float))
-  {
-    return "float";
-  }
-  if(typeid(value) == typeid(double))
-  {
-    return "double";
-  }
-
-  if(typeid(value) == typeid(int8_t))
-  {
-    return "int8_t";
-  }
-  if(typeid(value) == typeid(uint8_t))
-  {
-    return "uint8_t";
-  }
-#if CMP_TYPE_CHAR_IS_SIGNED
-  if(typeid(value) == typeid(char))
-  {
-    return "int8_t";
-  }
-#else
-  if(typeid(value) == typeid(char))
+  if(std::is_same<T, int8_t>::value)
   {
     return "int8_t";
   }
-#endif
-  if(typeid(value) == typeid(signed char))
-  {
-    return "int8_t";
-  }
-  if(typeid(value) == typeid(unsigned char))
+  else if(std::is_same<T, uint8_t>::value)
   {
     return "uint8_t";
   }
-
-  if(typeid(value) == typeid(int16_t))
-  {
-    return "int16_t";
-  }
-  if(typeid(value) == typeid(short))
+  else if(std::is_same<T, int16_t>::value)
   {
     return "int16_t";
   }
-  if(typeid(value) == typeid(signed short))
-  {
-    return "int16_t";
-  }
-  if(typeid(value) == typeid(uint16_t))
-  {
-    return "uint16_t";
-  }
-  if(typeid(value) == typeid(unsigned short))
+  else if(std::is_same<T, uint16_t>::value)
   {
     return "uint16_t";
   }
-
-  if(typeid(value) == typeid(int32_t))
-  {
-    return "int32_t";
-  }
-  if(typeid(value) == typeid(uint32_t))
-  {
-    return "uint32_t";
-  }
-#if(CMP_SIZEOF_INT == 4)
-  if(typeid(value) == typeid(int))
-  {
-    return "int32_t";
-  }
-  if(typeid(value) == typeid(signed int))
+  else if(std::is_same<T, int32_t>::value)
   {
     return "int32_t";
   }
-  if(typeid(value) == typeid(unsigned int))
+  else if(std::is_same<T, uint32_t>::value)
   {
     return "uint32_t";
   }
-#endif
-
-  if(typeid(value) == typeid(int64_t))
+  else if(std::is_same<T, int64_t>::value)
   {
     return "int64_t";
   }
-  if(typeid(value) == typeid(uint64_t))
+  else if(std::is_same<T, uint64_t>::value)
   {
     return "uint64_t";
   }
-
-#if(CMP_SIZEOF_LONG == 4)
-  if(typeid(value) == typeid(long int))
-  {
-    return "long int";
-  }
-  if(typeid(value) == typeid(signed long int))
-  {
-    return "signed long int";
-  }
-  if(typeid(value) == typeid(unsigned long int))
-  {
-    return "unsigned long int";
-  }
-#elif(CMP_SIZEOF_LONG == 8)
-  if(typeid(value) == typeid(long int))
-  {
-    return "int64_t";
-  }
-  if(typeid(value) == typeid(signed long int))
-  {
-    return "int64_t";
-  }
-  if(typeid(value) == typeid(unsigned long int))
+  else if(std::is_same<T, float>::value)
   {
-    return "uint64_t";
-  }
-#endif
-
-#if(CMP_SIZEOF_LONG_LONG == 8)
-  if(typeid(value) == typeid(long long int))
-  {
-    return "int64_t";
-  }
-  if(typeid(value) == typeid(signed long long int))
-  {
-    return "int64_t";
+    return "float";
   }
-  if(typeid(value) == typeid(unsigned long long int))
+  else if(std::is_same<T, double>::value)
   {
-    return "uint64_t";
+    return "double";
   }
-#endif
-
-  if(typeid(value) == typeid(bool))
+  else if(std::is_same<T, bool>::value)
   {
     return "bool";
   }
 
-  // qDebug()  << "Error: HDFTypeForPrimitive - Unknown Type: " << (typeid(value).name()) ;
-  const char* name = typeid(value).name();
-  if(nullptr != name && name[0] == 'l')
-  {
-    qDebug() << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t.";
-  }
   return "UnknownType";
 }
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int DataArray<T>::writeH5Data(hid_t parentId, comp_dims_type tDims) const
+int32_t DataArray<T>::writeH5Data(hid_t parentId, const comp_dims_type& tDims) const
 {
   if(m_Array == nullptr)
   {
@@ -1255,14 +1143,14 @@ int DataArray<T>::writeH5Data(hid_t parentId, comp_dims_type tDims) const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int DataArray<T>::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const
+int32_t DataArray<T>::writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const
 {
   if(m_Array == nullptr)
   {
     return -85648;
   }
   QString dimStr;
-  int precision = 0;
+  int32_t precision = 0;
   QString xdmfTypeName;
   getXdmfTypeAndSize(xdmfTypeName, precision);
   if(0 == precision)
@@ -1273,7 +1161,7 @@ int DataArray<T>::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const Q
     return -100;
   }
 
-  int numComp = getNumberOfComponents();
+  int32_t numComp = getNumberOfComponents();
   out << "    <Attribute Name=\"" << getName() << label << "\" ";
   if(numComp == 1)
   {
@@ -1313,7 +1201,6 @@ int DataArray<T>::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const Q
 template <typename T>
 QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
 {
-
   QLocale usa(QLocale::English, QLocale::UnitedStates);
 
   QString info;
@@ -1374,13 +1261,13 @@ QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int DataArray<T>::readH5Data(hid_t parentId)
+int32_t DataArray<T>::readH5Data(hid_t parentId)
 {
-  int err = 0;
+  int32_t err = 0;
 
   resizeTuples(0);
   IDataArray::Pointer p = H5DataArrayReader::ReadIDataArray(parentId, getName());
-  if(p.get() == nullptr)
+  if(p == nullptr)
   {
     return -1;
   }
@@ -1400,58 +1287,16 @@ int DataArray<T>::readH5Data(hid_t parentId)
   return err;
 }
 
-#if 0
 // -----------------------------------------------------------------------------
 template <typename T>
 void DataArray<T>::byteSwapElements()
 {
-  char* ptr = reinterpret_cast<char*>(m_Array);
-  char t[8];
-  size_t size = getTypeSize();
-  for(uint64_t var = 0; var < m_Size; ++var)
+  for(auto& value : *this)
   {
-    if(sizeof(T) == 2)
-    {
-      DA_BYTE_SWAP(0, 1, t)
-    }
-    else if(sizeof(T) == 4)
-    {
-      DA_BYTE_SWAP(0, 3, t) DA_BYTE_SWAP(1, 2, t)
-    }
-    else if(sizeof(T) == 8)
-    {
-      DA_BYTE_SWAP(0, 7, t) DA_BYTE_SWAP(1, 6, t) DA_BYTE_SWAP(2, 5, t) DA_BYTE_SWAP(3, 4, t)
-    }
-    ptr += size; // increment the pointer
-  }
-}
-
-#else
-// -----------------------------------------------------------------------------
-template <typename T>
-void DataArray<T>::byteSwapElements()
-{
-  for(size_t i = 0; i < m_Size; ++i)
-  {
-    if(sizeof(T) == 2)
-    {
-      m_Array[i] = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_2(m_Array[i]);
-    }
-    else if(sizeof(T) == 4)
-    {
-      uint32_t* ptr = reinterpret_cast<uint32_t*>(m_Array + i);
-      *ptr = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_4(*ptr);
-    }
-    else if(sizeof(T) == 8)
-    {
-      uint64_t* ptr = reinterpret_cast<uint64_t*>(m_Array + i);
-      *ptr = SIMPL_ENDIAN_INTRINSIC_BYTE_SWAP_8(*ptr);
-    }
+    value = byteSwap(value);
   }
 }
 
-#endif
-
 template <typename T>
 typename DataArray<T>::iterator DataArray<T>::begin()
 {
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 0e3ab6e474..6f526f7519 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -118,7 +118,7 @@ class DataArray : public IDataArray
    *
    * For example if you have a 2D image dimensions of 80(w) x 60(h) then the "cdims" would be [80][60]
    */
-  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue);
+  DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue);
 
   /**
    * @brief Protected Constructor
@@ -128,7 +128,7 @@ class DataArray : public IDataArray
    * @param initValue The value to use when initializing each element of the array
    * @param allocate Will all the memory be allocated at time of construction
    */
-  DataArray(size_t numTuples, const QString& name, comp_dims_type compDims, T initValue, bool allocate);
+  DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue, bool allocate);
 
   ~DataArray() override;
 
@@ -151,7 +151,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate);
+  static Pointer CreateArray(size_t numTuples, int32_t rank, const size_t* dims, const QString& name, bool allocate);
 
   /**
    * @brief Static constructor
@@ -184,7 +184,7 @@ class DataArray : public IDataArray
    * @param allocate Will all the memory be allocated at time of construction
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numTuples, int rank, const size_t* compDims, const QString& name, bool allocate) const override;
+  IDataArray::Pointer createNewArray(size_t numTuples, int32_t rank, const size_t* compDims, const QString& name, bool allocate) const override;
 
   /**
    * @brief createNewArray
@@ -203,7 +203,7 @@ class DataArray : public IDataArray
    * @param name The name of the array
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer FromQVector(QVector<T>& vec, const QString& name);
+  static Pointer FromQVector(const QVector<T>& vec, const QString& name);
 
   /**
    * @brief Static Method to create a DataArray from a std::vector through a deep copy of the data
@@ -212,7 +212,7 @@ class DataArray : public IDataArray
    * @param name The name of the array
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
-  static Pointer FromStdVector(std::vector<T>& vec, const QString& name);
+  static Pointer FromStdVector(const std::vector<T>& vec, const QString& name);
 
   /**
    * @brief FromPointer Creates a DataArray<T> object with a <b>DEEP COPY</b> of the data
@@ -221,7 +221,7 @@ class DataArray : public IDataArray
    * @param name
    * @return
    */
-  static Pointer CopyFromPointer(T* data, size_t size, const QString& name);
+  static Pointer CopyFromPointer(const T* data, size_t size, const QString& name);
 
   /**
    * @brief WrapPointer Creates a DataArray<T> object that references the pointer. The original caller can
@@ -258,7 +258,7 @@ class DataArray : public IDataArray
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision) const override;
   // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
   // This is required so that other classes can call this version of copyData from the subclasses.
   using IDataArray::copyFromArray;
@@ -282,7 +282,7 @@ class DataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief copyIntoArray
@@ -299,13 +299,13 @@ class DataArray : public IDataArray
    * @brief Gives this array a human readable name
    * @param name The name of this array
    */
-  virtual void setInitValue(T initValue);
+  void setInitValue(T initValue);
 
   /**
    * @brief Returns the initial value for the array.
    * @return
    */
-  virtual T getInitValue() const
+  T getInitValue() const
   {
     return m_InitValue;
   }
@@ -326,7 +326,7 @@ class DataArray : public IDataArray
    * @brief Allocates the memory needed for this class
    * @return 1 on success, -1 on failure
    */
-  virtual int32_t allocate();
+  int32_t allocate();
 
   /**
    * @brief Sets all the values to zero.
@@ -336,7 +336,7 @@ class DataArray : public IDataArray
   /**
    * @brief Sets all the values to value.
    */
-  virtual void initializeWithValue(T initValue, size_t offset = 0);
+  void initializeWithValue(T initValue, size_t offset = 0);
 
   /**
    * @brief Removes Tuples from the m_Array. If the size of the vector is Zero nothing is done. If the size of the
@@ -346,7 +346,7 @@ class DataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(comp_dims_type& idxs) override;
+  int32_t eraseTuples(const comp_dims_type& idxs) override;
 
   /**
    * @brief
@@ -354,7 +354,7 @@ class DataArray : public IDataArray
    * @param newPos
    * @return
    */
-  int copyTuple(size_t currentPos, size_t newPos) override;
+  int32_t copyTuple(size_t currentPos, size_t newPos) override;
 
   /**
    * @brief Returns the number of bytes that make up the data type.
@@ -387,7 +387,7 @@ class DataArray : public IDataArray
    * 3 element component (vector) then this will be 3. If you are storing a small image of size 80x60
    * at each Tuple (like EBSD Kikuchi patterns) then the result would be 4800.
    */
-  int getNumberOfComponents() const override;
+  int32_t getNumberOfComponents() const override;
 
   /**
    * @brief Returns a void pointer pointing to the index of the array. nullptr
@@ -398,18 +398,6 @@ class DataArray : public IDataArray
    */
   void* getVoidPointer(size_t i) override;
 
-  /**
-   * @brief Returns a list of the contents of DataArray (For Python Binding)
-   * @return std::list. Possibly empty
-   */
-  std::list<T> getArray() const;
-
-  /**
-   * @brief Sets the contents of the array to the list (For Python Binding)
-   * @param std::list. New array contents
-   */
-  void setArray(std::list<T> newArray);
-
   /**
    * @brief Returns the pointer to a specific index into the array. No checks are made
    * as to the correctness of the index being passed in. If you ask for an index off
@@ -417,14 +405,14 @@ class DataArray : public IDataArray
    * @param i The index to return the pointer to.
    * @return The pointer to the index
    */
-  virtual T* getPointer(size_t i) const;
+  T* getPointer(size_t i) const;
 
   /**
    * @brief Returns the value for a given index
    * @param i The index to return the value at
    * @return The value at index i
    */
-  virtual T getValue(size_t i) const;
+  T getValue(size_t i) const;
 
   /**
    * @brief Sets a specific value in the array
@@ -435,7 +423,7 @@ class DataArray : public IDataArray
 
   //----------------------------------------------------------------------------
   // These can be overridden for more efficiency
-  T getComponent(size_t i, int j) const;
+  T getComponent(size_t i, int32_t j) const;
 
   /**
    * @brief Sets a specific component of the Tuple located at i
@@ -443,14 +431,14 @@ class DataArray : public IDataArray
    * @param j The Component index into the Tuple
    * @param c The value to set
    */
-  void setComponent(size_t i, int j, T c);
+  void setComponent(size_t i, int32_t j, T c);
 
   /**
    * @brief setTuple
    * @param tupleIndex
    * @param data
    */
-  void setTuple(size_t tupleIndex, T* data);
+  void setTuple(size_t tupleIndex, const T* data);
 
   /**
    * @brief setTuple
@@ -464,7 +452,7 @@ class DataArray : public IDataArray
    * @param i The index of the Tuple
    * @param c The value to splat across all components in the tuple
    */
-  void initializeTuple(size_t i, void* p) override;
+  void initializeTuple(size_t i, const void* p) override;
 
   /**
    * @brief getTuplePointer Returns the pointer to a specific tuple
@@ -493,7 +481,7 @@ class DataArray : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) const override;
+  void printComponent(QTextStream& out, size_t i, int32_t j) const override;
 
   /**
    * @brief Returns the HDF Type for a given primitive value.
@@ -514,7 +502,7 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, comp_dims_type tDims) const override;
+  int32_t writeH5Data(hid_t parentId, const comp_dims_type& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -522,7 +510,7 @@ class DataArray : public IDataArray
    * @param volDims
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override;
+  int32_t writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override;
 
   /**
    * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
@@ -540,7 +528,7 @@ class DataArray : public IDataArray
     toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
 
     QString compDimStr = "(";
-    for(int i = 0; i < m_CompDims.size(); i++)
+    for(size_t i = 0; i < m_CompDims.size(); i++)
     {
       compDimStr = compDimStr + QString::number(m_CompDims[i]);
       if(i < m_CompDims.size() - 1)
@@ -568,12 +556,12 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override;
+  int32_t readH5Data(hid_t parentId) override;
 
   /**
    * @brief
    */
-  virtual void byteSwapElements();
+  void byteSwapElements();
 
   //========================================= STL INTERFACE COMPATIBILITY =================================
 
@@ -597,7 +585,7 @@ class DataArray : public IDataArray
       ptr_ = ptr_ + num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int ununsed)
+    self_type operator++(int32_t ununsed)
     {
       std::ignore = ununsed;
       self_type i = *this;
@@ -650,7 +638,7 @@ class DataArray : public IDataArray
       ptr_ = ptr_ + num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int ununsed)
+    self_type operator++(int32_t ununsed)
     {
       std::ignore = ununsed;
       self_type i = *this;
@@ -708,14 +696,14 @@ class DataArray : public IDataArray
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int ununsed)
+    self_type operator++(int32_t ununsed)
     {
       std::ignore = ununsed;
       self_type i = *this;
       ptr_++;
       return i;
     } // POSTFIX
-    self_type operator+(int amt)
+    self_type operator+(int32_t amt)
     {
       ptr_ += amt;
       return *this;
@@ -764,13 +752,13 @@ class DataArray : public IDataArray
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int amt)
+    self_type operator++(int32_t amt)
     {
       self_type i = *this;
       ptr_ += amt;
       return i;
     } // POSTFIX
-    self_type operator+(int amt)
+    self_type operator+(int32_t amt)
     {
       ptr_ += amt;
       return *this;
@@ -1010,7 +998,7 @@ class DataArray : public IDataArray
    * @param size
    * @return Pointer to the internal array
    */
-  virtual T* resizeAndExtend(size_t size);
+  T* resizeAndExtend(size_t size);
 
 private:
   T* m_Array = nullptr;
@@ -1027,7 +1015,7 @@ class DataArray : public IDataArray
 // -----------------------------------------------------------------------------
 // These are specialized for bool type as std::vector<bool> uses bits instead of bytes
 template <>
-typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(std::vector<bool>& vec, const QString& name);
+typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(const std::vector<bool>& vec, const QString& name);
 
 template <>
 void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data);
diff --git a/Source/SIMPLib/DataArrays/IDataArray.cpp b/Source/SIMPLib/DataArrays/IDataArray.cpp
index e3a8198718..23747d83e4 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArray.cpp
@@ -26,7 +26,7 @@ IDataArray::~IDataArray() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool IDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray)
+bool IDataArray::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray)
 {
   return copyFromArray(destTupleOffset, sourceArray, 0, sourceArray->getNumberOfTuples());
 }
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 6d80bc4d1a..e19da37641 100755
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -49,7 +49,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
   PYB11_METHOD(QString getTypeAsString)
   PYB11_METHOD(std::vector<size_t> getComponentDimensions)
   PYB11_METHOD(size_t getNumberOfTuples)
-  PYB11_METHOD(int getNumberOfComponents)
+  PYB11_METHOD(int32_t getNumberOfComponents)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
     IDataArray(const QString& name = "");
     ~IDataArray() override;
 
-    virtual Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const = 0;
+    virtual Pointer createNewArray(size_t numElements, int32_t rank, const size_t* dims, const QString& name, bool allocate = true) const = 0;
     virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const = 0;
     // virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
 
@@ -83,7 +83,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      */
     DataArrayPath getDataArrayPath() const override;
 
-    virtual int getClassVersion() const = 0;
+    virtual int32_t getClassVersion() const = 0;
 
     /**
      * @brief Has all the memory needed for this class been allocated?
@@ -123,7 +123,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      */
     virtual size_t getSize() const = 0;
 
-    virtual int getNumberOfComponents() const = 0;
+    virtual int32_t getNumberOfComponents() const = 0;
     virtual std::vector<size_t> getComponentDimensions() const = 0;
 
     /**
@@ -140,14 +140,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * can be a primitive like char, float, int or the name of a class.
      * @return
      */
-    virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const = 0;
+    virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision) const = 0;
 
     /**
      * @brief Erases tuples based on a list of specific Tuple indices
      * @param idxs The indices to erase
      * @return
      */
-    virtual int eraseTuples(std::vector<size_t>& idxs) = 0;
+    virtual int32_t eraseTuples(const std::vector<size_t>& idxs) = 0;
 
     /**
      * @brief Copies a Tuple from one position to another.
@@ -155,7 +155,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param newPos The destination index to place the copied data
      * @return
      */
-    virtual int copyTuple(size_t currentPos, size_t newPos) = 0;
+    virtual int32_t copyTuple(size_t currentPos, size_t newPos) = 0;
 
     /**
      * @brief copyData This method copies all data from the <b>sourceArray</b> into
@@ -178,7 +178,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param sourceArray
      * @return
      */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray);
+    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray);
 
     /**
      * @brief copyData This method copies the number of tuples specified by the
@@ -199,14 +199,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param sourceArray
      * @return
      */
-    virtual bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) = 0;
+    virtual bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) = 0;
 
     /**
      * @brief Splats the same value c across all values in the Tuple
      * @param pos The index of the Tuple
      * @param value pointer to value
      */
-    virtual void initializeTuple(size_t pos, void* value) = 0;
+    virtual void initializeTuple(size_t pos, const void* value) = 0;
 
     /**
      * @brief Sets all the values to zero.
@@ -240,7 +240,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param i
      * @param j
      */
-    virtual void printComponent(QTextStream& out, size_t i, int j) const = 0;
+    virtual void printComponent(QTextStream& out, size_t i, int32_t j) const = 0;
 
     /**
      * @brief deepCopy
@@ -255,14 +255,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param tDims
      * @return
      */
-    virtual int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const = 0;
+    virtual int32_t writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const = 0;
 
     /**
      * @brief readH5Data
      * @param parentId
      * @return
      */
-    virtual int readH5Data(hid_t parentId) = 0;
+    virtual int32_t readH5Data(hid_t parentId) = 0;
 
     /**
      * @brief writeXdmfAttribute
@@ -273,7 +273,7 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
      * @param label
      * @return
      */
-    virtual int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const = 0;
+    virtual int32_t writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const = 0;
 
     /**
      * @brief getTypeAsString
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index a5d85825c2..99ddf63039 100755
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -374,7 +374,7 @@ class NeighborList : public IDataArray
      * @param idxs The indices to remove
      * @return error code.
      */
-    int eraseTuples(std::vector<size_t>& idxs) override
+    int eraseTuples(const std::vector<size_t>& idxs) override
     {
       int err = 0;
       // If nothing is to be erased just return
@@ -455,12 +455,17 @@ class NeighborList : public IDataArray
      * @param sourceArray
      * @return
      */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
+    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
     {
       if(!m_IsAllocated) { return false; }
       if(destTupleOffset >= m_Array.size() ) { return false; }
       if(!sourceArray->isAllocated()) { return false; }
-      Self* source = dynamic_cast<Self*>(sourceArray.get());
+      const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+
+      if(source == nullptr)
+      {
+        return false;
+      }
 
       if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
       {
@@ -508,7 +513,7 @@ class NeighborList : public IDataArray
      * @param i The index of the Tuple
      * @param c The value to splat across all components in the tuple
      */
-    void initializeTuple(size_t i, void* p) override
+    void initializeTuple(size_t i, const void* p) override
     {
       Q_UNUSED(i);
       Q_UNUSED(p);
@@ -672,7 +677,7 @@ class NeighborList : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override
+    int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
     {
       int err = 0;
 
@@ -813,7 +818,7 @@ class NeighborList : public IDataArray
      * @param groupPath
      * @return
      */
-    int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName,
+    int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName,
                                    const QString& groupPath, const QString& label) const override
     {
       int precision = 0;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 07a5042b4c..76890b9bdf 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -248,7 +248,7 @@ size_t StatsDataArray::getTypeSize() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::eraseTuples(std::vector<size_t>& idxs)
+int StatsDataArray::eraseTuples(const std::vector<size_t>& idxs)
 {
   int err = 0;
 
@@ -310,7 +310,7 @@ int StatsDataArray::copyTuple(size_t currentPos, size_t newPos)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool StatsDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
+bool StatsDataArray::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
 {
   if(!m_IsAllocated)
   {
@@ -328,7 +328,12 @@ bool StatsDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer s
   {
     return false;
   }
-  Self* source = dynamic_cast<Self*>(sourceArray.get());
+  const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+
+  if(source == nullptr)
+  {
+    return false;
+  }
 
   if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
   {
@@ -356,7 +361,7 @@ bool StatsDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer s
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StatsDataArray::initializeTuple(size_t i, void* p)
+void StatsDataArray::initializeTuple(size_t i, const void* p)
 {
   Q_ASSERT(false);
 }
@@ -428,7 +433,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims) const
+int StatsDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
 {
   herr_t err = 0;
   hid_t gid = QH5Utilities::createGroup(parentId, getName());
@@ -635,7 +640,7 @@ int StatsDataArray::readFromJson(const QJsonObject& jsonRoot)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
+int StatsDataArray::writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
 {
   out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
   return -1;
@@ -824,7 +829,7 @@ StatsData::Pointer StatsDataArray::getStatsData(int idx) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StatsData::Pointer StatsDataArray::operator[](int idx)
+StatsData::Pointer StatsDataArray::operator[](int idx) const
 {
 #ifndef NDEBUG
   if(!m_StatsDataArray.empty())
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index bfc29fdf4d..2dcbd7e6a7 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -52,10 +52,9 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
 {
   // clang-format off
   // Start Python bindings declarations
-  PYB11_BEGIN_BINDINGS(StatsDataArray SUPER IDataArray)
+  PYB11_BEGIN_BINDINGS(StatsDataArray SUPERCLASS IDataArray)
   PYB11_SHARED_POINTERS(StatsDataArray)
   PYB11_STATIC_NEW_MACRO(StatsDataArray)
-  PYB11_STATIC_CREATION(New)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t int size_t* QString bool)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t std::vector<size_t> QString bool)
@@ -193,7 +192,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param idx
    * @return
    */
-  StatsData::Pointer operator[](int idx);
+  StatsData::Pointer operator[](int idx) const;
 
   /* **************** This is the interface for the IDataArray Class which MUST
    *  Be implemented. Most of it is useless and will simply ASSERT if called. */
@@ -265,7 +264,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(std::vector<size_t>& idxs) override;
+  int eraseTuples(const std::vector<size_t>& idxs) override;
 
   /**
    * @brief Copies a Tuple from one position to another.
@@ -298,14 +297,14 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArrayShPtrType sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief Splats the same value c across all values in the Tuple
    * @param i The index of the Tuple
    * @param c The value to splat across all components in the tuple
    */
-  void initializeTuple(size_t i, void* p) override;
+  void initializeTuple(size_t i, const void* p) override;
 
   /**
    * @brief Sets all the values to zero.
@@ -353,7 +352,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override;
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief readH5Data
@@ -370,7 +369,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param groupPath
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
+  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
 
   /**
    * @brief getInfoString
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index a697a47548..eeea694091 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -242,7 +242,7 @@ size_t StringDataArray::getTypeSize() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::eraseTuples(std::vector<size_t>& idxs)
+int StringDataArray::eraseTuples(const std::vector<size_t>& idxs)
 {
 
   int err = 0;
@@ -314,7 +314,7 @@ int StringDataArray::copyTuple(size_t currentPos, size_t newPos)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool StringDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
+bool StringDataArray::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
 {
   if(destTupleOffset >= m_Array.size())
   {
@@ -325,7 +325,11 @@ bool StringDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer
     return false;
   }
 
-  Self* source = dynamic_cast<Self*>(sourceArray.get());
+  const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+  if(source == nullptr)
+  {
+    return false;
+  }
 
   if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
   {
@@ -346,9 +350,9 @@ bool StringDataArray::copyFromArray(size_t destTupleOffset, IDataArray::Pointer
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringDataArray::initializeTuple(size_t pos, void* value)
+void StringDataArray::initializeTuple(size_t pos, const void* value)
 {
-  m_Array[pos] = *(reinterpret_cast<QString*>(value));
+  m_Array[pos] = *(reinterpret_cast<const QString*>(value));
 }
 
 // -----------------------------------------------------------------------------
@@ -447,7 +451,7 @@ QString StringDataArray::getFullNameOfClass() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims) const
+int StringDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
 {
   return H5DataArrayWriter::writeStringDataArray<StringDataArray>(parentId, this);
 }
@@ -455,7 +459,7 @@ int StringDataArray::writeH5Data(hid_t parentId, std::vector<size_t> tDims) cons
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
+int StringDataArray::writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const
 {
   out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
   return -1;
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index d4ed674fe2..6f25c2ff2b 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
 {
   // clang-format off
   // Start Python bindings declarations
-  PYB11_BEGIN_BINDINGS(StringDataArray SUPER IDataArray)
+  PYB11_BEGIN_BINDINGS(StringDataArray SUPERCLASS IDataArray)
   PYB11_SHARED_POINTERS(StringDataArray)
   PYB11_STATIC_NEW_MACRO(StringDataArray)
   PYB11_STATIC_CREATION(CreateArray OVERLOAD size_t QString bool)
@@ -231,7 +231,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(std::vector<size_t>& idxs) override;
+  int eraseTuples(const std::vector<size_t>& idxs) override;
 
   /**
    * @brief Copies a Tuple from one position to another.
@@ -264,14 +264,14 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArrayShPtrType sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief Does Nothing
    * @param pos The index of the Tuple
    * @param value pointer to value
    */
-  void initializeTuple(size_t pos, void* value) override;
+  void initializeTuple(size_t pos, const void* value) override;
 
   /**
    * @brief Sets all the values to empty string.
@@ -342,7 +342,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override;
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -352,7 +352,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param groupPath
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
+  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override;
 
   /**
    * @brief getInfoString
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 059b552923..bd7babd6dd 100755
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -280,7 +280,7 @@ class StructArray : public IDataArray
      * @param idxs The indices to remove
      * @return error code.
      */
-    int eraseTuples(std::vector<size_t>& idxs) override
+    int eraseTuples(const std::vector<size_t>& idxs) override
     {
 
       int err = 0;
@@ -435,7 +435,7 @@ class StructArray : public IDataArray
      * @param sourceArray
      * @return
      */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::Pointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
+    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
     {
       if(!m_IsAllocated)
       {
@@ -453,7 +453,11 @@ class StructArray : public IDataArray
       {
         return false;
       }
-      Self* source = dynamic_cast<Self*>(sourceArray.get());
+      const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+      if(source == nullptr)
+      {
+        return false;
+      }
       if(nullptr == source->getPointer(0))
       {
         return false;
@@ -579,7 +583,7 @@ class StructArray : public IDataArray
      * @param i The index of the Tuple
      * @param c The value to splat across all components in the tuple
      */
-    void initializeTuple(size_t i, void* p) override
+    void initializeTuple(size_t i, const void* p) override
     {
 #ifndef NDEBUG
       if (m_Size > 0) { Q_ASSERT(i < m_Size);}
@@ -667,7 +671,7 @@ class StructArray : public IDataArray
      * @param parentId
      * @return
      */
-    int writeH5Data(hid_t parentId, std::vector<size_t> tDims) const override
+    int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
     {
       Q_ASSERT(false);
       return -1;
@@ -682,7 +686,7 @@ class StructArray : public IDataArray
      * @param groupPath
      * @return
      */
-    int writeXdmfAttribute(QTextStream& out, int64_t* volDims, const QString& hdfFileName,
+    int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName,
                                    const QString& groupPath, const QString& labelb) const override
     {
       out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 6f0fb1b1c7..c2c7cdf248 100755
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -83,8 +83,8 @@ class SIMPLib_EXPORT DataArrayPath
 {
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(DataArrayPath)
-  PYB11_CREATION(ARGS QString QString QString)
-  PYB11_CREATION(ARGS QString)
+  PYB11_CREATION(QString QString QString)
+  PYB11_CREATION(QString)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
   PYB11_PROPERTY(QString DataArrayName READ getDataArrayName WRITE setDataArrayName)
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleInput.h b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
index d27cfb5baf..bce8ae1fdd 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleInput.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
@@ -27,22 +27,23 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #pragma once
 
 #include <QtCore/QJsonObject>
 #include <QtCore/QMetaType>
 
 /**
-* @brief
-*/
-typedef struct
+ * @brief
+ */
+struct AxisAngleInput_t
 {
-  float angle;
-  float h;
-  float k;
-  float l;
+  float angle = 0.0f;
+  float h = 0.0f;
+  float k = 0.0f;
+  float l = 0.0f;
 
-  void writeJson(QJsonObject& json)
+  void writeJson(QJsonObject& json) const
   {
     json["angle"] = angle;
     json["h"] = h;
@@ -50,9 +51,9 @@ typedef struct
     json["l"] = l;
   }
 
-  bool readJson(QJsonObject& json)
+  bool readJson(const QJsonObject& json)
   {
-    if (json["angle"].isDouble() && json["h"].isDouble() && json["k"].isDouble() && json["l"].isDouble())
+    if(json["angle"].isDouble() && json["h"].isDouble() && json["k"].isDouble() && json["l"].isDouble())
     {
       angle = static_cast<float>(json["angle"].toDouble());
       h = static_cast<float>(json["h"].toDouble());
@@ -62,11 +63,6 @@ typedef struct
     }
     return false;
   }
-
-} AxisAngleInput_t;
+};
 
 Q_DECLARE_METATYPE(AxisAngleInput_t)
-
-
-
-
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 62d3d7861d..0658bb93a1 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -53,12 +53,11 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   PYB11_BEGIN_BINDINGS(ComparisonSet SUPERCLASS AbstractComparison)
   PYB11_SHARED_POINTERS(ComparisonSet)
   PYB11_STATIC_NEW_MACRO(ComparisonSet)
-  PYB11_CREATION()
   PYB11_PROPERTY(QVector<AbstractComparison::Pointer> Comparisons READ getComparisons WRITE setComparisons)
   PYB11_PROPERTY(bool InvertComparison READ getInvertComparison WRITE setInvertComparison)
   PYB11_PROPERTY(int UnionOperator READ getUnionOperator WRITE setUnionOperator)
-  PYB11_METHOD(void addComparison ARGS AbstractComparisonPtr,comparison)
-  PYB11_METHOD(void insertComparison ARGS int,index AbstractComparisonPtr,comparison)
+  PYB11_METHOD(void addComparison ARGS comparison)
+  PYB11_METHOD(void insertComparison ARGS index comparison)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 189da0d10a..63d1a95fbd 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -52,7 +52,6 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
   PYB11_BEGIN_BINDINGS(ComparisonValue SUPERCLASS AbstractComparison)
   PYB11_SHARED_POINTERS(ComparisonValue)
   PYB11_STATIC_NEW_MACRO(ComparisonValue)
-  PYB11_CREATION()
   PYB11_PROPERTY(QString AttributeArrayName READ getAttributeArrayName WRITE setAttributeArrayName)
   PYB11_PROPERTY(int CompOperator READ getCompOperator WRITE setCompOperator)
   PYB11_PROPERTY(double CompValue READ getCompValue WRITE setCompValue)
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 59105c9199..ea71992a01 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -53,8 +53,6 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   PYB11_BEGIN_BINDINGS(EdgeGeom SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(EdgeGeom)
   PYB11_STATIC_NEW_MACRO(EdgeGeom)
-  PYB11_CREATION(CreateGeometry ARGS size_t SharedVertexList::Pointer QString bool)
-  PYB11_CREATION(CreateGeometry ARGS SharedEdgeList::Pointer SharedVertexList::Pointer QString)
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertexList::Pointer getVertices)
   PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 5c9d4912df..097627b7cb 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -54,11 +54,9 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   PYB11_BEGIN_BINDINGS(QuadGeom SUPERCLASS IGeometry2D)
   PYB11_SHARED_POINTERS(QuadGeom)
   PYB11_STATIC_NEW_MACRO(QuadGeom)
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedQuadList::Pointer SharedVertexList::Pointer QString)
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertextList::Pointer getVertices)
-  PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
+  //PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
   PYB11_METHOD(void setQuads SharedQuadList::Pointer,quads)
   PYB11_METHOD(SharedQuadList::Pointer getQuads)
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index a85f608b23..148e0190e1 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -54,15 +54,12 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   PYB11_BEGIN_BINDINGS(TriangleGeom SUPERCLASS IGeometry2D)
   PYB11_SHARED_POINTERS(TriangleGeom)
   PYB11_STATIC_NEW_MACRO(TriangleGeom)
-	  
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD size_t SharedVertexList::Pointer QString bool)
-  PYB11_CREATION(CreateGeometry ARGS OVERLOAD SharedTriList::Pointer SharedVertexList::Pointer QString)
-  PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
+  PYB11_METHOD(void setVertices ARGS vertices)
   PYB11_METHOD(SharedVertextList::Pointer getVertices)
-  PYB11_METHOD(void setEdges SharedEdgeList::Pointer,edges)
+  //PYB11_METHOD(void setEdges ARGS edges)
   PYB11_METHOD(SharedEdgeList::Pointer getEdges)
-  PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
-  PYB11_METHOD(void getCoords size_t,vertId float,coords[3])
+  PYB11_METHOD(void setCoords ARGS vertId coords)
+  PYB11_METHOD(void getCoords ARGS vertId coords)
   PYB11_METHOD(size_t getNumberOfVertices)
   PYB11_METHOD(size_t getNumberOfEdges)
   PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 2ee3c9d20b..1a96f8b5aa 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -56,9 +56,6 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
   PYB11_BEGIN_BINDINGS(VertexGeom SUPERCLASS IGeometry)
   PYB11_SHARED_POINTERS(VertexGeom)
   PYB11_STATIC_NEW_MACRO(VertexGeom)
-  
-  PYB11_CREATION(CreateGeometry ARGS size_t QString bool)
-  PYB11_CREATION(CreateGeometry ARGS SharedVertexList::Pointer QString)
   PYB11_METHOD(void setVertices SharedVertexList::Pointer,vertices)
   PYB11_METHOD(SharedVertexList::Pointer getVertices)
   PYB11_METHOD(void setCoords size_t,vertId float,coords[3])
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
index 4a82f3252a..71fb69c83a 100755
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -67,7 +67,7 @@ class H5DataArrayWriter
      * @return
      */
     template <typename IDataArrayType>
-    static int writeDataArrayAttributes(hid_t gid, const IDataArrayType* dataArray, std::vector<size_t> tDims, std::vector<size_t> cDims)
+    static int writeDataArrayAttributes(hid_t gid, const IDataArrayType* dataArray, const std::vector<size_t>& tDims, const std::vector<size_t>& cDims)
     {
       int err = QH5Lite::writeScalarAttribute(gid, dataArray->getName(), SIMPL::HDF5::DataArrayVersion, dataArray->getClassVersion());
       if(err < 0)
@@ -116,7 +116,7 @@ class H5DataArrayWriter
      * @return
      */
     template <class T>
-    static int writeDataArray(hid_t gid, const T* dataArray, std::vector<size_t> tDims)
+    static int writeDataArray(hid_t gid, const T* dataArray, const std::vector<size_t>& tDims)
     {
       int err = 0;
 
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
index 4964e6e4c1..49e05573d2 100755
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.h
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -85,7 +85,7 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
 {
 
   // Start Python bindings declarations
-  PYB11_BEGIN_BINDINGS(PrimaryStatsData SUPER StatsData)
+  PYB11_BEGIN_BINDINGS(PrimaryStatsData SUPERCLASS StatsData)
   PYB11_SHARED_POINTERS(PrimaryStatsData)
   PYB11_STATIC_NEW_MACRO(PrimaryStatsData)
   PYB11_PROPERTY(float BinStepSize READ getBinStepSize WRITE setBinStepSize)
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
new file mode 100644
index 0000000000..ba0196e6ac
--- /dev/null
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -0,0 +1,137 @@
+function(CreatePybind11Module)
+  set(options PLUGIN)
+  set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
+  set(multiValueArgs LINK_LIBRARIES INCLUDE_DIRS)
+  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  find_package(pybind11 REQUIRED)
+
+  set(PLUGIN_ARG "")
+  if(${ARGS_PLUGIN})
+    set(PLUGIN_ARG "--plugin")
+  endif()
+
+  set(CREATE_PYTHON_BINDINGS_TARGET ${ARGS_MODULE_NAME}CreatePythonBindings)
+  set(PYTHON_MODULE_SOURCE_FILE ${ARGS_OUTPUT_DIR}/py_${ARGS_MODULE_NAME}.cpp)
+  set(PYTHON_UNIT_TEST_FILE ${ARGS_PYTHON_OUTPUT_DIR}/${ARGS_MODULE_NAME}_UnitTest.py)
+
+  file(MAKE_DIRECTORY ${ARGS_OUTPUT_DIR})
+  file(MAKE_DIRECTORY ${ARGS_PYTHON_OUTPUT_DIR})
+
+  set(PY_GENERATOR ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/generate_python_bindings.py)
+
+  add_custom_target(${CREATE_PYTHON_BINDINGS_TARGET} ALL
+      COMMAND ${PYTHON_EXECUTABLE} ${PY_GENERATOR}
+      "${ARGS_OUTPUT_DIR}"
+      "${ARGS_FILE_LIST_PATH}"
+      "${ARGS_SOURCE_DIR}"
+      "${PLUGIN_ARG}"
+      "${ARGS_PYTHON_OUTPUT_DIR}"
+      "--include_dir=${ARGS_INCLUDE_DIR}"
+      "--module_name=${ARGS_MODULE_NAME}"
+      "--header_path=${ARGS_HEADER_PATH}"
+      "--body_path=${ARGS_BODY_PATH}"
+      COMMENT "${ARGS_MODULE_NAME}: Generating Python bindings"
+      BYPRODUCTS ${PYTHON_MODULE_SOURCE_FILE}
+  )
+
+  set_property(TARGET ${CREATE_PYTHON_BINDINGS_TARGET} PROPERTY FOLDER "Python/Generator")
+
+  pybind11_add_module(${ARGS_MODULE_NAME}
+    ${PYTHON_MODULE_SOURCE_FILE}
+  )
+
+  set_property(TARGET ${ARGS_MODULE_NAME} PROPERTY FOLDER "Python/Bindings")
+
+  set_source_files_properties(${PYTHON_MODULE_SOURCE_FILE}
+    PROPERTIES  
+      SKIP_AUTOMOC ON
+  )
+
+  add_dependencies(${ARGS_MODULE_NAME} ${CREATE_PYTHON_BINDINGS_TARGET})
+
+  target_link_libraries(${ARGS_MODULE_NAME}
+    PUBLIC
+      ${ARGS_LINK_LIBRARIES}
+  )
+
+  target_include_directories(${ARGS_MODULE_NAME}
+    PUBLIC
+      ${ARGS_INCLUDE_DIRS}
+  )
+
+  set(TESTS_PYTHONPATH
+    "$<TARGET_FILE_DIR:simpl>"
+  )
+
+  if(WIN32)
+    string(REPLACE ";" "\\;" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
+  else()
+    string(REPLACE ";" ":" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
+  endif()
+
+  set(PYTHON_UNIT_TEST_NAME PY_${ARGS_MODULE_NAME}_UnitTest)
+
+  add_test(NAME ${PYTHON_UNIT_TEST_NAME}
+    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_UNIT_TEST_FILE}
+  )
+
+  set_tests_properties(${PYTHON_UNIT_TEST_NAME}
+    PROPERTIES
+      ENVIRONMENT "PYTHONPATH=${TESTS_PYTHONPATH}"
+  )
+endfunction()
+
+function(CreatePybind11Plugin)
+  set(options)
+  set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH)
+  set(multiValueArgs)
+  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  string(TOLOWER ${ARGS_PLUGIN_NAME} PLUGIN_NAME_lower)
+
+  CreatePybind11Module(MODULE_NAME ${PLUGIN_NAME_lower}
+    OUTPUT_DIR "${${ARGS_PLUGIN_NAME}_BINARY_DIR}/Wrapping/PythonCore"
+    FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/${ARGS_PLUGIN_NAME}PublicFilters.txt"
+    SOURCE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/${ARGS_PLUGIN_NAME}Filters"
+    INCLUDE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}"
+    PYTHON_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
+    HEADER_PATH ${ARGS_HEADER_PATH}
+    BODY_PATH ${ARGS_BODY_PATH}
+    LINK_LIBRARIES ${ARGS_PLUGIN_TARGET}
+    INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
+    PLUGIN
+  )
+endfunction()
+
+function(CreatePythonTests)
+  set(options)
+  set(oneValueArgs PREFIX INPUT_DIR)
+  set(multiValueArgs TEST_NAMES)
+  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(TESTS_PYTHONPATH
+    "$<TARGET_FILE_DIR:simpl>"
+    "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL"
+    "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
+    "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d/$<CONFIG>"
+  )
+
+  if(WIN32)
+    string(REPLACE ";" "\\;" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
+  else()
+    string(REPLACE ";" ":" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
+  endif()
+
+  foreach(test ${ARGS_TEST_NAMES})
+    string(REPLACE "/" "_" test_name ${test})
+    set(PY_TEST_NAME ${ARGS_PREFIX}_${test_name})
+    add_test(NAME ${PY_TEST_NAME}
+      COMMAND ${PYTHON_EXECUTABLE} "${ARGS_INPUT_DIR}/${test}.py"
+    )
+    set_tests_properties(${PY_TEST_NAME}
+      PROPERTIES
+        ENVIRONMENT "PYTHONPATH=${TESTS_PYTHONPATH}"
+    )
+  endforeach()
+endfunction()
diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
new file mode 100644
index 0000000000..a1c7297e28
--- /dev/null
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -0,0 +1,643 @@
+#pragma once
+
+#include <QtCore/QString>
+
+#include <pybind11/numpy.h>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <pybind11/stl_bind.h>
+
+namespace py = pybind11;
+
+#include "SIMPLib/CoreFilters/CreateDataArray.h"
+#include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
+#include "SIMPLib/DataContainers/DataContainerProxy.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
+#include "SIMPLib/Common/ShapeType.h"
+#include "SIMPLib/Common/PhaseType.h"
+
+using DataContainersMap = QMap<QString, DataContainerProxy>;
+using AttributeMatricesMap = QMap<QString, AttributeMatrixProxy>;
+using VectorOfFloatArray = QVector<FloatArrayType::Pointer>;
+
+namespace pybind11
+{
+namespace detail
+{
+/* Create a TypeCaster for auto python string <--> QString conversion */
+template <>
+struct type_caster<QString>
+{
+public:
+  /**
+   * This macro establishes the name 'QString' in
+   * function signatures and declares a local variable
+   * 'value' of type QString
+   */
+  PYBIND11_TYPE_CASTER(QString, _("QString"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a PyObject into a QString
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    object temp;
+    handle load_src = src;
+    if(PyUnicode_Check(load_src.ptr()))
+    {
+      temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(load_src.ptr()));
+      if(!temp) /* A UnicodeEncodeError occured */
+      {
+        PyErr_Clear();
+        return false;
+      }
+      load_src = temp;
+    }
+    char* buffer = nullptr;
+    ssize_t length = 0;
+    int err = PYBIND11_BYTES_AS_STRING_AND_SIZE(load_src.ptr(), &buffer, &length);
+    if(err == -1) /* A TypeError occured */
+    {
+      PyErr_Clear();
+      return false;
+    }
+    value = QString::fromUtf8(buffer, static_cast<int>(length));
+    return true;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert an QString instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QString& src, return_value_policy /* policy */, handle /* parent */)
+  {
+#if PY_VERSION_HEX >= 0x03030000 // Python 3.3
+    assert(sizeof(QChar) == 2);
+    return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, src.constData(), src.length());
+#else
+    QByteArray a = src.toUtf8();
+    return PyUnicode_FromStringAndSize(a.data(), (ssize_t)a.length());
+#endif
+  }
+};
+/* Create a TypeCaster for auto python tuple <--> QPair conversion */
+template <>
+struct type_caster<FPRangePair>
+{
+public:
+  /**
+   * This macro establishes the name 'FPRangePair' in
+   * function signatures and declares a local variable
+   * 'value' of type FPRangePair
+   */
+  PYBIND11_TYPE_CASTER(FPRangePair, _("FPRangePair"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a tuple into a FPRangePair
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::tuple>(src))
+    {
+      py::tuple valuePair = py::cast<py::tuple>(src);
+      value = FPRangePair();
+      value.first = py::cast<double>(valuePair[0]);
+      value.second = py::cast<double>(valuePair[1]);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert  FPRangePair instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const FPRangePair& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    return py::tuple((src.first, src.second));
+  }
+};
+
+/* Create a TypeCaster for auto python dict <--> ASCIIWizardData conversion */
+template <>
+struct type_caster<ASCIIWizardData>
+{
+public:
+  /**
+   * This macro establishes the name 'ASCIIWizardData' in
+   * function signatures and declares a local variable
+   * 'value' of type ASCIIWizardData
+   */
+  PYBIND11_TYPE_CASTER(ASCIIWizardData, _("ASCIIWizardData"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a dict into a ASCIIWizardData
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::dict>(src))
+    {
+      py::dict awdDict = py::cast<py::dict>(src);
+      value = ASCIIWizardData();
+      value.inputFilePath = py::cast<QString>(awdDict["inputFilePath"]);
+      value.beginIndex = py::cast<int>(awdDict["beginIndex"]);
+      value.numberOfLines = py::cast<int>(awdDict["numberOfLines"]);
+      QList<char> delimiters;
+      for(auto object : awdDict["delimiters"])
+      {
+        delimiters.push_back(py::cast<char>(object));
+      }
+      value.delimiters = delimiters;
+      value.consecutiveDelimiters = py::cast<bool>(awdDict["consecutiveDelimiters"]);
+      value.automaticAM = py::cast<bool>(awdDict["automaticAM"]);
+      value.selectedPath = py::cast<DataArrayPath>(awdDict["selectedPath"]);
+      QStringList dataHeaders;
+      for(auto header : awdDict["headers"])
+      {
+        dataHeaders.push_back(py::cast<QString>(header));
+      }
+      value.dataHeaders = dataHeaders;
+      value.attrMatType = py::cast<int>(awdDict["attrMatType"]);
+      std::vector<size_t> tupleDims;
+      for(auto tupleDim : awdDict["tupleDimensions"])
+      {
+        tupleDims.push_back(py::cast<size_t>(tupleDim));
+      }
+      value.tupleDims = tupleDims;
+      QStringList dataTypes;
+      for(auto dataType : awdDict["dataTypes"])
+      {
+        dataTypes.push_back(py::cast<QString>(dataType));
+      }
+      value.dataTypes = dataTypes;
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert  ASCIIWizardData instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const ASCIIWizardData& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::dict awdDict;
+    awdDict["inputFilePath"] = src.inputFilePath;
+    awdDict["beginIndex"] = src.beginIndex;
+    awdDict["numberOfLines"] = src.numberOfLines;
+    awdDict["delimiters"] = src.delimiters;
+    awdDict["consecutiveDelimiters"] = src.consecutiveDelimiters;
+    awdDict["automaticAM"] = src.automaticAM;
+    awdDict["selectedPath"] = src.selectedPath;
+    awdDict["headers"] = src.dataHeaders;
+    awdDict["attrMatType"] = src.attrMatType;
+    awdDict["tupleDimensions"] = src.tupleDims;
+    awdDict["dataTypes"] = src.dataTypes;
+    return std::move(awdDict);
+  }
+};
+
+/* Create a TypeCaster for auto python list <--> QVector<DataArrayPath> conversion */
+template <>
+struct type_caster<QVector<DataArrayPath>>
+{
+public:
+  /**
+   * This macro establishes the name 'QVector<DataArrayPath>' in
+   * function signatures and declares a local variable
+   * 'value' of type QVector<DataArrayPath>
+   */
+  PYBIND11_TYPE_CASTER(QVector<DataArrayPath>, _("QVector<DataArrayPath>"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<DataArrayPath>
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::list>(src))
+    {
+      value = QVector<DataArrayPath>();
+      for(auto dataArrayPath : src)
+      {
+        value.push_back(py::cast<DataArrayPath>(dataArrayPath));
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert QVector<DataArrayPath> instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QVector<DataArrayPath>& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::list dataArrayPaths;
+    for(auto dataArrayPath : src)
+    {
+      dataArrayPaths.append(dataArrayPath);
+    }
+    return std::move(dataArrayPaths);
+  }
+};
+
+/* Create a TypeCaster for auto python dict <--> QMap<QString, DataContainerProxy> conversion */
+template <>
+struct type_caster<DataContainersMap>
+{
+public:
+  /**
+   * This macro establishes the name 'QMap<QString, V>' in
+   * function signatures and declares a local variable
+   * 'value' of type QMap<QString, V>
+   */
+  PYBIND11_TYPE_CASTER(DataContainersMap, _("DataContainersMap"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::dict>(src))
+    {
+      std::map<QString, DataContainerProxy> mapDict = py::cast<std::map<QString, DataContainerProxy>>(src);
+      value = QMap<QString, DataContainerProxy>();
+      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
+      {
+        value.insert(it->first, it->second);
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert QMap<QString, V> instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QMap<QString, DataContainerProxy>& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    std::map<QString, DataContainerProxy> qmapStd = src.toStdMap();
+    py::dict qmapDict;
+    for(auto it = qmapStd.begin(); it != qmapStd.end(); ++it)
+    {
+      QString key(it->first);
+      qmapDict[py::str(key.toStdString())] = py::cast(it->second);
+    }
+    return std::move(qmapDict);
+  }
+};
+
+/* Create a TypeCaster for auto python dict <--> QMap<QString, DataContainerProxy> conversion */
+template <>
+struct type_caster<AttributeMatricesMap>
+{
+public:
+  /**
+   * This macro establishes the name 'QMap<QString, V>' in
+   * function signatures and declares a local variable
+   * 'value' of type QMap<QString, V>
+   */
+  PYBIND11_TYPE_CASTER(AttributeMatricesMap, _("AttributeMatricesMap"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::dict>(src))
+    {
+      std::map<QString, AttributeMatrixProxy> mapDict = py::cast<std::map<QString, AttributeMatrixProxy>>(src);
+      value = QMap<QString, AttributeMatrixProxy>();
+      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
+      {
+        value.insert(it->first, it->second);
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert QMap<QString, V> instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QMap<QString, AttributeMatrixProxy>& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::dict qmapDict;
+    std::map<QString, AttributeMatrixProxy> qmapStd = src.toStdMap();
+    for(auto it = qmapStd.begin(); it != qmapStd.end(); ++it)
+    {
+      QString key(it->first);
+      qmapDict[py::str(key.toStdString())] = py::cast(it->second);
+    }
+    return std::move(qmapDict);
+  }
+};
+
+/* Create a TypeCaster for auto python list <--> QVector<ShapeType::Type> conversion */
+template <>
+struct type_caster<QVector<ShapeType::Type>>
+{
+public:
+  /**
+   * This macro establishes the name 'QVector<ShapeType::Type>' in
+   * function signatures and declares a local variable
+   * 'value' of type QVector<ShapeType::Type>
+   */
+  PYBIND11_TYPE_CASTER(QVector<ShapeType::Type>, _("QVector<ShapeType::Type>"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<ShapeType::Type>
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::list>(src))
+    {
+      value = QVector<ShapeType::Type>();
+      for(auto shapeType : src)
+      {
+        value.push_back(py::cast<ShapeType::Type>(shapeType));
+      }
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert QVector<ShapeType::Type> instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QVector<ShapeType::Type>& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::list shapeTypes;
+    for(auto shapeType : src)
+    {
+      shapeTypes.append(shapeType);
+    }
+    return std::move(shapeTypes);
+  }
+};
+
+/* Create a TypeCaster for auto python list <--> QVector<PhaseType::Type> conversion */
+template <>
+struct type_caster<QVector<PhaseType::Type>>
+{
+public:
+  /**
+   * This macro establishes the name 'QVector<PhaseType::Type>' in
+   * function signatures and declares a local variable
+   * 'value' of type QVector<PhaseType::Type>
+   */
+  PYBIND11_TYPE_CASTER(QVector<PhaseType::Type>, _("QVector<PhaseType::Type>"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<PhaseType::Type>
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::list>(src))
+    {
+      value = QVector<PhaseType::Type>();
+      for(auto phaseType : src)
+      {
+        value.push_back(py::cast<PhaseType::Type>(phaseType));
+      }
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert QVector<PhaseType::Type> instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const QVector<PhaseType::Type>& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::list phaseTypes;
+    for(PhaseType::Type phaseType : src)
+    {
+      phaseTypes.append(phaseType);
+    }
+    return std::move(phaseTypes);
+  }
+};
+
+/* Create a TypeCaster for auto python list <--> VectorOfFloatArray conversion */
+template <>
+struct type_caster<VectorOfFloatArray>
+{
+public:
+  /**
+   * This macro establishes the name 'VectorOfFloatArray' in
+   * function signatures and declares a local variable
+   * 'value' of type VectorOfFloatArray
+   */
+  PYBIND11_TYPE_CASTER(VectorOfFloatArray, _("VectorOfFloatArray"));
+
+  /**
+   *  @brief Conversion part 1 (Python->C++): convert a list into a VectorOfFloatArray
+   * instance or return false upon failure. The second argument
+   * indicates whether implicit conversions should be applied.
+   * @param src
+   * @return boolean
+   */
+  bool load(handle src, bool b)
+  {
+    if(!src)
+    {
+      return false;
+    }
+    if(py::isinstance<py::list>(src))
+    {
+      /* Extract PyObject from handle */
+      PyObject* source = src.ptr();
+      /* Try converting into a Python integer value */
+      VectorOfFloatArray floatArrays;
+      for(auto floatArray : src)
+      {
+        if(py::isinstance<py::list>(floatArray) || py::isinstance<py::tuple>(floatArray))
+        {
+          FloatArrayType::Pointer floatArrayPtr;
+          std::vector<float> floatArrayVector;
+          size_t index = 0;
+          QString name;
+          for(auto value : floatArray)
+          {
+            if(index == 0)
+            {
+              name = py::cast<QString>(value);
+            }
+            else
+            {
+              floatArrayVector.push_back(py::cast<float>(value));
+            }
+            index++;
+          }
+          floatArrayPtr = FloatArrayType::FromStdVector(floatArrayVector, name);
+          floatArrays.push_back(floatArrayPtr);
+        }
+        else if(py::isinstance<FloatArrayType>(floatArray))
+        {
+          PyObject* floatArrayPy = floatArray.ptr();
+          floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
+          Py_XDECREF(floatArrayPy);
+        }
+        else
+        {
+          py::print("object must be list, tuple, or FloatArray");
+        }
+      }
+
+      value = floatArrays;
+      Py_XDECREF(source);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * @brief Conversion part 2 (C++ -> Python): convert VectorOfFloatArray instance into
+   * a Python object. The second and third arguments are used to
+   * indicate the return value policy and parent object (for
+   * ``return_value_policy::reference_internal``) and are generally
+   * ignored by implicit casters.
+   *
+   * @param src
+   * @return
+   */
+  static handle cast(const VectorOfFloatArray& src, return_value_policy /* policy */, handle /* parent */)
+  {
+    py::list floatArrays;
+    for(FloatArrayType::Pointer floatArray : src)
+    {
+      py::list floatArrayList;
+      floatArrayList.append(floatArray->getName());
+      for(float value : *floatArray)
+      {
+        floatArrayList.append(value);
+      }
+
+      floatArrays.append(floatArray);
+    }
+    return std::move(floatArrays);
+  }
+};
+
+} // namespace detail
+} // namespace pybind11
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
new file mode 100644
index 0000000000..59f05d601e
--- /dev/null
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -0,0 +1,611 @@
+import argparse
+import os
+import re
+
+from collections import Counter, defaultdict
+from pathlib import Path
+
+# typing.Final isn't available until 3.8+
+from typing import DefaultDict, Dict, Generator, List, Optional, Tuple
+
+PYB11_BEGIN_BINDINGS: str = 'PYB11_BEGIN_BINDINGS'
+PYB11_END_BINDINGS: str = 'PYB11_END_BINDINGS'
+PYB11_PROPERTY: str = 'PYB11_PROPERTY'
+PYB11_METHOD: str = 'PYB11_METHOD'
+PYB11_STATIC_CREATION: str = 'PYB11_STATIC_CREATION'
+PYB11_CREATION: str = 'PYB11_CREATION'
+PYB11_ENUMERATION: str = 'PYB11_ENUMERATION'
+PYB11_STATIC_NEW_MACRO: str = 'PYB11_STATIC_NEW_MACRO'
+PYB11_FILTER_NEW_MACRO: str = 'PYB11_FILTER_NEW_MACRO'
+PYB11_SHARED_POINTERS: str = 'PYB11_SHARED_POINTERS'
+PYB11_FILTER: str = 'PYB11_FILTER'
+
+PYB11_SUPERCLASS: str = 'SUPERCLASS'
+PYB11_READ: str = 'READ'
+PYB11_WRITE: str = 'WRITE'
+PYB11_CONST_GET_OVERLOAD: str = 'CONST_GET_OVERLOAD'
+PYB11_CONST_METHOD: str = 'CONST_METHOD'
+PYB11_RETURN_VALUE_POLICY: str = 'RETURN_VALUE_POLICY'
+PYB11_ARGS: str = 'ARGS'
+PYB11_OVERLOAD: str = 'OVERLOAD'
+
+class PyProperty():
+  def __init__(self):
+    self.name: str = ''
+    self.type: str = ''
+    self.read: str = ''
+    self.write: str = ''
+    self.is_const_overload: bool = False
+
+class PyMethod():
+  def __init__(self):
+    self.name: str = ''
+    self.return_type: str = ''
+    self.args: List[str] = []
+    self.arg_types: List[str] = []
+    self.is_const: bool = False
+    self.return_value_policy: str = ''
+    self.is_overload: bool = False
+
+class PyStaticCreation():
+  def __init__(self):
+    self.name: str = ''
+    self.args: List[str] = []
+    self.is_overload: bool = False
+
+class PyConstructor():
+  def __init__(self):
+    self.args: List[str] = []
+
+class PyEnum():
+  def __init__(self):
+    self.name: str = ''
+    self.values: List[str] = []
+
+class PyClass():
+  def __init__(self):
+    self.name: str = ''
+    self.superclass: str = ''
+    self.properties: List[PyProperty] = []
+    self.methods: List[PyMethod] = []
+    self.static_creation_methods: List[PyStaticCreation] = []
+    self.constructors: List[PyConstructor] = []
+    self.enums: List[PyEnum] = []
+    self.has_static_new: bool = False
+    self.uses_shared_pointer: bool = False
+    self.is_filter: bool = False
+
+  def __repr__(self):
+    return self.name
+
+  def generate_bindings(self) -> str:
+    template_param = self.name
+    if self.superclass:
+      template_param += f', {self.superclass}'
+    if self.uses_shared_pointer:
+      template_param += f', std::shared_ptr<{self.name}>'
+
+    if self.enums:
+      instance = f'instance{self.name}'
+      code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
+
+      code += f'{instance}\n'
+    else:
+      code = f'py::class_<{template_param}>(mod, \"{self.name}\")\n'
+
+    for constructor in self.constructors:
+      args = ', '.join(constructor.args)
+      code += f'  .def(py::init<{args}>())\n'
+
+    if self.has_static_new:
+      code += f'  .def(py::init([]()\n    {{ \n      return {self.name}::New();\n    }}))\n'
+      code += f'  .def_static(\"New\", &{self.name}::New)\n'
+
+    for static_new_method in self.static_creation_methods:
+      args = ', '.join([f'{arg} var_{i}' for i, arg in enumerate(static_new_method.args)])
+      values = ', '.join([f'var_{i}' for i, arg in enumerate(static_new_method.args)])
+
+      code += f'  .def(py::init([]({args}) {{\n      return {self.name}::{static_new_method.name}({values});\n    }}))\n'
+      if not static_new_method.is_overload:
+        code += f'  .def_static(\"{static_new_method.name}\", &{self.name}::{static_new_method.name})\n'
+
+    for prop in self.properties:
+      if prop.read and prop.write:
+        if prop.is_const_overload:
+          code += f'  .def_property(\"{prop.name}\", py::overload_cast<>(&{self.name}::{prop.read}, py::const_), &{self.name}::{prop.write})\n'
+        else:
+          code += f'  .def_property(\"{prop.name}\", &{self.name}::{prop.read}, &{self.name}::{prop.write})\n'
+      elif prop.read:
+        code += f'  .def_property_readonly(\"{prop.name}\", &{self.name}::{prop.read})\n'
+      elif prop.write:
+        code += f'  .def(\"set{prop.name}\", &{self.name}::set{prop.name}, \"{prop.name}\"_a)\n'
+    
+    for method in self.methods:
+      if method.is_overload:
+        template_param = ', '.join(method.arg_types)
+        code += f'  .def(\"{method.name}\", py::overload_cast<{template_param}>(&{self.name}::{method.name}'
+        if method.is_const:
+          code += ', py::const_'
+        code += ')'
+      else:
+        code += f'  .def(\"{method.name}\", &{self.name}::{method.name}'
+      if method.return_value_policy:
+        code += f', {method.return_value_policy}'
+      if method.args:
+        args = ', '.join([f'\"{arg}\"_a' for arg in method.args])
+        code += f', {args}'
+      code += ')\n'
+
+    code += ';\n\n'
+
+    for enum in self.enums:
+      code += f'py::enum_<{self.name}::{enum.name}>(instance{self.name}, \"{enum.name}\")\n'
+      for value in enum.values:
+        code += f'  .value(\"{value}\", {self.name}::{enum.name}::{value})\n'
+      code += ';\n\n'
+
+    return code
+
+  def generate_python_interface(self, module_name: str) -> str:
+    arg_list = [replace_python_keywords(camel_to_snake(prop.name)) for prop in self.properties]
+    args_text = ', '.join(arg_list)
+    if args_text:
+      args_text = ', ' + args_text
+    code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}):\n'
+    code += f'  filter = {module_name}.{self.name}()\n'
+    code += f'  filter.setDataContainerArray(data_container_array)\n'
+
+    for prop, arg in zip(self.properties, arg_list):
+      code += f'  filter.{prop.name} = {arg}\n'
+
+    code += '  filter.execute()\n'
+    code += '  return filter.ErrorCode\n\n'
+    return code
+
+  def generate_unit_test_snippet(self, module_name: str) -> str:
+    code = f'  print(\'# --- {self.name}\')\n'
+    code += f'  filter = {module_name}.{self.name}()\n'
+    code += f'  filter.preflight()\n'
+    code += f'  if filter.NameOfClass != \'{self.name}\':\n'
+    code += f'    print(\'  Error: Filter class name is not correct. %s != {self.name}\' % filter.NameOfClass)\n\n'
+    return code
+
+def replace_python_keywords(text: str) -> str:
+  if text == 'lambda':
+    return 'lambda_value'
+  return text
+
+def camel_to_snake(text: str) -> str:
+  result = re.sub(r'(.)([A-Z][a-z]+)', r'\1_\2', text)
+  return re.sub(r'([a-z0-9])([A-Z])', r'\1_\2', result).lower()
+
+def is_child_path(child_path: str, parent_path: str) -> bool:
+  return os.path.commonpath([os.path.abspath(parent_path)]) == os.path.commonpath([os.path.abspath(parent_path), os.path.abspath(child_path)])
+
+def find_enum_values(file_path: str, name: str) -> List[str]:
+  enum_values = []
+
+  with open(file_path, 'r') as file:
+    line: str
+    for line in file:
+      line = line.strip()
+      if f'enum class {name}' in line:
+        while '{' not in line:
+          line = next(file).strip()
+        line = next(file).strip()
+        while '};' not in line:
+          value = line.strip(',')
+          enum_values.append(value.split(' ')[0])
+          line = next(file).strip()
+        break
+ 
+  return enum_values
+
+def find_index(lst: list, value) -> Optional[int]:
+  if value in lst:
+    return lst.index(value)
+  else:
+    return None
+
+def extract_macro_args(line: str) -> List[str]:
+  match = re.search(r'\((.*?)\)', line)
+  if not match:
+    raise RuntimeError('No match found')
+  return list(filter(bool, match.group(1).split(' ')))
+
+def file_line_generator(file_path: str) -> Generator[str, None, None]:
+  with open(file_path, 'r') as file:
+    line: str
+    for line in file:
+      yield line
+
+def parse_class(line: str) -> PyClass:
+  tokens = extract_macro_args(line)
+  py_class = PyClass()
+  py_class.name = tokens.pop(0)
+  while tokens:
+    token = tokens.pop(0)
+    if token == PYB11_SUPERCLASS:
+      py_class.superclass = tokens.pop(0)
+  return py_class
+
+def parse_property(line: str) -> PyProperty:
+  tokens = extract_macro_args(line)
+  prop = PyProperty()
+  prop.type = tokens.pop(0)
+  prop.name = tokens.pop(0)
+  while tokens:
+    token = tokens.pop(0)
+    if token == PYB11_READ:
+      prop.read = tokens.pop(0)
+    elif token == PYB11_WRITE:
+      prop.write = tokens.pop(0)
+    elif token == PYB11_CONST_GET_OVERLOAD:
+      prop.is_const_overload = True
+  return prop
+
+def parse_method_arg(arg: str) -> Tuple[str, str]:
+  arg_values = arg.split(',')
+  arg_name = arg_values[1]
+  arg_type = arg_values[0]
+  arg_type = arg_type.replace('.', ' ')
+  return (arg_name, arg_type)
+
+def parse_method(line: str) -> PyMethod:
+  tokens = extract_macro_args(line)
+  method = PyMethod()
+  method.return_type = tokens.pop(0)
+  method.name = tokens.pop(0)
+
+  if tokens:
+    if tokens[-1] == PYB11_CONST_METHOD:
+      method.is_const = True
+      tokens.pop()
+
+    index = find_index(tokens, PYB11_RETURN_VALUE_POLICY)
+
+    if index is not None:
+      method.return_value_policy = tokens.pop(index + 1)
+      tokens.pop(index)
+
+    token = tokens.pop(0)
+    if token == PYB11_ARGS:
+      while tokens:
+        arg = tokens.pop(0)
+        if ',' in arg:
+          arg_name, arg_type = parse_method_arg(arg)
+          method.args.append(arg_name)
+          method.arg_types.append(arg_type)
+        else:
+          method.args.append(arg)
+    elif token == PYB11_OVERLOAD:
+      method.is_overload = True
+      while tokens:
+        overload_arg = tokens.pop(0)
+        arg_name, arg_type = parse_method_arg(overload_arg)
+        method.args.append(arg_name)
+        method.arg_types.append(arg_type)
+
+  return method
+
+def parse_static_creation(line: str) -> PyStaticCreation:
+  tokens = extract_macro_args(line)
+  py_static_creation = PyStaticCreation()
+  py_static_creation.name = tokens.pop(0)
+  if tokens:
+    token = tokens.pop(0)
+    if token == PYB11_ARGS:
+      while tokens:
+        py_static_creation.args.append(tokens.pop(0))
+    elif token == PYB11_OVERLOAD:
+      py_static_creation.is_overload = True
+      while tokens:
+        py_static_creation.args.append(tokens.pop(0))
+  return py_static_creation
+
+def parse_creation(line: str) -> PyConstructor:
+  tokens = extract_macro_args(line)
+  constructor = PyConstructor()
+  tokens = [item.replace('.', ' ') for item in tokens]
+  constructor.args = tokens
+  return constructor
+
+def parse_enumeration(line: str) -> PyEnum:
+  tokens = extract_macro_args(line)
+  enum = PyEnum()
+  enum.name = tokens.pop(0)
+  return enum
+
+def parse_static_new_macro(line: str) -> bool:
+  return True
+
+def parse_filter_new_macro(line: str) -> bool:
+  return True
+
+def parse_shared_pointers(line: str) -> bool:
+  return True
+
+def parse_filter(line: str) -> bool:
+  return True
+
+def parse_bindings(class_line: str, file: Generator[str, None, None]) -> PyClass:
+  py_class = parse_class(class_line)
+  line: str
+  for line in file:
+    line = line.strip()
+    if line.startswith(PYB11_END_BINDINGS):
+      break
+    elif line.startswith(PYB11_PROPERTY):
+      py_class.properties.append(parse_property(line))
+    elif line.startswith(PYB11_METHOD):
+      py_class.methods.append(parse_method(line))
+    elif line.startswith(PYB11_STATIC_CREATION):
+      py_class.static_creation_methods.append(parse_static_creation(line))
+    elif line.startswith(PYB11_CREATION):
+      py_class.constructors.append(parse_creation(line))
+    elif line.startswith(PYB11_ENUMERATION):
+      py_class.enums.append(parse_enumeration(line))
+    elif line.startswith(PYB11_STATIC_NEW_MACRO):
+      py_class.has_static_new = parse_static_new_macro(line)
+    elif line.startswith(PYB11_FILTER_NEW_MACRO):
+      py_class.has_static_new = parse_filter_new_macro(line)
+    elif line.startswith(PYB11_SHARED_POINTERS):
+      py_class.uses_shared_pointer = parse_shared_pointers(line)
+    elif line.startswith(PYB11_FILTER):
+      py_class.is_filter = parse_filter(line)
+  return py_class
+
+def parse_file(file_path: str) -> List[PyClass]:
+  file_gen = file_line_generator(file_path)
+  classes = []
+  line: str
+  for line in file_gen:
+    line = line.strip()
+    if line.startswith(PYB11_BEGIN_BINDINGS):
+      py_class = parse_bindings(line, file_gen)
+      for enum in py_class.enums:
+        enum.values = find_enum_values(file_path, enum.name)
+      classes.append(py_class)
+  return classes
+
+def dfs(graph: DefaultDict[str, List[str]], vertex: str) -> List[str]:
+  visited = {key : False for key in graph.keys()}
+  def dfs_impl(graph: DefaultDict[str, List[str]], vertex: str, visited: Dict[str, bool]) -> List[str]:
+    visited[vertex] = True
+    path = [vertex]
+
+    for item in graph[vertex]:
+      if item not in graph:
+        path.append(item)
+      elif not visited[item]:
+        path.extend(dfs_impl(graph, item, visited))
+    return path
+  return dfs_impl(graph, vertex, visited)
+
+def is_sublist(parent: list, child: list) -> bool:
+  it = iter(parent)
+  return all(any(parent_item == child_item for parent_item in it) for child_item in child)
+
+def remove_sublists(lists: list) -> list:
+  lists.sort(key=lambda s: len(s))
+  out = []
+  n = len(lists)
+  for i, item in enumerate(lists):
+    is_sub = False
+    for j in range(i + 1, n - 1):
+      is_sub = is_sublist(lists[j], item)
+      if is_sub:
+        break
+    if not is_sub:
+      out.append(item)
+  return out
+
+def sort_inherited_classes(classes: List[PyClass]) -> List[PyClass]:
+  # assumes single inheritance
+  class_lookup = {item.name : item for item in classes}
+  superclasses = {item.superclass for item in classes}
+  class_names = {item.name for item in classes}
+
+  intersection = superclasses.intersection(class_names)
+
+  base_classes = []
+
+  for item in classes:
+    if item.superclass not in intersection:
+      base_classes.append(item.name)
+
+  graph: DefaultDict[str, List[str]] = defaultdict(list)
+
+  for py_class in classes:
+    graph[py_class.superclass].append(py_class.name)
+
+  sorted_classes = []
+
+  for name in base_classes:
+    sorted_classes.append(dfs(graph, name))
+
+  sorted_classes = remove_sublists(sorted_classes)
+
+  sorted_classes = [item for items in sorted_classes for item in items]
+
+  result = []
+
+  for name in sorted_classes:
+    if name in class_lookup:
+      result.append(class_lookup[name])
+
+  if Counter(classes) != Counter(result):
+    raise RuntimeError('sorted results must contain same elements as input')
+
+  return result
+
+def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str) -> None:
+  with open(f'{output_dir}/py_simpl.cpp', 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
+    with open(header_path, 'r') as header_file:
+      header_code = header_file.read()
+      module_file.write(header_code)
+
+    module_file.write('\n')
+
+    for file_path in files:
+      file_path = Path(file_path).relative_to(source_dir).as_posix()
+      module_file.write(f'#include \"{file_path}\"\n')
+
+    module_file.write('\nPYBIND11_MODULE(simpl, mod)\n{\n')
+
+    module_classes = []
+
+    for file_path in files:
+      classes = parse_file(file_path)
+      module_classes.extend(classes)
+
+    module_classes = sort_inherited_classes(module_classes)
+
+    python_file.write(f'import simpl\n\n')
+
+    test_file.write(f'import simpl\n\n')
+    test_file.write(f'def simplUnitTest():\n')
+
+    for py_class in module_classes:
+      code = py_class.generate_bindings()
+      module_file.write(code)
+      if py_class.is_filter:
+        python_code = py_class.generate_python_interface('simpl')
+        python_file.write(python_code)
+        test_code = py_class.generate_unit_test_snippet('simpl')
+        test_file.write(test_code)
+
+    test_file.write('\n')
+    test_file.write('if __name__ == \'__main__\':\n')
+    test_file.write('  print(\'simpl UnitTest Starting\')\n')
+    test_file.write('  simplUnitTest()\n')
+    test_file.write('  print(\'simpl UnitTest Complete\')\n')
+
+    with open(body_path, 'r') as body_file:
+      body_code = body_file.read()
+      module_file.write(body_code)
+
+    module_file.write('}\n')
+
+def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, header_path: str = '', body_path: str = '') -> None:
+  with open(f'{output_dir}/py_{module_name}.cpp', 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
+    includes = files
+    if include_dir:
+      includes = []
+      for file_path in files:
+        path = Path(file_path)
+        include_path = Path(include_dir)
+        path = path.relative_to(include_path)
+        path = include_path.parts[-1] / path
+        includes.append(path.as_posix())
+
+    include_code = '\n'.join([f'#include \"{file_path}\"' for file_path in includes])
+
+    custom_header_code = ''
+    if header_path:
+      with open(header_path, 'r') as header_file:
+        custom_header_code = header_file.read()
+
+    custom_body_code = ''
+    if body_path:
+      with open(body_path, 'r') as body_file:
+        custom_body_code = body_file.read()
+
+    header_code = (
+      '#include <memory>\n\n'
+      '#include \"pybind11/pybind11.h\"\n\n'
+      '#include \"Binding/Pybind11CustomTypeCasts.h\"\n\n'
+      f'{custom_header_code}\n'
+      f'{include_code}\n\n'
+      'namespace py = pybind11;\n'
+      'using namespace py::literals;\n\n'
+      f'PYBIND11_MODULE({module_name}, mod)\n'
+      '{\n'
+      'py::module::import("simpl");\n\n'
+    )
+    module_file.write(header_code)
+
+    module_classes = []
+
+    for file_path in files:
+      classes = parse_file(file_path)
+      module_classes.extend(classes)
+
+    module_classes = sort_inherited_classes(module_classes)
+
+    python_file.write(f'import {module_name}\n\n')
+
+    test_file.write(f'import {module_name}\n\n')
+    test_file.write(f'def {module_name}UnitTest():\n')
+
+    for py_class in module_classes:
+      code = py_class.generate_bindings()
+      module_file.write(code)
+      if py_class.is_filter:
+        python_code = py_class.generate_python_interface(module_name)
+        python_file.write(python_code)
+        test_code = py_class.generate_unit_test_snippet(module_name)
+        test_file.write(test_code)
+
+    test_file.write('\n')
+    test_file.write('if __name__ == \'__main__\':\n')
+    test_file.write(f'  print(\'{module_name} UnitTest Starting\')\n')
+    test_file.write(f'  {module_name}UnitTest()\n')
+    test_file.write(f'  print(\'{module_name} UnitTest Complete\')\n')
+
+    module_file.write(f'{custom_body_code}\n')
+
+    module_file.write('}\n')
+
+def read_plugin_file_list(file_list_path: str, source_dir: str) -> List[str]:
+  files = []
+  with open(args.file_list_path, 'r') as file:
+    lines = file.read().splitlines()
+    for line in lines:
+      if line.startswith('#'):
+        continue
+      path = line.strip()
+      path = f'{source_dir}/{line}'
+      files.append(path)
+  return files
+
+def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
+  files = []
+  with open(args.file_list_path, 'r') as file:
+    lines = file.read().split(';')
+    for line in lines:
+      path = line.strip()
+      if '.h' in path and is_child_path(path, source_dir):
+        with open(path, 'r') as file:
+          data = file.read()
+          if re.search(PYB11_BEGIN_BINDINGS, data) and not re.search(f'#define {PYB11_BEGIN_BINDINGS}', data):
+            files.append(path)
+  files = list(dict.fromkeys(files))
+  return files
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument('output_dir')
+  parser.add_argument('file_list_path')
+  parser.add_argument('source_dir')
+  parser.add_argument('python_output_dir')
+  parser.add_argument('--module_name')
+  parser.add_argument('--header_path')
+  parser.add_argument('--body_path')
+  parser.add_argument('--include_dir')
+  parser.add_argument('--plugin', action='store_true')
+
+  args = parser.parse_args()
+
+  if args.plugin:
+    if args.module_name is None:
+      parser.error('--plugin requires --module_name')
+    files = read_plugin_file_list(args.file_list_path, args.source_dir)
+    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.header_path, args.body_path)
+  else:
+    if args.header_path is None:
+      parser.error('requires --header_path')
+    if args.body_path is None:
+      parser.error('requires --body_path')
+    files = read_simpl_file_list(args.file_list_path, args.source_dir)
+    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir)
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
new file mode 100644
index 0000000000..b4439a0182
--- /dev/null
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -0,0 +1,227 @@
+registerDataArray<int8_t>(mod, "Int8Array");
+registerDataArray<uint8_t>(mod, "UInt8Array");
+
+registerDataArray<int16_t>(mod, "Int16Array");
+registerDataArray<uint16_t>(mod, "UInt16Array");
+
+registerDataArray<int32_t>(mod, "Int32Array");
+registerDataArray<uint32_t>(mod, "UInt32Array");
+
+registerDataArray<int64_t>(mod, "Int64Array");
+registerDataArray<uint64_t>(mod, "UInt64Array");
+
+registerDataArray<float>(mod, "FloatArray");
+registerDataArray<double>(mod, "DoubleArray");
+
+registerSIMPLArray<float, 2>(mod, "FloatVec2");
+registerSIMPLArray<int32_t, 2>(mod, "IntVec2");
+registerSIMPLArray<size_t, 2>(mod, "SizeVec2");
+
+registerSIMPLArray<float, 3>(mod, "FloatVec3");
+registerSIMPLArray<int32_t, 3>(mod, "IntVec3");
+registerSIMPLArray<size_t, 3>(mod, "SizeVec3");
+
+registerSIMPLArray<float, 4>(mod, "FloatVec4");
+registerSIMPLArray<int32_t, 4>(mod, "IntVec4");
+registerSIMPLArray<size_t, 4>(mod, "SizeVec4");
+
+registerSIMPLArray<float, 6>(mod, "FloatVec6");
+registerSIMPLArray<int32_t, 6>(mod, "IntVec6");
+
+py::implicitly_convertible<QString, DataArrayPath>();
+
+py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
+  .def(py::init<float, float, float, float>())
+  .def_readwrite("angle", &AxisAngleInput_t::angle)
+  .def_readwrite("h", &AxisAngleInput_t::h)
+  .def_readwrite("k", &AxisAngleInput_t::k)
+  .def_readwrite("l", &AxisAngleInput_t::l)
+;
+
+py::class_<StackFileListInfo>(mod, "FileListInfo")
+  .def(py::init<>([] (int32_t paddingDigits, uint32_t ordering, int32_t startIndex,
+    int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
+    const QString& fileSuffix, const QString& fileExtension)
+    {
+      StackFileListInfo fileListInfo;
+      fileListInfo.PaddingDigits = paddingDigits;
+      fileListInfo.Ordering = ordering;
+      fileListInfo.StartIndex = startIndex;
+      fileListInfo.EndIndex = endIndex;
+      fileListInfo.IncrementIndex = incrementIndex;
+      fileListInfo.InputPath = inputPath;
+      fileListInfo.FilePrefix = filePrefix;
+      fileListInfo.FileSuffix = fileSuffix;
+      fileListInfo.FileExtension = fileExtension;
+      return fileListInfo;
+    }))
+;
+
+py::class_<QSet<QString>>(mod, "StringSet")
+  .def(py::init<>([](py::set stringSet) {
+    QSet<QString> newQStringSet = QSet<QString>();
+    for(auto newString : stringSet)
+    {
+      newQStringSet.insert(py::cast<QString>(newString));
+    }
+    return newQStringSet;
+  }))
+;
+
+py::class_<QDateTime>(mod, "DateTime")
+  .def(py::init<>([](int year, int month, int day, int seconds) {
+    QDateTime dateTime(QDate(year, month, day));
+    dateTime.setTime_t(seconds);
+    return dateTime;
+  }))
+;
+
+py::class_<QJsonArray>(mod, "JsonArray")
+  .def(py::init<>([](py::list values) {
+    QJsonArray qJsonArray;
+    for(auto value : values) {
+      QJsonValue qJsonValue(py::cast<double>(value));
+      qJsonArray.push_back(qJsonValue);
+    }
+    return qJsonArray;
+  }))
+;
+
+py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList")
+  .def(py::init<>([](py::list values) {
+    QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
+    for(auto value : values) {
+      py::list valueAsList = py::cast<py::list>(value);
+      ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
+      datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
+      datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
+      datasetImportInfoList.push_back(datasetImportInfo);
+    }
+    return datasetImportInfoList;
+  }));
+
+py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8");
+py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8");
+
+py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16");
+py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16");
+
+py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32");
+py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32");
+
+py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64");
+py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64");
+
+py::bind_vector<std::vector<float>>(mod, "VectorFloat");
+py::bind_vector<std::vector<double>>(mod, "VectorDouble");
+
+if(py::detail::get_type_info(typeid(std::vector<size_t>)))
+{
+  mod.attr("VectorSizeT") = mod.attr("VectorUInt64");
+} 
+else 
+{
+  py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT");
+}
+
+py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
+  .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
+  .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
+  .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
+  .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
+  .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
+  .export_values()
+;
+
+py::enum_<SIMPL::DelimiterTypes::Type>(mod, "DelimiterTypes")
+  .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
+  .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
+  .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
+  .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
+  .value("Space", SIMPL::DelimiterTypes::Type::Space)
+;
+
+py::enum_<PhaseType::Type>(mod, "PhaseType")
+  .value("Primary", PhaseType::Type::Primary)
+  .value("Precipitate", PhaseType::Type::Precipitate)
+  .value("Transformation", PhaseType::Type::Transformation)
+  .value("Matrix", PhaseType::Type::Matrix)
+  .value("Boundary", PhaseType::Type::Boundary)
+  .value("Unknown", PhaseType::Type::Unknown)
+  .value("Any", PhaseType::Type::Any)
+;
+
+py::enum_<ShapeType::Type>(mod, "ShapeType")
+  .value("Ellipsoid", ShapeType::Type::Ellipsoid)
+  .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
+  .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
+  .value("CylinderA", ShapeType::Type::CylinderA)
+  .value("CylinderB", ShapeType::Type::CylinderB)
+  .value("CylinderC", ShapeType::Type::CylinderC)
+  .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
+  .value("Unknown", ShapeType::Type::Unknown)
+  .value("Any", ShapeType::Type::Any)
+;
+
+py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
+  .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
+  .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
+  .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
+  .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
+  .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
+  .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
+  .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
+  .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
+  .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
+  .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
+  .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
+  .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure)
+;
+
+py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
+  .value("Int8", SIMPL::ScalarTypes::Type::Int8)
+  .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
+  .value("Int16", SIMPL::ScalarTypes::Type::Int16)
+  .value("UInt16", SIMPL::ScalarTypes::Type::UInt16)
+  .value("Int32", SIMPL::ScalarTypes::Type::Int32)
+  .value("UInt32", SIMPL::ScalarTypes::Type::UInt32)
+  .value("Int64", SIMPL::ScalarTypes::Type::Int64)
+  .value("UInt64", SIMPL::ScalarTypes::Type::UInt64)
+  .value("Float", SIMPL::ScalarTypes::Type::Float)
+  .value("Double", SIMPL::ScalarTypes::Type::Double)
+  .value("Bool", SIMPL::ScalarTypes::Type::Bool)
+;
+
+py::enum_<CreateDataArray::InitializationChoices>(mod, "InitializationType")
+  .value("Manual", CreateDataArray::InitializationChoices::Manual)
+  .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
+  .export_values()
+;
+
+py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits")
+  .value("Radians", ArrayCalculator::AngleUnits::Radians)
+  .value("Degrees", ArrayCalculator::AngleUnits::Degrees)
+  .export_values()
+;
+
+py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
+  .value("Int8", SIMPL::NumericTypes::Type::Int8)
+  .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
+  .value("Int16", SIMPL::NumericTypes::Type::Int16)
+  .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
+  .value("Int32", SIMPL::NumericTypes::Type::Int32)
+  .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
+  .value("Int64", SIMPL::NumericTypes::Type::Int64)
+  .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
+  .value("Float", SIMPL::NumericTypes::Type::Float)
+  .value("Double", SIMPL::NumericTypes::Type::Double)
+  .value("Bool", SIMPL::NumericTypes::Type::Bool)
+  .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
+  .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType)
+;
+
+py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat")
+  .value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat)
+  .value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat)
+  .export_values()
+;
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
new file mode 100644
index 0000000000..1fd1038f78
--- /dev/null
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -0,0 +1,47 @@
+#include <memory>
+#include <typeinfo>
+#include <utility>
+
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+
+#include "pybind11/numpy.h"
+#include "pybind11/pybind11.h"
+#include "pybind11/stl_bind.h"
+#include "pybind11/stl.h"
+
+#include "SIMPLib/Common/PhaseType.h"
+#include "SIMPLib/Common/ShapeType.h"
+#include "SIMPLib/Utilities/PythonSupport.h"
+#include "SIMPLib/CoreFilters/ArrayCalculator.h"
+#include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
+#include "SIMPLib/FilterParameters/AxisAngleInput.h"
+#include "SIMPLib/FilterParameters/StackFileListInfo.h"
+#include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
+
+namespace py = pybind11;
+using namespace py::literals;
+
+PYBIND11_MAKE_OPAQUE(std::vector<int8_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<uint8_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<int16_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<uint16_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<int32_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<uint32_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<int64_t>);
+PYBIND11_MAKE_OPAQUE(std::vector<uint64_t>);
+
+PYBIND11_MAKE_OPAQUE(std::vector<float>);
+PYBIND11_MAKE_OPAQUE(std::vector<double>);
+
+/*
+ * Linux does not like the below line because unsigned long int and size_t are
+ * the same thing. Apple (clang) and Windows (MSVC) do not seem to have a problem
+ * with the line.
+ */
+#if defined(__APPLE__)
+PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
+#endif
+
+#include "Binding/Pybind11CustomTypeCasts.h"
+#include "Binding/pySupport.h"
diff --git a/Wrapping/Python/Binding/pySupport.h b/Wrapping/Python/Binding/pySupport.h
new file mode 100644
index 0000000000..b275a4c8e7
--- /dev/null
+++ b/Wrapping/Python/Binding/pySupport.h
@@ -0,0 +1,185 @@
+#pragma once
+
+#include "pybind11/pybind11.h"
+#include "pybind11/stl.h"
+#include "pybind11/numpy.h"
+
+#include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+template <class T>
+void registerDataArray(pybind11::module& mod, const char* name)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+  using DataArrayType = DataArray<T>;
+  py::class_<DataArrayType, IDataArray, std::shared_ptr<DataArrayType>>(mod, name, py::buffer_protocol())
+      .def(py::init([](size_t numElements, const QString& name, T initValue) { return std::make_shared<DataArrayType>(numElements, name, initValue); }))
+      .def(py::init([](size_t numElements, const std::vector<size_t>& cDims, const QString& name, T initValue) { return std::make_shared<DataArrayType>(numElements, name, cDims, initValue); }))
+      .def(py::init([](py::array_t<T, py::array::c_style> data, const QString& name, bool ownsData) {
+        py::buffer_info buf = data.request();
+        const std::vector<ssize_t>& shape = buf.shape;
+        ssize_t ndim = buf.ndim;
+        size_t numTuples = 0;
+        std::vector<size_t> cDims;
+        if(ndim == 0)
+        {
+          numTuples = 1;
+          cDims.push_back(1);
+        }
+        else if(ndim == 1)
+        {
+          numTuples = static_cast<size_t>(shape.front());
+          cDims.push_back(1);
+        }
+        else
+        {
+          numTuples = static_cast<size_t>(shape.front());
+          cDims.resize(ndim - 1);
+          for(ssize_t e = 0; e < ndim - 1; e++)
+          {
+            cDims[e] = static_cast<size_t>(shape[e + 1]);
+          }
+        }
+        return DataArrayType::WrapPointer(reinterpret_cast<T*>(data.mutable_data(0)), numTuples, cDims, name, ownsData);
+      }))
+      .def_property("name", &DataArrayType::getName, &DataArrayType::setName)
+      .def("__getitem__", [](const DataArrayType& dataArray, size_t i) { return dataArray.at(i); })
+      .def("__setitem__", [](DataArrayType& dataArray, size_t i, T value) { dataArray.at(i) = value; })
+      .def("__len__", &DataArrayType::size)
+      .def_property_readonly("size", &DataArrayType::size)
+      .def_property_readonly("cdims",
+                             [](const DataArrayType& dataArray) {
+                               std::vector<size_t> cDims = dataArray.getComponentDimensions();
+                               py::tuple dims(cDims.size());
+                               for(size_t i = 0; i < cDims.size(); i++)
+                               {
+                                 dims[i] = cDims[i];
+                               }
+                               return dims;
+                             })
+      .def_property_readonly("tuples", &DataArrayType::getNumberOfTuples)
+      .def(
+          "__iter__", [](const DataArrayType& dataArray) { return py::make_iterator(dataArray.begin(), dataArray.end()); }, py::keep_alive<0, 1>())
+      .def_buffer([](const DataArrayType& dataArray) -> py::buffer_info {
+        int nComp = dataArray.getNumberOfComponents();
+        size_t numTuples = dataArray.getNumberOfTuples();
+        ssize_t ndim = 0;
+        std::vector<ssize_t> shape;
+        std::vector<ssize_t> strides;
+        if(nComp == 1)
+        {
+          ndim = 1;
+          shape.push_back(numTuples);
+          strides.push_back(sizeof(T));
+        }
+        else
+        {
+          std::vector<size_t> cDims = dataArray.getComponentDimensions();
+          ndim = static_cast<ssize_t>(cDims.size()) + 1;
+          shape.resize(ndim);
+          shape[0] = numTuples;
+          for(ssize_t e = 0; e < ndim - 1; e++)
+          {
+            shape[e + 1] = static_cast<ssize_t>(cDims[e]);
+          }
+          ssize_t cur = 1;
+          std::vector<ssize_t> rshape(shape);
+          std::reverse(rshape.begin(), rshape.end());
+          for(auto val : rshape)
+          {
+            strides.push_back(cur * val * sizeof(T));
+            cur *= val;
+          }
+          strides.pop_back();
+          strides.insert(strides.begin(), sizeof(T));
+          std::reverse(strides.begin(), strides.end());
+        }
+        return py::buffer_info(dataArray.getPointer(0), sizeof(T), py::format_descriptor<T>::format(), ndim, shape, strides);
+      })
+      .def(
+          "npview", [](DataArrayType& dataArray) { return py::array_t<T, py::array::c_style>(dataArray.size(), dataArray.data(), py::cast(dataArray)); }, py::return_value_policy::reference_internal)
+      .def("__repr__", [](const DataArrayType& a) {
+        std::stringstream ss;
+        ss << "<'" << a.getFullNameOfClass().toStdString() << "  NAME=" << a.getName().toStdString() << ": TUPLES: " << a.getNumberOfTuples() << "  COMPONENTS: [";
+        std::vector<size_t> comps = a.getComponentDimensions();
+        bool first = true;
+        for(const auto& c : comps)
+        {
+          if(!first)
+          {
+            ss << ",";
+          }
+          ss << c;
+          first = false;
+        }
+        ss << "]'>";
+        return ss.str();
+      });
+}
+
+template <class T, unsigned int Dim_>
+struct IVecType
+{
+  using Type = SIMPLArray<T, Dim_>;
+};
+
+template <class T>
+struct IVecType<T, 2>
+{
+  using Type = IVec2<T>;
+};
+
+template <class T>
+struct IVecType<T, 3>
+{
+  using Type = IVec3<T>;
+};
+
+template <class T>
+struct IVecType<T, 4>
+{
+  using Type = IVec4<T>;
+};
+
+template <class T>
+struct IVecType<T, 6>
+{
+  using Type = IVec6<T>;
+};
+
+template <class T, unsigned int Dim_>
+void registerSIMPLArray(pybind11::module& mod, const char* name)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+  using array_t = typename IVecType<T, Dim_>::Type;
+  py::class_<array_t>(mod, name)
+      .def(py::init<>([](py::list values) {
+        array_t vec;
+        for(size_t i = 0; i < vec.size(); i++)
+        {
+          vec[i] = py::cast<T>(values[i]);
+        }
+        return vec;
+      }))
+      .def("__repr__",
+           [](const array_t& input) {
+             py::list output;
+             for(auto value : input)
+             {
+               output.append(value);
+             }
+             return py::str(output);
+           })
+      .def("__str__",
+           [](const array_t& input) {
+             py::list output;
+             for(auto value : input)
+             {
+               output.append(value);
+             }
+             return py::str(output);
+           })
+      .def("__getitem__", [](const array_t& values, size_t index) { return values.at(index); });
+}
diff --git a/Wrapping/Python/SIMPL/simpl_helpers.py b/Wrapping/Python/SIMPL/simpl_helpers.py
index 3110aa5155..1584d662d6 100644
--- a/Wrapping/Python/SIMPL/simpl_helpers.py
+++ b/Wrapping/Python/SIMPL/simpl_helpers.py
@@ -1,16 +1,11 @@
+import simpl
+import simplpy as d3d
 
-from dream3d import simpl
-from dream3d import simplpy as d3d
-#from dream3d import syntheticbuildingpy as synthetic_building
-from enum import IntEnum
+import numpy as np
 
-try:
-    import numpy as np
-except ImportError:
-    raise RuntimeError("This module depends on the numpy module. Please make\
-sure that it is installed properly.")
+from enum import IntEnum
 
-def ReadDREAM3DFile(data_container_array, input_file ):
+def ReadDREAM3DFile(data_container_array, input_file):
     '''
     Executes the filter DataContainerReader and returns the error. This will read the entire
     file into memory.
@@ -36,72 +31,69 @@ def ReadDREAM3DFile(data_container_array, input_file ):
     return executeError
 
 def CreateDataContainerArray():
-    """
+    '''
     Creates a Top level Data Container Array object. Everything will get packed in this
-    """
+    '''
     dca = simpl.DataContainerArray.New()
     return dca
 
 def CreateDataContainer(name):
-    """
+    '''
     Creates a DataContainer object
 
     Keyword arguments:
     name -- The name of the DataContainer    
-    """
+    '''
     dc = simpl.DataContainer(name)
     return dc
 
-
 def CreateAttributeMatrix(dims, name, type):
-    """
+    '''
     Creates an AttriuteMatrix of the given type
 
     Keyword arguments:
     dims -- the dimensions of the AttributeMatrix
     name -- The name of the AttributeMatrix
     type -- the type of the AttributeMatrix
-    """
+    '''
     am = simpl.AttributeMatrix.New(dims, name, type)
     return am
 
-
 def WriteDREAM3DFile(path, dca, verbose=False):
-    """
+    '''
     Writes a dream3d file and returns the error code
 
     Keyword arguments:
     path -- The output path of the file.
     dca -- The DataContainerArray to write
-    """
+    '''
     # Lets write out the whole Heirarchy to a .dream3d file
     if verbose:
-        print("Creating DREAM3D Writer filter....")
+        print('Creating DREAM3D Writer filter....')
     writer = simpl.DataContainerWriter.New()
     writer.OutputFile = (path)
     if verbose:
-        print("Writing to file:", path)
+        print('Writing to file:', path)
     writer.setDataContainerArray(dca)
     writer.execute()
     if(writer.ErrorCode != 0):
-        print("Error %d writing DREAM.3D File to path %s" % writer.ErrorCode, path)
+        print('Error %d writing DREAM.3D File to path %s' % writer.ErrorCode, path)
     return writer.ErrorCode
 
-
 def CreateDataArray(name, shape, cDims, type):
-    """
-    Creates a data array with the attributes listed. The array will be a numpy array in "C" ordering.
+    '''
+    Creates a data array with the attributes listed. The array will be a numpy array in 'C' ordering.
 
     Keyword arguments:
     name -- The name of the DataArray
     shape -- The dimensions of the DataArray. Note that the array will be flattened into a contiguous array
     cDims -- The component dimensions, i.e., the number of components at each tuple.
     type -- The numpy type of array to create: 8,16,32,64 signed/unsiged and 32/64 floats are supported
-    """
+    '''
     # Create a numpy array of ones to hold our data
     ashape = np.append([np.prod(shape)], cDims)
     # Create a numpy array to hold our data
-    num_array = np.ndarray(ashape, dtype=type, order="C")
+    num_array = np.ndarray(ashape, dtype=type, order='C')
     # Get the numpy array as contiguous
     z = np.asarray(num_array)
     if not z.flags.contiguous:
@@ -109,47 +101,47 @@ def CreateDataArray(name, shape, cDims, type):
     z.fill(0)
     assert z.flags.contiguous, 'Only contiguous arrays are supported.'
     assert not np.issubdtype(z.dtype, np.complex128), \
-            "Complex numpy arrays cannot be converted to vtk arrays."\
-            "Use real() or imag() to get a component of the array before"\
-            " passing it to vtk."
+            'Complex numpy arrays cannot be converted to vtk arrays.'\
+            'Use real() or imag() to get a component of the array before'\
+            ' passing it to vtk.'
     
     # Declare the number of components for the array
     if type == np.int8:
-        array = simpl.Int8ArrayType(z, name, False)
+        array = simpl.Int8Array(z, name, False)
     elif type == np.uint8:
-        array = simpl.UInt8ArrayType(z, name, False)
+        array = simpl.UInt8Array(z, name, False)
     elif type == np.int16:
-        array = simpl.Int16ArrayType(z, name, False)
+        array = simpl.Int16Array(z, name, False)
     elif type == np.uint16:
-        array = simpl.UInt16ArrayType(z, name, False)
+        array = simpl.UInt16Array(z, name, False)
     elif type == np.int32:
-        array = simpl.Int32ArrayType(z, name, False)
+        array = simpl.Int32Array(z, name, False)
     elif type == np.uint32:
-        array = simpl.UInt32ArrayType(z, name, False)
+        array = simpl.UInt32Array(z, name, False)
     elif type == np.int64:
-        array = simpl.Int64ArrayType(z, name, False)
+        array = simpl.Int64Array(z, name, False)
     elif type == np.uint64:
-        array = simpl.UInt64ArrayType(z, name, False)
+        array = simpl.UInt64Array(z, name, False)
     elif type == np.float32:
-        array = simpl.FloatArrayType(z, name, False)
+        array = simpl.FloatArray(z, name, False)
     elif type == np.double:
-        array = simpl.DoubleArrayType(z, name, False)     
+        array = simpl.DoubleArray(z, name, False)     
     
     # we need to return the 'z' numpy array so it does not go out of scope.
     return (z, array)
 
 def CreateDataContainerProxy(dca, data_array_paths):
-    """
+    '''
     Create a DataContainerProxy
     \ndca: Data Container Array
-    \ndata_array_paths: list of DataArrayPaths (or list/tuple equivalent) to be "checked"
-    """
+    \ndata_array_paths: list of DataArrayPaths (or list/tuple equivalent) to be 'checked'
+    '''
     dcap = simpl.DataContainerArrayProxy()
-    checked = 2 # The flag for "checking" an item
+    checked = 2 # The flag for 'checking' an item
     for data_array_path in data_array_paths:
-        data_container_name = ""
-        attr_matrix_name = ""
-        data_array_name = ""
+        data_container_name = ''
+        attr_matrix_name = ''
+        data_array_name = ''
         if isinstance(data_array_path, (list, tuple)):
             data_container_name = data_array_path[0]
             attr_matrix_name = data_array_path[1]
@@ -158,25 +150,24 @@ def CreateDataContainerProxy(dca, data_array_paths):
             data_container_name = data_array_path.DataContainerName
             attr_matrix_name = data_array_path.AttributeMatrixName
             data_array_name = data_array_path.DataArrayName
-        if data_container_name == "":
+        if data_container_name == '':
             continue
-        elif attr_matrix_name == "":
+        elif attr_matrix_name == '':
             dcap.getDataContainerProxy(data_container_name).Flag =checked
-        elif data_array_name == "":
+        elif data_array_name == '':
             dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name).Flag =checked
         else:
             dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name) \
             .getDataArrayProxy(data_array_name).Flag =checked
     return dcap
 
-
-def CreateGeometry(data_container_array, array_handling, geometry_type, data_container_name, treat_warnings_as_errors, dimensions = simpl.IntVec3Type([0,0,0]),
-origin = simpl.FloatVec3Type([0,0,0]), spacing = simpl.FloatVec3Type([0,0,0]), cell_attribute_matrix_name="", x_bounds_array_path = simpl.DataArrayPath("", "", ""),
-y_bounds_array_path = simpl.DataArrayPath("", "", ""), z_bounds_array_path = simpl.DataArrayPath("", "", ""), 
-shared_vertex_list_array_path = simpl.DataArrayPath("", "", ""), vertex_attribute_matrix_name = "", shared_edge_list_array_path = simpl.DataArrayPath("", "", ""),
-edge_attribute_matrix_name = "", shared_tri_list_array_path = simpl.DataArrayPath("", "", ""), face_attribute_matrix_name="",
-shared_quad_list_array_path = simpl.DataArrayPath("", "", ""), shared_tet_list_array_path = simpl.DataArrayPath("", "", "")):
-    """
+def CreateGeometry(data_container_array, array_handling, geometry_type, data_container_name, treat_warnings_as_errors, dimensions = simpl.IntVec3([0,0,0]),
+origin = simpl.FloatVec3([0,0,0]), spacing = simpl.FloatVec3([0,0,0]), cell_attribute_matrix_name='', x_bounds_array_path = simpl.DataArrayPath('', '', ''),
+y_bounds_array_path = simpl.DataArrayPath('', '', ''), z_bounds_array_path = simpl.DataArrayPath('', '', ''), 
+shared_vertex_list_array_path = simpl.DataArrayPath('', '', ''), vertex_attribute_matrix_name = '', shared_edge_list_array_path = simpl.DataArrayPath('', '', ''),
+edge_attribute_matrix_name = '', shared_tri_list_array_path = simpl.DataArrayPath('', '', ''), face_attribute_matrix_name='',
+shared_quad_list_array_path = simpl.DataArrayPath('', '', ''), shared_tet_list_array_path = simpl.DataArrayPath('', '', '')):
+    '''
     Create Geometry
 
     Required inputs: 
@@ -221,21 +212,21 @@ def CreateGeometry(data_container_array, array_handling, geometry_type, data_con
         * Vertex Attribute Matrix Name
         * Cell Attribute Matrix Name
 
-    """
+    '''
 
     # For all geometry types
     create_geometry = simpl.CreateGeometry.New()
     create_geometry.setDataContainerArray(data_container_array)
-    create_geometry.DataContainerName = simpl.DataArrayPath(data_container_name, "", "")
+    create_geometry.DataContainerName = simpl.DataArrayPath(data_container_name, '', '')
     create_geometry.GeometryType = geometry_type
     create_geometry.TreatWarningsAsErrors = treat_warnings_as_errors
 
     # Array Handling
     if not type(array_handling) == ArrayHandling and is_number(array_handling):
         create_geometry.ArrayHandling = array_handling
-    elif array_handling == ArrayHandling.CopyArrays or "copy" in array_handling.toLowerCase():
+    elif array_handling == ArrayHandling.CopyArrays or 'copy' in array_handling.toLowerCase():
         create_geometry.ArrayHandling = 0
-    elif  array_handling == ArrayHandling.MoveArrays or "move" in array_handling.toLowerCase():
+    elif  array_handling == ArrayHandling.MoveArrays or 'move' in array_handling.toLowerCase():
         create_geometry.ArrayHandling = 1        
 
 	# Set required parameters based on Geometry Type
@@ -278,10 +269,9 @@ def CreateGeometry(data_container_array, array_handling, geometry_type, data_con
     executeError = create_geometry.ErrorCode
     return executeError
 
-
 def CreateAsciiWizardData(input_file_path, begin_index, number_of_lines, delimiters, consecutive_delimiters,
 automatic_AM, selected_path, headers, attribute_matrix_type, tuple_dimensions, data_types):
-    """
+    '''
     Creates an ASCII Wizard Data object for use in the ReadASCIIData filter
     \ninput_file_path: a string containing the path to the input file
     \nbegin_index: an integer for the line number to start reading in the file
@@ -290,34 +280,33 @@ def CreateAsciiWizardData(input_file_path, begin_index, number_of_lines, delimit
     \nconsecutive_delimiters: a boolean for whether to treat consecutive delimiters as one
     \nautomatic_AM: a boolean for whether to create a new attribute matrix
     \nselected_path: a DataArrayPath object for the input data
-    \nheaders: a list of strings containing header names (ie. ["x", "y", "z"])
+    \nheaders: a list of strings containing header names (ie. ['x', 'y', 'z'])
     \nattribute_matrix_type: either an AttributeMatrix.Type object or the integer equivalent
     \ntuple_dimensions: a list of integers for the dimensions of each tuple
-    \ndata_types: a list of strings for the data types (ie. ["float", "float", "float"])
-    """
+    \ndata_types: a list of strings for the data types (ie. ['float', 'float', 'float'])
+    '''
     wizardData = {
-    "inputFilePath": input_file_path,
-    "beginIndex": begin_index,
-    "numberOfLines": number_of_lines,
-    "delimiters": delimiters,    
-    "consecutiveDelimiters": consecutive_delimiters,
-    "automaticAM": automatic_AM,
-    "selectedPath": selected_path,
-    "headers": headers,
-    "attrMatType": attribute_matrix_type,
-    "tupleDimensions": tuple_dimensions,
-    "dataTypes": data_types
+    'inputFilePath': input_file_path,
+    'beginIndex': begin_index,
+    'numberOfLines': number_of_lines,
+    'delimiters': delimiters,    
+    'consecutiveDelimiters': consecutive_delimiters,
+    'automaticAM': automatic_AM,
+    'selectedPath': selected_path,
+    'headers': headers,
+    'attrMatType': attribute_matrix_type,
+    'tupleDimensions': tuple_dimensions,
+    'dataTypes': data_types
     }
     return wizardData
 
-
 def CreateDynamicTableData(data, columnheaders = [], rowheaders = []):
-    """
+    '''
     Creates a DynamicTableData object for use in creation of attribute matrices
     \ndata: a list of lists of integer values for the tuple dimensions of the attribute matrix
     \ncolumnheaders: a list of the column headers for the data (optional)
     \nrowheaders: a list of the row headers for the data (optional)
-    """
+    '''
     if not columnheaders:
         cols = len(data[0])
         for i in range(cols):
@@ -341,18 +330,17 @@ def CreateDynamicTableData(data, columnheaders = [], rowheaders = []):
         dtd = simpl.DynamicTableData(tabledata, columnheaders, rowheaders)        
         return dtd
 
-    
 def RemoveArray(dca, path):
-    """
+    '''
     Removes the array given by 'path'
     \ndca: Data Container Array containing the array to be removed
     \npath: Either a DataArrayPath object or a list of 3 strings (data container, attribute matrix name, array name)
     \nReturns a boolean variable of True if successful, False otherwise
-    """
+    '''
     # Validate path object and get names of path elements
-    datacontainername = ""
-    attrmatrixname = ""
-    dataarrayname = ""
+    datacontainername = ''
+    attrmatrixname = ''
+    dataarrayname = ''
     if isinstance(path, simpl.DataArrayPath):
         datacontainername = path.DataContainerName
         attrmatrixname = path.AttributeMatrixName
@@ -364,16 +352,16 @@ def RemoveArray(dca, path):
         attrmatrixname = path[1]
         dataarrayname = path[2]
     else:
-        print("Invalid path object")
+        print('Invalid path object')
         return False
     
     # Construct Data Container Array Proxy
     dcap = simpl.DataContainerArrayProxy()
-    if datacontainername == "":
+    if datacontainername == '':
         return False
-    elif attrmatrixname == "" and dataarrayname == "":
+    elif attrmatrixname == '' and dataarrayname == '':
         dcap.getDataContainerProxy(datacontainername).Flag =2
-    elif dataarrayname == "":
+    elif dataarrayname == '':
         dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).Flag =2
     else:
         dcap.getDataContainerProxy(datacontainername).Flag =0
@@ -382,19 +370,18 @@ def RemoveArray(dca, path):
 
     err = d3d.remove_arrays(dca, dcap)
     if err < 0:
-        print("Error condition for Remove Arrays: %d" % err)
+        print('Error condition for Remove Arrays: %d' % err)
         return False
     else:      
         return True
 
-
 def RemoveArrays(dca, paths):
-    """
+    '''
     Remove the list of data array paths
     \ndca: Data Container Array containing the arrays to be removed
     \npaths: List of either DataArrayPath objects or of lists of 3 strings (data container, attribute matrix name, array name)
     \nReturns a boolean variable of True if successful, False otherwise
-    """
+    '''
     success = True
 
     for path in paths:
@@ -404,22 +391,22 @@ def RemoveArrays(dca, paths):
     return success
 
 def MultiThresholdObjects(dca, destination_array_name, selected_thresholds):
-    """
+    '''
     Create and run a Multi Threshold Objects filter
     \ndca: Data Container Array containing the arrays
     \ndestination_array_name: The name of the destination array for storing the results
     \nselected_thresholds: A list of tuples containing the Data Container Name, Attribute Matrix Name, Data Array Name,  a Comparison Operator, and a Comparison Value
-    \n The comparison operator choices are ["<", ">", "=", "!="] (or their index in this list)
+    \n The comparison operator choices are ['<', '>', '=', '!='] (or their index in this list)
     \n The comparison value is an double floating point number to compare the values with. 
-    """
-    comparison_operators = ["<", ">", "=", "!="]
+    '''
+    comparison_operators = ['<', '>', '=', '!=']
     if len(selected_thresholds) == 0:
-        print("Insufficient data passed")
+        print('Insufficient data passed')
         return
     thresholds = simpl.ComparisonInputs()
     for selected_threshold in selected_thresholds:
         if len(selected_threshold) < 5:
-            print("Selected threshold has insufficient data")
+            print('Selected threshold has insufficient data')
             continue
         datacontainername = selected_threshold[0]
         attrmatrixname = selected_threshold[1]
@@ -428,42 +415,41 @@ def MultiThresholdObjects(dca, destination_array_name, selected_thresholds):
         if not is_number(comparison_operator):
             comparison_operator = comparison_operators.index(selected_threshold[3])
             if comparison_operator < 0:
-                print("Invalid comparison operator passed in selected threshold")
+                print('Invalid comparison operator passed in selected threshold')
                 continue
         elif comparison_operator < 0 or comparison_operator > (len(comparison_operators) - 1):
-            print("Invalid comparison operator passed in selected threshold")
+            print('Invalid comparison operator passed in selected threshold')
             continue
         comparison_value = selected_threshold[4]
         if not is_number(comparison_value):
-            print("Non-numerical value passed for comparison value")
+            print('Non-numerical value passed for comparison value')
         thresholds.addInput(datacontainername, attrmatrixname, dataarrayname, comparison_operator, comparison_value)
     
     err = d3d.multi_threshold_objects(dca, destination_array_name, thresholds)
     return err
 
-
 def MultiThresholdObjects2(dca, source_path, destination_array_name, selected_thresholds):
-    """
+    '''
     Create and run a Multi Threshold Objects filter
     \ndca: Data Container Array containing the arrays
     \nsource_path: Data Array Path or tuple/list of 3 strings representing a Data Array Path
     \ndestination_array_name: The name of the destination array for storing the results
     \nselected_thresholds: A list of Comparison Sets that has a DataContainerName, AttributeMatrixName, and a Union Operator (AND, OR)
     \nA list of tuples containing the AttributeArrayName, a CompOperator, and a CompValue
-    \nThe comparison operator choices are ["<", ">", "=", "!="] (or their index in this list)
+    \nThe comparison operator choices are ['<', '>', '=', '!='] (or their index in this list)
     \nThe comparison value is an double floating point number to compare the values with. 
     \nNOTE: Comparison Sets can contain Comparison Sets or Values but Comparison Values cannot contain either
     \n Place the UnionOperator in front of the Comparison Values in a a Comparison Set
     \n Comparison Sets should be lists in [] form and Comparison Values should be tuples in () form
     \nExample:
-    \n["AND", (CV1), (CV2), ["OR", (CV3, (CV4)]] ==> CV1 && CV2 && (CV3 OR CV4)
-    """
+    \n['AND', (CV1), (CV2), ['OR', (CV3, (CV4)]] ==> CV1 && CV2 && (CV3 OR CV4)
+    '''
     thresholds = simpl.ComparisonInputsAdvanced()
     topLevelComparisonSet = simpl.ComparisonSet()
     for selected_threshold in selected_thresholds:
-        if selected_threshold == "AND":
+        if selected_threshold == 'AND':
             topLevelComparisonSet.UnionOperator = 0
-        elif selected_threshold == "OR":
+        elif selected_threshold == 'OR':
             topLevelComparisonSet.UnionOperator = 1
         if isinstance(selected_threshold, tuple):
             comparisonValue = simpl.ComparisonValue()
@@ -482,25 +468,24 @@ def MultiThresholdObjects2(dca, source_path, destination_array_name, selected_th
         thresholds.DataContainerName = source_path.DataContainerName
         thresholds.AttributeMatrixName = source_path.AttributeMatrixName
     else:
-        print("Invalid source path")
+        print('Invalid source path')
         return -1        
     
     err = d3d.multi_threshold_objects2(dca, destination_array_name, thresholds)
     if err < 0:
-        print("MultiThresholdObjects ErrorCode: %d" % err)
+        print('MultiThresholdObjects ErrorCode: %d' % err)
     return err
 
-
 def BuildSelectedThresholds(selected_threshold):
-    """
+    '''
     Recursive function to build a Comparison Set
     \nselected_threshold: A nested Comparison Set to be built
-    """
+    '''
     # AND = 0 / OR = 1
     newComparisonSet = simpl.ComparisonSet()
-    if selected_threshold[0] == "AND":
+    if selected_threshold[0] == 'AND':
         newComparisonSet.UnionOperator = 0
-    elif selected_threshold[0] == "OR":
+    elif selected_threshold[0] == 'OR':
         newComparisonSet.UnionOperator = 1
     for element in selected_threshold:
         if isinstance(element, tuple):
@@ -514,78 +499,76 @@ def BuildSelectedThresholds(selected_threshold):
             newComparisonSet.addComparison(comparisonSet) 
     return newComparisonSet
 
-
 def MoveData(dca, what_to_move, source_path, destination_path):
-    """
+    '''
     Move the data from source to destination
     \ndca: Data Container Array containing project data
-    \nwhat_to_move: Either "Attribute Matrix" or "Data Array" (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
+    \nwhat_to_move: Either 'Attribute Matrix' or 'Data Array' (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
     \nsource_path: The full Data Array Path to the object being moved (or a list/tuple of strings)
     \ndestination: The full Data Array Path where the object is moved to (or a list/tuple of strings)
-    """
+    '''
     what_to_move_number = 0
     if not isinstance(what_to_move, (simpl.AttributeMatrix, simpl.IDataArray)):
-        if what_to_move == "Data Array" or what_to_move == "Attribute Array" or what_to_move == WhatToMove.AttributeArray:
+        if what_to_move == 'Data Array' or what_to_move == 'Attribute Array' or what_to_move == WhatToMove.AttributeArray:
             what_to_move_number = 1
-        elif what_to_move != "Attribute Matrix" and what_to_move != WhatToMove.AttributeMatrix:
-            print("Invalid type for 'what to move'")
+        elif what_to_move != 'Attribute Matrix' and what_to_move != WhatToMove.AttributeMatrix:
+            print('Invalid type for \'what to move\'')
             return -1
     if not isinstance(source_path, (simpl.DataArrayPath, list, tuple)):
-        print("Invalid source path")
+        print('Invalid source path')
         return -1
     if not isinstance(destination_path, (simpl.DataArrayPath, list, tuple)):
-        print("Invalid destination path")
+        print('Invalid destination path')
         return -1
     
-    destination_datacontainername = ""
+    destination_datacontainername = ''
     if isinstance(destination_path, simpl.DataArrayPath):
         destination_datacontainername = destination_path.DataContainerName
     else:
         destination_datacontainername = destination_path[0]
-    destination_attrmatrixname = ""
+    destination_attrmatrixname = ''
     if isinstance(destination_path, simpl.DataArrayPath):
         destination_attrmatrixname = destination_path.AttributeMatrixName
     else:
         destination_attrmatrixname = destination_path[1]
-    destination_dataarrayname = ""
+    destination_dataarrayname = ''
     if isinstance(destination_path, simpl.DataArrayPath):
         destination_dataarrayname = destination_path.DataArrayName
     else:
         destination_dataarrayname = destination_path[2]
     
-    source_datacontainername = ""
+    source_datacontainername = ''
     if isinstance(source_path, simpl.DataArrayPath):
         source_datacontainername = source_path.DataContainerName
     else:
         source_datacontainername = source_path[0]
-    source_attrmatrixname = ""
+    source_attrmatrixname = ''
     if isinstance(source_path, simpl.DataArrayPath):
         source_attrmatrixname = source_path.AttributeMatrixName
     else:
         source_attrmatrixname = source_path[1]
-    source_dataarrayname = ""
+    source_dataarrayname = ''
     if isinstance(source_path, simpl.DataArrayPath):
         source_dataarrayname = source_path.DataArrayName
     else:
         source_dataarrayname = source_path[2]
 
-    err = d3d.move_data(dca, what_to_move_number, destination_datacontainername, simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, ""),
-    simpl.DataArrayPath(destination_datacontainername, destination_attrmatrixname, ""), simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, source_dataarrayname))
+    err = d3d.move_data(dca, what_to_move_number, destination_datacontainername, simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, ''),
+    simpl.DataArrayPath(destination_datacontainername, destination_attrmatrixname, ''), simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, source_dataarrayname))
     if err < 0:
-        print("MoveData ErrorCode %d: " % err)
+        print('MoveData ErrorCode %d: ' % err)
     return err
-    
 
 def MoveMultiData(dca, what_to_move, source_paths, destination_path):
-    """
+    '''
     Moves multiple data arrays or attribute matrices to the destination path
     \ndca: Data Container Array with the data in it
-    \nwhat_to_move: Either "Attribute Matrix" or "Data Array" (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
+    \nwhat_to_move: Either 'Attribute Matrix' or 'Data Array' (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
     \nsource_paths: A list of full Data Array Paths to the objects being moved (or a list of list/tuple of strings)
     \ndestination: The full Data Array Path where the object is moved to (or a list/tuple of strings)
-    """
+    '''
     if len(source_paths) < 1:
-        print("Invalid or insufficient source paths")
+        print('Invalid or insufficient source paths')
         return -1
     err = 0
     for source_path in source_paths:
@@ -608,66 +591,54 @@ def is_number(s):
  
     return False
 
-
 # Custom enumerations for Python
 
 class ArrayHandling(IntEnum):
     CopyArrays = 0
     MoveArrays = 1
 
-
 class FeatureGeneration(IntEnum):
     GenerateFeatures = 0
     AlreadyHaveFeatures = 1
 
-
 class SaveShapeDescArrays(IntEnum):
     DoNotSave = 0
     SaveToNewAttrMatrix = 1
     AppendToExistingAttrMatrix = 2
 
-
 class Delimiter(IntEnum):
     COMMA = 0
     SEMICOLON = 1
     COLON = 2
     TAB = 3
 
-
 class Hemisphere(IntEnum):
     Northern = 0
     Southern = 1
 
-
 class WhatToMove(IntEnum):
     AttributeMatrix = 0
     AttributeArray = 1
 
-
 class AngleRepresentation(IntEnum):
     Radians = 0
     Degrees = 1
     Invalid = 2
 
-
 class BadDataOperation(IntEnum):
     Dilate = 0
     Erode = 1
 
-
 class ReferenceOrientation(IntEnum):
     AverageOrientation = 0
     OrientationAtFeatureCentroid = 1
 
-
 class DistributionFitType(IntEnum):
     Beta = 0
     Lognormal = 1
     Power = 2
 
-	
 class ObjectToCopy(IntEnum):
     DataContainer = 0
     AttributeMatrix = 1
     AttributeArray = 2
-	
\ No newline at end of file
diff --git a/Wrapping/Python/SIMPL/simpl_test_dirs.in.py b/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
index d03e5efff2..a0107f7e55 100644
--- a/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
+++ b/Wrapping/Python/SIMPL/simpl_test_dirs.in.py
@@ -1,16 +1,13 @@
-
-
-""" module to get build specific directories  """
+''' module to get build specific directories '''
 
 def GetBuildDirectory():
-  return "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
+  return '${CMAKE_LIBRARY_OUTPUT_DIRECTORY}'
 
 def GetTestDirectory():
-  return "${SIMPLProj_BINARY_DIR}/Testing"
+  return '${SIMPLProj_BINARY_DIR}/Testing'
 
 def GetTestTempDirectory():
-  return "${SIMPLProj_BINARY_DIR}/Testing/Temporary"
+  return '${SIMPLProj_BINARY_DIR}/Testing/Temporary'
 
 def GetDataDirectory():
-  return "${DREAM3D_DATA_DIR}"
-
+  return '${DREAM3D_DATA_DIR}'
diff --git a/Wrapping/Python/Testing/AbstractFilterTest.py b/Wrapping/Python/Testing/AbstractFilterTest.py
index 6762936572..6209f2afee 100644
--- a/Wrapping/Python/Testing/AbstractFilterTest.py
+++ b/Wrapping/Python/Testing/AbstractFilterTest.py
@@ -1,50 +1,28 @@
-""" This is a basic test for AbstractFilter """
-
-import time
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
 
 def BasicTest():
-    """
-    This will test the basic AbstractFilter methods
-    """
-    filter = simpl.EmptyFilter.New()
+    filter = simpl.EmptyFilter()
 
-    groupName = filter.GroupName
-    assert groupName == "Core"
+    assert filter.GroupName == 'Core'
 
-    subGroupName = filter.SubGroupName
-    assert subGroupName == "Misc"
+    assert filter.SubGroupName == 'Misc'
 
-    humanLabel = filter.HumanLabel
-    assert humanLabel == "Unknown Filter: "
+    assert filter.HumanLabel == 'Unknown Filter: '
 
-    filterVersion = filter.FilterVersion
-    assert filterVersion != "0.0.0"
+    assert filter.FilterVersion != '0.0.0'
 
-    compiledLibraryName = filter.CompiledLibraryName
-    assert compiledLibraryName == "Core"
+    assert filter.CompiledLibraryName == 'Core'
 
     filter.Cancel = False
-    b = filter.Cancel
-    assert b is False
+    assert not filter.Cancel
 
     filter.Enabled = True
-    b = filter.Enabled
-    assert b is True
-
-    filter.setErrorCondition(-1000, "Foo")
-    e = filter.ErrorCode
-    assert e == -1000
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-    print("AbstractFilter Test Starting")
+    assert filter.Enabled
+
+    filter.setErrorCondition(-1000, 'Foo')
+    assert filter.ErrorCode == -1000
+
+if __name__ == '__main__':
+    print('AbstractFilter Test Starting')
     BasicTest()
-    print("AbstractFilter Test Complete")
+    print('AbstractFilter Test Complete')
diff --git a/Wrapping/Python/Testing/Array_Calculator_Test.py b/Wrapping/Python/Testing/Array_Calculator_Test.py
index 3c45519239..8cf7689d29 100644
--- a/Wrapping/Python/Testing/Array_Calculator_Test.py
+++ b/Wrapping/Python/Testing/Array_Calculator_Test.py
@@ -1,49 +1,42 @@
 # Pipeline : 
 # This pipeline is designed to test the Attribute Array Calculator filter
-#
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
 
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def array_calculator_test():
     # Create Data Container Array using simpl directly
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container using the pythonic version
-    err = simplpy.create_data_container(dca, "ImageDataContainer")
+    err = simplpy.create_data_container(dca, 'ImageDataContainer')
     assert err == 0
 
     # Create an Attribute Matrix
     amDims = [[4, 5, 6]]
     tableData = sc.CreateDynamicTableData(amDims)
-    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
-    
+
     # Add a data array to the Attribute Matrix by using a Filter
-    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
-    inputRange = (0,0)
-    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data')
+    inputRange = (0, 0)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, '37', inputRange)
     assert err == 0
-    
+
     # Test: Attribute Array Calculator
-    err = simplpy.array_calculator(dca, simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", ""), 
-                                   "Int32Data*3.1415927*100", simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Output"),
+    err = simplpy.array_calculator(dca, simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', ''), 
+                                   'Int32Data*3.1415927*100', simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Output'),
                                    simpl.AngleUnits.Radians, simpl.ScalarTypes.UInt32)
     assert err == 0
 
-
     # Write to DREAM3D file
     err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Data/Output/CoreFilterTests/ArrayCalculatorTest.dream3d", dca)
+                              + '/Data/Output/CoreFilterTests/ArrayCalculatorTest.dream3d', dca)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     array_calculator_test()
diff --git a/Wrapping/Python/Testing/AttributeMatrixTest.py b/Wrapping/Python/Testing/AttributeMatrixTest.py
index 72dc8b2ed6..5e366f79e6 100644
--- a/Wrapping/Python/Testing/AttributeMatrixTest.py
+++ b/Wrapping/Python/Testing/AttributeMatrixTest.py
@@ -1,28 +1,21 @@
-
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def AttributeMatrixTest():
     # Create an AttributeMatrix
     amType = simpl.AttributeMatrix.Type.Cell
     tupleDims = simpl.VectorSizeT([5,4,3])
-    amName = "CellAttributeMatrix"
+    amName = 'CellAttributeMatrix'
     am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
-    print("Name: %s" % am.Name)
+    print('Name: %s' % am.Name)
 
-    arrayExist = am.doesAttributeArrayExist("Test Data Array")
+    arrayExist = am.doesAttributeArrayExist('Test Data Array')
     assert arrayExist is False
-    print("arrayExist: %s" % arrayExist)
-
+    print('arrayExist: %s' % arrayExist)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     AttributeMatrixTest()
-    print("AttributeMatrixTest Test Complete")
+    print('AttributeMatrixTest Test Complete')
diff --git a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
index 678be58bc8..16c8e3ce3b 100644
--- a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
+++ b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
@@ -2,45 +2,39 @@
 Creates a Int32 array and then converts it to UInt8
 '''
 
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
+import datetime
 
 def convert_data_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container
-    dc = sc.CreateDataContainer("ImageDataContainer")
+    dc = sc.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
  
     shape = simpl.VectorSizeT([4, 5, 2])
-    cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
+    cellAm = sc.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)   
     
-    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
+    dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data')
     inputRange = (0,0)
-    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, '37', inputRange)
     assert err == 0
 
-
     # Test: Convert AttributeArray Data Type
-    err = simplpy.convert_data(dca, simpl.NumericTypes.UInt8, "uint8",
-                               simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data"))
+    err = simplpy.convert_data(dca, simpl.NumericTypes.UInt8, 'uint8',
+                               simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data'))
     assert err == 0
 
     # Write to DREAM3D file
     err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Data/Output/CoreFilterTests/ConvertAttributeArrayDataType.dream3d", dca)
+                              + '/Data/Output/CoreFilterTests/ConvertAttributeArrayDataType.dream3d', dca)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     convert_data_test()
diff --git a/Wrapping/Python/Testing/Copy_Object_Test.py b/Wrapping/Python/Testing/Copy_Object_Test.py
index 5a6a8caa33..c108dcc306 100644
--- a/Wrapping/Python/Testing/Copy_Object_Test.py
+++ b/Wrapping/Python/Testing/Copy_Object_Test.py
@@ -1,52 +1,47 @@
 # Pipeline : 
 # This pipeline is designed to test the Copy Object filter
-#
 
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def copy_object_test():
     # Create Data Container Array using simpl directly
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container using the pythonic version
-    err = simplpy.create_data_container(dca, "ImageDataContainer")
+    err = simplpy.create_data_container(dca, 'ImageDataContainer')
     assert err == 0
 
     # Create an Attribute Matrix
     amDims = [[4, 5, 6]]
     tableData = sc.CreateDynamicTableData(amDims)
-    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
     
     # Add a data array to the Attribute Matrix by using a Filter
-    dap = simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data")
-    inputRange = (0,0)
-    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, "37", inputRange)
+    dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data')
+    inputRange = (0, 0)
+    err = simplpy.create_data_array(dca,simpl.ScalarTypes.Int32, 1, dap, 0, '37', inputRange)
     assert err == 0
 
     # Test: Copy Object
-    err = simplpy.copy_object(dca, sc.ObjectToCopy.AttributeArray, "", 
-                              simpl.DataArrayPath("", "", ""),
-                              simpl.DataArrayPath("ImageDataContainer", "CellAttributeMatrix", "Int32Data"),
-                              "Int32Data_Copy")
+    err = simplpy.copy_object(dca, sc.ObjectToCopy.AttributeArray, '', 
+                              simpl.DataArrayPath('', '', ''),
+                              simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data'),
+                              'Int32Data_Copy')
     if err < 0:
-        print("copy_object ErrorCondition %d" % err)
+        print('copy_object ErrorCondition %d' % err)
     assert err == 0
 
     # Write to DREAM3D file
     err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
-                              + "/Data/Output/CoreFilterTests/CopyObjectTest.dream3d", dca)
+                              + '/Data/Output/CoreFilterTests/CopyObjectTest.dream3d', dca)
     if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
+        print('WriteDREAM3DFile ErrorCondition: %d' % err)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     copy_object_test()
diff --git a/Wrapping/Python/Testing/Create_Edge_Geometry.py b/Wrapping/Python/Testing/Create_Edge_Geometry.py
index 3f96aa1b8c..dfaefe0fd7 100644
--- a/Wrapping/Python/Testing/Create_Edge_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Edge_Geometry.py
@@ -1,97 +1,87 @@
-
-import time
-
 # Based on CreateEdgeGeometry example
-# 
-
-# These are the simpl_py python modules
 
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy as d3d
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def CreateEdgeGeometryTest():
   # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
+  dca = simpl.DataContainerArray()
 
   # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
+  err = d3d.create_data_container(dca, 'DataContainer')
   if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
+    print('DataContainer ErrorCondition: %d' % err)
 
   # Import ASCII Data - #1 - Vertex Coordinates (Using helper function)
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
 
   err = d3d.read_ascii_data(dca, sc.CreateAsciiWizardData(importFile, 2, 145, [','], False, True, 
-  simpl.DataArrayPath("DataContainer", "Bounds", ""), ["x", "y", "z"], 3,
-  [144], ["float", "float", "float"]))
+  simpl.DataArrayPath('DataContainer', 'Bounds', ''), ['x', 'y', 'z'], 3,
+  [144], ['float', 'float', 'float']))
   if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
   
 
   # Import ASCII Data - #2 - Edge Connectivity (Without using helper function)
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/EdgeConnectivity.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/EdgeConnectivity.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 265,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "EdgeList", ""),
-    "headers": ["V1", "V0"],
-    "attrMatType": 3,
-    "tupleDimensions": [264],
-    "dataTypes": ["int64_t", "int64_t"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 265,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'EdgeList', ''),
+    'headers': ['V1', 'V0'],
+    'attrMatType': 3,
+    'tupleDimensions': [264],
+    'dataTypes': ['int64_t', 'int64_t']
   }  
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
 
   # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
   if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
   # Delete Data # 1
   # Remove array helper function:
-  err = sc.RemoveArrays(dca, [("DataContainer", "Bounds", "x"), ("DataContainer", "Bounds", "y"), ("DataContainer", "Bounds", "z")])
+  err = sc.RemoveArrays(dca, [('DataContainer', 'Bounds', 'x'), ('DataContainer', 'Bounds', 'y'), ('DataContainer', 'Bounds', 'z')])
   if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
   # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "EdgeList", "V0"), 
-  simpl.DataArrayPath("DataContainer", "EdgeList", "V1")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Edges", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'EdgeList', 'V0'), 
+  simpl.DataArrayPath('DataContainer', 'EdgeList', 'V1')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Edges', False)
   if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
 
   # Delete Data # 2
   # Remove array helper function:
-  err = sc.RemoveArrays(dca, [("DataContainer", "EdgeList", "V0"), ("DataContainer", "EdgeList", "V1")])
+  err = sc.RemoveArrays(dca, [('DataContainer', 'EdgeList', 'V0'), ('DataContainer', 'EdgeList', 'V1')])
   if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_edge_list_array_path = simpl.DataArrayPath("DataContainer", "EdgeList", "Edges"),
-  vertex_attribute_matrix_name = "VertexData",
-  edge_attribute_matrix_name = "EdgeData")
+  err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, 'DataContainer', False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+  shared_edge_list_array_path = simpl.DataArrayPath('DataContainer', 'EdgeList', 'Edges'),
+  vertex_attribute_matrix_name = 'VertexData',
+  edge_attribute_matrix_name = 'EdgeData')
   if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
+    print('Create Geometry -  ErrorCondition: %d' % err)
 
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateEdgeGeometry.dream3d", True, False)
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateEdgeGeometry.dream3d', True, False)
   if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
+    print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
-  #help(simpl.ImageGeom)
+if __name__ == '__main__':
   CreateEdgeGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Quad_Geometry.py b/Wrapping/Python/Testing/Create_Quad_Geometry.py
index dfaca618fd..4593202fd8 100644
--- a/Wrapping/Python/Testing/Create_Quad_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Quad_Geometry.py
@@ -1,115 +1,108 @@
 # Based on CreateQuadGeometry example
-# 
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy as d3d
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def CreateQuadGeometryTest():
   # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
+  dca = simpl.DataContainerArray()
 
   # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
+  err = d3d.create_data_container(dca, 'DataContainer')
   if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
+    print('DataContainer ErrorCondition: %d' % err)
 
   # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 145,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+    'headers': ['x', 'y', 'z'],
+    'attrMatType': 3,
+    'tupleDimensions': [144],
+    'dataTypes': ['float', 'float', 'float']
   }
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
   
-
   # Import ASCII Data - #2 - Edge Connectivity
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/QuadConnectivity.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/QuadConnectivity.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 122,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "QuadList", ""),
-    "headers": ["V0", "V1", "V2", "V3"],
-    "attrMatType": 3,
-    "tupleDimensions": [121],
-    "dataTypes": ["int64_t", "int64_t","int64_t", "int64_t"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 122,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'QuadList', ''),
+    'headers': ['V0', 'V1', 'V2', 'V3'],
+    'attrMatType': 3,
+    'tupleDimensions': [121],
+    'dataTypes': ['int64_t', 'int64_t','int64_t', 'int64_t']
   }  
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
 
   # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
   if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
   # Delete Data # 1
   dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  dcap.getDataContainerProxy('DataContainer').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
   if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
   # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "QuadList", "V0"), 
-  simpl.DataArrayPath("DataContainer", "QuadList", "V1"), simpl.DataArrayPath("DataContainer", "QuadList", "V2"), 
-  simpl.DataArrayPath("DataContainer", "QuadList", "V3")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Quads", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'QuadList', 'V0'), 
+  simpl.DataArrayPath('DataContainer', 'QuadList', 'V1'), simpl.DataArrayPath('DataContainer', 'QuadList', 'V2'), 
+  simpl.DataArrayPath('DataContainer', 'QuadList', 'V3')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Quads', False)
   if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
 
   # Delete Data # 2
   dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V0").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V1").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V2").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("QuadList").getDataArrayProxy("V3").Flag = 2
+  dcap.getDataContainerProxy('DataContainer').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V0').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V1').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V2').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V3').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
   if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_quad_list_array_path = simpl.DataArrayPath("DataContainer", "QuadList", "Quads"),
-  vertex_attribute_matrix_name = "VertexData",
-  face_attribute_matrix_name = "FaceData")
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, 'DataContainer', False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+  shared_quad_list_array_path = simpl.DataArrayPath('DataContainer', 'QuadList', 'Quads'),
+  vertex_attribute_matrix_name = 'VertexData',
+  face_attribute_matrix_name = 'FaceData')
   if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
+    print('Create Geometry -  ErrorCondition: %d' % err)
 
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateQuadGeometry.dream3d", True, False)
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateQuadGeometry.dream3d', True, False)
   if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
+    print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   CreateQuadGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_RectilinearGrid.py b/Wrapping/Python/Testing/Create_RectilinearGrid.py
index 6aa8a39bf9..1d2d4a7d0a 100644
--- a/Wrapping/Python/Testing/Create_RectilinearGrid.py
+++ b/Wrapping/Python/Testing/Create_RectilinearGrid.py
@@ -1,59 +1,53 @@
 
 # Based on CreateRectilinearGrid example
-# 
 
 # As of 9-13-18, this example will not work as the input file is not available
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy as d3d
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def CreateRectilinearGridTest():
   # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
+  dca = simpl.DataContainerArray()
 
   # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
+  err = d3d.create_data_container(dca, 'DataContainer')
   if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
+    print('DataContainer ErrorCondition: %d' % err)
 
   # Import ASCII Data - Rectilinear Grid
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/RectilinearGrid.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/RectilinearGrid.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 15,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [14],
-    "dataTypes": ["float", "float", "float"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 15,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+    'headers': ['x', 'y', 'z'],
+    'attrMatType': 3,
+    'tupleDimensions': [14],
+    'dataTypes': ['float', 'float', 'float']
   }
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
   
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
-  x_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-  y_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-  z_bounds_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "z"),
-  face_attribute_matrix_name = "CellData")
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False, 
+  x_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
+  y_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
+  z_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'z'),
+  face_attribute_matrix_name = 'CellData')
   if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
+    print('Create Geometry -  ErrorCondition: %d' % err)
 
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateRectilinearGrid.dream3d", True, False)
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateRectilinearGrid.dream3d', True, False)
   if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
+    print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   CreateRectilinearGridTest()
diff --git a/Wrapping/Python/Testing/Create_Triangle_Geometry.py b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
index 7ce24fdab2..f997e4bfbc 100644
--- a/Wrapping/Python/Testing/Create_Triangle_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
@@ -1,111 +1,106 @@
 # Based on CreateTriangleGeometry example
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy as d3d
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def CreateTriangleGeometryTest():
   # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
+  dca = simpl.DataContainerArray()
 
   # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
+  err = d3d.create_data_container(dca, 'DataContainer')
   if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
+    print('DataContainer ErrorCondition: %d' % err)
 
   # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 145,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+    'headers': ['x', 'y', 'z'],
+    'attrMatType': 3,
+    'tupleDimensions': [144],
+    'dataTypes': ['float', 'float', 'float']
   }
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
   
   # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
   if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
   # Delete Data # 1
   dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  dcap.getDataContainerProxy('DataContainer').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
   if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
   # Import ASCII Data - #2 - Triangle Connectivity
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/TriangleConnectivity.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 243,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Triangles", ""),
-    "headers": ["V0", "V1", "V2"],
-    "attrMatType": 3,
-    "tupleDimensions": [242],
-    "dataTypes": ["int64_t", "int64_t","int64_t"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 243,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'Triangles', ''),
+    'headers': ['V0', 'V1', 'V2'],
+    'attrMatType': 3,
+    'tupleDimensions': [242],
+    'dataTypes': ['int64_t', 'int64_t','int64_t']
   }  
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
 
   # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Triangles", "V0"), 
-  simpl.DataArrayPath("DataContainer", "Triangles", "V1"), simpl.DataArrayPath("DataContainer", "Triangles", "V2")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Triangles", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Triangles', 'V0'), 
+  simpl.DataArrayPath('DataContainer', 'Triangles', 'V1'), simpl.DataArrayPath('DataContainer', 'Triangles', 'V2')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Triangles', False)
   if err < 0:
-    print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
 
   # Delete Data # 2
   dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").Flag = 2
+  dcap.getDataContainerProxy('DataContainer').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V0').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V1').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V2').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
   if err < 0:
-    print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  shared_tri_list_array_path = simpl.DataArrayPath("DataContainer", "Triangles", "Triangles"),
-  vertex_attribute_matrix_name = "VertexData",
-  face_attribute_matrix_name = "FaceData")
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+  shared_tri_list_array_path = simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'),
+  vertex_attribute_matrix_name = 'VertexData',
+  face_attribute_matrix_name = 'FaceData')
   if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
+    print('Create Geometry -  ErrorCondition: %d' % err)
 
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateTriangleGeometry.dream3d", True, False)
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateTriangleGeometry.dream3d', True, False)
   if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
+    print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   CreateTriangleGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Vertex_Geometry.py b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
index b3c799e889..24c6d6cbd4 100644
--- a/Wrapping/Python/Testing/Create_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
@@ -1,75 +1,70 @@
 # Based on CreateVertexGeometry example
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy as d3d
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy as d3d
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def CreateVertexGeometryTest():
   # Create Data Container Array
-  dca = simpl.DataContainerArray.New()
+  dca = simpl.DataContainerArray()
 
   # Create the Data Container
-  err = d3d.create_data_container(dca, "DataContainer")
+  err = d3d.create_data_container(dca, 'DataContainer')
   if err < 0:
-    print("DataContainer ErrorCondition: %d" % err)
+    print('DataContainer ErrorCondition: %d' % err)
 
   # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
   wizardData = {
-    "inputFilePath": importFile,
-    "beginIndex": 2,
-    "numberOfLines": 145,
-    "delimiters": [','],    
-    "consecutiveDelimiters": False,
-    "automaticAM": True,
-    "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-    "headers": ["x", "y", "z"],
-    "attrMatType": 3,
-    "tupleDimensions": [144],
-    "dataTypes": ["float", "float", "float"]
+    'inputFilePath': importFile,
+    'beginIndex': 2,
+    'numberOfLines': 145,
+    'delimiters': [','],    
+    'consecutiveDelimiters': False,
+    'automaticAM': True,
+    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+    'headers': ['x', 'y', 'z'],
+    'attrMatType': 3,
+    'tupleDimensions': [144],
+    'dataTypes': ['float', 'float', 'float']
   }
   err = d3d.read_ascii_data(dca, wizardData)
   if err < 0:
-    print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
   
   # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "y"), 
-  simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, "Vertices", False)
+  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
+  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
   if err < 0:
-    print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
   # Delete Data # 1
   dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy("DataContainer").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
-  dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+  dcap.getDataContainerProxy('DataContainer').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
+  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
   if err < 0:
-    print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
   # Create Geometry
-  data_container_name = "DataContainer"
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices")
-  vertex_attribute_matrix_name = "VertexData"
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, "DataContainer", False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-  vertex_attribute_matrix_name = "VertexData")
+  data_container_name = 'DataContainer'
+  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices')
+  vertex_attribute_matrix_name = 'VertexData'
+  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False, 
+  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+  vertex_attribute_matrix_name = 'VertexData')
   if err < 0:
-    print("Create Geometry -  ErrorCondition: %d" % err)
+    print('Create Geometry -  ErrorCondition: %d' % err)
 
-  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + "/CreateVertexGeometry.dream3d", True, False)
+  err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateVertexGeometry.dream3d', True, False)
   if err < 0:
-    print("DataContainerWriter ErrorCondition: %d" % err)
+    print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   CreateVertexGeometryTest()
diff --git a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
index 3e4037c53a..654e542f83 100644
--- a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
@@ -1,94 +1,87 @@
 # Pipeline: Crop Vertex Geometry Test
 # Based on CreateVertexGeometry example
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def crop_vertex_geometry_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
+    err = simplpy.create_data_container(dca, 'DataContainer')
     if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
+        print('DataContainer ErrorCondition: %d' % err)
 
     # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+    import_file = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
     wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
+        'inputFilePath': import_file,
+        'beginIndex': 2,
+        'numberOfLines': 145,
+        'delimiters': [','],
+        'consecutiveDelimiters': False,
+        'automaticAM': True,
+        'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+        'headers': ['x', 'y', 'z'],
+        'attrMatType': 3,
+        'tupleDimensions': [144],
+        'dataTypes': ['float', 'float', 'float']
     }
     err = simplpy.read_ascii_data(dca, wizard_data)
     if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+        print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
 
     # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
+    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
+                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
+                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Vertices', False)
     if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+        print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
     # Delete Data # 1
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+    dcap.getDataContainerProxy('DataContainer').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+        print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
     # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            vertex_attribute_matrix_name="VertexData")
+    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False,
+                            shared_vertex_list_array_path=simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+                            vertex_attribute_matrix_name='VertexData')
     if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
+        print('Create Geometry -  ErrorCondition: %d' % err)
 
     # Crop Geometry (Vertex)
-    err = simplpy.crop_vertex_geometry(dca, "DataContainer", "CroppedDataContainer",
+    err = simplpy.crop_vertex_geometry(dca, 'DataContainer', 'CroppedDataContainer',
                                        -0.5, -0.5, 0.0, 0.5, 0.5, 1)
     if err < 0:
-        print("CropVertexGeometry -  ErrorCondition: %d" % err)
+        print('CropVertexGeometry -  ErrorCondition: %d' % err)
 
     # Delete Data #2
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("VertexData").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("Vertices").Flag = 2
+    dcap.getDataContainerProxy('DataContainer').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('VertexData').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('Vertices').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+        print('Remove Arrays #2 -  ErrorCondition: %d' % err)
 
     # Write to DREAM.3D File
     err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
-                                        "/Data/Output/CoreFilters/" +
-                                        "CropVertexGeometry.dream3d", True, False)
+                                        '/Data/Output/CoreFilters/' +
+                                        'CropVertexGeometry.dream3d', True, False)
     if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
-
+        print('DataContainerWriter ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     crop_vertex_geometry_test()
diff --git a/Wrapping/Python/Testing/DataArrayTest.py b/Wrapping/Python/Testing/DataArrayTest.py
index 59eaf8b748..2ba9141c92 100644
--- a/Wrapping/Python/Testing/DataArrayTest.py
+++ b/Wrapping/Python/Testing/DataArrayTest.py
@@ -1,33 +1,24 @@
+import numpy as np
 
-import time
-
-try:
-    import numpy as np
-except ImportError:
-    raise RuntimeError("This module depends on the numpy module. Please make\
-sure that it is installed properly.")
-
-# These are the SIMPL python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def DataArrayTest():
-    """
+    '''
     This is the Top level to test the creation of Data Arrays from numpy and placing those
     arrays into a DREAM3D DataContainer heirarchy.
-    """
+    '''
     dca = sc.CreateDataContainerArray()
 
-    dc = sc.CreateDataContainer("ImageDataContainer")
+    dc = sc.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
 
     shape = simpl.VectorSizeT([4, 5, 2])
-    cellAm = sc.CreateAttributeMatrix(shape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
+    cellAm = sc.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
-    shape = [4,5,2]
+    shape = [4, 5, 2]
     # Create the Component Dimensions for the Array, 1 Component in this case
     cDims = simpl.VectorSizeT([1])
 
@@ -38,33 +29,30 @@ def DataArrayTest():
     arrayList = []
 
     for index, item in enumerate(arrayTypes):
-        # print("+++ Creating Array: %s" % item)
+        # print('+++ Creating Array: %s' % item)
         z_flat, array = sc.CreateDataArray(arrayTypes[index].__name__, shape, cDims, item)
         cellAm.addOrReplaceAttributeArray(array)
         arrayList.append(z_flat)
         # Now add an array that is purely allocated on the C++/SIMPL side of things.
-        # print ("  Creating Int32Array locally to the Loop.... Int32 SIMPL %s" % array.Name)
-        array = simpl.Int32ArrayType(shape[0]*shape[1]*shape[2], "Int32 SIMPL " + array.Name, True)
+        # print ('  Creating Int32Array locally to the Loop.... Int32 SIMPL %s' % array.Name)
+        array = simpl.Int32Array(shape[0] * shape[1] * shape[2], 'Int32 SIMPL ' + array.Name, True)
         # cellAm.addOrReplaceAttributeArray(array)
         # for x in range(shape[0]*shape[1]*shape[2]):
         #     array.setValue(x, x)
         # This will force cleanup the array that just got created.
-        array = simpl.Int32ArrayType.Cleanup()
-        # print("--- Loop Complete for %s" % item)
+        array = None
+        # print('--- Loop Complete for %s' % item)
 
     # Create a Geometry Object and store it in the DataContainer
-    imageGeom = simpl.ImageGeom.CreateGeometry("ImageGeometry")
+    imageGeom = simpl.ImageGeom.CreateGeometry('ImageGeometry')
     imageGeom.setDimensions(shape[0], shape[1], shape[2])
     imageGeom.setSpacing(1.0, 2.0, 3.0)
     imageGeom.setOrigin(5.5, -9.0, 0.0)
     dc.setGeometry(imageGeom)
 
-    err = sc.WriteDREAM3DFile(sd.GetTestTempDirectory() + "/DataArrayTest.dream3d", dca, True)
+    err = sc.WriteDREAM3DFile(sd.GetTestTempDirectory() + '/DataArrayTest.dream3d', dca, True)
     assert err == 0
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     DataArrayTest()
-    print("[DataArrayTest] Complete")
+    print('[DataArrayTest] Complete')
diff --git a/Wrapping/Python/Testing/DataContainerArrayTest.py b/Wrapping/Python/Testing/DataContainerArrayTest.py
index 3d1c305fa9..bcece84ea9 100644
--- a/Wrapping/Python/Testing/DataContainerArrayTest.py
+++ b/Wrapping/Python/Testing/DataContainerArrayTest.py
@@ -1,86 +1,62 @@
-
-""" This is a test for DataContainerArray """
-
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-
-
-def create_data_container(data_container_array, ):
-    """
-    Instantiates CreateDataContainer
-    """
-    create_data_container = simpl.CreateDataContainer(data_container_name)
-    create_data_container.setDataContainerArray(data_container_array)
-    create_data_container.DataContainerName = data_container_name
-    # create_data_container.execute()
-    # executeError = create_data_container.ErrorCondition
-    return 0
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def AttributeMatrixAccessTest():
-    """
+    '''
     Test the various methods that deal with AttributeMatrix
     and DataContainerArray
-    """
-    print("Starting AttributeMatrixAccessTest....")
+    '''
+    print('Starting AttributeMatrixAccessTest....')
     dca = sc.CreateDataContainerArray()
-    dc = sc.CreateDataContainer("AM Test")
+    dc = sc.CreateDataContainer('AM Test')
     dca.addOrReplaceDataContainer(dc)
     
     amType = simpl.AttributeMatrix.Type.Cell
-    tupleDims = simpl.VectorSizeT([5,4,3])
-    am = simpl.AttributeMatrix.New(tupleDims, "CellAttributeMatrix", amType)
+    tupleDims = simpl.VectorSizeT([5, 4, 3])
+    am = simpl.AttributeMatrix.New(tupleDims, 'CellAttributeMatrix', amType)
     dc.addOrReplaceAttributeMatrix(am)
 
     # See if we can get the AttributeMatrix based on a DataArrayPath object
-    dap = simpl.DataArrayPath("AM Test", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('AM Test', 'CellAttributeMatrix', '')
     am0 = dca.getAttributeMatrix(dap)
     assert am0 == am
     assert True == dca.doesAttributeMatrixExist(dap)
 
     # Change the data array path to something that does not exist.
-    dap.update("AM Test", "Foo", "")
+    dap.update('AM Test', 'Foo', '')
     am0 = dca.getAttributeMatrix(dap)
     assert am0 != am
     assert False == dca.doesAttributeMatrixExist(dap)
 
-
 def DataContainerTest():
-    """
+    '''
     This is the main unit test
     This needs to be updated as more methods are exposed to Python
-    """
-    print("Starting DataContainerTest....")
+    '''
+    print('Starting DataContainerTest....')
     dca = sc.CreateDataContainerArray()
-    dc0 = sc.CreateDataContainer("dc0")
-    dc1 = sc.CreateDataContainer("dc1")
+    dc0 = sc.CreateDataContainer('dc0')
+    dc1 = sc.CreateDataContainer('dc1')
 
     dca.addOrReplaceDataContainer(dc0)
     dca.addOrReplaceDataContainer(dc1)
 
-    exist = dca.doesDataContainerExist("dc0")
-    assert exist is True
-    exist = dca.doesDataContainerExist("dc1")
-    assert exist is True
+    assert dca.doesDataContainerExist('dc0')
+    assert dca.doesDataContainerExist('dc1')
 
-    dc0 = dca.removeDataContainer("dc0")
-    exist = dca.doesDataContainerExist("dc0")
-    assert exist is False
+    dc0 = dca.removeDataContainer('dc0')
+    assert not dca.doesDataContainerExist('dc0')
 
-    dca.renameDataContainer("dc1", "dc0")
-    exist = dca.doesDataContainerExist("dc1")
-    assert exist is False
-    exist = dca.doesDataContainerExist("dc0")
-    assert exist is True
+    dca.renameDataContainer('dc1', 'dc0')
+    assert not dca.doesDataContainerExist('dc1')
+    assert dca.doesDataContainerExist('dc0')
 
     numDC = dca.getNumDataContainers()
     assert numDC == 1
 
-    dca.duplicateDataContainer("dc0", "dc1")
+    dca.duplicateDataContainer('dc0', 'dc1')
     numDC = dca.getNumDataContainers()
     assert numDC == 2
 
@@ -89,16 +65,13 @@ def DataContainerTest():
     assert numDC == 0
 
 def MiscTest():
-    print("Starting MiscTest")
+    print('Starting MiscTest')
     dca = sc.CreateDataContainerArray()
-    dc = sc.CreateDataContainer("My New DataContainer")
+    dc = sc.CreateDataContainer('My New DataContainer')
     dca.addOrReplaceDataContainer(dc)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     MiscTest()
     DataContainerTest()
     AttributeMatrixAccessTest()
-    print("DataContainerArrayTest Test Complete")
+    print('DataContainerArrayTest Test Complete')
diff --git a/Wrapping/Python/Testing/DataContainerTest.py b/Wrapping/Python/Testing/DataContainerTest.py
index ff812c1d83..5b61656880 100644
--- a/Wrapping/Python/Testing/DataContainerTest.py
+++ b/Wrapping/Python/Testing/DataContainerTest.py
@@ -1,50 +1,32 @@
-""" This is a test for DataContainer """
-
-# These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-
-def CreateAttributeMatrix():
-  """
-  Creates a Cell AttributeMatrix and returns it.
-  """
-  
-  am = simpl.AttributeMatrix.Create(tupleDims, "CellAttributeMatrix", amType)
-  return am
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def DataContainerTest() :
-  """
+  '''
   Tests various methods of the DataContainer Class
-  """
+  '''
 
   dca = sc.CreateDataContainerArray()
 
   # Create a DataContainer
-  dc = simpl.DataContainer("Default Name")
-  assert dc.Name == "Default Name"
-  dc.Name = "ImageDataContainer"
-  assert dc.Name == "ImageDataContainer"
+  dc = simpl.DataContainer('Default Name')
+  assert dc.Name == 'Default Name'
+  dc.Name = 'ImageDataContainer'
+  assert dc.Name == 'ImageDataContainer'
   
   amType = simpl.AttributeMatrix.Type.Cell
-  tupleDims = simpl.VectorSizeT([5,4,3])
-  amName = "CellAttributeMatrix"
+  tupleDims = simpl.VectorSizeT([5, 4, 3])
+  amName = 'CellAttributeMatrix'
   am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
 
   dc.addOrReplaceAttributeMatrix(am)
 
-  exists = dc.doesAttributeMatrixExist("CellAttributeMatrix")
+  exists = dc.doesAttributeMatrixExist('CellAttributeMatrix')
   
-  print("Exists: %s" % exists)
-
-
-
+  print('Exists: %s' % exists)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   DataContainerTest()
-  print("DataContainerTest Test Complete")
+  print('DataContainerTest Test Complete')
diff --git a/Wrapping/Python/Testing/Export_Triangle_Geometry.py b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
index 514b796ecb..012a459aa1 100644
--- a/Wrapping/Python/Testing/Export_Triangle_Geometry.py
+++ b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
@@ -1,123 +1,114 @@
-# Based on CreateTriangleGeometry example
-# Tests the Export Triangle Geometry filter
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def export_triangle_geometry():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create the Data Container
-    err = simplpy.create_data_container(dca, "DataContainer")
+    err = simplpy.create_data_container(dca, 'DataContainer')
     if err < 0:
-        print("DataContainer ErrorCondition: %d" % err)
+        print('DataContainer ErrorCondition: %d' % err)
 
     # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv"
+    import_file = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
     wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 145,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Bounds", ""),
-        "headers": ["x", "y", "z"],
-        "attrMatType": 3,
-        "tupleDimensions": [144],
-        "dataTypes": ["float", "float", "float"]
+        'inputFilePath': import_file,
+        'beginIndex': 2,
+        'numberOfLines': 145,
+        'delimiters': [','],
+        'consecutiveDelimiters': False,
+        'automaticAM': True,
+        'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
+        'headers': ['x', 'y', 'z'],
+        'attrMatType': 3,
+        'tupleDimensions': [144],
+        'dataTypes': ['float', 'float', 'float']
     }
     err = simplpy.read_ascii_data(dca, wizard_data)
     if err < 0:
-        print("Import ASCII Data #1 -  ErrorCondition: %d" % err)
+        print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
 
     # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Bounds", "x"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "y"),
-                                 simpl.DataArrayPath("DataContainer", "Bounds", "z")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Vertices", False)
+    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
+                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
+                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
+    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Vertices', False)
     if err < 0:
-        print("Combined Attribute Arrays #1 -  ErrorCondition: %d" % err)
+        print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
 
     # Delete Data # 1
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("x").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("y").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Bounds").getDataArrayProxy("z").Flag = 2
+    dcap.getDataContainerProxy('DataContainer').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
-        print("Remove Arrays #1 -  ErrorCondition: %d" % err)
+        print('Remove Arrays #1 -  ErrorCondition: %d' % err)
 
     # Import ASCII Data - #2 - Triangle Connectivity
-    import_file = sd.GetBuildDirectory() + "/Data/SIMPL/TriangleConnectivity.csv"
+    import_file = sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv'
     wizard_data = {
-        "inputFilePath": import_file,
-        "beginIndex": 2,
-        "numberOfLines": 243,
-        "delimiters": [','],
-        "consecutiveDelimiters": False,
-        "automaticAM": True,
-        "selectedPath": simpl.DataArrayPath("DataContainer", "Triangles", ""),
-        "headers": ["V0", "V1", "V2"],
-        "attrMatType": 3,
-        "tupleDimensions": [242],
-        "dataTypes": ["int64_t", "int64_t", "int64_t"]
+        'inputFilePath': import_file,
+        'beginIndex': 2,
+        'numberOfLines': 243,
+        'delimiters': [','],
+        'consecutiveDelimiters': False,
+        'automaticAM': True,
+        'selectedPath': simpl.DataArrayPath('DataContainer', 'Triangles', ''),
+        'headers': ['V0', 'V1', 'V2'],
+        'attrMatType': 3,
+        'tupleDimensions': [242],
+        'dataTypes': ['int64_t', 'int64_t', 'int64_t']
     }
     err = simplpy.read_ascii_data(dca, wizard_data)
     if err < 0:
-        print("Import ASCII Data #2 -  ErrorCondition: %d" % err)
+        print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
 
     # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "Triangles", "V0"),
-                                 simpl.DataArrayPath("DataContainer", "Triangles", "V1"),
-                                 simpl.DataArrayPath("DataContainer", "Triangles", "V2")]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, "Triangles", False)
+    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Triangles', 'V0'),
+                                 simpl.DataArrayPath('DataContainer', 'Triangles', 'V1'),
+                                 simpl.DataArrayPath('DataContainer', 'Triangles', 'V2')]
+    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Triangles', False)
     if err < 0:
-        print("Combined Attribute Arrays #2 -  ErrorCondition: %d" % err)
+        print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
 
     # Delete Data # 2
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("DataContainer").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").Flag = 0
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V0").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V1").Flag = 2
-    dcap.getDataContainerProxy("DataContainer").getAttributeMatrixProxy("Triangles").getDataArrayProxy("V2").Flag = 2
+    dcap.getDataContainerProxy('DataContainer').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').Flag = 0
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V0').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V1').Flag = 2
+    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V2').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
     if err < 0:
-        print("Remove Arrays #2 -  ErrorCondition: %d" % err)
+        print('Remove Arrays #2 -  ErrorCondition: %d' % err)
 
     # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, "DataContainer", False,
-                            shared_vertex_list_array_path=simpl.DataArrayPath("DataContainer", "Bounds", "Vertices"),
-                            shared_tri_list_array_path=simpl.DataArrayPath("DataContainer", "Triangles", "Triangles"),
-                            vertex_attribute_matrix_name="VertexData",
-                            face_attribute_matrix_name="FaceData")
+    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False,
+                            shared_vertex_list_array_path=simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+                            shared_tri_list_array_path=simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'),
+                            vertex_attribute_matrix_name='VertexData',
+                            face_attribute_matrix_name='FaceData')
     if err < 0:
-        print("Create Geometry -  ErrorCondition: %d" % err)
+        print('Create Geometry -  ErrorCondition: %d' % err)
 
     # Write to DREAM3D File
-    err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + "/Data/Output/CoreFilters/ExportTriangleGeometry.dream3d", True, False)
+    err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + '/Data/Output/CoreFilters/ExportTriangleGeometry.dream3d', True, False)
     if err < 0:
-        print("DataContainerWriter ErrorCondition: %d" % err)
+        print('DataContainerWriter ErrorCondition: %d' % err)
 
     # Export Triangle Geometry
-    err = simplpy.write_triangle_geometry(dca, "DataContainer", sd.GetBuildDirectory() +
-                                          "/Data/Output/CoreFilters/output_nodes.txt",
+    err = simplpy.write_triangle_geometry(dca, 'DataContainer', sd.GetBuildDirectory() +
+                                          '/Data/Output/CoreFilters/output_nodes.txt',
                                           sd.GetBuildDirectory() +
-                                          "/Data/Output/CoreFilters/output_triangles.txt")
+                                          '/Data/Output/CoreFilters/output_triangles.txt')
     if err < 0:
-        print("WriteTriangleGeometry ErrorCondition: %d" % err)
-
+        print('WriteTriangleGeometry ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     export_triangle_geometry()
diff --git a/Wrapping/Python/Testing/GeometryTest.py b/Wrapping/Python/Testing/GeometryTest.py
index 7ab7e19fc3..da56bc4e0c 100644
--- a/Wrapping/Python/Testing/GeometryTest.py
+++ b/Wrapping/Python/Testing/GeometryTest.py
@@ -1,30 +1,17 @@
-"""
-For the standard Python 3 installation from python.org I had to pip3 install scipy imageio
-in order to use the below modules.
-"""
-import time
-import imageio
-
-try:
-    import numpy as np
-except ImportError:
-    raise RuntimeError("This module depends on the numpy module. Please make\
-sure that it is installed properly.")
-
-# These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import numpy as np
 
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def GeometryTest():
-  imageGeom = simpl.ImageGeom.CreateGeometry("ImageGeometry")
-  assert imageGeom.Name == "ImageGeometry"
+  imageGeom = simpl.ImageGeom.CreateGeometry('ImageGeometry')
+  assert imageGeom.Name == 'ImageGeometry'
 
   imageGeom.setDimensions(100, 1001, 200)
   dims = imageGeom.getDimensions()
-  print("dims= %s" % dims)
+  print('dims= %s' % dims)
   assert dims[0] == 100
   assert dims[1] == 1001
   assert dims[2] == 200
@@ -34,17 +21,17 @@ def GeometryTest():
   assert imageRes[0] == 1.0
   assert imageRes[1] == 2.0
   assert imageRes[2] == 3.0
-  print("imageRes= %s" % imageRes)
+  print('imageRes= %s' % imageRes)
 
   imageGeom.setOrigin(20, 45, 70)
   origin = imageGeom.getOrigin()
   assert origin[0] == 20
   assert origin[1] == 45
   assert origin[2] == 70
-  print("origin= %s" % origin)
+  print('origin= %s' % origin)
 
   infoString = imageGeom.getInfoString(simpl.HtmlFormat)
-  print("%s" % infoString)
+  print('%s' % infoString)
 
   boundingBox = imageGeom.getBoundingBox()
   assert boundingBox[0] == 20
@@ -53,15 +40,8 @@ def GeometryTest():
   assert boundingBox[3] == 2047
   assert boundingBox[4] == 70
   assert boundingBox[5] == 670
-  print("boundingBox= %s" % boundingBox)
+  print('boundingBox= %s' % boundingBox)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   GeometryTest()
-  print("GeometryTest Complete")
-
-
-
-
+  print('GeometryTest Complete')
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index 2c7c9a3918..60b77d3bbf 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -1,29 +1,14 @@
-"""
-For the standard Python 3 installation from python.org I had to pip3 install scipy imageio
-in order to use the below modules.
-"""
-import time
 import imageio
-  
-try:
-    import numpy as np
-except ImportError:
-    raise RuntimeError("This module depends on the numpy module. Please make\
-sure that it is installed properly.")
-
-# These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import numpy as np
 
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def ImageReadTest():
-    """
-
-    """
     # Read the Image first so we can get the dimensions
-    tif = imageio.imread(sd.GetDataDirectory() + "/Data/Image/slice_11.tif")
+    tif = imageio.imread(sd.GetDataDirectory() + '/Data/Image/slice_11.tif')
     z = np.asarray(tif)
     if not z.flags.contiguous:
         z = np.ascontiguousarray(z)
@@ -31,9 +16,9 @@ def ImageReadTest():
     shape = z.shape
     assert z.flags.contiguous, 'Only contiguous arrays are supported.'
     assert not np.issubdtype(z.dtype, np.complex128), \
-        "Complex numpy arrays cannot be converted to vtk arrays."\
-        "Use real() or imag() to get a component of the array before"\
-        " passing it to vtk."
+        'Complex numpy arrays cannot be converted to vtk arrays.'\
+        'Use real() or imag() to get a component of the array before'\
+        ' passing it to vtk.'
     # Get the Pointer to the numpy array
     z_flat = np.ravel(z)
 
@@ -41,36 +26,30 @@ def ImageReadTest():
     dca = sc.CreateDataContainerArray()
 
     # Create the DataContainer
-    dc = sc.CreateDataContainer("ImageDataContainer")
+    dc = sc.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
 
     # Create an AttributeMatrix and add it to the DataContainer
     amShape = simpl.VectorSizeT([shape[1], shape[0], 1])
-    cellAm = sc.CreateAttributeMatrix(amShape, "CellAttributeMatrix", simpl.AttributeMatrix.Type.Cell)
+    cellAm = sc.CreateAttributeMatrix(amShape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
-    cDims = simpl.VectorSizeT([1])
-    name = "slice_11.tiff"
-    array = simpl.UInt8ArrayType(z_flat, name, False)
+    name = 'slice_11.tiff'
+    array = simpl.UInt8Array(z_flat, name, False)
     cellAm.addOrReplaceAttributeArray(array)
 
     # Create a Geometry Object and store it in the DataContainer
-    imageGeom = simpl.ImageGeom.CreateGeometry("ImageGeometry")
+    imageGeom = simpl.ImageGeom.CreateGeometry('ImageGeometry')
     imageGeom.setDimensions(shape[1], shape[0], 1)
     imageGeom.setSpacing(1.0, 1.0, 1.0)
     imageGeom.setOrigin(20, 45, 70)
     dc.setGeometry(imageGeom)
 
     # Write the file out
-    err = sc.WriteDREAM3DFile( sd.GetBuildDirectory() + "/Data/Output/PythonTest/ImageReadTest.dream3d", dca, True)
+    err = sc.WriteDREAM3DFile( sd.GetBuildDirectory() + '/Data/Output/PythonTest/ImageReadTest.dream3d', dca, True)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   ImageReadTest()
-  print("ImageReadTest Complete")
-
+  print('ImageReadTest Complete')
diff --git a/Wrapping/Python/Testing/Import_Ascii_Data_Array.py b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
index 919aea556a..8cb91e224e 100644
--- a/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
+++ b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
@@ -1,52 +1,45 @@
 # Pipeline: Import Ascii Data Array Test
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def import_ascii_array_test():
     # Create Data Container Array using simpl directly
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container using the pythonic version
-    err = simplpy.create_data_container(dca, "DataContainer")
+    err = simplpy.create_data_container(dca, 'DataContainer')
     assert err == 0
 
     # Create an Attribute Matrix
-    amDims = [[143,1,1]]
+    amDims = [[143, 1, 1]]
     tableData = sc.CreateDynamicTableData(amDims)
-    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
 
     # Import ASCII Data Attribute Array
-    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "AsciiData"),
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', 'AsciiData'),
                                          simpl.NumericTypes.Float, 3, 1,
-                                         sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv",
+                                         sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv',
                                          simpl.DelimiterTypes.Comma)
     if err < 0:
-        print("ImportAsciiDataArray ErrorCondition: %d" % err)
+        print('ImportAsciiDataArray ErrorCondition: %d' % err)
     assert err == 0
 
     # Export ASCII Data
     # Output Style = 0 Means Multiple Files, Style = 1 Means a Single file
     outStyle = 0 
-    selected_data_array_paths = [simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "AsciiData")]
+    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', 'AsciiData')]
     err = simplpy.write_ascii_data(dca, selected_data_array_paths,
-                                   sd.GetBuildDirectory() + "/Data/Output/CoreFilters", # Only needed for Multi-File output
-                                   sd.GetBuildDirectory() + "/Data/Output/CoreFilters/AcsiiOutput.csv", # Only needed for Single File Style
-                                   simpl.DelimiterTypes.Comma, ".csv", 10, outStyle)
+                                   sd.GetBuildDirectory() + '/Data/Output/CoreFilters', # Only needed for Multi-File output
+                                   sd.GetBuildDirectory() + '/Data/Output/CoreFilters/AcsiiOutput.csv', # Only needed for Single File Style
+                                   simpl.DelimiterTypes.Comma, '.csv', 10, outStyle)
     if err < 0:
-        print("WriteAsciiData ErrorCondition: %d" % err)
+        print('WriteAsciiData ErrorCondition: %d' % err)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     import_ascii_array_test()
diff --git a/Wrapping/Python/Testing/Import_Hdf5_Dataset.py b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
index 4ea8a63ce9..b02bb44cb6 100644
--- a/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
+++ b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
@@ -1,73 +1,66 @@
 # Pipeline: Import Hdf5 Data Array Test
 
-# These are the simpl_py python modules
-
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def createInputFile():
     # Create Data Container Array using simpl directly
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container using the pythonic version
-    err = simplpy.create_data_container(dca, "DataContainer")
+    err = simplpy.create_data_container(dca, 'DataContainer')
     assert err == 0
 
     # Create an Attribute Matrix
-    amDims = [[143,1,1]]
+    amDims = [[143, 1, 1]]
     tableData = sc.CreateDynamicTableData(amDims)
-    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
 
     # Import ASCII Data Attribute Array
-    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "DummyDBL"),
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', 'DummyDBL'),
                                          simpl.NumericTypes.Float, 3, 1,
-                                         sd.GetBuildDirectory() + "/Data/SIMPL/VertexCoordinates.csv",
+                                         sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv',
                                          simpl.DelimiterTypes.Comma)
     if err < 0:
-        print("ImportAsciiDataArray ErrorCondition: %d" % err)
+        print('ImportAsciiDataArray ErrorCondition: %d' % err)
     assert err == 0
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.h5", dca)
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.h5', dca)
     assert err == 0
 
-
 def import_hdf5_dataset_test():
     # Create Data Container Array using simpl directly
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Create a Data Container using the pythonic version
-    err = simplpy.create_data_container(dca, "DataContainer")
+    err = simplpy.create_data_container(dca, 'DataContainer')
     assert err == 0
 
     # Create an Attribute Matrix
-    amDims = [[143,1,1]]
+    amDims = [[143, 1, 1]]
     tableData = sc.CreateDynamicTableData(amDims)
-    dap = simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", "")
+    dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
 
     # Import HDF5 Dataset
-    dataset_import_info_list = simpl.DatasetImportInfoList([["DataContainers/DataContainer/CellAttributeMatrix/DummyDBL", "3, 1"]])
-    err = simplpy.import_hdf5_dataset(dca, sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.h5",
+    dataset_import_info_list = simpl.DatasetImportInfoList([['DataContainers/DataContainer/CellAttributeMatrix/DummyDBL', '3, 1']])
+    err = simplpy.import_hdf5_dataset(dca, sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.h5',
                                       dataset_import_info_list,
-                                      simpl.DataArrayPath("DataContainer", "CellAttributeMatrix", ""))
+                                      simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', ''))
     if err < 0:
-        print("ImportHdf5Dataset ErrorCondition: %d" % err)
+        print('ImportHdf5Dataset ErrorCondition: %d' % err)
     assert err == 0
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilters/ImportHDF5.dream3d", dca)
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.dream3d', dca)
     assert err == 0
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     createInputFile()
     import_hdf5_dataset_test()
diff --git a/Wrapping/Python/Testing/NumPy_Round_Trip.py b/Wrapping/Python/Testing/NumPy_Round_Trip.py
index e4253cbb63..5321f605c9 100644
--- a/Wrapping/Python/Testing/NumPy_Round_Trip.py
+++ b/Wrapping/Python/Testing/NumPy_Round_Trip.py
@@ -1,32 +1,24 @@
+import numpy as np
 
-import time
-
-try:
-    import numpy as np
-except ImportError:
-    raise RuntimeError("This module depends on the numpy module. Please make\
-sure that it is installed properly.")
-
-# These are the SIMPL python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-from dream3d import orientationanalysispy as orient
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
+import orientationanalysispy as orient
 
 def Test1():
-  """
+  '''
   This will test manually creating an numpy array, wrapping the numpy array with
   a simpl.DataArray, running a filter to adjust those values, and then showing 
   that the original numpy array has in fact been changed.
-  """
-  print("===================== Test 1 =====================")
+  '''
+  print('===================== Test 1 =====================')
   shape = [4, 3, 2]
   cDims = [3]
   # Create a numpy array of ones to hold our data
   ashape = np.append([np.prod(shape)], cDims)
   # Create a numpy array to hold our data
-  num_array = np.ndarray(ashape, dtype=np.float32, order="C")
+  num_array = np.ndarray(ashape, dtype=np.float32, order='C')
   # Get the numpy array as contiguous
   z = np.asarray(num_array)
   if not z.flags.contiguous:
@@ -38,91 +30,89 @@ def Test1():
   # Create the DataContainerArray
   dca = sc.CreateDataContainerArray()
   # Create and add a DataContainer to the DataContainerArray
-  dc = sc.CreateDataContainer("DC")
+  dc = sc.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
   # Create and add an AttributeMatrix to the DataContainerArray
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
 
   # Create the wrapped DataArray<float> array
-  eulers = simpl.FloatArrayType(z, "Eulers", False)
+  eulers = simpl.FloatArray(z, 'Eulers', False)
   # Add the DataArray to the AttributeMatrix
   cellAm.addOrReplaceAttributeArray(eulers)
 
   # Create a DataArrayPath
-  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
-  # Run the filter ChangeAngleRepresentation since this filter acts on data "in place"
+  dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
+  # Run the filter ChangeAngleRepresentation since this filter acts on data 'in place'
   err = orient.change_angle_representation(dca, 1, dap)
   if err < 0:
-    print("change_angle_representation ErrorCondition: %d" % err)
+    print('change_angle_representation ErrorCondition: %d' % err)
 
   roundtrip = np.asarray(eulers)
 
-  # print("--------------- roundtrip ---------------")
+  # print('--------------- roundtrip ---------------')
   print(roundtrip.shape)
   print(roundtrip[0])
 
-
-
 def Test2():
-  """
+  '''
   This is the Top level to test the creation of Data Arrays from numpy and placing those
   arrays into a DREAM3D DataContainer heirarchy. The numpy array is created on the 
   python side of things.
-  """
-  print("===================== Test 2 =====================")
+  '''
+  print('===================== Test 2 =====================')
   dca = sc.CreateDataContainerArray()
 
-  dc = sc.CreateDataContainer("DC")
+  dc = sc.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
 
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
   # Create the Component Dimensions for the Array, 3 Component in this case
   cDims = simpl.VectorSizeT([3])
   # Create the array which wraps a Numpy contiguous array 
-  npyArray, eulers = sc.CreateDataArray("Eulers", shape, cDims, np.float32)
+  npyArray, eulers = sc.CreateDataArray('Eulers', shape, cDims, np.float32)
   npyArray.fill(3.1415927)
   # Add the DataArray to the AttributeMatrix
   cellAm.addOrReplaceAttributeArray(eulers)
 
   # Create a DataArrayPath
-  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
-  # Run the filter ChangeAngleRepresentation since this filter acts on data "in place"
+  dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
+  # Run the filter ChangeAngleRepresentation since this filter acts on data 'in place'
   err = orient.change_angle_representation(dca, 1, dap)
   if err < 0:
-    print("change_angle_representation ErrorCondition: %d" % err)
+    print('change_angle_representation ErrorCondition: %d' % err)
 
 
 def Test3():
-  """
+  '''
   Create a simpl DataArray<T>, then convert that to a numpy array in place
   and do numpy operations to create a new array, then wrote both arrays
   to a .dream3d file
-  """
-  print("===================== Test 3 =====================")
+  '''
+  print('===================== Test 3 =====================')
 
   dca = sc.CreateDataContainerArray()
 
-  dc = sc.CreateDataContainer("DC")
+  dc = sc.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
   # The shape is in XYZ order
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, "CAM", simpl.AttributeMatrix.Type.Cell)
+  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
 
   # Create the Component Dimensions for the Array, 3 Component in this case
   cDims = simpl.VectorSizeT([3])
-  eulers = simpl.FloatArrayType(24, cDims, "Eulers", 3.1415927)
+  eulers = simpl.FloatArray(24, cDims, 'Eulers', 3.1415927)
   cellAm.addOrReplaceAttributeArray(eulers)
 
   # now build up a pipeline to act on the Data Structure that we just created
-  dap = simpl.DataArrayPath("DC", "CAM", "Eulers")
+  dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
   err = orient.change_angle_representation(dca, 1, dap)
   if err < 0:
-    print("change_angle_representation ErrorCondition: %d" % err)
+    print('change_angle_representation ErrorCondition: %d' % err)
 
   # Convert in-place to an numpy array
   np_eulers = np.asarray(eulers)
@@ -136,22 +126,17 @@ def Test3():
   assert np_rads.flags.contiguous, 'Only contiguous arrays are supported.'
   
   # Create the wrapped DataArray<float> object
-  simpl_rads = simpl.FloatArrayType(np_rads, "Eulers as Rads", False)
+  simpl_rads = simpl.FloatArray(np_rads, 'Eulers as Rads', False)
   # Add the DataArray to the AttributeMatrix
   cellAm.addOrReplaceAttributeArray(simpl_rads)
 
   # Write to DREAM3D file
-  err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/Python_RoundTrip/RoundTripTest.dream3d", dca)
+  err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/Python_RoundTrip/RoundTripTest.dream3d', dca)
   if err < 0:
-      print("WriteDREAM3DFile ErrorCondition: %d" % err)
- 
-
+      print('WriteDREAM3DFile ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   Test1()
   Test2()
   Test3()
-  print("[NumPy_Round_Trip] Complete")
+  print('[NumPy_Round_Trip] Complete')
diff --git a/Wrapping/Python/Testing/Remove_Component_From_Array.py b/Wrapping/Python/Testing/Remove_Component_From_Array.py
index 00a415b779..d0d134fe3e 100644
--- a/Wrapping/Python/Testing/Remove_Component_From_Array.py
+++ b/Wrapping/Python/Testing/Remove_Component_From_Array.py
@@ -1,148 +1,141 @@
 # Pipeline : Remove Component From Array Filter Test
 # Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
 
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def remove_component_from_array_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Confidence Index').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'CriticalField').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'EulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureReferenceMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Fit').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'GBManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'IPFColor').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Image Quality').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'KernelAverageMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Mask').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'QPManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Quats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'SEM Signal').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'TJManhattanDistances').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'CrystalStructures').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'LatticeConstants').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'MaterialName').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Active').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AspectRatios').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEuler').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgQuats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisLengths').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Centroids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'CriticalFields').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'EquivalentDiameters').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'FeatureAvgMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'MisorientationList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborhoodList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Neighborhoods').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumElements').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors2').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Omega3s').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Poles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Schmids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Shape Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SharedSurfaceAreaList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Size Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SlipSystems').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Sphericity').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SurfaceAreaVolumeRatio').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('NewGrain Data').getDataArrayProxy(
+        'Active').Flag = 2
 
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
                                         False, dcap)
     if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
+        print('DataContainerReader ErrorCondition %d' % err)
         
     # Remove Component From Array
     err = simplpy.remove_component_from_array(dca,
-                                              simpl.DataArrayPath("Small IN100",
-                                                                  "Grain Data",
-                                                                  "AxisEulerAngles"), 2, True,
-                                              "AxisEulerAngles_RemovedComp",
-                                              "AxisEulerAngles_Reduced")
+                                              simpl.DataArrayPath('Small IN100',
+                                                                  'Grain Data',
+                                                                  'AxisEulerAngles'), 2, True,
+                                              'AxisEulerAngles_RemovedComp',
+                                              'AxisEulerAngles_Reduced')
     if err < 0:
-        print("RemoveComponentFromArray ErrorCondition %d" % err)
+        print('RemoveComponentFromArray ErrorCondition %d' % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
-                              "RemoveComponentFromArray.dream3d",
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
+                              'RemoveComponentFromArray.dream3d',
                               dca)
     if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
+        print('WriteDREAM3DFile ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     remove_component_from_array_test()
diff --git a/Wrapping/Python/Testing/Rename_Attribute_Array.py b/Wrapping/Python/Testing/Rename_Attribute_Array.py
index ce2ad33d43..766a207810 100644
--- a/Wrapping/Python/Testing/Rename_Attribute_Array.py
+++ b/Wrapping/Python/Testing/Rename_Attribute_Array.py
@@ -1,146 +1,139 @@
 # Pipeline : Rename Attribute Array Filter Test
 # Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
 
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
-
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def rename_array_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Confidence Index').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'CriticalField').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'EulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureReferenceMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Fit').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'GBManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'IPFColor').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Image Quality').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'KernelAverageMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Mask').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'QPManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Quats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'SEM Signal').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'TJManhattanDistances').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'CrystalStructures').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'LatticeConstants').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'MaterialName').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Active').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AspectRatios').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEuler').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgQuats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisLengths').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Centroids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'CriticalFields').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'EquivalentDiameters').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'FeatureAvgMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'MisorientationList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborhoodList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Neighborhoods').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumElements').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors2').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Omega3s').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Poles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Schmids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Shape Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SharedSurfaceAreaList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Size Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SlipSystems').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Sphericity').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SurfaceAreaVolumeRatio').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('NewGrain Data').getDataArrayProxy(
+        'Active').Flag = 2
 
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
                                         False, dcap)
     if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
+        print('DataContainerReader ErrorCondition %d' % err)
         
     # Rename Attribute Array
     err = simplpy.rename_attribute_array(dca,
-                                         simpl.DataArrayPath("Small IN100", "EBSD Scan Data",
-                                                             "IPFColor"),
-                                         "InversePoleFigureColor")
+                                         simpl.DataArrayPath('Small IN100', 'EBSD Scan Data',
+                                                             'IPFColor'),
+                                         'InversePoleFigureColor')
     if err < 0:
-        print("RenameAttributeArray ErrorCondition %d" % err)
+        print('RenameAttributeArray ErrorCondition %d' % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
-                              "RenameAttributeArray.dream3d",
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
+                              'RenameAttributeArray.dream3d',
                               dca)
     if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
+        print('WriteDREAM3DFile ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     rename_array_test()
diff --git a/Wrapping/Python/Testing/Split_Attribute_Array.py b/Wrapping/Python/Testing/Split_Attribute_Array.py
index e403bc86e3..425748d0b6 100644
--- a/Wrapping/Python/Testing/Split_Attribute_Array.py
+++ b/Wrapping/Python/Testing/Split_Attribute_Array.py
@@ -1,149 +1,144 @@
 # Pipeline : Split Attribute Array Filter Test
 # Based on (01) SmallIN100 Quick Mesh (from EBSD Surface Meshing)
 
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
-
-import datetime as datetime
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
+import datetime
 
 def split_array_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray.New()
+    dca = simpl.DataContainerArray()
 
     # Read DREAM3D File
     dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Confidence Index").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "CriticalField").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "EulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "FeatureReferenceMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Fit").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "GBManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "IPFColor").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Image Quality").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "KernelAverageMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Mask").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "QPManhattanDistances").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "Quats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "SEM Signal").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("EBSD Scan Data").getDataArrayProxy(
-        "TJManhattanDistances").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Confidence Index').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'CriticalField').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'EulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'FeatureReferenceMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Fit').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'GBManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'IPFColor').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Image Quality').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'KernelAverageMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Mask').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'QPManhattanDistances').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'Quats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'SEM Signal').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
+        'TJManhattanDistances').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "CrystalStructures").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "LatticeConstants").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Phase Data").getDataArrayProxy(
-        "MaterialName").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'CrystalStructures').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'LatticeConstants').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
+        'MaterialName').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Active").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AspectRatios").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEuler").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AvgQuats").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisEulerAngles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "AxisLengths").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Centroids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "CriticalFields").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "EquivalentDiameters").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "FeatureAvgMisorientations").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "MisorientationList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NeighborhoodList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Neighborhoods").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumElements").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "NumNeighbors2").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Omega3s").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "ParentIds").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Poles").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy("Phases").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Schmids").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Shape Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SharedSurfaceAreaList").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Size Volumes").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SlipSystems").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "Sphericity").Flag = 2
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("Grain Data").getDataArrayProxy(
-        "SurfaceAreaVolumeRatio").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Active').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AspectRatios').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEuler').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AvgQuats').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisEulerAngles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'AxisLengths').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Centroids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'CriticalFields').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'EquivalentDiameters').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'FeatureAvgMisorientations').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'MisorientationList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NeighborhoodList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Neighborhoods').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumElements').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'NumNeighbors2').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Omega3s').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'ParentIds').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Poles').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Phases').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Schmids').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Shape Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SharedSurfaceAreaList').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Size Volumes').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SlipSystems').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'Sphericity').Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
+        'SurfaceAreaVolumeRatio').Flag = 2
 
-    dcap.getDataContainerProxy("Small IN100").getAttributeMatrixProxy("NewGrain Data").getDataArrayProxy(
-        "Active").Flag = 2
+    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('NewGrain Data').getDataArrayProxy(
+        'Active').Flag = 2
 
     now_time = datetime.datetime.now()
     now_time_seconds = now_time.hour * 3600 + now_time.minute * 60 + now_time.second
     dt = simpl.DateTime(now_time.year, now_time.month, now_time.day, now_time_seconds)
     err = simplpy.data_container_reader(dca,
                                         sd.GetBuildDirectory() +
-                                        "/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d",
+                                        '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
                                         False, dcap)
     if err < 0:
-        print("DataContainerReader ErrorCondition %d" % err)
+        print('DataContainerReader ErrorCondition %d' % err)
         
     # Split Attribute Array
     err = simplpy.split_attribute_array(dca,
-                                        simpl.DataArrayPath("Small IN100", "Grain Data",
-                                                            "Centroids"),
-                                        "_Component_")
+                                        simpl.DataArrayPath('Small IN100', 'Grain Data',
+                                                            'Centroids'),
+                                        '_Component_')
     if err < 0:
-        print("SplitAttributeArray ErrorCondition %d" % err)
+        print('SplitAttributeArray ErrorCondition %d' % err)
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + "/Data/Output/CoreFilterTests/" +
-                              "SplitAttributeArray.dream3d",
+    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
+                              'SplitAttributeArray.dream3d',
                               dca)
     if err < 0:
-        print("WriteDREAM3DFile ErrorCondition: %d" % err)
-
+        print('WriteDREAM3DFile ErrorCondition: %d' % err)
 
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
     split_array_test()
diff --git a/Wrapping/Python/Testing/TestBindings.py b/Wrapping/Python/Testing/TestBindings.py
index 22fb361cb9..ff97f421de 100644
--- a/Wrapping/Python/Testing/TestBindings.py
+++ b/Wrapping/Python/Testing/TestBindings.py
@@ -1,16 +1,14 @@
-
 import time
 
-
 # These are the simpl_py python modules
-from dream3d import simplpy
-from dream3d import simpl
-from dream3d import simpl_helpers as sc
-from dream3d import simpl_test_dirs as sd
+import simpl
+import simplpy
+import simpl_helpers as sc
+import simpl_test_dirs as sd
 
 def PipelineTest():
-  inputPath = sd.GetTestTempDirectory() + "/SmallIN100.dream3d"
-  reader = simpl.DataContainerReader.New()
+  inputPath = sd.GetTestTempDirectory() + '/SmallIN100.dream3d'
+  reader = simpl.DataContainerReader()
   reader.InputFile = (inputPath)
   reader.OverwriteExistingDataContainers = (True)
   # This must be called to generate a default DataContainerArrayProxy object from the file structure
@@ -18,49 +16,42 @@ def PipelineTest():
   # Now set that proxy into the filter.
   reader.InputFileDataContainerArrayProxy = (dataContainerProxy)
 
-  print("humanLabel: %s " % reader.HumanLabel)
-  print("groupName: %s " % reader.GroupName)
-  print("subGroupName: %s " % reader.SubGroupName)
-  print("filterVersion: %s " % reader.FilterVersion)
-  print("compiledLibraryName: %s " % reader.CompiledLibraryName)
-
+  print('humanLabel: %s ' % reader.HumanLabel)
+  print('groupName: %s ' % reader.GroupName)
+  print('subGroupName: %s ' % reader.SubGroupName)
+  print('filterVersion: %s ' % reader.FilterVersion)
+  print('compiledLibraryName: %s ' % reader.CompiledLibraryName)
 
-  writer = simpl.DataContainerWriter.New()
-  writer.OutputFile = (sd.GetTestTempDirectory() + "/TestBindings.dream3d")
-  print("humanLabel: %s " % writer.HumanLabel)
-  print("groupName: %s " % writer.GroupName)
-  print("subGroupName: %s " % writer.SubGroupName)
-  print("filterVersion: %s " % writer.FilterVersion)
-  print("compiledLibraryName: %s " % writer.CompiledLibraryName)
+  writer = simpl.DataContainerWriter()
+  writer.OutputFile = (sd.GetTestTempDirectory() + '/TestBindings.dream3d')
+  print('humanLabel: %s ' % writer.HumanLabel)
+  print('groupName: %s ' % writer.GroupName)
+  print('subGroupName: %s ' % writer.SubGroupName)
+  print('filterVersion: %s ' % writer.FilterVersion)
+  print('compiledLibraryName: %s ' % writer.CompiledLibraryName)
 
-
-  pipeline = simpl.FilterPipeline.New()
-  pipeline.Name = ("New Pipeline")
-  print("Pipeline Name: %s " % pipeline.Name)
+  pipeline = simpl.FilterPipeline()
+  pipeline.Name = ('New Pipeline')
+  print('Pipeline Name: %s ' % pipeline.Name)
 
   pipeline.pushBack(reader)
   pipeline.pushBack(writer)
   filterCount = pipeline.size()
-  print("Filter Count: %d" % filterCount)
+  print('Filter Count: %d' % filterCount)
 
   err = pipeline.preflightPipeline()
-  print("Preflight ErrorCondition: %d" % err)
+  print('Preflight ErrorCondition: %d' % err)
 
-  dataContainer = pipeline.run()
+  pipeline.run()
   err = pipeline.ErrorCode
-  print("Execute ErrorCondition: %d" % err)
+  print('Execute ErrorCondition: %d' % err)
 
   pipeline.popFront()
   filterCount = pipeline.size()
-  print("Filter Count: %d" % filterCount)
+  print('Filter Count: %d' % filterCount)
 
   time.sleep(2)
 
-
-"""
-Main entry point for python script
-"""
-if __name__ == "__main__":
+if __name__ == '__main__':
   PipelineTest()
-  print("Test Complete")
-
+  print('Test Complete')

From 59739033572b2d710e413d5649db3e7a9bbca753 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 27 Apr 2020 11:23:53 -0400
Subject: [PATCH 198/397] Correctly list a header file using .h file.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/RESTClient/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/RESTClient/CMakeLists.txt b/Source/RESTClient/CMakeLists.txt
index ba0cdd52c8..a96c7d59f9 100755
--- a/Source/RESTClient/CMakeLists.txt
+++ b/Source/RESTClient/CMakeLists.txt
@@ -52,7 +52,7 @@ set(RESTClient_HDRS
   ${RESTClient_SOURCE_DIR}/mrestrequestmanager.h
   ${RESTClient_SOURCE_DIR}/mrestrequestptr.h
   ${RESTClient_SOURCE_DIR}/mrestrequestqueue.h
-  ${RESTClient_SOURCE_DIR}/RESTClientDLLExport
+  ${RESTClient_SOURCE_DIR}/RESTClientDLLExport.h
   ${RESTClient_SOURCE_DIR}/SIMPLClientRequest.h
   ${RESTClient_SOURCE_DIR}/SIMPLRestClient.h
   ${RESTClient_SOURCE_DIR}/userptr.h

From 23390163eb32654029d2a8f70babcf75a1978e4c Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 28 Apr 2020 14:17:52 -0400
Subject: [PATCH 199/397] Allowed use of Anaconda environment for Python tests

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                | 20 +++++
 .../Python/Binding/CreatePybind11Module.cmake | 77 ++++++++++++-------
 Wrapping/Python/Binding/anaconda_setup.sh     |  5 ++
 3 files changed, 75 insertions(+), 27 deletions(-)
 create mode 100755 Wrapping/Python/Binding/anaconda_setup.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2200f6622..113fc9f71c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,6 +477,26 @@ endif()
 # Find the Pybind11 installation
 option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
 if(SIMPL_ENABLE_PYTHON)
+  option(SIMPL_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
+
+  if(SIMPL_ANACONDA_PYTHON)
+    if(NOT ANACONDA_DIR)
+      message(FATAL_ERROR "ANACONDA_DIR is not set.")
+    endif()
+
+    if(NOT ANACONDA_ENVIRONMENT_NAME)
+      message(FATAL_ERROR "ANACONDA_ENVIRONMENT_NAME is not set.")
+    endif()
+
+    find_program(SIMPL_CONDA_EXECUTABLE
+      NAMES
+        "conda"
+        "conda.bat"
+      PATHS
+        ${ANACONDA_DIR}/condabin
+    )
+  endif()
+
   include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/CreatePybind11Module.cmake)
 
   get_target_property(SIMPL_PY_SOURCES SIMPLib SOURCES)
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index ba0196e6ac..bfdfc8cad4 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -1,3 +1,46 @@
+function(AddPythonTest)
+  set(options )
+  set(oneValueArgs NAME FILE)
+  set(multiValueArgs PYTHONPATH)
+  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if(SIMPL_ANACONDA_PYTHON)
+    if(WIN32)
+      add_test(NAME ${ARGS_NAME}
+        COMMAND ${SIMPL_CONDA_EXECUTABLE} "activate" ${ANACONDA_ENVIRONMENT_NAME} "&&" "python" ${ARGS_FILE}
+      )
+    else()
+      add_test(NAME ${ARGS_NAME}
+        COMMAND ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/anaconda_setup.sh "&&" "python" ${ARGS_FILE}
+      )
+
+      set_property(TEST ${ARGS_NAME}
+        PROPERTY
+          ENVIRONMENT
+            "SIMPL_ANACONDA_DIR=${ANACONDA_DIR}"
+            "SIMPL_CONDA_ENV=${ANACONDA_ENVIRONMENT_NAME}"
+      )
+    endif()
+  else()
+    add_test(NAME ${ARGS_NAME}
+      COMMAND ${PYTHON_EXECUTABLE} ${ARGS_FILE}
+    )
+  endif()
+
+  if(WIN32)
+    string(REPLACE ";" "\\;" ARGS_PYTHONPATH "${ARGS_PYTHONPATH}")
+  else()
+    string(REPLACE ";" ":" ARGS_PYTHONPATH "${ARGS_PYTHONPATH}")
+  endif()
+
+  set_property(TEST ${ARGS_NAME}
+    APPEND
+    PROPERTY
+      ENVIRONMENT
+      "PYTHONPATH=${ARGS_PYTHONPATH}"
+  )
+endfunction()
+
 function(CreatePybind11Module)
   set(options PLUGIN)
   set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
@@ -64,21 +107,9 @@ function(CreatePybind11Module)
     "$<TARGET_FILE_DIR:simpl>"
   )
 
-  if(WIN32)
-    string(REPLACE ";" "\\;" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
-  else()
-    string(REPLACE ";" ":" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
-  endif()
-
-  set(PYTHON_UNIT_TEST_NAME PY_${ARGS_MODULE_NAME}_UnitTest)
-
-  add_test(NAME ${PYTHON_UNIT_TEST_NAME}
-    COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_UNIT_TEST_FILE}
-  )
-
-  set_tests_properties(${PYTHON_UNIT_TEST_NAME}
-    PROPERTIES
-      ENVIRONMENT "PYTHONPATH=${TESTS_PYTHONPATH}"
+  AddPythonTest(NAME PY_${ARGS_MODULE_NAME}_UnitTest
+    FILE ${PYTHON_UNIT_TEST_FILE}
+    PYTHONPATH ${TESTS_PYTHONPATH}
   )
 endfunction()
 
@@ -117,21 +148,13 @@ function(CreatePythonTests)
     "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d/$<CONFIG>"
   )
 
-  if(WIN32)
-    string(REPLACE ";" "\\;" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
-  else()
-    string(REPLACE ";" ":" TESTS_PYTHONPATH "${TESTS_PYTHONPATH}")
-  endif()
-
   foreach(test ${ARGS_TEST_NAMES})
     string(REPLACE "/" "_" test_name ${test})
     set(PY_TEST_NAME ${ARGS_PREFIX}_${test_name})
-    add_test(NAME ${PY_TEST_NAME}
-      COMMAND ${PYTHON_EXECUTABLE} "${ARGS_INPUT_DIR}/${test}.py"
-    )
-    set_tests_properties(${PY_TEST_NAME}
-      PROPERTIES
-        ENVIRONMENT "PYTHONPATH=${TESTS_PYTHONPATH}"
+
+    AddPythonTest(NAME ${PY_TEST_NAME}
+      FILE ${ARGS_INPUT_DIR}/${test}.py
+      PYTHONPATH ${TESTS_PYTHONPATH}
     )
   endforeach()
 endfunction()
diff --git a/Wrapping/Python/Binding/anaconda_setup.sh b/Wrapping/Python/Binding/anaconda_setup.sh
new file mode 100755
index 0000000000..d809708bff
--- /dev/null
+++ b/Wrapping/Python/Binding/anaconda_setup.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source "$SIMPL_ANACONDA_DIR"/etc/profile.d/conda.sh
+
+conda activate "$SIMPL_CONDA_ENV"

From 82da9d0af29b3dbf25130f62a6ceebdad719df91 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 28 Apr 2020 14:39:33 -0400
Subject: [PATCH 200/397] Renamed SIMPL_ANACONDA_PYTHON to
 SIMPL_USE_ANACONDA_PYTHON

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                     | 4 ++--
 Wrapping/Python/Binding/CreatePybind11Module.cmake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 113fc9f71c..7770be8072 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,9 +477,9 @@ endif()
 # Find the Pybind11 installation
 option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
 if(SIMPL_ENABLE_PYTHON)
-  option(SIMPL_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
+  option(SIMPL_USE_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
 
-  if(SIMPL_ANACONDA_PYTHON)
+  if(SIMPL_USE_ANACONDA_PYTHON)
     if(NOT ANACONDA_DIR)
       message(FATAL_ERROR "ANACONDA_DIR is not set.")
     endif()
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index bfdfc8cad4..f1f9dc5324 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -4,7 +4,7 @@ function(AddPythonTest)
   set(multiValueArgs PYTHONPATH)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  if(SIMPL_ANACONDA_PYTHON)
+  if(SIMPL_USE_ANACONDA_PYTHON)
     if(WIN32)
       add_test(NAME ${ARGS_NAME}
         COMMAND ${SIMPL_CONDA_EXECUTABLE} "activate" ${ANACONDA_ENVIRONMENT_NAME} "&&" "python" ${ARGS_FILE}

From a37eff39e85919844e83185501488396b284be2a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 27 Apr 2020 18:33:39 -0400
Subject: [PATCH 201/397] Replace use of QPair with std::pair for FPRangePair
 typedef

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../AbstractFilterParametersReader.cpp        |  4 ++--
 .../AbstractFilterParametersReader.h          |  3 ++-
 .../H5FilterParametersReader.cpp              |  4 ++--
 .../H5FilterParametersReader.h                |  2 +-
 .../FilterParameters/RangeFilterParameter.cpp | 16 +++++++-------
 .../FilterParameters/RangeFilterParameter.h   | 10 ++++-----
 .../Testing/Cxx/FilterParametersRWTest.cpp    | 21 +++++++++----------
 Source/SIMPLib/TestFilters/GenericExample.h   |  2 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |  2 +-
 .../Python/Binding/Pybind11CustomTypeCasts.h  |  3 +++
 10 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index 414581959d..7e05da344d 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -544,13 +544,13 @@ DynamicTableData AbstractFilterParametersReader::readDynamicTableData(const QStr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QPair<double, double> AbstractFilterParametersReader::readPairOfDoubles(const QString& name, QPair<double, double> v)
+FPRangePair AbstractFilterParametersReader::readPairOfDoubles(const QString& name, const FPRangePair& v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
 
   // This should never be executed
-  return QPair<double, double>();
+  return {};
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 34dc1eebec..d45ec61d88 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -49,6 +49,7 @@
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 #include "SIMPLib/SIMPLib.h"
@@ -132,7 +133,7 @@ class SIMPLib_EXPORT AbstractFilterParametersReader
 
     virtual DynamicTableData readDynamicTableData(const QString& name, DynamicTableData v);
 
-    virtual QPair<double, double> readPairOfDoubles(const QString& name, QPair<double, double> v);
+    virtual FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v);
 
   protected:
     AbstractFilterParametersReader();
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index fa32d1c971..93618e4fcf 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -1237,7 +1237,7 @@ DynamicTableData H5FilterParametersReader::readDynamicTableData(const QString& n
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QPair<double, double> H5FilterParametersReader::readPairOfDoubles(const QString& name, QPair<double, double> v)
+FPRangePair H5FilterParametersReader::readPairOfDoubles(const QString& name, const FPRangePair& v)
 {
   /*int err = QH5Lite::writeScalarAttribute(m_CurrentGroupId, name, "Min", v.first);
   if (err < 0) { return err; }
@@ -1258,7 +1258,7 @@ QPair<double, double> H5FilterParametersReader::readPairOfDoubles(const QString&
     return v;
   }
 
-  QPair<double, double> value;
+  FPRangePair value;
   value.first = min;
   value.second = max;
   return value;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index f364e62fb5..ca63d51760 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -169,7 +169,7 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
     QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> def) override;
     DynamicTableData readDynamicTableData(const QString& name, DynamicTableData def) override;
 
-    QPair<double, double> readPairOfDoubles(const QString& name, QPair<double, double> v) override;
+    FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v) override;
 
   protected:
     H5FilterParametersReader();
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 3602e58b3b..488a27268d 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -48,7 +48,7 @@ RangeFilterParameter::~RangeFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RangeFilterParameter::Pointer RangeFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QPair<double, double>& defaultPair, Category category,
+RangeFilterParameter::Pointer RangeFilterParameter::New(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category,
                                                         const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
@@ -85,12 +85,12 @@ void RangeFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
-    QPair<double, double> pair;
+    FPRangePair dataPair;
 
-    pair.first = obj["Min"].toDouble();
-    pair.second = obj["Max"].toDouble();
+    dataPair.first = obj["Min"].toDouble();
+    dataPair.second = obj["Max"].toDouble();
 
-    m_SetterCallback(pair);
+    m_SetterCallback(dataPair);
   }
 }
 
@@ -101,11 +101,11 @@ void RangeFilterParameter::writeJson(QJsonObject& json)
 {
   if (m_GetterCallback)
   {
-    QPair<double, double> pair = m_GetterCallback();
+    FPRangePair dataPair = m_GetterCallback();
     QJsonObject obj;
 
-    obj["Min"] = pair.first;
-    obj["Max"] = pair.second;
+    obj["Min"] = dataPair.first;
+    obj["Max"] = dataPair.second;
 
     json[getPropertyName()] = obj;
   }
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 4f08db3fd8..244175c2a8 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -36,13 +36,13 @@
 #pragma once
 
 #include <memory>
+#include <utility>
 
 #include <QtCore/QJsonObject>
-#include <QtCore/QPair>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
-typedef QPair<double, double> FPRangePair;
+typedef std::pair<double, double> FPRangePair;
 
 /**
  * @brief SIMPL_NEW_RANGE_FP This macro is a short-form way of instantiating an instance of
@@ -75,8 +75,8 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
 
   static Pointer New();
 
-  typedef std::function<void(QPair<double, double>)> SetterCallbackType;
-  typedef std::function<QPair<double, double>(void)> GetterCallbackType;
+  typedef std::function<void(FPRangePair)> SetterCallbackType;
+  typedef std::function<FPRangePair(void)> GetterCallbackType;
 
   /**
    * @brief New This function instantiates an instance of the RangeFilterParameter. Although this function is available to be used,
@@ -94,7 +94,7 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QPair<double, double>& defaultPair, Category category, const SetterCallbackType& setterCallback,
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category, const SetterCallbackType& setterCallback,
                      const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   /**
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index d59b29085c..9f1eecbb76 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -78,6 +78,7 @@
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -748,34 +749,32 @@ class FilterParametersRWTest
   //  SIMPL_INSTANCE_PROPERTY(UInt32Vector_t, UInt32Vector_2)
   //  Q_PROPERTY(UInt32Vector_t UInt32Vector_2 READ getUInt32Vector_2 WRITE setUInt32Vector_2)
 
-  typedef QPair<double, double> DoublesPair;
-
   // -----------------------------------------------------------------------------
-  void setPair1(const DoublesPair& value)
+  void setPair1(const FPRangePair& value)
   {
     m_Pair1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  DoublesPair getPair1() const
+  FPRangePair getPair1() const
   {
     return m_Pair1;
   }
 
-  Q_PROPERTY(DoublesPair Pair1 READ getPair1 WRITE setPair1)
+  Q_PROPERTY(FPRangePair Pair1 READ getPair1 WRITE setPair1)
   // -----------------------------------------------------------------------------
-  void setPair2(const DoublesPair& value)
+  void setPair2(const FPRangePair& value)
   {
     m_Pair2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  DoublesPair getPair2() const
+  FPRangePair getPair2() const
   {
     return m_Pair2;
   }
 
-  Q_PROPERTY(DoublesPair Pair2 READ getPair2 WRITE setPair2)
+  Q_PROPERTY(FPRangePair Pair2 READ getPair2 WRITE setPair2)
 
   // -----------------------------------------------------------------------------
   //
@@ -1267,7 +1266,7 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
       DREAM3D_REQUIRE_EQUAL(m_Pair1.first, m_Pair2.first)
       DREAM3D_REQUIRE_EQUAL(m_Pair1.second, m_Pair2.second)
 
-      m_Pair2 = DoublesPair();
+      m_Pair2 = FPRangePair();
     }
 
     {
@@ -1451,8 +1450,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   ShapeType::Types m_ShapeTypeVector_2 = {};
   PhaseType::Types m_PhaseTypeVector_1 = {};
   PhaseType::Types m_PhaseTypeVector_2 = {};
-  DoublesPair m_Pair1 = {};
-  DoublesPair m_Pair2 = {};
+  FPRangePair m_Pair1 = {};
+  FPRangePair m_Pair2 = {};
 
   FilterParametersRWTest(const FilterParametersRWTest&); // Copy Constructor Not Implemented
   void operator=(const FilterParametersRWTest&);         // Move assignment Not Implemented
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 60bafb2982..393652c40d 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -51,6 +51,7 @@
 #include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -266,7 +267,6 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
 
   Q_PROPERTY(int PhaseCount READ getPhaseCount WRITE setPhaseCount)
 
-  typedef QPair<double, double> FPRangePair;
   /**
    * @brief Setter property for InitRange
    */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index f9727994c5..606ef58b6f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -122,7 +122,7 @@ void RangeWidget::on_maxValue_textChanged(const QString& text)
 // -----------------------------------------------------------------------------
 void RangeWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QPair<double, double> pair;
+  FPRangePair pair;
   pair.first = minValue->text().toDouble();
   pair.second = maxValue->text().toDouble();
 
diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index a1c7297e28..8f43dc93ef 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -94,6 +94,8 @@ struct type_caster<QString>
 #endif
   }
 };
+
+#if 0
 /* Create a TypeCaster for auto python tuple <--> QPair conversion */
 template <>
 struct type_caster<FPRangePair>
@@ -145,6 +147,7 @@ struct type_caster<FPRangePair>
     return py::tuple((src.first, src.second));
   }
 };
+#endif
 
 /* Create a TypeCaster for auto python dict <--> ASCIIWizardData conversion */
 template <>

From 1d9f731a77cec686073a3bcd7cf01dab6d401dd5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 27 Apr 2020 18:34:20 -0400
Subject: [PATCH 202/397] Fix Qt deprecation warnings

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../FilterParameterWidget.cpp                   | 17 +++++++----------
 .../FilterParameterWidgets/SourceList.cmake     |  2 +-
 .../Widgets/DataStructureTreeView.cpp           |  6 +++---
 .../ImportASCIIDataWizard/DataFormatPage.cpp    | 15 ++++++---------
 4 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 13912fe23f..116a6a25db 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -37,18 +37,17 @@
 #include <QtCore/QPropertyAnimation>
 #include <QtCore/QTimer>
 #include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+#include <QtCore/QDebug>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QGraphicsOpacityEffect>
 #include <QtWidgets/QMenu>
 
-#include <QtCore/QTextStream>
-
-#include <QtCore/QDebug>
+#include <QtGui/QScreen>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -230,17 +229,15 @@ void FilterParameterWidget::changeStyleSheet(Style style)
 QPoint FilterParameterWidget::adjustedMenuPosition(QToolButton* pushButton)
 {
   // Calculate the actual virtual desktop QRect.
-  int screenCount = QApplication::desktop()->screenCount();
+  QList<QScreen*> screens = QGuiApplication::screens();
   int xMin = std::numeric_limits<int>::max();
   int yMin = std::numeric_limits<int>::max();
   int xMax = std::numeric_limits<int>::min();
   int yMax = std::numeric_limits<int>::min();
   QRect virtDesktopRect;
-  for(int i = 0; i < screenCount; i++)
+  for(const auto& screen : screens)
   {
-    QRect rect = QApplication::desktop()->availableGeometry(i);
-    // qDebug() << i << "\t" << rect;
-
+    QRect rect = screen->availableGeometry();
     if(rect.x() < xMin)
     {
       xMin = rect.x();
@@ -290,7 +287,7 @@ QPoint FilterParameterWidget::adjustedMenuPosition(QToolButton* pushButton)
   point.setY(globalButtonCoords.y());
 
   int screenNum = QApplication::desktop()->screenNumber(pushButton);
-  int desktopHeight = QApplication::desktop()->availableGeometry(screenNum).height();
+  int desktopHeight = screens.at(screenNum)->availableGeometry().height();
 
   if(point.y() > desktopHeight)
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index 0a98c38461..8515c7f74d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -164,7 +164,7 @@ file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "else {\n")
 file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return  {FPCodeGenerator::New(humanLabel, propertyName, fpCategory, initValue)};\n}\n")
 #file(APPEND ${FILTER_PARAMETER_CODEGEN_FILE} "  return ptr;\n}\n\n")
 
-file(APPEND  ${FILTER_PARAMETER_TYPELIST_FILE} "qSort(list.begin(), list.end());\nreturn list;\n")
+file(APPEND  ${FILTER_PARAMETER_TYPELIST_FILE} "std::sort(list.begin(), list.end());\nreturn list;\n")
 
 cmpReplaceFileIfDifferent(OLD_FILE_PATH ${SVWidgetsLib_BINARY_DIR}/FilterWidgetManager_RegisterWidgets.cpp
                           NEW_FILE_PATH ${SVWidgetsLib_BINARY_DIR}/FilterWidgetManager_RegisterWidgets_tmp.cpp)
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 225ea0d7ce..39bf98e9c5 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -845,11 +845,11 @@ QStandardItem* DataStructureTreeView::getOrCreateItem(QStandardItem* parentItem,
 void DataStructureTreeView::rowsInserted(const QModelIndex& parent, int start, int end)
 {
   QTreeView::rowsInserted(parent, start, end);
-
   // Expand if the specified parent did not have children previously
-  if(0 == start && !parent.child(end + 1, 0).isValid())
+  if(this->model())
   {
-    expand(parent);
+    if(0 == start && !model()->index(end + 1, 0, parent).isValid())
+      expand(parent);
   }
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 2ad37f1953..13640e0ca4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -36,14 +36,13 @@
 #include "DataFormatPage.h"
 
 #include <QtCore/QSignalMapper>
+#include <QtCore/QDebug>
 
+#include <QtGui/QScreen>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QMenu>
 
-#include <QtCore/QDebug>
-
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
@@ -600,17 +599,15 @@ bool DataFormatPage::eventFilter(QObject* obj, QEvent* event)
 QPoint DataFormatPage::adjustedMenuPosition(QPushButton* pushButton)
 {
   // Calculate the actual virtual desktop QRect.
-  int screenCount = QApplication::desktop()->screenCount();
+  QList<QScreen*> screens = QGuiApplication::screens();
   int xMin = std::numeric_limits<int>::max();
   int yMin = std::numeric_limits<int>::max();
   int xMax = std::numeric_limits<int>::min();
   int yMax = std::numeric_limits<int>::min();
   QRect virtDesktopRect;
-  for(int i = 0; i < screenCount; i++)
+  for(const auto& screen : screens)
   {
-    QRect rect = QApplication::desktop()->availableGeometry(i);
-    // qDebug() << i << "\t" << rect;
-
+    QRect rect = screen->availableGeometry();
     if(rect.x() < xMin)
     {
       xMin = rect.x();
@@ -659,7 +656,7 @@ QPoint DataFormatPage::adjustedMenuPosition(QPushButton* pushButton)
   //point.setY(globalButtonCoords.y());
 
   int screenNum = QApplication::desktop()->screenNumber(pushButton);
-  int desktopHeight = QApplication::desktop()->availableGeometry(screenNum).height();
+  int desktopHeight = screens.at(screenNum)->availableGeometry().height();
 
   if(point.y() > desktopHeight)
   {

From 9c205ecb6b2ebb57626d6f80df95e246f7bd6cb1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 30 Apr 2020 12:25:59 -0400
Subject: [PATCH 203/397] Fix compiler warnings in DataArray.cpp

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 96 +++++++++++--------------
 1 file changed, 43 insertions(+), 53 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index b608d5a6dc..2d3df16932 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -35,61 +35,52 @@
 
 #include "DataArray.hpp"
 
-namespace
-{
-uint16_t byteSwap16(uint16_t value)
-{
-  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);
-}
-
-uint32_t byteSwap32(uint32_t value)
-{
-  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);
-}
-
-uint64_t byteSwap64(uint64_t value)
-{
-  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |
-         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);
-}
-
-}
+#define DATA_ARRAY_BYTE_SWAP_FUNCTIONS\
+namespace {\
+uint16_t byteSwap16(uint16_t value) {  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);}\
+uint32_t byteSwap32(uint32_t value){  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);}\
+uint64_t byteSwap64(uint64_t value){\
+  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |\
+         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);\
+}}
 
 #ifndef SIMPL_BYTE_SWAP_NO_INTRINSICS
 
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#if defined(_MSC_VER)
-#include <cstdlib>
-#define SIMPL_BYTE_SWAP_16(x) _byteswap_ushort(x)
-#define SIMPL_BYTE_SWAP_32(x) _byteswap_ulong(x)
-#define SIMPL_BYTE_SWAP_64(x) _byteswap_uint64(x)
+  #ifndef __has_builtin
+  #define __has_builtin(x) 0
+  #endif
+
+  #if defined(_MSC_VER)
+    #include <cstdlib>
+    #define SIMPL_BYTE_SWAP_16(x) _byteswap_ushort(x)
+    #define SIMPL_BYTE_SWAP_32(x) _byteswap_ulong(x)
+    #define SIMPL_BYTE_SWAP_64(x) _byteswap_uint64(x)
+
+  #elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+    #if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
+    #define SIMPL_BYTE_SWAP_16(x) __builtin_bswap16(x)
+    #else
+    #define SIMPL_BYTE_SWAP_16(x) __builtin_bswap32((x) << 16)
+    #endif
+    #define SIMPL_BYTE_SWAP_32(x) __builtin_bswap32(x)
+    #define SIMPL_BYTE_SWAP_64(x) __builtin_bswap64(x)
+  #elif defined(__linux__)
+    #include <byteswap.h>
+    #define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
+    #define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
+    #define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
+  #else
+    DATA_ARRAY_BYTE_SWAP_FUNCTIONS
+    #define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+    #define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+    #define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
+  #endif
 
-#elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
-#if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
-#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap16(x)
-#else
-#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap32((x) << 16)
-#endif
-#define SIMPL_BYTE_SWAP_32(x) __builtin_bswap32(x)
-#define SIMPL_BYTE_SWAP_64(x) __builtin_bswap64(x)
-#elif defined(__linux__)
-#include <byteswap.h>
-#define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
-#define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
-#define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
 #else
-#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
-#endif
-
-#else
-#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
+  DATA_ARRAY_BYTE_SWAP_FUNCTIONS
+  #define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+  #define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+  #define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
 #endif // SIMPL_BYTE_SWAP_NO_INTRINSICS
 
 #include <string>
@@ -185,8 +176,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(compDims)
 , m_InitValue(initValue)
+, m_CompDims(compDims)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
@@ -204,8 +195,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue, bool allocate)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(compDims)
 , m_InitValue(initValue)
+, m_CompDims(compDims)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   if(allocate)
@@ -1041,7 +1032,6 @@ template <typename T>
 void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   int32_t precision = out.realNumberPrecision();
-  T value = static_cast<T>(0x00);
   if(std::is_same<T, float>::value)
   {
     out.setRealNumberPrecision(8);

From 19c5c1bcdd8b3f65c3cecb8cff8f2a180a7d284f Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 30 Apr 2020 14:18:16 -0400
Subject: [PATCH 204/397] Revert "Fix compiler warnings in DataArray.cpp"

This reverts commit 9c205ecb6b2ebb57626d6f80df95e246f7bd6cb1.
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 96 ++++++++++++++-----------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 2d3df16932..b608d5a6dc 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -35,52 +35,61 @@
 
 #include "DataArray.hpp"
 
-#define DATA_ARRAY_BYTE_SWAP_FUNCTIONS\
-namespace {\
-uint16_t byteSwap16(uint16_t value) {  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);}\
-uint32_t byteSwap32(uint32_t value){  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);}\
-uint64_t byteSwap64(uint64_t value){\
-  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |\
-         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);\
-}}
+namespace
+{
+uint16_t byteSwap16(uint16_t value)
+{
+  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);
+}
+
+uint32_t byteSwap32(uint32_t value)
+{
+  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);
+}
+
+uint64_t byteSwap64(uint64_t value)
+{
+  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |
+         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);
+}
+
+}
 
 #ifndef SIMPL_BYTE_SWAP_NO_INTRINSICS
 
-  #ifndef __has_builtin
-  #define __has_builtin(x) 0
-  #endif
-
-  #if defined(_MSC_VER)
-    #include <cstdlib>
-    #define SIMPL_BYTE_SWAP_16(x) _byteswap_ushort(x)
-    #define SIMPL_BYTE_SWAP_32(x) _byteswap_ulong(x)
-    #define SIMPL_BYTE_SWAP_64(x) _byteswap_uint64(x)
-
-  #elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
-    #if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
-    #define SIMPL_BYTE_SWAP_16(x) __builtin_bswap16(x)
-    #else
-    #define SIMPL_BYTE_SWAP_16(x) __builtin_bswap32((x) << 16)
-    #endif
-    #define SIMPL_BYTE_SWAP_32(x) __builtin_bswap32(x)
-    #define SIMPL_BYTE_SWAP_64(x) __builtin_bswap64(x)
-  #elif defined(__linux__)
-    #include <byteswap.h>
-    #define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
-    #define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
-    #define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
-  #else
-    DATA_ARRAY_BYTE_SWAP_FUNCTIONS
-    #define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-    #define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-    #define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
-  #endif
+#ifndef __has_builtin
+#define __has_builtin(x) 0
+#endif
+
+#if defined(_MSC_VER)
+#include <cstdlib>
+#define SIMPL_BYTE_SWAP_16(x) _byteswap_ushort(x)
+#define SIMPL_BYTE_SWAP_32(x) _byteswap_ulong(x)
+#define SIMPL_BYTE_SWAP_64(x) _byteswap_uint64(x)
 
+#elif(defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+#if(defined(__clang__) && __has_builtin(__builtin_bswap16)) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
+#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap16(x)
+#else
+#define SIMPL_BYTE_SWAP_16(x) __builtin_bswap32((x) << 16)
+#endif
+#define SIMPL_BYTE_SWAP_32(x) __builtin_bswap32(x)
+#define SIMPL_BYTE_SWAP_64(x) __builtin_bswap64(x)
+#elif defined(__linux__)
+#include <byteswap.h>
+#define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
+#define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
+#define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
 #else
-  DATA_ARRAY_BYTE_SWAP_FUNCTIONS
-  #define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-  #define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-  #define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
+#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
+#endif
+
+#else
+#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
+#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
+#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
 #endif // SIMPL_BYTE_SWAP_NO_INTRINSICS
 
 #include <string>
@@ -176,8 +185,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_InitValue(initValue)
 , m_CompDims(compDims)
+, m_InitValue(initValue)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
@@ -195,8 +204,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue, bool allocate)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_InitValue(initValue)
 , m_CompDims(compDims)
+, m_InitValue(initValue)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   if(allocate)
@@ -1032,6 +1041,7 @@ template <typename T>
 void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   int32_t precision = out.realNumberPrecision();
+  T value = static_cast<T>(0x00);
   if(std::is_same<T, float>::value)
   {
     out.setRealNumberPrecision(8);

From 65cbad5b4c81834dc6dac76b4c43b78668fc3e3d Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 29 Apr 2020 13:11:06 -0400
Subject: [PATCH 205/397] Removed option to turn off usage of byte swap
 compiler intrinsic

* All compilers that we support have intrinsic byte swap functions
defined
* Fixed use of undefined behavior (violating strict aliasing) in
byte swap functions

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                          |  9 ---
 Source/SIMPLib/DataArrays/DataArray.cpp | 96 +++++++++++--------------
 2 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7770be8072..c28b52dc45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,15 +464,6 @@ include(${PROJECT_RESOURCES_DIR}/CPack/PackageProject.cmake)
 # Include any Support related CMake codes
 include(${SIMPLProj_SOURCE_DIR}/Support/Support.cmake)
 
-option(SIMPL_BYTE_SWAP_NO_INTRINSICS "Disable use of compiler intrinsics for byte swapping" OFF)
-
-if(SIMPL_BYTE_SWAP_NO_INTRINSICS)
-  target_compile_definitions(SIMPLib
-    PRIVATE
-      SIMPL_BYTE_SWAP_NO_INTRINSICS
-  )
-endif()
-
 # --------------------------------------------------------------------------
 # Find the Pybind11 installation
 option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index b608d5a6dc..3ab2afa244 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -35,28 +35,6 @@
 
 #include "DataArray.hpp"
 
-namespace
-{
-uint16_t byteSwap16(uint16_t value)
-{
-  return ((value & 0x00FF) << 8) | ((value & 0xFF00) >> 8);
-}
-
-uint32_t byteSwap32(uint32_t value)
-{
-  return ((value & 0x000000FF) << 24) | ((value & 0x0000FF00) << 8) | ((value & 0x00FF0000) >> 8) | ((value & 0xFF000000) >> 24);
-}
-
-uint64_t byteSwap64(uint64_t value)
-{
-  return ((value & 0x00000000000000FFULL) << 56) | ((value & 0x000000000000FF00ULL) << 40) | ((value & 0x0000000000FF0000ULL) << 24) | ((value & 0x00000000FF000000ULL) << 8) |
-         ((value & 0x000000FF00000000ULL) >> 8) | ((value & 0x0000FF0000000000ULL) >> 24) | ((value & 0x00FF000000000000ULL) >> 40) | ((value & 0xFF00000000000000ULL) >> 56);
-}
-
-}
-
-#ifndef SIMPL_BYTE_SWAP_NO_INTRINSICS
-
 #ifndef __has_builtin
 #define __has_builtin(x) 0
 #endif
@@ -80,18 +58,8 @@ uint64_t byteSwap64(uint64_t value)
 #define SIMPL_BYTE_SWAP_16(x) bswap_16(x)
 #define SIMPL_BYTE_SWAP_32(x) bswap_32(x)
 #define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
-#else
-#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
 #endif
 
-#else
-#define SIMPL_BYTE_SWAP_16(x) byteSwap16(x)
-#define SIMPL_BYTE_SWAP_32(x) byteSwap32(x)
-#define SIMPL_BYTE_SWAP_64(x) byteSwap64(x)
-#endif // SIMPL_BYTE_SWAP_NO_INTRINSICS
-
 #include <string>
 #include <cstring>
 #include <functional>
@@ -103,31 +71,54 @@ uint64_t byteSwap64(uint64_t value)
 
 namespace
 {
-template <class T>
-T byteSwap(T value)
+// Can be replaced with std::bit_cast in C++ 20
+
+template <class To, class From, class = std::enable_if_t<(sizeof(To) == sizeof(From)) && std::is_trivially_copyable<From>::value && std::is_trivial<To>::value>>
+To bit_cast(const From& src) noexcept
 {
-  static_assert(std::is_arithmetic<T>::value, "T must be an arithmetic type");
-  static_assert(sizeof(T) == 1 || sizeof(T) == 2 || sizeof(T) == 4 || sizeof(T) == 8, "sizeof(T) must be 1, 2, 4, or 8");
+  To dst;
+  std::memcpy(&dst, &src, sizeof(To));
+  return dst;
+}
 
-  if(sizeof(T) == 2)
-  {
-    return SIMPL_BYTE_SWAP_16(value);
-  }
-  else if(sizeof(T) == 4)
-  {
-    uint32_t* ptr = reinterpret_cast<uint32_t*>(&value);
-    uint32_t result = SIMPL_BYTE_SWAP_32(*ptr);
-    return *reinterpret_cast<T*>(&result);
-  }
-  else if(sizeof(T) == 8)
-  {
-    uint64_t* ptr = reinterpret_cast<uint64_t*>(&value);
-    uint64_t result = SIMPL_BYTE_SWAP_64(*ptr);
-    return *reinterpret_cast<T*>(&result);
-  }
+// SFINAE can be replaced with if constexpr in C++ 17
 
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint8_t)>* = nullptr>
+T byteSwap(T value)
+{
   return value;
 }
+
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint16_t)>* = nullptr>
+T byteSwap(T value)
+{
+  return SIMPL_BYTE_SWAP_16(value);
+}
+
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint32_t) && !std::is_floating_point<T>::value>* = nullptr>
+T byteSwap(T value)
+{
+  return SIMPL_BYTE_SWAP_32(value);
+}
+
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint32_t) && std::is_floating_point<T>::value>* = nullptr>
+T byteSwap(T value)
+{
+  return bit_cast<T>(SIMPL_BYTE_SWAP_32(bit_cast<uint32_t>(value)));
+}
+
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint64_t) && !std::is_floating_point<T>::value>* = nullptr>
+T byteSwap(T value)
+{
+  return SIMPL_BYTE_SWAP_64(value);
+}
+
+template <class T, std::enable_if_t<sizeof(T) == sizeof(uint64_t) && std::is_floating_point<T>::value>* = nullptr>
+T byteSwap(T value)
+{
+  return bit_cast<T>(SIMPL_BYTE_SWAP_64(bit_cast<uint64_t>(value)));
+}
+
 } // namespace
 
 template <typename T>
@@ -1041,7 +1032,6 @@ template <typename T>
 void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   int32_t precision = out.realNumberPrecision();
-  T value = static_cast<T>(0x00);
   if(std::is_same<T, float>::value)
   {
     out.setRealNumberPrecision(8);

From d2455e0f470e26267812b5df2a41fdc5748f34cf Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 29 Apr 2020 13:59:04 -0400
Subject: [PATCH 206/397] Fixed conda.exe being found instead of conda.bat

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c28b52dc45..b978f48e8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -479,13 +479,18 @@ if(SIMPL_ENABLE_PYTHON)
       message(FATAL_ERROR "ANACONDA_ENVIRONMENT_NAME is not set.")
     endif()
 
-    find_program(SIMPL_CONDA_EXECUTABLE
+    if(WIN32)
+      find_program(SIMPL_CONDA_EXECUTABLE
       NAMES
-        "conda"
         "conda.bat"
       PATHS
         ${ANACONDA_DIR}/condabin
-    )
+      )
+    
+      if(NOT SIMPL_CONDA_EXECUTABLE)
+        message(FATAL_ERROR "Unable to find conda.bat")
+      endif()
+    endif()
   endif()
 
   include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/CreatePybind11Module.cmake)

From bca588062f8ecd9e573f74eb29bcc5caef8b19c4 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 30 Apr 2020 14:38:28 -0400
Subject: [PATCH 207/397] Reapplied initialization order warning fix in
 DataArray.cpp

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 3ab2afa244..361deb7550 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -176,8 +176,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(compDims)
 , m_InitValue(initValue)
+, m_CompDims(compDims)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   m_Array = resizeAndExtend(m_NumTuples * m_NumComponents);
@@ -195,8 +195,8 @@ template <typename T>
 DataArray<T>::DataArray(size_t numTuples, const QString& name, const comp_dims_type& compDims, T initValue, bool allocate)
 : IDataArray(name)
 , m_NumTuples(numTuples)
-, m_CompDims(compDims)
 , m_InitValue(initValue)
+, m_CompDims(compDims)
 {
   m_NumComponents = std::accumulate(m_CompDims.cbegin(), m_CompDims.cend(), static_cast<size_t>(1), std::multiplies<>());
   if(allocate)

From b226f3411125a13a01dd059ffc293e8bebe11697 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 30 Apr 2020 15:50:11 -0400
Subject: [PATCH 208/397] Fixed conda executable using wrong cached value

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b978f48e8a..18141204d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -480,16 +480,9 @@ if(SIMPL_ENABLE_PYTHON)
     endif()
 
     if(WIN32)
-      find_program(SIMPL_CONDA_EXECUTABLE
-      NAMES
-        "conda.bat"
-      PATHS
-        ${ANACONDA_DIR}/condabin
-      )
-    
-      if(NOT SIMPL_CONDA_EXECUTABLE)
-        message(FATAL_ERROR "Unable to find conda.bat")
-      endif()
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda.bat)
+    else()
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda)
     endif()
   endif()
 

From 38bfc26c496f445699f484c21469cf906aa7762b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 1 May 2020 11:02:27 -0400
Subject: [PATCH 209/397] Fixed SIMPL_CONDA_EXECUTABLE caching

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18141204d8..320797e4e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -480,9 +480,9 @@ if(SIMPL_ENABLE_PYTHON)
     endif()
 
     if(WIN32)
-      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda.bat)
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda.bat CACHE FILEPATH "")
     else()
-      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda)
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda CACHE FILEPATH "")
     endif()
   endif()
 

From 7f12b9ad161d46efb70bfca39a1e1bb50a08d6a8 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 1 May 2020 14:49:08 -0400
Subject: [PATCH 210/397] Added CMake failure for if the system is big endian

* SIMPL doesn't support big endian so we fail fast

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index a082075729..2f2fcf5ade 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -40,6 +40,10 @@ set(SIMPLib_FILTER_DOC_DIR ${SIMPLib_SOURCE_DIR}/Documentation/${PROJECT_NAME}Fi
 
 include(${CMP_SOURCE_DIR}/cmpProject.cmake)
 
+if(BIGENDIAN)
+  message(FATAL_ERROR "Big endian architecture not supported")
+endif()
+
 #-- Configure Target Specific configuration file
 cmpConfigureFileWithMD5Check(CONFIGURED_TEMPLATE_PATH ${SIMPLib_SOURCE_DIR}/SIMPLibConfiguration.h.in
                              GENERATED_FILE_PATH ${SIMPLib_BINARY_DIR}/${CMP_TOP_HEADER_FILE})

From 9f3bc2240c87200e5ad580421a87538029e368d6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 2 May 2020 10:32:10 -0400
Subject: [PATCH 211/397] Print out the Start and End times when running a
 pipeline.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Filtering/FilterPipeline.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 78ea29c745..de7abd1bf9 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -863,6 +863,11 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
 
   m_Dca = dca;
 
+  QDateTime now = QDateTime::currentDateTime();
+  QString msg;
+  QTextStream out(&msg);
+  out << "Pipline Start: " << now.toString(Qt::ISODate);
+  notifyStatusMessage(msg);
   // Start looping through the Pipeline
   for(const auto& filt : m_Pipeline)
   {
@@ -911,6 +916,10 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
 
     notifyProgressMessage(static_cast<int>(static_cast<float>(filtIndex + 1) / (m_Pipeline.size()) * 100.0f), "");
   }
+  now = QDateTime::currentDateTime();
+  msg.clear();
+  out << "Pipline End: " << now.toString(Qt::ISODate);
+  notifyStatusMessage(msg);
 
   disconnectSignalsSlots();
 

From 88485ca0a1486d8239e4de0dcab011f5872cef28 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 2 May 2020 10:43:07 -0400
Subject: [PATCH 212/397] Do not read or write PreflightUpdatedValue Filter
 Parameters

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../PreflightUpdatedValueFilterParameter.cpp     | 16 ++++++++++++++++
 .../PreflightUpdatedValueFilterParameter.h       | 12 ++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index 8ca75e8486..c57d3ae110 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -35,6 +35,8 @@
 
 #include "PreflightUpdatedValueFilterParameter.h"
 
+#include <tuple>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -70,6 +72,20 @@ QString PreflightUpdatedValueFilterParameter::getWidgetType() const
   return QString("PreflightUpdatedValueWidget");
 }
 
+// -----------------------------------------------------------------------------
+void PreflightUpdatedValueFilterParameter::readJson(const QJsonObject& json)
+{
+  // We don't want to read this value. Reading does no good since it is a calculated value
+  std::ignore = json;
+}
+
+// -----------------------------------------------------------------------------
+void PreflightUpdatedValueFilterParameter::writeJson(QJsonObject& json)
+{
+  // We don't want to write this value. It serves no purpose saving the value
+  std::ignore = json;
+}
+
 // -----------------------------------------------------------------------------
 PreflightUpdatedValueFilterParameter::Pointer PreflightUpdatedValueFilterParameter::NullPointer()
 {
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index f63271eeb7..cc23d75c98 100755
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -128,6 +128,18 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
      */
     PreflightUpdatedValueFilterParameter::GetterCallbackType getGetterCallback() const;
 
+    /**
+     * @brief readJson
+     * @return
+     */
+    void readJson(const QJsonObject& json) override;
+
+    /**
+     * @brief writeJson
+     * @return
+     */
+    void writeJson(QJsonObject& json) override;
+
   protected:
       /**
        * @brief PreflightUpdatedValueFilterParameter The default constructor.  It is protected because this

From 0eac69db87c78e4f64fffb3e17dfedcd021d4006 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 4 May 2020 12:27:12 -0400
Subject: [PATCH 213/397] DOC: Rotate Sample Ref Frame with more explanation
 and images

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Images/RotateSampleRefFrame_1.png          | Bin 0 -> 144096 bytes
 .../CoreFilters/RotateSampleRefFrame.md        |   8 +++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/RotateSampleRefFrame_1.png

diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/RotateSampleRefFrame_1.png b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/Images/RotateSampleRefFrame_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb326849ef03a9718076877eede687fed0ae75ca
GIT binary patch
literal 144096
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

literal 0
HcmV?d00001

diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md
index 1ef88bb969..7cb03d7272 100644
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/RotateSampleRefFrame.md
@@ -1,4 +1,4 @@
-# Rotate Sample Reference Frame  #
+# Rotate Sample Reference Frame #
 
 ## Group (Subgroup) ##
 
@@ -16,6 +16,12 @@ The equivalent rotation matrix for the above rotation would be the following:
 | 1 | 0 | 0 |
 | 0 | 0 | 1 |
 
+## Example ##
+
+When importing EBSD data from EDAX typically the user will need to rotate the sample reference frame about the <010> (Y) axis. This results in the image comparison below. Note that in the original image the origin of the data is at (0, 0) microns but after rotation the origin now becomes (-189, 0) microns. If you need to reset the origin back to (0,0) then the filter "Set Origin & Spacing" can be run.
+
+![Imported EBSD Data Rotated about the <010> axis](Images/RotateSampleREfFrame_1.png)
+
 ## Parameters ##
 
 | Name | Type | Description |

From 3b62c9396d91b4c2a8f89e069a9837fc8715ed24 Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <jared.duffey@bluequartz.net>
Date: Thu, 7 May 2020 08:55:42 -0400
Subject: [PATCH 214/397] Implement DataArray iterators (#400)

* Fixed bug with DataArray iterators
* The operator+ was mistakenly implemented as operator+=
* Made iterator and const_iterator fulfill random accesss iterator
* Changed template begin() and end() to tupleBegin() and tupleEnd()
* Fixed difference_type typedef
* Remove unneeded iterator category
* Fixed implementation of max_size() to match std::vector
* Added more API to tuple iterators
* Changed uses of memcpy and some raw loops to use std algorithms
* Removed extra const
* Removed max_size() from DataArray
* Fixed iterator error

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp       | 258 +++++-----
 Source/SIMPLib/DataArrays/DataArray.hpp       | 483 +++++++++++++-----
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |   4 +-
 3 files changed, 497 insertions(+), 248 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 361deb7550..1c51a9a9f5 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -248,10 +248,7 @@ typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, int32
     return nullptr;
   }
   comp_dims_type cDims(static_cast<size_t>(rank));
-  for(size_t i = 0; i < static_cast<size_t>(rank); i++)
-  {
-    cDims[i] = dims[i];
-  }
+  std::copy(dims, dims + rank, cDims.begin());
   auto d = std::make_shared<DataArray<T>>(numTuples, name, cDims, static_cast<T>(0), allocate);
   if(allocate)
   {
@@ -323,29 +320,10 @@ IDataArray::Pointer DataArray<T>::createNewArray(size_t numTuples, const comp_di
 template <typename T>
 typename DataArray<T>::Pointer DataArray<T>::FromQVector(const QVector<T>& vec, const QString& name)
 {
-
   Pointer p = CreateArray(static_cast<size_t>(vec.size()), name, true);
   if(nullptr != p)
   {
-    std::memcpy(p->getPointer(0), vec.data(), static_cast<size_t>(vec.size()) * sizeof(T));
-  }
-  return p;
-}
-
-// -----------------------------------------------------------------------------
-template <>
-typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(const std::vector<bool>& vec, const QString& name)
-{
-  comp_dims_type cDims = {1};
-  Pointer p = CreateArray(vec.size(), cDims, name, true);
-  if(nullptr != p)
-  {
-    size_t i = 0;
-    for(const auto value : vec)
-    {
-      p->setValue(i, value);
-      i++;
-    }
+    std::copy(vec.cbegin(), vec.cend(), p->begin());
   }
   return p;
 }
@@ -358,7 +336,7 @@ typename DataArray<T>::Pointer DataArray<T>::FromStdVector(const std::vector<T>&
   Pointer p = CreateArray(vec.size(), cDims, name, true);
   if(nullptr != p)
   {
-    std::memcpy(p->getPointer(0), &(vec.front()), vec.size() * sizeof(T));
+    std::copy(vec.cbegin(), vec.cend(), p->begin());
   }
   return p;
 }
@@ -370,7 +348,7 @@ typename DataArray<T>::Pointer DataArray<T>::CopyFromPointer(const T* data, size
   Pointer p = CreateArray(size, name, true);
   if(nullptr != p)
   {
-    std::memcpy(p->getPointer(0), data, size * sizeof(T));
+    std::copy(data, data + size, p->begin());
   }
   return p;
 }
@@ -392,8 +370,10 @@ typename DataArray<T>::Pointer DataArray<T>::WrapPointer(T* data, size_t numTupl
   // Allocate on the heap
   auto d = std::make_shared<DataArray<T>>(numTuples, name, compDims, static_cast<T>(0), false);
 
-  d->m_Array = data;        // Now set the internal array to the raw pointer
-  d->m_OwnsData = ownsData; // Set who owns the data, i.e., who is going to "free" the memory
+  // Now set the internal array to the raw pointer
+  d->m_Array = data;
+  // Set who owns the data, i.e., who is going to "free" the memory
+  d->m_OwnsData = ownsData;
   if(nullptr != data)
   {
     d->m_IsAllocated = true;
@@ -411,13 +391,10 @@ IDataArray::Pointer DataArray<T>::deepCopy(bool forceNoAllocate) const
   {
     allocate = false;
   }
-  IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
+  auto daCopy = CreateArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
   if(m_IsAllocated && !forceNoAllocate)
   {
-    T* src = getPointer(0);
-    void* dest = daCopy->getVoidPointer(0);
-    size_t totalBytes = (getNumberOfTuples() * static_cast<size_t>(getNumberOfComponents()) * sizeof(T));
-    std::memcpy(dest, src, totalBytes);
+    std::copy(begin(), end(), daCopy->begin());
   }
   return daCopy;
 }
@@ -541,9 +518,6 @@ void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision)
     precision = 1;
   }
 }
-// This line must be here, because we are overloading the copyData pure  function in IDataArray.
-// This is required so that other classes can call this version of copyData from the subclasses.
-// using IDataArray::copyFromArray;
 
 // -----------------------------------------------------------------------------
 template <typename T>
@@ -590,9 +564,10 @@ bool DataArray<T>::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointe
     return false;
   }
 
-  size_t elementStart = destTupleOffset * static_cast<size_t>(getNumberOfComponents());
-  size_t totalBytes = (totalSrcTuples * static_cast<size_t>(sourceArray->getNumberOfComponents())) * sizeof(T);
-  std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * static_cast<size_t>(sourceArray->getNumberOfComponents())), totalBytes);
+  auto srcBegin = source->cbegin() + (srcTupleOffset * source->m_NumComponents);
+  auto srcEnd = srcBegin + (totalSrcTuples * source->m_NumComponents);
+  auto dstBegin = begin() + (destTupleOffset * m_NumComponents);
+  std::copy(srcBegin, srcEnd, dstBegin);
   return true;
 }
 
@@ -602,8 +577,7 @@ bool DataArray<T>::copyIntoArray(Pointer dest) const
 {
   if(m_IsAllocated && dest->isAllocated() && m_Array && dest->getPointer(0))
   {
-    size_t totalBytes = m_Size * sizeof(T);
-    std::memcpy(dest->getPointer(0), m_Array, totalBytes);
+    std::copy(cbegin(), cend(), dest->begin());
     return true;
   }
   return false;
@@ -641,7 +615,7 @@ void DataArray<T>::releaseOwnership()
 template <typename T>
 int32_t DataArray<T>::allocate()
 {
-  if((nullptr != m_Array) && (true == m_OwnsData))
+  if((nullptr != m_Array) && m_OwnsData)
   {
     deallocate();
   }
@@ -675,8 +649,7 @@ void DataArray<T>::initializeWithZeros()
   {
     return;
   }
-  size_t typeSize = sizeof(T);
-  ::memset(m_Array, 0, m_Size * typeSize);
+  std::fill_n(m_Array, m_Size, 0);
 }
 
 // -----------------------------------------------------------------------------
@@ -687,10 +660,7 @@ void DataArray<T>::initializeWithValue(T initValue, size_t offset)
   {
     return;
   }
-  for(size_t i = offset; i < m_Size; i++)
-  {
-    m_Array[i] = initValue;
-  }
+  std::fill(begin() + offset, end(), initValue);
 }
 
 // -----------------------------------------------------------------------------
@@ -727,11 +697,11 @@ int32_t DataArray<T>::eraseTuples(const comp_dims_type& idxs)
   // Create a new m_Array to copy into
   T* newArray = new T[newSize]();
 
+#ifndef NDEBUG
   // Splat AB across the array so we know if we are copying the values or not
-  ::memset(newArray, 0xAB, newSize * sizeof(T));
+  std::memset(newArray, 0xAB, newSize * sizeof(T));
+#endif
 
-  // Keep the current Destination Pointer
-  T* currentDest = newArray;
   size_t j = 0;
   size_t k = 0;
   // Find the first chunk to copy by walking the idxs array until we get an
@@ -748,11 +718,14 @@ int32_t DataArray<T>::eraseTuples(const comp_dims_type& idxs)
     }
   }
 
-  if(k == idxs.size()) // Only front elements are being dropped
+  // Only front elements are being dropped
+  if(k == idxs.size())
   {
-    T* currentSrc = m_Array + (j * m_NumComponents);
-    std::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * m_NumComponents * sizeof(T));
-    deallocate(); // We are done copying - delete the current m_Array
+    auto srcBegin = begin() + (j * m_NumComponents);
+    auto srcEnd = srcBegin + (getNumberOfTuples() - idxs.size()) * m_NumComponents;
+    std::copy(srcBegin, srcEnd, newArray);
+    // We are done copying - delete the current m_Array
+    deallocate();
     m_Size = newSize;
     m_Array = newArray;
     m_OwnsData = true;
@@ -786,10 +759,10 @@ int32_t DataArray<T>::eraseTuples(const comp_dims_type& idxs)
   // Copy the data
   for(size_t i = 0; i < srcIdx.size(); ++i)
   {
-    currentDest = newArray + destIdx[i];
-    T* currentSrc = m_Array + srcIdx[i];
-    size_t bytes = copyElements[i] * sizeof(T);
-    std::memcpy(currentDest, currentSrc, bytes);
+    auto srcBegin = begin() + srcIdx[i];
+    auto srcEnd = srcBegin + copyElements[i];
+    auto dstBegin = newArray + destIdx[i];
+    std::copy(srcBegin, srcEnd, dstBegin);
   }
 
   // We are done copying - delete the current m_Array
@@ -815,10 +788,10 @@ int32_t DataArray<T>::copyTuple(size_t currentPos, size_t newPos)
   {
     return -1;
   }
-  T* src = m_Array + (currentPos * m_NumComponents);
-  T* dest = m_Array + (newPos * m_NumComponents);
-  size_t bytes = sizeof(T) * m_NumComponents;
-  std::memcpy(dest, src, bytes);
+  auto srcBegin = begin() + (currentPos * m_NumComponents);
+  auto srcEnd = srcBegin + m_NumComponents;
+  auto dstBegin = begin() + (newPos * m_NumComponents);
+  std::copy(srcBegin, srcEnd, dstBegin);
   return 0;
 }
 
@@ -944,7 +917,7 @@ void DataArray<T>::setTuple(size_t tupleIndex, const T* data)
     Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
   }
 #endif
-  std::memcpy(getTuplePointer(tupleIndex), data, m_NumComponents * sizeof(T));
+  std::copy(data, data + m_NumComponents, begin() + (tupleIndex * m_NumComponents));
 }
 
 // -----------------------------------------------------------------------------
@@ -957,25 +930,9 @@ void DataArray<T>::setTuple(size_t tupleIndex, const std::vector<T>& data)
     Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
   }
 #endif
-  std::memcpy(getTuplePointer(tupleIndex), data.data(), m_NumComponents * sizeof(T));
-}
-// -----------------------------------------------------------------------------
-template <>
-void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data)
-{
-#ifndef NDEBUG
-  if(m_Size > 0)
-  {
-    Q_ASSERT(tupleIndex * m_NumComponents + (m_NumComponents - 1) < m_Size);
-  }
-#endif
-  bool* ptr = getTuplePointer(tupleIndex);
-  size_t i = 0;
-  for(const auto value : data)
-  {
-    ptr[i] = value;
-    i++;
-  }
+  auto srcBegin = data.cbegin();
+  auto srcEnd = srcBegin + m_NumComponents;
+  std::copy(srcBegin, srcEnd, begin() + (tupleIndex * m_NumComponents));
 }
 
 // -----------------------------------------------------------------------------
@@ -997,10 +954,7 @@ void DataArray<T>::initializeTuple(size_t i, const void* p)
     return;
   }
   const T* c = reinterpret_cast<const T*>(p);
-  for(size_t j = 0; j < m_NumComponents; ++j)
-  {
-    m_Array[i * m_NumComponents + j] = *c;
-  }
+  std::fill_n(begin() + (i * m_NumComponents), m_NumComponents, *c);
 }
 
 // -----------------------------------------------------------------------------
@@ -1212,10 +1166,10 @@ QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
     QString compDimStr = "(";
     for(size_t i = 0; i < m_CompDims.size(); i++)
     {
-      compDimStr = compDimStr + QString::number(m_CompDims[i]);
+      compDimStr += QString::number(m_CompDims[i]);
       if(i < m_CompDims.size() - 1)
       {
-        compDimStr = compDimStr + QString(", ");
+        compDimStr += ", ";
       }
     }
     compDimStr = compDimStr + ")";
@@ -1235,10 +1189,10 @@ QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
     QString compDimStr = "(";
     for(size_t i = 0; i < m_CompDims.size(); i++)
     {
-      compDimStr = compDimStr + QString::number(m_CompDims[i]);
+      compDimStr += QString::number(m_CompDims[i]);
       if(i < m_CompDims.size() - 1)
       {
-        compDimStr = compDimStr + QString(", ");
+        compDimStr += ", ";
       }
     }
     compDimStr = compDimStr + ")";
@@ -1310,29 +1264,97 @@ typename DataArray<T>::const_iterator DataArray<T>::end() const
   return const_iterator(m_Array + m_Size);
 }
 
-// rbegin
-// rend
-// cbegin
-// cend
-// crbegin
-// crend
+template <typename T>
+typename DataArray<T>::const_iterator DataArray<T>::cbegin() const
+{
+  return begin();
+}
 
-// ######### Capacity #########
 template <typename T>
-typename DataArray<T>::size_type DataArray<T>::size() const
+typename DataArray<T>::const_iterator DataArray<T>::cend() const
 {
-  return m_Size;
+  return end();
+}
+
+template <typename T>
+typename DataArray<T>::reverse_iterator DataArray<T>::rbegin()
+{
+  return std::make_reverse_iterator(end());
+}
+
+template <typename T>
+typename DataArray<T>::reverse_iterator DataArray<T>::rend()
+{
+  return std::make_reverse_iterator(begin());
 }
+
 template <typename T>
-typename DataArray<T>::size_type DataArray<T>::max_size() const
+typename DataArray<T>::const_reverse_iterator DataArray<T>::rbegin() const
+{
+  return std::make_reverse_iterator(end());
+}
+
+template <typename T>
+typename DataArray<T>::const_reverse_iterator DataArray<T>::rend() const
+{
+  return std::make_reverse_iterator(begin());
+}
+
+template <typename T>
+typename DataArray<T>::const_reverse_iterator DataArray<T>::crbegin() const
+{
+  return rbegin();
+}
+
+template <typename T>
+typename DataArray<T>::const_reverse_iterator DataArray<T>::crend() const
+{
+  return rend();
+}
+
+template <typename T>
+typename DataArray<T>::tuple_iterator DataArray<T>::tupleBegin()
+{
+  return tuple_iterator(m_Array, m_NumComponents);
+}
+
+template <typename T>
+typename DataArray<T>::tuple_iterator DataArray<T>::tupleEnd()
+{
+  return tuple_iterator(m_Array + m_Size, m_NumComponents);
+}
+
+template <typename T>
+typename DataArray<T>::const_tuple_iterator DataArray<T>::tupleBegin() const
+{
+  return const_tuple_iterator(m_Array, m_NumComponents);
+}
+
+template <typename T>
+typename DataArray<T>::const_tuple_iterator DataArray<T>::tupleEnd() const
+{
+  return const_tuple_iterator(m_Array + m_Size, m_NumComponents);
+}
+
+template <typename T>
+typename DataArray<T>::const_tuple_iterator DataArray<T>::constTupleBegin() const
+{
+  return tupleBegin();
+}
+
+template <typename T>
+typename DataArray<T>::const_tuple_iterator DataArray<T>::constTupleEnd() const
+{
+  return tupleEnd();
+}
+
+// ######### Capacity #########
+template <typename T>
+typename DataArray<T>::size_type DataArray<T>::size() const
 {
   return m_Size;
 }
-//  void resize(size_type n)
-//  {
-//    resizeAndExtend(n);
-//  }
-// void resize (size_type n, const value_type& val);
+
 template <typename T>
 typename DataArray<T>::size_type DataArray<T>::capacity() const noexcept
 {
@@ -1344,8 +1366,6 @@ bool DataArray<T>::empty() const noexcept
 {
   return (m_Size == 0);
 }
-// reserve()
-// shrink_to_fit()
 
 // ######### Element Access #########
 
@@ -1356,10 +1376,7 @@ template <typename T>
 void DataArray<T>::assign(size_type n, const value_type& val) // fill (2)
 {
   resizeAndExtend(n);
-  for(size_t i = 0; i < n; i++)
-  {
-    m_Array[i] = val;
-  }
+  std::fill(begin(), end(), val);
 }
 
 // -----------------------------------------------------------------------------
@@ -1376,6 +1393,7 @@ void DataArray<T>::push_back(const value_type& val)
   resizeAndExtend(m_Size + 1);
   m_Array[m_MaxId] = val;
 }
+
 // -----------------------------------------------------------------------------
 template <typename T>
 void DataArray<T>::push_back(value_type&& val)
@@ -1390,10 +1408,6 @@ void DataArray<T>::pop_back()
 {
   resizeAndExtend(m_Size - 1);
 }
-// insert
-// iterator erase (const_iterator position)
-// iterator erase (const_iterator first, const_iterator last);
-// swap
 
 // -----------------------------------------------------------------------------
 template <typename T>
@@ -1410,8 +1424,6 @@ void DataArray<T>::clear()
   m_IsAllocated = false;
   m_NumTuples = 0;
 }
-// emplace
-// emplace_back
 
 // =================================== END STL COMPATIBLE INTERFACe ===================================================
 
@@ -1419,6 +1431,7 @@ void DataArray<T>::clear()
 template <typename T>
 void DataArray<T>::deallocate()
 {
+#ifndef NDEBUG
   // We are going to splat 0xABABAB across the first value of the array as a debugging aid
   auto cptr = reinterpret_cast<unsigned char*>(m_Array);
   if(nullptr != cptr)
@@ -1447,6 +1460,7 @@ void DataArray<T>::deallocate()
       }
     }
   }
+#endif
 #if 0
       if (MUD_FLAP_0 != 0xABABABABABABABABul
           || MUD_FLAP_1 != 0xABABABABABABABABul
@@ -1458,6 +1472,7 @@ void DataArray<T>::deallocate()
         Q_ASSERT(false);
       }
 #endif
+
   delete[](m_Array);
 
   m_Array = nullptr;
@@ -1490,7 +1505,8 @@ T* DataArray<T>::resizeAndExtend(size_t size)
   size_t newSize = 0;
   size_t oldSize = 0;
 
-  if(size == m_Size) // Requested size is equal to current size.  Do nothing.
+  // Requested size is equal to current size.  Do nothing.
+  if(size == m_Size)
   {
     return m_Array;
   }
@@ -1514,7 +1530,9 @@ T* DataArray<T>::resizeAndExtend(size_t size)
   // Copy the data from the old array.
   if(m_Array != nullptr)
   {
-    std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
+    auto srcBegin = begin();
+    auto srcEnd = srcBegin + (newSize < m_Size ? newSize : m_Size);
+    std::copy(srcBegin, srcEnd, newArray);
   }
 
   // Allocate a new array if we DO NOT own the current array
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 6f526f7519..7860b0d258 100755
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -92,9 +92,8 @@ class DataArray : public IDataArray
   using size_type = size_t;
   using value_type = T;
   using reference = T&;
-  using iterator_category = std::input_iterator_tag;
   using pointer = T*;
-  using difference_type = value_type;
+  using difference_type = ptrdiff_t;
 
   //========================================= SIMPL INTERFACE COMPATIBILITY =================================
   using ContainterType = std::vector<Pointer>;
@@ -572,47 +571,114 @@ class DataArray : public IDataArray
     using value_type = T;
     using reference = T&;
     using pointer = T*;
-    using difference_type = value_type;
-    using iterator_category = std::forward_iterator_tag;
+    using difference_type = ptrdiff_t;
+    using iterator_category = std::random_access_iterator_tag;
 
-    tuple_iterator(pointer ptr, size_type numComps)
-    : ptr_(ptr)
-    , num_comps_(numComps)
+    tuple_iterator() = delete;
+
+    self_type& operator++()
     {
-    }
-    self_type operator++()
+      ptr_ += num_comps_;
+      return *this;
+    } // PREFIX
+    self_type operator++(int32_t unused)
     {
-      ptr_ = ptr_ + num_comps_;
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
+      self_type i = *this;
+      ptr_ += num_comps_;
+      return i;
+    } // POSTFIX
+    self_type& operator--()
+    {
+      ptr_ -= num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t ununsed)
+    self_type operator--(int32_t unused)
     {
-      std::ignore = ununsed;
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
       self_type i = *this;
-      ptr_ = ptr_ + num_comps_;
+      ptr_ -= num_comps_;
       return i;
     } // POSTFIX
-    reference operator*()
+    self_type& operator+=(difference_type amt)
+    {
+      ptr_ += amt * num_comps_;
+      return *this;
+    }
+    self_type operator+(difference_type amt) const
+    {
+      return self_type(ptr_ + amt * num_comps_, num_comps_);
+    }
+    self_type& operator-=(difference_type amt)
+    {
+      ptr_ -= amt * num_comps_;
+      return *this;
+    }
+    self_type operator-(difference_type amt) const
+    {
+      return self_type(ptr_ - amt * num_comps_, num_comps_);
+    }
+    difference_type operator-(const self_type& rhs) const
+    {
+      return (ptr_ - rhs.ptr_) / static_cast<difference_type>(num_comps_);
+    }
+    friend self_type operator+(difference_type lhs, const self_type& rhs)
+    {
+      return self_type(lhs * rhs.num_comps_ + rhs.ptr_, rhs.num_comps_);
+    }
+    reference operator[](difference_type amt) const
+    {
+      return ptr_[amt * num_comps_];
+    }
+    reference operator*() const
     {
       return *ptr_;
     }
-    pointer operator->()
+    pointer operator->() const
     {
       return ptr_;
     }
-    bool operator==(const self_type& rhs)
+    bool operator==(const self_type& rhs) const
     {
       return ptr_ == rhs.ptr_;
     }
-    bool operator!=(const self_type& rhs)
+    bool operator!=(const self_type& rhs) const
     {
       return ptr_ != rhs.ptr_;
     }
+    bool operator>(const self_type& rhs) const
+    {
+      return ptr_ > rhs.ptr_;
+    }
+    bool operator<(const self_type& rhs) const
+    {
+      return ptr_ < rhs.ptr_;
+    }
+    bool operator>=(const self_type& rhs) const
+    {
+      return ptr_ >= rhs.ptr_;
+    }
+    bool operator<=(const self_type& rhs) const
+    {
+      return ptr_ <= rhs.ptr_;
+    }
+
     reference comp_value(size_type comp)
     {
       return *(ptr_ + comp);
     }
 
+  protected:
+    tuple_iterator(pointer ptr, size_type numComps)
+    : ptr_(ptr)
+    , num_comps_(numComps)
+    {
+    }
+
+    friend class DataArray;
+
   private:
     pointer ptr_;
     size_t num_comps_;
@@ -623,49 +689,116 @@ class DataArray : public IDataArray
   public:
     using self_type = const_tuple_iterator;
     using value_type = T;
-    using reference = T&;
-    using pointer = T*;
-    using difference_type = value_type;
-    using iterator_category = std::forward_iterator_tag;
+    using reference = const T&;
+    using pointer = const T*;
+    using difference_type = ptrdiff_t;
+    using iterator_category = std::random_access_iterator_tag;
 
-    const_tuple_iterator(pointer ptr, size_type numComps)
-    : ptr_(ptr)
-    , num_comps_(numComps)
+    const_tuple_iterator() = delete;
+
+    self_type& operator++()
     {
-    }
-    self_type operator++()
+      ptr_ += num_comps_;
+      return *this;
+    } // PREFIX
+    self_type operator++(int32_t unused)
+    {
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
+      self_type i = *this;
+      ptr_ += num_comps_;
+      return i;
+    } // POSTFIX
+    self_type& operator--()
     {
-      ptr_ = ptr_ + num_comps_;
+      ptr_ -= num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t ununsed)
+    self_type operator--(int32_t unused)
     {
-      std::ignore = ununsed;
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
       self_type i = *this;
-      ptr_ = ptr_ + num_comps_;
+      ptr_ -= num_comps_;
       return i;
     } // POSTFIX
-    const value_type& operator*()
+    self_type& operator+=(difference_type amt)
+    {
+      ptr_ += amt * num_comps_;
+      return *this;
+    }
+    self_type operator+(difference_type amt) const
+    {
+      return self_type(ptr_ + amt * num_comps_, num_comps_);
+    }
+    self_type& operator-=(difference_type amt)
+    {
+      ptr_ -= amt * num_comps_;
+      return *this;
+    }
+    self_type operator-(difference_type amt) const
+    {
+      return self_type(ptr_ - amt * num_comps_, num_comps_);
+    }
+    difference_type operator-(const self_type& rhs) const
+    {
+      return (ptr_ - rhs.ptr_) / static_cast<difference_type>(num_comps_);
+    }
+    friend self_type operator+(difference_type lhs, const self_type& rhs)
+    {
+      return self_type(lhs * rhs.num_comps_ + rhs.ptr_, rhs.num_comps_);
+    }
+    reference operator[](difference_type amt) const
+    {
+      return ptr_[amt * num_comps_];
+    }
+    reference operator*() const
     {
       return *ptr_;
     }
-    const pointer operator->()
+    pointer operator->() const
     {
       return ptr_;
     }
-    bool operator==(const self_type& rhs)
+    bool operator==(const self_type& rhs) const
     {
       return ptr_ == rhs.ptr_;
     }
-    bool operator!=(const self_type& rhs)
+    bool operator!=(const self_type& rhs) const
     {
       return ptr_ != rhs.ptr_;
     }
-    const value_type& comp_value(size_type comp)
+    bool operator>(const self_type& rhs) const
+    {
+      return ptr_ > rhs.ptr_;
+    }
+    bool operator<(const self_type& rhs) const
+    {
+      return ptr_ < rhs.ptr_;
+    }
+    bool operator>=(const self_type& rhs) const
+    {
+      return ptr_ >= rhs.ptr_;
+    }
+    bool operator<=(const self_type& rhs) const
+    {
+      return ptr_ <= rhs.ptr_;
+    }
+
+    reference comp_value(size_type comp) const
     {
       return *(ptr_ + comp);
     }
 
+  protected:
+    const_tuple_iterator(pointer ptr, size_type numComps)
+    : ptr_(ptr)
+    , num_comps_(numComps)
+    {
+    }
+
+    friend class DataArray;
+
   private:
     pointer ptr_;
     size_t num_comps_;
@@ -678,171 +811,283 @@ class DataArray : public IDataArray
     using value_type = T;
     using reference = T&;
     using pointer = T*;
-    using difference_type = value_type;
-    using iterator_category = std::forward_iterator_tag;
+    using difference_type = ptrdiff_t;
+    using iterator_category = std::random_access_iterator_tag;
 
-    iterator(pointer ptr)
-    : ptr_(ptr)
-    {
-    }
-    iterator(pointer ptr, size_type ununsed)
-    : ptr_(ptr)
+    iterator() = delete;
+
+    iterator(const self_type& iter)
+    : ptr_(iter.ptr_)
     {
-      std::ignore = ununsed;
     }
 
-    self_type operator++()
+    self_type& operator++()
     {
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t ununsed)
+    self_type operator++(int32_t unused)
     {
-      std::ignore = ununsed;
+      // Replace with [[maybe_unused]] in C++ 17
+      (void) unused;
       self_type i = *this;
       ptr_++;
       return i;
     } // POSTFIX
-    self_type operator+(int32_t amt)
+    self_type& operator--()
+    {
+      ptr_--;
+      return *this;
+    } // PREFIX
+    self_type operator--(int32_t unused)
+    {
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
+      self_type i = *this;
+      ptr_--;
+      return i;
+    } // POSTFIX
+    self_type& operator+=(difference_type amt)
     {
       ptr_ += amt;
       return *this;
     }
-    reference operator*()
+    self_type operator+(difference_type amt) const
+    {
+      return self_type(ptr_ + amt);
+    }
+    self_type& operator-=(difference_type amt)
+    {
+      ptr_ -= amt;
+      return *this;
+    }
+    self_type operator-(difference_type amt) const
+    {
+      return self_type(ptr_ - amt);
+    }
+    difference_type operator-(const self_type& rhs) const
+    {
+      return ptr_ - rhs.ptr_;
+    }
+    friend self_type operator+(difference_type lhs, const self_type& rhs)
+    {
+      return self_type(lhs + rhs.ptr_);
+    }
+    reference operator[](difference_type amt) const
+    {
+      return ptr_[amt];
+    }
+    reference operator*() const
     {
       return *ptr_;
     }
-    pointer operator->()
+    pointer operator->() const
     {
       return ptr_;
     }
-    bool operator==(const self_type& rhs)
+    bool operator==(const self_type& rhs) const
     {
       return ptr_ == rhs.ptr_;
     }
-    bool operator!=(const self_type& rhs)
+    bool operator!=(const self_type& rhs) const
     {
       return ptr_ != rhs.ptr_;
     }
+    bool operator>(const self_type& rhs) const
+    {
+      return ptr_ > rhs.ptr_;
+    }
+    bool operator<(const self_type& rhs) const
+    {
+      return ptr_ < rhs.ptr_;
+    }
+    bool operator>=(const self_type& rhs) const
+    {
+      return ptr_ >= rhs.ptr_;
+    }
+    bool operator<=(const self_type& rhs) const
+    {
+      return ptr_ <= rhs.ptr_;
+    }
+
+  protected:
+    iterator(pointer ptr)
+    : ptr_(ptr)
+    {
+    }
+
+    friend class DataArray;
 
   private:
     pointer ptr_;
   };
 
+  using reverse_iterator = std::reverse_iterator<iterator>;
+
   class const_iterator
   {
   public:
     using self_type = const_iterator;
     using value_type = T;
-    using reference = T&;
-    using pointer = T*;
-    using difference_type = value_type;
-    using iterator_category = std::forward_iterator_tag;
-    const_iterator(pointer ptr)
-    : ptr_(ptr)
-    {
-    }
-    const_iterator(pointer ptr, size_type unused)
-    : ptr_(ptr)
+    using reference = const T&;
+    using pointer = const T*;
+    using difference_type = ptrdiff_t;
+    using iterator_category = std::random_access_iterator_tag;
+
+    const_iterator() = delete;
+
+    const_iterator(const self_type& iter)
+    : ptr_(iter.ptr_)
     {
     }
 
-    self_type operator++()
+    self_type& operator++()
     {
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t amt)
+    self_type operator++(int32_t unused)
     {
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
       self_type i = *this;
-      ptr_ += amt;
+      ptr_++;
+      return i;
+    } // POSTFIX
+    self_type& operator--()
+    {
+      ptr_--;
+      return *this;
+    } // PREFIX
+    self_type operator--(int32_t unused)
+    {
+      // Replace with [[maybe_unused]] in C++ 17
+      (void)unused;
+      self_type i = *this;
+      ptr_--;
       return i;
     } // POSTFIX
-    self_type operator+(int32_t amt)
+    self_type& operator+=(difference_type amt)
     {
       ptr_ += amt;
       return *this;
     }
-    const value_type& operator*()
+    self_type operator+(difference_type amt) const
+    {
+      return self_type(ptr_ + amt);
+    }
+    self_type& operator-=(difference_type amt)
+    {
+      ptr_ -= amt;
+      return *this;
+    }
+    self_type operator-(difference_type amt) const
+    {
+      return self_type(ptr_ - amt);
+    }
+    difference_type operator-(const self_type& rhs) const
+    {
+      return ptr_ - rhs.ptr_;
+    }
+    friend self_type operator+(difference_type lhs, const self_type& rhs)
+    {
+      return self_type(lhs + rhs.ptr_);
+    }
+    reference operator[](difference_type amt) const
+    {
+      return ptr_[amt];
+    }
+    reference operator*() const
     {
       return *ptr_;
     }
-    const pointer operator->()
+    pointer operator->() const
     {
       return ptr_;
     }
-    bool operator==(const self_type& rhs)
+    bool operator==(const self_type& rhs) const
     {
       return ptr_ == rhs.ptr_;
     }
-    bool operator!=(const self_type& rhs)
+    bool operator!=(const self_type& rhs) const
     {
       return ptr_ != rhs.ptr_;
     }
+    bool operator>(const self_type& rhs) const
+    {
+      return ptr_ > rhs.ptr_;
+    }
+    bool operator<(const self_type& rhs) const
+    {
+      return ptr_ < rhs.ptr_;
+    }
+    bool operator>=(const self_type& rhs) const
+    {
+      return ptr_ >= rhs.ptr_;
+    }
+    bool operator<=(const self_type& rhs) const
+    {
+      return ptr_ <= rhs.ptr_;
+    }
+
+  protected:
+    const_iterator(pointer ptr)
+    : ptr_(ptr)
+    {
+    }
+
+    friend class DataArray;
 
   private:
     pointer ptr_;
   };
 
+  using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+
   // ######### Iterators #########
-  /**
-   *
-   */
-  template <typename IteratorType> IteratorType begin()
-  {
-    return IteratorType(m_Array, m_NumComponents);
-  }
 
-  /**
-   * @brief begin
-   * @return
-   */
-  iterator begin();
+  tuple_iterator tupleBegin();
 
-  template <typename IteratorType> IteratorType end()
-  {
-    return IteratorType(m_Array + m_Size, m_NumComponents);
-  }
+  tuple_iterator tupleEnd();
+
+  const_tuple_iterator tupleBegin() const;
+
+  const_tuple_iterator tupleEnd() const;
+
+  const_tuple_iterator constTupleBegin() const;
+
+  const_tuple_iterator constTupleEnd() const;
+
+  iterator begin();
 
-  /**
-   * @brief end
-   * @return
-   */
   iterator end();
 
-  /**
-   * @brief begin
-   * @return
-   */
   const_iterator begin() const;
 
-  /**
-   * @brief end
-   * @return
-   */
   const_iterator end() const;
 
-  // rbegin
-  // rend
-  // cbegin
-  // cend
-  // crbegin
-  // crend
+  const_iterator cbegin() const;
+
+  const_iterator cend() const;
+
+  reverse_iterator rbegin();
+
+  reverse_iterator rend();
+
+  const_reverse_iterator rbegin() const;
+
+  const_reverse_iterator rend() const;
+
+  const_reverse_iterator crbegin() const;
+
+  const_reverse_iterator crend() const;
 
   // ######### Capacity #########
 
   size_type size() const;
 
-  size_type max_size() const;
-  //  void resize(size_type n) override
-  //  {
-  //    resizeAndExtend(n);
-  //  }
-  // void resize (size_type n, const value_type& val);
   size_type capacity() const noexcept;
   bool empty() const noexcept;
-  // reserve()
-  // shrink_to_fit()
 
   // ######### Element Access #########
 
@@ -948,17 +1193,11 @@ class DataArray : public IDataArray
    * @brief pop_back
    */
   void pop_back();
-  // insert
-  // iterator erase (const_iterator position)
-  // iterator erase (const_iterator first, const_iterator last);
-  // swap
 
   /**
    * @brief Removes all elements from the array (which are destroyed), leaving the container with a size of 0.
    */
   void clear();
-  // emplace
-  // emplace_back
 
   /**
    * @brief equal
@@ -1012,14 +1251,6 @@ class DataArray : public IDataArray
   bool m_OwnsData = true;
 };
 
-// -----------------------------------------------------------------------------
-// These are specialized for bool type as std::vector<bool> uses bits instead of bytes
-template <>
-typename DataArray<bool>::Pointer DataArray<bool>::FromStdVector(const std::vector<bool>& vec, const QString& name);
-
-template <>
-void DataArray<bool>::setTuple(size_t tupleIndex, const std::vector<bool>& data);
-
 // -----------------------------------------------------------------------------
 // Declare our extern templates
 extern template class DataArray<bool>;
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 2a79043fac..2d238ddc51 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -1370,14 +1370,14 @@ true);
     CompDimsType cDims = {4};
     RgbaType rgba(10, QString("RGBA Array"), cDims, 0);
 
-    RgbaIterator begin = rgba.begin<RgbaIterator>();
+    RgbaIterator begin = rgba.tupleBegin();
     rgba.initializeWithValue(0xFF);
     rgba[0] = 0x65;
     rgba[1] = 0x66;
     rgba[2] = 0x67;
     rgba[3] = 0x68;
 
-    for(RgbaIterator rgbaIter = begin; rgbaIter != rgba.end<RgbaIterator>(); rgbaIter++)
+    for(RgbaIterator rgbaIter = begin; rgbaIter != rgba.tupleEnd(); rgbaIter++)
     {
       std::cout << "rgba: " << static_cast<int>(*rgbaIter) << std::endl;
       std::cout << " rgba[0] " << static_cast<int>(rgbaIter.comp_value(0)) << " rgba[1] " << static_cast<int>(rgbaIter.comp_value(1)) << " rgba[2] " << static_cast<int>(rgbaIter.comp_value(2))

From 6a52d79d2f02f5ce63351a250e76bae579014826 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 7 May 2020 12:42:50 -0400
Subject: [PATCH 215/397] Allow user to specify the init values for each
 component of the tuple (#399)

* Allow user to specify the init values for each component of the tuple

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   | 316 +++++---
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |  10 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       | 746 +++++++++++++-----
 .../CoreFilters/CreateDataArray.md            |  27 +-
 4 files changed, 740 insertions(+), 359 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index f6abe28c9e..364a841a17 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -33,19 +33,17 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
-
 #include "CreateDataArray.h"
 
 
 #include <limits>
 #include <random>
 #include <chrono>
+#include <utility>
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
@@ -56,89 +54,114 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataArrayID = 1
 };
 
-/**
-* @brief initializeArrayWithInts Initializes the array p with integers, either from the
-* manual value entered in the filter, or with a random number.  This function does not
-* check that the template type actually is an integer, so it will most likely cause
-* unexpected results when passing anything other than an integer as a template parameter.
-* @param p The array that will be initialized
-*/
-template <typename T> void initializeArrayWithInts(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const QString& initializationValue, SIMPL::ScalarTypes::Type scalarType)
+namespace CDA
 {
 
-  typename DataArray<T>::Pointer array = std::dynamic_pointer_cast<DataArray<T>>(outputArrayPtr);
-  size_t count = array->getSize();
-  T* rawPointer = array->getPointer(0);
+#define CDA_CREATE_CONVERTOR(type, func)                                                                                                                                                               \
+  template <>                                                                                                                                                                                          \
+  struct convert_from<type>                                                                                                                                                                            \
+  {                                                                                                                                                                                                    \
+    static std::pair<type, bool> convert(const QString& input)                                                                                                                                         \
+    {                                                                                                                                                                                                  \
+      bool ok = false;                                                                                                                                                                                 \
+      type value = static_cast<type>(input.func(&ok));                                                                                                                                                 \
+      return {value, ok};                                                                                                                                                                              \
+    }                                                                                                                                                                                                  \
+  };
 
-  if(initializationType == CreateDataArray::Manual)
-  {
+template <class T>
+struct convert_from
+{
+};
+
+CDA_CREATE_CONVERTOR(uint8_t, toUInt)
+CDA_CREATE_CONVERTOR(int8_t, toInt)
+CDA_CREATE_CONVERTOR(uint16_t, toUShort)
+CDA_CREATE_CONVERTOR(int16_t, toShort)
+CDA_CREATE_CONVERTOR(uint32_t, toUInt)
+CDA_CREATE_CONVERTOR(int32_t, toInt)
+CDA_CREATE_CONVERTOR(uint64_t, toULongLong)
+CDA_CREATE_CONVERTOR(int64_t, toLongLong)
+CDA_CREATE_CONVERTOR(bool, toInt)
+
+CDA_CREATE_CONVERTOR(float, toDouble)
+CDA_CREATE_CONVERTOR(double, toDouble)
+
+constexpr char CDA_SEP = ';';
+constexpr char CDA_LB = '[';
+constexpr char CDA_RB = ']';
+
+/**
+ *
+ */
+template <typename T>
+std::vector<T> createInitVector(AbstractFilter* filter, const QString& initializationValue, int32_t numComponents)
+{
+  using ConvertOutputType = std::pair<T, bool>;
+  ConvertOutputType conversionResult;
+  std::vector<T> values(numComponents);
 
-    qint8 i8 = static_cast<qint8>(initializationValue.toInt());
-    quint8 ui8 = static_cast<quint8>(initializationValue.toUInt());
-    qint16 i16 = static_cast<qint16>(initializationValue.toShort());
-    quint16 ui16 = static_cast<quint16>(initializationValue.toUShort());
-    qint32 i32 = static_cast<qint32>(initializationValue.toInt());
-    quint32 ui32 = static_cast<quint32>(initializationValue.toUInt());
-    qint64 i64 = static_cast<qint64>(initializationValue.toLongLong());
-    quint64 ui64 = static_cast<quint64>(initializationValue.toULongLong());
+  if(initializationValue.startsWith(CDA_LB) && initializationValue.endsWith(CDA_RB))
+  {
+    QString input = initializationValue;
+    input = input.replace('[', "");
+    input = input.replace(']', "");
+    QStringList tokens = input.split(CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
 
-    switch(scalarType)
+    for(int32_t i = 0; i < numComponents; i++)
     {
-    case SIMPL::ScalarTypes::Type::Int8:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(i8);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::UInt8:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(ui8);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::Int16:
-      for(size_t i = 0; i < count; i++)
+      int32_t idx = (tokens.size() == 1 ? 0 : i);
+      conversionResult = convert_from<T>::convert(tokens[idx]);
+      if(conversionResult.second)
       {
-        rawPointer[i] = static_cast<T>(i16);
+        values[i] = conversionResult.first;
       }
-      break;
-    case SIMPL::ScalarTypes::Type::UInt16:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(ui16);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::Int32:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(i32);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::UInt32:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(ui32);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::Int64:
-      for(size_t i = 0; i < count; i++)
-      {
-        rawPointer[i] = static_cast<T>(i64);
-      }
-      break;
-    case SIMPL::ScalarTypes::Type::UInt64:
-      for(size_t i = 0; i < count; i++)
+      else
       {
-        rawPointer[i] = static_cast<T>(ui64);
+        if(filter)
+        {
+          QString msg = QString("Input String '%1' could not be converted to a numeric value. ").arg(tokens[0]);
+          filter->setErrorCondition(-5400, msg);
+          values.clear();
+          return values;
+        }
       }
-      break;
-    default:
-      Q_ASSERT_X(false, __FILE__, "Incorrent use of CreateDataArray::initializeArrayWithInts when using a non-integer type");
-      break;
+    }
+  }
+  else
+  {
+    conversionResult = convert_from<T>::convert(initializationValue);
+    if(conversionResult.second)
+    {
+      values.assign(numComponents, conversionResult.first);
+    }
+  }
+  return values;
+}
+
+/**
+ * @brief CDA::initializeArrayWithInts Initializes the array p with integers, either from the
+ * manual value entered in the filter, or with a random number.  This function does not
+ * check that the template type actually is an integer, so it will most likely cause
+ * unexpected results when passing anything other than an integer as a template parameter.
+ * @param p The array that will be initialized
+ */
+template <typename T>
+void initializeArrayWithInts(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const std::vector<T>& initValues)
+{
+  typename DataArray<T>::Pointer array = std::dynamic_pointer_cast<DataArray<T>>(outputArrayPtr);
+  size_t numTuples = array->getNumberOfTuples();
+
+  if(initializationType == CreateDataArray::Manual)
+  {
+    for(size_t t = 0; t < numTuples; t++)
+    {
+      array->setTuple(t, initValues);
     }
   }
   else
@@ -148,8 +171,10 @@ template <typename T> void initializeArrayWithInts(IDataArray::Pointer outputArr
 
     std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
     std::mt19937_64 generator(seed); // Standard mersenne_twister_engine seeded with milliseconds
-    std::uniform_int_distribution<> distribution(rangeMin , rangeMax);
+    std::uniform_int_distribution<> distribution(rangeMin, rangeMax);
 
+    size_t count = array->size();
+    T* rawPointer = array->getPointer(0);
     for(size_t i = 0; i < count; i++)
     {
       T value = static_cast<T>(distribution(generator));
@@ -159,26 +184,25 @@ template <typename T> void initializeArrayWithInts(IDataArray::Pointer outputArr
 }
 
 /**
-* @brief initializeArrayWithInts Initializes the array p with integers, either from the
-* manual value entered in the filter, or with a random number.  This function does not
-* check that the template type actually is an integer, so it will most likely cause
-* unexpected results when passing anything other than an integer as a template parameter.
-* @param p The array that will be initialized
-*/
-template <> void initializeArrayWithInts<bool>(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const QString& initializationValue, SIMPL::ScalarTypes::Type scalarType)
+ * @brief CDA::initializeArrayWithInts Initializes the array p with integers, either from the
+ * manual value entered in the filter, or with a random number.  This function does not
+ * check that the template type actually is an integer, so it will most likely cause
+ * unexpected results when passing anything other than an integer as a template parameter.
+ * @param p The array that will be initialized
+ */
+void initializeArrayWithBool(IDataArray::Pointer outputArrayPtr, int initializationType, const std::vector<bool>& initValues)
 {
   DataArray<bool>::Pointer array = std::dynamic_pointer_cast<DataArray<bool>>(outputArrayPtr);
-  size_t count = array->getSize();
-  bool* rawPointer = array->getPointer(0);
-
+  size_t numTuples = array->getNumberOfTuples();
+  int32_t numComp = array->getNumberOfComponents();
   if(initializationType == CreateDataArray::Manual)
   {
-    bool result;
-    result = initializationValue.toInt() != 0;
-
-    for(size_t i = 0; i < count; i++)
+    for(size_t t = 0; t < numTuples; t++)
     {
-      rawPointer[i] = result;
+      for(int32_t c = 0; c < numComp; c++)
+      {
+        array->setComponent(t, c, initValues[c]);
+      }
     }
   }
   else
@@ -186,6 +210,8 @@ template <> void initializeArrayWithInts<bool>(IDataArray::Pointer outputArrayPt
     std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
     std::mt19937_64 generator(seed); // Standard mersenne_twister_engine seeded with milliseconds
     std::uniform_int_distribution<int32_t> distribution(0, 1);
+    size_t count = array->getSize();
+    bool* rawPointer = array->getPointer(0);
 
     for(size_t i = 0; i < count; i++)
     {
@@ -210,22 +236,23 @@ template <> void initializeArrayWithInts<bool>(IDataArray::Pointer outputArrayPt
 * parameter.
 * @param p The array that will be initialized
 */
-template <typename T> void initializeArrayWithReals(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const QString& initializationValue)
+template <typename T>
+void initializeArrayWithReals(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const std::vector<T>& initValues)
 {
   typename DataArray<T>::Pointer array = std::dynamic_pointer_cast<DataArray<T>>(outputArrayPtr);
-  size_t count = array->getSize();
-  T* rawPointer = array->getPointer(0);
+  size_t numTuples = array->getNumberOfTuples();
 
   if(initializationType == CreateDataArray::Manual)
   {
-    T value = static_cast<T>(initializationValue.toDouble());
-    for(size_t i = 0; i < count; i++)
+    for(size_t t = 0; t < numTuples; t++)
     {
-      rawPointer[i] = value;
+      array->setTuple(t, initValues);
     }
   }
   else
   {
+    size_t count = array->getSize();
+    T* rawPointer = array->getPointer(0);
     T rangeMin = static_cast<T>(initializationRange.first);
     T rangeMax = static_cast<T>(initializationRange.second);
 
@@ -233,7 +260,6 @@ template <typename T> void initializeArrayWithReals(IDataArray::Pointer outputAr
     std::mt19937_64 generator(seed); // Standard mersenne_twister_engine seeded with milliseconds
     std::uniform_real_distribution<> distribution(rangeMin, rangeMax);
 
-    size_t count = array->getSize();
     for(size_t i = 0; i < count; i++)
     {
       T value = distribution(generator);
@@ -242,17 +268,12 @@ template <typename T> void initializeArrayWithReals(IDataArray::Pointer outputAr
   }
 }
 
+} // namespace CDA
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateDataArray::CreateDataArray()
-: m_ScalarType(SIMPL::ScalarTypes::Type::Int8)
-, m_NumberOfComponents(0)
-, m_NewArray("", "", "")
-, m_InitializationType(Manual)
-, m_InitializationValue("0")
-{
-}
+CreateDataArray::CreateDataArray() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -362,6 +383,19 @@ void CreateDataArray::dataCheck()
   {
     return;
   }
+
+  // Sanity check input string at this point for well formedness
+  // Check to see if we have multiple values
+  bool startsWithSqBracket = m_InitializationValue.trimmed().startsWith(CDA::CDA_LB);
+  bool endsWithSqBracket = m_InitializationValue.trimmed().endsWith(CDA::CDA_RB);
+  // If only 1 bracket appears that is bad.
+  if((!startsWithSqBracket && endsWithSqBracket) || (startsWithSqBracket && !endsWithSqBracket))
+  {
+    QString ss = QString("Init string is not valid. Starting or ending square brackets are missing.");
+    setErrorCondition(-5458, ss);
+    return;
+  }
+
   // Create the data array and initialize it to a placeholder value
   m_OutputArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromTypeEnum()(this, getNewArray(), cDims, static_cast<int>(getScalarType()), 0, DataArrayID);
 
@@ -413,7 +447,6 @@ void CreateDataArray::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -429,70 +462,103 @@ void CreateDataArray::execute()
 
   if(m_ScalarType == SIMPL::ScalarTypes::Type::Int8)
   {
-    initializeArrayWithInts<int8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<int8_t> values = CDA::createInitVector<int8_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<int8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int16)
   {
-    initializeArrayWithInts<int16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<int16_t> values = CDA::createInitVector<int16_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<int16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int32)
   {
-    initializeArrayWithInts<int32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<int32_t> values = CDA::createInitVector<int32_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<int32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int64)
   {
-    initializeArrayWithInts<int64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<int64_t> values = CDA::createInitVector<int64_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<int64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt8)
   {
-    initializeArrayWithInts<uint8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<uint8_t> values = CDA::createInitVector<uint8_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<uint8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt16)
   {
-    initializeArrayWithInts<uint16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<uint16_t> values = CDA::createInitVector<uint16_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<uint16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt32)
   {
-    initializeArrayWithInts<uint32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<uint32_t> values = CDA::createInitVector<uint32_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<uint32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt64)
   {
-    initializeArrayWithInts<uint64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<uint64_t> values = CDA::createInitVector<uint64_t>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithInts<uint64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Float)
   {
-    initializeArrayWithReals<float>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue);
+    std::vector<float> values = CDA::createInitVector<float>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithReals<float>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Double)
   {
-    initializeArrayWithReals<double>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue);
+    std::vector<double> values = CDA::createInitVector<double>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithReals<double>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Bool)
   {
-    initializeArrayWithInts<bool>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, m_InitializationValue, m_ScalarType);
+    std::vector<bool> values = CDA::createInitVector<bool>(this, m_InitializationValue, m_NumberOfComponents);
+    CDA::initializeArrayWithBool(m_OutputArrayPtr.lock(), m_InitializationType, values);
   }
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void CreateDataArray::checkInitialization(QString dataArrayName)
+template <typename T>
+void CreateDataArray::checkInitialization(QString dataArrayName)
 {
   if(m_InitializationType == Manual)
   {
-    bool ok;
-    double input = m_InitializationValue.toDouble(&ok);
-    if(!ok)
+    // Check to see if we have multiple values
+    bool startsWithSqBracket = m_InitializationValue.trimmed().startsWith(CDA::CDA_LB);
+    bool endsWithSqBracket = m_InitializationValue.trimmed().endsWith(CDA::CDA_RB);
+
+    // If there are no brackets then the string should be able to be converted to a number.
+    if(!startsWithSqBracket && !endsWithSqBracket)
     {
-      QString ss = "Could not convert initialization value to a double.";
-      setErrorCondition(-5559, ss);
+      QString input = m_InitializationValue.trimmed();
+      CDA::convert_from<T> convertor;
+      std::pair<T, bool> conversionResult = convertor.convert(input);
+      if(!conversionResult.second)
+      {
+        QString ss =
+            QString("Init string cannot be converted to a number. If this is a multicomponent surround the string with square brackets [ ] or check the range of the type you are trying to convert.");
+        setErrorCondition(-5457, ss);
+      }
       return;
     }
 
-    if(input < static_cast<double>(std::numeric_limits<T>().lowest()) || input > static_cast<double>(std::numeric_limits<T>().max()))
+    if(startsWithSqBracket && endsWithSqBracket)
     {
-      QString ss = QObject::tr("%1: Invalid initialization value. The valid range is %2 to %3").arg(dataArrayName).arg(std::numeric_limits<T>::min()).arg(std::numeric_limits<T>::max());
-      setErrorCondition(-4000, ss);
+      QString input = m_InitializationValue.trimmed();
+      input = input.replace('[', "");
+      input = input.replace(']', "");
+      QStringList tokens = input.split(CDA::CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
+      if(m_NumberOfComponents != tokens.size() && tokens.size() != 1)
+      {
+        QString ss = QString("Number of initialization components does not match number of components.%1 vs %2").arg(tokens.size()).arg(m_NumberOfComponents);
+        setErrorCondition(-5459, ss);
+        return;
+      }
+      // This next part will just ignore the return as we are looking for the ability to actually convert all the inputs
+      // into valid numbers. The method will report through the filter if there were errors attempting this conversion
+      std::ignore = CDA::createInitVector<T>(this, m_InitializationValue, m_NumberOfComponents);
       return;
     }
   }
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index a79e0e94ce..69a5903f51 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -243,11 +243,11 @@ class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
   private:
     IDataArrayWkPtrType m_OutputArrayPtr;
 
-    SIMPL::ScalarTypes::Type m_ScalarType = {};
-    int m_NumberOfComponents = {};
-    DataArrayPath m_NewArray = {};
-    int m_InitializationType = {};
-    QString m_InitializationValue = {};
+    SIMPL::ScalarTypes::Type m_ScalarType = {SIMPL::ScalarTypes::Type::Int8};
+    int m_NumberOfComponents = {0};
+    DataArrayPath m_NewArray = {"", "", ""};
+    int m_InitializationType = {Manual};
+    QString m_InitializationValue = {"0"};
     FPRangePair m_InitializationRange = {};
 
     /**
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 09c170c149..52dd64ecdd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -1,39 +1,41 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
+#include "SIMPLib/CoreFilters/CreateDataContainer.h"
+#include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -55,48 +57,8 @@ class CreateDataArrayTest
   virtual ~CreateDataArrayTest() = default;
   static const int k_NoError = 0;
   static const int k_Int8Error = -4050;
-
-
-
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  int TestFilterAvailability()
-  {
-    // Now instantiate the CreateDataArray Filter from the FilterManager
-    QString filtName = "CreateDataArray";
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr == filterFactory.get())
-    {
-      std::stringstream ss;
-      ss << "The CreateDataArrayTest Requires the use of the " << filtName.toStdString() << " filter which is found in the IO Plugin";
-      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
-    }
-
-    // Now instantiate the CreateDataContainer Filter from the FilterManager
-    filtName = "CreateDataContainer";
-    filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr == filterFactory.get())
-    {
-      std::stringstream ss;
-      ss << "The CreateDataArrayTest Requires the use of the " << filtName.toStdString() << " filter which is found in the IO Plugin";
-      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
-    }
-
-    // Now instantiate the CreateDataContainer Filter from the FilterManager
-    filtName = "CreateAttributeMatrix";
-    fm = FilterManager::Instance();
-    filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr == filterFactory.get())
-    {
-      std::stringstream ss;
-      ss << "The CreateDataArrayTest Requires the use of the " << filtName.toStdString() << " filter which is found in the IO Plugin";
-      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
-    }
-
-    return EXIT_SUCCESS;
-  }
+  const size_t k_NumTuples = 5;
+  const size_t k_NumComponents = 3;
 
   // -----------------------------------------------------------------------------
   //
@@ -105,52 +67,24 @@ class CreateDataArrayTest
   {
 
     int err = 0;
-    bool propWasSet = false;
     // bool ok = false;
     QVariant var;
 
     DataContainerArray::Pointer dca = DataContainerArray::New();
-
-    // Now instantiate the CreateDataArray Filter from the FilterManager
-    FilterManager* fm = FilterManager::Instance();
-
-    QString filtName = "CreateDataContainer";
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr != filterFactory.get())
     {
-      // If we get this far, the Factory is good so creating the filter should not fail unless something has
-      // horribly gone wrong in which case the system is going to come down quickly after this.
-      AbstractFilter::Pointer filter = filterFactory->create();
-
+      CreateDataContainer::Pointer filter = CreateDataContainer::New();
+      filter->setDataContainerName({"Test Data Container", "", ""});
       filter->setDataContainerArray(dca);
 
-      // Test 1 set int32 array with an initialization of -5 and read value for comparison
-      var.setValue(QString::fromLatin1("Test Data Container"));
-      propWasSet = filter->setProperty("CreatedDataContainer", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
       filter->preflight();
       err = filter->getErrorCode();
       DREAM3D_REQUIRED(err, >=, 0)
     }
-
-    filtName = "CreateAttributeMatrix";
-    filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr != filterFactory.get())
     {
-      // If we get this far, the Factory is good so creating the filter should not fail unless something has
-      // horribly gone wrong in which case the system is going to come down quickly after this.
-      AbstractFilter::Pointer filter = filterFactory->create();
+      CreateAttributeMatrix::Pointer filter = CreateAttributeMatrix::New();
 
       filter->setDataContainerArray(dca);
-
-      var.setValue(QString::fromLatin1("Test Data Container"));
-      propWasSet = filter->setProperty("CreatedDataContainer", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
-      var.setValue(QString::fromLatin1("Cell Attribute Matrix"));
-      propWasSet = filter->setProperty("CreatedAttributeMatrix", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+      filter->setCreatedAttributeMatrix({"Test Data Container", "Cell Attribute Matrix", ""});
 
       filter->preflight();
       err = filter->getErrorCode();
@@ -168,7 +102,7 @@ class CreateDataArrayTest
     DataContainerArray::Pointer dca = DataContainerArray::New();
     DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
     dca->addOrReplaceDataContainer(m);
-    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(std::vector<size_t>(1, 1), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
+    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New({k_NumTuples}, SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
     m->addOrReplaceAttributeMatrix(attrMatrix);
     return dca;
   }
@@ -176,165 +110,545 @@ class CreateDataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestScalarType(AbstractFilter::Pointer filter, SIMPL::ScalarTypes::Type scalarType)
+  template <typename T>
+  void TestBasicParsing(SIMPL::ScalarTypes::Type scalarType)
   {
+    CreateDataArray::Pointer filter = CreateDataArray::New();
+    int32_t err = 0;
+    DataContainerArray::Pointer dca = DataContainerArray::NullPointer();
 
     QString dsName = QString("TestArray-%1").arg(static_cast<int>(scalarType));
+    std::cout << "    Testing Basic Parsing" << dsName.toStdString() << std::endl;
     DataArrayPath path = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, dsName);
 
-    DataContainerArray::Pointer dca = CreateDataContainerArray();
+    filter->setScalarType(scalarType);
+    filter->setNewArray(path);
+    filter->setInitializationType(0);
+    filter->setNumberOfComponents(k_NumComponents);
+
+    // test multiple components with multiple init values
+    dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
+    filter->setNumberOfComponents(k_NumComponents);
+    filter->setInitializationValue("[2;3;4");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5458);
 
-    QVariant var;
-    int err = 0;
-    bool propWasSet = false;
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("2;3;4]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5458);
 
-    var.setValue(scalarType);
-    propWasSet = filter->setProperty("ScalarType", var); //
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("2;3;4");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5457);
 
-    var.setValue(1);
-    propWasSet = filter->setProperty("NumberOfComponents", var); // 1 component
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[2;4]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5459);
 
-    var.setValue(path);
-    propWasSet = filter->setProperty("NewArray", var); // array path
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("2;3;hfi4");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5457);
 
-    /* ==== Test The Maximum Value for the primitive type ===== */
-    T max = std::numeric_limits<T>::max();
-    var.setValue(QString::number(max));
-    propWasSet = filter->setProperty("InitializationValue", var); // initialize with
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true);
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[2;3;hfi4]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
+  }
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  template <typename T>
+  void TestUnsignedIntegers(SIMPL::ScalarTypes::Type scalarType)
+  {
+    CreateDataArray::Pointer filter = CreateDataArray::New();
+    int32_t err = 0;
+    using DataArrayType = DataArray<T>;
+    DataContainerArray::Pointer dca = DataContainerArray::NullPointer();
+
+    QString dsName = QString("TestArray-%1").arg(static_cast<int>(scalarType));
+    std::cout << "    Testing Unsigned Integer" << dsName.toStdString() << std::endl;
+    DataArrayPath path = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, dsName);
+
+    filter->setScalarType(scalarType);
+    filter->setNewArray(path);
+    filter->setInitializationType(0);
+    filter->setNumberOfComponents(k_NumComponents);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[-65;78;88]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
 
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65;78;88]");
     filter->preflight();
     err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
+    // Now verify the data was correctly written to the data array
+    std::vector<T> exemplar = {static_cast<T>(65), static_cast<T>(78), static_cast<T>(88)};
+    typename DataArrayType::Pointer output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    size_t outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
+    {
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
+    }
+
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[-65]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->execute();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(65), static_cast<T>(65), static_cast<T>(65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
     {
-      IDataArray::Pointer testArrayPtr = dca->getDataContainer(SIMPL::Defaults::DataContainerName)->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
-      typedef DataArray<T> DataArrayType;
-      typename DataArrayType::Pointer inputArray = std::dynamic_pointer_cast<DataArrayType>(testArrayPtr);
-      DREAM3D_REQUIRE_VALID_POINTER(inputArray.get());
-      T* inputArrayPtr = inputArray->getPointer(0); // pointer to the int array created from the filter
-      DREAM3D_REQUIRE_EQUAL(inputArrayPtr[0], max)
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
     }
 
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
+    filter->setInitializationValue("-65");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5457);
 
-    /* ==== Test The Minmum Value for the primitive type ===== */
-    T min = std::numeric_limits<T>::min();
-    var.setValue(QString::number(min));
-    propWasSet = filter->setProperty("InitializationValue", var); // initialize with
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[-65]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
 
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("65");
     filter->preflight();
     err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(65), static_cast<T>(65), static_cast<T>(65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
+    {
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
+    }
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  template <typename T>
+  void TestSignedIntegers(SIMPL::ScalarTypes::Type scalarType)
+  {
+    CreateDataArray::Pointer filter = CreateDataArray::New();
+    int32_t err = 0;
+    using DataArrayType = DataArray<T>;
+    DataContainerArray::Pointer dca = DataContainerArray::NullPointer();
+
+    QString dsName = QString("TestArray-%1").arg(static_cast<int>(scalarType));
+    std::cout << "    Testing Signed Integer" << dsName.toStdString() << std::endl;
+    DataArrayPath path = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, dsName);
+
+    filter->setScalarType(scalarType);
+    filter->setNewArray(path);
+    filter->setInitializationType(0);
+    filter->setNumberOfComponents(k_NumComponents);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[-65;78;88]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, k_NoError);
+
+    // Now verify the data was correctly written to the data array
+    std::vector<T> exemplar = {static_cast<T>(-65), static_cast<T>(78), static_cast<T>(88)};
+    typename DataArrayType::Pointer output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    size_t outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
+    {
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
+    }
+
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[-65]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, k_NoError);
+
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(-65), static_cast<T>(-65), static_cast<T>(-65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
+    {
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
+    }
+
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
+    filter->setInitializationValue("65");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
 
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
     filter->execute();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, k_NoError);
 
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(65), static_cast<T>(65), static_cast<T>(65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
     {
-      IDataArray::Pointer testArrayPtr = dca->getDataContainer(SIMPL::Defaults::DataContainerName)->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
-      typedef DataArray<T> DataArrayType;
-      typename DataArrayType::Pointer inputArray = std::dynamic_pointer_cast<DataArrayType>(testArrayPtr);
-      DREAM3D_REQUIRE_VALID_POINTER(inputArray.get());
-      T* inputArrayPtr = inputArray->getPointer(0); // pointer to the int array created from the filter
-      DREAM3D_REQUIRE_EQUAL(inputArrayPtr[0], min)
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
     }
   }
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  int TestCreateDataArray()
+  template <typename T>
+  void TestReals(SIMPL::ScalarTypes::Type scalarType)
   {
-    //  bool propWasSet = false;
-    //  bool ok = false;
-    //  int err = 0;
-
-    // Now instantiate the CreateDataArray Filter from the FilterManager
-    QString filtName = "CreateDataArray";
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
-    if(nullptr != filterFactory.get())
+    CreateDataArray::Pointer filter = CreateDataArray::New();
+    int32_t err = 0;
+    using DataArrayType = DataArray<T>;
+    DataContainerArray::Pointer dca = DataContainerArray::NullPointer();
+
+    QString dsName = QString("TestArray-%1").arg(static_cast<int>(scalarType));
+    std::cout << "    Testing Reals" << dsName.toStdString() << std::endl;
+    DataArrayPath path = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, dsName);
+
+    filter->setScalarType(scalarType);
+    filter->setNewArray(path);
+    filter->setInitializationType(0);
+    filter->setNumberOfComponents(k_NumComponents);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65;78;88]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, k_NoError);
+
+    // Now verify the data was correctly written to the data array
+    std::vector<T> exemplar = {static_cast<T>(65), static_cast<T>(78), static_cast<T>(88)};
+    typename DataArrayType::Pointer output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    size_t outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
+    {
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
+    }
+
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("[65]");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, k_NoError);
+
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(65), static_cast<T>(65), static_cast<T>(65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
     {
-      // If we get this far, the Factory is good so creating the filter should not fail unless something has
-      // horribly gone wrong in which case the system is going to come down quickly after this.
-      AbstractFilter::Pointer filter = filterFactory->create();
-      // DataArrayPath path1 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, "testArray");
-
-      TestScalarType<uint64_t>(filter, SIMPL::ScalarTypes::Type::UInt64);
-      TestScalarType<int8_t>(filter, SIMPL::ScalarTypes::Type::Int8);
-      TestScalarType<uint8_t>(filter, SIMPL::ScalarTypes::Type::UInt8);
-      TestScalarType<int16_t>(filter, SIMPL::ScalarTypes::Type::Int16);
-      TestScalarType<uint16_t>(filter, SIMPL::ScalarTypes::Type::UInt16);
-      TestScalarType<int32_t>(filter, SIMPL::ScalarTypes::Type::Int32);
-      TestScalarType<uint32_t>(filter, SIMPL::ScalarTypes::Type::UInt32);
-      TestScalarType<int64_t>(filter, SIMPL::ScalarTypes::Type::Int64);
-
-//    TestScalarType<float>(filter, 8);
-//    TestScalarType<double>(filter, path1, 9);
-
-#if 0
-        // Test 2 set a bool array with a non-zero value and compare to 1
-        filter->setDataContainerArray(dca);
-        filter->getDataContainerArray()->getAttributeMatrix(path1)->removeAttributeArray(path1.getDataArrayName());
-        QVariant var;
-        var.setValue(10);
-        propWasSet = filter->setProperty("ScalarType", var); // bool
-        DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
-            double d = QString("0.000001").toDouble(&ok);
-        var.setValue(d);
-        propWasSet = filter->setProperty("InitializationValue", var); // initialize with d (9.9999999999999995e-007 Visual Studio)
-        DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
-            filter->execute();
-        err = filter->getErrorCode();
-        DREAM3D_REQUIRE_EQUAL(err, k_NoError);
-
-        IDataArray::Pointer boolArray = m->getAttributeMatrix(path.getAttributeMatrixName())->getAttributeArray(path.getDataArrayName());
-        DataArray<bool>::Pointer inputArrayBool = std::dynamic_pointer_cast<DataArray<bool>>(boolArray);
-        bool* inputArrayPtrBool = inputArrayBool->getPointer(0); // pointer to the bool array created from the filter
-        if (*inputArrayPtrBool != 1) // check the initialization value from the bool array
-        {
-          DREAM3D_REQUIRE_EQUAL(0, 1)
-        }
-
-        // Test 3 set int8 array with an initialization of 128 for out of range error
-        filter->setDataContainerArray(dca);
-        var.setValue(0);
-        propWasSet = filter->setProperty("ScalarType", var); // int8
-        DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
-            var.setValue(128);
-        propWasSet = filter->setProperty("InitializationValue", var); // initialize with 128
-        DREAM3D_REQUIRE_EQUAL(propWasSet, true)
-
-            filter->execute();
-        err = filter->getErrorCode();
-        DREAM3D_REQUIRE_EQUAL(err, k_Int8Error);
-
-#endif
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
     }
-    else
+
+    //-------------------------------------------------------------------------
+    // Now try with muliple components but a single value in the string
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setInitializationValue("65");
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    dca = CreateDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, k_NoError);
+
+    // Now verify the data was correctly written to the data array
+    exemplar = {static_cast<T>(65), static_cast<T>(65), static_cast<T>(65)};
+    output = dca->getPrereqArrayFromPath<DataArrayType>(nullptr, path, {3});
+    outNumTuples = output->getNumberOfTuples();
+    for(size_t t = 0; t < outNumTuples; t++)
     {
-      QString ss = QObject::tr("CreateDataArrayTest Error creating filter '%1'. Filter was not created/executed. Please notify the developers.").arg(filtName);
-      DREAM3D_REQUIRE_EQUAL(0, 1)
+      T* tPtr = output->getTuplePointer(t);
+      int32_t cmp = std::memcmp(tPtr, exemplar.data(), sizeof(T) * k_NumComponents);
+      if(cmp != 0)
+      {
+        std::cout << "##################################################################################################" << std::endl;
+        std::cout << "CreateDataArrayTest Failure:(" << __LINE__ << ")" << std::endl;
+        std::cout << output->getInfoString(SIMPL::MarkDown).toStdString() << std::endl;
+        QString str;
+        QTextStream out(&str);
+        output->printTuple(out, t);
+        std::cout << "Data:    " << str.toStdString() << std::endl;
+        std::cout << "Exemplar:" << exemplar[0] << ", " << exemplar[1] << ", " << exemplar[2] << std::endl;
+        std::cout << "##################################################################################################" << std::endl;
+      }
+      DREAM3D_REQUIRE_EQUAL(cmp, 0)
     }
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestCreateDataArray()
+  {
+    TestBasicParsing<int8_t>(SIMPL::ScalarTypes::Type::Int8);
+    TestBasicParsing<uint8_t>(SIMPL::ScalarTypes::Type::UInt8);
+    TestBasicParsing<int16_t>(SIMPL::ScalarTypes::Type::Int16);
+    TestBasicParsing<uint16_t>(SIMPL::ScalarTypes::Type::UInt16);
+    TestBasicParsing<int32_t>(SIMPL::ScalarTypes::Type::Int32);
+    TestBasicParsing<uint32_t>(SIMPL::ScalarTypes::Type::UInt32);
+    TestBasicParsing<int64_t>(SIMPL::ScalarTypes::Type::Int64);
+    TestBasicParsing<uint64_t>(SIMPL::ScalarTypes::Type::UInt64);
+    TestBasicParsing<float>(SIMPL::ScalarTypes::Type::Float);
+    TestBasicParsing<double>(SIMPL::ScalarTypes::Type::Double);
+
+    TestSignedIntegers<int8_t>(SIMPL::ScalarTypes::Type::Int8);
+    TestSignedIntegers<int16_t>(SIMPL::ScalarTypes::Type::Int16);
+    TestSignedIntegers<int32_t>(SIMPL::ScalarTypes::Type::Int32);
+    TestSignedIntegers<int64_t>(SIMPL::ScalarTypes::Type::Int64);
+
+    TestUnsignedIntegers<uint8_t>(SIMPL::ScalarTypes::Type::UInt8);
+    TestUnsignedIntegers<uint16_t>(SIMPL::ScalarTypes::Type::UInt16);
+    TestUnsignedIntegers<uint32_t>(SIMPL::ScalarTypes::Type::UInt32);
+    TestUnsignedIntegers<uint64_t>(SIMPL::ScalarTypes::Type::UInt64);
+
+    TestReals<float>(SIMPL::ScalarTypes::Type::Float);
+    TestReals<double>(SIMPL::ScalarTypes::Type::Double);
+
+    //    //   TestIntegers<bool>(filter, SIMPL::ScalarTypes::Type::Bool);
+    //    TestIntegers<size_t>(SIMPL::ScalarTypes::Type::SizeT);
     return EXIT_SUCCESS;
   }
 
@@ -347,8 +661,6 @@ class CreateDataArrayTest
 
     int err = EXIT_SUCCESS;
 
-    DREAM3D_REGISTER_TEST(TestFilterAvailability());
-
     DREAM3D_REGISTER_TEST(TestCreateDataArray())
   }
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
index 95afe61316..8bef29c6f1 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
@@ -1,16 +1,24 @@
-# Create Data Array  #
-
+# Create Data Array #
 
 ## Group (Subgroup) ##
 
 Core (Generation)
 
-
 ## Description ##
 
-This **Filter** creates an **Attribute Array** of any primitive type with any number of components along a _single component dimension_. For example, a scalar as (1) or a 3-vector as (3), but _not_ a matrix as (3, 3). The array is initialized to a user define value. The primitive type of the array to create is set using an integer constant. Code listing 1 shows the values:
+This **Filter** creates an **Attribute Array** of any primitive type with any number of components along a _single component dimension_. For example, a scalar as (1) or a 3-vector as (3), but _not_ a matrix as (3, 3). The array is initialized to a user define value or with random values within a specified range.
+
+When initializing a multicomponent array square bracket notation can be used to specify different initialization values for each component. For example say that I want to intialize a 2 component array where the first component is 0 and the second component is 1 we would use the following input string for the *Initialization Value*
+
+    [0;1]
+
+We are using semicolons instead of commas or decimal points due to different international standards (European versus United States?).
+
+Another example is if you want to create a floating point array where each tuple has 10 components but you just want the value of 2.5 to be used for each, then simply use:
 
-### Primitive Type Enumeration ###
+    [2.5] or 2.5
+
+### Scalar Type Values ###
 
     static const int Int8 = 0;
     static const int UInt8 = 1;
@@ -23,9 +31,8 @@ This **Filter** creates an **Attribute Array** of any primitive type with any nu
     static const int Float = 8;
     static const int Double = 9;
     static const int Bool = 10;
-    
 
-### Primitive Data Types ##
+### Primitive Data Type Valid Ranges ##
 
 | Type             | Size |        Range       |
 |------------------|------|--------------------|
@@ -49,7 +56,7 @@ must have a user entry or the default value _0_ will be used.
 | Name             | Type | Description |
 |------------------|------|-------------|
 | Scalar Type | Enumeration | Primitive data type for created array |
-| Number of Components | int32_t | Component size |
+| Number of Components | int32_t | The number of components that each tuple contains. Matrix are row major form within SIMPL|
 | Initialization Value | float | Initialization value for array |
 
 ## Required Geometry ##
@@ -66,11 +73,8 @@ None
 |------|--------------|-------------|---------|----------------|
 | Any **Attribute Array** | None | Any | Any | Created **Attribute Array** location and name |
 
-
 ## Example Pipelines ##
 
-
-
 ## License & Copyright ##
 
 Please see the description file distributed with this **Plugin**
@@ -78,4 +82,3 @@ Please see the description file distributed with this **Plugin**
 ## DREAM.3D Mailing Lists ##
 
 If you need more help with a **Filter**, please consider asking your question on the [DREAM.3D Users Google group!](https://groups.google.com/forum/?hl=en#!forum/dream3d-users)
-

From c0b5e83667091877ffeeb48c72e73fca98b87308 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 7 May 2020 13:48:44 -0400
Subject: [PATCH 216/397] Remove extra include for <memory> since it is already
 in the header file

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp              | 1 -
 Source/SIMPLib/CoreFilters/ArrayCalculator.cpp                   | 1 -
 Source/SIMPLib/CoreFilters/Breakpoint.cpp                        | 1 -
 Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp            | 1 -
 Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp          | 1 -
 Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp               | 1 -
 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp           | 1 -
 Source/SIMPLib/CoreFilters/ConvertData.cpp                       | 1 -
 Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp    | 1 -
 Source/SIMPLib/CoreFilters/CopyObject.cpp                        | 1 -
 Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp             | 1 -
 Source/SIMPLib/CoreFilters/CreateDataContainer.cpp               | 1 -
 .../SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp   | 1 -
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp                    | 1 -
 Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp               | 1 -
 Source/SIMPLib/CoreFilters/CreateStringArray.cpp                 | 1 -
 Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp                | 1 -
 Source/SIMPLib/CoreFilters/DataContainerReader.cpp               | 1 -
 Source/SIMPLib/CoreFilters/DataContainerWriter.cpp               | 1 -
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp                       | 1 -
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp                    | 1 -
 .../SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp   | 1 -
 Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp           | 1 -
 Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp             | 1 -
 Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp              | 1 -
 Source/SIMPLib/CoreFilters/FileReader.cpp                        | 1 -
 Source/SIMPLib/CoreFilters/FileWriter.cpp                        | 1 -
 Source/SIMPLib/CoreFilters/FindDerivatives.cpp                   | 1 -
 Source/SIMPLib/CoreFilters/GenerateColorTable.cpp                | 1 -
 Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp               | 1 -
 Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp                 | 1 -
 Source/SIMPLib/CoreFilters/InitializeData.cpp                    | 1 -
 Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp      | 1 -
 Source/SIMPLib/CoreFilters/MassCreateData.cpp                    | 1 -
 Source/SIMPLib/CoreFilters/MoveData.cpp                          | 1 -
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp                     | 1 -
 Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp             | 1 -
 Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp            | 1 -
 Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp                | 1 -
 Source/SIMPLib/CoreFilters/PostSlackMessage.cpp                  | 1 -
 Source/SIMPLib/CoreFilters/RawBinaryReader.cpp                   | 1 -
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp                     | 1 -
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp                      | 1 -
 Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp          | 1 -
 Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp              | 1 -
 Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp             | 1 -
 Source/SIMPLib/CoreFilters/RenameDataContainer.cpp               | 1 -
 Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp               | 1 -
 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp              | 1 -
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp                       | 1 -
 Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp      | 1 -
 Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp               | 1 -
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp                    | 1 -
 Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp             | 1 -
 54 files changed, 54 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 4968e126d9..b4f337a24e 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ApplyImageTransforms.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 944423569a..34065f6ef1 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ArrayCalculator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 8a42166f2e..357a56a3d1 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "Breakpoint.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index c9193f2698..0dc4abb3c0 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CombineAttributeArrays.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index e52d4e7d14..f04f1ec533 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -32,7 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#include <memory>
 
 #include "CombineAttributeMatrices.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 4b67dd7e86..d62e6d5da1 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ConditionalSetValue.h"
 
-#include <memory>
 #include <tuple>
 
 #include <QtCore/QTextStream>
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 58ab6b6b44..b51ca7b108 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -36,7 +36,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ConvertColorToGrayScale.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index b7346a4119..c2bcdd459b 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ConvertData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index cdafc30e9e..dee0c09e89 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CopyFeatureArrayToElementArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 84c4ebde01..3859c30ef5 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CopyObject.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 129e7c3052..77b200d495 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CreateAttributeMatrix.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 8725bcab3f..bb6e4b2bd2 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CreateDataContainer.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 93d7f857a4..bdfce5dbcd 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CreateFeatureArrayFromElementArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index aa0236fe5b..7172330241 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CreateGeometry.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 14e04c1197..0a110a7f83 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -32,7 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#include <memory>
 
 #include "CreateImageGeometry.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 351b48ee13..f6fdc01a4f 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CreateStringArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 1e7488300a..705fdff2a1 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "CropVertexGeometry.h"
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index c8a4239fe8..41e6ef7bd2 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerReader.h"
 
-#include <memory>
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index cf9d505033..87acdc1e76 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerWriter.h"
 
-#include <memory>
 
 #include <QtCore/QTextStream>
 #include <QtCore/QDebug>
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index c508712c76..934935b6e1 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "EmptyFilter.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index 8e3350a9e6..f98a9703b4 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ExecuteProcess.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index bf672374a8..c1e6ba9713 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ExtractAttributeArraysFromGeometry.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index b477f681e4..e669745d23 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ExtractComponentAsArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index efff990608..584f35085c 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ExtractVertexGeometry.h"
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index cd69574af4..8ef5fff574 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "FeatureDataCSVWriter.h"
 
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index 3cd8b30bbe..e8494853e6 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "FileReader.h"
 
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index 871e87b660..0a38d92d3e 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "FileWriter.h"
 
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 91e63237a6..8ad43adf17 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "FindDerivatives.h"
 
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 928b691ebd..c47935c5ea 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -2,7 +2,6 @@
  * Your License or Copyright can go here
  */
 
-#include <memory>
 
 #include "GenerateColorTable.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 29594ec33f..b887d926da 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ImportAsciDataArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 59f8e6846a..194d25bcae 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -30,7 +30,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ImportHDF5Dataset.h"
 
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 96853ccd1a..6af3b1c1c4 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "InitializeData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index d125cde656..9b0121a00b 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "LinkFeatureMapToElementArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 09cf843c14..27db6b9c97 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "MassCreateData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 72836b7ec0..33942b5091 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "MoveData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 1fc8d0c537..acac9b9674 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "MoveMultiData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 789d706dab..0489e821ed 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "MultiThresholdObjects.h"
 
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 532efe4df3..8984d3ae52 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "MultiThresholdObjects2.h"
 
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 459740f330..2c1c69acef 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -31,7 +31,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "PipelineAnnotation.h"
 
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 82a145ff9d..17b35d7048 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -30,7 +30,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "PostSlackMessage.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index a49ed9d35d..26235e86c6 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -34,7 +34,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RawBinaryReader.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index f989be48b0..376a390cfa 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -2,7 +2,6 @@
  * Your License or Copyright can go here
  */
 
-#include <memory>
 
 #include "ReadASCIIData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 77fab21fbd..5736392738 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RemoveArrays.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 2a6087e8c5..6ea6af072d 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RemoveComponentFromArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 52962d0ef0..9a7e7c951f 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RenameAttributeArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index e014020eb3..f843df95d5 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RenameAttributeMatrix.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 6ef6b882d2..28abf393ca 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "RenameDataContainer.h"
 
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 6e2b79cf4b..c6b7f1a886 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ReplaceValueInArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index f445bdc1d7..aff04d1014 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -37,7 +37,6 @@
 #include "RotateSampleRefFrame.h"
 
 #include <cmath>
-#include <memory>
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
 #include <tbb/blocked_range3d.h>
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 0317f9fd63..b33c819bb7 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "ScaleVolume.h"
 
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 71dbea0aa1..2d24fec04f 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "SetOriginResolutionImageGeom.h"
 
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 22d6858559..5e68fdaac9 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -33,7 +33,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "SplitAttributeArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index a5c24d3748..7b705a391d 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "WriteASCIIData.h"
 
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index ca6abc41de..83385d29fe 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -33,7 +33,6 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <memory>
 
 #include "WriteTriangleGeometry.h"
 

From e826148ad3cfe792b69c7d747a10d831b2af167f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 7 May 2020 14:23:11 -0400
Subject: [PATCH 217/397] Remove extra space and fix some include groupings

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/PipelineRunner/PipelineRunner.cpp                     | 2 --
 Source/SIMPLib/Common/EnsembleInfo.h                         | 1 -
 Source/SIMPLib/Common/SIMPLRange.h                           | 1 -
 Source/SIMPLib/Common/SIMPLRange2D.h                         | 1 -
 Source/SIMPLib/Common/SIMPLRange3D.h                         | 1 -
 Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp         | 1 -
 Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp          | 4 ----
 Source/SIMPLib/CoreFilters/ArrayCalculator.cpp               | 4 ----
 Source/SIMPLib/CoreFilters/Breakpoint.cpp                    | 3 ---
 Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp        | 3 ---
 Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp      | 1 -
 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp       | 3 ---
 Source/SIMPLib/CoreFilters/ConvertData.cpp                   | 3 ---
 .../SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp   | 3 ---
 Source/SIMPLib/CoreFilters/CopyObject.cpp                    | 3 ---
 Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp         | 3 ---
 Source/SIMPLib/CoreFilters/CreateDataContainer.cpp           | 3 ---
 .../CoreFilters/CreateFeatureArrayFromElementArray.cpp       | 3 ---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp                | 3 ---
 Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp           | 1 -
 Source/SIMPLib/CoreFilters/CreateStringArray.cpp             | 3 ---
 Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp            | 3 ---
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp                   | 3 ---
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp                | 4 ----
 .../CoreFilters/ExtractAttributeArraysFromGeometry.cpp       | 3 ---
 Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp       | 3 ---
 Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp         | 3 ---
 Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp          | 2 --
 Source/SIMPLib/CoreFilters/FeatureCountDecision.h            | 1 -
 Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp          | 4 ----
 Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h            | 1 -
 Source/SIMPLib/CoreFilters/FileReader.cpp                    | 2 --
 Source/SIMPLib/CoreFilters/FileWriter.cpp                    | 2 --
 Source/SIMPLib/CoreFilters/FindDerivatives.cpp               | 3 ---
 Source/SIMPLib/CoreFilters/GenerateColorTable.cpp            | 1 -
 Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp           | 5 -----
 Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp             | 2 --
 Source/SIMPLib/CoreFilters/InitializeData.cpp                | 4 ----
 Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp  | 4 ----
 Source/SIMPLib/CoreFilters/MaskCountDecision.cpp             | 2 --
 Source/SIMPLib/CoreFilters/MaskCountDecision.h               | 1 -
 Source/SIMPLib/CoreFilters/MassCreateData.cpp                | 3 ---
 Source/SIMPLib/CoreFilters/MoveData.cpp                      | 4 ----
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp                 | 4 ----
 Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp         | 3 ---
 Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp        | 3 ---
 Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp            | 3 ---
 Source/SIMPLib/CoreFilters/PostSlackMessage.cpp              | 3 ---
 Source/SIMPLib/CoreFilters/RawBinaryReader.cpp               | 5 -----
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp                 | 3 ---
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp                  | 3 ---
 Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp      | 3 ---
 Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp          | 3 ---
 Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp         | 3 ---
 Source/SIMPLib/CoreFilters/RenameDataContainer.cpp           | 3 ---
 Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp           | 3 ---
 Source/SIMPLib/CoreFilters/RequiredZThickness.cpp            | 1 -
 Source/SIMPLib/CoreFilters/RequiredZThickness.h              | 1 -
 Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp          | 1 -
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp                   | 4 ----
 Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp  | 4 ----
 Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp           | 3 ---
 .../SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp  | 5 -----
 .../CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp   | 1 -
 .../CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp | 1 -
 .../CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp  | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp   | 1 -
 .../Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp       | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp    | 3 ---
 .../CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp    | 3 ---
 .../SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp  | 1 -
 .../CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp      | 3 ---
 .../SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp   | 4 ----
 .../CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp      | 3 ---
 .../CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp        | 2 --
 .../CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp       | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp  | 1 -
 .../SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp   | 1 -
 .../Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp   | 3 ---
 .../CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp  | 1 -
 .../CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp    | 1 -
 .../CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp     | 2 --
 .../CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp    | 1 -
 .../CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp       | 3 ---
 .../CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp        | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp      | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp | 2 --
 .../SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp | 1 -
 .../SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp  | 3 ---
 Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp | 1 -
 Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp  | 1 -
 .../CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp     | 1 -
 .../CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp    | 1 -
 .../CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp      | 1 -
 Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp  | 2 --
 Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp  | 1 -
 .../CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp       | 1 -
 .../CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp     | 1 -
 Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp   | 1 -
 .../Testing/Cxx/SetOriginResolutionImageGeomTest.cpp         | 1 -
 .../SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp   | 1 -
 .../CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp    | 4 ----
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp                | 4 ----
 Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp         | 4 ----
 Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp       | 1 -
 Source/SIMPLib/DataArrays/StatsDataArray.h                   | 2 --
 Source/SIMPLib/DataArrays/StringDataArray.cpp                | 1 -
 Source/SIMPLib/DataArrays/StringDataArray.h                  | 4 +---
 Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp      | 3 ---
 .../SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp   | 1 -
 Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp    | 1 -
 Source/SIMPLib/DataContainers/AttributeMatrix.cpp            | 1 -
 Source/SIMPLib/DataContainers/DataContainer.h                | 2 --
 Source/SIMPLib/DataContainers/DataContainerArray.cpp         | 1 -
 Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp    | 1 -
 .../DataContainers/Testing/Cxx/DataContainerBundleTest.cpp   | 1 -
 Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h   | 1 -
 Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp | 1 -
 .../SIMPLib/FilterParameters/JsonFilterParametersReader.cpp  | 2 --
 .../SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp  | 1 -
 .../FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp  | 2 --
 Source/SIMPLib/Filtering/AbstractComparison.cpp              | 1 -
 Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h          | 1 -
 Source/SIMPLib/Geometry/DerivativeHelpers.cpp                | 1 -
 Source/SIMPLib/Geometry/EdgeGeom.cpp                         | 1 -
 Source/SIMPLib/Geometry/HexahedralGeom.cpp                   | 1 -
 Source/SIMPLib/Geometry/HexahedralGeom.h                     | 1 -
 Source/SIMPLib/Geometry/IGeometry.h                          | 1 -
 Source/SIMPLib/Geometry/ImageGeom.h                          | 1 -
 Source/SIMPLib/Geometry/QuadGeom.h                           | 1 -
 Source/SIMPLib/Geometry/RectGridGeom.h                       | 1 -
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp                | 1 -
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp                  | 1 -
 Source/SIMPLib/Geometry/TetrahedralGeom.h                    | 1 -
 Source/SIMPLib/Geometry/TriangleGeom.cpp                     | 1 -
 Source/SIMPLib/Geometry/TriangleGeom.h                       | 1 -
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp                    | 1 -
 Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp           | 1 -
 Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp             | 3 ---
 .../SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp | 2 --
 .../SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp | 2 --
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp                | 3 +--
 Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp | 2 --
 Source/SIMPLib/TestFilters/GenericExample.cpp                | 1 -
 Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp  | 1 -
 .../SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp   | 1 -
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp                    | 2 --
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp                  | 1 -
 .../FilterParameterWidgets/DataArraySelectionWidget.cpp      | 1 -
 .../FilterParameterWidgets/DataContainerReaderWidget.cpp     | 1 -
 .../FilterParameterWidgets/DynamicTableWidget.cpp            | 1 -
 .../FilterParameterWidgets/FileListInfoWidget.cpp            | 1 -
 .../MultiAttributeMatrixSelectionWidget.cpp                  | 1 -
 Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp               | 1 -
 Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp        | 2 --
 Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp    | 2 --
 Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp            | 2 --
 Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp   | 2 --
 .../Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp  | 2 --
 Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp          | 2 --
 Source/SVWidgetsLib/Widgets/SVPipelineView.cpp               | 1 -
 Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp         | 1 -
 163 files changed, 2 insertions(+), 328 deletions(-)

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 5cca769852..4be0a42cb2 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -44,7 +44,6 @@
 #include <QtCore/QCommandLineOption>
 #include <QtCore/QCommandLineParser>
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
@@ -54,7 +53,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index 0f28331e06..b601bd4994 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -39,7 +39,6 @@
 
 
 #include "SIMPLib/Common/PhaseType.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 
diff --git a/Source/SIMPLib/Common/SIMPLRange.h b/Source/SIMPLib/Common/SIMPLRange.h
index afa2a2c7fb..831fc350c0 100644
--- a/Source/SIMPLib/Common/SIMPLRange.h
+++ b/Source/SIMPLib/Common/SIMPLRange.h
@@ -36,7 +36,6 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.h b/Source/SIMPLib/Common/SIMPLRange2D.h
index 222f846478..d92a5ce821 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.h
+++ b/Source/SIMPLib/Common/SIMPLRange2D.h
@@ -36,7 +36,6 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
index b685fb802f..ad34f481ed 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.h
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -36,7 +36,6 @@
 #include <array>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
-
 #include "SIMPLib/SIMPLib.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index 1c2d1c3964..9dda9c3186 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index b4f337a24e..59437a900b 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -32,19 +32,15 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ApplyImageTransforms.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
-
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 34065f6ef1..2921da9a4c 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -32,16 +32,12 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ArrayCalculator.h"
 
 #include <QtCore/QRegularExpression>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 357a56a3d1..8ddfe52f50 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "Breakpoint.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 0dc4abb3c0..6f59a4f6de 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CombineAttributeArrays.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index f04f1ec533..5dfaaf284b 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index b51ca7b108..21d4b2dde9 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -35,8 +35,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ConvertColorToGrayScale.h"
 
 #include <algorithm>
@@ -44,7 +42,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index c2bcdd459b..98d3fdbc6e 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ConvertData.h"
 
 #include <iostream>
@@ -41,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index dee0c09e89..a2329673e4 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CopyFeatureArrayToElementArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 3859c30ef5..0dd94dbedf 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -32,14 +32,11 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CopyObject.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 77b200d495..3a6af3d2b8 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CreateAttributeMatrix.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index bb6e4b2bd2..b654c40ba1 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CreateDataContainer.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index bdfce5dbcd..4edfdf5532 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CreateFeatureArrayFromElementArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 7172330241..f83ea72435 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -32,14 +32,11 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CreateGeometry.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 0a110a7f83..2bd3207f84 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index f6fdc01a4f..e5cec00254 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CreateStringArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 705fdff2a1..3f162687f7 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -32,8 +32,6 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "CropVertexGeometry.h"
 
 #include <cassert>
@@ -41,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 934935b6e1..8a35bcca77 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "EmptyFilter.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index f98a9703b4..94a4e5ad3f 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -32,18 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ExecuteProcess.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index c1e6ba9713..845e80d28f 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -32,8 +32,6 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ExtractAttributeArraysFromGeometry.h"
 
 #include <cassert>
@@ -42,7 +40,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index e669745d23..b3b33095c0 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ExtractComponentAsArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 584f35085c..f63f8b8332 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -32,8 +32,6 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ExtractVertexGeometry.h"
 
 #include <numeric>
@@ -41,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 0b18924914..43b87fc3a6 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -36,11 +36,9 @@
 #include "FeatureCountDecision.h"
 
 #include <QtCore/QJsonDocument>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index aef6fd321d..92bff37222 100755
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 8ef5fff574..c5349e85fc 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -32,16 +32,12 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "FeatureDataCSVWriter.h"
 
 #include <QtCore/QDir>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 55bdcf9f64..ea3e0a50b5 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
 #include "SIMPLib/Common/Constants.h"
 
 /**
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index e8494853e6..14a6bcec6c 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "FileReader.h"
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index 0a38d92d3e..b393428921 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "FileWriter.h"
 
 #include <QtCore/QDir>
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 8ad43adf17..bd2fba2225 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "FindDerivatives.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/TemplateHelpers.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index c47935c5ea..4a0e5ff647 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -8,7 +8,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index b887d926da..a73aaa0dc9 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ImportAsciDataArray.h"
 
 #include <locale>
@@ -41,15 +39,12 @@
 
 #include <QtCore/QFileInfo>
 #include <QtCore/QDateTime>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 194d25bcae..f78bcedd26 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -29,8 +29,6 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ImportHDF5Dataset.h"
 
 #include <QtCore/QFileInfo>
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 6af3b1c1c4..7441de7b1f 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "InitializeData.h"
 
 #include <random>
@@ -41,11 +39,9 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTime>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 9b0121a00b..6c75680524 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -32,17 +32,13 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "LinkFeatureMapToElementArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 729a30cfbc..df275c4685 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -36,11 +36,9 @@
 #include "MaskCountDecision.h"
 
 #include <QtCore/QJsonDocument>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 87833686fe..e1f5ceac5c 100755
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 27db6b9c97..7270400aa1 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "MassCreateData.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 33942b5091..8df549d62e 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -32,17 +32,13 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "MoveData.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index acac9b9674..9771cf21b7 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -32,17 +32,13 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "MoveMultiData.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 0489e821ed..1849db5b4c 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "MultiThresholdObjects.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 8984d3ae52..ad65789174 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "MultiThresholdObjects2.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 2c1c69acef..b7d6a47e95 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -30,14 +30,11 @@
 *    United States Air Force Prime Contract FA8650-15-D-5231
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "PipelineAnnotation.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ParagraphFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 17b35d7048..04eb9c3c75 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -29,8 +29,6 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "PostSlackMessage.h"
 
 #include <QtCore/QEventLoop>
@@ -44,7 +42,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 26235e86c6..a78768ebc7 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -33,20 +33,15 @@
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RawBinaryReader.h"
 
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 376a390cfa..f78db203d7 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -6,18 +6,15 @@
 #include "ReadASCIIData.h"
 
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
-
 #include "SIMPLib/SIMPLibVersion.h"
 
 #include "SIMPLib/CoreFilters/util/AbstractDataParser.hpp"
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 5736392738..f87b4c09ac 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RemoveArrays.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
 #include "SIMPLib/SIMPLibVersion.h"
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 6ea6af072d..089bccb7c6 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RemoveComponentFromArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 9a7e7c951f..88e268ab7a 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RenameAttributeArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index f843df95d5..6673a11210 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RenameAttributeMatrix.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 28abf393ca..98ce837a05 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "RenameDataContainer.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index c6b7f1a886..2d71b57475 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -32,14 +32,11 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ReplaceValueInArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 9b597e34c3..a6283463d2 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 7da1c76e2b..5d0de64380 100755
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-
 #include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index aff04d1014..c421ccdabe 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -49,7 +49,6 @@
 #include <Eigen/Dense>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index b33c819bb7..dc7e02ec23 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -32,18 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "ScaleVolume.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 2d24fec04f..98b1b41e6a 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -32,18 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "SetOriginResolutionImageGeom.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 5e68fdaac9..fdc6ec922a 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -32,14 +32,11 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "SplitAttributeArray.h"
 
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index e064774532..3160511ad6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -45,13 +43,10 @@
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/util/CalculatorOperator.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 3e01dff1f3..a89db8282d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index b747e9ab91..88851f96d5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 92313d701d..5de89e68a2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -36,13 +36,11 @@
 
 #include <QTextStream>
 #include <QtCore/QFile>
-
 #include <QtCore/QTextStream>
 
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index ac45abe5ad..8eec3f55e9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -48,7 +48,6 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index fe8065404b..806a6290b5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -40,14 +40,12 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index e6d03df13e..6c398e6fc6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -44,12 +44,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -58,7 +56,6 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 651b44a204..105523da9e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include <cassert>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -44,7 +42,6 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 52dd64ecdd..5498e09801 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -45,7 +45,6 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index e1d7d2ebaf..7164c18740 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include <assert.h>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -46,7 +44,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/CreateDataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index 1f4792fa11..a37f84860e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -44,15 +44,12 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
-
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -61,7 +58,6 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 559cf3e7dd..1dcb9a438c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -33,17 +33,14 @@
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLib/CoreFilters/CreateImageGeometry.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/SIMPLibVersion.h"
-
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index fae53565a5..1b5248f7f1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -42,12 +42,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index c8d29adfe2..b0492cf7d7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -44,12 +44,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index 52ad1e0351..21999c5eee 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -39,7 +39,6 @@
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
-
 #include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index 9696ca06af..100deaed9f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -49,7 +49,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/ExecuteProcess.h"
 
 /**
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 5b85f8ec7f..527e3708b4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -44,12 +44,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/QuadGeom.h"
@@ -57,7 +55,6 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index d2e7783ae5..eae7c4d98e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/ExtractComponentAsArray.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index 5490cf7273..daa6c9ada0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -20,7 +20,6 @@
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/ExtractVertexGeometry.h"
 
 // This header is auto-generated during cmake time
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 05dcaa5e1a..306bb18459 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -46,10 +46,8 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index ebcb4d515f..112e4ee2e2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QString>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 2cd90ecbf8..58994ec87b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -39,11 +39,9 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QJsonParseError>
 #include <QtCore/QString>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -53,7 +51,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/GenerateColorTable.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index bdb58386fe..492ec2a318 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -18,11 +18,9 @@
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index ae9228d0df..518b6aad64 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -44,12 +44,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index b6e46ad3bf..7b5ac59b65 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -44,12 +44,10 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index 1d7278eda1..5ad494ba54 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -40,7 +40,6 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -52,7 +51,6 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/Breakpoint.h"
 #include "SIMPLib/TestFilters/ChangeGlobalValue.h"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
index ff3a982124..b260f814ee 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
@@ -5,7 +5,6 @@
 #include <QtCore/QFile>
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 1a9d72477e..6af778f9ee 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -40,14 +40,11 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QVector>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
-
 #include "SIMPLib/CoreFilters/RawBinaryReader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 1e3ba3a51b..bff4f7f7a1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -48,7 +48,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/ReadASCIIData.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index 55fec9f598..c27e23d3f0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -45,7 +45,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RemoveArrays.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index c176e1e6b6..bbe7ac22b6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RenameAttributeArray.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index e6daaac196..d64db3f913 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RenameAttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index f7e8a1e979..779bf1c999 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RenameDataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
index 459c7f3401..6541636356 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -39,7 +39,6 @@
 
 
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -50,7 +49,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RenameDataContainer.h"
 
 class RenameTimingTest
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 38438375be..06a4e24cc7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index bc43d6ce8d..c845ea253e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/RequiredZThickness.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
index 506b947f4b..56f67af0ab 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
@@ -50,7 +50,6 @@
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 
 class RotateSampleRefFrameTest
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index 683177cdaf..ad4d61bdbd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/ScaleVolume.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index b26a23d17a..023df26c08 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 620cbee2dc..410ebe6eaf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -50,7 +50,6 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/MeshStructs.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 8151e9e67b..d185420666 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -36,23 +36,19 @@
 #pragma once
 
 #include <QtCore/QFile>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/Geometry/TriangleGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 7b705a391d..95b6547b14 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -32,16 +32,12 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "WriteASCIIData.h"
 
 #include <QtCore/QDir>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 83385d29fe..c8e16017f5 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -32,18 +32,14 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "WriteTriangleGeometry.h"
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index 31cf367932..52e62bf679 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -34,7 +34,6 @@
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/CoreFilters/util/ParserFunctors.hpp"
 
 class AbstractDataParser
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 2dcbd7e6a7..1df37cb224 100755
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -37,11 +37,9 @@
 #include <memory>
 
 #include <QtCore/QJsonObject>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/StatsData/StatsData.h"
-
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index eeea694091..1908ee271b 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -37,7 +37,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
-
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
 
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 6f25c2ff2b..8934edf453 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -41,13 +41,11 @@
 #include <vector>
 
 #include <QtCore/QString>
+#include <QtCore/QTextStream>
 
 #include "H5Support/H5Lite.h"
 
-#include <QtCore/QTextStream>
-
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/DataArrays/IDataArray.h"
 
 /**
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 2d238ddc51..3b60bef377 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -45,20 +45,17 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QVector>
-
 #include <QtCore/QTextStream>
 
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 9727c938f8..317a3911c9 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -42,7 +42,6 @@
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/Geometry/MeshStructs.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index 462dea230c..1111cb60b0 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -42,7 +42,6 @@
 #include "SIMPLib/DataArrays/StructArray.hpp"
 #include "SIMPLib/Geometry/MeshStructs.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 05ea0b2100..db264db7f2 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -34,7 +34,6 @@
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QTextStream>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 719a6b3246..f2853c28aa 100755
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -42,11 +42,9 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 #include <QtCore/QVector>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 8112412842..4d34ea35b3 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
-
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 30ca3f2ce7..7cffea36fc 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -40,7 +40,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataArrays/IDataArray.h"
-
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index 7d885b798b..cab3bb058d 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -44,7 +44,6 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 258311ffb7..45fa45bb41 100755
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -45,7 +45,6 @@
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-
 #include "SIMPLib/SIMPLib.h"
 
 /**
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 93618e4fcf..66562a06f4 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -45,7 +45,6 @@
 
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 65163e098d..5694273598 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -37,11 +37,9 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QStringList>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/CoreFilters/EmptyFilter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 745044dc14..3aab18d54b 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -42,7 +42,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 9f1eecbb76..0de6dae0fd 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -36,7 +36,6 @@
 #include <QtCore/QPair>
 
 #include "SIMPLib/Common/PhaseType.h"
-
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -87,7 +86,6 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.cpp b/Source/SIMPLib/Filtering/AbstractComparison.cpp
index 7adc279a44..2b038a7211 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.cpp
+++ b/Source/SIMPLib/Filtering/AbstractComparison.cpp
@@ -36,7 +36,6 @@
 #include "AbstractComparison.h"
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Filtering/ComparisonSet.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index 7b2e682640..8f6a454d8d 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -43,7 +43,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Filtering/AbstractComparison.h"
 
 /**
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
index 65e40f7a46..718348b950 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
@@ -56,7 +56,6 @@
 
 #include "SIMPLib/Math/GeometryMath.h"
 #include "SIMPLib/Math/MatrixMath.h"
-
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/QuadGeom.h"
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 05f0eabdd6..5a4bf4d224 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -47,7 +47,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/EdgeGeom.h"
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index e46e3a38ad..ca8c98a975 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -12,7 +12,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/HexahedralGeom.h"
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index b5e898e0c4..e3730a85e7 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -6,7 +6,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/IGeometry3D.h"
-
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index f07f6a084d..4ab94c4727 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -40,7 +40,6 @@
 #include <QMutex>
 #include <QtCore/QMap>
 #include <QtCore/QString>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index ad161ecf47..993fb82929 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -39,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Geometry/IGeometryGrid.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 097627b7cb..132511969e 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -39,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Geometry/IGeometry2D.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 5e2eaff0ec..945eac242d 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -40,7 +40,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/IGeometryGrid.h"
-
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
index b0249afe54..408d552e0e 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
@@ -36,7 +36,6 @@
 #include "ShapeOps.h"
 
 #include "SIMPLib/Math/SIMPLibMath.h"
-
 #include "SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h"
 #include "SIMPLib/Geometry/ShapeOps/CylinderAOps.h"
 #include "SIMPLib/Geometry/ShapeOps/CylinderBOps.h"
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index b72d3f51a4..5c12b2f2e8 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -47,7 +47,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 00b894a7e5..3811e8d1e1 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -40,7 +40,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/IGeometry3D.h"
-
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 41b7ea4d18..42f0a8dddf 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -47,7 +47,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Geometry/TriangleGeom.h"
-
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 148e0190e1..fba4bc56f2 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -39,7 +39,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-
 #include "SIMPLib/Geometry/IGeometry2D.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index 33bc1e6bd6..c3d451f071 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -43,7 +43,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
-
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 
diff --git a/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
index e79f1948ea..7fced926e1 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
@@ -5,7 +5,6 @@
 #include <iostream>
 
 #include "SIMPLib/Math/MatrixMath.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 5597eaa71a..c97f69e38c 100755
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -53,11 +53,9 @@
 #include "QtWebApp/httpserver/httpsessionstore.h"
 
 #include <QtCore/QTextStream>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
-
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -74,7 +72,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/CoreFilters/CreateDataContainer.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 2afae85e30..5a08831718 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -36,11 +36,9 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QProcess>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
-
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
index cdba0e74c4..01015bd4e6 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
@@ -3,11 +3,9 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
-
 #include "SIMPLib/REST/SIMPLDirectoryListing.h"
 
 SIMPLStaticFileController* SIMPLStaticFileController::m_Instance = nullptr;
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index b17a27d9de..5188b5481e 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -39,11 +39,10 @@
 
 #include <QtCore/QJsonArray>
 #include <QtCore/QString>
+#include <QtCore/QDebug>
 
 #include "H5Support/H5Utilities.h"
 
-#include <QtCore/QDebug>
-
 #include "SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index 9820456ae7..0eca78a26b 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -37,11 +37,9 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QJsonDocument>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index a9534dbd12..ed1e5b641a 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -40,7 +40,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
index 095c68bd70..d4848adac4 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
@@ -47,7 +47,6 @@
 #endif
 
 #include "SIMPLib/Utilities/FloatSummation.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
index d49c7acd7e..ca62db8672 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
@@ -41,7 +41,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Utilities/StringOperations.h"
-
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index 80b98016a7..58490326a8 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -43,11 +43,9 @@
 
 #include <QtCore/QByteArray>
 #include <QtCore/QFile>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Geometry/ImageGeom.h"
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index 8170350337..4c73dde24d 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -48,7 +48,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/AppVersion.h"
-
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 0e9ae0f3ea..01a5f91fec 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -38,7 +38,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index c8fd98b804..705f7cb40a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -49,7 +49,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
-
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index dac8eaf0c8..97d2d07027 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -39,7 +39,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
-
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index bb04c300c7..c23beeca8d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -45,7 +45,6 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 #include "SIMPLib/Utilities/FilePathGenerator.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 5ed80c4fc1..f1a99058c3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -43,7 +43,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
index 2e364b6a50..2cabe64570 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
@@ -39,7 +39,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Filtering/FilterManager.h"
-
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 
 #include "QtWebApp/httpserver/httplistener.h"
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
index 88857e8fe2..30c971b74c 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
@@ -32,8 +32,6 @@
 *    United States Prime Contract Navy N00173-07-C-2068
 *
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include <QtWidgets/QLineEdit>
 
 #include <QtGui/QPainter>
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index f3e0f85f88..bbaa826b57 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -32,8 +32,6 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include <QtWidgets/QLineEdit>
 
 #include <QtGui/QPainter>
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 8c05a68803..b545afb875 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -43,11 +43,9 @@
 #include <QtWidgets/QVBoxLayout>
 
 #include <QtCore/QTextStream>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/DocRequestManager.h"
-
 #include "SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index c3b711ea8d..a981dc4465 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -35,11 +35,9 @@
 #include "FilterLibraryToolboxWidget.h"
 
 #include <QtCore/QFileInfo>
-
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/DocRequestManager.h"
-
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Common/Constants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index 26355e648c..e8fd268d74 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -36,11 +36,9 @@
 #include "ImportASCIIDataWizard.h"
 
 #include <QtCore/QFile>
-
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
-
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
index 0ea11e91e4..dbf445e11e 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
@@ -29,8 +29,6 @@
  *
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
 #include "H5Support/H5Utilities.h"
 
 #include "ImportHDF5TreeModel.h"
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index eadc128432..29062307d5 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -61,7 +61,6 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/Common/DocRequestManager.h"
-
 #include "SIMPLib/CoreFilters/Breakpoint.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
index 87b4ec295b..ddfe677f24 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
@@ -8,7 +8,6 @@
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
-
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>

From c00cc3e0f649f2072f9a5cac30e3a522e1437bf0 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 7 May 2020 15:42:28 -0400
Subject: [PATCH 218/397] Fixed test command not running with Anaconda

* Moved Anaconda Windows test command to batch file

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/CreatePybind11Module.cmake  | 13 +++++++++++--
 Wrapping/Python/Binding/anaconda_test.bat           |  5 +++++
 .../Binding/{anaconda_setup.sh => anaconda_test.sh} |  2 ++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 Wrapping/Python/Binding/anaconda_test.bat
 rename Wrapping/Python/Binding/{anaconda_setup.sh => anaconda_test.sh} (78%)

diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index f1f9dc5324..fdebffcc4a 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -7,11 +7,19 @@ function(AddPythonTest)
   if(SIMPL_USE_ANACONDA_PYTHON)
     if(WIN32)
       add_test(NAME ${ARGS_NAME}
-        COMMAND ${SIMPL_CONDA_EXECUTABLE} "activate" ${ANACONDA_ENVIRONMENT_NAME} "&&" "python" ${ARGS_FILE}
+        COMMAND ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/anaconda_test.bat
+      )
+
+      set_property(TEST ${ARGS_NAME}
+        PROPERTY
+          ENVIRONMENT
+            "SIMPL_CONDA_EXECUTABLE=${SIMPL_CONDA_EXECUTABLE}"
+            "SIMPL_CONDA_ENV=${ANACONDA_ENVIRONMENT_NAME}"
+            "PYTHON_TEST_FILE=${ARGS_FILE}"
       )
     else()
       add_test(NAME ${ARGS_NAME}
-        COMMAND ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/anaconda_setup.sh "&&" "python" ${ARGS_FILE}
+        COMMAND ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/anaconda_test.sh
       )
 
       set_property(TEST ${ARGS_NAME}
@@ -19,6 +27,7 @@ function(AddPythonTest)
           ENVIRONMENT
             "SIMPL_ANACONDA_DIR=${ANACONDA_DIR}"
             "SIMPL_CONDA_ENV=${ANACONDA_ENVIRONMENT_NAME}"
+            "PYTHON_TEST_FILE=${ARGS_FILE}"
       )
     endif()
   else()
diff --git a/Wrapping/Python/Binding/anaconda_test.bat b/Wrapping/Python/Binding/anaconda_test.bat
new file mode 100644
index 0000000000..c7cc92572e
--- /dev/null
+++ b/Wrapping/Python/Binding/anaconda_test.bat
@@ -0,0 +1,5 @@
+@echo off
+
+CALL "%SIMPL_CONDA_EXECUTABLE%" activate "%SIMPL_CONDA_ENV%"
+
+python "%PYTHON_TEST_FILE%"
diff --git a/Wrapping/Python/Binding/anaconda_setup.sh b/Wrapping/Python/Binding/anaconda_test.sh
similarity index 78%
rename from Wrapping/Python/Binding/anaconda_setup.sh
rename to Wrapping/Python/Binding/anaconda_test.sh
index d809708bff..67acc7a18d 100755
--- a/Wrapping/Python/Binding/anaconda_setup.sh
+++ b/Wrapping/Python/Binding/anaconda_test.sh
@@ -3,3 +3,5 @@
 source "$SIMPL_ANACONDA_DIR"/etc/profile.d/conda.sh
 
 conda activate "$SIMPL_CONDA_ENV"
+
+python "$PYTHON_TEST_FILE"

From 8df59f98d065e8150bc2a607869c666ccad2cc2f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 8 May 2020 17:04:15 -0400
Subject: [PATCH 219/397] Fix compiler warnings about redefined macros

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Math/SIMPLibMath.h          | 15 +++++++++------
 ThirdParty/QtWebApp/logging/logmessage.cpp |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index 919462639f..66d7259895 100755
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -59,9 +59,9 @@
      Microsoft doesn't define M_2PI ever, other compilers may lack some of these
      too, hence the sequence as it is: load math.h, then see what's lacking still.
   */
-//  #ifndef _USE_MATH_DEFINES
-//   #define _USE_MATH_DEFINES 1
-//  #endif
+  #ifndef _USE_MATH_DEFINES
+   #define _USE_MATH_DEFINES 1
+  #endif
 
 /*
 "It's a known, long-standing bug in the compiler system's headers.  For
@@ -76,10 +76,8 @@ standard C++ library."
 
 #endif
 
-#include <cmath>
-
 #include <cstddef>
-
+#include <cmath>
 #include <vector>
 #include <limits>
 
@@ -141,6 +139,11 @@ standard C++ library."
 #define M_2PI           6.283185307179586232    /* 2*pi  */
 #endif
 
+// This next bit is for MSVC compilers. We need to tell it that we already defined some math constants
+#ifndef _MATH_DEFINES_DEFINED
+#define _MATH_DEFINES_DEFINED
+#endif
+
 namespace SIMPLib
 {
   namespace Constants
diff --git a/ThirdParty/QtWebApp/logging/logmessage.cpp b/ThirdParty/QtWebApp/logging/logmessage.cpp
index 1575ae097c..732f153f62 100644
--- a/ThirdParty/QtWebApp/logging/logmessage.cpp
+++ b/ThirdParty/QtWebApp/logging/logmessage.cpp
@@ -66,7 +66,7 @@ QString LogMessage::toString(const QString& msgFormat, const QString& timestampF
   decorated.replace("{line}", QString::number(line));
 
   QString threadId;
-  threadId.setNum((unsigned long)QThread::currentThreadId());
+  threadId.setNum((unsigned long long)QThread::currentThreadId());
   decorated.replace("{thread}", threadId);
 
   // Fill in variables

From 3e1c3f13af7e2bb2cde4e6d1bb7e4b221db4ef82 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 11 May 2020 13:57:35 -0400
Subject: [PATCH 220/397] Print out all the Python Testing environment
 variables for debugging

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Binding/anaconda_test.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Wrapping/Python/Binding/anaconda_test.sh b/Wrapping/Python/Binding/anaconda_test.sh
index 67acc7a18d..dc6fb9eb9f 100755
--- a/Wrapping/Python/Binding/anaconda_test.sh
+++ b/Wrapping/Python/Binding/anaconda_test.sh
@@ -1,7 +1,17 @@
 #!/bin/bash
 
+echo "SIMPL_ANACONDA_DIR: $SIMPL_ANACONDA_DIR"
+echo "SIMPL_CONDA_ENV: $SIMPL_CONDA_ENV"
+echo "PYTHON_TEST_FILE: $PYTHON_TEST_FILE"
+echo "PYTHONPATH: $PYTHONPATH"
+
 source "$SIMPL_ANACONDA_DIR"/etc/profile.d/conda.sh
 
 conda activate "$SIMPL_CONDA_ENV"
 
+echo "PATH: $PATH"
+echo "Where is Python: " `which python`
+echo "Where is Conda: " `which conda`
+echo "Python Version: " `python --version`
+
 python "$PYTHON_TEST_FILE"

From 51dbe6005ae0814d4b5fe8dc9a2fbf173b689297 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 8 May 2020 17:50:08 -0400
Subject: [PATCH 221/397] Formatted all source files with clang-format

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Resources/UnitTestSupport.hpp                 |   13 +-
 .../FilterCallback/FilterParameter.cpp        |   80 +-
 .../FilterCallback/FilterParameter.h          |  529 ++-
 .../FilterParameterCallbackExample.cpp        |   13 +-
 .../FilterCallback/FilterWidget.cpp           |    3 +-
 .../FilterCallback/FilterWidget.h             |   17 +-
 .../Experimental/FilterCallback/IFilter.cpp   |   35 +-
 Source/Experimental/FilterCallback/IFilter.h  |  178 +-
 Source/MakeFilterUuid/MakeFilterUuid.cpp      |    2 +-
 Source/PipelineRunner/PipelineRunner.cpp      |   66 +-
 Source/RESTClient/RESTClientDLLExport.h       |  125 +-
 Source/SIMPLib/Common/AppVersion.cpp          |   75 +-
 Source/SIMPLib/Common/AppVersion.h            |  110 +-
 Source/SIMPLib/Common/Constants.h             | 1698 ++++----
 .../Common/CreatedArrayHelpIndexEntry.cpp     |   66 +-
 .../Common/CreatedArrayHelpIndexEntry.h       |  333 +-
 Source/SIMPLib/Common/DocRequestManager.h     |   39 +-
 Source/SIMPLib/Common/EnsembleInfo.cpp        |   66 +-
 Source/SIMPLib/Common/EnsembleInfo.h          |   68 +-
 Source/SIMPLib/Common/INamedCollection.cpp    |    2 -
 Source/SIMPLib/Common/INamedCollection.h      |  137 +-
 Source/SIMPLib/Common/INamedObject.cpp        |    2 -
 Source/SIMPLib/Common/INamedObject.h          |   14 +-
 Source/SIMPLib/Common/IObserver.cpp           |   66 +-
 Source/SIMPLib/Common/IObserver.h             |  105 +-
 Source/SIMPLib/Common/Observable.cpp          |   72 +-
 Source/SIMPLib/Common/Observable.h            |  158 +-
 Source/SIMPLib/Common/Observer.cpp            |   66 +-
 Source/SIMPLib/Common/Observer.h              |  110 +-
 Source/SIMPLib/Common/PhaseType.cpp           |   70 +-
 Source/SIMPLib/Common/PhaseType.h             |   74 +-
 Source/SIMPLib/Common/SIMPLArray.hpp          |    5 +-
 Source/SIMPLib/Common/SIMPLPythonMacros.h     |    6 +-
 Source/SIMPLib/Common/SIMPLRange3D.h          |    2 +-
 Source/SIMPLib/Common/SIMPLibDLLExport.h      |  100 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  474 +--
 Source/SIMPLib/Common/ScopedFileMonitor.hpp   |   90 +-
 Source/SIMPLib/Common/ShapeType.cpp           |   74 +-
 Source/SIMPLib/Common/ShapeType.h             |   75 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |    7 +-
 .../Common/Testing/Cxx/SIMPLArrayTest.cpp     |    2 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |    5 +-
 .../CoreFilters/ApplyImageTransforms.h        |  292 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   88 +-
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |  597 ++-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   67 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h       |   70 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |   78 +-
 .../CoreFilters/CombineAttributeArrays.h      |   70 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |   88 +-
 .../CoreFilters/CombineAttributeMatrices.h    |  493 ++-
 .../CoreFilters/ConditionalSetValue.cpp       |   67 +-
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |  384 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  179 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |    3 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   69 +-
 Source/SIMPLib/CoreFilters/ConvertData.h      |  374 +-
 .../CopyFeatureArrayToElementArray.cpp        |   86 +-
 .../CopyFeatureArrayToElementArray.h          |  384 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |   17 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       |    4 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   71 +-
 .../CoreFilters/CreateAttributeMatrix.h       |  374 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   81 +-
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |  513 ++-
 .../CoreFilters/CreateDataContainer.cpp       |   71 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |  318 +-
 .../CreateFeatureArrayFromElementArray.cpp    |   89 +-
 .../CreateFeatureArrayFromElementArray.h      |  412 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |   27 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |    3 +-
 .../SIMPLib/CoreFilters/CreateGridMontage.h   |   10 +-
 .../CoreFilters/CreateImageGeometry.cpp       |   71 +-
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |  420 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   88 +-
 .../SIMPLib/CoreFilters/CreateStringArray.h   |  378 +-
 .../CoreFilters/CropVertexGeometry.cpp        |    8 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |    4 +-
 .../CoreFilters/DataContainerReader.cpp       |   67 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |  571 ++-
 .../CoreFilters/DataContainerWriter.cpp       |   73 +-
 .../SIMPLib/CoreFilters/DataContainerWriter.h |  516 ++-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   66 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |  330 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   67 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |   70 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |   20 +-
 .../ExtractAttributeArraysFromGeometry.h      |    3 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   77 +-
 .../CoreFilters/ExtractComponentAsArray.h     |  380 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |    7 +-
 .../CoreFilters/ExtractVertexGeometry.h       |    3 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   74 +-
 .../CoreFilters/FeatureCountDecision.h        |  336 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   75 +-
 .../CoreFilters/FeatureDataCSVWriter.h        |  472 ++-
 Source/SIMPLib/CoreFilters/FileReader.cpp     |   66 +-
 Source/SIMPLib/CoreFilters/FileReader.h       |  186 +-
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |   66 +-
 Source/SIMPLib/CoreFilters/FileWriter.h       |  197 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  174 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |   86 +-
 .../CoreFilters/GenerateColorTable.cpp        |   82 +-
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |    4 +-
 .../CoreFilters/GenerateTiltSeries.cpp        |    1 -
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h  |    1 -
 .../CoreFilters/ImportAsciDataArray.cpp       |  162 +-
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |  585 ++-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |    2 -
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.h   |    3 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |   81 +-
 Source/SIMPLib/CoreFilters/InitializeData.h   |  112 +-
 .../LinkFeatureMapToElementArray.cpp          |   77 +-
 .../LinkFeatureMapToElementArray.h            |  394 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   76 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |  336 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |   72 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |   71 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |   74 +-
 Source/SIMPLib/CoreFilters/MoveData.h         |  431 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |   80 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |  431 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   70 +-
 .../CoreFilters/MultiThresholdObjects.h       |  352 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |  182 +-
 .../CoreFilters/MultiThresholdObjects2.h      |  438 +-
 .../CoreFilters/PipelineAnnotation.cpp        |   63 +-
 .../SIMPLib/CoreFilters/PipelineAnnotation.h  |   72 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |    2 -
 Source/SIMPLib/CoreFilters/PostSlackMessage.h |   28 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   19 +-
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |  466 ++-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |   14 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |   79 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |   70 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |  360 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   80 +-
 .../CoreFilters/RemoveComponentFromArray.h    |  438 +-
 .../CoreFilters/RenameAttributeArray.cpp      |   82 +-
 .../CoreFilters/RenameAttributeArray.h        |  361 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |   68 +-
 .../CoreFilters/RenameAttributeMatrix.h       |  361 +-
 .../CoreFilters/RenameDataContainer.cpp       |   68 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |  351 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |   76 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |  378 +-
 .../CoreFilters/RequiredZThickness.cpp        |   68 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |  356 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |   12 +-
 .../CoreFilters/RotateSampleRefFrame.h        |    1 -
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |   68 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |  440 +--
 .../SetOriginResolutionImageGeom.cpp          |   68 +-
 .../SetOriginResolutionImageGeom.h            |  440 +--
 .../CoreFilters/SplitAttributeArray.cpp       |    8 +-
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |    3 +-
 .../Testing/Cxx/ApplyImageTransformsTest.cpp  |   33 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |  114 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   72 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |   66 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   66 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |    1 -
 .../Testing/Cxx/ConvertDataTest.cpp           |    6 +-
 .../CopyFeatureArrayToElementArrayTest.cpp    |   42 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |    7 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |   66 +-
 .../Testing/Cxx/CreateDataContainerTest.cpp   |   70 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |   66 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |    5 +-
 .../Testing/Cxx/CreateImageGeometryTest.cpp   |   66 +-
 .../Testing/Cxx/CreateStringArrayTest.cpp     |    1 -
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |    3 +-
 .../Testing/Cxx/DataContainerTest.cpp         |   71 +-
 .../Testing/Cxx/ErrorMessageTest.cpp          |   66 +-
 .../Testing/Cxx/ExecuteProcessTest.cpp        |   72 +-
 ...ExtractAttributeArraysFromGeometryTest.cpp |    6 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |   66 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |    6 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   66 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   66 +-
 .../Testing/Cxx/ImportAsciDataArrayTest.cpp   |    5 +-
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     |   22 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |    3 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   15 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   75 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   70 +-
 .../Testing/Cxx/PipelinePauseTest.cpp         |   66 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |  107 +-
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |   72 +-
 .../Testing/Cxx/RemoveArraysObserver.h        |    5 +-
 .../Testing/Cxx/RemoveArraysTest.cpp          |   66 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |   69 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |   66 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |   66 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |   72 +-
 .../Testing/Cxx/RenameTimingTest.cpp          |   75 +-
 .../Testing/Cxx/ReplaceValueTest.cpp          |   69 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |   66 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |   66 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   68 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |   36 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |   66 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   12 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |   88 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |  572 ++-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   78 +-
 .../CoreFilters/WriteTriangleGeometry.h       |  376 +-
 Source/SIMPLib/CoreFilters/util/ABSOperator.h |  109 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.cpp |   66 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.h   |  109 +-
 .../CoreFilters/util/ASCIIWizardData.hpp      |    5 +-
 .../SIMPLib/CoreFilters/util/ASinOperator.h   |  109 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.cpp |   66 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.h   |  109 +-
 .../CoreFilters/util/AbstractDataParser.hpp   |    9 +-
 .../CoreFilters/util/AdditionOperator.cpp     |   66 +-
 .../CoreFilters/util/AdditionOperator.h       |  109 +-
 .../CoreFilters/util/BinaryOperator.cpp       |   66 +-
 .../SIMPLib/CoreFilters/util/BinaryOperator.h |  110 +-
 .../CoreFilters/util/CalculatorArray.hpp      |  194 +-
 .../CoreFilters/util/CalculatorItem.cpp       |   66 +-
 .../SIMPLib/CoreFilters/util/CalculatorItem.h |  219 +-
 .../CoreFilters/util/CalculatorOperator.cpp   |   66 +-
 .../CoreFilters/util/CalculatorOperator.h     |  148 +-
 .../CoreFilters/util/CalculatorSeparator.cpp  |   66 +-
 .../CoreFilters/util/CalculatorSeparator.h    |   99 +-
 .../SIMPLib/CoreFilters/util/CeilOperator.h   |  109 +-
 .../CoreFilters/util/CommaSeparator.cpp       |   66 +-
 .../SIMPLib/CoreFilters/util/CommaSeparator.h |  109 +-
 .../SIMPLib/CoreFilters/util/CosOperator.cpp  |   66 +-
 Source/SIMPLib/CoreFilters/util/CosOperator.h |  109 +-
 .../CoreFilters/util/DivisionOperator.cpp     |   66 +-
 .../CoreFilters/util/DivisionOperator.h       |  109 +-
 Source/SIMPLib/CoreFilters/util/ExpOperator.h |  109 +-
 .../CoreFilters/util/FloorOperator.cpp        |   66 +-
 .../SIMPLib/CoreFilters/util/FloorOperator.h  |  109 +-
 .../CoreFilters/util/ICalculatorArray.cpp     |   66 +-
 .../CoreFilters/util/ICalculatorArray.h       |  122 +-
 .../CoreFilters/util/LeftParenthesisItem.cpp  |   66 +-
 .../CoreFilters/util/LeftParenthesisItem.h    |  123 +-
 Source/SIMPLib/CoreFilters/util/LnOperator.h  |  109 +-
 .../SIMPLib/CoreFilters/util/Log10Operator.h  |  109 +-
 .../SIMPLib/CoreFilters/util/LogOperator.cpp  |   66 +-
 Source/SIMPLib/CoreFilters/util/LogOperator.h |  111 +-
 .../util/MultiplicationOperator.cpp           |   66 +-
 .../CoreFilters/util/MultiplicationOperator.h |  109 +-
 .../CoreFilters/util/NegativeOperator.cpp     |   66 +-
 .../CoreFilters/util/NegativeOperator.h       |  111 +-
 .../CoreFilters/util/ParserFunctors.hpp       |    3 +-
 .../SIMPLib/CoreFilters/util/PowOperator.cpp  |   66 +-
 Source/SIMPLib/CoreFilters/util/PowOperator.h |  109 +-
 .../CoreFilters/util/RightParenthesisItem.cpp |   66 +-
 .../CoreFilters/util/RightParenthesisItem.h   |  123 +-
 .../SIMPLib/CoreFilters/util/RootOperator.cpp |   66 +-
 .../SIMPLib/CoreFilters/util/RootOperator.h   |  109 +-
 .../SIMPLib/CoreFilters/util/SinOperator.cpp  |   66 +-
 Source/SIMPLib/CoreFilters/util/SinOperator.h |  109 +-
 .../SIMPLib/CoreFilters/util/SqrtOperator.h   |  109 +-
 .../CoreFilters/util/SubtractionOperator.cpp  |   66 +-
 .../CoreFilters/util/SubtractionOperator.h    |  109 +-
 .../SIMPLib/CoreFilters/util/TanOperator.cpp  |   66 +-
 Source/SIMPLib/CoreFilters/util/TanOperator.h |  109 +-
 .../CoreFilters/util/UnaryOperator.cpp        |   66 +-
 .../SIMPLib/CoreFilters/util/UnaryOperator.h  |  120 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       |    3 +-
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |   67 +-
 Source/SIMPLib/DataArrays/IDataArray.cpp      |    3 +-
 Source/SIMPLib/DataArrays/IDataArray.h        |  457 ++-
 .../SIMPLib/DataArrays/IDataArrayFilter.cpp   |   66 +-
 Source/SIMPLib/DataArrays/IDataArrayFilter.h  |   71 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    | 1935 ++++-----
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |   17 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |   68 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |    1 -
 Source/SIMPLib/DataArrays/StructArray.hpp     | 1383 +++----
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |   38 +-
 .../Testing/Cxx/StringDataArrayTest.cpp       |   68 +-
 .../Testing/Cxx/StructArrayTest.cpp           |   69 +-
 .../DataContainers/AttributeMatrix.cpp        |  114 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  904 ++---
 .../DataContainers/AttributeMatrixProxy.cpp   |   48 +-
 .../DataContainers/AttributeMatrixProxy.h     |   66 +-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  |   70 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h |  808 ++--
 .../SIMPLib/DataContainers/DataContainer.cpp  |  102 +-
 Source/SIMPLib/DataContainers/DataContainer.h |   14 +-
 .../DataContainers/DataContainerArray.cpp     |    7 +-
 .../DataContainers/DataContainerArray.h       |  757 ++--
 .../DataContainerArrayProxy.cpp               |    2 +-
 .../DataContainers/DataContainerArrayProxy.h  |   66 +-
 .../DataContainers/DataContainerBundle.cpp    |   66 +-
 .../DataContainers/DataContainerBundle.h      |  381 +-
 .../DataContainers/DataContainerProxy.cpp     |  151 +-
 .../DataContainers/DataContainerProxy.h       |   66 +-
 Source/SIMPLib/DataContainers/DsnIterators.h  |   47 +-
 .../DataContainers/IDataContainerBundle.cpp   |   66 +-
 .../DataContainers/IDataContainerBundle.h     |  142 +-
 .../IDataStructureContainerNode.hpp           |    7 +-
 .../SIMPLib/DataContainers/RenameDataPath.cpp |    5 +-
 .../SIMPLib/DataContainers/RenameDataPath.h   |  123 +-
 .../Testing/Cxx/DataContainerBundleTest.cpp   |   66 +-
 .../AbstractFilterParametersReader.cpp        |   66 +-
 .../AbstractFilterParametersReader.h          |  223 +-
 .../AbstractFilterParametersWriter.cpp        |   66 +-
 .../AbstractFilterParametersWriter.h          |  196 +-
 ...AttributeMatrixCreationFilterParameter.cpp |   68 +-
 .../AttributeMatrixCreationFilterParameter.h  |  349 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   68 +-
 .../AttributeMatrixSelectionFilterParameter.h |  422 +-
 .../AxisAngleFilterParameter.cpp              |   68 +-
 .../AxisAngleFilterParameter.h                |  283 +-
 .../BooleanFilterParameter.cpp                |   68 +-
 .../FilterParameters/BooleanFilterParameter.h |   85 +-
 .../CalculatorFilterParameter.cpp             |   66 +-
 .../CalculatorFilterParameter.h               |  189 +-
 .../ChoiceFilterParameter.cpp                 |   69 +-
 .../FilterParameters/ChoiceFilterParameter.h  |  340 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   78 +-
 ...mparisonSelectionAdvancedFilterParameter.h |  388 +-
 .../ComparisonSelectionFilterParameter.cpp    |   72 +-
 .../ComparisonSelectionFilterParameter.h      |  388 +-
 .../ConstrainedDoubleFilterParameter.cpp      |   76 +-
 .../ConstrainedDoubleFilterParameter.h        |  282 +-
 .../ConstrainedFilterParameter.cpp            |   66 +-
 .../ConstrainedFilterParameter.h              |  175 +-
 .../ConstrainedIntFilterParameter.cpp         |   77 +-
 .../ConstrainedIntFilterParameter.h           |  281 +-
 .../DataArrayCreationFilterParameter.cpp      |   68 +-
 .../DataArrayCreationFilterParameter.h        |  414 +-
 .../DataArraySelectionFilterParameter.cpp     |   75 +-
 .../DataArraySelectionFilterParameter.h       |  521 ++-
 ...DataContainerArrayProxyFilterParameter.cpp |   68 +-
 .../DataContainerArrayProxyFilterParameter.h  |  348 +-
 .../DataContainerCreationFilterParameter.cpp  |   66 +-
 .../DataContainerCreationFilterParameter.h    |  193 +-
 ...aContainerGridSelectionFilterParameter.cpp |    4 +-
 .../DataContainerReaderFilterParameter.cpp    |   66 +-
 .../DataContainerReaderFilterParameter.h      |  315 +-
 .../DataContainerSelectionFilterParameter.cpp |   70 +-
 .../DataContainerSelectionFilterParameter.h   |  354 +-
 .../DoubleFilterParameter.cpp                 |   76 +-
 .../FilterParameters/DoubleFilterParameter.h  |  320 +-
 .../DynamicChoiceFilterParameter.cpp          |   66 +-
 .../DynamicChoiceFilterParameter.h            |  337 +-
 .../FilterParameters/DynamicTableData.cpp     |  174 +-
 .../FilterParameters/DynamicTableData.h       |  428 +-
 .../DynamicTableFilterParameter.cpp           |   71 +-
 .../DynamicTableFilterParameter.h             |  365 +-
 .../FileListInfoFilterParameter.cpp           |   68 +-
 .../FileListInfoFilterParameter.h             |    5 +-
 .../FilterParameters/FilterParameter.cpp      |   66 +-
 .../FilterParameters/FilterParameter.h        |  430 +-
 .../FilterParameters/FloatFilterParameter.cpp |   65 +-
 .../FilterParameters/FloatFilterParameter.h   |  282 +-
 .../FloatVec2FilterParameter.cpp              |   64 +-
 .../FloatVec2FilterParameter.h                |  174 +-
 .../FloatVec3FilterParameter.cpp              |   68 +-
 .../FloatVec3FilterParameter.h                |  174 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |   71 +-
 .../FourthOrderPolynomialFilterParameter.h    |  239 +-
 .../GenerateColorTableFilterParameter.cpp     |   68 +-
 .../GenerateColorTableFilterParameter.h       |  225 +-
 .../H5FilterParametersConstants.h             |   90 +-
 .../H5FilterParametersReader.cpp              |  147 +-
 .../H5FilterParametersReader.h                |  338 +-
 .../H5FilterParametersWriter.cpp              |   74 +-
 .../H5FilterParametersWriter.h                |  314 +-
 .../ImportHDF5DatasetFilterParameter.h        |    4 +-
 .../InputFileFilterParameter.cpp              |   70 +-
 .../InputFileFilterParameter.h                |   77 +-
 .../InputPathFilterParameter.cpp              |   70 +-
 .../InputPathFilterParameter.h                |   77 +-
 .../FilterParameters/IntFilterParameter.cpp   |   66 +-
 .../FilterParameters/IntFilterParameter.h     |  281 +-
 .../IntVec3FilterParameter.cpp                |   68 +-
 .../FilterParameters/IntVec3FilterParameter.h |  174 +-
 .../JsonFilterParametersReader.h              |  376 +-
 .../JsonFilterParametersWriter.cpp            |   70 +-
 .../JsonFilterParametersWriter.h              |  368 +-
 .../LinkedBooleanFilterParameter.cpp          |   71 +-
 .../LinkedBooleanFilterParameter.h            |  315 +-
 .../LinkedChoicesFilterParameter.cpp          |   70 +-
 .../LinkedChoicesFilterParameter.h            |  242 +-
 ...dDataContainerSelectionFilterParameter.cpp |   66 +-
 ...kedDataContainerSelectionFilterParameter.h |  357 +-
 .../LinkedPathCreationFilterParameter.cpp     |    3 +-
 .../LinkedPathCreationFilterParameter.h       |    4 +-
 .../MontageSelectionFilterParameter.cpp       |    1 -
 ...ntageStructureSelectionFilterParameter.cpp |    5 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   81 +-
 ...iAttributeMatrixSelectionFilterParameter.h |  436 +-
 ...MultiDataArraySelectionFilterParameter.cpp |   72 +-
 .../MultiDataArraySelectionFilterParameter.h  |  436 +-
 ...iDataContainerSelectionFilterParameter.cpp |  141 +-
 ...ltiDataContainerSelectionFilterParameter.h |  434 +-
 .../NumericTypeFilterParameter.cpp            |   69 +-
 .../NumericTypeFilterParameter.h              |  125 +-
 .../OutputFileFilterParameter.cpp             |   70 +-
 .../OutputFileFilterParameter.h               |  337 +-
 .../OutputPathFilterParameter.cpp             |   70 +-
 .../OutputPathFilterParameter.h               |   77 +-
 .../ParagraphFilterParameter.cpp              |   62 +-
 .../ParagraphFilterParameter.h                |   95 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |   66 +-
 .../PhaseTypeSelectionFilterParameter.h       |  129 +-
 .../PreflightUpdatedValueFilterParameter.cpp  |   66 +-
 .../PreflightUpdatedValueFilterParameter.h    |  255 +-
 .../FilterParameters/RangeFilterParameter.cpp |   68 +-
 .../ReadASCIIDataFilterParameter.cpp          |   66 +-
 .../ReadASCIIDataFilterParameter.h            |   67 +-
 .../ScalarTypeFilterParameter.cpp             |   69 +-
 .../ScalarTypeFilterParameter.h               |  125 +-
 .../SecondOrderPolynomialFilterParameter.cpp  |   71 +-
 .../SecondOrderPolynomialFilterParameter.h    |  197 +-
 .../SeparatorFilterParameter.cpp              |   66 +-
 .../SeparatorFilterParameter.h                |  153 +-
 .../ShapeTypeSelectionFilterParameter.cpp     |   70 +-
 .../ShapeTypeSelectionFilterParameter.h       |  147 +-
 .../StringFilterParameter.cpp                 |   69 +-
 .../FilterParameters/StringFilterParameter.h  |  280 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp    |   67 +-
 .../ThirdOrderPolynomialFilterParameter.cpp   |   71 +-
 .../ThirdOrderPolynomialFilterParameter.h     |  183 +-
 .../UInt64FilterParameter.cpp                 |   65 +-
 .../FilterParameters/UInt64FilterParameter.h  |  215 +-
 .../UnknownFilterParameter.cpp                |   66 +-
 .../FilterParameters/UnknownFilterParameter.h |   94 +-
 .../SIMPLib/Filtering/AbstractComparison.cpp  |   66 +-
 Source/SIMPLib/Filtering/AbstractComparison.h |   73 +-
 .../Filtering/AbstractDecisionFilter.cpp      |   67 +-
 .../Filtering/AbstractDecisionFilter.h        |   80 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |  137 +-
 Source/SIMPLib/Filtering/ComparisonInputs.cpp |   66 +-
 Source/SIMPLib/Filtering/ComparisonInputs.h   |   69 +-
 .../Filtering/ComparisonInputsAdvanced.cpp    |   66 +-
 .../Filtering/ComparisonInputsAdvanced.h      |   85 +-
 Source/SIMPLib/Filtering/ComparisonSet.cpp    |   66 +-
 Source/SIMPLib/Filtering/ComparisonSet.h      |  143 +-
 Source/SIMPLib/Filtering/ComparisonValue.cpp  |   66 +-
 Source/SIMPLib/Filtering/ComparisonValue.h    |  138 +-
 Source/SIMPLib/Filtering/CoreConstants.h      |   22 +-
 Source/SIMPLib/Filtering/CorePlugin.h         |  276 +-
 Source/SIMPLib/Filtering/FilterFactory.hpp    |   69 +-
 Source/SIMPLib/Filtering/FilterManager.cpp    |   73 +-
 Source/SIMPLib/Filtering/FilterManager.h      |   79 +-
 Source/SIMPLib/Filtering/IFilterFactory.hpp   |   85 +-
 .../Filtering/QMetaObjectUtilities.cpp        |   66 +-
 .../SIMPLib/Filtering/QMetaObjectUtilities.h  |   72 +-
 .../Testing/Cxx/FilterPipelineTest.cpp        |   66 +-
 .../Filtering/ThresholdFilterHelper.cpp       |   66 +-
 .../SIMPLib/Filtering/ThresholdFilterHelper.h |   85 +-
 .../Geometry/CompositeTransformContainer.cpp  |   62 +-
 .../Geometry/CompositeTransformContainer.h    |   62 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.cpp |   71 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.h   |  154 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   71 +-
 Source/SIMPLib/Geometry/EdgeGeom.h            |    3 -
 Source/SIMPLib/Geometry/GeometryHelpers.h     |  298 +-
 Source/SIMPLib/Geometry/HexahedralGeom.cpp    |    6 +-
 Source/SIMPLib/Geometry/HexahedralGeom.h      | 1127 +++---
 Source/SIMPLib/Geometry/IGeometry2D.cpp       |   66 +-
 Source/SIMPLib/Geometry/IGeometry2D.h         |   66 +-
 Source/SIMPLib/Geometry/IGeometry3D.cpp       |   66 +-
 Source/SIMPLib/Geometry/IGeometry3D.h         |  485 ++-
 Source/SIMPLib/Geometry/IGeometryGrid.cpp     |   66 +-
 Source/SIMPLib/Geometry/IGeometryGrid.h       |    9 +-
 .../SIMPLib/Geometry/ITransformContainer.cpp  |   62 +-
 Source/SIMPLib/Geometry/ITransformContainer.h |   67 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |  111 +-
 Source/SIMPLib/Geometry/ImageGeom.h           |    3 -
 Source/SIMPLib/Geometry/MeshStructs.h         |  207 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   73 +-
 Source/SIMPLib/Geometry/QuadGeom.h            |    3 -
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   86 +-
 Source/SIMPLib/Geometry/RectGridGeom.h        |  598 ++-
 .../Geometry/ShapeOps/CubeOctohedronOps.cpp   |   66 +-
 .../Geometry/ShapeOps/CubeOctohedronOps.h     |  148 +-
 .../Geometry/ShapeOps/CylinderAOps.cpp        |   66 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderAOps.h  |  128 +-
 .../Geometry/ShapeOps/CylinderBOps.cpp        |   66 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderBOps.h  |  128 +-
 .../Geometry/ShapeOps/CylinderCOps.cpp        |   66 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderCOps.h  |  128 +-
 .../Geometry/ShapeOps/EllipsoidOps.cpp        |   66 +-
 .../SIMPLib/Geometry/ShapeOps/EllipsoidOps.h  |  123 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp |   66 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h   |  191 +-
 .../Geometry/ShapeOps/SuperEllipsoidOps.cpp   |   66 +-
 .../Geometry/ShapeOps/SuperEllipsoidOps.h     |  128 +-
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     |   66 +-
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     |   66 +-
 Source/SIMPLib/Geometry/SharedTetOps.cpp      |   66 +-
 Source/SIMPLib/Geometry/SharedTriOps.cpp      |   66 +-
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |   66 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   70 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h     | 1186 +++---
 Source/SIMPLib/Geometry/TransformContainer.h  |   65 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   70 +-
 Source/SIMPLib/Geometry/TriangleGeom.h        |    3 -
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   68 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |   69 +-
 .../HDF5/H5BoundaryStatsDataDelegate.cpp      |   66 +-
 .../HDF5/H5BoundaryStatsDataDelegate.h        |  138 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |   68 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.h       |  167 +-
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |  409 +-
 Source/SIMPLib/HDF5/H5Macros.h                |   95 +-
 .../HDF5/H5MatrixStatsDataDelegate.cpp        |   66 +-
 .../SIMPLib/HDF5/H5MatrixStatsDataDelegate.h  |  145 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp   |   66 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.h     |  186 +-
 .../HDF5/H5PrimaryStatsDataDelegate.cpp       |   66 +-
 .../SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h |  173 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp   |   66 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.h     |  143 +-
 .../H5TransformationStatsDataDelegate.cpp     |   66 +-
 .../HDF5/H5TransformationStatsDataDelegate.h  |  175 +-
 Source/SIMPLib/HDF5/VTKH5Constants.h          |  181 +-
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   |  113 +-
 Source/SIMPLib/ITK/SimpleITKEnums.h           |    1 -
 ...am3DITransformContainerToTransformTest.cpp |   62 +-
 .../itkDream3DTransformContainerTestHelper.h  |   68 +-
 ...eam3DTransformContainerToTransformTest.cpp |   62 +-
 ...nsformToDream3DITransformContainerTest.cpp |   62 +-
 ...ansformToDream3DTransformContainerTest.cpp |   62 +-
 Source/SIMPLib/ITK/itkBridge.h                |   14 +-
 .../ITK/itkDream3DFilterInterruption.h        |    1 -
 ...itkDream3DITransformContainerToTransform.h |   64 +-
 .../itkDream3DTransformContainerToTransform.h |   67 +-
 .../ITK/itkFijiConfigurationFileReader.hpp    |  162 +-
 .../SIMPLib/ITK/itkGetComponentsDimensions.h  |   31 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp   |   17 +-
 Source/SIMPLib/ITK/itkImageReaderHelper.h     |    2 +-
 .../ITK/itkImportDream3DImageContainer.h      |    4 +-
 .../ITK/itkInPlaceDream3DDataToImageFilter.h  |    3 +-
 .../ITK/itkInPlaceImageToDream3DDataFilter.h  |    2 -
 Source/SIMPLib/ITK/itkReadImageImpl.hpp       |   13 +-
 Source/SIMPLib/ITK/itkTemplateUtilities.h     |    1 -
 ...itkTransformToDream3DITransformContainer.h |   71 +-
 .../itkTransformToDream3DTransformContainer.h |   69 +-
 Source/SIMPLib/Math/ArrayHelpers.hpp          |  205 +-
 Source/SIMPLib/Math/GeometryMath.cpp          |  158 +-
 Source/SIMPLib/Math/GeometryMath.h            |  726 ++--
 Source/SIMPLib/Math/MatrixMath.cpp            |   66 +-
 .../Math/RadialDistributionFunction.cpp       |   68 +-
 .../SIMPLib/Math/RadialDistributionFunction.h |  109 +-
 Source/SIMPLib/Math/RdfData.cpp               |   66 +-
 Source/SIMPLib/Math/RdfData.h                 |  338 +-
 Source/SIMPLib/Math/SIMPLibMath.cpp           |   66 +-
 Source/SIMPLib/Math/SIMPLibMath.h             |  340 +-
 Source/SIMPLib/Math/SIMPLibRandom.cpp         |   66 +-
 Source/SIMPLib/Math/SIMPLibRandom.h           |   85 +-
 .../Math/Testing/Cxx/MatrixMathTest.cpp       |    3 +-
 .../Math/Testing/Cxx/QuaternionMathTest.cpp   |   66 +-
 .../Messages/AbstractMessageHandler.cpp       |    2 +-
 .../SIMPLib/Messages/AbstractMessageHandler.h |   32 +-
 .../Messages/AbstractProgressMessage.cpp      |    2 +-
 .../SIMPLib/Messages/FilterErrorMessage.cpp   |    2 +-
 Source/SIMPLib/Messages/FilterErrorMessage.h  |    2 -
 .../Messages/FilterProgressMessage.cpp        |    2 +-
 .../SIMPLib/Messages/FilterProgressMessage.h  |    2 -
 .../SIMPLib/Messages/FilterStatusMessage.cpp  |    2 +-
 Source/SIMPLib/Messages/FilterStatusMessage.h |    2 -
 .../SIMPLib/Messages/FilterWarningMessage.cpp |    2 +-
 .../SIMPLib/Messages/FilterWarningMessage.h   |    2 -
 .../SIMPLib/Messages/GenericErrorMessage.cpp  |    2 +-
 Source/SIMPLib/Messages/GenericErrorMessage.h |    2 -
 .../Messages/GenericProgressMessage.cpp       |    2 +-
 .../SIMPLib/Messages/GenericProgressMessage.h |    2 -
 .../SIMPLib/Messages/GenericStatusMessage.cpp |    2 +-
 .../SIMPLib/Messages/GenericStatusMessage.h   |    2 -
 .../Messages/GenericWarningMessage.cpp        |    2 +-
 .../SIMPLib/Messages/GenericWarningMessage.h  |    2 -
 .../SIMPLib/Messages/PipelineErrorMessage.cpp |    7 +-
 .../SIMPLib/Messages/PipelineErrorMessage.h   |    2 -
 .../Messages/PipelineProgressMessage.cpp      |    6 +-
 .../Messages/PipelineProgressMessage.h        |    2 -
 .../Messages/PipelineStatusMessage.cpp        |    6 +-
 .../SIMPLib/Messages/PipelineStatusMessage.h  |    2 -
 .../Messages/PipelineWarningMessage.cpp       |    4 +-
 .../SIMPLib/Messages/PipelineWarningMessage.h |    2 -
 Source/SIMPLib/Montages/AbstractMontage.cpp   |    2 -
 Source/SIMPLib/Montages/AbstractMontage.h     |   16 +-
 Source/SIMPLib/Montages/DataContainerGrid.cpp |    8 +-
 Source/SIMPLib/Montages/GridMontage.cpp       |    2 -
 Source/SIMPLib/Montages/GridMontage.h         |   14 +-
 Source/SIMPLib/Montages/GridTileIndex.cpp     |    2 +-
 Source/SIMPLib/Montages/MontageSupport.h      |   12 +-
 Source/SIMPLib/Plugin/ISIMPLibPlugin.h        |  358 +-
 Source/SIMPLib/Plugin/PluginManager.cpp       |   78 +-
 Source/SIMPLib/Plugin/PluginManager.h         |  219 +-
 Source/SIMPLib/Plugin/PluginProxy.cpp         |   66 +-
 Source/SIMPLib/Plugin/PluginProxy.h           |  134 +-
 Source/SIMPLib/Plugin/SIMPLPluginConstants.h  |    6 +-
 Source/SIMPLib/Plugin/SIMPLibPlugin.h         |  218 +-
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp |   70 +-
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.h   |  106 +-
 Source/SIMPLib/REST/PipelineListener.h        |    1 -
 .../REST/PipelineListenerMessageHandler.cpp   |    3 +-
 Source/SIMPLib/REST/SIMPLDirectoryListing.h   |    1 -
 Source/SIMPLib/REST/SIMPLRequestMapper.h      |    1 -
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |    9 +-
 .../V1Controllers/ApiNotFoundController.cpp   |    1 -
 .../V1Controllers/ApiNotFoundController.h     |    1 -
 .../ExecutePipelineController.cpp             |   99 +-
 .../ExecutePipelineMessageHandler.h           |   67 +-
 .../ListFilterParametersController.h          |    1 -
 .../V1Controllers/LoadedPluginsController.h   |    1 -
 .../V1Controllers/NamesOfFiltersController.h  |    1 -
 .../V1Controllers/NumFiltersController.cpp    |    1 -
 .../REST/V1Controllers/NumFiltersController.h |    1 -
 .../V1Controllers/PluginInfoController.cpp    |    1 -
 .../REST/V1Controllers/PluginInfoController.h |    1 -
 .../PreflightPipelineController.cpp           |   68 +-
 .../PreflightPipelineController.h             |    2 -
 .../PreflightPipelineMessageHandler.h         |   69 +-
 .../V1Controllers/SIMPLStaticFileController.h |    2 +-
 .../REST/V1Controllers/V1RequestMapper.cpp    |    1 -
 .../REST/V1Controllers/V1RequestMapper.h      |    1 -
 .../SIMPLib/StatsData/BoundaryStatsData.cpp   |   67 +-
 Source/SIMPLib/StatsData/BoundaryStatsData.h  |  308 +-
 Source/SIMPLib/StatsData/MatrixStatsData.cpp  |   68 +-
 Source/SIMPLib/StatsData/MatrixStatsData.h    |  243 +-
 .../StatsData/PrecipitateStatsData.cpp        |   66 +-
 .../SIMPLib/StatsData/PrecipitateStatsData.h  |  543 +--
 Source/SIMPLib/StatsData/StatsData.cpp        |   78 +-
 Source/SIMPLib/StatsData/StatsData.h          |    3 +-
 .../StatsData/TransformationStatsData.cpp     |   66 +-
 .../StatsData/TransformationStatsData.h       |  748 ++--
 .../TestFilters/ArraySelectionExample.cpp     |   62 +-
 .../TestFilters/ArraySelectionExample.h       |  111 +-
 .../TestFilters/DynamicTableExample.cpp       |   67 +-
 .../SIMPLib/TestFilters/DynamicTableExample.h |  114 +-
 .../TestFilters/ErrorWarningFilter.cpp        |   60 +-
 .../SIMPLib/TestFilters/ErrorWarningFilter.h  |   76 +-
 Source/SIMPLib/TestFilters/Filt0.h            |   35 +-
 Source/SIMPLib/TestFilters/Filt1.h            |   37 +-
 Source/SIMPLib/TestFilters/FilterGroup00.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup00.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup01.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup01.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup02.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup03.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup04.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup05.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup06.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup07.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup08.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup09.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup10.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup12.h    |   72 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp  |   60 +-
 Source/SIMPLib/TestFilters/FilterGroup13.h    |   72 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |   69 +-
 Source/SIMPLib/TestFilters/GenericExample.h   |  110 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |   72 +-
 .../SIMPLib/TestFilters/MakeDataContainer.h   |  122 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |   81 +-
 Source/SIMPLib/TestFilters/ThresholdExample.h |  106 +-
 Source/SIMPLib/Utilities/ColorTable.h         |  218 +-
 Source/SIMPLib/Utilities/ColorUtilities.cpp   |   66 +-
 Source/SIMPLib/Utilities/ColorUtilities.h     |  127 +-
 Source/SIMPLib/Utilities/FilePathGenerator.h  |    8 +-
 .../Utilities/FileSystemPathHelper.cpp        |    6 +-
 .../SIMPLib/Utilities/FileSystemPathHelper.h  |   30 +-
 Source/SIMPLib/Utilities/FloatSummation.h     |   41 +-
 .../Utilities/ParallelData2DAlgorithm.cpp     |    8 +-
 .../Utilities/ParallelData3DAlgorithm.cpp     |    8 +-
 .../Utilities/ParallelDataAlgorithm.cpp       |    8 +-
 .../SIMPLib/Utilities/ParallelDataAlgorithm.h |    4 +-
 .../Utilities/SIMPLDataPathValidator.cpp      |   22 +-
 .../Utilities/SIMPLDataPathValidator.h        |   68 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   |   16 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h  |  177 +-
 .../SIMPLH5DataReaderRequirements.cpp         |    3 +-
 .../Utilities/SIMPLH5DataReaderRequirements.h |    3 -
 Source/SIMPLib/Utilities/SIMPLibEndian.h      |  425 +-
 Source/SIMPLib/Utilities/StringOperations.h   |   76 +-
 Source/SIMPLib/Utilities/TestObserver.h       |   42 +-
 .../Testing/Cxx/FloatSummationTest.cpp        |   66 +-
 .../Testing/Cxx/StringOperationsTest.cpp      |   66 +-
 Source/SIMPLib/Utilities/TimeUtilities.h      |   86 +-
 Source/SIMPLib/Utilities/ToolTipGenerator.cpp |    8 +-
 Source/SIMPLib/Utilities/ToolTipGenerator.h   |    7 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp     |   66 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.h       |  388 +-
 Source/SIMPLib/VTKUtils/VTKUtil.hpp           |  209 +-
 Source/SIMPLib/VTKUtils/VTKWriterMacros.h     |  428 +-
 .../PipelineItemBorderSizeAnimation.cpp       |   68 +-
 .../PipelineItemBorderSizeAnimation.h         |   86 +-
 .../PipelineItemHeightAnimation.cpp           |   76 +-
 .../Animations/PipelineItemHeightAnimation.h  |   96 +-
 .../Animations/PipelineItemSlideAnimation.cpp |   82 +-
 .../Animations/PipelineItemSlideAnimation.h   |  106 +-
 .../SVWidgetsLib/Core/FilterWidgetManager.cpp |   66 +-
 .../SVWidgetsLib/Core/FilterWidgetManager.h   |  204 +-
 .../Core/IFilterWidgetFactory.cpp             |   66 +-
 .../SVWidgetsLib/Core/IFilterWidgetFactory.h  |  151 +-
 .../SVWidgetsLib/Core/SVWidgetsLibConstants.h |  153 +-
 .../SVWidgetsLib/Core/SVWidgetsLibDLLExport.h |  116 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp  |   72 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.h    |  134 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp  |   95 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.h    |   90 +-
 .../Dialogs/ColorPresetsDialog.cpp            |  109 +-
 .../SVWidgetsLib/Dialogs/ColorPresetsDialog.h |   77 +-
 .../Dialogs/ColorPresetsDialogTableModel.cpp  |   97 +-
 .../Dialogs/ColorPresetsDialogTableModel.h    |   78 +-
 .../Dialogs/FavoritesChangedDialog.cpp        |   70 +-
 .../Dialogs/FavoritesChangedDialog.h          |  112 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.cpp |   70 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.h   |  129 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp   |   67 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.h     |  151 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckData.cpp  |   66 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheckData.h |  138 +-
 .../Dialogs/UpdateCheckDialog.cpp             |   72 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckDialog.h  |  251 +-
 .../AbstractIOFileWidget.cpp                  |   84 +-
 .../AbstractIOFileWidget.h                    |  196 +-
 .../AttributeMatrixCreationWidget.cpp         |   81 +-
 .../AttributeMatrixCreationWidget.h           |  117 +-
 .../AttributeMatrixSelectionWidget.cpp        |   82 +-
 .../AttributeMatrixSelectionWidget.h          |  167 +-
 .../AxisAngleWidget.cpp                       |   67 +-
 .../FilterParameterWidgets/AxisAngleWidget.h  |  143 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |   67 +-
 .../FilterParameterWidgets/BooleanWidget.h    |  146 +-
 .../CalculatorWidget.cpp                      |   70 +-
 .../FilterParameterWidgets/CalculatorWidget.h |  212 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   67 +-
 .../FilterParameterWidgets/ChoiceWidget.h     |  155 +-
 .../ComparisonContainerWidget.cpp             |  113 +-
 .../ComparisonContainerWidget.h               |  183 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |  135 +-
 .../ComparisonSelectionAdvancedWidget.h       |  309 +-
 .../ComparisonSelectionItemDelegate.cpp       |   71 +-
 .../ComparisonSelectionItemDelegate.h         |  118 +-
 .../ComparisonSelectionTableModel.cpp         |   83 +-
 .../ComparisonSelectionTableModel.h           |  325 +-
 .../ComparisonSelectionWidget.cpp             |   86 +-
 .../ComparisonSelectionWidget.h               |  424 +-
 .../ComparisonSetWidget.cpp                   |   64 +-
 .../ComparisonSetWidget.h                     |  219 +-
 .../ComparisonValueWidget.cpp                 |   20 +-
 .../ComparisonValueWidget.h                   |  139 +-
 .../ConstrainedDoubleWidget.cpp               |   81 +-
 .../ConstrainedDoubleWidget.h                 |  144 +-
 .../ConstrainedIntWidget.cpp                  |   79 +-
 .../ConstrainedIntWidget.h                    |  142 +-
 .../FilterParameterWidgets/CustomWidget.cpp   |   67 +-
 .../FilterParameterWidgets/CustomWidget.h     |  131 +-
 .../DataArrayCreationWidget.cpp               |   81 +-
 .../DataArrayCreationWidget.h                 |  174 +-
 .../DataArrayInformationDisplayWidget.cpp     |   67 +-
 .../DataArrayInformationDisplayWidget.h       |  144 +-
 .../DataArraySelectionWidget.cpp              |   73 +-
 .../DataArraySelectionWidget.h                |  171 +-
 .../DataContainerArrayProxyWidget.cpp         |   88 +-
 .../DataContainerArrayProxyWidget.h           |  249 +-
 .../DataContainerCreationWidget.cpp           |   71 +-
 .../DataContainerCreationWidget.h             |  150 +-
 .../DataContainerGridModel.cpp                |   11 +-
 .../DataContainerGridSelectionWidget.cpp      |    4 +-
 .../DataContainerReaderWidget.cpp             |   90 +-
 .../DataContainerReaderWidget.h               |  244 +-
 .../DataContainerSelectionWidget.cpp          |   80 +-
 .../DataContainerSelectionWidget.h            |  213 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |   67 +-
 .../FilterParameterWidgets/DoubleWidget.h     |  144 +-
 .../DynamicChoiceWidget.cpp                   |   66 +-
 .../DynamicChoiceWidget.h                     |  156 +-
 .../DynamicTableItemDelegate.cpp              |   66 +-
 .../DynamicTableItemDelegate.h                |   95 +-
 .../DynamicTableWidget.cpp                    |   80 +-
 .../DynamicTableWidget.h                      |  192 +-
 .../FileListInfoWidget.cpp                    |    4 +-
 .../FileListInfoWidget.h                      |    5 +-
 .../FilterParameterWidget.cpp                 |   10 +-
 .../FilterParameterWidget.h                   |  351 +-
 .../FilterParameterWidgetUtils.hpp            |  465 +--
 .../FilterParameterWidgetsDialogs.cpp         |   66 +-
 .../FilterParameterWidgetsDialogs.h           |   91 +-
 .../FloatVec2Widget.cpp                       |   68 +-
 .../FilterParameterWidgets/FloatVec2Widget.h  |  154 +-
 .../FloatVec3Widget.cpp                       |   67 +-
 .../FilterParameterWidgets/FloatVec3Widget.h  |  155 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |   67 +-
 .../FilterParameterWidgets/FloatWidget.h      |  144 +-
 .../FourthOrderPolynomialWidget.cpp           |   67 +-
 .../FourthOrderPolynomialWidget.h             |  144 +-
 .../GenerateColorTableWidget.cpp              |   94 +-
 .../GenerateColorTableWidget.h                |  184 +-
 .../IComparisonWidget.cpp                     |   76 +-
 .../IComparisonWidget.h                       |  121 +-
 .../ImportHDF5DatasetWidget.h                 |   12 +-
 .../InputFileWidget.cpp                       |   70 +-
 .../FilterParameterWidgets/InputFileWidget.h  |  137 +-
 .../InputPathWidget.cpp                       |   67 +-
 .../FilterParameterWidgets/InputPathWidget.h  |  137 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |    1 -
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   67 +-
 .../FilterParameterWidgets/IntVec3Widget.h    |  147 +-
 .../FilterParameterWidgets/IntWidget.cpp      |   67 +-
 .../FilterParameterWidgets/IntWidget.h        |  142 +-
 .../LinkedBooleanWidget.cpp                   |   67 +-
 .../LinkedBooleanWidget.h                     |  165 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   83 +-
 .../LinkedDataContainerSelectionWidget.h      |  217 +-
 .../LinkedPathCreationWidget.cpp              |    2 -
 .../MontageStructureSelectionWidget.cpp       |    4 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |  103 +-
 .../MultiAttributeMatrixSelectionWidget.h     |  240 +-
 .../MultiDataArraySelectionWidget.cpp         |   97 +-
 .../MultiDataArraySelectionWidget.h           |  242 +-
 .../MultiDataContainerSelectionWidget.cpp     |  146 +-
 .../MultiDataContainerSelectionWidget.h       |  240 +-
 .../NumericTypeWidget.cpp                     |   69 +-
 .../NumericTypeWidget.h                       |  143 +-
 .../OutputFileWidget.cpp                      |   66 +-
 .../FilterParameterWidgets/OutputFileWidget.h |  124 +-
 .../OutputPathWidget.cpp                      |   67 +-
 .../FilterParameterWidgets/OutputPathWidget.h |  124 +-
 .../ParagraphWidget.cpp                       |   63 +-
 .../FilterParameterWidgets/ParagraphWidget.h  |   89 +-
 .../PhaseTypeSelectionWidget.cpp              |   84 +-
 .../PhaseTypeSelectionWidget.h                |  169 +-
 .../PreflightUpdatedValueWidget.cpp           |   67 +-
 .../PreflightUpdatedValueWidget.h             |  144 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |   67 +-
 .../FilterParameterWidgets/RangeWidget.h      |  150 +-
 .../ReadASCIIDataWidget.cpp                   |   10 +-
 .../ReadASCIIDataWidget.h                     |  143 +-
 .../ScalarTypeWidget.cpp                      |   69 +-
 .../FilterParameterWidgets/ScalarTypeWidget.h |  143 +-
 .../SecondOrderPolynomialWidget.cpp           |   67 +-
 .../SecondOrderPolynomialWidget.h             |  144 +-
 .../SeparatorWidget.cpp                       |   68 +-
 .../FilterParameterWidgets/SeparatorWidget.h  |  144 +-
 .../ShapeTypeSelectionWidget.cpp              |   90 +-
 .../ShapeTypeSelectionWidget.h                |  146 +-
 .../FilterParameterWidgets/StringWidget.cpp   |   67 +-
 .../FilterParameterWidgets/StringWidget.h     |  142 +-
 .../ThirdOrderPolynomialWidget.cpp            |   67 +-
 .../ThirdOrderPolynomialWidget.h              |  144 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |   63 +-
 .../FilterParameterWidgets/UInt64Widget.h     |  138 +-
 .../FilterParameterWidgets/UnknownWidget.cpp  |   67 +-
 .../FilterParameterWidgets/UnknownWidget.h    |  145 +-
 .../QtSupport/QRoundProgressBar.cpp           |  482 ++-
 .../QtSupport/QRoundProgressBar.h             |  389 +-
 .../QtSApplicationAboutBoxDialog.cpp          |   66 +-
 .../QtSupport/QtSApplicationAboutBoxDialog.h  |  157 +-
 .../QtSupport/QtSApplicationFileInfo.cpp      |   66 +-
 .../QtSupport/QtSApplicationFileInfo.h        |   86 +-
 .../QtSupport/QtSBookmarkMissingDialog.cpp    |   67 +-
 .../QtSupport/QtSBookmarkMissingDialog.h      |   99 +-
 .../QtSupport/QtSCheckboxDialog.cpp           |   66 +-
 .../QtSupport/QtSCheckboxDialog.h             |  102 +-
 .../QtSupport/QtSColorComboPicker.cpp         |   66 +-
 .../QtSupport/QtSColorComboPicker.h           |   87 +-
 .../QtSupport/QtSDisclosableWidget.cpp        |   17 +-
 .../QtSupport/QtSDisclosableWidget.h          |   21 +-
 .../QtSupport/QtSDistributionTypeWidget.cpp   |   66 +-
 .../QtSupport/QtSDistributionTypeWidget.h     |  104 +-
 .../SVWidgetsLib/QtSupport/QtSDocServer.cpp   |   66 +-
 Source/SVWidgetsLib/QtSupport/QtSDocServer.h  |   74 +-
 .../QtSupport/QtSDroppableScrollArea.cpp      |   66 +-
 .../QtSupport/QtSDroppableScrollArea.h        |   88 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp |   66 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.h   |  119 +-
 .../QtSupport/QtSFSDropLineEdit.cpp           |   66 +-
 .../QtSupport/QtSFSDropLineEdit.h             |  116 +-
 .../SVWidgetsLib/QtSupport/QtSFaderWidget.h   |   64 +-
 .../QtSupport/QtSFileCompleter.cpp            |   66 +-
 .../SVWidgetsLib/QtSupport/QtSFileCompleter.h |   76 +-
 .../QtSupport/QtSFileDragMessageBox.cpp       |   66 +-
 .../QtSupport/QtSFileDragMessageBox.h         |   93 +-
 .../QtSupport/QtSGraphicsView.cpp             |   66 +-
 .../SVWidgetsLib/QtSupport/QtSGraphicsView.h  |  262 +-
 .../QtSupport/QtSHelpUrlGenerator.cpp         |   91 +-
 .../QtSupport/QtSHelpUrlGenerator.h           |  112 +-
 .../SVWidgetsLib/QtSupport/QtSHoverButton.cpp |   66 +-
 .../SVWidgetsLib/QtSupport/QtSHoverButton.h   |   89 +-
 .../QtSupport/QtSImageGraphicsDelegate.cpp    |   66 +-
 .../QtSupport/QtSImageGraphicsDelegate.h      |  458 ++-
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.h   |  153 +-
 Source/SVWidgetsLib/QtSupport/QtSMacros.h     |  310 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.cpp |   68 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.h   |  321 +-
 .../QtSupport/QtSRecentFileList.cpp           |   66 +-
 .../QtSupport/QtSRecentFileList.h             |  259 +-
 Source/SVWidgetsLib/QtSupport/QtSSettings.cpp |   66 +-
 Source/SVWidgetsLib/QtSupport/QtSSettings.h   |  145 +-
 Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp |   66 +-
 Source/SVWidgetsLib/QtSupport/QtSSplitter.h   |   91 +-
 .../QtSupport/QtSSplitterHandle.cpp           |   67 +-
 .../QtSupport/QtSSplitterHandle.h             |   85 +-
 .../SVWidgetsLib/QtSupport/QtSStringEdit.cpp  |   71 +-
 Source/SVWidgetsLib/QtSupport/QtSStringEdit.h |   69 +-
 .../httpserver/QtSStaticFileController.cpp    |    6 +-
 .../httpserver/QtSStaticFileController.h      |    1 -
 Source/SVWidgetsLib/Widgets/BookmarksItem.cpp |   67 +-
 Source/SVWidgetsLib/Widgets/BookmarksItem.h   |  296 +-
 .../Widgets/BookmarksItemDelegate.cpp         |   68 +-
 .../Widgets/BookmarksItemDelegate.h           |   99 +-
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   92 +-
 Source/SVWidgetsLib/Widgets/BookmarksModel.h  |  304 +-
 .../Widgets/BookmarksToolboxWidget.cpp        |   72 +-
 .../Widgets/BookmarksToolboxWidget.h          |  295 +-
 .../Widgets/BookmarksTreeView.cpp             |  110 +-
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h  |  407 +-
 .../Widgets/DREAM3DListWidget.cpp             |   68 +-
 .../SVWidgetsLib/Widgets/DREAM3DListWidget.h  |   99 +-
 .../Widgets/DataArrayPathDisplay.cpp          |    5 +-
 .../Widgets/DataArrayPathDisplay.h            |   37 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  |    3 +-
 .../Widgets/DataArrayPathSelectionWidget.h    |  324 +-
 .../Widgets/DataContainerArrayWidget.cpp      |   68 +-
 .../Widgets/DataContainerArrayWidget.h        |   57 +-
 Source/SVWidgetsLib/Widgets/DataPathLabel.cpp |    6 +-
 Source/SVWidgetsLib/Widgets/DataPathLabel.h   |    2 +-
 .../Widgets/DataStructureItem.cpp             |  117 +-
 .../SVWidgetsLib/Widgets/DataStructureItem.h  |  232 +-
 .../Widgets/DataStructureItemDelegate.cpp     |   29 +-
 .../Widgets/DataStructureItemDelegate.h       |    9 +-
 .../Widgets/DataStructureModel.cpp            |   88 +-
 .../SVWidgetsLib/Widgets/DataStructureModel.h |  202 +-
 .../Widgets/DataStructureTreeView.cpp         |    6 +-
 .../Widgets/DataStructureWidget.cpp           |    5 +-
 .../Widgets/DataStructureWidget.h             |   97 +-
 .../Widgets/FilterInputWidget.cpp             |  176 +-
 .../SVWidgetsLib/Widgets/FilterInputWidget.h  |  227 +-
 .../Widgets/FilterLibraryToolboxWidget.cpp    |   73 +-
 .../Widgets/FilterLibraryToolboxWidget.h      |  223 +-
 .../Widgets/FilterLibraryTreeWidget.cpp       |   66 +-
 .../Widgets/FilterLibraryTreeWidget.h         |  110 +-
 .../SVWidgetsLib/Widgets/FilterListItem.cpp   |   77 +-
 Source/SVWidgetsLib/Widgets/FilterListItem.h  |  249 +-
 .../SVWidgetsLib/Widgets/FilterListModel.cpp  |   80 +-
 Source/SVWidgetsLib/Widgets/FilterListModel.h |  151 +-
 .../Widgets/FilterListToolboxWidget.cpp       |  182 +-
 .../Widgets/FilterListToolboxWidget.h         |  206 +-
 .../SVWidgetsLib/Widgets/FilterListView.cpp   |  164 +-
 Source/SVWidgetsLib/Widgets/FilterListView.h  |  337 +-
 .../SVWidgetsLib/Widgets/FilterListWidget.cpp |   66 +-
 .../SVWidgetsLib/Widgets/FilterListWidget.h   |  100 +-
 .../ImportASCIIDataWizard/ASCIIDataItem.cpp   |   66 +-
 .../ImportASCIIDataWizard/ASCIIDataItem.h     |   71 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.cpp  |   76 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.h    |   83 +-
 .../AbstractWizardPage.cpp                    |   66 +-
 .../AbstractWizardPage.h                      |  104 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |  177 +-
 .../ImportASCIIDataWizard/DataFormatPage.h    |  557 ++-
 .../ImportASCIIDataWizard/DelimitedPage.cpp   |   70 +-
 .../ImportASCIIDataWizard/DelimitedPage.h     |  153 +-
 .../EditHeadersDialog.cpp                     |   66 +-
 .../ImportASCIIDataWizard/EditHeadersDialog.h |   80 +-
 .../ImportASCIIDataWizard.cpp                 |   72 +-
 .../ImportASCIIDataWizard.h                   |  289 +-
 .../LineCounterObject.cpp                     |   66 +-
 .../ImportASCIIDataWizard/LineCounterObject.h |   89 +-
 .../TupleSelectionPage.cpp                    |   67 +-
 .../TupleSelectionPage.h                      |  121 +-
 .../TupleTableItemDelegate.cpp                |   66 +-
 .../TupleTableItemDelegate.h                  |   95 +-
 .../TupleTableWidget.cpp                      |   67 +-
 .../ImportASCIIDataWizard/TupleTableWidget.h  |  145 +-
 .../Widgets/ImportHDF5TreeModelItem.cpp       |    1 -
 .../Widgets/ImportHDF5TreeModelItem.h         |    2 -
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp  |   77 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.h    |  164 +-
 .../Widgets/IssuesWidgetMessageHandler.cpp    |   71 +-
 .../Widgets/IssuesWidgetMessageHandler.h      |  134 +-
 .../Widgets/PipelineFilterMimeData.cpp        |   54 +-
 .../Widgets/PipelineFilterMimeData.h          |   98 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp  |   59 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.h    |  625 ++-
 .../Widgets/PipelineItemDelegate.cpp          |  267 +-
 .../Widgets/PipelineItemDelegate.h            |  132 +-
 .../Widgets/PipelineListWidget.cpp            |   58 +-
 .../SVWidgetsLib/Widgets/PipelineListWidget.h |  193 +-
 Source/SVWidgetsLib/Widgets/PipelineModel.cpp |  164 +-
 Source/SVWidgetsLib/Widgets/PipelineModel.h   |  234 +-
 Source/SVWidgetsLib/Widgets/PipelineView.cpp  |   68 +-
 Source/SVWidgetsLib/Widgets/PipelineView.h    |  163 +-
 Source/SVWidgetsLib/Widgets/PopUpWidget.cpp   |   62 +-
 Source/SVWidgetsLib/Widgets/PopUpWidget.h     |  160 +-
 Source/SVWidgetsLib/Widgets/ProgressDialog.h  |   30 +-
 .../SVWidgetsLib/Widgets/SVControlWidgets.cpp |   70 +-
 .../SVWidgetsLib/Widgets/SVControlWidgets.h   |   69 +-
 .../Widgets/SVOverlayWidgetButton.cpp         |   12 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   29 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |    5 +-
 Source/SVWidgetsLib/Widgets/SVStyle.cpp       |  193 +-
 Source/SVWidgetsLib/Widgets/SVStyle.h         | 3506 ++++++++---------
 .../Widgets/SVUserManualDialog.cpp            |   75 +-
 .../SVWidgetsLib/Widgets/SVUserManualDialog.h |  107 +-
 .../Widgets/StandardOutputWidget.cpp          |   72 +-
 .../Widgets/StandardOutputWidget.h            |  149 +-
 .../SVWidgetsLib/Widgets/StatusBarButton.cpp  |    6 +-
 Source/SVWidgetsLib/Widgets/StatusBarButton.h |   91 +-
 .../Widgets/StatusBarIssuesButton.cpp         |   11 +-
 .../Widgets/StatusBarIssuesButton.h           |   57 +-
 .../SVWidgetsLib/Widgets/StatusBarWidget.cpp  |  171 +-
 Source/SVWidgetsLib/Widgets/StatusBarWidget.h |  315 +-
 .../Widgets/util/AddFilterCommand.cpp         |   12 +-
 .../Widgets/util/AddFilterCommand.h           |    8 +-
 .../Widgets/util/MoveFilterCommand.cpp        |  162 +-
 .../Widgets/util/MoveFilterCommand.h          |   75 +-
 .../Widgets/util/RemoveFilterCommand.cpp      |   10 +-
 .../Widgets/util/RemoveFilterCommand.h        |    8 +-
 .../Explicit/include/sitkExplicit.h           |   53 +-
 .../Explicit/include/sitkExplicitITK.h        |   38 +-
 .../sitkExplicitITKComposeImageFilter.h       |   80 +-
 .../sitkExplicitITKDefaultPixelAccessor.h     |   60 +-
 ...itkExplicitITKDefaultVectorPixelAccessor.h |   32 +-
 .../Explicit/include/sitkExplicitITKImage.h   |   36 +-
 .../include/sitkExplicitITKImageBase.h        |   32 +-
 .../sitkExplicitITKImageConstIterator.h       |  116 +-
 .../include/sitkExplicitITKImageRegion.h      |   32 +-
 .../sitkExplicitITKImageRegionConstIterator.h |  112 +-
 ...itkExplicitITKImageScanlineConstIterator.h |  106 +-
 .../sitkExplicitITKImageScanlineIterator.h    |  102 +-
 .../include/sitkExplicitITKImageSource.h      |  194 +-
 .../sitkExplicitITKImageToImageFilter.h       | 1274 +++---
 .../sitkExplicitITKImportImageContainer.h     |   68 +-
 .../sitkExplicitITKInPlaceImageFilter.h       |  620 +--
 .../include/sitkExplicitITKLabelMap.h         |   68 +-
 .../include/sitkExplicitITKVectorImage.h      |   32 +-
 ...itITKVectorIndexSelectionCastImageFilter.h |   80 +-
 .../Explicit/include/sitkMacro.h              |  122 +-
 .../Explicit/include/sitkVersionConfig.h      |   34 +-
 .../QtWebApp/httpserver/ServerSettings.h      |    4 +-
 .../httpserver/httpconnectionhandler.h        |    1 -
 .../httpserver/httpconnectionhandlerpool.cpp  |    5 +-
 .../httpserver/httpconnectionhandlerpool.h    |    2 -
 ThirdParty/QtWebApp/httpserver/httpcookie.h   |    1 -
 ThirdParty/QtWebApp/httpserver/httpglobal.h   |    2 -
 .../QtWebApp/httpserver/httplistener.cpp      |    2 +-
 ThirdParty/QtWebApp/httpserver/httplistener.h |    1 -
 .../QtWebApp/httpserver/httprequest.cpp       |   36 +-
 ThirdParty/QtWebApp/httpserver/httprequest.h  |    1 -
 .../QtWebApp/httpserver/httprequesthandler.h  |   25 +-
 ThirdParty/QtWebApp/httpserver/httpresponse.h |  102 +-
 .../QtWebApp/httpserver/httpsession.cpp       |    2 +-
 ThirdParty/QtWebApp/httpserver/httpsession.h  |    1 -
 .../QtWebApp/httpserver/httpsessionstore.cpp  |    4 +-
 .../QtWebApp/httpserver/httpsessionstore.h    |    1 -
 .../httpserver/staticfilecontroller.h         |    1 -
 ThirdParty/QtWebApp/logging/dualfilelogger.h  |    1 -
 ThirdParty/QtWebApp/logging/filelogger.h      |    1 -
 ThirdParty/QtWebApp/logging/logger.h          |    1 -
 ThirdParty/QtWebApp/logging/logglobal.h       |    1 -
 ThirdParty/QtWebApp/logging/logmessage.h      |    1 -
 ThirdParty/QtWebApp/qtservice/qtservice.h     |    4 +-
 ThirdParty/QtWebApp/qtservice/qtservice_p.h   |    1 -
 .../QtWebApp/qtservice/qtunixserversocket.h   |    1 -
 ThirdParty/QtWebApp/qtservice/qtunixsocket.h  |    1 -
 ThirdParty/QtWebApp/templateengine/template.h |    1 -
 .../QtWebApp/templateengine/templatecache.h   |    1 -
 .../QtWebApp/templateengine/templateglobal.h  |    1 -
 .../QtWebApp/templateengine/templateloader.h  |    1 -
 Wrapping/Python/Binding/pySIMPLBody.cpp       |  259 +-
 .../Pybind11/CodeScraper/CodeScraper.cpp      |    8 +-
 .../CodeScraper/PyBind11Generator.cpp         |   96 +-
 .../Pybind11/CodeScraper/PyBind11Generator.h  |   38 +-
 .../Pybind11/CodeScraper/PythonBindingClass.h |   24 +-
 .../CodeScraper/PythonBindingsModule.cpp      |   10 +-
 .../CodeScraper/PythonBindingsModule.h        |   14 +-
 .../Python/Pybind11/CodeScraper/PythonUtils.h |   16 +-
 1082 files changed, 64646 insertions(+), 66071 deletions(-)
 mode change 100755 => 100644 Resources/UnitTestSupport.hpp
 mode change 100755 => 100644 Source/RESTClient/RESTClientDLLExport.h
 mode change 100755 => 100644 Source/SIMPLib/Common/AppVersion.h
 mode change 100755 => 100644 Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
 mode change 100755 => 100644 Source/SIMPLib/Common/DocRequestManager.h
 mode change 100755 => 100644 Source/SIMPLib/Common/IObserver.h
 mode change 100755 => 100644 Source/SIMPLib/Common/Observable.h
 mode change 100755 => 100644 Source/SIMPLib/Common/Observer.h
 mode change 100755 => 100644 Source/SIMPLib/Common/PhaseType.h
 mode change 100755 => 100644 Source/SIMPLib/Common/SIMPLibDLLExport.h
 mode change 100755 => 100644 Source/SIMPLib/Common/SIMPLibSetGetMacros.h
 mode change 100755 => 100644 Source/SIMPLib/Common/ScopedFileMonitor.hpp
 mode change 100755 => 100644 Source/SIMPLib/Common/ShapeType.h
 mode change 100755 => 100644 Source/SIMPLib/Common/TemplateHelpers.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/ConditionalSetValue.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/ConvertData.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CreateDataContainer.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/CreateImageGeometry.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/DataContainerReader.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/DataContainerWriter.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/EmptyFilter.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/FeatureCountDecision.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/FileReader.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/FileWriter.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/MaskCountDecision.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/MoveData.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RawBinaryReader.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RenameAttributeArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RenameDataContainer.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/RequiredZThickness.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/ScaleVolume.h
 mode change 100755 => 100644 Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/DataArray.hpp
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/DynamicListArray.hpp
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/IDataArray.h
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/IDataArrayFilter.h
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/NeighborList.hpp
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/StatsDataArray.h
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/StructArray.hpp
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/AttributeMatrix.h
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/DataArrayPath.h
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/DataContainer.h
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/DataContainerArray.h
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/DataContainerBundle.h
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/IDataContainerBundle.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DynamicTableData.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/FilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/IntFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/StringFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/AbstractDecisionFilter.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/AbstractFilter.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/ComparisonInputs.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/FilterFactory.hpp
 mode change 100755 => 100644 Source/SIMPLib/Filtering/FilterManager.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/IFilterFactory.hpp
 mode change 100755 => 100644 Source/SIMPLib/Filtering/QMetaObjectUtilities.h
 mode change 100755 => 100644 Source/SIMPLib/Filtering/ThresholdFilterHelper.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/DerivativeHelpers.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/GeometryHelpers.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/IGeometry2D.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/IGeometry3D.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/MeshStructs.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
 mode change 100755 => 100644 Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5DataArrayReader.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5Macros.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5StatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
 mode change 100755 => 100644 Source/SIMPLib/HDF5/VTKH5Constants.h
 mode change 100755 => 100644 Source/SIMPLib/Math/ArrayHelpers.hpp
 mode change 100755 => 100644 Source/SIMPLib/Math/GeometryMath.h
 mode change 100755 => 100644 Source/SIMPLib/Math/RadialDistributionFunction.h
 mode change 100755 => 100644 Source/SIMPLib/Math/SIMPLibMath.h
 mode change 100755 => 100644 Source/SIMPLib/Math/SIMPLibRandom.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/AbstractMessageHandler.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/FilterErrorMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/FilterProgressMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/FilterStatusMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/FilterWarningMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/GenericErrorMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/GenericProgressMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/GenericStatusMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/GenericWarningMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/PipelineErrorMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/PipelineProgressMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/PipelineStatusMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Messages/PipelineWarningMessage.h
 mode change 100755 => 100644 Source/SIMPLib/Plugin/ISIMPLibPlugin.h
 mode change 100755 => 100644 Source/SIMPLib/Plugin/PluginManager.h
 mode change 100755 => 100644 Source/SIMPLib/Plugin/PluginProxy.h
 mode change 100755 => 100644 Source/SIMPLib/Plugin/SIMPLibPlugin.h
 mode change 100755 => 100644 Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
 mode change 100755 => 100644 Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
 mode change 100755 => 100644 Source/SIMPLib/StatsData/BoundaryStatsData.h
 mode change 100755 => 100644 Source/SIMPLib/StatsData/MatrixStatsData.h
 mode change 100755 => 100644 Source/SIMPLib/StatsData/PrecipitateStatsData.h
 mode change 100755 => 100644 Source/SIMPLib/StatsData/StatsData.h
 mode change 100755 => 100644 Source/SIMPLib/StatsData/TransformationStatsData.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/ColorTable.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/ColorUtilities.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/FilePathGenerator.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/SIMPLibEndian.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/StringOperations.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/TestObserver.h
 mode change 100755 => 100644 Source/SIMPLib/Utilities/TimeUtilities.h
 mode change 100755 => 100644 Source/SIMPLib/VTKUtils/VTKFileReader.h
 mode change 100755 => 100644 Source/SIMPLib/VTKUtils/VTKUtil.hpp
 mode change 100755 => 100644 Source/SIMPLib/VTKUtils/VTKWriterMacros.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/AboutPlugins.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/PluginDetails.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/UpdateCheck.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QRoundProgressBar.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSMacros.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSSettings.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSSplitter.h
 mode change 100755 => 100644 Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/BookmarksItem.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/BookmarksModel.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/DataStructureItem.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/DataStructureModel.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/DataStructureWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterInputWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterListItem.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterListModel.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterListView.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/FilterListWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/IssuesWidget.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/PipelineItem.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/PipelineModel.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/PipelineView.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/SVPipelineView.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
 mode change 100755 => 100644 Source/SVWidgetsLib/Widgets/StandardOutputWidget.h

diff --git a/Resources/UnitTestSupport.hpp b/Resources/UnitTestSupport.hpp
old mode 100755
new mode 100644
index 495d497d56..14ea267382
--- a/Resources/UnitTestSupport.hpp
+++ b/Resources/UnitTestSupport.hpp
@@ -428,8 +428,8 @@ bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
     QString buf;                                                                                                                                                                                       \
     QTextStream ss(&buf);                                                                                                                                                                              \
     ss << "Your test required the following\n            '";                                                                                                                                           \
-    ss << "AlmostEqualUlpsFinal(" << #L << ", " << #R << ", " << #Ulps << ")'\n             but this condition was not met with MaxUlps=" << Ulps << "\n";                                              \
-    ss << "             " << *L << "==" << *R;                                                                                                                                                           \
+    ss << "AlmostEqualUlpsFinal(" << #L << ", " << #R << ", " << #Ulps << ")'\n             but this condition was not met with MaxUlps=" << Ulps << "\n";                                             \
+    ss << "             " << *L << "==" << *R;                                                                                                                                                         \
     DREAM3D_TEST_THROW_EXCEPTION(buf.toStdString())                                                                                                                                                    \
   }
 
@@ -533,7 +533,8 @@ bool AlmostEqualUlpsFinal(float* A, float* B, int maxUlps)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T, typename K> void require_equal(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
+template <typename T, typename K>
+void require_equal(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
 {
   if(l != r)
   {
@@ -550,7 +551,8 @@ template <typename T, typename K> void require_equal(T l, const QString& L, K r,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T, typename K> void require_less_than(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
+template <typename T, typename K>
+void require_less_than(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
 {
   if(l >= r)
   {
@@ -566,7 +568,8 @@ template <typename T, typename K> void require_less_than(T l, const QString& L,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T, typename K> void require_greater_than(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
+template <typename T, typename K>
+void require_greater_than(T l, const QString& L, K r, const QString& R, const QString file = "", int line = 0)
 {
   if(l <= r)
   {
diff --git a/Source/Experimental/FilterCallback/FilterParameter.cpp b/Source/Experimental/FilterCallback/FilterParameter.cpp
index f5f16f93e6..71816bf124 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameter.cpp
@@ -1,36 +1,24 @@
 #include "FilterParameter.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 IFilterParameter::IFilterParameter(const std::string& humanLabel, const std::string& propertyName, IFilterParameter::Category category, int groupIndex)
-  : m_HumanLabel(humanLabel)
-  , m_PropertyName(propertyName)
-  , m_Category(category)
-  , m_GroupIndex(groupIndex)
+: m_HumanLabel(humanLabel)
+, m_PropertyName(propertyName)
+, m_Category(category)
+, m_GroupIndex(groupIndex)
 {
 }
 
 IFilterParameter::~IFilterParameter() = default;
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 
-
-
-
-Int32Parameter::Pointer Int32Parameter::New(const std::string& humanLabel,
-                                                            const std::string& propertyName,
-                                                            int defaultValue,
-                                                            Category category,
-                                                            Int32Parameter::SetterCallbackType setterCallback,
-                                                            Int32Parameter::GetterCallbackType getterCallback,
-                                                            int groupIndex)
+Int32Parameter::Pointer Int32Parameter::New(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, Int32Parameter::SetterCallbackType setterCallback,
+                                            Int32Parameter::GetterCallbackType getterCallback, int groupIndex)
 {
   Pointer sharedPtr(new Int32Parameter(humanLabel, propertyName, defaultValue, category, setterCallback, getterCallback, groupIndex));
   return sharedPtr;
@@ -61,24 +49,20 @@ void Int32Parameter::writeJson(QJsonObject& json) const
   json[QString::fromStdString(getPropertyName())] = m_GetterCallback();
 }
 
-Int32Parameter::Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
-  : IFilterParameter(humanLabel, propertyName, category, groupIndex)
-  , m_DefaultValue(defaultValue)
-  , m_SetterCallback(setterCallback)
-  , m_GetterCallback(getterCallback)
+Int32Parameter::Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                               const GetterCallbackType& getterCallback, int groupIndex)
+: IFilterParameter(humanLabel, propertyName, category, groupIndex)
+, m_DefaultValue(defaultValue)
+, m_SetterCallback(setterCallback)
+, m_GetterCallback(getterCallback)
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DoubleParameter::Pointer DoubleParameter::New(const std::string& humanLabel,
-                                              const std::string& propertyName,
-                                              double defaultValue,
-                                              Category category,
-                                              DoubleParameter::SetterCallbackType setterCallback,
-                                              DoubleParameter::GetterCallbackType getterCallback,
-                                              int groupIndex)
+DoubleParameter::Pointer DoubleParameter::New(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category,
+                                              DoubleParameter::SetterCallbackType setterCallback, DoubleParameter::GetterCallbackType getterCallback, int groupIndex)
 {
   Pointer sharedPtr(new DoubleParameter(humanLabel, propertyName, defaultValue, category, setterCallback, getterCallback, groupIndex));
   return sharedPtr;
@@ -109,27 +93,20 @@ void DoubleParameter::writeJson(QJsonObject& json) const
   json[QString::fromStdString(getPropertyName())] = m_GetterCallback();
 }
 
-
-DoubleParameter::DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
-  : IFilterParameter(humanLabel, propertyName, category, groupIndex)
-  , m_DefaultValue(defaultValue)
-  , m_SetterCallback(setterCallback)
-  , m_GetterCallback(getterCallback)
+DoubleParameter::DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                 const GetterCallbackType& getterCallback, int groupIndex)
+: IFilterParameter(humanLabel, propertyName, category, groupIndex)
+, m_DefaultValue(defaultValue)
+, m_SetterCallback(setterCallback)
+, m_GetterCallback(getterCallback)
 {
 }
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPathParameter::Pointer DataArrayPathParameter::New(const std::string& humanLabel,
-                                                            const std::string& propertyName,
-                                                            const DataArrayPath& defaultValue,
-                                                            Category category,
-                                                            SetterCallbackType setterCallback,
-                                                            GetterCallbackType getterCallback,
-                                                            int groupIndex)
+DataArrayPathParameter::Pointer DataArrayPathParameter::New(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                            SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
 {
   DataArrayPathParameter::Pointer sharedPtr(new DataArrayPathParameter(humanLabel, propertyName, defaultValue, category, setterCallback, getterCallback, groupIndex));
   return sharedPtr;
@@ -154,7 +131,7 @@ void DataArrayPathParameter::readJson(const QJsonObject& json)
     DataArrayPath dap;
     QJsonObject obj = jsonValue.toObject();
     dap.readJson(obj);
-    if( m_SetterCallback)
+    if(m_SetterCallback)
     {
       m_SetterCallback(dap);
     }
@@ -169,11 +146,12 @@ void DataArrayPathParameter::writeJson(QJsonObject& json) const
   }
 }
 
-DataArrayPathParameter::DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
-  : IFilterParameter(humanLabel, propertyName, category, groupIndex)
-  , m_DefaultValue(defaultValue)
-  , m_SetterCallback(setterCallback)
-  , m_GetterCallback(getterCallback)
+DataArrayPathParameter::DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath& defaultValue, Category category,
+                                               const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+: IFilterParameter(humanLabel, propertyName, category, groupIndex)
+, m_DefaultValue(defaultValue)
+, m_SetterCallback(setterCallback)
+, m_GetterCallback(getterCallback)
 {
 }
 
diff --git a/Source/Experimental/FilterCallback/FilterParameter.h b/Source/Experimental/FilterCallback/FilterParameter.h
index 3b4da6c710..25be4d58fb 100644
--- a/Source/Experimental/FilterCallback/FilterParameter.h
+++ b/Source/Experimental/FilterCallback/FilterParameter.h
@@ -1,21 +1,15 @@
 #pragma once
 
-
-
-
-
 #include <memory>
 
 #include <functional>
 #include <iostream>
 #include <string>
 
-
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-
 // -----------------------------------------------------------------------------
 // This section of Macros allows each FilterParameter subclass to create a macro
 // or set of macros that can lessen the amout of code that needs to be written
@@ -24,218 +18,186 @@
 // __VA__ARGS__
 // -----------------------------------------------------------------------------
 
-#define SIMPL_BIND_SETTER(Class, Type, Prop)\
-  Class::SetterCallbackType _##Prop##_ParamSetter = [this](Type i) { return this->set##Prop(i); };                                                                                                       \
-  
-#define SIMPL_BIND_GETTER(Class, Type, Prop)\
-  Class::GetterCallbackType _##Prop##_ParamGetter = [this] { return this->get##Prop(); };                                                                                                                \
-  
+#define SIMPL_BIND_SETTER(Class, Type, Prop) Class::SetterCallbackType _##Prop##_ParamSetter = [this](Type i) { return this->set##Prop(i); };
+
+#define SIMPL_BIND_GETTER(Class, Type, Prop) Class::GetterCallbackType _##Prop##_ParamGetter = [this] { return this->get##Prop(); };
+
 // Define overrides that can be used by the expansion of our main macro.
 // Each subclass can define a macro that takes up to nine (9) arguments
 // to the constructor. These macros support a minimum of 4 arguments.
 
-#define SIMPL_NEW_FP_9(Class, Type, Desc, Prop, Category, Index, A, B, C, D, E)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index, A, B, C, D, E)
-
-#define SIMPL_NEW_FP_8(Class, Type, Desc, Prop, Category, Index, A, B, C, D)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index, A, B, C, D)
-
-#define SIMPL_NEW_FP_7(Class, Type, Desc, Prop, Category, Index, A, B, C)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index, A, B, C)
-
-#define SIMPL_NEW_FP_6(Class, Type, Desc, Prop, Category, Index, A, B)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index, A, B)
-
-#define SIMPL_NEW_FP_5(Class, Type, Desc, Prop, Category, Index, A)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index, A)
-
-#define SIMPL_NEW_FP_4(Class, Type, Desc, Prop, Category, Index)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); },\
-  Index)
-
-#define SIMPL_NEW_FP_3(Class, Type, Desc, Prop, Category)\
-  Class::New(Desc, #Prop, get##Prop(), Category, \
-  [this](Type i) { return this->set##Prop(i); }, \
-  [this] { return this->get##Prop(); }\
-  )
+#define SIMPL_NEW_FP_9(Class, Type, Desc, Prop, Category, Index, A, B, C, D, E)                                                                                                                        \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index, A, B, C, D, E)
 
+#define SIMPL_NEW_FP_8(Class, Type, Desc, Prop, Category, Index, A, B, C, D)                                                                                                                           \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index, A, B, C, D)
+
+#define SIMPL_NEW_FP_7(Class, Type, Desc, Prop, Category, Index, A, B, C)                                                                                                                              \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index, A, B, C)
+
+#define SIMPL_NEW_FP_6(Class, Type, Desc, Prop, Category, Index, A, B)                                                                                                                                 \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index, A, B)
+
+#define SIMPL_NEW_FP_5(Class, Type, Desc, Prop, Category, Index, A)                                                                                                                                    \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index, A)
+
+#define SIMPL_NEW_FP_4(Class, Type, Desc, Prop, Category, Index)                                                                                                                                       \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); }, Index)
+
+#define SIMPL_NEW_FP_3(Class, Type, Desc, Prop, Category)                                                                                                                                              \
+  Class::New(                                                                                                                                                                                          \
+      Desc, #Prop, get##Prop(), Category, [this](Type i) { return this->set##Prop(i); }, [this] { return this->get##Prop(); })
 
 /**
  * @brief This macro is needed for Visual Studio due to differences of VAR_ARGS when
  * passed to another macro that results in a new macro that needs expansion.
  */
-#define SIMPL_EXPAND( x ) x
+#define SIMPL_EXPAND(x) x
 
 // -----------------------------------------------------------------------------
 // Define a macro that uses the "paired, sliding arg list"
 // technique to select the appropriate override.
 #define _FP_GET_OVERRIDE(A, B, C, D, E, F, G, H, I, NAME, ...) NAME
 
+#define SIMPL_NEW_INT32_FP(...)                                                                                                                                                                        \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)(Int32Parameter, int, __VA_ARGS__))
 
-#define SIMPL_NEW_INT32_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)\
-  (Int32Parameter, int, __VA_ARGS__))
-
-
-#define SIMPL_NEW_DOUBLE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)\
-  (DoubleParameter, double, __VA_ARGS__))
-
-
-#define SIMPL_NEW_DATA_ARRAY_PATH_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)\
-  (DataArrayPathParameter, DataArrayPath, __VA_ARGS__))
-
+#define SIMPL_NEW_DOUBLE_FP(...)                                                                                                                                                                       \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)(DoubleParameter, double, __VA_ARGS__))
 
+#define SIMPL_NEW_DATA_ARRAY_PATH_FP(...)                                                                                                                                                              \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4, SIMPL_NEW_FP_3)(DataArrayPathParameter, DataArrayPath,    \
+                                                                                                                                                             __VA_ARGS__))
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 class IFilterParameter
 {
-  public:
-    using Self = IFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    using EnumType = unsigned int;
-    
-    enum class Category : EnumType
-    {
-      Parameter = 0,
-      RequiredArray = 1,
-      CreatedArray = 2,
-      Uncategorized = 3
-    };
-    
-    IFilterParameter(const std::string& humanLabel, const std::string& propertyName, Category category, int groupIndex);
-    
-    virtual ~IFilterParameter();
-
-    /**
-     * @brief Setter property for HumanLabel
-     */
-    void setHumanLabel(const std::string& value);
-    /**
-     * @brief Getter property for HumanLabel
-     * @return Value of HumanLabel
-     */
-    std::string getHumanLabel() const;
-
-    /**
-     * @brief Setter property for PropertyName
-     */
-    void setPropertyName(const std::string& value);
-    /**
-     * @brief Getter property for PropertyName
-     * @return Value of PropertyName
-     */
-    std::string getPropertyName() const;
-
-    /**
-     * @brief Setter property for Category
-     */
-    void setCategory(const Category& value);
-    /**
-     * @brief Getter property for Category
-     * @return Value of Category
-     */
-    Category getCategory() const;
-
-    /**
-     * @brief Setter property for GroupIndex
-     */
-    void setGroupIndex(int value);
-    /**
-     * @brief Getter property for GroupIndex
-     * @return Value of GroupIndex
-     */
-    int getGroupIndex() const;
-
-    virtual void readJson(const QJsonObject& json) = 0;
-    virtual void writeJson(QJsonObject& json) const = 0;
-    
-  private:
-    IFilterParameter(const IFilterParameter&) = delete; // Copy Constructor Not Implemented
-    void operator=(const IFilterParameter&) = delete;   // Move assignment Not Implemented
+public:
+  using Self = IFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  using EnumType = unsigned int;
+
+  enum class Category : EnumType
+  {
+    Parameter = 0,
+    RequiredArray = 1,
+    CreatedArray = 2,
+    Uncategorized = 3
+  };
+
+  IFilterParameter(const std::string& humanLabel, const std::string& propertyName, Category category, int groupIndex);
+
+  virtual ~IFilterParameter();
+
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const std::string& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  std::string getHumanLabel() const;
+
+  /**
+   * @brief Setter property for PropertyName
+   */
+  void setPropertyName(const std::string& value);
+  /**
+   * @brief Getter property for PropertyName
+   * @return Value of PropertyName
+   */
+  std::string getPropertyName() const;
+
+  /**
+   * @brief Setter property for Category
+   */
+  void setCategory(const Category& value);
+  /**
+   * @brief Getter property for Category
+   * @return Value of Category
+   */
+  Category getCategory() const;
+
+  /**
+   * @brief Setter property for GroupIndex
+   */
+  void setGroupIndex(int value);
+  /**
+   * @brief Getter property for GroupIndex
+   * @return Value of GroupIndex
+   */
+  int getGroupIndex() const;
+
+  virtual void readJson(const QJsonObject& json) = 0;
+  virtual void writeJson(QJsonObject& json) const = 0;
+
+private:
+  IFilterParameter(const IFilterParameter&) = delete; // Copy Constructor Not Implemented
+  void operator=(const IFilterParameter&) = delete;   // Move assignment Not Implemented
 };
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 class Int32Parameter : public IFilterParameter
 {
-    
-  public:
-    using Self = Int32Parameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    using SetterCallbackType = std::function<void(int)>;
-    using GetterCallbackType = std::function<int(void)>;
-    
-    
-    static Pointer New(const std::string& humanLabel,
-                       const std::string& propertyName,
-                       int defaultValue,
-                       Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-    virtual ~Int32Parameter();
-
-    /**
-     * @brief Setter property for DefaultValue
-     */
-    void setDefaultValue(int value);
-    /**
-     * @brief Getter property for DefaultValue
-     * @return Value of DefaultValue
-     */
-    int getDefaultValue() const;
-
-    SetterCallbackType getSetterCallback();
-    GetterCallbackType getGetterCallback();
-    
-    void readJson(const QJsonObject& json) override;
-    
-    void writeJson(QJsonObject& json) const override;
-    
-  protected:
-    Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
-    
-  private:
-    Int32Parameter(const Int32Parameter&) = delete; // Copy Constructor Not Implemented
-    void operator=(const Int32Parameter&) = delete; // Move assignment Not Implemented
-
-    SetterCallbackType m_SetterCallback;
-    GetterCallbackType m_GetterCallback;
+
+public:
+  using Self = Int32Parameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  using SetterCallbackType = std::function<void(int)>;
+  using GetterCallbackType = std::function<int(void)>;
+
+  static Pointer New(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  virtual ~Int32Parameter();
+
+  /**
+   * @brief Setter property for DefaultValue
+   */
+  void setDefaultValue(int value);
+  /**
+   * @brief Getter property for DefaultValue
+   * @return Value of DefaultValue
+   */
+  int getDefaultValue() const;
+
+  SetterCallbackType getSetterCallback();
+  GetterCallbackType getGetterCallback();
+
+  void readJson(const QJsonObject& json) override;
+
+  void writeJson(QJsonObject& json) const override;
+
+protected:
+  Int32Parameter(const std::string& humanLabel, const std::string& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                 const GetterCallbackType& getterCallback, int groupIndex);
+
+private:
+  Int32Parameter(const Int32Parameter&) = delete; // Copy Constructor Not Implemented
+  void operator=(const Int32Parameter&) = delete; // Move assignment Not Implemented
+
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
 };
 
 // -----------------------------------------------------------------------------
@@ -243,51 +205,48 @@ class Int32Parameter : public IFilterParameter
 // -----------------------------------------------------------------------------
 class DoubleParameter : public IFilterParameter
 {
-  public:
-    using Self = DoubleParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    using SetterCallbackType = std::function<void(double)>;
-    using GetterCallbackType = std::function<double(void)>;
-    
-    static Pointer New(const std::string& humanLabel,
-                       const std::string& propertyName,
-                       double defaultValue,
-                       Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-    virtual ~DoubleParameter();
-
-    /**
-     * @brief Setter property for DefaultValue
-     */
-    void setDefaultValue(double value);
-    /**
-     * @brief Getter property for DefaultValue
-     * @return Value of DefaultValue
-     */
-    double getDefaultValue() const;
-
-    SetterCallbackType getSetterCallback();
-    GetterCallbackType getGetterCallback();
-    
-    void readJson(const QJsonObject& json) override;
-    
-    void writeJson(QJsonObject& json) const override;
-    
-  protected:
-    DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
-    
-  private:
-    DoubleParameter(const DoubleParameter&) = delete; // Copy Constructor Not Implemented
-    void operator=(const DoubleParameter&) = delete;  // Move assignment Not Implemented
-
-    SetterCallbackType m_SetterCallback;
-    GetterCallbackType m_GetterCallback;
+public:
+  using Self = DoubleParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  using SetterCallbackType = std::function<void(double)>;
+  using GetterCallbackType = std::function<double(void)>;
+
+  static Pointer New(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  virtual ~DoubleParameter();
+
+  /**
+   * @brief Setter property for DefaultValue
+   */
+  void setDefaultValue(double value);
+  /**
+   * @brief Getter property for DefaultValue
+   * @return Value of DefaultValue
+   */
+  double getDefaultValue() const;
+
+  SetterCallbackType getSetterCallback();
+  GetterCallbackType getGetterCallback();
+
+  void readJson(const QJsonObject& json) override;
+
+  void writeJson(QJsonObject& json) const override;
+
+protected:
+  DoubleParameter(const std::string& humanLabel, const std::string& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                  const GetterCallbackType& getterCallback, int groupIndex);
+
+private:
+  DoubleParameter(const DoubleParameter&) = delete; // Copy Constructor Not Implemented
+  void operator=(const DoubleParameter&) = delete;  // Move assignment Not Implemented
+
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
 };
 
 // -----------------------------------------------------------------------------
@@ -295,59 +254,55 @@ class DoubleParameter : public IFilterParameter
 // -----------------------------------------------------------------------------
 class DataArrayPathParameter : public IFilterParameter
 {
-  public:
-    using Self = DataArrayPathParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-    
-    static Pointer New(const std::string& humanLabel,
-                       const std::string& propertyName,
-                       const DataArrayPath& defaultValue,
-                       Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-    
-    virtual ~DataArrayPathParameter();
-
-    /**
-     * @brief Setter property for DefaultValue
-     */
-    void setDefaultValue(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DefaultValue
-     * @return Value of DefaultValue
-     */
-    DataArrayPath getDefaultValue() const;
-
-    SetterCallbackType getSetterCallback();
-    GetterCallbackType getGetterCallback();
-    
-    void readJson(const QJsonObject& json) override;
-    
-    void writeJson(QJsonObject& json) const override;
-    
-  protected:
-    DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath &defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex);
-    
-  private:
-    std::string m_HumanLabel = {};
-    std::string m_PropertyName = {};
-    Category m_Category = {};
-    int m_GroupIndex = {};
-    int m_DefaultInt = {};
-    double m_DefaultDouble = {};
-    DataArrayPath m_DefaultDAP = {};
-
-    DataArrayPathParameter(const DataArrayPathParameter&) = delete; // Copy Constructor Not Implemented
-    void operator=(const DataArrayPathParameter&) = delete;         // Move assignment Not Implemented
-
-    SetterCallbackType m_SetterCallback;
-    GetterCallbackType m_GetterCallback;
+public:
+  using Self = DataArrayPathParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  static Pointer New(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  virtual ~DataArrayPathParameter();
+
+  /**
+   * @brief Setter property for DefaultValue
+   */
+  void setDefaultValue(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DefaultValue
+   * @return Value of DefaultValue
+   */
+  DataArrayPath getDefaultValue() const;
+
+  SetterCallbackType getSetterCallback();
+  GetterCallbackType getGetterCallback();
+
+  void readJson(const QJsonObject& json) override;
+
+  void writeJson(QJsonObject& json) const override;
+
+protected:
+  DataArrayPathParameter(const std::string& humanLabel, const std::string& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                         const GetterCallbackType& getterCallback, int groupIndex);
+
+private:
+  std::string m_HumanLabel = {};
+  std::string m_PropertyName = {};
+  Category m_Category = {};
+  int m_GroupIndex = {};
+  int m_DefaultInt = {};
+  double m_DefaultDouble = {};
+  DataArrayPath m_DefaultDAP = {};
+
+  DataArrayPathParameter(const DataArrayPathParameter&) = delete; // Copy Constructor Not Implemented
+  void operator=(const DataArrayPathParameter&) = delete;         // Move assignment Not Implemented
+
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
 };
-
diff --git a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
index ab7b4ade7d..9a1cef4313 100644
--- a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
@@ -26,7 +26,6 @@
 //#define ADD_DATAARRAYPATH_PARAMETER(Params, Desc, Prop) \
 //  ADD_NEW_FILTER_PARAMETER(Params, DataArrayPathParameter, Desc, Prop, DataArrayPath)
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -35,7 +34,6 @@ namespace Detail
 const QString FilterName("FilterName");
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -62,12 +60,14 @@ int main(int argc, char* argv[])
   {
     dblParam->getSetterCallback()(6.66666);
   }
-  
+
   DataArrayPathParameter::Pointer dapParam = std::dynamic_pointer_cast<DataArrayPathParameter>(params.at(3));
-  if(dapParam) {
+  if(dapParam)
+  {
     std::function<void(DataArrayPath)> dapCallback = dapParam->getSetterCallback();
-    if(dapCallback) {
-      dapCallback(DataArrayPath("Image","CellAM","FeatureIds"));
+    if(dapCallback)
+    {
+      dapCallback(DataArrayPath("Image", "CellAM", "FeatureIds"));
     }
   }
 
@@ -81,7 +81,6 @@ int main(int argc, char* argv[])
   int32Widget_B.parametersUpdated();
   filter.printValues(std::cout);
 
-
   QJsonObject root;
   filter.writeParameters(root);
 
diff --git a/Source/Experimental/FilterCallback/FilterWidget.cpp b/Source/Experimental/FilterCallback/FilterWidget.cpp
index 36c47f1fe1..9e29cfb419 100644
--- a/Source/Experimental/FilterCallback/FilterWidget.cpp
+++ b/Source/Experimental/FilterCallback/FilterWidget.cpp
@@ -60,7 +60,6 @@ void IntFilterParameterWidget::parametersUpdated()
   }
   else
   {
-    std::cout << "Filter Parameter is NOT Int32Parameter"  << std::endl;
+    std::cout << "Filter Parameter is NOT Int32Parameter" << std::endl;
   }
 }
-
diff --git a/Source/Experimental/FilterCallback/FilterWidget.h b/Source/Experimental/FilterCallback/FilterWidget.h
index e900411e50..bbc98ae613 100644
--- a/Source/Experimental/FilterCallback/FilterWidget.h
+++ b/Source/Experimental/FilterCallback/FilterWidget.h
@@ -1,35 +1,26 @@
 
 #pragma once
 
-
-
-
-
 class IFilter;
 class Int32Parameter;
 class IFilterParameter;
 
-
 class IntFilterParameterWidget /* :  Normally be a QWidget class */
 {
 
 public:
   IntFilterParameterWidget(IFilter* filter, Int32Parameter* parameter);
-  
+
   IntFilterParameterWidget(IFilter* filter, IFilterParameter* parameter);
-  
+
   virtual ~IntFilterParameterWidget();
-  
+
   void parametersUpdated();
-  
-private:
 
+private:
   IFilter* m_Filter = nullptr;
   Int32Parameter* m_FilterParameter = nullptr;
 
   IntFilterParameterWidget(const IntFilterParameterWidget&) = delete; // Copy Constructor Not Implemented
   void operator=(const IntFilterParameterWidget&) = delete;           // Move assignment Not Implemented
 };
-
-
-
diff --git a/Source/Experimental/FilterCallback/IFilter.cpp b/Source/Experimental/FilterCallback/IFilter.cpp
index 68b1373c00..4974fd2cad 100644
--- a/Source/Experimental/FilterCallback/IFilter.cpp
+++ b/Source/Experimental/FilterCallback/IFilter.cpp
@@ -1,18 +1,15 @@
 #include "IFilter.h"
 
-
-
-
 #include "FilterParameter.h"
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 IFilter::IFilter()
-  : m_Index(0)
-  , m_Parameter1(std::numeric_limits<int>::max())
-  , m_Parameter2(std::numeric_limits<double>::max())
-  , m_FeatureIdsPath("Foo", "Bar", "FeatureIds")
+: m_Index(0)
+, m_Parameter1(std::numeric_limits<int>::max())
+, m_Parameter2(std::numeric_limits<double>::max())
+, m_FeatureIdsPath("Foo", "Bar", "FeatureIds")
 {
   setupParameters();
 }
@@ -29,12 +26,12 @@ void IFilter::setupParameters()
 {
   std::vector<IFilterParameter::Pointer> params;
   int groupIndex = -1;
-  
-  params.push_back( SIMPL_NEW_INT32_FP("Parameter 1", Parameter1, IFilterParameter::Category::Parameter) );
-  params.push_back( SIMPL_NEW_DOUBLE_FP("Parameter 2", Parameter2, IFilterParameter::Category::Parameter) );
-  params.push_back( SIMPL_NEW_INT32_FP("Index", Index, IFilterParameter::Category::Parameter, groupIndex) );
-  params.push_back( SIMPL_NEW_DATA_ARRAY_PATH_FP("FeatureIdsPath", FeatureIdsPath, IFilterParameter::Category::Parameter, groupIndex) );
-  
+
+  params.push_back(SIMPL_NEW_INT32_FP("Parameter 1", Parameter1, IFilterParameter::Category::Parameter));
+  params.push_back(SIMPL_NEW_DOUBLE_FP("Parameter 2", Parameter2, IFilterParameter::Category::Parameter));
+  params.push_back(SIMPL_NEW_INT32_FP("Index", Index, IFilterParameter::Category::Parameter, groupIndex));
+  params.push_back(SIMPL_NEW_DATA_ARRAY_PATH_FP("FeatureIdsPath", FeatureIdsPath, IFilterParameter::Category::Parameter, groupIndex));
+
   m_FilterParameters = params;
 }
 
@@ -107,12 +104,12 @@ void IFilter::dataCheck()
 // -----------------------------------------------------------------------------
 void IFilter::preflight()
 {
-//  setInPreflight(true);
-//  emit preflightAboutToExecute();
-//  emit updateFilterParameters(this);
-//  dataCheck();
-//  emit preflightExecuted();
-//  setInPreflight(false);
+  //  setInPreflight(true);
+  //  emit preflightAboutToExecute();
+  //  emit updateFilterParameters(this);
+  //  dataCheck();
+  //  emit preflightExecuted();
+  //  setInPreflight(false);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/Experimental/FilterCallback/IFilter.h b/Source/Experimental/FilterCallback/IFilter.h
index 6cf670275e..db21b052df 100644
--- a/Source/Experimental/FilterCallback/IFilter.h
+++ b/Source/Experimental/FilterCallback/IFilter.h
@@ -1,13 +1,10 @@
 
 #pragma once
 
-
-
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-
 #include "FilterParameter.h"
 
 // -----------------------------------------------------------------------------
@@ -15,75 +12,75 @@
 // -----------------------------------------------------------------------------
 class IFilter
 {
-  public:
-    IFilter();
-    
-    virtual ~IFilter();
-    
-    void setupParameters();
-
-    /**
-     * @brief Setter property for Index
-     */
-    void setIndex(int value);
-    /**
-     * @brief Getter property for Index
-     * @return Value of Index
-     */
-    int getIndex() const;
-
-    /**
-     * @brief Setter property for Parameter1
-     */
-    void setParameter1(int value);
-    /**
-     * @brief Getter property for Parameter1
-     * @return Value of Parameter1
-     */
-    int getParameter1() const;
-
-    /**
-     * @brief Setter property for Parameter2
-     */
-    void setParameter2(double value);
-    /**
-     * @brief Getter property for Parameter2
-     * @return Value of Parameter2
-     */
-    double getParameter2() const;
-
-    /**
-     * @brief Setter property for FeatureIdsPath
-     */
-    void setFeatureIdsPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FeatureIdsPath
-     * @return Value of FeatureIdsPath
-     */
-    DataArrayPath getFeatureIdsPath() const;
-
-    void readFilterParameters(QJsonObject& root);
-    
-    void writeParameters(QJsonObject& root);
-    
-    void printValues(std::ostream& out);
-    
-    std::string getName();
-
-    /**
-     * @brief Setter property for InPreflight
-     */
-    void setInPreflight(bool value);
-    /**
-     * @brief Getter property for InPreflight
-     * @return Value of InPreflight
-     */
-    bool getInPreflight() const;
-
-    std::vector<IFilterParameter::Pointer> getFilterParameters();
-    
-    virtual void preflight();
-    #if 0  
+public:
+  IFilter();
+
+  virtual ~IFilter();
+
+  void setupParameters();
+
+  /**
+   * @brief Setter property for Index
+   */
+  void setIndex(int value);
+  /**
+   * @brief Getter property for Index
+   * @return Value of Index
+   */
+  int getIndex() const;
+
+  /**
+   * @brief Setter property for Parameter1
+   */
+  void setParameter1(int value);
+  /**
+   * @brief Getter property for Parameter1
+   * @return Value of Parameter1
+   */
+  int getParameter1() const;
+
+  /**
+   * @brief Setter property for Parameter2
+   */
+  void setParameter2(double value);
+  /**
+   * @brief Getter property for Parameter2
+   * @return Value of Parameter2
+   */
+  double getParameter2() const;
+
+  /**
+   * @brief Setter property for FeatureIdsPath
+   */
+  void setFeatureIdsPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FeatureIdsPath
+   * @return Value of FeatureIdsPath
+   */
+  DataArrayPath getFeatureIdsPath() const;
+
+  void readFilterParameters(QJsonObject& root);
+
+  void writeParameters(QJsonObject& root);
+
+  void printValues(std::ostream& out);
+
+  std::string getName();
+
+  /**
+   * @brief Setter property for InPreflight
+   */
+  void setInPreflight(bool value);
+  /**
+   * @brief Getter property for InPreflight
+   * @return Value of InPreflight
+   */
+  bool getInPreflight() const;
+
+  std::vector<IFilterParameter::Pointer> getFilterParameters();
+
+  virtual void preflight();
+#if 0  
   // These are slots
   virtual void setCancel(bool value);
   
@@ -115,26 +112,23 @@ class IFilter
 * @brief preflightExecuted Emitted just after calling dataCheck()
 */
     void preflightExecuted();
-    #endif
-    
-  protected:
-    void dataCheck();
-    
-  private:
-    int m_Index = {};
-    int m_Parameter1 = {};
-    double m_Parameter2 = {};
-    DataArrayPath m_FeatureIdsPath = {};
-    bool m_InPreflight = {};
-
-    std::vector<IFilterParameter::Pointer> m_FilterParameters;
-
-  public:
-    IFilter(const IFilter&) = delete; // Copy Constructor Not Implemented
-    IFilter(IFilter&&) = delete;      // Move Constructor Not Implemented
-    IFilter& operator=(const IFilter&) = delete; // Copy Assignment Not Implemented
-    IFilter& operator=(IFilter&&) = delete;      // Move Assignment Not Implemented
-};
+#endif
+
+protected:
+  void dataCheck();
 
+private:
+  int m_Index = {};
+  int m_Parameter1 = {};
+  double m_Parameter2 = {};
+  DataArrayPath m_FeatureIdsPath = {};
+  bool m_InPreflight = {};
 
+  std::vector<IFilterParameter::Pointer> m_FilterParameters;
 
+public:
+  IFilter(const IFilter&) = delete;            // Copy Constructor Not Implemented
+  IFilter(IFilter&&) = delete;                 // Move Constructor Not Implemented
+  IFilter& operator=(const IFilter&) = delete; // Copy Assignment Not Implemented
+  IFilter& operator=(IFilter&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/MakeFilterUuid/MakeFilterUuid.cpp b/Source/MakeFilterUuid/MakeFilterUuid.cpp
index 4043511e54..885c9b1c15 100644
--- a/Source/MakeFilterUuid/MakeFilterUuid.cpp
+++ b/Source/MakeFilterUuid/MakeFilterUuid.cpp
@@ -11,7 +11,7 @@
  * @param argv
  * @return
  */
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
 
   QString libName = QString::fromLatin1(argv[1]);
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 4be0a42cb2..29c03a3842 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // C Includes
 #include <cassert>
diff --git a/Source/RESTClient/RESTClientDLLExport.h b/Source/RESTClient/RESTClientDLLExport.h
old mode 100755
new mode 100644
index 0f4a7db06e..fbdbb1f8fd
--- a/Source/RESTClient/RESTClientDLLExport.h
+++ b/Source/RESTClient/RESTClientDLLExport.h
@@ -1,55 +1,50 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
-
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-#if defined (_MSC_VER)
-#pragma warning(disable: 4251)
-#pragma warning(disable: 4710)
-#pragma warning(disable: 4820)
-#pragma warning(disable: 4668)
-#pragma warning(disable: 4265)
-#pragma warning(disable: 4189)
-#pragma warning(disable: 4640)
-#pragma warning(disable: 4996)
-#pragma warning(disable: 4548)
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251)
+#pragma warning(disable : 4710)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 4668)
+#pragma warning(disable : 4265)
+#pragma warning(disable : 4189)
+#pragma warning(disable : 4640)
+#pragma warning(disable : 4996)
+#pragma warning(disable : 4548)
 #endif
 
 /* Cmake will define RESTClient_EXPORTS on Windows when it
@@ -59,19 +54,19 @@ projects by hand you need to define RESTClient_EXPORTS when
 building the RESTClientDatModel DLL on windows.
 */
 
-#if defined (RESTClient_BUILT_AS_DYNAMIC_LIB)
+#if defined(RESTClient_BUILT_AS_DYNAMIC_LIB)
 
-#if defined (RESTClient_EXPORTS)  /* Compiling the RESTClient DLL/Dylib */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  RESTClient_EXPORT __declspec(dllexport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define RESTClient_EXPORT __attribute__ ((visibility("default")))
+#if defined(RESTClient_EXPORTS) /* Compiling the RESTClient DLL/Dylib */
+#if defined(_MSC_VER)           /* MSVC Compiler Case */
+#define RESTClient_EXPORT __declspec(dllexport)
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define RESTClient_EXPORT __attribute__((visibility("default")))
 #endif
-#else  /* Importing the DLL into another project */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  RESTClient_EXPORT __declspec(dllimport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define RESTClient_EXPORT __attribute__ ((visibility("default")))
+#else                 /* Importing the DLL into another project */
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define RESTClient_EXPORT __declspec(dllimport)
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define RESTClient_EXPORT __attribute__((visibility("default")))
 #endif
 #endif
 #endif
@@ -82,24 +77,22 @@ building the RESTClientDatModel DLL on windows.
 #endif
 
 #if 0
-#if defined (_WIN32) || defined __CYGWIN__
+#if defined(_WIN32) || defined __CYGWIN__
 
-#if defined (RESTClient_BUILT_AS_DYNAMIC_LIB)
+#if defined(RESTClient_BUILT_AS_DYNAMIC_LIB)
 #if defined(RESTClient_EXPORTS)
-#define  RESTClient_EXPORT __declspec(dllexport)
+#define RESTClient_EXPORT __declspec(dllexport)
 #else
-#define  RESTClient_EXPORT __declspec(dllimport)
+#define RESTClient_EXPORT __declspec(dllimport)
 #endif /* RESTClient_EXPORTS */
 
 #else
 #define RESTClient_EXPORT
 #endif
 #elif __GNUC__ >= 4
-#define FLOW_DLL __attribute__ ((visibility("default")))
+#define FLOW_DLL __attribute__((visibility("default")))
 #define DLL_LOCAL  __attribute__ ((visibility("hidden")
 #else /* defined (_WIN32) && defined (RESTClient_BUILD_SHARED_LIBS)  */
 #define RESTClient_EXPORT
 #endif
 #endif
-
-
diff --git a/Source/SIMPLib/Common/AppVersion.cpp b/Source/SIMPLib/Common/AppVersion.cpp
index 5add61ae4d..d309ed4867 100644
--- a/Source/SIMPLib/Common/AppVersion.cpp
+++ b/Source/SIMPLib/Common/AppVersion.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AppVersion.h"
 
@@ -70,7 +70,6 @@ AppVersion::AppVersion(const AppVersion& rhs)
 // -----------------------------------------------------------------------------
 AppVersion& AppVersion::operator=(const AppVersion& rhs) = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -88,14 +87,14 @@ bool AppVersion::operator>(const AppVersion& rhs)
   {
     return true;
   }
-  
+
   if(m_MajorNum == rhs.m_MajorNum)
   {
     if(m_MinorNum > rhs.m_MinorNum)
     {
       return true;
     }
-    
+
     if(m_MinorNum == rhs.m_MinorNum)
     {
       return m_PatchNum > rhs.m_PatchNum;
@@ -114,14 +113,14 @@ bool AppVersion::operator<(const AppVersion& rhs)
   {
     return true;
   }
-  
+
   if(m_MajorNum == rhs.m_MajorNum)
   {
     if(m_MinorNum < rhs.m_MinorNum)
     {
       return true;
     }
-    
+
     if(m_MinorNum == rhs.m_MinorNum)
     {
       return m_PatchNum < rhs.m_PatchNum;
diff --git a/Source/SIMPLib/Common/AppVersion.h b/Source/SIMPLib/Common/AppVersion.h
old mode 100755
new mode 100644
index e4459b638c..3ce4892f08
--- a/Source/SIMPLib/Common/AppVersion.h
+++ b/Source/SIMPLib/Common/AppVersion.h
@@ -1,68 +1,68 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include "SIMPLib/SIMPLib.h"
 
 class SIMPLib_EXPORT AppVersion
 {
-  public:
-    AppVersion();
-    AppVersion(int majorNum, int minorNum, int patchNum);
+public:
+  AppVersion();
+  AppVersion(int majorNum, int minorNum, int patchNum);
 
-    AppVersion(const AppVersion&);
-    AppVersion(const AppVersion&&) = delete;
-    AppVersion& operator=(const AppVersion&);
-    AppVersion& operator=(AppVersion&&) = delete;
-    
-    bool operator==(const AppVersion&);
-    bool operator>(const AppVersion&);
-    bool operator<(const AppVersion&);
+  AppVersion(const AppVersion&);
+  AppVersion(const AppVersion&&) = delete;
+  AppVersion& operator=(const AppVersion&);
+  AppVersion& operator=(AppVersion&&) = delete;
 
-    virtual ~AppVersion();
+  bool operator==(const AppVersion&);
+  bool operator>(const AppVersion&);
+  bool operator<(const AppVersion&);
 
-    int getMajorNum();
-    int getMinorNum();
-    int getPatchNum();
+  virtual ~AppVersion();
 
-    void setMajorNum(int major);
-    void setMinorNum(int minor);
-    void setPatchNum(int patch);
+  int getMajorNum();
+  int getMinorNum();
+  int getPatchNum();
 
-  private:
-    int m_MajorNum = -1;
-    int m_MinorNum = -1;
-    int m_PatchNum = -1;
+  void setMajorNum(int major);
+  void setMinorNum(int minor);
+  void setPatchNum(int patch);
+
+private:
+  int m_MajorNum = -1;
+  int m_MinorNum = -1;
+  int m_PatchNum = -1;
 };
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 690733b951..2db5138c89 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -90,739 +90,735 @@ const unsigned int HightoLow = 1;
 const unsigned int UnknownRefFrameZDirection = 2;
 } // namespace RefFrameZDir
 
-  namespace TypeNames
-  {
-    const QString Bool("bool");
-    const QString Float("float");
-    const QString Double("double");
-    const QString Int8("int8_t");
-    const QString UInt8("uint8_t");
-    const QString Int16("int16_t");
-    const QString UInt16("uint16_t");
-    const QString Int32("int32_t");
-    const QString UInt32("uint32_t");
-    const QString Int64("int64_t");
-    const QString UInt64("uint64_t");
-    const QString SizeT("size_t");
-    const QString String("string");
-    const QString StatsDataArray("StatsDataArray");
-    const QString NeighborList("NeighborList<T>");
-    const QString StringArray("StringDataArray");
-    const QString Unknown("Unknown");
-    const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " +
-                                    TypeNames::Int32 + ", " + TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " +
-                                    TypeNames::SizeT);
-  }
-
-  namespace TypeEnums
-  {
-  const int Int8 = 0;
-  const int UInt8 = 1;
-  const int Int16 = 2;
-  const int UInt16 = 3;
-  const int Int32 = 4;
-  const int UInt32 = 5;
-  const int Int64 = 6;
-  const int UInt64 = 7;
-  const int Float = 8;
-  const int Double = 9;
-  const int Bool = 10;
-  const int SizeT = 11;
-
-  const int UnknownType = 12;
-  const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
-                                  TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
-  }
-
-  namespace NumericTypes
-  {
-    namespace Names
-    {
-      const QString Int8("signed   int 8  bit");
-      const QString UInt8("unsigned int 8  bit");
-      const QString Int16("signed   int 16 bit");
-      const QString UInt16("unsigned int 16 bit");
-      const QString Int32("signed   int 32 bit");
-      const QString UInt32("unsigned int 32 bit");
-      const QString Int64("signed   int 64 bit");
-      const QString UInt64("unsigned int 64 bit");
-      const QString Float("       Float 32 bit");
-      const QString Double("      Double 64 bit");
-      const QString Bool("Bool");
-      const QString SizeT("size_t");
-    }
-
-    enum class Type : int
-    {
-      Int8 = 0,
-      UInt8,
-      Int16,
-      UInt16,
-      Int32,
-      UInt32,
-      Int64,
-      UInt64,
-      Float,
-      Double,
-      Bool,
-      SizeT,
-      UnknownNumType
-    };
-
-    const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes::Names::UInt8 + ", " + NumericTypes::Names::Int16 + ", " + NumericTypes::Names::UInt16 + ", " +
-                                    NumericTypes::Names::Int32 + ", " + NumericTypes::Names::UInt32 + ", " + NumericTypes::Names::Int64 + ", " + NumericTypes::Names::UInt64 + ", " +
-                                    NumericTypes::Names::Float + ", " + NumericTypes::Names::Double + ", " + NumericTypes::Names::Bool + ", " + NumericTypes::Names::SizeT);
-  }
-
-  namespace DelimiterTypes
-  {
-    enum class Type : int
-    {
-      Comma = 0,
-      Semicolon = 1,
-      Colon = 2,
-      Tab = 3,
-      Space = 4
-    };
-  }
-
-  namespace ScalarTypes
-  {
-  enum class Type : int
-  {
-    Int8 = 0,
-    UInt8,
-    Int16,
-    UInt16,
-    Int32,
-    UInt32,
-    Int64,
-    UInt64,
-    Float,
-    Double,
-    Bool,
-    SizeT
-  };
-  }
-
-  namespace IO
-  {
-    const QString DAPSettingsHeader("Path");
-  }
-
-
-  namespace Defaults
-  {
-    const QString None("None");
-    const QString AnyPrimitive("Any");
-    const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
-    // const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
-    // const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
-
-    const QString AttributeMatrixName("AttributeMatrix");
-    const QString ElementAttributeMatrixName("ElementAttributeMatrix");
-    const QString FeatureAttributeMatrixName("FeatureAttributeMatrix");
-    const QString EnsembleAttributeMatrixName("EnsembleAttributeMatrix");
-
-    const QString ImageDataContainerName("ImageDataContainer");
-    const QString NewImageDataContainerName("NewImageDataContainer");
-    const QString TriangleDataContainerName("TriangleDataContainer");
-    const QString QuadDataContainerName("QuadDataContainer");
-    const QString TetrahedralDataContainerName("TetrahedralDataContainer");
-    const QString HexahedralDataContainerName("HexahedralDataContainer");
-
-    const QString VertexDataContainerName("VertexDataContainer");
-    const QString VertexAttributeMatrixName("VertexData");
-    const QString VertexFeatureAttributeMatrixName("VertexFeatureData");
-    const QString VertexEnsembleAttributeMatrixName("VertexEnsembleData");
-
-    const QString EdgeDataContainerName("EdgeDataContainer");
-    const QString EdgeAttributeMatrixName("EdgeData");
-    const QString EdgeFeatureAttributeMatrixName("EdgeFeatureData");
-    const QString EdgeEnsembleAttributeMatrixName("EdgeEnsembleData");
-
-    const QString SurfaceDataContainerName("SurfaceDataContainer");
-    const QString FaceAttributeMatrixName("FaceData");
-    const QString FaceFeatureAttributeMatrixName("FaceFeatureData");
-    const QString FaceEnsembleAttributeMatrixName("FaceEnsembleData");
-
-    const QString VolumeDataContainerName("VolumeDataContainer");
-    const QString NewVolumeDataContainerName("NewVolumeDataContainer");
-    const QString CellAttributeMatrixName("CellData");
-    const QString NewCellAttributeMatrixName("NewCellData");
-    const QString CellFeatureAttributeMatrixName("CellFeatureData");
-    const QString NewCellFeatureAttributeMatrixName("NewCellFeatureData");
-    const QString CellEnsembleAttributeMatrixName("CellEnsembleData");
-
-    const QString VoxelDataName("VoxelData");
-
-    const QString SyntheticVolumeDataContainerName("SyntheticVolumeDataContainer");
-    const QString StatsGenerator("StatsGeneratorDataContainer");
-
-    const QString SomePath("SomeDataContainer|SomeAttributeMatrix|SomeDataArray");
-
-    const QString GenericBundleName("GenericBundle");
-    const QString TimeSeriesBundleName("TimeSeriesBundle");
-
-    const QString GenericBundleAttributeMatrixName("GenericBundleAttributeMatrix");
-    const QString TimeSeriesBundleAttributeMatrixName("TimeSeriesBundleAttributeMatrix");
-
-    const QString DataContainerName("DataContainer");
-    const QString NewDataContainerName("NewDataContainer");
-    const QString NewAttributeMatrixName("NewAttributeMatrixName");
-  }
-
-  namespace PipelineVersionNumbers
-  {
-    const int CurrentVersion(6);
-  }
-
-  namespace FilterGroups
-  {
-    const QString CoreFilters("Core");
-    const QString Generic("Generic");
-    const QString IOFilters("IO");
-    const QString ProcessingFilters("Processing");
-    const QString ReconstructionFilters("Reconstruction");
-    const QString SamplingFilters("Sampling");
-    const QString StatisticsFilters("Statistics");    
-    const QString SyntheticBuildingFilters("Synthetic Building");
-    const QString SurfaceMeshingFilters("Surface Meshing");
-    const QString Utilities("Utilities");
-    const QString CustomFilters("Custom");
-    const QString Unsupported("Unsupported");
-  }
-
-  namespace FilterSubGroups
-  {
-    const QString EnsembleStatsFilters("Ensemble");
-    const QString MemoryManagementFilters("Memory/Management");
-    const QString SpatialFilters("Spatial");
-    const QString StatisticsFilters("Statistics");
-    const QString FeatureIdentificationFilters("FeatureIdentification");
-    const QString OutputFilters("Output");
-    const QString InputFilters("Input");
-    const QString ImageFilters("Image");
-    const QString CleanupFilters("Cleanup");
-    const QString ThresholdFilters("Threshold");
-    const QString RegularizationFilters("Regularization");
-    const QString ConversionFilters("Conversion");
-    const QString FusionFilters("Fusion");
-    const QString WarpingFilters("Warping");
-    const QString AlignmentFilters("Alignment");
-    const QString SegmentationFilters("Segmentation");
-    const QString GroupingFilters("Grouping");
-    const QString CropCutFilters("Croping/Cutting");
-    const QString RotationTransformationFilters("Rotating/Transforming");
-    const QString ResolutionFilters("Spacing");
-    const QString MorphologicalFilters("Morphological");
-    const QString PackingFilters("Packing");
-    const QString CrystallographyFilters("Crystallography");
-    const QString GenerationFilters("Generation");
-    const QString SmoothingFilters("Smoothing");
-    const QString CurvatureFilters("Curvature");
-    const QString ConnectivityArrangementFilters("Connectivity/Arrangement");
-    const QString MappingFilters("Mapping");
-    const QString MiscFilters("Misc");
-    const QString GeometryFilters("Geometry");
-    const QString ImportFilters("Import");
-    const QString ExportFilters("Export");
-  }
-
-  namespace GeneralData
-  {
-    const QString CombinedData("CombinedData");
-    const QString ThresholdArray("ThresholdArray");
-    const QString Mask("Mask");
-  }
-
-  namespace CellData
-  {
-    const QString AxisAngles("AxisAngles");
-    const QString BC("BandContrasts");
-    const QString BandContrast("BandContrast");
-    const QString CellPhases("Phases");
-    const QString ConfidenceIndex("Confidence Index");
-    const QString CAxisLocation("CAxisLocation");
-    const QString ConfidenceIndexNoSpace("ConfidenceIndex");
-    const QString Current("Current");
-    const QString DislocationTensors("DislocationTensors");
-    const QString EulerAngles("EulerAngles");
-    const QString EulerColor("EulerColor");
-    const QString FarFeatureQuats("FarFeatureQuats");
-    const QString FarFeatureZoneIds("FarFeatureZoneIds");
-    const QString FitQuality("FitQuality");
-    const QString FlatImageData("FlatImageData");
-    const QString GBEuclideanDistances("GBEuclideanDistances");
-    const QString GBManhattanDistances("GBManhattanDistances");
-    const QString GlobAlpha("GlobAlpha");
-    const QString GoodVoxels("GoodVoxels");
-    const QString FeatureIds("FeatureIds");
-    const QString FeatureReferenceCAxisMisorientations("FeatureReferenceCAxisMisorientations");
-    const QString FeatureReferenceMisorientations("FeatureReferenceMisorientations");
-    const QString IPFColor("IPFColor");
-    const QString ImageData("ImageData");
-    const QString ImageQuality("Image Quality");
-    const QString ImageQualityNoSpace("ImageQuality");
-    const QString KernelAverageMisorientations("KernelAverageMisorientations");
-    const QString Mask("Mask");
-    const QString MotionDirection("MotionDirection");
-    const QString MicroTexVolFrac("MicroTexVolFrac");
-    const QString MisorientationColor("MisorientationColor");
-    const QString ParentDensity("ParentDensity");
-    const QString MTRgKAM("MTRgKAM");
-    const QString NearestNeighbors("NearestNeighbors");
-    const QString ParentIds("ParentIds");
-    const QString Phases("Phases");
-    const QString ProjectedImageMin("ProjectedImageMin");
-    const QString ProjectedImageMax("ProjectedImageMax");
-    const QString ProjectedImageAvg("ProjectedImageAvg");
-    const QString ProjectedImageStd("ProjectedImageStd");
-    const QString ProjectedImageVar("ProjectedImageVar");
-    const QString QPEuclideanDistances("QPEuclideanDistances");
-    const QString QPManhattanDistances("QPManhattanDistances");
-    const QString Quats("Quats");
-    const QString RodriguesColor("RodriguesColor");
-    const QString RodriguesVectors("RodriguesVectors");
-    const QString SolidMeshNodes("SolidMeshNodes");
-    const QString SineParams("SineParams");
-    const QString SolidMeshTetrahedrons("SolidMeshTetrahedrons");
-    const QString Speed("Speed");
-    const QString SurfaceMeshCells("SurfaceMeshCells");
-    const QString BoundaryCells("BoundaryCells");
-    const QString TJManhattanDistances("TJManhattanDistances");
-    const QString TJEuclideanDistances("TJEuclideanDistances");
-    const QString VectorColor("VectorColor");
-    const QString VectorData("VectorData");
-    const QString Histogram("Histogram");
-  }
-
-  namespace FeatureData
-  {
-    const QString FeatureID("Feature_ID");
-    const QString Active("Active");
-    const QString AspectRatios("AspectRatios");
-    const QString AvgCAxes("AvgCAxes");
-    const QString AvgCAxisMisalignments("AvgCAxisMisalignments");
-    const QString LocalCAxisMisalignments("LocalCAxisMisalignments");
-    const QString UnbiasedLocalCAxisMisalignments("UnbiasedLocalCAxisMisalignments");
-    const QString AvgQuats("AvgQuats");
-    const QString AxisEulerAngles("AxisEulerAngles");
-    const QString AxisLengths("AxisLengths");
-    const QString BasalLoadingFactor("BasalLoadingFactor");
-    const QString BiasedFeatures("BiasedFeatures");
-    const QString CAxisMisalignmentList("CAxisMisalignmentList");
-    const QString Centroids("Centroids");
-    const QString ClusteringList("ClusteringList");
-    const QString ElasticStrains("ElasticStrains");
-    const QString EquivalentDiameters("EquivalentDiameters");
-    const QString SaltykovEquivalentDiameters("SaltykovEquivalentDiameters");
-    const QString EulerAngles("EulerAngles");
-    const QString AvgEulerAngles("AvgEulerAngles");
-    const QString F1List("F1List");
-    const QString F1sptList("F1sptList");
-    const QString F7List("F7List");
-    const QString FarFeatureOrientations("FarFeatureOrientations");
-    const QString FeaturePhases("Phases");
-    const QString GoodFeatures("GoodFeatures");
-    const QString FeatureAvgCAxisMisorientations("FeatureAvgCAxisMisorientations");
-    const QString FeatureAvgMisorientations("FeatureAvgMisorientations");
-    const QString FeatureStdevCAxisMisorientations("FeatureStdevCAxisMisorientations");
-    const QString KernelAvgMisorientations("KernelAvgMisorientations");
-    const QString LMG("LMG");
-    const QString LargestCrossSections("LargestCrossSections");
-    const QString Mask("Mask");
-    const QString MTRdensity("MTRdensity");
-    const QString MTRgKAM("MTRgKAM");
-
-    const QString MisorientationList("MisorientationList");
-    const QString NeighborList("NeighborList");
-    const QString NeighborhoodList("NeighborhoodList");
-    const QString Neighborhoods("Neighborhoods");
-    const QString NumCells("NumCells");
-    const QString NumElements("NumElements");
-    const QString NumFeaturesPerParent("NumFeaturesPerParent");
-    const QString NumNeighbors("NumNeighbors");
-    const QString Omega3s("Omega3s");
-    const QString ParentIds("ParentIds");
-    const QString Phases("Phases");
-    const QString Poles("Poles");
-    const QString RGBs("RGBs");
-    const QString Schmids("Schmids");
-    const QString SharedSurfaceAreaList("SharedSurfaceAreaList");
-    const QString SlipSystems("SlipSystems");
-    const QString SurfaceAreaVol("SurfaceAreaVolumeRatio");
-    const QString SurfaceFeatures("SurfaceFeatures");
-    const QString SurfaceElementFractions("SurfaceElementFractions");
-    const QString Volumes("Volumes");
-    const QString AvgMisorientations("AvgMisorientations");
-    const QString mPrimeList("mPrimeList");
-    const QString NumBins("NumBins");
-    const QString ScalarAverages("ScalarAverages");
-
-  }
-
-  namespace EnsembleData
-  {
-    const QString NumFeatures("NumFeatures");
-    const QString VolFractions("VolFractions");
-    const QString TotalSurfaceAreas("TotalSurfaceAreas");
-    const QString CrystalSymmetry("Crystal Symmetry");
-    const QString CrystalStructures("CrystalStructures");
-    const QString PhaseTypes("PhaseTypes");
-    const QString BravaisLattice("BravaisLattice");
-    const QString PrecipitateFractions("PrecipitateFractions");
-    const QString ShapeTypes("ShapeTypes");
-    const QString Statistics("Statistics");
-    const QString PhaseName("PhaseName");
-    const QString LatticeConstants("LatticeConstants");
-    const QString GBCD("GBCD");
-    const QString GBCDdimensions("GBCDdimensions");
-    const QString FitParameters("FitParameters");
-    const QString MaterialName("MaterialName");
-  }
-
-
-  namespace VertexData
-  {
-    const QString AtomVelocities("AtomVelocities");
-    const QString AtomTypes("AtomTypes");
-    const QString AtomFeatureLabels("AtomFeatureLabels");
-    const QString NumberOfArms("NumberOfArms");
-    const QString NodeConstraints("NodeConstraints");
-    const QString SurfaceMeshNodes("Nodes");
-    const QString SurfaceMeshNodeType("NodeType");
-    const QString SurfaceMeshNodeNormals("NodeNormals");
-    const QString SurfaceMeshNodeFaces("NodeFaces");
-  }
-
-  namespace FaceData
-  {
-    const QString SurfaceMeshFaces("Faces");
-    const QString SurfaceMeshFaceIPFColors("IPFColors");
-    const QString SurfaceMeshFaceMisorientationColors("MisorientationColors");
-    const QString SurfaceMeshFaceSchuhMisorientationColors("SchuhMisorientationColors");
-    const QString SurfaceMeshFaceLabels("FaceLabels");
-    const QString SurfaceMeshFacePhases("Phases");
-    const QString SurfaceMeshF1s("F1s");
-    const QString SurfaceMeshF1spts("F1spts");
-    const QString SurfaceMeshF7s("F7s");
-    const QString SurfaceMeshmPrimes("mPrimes");
-    const QString SurfaceMeshVoxels("SurfaceMeshVoxels");
-    const QString SurfaceMeshFaceCentroids("FaceCentroids");
-    const QString SurfaceMeshFaceAreas("FaceAreas");
-    const QString SurfaceMeshTwinBoundary("TwinBoundary");
-    const QString SurfaceMeshTwinBoundaryIncoherence("TwinBoundaryIncoherence");
-    const QString SurfaceMeshTwinBoundarySchmidFactors("TwinBoundarySchmidFactors");
-    const QString SurfaceMeshFaceDihedralAngles("FaceDihedralAngles");
-    const QString SurfaceMeshFaceNormals("FaceNormals");
-    const QString SurfaceMeshFeatureFaceId("FeatureFaceId");
-    const QString SurfaceMeshGaussianCurvatures("GaussianCurvatures");
-    const QString SurfaceMeshMeanCurvatures("MeanCurvatures");
-    const QString SurfaceMeshPrincipalCurvature1("PrincipalCurvature1");
-    const QString SurfaceMeshPrincipalCurvature2("PrincipalCurvature2");
-    const QString SurfaceMeshPrincipalDirection1("PrincipalDirection1");
-    const QString SurfaceMeshPrincipalDirection2("PrincipalDirection2");
-  }
-
-  namespace EdgeData
-  {
-    const QString DislocationIds("DislocationIds");
-    const QString BurgersVectors("BurgersVectors");
-    const QString SlipPlaneNormals("SlipPlaneNormals");
-    const QString SurfaceMeshEdges("SurfaceMeshEdges");
-    const QString SurfaceMeshUniqueEdges("SurfaceMeshUniqueEdges");
-    const QString SurfaceMeshInternalEdges("SurfaceMeshInternalEdges");
-    const QString SurfaceMeshTriangleEdges("SurfaceMeshTriangleEdges");
-    const QString SurfaceMeshEdgeFaces("SurfaceMeshEdgeFaces");
-  }
-
-  namespace Settings
-  {
-    const QString Library("Filter Library");
-    const QString PrebuiltPipelines("Prebuilt Pipelines");
-    const QString FavoritePipelines("Favorite Pipelines");
-    const QString PipelineBuilderGroup("PipelineBuilder");
-    const QString FavoriteConfig("favorite_config");
-    const QString NumFilters("Number_Filters");
-    const QString PipelineName("Name");
-    const QString FilterName("Filter_Name");
-    const QString FilterUuid("Filter_Uuid");
-    const QString FilterVersion("FilterVersion");
-    const QString HumanLabel("Filter_Human_Label");
-    const QString FilterEnabled("Filter_Enabled");
-    const QString GroupName("GroupName");
-    const QString SubGroupName("SubGroupName");
-    const QString BrandingString("BrandingString");
-    const QString CompiledLibraryName("CompiledLibraryName");
-    const QString Version("Version");
-    const QString PipelineBuilderGeomertry("PipelineBuilderGeometry");
-  }
-
-
-  namespace HDF5
-  {
-    const QString FileVersion("7.0");
-    const QString FileVersionName("FileVersion");
-    const QString DREAM3DVersion("DREAM3D Version");
-    const QString ObjectType("ObjectType");
-    const QString Rank("Rank");
-    const QString TupleDimensions("TupleDimensions");
-    const QString ComponentDimensions("ComponentDimensions");
-    const QString AxisDimensions("Tuple Axis Dimensions");
-    const QString DataArrayVersion("DataArrayVersion");
-  }
-
-  namespace StringConstants
-  {
-    const QString Alpha("Alpha");
-    const QString Angle("Angle");
-
-    const QString Average("Average");
-    const QString Axis("Axis");
-    const QString AxisODFWeights("AxisODF-Weights");
-    const QString AxisOrientation("AxisOrientation");
-    const QString Beta("Beta");
-    const QString BetaDistribution("Beta Distribution");
-    const QString BinNumber("BinNumber");
-    const QString BinCount("Bin Count");
-    const QString BinStepSize("Bin Step Size");
-    const QString BoundaryArea("BoundaryArea");
-    const QString BoundaryStatsData("BoundaryStatsData");
-    const QString CellNeighbors("CellNeighbors");
-
-    const QString CellsContainingVert("CellsContainingVert");
-    const QString CellsName("Cells");
-    const QString CrystalStructure("CrystalStructure");
-    const QString DataContainerGroupName("DataContainers");
-    const QString DataContainerBundleGroupName("DataContainerBundles");
-    const QString DataContainerNames("DataContainerNames");
-    const QString MetaDataArrays("MetaDataArrays");
-    const QString MontageGroupName("Montages");
-    const QString DataContainerType("DataContainerType");
-    const QString AttributeMatrixType("AttributeMatrixType");
-
-    const QString Dims("Dims");
-    const QString DistributionType("Distribution Type");
-
-    const QString EdgeNeighbors("EdgeNeighbors");
-    const QString EdgesContainingVert("EdgesContainingVert");
-    const QString EdgesName("Edges");
-    const QString EdgeCentroids("EdgeCentroids");
-    const QString EdgeLengths("EdgeLengths");
-    const QString Euler1("Euler 1");
-    const QString Euler2("Euler 2");
-    const QString Euler3("Euler 3");
-    const QString Exp_k("K");
-
-    const QString FaceNeighbors("FaceNeighbors");
-    const QString FacesContainingVert("FacesContainingVert");
-    const QString FacesName("Faces");
-    const QString TrianglesName("Triangles");
-    const QString TriangleNeighbors("TriangleNeighbors");
-    const QString TrianglesContainingVert("TrianglesContainingVert");
-    const QString TriangleCentroids("TriangleCentroids");
-    const QString TriangleAreas("TriangleAreas");
-    const QString Frequencies("Frequencies");
-
-    const QString QuadsName("Quadrilaterals");
-    const QString QuadNeighbors("QuadrilateralNeighbors");
-    const QString QuadsContainingVert("QuadrilateralsContainingVerts");
-    const QString QuadCentroids("QuadrilateralCentroids");
-    const QString QuadAreas("QuadrilateralAreas");
-
-    const QString TetsName("Tetrahedra");
-    const QString TetNeighbors("TetrahedralNeighbors");
-    const QString TetsContainingVert("TetrahedraContainingVerts");
-    const QString TetCentroids("TetrahedralCentroids");
-    const QString TetVolumes("TetrahedralVolumes");
-
-    const QString HexasName("Hexahedra");
-    const QString HexNeighbors("HexahedralNeighbors");
-    const QString HexasContainingVert("HexahedraContainingVerts");
-    const QString HexCentroids("HexahedralCentroids");
-    const QString HexVolumes("HexahedralVolumes");
-
-    const QString VoxelSizes("VoxelSizes");
-    const QString VertexSizes("VertexSizes");
-
-    const QString GBCD("GBCD");
-    const QString FeatureAvgDisorientation ("FeatureAvgDisorientation");
-    const QString Feature_Diameter_Info("Feature_Diameter_Info");
-    const QString Feature_SizeVBoverA_Distributions("FeatureSize Vs B Over A Distributions");
-    const QString Feature_SizeVCoverA_Distributions("FeatureSize Vs C Over A Distributions");
-    const QString Feature_SizeVNeighbors_Distributions("FeatureSize Vs Neighbors Distributions");
-    const QString Feature_SizeVOmega3_Distributions("FeatureSize Vs Omega3 Distributions");
-    const QString Feature_SizeVClustering_Distributions("FeatureSize Vs Clustering Distributions");
-    const QString Feature_Size_Distribution("FeatureSize Distribution");
-    const QString KernelAvgDisorientation( "KernelAvgDisorientation");
-    const QString LogNormalDistribution("Log Normal Distribution");
-    const QString MDFWeights("MDF-Weights");
-    const QString MatrixStatsData("MatrixStatsData");
-    const QString MeshFaceNeighborLists("MeshFaceNeighborLists");
-    const QString MicroTextureBins("MicroTextureBins");
-    const QString MinimumValue("Minimum Value");
-    const QString MinMaxNoOfBins("MinMaxNoOfBins");
-    const QString MisorientationBins("MisorientationBins");
-    const QString Neighbor_Feature_ID_List( "Neighbor_Feature_ID_List");
-
-    const QString ODF("ODF");
-    const QString ODFWeights("ODF-Weights");
-
-    const QString ParentPhase("Parent Phase");
-    const QString PhaseFraction("PhaseFraction");
-    const QString PhaseType("PhaseType");
-    const QString PipelineGroupName("Pipeline");
-    const QString PipelineVersionName("Pipeline Version");
-    const QString PipelineCurrentName("Current Pipeline");
-    const QString PowerLawDistribution("Power Law Distribution");
-    const QString PrecipitateBoundaryFraction("Precipitate Boundary Fraction");
-    const QString PrecipitateStatsData("PrecipitateStatsData");
-    const QString PrimaryStatsData("PrimaryStatsData");
-    const QString PresetName("PresetName");
-
-    const QString RadialDistFunc("Radial Distribution Function");
-    const QString RdfMinDistance("Min");
-    const QString RdfMaxDistance("Max");
-    const QString RdfBoxDims("BoxDims");
-    const QString RdfBoxRes("BoxRes");
-
-    const QString Sigma("Sigma");
-    const QString StandardDeviation("Standard Deviation");
-    const QString Statistics("Statistics");
-    const QString Stats("Stats");
-    const QString StatsData("StatsData");
-    const QString StatsType("StatsType");
-
-    const QString TransformationStatsData("TransformationStatsData");
-    const QString UnknownDistribution("Unknown Distribution");
-
-    const QString VerticesName("Vertices");
-    const QString VertsName("Verts");
-    const QString ImageName("Image");
-
-    const QString Weight("Weight");
-
-    const QString MetaData("_META_DATA");
-
-    const QString Name("Name");
-    const QString Index("Index");
-  }
-
-  namespace CellType
-  {
-    const QString Quadrilateral("Quadrilateral");
-    const QString Tetrahedron("Tetrahedron");
-    const QString Triangle("Triangle");
-    const QString Face("Face");
-    const QString Edge("Edge");
-    const QString Vertex("Vertex");
-    const QString Node("Node");
-  }
-
-  //namespace PhaseType
-  //{
-  //  //const unsigned int PrimaryPhase = 0;              //!<
-  //  //const unsigned int PrecipitatePhase = 1;          //!<
-  //  //const unsigned int TransformationPhase = 2;       //!<
-  //  //const unsigned int MatrixPhase = 3;              //!<
-  //  //const unsigned int BoundaryPhase = 4;              //!<
-  //  //const unsigned int Unknown = 999;    //!<
-
-  //  const QString Primary("Primary");
-  //  const QString Precipitate("Precipitate");
-  //  const QString Transformation("Transformation");
-  //  const QString Matrix("Matrix");
-  //  const QString Boundary("Boundary");
-  //  const QString UnknownPhase("Unknown");
-  //}
-
-  namespace AlignmentMethod
-  {
-    const unsigned int OuterBoundary = 0;        //!<
-    const unsigned int Misorientation = 1;       //!<
-    const unsigned int MutualInformation = 2;    //!<
-    const unsigned int Count = 3;                //!<
-    const unsigned int UnknownAlignmentMethod = 999;    //!<
-  }
-
-  namespace StatisticsType
-  {
-    const unsigned int Feature_SizeVBoverA = 0;    //!<
-    const unsigned int Feature_SizeVCoverA = 1;        //!<
-    const unsigned int Feature_SizeVNeighbors = 2;     //!<
-    const unsigned int Feature_SizeVOmega3 = 3;        //!<
-    const unsigned int Feature_SizeVClustering = 4;        //!<
-    const unsigned int UnknownStatisticsGroup = 999;    //!<
-
-  }
-
-  namespace DistributionType
-  {
-    const unsigned int Beta = 0;         //!<
-    const unsigned int LogNormal = 1;    //!<
-    const unsigned int Power = 2;        //!<
-    const unsigned int RDFFrequency = 3; //!<
-    const unsigned int RDFMaxMin = 4; //!<
-    const unsigned int UnknownDistributionType = 5;    //!<
-    const unsigned int Count = 6; //!<
-
-    enum ColumnCount
-    {
-      BetaColumnCount = 2,       //!<
-      LogNormalColumnCount = 2,  //!<
-      PowerLawColumnCount = 2,   //!<
-      RawDistDataColumnCount = 1,   //!<
-      UnknownColumCount = 0      //!<
-    };
-
-
-  }
-
-  namespace EulerAngleConversionType
-  {
-    const unsigned int DegreesToRadians = 0; //!<
-    const unsigned int RadiansToDegrees = 1; //!<
-  }
-
-  namespace FlattenImageMethod
-  {
-    const unsigned int Lightness = 0; //!<
-    const unsigned int Average = 1; //!<
-    const unsigned int Luminosity = 2; //!<
-  }
-
-  namespace EulerFrameRotationAxis
-  {
-    const unsigned int RD = 0; //!<
-    const unsigned int TD = 1; //!<
-    const unsigned int ND = 2; //!<
-    const unsigned int None = 3; //!<
-  }
-
-  namespace SampleFrameRotationAxis
-  {
-    const unsigned int X = 0; //!<
-    const unsigned int Y = 1; //!<
-    const unsigned int Z = 2; //!<
-    const unsigned int None = 3; //!<
-  }
-
-  namespace RefFrameRotationAngle
-  {
-    const unsigned int Ninety = 0; //!<
-    const unsigned int oneEighty = 1; //!<
-    const unsigned int twoSeventy = 2; //!<
-    const unsigned int Mirror = 3; //!<
-    const unsigned int Zero = 4; //!<
-  }
-
-  namespace Overlap
-  {
-    const unsigned int Rigid = 0; //!<
-    const unsigned int Progressive = 1; //!<
-    const unsigned int UnknownOverlap = 999; //!<
-  }
+namespace TypeNames
+{
+const QString Bool("bool");
+const QString Float("float");
+const QString Double("double");
+const QString Int8("int8_t");
+const QString UInt8("uint8_t");
+const QString Int16("int16_t");
+const QString UInt16("uint16_t");
+const QString Int32("int32_t");
+const QString UInt32("uint32_t");
+const QString Int64("int64_t");
+const QString UInt64("uint64_t");
+const QString SizeT("size_t");
+const QString String("string");
+const QString StatsDataArray("StatsDataArray");
+const QString NeighborList("NeighborList<T>");
+const QString StringArray("StringDataArray");
+const QString Unknown("Unknown");
+const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " +
+                                TypeNames::Int32 + ", " + TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " +
+                                TypeNames::SizeT);
+} // namespace TypeNames
+
+namespace TypeEnums
+{
+const int Int8 = 0;
+const int UInt8 = 1;
+const int Int16 = 2;
+const int UInt16 = 3;
+const int Int32 = 4;
+const int UInt32 = 5;
+const int Int64 = 6;
+const int UInt64 = 7;
+const int Float = 8;
+const int Double = 9;
+const int Bool = 10;
+const int SizeT = 11;
+
+const int UnknownType = 12;
+const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
+                                TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
+} // namespace TypeEnums
+
+namespace NumericTypes
+{
+namespace Names
+{
+const QString Int8("signed   int 8  bit");
+const QString UInt8("unsigned int 8  bit");
+const QString Int16("signed   int 16 bit");
+const QString UInt16("unsigned int 16 bit");
+const QString Int32("signed   int 32 bit");
+const QString UInt32("unsigned int 32 bit");
+const QString Int64("signed   int 64 bit");
+const QString UInt64("unsigned int 64 bit");
+const QString Float("       Float 32 bit");
+const QString Double("      Double 64 bit");
+const QString Bool("Bool");
+const QString SizeT("size_t");
+} // namespace Names
+
+enum class Type : int
+{
+  Int8 = 0,
+  UInt8,
+  Int16,
+  UInt16,
+  Int32,
+  UInt32,
+  Int64,
+  UInt64,
+  Float,
+  Double,
+  Bool,
+  SizeT,
+  UnknownNumType
+};
+
+const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes::Names::UInt8 + ", " + NumericTypes::Names::Int16 + ", " + NumericTypes::Names::UInt16 + ", " +
+                                NumericTypes::Names::Int32 + ", " + NumericTypes::Names::UInt32 + ", " + NumericTypes::Names::Int64 + ", " + NumericTypes::Names::UInt64 + ", " +
+                                NumericTypes::Names::Float + ", " + NumericTypes::Names::Double + ", " + NumericTypes::Names::Bool + ", " + NumericTypes::Names::SizeT);
+} // namespace NumericTypes
+
+namespace DelimiterTypes
+{
+enum class Type : int
+{
+  Comma = 0,
+  Semicolon = 1,
+  Colon = 2,
+  Tab = 3,
+  Space = 4
+};
+}
+
+namespace ScalarTypes
+{
+enum class Type : int
+{
+  Int8 = 0,
+  UInt8,
+  Int16,
+  UInt16,
+  Int32,
+  UInt32,
+  Int64,
+  UInt64,
+  Float,
+  Double,
+  Bool,
+  SizeT
+};
+}
+
+namespace IO
+{
+const QString DAPSettingsHeader("Path");
+}
+
+namespace Defaults
+{
+const QString None("None");
+const QString AnyPrimitive("Any");
+const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
+// const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
+// const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
+
+const QString AttributeMatrixName("AttributeMatrix");
+const QString ElementAttributeMatrixName("ElementAttributeMatrix");
+const QString FeatureAttributeMatrixName("FeatureAttributeMatrix");
+const QString EnsembleAttributeMatrixName("EnsembleAttributeMatrix");
+
+const QString ImageDataContainerName("ImageDataContainer");
+const QString NewImageDataContainerName("NewImageDataContainer");
+const QString TriangleDataContainerName("TriangleDataContainer");
+const QString QuadDataContainerName("QuadDataContainer");
+const QString TetrahedralDataContainerName("TetrahedralDataContainer");
+const QString HexahedralDataContainerName("HexahedralDataContainer");
+
+const QString VertexDataContainerName("VertexDataContainer");
+const QString VertexAttributeMatrixName("VertexData");
+const QString VertexFeatureAttributeMatrixName("VertexFeatureData");
+const QString VertexEnsembleAttributeMatrixName("VertexEnsembleData");
+
+const QString EdgeDataContainerName("EdgeDataContainer");
+const QString EdgeAttributeMatrixName("EdgeData");
+const QString EdgeFeatureAttributeMatrixName("EdgeFeatureData");
+const QString EdgeEnsembleAttributeMatrixName("EdgeEnsembleData");
+
+const QString SurfaceDataContainerName("SurfaceDataContainer");
+const QString FaceAttributeMatrixName("FaceData");
+const QString FaceFeatureAttributeMatrixName("FaceFeatureData");
+const QString FaceEnsembleAttributeMatrixName("FaceEnsembleData");
+
+const QString VolumeDataContainerName("VolumeDataContainer");
+const QString NewVolumeDataContainerName("NewVolumeDataContainer");
+const QString CellAttributeMatrixName("CellData");
+const QString NewCellAttributeMatrixName("NewCellData");
+const QString CellFeatureAttributeMatrixName("CellFeatureData");
+const QString NewCellFeatureAttributeMatrixName("NewCellFeatureData");
+const QString CellEnsembleAttributeMatrixName("CellEnsembleData");
+
+const QString VoxelDataName("VoxelData");
+
+const QString SyntheticVolumeDataContainerName("SyntheticVolumeDataContainer");
+const QString StatsGenerator("StatsGeneratorDataContainer");
+
+const QString SomePath("SomeDataContainer|SomeAttributeMatrix|SomeDataArray");
+
+const QString GenericBundleName("GenericBundle");
+const QString TimeSeriesBundleName("TimeSeriesBundle");
+
+const QString GenericBundleAttributeMatrixName("GenericBundleAttributeMatrix");
+const QString TimeSeriesBundleAttributeMatrixName("TimeSeriesBundleAttributeMatrix");
+
+const QString DataContainerName("DataContainer");
+const QString NewDataContainerName("NewDataContainer");
+const QString NewAttributeMatrixName("NewAttributeMatrixName");
+} // namespace Defaults
+
+namespace PipelineVersionNumbers
+{
+const int CurrentVersion(6);
+}
+
+namespace FilterGroups
+{
+const QString CoreFilters("Core");
+const QString Generic("Generic");
+const QString IOFilters("IO");
+const QString ProcessingFilters("Processing");
+const QString ReconstructionFilters("Reconstruction");
+const QString SamplingFilters("Sampling");
+const QString StatisticsFilters("Statistics");
+const QString SyntheticBuildingFilters("Synthetic Building");
+const QString SurfaceMeshingFilters("Surface Meshing");
+const QString Utilities("Utilities");
+const QString CustomFilters("Custom");
+const QString Unsupported("Unsupported");
+} // namespace FilterGroups
+
+namespace FilterSubGroups
+{
+const QString EnsembleStatsFilters("Ensemble");
+const QString MemoryManagementFilters("Memory/Management");
+const QString SpatialFilters("Spatial");
+const QString StatisticsFilters("Statistics");
+const QString FeatureIdentificationFilters("FeatureIdentification");
+const QString OutputFilters("Output");
+const QString InputFilters("Input");
+const QString ImageFilters("Image");
+const QString CleanupFilters("Cleanup");
+const QString ThresholdFilters("Threshold");
+const QString RegularizationFilters("Regularization");
+const QString ConversionFilters("Conversion");
+const QString FusionFilters("Fusion");
+const QString WarpingFilters("Warping");
+const QString AlignmentFilters("Alignment");
+const QString SegmentationFilters("Segmentation");
+const QString GroupingFilters("Grouping");
+const QString CropCutFilters("Croping/Cutting");
+const QString RotationTransformationFilters("Rotating/Transforming");
+const QString ResolutionFilters("Spacing");
+const QString MorphologicalFilters("Morphological");
+const QString PackingFilters("Packing");
+const QString CrystallographyFilters("Crystallography");
+const QString GenerationFilters("Generation");
+const QString SmoothingFilters("Smoothing");
+const QString CurvatureFilters("Curvature");
+const QString ConnectivityArrangementFilters("Connectivity/Arrangement");
+const QString MappingFilters("Mapping");
+const QString MiscFilters("Misc");
+const QString GeometryFilters("Geometry");
+const QString ImportFilters("Import");
+const QString ExportFilters("Export");
+} // namespace FilterSubGroups
+
+namespace GeneralData
+{
+const QString CombinedData("CombinedData");
+const QString ThresholdArray("ThresholdArray");
+const QString Mask("Mask");
+} // namespace GeneralData
+
+namespace CellData
+{
+const QString AxisAngles("AxisAngles");
+const QString BC("BandContrasts");
+const QString BandContrast("BandContrast");
+const QString CellPhases("Phases");
+const QString ConfidenceIndex("Confidence Index");
+const QString CAxisLocation("CAxisLocation");
+const QString ConfidenceIndexNoSpace("ConfidenceIndex");
+const QString Current("Current");
+const QString DislocationTensors("DislocationTensors");
+const QString EulerAngles("EulerAngles");
+const QString EulerColor("EulerColor");
+const QString FarFeatureQuats("FarFeatureQuats");
+const QString FarFeatureZoneIds("FarFeatureZoneIds");
+const QString FitQuality("FitQuality");
+const QString FlatImageData("FlatImageData");
+const QString GBEuclideanDistances("GBEuclideanDistances");
+const QString GBManhattanDistances("GBManhattanDistances");
+const QString GlobAlpha("GlobAlpha");
+const QString GoodVoxels("GoodVoxels");
+const QString FeatureIds("FeatureIds");
+const QString FeatureReferenceCAxisMisorientations("FeatureReferenceCAxisMisorientations");
+const QString FeatureReferenceMisorientations("FeatureReferenceMisorientations");
+const QString IPFColor("IPFColor");
+const QString ImageData("ImageData");
+const QString ImageQuality("Image Quality");
+const QString ImageQualityNoSpace("ImageQuality");
+const QString KernelAverageMisorientations("KernelAverageMisorientations");
+const QString Mask("Mask");
+const QString MotionDirection("MotionDirection");
+const QString MicroTexVolFrac("MicroTexVolFrac");
+const QString MisorientationColor("MisorientationColor");
+const QString ParentDensity("ParentDensity");
+const QString MTRgKAM("MTRgKAM");
+const QString NearestNeighbors("NearestNeighbors");
+const QString ParentIds("ParentIds");
+const QString Phases("Phases");
+const QString ProjectedImageMin("ProjectedImageMin");
+const QString ProjectedImageMax("ProjectedImageMax");
+const QString ProjectedImageAvg("ProjectedImageAvg");
+const QString ProjectedImageStd("ProjectedImageStd");
+const QString ProjectedImageVar("ProjectedImageVar");
+const QString QPEuclideanDistances("QPEuclideanDistances");
+const QString QPManhattanDistances("QPManhattanDistances");
+const QString Quats("Quats");
+const QString RodriguesColor("RodriguesColor");
+const QString RodriguesVectors("RodriguesVectors");
+const QString SolidMeshNodes("SolidMeshNodes");
+const QString SineParams("SineParams");
+const QString SolidMeshTetrahedrons("SolidMeshTetrahedrons");
+const QString Speed("Speed");
+const QString SurfaceMeshCells("SurfaceMeshCells");
+const QString BoundaryCells("BoundaryCells");
+const QString TJManhattanDistances("TJManhattanDistances");
+const QString TJEuclideanDistances("TJEuclideanDistances");
+const QString VectorColor("VectorColor");
+const QString VectorData("VectorData");
+const QString Histogram("Histogram");
+} // namespace CellData
+
+namespace FeatureData
+{
+const QString FeatureID("Feature_ID");
+const QString Active("Active");
+const QString AspectRatios("AspectRatios");
+const QString AvgCAxes("AvgCAxes");
+const QString AvgCAxisMisalignments("AvgCAxisMisalignments");
+const QString LocalCAxisMisalignments("LocalCAxisMisalignments");
+const QString UnbiasedLocalCAxisMisalignments("UnbiasedLocalCAxisMisalignments");
+const QString AvgQuats("AvgQuats");
+const QString AxisEulerAngles("AxisEulerAngles");
+const QString AxisLengths("AxisLengths");
+const QString BasalLoadingFactor("BasalLoadingFactor");
+const QString BiasedFeatures("BiasedFeatures");
+const QString CAxisMisalignmentList("CAxisMisalignmentList");
+const QString Centroids("Centroids");
+const QString ClusteringList("ClusteringList");
+const QString ElasticStrains("ElasticStrains");
+const QString EquivalentDiameters("EquivalentDiameters");
+const QString SaltykovEquivalentDiameters("SaltykovEquivalentDiameters");
+const QString EulerAngles("EulerAngles");
+const QString AvgEulerAngles("AvgEulerAngles");
+const QString F1List("F1List");
+const QString F1sptList("F1sptList");
+const QString F7List("F7List");
+const QString FarFeatureOrientations("FarFeatureOrientations");
+const QString FeaturePhases("Phases");
+const QString GoodFeatures("GoodFeatures");
+const QString FeatureAvgCAxisMisorientations("FeatureAvgCAxisMisorientations");
+const QString FeatureAvgMisorientations("FeatureAvgMisorientations");
+const QString FeatureStdevCAxisMisorientations("FeatureStdevCAxisMisorientations");
+const QString KernelAvgMisorientations("KernelAvgMisorientations");
+const QString LMG("LMG");
+const QString LargestCrossSections("LargestCrossSections");
+const QString Mask("Mask");
+const QString MTRdensity("MTRdensity");
+const QString MTRgKAM("MTRgKAM");
+
+const QString MisorientationList("MisorientationList");
+const QString NeighborList("NeighborList");
+const QString NeighborhoodList("NeighborhoodList");
+const QString Neighborhoods("Neighborhoods");
+const QString NumCells("NumCells");
+const QString NumElements("NumElements");
+const QString NumFeaturesPerParent("NumFeaturesPerParent");
+const QString NumNeighbors("NumNeighbors");
+const QString Omega3s("Omega3s");
+const QString ParentIds("ParentIds");
+const QString Phases("Phases");
+const QString Poles("Poles");
+const QString RGBs("RGBs");
+const QString Schmids("Schmids");
+const QString SharedSurfaceAreaList("SharedSurfaceAreaList");
+const QString SlipSystems("SlipSystems");
+const QString SurfaceAreaVol("SurfaceAreaVolumeRatio");
+const QString SurfaceFeatures("SurfaceFeatures");
+const QString SurfaceElementFractions("SurfaceElementFractions");
+const QString Volumes("Volumes");
+const QString AvgMisorientations("AvgMisorientations");
+const QString mPrimeList("mPrimeList");
+const QString NumBins("NumBins");
+const QString ScalarAverages("ScalarAverages");
+
+} // namespace FeatureData
+
+namespace EnsembleData
+{
+const QString NumFeatures("NumFeatures");
+const QString VolFractions("VolFractions");
+const QString TotalSurfaceAreas("TotalSurfaceAreas");
+const QString CrystalSymmetry("Crystal Symmetry");
+const QString CrystalStructures("CrystalStructures");
+const QString PhaseTypes("PhaseTypes");
+const QString BravaisLattice("BravaisLattice");
+const QString PrecipitateFractions("PrecipitateFractions");
+const QString ShapeTypes("ShapeTypes");
+const QString Statistics("Statistics");
+const QString PhaseName("PhaseName");
+const QString LatticeConstants("LatticeConstants");
+const QString GBCD("GBCD");
+const QString GBCDdimensions("GBCDdimensions");
+const QString FitParameters("FitParameters");
+const QString MaterialName("MaterialName");
+} // namespace EnsembleData
+
+namespace VertexData
+{
+const QString AtomVelocities("AtomVelocities");
+const QString AtomTypes("AtomTypes");
+const QString AtomFeatureLabels("AtomFeatureLabels");
+const QString NumberOfArms("NumberOfArms");
+const QString NodeConstraints("NodeConstraints");
+const QString SurfaceMeshNodes("Nodes");
+const QString SurfaceMeshNodeType("NodeType");
+const QString SurfaceMeshNodeNormals("NodeNormals");
+const QString SurfaceMeshNodeFaces("NodeFaces");
+} // namespace VertexData
+
+namespace FaceData
+{
+const QString SurfaceMeshFaces("Faces");
+const QString SurfaceMeshFaceIPFColors("IPFColors");
+const QString SurfaceMeshFaceMisorientationColors("MisorientationColors");
+const QString SurfaceMeshFaceSchuhMisorientationColors("SchuhMisorientationColors");
+const QString SurfaceMeshFaceLabels("FaceLabels");
+const QString SurfaceMeshFacePhases("Phases");
+const QString SurfaceMeshF1s("F1s");
+const QString SurfaceMeshF1spts("F1spts");
+const QString SurfaceMeshF7s("F7s");
+const QString SurfaceMeshmPrimes("mPrimes");
+const QString SurfaceMeshVoxels("SurfaceMeshVoxels");
+const QString SurfaceMeshFaceCentroids("FaceCentroids");
+const QString SurfaceMeshFaceAreas("FaceAreas");
+const QString SurfaceMeshTwinBoundary("TwinBoundary");
+const QString SurfaceMeshTwinBoundaryIncoherence("TwinBoundaryIncoherence");
+const QString SurfaceMeshTwinBoundarySchmidFactors("TwinBoundarySchmidFactors");
+const QString SurfaceMeshFaceDihedralAngles("FaceDihedralAngles");
+const QString SurfaceMeshFaceNormals("FaceNormals");
+const QString SurfaceMeshFeatureFaceId("FeatureFaceId");
+const QString SurfaceMeshGaussianCurvatures("GaussianCurvatures");
+const QString SurfaceMeshMeanCurvatures("MeanCurvatures");
+const QString SurfaceMeshPrincipalCurvature1("PrincipalCurvature1");
+const QString SurfaceMeshPrincipalCurvature2("PrincipalCurvature2");
+const QString SurfaceMeshPrincipalDirection1("PrincipalDirection1");
+const QString SurfaceMeshPrincipalDirection2("PrincipalDirection2");
+} // namespace FaceData
+
+namespace EdgeData
+{
+const QString DislocationIds("DislocationIds");
+const QString BurgersVectors("BurgersVectors");
+const QString SlipPlaneNormals("SlipPlaneNormals");
+const QString SurfaceMeshEdges("SurfaceMeshEdges");
+const QString SurfaceMeshUniqueEdges("SurfaceMeshUniqueEdges");
+const QString SurfaceMeshInternalEdges("SurfaceMeshInternalEdges");
+const QString SurfaceMeshTriangleEdges("SurfaceMeshTriangleEdges");
+const QString SurfaceMeshEdgeFaces("SurfaceMeshEdgeFaces");
+} // namespace EdgeData
+
+namespace Settings
+{
+const QString Library("Filter Library");
+const QString PrebuiltPipelines("Prebuilt Pipelines");
+const QString FavoritePipelines("Favorite Pipelines");
+const QString PipelineBuilderGroup("PipelineBuilder");
+const QString FavoriteConfig("favorite_config");
+const QString NumFilters("Number_Filters");
+const QString PipelineName("Name");
+const QString FilterName("Filter_Name");
+const QString FilterUuid("Filter_Uuid");
+const QString FilterVersion("FilterVersion");
+const QString HumanLabel("Filter_Human_Label");
+const QString FilterEnabled("Filter_Enabled");
+const QString GroupName("GroupName");
+const QString SubGroupName("SubGroupName");
+const QString BrandingString("BrandingString");
+const QString CompiledLibraryName("CompiledLibraryName");
+const QString Version("Version");
+const QString PipelineBuilderGeomertry("PipelineBuilderGeometry");
+} // namespace Settings
+
+namespace HDF5
+{
+const QString FileVersion("7.0");
+const QString FileVersionName("FileVersion");
+const QString DREAM3DVersion("DREAM3D Version");
+const QString ObjectType("ObjectType");
+const QString Rank("Rank");
+const QString TupleDimensions("TupleDimensions");
+const QString ComponentDimensions("ComponentDimensions");
+const QString AxisDimensions("Tuple Axis Dimensions");
+const QString DataArrayVersion("DataArrayVersion");
+} // namespace HDF5
+
+namespace StringConstants
+{
+const QString Alpha("Alpha");
+const QString Angle("Angle");
+
+const QString Average("Average");
+const QString Axis("Axis");
+const QString AxisODFWeights("AxisODF-Weights");
+const QString AxisOrientation("AxisOrientation");
+const QString Beta("Beta");
+const QString BetaDistribution("Beta Distribution");
+const QString BinNumber("BinNumber");
+const QString BinCount("Bin Count");
+const QString BinStepSize("Bin Step Size");
+const QString BoundaryArea("BoundaryArea");
+const QString BoundaryStatsData("BoundaryStatsData");
+const QString CellNeighbors("CellNeighbors");
+
+const QString CellsContainingVert("CellsContainingVert");
+const QString CellsName("Cells");
+const QString CrystalStructure("CrystalStructure");
+const QString DataContainerGroupName("DataContainers");
+const QString DataContainerBundleGroupName("DataContainerBundles");
+const QString DataContainerNames("DataContainerNames");
+const QString MetaDataArrays("MetaDataArrays");
+const QString MontageGroupName("Montages");
+const QString DataContainerType("DataContainerType");
+const QString AttributeMatrixType("AttributeMatrixType");
+
+const QString Dims("Dims");
+const QString DistributionType("Distribution Type");
+
+const QString EdgeNeighbors("EdgeNeighbors");
+const QString EdgesContainingVert("EdgesContainingVert");
+const QString EdgesName("Edges");
+const QString EdgeCentroids("EdgeCentroids");
+const QString EdgeLengths("EdgeLengths");
+const QString Euler1("Euler 1");
+const QString Euler2("Euler 2");
+const QString Euler3("Euler 3");
+const QString Exp_k("K");
+
+const QString FaceNeighbors("FaceNeighbors");
+const QString FacesContainingVert("FacesContainingVert");
+const QString FacesName("Faces");
+const QString TrianglesName("Triangles");
+const QString TriangleNeighbors("TriangleNeighbors");
+const QString TrianglesContainingVert("TrianglesContainingVert");
+const QString TriangleCentroids("TriangleCentroids");
+const QString TriangleAreas("TriangleAreas");
+const QString Frequencies("Frequencies");
+
+const QString QuadsName("Quadrilaterals");
+const QString QuadNeighbors("QuadrilateralNeighbors");
+const QString QuadsContainingVert("QuadrilateralsContainingVerts");
+const QString QuadCentroids("QuadrilateralCentroids");
+const QString QuadAreas("QuadrilateralAreas");
+
+const QString TetsName("Tetrahedra");
+const QString TetNeighbors("TetrahedralNeighbors");
+const QString TetsContainingVert("TetrahedraContainingVerts");
+const QString TetCentroids("TetrahedralCentroids");
+const QString TetVolumes("TetrahedralVolumes");
+
+const QString HexasName("Hexahedra");
+const QString HexNeighbors("HexahedralNeighbors");
+const QString HexasContainingVert("HexahedraContainingVerts");
+const QString HexCentroids("HexahedralCentroids");
+const QString HexVolumes("HexahedralVolumes");
+
+const QString VoxelSizes("VoxelSizes");
+const QString VertexSizes("VertexSizes");
+
+const QString GBCD("GBCD");
+const QString FeatureAvgDisorientation("FeatureAvgDisorientation");
+const QString Feature_Diameter_Info("Feature_Diameter_Info");
+const QString Feature_SizeVBoverA_Distributions("FeatureSize Vs B Over A Distributions");
+const QString Feature_SizeVCoverA_Distributions("FeatureSize Vs C Over A Distributions");
+const QString Feature_SizeVNeighbors_Distributions("FeatureSize Vs Neighbors Distributions");
+const QString Feature_SizeVOmega3_Distributions("FeatureSize Vs Omega3 Distributions");
+const QString Feature_SizeVClustering_Distributions("FeatureSize Vs Clustering Distributions");
+const QString Feature_Size_Distribution("FeatureSize Distribution");
+const QString KernelAvgDisorientation("KernelAvgDisorientation");
+const QString LogNormalDistribution("Log Normal Distribution");
+const QString MDFWeights("MDF-Weights");
+const QString MatrixStatsData("MatrixStatsData");
+const QString MeshFaceNeighborLists("MeshFaceNeighborLists");
+const QString MicroTextureBins("MicroTextureBins");
+const QString MinimumValue("Minimum Value");
+const QString MinMaxNoOfBins("MinMaxNoOfBins");
+const QString MisorientationBins("MisorientationBins");
+const QString Neighbor_Feature_ID_List("Neighbor_Feature_ID_List");
+
+const QString ODF("ODF");
+const QString ODFWeights("ODF-Weights");
+
+const QString ParentPhase("Parent Phase");
+const QString PhaseFraction("PhaseFraction");
+const QString PhaseType("PhaseType");
+const QString PipelineGroupName("Pipeline");
+const QString PipelineVersionName("Pipeline Version");
+const QString PipelineCurrentName("Current Pipeline");
+const QString PowerLawDistribution("Power Law Distribution");
+const QString PrecipitateBoundaryFraction("Precipitate Boundary Fraction");
+const QString PrecipitateStatsData("PrecipitateStatsData");
+const QString PrimaryStatsData("PrimaryStatsData");
+const QString PresetName("PresetName");
+
+const QString RadialDistFunc("Radial Distribution Function");
+const QString RdfMinDistance("Min");
+const QString RdfMaxDistance("Max");
+const QString RdfBoxDims("BoxDims");
+const QString RdfBoxRes("BoxRes");
+
+const QString Sigma("Sigma");
+const QString StandardDeviation("Standard Deviation");
+const QString Statistics("Statistics");
+const QString Stats("Stats");
+const QString StatsData("StatsData");
+const QString StatsType("StatsType");
+
+const QString TransformationStatsData("TransformationStatsData");
+const QString UnknownDistribution("Unknown Distribution");
+
+const QString VerticesName("Vertices");
+const QString VertsName("Verts");
+const QString ImageName("Image");
+
+const QString Weight("Weight");
+
+const QString MetaData("_META_DATA");
+
+const QString Name("Name");
+const QString Index("Index");
+} // namespace StringConstants
+
+namespace CellType
+{
+const QString Quadrilateral("Quadrilateral");
+const QString Tetrahedron("Tetrahedron");
+const QString Triangle("Triangle");
+const QString Face("Face");
+const QString Edge("Edge");
+const QString Vertex("Vertex");
+const QString Node("Node");
+} // namespace CellType
+
+// namespace PhaseType
+//{
+//  //const unsigned int PrimaryPhase = 0;              //!<
+//  //const unsigned int PrecipitatePhase = 1;          //!<
+//  //const unsigned int TransformationPhase = 2;       //!<
+//  //const unsigned int MatrixPhase = 3;              //!<
+//  //const unsigned int BoundaryPhase = 4;              //!<
+//  //const unsigned int Unknown = 999;    //!<
+
+//  const QString Primary("Primary");
+//  const QString Precipitate("Precipitate");
+//  const QString Transformation("Transformation");
+//  const QString Matrix("Matrix");
+//  const QString Boundary("Boundary");
+//  const QString UnknownPhase("Unknown");
+//}
+
+namespace AlignmentMethod
+{
+const unsigned int OuterBoundary = 0;            //!<
+const unsigned int Misorientation = 1;           //!<
+const unsigned int MutualInformation = 2;        //!<
+const unsigned int Count = 3;                    //!<
+const unsigned int UnknownAlignmentMethod = 999; //!<
+} // namespace AlignmentMethod
+
+namespace StatisticsType
+{
+const unsigned int Feature_SizeVBoverA = 0;      //!<
+const unsigned int Feature_SizeVCoverA = 1;      //!<
+const unsigned int Feature_SizeVNeighbors = 2;   //!<
+const unsigned int Feature_SizeVOmega3 = 3;      //!<
+const unsigned int Feature_SizeVClustering = 4;  //!<
+const unsigned int UnknownStatisticsGroup = 999; //!<
+
+} // namespace StatisticsType
+
+namespace DistributionType
+{
+const unsigned int Beta = 0;                    //!<
+const unsigned int LogNormal = 1;               //!<
+const unsigned int Power = 2;                   //!<
+const unsigned int RDFFrequency = 3;            //!<
+const unsigned int RDFMaxMin = 4;               //!<
+const unsigned int UnknownDistributionType = 5; //!<
+const unsigned int Count = 6;                   //!<
+
+enum ColumnCount
+{
+  BetaColumnCount = 2,        //!<
+  LogNormalColumnCount = 2,   //!<
+  PowerLawColumnCount = 2,    //!<
+  RawDistDataColumnCount = 1, //!<
+  UnknownColumCount = 0       //!<
+};
+
+} // namespace DistributionType
+
+namespace EulerAngleConversionType
+{
+const unsigned int DegreesToRadians = 0; //!<
+const unsigned int RadiansToDegrees = 1; //!<
+} // namespace EulerAngleConversionType
+
+namespace FlattenImageMethod
+{
+const unsigned int Lightness = 0;  //!<
+const unsigned int Average = 1;    //!<
+const unsigned int Luminosity = 2; //!<
+} // namespace FlattenImageMethod
+
+namespace EulerFrameRotationAxis
+{
+const unsigned int RD = 0;   //!<
+const unsigned int TD = 1;   //!<
+const unsigned int ND = 2;   //!<
+const unsigned int None = 3; //!<
+} // namespace EulerFrameRotationAxis
+
+namespace SampleFrameRotationAxis
+{
+const unsigned int X = 0;    //!<
+const unsigned int Y = 1;    //!<
+const unsigned int Z = 2;    //!<
+const unsigned int None = 3; //!<
+} // namespace SampleFrameRotationAxis
+
+namespace RefFrameRotationAngle
+{
+const unsigned int Ninety = 0;     //!<
+const unsigned int oneEighty = 1;  //!<
+const unsigned int twoSeventy = 2; //!<
+const unsigned int Mirror = 3;     //!<
+const unsigned int Zero = 4;       //!<
+} // namespace RefFrameRotationAngle
+
+namespace Overlap
+{
+const unsigned int Rigid = 0;            //!<
+const unsigned int Progressive = 1;      //!<
+const unsigned int UnknownOverlap = 999; //!<
+} // namespace Overlap
 
 //  namespace DataContainerType
 //  {
@@ -862,78 +858,78 @@ const unsigned int UnknownRefFrameZDirection = 2;
 
 namespace Geometry
 {
-  const QString Geometry("_SIMPL_GEOMETRY");
-  const QString GeometryName("GeometryName");
-  const QString GeometryType("GeometryType");
-  const QString GeometryTypeName("GeometryTypeName");
-  const QString NumberOfTuples("NumberOfTuples");
-  const QString UnitDimensionality("UnitDimensionality");
-  const QString SpatialDimensionality("SpatialDimensionality");
-
-  const QString AnyGeometry("AnyGeometry");
-  const QString UnknownGeometry("UnkownGeometry");
-  const QString ImageGeometry("ImageGeometry");
-  const QString RectGridGeometry("RectGridGeometry");
-  const QString VertexGeometry("VertexGeometry");
-  const QString EdgeGeometry("EdgeGeometry");
-  const QString TriangleGeometry("TriangleGeometry");
-  const QString QuadGeometry("QuadrilateralGeometry");
-  const QString TetrahedralGeometry("TetrahedralGeometry");
-  const QString HexahedralGeometry("HexahedralGeometry");
-
-  const QString xBoundsList("xBounds");
-  const QString yBoundsList("yBounds");
-  const QString zBoundsList("zBounds");
-  const QString SharedVertexList("SharedVertexList");
-  const QString SharedEdgeList("SharedEdgeList");
-  const QString SharedTriList("SharedTriList");
-  const QString SharedQuadList("SharedQuadList");
-  const QString SharedTetList("SharedTetList");
-  const QString SharedHexList("SharedHexList");
-  const QString UnsharedEdgeList("UnsharedEdgeList");
-  const QString UnsharedFaceList("UnsharedFaceList");
-
-  const QString TransformContainerGroup("TransformContainerGroup");
-  const QString TransformContainer("TransformContainer");
-  const QString CompositeTransformContainer("CompositeTransformContainer");
-  const QString TransformContainerTypeName("TransformContainerTypeName");
-  const QString UnknownTransformContainer("UnknownTransformContainer");
-  const QString TransformContainerParameters("TransformParameters");
-  const QString TransformContainerFixedParameters("TransformFixedParameters");
-  const QString TransformContainerTypeAsString("TransformType");
-  const QString TransformContainerMovingName("TransformMovingName");
-  const QString TransformContainerReferenceName("TransformReferenceName");
-
-  const QString k_Yoctometer("Yoctometer");
-  const QString k_Zeptometer("Zeptometer");
-  const QString k_Attometer("Attometer");
-  const QString k_Femtometer("Femtometer");
-  const QString k_Picometer("Picometer");
-  const QString k_Nanometer("Nanometer");
-  const QString k_Micrometer("Micrometer");
-  const QString k_Millimeter("Millimeter");
-  const QString k_Centimeter("Centimeter");
-  const QString k_Decimeter("Decimeter");
-  const QString k_Meter("Meter");
-  const QString k_Decameter("Decameter");
-  const QString k_Hectometer("Hectometer");
-  const QString k_Kilometer("Kilometer");
-  const QString k_Megameter("Megameter");
-  const QString k_Gigameter("Gigameter");
-  const QString k_Terameter("Terameter");
-  const QString k_Petameter("Petameter");
-  const QString k_Exameter("Exameter");
-  const QString k_Zettameter("Zettameter");
-  const QString k_Yottameter("Yottameter");
-  const QString k_Angstrom("Angstrom");
-  const QString k_Mil("Mil");
-  const QString k_Inch("Inch");
-  const QString k_Foot("Foot");
-  const QString k_Mile("Mile");
-  const QString k_Fathom("Fathom");
-  const QString k_Unspecified("Unspecified");
-  const QString k_Unknown("Unknown");
-}
+const QString Geometry("_SIMPL_GEOMETRY");
+const QString GeometryName("GeometryName");
+const QString GeometryType("GeometryType");
+const QString GeometryTypeName("GeometryTypeName");
+const QString NumberOfTuples("NumberOfTuples");
+const QString UnitDimensionality("UnitDimensionality");
+const QString SpatialDimensionality("SpatialDimensionality");
+
+const QString AnyGeometry("AnyGeometry");
+const QString UnknownGeometry("UnkownGeometry");
+const QString ImageGeometry("ImageGeometry");
+const QString RectGridGeometry("RectGridGeometry");
+const QString VertexGeometry("VertexGeometry");
+const QString EdgeGeometry("EdgeGeometry");
+const QString TriangleGeometry("TriangleGeometry");
+const QString QuadGeometry("QuadrilateralGeometry");
+const QString TetrahedralGeometry("TetrahedralGeometry");
+const QString HexahedralGeometry("HexahedralGeometry");
+
+const QString xBoundsList("xBounds");
+const QString yBoundsList("yBounds");
+const QString zBoundsList("zBounds");
+const QString SharedVertexList("SharedVertexList");
+const QString SharedEdgeList("SharedEdgeList");
+const QString SharedTriList("SharedTriList");
+const QString SharedQuadList("SharedQuadList");
+const QString SharedTetList("SharedTetList");
+const QString SharedHexList("SharedHexList");
+const QString UnsharedEdgeList("UnsharedEdgeList");
+const QString UnsharedFaceList("UnsharedFaceList");
+
+const QString TransformContainerGroup("TransformContainerGroup");
+const QString TransformContainer("TransformContainer");
+const QString CompositeTransformContainer("CompositeTransformContainer");
+const QString TransformContainerTypeName("TransformContainerTypeName");
+const QString UnknownTransformContainer("UnknownTransformContainer");
+const QString TransformContainerParameters("TransformParameters");
+const QString TransformContainerFixedParameters("TransformFixedParameters");
+const QString TransformContainerTypeAsString("TransformType");
+const QString TransformContainerMovingName("TransformMovingName");
+const QString TransformContainerReferenceName("TransformReferenceName");
+
+const QString k_Yoctometer("Yoctometer");
+const QString k_Zeptometer("Zeptometer");
+const QString k_Attometer("Attometer");
+const QString k_Femtometer("Femtometer");
+const QString k_Picometer("Picometer");
+const QString k_Nanometer("Nanometer");
+const QString k_Micrometer("Micrometer");
+const QString k_Millimeter("Millimeter");
+const QString k_Centimeter("Centimeter");
+const QString k_Decimeter("Decimeter");
+const QString k_Meter("Meter");
+const QString k_Decameter("Decameter");
+const QString k_Hectometer("Hectometer");
+const QString k_Kilometer("Kilometer");
+const QString k_Megameter("Megameter");
+const QString k_Gigameter("Gigameter");
+const QString k_Terameter("Terameter");
+const QString k_Petameter("Petameter");
+const QString k_Exameter("Exameter");
+const QString k_Zettameter("Zettameter");
+const QString k_Yottameter("Yottameter");
+const QString k_Angstrom("Angstrom");
+const QString k_Mil("Mil");
+const QString k_Inch("Inch");
+const QString k_Foot("Foot");
+const QString k_Mile("Mile");
+const QString k_Fathom("Fathom");
+const QString k_Unspecified("Unspecified");
+const QString k_Unknown("Unknown");
+} // namespace Geometry
 
 //  namespace GeometryType
 //  {
@@ -952,7 +948,7 @@ namespace XdmfGridType
 const unsigned int PolyData = 0;
 const unsigned int RectilinearGrid = 1;
 const unsigned int UnknownGrid = 0xFFFFFFFF;
-}
+} // namespace XdmfGridType
 
 namespace XdmfCenterType
 {
@@ -961,7 +957,7 @@ const QString Edge("Edge");
 const QString Face("Face");
 const QString Cell("Cell");
 const QString Grid("Grid");
-}
+} // namespace XdmfCenterType
 
 // namespace ShapeType
 //{
@@ -991,7 +987,7 @@ const QString H5VoxelFile("VoxelData.h5voxel");
 const QString VisualizationVizFile("Visualization.vtk");           // 11
 const QString DownSampledVizFile("DownSampled_Visualization.vtk"); // 11
 const QString HDF5FeatureFile("Features.h5feature");
-}
+} // namespace Reconstruction
 
 namespace SyntheticBuilder
 {
@@ -1003,7 +999,7 @@ const QString HDF5FeatureFile("Features.h5feature");
 
 const QString ErrorFile("Error.txt");
 const QString VtkFile("Test.vtk");
-}
+} // namespace SyntheticBuilder
 
 /*   Surface Meshing Related   */
 namespace SurfaceMesh
@@ -1017,12 +1013,12 @@ const signed char QuadPoint = 4;
 const signed char SurfaceDefault = 12;
 const signed char SurfaceTriplePoint = 13;
 const signed char SurfaceQuadPoint = 14;
-}
+} // namespace NodeType
 namespace NodeId
 {
 const signed char Unused = -1;
 }
-}
+} // namespace SurfaceMesh
 
 namespace SolidMeshing
 {
@@ -1031,7 +1027,7 @@ const QString MeshFile("solid_mesh_v5_1.vtk");
 const QString MeshFile2("solid_mesh_v5_2.vtk");
 const QString ElementQualityFile("element_quality_measures_v5.txt");
 const QString VoxelsFile("voxels_v5.txt");
-}
+} // namespace SolidMeshing
 
 namespace Union
 {
@@ -1039,14 +1035,14 @@ namespace Strings
 {
 const QString And("And");
 const QString Or("Or");
-}
+} // namespace Strings
 enum Enumeration
 {
   Operator_And = 0,
   Operator_Or,
   Operator_Unknown
 };
-}
+} // namespace Union
 
 namespace Comparison
 {
@@ -1056,7 +1052,7 @@ const QString LessThan("<");
 const QString GreaterThan(">");
 const QString Equal("=");
 const QString NotEqual("!=");
-}
+} // namespace Strings
 enum Enumeration
 {
   Operator_LessThan = 0,
@@ -1065,14 +1061,14 @@ enum Enumeration
   Operator_NotEqual,
   Operator_Unknown
 };
-}
+} // namespace Comparison
 
 namespace Layout
 {
 const signed int Horizontal = 0;
 const signed int Vertical = 1;
 const signed int Square = 2;
-};
+}; // namespace Layout
 } // namespace SIMPL
 
 namespace Core
@@ -1085,7 +1081,7 @@ namespace Test
 const QString TestPluginFile("TestPlugin");
 const QString TestPluginDisplayName("Test Plugin");
 const QString TestBaseName("Test");
-}
+} // namespace Test
 
 Q_DECLARE_METATYPE(SIMPL::NumericTypes::Type)
 Q_DECLARE_METATYPE(SIMPL::ScalarTypes::Type)
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
index b383feda9c..cd32ef2e41 100644
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CreatedArrayHelpIndexEntry.h"
 
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
old mode 100755
new mode 100644
index 19f502fe27..1ac17360c8
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -44,139 +44,136 @@
 
 class SIMPLib_EXPORT CreatedArrayHelpIndexEntry
 {
-  public:
-    using Self = CreatedArrayHelpIndexEntry;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
-     */
-    static QString ClassName();
-
-    typedef QVector<Pointer> VectorType;
-
-    virtual ~CreatedArrayHelpIndexEntry();
-
-    /**
-     * @brief Setter property for FilterName
-     */
-    void setFilterName(const QString& value);
-    /**
-     * @brief Getter property for FilterName
-     * @return Value of FilterName
-     */
-    QString getFilterName() const;
-
-    /**
-     * @brief Setter property for FilterHumanLabel
-     */
-    void setFilterHumanLabel(const QString& value);
-    /**
-     * @brief Getter property for FilterHumanLabel
-     * @return Value of FilterHumanLabel
-     */
-    QString getFilterHumanLabel() const;
-
-    /**
-     * @brief Setter property for FilterGroup
-     */
-    void setFilterGroup(const QString& value);
-    /**
-     * @brief Getter property for FilterGroup
-     * @return Value of FilterGroup
-     */
-    QString getFilterGroup() const;
-
-    /**
-     * @brief Setter property for FilterSubGroup
-     */
-    void setFilterSubGroup(const QString& value);
-    /**
-     * @brief Getter property for FilterSubGroup
-     * @return Value of FilterSubGroup
-     */
-    QString getFilterSubGroup() const;
-
-    /**
-     * @brief Setter property for ArrayDefaultName
-     */
-    void setArrayDefaultName(const QString& value);
-    /**
-     * @brief Getter property for ArrayDefaultName
-     * @return Value of ArrayDefaultName
-     */
-    QString getArrayDefaultName() const;
-
-    /**
-     * @brief Setter property for ArrayGroup
-     */
-    void setArrayGroup(const QString& value);
-    /**
-     * @brief Getter property for ArrayGroup
-     * @return Value of ArrayGroup
-     */
-    QString getArrayGroup() const;
-
-    /**
-     * @brief Setter property for ArrayType
-     */
-    void setArrayType(const QString& value);
-    /**
-     * @brief Getter property for ArrayType
-     * @return Value of ArrayType
-     */
-    QString getArrayType() const;
-
-    /**
-     * @brief Setter property for ArrayNumComponents
-     */
-    void setArrayNumComponents(int value);
-    /**
-     * @brief Getter property for ArrayNumComponents
-     * @return Value of ArrayNumComponents
-     */
-    int getArrayNumComponents() const;
-
-    /**
-     * @brief Setter property for ArrayDescription
-     */
-    void setArrayDescription(const QString& value);
-    /**
-     * @brief Getter property for ArrayDescription
-     * @return Value of ArrayDescription
-     */
-    QString getArrayDescription() const;
-
-  protected:
-    CreatedArrayHelpIndexEntry();
-
-  public:
-    CreatedArrayHelpIndexEntry(const CreatedArrayHelpIndexEntry&) = delete; // Copy Constructor Not Implemented
-    CreatedArrayHelpIndexEntry(CreatedArrayHelpIndexEntry&&) = delete;      // Move Constructor Not Implemented
-    CreatedArrayHelpIndexEntry& operator=(const CreatedArrayHelpIndexEntry&) = delete; // Copy Assignment Not Implemented
-    CreatedArrayHelpIndexEntry& operator=(CreatedArrayHelpIndexEntry&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QString m_FilterName = {};
-    QString m_FilterHumanLabel = {};
-    QString m_FilterGroup = {};
-    QString m_FilterSubGroup = {};
-    QString m_ArrayDefaultName = {};
-    QString m_ArrayGroup = {};
-    QString m_ArrayType = {};
-    int m_ArrayNumComponents = {};
-    QString m_ArrayDescription = {};
+public:
+  using Self = CreatedArrayHelpIndexEntry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for CreatedArrayHelpIndexEntry
+   */
+  static QString ClassName();
+
+  typedef QVector<Pointer> VectorType;
+
+  virtual ~CreatedArrayHelpIndexEntry();
+
+  /**
+   * @brief Setter property for FilterName
+   */
+  void setFilterName(const QString& value);
+  /**
+   * @brief Getter property for FilterName
+   * @return Value of FilterName
+   */
+  QString getFilterName() const;
+
+  /**
+   * @brief Setter property for FilterHumanLabel
+   */
+  void setFilterHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for FilterHumanLabel
+   * @return Value of FilterHumanLabel
+   */
+  QString getFilterHumanLabel() const;
+
+  /**
+   * @brief Setter property for FilterGroup
+   */
+  void setFilterGroup(const QString& value);
+  /**
+   * @brief Getter property for FilterGroup
+   * @return Value of FilterGroup
+   */
+  QString getFilterGroup() const;
+
+  /**
+   * @brief Setter property for FilterSubGroup
+   */
+  void setFilterSubGroup(const QString& value);
+  /**
+   * @brief Getter property for FilterSubGroup
+   * @return Value of FilterSubGroup
+   */
+  QString getFilterSubGroup() const;
+
+  /**
+   * @brief Setter property for ArrayDefaultName
+   */
+  void setArrayDefaultName(const QString& value);
+  /**
+   * @brief Getter property for ArrayDefaultName
+   * @return Value of ArrayDefaultName
+   */
+  QString getArrayDefaultName() const;
+
+  /**
+   * @brief Setter property for ArrayGroup
+   */
+  void setArrayGroup(const QString& value);
+  /**
+   * @brief Getter property for ArrayGroup
+   * @return Value of ArrayGroup
+   */
+  QString getArrayGroup() const;
+
+  /**
+   * @brief Setter property for ArrayType
+   */
+  void setArrayType(const QString& value);
+  /**
+   * @brief Getter property for ArrayType
+   * @return Value of ArrayType
+   */
+  QString getArrayType() const;
+
+  /**
+   * @brief Setter property for ArrayNumComponents
+   */
+  void setArrayNumComponents(int value);
+  /**
+   * @brief Getter property for ArrayNumComponents
+   * @return Value of ArrayNumComponents
+   */
+  int getArrayNumComponents() const;
+
+  /**
+   * @brief Setter property for ArrayDescription
+   */
+  void setArrayDescription(const QString& value);
+  /**
+   * @brief Getter property for ArrayDescription
+   * @return Value of ArrayDescription
+   */
+  QString getArrayDescription() const;
+
+protected:
+  CreatedArrayHelpIndexEntry();
+
+public:
+  CreatedArrayHelpIndexEntry(const CreatedArrayHelpIndexEntry&) = delete;            // Copy Constructor Not Implemented
+  CreatedArrayHelpIndexEntry(CreatedArrayHelpIndexEntry&&) = delete;                 // Move Constructor Not Implemented
+  CreatedArrayHelpIndexEntry& operator=(const CreatedArrayHelpIndexEntry&) = delete; // Copy Assignment Not Implemented
+  CreatedArrayHelpIndexEntry& operator=(CreatedArrayHelpIndexEntry&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FilterName = {};
+  QString m_FilterHumanLabel = {};
+  QString m_FilterGroup = {};
+  QString m_FilterSubGroup = {};
+  QString m_ArrayDefaultName = {};
+  QString m_ArrayGroup = {};
+  QString m_ArrayType = {};
+  int m_ArrayNumComponents = {};
+  QString m_ArrayDescription = {};
 };
-
-
-
diff --git a/Source/SIMPLib/Common/DocRequestManager.h b/Source/SIMPLib/Common/DocRequestManager.h
old mode 100755
new mode 100644
index de64169512..77b7d54d66
--- a/Source/SIMPLib/Common/DocRequestManager.h
+++ b/Source/SIMPLib/Common/DocRequestManager.h
@@ -37,7 +37,6 @@
 
 #include "SIMPLib/SIMPLib.h"
 
-
 /**
  * @brief The DocRequestManager class is the moderator between low level libraries
  * that request the documentation for a filter be shown to the user in some capacity.
@@ -49,33 +48,31 @@
 class SIMPLib_EXPORT DocRequestManager : public QObject
 {
 
-    Q_OBJECT
-
-  public:
-    DocRequestManager();
-    ~DocRequestManager() override;
+  Q_OBJECT
 
-    static DocRequestManager* Instance();
+public:
+  DocRequestManager();
+  ~DocRequestManager() override;
 
-  public Q_SLOTS:
-    void requestFilterDocs(const QString &filter);
+  static DocRequestManager* Instance();
 
-    void requestFilterDocUrl(const QUrl &filter);
+public Q_SLOTS:
+  void requestFilterDocs(const QString& filter);
 
-  Q_SIGNALS:
+  void requestFilterDocUrl(const QUrl& filter);
 
-    void showFilterDocs(const QString &filter);
+Q_SIGNALS:
 
-    void showFilterDocUrl(const QUrl &url);
+  void showFilterDocs(const QString& filter);
 
-  private:
+  void showFilterDocUrl(const QUrl& url);
 
-     static DocRequestManager *self;
+private:
+  static DocRequestManager* self;
 
-   public:
-     DocRequestManager(const DocRequestManager&) = delete; // Copy Constructor Not Implemented
-     DocRequestManager(DocRequestManager&&) = delete;      // Move Constructor Not Implemented
-     DocRequestManager& operator=(const DocRequestManager&) = delete; // Copy Assignment Not Implemented
-     DocRequestManager& operator=(DocRequestManager&&) = delete;      // Move Assignment Not Implemented
+public:
+  DocRequestManager(const DocRequestManager&) = delete;            // Copy Constructor Not Implemented
+  DocRequestManager(DocRequestManager&&) = delete;                 // Move Constructor Not Implemented
+  DocRequestManager& operator=(const DocRequestManager&) = delete; // Copy Assignment Not Implemented
+  DocRequestManager& operator=(DocRequestManager&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Common/EnsembleInfo.cpp b/Source/SIMPLib/Common/EnsembleInfo.cpp
index a2c8f258e4..47f8e7983a 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.cpp
+++ b/Source/SIMPLib/Common/EnsembleInfo.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "EnsembleInfo.h"
 
diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index b601bd4994..effa5447d7 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QObject>
 
-
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
@@ -123,4 +122,3 @@ class SIMPLib_EXPORT EnsembleInfo : public QObject
 };
 
 Q_DECLARE_METATYPE(EnsembleInfo)
-
diff --git a/Source/SIMPLib/Common/INamedCollection.cpp b/Source/SIMPLib/Common/INamedCollection.cpp
index e0db1805ec..ece674c01a 100644
--- a/Source/SIMPLib/Common/INamedCollection.cpp
+++ b/Source/SIMPLib/Common/INamedCollection.cpp
@@ -59,5 +59,3 @@ INamedCollection::Pointer INamedCollection::NullPointer()
 {
   return Pointer(static_cast<Self*>(nullptr));
 }
-
-
diff --git a/Source/SIMPLib/Common/INamedCollection.h b/Source/SIMPLib/Common/INamedCollection.h
index 4963206d84..2512f75314 100644
--- a/Source/SIMPLib/Common/INamedCollection.h
+++ b/Source/SIMPLib/Common/INamedCollection.h
@@ -48,73 +48,72 @@ class INamedObject;
 class SIMPLib_EXPORT INamedCollection
 {
 public:
-    using Self = INamedCollection;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    INamedCollection();
-    virtual ~INamedCollection();
-
-    INamedCollection(const INamedCollection&) = default;            // Copy Constructor Not Implemented
-    INamedCollection(INamedCollection&&) = default;                 // Move Constructor Not Implemented
-    INamedCollection& operator=(const INamedCollection&) = default; // Copy Assignment Not Implemented
-    INamedCollection& operator=(INamedCollection&&) = default;      // Move Assignment Not Implemented
-
-    using NameList = QStringList;
-
-    /**
-     * @brief Returns the number of items in the collection.
-     * @return
-     */
-    virtual size_t size() const = 0;
-
-    /**
-     * @brief Returns true if the collection is empty.  Returns false otherwise.
-     * @return
-     */
-    virtual bool isEmpty() const = 0;
-
-    /**
-     * @brief Clears the collection of all items.
-     */
-    virtual void clear() = 0;
-
-    /**
-     * @brief Erases any item with the given name.
-     * @param name
-     */
-    virtual void erase(const QString& name) = 0;
-
-    /**
-     * @brief Returns true if the collection contains an item with the given name.
-     * Returns false otherwise.
-     * @param name
-     * @return
-     */
-    virtual bool contains(const QString& name) const = 0;
-
-    /**
-     * @brief Returns a list of all names in the collection.
-     * @return
-     */
-    virtual NameList getNameList() const = 0;
-
-  protected:
-    /**
-     * @brief Alerts the INamedObject that it has been added to a collection.
-     * @param obj
-     */
-    void handleAddingObject(INamedObject* obj);
-
-    /**
-     * @brief Alerts the INamedObject that it has been removed from a collection.
-     * @param obj
-     */
-    void handleRemovingObject(INamedObject* obj);
-
-  private:
-
+  using Self = INamedCollection;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  INamedCollection();
+  virtual ~INamedCollection();
+
+  INamedCollection(const INamedCollection&) = default;            // Copy Constructor Not Implemented
+  INamedCollection(INamedCollection&&) = default;                 // Move Constructor Not Implemented
+  INamedCollection& operator=(const INamedCollection&) = default; // Copy Assignment Not Implemented
+  INamedCollection& operator=(INamedCollection&&) = default;      // Move Assignment Not Implemented
+
+  using NameList = QStringList;
+
+  /**
+   * @brief Returns the number of items in the collection.
+   * @return
+   */
+  virtual size_t size() const = 0;
+
+  /**
+   * @brief Returns true if the collection is empty.  Returns false otherwise.
+   * @return
+   */
+  virtual bool isEmpty() const = 0;
+
+  /**
+   * @brief Clears the collection of all items.
+   */
+  virtual void clear() = 0;
+
+  /**
+   * @brief Erases any item with the given name.
+   * @param name
+   */
+  virtual void erase(const QString& name) = 0;
+
+  /**
+   * @brief Returns true if the collection contains an item with the given name.
+   * Returns false otherwise.
+   * @param name
+   * @return
+   */
+  virtual bool contains(const QString& name) const = 0;
+
+  /**
+   * @brief Returns a list of all names in the collection.
+   * @return
+   */
+  virtual NameList getNameList() const = 0;
+
+protected:
+  /**
+   * @brief Alerts the INamedObject that it has been added to a collection.
+   * @param obj
+   */
+  void handleAddingObject(INamedObject* obj);
+
+  /**
+   * @brief Alerts the INamedObject that it has been removed from a collection.
+   * @param obj
+   */
+  void handleRemovingObject(INamedObject* obj);
+
+private:
 };
diff --git a/Source/SIMPLib/Common/INamedObject.cpp b/Source/SIMPLib/Common/INamedObject.cpp
index ce6c13ffca..f910671bb1 100644
--- a/Source/SIMPLib/Common/INamedObject.cpp
+++ b/Source/SIMPLib/Common/INamedObject.cpp
@@ -138,5 +138,3 @@ INamedObject::Pointer INamedObject::NullPointer()
 {
   return Pointer(static_cast<Self*>(nullptr));
 }
-
-
diff --git a/Source/SIMPLib/Common/INamedObject.h b/Source/SIMPLib/Common/INamedObject.h
index b94cd379f5..989bd9f13b 100644
--- a/Source/SIMPLib/Common/INamedObject.h
+++ b/Source/SIMPLib/Common/INamedObject.h
@@ -55,13 +55,12 @@ class SIMPLib_EXPORT INamedObject
   friend INamedCollection;
 
 public:
-    using Self = INamedObject;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
+  using Self = INamedObject;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
   using HashType = size_t;
   using ParentCollectionType = std::set<INamedCollection*>;
@@ -126,7 +125,6 @@ class SIMPLib_EXPORT INamedObject
   INamedObject(const QString& name);
 
 private:
-
   /**
    * @brief Adds the collection to the list of parents.
    * @param collection
diff --git a/Source/SIMPLib/Common/IObserver.cpp b/Source/SIMPLib/Common/IObserver.cpp
index 269fb09dda..c96a36d0d3 100644
--- a/Source/SIMPLib/Common/IObserver.cpp
+++ b/Source/SIMPLib/Common/IObserver.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IObserver.h"
 
diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
old mode 100755
new mode 100644
index 575298cc9a..0428284c06
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -1,67 +1,64 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 class SIMPLib_EXPORT IObserver
 {
-  public:
-    IObserver();
-    virtual ~IObserver();
-    /**
-     * @brief Returns the name of the class for IObserver
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for IObserver
-     */
-    static QString ClassName();
+public:
+  IObserver();
+  virtual ~IObserver();
+  /**
+   * @brief Returns the name of the class for IObserver
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for IObserver
+   */
+  static QString ClassName();
 
-    virtual void processPipelineMessage(const AbstractMessage::Pointer& pm);
+  virtual void processPipelineMessage(const AbstractMessage::Pointer& pm);
 
-  public:
-    IObserver(const IObserver&) = delete;      // Copy Constructor Not Implemented
-    IObserver(IObserver&&) = delete;           // Move Constructor Not Implemented
-    IObserver& operator=(const IObserver&) = delete; // Copy Assignment Not Implemented
-    IObserver& operator=(IObserver&&) = delete;      // Move Assignment Not Implemented
+public:
+  IObserver(const IObserver&) = delete;            // Copy Constructor Not Implemented
+  IObserver(IObserver&&) = delete;                 // Move Constructor Not Implemented
+  IObserver& operator=(const IObserver&) = delete; // Copy Assignment Not Implemented
+  IObserver& operator=(IObserver&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index 3aa037ec92..240864b14f 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "Observable.h"
 
@@ -70,7 +70,7 @@ void Observable::operator=(const Observable&)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::setErrorCondition(int code, const QString &messageText)
+void Observable::setErrorCondition(int code, const QString& messageText)
 {
   GenericErrorMessage::Pointer pm = GenericErrorMessage::New(messageText, code);
   emit messageGenerated(pm);
@@ -79,7 +79,7 @@ void Observable::setErrorCondition(int code, const QString &messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::setErrorConditionWithPrefix(int code, const QString &prefix, const QString &messageText)
+void Observable::setErrorConditionWithPrefix(int code, const QString& prefix, const QString& messageText)
 {
   QString msg = messageText;
   msg.prepend(tr("%1 - ").arg(prefix));
@@ -99,7 +99,7 @@ void Observable::setWarningCondition(int code, const QString& messageText)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void Observable::setWarningConditionWithPrefix(int code, const QString &prefix, const QString &messageText)
+void Observable::setWarningConditionWithPrefix(int code, const QString& prefix, const QString& messageText)
 {
   QString msg = messageText;
   msg.prepend(tr("%1 - ").arg(prefix));
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
old mode 100755
new mode 100644
index d01f4d0efd..bb8e1a9265
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +40,6 @@
 
 #include "SIMPLib/Messages/AbstractMessage.h"
 
-
 /**
  * @class Observable Observable.h DREAM3D/Common/Observable.h
  * @brief
@@ -52,67 +50,65 @@
  */
 class SIMPLib_EXPORT Observable : public QObject
 {
-    Q_OBJECT
+  Q_OBJECT
 
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(Observable)
-    PYB11_METHOD(void setErrorCondition ARGS code messageText)
-    PYB11_METHOD(void setErrorConditionWithPrefix ARGS code prefix messageText)
-    PYB11_METHOD(void setWarningCondition ARGS code messageText)
-    PYB11_METHOD(void setWarningConditionWithPrefix ARGS code prefix messageText)
-    PYB11_METHOD(void notifyStatusMessage ARGS messageText)
-    PYB11_METHOD(void notifyStatusMessageWithPrefix ARGS prefix messageText)
-    PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
-    PYB11_METHOD(void notifyProgressMessageWithPrefix ARGS progress prefix messageText)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(Observable)
+  PYB11_METHOD(void setErrorCondition ARGS code messageText)
+  PYB11_METHOD(void setErrorConditionWithPrefix ARGS code prefix messageText)
+  PYB11_METHOD(void setWarningCondition ARGS code messageText)
+  PYB11_METHOD(void setWarningConditionWithPrefix ARGS code prefix messageText)
+  PYB11_METHOD(void notifyStatusMessage ARGS messageText)
+  PYB11_METHOD(void notifyStatusMessageWithPrefix ARGS prefix messageText)
+  PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
+  PYB11_METHOD(void notifyProgressMessageWithPrefix ARGS progress prefix messageText)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 
-  public:
-    /**
-     * @brief Returns the name of the class for Observable
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for Observable
-     */
-    static QString ClassName();
+public:
+  /**
+   * @brief Returns the name of the class for Observable
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for Observable
+   */
+  static QString ClassName();
 
-    Observable();
+  Observable();
 
-    Observable(const Observable& rhs);
+  Observable(const Observable& rhs);
 
-    ~Observable() override;
+  ~Observable() override;
 
-    void operator=(const Observable&);
+  void operator=(const Observable&);
 
-    // ------------------------------
-    // These are convenience methods that construct a @see AbstractMessage object and then 'emit' that object
-    // ------------------------------
-    virtual void setErrorCondition(int code, const QString& messageText);
+  // ------------------------------
+  // These are convenience methods that construct a @see AbstractMessage object and then 'emit' that object
+  // ------------------------------
+  virtual void setErrorCondition(int code, const QString& messageText);
 
-    void setErrorConditionWithPrefix(int code, const QString &prefix, const QString& messageText);
+  void setErrorConditionWithPrefix(int code, const QString& prefix, const QString& messageText);
 
-    virtual void setWarningCondition(int code, const QString& messageText);
+  virtual void setWarningCondition(int code, const QString& messageText);
 
-    void setWarningConditionWithPrefix(int code, const QString &prefix, const QString& messageText);
+  void setWarningConditionWithPrefix(int code, const QString& prefix, const QString& messageText);
 
-    virtual void notifyStatusMessage(const QString& messageText) const;
+  virtual void notifyStatusMessage(const QString& messageText) const;
 
-    void notifyStatusMessageWithPrefix(const QString& prefix, const QString& messageText) const;
+  void notifyStatusMessageWithPrefix(const QString& prefix, const QString& messageText) const;
 
-    virtual void notifyProgressMessage(int progress, const QString& messageText) const;
+  virtual void notifyProgressMessage(int progress, const QString& messageText) const;
 
-    void notifyProgressMessageWithPrefix(int progress, const QString& prefix, const QString& messageText) const;
+  void notifyProgressMessageWithPrefix(int progress, const QString& prefix, const QString& messageText) const;
 
-  signals:
+signals:
 
-    /**
-     * @brief messageGenerated This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
-     * @param msg
-     */
-    void messageGenerated(const AbstractMessage::Pointer& msg) const;
+  /**
+   * @brief messageGenerated This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
+   * @param msg
+   */
+  void messageGenerated(const AbstractMessage::Pointer& msg) const;
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Common/Observer.cpp b/Source/SIMPLib/Common/Observer.cpp
index fd907128e2..276e0fd479 100644
--- a/Source/SIMPLib/Common/Observer.cpp
+++ b/Source/SIMPLib/Common/Observer.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "Observer.h"
 
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
old mode 100755
new mode 100644
index a4bcdcd0fb..dc8fcc588c
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QObject>
 
 #include "SIMPLib/SIMPLib.h"
@@ -54,31 +52,29 @@
  */
 class SIMPLib_EXPORT Observer : public QObject, public IObserver
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    Observer();
-    /**
-     * @brief Returns the name of the class for Observer
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for Observer
-     */
-    static QString ClassName();
+public:
+  Observer();
+  /**
+   * @brief Returns the name of the class for Observer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for Observer
+   */
+  static QString ClassName();
 
-    ~Observer() override;
+  ~Observer() override;
 
-  public slots:
-    void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
+public slots:
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
-  public:
-    Observer(const Observer&) = delete;       // Copy Constructor Not Implemented
-    Observer(Observer&&) = delete;            // Move Constructor Not Implemented
-    Observer& operator=(const Observer&) = delete; // Copy Assignment Not Implemented
-    Observer& operator=(Observer&&) = delete;      // Move Assignment Not Implemented
+public:
+  Observer(const Observer&) = delete;            // Copy Constructor Not Implemented
+  Observer(Observer&&) = delete;                 // Move Constructor Not Implemented
+  Observer& operator=(const Observer&) = delete; // Copy Assignment Not Implemented
+  Observer& operator=(Observer&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Common/PhaseType.cpp b/Source/SIMPLib/Common/PhaseType.cpp
index c4c9ef7d56..5d23b159a9 100644
--- a/Source/SIMPLib/Common/PhaseType.cpp
+++ b/Source/SIMPLib/Common/PhaseType.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PhaseType.h"
 
@@ -50,7 +50,7 @@ PhaseType::~PhaseType() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<PhaseType::EnumType> PhaseType::ToQVector(Types &types)
+QVector<PhaseType::EnumType> PhaseType::ToQVector(Types& types)
 {
   QVector<PhaseType::EnumType> vec(types.size());
   for(int i = 0; i < types.size(); i++)
@@ -63,7 +63,7 @@ QVector<PhaseType::EnumType> PhaseType::ToQVector(Types &types)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PhaseType::Types PhaseType::FromQVector(QVector<PhaseType::EnumType> &vec)
+PhaseType::Types PhaseType::FromQVector(QVector<PhaseType::EnumType>& vec)
 {
   PhaseType::Types types(vec.size());
   for(int i = 0; i < vec.size(); i++)
diff --git a/Source/SIMPLib/Common/PhaseType.h b/Source/SIMPLib/Common/PhaseType.h
old mode 100755
new mode 100644
index eacf31cbcc..840d34d6bf
--- a/Source/SIMPLib/Common/PhaseType.h
+++ b/Source/SIMPLib/Common/PhaseType.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,7 +39,6 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
-
 #include "SIMPLib/SIMPLib.h"
 
 /**
@@ -62,7 +61,7 @@ class SIMPLib_EXPORT PhaseType
     Transformation = 2, //!<
     Matrix = 3,         //!<
     Boundary = 4,       //!<
-    Unknown = 999,   //!<
+    Unknown = 999,      //!<
     Any = 4294967295U
 
   };
@@ -75,7 +74,7 @@ class SIMPLib_EXPORT PhaseType
    * @param types
    * @return
    */
-  static QVector<EnumType> ToQVector(Types &types);
+  static QVector<EnumType> ToQVector(Types& types);
 
   /**
    * @brief Converts <b>From</b> a QVector<EnumType> to QVector<Type>. Useful for
@@ -83,7 +82,7 @@ class SIMPLib_EXPORT PhaseType
    * @param types
    * @return
    */
-  static Types FromQVector(QVector<EnumType> &types);
+  static Types FromQVector(QVector<EnumType>& types);
 
   /**
    * @brief PrimaryStr
@@ -165,4 +164,3 @@ class SIMPLib_EXPORT PhaseType
 
 Q_DECLARE_METATYPE(PhaseType::Type)
 Q_DECLARE_METATYPE(PhaseType::Types)
-
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 848cf798c8..2f7ec45337 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -340,6 +340,7 @@ template <typename T>
 class IVec3 : public SIMPLArray<T, 3>
 {
   using ParentType = SIMPLArray<T, 3>;
+
 public:
   IVec3(const IVec3&) = default;
   IVec3(IVec3&&) noexcept = default;
@@ -464,9 +465,11 @@ class IVec3 : public SIMPLArray<T, 3>
 };
 
 // -----------------------------------------------------------------------------
-template <typename T> class IVec4 : public SIMPLArray<T, 4>
+template <typename T>
+class IVec4 : public SIMPLArray<T, 4>
 {
   using ParentType = SIMPLArray<T, 4>;
+
 public:
   IVec4(const IVec4&) = default;
   IVec4(IVec4&&) noexcept = default;
diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
index eaa848d7e4..2ff965857b 100644
--- a/Source/SIMPLib/Common/SIMPLPythonMacros.h
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -194,9 +194,9 @@
 #define PYB11_METHOD(...)
 
 /**
-* @brief PYB11_FILTER This macro is used to flag the class as being a filter class.
-* This will make the generator create a Pythonic interface for this filter.
-*/
+ * @brief PYB11_FILTER This macro is used to flag the class as being a filter class.
+ * This will make the generator create a Pythonic interface for this filter.
+ */
 #define PYB11_FILTER(...)
 
 // End of PYBIND11 Macro Definitions
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
index ad34f481ed..66bde0f602 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.h
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT SIMPLRange3D
 
   SIMPLRange3D();
   SIMPLRange3D(size_t x, size_t y, size_t z);
-  SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax); 
+  SIMPLRange3D(size_t xMin, size_t xMax, size_t yMin, size_t yMax, size_t zMin, size_t zMax);
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   SIMPLRange3D(const tbb::blocked_range3d<size_t>& r);
 #endif
diff --git a/Source/SIMPLib/Common/SIMPLibDLLExport.h b/Source/SIMPLib/Common/SIMPLibDLLExport.h
old mode 100755
new mode 100644
index 3479f23e97..3ee6ed2ad0
--- a/Source/SIMPLib/Common/SIMPLibDLLExport.h
+++ b/Source/SIMPLib/Common/SIMPLibDLLExport.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 /* Cmake will define SIMPLib_EXPORTS on Windows when it
 configures to build a shared library. If you are going to use
 another build system on windows or create the visual studio
@@ -44,21 +42,21 @@ projects by hand you need to define SIMPLib_EXPORTS when
 building on Windows with MSVC.
 */
 
-#if defined (SIMPLib_BUILT_AS_DYNAMIC_LIB)
+#if defined(SIMPLib_BUILT_AS_DYNAMIC_LIB)
 
 #if defined(SIMPLib_EXPORTS) /* Compiling the SIMPLib DLL/Dylib */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  SIMPLib_EXPORT __declspec(dllexport)
+#if defined(_MSC_VER)        /* MSVC Compiler Case */
+#define SIMPLib_EXPORT __declspec(dllexport)
 #define EXPIMP_TEMPLATE
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define SIMPLib_EXPORT __attribute__ ((visibility("default")))
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define SIMPLib_EXPORT __attribute__((visibility("default")))
 #endif
-#else  /* Importing the DLL into another project */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  SIMPLib_EXPORT __declspec(dllimport)
+#else                 /* Importing the DLL into another project */
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define SIMPLib_EXPORT __declspec(dllimport)
 #define EXPIMP_TEMPLATE extern
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define SIMPLib_EXPORT __attribute__ ((visibility("default")))
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define SIMPLib_EXPORT __attribute__((visibility("default")))
 #endif
 #endif
 #endif
@@ -73,24 +71,22 @@ building on Windows with MSVC.
 #endif
 
 #if 0
-#if defined (_WIN32) || defined __CYGWIN__
+#if defined(_WIN32) || defined __CYGWIN__
 
-#if defined (DREAM3D_BUILT_AS_DYNAMIC_LIB)
+#if defined(DREAM3D_BUILT_AS_DYNAMIC_LIB)
 #if defined(SIMPLib_EXPORTS)
-#define  SIMPLib_EXPORT __declspec(dllexport)
+#define SIMPLib_EXPORT __declspec(dllexport)
 #else
-#define  SIMPLib_EXPORT __declspec(dllimport)
+#define SIMPLib_EXPORT __declspec(dllimport)
 #endif /* SIMPLib_EXPORTS */
 
 #else
 #define SIMPLib_EXPORT
 #endif
 #elif __GNUC__ >= 4
-#define FLOW_DLL __attribute__ ((visibility("default")))
+#define FLOW_DLL __attribute__((visibility("default")))
 #define DLL_LOCAL  __attribute__ ((visibility("hidden")
 #else /* defined (_WIN32) && defined (DREAM3D_BUILD_SHARED_LIBS)  */
 #define SIMPLib_EXPORT
 #endif
 #endif
-
-
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
old mode 100755
new mode 100644
index 5188d70e2e..1a7374da12
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <cstring>
 #include <sstream>
 #include <stdexcept>
@@ -54,57 +53,59 @@
 //-- C++11 Includes
 #include <memory>
 
-
-#define COPY_ARRAY_3(var, obj)\
-  (var)[0] = (obj)->(var)[0]; (var)[1] = (obj)->(var)[1]; (var)[2] = (obj)->(var)[2];
-
-#define COPY_ARRAY_4(var, obj)\
-  (var)[0] = (obj)->(var)[0]; (var)[1] = (obj)->(var)[1];\
-  (var)[2] = (obj)->(var)[2]; (var)[3] = (obj)->(var)[3];
-
-#define COPY_ARRAY_5(var, obj)\
-  (var)[0] = (obj)->(var)[0]; (var)[1] = (obj)->(var)[1];\
-  (var)[2] = (obj)->(var)[2]; (var)[3] = (obj)->(var)[3];\
+#define COPY_ARRAY_3(var, obj)                                                                                                                                                                         \
+  (var)[0] = (obj)->(var)[0];                                                                                                                                                                          \
+  (var)[1] = (obj)->(var)[1];                                                                                                                                                                          \
+  (var)[2] = (obj)->(var)[2];
+
+#define COPY_ARRAY_4(var, obj)                                                                                                                                                                         \
+  (var)[0] = (obj)->(var)[0];                                                                                                                                                                          \
+  (var)[1] = (obj)->(var)[1];                                                                                                                                                                          \
+  (var)[2] = (obj)->(var)[2];                                                                                                                                                                          \
+  (var)[3] = (obj)->(var)[3];
+
+#define COPY_ARRAY_5(var, obj)                                                                                                                                                                         \
+  (var)[0] = (obj)->(var)[0];                                                                                                                                                                          \
+  (var)[1] = (obj)->(var)[1];                                                                                                                                                                          \
+  (var)[2] = (obj)->(var)[2];                                                                                                                                                                          \
+  (var)[3] = (obj)->(var)[3];                                                                                                                                                                          \
   (var)[4] = (obj)->(var)[4];
 
-
 /**
  * This will perform a deep copy of the content of the shared vector from
  * target to destination. This is NOT just a simple pointer copy.
  */
-#define DEEP_COPY_SHARED_VECTOR(sharedPtr, obj, VType, m_msgType)\
-  if (nullptr != (sharedPtr))\
-  {\
-    (sharedPtr) = VType(static_cast<std::vector<m_msgType>*>(nullptr));\
-  }\
-  if (nullptr != (obj)->(sharedPtr).get())\
-  {\
-    (sharedPtr) = VType(new std::vector<m_msgType>(*((obj)->(sharedPtr).get())));\
+#define DEEP_COPY_SHARED_VECTOR(sharedPtr, obj, VType, m_msgType)                                                                                                                                      \
+  if(nullptr != (sharedPtr))                                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    (sharedPtr) = VType(static_cast<std::vector<m_msgType>*>(nullptr));                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  if(nullptr != (obj)->(sharedPtr).get())                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    (sharedPtr) = VType(new std::vector<m_msgType>(*((obj)->(sharedPtr).get())));                                                                                                                      \
   }
 
-
-#define SHARED_IS_NULL(ptr)\
-  (  (ptr).get() == nullptr )
+#define SHARED_IS_NULL(ptr) ((ptr).get() == nullptr)
 
 /**
  * @brief Creates a static method that returns a nullptr pointer wrapped in a
  * std::shared_ptr<>
  * @param thisClass The name of the class.
  */
-#define SIMPL_NULL_SHARED_POINTER(thisClass)\
-  static Pointer NullPointer(void)\
-  { \
-    return Pointer(static_cast<thisClass*>(nullptr));\
+#define SIMPL_NULL_SHARED_POINTER(thisClass)                                                                                                                                                           \
+  static Pointer NullPointer(void)                                                                                                                                                                     \
+  {                                                                                                                                                                                                    \
+    return Pointer(static_cast<thisClass*>(nullptr));                                                                                                                                                  \
   }
 
 #ifndef QT_SHARED_POINTERS
- /* @brief Creates some basic typedefs that can be used throughout the code to
+/* @brief Creates some basic typedefs that can be used throughout the code to
  * reference the class.
  */
-#define QT_SHARED_POINTERS(thisClass)\
-  typedef thisClass    Self;\
-  typedef QSharedPointer< Self > Pointer;\
-  typedef QSharedPointer<const Self >  ConstPointer;\
+#define QT_SHARED_POINTERS(thisClass)                                                                                                                                                                  \
+  typedef thisClass Self;                                                                                                                                                                              \
+  typedef QSharedPointer<Self> Pointer;                                                                                                                                                                \
+  typedef QSharedPointer<const Self> ConstPointer;                                                                                                                                                     \
   SIMPL_NULL_SHARED_POINTER(thisClass)
 
 #endif
@@ -113,56 +114,53 @@
  * @brief Creates some basic typedefs that can be used throughout the code to
  * reference the class.
  */
-#define SIMPL_SHARED_POINTERS(thisClass)\
-  typedef thisClass    Self;\
-  typedef std::shared_ptr<Self > Pointer;\
-  typedef std::shared_ptr<const Self >  ConstPointer;\
-  typedef std::weak_ptr<thisClass > WeakPointer;\
-  typedef std::weak_ptr<thisClass > ConstWeakPointer;\
+#define SIMPL_SHARED_POINTERS(thisClass)                                                                                                                                                               \
+  typedef thisClass Self;                                                                                                                                                                              \
+  typedef std::shared_ptr<Self> Pointer;                                                                                                                                                               \
+  typedef std::shared_ptr<const Self> ConstPointer;                                                                                                                                                    \
+  typedef std::weak_ptr<thisClass> WeakPointer;                                                                                                                                                        \
+  typedef std::weak_ptr<thisClass> ConstWeakPointer;                                                                                                                                                   \
   SIMPL_NULL_SHARED_POINTER(thisClass)
 
-
-#define SIMPL_STATIC_NEW_SUPERCLASS(superclass, theclass)\
-  static superclass::Pointer New##superclass()\
-  {\
-    theclass* ptr = new theclass();\
-    superclass::Pointer shared_ptr (dynamic_cast<superclass*>(ptr) );\
-    return shared_ptr;\
+#define SIMPL_STATIC_NEW_SUPERCLASS(superclass, theclass)                                                                                                                                              \
+  static superclass::Pointer New##superclass()                                                                                                                                                         \
+  {                                                                                                                                                                                                    \
+    theclass* ptr = new theclass();                                                                                                                                                                    \
+    superclass::Pointer shared_ptr(dynamic_cast<superclass*>(ptr));                                                                                                                                    \
+    return shared_ptr;                                                                                                                                                                                 \
   }
 
 /**
  * @brief Creates a typedef that points to the superclass of this class
  */
-#define SIMPL_SUPERCLASS_POINTER(SuperClass)\
-  typedef SuperClass::Pointer SuperClass;
-
+#define SIMPL_SUPERCLASS_POINTER(SuperClass) typedef SuperClass::Pointer SuperClass;
 
 /**
  * @brief Creates a static "New" method that creates an instance of thisClass
  */
-#define SIMPL_NEW_SUPERCLASS(thisClass, SuperClass)\
-  typedef SuperClass::Pointer SuperClass##Type;\
-  static SuperClass##Type New##SuperClass(void) \
-  { \
-    SuperClass##Type sharedPtr (new (thisClass)); \
-    return sharedPtr; \
+#define SIMPL_NEW_SUPERCLASS(thisClass, SuperClass)                                                                                                                                                    \
+  typedef SuperClass::Pointer SuperClass##Type;                                                                                                                                                        \
+  static SuperClass##Type New##SuperClass(void)                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    SuperClass##Type sharedPtr(new(thisClass));                                                                                                                                                        \
+    return sharedPtr;                                                                                                                                                                                  \
   }
 
 /**
  * @brief Implements a Static 'New' Method for a class
  */
-#define SIMPL_STATIC_NEW_MACRO(thisClass) \
-  static Pointer New(void) \
-  { \
-    Pointer sharedPtr (new (thisClass)); \
-    return sharedPtr; \
+#define SIMPL_STATIC_NEW_MACRO(thisClass)                                                                                                                                                              \
+  static Pointer New(void)                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    Pointer sharedPtr(new(thisClass));                                                                                                                                                                 \
+    return sharedPtr;                                                                                                                                                                                  \
   }
 
-#define SIMPL_STATIC_NEW_MACRO_WITH_ARGS(thisClass, args) \
-  static Pointer New args \
-  { \
-    Pointer sharedPtr (new (thisClass)); \
-    return sharedPtr; \
+#define SIMPL_STATIC_NEW_MACRO_WITH_ARGS(thisClass, args)                                                                                                                                              \
+  static Pointer New args                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    Pointer sharedPtr(new(thisClass));                                                                                                                                                                 \
+    return sharedPtr;                                                                                                                                                                                  \
   }
 
 /** Macro used to add standard methods to all classes, mainly type
@@ -221,7 +219,7 @@ public:
   }
 
 #define SIMPL_CLASS_VERSION(vers)                                                                                                                                                                      \
-  int getClassVersion() const override                                                                                                                                                                       \
+  int getClassVersion() const override                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
     return vers;                                                                                                                                                                                       \
   }
@@ -229,36 +227,42 @@ public:
 //------------------------------------------------------------------------------
 // Macros for Properties
 /**
-* @brief Creates a QString constant for the Property so that the property
-* can be retrieved by name.
-*/
-#define SIMPL_PROPERTY_CONSTANT(prpty)\
-  const QString prpty ( #prpty );
+ * @brief Creates a QString constant for the Property so that the property
+ * can be retrieved by name.
+ */
+#define SIMPL_PROPERTY_CONSTANT(prpty) const QString prpty(#prpty);
 
 /**
-* @brief Creates a "setter" method to set the property.
-*/
-#define SIMPL_SET_PROPERTY(type, prpty)\
-  void set##prpty(const type& value) { this->m_##prpty = value; }
+ * @brief Creates a "setter" method to set the property.
+ */
+#define SIMPL_SET_PROPERTY(type, prpty)                                                                                                                                                                \
+  void set##prpty(const type& value)                                                                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    this->m_##prpty = value;                                                                                                                                                                           \
+  }
 
 /**
-* @brief Creates a "getter" method to retrieve the value of the property.
-*/
-#define SIMPL_GET_PROPERTY(type, prpty)\
-  type get##prpty() const { return m_##prpty; }
+ * @brief Creates a "getter" method to retrieve the value of the property.
+ */
+#define SIMPL_GET_PROPERTY(type, prpty)                                                                                                                                                                \
+  type get##prpty() const                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    return m_##prpty;                                                                                                                                                                                  \
+  }
 
 /**
-* @brief
-*/
-#define SIMPL_SET_FILTER_PARAMETER(type, prpty)\
-  void set##prpty(const type& value) { this->m_##prpty = value; emit parametersChanged(); }
-
+ * @brief
+ */
+#define SIMPL_SET_FILTER_PARAMETER(type, prpty)                                                                                                                                                        \
+  void set##prpty(const type& value)                                                                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    this->m_##prpty = value;                                                                                                                                                                           \
+    emit parametersChanged();                                                                                                                                                                          \
+  }
 
-#define SIMPL_SET_PROPERTY_DECL(type, prpty)\
-  void set##prpty(type value);
+#define SIMPL_SET_PROPERTY_DECL(type, prpty) void set##prpty(type value);
 
-#define SIMPL_GET_PROPERTY_DECL(type, prpty)\
-  type get##prpty() const;
+#define SIMPL_GET_PROPERTY_DECL(type, prpty) type get##prpty() const;
 
 #define SIMPL_INSTANCE_PROPERTY_DECL(type, prpty)                                                                                                                                                      \
 private:                                                                                                                                                                                               \
@@ -283,23 +287,29 @@ private:
 public:                                                                                                                                                                                                \
   virtual SIMPL_SET_PROPERTY_DECL(type, prpty) virtual SIMPL_GET_PROPERTY_DECL(type, prpty)
 
-#define SIMPL_SET_PROPERTY_DEF(class, type, prpty)\
-  void class::set##prpty(const type& value) { this->m_##prpty = value; }
+#define SIMPL_SET_PROPERTY_DEF(class, type, prpty)                                                                                                                                                     \
+  void class ::set##prpty(const type& value)                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    this->m_##prpty = value;                                                                                                                                                                           \
+  }
 
-#define SIMPL_GET_PROPERTY_DEF(class, type, prpty)\
-  type class::get##prpty() const { return m_##prpty; }
+#define SIMPL_GET_PROPERTY_DEF(class, type, prpty)                                                                                                                                                     \
+  type class ::get##prpty() const                                                                                                                                                                      \
+  {                                                                                                                                                                                                    \
+    return m_##prpty;                                                                                                                                                                                  \
+  }
 
-#define SIMPL_INSTANCE_PROPERTY_DEF(class, type, prpty)\
-      SIMPL_SET_PROPERTY_DEF(class, type, prpty)\
-      SIMPL_GET_PROPERTY_DEF(class, type, prpty)
+#define SIMPL_INSTANCE_PROPERTY_DEF(class, type, prpty)                                                                                                                                                \
+  SIMPL_SET_PROPERTY_DEF(class, type, prpty)                                                                                                                                                           \
+  SIMPL_GET_PROPERTY_DEF(class, type, prpty)
 
-#define SIMPL_INSTANCE_PROPERTY_DEF(class, type, prpty)\
-      SIMPL_SET_PROPERTY_DEF(class, type, prpty)\
-      SIMPL_GET_PROPERTY_DEF(class, type, prpty)
+#define SIMPL_INSTANCE_PROPERTY_DEF(class, type, prpty)                                                                                                                                                \
+  SIMPL_SET_PROPERTY_DEF(class, type, prpty)                                                                                                                                                           \
+  SIMPL_GET_PROPERTY_DEF(class, type, prpty)
 
 /**
-* @brief
-*/
+ * @brief
+ */
 #define SIMPL_VIRTUAL_INSTANCE_PROPERTY(type, prpty)                                                                                                                                                   \
 private:                                                                                                                                                                                               \
   type m_##prpty = {};                                                                                                                                                                                 \
@@ -333,32 +343,28 @@ private:
 public:                                                                                                                                                                                                \
   SIMPL_GET_PROPERTY(type, prpty)
 
-#define SIMPL_SET_PROPERTY_DECL(type, prpty)\
-  void set##prpty(type value);
+#define SIMPL_SET_PROPERTY_DECL(type, prpty) void set##prpty(type value);
 
-#define SIMPL_GET_PROPERTY_DECL(type, prpty)\
-  type get##prpty() const;
+#define SIMPL_GET_PROPERTY_DECL(type, prpty) type get##prpty() const;
 
+#define SIMPL_PIMPL_PROPERTY_DECL(type, prpty)                                                                                                                                                         \
+public:                                                                                                                                                                                                \
+  SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)                                                                                                                                                           \
+  SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)
 
-#define SIMPL_PIMPL_PROPERTY_DECL(type, prpty)\
-  public:\
-  SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
-  SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
-
-#define SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty)\
-  type get##prpty() const;
+#define SIMPL_PIMPL_GET_PROPERTY_DECL(type, prpty) type get##prpty() const;
 
-#define SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty)\
-  void set##prpty(const type& value);\
+#define SIMPL_PIMPL_SET_PROPERTY_DECL(type, prpty) void set##prpty(const type& value);
 
-#define SIMPL_PIMPL_PROPERTY_DEF(Class, type, prpty)\
-  SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)\
-  SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
+#define SIMPL_PIMPL_PROPERTY_DEF(Class, type, prpty)                                                                                                                                                   \
+  SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)                                                                                                                                                     \
+  SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)
 
-#define SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)\
-  type Class::get##prpty() const {\
-    Q_D(const Class);\
-    return d->m_##prpty;\
+#define SIMPL_PIMPL_GET_PROPERTY_DEF(Class, type, prpty)                                                                                                                                               \
+  type Class::get##prpty() const                                                                                                                                                                       \
+  {                                                                                                                                                                                                    \
+    Q_D(const Class);                                                                                                                                                                                  \
+    return d->m_##prpty;                                                                                                                                                                               \
   }
 
 #define SIMPL_PIMPL_SET_PROPERTY_DEF(Class, type, prpty)                                                                                                                                               \
@@ -383,128 +389,136 @@ private:
 public:                                                                                                                                                                                                \
   virtual SIMPL_SET_PROPERTY(bool, prpty) SIMPL_GET_BOOL_PROPERTY(prpty)
 
-#define SIMPL_GET_BOOL_PROPERTY(prpty)\
-  public:\
-  virtual bool is##prpty() { return m_##prpty; }
+#define SIMPL_GET_BOOL_PROPERTY(prpty)                                                                                                                                                                 \
+public:                                                                                                                                                                                                \
+  virtual bool is##prpty()                                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    return m_##prpty;                                                                                                                                                                                  \
+  }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-#define SIMPL_CONTAINER_TYPE(thisClass, container) \
-  typedef (container)<thisClass>     ContainerT; \
-  typedef std::shared_ptr<(container)<(thisClass)>> ContainerPType;
-
+#define SIMPL_CONTAINER_TYPE(thisClass, container)                                                                                                                                                     \
+  typedef(container)<thisClass> ContainerT;                                                                                                                                                            \
+  typedef std::shared_ptr<(container) < (thisClass)>> ContainerPType;
 
 /**
-* @brief Creates a "setter" method to set the property.
-*/
-#define SIMPL_SET_STRING_PROPERTY( prpty, varname) \
-  void set##prpty(const QString& value) { this->varname = value; }
+ * @brief Creates a "setter" method to set the property.
+ */
+#define SIMPL_SET_STRING_PROPERTY(prpty, varname)                                                                                                                                                      \
+  void set##prpty(const QString& value)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    this->varname = value;                                                                                                                                                                             \
+  }
 
 /**
-* @brief Creates a "getter" method to retrieve the value of the property.
-*/
-#define SIMPL_GET_STRING_PROPERTY( prpty, varname) \
-  QString get##prpty() const { return varname; }
+ * @brief Creates a "getter" method to retrieve the value of the property.
+ */
+#define SIMPL_GET_STRING_PROPERTY(prpty, varname)                                                                                                                                                      \
+  QString get##prpty() const                                                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    return varname;                                                                                                                                                                                    \
+  }
 
 /**
-* @brief Creates a "setter" method to set the property.
-*/
-#define SIMPL_SET_STRING_PROPERTY_OVERRIDE(prpty, varname)      \
-  void set##prpty(const QString& value) override  \
-  {  \
-    this->varname = value;  \
+ * @brief Creates a "setter" method to set the property.
+ */
+#define SIMPL_SET_STRING_PROPERTY_OVERRIDE(prpty, varname)                                                                                                                                             \
+  void set##prpty(const QString& value) override                                                                                                                                                       \
+  {                                                                                                                                                                                                    \
+    this->varname = value;                                                                                                                                                                             \
   }
 
 /**
-* @brief Creates a "getter" method to retrieve the value of the property.
-*/
-#define SIMPL_GET_STRING_PROPERTY_OVERRIDE(prpty, varname)      \
-  QString get##prpty() const override  \
-  {  \
-    return varname;\
+ * @brief Creates a "getter" method to retrieve the value of the property.
+ */
+#define SIMPL_GET_STRING_PROPERTY_OVERRIDE(prpty, varname)                                                                                                                                             \
+  QString get##prpty() const override                                                                                                                                                                  \
+  {                                                                                                                                                                                                    \
+    return varname;                                                                                                                                                                                    \
   }
 
 /**
  * @brief Creates setters and getters in the form of 'setXXX()' and 'getXXX()' methods
  */
-#define SIMPL_INSTANCE_STRING_PROPERTY(prpty)\
-  private:\
-  QString      m_##prpty;\
-  public:\
-  SIMPL_SET_STRING_PROPERTY(prpty,  m_##prpty)\
-  SIMPL_GET_STRING_PROPERTY(prpty,  m_##prpty)
+#define SIMPL_INSTANCE_STRING_PROPERTY(prpty)                                                                                                                                                          \
+private:                                                                                                                                                                                               \
+  QString m_##prpty;                                                                                                                                                                                   \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_STRING_PROPERTY(prpty, m_##prpty)                                                                                                                                                          \
+  SIMPL_GET_STRING_PROPERTY(prpty, m_##prpty)
 
 /**
-* @brief
-*/
-#define SIMPL_INSTANCE_STRING_PROPERTY_OVERRIDE(prpty)\
-private:\
-  QString m_##prpty;\
-public:\
-  SIMPL_SET_STRING_PROPERTY_OVERRIDE(prpty, m_##prpty)\
+ * @brief
+ */
+#define SIMPL_INSTANCE_STRING_PROPERTY_OVERRIDE(prpty)                                                                                                                                                 \
+private:                                                                                                                                                                                               \
+  QString m_##prpty;                                                                                                                                                                                   \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_STRING_PROPERTY_OVERRIDE(prpty, m_##prpty)                                                                                                                                                 \
   SIMPL_GET_STRING_PROPERTY_OVERRIDE(prpty, m_##prpty)
 
-#define SIMPL_VIRTUAL_INSTANCE_STRING_PROPERTY(prpty)\
-  private:\
-  QString      m_##prpty;\
-  public:\
-  virtual SIMPL_SET_STRING_PROPERTY(prpty,  m_##prpty)\
-  virtual SIMPL_GET_STRING_PROPERTY(prpty,  m_##prpty)
-
+#define SIMPL_VIRTUAL_INSTANCE_STRING_PROPERTY(prpty)                                                                                                                                                  \
+private:                                                                                                                                                                                               \
+  QString m_##prpty;                                                                                                                                                                                   \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  virtual SIMPL_SET_STRING_PROPERTY(prpty, m_##prpty) virtual SIMPL_GET_STRING_PROPERTY(prpty, m_##prpty)
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-#define SIMPL_DECLARE_ARRAY(Type, ptr, prpty )\
-  private:\
-  DataArray<Type>::Pointer m_##prpty;\
-  Type* (ptr) = nullptr;\
-  public:\
-  SIMPL_SET_PROPERTY(DataArray<Type>::Pointer, prpty)\
+#define SIMPL_DECLARE_ARRAY(Type, ptr, prpty)                                                                                                                                                          \
+private:                                                                                                                                                                                               \
+  DataArray<Type>::Pointer m_##prpty;                                                                                                                                                                  \
+  Type*(ptr) = nullptr;                                                                                                                                                                                \
+                                                                                                                                                                                                       \
+public:                                                                                                                                                                                                \
+  SIMPL_SET_PROPERTY(DataArray<Type>::Pointer, prpty)                                                                                                                                                  \
   SIMPL_GET_PROPERTY(DataArray<Type>::Pointer, prpty)
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-#define DEFINE_DATAARRAY_VARIABLE(type, name)\
-  private:\
-  DataArray<type>::WeakPointer m_##name##Ptr;\
+#define DEFINE_DATAARRAY_VARIABLE(type, name)                                                                                                                                                          \
+private:                                                                                                                                                                                               \
+  DataArray<type>::WeakPointer m_##name##Ptr;                                                                                                                                                          \
   type* m_##name = nullptr;
 
-#define DEFINE_DATAARRAY_WEAKPTR(type, name)  \
-private:    \
+#define DEFINE_DATAARRAY_WEAKPTR(type, name)                                                                                                                                                           \
+private:                                                                                                                                                                                               \
   DataArray<type>::WeakPointer m_##name##Ptr;
 
-#define DEFINE_STRINGARRAY_VARIABLE(name)\
-  private:\
+#define DEFINE_STRINGARRAY_VARIABLE(name)                                                                                                                                                              \
+private:                                                                                                                                                                                               \
   StringDataArray::WeakPointer m_##name##Ptr;
 
-#define DEFINE_REQUIRED_VARIABLE(type, name)\
-  SIMPL_INSTANCE_STRING_PROPERTY(name##ArrayName);\
-  private:\
-  type::WeakPointer m_##name##Ptr;\
+#define DEFINE_REQUIRED_VARIABLE(type, name)                                                                                                                                                           \
+  SIMPL_INSTANCE_STRING_PROPERTY(name##ArrayName);                                                                                                                                                     \
+                                                                                                                                                                                                       \
+private:                                                                                                                                                                                               \
+  type::WeakPointer m_##name##Ptr;                                                                                                                                                                     \
   (type)* m_##name = nullptr;
 
-//used in place of 'DEFINE_DATAARRAY_VARIABLE' in filter header
-#define DEFINE_IDATAARRAY_VARIABLE(varName)\
-  private:\
-  IDataArray::WeakPointer m_##varName##Ptr;\
+// used in place of 'DEFINE_DATAARRAY_VARIABLE' in filter header
+#define DEFINE_IDATAARRAY_VARIABLE(varName)                                                                                                                                                            \
+private:                                                                                                                                                                                               \
+  IDataArray::WeakPointer m_##varName##Ptr;                                                                                                                                                            \
   void* m_##varName = nullptr;
 
-#define DEFINE_IDATAARRAY_WEAKPTR(varName)    \
-private:    \
+#define DEFINE_IDATAARRAY_WEAKPTR(varName)                                                                                                                                                             \
+private:                                                                                                                                                                                               \
   IDataArray::WeakPointer m_##varName##Ptr;
 
-#define SIMPL_COPY_INSTANCEVAR(name)\
-  filter->set##name(get##name());
+#define SIMPL_COPY_INSTANCEVAR(name) filter->set##name(get##name());
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 
-
 namespace SIMPLTesting
 {
 class bad_lexical_cast : public std::runtime_error
@@ -525,7 +539,8 @@ class bad_any_cast : public std::runtime_error
   }
 };
 
-template <typename T> T lexical_cast(const QString& s)
+template <typename T>
+T lexical_cast(const QString& s)
 {
   std::istringstream i(s.toStdString());
   T x;
@@ -537,6 +552,3 @@ template <typename T> T lexical_cast(const QString& s)
   return x;
 }
 } // namespace SIMPLTesting
-
-
-
diff --git a/Source/SIMPLib/Common/ScopedFileMonitor.hpp b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
old mode 100755
new mode 100644
index bf68196a5a..b700608ad8
--- a/Source/SIMPLib/Common/ScopedFileMonitor.hpp
+++ b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,13 +43,19 @@
  */
 class ScopedFileMonitor
 {
-  public:
-    ScopedFileMonitor(FILE* f) : m_File(f) {}
-    virtual ~ScopedFileMonitor() { if (nullptr != m_File) fclose(m_File);}
-  private:
-    FILE* m_File;
-    ScopedFileMonitor(const ScopedFileMonitor&); // Copy Constructor Not Implemented
-    void operator=(const ScopedFileMonitor&);    // Move assignment Not Implemented
-};
-
+public:
+  ScopedFileMonitor(FILE* f)
+  : m_File(f)
+  {
+  }
+  virtual ~ScopedFileMonitor()
+  {
+    if(nullptr != m_File)
+      fclose(m_File);
+  }
 
+private:
+  FILE* m_File;
+  ScopedFileMonitor(const ScopedFileMonitor&); // Copy Constructor Not Implemented
+  void operator=(const ScopedFileMonitor&);    // Move assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Common/ShapeType.cpp b/Source/SIMPLib/Common/ShapeType.cpp
index 271b4b30a2..5bea65e843 100644
--- a/Source/SIMPLib/Common/ShapeType.cpp
+++ b/Source/SIMPLib/Common/ShapeType.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ShapeType.h"
 
@@ -48,7 +48,7 @@ ShapeType::~ShapeType() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<ShapeType::EnumType> ShapeType::ToQVector(Types &types)
+QVector<ShapeType::EnumType> ShapeType::ToQVector(Types& types)
 {
   QVector<ShapeType::EnumType> vec(types.size());
   for(int i = 0; i < types.size(); i++)
@@ -61,7 +61,7 @@ QVector<ShapeType::EnumType> ShapeType::ToQVector(Types &types)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ShapeType::Types ShapeType::FromQVector(QVector<ShapeType::EnumType> &vec)
+ShapeType::Types ShapeType::FromQVector(QVector<ShapeType::EnumType>& vec)
 {
   ShapeType::Types types(vec.size());
   for(int i = 0; i < vec.size(); i++)
@@ -71,7 +71,6 @@ ShapeType::Types ShapeType::FromQVector(QVector<ShapeType::EnumType> &vec)
   return types;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -151,7 +150,7 @@ QString ShapeType::getShapeTypeString(Type ShapeType)
   case Type::CylinderC:
     return CylinderCStr();
   case Type::ShapeTypeEnd:
-      return ShapeTypeEndStr();
+    return ShapeTypeEndStr();
   case Type::Unknown:
     return UnknownShapeTypeStr();
   default:
@@ -211,7 +210,6 @@ void ShapeType::getShapeTypeStrings(QVector<QString>& strings)
   strings.push_back(CylinderCStr());
   strings.push_back(ShapeTypeEndStr());
   strings.push_back(UnknownShapeTypeStr());
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/ShapeType.h b/Source/SIMPLib/Common/ShapeType.h
old mode 100755
new mode 100644
index 58ef0d6edf..7cc1270aae
--- a/Source/SIMPLib/Common/ShapeType.h
+++ b/Source/SIMPLib/Common/ShapeType.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -64,8 +64,8 @@ class SIMPLib_EXPORT ShapeType
     CylinderA = 3,      //!<
     CylinderB = 4,      //!<
     CylinderC = 5,      //!<
-    ShapeTypeEnd = 6, //!
-    Unknown = 999,       //!<
+    ShapeTypeEnd = 6,   //!
+    Unknown = 999,      //!<
     Any = 4294967295U
 
   };
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT ShapeType
    * @param types
    * @return
    */
-  static QVector<EnumType> ToQVector(Types &types);
+  static QVector<EnumType> ToQVector(Types& types);
 
   /**
    * @brief Converts <b>From</b> a QVector<EnumType> to QVector<Type>. Useful for
@@ -86,7 +86,7 @@ class SIMPLib_EXPORT ShapeType
    * @param types
    * @return
    */
-  static Types FromQVector(QVector<EnumType> &types);
+  static Types FromQVector(QVector<EnumType>& types);
 
   static QString EllipsoidStr();
   static QString SuperEllipsoid();
@@ -119,4 +119,3 @@ class SIMPLib_EXPORT ShapeType
 
 Q_DECLARE_METATYPE(ShapeType::Type)
 Q_DECLARE_METATYPE(ShapeType::Types)
-
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
old mode 100755
new mode 100644
index 45f5271b47..3d06db02a7
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -109,7 +109,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                    \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                \
   }
 
 #define EXECUTE_TEMPLATE(observableObj, templateName, inputData, ...)                                                                                                                                  \
@@ -175,7 +175,7 @@ namespace TemplateHelpers
   }                                                                                                                                                                                                    \
   else                                                                                                                                                                                                 \
   {                                                                                                                                                                                                    \
-    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                    \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "The input array was of unsupported type");                                                \
   }
 
 /**
@@ -194,7 +194,8 @@ const int MissingArray(-405);
  * @brief This class (functor) simply returns true or false if the IDataArray can be downcast to a certain DataArray type
  * parameterized by the template parameter T.
  */
-template <typename T> class CanDynamicCast
+template <typename T>
+class CanDynamicCast
 {
 public:
   CanDynamicCast() = default;
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index 9dda9c3186..e02f3cbc11 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -79,7 +79,7 @@ class SIMPLArrayTest
     std::vector<int32_t> iv3 = {4, 5};
     i3 = iv3.data();
 
-    std::vector<int32_t> iv2 = {6,5};
+    std::vector<int32_t> iv2 = {6, 5};
     i3 = IntVec2Type(iv2);
 
     int32_t x = i3.getX();
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 59437a900b..5cda8fa40e 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -113,7 +113,6 @@ void ApplyImageTransforms::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -137,10 +136,10 @@ void ApplyImageTransforms::execute()
     FloatVec3Type origin = imageGeom->getOrigin();
 
     ::ITransformContainer::Pointer iTransformContainer = imageGeom->getTransformContainer();
-    if (iTransformContainer)
+    if(iTransformContainer)
     {
       TransformContainer::Pointer transformContainer = std::dynamic_pointer_cast<TransformContainer>(iTransformContainer);
-      if (transformContainer)
+      if(transformContainer)
       {
         TransformContainer::TransformParametersType parameters = transformContainer->getParameters();
 
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index 1bb3553d22..714be80419 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,118 +47,116 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
 {
   Q_OBJECT
 
-  public:
-    using Self = ApplyImageTransforms;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ApplyImageTransforms> New();
-
-    /**
-     * @brief Returns the name of the class for ApplyImageTransforms
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ApplyImageTransforms
-     */
-    static QString ClassName();
-
-    ~ApplyImageTransforms() override;
-
-    /**
-     * @brief Setter property for ImageDataContainers
-     */
-    void setImageDataContainers(const QStringList& value);
-    /**
-     * @brief Getter property for ImageDataContainers
-     * @return Value of ImageDataContainers
-     */
-    QStringList getImageDataContainers() const;
-
-    Q_PROPERTY(QStringList ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ApplyImageTransforms();
-
-    /**
-    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-    */
-    void dataCheck() override;
-
-    /**
-    * @brief Initializes all the private instance variables.
-    */
-    void initialize();
-  private:
-    QStringList m_ImageDataContainers = {};
-
-  public:
-    /* Rule of 5: All special member functions should be defined if any are defined.
-    * https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c21-if-you-define-or-delete-any-default-operation-define-or-delete-them-all
-    */
-    ApplyImageTransforms(const ApplyImageTransforms&) = delete;             // Copy Constructor Not Implemented
-    ApplyImageTransforms& operator=(const ApplyImageTransforms&) = delete;  // Copy Assignment Not Implemented
-    ApplyImageTransforms(ApplyImageTransforms&&) = delete;                  // Move Constructor Not Implemented
-    ApplyImageTransforms& operator=(ApplyImageTransforms&&) = delete;       // Move Assignment Not Implemented
-
+public:
+  using Self = ApplyImageTransforms;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ApplyImageTransforms> New();
+
+  /**
+   * @brief Returns the name of the class for ApplyImageTransforms
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ApplyImageTransforms
+   */
+  static QString ClassName();
+
+  ~ApplyImageTransforms() override;
+
+  /**
+   * @brief Setter property for ImageDataContainers
+   */
+  void setImageDataContainers(const QStringList& value);
+  /**
+   * @brief Getter property for ImageDataContainers
+   * @return Value of ImageDataContainers
+   */
+  QStringList getImageDataContainers() const;
+
+  Q_PROPERTY(QStringList ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ApplyImageTransforms();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  QStringList m_ImageDataContainers = {};
+
+public:
+  /* Rule of 5: All special member functions should be defined if any are defined.
+   * https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c21-if-you-define-or-delete-any-default-operation-define-or-delete-them-all
+   */
+  ApplyImageTransforms(const ApplyImageTransforms&) = delete;            // Copy Constructor Not Implemented
+  ApplyImageTransforms& operator=(const ApplyImageTransforms&) = delete; // Copy Assignment Not Implemented
+  ApplyImageTransforms(ApplyImageTransforms&&) = delete;                 // Move Constructor Not Implemented
+  ApplyImageTransforms& operator=(ApplyImageTransforms&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 2921da9a4c..eba2064bfe 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ArrayCalculator.h"
 
 #include <QtCore/QRegularExpression>
@@ -130,7 +130,8 @@
     itemPtr = CalculatorArray<bool>::New(arrayCast, ICalculatorArray::Array, !getInPreflight());                                                                                                       \
   }
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataArrayID = 1
 };
 
@@ -270,13 +271,13 @@ void ArrayCalculator::dataCheck()
   ICalculatorArray::ValueType resultType = ICalculatorArray::ValueType::Unknown;
 
   for(const auto& item1 : parsedInfix)
-  //for(int32_t i = 0; i < parsedInfix.size(); i++)
+  // for(int32_t i = 0; i < parsedInfix.size(); i++)
   {
-    //CalculatorItem::Pointer item1 = parsedInfix[i];
+    // CalculatorItem::Pointer item1 = parsedInfix[i];
     if(item1->isICalculatorArray())
     {
       ICalculatorArray::Pointer array1 = std::dynamic_pointer_cast<ICalculatorArray>(item1);
-      if (item1->isArray())
+      if(item1->isArray())
       {
         if(!cDims.empty() && resultType == ICalculatorArray::ValueType::Array && cDims != array1->getArray()->getComponentDimensions())
         {
@@ -288,7 +289,7 @@ void ArrayCalculator::dataCheck()
         resultType = ICalculatorArray::ValueType::Array;
         cDims = array1->getArray()->getComponentDimensions();
       }
-      else if (resultType == ICalculatorArray::ValueType::Unknown)
+      else if(resultType == ICalculatorArray::ValueType::Unknown)
       {
         resultType = ICalculatorArray::ValueType::Number;
         cDims = array1->getArray()->getComponentDimensions();
@@ -307,13 +308,11 @@ void ArrayCalculator::dataCheck()
   AttributeMatrix::Pointer calculatedAM = getDataContainerArray()->getAttributeMatrix(calculatedAMPath);
   if(nullptr == calculatedAM.get())
   {
-    QString ss = QObject::tr("The AttributeMatrix at %1/%2 was not found")
-                     .arg(calculatedAMPath.getDataContainerName(), calculatedAMPath.getAttributeMatrixName());
+    QString ss = QObject::tr("The AttributeMatrix at %1/%2 was not found").arg(calculatedAMPath.getDataContainerName(), calculatedAMPath.getAttributeMatrixName());
     setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::LOST_ATTR_MATRIX), ss);
     return;
   }
 
-
   if(resultType == ICalculatorArray::ValueType::Number)
   {
     QString ss = QObject::tr("The result of the chosen expression will be a numeric value or contain one tuple."
@@ -385,7 +384,6 @@ void ArrayCalculator::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -476,13 +474,13 @@ void ArrayCalculator::execute()
     setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::UNEXPECTED_OUTPUT), ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template<typename T> IDataArray::Pointer convertArray(const DoubleArrayType::Pointer& inputArray)
+template <typename T>
+IDataArray::Pointer convertArray(const DoubleArrayType::Pointer& inputArray)
 {
   if(nullptr == inputArray)
   {
@@ -1016,7 +1014,7 @@ QVector<CalculatorItem::Pointer> ArrayCalculator::toRPN(QVector<CalculatorItem::
     rpnEquation.push_back(item);
   }
 
-    delete oneComponent;
+  delete oneComponent;
 
   return rpnEquation;
 }
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index f8a1e239a5..909748de98 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -58,270 +57,268 @@ using CalculatorItemShPtrType = std::shared_ptr<CalculatorItem>;
  */
 class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ArrayCalculator)
-    PYB11_FILTER_NEW_MACRO(ArrayCalculator)
-    PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
-    PYB11_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
-    PYB11_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
-    PYB11_PROPERTY(ArrayCalculator::AngleUnits Units READ getUnits WRITE setUnits)
-    PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    enum AngleUnits
-    {
-      Degrees,
-      Radians
-    };
-
-    Q_ENUMS(AngleUnits)
-
-    using Self = ArrayCalculator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ArrayCalculator> New();
-
-    /**
-     * @brief Returns the name of the class for ArrayCalculator
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ArrayCalculator
-     */
-    static QString ClassName();
-
-    /**
-     * @brief Setter property for SelectedAttributeMatrix
-     */
-    void setSelectedAttributeMatrix(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedAttributeMatrix
-     * @return Value of SelectedAttributeMatrix
-     */
-    DataArrayPath getSelectedAttributeMatrix() const;
-
-    Q_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
-
-    /**
-     * @brief Setter property for InfixEquation
-     */
-    void setInfixEquation(const QString& value);
-    /**
-     * @brief Getter property for InfixEquation
-     * @return Value of InfixEquation
-     */
-    QString getInfixEquation() const;
-
-    Q_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
-
-    /**
-     * @brief Setter property for CalculatedArray
-     */
-    void setCalculatedArray(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CalculatedArray
-     * @return Value of CalculatedArray
-     */
-    DataArrayPath getCalculatedArray() const;
-
-    Q_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
-
-    /**
-     * @brief Setter property for Units
-     */
-    void setUnits(const ArrayCalculator::AngleUnits& value);
-    /**
-     * @brief Getter property for Units
-     * @return Value of Units
-     */
-    ArrayCalculator::AngleUnits getUnits() const;
-
-    Q_PROPERTY(AngleUnits Units READ getUnits WRITE setUnits)
-
-    /**
-     * @brief Setter property for ScalarType
-     */
-    void setScalarType(SIMPL::ScalarTypes::Type value);
-    /**
-     * @brief Getter property for ScalarType
-     * @return Value of ScalarType
-     */
-    SIMPL::ScalarTypes::Type getScalarType() const;
-
-    Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-
-    ~ArrayCalculator() override;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-    * @brief readFilterParametersFromJson Reads the filter parameters from a file
-    * @param reader Reader that is used to read the parameters from a file
-    */
-    void readFilterParameters(QJsonObject &obj) override;
-
-    /**
-    * @brief writeFilterParametersToJson Writes the filter parameters to a file
-    * @param root The root json object
-    */
-    void writeFilterParameters(QJsonObject &obj) const override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ArrayCalculator();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-    /**
-     * @brief Converts the given data array to one of the specified scalar type
-     * @param inputArray
-     * @param scalarType
-     * @return
-     */
-    IDataArrayShPtrType convertArrayType(const IDataArrayShPtrType& inputArray, SIMPL::ScalarTypes::Type scalarType);
-
-  private:
-    DataArrayPath m_SelectedAttributeMatrix = {};
-    QString m_InfixEquation = {};
-    DataArrayPath m_CalculatedArray = {};
-    ArrayCalculator::AngleUnits m_Units = {};
-    SIMPL::ScalarTypes::Type m_ScalarType = {};
-
-    QMap<QString, CalculatorItemShPtrType> m_SymbolMap;
-    QStack<ICalculatorArray::Pointer>                           m_ExecutionStack;
-
-    void createSymbolMap();
-
-    QVector<CalculatorItemShPtrType> parseInfixEquation();
-    QVector<CalculatorItemShPtrType> toRPN(QVector<CalculatorItemShPtrType> infixEquation);
-
-    void checkForAmbiguousArrayName(QString itemStr, QString warningMsg);
-
-    /**
-     * @brief getRegularExpressionMatches
-     * @return
-     */
-    QVector<QString> getRegularExpressionMatches();
-
-    /**
-     * @brief parseNumberArray
-     * @param token
-     * @param parsedInfix
-     */
-    void parseNumericValue(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, double number);
-
-    /**
-     * @brief parseMinusSign
-     * @param strItem
-     * @param parsedInfix
-     * @param loopIdx
-     */
-    void parseMinusSign(QString strItem, QVector<CalculatorItemShPtrType>& parsedInfix, int loopIdx);
-
-    /**
-     * @brief parseIndexOperator
-     * @param token
-     * @param parsedInfix
-     * @param number
-     */
-    bool parseIndexOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
-
-    /**
-     * @brief parseCommaOperator
-     * @param token
-     * @param parsedInfix
-     * @return
-     */
-    bool parseCommaOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
-
-    /**
-     * @brief parseArray
-     * @param token
-     * @param parsedInfix
-     * @param selectedAM
-     * @return
-     */
-    bool parseArray(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, const AttributeMatrixShPtrType& selectedAM);
-
-  public:
-    ArrayCalculator(const ArrayCalculator&) = delete; // Copy Constructor Not Implemented
-    ArrayCalculator(ArrayCalculator&&) = delete;      // Move Constructor Not Implemented
-    ArrayCalculator& operator=(const ArrayCalculator&) = delete; // Copy Assignment Not Implemented
-    ArrayCalculator& operator=(ArrayCalculator&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ArrayCalculator SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ArrayCalculator)
+  PYB11_FILTER_NEW_MACRO(ArrayCalculator)
+  PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
+  PYB11_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
+  PYB11_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
+  PYB11_PROPERTY(ArrayCalculator::AngleUnits Units READ getUnits WRITE setUnits)
+  PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  enum AngleUnits
+  {
+    Degrees,
+    Radians
+  };
+
+  Q_ENUMS(AngleUnits)
+
+  using Self = ArrayCalculator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ArrayCalculator> New();
+
+  /**
+   * @brief Returns the name of the class for ArrayCalculator
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ArrayCalculator
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for SelectedAttributeMatrix
+   */
+  void setSelectedAttributeMatrix(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedAttributeMatrix
+   * @return Value of SelectedAttributeMatrix
+   */
+  DataArrayPath getSelectedAttributeMatrix() const;
+
+  Q_PROPERTY(DataArrayPath SelectedAttributeMatrix READ getSelectedAttributeMatrix WRITE setSelectedAttributeMatrix)
+
+  /**
+   * @brief Setter property for InfixEquation
+   */
+  void setInfixEquation(const QString& value);
+  /**
+   * @brief Getter property for InfixEquation
+   * @return Value of InfixEquation
+   */
+  QString getInfixEquation() const;
+
+  Q_PROPERTY(QString InfixEquation READ getInfixEquation WRITE setInfixEquation)
+
+  /**
+   * @brief Setter property for CalculatedArray
+   */
+  void setCalculatedArray(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CalculatedArray
+   * @return Value of CalculatedArray
+   */
+  DataArrayPath getCalculatedArray() const;
+
+  Q_PROPERTY(DataArrayPath CalculatedArray READ getCalculatedArray WRITE setCalculatedArray)
+
+  /**
+   * @brief Setter property for Units
+   */
+  void setUnits(const ArrayCalculator::AngleUnits& value);
+  /**
+   * @brief Getter property for Units
+   * @return Value of Units
+   */
+  ArrayCalculator::AngleUnits getUnits() const;
+
+  Q_PROPERTY(AngleUnits Units READ getUnits WRITE setUnits)
+
+  /**
+   * @brief Setter property for ScalarType
+   */
+  void setScalarType(SIMPL::ScalarTypes::Type value);
+  /**
+   * @brief Getter property for ScalarType
+   * @return Value of ScalarType
+   */
+  SIMPL::ScalarTypes::Type getScalarType() const;
+
+  Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+
+  ~ArrayCalculator() override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief readFilterParametersFromJson Reads the filter parameters from a file
+   * @param reader Reader that is used to read the parameters from a file
+   */
+  void readFilterParameters(QJsonObject& obj) override;
+
+  /**
+   * @brief writeFilterParametersToJson Writes the filter parameters to a file
+   * @param root The root json object
+   */
+  void writeFilterParameters(QJsonObject& obj) const override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ArrayCalculator();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief Converts the given data array to one of the specified scalar type
+   * @param inputArray
+   * @param scalarType
+   * @return
+   */
+  IDataArrayShPtrType convertArrayType(const IDataArrayShPtrType& inputArray, SIMPL::ScalarTypes::Type scalarType);
+
+private:
+  DataArrayPath m_SelectedAttributeMatrix = {};
+  QString m_InfixEquation = {};
+  DataArrayPath m_CalculatedArray = {};
+  ArrayCalculator::AngleUnits m_Units = {};
+  SIMPL::ScalarTypes::Type m_ScalarType = {};
+
+  QMap<QString, CalculatorItemShPtrType> m_SymbolMap;
+  QStack<ICalculatorArray::Pointer> m_ExecutionStack;
+
+  void createSymbolMap();
+
+  QVector<CalculatorItemShPtrType> parseInfixEquation();
+  QVector<CalculatorItemShPtrType> toRPN(QVector<CalculatorItemShPtrType> infixEquation);
+
+  void checkForAmbiguousArrayName(QString itemStr, QString warningMsg);
+
+  /**
+   * @brief getRegularExpressionMatches
+   * @return
+   */
+  QVector<QString> getRegularExpressionMatches();
+
+  /**
+   * @brief parseNumberArray
+   * @param token
+   * @param parsedInfix
+   */
+  void parseNumericValue(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, double number);
+
+  /**
+   * @brief parseMinusSign
+   * @param strItem
+   * @param parsedInfix
+   * @param loopIdx
+   */
+  void parseMinusSign(QString strItem, QVector<CalculatorItemShPtrType>& parsedInfix, int loopIdx);
+
+  /**
+   * @brief parseIndexOperator
+   * @param token
+   * @param parsedInfix
+   * @param number
+   */
+  bool parseIndexOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
+
+  /**
+   * @brief parseCommaOperator
+   * @param token
+   * @param parsedInfix
+   * @return
+   */
+  bool parseCommaOperator(QString token, QVector<CalculatorItemShPtrType>& parsedInfix);
+
+  /**
+   * @brief parseArray
+   * @param token
+   * @param parsedInfix
+   * @param selectedAM
+   * @return
+   */
+  bool parseArray(QString token, QVector<CalculatorItemShPtrType>& parsedInfix, const AttributeMatrixShPtrType& selectedAM);
+
+public:
+  ArrayCalculator(const ArrayCalculator&) = delete;            // Copy Constructor Not Implemented
+  ArrayCalculator(ArrayCalculator&&) = delete;                 // Move Constructor Not Implemented
+  ArrayCalculator& operator=(const ArrayCalculator&) = delete; // Copy Assignment Not Implemented
+  ArrayCalculator& operator=(ArrayCalculator&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 8ddfe52f50..5b7f3b2fab 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "Breakpoint.h"
 
 #include <QtCore/QTextStream>
@@ -86,7 +86,6 @@ void Breakpoint::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 0796c5babc..a80c59e386 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -148,7 +148,6 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
    */
   void execute() override;
 
-
 public slots:
   /**
    * @brief resumePipeline Resumes the pipeline
@@ -193,4 +192,3 @@ public slots:
   Breakpoint& operator=(const Breakpoint&) = delete; // Copy Assignment Not Implemented
   Breakpoint& operator=(Breakpoint&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 6f59a4f6de..43d0d3c412 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CombineAttributeArrays.h"
 
 #include <QtCore/QTextStream>
@@ -46,7 +46,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   CombinedArrayID = 1
 };
 
@@ -54,7 +55,8 @@ enum createdPathID : RenameDataPath::DataID_t {
  * @brief The CombineAttributeArraysTemplatePrivate class is a templated private implementation that deals with
  * combining the various input arrays into one contiguous array
  */
-template <typename DataType> class CombineAttributeArraysTemplatePrivate
+template <typename DataType>
+class CombineAttributeArraysTemplatePrivate
 {
 public:
   typedef DataArray<DataType> DataArrayType;
@@ -222,7 +224,8 @@ void CombineAttributeArrays::readFilterParameters(AbstractFilterParametersReader
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename DataType> void verifyArrayList(AbstractFilter* filter, QVector<IDataArray::WeakPointer> ptrArray)
+template <typename DataType>
+void verifyArrayList(AbstractFilter* filter, QVector<IDataArray::WeakPointer> ptrArray)
 {
   for(QVector<IDataArray::WeakPointer>::iterator it = ptrArray.begin(); it != ptrArray.end(); ++it)
   {
@@ -279,7 +282,7 @@ void CombineAttributeArrays::dataCheck()
       totalComps += numComps;
     }
   }
-  if(! m_SelectedWeakPtrVector.isEmpty() )
+  if(!m_SelectedWeakPtrVector.isEmpty())
   {
     EXECUTE_FUNCTION_TEMPLATE(this, verifyArrayList, m_SelectedWeakPtrVector[0].lock(), this, m_SelectedWeakPtrVector)
   }
@@ -304,7 +307,6 @@ void CombineAttributeArrays::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
old mode 100755
new mode 100644
index febd7f6613..4052c5acf1
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -199,7 +199,6 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
    */
   void execute() override;
 
-
   /**
    * @brief Returns the list of deleted data paths.
    * @return
@@ -234,4 +233,3 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
   CombineAttributeArrays& operator=(const CombineAttributeArrays&) = delete; // Copy Assignment Not Implemented
   CombineAttributeArrays& operator=(CombineAttributeArrays&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 5dfaaf284b..d3ca03e951 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CombineAttributeMatrices.h"
 
@@ -49,7 +49,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   CombinedMatrixID = 1
 };
 
@@ -210,9 +211,9 @@ void CombineAttributeMatrices::dataCheck()
   AttributeMatrix::Pointer combinedAttrMat = m->getAttributeMatrix(getCombinedAttributeMatrixName());
 
   std::vector<size_t> cDims(1, 1);
-  m_FirstIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(),
-                                                                                                        cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FirstIndexPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FirstIndexPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_FirstIndexPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FirstIndex = m_FirstIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -221,9 +222,9 @@ void CombineAttributeMatrices::dataCheck()
     return;
   }
 
-  m_SecondIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(),
-                                                                                                         cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_SecondIndexPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_SecondIndexPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_SecondIndexPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_SecondIndex = m_SecondIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -271,8 +272,8 @@ void CombineAttributeMatrices::dataCheck()
   }
 }
 
-
-template <typename T> void copyData(IDataArray::Pointer fromData, IDataArray::Pointer toData, size_t location)
+template <typename T>
+void copyData(IDataArray::Pointer fromData, IDataArray::Pointer toData, size_t location)
 {
   typename DataArray<T>::Pointer fData = std::dynamic_pointer_cast<DataArray<T>>(fromData);
   typename DataArray<T>::Pointer tData = std::dynamic_pointer_cast<DataArray<T>>(toData);
@@ -344,7 +345,6 @@ void CombineAttributeMatrices::execute()
     IDataArray::Pointer toDataArray = combinedAttrMat->getAttributeArray(*iter);
     EXECUTE_FUNCTION_TEMPLATE(this, copyData, fromDataArray, fromDataArray, toDataArray, location);
   }
-
 }
 
 // -----------------------------------------------------------------------------
@@ -352,7 +352,7 @@ void CombineAttributeMatrices::execute()
 // -----------------------------------------------------------------------------
 std::list<DataArrayPath> CombineAttributeMatrices::getDeletedPaths()
 {
-  return { getFirstAttributeMatrixPath(), getSecondAttributeMatrixPath() };
+  return {getFirstAttributeMatrixPath(), getSecondAttributeMatrixPath()};
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
old mode 100755
new mode 100644
index dc015b90b3..252da0b610
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,218 +46,216 @@
  */
 class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CombineAttributeMatrices)
-    PYB11_FILTER_NEW_MACRO(CombineAttributeMatrices)
-    PYB11_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
-    PYB11_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
-    PYB11_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
-    PYB11_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
-    PYB11_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
-    PYB11_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CombineAttributeMatrices;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CombineAttributeMatrices> New();
-
-    /**
-     * @brief Returns the name of the class for CombineAttributeMatrices
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CombineAttributeMatrices
-     */
-    static QString ClassName();
-
-    ~CombineAttributeMatrices() override;
-
-    /**
-     * @brief Setter property for FirstAttributeMatrixPath
-     */
-    void setFirstAttributeMatrixPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FirstAttributeMatrixPath
-     * @return Value of FirstAttributeMatrixPath
-     */
-    DataArrayPath getFirstAttributeMatrixPath() const;
-
-    Q_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
-
-    /**
-     * @brief Setter property for SecondAttributeMatrixPath
-     */
-    void setSecondAttributeMatrixPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SecondAttributeMatrixPath
-     * @return Value of SecondAttributeMatrixPath
-     */
-    DataArrayPath getSecondAttributeMatrixPath() const;
-
-    Q_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
-
-    /**
-     * @brief Setter property for FirstIndexArrayPath
-     */
-    void setFirstIndexArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FirstIndexArrayPath
-     * @return Value of FirstIndexArrayPath
-     */
-    DataArrayPath getFirstIndexArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
-
-    /**
-     * @brief Setter property for SecondIndexArrayPath
-     */
-    void setSecondIndexArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SecondIndexArrayPath
-     * @return Value of SecondIndexArrayPath
-     */
-    DataArrayPath getSecondIndexArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
-
-    /**
-     * @brief Setter property for CombinedAttributeMatrixName
-     */
-    void setCombinedAttributeMatrixName(const QString& value);
-    /**
-     * @brief Getter property for CombinedAttributeMatrixName
-     * @return Value of CombinedAttributeMatrixName
-     */
-    QString getCombinedAttributeMatrixName() const;
-
-    Q_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
-
-    /**
-     * @brief Setter property for NewIndexArrayName
-     */
-    void setNewIndexArrayName(const QString& value);
-    /**
-     * @brief Getter property for NewIndexArrayName
-     * @return Value of NewIndexArrayName
-     */
-    QString getNewIndexArrayName() const;
-
-    Q_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-    */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-     * @brief Returns the list of deleted data paths.
-     * @return
-     */
-    std::list<DataArrayPath> getDeletedPaths();
-
-  protected:
-    CombineAttributeMatrices();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-    /**
-     * @brief updateFeatureInstancePointers Updates raw feature pointers
-     */
-    void updateFeatureInstancePointers();
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_FirstIndexPtr;
-    int32_t* m_FirstIndex = nullptr;
-    std::weak_ptr<DataArray<int32_t>> m_SecondIndexPtr;
-    int32_t* m_SecondIndex = nullptr;
-    std::weak_ptr<DataArray<int32_t>> m_NewIndexPtr;
-    int32_t* m_NewIndex = nullptr;
-
-    DataArrayPath m_FirstAttributeMatrixPath = {};
-    DataArrayPath m_SecondAttributeMatrixPath = {};
-    DataArrayPath m_FirstIndexArrayPath = {};
-    DataArrayPath m_SecondIndexArrayPath = {};
-    QString m_CombinedAttributeMatrixName = {};
-    QString m_NewIndexArrayName = {};
-
-  public:
-    CombineAttributeMatrices(const CombineAttributeMatrices&) = delete; // Copy Constructor Not Implemented
-    CombineAttributeMatrices(CombineAttributeMatrices&&) = delete;      // Move Constructor Not Implemented
-    CombineAttributeMatrices& operator=(const CombineAttributeMatrices&) = delete; // Copy Assignment Not Implemented
-    CombineAttributeMatrices& operator=(CombineAttributeMatrices&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CombineAttributeMatrices SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CombineAttributeMatrices)
+  PYB11_FILTER_NEW_MACRO(CombineAttributeMatrices)
+  PYB11_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
+  PYB11_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
+  PYB11_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
+  PYB11_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
+  PYB11_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
+  PYB11_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CombineAttributeMatrices;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CombineAttributeMatrices> New();
+
+  /**
+   * @brief Returns the name of the class for CombineAttributeMatrices
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CombineAttributeMatrices
+   */
+  static QString ClassName();
+
+  ~CombineAttributeMatrices() override;
+
+  /**
+   * @brief Setter property for FirstAttributeMatrixPath
+   */
+  void setFirstAttributeMatrixPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FirstAttributeMatrixPath
+   * @return Value of FirstAttributeMatrixPath
+   */
+  DataArrayPath getFirstAttributeMatrixPath() const;
+
+  Q_PROPERTY(DataArrayPath FirstAttributeMatrixPath READ getFirstAttributeMatrixPath WRITE setFirstAttributeMatrixPath)
+
+  /**
+   * @brief Setter property for SecondAttributeMatrixPath
+   */
+  void setSecondAttributeMatrixPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SecondAttributeMatrixPath
+   * @return Value of SecondAttributeMatrixPath
+   */
+  DataArrayPath getSecondAttributeMatrixPath() const;
+
+  Q_PROPERTY(DataArrayPath SecondAttributeMatrixPath READ getSecondAttributeMatrixPath WRITE setSecondAttributeMatrixPath)
+
+  /**
+   * @brief Setter property for FirstIndexArrayPath
+   */
+  void setFirstIndexArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FirstIndexArrayPath
+   * @return Value of FirstIndexArrayPath
+   */
+  DataArrayPath getFirstIndexArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath FirstIndexArrayPath READ getFirstIndexArrayPath WRITE setFirstIndexArrayPath)
+
+  /**
+   * @brief Setter property for SecondIndexArrayPath
+   */
+  void setSecondIndexArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SecondIndexArrayPath
+   * @return Value of SecondIndexArrayPath
+   */
+  DataArrayPath getSecondIndexArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SecondIndexArrayPath READ getSecondIndexArrayPath WRITE setSecondIndexArrayPath)
+
+  /**
+   * @brief Setter property for CombinedAttributeMatrixName
+   */
+  void setCombinedAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CombinedAttributeMatrixName
+   * @return Value of CombinedAttributeMatrixName
+   */
+  QString getCombinedAttributeMatrixName() const;
+
+  Q_PROPERTY(QString CombinedAttributeMatrixName READ getCombinedAttributeMatrixName WRITE setCombinedAttributeMatrixName)
+
+  /**
+   * @brief Setter property for NewIndexArrayName
+   */
+  void setNewIndexArrayName(const QString& value);
+  /**
+   * @brief Getter property for NewIndexArrayName
+   * @return Value of NewIndexArrayName
+   */
+  QString getNewIndexArrayName() const;
+
+  Q_PROPERTY(QString NewIndexArrayName READ getNewIndexArrayName WRITE setNewIndexArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief Returns the list of deleted data paths.
+   * @return
+   */
+  std::list<DataArrayPath> getDeletedPaths();
+
+protected:
+  CombineAttributeMatrices();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief updateFeatureInstancePointers Updates raw feature pointers
+   */
+  void updateFeatureInstancePointers();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_FirstIndexPtr;
+  int32_t* m_FirstIndex = nullptr;
+  std::weak_ptr<DataArray<int32_t>> m_SecondIndexPtr;
+  int32_t* m_SecondIndex = nullptr;
+  std::weak_ptr<DataArray<int32_t>> m_NewIndexPtr;
+  int32_t* m_NewIndex = nullptr;
+
+  DataArrayPath m_FirstAttributeMatrixPath = {};
+  DataArrayPath m_SecondAttributeMatrixPath = {};
+  DataArrayPath m_FirstIndexArrayPath = {};
+  DataArrayPath m_SecondIndexArrayPath = {};
+  QString m_CombinedAttributeMatrixName = {};
+  QString m_NewIndexArrayName = {};
+
+public:
+  CombineAttributeMatrices(const CombineAttributeMatrices&) = delete;            // Copy Constructor Not Implemented
+  CombineAttributeMatrices(CombineAttributeMatrices&&) = delete;                 // Move Constructor Not Implemented
+  CombineAttributeMatrices& operator=(const CombineAttributeMatrices&) = delete; // Copy Assignment Not Implemented
+  CombineAttributeMatrices& operator=(CombineAttributeMatrices&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index d62e6d5da1..8f960b40f7 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ConditionalSetValue.h"
 
 #include <tuple>
@@ -240,7 +240,6 @@ void ConditionalSetValue::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
old mode 100755
new mode 100644
index 6fc4a29080..abc4fc6b10
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,164 +47,161 @@
  */
 class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ConditionalSetValue)
-    PYB11_FILTER_NEW_MACRO(ConditionalSetValue)
-    PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-    PYB11_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
-    PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ConditionalSetValue;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ConditionalSetValue> New();
-
-    /**
-     * @brief Returns the name of the class for ConditionalSetValue
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ConditionalSetValue
-     */
-    static QString ClassName();
-
-    ~ConditionalSetValue() override;
-
-    /**
-     * @brief Setter property for SelectedArrayPath
-     */
-    void setSelectedArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedArrayPath
-     * @return Value of SelectedArrayPath
-     */
-    DataArrayPath getSelectedArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-
-    /**
-     * @brief Setter property for ConditionalArrayPath
-     */
-    void setConditionalArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for ConditionalArrayPath
-     * @return Value of ConditionalArrayPath
-     */
-    DataArrayPath getConditionalArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
-
-    /**
-     * @brief Setter property for ReplaceValue
-     */
-    void setReplaceValue(double value);
-    /**
-     * @brief Getter property for ReplaceValue
-     * @return Value of ReplaceValue
-     */
-    double getReplaceValue() const;
-
-    Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ConditionalSetValue();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<bool>> m_ConditionalArrayPtr;
-    bool* m_ConditionalArray = nullptr;
-
-    DataArrayPath m_SelectedArrayPath = {};
-    DataArrayPath m_ConditionalArrayPath = {};
-    double m_ReplaceValue = {};
-
-    IDataArray::WeakPointer m_ArrayPtr;
-
-  public:
-    ConditionalSetValue(const ConditionalSetValue&) = delete; // Copy Constructor Not Implemented
-    ConditionalSetValue(ConditionalSetValue&&) = delete;      // Move Constructor Not Implemented
-    ConditionalSetValue& operator=(const ConditionalSetValue&) = delete; // Copy Assignment Not Implemented
-    ConditionalSetValue& operator=(ConditionalSetValue&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ConditionalSetValue SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ConditionalSetValue)
+  PYB11_FILTER_NEW_MACRO(ConditionalSetValue)
+  PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+  PYB11_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
+  PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ConditionalSetValue;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ConditionalSetValue> New();
+
+  /**
+   * @brief Returns the name of the class for ConditionalSetValue
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConditionalSetValue
+   */
+  static QString ClassName();
+
+  ~ConditionalSetValue() override;
+
+  /**
+   * @brief Setter property for SelectedArrayPath
+   */
+  void setSelectedArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArrayPath
+   * @return Value of SelectedArrayPath
+   */
+  DataArrayPath getSelectedArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+
+  /**
+   * @brief Setter property for ConditionalArrayPath
+   */
+  void setConditionalArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for ConditionalArrayPath
+   * @return Value of ConditionalArrayPath
+   */
+  DataArrayPath getConditionalArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath ConditionalArrayPath READ getConditionalArrayPath WRITE setConditionalArrayPath)
+
+  /**
+   * @brief Setter property for ReplaceValue
+   */
+  void setReplaceValue(double value);
+  /**
+   * @brief Getter property for ReplaceValue
+   * @return Value of ReplaceValue
+   */
+  double getReplaceValue() const;
+
+  Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ConditionalSetValue();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<bool>> m_ConditionalArrayPtr;
+  bool* m_ConditionalArray = nullptr;
+
+  DataArrayPath m_SelectedArrayPath = {};
+  DataArrayPath m_ConditionalArrayPath = {};
+  double m_ReplaceValue = {};
+
+  IDataArray::WeakPointer m_ArrayPtr;
+
+public:
+  ConditionalSetValue(const ConditionalSetValue&) = delete;            // Copy Constructor Not Implemented
+  ConditionalSetValue(ConditionalSetValue&&) = delete;                 // Move Constructor Not Implemented
+  ConditionalSetValue& operator=(const ConditionalSetValue&) = delete; // Copy Assignment Not Implemented
+  ConditionalSetValue& operator=(ConditionalSetValue&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 21d4b2dde9..f3cd6cc905 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -1,40 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of
-* its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of
+ * its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ConvertColorToGrayScale.h"
 
 #include <algorithm>
@@ -71,11 +71,11 @@ class LuminosityImpl
   , m_NumComp(comp)
   {
   }
-  LuminosityImpl(const LuminosityImpl&) = default; // Copy Constructor Not Implemented
-  LuminosityImpl(LuminosityImpl&&) = default;      // Move Constructor Not Implemented
+  LuminosityImpl(const LuminosityImpl&) = default;           // Copy Constructor Not Implemented
+  LuminosityImpl(LuminosityImpl&&) = default;                // Move Constructor Not Implemented
   LuminosityImpl& operator=(const LuminosityImpl&) = delete; // Copy Assignment Not Implemented
   LuminosityImpl& operator=(LuminosityImpl&&) = delete;      // Move Assignment Not Implemented
-  ~LuminosityImpl()  = default;
+  ~LuminosityImpl() = default;
 
   void convert(size_t start, size_t end) const
   {
@@ -86,7 +86,10 @@ class LuminosityImpl
     }
   }
 
-   void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
+  void operator()(const SIMPLRange& range) const
+  {
+    convert(range.min(), range.max());
+  }
 };
 
 class LightnessImpl
@@ -103,24 +106,25 @@ class LightnessImpl
   , m_NumComp(comp)
   {
   }
-  LightnessImpl(const LightnessImpl&) = default; // Copy Constructor Not Implemented
-  LightnessImpl(LightnessImpl&&) = default;      // Move Constructor Not Implemented
+  LightnessImpl(const LightnessImpl&) = default;           // Copy Constructor Not Implemented
+  LightnessImpl(LightnessImpl&&) = default;                // Move Constructor Not Implemented
   LightnessImpl& operator=(const LightnessImpl&) = delete; // Copy Assignment Not Implemented
   LightnessImpl& operator=(LightnessImpl&&) = delete;      // Move Assignment Not Implemented
-  ~LightnessImpl()  = default;
+  ~LightnessImpl() = default;
 
   void convert(size_t start, size_t end) const
   {
     for(size_t i = start; i < end; i++)
     {
-      std::pair<uint8_t*, uint8_t*> minmax{
-        std::minmax_element(m_ImageData + (start * m_NumComp), m_ImageData + (end * m_NumComp))
-      };
+      std::pair<uint8_t*, uint8_t*> minmax{std::minmax_element(m_ImageData + (start * m_NumComp), m_ImageData + (end * m_NumComp))};
       m_FlatImageData[i] = static_cast<uint8_t>(roundf((minmax.first[0] + minmax.second[0]) / 2.0f));
     }
   }
 
-  void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
+  void operator()(const SIMPLRange& range) const
+  {
+    convert(range.min(), range.max());
+  }
 };
 
 class SingleChannelImpl
@@ -139,11 +143,11 @@ class SingleChannelImpl
   , m_Channel(channel)
   {
   }
-  SingleChannelImpl(const SingleChannelImpl&) = default; // Copy Constructor Not Implemented
-  SingleChannelImpl(SingleChannelImpl&&) = default;      // Move Constructor Not Implemented
+  SingleChannelImpl(const SingleChannelImpl&) = default;           // Copy Constructor Not Implemented
+  SingleChannelImpl(SingleChannelImpl&&) = default;                // Move Constructor Not Implemented
   SingleChannelImpl& operator=(const SingleChannelImpl&) = delete; // Copy Assignment Not Implemented
   SingleChannelImpl& operator=(SingleChannelImpl&&) = delete;      // Move Assignment Not Implemented
-  ~SingleChannelImpl()  = default;
+  ~SingleChannelImpl() = default;
 
   void convert(size_t start, size_t end) const
   {
@@ -153,29 +157,31 @@ class SingleChannelImpl
     }
   }
 
-   void operator()(const SIMPLRange& range) const { convert(range.min(), range.max()); }
-
+  void operator()(const SIMPLRange& range) const
+  {
+    convert(range.min(), range.max());
+  }
 };
 
 class ParallelWrapper
 {
-  public:
-    ~ParallelWrapper() = default;
-    ParallelWrapper(const ParallelWrapper&) = delete; // Copy Constructor Not Implemented
-    ParallelWrapper(ParallelWrapper&&) = delete;      // Move Constructor Not Implemented
-    ParallelWrapper& operator=(const ParallelWrapper&) = delete; // Copy Assignment Not Implemented
-    ParallelWrapper& operator=(ParallelWrapper&&) = delete;      // Move Assignment Not Implemented
-
-    template<typename T>
-    static void Run(T impl, size_t totalPoints)
-    {
-      ParallelDataAlgorithm dataAlg;
-      dataAlg.setRange(0, totalPoints);
-      dataAlg.execute(impl);
-    }
+public:
+  ~ParallelWrapper() = default;
+  ParallelWrapper(const ParallelWrapper&) = delete;            // Copy Constructor Not Implemented
+  ParallelWrapper(ParallelWrapper&&) = delete;                 // Move Constructor Not Implemented
+  ParallelWrapper& operator=(const ParallelWrapper&) = delete; // Copy Assignment Not Implemented
+  ParallelWrapper& operator=(ParallelWrapper&&) = delete;      // Move Assignment Not Implemented
+
+  template <typename T>
+  static void Run(T impl, size_t totalPoints)
+  {
+    ParallelDataAlgorithm dataAlg;
+    dataAlg.setRange(0, totalPoints);
+    dataAlg.execute(impl);
+  }
 
-  protected:
-    ParallelWrapper() = default;
+protected:
+  ParallelWrapper() = default;
 };
 
 // -----------------------------------------------------------------------------
@@ -245,7 +251,9 @@ void ConvertColorToGrayScale::setupFilterParameters()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConvertColorToGrayScale::initialize() { }
+void ConvertColorToGrayScale::initialize()
+{
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -332,7 +340,6 @@ void ConvertColorToGrayScale::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -371,9 +378,7 @@ void ConvertColorToGrayScale::execute()
     }
 
     DataArrayPath newPath = m_OutputArrayPaths[i];
-    UInt8ArrayType::Pointer outputGrayData = getDataContainerArray()->
-                                             getAttributeMatrix(newPath)->
-                                             getAttributeArrayAs<UInt8ArrayType>(newPath.getDataArrayName());
+    UInt8ArrayType::Pointer outputGrayData = getDataContainerArray()->getAttributeMatrix(newPath)->getAttributeArrayAs<UInt8ArrayType>(newPath.getDataArrayName());
 
     if(nullptr == outputGrayData.get())
     {
@@ -387,20 +392,20 @@ void ConvertColorToGrayScale::execute()
     size_t comp = inputColorData->getNumberOfComponents();
     size_t totalPoints = inputColorData->getNumberOfTuples();
 
-    switch (convType)
+    switch(convType)
     {
-      case ConversionType::Luminosity:
-        ParallelWrapper::Run<LuminosityImpl>(LuminosityImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), m_ColorWeights, comp), totalPoints );
-        break;
-      case ConversionType::Average:
-        ParallelWrapper::Run<LuminosityImpl>(LuminosityImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), {0.3333f, 0.3333f, 0.3333f}, comp) , totalPoints);
-        break;
-      case ConversionType::Lightness:
-        ParallelWrapper::Run<LightnessImpl>(LightnessImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp) , totalPoints);
-        break;
-      case ConversionType::SingleChannel:
-        ParallelWrapper::Run<SingleChannelImpl>(SingleChannelImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp, getColorChannel()) , totalPoints);
-        break;
+    case ConversionType::Luminosity:
+      ParallelWrapper::Run<LuminosityImpl>(LuminosityImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), m_ColorWeights, comp), totalPoints);
+      break;
+    case ConversionType::Average:
+      ParallelWrapper::Run<LuminosityImpl>(LuminosityImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), {0.3333f, 0.3333f, 0.3333f}, comp), totalPoints);
+      break;
+    case ConversionType::Lightness:
+      ParallelWrapper::Run<LightnessImpl>(LightnessImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp), totalPoints);
+      break;
+    case ConversionType::SingleChannel:
+      ParallelWrapper::Run<SingleChannelImpl>(SingleChannelImpl(inputColorData->getPointer(0), outputGrayData->getPointer(0), comp, getColorChannel()), totalPoints);
+      break;
     }
   }
 }
@@ -423,7 +428,7 @@ AbstractFilter::Pointer ConvertColorToGrayScale::newFilterInstance(bool copyFilt
 // -----------------------------------------------------------------------------
 QString ConvertColorToGrayScale::getCompiledLibraryName() const
 {
-  return  Core::CoreBaseName;
+  return Core::CoreBaseName;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 77fe4fbdda..21e7ad26bb 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -240,7 +240,6 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ConvertColorToGrayScale();
   /**
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 98d3fdbc6e..1c168eef0f 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ConvertData.h"
 
 #include <iostream>
@@ -321,7 +321,6 @@ void ConvertData::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -340,7 +339,7 @@ void ConvertData::execute()
 
   IDataArray::Pointer iArray = am->getAttributeArray(m_SelectedCellArrayPath.getDataArrayName());
 
-  if (nullptr == iArray.get())
+  if(nullptr == iArray.get())
   {
     setErrorCondition(-90002, tr("Data Array '%1' does not exist.").arg(m_SelectedCellArrayPath.getDataArrayName()));
     return;
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
old mode 100755
new mode 100644
index 964b11980b..64fad29072
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,159 +46,156 @@
  */
 class SIMPLib_EXPORT ConvertData : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ConvertData)
-    PYB11_FILTER_NEW_MACRO(ConvertData)
-    PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-    PYB11_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
-    PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ConvertData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ConvertData> New();
-
-    /**
-     * @brief Returns the name of the class for ConvertData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ConvertData
-     */
-    static QString ClassName();
-
-    ~ConvertData() override;
-
-    /**
-     * @brief Setter property for ScalarType
-     */
-    void setScalarType(SIMPL::NumericTypes::Type value);
-    /**
-     * @brief Getter property for ScalarType
-     * @return Value of ScalarType
-     */
-    SIMPL::NumericTypes::Type getScalarType() const;
-
-    Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-
-    /**
-     * @brief Setter property for OutputArrayName
-     */
-    void setOutputArrayName(const QString& value);
-    /**
-     * @brief Getter property for OutputArrayName
-     * @return Value of OutputArrayName
-     */
-    QString getOutputArrayName() const;
-
-    Q_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
-
-    /**
-     * @brief Setter property for SelectedCellArrayPath
-     */
-    void setSelectedCellArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedCellArrayPath
-     * @return Value of SelectedCellArrayPath
-     */
-    DataArrayPath getSelectedCellArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ConvertData();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  public:
-    ConvertData(const ConvertData&) = delete;    // Copy Constructor Not Implemented
-    ConvertData(ConvertData&&) = delete;         // Move Constructor Not Implemented
-    ConvertData& operator=(const ConvertData&) = delete; // Copy Assignment Not Implemented
-    ConvertData& operator=(ConvertData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    SIMPL::NumericTypes::Type m_ScalarType = {};
-    QString m_OutputArrayName = {};
-    DataArrayPath m_SelectedCellArrayPath = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ConvertData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ConvertData)
+  PYB11_FILTER_NEW_MACRO(ConvertData)
+  PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+  PYB11_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
+  PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ConvertData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ConvertData> New();
+
+  /**
+   * @brief Returns the name of the class for ConvertData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConvertData
+   */
+  static QString ClassName();
+
+  ~ConvertData() override;
+
+  /**
+   * @brief Setter property for ScalarType
+   */
+  void setScalarType(SIMPL::NumericTypes::Type value);
+  /**
+   * @brief Getter property for ScalarType
+   * @return Value of ScalarType
+   */
+  SIMPL::NumericTypes::Type getScalarType() const;
+
+  Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+
+  /**
+   * @brief Setter property for OutputArrayName
+   */
+  void setOutputArrayName(const QString& value);
+  /**
+   * @brief Getter property for OutputArrayName
+   * @return Value of OutputArrayName
+   */
+  QString getOutputArrayName() const;
+
+  Q_PROPERTY(QString OutputArrayName READ getOutputArrayName WRITE setOutputArrayName)
+
+  /**
+   * @brief Setter property for SelectedCellArrayPath
+   */
+  void setSelectedCellArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedCellArrayPath
+   * @return Value of SelectedCellArrayPath
+   */
+  DataArrayPath getSelectedCellArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ConvertData();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  ConvertData(const ConvertData&) = delete;            // Copy Constructor Not Implemented
+  ConvertData(ConvertData&&) = delete;                 // Move Constructor Not Implemented
+  ConvertData& operator=(const ConvertData&) = delete; // Copy Assignment Not Implemented
+  ConvertData& operator=(ConvertData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  SIMPL::NumericTypes::Type m_ScalarType = {};
+  QString m_OutputArrayName = {};
+  DataArrayPath m_SelectedCellArrayPath = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index a2329673e4..0370c2c910 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CopyFeatureArrayToElementArray.h"
 
 #include <QtCore/QTextStream>
@@ -46,7 +46,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   ElementArrayID = 1
 };
 
@@ -85,7 +86,8 @@ void CopyFeatureArrayToElementArray::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::RequiredArray, CopyFeatureArrayToElementArray, req));
   }
   parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, FeatureIdsArrayPath, FeatureIdsArrayPath, FilterParameter::CreatedArray, CopyFeatureArrayToElementArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, FeatureIdsArrayPath, FeatureIdsArrayPath, FilterParameter::CreatedArray, CopyFeatureArrayToElementArray));
 
   setFilterParameters(parameters);
 }
@@ -124,15 +126,14 @@ void CopyFeatureArrayToElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
-                                                                                                        cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FeatureIdsPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
-  m_InArrayPtr =
-      getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
 
   DataArrayPath tempPath(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), "");
   getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, tempPath, -301);
@@ -146,11 +147,11 @@ void CopyFeatureArrayToElementArray::dataCheck()
   TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), ElementArrayID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> IDataArray::Pointer copyData(IDataArray::Pointer inputData, size_t totalPoints, int32_t* featureIds)
+template <typename T>
+IDataArray::Pointer copyData(IDataArray::Pointer inputData, size_t totalPoints, int32_t* featureIds)
 {
   QString cellArrayName = inputData->getName();
 
@@ -290,7 +291,6 @@ void CopyFeatureArrayToElementArray::execute()
     AttributeMatrix::Pointer am = getDataContainerArray()->getAttributeMatrix(getFeatureIdsArrayPath());
     am->insertOrAssign(p);
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
old mode 100755
new mode 100644
index f0d6dda540..2b8cdf5758
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,164 +49,161 @@ using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CopyFeatureArrayToElementArray)
-    PYB11_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
-    PYB11_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
-    PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-    PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CopyFeatureArrayToElementArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CopyFeatureArrayToElementArray> New();
-
-    /**
-     * @brief Returns the name of the class for CopyFeatureArrayToElementArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CopyFeatureArrayToElementArray
-     */
-    static QString ClassName();
-
-    ~CopyFeatureArrayToElementArray() override;
-
-    /**
-     * @brief Setter property for SelectedFeatureArrayPath
-     */
-    void setSelectedFeatureArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedFeatureArrayPath
-     * @return Value of SelectedFeatureArrayPath
-     */
-    DataArrayPath getSelectedFeatureArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
-
-    /**
-     * @brief Setter property for FeatureIdsArrayPath
-     */
-    void setFeatureIdsArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FeatureIdsArrayPath
-     * @return Value of FeatureIdsArrayPath
-     */
-    DataArrayPath getFeatureIdsArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-
-    /**
-     * @brief Setter property for CreatedArrayName
-     */
-    void setCreatedArrayName(const QString& value);
-    /**
-     * @brief Getter property for CreatedArrayName
-     * @return Value of CreatedArrayName
-     */
-    QString getCreatedArrayName() const;
-
-    Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CopyFeatureArrayToElementArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
-    int32_t* m_FeatureIds = nullptr;
-
-    IDataArrayWkPtrType m_InArrayPtr;
-
-    DataArrayPath m_SelectedFeatureArrayPath = {};
-    DataArrayPath m_FeatureIdsArrayPath = {};
-    QString m_CreatedArrayName = {};
-
-  public:
-    CopyFeatureArrayToElementArray(const CopyFeatureArrayToElementArray&) = delete; // Copy Constructor Not Implemented
-    CopyFeatureArrayToElementArray(CopyFeatureArrayToElementArray&&) = delete;      // Move Constructor Not Implemented
-    CopyFeatureArrayToElementArray& operator=(const CopyFeatureArrayToElementArray&) = delete; // Copy Assignment Not Implemented
-    CopyFeatureArrayToElementArray& operator=(CopyFeatureArrayToElementArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CopyFeatureArrayToElementArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CopyFeatureArrayToElementArray)
+  PYB11_FILTER_NEW_MACRO(CopyFeatureArrayToElementArray)
+  PYB11_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
+  PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+  PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CopyFeatureArrayToElementArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CopyFeatureArrayToElementArray> New();
+
+  /**
+   * @brief Returns the name of the class for CopyFeatureArrayToElementArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CopyFeatureArrayToElementArray
+   */
+  static QString ClassName();
+
+  ~CopyFeatureArrayToElementArray() override;
+
+  /**
+   * @brief Setter property for SelectedFeatureArrayPath
+   */
+  void setSelectedFeatureArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedFeatureArrayPath
+   * @return Value of SelectedFeatureArrayPath
+   */
+  DataArrayPath getSelectedFeatureArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedFeatureArrayPath READ getSelectedFeatureArrayPath WRITE setSelectedFeatureArrayPath)
+
+  /**
+   * @brief Setter property for FeatureIdsArrayPath
+   */
+  void setFeatureIdsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FeatureIdsArrayPath
+   * @return Value of FeatureIdsArrayPath
+   */
+  DataArrayPath getFeatureIdsArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+
+  /**
+   * @brief Setter property for CreatedArrayName
+   */
+  void setCreatedArrayName(const QString& value);
+  /**
+   * @brief Getter property for CreatedArrayName
+   * @return Value of CreatedArrayName
+   */
+  QString getCreatedArrayName() const;
+
+  Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CopyFeatureArrayToElementArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+  int32_t* m_FeatureIds = nullptr;
+
+  IDataArrayWkPtrType m_InArrayPtr;
+
+  DataArrayPath m_SelectedFeatureArrayPath = {};
+  DataArrayPath m_FeatureIdsArrayPath = {};
+  QString m_CreatedArrayName = {};
+
+public:
+  CopyFeatureArrayToElementArray(const CopyFeatureArrayToElementArray&) = delete;            // Copy Constructor Not Implemented
+  CopyFeatureArrayToElementArray(CopyFeatureArrayToElementArray&&) = delete;                 // Move Constructor Not Implemented
+  CopyFeatureArrayToElementArray& operator=(const CopyFeatureArrayToElementArray&) = delete; // Copy Assignment Not Implemented
+  CopyFeatureArrayToElementArray& operator=(CopyFeatureArrayToElementArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 0dd94dbedf..b8e26c47d4 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -48,7 +48,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataContainerID = 1,
   AttributeMatrixID,
   DataArrayID
@@ -151,8 +152,7 @@ void CopyObject::dataCheck()
   switch(getObjectToCopy())
   {
   // Copy Data Container
-  case 0:
-  {
+  case 0: {
     if(getDataContainerArray()->doesDataContainerExist(getCopiedObjectName()))
     {
       QString ss = QObject::tr("A Data Container already exists with the name %1").arg(getCopiedObjectName());
@@ -174,8 +174,7 @@ void CopyObject::dataCheck()
     break;
   }
   // Copy Attribute Matrix
-  case 1:
-  {
+  case 1: {
     DataArrayPath path(getAttributeMatrixToCopy().getDataContainerName(), getCopiedObjectName(), "");
     if(getDataContainerArray()->doesAttributeMatrixExist(path))
     {
@@ -198,8 +197,7 @@ void CopyObject::dataCheck()
     break;
   }
   // Copy Attribute Array
-  case 2:
-  {
+  case 2: {
     DataArrayPath path(getAttributeArrayToCopy().getDataContainerName(), getAttributeArrayToCopy().getAttributeMatrixName(), getCopiedObjectName());
     if(getDataContainerArray()->doesAttributeArrayExist(path))
     {
@@ -221,14 +219,12 @@ void CopyObject::dataCheck()
 
     break;
   }
-  default:
-  {
+  default: {
     break;
   }
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -241,7 +237,6 @@ void CopyObject::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 8e6cf97d8d..2d316a5d0f 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -66,7 +66,7 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -210,7 +210,6 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   CopyObject();
   /**
@@ -236,4 +235,3 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   DataArrayPath m_AttributeArrayToCopy = {};
   QString m_CopiedObjectName = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 3a6af3d2b8..7659da7e56 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CreateAttributeMatrix.h"
 
 #include <QtCore/QTextStream>
@@ -45,7 +45,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   AttributeMatrixID = 1
 };
 
@@ -156,7 +157,6 @@ void CreateAttributeMatrix::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -174,7 +174,6 @@ void CreateAttributeMatrix::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
old mode 100755
new mode 100644
index d6896b3198..98128e04a8
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,159 +46,156 @@
  */
 class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateAttributeMatrix)
-    PYB11_FILTER_NEW_MACRO(CreateAttributeMatrix)
-    PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
-    PYB11_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
-    PYB11_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateAttributeMatrix;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateAttributeMatrix> New();
-
-    /**
-     * @brief Returns the name of the class for CreateAttributeMatrix
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateAttributeMatrix
-     */
-    static QString ClassName();
-
-    ~CreateAttributeMatrix() override;
-
-    /**
-     * @brief Setter property for CreatedAttributeMatrix
-     */
-    void setCreatedAttributeMatrix(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CreatedAttributeMatrix
-     * @return Value of CreatedAttributeMatrix
-     */
-    DataArrayPath getCreatedAttributeMatrix() const;
-
-    Q_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
-
-    /**
-     * @brief Setter property for AttributeMatrixType
-     */
-    void setAttributeMatrixType(int value);
-    /**
-     * @brief Getter property for AttributeMatrixType
-     * @return Value of AttributeMatrixType
-     */
-    int getAttributeMatrixType() const;
-
-    Q_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
-
-    /**
-     * @brief Setter property for TupleDimensions
-     */
-    void setTupleDimensions(const DynamicTableData& value);
-    /**
-     * @brief Getter property for TupleDimensions
-     * @return Value of TupleDimensions
-     */
-    DynamicTableData getTupleDimensions() const;
-
-    Q_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateAttributeMatrix();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  public:
-    CreateAttributeMatrix(const CreateAttributeMatrix&) = delete; // Copy Constructor Not Implemented
-    CreateAttributeMatrix(CreateAttributeMatrix&&) = delete;      // Move Constructor Not Implemented
-    CreateAttributeMatrix& operator=(const CreateAttributeMatrix&) = delete; // Copy Assignment Not Implemented
-    CreateAttributeMatrix& operator=(CreateAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_CreatedAttributeMatrix = {};
-    int m_AttributeMatrixType = {};
-    DynamicTableData m_TupleDimensions = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateAttributeMatrix SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateAttributeMatrix)
+  PYB11_FILTER_NEW_MACRO(CreateAttributeMatrix)
+  PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
+  PYB11_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
+  PYB11_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateAttributeMatrix;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateAttributeMatrix> New();
+
+  /**
+   * @brief Returns the name of the class for CreateAttributeMatrix
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateAttributeMatrix
+   */
+  static QString ClassName();
+
+  ~CreateAttributeMatrix() override;
+
+  /**
+   * @brief Setter property for CreatedAttributeMatrix
+   */
+  void setCreatedAttributeMatrix(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedAttributeMatrix
+   * @return Value of CreatedAttributeMatrix
+   */
+  DataArrayPath getCreatedAttributeMatrix() const;
+
+  Q_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
+
+  /**
+   * @brief Setter property for AttributeMatrixType
+   */
+  void setAttributeMatrixType(int value);
+  /**
+   * @brief Getter property for AttributeMatrixType
+   * @return Value of AttributeMatrixType
+   */
+  int getAttributeMatrixType() const;
+
+  Q_PROPERTY(int AttributeMatrixType READ getAttributeMatrixType WRITE setAttributeMatrixType)
+
+  /**
+   * @brief Setter property for TupleDimensions
+   */
+  void setTupleDimensions(const DynamicTableData& value);
+  /**
+   * @brief Getter property for TupleDimensions
+   * @return Value of TupleDimensions
+   */
+  DynamicTableData getTupleDimensions() const;
+
+  Q_PROPERTY(DynamicTableData TupleDimensions READ getTupleDimensions WRITE setTupleDimensions)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateAttributeMatrix();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  CreateAttributeMatrix(const CreateAttributeMatrix&) = delete;            // Copy Constructor Not Implemented
+  CreateAttributeMatrix(CreateAttributeMatrix&&) = delete;                 // Move Constructor Not Implemented
+  CreateAttributeMatrix& operator=(const CreateAttributeMatrix&) = delete; // Copy Assignment Not Implemented
+  CreateAttributeMatrix& operator=(CreateAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_CreatedAttributeMatrix = {};
+  int m_AttributeMatrixType = {};
+  DynamicTableData m_TupleDimensions = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 364a841a17..1102c515d4 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CreateDataArray.h"
 
-
 #include <limits>
 #include <random>
 #include <chrono>
@@ -229,13 +228,13 @@ void initializeArrayWithBool(IDataArray::Pointer outputArrayPtr, int initializat
 }
 
 /**
-* @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
-* manual value entered in the filter, or with a random number.  This function does not
-* check that the template type actually is a non-integer, so it will most likely cause
-* unexpected results when passing anything other than a float or double as a template
-* parameter.
-* @param p The array that will be initialized
-*/
+ * @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
+ * manual value entered in the filter, or with a random number.  This function does not
+ * check that the template type actually is a non-integer, so it will most likely cause
+ * unexpected results when passing anything other than a float or double as a template
+ * parameter.
+ * @param p The array that will be initialized
+ */
 template <typename T>
 void initializeArrayWithReals(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const std::vector<T>& initValues)
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index 69a5903f51..7bbc15e7b7 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,229 +50,225 @@ using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT CreateDataArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateDataArray)
-    PYB11_FILTER_NEW_MACRO(CreateDataArray)
-    PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-    PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-    PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
-    PYB11_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
-    PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
-    PYB11_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateDataArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateDataArray> New();
-
-    /**
-     * @brief Returns the name of the class for CreateDataArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateDataArray
-     */
-    static QString ClassName();
-
-    ~CreateDataArray() override;
-
-    enum InitializationChoices
-    {
-      Manual,
-      RandomWithRange
-    };
-
-    /**
-     * @brief Setter property for ScalarType
-     */
-    void setScalarType(SIMPL::ScalarTypes::Type value);
-    /**
-     * @brief Getter property for ScalarType
-     * @return Value of ScalarType
-     */
-    SIMPL::ScalarTypes::Type getScalarType() const;
-
-    Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-
-    /**
-     * @brief Setter property for NumberOfComponents
-     */
-    void setNumberOfComponents(int value);
-    /**
-     * @brief Getter property for NumberOfComponents
-     * @return Value of NumberOfComponents
-     */
-    int getNumberOfComponents() const;
-
-    Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-
-    /**
-     * @brief Setter property for NewArray
-     */
-    void setNewArray(const DataArrayPath& value);
-    /**
-     * @brief Getter property for NewArray
-     * @return Value of NewArray
-     */
-    DataArrayPath getNewArray() const;
-
-    Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
-
-    /**
-     * @brief Setter property for InitializationType
-     */
-    void setInitializationType(int value);
-    /**
-     * @brief Getter property for InitializationType
-     * @return Value of InitializationType
-     */
-    int getInitializationType() const;
-
-    Q_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
-
-    /**
-     * @brief Setter property for InitializationValue
-     */
-    void setInitializationValue(const QString& value);
-    /**
-     * @brief Getter property for InitializationValue
-     * @return Value of InitializationValue
-     */
-    QString getInitializationValue() const;
-
-    Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
-
-    /**
-     * @brief Setter property for InitializationRange
-     */
-    void setInitializationRange(const FPRangePair& value);
-    /**
-     * @brief Getter property for InitializationRange
-     * @return Value of InitializationRange
-     */
-    FPRangePair getInitializationRange() const;
-
-    Q_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateDataArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    IDataArrayWkPtrType m_OutputArrayPtr;
-
-    SIMPL::ScalarTypes::Type m_ScalarType = {SIMPL::ScalarTypes::Type::Int8};
-    int m_NumberOfComponents = {0};
-    DataArrayPath m_NewArray = {"", "", ""};
-    int m_InitializationType = {Manual};
-    QString m_InitializationValue = {"0"};
-    FPRangePair m_InitializationRange = {};
-
-    /**
-    * @brief checkInitialization Checks that the chosen initialization value/range is inside
-    * the bounds of the array type
-    */
-    template <typename T>
-    void checkInitialization(QString dataArrayName);
-
-    const QString Int8 = "signed   int 8  bit";
-    const QString UInt8 = "unsigned int 8  bit";
-    const QString Int16 = "signed   int 16 bit";
-    const QString UInt16 = "unsigned int 16 bit";
-    const QString Int32 = "signed   int 32 bit";
-    const QString UInt32 = "unsigned int 32 bit";
-    const QString Int64 = "signed   int 64 bit";
-    const QString UInt64 = "unsigned int 64 bit";
-    const QString Float = "       Float 32 bit";
-    const QString Double = "      Double 64 bit";
-    const QString Bool = "bool";
-
-  public:
-    CreateDataArray(const CreateDataArray&) = delete; // Copy Constructor Not Implemented
-    CreateDataArray(CreateDataArray&&) = delete;      // Move Constructor Not Implemented
-    CreateDataArray& operator=(const CreateDataArray&) = delete; // Copy Assignment Not Implemented
-    CreateDataArray& operator=(CreateDataArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateDataArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateDataArray)
+  PYB11_FILTER_NEW_MACRO(CreateDataArray)
+  PYB11_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+  PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
+  PYB11_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
+  PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
+  PYB11_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateDataArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateDataArray> New();
+
+  /**
+   * @brief Returns the name of the class for CreateDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateDataArray
+   */
+  static QString ClassName();
+
+  ~CreateDataArray() override;
+
+  enum InitializationChoices
+  {
+    Manual,
+    RandomWithRange
+  };
+
+  /**
+   * @brief Setter property for ScalarType
+   */
+  void setScalarType(SIMPL::ScalarTypes::Type value);
+  /**
+   * @brief Getter property for ScalarType
+   * @return Value of ScalarType
+   */
+  SIMPL::ScalarTypes::Type getScalarType() const;
+
+  Q_PROPERTY(SIMPL::ScalarTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+
+  /**
+   * @brief Setter property for NumberOfComponents
+   */
+  void setNumberOfComponents(int value);
+  /**
+   * @brief Getter property for NumberOfComponents
+   * @return Value of NumberOfComponents
+   */
+  int getNumberOfComponents() const;
+
+  Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+
+  /**
+   * @brief Setter property for NewArray
+   */
+  void setNewArray(const DataArrayPath& value);
+  /**
+   * @brief Getter property for NewArray
+   * @return Value of NewArray
+   */
+  DataArrayPath getNewArray() const;
+
+  Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
+
+  /**
+   * @brief Setter property for InitializationType
+   */
+  void setInitializationType(int value);
+  /**
+   * @brief Getter property for InitializationType
+   * @return Value of InitializationType
+   */
+  int getInitializationType() const;
+
+  Q_PROPERTY(int InitializationType READ getInitializationType WRITE setInitializationType)
+
+  /**
+   * @brief Setter property for InitializationValue
+   */
+  void setInitializationValue(const QString& value);
+  /**
+   * @brief Getter property for InitializationValue
+   * @return Value of InitializationValue
+   */
+  QString getInitializationValue() const;
+
+  Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
+
+  /**
+   * @brief Setter property for InitializationRange
+   */
+  void setInitializationRange(const FPRangePair& value);
+  /**
+   * @brief Getter property for InitializationRange
+   * @return Value of InitializationRange
+   */
+  FPRangePair getInitializationRange() const;
+
+  Q_PROPERTY(FPRangePair InitializationRange READ getInitializationRange WRITE setInitializationRange)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateDataArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  IDataArrayWkPtrType m_OutputArrayPtr;
+
+  SIMPL::ScalarTypes::Type m_ScalarType = {SIMPL::ScalarTypes::Type::Int8};
+  int m_NumberOfComponents = {0};
+  DataArrayPath m_NewArray = {"", "", ""};
+  int m_InitializationType = {Manual};
+  QString m_InitializationValue = {"0"};
+  FPRangePair m_InitializationRange = {};
+
+  /**
+   * @brief checkInitialization Checks that the chosen initialization value/range is inside
+   * the bounds of the array type
+   */
+  template <typename T>
+  void checkInitialization(QString dataArrayName);
+
+  const QString Int8 = "signed   int 8  bit";
+  const QString UInt8 = "unsigned int 8  bit";
+  const QString Int16 = "signed   int 16 bit";
+  const QString UInt16 = "unsigned int 16 bit";
+  const QString Int32 = "signed   int 32 bit";
+  const QString UInt32 = "unsigned int 32 bit";
+  const QString Int64 = "signed   int 64 bit";
+  const QString UInt64 = "unsigned int 64 bit";
+  const QString Float = "       Float 32 bit";
+  const QString Double = "      Double 64 bit";
+  const QString Bool = "bool";
+
+public:
+  CreateDataArray(const CreateDataArray&) = delete;            // Copy Constructor Not Implemented
+  CreateDataArray(CreateDataArray&&) = delete;                 // Move Constructor Not Implemented
+  CreateDataArray& operator=(const CreateDataArray&) = delete; // Copy Assignment Not Implemented
+  CreateDataArray& operator=(CreateDataArray&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index b654c40ba1..3b1db40bd4 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CreateDataContainer.h"
 
 #include <QtCore/QTextStream>
@@ -43,7 +43,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataContainerID = 1
 };
 
@@ -97,7 +98,6 @@ void CreateDataContainer::dataCheck()
   getDataContainerArray()->createNonPrereqDataContainer(this, getDataContainerName(), DataContainerID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -115,7 +115,6 @@ void CreateDataContainer::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
old mode 100755
new mode 100644
index 055631da9b..4f9d17730f
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,131 +45,128 @@
  */
 class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateDataContainer)
-    PYB11_FILTER_NEW_MACRO(CreateDataContainer)
-    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateDataContainer;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateDataContainer> New();
-
-    /**
-     * @brief Returns the name of the class for CreateDataContainer
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateDataContainer
-     */
-    static QString ClassName();
-
-    ~CreateDataContainer() override;
-
-    /**
-     * @brief Setter property for DataContainerName
-     */
-    void setDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerName
-     * @return Value of DataContainerName
-     */
-    DataArrayPath getDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateDataContainer();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  public:
-    CreateDataContainer(const CreateDataContainer&) = delete; // Copy Constructor Not Implemented
-    CreateDataContainer(CreateDataContainer&&) = delete;      // Move Constructor Not Implemented
-    CreateDataContainer& operator=(const CreateDataContainer&) = delete; // Copy Assignment Not Implemented
-    CreateDataContainer& operator=(CreateDataContainer&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_DataContainerName = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateDataContainer SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateDataContainer)
+  PYB11_FILTER_NEW_MACRO(CreateDataContainer)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateDataContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateDataContainer> New();
+
+  /**
+   * @brief Returns the name of the class for CreateDataContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateDataContainer
+   */
+  static QString ClassName();
+
+  ~CreateDataContainer() override;
+
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateDataContainer();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  CreateDataContainer(const CreateDataContainer&) = delete;            // Copy Constructor Not Implemented
+  CreateDataContainer(CreateDataContainer&&) = delete;                 // Move Constructor Not Implemented
+  CreateDataContainer& operator=(const CreateDataContainer&) = delete; // Copy Assignment Not Implemented
+  CreateDataContainer& operator=(CreateDataContainer&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_DataContainerName = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 4edfdf5532..989bbcfc79 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CreateFeatureArrayFromElementArray.h"
 
 #include <QtCore/QTextStream>
@@ -47,7 +47,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   FeatureArrayID = 1
 };
 
@@ -88,7 +89,8 @@ void CreateFeatureArrayFromElementArray::setupFilterParameters()
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::CellFeature, IGeometry::Type::Any);
     parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray, req));
   }
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, CellFeatureAttributeMatrixName, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, CellFeatureAttributeMatrixName, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray,
+                                                      CreateFeatureArrayFromElementArray));
   setFilterParameters(parameters);
 }
 
@@ -127,9 +129,9 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
-                                                                                                        cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FeatureIdsPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -147,11 +149,11 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, m_InArrayPtr.lock()->getComponentDimensions(), m_InArrayPtr.lock(), FeatureArrayID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> IDataArray::Pointer copyCellData(AbstractFilter* filter, IDataArray::Pointer inputData, int32_t features, int32_t* featureIds, const QString& createdArrayName)
+template <typename T>
+IDataArray::Pointer copyCellData(AbstractFilter* filter, IDataArray::Pointer inputData, int32_t features, int32_t* featureIds, const QString& createdArrayName)
 {
   QString featureArrayName = inputData->getName();
 
@@ -247,7 +249,11 @@ void CreateFeatureArrayFromElementArray::execute()
 
   if(mismatchedFeatures)
   {
-    QString ss = QObject::tr("Attribute Matrix %1 has %2 tuples but the input array %3 has a Feature ID value of at least %4").arg(m_CellFeatureAttributeMatrixName.serialize("/")).arg(totalFeatures).arg(getFeatureIdsArrayPath().serialize("/")).arg(largestFeature);
+    QString ss = QObject::tr("Attribute Matrix %1 has %2 tuples but the input array %3 has a Feature ID value of at least %4")
+                     .arg(m_CellFeatureAttributeMatrixName.serialize("/"))
+                     .arg(totalFeatures)
+                     .arg(getFeatureIdsArrayPath().serialize("/"))
+                     .arg(largestFeature);
     setErrorCondition(-5555, ss);
     return;
   }
@@ -315,7 +321,6 @@ void CreateFeatureArrayFromElementArray::execute()
   {
     getDataContainerArray()->getAttributeMatrix(m_CellFeatureAttributeMatrixName)->insertOrAssign(p);
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
old mode 100755
new mode 100644
index 1755976206..7f3eeda9c4
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,178 +49,175 @@ using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
-    PYB11_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
-    PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
-    PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-    PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
-    PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateFeatureArrayFromElementArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateFeatureArrayFromElementArray> New();
-
-    /**
-     * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
-     */
-    static QString ClassName();
-
-    ~CreateFeatureArrayFromElementArray() override;
-
-    /**
-     * @brief Setter property for CellFeatureAttributeMatrixName
-     */
-    void setCellFeatureAttributeMatrixName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CellFeatureAttributeMatrixName
-     * @return Value of CellFeatureAttributeMatrixName
-     */
-    DataArrayPath getCellFeatureAttributeMatrixName() const;
-
-    Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
-
-    /**
-     * @brief Setter property for SelectedCellArrayPath
-     */
-    void setSelectedCellArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedCellArrayPath
-     * @return Value of SelectedCellArrayPath
-     */
-    DataArrayPath getSelectedCellArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-
-    /**
-     * @brief Setter property for CreatedArrayName
-     */
-    void setCreatedArrayName(const QString& value);
-    /**
-     * @brief Getter property for CreatedArrayName
-     * @return Value of CreatedArrayName
-     */
-    QString getCreatedArrayName() const;
-
-    Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
-
-    /**
-     * @brief Setter property for FeatureIdsArrayPath
-     */
-    void setFeatureIdsArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FeatureIdsArrayPath
-     * @return Value of FeatureIdsArrayPath
-     */
-    DataArrayPath getFeatureIdsArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateFeatureArrayFromElementArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
-    int32_t* m_FeatureIds = nullptr;
-
-    IDataArrayWkPtrType m_InArrayPtr;
-
-    DataArrayPath m_CellFeatureAttributeMatrixName = {};
-    DataArrayPath m_SelectedCellArrayPath = {};
-    QString m_CreatedArrayName = {};
-    DataArrayPath m_FeatureIdsArrayPath = {};
-
-  public:
-    CreateFeatureArrayFromElementArray(const CreateFeatureArrayFromElementArray&) = delete; // Copy Constructor Not Implemented
-    CreateFeatureArrayFromElementArray(CreateFeatureArrayFromElementArray&&) = delete;      // Move Constructor Not Implemented
-    CreateFeatureArrayFromElementArray& operator=(const CreateFeatureArrayFromElementArray&) = delete; // Copy Assignment Not Implemented
-    CreateFeatureArrayFromElementArray& operator=(CreateFeatureArrayFromElementArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateFeatureArrayFromElementArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateFeatureArrayFromElementArray)
+  PYB11_FILTER_NEW_MACRO(CreateFeatureArrayFromElementArray)
+  PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
+  PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+  PYB11_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
+  PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateFeatureArrayFromElementArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateFeatureArrayFromElementArray> New();
+
+  /**
+   * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateFeatureArrayFromElementArray
+   */
+  static QString ClassName();
+
+  ~CreateFeatureArrayFromElementArray() override;
+
+  /**
+   * @brief Setter property for CellFeatureAttributeMatrixName
+   */
+  void setCellFeatureAttributeMatrixName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CellFeatureAttributeMatrixName
+   * @return Value of CellFeatureAttributeMatrixName
+   */
+  DataArrayPath getCellFeatureAttributeMatrixName() const;
+
+  Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
+
+  /**
+   * @brief Setter property for SelectedCellArrayPath
+   */
+  void setSelectedCellArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedCellArrayPath
+   * @return Value of SelectedCellArrayPath
+   */
+  DataArrayPath getSelectedCellArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+
+  /**
+   * @brief Setter property for CreatedArrayName
+   */
+  void setCreatedArrayName(const QString& value);
+  /**
+   * @brief Getter property for CreatedArrayName
+   * @return Value of CreatedArrayName
+   */
+  QString getCreatedArrayName() const;
+
+  Q_PROPERTY(QString CreatedArrayName READ getCreatedArrayName WRITE setCreatedArrayName)
+
+  /**
+   * @brief Setter property for FeatureIdsArrayPath
+   */
+  void setFeatureIdsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FeatureIdsArrayPath
+   * @return Value of FeatureIdsArrayPath
+   */
+  DataArrayPath getFeatureIdsArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateFeatureArrayFromElementArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+  int32_t* m_FeatureIds = nullptr;
+
+  IDataArrayWkPtrType m_InArrayPtr;
+
+  DataArrayPath m_CellFeatureAttributeMatrixName = {};
+  DataArrayPath m_SelectedCellArrayPath = {};
+  QString m_CreatedArrayName = {};
+  DataArrayPath m_FeatureIdsArrayPath = {};
+
+public:
+  CreateFeatureArrayFromElementArray(const CreateFeatureArrayFromElementArray&) = delete;            // Copy Constructor Not Implemented
+  CreateFeatureArrayFromElementArray(CreateFeatureArrayFromElementArray&&) = delete;                 // Move Constructor Not Implemented
+  CreateFeatureArrayFromElementArray& operator=(const CreateFeatureArrayFromElementArray&) = delete; // Copy Assignment Not Implemented
+  CreateFeatureArrayFromElementArray& operator=(CreateFeatureArrayFromElementArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index f83ea72435..74611c27dc 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -563,7 +563,7 @@ void CreateGeometry::dataCheck()
     FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath5(), cDims);
     cDims[0] = 8;
     m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedHexList>(this, getSharedHexListArrayPath(), cDims);
-    if (m_HexesPtr.lock())
+    if(m_HexesPtr.lock())
     {
       m_Hexes = m_HexesPtr.lock()->getPointer(0);
     }
@@ -573,7 +573,6 @@ void CreateGeometry::dataCheck()
       return;
     }
 
-
     HexahedralGeom::Pointer hexahedral = HexahedralGeom::NullPointer();
     if(static_cast<int>(getArrayHandling()) == k_CopyArrays)
     {
@@ -599,8 +598,7 @@ void CreateGeometry::dataCheck()
     dc->createNonPrereqAttributeMatrix(this, path, tDims, AttributeMatrix::Type::Cell);
     break;
   }
-  default:
-  {
+  default: {
     QString ss = QObject::tr("Invalid selection for Geometry type");
     setErrorCondition(-701, ss);
     break;
@@ -608,7 +606,6 @@ void CreateGeometry::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -840,22 +837,22 @@ void CreateGeometry::execute()
   case 7: // HexahedralGeom
   {
     size_t idx = 0;
-    for (size_t i = 0; i < m_HexesPtr.lock()->getSize(); i++)
+    for(size_t i = 0; i < m_HexesPtr.lock()->getSize(); i++)
     {
-      if (m_Hexes[i] > idx)
+      if(m_Hexes[i] > idx)
       {
         idx = m_Hexes[i];
       }
     }
 
-    if ((idx + 1) > m_NumVerts)
+    if((idx + 1) > m_NumVerts)
     {
       QString ss = QObject::tr("Supplied hexahedra list contains a vertex index larger than the total length of the supplied shared vertex list\n"
-        "Index Value: %1\n"
-        "Number of Vertices: %2")
-        .arg(idx)
-        .arg(m_NumVerts);
-      if (m_TreatWarningsAsErrors)
+                               "Index Value: %1\n"
+                               "Number of Vertices: %2")
+                       .arg(idx)
+                       .arg(m_NumVerts);
+      if(m_TreatWarningsAsErrors)
       {
         setErrorCondition(-1, ss);
       }
@@ -868,12 +865,10 @@ void CreateGeometry::execute()
 
     break;
   }
-  default:
-  {
+  default: {
     break;
   }
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index 1701b203bd..fc3dd37b4c 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -92,7 +92,7 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -585,7 +585,6 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   CreateGeometry();
   /**
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
index 10114ca5f6..63182bd3e2 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.h
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
 
   QString getNameOfClass() const override;
   static QString ClassName();
-  //static int CreateGridMontage::IsTypeOf(const char* type);
+  // static int CreateGridMontage::IsTypeOf(const char* type);
 
   ~CreateGridMontage() override;
 
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
    * @return
    */
   QString getMontageName() const;
-  
+
   /**
    * @brief Setter for the MontageName property
    * @param value
@@ -103,9 +103,9 @@ class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
   Q_PROPERTY(DataContainerGrid GridSelection READ getGridSelection WRITE setGridSelection)
 
   /**
-    * @brief Getter for the DataContainerNameList property
-    * @return
-    */
+   * @brief Getter for the DataContainerNameList property
+   * @return
+   */
   QStringList getDataContainerNameList() const;
 
   /**
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 2bd3207f84..1d05c9e113 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CreateImageGeometry.h"
 
@@ -89,8 +89,7 @@ void CreateImageGeometry::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateImageGeometry));
   parameters.back()->setLegacyPropertyName("Resolution");
 
-  PreflightUpdatedValueFilterParameter::Pointer param =
-             SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateImageGeometry);
+  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateImageGeometry);
   param->setReadOnly(true);
   parameters.push_back(param);
 
@@ -150,7 +149,6 @@ void CreateImageGeometry::dataCheck()
   m->setGeometry(image);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -163,7 +161,6 @@ void CreateImageGeometry::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
old mode 100755
new mode 100644
index 40dae91adf..4c7e076696
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,182 +47,179 @@
  */
 class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateImageGeometry)
-    PYB11_FILTER_NEW_MACRO(CreateImageGeometry)
-    PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
-    PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
-    PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
-    PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateImageGeometry;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateImageGeometry> New();
-
-    /**
-     * @brief Returns the name of the class for CreateImageGeometry
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateImageGeometry
-     */
-    static QString ClassName();
-
-    ~CreateImageGeometry() override;
-
-    /**
-     * @brief Setter property for SelectedDataContainer
-     */
-    void setSelectedDataContainer(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedDataContainer
-     * @return Value of SelectedDataContainer
-     */
-    DataArrayPath getSelectedDataContainer() const;
-
-    Q_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
-
-    /**
-     * @brief Setter property for Dimensions
-     */
-    void setDimensions(const IntVec3Type& value);
-    /**
-     * @brief Getter property for Dimensions
-     * @return Value of Dimensions
-     */
-    IntVec3Type getDimensions() const;
-
-    Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
-
-    /**
-     * @brief Setter property for Origin
-     */
-    void setOrigin(const FloatVec3Type& value);
-    /**
-     * @brief Getter property for Origin
-     * @return Value of Origin
-     */
-    FloatVec3Type getOrigin() const;
-
-    Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
-
-    /**
-     * @brief Setter property for Spacing
-     */
-    void setSpacing(const FloatVec3Type& value);
-    /**
-     * @brief Getter property for Spacing
-     * @return Value of Spacing
-     */
-    FloatVec3Type getSpacing() const;
-
-    Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-
-    QString getBoxDimensions();
-    Q_PROPERTY(QString BoxDimensions READ getBoxDimensions)
-  
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateImageGeometry();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief updateSurfaceMesh Updates the mesh coordinates
-     */
-    void updateSurfaceMesh();
-
-  public:
-    CreateImageGeometry(const CreateImageGeometry&) = delete; // Copy Constructor Not Implemented
-    CreateImageGeometry(CreateImageGeometry&&) = delete;      // Move Constructor Not Implemented
-    CreateImageGeometry& operator=(const CreateImageGeometry&) = delete; // Copy Assignment Not Implemented
-    CreateImageGeometry& operator=(CreateImageGeometry&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_SelectedDataContainer = {};
-    IntVec3Type m_Dimensions = {};
-    FloatVec3Type m_Origin = {};
-    FloatVec3Type m_Spacing = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateImageGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateImageGeometry)
+  PYB11_FILTER_NEW_MACRO(CreateImageGeometry)
+  PYB11_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
+  PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+  PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+  PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateImageGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateImageGeometry> New();
+
+  /**
+   * @brief Returns the name of the class for CreateImageGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateImageGeometry
+   */
+  static QString ClassName();
+
+  ~CreateImageGeometry() override;
+
+  /**
+   * @brief Setter property for SelectedDataContainer
+   */
+  void setSelectedDataContainer(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedDataContainer
+   * @return Value of SelectedDataContainer
+   */
+  DataArrayPath getSelectedDataContainer() const;
+
+  Q_PROPERTY(DataArrayPath SelectedDataContainer READ getSelectedDataContainer WRITE setSelectedDataContainer)
+
+  /**
+   * @brief Setter property for Dimensions
+   */
+  void setDimensions(const IntVec3Type& value);
+  /**
+   * @brief Getter property for Dimensions
+   * @return Value of Dimensions
+   */
+  IntVec3Type getDimensions() const;
+
+  Q_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
+
+  /**
+   * @brief Setter property for Origin
+   */
+  void setOrigin(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Origin
+   * @return Value of Origin
+   */
+  FloatVec3Type getOrigin() const;
+
+  Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+
+  /**
+   * @brief Setter property for Spacing
+   */
+  void setSpacing(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Spacing
+   * @return Value of Spacing
+   */
+  FloatVec3Type getSpacing() const;
+
+  Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+
+  QString getBoxDimensions();
+  Q_PROPERTY(QString BoxDimensions READ getBoxDimensions)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateImageGeometry();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief updateSurfaceMesh Updates the mesh coordinates
+   */
+  void updateSurfaceMesh();
+
+public:
+  CreateImageGeometry(const CreateImageGeometry&) = delete;            // Copy Constructor Not Implemented
+  CreateImageGeometry(CreateImageGeometry&&) = delete;                 // Move Constructor Not Implemented
+  CreateImageGeometry& operator=(const CreateImageGeometry&) = delete; // Copy Assignment Not Implemented
+  CreateImageGeometry& operator=(CreateImageGeometry&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_SelectedDataContainer = {};
+  IntVec3Type m_Dimensions = {};
+  FloatVec3Type m_Origin = {};
+  FloatVec3Type m_Spacing = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index e5cec00254..7bd4ccb268 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "CreateStringArray.h"
 
 #include <QtCore/QTextStream>
@@ -48,25 +48,24 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   StringArrayID = 1
 };
 
 /**
-* @brief initializeArrayWithInts Initializes the array p with integers, either from the
-* manual value entered in the filter, or with a random number.  This function does not
-* check that the template type actually is an integer, so it will most likely cause
-* unexpected results when passing anything other than an integer as a template parameter.
-* @param p The array that will be initialized
-*/
+ * @brief initializeArrayWithInts Initializes the array p with integers, either from the
+ * manual value entered in the filter, or with a random number.  This function does not
+ * check that the template type actually is an integer, so it will most likely cause
+ * unexpected results when passing anything other than an integer as a template parameter.
+ * @param p The array that will be initialized
+ */
 void initializeArray(IDataArray::Pointer outputArrayPtr, const QString& initializationValue)
 {
   StringDataArray::Pointer array = std::dynamic_pointer_cast<StringDataArray>(outputArrayPtr);
   array->initializeWithValue(initializationValue);
 }
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -148,7 +147,7 @@ void CreateStringArray::dataCheck()
     QString ss = QObject::tr("The Created DataArrayPath is invalid. Please select the Data Container, Attribute Matrix and set an output DataArray name.");
     setErrorCondition(-8152, ss);
   }
-  if (m_InitializationValue.isEmpty())
+  if(m_InitializationValue.isEmpty())
   {
     QString ss = "Empty initialization value.";
     setErrorCondition(-5759, ss);
@@ -158,12 +157,11 @@ void CreateStringArray::dataCheck()
   {
     return;
   }
-  
+
   // Create the data array and initialize it to a placeholder value
   m_OutputArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<StringDataArray>(this, getNewArray(), m_InitializationValue, cDims, "", StringArrayID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 6ad35e520c..4c40004e8c 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,161 +46,158 @@
  */
 class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(CreateStringArray)
-    PYB11_FILTER_NEW_MACRO(CreateStringArray)
-    PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-    PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
-    PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = CreateStringArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<CreateStringArray> New();
-
-    /**
-     * @brief Returns the name of the class for CreateStringArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CreateStringArray
-     */
-    static QString ClassName();
-
-    ~CreateStringArray() override;
-
-    /**
-     * @brief Setter property for NumberOfComponents
-     */
-    void setNumberOfComponents(int value);
-    /**
-     * @brief Getter property for NumberOfComponents
-     * @return Value of NumberOfComponents
-     */
-    int getNumberOfComponents() const;
-
-    Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-
-    /**
-     * @brief Setter property for NewArray
-     */
-    void setNewArray(const DataArrayPath& value);
-    /**
-     * @brief Getter property for NewArray
-     * @return Value of NewArray
-     */
-    DataArrayPath getNewArray() const;
-
-    Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
-
-    /**
-     * @brief Setter property for InitializationValue
-     */
-    void setInitializationValue(const QString& value);
-    /**
-     * @brief Getter property for InitializationValue
-     * @return Value of InitializationValue
-     */
-    QString getInitializationValue() const;
-
-    Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    CreateStringArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    int m_NumberOfComponents = {};
-    DataArrayPath m_NewArray = {};
-    QString m_InitializationValue = {};
-
-    IDataArray::WeakPointer m_OutputArrayPtr;
-
-  public:
-    CreateStringArray(const CreateStringArray&) = delete; // Copy Constructor Not Implemented
-    CreateStringArray(CreateStringArray&&) = delete;      // Move Constructor Not Implemented
-    CreateStringArray& operator=(const CreateStringArray&) = delete; // Copy Assignment Not Implemented
-    CreateStringArray& operator=(CreateStringArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(CreateStringArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(CreateStringArray)
+  PYB11_FILTER_NEW_MACRO(CreateStringArray)
+  PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  PYB11_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
+  PYB11_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = CreateStringArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<CreateStringArray> New();
+
+  /**
+   * @brief Returns the name of the class for CreateStringArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CreateStringArray
+   */
+  static QString ClassName();
+
+  ~CreateStringArray() override;
+
+  /**
+   * @brief Setter property for NumberOfComponents
+   */
+  void setNumberOfComponents(int value);
+  /**
+   * @brief Getter property for NumberOfComponents
+   * @return Value of NumberOfComponents
+   */
+  int getNumberOfComponents() const;
+
+  Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+
+  /**
+   * @brief Setter property for NewArray
+   */
+  void setNewArray(const DataArrayPath& value);
+  /**
+   * @brief Getter property for NewArray
+   * @return Value of NewArray
+   */
+  DataArrayPath getNewArray() const;
+
+  Q_PROPERTY(DataArrayPath NewArray READ getNewArray WRITE setNewArray)
+
+  /**
+   * @brief Setter property for InitializationValue
+   */
+  void setInitializationValue(const QString& value);
+  /**
+   * @brief Getter property for InitializationValue
+   * @return Value of InitializationValue
+   */
+  QString getInitializationValue() const;
+
+  Q_PROPERTY(QString InitializationValue READ getInitializationValue WRITE setInitializationValue)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  CreateStringArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  int m_NumberOfComponents = {};
+  DataArrayPath m_NewArray = {};
+  QString m_InitializationValue = {};
+
+  IDataArray::WeakPointer m_OutputArrayPtr;
+
+public:
+  CreateStringArray(const CreateStringArray&) = delete;            // Copy Constructor Not Implemented
+  CreateStringArray(CreateStringArray&&) = delete;                 // Move Constructor Not Implemented
+  CreateStringArray& operator=(const CreateStringArray&) = delete; // Copy Assignment Not Implemented
+  CreateStringArray& operator=(CreateStringArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 3f162687f7..32d665965b 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -50,7 +50,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataContainerID = 1
 };
 
@@ -201,11 +202,11 @@ void CropVertexGeometry::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void copyDataToCroppedGeometry(IDataArray::Pointer inDataPtr, IDataArray::Pointer outDataPtr, std::vector<int64_t>& croppedPoints)
+template <typename T>
+void copyDataToCroppedGeometry(IDataArray::Pointer inDataPtr, IDataArray::Pointer outDataPtr, std::vector<int64_t>& croppedPoints)
 {
   typename DataArray<T>::Pointer inputDataPtr = std::dynamic_pointer_cast<DataArray<T>>(inDataPtr);
   T* inputData = static_cast<T*>(inputDataPtr->getPointer(0));
@@ -306,7 +307,6 @@ void CropVertexGeometry::execute()
       }
     }
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index c5fd515dce..41600a0131 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -249,7 +249,6 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   CropVertexGeometry();
   /**
@@ -280,4 +279,3 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   CropVertexGeometry& operator=(const CropVertexGeometry&) = delete; // Copy Assignment Not Implemented
   CropVertexGeometry& operator=(CropVertexGeometry&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 41e6ef7bd2..a7a731bcb1 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerReader.h"
 
-
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 #include <QtCore/QDebug>
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
old mode 100755
new mode 100644
index 0223c0a172..07436e3c87
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,257 +55,255 @@ class SIMPLH5DataReader;
  */
 class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
 {
-    Q_OBJECT
-    
-    // This line MUST be first when exposing a class and properties to Python
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(DataContainerReader)
-    PYB11_FILTER_NEW_MACRO(DataContainerReader)
-    PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-    PYB11_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
-    PYB11_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
-    PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS path)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = DataContainerReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<DataContainerReader> New();
-
-    /**
-     * @brief Returns the name of the class for DataContainerReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerReader
-     */
-    static QString ClassName();
-
-    ~DataContainerReader() override;
-
-    /**
-     * @brief Setter property for InputFile
-     */
-    void setInputFile(const QString& value);
-    /**
-     * @brief Getter property for InputFile
-     * @return Value of InputFile
-     */
-    QString getInputFile() const;
-
-    Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-
-    /**
-     * @brief Setter property for OverwriteExistingDataContainers
-     */
-    void setOverwriteExistingDataContainers(bool value);
-    /**
-     * @brief Getter property for OverwriteExistingDataContainers
-     * @return Value of OverwriteExistingDataContainers
-     */
-    bool getOverwriteExistingDataContainers() const;
-
-    Q_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
-
-    /**
-     * @brief Setter property for LastFileRead
-     */
-    void setLastFileRead(const QString& value);
-    /**
-     * @brief Getter property for LastFileRead
-     * @return Value of LastFileRead
-     */
-    QString getLastFileRead() const;
-
-    Q_PROPERTY(QString LastFileRead READ getLastFileRead WRITE setLastFileRead)
-
-    /**
-     * @brief Setter property for LastRead
-     */
-    void setLastRead(const QDateTime& value);
-    /**
-     * @brief Getter property for LastRead
-     * @return Value of LastRead
-     */
-    QDateTime getLastRead() const;
-
-    Q_PROPERTY(QDateTime LastRead READ getLastRead WRITE setLastRead)
-
-    /**
-     * @brief Setter property for InputFileDataContainerArrayProxy
-     */
-    void setInputFileDataContainerArrayProxy(const DataContainerArrayProxy& value);
-    /**
-     * @brief Getter property for InputFileDataContainerArrayProxy
-     * @return Value of InputFileDataContainerArrayProxy
-     */
-    DataContainerArrayProxy getInputFileDataContainerArrayProxy() const;
-
-    Q_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief This method is called just before the writeFilterParameters() completes
-     * @param obj The json object to add the filter parameters into
-     * @param rootObject The parent object of **obj**
-     */
-    void preWriteFilterParameters(QJsonObject& obj, QJsonObject& rootObject) override;
-
-    /**
-     * @brief writeFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void writeFilterParameters(QJsonObject& obj) const override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(QJsonObject& obj) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-     * @brief readExistingPipelineFromFile Reads the existing pipeline that is stored in the file and store it
-     * in the class instance for later writing to another SIMPLView data file
-     * @param fileId HDF5 group Id for pipeline
-     * @return Integer error value
-     */
-    int readExistingPipelineFromFile(hid_t fileId);
-
-    /**
-     * @brief writeExistingPipelineToFile Writes the filter parameters of the existing pipline to a
-     * SIMPLView file
-     * @param obj json object
-     * @param index The index that the inserted pipeline should start at.
-     * @return
-     */
-    int writeExistingPipelineToFile(QJsonObject &obj, int index);
-
-    /**
-     * @brief readDataContainerArrayStructure Reads the structure of the DataContainerArray from the HDF5 based .dream3d file. For this method to work
-     * the member variable for the file path should have been set prior to calling this method.
-     * @param path The file path to the SIMPLView file
-     * @return DataContainerArrayProxy instance
-     */
-    DataContainerArrayProxy readDataContainerArrayStructure(const QString& path);
-
-    /**
-    * @brief syncProxies Combines the file and cached proxies if they are out-of-sync
-    * @return
-    */
-    bool syncProxies();
-
-  protected:
-    DataContainerReader();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-    /**
-     * @brief readData
-     * @param proxy
-     * @return
-     */
-    DataContainerArrayShPtrType readData(DataContainerArrayProxy& proxy);
-
-    /**
-     * @brief readMontageGroup
-     * @param dca
-     * @return
-     */
-    DataContainerArray::MontageCollection readMontageGroup(const DataContainerArray::Pointer& dca);
-
-  protected slots:
-    /**
-    * @brief Cleans up the filter after execution
-    */
-    void cleanupFilter() override;
-
-  private:
-    QString m_InputFile = {};
-    bool m_OverwriteExistingDataContainers = {};
-    QString m_LastFileRead = {};
-    QDateTime m_LastRead = {};
-    DataContainerArrayProxy m_InputFileDataContainerArrayProxy = {};
-
-    FilterPipeline::Pointer                     m_PipelineFromFile;
-
-  public:
-    DataContainerReader(const DataContainerReader&) = delete; // Copy Constructor Not Implemented
-    DataContainerReader(DataContainerReader&&) = delete;      // Move Constructor Not Implemented
-    DataContainerReader& operator=(const DataContainerReader&) = delete; // Copy Assignment Not Implemented
-    DataContainerReader& operator=(DataContainerReader&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // This line MUST be first when exposing a class and properties to Python
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataContainerReader SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(DataContainerReader)
+  PYB11_FILTER_NEW_MACRO(DataContainerReader)
+  PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+  PYB11_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
+  PYB11_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
+  PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS path)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = DataContainerReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<DataContainerReader> New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerReader
+   */
+  static QString ClassName();
+
+  ~DataContainerReader() override;
+
+  /**
+   * @brief Setter property for InputFile
+   */
+  void setInputFile(const QString& value);
+  /**
+   * @brief Getter property for InputFile
+   * @return Value of InputFile
+   */
+  QString getInputFile() const;
+
+  Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+
+  /**
+   * @brief Setter property for OverwriteExistingDataContainers
+   */
+  void setOverwriteExistingDataContainers(bool value);
+  /**
+   * @brief Getter property for OverwriteExistingDataContainers
+   * @return Value of OverwriteExistingDataContainers
+   */
+  bool getOverwriteExistingDataContainers() const;
+
+  Q_PROPERTY(bool OverwriteExistingDataContainers READ getOverwriteExistingDataContainers WRITE setOverwriteExistingDataContainers)
+
+  /**
+   * @brief Setter property for LastFileRead
+   */
+  void setLastFileRead(const QString& value);
+  /**
+   * @brief Getter property for LastFileRead
+   * @return Value of LastFileRead
+   */
+  QString getLastFileRead() const;
+
+  Q_PROPERTY(QString LastFileRead READ getLastFileRead WRITE setLastFileRead)
+
+  /**
+   * @brief Setter property for LastRead
+   */
+  void setLastRead(const QDateTime& value);
+  /**
+   * @brief Getter property for LastRead
+   * @return Value of LastRead
+   */
+  QDateTime getLastRead() const;
+
+  Q_PROPERTY(QDateTime LastRead READ getLastRead WRITE setLastRead)
+
+  /**
+   * @brief Setter property for InputFileDataContainerArrayProxy
+   */
+  void setInputFileDataContainerArrayProxy(const DataContainerArrayProxy& value);
+  /**
+   * @brief Getter property for InputFileDataContainerArrayProxy
+   * @return Value of InputFileDataContainerArrayProxy
+   */
+  DataContainerArrayProxy getInputFileDataContainerArrayProxy() const;
+
+  Q_PROPERTY(DataContainerArrayProxy InputFileDataContainerArrayProxy READ getInputFileDataContainerArrayProxy WRITE setInputFileDataContainerArrayProxy)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief This method is called just before the writeFilterParameters() completes
+   * @param obj The json object to add the filter parameters into
+   * @param rootObject The parent object of **obj**
+   */
+  void preWriteFilterParameters(QJsonObject& obj, QJsonObject& rootObject) override;
+
+  /**
+   * @brief writeFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void writeFilterParameters(QJsonObject& obj) const override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(QJsonObject& obj) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief readExistingPipelineFromFile Reads the existing pipeline that is stored in the file and store it
+   * in the class instance for later writing to another SIMPLView data file
+   * @param fileId HDF5 group Id for pipeline
+   * @return Integer error value
+   */
+  int readExistingPipelineFromFile(hid_t fileId);
+
+  /**
+   * @brief writeExistingPipelineToFile Writes the filter parameters of the existing pipline to a
+   * SIMPLView file
+   * @param obj json object
+   * @param index The index that the inserted pipeline should start at.
+   * @return
+   */
+  int writeExistingPipelineToFile(QJsonObject& obj, int index);
+
+  /**
+   * @brief readDataContainerArrayStructure Reads the structure of the DataContainerArray from the HDF5 based .dream3d file. For this method to work
+   * the member variable for the file path should have been set prior to calling this method.
+   * @param path The file path to the SIMPLView file
+   * @return DataContainerArrayProxy instance
+   */
+  DataContainerArrayProxy readDataContainerArrayStructure(const QString& path);
+
+  /**
+   * @brief syncProxies Combines the file and cached proxies if they are out-of-sync
+   * @return
+   */
+  bool syncProxies();
+
+protected:
+  DataContainerReader();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief readData
+   * @param proxy
+   * @return
+   */
+  DataContainerArrayShPtrType readData(DataContainerArrayProxy& proxy);
+
+  /**
+   * @brief readMontageGroup
+   * @param dca
+   * @return
+   */
+  DataContainerArray::MontageCollection readMontageGroup(const DataContainerArray::Pointer& dca);
+
+protected slots:
+  /**
+   * @brief Cleans up the filter after execution
+   */
+  void cleanupFilter() override;
+
+private:
+  QString m_InputFile = {};
+  bool m_OverwriteExistingDataContainers = {};
+  QString m_LastFileRead = {};
+  QDateTime m_LastRead = {};
+  DataContainerArrayProxy m_InputFileDataContainerArrayProxy = {};
+
+  FilterPipeline::Pointer m_PipelineFromFile;
+
+public:
+  DataContainerReader(const DataContainerReader&) = delete;            // Copy Constructor Not Implemented
+  DataContainerReader(DataContainerReader&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerReader& operator=(const DataContainerReader&) = delete; // Copy Assignment Not Implemented
+  DataContainerReader& operator=(DataContainerReader&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 87acdc1e76..52de771a84 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerWriter.h"
 
-
 #include <QtCore/QTextStream>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
@@ -130,10 +129,8 @@ void DataContainerWriter::dataCheck()
     m_OutputFile.append(".dream3d");
   }
   FileSystemPathHelper::CheckOutputFile(this, "Output File Path", getOutputFile(), true);
-
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -290,7 +287,6 @@ void DataContainerWriter::execute()
   H5Gclose(dcaGid);
 
   dcaGid = -1;
-
 }
 
 // -----------------------------------------------------------------------------
@@ -383,7 +379,8 @@ void DataContainerWriter::writeXdmfFooter(QTextStream& xdmf)
 {
   if(getWriteTimeSeries())
   {
-    xdmf << " </Grid>" << "\n";
+    xdmf << " </Grid>"
+         << "\n";
   }
   xdmf << " </Domain>"
        << "\n";
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
old mode 100755
new mode 100644
index 5c7ba12c4f..3c1f823ed3
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,230 +49,227 @@
  */
 class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
 {
-    Q_OBJECT
-    
-    // This line MUST be first when exposing a class and properties to Python
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(DataContainerWriter)
-    PYB11_FILTER_NEW_MACRO(DataContainerWriter)
-    PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-    PYB11_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
-    PYB11_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = DataContainerWriter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<DataContainerWriter> New();
-
-    /**
-     * @brief Returns the name of the class for DataContainerWriter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerWriter
-     */
-    static QString ClassName();
-
-    ~DataContainerWriter() override;
-
-    /**
-     * @brief Setter property for OutputFile
-     */
-    void setOutputFile(const QString& value);
-    /**
-     * @brief Getter property for OutputFile
-     * @return Value of OutputFile
-     */
-    QString getOutputFile() const;
-
-    Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-
-    /**
-     * @brief Setter property for WritePipeline
-     */
-    void setWritePipeline(bool value);
-    /**
-     * @brief Getter property for WritePipeline
-     * @return Value of WritePipeline
-     */
-    bool getWritePipeline() const;
-
-    /**
-     * @brief Setter property for WriteXdmfFile
-     */
-    void setWriteXdmfFile(bool value);
-    /**
-     * @brief Getter property for WriteXdmfFile
-     * @return Value of WriteXdmfFile
-     */
-    bool getWriteXdmfFile() const;
-
-    Q_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
-
-    /**
-     * @brief Setter property for WriteTimeSeries
-     */
-    void setWriteTimeSeries(bool value);
-    /**
-     * @brief Getter property for WriteTimeSeries
-     * @return Value of WriteTimeSeries
-     */
-    bool getWriteTimeSeries() const;
-
-    Q_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
-
-    /**
-     * @brief Setter property for AppendToExisting
-     */
-    void setAppendToExisting(bool value);
-    /**
-     * @brief Getter property for AppendToExisting
-     * @return Value of AppendToExisting
-     */
-    bool getAppendToExisting() const;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    DataContainerWriter();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief openFile Opens or creates an HDF5 file to write data into
-     * @param append Should a new file be created or append data to a currently existing file
-     * @return
-     */
-    hid_t openFile(bool append = false);
-
-    /**
-     * @brief closeFile Closes the currently open file
-     * @return Integer error value
-     */
-    herr_t closeFile();
-
-    /**
-     * @brief writePipeline Writes the existing pipeline to the HDF5 file
-     * @return
-     */
-    int writePipeline();
-
-    /**
-     * @brief writeDataContainerBundles Writes any existing DataContainerBundles to the HDF5 file
-     * @param fileId Group Id for the DataContainerBundles
-     * @return
-     */
-    int writeDataContainerBundles(hid_t fileId);
-
-    /**
-     * @brief writeMontages Writes any existing Montages to the HDF5 file
-     * @param fileId Group Id for the Montages
-     * @return
-     */
-    int writeMontages(hid_t fileId);
-
-    /**
-     * @brief writeXdmfHeader Writes the Xdmf header
-     * @param out QTextStream for output
-     */
-    void writeXdmfHeader(QTextStream& out);
-
-    /**
-     * @brief writeXdmfFooter Writes the Xdmf footer
-     * @param out QTextStream for output
-     */
-    void writeXdmfFooter(QTextStream& out);
-
-  private:
-    QString m_OutputFile = {};
-    bool m_WritePipeline = {};
-    bool m_WriteXdmfFile = {};
-    bool m_WriteTimeSeries = {};
-    bool m_AppendToExisting = {};
-
-    hid_t m_FileId;
-
-  public:
-    DataContainerWriter(const DataContainerWriter&) = delete; // Copy Constructor Not Implemented
-    DataContainerWriter(DataContainerWriter&&) = delete;      // Move Constructor Not Implemented
-    DataContainerWriter& operator=(const DataContainerWriter&) = delete; // Copy Assignment Not Implemented
-    DataContainerWriter& operator=(DataContainerWriter&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // This line MUST be first when exposing a class and properties to Python
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DataContainerWriter SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(DataContainerWriter)
+  PYB11_FILTER_NEW_MACRO(DataContainerWriter)
+  PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
+  PYB11_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
+  PYB11_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = DataContainerWriter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<DataContainerWriter> New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerWriter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerWriter
+   */
+  static QString ClassName();
+
+  ~DataContainerWriter() override;
+
+  /**
+   * @brief Setter property for OutputFile
+   */
+  void setOutputFile(const QString& value);
+  /**
+   * @brief Getter property for OutputFile
+   * @return Value of OutputFile
+   */
+  QString getOutputFile() const;
+
+  Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
+
+  /**
+   * @brief Setter property for WritePipeline
+   */
+  void setWritePipeline(bool value);
+  /**
+   * @brief Getter property for WritePipeline
+   * @return Value of WritePipeline
+   */
+  bool getWritePipeline() const;
+
+  /**
+   * @brief Setter property for WriteXdmfFile
+   */
+  void setWriteXdmfFile(bool value);
+  /**
+   * @brief Getter property for WriteXdmfFile
+   * @return Value of WriteXdmfFile
+   */
+  bool getWriteXdmfFile() const;
+
+  Q_PROPERTY(bool WriteXdmfFile READ getWriteXdmfFile WRITE setWriteXdmfFile)
+
+  /**
+   * @brief Setter property for WriteTimeSeries
+   */
+  void setWriteTimeSeries(bool value);
+  /**
+   * @brief Getter property for WriteTimeSeries
+   * @return Value of WriteTimeSeries
+   */
+  bool getWriteTimeSeries() const;
+
+  Q_PROPERTY(bool WriteTimeSeries READ getWriteTimeSeries WRITE setWriteTimeSeries)
+
+  /**
+   * @brief Setter property for AppendToExisting
+   */
+  void setAppendToExisting(bool value);
+  /**
+   * @brief Getter property for AppendToExisting
+   * @return Value of AppendToExisting
+   */
+  bool getAppendToExisting() const;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  DataContainerWriter();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief openFile Opens or creates an HDF5 file to write data into
+   * @param append Should a new file be created or append data to a currently existing file
+   * @return
+   */
+  hid_t openFile(bool append = false);
+
+  /**
+   * @brief closeFile Closes the currently open file
+   * @return Integer error value
+   */
+  herr_t closeFile();
+
+  /**
+   * @brief writePipeline Writes the existing pipeline to the HDF5 file
+   * @return
+   */
+  int writePipeline();
+
+  /**
+   * @brief writeDataContainerBundles Writes any existing DataContainerBundles to the HDF5 file
+   * @param fileId Group Id for the DataContainerBundles
+   * @return
+   */
+  int writeDataContainerBundles(hid_t fileId);
+
+  /**
+   * @brief writeMontages Writes any existing Montages to the HDF5 file
+   * @param fileId Group Id for the Montages
+   * @return
+   */
+  int writeMontages(hid_t fileId);
+
+  /**
+   * @brief writeXdmfHeader Writes the Xdmf header
+   * @param out QTextStream for output
+   */
+  void writeXdmfHeader(QTextStream& out);
+
+  /**
+   * @brief writeXdmfFooter Writes the Xdmf footer
+   * @param out QTextStream for output
+   */
+  void writeXdmfFooter(QTextStream& out);
+
+private:
+  QString m_OutputFile = {};
+  bool m_WritePipeline = {};
+  bool m_WriteXdmfFile = {};
+  bool m_WriteTimeSeries = {};
+  bool m_AppendToExisting = {};
+
+  hid_t m_FileId;
+
+public:
+  DataContainerWriter(const DataContainerWriter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerWriter(DataContainerWriter&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerWriter& operator=(const DataContainerWriter&) = delete; // Copy Assignment Not Implemented
+  DataContainerWriter& operator=(DataContainerWriter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 8a35bcca77..e315da2316 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "EmptyFilter.h"
 
 #include <QtCore/QTextStream>
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
old mode 100755
new mode 100644
index 7dc108bdb2..0769921113
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,137 +45,134 @@
  */
 class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(EmptyFilter)
-    PYB11_FILTER_NEW_MACRO(EmptyFilter)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = EmptyFilter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<EmptyFilter> New();
-
-    /**
-     * @brief Returns the name of the class for EmptyFilter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for EmptyFilter
-     */
-    static QString ClassName();
-
-    ~EmptyFilter() override;
-
-    /**
-     * @brief Setter property for OriginalFilterName
-     */
-    void setOriginalFilterName(const QString& value);
-    /**
-     * @brief Getter property for OriginalFilterName
-     * @return Value of OriginalFilterName
-     */
-    QString getOriginalFilterName() const;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-     * @brief This is overloaded from the super class for this particular filter.
-     * All other filters do <b>NOT</b> overload this filter
-     * @param humanLabel
-     */
-    void setHumanLabel(const QString& humanLabel);
-
-  protected:
-    EmptyFilter();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    QString m_OriginalFilterName = {};
-
-    QString m_HumanLabel;
-
-  public:
-    EmptyFilter(const EmptyFilter&) = delete;    // Copy Constructor Not Implemented
-    EmptyFilter(EmptyFilter&&) = delete;         // Move Constructor Not Implemented
-    EmptyFilter& operator=(const EmptyFilter&) = delete; // Copy Assignment Not Implemented
-    EmptyFilter& operator=(EmptyFilter&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(EmptyFilter SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(EmptyFilter)
+  PYB11_FILTER_NEW_MACRO(EmptyFilter)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = EmptyFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<EmptyFilter> New();
+
+  /**
+   * @brief Returns the name of the class for EmptyFilter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for EmptyFilter
+   */
+  static QString ClassName();
+
+  ~EmptyFilter() override;
+
+  /**
+   * @brief Setter property for OriginalFilterName
+   */
+  void setOriginalFilterName(const QString& value);
+  /**
+   * @brief Getter property for OriginalFilterName
+   * @return Value of OriginalFilterName
+   */
+  QString getOriginalFilterName() const;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief This is overloaded from the super class for this particular filter.
+   * All other filters do <b>NOT</b> overload this filter
+   * @param humanLabel
+   */
+  void setHumanLabel(const QString& humanLabel);
+
+protected:
+  EmptyFilter();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  QString m_OriginalFilterName = {};
+
+  QString m_HumanLabel;
+
+public:
+  EmptyFilter(const EmptyFilter&) = delete;            // Copy Constructor Not Implemented
+  EmptyFilter(EmptyFilter&&) = delete;                 // Move Constructor Not Implemented
+  EmptyFilter& operator=(const EmptyFilter&) = delete; // Copy Assignment Not Implemented
+  EmptyFilter& operator=(EmptyFilter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index 94a4e5ad3f..e9a0a360fb 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ExecuteProcess.h"
 
 #include <QtCore/QCoreApplication>
@@ -113,7 +113,6 @@ void ExecuteProcess::dataCheck()
   //  }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index cb159d678a..9f79b44ca4 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -165,7 +165,6 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ExecuteProcess();
   /**
@@ -205,4 +204,3 @@ protected slots:
   ExecuteProcess& operator=(const ExecuteProcess&) = delete; // Copy Assignment Not Implemented
   ExecuteProcess& operator=(ExecuteProcess&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index 845e80d28f..b2956c3855 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -54,7 +54,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   RectGrid_XBoundsID = 1,
   RectGrid_YBoundsID,
   RectGrid_ZBoundsID,
@@ -129,10 +130,11 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
         "SharedVertexListArrayPath3", "SharedQuadListArrayPath",                     // QuadGeom
         "SharedVertexListArrayPath4", "SharedTetListArrayPath",                      // TetrahedralGeom
         "SharedVertexListArrayPath5", "SharedHexListArrayPath"                       // HexahedralGeom
-    }; 
+    };
     parameter->setLinkedProperties(linkedProps);
     parameter->setCategory(FilterParameter::Parameter);
-    IGeometry::Types geomTypes = {IGeometry::Type::RectGrid, IGeometry::Type::Vertex, IGeometry::Type::Edge, IGeometry::Type::Triangle, IGeometry::Type::Quad, IGeometry::Type::Tetrahedral, IGeometry::Type::Hexahedral};
+    IGeometry::Types geomTypes = {IGeometry::Type::RectGrid, IGeometry::Type::Vertex,      IGeometry::Type::Edge,      IGeometry::Type::Triangle,
+                                  IGeometry::Type::Quad,     IGeometry::Type::Tetrahedral, IGeometry::Type::Hexahedral};
     parameter->setDefaultGeometryTypes(geomTypes);
     parameters.push_back(parameter);
   }
@@ -185,10 +187,10 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Hexahedral);
     parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
-      static_cast<int32_t>(IGeometry::Type::Hexahedral)));
+                                                  static_cast<int32_t>(IGeometry::Type::Hexahedral)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Cell, IGeometry::Type::Hexahedral);
     parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
-      static_cast<int32_t>(IGeometry::Type::Hexahedral)));
+                                                  static_cast<int32_t>(IGeometry::Type::Hexahedral)));
   }
   setFilterParameters(parameters);
 }
@@ -497,8 +499,7 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
 
     break;
   }
-  default:
-  {
+  default: {
     QString ss = QObject::tr("Selected Data Container (%1) does not contain a valid geometry\n"
                              "Geometry Type: %2\n"
                              "Valid Geometry Types: Rectilinear Grid, Vertex, Edge, Triangle, Quadrilateral, Tetrahedral")
@@ -510,7 +511,6 @@ void ExtractAttributeArraysFromGeometry::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -633,12 +633,10 @@ void ExtractAttributeArraysFromGeometry::execute()
 
     break;
   }
-  default:
-  {
+  default: {
     break;
   }
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 9a43eb2c83..0650cbbbd4 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -342,7 +342,6 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ExtractAttributeArraysFromGeometry();
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index b3b33095c0..e2bf390004 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ExtractComponentAsArray.h"
 
 #include <QtCore/QTextStream>
@@ -47,7 +47,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataArrayID = 1
 };
 
@@ -146,8 +147,7 @@ void ExtractComponentAsArray::dataCheck()
 
   if(m_CompNumber < 0)
   {
-    QString ss = QObject::tr("Component to extract (%1) is a negative value and this is not allowed. Value must be Zero (0) or greater.")
-                     .arg(m_CompNumber);
+    QString ss = QObject::tr("Component to extract (%1) is a negative value and this is not allowed. Value must be Zero (0) or greater.").arg(m_CompNumber);
     setErrorCondition(-11005, ss);
     return;
   }
@@ -157,11 +157,11 @@ void ExtractComponentAsArray::dataCheck()
   m_NewArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath, cDims, m_InArrayPtr.lock(), DataArrayID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void extractComponent(IDataArray::Pointer inputData, IDataArray::Pointer newData, int compNumber)
+template <typename T>
+void extractComponent(IDataArray::Pointer inputData, IDataArray::Pointer newData, int compNumber)
 {
   typename DataArray<T>::Pointer inputArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(inputData);
   typename DataArray<T>::Pointer newArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(newData);
@@ -196,7 +196,6 @@ void ExtractComponentAsArray::execute()
   }
 
   EXECUTE_FUNCTION_TEMPLATE(this, extractComponent, m_InArrayPtr.lock(), m_InArrayPtr.lock(), m_NewArrayPtr.lock(), m_CompNumber)
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
old mode 100755
new mode 100644
index 59bed2fa3b..a8ca99797f
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,162 +50,159 @@ class IDataArray;
  */
 class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ExtractComponentAsArray)
-    PYB11_FILTER_NEW_MACRO(ExtractComponentAsArray)
-    PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-    PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
-    PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ExtractComponentAsArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ExtractComponentAsArray> New();
-
-    /**
-     * @brief Returns the name of the class for ExtractComponentAsArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ExtractComponentAsArray
-     */
-    static QString ClassName();
-
-    ~ExtractComponentAsArray() override;
-
-    /**
-     * @brief Setter property for SelectedArrayPath
-     */
-    void setSelectedArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedArrayPath
-     * @return Value of SelectedArrayPath
-     */
-    DataArrayPath getSelectedArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-
-    /**
-     * @brief Setter property for CompNumber
-     */
-    void setCompNumber(int value);
-    /**
-     * @brief Getter property for CompNumber
-     * @return Value of CompNumber
-     */
-    int getCompNumber() const;
-
-    Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
-
-    /**
-     * @brief Setter property for NewArrayArrayName
-     */
-    void setNewArrayArrayName(const QString& value);
-    /**
-     * @brief Getter property for NewArrayArrayName
-     * @return Value of NewArrayArrayName
-     */
-    QString getNewArrayArrayName() const;
-
-    Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ExtractComponentAsArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    IDataArrayWkPtrType m_InArrayPtr;
-    IDataArrayWkPtrType m_NewArrayPtr;
-
-    DataArrayPath m_SelectedArrayPath = {};
-    int m_CompNumber = {};
-    QString m_NewArrayArrayName = {};
-
-  public:
-    ExtractComponentAsArray(const ExtractComponentAsArray&) = delete; // Copy Constructor Not Implemented
-    ExtractComponentAsArray(ExtractComponentAsArray&&) = delete;      // Move Constructor Not Implemented
-    ExtractComponentAsArray& operator=(const ExtractComponentAsArray&) = delete; // Copy Assignment Not Implemented
-    ExtractComponentAsArray& operator=(ExtractComponentAsArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ExtractComponentAsArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ExtractComponentAsArray)
+  PYB11_FILTER_NEW_MACRO(ExtractComponentAsArray)
+  PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+  PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
+  PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ExtractComponentAsArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ExtractComponentAsArray> New();
+
+  /**
+   * @brief Returns the name of the class for ExtractComponentAsArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ExtractComponentAsArray
+   */
+  static QString ClassName();
+
+  ~ExtractComponentAsArray() override;
+
+  /**
+   * @brief Setter property for SelectedArrayPath
+   */
+  void setSelectedArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArrayPath
+   * @return Value of SelectedArrayPath
+   */
+  DataArrayPath getSelectedArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+
+  /**
+   * @brief Setter property for CompNumber
+   */
+  void setCompNumber(int value);
+  /**
+   * @brief Getter property for CompNumber
+   * @return Value of CompNumber
+   */
+  int getCompNumber() const;
+
+  Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
+
+  /**
+   * @brief Setter property for NewArrayArrayName
+   */
+  void setNewArrayArrayName(const QString& value);
+  /**
+   * @brief Getter property for NewArrayArrayName
+   * @return Value of NewArrayArrayName
+   */
+  QString getNewArrayArrayName() const;
+
+  Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ExtractComponentAsArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  IDataArrayWkPtrType m_InArrayPtr;
+  IDataArrayWkPtrType m_NewArrayPtr;
+
+  DataArrayPath m_SelectedArrayPath = {};
+  int m_CompNumber = {};
+  QString m_NewArrayArrayName = {};
+
+public:
+  ExtractComponentAsArray(const ExtractComponentAsArray&) = delete;            // Copy Constructor Not Implemented
+  ExtractComponentAsArray(ExtractComponentAsArray&&) = delete;                 // Move Constructor Not Implemented
+  ExtractComponentAsArray& operator=(const ExtractComponentAsArray&) = delete; // Copy Assignment Not Implemented
+  ExtractComponentAsArray& operator=(ExtractComponentAsArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index f63f8b8332..1cb58f2fa5 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -48,7 +48,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataContainerID = 1,
   AttributeMatrixID
 };
@@ -244,14 +245,14 @@ void ExtractVertexGeometry::dataCheck()
     AttributeMatrix::Pointer vertexCellAttrMat = vertexDataContainer->getAttributeMatrix(newDap);
     if(vertexCellAttrMat == nullptr)
     {
-      vertexCellAttrMat = vertexDataContainer->createNonPrereqAttributeMatrix(this, sourceCellAttrMat->getName(), sourceCellAttrMat->getTupleDimensions(), AttributeMatrix::Type::Vertex, AttributeMatrixID);
+      vertexCellAttrMat =
+          vertexDataContainer->createNonPrereqAttributeMatrix(this, sourceCellAttrMat->getName(), sourceCellAttrMat->getTupleDimensions(), AttributeMatrix::Type::Vertex, AttributeMatrixID);
     }
 
     vertexCellAttrMat->insertOrAssign(newArrayPtr);
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index f9ae6a72e5..16c647b9ff 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -201,7 +201,6 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ExtractVertexGeometry();
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 43b87fc3a6..2c4c17c5d2 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FeatureCountDecision.h"
 
@@ -107,15 +107,14 @@ void FeatureCountDecision::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
 
-  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(),
-                                                                                                        cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                         /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FeatureIdsPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -142,7 +141,6 @@ void FeatureCountDecision::execute()
 
   emit decisionMade(dm);
   emit targetValue(m_FeatureIds[1]);
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
old mode 100755
new mode 100644
index 92bff37222..8c0d751a98
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,140 +47,137 @@
  */
 class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(FeatureCountDecision)
-    PYB11_STATIC_NEW_MACRO(FeatureCountDecision)
-    PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-    PYB11_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = FeatureCountDecision;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for FeatureCountDecision
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for FeatureCountDecision
-     */
-    static QString ClassName();
-
-    ~FeatureCountDecision() override;
-
-    /**
-     * @brief Setter property for FeatureIdsArrayPath
-     */
-    void setFeatureIdsArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for FeatureIdsArrayPath
-     * @return Value of FeatureIdsArrayPath
-     */
-    DataArrayPath getFeatureIdsArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
-
-    /**
-     * @brief Setter property for MaxGrains
-     */
-    void setMaxGrains(int value);
-    /**
-     * @brief Getter property for MaxGrains
-     * @return Value of MaxGrains
-     */
-    int getMaxGrains() const;
-
-    Q_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
-
-    /**
-    * @brief
-    * @param jsonDoc
-    */
-    void extractProperties(const QJsonDocument &jsonDoc) override;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    FeatureCountDecision();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
-    int32_t* m_FeatureIds = nullptr;
-
-    DataArrayPath m_FeatureIdsArrayPath = {};
-    int m_MaxGrains = {};
-
-  public:
-    FeatureCountDecision(const FeatureCountDecision&) = delete; // Copy Constructor Not Implemented
-    FeatureCountDecision(FeatureCountDecision&&) = delete;      // Move Constructor Not Implemented
-    FeatureCountDecision& operator=(const FeatureCountDecision&) = delete; // Copy Assignment Not Implemented
-    FeatureCountDecision& operator=(FeatureCountDecision&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FeatureCountDecision SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(FeatureCountDecision)
+  PYB11_STATIC_NEW_MACRO(FeatureCountDecision)
+  PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+  PYB11_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = FeatureCountDecision;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FeatureCountDecision
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FeatureCountDecision
+   */
+  static QString ClassName();
+
+  ~FeatureCountDecision() override;
+
+  /**
+   * @brief Setter property for FeatureIdsArrayPath
+   */
+  void setFeatureIdsArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for FeatureIdsArrayPath
+   * @return Value of FeatureIdsArrayPath
+   */
+  DataArrayPath getFeatureIdsArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
+
+  /**
+   * @brief Setter property for MaxGrains
+   */
+  void setMaxGrains(int value);
+  /**
+   * @brief Getter property for MaxGrains
+   * @return Value of MaxGrains
+   */
+  int getMaxGrains() const;
+
+  Q_PROPERTY(int MaxGrains READ getMaxGrains WRITE setMaxGrains)
+
+  /**
+   * @brief
+   * @param jsonDoc
+   */
+  void extractProperties(const QJsonDocument& jsonDoc) override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  FeatureCountDecision();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+  int32_t* m_FeatureIds = nullptr;
+
+  DataArrayPath m_FeatureIdsArrayPath = {};
+  int m_MaxGrains = {};
+
+public:
+  FeatureCountDecision(const FeatureCountDecision&) = delete;            // Copy Constructor Not Implemented
+  FeatureCountDecision(FeatureCountDecision&&) = delete;                 // Move Constructor Not Implemented
+  FeatureCountDecision& operator=(const FeatureCountDecision&) = delete; // Copy Assignment Not Implemented
+  FeatureCountDecision& operator=(FeatureCountDecision&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index c5349e85fc..fd8d794900 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FeatureDataCSVWriter.h"
 
 #include <QtCore/QDir>
@@ -156,7 +156,6 @@ void FeatureDataCSVWriter::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -302,9 +301,9 @@ void FeatureDataCSVWriter::execute()
 AbstractFilter::Pointer FeatureDataCSVWriter::newFilterInstance(bool copyFilterParameters) const
 {
   /*
-  * FeatureDataFile
-  * WriteNeighborListData
-  */
+   * FeatureDataFile
+   * WriteNeighborListData
+   */
   FeatureDataCSVWriter::Pointer filter = FeatureDataCSVWriter::New();
   if(copyFilterParameters)
   {
@@ -387,7 +386,7 @@ void FeatureDataCSVWriter::setDelimiterChoiceInt(int value)
 {
   this->m_DelimiterChoice = 0; // Set the default and if the value falls within the correct range, use that.
   // Allowed integer values of the enum SIMPL::DelimiterTypes::Type; see defintion in Constants.h
-  if (value >= 0 && value <= 4)
+  if(value >= 0 && value <= 4)
   {
     this->m_DelimiterChoice = value;
   }
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index ea3e0a50b5..e8722cac08 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,208 +44,207 @@
 /**
  * @brief The FeatureDataCSVWriter class. See [Filter documentation](@ref featuredatacsvwriter) for details.
  */
-class  SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
+class SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(FeatureDataCSVWriter)
-    PYB11_FILTER_NEW_MACRO(FeatureDataCSVWriter)
-    PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
-    PYB11_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
-    PYB11_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
-    PYB11_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
-    PYB11_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = FeatureDataCSVWriter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<FeatureDataCSVWriter> New();
-
-    /**
-     * @brief Returns the name of the class for FeatureDataCSVWriter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for FeatureDataCSVWriter
-     */
-    static QString ClassName();
-
-    ~FeatureDataCSVWriter() override;
-
-    /**
-     * @brief Setter property for CellFeatureAttributeMatrixPath
-     */
-    void setCellFeatureAttributeMatrixPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CellFeatureAttributeMatrixPath
-     * @return Value of CellFeatureAttributeMatrixPath
-     */
-    DataArrayPath getCellFeatureAttributeMatrixPath() const;
-
-    Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
-
-    /**
-     * @brief Setter property for FeatureDataFile
-     */
-    void setFeatureDataFile(const QString& value);
-    /**
-     * @brief Getter property for FeatureDataFile
-     * @return Value of FeatureDataFile
-     */
-    QString getFeatureDataFile() const;
-
-    Q_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
-
-    /**
-     * @brief Setter property for WriteNeighborListData
-     */
-    void setWriteNeighborListData(bool value);
-    /**
-     * @brief Getter property for WriteNeighborListData
-     * @return Value of WriteNeighborListData
-     */
-    bool getWriteNeighborListData() const;
-
-    Q_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
-
-    /**
-     * @brief Setter property for DelimiterChoice
-     */
-    void setDelimiterChoice(int value);
-    /**
-     * @brief Getter property for DelimiterChoice
-     * @return Value of DelimiterChoice
-     */
-    int getDelimiterChoice() const;
-
-    Q_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
-
-    /**
-     * @brief Setter property for WriteNumFeaturesLine
-     */
-    void setWriteNumFeaturesLine(bool value);
-    /**
-     * @brief Getter property for WriteNumFeaturesLine
-     * @return Value of WriteNumFeaturesLine
-     */
-    bool getWriteNumFeaturesLine() const;
-
-    Q_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
-
-    /**
-     * @brief Setter property for Delimiter
-     */
-    void setDelimiter(char value);
-    /**
-     * @brief Getter property for Delimiter
-     * @return Value of Delimiter
-     */
-    char getDelimiter() const;
-
-    /**
-     * @brief getDelimiterChoiceInt Returns the corresponding int from the enum SIMPL::DelimiterTypes::Type for DelimiterChoice
-     */
-    int getDelimiterChoiceInt() const;
-
-    /**
-     * @brief setDelimiterChoiceInt Sets DelimiterChoice to the enum type from SIMPL::DelimiterTypes::Type corresponding to the int parameter
-     */
-    void setDelimiterChoiceInt(int value);
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    FeatureDataCSVWriter();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    FeatureDataCSVWriter(const FeatureDataCSVWriter&) = delete; // Copy Constructor Not Implemented
-    FeatureDataCSVWriter(FeatureDataCSVWriter&&) = delete;      // Move Constructor Not Implemented
-    FeatureDataCSVWriter& operator=(const FeatureDataCSVWriter&) = delete; // Copy Assignment Not Implemented
-    FeatureDataCSVWriter& operator=(FeatureDataCSVWriter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_CellFeatureAttributeMatrixPath = {};
-    QString m_FeatureDataFile = {};
-    bool m_WriteNeighborListData = {};
-    int m_DelimiterChoice = {};
-    bool m_WriteNumFeaturesLine = {};
-    char m_Delimiter = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FeatureDataCSVWriter SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(FeatureDataCSVWriter)
+  PYB11_FILTER_NEW_MACRO(FeatureDataCSVWriter)
+  PYB11_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
+  PYB11_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
+  PYB11_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
+  PYB11_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
+  PYB11_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = FeatureDataCSVWriter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<FeatureDataCSVWriter> New();
+
+  /**
+   * @brief Returns the name of the class for FeatureDataCSVWriter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FeatureDataCSVWriter
+   */
+  static QString ClassName();
+
+  ~FeatureDataCSVWriter() override;
+
+  /**
+   * @brief Setter property for CellFeatureAttributeMatrixPath
+   */
+  void setCellFeatureAttributeMatrixPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CellFeatureAttributeMatrixPath
+   * @return Value of CellFeatureAttributeMatrixPath
+   */
+  DataArrayPath getCellFeatureAttributeMatrixPath() const;
+
+  Q_PROPERTY(DataArrayPath CellFeatureAttributeMatrixPath READ getCellFeatureAttributeMatrixPath WRITE setCellFeatureAttributeMatrixPath)
+
+  /**
+   * @brief Setter property for FeatureDataFile
+   */
+  void setFeatureDataFile(const QString& value);
+  /**
+   * @brief Getter property for FeatureDataFile
+   * @return Value of FeatureDataFile
+   */
+  QString getFeatureDataFile() const;
+
+  Q_PROPERTY(QString FeatureDataFile READ getFeatureDataFile WRITE setFeatureDataFile)
+
+  /**
+   * @brief Setter property for WriteNeighborListData
+   */
+  void setWriteNeighborListData(bool value);
+  /**
+   * @brief Getter property for WriteNeighborListData
+   * @return Value of WriteNeighborListData
+   */
+  bool getWriteNeighborListData() const;
+
+  Q_PROPERTY(bool WriteNeighborListData READ getWriteNeighborListData WRITE setWriteNeighborListData)
+
+  /**
+   * @brief Setter property for DelimiterChoice
+   */
+  void setDelimiterChoice(int value);
+  /**
+   * @brief Getter property for DelimiterChoice
+   * @return Value of DelimiterChoice
+   */
+  int getDelimiterChoice() const;
+
+  Q_PROPERTY(int DelimiterChoice READ getDelimiterChoice WRITE setDelimiterChoice)
+
+  /**
+   * @brief Setter property for WriteNumFeaturesLine
+   */
+  void setWriteNumFeaturesLine(bool value);
+  /**
+   * @brief Getter property for WriteNumFeaturesLine
+   * @return Value of WriteNumFeaturesLine
+   */
+  bool getWriteNumFeaturesLine() const;
+
+  Q_PROPERTY(bool WriteNumFeaturesLine READ getWriteNumFeaturesLine WRITE setWriteNumFeaturesLine)
+
+  /**
+   * @brief Setter property for Delimiter
+   */
+  void setDelimiter(char value);
+  /**
+   * @brief Getter property for Delimiter
+   * @return Value of Delimiter
+   */
+  char getDelimiter() const;
+
+  /**
+   * @brief getDelimiterChoiceInt Returns the corresponding int from the enum SIMPL::DelimiterTypes::Type for DelimiterChoice
+   */
+  int getDelimiterChoiceInt() const;
+
+  /**
+   * @brief setDelimiterChoiceInt Sets DelimiterChoice to the enum type from SIMPL::DelimiterTypes::Type corresponding to the int parameter
+   */
+  void setDelimiterChoiceInt(int value);
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  FeatureDataCSVWriter();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  FeatureDataCSVWriter(const FeatureDataCSVWriter&) = delete;            // Copy Constructor Not Implemented
+  FeatureDataCSVWriter(FeatureDataCSVWriter&&) = delete;                 // Move Constructor Not Implemented
+  FeatureDataCSVWriter& operator=(const FeatureDataCSVWriter&) = delete; // Copy Assignment Not Implemented
+  FeatureDataCSVWriter& operator=(FeatureDataCSVWriter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_CellFeatureAttributeMatrixPath = {};
+  QString m_FeatureDataFile = {};
+  bool m_WriteNeighborListData = {};
+  int m_DelimiterChoice = {};
+  bool m_WriteNumFeaturesLine = {};
+  char m_Delimiter = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index 14a6bcec6c..d126ff4ef0 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FileReader.h"
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
old mode 100755
new mode 100644
index ded10e79c4..0d31d878a5
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,64 +46,63 @@
  */
 class SIMPLib_EXPORT FileReader : public AbstractFilter
 {
-    Q_OBJECT
-    
-  public:
-    using Self = FileReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for FileReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for FileReader
-     */
-    static QString ClassName();
-
-    ~FileReader() override;
-
-    /* This will internally call readHeader() and readFile() with appropriate
-     * error checkes after each one. Subclasses should just implement the readHeader
-     * and readFile methods unless special setups are needed.
-     */
-    void execute() override;
-
-  protected:
-    FileReader();
-
-    /**
-     * @brief readHeader Reads the header of the input file
-     * @return Integer error value
-     */
-    virtual int32_t readHeader() = 0;
-
-    /**
-     * @brief readFile Reads the contents of the input file
-     * @return Integer error value
-     */
-    virtual int32_t readFile() = 0;
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    virtual void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    FileReader(const FileReader&) = delete;     // Copy Constructor Not Implemented
-    FileReader(FileReader&&) = delete;          // Move Constructor Not Implemented
-    FileReader& operator=(const FileReader&) = delete; // Copy Assignment Not Implemented
-    FileReader& operator=(FileReader&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+  Q_OBJECT
+
+public:
+  using Self = FileReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for FileReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FileReader
+   */
+  static QString ClassName();
+
+  ~FileReader() override;
+
+  /* This will internally call readHeader() and readFile() with appropriate
+   * error checkes after each one. Subclasses should just implement the readHeader
+   * and readFile methods unless special setups are needed.
+   */
+  void execute() override;
+
+protected:
+  FileReader();
+
+  /**
+   * @brief readHeader Reads the header of the input file
+   * @return Integer error value
+   */
+  virtual int32_t readHeader() = 0;
+
+  /**
+   * @brief readFile Reads the contents of the input file
+   * @return Integer error value
+   */
+  virtual int32_t readFile() = 0;
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  virtual void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  FileReader(const FileReader&) = delete;            // Copy Constructor Not Implemented
+  FileReader(FileReader&&) = delete;                 // Move Constructor Not Implemented
+  FileReader& operator=(const FileReader&) = delete; // Copy Assignment Not Implemented
+  FileReader& operator=(FileReader&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index b393428921..f86637b24d 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FileWriter.h"
 
 #include <QtCore/QDir>
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
old mode 100755
new mode 100644
index f3c2239c2f..4fc97934e0
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,70 +45,69 @@
  */
 class SIMPLib_EXPORT FileWriter : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
-    PYB11_SHARED_POINTERS(FileWriter)
-    PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = FileWriter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for FileWriter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for FileWriter
-     */
-    static QString ClassName();
-
-    ~FileWriter() override;
-
-    /**
-     * @brief Setter property for OutputFile
-     */
-    void setOutputFile(const QString& value);
-    /**
-     * @brief Getter property for OutputFile
-     * @return Value of OutputFile
-     */
-    QString getOutputFile() const;
-
-    Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
-
-    void execute() override;
-
-  protected:
-    FileWriter();
-
-    /**
-     * @brief writeHeader Writes the header of the output file
-     * @return Integer error value
-     */
-    virtual int32_t writeHeader() = 0;
-
-    /**
-     * @brief writeFile Writes the contents of the output file
-     * @return Integer error value
-     */
-    virtual int32_t writeFile() = 0;
-
-  public:
-    FileWriter(const FileWriter&) = delete;     // Copy Constructor Not Implemented
-    FileWriter(FileWriter&&) = delete;          // Move Constructor Not Implemented
-    FileWriter& operator=(const FileWriter&) = delete; // Copy Assignment Not Implemented
-    FileWriter& operator=(FileWriter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QString m_OutputFile = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FileWriter SUPERCLASS AbstractFilter)
+  PYB11_SHARED_POINTERS(FileWriter)
+  PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = FileWriter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for FileWriter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FileWriter
+   */
+  static QString ClassName();
+
+  ~FileWriter() override;
+
+  /**
+   * @brief Setter property for OutputFile
+   */
+  void setOutputFile(const QString& value);
+  /**
+   * @brief Getter property for OutputFile
+   * @return Value of OutputFile
+   */
+  QString getOutputFile() const;
+
+  Q_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
+
+  void execute() override;
+
+protected:
+  FileWriter();
+
+  /**
+   * @brief writeHeader Writes the header of the output file
+   * @return Integer error value
+   */
+  virtual int32_t writeHeader() = 0;
+
+  /**
+   * @brief writeFile Writes the contents of the output file
+   * @return Integer error value
+   */
+  virtual int32_t writeFile() = 0;
+
+public:
+  FileWriter(const FileWriter&) = delete;            // Copy Constructor Not Implemented
+  FileWriter(FileWriter&&) = delete;                 // Move Constructor Not Implemented
+  FileWriter& operator=(const FileWriter&) = delete; // Copy Assignment Not Implemented
+  FileWriter& operator=(FileWriter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_OutputFile = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index bd2fba2225..7e7787f194 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FindDerivatives.h"
 
 #include <QtCore/QTextStream>
@@ -64,48 +64,52 @@
  */
 class FilterMessageHandler : public AbstractMessageHandler
 {
-  public:
-    explicit FilterMessageHandler(FindDerivatives* filter) : m_Filter(filter) {}
+public:
+  explicit FilterMessageHandler(FindDerivatives* filter)
+  : m_Filter(filter)
+  {
+  }
 
-    /**
-     * @brief Re-emits incoming GenericProgressMessages as FilterProgressMessages.
-     */
-    void processMessage(const GenericProgressMessage* msg) const override
-    {
-      emit m_Filter->notifyProgressMessage(msg->getProgressValue(), msg->getMessageText());
-    }
+  /**
+   * @brief Re-emits incoming GenericProgressMessages as FilterProgressMessages.
+   */
+  void processMessage(const GenericProgressMessage* msg) const override
+  {
+    emit m_Filter->notifyProgressMessage(msg->getProgressValue(), msg->getMessageText());
+  }
 
-    /**
-     * @brief Re-emits incoming GenericStatusMessages as FilterStatusMessages.  Prepends text to the
-     * message text that explains that we are computing the derivatives
-     */
-    void processMessage(const GenericStatusMessage* msg) const override
-    {
-      QString messageText = QObject::tr("Computing Derivatives || %1").arg(msg->getMessageText());
-      emit m_Filter->notifyStatusMessage(messageText);
-    }
+  /**
+   * @brief Re-emits incoming GenericStatusMessages as FilterStatusMessages.  Prepends text to the
+   * message text that explains that we are computing the derivatives
+   */
+  void processMessage(const GenericStatusMessage* msg) const override
+  {
+    QString messageText = QObject::tr("Computing Derivatives || %1").arg(msg->getMessageText());
+    emit m_Filter->notifyStatusMessage(messageText);
+  }
 
-    /**
-     * @brief Re-emits incoming GenericErrorMessages as FilterErrorMessages.
-     */
-    void processMessage(const GenericErrorMessage* msg) const override
-    {
-      emit m_Filter->setErrorCondition(msg->getCode(), msg->getMessageText());
-    }
+  /**
+   * @brief Re-emits incoming GenericErrorMessages as FilterErrorMessages.
+   */
+  void processMessage(const GenericErrorMessage* msg) const override
+  {
+    emit m_Filter->setErrorCondition(msg->getCode(), msg->getMessageText());
+  }
 
-    /**
-     * @brief Re-emits incoming GenericWarningMessages as FilterWarningMessages.
-     */
-    void processMessage(const GenericWarningMessage* msg) const override
-    {
-      emit m_Filter->setWarningCondition(msg->getCode(), msg->getMessageText());
-    }
+  /**
+   * @brief Re-emits incoming GenericWarningMessages as FilterWarningMessages.
+   */
+  void processMessage(const GenericWarningMessage* msg) const override
+  {
+    emit m_Filter->setWarningCondition(msg->getCode(), msg->getMessageText());
+  }
 
-  private:
-    FindDerivatives* m_Filter = nullptr;
+private:
+  FindDerivatives* m_Filter = nullptr;
 };
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DerivativesArrayID = 1
 };
 
@@ -168,7 +172,8 @@ void FindDerivatives::readFilterParameters(AbstractFilterParametersReader* reade
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename DataType> void findDerivs(IDataArray::Pointer inDataPtr, DoubleArrayType::Pointer derivs, DataContainer::Pointer m, Observable* observable)
+template <typename DataType>
+void findDerivs(IDataArray::Pointer inDataPtr, DoubleArrayType::Pointer derivs, DataContainer::Pointer m, Observable* observable)
 {
   typename DataArray<DataType>::Pointer inputDataPtr = std::dynamic_pointer_cast<DataArray<DataType>>(inDataPtr);
   IGeometry::Pointer geom = m->getGeometry();
@@ -187,7 +192,8 @@ template <typename DataType> void findDerivs(IDataArray::Pointer inDataPtr, Doub
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDataPtr, DoubleArrayType::Pointer outDataPtr, DataContainer::Pointer m)
+template <typename DataType>
+void interpolateCellValues(IDataArray::Pointer inDataPtr, DoubleArrayType::Pointer outDataPtr, DataContainer::Pointer m)
 {
   typename DataArray<DataType>::Pointer inputDataPtr = std::dynamic_pointer_cast<DataArray<DataType>>(inDataPtr);
   IGeometry::Pointer geom = m->getGeometry();
@@ -207,48 +213,42 @@ template <typename DataType> void interpolateCellValues(IDataArray::Pointer inDa
 
   switch(geomType)
   {
-  case IGeometry::Type::Edge:
-  {
+  case IGeometry::Type::Edge: {
     EdgeGeom::Pointer edgeGeom = m->getGeometryAs<EdgeGeom>();
     SharedVertexList::Pointer verts = edgeGeom->getVertices();
     outDataPtr->resizeTuples(edgeGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
-  case IGeometry::Type::Triangle:
-  {
+  case IGeometry::Type::Triangle: {
     TriangleGeom::Pointer triGeom = m->getGeometryAs<TriangleGeom>();
     SharedVertexList::Pointer verts = triGeom->getVertices();
     outDataPtr->resizeTuples(triGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
-  case IGeometry::Type::Quad:
-  {
+  case IGeometry::Type::Quad: {
     QuadGeom::Pointer quadGeom = m->getGeometryAs<QuadGeom>();
     SharedVertexList::Pointer verts = quadGeom->getVertices();
     outDataPtr->resizeTuples(quadGeom->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
-  case IGeometry::Type::Tetrahedral:
-  {
+  case IGeometry::Type::Tetrahedral: {
     TetrahedralGeom::Pointer tets = m->getGeometryAs<TetrahedralGeom>();
     SharedVertexList::Pointer verts = tets->getVertices();
     outDataPtr->resizeTuples(tets->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
-  case IGeometry::Type::Hexahedral:
-  {
+  case IGeometry::Type::Hexahedral: {
     HexahedralGeom::Pointer hexas = m->getGeometryAs<HexahedralGeom>();
     SharedVertexList::Pointer verts = hexas->getVertices();
     outDataPtr->resizeTuples(hexas->getNumberOfVertices());
     GeometryHelpers::Generic::AverageCellArrayValues<size_t, DataType, uint16_t, double>(elemsContainingVert, verts, inputDataPtr, outDataPtr);
     break;
   }
-  default:
-  {
+  default: {
     break;
   }
   }
@@ -329,8 +329,7 @@ void FindDerivatives::dataCheck()
     {
       m_Interpolate = true;
     }
-    if(inAttrMatType != AttributeMatrix::Type::Vertex && inAttrMatType != AttributeMatrix::Type::Edge && inAttrMatType != AttributeMatrix::Type::Face &&
-       inAttrMatType != AttributeMatrix::Type::Cell)
+    if(inAttrMatType != AttributeMatrix::Type::Vertex && inAttrMatType != AttributeMatrix::Type::Edge && inAttrMatType != AttributeMatrix::Type::Face && inAttrMatType != AttributeMatrix::Type::Cell)
     {
       ss = QObject::tr("The Geometry type is %1, but the selected DataArray does not belong to a Cell, Face, Edge or Vertex AttributeMatrix").arg(geomName);
       setErrorCondition(-11002, ss);
@@ -371,15 +370,14 @@ void FindDerivatives::dataCheck()
   cDims *= 3;
   std::vector<size_t> dims(1, cDims);
 
-  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(
-      this, getDerivativesArrayPath(), 0, dims, "", DerivativesArrayID);    /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_DerivativesArrayPtr.lock())       /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(this, getDerivativesArrayPath(), 0, dims, "",
+                                                                                                   DerivativesArrayID); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_DerivativesArrayPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_DerivativesArray = m_DerivativesArrayPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index f27a555744..12e9584a44 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -117,9 +117,9 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
 
   Q_PROPERTY(DataArrayPath DerivativesArrayPath READ getDerivativesArrayPath WRITE setDerivativesArrayPath)
 
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
   QString getCompiledLibraryName() const override;
 
   /**
@@ -179,7 +179,6 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FindDerivatives();
 
@@ -211,10 +210,9 @@ protected slots:
 
   bool m_Interpolate;
 
-  public:
-    FindDerivatives(const FindDerivatives&) = delete; // Copy Constructor Not Implemented
-    FindDerivatives(FindDerivatives&&) = delete;      // Move Constructor Not Implemented
-    FindDerivatives& operator=(const FindDerivatives&) = delete; // Copy Assignment Not Implemented
-    FindDerivatives& operator=(FindDerivatives&&) = delete;      // Move Assignment Not Implemented
+public:
+  FindDerivatives(const FindDerivatives&) = delete;            // Copy Constructor Not Implemented
+  FindDerivatives(FindDerivatives&&) = delete;                 // Move Constructor Not Implemented
+  FindDerivatives& operator=(const FindDerivatives&) = delete; // Copy Assignment Not Implemented
+  FindDerivatives& operator=(FindDerivatives&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 4a0e5ff647..4388f75572 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -2,7 +2,6 @@
  * Your License or Copyright can go here
  */
 
-
 #include "GenerateColorTable.h"
 
 #include <QtCore/QTextStream>
@@ -17,7 +16,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   ColorArrayID = 1
 };
 
@@ -30,7 +30,7 @@ int findRightBinIndex(T nValue, std::vector<float> binPoints)
   /* This is a brute-force way of finding the proper bins.
      We will need to change this method to a binary search. */
   int rightBinIndex = 0;
-  while (binPoints[rightBinIndex] < nValue)
+  while(binPoints[rightBinIndex] < nValue)
   {
     rightBinIndex++;
   }
@@ -44,10 +44,10 @@ int findRightBinIndex(T nValue, std::vector<float> binPoints)
 int findRightBinIndex_Binary(float nValue, std::vector<float> binPoints)
 {
   int min = 0, max = binPoints.size() - 1;
-  while (min < max)
+  while(min < max)
   {
     int middle = (min + max) / 2;
-    if (nValue > binPoints[middle])
+    if(nValue > binPoints[middle])
     {
       min = middle + 1;
     }
@@ -77,17 +77,23 @@ class GenerateColorTableImpl
   {
     m_ArrayMin = arrayPtr->getValue(0);
     m_ArrayMax = arrayPtr->getValue(0);
-    for (int i=1; i<arrayPtr->getNumberOfTuples(); i++)
+    for(int i = 1; i < arrayPtr->getNumberOfTuples(); i++)
     {
-      if (arrayPtr->getValue(i) < m_ArrayMin) { m_ArrayMin = arrayPtr->getValue(i); }
-      if (arrayPtr->getValue(i) > m_ArrayMax) { m_ArrayMax = arrayPtr->getValue(i); }
+      if(arrayPtr->getValue(i) < m_ArrayMin)
+      {
+        m_ArrayMin = arrayPtr->getValue(i);
+      }
+      if(arrayPtr->getValue(i) > m_ArrayMax)
+      {
+        m_ArrayMax = arrayPtr->getValue(i);
+      }
     }
   }
   virtual ~GenerateColorTableImpl() = default;
 
   void convert(size_t start, size_t end) const
   {
-    for (size_t i = start; i < end; i++)
+    for(size_t i = start; i < end; i++)
     {
       // Normalize value
       float nValue = (static_cast<float>(m_ArrayPtr->getValue(i) - m_ArrayMin)) / static_cast<float>((m_ArrayMax - m_ArrayMin));
@@ -95,7 +101,7 @@ class GenerateColorTableImpl
       int rightBinIndex = findRightBinIndex_Binary(nValue, m_BinPoints);
 
       int leftBinIndex = rightBinIndex - 1;
-      if (leftBinIndex < 0)
+      if(leftBinIndex < 0)
       {
         leftBinIndex = 0;
         rightBinIndex = 1;
@@ -103,7 +109,7 @@ class GenerateColorTableImpl
 
       // Find the fractional distance traveled between the beginning and end of the current color bin
       float currFraction = 0.0f;
-      if (rightBinIndex < m_BinPoints.size())
+      if(rightBinIndex < m_BinPoints.size())
       {
         currFraction = (nValue - m_BinPoints[leftBinIndex]) / (m_BinPoints[rightBinIndex] - m_BinPoints[leftBinIndex]);
       }
@@ -134,14 +140,15 @@ class GenerateColorTableImpl
   {
     convert(r.min(), r.max());
   }
+
 private:
-  typename DataArray<T>::Pointer                        m_ArrayPtr;
+  typename DataArray<T>::Pointer m_ArrayPtr;
   std::vector<float> m_BinPoints;
-  T                                                     m_ArrayMin;
-  T                                                     m_ArrayMax;
-  int                                                   m_NumControlColors;
-  std::vector<std::vector<double> >                     m_ControlPoints;
-  UInt8ArrayType::Pointer                               m_ColorArray;
+  T m_ArrayMin;
+  T m_ArrayMax;
+  int m_NumControlColors;
+  std::vector<std::vector<double>> m_ControlPoints;
+  UInt8ArrayType::Pointer m_ColorArray;
 };
 
 // -----------------------------------------------------------------------------
@@ -150,7 +157,10 @@ class GenerateColorTableImpl
 template <typename T>
 void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray presetControlPoints, DataArrayPath selectedDAP, QString rgbArrayName, DataContainerArray::Pointer dca)
 {
-  if (arrayPtr->getNumberOfTuples() <= 0) { return; }
+  if(arrayPtr->getNumberOfTuples() <= 0)
+  {
+    return;
+  }
 
   if(presetControlPoints.empty())
   {
@@ -159,16 +169,16 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
 
   int numControlColors = presetControlPoints.count() / 4;
   int numComponents = 4;
-  std::vector<std::vector<double> > controlPoints(numControlColors, std::vector<double>(numComponents));
+  std::vector<std::vector<double>> controlPoints(numControlColors, std::vector<double>(numComponents));
 
   // Migrate colorControlPoints values from QJsonArray to 2D array.  Store A-values in binPoints vector.
   std::vector<float> binPoints;
-  for (int i=0; i<numControlColors; i++)
+  for(int i = 0; i < numControlColors; i++)
   {
-    for (int j=0; j<numComponents; j++)
+    for(int j = 0; j < numComponents; j++)
     {
-      controlPoints[i][j] = static_cast<float>(presetControlPoints[numComponents*i + j].toDouble());
-      if (j == 0)
+      controlPoints[i][j] = static_cast<float>(presetControlPoints[numComponents * i + j].toDouble());
+      if(j == 0)
       {
         binPoints.push_back(controlPoints[i][j]);
       }
@@ -178,7 +188,7 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   // Normalize binPoints values
   float binMin = binPoints[0];
   float binMax = binPoints[binPoints.size() - 1];
-  for (int i=0; i<binPoints.size(); i++)
+  for(int i = 0; i < binPoints.size(); i++)
   {
     binPoints[i] = (binPoints[i] - binMin) / (binMax - binMin);
   }
@@ -187,7 +197,10 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
   tmpPath.setDataArrayName(rgbArrayName);
 
   UInt8ArrayType::Pointer colorArray = dca->getPrereqArrayFromPath<UInt8ArrayType>(nullptr, tmpPath, std::vector<size_t>(1, 3));
-  if (colorArray.get() == nullptr) { return; }
+  if(colorArray.get() == nullptr)
+  {
+    return;
+  }
 
   ParallelDataAlgorithm dataAlg;
   dataAlg.setRange(0, arrayPtr->getNumberOfTuples());
@@ -336,7 +349,6 @@ void GenerateColorTable::execute()
     setErrorCondition(-10000, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
@@ -356,7 +368,9 @@ AbstractFilter::Pointer GenerateColorTable::newFilterInstance(bool copyFilterPar
 //
 // -----------------------------------------------------------------------------
 QString GenerateColorTable::getCompiledLibraryName() const
-{ return Core::CoreBaseName; }
+{
+  return Core::CoreBaseName;
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -373,7 +387,7 @@ QString GenerateColorTable::getFilterVersion() const
 {
   QString version;
   QTextStream vStream(&version);
-  vStream <<  SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
   return version;
 }
 
@@ -381,7 +395,9 @@ QString GenerateColorTable::getFilterVersion() const
 //
 // -----------------------------------------------------------------------------
 QString GenerateColorTable::getGroupName() const
-{ return SIMPL::FilterGroups::CoreFilters; }
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -395,13 +411,17 @@ QUuid GenerateColorTable::getUuid() const
 //
 // -----------------------------------------------------------------------------
 QString GenerateColorTable::getSubGroupName() const
-{ return SIMPL::FilterSubGroups::ImageFilters; }
+{
+  return SIMPL::FilterSubGroups::ImageFilters;
+}
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 QString GenerateColorTable::getHumanLabel() const
-{ return "Generate Color Table"; }
+{
+  return "Generate Color Table";
+}
 
 // -----------------------------------------------------------------------------
 GenerateColorTable::Pointer GenerateColorTable::NullPointer()
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 30f5dda3f4..1cab8f129b 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -36,7 +36,7 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -163,7 +163,6 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   GenerateColorTable();
 
@@ -189,4 +188,3 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
   DataArrayPath m_SelectedDataArrayPath = {};
   QString m_RgbArrayName = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index 4ef2e9b5a1..f06f855d0b 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -419,7 +419,6 @@ void GenerateTiltSeries::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 621256050b..378faee846 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -203,7 +203,6 @@ class SIMPLib_EXPORT GenerateTiltSeries : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   GenerateTiltSeries();
 
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index a73aaa0dc9..ba1fb452df 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ImportAsciDataArray.h"
 
 #include <locale>
@@ -56,7 +56,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   AsciiArrayID = 1
 };
 
@@ -83,7 +84,7 @@ int32_t readLine(std::istream& in, char* result, size_t length)
     {
       return 0;
     }
-    if(in.gcount() == static_cast<std::streamsize>(length) )
+    if(in.gcount() == static_cast<std::streamsize>(length))
     {
       // Read kBufferSize chars; ignoring the rest of the line.
       in.clear();
@@ -93,21 +94,20 @@ int32_t readLine(std::istream& in, char* result, size_t length)
   return 1;
 }
 
-
 class DelimiterType : public std::ctype<char>
 {
-    mask my_table[table_size];
-  public:
-    DelimiterType(char delimiter, size_t refs = 0)
-      : std::ctype<char>(&my_table[0], false, refs)
-    {
-      std::copy_n(classic_table(), table_size, my_table);
-      my_table[static_cast<mask>(delimiter)] = (mask)space;
-    }
-};
+  mask my_table[table_size];
 
+public:
+  DelimiterType(char delimiter, size_t refs = 0)
+  : std::ctype<char>(&my_table[0], false, refs)
+  {
+    std::copy_n(classic_table(), table_size, my_table);
+    my_table[static_cast<mask>(delimiter)] = (mask)space;
+  }
+};
 
-}
+} // namespace Detail
 
 // -----------------------------------------------------------------------------
 //
@@ -117,17 +117,17 @@ int check_error_bits(std::ifstream* f)
   int stop = RBR_NO_ERROR;
   if(f->eof())
   {
-    //std::perror("stream eofbit. error state");
+    // std::perror("stream eofbit. error state");
     stop = RBR_READ_EOF;
   }
   else if(f->fail())
   {
-    //std::perror("stream failbit (or badbit). error state");
+    // std::perror("stream failbit (or badbit). error state");
     stop = RBR_READ_ERROR;
   }
   else if(f->bad())
   {
-    //std::perror("stream badbit. error state");
+    // std::perror("stream badbit. error state");
     stop = RBR_READ_ERROR;
   }
   return stop;
@@ -136,7 +136,8 @@ int check_error_bits(std::ifstream* f)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Pointer data, const QString& filename, int32_t skipHeaderLines, char delimiter, bool inputIsBool = false)
+template <typename T, typename K>
+int32_t readAsciFile(typename DataArray<T>::Pointer data, const QString& filename, int32_t skipHeaderLines, char delimiter, bool inputIsBool = false)
 {
   int32_t err = 0;
   QFileInfo fi(filename);
@@ -160,7 +161,7 @@ template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Po
   // thing we are going to do it over write those bytes with the real data that we are after.
   for(int i = 0; i < skipHeaderLines; i++)
   {
-    buf.fill(0x00); // Splat Null Chars across the line
+    buf.fill(0x00);                                  // Splat Null Chars across the line
     err = Detail::readLine(in, buffer, kBufferSize); // Read Line 1 - VTK Version Info
     if(err < 0)
     {
@@ -206,7 +207,7 @@ template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Po
     for(size_t i = 0; i < totalSize; ++i)
     {
       in >> value;
-      data->setValue(i, static_cast<T>(value) );
+      data->setValue(i, static_cast<T>(value));
       err = check_error_bits(&in);
       if(err == RBR_READ_EOF && i < totalSize - 1)
       {
@@ -221,8 +222,6 @@ template <typename T, typename K> int32_t readAsciFile(typename DataArray<T>::Po
   return RBR_NO_ERROR;
 }
 
-
-
 /* ############## Start Private Implementation ############################### */
 // -----------------------------------------------------------------------------
 //
@@ -251,7 +250,6 @@ ImportAsciDataArrayPrivate::ImportAsciDataArrayPrivate(ImportAsciDataArray* ptr)
 }
 /* ############## End Private Implementation ############################### */
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -334,21 +332,18 @@ void ImportAsciDataArray::readHeaderPortion()
 {
   int32_t err = 0;
   QString filename = getInputFile();
-  
+
   QFileInfo fi(getInputFile());
-  
+
   QDateTime lastModified(fi.lastModified());
-  if(getInputFile() == getInputFile_Cache() 
-      && getLastRead().isValid() 
-      && lastModified.msecsTo(getLastRead()) >= 0
-      && getSkipHeaderLines() == getHeaderLines() )
+  if(getInputFile() == getInputFile_Cache() && getLastRead().isValid() && lastModified.msecsTo(getLastRead()) >= 0 && getSkipHeaderLines() == getHeaderLines())
   {
     // We are reading from the cache, so set the FileWasRead flag to false
   }
   else
   {
     // We are reading from the file
-    
+
     std::ifstream in(filename.toLatin1().constData(), std::ios_base::in | std::ios_base::binary);
     if(!in.is_open())
     {
@@ -356,17 +351,17 @@ void ImportAsciDataArray::readHeaderPortion()
       setErrorCondition(RBR_FILE_NOT_OPEN, errorMessage);
       return;
     }
-    
+
     in.imbue(std::locale(std::locale(), new Detail::DelimiterType(getDelimiter())));
-    
+
     QByteArray buf(kBufferSize, '\0');
     char* buffer = buf.data();
-    
+
     int skipHeaderLines = getSkipHeaderLines();
     for(int i = 0; i < skipHeaderLines; i++)
     {
       buf.fill(0x00); // Splat Null Chars across the line
-      err = Detail::readLine(in, buffer, kBufferSize); 
+      err = Detail::readLine(in, buffer, kBufferSize);
       if(err < 0)
       {
         QString errorMessage = QString("Error reading the input file at line %1 of the file").arg(i);
@@ -374,24 +369,21 @@ void ImportAsciDataArray::readHeaderPortion()
         return;
       }
     }
-    
+
     err = Detail::readLine(in, buffer, kBufferSize);
     if(err < 0)
     {
       setErrorCondition(err, "Error reading the first line of data from the input file");
     }
-    
+
     setFirstLine(buf);
-    
-    
+
     // Set the file path and time stamp into the cache
     setLastRead(QDateTime::currentDateTime());
     setInputFile_Cache(getInputFile());
   }
-  
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -422,18 +414,15 @@ void ImportAsciDataArray::setupFilterParameters()
     parameters.push_back(parameter);
   }
 
-
   {
     DataArrayCreationFilterParameter::RequirementType req;
     parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Output Attribute Array", CreatedAttributeArrayPath, FilterParameter::CreatedArray, ImportAsciDataArray, req));
   }
-  
-  PreflightUpdatedValueFilterParameter::Pointer param =
-      SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("First Line of Data:", FirstLine, FilterParameter::Parameter, ImportAsciDataArray);
+
+  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("First Line of Data:", FirstLine, FilterParameter::Parameter, ImportAsciDataArray);
   param->setReadOnly(true);
   parameters.push_back(param);
 
-
   setFilterParameters(parameters);
 }
 
@@ -533,11 +522,8 @@ void ImportAsciDataArray::dataCheck()
     getDataContainerArray()->createNonPrereqArrayFromPath<SizeTArrayType>(this, getCreatedAttributeArrayPath(), false, cDims, "CreatedAttributeArrayPath", AsciiArrayID);
   }
   readHeaderPortion();
-  
-  
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -579,7 +565,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
     Int16ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<int16_t,int16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<int16_t, int16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -588,7 +574,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
     UInt16ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<uint16_t,uint16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<uint16_t, uint16_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -597,7 +583,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
     Int32ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<int32_t,int32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<int32_t, int32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -606,7 +592,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
     UInt32ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<uint32_t,uint32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<uint32_t, uint32_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -615,7 +601,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
     Int64ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<int64_t,int64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<int64_t, int64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -624,7 +610,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
     UInt64ArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<uint64_t,uint64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<uint64_t, uint64_t>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -633,7 +619,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
     FloatArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<float,float>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<float, float>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
@@ -642,7 +628,7 @@ void ImportAsciDataArray::execute()
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
     DoubleArrayType::Pointer p = getDataContainerArray()->getPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), cDims);
-    err = readAsciFile<double,double>(p, m_InputFile, m_SkipHeaderLines, delimiter);
+    err = readAsciFile<double, double>(p, m_InputFile, m_SkipHeaderLines, delimiter);
     if(err >= 0)
     {
       m_Array = p;
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index c92f8d2098..904ffa02f7 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -54,265 +54,262 @@ class ImportAsciDataArrayPrivate;
  */
 class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
 {
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(ImportAsciDataArray)
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ImportAsciDataArray)
-    PYB11_FILTER_NEW_MACRO(ImportAsciDataArray)
-    PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
-    PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-    PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-    PYB11_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
-    PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-    PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ImportAsciDataArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ImportAsciDataArray> New();
-
-    /**
-     * @brief Returns the name of the class for ImportAsciDataArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ImportAsciDataArray
-     */
-    static QString ClassName();
-
-    ~ImportAsciDataArray() override;
-
-    /**
-     * @brief Setter property for CreatedAttributeArrayPath
-     */
-    void setCreatedAttributeArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CreatedAttributeArrayPath
-     * @return Value of CreatedAttributeArrayPath
-     */
-    DataArrayPath getCreatedAttributeArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
-
-    /**
-     * @brief Setter property for ScalarType
-     */
-    void setScalarType(SIMPL::NumericTypes::Type value);
-    /**
-     * @brief Getter property for ScalarType
-     * @return Value of ScalarType
-     */
-    SIMPL::NumericTypes::Type getScalarType() const;
-
-    Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-
-    /**
-     * @brief Setter property for NumberOfComponents
-     */
-    void setNumberOfComponents(int value);
-    /**
-     * @brief Getter property for NumberOfComponents
-     * @return Value of NumberOfComponents
-     */
-    int getNumberOfComponents() const;
-
-    Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-
-    /**
-     * @brief Setter property for SkipHeaderLines
-     */
-    void setSkipHeaderLines(int value);
-    /**
-     * @brief Getter property for SkipHeaderLines
-     * @return Value of SkipHeaderLines
-     */
-    int getSkipHeaderLines() const;
-
-    Q_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
-
-    /**
-     * @brief Setter property for InputFile
-     */
-    void setInputFile(const QString& value);
-    /**
-     * @brief Getter property for InputFile
-     * @return Value of InputFile
-     */
-    QString getInputFile() const;
-
-    Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-
-    /**
-     * @brief Setter property for Delimiter
-     */
-    void setDelimiter(int value);
-    /**
-     * @brief Getter property for Delimiter
-     * @return Value of Delimiter
-     */
-    int getDelimiter() const;
-
-    Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
-    
-    
-    Q_PROPERTY(QString FirstLine READ getFirstLine)
-
-    /**
-     * @brief Setter property for FirstLine
-     */
-    void setFirstLine(const QString& value);
-    /**
-     * @brief Getter property for FirstLine
-     * @return Value of FirstLine
-     */
-    QString getFirstLine() const;
-
-    /**
-     * @brief Setter property for InputFile_Cache
-     */
-    void setInputFile_Cache(const QString& value);
-    /**
-     * @brief Getter property for InputFile_Cache
-     * @return Value of InputFile_Cache
-     */
-    QString getInputFile_Cache() const;
-
-    /**
-     * @brief Setter property for LastRead
-     */
-    void setLastRead(const QDateTime& value);
-    /**
-     * @brief Getter property for LastRead
-     * @return Value of LastRead
-     */
-    QDateTime getLastRead() const;
-
-    /**
-     * @brief Setter property for HeaderLines
-     */
-    void setHeaderLines(int value);
-    /**
-     * @brief Getter property for HeaderLines
-     * @return Value of HeaderLines
-     */
-    int getHeaderLines() const;
-
-    enum DelimeterType
-    {
-      Comma = 0,
-      Semicolon = 1,
-      Space = 2,
-      Colon = 3,
-      Tab = 4
-    };
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ImportAsciDataArray();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-    /**
-     * @brief Converts from the enumeration to a char
-     * @return
-     */
-    char converSelectedDelimiter();
-    
-    /**
-     * @brief readHeaderPortion
-     * @return 
-     */
-    void readHeaderPortion();
-
-  private:
-    DataArrayPath m_CreatedAttributeArrayPath = {};
-    SIMPL::NumericTypes::Type m_ScalarType = {};
-    int m_NumberOfComponents = {};
-    int m_SkipHeaderLines = {};
-    QString m_InputFile = {};
-    int m_Delimiter = {};
-
-    QScopedPointer<ImportAsciDataArrayPrivate> const d_ptr;
-
-    IDataArrayShPtrType m_Array;
-
-  public:
-    ImportAsciDataArray(const ImportAsciDataArray&) = delete; // Copy Constructor Not Implemented
-    ImportAsciDataArray(ImportAsciDataArray&&) = delete;      // Move Constructor Not Implemented
-    ImportAsciDataArray& operator=(const ImportAsciDataArray&) = delete; // Copy Assignment Not Implemented
-    ImportAsciDataArray& operator=(ImportAsciDataArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+  Q_DECLARE_PRIVATE(ImportAsciDataArray)
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ImportAsciDataArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ImportAsciDataArray)
+  PYB11_FILTER_NEW_MACRO(ImportAsciDataArray)
+  PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
+  PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+  PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  PYB11_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
+  PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+  PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ImportAsciDataArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ImportAsciDataArray> New();
+
+  /**
+   * @brief Returns the name of the class for ImportAsciDataArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ImportAsciDataArray
+   */
+  static QString ClassName();
+
+  ~ImportAsciDataArray() override;
+
+  /**
+   * @brief Setter property for CreatedAttributeArrayPath
+   */
+  void setCreatedAttributeArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedAttributeArrayPath
+   * @return Value of CreatedAttributeArrayPath
+   */
+  DataArrayPath getCreatedAttributeArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
+
+  /**
+   * @brief Setter property for ScalarType
+   */
+  void setScalarType(SIMPL::NumericTypes::Type value);
+  /**
+   * @brief Getter property for ScalarType
+   * @return Value of ScalarType
+   */
+  SIMPL::NumericTypes::Type getScalarType() const;
+
+  Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+
+  /**
+   * @brief Setter property for NumberOfComponents
+   */
+  void setNumberOfComponents(int value);
+  /**
+   * @brief Getter property for NumberOfComponents
+   * @return Value of NumberOfComponents
+   */
+  int getNumberOfComponents() const;
+
+  Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+
+  /**
+   * @brief Setter property for SkipHeaderLines
+   */
+  void setSkipHeaderLines(int value);
+  /**
+   * @brief Getter property for SkipHeaderLines
+   * @return Value of SkipHeaderLines
+   */
+  int getSkipHeaderLines() const;
+
+  Q_PROPERTY(int SkipHeaderLines READ getSkipHeaderLines WRITE setSkipHeaderLines)
+
+  /**
+   * @brief Setter property for InputFile
+   */
+  void setInputFile(const QString& value);
+  /**
+   * @brief Getter property for InputFile
+   * @return Value of InputFile
+   */
+  QString getInputFile() const;
+
+  Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+
+  /**
+   * @brief Setter property for Delimiter
+   */
+  void setDelimiter(int value);
+  /**
+   * @brief Getter property for Delimiter
+   * @return Value of Delimiter
+   */
+  int getDelimiter() const;
+
+  Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
+
+  Q_PROPERTY(QString FirstLine READ getFirstLine)
+
+  /**
+   * @brief Setter property for FirstLine
+   */
+  void setFirstLine(const QString& value);
+  /**
+   * @brief Getter property for FirstLine
+   * @return Value of FirstLine
+   */
+  QString getFirstLine() const;
+
+  /**
+   * @brief Setter property for InputFile_Cache
+   */
+  void setInputFile_Cache(const QString& value);
+  /**
+   * @brief Getter property for InputFile_Cache
+   * @return Value of InputFile_Cache
+   */
+  QString getInputFile_Cache() const;
+
+  /**
+   * @brief Setter property for LastRead
+   */
+  void setLastRead(const QDateTime& value);
+  /**
+   * @brief Getter property for LastRead
+   * @return Value of LastRead
+   */
+  QDateTime getLastRead() const;
+
+  /**
+   * @brief Setter property for HeaderLines
+   */
+  void setHeaderLines(int value);
+  /**
+   * @brief Getter property for HeaderLines
+   * @return Value of HeaderLines
+   */
+  int getHeaderLines() const;
+
+  enum DelimeterType
+  {
+    Comma = 0,
+    Semicolon = 1,
+    Space = 2,
+    Colon = 3,
+    Tab = 4
+  };
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ImportAsciDataArray();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief Converts from the enumeration to a char
+   * @return
+   */
+  char converSelectedDelimiter();
+
+  /**
+   * @brief readHeaderPortion
+   * @return
+   */
+  void readHeaderPortion();
+
+private:
+  DataArrayPath m_CreatedAttributeArrayPath = {};
+  SIMPL::NumericTypes::Type m_ScalarType = {};
+  int m_NumberOfComponents = {};
+  int m_SkipHeaderLines = {};
+  QString m_InputFile = {};
+  int m_Delimiter = {};
+
+  QScopedPointer<ImportAsciDataArrayPrivate> const d_ptr;
+
+  IDataArrayShPtrType m_Array;
+
+public:
+  ImportAsciDataArray(const ImportAsciDataArray&) = delete;            // Copy Constructor Not Implemented
+  ImportAsciDataArray(ImportAsciDataArray&&) = delete;                 // Move Constructor Not Implemented
+  ImportAsciDataArray& operator=(const ImportAsciDataArray&) = delete; // Copy Assignment Not Implemented
+  ImportAsciDataArray& operator=(ImportAsciDataArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index f78bcedd26..215770bd75 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -349,7 +349,6 @@ void ImportHDF5Dataset::dataCheck()
   // The sentinel will close the HDF5 File and any groups that were open.
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -361,7 +360,6 @@ void ImportHDF5Dataset::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
index dc6308c28e..89c9dc8bce 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -211,7 +211,6 @@ class SIMPLib_EXPORT ImportHDF5Dataset : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ImportHDF5Dataset();
 
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 7441de7b1f..95b5c083bc 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "InitializeData.h"
 
 #include <random>
@@ -291,7 +291,8 @@ void InitializeData::dataCheck()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void InitializeData::checkInitialization(IDataArray::Pointer p)
+template <typename T>
+void InitializeData::checkInitialization(IDataArray::Pointer p)
 {
   QString arrayName = p->getName();
 
@@ -330,7 +331,6 @@ template <typename T> void InitializeData::checkInitialization(IDataArray::Point
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -350,7 +350,9 @@ void InitializeData::execute()
   SizeVec3Type udims = m->getGeometryAs<ImageGeom>()->getDimensions();
 
   int64_t dims[3] = {
-      static_cast<int64_t>(udims[0]), static_cast<int64_t>(udims[1]), static_cast<int64_t>(udims[2]),
+      static_cast<int64_t>(udims[0]),
+      static_cast<int64_t>(udims[1]),
+      static_cast<int64_t>(udims[2]),
   };
 
   QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
@@ -404,13 +406,13 @@ void InitializeData::execute()
 
     delay(1); // Delay the execution by 1 second to avoid the exact same seedings for each array
   }
-
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void InitializeData::initializeArrayWithInts(IDataArray::Pointer p, int64_t dims[3])
+template <typename T>
+void InitializeData::initializeArrayWithInts(IDataArray::Pointer p, int64_t dims[3])
 {
   T rangeMin;
   T rangeMax;
@@ -457,7 +459,8 @@ template <typename T> void InitializeData::initializeArrayWithInts(IDataArray::P
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void InitializeData::initializeArrayWithReals(IDataArray::Pointer p, int64_t dims[3])
+template <typename T>
+void InitializeData::initializeArrayWithReals(IDataArray::Pointer p, int64_t dims[3])
 {
   T rangeMin;
   T rangeMax;
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 87f97f06f0..6347d68e3f 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -78,7 +78,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -243,7 +243,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -294,7 +294,6 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   InitializeData();
   /**
@@ -328,39 +327,38 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   };
 
   /**
-  * @brief initializeArrayWithInts Initializes the array p with integers, either from the
-  * manual value entered in the filter, or with a random number.  This function does not
-  * check that the template type actually is an integer, so it will most likely cause
-  * unexpected results when passing anything other than an integer as a template parameter.
-  * @param p The array that will be initialized
-  * @param dims The dimensions of the array p
-  */
+   * @brief initializeArrayWithInts Initializes the array p with integers, either from the
+   * manual value entered in the filter, or with a random number.  This function does not
+   * check that the template type actually is an integer, so it will most likely cause
+   * unexpected results when passing anything other than an integer as a template parameter.
+   * @param p The array that will be initialized
+   * @param dims The dimensions of the array p
+   */
   template <typename T>
   void initializeArrayWithInts(IDataArrayShPtrType p, int64_t dims[3]);
 
   /**
-  * @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
-  * manual value entered in the filter, or with a random number.  This function does not
-  * check that the template type actually is a non-integer, so it will most likely cause
-  * unexpected results when passing anything other than a float or double as a template
-  * parameter.
-  * @param p The array that will be initialized
-  * @param dims The dimensions of the array p
-  */
+   * @brief initializeArrayWithReals Initializes the array p with real numbers, either from the
+   * manual value entered in the filter, or with a random number.  This function does not
+   * check that the template type actually is a non-integer, so it will most likely cause
+   * unexpected results when passing anything other than a float or double as a template
+   * parameter.
+   * @param p The array that will be initialized
+   * @param dims The dimensions of the array p
+   */
   template <typename T>
   void initializeArrayWithReals(IDataArrayShPtrType p, int64_t dims[3]);
 
   /**
-  * @brief checkInitialization Checks that the chosen initialization value/range is inside
-  * the bounds of the array type
-  */
+   * @brief checkInitialization Checks that the chosen initialization value/range is inside
+   * the bounds of the array type
+   */
   template <typename T>
   void checkInitialization(IDataArrayShPtrType p);
 
 public:
-  InitializeData(const InitializeData&) = delete; // Copy Constructor Not Implemented
-  InitializeData(InitializeData&&) = delete;      // Move Constructor Not Implemented
+  InitializeData(const InitializeData&) = delete;            // Copy Constructor Not Implemented
+  InitializeData(InitializeData&&) = delete;                 // Move Constructor Not Implemented
   InitializeData& operator=(const InitializeData&) = delete; // Copy Assignment Not Implemented
   InitializeData& operator=(InitializeData&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 6c75680524..42bf78569b 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "LinkFeatureMapToElementArray.h"
 
 #include <QtCore/QTextStream>
@@ -46,7 +46,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   AttributeMatrixID = 1,
   DataArrayID
 };
@@ -136,9 +137,9 @@ void LinkFeatureMapToElementArray::dataCheck()
   m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature, AttributeMatrixID);
 
   std::vector<size_t> cDims(1, 1);
-  m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(),
-                                                                                                              cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_SelectedCellDataPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_SelectedCellDataPtr =
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_SelectedCellDataPtr.lock())                                                                       /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_SelectedCellData = m_SelectedCellDataPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -156,7 +157,6 @@ void LinkFeatureMapToElementArray::dataCheck()
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -194,7 +194,6 @@ void LinkFeatureMapToElementArray::execute()
   {
     m_Active[i] = active[i];
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
old mode 100755
new mode 100644
index 3c47024d42..91bd27891d
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,169 +46,166 @@
  */
 class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(LinkFeatureMapToElementArray)
-    PYB11_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
-    PYB11_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
-    PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-    PYB11_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = LinkFeatureMapToElementArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<LinkFeatureMapToElementArray> New();
-
-    /**
-     * @brief Returns the name of the class for LinkFeatureMapToElementArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for LinkFeatureMapToElementArray
-     */
-    static QString ClassName();
-
-    ~LinkFeatureMapToElementArray() override;
-
-    /**
-     * @brief Setter property for CellFeatureAttributeMatrixName
-     */
-    void setCellFeatureAttributeMatrixName(const QString& value);
-    /**
-     * @brief Getter property for CellFeatureAttributeMatrixName
-     * @return Value of CellFeatureAttributeMatrixName
-     */
-    QString getCellFeatureAttributeMatrixName() const;
-
-    Q_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
-
-    /**
-     * @brief Setter property for SelectedCellArrayPath
-     */
-    void setSelectedCellArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedCellArrayPath
-     * @return Value of SelectedCellArrayPath
-     */
-    DataArrayPath getSelectedCellArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
-
-    /**
-     * @brief Setter property for ActiveArrayName
-     */
-    void setActiveArrayName(const QString& value);
-    /**
-     * @brief Getter property for ActiveArrayName
-     * @return Value of ActiveArrayName
-     */
-    QString getActiveArrayName() const;
-
-    Q_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    LinkFeatureMapToElementArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief updateFeatureInstancePointers Updates raw feature pointers
-     */
-    void updateFeatureInstancePointers();
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_SelectedCellDataPtr;
-    int32_t* m_SelectedCellData = nullptr;
-    std::weak_ptr<DataArray<bool>> m_ActivePtr;
-    bool* m_Active = nullptr;
-
-    QString m_CellFeatureAttributeMatrixName = {};
-    DataArrayPath m_SelectedCellArrayPath = {};
-    QString m_ActiveArrayName = {};
-
-  public:
-    LinkFeatureMapToElementArray(const LinkFeatureMapToElementArray&) = delete; // Copy Constructor Not Implemented
-    LinkFeatureMapToElementArray(LinkFeatureMapToElementArray&&) = delete;      // Move Constructor Not Implemented
-    LinkFeatureMapToElementArray& operator=(const LinkFeatureMapToElementArray&) = delete; // Copy Assignment Not Implemented
-    LinkFeatureMapToElementArray& operator=(LinkFeatureMapToElementArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(LinkFeatureMapToElementArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(LinkFeatureMapToElementArray)
+  PYB11_FILTER_NEW_MACRO(LinkFeatureMapToElementArray)
+  PYB11_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
+  PYB11_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+  PYB11_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = LinkFeatureMapToElementArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<LinkFeatureMapToElementArray> New();
+
+  /**
+   * @brief Returns the name of the class for LinkFeatureMapToElementArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for LinkFeatureMapToElementArray
+   */
+  static QString ClassName();
+
+  ~LinkFeatureMapToElementArray() override;
+
+  /**
+   * @brief Setter property for CellFeatureAttributeMatrixName
+   */
+  void setCellFeatureAttributeMatrixName(const QString& value);
+  /**
+   * @brief Getter property for CellFeatureAttributeMatrixName
+   * @return Value of CellFeatureAttributeMatrixName
+   */
+  QString getCellFeatureAttributeMatrixName() const;
+
+  Q_PROPERTY(QString CellFeatureAttributeMatrixName READ getCellFeatureAttributeMatrixName WRITE setCellFeatureAttributeMatrixName)
+
+  /**
+   * @brief Setter property for SelectedCellArrayPath
+   */
+  void setSelectedCellArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedCellArrayPath
+   * @return Value of SelectedCellArrayPath
+   */
+  DataArrayPath getSelectedCellArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedCellArrayPath READ getSelectedCellArrayPath WRITE setSelectedCellArrayPath)
+
+  /**
+   * @brief Setter property for ActiveArrayName
+   */
+  void setActiveArrayName(const QString& value);
+  /**
+   * @brief Getter property for ActiveArrayName
+   * @return Value of ActiveArrayName
+   */
+  QString getActiveArrayName() const;
+
+  Q_PROPERTY(QString ActiveArrayName READ getActiveArrayName WRITE setActiveArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  LinkFeatureMapToElementArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief updateFeatureInstancePointers Updates raw feature pointers
+   */
+  void updateFeatureInstancePointers();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_SelectedCellDataPtr;
+  int32_t* m_SelectedCellData = nullptr;
+  std::weak_ptr<DataArray<bool>> m_ActivePtr;
+  bool* m_Active = nullptr;
+
+  QString m_CellFeatureAttributeMatrixName = {};
+  DataArrayPath m_SelectedCellArrayPath = {};
+  QString m_ActiveArrayName = {};
+
+public:
+  LinkFeatureMapToElementArray(const LinkFeatureMapToElementArray&) = delete;            // Copy Constructor Not Implemented
+  LinkFeatureMapToElementArray(LinkFeatureMapToElementArray&&) = delete;                 // Move Constructor Not Implemented
+  LinkFeatureMapToElementArray& operator=(const LinkFeatureMapToElementArray&) = delete; // Copy Assignment Not Implemented
+  LinkFeatureMapToElementArray& operator=(LinkFeatureMapToElementArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index df275c4685..aa12992d3c 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MaskCountDecision.h"
 
@@ -64,8 +64,7 @@ MaskCountDecision::~MaskCountDecision() = default;
 void MaskCountDecision::setupFilterParameters()
 {
   FilterParameterVectorType parameters = getFilterParameters();
-  DataArraySelectionFilterParameter::RequirementType req =
-      DataArraySelectionFilterParameter::CreateRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Type::Any, IGeometry::Type::Any);
+  DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Type::Any, IGeometry::Type::Any);
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Mask", MaskArrayPath, FilterParameter::RequiredArray, MaskCountDecision, req));
   parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of True Instances", NumberOfTrues, FilterParameter::Parameter, MaskCountDecision, 0));
   setFilterParameters(parameters);
@@ -100,15 +99,13 @@ void MaskCountDecision::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
 
-  m_MaskPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_MaskPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_MaskPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_MaskPtr.lock())                                                                                /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_Mask = m_MaskPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -155,7 +152,6 @@ void MaskCountDecision::execute()
   qDebug() << "Fell through: " << dm;
 
   emit decisionMade(dm);
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
old mode 100755
new mode 100644
index e1f5ceac5c..c54f0a0b72
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,140 +47,137 @@
  */
 class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(MaskCountDecision)
-    PYB11_STATIC_NEW_MACRO(MaskCountDecision)
-    PYB11_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
-    PYB11_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = MaskCountDecision;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for MaskCountDecision
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MaskCountDecision
-     */
-    static QString ClassName();
-
-    ~MaskCountDecision() override;
-
-    /**
-     * @brief Setter property for MaskArrayPath
-     */
-    void setMaskArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for MaskArrayPath
-     * @return Value of MaskArrayPath
-     */
-    DataArrayPath getMaskArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
-
-    /**
-     * @brief Setter property for NumberOfTrues
-     */
-    void setNumberOfTrues(int value);
-    /**
-     * @brief Getter property for NumberOfTrues
-     * @return Value of NumberOfTrues
-     */
-    int getNumberOfTrues() const;
-
-    Q_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
-
-    /**
-    * @brief
-    * @param jsonDoc
-    */
-    void extractProperties(const QJsonDocument &jsonDoc) override;
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    MaskCountDecision();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<bool>> m_MaskPtr;
-    bool* m_Mask = nullptr;
-
-    DataArrayPath m_MaskArrayPath = {};
-    int m_NumberOfTrues = {};
-
-  public:
-    MaskCountDecision(const MaskCountDecision&) = delete; // Copy Constructor Not Implemented
-    MaskCountDecision(MaskCountDecision&&) = delete;      // Move Constructor Not Implemented
-    MaskCountDecision& operator=(const MaskCountDecision&) = delete; // Copy Assignment Not Implemented
-    MaskCountDecision& operator=(MaskCountDecision&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MaskCountDecision SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(MaskCountDecision)
+  PYB11_STATIC_NEW_MACRO(MaskCountDecision)
+  PYB11_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
+  PYB11_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = MaskCountDecision;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for MaskCountDecision
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MaskCountDecision
+   */
+  static QString ClassName();
+
+  ~MaskCountDecision() override;
+
+  /**
+   * @brief Setter property for MaskArrayPath
+   */
+  void setMaskArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for MaskArrayPath
+   * @return Value of MaskArrayPath
+   */
+  DataArrayPath getMaskArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath MaskArrayPath READ getMaskArrayPath WRITE setMaskArrayPath)
+
+  /**
+   * @brief Setter property for NumberOfTrues
+   */
+  void setNumberOfTrues(int value);
+  /**
+   * @brief Getter property for NumberOfTrues
+   * @return Value of NumberOfTrues
+   */
+  int getNumberOfTrues() const;
+
+  Q_PROPERTY(int NumberOfTrues READ getNumberOfTrues WRITE setNumberOfTrues)
+
+  /**
+   * @brief
+   * @param jsonDoc
+   */
+  void extractProperties(const QJsonDocument& jsonDoc) override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  MaskCountDecision();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<bool>> m_MaskPtr;
+  bool* m_Mask = nullptr;
+
+  DataArrayPath m_MaskArrayPath = {};
+  int m_NumberOfTrues = {};
+
+public:
+  MaskCountDecision(const MaskCountDecision&) = delete;            // Copy Constructor Not Implemented
+  MaskCountDecision(MaskCountDecision&&) = delete;                 // Move Constructor Not Implemented
+  MaskCountDecision& operator=(const MaskCountDecision&) = delete; // Copy Assignment Not Implemented
+  MaskCountDecision& operator=(MaskCountDecision&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 7270400aa1..ad9f2cd14e 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MassCreateData.h"
 
 #include <QtCore/QTextStream>
@@ -42,7 +42,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   DataContainerBaseID = 1
 };
 
@@ -50,7 +51,7 @@ enum createdPathID : RenameDataPath::DataID_t {
 //
 // -----------------------------------------------------------------------------
 MassCreateData::MassCreateData()
-  : m_DataContainerName("DataContainer")
+: m_DataContainerName("DataContainer")
 {
 }
 
@@ -101,7 +102,6 @@ void MassCreateData::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index 9dd1624d62..3017bd7e7c 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -63,7 +62,7 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -159,7 +158,6 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   MassCreateData();
   /**
@@ -181,4 +179,3 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
 private:
   DataArrayPath m_DataContainerName = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 8df549d62e..bf760f327f 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MoveData.h"
 
 #include <QtCore/QTextStream>
@@ -50,7 +50,7 @@ namespace
 {
 const int32_t k_MoveAttributeMatrix = 0;
 const int32_t k_MoveDataArray = 1;
-}
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
@@ -166,7 +166,7 @@ void MoveData::dataCheck()
     }
 
     amDestDataContainer->addOrReplaceAttributeMatrix(amSrcAttributeMatrix);
-    //amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+    // amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
     addPathRename(amSrcPath, amSrcAttributeMatrix->getDataArrayPath());
   }
   else if(getWhatToMove() == k_MoveDataArray)
@@ -196,7 +196,7 @@ void MoveData::dataCheck()
     }
 
     daDestAttributeMatrix->insertOrAssign(daSrcDataArray);
-    //daSrcAttributeMatrix->removeAttributeArray(daSrcPath.getDataArrayName());
+    // daSrcAttributeMatrix->removeAttributeArray(daSrcPath.getDataArrayName());
     addPathRename(daSrcPath, daSrcDataArray->getDataArrayPath());
   }
   else
@@ -207,7 +207,6 @@ void MoveData::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -221,7 +220,6 @@ void MoveData::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
old mode 100755
new mode 100644
index 8a31059dfa..01f4b88ba3
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,187 +45,185 @@
  */
 class SIMPLib_EXPORT MoveData : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(MoveData SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(MoveData)
-    PYB11_FILTER_NEW_MACRO(MoveData)
-    PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-    PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
-    PYB11_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
-    PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
-    PYB11_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = MoveData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<MoveData> New();
-
-    /**
-     * @brief Returns the name of the class for MoveData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MoveData
-     */
-    static QString ClassName();
-
-    ~MoveData() override;
-
-    /**
-     * @brief Setter property for WhatToMove
-     */
-    void setWhatToMove(int value);
-    /**
-     * @brief Getter property for WhatToMove
-     * @return Value of WhatToMove
-     */
-    int getWhatToMove() const;
-
-    Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-
-    /**
-     * @brief Setter property for DataContainerDestination
-     */
-    void setDataContainerDestination(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerDestination
-     * @return Value of DataContainerDestination
-     */
-    DataArrayPath getDataContainerDestination() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
-
-    /**
-     * @brief Setter property for AttributeMatrixSource
-     */
-    void setAttributeMatrixSource(const DataArrayPath& value);
-    /**
-     * @brief Getter property for AttributeMatrixSource
-     * @return Value of AttributeMatrixSource
-     */
-    DataArrayPath getAttributeMatrixSource() const;
-
-    Q_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
-
-    /**
-     * @brief Setter property for AttributeMatrixDestination
-     */
-    void setAttributeMatrixDestination(const DataArrayPath& value);
-    /**
-     * @brief Getter property for AttributeMatrixDestination
-     * @return Value of AttributeMatrixDestination
-     */
-    DataArrayPath getAttributeMatrixDestination() const;
-
-    Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
-
-    /**
-     * @brief Setter property for DataArraySource
-     */
-    void setDataArraySource(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataArraySource
-     * @return Value of DataArraySource
-     */
-    DataArrayPath getDataArraySource() const;
-
-    Q_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    MoveData();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    MoveData(const MoveData&) = delete;       // Copy Constructor Not Implemented
-    MoveData(MoveData&&) = delete;            // Move Constructor Not Implemented
-    MoveData& operator=(const MoveData&) = delete; // Copy Assignment Not Implemented
-    MoveData& operator=(MoveData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    int m_WhatToMove = {};
-    DataArrayPath m_DataContainerDestination = {};
-    DataArrayPath m_AttributeMatrixSource = {};
-    DataArrayPath m_AttributeMatrixDestination = {};
-    DataArrayPath m_DataArraySource = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MoveData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(MoveData)
+  PYB11_FILTER_NEW_MACRO(MoveData)
+  PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
+  PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+  PYB11_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
+  PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
+  PYB11_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = MoveData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<MoveData> New();
+
+  /**
+   * @brief Returns the name of the class for MoveData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MoveData
+   */
+  static QString ClassName();
+
+  ~MoveData() override;
+
+  /**
+   * @brief Setter property for WhatToMove
+   */
+  void setWhatToMove(int value);
+  /**
+   * @brief Getter property for WhatToMove
+   * @return Value of WhatToMove
+   */
+  int getWhatToMove() const;
+
+  Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
+
+  /**
+   * @brief Setter property for DataContainerDestination
+   */
+  void setDataContainerDestination(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerDestination
+   * @return Value of DataContainerDestination
+   */
+  DataArrayPath getDataContainerDestination() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+
+  /**
+   * @brief Setter property for AttributeMatrixSource
+   */
+  void setAttributeMatrixSource(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixSource
+   * @return Value of AttributeMatrixSource
+   */
+  DataArrayPath getAttributeMatrixSource() const;
+
+  Q_PROPERTY(DataArrayPath AttributeMatrixSource READ getAttributeMatrixSource WRITE setAttributeMatrixSource)
+
+  /**
+   * @brief Setter property for AttributeMatrixDestination
+   */
+  void setAttributeMatrixDestination(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixDestination
+   * @return Value of AttributeMatrixDestination
+   */
+  DataArrayPath getAttributeMatrixDestination() const;
+
+  Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
+
+  /**
+   * @brief Setter property for DataArraySource
+   */
+  void setDataArraySource(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataArraySource
+   * @return Value of DataArraySource
+   */
+  DataArrayPath getDataArraySource() const;
+
+  Q_PROPERTY(DataArrayPath DataArraySource READ getDataArraySource WRITE setDataArraySource)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  MoveData();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  MoveData(const MoveData&) = delete;            // Copy Constructor Not Implemented
+  MoveData(MoveData&&) = delete;                 // Move Constructor Not Implemented
+  MoveData& operator=(const MoveData&) = delete; // Copy Assignment Not Implemented
+  MoveData& operator=(MoveData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  int m_WhatToMove = {};
+  DataArrayPath m_DataContainerDestination = {};
+  DataArrayPath m_AttributeMatrixSource = {};
+  DataArrayPath m_AttributeMatrixDestination = {};
+  DataArrayPath m_DataArraySource = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 9771cf21b7..ba436e096c 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MoveMultiData.h"
 
 #include <QtCore/QTextStream>
@@ -52,7 +52,7 @@ namespace
 {
 const int32_t k_MoveAttributeMatrix = 0;
 const int32_t k_MoveMultiDataArray = 1;
-}
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
@@ -175,14 +175,14 @@ void MoveMultiData::dataCheck()
 
       // Move Attribute Matrix
       amDestDataContainer->addOrReplaceAttributeMatrix(amSrcAttributeMatrix);
-      //amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
+      // amSrcDataContainer->removeAttributeMatrix(amSrcAttributeMatrix->getName());
       addPathRename(amSrcPaths[i], amSrcAttributeMatrix->getDataArrayPath());
     }
   }
   else if(getWhatToMove() == k_MoveMultiDataArray)
   {
     AttributeMatrix::Pointer daDestAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amDestPath, -301);
-    
+
     // Repeat for each DataArray
     for(int i = 0; i < daSrcPaths.size(); i++)
     {
@@ -198,8 +198,8 @@ void MoveMultiData::dataCheck()
       if(daDestAttributeMatrix->getNumberOfTuples() != daSrcDataArray->getNumberOfTuples())
       {
         QString ss = QObject::tr("The number of tuples of source Attribute Array (%1) and destination Attribute Matrix (%2) do not match")
-          .arg(daSrcDataArray->getNumberOfTuples())
-          .arg(daDestAttributeMatrix->getNumberOfTuples());
+                         .arg(daSrcDataArray->getNumberOfTuples())
+                         .arg(daDestAttributeMatrix->getNumberOfTuples());
         setErrorCondition(-11019, ss);
         return;
       }
@@ -213,7 +213,7 @@ void MoveMultiData::dataCheck()
 
       // Move Array
       daDestAttributeMatrix->insertOrAssign(daSrcDataArray);
-      //daSrcAttributeMatrix->removeAttributeArray(daSrcPaths[i].getDataArrayName());
+      // daSrcAttributeMatrix->removeAttributeArray(daSrcPaths[i].getDataArrayName());
       addPathRename(daSrcPaths[i], daSrcDataArray->getDataArrayPath());
     }
   }
@@ -225,7 +225,6 @@ void MoveMultiData::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -239,7 +238,6 @@ void MoveMultiData::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index edd23f9de9..b2ac334ad9 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,187 +45,185 @@
  */
 class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(MoveMultiData)
-    PYB11_FILTER_NEW_MACRO(MoveMultiData)
-    PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-    PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
-    PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
-    PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
-    PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = MoveMultiData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<MoveMultiData> New();
-
-    /**
-     * @brief Returns the name of the class for MoveMultiData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MoveMultiData
-     */
-    static QString ClassName();
-
-    ~MoveMultiData() override;
-
-    /**
-     * @brief Setter property for WhatToMove
-     */
-    void setWhatToMove(int value);
-    /**
-     * @brief Getter property for WhatToMove
-     * @return Value of WhatToMove
-     */
-    int getWhatToMove() const;
-
-    Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
-
-    /**
-     * @brief Setter property for DataContainerDestination
-     */
-    void setDataContainerDestination(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerDestination
-     * @return Value of DataContainerDestination
-     */
-    DataArrayPath getDataContainerDestination() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
-
-    /**
-     * @brief Setter property for AttributeMatrixSources
-     */
-    void setAttributeMatrixSources(const QVector<DataArrayPath>& value);
-    /**
-     * @brief Getter property for AttributeMatrixSources
-     * @return Value of AttributeMatrixSources
-     */
-    QVector<DataArrayPath> getAttributeMatrixSources() const;
-
-    Q_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
-
-    /**
-     * @brief Setter property for AttributeMatrixDestination
-     */
-    void setAttributeMatrixDestination(const DataArrayPath& value);
-    /**
-     * @brief Getter property for AttributeMatrixDestination
-     * @return Value of AttributeMatrixDestination
-     */
-    DataArrayPath getAttributeMatrixDestination() const;
-
-    Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
-
-    /**
-     * @brief Setter property for DataArraySources
-     */
-    void setDataArraySources(const QVector<DataArrayPath>& value);
-    /**
-     * @brief Getter property for DataArraySources
-     * @return Value of DataArraySources
-     */
-    QVector<DataArrayPath> getDataArraySources() const;
-
-    Q_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    MoveMultiData();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    MoveMultiData(const MoveMultiData&) = delete;  // Copy Constructor Not Implemented
-    MoveMultiData(MoveMultiData&&) = delete;       // Move Constructor Not Implemented
-    MoveMultiData& operator=(const MoveMultiData&) = delete; // Copy Assignment Not Implemented
-    MoveMultiData& operator=(MoveMultiData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    int m_WhatToMove = {};
-    DataArrayPath m_DataContainerDestination = {};
-    QVector<DataArrayPath> m_AttributeMatrixSources = {};
-    DataArrayPath m_AttributeMatrixDestination = {};
-    QVector<DataArrayPath> m_DataArraySources = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MoveMultiData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(MoveMultiData)
+  PYB11_FILTER_NEW_MACRO(MoveMultiData)
+  PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
+  PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+  PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
+  PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
+  PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = MoveMultiData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<MoveMultiData> New();
+
+  /**
+   * @brief Returns the name of the class for MoveMultiData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MoveMultiData
+   */
+  static QString ClassName();
+
+  ~MoveMultiData() override;
+
+  /**
+   * @brief Setter property for WhatToMove
+   */
+  void setWhatToMove(int value);
+  /**
+   * @brief Getter property for WhatToMove
+   * @return Value of WhatToMove
+   */
+  int getWhatToMove() const;
+
+  Q_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
+
+  /**
+   * @brief Setter property for DataContainerDestination
+   */
+  void setDataContainerDestination(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerDestination
+   * @return Value of DataContainerDestination
+   */
+  DataArrayPath getDataContainerDestination() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
+
+  /**
+   * @brief Setter property for AttributeMatrixSources
+   */
+  void setAttributeMatrixSources(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for AttributeMatrixSources
+   * @return Value of AttributeMatrixSources
+   */
+  QVector<DataArrayPath> getAttributeMatrixSources() const;
+
+  Q_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
+
+  /**
+   * @brief Setter property for AttributeMatrixDestination
+   */
+  void setAttributeMatrixDestination(const DataArrayPath& value);
+  /**
+   * @brief Getter property for AttributeMatrixDestination
+   * @return Value of AttributeMatrixDestination
+   */
+  DataArrayPath getAttributeMatrixDestination() const;
+
+  Q_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
+
+  /**
+   * @brief Setter property for DataArraySources
+   */
+  void setDataArraySources(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for DataArraySources
+   * @return Value of DataArraySources
+   */
+  QVector<DataArrayPath> getDataArraySources() const;
+
+  Q_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  MoveMultiData();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  MoveMultiData(const MoveMultiData&) = delete;            // Copy Constructor Not Implemented
+  MoveMultiData(MoveMultiData&&) = delete;                 // Move Constructor Not Implemented
+  MoveMultiData& operator=(const MoveMultiData&) = delete; // Copy Assignment Not Implemented
+  MoveMultiData& operator=(MoveMultiData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  int m_WhatToMove = {};
+  DataArrayPath m_DataContainerDestination = {};
+  QVector<DataArrayPath> m_AttributeMatrixSources = {};
+  DataArrayPath m_AttributeMatrixDestination = {};
+  QVector<DataArrayPath> m_DataArraySources = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 1849db5b4c..0f3305bb1c 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiThresholdObjects.h"
 
 #include <QtCore/QTextStream>
@@ -46,7 +46,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   ThresholdArrayID = 1
 };
 
@@ -173,7 +174,6 @@ void MultiThresholdObjects::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index 64a5b22022..175630de60 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,148 +47,145 @@
  */
 class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(MultiThresholdObjects)
-    PYB11_FILTER_NEW_MACRO(MultiThresholdObjects)
-    PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
-    PYB11_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = MultiThresholdObjects;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<MultiThresholdObjects> New();
-
-    /**
-     * @brief Returns the name of the class for MultiThresholdObjects
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MultiThresholdObjects
-     */
-    static QString ClassName();
-
-    ~MultiThresholdObjects() override;
-
-    /**
-     * @brief Setter property for DestinationArrayName
-     */
-    void setDestinationArrayName(const QString& value);
-    /**
-     * @brief Getter property for DestinationArrayName
-     * @return Value of DestinationArrayName
-     */
-    QString getDestinationArrayName() const;
-
-    Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
-
-    /**
-     * @brief Setter property for SelectedThresholds
-     */
-    void setSelectedThresholds(const ComparisonInputs& value);
-    /**
-     * @brief Getter property for SelectedThresholds
-     * @return Value of SelectedThresholds
-     */
-    ComparisonInputs getSelectedThresholds() const;
-
-    Q_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    MultiThresholdObjects();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<bool>> m_DestinationPtr;
-    bool* m_Destination = nullptr;
-
-    QString m_DestinationArrayName = {};
-    ComparisonInputs m_SelectedThresholds = {};
-
-  public:
-    MultiThresholdObjects(const MultiThresholdObjects&) = delete; // Copy Constructor Not Implemented
-    MultiThresholdObjects(MultiThresholdObjects&&) = delete;      // Move Constructor Not Implemented
-    MultiThresholdObjects& operator=(const MultiThresholdObjects&) = delete; // Copy Assignment Not Implemented
-    MultiThresholdObjects& operator=(MultiThresholdObjects&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MultiThresholdObjects SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(MultiThresholdObjects)
+  PYB11_FILTER_NEW_MACRO(MultiThresholdObjects)
+  PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
+  PYB11_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = MultiThresholdObjects;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<MultiThresholdObjects> New();
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects
+   */
+  static QString ClassName();
+
+  ~MultiThresholdObjects() override;
+
+  /**
+   * @brief Setter property for DestinationArrayName
+   */
+  void setDestinationArrayName(const QString& value);
+  /**
+   * @brief Getter property for DestinationArrayName
+   * @return Value of DestinationArrayName
+   */
+  QString getDestinationArrayName() const;
+
+  Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
+
+  /**
+   * @brief Setter property for SelectedThresholds
+   */
+  void setSelectedThresholds(const ComparisonInputs& value);
+  /**
+   * @brief Getter property for SelectedThresholds
+   * @return Value of SelectedThresholds
+   */
+  ComparisonInputs getSelectedThresholds() const;
+
+  Q_PROPERTY(ComparisonInputs SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  MultiThresholdObjects();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<bool>> m_DestinationPtr;
+  bool* m_Destination = nullptr;
+
+  QString m_DestinationArrayName = {};
+  ComparisonInputs m_SelectedThresholds = {};
+
+public:
+  MultiThresholdObjects(const MultiThresholdObjects&) = delete;            // Copy Constructor Not Implemented
+  MultiThresholdObjects(MultiThresholdObjects&&) = delete;                 // Move Constructor Not Implemented
+  MultiThresholdObjects& operator=(const MultiThresholdObjects&) = delete; // Copy Assignment Not Implemented
+  MultiThresholdObjects& operator=(MultiThresholdObjects&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index ad65789174..2e3680bd51 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiThresholdObjects2.h"
 
 #include <QtCore/QTextStream>
@@ -47,7 +47,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   ThresholdArrayID = 1
 };
 
@@ -119,7 +120,7 @@ void MultiThresholdObjects2::dataCheck()
   }
   else
   {
-    //int32_t count = comparisonValues.size();
+    // int32_t count = comparisonValues.size();
     QString dcName = m_SelectedThresholds.getDataContainerName();
     QString amName = m_SelectedThresholds.getAttributeMatrixName();
 
@@ -135,7 +136,7 @@ void MultiThresholdObjects2::dataCheck()
       setErrorCondition(-13091, ss);
     }
 
-    //AbstractComparison::Pointer comp = m_SelectedThresholds[0];
+    // AbstractComparison::Pointer comp = m_SelectedThresholds[0];
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
@@ -149,7 +150,7 @@ void MultiThresholdObjects2::dataCheck()
     {
       ComparisonValue::Pointer comp = std::dynamic_pointer_cast<ComparisonValue>(comparisonValues[i]);
 
-      if (nullptr != comp)
+      if(nullptr != comp)
       {
         tempPath.update(dcName, amName, comp->getAttributeArrayName());
         IDataArray::Pointer inputData = getDataContainerArray()->getPrereqIDataArrayFromPath(this, tempPath);
@@ -157,11 +158,11 @@ void MultiThresholdObjects2::dataCheck()
         {
           cDims = inputData->getComponentDimensions();
           int32_t numComp = static_cast<int32_t>(cDims[0]);
-          for (int32_t d = 1; d < cDims.size(); d++)
+          for(int32_t d = 1; d < cDims.size(); d++)
           {
             numComp *= cDims[d];
           }
-          if (numComp > 1)
+          if(numComp > 1)
           {
             QString ss = QObject::tr("Selected array '%1' is not a scalar array").arg(comp->getAttributeArrayName());
             setErrorCondition(-11003, ss);
@@ -172,7 +173,6 @@ void MultiThresholdObjects2::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -196,50 +196,50 @@ void MultiThresholdObjects2::execute()
   DataContainer::Pointer m = dca->getDataContainer(dcName);
 
   // At least one threshold value is required
-  if (!m_SelectedThresholds.hasComparisonValue())
+  if(!m_SelectedThresholds.hasComparisonValue())
   {
     QString ss = QObject::tr("Error Executing threshold filter. There are no specified values to threshold against");
     setErrorCondition(-13001, ss);
     return;
   }
 
-    bool invert = m_SelectedThresholds.shouldInvert();
+  bool invert = m_SelectedThresholds.shouldInvert();
 
-    int64_t thresholdSize;
-    BoolArrayType::Pointer thresholdArray;
+  int64_t thresholdSize;
+  BoolArrayType::Pointer thresholdArray;
 
-    createBoolArray(thresholdSize, thresholdArray);
-    bool firstValueFound = false;
+  createBoolArray(thresholdSize, thresholdArray);
+  bool firstValueFound = false;
 
-    int32_t err = 0;
+  int32_t err = 0;
 
-    // Loop on the remaining Comparison objects updating our final result array as we go
-    for(int32_t i = 0; i < m_SelectedThresholds.size() && err >= 0; ++i)
+  // Loop on the remaining Comparison objects updating our final result array as we go
+  for(int32_t i = 0; i < m_SelectedThresholds.size() && err >= 0; ++i)
+  {
+    if(std::dynamic_pointer_cast<ComparisonSet>(m_SelectedThresholds[i]))
     {
-      if (std::dynamic_pointer_cast<ComparisonSet>(m_SelectedThresholds[i]))
-      {
-        ComparisonSet::Pointer comparisonSet = std::dynamic_pointer_cast<ComparisonSet>(m_SelectedThresholds[i]);
-        thresholdSet(comparisonSet, thresholdArray, err, !firstValueFound, false);
-        firstValueFound = true;
-      }
-      else if(std::dynamic_pointer_cast<ComparisonValue>(m_SelectedThresholds[i]))
-      {
-        ComparisonValue::Pointer comparisonValue = std::dynamic_pointer_cast<ComparisonValue>(m_SelectedThresholds[i]);
-        thresholdValue(comparisonValue, thresholdArray, err, !firstValueFound, false);
-        firstValueFound = true;
-      }
+      ComparisonSet::Pointer comparisonSet = std::dynamic_pointer_cast<ComparisonSet>(m_SelectedThresholds[i]);
+      thresholdSet(comparisonSet, thresholdArray, err, !firstValueFound, false);
+      firstValueFound = true;
     }
-
-    if (invert)
+    else if(std::dynamic_pointer_cast<ComparisonValue>(m_SelectedThresholds[i]))
     {
-      invertThreshold(thresholdSize, thresholdArray);
+      ComparisonValue::Pointer comparisonValue = std::dynamic_pointer_cast<ComparisonValue>(m_SelectedThresholds[i]);
+      thresholdValue(comparisonValue, thresholdArray, err, !firstValueFound, false);
+      firstValueFound = true;
     }
+  }
 
-    bool* threshold = thresholdArray->getPointer(0);
-    for (int64_t p = 0; p < thresholdSize; p++)
-    {
-      m_Destination[p] = threshold[p];
-    }
+  if(invert)
+  {
+    invertThreshold(thresholdSize, thresholdArray);
+  }
+
+  bool* threshold = thresholdArray->getPointer(0);
+  for(int64_t p = 0; p < thresholdSize; p++)
+  {
+    m_Destination[p] = threshold[p];
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -270,15 +270,15 @@ void MultiThresholdObjects2::insertThreshold(int64_t numItems, BoolArrayType::Po
   bool* newArray = newArrayPtr->getPointer(0);
   bool* currentArray = currentArrayPtr->getPointer(0);
 
-  for (int64_t i = 0; i < numItems; i++)
+  for(int64_t i = 0; i < numItems; i++)
   {
     // invert the current comparison if necessary
-    if (inverse)
+    if(inverse)
     {
       newArray[i] = !newArray[i];
     }
 
-    if (SIMPL::Union::Operator_Or == unionOperator)
+    if(SIMPL::Union::Operator_Or == unionOperator)
     {
       currentArray[i] = currentArray[i] || newArray[i];
     }
@@ -296,7 +296,7 @@ void MultiThresholdObjects2::invertThreshold(int64_t numItems, BoolArrayType::Po
 {
   bool* threshold = thresholdArray->getPointer(0);
 
-  for (int64_t i = 0; i < numItems; i++)
+  for(int64_t i = 0; i < numItems; i++)
   {
     threshold[i] = !threshold[i];
   }
@@ -305,14 +305,14 @@ void MultiThresholdObjects2::invertThreshold(int64_t numItems, BoolArrayType::Po
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiThresholdObjects2::thresholdSet(ComparisonSet::Pointer comparisonSet, BoolArrayType::Pointer& currentThreshold, int32_t &err, bool replaceInput, bool inverse)
+void MultiThresholdObjects2::thresholdSet(ComparisonSet::Pointer comparisonSet, BoolArrayType::Pointer& currentThreshold, int32_t& err, bool replaceInput, bool inverse)
 {
-  if (nullptr == comparisonSet)
+  if(nullptr == comparisonSet)
   {
     return;
   }
 
-  if (inverse)
+  if(inverse)
   {
     inverse = !comparisonSet->getInvertComparison();
   }
@@ -328,32 +328,32 @@ void MultiThresholdObjects2::thresholdSet(ComparisonSet::Pointer comparisonSet,
   bool firstValueFound = false;
 
   QVector<AbstractComparison::Pointer> comparisons = comparisonSet->getComparisons();
-  for (int i = 0; i < comparisons.size(); i++)
+  for(int i = 0; i < comparisons.size(); i++)
   {
     // Check all contents of child Comparison Sets
-    if (std::dynamic_pointer_cast<ComparisonSet>(comparisons.at(i)))
-    { 
+    if(std::dynamic_pointer_cast<ComparisonSet>(comparisons.at(i)))
+    {
       ComparisonSet::Pointer childSet = std::dynamic_pointer_cast<ComparisonSet>(comparisons.at(i));
       thresholdSet(childSet, setThresholdArray, err, !firstValueFound, false);
       firstValueFound = true;
     }
     // Check Comparison Values
-    if (std::dynamic_pointer_cast<ComparisonValue>(comparisons.at(i)))
+    if(std::dynamic_pointer_cast<ComparisonValue>(comparisons.at(i)))
     {
       ComparisonValue::Pointer childValue = std::dynamic_pointer_cast<ComparisonValue>(comparisons.at(i));
       thresholdValue(childValue, setThresholdArray, err, !firstValueFound, false);
       firstValueFound = true;
     }
 
-    if (err < 0)
+    if(err < 0)
     {
       return;
     }
   }
 
-  if (replaceInput)
+  if(replaceInput)
   {
-    if (inverse)
+    if(inverse)
     {
       invertThreshold(setArraySize, setThresholdArray);
     }
@@ -369,9 +369,9 @@ void MultiThresholdObjects2::thresholdSet(ComparisonSet::Pointer comparisonSet,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonValue, BoolArrayType::Pointer& inputThreshold, int32_t &err, bool replaceInput, bool inverse)
+void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonValue, BoolArrayType::Pointer& inputThreshold, int32_t& err, bool replaceInput, bool inverse)
 {
-  if (nullptr == comparisonValue)
+  if(nullptr == comparisonValue)
   {
     return;
   }
@@ -390,30 +390,30 @@ void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonV
   // Initialize the array to false
   currentArrayPtr->initializeWithZeros();
 
-  //bool* currentArray = currentArrayPtr->getPointer(0);
+  // bool* currentArray = currentArrayPtr->getPointer(0);
   int compOperator = comparisonValue->getCompOperator();
   double compValue = comparisonValue->getCompValue();
 
   ThresholdFilterHelper filter(static_cast<SIMPL::Comparison::Enumeration>(compOperator), compValue, currentArrayPtr.get());
 
   err = filter.execute(m->getAttributeMatrix(amName)->getAttributeArray(comparisonValue->getAttributeArrayName()), currentArrayPtr.get());
-  if (err < 0)
+  if(err < 0)
   {
     DataArrayPath tempPath(m_SelectedThresholds.getDataContainerName(), m_SelectedThresholds.getAttributeMatrixName(), comparisonValue->getAttributeArrayName());
     QString ss = QObject::tr("Error Executing threshold filter on array. The path is %1").arg(tempPath.serialize());
     setErrorCondition(-13002, ss);
     return;
   }
-  
-  if (replaceInput)
+
+  if(replaceInput)
   {
-    if (inverse)
+    if(inverse)
     {
       invertThreshold(totalTuples, currentArrayPtr);
     }
     inputThreshold.swap(currentArrayPtr);
   }
-  else 
+  else
   {
     // insert into current threshold
     insertThreshold(totalTuples, inputThreshold, comparisonValue->getUnionOperator(), currentArrayPtr, inverse);
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 6f0d749749..688527437c 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,192 +47,189 @@
 /**
  * @brief The MultiThresholdObjects2 class. See [Filter documentation](@ref multithresholdobjects2) for details.
  */
-class  SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
+class SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(MultiThresholdObjects2)
-    PYB11_FILTER_NEW_MACRO(MultiThresholdObjects2)
-    PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
-    PYB11_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = MultiThresholdObjects2;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<MultiThresholdObjects2> New();
-
-    /**
-     * @brief Returns the name of the class for MultiThresholdObjects2
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MultiThresholdObjects2
-     */
-    static QString ClassName();
-
-    ~MultiThresholdObjects2() override;
-
-    /**
-     * @brief Setter property for DestinationArrayName
-     */
-    void setDestinationArrayName(const QString& value);
-    /**
-     * @brief Getter property for DestinationArrayName
-     * @return Value of DestinationArrayName
-     */
-    QString getDestinationArrayName() const;
-
-    Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
-
-    /**
-     * @brief Setter property for SelectedThresholds
-     */
-    void setSelectedThresholds(const ComparisonInputsAdvanced& value);
-    /**
-     * @brief Getter property for SelectedThresholds
-     * @return Value of SelectedThresholds
-     */
-    ComparisonInputsAdvanced getSelectedThresholds() const;
-
-    Q_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    MultiThresholdObjects2();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-    /**
-    * @brief Creates and returns a DataArray<bool> for the given AttributeMatrix and the number of tuples
-    */
-    void createBoolArray(int64_t& numItems, BoolArrayType::Pointer& thresholdArrayPtr);
-    
-    /**
-    * @brief Merges two DataArray<bool>s of a given size using a union operator AND / OR and inverts the second DataArray if requested
-    * @param numItems Number of values in both DataArrays
-    * @param currentArray DataArray<bool> to merge values into
-    * @param unionOperator Union operator used to merge into currentArray
-    * @param newArray DataArray<bool> of values to merge into the currentArray
-    * @param inverse Should newArray have its boolean values flipped before being merged in
-    */
-    void insertThreshold(int64_t numItems, BoolArrayType::Pointer currentArray, int unionOperator, const BoolArrayType::Pointer newArray, bool inverse);
-    
-    /**
-    * @brief Flips the boolean values for a DataArray<bool>
-    * @param numItems Number of tuples in the DataArray
-    * @param thresholdArray DataArray to invert
-    */
-    void invertThreshold(int64_t numItems, BoolArrayType::Pointer thresholdArray);
-
-    /**
-    * @brief Performs a check on a ComparisonSet and either merges the result into the DataArray passed in or replaces the DataArray
-    * @param comparisonSet The set of comparisons used for setting the threshold
-    * @param inputThreshold DataArray<bool> merged into or replaced after finding the ComparisonSet's threshould output
-    * @param err Return any error code given
-    * @param replaceInput Specifies whether or not the result gets merged into inputThreshold or replaces it
-    * @param inverse Specifies whether or not the results need to be flipped before merging or replacing inputThreshold
-    */
-    void thresholdSet(ComparisonSet::Pointer comparisonSet, BoolArrayType::Pointer& inputThreshold, int32_t& err, bool replaceInput = false, bool inverse = false);
-    
-    /**
-    * @brief Performs a check on a single ComparisonValue and either merges the result into the DataArray passed in or replaces the DataArray
-    * @param comparisonValue The comparison operator and value used for caluculating the threshold
-    * @param inputThreshold DataArray<bool> merged into or replaced after finding the ComparisonSet's threshould output
-    * @param err Return any error code given
-    * @param replaceInput Specifies whether or not the result gets merged into inputThreshold or replaces it
-    * @param inverse Specifies whether or not the results need to be flipped before merging or replacing inputThreshold
-    */
-    void thresholdValue(ComparisonValue::Pointer comparisonValue, BoolArrayType::Pointer& inputThreshold, int32_t& err, bool replaceInput = false, bool inverse = false);
-
-
-  private:
-    std::weak_ptr<DataArray<bool>> m_DestinationPtr;
-    bool* m_Destination = nullptr;
-
-    QString m_DestinationArrayName = {};
-    ComparisonInputsAdvanced m_SelectedThresholds = {};
-
-  public:
-    MultiThresholdObjects2(const MultiThresholdObjects2&) = delete; // Copy Constructor Not Implemented
-    MultiThresholdObjects2(MultiThresholdObjects2&&) = delete;      // Move Constructor Not Implemented
-    MultiThresholdObjects2& operator=(const MultiThresholdObjects2&) = delete; // Copy Assignment Not Implemented
-    MultiThresholdObjects2& operator=(MultiThresholdObjects2&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MultiThresholdObjects2 SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(MultiThresholdObjects2)
+  PYB11_FILTER_NEW_MACRO(MultiThresholdObjects2)
+  PYB11_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
+  PYB11_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = MultiThresholdObjects2;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<MultiThresholdObjects2> New();
+
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects2
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiThresholdObjects2
+   */
+  static QString ClassName();
+
+  ~MultiThresholdObjects2() override;
+
+  /**
+   * @brief Setter property for DestinationArrayName
+   */
+  void setDestinationArrayName(const QString& value);
+  /**
+   * @brief Getter property for DestinationArrayName
+   * @return Value of DestinationArrayName
+   */
+  QString getDestinationArrayName() const;
+
+  Q_PROPERTY(QString DestinationArrayName READ getDestinationArrayName WRITE setDestinationArrayName)
+
+  /**
+   * @brief Setter property for SelectedThresholds
+   */
+  void setSelectedThresholds(const ComparisonInputsAdvanced& value);
+  /**
+   * @brief Getter property for SelectedThresholds
+   * @return Value of SelectedThresholds
+   */
+  ComparisonInputsAdvanced getSelectedThresholds() const;
+
+  Q_PROPERTY(ComparisonInputsAdvanced SelectedThresholds READ getSelectedThresholds WRITE setSelectedThresholds)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  MultiThresholdObjects2();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief Creates and returns a DataArray<bool> for the given AttributeMatrix and the number of tuples
+   */
+  void createBoolArray(int64_t& numItems, BoolArrayType::Pointer& thresholdArrayPtr);
+
+  /**
+   * @brief Merges two DataArray<bool>s of a given size using a union operator AND / OR and inverts the second DataArray if requested
+   * @param numItems Number of values in both DataArrays
+   * @param currentArray DataArray<bool> to merge values into
+   * @param unionOperator Union operator used to merge into currentArray
+   * @param newArray DataArray<bool> of values to merge into the currentArray
+   * @param inverse Should newArray have its boolean values flipped before being merged in
+   */
+  void insertThreshold(int64_t numItems, BoolArrayType::Pointer currentArray, int unionOperator, const BoolArrayType::Pointer newArray, bool inverse);
+
+  /**
+   * @brief Flips the boolean values for a DataArray<bool>
+   * @param numItems Number of tuples in the DataArray
+   * @param thresholdArray DataArray to invert
+   */
+  void invertThreshold(int64_t numItems, BoolArrayType::Pointer thresholdArray);
+
+  /**
+   * @brief Performs a check on a ComparisonSet and either merges the result into the DataArray passed in or replaces the DataArray
+   * @param comparisonSet The set of comparisons used for setting the threshold
+   * @param inputThreshold DataArray<bool> merged into or replaced after finding the ComparisonSet's threshould output
+   * @param err Return any error code given
+   * @param replaceInput Specifies whether or not the result gets merged into inputThreshold or replaces it
+   * @param inverse Specifies whether or not the results need to be flipped before merging or replacing inputThreshold
+   */
+  void thresholdSet(ComparisonSet::Pointer comparisonSet, BoolArrayType::Pointer& inputThreshold, int32_t& err, bool replaceInput = false, bool inverse = false);
+
+  /**
+   * @brief Performs a check on a single ComparisonValue and either merges the result into the DataArray passed in or replaces the DataArray
+   * @param comparisonValue The comparison operator and value used for caluculating the threshold
+   * @param inputThreshold DataArray<bool> merged into or replaced after finding the ComparisonSet's threshould output
+   * @param err Return any error code given
+   * @param replaceInput Specifies whether or not the result gets merged into inputThreshold or replaces it
+   * @param inverse Specifies whether or not the results need to be flipped before merging or replacing inputThreshold
+   */
+  void thresholdValue(ComparisonValue::Pointer comparisonValue, BoolArrayType::Pointer& inputThreshold, int32_t& err, bool replaceInput = false, bool inverse = false);
+
+private:
+  std::weak_ptr<DataArray<bool>> m_DestinationPtr;
+  bool* m_Destination = nullptr;
+
+  QString m_DestinationArrayName = {};
+  ComparisonInputsAdvanced m_SelectedThresholds = {};
+
+public:
+  MultiThresholdObjects2(const MultiThresholdObjects2&) = delete;            // Copy Constructor Not Implemented
+  MultiThresholdObjects2(MultiThresholdObjects2&&) = delete;                 // Move Constructor Not Implemented
+  MultiThresholdObjects2& operator=(const MultiThresholdObjects2&) = delete; // Copy Assignment Not Implemented
+  MultiThresholdObjects2& operator=(MultiThresholdObjects2&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index b7d6a47e95..0b2d127e45 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "PipelineAnnotation.h"
 
 #include <QtCore/QTextStream>
@@ -77,7 +77,6 @@ void PipelineAnnotation::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
index ff52ee2a0c..b369c3c309 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -60,7 +60,7 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -105,7 +105,7 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -151,7 +151,6 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   PipelineAnnotation();
   /**
@@ -165,12 +164,11 @@ class SIMPLib_EXPORT PipelineAnnotation : public AbstractFilter
   void initialize();
 
 public:
-  PipelineAnnotation(const PipelineAnnotation&) = delete; // Copy Constructor Not Implemented
-  PipelineAnnotation(PipelineAnnotation&&) = delete;      // Move Constructor Not Implemented
+  PipelineAnnotation(const PipelineAnnotation&) = delete;            // Copy Constructor Not Implemented
+  PipelineAnnotation(PipelineAnnotation&&) = delete;                 // Move Constructor Not Implemented
   PipelineAnnotation& operator=(const PipelineAnnotation&) = delete; // Copy Assignment Not Implemented
   PipelineAnnotation& operator=(PipelineAnnotation&&) = delete;      // Move Assignment Not Implemented
 
 private:
   QString m_Summary = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 04eb9c3c75..8dde30f2b4 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -102,7 +102,6 @@ void PostSlackMessage::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -161,7 +160,6 @@ void PostSlackMessage::execute()
 
   delete reply;
   delete connection;
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index 4269c6bd7a..e9e15f4559 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -140,9 +140,9 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
 
   Q_PROPERTY(bool WarningsAsError READ getWarningsAsError WRITE setWarningsAsError)
 
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
   QString getCompiledLibraryName() const override;
 
   /**
@@ -195,18 +195,17 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   PostSlackMessage();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 private:
@@ -219,10 +218,9 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   QMutex m_Mutex;
   QNetworkAccessManager* m_NetworkManager;
 
-  public:
-    PostSlackMessage(const PostSlackMessage&) = delete; // Copy Constructor Not Implemented
-    PostSlackMessage(PostSlackMessage&&) = delete;      // Move Constructor Not Implemented
-    PostSlackMessage& operator=(const PostSlackMessage&) = delete; // Copy Assignment Not Implemented
-    PostSlackMessage& operator=(PostSlackMessage&&) = delete;      // Move Assignment Not Implemented
+public:
+  PostSlackMessage(const PostSlackMessage&) = delete;            // Copy Constructor Not Implemented
+  PostSlackMessage(PostSlackMessage&&) = delete;                 // Move Constructor Not Implemented
+  PostSlackMessage& operator=(const PostSlackMessage&) = delete; // Copy Assignment Not Implemented
+  PostSlackMessage& operator=(PostSlackMessage&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index a78768ebc7..02291e7208 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -62,14 +62,14 @@
 
 #ifdef CMP_WORDS_BIGENDIAN
 #define SWAP_ARRAY(array)                                                                                                                                                                              \
-  if(filter->getEndian() == 0)                                                                                                                                                                                    \
+  if(filter->getEndian() == 0)                                                                                                                                                                         \
   {                                                                                                                                                                                                    \
     array->byteSwapElements();                                                                                                                                                                         \
   }
 
 #else
 #define SWAP_ARRAY(array)                                                                                                                                                                              \
-  if(filter->getEndian() == 1)                                                                                                                                                                                    \
+  if(filter->getEndian() == 1)                                                                                                                                                                         \
   {                                                                                                                                                                                                    \
     array->byteSwapElements();                                                                                                                                                                         \
   }
@@ -96,7 +96,8 @@ int32_t SanityCheckFileSizeVersusAllocatedSize(size_t allocatedBytes, size_t fil
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> int32_t readBinaryFile(RawBinaryReader* filter, const std::vector<size_t>& cDims)
+template <typename T>
+int32_t readBinaryFile(RawBinaryReader* filter, const std::vector<size_t>& cDims)
 {
   typename DataArray<T>::Pointer p = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter, filter->getCreatedAttributeArrayPath(), cDims);
   QString filename = filter->getInputFile();
@@ -128,11 +129,11 @@ template <typename T> int32_t readBinaryFile(RawBinaryReader* filter, const std:
   // Skip some header bytes if the user asked for it.
   if(skipHeaderBytes > 0)
   {
-    #if defined (_MSC_VER)
-      _fseeki64(f, skipHeaderBytes, SEEK_SET);
-    #else
-      fseek(f, skipHeaderBytes, SEEK_SET);
-    #endif
+#if defined(_MSC_VER)
+    _fseeki64(f, skipHeaderBytes, SEEK_SET);
+#else
+    fseek(f, skipHeaderBytes, SEEK_SET);
+#endif
   }
   numRead = 0;
   // Now start reading the data in chunks if needed.
@@ -161,7 +162,6 @@ template <typename T> int32_t readBinaryFile(RawBinaryReader* filter, const std:
     }
   }
 
-
   SWAP_ARRAY(p)
 
   return RBR_NO_ERROR;
@@ -351,7 +351,6 @@ void RawBinaryReader::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
old mode 100755
new mode 100644
index 0db86dd788..0c06d39a71
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -1,38 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2009-2019 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,205 +50,201 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RawBinaryReader)
-    PYB11_FILTER_NEW_MACRO(RawBinaryReader)
-    PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
-    PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-    PYB11_PROPERTY(int Endian READ getEndian WRITE setEndian)
-    PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-    PYB11_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
-    PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RawBinaryReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RawBinaryReader> New();
-
-    /**
-     * @brief Returns the name of the class for RawBinaryReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RawBinaryReader
-     */
-    static QString ClassName();
-
-    ~RawBinaryReader() override;
-
-    /**
-     * @brief Setter property for CreatedAttributeArrayPath
-     */
-    void setCreatedAttributeArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for CreatedAttributeArrayPath
-     * @return Value of CreatedAttributeArrayPath
-     */
-    DataArrayPath getCreatedAttributeArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
-
-    /**
-     * @brief Setter property for ScalarType
-     */
-    void setScalarType(SIMPL::NumericTypes::Type value);
-    /**
-     * @brief Getter property for ScalarType
-     * @return Value of ScalarType
-     */
-    SIMPL::NumericTypes::Type getScalarType() const;
-
-    Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-
-    /**
-     * @brief Setter property for Endian
-     */
-    void setEndian(int value);
-    /**
-     * @brief Getter property for Endian
-     * @return Value of Endian
-     */
-    int getEndian() const;
-
-    Q_PROPERTY(int Endian READ getEndian WRITE setEndian)
-
-    /**
-     * @brief Setter property for NumberOfComponents
-     */
-    void setNumberOfComponents(int value);
-    /**
-     * @brief Getter property for NumberOfComponents
-     * @return Value of NumberOfComponents
-     */
-    int getNumberOfComponents() const;
-
-    Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
-
-    /**
-     * @brief Setter property for SkipHeaderBytes
-     */
-    void setSkipHeaderBytes(uint64_t value);
-    /**
-     * @brief Getter property for SkipHeaderBytes
-     * @return Value of SkipHeaderBytes
-     */
-    uint64_t getSkipHeaderBytes() const;
-
-    Q_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
-
-    /**
-     * @brief Setter property for InputFile
-     */
-    void setInputFile(const QString& value);
-    /**
-     * @brief Getter property for InputFile
-     * @return Value of InputFile
-     */
-    QString getInputFile() const;
-
-    Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
-
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    RawBinaryReader();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    DataArrayPath m_CreatedAttributeArrayPath = {};
-    SIMPL::NumericTypes::Type m_ScalarType = {};
-    int m_Endian = {};
-    int m_NumberOfComponents = {};
-    uint64_t m_SkipHeaderBytes = {};
-    QString m_InputFile = {};
-
-    IDataArrayShPtrType m_Array;
-
-  public:
-    RawBinaryReader(const RawBinaryReader&) = delete; // Copy Constructor Not Implemented
-    RawBinaryReader(RawBinaryReader&&) = delete;      // Move Constructor Not Implemented
-    RawBinaryReader& operator=(const RawBinaryReader&) = delete; // Copy Assignment Not Implemented
-    RawBinaryReader& operator=(RawBinaryReader&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RawBinaryReader SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RawBinaryReader)
+  PYB11_FILTER_NEW_MACRO(RawBinaryReader)
+  PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
+  PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+  PYB11_PROPERTY(int Endian READ getEndian WRITE setEndian)
+  PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  PYB11_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
+  PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RawBinaryReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RawBinaryReader> New();
+
+  /**
+   * @brief Returns the name of the class for RawBinaryReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RawBinaryReader
+   */
+  static QString ClassName();
+
+  ~RawBinaryReader() override;
+
+  /**
+   * @brief Setter property for CreatedAttributeArrayPath
+   */
+  void setCreatedAttributeArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for CreatedAttributeArrayPath
+   * @return Value of CreatedAttributeArrayPath
+   */
+  DataArrayPath getCreatedAttributeArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
+
+  /**
+   * @brief Setter property for ScalarType
+   */
+  void setScalarType(SIMPL::NumericTypes::Type value);
+  /**
+   * @brief Getter property for ScalarType
+   * @return Value of ScalarType
+   */
+  SIMPL::NumericTypes::Type getScalarType() const;
+
+  Q_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
+
+  /**
+   * @brief Setter property for Endian
+   */
+  void setEndian(int value);
+  /**
+   * @brief Getter property for Endian
+   * @return Value of Endian
+   */
+  int getEndian() const;
+
+  Q_PROPERTY(int Endian READ getEndian WRITE setEndian)
+
+  /**
+   * @brief Setter property for NumberOfComponents
+   */
+  void setNumberOfComponents(int value);
+  /**
+   * @brief Getter property for NumberOfComponents
+   * @return Value of NumberOfComponents
+   */
+  int getNumberOfComponents() const;
+
+  Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+
+  /**
+   * @brief Setter property for SkipHeaderBytes
+   */
+  void setSkipHeaderBytes(uint64_t value);
+  /**
+   * @brief Getter property for SkipHeaderBytes
+   * @return Value of SkipHeaderBytes
+   */
+  uint64_t getSkipHeaderBytes() const;
+
+  Q_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
+
+  /**
+   * @brief Setter property for InputFile
+   */
+  void setInputFile(const QString& value);
+  /**
+   * @brief Getter property for InputFile
+   * @return Value of InputFile
+   */
+  QString getInputFile() const;
+
+  Q_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  RawBinaryReader();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  DataArrayPath m_CreatedAttributeArrayPath = {};
+  SIMPL::NumericTypes::Type m_ScalarType = {};
+  int m_Endian = {};
+  int m_NumberOfComponents = {};
+  uint64_t m_SkipHeaderBytes = {};
+  QString m_InputFile = {};
+
+  IDataArrayShPtrType m_Array;
+
+public:
+  RawBinaryReader(const RawBinaryReader&) = delete;            // Copy Constructor Not Implemented
+  RawBinaryReader(RawBinaryReader&&) = delete;                 // Move Constructor Not Implemented
+  RawBinaryReader& operator=(const RawBinaryReader&) = delete; // Copy Assignment Not Implemented
+  RawBinaryReader& operator=(RawBinaryReader&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index f78db203d7..d22c0b9558 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -2,7 +2,6 @@
  * Your License or Copyright can go here
  */
 
-
 #include "ReadASCIIData.h"
 
 #include <QtCore/QFileInfo>
@@ -21,17 +20,16 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
-namespace {
-   const QString k_Skip("Skip");
+namespace
+{
+const QString k_Skip("Skip");
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 ReadASCIIData::ReadASCIIData() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -62,7 +60,7 @@ void ReadASCIIData::readFilterParameters(AbstractFilterParametersReader* reader,
 
   QString delimitersStr = reader->readString(prefix + "Delimiters", "");
   QList<char> delimiters;
-  for(auto && i : delimitersStr)
+  for(auto&& i : delimitersStr)
   {
     delimiters.push_back(i.toLatin1());
   }
@@ -337,7 +335,7 @@ void ReadASCIIData::dataCheck()
   for(int i = 0; i < dataTypes.size(); i++)
   {
     QString dataType = dataTypes[i];
-    if(dataType == ::k_Skip) 
+    if(dataType == ::k_Skip)
     {
       continue;
     }
@@ -410,7 +408,6 @@ void ReadASCIIData::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -577,7 +574,6 @@ void ReadASCIIData::execute()
     }
     inputFile.close();
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index c652d0c2af..0913416a7f 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -111,9 +111,9 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     INVALID_ARRAY_TYPE = -106
   };
 
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
   QString getCompiledLibraryName() const override;
 
   /**
@@ -167,52 +167,49 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
-  * @brief readFilterParametersFromJson Reads the filter parameters from a file
-  * @param reader Reader that is used to read the parameters from a file
-  */
+   * @brief readFilterParametersFromJson Reads the filter parameters from a file
+   * @param reader Reader that is used to read the parameters from a file
+   */
   void readFilterParameters(QJsonObject& obj) override;
 
   /**
-  * @brief writeFilterParametersToJson Writes the filter parameters to a file
-  * @param root The root json object
-  */
+   * @brief writeFilterParametersToJson Writes the filter parameters to a file
+   * @param root The root json object
+   */
   void writeFilterParameters(QJsonObject& obj) const override;
 
-   /**
-    * @brief execute Reimplemented from @see AbstractFilter class
-    */
-    void execute() override;
-
-
-    /**
-    * @brief Updates any DataArrayPath properties from the old path to a new path
-    * For DataArrayPaths longer than the given path, only the specified values are modified
-    * @param renamePath
-    */
-    void renameDataArrayPath(const DataArrayPath::RenameType& renamePath) override;
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
 
-  protected:
-    ReadASCIIData();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
+  /**
+   * @brief Updates any DataArrayPath properties from the old path to a new path
+   * For DataArrayPaths longer than the given path, only the specified values are modified
+   * @param renamePath
+   */
+  void renameDataArrayPath(const DataArrayPath::RenameType& renamePath) override;
 
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
+protected:
+  ReadASCIIData();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
 
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
 
-  private:
-    ASCIIWizardData m_WizardData = {};
+private:
+  ASCIIWizardData m_WizardData = {};
 
-    QMap<int, IDataArrayShPtrType> m_ASCIIArrayMap;
+  QMap<int, IDataArrayShPtrType> m_ASCIIArrayMap;
 
-  public:
-    ReadASCIIData(const ReadASCIIData&) = delete;  // Copy Constructor Not Implemented
-    ReadASCIIData(ReadASCIIData&&) = delete;       // Move Constructor Not Implemented
-    ReadASCIIData& operator=(const ReadASCIIData&) = delete; // Copy Assignment Not Implemented
-    ReadASCIIData& operator=(ReadASCIIData&&) = delete;      // Move Assignment Not Implemented
+public:
+  ReadASCIIData(const ReadASCIIData&) = delete;            // Copy Constructor Not Implemented
+  ReadASCIIData(ReadASCIIData&&) = delete;                 // Move Constructor Not Implemented
+  ReadASCIIData& operator=(const ReadASCIIData&) = delete; // Copy Assignment Not Implemented
+  ReadASCIIData& operator=(ReadASCIIData&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index f87b4c09ac..5198dc4658 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "RemoveArrays.h"
 
 #include <QtCore/QTextStream>
@@ -107,7 +107,6 @@ void RemoveArrays::dataCheck()
   removeSelectionsFromDataContainerArray(getDataContainerArray().get(), Qt::Checked);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -142,7 +141,7 @@ void RemoveArrays::removeSelectionsFromDataContainerArray(DataContainerArray* dc
     {
       auto dc = dca->removeDataContainer(dcProxy.getName()); // Remove it out
       m_RemovedPaths.merge(dc->getDescendantPaths());
-      continue;                               // Continue to the next DataContainer
+      continue; // Continue to the next DataContainer
     }
     QMap<QString, AttributeMatrixProxy> attrMats = dcProxy.getAttributeMatricies();
     QMutableMapIterator<QString, AttributeMatrixProxy> attrMatsIter(attrMats);
@@ -214,7 +213,6 @@ void RemoveArrays::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index edae794040..b158e052ff 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,152 +46,149 @@
  */
 class SIMPLib_EXPORT RemoveArrays : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RemoveArrays)
-    PYB11_FILTER_NEW_MACRO(RemoveArrays)
-    PYB11_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RemoveArrays;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RemoveArrays> New();
-
-    /**
-     * @brief Returns the name of the class for RemoveArrays
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RemoveArrays
-     */
-    static QString ClassName();
-
-    ~RemoveArrays() override;
-
-    /**
-     * @brief Setter property for DataArraysToRemove
-     */
-    void setDataArraysToRemove(const DataContainerArrayProxy& value);
-    /**
-     * @brief Getter property for DataArraysToRemove
-     * @return Value of DataArraysToRemove
-     */
-    DataContainerArrayProxy getDataArraysToRemove() const;
-
-    Q_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-     * @brief removeSelectionsFromDataContainerArray Attempts to remove those DataContainers, AttributeMatrices, and DataArrays selected by the user.
-     * DataArray items that are flagged as selected by the user/programmer.
-     * @param dca DataContainerArray instance pointer
-     * @param state Flagged state of items in the DataContainerArray
-     */
-    void removeSelectionsFromDataContainerArray(DataContainerArray* dca, Qt::CheckState state);
-
-    /**
-     * @brief Returns the list of deleted data paths.
-     * @return
-     */
-    std::list<DataArrayPath> getDeletedPaths() override;
-
-  protected:
-    RemoveArrays();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-    * @brief markSelectionsForDeletion Marks the items in the data container array with checkstate 'state' for deletion
-    */
-    void markSelectionsForDeletion(DataContainerArray* dca, Qt::CheckState state);
-
-  public:
-    RemoveArrays(const RemoveArrays&) = delete;   // Copy Constructor Not Implemented
-    RemoveArrays(RemoveArrays&&) = delete;        // Move Constructor Not Implemented
-    RemoveArrays& operator=(const RemoveArrays&) = delete; // Copy Assignment Not Implemented
-    RemoveArrays& operator=(RemoveArrays&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataContainerArrayProxy m_DataArraysToRemove = {};
-
-    std::list<DataArrayPath> m_RemovedPaths;
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RemoveArrays SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RemoveArrays)
+  PYB11_FILTER_NEW_MACRO(RemoveArrays)
+  PYB11_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RemoveArrays;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RemoveArrays> New();
+
+  /**
+   * @brief Returns the name of the class for RemoveArrays
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RemoveArrays
+   */
+  static QString ClassName();
+
+  ~RemoveArrays() override;
+
+  /**
+   * @brief Setter property for DataArraysToRemove
+   */
+  void setDataArraysToRemove(const DataContainerArrayProxy& value);
+  /**
+   * @brief Getter property for DataArraysToRemove
+   * @return Value of DataArraysToRemove
+   */
+  DataContainerArrayProxy getDataArraysToRemove() const;
+
+  Q_PROPERTY(DataContainerArrayProxy DataArraysToRemove READ getDataArraysToRemove WRITE setDataArraysToRemove)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief removeSelectionsFromDataContainerArray Attempts to remove those DataContainers, AttributeMatrices, and DataArrays selected by the user.
+   * DataArray items that are flagged as selected by the user/programmer.
+   * @param dca DataContainerArray instance pointer
+   * @param state Flagged state of items in the DataContainerArray
+   */
+  void removeSelectionsFromDataContainerArray(DataContainerArray* dca, Qt::CheckState state);
+
+  /**
+   * @brief Returns the list of deleted data paths.
+   * @return
+   */
+  std::list<DataArrayPath> getDeletedPaths() override;
+
+protected:
+  RemoveArrays();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief markSelectionsForDeletion Marks the items in the data container array with checkstate 'state' for deletion
+   */
+  void markSelectionsForDeletion(DataContainerArray* dca, Qt::CheckState state);
+
+public:
+  RemoveArrays(const RemoveArrays&) = delete;            // Copy Constructor Not Implemented
+  RemoveArrays(RemoveArrays&&) = delete;                 // Move Constructor Not Implemented
+  RemoveArrays& operator=(const RemoveArrays&) = delete; // Copy Assignment Not Implemented
+  RemoveArrays& operator=(RemoveArrays&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataContainerArrayProxy m_DataArraysToRemove = {};
+
+  std::list<DataArrayPath> m_RemovedPaths;
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 089bccb7c6..91d59920ab 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "RemoveComponentFromArray.h"
 
 #include <QtCore/QTextStream>
@@ -48,7 +48,8 @@
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   NewDataArrayID = 1,
   ReducedDataArrayID
 };
@@ -82,7 +83,8 @@ void RemoveComponentFromArray::setupFilterParameters()
       DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Category::Any);
   parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, RemoveComponentFromArray, req));
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Removed Component Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Removed Component Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
 
   parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Reduced Attribute Array", ReducedArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
 
@@ -176,11 +178,11 @@ void RemoveComponentFromArray::dataCheck()
   m_ReducedArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromArrayType()(this, tempPath2, cDims, m_InArrayPtr.lock(), ReducedDataArrayID);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void extractComponent(IDataArray::Pointer inputData, IDataArray::Pointer newData, IDataArray::Pointer reducedData, int compNumber)
+template <typename T>
+void extractComponent(IDataArray::Pointer inputData, IDataArray::Pointer newData, IDataArray::Pointer reducedData, int compNumber)
 {
   typename DataArray<T>::Pointer inputArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(inputData);
   typename DataArray<T>::Pointer newArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(newData);
@@ -221,7 +223,8 @@ template <typename T> void extractComponent(IDataArray::Pointer inputData, IData
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void reduceArrayOnly(IDataArray::Pointer inputData, IDataArray::Pointer reducedData, int compNumber)
+template <typename T>
+void reduceArrayOnly(IDataArray::Pointer inputData, IDataArray::Pointer reducedData, int compNumber)
 {
   typename DataArray<T>::Pointer inputArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(inputData);
   typename DataArray<T>::Pointer reducedArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(reducedData);
@@ -275,7 +278,6 @@ void RemoveComponentFromArray::execute()
   {
     EXECUTE_FUNCTION_TEMPLATE(this, reduceArrayOnly, m_InArrayPtr.lock(), m_InArrayPtr.lock(), m_ReducedArrayPtr.lock(), m_CompNumber)
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
old mode 100755
new mode 100644
index 80fd04d322..c3dd66bc66
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,191 +48,188 @@ using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RemoveComponentFromArray)
-    PYB11_FILTER_NEW_MACRO(RemoveComponentFromArray)
-    PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-    PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
-    PYB11_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
-    PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
-    PYB11_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RemoveComponentFromArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RemoveComponentFromArray> New();
-
-    /**
-     * @brief Returns the name of the class for RemoveComponentFromArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RemoveComponentFromArray
-     */
-    static QString ClassName();
-
-    ~RemoveComponentFromArray() override;
-
-    /**
-     * @brief Setter property for SelectedArrayPath
-     */
-    void setSelectedArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedArrayPath
-     * @return Value of SelectedArrayPath
-     */
-    DataArrayPath getSelectedArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-
-    /**
-     * @brief Setter property for CompNumber
-     */
-    void setCompNumber(int value);
-    /**
-     * @brief Getter property for CompNumber
-     * @return Value of CompNumber
-     */
-    int getCompNumber() const;
-
-    Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
-
-    /**
-     * @brief Setter property for SaveRemovedComponent
-     */
-    void setSaveRemovedComponent(bool value);
-    /**
-     * @brief Getter property for SaveRemovedComponent
-     * @return Value of SaveRemovedComponent
-     */
-    bool getSaveRemovedComponent() const;
-
-    Q_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
-
-    /**
-     * @brief Setter property for NewArrayArrayName
-     */
-    void setNewArrayArrayName(const QString& value);
-    /**
-     * @brief Getter property for NewArrayArrayName
-     * @return Value of NewArrayArrayName
-     */
-    QString getNewArrayArrayName() const;
-
-    Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
-
-    /**
-     * @brief Setter property for ReducedArrayArrayName
-     */
-    void setReducedArrayArrayName(const QString& value);
-    /**
-     * @brief Getter property for ReducedArrayArrayName
-     * @return Value of ReducedArrayArrayName
-     */
-    QString getReducedArrayArrayName() const;
-
-    Q_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    RemoveComponentFromArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    IDataArrayWkPtrType m_InArrayPtr;
-    IDataArrayWkPtrType m_NewArrayPtr;
-    IDataArrayWkPtrType m_ReducedArrayPtr;
-
-    DataArrayPath m_SelectedArrayPath = {};
-    int m_CompNumber = {};
-    bool m_SaveRemovedComponent = {};
-    QString m_NewArrayArrayName = {};
-    QString m_ReducedArrayArrayName = {};
-
-  public:
-    RemoveComponentFromArray(const RemoveComponentFromArray&) = delete; // Copy Constructor Not Implemented
-    RemoveComponentFromArray(RemoveComponentFromArray&&) = delete;      // Move Constructor Not Implemented
-    RemoveComponentFromArray& operator=(const RemoveComponentFromArray&) = delete; // Copy Assignment Not Implemented
-    RemoveComponentFromArray& operator=(RemoveComponentFromArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RemoveComponentFromArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RemoveComponentFromArray)
+  PYB11_FILTER_NEW_MACRO(RemoveComponentFromArray)
+  PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+  PYB11_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
+  PYB11_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
+  PYB11_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
+  PYB11_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RemoveComponentFromArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RemoveComponentFromArray> New();
+
+  /**
+   * @brief Returns the name of the class for RemoveComponentFromArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RemoveComponentFromArray
+   */
+  static QString ClassName();
+
+  ~RemoveComponentFromArray() override;
+
+  /**
+   * @brief Setter property for SelectedArrayPath
+   */
+  void setSelectedArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArrayPath
+   * @return Value of SelectedArrayPath
+   */
+  DataArrayPath getSelectedArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+
+  /**
+   * @brief Setter property for CompNumber
+   */
+  void setCompNumber(int value);
+  /**
+   * @brief Getter property for CompNumber
+   * @return Value of CompNumber
+   */
+  int getCompNumber() const;
+
+  Q_PROPERTY(int CompNumber READ getCompNumber WRITE setCompNumber)
+
+  /**
+   * @brief Setter property for SaveRemovedComponent
+   */
+  void setSaveRemovedComponent(bool value);
+  /**
+   * @brief Getter property for SaveRemovedComponent
+   * @return Value of SaveRemovedComponent
+   */
+  bool getSaveRemovedComponent() const;
+
+  Q_PROPERTY(bool SaveRemovedComponent READ getSaveRemovedComponent WRITE setSaveRemovedComponent)
+
+  /**
+   * @brief Setter property for NewArrayArrayName
+   */
+  void setNewArrayArrayName(const QString& value);
+  /**
+   * @brief Getter property for NewArrayArrayName
+   * @return Value of NewArrayArrayName
+   */
+  QString getNewArrayArrayName() const;
+
+  Q_PROPERTY(QString NewArrayArrayName READ getNewArrayArrayName WRITE setNewArrayArrayName)
+
+  /**
+   * @brief Setter property for ReducedArrayArrayName
+   */
+  void setReducedArrayArrayName(const QString& value);
+  /**
+   * @brief Getter property for ReducedArrayArrayName
+   * @return Value of ReducedArrayArrayName
+   */
+  QString getReducedArrayArrayName() const;
+
+  Q_PROPERTY(QString ReducedArrayArrayName READ getReducedArrayArrayName WRITE setReducedArrayArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  RemoveComponentFromArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  IDataArrayWkPtrType m_InArrayPtr;
+  IDataArrayWkPtrType m_NewArrayPtr;
+  IDataArrayWkPtrType m_ReducedArrayPtr;
+
+  DataArrayPath m_SelectedArrayPath = {};
+  int m_CompNumber = {};
+  bool m_SaveRemovedComponent = {};
+  QString m_NewArrayArrayName = {};
+  QString m_ReducedArrayArrayName = {};
+
+public:
+  RemoveComponentFromArray(const RemoveComponentFromArray&) = delete;            // Copy Constructor Not Implemented
+  RemoveComponentFromArray(RemoveComponentFromArray&&) = delete;                 // Move Constructor Not Implemented
+  RemoveComponentFromArray& operator=(const RemoveComponentFromArray&) = delete; // Copy Assignment Not Implemented
+  RemoveComponentFromArray& operator=(RemoveComponentFromArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 88e268ab7a..0baf32ec02 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "RenameAttributeArray.h"
 
 #include <QtCore/QTextStream>
@@ -127,26 +127,22 @@ void RenameAttributeArray::dataCheck()
   RenameErrorCodes code = attrMat->renameAttributeArray(daName, m_NewArrayName, false);
   switch(code)
   {
-  case OLD_DOES_NOT_EXIST:
-  {
+  case OLD_DOES_NOT_EXIST: {
     QString ss = QObject::tr("A DataArray with the name '%1' was not found in the AttributeMatrix").arg(daName);
     setErrorCondition(-11016, ss);
     return;
   }
-  case NEW_EXISTS:
-  {
+  case NEW_EXISTS: {
     QString ss = QObject::tr("A DataArray with the name '%1' already exists in the AttributeMatrix").arg(m_NewArrayName);
     setErrorCondition(-11017, ss);
     return;
   }
-  case RenameErrorCodes::SAME_PATH:
-  {
+  case RenameErrorCodes::SAME_PATH: {
     QString ss = QObject::tr("The new and original DataArray names cannot be identical");
     setErrorCondition(-11018, ss);
     return;
   }
-  case SUCCESS:
-  {
+  case SUCCESS: {
     clearErrorCode();
     clearWarningCode();
     DataArrayPath newPath = getSelectedArrayPath();
@@ -157,7 +153,6 @@ void RenameAttributeArray::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -170,7 +165,6 @@ void RenameAttributeArray::execute()
   {
     return;
   }
-
 }
 // -----------------------------------------------------------------------------
 //
@@ -254,7 +248,7 @@ DataArrayPath::RenameContainer RenameAttributeArray::getRenamedPaths()
   newPath.setDataArrayName(getNewArrayName());
 
   DataArrayPath::RenameContainer container;
-  DataArrayPath::RenameType rename = { oldPath, newPath };
+  DataArrayPath::RenameType rename = {oldPath, newPath};
   container.push_back(rename);
 
   return container;
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
old mode 100755
new mode 100644
index 0ab2990490..8c7989d788
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,152 +45,150 @@
  */
 class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RenameAttributeArray)
-    PYB11_FILTER_NEW_MACRO(RenameAttributeArray)
-    PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-    PYB11_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RenameAttributeArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RenameAttributeArray> New();
-
-    /**
-     * @brief Returns the name of the class for RenameAttributeArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RenameAttributeArray
-     */
-    static QString ClassName();
-
-    ~RenameAttributeArray() override;
-
-    /**
-     * @brief Setter property for SelectedArrayPath
-     */
-    void setSelectedArrayPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedArrayPath
-     * @return Value of SelectedArrayPath
-     */
-    DataArrayPath getSelectedArrayPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
-
-    /**
-     * @brief Setter property for NewArrayName
-     */
-    void setNewArrayName(const QString& value);
-    /**
-     * @brief Getter property for NewArrayName
-     * @return Value of NewArrayName
-     */
-    QString getNewArrayName() const;
-
-    Q_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-     * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
-     * @return
-     */
-    DataArrayPath::RenameContainer getRenamedPaths() override;
-
-  protected:
-    RenameAttributeArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  private:
-    DataArrayPath m_SelectedArrayPath = {};
-    QString m_NewArrayName = {};
-
-    QString m_LastArrayName = "";
-
-  public:
-    RenameAttributeArray(const RenameAttributeArray&) = delete; // Copy Constructor Not Implemented
-    RenameAttributeArray(RenameAttributeArray&&) = delete;      // Move Constructor Not Implemented
-    RenameAttributeArray& operator=(const RenameAttributeArray&) = delete; // Copy Assignment Not Implemented
-    RenameAttributeArray& operator=(RenameAttributeArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RenameAttributeArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RenameAttributeArray)
+  PYB11_FILTER_NEW_MACRO(RenameAttributeArray)
+  PYB11_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+  PYB11_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RenameAttributeArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RenameAttributeArray> New();
+
+  /**
+   * @brief Returns the name of the class for RenameAttributeArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RenameAttributeArray
+   */
+  static QString ClassName();
+
+  ~RenameAttributeArray() override;
+
+  /**
+   * @brief Setter property for SelectedArrayPath
+   */
+  void setSelectedArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArrayPath
+   * @return Value of SelectedArrayPath
+   */
+  DataArrayPath getSelectedArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedArrayPath READ getSelectedArrayPath WRITE setSelectedArrayPath)
+
+  /**
+   * @brief Setter property for NewArrayName
+   */
+  void setNewArrayName(const QString& value);
+  /**
+   * @brief Getter property for NewArrayName
+   * @return Value of NewArrayName
+   */
+  QString getNewArrayName() const;
+
+  Q_PROPERTY(QString NewArrayName READ getNewArrayName WRITE setNewArrayName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
+   * @return
+   */
+  DataArrayPath::RenameContainer getRenamedPaths() override;
+
+protected:
+  RenameAttributeArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  DataArrayPath m_SelectedArrayPath = {};
+  QString m_NewArrayName = {};
+
+  QString m_LastArrayName = "";
+
+public:
+  RenameAttributeArray(const RenameAttributeArray&) = delete;            // Copy Constructor Not Implemented
+  RenameAttributeArray(RenameAttributeArray&&) = delete;                 // Move Constructor Not Implemented
+  RenameAttributeArray& operator=(const RenameAttributeArray&) = delete; // Copy Assignment Not Implemented
+  RenameAttributeArray& operator=(RenameAttributeArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index 6673a11210..91b573a6ae 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "RenameAttributeMatrix.h"
 
 #include <QtCore/QTextStream>
@@ -142,7 +142,6 @@ void RenameAttributeMatrix::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -155,7 +154,6 @@ void RenameAttributeMatrix::execute()
   {
     return;
   }
-
 }
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
old mode 100755
new mode 100644
index e7e1f7e5e2..f5415289ee
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,152 +45,150 @@
  */
 class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RenameAttributeMatrix)
-    PYB11_FILTER_NEW_MACRO(RenameAttributeMatrix)
-    PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
-    PYB11_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RenameAttributeMatrix;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RenameAttributeMatrix> New();
-
-    /**
-     * @brief Returns the name of the class for RenameAttributeMatrix
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RenameAttributeMatrix
-     */
-    static QString ClassName();
-
-    ~RenameAttributeMatrix() override;
-
-    /**
-     * @brief Setter property for SelectedAttributeMatrixPath
-     */
-    void setSelectedAttributeMatrixPath(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedAttributeMatrixPath
-     * @return Value of SelectedAttributeMatrixPath
-     */
-    DataArrayPath getSelectedAttributeMatrixPath() const;
-
-    Q_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
-
-    /**
-     * @brief Setter property for NewAttributeMatrix
-     */
-    void setNewAttributeMatrix(const QString& value);
-    /**
-     * @brief Getter property for NewAttributeMatrix
-     * @return Value of NewAttributeMatrix
-     */
-    QString getNewAttributeMatrix() const;
-
-    Q_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-    * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
-    * @return
-    */
-    DataArrayPath::RenameContainer getRenamedPaths() override;
-
-  protected:
-    RenameAttributeMatrix();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  private:
-    DataArrayPath m_SelectedAttributeMatrixPath = {};
-    QString m_NewAttributeMatrix = {};
-
-    QString m_LastMatrixName = "";
-
-  public:
-    RenameAttributeMatrix(const RenameAttributeMatrix&) = delete; // Copy Constructor Not Implemented
-    RenameAttributeMatrix(RenameAttributeMatrix&&) = delete;      // Move Constructor Not Implemented
-    RenameAttributeMatrix& operator=(const RenameAttributeMatrix&) = delete; // Copy Assignment Not Implemented
-    RenameAttributeMatrix& operator=(RenameAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RenameAttributeMatrix SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RenameAttributeMatrix)
+  PYB11_FILTER_NEW_MACRO(RenameAttributeMatrix)
+  PYB11_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
+  PYB11_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RenameAttributeMatrix;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RenameAttributeMatrix> New();
+
+  /**
+   * @brief Returns the name of the class for RenameAttributeMatrix
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RenameAttributeMatrix
+   */
+  static QString ClassName();
+
+  ~RenameAttributeMatrix() override;
+
+  /**
+   * @brief Setter property for SelectedAttributeMatrixPath
+   */
+  void setSelectedAttributeMatrixPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedAttributeMatrixPath
+   * @return Value of SelectedAttributeMatrixPath
+   */
+  DataArrayPath getSelectedAttributeMatrixPath() const;
+
+  Q_PROPERTY(DataArrayPath SelectedAttributeMatrixPath READ getSelectedAttributeMatrixPath WRITE setSelectedAttributeMatrixPath)
+
+  /**
+   * @brief Setter property for NewAttributeMatrix
+   */
+  void setNewAttributeMatrix(const QString& value);
+  /**
+   * @brief Getter property for NewAttributeMatrix
+   * @return Value of NewAttributeMatrix
+   */
+  QString getNewAttributeMatrix() const;
+
+  Q_PROPERTY(QString NewAttributeMatrix READ getNewAttributeMatrix WRITE setNewAttributeMatrix)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
+   * @return
+   */
+  DataArrayPath::RenameContainer getRenamedPaths() override;
+
+protected:
+  RenameAttributeMatrix();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  DataArrayPath m_SelectedAttributeMatrixPath = {};
+  QString m_NewAttributeMatrix = {};
+
+  QString m_LastMatrixName = "";
+
+public:
+  RenameAttributeMatrix(const RenameAttributeMatrix&) = delete;            // Copy Constructor Not Implemented
+  RenameAttributeMatrix(RenameAttributeMatrix&&) = delete;                 // Move Constructor Not Implemented
+  RenameAttributeMatrix& operator=(const RenameAttributeMatrix&) = delete; // Copy Assignment Not Implemented
+  RenameAttributeMatrix& operator=(RenameAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 98ce837a05..b1c795f72e 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "RenameDataContainer.h"
 
 #include <QtCore/QTextStream>
@@ -125,7 +125,6 @@ void RenameDataContainer::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -138,7 +137,6 @@ void RenameDataContainer::execute()
   {
     return;
   }
-
 }
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
old mode 100755
new mode 100644
index 0e60942b11..14780c8d01
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,147 +45,145 @@
  */
 class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RenameDataContainer)
-    PYB11_FILTER_NEW_MACRO(RenameDataContainer)
-    PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
-    PYB11_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RenameDataContainer;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<RenameDataContainer> New();
-
-    /**
-     * @brief Returns the name of the class for RenameDataContainer
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RenameDataContainer
-     */
-    static QString ClassName();
-
-    ~RenameDataContainer() override;
-
-    /**
-     * @brief Setter property for SelectedDataContainerName
-     */
-    void setSelectedDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedDataContainerName
-     * @return Value of SelectedDataContainerName
-     */
-    DataArrayPath getSelectedDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
-
-    /**
-     * @brief Setter property for NewDataContainerName
-     */
-    void setNewDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for NewDataContainerName
-     * @return Value of NewDataContainerName
-     */
-    DataArrayPath getNewDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    /**
-    * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
-    * @return
-    */
-    DataArrayPath::RenameContainer getRenamedPaths() override;
-
-  protected:
-    RenameDataContainer();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  private:
-    DataArrayPath m_SelectedDataContainerName = {};
-    DataArrayPath m_NewDataContainerName = {};
-
-    DataArrayPath m_LastContainerName;
-
-  public:
-    RenameDataContainer(const RenameDataContainer&) = delete; // Copy Constructor Not Implemented
-    RenameDataContainer(RenameDataContainer&&) = delete;      // Move Constructor Not Implemented
-    RenameDataContainer& operator=(const RenameDataContainer&) = delete; // Copy Assignment Not Implemented
-    RenameDataContainer& operator=(RenameDataContainer&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RenameDataContainer SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RenameDataContainer)
+  PYB11_FILTER_NEW_MACRO(RenameDataContainer)
+  PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+  PYB11_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RenameDataContainer;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<RenameDataContainer> New();
+
+  /**
+   * @brief Returns the name of the class for RenameDataContainer
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RenameDataContainer
+   */
+  static QString ClassName();
+
+  ~RenameDataContainer() override;
+
+  /**
+   * @brief Setter property for SelectedDataContainerName
+   */
+  void setSelectedDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedDataContainerName
+   * @return Value of SelectedDataContainerName
+   */
+  DataArrayPath getSelectedDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+
+  /**
+   * @brief Setter property for NewDataContainerName
+   */
+  void setNewDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for NewDataContainerName
+   * @return Value of NewDataContainerName
+   */
+  DataArrayPath getNewDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath NewDataContainerName READ getNewDataContainerName WRITE setNewDataContainerName)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  /**
+   * @brief Returns a list of DataArrayPaths that have been renamed along with their corresponding renamed value
+   * @return
+   */
+  DataArrayPath::RenameContainer getRenamedPaths() override;
+
+protected:
+  RenameDataContainer();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  DataArrayPath m_SelectedDataContainerName = {};
+  DataArrayPath m_NewDataContainerName = {};
+
+  DataArrayPath m_LastContainerName;
+
+public:
+  RenameDataContainer(const RenameDataContainer&) = delete;            // Copy Constructor Not Implemented
+  RenameDataContainer(RenameDataContainer&&) = delete;                 // Move Constructor Not Implemented
+  RenameDataContainer& operator=(const RenameDataContainer&) = delete; // Copy Assignment Not Implemented
+  RenameDataContainer& operator=(RenameDataContainer&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 2d71b57475..5f29c3701a 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ReplaceValueInArray.h"
 
 #include <QtCore/QTextStream>
@@ -91,7 +91,8 @@ void ReplaceValueInArray::readFilterParameters(AbstractFilterParametersReader* r
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void checkValuesInt(AbstractFilter* filter, double removeValue, double replaceValue, QString strType)
+template <typename T>
+void checkValuesInt(AbstractFilter* filter, double removeValue, double replaceValue, QString strType)
 {
   QString ss;
 
@@ -110,7 +111,8 @@ template <typename T> void checkValuesInt(AbstractFilter* filter, double removeV
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double removeValue, double replaceValue, QString strType)
+template <typename T>
+void checkValuesFloatDouble(AbstractFilter* filter, double removeValue, double replaceValue, QString strType)
 {
   QString ss;
 
@@ -132,7 +134,8 @@ template <typename T> void checkValuesFloatDouble(AbstractFilter* filter, double
 //
 // -----------------------------------------------------------------------------
 
-template <typename T> void replaceValue(AbstractFilter* filter, IDataArray::Pointer inDataPtr, double removeValue, double replaceValue)
+template <typename T>
+void replaceValue(AbstractFilter* filter, IDataArray::Pointer inDataPtr, double removeValue, double replaceValue)
 {
   typename DataArray<T>::Pointer inputArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(inDataPtr);
 
@@ -240,7 +243,6 @@ void ReplaceValueInArray::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
old mode 100755
new mode 100644
index 6b66026e96..0086a61ac0
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,161 +50,158 @@ class IDataArray;
  */
 class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ReplaceValueInArray)
-    PYB11_FILTER_NEW_MACRO(ReplaceValueInArray)
-    PYB11_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
-    PYB11_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
-    PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ReplaceValueInArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ReplaceValueInArray> New();
-
-    /**
-     * @brief Returns the name of the class for ReplaceValueInArray
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ReplaceValueInArray
-     */
-    static QString ClassName();
-
-    ~ReplaceValueInArray() override;
-
-    /**
-     * @brief Setter property for SelectedArray
-     */
-    void setSelectedArray(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SelectedArray
-     * @return Value of SelectedArray
-     */
-    DataArrayPath getSelectedArray() const;
-
-    Q_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
-
-    /**
-     * @brief Setter property for RemoveValue
-     */
-    void setRemoveValue(double value);
-    /**
-     * @brief Getter property for RemoveValue
-     * @return Value of RemoveValue
-     */
-    double getRemoveValue() const;
-
-    Q_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
-
-    /**
-     * @brief Setter property for ReplaceValue
-     */
-    void setReplaceValue(double value);
-    /**
-     * @brief Getter property for ReplaceValue
-     * @return Value of ReplaceValue
-     */
-    double getReplaceValue() const;
-
-    Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ReplaceValueInArray();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    IDataArrayWkPtrType m_ArrayPtr;
-
-    DataArrayPath m_SelectedArray = {};
-    double m_RemoveValue = {};
-    double m_ReplaceValue = {};
-
-  public:
-    ReplaceValueInArray(const ReplaceValueInArray&) = delete; // Copy Constructor Not Implemented
-    ReplaceValueInArray(ReplaceValueInArray&&) = delete;      // Move Constructor Not Implemented
-    ReplaceValueInArray& operator=(const ReplaceValueInArray&) = delete; // Copy Assignment Not Implemented
-    ReplaceValueInArray& operator=(ReplaceValueInArray&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ReplaceValueInArray SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ReplaceValueInArray)
+  PYB11_FILTER_NEW_MACRO(ReplaceValueInArray)
+  PYB11_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
+  PYB11_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
+  PYB11_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ReplaceValueInArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ReplaceValueInArray> New();
+
+  /**
+   * @brief Returns the name of the class for ReplaceValueInArray
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ReplaceValueInArray
+   */
+  static QString ClassName();
+
+  ~ReplaceValueInArray() override;
+
+  /**
+   * @brief Setter property for SelectedArray
+   */
+  void setSelectedArray(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedArray
+   * @return Value of SelectedArray
+   */
+  DataArrayPath getSelectedArray() const;
+
+  Q_PROPERTY(DataArrayPath SelectedArray READ getSelectedArray WRITE setSelectedArray)
+
+  /**
+   * @brief Setter property for RemoveValue
+   */
+  void setRemoveValue(double value);
+  /**
+   * @brief Getter property for RemoveValue
+   * @return Value of RemoveValue
+   */
+  double getRemoveValue() const;
+
+  Q_PROPERTY(double RemoveValue READ getRemoveValue WRITE setRemoveValue)
+
+  /**
+   * @brief Setter property for ReplaceValue
+   */
+  void setReplaceValue(double value);
+  /**
+   * @brief Getter property for ReplaceValue
+   * @return Value of ReplaceValue
+   */
+  double getReplaceValue() const;
+
+  Q_PROPERTY(double ReplaceValue READ getReplaceValue WRITE setReplaceValue)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ReplaceValueInArray();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  IDataArrayWkPtrType m_ArrayPtr;
+
+  DataArrayPath m_SelectedArray = {};
+  double m_RemoveValue = {};
+  double m_ReplaceValue = {};
+
+public:
+  ReplaceValueInArray(const ReplaceValueInArray&) = delete;            // Copy Constructor Not Implemented
+  ReplaceValueInArray(ReplaceValueInArray&&) = delete;                 // Move Constructor Not Implemented
+  ReplaceValueInArray& operator=(const ReplaceValueInArray&) = delete; // Copy Assignment Not Implemented
+  ReplaceValueInArray& operator=(ReplaceValueInArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index a6283463d2..8057dfe080 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RequiredZThickness.h"
 
@@ -148,7 +148,6 @@ void RequiredZThickness::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -184,7 +183,6 @@ void RequiredZThickness::execute()
     bool needMoreData = true;
     emit decisionMade(needMoreData);
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
old mode 100755
new mode 100644
index 5d0de64380..331c9435ae
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,150 +47,147 @@
  */
 class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(RequiredZThickness)
-    PYB11_STATIC_NEW_MACRO(RequiredZThickness)
-    PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
-    PYB11_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
-    PYB11_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = RequiredZThickness;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for RequiredZThickness
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RequiredZThickness
-     */
-    static QString ClassName();
-
-    ~RequiredZThickness() override;
-
-    /**
-     * @brief Setter property for DataContainerSelection
-     */
-    void setDataContainerSelection(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerSelection
-     * @return Value of DataContainerSelection
-     */
-    DataArrayPath getDataContainerSelection() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
-
-    /**
-     * @brief Setter property for NumZVoxels
-     */
-    void setNumZVoxels(int value);
-    /**
-     * @brief Getter property for NumZVoxels
-     * @return Value of NumZVoxels
-     */
-    int getNumZVoxels() const;
-
-    Q_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
-
-    /**
-     * @brief Setter property for PreflightCheck
-     */
-    void setPreflightCheck(bool value);
-    /**
-     * @brief Getter property for PreflightCheck
-     * @return Value of PreflightCheck
-     */
-    bool getPreflightCheck() const;
-
-    Q_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-    //  signals:
-    //    void decisionMade(bool& dm);
-
-  protected:
-    RequiredZThickness();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
-
-    DataArrayPath m_DataContainerSelection = {};
-    int m_NumZVoxels = {};
-    bool m_PreflightCheck = {};
-
-  public:
-    RequiredZThickness(const RequiredZThickness&) = delete; // Copy Constructor Not Implemented
-    RequiredZThickness(RequiredZThickness&&) = delete;      // Move Constructor Not Implemented
-    RequiredZThickness& operator=(const RequiredZThickness&) = delete; // Copy Assignment Not Implemented
-    RequiredZThickness& operator=(RequiredZThickness&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(RequiredZThickness SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(RequiredZThickness)
+  PYB11_STATIC_NEW_MACRO(RequiredZThickness)
+  PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+  PYB11_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
+  PYB11_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = RequiredZThickness;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for RequiredZThickness
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RequiredZThickness
+   */
+  static QString ClassName();
+
+  ~RequiredZThickness() override;
+
+  /**
+   * @brief Setter property for DataContainerSelection
+   */
+  void setDataContainerSelection(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerSelection
+   * @return Value of DataContainerSelection
+   */
+  DataArrayPath getDataContainerSelection() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+
+  /**
+   * @brief Setter property for NumZVoxels
+   */
+  void setNumZVoxels(int value);
+  /**
+   * @brief Getter property for NumZVoxels
+   * @return Value of NumZVoxels
+   */
+  int getNumZVoxels() const;
+
+  Q_PROPERTY(int NumZVoxels READ getNumZVoxels WRITE setNumZVoxels)
+
+  /**
+   * @brief Setter property for PreflightCheck
+   */
+  void setPreflightCheck(bool value);
+  /**
+   * @brief Getter property for PreflightCheck
+   * @return Value of PreflightCheck
+   */
+  bool getPreflightCheck() const;
+
+  Q_PROPERTY(bool PreflightCheck READ getPreflightCheck WRITE setPreflightCheck)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+  //  signals:
+  //    void decisionMade(bool& dm);
+
+protected:
+  RequiredZThickness();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+
+  DataArrayPath m_DataContainerSelection = {};
+  int m_NumZVoxels = {};
+  bool m_PreflightCheck = {};
+
+public:
+  RequiredZThickness(const RequiredZThickness&) = delete;            // Copy Constructor Not Implemented
+  RequiredZThickness(RequiredZThickness&&) = delete;                 // Move Constructor Not Implemented
+  RequiredZThickness& operator=(const RequiredZThickness&) = delete; // Copy Assignment Not Implemented
+  RequiredZThickness& operator=(RequiredZThickness&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index c421ccdabe..ffb3ec467f 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -156,7 +156,7 @@ RotateArgs createRotateParams(const ImageGeom& imageGeom, const Matrix3fR& rotat
 {
   const SizeVec3Type origDims = imageGeom.getDimensions();
   const FloatVec3Type spacing = imageGeom.getSpacing();
-  //const FloatVec3Type origin = imageGeom.getOrigin();
+  // const FloatVec3Type origin = imageGeom.getOrigin();
 
   float xMin = std::numeric_limits<float>::max();
   float xMax = std::numeric_limits<float>::min();
@@ -450,8 +450,7 @@ void RotateSampleRefFrame::dataCheck()
 
   switch(representation)
   {
-  case RotationRepresentation::AxisAngle:
-  {
+  case RotationRepresentation::AxisAngle: {
     const Eigen::Vector3f rotationAxis(m_RotationAxis.data());
     float norm = rotationAxis.norm();
     if(!SIMPLibMath::closeEnough(rotationAxis.norm(), 1.0f, k_Threshold))
@@ -467,8 +466,7 @@ void RotateSampleRefFrame::dataCheck()
     p_Impl->m_RotationMatrix = axisAngle.toRotationMatrix();
   }
   break;
-  case RotationRepresentation::RotationMatrix:
-  {
+  case RotationRepresentation::RotationMatrix: {
     auto rotationMatrixTable = m_RotationTable.getTableData();
 
     if(rotationMatrixTable.size() != 3)
@@ -512,8 +510,7 @@ void RotateSampleRefFrame::dataCheck()
     p_Impl->m_RotationMatrix = rotationMatrix;
   }
   break;
-  default:
-  {
+  default: {
     QString ss = QObject::tr("Invalid rotation representation");
     setErrorCondition(-45008, ss);
     return;
@@ -534,7 +531,6 @@ void RotateSampleRefFrame::dataCheck()
   m->getAttributeMatrix(attrMatName)->resizeAttributeArrays(tDims);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index c22307267f..bac957b453 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -265,7 +265,6 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   RotateSampleRefFrame();
 
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index dc7e02ec23..b4ae6b37f8 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ScaleVolume.h"
 
 #include <QtCore/QTextStream>
@@ -173,7 +173,6 @@ void ScaleVolume::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -254,7 +253,6 @@ void ScaleVolume::execute()
   {
     updateSurfaceMesh();
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
old mode 100755
new mode 100644
index ed7bd7c189..d44a01fed8
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,192 +46,189 @@
  */
 class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(ScaleVolume)
-    PYB11_FILTER_NEW_MACRO(ScaleVolume)
-    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-    PYB11_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
-    PYB11_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
-    PYB11_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
-    PYB11_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = ScaleVolume;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<ScaleVolume> New();
-
-    /**
-     * @brief Returns the name of the class for ScaleVolume
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ScaleVolume
-     */
-    static QString ClassName();
-
-    ~ScaleVolume() override;
-
-    /**
-     * @brief Setter property for DataContainerName
-     */
-    void setDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerName
-     * @return Value of DataContainerName
-     */
-    DataArrayPath getDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-
-    /**
-     * @brief Setter property for SurfaceDataContainerName
-     */
-    void setSurfaceDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for SurfaceDataContainerName
-     * @return Value of SurfaceDataContainerName
-     */
-    DataArrayPath getSurfaceDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
-
-    /**
-     * @brief Setter property for ApplyToVoxelVolume
-     */
-    void setApplyToVoxelVolume(bool value);
-    /**
-     * @brief Getter property for ApplyToVoxelVolume
-     * @return Value of ApplyToVoxelVolume
-     */
-    bool getApplyToVoxelVolume() const;
-
-    Q_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
-
-    /**
-     * @brief Setter property for ApplyToSurfaceMesh
-     */
-    void setApplyToSurfaceMesh(bool value);
-    /**
-     * @brief Getter property for ApplyToSurfaceMesh
-     * @return Value of ApplyToSurfaceMesh
-     */
-    bool getApplyToSurfaceMesh() const;
-
-    Q_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
-
-    /**
-     * @brief Setter property for ScaleFactor
-     */
-    void setScaleFactor(const FloatVec3Type& value);
-    /**
-     * @brief Getter property for ScaleFactor
-     * @return Value of ScaleFactor
-     */
-    FloatVec3Type getScaleFactor() const;
-
-    Q_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    ScaleVolume();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief updateSurfaceMesh updates the mesh coordinates
-     */
-    void updateSurfaceMesh();
-
-  public:
-    ScaleVolume(const ScaleVolume&) = delete;    // Copy Constructor Not Implemented
-    ScaleVolume(ScaleVolume&&) = delete;         // Move Constructor Not Implemented
-    ScaleVolume& operator=(const ScaleVolume&) = delete; // Copy Assignment Not Implemented
-    ScaleVolume& operator=(ScaleVolume&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_DataContainerName = {};
-    DataArrayPath m_SurfaceDataContainerName = {};
-    bool m_ApplyToVoxelVolume = {};
-    bool m_ApplyToSurfaceMesh = {};
-    FloatVec3Type m_ScaleFactor = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(ScaleVolume SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(ScaleVolume)
+  PYB11_FILTER_NEW_MACRO(ScaleVolume)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
+  PYB11_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
+  PYB11_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
+  PYB11_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = ScaleVolume;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<ScaleVolume> New();
+
+  /**
+   * @brief Returns the name of the class for ScaleVolume
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ScaleVolume
+   */
+  static QString ClassName();
+
+  ~ScaleVolume() override;
+
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+  /**
+   * @brief Setter property for SurfaceDataContainerName
+   */
+  void setSurfaceDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SurfaceDataContainerName
+   * @return Value of SurfaceDataContainerName
+   */
+  DataArrayPath getSurfaceDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath SurfaceDataContainerName READ getSurfaceDataContainerName WRITE setSurfaceDataContainerName)
+
+  /**
+   * @brief Setter property for ApplyToVoxelVolume
+   */
+  void setApplyToVoxelVolume(bool value);
+  /**
+   * @brief Getter property for ApplyToVoxelVolume
+   * @return Value of ApplyToVoxelVolume
+   */
+  bool getApplyToVoxelVolume() const;
+
+  Q_PROPERTY(bool ApplyToVoxelVolume READ getApplyToVoxelVolume WRITE setApplyToVoxelVolume)
+
+  /**
+   * @brief Setter property for ApplyToSurfaceMesh
+   */
+  void setApplyToSurfaceMesh(bool value);
+  /**
+   * @brief Getter property for ApplyToSurfaceMesh
+   * @return Value of ApplyToSurfaceMesh
+   */
+  bool getApplyToSurfaceMesh() const;
+
+  Q_PROPERTY(bool ApplyToSurfaceMesh READ getApplyToSurfaceMesh WRITE setApplyToSurfaceMesh)
+
+  /**
+   * @brief Setter property for ScaleFactor
+   */
+  void setScaleFactor(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for ScaleFactor
+   * @return Value of ScaleFactor
+   */
+  FloatVec3Type getScaleFactor() const;
+
+  Q_PROPERTY(FloatVec3Type ScaleFactor READ getScaleFactor WRITE setScaleFactor)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  ScaleVolume();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief updateSurfaceMesh updates the mesh coordinates
+   */
+  void updateSurfaceMesh();
+
+public:
+  ScaleVolume(const ScaleVolume&) = delete;            // Copy Constructor Not Implemented
+  ScaleVolume(ScaleVolume&&) = delete;                 // Move Constructor Not Implemented
+  ScaleVolume& operator=(const ScaleVolume&) = delete; // Copy Assignment Not Implemented
+  ScaleVolume& operator=(ScaleVolume&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_SurfaceDataContainerName = {};
+  bool m_ApplyToVoxelVolume = {};
+  bool m_ApplyToSurfaceMesh = {};
+  FloatVec3Type m_ScaleFactor = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 98b1b41e6a..728e758da0 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SetOriginResolutionImageGeom.h"
 
 #include <QtCore/QTextStream>
@@ -172,7 +172,6 @@ void SetOriginResolutionImageGeom::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -185,7 +184,6 @@ void SetOriginResolutionImageGeom::execute()
   {
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
old mode 100755
new mode 100644
index 9ebe5a8484..bca2aed24f
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,192 +46,189 @@
  */
 class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(SetOriginResolutionImageGeom)
-    PYB11_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
-    PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-    PYB11_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
-    PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
-    PYB11_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
-    PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = SetOriginResolutionImageGeom;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<SetOriginResolutionImageGeom> New();
-
-    /**
-     * @brief Returns the name of the class for SetOriginResolutionImageGeom
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for SetOriginResolutionImageGeom
-     */
-    static QString ClassName();
-
-    ~SetOriginResolutionImageGeom() override;
-
-    /**
-     * @brief Setter property for DataContainerName
-     */
-    void setDataContainerName(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerName
-     * @return Value of DataContainerName
-     */
-    DataArrayPath getDataContainerName() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
-
-    /**
-     * @brief Setter property for ChangeOrigin
-     */
-    void setChangeOrigin(bool value);
-    /**
-     * @brief Getter property for ChangeOrigin
-     * @return Value of ChangeOrigin
-     */
-    bool getChangeOrigin() const;
-
-    Q_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
-
-    /**
-     * @brief Setter property for Origin
-     */
-    void setOrigin(const FloatVec3Type& value);
-    /**
-     * @brief Getter property for Origin
-     * @return Value of Origin
-     */
-    FloatVec3Type getOrigin() const;
-
-    Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
-
-    /**
-     * @brief Setter property for ChangeResolution
-     */
-    void setChangeResolution(bool value);
-    /**
-     * @brief Getter property for ChangeResolution
-     * @return Value of ChangeResolution
-     */
-    bool getChangeResolution() const;
-
-    Q_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
-
-    /**
-     * @brief Setter property for Spacing
-     */
-    void setSpacing(const FloatVec3Type& value);
-    /**
-     * @brief Getter property for Spacing
-     * @return Value of Spacing
-     */
-    FloatVec3Type getSpacing() const;
-
-    Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-     */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    SetOriginResolutionImageGeom();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-    /**
-     * @brief updateSurfaceMesh Updates the mesh coordinates
-     */
-    void updateSurfaceMesh();
-
-  public:
-    SetOriginResolutionImageGeom(const SetOriginResolutionImageGeom&) = delete; // Copy Constructor Not Implemented
-    SetOriginResolutionImageGeom(SetOriginResolutionImageGeom&&) = delete;      // Move Constructor Not Implemented
-    SetOriginResolutionImageGeom& operator=(const SetOriginResolutionImageGeom&) = delete; // Copy Assignment Not Implemented
-    SetOriginResolutionImageGeom& operator=(SetOriginResolutionImageGeom&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_DataContainerName = {};
-    bool m_ChangeOrigin = {};
-    FloatVec3Type m_Origin = {};
-    bool m_ChangeResolution = {};
-    FloatVec3Type m_Spacing = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(SetOriginResolutionImageGeom SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(SetOriginResolutionImageGeom)
+  PYB11_FILTER_NEW_MACRO(SetOriginResolutionImageGeom)
+  PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+  PYB11_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
+  PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+  PYB11_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
+  PYB11_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = SetOriginResolutionImageGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<SetOriginResolutionImageGeom> New();
+
+  /**
+   * @brief Returns the name of the class for SetOriginResolutionImageGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for SetOriginResolutionImageGeom
+   */
+  static QString ClassName();
+
+  ~SetOriginResolutionImageGeom() override;
+
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  DataArrayPath getDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
+
+  /**
+   * @brief Setter property for ChangeOrigin
+   */
+  void setChangeOrigin(bool value);
+  /**
+   * @brief Getter property for ChangeOrigin
+   * @return Value of ChangeOrigin
+   */
+  bool getChangeOrigin() const;
+
+  Q_PROPERTY(bool ChangeOrigin READ getChangeOrigin WRITE setChangeOrigin)
+
+  /**
+   * @brief Setter property for Origin
+   */
+  void setOrigin(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Origin
+   * @return Value of Origin
+   */
+  FloatVec3Type getOrigin() const;
+
+  Q_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
+
+  /**
+   * @brief Setter property for ChangeResolution
+   */
+  void setChangeResolution(bool value);
+  /**
+   * @brief Getter property for ChangeResolution
+   * @return Value of ChangeResolution
+   */
+  bool getChangeResolution() const;
+
+  Q_PROPERTY(bool ChangeResolution READ getChangeResolution WRITE setChangeResolution)
+
+  /**
+   * @brief Setter property for Spacing
+   */
+  void setSpacing(const FloatVec3Type& value);
+  /**
+   * @brief Getter property for Spacing
+   * @return Value of Spacing
+   */
+  FloatVec3Type getSpacing() const;
+
+  Q_PROPERTY(FloatVec3Type Spacing READ getSpacing WRITE setSpacing)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  SetOriginResolutionImageGeom();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+  /**
+   * @brief updateSurfaceMesh Updates the mesh coordinates
+   */
+  void updateSurfaceMesh();
+
+public:
+  SetOriginResolutionImageGeom(const SetOriginResolutionImageGeom&) = delete;            // Copy Constructor Not Implemented
+  SetOriginResolutionImageGeom(SetOriginResolutionImageGeom&&) = delete;                 // Move Constructor Not Implemented
+  SetOriginResolutionImageGeom& operator=(const SetOriginResolutionImageGeom&) = delete; // Copy Assignment Not Implemented
+  SetOriginResolutionImageGeom& operator=(SetOriginResolutionImageGeom&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_DataContainerName = {};
+  bool m_ChangeOrigin = {};
+  FloatVec3Type m_Origin = {};
+  bool m_ChangeResolution = {};
+  FloatVec3Type m_Spacing = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index fdc6ec922a..838d3ecc66 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -45,7 +45,8 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 
-enum createdPathID : RenameDataPath::DataID_t {
+enum createdPathID : RenameDataPath::DataID_t
+{
   SplitArrayID = 1
 };
 
@@ -148,11 +149,11 @@ void SplitAttributeArray::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> void splitMulticomponentArray(IDataArray::Pointer inputArray, std::vector<IDataArray::Pointer>& splitArrays)
+template <typename T>
+void splitMulticomponentArray(IDataArray::Pointer inputArray, std::vector<IDataArray::Pointer>& splitArrays)
 {
   typename DataArray<T>::Pointer inputPtr = std::dynamic_pointer_cast<DataArray<T>>(inputArray);
   T* iPtr = inputPtr->getPointer(0);
@@ -191,7 +192,6 @@ void SplitAttributeArray::execute()
   }
 
   EXECUTE_FUNCTION_TEMPLATE(this, splitMulticomponentArray, m_InputArrayPtr.lock(), m_InputArrayPtr.lock(), m_SplitArraysPtrVector)
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 7a9bfe5ae4..8458275239 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -177,7 +177,6 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   SplitAttributeArray();
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
index 4c1d0ade42..ee028f584b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -18,22 +18,22 @@
 class ApplyImageTransformsTest
 {
 
-  public:
-    ApplyImageTransformsTest() = default;
-    ~ApplyImageTransformsTest() = default;
-    ApplyImageTransformsTest(const ApplyImageTransformsTest&) = delete;            // Copy Constructor
-    ApplyImageTransformsTest(ApplyImageTransformsTest&&) = delete;                 // Move Constructor
-    ApplyImageTransformsTest& operator=(const ApplyImageTransformsTest&) = delete; // Copy Assignment
-    ApplyImageTransformsTest& operator=(ApplyImageTransformsTest&&) = delete;      // Move Assignment
+public:
+  ApplyImageTransformsTest() = default;
+  ~ApplyImageTransformsTest() = default;
+  ApplyImageTransformsTest(const ApplyImageTransformsTest&) = delete;            // Copy Constructor
+  ApplyImageTransformsTest(ApplyImageTransformsTest&&) = delete;                 // Move Constructor
+  ApplyImageTransformsTest& operator=(const ApplyImageTransformsTest&) = delete; // Copy Assignment
+  ApplyImageTransformsTest& operator=(ApplyImageTransformsTest&&) = delete;      // Move Assignment
 
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-    void TestFilterAvailability()
-    {
-      ApplyImageTransforms::Pointer filter = ApplyImageTransforms::New();
-      filter->preflight();
-    }
+  void TestFilterAvailability()
+  {
+    ApplyImageTransforms::Pointer filter = ApplyImageTransforms::New();
+    filter->preflight();
+  }
 
   // -----------------------------------------------------------------------------
   //
@@ -53,13 +53,10 @@ class ApplyImageTransformsTest
   {
     int err = EXIT_SUCCESS;
 
-    DREAM3D_REGISTER_TEST( TestFilterAvailability() );
+    DREAM3D_REGISTER_TEST(TestFilterAvailability());
 
-    DREAM3D_REGISTER_TEST( TestApplyImageTransformsTest() )
+    DREAM3D_REGISTER_TEST(TestApplyImageTransformsTest())
   }
 
-  private:
-
-
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 3160511ad6..f136f95938 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -304,11 +304,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+      UInt32ArrayType::Pointer nArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
-      UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+      UInt32ArrayType::Pointer sArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + 2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -330,11 +328,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+      UInt32ArrayType::Pointer nArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
-      UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+      UInt32ArrayType::Pointer sArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -356,11 +352,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+      UInt32ArrayType::Pointer nArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
-      UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+      UInt32ArrayType::Pointer sArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -381,11 +375,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+      UInt32ArrayType::Pointer nArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
-      UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+      UInt32ArrayType::Pointer sArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\" + \"*\"[1]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -397,11 +389,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer nArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
+      UInt32ArrayType::Pointer nArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "4"));
 
-      UInt32ArrayType::Pointer sArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
+      UInt32ArrayType::Pointer sArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "*"));
 
       propWasSet = filter->setProperty("InfixEquation", "\"4\"[0] + \"*\"[3]");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -474,8 +464,7 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+      FloatArrayType::Pointer inputArray1 = filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
       propWasSet = filter->setProperty("InfixEquation", "-InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -491,8 +480,7 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      UInt32ArrayType::Pointer inputArray2 =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
+      UInt32ArrayType::Pointer inputArray2 = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
 
       propWasSet = filter->setProperty("InfixEquation", "InputArray2");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -510,11 +498,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+      FloatArrayType::Pointer inputArray1 = filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
-      UInt32ArrayType::Pointer spacedArray =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "Spaced Array"));
+      UInt32ArrayType::Pointer spacedArray = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "Spaced Array"));
 
       propWasSet = filter->setProperty("InfixEquation", "Spaced Array + InputArray1");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
@@ -531,11 +517,9 @@ class ArrayCalculatorTest
     {
       AbstractFilter::Pointer filter = createArrayCalculatorFilter(arrayPath);
 
-      FloatArrayType::Pointer inputArray1 =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
+      FloatArrayType::Pointer inputArray1 = filter->getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray1"));
 
-      UInt32ArrayType::Pointer inputArray2 =
-          filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
+      UInt32ArrayType::Pointer inputArray2 = filter->getDataContainerArray()->getPrereqArrayFromPath<UInt32ArrayType>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "InputArray2"));
 
       propWasSet = filter->setProperty("InfixEquation", "sqrt((InputArray1^2)+(InputArray2^2))");
       DREAM3D_REQUIRE_EQUAL(propWasSet, true);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index a89db8282d..0733ac8936 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 
@@ -91,7 +91,8 @@ class CombineAttributeArraysTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void initializeData(IDataArray::Pointer inputPtr)
+  template <typename T>
+  void initializeData(IDataArray::Pointer inputPtr)
   {
     auto inputDataPtr = std::dynamic_pointer_cast<DataArray<T>>(inputPtr);
     T* inputData = static_cast<T*>(inputDataPtr->getPointer(0));
@@ -172,7 +173,8 @@ class CombineAttributeArraysTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkCombineAttributeArraysFilter(AbstractFilter::Pointer filter, DataArrayPath vectorArrayPath, DataArrayPath scalarArrayPath)
+  template <typename T>
+  void checkCombineAttributeArraysFilter(AbstractFilter::Pointer filter, DataArrayPath vectorArrayPath, DataArrayPath scalarArrayPath)
   {
     int32_t err = 0;
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 88851f96d5..eff4c16815 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 111d5788cd..6e3ca894c4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 5de89e68a2..c0777983e2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -60,7 +60,6 @@
 
 #include <tbb/parallel_for.h>
 
-
 class ConvertColorToGrayScaleTest
 {
   const FloatVec3Type m_defaultWeights{0.2125f, 0.7154f, 0.0721f};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index 8eec3f55e9..4445e26c8d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -173,7 +173,8 @@ class ConvertDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> std::shared_ptr<DataArray<T>> getDataArray(AttributeMatrix::Pointer am, QString dataArray)
+  template <typename T>
+  std::shared_ptr<DataArray<T>> getDataArray(AttributeMatrix::Pointer am, QString dataArray)
   {
     typename DataArray<T>::Pointer da = std::dynamic_pointer_cast<DataArray<T>>(am->getAttributeArray(dataArray));
 
@@ -183,7 +184,8 @@ class ConvertDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T, typename U> void checkConvertedArray(std::shared_ptr<DataArray<T>> originalDataArray, std::shared_ptr<DataArray<U>> convertedDataArray)
+  template <typename T, typename U>
+  void checkConvertedArray(std::shared_ptr<DataArray<T>> originalDataArray, std::shared_ptr<DataArray<U>> convertedDataArray)
   {
     DREAM3D_ASSERT(nullptr != originalDataArray.get());
     DREAM3D_ASSERT(nullptr != convertedDataArray.get());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index 806a6290b5..1961b528fd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -95,7 +95,8 @@ class CopyFeatureArrayToElementArrayTest
     return da;
   }
 
-  template <typename T> void TestCopyFeatureArrayToElementArrayForType()
+  template <typename T>
+  void TestCopyFeatureArrayToElementArrayForType()
   {
     // Names and Constants
 
@@ -104,7 +105,6 @@ class CopyFeatureArrayToElementArrayTest
     static const QString k_Cell_AMName("Cell Attribute Matrix");
     static const QString k_Feature_AMName("Feature Attribute Matrix");
 
-
     static const QString k_CellFeatureIdsArrayName("FeatureIds");
     static const QString k_CellTempArrayName("Temperature");
 
@@ -135,12 +135,12 @@ class CopyFeatureArrayToElementArrayTest
     {
       for(size_t x = 0; x < 10; x++)
       {
-        size_t index = (10*y) + x;
+        size_t index = (10 * y) + x;
         cellFeatureIds->setValue(index, static_cast<int32_t>(y));
       }
     }
 
-    //Create an array in teh Feature Attribute Matrix with 3 values since we created 3 features in the cell attribute matrix
+    // Create an array in teh Feature Attribute Matrix with 3 values since we created 3 features in the cell attribute matrix
     typename DataArray<T>::Pointer avgTempValue = DataArray<T>::CreateArray(3, k_FeatureDataArrayName, true);
     featureAM->insertOrAssign(avgTempValue);
     for(int i = 0; i < 3; i++)
@@ -184,25 +184,23 @@ class CopyFeatureArrayToElementArrayTest
 
     for(size_t i = 0; i < createdElementArray->getNumberOfTuples(); i++)
     {
-//      daFeatures->printTuple(ss , i);
-//      createdElementArray->printTuple(ss, i);
-//      ss << "---\n";
-
-        int32_t featureId = cellFeatureIds->getValue(i);
-        T value = createdElementArray->getValue(i);
-        T featureValue = avgTempValue->getValue(featureId);
-        DREAM3D_REQUIRE_EQUAL(value, featureValue);
-
-//      for(size_t j = 0; j < daFeatures->getNumberOfComponents(); j++)
-//      {
-
-//        T oldValue = daFeatures->getComponent(i, j);
-//        T newValue = createdElementArray->getComponent(daIDList->getValue(i), j);
-//        DREAM3D_REQUIRE_EQUAL(newValue, oldValue)
-//      }
+      //      daFeatures->printTuple(ss , i);
+      //      createdElementArray->printTuple(ss, i);
+      //      ss << "---\n";
+
+      int32_t featureId = cellFeatureIds->getValue(i);
+      T value = createdElementArray->getValue(i);
+      T featureValue = avgTempValue->getValue(featureId);
+      DREAM3D_REQUIRE_EQUAL(value, featureValue);
+
+      //      for(size_t j = 0; j < daFeatures->getNumberOfComponents(); j++)
+      //      {
+
+      //        T oldValue = daFeatures->getComponent(i, j);
+      //        T newValue = createdElementArray->getComponent(daIDList->getValue(i), j);
+      //        DREAM3D_REQUIRE_EQUAL(newValue, oldValue)
+      //      }
     }
-
-
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 6c398e6fc6..6b190883a1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -119,7 +119,8 @@ class CopyObjectTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
+  template <typename T>
+  void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
   {
     if(originalData == IDataArray::NullPointer() || newData == IDataArray::NullPointer())
     {
@@ -532,8 +533,8 @@ class CopyObjectTest
     bool sameArrayNames = (newMatrixNames == oldMatrixNames);
     DREAM3D_REQUIRE_EQUAL(sameArrayNames, true)
 
-    //DataContainer::Container_t oldAttrMatrices = oldDC->getAttributeMatrices();
-    //DataContainer::Container_t newAttrMatrices = newDC->getAttributeMatrices();
+    // DataContainer::Container_t oldAttrMatrices = oldDC->getAttributeMatrices();
+    // DataContainer::Container_t newAttrMatrices = newDC->getAttributeMatrices();
 
     for(int i = 0; i < newMatrixNames.size(); i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 105523da9e..684f2c4d2f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <cassert>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index 7164c18740..2627898eba 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <assert.h>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -121,7 +121,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestValidDataContainer()
   {
-    TestFilter(DataArrayPath("DataContainer","",""), 0);
+    TestFilter(DataArrayPath("DataContainer", "", ""), 0);
   }
 
   // -----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ class CreateDataContainerTest
   // -----------------------------------------------------------------------------
   void TestInvalidName()
   {
-    TestFilter(DataArrayPath("Data/Container","",""), -888);
+    TestFilter(DataArrayPath("Data/Container", "", ""), -888);
   }
 
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 1bf7f16fd7..3edffb1251 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index a37f84860e..de992c4cd9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -384,7 +384,7 @@ class CreateGeometryTest
 
         DREAM3D_REQUIRE_EQUAL(names.contains(daVertices->getName()), false)
         // daElements is renamed by the geometries, causing names.contains(daElements->getName()) to return true.
-        //if(geomType != IGeometry::Type::Vertex)
+        // if(geomType != IGeometry::Type::Vertex)
         //{
         //  DREAM3D_REQUIRE_EQUAL(names.contains(daElements->getName()), false)
         //}
@@ -1220,7 +1220,8 @@ class CreateGeometryTest
 
     // Create Hexahedron Data Arrays
 
-    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
+    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f},
+                                                {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
 
     std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 1dcb9a438c..60ee7a1366 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLib/CoreFilters/CreateImageGeometry.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index 1b5248f7f1..d96209ae1c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -208,5 +208,4 @@ class CreateStringArrayTest
 
 private:
   QString m_FilterName = QString("CreateStringArray");
-
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index b0492cf7d7..ec1f7a612d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -99,7 +99,8 @@ class CropVertexGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
+  template <typename T>
+  void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
   {
     DREAM3D_REQUIRE_EQUAL(originalData->getSize(), newData->getSize())
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index 16432b092d..af90d5c197 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <cstdlib>
 #include <tuple>
@@ -118,7 +118,7 @@ QString H5File()
 {
   return TestDir() + QString::fromLatin1("/DataContainerProxyTest.h5");
 }
-}
+} // namespace DataContainerIOTest
 
 class DataContainerTest
 {
@@ -472,7 +472,8 @@ class DataContainerTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void insertDeleteArray(DataContainer::Pointer m)
+  template <typename T>
+  void insertDeleteArray(DataContainer::Pointer m)
   {
     // This should fail because there is no attribute matrix
     AttributeMatrix::Pointer attrMatrix = m->getAttributeMatrix(getCellAttributeMatrixName());
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index 21999c5eee..b86e5468c1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <string>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index 100deaed9f..f7a7de1cea 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QObject>
 
@@ -63,9 +63,9 @@ class ExecuteProcessMessageHandler : public AbstractMessageHandler
   {
   }
 
- /**
-  * @brief Appends incoming FilterStatusMessages to the standard output string
-  */
+  /**
+   * @brief Appends incoming FilterStatusMessages to the standard output string
+   */
   void processMessage(const FilterStatusMessage* msg) const override
   {
     QString str = msg->generateMessageString();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 527e3708b4..709deb0d77 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -104,7 +104,8 @@ class ExtractAttributeArraysFromGeometryTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
+  template <typename T>
+  void checkDataArray(std::shared_ptr<DataArray<T>> originalData, std::shared_ptr<DataArray<T>> newData)
   {
     DREAM3D_REQUIRE_EQUAL(originalData->getSize(), newData->getSize())
 
@@ -677,7 +678,8 @@ class ExtractAttributeArraysFromGeometryTest
 
     // Create Geometry
 
-    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
+    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f},
+                                                {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
 
     std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index eae7c4d98e..5514d5b16f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 306bb18459..d8e87479c4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -94,7 +94,8 @@ class FeatureDataCSVWriterTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> T convertQByteArray(const QByteArray& value)
+  template <typename T>
+  T convertQByteArray(const QByteArray& value)
   {
     if(typeid(T) == typeid(float))
     {
@@ -130,7 +131,8 @@ class FeatureDataCSVWriterTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataList(AttributeMatrix::Pointer am, const QString& daName, const QList<QByteArray>& tokens, int featureID, int column)
+  template <typename T>
+  void checkDataList(AttributeMatrix::Pointer am, const QString& daName, const QList<QByteArray>& tokens, int featureID, int column)
   {
     typename DataArray<T>::Pointer dataPtr = am->getAttributeArrayAs<DataArray<T>>(daName);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 112e4ee2e2..6ef574ceff 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 58994ec87b..3b5f1c7295 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QFile>
 #include <QtCore/QJsonArray>
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
index e95df2a74c..9b9b101bcf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportAsciDataArrayTest.cpp
@@ -52,7 +52,8 @@ class ImportAsciDataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> int RunTest(char sep, int delimiter, int scalarType)
+  template <typename T>
+  int RunTest(char sep, int delimiter, int scalarType)
   {
     writeFile(sep);
 
@@ -140,7 +141,7 @@ class ImportAsciDataArrayTest
         else // Bool type
         {
           bool value = (index != 0);
-		  //DREAM3D_REQUIRE_EQUAL(value, (ptr[index]))
+          // DREAM3D_REQUIRE_EQUAL(value, (ptr[index]))
           DREAM3D_REQUIRE_EQUAL(value, static_cast<bool>(ptr[index]))
           index++;
         }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index 492ec2a318..5e1d37f8dc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -52,7 +52,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //  Uses Raw Pointers to save data to the data file
   // -----------------------------------------------------------------------------
-  template <typename T> herr_t writePointer1DArrayDataset(hid_t loc_id)
+  template <typename T>
+  herr_t writePointer1DArrayDataset(hid_t loc_id)
   {
 
     T value = 0x0;
@@ -82,7 +83,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //  Uses Raw Pointers to save data to the data file
   // -----------------------------------------------------------------------------
-  template <typename T> herr_t writePointer2DArrayDataset(hid_t loc_id)
+  template <typename T>
+  herr_t writePointer2DArrayDataset(hid_t loc_id)
   {
 
     T value = 0x0;
@@ -113,7 +115,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //  Uses Raw Pointers to save data to the data file
   // -----------------------------------------------------------------------------
-  template <typename T> herr_t writePointer3DArrayDataset(hid_t loc_id)
+  template <typename T>
+  herr_t writePointer3DArrayDataset(hid_t loc_id)
   {
 
     T value = 0x0;
@@ -145,7 +148,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //  Uses Raw Pointers to save data to the data file
   // -----------------------------------------------------------------------------
-  template <typename T> herr_t writePointer4DArrayDataset(hid_t loc_id)
+  template <typename T>
+  herr_t writePointer4DArrayDataset(hid_t loc_id)
   {
 
     T value = 0x0;
@@ -358,7 +362,8 @@ class ImportHDF5DatasetTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void DatasetTest(ImportHDF5Dataset::Pointer filter, QList<ImportHDF5Dataset::DatasetImportInfo> importInfoList, std::vector<size_t> amDims, int errCode)
+  template <typename T>
+  void DatasetTest(ImportHDF5Dataset::Pointer filter, QList<ImportHDF5Dataset::DatasetImportInfo> importInfoList, std::vector<size_t> amDims, int errCode)
   {
     if(importInfoList.empty())
     {
@@ -399,13 +404,14 @@ class ImportHDF5DatasetTest
       statusMessage.append("tDims = " + tDimsStr + "\n");
       statusMessage.append("cDims = \n" + cDimsVectorStr);
 
-      //std::cout << statusMessage.toStdString() << std::endl;
+      // std::cout << statusMessage.toStdString() << std::endl;
     }
     else
     {
       ImportHDF5Dataset::DatasetImportInfo info = dsetInfoList[0];
-//      std::cout << QObject::tr("Starting %1 Dataset Test: Dataset Path = %2, tDims = %3, cDims = %4").arg(typeStr).arg(info.dataSetPath).arg(tDimsStr).arg(info.componentDimensions).toStdString()
-//                << std::endl;
+      //      std::cout << QObject::tr("Starting %1 Dataset Test: Dataset Path = %2, tDims = %3, cDims =
+      //      %4").arg(typeStr).arg(info.dataSetPath).arg(tDimsStr).arg(info.componentDimensions).toStdString()
+      //                << std::endl;
     }
 
     filter->execute();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 518b6aad64..01024fc3f6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -100,7 +100,8 @@ class MoveDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
+  template <typename T>
+  void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
   {
     if(originalData == IDataArray::NullPointer() || newData == IDataArray::NullPointer())
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index 7b5ac59b65..8dcf79f1e9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -100,7 +100,8 @@ class MoveMultiDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
+  template <typename T>
+  void checkDataArray(IDataArray::Pointer originalData, IDataArray::Pointer newData, bool isRenamed)
   {
     if(originalData == IDataArray::NullPointer() || newData == IDataArray::NullPointer())
     {
@@ -484,9 +485,9 @@ class MoveMultiDataTest
 
     TestCase(dcaTest, sources, dst, 1, 0);
 
-    sources = { DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_int32ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_uint64ArrayName),
-           DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_int64ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_floatArrayName),
-           DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_doubleArrayName) };
+    sources = {DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_int32ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_uint64ArrayName),
+               DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_int64ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_floatArrayName),
+               DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, k_doubleArrayName)};
 
     dst = DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, "");
 
@@ -506,9 +507,9 @@ class MoveMultiDataTest
 
     dcaTest->getDataContainer(k_DataContainerDstName)->addOrReplaceAttributeMatrix(dcaTest->getDataContainer(k_DataContainerName)->removeAttributeMatrix(k_AttributeMatrixDstName));
 
-    sources = { DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint8ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int8ArrayName),
-           DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint16ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int16ArrayName),
-           DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint32ArrayName) };
+    sources = {DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint8ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int8ArrayName),
+               DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint16ArrayName), DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_int16ArrayName),
+               DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, k_uint32ArrayName)};
 
     dst = DataArrayPath(k_DataContainerDstName, k_AttributeMatrixDstName, "");
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index bdb0ecec49..b52f945116 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QString>
 
@@ -153,7 +153,8 @@ class MultiThresholdObjects2Test
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void ComparisonValueTest(AbstractFilter::Pointer filter, DataArray<T>* dataArray, SIMPL::Comparison::Enumeration comparisonOperator, T value, QString outputName)
+  template <typename T>
+  void ComparisonValueTest(AbstractFilter::Pointer filter, DataArray<T>* dataArray, SIMPL::Comparison::Enumeration comparisonOperator, T value, QString outputName)
   {
     QString dataContainerName = filter->getDataContainerArray()->getDataContainerNames().at(0);
 
@@ -218,7 +219,7 @@ class MultiThresholdObjects2Test
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> 
+  template <typename T>
   void ComparisonValueTestAll(AbstractFilter::Pointer filter, DataArray<T>* dataArray, T comparisonValue, QString outputName)
   {
     ComparisonValueTest(filter, dataArray, SIMPL::Comparison::Operator_GreaterThan, comparisonValue, outputName + QString::number(0));
@@ -353,8 +354,8 @@ class MultiThresholdObjects2Test
   }
 
   /**
-* @brief
-*/
+   * @brief
+   */
   void operator()()
   {
     int err = EXIT_SUCCESS;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index cb9b180ee6..0a591e6853 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QString>
 
@@ -219,8 +219,8 @@ class MultiThresholdObjectsTest
   }
 
   /**
-* @brief
-*/
+   * @brief
+   */
   void operator()()
   {
     int err = EXIT_SUCCESS;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index 5ad494ba54..ac8264e9f6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QMetaObject>
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 6af778f9ee..c489806440 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -90,7 +90,7 @@ enum JunkPlacement
   End,
   Both
 };
-}
+} // namespace Detail
 
 class RawBinaryReaderTest
 {
@@ -117,7 +117,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> bool createAndWriteToFile(T* dataArray, size_t dataSize, T* junkArray, size_t junkSize, Detail::JunkPlacement junkPlacement)
+  template <typename T>
+  bool createAndWriteToFile(T* dataArray, size_t dataSize, T* junkArray, size_t junkSize, Detail::JunkPlacement junkPlacement)
   {
     /* Any of these combinations will return failure:
      *      If the junkArray has values and junkPlacement is set to NONE
@@ -218,7 +219,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase1: This tests when the file size is equal to the allocated size, and checks to see if the data read is the same as the data written.
-  template <typename T, size_t N> int testCase1_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  int testCase1_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int err = 0;
     int dataArraySize = k_ArraySize * N;
@@ -287,7 +289,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase1_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase1_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase1_Execute<T, 1>(name, scalarType);
     testCase1_Execute<T, 2>(name, scalarType);
@@ -324,7 +327,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase2: This tests when the file size is smaller than the allocated size. (Reading past the end of the file)
-  template <typename T, size_t N> void testCase2_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  void testCase2_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int err = 0;
     int dataArraySize = k_ArraySize * N / 2; // We don't care what is written...we just need the data array size to be less than the file size
@@ -382,7 +386,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase2_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase2_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase2_Execute<T, 1>(name, scalarType);
     testCase2_Execute<T, 2>(name, scalarType);
@@ -419,7 +424,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase3: This tests when the file size is larger than the allocated size and there is junk at the end of the file.
-  template <typename T, size_t N> void testCase3_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  void testCase3_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int dataArraySize = k_ArraySize * N;
     int junkArraySize = 10;
@@ -493,7 +499,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase3_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase3_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase3_Execute<T, 1>(name, scalarType);
     testCase3_Execute<T, 2>(name, scalarType);
@@ -530,7 +537,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase4: This tests when the file size is larger than the allocated size and there is junk at the beginning of the file.
-  template <typename T, size_t N> void testCase4_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  void testCase4_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int dataArraySize = k_ArraySize * N;
     int junkArraySize = 5;
@@ -632,7 +640,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase4_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase4_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase4_Execute<T, 1>(name, scalarType);
     testCase4_Execute<T, 2>(name, scalarType);
@@ -669,7 +678,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase5: This tests when the file size is larger than the allocated size and there is junk both at the beginning and end of the file.
-  template <typename T, size_t N> void testCase5_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  void testCase5_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int dataArraySize = k_ArraySize * N;
     int junkArraySize = 10;
@@ -743,7 +753,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase5_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase5_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase5_Execute<T, 1>(name, scalarType);
     testCase5_Execute<T, 2>(name, scalarType);
@@ -780,7 +791,8 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   // testCase6: This tests when skipHeaderBytes equals the file size
-  template <typename T, size_t N> void testCase6_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T, size_t N>
+  void testCase6_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     int dataArraySize = 1000;
     int junkArraySize = k_ArraySize * N;
@@ -842,7 +854,8 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void testCase6_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  template <typename T>
+  void testCase6_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
   {
     testCase6_Execute<T, 1>(name, scalarType);
     testCase6_Execute<T, 2>(name, scalarType);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index bff4f7f7a1..5ee2150654 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <cmath>
 
 #include <QtCore/QFile>
@@ -123,7 +123,8 @@ class ReadASCIIDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void CreateFile(const QString& filePath, std::vector<T> values, char /* delimiter */)
+  template <typename T>
+  void CreateFile(const QString& filePath, std::vector<T> values, char /* delimiter */)
   {
     QFile data(filePath);
     if(data.open(QFile::WriteOnly))
@@ -187,7 +188,8 @@ class ReadASCIIDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void ConvertType()
+  template <typename T>
+  void ConvertType()
   {
     char delimiter = '\t';
     using DataArrayType = DataArray<T>;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
index efe4032b83..51e5561973 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
@@ -58,12 +58,11 @@ public slots:
   }
 
 public:
-  RemoveArraysObserver(const RemoveArraysObserver&) = delete; // Copy Constructor Not Implemented
-  RemoveArraysObserver(RemoveArraysObserver&&) = delete;      // Move Constructor Not Implemented
+  RemoveArraysObserver(const RemoveArraysObserver&) = delete;            // Copy Constructor Not Implemented
+  RemoveArraysObserver(RemoveArraysObserver&&) = delete;                 // Move Constructor Not Implemented
   RemoveArraysObserver& operator=(const RemoveArraysObserver&) = delete; // Copy Assignment Not Implemented
   RemoveArraysObserver& operator=(RemoveArraysObserver&&) = delete;      // Move Assignment Not Implemented
 
 private:
   QList<PipelineMessage> m_ErrorList = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index c27e23d3f0..85d35a558f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QString>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index 0392cae41e..c41bd11746 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
@@ -310,7 +310,8 @@ class RemoveComponentFromArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestScalarType(AbstractFilter::Pointer filter, DataArrayPath path, int scalarType)
+  template <typename T>
+  void TestScalarType(AbstractFilter::Pointer filter, DataArrayPath path, int scalarType)
   {
 
     DataContainerArray::Pointer dca = CreateDataContainerArray();
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index bbe7ac22b6..7b27135991 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index d64db3f913..5f00fa8e7c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 779bf1c999..309663cc4f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -149,11 +149,11 @@ class RenameDataContainerTest
 
     QVariant value;
 
-    DataArrayPath dataContainerName ("DataContainer");
+    DataArrayPath dataContainerName("DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
-    DataArrayPath newDataContainerName ("Container_2");
+    DataArrayPath newDataContainerName("Container_2");
     value.setValue(newDataContainerName);
     filter->setProperty("NewDataContainerName", value);
 
@@ -183,7 +183,7 @@ class RenameDataContainerTest
 
     QVariant value;
 
-    DataArrayPath dataContainerName ( "DataContainer");
+    DataArrayPath dataContainerName("DataContainer");
     value.setValue(dataContainerName);
     filter->setProperty("SelectedDataContainerName", value);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
index 6541636356..82d31a05e3 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <ctime>
 #include <chrono>
 #include <iostream>
 
-
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -104,7 +103,7 @@ class RenameTimingTest
   // -----------------------------------------------------------------------------
   void TestPreflightTimes()
   {
-    //const int iterations = 1;
+    // const int iterations = 1;
     FilterPipeline::Pointer pipeline = createPipeline();
 
     {
@@ -119,11 +118,11 @@ class RenameTimingTest
     QVariant value;
     value.setValue(QString("NewName"));
     AbstractFilter::Pointer filter = pipeline->getFilterContainer().front();
-    filter->setProperty("DataContainerName", value);    
+    filter->setProperty("DataContainerName", value);
 
     {
       auto start = std::chrono::steady_clock::now();
-      //for(int i = 0; i < iterations; i++)
+      // for(int i = 0; i < iterations; i++)
       {
         pipeline->preflightPipeline();
       }
@@ -148,4 +147,4 @@ class RenameTimingTest
 
 private:
   RenameTimingTest(const RenameTimingTest&); // Copy Constructor Not Implemented
-  void operator=(const RenameTimingTest&);          // Move assignment Not Implemented
+  void operator=(const RenameTimingTest&);   // Move assignment Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index 06a4e24cc7..baa265536e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 
@@ -194,7 +194,8 @@ class ReplaceValueTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void validateReplacedValues(IDataArray::Pointer iArray)
+  template <typename T>
+  void validateReplacedValues(IDataArray::Pointer iArray)
   {
     typename DataArray<T>::Pointer dataArrayPtr = std::dynamic_pointer_cast<DataArray<T>>(iArray);
     T* dataArray = dataArrayPtr->getPointer(0);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index c845ea253e..5aa1470fa7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index ad4d61bdbd..750ec5b28b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 023df26c08..49e7587df5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -53,7 +53,7 @@ namespace SetOriginResolutionImageGeometryTest
 {
 const FloatVec3Type ORIGIN = FloatVec3Type{1, 2, 3};
 const FloatVec3Type RESOLUTION = FloatVec3Type{4, 5, 6};
-}
+} // namespace SetOriginResolutionImageGeometryTest
 
 class SetOriginResolutionImageGeomTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 5727ff3a97..7ecab6d2eb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -52,14 +52,13 @@ class SplitAttributeArrayTest
 {
 
 public:
-  SplitAttributeArrayTest()= default;
+  SplitAttributeArrayTest() = default;
   virtual ~SplitAttributeArrayTest() = default;
-  SplitAttributeArrayTest(const SplitAttributeArrayTest&) = delete; // Copy Constructor Not Implemented
-  SplitAttributeArrayTest(SplitAttributeArrayTest&&) = delete;      // Move Constructor Not Implemented
+  SplitAttributeArrayTest(const SplitAttributeArrayTest&) = delete;            // Copy Constructor Not Implemented
+  SplitAttributeArrayTest(SplitAttributeArrayTest&&) = delete;                 // Move Constructor Not Implemented
   SplitAttributeArrayTest& operator=(const SplitAttributeArrayTest&) = delete; // Copy Assignment Not Implemented
   SplitAttributeArrayTest& operator=(SplitAttributeArrayTest&&) = delete;      // Move Assignment Not Implemented
-  
-  
+
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -144,7 +143,8 @@ class SplitAttributeArrayTest
     }
   }
 
-  template <typename T> void fillDataArray(IDataArray::Pointer inputArray)
+  template <typename T>
+  void fillDataArray(IDataArray::Pointer inputArray)
   {
     typename DataArray<T>::Pointer daPtr = std::dynamic_pointer_cast<DataArray<T>>(inputArray);
     T num = 0;
@@ -220,7 +220,8 @@ class SplitAttributeArrayTest
     return EXIT_SUCCESS;
   }
 
-  template <typename T> void TestSplitByType(AbstractFilter::Pointer filter, DataContainerArray::Pointer dca, QString dataType)
+  template <typename T>
+  void TestSplitByType(AbstractFilter::Pointer filter, DataContainerArray::Pointer dca, QString dataType)
   {
     //    Observer obs;
     //    QObject::connect(
@@ -253,20 +254,20 @@ class SplitAttributeArrayTest
         filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType));
 
     std::vector<DataArrayPtrType> mcArraysAfterSplit;
-    DataArrayPtrType mcArray0 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
-        filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component0"));
+    DataArrayPtrType mcArray0 =
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component0"));
     mcArraysAfterSplit.push_back(mcArray0);
-    DataArrayPtrType mcArray1 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
-        filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component1"));
+    DataArrayPtrType mcArray1 =
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component1"));
     mcArraysAfterSplit.push_back(mcArray1);
-    DataArrayPtrType mcArray2 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
-        filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component2"));
+    DataArrayPtrType mcArray2 =
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component2"));
     mcArraysAfterSplit.push_back(mcArray2);
-    DataArrayPtrType mcArray3 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
-        filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component3"));
+    DataArrayPtrType mcArray3 =
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component3"));
     mcArraysAfterSplit.push_back(mcArray3);
-    DataArrayPtrType mcArray4 = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(
-        filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component4"));
+    DataArrayPtrType mcArray4 =
+        filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter.get(), DataArrayPath("DataContainer", "AttributeMatrix", "MultiComponent Array " + dataType + "Component4"));
     mcArraysAfterSplit.push_back(mcArray4);
 
     size_t numTuples = mcArray_original->getNumberOfTuples();
@@ -295,5 +296,4 @@ class SplitAttributeArrayTest
 
     DREAM3D_REGISTER_TEST(RemoveTestFiles())
   }
-
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 410ebe6eaf..e48e512c4e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <cstdlib>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index d185420666..1920203a1e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -121,16 +121,16 @@ class WriteTriangleGeometryTest
     // Create Triangle Data Arrays
 
     FloatArrayType::Pointer daTriVert = FloatArrayType::CreateArray(k_NumNodes, k_Dims3, k_TriVertexListDAName, true);
-    for (size_t i = 0; i < daTriVert->getNumberOfTuples(); i++)
+    for(size_t i = 0; i < daTriVert->getNumberOfTuples(); i++)
     {
-      for (int j = 0; j < daTriVert->getNumberOfComponents(); j++)
+      for(int j = 0; j < daTriVert->getNumberOfComponents(); j++)
       {
         float value(static_cast<float>(i + j));
-        if (i % 2 != 0)
+        if(i % 2 != 0)
         {
           value *= -1.0f;
         }
-        if (j > 0)
+        if(j > 0)
         {
           value += (j + 1) * 0.111f;
         }
@@ -139,9 +139,9 @@ class WriteTriangleGeometryTest
     }
 
     SharedTriList::Pointer daTriList = SharedTriList::CreateArray(k_NumTriangles, k_Dims3, k_TriListDAName, true);
-    for (size_t i = 0; i < daTriList->getNumberOfTuples(); i++)
+    for(size_t i = 0; i < daTriList->getNumberOfTuples(); i++)
     {
-      for (int j = 0; j < daTriList->getNumberOfComponents(); j++)
+      for(int j = 0; j < daTriList->getNumberOfComponents(); j++)
       {
         daTriList->setComponent(i, j, i + j);
       }
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 95b6547b14..ebb1399f21 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "WriteASCIIData.h"
 
 #include <QtCore/QDir>
@@ -57,7 +57,8 @@
  * @brief The ExportDataPrivate class is a templated class that implements a method to generically
  * export data to an ASCII file
  */
-template <typename TInputType> class WriteASCIIDataPrivate
+template <typename TInputType>
+class WriteASCIIDataPrivate
 {
 public:
   using DataArrayType = DataArray<TInputType>;
@@ -302,15 +303,15 @@ void WriteASCIIData::dataCheck()
       return;
     }
 
-    if( ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
+    if(ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "NeighborList is unsupported when writing ASCII Data.");
     }
-    else if( ptr.lock()->getTypeAsString().compare("struct") == 0)
+    else if(ptr.lock()->getTypeAsString().compare("struct") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StructArray is unsupported when writing ASCII Data.");
     }
-    else if( ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
+    else if(ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StatsDataArray is unsupported when writing ASCII Data.");
     }
@@ -318,11 +319,9 @@ void WriteASCIIData::dataCheck()
     {
       m_SelectedWeakPtrVector.push_back(ptr);
     }
-
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -388,20 +387,19 @@ void WriteASCIIData::writeMultiFileOutput()
 
     char delimiter = lookupDelimiter();
 
-
-    if( std::dynamic_pointer_cast<StringDataArray>(selectedArrayPtr).get() != nullptr)
+    if(std::dynamic_pointer_cast<StringDataArray>(selectedArrayPtr).get() != nullptr)
     {
-       writeStringArray(selectedArrayPtr, exportArrayFile, delimiter);
+      writeStringArray(selectedArrayPtr, exportArrayFile, delimiter);
     }
-    else if( selectedArrayPtr->getTypeAsString().compare("NeighborList<T>") == 0)
+    else if(selectedArrayPtr->getTypeAsString().compare("NeighborList<T>") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "NeighborList is unsupported when writing ASCII Data.");
     }
-    else if( selectedArrayPtr->getTypeAsString().compare("struct") == 0)
+    else if(selectedArrayPtr->getTypeAsString().compare("struct") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StructArray is unsupported when writing ASCII Data.");
     }
-    else if( selectedArrayPtr->getTypeAsString().compare("StatsDataArray") == 0)
+    else if(selectedArrayPtr->getTypeAsString().compare("StatsDataArray") == 0)
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StatsDataArray is unsupported when writing ASCII Data.");
     }
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index c8aff9537e..f3454d916a 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,258 +49,255 @@ using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(WriteASCIIData)
-    PYB11_FILTER_NEW_MACRO(WriteASCIIData)
-    PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
-    PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
-    PYB11_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
-    PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
-    PYB11_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
-    PYB11_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
-    PYB11_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = WriteASCIIData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<WriteASCIIData> New();
-
-    /**
-     * @brief Returns the name of the class for WriteASCIIData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for WriteASCIIData
-     */
-    static QString ClassName();
-
-    ~WriteASCIIData() override;
-
-    /**
-     * @brief Setter property for SelectedDataArrayPaths
-     */
-    void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
-    /**
-     * @brief Getter property for SelectedDataArrayPaths
-     * @return Value of SelectedDataArrayPaths
-     */
-    QVector<DataArrayPath> getSelectedDataArrayPaths() const;
-
-    Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
-
-    /**
-     * @brief Setter property for OutputPath
-     */
-    void setOutputPath(const QString& value);
-    /**
-     * @brief Getter property for OutputPath
-     * @return Value of OutputPath
-     */
-    QString getOutputPath() const;
-
-    Q_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
-
-    /**
-     * @brief Setter property for OutputFilePath
-     */
-    void setOutputFilePath(const QString& value);
-    /**
-     * @brief Getter property for OutputFilePath
-     * @return Value of OutputFilePath
-     */
-    QString getOutputFilePath() const;
-
-    Q_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
-
-    /**
-     * @brief Setter property for Delimiter
-     */
-    void setDelimiter(int value);
-    /**
-     * @brief Getter property for Delimiter
-     * @return Value of Delimiter
-     */
-    int getDelimiter() const;
-
-    Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
-
-    /**
-     * @brief Setter property for FileExtension
-     */
-    void setFileExtension(const QString& value);
-    /**
-     * @brief Getter property for FileExtension
-     * @return Value of FileExtension
-     */
-    QString getFileExtension() const;
-
-    Q_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
-
-    /**
-     * @brief Setter property for MaxValPerLine
-     */
-    void setMaxValPerLine(int value);
-    /**
-     * @brief Getter property for MaxValPerLine
-     * @return Value of MaxValPerLine
-     */
-    int getMaxValPerLine() const;
-
-    Q_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
-
-    /**
-     * @brief Setter property for OutputStyle
-     */
-    void setOutputStyle(int value);
-    /**
-     * @brief Getter property for OutputStyle
-     * @return Value of OutputStyle
-     */
-    int getOutputStyle() const;
-
-    Q_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
-
-    enum DelimiterType
-    {
-      Comma = 0,
-      Semicolon = 1,
-      Space = 2,
-      Colon = 3,
-      Tab = 4
-    };
-
-    enum OutputType
-    {
-      MultiFile = 0,
-      SingleFile = 1
-    };
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    WriteASCIIData();
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-
-  private:
-    QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
-    QString m_OutputPath = {};
-    QString m_OutputFilePath = {};
-    int m_Delimiter = {};
-    QString m_FileExtension = {};
-    int m_MaxValPerLine = {};
-    int m_OutputStyle = {};
-
-    /**
-     * @brief lookupDelimiter Returns the char representation for the
-     * selected delimiter
-     * @return Char for delimiter
-     */
-    char lookupDelimiter();
-
-    /**
-     * @brief Specific function to write string arrays to a text file
-     * @param inputData
-     */
-    void writeStringArray(const IDataArrayShPtrType& inputData, const QString& outputFile, char delimiter);
-
-    /**
-     * @brief m_SelectedWeakPtrVector
-     */
-    QVector<IDataArrayWkPtrType> m_SelectedWeakPtrVector;
-
-    /**
-     * @brief writeMultifileOutput
-     */
-    void writeMultiFileOutput();
-
-    /**
-     * @brief writeSingleFileOutput
-     */
-    void writeSingleFileOutput();
-
-  public:
-    WriteASCIIData(const WriteASCIIData&) = delete; // Copy Constructor Not Implemented
-    WriteASCIIData(WriteASCIIData&&) = delete;      // Move Constructor Not Implemented
-    WriteASCIIData& operator=(const WriteASCIIData&) = delete; // Copy Assignment Not Implemented
-    WriteASCIIData& operator=(WriteASCIIData&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(WriteASCIIData SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(WriteASCIIData)
+  PYB11_FILTER_NEW_MACRO(WriteASCIIData)
+  PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
+  PYB11_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
+  PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
+  PYB11_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
+  PYB11_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
+  PYB11_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = WriteASCIIData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<WriteASCIIData> New();
+
+  /**
+   * @brief Returns the name of the class for WriteASCIIData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for WriteASCIIData
+   */
+  static QString ClassName();
+
+  ~WriteASCIIData() override;
+
+  /**
+   * @brief Setter property for SelectedDataArrayPaths
+   */
+  void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for SelectedDataArrayPaths
+   * @return Value of SelectedDataArrayPaths
+   */
+  QVector<DataArrayPath> getSelectedDataArrayPaths() const;
+
+  Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+
+  /**
+   * @brief Setter property for OutputPath
+   */
+  void setOutputPath(const QString& value);
+  /**
+   * @brief Getter property for OutputPath
+   * @return Value of OutputPath
+   */
+  QString getOutputPath() const;
+
+  Q_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
+
+  /**
+   * @brief Setter property for OutputFilePath
+   */
+  void setOutputFilePath(const QString& value);
+  /**
+   * @brief Getter property for OutputFilePath
+   * @return Value of OutputFilePath
+   */
+  QString getOutputFilePath() const;
+
+  Q_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
+
+  /**
+   * @brief Setter property for Delimiter
+   */
+  void setDelimiter(int value);
+  /**
+   * @brief Getter property for Delimiter
+   * @return Value of Delimiter
+   */
+  int getDelimiter() const;
+
+  Q_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  Q_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
+
+  /**
+   * @brief Setter property for MaxValPerLine
+   */
+  void setMaxValPerLine(int value);
+  /**
+   * @brief Getter property for MaxValPerLine
+   * @return Value of MaxValPerLine
+   */
+  int getMaxValPerLine() const;
+
+  Q_PROPERTY(int MaxValPerLine READ getMaxValPerLine WRITE setMaxValPerLine)
+
+  /**
+   * @brief Setter property for OutputStyle
+   */
+  void setOutputStyle(int value);
+  /**
+   * @brief Getter property for OutputStyle
+   * @return Value of OutputStyle
+   */
+  int getOutputStyle() const;
+
+  Q_PROPERTY(int OutputStyle READ getOutputStyle WRITE setOutputStyle)
+
+  enum DelimiterType
+  {
+    Comma = 0,
+    Semicolon = 1,
+    Space = 2,
+    Colon = 3,
+    Tab = 4
+  };
+
+  enum OutputType
+  {
+    MultiFile = 0,
+    SingleFile = 1
+  };
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  WriteASCIIData();
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
+  QString m_OutputPath = {};
+  QString m_OutputFilePath = {};
+  int m_Delimiter = {};
+  QString m_FileExtension = {};
+  int m_MaxValPerLine = {};
+  int m_OutputStyle = {};
+
+  /**
+   * @brief lookupDelimiter Returns the char representation for the
+   * selected delimiter
+   * @return Char for delimiter
+   */
+  char lookupDelimiter();
+
+  /**
+   * @brief Specific function to write string arrays to a text file
+   * @param inputData
+   */
+  void writeStringArray(const IDataArrayShPtrType& inputData, const QString& outputFile, char delimiter);
+
+  /**
+   * @brief m_SelectedWeakPtrVector
+   */
+  QVector<IDataArrayWkPtrType> m_SelectedWeakPtrVector;
+
+  /**
+   * @brief writeMultifileOutput
+   */
+  void writeMultiFileOutput();
+
+  /**
+   * @brief writeSingleFileOutput
+   */
+  void writeSingleFileOutput();
+
+public:
+  WriteASCIIData(const WriteASCIIData&) = delete;            // Copy Constructor Not Implemented
+  WriteASCIIData(WriteASCIIData&&) = delete;                 // Move Constructor Not Implemented
+  WriteASCIIData& operator=(const WriteASCIIData&) = delete; // Copy Assignment Not Implemented
+  WriteASCIIData& operator=(WriteASCIIData&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index c8e16017f5..e469409db3 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "WriteTriangleGeometry.h"
 
 #include <QtCore/QDir>
@@ -112,7 +112,6 @@ void WriteTriangleGeometry::dataCheck()
   clearErrorCode();
   clearWarningCode();
 
-
   QFileInfo fi(getOutputNodesFile());
   if(fi.suffix().compare("") == 0)
   {
@@ -120,7 +119,7 @@ void WriteTriangleGeometry::dataCheck()
   }
   FileSystemPathHelper::CheckOutputFile(this, "Output Nodes File", getOutputNodesFile(), true);
 
-  fi= QFileInfo(getOutputTrianglesFile());
+  fi = QFileInfo(getOutputTrianglesFile());
   if(fi.suffix().compare("") == 0)
   {
     m_OutputTrianglesFile.append(".bin");
@@ -151,7 +150,6 @@ void WriteTriangleGeometry::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -190,10 +188,10 @@ void WriteTriangleGeometry::execute()
     setErrorCondition(-1, ss);
     return;
   }
-  
+
   QFile fileNodes(getOutputNodesFile());
-  
-  if (!fileNodes.open(QIODevice::WriteOnly | QIODevice::Text))
+
+  if(!fileNodes.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getOutputNodesFile());
     setErrorCondition(-100, ss);
@@ -240,7 +238,7 @@ void WriteTriangleGeometry::execute()
 
   QFile fileTri(getOutputTrianglesFile());
 
-  if (!fileTri.open(QIODevice::WriteOnly | QIODevice::Text))
+  if(!fileTri.open(QIODevice::WriteOnly | QIODevice::Text))
   {
     QString ss = QObject::tr("Output file could not be opened: %1").arg(getOutputTrianglesFile());
     setErrorCondition(-100, ss);
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index 53cb037809..e5b465e177 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,7 +44,6 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-
 /**
  * @class WriteTriangleGeometry WriteTriangleGeometry.h FilterCategory/Code/FilterCategoryFilters/WriteTriangleGeometry.h
  * @brief This filter writes a Nodes, Triangles and Edges file from a Surface Mesh.
@@ -55,159 +53,157 @@
  */
 class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
-    PYB11_FILTER()
-    PYB11_SHARED_POINTERS(WriteTriangleGeometry)
-    PYB11_FILTER_NEW_MACRO(WriteTriangleGeometry)
-    PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
-    PYB11_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
-    PYB11_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = WriteTriangleGeometry;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static std::shared_ptr<WriteTriangleGeometry> New();
-
-    /**
-     * @brief Returns the name of the class for WriteTriangleGeometry
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for WriteTriangleGeometry
-     */
-    static QString ClassName();
-
-    ~WriteTriangleGeometry() override;
-
-    /**
-     * @brief Setter property for DataContainerSelection
-     */
-    void setDataContainerSelection(const DataArrayPath& value);
-    /**
-     * @brief Getter property for DataContainerSelection
-     * @return Value of DataContainerSelection
-     */
-    DataArrayPath getDataContainerSelection() const;
-
-    Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
-
-    /**
-     * @brief Setter property for OutputNodesFile
-     */
-    void setOutputNodesFile(const QString& value);
-    /**
-     * @brief Getter property for OutputNodesFile
-     * @return Value of OutputNodesFile
-     */
-    QString getOutputNodesFile() const;
-
-    Q_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
-
-    /**
-     * @brief Setter property for OutputTrianglesFile
-     */
-    void setOutputTrianglesFile(const QString& value);
-    /**
-     * @brief Getter property for OutputTrianglesFile
-     * @return Value of OutputTrianglesFile
-     */
-    QString getOutputTrianglesFile() const;
-
-    Q_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
-
-    /**
-     * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
-     */
-    QString getCompiledLibraryName() const override;
-
-    /**
-     * @brief getBrandingString Returns the branding string for the filter, which is a tag
-     * used to denote the filter's association with specific plugins
-     * @return Branding string
-    */
-    QString getBrandingString() const override;
-
-    /**
-     * @brief getFilterVersion Returns a version string for this filter. Default
-     * value is an empty string.
-     * @return
-     */
-    QString getFilterVersion() const override;
-
-    /**
-     * @brief newFilterInstance Reimplemented from @see AbstractFilter class
-     */
-    AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
-
-    /**
-     * @brief getGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getGroupName() const override;
-
-    /**
-     * @brief getSubGroupName Reimplemented from @see AbstractFilter class
-     */
-    QString getSubGroupName() const override;
-
-    /**
-     * @brief getUuid Return the unique identifier for this filter.
-     * @return A QUuid object.
-     */
-    QUuid getUuid() const override;
-
-    /**
-     * @brief getHumanLabel Reimplemented from @see AbstractFilter class
-     */
-    QString getHumanLabel() const override;
-
-    /**
-     * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void setupFilterParameters() override;
-
-    /**
-     * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-     */
-    void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
-    /**
-     * @brief execute Reimplemented from @see AbstractFilter class
-     */
-    void execute() override;
-
-
-  protected:
-    WriteTriangleGeometry();
-
-    /**
-     * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-     */
-    void dataCheck() override;
-
-    /**
-     * @brief Initializes all the private instance variables.
-     */
-    void initialize();
-
-  public:
-    WriteTriangleGeometry(const WriteTriangleGeometry&) = delete; // Copy Constructor Not Implemented
-    WriteTriangleGeometry(WriteTriangleGeometry&&) = delete;      // Move Constructor Not Implemented
-    WriteTriangleGeometry& operator=(const WriteTriangleGeometry&) = delete; // Copy Assignment Not Implemented
-    WriteTriangleGeometry& operator=(WriteTriangleGeometry&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataArrayPath m_DataContainerSelection = {};
-    QString m_OutputNodesFile = {};
-    QString m_OutputTrianglesFile = {};
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(WriteTriangleGeometry SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(WriteTriangleGeometry)
+  PYB11_FILTER_NEW_MACRO(WriteTriangleGeometry)
+  PYB11_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+  PYB11_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
+  PYB11_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = WriteTriangleGeometry;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static std::shared_ptr<WriteTriangleGeometry> New();
+
+  /**
+   * @brief Returns the name of the class for WriteTriangleGeometry
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for WriteTriangleGeometry
+   */
+  static QString ClassName();
+
+  ~WriteTriangleGeometry() override;
+
+  /**
+   * @brief Setter property for DataContainerSelection
+   */
+  void setDataContainerSelection(const DataArrayPath& value);
+  /**
+   * @brief Getter property for DataContainerSelection
+   * @return Value of DataContainerSelection
+   */
+  DataArrayPath getDataContainerSelection() const;
+
+  Q_PROPERTY(DataArrayPath DataContainerSelection READ getDataContainerSelection WRITE setDataContainerSelection)
+
+  /**
+   * @brief Setter property for OutputNodesFile
+   */
+  void setOutputNodesFile(const QString& value);
+  /**
+   * @brief Getter property for OutputNodesFile
+   * @return Value of OutputNodesFile
+   */
+  QString getOutputNodesFile() const;
+
+  Q_PROPERTY(QString OutputNodesFile READ getOutputNodesFile WRITE setOutputNodesFile)
+
+  /**
+   * @brief Setter property for OutputTrianglesFile
+   */
+  void setOutputTrianglesFile(const QString& value);
+  /**
+   * @brief Getter property for OutputTrianglesFile
+   * @return Value of OutputTrianglesFile
+   */
+  QString getOutputTrianglesFile() const;
+
+  Q_PROPERTY(QString OutputTrianglesFile READ getOutputTrianglesFile WRITE setOutputTrianglesFile)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  WriteTriangleGeometry();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+public:
+  WriteTriangleGeometry(const WriteTriangleGeometry&) = delete;            // Copy Constructor Not Implemented
+  WriteTriangleGeometry(WriteTriangleGeometry&&) = delete;                 // Move Constructor Not Implemented
+  WriteTriangleGeometry& operator=(const WriteTriangleGeometry&) = delete; // Copy Assignment Not Implemented
+  WriteTriangleGeometry& operator=(WriteTriangleGeometry&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataArrayPath m_DataContainerSelection = {};
+  QString m_OutputNodesFile = {};
+  QString m_OutputTrianglesFile = {};
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.h b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
index 48b71819c5..2c716e5d42 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT ABSOperator : public UnaryOperator
 {
-  public:
-    using Self = ABSOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ABSOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new ABSOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new ABSOperator());
+  }
 
-    ~ABSOperator() override;
+  ~ABSOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    ABSOperator();
+protected:
+  ABSOperator();
 
-  public:
-    ABSOperator(const ABSOperator&) = delete;    // Copy Constructor Not Implemented
-    ABSOperator(ABSOperator&&) = delete;         // Move Constructor Not Implemented
-    ABSOperator& operator=(const ABSOperator&) = delete; // Copy Assignment Not Implemented
-    ABSOperator& operator=(ABSOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  ABSOperator(const ABSOperator&) = delete;            // Copy Constructor Not Implemented
+  ABSOperator(ABSOperator&&) = delete;                 // Move Constructor Not Implemented
+  ABSOperator& operator=(const ABSOperator&) = delete; // Copy Assignment Not Implemented
+  ABSOperator& operator=(ABSOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
index ed41e66efa..9f2f35b5b4 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ACosOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.h b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
index b9ebed2e73..9f0332291f 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT ACosOperator : public UnaryOperator
 {
-  public:
-    using Self = ACosOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ACosOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new ACosOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new ACosOperator());
+  }
 
-    ~ACosOperator() override;
+  ~ACosOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    ACosOperator();
+protected:
+  ACosOperator();
 
-  public:
-    ACosOperator(const ACosOperator&) = delete;   // Copy Constructor Not Implemented
-    ACosOperator(ACosOperator&&) = delete;        // Move Constructor Not Implemented
-    ACosOperator& operator=(const ACosOperator&) = delete; // Copy Assignment Not Implemented
-    ACosOperator& operator=(ACosOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  ACosOperator(const ACosOperator&) = delete;            // Copy Constructor Not Implemented
+  ACosOperator(ACosOperator&&) = delete;                 // Move Constructor Not Implemented
+  ACosOperator& operator=(const ACosOperator&) = delete; // Copy Assignment Not Implemented
+  ACosOperator& operator=(ACosOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 629d9580a8..5f227713eb 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -68,8 +68,8 @@ class ASCIIWizardData
   int attrMatType = 999;
   DataArrayPath selectedPath;
 
-  int headerLine = 0; // -1 means this selection is not used
-  bool headerIsCustom = false; // The user has set their own header names
+  int headerLine = 0;              // -1 means this selection is not used
+  bool headerIsCustom = false;     // The user has set their own header names
   bool headerUsesDefaults = false; // The user just wants to use the automatically generated headers
   bool consecutiveDelimiters = false;
   bool automaticAM = false;
@@ -127,4 +127,3 @@ class ASCIIWizardData
 };
 
 Q_DECLARE_METATYPE(ASCIIWizardData)
-
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.h b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
index 3de00a923c..6f6f4ee5c5 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT ASinOperator : public UnaryOperator
 {
-  public:
-    using Self = ASinOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ASinOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new ASinOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new ASinOperator());
+  }
 
-    ~ASinOperator() override;
+  ~ASinOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    ASinOperator();
+protected:
+  ASinOperator();
 
-  public:
-    ASinOperator(const ASinOperator&) = delete;   // Copy Constructor Not Implemented
-    ASinOperator(ASinOperator&&) = delete;        // Move Constructor Not Implemented
-    ASinOperator& operator=(const ASinOperator&) = delete; // Copy Assignment Not Implemented
-    ASinOperator& operator=(ASinOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  ASinOperator(const ASinOperator&) = delete;            // Copy Constructor Not Implemented
+  ASinOperator(ASinOperator&&) = delete;                 // Move Constructor Not Implemented
+  ASinOperator& operator=(const ASinOperator&) = delete; // Copy Assignment Not Implemented
+  ASinOperator& operator=(ASinOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
index 1459269948..d9e9e67a04 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ATanOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.h b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
index 69288e7d02..8746f3fc91 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT ATanOperator : public UnaryOperator
 {
-  public:
-    using Self = ATanOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ATanOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new ATanOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new ATanOperator());
+  }
 
-    ~ATanOperator() override;
+  ~ATanOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    ATanOperator();
+protected:
+  ATanOperator();
 
-  public:
-    ATanOperator(const ATanOperator&) = delete;   // Copy Constructor Not Implemented
-    ATanOperator(ATanOperator&&) = delete;        // Move Constructor Not Implemented
-    ATanOperator& operator=(const ATanOperator&) = delete; // Copy Assignment Not Implemented
-    ATanOperator& operator=(ATanOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  ATanOperator(const ATanOperator&) = delete;            // Copy Constructor Not Implemented
+  ATanOperator(ATanOperator&&) = delete;                 // Move Constructor Not Implemented
+  ATanOperator& operator=(const ATanOperator&) = delete; // Copy Assignment Not Implemented
+  ATanOperator& operator=(ATanOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index 52e62bf679..ec950ad6f2 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -87,7 +87,7 @@ class AbstractDataParser
   {
     m_DataArray = value;
   }
-  
+
   IDataArray::Pointer getDataArray()
   {
     return m_DataArray;
@@ -189,12 +189,11 @@ class Parser : public AbstractDataParser
 private:
   typename ArrayType::Pointer m_Ptr;
 
-  public:
-  Parser(const Parser&) = delete; // Copy Constructor Not Implemented
-  Parser(Parser&&) = delete;      // Move Constructor Not Implemented
+public:
+  Parser(const Parser&) = delete;            // Copy Constructor Not Implemented
+  Parser(Parser&&) = delete;                 // Move Constructor Not Implemented
   Parser& operator=(const Parser&) = delete; // Copy Assignment Not Implemented
   Parser& operator=(Parser&&) = delete;      // Move Assignment
-  
 };
 
 using Int8ParserType = Parser<Int8ArrayType, Int8Functor>;
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
index a730a466d2..6d43876892 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AdditionOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
index b89e6d1cd6..485f8d52ff 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT AdditionOperator : public BinaryOperator
 {
-  public:
-    using Self = AdditionOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = AdditionOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new AdditionOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new AdditionOperator());
+  }
 
-    ~AdditionOperator() override;
+  ~AdditionOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    AdditionOperator();
+protected:
+  AdditionOperator();
 
-  public:
-    AdditionOperator(const AdditionOperator&) = delete; // Copy Constructor Not Implemented
-    AdditionOperator(AdditionOperator&&) = delete;      // Move Constructor Not Implemented
-    AdditionOperator& operator=(const AdditionOperator&) = delete; // Copy Assignment Not Implemented
-    AdditionOperator& operator=(AdditionOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  AdditionOperator(const AdditionOperator&) = delete;            // Copy Constructor Not Implemented
+  AdditionOperator(AdditionOperator&&) = delete;                 // Move Constructor Not Implemented
+  AdditionOperator& operator=(const AdditionOperator&) = delete; // Copy Assignment Not Implemented
+  AdditionOperator& operator=(AdditionOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
index 87256f3a6b..05acc0a731 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BinaryOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
index 2a6b19b560..195b085891 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,35 +43,35 @@
 
 class SIMPLib_EXPORT BinaryOperator : public CalculatorOperator
 {
-  public:
-    using Self = BinaryOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = BinaryOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new BinaryOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new BinaryOperator());
+  }
 
-    ~BinaryOperator() override;
+  ~BinaryOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) final;
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) final;
 
-  protected:
-    BinaryOperator();
+protected:
+  BinaryOperator();
 
-  public:
-    BinaryOperator(const BinaryOperator&) = delete; // Copy Constructor Not Implemented
-    BinaryOperator(BinaryOperator&&) = delete;      // Move Constructor Not Implemented
-    BinaryOperator& operator=(const BinaryOperator&) = delete; // Copy Assignment Not Implemented
-    BinaryOperator& operator=(BinaryOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  BinaryOperator(const BinaryOperator&) = delete;            // Copy Constructor Not Implemented
+  BinaryOperator(BinaryOperator&&) = delete;                 // Move Constructor Not Implemented
+  BinaryOperator& operator=(const BinaryOperator&) = delete; // Copy Assignment Not Implemented
+  BinaryOperator& operator=(BinaryOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
 
 #define CREATE_NEW_ARRAY_STANDARD_BINARY(filter, calculatedArrayPath, executionStack, op)                                                                                                              \
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index 207ccef0f5..e56e811016 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -70,94 +70,96 @@ class SIMPLib_EXPORT CalculatorArray : public ICalculatorArray
     return QString("CalculatorArray<T>");
   }
 
-    static Pointer New(typename DataArray<T>::Pointer dataArray, ValueType type, bool allocate)
-    {
-      return Pointer(new CalculatorArray(dataArray, type, allocate));
-    }
+  static Pointer New(typename DataArray<T>::Pointer dataArray, ValueType type, bool allocate)
+  {
+    return Pointer(new CalculatorArray(dataArray, type, allocate));
+  }
 
-    ~CalculatorArray() override = default;
+  ~CalculatorArray() override = default;
 
-    IDataArray::Pointer getArray() override { return m_Array; }
+  IDataArray::Pointer getArray() override
+  {
+    return m_Array;
+  }
 
-    void setValue(int i, double val) override
-    {
-      m_Array->setValue(i, val);
-    }
+  void setValue(int i, double val) override
+  {
+    m_Array->setValue(i, val);
+  }
 
-    double getValue(int i) override
+  double getValue(int i) override
+  {
+    if(m_Array->getNumberOfTuples() > 1)
     {
-      if (m_Array->getNumberOfTuples() > 1)
-      {
-        return static_cast<double>(m_Array->getValue(i));
-      }
-      if(m_Array->getNumberOfTuples() == 1)
-      {
-        return static_cast<double>(m_Array->getValue(0));
-      }
-      // ERROR: The array is empty!
-      return 0.0;
+      return static_cast<double>(m_Array->getValue(i));
     }
-
-    ICalculatorArray::ValueType getType() override
+    if(m_Array->getNumberOfTuples() == 1)
     {
-      return m_Type;
+      return static_cast<double>(m_Array->getValue(0));
     }
+    // ERROR: The array is empty!
+    return 0.0;
+  }
+
+  ICalculatorArray::ValueType getType() override
+  {
+    return m_Type;
+  }
 
-    DoubleArrayType::Pointer reduceToOneComponent(int c, bool allocate = true) override
+  DoubleArrayType::Pointer reduceToOneComponent(int c, bool allocate = true) override
+  {
+    if(c >= 0 && c <= m_Array->getNumberOfComponents())
     {
-      if(c >= 0 && c <= m_Array->getNumberOfComponents())
+      if(m_Array->getNumberOfComponents() > 1)
       {
-        if(m_Array->getNumberOfComponents() > 1)
+        DoubleArrayType::Pointer newArray = DoubleArrayType::CreateArray(m_Array->getNumberOfTuples(), {1}, m_Array->getName(), allocate);
+        if(allocate)
         {
-          DoubleArrayType::Pointer newArray = DoubleArrayType::CreateArray(m_Array->getNumberOfTuples(), {1}, m_Array->getName(), allocate);
-          if(allocate)
+          for(int i = 0; i < m_Array->getNumberOfTuples(); i++)
           {
-            for(int i = 0; i < m_Array->getNumberOfTuples(); i++)
-            {
-              newArray->setComponent(i, 0, m_Array->getComponent(i, c));
-            }
+            newArray->setComponent(i, 0, m_Array->getComponent(i, c));
           }
-
-          return newArray;
         }
-      }
 
-      return DoubleArrayType::NullPointer();
+        return newArray;
+      }
     }
 
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override
-    {
-      Q_UNUSED(infixVector)
-      Q_UNUSED(currentIndex)
+    return DoubleArrayType::NullPointer();
+  }
 
-      return CalculatorItem::ErrorCode::SUCCESS;
-    }
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override
+  {
+    Q_UNUSED(infixVector)
+    Q_UNUSED(currentIndex)
+
+    return CalculatorItem::ErrorCode::SUCCESS;
+  }
 
-  protected:
-    CalculatorArray() = default;
+protected:
+  CalculatorArray() = default;
 
-    CalculatorArray(typename DataArray<T>::Pointer dataArray, ValueType type, bool allocate) :
-      ICalculatorArray(),
-      m_Type(type)
+  CalculatorArray(typename DataArray<T>::Pointer dataArray, ValueType type, bool allocate)
+  : ICalculatorArray()
+  , m_Type(type)
+  {
+    m_Array = DoubleArrayType::CreateArray(dataArray->getNumberOfTuples(), dataArray->getComponentDimensions(), dataArray->getName(), allocate);
+    if(allocate)
     {
-      m_Array = DoubleArrayType::CreateArray(dataArray->getNumberOfTuples(), dataArray->getComponentDimensions(), dataArray->getName(), allocate);
-      if(allocate)
+      for(int i = 0; i < dataArray->getSize(); i++)
       {
-        for (int i = 0; i < dataArray->getSize(); i++)
-        {
-          m_Array->setValue(i, static_cast<double>(dataArray->getValue(i)));
-        }
+        m_Array->setValue(i, static_cast<double>(dataArray->getValue(i)));
       }
     }
+  }
 
-  private:
-    DoubleArrayType::Pointer                                  m_Array;
-    ValueType                                                 m_Type;
+private:
+  DoubleArrayType::Pointer m_Array;
+  ValueType m_Type;
 
-  public:
-    CalculatorArray(const CalculatorArray&) = delete;            // Copy Constructor Not Implemented
-    CalculatorArray(CalculatorArray&&) = delete;                 // Move Constructor Not Implemented
-    CalculatorArray& operator=(const CalculatorArray&) = delete; // Copy Assignment Not Implemented
-    CalculatorArray& operator=(CalculatorArray&&) = delete;      // Move Assignment Not Implemented
+public:
+  CalculatorArray(const CalculatorArray&) = delete;            // Copy Constructor Not Implemented
+  CalculatorArray(CalculatorArray&&) = delete;                 // Move Constructor Not Implemented
+  CalculatorArray& operator=(const CalculatorArray&) = delete; // Copy Assignment Not Implemented
+  CalculatorArray& operator=(CalculatorArray&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
index d68a85184d..27bedd1729 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CalculatorItem.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index 53dd10479e..0cd6c5f73d 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,81 +46,80 @@
  */
 class SIMPLib_EXPORT CalculatorItem
 {
-  public:
-    using Self = CalculatorItem;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    virtual ~CalculatorItem();
-
-    using EnumType = int;
-
-    enum class ErrorCode : EnumType
-    {
-      SUCCESS = 0,
-      INVALID_EQUATION = -4009,
-      INVALID_COMPONENT = -4010,
-      EMPTY_EQUATION = -4011,
-      EMPTY_CAL_ARRAY = -4012,
-      EMPTY_SEL_MATRIX = -4013,
-      LOST_ATTR_MATRIX = -4014,
-      INCORRECT_TUPLE_COUNT = -4015,
-      INCONSISTENT_TUPLES = -4016,
-      UNRECOGNIZED_ITEM = -4017,
-      MISMATCHED_PARENTHESES = -4018,
-      UNEXPECTED_OUTPUT = -4019,
-      COMPONENT_OUT_OF_RANGE = -4020,
-      INVALID_ARRAY_NAME = -4022,
-      INCONSISTENT_INDEXING = -4023,
-      INCONSISTENT_COMP_DIMS = -4024,
-      ATTRARRAY_ZEROTUPLES_WARNING = -4025,
-      ORPHANED_COMPONENT = -4026,
-      OPERATOR_NO_LEFT_VALUE = -4027,
-      OPERATOR_NO_RIGHT_VALUE = -4028,
-      OPERATOR_NO_OPENING_PAREN = -4029,
-      OPERATOR_NO_CLOSING_PAREN = -4030,
-      NO_NUMERIC_ARGUMENTS = -4031,
-      MISSING_ARGUMENTS = -4032,
-      NOT_ENOUGH_ARGUMENTS = -4033,
-      TOO_MANY_ARGUMENTS = -4034,
-      INVALID_SYMBOL = -4035,
-      NO_PRECEDING_UNARY_OPERATOR = -4036,
-      InvalidOutputArrayType = -4037,
-      AttributeMatrixInsertionError = -4038
-    };
-
-    enum class WarningCode : EnumType
-    {
-      NONE = 0,
-      NUMERIC_VALUE_WARNING = -5010,
-      AMBIGUOUS_NAME_WARNING = -5011
-    };
-
-    QString getInfixToken();
-
-    virtual CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) = 0;
-
-    bool isICalculatorArray();
-
-    bool isArray();
-
-    bool isNumber();
-
-  protected:
-    CalculatorItem();
-
-    void setInfixToken(const QString& token);
-
-  private:
-    QString m_InfixToken = "";
-
-  public:
-    CalculatorItem(const CalculatorItem&) = delete; // Copy Constructor Not Implemented
-    CalculatorItem(CalculatorItem&&) = delete;      // Move Constructor Not Implemented
-    CalculatorItem& operator=(const CalculatorItem&) = delete; // Copy Assignment Not Implemented
-    CalculatorItem& operator=(CalculatorItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = CalculatorItem;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  virtual ~CalculatorItem();
+
+  using EnumType = int;
+
+  enum class ErrorCode : EnumType
+  {
+    SUCCESS = 0,
+    INVALID_EQUATION = -4009,
+    INVALID_COMPONENT = -4010,
+    EMPTY_EQUATION = -4011,
+    EMPTY_CAL_ARRAY = -4012,
+    EMPTY_SEL_MATRIX = -4013,
+    LOST_ATTR_MATRIX = -4014,
+    INCORRECT_TUPLE_COUNT = -4015,
+    INCONSISTENT_TUPLES = -4016,
+    UNRECOGNIZED_ITEM = -4017,
+    MISMATCHED_PARENTHESES = -4018,
+    UNEXPECTED_OUTPUT = -4019,
+    COMPONENT_OUT_OF_RANGE = -4020,
+    INVALID_ARRAY_NAME = -4022,
+    INCONSISTENT_INDEXING = -4023,
+    INCONSISTENT_COMP_DIMS = -4024,
+    ATTRARRAY_ZEROTUPLES_WARNING = -4025,
+    ORPHANED_COMPONENT = -4026,
+    OPERATOR_NO_LEFT_VALUE = -4027,
+    OPERATOR_NO_RIGHT_VALUE = -4028,
+    OPERATOR_NO_OPENING_PAREN = -4029,
+    OPERATOR_NO_CLOSING_PAREN = -4030,
+    NO_NUMERIC_ARGUMENTS = -4031,
+    MISSING_ARGUMENTS = -4032,
+    NOT_ENOUGH_ARGUMENTS = -4033,
+    TOO_MANY_ARGUMENTS = -4034,
+    INVALID_SYMBOL = -4035,
+    NO_PRECEDING_UNARY_OPERATOR = -4036,
+    InvalidOutputArrayType = -4037,
+    AttributeMatrixInsertionError = -4038
+  };
+
+  enum class WarningCode : EnumType
+  {
+    NONE = 0,
+    NUMERIC_VALUE_WARNING = -5010,
+    AMBIGUOUS_NAME_WARNING = -5011
+  };
+
+  QString getInfixToken();
+
+  virtual CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) = 0;
+
+  bool isICalculatorArray();
+
+  bool isArray();
+
+  bool isNumber();
+
+protected:
+  CalculatorItem();
+
+  void setInfixToken(const QString& token);
+
+private:
+  QString m_InfixToken = "";
+
+public:
+  CalculatorItem(const CalculatorItem&) = delete;            // Copy Constructor Not Implemented
+  CalculatorItem(CalculatorItem&&) = delete;                 // Move Constructor Not Implemented
+  CalculatorItem& operator=(const CalculatorItem&) = delete; // Copy Assignment Not Implemented
+  CalculatorItem& operator=(CalculatorItem&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
index 06fbd71b6d..5b2eaecde6 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CalculatorOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index ea7406324f..e17b3b4834 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,60 +49,60 @@
 
 class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
 {
-  public:
-    enum OperatorType
-    {
-      Unary,
-      Binary
-    };
+public:
+  enum OperatorType
+  {
+    Unary,
+    Binary
+  };
 
-    using Self = CalculatorOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+  using Self = CalculatorOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static double toDegrees(double radians);
-    static double toRadians(double degrees);
+  static double toDegrees(double radians);
+  static double toRadians(double degrees);
 
-    ~CalculatorOperator() override;
+  ~CalculatorOperator() override;
 
-    bool hasHigherPrecedence(CalculatorOperator::Pointer other);
+  bool hasHigherPrecedence(CalculatorOperator::Pointer other);
 
-    virtual void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) = 0;
+  virtual void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) = 0;
 
-    OperatorType getOperatorType();
+  OperatorType getOperatorType();
 
-  protected:
-    CalculatorOperator();
+protected:
+  CalculatorOperator();
 
-    enum Precedence
-    {
-      Unknown_Precedence,
-      A_Precedence,
-      B_Precedence,
-      C_Precedence,
-      D_Precedence,
-      E_Precedence
-    };
+  enum Precedence
+  {
+    Unknown_Precedence,
+    A_Precedence,
+    B_Precedence,
+    C_Precedence,
+    D_Precedence,
+    E_Precedence
+  };
 
-    double root(double base, double root);
+  double root(double base, double root);
 
-    Precedence getPrecedence();
-    void setPrecedence(Precedence precedence);
+  Precedence getPrecedence();
+  void setPrecedence(Precedence precedence);
 
-    void setOperatorType(OperatorType type);
+  void setOperatorType(OperatorType type);
 
-  private:
-    Precedence                                      m_Precedence;
-    OperatorType                                    m_OperatorType;
+private:
+  Precedence m_Precedence;
+  OperatorType m_OperatorType;
 
-  public:
-    CalculatorOperator(const CalculatorOperator&) = delete; // Copy Constructor Not Implemented
-    CalculatorOperator(CalculatorOperator&&) = delete;      // Move Constructor Not Implemented
-    CalculatorOperator& operator=(const CalculatorOperator&) = delete; // Copy Assignment Not Implemented
-    CalculatorOperator& operator=(CalculatorOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  CalculatorOperator(const CalculatorOperator&) = delete;            // Copy Constructor Not Implemented
+  CalculatorOperator(CalculatorOperator&&) = delete;                 // Move Constructor Not Implemented
+  CalculatorOperator& operator=(const CalculatorOperator&) = delete; // Copy Assignment Not Implemented
+  CalculatorOperator& operator=(CalculatorOperator&&) = delete;      // Move Assignment Not Implemented
 };
 
 #define CREATE_NEW_ARRAY_TWO_ARGUMENTS(filter, calculatedArrayPath, executionStack, func)                                                                                                              \
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
index 5819696b10..469e35f46e 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CalculatorSeparator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
index df9f7e6735..e9b8632596 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,25 +43,24 @@
 
 class SIMPLib_EXPORT CalculatorSeparator : public CalculatorItem
 {
-  public:
-    using Self = CalculatorSeparator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CalculatorSeparator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    ~CalculatorSeparator() override;
+  ~CalculatorSeparator() override;
 
-  protected:
-    CalculatorSeparator();
+protected:
+  CalculatorSeparator();
 
-  public:
-    CalculatorSeparator(const CalculatorSeparator&) = delete; // Copy Constructor Not Implemented
-    CalculatorSeparator(CalculatorSeparator&&) = delete;      // Move Constructor Not Implemented
-    CalculatorSeparator& operator=(const CalculatorSeparator&) = delete; // Copy Assignment Not Implemented
-    CalculatorSeparator& operator=(CalculatorSeparator&&) = delete;      // Move Assignment Not Implemented
+public:
+  CalculatorSeparator(const CalculatorSeparator&) = delete;            // Copy Constructor Not Implemented
+  CalculatorSeparator(CalculatorSeparator&&) = delete;                 // Move Constructor Not Implemented
+  CalculatorSeparator& operator=(const CalculatorSeparator&) = delete; // Copy Assignment Not Implemented
+  CalculatorSeparator& operator=(CalculatorSeparator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.h b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
index 43f1a40491..a89279e6f3 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT CeilOperator : public UnaryOperator
 {
-  public:
-    using Self = CeilOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CeilOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new CeilOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new CeilOperator());
+  }
 
-    ~CeilOperator() override;
+  ~CeilOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    CeilOperator();
+protected:
+  CeilOperator();
 
-  public:
-    CeilOperator(const CeilOperator&) = delete;   // Copy Constructor Not Implemented
-    CeilOperator(CeilOperator&&) = delete;        // Move Constructor Not Implemented
-    CeilOperator& operator=(const CeilOperator&) = delete; // Copy Assignment Not Implemented
-    CeilOperator& operator=(CeilOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  CeilOperator(const CeilOperator&) = delete;            // Copy Constructor Not Implemented
+  CeilOperator(CeilOperator&&) = delete;                 // Move Constructor Not Implemented
+  CeilOperator& operator=(const CeilOperator&) = delete; // Copy Assignment Not Implemented
+  CeilOperator& operator=(CeilOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
index 2968954548..f4c3f1f56d 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CommaSeparator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
index db1ad3cef5..e2a61d68d3 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,32 +43,31 @@
 
 class SIMPLib_EXPORT CommaSeparator : public CalculatorSeparator
 {
-  public:
-    using Self = CommaSeparator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CommaSeparator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new CommaSeparator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new CommaSeparator());
+  }
 
-    ~CommaSeparator() override;
+  ~CommaSeparator() override;
 
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
 
-  protected:
-    CommaSeparator();
+protected:
+  CommaSeparator();
 
-  public:
-    CommaSeparator(const CommaSeparator&) = delete; // Copy Constructor Not Implemented
-    CommaSeparator(CommaSeparator&&) = delete;      // Move Constructor Not Implemented
-    CommaSeparator& operator=(const CommaSeparator&) = delete; // Copy Assignment Not Implemented
-    CommaSeparator& operator=(CommaSeparator&&) = delete;      // Move Assignment Not Implemented
+public:
+  CommaSeparator(const CommaSeparator&) = delete;            // Copy Constructor Not Implemented
+  CommaSeparator(CommaSeparator&&) = delete;                 // Move Constructor Not Implemented
+  CommaSeparator& operator=(const CommaSeparator&) = delete; // Copy Assignment Not Implemented
+  CommaSeparator& operator=(CommaSeparator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
index 4188724940..8f61904bb2 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CosOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.h b/Source/SIMPLib/CoreFilters/util/CosOperator.h
index 3e88a93bd5..313d85fd8b 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT CosOperator : public UnaryOperator
 {
-  public:
-    using Self = CosOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CosOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new CosOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new CosOperator());
+  }
 
-    ~CosOperator() override;
+  ~CosOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    CosOperator();
+protected:
+  CosOperator();
 
-  public:
-    CosOperator(const CosOperator&) = delete;    // Copy Constructor Not Implemented
-    CosOperator(CosOperator&&) = delete;         // Move Constructor Not Implemented
-    CosOperator& operator=(const CosOperator&) = delete; // Copy Assignment Not Implemented
-    CosOperator& operator=(CosOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  CosOperator(const CosOperator&) = delete;            // Copy Constructor Not Implemented
+  CosOperator(CosOperator&&) = delete;                 // Move Constructor Not Implemented
+  CosOperator& operator=(const CosOperator&) = delete; // Copy Assignment Not Implemented
+  CosOperator& operator=(CosOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
index 233ab78849..b007d7919f 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DivisionOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
index 8eee80f91a..b4e5eb6494 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,32 +45,31 @@
 
 class SIMPLib_EXPORT DivisionOperator : public BinaryOperator
 {
-  public:
-    using Self = DivisionOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = DivisionOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new DivisionOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new DivisionOperator());
+  }
 
-    ~DivisionOperator() override;
+  ~DivisionOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    DivisionOperator();
+protected:
+  DivisionOperator();
 
-  public:
-    DivisionOperator(const DivisionOperator&) = delete; // Copy Constructor Not Implemented
-    DivisionOperator(DivisionOperator&&) = delete;      // Move Constructor Not Implemented
-    DivisionOperator& operator=(const DivisionOperator&) = delete; // Copy Assignment Not Implemented
-    DivisionOperator& operator=(DivisionOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  DivisionOperator(const DivisionOperator&) = delete;            // Copy Constructor Not Implemented
+  DivisionOperator(DivisionOperator&&) = delete;                 // Move Constructor Not Implemented
+  DivisionOperator& operator=(const DivisionOperator&) = delete; // Copy Assignment Not Implemented
+  DivisionOperator& operator=(DivisionOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.h b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
index 4632b59d1b..47573248af 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT ExpOperator : public UnaryOperator
 {
-  public:
-    using Self = ExpOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ExpOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new ExpOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new ExpOperator());
+  }
 
-    ~ExpOperator() override;
+  ~ExpOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    ExpOperator();
+protected:
+  ExpOperator();
 
-  public:
-    ExpOperator(const ExpOperator&) = delete;    // Copy Constructor Not Implemented
-    ExpOperator(ExpOperator&&) = delete;         // Move Constructor Not Implemented
-    ExpOperator& operator=(const ExpOperator&) = delete; // Copy Assignment Not Implemented
-    ExpOperator& operator=(ExpOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  ExpOperator(const ExpOperator&) = delete;            // Copy Constructor Not Implemented
+  ExpOperator(ExpOperator&&) = delete;                 // Move Constructor Not Implemented
+  ExpOperator& operator=(const ExpOperator&) = delete; // Copy Assignment Not Implemented
+  ExpOperator& operator=(ExpOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
index d0307aefcb..ce8287d642 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloorOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.h b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
index d41a5fb281..15c90568ac 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT FloorOperator : public UnaryOperator
 {
-  public:
-    using Self = FloorOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = FloorOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new FloorOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new FloorOperator());
+  }
 
-    ~FloorOperator() override;
+  ~FloorOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    FloorOperator();
+protected:
+  FloorOperator();
 
-  public:
-    FloorOperator(const FloorOperator&) = delete;  // Copy Constructor Not Implemented
-    FloorOperator(FloorOperator&&) = delete;       // Move Constructor Not Implemented
-    FloorOperator& operator=(const FloorOperator&) = delete; // Copy Assignment Not Implemented
-    FloorOperator& operator=(FloorOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  FloorOperator(const FloorOperator&) = delete;            // Copy Constructor Not Implemented
+  FloorOperator(FloorOperator&&) = delete;                 // Move Constructor Not Implemented
+  FloorOperator& operator=(const FloorOperator&) = delete; // Copy Assignment Not Implemented
+  FloorOperator& operator=(FloorOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
index 190705a2b6..9169a261e2 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ICalculatorArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
index f294883a4d..98bff9cc23 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
@@ -48,39 +47,38 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 class SIMPLib_EXPORT ICalculatorArray : public CalculatorItem
 {
-  public:
-    enum ValueType
-    {
-      Number,
-      Array,
-      Unknown
-    };
+public:
+  enum ValueType
+  {
+    Number,
+    Array,
+    Unknown
+  };
 
-    using Self = ICalculatorArray;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+  using Self = ICalculatorArray;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    ~ICalculatorArray() override;
+  ~ICalculatorArray() override;
 
-    virtual IDataArrayShPtrType getArray() = 0;
-    virtual double getValue(int i) = 0;
-    virtual void setValue(int i, double value) = 0;
-    virtual ValueType getType() = 0;
+  virtual IDataArrayShPtrType getArray() = 0;
+  virtual double getValue(int i) = 0;
+  virtual void setValue(int i, double value) = 0;
+  virtual ValueType getType() = 0;
 
-    virtual DoubleArrayType::Pointer reduceToOneComponent(int c, bool allocate = true) = 0;
+  virtual DoubleArrayType::Pointer reduceToOneComponent(int c, bool allocate = true) = 0;
 
-  protected:
-    ICalculatorArray();
+protected:
+  ICalculatorArray();
 
-  public:
-    ICalculatorArray(const ICalculatorArray&) = delete; // Copy Constructor Not Implemented
-    ICalculatorArray(ICalculatorArray&&) = delete;      // Move Constructor Not Implemented
-    ICalculatorArray& operator=(const ICalculatorArray&) = delete; // Copy Assignment Not Implemented
-    ICalculatorArray& operator=(ICalculatorArray&&) = delete;      // Move Assignment Not Implemented
+public:
+  ICalculatorArray(const ICalculatorArray&) = delete;            // Copy Constructor Not Implemented
+  ICalculatorArray(ICalculatorArray&&) = delete;                 // Move Constructor Not Implemented
+  ICalculatorArray& operator=(const ICalculatorArray&) = delete; // Copy Assignment Not Implemented
+  ICalculatorArray& operator=(ICalculatorArray&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
index 2c50dba0bd..52b2164e7d 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LeftParenthesisItem.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
index 467ffcfa05..33c4e53c83 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,39 +45,38 @@
 
 class SIMPLib_EXPORT LeftParenthesisItem : public CalculatorItem
 {
-  public:
-    using Self = LeftParenthesisItem;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = LeftParenthesisItem;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new LeftParenthesisItem());
-    }
+  static Pointer New()
+  {
+    return Pointer(new LeftParenthesisItem());
+  }
 
-    ~LeftParenthesisItem() override;
+  ~LeftParenthesisItem() override;
 
-    /**
-     * @brief checkValidity
-     * @param infixVector
-     * @param currentIndex
-     * @param msg
-     * @return
-     */
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
+  /**
+   * @brief checkValidity
+   * @param infixVector
+   * @param currentIndex
+   * @param msg
+   * @return
+   */
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
 
-  protected:
-    LeftParenthesisItem();
+protected:
+  LeftParenthesisItem();
 
-  public:
-    LeftParenthesisItem(const LeftParenthesisItem&) = delete; // Copy Constructor Not Implemented
-    LeftParenthesisItem(LeftParenthesisItem&&) = delete;      // Move Constructor Not Implemented
-    LeftParenthesisItem& operator=(const LeftParenthesisItem&) = delete; // Copy Assignment Not Implemented
-    LeftParenthesisItem& operator=(LeftParenthesisItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  LeftParenthesisItem(const LeftParenthesisItem&) = delete;            // Copy Constructor Not Implemented
+  LeftParenthesisItem(LeftParenthesisItem&&) = delete;                 // Move Constructor Not Implemented
+  LeftParenthesisItem& operator=(const LeftParenthesisItem&) = delete; // Copy Assignment Not Implemented
+  LeftParenthesisItem& operator=(LeftParenthesisItem&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.h b/Source/SIMPLib/CoreFilters/util/LnOperator.h
index 9463ec6523..389efb82c7 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT LnOperator : public UnaryOperator
 {
-  public:
-    using Self = LnOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = LnOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new LnOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new LnOperator());
+  }
 
-    ~LnOperator() override;
+  ~LnOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    LnOperator();
+protected:
+  LnOperator();
 
-  public:
-    LnOperator(const LnOperator&) = delete;     // Copy Constructor Not Implemented
-    LnOperator(LnOperator&&) = delete;          // Move Constructor Not Implemented
-    LnOperator& operator=(const LnOperator&) = delete; // Copy Assignment Not Implemented
-    LnOperator& operator=(LnOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  LnOperator(const LnOperator&) = delete;            // Copy Constructor Not Implemented
+  LnOperator(LnOperator&&) = delete;                 // Move Constructor Not Implemented
+  LnOperator& operator=(const LnOperator&) = delete; // Copy Assignment Not Implemented
+  LnOperator& operator=(LnOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.h b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
index 64bd09d4c2..df27f84a7f 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.h
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT Log10Operator : public UnaryOperator
 {
-  public:
-    using Self = Log10Operator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = Log10Operator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new Log10Operator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new Log10Operator());
+  }
 
-    ~Log10Operator() override;
+  ~Log10Operator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    Log10Operator();
+protected:
+  Log10Operator();
 
-  public:
-    Log10Operator(const Log10Operator&) = delete;  // Copy Constructor Not Implemented
-    Log10Operator(Log10Operator&&) = delete;       // Move Constructor Not Implemented
-    Log10Operator& operator=(const Log10Operator&) = delete; // Copy Assignment Not Implemented
-    Log10Operator& operator=(Log10Operator&&) = delete;      // Move Assignment Not Implemented
+public:
+  Log10Operator(const Log10Operator&) = delete;            // Copy Constructor Not Implemented
+  Log10Operator(Log10Operator&&) = delete;                 // Move Constructor Not Implemented
+  Log10Operator& operator=(const Log10Operator&) = delete; // Copy Assignment Not Implemented
+  Log10Operator& operator=(Log10Operator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
index 0304409865..eca6ffb09f 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LogOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.h b/Source/SIMPLib/CoreFilters/util/LogOperator.h
index 7cb0c4e1f8..6893013c71 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,33 +47,32 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT LogOperator : public UnaryOperator
 {
-  public:
-    using Self = LogOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = LogOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new LogOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new LogOperator());
+  }
 
-    ~LogOperator() override;
+  ~LogOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    LogOperator();
+protected:
+  LogOperator();
 
-  private:
-    double log_arbitrary_base(double base, double value);
+private:
+  double log_arbitrary_base(double base, double value);
 
-  public:
-    LogOperator(const LogOperator&) = delete;    // Copy Constructor Not Implemented
-    LogOperator(LogOperator&&) = delete;         // Move Constructor Not Implemented
-    LogOperator& operator=(const LogOperator&) = delete; // Copy Assignment Not Implemented
-    LogOperator& operator=(LogOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  LogOperator(const LogOperator&) = delete;            // Copy Constructor Not Implemented
+  LogOperator(LogOperator&&) = delete;                 // Move Constructor Not Implemented
+  LogOperator& operator=(const LogOperator&) = delete; // Copy Assignment Not Implemented
+  LogOperator& operator=(LogOperator&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
index 4c4585e5fb..83f2258cd5 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MultiplicationOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
index b9ede408e1..2e1f779ab4 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,32 +45,31 @@
 
 class SIMPLib_EXPORT MultiplicationOperator : public BinaryOperator
 {
-  public:
-    using Self = MultiplicationOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = MultiplicationOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new MultiplicationOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new MultiplicationOperator());
+  }
 
-    ~MultiplicationOperator() override;
+  ~MultiplicationOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    MultiplicationOperator();
+protected:
+  MultiplicationOperator();
 
-  public:
-    MultiplicationOperator(const MultiplicationOperator&) = delete; // Copy Constructor Not Implemented
-    MultiplicationOperator(MultiplicationOperator&&) = delete;      // Move Constructor Not Implemented
-    MultiplicationOperator& operator=(const MultiplicationOperator&) = delete; // Copy Assignment Not Implemented
-    MultiplicationOperator& operator=(MultiplicationOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  MultiplicationOperator(const MultiplicationOperator&) = delete;            // Copy Constructor Not Implemented
+  MultiplicationOperator(MultiplicationOperator&&) = delete;                 // Move Constructor Not Implemented
+  MultiplicationOperator& operator=(const MultiplicationOperator&) = delete; // Copy Assignment Not Implemented
+  MultiplicationOperator& operator=(MultiplicationOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
index 7603cded2f..04f0edef5d 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "NegativeOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
index 8a39156165..c296221f8a 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,34 +45,33 @@
 
 class SIMPLib_EXPORT NegativeOperator : public CalculatorOperator
 {
-  public:
-    using Self = NegativeOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = NegativeOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new NegativeOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new NegativeOperator());
+  }
 
-    ~NegativeOperator() override;
+  ~NegativeOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& errMsg) final;
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& errMsg) final;
 
-  protected:
-    NegativeOperator();
+protected:
+  NegativeOperator();
 
-  public:
-    NegativeOperator(const NegativeOperator&) = delete; // Copy Constructor Not Implemented
-    NegativeOperator(NegativeOperator&&) = delete;      // Move Constructor Not Implemented
-    NegativeOperator& operator=(const NegativeOperator&) = delete; // Copy Assignment Not Implemented
-    NegativeOperator& operator=(NegativeOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  NegativeOperator(const NegativeOperator&) = delete;            // Copy Constructor Not Implemented
+  NegativeOperator(NegativeOperator&&) = delete;                 // Move Constructor Not Implemented
+  NegativeOperator& operator=(const NegativeOperator&) = delete; // Copy Assignment Not Implemented
+  NegativeOperator& operator=(NegativeOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp b/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
index 261d691c8e..696ebc4489 100644
--- a/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ParserFunctors.hpp
@@ -39,7 +39,7 @@ namespace ParserErrorMessages
 {
 const QString ValueOutOfRange = "Value is out of range for the specified data type.";
 const QString CouldNotConvert = "Value could not be converted to the specified data type.";
-}
+} // namespace ParserErrorMessages
 
 // -----------------------------------------------------------------------------
 //
@@ -429,4 +429,3 @@ class StringFunctor : public ParserFunctor
     return token;
   }
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
index 10acf47e2d..976a652d84 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PowOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.h b/Source/SIMPLib/CoreFilters/util/PowOperator.h
index 2742de4e6a..0d3f5ddee9 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT PowOperator : public BinaryOperator
 {
-  public:
-    using Self = PowOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = PowOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new PowOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new PowOperator());
+  }
 
-    ~PowOperator() override;
+  ~PowOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    PowOperator();
+protected:
+  PowOperator();
 
-  public:
-    PowOperator(const PowOperator&) = delete;    // Copy Constructor Not Implemented
-    PowOperator(PowOperator&&) = delete;         // Move Constructor Not Implemented
-    PowOperator& operator=(const PowOperator&) = delete; // Copy Assignment Not Implemented
-    PowOperator& operator=(PowOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  PowOperator(const PowOperator&) = delete;            // Copy Constructor Not Implemented
+  PowOperator(PowOperator&&) = delete;                 // Move Constructor Not Implemented
+  PowOperator& operator=(const PowOperator&) = delete; // Copy Assignment Not Implemented
+  PowOperator& operator=(PowOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
index 0e6746d82b..4c2edc704e 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RightParenthesisItem.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
index fcc631aae3..6f62a71756 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,39 +45,38 @@
 
 class SIMPLib_EXPORT RightParenthesisItem : public CalculatorItem
 {
-  public:
-    using Self = RightParenthesisItem;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = RightParenthesisItem;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new RightParenthesisItem());
-    }
+  static Pointer New()
+  {
+    return Pointer(new RightParenthesisItem());
+  }
 
-    ~RightParenthesisItem() override;
+  ~RightParenthesisItem() override;
 
-    /**
-     * @brief checkValidity
-     * @param infixVector
-     * @param currentIndex
-     * @param msg
-     * @return
-     */
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
+  /**
+   * @brief checkValidity
+   * @param infixVector
+   * @param currentIndex
+   * @param msg
+   * @return
+   */
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) override;
 
-  protected:
-    RightParenthesisItem();
+protected:
+  RightParenthesisItem();
 
-  public:
-    RightParenthesisItem(const RightParenthesisItem&) = delete; // Copy Constructor Not Implemented
-    RightParenthesisItem(RightParenthesisItem&&) = delete;      // Move Constructor Not Implemented
-    RightParenthesisItem& operator=(const RightParenthesisItem&) = delete; // Copy Assignment Not Implemented
-    RightParenthesisItem& operator=(RightParenthesisItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  RightParenthesisItem(const RightParenthesisItem&) = delete;            // Copy Constructor Not Implemented
+  RightParenthesisItem(RightParenthesisItem&&) = delete;                 // Move Constructor Not Implemented
+  RightParenthesisItem& operator=(const RightParenthesisItem&) = delete; // Copy Assignment Not Implemented
+  RightParenthesisItem& operator=(RightParenthesisItem&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
index 4dc597f341..b202b58219 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RootOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.h b/Source/SIMPLib/CoreFilters/util/RootOperator.h
index c826f7ed89..cee53f0544 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT RootOperator : public UnaryOperator
 {
-  public:
-    using Self = RootOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = RootOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new RootOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new RootOperator());
+  }
 
-    ~RootOperator() override;
+  ~RootOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    RootOperator();
+protected:
+  RootOperator();
 
-  public:
-    RootOperator(const RootOperator&) = delete;   // Copy Constructor Not Implemented
-    RootOperator(RootOperator&&) = delete;        // Move Constructor Not Implemented
-    RootOperator& operator=(const RootOperator&) = delete; // Copy Assignment Not Implemented
-    RootOperator& operator=(RootOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  RootOperator(const RootOperator&) = delete;            // Copy Constructor Not Implemented
+  RootOperator(RootOperator&&) = delete;                 // Move Constructor Not Implemented
+  RootOperator& operator=(const RootOperator&) = delete; // Copy Assignment Not Implemented
+  RootOperator& operator=(RootOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
index b58a2a9161..131cf40ec0 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SinOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.h b/Source/SIMPLib/CoreFilters/util/SinOperator.h
index f927ce571d..56cdebfb29 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT SinOperator : public UnaryOperator
 {
-  public:
-    using Self = SinOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = SinOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new SinOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new SinOperator());
+  }
 
-    ~SinOperator() override;
+  ~SinOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    SinOperator();
+protected:
+  SinOperator();
 
-  public:
-    SinOperator(const SinOperator&) = delete;    // Copy Constructor Not Implemented
-    SinOperator(SinOperator&&) = delete;         // Move Constructor Not Implemented
-    SinOperator& operator=(const SinOperator&) = delete; // Copy Assignment Not Implemented
-    SinOperator& operator=(SinOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  SinOperator(const SinOperator&) = delete;            // Copy Constructor Not Implemented
+  SinOperator(SinOperator&&) = delete;                 // Move Constructor Not Implemented
+  SinOperator& operator=(const SinOperator&) = delete; // Copy Assignment Not Implemented
+  SinOperator& operator=(SinOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
index 5be9da5693..dcfdf652f5 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT SqrtOperator : public UnaryOperator
 {
-  public:
-    using Self = SqrtOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = SqrtOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new SqrtOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new SqrtOperator());
+  }
 
-    ~SqrtOperator() override;
+  ~SqrtOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    SqrtOperator();
+protected:
+  SqrtOperator();
 
-  public:
-    SqrtOperator(const SqrtOperator&) = delete;   // Copy Constructor Not Implemented
-    SqrtOperator(SqrtOperator&&) = delete;        // Move Constructor Not Implemented
-    SqrtOperator& operator=(const SqrtOperator&) = delete; // Copy Assignment Not Implemented
-    SqrtOperator& operator=(SqrtOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  SqrtOperator(const SqrtOperator&) = delete;            // Copy Constructor Not Implemented
+  SqrtOperator(SqrtOperator&&) = delete;                 // Move Constructor Not Implemented
+  SqrtOperator& operator=(const SqrtOperator&) = delete; // Copy Assignment Not Implemented
+  SqrtOperator& operator=(SqrtOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
index ac35eaf9a7..88f19d6aed 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SubtractionOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
index 8950dfdd31..22219d866e 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,32 +45,31 @@
 
 class SIMPLib_EXPORT SubtractionOperator : public BinaryOperator
 {
-  public:
-    using Self = SubtractionOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = SubtractionOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new SubtractionOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new SubtractionOperator());
+  }
 
-    ~SubtractionOperator() override;
+  ~SubtractionOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    SubtractionOperator();
+protected:
+  SubtractionOperator();
 
-  public:
-    SubtractionOperator(const SubtractionOperator&) = delete; // Copy Constructor Not Implemented
-    SubtractionOperator(SubtractionOperator&&) = delete;      // Move Constructor Not Implemented
-    SubtractionOperator& operator=(const SubtractionOperator&) = delete; // Copy Assignment Not Implemented
-    SubtractionOperator& operator=(SubtractionOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  SubtractionOperator(const SubtractionOperator&) = delete;            // Copy Constructor Not Implemented
+  SubtractionOperator(SubtractionOperator&&) = delete;                 // Move Constructor Not Implemented
+  SubtractionOperator& operator=(const SubtractionOperator&) = delete; // Copy Assignment Not Implemented
+  SubtractionOperator& operator=(SubtractionOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
index 7c14a034f5..2473ad1d69 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TanOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.h b/Source/SIMPLib/CoreFilters/util/TanOperator.h
index a843dbc88c..65ebf59500 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,32 +47,31 @@ class CalculatorNumber;
 
 class SIMPLib_EXPORT TanOperator : public UnaryOperator
 {
-  public:
-    using Self = TanOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = TanOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New()
-    {
-      return Pointer(new TanOperator());
-    }
+  static Pointer New()
+  {
+    return Pointer(new TanOperator());
+  }
 
-    ~TanOperator() override;
+  ~TanOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-  protected:
-    TanOperator();
+protected:
+  TanOperator();
 
-  public:
-    TanOperator(const TanOperator&) = delete;    // Copy Constructor Not Implemented
-    TanOperator(TanOperator&&) = delete;         // Move Constructor Not Implemented
-    TanOperator& operator=(const TanOperator&) = delete; // Copy Assignment Not Implemented
-    TanOperator& operator=(TanOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  TanOperator(const TanOperator&) = delete;            // Copy Constructor Not Implemented
+  TanOperator(TanOperator&&) = delete;                 // Move Constructor Not Implemented
+  TanOperator& operator=(const TanOperator&) = delete; // Copy Assignment Not Implemented
+  TanOperator& operator=(TanOperator&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
index 8dba912eb1..a19db1493a 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UnaryOperator.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
index ec1053bb98..56264e5b7a 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,43 +43,43 @@
 
 class SIMPLib_EXPORT UnaryOperator : public CalculatorOperator
 {
-  public:
-    using Self = UnaryOperator;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New()
-    {
-      return Pointer(new UnaryOperator());
-    }
+public:
+  using Self = UnaryOperator;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New()
+  {
+    return Pointer(new UnaryOperator());
+  }
 
-    ~UnaryOperator() override;
+  ~UnaryOperator() override;
 
-    void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer> &executionStack) override;
+  void calculate(AbstractFilter* filter, DataArrayPath calculatedArrayPath, QStack<ICalculatorArray::Pointer>& executionStack) override;
 
-    CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) final;
+  CalculatorItem::ErrorCode checkValidity(QVector<CalculatorItem::Pointer> infixVector, int currentIndex, QString& msg) final;
 
-    int getNumberOfArguments();
+  int getNumberOfArguments();
 
-  protected:
-    UnaryOperator();
+protected:
+  UnaryOperator();
 
-    void setNumberOfArguments(int numOfArguments);
+  void setNumberOfArguments(int numOfArguments);
 
-  private:
-    int                                           m_NumOfArguments;
+private:
+  int m_NumOfArguments;
 
-  public:
-    UnaryOperator(const UnaryOperator&) = delete;  // Copy Constructor Not Implemented
-    UnaryOperator(UnaryOperator&&) = delete;       // Move Constructor Not Implemented
-    UnaryOperator& operator=(const UnaryOperator&) = delete; // Copy Assignment Not Implemented
-    UnaryOperator& operator=(UnaryOperator&&) = delete;      // Move Assignment Not Implemented
+public:
+  UnaryOperator(const UnaryOperator&) = delete;            // Copy Constructor Not Implemented
+  UnaryOperator(UnaryOperator&&) = delete;                 // Move Constructor Not Implemented
+  UnaryOperator& operator=(const UnaryOperator&) = delete; // Copy Assignment Not Implemented
+  UnaryOperator& operator=(UnaryOperator&&) = delete;      // Move Assignment Not Implemented
 };
 
-#define CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, func)                                                                                                          \
+#define CREATE_NEW_ARRAY_STANDARD_UNARY(filter, calculatedArrayPath, executionStack, func)                                                                                                             \
   ArrayCalculator* calculatorFilter = dynamic_cast<ArrayCalculator*>(filter);                                                                                                                          \
                                                                                                                                                                                                        \
   if(!executionStack.empty() && nullptr != executionStack.top() && nullptr != calculatorFilter)                                                                                                        \
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
old mode 100755
new mode 100644
index 7860b0d258..0798077727
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -829,7 +829,7 @@ class DataArray : public IDataArray
     self_type operator++(int32_t unused)
     {
       // Replace with [[maybe_unused]] in C++ 17
-      (void) unused;
+      (void)unused;
       self_type i = *this;
       ptr_++;
       return i;
@@ -1219,7 +1219,6 @@ class DataArray : public IDataArray
   // =================================== END STL COMPATIBLE INTERFACe ===================================================
 
 protected:
-
   /**
    * @brief deallocates the memory block
    */
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
old mode 100755
new mode 100644
index 5e017db5f5..9839e3eee3
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -344,4 +344,3 @@ class DynamicListArray
 typedef DynamicListArray<int32_t, int32_t> Int32Int32DynamicListArray;
 typedef DynamicListArray<uint16_t, int64_t> UInt16Int64DynamicListArray;
 typedef DynamicListArray<int64_t, int64_t> Int64Int64DynamicListArray;
-
diff --git a/Source/SIMPLib/DataArrays/IDataArray.cpp b/Source/SIMPLib/DataArrays/IDataArray.cpp
index 23747d83e4..22b04f9532 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArray.cpp
@@ -16,7 +16,8 @@
 // -----------------------------------------------------------------------------
 IDataArray::IDataArray(const QString& name)
 : IDataStructureNode(name)
-{}
+{
+}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
old mode 100755
new mode 100644
index e19da37641..f4ac8e7d24
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -70,237 +70,234 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
    */
   static QString ClassName();
 
-    IDataArray(const QString& name = "");
-    ~IDataArray() override;
-
-    virtual Pointer createNewArray(size_t numElements, int32_t rank, const size_t* dims, const QString& name, bool allocate = true) const = 0;
-    virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const = 0;
-    // virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
-
-    /**
-     * @brief Creates and returns a DataArrayPath for the DataArray
-     * @return
-     */
-    DataArrayPath getDataArrayPath() const override;
-
-    virtual int32_t getClassVersion() const = 0;
-
-    /**
-     * @brief Has all the memory needed for this class been allocated?
-     */
-    virtual bool isAllocated() const = 0;
-
-    /**
-     * @brief Makes this class responsible for freeing the memory.
-     */
-    virtual void takeOwnership () = 0;
-
-    /**
-     * @brief This class will NOT free the memory associated with the internal pointer.
-     * This can be useful if the user wishes to keep the data around after this
-     * class goes out of scope.
-     */
-    virtual void releaseOwnership () = 0;
-
-    /**
-     * @brief Returns a void pointer pointing to the index of the array. nullptr
-     * pointers are entirely possible. No checks are performed to make sure
-     * the index is with in the range of the internal data array.
-     * @param i The index to have the returned pointer pointing to.
-     * @return Void Pointer. Possibly nullptr.
-     */
-    virtual void* getVoidPointer ( size_t i) = 0;
-
-    /**
-    * @brief Returns the number of Tuples in the array.
-    */
-    virtual size_t getNumberOfTuples() const = 0;
-
-
-    /**
-     * @brief Return the number of elements in the array
-     * @return
-     */
-    virtual size_t getSize() const = 0;
-
-    virtual int32_t getNumberOfComponents() const = 0;
-    virtual std::vector<size_t> getComponentDimensions() const = 0;
-
-    /**
-     * @brief Returns the number of bytes that make up the data type.
-     * 1 = char
-     * 2 = 16 bit integer
-     * 4 = 32 bit integer/Float
-     * 8 = 64 bit integer/Double
-     */
-    virtual size_t getTypeSize() const = 0;
-
-    /**
-     * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision) const = 0;
-
-    /**
-     * @brief Erases tuples based on a list of specific Tuple indices
-     * @param idxs The indices to erase
-     * @return
-     */
-    virtual int32_t eraseTuples(const std::vector<size_t>& idxs) = 0;
-
-    /**
-     * @brief Copies a Tuple from one position to another.
-     * @param currentPos The index of the source data
-     * @param newPos The destination index to place the copied data
-     * @return
-     */
-    virtual int32_t copyTuple(size_t currentPos, size_t newPos) = 0;
-
-    /**
-     * @brief copyData This method copies all data from the <b>sourceArray</b> into
-     * the current array starting at the target destination tuple offset value.
-     *
-     * The method will check to ensure that various conditions are properly met
-     * before attempting to copy the data into the array at the give offset to avoid
-     * the possibility of walking off the end of the array into application memory
-     * or causing a General protection fault by the OS.
-     *
-     * For example if the DataArray has 10 tuples and the destTupleOffset = 5 then
-     * then source data will be copied into the destination array starting at
-     * destination tuple 5. In psuedo code it would be the following:
-     * @code
-     *  destArray[5] = sourceArray[0];
-     *  destArray[6] = sourceArray[1];
-     *  .....
-     * @endcode
-     * @param destTupleOffset
-     * @param sourceArray
-     * @return
-     */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray);
-
-    /**
-     * @brief copyData This method copies the number of tuples specified by the
-     * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
-     * into the current array starting at the target destination tuple offset value.
-     *
-     * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
-     *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
-     *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
-     * of the destination array. In psuedo code it would be the following:
-     * @code
-     *  destArray[5] = sourceArray[5];
-     *  destArray[6] = sourceArray[6];
-     *  destArray[7] = sourceArray[7];
-     *  .....
-     * @endcode
-     * @param destTupleOffset
-     * @param sourceArray
-     * @return
-     */
-    virtual bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) = 0;
-
-    /**
-     * @brief Splats the same value c across all values in the Tuple
-     * @param pos The index of the Tuple
-     * @param value pointer to value
-     */
-    virtual void initializeTuple(size_t pos, const void* value) = 0;
-
-    /**
-     * @brief Sets all the values to zero.
-     */
-    virtual void initializeWithZeros() = 0;
-
-    /**
-     * @brief Resizes the internal array
-     * @param size The new size of the internal array
-     * @return 1 on success, 0 on failure
-     */
-    virtual int32_t resizeTotalElements(size_t size) = 0;
-
-    /**
-     * @brief resize
-     * @param count
-     */
-    virtual void resizeTuples(size_t count) = 0;
-
-    /**
-     * @brief printTuple
-     * @param out
-     * @param i
-     * @param delimiter
-     */
-    virtual void printTuple(QTextStream& out, size_t i, char delimiter = ',') const = 0;
-
-    /**
-     * @brief printComponent
-     * @param out
-     * @param i
-     * @param j
-     */
-    virtual void printComponent(QTextStream& out, size_t i, int32_t j) const = 0;
-
-    /**
-     * @brief deepCopy
-     * @param forceNoAllocate
-     * @return
-     */
-    virtual IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const = 0;
-
-    /**
-     * @brief writeH5Data
-     * @param parentId
-     * @param tDims
-     * @return
-     */
-    virtual int32_t writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const = 0;
-
-    /**
-     * @brief readH5Data
-     * @param parentId
-     * @return
-     */
-    virtual int32_t readH5Data(hid_t parentId) = 0;
-
-    /**
-     * @brief writeXdmfAttribute
-     * @param out
-     * @param volDims
-     * @param hdfFileName
-     * @param groupPath
-     * @param label
-     * @return
-     */
-    virtual int32_t writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const = 0;
-
-    /**
-     * @brief getTypeAsString
-     * @return
-     */
-    virtual QString getTypeAsString() const = 0;
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    virtual QString getInfoString(SIMPL::InfoStringFormat format) const = 0;
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the current DataArray.
-     * @return
-     */
-    virtual ToolTipGenerator getToolTipGenerator() const = 0;
-
-  protected:
-
-  private:
-    IDataArray (const IDataArray&);    //Not Implemented
-    void operator=(const IDataArray&); //Not Implemented
+  IDataArray(const QString& name = "");
+  ~IDataArray() override;
 
+  virtual Pointer createNewArray(size_t numElements, int32_t rank, const size_t* dims, const QString& name, bool allocate = true) const = 0;
+  virtual Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const = 0;
+  // virtual Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) = 0;
+
+  /**
+   * @brief Creates and returns a DataArrayPath for the DataArray
+   * @return
+   */
+  DataArrayPath getDataArrayPath() const override;
+
+  virtual int32_t getClassVersion() const = 0;
+
+  /**
+   * @brief Has all the memory needed for this class been allocated?
+   */
+  virtual bool isAllocated() const = 0;
+
+  /**
+   * @brief Makes this class responsible for freeing the memory.
+   */
+  virtual void takeOwnership() = 0;
+
+  /**
+   * @brief This class will NOT free the memory associated with the internal pointer.
+   * This can be useful if the user wishes to keep the data around after this
+   * class goes out of scope.
+   */
+  virtual void releaseOwnership() = 0;
+
+  /**
+   * @brief Returns a void pointer pointing to the index of the array. nullptr
+   * pointers are entirely possible. No checks are performed to make sure
+   * the index is with in the range of the internal data array.
+   * @param i The index to have the returned pointer pointing to.
+   * @return Void Pointer. Possibly nullptr.
+   */
+  virtual void* getVoidPointer(size_t i) = 0;
+
+  /**
+   * @brief Returns the number of Tuples in the array.
+   */
+  virtual size_t getNumberOfTuples() const = 0;
+
+  /**
+   * @brief Return the number of elements in the array
+   * @return
+   */
+  virtual size_t getSize() const = 0;
+
+  virtual int32_t getNumberOfComponents() const = 0;
+  virtual std::vector<size_t> getComponentDimensions() const = 0;
+
+  /**
+   * @brief Returns the number of bytes that make up the data type.
+   * 1 = char
+   * 2 = 16 bit integer
+   * 4 = 32 bit integer/Float
+   * 8 = 64 bit integer/Double
+   */
+  virtual size_t getTypeSize() const = 0;
+
+  /**
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  virtual void getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision) const = 0;
+
+  /**
+   * @brief Erases tuples based on a list of specific Tuple indices
+   * @param idxs The indices to erase
+   * @return
+   */
+  virtual int32_t eraseTuples(const std::vector<size_t>& idxs) = 0;
+
+  /**
+   * @brief Copies a Tuple from one position to another.
+   * @param currentPos The index of the source data
+   * @param newPos The destination index to place the copied data
+   * @return
+   */
+  virtual int32_t copyTuple(size_t currentPos, size_t newPos) = 0;
+
+  /**
+   * @brief copyData This method copies all data from the <b>sourceArray</b> into
+   * the current array starting at the target destination tuple offset value.
+   *
+   * The method will check to ensure that various conditions are properly met
+   * before attempting to copy the data into the array at the give offset to avoid
+   * the possibility of walking off the end of the array into application memory
+   * or causing a General protection fault by the OS.
+   *
+   * For example if the DataArray has 10 tuples and the destTupleOffset = 5 then
+   * then source data will be copied into the destination array starting at
+   * destination tuple 5. In psuedo code it would be the following:
+   * @code
+   *  destArray[5] = sourceArray[0];
+   *  destArray[6] = sourceArray[1];
+   *  .....
+   * @endcode
+   * @param destTupleOffset
+   * @param sourceArray
+   * @return
+   */
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray);
+
+  /**
+   * @brief copyData This method copies the number of tuples specified by the
+   * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
+   * into the current array starting at the target destination tuple offset value.
+   *
+   * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
+   *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
+   *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
+   * of the destination array. In psuedo code it would be the following:
+   * @code
+   *  destArray[5] = sourceArray[5];
+   *  destArray[6] = sourceArray[6];
+   *  destArray[7] = sourceArray[7];
+   *  .....
+   * @endcode
+   * @param destTupleOffset
+   * @param sourceArray
+   * @return
+   */
+  virtual bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) = 0;
+
+  /**
+   * @brief Splats the same value c across all values in the Tuple
+   * @param pos The index of the Tuple
+   * @param value pointer to value
+   */
+  virtual void initializeTuple(size_t pos, const void* value) = 0;
+
+  /**
+   * @brief Sets all the values to zero.
+   */
+  virtual void initializeWithZeros() = 0;
+
+  /**
+   * @brief Resizes the internal array
+   * @param size The new size of the internal array
+   * @return 1 on success, 0 on failure
+   */
+  virtual int32_t resizeTotalElements(size_t size) = 0;
+
+  /**
+   * @brief resize
+   * @param count
+   */
+  virtual void resizeTuples(size_t count) = 0;
+
+  /**
+   * @brief printTuple
+   * @param out
+   * @param i
+   * @param delimiter
+   */
+  virtual void printTuple(QTextStream& out, size_t i, char delimiter = ',') const = 0;
+
+  /**
+   * @brief printComponent
+   * @param out
+   * @param i
+   * @param j
+   */
+  virtual void printComponent(QTextStream& out, size_t i, int32_t j) const = 0;
+
+  /**
+   * @brief deepCopy
+   * @param forceNoAllocate
+   * @return
+   */
+  virtual IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const = 0;
+
+  /**
+   * @brief writeH5Data
+   * @param parentId
+   * @param tDims
+   * @return
+   */
+  virtual int32_t writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const = 0;
+
+  /**
+   * @brief readH5Data
+   * @param parentId
+   * @return
+   */
+  virtual int32_t readH5Data(hid_t parentId) = 0;
+
+  /**
+   * @brief writeXdmfAttribute
+   * @param out
+   * @param volDims
+   * @param hdfFileName
+   * @param groupPath
+   * @param label
+   * @return
+   */
+  virtual int32_t writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const = 0;
+
+  /**
+   * @brief getTypeAsString
+   * @return
+   */
+  virtual QString getTypeAsString() const = 0;
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  virtual QString getInfoString(SIMPL::InfoStringFormat format) const = 0;
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  virtual ToolTipGenerator getToolTipGenerator() const = 0;
+
+protected:
+private:
+  IDataArray(const IDataArray&);     // Not Implemented
+  void operator=(const IDataArray&); // Not Implemented
 };
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp b/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
index cfcaca3554..0eeeabf77e 100644
--- a/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IDataArrayFilter.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
diff --git a/Source/SIMPLib/DataArrays/IDataArrayFilter.h b/Source/SIMPLib/DataArrays/IDataArrayFilter.h
old mode 100755
new mode 100644
index 33050fa493..f43570804e
--- a/Source/SIMPLib/DataArrays/IDataArrayFilter.h
+++ b/Source/SIMPLib/DataArrays/IDataArrayFilter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,9 +51,8 @@ class SIMPLib_EXPORT IDataArrayFilter
   int execute(IDataArray* input, IDataArray* output);
 
 public:
-  IDataArrayFilter(const IDataArrayFilter&) = delete; // Copy Constructor Not Implemented
-  IDataArrayFilter(IDataArrayFilter&&) = delete;      // Move Constructor Not Implemented
+  IDataArrayFilter(const IDataArrayFilter&) = delete;            // Copy Constructor Not Implemented
+  IDataArrayFilter(IDataArrayFilter&&) = delete;                 // Move Constructor Not Implemented
   IDataArrayFilter& operator=(const IDataArrayFilter&) = delete; // Copy Assignment Not Implemented
   IDataArrayFilter& operator=(IDataArrayFilter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
old mode 100755
new mode 100644
index 99ddf63039..4b6c3116b1
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -41,7 +41,6 @@
 #include <QtCore/QMap>
 #include <QtCore/QTextStream>
 
-
 #include "H5Support/H5Lite.h"
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Lite.h"
@@ -51,7 +50,6 @@
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
-
 /**
  * @class NeighborList NeighborList.hpp DREAM3DLib/Common/NeighborList.hpp
  * @brief Template class for wrapping raw arrays of data.
@@ -59,1076 +57,1181 @@
  * @date July 3, 2008
  * @version 1.0
  */
-template<typename T>
+template <typename T>
 class NeighborList : public IDataArray
 {
-  public:
-    using Self = NeighborList<T>;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer()
+public:
+  using Self = NeighborList<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
+
+  using value_type = T;
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return QString("NeighborList<T>");
+  }
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return QString("NeighborList<T>");
+  }
+
+  /**
+   * @brief Returns the version of this class.
+   * @return
+   */
+  int32_t getClassVersion() const override
+  {
+    return 2;
+  }
+
+  void setNumNeighborsArrayName(const QString& name)
+  {
+    m_NumNeighborsArrayName = name;
+  }
+
+  QString getNumNeighborsArrayName()
+  {
+    return m_NumNeighborsArrayName;
+  }
+
+  static Pointer New()
+  {
+    return CreateArray(0, "NeighborList", false);
+  }
+
+  /**
+   * @brief CreateArray
+   * @param numTuples
+   * @param name
+   * @param allocate
+   * @return
+   */
+  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true)
+  {
+    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+    if(name.isEmpty())
     {
-      return Pointer(static_cast<Self*>(nullptr));
+      return NullPointer();
     }
-
-    using value_type = T;
-
-    /**
-     * @brief Returns the name of the class for AbstractMessage
-     */
-    QString getNameOfClass() const override
+    Pointer ptr = Pointer(new NeighborList<T>(numTuples, name));
+    if(allocate)
     {
-      return QString("NeighborList<T>");
+      ptr->resizeTuples(numTuples);
     }
-    /**
-     * @brief Returns the name of the class for AbstractMessage
-     */
-    static QString ClassName()
+    return ptr;
+  }
+
+  /**
+   * @brief CreateArray
+   * @param numTuples
+   * @param rank
+   * @param dims
+   * @param name
+   * @param allocate
+   * @return
+   */
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
+  {
+    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+    if(name.isEmpty())
     {
-      return QString("NeighborList<T>");
+      return NullPointer();
     }
 
-    /**
-     * @brief Returns the version of this class.
-     * @return
-     */
-    int32_t getClassVersion() const override
+    size_t numElements = numTuples;
+    for(int iter = 0; iter < rank; iter++)
     {
-      return 2;
+      numElements *= dims[iter];
     }
-
-    void setNumNeighborsArrayName(const QString& name)
+    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+    if(allocate)
     {
-      m_NumNeighborsArrayName = name;
+      ptr->resizeTuples(numElements);
     }
-
-    QString getNumNeighborsArrayName()
+    return ptr;
+  }
+
+  /**
+   * @brief CreateArray
+   * @param numTuples
+   * @param cDims
+   * @param name
+   * @param allocate
+   * @return
+   */
+  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
     {
-      return m_NumNeighborsArrayName;
+      return NullPointer();
     }
+    size_t numElements = std::accumulate(cDims.begin(), cDims.end(), numTuples, std::multiplies<>());
 
-    static Pointer New()
+    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+    if(allocate)
     {
-      return CreateArray(0, "NeighborList", false);
+      ptr->resizeTuples(numElements);
     }
-
-    /**
-     * @brief CreateArray
-     * @param numTuples
-     * @param name
-     * @param allocate
-     * @return
-     */
-    static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true)
+    return ptr;
+  }
+
+  /**
+   * @brief CreateArray
+   * @param numTuples
+   * @param cDims
+   * @param name
+   * @param allocate
+   * @return
+   */
+  //    static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true)
+  //    {
+  //      if(name.isEmpty())
+  //      {
+  //        return NullPointer();
+  //      }
+  //      size_t numElements = numTuples;
+  //      for(int iter = 0; iter < cDims.size(); iter++)
+  //      {
+  //        numElements *= cDims[iter];
+  //      }
+  //      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+  //      if(allocate)
+  //      {
+  //        ptr->resizeTuples(numElements);
+  //      }
+  //      return ptr;
+  //    }
+
+  /**
+   * @brief CreateArray
+   * @param tDims
+   * @param cDims
+   * @param name
+   * @param allocate
+   * @return
+   */
+  static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
     {
-      //std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-      Pointer ptr = Pointer(new NeighborList<T>(numTuples, name));
-      if(allocate)
-      {
-        ptr->resizeTuples(numTuples);
-      }
-      return ptr;
-    }
-
-    /**
-     * @brief CreateArray
-     * @param numTuples
-     * @param rank
-     * @param dims
-     * @param name
-     * @param allocate
-     * @return
-     */
-    static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
-    {
-      //std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-
-      size_t numElements = numTuples;
-      for(int iter = 0; iter < rank; iter++)
-      {
-        numElements *= dims[iter];
-      }
-      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-      if(allocate)
-      {
-        ptr->resizeTuples(numElements);
-      }
-      return ptr;
+      return NullPointer();
     }
-
-    /**
-     * @brief CreateArray
-     * @param numTuples
-     * @param cDims
-     * @param name
-     * @param allocate
-     * @return
-     */
-    static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
+    size_t numElements = tDims[0];
+    for(int iter = 1; iter < tDims.size(); iter++)
     {
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-      size_t numElements = std::accumulate(cDims.begin(), cDims.end(), numTuples, std::multiplies<>());
-
-      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-      if(allocate)
-      {
-        ptr->resizeTuples(numElements);
-      }
-      return ptr;
-    }
-
-    /**
-     * @brief CreateArray
-     * @param numTuples
-     * @param cDims
-     * @param name
-     * @param allocate
-     * @return
-     */
-    //    static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true)
-    //    {
-    //      if(name.isEmpty())
-    //      {
-    //        return NullPointer();
-    //      }
-    //      size_t numElements = numTuples;
-    //      for(int iter = 0; iter < cDims.size(); iter++)
-    //      {
-    //        numElements *= cDims[iter];
-    //      }
-    //      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-    //      if(allocate)
-    //      {
-    //        ptr->resizeTuples(numElements);
-    //      }
-    //      return ptr;
-    //    }
-
-    /**
-     * @brief CreateArray
-     * @param tDims
-     * @param cDims
-     * @param name
-     * @param allocate
-     * @return
-     */
-    static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
-    {
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-      size_t numElements = tDims[0];
-      for(int iter = 1; iter < tDims.size(); iter++)
-      {
-        numElements *= tDims[iter];
-      }
-      for(int iter = 0; iter < cDims.size(); iter++)
-      {
-        numElements *= cDims[iter];
-      }
-      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-      if(allocate)
-      {
-        ptr->resizeTuples(numElements);
-      }
-      return ptr;
+      numElements *= tDims[iter];
     }
-
-    /**
-     * @brief createNewArray
-     * @param numElements
-     * @param rank
-     * @param dims
-     * @param name
-     * @return
-     */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
+    for(int iter = 0; iter < cDims.size(); iter++)
     {
-      return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
+      numElements *= cDims[iter];
     }
-
-    /**
-     * @brief createNewArray
-     * @param numElements
-     * @param dims
-     * @param name
-     * @return
-     */
-    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
+    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+    if(allocate)
     {
-      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
+      ptr->resizeTuples(numElements);
     }
-
-    /**
-     * @brief createNewArray
-     * @param numElements
-     * @param dims
-     * @param name
-     * @return
-     */
-    //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
-    //    {
-    //      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
-    //    }
-
-    using VectorType = std::vector<T>;
-    using SharedVectorType = std::shared_ptr<VectorType>;
-
-    // -----------------------------------------------------------------------------
-    ~NeighborList() override = default;
-
-    /**
-     * @brief isAllocated
-     * @return
-     */
-    bool isAllocated() const override { return true; }
-
-    /**
-     * @brief Gives this array a human readable name
-     * @param name The name of this array
-     */
-    virtual void setInitValue(T initValue)
+    return ptr;
+  }
+
+  /**
+   * @brief createNewArray
+   * @param numElements
+   * @param rank
+   * @param dims
+   * @param name
+   * @return
+   */
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
+  {
+    return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
+  }
+
+  /**
+   * @brief createNewArray
+   * @param numElements
+   * @param dims
+   * @param name
+   * @return
+   */
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
+  {
+    return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
+  }
+
+  /**
+   * @brief createNewArray
+   * @param numElements
+   * @param dims
+   * @param name
+   * @return
+   */
+  //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
+  //    {
+  //      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
+  //    }
+
+  using VectorType = std::vector<T>;
+  using SharedVectorType = std::shared_ptr<VectorType>;
+
+  // -----------------------------------------------------------------------------
+  ~NeighborList() override = default;
+
+  /**
+   * @brief isAllocated
+   * @return
+   */
+  bool isAllocated() const override
+  {
+    return true;
+  }
+
+  /**
+   * @brief Gives this array a human readable name
+   * @param name The name of this array
+   */
+  virtual void setInitValue(T initValue)
+  {
+    m_InitValue = initValue;
+  }
+
+  /**
+   * @brief Sets all the values to value.
+   */
+  virtual void initializeWithValue(T initValue, size_t offset = 0)
+  {
+  }
+
+  /**
+   * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
+  {
+    T value = 0x00;
+    xdmfTypeName = "UNKNOWN";
+    precision = 0;
+    if(typeid(value) == typeid(int8_t))
     {
-      m_InitValue = initValue;
+      xdmfTypeName = "Char";
+      precision = 1;
     }
-
-    /**
-     * @brief Sets all the values to value.
-     */
-    virtual void initializeWithValue(T initValue, size_t offset = 0)
+    if(typeid(value) == typeid(uint8_t))
     {
-
+      xdmfTypeName = "UChar";
+      precision = 1;
     }
 
-    /**
-     * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
+    if(typeid(value) == typeid(int16_t))
     {
-      T value = 0x00;
-      xdmfTypeName = "UNKNOWN";
+      xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
+      precision = 0;
+    }
+    if(typeid(value) == typeid(uint16_t))
+    {
+      xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
       precision = 0;
-      if (typeid(value) == typeid(int8_t)) { xdmfTypeName = "Char"; precision = 1;}
-      if (typeid(value) == typeid(uint8_t)) { xdmfTypeName = "UChar"; precision = 1;}
-
-      if (typeid(value) == typeid(int16_t)) { xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF"; precision = 0;}
-      if (typeid(value) == typeid(uint16_t)) { xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF"; precision = 0;}
-
-      if (typeid(value) == typeid(int32_t)) { xdmfTypeName = "Int"; precision = 4;}
-      if (typeid(value) == typeid(uint32_t)) { xdmfTypeName = "UInt"; precision = 4;}
-
-      if (typeid(value) == typeid(int64_t)) { xdmfTypeName = "Int"; precision = 8;}
-      if (typeid(value) == typeid(uint64_t)) { xdmfTypeName = "UInt"; precision = 8;}
-
-      if (typeid(value) == typeid(float)) { xdmfTypeName = "Float"; precision = 4;}
-      if (typeid(value) == typeid(double)) { xdmfTypeName = "Float"; precision = 8;}
-
-      if (typeid(value) == typeid(bool)) { xdmfTypeName = "uchar"; precision = 1;}
     }
 
+    if(typeid(value) == typeid(int32_t))
+    {
+      xdmfTypeName = "Int";
+      precision = 4;
+    }
+    if(typeid(value) == typeid(uint32_t))
+    {
+      xdmfTypeName = "UInt";
+      precision = 4;
+    }
 
-    /**
-     * @brief getTypeAsString
-     * @return
-     */
-    QString getTypeAsString() const override { return NeighborList<T>::ClassName();}
+    if(typeid(value) == typeid(int64_t))
+    {
+      xdmfTypeName = "Int";
+      precision = 8;
+    }
+    if(typeid(value) == typeid(uint64_t))
+    {
+      xdmfTypeName = "UInt";
+      precision = 8;
+    }
 
-    /**
-     * @brief takeOwnership
-     */
-    void takeOwnership() override {    }
+    if(typeid(value) == typeid(float))
+    {
+      xdmfTypeName = "Float";
+      precision = 4;
+    }
+    if(typeid(value) == typeid(double))
+    {
+      xdmfTypeName = "Float";
+      precision = 8;
+    }
 
-    /**
-     * @brief releaseOwnership
-     */
-    void releaseOwnership() override  { }
+    if(typeid(value) == typeid(bool))
+    {
+      xdmfTypeName = "uchar";
+      precision = 1;
+    }
+  }
+
+  /**
+   * @brief getTypeAsString
+   * @return
+   */
+  QString getTypeAsString() const override
+  {
+    return NeighborList<T>::ClassName();
+  }
+
+  /**
+   * @brief takeOwnership
+   */
+  void takeOwnership() override
+  {
+  }
+
+  /**
+   * @brief releaseOwnership
+   */
+  void releaseOwnership() override
+  {
+  }
+
+  /**
+   * @brief getVoidPointer
+   * @param i
+   * @return
+   */
+  void* getVoidPointer(size_t i) override
+  {
+    return nullptr;
+  }
+
+  /**
+   * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
+   * vector is greater than or Equal to the number of Tuples then the Array is Resized to Zero. If there are
+   * indices that are larger than the size of the original (before erasing operations) then an error code (-100) is
+   * returned from the program.
+   * @param idxs The indices to remove
+   * @return error code.
+   */
+  int eraseTuples(const std::vector<size_t>& idxs) override
+  {
+    int err = 0;
+    // If nothing is to be erased just return
+    if(idxs.empty())
+    {
+      return 0;
+    }
 
-    /**
-     * @brief getVoidPointer
-     * @param i
-     * @return
-     */
-    void* getVoidPointer(size_t i) override { return nullptr; }
+    size_t idxsSize = static_cast<size_t>(idxs.size());
+    if(idxsSize >= getNumberOfTuples())
+    {
+      resizeTuples(0);
+      return 0;
+    }
 
-    /**
-     * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
-     * vector is greater than or Equal to the number of Tuples then the Array is Resized to Zero. If there are
-     * indices that are larger than the size of the original (before erasing operations) then an error code (-100) is
-     * returned from the program.
-     * @param idxs The indices to remove
-     * @return error code.
-     */
-    int eraseTuples(const std::vector<size_t>& idxs) override
+    size_t arraySize = m_Array.size();
+    // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
+    // off the end of the array and return an error code.
+    for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
     {
-      int err = 0;
-      // If nothing is to be erased just return
-      if(idxs.empty())
+      if(idxs[i] >= arraySize)
       {
-        return 0;
+        return -100;
       }
+    }
 
-      size_t idxsSize = static_cast<size_t>(idxs.size());
-      if (idxsSize >= getNumberOfTuples() )
-      {
-        resizeTuples(0);
-        return 0;
-      }
+    std::vector<SharedVectorType> replacement(arraySize - idxsSize);
 
-      size_t arraySize = m_Array.size();
-      // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
-      // off the end of the array and return an error code.
-      for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+    size_t idxsIndex = 0;
+    size_t rIdx = 0;
+    for(size_t dIdx = 0; dIdx < arraySize; ++dIdx)
+    {
+      if(dIdx != idxs[idxsIndex])
       {
-        if (idxs[i] >= arraySize) { return -100; }
+        replacement[rIdx] = m_Array[dIdx];
+        ++rIdx;
       }
-
-      std::vector<SharedVectorType> replacement(arraySize - idxsSize);
-
-      size_t idxsIndex = 0;
-      size_t rIdx = 0;
-      for(size_t dIdx = 0; dIdx < arraySize; ++dIdx)
+      else
       {
-        if (dIdx != idxs[idxsIndex])
-        {
-          replacement[rIdx] = m_Array[dIdx];
-          ++rIdx;
-        }
-        else
+        ++idxsIndex;
+        if(idxsIndex == idxsSize)
         {
-          ++idxsIndex;
-          if (idxsIndex == idxsSize ) { idxsIndex--;}
+          idxsIndex--;
         }
       }
-      m_Array = replacement;
-      m_NumTuples = m_Array.size();
-      return err;
     }
-
-    /**
-     * @brief copyTuple
-     * @param currentPos
-     * @param newPos
-     * @return
-     */
-    int copyTuple(size_t currentPos, size_t newPos) override
+    m_Array = replacement;
+    m_NumTuples = m_Array.size();
+    return err;
+  }
+
+  /**
+   * @brief copyTuple
+   * @param currentPos
+   * @param newPos
+   * @return
+   */
+  int copyTuple(size_t currentPos, size_t newPos) override
+  {
+    m_Array[newPos] = m_Array[currentPos];
+    return 0;
+  }
+
+  // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
+  // This is required so that other classes can call this version of copyData from the subclasses.
+  using IDataArray::copyFromArray;
+
+  /**
+   * @brief copyData This method copies the number of tuples specified by the
+   * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
+   * into the current array starting at the target destination tuple offset value.
+   *
+   * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
+   *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
+   *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
+   * of the destination array. In psuedo code it would be the following:
+   * @code
+   *  destArray[5] = sourceArray[5];
+   *  destArray[6] = sourceArray[6];
+   *  destArray[7] = sourceArray[7];
+   *  .....
+   * @endcode
+   * @param destTupleOffset
+   * @param sourceArray
+   * @return
+   */
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
+  {
+    if(!m_IsAllocated)
     {
-      m_Array[newPos] = m_Array[currentPos];
-      return 0;
+      return false;
     }
+    if(destTupleOffset >= m_Array.size())
+    {
+      return false;
+    }
+    if(!sourceArray->isAllocated())
+    {
+      return false;
+    }
+    const Self* source = dynamic_cast<const Self*>(sourceArray.get());
 
-    // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
-    // This is required so that other classes can call this version of copyData from the subclasses.
-    using IDataArray::copyFromArray;
-
-    /**
-     * @brief copyData This method copies the number of tuples specified by the
-     * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
-     * into the current array starting at the target destination tuple offset value.
-     *
-     * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
-     *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
-     *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
-     * of the destination array. In psuedo code it would be the following:
-     * @code
-     *  destArray[5] = sourceArray[5];
-     *  destArray[6] = sourceArray[6];
-     *  destArray[7] = sourceArray[7];
-     *  .....
-     * @endcode
-     * @param destTupleOffset
-     * @param sourceArray
-     * @return
-     */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
-    {
-      if(!m_IsAllocated) { return false; }
-      if(destTupleOffset >= m_Array.size() ) { return false; }
-      if(!sourceArray->isAllocated()) { return false; }
-      const Self* source = dynamic_cast<const Self*>(sourceArray.get());
-
-      if(source == nullptr)
-      {
-        return false;
-      }
-
-      if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
-      {
-        return false;
-      }
-
-      if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
-      {
-        return false;
-      }
-
-      if(totalSrcTuples * sourceArray->getNumberOfComponents() + destTupleOffset * getNumberOfComponents() > m_Array.size())
-      {
-        return false;
-      }
-
-      for(size_t i = srcTupleOffset; i < srcTupleOffset + totalSrcTuples; i++)
-      {
-        m_Array[destTupleOffset + i] = source->getList(i);
-      }
-      return true;
-
-      //      if(!m_IsAllocated) { return false; }
-      //      if(nullptr == m_Array) { return false; }
-      //      if(destTupleOffset > m_MaxId) { return false; }
-      //      if(!sourceArray->isAllocated()) { return false; }
-      //      Self* source = dynamic_cast<Self*>(sourceArray.get());
-      //      if(nullptr == source->getPointer(0)) { return false; }
-
-      //      if(sourceArray->getNumberOfComponents() != getNumberOfComponents()) { return false; }
-
-      //      if (srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples()) { return false; }
-
-      //      if( totalSrcTuples*sourceArray->getNumberOfComponents() + destTupleOffset*getNumberOfComponents() > m_Size) { return false; }
+    if(source == nullptr)
+    {
+      return false;
+    }
 
-      //      size_t elementStart = destTupleOffset*getNumberOfComponents();
-      //      size_t totalBytes = (totalSrcTuples*sourceArray->getNumberOfComponents()) * sizeof(T);
-      //      std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * sourceArray->getNumberOfComponents()), totalBytes);
-      //      return true;
+    if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
+    {
+      return false;
     }
 
+    if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
+    {
+      return false;
+    }
 
-    /**
-     * @brief Splats the same value c across all values in the Tuple
-     * @param i The index of the Tuple
-     * @param c The value to splat across all components in the tuple
-     */
-    void initializeTuple(size_t i, const void* p) override
+    if(totalSrcTuples * sourceArray->getNumberOfComponents() + destTupleOffset * getNumberOfComponents() > m_Array.size())
     {
-      Q_UNUSED(i);
-      Q_UNUSED(p);
-      Q_ASSERT(false);
+      return false;
     }
 
-    /**
-     * @brief Returns the number of elements in the internal array.
-     */
-    size_t getNumberOfTuples() const override
+    for(size_t i = srcTupleOffset; i < srcTupleOffset + totalSrcTuples; i++)
+    {
+      m_Array[destTupleOffset + i] = source->getList(i);
+    }
+    return true;
+
+    //      if(!m_IsAllocated) { return false; }
+    //      if(nullptr == m_Array) { return false; }
+    //      if(destTupleOffset > m_MaxId) { return false; }
+    //      if(!sourceArray->isAllocated()) { return false; }
+    //      Self* source = dynamic_cast<Self*>(sourceArray.get());
+    //      if(nullptr == source->getPointer(0)) { return false; }
+
+    //      if(sourceArray->getNumberOfComponents() != getNumberOfComponents()) { return false; }
+
+    //      if (srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples()) { return false; }
+
+    //      if( totalSrcTuples*sourceArray->getNumberOfComponents() + destTupleOffset*getNumberOfComponents() > m_Size) { return false; }
+
+    //      size_t elementStart = destTupleOffset*getNumberOfComponents();
+    //      size_t totalBytes = (totalSrcTuples*sourceArray->getNumberOfComponents()) * sizeof(T);
+    //      std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * sourceArray->getNumberOfComponents()), totalBytes);
+    //      return true;
+  }
+
+  /**
+   * @brief Splats the same value c across all values in the Tuple
+   * @param i The index of the Tuple
+   * @param c The value to splat across all components in the tuple
+   */
+  void initializeTuple(size_t i, const void* p) override
+  {
+    Q_UNUSED(i);
+    Q_UNUSED(p);
+    Q_ASSERT(false);
+  }
+
+  /**
+   * @brief Returns the number of elements in the internal array.
+   */
+  size_t getNumberOfTuples() const override
+  {
+    return m_NumTuples;
+  }
+
+  /**
+   * @brief getSize Returns the total number of data items that are being stored. This is the sum of all the sizes
+   * of the internal storage arrays for this class.
+   * @return
+   */
+  size_t getSize() const override
+  {
+    size_t total = 0;
+    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
     {
-      return m_NumTuples;
+      total += m_Array[dIdx]->size();
+    }
+    return total;
+  }
+
+  /**
+   * @brief setNumberOfComponents
+   * @param nc
+   */
+  void setNumberOfComponents(int nc)
+  {
+  }
+
+  /**
+   * @brief getNumberOfComponents
+   * @return
+   */
+  int getNumberOfComponents() const override
+  {
+    return 1;
+  }
+
+  /**
+   * @brief getComponentDimensions
+   * @return
+   */
+  std::vector<size_t> getComponentDimensions() const override
+  {
+    std::vector<size_t> dims = {1};
+    return dims;
+  }
+
+  /**
+   * @brief SetRank
+   * @param rnk
+   */
+  void SetRank(int rnk)
+  {
+  }
+
+  /**
+   * @brief getRank
+   * @return
+   */
+  int getRank() const
+  {
+    return 1;
+  }
+
+  /**
+   * @brief getTypeSize
+   * @return
+   */
+  size_t getTypeSize() const override
+  {
+    return sizeof(SharedVectorType);
+  }
+
+  /**
+   * @brief initializeWithZeros
+   */
+  void initializeWithZeros() override
+  {
+    m_Array.clear();
+    m_IsAllocated = false;
+  }
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
+  {
+    bool allocate = m_IsAllocated;
+    if(forceNoAllocate)
+    {
+      allocate = false;
     }
 
+    typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), allocate);
 
-    /**
-     * @brief getSize Returns the total number of data items that are being stored. This is the sum of all the sizes
-     * of the internal storage arrays for this class.
-     * @return
-     */
-    size_t getSize() const override
+    if(m_IsAllocated && !forceNoAllocate)
     {
-      size_t total = 0;
-      for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+      size_t count = (m_IsAllocated ? getNumberOfTuples() : 0);
+      for(size_t i = 0; i < count; i++)
       {
-        total += m_Array[dIdx]->size();
+        typename NeighborList<T>::SharedVectorType sharedNeiLst(new std::vector<T>(*(m_Array[i])));
+        daCopyPtr->setList(static_cast<int>(i), sharedNeiLst);
       }
-      return total;
-    }
-
-    /**
-     * @brief setNumberOfComponents
-     * @param nc
-     */
-    void setNumberOfComponents(int nc) { }
-
-    /**
-     * @brief getNumberOfComponents
-     * @return
-     */
-    int getNumberOfComponents() const override { return 1; }
-
-    /**
-     * @brief getComponentDimensions
-     * @return
-     */
-    std::vector<size_t> getComponentDimensions() const override
-    {
-      std::vector<size_t> dims = {1};
-      return dims;
-    }
-
-    /**
-     * @brief SetRank
-     * @param rnk
-     */
-    void SetRank(int rnk) { }
-
-    /**
-     * @brief getRank
-     * @return
-     */
-    int getRank() const { return 1; }
-
-    /**
-     * @brief getTypeSize
-     * @return
-     */
-    size_t getTypeSize() const override  { return sizeof(SharedVectorType); }
-
-    /**
-     * @brief initializeWithZeros
-     */
-    void initializeWithZeros() override {
-      m_Array.clear();
+    }
+    return daCopyPtr;
+  }
+
+  /**
+   * @brief resizeTotalElements
+   * @param size
+   * @return
+   */
+  int32_t resizeTotalElements(size_t size) override
+  {
+    // std::cout << "NeighborList::resizeTotalElements(" << size << ")" << std::endl;
+    size_t old = m_Array.size();
+    m_Array.resize(size);
+    m_NumTuples = size;
+    if(size == 0)
+    {
       m_IsAllocated = false;
     }
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
+    else
     {
-      bool allocate = m_IsAllocated;
-      if(forceNoAllocate)
-      {
-        allocate = false;
-      }
-
-      typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), allocate);
-
-      if(m_IsAllocated && !forceNoAllocate)
-      {
-        size_t count = (m_IsAllocated ? getNumberOfTuples(): 0);
-        for(size_t i = 0; i < count; i++)
-        {
-          typename NeighborList<T>::SharedVectorType sharedNeiLst(new std::vector<T>(*(m_Array[i])));
-          daCopyPtr->setList(static_cast<int>(i), sharedNeiLst);
-        }
-      }
-      return daCopyPtr;
+      m_IsAllocated = true;
     }
-
-    /**
-     * @brief resizeTotalElements
-     * @param size
-     * @return
-     */
-    int32_t resizeTotalElements(size_t size) override
+    // Initialize with zero length Vectors
+    for(size_t i = old; i < m_Array.size(); ++i)
     {
-      //std::cout << "NeighborList::resizeTotalElements(" << size << ")" << std::endl;
-      size_t old = m_Array.size();
-      m_Array.resize(size);
-      m_NumTuples = size;
-      if (size == 0) { m_IsAllocated = false; }
-      else { m_IsAllocated = true; }
-      // Initialize with zero length Vectors
-      for (size_t i = old; i < m_Array.size(); ++i)
-      {
-        m_Array[i] = SharedVectorType(new VectorType);
-      }
-      return 1;
+      m_Array[i] = SharedVectorType(new VectorType);
     }
-
-    /**
-     * @brief Resizes the internal array to accomondate numTuples
-     * @param numTuples
-     */
-    void resizeTuples(size_t numTuples) override
+    return 1;
+  }
+
+  /**
+   * @brief Resizes the internal array to accomondate numTuples
+   * @param numTuples
+   */
+  void resizeTuples(size_t numTuples) override
+  {
+    resizeTotalElements(numTuples);
+  }
+
+  // FIXME: These need to be implemented
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
+  {
+    SharedVectorType sharedVec = m_Array[i];
+    VectorType* vec = sharedVec.get();
+    size_t size = vec->size();
+    out << size;
+    for(size_t j = 0; j < size; j++)
     {
-      resizeTotalElements(numTuples);
+      out << delimiter << vec->at(j);
     }
-
-    //FIXME: These need to be implemented
-    void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
+  }
+
+  /**
+   * @brief printComponent
+   * @param out
+   * @param i
+   * @param j
+   */
+  void printComponent(QTextStream& out, size_t i, int j) const override
+  {
+    Q_ASSERT(false);
+  }
+
+  /**
+   *
+   * @param parentId
+   * @return
+   */
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+  {
+    int err = 0;
+
+    // Generate the NumNeighbors array and also compute the total number
+    // of elements that would be needed to flatten the array so we
+    // can compare this with what is written in the file. If they are
+    // different we are going to overwrite what is in the file with what
+    // we compute here.
+
+    QString numNeighborsArrayName = m_NumNeighborsArrayName;
+
+    if(numNeighborsArrayName.isEmpty())
     {
-      SharedVectorType sharedVec = m_Array[i];
-      VectorType* vec = sharedVec.get();
-      size_t size = vec->size();
-      out << size;
-      for(size_t j = 0; j < size; j++)
-      {
-        out << delimiter << vec->at(j);
-      }
+      numNeighborsArrayName = getName() + "_NumNeighbors";
     }
 
-    /**
-     * @brief printComponent
-     * @param out
-     * @param i
-     * @param j
-     */
-    void printComponent(QTextStream& out, size_t i, int j) const override
+    Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), numNeighborsArrayName, true);
+    int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
+    size_t total = 0;
+    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
     {
-      Q_ASSERT(false);
+      numNeighbors[dIdx] = static_cast<int32_t>(m_Array[dIdx]->size());
+      total += m_Array[dIdx]->size();
     }
 
-    /**
-     *
-     * @param parentId
-     * @return
-     */
-    int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+    // Check to see if the NumNeighbors is already written to the file
+    bool rewrite = false;
+    if(!QH5Lite::datasetExists(parentId, numNeighborsArrayName))
     {
-      int err = 0;
-
-      // Generate the NumNeighbors array and also compute the total number
-      // of elements that would be needed to flatten the array so we
-      // can compare this with what is written in the file. If they are
-      // different we are going to overwrite what is in the file with what
-      // we compute here.
-
-      QString numNeighborsArrayName = m_NumNeighborsArrayName;
-
-      if(numNeighborsArrayName.isEmpty())
-      {
-        numNeighborsArrayName = getName() + "_NumNeighbors";
-      }
-
-      Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), numNeighborsArrayName, true);
-      int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
-      size_t total = 0;
-      for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+      // The NumNeighbors Array is NOT already in the file so write it to the file
+      numNeighborsPtr->writeH5Data(parentId, tDims);
+    }
+    else
+    {
+      // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
+      // we have in memory.
+      std::vector<int32_t> fileNumNeigh(m_Array.size());
+      err = H5Lite::readVectorDataset(parentId, numNeighborsArrayName.toStdString(), fileNumNeigh);
+      if(err < 0)
       {
-        numNeighbors[dIdx] = static_cast<int32_t>(m_Array[dIdx]->size());
-        total += m_Array[dIdx]->size();
+        return -602;
       }
 
-      // Check to see if the NumNeighbors is already written to the file
-      bool rewrite = false;
-      if(!QH5Lite::datasetExists(parentId, numNeighborsArrayName))
+      // Compare the 2 vectors to make sure they are exactly the same;
+      if(fileNumNeigh.size() != numNeighborsPtr->getNumberOfTuples())
       {
-        // The NumNeighbors Array is NOT already in the file so write it to the file
-        numNeighborsPtr->writeH5Data(parentId, tDims);
+        rewrite = true;
       }
-      else
+      // The sizes are the same, now compare each value;
+      int32_t* fileNumNeiPtr = &(fileNumNeigh.front());
+      size_t nBytes = numNeighborsPtr->getNumberOfTuples() * sizeof(int32_t);
+      if(::memcmp(numNeighbors, fileNumNeiPtr, nBytes) != 0)
       {
-        // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
-        // we have in memory.
-        std::vector<int32_t> fileNumNeigh(m_Array.size());
-        err = H5Lite::readVectorDataset(parentId, numNeighborsArrayName.toStdString(), fileNumNeigh);
-        if (err < 0)
-        {
-          return -602;
-        }
-
-        // Compare the 2 vectors to make sure they are exactly the same;
-        if (fileNumNeigh.size() != numNeighborsPtr->getNumberOfTuples())
-        {
-          rewrite = true;
-        }
-        // The sizes are the same, now compare each value;
-        int32_t* fileNumNeiPtr = &(fileNumNeigh.front());
-        size_t nBytes = numNeighborsPtr->getNumberOfTuples() * sizeof(int32_t);
-        if (::memcmp(numNeighbors, fileNumNeiPtr, nBytes) != 0)
-        {
-          rewrite = true;
-        }
+        rewrite = true;
       }
+    }
 
-      // Write out the NumNeighbors Array because something was different between what we computed at
-      // the top of the function versus what is in memory
-      if(rewrite)
-      {
-        numNeighborsPtr->writeH5Data(parentId, tDims);
-      }
+    // Write out the NumNeighbors Array because something was different between what we computed at
+    // the top of the function versus what is in memory
+    if(rewrite)
+    {
+      numNeighborsPtr->writeH5Data(parentId, tDims);
+    }
 
-      // Allocate an array of the proper size so we can concatenate all the arrays together into a single array that
-      // can be written to the HDF5 File. This operation can ballon the memory size temporarily until this operation
-      // is complete.
-      QVector<T> flat (total);
-      size_t currentStart = 0;
-      for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+    // Allocate an array of the proper size so we can concatenate all the arrays together into a single array that
+    // can be written to the HDF5 File. This operation can ballon the memory size temporarily until this operation
+    // is complete.
+    QVector<T> flat(total);
+    size_t currentStart = 0;
+    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+    {
+      size_t nEle = m_Array[dIdx]->size();
+      if(nEle == 0)
       {
-        size_t nEle = m_Array[dIdx]->size();
-        if(nEle == 0)
-        {
-          continue;
-        }
-        T* start = m_Array[dIdx]->data(); // get the pointer to the front of the array
-        //    T* end = start + nEle; // get the pointer to the end of the array
-        T* dst = flat.data() + currentStart;
-        ::memcpy(dst, start, nEle * sizeof(T));
-
-        currentStart += m_Array[dIdx]->size();
+        continue;
       }
+      T* start = m_Array[dIdx]->data(); // get the pointer to the front of the array
+      //    T* end = start + nEle; // get the pointer to the end of the array
+      T* dst = flat.data() + currentStart;
+      ::memcpy(dst, start, nEle * sizeof(T));
 
-      // Now we can actually write the actual array data.
-      int32_t rank = 1;
-      hsize_t dims[1] = { total };
-      if (total > 0)
-      {
-        err = QH5Lite::writePointerDataset(parentId, getName(), rank, dims, flat.data());
-        if(err < 0)
-        {
-          return -605;
-        }
-
-        err = QH5Lite::writeScalarAttribute(parentId, getName(), SIMPL::HDF5::DataArrayVersion, getClassVersion());
-        if(err < 0)
-        {
-          return -604;
-        }
-        err = QH5Lite::writeStringAttribute(parentId, getName(), SIMPL::HDF5::ObjectType, getNameOfClass());
-        if(err < 0)
-        {
-          return -607;
-        }
-
-        // Write the tuple dimensions as an attribute
-        hsize_t size = tDims.size();
-        err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
-        if (err < 0)
-        {
-          return -609;
-        }
-
-        std::vector<size_t> cDims = getComponentDimensions();
-        // write the component dimensions as  an attribute
-        size = cDims.size();
-        err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
-        if (err < 0)
-        {
-          return -610;
-        }
-
-        err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
-        if(err < 0)
-        {
-          return -608;
-        }
-      }
-      return err;
+      currentStart += m_Array[dIdx]->size();
     }
 
-    /**
-     * @brief writeXdmfAttribute
-     * @param out
-     * @param volDims
-     * @param hdfFileName
-     * @param groupPath
-     * @return
-     */
-    int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName,
-                                   const QString& groupPath, const QString& label) const override
-    {
-      int precision = 0;
-      QString xdmfTypeName;
-      getXdmfTypeAndSize(xdmfTypeName, precision);
-
-      out << "    <Attribute Name=\"" << getName() << label << "\" AttributeType=\"Scalar\" Center=\"Node\">";
-      out << "      <DataItem Format=\"HDF\" Dimensions=\"" << volDims[0] << " " << volDims[1] << " " << volDims[2] << "\" ";
-      out << "NumberType=\"" << xdmfTypeName << "\" " << "Precision=\"" << precision << "\" >";
-      out << "        " << hdfFileName.toLatin1().data() << groupPath.toLatin1().data() << "/" << getName();
-      out << "      </DataItem>";
-      out << "    </Attribute>";
-      return 1;
-    }
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the current DataArray.
-     * @return
-     */
-    ToolTipGenerator getToolTipGenerator() const override
-    {
-      ToolTipGenerator toolTipGen;
-      QLocale usa(QLocale::English, QLocale::UnitedStates);
-
-      toolTipGen.addTitle("Attribute Array Info");
-      toolTipGen.addValue("Name", getName());
-      toolTipGen.addValue("Type", getTypeAsString());
-      toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
-      toolTipGen.addValue("Number of Lists", usa.toString(static_cast<qlonglong>(getNumberOfLists())));
-
-      return toolTipGen;
-    }
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    QString getInfoString(SIMPL::InfoStringFormat format) const override
-    {
-      if(format == SIMPL::HtmlFormat)
-      {
-        return getToolTipGenerator().generateHTML();
-      }
-      else
+    // Now we can actually write the actual array data.
+    int32_t rank = 1;
+    hsize_t dims[1] = {total};
+    if(total > 0)
+    {
+      err = QH5Lite::writePointerDataset(parentId, getName(), rank, dims, flat.data());
+      if(err < 0)
       {
-
+        return -605;
       }
-      return QString();
-    }
-    /**
-     *
-     * @param parentId
-     * @return
-     */
-    int readH5Data(hid_t parentId) override
-    {
-      int err = 0;
 
-      std::vector<T> flat;
-      err = QH5Lite::readVectorDataset(parentId, getName(), flat);
+      err = QH5Lite::writeScalarAttribute(parentId, getName(), SIMPL::HDF5::DataArrayVersion, getClassVersion());
       if(err < 0)
       {
-        return err;
+        return -604;
       }
-
-      QString numNeighborsArrayName = m_NumNeighborsArrayName;
-
-      if(numNeighborsArrayName.isEmpty())
+      err = QH5Lite::writeStringAttribute(parentId, getName(), SIMPL::HDF5::ObjectType, getNameOfClass());
+      if(err < 0)
       {
-        numNeighborsArrayName = getName() + "_NumNeighbors";
+        return -607;
       }
 
-      // Read the Attribute Off the data set to find the name of the array that holds all the sizes
-      err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
+      // Write the tuple dimensions as an attribute
+      hsize_t size = tDims.size();
+      err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
       if(err < 0)
       {
-        return err;
+        return -609;
       }
-      // Generate the number of neighbors array and also compute the total number
-      // of elements that would be needed to flatten the array
-      std::vector<int32_t> numNeighbors;
 
-      // Check to see if the NumNeighbors exists in the file, which it must.
-      if(QH5Lite::datasetExists(parentId, numNeighborsArrayName))
+      std::vector<size_t> cDims = getComponentDimensions();
+      // write the component dimensions as  an attribute
+      size = cDims.size();
+      err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
+      if(err < 0)
       {
-        err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, numNeighbors);
-        if(err < 0)
-        {
-          return -702;
-        }
+        return -610;
       }
-      else
+
+      err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
+      if(err < 0)
       {
-        return -703;
+        return -608;
       }
+    }
+    return err;
+  }
+
+  /**
+   * @brief writeXdmfAttribute
+   * @param out
+   * @param volDims
+   * @param hdfFileName
+   * @param groupPath
+   * @return
+   */
+  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override
+  {
+    int precision = 0;
+    QString xdmfTypeName;
+    getXdmfTypeAndSize(xdmfTypeName, precision);
+
+    out << "    <Attribute Name=\"" << getName() << label << "\" AttributeType=\"Scalar\" Center=\"Node\">";
+    out << "      <DataItem Format=\"HDF\" Dimensions=\"" << volDims[0] << " " << volDims[1] << " " << volDims[2] << "\" ";
+    out << "NumberType=\"" << xdmfTypeName << "\" "
+        << "Precision=\"" << precision << "\" >";
+    out << "        " << hdfFileName.toLatin1().data() << groupPath.toLatin1().data() << "/" << getName();
+    out << "      </DataItem>";
+    out << "    </Attribute>";
+    return 1;
+  }
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override
+  {
+    ToolTipGenerator toolTipGen;
+    QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+    toolTipGen.addTitle("Attribute Array Info");
+    toolTipGen.addValue("Name", getName());
+    toolTipGen.addValue("Type", getTypeAsString());
+    toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+    toolTipGen.addValue("Number of Lists", usa.toString(static_cast<qlonglong>(getNumberOfLists())));
+
+    return toolTipGen;
+  }
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  QString getInfoString(SIMPL::InfoStringFormat format) const override
+  {
+    if(format == SIMPL::HtmlFormat)
+    {
+      return getToolTipGenerator().generateHTML();
+    }
+    else
+    {
+    }
+    return QString();
+  }
+  /**
+   *
+   * @param parentId
+   * @return
+   */
+  int readH5Data(hid_t parentId) override
+  {
+    int err = 0;
+
+    std::vector<T> flat;
+    err = QH5Lite::readVectorDataset(parentId, getName(), flat);
+    if(err < 0)
+    {
+      return err;
+    }
 
-      // int32_t totalElements = std::accumulate(numNeighbors.begin(), numNeighbors.end(), 0);
+    QString numNeighborsArrayName = m_NumNeighborsArrayName;
 
-      // Loop over all the entries and make new Vectors to hold the incoming data
-      m_Array.resize(numNeighbors.size());
-      m_IsAllocated = true;
-      size_t currentStart = 0;
-      qint32 count = static_cast<qint32>(numNeighbors.size());
-      for(QVector<int32_t>::size_type dIdx = 0; dIdx < count; ++dIdx)
-      {
-        size_t nEle = numNeighbors[dIdx];
-        if(nEle > 0)
-        {
-          m_Array[dIdx] = SharedVectorType(new VectorType(numNeighbors[dIdx]));
+    if(numNeighborsArrayName.isEmpty())
+    {
+      numNeighborsArrayName = getName() + "_NumNeighbors";
+    }
 
-          T* dst = m_Array[dIdx]->data(); // get the pointer to the front of the array
-          //    T* end = start + nEle; // get the pointer to the end of the array
-          T* start = flat.data() + currentStart;
-          ::memcpy(dst, start, nEle * sizeof(T));
-          currentStart += nEle;
-        }
-        else
-        {
-          m_Array[dIdx] = SharedVectorType(new VectorType(0));
-        }
-      }
-      m_NumTuples = m_Array.size(); // Sync up the numTuples property with the size of the internal array
+    // Read the Attribute Off the data set to find the name of the array that holds all the sizes
+    err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
+    if(err < 0)
+    {
       return err;
     }
+    // Generate the number of neighbors array and also compute the total number
+    // of elements that would be needed to flatten the array
+    std::vector<int32_t> numNeighbors;
 
-    /**
-     * @brief addEntry
-     * @param grainId
-     * @param value
-     */
-    void addEntry(int grainId, T value)
+    // Check to see if the NumNeighbors exists in the file, which it must.
+    if(QH5Lite::datasetExists(parentId, numNeighborsArrayName))
     {
-      if(grainId >= static_cast<int>(m_Array.size()) )
+      err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, numNeighbors);
+      if(err < 0)
       {
-        size_t old = m_Array.size();
-        m_Array.resize(grainId + 1);
-        m_IsAllocated = true;
-        // Initialize with zero length Vectors
-        for(size_t i = old; i < m_Array.size(); ++i)
-        {
-          m_Array[i] = SharedVectorType(new VectorType);
-        }
+        return -702;
       }
-      m_Array[grainId]->push_back(value);
-      m_NumTuples = m_Array.size();
     }
-
-    /**
-     * @brief clearAllLists
-     */
-    void clearAllLists()
+    else
     {
-      m_Array.clear();
-      m_IsAllocated = false;
+      return -703;
     }
 
+    // int32_t totalElements = std::accumulate(numNeighbors.begin(), numNeighbors.end(), 0);
 
-    /**
-     * @brief setList
-     * @param grainId
-     * @param neighborList
-     */
-    void setList(int grainId, SharedVectorType neighborList)
+    // Loop over all the entries and make new Vectors to hold the incoming data
+    m_Array.resize(numNeighbors.size());
+    m_IsAllocated = true;
+    size_t currentStart = 0;
+    qint32 count = static_cast<qint32>(numNeighbors.size());
+    for(QVector<int32_t>::size_type dIdx = 0; dIdx < count; ++dIdx)
     {
-      if(grainId >= static_cast<int>(m_Array.size()) )
+      size_t nEle = numNeighbors[dIdx];
+      if(nEle > 0)
       {
-        size_t old = m_Array.size();
-        m_Array.resize(grainId + 1);
-        m_IsAllocated = true;
-        // Initialize with zero length Vectors
-        for(size_t i = old; i < m_Array.size(); ++i)
-        {
-          m_Array[i] = SharedVectorType(new VectorType);
-        }
+        m_Array[dIdx] = SharedVectorType(new VectorType(numNeighbors[dIdx]));
+
+        T* dst = m_Array[dIdx]->data(); // get the pointer to the front of the array
+        //    T* end = start + nEle; // get the pointer to the end of the array
+        T* start = flat.data() + currentStart;
+        ::memcpy(dst, start, nEle * sizeof(T));
+        currentStart += nEle;
+      }
+      else
+      {
+        m_Array[dIdx] = SharedVectorType(new VectorType(0));
       }
-      m_Array[grainId] = neighborList;
     }
-
-    /**
-     * @brief getValue
-     * @param grainId
-     * @param index
-     * @param ok
-     * @return
-     */
-    T getValue(int grainId, int index, bool& ok) const
+    m_NumTuples = m_Array.size(); // Sync up the numTuples property with the size of the internal array
+    return err;
+  }
+
+  /**
+   * @brief addEntry
+   * @param grainId
+   * @param value
+   */
+  void addEntry(int grainId, T value)
+  {
+    if(grainId >= static_cast<int>(m_Array.size()))
     {
-#ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
-#endif
-      SharedVectorType vec = m_Array[grainId];
-      if(index < 0 || static_cast<size_t>(index) >= vec->size())
+      size_t old = m_Array.size();
+      m_Array.resize(grainId + 1);
+      m_IsAllocated = true;
+      // Initialize with zero length Vectors
+      for(size_t i = old; i < m_Array.size(); ++i)
       {
-        ok = false;
-        return -1;
+        m_Array[i] = SharedVectorType(new VectorType);
       }
-      return (*vec)[index];
     }
-
-    /**
-     * @brief getNumberOfLists
-     * @return
-     */
-    int getNumberOfLists() const
+    m_Array[grainId]->push_back(value);
+    m_NumTuples = m_Array.size();
+  }
+
+  /**
+   * @brief clearAllLists
+   */
+  void clearAllLists()
+  {
+    m_Array.clear();
+    m_IsAllocated = false;
+  }
+
+  /**
+   * @brief setList
+   * @param grainId
+   * @param neighborList
+   */
+  void setList(int grainId, SharedVectorType neighborList)
+  {
+    if(grainId >= static_cast<int>(m_Array.size()))
     {
-      return static_cast<int>(m_Array.size());
+      size_t old = m_Array.size();
+      m_Array.resize(grainId + 1);
+      m_IsAllocated = true;
+      // Initialize with zero length Vectors
+      for(size_t i = old; i < m_Array.size(); ++i)
+      {
+        m_Array[i] = SharedVectorType(new VectorType);
+      }
     }
-
-    /**
-     * @brief getListSize
-     * @param grainId
-     * @return
-     */
-    int getListSize(int grainId) const
-    {
+    m_Array[grainId] = neighborList;
+  }
+
+  /**
+   * @brief getValue
+   * @param grainId
+   * @param index
+   * @param ok
+   * @return
+   */
+  T getValue(int grainId, int index, bool& ok) const
+  {
 #ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
-#endif
-      return static_cast<int>(m_Array[grainId]->size());
-    }
-
-    VectorType& getListReference(int grainId) const
+    if(m_Array.size() > 0u)
     {
-#ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
-#endif
-      return *(m_Array[grainId]);
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
     }
-
-    /**
-     * @brief getList
-     * @param grainId
-     * @return
-     */
-    SharedVectorType getList(int grainId) const
-    {
-#ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
 #endif
-      return m_Array[grainId];
-    }
-
-    /**
-     * @brief copyOfList
-     * @param grainId
-     * @return
-     */
-    VectorType copyOfList(int grainId) const
+    SharedVectorType vec = m_Array[grainId];
+    if(index < 0 || static_cast<size_t>(index) >= vec->size())
     {
+      ok = false;
+      return -1;
+    }
+    return (*vec)[index];
+  }
+
+  /**
+   * @brief getNumberOfLists
+   * @return
+   */
+  int getNumberOfLists() const
+  {
+    return static_cast<int>(m_Array.size());
+  }
+
+  /**
+   * @brief getListSize
+   * @param grainId
+   * @return
+   */
+  int getListSize(int grainId) const
+  {
 #ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
-#endif
-
-      VectorType copy(*(m_Array[grainId]));
-      return copy;
+    if(m_Array.size() > 0u)
+    {
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
     }
+#endif
+    return static_cast<int>(m_Array[grainId]->size());
+  }
 
-    /**
-     * @brief operator []
-     * @param grainId
-     * @return
-     */
-    VectorType& operator[](int grainId)
-    {
+  VectorType& getListReference(int grainId) const
+  {
 #ifndef NDEBUG
-      if (m_Array.size() > 0u) { Q_ASSERT(grainId < static_cast<int>(m_Array.size()));}
-#endif
-      return *(m_Array[grainId]);
+    if(m_Array.size() > 0u)
+    {
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
     }
-
-    /**
-     * @brief operator []
-     * @param grainId
-     * @return
-     */
-    VectorType& operator[](size_t grainId)
+#endif
+    return *(m_Array[grainId]);
+  }
+
+  /**
+   * @brief getList
+   * @param grainId
+   * @return
+   */
+  SharedVectorType getList(int grainId) const
+  {
+#ifndef NDEBUG
+    if(m_Array.size() > 0u)
     {
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+    }
+#endif
+    return m_Array[grainId];
+  }
+
+  /**
+   * @brief copyOfList
+   * @param grainId
+   * @return
+   */
+  VectorType copyOfList(int grainId) const
+  {
 #ifndef NDEBUG
-      if (m_Array.size() > 0ul) { Q_ASSERT(grainId < m_Array.size());}
+    if(m_Array.size() > 0u)
+    {
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+    }
 #endif
-      return *(m_Array[grainId]);
 
+    VectorType copy(*(m_Array[grainId]));
+    return copy;
+  }
+
+  /**
+   * @brief operator []
+   * @param grainId
+   * @return
+   */
+  VectorType& operator[](int grainId)
+  {
+#ifndef NDEBUG
+    if(m_Array.size() > 0u)
+    {
+      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
     }
-
-
-  protected:
-    /**
-     * @brief NeighborList
-     */
-    NeighborList(size_t numTuples, const QString name)
-    : IDataArray(name)
-    , m_NumTuples(numTuples)
-    , m_IsAllocated(false)
+#endif
+    return *(m_Array[grainId]);
+  }
+
+  /**
+   * @brief operator []
+   * @param grainId
+   * @return
+   */
+  VectorType& operator[](size_t grainId)
+  {
+#ifndef NDEBUG
+    if(m_Array.size() > 0ul)
     {
+      Q_ASSERT(grainId < m_Array.size());
     }
-
-  private:
-    QString m_NumNeighborsArrayName;
-    std::vector<SharedVectorType> m_Array;
-    size_t m_NumTuples;
-    bool m_IsAllocated;
-    T m_InitValue;
-
-  public:
-    NeighborList(const NeighborList&) = delete;            // Copy Constructor Not Implemented
-    NeighborList(NeighborList&&) = delete;                 // Move Constructor Not Implemented
-    NeighborList& operator=(const NeighborList&) = delete; // Copy Assignment Not Implemented
-    NeighborList& operator=(NeighborList&&) = delete;      // Move Assignment Not Implemented
+#endif
+    return *(m_Array[grainId]);
+  }
+
+protected:
+  /**
+   * @brief NeighborList
+   */
+  NeighborList(size_t numTuples, const QString name)
+  : IDataArray(name)
+  , m_NumTuples(numTuples)
+  , m_IsAllocated(false)
+  {
+  }
+
+private:
+  QString m_NumNeighborsArrayName;
+  std::vector<SharedVectorType> m_Array;
+  size_t m_NumTuples;
+  bool m_IsAllocated;
+  T m_InitValue;
+
+public:
+  NeighborList(const NeighborList&) = delete;            // Copy Constructor Not Implemented
+  NeighborList(NeighborList&&) = delete;                 // Move Constructor Not Implemented
+  NeighborList& operator=(const NeighborList&) = delete; // Copy Assignment Not Implemented
+  NeighborList& operator=(NeighborList&&) = delete;      // Move Assignment Not Implemented
 };
 
 using Int32NeighborListType = NeighborList<int32_t>;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 76890b9bdf..923f8ebc7e 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -122,7 +122,6 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numTuples, const std:
   return ptr;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -776,27 +775,27 @@ void StatsDataArray::fillArrayWithNewStatsData(size_t n, PhaseType::Type* phase_
 void StatsDataArray::fillArrayWithNewStatsData(size_t n, PhaseType::EnumType* phase_types)
 {
   m_StatsDataArray.resize(n);
-  for (size_t i = 0; i < n; ++i)
+  for(size_t i = 0; i < n; ++i)
   {
-    if (phase_types != nullptr)
+    if(phase_types != nullptr)
     {
-      if (phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Primary))
+      if(phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Primary))
       {
         m_StatsDataArray[i] = PrimaryStatsData::New();
       }
-      else if (phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Precipitate))
+      else if(phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Precipitate))
       {
         m_StatsDataArray[i] = PrecipitateStatsData::New();
       }
-      else if (phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Transformation))
+      else if(phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Transformation))
       {
         m_StatsDataArray[i] = TransformationStatsData::New();
       }
-      else if (phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Boundary))
+      else if(phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Boundary))
       {
         m_StatsDataArray[i] = BoundaryStatsData::New();
       }
-      else if (phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Matrix))
+      else if(phase_types[i] == static_cast<PhaseType::EnumType>(PhaseType::Type::Matrix))
       {
         m_StatsDataArray[i] = MatrixStatsData::New();
       }
@@ -805,7 +804,7 @@ void StatsDataArray::fillArrayWithNewStatsData(size_t n, PhaseType::EnumType* ph
         m_StatsDataArray[i] = StatsData::New();
       }
     }
-    if (phase_types == nullptr)
+    if(phase_types == nullptr)
     {
       m_StatsDataArray[i] = StatsData::New();
     }
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
old mode 100755
new mode 100644
index 1df37cb224..f26e10070e
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -412,5 +412,3 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
   StatsDataArray& operator=(const StatsDataArray&) = delete; // Copy Assignment Not Implemented
   StatsDataArray& operator=(StatsDataArray&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index 1908ee271b..bcf57a58a5 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -39,7 +39,6 @@
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
old mode 100755
new mode 100644
index bd7babd6dd..4e62c7e1ac
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -4,39 +4,39 @@
 //                           FA8650-07-D-5800
 //
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <cstring>
@@ -48,8 +48,7 @@
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/IDataArrayFilter.h"
 
-
-template<typename T>
+template <typename T>
 class StructArray : public IDataArray
 {
 public:
@@ -87,706 +86,732 @@ class StructArray : public IDataArray
     return 2;
   }
 
-    /**
-     * @brief Static constructor
-     * @param numElements The number of elements in the internal array.
-     * @param name The name of the array
-     * @return Std::Shared_Ptr wrapping an instance of StructArrayTemplate<T>
-     */
-    static Pointer CreateArray(size_t numElements, const QString& name, bool allocate = true)
+  /**
+   * @brief Static constructor
+   * @param numElements The number of elements in the internal array.
+   * @param name The name of the array
+   * @return Std::Shared_Ptr wrapping an instance of StructArrayTemplate<T>
+   */
+  static Pointer CreateArray(size_t numElements, const QString& name, bool allocate = true)
+  {
+    if(name.isEmpty())
     {
-      if(name.isEmpty())
-      {
-        return NullPointer();
-      }
-      StructArray<T>* d = new StructArray<T> (numElements, true);
-      if(allocate)
+      return NullPointer();
+    }
+    StructArray<T>* d = new StructArray<T>(numElements, true);
+    if(allocate)
+    {
+      if(d->Allocate() < 0)
       {
-        if (d->Allocate() < 0)
-        {
-          // Could not allocate enough memory, reset the pointer to null and return
-          delete d;
-          return StructArray<T>::NullPointer();
-        }
+        // Could not allocate enough memory, reset the pointer to null and return
+        delete d;
+        return StructArray<T>::NullPointer();
       }
-      d->setName(name);
-      Pointer ptr(d);
-      return ptr;
     }
+    d->setName(name);
+    Pointer ptr(d);
+    return ptr;
+  }
 
-    /**
-     * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
-     * contained in the vector. The number of components will be set to 1.
-     * @param vec The vector to copy the data from
-     * @param name The name of the array
-     * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
-     */
-    IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
-    {
-      IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
-      return p;
-    }
+  /**
+   * @brief Static Method to create a DataArray from a QVector through a deep copy of the data
+   * contained in the vector. The number of components will be set to 1.
+   * @param vec The vector to copy the data from
+   * @param name The name of the array
+   * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
+   */
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
+  {
+    IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
+    return p;
+  }
 
-    IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
-    {
-      IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
-      return p;
-    }
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
+  {
+    IDataArray::Pointer p = StructArray<T>::CreateArray(numElements, name, allocate);
+    return p;
+  }
 
-    /**
-     * @brief Destructor
-     */
-    ~StructArray() override
+  /**
+   * @brief Destructor
+   */
+  ~StructArray() override
+  {
+    // qDebug() << "~StructArrayTemplate '" << m_Name << "'" ;
+    if((nullptr != m_Array) && (true == m_OwnsData))
     {
-      //qDebug() << "~StructArrayTemplate '" << m_Name << "'" ;
-      if((nullptr != m_Array) && (true == m_OwnsData))
-      {
-        deallocate();
-      }
+      deallocate();
     }
+  }
 
-    /**
-     * @brief isAllocated
-     * @return
-     */
-    bool isAllocated() const override
-    {
-      return m_IsAllocated;
-    }
+  /**
+   * @brief isAllocated
+   * @return
+   */
+  bool isAllocated() const override
+  {
+    return m_IsAllocated;
+  }
 
+  /**
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
+  {
+    xdmfTypeName = getNameOfClass();
+    precision = 0;
+  }
 
-    /**
-     * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
-    {
-      xdmfTypeName = getNameOfClass();
-      precision = 0;
-    }
+  /**
+   * @brief getTypeAsString
+   * @return
+   */
+  QString getTypeAsString() const override
+  {
+    return "struct";
+  }
 
-    /**
-     * @brief getTypeAsString
-     * @return
-     */
-    QString getTypeAsString() const override { return "struct"; }
+  /**
+   * @brief Returns the HDF Type for a given primitive value.
+   * @param value A value to use. Can be anything. Just used to get the type info
+   * from
+   * @return The HDF5 native type for the value
+   */
+  virtual QString getFullNameOfClass() const
+  {
+    QString theType = getTypeAsString();
+    theType = "StructArray<" + theType + ">";
+    return theType;
+  }
 
-    /**
-    * @brief Returns the HDF Type for a given primitive value.
-    * @param value A value to use. Can be anything. Just used to get the type info
-    * from
-    * @return The HDF5 native type for the value
-    */
-    virtual QString getFullNameOfClass() const
-    {
-      QString theType = getTypeAsString();
-      theType = "StructArray<" + theType + ">";
-      return theType;
-    }
+  /**
+   * @brief Makes this class responsible for freeing the memory
+   */
+  void takeOwnership() override
+  {
+    m_OwnsData = true;
+  }
 
-    /**
-     * @brief Makes this class responsible for freeing the memory
-     */
-    void takeOwnership() override
-    {
-      m_OwnsData = true;
-    }
+  /**
+   * @brief This class will NOT free the memory associated with the internal pointer.
+   * This can be useful if the user wishes to keep the data around after this
+   * class goes out of scope.
+   */
+  void releaseOwnership() override
+  {
+    m_OwnsData = false;
+  }
 
-    /**
-     * @brief This class will NOT free the memory associated with the internal pointer.
-     * This can be useful if the user wishes to keep the data around after this
-     * class goes out of scope.
-     */
-    void releaseOwnership() override
+  /**
+   * @brief Allocates the memory needed for this class
+   * @return 1 on success, -1 on failure
+   */
+  int32_t Allocate()
+  {
+    if((nullptr != m_Array) && (true == m_OwnsData))
     {
-      m_OwnsData = false;
+      deallocate();
     }
+    m_Array = nullptr;
+    m_OwnsData = true;
+    m_IsAllocated = false;
 
-    /**
-     * @brief Allocates the memory needed for this class
-     * @return 1 on success, -1 on failure
-     */
-    int32_t Allocate()
+    if(m_Size == 0)
     {
-      if((nullptr != m_Array) && (true == m_OwnsData))
-      {
-        deallocate();
-      }
-      m_Array = nullptr;
-      m_OwnsData = true;
-      m_IsAllocated = false;
-
-      if(m_Size == 0)
-      {
-        initialize();
-        return 1;
-      }
-
-      size_t newSize = m_Size;
-      m_Array = new T[newSize]();
-
-      if (!m_Array)
-      {
-        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. " ;
-        return -1;
-      }
-      m_IsAllocated = true;
-      m_Size = newSize;
+      initialize();
       return 1;
     }
 
-    /**
-     * @brief Initializes this class to zero bytes freeing any data that it currently owns
-     */
-    virtual void initialize()
-    {
-      if(nullptr != m_Array && true == m_OwnsData)
-      {
-        deallocate();
-      }
-      m_Array = nullptr;
-      m_Size = 0;
-      m_OwnsData = true;
-      m_MaxId = 0;
-      m_IsAllocated = false;
-    }
+    size_t newSize = m_Size;
+    m_Array = new T[newSize]();
 
-    /**
-     * @brief Sets all the values to zero.
-     */
-    void initializeWithZeros() override
+    if(!m_Array)
     {
-      size_t typeSize = sizeof(T);
-      ::memset(m_Array, 0, m_Size * typeSize);
+      qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+      return -1;
     }
+    m_IsAllocated = true;
+    m_Size = newSize;
+    return 1;
+  }
 
-    /**
-     * @brief Sets all the values to value.
-     */
-    void initializeWithValue(T value, size_t offset = 0)
+  /**
+   * @brief Initializes this class to zero bytes freeing any data that it currently owns
+   */
+  virtual void initialize()
+  {
+    if(nullptr != m_Array && true == m_OwnsData)
     {
-      for(size_t i = offset; i < m_Size; i++)
-      {
-        m_Array[i] = value;
-      }
+      deallocate();
     }
+    m_Array = nullptr;
+    m_Size = 0;
+    m_OwnsData = true;
+    m_MaxId = 0;
+    m_IsAllocated = false;
+  }
+
+  /**
+   * @brief Sets all the values to zero.
+   */
+  void initializeWithZeros() override
+  {
+    size_t typeSize = sizeof(T);
+    ::memset(m_Array, 0, m_Size * typeSize);
+  }
 
-    /**
-     * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
-     * vector is greater than or Equal to the number of Tuples then the Array is Resized to Zero. If there are
-     * indices that are larger than the size of the original (before erasing operations) then an error code (-100) is
-     * returned from the program.
-     * @param idxs The indices to remove
-     * @return error code.
-     */
-    int eraseTuples(const std::vector<size_t>& idxs) override
+  /**
+   * @brief Sets all the values to value.
+   */
+  void initializeWithValue(T value, size_t offset = 0)
+  {
+    for(size_t i = offset; i < m_Size; i++)
     {
+      m_Array[i] = value;
+    }
+  }
 
-      int err = 0;
+  /**
+   * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
+   * vector is greater than or Equal to the number of Tuples then the Array is Resized to Zero. If there are
+   * indices that are larger than the size of the original (before erasing operations) then an error code (-100) is
+   * returned from the program.
+   * @param idxs The indices to remove
+   * @return error code.
+   */
+  int eraseTuples(const std::vector<size_t>& idxs) override
+  {
 
-      // If nothing is to be erased just return
-      if(idxs.empty())
-      {
-        return 0;
-      }
+    int err = 0;
 
-      size_t idxs_size = static_cast<size_t>(idxs.size());
-      if (idxs_size >= getNumberOfTuples() )
-      {
-        resizeTuples(0);
-        return 0;
-      }
+    // If nothing is to be erased just return
+    if(idxs.empty())
+    {
+      return 0;
+    }
 
-      // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
-      // off the end of the array and return an error code.
-      for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
-      {
-        if(idxs[i] > m_MaxId)
-        {
-          return -100;
-        }
-      }
+    size_t idxs_size = static_cast<size_t>(idxs.size());
+    if(idxs_size >= getNumberOfTuples())
+    {
+      resizeTuples(0);
+      return 0;
+    }
 
-      // Calculate the new size of the array to copy into
-      size_t newSize = (getNumberOfTuples() - idxs.size());
-      T* currentSrc = nullptr;
-
-      // Create a new Array to copy into
-      T* newArray = new T[newSize]();
-      // Splat AB across the array so we know if we are copying the values or not
-      ::memset(newArray, 0xAB, newSize * sizeof(T));
-
-      // Keep the current Destination Pointer
-      T* currentDest = newArray;
-      size_t j = 0;
-      size_t k = 0;
-      // Find the first chunk to copy by walking the idxs array until we get an
-      // index that is NOT a continuous increment from the start
-      for (k = 0; k < idxs.size(); ++k)
+    // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
+    // off the end of the array and return an error code.
+    for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+    {
+      if(idxs[i] > m_MaxId)
       {
-        if(j == idxs[k])
-        {
-          ++j;
-        }
-        else
-        {
-          break;
-        }
+        return -100;
       }
+    }
 
-      if(k == idxs.size()) // Only front elements are being dropped
-      {
-        currentSrc = m_Array + (j);
-        ::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * sizeof(T));
-        deallocate(); // We are done copying - delete the current Array
-        m_Size = newSize;
-        m_Array = newArray;
-        m_OwnsData = true;
-        m_MaxId = newSize - 1;
-        return 0;
-      }
+    // Calculate the new size of the array to copy into
+    size_t newSize = (getNumberOfTuples() - idxs.size());
+    T* currentSrc = nullptr;
 
-      std::vector<size_t> srcIdx(idxs.size() + 1);
-      std::vector<size_t> destIdx(idxs.size() + 1);
-      std::vector<size_t> copyElements(idxs.size() + 1);
-      srcIdx[0] = 0;
-      destIdx[0] = 0;
-      copyElements[0] = (idxs[0] - 0);
+    // Create a new Array to copy into
+    T* newArray = new T[newSize]();
+    // Splat AB across the array so we know if we are copying the values or not
+    ::memset(newArray, 0xAB, newSize * sizeof(T));
 
-      for(size_t i = 1; i < srcIdx.size(); ++i)
+    // Keep the current Destination Pointer
+    T* currentDest = newArray;
+    size_t j = 0;
+    size_t k = 0;
+    // Find the first chunk to copy by walking the idxs array until we get an
+    // index that is NOT a continuous increment from the start
+    for(k = 0; k < idxs.size(); ++k)
+    {
+      if(j == idxs[k])
       {
-        srcIdx[i] = (idxs[i - 1] + 1);
-
-        if(i < srcIdx.size() - 1)
-        {
-          copyElements[i] = (idxs[i] - idxs[i - 1] - 1);
-        }
-        else
-        {
-          copyElements[i] = (getNumberOfTuples() - idxs[i - 1] - 1);
-        }
-        destIdx[i] = copyElements[i - 1] + destIdx[i - 1];
+        ++j;
       }
-
-      // Copy the data
-      for (int i = 0; i < srcIdx.size(); ++i)
+      else
       {
-        currentDest = newArray + destIdx[i];
-        currentSrc = m_Array + srcIdx[i];
-        size_t bytes = copyElements[i] * sizeof(T);
-        ::memcpy(currentDest, currentSrc, bytes);
+        break;
       }
+    }
 
-      // We are done copying - delete the current Array
-      deallocate();
-
-      // Allocation was successful.  Save it.
+    if(k == idxs.size()) // Only front elements are being dropped
+    {
+      currentSrc = m_Array + (j);
+      ::memcpy(currentDest, currentSrc, (getNumberOfTuples() - idxs.size()) * sizeof(T));
+      deallocate(); // We are done copying - delete the current Array
       m_Size = newSize;
       m_Array = newArray;
-      // This object has now allocated its memory and owns it.
       m_OwnsData = true;
-
       m_MaxId = newSize - 1;
-
-      return err;
-    }
-
-    /**
-     * @brief
-     * @param currentPos
-     * @param newPos
-     * @return
-     */
-    int copyTuple(size_t currentPos, size_t newPos) override
-    {
-      size_t max = ((m_MaxId + 1));
-      if (currentPos >= max
-          || newPos >= max )
-      {return -1;}
-      if (currentPos == newPos) { return 0; }
-      T* src = m_Array + (currentPos);
-      T* dest = m_Array + (newPos);
-      size_t bytes = sizeof(T);
-      ::memcpy(dest, src, bytes);
       return 0;
     }
 
-    // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
-    // This is required so that other classes can call this version of copyData from the subclasses.
-    using IDataArray::copyFromArray;
-
-    /**
-     * @brief copyData This method copies the number of tuples specified by the
-     * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
-     * into the current array starting at the target destination tuple offset value.
-     *
-     * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
-     *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
-     *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
-     * of the destination array. In psuedo code it would be the following:
-     * @code
-     *  destArray[5] = sourceArray[5];
-     *  destArray[6] = sourceArray[6];
-     *  destArray[7] = sourceArray[7];
-     *  .....
-     * @endcode
-     * @param destTupleOffset
-     * @param sourceArray
-     * @return
-     */
-    bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
-    {
-      if(!m_IsAllocated)
-      {
-        return false;
-      }
-      if(nullptr == m_Array)
-      {
-        return false;
-      }
-      if(destTupleOffset >= m_MaxId)
-      {
-        return false;
-      }
-      if(!sourceArray->isAllocated())
-      {
-        return false;
-      }
-      const Self* source = dynamic_cast<const Self*>(sourceArray.get());
-      if(source == nullptr)
+    std::vector<size_t> srcIdx(idxs.size() + 1);
+    std::vector<size_t> destIdx(idxs.size() + 1);
+    std::vector<size_t> copyElements(idxs.size() + 1);
+    srcIdx[0] = 0;
+    destIdx[0] = 0;
+    copyElements[0] = (idxs[0] - 0);
+
+    for(size_t i = 1; i < srcIdx.size(); ++i)
+    {
+      srcIdx[i] = (idxs[i - 1] + 1);
+
+      if(i < srcIdx.size() - 1)
       {
-        return false;
+        copyElements[i] = (idxs[i] - idxs[i - 1] - 1);
       }
-      if(nullptr == source->getPointer(0))
+      else
       {
-        return false;
+        copyElements[i] = (getNumberOfTuples() - idxs[i - 1] - 1);
       }
+      destIdx[i] = copyElements[i - 1] + destIdx[i - 1];
+    }
 
-      if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
-      {
-        return false;
-      }
+    // Copy the data
+    for(int i = 0; i < srcIdx.size(); ++i)
+    {
+      currentDest = newArray + destIdx[i];
+      currentSrc = m_Array + srcIdx[i];
+      size_t bytes = copyElements[i] * sizeof(T);
+      ::memcpy(currentDest, currentSrc, bytes);
+    }
 
-      if(totalSrcTuples + destTupleOffset > m_Size)
-      {
-        return false;
-      }
+    // We are done copying - delete the current Array
+    deallocate();
 
-      T* src = source->getPointer(srcTupleOffset);
-      T* dest = m_Array + destTupleOffset;
-      size_t bytes = (totalSrcTuples) * sizeof(T);
-      ::memcpy(dest, src, bytes);
+    // Allocation was successful.  Save it.
+    m_Size = newSize;
+    m_Array = newArray;
+    // This object has now allocated its memory and owns it.
+    m_OwnsData = true;
 
-      return true;
-    }
+    m_MaxId = newSize - 1;
+
+    return err;
+  }
 
-    /**
-     * @brief Returns the number of bytes that make up the data type.
-     * 1 = char
-     * 2 = 16 bit integer
-     * 4 = 32 bit integer/Float
-     * 8 = 64 bit integer/Double
-     */
-    size_t getTypeSize() const override
+  /**
+   * @brief
+   * @param currentPos
+   * @param newPos
+   * @return
+   */
+  int copyTuple(size_t currentPos, size_t newPos) override
+  {
+    size_t max = ((m_MaxId + 1));
+    if(currentPos >= max || newPos >= max)
     {
-      return sizeof(T);
+      return -1;
     }
-
-    /**
-     * @brief Returns the number of elements in the internal array.
-     */
-    size_t getNumberOfTuples() const override
+    if(currentPos == newPos)
     {
-      if (m_Size == 0) { return 0; }
-      return (m_MaxId + 1);
+      return 0;
     }
+    T* src = m_Array + (currentPos);
+    T* dest = m_Array + (newPos);
+    size_t bytes = sizeof(T);
+    ::memcpy(dest, src, bytes);
+    return 0;
+  }
+
+  // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
+  // This is required so that other classes can call this version of copyData from the subclasses.
+  using IDataArray::copyFromArray;
 
-    /**
-     * @brief getSize
-     * @return
-     */
-    size_t getSize() const override
+  /**
+   * @brief copyData This method copies the number of tuples specified by the
+   * totalSrcTuples value starting from the source tuple offset value in <b>sourceArray</b>
+   * into the current array starting at the target destination tuple offset value.
+   *
+   * For example if the DataArray has 10 tuples, the source DataArray has 10 tuples,
+   *  the destTupleOffset = 5, the srcTupleOffset = 5, and the totalSrcTuples = 3,
+   *  then tuples 5, 6, and 7 will be copied from the source into tuples 5, 6, and 7
+   * of the destination array. In psuedo code it would be the following:
+   * @code
+   *  destArray[5] = sourceArray[5];
+   *  destArray[6] = sourceArray[6];
+   *  destArray[7] = sourceArray[7];
+   *  .....
+   * @endcode
+   * @param destTupleOffset
+   * @param sourceArray
+   * @return
+   */
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
+  {
+    if(!m_IsAllocated)
     {
-      return m_Size;
+      return false;
     }
-
-    /**
-     * @brief getNumberOfComponents
-     * @return
-     */
-    int getNumberOfComponents() const override
+    if(nullptr == m_Array)
     {
-      return 1;
+      return false;
     }
-
-    /**
-     * @brief getNumberOfComponents
-     * @return
-     */
-    std::vector<size_t> getComponentDimensions() const override
+    if(destTupleOffset >= m_MaxId)
     {
-      std::vector<size_t> dims(1, 1);
-      return dims;
+      return false;
     }
-
-    // Description:
-    // Set/Get the dimension (n) of the rank. Must be >= 1. Make sure that
-    // this is set before allocation.
-    void SetRank(int rnk)
+    if(!sourceArray->isAllocated())
     {
-
+      return false;
     }
-
-    /**
-     * @brief getRank
-     * @return
-     */
-    int getRank() const
+    const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+    if(source == nullptr)
     {
-      return 1;
+      return false;
+    }
+    if(nullptr == source->getPointer(0))
+    {
+      return false;
     }
 
-
-    /**
-     * @brief Returns a void pointer pointing to the index of the array. nullptr
-     * pointers are entirely possible. No checks are performed to make sure
-     * the index is with in the range of the internal data array.
-     * @param i The index to have the returned pointer pointing to.
-     * @return Void Pointer. Possibly nullptr.
-     */
-    void* getVoidPointer(size_t i) override
+    if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
     {
-      if (i >= m_Size) { return nullptr;}
+      return false;
+    }
 
-      return reinterpret_cast<void*>(m_Array + i);
+    if(totalSrcTuples + destTupleOffset > m_Size)
+    {
+      return false;
     }
 
+    T* src = source->getPointer(srcTupleOffset);
+    T* dest = m_Array + destTupleOffset;
+    size_t bytes = (totalSrcTuples) * sizeof(T);
+    ::memcpy(dest, src, bytes);
+
+    return true;
+  }
+
+  /**
+   * @brief Returns the number of bytes that make up the data type.
+   * 1 = char
+   * 2 = 16 bit integer
+   * 4 = 32 bit integer/Float
+   * 8 = 64 bit integer/Double
+   */
+  size_t getTypeSize() const override
+  {
+    return sizeof(T);
+  }
 
-    /**
-     * @brief Returns the pointer to a specific index into the array. No checks are made
-     * as to the correctness of the index being passed in. If you ask for an index off
-     * then end of the array they you will likely cause your program to abort.
-     * @param i The index to return the pointer to.
-     * @return The pointer to the index
-     */
-    virtual T* getPointer(size_t i) const
+  /**
+   * @brief Returns the number of elements in the internal array.
+   */
+  size_t getNumberOfTuples() const override
+  {
+    if(m_Size == 0)
     {
-#ifndef NDEBUG
-      if (m_Size > 0) { Q_ASSERT(i < m_Size);}
-#endif
-      return reinterpret_cast<T*>(m_Array + i);
+      return 0;
     }
+    return (m_MaxId + 1);
+  }
 
-    /**
-     * @brief Splats the same value c across all values in the Tuple
-     * @param i The index of the Tuple
-     * @param c The value to splat across all components in the tuple
-     */
-    void initializeTuple(size_t i, const void* p) override
+  /**
+   * @brief getSize
+   * @return
+   */
+  size_t getSize() const override
+  {
+    return m_Size;
+  }
+
+  /**
+   * @brief getNumberOfComponents
+   * @return
+   */
+  int getNumberOfComponents() const override
+  {
+    return 1;
+  }
+
+  /**
+   * @brief getNumberOfComponents
+   * @return
+   */
+  std::vector<size_t> getComponentDimensions() const override
+  {
+    std::vector<size_t> dims(1, 1);
+    return dims;
+  }
+
+  // Description:
+  // Set/Get the dimension (n) of the rank. Must be >= 1. Make sure that
+  // this is set before allocation.
+  void SetRank(int rnk)
+  {
+  }
+
+  /**
+   * @brief getRank
+   * @return
+   */
+  int getRank() const
+  {
+    return 1;
+  }
+
+  /**
+   * @brief Returns a void pointer pointing to the index of the array. nullptr
+   * pointers are entirely possible. No checks are performed to make sure
+   * the index is with in the range of the internal data array.
+   * @param i The index to have the returned pointer pointing to.
+   * @return Void Pointer. Possibly nullptr.
+   */
+  void* getVoidPointer(size_t i) override
+  {
+    if(i >= m_Size)
     {
-#ifndef NDEBUG
-      if (m_Size > 0) { Q_ASSERT(i < m_Size);}
-#endif
-      Q_ASSERT(false);
-      //T c = static_cast<T>(p);
-      //for (int j = 0; j < this->NumberOfComponents; ++j)
-      {
-        // Array[i] = c;
-      }
+      return nullptr;
     }
 
-    IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
+    return reinterpret_cast<void*>(m_Array + i);
+  }
+
+  /**
+   * @brief Returns the pointer to a specific index into the array. No checks are made
+   * as to the correctness of the index being passed in. If you ask for an index off
+   * then end of the array they you will likely cause your program to abort.
+   * @param i The index to return the pointer to.
+   * @return The pointer to the index
+   */
+  virtual T* getPointer(size_t i) const
+  {
+#ifndef NDEBUG
+    if(m_Size > 0)
     {
-      bool allocate = m_IsAllocated;
-      if(forceNoAllocate)
-      {
-        allocate = false;
-      }
-      IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
-      if(m_IsAllocated && !forceNoAllocate)
-      {
-        T* src = getPointer(0);
-        void* dest = daCopy->getVoidPointer(0);
-        size_t totalBytes = (getNumberOfTuples() * getNumberOfComponents() * sizeof(T));
-        ::memcpy(dest, src, totalBytes);
-      }
-      return daCopy;
+      Q_ASSERT(i < m_Size);
     }
+#endif
+    return reinterpret_cast<T*>(m_Array + i);
+  }
 
-    /**
-     * @brief Reseizes the internal array
-     * @param size The new size of the internal array
-     * @return 1 on success, 0 on failure
-     */
-    int32_t resizeTotalElements(size_t size) override
+  /**
+   * @brief Splats the same value c across all values in the Tuple
+   * @param i The index of the Tuple
+   * @param c The value to splat across all components in the tuple
+   */
+  void initializeTuple(size_t i, const void* p) override
+  {
+#ifndef NDEBUG
+    if(m_Size > 0)
     {
-      if(resizeAndExtend(size) || size == 0)
-      {
-        return 1;
-      }
-      return 0;
+      Q_ASSERT(i < m_Size);
     }
-
-    /**
-     * @brief Resizes the internal array to accomondate numTuples
-     * @param numTuples
-     */
-    void resizeTuples(size_t numTuples) override
+#endif
+    Q_ASSERT(false);
+    // T c = static_cast<T>(p);
+    // for (int j = 0; j < this->NumberOfComponents; ++j)
     {
-      resizeTotalElements(numTuples);
+      // Array[i] = c;
     }
+  }
 
-    /**
-     * @brief printTuple
-     * @param out
-     * @param i
-     * @param delimiter
-     */
-    void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
+  {
+    bool allocate = m_IsAllocated;
+    if(forceNoAllocate)
     {
-      Q_ASSERT(false);
-      //        for(int j = 0; j < NumberOfComponents; ++j)
-      //        {
-      //          if (j != 0) { out << delimiter; }
-      //          out << Array[i + j];
-      //        }
+      allocate = false;
     }
-
-    /**
-     * @brief printComponent
-     * @param out
-     * @param i
-     * @param j
-     */
-    void printComponent(QTextStream& out, size_t i, int j) const override
+    IDataArray::Pointer daCopy = createNewArray(getNumberOfTuples(), getComponentDimensions(), getName(), allocate);
+    if(m_IsAllocated && !forceNoAllocate)
     {
-      Q_ASSERT(false);
-      //        out << Array[i + j];
+      T* src = getPointer(0);
+      void* dest = daCopy->getVoidPointer(0);
+      size_t totalBytes = (getNumberOfTuples() * getNumberOfComponents() * sizeof(T));
+      ::memcpy(dest, src, totalBytes);
     }
+    return daCopy;
+  }
 
-
-    /**
-     *
-     * @param parentId
-     * @return
-     */
-    int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+  /**
+   * @brief Reseizes the internal array
+   * @param size The new size of the internal array
+   * @return 1 on success, 0 on failure
+   */
+  int32_t resizeTotalElements(size_t size) override
+  {
+    if(resizeAndExtend(size) || size == 0)
     {
-      Q_ASSERT(false);
-      return -1;
+      return 1;
     }
+    return 0;
+  }
 
+  /**
+   * @brief Resizes the internal array to accomondate numTuples
+   * @param numTuples
+   */
+  void resizeTuples(size_t numTuples) override
+  {
+    resizeTotalElements(numTuples);
+  }
 
-    /**
-     * @brief writeXdmfAttribute
-     * @param out
-     * @param volDims
-     * @param hdfFileName
-     * @param groupPath
-     * @return
-     */
-    int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName,
-                                   const QString& groupPath, const QString& labelb) const override
-    {
-      out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
-      return -1;
-    }
+  /**
+   * @brief printTuple
+   * @param out
+   * @param i
+   * @param delimiter
+   */
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
+  {
+    Q_ASSERT(false);
+    //        for(int j = 0; j < NumberOfComponents; ++j)
+    //        {
+    //          if (j != 0) { out << delimiter; }
+    //          out << Array[i + j];
+    //        }
+  }
 
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the current DataArray.
-     * @return
-     */
-    ToolTipGenerator getToolTipGenerator() const override
-    {
-      ToolTipGenerator toolTipGen;
-      QLocale usa(QLocale::English, QLocale::UnitedStates);
+  /**
+   * @brief printComponent
+   * @param out
+   * @param i
+   * @param j
+   */
+  void printComponent(QTextStream& out, size_t i, int j) const override
+  {
+    Q_ASSERT(false);
+    //        out << Array[i + j];
+  }
+
+  /**
+   *
+   * @param parentId
+   * @return
+   */
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+  {
+    Q_ASSERT(false);
+    return -1;
+  }
 
-      toolTipGen.addTitle("Attribute Array Info");
-      toolTipGen.addValue("Name", getName());
-      toolTipGen.addValue("Type", getTypeAsString());
-      toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+  /**
+   * @brief writeXdmfAttribute
+   * @param out
+   * @param volDims
+   * @param hdfFileName
+   * @param groupPath
+   * @return
+   */
+  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& labelb) const override
+  {
+    out << "<!-- Xdmf is not supported for " << getNameOfClass() << " with type " << getTypeAsString() << " --> ";
+    return -1;
+  }
 
-      return toolTipGen;
-    }
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current DataArray.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override
+  {
+    ToolTipGenerator toolTipGen;
+    QLocale usa(QLocale::English, QLocale::UnitedStates);
 
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    QString getInfoString(SIMPL::InfoStringFormat format) const override
-    {
-      if(format == SIMPL::HtmlFormat)
-      {
-        return getToolTipGenerator().generateHTML();
-      }
-      else
-      {
+    toolTipGen.addTitle("Attribute Array Info");
+    toolTipGen.addValue("Name", getName());
+    toolTipGen.addValue("Type", getTypeAsString());
+    toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
 
-      }
-      return QString();
-    }
+    return toolTipGen;
+  }
 
-    /**
-     * @brief
-     * @param parentId
-     * @return
-     */
-    int readH5Data(hid_t parentId) override
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  QString getInfoString(SIMPL::InfoStringFormat format) const override
+  {
+    if(format == SIMPL::HtmlFormat)
     {
-      Q_ASSERT(false);
-      int err = -1;
-
-      return err;
+      return getToolTipGenerator().generateHTML();
     }
-
-    /**
-     * @brief operator []
-     * @param i
-     * @return
-     */
-    inline T& operator[](size_t i)
+    else
     {
-      Q_ASSERT(i < m_Size);
-      return m_Array[i];
     }
+    return QString();
+  }
+
+  /**
+   * @brief
+   * @param parentId
+   * @return
+   */
+  int readH5Data(hid_t parentId) override
+  {
+    Q_ASSERT(false);
+    int err = -1;
 
+    return err;
+  }
 
-  protected:
-    /**
-     * @brief Protected Constructor
-     * @param numElements The number of elements in the internal array.
-     * @param takeOwnership Will the class clean up the memory. Default=true
-     */
-    StructArray(size_t numElements, bool ownsData = true)
-    : m_Array(nullptr)
-    , m_Size(numElements)
-    , m_OwnsData(ownsData)
-    , m_IsAllocated(false)
-    {
-      m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
-      //  MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
-    }
+  /**
+   * @brief operator []
+   * @param i
+   * @return
+   */
+  inline T& operator[](size_t i)
+  {
+    Q_ASSERT(i < m_Size);
+    return m_Array[i];
+  }
+
+protected:
+  /**
+   * @brief Protected Constructor
+   * @param numElements The number of elements in the internal array.
+   * @param takeOwnership Will the class clean up the memory. Default=true
+   */
+  StructArray(size_t numElements, bool ownsData = true)
+  : m_Array(nullptr)
+  , m_Size(numElements)
+  , m_OwnsData(ownsData)
+  , m_IsAllocated(false)
+  {
+    m_MaxId = (m_Size > 0) ? m_Size - 1 : m_Size;
+    //  MUD_FLAP_0 = MUD_FLAP_1 = MUD_FLAP_2 = MUD_FLAP_3 = MUD_FLAP_4 = MUD_FLAP_5 = 0xABABABABABABABABul;
+  }
 
-    /**
-     * @brief deallocates the memory block
-     */
-    void deallocate()
+  /**
+   * @brief deallocates the memory block
+   */
+  void deallocate()
+  {
+    // We are going to splat 0xABABAB across the first value of the array as a debugging aid
+    unsigned char* cptr = reinterpret_cast<unsigned char*>(m_Array);
+    if(nullptr != cptr)
     {
-      // We are going to splat 0xABABAB across the first value of the array as a debugging aid
-      unsigned char* cptr = reinterpret_cast<unsigned char*>(m_Array);
-      if(nullptr != cptr)
+      if(m_Size > 0)
       {
-        if (m_Size > 0)
+        if(sizeof(T) >= 1)
         {
-          if (sizeof(T) >= 1) { cptr[0] = 0xAB; }
-          if (sizeof(T) >= 2) { cptr[1] = 0xAB; }
-          if (sizeof(T) >= 4) { cptr[2] = 0xAB; cptr[3] = 0xAB;}
-          if (sizeof(T) >= 8) { cptr[4] = 0xAB; cptr[5] = 0xAB; cptr[6] = 0xAB; cptr[7] = 0xAB;}
+          cptr[0] = 0xAB;
+        }
+        if(sizeof(T) >= 2)
+        {
+          cptr[1] = 0xAB;
+        }
+        if(sizeof(T) >= 4)
+        {
+          cptr[2] = 0xAB;
+          cptr[3] = 0xAB;
+        }
+        if(sizeof(T) >= 8)
+        {
+          cptr[4] = 0xAB;
+          cptr[5] = 0xAB;
+          cptr[6] = 0xAB;
+          cptr[7] = 0xAB;
         }
       }
+    }
 #if 0
       if (MUD_FLAP_0 != 0xABABABABABABABABul
           || MUD_FLAP_1 != 0xABABABABABABABABul
@@ -799,87 +824,81 @@ class StructArray : public IDataArray
       }
 #endif
 
-      delete[](m_Array);
-
-      m_Array = nullptr;
-      m_IsAllocated = false;
-    }
-
-    /**
-     * @brief resizes the internal array to be 'size' elements in length
-     * @param size
-     * @return Pointer to the internal array
-     */
-    virtual T* resizeAndExtend(size_t size)
-    {
-      T* newArray = nullptr;
-      size_t newSize = 0;
-
-      if(size == m_Size) // Requested size is equal to current size.  Do nothing.
-      {
-        return m_Array;
-      }
-      newSize = size;
-
-      // Wipe out the array completely if new size is zero.
-      if (newSize == 0)
-      {
-        initialize();
-        return m_Array;
-      }
-
-      newArray = new T[newSize]();
-      if(!newArray)
-      {
-        qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
-        return nullptr;
-      }
-
-      // Copy the data from the old array.
-      if(m_Array != nullptr)
-      {
-        std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
-      }
-
-      // Allocate a new array if we DO NOT own the current array
-      if((nullptr != m_Array) && m_OwnsData)
-      {
-        // Free the old array
-        deallocate();
-      }
+    delete[](m_Array);
 
-      // Allocation was successful.  Save it.
-      m_Size = newSize;
-      m_Array = newArray;
-      // This object has now allocated its memory and owns it.
-      m_OwnsData = true;
+    m_Array = nullptr;
+    m_IsAllocated = false;
+  }
 
-      m_MaxId = newSize - 1;
-      m_IsAllocated = true;
+  /**
+   * @brief resizes the internal array to be 'size' elements in length
+   * @param size
+   * @return Pointer to the internal array
+   */
+  virtual T* resizeAndExtend(size_t size)
+  {
+    T* newArray = nullptr;
+    size_t newSize = 0;
 
+    if(size == m_Size) // Requested size is equal to current size.  Do nothing.
+    {
       return m_Array;
     }
+    newSize = size;
 
-  private:
-
-    //  unsigned long long int MUD_FLAP_0;
-    T* m_Array;
-    //  unsigned long long int MUD_FLAP_1;
-    size_t m_Size;
-    //  unsigned long long int MUD_FLAP_4;
-    bool m_OwnsData;
-    //  unsigned long long int MUD_FLAP_2;
-    size_t m_MaxId;
+    // Wipe out the array completely if new size is zero.
+    if(newSize == 0)
+    {
+      initialize();
+      return m_Array;
+    }
 
-    bool m_IsAllocated;
-    //   unsigned long long int MUD_FLAP_3;
-    //  unsigned long long int MUD_FLAP_5;
+    newArray = new T[newSize]();
+    if(!newArray)
+    {
+      qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
+      return nullptr;
+    }
 
-    StructArray(const StructArray&); //Not Implemented
-    void operator=(const StructArray&); //Not Implemented
+    // Copy the data from the old array.
+    if(m_Array != nullptr)
+    {
+      std::memcpy(newArray, m_Array, (newSize < m_Size ? newSize : m_Size) * sizeof(T));
+    }
 
+    // Allocate a new array if we DO NOT own the current array
+    if((nullptr != m_Array) && m_OwnsData)
+    {
+      // Free the old array
+      deallocate();
+    }
 
-};
+    // Allocation was successful.  Save it.
+    m_Size = newSize;
+    m_Array = newArray;
+    // This object has now allocated its memory and owns it.
+    m_OwnsData = true;
 
+    m_MaxId = newSize - 1;
+    m_IsAllocated = true;
 
+    return m_Array;
+  }
 
+private:
+  //  unsigned long long int MUD_FLAP_0;
+  T* m_Array;
+  //  unsigned long long int MUD_FLAP_1;
+  size_t m_Size;
+  //  unsigned long long int MUD_FLAP_4;
+  bool m_OwnsData;
+  //  unsigned long long int MUD_FLAP_2;
+  size_t m_MaxId;
+
+  bool m_IsAllocated;
+  //   unsigned long long int MUD_FLAP_3;
+  //  unsigned long long int MUD_FLAP_5;
+
+  StructArray(const StructArray&);    // Not Implemented
+  void operator=(const StructArray&); // Not Implemented
+};
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 3b60bef377..f87a362f06 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -102,7 +102,8 @@ struct Sum
   int sum;
 };
 
-template <typename T> void print(const T& v)
+template <typename T>
+void print(const T& v)
 {
   std::cout << v << " ";
 }
@@ -129,7 +130,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestcopyTuplesForType()
+  template <typename T>
+  void TestcopyTuplesForType()
   {
     int err = 0;
     std::vector<size_t> dims(1, NUM_COMPONENTS_2);
@@ -183,7 +185,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestEraseElementsForType()
+  template <typename T>
+  void TestEraseElementsForType()
   {
     // Test dropping of front elements only
     {
@@ -373,7 +376,8 @@ class DataArrayTest
     TestEraseElementsForType<double>();
   }
 
-  template <typename T> QString TypeToString(T v)
+  template <typename T>
+  QString TypeToString(T v)
   {
 
     if(typeid(v) == typeid(long))
@@ -445,7 +449,7 @@ class DataArrayTest
     TEST_TYPE_STRING(uint64_t)
     TEST_TYPE_STRING(float)
     TEST_TYPE_STRING(double)
-}
+  }
 
   // -----------------------------------------------------------------------------
   //
@@ -528,7 +532,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //  Test the NeighborList Class
   // -----------------------------------------------------------------------------
-  template <typename T> void TestNeighborListForType()
+  template <typename T>
+  void TestNeighborListForType()
   {
     typename NeighborList<T>::Pointer n = NeighborList<T>::New();
     n->setName("Test");
@@ -624,7 +629,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestNeighborListDeepCopyForType()
+  template <typename T>
+  void TestNeighborListDeepCopyForType()
   {
 
     std::vector<size_t> tDims(10);
@@ -675,7 +681,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> int ValidateArrayForType(typename DataArray<T>::Pointer array, size_t numTuples, int numComp)
+  template <typename T>
+  int ValidateArrayForType(typename DataArray<T>::Pointer array, size_t numTuples, int numComp)
   {
     int err = 0;
     DREAM3D_REQUIRED(true, ==, array->isAllocated());
@@ -799,7 +806,8 @@ class DataArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestArrayCreationForType()
+  template <typename T>
+  void TestArrayCreationForType()
   {
     int err = 0;
     size_t numTuples = NUM_TUPLES;
@@ -942,7 +950,8 @@ true);
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestDeepCopyDataArrayForType()
+  template <typename T>
+  void TestDeepCopyDataArrayForType()
   {
     size_t numTuples = 10;
     std::vector<size_t> cDims(1, 5);
@@ -998,7 +1007,8 @@ true);
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestCopyDataForType()
+  template <typename T>
+  void TestCopyDataForType()
   {
     size_t numTuples = 10;
     std::vector<size_t> cDims(1, 5);
@@ -1120,7 +1130,8 @@ true);
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestWrapPointerForType()
+  template <typename T>
+  void TestWrapPointerForType()
   {
     std::vector<size_t> cDims = {1};
     T* ptr = new T[TEST_SIZE]; // Allocate on the heap
@@ -1185,7 +1196,8 @@ true);
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void TestSetTupleForType()
+  template <typename T>
+  void TestSetTupleForType()
   {
     size_t numTuples = 10;
     std::vector<size_t> cDims = {5};
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 317a3911c9..5842de1d86 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <stdlib.h>
 
@@ -82,7 +82,7 @@ static const QString _6("six");
 static const QString _7("seven");
 static const QString _8("eight");
 static const QString _9("nine");
-}
+} // namespace
 
 const QString kArrayName("Test Strings");
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index 1111cb60b0..c90143ba23 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <stdlib.h>
 
@@ -457,7 +457,8 @@ class StructArrayTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void _TestDeepCopyStructArray()
+  template <typename T>
+  void _TestDeepCopyStructArray()
   {
     size_t numTuples = 10;
     std::vector<size_t> cDims(1, 1);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index db264db7f2..ad4faea4b0 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QTextStream>
 #include <QtCore/QDebug>
@@ -209,30 +209,30 @@ AttributeMatrix::Type AttributeMatrix::StringToType(const QString& str)
 // -----------------------------------------------------------------------------
 QVector<QString> AttributeMatrix::GetTypesAsStrings()
 {
-    QVector<QString> choices;
-    choices.push_back("Vertex");
-    choices.push_back("Edge");
-    choices.push_back("Face");
-    choices.push_back("Cell");
-    choices.push_back("VertexFeature");
-    choices.push_back("EdgeFeature");
-    choices.push_back("FaceFeature");
-    choices.push_back("CellFeature");
-    choices.push_back("VertexEnsemble");
-    choices.push_back("EdgeEnsemble");
-    choices.push_back("FaceEnsemble");
-    choices.push_back("CellEnsemble");
-    choices.push_back("MetaData");
-    choices.push_back("Generic");
-    choices.push_back("Unknown");
-    choices.push_back("Any");
-    return choices;
+  QVector<QString> choices;
+  choices.push_back("Vertex");
+  choices.push_back("Edge");
+  choices.push_back("Face");
+  choices.push_back("Cell");
+  choices.push_back("VertexFeature");
+  choices.push_back("EdgeFeature");
+  choices.push_back("FaceFeature");
+  choices.push_back("CellFeature");
+  choices.push_back("VertexEnsemble");
+  choices.push_back("EdgeEnsemble");
+  choices.push_back("FaceEnsemble");
+  choices.push_back("CellEnsemble");
+  choices.push_back("MetaData");
+  choices.push_back("Generic");
+  choices.push_back("Unknown");
+  choices.push_back("Any");
+  return choices;
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString &h5InternalPath)
+void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContainerProxy* dcProxy, SIMPLH5DataReaderRequirements* req, const QString& h5InternalPath)
 {
   QList<QString> attributeMatrixNames;
   QH5Utilities::getGroupObjects(containerId, H5Utilities::CustomHDFDataTypes::Group, attributeMatrixNames);
@@ -255,7 +255,7 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
       herr_t err = QH5Lite::readScalarAttribute(containerId, attributeMatrixName, SIMPL::StringConstants::AttributeMatrixType, amTypeTmp);
       if(err >= 0)
       {
-        if (req != nullptr)
+        if(req != nullptr)
         {
           AttributeMatrix::Types amTypes = req->getAMTypes();
           if(amTypes.empty() || amTypes.contains(static_cast<AttributeMatrix::Type>(amTypeTmp)))
@@ -363,7 +363,7 @@ RenameErrorCodes AttributeMatrix::renameAttributeArray(const QString& oldname, c
   {
     return SUCCESS;
   }
-  
+
   // Rename not successful
   return NEW_EXISTS;
 }
@@ -405,13 +405,13 @@ size_t AttributeMatrix::getNumberOfTuples() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool AttributeMatrix::removeInactiveObjects(const QVector<bool> &activeObjects, DataArray<int32_t> *featureIds)
+bool AttributeMatrix::removeInactiveObjects(const QVector<bool>& activeObjects, DataArray<int32_t>* featureIds)
 {
   bool acceptableMatrix = false;
   // Only valid for feature or ensemble type matrices
   if(m_Type == AttributeMatrix::Type::VertexFeature || m_Type == AttributeMatrix::Type::VertexEnsemble || m_Type == AttributeMatrix::Type::EdgeFeature ||
-     m_Type == AttributeMatrix::Type::EdgeEnsemble || m_Type == AttributeMatrix::Type::FaceFeature || m_Type == AttributeMatrix::Type::FaceEnsemble ||
-     m_Type == AttributeMatrix::Type::CellFeature || m_Type == AttributeMatrix::Type::CellEnsemble)
+     m_Type == AttributeMatrix::Type::EdgeEnsemble || m_Type == AttributeMatrix::Type::FaceFeature || m_Type == AttributeMatrix::Type::FaceEnsemble || m_Type == AttributeMatrix::Type::CellFeature ||
+     m_Type == AttributeMatrix::Type::CellEnsemble)
   {
     acceptableMatrix = true;
   }
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
old mode 100755
new mode 100644
index 69109c252d..5f841a8adb
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -1,45 +1,44 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#if defined (_MSC_VER)
-#define WIN32_LEAN_AND_MEAN   // Exclude rarely-used stuff from Windows headers
+#if defined(_MSC_VER)
+#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
 #endif
 
-
 //-- C++ includes
 #include <memory>
 #include <vector>
@@ -65,7 +64,8 @@
 class AttributeMatrixProxy;
 class DataContainerProxy;
 class SIMPLH5DataReaderRequirements;
-template<class T> class DataArray;
+template <class T>
+class DataArray;
 
 enum RenameErrorCodes
 {
@@ -131,8 +131,8 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
   using Container_t = std::vector<std::shared_ptr<IDataArray>>;
 
   /**
-  * @brief The Type is an enum that describes the type of data that the AttributeMatrix holds
-  */
+   * @brief The Type is an enum that describes the type of data that the AttributeMatrix holds
+   */
   enum class Type : EnumType
   {
     Vertex = 0,         //!<
@@ -217,446 +217,466 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    */
   DataArrayPath getDataArrayPath() const override;
 
-    /**
-    * @brief Type
-    */
-    /**
-     * @brief Setter property for Type
-     */
-    void setType(const AttributeMatrix::Type& value);
-    /**
-     * @brief Getter property for Type
-     * @return Value of Type
-     */
-    AttributeMatrix::Type getType() const;
-
-    /**
-     * @brief Adds the IDataArray to the AttributeMatrix.
-     * @param data The IDataArrayShPtrType that will hold the data
-     * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
-     */
-    bool addOrReplaceAttributeArray(const IDataArrayShPtrType& data);
-
-    /**
-     * @brief Returns the array for a given named array or the equivelant to a
-     * null pointer if the name does not exist.
-     * @param name The name of the data array
-     */
-    IDataArrayShPtrType getAttributeArray(const QString& name) const;
-
-    /**
-     * @brief getAttributeArray
-     * @param path
-     * @return
-     */
-    IDataArrayShPtrType getAttributeArray(const DataArrayPath& path) const;
-
-    /**
-    * @brief returns a IDataArray based object that is stored in the attribute matrix by a
-    * given name.
-    * @param name The name of the array
-    */
-    template<class ArrayType>
-    typename ArrayType::Pointer getAttributeArrayAs(const QString& name) const
-    {
-      IDataArrayShPtrType iDataArray = getAttributeArray(name);
-      return std::dynamic_pointer_cast< ArrayType >(iDataArray);
-    }
+  /**
+   * @brief Type
+   */
+  /**
+   * @brief Setter property for Type
+   */
+  void setType(const AttributeMatrix::Type& value);
+  /**
+   * @brief Getter property for Type
+   * @return Value of Type
+   */
+  AttributeMatrix::Type getType() const;
 
+  /**
+   * @brief Adds the IDataArray to the AttributeMatrix.
+   * @param data The IDataArrayShPtrType that will hold the data
+   * @return Bool: True if the addition happened, FALSE if an IDataArray with the same name already exists.
+   */
+  bool addOrReplaceAttributeArray(const IDataArrayShPtrType& data);
 
-    /**
-     * @brief Returns bool of whether a named array exists
-     * @param name The name of the data array
-     */
-    bool doesAttributeArrayExist(const QString& name) const;
-
-    /**
-     * @brief Removes the named data array from the Data Container and returns it to the calling
-     * method.
-     * @param name The name of the array
-     * @return
-     */
-    virtual IDataArrayShPtrType removeAttributeArray(const QString& name);
-
-    /**
-    * @brief Renames a cell data array from the Data Container
-    * @param name The name of the array
-    */
-    virtual RenameErrorCodes renameAttributeArray(const QString& oldname, const QString& newname, bool overwrite = false);
-
-
-    /**
-     * @brief Removes all the Cell Arrays
-     */
-    virtual void clearAttributeArrays();
-
-    /**
-     * @brief Returns the collection of contained DataArrays
-     * @return
-     */
-    Container_t getAttributeArrays() const;
-
-    /**
-    * @brief Returns a list that contains the names of all the arrays currently stored in the
-    * Cell (Formerly Cell) group
-    * @return
-    */
-    virtual NameList getAttributeArrayNames() const;
-
-    /**
-    * @brief Returns the total number of arrays that are stored in the Cell group
-    * @return
-    */
-    int getNumAttributeArrays() const;
-
-    /**
-    * @brief Resizes an array from the Attribute Matrix
-    * @param size The new size of the array
-    */
-    void resizeAttributeArrays(const std::vector<size_t>& tDims);
-
-    /**
-     * @brief Returns bool of whether a named array exists
-     * @param name The name of the data array
-     */
-    virtual bool validateAttributeArraySizes() const;
-
-    /**
-     * @brief getPrereqArray
-     * @param filter An instance of an AbstractFilter that is calling this function. Can be nullptr in which case
-     * no error message will be returned if there is an error. Will only check component dims if cDims is not empty.
-     * @param attributeArrayName The name of the Attribute Array
-     * @param err The error code to set into the filter if there is an error
-     * @param cDims The component Dimensions of the Data Array
-     * @return A valid IDataArray Subclass if the array exists otherwise a null shared pointer.
-     */
-    template <class ArrayType>
-    typename ArrayType::Pointer getPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, int err, const std::vector<size_t>& cDims = {}) const
-    {
-      QString ss;
-      typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
-      //Make sure the name is not empty for the AttributeArrayName. This would be detected below
-      // in the call to get either one BUT the reason for the failure would not be evident so we make these explicit checks
-      // here and send back nice error messages to ther user/programmer.
-      if(attributeArrayName.isEmpty())
-      {
-        if(filter)
-        {
-          ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
-          filter->setErrorCondition(err, ss);
-        }
-      }
-      // Now ask for the actual AttributeArray from the AttributeMatrix
-      if(!doesAttributeArrayExist(attributeArrayName))
-      {
-        if(filter)
-        {
-          ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
-          filter->setErrorCondition(err, ss);
-        }
-        return attributeArray;
-      }
+  /**
+   * @brief Returns the array for a given named array or the equivelant to a
+   * null pointer if the name does not exist.
+   * @param name The name of the data array
+   */
+  IDataArrayShPtrType getAttributeArray(const QString& name) const;
 
-      if(!cDims.empty())
-      {
-        size_t numComp = std::accumulate(cDims.cbegin(), cDims.cend(), static_cast<size_t>(1), std::multiplies<size_t>());
+  /**
+   * @brief getAttributeArray
+   * @param path
+   * @return
+   */
+  IDataArrayShPtrType getAttributeArray(const DataArrayPath& path) const;
 
-        // Check to make sure the AttributeArray we have is of the proper type, size and number of components
-        if(false == dataArrayCompatibility<ArrayType>(attributeArrayName, numComp, filter))
-        {
-          return attributeArray;
-        }
-      }
+  /**
+   * @brief returns a IDataArray based object that is stored in the attribute matrix by a
+   * given name.
+   * @param name The name of the array
+   */
+  template <class ArrayType>
+  typename ArrayType::Pointer getAttributeArrayAs(const QString& name) const
+  {
+    IDataArrayShPtrType iDataArray = getAttributeArray(name);
+    return std::dynamic_pointer_cast<ArrayType>(iDataArray);
+  }
+
+  /**
+   * @brief Returns bool of whether a named array exists
+   * @param name The name of the data array
+   */
+  bool doesAttributeArrayExist(const QString& name) const;
+
+  /**
+   * @brief Removes the named data array from the Data Container and returns it to the calling
+   * method.
+   * @param name The name of the array
+   * @return
+   */
+  virtual IDataArrayShPtrType removeAttributeArray(const QString& name);
+
+  /**
+   * @brief Renames a cell data array from the Data Container
+   * @param name The name of the array
+   */
+  virtual RenameErrorCodes renameAttributeArray(const QString& oldname, const QString& newname, bool overwrite = false);
+
+  /**
+   * @brief Removes all the Cell Arrays
+   */
+  virtual void clearAttributeArrays();
+
+  /**
+   * @brief Returns the collection of contained DataArrays
+   * @return
+   */
+  Container_t getAttributeArrays() const;
+
+  /**
+   * @brief Returns a list that contains the names of all the arrays currently stored in the
+   * Cell (Formerly Cell) group
+   * @return
+   */
+  virtual NameList getAttributeArrayNames() const;
 
-      IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
-      attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
-      if(nullptr == attributeArray.get() && filter)
+  /**
+   * @brief Returns the total number of arrays that are stored in the Cell group
+   * @return
+   */
+  int getNumAttributeArrays() const;
+
+  /**
+   * @brief Resizes an array from the Attribute Matrix
+   * @param size The new size of the array
+   */
+  void resizeAttributeArrays(const std::vector<size_t>& tDims);
+
+  /**
+   * @brief Returns bool of whether a named array exists
+   * @param name The name of the data array
+   */
+  virtual bool validateAttributeArraySizes() const;
+
+  /**
+   * @brief getPrereqArray
+   * @param filter An instance of an AbstractFilter that is calling this function. Can be nullptr in which case
+   * no error message will be returned if there is an error. Will only check component dims if cDims is not empty.
+   * @param attributeArrayName The name of the Attribute Array
+   * @param err The error code to set into the filter if there is an error
+   * @param cDims The component Dimensions of the Data Array
+   * @return A valid IDataArray Subclass if the array exists otherwise a null shared pointer.
+   */
+  template <class ArrayType>
+  typename ArrayType::Pointer getPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, int err, const std::vector<size_t>& cDims = {}) const
+  {
+    QString ss;
+    typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
+    // Make sure the name is not empty for the AttributeArrayName. This would be detected below
+    // in the call to get either one BUT the reason for the failure would not be evident so we make these explicit checks
+    // here and send back nice error messages to ther user/programmer.
+    if(attributeArrayName.isEmpty())
+    {
+      if(filter)
+      {
+        ss = QObject::tr("AttributeMatrix:'%1' The name of a requested Attribute Array was empty. Please provide a name for this array").arg(getName());
+        filter->setErrorCondition(err, ss);
+      }
+    }
+    // Now ask for the actual AttributeArray from the AttributeMatrix
+    if(!doesAttributeArrayExist(attributeArrayName))
+    {
+      if(filter)
       {
-        ss = QObject::tr("The AttributeMatrix named '%1' contains an array with name '%2' but the DataArray could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
+        ss = QObject::tr("The AttributeMatrix named '%1' does NOT have a DataArray with name '%2'. This filter requires this DataArray in order to execute.").arg(getName()).arg(attributeArrayName);
         filter->setErrorCondition(err, ss);
       }
       return attributeArray;
     }
 
-    /**
-     * @brief getExistingPrereqArray
-     * @param filter
-     * @param attributeArrayName
-     * @param err
-     * @return
-     */
-    IDataArray::Pointer getPrereqIDataArray(AbstractFilter* filter, const QString& attributeArrayName, int err) const;
-
-    /**
-     * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The condition for this
-     * method to work properly is the name of the attribute array is not empty
-     * @param filter The instance of the filter the filter that is requesting the new array
-     * @param attributeArrayName The name of the AttributeArray to create
-     * @param initValue The initial value of all the elements of the array
-     * @param size The number of tuples in the Array
-     * @param dims The dimensions of the components of the AttributeArray
-     * @return A Shared Pointer to the newly created array
-     */
-    template <class ArrayType>
-    typename ArrayType::Pointer createNonPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims,
-                                                     RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+    if(!cDims.empty())
     {
-      typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
+      size_t numComp = std::accumulate(cDims.cbegin(), cDims.cend(), static_cast<size_t>(1), std::multiplies<size_t>());
 
-      QString ss;
-      if(attributeArrayName.isEmpty())
+      // Check to make sure the AttributeArray we have is of the proper type, size and number of components
+      if(false == dataArrayCompatibility<ArrayType>(attributeArrayName, numComp, filter))
       {
-        if(filter)
-        {
-          ss = QObject::tr("The name of the array was empty. Please provide a name for this array.");
-          filter->setErrorCondition(-10001, ss);
-        }
         return attributeArray;
       }
-      IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
-      if (nullptr == iDataArray.get())
-      {
-        createAndAddAttributeArray<ArrayType>(filter, attributeArrayName, initValue, compDims);
-      }
-      else if (filter)
-      {
-        ss = QObject::tr("AttributeMatrix:'%1' An Attribute Array already exists with the name %2.").arg(getName()).arg(attributeArrayName);
-        filter->setErrorCondition(-10002, ss);
-        return attributeArray;
-      }
-      iDataArray = getAttributeArray(attributeArrayName);
-      if(nullptr == iDataArray && filter)
-      {
-        ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be created.").arg(getName()).arg(attributeArrayName);
-        filter->setErrorCondition(-10003, ss);
-      }
-      attributeArray = std::dynamic_pointer_cast< ArrayType >(iDataArray);
-      if(nullptr == attributeArray.get() && filter)
-      {
-        ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
-        filter->setErrorCondition(-10004, ss);
-      }
-      else if(nullptr != attributeArray && filter)
+    }
+
+    IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
+    attributeArray = std::dynamic_pointer_cast<ArrayType>(iDataArray);
+    if(nullptr == attributeArray.get() && filter)
+    {
+      ss = QObject::tr("The AttributeMatrix named '%1' contains an array with name '%2' but the DataArray could not be downcast using std::dynamic_pointer_cast<T>.")
+               .arg(getName())
+               .arg(attributeArrayName);
+      filter->setErrorCondition(err, ss);
+    }
+    return attributeArray;
+  }
+
+  /**
+   * @brief getExistingPrereqArray
+   * @param filter
+   * @param attributeArrayName
+   * @param err
+   * @return
+   */
+  IDataArray::Pointer getPrereqIDataArray(AbstractFilter* filter, const QString& attributeArrayName, int err) const;
+
+  /**
+   * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The condition for this
+   * method to work properly is the name of the attribute array is not empty
+   * @param filter The instance of the filter the filter that is requesting the new array
+   * @param attributeArrayName The name of the AttributeArray to create
+   * @param initValue The initial value of all the elements of the array
+   * @param size The number of tuples in the Array
+   * @param dims The dimensions of the components of the AttributeArray
+   * @return A Shared Pointer to the newly created array
+   */
+  template <class ArrayType>
+  typename ArrayType::Pointer createNonPrereqArray(AbstractFilter* filter, const QString& attributeArrayName, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims,
+                                                   RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+  {
+    typename ArrayType::Pointer attributeArray = ArrayType::NullPointer();
+
+    QString ss;
+    if(attributeArrayName.isEmpty())
+    {
+      if(filter)
       {
-        // Check if path was renamed
-        // This will crash if no parent node is found
-        IDataStructureNode* parentPtr = getParentNode();
-        RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(parentPtr->getName(), getName(), attributeArrayName));
+        ss = QObject::tr("The name of the array was empty. Please provide a name for this array.");
+        filter->setErrorCondition(-10001, ss);
       }
       return attributeArray;
     }
+    IDataArrayShPtrType iDataArray = getAttributeArray(attributeArrayName);
+    if(nullptr == iDataArray.get())
+    {
+      createAndAddAttributeArray<ArrayType>(filter, attributeArrayName, initValue, compDims);
+    }
+    else if(filter)
+    {
+      ss = QObject::tr("AttributeMatrix:'%1' An Attribute Array already exists with the name %2.").arg(getName()).arg(attributeArrayName);
+      filter->setErrorCondition(-10002, ss);
+      return attributeArray;
+    }
+    iDataArray = getAttributeArray(attributeArrayName);
+    if(nullptr == iDataArray && filter)
+    {
+      ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be created.").arg(getName()).arg(attributeArrayName);
+      filter->setErrorCondition(-10003, ss);
+    }
+    attributeArray = std::dynamic_pointer_cast<ArrayType>(iDataArray);
+    if(nullptr == attributeArray.get() && filter)
+    {
+      ss = QObject::tr("AttributeMatrix:'%1' An array with name '%2' could not be downcast using std::dynamic_pointer_cast<T>.").arg(getName()).arg(attributeArrayName);
+      filter->setErrorCondition(-10004, ss);
+    }
+    else if(nullptr != attributeArray && filter)
+    {
+      // Check if path was renamed
+      // This will crash if no parent node is found
+      IDataStructureNode* parentPtr = getParentNode();
+      RenameDataPath::AlertFilterCreatedPath(filter, id, DataArrayPath(parentPtr->getName(), getName(), attributeArrayName));
+    }
+    return attributeArray;
+  }
 
-    /**
-    * @brief Creates and Adds the data for a named array
-    * @param name The name that the array will be known by
-    * @param dims The size the data on each tuple
-    */
-    template <class ArrayType>
-    void createAndAddAttributeArray(AbstractFilter* filter, const QString& name, typename ArrayType::value_type initValue, std::vector<size_t> compDims, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+  /**
+   * @brief Creates and Adds the data for a named array
+   * @param name The name that the array will be known by
+   * @param dims The size the data on each tuple
+   */
+  template <class ArrayType>
+  void createAndAddAttributeArray(AbstractFilter* filter, const QString& name, typename ArrayType::value_type initValue, std::vector<size_t> compDims,
+                                  RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+  {
+    bool allocateData = false;
+    if(nullptr == filter)
+    {
+      allocateData = true;
+    }
+    else
     {
-      bool allocateData = false;
-      if(nullptr == filter) { allocateData = true; }
-      else { allocateData = !filter->getInPreflight(); }
-      typename ArrayType::Pointer attributeArray = ArrayType::CreateArray(getNumberOfTuples(), compDims, name, allocateData);
-      if(attributeArray.get() != nullptr)
+      allocateData = !filter->getInPreflight();
+    }
+    typename ArrayType::Pointer attributeArray = ArrayType::CreateArray(getNumberOfTuples(), compDims, name, allocateData);
+    if(attributeArray.get() != nullptr)
+    {
+      if(allocateData)
       {
-        if(allocateData)
-        {
-          attributeArray->initializeWithValue(initValue);
-        }
-        attributeArray->setInitValue(initValue);
-        addOrReplaceAttributeArray(attributeArray);
-        // Check if path was renamed
-        DataArrayPath path = getDataArrayPath();
-        path.setDataArrayName(name);
-        RenameDataPath::AlertFilterCreatedPath(filter, id, path);
+        attributeArray->initializeWithValue(initValue);
       }
+      attributeArray->setInitValue(initValue);
+      addOrReplaceAttributeArray(attributeArray);
+      // Check if path was renamed
+      DataArrayPath path = getDataArrayPath();
+      path.setDataArrayName(name);
+      RenameDataPath::AlertFilterCreatedPath(filter, id, path);
     }
+  }
 
-    /**
-     * @brief dataArrayCompatibility
-     * @param arrayName
-     * @param numComp
-     * @param filter
-     * @return
-     */
-    template<class ArrayType>
-    bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter) const
+  /**
+   * @brief dataArrayCompatibility
+   * @param arrayName
+   * @param numComp
+   * @param filter
+   * @return
+   */
+  template <class ArrayType>
+  bool dataArrayCompatibility(const QString& arrayName, int numComp, AbstractFilter* filter) const
+  {
+    // Make sure the types are the same
+    IDataArrayShPtrType ida = getAttributeArray(arrayName);
+    typename ArrayType::Pointer targetDestArray = std::dynamic_pointer_cast<ArrayType>(ida);
+    if(targetDestArray.get() == nullptr)
     {
-      // Make sure the types are the same
-      IDataArrayShPtrType ida = getAttributeArray(arrayName);
-      typename ArrayType::Pointer targetDestArray = std::dynamic_pointer_cast< ArrayType >(ida);
-      if(targetDestArray.get() == nullptr)
+      if(nullptr != filter)
       {
-        if (nullptr != filter)
-        {
-          typename ArrayType::Pointer validTargetArray = ArrayType::CreateArray(1, "JUNK_INTERNAL_ARRAY", false);
-          IDataArrayShPtrType srcArray = getAttributeArray(arrayName);
-          QString srcDesc = srcArray->getTypeAsString();
-          QString desc = validTargetArray->getTypeAsString();
-          QString ss = QObject::tr("The Filter '%1' requires an array of type '%2' but the data array '%3' has a type of '%4'").arg(filter->getHumanLabel()).arg(desc).arg(srcArray->getName()).arg(srcDesc);
-          filter->setErrorCondition(-501, ss);
-        }
-        return false;
+        typename ArrayType::Pointer validTargetArray = ArrayType::CreateArray(1, "JUNK_INTERNAL_ARRAY", false);
+        IDataArrayShPtrType srcArray = getAttributeArray(arrayName);
+        QString srcDesc = srcArray->getTypeAsString();
+        QString desc = validTargetArray->getTypeAsString();
+        QString ss =
+            QObject::tr("The Filter '%1' requires an array of type '%2' but the data array '%3' has a type of '%4'").arg(filter->getHumanLabel()).arg(desc).arg(srcArray->getName()).arg(srcDesc);
+        filter->setErrorCondition(-501, ss);
       }
-      // Make sure the sizes are equal to what is being asked for
-      if (getNumberOfTuples() != targetDestArray->getNumberOfTuples())
+      return false;
+    }
+    // Make sure the sizes are equal to what is being asked for
+    if(getNumberOfTuples() != targetDestArray->getNumberOfTuples())
+    {
+      if(nullptr != filter)
       {
-        if (nullptr != filter)
-        {
-          QString ss = QObject::tr("Filter '%1' requires array with name '%2' to have Number of Tuples = %3. The currently selected array "
-                                   " has %4").arg(filter->getHumanLabel()).arg(arrayName).arg((getNumberOfTuples())).arg(targetDestArray->getNumberOfTuples());
-          filter->setErrorCondition(-502, ss);
-        }
-        return false;
+        QString ss = QObject::tr("Filter '%1' requires array with name '%2' to have Number of Tuples = %3. The currently selected array "
+                                 " has %4")
+                         .arg(filter->getHumanLabel())
+                         .arg(arrayName)
+                         .arg((getNumberOfTuples()))
+                         .arg(targetDestArray->getNumberOfTuples());
+        filter->setErrorCondition(-502, ss);
       }
-      // Make sure the number of components match
-      if (numComp != targetDestArray->getNumberOfComponents())
+      return false;
+    }
+    // Make sure the number of components match
+    if(numComp != targetDestArray->getNumberOfComponents())
+    {
+      if(nullptr != filter)
       {
-        if (nullptr != filter)
-        {
-          QString ss = QObject::tr("Filter '%1' is trying to use array '%2' where the number of components is %3 but the filter requires that array "
-                                   " to have %4.").arg(filter->getHumanLabel()).arg(targetDestArray->getName()).arg(targetDestArray->getNumberOfComponents()).arg(numComp);
-          filter->setErrorCondition(-503, ss);
-        }
-        return false;
+        QString ss = QObject::tr("Filter '%1' is trying to use array '%2' where the number of components is %3 but the filter requires that array "
+                                 " to have %4.")
+                         .arg(filter->getHumanLabel())
+                         .arg(targetDestArray->getName())
+                         .arg(targetDestArray->getNumberOfComponents())
+                         .arg(numComp);
+        filter->setErrorCondition(-503, ss);
       }
-      // Make sure we can downcast to the proper type
-      typename ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(targetDestArray);
-      if (nullptr == array.get())
+      return false;
+    }
+    // Make sure we can downcast to the proper type
+    typename ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(targetDestArray);
+    if(nullptr == array.get())
+    {
+      typename ArrayType::Pointer dat = ArrayType::CreateArray(1, "JUNK-INTERNAL-USE-ONLY", true);
+      QString ss = QObject::tr(" - The filter requested an array named '%1' with type '%2' from the filter '%3'.\n"
+                               "An Array with name '%4' is stored in the %5 but is of type %6\n")
+                       .arg(arrayName)
+                       .arg(dat->getTypeAsString())
+                       .arg(getNameOfClass())
+                       .arg(arrayName)
+                       .arg(getNameOfClass())
+                       .arg(targetDestArray->getTypeAsString());
+      if(nullptr != filter)
       {
-        typename ArrayType::Pointer dat = ArrayType::CreateArray(1, "JUNK-INTERNAL-USE-ONLY", true);
-        QString ss = QObject::tr(" - The filter requested an array named '%1' with type '%2' from the filter '%3'.\n"
-                                 "An Array with name '%4' is stored in the %5 but is of type %6\n")
-                     .arg(arrayName).arg(dat->getTypeAsString()).arg(getNameOfClass()).arg(arrayName).arg(getNameOfClass()).arg(targetDestArray->getTypeAsString());
-        if (nullptr != filter)
-        {
-          filter->setErrorCondition(-504, ss);
-        }
-        return false;
+        filter->setErrorCondition(-504, ss);
       }
-      return true;
+      return false;
     }
+    return true;
+  }
+
+  /**
+  * @brief Removes inactive objects from the Attribute Matrix and renumbers the active objects to preserve a compact matrix
+    (only valid for feature or ensemble type matrices)
+  * @param size The new size of the array
+  */
+  bool removeInactiveObjects(const QVector<bool>& activeObjects, DataArray<int32_t>* featureIds);
+
+  /**
+   * @brief Sets the Tuple Dimensions for the Attribute Matrix
+   * @param tupleDims
+   */
+  void setTupleDimensions(const std::vector<size_t>& tupleDims);
+
+  /**
+   * @brief Returns the Tuple Dimensions of the AttributeMatrix
+   * @return
+   */
+  std::vector<size_t> getTupleDimensions() const;
+
+  /**
+   * @brief Returns the number of Tuples that the feature data has. For example if there are 32 features
+   * in during a set of filtering operations then the a value of '32' would be returned.
+   * @return
+   */
+  size_t getNumberOfTuples() const;
+
+  /**
+   * @brief creates and returns a copy of the attribute matrix
+   * @return On error, will return a null pointer.  It is the responsibility of the calling function to check for errors and return an error message using the PipelineMessage
+   */
+  virtual AttributeMatrix::Pointer deepCopy(bool forceNoAllocate = false) const;
+
+  /**
+   * @brief writeAttributeArraysToHDF5
+   * @param parentId
+   * @return
+   */
+  virtual int writeAttributeArraysToHDF5(hid_t parentId) const;
+
+  /**
+   * @brief addAttributeArrayFromHDF5Path
+   * @param gid
+   * @param name
+   * @param preflight
+   * @return
+   */
+  virtual int addAttributeArrayFromHDF5Path(hid_t gid, const QString& name, bool preflight);
+
+  /**
+   * @brief readAttributeArraysFromHDF5
+   * @param amGid
+   * @param preflight
+   * @param attrMatProxy
+   * @return
+   */
+  virtual int readAttributeArraysFromHDF5(hid_t amGid, bool preflight, AttributeMatrixProxy* attrMatProxy);
+
+  /**
+   * @brief generateXdmfText
+   * @param centering
+   * @param dataContainerName
+   * @param hdfFileName
+   * @param gridType
+   * @return
+   */
+  virtual QString generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
+
+  /**
+   * @brief getInfoString Returns a text string in the given format that has information
+   * about the attribute Matrix
+   * @param format A value from the SIMPL::InfoStringFormat enumeration
+   * @return
+   */
+  virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the current AttributeMatrix.
+   * @return
+   */
+  virtual ToolTipGenerator getToolTipGenerator() const;
+
+protected:
+  AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
+
+  /**
+   * @brief writeXdmfAttributeData
+   * @param array
+   * @param centering
+   * @param dataContainerName
+   * @param hdfFileName
+   * @param gridType
+   * @return
+   */
+  virtual QString writeXdmfAttributeData(const IDataArrayShPtrType& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
+
+  /**
+   * @brief writeXdmfAttributeDataHelper
+   * @param numComp
+   * @param attrType
+   * @param dataContainerName
+   * @param array
+   * @param centering
+   * @param precision
+   * @param xdmfTypeName
+   * @param hdfFileName
+   * @param gridType
+   * @return
+   */
+  virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArrayShPtrType& array, const QString& centering, int precision,
+                                               const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0) const;
+
+private:
+  std::vector<size_t> m_TupleDims;
+  AttributeMatrix::Type m_Type = {};
 
-    /**
-    * @brief Removes inactive objects from the Attribute Matrix and renumbers the active objects to preserve a compact matrix
-      (only valid for feature or ensemble type matrices)
-    * @param size The new size of the array
-    */
-    bool removeInactiveObjects(const QVector<bool> &activeObjects, DataArray<int32_t>* featureIds);
-
-    /**
-     * @brief Sets the Tuple Dimensions for the Attribute Matrix
-     * @param tupleDims
-     */
-    void setTupleDimensions(const std::vector<size_t>& tupleDims);
-
-    /**
-     * @brief Returns the Tuple Dimensions of the AttributeMatrix
-     * @return
-     */
-    std::vector<size_t> getTupleDimensions() const;
-
-    /**
-    * @brief Returns the number of Tuples that the feature data has. For example if there are 32 features
-    * in during a set of filtering operations then the a value of '32' would be returned.
-    * @return
-    */
-    size_t getNumberOfTuples() const;
-
-    /**
-    * @brief creates and returns a copy of the attribute matrix
-    * @return On error, will return a null pointer.  It is the responsibility of the calling function to check for errors and return an error message using the PipelineMessage
-    */
-    virtual AttributeMatrix::Pointer deepCopy(bool forceNoAllocate = false) const;
-
-    /**
-     * @brief writeAttributeArraysToHDF5
-     * @param parentId
-     * @return
-     */
-    virtual int writeAttributeArraysToHDF5(hid_t parentId) const;
-
-    /**
-     * @brief addAttributeArrayFromHDF5Path
-     * @param gid
-     * @param name
-     * @param preflight
-     * @return
-     */
-    virtual int addAttributeArrayFromHDF5Path(hid_t gid, const QString& name, bool preflight);
-
-    /**
-     * @brief readAttributeArraysFromHDF5
-     * @param amGid
-     * @param preflight
-     * @param attrMatProxy
-     * @return
-     */
-    virtual int readAttributeArraysFromHDF5(hid_t amGid, bool preflight, AttributeMatrixProxy* attrMatProxy);
-
-    /**
-     * @brief generateXdmfText
-     * @param centering
-     * @param dataContainerName
-     * @param hdfFileName
-     * @param gridType
-     * @return
-     */
-    virtual QString generateXdmfText(const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
-
-    /**
-     * @brief getInfoString Returns a text string in the given format that has information
-     * about the attribute Matrix
-     * @param format A value from the SIMPL::InfoStringFormat enumeration
-     * @return
-     */
-    virtual QString getInfoString(SIMPL::InfoStringFormat format) const;
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the current AttributeMatrix.
-     * @return
-     */
-    virtual ToolTipGenerator getToolTipGenerator() const;
-
-  protected:
-    AttributeMatrix(const std::vector<size_t>& tDims, const QString& name, AttributeMatrix::Type attrType);
-
-    /**
-     * @brief writeXdmfAttributeData
-     * @param array
-     * @param centering
-     * @param dataContainerName
-     * @param hdfFileName
-     * @param gridType
-     * @return
-     */
-    virtual QString writeXdmfAttributeData(const IDataArrayShPtrType& array, const QString& centering, const QString& dataContainerName, const QString& hdfFileName, uint8_t gridType = 0) const;
-
-    /**
-     * @brief writeXdmfAttributeDataHelper
-     * @param numComp
-     * @param attrType
-     * @param dataContainerName
-     * @param array
-     * @param centering
-     * @param precision
-     * @param xdmfTypeName
-     * @param hdfFileName
-     * @param gridType
-     * @return
-     */
-    virtual QString writeXdmfAttributeDataHelper(int numComp, const QString& attrType, const QString& dataContainerName, const IDataArrayShPtrType& array, const QString& centering, int precision,
-                                                 const QString& xdmfTypeName, const QString& hdfFileName, uint8_t gridType = 0) const;
-
-  private:
-
-    std::vector<size_t> m_TupleDims;
-    AttributeMatrix::Type m_Type = {};
-
-    AttributeMatrix(const AttributeMatrix&);
-    void operator =(const AttributeMatrix&);
+  AttributeMatrix(const AttributeMatrix&);
+  void operator=(const AttributeMatrix&);
 };
 
 Q_DECLARE_METATYPE(AttributeMatrix::Type)
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
index 07a1f34922..bed0cecb5d 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
@@ -153,68 +153,52 @@ AttributeMatrixProxy::AMTypeFlag AttributeMatrixProxy::AttributeMatrixTypeToFlag
 {
   switch(amType)
   {
-  case AttributeMatrix::Type::Any:
-  {
+  case AttributeMatrix::Type::Any: {
     return Any_AMType;
   }
-  case AttributeMatrix::Type::Cell:
-  {
+  case AttributeMatrix::Type::Cell: {
     return Cell_AMType;
   }
-  case AttributeMatrix::Type::CellEnsemble:
-  {
+  case AttributeMatrix::Type::CellEnsemble: {
     return CellEnsemble_AMType;
   }
-  case AttributeMatrix::Type::CellFeature:
-  {
+  case AttributeMatrix::Type::CellFeature: {
     return CellFeature_AMType;
   }
-  case AttributeMatrix::Type::Edge:
-  {
+  case AttributeMatrix::Type::Edge: {
     return Edge_AMType;
   }
-  case AttributeMatrix::Type::EdgeEnsemble:
-  {
+  case AttributeMatrix::Type::EdgeEnsemble: {
     return EdgeEnsemble_AMType;
   }
-  case AttributeMatrix::Type::EdgeFeature:
-  {
+  case AttributeMatrix::Type::EdgeFeature: {
     return EdgeFeature_AMType;
   }
-  case AttributeMatrix::Type::Face:
-  {
+  case AttributeMatrix::Type::Face: {
     return Face_AMType;
   }
-  case AttributeMatrix::Type::FaceEnsemble:
-  {
+  case AttributeMatrix::Type::FaceEnsemble: {
     return FaceEnsemble_AMType;
   }
-  case AttributeMatrix::Type::FaceFeature:
-  {
+  case AttributeMatrix::Type::FaceFeature: {
     return FaceFeature_AMType;
   }
-  case AttributeMatrix::Type::Generic:
-  {
+  case AttributeMatrix::Type::Generic: {
     return Generic_AMType;
   }
-  case AttributeMatrix::Type::MetaData:
-  {
+  case AttributeMatrix::Type::MetaData: {
     return MetaData_AMType;
   }
-  case AttributeMatrix::Type::Vertex:
-  {
+  case AttributeMatrix::Type::Vertex: {
     return Vertex_AMType;
   }
-  case AttributeMatrix::Type::VertexEnsemble:
-  {
+  case AttributeMatrix::Type::VertexEnsemble: {
     return VertexEnsemble_AMType;
   }
-  case AttributeMatrix::Type::VertexFeature:
-  {
+  case AttributeMatrix::Type::VertexFeature: {
     return VertexFeature_AMType;
   }
-  case AttributeMatrix::Type::Unknown:
-  {
+  case AttributeMatrix::Type::Unknown: {
     return Unknown_AMType;
   }
   }
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
index 8dc17ea6fc..a2f37343d3 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 15a6cef0e3..c3fd1bc6c3 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArrayPath.h"
 
@@ -476,8 +476,8 @@ bool DataArrayPath::ValidateVector(const QVector<DataArrayPath>& other)
     return true;
   }
 
-    dcName = other.first().getDataContainerName();
-    amName = other.first().getAttributeMatrixName();
+  dcName = other.first().getDataContainerName();
+  amName = other.first().getAttributeMatrixName();
 
   for(int i = 0; i < other.size(); ++i)
   {
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
old mode 100755
new mode 100644
index c2c7cdf248..76d7360421
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -1,42 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include <QtCore/QMetaType>                   // for Q_DECLARE_METATYPE
-#include <QtCore/QObject>                 // for Q_OBJECT
+#include <QtCore/QMetaType> // for Q_DECLARE_METATYPE
+#include <QtCore/QObject>   // for Q_OBJECT
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
@@ -106,401 +106,401 @@ class SIMPLib_EXPORT DataArrayPath
 
   static HashType GetHash(const QString& name);
 
-  public:
-    // tuple <oldPath, newPath>
-    using RenameType = std::pair<DataArrayPath, DataArrayPath>;
-    using RenameContainer = std::list<RenameType>;
-
-    DataArrayPath();
-
-    /**
-     * @brief DataArrayPath
-     * @param dcName
-     * @param amName
-     * @param daName
-     */
-    DataArrayPath(const QString& dcName, const QString& amName, const QString& daName);
-
-    /**
-     * @brief DataArrayPath
-     * @param path A path with the '|' delimeters
-     */
-    explicit DataArrayPath(const QString& path);
-
-    /**
-     * @brief DataArrayPath Copy Constructor
-     */
-    DataArrayPath(const DataArrayPath& rhs);
-
-    /**
-     * @brief ~DataArrayPath
-     */
-    virtual ~DataArrayPath();
-
-    /**
-     * @brief checks that a vector of paths have the same data container and attribute matrix
-     * @return true if the paths in the vector have the same data container and attribute matrix, false otherwise
-     */
-    static bool ValidateVector(const QVector<DataArrayPath>& other);
-
-    /**
-     * @brief Gets the data array names from a QVector of DataArrayPaths.
-     * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
-     */
-    static QList<QString> GetDataArrayNames(const QVector<DataArrayPath>& paths);
-
-    /**
-     * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
-     * @return Returns the attribute matrix path as a DataArrayPath from a QVector
-     * of DataArrayPaths.
-     */
-    static DataArrayPath GetAttributeMatrixPath(const QVector<DataArrayPath>& paths);
-
-    /**
-     * @brief ConvertToQVector Converts a QStringList of DataArrayPaths to a QVector of DataArrayPaths
-     * @param paths
-     * @return
-     */
-    static QVector<DataArrayPath> ConvertToQVector(QStringList& paths);
-
-    /**
-     * @brief serialize Deserializes the string into a DataArrayPath, using the specified delimiter.
-     * @param delimiter
-     * @return
-     */
-    static DataArrayPath Deserialize(const QString& str, const QString& delimiter);
-
-    /**
-     * @brief Returns the DataType matching the current path.
-     * @return
-     */
-    DataArrayPathHelper::DataType getDataType() const
+public:
+  // tuple <oldPath, newPath>
+  using RenameType = std::pair<DataArrayPath, DataArrayPath>;
+  using RenameContainer = std::list<RenameType>;
+
+  DataArrayPath();
+
+  /**
+   * @brief DataArrayPath
+   * @param dcName
+   * @param amName
+   * @param daName
+   */
+  DataArrayPath(const QString& dcName, const QString& amName, const QString& daName);
+
+  /**
+   * @brief DataArrayPath
+   * @param path A path with the '|' delimeters
+   */
+  explicit DataArrayPath(const QString& path);
+
+  /**
+   * @brief DataArrayPath Copy Constructor
+   */
+  DataArrayPath(const DataArrayPath& rhs);
+
+  /**
+   * @brief ~DataArrayPath
+   */
+  virtual ~DataArrayPath();
+
+  /**
+   * @brief checks that a vector of paths have the same data container and attribute matrix
+   * @return true if the paths in the vector have the same data container and attribute matrix, false otherwise
+   */
+  static bool ValidateVector(const QVector<DataArrayPath>& other);
+
+  /**
+   * @brief Gets the data array names from a QVector of DataArrayPaths.
+   * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
+   */
+  static QList<QString> GetDataArrayNames(const QVector<DataArrayPath>& paths);
+
+  /**
+   * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
+   * @return Returns the attribute matrix path as a DataArrayPath from a QVector
+   * of DataArrayPaths.
+   */
+  static DataArrayPath GetAttributeMatrixPath(const QVector<DataArrayPath>& paths);
+
+  /**
+   * @brief ConvertToQVector Converts a QStringList of DataArrayPaths to a QVector of DataArrayPaths
+   * @param paths
+   * @return
+   */
+  static QVector<DataArrayPath> ConvertToQVector(QStringList& paths);
+
+  /**
+   * @brief serialize Deserializes the string into a DataArrayPath, using the specified delimiter.
+   * @param delimiter
+   * @return
+   */
+  static DataArrayPath Deserialize(const QString& str, const QString& delimiter);
+
+  /**
+   * @brief Returns the DataType matching the current path.
+   * @return
+   */
+  DataArrayPathHelper::DataType getDataType() const
+  {
+    return m_DataType;
+  }
+
+  /**
+   * @brief Returns the DataContainer name
+   * @return
+   */
+  QString getDataContainerName() const
+  {
+    return m_DataContainerName;
+  }
+
+  /**
+   * @brief Returns the AttributeMatrix name
+   * @return
+   */
+  QString getAttributeMatrixName() const
+  {
+    return m_AttributeMatrixName;
+  }
+
+  /**
+   * @brief Returns the DataArray name
+   * @return
+   */
+  QString getDataArrayName() const
+  {
+    return m_DataArrayName;
+  }
+
+  /**
+   * @brief Sets the DataContainer name and updates the hash
+   * @param name
+   */
+  void setDataContainerName(const QString& name);
+
+  /**
+   * @brief Sets the AttributeMatrix name and updates the hash
+   * @param name
+   */
+  void setAttributeMatrixName(const QString& name);
+
+  /**
+   * @brief Sets the DataArray name and updates the hash
+   * @param name
+   */
+  void setDataArrayName(const QString& name);
+
+  /**
+   * @brief operator =
+   */
+  DataArrayPath& operator=(const DataArrayPath& rhs);
+
+  /**
+   * @brief operator ==
+   * @param rhs
+   * @return
+   */
+  bool operator==(const DataArrayPath& rhs) const;
+
+  /**
+   * @brief operator !=
+   * @param rhs
+   * @return
+   */
+  bool operator!=(const DataArrayPath& rhs) const;
+
+  /**
+   * @brief operator < is required for std::set
+   * @param rhs
+   * @return
+   */
+  bool operator<(const DataArrayPath& rhs) const;
+
+  /**
+   * @brief serialize Returns the path using the '|' charater by default. This can be over ridden by the programmer
+   * @param delimiter
+   * @return
+   */
+  QString serialize(const QString& delimiter = "|") const;
+
+  /**
+   * @brief getAsVector Returns the DataArrayPath represented as a QVector<String> where index[0] = DataContainer Name,
+   * index[1] = AttributeMatrix Name and index[2] = DataArray Name
+   * @return
+   */
+  QVector<QString> toQVector() const;
+
+  /**
+   * @brief isEmpty Returns if ALL of the string elements are empty. Note that a class could return FALSE for this
+   * function and FALSE for isValid() also so this function is not a true indication of a valid path.
+   * @return
+   */
+  bool isEmpty() const
+  {
+    return m_DataType == DataArrayPathHelper::DataType::None;
+  }
+
+  /**
+   * @brief isValid Returns if ALL of the string components have some value stored in them so 'valid' in this sense just
+   * means that all three components have a non-empty string. This does NOT necessarily mean that those strings, once
+   * serialized into a path actually refer to something in your DataContainer.
+   * @return
+   */
+  bool isValid() const
+  {
+    return m_DataType == DataArrayPathHelper::DataType::DataArray;
+  }
+
+  /**
+   * @brief toQStringList Converts the DataArrayPath to a QStringList
+   * @return
+   */
+  QStringList toQStringList() const;
+
+  /**
+   * @brief Updates the DataArrayPath with the values in the arguments
+   * @param dcName The DataContainer Name
+   * @param amName The AttributeMatrix Name
+   * @param daName The DataArray Name
+   */
+  void update(const QString& dcName, const QString& amName, const QString& daName);
+
+  /**
+   * @brief checks that two paths share the same data container
+   * @param other The other path
+   * @return true if the two paths share the same data container, false otherwise
+   */
+  bool hasSameDataContainer(const DataArrayPath& other) const;
+
+  /**
+   * @brief checks that two paths share the same attribute matrix
+   * @param other The other path
+   * @return true if the two paths share the same attribute matrix, false otherwise
+   */
+  bool hasSameAttributeMatrix(const DataArrayPath& other) const;
+
+  /**
+   * @brief checks that two paths share the same data container and attribute matrix
+   * @param other The other path
+   * @return true if the two paths share the same data container and attribute matrix, false otherwise
+   */
+  bool hasSameAttributeMatrixPath(const DataArrayPath& other) const;
+
+  /**
+   * @brief checks that two paths share the same data array
+   * @param other The other path
+   * @return true if the two paths share the same data array, false otherwise
+   */
+  bool hasSameDataArray(const DataArrayPath& other) const;
+
+  /**
+   * @brief Returns true if this DataArrayPath is a subset of the given path.  Returns false otherwise.
+   * @param other
+   * @return
+   */
+  bool isSubset(const DataArrayPath& other) const;
+
+  /**
+   * @brief checks if the given DataArrayPath could indicate a possible renamed path.
+   * This requires that the given path be no longer than the current path and only one value is changed.
+   * Returns true if this is a possible rename and returns false otherwise.
+   * @param updated
+   * @return
+   */
+  bool possibleRename(const DataArrayPath& updated) const
+  {
+    // Empty DataArrayPaths are not considered renames
+    // Neither are DataArrayPaths of different lengths
+    if(getDataType() != updated.getDataType())
     {
-      return m_DataType;
+      return false;
     }
 
-    /**
-     * @brief Returns the DataContainer name
-     * @return
-     */
-    QString getDataContainerName() const
+    // Check number of differences
+    int differences = 0;
+    if(!hasSameDataArray(updated))
     {
-      return m_DataContainerName;
+      differences++;
     }
-
-    /**
-     * @brief Returns the AttributeMatrix name
-     * @return
-     */
-    QString getAttributeMatrixName() const
+    if(!hasSameAttributeMatrix(updated))
     {
-      return m_AttributeMatrixName;
+      differences++;
     }
+    if(!hasSameDataContainer(updated))
+    {
+      differences++;
+    }
+
+    return 1 == differences;
+  }
 
-    /**
-     * @brief Returns the DataArray name
-     * @return
-     */
-    QString getDataArrayName() const
+  /**
+   * @brief updates the current path based on the newPath if it matches the given previous value
+   * @param renamePath
+   * return
+   */
+  bool updatePath(const DataArrayPath::RenameType& renamePath)
+  {
+    const DataArrayPath& oldPath = std::get<0>(renamePath);
+    const DataArrayPath& newPath = std::get<1>(renamePath);
+
+    bool valid = true;
+    // Check for differences with original path
+    switch(oldPath.getDataType())
     {
-      return m_DataArrayName;
+    case DataArrayPathHelper::DataType::DataArray:
+      valid &= hasSameDataArray(oldPath);
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::AttributeMatrix:
+      valid &= hasSameAttributeMatrix(oldPath);
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::DataContainer:
+      valid &= hasSameDataContainer(oldPath);
+      break;
+    default:
+      valid = false;
+      break;
     }
 
-    /**
-     * @brief Sets the DataContainer name and updates the hash
-     * @param name
-     */
-    void setDataContainerName(const QString& name);
-
-    /**
-     * @brief Sets the AttributeMatrix name and updates the hash
-     * @param name
-     */
-    void setAttributeMatrixName(const QString& name);
-
-    /**
-     * @brief Sets the DataArray name and updates the hash
-     * @param name
-     */
-    void setDataArrayName(const QString& name);
-
-    /**
-     * @brief operator =
-     */
-    DataArrayPath& operator=(const DataArrayPath& rhs);
-
-    /**
-     * @brief operator ==
-     * @param rhs
-     * @return
-     */
-    bool operator==(const DataArrayPath& rhs) const;
-
-    /**
-     * @brief operator !=
-     * @param rhs
-     * @return
-     */
-    bool operator!=(const DataArrayPath& rhs) const;
-
-    /**
-     * @brief operator < is required for std::set
-     * @param rhs
-     * @return
-     */
-    bool operator<(const DataArrayPath& rhs) const;
-
-    /**
-     * @brief serialize Returns the path using the '|' charater by default. This can be over ridden by the programmer
-     * @param delimiter
-     * @return
-     */
-    QString serialize(const QString& delimiter = "|") const;
-
-    /**
-     * @brief getAsVector Returns the DataArrayPath represented as a QVector<String> where index[0] = DataContainer Name,
-     * index[1] = AttributeMatrix Name and index[2] = DataArray Name
-     * @return
-     */
-    QVector<QString> toQVector() const;
-
-    /**
-     * @brief isEmpty Returns if ALL of the string elements are empty. Note that a class could return FALSE for this
-     * function and FALSE for isValid() also so this function is not a true indication of a valid path.
-     * @return
-     */
-    bool isEmpty() const
+    if(!valid)
     {
-      return m_DataType == DataArrayPathHelper::DataType::None;
+      return false;
     }
 
-    /**
-     * @brief isValid Returns if ALL of the string components have some value stored in them so 'valid' in this sense just
-     * means that all three components have a non-empty string. This does NOT necessarily mean that those strings, once
-     * serialized into a path actually refer to something in your DataContainer.
-     * @return
-     */
-    bool isValid() const
+    // Substitude in the new DataArrayPath
+    switch(oldPath.getDataType())
     {
-      return m_DataType == DataArrayPathHelper::DataType::DataArray;
+    case DataArrayPathHelper::DataType::DataArray:
+      setDataArrayName(newPath.getDataArrayName());
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::AttributeMatrix:
+      setAttributeMatrixName(newPath.getAttributeMatrixName());
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::DataContainer:
+      setDataContainerName(newPath.getDataContainerName());
+      break;
+    case DataArrayPathHelper::DataType::None:
+      break;
     }
 
-    /**
-     * @brief toQStringList Converts the DataArrayPath to a QStringList
-     * @return
-     */
-    QStringList toQStringList() const;
-
-    /**
-     * @brief Updates the DataArrayPath with the values in the arguments
-     * @param dcName The DataContainer Name
-     * @param amName The AttributeMatrix Name
-     * @param daName The DataArray Name
-     */
-    void update(const QString& dcName, const QString& amName, const QString& daName);
-
-    /**
-     * @brief checks that two paths share the same data container
-     * @param other The other path
-     * @return true if the two paths share the same data container, false otherwise
-     */
-    bool hasSameDataContainer(const DataArrayPath& other) const;
-
-    /**
-     * @brief checks that two paths share the same attribute matrix
-     * @param other The other path
-     * @return true if the two paths share the same attribute matrix, false otherwise
-     */
-    bool hasSameAttributeMatrix(const DataArrayPath& other) const;
-
-    /**
-     * @brief checks that two paths share the same data container and attribute matrix
-     * @param other The other path
-     * @return true if the two paths share the same data container and attribute matrix, false otherwise
-     */
-    bool hasSameAttributeMatrixPath(const DataArrayPath& other) const;
-
-    /**
-     * @brief checks that two paths share the same data array
-     * @param other The other path
-     * @return true if the two paths share the same data array, false otherwise
-     */
-    bool hasSameDataArray(const DataArrayPath& other) const;
-
-    /**
-     * @brief Returns true if this DataArrayPath is a subset of the given path.  Returns false otherwise.
-     * @param other
-     * @return
-     */
-    bool isSubset(const DataArrayPath& other) const;
-
-    /**
-     * @brief checks if the given DataArrayPath could indicate a possible renamed path.
-     * This requires that the given path be no longer than the current path and only one value is changed.
-     * Returns true if this is a possible rename and returns false otherwise.
-     * @param updated
-     * @return
-     */
-    bool possibleRename(const DataArrayPath& updated) const
+    return true;
+  }
+
+  /**
+   * @brief Creates the missing RenameType resulting from two other RenameTypes.
+   * This can fail if the previous and new RenameTypes are not adequately related.
+   * This returns a pair of a bool signifying the success of the operation and the
+   * resulting RenameType.
+   * @param oldRename
+   * @param newRename
+   * @return std::pair<success, resulting rename>
+   */
+  static std::pair<bool, RenameType> CreateLinkingRename(const RenameType& oldRename, const RenameType& newRename)
+  {
+    const DataArrayPath& oldOldPath = oldRename.first;
+    const DataArrayPath& oldNewPath = oldRename.second;
+
+    const DataArrayPath& newOldPath = newRename.first;
+    const DataArrayPath& newNewPath = newRename.second;
+
+    // Handle renaming of the same path.
+    // Rename path should be removed if the path was recreated,
+    // thus this signifies that a filter's rename was changed.
+    if((newOldPath == oldOldPath) && (oldNewPath != newNewPath))
     {
-      // Empty DataArrayPaths are not considered renames
-      // Neither are DataArrayPaths of different lengths
-      if(getDataType() != updated.getDataType())
-      {
-        return false;
-      }
-
-      // Check number of differences
-      int differences = 0;
-      if(!hasSameDataArray(updated))
-      {
-        differences++;
-      }
-      if(!hasSameAttributeMatrix(updated))
-      {
-        differences++;
-      }
-      if(!hasSameDataContainer(updated))
-      {
-        differences++;
-      }
-
-      return 1 == differences;
+      return std::make_pair(true, RenameType{oldNewPath, newNewPath});
     }
 
-    /**
-     * @brief updates the current path based on the newPath if it matches the given previous value
-     * @param renamePath
-     * return
-     */
-    bool updatePath(const DataArrayPath::RenameType& renamePath)
+    // Require newOldPath to be a subset of oldNewPath
+    const bool isSubset = newOldPath.isSubset(oldNewPath);
+    if(!isSubset)
     {
-      const DataArrayPath& oldPath = std::get<0>(renamePath);
-      const DataArrayPath& newPath = std::get<1>(renamePath);
-
-      bool valid = true;
-      // Check for differences with original path
-      switch(oldPath.getDataType())
-      {
-      case DataArrayPathHelper::DataType::DataArray:
-        valid &= hasSameDataArray(oldPath);
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::AttributeMatrix:
-        valid &= hasSameAttributeMatrix(oldPath);
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::DataContainer:
-        valid &= hasSameDataContainer(oldPath);
-        break;
-      default:
-        valid = false;
-        break;
-      }
-
-      if(!valid)
-      {
-        return false;
-      }
-
-      // Substitude in the new DataArrayPath
-      switch(oldPath.getDataType())
-      {
-      case DataArrayPathHelper::DataType::DataArray:
-        setDataArrayName(newPath.getDataArrayName());
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::AttributeMatrix:
-        setAttributeMatrixName(newPath.getAttributeMatrixName());
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::DataContainer:
-        setDataContainerName(newPath.getDataContainerName());
-        break;
-      case DataArrayPathHelper::DataType::None:
-        break;
-      }
-
-      return true;
+      return std::make_pair(false, RenameType{});
     }
 
-    /**
-     * @brief Creates the missing RenameType resulting from two other RenameTypes.
-     * This can fail if the previous and new RenameTypes are not adequately related.
-     * This returns a pair of a bool signifying the success of the operation and the
-     * resulting RenameType.
-     * @param oldRename
-     * @param newRename
-     * @return std::pair<success, resulting rename>
-     */
-    static std::pair<bool, RenameType> CreateLinkingRename(const RenameType& oldRename, const RenameType& newRename)
+    // Create output rename
+    DataArrayPath replacementOldPath = oldOldPath;
+    replacementOldPath.updatePath(newRename);
+    DataArrayPath replacementNewPath = oldNewPath;
+
+    DataArrayPathHelper::DataType newOldType = newOldPath.getDataType();
+    switch(newOldType)
     {
-      const DataArrayPath& oldOldPath = oldRename.first;
-      const DataArrayPath& oldNewPath = oldRename.second;
-
-      const DataArrayPath& newOldPath = newRename.first;
-      const DataArrayPath& newNewPath = newRename.second;
-
-      // Handle renaming of the same path.
-      // Rename path should be removed if the path was recreated,
-      // thus this signifies that a filter's rename was changed.
-      if((newOldPath == oldOldPath) && (oldNewPath != newNewPath))
-      {
-        return std::make_pair(true, RenameType{ oldNewPath, newNewPath });
-      }
-
-      // Require newOldPath to be a subset of oldNewPath
-      const bool isSubset = newOldPath.isSubset(oldNewPath);
-      if(!isSubset)
-      {
-        return std::make_pair(false, RenameType{});
-      }
-
-      // Create output rename
-      DataArrayPath replacementOldPath = oldOldPath;
-      replacementOldPath.updatePath(newRename);
-      DataArrayPath replacementNewPath = oldNewPath;
-
-      DataArrayPathHelper::DataType newOldType = newOldPath.getDataType();
-      switch(newOldType)
-      {
-      case DataArrayPathHelper::DataType::DataArray:
-        replacementNewPath.setDataArrayName(newNewPath.getDataArrayName());
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::AttributeMatrix:
-        replacementNewPath.setAttributeMatrixName(newNewPath.getAttributeMatrixName());
-        // [[fallthrough]];
-      case DataArrayPathHelper::DataType::DataContainer:
-        replacementNewPath.setDataContainerName(newNewPath.getDataContainerName());
-        break;
-      case DataArrayPathHelper::DataType::None:
-        break;
-      }
-
-      return std::make_pair(true, std::make_pair(replacementOldPath, replacementNewPath));
+    case DataArrayPathHelper::DataType::DataArray:
+      replacementNewPath.setDataArrayName(newNewPath.getDataArrayName());
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::AttributeMatrix:
+      replacementNewPath.setAttributeMatrixName(newNewPath.getAttributeMatrixName());
+      // [[fallthrough]];
+    case DataArrayPathHelper::DataType::DataContainer:
+      replacementNewPath.setDataContainerName(newNewPath.getDataContainerName());
+      break;
+    case DataArrayPathHelper::DataType::None:
+      break;
     }
 
-    /**
-     * @brief Writes the contents of the proxy to the json object 'json'
-     * @param json
-     * @return
-     */
-    void writeJson(QJsonObject& json) const;
-
-    /**
-     * @brief Reads the contents of the the json object 'json' into the proxy
-     * @param json
-     * @return
-     */
-    bool readJson(QJsonObject& json);
-
-    /**
-     * @brief Returns a QJsonObject that holds the values of this class.
-     * @return
-     */
-    QJsonObject toJsonObject() const;
-
-  protected:
-    void updateDataType();
-
-  private:
-    DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
+    return std::make_pair(true, std::make_pair(replacementOldPath, replacementNewPath));
+  }
+
+  /**
+   * @brief Writes the contents of the proxy to the json object 'json'
+   * @param json
+   * @return
+   */
+  void writeJson(QJsonObject& json) const;
+
+  /**
+   * @brief Reads the contents of the the json object 'json' into the proxy
+   * @param json
+   * @return
+   */
+  bool readJson(QJsonObject& json);
+
+  /**
+   * @brief Returns a QJsonObject that holds the values of this class.
+   * @return
+   */
+  QJsonObject toJsonObject() const;
+
+protected:
+  void updateDataType();
+
+private:
+  DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
 };
 
 Q_DECLARE_METATYPE(DataArrayPath)
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 7f177be955..9c4f4cdb3c 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainer.h"
 
@@ -65,8 +65,8 @@ DataContainer::DataContainer() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainer::DataContainer(const QString &name)
-  : IDataStructureContainerNode(name)
+DataContainer::DataContainer(const QString& name)
+: IDataStructureContainerNode(name)
 {
 }
 
@@ -538,21 +538,21 @@ int DataContainer::writeXdmf(QTextStream& out, const QString& hdfFileName) const
     case IGeometry::Type::Hexahedral:
       switch(amType)
       {
-        // FIXME: There are more AttributeMatrix Types that should be implemented
-        case AttributeMatrix::Type::Vertex:
-          xdmfCenter = SIMPL::XdmfCenterType::Node;
-          break;
-        case AttributeMatrix::Type::Edge:
-          xdmfCenter = SIMPL::XdmfCenterType::Cell;
-          break;
-        case AttributeMatrix::Type::Face:
-          xdmfCenter = SIMPL::XdmfCenterType::Cell;
-          break;
-        case AttributeMatrix::Type::Cell:
-          xdmfCenter = SIMPL::XdmfCenterType::Cell;
-          break;
-        default:
-          break;
+      // FIXME: There are more AttributeMatrix Types that should be implemented
+      case AttributeMatrix::Type::Vertex:
+        xdmfCenter = SIMPL::XdmfCenterType::Node;
+        break;
+      case AttributeMatrix::Type::Edge:
+        xdmfCenter = SIMPL::XdmfCenterType::Cell;
+        break;
+      case AttributeMatrix::Type::Face:
+        xdmfCenter = SIMPL::XdmfCenterType::Cell;
+        break;
+      case AttributeMatrix::Type::Cell:
+        xdmfCenter = SIMPL::XdmfCenterType::Cell;
+        break;
+      default:
+        break;
       }
       break;
     case IGeometry::Type::Image:
@@ -754,7 +754,7 @@ QString DataContainer::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   QString info;
   QTextStream ss(&info);
   ss << "Requested InfoStringFormat is not supported. " << format;
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
old mode 100755
new mode 100644
index f2853c28aa..0e073db082
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -138,7 +138,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   /**
    * @brief AttributeMatrixMap_t
    */
-  //using AttributeMatrixMap_t = QMap<QString, AttributeMatrixShPtr>;
+  // using AttributeMatrixMap_t = QMap<QString, AttributeMatrixShPtr>;
 
   /**
    * @brief Creates a new shared pointer instance of this class
@@ -177,7 +177,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Sets the geometry of the data container
    * @param geometry
    */
-  virtual void setGeometry(const IGeometry::Pointer &geometry);
+  virtual void setGeometry(const IGeometry::Pointer& geometry);
 
   /**
    * @brief Returns the geometry of the data container
@@ -207,7 +207,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   {
     return insertOrAssign(matrix);
   }
-  
+
   /**
    * @brief Returns the array for a given named array or the equivelant to a
    * null pointer if the name does not exist.
@@ -341,7 +341,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @brief Returns the geometry as the templated type
    * @return
    */
-  template <typename GeometryType> typename GeometryType::Pointer getGeometryAs() const
+  template <typename GeometryType>
+  typename GeometryType::Pointer getGeometryAs() const
   {
     typename GeometryType::Pointer geom = std::dynamic_pointer_cast<GeometryType>(getGeometry());
     return geom;
@@ -352,7 +353,8 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param filter
    * @return
    */
-  template <typename GeometryType> typename GeometryType::Pointer getPrereqGeometry(AbstractFilter* filter) const
+  template <typename GeometryType>
+  typename GeometryType::Pointer getPrereqGeometry(AbstractFilter* filter) const
   {
     typename GeometryType::Pointer geom = GeometryType::NullPointer();
     IGeometry::Pointer igeom = getGeometry();
@@ -420,7 +422,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
    * @param hdfFileName
    * @return
    */
-  virtual int writeXdmf(QTextStream& out, const QString &hdfFileName) const;
+  virtual int writeXdmf(QTextStream& out, const QString& hdfFileName) const;
 
   /**
    * @brief readMeshDataFromHDF5
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 4d34ea35b3..7c2ab143ad 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -520,7 +520,7 @@ AbstractMontageShPtr DataContainerArray::getPrereqMontage(AbstractFilter* filter
 //
 // -----------------------------------------------------------------------------
 GridMontageShPtr DataContainerArray::createNonPrereqGridMontage(AbstractFilter* filter, const QString& montageName, SizeVec3Type size, const QStringList& dcNames,
-                                                                    GridMontage::CollectionMethod collectionMethod)
+                                                                GridMontage::CollectionMethod collectionMethod)
 {
   GridMontage::Pointer montage = GridMontage::New(montageName, size[0], size[1], size[2]);
 
@@ -888,7 +888,9 @@ IDataArray::Pointer DataContainerArray::getPrereqIDataArrayFromPath(AbstractFilt
   {
     if(filter)
     {
-      ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
+      ss = QObject::tr("DataContainerArray::getPrereqIDataArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+               .arg(__LINE__)
+               .arg(path.serialize());
       filter->setErrorCondition(-90001, ss);
     }
     return dataArray;
@@ -898,7 +900,6 @@ IDataArray::Pointer DataContainerArray::getPrereqIDataArrayFromPath(AbstractFilt
   QString amName = path.getAttributeMatrixName();
   QString daName = path.getDataArrayName();
 
-
   DataContainerShPtr dc = getDataContainer(dcName);
   if(nullptr == dc.get())
   {
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
old mode 100755
new mode 100644
index 5cc7dea5a6..c938a23639
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -1,42 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
 
-#include <cstddef>       // for nullptr
+#include <cstddef> // for nullptr
 
 #include <QtCore/QObject> // for Q_OBJECT
 #include <QtCore/QString>
@@ -271,397 +271,404 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    */
   IDataContainerBundle::Pointer getDataContainerBundle(const QString& name) const;
 
-  template <typename BundleType> typename BundleType::Pointer getDataContainerBundleAs(const QString& name) const
+  template <typename BundleType>
+  typename BundleType::Pointer getDataContainerBundleAs(const QString& name) const
   {
     typename BundleType::Pointer dcb = std::dynamic_pointer_cast<BundleType>(getDataContainerBundle(name));
     return dcb;
   }
 
-    /**
-     * @brief addDataContainerBundle
-     * @param dataContainer
-     */
-    void addDataContainerBundle(IDataContainerBundle::Pointer dataContainerBundle);
-
-    /**
-     * @brief removeDataContainerBundle
-     * @param name
-     * @return
-     */
-    int removeDataContainerBundle(const QString& name);
-
-    /**
-     * @brief renameDataContainerBundle
-     * @param oldName
-     * @param newName
-     */
-    bool renameDataContainerBundle(const QString& oldName, const QString& newName);
-
-    /**
-     * @brief removeDataContainerFromBundle
-     * @param name
-     */
-    void removeDataContainerFromBundles(const QString& name);
-
-    /**
-     * @brief Returns a copy of the Montage collection.
-     * @return
-     */
-    MontageCollection getMontageCollection() const;
-
-    /**
-     * @brief Attempts to add the given montage to the collection.
-     * This will fail if a montage by the same name already exists in the collection.
-     * Returns true if it succeded.  Returns false otherwise.
-     * @param montage
-     * @return
-     */
-    bool addMontage(const AbstractMontageShPtr& montage);
-
-    /**
-     * @brief Adds the given montage to the collection if no montages of the same name exist yet.
-     * Otherwise, the current montage is replaced with the one provided.
-     * @param montage
-     */
-    void addOrReplaceMontage(const AbstractMontageShPtr& montage);
-
-    /**
-     * @brief Removes any montage of the given name from the collection.
-     * @param name
-     */
-    void removeMontage(const QString& name);
-
-    /**
-     * @brief Finds and returns a shared pointer to a montage with the given name.
-     * If none are found, this returns nullptr.
-     * @param name
-     * @return
-     */
-    AbstractMontageShPtr getMontage(const QString& name) const;
-
-    /**
-     * @brief Returns a list of names for all montages in the collection.
-     * @return
-     */
-    QStringList getMontageNames() const;
-
-    /**
-     * @brief createNonPrereqGridMontage
-     * @param filter
-     * @param montageName
-     * @param size
-     * @param dcNames
-     * @param collectionType
-     * @return
-     */
-    GridMontageShPtr createNonPrereqGridMontage(AbstractFilter* filter, const QString& montageName, SizeVec3Type size, const QStringList& dcNames = QStringList(),
-      GridMontage::CollectionMethod collectionMethod = GridMontage::CollectionMethod::CombOrder);
-
-
-    /**
-     * @brief renameDataArrayPaths
-     * @param renamePaths
-     */
-    void renameDataArrayPaths(DataArrayPath::RenameContainer renamePaths);
-
-    DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists = false);
-
-    /**
-     * @brief getPrereqMontage
-     * @param filter
-     * @param name
-     */
-    AbstractMontageShPtr getPrereqMontage(AbstractFilter* filter, const QString& name);
-
-    /**
-     * @brief getPrereqDataContainer
-     * @param name
-     * @param createIfNotExists
-     * @return
-     */
-    DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const QString& name, bool createIfNotExists = false);
-
-    /**
-     * @brief createNonPrereqDataContainer
-     * @param filter
-     * @param dap
-     * @param id
-     * @return
-     */
-    DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
-
-    /**
-     * @brief This function will create a new DataContainer of type <T>
-     * @param dataContainerName The name of the DataContainer. Must not be empty or this method will ASSERT()
-     * @return Valid DataContainer Object UNLESS the DataContainer with the given name already exists or the
-     * dataContainerName is empty in which case a Null DataContainer will be returned.
-     */
-    DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
-
-
-    /**
-     * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
-     * if it is available for the given DataContainer
-     * @param filter
-     * @param dcName
-     * @return
-     */
-    template<typename GeometryType>
-    typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const QString& dcName)
-    {
-      typename GeometryType::Pointer geom = GeometryType::NullPointer();
-      DataContainerShPtr dc = getPrereqDataContainer(filter, dcName, false);
-      if(nullptr == dc) { return geom; }
+  /**
+   * @brief addDataContainerBundle
+   * @param dataContainer
+   */
+  void addDataContainerBundle(IDataContainerBundle::Pointer dataContainerBundle);
 
-      return dc->getPrereqGeometry<GeometryType>(filter);
-    }
+  /**
+   * @brief removeDataContainerBundle
+   * @param name
+   * @return
+   */
+  int removeDataContainerBundle(const QString& name);
 
-    /**
-     * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
-     * if it is available for the given DataContainer
-     * @param filter
-     * @param path
-     * @return
-     */
-    template <typename GeometryType>
-    typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const DataArrayPath& path)
-    {
-      typename GeometryType::Pointer geom = GeometryType::NullPointer();
-      DataContainerShPtr dc = getPrereqDataContainer(filter, path.getDataContainerName(), false);
-      if(nullptr == dc)
-      {
-        return geom;
-      }
+  /**
+   * @brief renameDataContainerBundle
+   * @param oldName
+   * @param newName
+   */
+  bool renameDataContainerBundle(const QString& oldName, const QString& newName);
+
+  /**
+   * @brief removeDataContainerFromBundle
+   * @param name
+   */
+  void removeDataContainerFromBundles(const QString& name);
 
-      return dc->getPrereqGeometry<GeometryType>(filter);
+  /**
+   * @brief Returns a copy of the Montage collection.
+   * @return
+   */
+  MontageCollection getMontageCollection() const;
+
+  /**
+   * @brief Attempts to add the given montage to the collection.
+   * This will fail if a montage by the same name already exists in the collection.
+   * Returns true if it succeded.  Returns false otherwise.
+   * @param montage
+   * @return
+   */
+  bool addMontage(const AbstractMontageShPtr& montage);
+
+  /**
+   * @brief Adds the given montage to the collection if no montages of the same name exist yet.
+   * Otherwise, the current montage is replaced with the one provided.
+   * @param montage
+   */
+  void addOrReplaceMontage(const AbstractMontageShPtr& montage);
+
+  /**
+   * @brief Removes any montage of the given name from the collection.
+   * @param name
+   */
+  void removeMontage(const QString& name);
+
+  /**
+   * @brief Finds and returns a shared pointer to a montage with the given name.
+   * If none are found, this returns nullptr.
+   * @param name
+   * @return
+   */
+  AbstractMontageShPtr getMontage(const QString& name) const;
+
+  /**
+   * @brief Returns a list of names for all montages in the collection.
+   * @return
+   */
+  QStringList getMontageNames() const;
+
+  /**
+   * @brief createNonPrereqGridMontage
+   * @param filter
+   * @param montageName
+   * @param size
+   * @param dcNames
+   * @param collectionType
+   * @return
+   */
+  GridMontageShPtr createNonPrereqGridMontage(AbstractFilter* filter, const QString& montageName, SizeVec3Type size, const QStringList& dcNames = QStringList(),
+                                              GridMontage::CollectionMethod collectionMethod = GridMontage::CollectionMethod::CombOrder);
+
+  /**
+   * @brief renameDataArrayPaths
+   * @param renamePaths
+   */
+  void renameDataArrayPaths(DataArrayPath::RenameContainer renamePaths);
+
+  DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, bool createIfNotExists = false);
+
+  /**
+   * @brief getPrereqMontage
+   * @param filter
+   * @param name
+   */
+  AbstractMontageShPtr getPrereqMontage(AbstractFilter* filter, const QString& name);
+
+  /**
+   * @brief getPrereqDataContainer
+   * @param name
+   * @param createIfNotExists
+   * @return
+   */
+  DataContainerShPtr getPrereqDataContainer(AbstractFilter* filter, const QString& name, bool createIfNotExists = false);
+
+  /**
+   * @brief createNonPrereqDataContainer
+   * @param filter
+   * @param dap
+   * @param id
+   * @return
+   */
+  DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const DataArrayPath& dap, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+
+  /**
+   * @brief This function will create a new DataContainer of type <T>
+   * @param dataContainerName The name of the DataContainer. Must not be empty or this method will ASSERT()
+   * @return Valid DataContainer Object UNLESS the DataContainer with the given name already exists or the
+   * dataContainerName is empty in which case a Null DataContainer will be returned.
+   */
+  DataContainerShPtr createNonPrereqDataContainer(AbstractFilter* filter, const QString& dataContainerName, RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID);
+
+  /**
+   * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
+   * if it is available for the given DataContainer
+   * @param filter
+   * @param dcName
+   * @return
+   */
+  template <typename GeometryType>
+  typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const QString& dcName)
+  {
+    typename GeometryType::Pointer geom = GeometryType::NullPointer();
+    DataContainerShPtr dc = getPrereqDataContainer(filter, dcName, false);
+    if(nullptr == dc)
+    {
+      return geom;
     }
 
-    /**
-     * @brief getPrereqAttributeMatrixFromPath This function will return an AttributeMatrix if it is availabe
-     * at the path
-     * @param filter An AbstractFilter or subclass where error messages and error codes can be sent
-     * @param path The DataArrayPath object that has the path to the AttributeMatrix
-     * @param err The error code to display to the user
-     * @return
-     */
-    AttributeMatrix::Pointer getPrereqAttributeMatrixFromPath(AbstractFilter* filter, const DataArrayPath& path, int err);
-
-    /**
-     * @brief getPrereqArrayFromPath
-     * @param filter Instance of an AbstractFilter. Can be nullptr
-     * @param path The path to the IDataArray
-     * @param cDims The component dimensions of the IDataArray subclass
-     * @return Valid or nullptr shared pointer based on availability of the array
-     */
-    template <class ArrayType>
-    typename ArrayType::Pointer getPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, const std::vector<size_t>& cDims = {}) const
+    return dc->getPrereqGeometry<GeometryType>(filter);
+  }
+
+  /**
+   * @brief getPrereqGeometryFromDataContainer Returns an IGeometry object of the templated type
+   * if it is available for the given DataContainer
+   * @param filter
+   * @param path
+   * @return
+   */
+  template <typename GeometryType>
+  typename GeometryType::Pointer getPrereqGeometryFromDataContainer(AbstractFilter* filter, const DataArrayPath& path)
+  {
+    typename GeometryType::Pointer geom = GeometryType::NullPointer();
+    DataContainerShPtr dc = getPrereqDataContainer(filter, path.getDataContainerName(), false);
+    if(nullptr == dc)
     {
-      QString ss;
-      typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+      return geom;
+    }
+
+    return dc->getPrereqGeometry<GeometryType>(filter);
+  }
 
-      if(path.isEmpty())
+  /**
+   * @brief getPrereqAttributeMatrixFromPath This function will return an AttributeMatrix if it is availabe
+   * at the path
+   * @param filter An AbstractFilter or subclass where error messages and error codes can be sent
+   * @param path The DataArrayPath object that has the path to the AttributeMatrix
+   * @param err The error code to display to the user
+   * @return
+   */
+  AttributeMatrix::Pointer getPrereqAttributeMatrixFromPath(AbstractFilter* filter, const DataArrayPath& path, int err);
+
+  /**
+   * @brief getPrereqArrayFromPath
+   * @param filter Instance of an AbstractFilter. Can be nullptr
+   * @param path The path to the IDataArray
+   * @param cDims The component dimensions of the IDataArray subclass
+   * @return Valid or nullptr shared pointer based on availability of the array
+   */
+  template <class ArrayType>
+  typename ArrayType::Pointer getPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, const std::vector<size_t>& cDims = {}) const
+  {
+    QString ss;
+    typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+
+    if(path.isEmpty())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
-          filter->setErrorCondition(-80000, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was empty").arg(__LINE__);
+        filter->setErrorCondition(-80000, ss);
       }
+      return dataArray;
+    }
 
-      if(!path.isValid())
+    if(!path.isValid())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2").arg(__LINE__).arg(path.serialize());
-          filter->setErrorCondition(-80001, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("DataContainerArray::getPrereqArrayFromPath Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+                 .arg(__LINE__)
+                 .arg(path.serialize());
+        filter->setErrorCondition(-80001, ss);
       }
+      return dataArray;
+    }
 
-      QString dcName = path.getDataContainerName();
-      QString amName = path.getAttributeMatrixName();
-      QString daName = path.getDataArrayName();
-
+    QString dcName = path.getDataContainerName();
+    QString amName = path.getAttributeMatrixName();
+    QString daName = path.getDataArrayName();
 
-      DataContainerShPtr dc = getDataContainer(dcName);
-      if(nullptr == dc.get())
+    DataContainerShPtr dc = getDataContainer(dcName);
+    if(nullptr == dc.get())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
-          filter->setErrorCondition(-80002, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(dcName);
+        filter->setErrorCondition(-80002, ss);
       }
+      return dataArray;
+    }
 
-      AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(amName);
-      if(nullptr == attrMat.get())
+    AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(amName);
+    if(nullptr == attrMat.get())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
-          filter->setErrorCondition(-80003, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(amName).arg(dcName);
+        filter->setErrorCondition(-80003, ss);
       }
-
-      dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
       return dataArray;
     }
 
-    /**
-    * @brief getPrereqIDataArrayFromPath
-    * @param filter
-    * @param path
-    * @return
-    */
-    IDataArray::Pointer getPrereqIDataArrayFromPath(AbstractFilter* filter, const DataArrayPath& path) const;
-
-    /**
-     * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The conditions for this
-     * method to work properly include: a valid DataArrayPath is supplied, the name of the attribute array is not empty,
-     * and an array with the same name cannot already exist
-     * @param filter The instance of the filter the filter that is requesting the new array
-     * @param attributeArrayName The name of the AttributeArray to create
-     * @param initValue The initial value of all the elements of the array
-     * @param size The number of tuples in the Array
-     * @param dims The dimensions of the components of the AttributeArray
-     * @return A Shared Pointer to the newly created array
-     */
-    template <class ArrayType>
-    typename ArrayType::Pointer createNonPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims, const QString& property = "",
-                                                             RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+    dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    return dataArray;
+  }
+
+  /**
+   * @brief getPrereqIDataArrayFromPath
+   * @param filter
+   * @param path
+   * @return
+   */
+  IDataArray::Pointer getPrereqIDataArrayFromPath(AbstractFilter* filter, const DataArrayPath& path) const;
+
+  /**
+   * @brief createNonPrereqArray This method will create a new DataArray in the AttributeMatrix. The conditions for this
+   * method to work properly include: a valid DataArrayPath is supplied, the name of the attribute array is not empty,
+   * and an array with the same name cannot already exist
+   * @param filter The instance of the filter the filter that is requesting the new array
+   * @param attributeArrayName The name of the AttributeArray to create
+   * @param initValue The initial value of all the elements of the array
+   * @param size The number of tuples in the Array
+   * @param dims The dimensions of the components of the AttributeArray
+   * @return A Shared Pointer to the newly created array
+   */
+  template <class ArrayType>
+  typename ArrayType::Pointer createNonPrereqArrayFromPath(AbstractFilter* filter, const DataArrayPath& path, typename ArrayType::value_type initValue, const std::vector<size_t>& compDims,
+                                                           const QString& property = "", RenameDataPath::DataID_t id = RenameDataPath::k_Invalid_ID)
+  {
+    typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
+    QString ss;
+    if(!path.isValid())
     {
-      typename ArrayType::Pointer dataArray = ArrayType::NullPointer();
-      QString ss;
-      if(!path.isValid())
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("Property '%1': The DataArrayPath is invalid because one of the elements was empty.\n  DataContainer: %2\n  AttributeMatrix: %3\n  DataArray: %4").arg(property).arg(path.getDataContainerName()).arg(path.getAttributeMatrixName()).arg(path.getDataArrayName());
-          filter->setErrorCondition(-80010, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("Property '%1': The DataArrayPath is invalid because one of the elements was empty.\n  DataContainer: %2\n  AttributeMatrix: %3\n  DataArray: %4")
+                 .arg(property)
+                 .arg(path.getDataContainerName())
+                 .arg(path.getAttributeMatrixName())
+                 .arg(path.getDataArrayName());
+        filter->setErrorCondition(-80010, ss);
       }
+      return dataArray;
+    }
 
-      if (path.getDataContainerName().contains('/'))
+    if(path.getDataContainerName().contains('/'))
+    {
+      if(filter)
       {
-        if (filter)
-        {
-          ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
-          filter->setErrorCondition(-80005, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80005, ss);
       }
+      return dataArray;
+    }
 
-      if (path.getAttributeMatrixName().contains('/'))
+    if(path.getAttributeMatrixName().contains('/'))
+    {
+      if(filter)
       {
-        if (filter)
-        {
-          ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(path.getAttributeMatrixName());
-          filter->setErrorCondition(-80006, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The AttributeMatrix '%1' has forward slashes in its name").arg(path.getAttributeMatrixName());
+        filter->setErrorCondition(-80006, ss);
       }
+      return dataArray;
+    }
 
-      if (path.getDataArrayName().contains('/'))
+    if(path.getDataArrayName().contains('/'))
+    {
+      if(filter)
       {
-        if (filter)
-        {
-          ss = QObject::tr("The DataArray '%1' has forward slashes in its name").arg(path.getDataArrayName());
-          filter->setErrorCondition(-80007, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The DataArray '%1' has forward slashes in its name").arg(path.getDataArrayName());
+        filter->setErrorCondition(-80007, ss);
       }
+      return dataArray;
+    }
 
-      if (path.getDataContainerName().contains('/'))
+    if(path.getDataContainerName().contains('/'))
+    {
+      if(filter)
       {
-        if (filter)
-        {
-          ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
-          filter->setErrorCondition(-80004, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The DataContainer '%1' has forward slashes in its name").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80004, ss);
       }
+      return dataArray;
+    }
 
-      DataContainerShPtr dc = getDataContainer(path.getDataContainerName());
-      if(nullptr == dc.get())
+    DataContainerShPtr dc = getDataContainer(path.getDataContainerName());
+    if(nullptr == dc.get())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(path.getDataContainerName());
-          filter->setErrorCondition(-80002, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The DataContainer '%1' was not found in the DataContainerArray").arg(path.getDataContainerName());
+        filter->setErrorCondition(-80002, ss);
       }
+      return dataArray;
+    }
 
-      AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(path.getAttributeMatrixName());
-      if(nullptr == attrMat.get())
+    AttributeMatrix::Pointer attrMat = dc->getAttributeMatrix(path.getAttributeMatrixName());
+    if(nullptr == attrMat.get())
+    {
+      if(filter)
       {
-        if(filter)
-        {
-          ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(path.getAttributeMatrixName()).arg(path.getDataContainerName());
-          filter->setErrorCondition(-80003, ss);
-        }
-        return dataArray;
+        ss = QObject::tr("The AttributeMatrix '%1' was not found in the DataContainer '%2'").arg(path.getAttributeMatrixName()).arg(path.getDataContainerName());
+        filter->setErrorCondition(-80003, ss);
       }
-
-      // If something goes wrong at this point the error message will be directly set in the 'filter' object so we just
-      // simply return what ever is given to us.
-      dataArray = attrMat->createNonPrereqArray<ArrayType>(filter, path.getDataArrayName(), initValue, compDims, id);
       return dataArray;
     }
 
-    /**
-     * @brief validateNumberOfTuples This method will validate that all of the DataArray
-     * paths supplied are valid, return non-nullptr DataArray pointers, and that all have the
-     * same number of tuples.  It will return false if and any of the checks fail, or
-     * if the QVector of input paths has 0 or 1 element.
-     * @param filter The filter calling the validation
-     * @param paths The paths that should be checked
-     * @return bool Validation check
-     */
-    bool validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const;
-
-    /**
-     * @brief validateNumberOfTuples This method will validate that all of the DataArray
-     * objects supplied are non-nullptr and that all are have the same number of tuples.
-     * It will return false if and any of the checks fail, or
-     * if the QVector of input DataArray objects has 0 or 1 element.
-     * @param filter The filter calling the validation
-     * @param paths The paths that should be checked
-     * @return bool Validation check
-     */
-    bool validateNumberOfTuples(AbstractFilter* filter, QVector<IDataArrayShPtrType> dataArrays) const;
-
-    /**
-     * @brief deepCopy
-     * @param dca
-     * @return
-     */
-    DataContainerArray::Pointer deepCopy(bool forceNoAllocate = false) const;
-
-  protected:
-    DataContainerArray();
-
-  private:
-    QMap<QString, IDataContainerBundle::Pointer> m_DataContainerBundles;
-    MontageCollection m_MontageCollection;
-
-    /**
-     * @brief setMontageTileFromDataContainerName
-     * @param row
-     * @param col
-     * @param depth
-     * @param dcName
-     */
-    void setMontageTileFromDataContainerName(AbstractFilter* filter, size_t row, size_t col, size_t depth, const GridMontage::Pointer& montage, const QString& dcName);
-
-  public:
-    DataContainerArray(const DataContainerArray&) = delete; // Copy Constructor Not Implemented
-    DataContainerArray(DataContainerArray&&) = delete;      // Move Constructor Not Implemented
-    DataContainerArray& operator=(const DataContainerArray&) = delete; // Copy Assignment Not Implemented
-    DataContainerArray& operator=(DataContainerArray&&) = delete;      // Move Assignment Not Implemented
+    // If something goes wrong at this point the error message will be directly set in the 'filter' object so we just
+    // simply return what ever is given to us.
+    dataArray = attrMat->createNonPrereqArray<ArrayType>(filter, path.getDataArrayName(), initValue, compDims, id);
+    return dataArray;
+  }
+
+  /**
+   * @brief validateNumberOfTuples This method will validate that all of the DataArray
+   * paths supplied are valid, return non-nullptr DataArray pointers, and that all have the
+   * same number of tuples.  It will return false if and any of the checks fail, or
+   * if the QVector of input paths has 0 or 1 element.
+   * @param filter The filter calling the validation
+   * @param paths The paths that should be checked
+   * @return bool Validation check
+   */
+  bool validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const;
+
+  /**
+   * @brief validateNumberOfTuples This method will validate that all of the DataArray
+   * objects supplied are non-nullptr and that all are have the same number of tuples.
+   * It will return false if and any of the checks fail, or
+   * if the QVector of input DataArray objects has 0 or 1 element.
+   * @param filter The filter calling the validation
+   * @param paths The paths that should be checked
+   * @return bool Validation check
+   */
+  bool validateNumberOfTuples(AbstractFilter* filter, QVector<IDataArrayShPtrType> dataArrays) const;
+
+  /**
+   * @brief deepCopy
+   * @param dca
+   * @return
+   */
+  DataContainerArray::Pointer deepCopy(bool forceNoAllocate = false) const;
+
+protected:
+  DataContainerArray();
+
+private:
+  QMap<QString, IDataContainerBundle::Pointer> m_DataContainerBundles;
+  MontageCollection m_MontageCollection;
+
+  /**
+   * @brief setMontageTileFromDataContainerName
+   * @param row
+   * @param col
+   * @param depth
+   * @param dcName
+   */
+  void setMontageTileFromDataContainerName(AbstractFilter* filter, size_t row, size_t col, size_t depth, const GridMontage::Pointer& montage, const QString& dcName);
+
+public:
+  DataContainerArray(const DataContainerArray&) = delete;            // Copy Constructor Not Implemented
+  DataContainerArray(DataContainerArray&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerArray& operator=(const DataContainerArray&) = delete; // Copy Assignment Not Implemented
+  DataContainerArray& operator=(DataContainerArray&&) = delete;      // Move Assignment Not Implemented
 };
 Q_DECLARE_METATYPE(DataContainerArray::Pointer);
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 7cffea36fc..85e450f27f 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -98,7 +98,7 @@ DataContainerArrayProxy::DataContainerArrayProxy(DataContainerArray* dca)
       {
         QString aaName = attrArray->getName();
         QString daPath = dataContainer->getName() + "/" + amName + "/";
-        
+
         DataArrayProxy daProxy(daPath, aaName, Qt::Checked, attrArray->getTypeAsString(), attrArray->getClassVersion());
         daProxy.setCompDims(attrArray->getComponentDimensions());
         daProxy.setTupleDims(attrMat->getTupleDimensions());
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index faaafc0756..6d2d76159b 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index 2614d5c7df..610b5bff80 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerBundle.h"
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
old mode 100755
new mode 100644
index 5eb4e860cf..69165f7e4b
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <QtCore/QVector>
@@ -45,162 +44,160 @@
 
 class SIMPLib_EXPORT DataContainerBundle : public IDataContainerBundle
 {
-    Q_OBJECT
-  public:
-    using Self = DataContainerBundle;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for DataContainerBundle
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerBundle
-     */
-    static QString ClassName();
-
-    ~DataContainerBundle() override;
-
-    /**
-     * @brief Creates a new DataContainerBundle
-     * @param name The Name of the Bundle
-     * @return
-     */
-    static Pointer New(const QString& name)
-    {
-      Pointer sharedPtr (new DataContainerBundle);
-      sharedPtr->setName(name);
-      return sharedPtr;
-    }
-
-    /**
-     * @brief GetMetaDataName
-     * @return Returns the name of the Meta Data AttributeMatrix name. This name should be used for any AttributeMatrix
-     * that is used in a DataContainer to hold the type of data that is used to group DataContainers into bundles.
-     */
-    static QString GetMetaDataName();
-
-    /**
-    * @brief The name of this DataContainerBundle
-    */
-    /**
-     * @brief Setter property for Name
-     */
-    void setName(const QString& value) override;
-    /**
-     * @brief Getter property for Name
-     * @return Value of Name
-     */
-    QString getName() const override;
-
-    /*
-     * @brief This is the list of array names that reside inside the "Meta Data" attribute matrix that are the
-     * pieces of data that define why the data containers were grouped into a bundle. For example, if you have a time
-     * series set of data where each Data Container is a step in "time" and there are several values for time:
-     * @li Time Value Real value of time
-     * @li Time Step Value Time Step value in the simulation
-     * @li Time Index The raw index of the data, i.e., this is the actual ordering that could also be used as then index
-     * into an array of data containers
-     */
-    /**
-     * @brief Setter property for MetaDataArrays
-     */
-    void setMetaDataArrays(const QStringList& value);
-    /**
-     * @brief Getter property for MetaDataArrays
-     * @return Value of MetaDataArrays
-     */
-    QStringList getMetaDataArrays() const;
-
-    /**
-     * @brief Sets All the DataContainers for this bundle
-     * @param containers
-     */
-    void setDataContainers(QVector<DataContainer::Pointer>& containers);
-    QVector<QString> getDataContainerNames() override;
-
-
-    /**
-     * @brief addDataContainer Adds a Data Container to the bundle
-     * @param dc
-     */
-    void addOrReplaceDataContainer(DataContainer::Pointer dc) override;
-
-    /**
-     * @brief removeDataContainer Removes a Data Container from the bundle by pointer
-     * @param dc
-     */
-    void removeDataContainer(DataContainer::Pointer dc) override;
-
-    /**
-     * @brief Removes a DataContainer by name from the bundle
-     * @param name
-     */
-    void removeDataContainer(const QString& name) override;
-
-    /**
-     * @brief Removes a Data Container by index
-     * @param i
-     */
-    void removeDataContainer(qint32 i) override;
-
-    /**
-     * @brief Returns the DataContainer at a given index
-     * @param index
-     * @return
-     */
-    DataContainer::Pointer getDataContainer(qint32 index) override;
-
-    /**
-     * @brief Returns the number of DataContainers held in the bundle
-     * @return
-     */
-    qint32 count() override;
-
-    /**
-     * @brief Removes all references to the DataContainers stored in the class. Count will = 0
-     * after this operation
-     */
-    void clear() override;
-
-    /**
-     * @brief This function returns all the Data Arrays Path objects that all the
-     * DataContainers have in common with each other.
-     */
-    QVector<DataArrayPath> findCommonDataArrayPaths(bool filterMetaData = true);
-
-    /**
-     * @brief writeH5Data Write this bundle out to an HDF5 File
-     * @param file_id The hdf5 file id or other group id where the bundle is going to be serialized to.
-     * @return
-     */
-    int writeH5Data(hid_t groupId) override;
-
-    /**
-     * @brief readH5Data Reads this bundle from an HDF5 file
-     * @param groupId
-     * @return
-     */
-    int readH5Data(hid_t groupId) override;
-
-  protected:
-    DataContainerBundle();
-
-  private:
-    QString m_Name = {};
-    QStringList m_MetaDataArrays = {};
-
-    QVector<DataContainer::Pointer>  m_DataContainers;
-    QString m_MetaDataAMName;
-
-  public:
-    DataContainerBundle(const DataContainerBundle&) = delete; // Copy Constructor Not Implemented
-    DataContainerBundle(DataContainerBundle&&) = delete;      // Move Constructor Not Implemented
-    DataContainerBundle& operator=(const DataContainerBundle&) = delete; // Copy Assignment Not Implemented
-    DataContainerBundle& operator=(DataContainerBundle&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  using Self = DataContainerBundle;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for DataContainerBundle
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerBundle
+   */
+  static QString ClassName();
+
+  ~DataContainerBundle() override;
+
+  /**
+   * @brief Creates a new DataContainerBundle
+   * @param name The Name of the Bundle
+   * @return
+   */
+  static Pointer New(const QString& name)
+  {
+    Pointer sharedPtr(new DataContainerBundle);
+    sharedPtr->setName(name);
+    return sharedPtr;
+  }
+
+  /**
+   * @brief GetMetaDataName
+   * @return Returns the name of the Meta Data AttributeMatrix name. This name should be used for any AttributeMatrix
+   * that is used in a DataContainer to hold the type of data that is used to group DataContainers into bundles.
+   */
+  static QString GetMetaDataName();
+
+  /**
+   * @brief The name of this DataContainerBundle
+   */
+  /**
+   * @brief Setter property for Name
+   */
+  void setName(const QString& value) override;
+  /**
+   * @brief Getter property for Name
+   * @return Value of Name
+   */
+  QString getName() const override;
+
+  /*
+   * @brief This is the list of array names that reside inside the "Meta Data" attribute matrix that are the
+   * pieces of data that define why the data containers were grouped into a bundle. For example, if you have a time
+   * series set of data where each Data Container is a step in "time" and there are several values for time:
+   * @li Time Value Real value of time
+   * @li Time Step Value Time Step value in the simulation
+   * @li Time Index The raw index of the data, i.e., this is the actual ordering that could also be used as then index
+   * into an array of data containers
+   */
+  /**
+   * @brief Setter property for MetaDataArrays
+   */
+  void setMetaDataArrays(const QStringList& value);
+  /**
+   * @brief Getter property for MetaDataArrays
+   * @return Value of MetaDataArrays
+   */
+  QStringList getMetaDataArrays() const;
+
+  /**
+   * @brief Sets All the DataContainers for this bundle
+   * @param containers
+   */
+  void setDataContainers(QVector<DataContainer::Pointer>& containers);
+  QVector<QString> getDataContainerNames() override;
+
+  /**
+   * @brief addDataContainer Adds a Data Container to the bundle
+   * @param dc
+   */
+  void addOrReplaceDataContainer(DataContainer::Pointer dc) override;
+
+  /**
+   * @brief removeDataContainer Removes a Data Container from the bundle by pointer
+   * @param dc
+   */
+  void removeDataContainer(DataContainer::Pointer dc) override;
+
+  /**
+   * @brief Removes a DataContainer by name from the bundle
+   * @param name
+   */
+  void removeDataContainer(const QString& name) override;
+
+  /**
+   * @brief Removes a Data Container by index
+   * @param i
+   */
+  void removeDataContainer(qint32 i) override;
+
+  /**
+   * @brief Returns the DataContainer at a given index
+   * @param index
+   * @return
+   */
+  DataContainer::Pointer getDataContainer(qint32 index) override;
+
+  /**
+   * @brief Returns the number of DataContainers held in the bundle
+   * @return
+   */
+  qint32 count() override;
+
+  /**
+   * @brief Removes all references to the DataContainers stored in the class. Count will = 0
+   * after this operation
+   */
+  void clear() override;
+
+  /**
+   * @brief This function returns all the Data Arrays Path objects that all the
+   * DataContainers have in common with each other.
+   */
+  QVector<DataArrayPath> findCommonDataArrayPaths(bool filterMetaData = true);
+
+  /**
+   * @brief writeH5Data Write this bundle out to an HDF5 File
+   * @param file_id The hdf5 file id or other group id where the bundle is going to be serialized to.
+   * @return
+   */
+  int writeH5Data(hid_t groupId) override;
+
+  /**
+   * @brief readH5Data Reads this bundle from an HDF5 file
+   * @param groupId
+   * @return
+   */
+  int readH5Data(hid_t groupId) override;
+
+protected:
+  DataContainerBundle();
+
+private:
+  QString m_Name = {};
+  QStringList m_MetaDataArrays = {};
+
+  QVector<DataContainer::Pointer> m_DataContainers;
+  QString m_MetaDataAMName;
+
+public:
+  DataContainerBundle(const DataContainerBundle&) = delete;            // Copy Constructor Not Implemented
+  DataContainerBundle(DataContainerBundle&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerBundle& operator=(const DataContainerBundle&) = delete; // Copy Assignment Not Implemented
+  DataContainerBundle& operator=(DataContainerBundle&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
index 8adc09fe58..306fcbfdb3 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerProxy.h"
 
@@ -47,7 +47,8 @@ DataContainerProxy::DataContainerProxy(const QString& dc_name, const uint8_t& re
 : m_Flag(read_dc)
 , m_Name(dc_name)
 , m_DCType(static_cast<unsigned int>(dc_type))
-{}
+{
+}
 
 // -----------------------------------------------------------------------------
 //
@@ -111,14 +112,14 @@ void DataContainerProxy::writeJson(QJsonObject& json) const
 // -----------------------------------------------------------------------------
 bool DataContainerProxy::readJson(QJsonObject& json)
 {
-  if (json["Flag"].isDouble() && json["Name"].isString() && json["Type"].isDouble() && json["Attribute Matricies"].isArray())
+  if(json["Flag"].isDouble() && json["Name"].isString() && json["Type"].isDouble() && json["Attribute Matricies"].isArray())
   {
-    if (json["Flag"].toDouble() >= std::numeric_limits<uint8_t>::min() && json["Flag"].toDouble() <= std::numeric_limits<uint8_t>::max())
+    if(json["Flag"].toDouble() >= std::numeric_limits<uint8_t>::min() && json["Flag"].toDouble() <= std::numeric_limits<uint8_t>::max())
     {
       m_Flag = static_cast<uint8_t>(json["Flag"].toDouble());
     }
     m_Name = json["Name"].toString();
-    if (json["Type"].toDouble() >= std::numeric_limits<unsigned int>::min() && json["Type"].toDouble() <= std::numeric_limits<unsigned int>::max())
+    if(json["Type"].toDouble() >= std::numeric_limits<unsigned int>::min() && json["Type"].toDouble() <= std::numeric_limits<unsigned int>::max())
     {
       m_DCType = static_cast<unsigned int>(json["Type"].toDouble());
     }
@@ -151,7 +152,7 @@ QMap<QString, AttributeMatrixProxy> DataContainerProxy::readMap(QJsonArray jsonA
   QMap<QString, AttributeMatrixProxy> map;
   foreach(QJsonValue val, jsonArray)
   {
-    if (val.isObject())
+    if(val.isObject())
     {
       AttributeMatrixProxy am;
       QJsonObject obj = val.toObject();
@@ -167,48 +168,38 @@ QMap<QString, AttributeMatrixProxy> DataContainerProxy::readMap(QJsonArray jsonA
 // -----------------------------------------------------------------------------
 DataContainerProxy::DCGeometryTypeFlag DataContainerProxy::GeometryTypeToFlag(IGeometry::Type geoType)
 {
-  switch (geoType)
+  switch(geoType)
   {
-    case IGeometry::Type::Any:
-    {
-      return Any_DCGeomType;
-    }
-    case IGeometry::Type::Edge:
-    {
-      return Edge_DCGeomType;
-    }
-    case IGeometry::Type::Image:
-    {
-      return Image_DCGeomType;
-    }
-    case IGeometry::Type::Quad:
-    {
-      return Quad_DCGeomType;
-    }
-    case IGeometry::Type::RectGrid:
-    {
-      return RectGrid_DCGeomType;
-    }
-    case IGeometry::Type::Tetrahedral:
-    {
-      return Tetrahedral_DCGeomType;
-    }
-    case IGeometry::Type::Triangle:
-    {
-      return Triangle_DCGeomType;
-    }
-    case IGeometry::Type::Vertex:
-    {
-      return Vertex_DCGeomType;
-    }
-    case IGeometry::Type::Hexahedral:
-    {
-      return Hexahedral_DCGeomType;
-    }
-    case IGeometry::Type::Unknown:
-    {
-      return Unknown_DCGeomType;
-    }
+  case IGeometry::Type::Any: {
+    return Any_DCGeomType;
+  }
+  case IGeometry::Type::Edge: {
+    return Edge_DCGeomType;
+  }
+  case IGeometry::Type::Image: {
+    return Image_DCGeomType;
+  }
+  case IGeometry::Type::Quad: {
+    return Quad_DCGeomType;
+  }
+  case IGeometry::Type::RectGrid: {
+    return RectGrid_DCGeomType;
+  }
+  case IGeometry::Type::Tetrahedral: {
+    return Tetrahedral_DCGeomType;
+  }
+  case IGeometry::Type::Triangle: {
+    return Triangle_DCGeomType;
+  }
+  case IGeometry::Type::Vertex: {
+    return Vertex_DCGeomType;
+  }
+  case IGeometry::Type::Hexahedral: {
+    return Hexahedral_DCGeomType;
+  }
+  case IGeometry::Type::Unknown: {
+    return Unknown_DCGeomType;
+  }
   }
 
   return Unknown_DCGeomType;
@@ -225,7 +216,7 @@ void DataContainerProxy::setFlags(uint8_t flag, AttributeMatrixProxy::AMTypeFlag
   {
     AttributeMatrixProxy& amProxy = amIter.value();
     AttributeMatrixProxy::AMTypeFlag amTypeFlag = AttributeMatrixProxy::AttributeMatrixTypeToFlag(static_cast<AttributeMatrix::Type>(amProxy.getAMType()));
-    if ((amTypes & amTypeFlag) > 0 || amTypes == AttributeMatrixProxy::AMTypeFlag::Any_AMType)
+    if((amTypes & amTypeFlag) > 0 || amTypes == AttributeMatrixProxy::AMTypeFlag::Any_AMType)
     {
       amProxy.setFlags(flag, primitiveTypes, compDimsVector);
     }
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.h b/Source/SIMPLib/DataContainers/DataContainerProxy.h
index d5f5d2c608..e4b4077ae3 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/DataContainers/DsnIterators.h b/Source/SIMPLib/DataContainers/DsnIterators.h
index c33bf168a4..16e9836e41 100644
--- a/Source/SIMPLib/DataContainers/DsnIterators.h
+++ b/Source/SIMPLib/DataContainers/DsnIterators.h
@@ -46,7 +46,7 @@ class IDataStructureNode;
  * AttributeMatrix iterators only iterate over their DataArrays.
  * This was made constexpr for the sake of creating faster runtime operations.
  */
-class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::shared_ptr<IDataStructureNode>, size_t> //std::iterator_traits<std::shared_ptr<IDataStructureNode>>
+class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::shared_ptr<IDataStructureNode>, size_t> // std::iterator_traits<std::shared_ptr<IDataStructureNode>>
 {
   using self_type = DsnIterator;
   using difference_type = size_t;
@@ -70,8 +70,9 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
   DsnIterator(const collection_type& collection, size_t index)
   : m_Collection(collection)
   , m_Index(index)
-  {}
-  
+  {
+  }
+
   /**
    * @brief Copy iterator
    * @param other
@@ -79,7 +80,8 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
   DsnIterator(const self_type& other)
   : m_Collection(other.m_Collection)
   , m_Index(other.m_Index)
-  {}
+  {
+  }
 
   /**
    * @brief Destructor
@@ -170,11 +172,11 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
   }
 
   /**
-  * @brief Returns true if the given iterator comes later in the collection.
-  * Returns false otherwise.
-  * @param other
-  * @return
-  */
+   * @brief Returns true if the given iterator comes later in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
   constexpr bool operator<(const self_type& other) const
   {
     return m_Index < other.m_Index;
@@ -214,10 +216,10 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
   }
 
   /**
-    * @brief Returns true if other iterator points to the same index in same collection.
-    * @param rhs right hand side
-    * @return
-    */
+   * @brief Returns true if other iterator points to the same index in same collection.
+   * @param rhs right hand side
+   * @return
+   */
   constexpr bool operator==(const self_type& rhs) const
   {
     return (m_Index == rhs.m_Index) && (m_Collection == rhs.m_Collection);
@@ -253,7 +255,6 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
   difference_type m_Index;
 };
 
-
 /**
  * @brief The DsnConstIterator is a bidirectional const iterator over data structure types
  * belonging to the same level.  DataContainerArray iterators only iterate over
@@ -261,7 +262,7 @@ class DsnIterator : public std::iterator<std::random_access_iterator_tag, std::s
  * AttributeMatrix iterators only iterate over their DataArrays.
  * This was made constexpr for the sake of creating faster runtime operations.
  */
-class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, const std::shared_ptr<IDataStructureNode>, size_t> //std::iterator_traits<const std::shared_ptr<IDataStructureNode>>
+class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, const std::shared_ptr<IDataStructureNode>, size_t> // std::iterator_traits<const std::shared_ptr<IDataStructureNode>>
 {
   using self_type = DsnConstIterator;
   using difference_type = size_t;
@@ -285,7 +286,8 @@ class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, c
   DsnConstIterator(const collection_type& collection, size_t index)
   : m_Collection(collection)
   , m_Index(index)
-  {}
+  {
+  }
 
   /**
    * @brief Copy constructor
@@ -294,7 +296,8 @@ class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, c
   DsnConstIterator(const self_type& other)
   : m_Collection(other.m_Collection)
   , m_Index(other.m_Index)
-  {}
+  {
+  }
 
   /**
    * @brief Destructor
@@ -385,11 +388,11 @@ class DsnConstIterator : public std::iterator<std::random_access_iterator_tag, c
   }
 
   /**
-  * @brief Returns true if the given iterator comes later in the collection.
-  * Returns false otherwise.
-  * @param other
-  * @return
-  */
+   * @brief Returns true if the given iterator comes later in the collection.
+   * Returns false otherwise.
+   * @param other
+   * @return
+   */
   constexpr bool operator<(const self_type& other) const
   {
     return m_Index < other.m_Index;
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
index aa26aa2f88..e8d9ef5863 100644
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "IDataContainerBundle.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.h b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
old mode 100755
new mode 100644
index 2edfadf56e..47b189a3fc
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,62 +40,60 @@
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 
 class SIMPLib_EXPORT IDataContainerBundle : public QObject
 {
-    Q_OBJECT
-  public:
-    using Self = IDataContainerBundle;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+  Q_OBJECT
+public:
+  using Self = IDataContainerBundle;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for IDataContainerBundle
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for IDataContainerBundle
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for IDataContainerBundle
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for IDataContainerBundle
+   */
+  static QString ClassName();
 
-    ~IDataContainerBundle() override;
+  ~IDataContainerBundle() override;
 
-    virtual void setName(const QString& getDataContainer) = 0;
-    virtual QString getName() const = 0;
+  virtual void setName(const QString& getDataContainer) = 0;
+  virtual QString getName() const = 0;
 
-    virtual QVector<QString> getDataContainerNames() = 0;
+  virtual QVector<QString> getDataContainerNames() = 0;
 
-    virtual void addOrReplaceDataContainer(DataContainer::Pointer dc) = 0;
+  virtual void addOrReplaceDataContainer(DataContainer::Pointer dc) = 0;
 
-    virtual void removeDataContainer(DataContainer::Pointer dc) = 0;
-    virtual void removeDataContainer(const QString& name) = 0;
-    virtual void removeDataContainer(qint32 i) = 0;
+  virtual void removeDataContainer(DataContainer::Pointer dc) = 0;
+  virtual void removeDataContainer(const QString& name) = 0;
+  virtual void removeDataContainer(qint32 i) = 0;
 
-    virtual DataContainer::Pointer getDataContainer(qint32 index) = 0;
+  virtual DataContainer::Pointer getDataContainer(qint32 index) = 0;
 
-    virtual qint32 count() = 0;
+  virtual qint32 count() = 0;
 
-    virtual void clear() = 0;
+  virtual void clear() = 0;
 
-    virtual int writeH5Data(hid_t groupId) = 0;
+  virtual int writeH5Data(hid_t groupId) = 0;
 
-    virtual int readH5Data(hid_t groupId) = 0;
+  virtual int readH5Data(hid_t groupId) = 0;
 
-  protected:
-    IDataContainerBundle();
+protected:
+  IDataContainerBundle();
 
-  public:
-    IDataContainerBundle(const IDataContainerBundle&) = delete; // Copy Constructor Not Implemented
-    IDataContainerBundle(IDataContainerBundle&&) = delete;      // Move Constructor Not Implemented
-    IDataContainerBundle& operator=(const IDataContainerBundle&) = delete; // Copy Assignment Not Implemented
-    IDataContainerBundle& operator=(IDataContainerBundle&&) = delete;      // Move Assignment Not Implemented
+public:
+  IDataContainerBundle(const IDataContainerBundle&) = delete;            // Copy Constructor Not Implemented
+  IDataContainerBundle(IDataContainerBundle&&) = delete;                 // Move Constructor Not Implemented
+  IDataContainerBundle& operator=(const IDataContainerBundle&) = delete; // Copy Assignment Not Implemented
+  IDataContainerBundle& operator=(IDataContainerBundle&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
index 66162767be..5b08c86a0c 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
@@ -42,7 +42,8 @@
 
 #include "IDataStructureNode.h"
 
-template <class DerivedChild_t> class IDataStructureContainerNode : public AbstractDataStructureContainer
+template <class DerivedChild_t>
+class IDataStructureContainerNode : public AbstractDataStructureContainer
 {
 public:
   using Self = IDataStructureContainerNode<DerivedChild_t>;
@@ -61,7 +62,6 @@ template <class DerivedChild_t> class IDataStructureContainerNode : public Abstr
   ChildCollection m_ChildrenNodes;
 
 protected:
-  
 public:
   IDataStructureContainerNode(const QString& name = "")
   : AbstractDataStructureContainer(name)
@@ -432,7 +432,7 @@ template <class DerivedChild_t> class IDataStructureContainerNode : public Abstr
     m_ChildrenNodes.erase(iter);
     destroyParentConnection(child.get());
   }
-  
+
   /**
    * @brief Removes the given child from the children collection and returns its shared_ptr.
    * @param child
@@ -457,5 +457,4 @@ template <class DerivedChild_t> class IDataStructureContainerNode : public Abstr
 
     return NullPointer();
   }
-
 };
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.cpp b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
index 12db0762a8..26ac42204a 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.cpp
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
@@ -119,7 +119,8 @@ bool RenameDataPath::CheckRenamePath(const DataContainerArrayShPtr& oldDca, cons
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayPath::RenameContainer RenameDataPath::CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths)
+DataArrayPath::RenameContainer RenameDataPath::CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths,
+                                                                    const std::list<DataArrayPath>& newPaths)
 {
   DataArrayPath::RenameContainer container;
   std::list<DataArrayPath> duplicatedPaths;
@@ -167,7 +168,7 @@ DataArrayPath::RenameContainer RenameDataPath::CheckForRenamedPaths(const DataCo
   }
 
   // Remove items with duplicated paths
-  for(auto iter = container.begin(); iter != container.end(); )
+  for(auto iter = container.begin(); iter != container.end();)
   {
     const DataArrayPath& checkPath = std::get<1>(*iter);
     if(duplicatedPaths.end() != std::find(duplicatedPaths.begin(), duplicatedPaths.end(), checkPath))
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.h b/Source/SIMPLib/DataContainers/RenameDataPath.h
index 9cbef7f633..a87cb8e94d 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.h
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.h
@@ -55,70 +55,71 @@ using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
  */
 namespace RenameDataPath
 {
-  using RenamePathType = std::pair<DataArrayPath, DataArrayPath>;
-  using RenameContainer = std::list<RenamePathType>;
-  using PossibleRename = std::pair<bool, RenamePathType>;
+using RenamePathType = std::pair<DataArrayPath, DataArrayPath>;
+using RenameContainer = std::list<RenamePathType>;
+using PossibleRename = std::pair<bool, RenamePathType>;
 
-  /**
-   * @brief DataID_t is used as the ID type when creating DataArrayPaths through 
-   * createNonPrereq* methods inside AbstractFilter::dataCheck().  This ID is 
-   * used for mapping created paths and performing quick lookups to detect rename
-   * operations far more quickly than previous implementations for rename 
-   * operations. This forces filters to opt-in to rename functionality rather than
-   * provide it across all filters automatically.
-   */
-  using DataID_t = size_t;
-  const DataID_t k_Invalid_ID = 0;
+/**
+ * @brief DataID_t is used as the ID type when creating DataArrayPaths through
+ * createNonPrereq* methods inside AbstractFilter::dataCheck().  This ID is
+ * used for mapping created paths and performing quick lookups to detect rename
+ * operations far more quickly than previous implementations for rename
+ * operations. This forces filters to opt-in to rename functionality rather than
+ * provide it across all filters automatically.
+ */
+using DataID_t = size_t;
+const DataID_t k_Invalid_ID = 0;
 
-  /**
-   * @brief This function serves as the main hub for alerting the specified 
-   * AbstractFilter that a DataArrayPath has been created with the given ID.
-   * The plus side of this is that AbstractFilter has a single friend function
-   * instead of having to declare DataContainerArray, DataContainer, and AttributeMatrix
-   * all as friend classes in order to achieve the same result.
-   * @param filter The filter creating the path
-   * @param id The local ID for the filter to perform rename checks on
-   * @param path The new DataArrayPath
-   */
-  void SIMPLib_EXPORT AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id, const DataArrayPath& path);
+/**
+ * @brief This function serves as the main hub for alerting the specified
+ * AbstractFilter that a DataArrayPath has been created with the given ID.
+ * The plus side of this is that AbstractFilter has a single friend function
+ * instead of having to declare DataContainerArray, DataContainer, and AttributeMatrix
+ * all as friend classes in order to achieve the same result.
+ * @param filter The filter creating the path
+ * @param id The local ID for the filter to perform rename checks on
+ * @param path The new DataArrayPath
+ */
+void SIMPLib_EXPORT AlertFilterCreatedPath(AbstractFilter* filter, DataID_t id, const DataArrayPath& path);
 
-  /**
-   * @brief Checks if two rename values are compatible to be merged together.
-   * @param originalPair
-   * @param newPair
-   * @return
-   */
-  bool SIMPLib_EXPORT CanReplaceRenamePath(const RenamePathType& originalPair, const RenamePathType& newPair);
+/**
+ * @brief Checks if two rename values are compatible to be merged together.
+ * @param originalPair
+ * @param newPair
+ * @return
+ */
+bool SIMPLib_EXPORT CanReplaceRenamePath(const RenamePathType& originalPair, const RenamePathType& newPair);
 
-  /**
-   * @brief checks if the targets of the old DataArrayPath and new DataArrayPath are compatible in their given DataContainerArrays
-   * @param oldDca
-   * @param newDca
-   * @param oldPath
-   * @param newPath
-   */
-  bool SIMPLib_EXPORT CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath);
+/**
+ * @brief checks if the targets of the old DataArrayPath and new DataArrayPath are compatible in their given DataContainerArrays
+ * @param oldDca
+ * @param newDca
+ * @param oldPath
+ * @param newPath
+ */
+bool SIMPLib_EXPORT CheckRenamePath(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const DataArrayPath& oldPath, const DataArrayPath& newPath);
 
-  /**
-   * @brief checks for and returns any updated DataArrayPaths between two sets
-   * @param oldPaths
-   * @param newPaths
-   * @return
-   */
-  RenameContainer SIMPLib_EXPORT CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths, const std::list<DataArrayPath>& newPaths);
-  
-  /**
-   * @brief Calculate the rename paths for the given filter and removes rename paths as required by created paths.
-   * The updated rename paths are added to the list parameter.
-   * @param filter
-   * @param renamePaths
-   */
-  void SIMPLib_EXPORT CalculateRenamedPaths(const AbstractFilterShPtr& filter, RenameContainer& renamedPaths);
+/**
+ * @brief checks for and returns any updated DataArrayPaths between two sets
+ * @param oldPaths
+ * @param newPaths
+ * @return
+ */
+RenameContainer SIMPLib_EXPORT CheckForRenamedPaths(const DataContainerArrayShPtr& oldDca, const DataContainerArrayShPtr& newDca, const std::list<DataArrayPath>& oldPaths,
+                                                    const std::list<DataArrayPath>& newPaths);
 
-  /**
-   * @brief Merges a list of DataArrayPath renames into an existing list.
-   * @param list
-   * @param newRenames
-   */
-  void SIMPLib_EXPORT MergeRenamedPaths(RenameContainer& list, const RenameContainer& newRenames);
-}
+/**
+ * @brief Calculate the rename paths for the given filter and removes rename paths as required by created paths.
+ * The updated rename paths are added to the list parameter.
+ * @param filter
+ * @param renamePaths
+ */
+void SIMPLib_EXPORT CalculateRenamedPaths(const AbstractFilterShPtr& filter, RenameContainer& renamedPaths);
+
+/**
+ * @brief Merges a list of DataArrayPath renames into an existing list.
+ * @param list
+ * @param newRenames
+ */
+void SIMPLib_EXPORT MergeRenamedPaths(RenameContainer& list, const RenameContainer& newRenames);
+} // namespace RenameDataPath
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index cab3bb058d..8ff8b22ee3 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index 7e05da344d..b0f46e8759 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractFilterParametersReader.h"
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index d45ec61d88..33847ad99e 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <set>
@@ -56,10 +56,7 @@
 
 class AbstractFilter;
 
-#define READ_ARRAY_SELECTION_PARAMETER(Name)\
-  setSelected##Name##Arrays( reader->readArraySelections(#Name, getSelected##Name##Arrays() ) );
-
-
+#define READ_ARRAY_SELECTION_PARAMETER(Name) setSelected##Name##Arrays(reader->readArraySelections(#Name, getSelected##Name##Arrays()));
 
 /**
  * @class AbstractFilterParametersReader AbstractFilterParametersReader.h DREAM3DLib/Common/AbstractFilterParametersReader.h
@@ -70,81 +67,79 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT AbstractFilterParametersReader
 {
-  public:
-    /**
-     * @brief Returns the name of the class for AbstractFilterParametersReader
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for AbstractFilterParametersReader
-     */
-    static QString ClassName();
-
-    virtual ~AbstractFilterParametersReader();
-
-    virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
-    virtual int closeFilterGroup() = 0;
-
-    virtual QString readString(const QString& name, QString value);
-    virtual QVector<QString> readStrings(const QString& name, QVector<QString> value);
-    virtual QStringList readStringList(const QString& name, QStringList value);
-
-    virtual int8_t readValue(const QString& name, int8_t value);
-    virtual int16_t readValue(const QString& name, int16_t value);
-    virtual int32_t readValue(const QString& name, int32_t value);
-    virtual int64_t readValue(const QString& name, int64_t value);
-    virtual uint8_t readValue(const QString& name, uint8_t value);
-    virtual uint16_t readValue(const QString& name, uint16_t value);
-    virtual uint32_t readValue(const QString& name, uint32_t value);
-    virtual uint64_t readValue(const QString& name, uint64_t value);
-    virtual float readValue(const QString& name, float value);
-    virtual double readValue(const QString& name, double value);
-    virtual bool readValue(const QString& name, bool value);
-    virtual AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value);
-
-    virtual QVector<int8_t> readArray(const QString& name, QVector<int8_t> value);
-    virtual QVector<int16_t> readArray(const QString& name, QVector<int16_t> value);
-    virtual QVector<int32_t> readArray(const QString& name, QVector<int32_t> value);
-    virtual QVector<int64_t> readArray(const QString& name, QVector<int64_t> value);
-    virtual QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value);
-    virtual QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value);
-    virtual QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value);
-    virtual QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value);
-    virtual QVector<float> readArray(const QString& name, QVector<float> value);
-    virtual QVector<double> readArray(const QString& name, QVector<double> value);
-
-    virtual IntVec3Type readIntVec3(const QString& name, IntVec3Type v);
-    virtual FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v);
-    virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v);
-    virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v);
-    virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v);
-    virtual StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v);
-    virtual ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos);
-    virtual ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v);
-    virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v);
-    virtual AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos);
-    virtual QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v);
-    virtual QSet<QString> readArraySelections(const QString& name, QSet<QString> v);
-
-    virtual DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v);
-
-    virtual DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v);
-    virtual QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> v);
-
-    virtual DynamicTableData readDynamicTableData(const QString& name, DynamicTableData v);
-
-    virtual FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v);
-
-  protected:
-    AbstractFilterParametersReader();
-
-  public:
-    AbstractFilterParametersReader(const AbstractFilterParametersReader&) = delete; // Copy Constructor Not Implemented
-    AbstractFilterParametersReader(AbstractFilterParametersReader&&) = delete;      // Move Constructor Not Implemented
-    AbstractFilterParametersReader& operator=(const AbstractFilterParametersReader&) = delete; // Copy Assignment Not Implemented
-    AbstractFilterParametersReader& operator=(AbstractFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  /**
+   * @brief Returns the name of the class for AbstractFilterParametersReader
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for AbstractFilterParametersReader
+   */
+  static QString ClassName();
+
+  virtual ~AbstractFilterParametersReader();
+
+  virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
+  virtual int closeFilterGroup() = 0;
+
+  virtual QString readString(const QString& name, QString value);
+  virtual QVector<QString> readStrings(const QString& name, QVector<QString> value);
+  virtual QStringList readStringList(const QString& name, QStringList value);
+
+  virtual int8_t readValue(const QString& name, int8_t value);
+  virtual int16_t readValue(const QString& name, int16_t value);
+  virtual int32_t readValue(const QString& name, int32_t value);
+  virtual int64_t readValue(const QString& name, int64_t value);
+  virtual uint8_t readValue(const QString& name, uint8_t value);
+  virtual uint16_t readValue(const QString& name, uint16_t value);
+  virtual uint32_t readValue(const QString& name, uint32_t value);
+  virtual uint64_t readValue(const QString& name, uint64_t value);
+  virtual float readValue(const QString& name, float value);
+  virtual double readValue(const QString& name, double value);
+  virtual bool readValue(const QString& name, bool value);
+  virtual AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value);
+
+  virtual QVector<int8_t> readArray(const QString& name, QVector<int8_t> value);
+  virtual QVector<int16_t> readArray(const QString& name, QVector<int16_t> value);
+  virtual QVector<int32_t> readArray(const QString& name, QVector<int32_t> value);
+  virtual QVector<int64_t> readArray(const QString& name, QVector<int64_t> value);
+  virtual QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value);
+  virtual QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value);
+  virtual QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value);
+  virtual QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value);
+  virtual QVector<float> readArray(const QString& name, QVector<float> value);
+  virtual QVector<double> readArray(const QString& name, QVector<double> value);
+
+  virtual IntVec3Type readIntVec3(const QString& name, IntVec3Type v);
+  virtual FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v);
+  virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v);
+  virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v);
+  virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v);
+  virtual StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v);
+  virtual ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos);
+  virtual ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v);
+  virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v);
+  virtual AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos);
+  virtual QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v);
+  virtual QSet<QString> readArraySelections(const QString& name, QSet<QString> v);
+
+  virtual DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v);
+
+  virtual DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v);
+  virtual QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> v);
+
+  virtual DynamicTableData readDynamicTableData(const QString& name, DynamicTableData v);
+
+  virtual FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v);
+
+protected:
+  AbstractFilterParametersReader();
+
+public:
+  AbstractFilterParametersReader(const AbstractFilterParametersReader&) = delete;            // Copy Constructor Not Implemented
+  AbstractFilterParametersReader(AbstractFilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
+  AbstractFilterParametersReader& operator=(const AbstractFilterParametersReader&) = delete; // Copy Assignment Not Implemented
+  AbstractFilterParametersReader& operator=(AbstractFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index 3c2f281f28..a03d244abc 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractFilterParametersWriter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index e96fab709d..dc4032aa72 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,10 +55,7 @@
 
 class AbstractFilter;
 
-#define WRITE_ARRAY_SELECTION_PARAMETER(Name)\
-  writer->writeArraySelections( #Name, getSelected##Name##Arrays() );
-
-
+#define WRITE_ARRAY_SELECTION_PARAMETER(Name) writer->writeArraySelections(#Name, getSelected##Name##Arrays());
 
 /**
  * @class AbstractFilterParametersWriter AbstractFilterParametersWriter.h DREAM3DLib/Common/AbstractFilterParametersWriter.h
@@ -70,87 +66,85 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT AbstractFilterParametersWriter
 {
-  public:
-    /**
-     * @brief Returns the name of the class for AbstractFilterParametersWriter
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for AbstractFilterParametersWriter
-     */
-    static QString ClassName();
+public:
+  /**
+   * @brief Returns the name of the class for AbstractFilterParametersWriter
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for AbstractFilterParametersWriter
+   */
+  static QString ClassName();
 
-    virtual ~AbstractFilterParametersWriter();
+  virtual ~AbstractFilterParametersWriter();
 
-    virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
-    virtual int closeFilterGroup() = 0;
+  virtual int openFilterGroup(AbstractFilter* filter, int index) = 0;
+  virtual int closeFilterGroup() = 0;
 
-    virtual int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) = 0;
+  virtual int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) = 0;
 
-    virtual int writeValue(const QString& name, const QString& value);
-    virtual int writeValue(const QString& name, const QVector<QString>& value);
-    virtual int writeValue(const QString& name, const QStringList& value);
+  virtual int writeValue(const QString& name, const QString& value);
+  virtual int writeValue(const QString& name, const QVector<QString>& value);
+  virtual int writeValue(const QString& name, const QStringList& value);
 
-    virtual int writeValue(const QString& name, int8_t value);
-    virtual int writeValue(const QString& name, int16_t value);
-    virtual int writeValue(const QString& name, int32_t value);
-    virtual int writeValue(const QString& name, int64_t value);
-    virtual int writeValue(const QString& name, uint8_t value);
-    virtual int writeValue(const QString& name, uint16_t value);
-    virtual int writeValue(const QString& name, uint32_t value);
-    virtual int writeValue(const QString& name, uint64_t value);
-    virtual int writeValue(const QString& name, float value);
-    virtual int writeValue(const QString& name, double value);
+  virtual int writeValue(const QString& name, int8_t value);
+  virtual int writeValue(const QString& name, int16_t value);
+  virtual int writeValue(const QString& name, int32_t value);
+  virtual int writeValue(const QString& name, int64_t value);
+  virtual int writeValue(const QString& name, uint8_t value);
+  virtual int writeValue(const QString& name, uint16_t value);
+  virtual int writeValue(const QString& name, uint32_t value);
+  virtual int writeValue(const QString& name, uint64_t value);
+  virtual int writeValue(const QString& name, float value);
+  virtual int writeValue(const QString& name, double value);
 
-    virtual int writeValue(const QString& name, QVector<int8_t> value);
-    virtual int writeValue(const QString& name, QVector<int16_t> value);
-    virtual int writeValue(const QString& name, QVector<int32_t> value);
-    virtual int writeValue(const QString& name, QVector<int64_t> value);
-    virtual int writeValue(const QString& name, QVector<uint8_t> value);
-    virtual int writeValue(const QString& name, QVector<uint16_t> value);
-    virtual int writeValue(const QString& name, QVector<uint32_t> value);
-    virtual int writeValue(const QString& name, QVector<uint64_t> value);
-    virtual int writeValue(const QString& name, QVector<float> value);
-    virtual int writeValue(const QString& name, QVector<double> value);
+  virtual int writeValue(const QString& name, QVector<int8_t> value);
+  virtual int writeValue(const QString& name, QVector<int16_t> value);
+  virtual int writeValue(const QString& name, QVector<int32_t> value);
+  virtual int writeValue(const QString& name, QVector<int64_t> value);
+  virtual int writeValue(const QString& name, QVector<uint8_t> value);
+  virtual int writeValue(const QString& name, QVector<uint16_t> value);
+  virtual int writeValue(const QString& name, QVector<uint32_t> value);
+  virtual int writeValue(const QString& name, QVector<uint64_t> value);
+  virtual int writeValue(const QString& name, QVector<float> value);
+  virtual int writeValue(const QString& name, QVector<double> value);
 
-    virtual int writeValue(const QString& name, IntVec3Type v);
-    virtual int writeValue(const QString& name, FloatVec3Type v);
-    virtual int writeValue(const QString& name, Float2ndOrderPoly_t v);
-    virtual int writeValue(const QString& name, Float3rdOrderPoly_t v);
-    virtual int writeValue(const QString& name, Float4thOrderPoly_t v);
-    virtual int writeValue(const QString& name, StackFileListInfo v);
+  virtual int writeValue(const QString& name, IntVec3Type v);
+  virtual int writeValue(const QString& name, FloatVec3Type v);
+  virtual int writeValue(const QString& name, Float2ndOrderPoly_t v);
+  virtual int writeValue(const QString& name, Float3rdOrderPoly_t v);
+  virtual int writeValue(const QString& name, Float4thOrderPoly_t v);
+  virtual int writeValue(const QString& name, StackFileListInfo v);
 
-    virtual int writeValue(const QString& name, ComparisonInput_t v);
-    virtual int writeValue(const QString& name, ComparisonInputs v);
+  virtual int writeValue(const QString& name, ComparisonInput_t v);
+  virtual int writeValue(const QString& name, ComparisonInputs v);
 
-    virtual int writeValue(const QString& name, QVector<AxisAngleInput_t> v);
+  virtual int writeValue(const QString& name, QVector<AxisAngleInput_t> v);
 
-    virtual int writeArraySelections(const QString& name, QSet<QString> v);
+  virtual int writeArraySelections(const QString& name, QSet<QString> v);
 
-    virtual int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy);
+  virtual int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy);
 
-    virtual int writeValue(const QString& name, AxisAngleInput_t v);
+  virtual int writeValue(const QString& name, AxisAngleInput_t v);
 
-    virtual int writeValue(const QString& name, const DataArrayPath& path);
+  virtual int writeValue(const QString& name, const DataArrayPath& path);
 
-    virtual int writeValue(const QString& name, const QVector<DataArrayPath>& path);
+  virtual int writeValue(const QString& name, const QVector<DataArrayPath>& path);
 
-    virtual int writeValue(const QString& name, const DynamicTableData& v);
+  virtual int writeValue(const QString& name, const DynamicTableData& v);
 
-    virtual int writeValue(const QString& name, const QPair<double, double>& v);
+  virtual int writeValue(const QString& name, const QPair<double, double>& v);
 
-  protected:
-    AbstractFilterParametersWriter();
+protected:
+  AbstractFilterParametersWriter();
 
-    virtual int writeValue(const QString& name, AxisAngleInput_t v, int vectorPos);
+  virtual int writeValue(const QString& name, AxisAngleInput_t v, int vectorPos);
 
-  public:
-    AbstractFilterParametersWriter(const AbstractFilterParametersWriter&) = delete; // Copy Constructor Not Implemented
-    AbstractFilterParametersWriter(AbstractFilterParametersWriter&&) = delete;      // Move Constructor Not Implemented
-    AbstractFilterParametersWriter& operator=(const AbstractFilterParametersWriter&) = delete; // Copy Assignment Not Implemented
-    AbstractFilterParametersWriter& operator=(AbstractFilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
+public:
+  AbstractFilterParametersWriter(const AbstractFilterParametersWriter&) = delete;            // Copy Constructor Not Implemented
+  AbstractFilterParametersWriter(AbstractFilterParametersWriter&&) = delete;                 // Move Constructor Not Implemented
+  AbstractFilterParametersWriter& operator=(const AbstractFilterParametersWriter&) = delete; // Copy Assignment Not Implemented
+  AbstractFilterParametersWriter& operator=(AbstractFilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 31fcb7344c..01aa8d4426 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -100,7 +100,7 @@ void AttributeMatrixCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void AttributeMatrixCreationFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DataArrayPath dap = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
old mode 100755
new mode 100644
index 9b657bd5c0..3f6c762fce
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -58,10 +58,8 @@ class AbstractFilter;
  * AttributeMatrixCreationFilterParameter::RequirementType req;
  * SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::CreatedArray, GenericExample, req);
  */
-#define SIMPL_NEW_AM_CREATION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (AttributeMatrixCreationFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_AM_CREATION_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AttributeMatrixCreationFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The AttributeMatrixCreationFilterParameter class is used by filters to instantiate an AttributeMatrixCreationWidget.  By instantiating an instance of
@@ -69,143 +67,142 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParameter
 {
-  public:
-    using Self = AttributeMatrixCreationFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
-     */
-    static QString ClassName();
-
-    // Typedefs for this class's callback functions
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-    };
-
-    /**
-     * @brief New This function instantiates an instance of the AttributeMatrixCreationFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_AM_CREATION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
-
-    ~AttributeMatrixCreationFilterParameter() override;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const AttributeMatrixCreationFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    AttributeMatrixCreationFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const AttributeMatrixCreationFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    AttributeMatrixCreationFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief AttributeMatrixCreationFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    AttributeMatrixCreationFilterParameter();
-
-  public:
-    AttributeMatrixCreationFilterParameter(const AttributeMatrixCreationFilterParameter&) = delete; // Copy Constructor Not Implemented
-    AttributeMatrixCreationFilterParameter(AttributeMatrixCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    AttributeMatrixCreationFilterParameter& operator=(const AttributeMatrixCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
-    AttributeMatrixCreationFilterParameter& operator=(AttributeMatrixCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    AttributeMatrixCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
-    AttributeMatrixCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = AttributeMatrixCreationFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AttributeMatrixCreationFilterParameter
+   */
+  static QString ClassName();
+
+  // Typedefs for this class's callback functions
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+  };
+
+  /**
+   * @brief New This function instantiates an instance of the AttributeMatrixCreationFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_AM_CREATION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+
+  ~AttributeMatrixCreationFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param DefaultGeometryTypes Default geometry types required for Data Container selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const AttributeMatrixCreationFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  AttributeMatrixCreationFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const AttributeMatrixCreationFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  AttributeMatrixCreationFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief AttributeMatrixCreationFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  AttributeMatrixCreationFilterParameter();
+
+public:
+  AttributeMatrixCreationFilterParameter(const AttributeMatrixCreationFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  AttributeMatrixCreationFilterParameter(AttributeMatrixCreationFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  AttributeMatrixCreationFilterParameter& operator=(const AttributeMatrixCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
+  AttributeMatrixCreationFilterParameter& operator=(AttributeMatrixCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  AttributeMatrixCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+  AttributeMatrixCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index b7d239cd1d..c6f31cf9a6 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AttributeMatrixSelectionFilterParameter.h"
 
@@ -155,7 +155,7 @@ void AttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void AttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DataArrayPath dap = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
old mode 100755
new mode 100644
index ded6fb323d..4be5ad363e
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,10 +57,8 @@
  * AttributeMatrixSelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", AttributeMatrixPath, FilterParameter::Parameter, GenericExample, req);
  */
-#define SIMPL_NEW_AM_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (AttributeMatrixSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_AM_SELECTION_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AttributeMatrixSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The AttributeMatrixSelectionFilterParameter class is used by filters to instantiate an AttributeMatrixSelectionWidget.  By instantiating an instance of
@@ -68,180 +66,178 @@
  */
 class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = AttributeMatrixSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-    };
-
-    /**
-     * @brief New This function instantiates an instance of the AttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_AM_SELECTION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
-
-    ~AttributeMatrixSelectionFilterParameter() override;
-
-    /**
-     * @brief CreateRequirement
-     * @param attributeMatrixType
-     * @return
-     */
-    static RequirementType CreateRequirement(AttributeMatrix::Category attributeMatrixObjectType);
-
-    /**
-     * @brief CreateRequirement
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @brief Returns the RequirementType for the filter parameter
-    * @return
-    */
-    RequirementType getRequirements();
-
-    /**
-    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-    * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const AttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    AttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const AttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    AttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief AttributeMatrixSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    AttributeMatrixSelectionFilterParameter();
-
-  public:
-    AttributeMatrixSelectionFilterParameter(const AttributeMatrixSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    AttributeMatrixSelectionFilterParameter(AttributeMatrixSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    AttributeMatrixSelectionFilterParameter& operator=(const AttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    AttributeMatrixSelectionFilterParameter& operator=(AttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-    AttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    AttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = AttributeMatrixSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AttributeMatrixSelectionFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+  };
+
+  /**
+   * @brief New This function instantiates an instance of the AttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_AM_SELECTION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+
+  ~AttributeMatrixSelectionFilterParameter() override;
+
+  /**
+   * @brief CreateRequirement
+   * @param attributeMatrixType
+   * @return
+   */
+  static RequirementType CreateRequirement(AttributeMatrix::Category attributeMatrixObjectType);
+
+  /**
+   * @brief CreateRequirement
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Returns the RequirementType for the filter parameter
+   * @return
+   */
+  RequirementType getRequirements();
+
+  /**
+   * @param DefaultGeometryTypes Default geometry types required for Data Container selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const AttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  AttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const AttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  AttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief AttributeMatrixSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  AttributeMatrixSelectionFilterParameter();
+
+public:
+  AttributeMatrixSelectionFilterParameter(const AttributeMatrixSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  AttributeMatrixSelectionFilterParameter(AttributeMatrixSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  AttributeMatrixSelectionFilterParameter& operator=(const AttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  AttributeMatrixSelectionFilterParameter& operator=(AttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  AttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  AttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 42b246acc6..044bacea8a 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AxisAngleFilterParameter.h"
 
@@ -97,7 +97,7 @@ void AxisAngleFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void AxisAngleFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     QJsonObject axisObj;
     AxisAngleInput_t axisAngle = m_GetterCallback();
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
old mode 100755
new mode 100644
index b589bc739d..c0f3602165
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -54,10 +54,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_AXISANGLE_FP("Crystal Rotations", CrystalSymmetryRotations, FilterParameter::Parameter, GenericExample, 2);
  */
-#define SIMPL_NEW_AXISANGLE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (AxisAngleFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_AXISANGLE_FP(...)                                                                                                                                                                    \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AxisAngleFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The AxisAngleFilterParameter class is used by filters to instantiate an AxisAngleWidget.  By instantiating an instance of
@@ -65,115 +63,112 @@
  */
 class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
 {
-  public:
-    using Self = AxisAngleFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for AxisAngleFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for AxisAngleFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(AxisAngleInput_t)>;
-    using GetterCallbackType = std::function<AxisAngleInput_t(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the AxisAngleFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_AXISANGLE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const AxisAngleInput_t& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-
-    ~AxisAngleFilterParameter() override;
-
-    /**
+public:
+  using Self = AxisAngleFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for AxisAngleFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for AxisAngleFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(AxisAngleInput_t)>;
+  using GetterCallbackType = std::function<AxisAngleInput_t(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the AxisAngleFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_AXISANGLE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const AxisAngleInput_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~AxisAngleFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const AxisAngleFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    AxisAngleFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const AxisAngleFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    AxisAngleFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-      /**
-       * @brief AxisAngleFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    AxisAngleFilterParameter();
-
-  public:
-    AxisAngleFilterParameter(const AxisAngleFilterParameter&) = delete; // Copy Constructor Not Implemented
-    AxisAngleFilterParameter(AxisAngleFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    AxisAngleFilterParameter& operator=(const AxisAngleFilterParameter&) = delete; // Copy Assignment Not Implemented
-    AxisAngleFilterParameter& operator=(AxisAngleFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    AxisAngleFilterParameter::SetterCallbackType m_SetterCallback = {};
-    AxisAngleFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const AxisAngleFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  AxisAngleFilterParameter::SetterCallbackType getSetterCallback() const;
 
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const AxisAngleFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  AxisAngleFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief AxisAngleFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  AxisAngleFilterParameter();
+
+public:
+  AxisAngleFilterParameter(const AxisAngleFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  AxisAngleFilterParameter(AxisAngleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  AxisAngleFilterParameter& operator=(const AxisAngleFilterParameter&) = delete; // Copy Assignment Not Implemented
+  AxisAngleFilterParameter& operator=(AxisAngleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  AxisAngleFilterParameter::SetterCallbackType m_SetterCallback = {};
+  AxisAngleFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index 33ab34de29..8929b22bf0 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BooleanFilterParameter.h"
 
@@ -93,7 +93,7 @@ void BooleanFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void BooleanFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
old mode 100755
new mode 100644
index 8d50ada61a..7e110b7006
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_BOOL_FP("Write Alignment Shift File", WriteAlignmentShifts, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_BOOL_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (BooleanFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_BOOL_FP(...)                                                                                                                                                                         \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(BooleanFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The BooleanFilterParameter class is used by filters to instantiate an BooleanWidget.  By instantiating an instance of
@@ -157,15 +155,15 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
   BooleanFilterParameter::GetterCallbackType getGetterCallback() const;
 
 protected:
-      /**
-       * @brief BooleanFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
+  /**
+   * @brief BooleanFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   BooleanFilterParameter();
 
 public:
-  BooleanFilterParameter(const BooleanFilterParameter&) = delete; // Copy Constructor Not Implemented
-  BooleanFilterParameter(BooleanFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  BooleanFilterParameter(const BooleanFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  BooleanFilterParameter(BooleanFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   BooleanFilterParameter& operator=(const BooleanFilterParameter&) = delete; // Copy Assignment Not Implemented
   BooleanFilterParameter& operator=(BooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -173,4 +171,3 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
   BooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
   BooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index 51873f7e2c..a220c05454 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CalculatorFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 03ee63ddf8..432af5bdf4 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_CALC_FP("Calculator Expression", CalcExpression, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_CALC_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (CalculatorFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_CALC_FP(...)                                                                                                                                                                         \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(CalculatorFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The CalculatorFilterParameter class is used by filters to instantiate an CalculatorWidget.  By instantiating an instance of
@@ -112,67 +110,67 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const CalculatorFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    CalculatorFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const CalculatorFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    CalculatorFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handles DataArrayPath changes wwith the assumption that the DataContainer and AttributeMatrix both match the input
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-    /**
-     * @brief CalculatorFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const CalculatorFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  CalculatorFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const CalculatorFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  CalculatorFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handles DataArrayPath changes wwith the assumption that the DataContainer and AttributeMatrix both match the input
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief CalculatorFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   CalculatorFilterParameter();
 
 public:
-  CalculatorFilterParameter(const CalculatorFilterParameter&) = delete; // Copy Constructor Not Implemented
-  CalculatorFilterParameter(CalculatorFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  CalculatorFilterParameter(const CalculatorFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  CalculatorFilterParameter(CalculatorFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   CalculatorFilterParameter& operator=(const CalculatorFilterParameter&) = delete; // Copy Assignment Not Implemented
   CalculatorFilterParameter& operator=(CalculatorFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -180,4 +178,3 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
   CalculatorFilterParameter::SetterCallbackType m_SetterCallback = {};
   CalculatorFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index abf9d1501d..9f1280c97e 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ChoiceFilterParameter.h"
 
@@ -51,7 +51,8 @@ ChoiceFilterParameter::~ChoiceFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                          const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
 
 {
   ChoiceFilterParameter::Pointer ptr = ChoiceFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
old mode 100755
new mode 100644
index bc80a597bd..4270722fa9
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_CHOICE_FP("Size Distribution Fit Type", SizeDistributionFitType, FilterParameter::Parameter, GenericExample, choices, false);
  */
-#define SIMPL_NEW_CHOICE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ChoiceFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_CHOICE_FP(...)                                                                                                                                                                       \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ChoiceFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ChoiceFilterParameter class is used by filters to instantiate an ChoiceWidget.  By instantiating an instance of
@@ -64,140 +62,136 @@
  */
 class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ChoiceFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for ChoiceFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ChoiceFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(int)>;
-    using GetterCallbackType = std::function<int(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the ChoiceFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_CHOICE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param choices The selections to choose from in the ChoiceWidget.
-    * @param editable Boolean that determines whether the choices are editable or not.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       int defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       QVector<QString> choices, bool editable,
-                       int groupIndex = -1);
-
-    ~ChoiceFilterParameter() override;
-
-    /**
-     * @brief Setter property for Choices
-     */
-    void setChoices(const QVector<QString>& value);
-    /**
-     * @brief Getter property for Choices
-     * @return Value of Choices
-     */
-    QVector<QString> getChoices() const;
-
-    /**
-     * @brief Setter property for Editable
-     */
-    void setEditable(bool value);
-    /**
-     * @brief Getter property for Editable
-     * @return Value of Editable
-     */
-    bool getEditable() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ChoiceFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ChoiceFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-      /**
-       * @brief ChoiceFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    ChoiceFilterParameter();
-
-  public:
-    ChoiceFilterParameter(const ChoiceFilterParameter&) = delete; // Copy Constructor Not Implemented
-    ChoiceFilterParameter(ChoiceFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    ChoiceFilterParameter& operator=(const ChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ChoiceFilterParameter& operator=(ChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QVector<QString> m_Choices = {};
-    bool m_Editable = {};
-    ChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
-    ChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = ChoiceFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ChoiceFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ChoiceFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(int)>;
+  using GetterCallbackType = std::function<int(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the ChoiceFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_CHOICE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param choices The selections to choose from in the ChoiceWidget.
+  * @param editable Boolean that determines whether the choices are editable or not.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     QVector<QString> choices, bool editable, int groupIndex = -1);
+
+  ~ChoiceFilterParameter() override;
+
+  /**
+   * @brief Setter property for Choices
+   */
+  void setChoices(const QVector<QString>& value);
+  /**
+   * @brief Getter property for Choices
+   * @return Value of Choices
+   */
+  QVector<QString> getChoices() const;
+
+  /**
+   * @brief Setter property for Editable
+   */
+  void setEditable(bool value);
+  /**
+   * @brief Getter property for Editable
+   * @return Value of Editable
+   */
+  bool getEditable() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ChoiceFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ChoiceFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief ChoiceFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  ChoiceFilterParameter();
+
+public:
+  ChoiceFilterParameter(const ChoiceFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ChoiceFilterParameter(ChoiceFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ChoiceFilterParameter& operator=(const ChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ChoiceFilterParameter& operator=(ChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QVector<QString> m_Choices = {};
+  bool m_Editable = {};
+  ChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 3b612db77b..df9424aed2 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionAdvancedFilterParameter.h"
 
-
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
 
@@ -55,9 +54,10 @@ ComparisonSelectionAdvancedFilterParameter::~ComparisonSelectionAdvancedFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category,
-                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
-                                                                                    int groupIndex)
+ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue,
+                                                                                                    Category category, const SetterCallbackType& setterCallback,
+                                                                                                    const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
+                                                                                                    int groupIndex)
 {
   ComparisonSelectionAdvancedFilterParameter::Pointer ptr = ComparisonSelectionAdvancedFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -109,7 +109,7 @@ void ComparisonSelectionAdvancedFilterParameter::readJson(const QJsonObject& jso
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     ComparisonInputsAdvanced inputs = m_GetterCallback();
 
@@ -156,7 +156,7 @@ void ComparisonSelectionAdvancedFilterParameter::dataArrayPathRenamed(AbstractFi
   {
     hasChanges |= comparison->renameDataArrayPath(renamePath);
   }
-  
+
   if(hasChanges)
   {
     m_SetterCallback(inputs);
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index e9c1016e54..3f270ce84f 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,10 +57,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_COMP_SEL_ADV_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Parameter, GenericExample, choices, true);
  */
-#define SIMPL_NEW_COMP_SEL_ADV_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ComparisonSelectionAdvancedFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_COMP_SEL_ADV_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ComparisonSelectionAdvancedFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ComparisonSelectionAdvancedFilterParameter class is used by filters to instantiate an ComparisonSelectionAdvancedWidget.  By instantiating an instance of
@@ -68,167 +66,165 @@
  */
 class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ComparisonSelectionAdvancedFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(ComparisonInputsAdvanced)>;
-    using GetterCallbackType = std::function<ComparisonInputsAdvanced(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the ComparisonSelectionAdvancedFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_COMP_SEL_ADV_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param choices The selections to choose from in the ComparisonSelectionAdvancedWidget.
-    * @param showOperators Boolean that determines whether to display the operators or not.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                       bool showOperators, int groupIndex = -1);
-
-    ~ComparisonSelectionAdvancedFilterParameter() override;
-
-    /**
-     * @brief Setter property for Choices
-     */
-    void setChoices(const QVector<QString>& value);
-    /**
-     * @brief Getter property for Choices
-     * @return Value of Choices
-     */
-    QVector<QString> getChoices() const;
-
-    /**
-     * @brief Setter property for ShowOperators
-     */
-    void setShowOperators(bool value);
-    /**
-     * @brief Getter property for ShowOperators
-     * @return Value of ShowOperators
-     */
-    bool getShowOperators() const;
-
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
-
-    /**
+public:
+  using Self = ComparisonSelectionAdvancedFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ComparisonSelectionAdvancedFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(ComparisonInputsAdvanced)>;
+  using GetterCallbackType = std::function<ComparisonInputsAdvanced(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the ComparisonSelectionAdvancedFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_COMP_SEL_ADV_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param choices The selections to choose from in the ComparisonSelectionAdvancedWidget.
+  * @param showOperators Boolean that determines whether to display the operators or not.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+
+  ~ComparisonSelectionAdvancedFilterParameter() override;
+
+  /**
+   * @brief Setter property for Choices
+   */
+  void setChoices(const QVector<QString>& value);
+  /**
+   * @brief Getter property for Choices
+   * @return Value of Choices
+   */
+  QVector<QString> getChoices() const;
+
+  /**
+   * @brief Setter property for ShowOperators
+   */
+  void setShowOperators(bool value);
+  /**
+   * @brief Getter property for ShowOperators
+   * @return Value of ShowOperators
+   */
+  bool getShowOperators() const;
+
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ComparisonSelectionAdvancedFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ComparisonSelectionAdvancedFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ComparisonSelectionAdvancedFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ComparisonSelectionAdvancedFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-    /**
-     * @brief ComparisonSelectionAdvancedFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    ComparisonSelectionAdvancedFilterParameter();
-
-  public:
-    ComparisonSelectionAdvancedFilterParameter(const ComparisonSelectionAdvancedFilterParameter&) = delete; // Copy Constructor Not Implemented
-    ComparisonSelectionAdvancedFilterParameter(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    ComparisonSelectionAdvancedFilterParameter& operator=(const ComparisonSelectionAdvancedFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ComparisonSelectionAdvancedFilterParameter& operator=(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QVector<QString> m_Choices = {};
-    bool m_ShowOperators = {};
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
-    ComparisonSelectionAdvancedFilterParameter::SetterCallbackType m_SetterCallback = {};
-    ComparisonSelectionAdvancedFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ComparisonSelectionAdvancedFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ComparisonSelectionAdvancedFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ComparisonSelectionAdvancedFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ComparisonSelectionAdvancedFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief ComparisonSelectionAdvancedFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  ComparisonSelectionAdvancedFilterParameter();
+
+public:
+  ComparisonSelectionAdvancedFilterParameter(const ComparisonSelectionAdvancedFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ComparisonSelectionAdvancedFilterParameter(ComparisonSelectionAdvancedFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ComparisonSelectionAdvancedFilterParameter& operator=(const ComparisonSelectionAdvancedFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ComparisonSelectionAdvancedFilterParameter& operator=(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QVector<QString> m_Choices = {};
+  bool m_ShowOperators = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  ComparisonSelectionAdvancedFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ComparisonSelectionAdvancedFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index a04f1d7998..fcde88b379 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionFilterParameter.h"
 
@@ -56,8 +56,8 @@ ComparisonSelectionFilterParameter::~ComparisonSelectionFilterParameter() = defa
 //
 // -----------------------------------------------------------------------------
 ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category,
-                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
-                                                                                    int groupIndex)
+                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
+                                                                                    bool showOperators, int groupIndex)
 {
   ComparisonSelectionFilterParameter::Pointer ptr = ComparisonSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -115,7 +115,7 @@ void ComparisonSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void ComparisonSelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     QJsonArray inputsArray;
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
old mode 100755
new mode 100644
index c6d0ebde75..b317c564d4
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,10 +56,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_COMP_SEL_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Parameter, GenericExample, choices, true);
  */
-#define SIMPL_NEW_COMP_SEL_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ComparisonSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_COMP_SEL_FP(...)                                                                                                                                                                     \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ComparisonSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ComparisonSelectionFilterParameter class is used by filters to instantiate an ComparisonSelectionWidget.  By instantiating an instance of
@@ -67,167 +65,165 @@
  */
 class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ComparisonSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for ComparisonSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ComparisonSelectionFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(ComparisonInputs)>;
-    using GetterCallbackType = std::function<ComparisonInputs(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the ComparisonSelectionFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_COMP_SEL_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param choices The selections to choose from in the ComparisonSelectionWidget.
-    * @param showOperators Boolean that determines whether to display the operators or not.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                       bool showOperators, int groupIndex = -1);
-
-    ~ComparisonSelectionFilterParameter() override;
-
-    /**
-     * @brief Setter property for Choices
-     */
-    void setChoices(const QVector<QString>& value);
-    /**
-     * @brief Getter property for Choices
-     * @return Value of Choices
-     */
-    QVector<QString> getChoices() const;
-
-    /**
-     * @brief Setter property for ShowOperators
-     */
-    void setShowOperators(bool value);
-    /**
-     * @brief Getter property for ShowOperators
-     * @return Value of ShowOperators
-     */
-    bool getShowOperators() const;
-
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
-
-    /**
+public:
+  using Self = ComparisonSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ComparisonSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ComparisonSelectionFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(ComparisonInputs)>;
+  using GetterCallbackType = std::function<ComparisonInputs(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the ComparisonSelectionFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_COMP_SEL_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param choices The selections to choose from in the ComparisonSelectionWidget.
+  * @param showOperators Boolean that determines whether to display the operators or not.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+
+  ~ComparisonSelectionFilterParameter() override;
+
+  /**
+   * @brief Setter property for Choices
+   */
+  void setChoices(const QVector<QString>& value);
+  /**
+   * @brief Getter property for Choices
+   * @return Value of Choices
+   */
+  QVector<QString> getChoices() const;
+
+  /**
+   * @brief Setter property for ShowOperators
+   */
+  void setShowOperators(bool value);
+  /**
+   * @brief Getter property for ShowOperators
+   * @return Value of ShowOperators
+   */
+  bool getShowOperators() const;
+
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ComparisonSelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ComparisonSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ComparisonSelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ComparisonSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief ComparisonSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    ComparisonSelectionFilterParameter();
-
-  public:
-    ComparisonSelectionFilterParameter(const ComparisonSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    ComparisonSelectionFilterParameter(ComparisonSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    ComparisonSelectionFilterParameter& operator=(const ComparisonSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ComparisonSelectionFilterParameter& operator=(ComparisonSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QVector<QString> m_Choices = {};
-    bool m_ShowOperators = {};
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
-    ComparisonSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    ComparisonSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ComparisonSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ComparisonSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ComparisonSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ComparisonSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief ComparisonSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  ComparisonSelectionFilterParameter();
+
+public:
+  ComparisonSelectionFilterParameter(const ComparisonSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ComparisonSelectionFilterParameter(ComparisonSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ComparisonSelectionFilterParameter& operator=(const ComparisonSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ComparisonSelectionFilterParameter& operator=(ComparisonSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QVector<QString> m_Choices = {};
+  bool m_ShowOperators = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  ComparisonSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ComparisonSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index 96072c1be1..53a7070be8 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedDoubleFilterParameter.h"
 
@@ -48,8 +48,8 @@ ConstrainedDoubleFilterParameter::~ConstrainedDoubleFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category,
+                                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ConstrainedDoubleFilterParameter::Pointer ptr = ConstrainedDoubleFilterParameter::New();
@@ -75,7 +75,7 @@ QString ConstrainedDoubleFilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedDoubleFilterParameter::readJson(const QJsonObject &json)
+void ConstrainedDoubleFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
@@ -87,9 +87,9 @@ void ConstrainedDoubleFilterParameter::readJson(const QJsonObject &json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedDoubleFilterParameter::writeJson(QJsonObject &json)
+void ConstrainedDoubleFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     json[getPropertyName()] = m_GetterCallback();
   }
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
old mode 100755
new mode 100644
index c081a9ab4a..45b04c4f08
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,11 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_CONSTRAINED_DOUBLE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ConstrainedDoubleFilterParameter, __VA_ARGS__))
-
+#define SIMPL_NEW_CONSTRAINED_DOUBLE_FP(...)                                                                                                                                                           \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ConstrainedDoubleFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ConstrainedDoubleFilterParameter class is used by filters to instantiate an DoubleWidget.  By instantiating an instance of
@@ -65,113 +62,112 @@
  */
 class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ConstrainedDoubleFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(double)>;
-    using GetterCallbackType = std::function<double(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the ConstrainedDoubleFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~ConstrainedDoubleFilterParameter() override;
-
-    /**
+public:
+  using Self = ConstrainedDoubleFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConstrainedDoubleFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(double)>;
+  using GetterCallbackType = std::function<double(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the ConstrainedDoubleFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  ~ConstrainedDoubleFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ConstrainedDoubleFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ConstrainedDoubleFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ConstrainedDoubleFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ConstrainedDoubleFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief ConstrainedDoubleFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    ConstrainedDoubleFilterParameter();
-
-  public:
-    ConstrainedDoubleFilterParameter(const ConstrainedDoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    ConstrainedDoubleFilterParameter(ConstrainedDoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    ConstrainedDoubleFilterParameter& operator=(const ConstrainedDoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ConstrainedDoubleFilterParameter& operator=(ConstrainedDoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    ConstrainedDoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
-    ConstrainedDoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ConstrainedDoubleFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ConstrainedDoubleFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ConstrainedDoubleFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ConstrainedDoubleFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief ConstrainedDoubleFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  ConstrainedDoubleFilterParameter();
+
+public:
+  ConstrainedDoubleFilterParameter(const ConstrainedDoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ConstrainedDoubleFilterParameter(ConstrainedDoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ConstrainedDoubleFilterParameter& operator=(const ConstrainedDoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ConstrainedDoubleFilterParameter& operator=(ConstrainedDoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  ConstrainedDoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ConstrainedDoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
index a456077ddf..2a212642cd 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
old mode 100755
new mode 100644
index 7e1bd3de67..3e2898672a
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,68 +39,71 @@
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
-template<typename T>
+template <typename T>
 class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ConstrainedFilterParameter<T>;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = ConstrainedFilterParameter<T>;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for ConstrainedFilterParameter<T>
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ConstrainedFilterParameter<T>
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for ConstrainedFilterParameter<T>
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConstrainedFilterParameter<T>
+   */
+  static QString ClassName();
 
-    virtual ~ConstrainedFilterParameter() {}
+  virtual ~ConstrainedFilterParameter()
+  {
+  }
 
-    /**
-     * @brief Setter property for Minimum
-     */
-    void setMinimum(const T& value);
-    /**
-     * @brief Getter property for Minimum
-     * @return Value of Minimum
-     */
-    T getMinimum() const;
+  /**
+   * @brief Setter property for Minimum
+   */
+  void setMinimum(const T& value);
+  /**
+   * @brief Getter property for Minimum
+   * @return Value of Minimum
+   */
+  T getMinimum() const;
 
-    /**
-     * @brief Setter property for Maximum
-     */
-    void setMaximum(const T& value);
-    /**
-     * @brief Getter property for Maximum
-     * @return Value of Maximum
-     */
-    T getMaximum() const;
+  /**
+   * @brief Setter property for Maximum
+   */
+  void setMaximum(const T& value);
+  /**
+   * @brief Getter property for Maximum
+   * @return Value of Maximum
+   */
+  T getMaximum() const;
 
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
 
-  protected:
-    ConstrainedFilterParameter() {}
+protected:
+  ConstrainedFilterParameter()
+  {
+  }
 
-  public:
-    ConstrainedFilterParameter(const ConstrainedFilterParameter&) = delete; // Copy Constructor Not Implemented
-    ConstrainedFilterParameter(ConstrainedFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    ConstrainedFilterParameter& operator=(const ConstrainedFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ConstrainedFilterParameter& operator=(ConstrainedFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  ConstrainedFilterParameter(const ConstrainedFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ConstrainedFilterParameter(ConstrainedFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ConstrainedFilterParameter& operator=(const ConstrainedFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ConstrainedFilterParameter& operator=(ConstrainedFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    T m_Minimum = {};
-    T m_Maximum = {};
+private:
+  T m_Minimum = {};
+  T m_Maximum = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index 2aec88fb96..6e79c30e50 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedIntFilterParameter.h"
 
@@ -48,9 +48,8 @@ ConstrainedIntFilterParameter::~ConstrainedIntFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-  int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-  int groupIndex)
+ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
+                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ConstrainedIntFilterParameter::Pointer ptr = ConstrainedIntFilterParameter::New();
@@ -76,7 +75,7 @@ QString ConstrainedIntFilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedIntFilterParameter::readJson(const QJsonObject &json)
+void ConstrainedIntFilterParameter::readJson(const QJsonObject& json)
 {
   QJsonValue jsonValue = json[getPropertyName()];
   if(!jsonValue.isUndefined() && m_SetterCallback)
@@ -88,9 +87,9 @@ void ConstrainedIntFilterParameter::readJson(const QJsonObject &json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedIntFilterParameter::writeJson(QJsonObject &json)
+void ConstrainedIntFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     json[getPropertyName()] = m_GetterCallback();
   }
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
old mode 100755
new mode 100644
index a48b609b0d..db7ba8dbec
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
  */
-#define SIMPL_NEW_CONSTRAINED_INT_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ConstrainedIntFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_CONSTRAINED_INT_FP(...)                                                                                                                                                              \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ConstrainedIntFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ConstrainedIntFilterParameter class is used by filters to instantiate an IntWidget.  By instantiating an instance of
@@ -64,113 +62,112 @@
  */
 class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
 {
-  public:
-    using Self = ConstrainedIntFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for ConstrainedIntFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for ConstrainedIntFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(int)>;
-    using GetterCallbackType = std::function<int(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the ConstrainedIntFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~ConstrainedIntFilterParameter() override;
-
-    /**
+public:
+  using Self = ConstrainedIntFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for ConstrainedIntFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for ConstrainedIntFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(int)>;
+  using GetterCallbackType = std::function<int(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the ConstrainedIntFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  ~ConstrainedIntFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ConstrainedIntFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ConstrainedIntFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ConstrainedIntFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ConstrainedIntFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief ConstrainedIntFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    ConstrainedIntFilterParameter();
-
-  public:
-    ConstrainedIntFilterParameter(const ConstrainedIntFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    ConstrainedIntFilterParameter(ConstrainedIntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    ConstrainedIntFilterParameter& operator=(const ConstrainedIntFilterParameter&) = delete; // Copy Assignment Not Implemented
-    ConstrainedIntFilterParameter& operator=(ConstrainedIntFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    ConstrainedIntFilterParameter::SetterCallbackType m_SetterCallback = {};
-    ConstrainedIntFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ConstrainedIntFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ConstrainedIntFilterParameter::SetterCallbackType getSetterCallback() const;
 
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ConstrainedIntFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ConstrainedIntFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief ConstrainedIntFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  ConstrainedIntFilterParameter();
+
+public:
+  ConstrainedIntFilterParameter(const ConstrainedIntFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ConstrainedIntFilterParameter(ConstrainedIntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  ConstrainedIntFilterParameter& operator=(const ConstrainedIntFilterParameter&) = delete; // Copy Assignment Not Implemented
+  ConstrainedIntFilterParameter& operator=(ConstrainedIntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  ConstrainedIntFilterParameter::SetterCallbackType m_SetterCallback = {};
+  ConstrainedIntFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 94272f1f1e..a8bb5e1352 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArrayCreationFilterParameter.h"
 #include "SIMPLib/Common/Constants.h"
@@ -153,7 +153,7 @@ void DataArrayCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void DataArrayCreationFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DataArrayPath dap = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
old mode 100755
new mode 100644
index ae92b05bba..fd20eaab4f
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -59,10 +59,8 @@ class AbstractFilter;
  * DataArrayCreationFilterParameter::RequirementType req;
  * SIMPL_NEW_DA_CREATION_FP("Created Data Array", CreatedDataArray, FilterParameter::Parameter, GenericExample, req, 0);
  */
-#define SIMPL_NEW_DA_CREATION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DataArrayCreationFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DA_CREATION_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataArrayCreationFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DataArrayCreationFilterParameter class is used by filters to instantiate an DataArrayCreationWidget.  By instantiating an instance of
@@ -70,178 +68,172 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DataArrayCreationFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DataArrayCreationFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataArrayCreationFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    typedef struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-    } RequirementType;
-
-    /**
-     * @brief New This function instantiates an instance of the DataArrayCreationFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_DA_CREATION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const DataArrayPath& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       RequirementType req, int groupIndex = -1);
-
-    ~DataArrayCreationFilterParameter() override;
-
-    /**
-     * @brief CreateRequirement
-     * @param attributeMatrixType
-     * @return
-     */
-    static RequirementType CreateRequirement(AttributeMatrix::Category attributeMatrixObjectType);
-
-    /**
-     * @brief CreateRequirement
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
-
-    /**
-    * @brief getWidgetType Returns the type of widget that displays and controls
-    * this FilterParameter subclass
-    * @return
-    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-    * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DataArrayCreationFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DataArrayCreationFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DataArrayCreationFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DataArrayCreationFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief DataArrayCreationFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DataArrayCreationFilterParameter();
-
-  public:
-    DataArrayCreationFilterParameter(const DataArrayCreationFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DataArrayCreationFilterParameter(DataArrayCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DataArrayCreationFilterParameter& operator=(const DataArrayCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DataArrayCreationFilterParameter& operator=(DataArrayCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-    DataArrayCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DataArrayCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DataArrayCreationFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataArrayCreationFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataArrayCreationFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  typedef struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+  } RequirementType;
+
+  /**
+   * @brief New This function instantiates an instance of the DataArrayCreationFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_DA_CREATION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+
+  ~DataArrayCreationFilterParameter() override;
+
+  /**
+   * @brief CreateRequirement
+   * @param attributeMatrixType
+   * @return
+   */
+  static RequirementType CreateRequirement(AttributeMatrix::Category attributeMatrixObjectType);
+
+  /**
+   * @brief CreateRequirement
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param DefaultGeometryTypes Default geometry types required for Data Container selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DataArrayCreationFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DataArrayCreationFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DataArrayCreationFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DataArrayCreationFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataArrayCreationFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataArrayCreationFilterParameter();
+
+public:
+  DataArrayCreationFilterParameter(const DataArrayCreationFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataArrayCreationFilterParameter(DataArrayCreationFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataArrayCreationFilterParameter& operator=(const DataArrayCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataArrayCreationFilterParameter& operator=(DataArrayCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  DataArrayCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DataArrayCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
-
-
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 86d077da74..c3f3053b86 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArraySelectionFilterParameter.h"
 #include "SIMPLib/Common/Constants.h"
@@ -84,8 +84,7 @@ QString DataArraySelectionFilterParameter::getWidgetType() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType,
-                                                                                                                size_t allowedCompDim,
+DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
                                                                                                                 AttributeMatrix::Category attributeMatrixCategory)
 {
   using SizeTVectorType = std::vector<size_t>;
@@ -131,9 +130,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParameter::CreateRequirement(const QString& primitiveType,
-                                                                                                        size_t allowedCompDim,
-                                                                                                        AttributeMatrix::Type attributeMatrixType,
+DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
                                                                                                         IGeometry::Type geometryType)
 {
   using SizeTVectorType = std::vector<size_t>;
@@ -215,7 +212,7 @@ void DataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void DataArraySelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DataArrayPath dap = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
old mode 100755
new mode 100644
index 3fd891d43a..7d5839731e
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -59,10 +59,8 @@ class AbstractFilter;
  * DataArraySelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Parameter, GenericExample, req);
  */
-#define SIMPL_NEW_DA_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DataArraySelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DA_SELECTION_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataArraySelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DataArraySelectionFilterParameter class is used by filters to instantiate an DataArraySelectionWidget.  By instantiating an instance of
@@ -70,233 +68,224 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DataArraySelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DataArraySelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataArraySelectionFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-      QVector<QString> daTypes;
-      std::vector<std::vector<size_t>> componentDimensions;
-    };
-
-    /**
-     * @brief New This function instantiates an instance of the DataArraySelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_DA_SELECTION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const DataArrayPath& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       RequirementType req, int groupIndex = -1);
-
-    ~DataArraySelectionFilterParameter() override;
-
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixCategory
-     * @return
-     */
-    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
-                                                     size_t allowedCompDim,
-                                                     AttributeMatrix::Category attributeMatrixCategory);
-
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(const QString& primitiveType,
-                                             size_t allowedCompDim,
-                                             AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
-
-    /**
-     * @brief CreateRequirement
-     * @param primitiveTypes
-     * @param allowedCompDim
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(const QVector<QString>& primitiveTypes, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
-
-    /**
-    * @brief getWidgetType Returns the type of widget that displays and controls
-    * this FilterParameter subclass
-    * @return
-    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @brief Returns the RequirementType for the filter parameter
-    * @return
-    */
-    RequirementType getRequirements();
-
-    /**
-    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-    * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
-
-    /**
-    * @param DefaultAttributeArrayTypes Default attribute array types required for Attribute Array selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultAttributeArrayTypes
-     */
-    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
-    /**
-     * @brief Getter property for DefaultAttributeArrayTypes
-     * @return Value of DefaultAttributeArrayTypes
-     */
-    QVector<QString> getDefaultAttributeArrayTypes() const;
-
-    /**
-    * @param DefaultComponentDimensions Default component dimensions required for Attribute Array selections
-    * @return
-    */
-    /**
-     * @brief Setter property for DefaultComponentDimensions
-     */
-    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
-    /**
-     * @brief Getter property for DefaultComponentDimensions
-     * @return Value of DefaultComponentDimensions
-     */
-    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DataArraySelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DataArraySelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief DataArraySelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DataArraySelectionFilterParameter();
-
-  public:
-    DataArraySelectionFilterParameter(const DataArraySelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DataArraySelectionFilterParameter(DataArraySelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DataArraySelectionFilterParameter& operator=(const DataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DataArraySelectionFilterParameter& operator=(DataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
-    QVector<QString> m_DefaultAttributeArrayTypes = {};
-    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
-    DataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DataArraySelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataArraySelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataArraySelectionFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+    QVector<QString> daTypes;
+    std::vector<std::vector<size_t>> componentDimensions;
+  };
+
+  /**
+   * @brief New This function instantiates an instance of the DataArraySelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_DA_SELECTION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+
+  ~DataArraySelectionFilterParameter() override;
+
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixCategory
+   * @return
+   */
+  static RequirementType CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Category attributeMatrixCategory);
+
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
+
+  /**
+   * @brief CreateRequirement
+   * @param primitiveTypes
+   * @param allowedCompDim
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(const QVector<QString>& primitiveTypes, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Returns the RequirementType for the filter parameter
+   * @return
+   */
+  RequirementType getRequirements();
+
+  /**
+   * @param DefaultGeometryTypes Default geometry types required for Data Container selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @param DefaultAttributeMatrixTypes Default attribute matrix types required for Attribute Matrix selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
+
+  /**
+   * @param DefaultAttributeArrayTypes Default attribute array types required for Attribute Array selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultAttributeArrayTypes
+   */
+  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  /**
+   * @brief Getter property for DefaultAttributeArrayTypes
+   * @return Value of DefaultAttributeArrayTypes
+   */
+  QVector<QString> getDefaultAttributeArrayTypes() const;
+
+  /**
+   * @param DefaultComponentDimensions Default component dimensions required for Attribute Array selections
+   * @return
+   */
+  /**
+   * @brief Setter property for DefaultComponentDimensions
+   */
+  void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+  /**
+   * @brief Getter property for DefaultComponentDimensions
+   * @return Value of DefaultComponentDimensions
+   */
+  std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DataArraySelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DataArraySelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataArraySelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataArraySelectionFilterParameter();
+
+public:
+  DataArraySelectionFilterParameter(const DataArraySelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataArraySelectionFilterParameter(DataArraySelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataArraySelectionFilterParameter& operator=(const DataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataArraySelectionFilterParameter& operator=(DataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+  DataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 77667f285d..b8eef22841 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerArrayProxyFilterParameter.h"
 
@@ -105,7 +105,7 @@ void DataContainerArrayProxyFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void DataContainerArrayProxyFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DataContainerArrayProxy proxy = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
old mode 100755
new mode 100644
index 0206e79a40..0062c92a8f
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -55,10 +55,8 @@
  * DataContainerArrayProxy proxy;
  * SIMPL_NEW_DCA_PROXY_FP("Array to Select", DcaProxy, FilterParameter::Parameter, GenericExample, proxy, Qt::Checked);
  */
-#define SIMPL_NEW_DCA_PROXY_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DataContainerArrayProxyFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DCA_PROXY_FP(...)                                                                                                                                                                    \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerArrayProxyFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DataContainerArrayProxyFilterParameter class is used by filters to instantiate an DataContainerArrayProxyWidget.  By instantiating an instance of
@@ -66,143 +64,141 @@
  */
 class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DataContainerArrayProxyFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataContainerArrayProxy)>;
-    using GetterCallbackType = std::function<DataContainerArrayProxy(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the DataContainerArrayProxyFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DCA_PROXY_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param proxy
-    * @param defState Default check-state of the items in the DataContainerArrayProxyWidget.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       DataContainerArrayProxy defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, DataContainerArrayProxy proxy,
-                       Qt::CheckState defState, int groupIndex = -1);
-
-    ~DataContainerArrayProxyFilterParameter() override;
-
-    /**
-     * @brief Setter property for DataContainerArrayProxy
-     */
-    void setDataContainerArrayProxy(const DataContainerArrayProxy& value);
-    /**
-     * @brief Getter property for DataContainerArrayProxy
-     * @return Value of DataContainerArrayProxy
-     */
-    DataContainerArrayProxy getDataContainerArrayProxy() const;
-
-    /**
-     * @brief Setter property for DefaultFlagValue
-     */
-    void setDefaultFlagValue(const Qt::CheckState& value);
-    /**
-     * @brief Getter property for DefaultFlagValue
-     * @return Value of DefaultFlagValue
-     */
-    Qt::CheckState getDefaultFlagValue() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DataContainerArrayProxyFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DataContainerArrayProxyFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DataContainerArrayProxyFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DataContainerArrayProxyFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief DataContainerArrayProxyFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DataContainerArrayProxyFilterParameter();
-
-  public:
-    DataContainerArrayProxyFilterParameter(const DataContainerArrayProxyFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DataContainerArrayProxyFilterParameter(DataContainerArrayProxyFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DataContainerArrayProxyFilterParameter& operator=(const DataContainerArrayProxyFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DataContainerArrayProxyFilterParameter& operator=(DataContainerArrayProxyFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataContainerArrayProxy m_DataContainerArrayProxy = {};
-    Qt::CheckState m_DefaultFlagValue = {};
-    DataContainerArrayProxyFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DataContainerArrayProxyFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DataContainerArrayProxyFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerArrayProxyFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataContainerArrayProxy)>;
+  using GetterCallbackType = std::function<DataContainerArrayProxy(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the DataContainerArrayProxyFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DCA_PROXY_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param proxy
+  * @param defState Default check-state of the items in the DataContainerArrayProxyWidget.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, DataContainerArrayProxy proxy, Qt::CheckState defState, int groupIndex = -1);
+
+  ~DataContainerArrayProxyFilterParameter() override;
+
+  /**
+   * @brief Setter property for DataContainerArrayProxy
+   */
+  void setDataContainerArrayProxy(const DataContainerArrayProxy& value);
+  /**
+   * @brief Getter property for DataContainerArrayProxy
+   * @return Value of DataContainerArrayProxy
+   */
+  DataContainerArrayProxy getDataContainerArrayProxy() const;
+
+  /**
+   * @brief Setter property for DefaultFlagValue
+   */
+  void setDefaultFlagValue(const Qt::CheckState& value);
+  /**
+   * @brief Getter property for DefaultFlagValue
+   * @return Value of DefaultFlagValue
+   */
+  Qt::CheckState getDefaultFlagValue() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DataContainerArrayProxyFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DataContainerArrayProxyFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DataContainerArrayProxyFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DataContainerArrayProxyFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataContainerArrayProxyFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataContainerArrayProxyFilterParameter();
+
+public:
+  DataContainerArrayProxyFilterParameter(const DataContainerArrayProxyFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerArrayProxyFilterParameter(DataContainerArrayProxyFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerArrayProxyFilterParameter& operator=(const DataContainerArrayProxyFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataContainerArrayProxyFilterParameter& operator=(DataContainerArrayProxyFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataContainerArrayProxy m_DataContainerArrayProxy = {};
+  Qt::CheckState m_DefaultFlagValue = {};
+  DataContainerArrayProxyFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DataContainerArrayProxyFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 44a8126f72..1fc89c5b16 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerCreationFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
old mode 100755
new mode 100644
index 789d0ad7d5..ca7efa3551
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -54,10 +54,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::CreatedArray, GenericExample);
  */
-#define SIMPL_NEW_DC_CREATION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DataContainerCreationFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DC_CREATION_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerCreationFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DataContainerCreationFilterParameter class is used by filters to instantiate an DataContainerCreationWidget.  By instantiating an instance of
@@ -103,8 +101,8 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~DataContainerCreationFilterParameter() override;
 
@@ -113,67 +111,67 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DataContainerCreationFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DataContainerCreationFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DataContainerCreationFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DataContainerCreationFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handles changes to the DataArrayPath
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-    /**
-     * @brief DataContainerCreationFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DataContainerCreationFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DataContainerCreationFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DataContainerCreationFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DataContainerCreationFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handles changes to the DataArrayPath
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataContainerCreationFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   DataContainerCreationFilterParameter();
 
 public:
-  DataContainerCreationFilterParameter(const DataContainerCreationFilterParameter&) = delete; // Copy Constructor Not Implemented
-  DataContainerCreationFilterParameter(DataContainerCreationFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  DataContainerCreationFilterParameter(const DataContainerCreationFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerCreationFilterParameter(DataContainerCreationFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   DataContainerCreationFilterParameter& operator=(const DataContainerCreationFilterParameter&) = delete; // Copy Assignment Not Implemented
   DataContainerCreationFilterParameter& operator=(DataContainerCreationFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -181,4 +179,3 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
   DataContainerCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
   DataContainerCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
index 9ddf2a1a1a..26f815df01 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -89,13 +89,13 @@ void DataContainerGridSelectionFilterParameter::readJson(const QJsonObject& json
     DataArrayPath dap;
     if(dap.readJson(obj))
     {
-      //m_SetterCallback(dap);
+      // m_SetterCallback(dap);
     }
     else // this is in here for historical where we used to save the value as a string
     {
       QString dcName = jsonValue.toString("");
       DataArrayPath dap(dcName, "", "");
-      //m_SetterCallback(dap);
+      // m_SetterCallback(dap);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index bcbfa78aa1..38ec0483bd 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerReaderFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
old mode 100755
new mode 100644
index b70f93b1f5..5328b770b2
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,130 +49,127 @@
  */
 class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DataContainerReaderFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DataContainerReaderFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerReaderFilterParameter
-     */
-    static QString ClassName();
-
-    /**
-     * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param filter The corresponding filter that sets all its values into the DataContainerReaderWidget.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category, DataContainerReader* filter,
-                       int groupIndex = -1);
-
-    ~DataContainerReaderFilterParameter() override;
-
-    /**
-     * @brief Setter property for DefaultFlagValue
-     */
-    void setDefaultFlagValue(const Qt::CheckState& value);
-    /**
-     * @brief Getter property for DefaultFlagValue
-     * @return Value of DefaultFlagValue
-     */
-    Qt::CheckState getDefaultFlagValue() const;
-
-    /**
-     * @brief Setter property for InputFileProperty
-     */
-    void setInputFileProperty(const QString& value);
-    /**
-     * @brief Getter property for InputFileProperty
-     * @return Value of InputFileProperty
-     */
-    QString getInputFileProperty() const;
-
-    /**
-     * @brief Setter property for FileExtension
-     */
-    void setFileExtension(const QString& value);
-    /**
-     * @brief Getter property for FileExtension
-     * @return Value of FileExtension
-     */
-    QString getFileExtension() const;
-
-    /**
-     * @brief Setter property for FileType
-     */
-    void setFileType(const QString& value);
-    /**
-     * @brief Getter property for FileType
-     * @return Value of FileType
-     */
-    QString getFileType() const;
-
-    /**
-     * @brief Setter property for Filter
-     */
-    void setFilter(DataContainerReader* value);
-    /**
-     * @brief Getter property for Filter
-     * @return Value of Filter
-     */
-    DataContainerReader* getFilter() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-  protected:
-    /**
-     * @brief DataContainerReaderFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    DataContainerReaderFilterParameter();
-
-  public:
-    DataContainerReaderFilterParameter(const DataContainerReaderFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DataContainerReaderFilterParameter(DataContainerReaderFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DataContainerReaderFilterParameter& operator=(const DataContainerReaderFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DataContainerReaderFilterParameter& operator=(DataContainerReaderFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DataContainerReader* m_Filter = nullptr;
-
-    Qt::CheckState m_DefaultFlagValue = {};
-    QString m_InputFileProperty = {};
-    QString m_FileExtension = {};
-    QString m_FileType = {};
+public:
+  using Self = DataContainerReaderFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerReaderFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerReaderFilterParameter
+   */
+  static QString ClassName();
+
+  /**
+   * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param filter The corresponding filter that sets all its values into the DataContainerReaderWidget.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, DataContainerReader* filter, int groupIndex = -1);
+
+  ~DataContainerReaderFilterParameter() override;
+
+  /**
+   * @brief Setter property for DefaultFlagValue
+   */
+  void setDefaultFlagValue(const Qt::CheckState& value);
+  /**
+   * @brief Getter property for DefaultFlagValue
+   * @return Value of DefaultFlagValue
+   */
+  Qt::CheckState getDefaultFlagValue() const;
+
+  /**
+   * @brief Setter property for InputFileProperty
+   */
+  void setInputFileProperty(const QString& value);
+  /**
+   * @brief Getter property for InputFileProperty
+   * @return Value of InputFileProperty
+   */
+  QString getInputFileProperty() const;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief Setter property for Filter
+   */
+  void setFilter(DataContainerReader* value);
+  /**
+   * @brief Getter property for Filter
+   * @return Value of Filter
+   */
+  DataContainerReader* getFilter() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+protected:
+  /**
+   * @brief DataContainerReaderFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataContainerReaderFilterParameter();
+
+public:
+  DataContainerReaderFilterParameter(const DataContainerReaderFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerReaderFilterParameter(DataContainerReaderFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerReaderFilterParameter& operator=(const DataContainerReaderFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataContainerReaderFilterParameter& operator=(DataContainerReaderFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DataContainerReader* m_Filter = nullptr;
+
+  Qt::CheckState m_DefaultFlagValue = {};
+  QString m_InputFileProperty = {};
+  QString m_FileExtension = {};
+  QString m_FileType = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index 128aa6e813..a5f16ca475 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerSelectionFilterParameter.h"
 
@@ -51,8 +51,8 @@ DataContainerSelectionFilterParameter::~DataContainerSelectionFilterParameter()
 //
 // -----------------------------------------------------------------------------
 DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const RequirementType& req,
-                                                                                          int groupIndex)
+                                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                          const RequirementType& req, int groupIndex)
 {
   DataContainerSelectionFilterParameter::Pointer ptr = DataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
old mode 100755
new mode 100644
index 1d4cd81e9d..de6578c013
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,10 +56,8 @@
  * DataContainerSelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Parameter, GenericExample, req, 2);
  */
-#define SIMPL_NEW_DC_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DataContainerSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DC_SELECTION_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DataContainerSelectionFilterParameter class is used by filters to instantiate an DataContainerSelectionWidget.  By instantiating an instance of
@@ -67,145 +65,145 @@
  */
 class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DataContainerSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DataContainerSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DataContainerSelectionFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-    };
-
-    /**
-     * @brief New This function instantiates an instance of the DataContainerSelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_DC_SELECTION_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
-
-    ~DataContainerSelectionFilterParameter() override;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @brief Returns the RequirementType for the filter parameter
-    * @return
-    */
-    RequirementType getRequirements();
-
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DataContainerSelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DataContainerSelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief Handles changes to the DataArrayPath
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-  protected:
-      /**
-       * @brief DataContainerSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DataContainerSelectionFilterParameter();
-
-  public:
-    DataContainerSelectionFilterParameter(const DataContainerSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DataContainerSelectionFilterParameter(DataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DataContainerSelectionFilterParameter& operator=(const DataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DataContainerSelectionFilterParameter& operator=(DataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    DataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DataContainerSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DataContainerSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DataContainerSelectionFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+  };
+
+  /**
+   * @brief New This function instantiates an instance of the DataContainerSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_DC_SELECTION_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+
+  ~DataContainerSelectionFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Returns the RequirementType for the filter parameter
+   * @return
+   */
+  RequirementType getRequirements();
+
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DataContainerSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DataContainerSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handles changes to the DataArrayPath
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief DataContainerSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DataContainerSelectionFilterParameter();
+
+public:
+  DataContainerSelectionFilterParameter(const DataContainerSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DataContainerSelectionFilterParameter(DataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerSelectionFilterParameter& operator=(const DataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DataContainerSelectionFilterParameter& operator=(DataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  DataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 34adf18fc1..7b91ab1626 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DoubleFilterParameter.h"
 
@@ -48,8 +48,8 @@ DoubleFilterParameter::~DoubleFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                          const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
@@ -64,12 +64,11 @@ DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLa
   return ptr;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                          float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                          const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
@@ -84,7 +83,6 @@ DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLa
   return ptr;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
old mode 100755
new mode 100644
index bc2b64738f..ebdfee4b3e
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,11 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_DOUBLE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DoubleFilterParameter, __VA_ARGS__))
-
+#define SIMPL_NEW_DOUBLE_FP(...)                                                                                                                                                                       \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DoubleFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DoubleFilterParameter class is used by filters to instantiate an DoubleWidget.  By instantiating an instance of
@@ -65,132 +62,131 @@
  */
 class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DoubleFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DoubleFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DoubleFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(double)>;
-    using GetterCallbackType = std::function<double(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    /**
-     * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~DoubleFilterParameter() override;
-
-    /**
+public:
+  using Self = DoubleFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DoubleFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DoubleFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(double)>;
+  using GetterCallbackType = std::function<double(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  /**
+   * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  ~DoubleFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DoubleFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DoubleFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DoubleFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DoubleFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief DoubleFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    DoubleFilterParameter();
-
-  public:
-    DoubleFilterParameter(const DoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    DoubleFilterParameter(DoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    DoubleFilterParameter& operator=(const DoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DoubleFilterParameter& operator=(DoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DoubleFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DoubleFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DoubleFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DoubleFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief DoubleFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DoubleFilterParameter();
+
+public:
+  DoubleFilterParameter(const DoubleFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DoubleFilterParameter(DoubleFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DoubleFilterParameter& operator=(const DoubleFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DoubleFilterParameter& operator=(DoubleFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DoubleFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DoubleFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 360cb82b77..6284862b6c 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicChoiceFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
old mode 100755
new mode 100644
index 4bc758cde5..32362e936e
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::CreatedArray, GenericExample, "DataArrayList");
  */
-#define SIMPL_NEW_DYN_CHOICE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DynamicChoiceFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DYN_CHOICE_FP(...)                                                                                                                                                                   \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DynamicChoiceFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DynamicChoiceFilterParameter class is used by filters to instantiate an DynamicChoiceWidget.  By instantiating an instance of
@@ -64,138 +62,135 @@
  */
 class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DynamicChoiceFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DynamicChoiceFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DynamicChoiceFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the DynamicChoiceFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DYN_CHOICE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param listProperty The name of the property that stores the selections to choose from in the DynamicChoiceWidget
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       const QString& listProperty, int groupIndex = -1);
-
-    ~DynamicChoiceFilterParameter() override;
-
-    /**
-     * @brief Setter property for ListProperty
-     */
-    void setListProperty(const QString& value);
-    /**
-     * @brief Getter property for ListProperty
-     * @return Value of ListProperty
-     */
-    QString getListProperty() const;
-
-    /**
-     * @brief Setter property for Units
-     */
-    void setUnits(const QString& value);
-    /**
-     * @brief Getter property for Units
-     * @return Value of Units
-     */
-    QString getUnits() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DynamicChoiceFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DynamicChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DynamicChoiceFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DynamicChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-      /**
-       * @brief DynamicChoiceFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DynamicChoiceFilterParameter();
-
-  public:
-    DynamicChoiceFilterParameter(const DynamicChoiceFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DynamicChoiceFilterParameter(DynamicChoiceFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DynamicChoiceFilterParameter& operator=(const DynamicChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DynamicChoiceFilterParameter& operator=(DynamicChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QString m_ListProperty = {};
-    QString m_Units = {};
-    DynamicChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DynamicChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DynamicChoiceFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DynamicChoiceFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DynamicChoiceFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the DynamicChoiceFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DYN_CHOICE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param listProperty The name of the property that stores the selections to choose from in the DynamicChoiceWidget
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& listProperty, int groupIndex = -1);
+
+  ~DynamicChoiceFilterParameter() override;
+
+  /**
+   * @brief Setter property for ListProperty
+   */
+  void setListProperty(const QString& value);
+  /**
+   * @brief Getter property for ListProperty
+   * @return Value of ListProperty
+   */
+  QString getListProperty() const;
+
+  /**
+   * @brief Setter property for Units
+   */
+  void setUnits(const QString& value);
+  /**
+   * @brief Getter property for Units
+   * @return Value of Units
+   */
+  QString getUnits() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DynamicChoiceFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DynamicChoiceFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DynamicChoiceFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DynamicChoiceFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief DynamicChoiceFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DynamicChoiceFilterParameter();
+
+public:
+  DynamicChoiceFilterParameter(const DynamicChoiceFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DynamicChoiceFilterParameter(DynamicChoiceFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DynamicChoiceFilterParameter& operator=(const DynamicChoiceFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DynamicChoiceFilterParameter& operator=(DynamicChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_ListProperty = {};
+  QString m_Units = {};
+  DynamicChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DynamicChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index ea733a1f0e..8faabb8917 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicTableData.h"
 
@@ -43,26 +43,26 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableData::DynamicTableData() :
-  m_DynamicRows(false),
-  m_DynamicCols(false),
-  m_MinRows(0),
-  m_MinCols(0),
-  m_DefaultRowCount(0),
-  m_DefaultColCount(0)
+DynamicTableData::DynamicTableData()
+: m_DynamicRows(false)
+, m_DynamicCols(false)
+, m_MinRows(0)
+, m_MinCols(0)
+, m_DefaultRowCount(0)
+, m_DefaultColCount(0)
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableData::DynamicTableData(int nRows, int nCols) :
-  m_DynamicRows(false),
-  m_DynamicCols(false),
-  m_MinRows(0),
-  m_MinCols(0),
-  m_DefaultRowCount(0),
-  m_DefaultColCount(0)
+DynamicTableData::DynamicTableData(int nRows, int nCols)
+: m_DynamicRows(false)
+, m_DynamicCols(false)
+, m_MinRows(0)
+, m_MinCols(0)
+, m_DefaultRowCount(0)
+, m_DefaultColCount(0)
 {
   std::vector<std::vector<double>> data(nRows, std::vector<double>(nCols, 0));
   m_TableData = data;
@@ -86,13 +86,13 @@ DynamicTableData::DynamicTableData(int nRows, int nCols) :
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableData::DynamicTableData(int nRows, int nCols,  const QStringList &rHeaders, const QStringList &cHeaders) :
-  m_DynamicRows(false),
-  m_DynamicCols(false),
-  m_MinRows(0),
-  m_MinCols(0),
-  m_DefaultRowCount(0),
-  m_DefaultColCount(0)
+DynamicTableData::DynamicTableData(int nRows, int nCols, const QStringList& rHeaders, const QStringList& cHeaders)
+: m_DynamicRows(false)
+, m_DynamicCols(false)
+, m_MinRows(0)
+, m_MinCols(0)
+, m_DefaultRowCount(0)
+, m_DefaultColCount(0)
 {
   std::vector<std::vector<double>> data(nRows, std::vector<double>(nCols, 0));
   m_TableData = data;
@@ -107,15 +107,13 @@ DynamicTableData::DynamicTableData(int nRows, int nCols,  const QStringList &rHe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableData::DynamicTableData(const std::vector<std::vector<double>>& data, 
-                                    const QStringList& rHeaders, 
-                                    const QStringList& cHeaders) :
-  m_DynamicRows(false),
-  m_DynamicCols(false),
-  m_MinRows(0),
-  m_MinCols(0),
-  m_DefaultRowCount(0),
-  m_DefaultColCount(0)
+DynamicTableData::DynamicTableData(const std::vector<std::vector<double>>& data, const QStringList& rHeaders, const QStringList& cHeaders)
+: m_DynamicRows(false)
+, m_DynamicCols(false)
+, m_MinRows(0)
+, m_MinCols(0)
+, m_DefaultRowCount(0)
+, m_DefaultColCount(0)
 {
   m_TableData = data;
   m_RowHeaders = rHeaders;
@@ -128,9 +126,7 @@ DynamicTableData::DynamicTableData(const std::vector<std::vector<double>>& data,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableData DynamicTableData::Create(const std::vector<std::vector<double>>& dims, 
-                                  const std::list<std::string>& rHeaders, 
-                                  const std::list<std::string>& cHeaders)
+DynamicTableData DynamicTableData::Create(const std::vector<std::vector<double>>& dims, const std::list<std::string>& rHeaders, const std::list<std::string>& cHeaders)
 {
   QStringList rowHdrs;
   for(const auto& rowHdr : rHeaders)
@@ -176,29 +172,29 @@ void DynamicTableData::checkAndAdjustDimensions()
     return;
   }
 
-    /* The header dimensions do not equal the data dimensions.
-       The data dimensions will be used and will overwrite the current header dimensions.
-       This may result in data loss.
-    */
-    int nRows = dataSize.width();
-    int nCols = dataSize.height();
+  /* The header dimensions do not equal the data dimensions.
+     The data dimensions will be used and will overwrite the current header dimensions.
+     This may result in data loss.
+  */
+  int nRows = dataSize.width();
+  int nCols = dataSize.height();
 
-    // If row header dimension is greater than default row dimension, remove the extra headers
-    if(m_RowHeaders.size() > nRows)
+  // If row header dimension is greater than default row dimension, remove the extra headers
+  if(m_RowHeaders.size() > nRows)
+  {
+    while(m_RowHeaders.size() > nRows)
     {
-      while(m_RowHeaders.size() > nRows)
-      {
-        m_RowHeaders.pop_back();
-      }
+      m_RowHeaders.pop_back();
     }
-    // If column header dimension is greater than default column dimension, remove the extra headers
-    if(m_ColHeaders.size() > nCols)
+  }
+  // If column header dimension is greater than default column dimension, remove the extra headers
+  if(m_ColHeaders.size() > nCols)
+  {
+    while(m_ColHeaders.size() > nCols)
     {
-      while(m_ColHeaders.size() > nCols)
-      {
-        m_ColHeaders.pop_back();
-      }
+      m_ColHeaders.pop_back();
     }
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -565,9 +561,8 @@ DynamicTableData& DynamicTableData::operator=(const DynamicTableData& rhs)
 // -----------------------------------------------------------------------------
 bool DynamicTableData::operator==(const DynamicTableData& rhs) const
 {
-  if(m_RowHeaders == rhs.m_RowHeaders && m_ColHeaders == rhs.m_ColHeaders && m_DynamicRows == rhs.m_DynamicRows
-     && m_DynamicCols == rhs.m_DynamicCols && m_MinRows == rhs.m_MinRows && m_MinCols == rhs.m_MinCols
-     && m_DefaultRowCount == rhs.m_DefaultRowCount && m_DefaultColCount == rhs.m_DefaultColCount)
+  if(m_RowHeaders == rhs.m_RowHeaders && m_ColHeaders == rhs.m_ColHeaders && m_DynamicRows == rhs.m_DynamicRows && m_DynamicCols == rhs.m_DynamicCols && m_MinRows == rhs.m_MinRows &&
+     m_MinCols == rhs.m_MinCols && m_DefaultRowCount == rhs.m_DefaultRowCount && m_DefaultColCount == rhs.m_DefaultColCount)
   {
     for(int i = 0; i < m_TableData.size(); i++)
     {
@@ -590,9 +585,8 @@ bool DynamicTableData::operator==(const DynamicTableData& rhs) const
 // -----------------------------------------------------------------------------
 bool DynamicTableData::operator!=(const DynamicTableData& rhs) const
 {
-  if(m_RowHeaders == rhs.m_RowHeaders && m_ColHeaders == rhs.m_ColHeaders && m_DynamicRows == rhs.m_DynamicRows
-     && m_DynamicCols == rhs.m_DynamicCols && m_MinRows == rhs.m_MinRows && m_MinCols == rhs.m_MinCols
-     && m_DefaultRowCount == rhs.m_DefaultRowCount && m_DefaultColCount == rhs.m_DefaultColCount)
+  if(m_RowHeaders == rhs.m_RowHeaders && m_ColHeaders == rhs.m_ColHeaders && m_DynamicRows == rhs.m_DynamicRows && m_DynamicCols == rhs.m_DynamicCols && m_MinRows == rhs.m_MinRows &&
+     m_MinCols == rhs.m_MinCols && m_DefaultRowCount == rhs.m_DefaultRowCount && m_DefaultColCount == rhs.m_DefaultColCount)
   {
     for(int i = 0; i < m_TableData.size(); i++)
     {
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
old mode 100755
new mode 100644
index bc3b86c674..d85ef56491
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -33,231 +33,225 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtCore/QObject>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SIMPLib_EXPORT DynamicTableData : public QObject
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(DynamicTableData)
-    PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
-    PYB11_PROPERTY(QStringList ColHeaders READ getColHeaders WRITE setColHeaders)
-    PYB11_PROPERTY(QStringList RowHeaders READ getRowHeaders WRITE setRowHeaders)
-    PYB11_PROPERTY(std::vector<std::vector<double>> TableData READ getTableData WRITE setTableData)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    DynamicTableData();
-    DynamicTableData(int nRows, int nCols);
-    DynamicTableData(int nRows, int nCols,  const QStringList &rHeaders, const QStringList &cHeaders);
-    DynamicTableData(const std::vector<std::vector<double> > &data, 
-                      const QStringList &rHeaders = QStringList(), 
-                      const QStringList &cHeaders = QStringList());
-
-    ~DynamicTableData() override;
-
-    static DynamicTableData Create(const std::vector<std::vector<double>>& dims, 
-                                  const std::list<std::string>& rHeaders, 
-                                  const std::list<std::string>& cHeaders);
-
-    /**
-     * @brief Setter property for ColHeaders
-     */
-    void setColHeaders(const QStringList& value);
-    /**
-     * @brief Getter property for ColHeaders
-     * @return Value of ColHeaders
-     */
-    QStringList getColHeaders() const;
-
-    /**
-     * @brief Setter property for RowHeaders
-     */
-    void setRowHeaders(const QStringList& value);
-    /**
-     * @brief Getter property for RowHeaders
-     * @return Value of RowHeaders
-     */
-    QStringList getRowHeaders() const;
-
-    /**
-     * @brief Setter property for DynamicRows
-     */
-    void setDynamicRows(bool value);
-    /**
-     * @brief Getter property for DynamicRows
-     * @return Value of DynamicRows
-     */
-    bool getDynamicRows() const;
-
-    /**
-     * @brief Setter property for DynamicCols
-     */
-    void setDynamicCols(bool value);
-    /**
-     * @brief Getter property for DynamicCols
-     * @return Value of DynamicCols
-     */
-    bool getDynamicCols() const;
-
-    /**
-     * @brief Setter property for MinRows
-     */
-    void setMinRows(int value);
-    /**
-     * @brief Getter property for MinRows
-     * @return Value of MinRows
-     */
-    int getMinRows() const;
-
-    /**
-     * @brief Setter property for MinCols
-     */
-    void setMinCols(int value);
-    /**
-     * @brief Getter property for MinCols
-     * @return Value of MinCols
-     */
-    int getMinCols() const;
-
-    /**
-     * @brief Setter property for DefaultRowCount
-     */
-    void setDefaultRowCount(int value);
-    /**
-     * @brief Getter property for DefaultRowCount
-     * @return Value of DefaultRowCount
-     */
-    int getDefaultRowCount() const;
-
-    /**
-     * @brief Setter property for DefaultColCount
-     */
-    void setDefaultColCount(int value);
-    /**
-     * @brief Getter property for DefaultColCount
-     * @return Value of DefaultColCount
-     */
-    int getDefaultColCount() const;
-
-    /**
-    * @brief This deserializes a string of data and returns the original 2D array.
-    */
-    static std::vector<std::vector<double> > DeserializeData(QString dataStr, int nRows, int nCols, char delimiter);
-
-    /**
-    * @brief This does the reverse of the flattenData function.  It expands the data back into a 2D array.
-    */
-    static std::vector<std::vector<double>> ExpandData(std::vector<double> orig, size_t nRows, size_t nCols);
-
-    /**
-    * @brief This deserializes a string of headers and returns the original QStringList.
-    */
-    static QStringList DeserializeHeaders(QString headersStr, char delimiter);
-
-    /**
-    * @brief This returns a serialized string of the data, iterating through columns first.
-    */
-    QString serializeData(char delimiter) const;
-
-    /**
-    * @brief This returns a serialized string of the row headers list.
-    */
-    QString serializeRowHeaders(char delimiter) const;
-
-    /**
-    * @brief This returns a serialized string of the column headers list.
-    */
-    QString serializeColumnHeaders(char delimiter) const;
-
-    /**
-    * @brief This returns a flattened vector of the data.
-    */
-    QVector<double> flattenData() const;
-
-    /**
-    * @brief Writes the contents of the proxy to the json object 'json'
-    * @param json
-    * @return
-    */
-    void writeJson(QJsonObject& json) const;
-
-    /**
-    * @brief Reads the contents of the json object 'json' into the proxy
-    * @param json
-    * @return
-    */
-    bool readJson(QJsonObject& json);
-
-    /**
-    * @brief Table data getter and setter
-    */
-    std::vector<std::vector<double>> getTableData() const;
-    void setTableData(const std::vector<std::vector<double>>& data);
-
-    /**
-    * @brief Calculates and returns the number of rows
-    */
-    int getNumRows() const;
-
-    /**
-    * @brief Calculates and returns the number of columns
-    */
-    int getNumCols() const;
-
-    /**
-    * @brief Checks if the DynamicTableData object is empty.
-    */
-    bool isEmpty();
-
-    DynamicTableData(const DynamicTableData& rhs);
-    DynamicTableData& operator=(const DynamicTableData& rhs);
-    bool operator==(const DynamicTableData& rhs) const;
-    bool operator!=(const DynamicTableData& rhs) const;
-
-  private:
-    QStringList m_ColHeaders = {};
-    QStringList m_RowHeaders = {};
-    bool m_DynamicRows = {};
-    bool m_DynamicCols = {};
-    int m_MinRows = {};
-    int m_MinCols = {};
-    int m_DefaultRowCount = {};
-    int m_DefaultColCount = {};
-
-    std::vector<std::vector<double> >       m_TableData;
-
-    /**
-    * @brief Writes the contents of the data to a QJsonObject
-    * @param data
-    * @return QJsonArray
-    */
-    void writeData(QJsonObject &object) const;
-
-    /**
-    * @brief Reads the contents of the QJsonObject into a 2D array
-    * @param object
-    * @return 2D array
-    */
-    std::vector<std::vector<double> > readData(QJsonObject object);
-
-    /**
-    * @brief Checks that the dimensions between all variables are the same.  If not, adjusts dimensions
-    * to match numRows and numCols.
-    */
-    void checkAndAdjustDimensions();
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(DynamicTableData)
+  PYB11_STATIC_CREATION(Create ARGS std::vector<std::vector<double>> std::list<std::string> std::list<std::string>)
+  PYB11_PROPERTY(QStringList ColHeaders READ getColHeaders WRITE setColHeaders)
+  PYB11_PROPERTY(QStringList RowHeaders READ getRowHeaders WRITE setRowHeaders)
+  PYB11_PROPERTY(std::vector<std::vector<double>> TableData READ getTableData WRITE setTableData)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  DynamicTableData();
+  DynamicTableData(int nRows, int nCols);
+  DynamicTableData(int nRows, int nCols, const QStringList& rHeaders, const QStringList& cHeaders);
+  DynamicTableData(const std::vector<std::vector<double>>& data, const QStringList& rHeaders = QStringList(), const QStringList& cHeaders = QStringList());
+
+  ~DynamicTableData() override;
+
+  static DynamicTableData Create(const std::vector<std::vector<double>>& dims, const std::list<std::string>& rHeaders, const std::list<std::string>& cHeaders);
+
+  /**
+   * @brief Setter property for ColHeaders
+   */
+  void setColHeaders(const QStringList& value);
+  /**
+   * @brief Getter property for ColHeaders
+   * @return Value of ColHeaders
+   */
+  QStringList getColHeaders() const;
+
+  /**
+   * @brief Setter property for RowHeaders
+   */
+  void setRowHeaders(const QStringList& value);
+  /**
+   * @brief Getter property for RowHeaders
+   * @return Value of RowHeaders
+   */
+  QStringList getRowHeaders() const;
+
+  /**
+   * @brief Setter property for DynamicRows
+   */
+  void setDynamicRows(bool value);
+  /**
+   * @brief Getter property for DynamicRows
+   * @return Value of DynamicRows
+   */
+  bool getDynamicRows() const;
+
+  /**
+   * @brief Setter property for DynamicCols
+   */
+  void setDynamicCols(bool value);
+  /**
+   * @brief Getter property for DynamicCols
+   * @return Value of DynamicCols
+   */
+  bool getDynamicCols() const;
+
+  /**
+   * @brief Setter property for MinRows
+   */
+  void setMinRows(int value);
+  /**
+   * @brief Getter property for MinRows
+   * @return Value of MinRows
+   */
+  int getMinRows() const;
+
+  /**
+   * @brief Setter property for MinCols
+   */
+  void setMinCols(int value);
+  /**
+   * @brief Getter property for MinCols
+   * @return Value of MinCols
+   */
+  int getMinCols() const;
+
+  /**
+   * @brief Setter property for DefaultRowCount
+   */
+  void setDefaultRowCount(int value);
+  /**
+   * @brief Getter property for DefaultRowCount
+   * @return Value of DefaultRowCount
+   */
+  int getDefaultRowCount() const;
+
+  /**
+   * @brief Setter property for DefaultColCount
+   */
+  void setDefaultColCount(int value);
+  /**
+   * @brief Getter property for DefaultColCount
+   * @return Value of DefaultColCount
+   */
+  int getDefaultColCount() const;
+
+  /**
+   * @brief This deserializes a string of data and returns the original 2D array.
+   */
+  static std::vector<std::vector<double>> DeserializeData(QString dataStr, int nRows, int nCols, char delimiter);
+
+  /**
+   * @brief This does the reverse of the flattenData function.  It expands the data back into a 2D array.
+   */
+  static std::vector<std::vector<double>> ExpandData(std::vector<double> orig, size_t nRows, size_t nCols);
+
+  /**
+   * @brief This deserializes a string of headers and returns the original QStringList.
+   */
+  static QStringList DeserializeHeaders(QString headersStr, char delimiter);
+
+  /**
+   * @brief This returns a serialized string of the data, iterating through columns first.
+   */
+  QString serializeData(char delimiter) const;
+
+  /**
+   * @brief This returns a serialized string of the row headers list.
+   */
+  QString serializeRowHeaders(char delimiter) const;
+
+  /**
+   * @brief This returns a serialized string of the column headers list.
+   */
+  QString serializeColumnHeaders(char delimiter) const;
+
+  /**
+   * @brief This returns a flattened vector of the data.
+   */
+  QVector<double> flattenData() const;
+
+  /**
+   * @brief Writes the contents of the proxy to the json object 'json'
+   * @param json
+   * @return
+   */
+  void writeJson(QJsonObject& json) const;
+
+  /**
+   * @brief Reads the contents of the json object 'json' into the proxy
+   * @param json
+   * @return
+   */
+  bool readJson(QJsonObject& json);
+
+  /**
+   * @brief Table data getter and setter
+   */
+  std::vector<std::vector<double>> getTableData() const;
+  void setTableData(const std::vector<std::vector<double>>& data);
+
+  /**
+   * @brief Calculates and returns the number of rows
+   */
+  int getNumRows() const;
+
+  /**
+   * @brief Calculates and returns the number of columns
+   */
+  int getNumCols() const;
+
+  /**
+   * @brief Checks if the DynamicTableData object is empty.
+   */
+  bool isEmpty();
+
+  DynamicTableData(const DynamicTableData& rhs);
+  DynamicTableData& operator=(const DynamicTableData& rhs);
+  bool operator==(const DynamicTableData& rhs) const;
+  bool operator!=(const DynamicTableData& rhs) const;
+
+private:
+  QStringList m_ColHeaders = {};
+  QStringList m_RowHeaders = {};
+  bool m_DynamicRows = {};
+  bool m_DynamicCols = {};
+  int m_MinRows = {};
+  int m_MinCols = {};
+  int m_DefaultRowCount = {};
+  int m_DefaultColCount = {};
+
+  std::vector<std::vector<double>> m_TableData;
+
+  /**
+   * @brief Writes the contents of the data to a QJsonObject
+   * @param data
+   * @return QJsonArray
+   */
+  void writeData(QJsonObject& object) const;
+
+  /**
+   * @brief Reads the contents of the QJsonObject into a 2D array
+   * @param object
+   * @return 2D array
+   */
+  std::vector<std::vector<double>> readData(QJsonObject object);
+
+  /**
+   * @brief Checks that the dimensions between all variables are the same.  If not, adjusts dimensions
+   * to match numRows and numCols.
+   */
+  void checkAndAdjustDimensions();
 };
 
 Q_DECLARE_METATYPE(DynamicTableData)
-
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index e3b91dd777..05a255f669 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicTableFilterParameter.h"
 
@@ -53,7 +53,8 @@ DynamicTableFilterParameter::~DynamicTableFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category,
+                                                                      const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   DynamicTableFilterParameter::Pointer ptr = DynamicTableFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -118,7 +119,7 @@ void DynamicTableFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void DynamicTableFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     DynamicTableData dynamicData = m_GetterCallback();
     QJsonObject jsonObj;
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
old mode 100755
new mode 100644
index 54210056d3..2cefe5e12a
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -55,10 +55,8 @@
  * Example 1 (instantiated within a filter called [DynamicTableExample](@ref dynamictableexample), with 5 optional parameters):
  * SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 5", DynamicData5, FilterParameter::Parameter, DynamicTableExample, true, true, 0, 0, 0);
  */
-#define SIMPL_NEW_DYN_TABLE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (DynamicTableFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_DYN_TABLE_FP(...)                                                                                                                                                                    \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DynamicTableFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The DynamicTableFilterParameter class is used by filters to instantiate an DynamicTableWidget.  By instantiating an instance of
@@ -66,152 +64,149 @@
  */
 class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
 {
-  public:
-    using Self = DynamicTableFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for DynamicTableFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for DynamicTableFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DynamicTableData)>;
-    using GetterCallbackType = std::function<DynamicTableData(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the DynamicTableFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DYN_TABLE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param isRowsDynamic Boolean that determines whether the row count is dynamic or fixed
-    * @param isColsDynamic Boolean that determines whether the column count is dynamic or fixed
-    * @param minRowCount Minimum number of rows possible
-    * @param minColCount Minimum number of columns possible
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       DynamicTableData defaultTableData, FilterParameter::Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-
-    ~DynamicTableFilterParameter() override;
-
-    /**
-     * @brief Setter property for DefaultTableData
-     */
-    void setDefaultTableData(const DynamicTableData& value);
-    /**
-     * @brief Getter property for DefaultTableData
-     * @return Value of DefaultTableData
-     */
-    DynamicTableData getDefaultTableData() const;
-
-    /**
-     * @brief Setter property for ErrorCondition
-     */
-    void setErrorCondition(int value);
-    /**
-     * @brief Getter property for ErrorCondition
-     * @return Value of ErrorCondition
-     */
-    int getErrorCondition() const;
-
-    /**
-     * @brief Setter property for ErrorMessage
-     */
-    void setErrorMessage(const QString& value);
-    /**
-     * @brief Getter property for ErrorMessage
-     * @return Value of ErrorMessage
-     */
-    QString getErrorMessage() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const DynamicTableFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    DynamicTableFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const DynamicTableFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    DynamicTableFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-      /**
-       * @brief DynamicTableFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    DynamicTableFilterParameter();
-
-  public:
-    DynamicTableFilterParameter(const DynamicTableFilterParameter&) = delete; // Copy Constructor Not Implemented
-    DynamicTableFilterParameter(DynamicTableFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    DynamicTableFilterParameter& operator=(const DynamicTableFilterParameter&) = delete; // Copy Assignment Not Implemented
-    DynamicTableFilterParameter& operator=(DynamicTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    DynamicTableData m_DefaultTableData = {};
-    int m_ErrorCondition = {};
-    QString m_ErrorMessage = {};
-    DynamicTableFilterParameter::SetterCallbackType m_SetterCallback = {};
-    DynamicTableFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = DynamicTableFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for DynamicTableFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for DynamicTableFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DynamicTableData)>;
+  using GetterCallbackType = std::function<DynamicTableData(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the DynamicTableFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DYN_TABLE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param isRowsDynamic Boolean that determines whether the row count is dynamic or fixed
+  * @param isColsDynamic Boolean that determines whether the column count is dynamic or fixed
+  * @param minRowCount Minimum number of rows possible
+  * @param minColCount Minimum number of columns possible
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~DynamicTableFilterParameter() override;
+
+  /**
+   * @brief Setter property for DefaultTableData
+   */
+  void setDefaultTableData(const DynamicTableData& value);
+  /**
+   * @brief Getter property for DefaultTableData
+   * @return Value of DefaultTableData
+   */
+  DynamicTableData getDefaultTableData() const;
+
+  /**
+   * @brief Setter property for ErrorCondition
+   */
+  void setErrorCondition(int value);
+  /**
+   * @brief Getter property for ErrorCondition
+   * @return Value of ErrorCondition
+   */
+  int getErrorCondition() const;
+
+  /**
+   * @brief Setter property for ErrorMessage
+   */
+  void setErrorMessage(const QString& value);
+  /**
+   * @brief Getter property for ErrorMessage
+   * @return Value of ErrorMessage
+   */
+  QString getErrorMessage() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const DynamicTableFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  DynamicTableFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const DynamicTableFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  DynamicTableFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief DynamicTableFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  DynamicTableFilterParameter();
+
+public:
+  DynamicTableFilterParameter(const DynamicTableFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  DynamicTableFilterParameter(DynamicTableFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  DynamicTableFilterParameter& operator=(const DynamicTableFilterParameter&) = delete; // Copy Assignment Not Implemented
+  DynamicTableFilterParameter& operator=(DynamicTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  DynamicTableData m_DefaultTableData = {};
+  int m_ErrorCondition = {};
+  QString m_ErrorMessage = {};
+  DynamicTableFilterParameter::SetterCallbackType m_SetterCallback = {};
+  DynamicTableFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 18c4f4de6d..729a928e50 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FileListInfoFilterParameter.h"
 
@@ -100,7 +100,7 @@ void FileListInfoFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void FileListInfoFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     StackFileListInfo fileListInfo = m_GetterCallback();
     QJsonObject jsonObj;
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
old mode 100755
new mode 100644
index 60ed824246..f4bf38e0f5
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -164,8 +164,8 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   FileListInfoFilterParameter();
 
 public:
-  FileListInfoFilterParameter(const FileListInfoFilterParameter&) = delete; // Copy Constructor Not Implemented
-  FileListInfoFilterParameter(FileListInfoFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  FileListInfoFilterParameter(const FileListInfoFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FileListInfoFilterParameter(FileListInfoFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   FileListInfoFilterParameter& operator=(const FileListInfoFilterParameter&) = delete; // Copy Assignment Not Implemented
   FileListInfoFilterParameter& operator=(FileListInfoFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -173,4 +173,3 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   FileListInfoFilterParameter::SetterCallbackType m_SetterCallback = {};
   FileListInfoFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index ae1c3ce1f0..335c904ff6 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
old mode 100755
new mode 100644
index c6d88b33cb..724fec7c22
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,152 +56,152 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT FilterParameter
 {
-  public:
-    using Self = FilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for FilterParameter
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for FilterParameter
-     */
-    static QString ClassName();
-
-    enum Category
-    {
-      Parameter = 0,
-      RequiredArray = 1,
-      CreatedArray = 2,
-      Uncategorized = 3
-    };
-
-    virtual ~FilterParameter();
-
-    /**
-     * @brief Setter property for HumanLabel
-     */
-    void setHumanLabel(const QString& value);
-    /**
-     * @brief Getter property for HumanLabel
-     * @return Value of HumanLabel
-     */
-    QString getHumanLabel() const;
-
-    /**
-     * @brief Setter property for PropertyName
-     */
-    void setPropertyName(const QString& value);
-    /**
-     * @brief Getter property for PropertyName
-     * @return Value of PropertyName
-     */
-    QString getPropertyName() const;
-
-    /**
-     * @brief This sets an alternate or legacy property name that was used in past versions of a filter.
-     *
-     * This can be useful if the filter changed the name of the property and to keep old pipeline files working
-     * @param value
-     */
-    void setLegacyPropertyName(const QString& value);
-
-    /**
-     * @brief Returns the legacy property name
-     * @return
-     */
-    QString getLegacyPropertyName() const;
-
-    /**
-     * @brief getWidgetType This is a pure virtual function. All subclasses need
-     * to implement this function.
-     * @return
-     */
-    virtual QString getWidgetType() const = 0;
-
-    /**
-     * @brief Setter property for DefaultValue
-     */
-    virtual void setDefaultValue(const QVariant& value);
-
-    /**
-     * @brief getDefaultValue
-     * @return
-     */
-    virtual QVariant getDefaultValue() const;
-
-    /**
-     * @brief Setter property for Category
-     */
-    void setCategory(const FilterParameter::Category& value);
-    /**
-     * @brief Getter property for Category
-     * @return Value of Category
-     */
-    FilterParameter::Category getCategory() const;
-
-    /**
-     * @brief Setter property for ReadOnly
-     */
-    void setReadOnly(bool value);
-    /**
-     * @brief Getter property for ReadOnly
-     * @return Value of ReadOnly
-     */
-    bool getReadOnly() const;
-
-    /**
-     * @brief Setter property for GroupIndex
-     */
-    void setGroupIndex(int value);
-    /**
-     * @brief Getter property for GroupIndex
-     * @return Value of GroupIndex
-     */
-    int getGroupIndex() const;
-
-    /**
-     * @brief readJson
-     * @return
-     */
-    virtual void readJson(const QJsonObject &json);
-
-    /**
-     * @brief writeJson
-     * @return
-     */
-    virtual void writeJson(QJsonObject &json);
-
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    virtual void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath);
-
-  protected:
-    FilterParameter();
-
-  public:
-    FilterParameter(const FilterParameter&) = delete; // Copy Constructor Not Implemented
-    FilterParameter(FilterParameter&&) = delete;      // Move Constructor Not Implemented
-    FilterParameter& operator=(const FilterParameter&) = delete; // Copy Assignment Not Implemented
-    FilterParameter& operator=(FilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QVariant m_DefaultValue = {};
-
-    QString m_HumanLabel = {};
-    QString m_PropertyName = {};
-    QString m_LegacyPropertyName = {};
-    FilterParameter::Category m_Category = {};
-    bool m_ReadOnly = {};
-    int m_GroupIndex = {};
+public:
+  using Self = FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for FilterParameter
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for FilterParameter
+   */
+  static QString ClassName();
+
+  enum Category
+  {
+    Parameter = 0,
+    RequiredArray = 1,
+    CreatedArray = 2,
+    Uncategorized = 3
+  };
+
+  virtual ~FilterParameter();
+
+  /**
+   * @brief Setter property for HumanLabel
+   */
+  void setHumanLabel(const QString& value);
+  /**
+   * @brief Getter property for HumanLabel
+   * @return Value of HumanLabel
+   */
+  QString getHumanLabel() const;
+
+  /**
+   * @brief Setter property for PropertyName
+   */
+  void setPropertyName(const QString& value);
+  /**
+   * @brief Getter property for PropertyName
+   * @return Value of PropertyName
+   */
+  QString getPropertyName() const;
+
+  /**
+   * @brief This sets an alternate or legacy property name that was used in past versions of a filter.
+   *
+   * This can be useful if the filter changed the name of the property and to keep old pipeline files working
+   * @param value
+   */
+  void setLegacyPropertyName(const QString& value);
+
+  /**
+   * @brief Returns the legacy property name
+   * @return
+   */
+  QString getLegacyPropertyName() const;
+
+  /**
+   * @brief getWidgetType This is a pure virtual function. All subclasses need
+   * to implement this function.
+   * @return
+   */
+  virtual QString getWidgetType() const = 0;
+
+  /**
+   * @brief Setter property for DefaultValue
+   */
+  virtual void setDefaultValue(const QVariant& value);
+
+  /**
+   * @brief getDefaultValue
+   * @return
+   */
+  virtual QVariant getDefaultValue() const;
+
+  /**
+   * @brief Setter property for Category
+   */
+  void setCategory(const FilterParameter::Category& value);
+  /**
+   * @brief Getter property for Category
+   * @return Value of Category
+   */
+  FilterParameter::Category getCategory() const;
+
+  /**
+   * @brief Setter property for ReadOnly
+   */
+  void setReadOnly(bool value);
+  /**
+   * @brief Getter property for ReadOnly
+   * @return Value of ReadOnly
+   */
+  bool getReadOnly() const;
+
+  /**
+   * @brief Setter property for GroupIndex
+   */
+  void setGroupIndex(int value);
+  /**
+   * @brief Getter property for GroupIndex
+   * @return Value of GroupIndex
+   */
+  int getGroupIndex() const;
+
+  /**
+   * @brief readJson
+   * @return
+   */
+  virtual void readJson(const QJsonObject& json);
+
+  /**
+   * @brief writeJson
+   * @return
+   */
+  virtual void writeJson(QJsonObject& json);
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  virtual void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath);
+
+protected:
+  FilterParameter();
+
+public:
+  FilterParameter(const FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FilterParameter(FilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  FilterParameter& operator=(const FilterParameter&) = delete; // Copy Assignment Not Implemented
+  FilterParameter& operator=(FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QVariant m_DefaultValue = {};
+
+  QString m_HumanLabel = {};
+  QString m_PropertyName = {};
+  QString m_LegacyPropertyName = {};
+  FilterParameter::Category m_Category = {};
+  bool m_ReadOnly = {};
+  int m_GroupIndex = {};
 };
 
 using FilterParameterVectorType = std::vector<FilterParameter::Pointer>;
@@ -215,71 +214,42 @@ using FilterParameterVectorType = std::vector<FilterParameter::Pointer>;
 // __VA__ARGS__
 // -----------------------------------------------------------------------------
 
-#define SIMPL_BIND_SETTER(CLASS, PTR, PROP)\
-std::bind(&CLASS::set##PROP, PTR, std::placeholders::_1)
+#define SIMPL_BIND_SETTER(CLASS, PTR, PROP) std::bind(&CLASS::set##PROP, PTR, std::placeholders::_1)
 
-#define SIMPL_BIND_GETTER(CLASS, PTR, PROP)\
-std::bind(&CLASS::get##PROP, PTR)
+#define SIMPL_BIND_GETTER(CLASS, PTR, PROP) std::bind(&CLASS::get##PROP, PTR)
 
 // Define overrides that can be used by the expansion of our main macro.
 // Each subclass can define a macro that takes up to nine (9) arguments
 // to the constructor. These macros support a minimum of 4 arguments.
 
-#define SIMPL_NEW_FP_9(Class, Desc, Prop, Category, Filter, Index, A, B, C, D)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index, A, B, C, D)
-
-#define SIMPL_NEW_FP_8(Class, Desc, Prop, Category, Filter, Index, A, B, C)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index, A, B, C)
-
-#define SIMPL_NEW_FP_7(Class, Desc, Prop, Category, Filter, Index, A, B)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index, A, B)
-
-#define SIMPL_NEW_FP_6(Class, Desc, Prop, Category, Filter, Index, A)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index, A)
-
-#define SIMPL_NEW_FP_5(Class, Desc, Prop, Category, Filter, Index)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index)
-
-#define SIMPL_NEW_FP_4(Class, Desc, Prop, Category, Filter)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_SETTER(Filter, this, Prop),\
-  SIMPL_BIND_GETTER(Filter, this, Prop))
-
-#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5(Class, Desc, Prop, Category, Filter, Index)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_GETTER(Filter, this, Prop),\
-  Index)
-
-#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4(Class, Desc, Prop, Category, Filter)\
-  Class::New(Desc, #Prop, get##Prop(), Category,\
-  SIMPL_BIND_GETTER(Filter, this, Prop))
+#define SIMPL_NEW_FP_9(Class, Desc, Prop, Category, Filter, Index, A, B, C, D)                                                                                                                         \
+  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C, D)
 
+#define SIMPL_NEW_FP_8(Class, Desc, Prop, Category, Filter, Index, A, B, C)                                                                                                                            \
+  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C)
+
+#define SIMPL_NEW_FP_7(Class, Desc, Prop, Category, Filter, Index, A, B)                                                                                                                               \
+  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B)
+
+#define SIMPL_NEW_FP_6(Class, Desc, Prop, Category, Filter, Index, A)                                                                                                                                  \
+  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A)
+
+#define SIMPL_NEW_FP_5(Class, Desc, Prop, Category, Filter, Index) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index)
+
+#define SIMPL_NEW_FP_4(Class, Desc, Prop, Category, Filter) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop))
+
+#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5(Class, Desc, Prop, Category, Filter, Index) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop), Index)
+
+#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4(Class, Desc, Prop, Category, Filter) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop))
 
 /**
  * @brief This macro is needed for Visual Studio due to differences of VAR_ARGS when
  * passed to another macro that results in a new macro that needs expansion.
  */
-#define SIMPL_EXPAND( x ) x
+#define SIMPL_EXPAND(x) x
 
 // -----------------------------------------------------------------------------
 // Define a macro that uses the "paired, sliding arg list"
 // technique to select the appropriate override.
 #define _FP_GET_OVERRIDE(A, B, C, D, E, F, G, H, I, NAME, ...) NAME
 #define _FP_GET_PREFLIGHTUPDATEDVALUE_OVERRIDE(A, B, C, D, E, NAME, ...) NAME
-
-
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index 2c6c03bd59..a8c4a2dfe9 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "FloatFilterParameter.h"
 
@@ -44,11 +44,8 @@ FloatFilterParameter::~FloatFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatFilterParameter::Pointer FloatFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                       float defaultValue, Category category, 
-                       const SetterCallbackType& setterCallback, 
-                       const GetterCallbackType& getterCallback, 
-                       int groupIndex)
+FloatFilterParameter::Pointer FloatFilterParameter::New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                        const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatFilterParameter::Pointer ptr = FloatFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 199f7063e6..4cef5de327 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,11 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_FLOAT_FP("Float 2", Float2, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_FLOAT_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (FloatFilterParameter, __VA_ARGS__))
-
+#define SIMPL_NEW_FLOAT_FP(...)                                                                                                                                                                        \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The FloatFilterParameter class is used by filters to instantiate an FloatWidget.  By instantiating an instance of
@@ -65,113 +62,112 @@
  */
 class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
 {
-  public:
-    using Self = FloatFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for FloatFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for FloatFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(float)>;
-    using GetterCallbackType = std::function<float(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the FloatFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~FloatFilterParameter() override;
-
-    /**
+public:
+  using Self = FloatFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for FloatFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for FloatFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(float)>;
+  using GetterCallbackType = std::function<float(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the FloatFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_FLOAT_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  ~FloatFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const FloatFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    FloatFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const FloatFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    FloatFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief FloatFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    FloatFilterParameter();
-
-  public:
-    FloatFilterParameter(const FloatFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    FloatFilterParameter(FloatFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    FloatFilterParameter& operator=(const FloatFilterParameter&) = delete; // Copy Assignment Not Implemented
-    FloatFilterParameter& operator=(FloatFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    FloatFilterParameter::SetterCallbackType m_SetterCallback = {};
-    FloatFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const FloatFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  FloatFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const FloatFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  FloatFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief FloatFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  FloatFilterParameter();
+
+public:
+  FloatFilterParameter(const FloatFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FloatFilterParameter(FloatFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  FloatFilterParameter& operator=(const FloatFilterParameter&) = delete; // Copy Assignment Not Implemented
+  FloatFilterParameter& operator=(FloatFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  FloatFilterParameter::SetterCallbackType m_SetterCallback = {};
+  FloatFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 1e7b0609bc..cce8ba95aa 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2016-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2016-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloatVec2FilterParameter.h"
 
@@ -100,7 +100,7 @@ void FloatVec2FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void FloatVec2FilterParameter::writeJson(QJsonObject& obj)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     FloatVec2Type floatVec2 = m_GetterCallback();
     QJsonObject json;
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 6cfae140d4..1616654a64 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -59,10 +59,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, GenericExample, 1);
  */
-#define SIMPL_NEW_FLOAT_VEC2_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (FloatVec2FilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_FLOAT_VEC2_FP(...)                                                                                                                                                                   \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatVec2FilterParameter, __VA_ARGS__))
 
 /**
  * @brief The FloatVec2FilterParameter class is used by filters to instantiate an FloatVec2Widget.  By instantiating an instance of
@@ -118,60 +116,60 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const FloatVec2FilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    FloatVec2FilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const FloatVec2FilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    FloatVec2FilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief FloatVec2FilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const FloatVec2FilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  FloatVec2FilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const FloatVec2FilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  FloatVec2FilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief FloatVec2FilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   FloatVec2FilterParameter();
 
 public:
-  FloatVec2FilterParameter(const FloatVec2FilterParameter&) = delete; // Copy Constructor Not Implemented
-  FloatVec2FilterParameter(FloatVec2FilterParameter&&) = delete;      // Move Constructor Not Implemented
+  FloatVec2FilterParameter(const FloatVec2FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FloatVec2FilterParameter(FloatVec2FilterParameter&&) = delete;                 // Move Constructor Not Implemented
   FloatVec2FilterParameter& operator=(const FloatVec2FilterParameter&) = delete; // Copy Assignment Not Implemented
   FloatVec2FilterParameter& operator=(FloatVec2FilterParameter&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index b3eb89d28a..8512f48211 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloatVec3FilterParameter.h"
 
@@ -103,7 +103,7 @@ void FloatVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void FloatVec3FilterParameter::writeJson(QJsonObject& obj)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     FloatVec3Type floatVec3 = m_GetterCallback();
     QJsonObject json;
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
old mode 100755
new mode 100644
index 45fa45bb41..3697aed53b
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -59,10 +59,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, GenericExample, 1);
  */
-#define SIMPL_NEW_FLOAT_VEC3_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (FloatVec3FilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_FLOAT_VEC3_FP(...)                                                                                                                                                                   \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatVec3FilterParameter, __VA_ARGS__))
 
 /**
  * @brief The FloatVec3FilterParameter class is used by filters to instantiate an FloatVec3Widget.  By instantiating an instance of
@@ -118,60 +116,60 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const FloatVec3FilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    FloatVec3FilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const FloatVec3FilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    FloatVec3FilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief FloatVec3FilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const FloatVec3FilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  FloatVec3FilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const FloatVec3FilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  FloatVec3FilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief FloatVec3FilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   FloatVec3FilterParameter();
 
 public:
-  FloatVec3FilterParameter(const FloatVec3FilterParameter&) = delete; // Copy Constructor Not Implemented
-  FloatVec3FilterParameter(FloatVec3FilterParameter&&) = delete;      // Move Constructor Not Implemented
+  FloatVec3FilterParameter(const FloatVec3FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FloatVec3FilterParameter(FloatVec3FilterParameter&&) = delete;                 // Move Constructor Not Implemented
   FloatVec3FilterParameter& operator=(const FloatVec3FilterParameter&) = delete; // Copy Assignment Not Implemented
   FloatVec3FilterParameter& operator=(FloatVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index b473e89584..40aea5e430 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FourthOrderPolynomialFilterParameter.h"
 
@@ -49,7 +49,8 @@ FourthOrderPolynomialFilterParameter::~FourthOrderPolynomialFilterParameter() =
 //
 // -----------------------------------------------------------------------------
 FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue,
-                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                        int groupIndex)
 {
 
   FourthOrderPolynomialFilterParameter::Pointer ptr = FourthOrderPolynomialFilterParameter::New();
@@ -98,7 +99,7 @@ void FourthOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void FourthOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     Float4thOrderPoly_t poly = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
old mode 100755
new mode 100644
index b2052e444e..82821ee911
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,39 +43,42 @@
 
 typedef struct
 {
-  float c40; float c04; 
-  float c31; float c13; 
-  float c22; 
-  float c30; float c03; 
-  float c21; float c12; float c20; float c02; 
-  float c11; float c10; float c01; float c00;
-  
-  void Float4thOrderPoly(float C40, float C04, 
-    float C31, float C13,
-    float C22,
-    float C30, float C03,
-    float C21, float C12, float C20, float C02,
-    float C11, float C10, float C01, float C00
-  )
+  float c40;
+  float c04;
+  float c31;
+  float c13;
+  float c22;
+  float c30;
+  float c03;
+  float c21;
+  float c12;
+  float c20;
+  float c02;
+  float c11;
+  float c10;
+  float c01;
+  float c00;
+
+  void Float4thOrderPoly(float C40, float C04, float C31, float C13, float C22, float C30, float C03, float C21, float C12, float C20, float C02, float C11, float C10, float C01, float C00)
   {
-  c40 = C40;
-  c04 = C04;
-  c31 = C31;
-  c13 = C13;
-  c22 = C22;
-  c30 = C30;
-  c03 = C03;
-  c21 = C21;
-  c12 = C12;
-  c20 = C20;
-  c02 = C02;
-  c11 = C11;
-  c10 = C10;
-  c01 = C01;
-  c00 = C00;
+    c40 = C40;
+    c04 = C04;
+    c31 = C31;
+    c13 = C13;
+    c22 = C22;
+    c30 = C30;
+    c03 = C03;
+    c21 = C21;
+    c12 = C12;
+    c20 = C20;
+    c02 = C02;
+    c11 = C11;
+    c10 = C10;
+    c01 = C01;
+    c00 = C00;
   }
-  
-  void writeJson(QJsonObject &json)
+
+  void writeJson(QJsonObject& json)
   {
     json["c40"] = static_cast<double>(c40);
     json["c04"] = static_cast<double>(c04);
@@ -94,12 +97,11 @@ typedef struct
     json["c00"] = static_cast<double>(c00);
   }
 
-  bool readJson(QJsonObject &json)
+  bool readJson(QJsonObject& json)
   {
-    if (json["c40"].isDouble() && json["c04"].isDouble() && json["c31"].isDouble() && json["c13"].isDouble()
-      && json["c22"].isDouble() && json["c30"].isDouble() && json["c03"].isDouble() && json["c21"].isDouble()
-      && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble()
-      && json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
+    if(json["c40"].isDouble() && json["c04"].isDouble() && json["c31"].isDouble() && json["c13"].isDouble() && json["c22"].isDouble() && json["c30"].isDouble() && json["c03"].isDouble() &&
+       json["c21"].isDouble() && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() &&
+       json["c00"].isDouble())
     {
       c40 = static_cast<float>(json["c40"].toDouble());
       c04 = static_cast<float>(json["c04"].toDouble());
@@ -136,10 +138,8 @@ Q_DECLARE_METATYPE(Float4thOrderPoly_t)
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_FourthO_POLY_FP("Fourth Order A Coefficients", FourthOrderACoeff, FilterParameter::Parameter, GenericExample, 2);
  */
-#define SIMPL_NEW_FourthO_POLY_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (FourthOrderPolynomialFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_FourthO_POLY_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FourthOrderPolynomialFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The FourthOrderPolynomialFilterParameter class is used by filters to instantiate an FourthOrderPolynomialWidget.  By instantiating an instance of
@@ -195,60 +195,60 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
+  QString getWidgetType() const override;
 
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
 
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const FourthOrderPolynomialFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    FourthOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const FourthOrderPolynomialFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  FourthOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
 
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const FourthOrderPolynomialFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    FourthOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const FourthOrderPolynomialFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  FourthOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
 
-  protected:
-    /**
-     * @brief FourthOrderPolynomialFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+protected:
+  /**
+   * @brief FourthOrderPolynomialFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   FourthOrderPolynomialFilterParameter();
 
 public:
-  FourthOrderPolynomialFilterParameter(const FourthOrderPolynomialFilterParameter&) = delete; // Copy Constructor Not Implemented
-  FourthOrderPolynomialFilterParameter(FourthOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  FourthOrderPolynomialFilterParameter(const FourthOrderPolynomialFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  FourthOrderPolynomialFilterParameter(FourthOrderPolynomialFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   FourthOrderPolynomialFilterParameter& operator=(const FourthOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   FourthOrderPolynomialFilterParameter& operator=(FourthOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -256,4 +256,3 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
   FourthOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
   FourthOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
index 676d53b53e..ac1a10ccbc 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "GenerateColorTableFilterParameter.h"
 
@@ -49,7 +49,7 @@ GenerateColorTableFilterParameter::~GenerateColorTableFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 GenerateColorTableFilterParameter::Pointer GenerateColorTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                    GenerateColorTable* filter, int groupIndex)
+                                                                                  GenerateColorTable* filter, int groupIndex)
 {
   GenerateColorTableFilterParameter::Pointer ptr = GenerateColorTableFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
old mode 100755
new mode 100644
index 666f156e6f..b99376f86f
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,85 +49,82 @@
  */
 class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
 {
-  public:
-    using Self = GenerateColorTableFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for GenerateColorTableFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for GenerateColorTableFilterParameter
-     */
-    static QString ClassName();
-
-    /**
-     * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param filter The corresponding filter that sets all its values into the DataContainerReaderWidget.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category, GenerateColorTable* filter,
-                       int groupIndex = -1);
-
-    ~GenerateColorTableFilterParameter() override;
-
-    /**
-     * @brief Setter property for Filter
-     */
-    void setFilter(GenerateColorTable* value);
-    /**
-     * @brief Getter property for Filter
-     * @return Value of Filter
-     */
-    GenerateColorTable* getFilter() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-  protected:
-    /**
-     * @brief GenerateColorTableFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    GenerateColorTableFilterParameter();
-
-  public:
-    GenerateColorTableFilterParameter(const GenerateColorTableFilterParameter&) = delete; // Copy Constructor Not Implemented
-    GenerateColorTableFilterParameter(GenerateColorTableFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    GenerateColorTableFilterParameter& operator=(const GenerateColorTableFilterParameter&) = delete; // Copy Assignment Not Implemented
-    GenerateColorTableFilterParameter& operator=(GenerateColorTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    GenerateColorTable* m_Filter = nullptr;
+public:
+  using Self = GenerateColorTableFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenerateColorTableFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenerateColorTableFilterParameter
+   */
+  static QString ClassName();
+
+  /**
+   * @brief New This function instantiates an instance of the DataContainerCreationFilterParameter.
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param filter The corresponding filter that sets all its values into the DataContainerReaderWidget.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GenerateColorTable* filter, int groupIndex = -1);
+
+  ~GenerateColorTableFilterParameter() override;
+
+  /**
+   * @brief Setter property for Filter
+   */
+  void setFilter(GenerateColorTable* value);
+  /**
+   * @brief Getter property for Filter
+   * @return Value of Filter
+   */
+  GenerateColorTable* getFilter() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+protected:
+  /**
+   * @brief GenerateColorTableFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  GenerateColorTableFilterParameter();
+
+public:
+  GenerateColorTableFilterParameter(const GenerateColorTableFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  GenerateColorTableFilterParameter(GenerateColorTableFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  GenerateColorTableFilterParameter& operator=(const GenerateColorTableFilterParameter&) = delete; // Copy Assignment Not Implemented
+  GenerateColorTableFilterParameter& operator=(GenerateColorTableFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  GenerateColorTable* m_Filter = nullptr;
 };
-
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h b/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
old mode 100755
new mode 100644
index ce149ca5db..1f8e9c8733
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
@@ -1,55 +1,51 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QString>
 
-
 namespace H5FilterParameter
 {
-  const QString ArrayNameConstant = "_ArrayName";
-  const QString CompOperatorConstant = "_CompOperator";
-  const QString CompValueConstant = "_CompValue";
-  const QString AngleConstant = "_Angle";
-  const QString ComparisonInput = "_ComparisonInput";
-  const QString AxisAngleInput = "_AxisAngleInput";
-  const QString HConstant = "_H";
-  const QString KConstant = "_K";
-  const QString LConstant = "_L";
-}
-
-
+const QString ArrayNameConstant = "_ArrayName";
+const QString CompOperatorConstant = "_CompOperator";
+const QString CompValueConstant = "_CompValue";
+const QString AngleConstant = "_Angle";
+const QString ComparisonInput = "_ComparisonInput";
+const QString AxisAngleInput = "_AxisAngleInput";
+const QString HConstant = "_H";
+const QString KConstant = "_K";
+const QString LConstant = "_L";
+} // namespace H5FilterParameter
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 66562a06f4..78f0d3cb3f 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5FilterParametersReader.h"
 
@@ -367,7 +367,7 @@ QString H5FilterParametersReader::readString(const QString& name, QString value)
     return value;
   }
 
-    return defaultStr;
+  return defaultStr;
 }
 
 // -----------------------------------------------------------------------------
@@ -511,7 +511,6 @@ bool H5FilterParametersReader::readValue(const QString& name, bool value)
   return value;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -536,7 +535,7 @@ QVector<int8_t> H5FilterParametersReader::readArray(const QString& name, QVector
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -561,7 +560,7 @@ QVector<int16_t> H5FilterParametersReader::readArray(const QString& name, QVecto
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -586,7 +585,7 @@ QVector<int32_t> H5FilterParametersReader::readArray(const QString& name, QVecto
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -612,7 +611,7 @@ QVector<int64_t> H5FilterParametersReader::readArray(const QString& name, QVecto
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -637,7 +636,7 @@ QVector<uint8_t> H5FilterParametersReader::readArray(const QString& name, QVecto
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -662,7 +661,7 @@ QVector<uint16_t> H5FilterParametersReader::readArray(const QString& name, QVect
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -687,7 +686,7 @@ QVector<uint32_t> H5FilterParametersReader::readArray(const QString& name, QVect
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -712,7 +711,7 @@ QVector<uint64_t> H5FilterParametersReader::readArray(const QString& name, QVect
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -737,7 +736,7 @@ QVector<float> H5FilterParametersReader::readArray(const QString& name, QVector<
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -762,7 +761,7 @@ QVector<double> H5FilterParametersReader::readArray(const QString& name, QVector
     return value;
   }
 
-    value.clear();
+  value.clear();
 
   for(int i = 0; i < vectorSize; i++)
   {
@@ -986,38 +985,38 @@ ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString& n
 // -----------------------------------------------------------------------------
 ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced defValue)
 {
-    /*
-    int size = 0;
-    QString strData = "";
-    bool ok = false;
-    // See if the data set actually exists, if it does NOT just return what the user passed in as a default value
-    if(false == QH5Lite::datasetExists(m_CurrentGroupId, name))
-    {
-      return defValue;
-    }
+  /*
+  int size = 0;
+  QString strData = "";
+  bool ok = false;
+  // See if the data set actually exists, if it does NOT just return what the user passed in as a default value
+  if(false == QH5Lite::datasetExists(m_CurrentGroupId, name))
+  {
+    return defValue;
+  }
 
-    herr_t err = QH5Lite::readStringDataset(m_CurrentGroupId, name, strData);
-    if(err < 0)
-    {
-      return defValue; // If the data set does not exist no point in going any further
-    }
+  herr_t err = QH5Lite::readStringDataset(m_CurrentGroupId, name, strData);
+  if(err < 0)
+  {
+    return defValue; // If the data set does not exist no point in going any further
+  }
 
-    // Now read the the attribute that says how many arrays are in the data set.
-    err = QH5Lite::readScalarAttribute(m_CurrentGroupId, name, "NumInputs", size);
+  // Now read the the attribute that says how many arrays are in the data set.
+  err = QH5Lite::readScalarAttribute(m_CurrentGroupId, name, "NumInputs", size);
 
-    QStringList strVector = strData.split('\n', QString::SkipEmptyParts);
-    qint32 strVecSize = strVector.size();
-    if(strVecSize != size)
-    {
-      // Something has gone wrong in the tokenization and the number of tokens does not match what
-      // was written to the HDF5 file.
-      return defValue;
-    }
-    */
+  QStringList strVector = strData.split('\n', QString::SkipEmptyParts);
+  qint32 strVecSize = strVector.size();
+  if(strVecSize != size)
+  {
+    // Something has gone wrong in the tokenization and the number of tokens does not match what
+    // was written to the HDF5 file.
+    return defValue;
+  }
+  */
 
-    ComparisonInputsAdvanced inputs;
+  ComparisonInputsAdvanced inputs;
 
-    return inputs;
+  return inputs;
 }
 
 // -----------------------------------------------------------------------------
@@ -1174,7 +1173,7 @@ DataArrayPath H5FilterParametersReader::readDataArrayPath(const QString& name, D
     return path;
   }
 
-    return def;
+  return def;
 }
 
 // -----------------------------------------------------------------------------
@@ -1230,7 +1229,7 @@ DynamicTableData H5FilterParametersReader::readDynamicTableData(const QString& n
     return tableData;
   }
 
-    return def;
+  return def;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index ca63d51760..3060a91840 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,141 +53,139 @@
  */
 class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersReader
 {
-  public:
-    using Self = H5FilterParametersReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for H5FilterParametersReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5FilterParametersReader
-     */
-    static QString ClassName();
-
-    ~H5FilterParametersReader() override;
-
-    /**
-     * @brief OpenDREAM3DFile This will open the HDF5 based DREAM3D file and open the proper HDF5 internal
-     * group that is associated with the pipeline storage
-     * @param filepath
-     * @param fid The HDF5 file Id that represents the open HDF5 file
-     * @return Return a pointer to a newly instantiated instance of this class. A Null Pointer will be returned if
-     * the file can not be opened or the group is missing.
-     */
-    static Pointer OpenDREAM3DFileForReadingPipeline(QString filePath, hid_t& fid);
-
-    /**
-     * @brief Setter property for PipelineGroupId
-     */
-    void setPipelineGroupId(const hid_t& value);
-    /**
-     * @brief Getter property for PipelineGroupId
-     * @return Value of PipelineGroupId
-     */
-    hid_t getPipelineGroupId() const;
-
-    hid_t getCurrentGroupId() const;
-
-    int openFilterGroup(AbstractFilter* filter, int index) override;
-    int closeFilterGroup() override;
-
-    /**
-     * @brief ReadPipelineFromFile
-     * @param filePath
-     * @return
-     */
-    FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
-
-    /**
-     * @brief readPipelineFromFile
-     * @param fid
-     * @param obs
-     * @return
-     */
-    FilterPipeline::Pointer readPipelineFromFile(hid_t fid, IObserver* obs = nullptr);
-
-    /**
-     * @brief getJsonFromFile
-     * @param filePath
-     * @param obs
-     * @return
-     */
-    QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
-
-    QString readString(const QString& name, QString value) override;
-    QVector<QString> readStrings(const QString& name, QVector<QString> value) override;
-    QStringList readStringList(const QString& name, QStringList value) override;
-
-    int8_t readValue(const QString& name, int8_t value) override;
-    int16_t readValue(const QString& name, int16_t value) override;
-    int32_t readValue(const QString& name, int32_t value) override;
-    int64_t readValue(const QString& name, int64_t value) override;
-    uint8_t readValue(const QString& name, uint8_t value) override;
-    uint16_t readValue(const QString& name, uint16_t value) override;
-    uint32_t readValue(const QString& name, uint32_t value) override;
-    uint64_t readValue(const QString& name, uint64_t value) override;
-    float readValue(const QString& name, float value) override;
-    double readValue(const QString& name, double value) override;
-    bool readValue(const QString& name, bool value) override;
-    AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value) override;
-
-    QVector<int8_t> readArray(const QString& name, QVector<int8_t> value) override;
-    QVector<int16_t> readArray(const QString& name, QVector<int16_t> value) override;
-    QVector<int32_t> readArray(const QString& name, QVector<int32_t> value) override;
-    QVector<int64_t> readArray(const QString& name, QVector<int64_t> value) override;
-    QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value) override;
-    QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value) override;
-    QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value) override;
-    QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value) override;
-    QVector<float> readArray(const QString& name, QVector<float> value) override;
-    QVector<double> readArray(const QString& name, QVector<double> value) override;
-
-    IntVec3Type readIntVec3(const QString& name, IntVec3Type v) override;
-    FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v) override;
-
-    Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v) override;
-    Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v) override;
-    Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v) override;
-    StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v) override;
-    ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos) override;
-    ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v) override;
-    ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v) override;
-    AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos) override;
-    QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> defValue) override;
-    QSet<QString> readArraySelections(const QString& name, QSet<QString> v) override;
-
-    DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v) override;
-    DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v) override;
-    QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> def) override;
-    DynamicTableData readDynamicTableData(const QString& name, DynamicTableData def) override;
-
-    FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v) override;
-
-  protected:
-    H5FilterParametersReader();
-
-  private:
-    hid_t m_PipelineGroupId = {};
-
-    hid_t m_CurrentGroupId = -1;
-    QJsonObject m_PipelineRoot;
-    QJsonObject m_CurrentFilterObject;
-    int m_Version = -1;
-    int m_CurrentIndex = -1;
-
-  public:
-    H5FilterParametersReader(const H5FilterParametersReader&) = delete;            // Copy Constructor Not Implemented
-    H5FilterParametersReader(H5FilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
-    H5FilterParametersReader& operator=(const H5FilterParametersReader&) = delete; // Copy Assignment Not Implemented
-    H5FilterParametersReader& operator=(H5FilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = H5FilterParametersReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for H5FilterParametersReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5FilterParametersReader
+   */
+  static QString ClassName();
+
+  ~H5FilterParametersReader() override;
+
+  /**
+   * @brief OpenDREAM3DFile This will open the HDF5 based DREAM3D file and open the proper HDF5 internal
+   * group that is associated with the pipeline storage
+   * @param filepath
+   * @param fid The HDF5 file Id that represents the open HDF5 file
+   * @return Return a pointer to a newly instantiated instance of this class. A Null Pointer will be returned if
+   * the file can not be opened or the group is missing.
+   */
+  static Pointer OpenDREAM3DFileForReadingPipeline(QString filePath, hid_t& fid);
+
+  /**
+   * @brief Setter property for PipelineGroupId
+   */
+  void setPipelineGroupId(const hid_t& value);
+  /**
+   * @brief Getter property for PipelineGroupId
+   * @return Value of PipelineGroupId
+   */
+  hid_t getPipelineGroupId() const;
+
+  hid_t getCurrentGroupId() const;
+
+  int openFilterGroup(AbstractFilter* filter, int index) override;
+  int closeFilterGroup() override;
+
+  /**
+   * @brief ReadPipelineFromFile
+   * @param filePath
+   * @return
+   */
+  FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
+
+  /**
+   * @brief readPipelineFromFile
+   * @param fid
+   * @param obs
+   * @return
+   */
+  FilterPipeline::Pointer readPipelineFromFile(hid_t fid, IObserver* obs = nullptr);
+
+  /**
+   * @brief getJsonFromFile
+   * @param filePath
+   * @param obs
+   * @return
+   */
+  QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
+
+  QString readString(const QString& name, QString value) override;
+  QVector<QString> readStrings(const QString& name, QVector<QString> value) override;
+  QStringList readStringList(const QString& name, QStringList value) override;
+
+  int8_t readValue(const QString& name, int8_t value) override;
+  int16_t readValue(const QString& name, int16_t value) override;
+  int32_t readValue(const QString& name, int32_t value) override;
+  int64_t readValue(const QString& name, int64_t value) override;
+  uint8_t readValue(const QString& name, uint8_t value) override;
+  uint16_t readValue(const QString& name, uint16_t value) override;
+  uint32_t readValue(const QString& name, uint32_t value) override;
+  uint64_t readValue(const QString& name, uint64_t value) override;
+  float readValue(const QString& name, float value) override;
+  double readValue(const QString& name, double value) override;
+  bool readValue(const QString& name, bool value) override;
+  AttributeMatrix::Type readValue(const QString& name, AttributeMatrix::Type value) override;
+
+  QVector<int8_t> readArray(const QString& name, QVector<int8_t> value) override;
+  QVector<int16_t> readArray(const QString& name, QVector<int16_t> value) override;
+  QVector<int32_t> readArray(const QString& name, QVector<int32_t> value) override;
+  QVector<int64_t> readArray(const QString& name, QVector<int64_t> value) override;
+  QVector<uint8_t> readArray(const QString& name, QVector<uint8_t> value) override;
+  QVector<uint16_t> readArray(const QString& name, QVector<uint16_t> value) override;
+  QVector<uint32_t> readArray(const QString& name, QVector<uint32_t> value) override;
+  QVector<uint64_t> readArray(const QString& name, QVector<uint64_t> value) override;
+  QVector<float> readArray(const QString& name, QVector<float> value) override;
+  QVector<double> readArray(const QString& name, QVector<double> value) override;
+
+  IntVec3Type readIntVec3(const QString& name, IntVec3Type v) override;
+  FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v) override;
+
+  Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v) override;
+  Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v) override;
+  Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v) override;
+  StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v) override;
+  ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos) override;
+  ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v) override;
+  ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v) override;
+  AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos) override;
+  QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> defValue) override;
+  QSet<QString> readArraySelections(const QString& name, QSet<QString> v) override;
+
+  DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v) override;
+  DataArrayPath readDataArrayPath(const QString& name, DataArrayPath v) override;
+  QVector<DataArrayPath> readDataArrayPathVector(const QString& name, QVector<DataArrayPath> def) override;
+  DynamicTableData readDynamicTableData(const QString& name, DynamicTableData def) override;
+
+  FPRangePair readPairOfDoubles(const QString& name, const FPRangePair& v) override;
+
+protected:
+  H5FilterParametersReader();
+
+private:
+  hid_t m_PipelineGroupId = {};
+
+  hid_t m_CurrentGroupId = -1;
+  QJsonObject m_PipelineRoot;
+  QJsonObject m_CurrentFilterObject;
+  int m_Version = -1;
+  int m_CurrentIndex = -1;
+
+public:
+  H5FilterParametersReader(const H5FilterParametersReader&) = delete;            // Copy Constructor Not Implemented
+  H5FilterParametersReader(H5FilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
+  H5FilterParametersReader& operator=(const H5FilterParametersReader&) = delete; // Copy Assignment Not Implemented
+  H5FilterParametersReader& operator=(H5FilterParametersReader&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 9a65002c2a..2e9fa662db 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5FilterParametersWriter.h"
 
@@ -81,9 +81,9 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
     {
       GenericErrorMessage::Pointer pm = GenericErrorMessage::New(QObject::tr("%1: %2").arg(JsonFilterParametersWriter::ClassName()).arg("FilterPipeline Object was nullptr for writing"), -1);
 
-      for (int i = 0; i < obs.size(); i++)
+      for(int i = 0; i < obs.size(); i++)
       {
-        if (obs[i] != nullptr)
+        if(obs[i] != nullptr)
         {
           obs[i]->processPipelineMessage(pm);
         }
@@ -112,9 +112,9 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
       PipelineErrorMessage::Pointer pm =
           PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(JsonFilterParametersWriter::ClassName()).arg("Output .dream3d file could not be created."), -1);
 
-      for (int i = 0; i < obs.size(); i++)
+      for(int i = 0; i < obs.size(); i++)
       {
-        if (obs[i] != nullptr)
+        if(obs[i] != nullptr)
         {
           obs[i]->processPipelineMessage(pm);
         }
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index b9a954aa84..a3c54e2ac4 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -52,129 +52,127 @@
  */
 class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersWriter
 {
-  public:
-    using Self = H5FilterParametersWriter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for H5FilterParametersWriter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5FilterParametersWriter
-     */
-    static QString ClassName();
-
-    /**
-     * @brief WritePipelineToFile This function will write a pipeline to an HDF5 based
-     * DREAM3D file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
-     * function <b>WITHOUT WARNING</b>
-     * @param pipeline The pipeline to be written
-     * @param filePath The file path to write
-     * @param name The name of the pipeline (Typically the nameo of the file)
-     * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
-     * @return
-     */
-    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) override;
-
-    /**
-     * @brief Setter property for PipelineGroupId
-     */
-    void setPipelineGroupId(const hid_t& value);
-    /**
-     * @brief Getter property for PipelineGroupId
-     * @return Value of PipelineGroupId
-     */
-    hid_t getPipelineGroupId() const;
-
-    ~H5FilterParametersWriter() override;
-
-    /**
-     * @brief Setter property for GroupId
-     */
-    void setGroupId(const hid_t& value);
-    /**
-     * @brief Getter property for GroupId
-     * @return Value of GroupId
-     */
-    hid_t getGroupId() const;
-
-    hid_t getCurrentGroupId() const;
-
-    int openFilterGroup(AbstractFilter* filter, int index) override;
-    int closeFilterGroup() override;
-
-    int writeValue(const QString& name, const QString& value) override;
-    int writeValue(const QString& name, const QVector<QString>& value) override;
-    int writeValue(const QString& name, const QStringList& value) override;
-
-    int writeValue(const QString& name, int8_t value) override;
-    int writeValue(const QString& name, int16_t value) override;
-    int writeValue(const QString& name, int32_t value) override;
-    int writeValue(const QString& name, int64_t value) override;
-    int writeValue(const QString& name, uint8_t value) override;
-    int writeValue(const QString& name, uint16_t value) override;
-    int writeValue(const QString& name, uint32_t value) override;
-    int writeValue(const QString& name, uint64_t value) override;
-    int writeValue(const QString& name, float value) override;
-    int writeValue(const QString& name, double value) override;
-
-    int writeValue(const QString& name, QVector<int8_t> value) override;
-    int writeValue(const QString& name, QVector<int16_t> value) override;
-    int writeValue(const QString& name, QVector<int32_t> value) override;
-    int writeValue(const QString& name, QVector<int64_t> value) override;
-    int writeValue(const QString& name, QVector<uint8_t> value) override;
-    int writeValue(const QString& name, QVector<uint16_t> value) override;
-    int writeValue(const QString& name, QVector<uint32_t> value) override;
-    int writeValue(const QString& name, QVector<uint64_t> value) override;
-    int writeValue(const QString& name, QVector<float> value) override;
-    int writeValue(const QString& name, QVector<double> value) override;
-
-    int writeValue(const QString& name, IntVec3Type v) override;
-    int writeValue(const QString& name, FloatVec3Type v) override;
-
-    int writeValue(const QString& name, Float2ndOrderPoly_t v) override;
-    int writeValue(const QString& name, Float3rdOrderPoly_t v) override;
-    int writeValue(const QString& name, Float4thOrderPoly_t v) override;
-    int writeValue(const QString& name, StackFileListInfo v) override;
-
-    int writeValue(const QString& name, ComparisonInput_t v) override;
-    int writeValue(const QString& name, ComparisonInputs v) override;
-
-    int writeValue(const QString& name, AxisAngleInput_t v) override;
-    int writeValue(const QString& name, QVector<AxisAngleInput_t> v) override;
-
-    int writeArraySelections(const QString& name, QSet<QString> v) override;
-    int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy) override;
-    int writeValue(const QString& name, const DataArrayPath& v) override;
-    int writeValue(const QString& name, const QVector<DataArrayPath>& paths) override;
-
-    int writeValue(const QString& name, const DynamicTableData& v) override;
-
-    int writeValue(const QString& name, const QPair<double, double>& v) override;
-
-  protected:
-    H5FilterParametersWriter();
-
-    int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
-
-  private:
-    hid_t m_PipelineGroupId = {};
-    hid_t m_GroupId = {};
-
-    hid_t m_CurrentGroupId = -1;
-
-  public:
-    H5FilterParametersWriter(const H5FilterParametersWriter&) = delete; // Copy Constructor Not Implemented
-    H5FilterParametersWriter(H5FilterParametersWriter&&) = delete;      // Move Constructor Not Implemented
-    H5FilterParametersWriter& operator=(const H5FilterParametersWriter&) = delete; // Copy Assignment Not Implemented
-    H5FilterParametersWriter& operator=(H5FilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = H5FilterParametersWriter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for H5FilterParametersWriter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5FilterParametersWriter
+   */
+  static QString ClassName();
+
+  /**
+   * @brief WritePipelineToFile This function will write a pipeline to an HDF5 based
+   * DREAM3D file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
+   * function <b>WITHOUT WARNING</b>
+   * @param pipeline The pipeline to be written
+   * @param filePath The file path to write
+   * @param name The name of the pipeline (Typically the nameo of the file)
+   * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+   * @return
+   */
+  int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>()) override;
+
+  /**
+   * @brief Setter property for PipelineGroupId
+   */
+  void setPipelineGroupId(const hid_t& value);
+  /**
+   * @brief Getter property for PipelineGroupId
+   * @return Value of PipelineGroupId
+   */
+  hid_t getPipelineGroupId() const;
+
+  ~H5FilterParametersWriter() override;
+
+  /**
+   * @brief Setter property for GroupId
+   */
+  void setGroupId(const hid_t& value);
+  /**
+   * @brief Getter property for GroupId
+   * @return Value of GroupId
+   */
+  hid_t getGroupId() const;
+
+  hid_t getCurrentGroupId() const;
+
+  int openFilterGroup(AbstractFilter* filter, int index) override;
+  int closeFilterGroup() override;
+
+  int writeValue(const QString& name, const QString& value) override;
+  int writeValue(const QString& name, const QVector<QString>& value) override;
+  int writeValue(const QString& name, const QStringList& value) override;
+
+  int writeValue(const QString& name, int8_t value) override;
+  int writeValue(const QString& name, int16_t value) override;
+  int writeValue(const QString& name, int32_t value) override;
+  int writeValue(const QString& name, int64_t value) override;
+  int writeValue(const QString& name, uint8_t value) override;
+  int writeValue(const QString& name, uint16_t value) override;
+  int writeValue(const QString& name, uint32_t value) override;
+  int writeValue(const QString& name, uint64_t value) override;
+  int writeValue(const QString& name, float value) override;
+  int writeValue(const QString& name, double value) override;
+
+  int writeValue(const QString& name, QVector<int8_t> value) override;
+  int writeValue(const QString& name, QVector<int16_t> value) override;
+  int writeValue(const QString& name, QVector<int32_t> value) override;
+  int writeValue(const QString& name, QVector<int64_t> value) override;
+  int writeValue(const QString& name, QVector<uint8_t> value) override;
+  int writeValue(const QString& name, QVector<uint16_t> value) override;
+  int writeValue(const QString& name, QVector<uint32_t> value) override;
+  int writeValue(const QString& name, QVector<uint64_t> value) override;
+  int writeValue(const QString& name, QVector<float> value) override;
+  int writeValue(const QString& name, QVector<double> value) override;
+
+  int writeValue(const QString& name, IntVec3Type v) override;
+  int writeValue(const QString& name, FloatVec3Type v) override;
+
+  int writeValue(const QString& name, Float2ndOrderPoly_t v) override;
+  int writeValue(const QString& name, Float3rdOrderPoly_t v) override;
+  int writeValue(const QString& name, Float4thOrderPoly_t v) override;
+  int writeValue(const QString& name, StackFileListInfo v) override;
+
+  int writeValue(const QString& name, ComparisonInput_t v) override;
+  int writeValue(const QString& name, ComparisonInputs v) override;
+
+  int writeValue(const QString& name, AxisAngleInput_t v) override;
+  int writeValue(const QString& name, QVector<AxisAngleInput_t> v) override;
+
+  int writeArraySelections(const QString& name, QSet<QString> v) override;
+  int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy) override;
+  int writeValue(const QString& name, const DataArrayPath& v) override;
+  int writeValue(const QString& name, const QVector<DataArrayPath>& paths) override;
+
+  int writeValue(const QString& name, const DynamicTableData& v) override;
+
+  int writeValue(const QString& name, const QPair<double, double>& v) override;
+
+protected:
+  H5FilterParametersWriter();
+
+  int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
+
+private:
+  hid_t m_PipelineGroupId = {};
+  hid_t m_GroupId = {};
+
+  hid_t m_CurrentGroupId = -1;
+
+public:
+  H5FilterParametersWriter(const H5FilterParametersWriter&) = delete;            // Copy Constructor Not Implemented
+  H5FilterParametersWriter(H5FilterParametersWriter&&) = delete;                 // Move Constructor Not Implemented
+  H5FilterParametersWriter& operator=(const H5FilterParametersWriter&) = delete; // Copy Assignment Not Implemented
+  H5FilterParametersWriter& operator=(H5FilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index dc4a1b8727..cf7171bee0 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -97,8 +97,8 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
   ImportHDF5DatasetFilterParameter();
 
 public:
-  ImportHDF5DatasetFilterParameter(const ImportHDF5DatasetFilterParameter&) = delete; // Copy Constructor Not Implemented
-  ImportHDF5DatasetFilterParameter(ImportHDF5DatasetFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  ImportHDF5DatasetFilterParameter(const ImportHDF5DatasetFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ImportHDF5DatasetFilterParameter(ImportHDF5DatasetFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   ImportHDF5DatasetFilterParameter& operator=(const ImportHDF5DatasetFilterParameter&) = delete; // Copy Assignment Not Implemented
   ImportHDF5DatasetFilterParameter& operator=(ImportHDF5DatasetFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index 7f0b040b66..db60643dbb 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "InputFileFilterParameter.h"
 
@@ -53,8 +53,8 @@ InputFileFilterParameter::~InputFileFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 InputFileFilterParameter::Pointer InputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
-                                                                int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                const QString& fileType, int groupIndex)
 {
   InputFileFilterParameter::Pointer ptr = InputFileFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
old mode 100755
new mode 100644
index 3fd4007428..a5b5e199ee
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
  * SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, GenericExample, "*.txt", "", 1);
  */
-#define SIMPL_NEW_INPUT_FILE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (InputFileFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_INPUT_FILE_FP(...)                                                                                                                                                                   \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(InputFileFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The InputFileFilterParameter class is used by filters to instantiate an InputFileWidget.  By instantiating an instance of
@@ -186,8 +184,8 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
   InputFileFilterParameter();
 
 public:
-  InputFileFilterParameter(const InputFileFilterParameter&) = delete; // Copy Constructor Not Implemented
-  InputFileFilterParameter(InputFileFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  InputFileFilterParameter(const InputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  InputFileFilterParameter(InputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   InputFileFilterParameter& operator=(const InputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
   InputFileFilterParameter& operator=(InputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -197,4 +195,3 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
   InputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
   InputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index e5e6e55421..680bdabf4b 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "InputPathFilterParameter.h"
 
@@ -49,8 +49,8 @@ InputPathFilterParameter::~InputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 InputPathFilterParameter::Pointer InputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
-                                                                int groupIndex)
+                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                const QString& fileType, int groupIndex)
 {
   InputPathFilterParameter::Pointer ptr = InputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
old mode 100755
new mode 100644
index a96e2cb78f..fff5dba7cc
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
  * SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Parameter, GenericExample, "*.txt", "", 2);
  */
-#define SIMPL_NEW_INPUT_PATH_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (InputPathFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_INPUT_PATH_FP(...)                                                                                                                                                                   \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(InputPathFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The InputPathFilterParameter class is used by filters to instantiate an InputPathWidget.  By instantiating an instance of
@@ -186,8 +184,8 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   InputPathFilterParameter();
 
 public:
-  InputPathFilterParameter(const InputPathFilterParameter&) = delete; // Copy Constructor Not Implemented
-  InputPathFilterParameter(InputPathFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  InputPathFilterParameter(const InputPathFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  InputPathFilterParameter(InputPathFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   InputPathFilterParameter& operator=(const InputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   InputPathFilterParameter& operator=(InputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -197,4 +195,3 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   InputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
   InputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index a10504c36f..1431cb1088 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IntFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
old mode 100755
new mode 100644
index a68c6b1824..8017fc08d7
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
  */
-#define SIMPL_NEW_INTEGER_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (IntFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_INTEGER_FP(...)                                                                                                                                                                      \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The IntFilterParameter class is used by filters to instantiate an IntWidget.  By instantiating an instance of
@@ -64,113 +62,112 @@
  */
 class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
 {
-  public:
-    using Self = IntFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for IntFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for IntFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(int)>;
-    using GetterCallbackType = std::function<int(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the IntFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~IntFilterParameter() override;
-
-    /**
+public:
+  using Self = IntFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for IntFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IntFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(int)>;
+  using GetterCallbackType = std::function<int(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the IntFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     int groupIndex = -1);
+
+  ~IntFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const IntFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    IntFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const IntFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    IntFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief IntFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    IntFilterParameter();
-
-  public:
-    IntFilterParameter(const IntFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    IntFilterParameter(IntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    IntFilterParameter& operator=(const IntFilterParameter&) = delete; // Copy Assignment Not Implemented
-    IntFilterParameter& operator=(IntFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    IntFilterParameter::SetterCallbackType m_SetterCallback = {};
-    IntFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const IntFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  IntFilterParameter::SetterCallbackType getSetterCallback() const;
 
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const IntFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  IntFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief IntFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  IntFilterParameter();
+
+public:
+  IntFilterParameter(const IntFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  IntFilterParameter(IntFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  IntFilterParameter& operator=(const IntFilterParameter&) = delete; // Copy Assignment Not Implemented
+  IntFilterParameter& operator=(IntFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  IntFilterParameter::SetterCallbackType m_SetterCallback = {};
+  IntFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index 3c6f901ab1..4e346cb2c3 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IntVec3FilterParameter.h"
 
@@ -103,7 +103,7 @@ void IntVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void IntVec3FilterParameter::writeJson(QJsonObject& obj)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     IntVec3Type intVec3 = m_GetterCallback();
     QJsonObject json;
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
old mode 100755
new mode 100644
index 13a0d40fb1..844a657ad0
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,10 +56,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
  * SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_INT_VEC3_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (IntVec3FilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_INT_VEC3_FP(...)                                                                                                                                                                     \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntVec3FilterParameter, __VA_ARGS__))
 
 /**
  * @brief The IntVec3FilterParameter class is used by filters to instantiate an IntVec3Widget.  By instantiating an instance of
@@ -115,60 +113,60 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const IntVec3FilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    IntVec3FilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const IntVec3FilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    IntVec3FilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief IntVec3FilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const IntVec3FilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  IntVec3FilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const IntVec3FilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  IntVec3FilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief IntVec3FilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   IntVec3FilterParameter();
 
 public:
-  IntVec3FilterParameter(const IntVec3FilterParameter&) = delete; // Copy Constructor Not Implemented
-  IntVec3FilterParameter(IntVec3FilterParameter&&) = delete;      // Move Constructor Not Implemented
+  IntVec3FilterParameter(const IntVec3FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  IntVec3FilterParameter(IntVec3FilterParameter&&) = delete;                 // Move Constructor Not Implemented
   IntVec3FilterParameter& operator=(const IntVec3FilterParameter&) = delete; // Copy Assignment Not Implemented
   IntVec3FilterParameter& operator=(IntVec3FilterParameter&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index c0cdfe590a..9b66a6af9f 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -51,160 +51,158 @@
  */
 class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParametersReader
 {
-  public:
-    using Self = JsonFilterParametersReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for JsonFilterParametersReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for JsonFilterParametersReader
-     */
-    static QString ClassName();
-
-    ~JsonFilterParametersReader() override;
-
-    /**
-     * @brief Setter property for FileName
-     */
-    void setFileName(const QString& value);
-    /**
-     * @brief Getter property for FileName
-     * @return Value of FileName
-     */
-    QString getFileName() const;
-
-    /**
-     * @brief Setter property for MaxFilterIndex
-     */
-    void setMaxFilterIndex(int value);
-    /**
-     * @brief Getter property for MaxFilterIndex
-     * @return Value of MaxFilterIndex
-     */
-    int getMaxFilterIndex() const;
-
-    /**
-     * @brief ReadPipelineFromFile Reads the Json formatted file and returns a FilterPipeline object
-     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-     * If the IObserver is NON-Null then an error message will be passed to it with an error message
-     * @param filePath The path to the INI formatted file
-     * @param format The format of the file which is anything that QSettings understands
-     * @param obs An IObserver object to report errors.
-     * @return Shared Pointer to a FilterPipeline Instance
-     */
-    FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
-
-    /**
-     * @brief getJsonFromFile Reads the Json formatted file and returns a json string
-     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-     * If the IObserver is NON-Null then an error message will be passed to it with an error message
-     * @param filePath The path to the INI formatted file
-     * @param format The format of the file which is anything that QSettings understands
-     * @param obs An IObserver object to report errors.
-     * @return Shared Pointer to a FilterPipeline Instance
-     */
-    QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
-
-    /**
-     * @brief ReadPipelineFromString Reads the Json formatted file and returns a FilterPipeline object
-     * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
-     * If the IObserver is NON-Null then an error message will be passed to it with an error message
-     * @param filePath The path to the INI formatted file
-     * @param format The format of the file which is anything that QSettings understands
-     * @param obs An IObserver object to report errors.
-     * @return Shared Pointer to a FilterPipeline Instance
-     */
-    FilterPipeline::Pointer readPipelineFromString(QString contents, IObserver* obs = nullptr);
-
-    /**
-     * @brief Gets the name of the pipeline from a pipeline file
-     * @param filePath The absolute path to the pipeline file.
-     * @param name Sets the name of the pipeline into this variable
-     * @param version Sets the DREAM3D Version into this variable.
-     * @param obs Any observer that needs to know about errors.
-     * @return
-     */
-    void readNameOfPipelineFromFile(QString filePath, QString& name, QString& version, IObserver* obs = nullptr);
-
-    /**
-     * @brief Generate an html formatted string that summarizes the pipeline file by listing
-     * each filter by it's human name and C++ class name.
-     * @param filePath The path to the pipeline file
-     * @param obs Any observer that needs to know about errors.
-     * @return html formatted string
-     */
-    static QString HtmlSummaryFromFile(QString filePath, IObserver* obs);
-
-    /**
-     * @brief Opens the pipeline file for operations
-     * @param filePath The path to the pipeline file
-     * @return
-     */
-    QJsonParseError openFile(QString filePath);
-
-    /**
-     * @brief setPipelineContents
-     * @param contents
-     * @return
-     */
-    int setPipelineContents(QString contents);
-
-    /**
-     * @brief closeFile
-     */
-    void closeFile();
-
-    /**
-     * @brief openFilterGroup
-     * @param unused
-     * @param index
-     * @return
-     */
-    int openFilterGroup(AbstractFilter* unused, int index) override;
-
-    /**
-     * @brief closeFilterGroup
-     * @return
-     */
-    int closeFilterGroup() override;
-
-    /*
-     * @brief getCurrentGroupObject
-     * @return
-     */
-    QJsonObject& getCurrentGroupObject();
-
-    bool containsGroup(QString key);
-
-    int openGroup(QString key);
-    int closeGroup();
-
-  protected:
-    JsonFilterParametersReader();
-
-  private:
-    QString m_FileName = {};
-    int m_MaxFilterIndex = {};
-
-    QJsonObject m_Root;
-    QJsonObject m_CurrentFilterIndex;
-
-    FilterPipeline::Pointer readPipeline(IObserver* obs);
-
-  public:
-    JsonFilterParametersReader(const JsonFilterParametersReader&) = delete;            // Copy Constructor Not Implemented
-    JsonFilterParametersReader(JsonFilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
-    JsonFilterParametersReader& operator=(const JsonFilterParametersReader&) = delete; // Copy Assignment Not Implemented
-    JsonFilterParametersReader& operator=(JsonFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = JsonFilterParametersReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for JsonFilterParametersReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for JsonFilterParametersReader
+   */
+  static QString ClassName();
+
+  ~JsonFilterParametersReader() override;
+
+  /**
+   * @brief Setter property for FileName
+   */
+  void setFileName(const QString& value);
+  /**
+   * @brief Getter property for FileName
+   * @return Value of FileName
+   */
+  QString getFileName() const;
+
+  /**
+   * @brief Setter property for MaxFilterIndex
+   */
+  void setMaxFilterIndex(int value);
+  /**
+   * @brief Getter property for MaxFilterIndex
+   * @return Value of MaxFilterIndex
+   */
+  int getMaxFilterIndex() const;
+
+  /**
+   * @brief ReadPipelineFromFile Reads the Json formatted file and returns a FilterPipeline object
+   * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+   * If the IObserver is NON-Null then an error message will be passed to it with an error message
+   * @param filePath The path to the INI formatted file
+   * @param format The format of the file which is anything that QSettings understands
+   * @param obs An IObserver object to report errors.
+   * @return Shared Pointer to a FilterPipeline Instance
+   */
+  FilterPipeline::Pointer readPipelineFromFile(QString filePath, IObserver* obs = nullptr);
+
+  /**
+   * @brief getJsonFromFile Reads the Json formatted file and returns a json string
+   * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+   * If the IObserver is NON-Null then an error message will be passed to it with an error message
+   * @param filePath The path to the INI formatted file
+   * @param format The format of the file which is anything that QSettings understands
+   * @param obs An IObserver object to report errors.
+   * @return Shared Pointer to a FilterPipeline Instance
+   */
+  QString getJsonFromFile(QString filePath, IObserver* obs = nullptr);
+
+  /**
+   * @brief ReadPipelineFromString Reads the Json formatted file and returns a FilterPipeline object
+   * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+   * If the IObserver is NON-Null then an error message will be passed to it with an error message
+   * @param filePath The path to the INI formatted file
+   * @param format The format of the file which is anything that QSettings understands
+   * @param obs An IObserver object to report errors.
+   * @return Shared Pointer to a FilterPipeline Instance
+   */
+  FilterPipeline::Pointer readPipelineFromString(QString contents, IObserver* obs = nullptr);
+
+  /**
+   * @brief Gets the name of the pipeline from a pipeline file
+   * @param filePath The absolute path to the pipeline file.
+   * @param name Sets the name of the pipeline into this variable
+   * @param version Sets the DREAM3D Version into this variable.
+   * @param obs Any observer that needs to know about errors.
+   * @return
+   */
+  void readNameOfPipelineFromFile(QString filePath, QString& name, QString& version, IObserver* obs = nullptr);
+
+  /**
+   * @brief Generate an html formatted string that summarizes the pipeline file by listing
+   * each filter by it's human name and C++ class name.
+   * @param filePath The path to the pipeline file
+   * @param obs Any observer that needs to know about errors.
+   * @return html formatted string
+   */
+  static QString HtmlSummaryFromFile(QString filePath, IObserver* obs);
+
+  /**
+   * @brief Opens the pipeline file for operations
+   * @param filePath The path to the pipeline file
+   * @return
+   */
+  QJsonParseError openFile(QString filePath);
+
+  /**
+   * @brief setPipelineContents
+   * @param contents
+   * @return
+   */
+  int setPipelineContents(QString contents);
+
+  /**
+   * @brief closeFile
+   */
+  void closeFile();
+
+  /**
+   * @brief openFilterGroup
+   * @param unused
+   * @param index
+   * @return
+   */
+  int openFilterGroup(AbstractFilter* unused, int index) override;
+
+  /**
+   * @brief closeFilterGroup
+   * @return
+   */
+  int closeFilterGroup() override;
+
+  /*
+   * @brief getCurrentGroupObject
+   * @return
+   */
+  QJsonObject& getCurrentGroupObject();
+
+  bool containsGroup(QString key);
+
+  int openGroup(QString key);
+  int closeGroup();
+
+protected:
+  JsonFilterParametersReader();
+
+private:
+  QString m_FileName = {};
+  int m_MaxFilterIndex = {};
+
+  QJsonObject m_Root;
+  QJsonObject m_CurrentFilterIndex;
+
+  FilterPipeline::Pointer readPipeline(IObserver* obs);
+
+public:
+  JsonFilterParametersReader(const JsonFilterParametersReader&) = delete;            // Copy Constructor Not Implemented
+  JsonFilterParametersReader(JsonFilterParametersReader&&) = delete;                 // Move Constructor Not Implemented
+  JsonFilterParametersReader& operator=(const JsonFilterParametersReader&) = delete; // Copy Assignment Not Implemented
+  JsonFilterParametersReader& operator=(JsonFilterParametersReader&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 3aab18d54b..70424e66d8 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
@@ -115,9 +115,9 @@ int JsonFilterParametersWriter::populateWriter(FilterPipeline::Pointer pipeline,
       PipelineErrorMessage::Pointer pm =
           PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: FilterPipeline Object was nullptr for writing").arg(JsonFilterParametersWriter::ClassName()), -1);
 
-      for (int i = 0; i < obs.size(); i++)
+      for(int i = 0; i < obs.size(); i++)
       {
-        if (obs[i] != nullptr)
+        if(obs[i] != nullptr)
         {
           obs[i]->processPipelineMessage(pm);
         }
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index bafaf6c1a0..297b1ec01e 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -55,156 +55,154 @@
  */
 class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParametersWriter
 {
-  public:
-    using Self = JsonFilterParametersWriter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief JsonFilterParametersWriter
-     * @param fileName
-     * @param pipelineName
-     */
-    JsonFilterParametersWriter(QString& fileName, QString& pipelineName);
-
-    ~JsonFilterParametersWriter() override;
-
-    /**
-     * @brief Returns the name of the class for JsonFilterParametersWriter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for JsonFilterParametersWriter
-     */
-    static QString ClassName();
-
-    /**
-     * @brief Setter property for FileName
-     */
-    void setFileName(const QString& value);
-    /**
-     * @brief Getter property for FileName
-     * @return Value of FileName
-     */
-    QString getFileName() const;
-
-    /**
-     * @brief Setter property for PipelineName
-     */
-    void setPipelineName(const QString& value);
-    /**
-     * @brief Getter property for PipelineName
-     * @return Value of PipelineName
-     */
-    QString getPipelineName() const;
-
-    /**
-     * @brief WritePipelineToFile This function will write a pipeline to a
-     * JSON file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
-     * function <b>WITHOUT WARNING</b>
-     * @param pipeline The pipeline to be written
-     * @param filePath The file path to write
-     * @param pipelineName The name of the pipeline (Typically the name of the file)
-     * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
-     * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
-     * @return
-     */
-    int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipelines, QList<IObserver*> obs = QList<IObserver*>()) override;
-
-    /**
-     * @brief WritePipelineToString This function will write a pipeline to a QString.
-     * @param pipeline The pipeline to be written
-     * @param pipelineName The name of the pipeline (Typically the name of the file)
-     * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
-     * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
-     * @return The pipeline as a QString
-     */
-    QString writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>());
-
-    /**
-     * @brief openFilterGroup
-     * @param unused
-     * @param index
-     * @return
-     */
-    int openFilterGroup(AbstractFilter* unused, int index) override;
-
-    /**
-     * @brief closeFilterGroup
-     * @return
-     */
-    int closeFilterGroup() override;
-
-  protected:
-    JsonFilterParametersWriter();
-
-  private:
-    int m_CurrentIndex = 0;
-    int m_MaxFilterIndex = -1;
-    QString m_FileName = {};
-    QString m_PipelineName = {};
-    QJsonObject m_Root;
-    QJsonObject m_CurrentFilterIndex;
-
-    /**
-     * @brief Setter property for MaxFilterIndex
-     */
-    void setMaxFilterIndex(int value);
-    /**
-     * @brief Getter property for MaxFilterIndex
-     * @return Value of MaxFilterIndex
-     */
-    int getMaxFilterIndex() const;
-
-    /**
-     * @brief getCurrentGroupObject
-     * @return
-     */
-    QJsonObject& getCurrentGroupObject();
-
-    /**
-     * @brief populateWriter
-     * @param pipeline
-     * @param pipelineName
-     * @param obs
-     * @return
-     */
-    int populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs);
-
-    /**
-     * @brief writePipeline
-     */
-    void writePipeline();
-
-    /**
-     * @brief clearWriter
-     */
-    void clearWriter();
-
-    /**
-     * @brief toDocument
-     * @return
-     */
-    QJsonDocument toDocument();
-
-    /**
-     * @brief generateIndexString Generates a possibly padded string that represents
-     * the current filter index. Used during the JSON document creation.
-     * @param currentIndex The numerical index that the string should be generated for.
-     * @return
-     */
-    QString generateIndexString(int currentIndex);
-
-  public:
-    JsonFilterParametersWriter(const JsonFilterParametersWriter&) = delete; // Copy Constructor Not Implemented
-    JsonFilterParametersWriter(JsonFilterParametersWriter&&) = delete;      // Move Constructor Not Implemented
-    JsonFilterParametersWriter& operator=(const JsonFilterParametersWriter&) = delete; // Copy Assignment Not Implemented
-    JsonFilterParametersWriter& operator=(JsonFilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = JsonFilterParametersWriter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief JsonFilterParametersWriter
+   * @param fileName
+   * @param pipelineName
+   */
+  JsonFilterParametersWriter(QString& fileName, QString& pipelineName);
+
+  ~JsonFilterParametersWriter() override;
+
+  /**
+   * @brief Returns the name of the class for JsonFilterParametersWriter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for JsonFilterParametersWriter
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for FileName
+   */
+  void setFileName(const QString& value);
+  /**
+   * @brief Getter property for FileName
+   * @return Value of FileName
+   */
+  QString getFileName() const;
+
+  /**
+   * @brief Setter property for PipelineName
+   */
+  void setPipelineName(const QString& value);
+  /**
+   * @brief Getter property for PipelineName
+   * @return Value of PipelineName
+   */
+  QString getPipelineName() const;
+
+  /**
+   * @brief WritePipelineToFile This function will write a pipeline to a
+   * JSON file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
+   * function <b>WITHOUT WARNING</b>
+   * @param pipeline The pipeline to be written
+   * @param filePath The file path to write
+   * @param pipelineName The name of the pipeline (Typically the name of the file)
+   * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
+   * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+   * @return
+   */
+  int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipelines, QList<IObserver*> obs = QList<IObserver*>()) override;
+
+  /**
+   * @brief WritePipelineToString This function will write a pipeline to a QString.
+   * @param pipeline The pipeline to be written
+   * @param pipelineName The name of the pipeline (Typically the name of the file)
+   * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
+   * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+   * @return The pipeline as a QString
+   */
+  QString writePipelineToString(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs = QList<IObserver*>());
+
+  /**
+   * @brief openFilterGroup
+   * @param unused
+   * @param index
+   * @return
+   */
+  int openFilterGroup(AbstractFilter* unused, int index) override;
+
+  /**
+   * @brief closeFilterGroup
+   * @return
+   */
+  int closeFilterGroup() override;
+
+protected:
+  JsonFilterParametersWriter();
+
+private:
+  int m_CurrentIndex = 0;
+  int m_MaxFilterIndex = -1;
+  QString m_FileName = {};
+  QString m_PipelineName = {};
+  QJsonObject m_Root;
+  QJsonObject m_CurrentFilterIndex;
+
+  /**
+   * @brief Setter property for MaxFilterIndex
+   */
+  void setMaxFilterIndex(int value);
+  /**
+   * @brief Getter property for MaxFilterIndex
+   * @return Value of MaxFilterIndex
+   */
+  int getMaxFilterIndex() const;
+
+  /**
+   * @brief getCurrentGroupObject
+   * @return
+   */
+  QJsonObject& getCurrentGroupObject();
+
+  /**
+   * @brief populateWriter
+   * @param pipeline
+   * @param pipelineName
+   * @param obs
+   * @return
+   */
+  int populateWriter(FilterPipeline::Pointer pipeline, QString pipelineName, bool expandPipeline, QList<IObserver*> obs);
+
+  /**
+   * @brief writePipeline
+   */
+  void writePipeline();
+
+  /**
+   * @brief clearWriter
+   */
+  void clearWriter();
+
+  /**
+   * @brief toDocument
+   * @return
+   */
+  QJsonDocument toDocument();
+
+  /**
+   * @brief generateIndexString Generates a possibly padded string that represents
+   * the current filter index. Used during the JSON document creation.
+   * @param currentIndex The numerical index that the string should be generated for.
+   * @return
+   */
+  QString generateIndexString(int currentIndex);
+
+public:
+  JsonFilterParametersWriter(const JsonFilterParametersWriter&) = delete;            // Copy Constructor Not Implemented
+  JsonFilterParametersWriter(JsonFilterParametersWriter&&) = delete;                 // Move Constructor Not Implemented
+  JsonFilterParametersWriter& operator=(const JsonFilterParametersWriter&) = delete; // Copy Assignment Not Implemented
+  JsonFilterParametersWriter& operator=(JsonFilterParametersWriter&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index d0f427a1c3..9bbb3ab1ed 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedBooleanFilterParameter.h"
 
@@ -49,7 +49,8 @@ LinkedBooleanFilterParameter::~LinkedBooleanFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
-                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex)
+                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties,
+                                                                        int groupIndex)
 {
   LinkedBooleanFilterParameter::Pointer ptr = LinkedBooleanFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -93,7 +94,7 @@ void LinkedBooleanFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void LinkedBooleanFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     json[getPropertyName()] = static_cast<int>(m_GetterCallback());
   }
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
old mode 100755
new mode 100644
index 6494b5090f..a094c837de
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Parameter, GenericExample, linkedProps);
  */
-#define SIMPL_NEW_LINKED_BOOL_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (LinkedBooleanFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_LINKED_BOOL_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(LinkedBooleanFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The LinkedBooleanFilterParameter class is used by filters to instantiate an LinkedBooleanWidget.  By instantiating an instance of
@@ -64,127 +62,124 @@
  */
 class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
 {
-  public:
-    using Self = LinkedBooleanFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for LinkedBooleanFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for LinkedBooleanFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(bool)>;
-    using GetterCallbackType = std::function<bool(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the LinkedBooleanFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_LINKED_BOOL_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param conditionalProperties The properties that appear/disappear when the LinkedBooleanWidget's checkbox is toggled.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const bool& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       QStringList conditionalProperties, int groupIndex = -1);
-
-    ~LinkedBooleanFilterParameter() override;
-
-    /**
-     * @brief Setter property for ConditionalProperties
-     */
-    void setConditionalProperties(const QStringList& value);
-    /**
-     * @brief Getter property for ConditionalProperties
-     * @return Value of ConditionalProperties
-     */
-    QStringList getConditionalProperties() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const LinkedBooleanFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    LinkedBooleanFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const LinkedBooleanFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    LinkedBooleanFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-      /**
-       * @brief LinkedBooleanFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    LinkedBooleanFilterParameter();
-
-  public:
-    LinkedBooleanFilterParameter(const LinkedBooleanFilterParameter&) = delete; // Copy Constructor Not Implemented
-    LinkedBooleanFilterParameter(LinkedBooleanFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    LinkedBooleanFilterParameter& operator=(const LinkedBooleanFilterParameter&) = delete; // Copy Assignment Not Implemented
-    LinkedBooleanFilterParameter& operator=(LinkedBooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QStringList m_ConditionalProperties = {};
-    LinkedBooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
-    LinkedBooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = LinkedBooleanFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for LinkedBooleanFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for LinkedBooleanFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(bool)>;
+  using GetterCallbackType = std::function<bool(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the LinkedBooleanFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_LINKED_BOOL_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param conditionalProperties The properties that appear/disappear when the LinkedBooleanWidget's checkbox is toggled.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex = -1);
+
+  ~LinkedBooleanFilterParameter() override;
+
+  /**
+   * @brief Setter property for ConditionalProperties
+   */
+  void setConditionalProperties(const QStringList& value);
+  /**
+   * @brief Getter property for ConditionalProperties
+   * @return Value of ConditionalProperties
+   */
+  QStringList getConditionalProperties() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const LinkedBooleanFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  LinkedBooleanFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const LinkedBooleanFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  LinkedBooleanFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief LinkedBooleanFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  LinkedBooleanFilterParameter();
+
+public:
+  LinkedBooleanFilterParameter(const LinkedBooleanFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  LinkedBooleanFilterParameter(LinkedBooleanFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  LinkedBooleanFilterParameter& operator=(const LinkedBooleanFilterParameter&) = delete; // Copy Assignment Not Implemented
+  LinkedBooleanFilterParameter& operator=(LinkedBooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QStringList m_ConditionalProperties = {};
+  LinkedBooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
+  LinkedBooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 0e40edf781..0093aca31f 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedChoicesFilterParameter.h"
 
@@ -49,8 +49,8 @@ LinkedChoicesFilterParameter::~LinkedChoicesFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
-                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices, QStringList linkedProperties,
-                                                                        int groupIndex)
+                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
+                                                                        QStringList linkedProperties, int groupIndex)
 {
   LinkedChoicesFilterParameter::Pointer ptr = LinkedChoicesFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
old mode 100755
new mode 100644
index d5674d9598..5cd9f5300a
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,94 +48,90 @@
  */
 class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
 {
-  public:
-    using Self = LinkedChoicesFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for LinkedChoicesFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for LinkedChoicesFilterParameter
-     */
-    static QString ClassName();
-
-    /**
-     * @brief New This function instantiates an instance of the LinkedChoicesFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_LINKED_CHOICES_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @param choices The selections that appear in the LinkedChoicesWidget.
-    * @param linkedProperties The properties that appear/disappear when a selection is chosen.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       int defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       QVector<QString> choices, QStringList linkedProperties,
-                       int groupIndex = -1);
-
-    ~LinkedChoicesFilterParameter() override;
-
-    /**
-     * @brief Setter property for LinkedProperties
-     */
-    void setLinkedProperties(const QStringList& value);
-    /**
-     * @brief Getter property for LinkedProperties
-     * @return Value of LinkedProperties
-     */
-    QStringList getLinkedProperties() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-  protected:
-      /**
-       * @brief LinkedChoicesFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    LinkedChoicesFilterParameter();
-
-  public:
-    LinkedChoicesFilterParameter(const LinkedChoicesFilterParameter&) = delete; // Copy Constructor Not Implemented
-    LinkedChoicesFilterParameter(LinkedChoicesFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    LinkedChoicesFilterParameter& operator=(const LinkedChoicesFilterParameter&) = delete; // Copy Assignment Not Implemented
-    LinkedChoicesFilterParameter& operator=(LinkedChoicesFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QStringList m_LinkedProperties = {};
+public:
+  using Self = LinkedChoicesFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for LinkedChoicesFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for LinkedChoicesFilterParameter
+   */
+  static QString ClassName();
+
+  /**
+   * @brief New This function instantiates an instance of the LinkedChoicesFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_LINKED_CHOICES_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param choices The selections that appear in the LinkedChoicesWidget.
+  * @param linkedProperties The properties that appear/disappear when a selection is chosen.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                     QVector<QString> choices, QStringList linkedProperties, int groupIndex = -1);
+
+  ~LinkedChoicesFilterParameter() override;
+
+  /**
+   * @brief Setter property for LinkedProperties
+   */
+  void setLinkedProperties(const QStringList& value);
+  /**
+   * @brief Getter property for LinkedProperties
+   * @return Value of LinkedProperties
+   */
+  QStringList getLinkedProperties() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+protected:
+  /**
+   * @brief LinkedChoicesFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  LinkedChoicesFilterParameter();
+
+public:
+  LinkedChoicesFilterParameter(const LinkedChoicesFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  LinkedChoicesFilterParameter(LinkedChoicesFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  LinkedChoicesFilterParameter& operator=(const LinkedChoicesFilterParameter&) = delete; // Copy Assignment Not Implemented
+  LinkedChoicesFilterParameter& operator=(LinkedChoicesFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QStringList m_LinkedProperties = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index 06ac694af7..16940049dd 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index 1ab8f7283d..860e620513 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -52,10 +52,8 @@ class AbstractFilter;
  * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
  * FilterName (class name), Choices, LinkedProperties, GroupIndex (optional).
  */
-#define SIMPL_NEW_LINKED_DC_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (LinkedDataContainerSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_LINKED_DC_SELECTION_FP(...)                                                                                                                                                          \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(LinkedDataContainerSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The LinkedDataContainerSelectionFilterParameter class is used by filters to instantiate a LinkedDataContainerSelectionWidget.  By instantiating an instance of
@@ -63,147 +61,146 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = LinkedDataContainerSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(DataArrayPath)>;
-    using GetterCallbackType = std::function<DataArrayPath(void)>;
-
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-    };
-
-    /**
-     * @brief New This function instantiates an instance of the LinkedDataContainerSelectionFilterParameter. This function must be used to instantiate the class; the 
-     * SIMPL_NEW_LINKED_DC_SELECTION_FP macro does not properly instantiate the class, so this static New method must be used.
-     *
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-     * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-     * that this FilterParameter subclass represents.
-     * @param choices The selections that appear in the LinkedChoicesWidget.
-     * @param linkedProperties The properties that appear/disappear when a selection is chosen.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-     static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
-
-     ~LinkedDataContainerSelectionFilterParameter() override;
-
-     /**
-      * @brief Setter property for LinkedProperties
-      */
-     void setLinkedProperties(const QStringList& value);
-     /**
-      * @brief Getter property for LinkedProperties
-      * @return Value of LinkedProperties
-      */
-     QStringList getLinkedProperties() const;
-
-     /**
-      * @brief Setter property for DefaultGeometryTypes
-      */
-     void setDefaultGeometryTypes(const IGeometry::Types& value);
-     /**
-      * @brief Getter property for DefaultGeometryTypes
-      * @return Value of DefaultGeometryTypes
-      */
-     IGeometry::Types getDefaultGeometryTypes() const;
-
-     /**
-      * @brief getWidgetType Returns the type of widget that displays and controls
-      * this FilterParameter subclass
-      * @return
-      */
-     QString getWidgetType() const override;
-
-     /**
-      * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-      * @param json The QJsonObject that the filter parameter reads from.
-      */
-     void readJson(const QJsonObject& json) override;
-
-     /**
-      * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-      * @param json The QJsonObject that the filter parameter writes to.
-      */
-     void writeJson(QJsonObject& json) override;
-
-     /**
-      * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * from the filter parameter.
-      */
-     /**
-      * @brief Setter property for SetterCallback
-      */
-     void setSetterCallback(const LinkedDataContainerSelectionFilterParameter::SetterCallbackType& value);
-     /**
-      * @brief Getter property for SetterCallback
-      * @return Value of SetterCallback
-      */
-     LinkedDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
-
-     /**
-      * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-      * that this FilterParameter subclass represents.
-      * @return The GetterCallback
-      */
-     /**
-      * @brief Setter property for GetterCallback
-      */
-     void setGetterCallback(const LinkedDataContainerSelectionFilterParameter::GetterCallbackType& value);
-     /**
-      * @brief Getter property for GetterCallback
-      * @return Value of GetterCallback
-      */
-     LinkedDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
-
-     /**
-      * @brief Handle DataArrayPath changes if necessary
-      */
-     void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
-
-   protected:
-     /**
-      * @brief LinkedDataContainerSelectionFilterParameter The default constructor.  It is protected because this
-      * filter parameter should only be instantiated using its New(...) function or short-form macro.
-      */
-     LinkedDataContainerSelectionFilterParameter();
-
-   public:
-     LinkedDataContainerSelectionFilterParameter(const LinkedDataContainerSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
-     LinkedDataContainerSelectionFilterParameter(LinkedDataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-     LinkedDataContainerSelectionFilterParameter& operator=(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-     LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-   private:
-     QStringList m_LinkedProperties = {};
-     IGeometry::Types m_DefaultGeometryTypes = {};
-     LinkedDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-     LinkedDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = LinkedDataContainerSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for LinkedDataContainerSelectionFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(DataArrayPath)>;
+  using GetterCallbackType = std::function<DataArrayPath(void)>;
+
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+  };
+
+  /**
+   * @brief New This function instantiates an instance of the LinkedDataContainerSelectionFilterParameter. This function must be used to instantiate the class; the
+   * SIMPL_NEW_LINKED_DC_SELECTION_FP macro does not properly instantiate the class, so this static New method must be used.
+   *
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param choices The selections that appear in the LinkedChoicesWidget.
+   * @param linkedProperties The properties that appear/disappear when a selection is chosen.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
+
+  ~LinkedDataContainerSelectionFilterParameter() override;
+
+  /**
+   * @brief Setter property for LinkedProperties
+   */
+  void setLinkedProperties(const QStringList& value);
+  /**
+   * @brief Getter property for LinkedProperties
+   * @return Value of LinkedProperties
+   */
+  QStringList getLinkedProperties() const;
+
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const LinkedDataContainerSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  LinkedDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const LinkedDataContainerSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  LinkedDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+
+protected:
+  /**
+   * @brief LinkedDataContainerSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  LinkedDataContainerSelectionFilterParameter();
+
+public:
+  LinkedDataContainerSelectionFilterParameter(const LinkedDataContainerSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  LinkedDataContainerSelectionFilterParameter(LinkedDataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  LinkedDataContainerSelectionFilterParameter& operator=(const LinkedDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QStringList m_LinkedProperties = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  LinkedDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  LinkedDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 04cc2e1a6e..59e379fe61 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -107,7 +107,8 @@ LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, ILinkedPath* linkedPath, int groupIndex)
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, ILinkedPath* linkedPath,
+                                                                                  int groupIndex)
 {
 
   LinkedPathCreationFilterParameter::Pointer ptr = LinkedPathCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index bcd5633d7d..a777508324 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -310,8 +310,8 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     ILinkedPath* linkedPath, int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, ILinkedPath* linkedPath, int groupIndex = -1);
 
   ~LinkedPathCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index 3efef7acf7..f25650ba27 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -34,7 +34,6 @@
 
 #include "MontageSelectionFilterParameter.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
index 70ad5fcd69..2e24a26578 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -47,9 +47,8 @@ MontageStructureSelectionFilterParameter::~MontageStructureSelectionFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue,
-                                                                                                Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                                int groupIndex)
+MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
 {
   MontageStructureSelectionFilterParameter::Pointer ptr = MontageStructureSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 5e21529dbc..e277564228 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MultiAttributeMatrixSelectionFilterParameter.h"
 
@@ -56,9 +56,10 @@ MultiAttributeMatrixSelectionFilterParameter::~MultiAttributeMatrixSelectionFilt
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
-                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                            RequirementType req, int groupIndex)
+MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName,
+                                                                                                        const QVector<DataArrayPath>& defaultValue, Category category,
+                                                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                                        RequirementType req, int groupIndex)
 {
 
   MultiAttributeMatrixSelectionFilterParameter::Pointer ptr = MultiAttributeMatrixSelectionFilterParameter::New();
@@ -91,7 +92,7 @@ QString MultiAttributeMatrixSelectionFilterParameter::getWidgetType() const
 //
 // -----------------------------------------------------------------------------
 MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatrixSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
-                                                                                                                          AttributeMatrix::Category attributeMatrixCategory)
+                                                                                                                                      AttributeMatrix::Category attributeMatrixCategory)
 {
   typedef std::vector<size_t> SizeTVectorType;
   MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
@@ -136,8 +137,8 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatrixSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
-                                                                                                                  IGeometry::Type geometryType)
+MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatrixSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim,
+                                                                                                                              AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
 {
   typedef std::vector<size_t> SizeTVectorType;
   MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
@@ -192,7 +193,7 @@ void MultiAttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& j
 // -----------------------------------------------------------------------------
 void MultiAttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     QVector<DataArrayPath> dapVec = m_GetterCallback();
     QJsonArray arrayObj;
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index fff0d0461c..96210f559b 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,10 +57,8 @@
  * MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0);
  */
-#define SIMPL_NEW_MAM_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (MultiAttributeMatrixSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_MAM_SELECTION_FP(...)                                                                                                                                                                \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiAttributeMatrixSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The MultiAttributeMatrixSelectionFilterParameter class is used by filters to instantiate an MultiDataArraySelectionWidget.  By instantiating an instance of
@@ -68,213 +66,205 @@
  */
 class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = MultiAttributeMatrixSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = MultiAttributeMatrixSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiAttributeMatrixSelectionFilterParameter
+   */
+  static QString ClassName();
 
-    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+  typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
+  typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
 
-    typedef struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-      QVector<QString> daTypes;
-      std::vector<std::vector<size_t>> componentDimensions;
-    } RequirementType;
+  typedef struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+    QVector<QString> daTypes;
+    std::vector<std::vector<size_t>> componentDimensions;
+  } RequirementType;
 
-    /**
-     * @brief New This function instantiates an instance of the MultiAttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_MDA_SELECTION_FP(...) macro at the top of this file.
+  /**
+   * @brief New This function instantiates an instance of the MultiAttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_MDA_SELECTION_FP(...) macro at the top of this file.
 
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QVector<DataArrayPath>& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       RequirementType req, int groupIndex = -1);
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
-    ~MultiAttributeMatrixSelectionFilterParameter() override;
+  ~MultiAttributeMatrixSelectionFilterParameter() override;
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixCategory
-     * @return
-     */
-    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
-                                                     size_t allowedCompDim,
-                                                     AttributeMatrix::Category attributeMatrixCategory);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixCategory
+   * @return
+   */
+  static RequirementType CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Category attributeMatrixCategory);
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(const QString& primitiveType,
-                                             size_t allowedCompDim,
-                                             AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
 
-    /**
-     * @brief Setter property for DefaultPaths
-     */
-    void setDefaultPaths(const QVector<DataArrayPath>& value);
-    /**
-     * @brief Getter property for DefaultPaths
-     * @return Value of DefaultPaths
-     */
-    QVector<DataArrayPath> getDefaultPaths() const;
+  /**
+   * @brief Setter property for DefaultPaths
+   */
+  void setDefaultPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for DefaultPaths
+   * @return Value of DefaultPaths
+   */
+  QVector<DataArrayPath> getDefaultPaths() const;
 
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
 
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
 
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeArrayTypes
-     */
-    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
-    /**
-     * @brief Getter property for DefaultAttributeArrayTypes
-     * @return Value of DefaultAttributeArrayTypes
-     */
-    QVector<QString> getDefaultAttributeArrayTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeArrayTypes
+   */
+  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  /**
+   * @brief Getter property for DefaultAttributeArrayTypes
+   * @return Value of DefaultAttributeArrayTypes
+   */
+  QVector<QString> getDefaultAttributeArrayTypes() const;
 
-    /**
-     * @brief Setter property for DefaultComponentDimensions
-     */
-    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
-    /**
-     * @brief Getter property for DefaultComponentDimensions
-     * @return Value of DefaultComponentDimensions
-     */
-    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
+  /**
+   * @brief Setter property for DefaultComponentDimensions
+   */
+  void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+  /**
+   * @brief Getter property for DefaultComponentDimensions
+   * @return Value of DefaultComponentDimensions
+   */
+  std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
-  protected:
-      /**
-       * @brief MultiAttributeMatrixSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    MultiAttributeMatrixSelectionFilterParameter();
+protected:
+  /**
+   * @brief MultiAttributeMatrixSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MultiAttributeMatrixSelectionFilterParameter();
 
-  public:
-    MultiAttributeMatrixSelectionFilterParameter(const MultiAttributeMatrixSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    MultiAttributeMatrixSelectionFilterParameter(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    MultiAttributeMatrixSelectionFilterParameter& operator=(const MultiAttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    MultiAttributeMatrixSelectionFilterParameter& operator=(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  MultiAttributeMatrixSelectionFilterParameter(const MultiAttributeMatrixSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MultiAttributeMatrixSelectionFilterParameter(MultiAttributeMatrixSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MultiAttributeMatrixSelectionFilterParameter& operator=(const MultiAttributeMatrixSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MultiAttributeMatrixSelectionFilterParameter& operator=(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    QVector<DataArrayPath> m_DefaultPaths = {};
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-    QVector<QString> m_DefaultAttributeArrayTypes = {};
-    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
-    MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+private:
+  QVector<DataArrayPath> m_DefaultPaths = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+  MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index b08b247845..c96df52ea9 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MultiDataArraySelectionFilterParameter.h"
 
@@ -136,8 +136,8 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
-                                                                                                                  IGeometry::Type geometryType)
+MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim,
+                                                                                                                  AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
 {
   typedef std::vector<size_t> SizeTVectorType;
   MultiDataArraySelectionFilterParameter::RequirementType req;
@@ -192,7 +192,7 @@ void MultiDataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void MultiDataArraySelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     QVector<DataArrayPath> dapVec = m_GetterCallback();
     QJsonArray arrayObj;
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
old mode 100755
new mode 100644
index 38216ab9a8..bfd2ba2e00
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,10 +57,8 @@
  * MultiDataArraySelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0);
  */
-#define SIMPL_NEW_MDA_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (MultiDataArraySelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_MDA_SELECTION_FP(...)                                                                                                                                                                \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiDataArraySelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The MultiDataArraySelectionFilterParameter class is used by filters to instantiate an MultiDataArraySelectionWidget.  By instantiating an instance of
@@ -68,213 +66,205 @@
  */
 class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = MultiDataArraySelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = MultiDataArraySelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiDataArraySelectionFilterParameter
+   */
+  static QString ClassName();
 
-    typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-    typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+  typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
+  typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
 
-    typedef struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-      QVector<QString> daTypes;
-      std::vector<std::vector<size_t>> componentDimensions;
-    } RequirementType;
+  typedef struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+    QVector<QString> daTypes;
+    std::vector<std::vector<size_t>> componentDimensions;
+  } RequirementType;
 
-    /**
-     * @brief New This function instantiates an instance of the MultiDataArraySelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_MDA_SELECTION_FP(...) macro at the top of this file.
+  /**
+   * @brief New This function instantiates an instance of the MultiDataArraySelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_MDA_SELECTION_FP(...) macro at the top of this file.
 
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QVector<DataArrayPath>& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       RequirementType req, int groupIndex = -1);
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
-    ~MultiDataArraySelectionFilterParameter() override;
+  ~MultiDataArraySelectionFilterParameter() override;
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixCategory
-     * @return
-     */
-    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
-                                                     size_t allowedCompDim,
-                                                     AttributeMatrix::Category attributeMatrixCategory);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixCategory
+   * @return
+   */
+  static RequirementType CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Category attributeMatrixCategory);
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(const QString& primitiveType,
-                                             size_t allowedCompDim,
-                                             AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
 
-    /**
-     * @brief Setter property for DefaultPaths
-     */
-    void setDefaultPaths(const QVector<DataArrayPath>& value);
-    /**
-     * @brief Getter property for DefaultPaths
-     * @return Value of DefaultPaths
-     */
-    QVector<DataArrayPath> getDefaultPaths() const;
+  /**
+   * @brief Setter property for DefaultPaths
+   */
+  void setDefaultPaths(const QVector<DataArrayPath>& value);
+  /**
+   * @brief Getter property for DefaultPaths
+   * @return Value of DefaultPaths
+   */
+  QVector<DataArrayPath> getDefaultPaths() const;
 
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
 
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
 
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeArrayTypes
-     */
-    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
-    /**
-     * @brief Getter property for DefaultAttributeArrayTypes
-     * @return Value of DefaultAttributeArrayTypes
-     */
-    QVector<QString> getDefaultAttributeArrayTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeArrayTypes
+   */
+  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  /**
+   * @brief Getter property for DefaultAttributeArrayTypes
+   * @return Value of DefaultAttributeArrayTypes
+   */
+  QVector<QString> getDefaultAttributeArrayTypes() const;
 
-    /**
-     * @brief Setter property for DefaultComponentDimensions
-     */
-    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
-    /**
-     * @brief Getter property for DefaultComponentDimensions
-     * @return Value of DefaultComponentDimensions
-     */
-    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
+  /**
+   * @brief Setter property for DefaultComponentDimensions
+   */
+  void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+  /**
+   * @brief Getter property for DefaultComponentDimensions
+   * @return Value of DefaultComponentDimensions
+   */
+  std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const MultiDataArraySelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    MultiDataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const MultiDataArraySelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  MultiDataArraySelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const MultiDataArraySelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    MultiDataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const MultiDataArraySelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  MultiDataArraySelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
-  protected:
-      /**
-       * @brief MultiDataArraySelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    MultiDataArraySelectionFilterParameter();
+protected:
+  /**
+   * @brief MultiDataArraySelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MultiDataArraySelectionFilterParameter();
 
-  public:
-    MultiDataArraySelectionFilterParameter(const MultiDataArraySelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    MultiDataArraySelectionFilterParameter(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    MultiDataArraySelectionFilterParameter& operator=(const MultiDataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    MultiDataArraySelectionFilterParameter& operator=(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  MultiDataArraySelectionFilterParameter(const MultiDataArraySelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MultiDataArraySelectionFilterParameter(MultiDataArraySelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataArraySelectionFilterParameter& operator=(const MultiDataArraySelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MultiDataArraySelectionFilterParameter& operator=(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    QVector<DataArrayPath> m_DefaultPaths = {};
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-    QVector<QString> m_DefaultAttributeArrayTypes = {};
-    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
-    MultiDataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    MultiDataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+private:
+  QVector<DataArrayPath> m_DefaultPaths = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+  MultiDataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  MultiDataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 949200587c..7b9683efb5 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MultiDataContainerSelectionFilterParameter.h"
 
@@ -87,40 +87,39 @@ QString MultiDataContainerSelectionFilterParameter::getWidgetType() const
   return QString("MultiDataContainerSelectionWidget");
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim,
-	AttributeMatrix::Category attributeMatrixCategory)
+                                                                                                                                  AttributeMatrix::Category attributeMatrixCategory)
 {
   using SizeTVectorType = std::vector<size_t>;
   MultiDataContainerSelectionFilterParameter::RequirementType req;
-	AttributeMatrix::Types amTypes;
-	if (attributeMatrixCategory == AttributeMatrix::Category::Element)
-	{
-		amTypes.push_back(AttributeMatrix::Type::Cell);
-		amTypes.push_back(AttributeMatrix::Type::Face);
-		amTypes.push_back(AttributeMatrix::Type::Edge);
-		amTypes.push_back(AttributeMatrix::Type::Vertex);
-	}
-	else if (attributeMatrixCategory == AttributeMatrix::Category::Feature)
-	{
-		amTypes.push_back(AttributeMatrix::Type::CellFeature);
-		amTypes.push_back(AttributeMatrix::Type::FaceFeature);
-		amTypes.push_back(AttributeMatrix::Type::EdgeFeature);
-		amTypes.push_back(AttributeMatrix::Type::VertexFeature);
-	}
-	else if (attributeMatrixCategory == AttributeMatrix::Category::Ensemble)
-	{
-		amTypes.push_back(AttributeMatrix::Type::CellEnsemble);
-		amTypes.push_back(AttributeMatrix::Type::FaceEnsemble);
-		amTypes.push_back(AttributeMatrix::Type::EdgeEnsemble);
-		amTypes.push_back(AttributeMatrix::Type::VertexEnsemble);
-	}
-	req.amTypes = amTypes;
-	if (primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
-	{
+  AttributeMatrix::Types amTypes;
+  if(attributeMatrixCategory == AttributeMatrix::Category::Element)
+  {
+    amTypes.push_back(AttributeMatrix::Type::Cell);
+    amTypes.push_back(AttributeMatrix::Type::Face);
+    amTypes.push_back(AttributeMatrix::Type::Edge);
+    amTypes.push_back(AttributeMatrix::Type::Vertex);
+  }
+  else if(attributeMatrixCategory == AttributeMatrix::Category::Feature)
+  {
+    amTypes.push_back(AttributeMatrix::Type::CellFeature);
+    amTypes.push_back(AttributeMatrix::Type::FaceFeature);
+    amTypes.push_back(AttributeMatrix::Type::EdgeFeature);
+    amTypes.push_back(AttributeMatrix::Type::VertexFeature);
+  }
+  else if(attributeMatrixCategory == AttributeMatrix::Category::Ensemble)
+  {
+    amTypes.push_back(AttributeMatrix::Type::CellEnsemble);
+    amTypes.push_back(AttributeMatrix::Type::FaceEnsemble);
+    amTypes.push_back(AttributeMatrix::Type::EdgeEnsemble);
+    amTypes.push_back(AttributeMatrix::Type::VertexEnsemble);
+  }
+  req.amTypes = amTypes;
+  if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
+  {
     req.daTypes = QVector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
@@ -137,8 +136,8 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType,
-	IGeometry::Type geometryType)
+MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSelectionFilterParameter::CreateRequirement(const QString& primitiveType, size_t allowedCompDim,
+                                                                                                                          AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
 {
   using SizeTVectorType = std::vector<size_t>;
   MultiDataContainerSelectionFilterParameter::RequirementType req;
@@ -152,14 +151,14 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-		QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
-		req.amTypes = amTypes;
-	}
-	if (IGeometry::Type::Any != geometryType)
-	{
-		req.dcGeometryTypes = IGeometry::Types(1, geometryType);
-	}
-	return req;
+    QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+    req.amTypes = amTypes;
+  }
+  if(IGeometry::Type::Any != geometryType)
+  {
+    req.dcGeometryTypes = IGeometry::Types(1, geometryType);
+  }
+  return req;
 }
 
 // -----------------------------------------------------------------------------
@@ -191,7 +190,7 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     QStringList dcList = m_GetterCallback();
     QJsonArray arrayObj;
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 5841e04bb7..70dbd656ff 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -57,10 +57,8 @@
  * MultiDataContainerSelectionFilterParameter::RequirementType req;
  * SIMPL_NEW_MCA_SELECTION_FP("Multi Data Container Test", SelectedMultiDataContainers, FilterParameter::Parameter, GenericExample, req, 0);
  */
-#define SIMPL_NEW_MDC_SELECTION_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (MultiDataContainerSelectionFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_MDC_SELECTION_FP(...)                                                                                                                                                                \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiDataContainerSelectionFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The MultiDataContainerSelectionFilterParameter class is used by filters to instantiate an MultiDataContainerSelectionWidget.  By instantiating an instance of
@@ -68,211 +66,205 @@
  */
 class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterParameter
 {
-  public:
-    using Self = MultiDataContainerSelectionFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = MultiDataContainerSelectionFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiDataContainerSelectionFilterParameter
+   */
+  static QString ClassName();
 
-    using SetterCallbackType = std::function<void(QStringList)>;
-    using GetterCallbackType = std::function<QStringList(void)>;
+  using SetterCallbackType = std::function<void(QStringList)>;
+  using GetterCallbackType = std::function<QStringList(void)>;
 
-    using RequirementType = struct
-    {
-      IGeometry::Types dcGeometryTypes;
-      AttributeMatrix::Types amTypes;
-      QVector<QString> daTypes;
-      std::vector<std::vector<size_t>> componentDimensions;
-    };
+  using RequirementType = struct
+  {
+    IGeometry::Types dcGeometryTypes;
+    AttributeMatrix::Types amTypes;
+    QVector<QString> daTypes;
+    std::vector<std::vector<size_t>> componentDimensions;
+  };
 
-    /**
-     * @brief New This function instantiates an instance of the MultiDataContainerSelectionFilterParameter.  Specifying a RequirementType will
-     * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
-     * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
-     * SIMPL_NEW_MCA_SELECTION_FP(...) macro at the top of this file.
+  /**
+   * @brief New This function instantiates an instance of the MultiDataContainerSelectionFilterParameter.  Specifying a RequirementType will
+   * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
+   * Although this function is available to be used, the preferable way to instantiate an instance of this class is to use the
+   * SIMPL_NEW_MCA_SELECTION_FP(...) macro at the top of this file.
 
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
-     * user interface.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param req The RequirementType that greys out non-conforming selection options in the DREAM.3D
+   * user interface.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
-    ~MultiDataContainerSelectionFilterParameter() override;
+  ~MultiDataContainerSelectionFilterParameter() override;
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixCategory
-     * @return
-     */
-    static RequirementType CreateCategoryRequirement(const QString& primitiveType,
-                                                     size_t allowedCompDim,
-                                                     AttributeMatrix::Category attributeMatrixCategory);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixCategory
+   * @return
+   */
+  static RequirementType CreateCategoryRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Category attributeMatrixCategory);
 
-    /**
-     * @brief CreateRequirement
-     * @param primitiveType
-     * @param allowedCompDim
-     * @param attributeMatrixType
-     * @param geometryType
-     * @return
-     */
-    static RequirementType CreateRequirement(const QString& primitiveType,
-                                             size_t allowedCompDim,
-                                             AttributeMatrix::Type attributeMatrixType,
-                                             IGeometry::Type geometryType);
+  /**
+   * @brief CreateRequirement
+   * @param primitiveType
+   * @param allowedCompDim
+   * @param attributeMatrixType
+   * @param geometryType
+   * @return
+   */
+  static RequirementType CreateRequirement(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType);
 
-    /**
-     * @brief Setter property for DefaultNames
-     */
-    void setDefaultNames(const QStringList& value);
-    /**
-     * @brief Getter property for DefaultNames
-     * @return Value of DefaultNames
-     */
-    QStringList getDefaultNames() const;
+  /**
+   * @brief Setter property for DefaultNames
+   */
+  void setDefaultNames(const QStringList& value);
+  /**
+   * @brief Getter property for DefaultNames
+   * @return Value of DefaultNames
+   */
+  QStringList getDefaultNames() const;
 
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
 
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
 
-    /**
-     * @brief Setter property for DefaultGeometryTypes
-     */
-    void setDefaultGeometryTypes(const IGeometry::Types& value);
-    /**
-     * @brief Getter property for DefaultGeometryTypes
-     * @return Value of DefaultGeometryTypes
-     */
-    IGeometry::Types getDefaultGeometryTypes() const;
+  /**
+   * @brief Setter property for DefaultGeometryTypes
+   */
+  void setDefaultGeometryTypes(const IGeometry::Types& value);
+  /**
+   * @brief Getter property for DefaultGeometryTypes
+   * @return Value of DefaultGeometryTypes
+   */
+  IGeometry::Types getDefaultGeometryTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeMatrixTypes
-     */
-    void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
-    /**
-     * @brief Getter property for DefaultAttributeMatrixTypes
-     * @return Value of DefaultAttributeMatrixTypes
-     */
-    QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeMatrixTypes
+   */
+  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  /**
+   * @brief Getter property for DefaultAttributeMatrixTypes
+   * @return Value of DefaultAttributeMatrixTypes
+   */
+  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
 
-    /**
-     * @brief Setter property for DefaultAttributeArrayTypes
-     */
-    void setDefaultAttributeArrayTypes(const QVector<QString>& value);
-    /**
-     * @brief Getter property for DefaultAttributeArrayTypes
-     * @return Value of DefaultAttributeArrayTypes
-     */
-    QVector<QString> getDefaultAttributeArrayTypes() const;
+  /**
+   * @brief Setter property for DefaultAttributeArrayTypes
+   */
+  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  /**
+   * @brief Getter property for DefaultAttributeArrayTypes
+   * @return Value of DefaultAttributeArrayTypes
+   */
+  QVector<QString> getDefaultAttributeArrayTypes() const;
 
-    /**
-     * @brief Setter property for DefaultComponentDimensions
-     */
-    void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
-    /**
-     * @brief Getter property for DefaultComponentDimensions
-     * @return Value of DefaultComponentDimensions
-     */
-    std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
+  /**
+   * @brief Setter property for DefaultComponentDimensions
+   */
+  void setDefaultComponentDimensions(const std::vector<std::vector<size_t>>& value);
+  /**
+   * @brief Getter property for DefaultComponentDimensions
+   * @return Value of DefaultComponentDimensions
+   */
+  std::vector<std::vector<size_t>> getDefaultComponentDimensions() const;
 
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const MultiDataContainerSelectionFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    MultiDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const MultiDataContainerSelectionFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  MultiDataContainerSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const MultiDataContainerSelectionFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    MultiDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const MultiDataContainerSelectionFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  MultiDataContainerSelectionFilterParameter::GetterCallbackType getGetterCallback() const;
 
-    /**
-     * @brief Handle DataArrayPath changes if necessary
-     * @param filter
-     * @param renamePath
-     */
-    void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param filter
+   * @param renamePath
+   */
+  void dataArrayPathRenamed(AbstractFilter* filter, const DataArrayPath::RenameType& renamePath) override;
 
-  protected:
-      /**
-       * @brief MultiDataContainerSelectionFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    MultiDataContainerSelectionFilterParameter();
+protected:
+  /**
+   * @brief MultiDataContainerSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MultiDataContainerSelectionFilterParameter();
 
-  public:
-    MultiDataContainerSelectionFilterParameter(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-    MultiDataContainerSelectionFilterParameter(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
-    MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  MultiDataContainerSelectionFilterParameter(const MultiDataContainerSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MultiDataContainerSelectionFilterParameter(MultiDataContainerSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataContainerSelectionFilterParameter& operator=(const MultiDataContainerSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    QStringList m_DefaultNames = {};
-    IGeometry::Types m_DefaultGeometryTypes = {};
-    QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-    QVector<QString> m_DefaultAttributeArrayTypes = {};
-    std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
-    MultiDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
-    MultiDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
+private:
+  QStringList m_DefaultNames = {};
+  IGeometry::Types m_DefaultGeometryTypes = {};
+  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
+  MultiDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
+  MultiDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 42a1cd1e62..ef56880a89 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "NumericTypeFilterParameter.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -50,7 +49,7 @@ NumericTypeFilterParameter::~NumericTypeFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   NumericTypeFilterParameter::Pointer ptr = NumericTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index ccda2fd640..15ae76cb70 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -55,13 +55,13 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_NUMERICTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
  */
-#define SIMPL_NEW_NUMERICTYPE_FP(...)                                                                                                                                                          \
+#define SIMPL_NEW_NUMERICTYPE_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(NumericTypeFilterParameter, __VA_ARGS__))
 
 /**
-* @brief The NumericTypeFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
-* this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
-*/
+ * @brief The NumericTypeFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
 class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 {
 public:
@@ -104,35 +104,35 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category, 
-                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~NumericTypeFilterParameter() override;
 
   /**
-  * @brief getWidgetType Returns the type of widget that displays and controls
-  * this FilterParameter subclass
-  * @return
-  */
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
   QString getWidgetType() const override;
 
   /**
-  * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-  * @param json The QJsonObject that the filter parameter reads from.
-  */
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
   void readJson(const QJsonObject& json) override;
 
   /**
-  * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-  * @param json The QJsonObject that the filter parameter writes to.
-  */
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
   void writeJson(QJsonObject& json) override;
 
   /**
-  * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The SetterCallback
-  */
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
   /**
    * @brief Setter property for SetterCallback
    */
@@ -144,10 +144,10 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   NumericTypeFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
-  * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The GetterCallback
-  */
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
   /**
    * @brief Setter property for GetterCallback
    */
@@ -160,14 +160,14 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 
 protected:
   /**
-  * @brief NumericTypeFilterParameter The default constructor.  It is protected because this
-  * filter parameter should only be instantiated using its New(...) function or short-form macro.
-  */
+   * @brief NumericTypeFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   NumericTypeFilterParameter();
 
 public:
-  NumericTypeFilterParameter(const NumericTypeFilterParameter&) = delete; // Copy Constructor Not Implemented
-  NumericTypeFilterParameter(NumericTypeFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  NumericTypeFilterParameter(const NumericTypeFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  NumericTypeFilterParameter(NumericTypeFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   NumericTypeFilterParameter& operator=(const NumericTypeFilterParameter&) = delete; // Copy Assignment Not Implemented
   NumericTypeFilterParameter& operator=(NumericTypeFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -175,4 +175,3 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   NumericTypeFilterParameter::SetterCallbackType m_SetterCallback = {};
   NumericTypeFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index eb5fd55089..0906fd4ac8 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "OutputFileFilterParameter.h"
 
@@ -49,8 +49,8 @@ OutputFileFilterParameter::~OutputFileFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 OutputFileFilterParameter::Pointer OutputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
-                                                                  int groupIndex)
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                  const QString& fileType, int groupIndex)
 {
   OutputFileFilterParameter::Pointer ptr = OutputFileFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
old mode 100755
new mode 100644
index 6baf8931d6..20795fc553
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
  * SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_OUTPUT_FILE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (OutputFileFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_OUTPUT_FILE_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(OutputFileFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The OutputFileFilterParameter class is used by filters to instantiate an OutputFileWidget.  By instantiating an instance of
@@ -64,141 +62,136 @@
  */
 class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 {
-  public:
-    using Self = OutputFileFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for OutputFileFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for OutputFileFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-   * @brief New This function instantiates an instance of the OutputFileFilterParameter. Although this function is available to be used,
-   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_FILE_FP(...) macro at the top of this file.
-
-   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-   * @param propertyName The internal property name for this filter parameter.
-   * @param defaultValue The value that this filter parameter will be initialized to by default.
-   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-   * are three categories: Parameter, Required Arrays, and Created Arrays.
-   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @param fileExtension The possible file extensions that this OutputFileWidget accepts.
-  * @param fileType The possible file types that this OutputFileWidget accepts.
-   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+public:
+  using Self = OutputFileFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for OutputFileFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for OutputFileFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+ * @brief New This function instantiates an instance of the OutputFileFilterParameter. Although this function is available to be used,
+ * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_FILE_FP(...) macro at the top of this file.
+
+ * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+ * @param propertyName The internal property name for this filter parameter.
+ * @param defaultValue The value that this filter parameter will be initialized to by default.
+ * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+ * are three categories: Parameter, Required Arrays, and Created Arrays.
+ * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+* that this FilterParameter subclass represents.
+ * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+* that this FilterParameter subclass represents.
+* @param fileExtension The possible file extensions that this OutputFileWidget accepts.
+* @param fileType The possible file types that this OutputFileWidget accepts.
+ * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+ * @return
+ */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+
+  ~OutputFileFilterParameter() override;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
    * @return
    */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category,
-                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       const QString& fileExtension = QString(""),
-                       const QString& fileType = QString(""),
-                       int groupIndex = -1);
-
-    ~OutputFileFilterParameter() override;
-
-    /**
-     * @brief Setter property for FileExtension
-     */
-    void setFileExtension(const QString& value);
-    /**
-     * @brief Getter property for FileExtension
-     * @return Value of FileExtension
-     */
-    QString getFileExtension() const;
-
-    /**
-     * @brief Setter property for FileType
-     */
-    void setFileType(const QString& value);
-    /**
-     * @brief Getter property for FileType
-     * @return Value of FileType
-     */
-    QString getFileType() const;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    OutputFileFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    OutputFileFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief OutputFileFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    OutputFileFilterParameter();
-
-  public:
-    OutputFileFilterParameter(const OutputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    OutputFileFilterParameter(OutputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    OutputFileFilterParameter& operator=(const OutputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
-    OutputFileFilterParameter& operator=(OutputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    QString m_FileExtension = {};
-    QString m_FileType = {};
-    OutputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
-    OutputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  OutputFileFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  OutputFileFilterParameter::GetterCallbackType getGetterCallback() const;
 
+protected:
+  /**
+   * @brief OutputFileFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  OutputFileFilterParameter();
+
+public:
+  OutputFileFilterParameter(const OutputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  OutputFileFilterParameter(OutputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  OutputFileFilterParameter& operator=(const OutputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
+  OutputFileFilterParameter& operator=(OutputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FileExtension = {};
+  QString m_FileType = {};
+  OutputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
+  OutputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index 1288b07679..f372d49c72 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "OutputPathFilterParameter.h"
 
@@ -49,8 +49,8 @@ OutputPathFilterParameter::~OutputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 OutputPathFilterParameter::Pointer OutputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension, const QString& fileType,
-                                                                  int groupIndex)
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                  const QString& fileType, int groupIndex)
 {
   OutputPathFilterParameter::Pointer ptr = OutputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
old mode 100755
new mode 100644
index 103a3ecd20..5dce9f5dad
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
  * SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_OUTPUT_PATH_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (OutputPathFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_OUTPUT_PATH_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(OutputPathFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The OutputPathFilterParameter class is used by filters to instantiate an OutputPathWidget.  By instantiating an instance of
@@ -186,8 +184,8 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   OutputPathFilterParameter();
 
 public:
-  OutputPathFilterParameter(const OutputPathFilterParameter&) = delete; // Copy Constructor Not Implemented
-  OutputPathFilterParameter(OutputPathFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  OutputPathFilterParameter(const OutputPathFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  OutputPathFilterParameter(OutputPathFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   OutputPathFilterParameter& operator=(const OutputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   OutputPathFilterParameter& operator=(OutputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -197,4 +195,3 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   OutputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
   OutputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index e374ad53fc..38bbb35f22 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ParagraphFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
old mode 100755
new mode 100644
index 1ee49e777e..e6c8d24225
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -98,16 +98,16 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, bool allowPreflight = true,
-                     int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, bool allowPreflight = true, int groupIndex = -1);
 
   ~ParagraphFilterParameter() override;
 
   /**
- * @brief getWidgetType Returns the type of widget that displays and controls
- * this FilterParameter subclass
- * @return
- */
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
   QString getWidgetType() const override;
 
   /**
@@ -123,10 +123,10 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   void writeJson(QJsonObject& json) override;
 
   /**
-  * @brief SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * from the filter parameter.
-  */
+   * @brief SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
   /**
    * @brief Setter property for SetterCallback
    */
@@ -138,10 +138,10 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   ParagraphFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
-  * @brief GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The GetterCallback
-  */
+   * @brief GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
   /**
    * @brief Setter property for GetterCallback
    */
@@ -170,8 +170,8 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   ParagraphFilterParameter();
 
 public:
-  ParagraphFilterParameter(const ParagraphFilterParameter&) = delete; // Copy Constructor Not Implemented
-  ParagraphFilterParameter(ParagraphFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  ParagraphFilterParameter(const ParagraphFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ParagraphFilterParameter(ParagraphFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   ParagraphFilterParameter& operator=(const ParagraphFilterParameter&) = delete; // Copy Assignment Not Implemented
   ParagraphFilterParameter& operator=(ParagraphFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -180,4 +180,3 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
   ParagraphFilterParameter::GetterCallbackType m_GetterCallback = {};
   bool m_AllowPreflight = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 63a8a99db8..a0e1a3a099 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PhaseTypeSelectionFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
old mode 100755
new mode 100644
index 478d406d01..645474dbdf
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,18 +48,18 @@
 // FP: Documentation incomplete because there isn't currently a way to instantiate this filter parameter
 //     in one line.
 /**
-* @brief SIMPL_NEW_PHASETYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
-* PhaseTypeSelectionFilterParameter. There are 8 required parameters and 1 optional parameter
-* that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
-* FilterName (class name), PhaseTypesArrayName, PhaseTypeCountProperty, AttributeMatrixProperty, GroupIndex (optional).
-*/
+ * @brief SIMPL_NEW_PHASETYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * PhaseTypeSelectionFilterParameter. There are 8 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), PhaseTypesArrayName, PhaseTypeCountProperty, AttributeMatrixProperty, GroupIndex (optional).
+ */
 #define SIMPL_NEW_PHASETYPE_SELECTION_FP(...)                                                                                                                                                          \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(PhaseTypeSelectionFilterParameter, __VA_ARGS__))
 
 /**
-* @brief The PhaseTypeSelectionFilterParameter class is used by filters to instantiate an PhaseTypeSelectionWidget.  By instantiating an instance of
-* this class in a filter's setupFilterParameters() method, a PhaseTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
-*/
+ * @brief The PhaseTypeSelectionFilterParameter class is used by filters to instantiate an PhaseTypeSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a PhaseTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
 class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 {
 public:
@@ -161,22 +161,22 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   QStringList getPhaseListChoices() const;
 
   /**
-  * @brief getWidgetType Returns the type of widget that displays and controls
-  * this FilterParameter subclass
-  * @return
-  */
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
   QString getWidgetType() const override;
 
   /**
-  * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-  * @param json The QJsonObject that the filter parameter reads from.
-  */
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
   void readJson(const QJsonObject& json) override;
 
   /**
-  * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-  * @param json The QJsonObject that the filter parameter writes to.
-  */
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
   void writeJson(QJsonObject& json) override;
 
   /**
@@ -200,10 +200,10 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
-  * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The SetterCallback
-  */
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
   /**
    * @brief Setter property for SetterCallback
    */
@@ -215,10 +215,10 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   PhaseTypeSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
-  * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The GetterCallback
-  */
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
   /**
    * @brief Setter property for GetterCallback
    */
@@ -236,14 +236,14 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 
 protected:
   /**
-  * @brief PhaseTypeSelectionFilterParameter The default constructor.  It is protected because this
-  * filter parameter should only be instantiated using its New(...) function or short-form macro.
-  */
+   * @brief PhaseTypeSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   PhaseTypeSelectionFilterParameter();
 
 public:
-  PhaseTypeSelectionFilterParameter(const PhaseTypeSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-  PhaseTypeSelectionFilterParameter(PhaseTypeSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  PhaseTypeSelectionFilterParameter(const PhaseTypeSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  PhaseTypeSelectionFilterParameter(PhaseTypeSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   PhaseTypeSelectionFilterParameter& operator=(const PhaseTypeSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
   PhaseTypeSelectionFilterParameter& operator=(PhaseTypeSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -258,4 +258,3 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   PhaseTypeSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   PhaseTypeSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index c57d3ae110..e35980990f 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PreflightUpdatedValueFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
old mode 100755
new mode 100644
index cc23d75c98..6e691558d5
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -52,10 +51,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Estimated Primary Features", EstimatedPrimaryFeatures, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP(...) \
-  SIMPL_EXPAND(_FP_GET_PREFLIGHTUPDATEDVALUE_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5, SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4)\
-  (PreflightUpdatedValueFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP(...)                                                                                                                                                        \
+  SIMPL_EXPAND(_FP_GET_PREFLIGHTUPDATEDVALUE_OVERRIDE(__VA_ARGS__, SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5, SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4)(PreflightUpdatedValueFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The PreflightUpdatedValueFilterParameter class is used by filters to instantiate an PreflightUpdatedValueWidget.  By instantiating an instance of
@@ -63,97 +60,93 @@
  */
 class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParameter
 {
-  public:
-    using Self = PreflightUpdatedValueFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the PreflightUpdatedValueFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue,
-                       Category category, GetterCallbackType getterCallback,
-                       int groupIndex = -1);
-
-    ~PreflightUpdatedValueFilterParameter() override;
-
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const PreflightUpdatedValueFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    PreflightUpdatedValueFilterParameter::GetterCallbackType getGetterCallback() const;
-
-    /**
-     * @brief readJson
-     * @return
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson
-     * @return
-     */
-    void writeJson(QJsonObject& json) override;
-
-  protected:
-      /**
-       * @brief PreflightUpdatedValueFilterParameter The default constructor.  It is protected because this
-       * filter parameter should only be instantiated using its New(...) function or short-form macro.
-       */
-    PreflightUpdatedValueFilterParameter();
-
-  public:
-    PreflightUpdatedValueFilterParameter(const PreflightUpdatedValueFilterParameter&) = delete; // Copy Constructor Not Implemented
-    PreflightUpdatedValueFilterParameter(PreflightUpdatedValueFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    PreflightUpdatedValueFilterParameter& operator=(const PreflightUpdatedValueFilterParameter&) = delete; // Copy Assignment Not Implemented
-    PreflightUpdatedValueFilterParameter& operator=(PreflightUpdatedValueFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    PreflightUpdatedValueFilterParameter::GetterCallbackType m_GetterCallback = {};
+public:
+  using Self = PreflightUpdatedValueFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for PreflightUpdatedValueFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the PreflightUpdatedValueFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GetterCallbackType getterCallback, int groupIndex = -1);
+
+  ~PreflightUpdatedValueFilterParameter() override;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const PreflightUpdatedValueFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  PreflightUpdatedValueFilterParameter::GetterCallbackType getGetterCallback() const;
+
+  /**
+   * @brief readJson
+   * @return
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson
+   * @return
+   */
+  void writeJson(QJsonObject& json) override;
+
+protected:
+  /**
+   * @brief PreflightUpdatedValueFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  PreflightUpdatedValueFilterParameter();
+
+public:
+  PreflightUpdatedValueFilterParameter(const PreflightUpdatedValueFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  PreflightUpdatedValueFilterParameter(PreflightUpdatedValueFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  PreflightUpdatedValueFilterParameter& operator=(const PreflightUpdatedValueFilterParameter&) = delete; // Copy Assignment Not Implemented
+  PreflightUpdatedValueFilterParameter& operator=(PreflightUpdatedValueFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  PreflightUpdatedValueFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 488a27268d..d1ea2056cb 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RangeFilterParameter.h"
 
@@ -99,7 +99,7 @@ void RangeFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void RangeFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     FPRangePair dataPair = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index 64f3bfd66b..f0a57b93ef 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ReadASCIIDataFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 85478f6f5a..a0c41a12de 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -86,4 +86,3 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
 
 private:
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index 1fb0fc4f38..59e8477f68 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ScalarTypeFilterParameter.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -50,7 +49,7 @@ ScalarTypeFilterParameter::~ScalarTypeFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   ScalarTypeFilterParameter::Pointer ptr = ScalarTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index 5608df3499..81f7851ad8 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -55,13 +55,13 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_SCALARTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
  */
-#define SIMPL_NEW_SCALARTYPE_FP(...)                                                                                                                                                          \
+#define SIMPL_NEW_SCALARTYPE_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ScalarTypeFilterParameter, __VA_ARGS__))
 
 /**
-* @brief The ScalarTypeFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
-* this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
-*/
+ * @brief The ScalarTypeFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
 class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 {
 public:
@@ -104,35 +104,35 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category, 
-                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ScalarTypeFilterParameter() override;
 
   /**
-  * @brief getWidgetType Returns the type of widget that displays and controls
-  * this FilterParameter subclass
-  * @return
-  */
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
   QString getWidgetType() const override;
 
   /**
-  * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-  * @param json The QJsonObject that the filter parameter reads from.
-  */
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
   void readJson(const QJsonObject& json) override;
 
   /**
-  * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-  * @param json The QJsonObject that the filter parameter writes to.
-  */
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
   void writeJson(QJsonObject& json) override;
 
   /**
-  * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The SetterCallback
-  */
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
   /**
    * @brief Setter property for SetterCallback
    */
@@ -144,10 +144,10 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   ScalarTypeFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
-  * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The GetterCallback
-  */
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
   /**
    * @brief Setter property for GetterCallback
    */
@@ -160,14 +160,14 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 
 protected:
   /**
-  * @brief ScalarTypeFilterParameter The default constructor.  It is protected because this
-  * filter parameter should only be instantiated using its New(...) function or short-form macro.
-  */
+   * @brief ScalarTypeFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   ScalarTypeFilterParameter();
 
 public:
-  ScalarTypeFilterParameter(const ScalarTypeFilterParameter&) = delete; // Copy Constructor Not Implemented
-  ScalarTypeFilterParameter(ScalarTypeFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  ScalarTypeFilterParameter(const ScalarTypeFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ScalarTypeFilterParameter(ScalarTypeFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   ScalarTypeFilterParameter& operator=(const ScalarTypeFilterParameter&) = delete; // Copy Assignment Not Implemented
   ScalarTypeFilterParameter& operator=(ScalarTypeFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -175,4 +175,3 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   ScalarTypeFilterParameter::SetterCallbackType m_SetterCallback = {};
   ScalarTypeFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 24390e963e..2aba723a36 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SecondOrderPolynomialFilterParameter.h"
 
@@ -49,7 +49,8 @@ SecondOrderPolynomialFilterParameter::~SecondOrderPolynomialFilterParameter() =
 //
 // -----------------------------------------------------------------------------
 SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPoly_t& defaultValue,
-                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                        int groupIndex)
 {
 
   SecondOrderPolynomialFilterParameter::Pointer ptr = SecondOrderPolynomialFilterParameter::New();
@@ -98,7 +99,7 @@ void SecondOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void SecondOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     Float2ndOrderPoly_t poly = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
old mode 100755
new mode 100644
index 5eda683f04..1c4c82e4b0
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,9 +43,14 @@
 
 typedef struct
 {
-  float c20; float c02; float c11; float c10; float c01; float c00;
-
-  void writeJson(QJsonObject &json)
+  float c20;
+  float c02;
+  float c11;
+  float c10;
+  float c01;
+  float c00;
+
+  void writeJson(QJsonObject& json)
   {
     json["c20"] = c20;
     json["c02"] = c02;
@@ -55,10 +60,9 @@ typedef struct
     json["c00"] = c00;
   }
 
-  bool readJson(QJsonObject &json)
+  bool readJson(QJsonObject& json)
   {
-    if (json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble()
-      && json["c01"].isDouble() && json["c00"].isDouble())
+    if(json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
     {
       c20 = static_cast<float>(json["c20"].toDouble());
       c02 = static_cast<float>(json["c02"].toDouble());
@@ -86,10 +90,8 @@ Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_SecondO_POLY_FP("Second Order A Coefficients", SecondOrderACoeff, FilterParameter::Parameter, GenericExample, 0);
  */
-#define SIMPL_NEW_SecondO_POLY_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (SecondOrderPolynomialFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_SecondO_POLY_FP(...)                                                                                                                                                                 \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(SecondOrderPolynomialFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The SecondOrderPolynomialFilterParameter class is used by filters to instantiate an SecondOrderPolynomialWidget.  By instantiating an instance of
@@ -135,10 +137,8 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const Float2ndOrderPoly_t& defaultValue, Category category,
-     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-     int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~SecondOrderPolynomialFilterParameter() override;
 
@@ -147,60 +147,60 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const SecondOrderPolynomialFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    SecondOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const SecondOrderPolynomialFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    SecondOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief SecondOrderPolynomialFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const SecondOrderPolynomialFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  SecondOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const SecondOrderPolynomialFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  SecondOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief SecondOrderPolynomialFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   SecondOrderPolynomialFilterParameter();
 
 public:
-  SecondOrderPolynomialFilterParameter(const SecondOrderPolynomialFilterParameter&) = delete; // Copy Constructor Not Implemented
-  SecondOrderPolynomialFilterParameter(SecondOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  SecondOrderPolynomialFilterParameter(const SecondOrderPolynomialFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  SecondOrderPolynomialFilterParameter(SecondOrderPolynomialFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   SecondOrderPolynomialFilterParameter& operator=(const SecondOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   SecondOrderPolynomialFilterParameter& operator=(SecondOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -208,4 +208,3 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
   SecondOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
   SecondOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
index 4b9bea0e2d..0ba55b9496 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SeparatorFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
old mode 100755
new mode 100644
index b3bb1c5578..94be4257a8
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,57 +45,56 @@
  */
 class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
 {
-  public:
-    using Self = SeparatorFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = SeparatorFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for SeparatorFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for SeparatorFilterParameter
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for SeparatorFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for SeparatorFilterParameter
+   */
+  static QString ClassName();
 
-    /**
-     * @brief New This function instantiates an instance of the SeparatorFilterParameter.
+  /**
+   * @brief New This function instantiates an instance of the SeparatorFilterParameter.
 
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, FilterParameter::Category category);
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, FilterParameter::Category category);
 
-    ~SeparatorFilterParameter() override;
+  ~SeparatorFilterParameter() override;
 
-    /**
-     * @brief getWidgetType Returns the type of widget that displays and controls
-     * this FilterParameter subclass
-     * @return
-     */
-    QString getWidgetType() const override;
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
 
-  protected:
-    /**
-     * @brief SeparatorFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    SeparatorFilterParameter();
+protected:
+  /**
+   * @brief SeparatorFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  SeparatorFilterParameter();
 
-  public:
-    SeparatorFilterParameter(const SeparatorFilterParameter&) = delete; // Copy Constructor Not Implemented
-    SeparatorFilterParameter(SeparatorFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    SeparatorFilterParameter& operator=(const SeparatorFilterParameter&) = delete; // Copy Assignment Not Implemented
-    SeparatorFilterParameter& operator=(SeparatorFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  SeparatorFilterParameter(const SeparatorFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  SeparatorFilterParameter(SeparatorFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  SeparatorFilterParameter& operator=(const SeparatorFilterParameter&) = delete; // Copy Assignment Not Implemented
+  SeparatorFilterParameter& operator=(SeparatorFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 52addb3070..931195665a 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ShapeTypeSelectionFilterParameter.h"
 
@@ -51,8 +51,8 @@ ShapeTypeSelectionFilterParameter::~ShapeTypeSelectionFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& phaseTypeCountProperty,
-                                                                                  const QString& phaseTypeArrayPathProperty, int groupIndex)
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                  const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex)
 {
   ShapeTypeSelectionFilterParameter::Pointer ptr = ShapeTypeSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
old mode 100755
new mode 100644
index 3e7ce2f923..c3c2ca01d3
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,25 +43,25 @@
 #include "SIMPLib/Common/ShapeType.h"
 
 /**
-* @brief SIMPL_NEW_SHAPETYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
-* ShapeTypeSelectionFilterParameter. There are 6 required parameters and 1 optional parameter
-* that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
-* FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
-*
-* Therefore, the macro should be written like this (this is a concrete example):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName,
-* PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
-*
-* Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
-* SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
-*/
+ * @brief SIMPL_NEW_SHAPETYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
+ * ShapeTypeSelectionFilterParameter. There are 6 required parameters and 1 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_SHAPETYPE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName,
+ * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
+ * SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ */
 #define SIMPL_NEW_SHAPETYPE_SELECTION_FP(...)                                                                                                                                                          \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ShapeTypeSelectionFilterParameter, __VA_ARGS__))
 
 /**
-* @brief The ShapeTypeSelectionFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
-* this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
-*/
+ * @brief The ShapeTypeSelectionFilterParameter class is used by filters to instantiate an ShapeTypeSelectionWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, a ShapeTypeSelectionWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
 class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 {
 public:
@@ -104,8 +104,8 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex = -1);
 
   ~ShapeTypeSelectionFilterParameter() override;
 
@@ -130,29 +130,29 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   QString getPhaseTypeArrayPathProperty() const;
 
   /**
-  * @brief getWidgetType Returns the type of widget that displays and controls
-  * this FilterParameter subclass
-  * @return
-  */
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
   QString getWidgetType() const override;
 
   /**
-  * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-  * @param json The QJsonObject that the filter parameter reads from.
-  */
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
   void readJson(const QJsonObject& json) override;
 
   /**
-  * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-  * @param json The QJsonObject that the filter parameter writes to.
-  */
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
   void writeJson(QJsonObject& json) override;
 
   /**
-  * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The SetterCallback
-  */
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
   /**
    * @brief Setter property for SetterCallback
    */
@@ -164,10 +164,10 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   ShapeTypeSelectionFilterParameter::SetterCallbackType getSetterCallback() const;
 
   /**
-  * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @return The GetterCallback
-  */
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
   /**
    * @brief Setter property for GetterCallback
    */
@@ -180,14 +180,14 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 
 protected:
   /**
-  * @brief ShapeTypeSelectionFilterParameter The default constructor.  It is protected because this
-  * filter parameter should only be instantiated using its New(...) function or short-form macro.
-  */
+   * @brief ShapeTypeSelectionFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   ShapeTypeSelectionFilterParameter();
 
 public:
-  ShapeTypeSelectionFilterParameter(const ShapeTypeSelectionFilterParameter&) = delete; // Copy Constructor Not Implemented
-  ShapeTypeSelectionFilterParameter(ShapeTypeSelectionFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  ShapeTypeSelectionFilterParameter(const ShapeTypeSelectionFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ShapeTypeSelectionFilterParameter(ShapeTypeSelectionFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   ShapeTypeSelectionFilterParameter& operator=(const ShapeTypeSelectionFilterParameter&) = delete; // Copy Assignment Not Implemented
   ShapeTypeSelectionFilterParameter& operator=(ShapeTypeSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -197,4 +197,3 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   ShapeTypeSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   ShapeTypeSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index 99f9e13162..a985d39190 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StringFilterParameter.h"
 
@@ -48,7 +48,8 @@ StringFilterParameter::~StringFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringFilterParameter::Pointer StringFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+StringFilterParameter::Pointer StringFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   StringFilterParameter::Pointer ptr = StringFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
old mode 100755
new mode 100644
index 05ddcaa202..4bbd3afed4
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,10 +53,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Parameter, GenericExample);
  */
-#define SIMPL_NEW_STRING_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (StringFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_STRING_FP(...)                                                                                                                                                                       \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(StringFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The StringFilterParameter class is used by filters to instantiate an StringWidget.  By instantiating an instance of
@@ -64,114 +62,112 @@
  */
 class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
 {
-  public:
-    using Self = StringFilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for StringFilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for StringFilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(QString)>;
-    using GetterCallbackType = std::function<QString(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the StringFilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_STRING_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-                       const QString& defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex = -1);
-
-    ~StringFilterParameter() override;
-
-    /**
+public:
+  using Self = StringFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for StringFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for StringFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the StringFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_STRING_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~StringFilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const StringFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    StringFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const StringFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    StringFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief StringFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    StringFilterParameter();
-
-  public:
-    StringFilterParameter(const StringFilterParameter&) = delete;            // Copy Constructor Not Implemented
-    StringFilterParameter(StringFilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    StringFilterParameter& operator=(const StringFilterParameter&) = delete; // Copy Assignment Not Implemented
-    StringFilterParameter& operator=(StringFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    StringFilterParameter::SetterCallbackType m_SetterCallback = {};
-    StringFilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
 
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const StringFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  StringFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const StringFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  StringFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief StringFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  StringFilterParameter();
+
+public:
+  StringFilterParameter(const StringFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  StringFilterParameter(StringFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  StringFilterParameter& operator=(const StringFilterParameter&) = delete; // Copy Assignment Not Implemented
+  StringFilterParameter& operator=(StringFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  StringFilterParameter::SetterCallbackType m_SetterCallback = {};
+  StringFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 0de6dae0fd..027a9c7ffa 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QPair>
 
@@ -89,7 +89,6 @@
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
-
 class FilterParametersRWTest
 {
 public:
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index 9f0943198c..8fee8ac4dc 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ThirdOrderPolynomialFilterParameter.h"
 
@@ -49,7 +49,8 @@ ThirdOrderPolynomialFilterParameter::~ThirdOrderPolynomialFilterParameter() = de
 //
 // -----------------------------------------------------------------------------
 ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue,
-                                                                                      Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+                                                                                      Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                      int groupIndex)
 {
 
   ThirdOrderPolynomialFilterParameter::Pointer ptr = ThirdOrderPolynomialFilterParameter::New();
@@ -98,7 +99,7 @@ void ThirdOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 void ThirdOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
 {
-  if (m_GetterCallback)
+  if(m_GetterCallback)
   {
     Float3rdOrderPoly_t poly = m_GetterCallback();
     QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
old mode 100755
new mode 100644
index 6b1325cc77..12421b67c8
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -54,10 +54,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_ThirdO_POLY_FP("Third Order A Coefficients", ThirdOrderACoeff, FilterParameter::Parameter, WarpRegularGrid, 1);
  */
-#define SIMPL_NEW_ThirdO_POLY_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (ThirdOrderPolynomialFilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_ThirdO_POLY_FP(...)                                                                                                                                                                  \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ThirdOrderPolynomialFilterParameter, __VA_ARGS__))
 
 /**
  * @brief The ThirdOrderPolynomialFilterParameter class is used by filters to instantiate an ThirdOrderPolynomialWidget.  By instantiating an instance of
@@ -103,72 +101,70 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-    static Pointer New(const QString& humanLabel, const QString& propertyName,
-    const Float3rdOrderPoly_t& defaultValue, Category category,
-    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-    int groupIndex = -1);
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
 
-    ~ThirdOrderPolynomialFilterParameter() override;
+  ~ThirdOrderPolynomialFilterParameter() override;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The SetterCallback
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const ThirdOrderPolynomialFilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    ThirdOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const ThirdOrderPolynomialFilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    ThirdOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief ThirdOrderPolynomialFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The SetterCallback
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const ThirdOrderPolynomialFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  ThirdOrderPolynomialFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const ThirdOrderPolynomialFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  ThirdOrderPolynomialFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief ThirdOrderPolynomialFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
   ThirdOrderPolynomialFilterParameter();
 
 public:
-  ThirdOrderPolynomialFilterParameter(const ThirdOrderPolynomialFilterParameter&) = delete; // Copy Constructor Not Implemented
-  ThirdOrderPolynomialFilterParameter(ThirdOrderPolynomialFilterParameter&&) = delete;      // Move Constructor Not Implemented
+  ThirdOrderPolynomialFilterParameter(const ThirdOrderPolynomialFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  ThirdOrderPolynomialFilterParameter(ThirdOrderPolynomialFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   ThirdOrderPolynomialFilterParameter& operator=(const ThirdOrderPolynomialFilterParameter&) = delete; // Copy Assignment Not Implemented
   ThirdOrderPolynomialFilterParameter& operator=(ThirdOrderPolynomialFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
@@ -176,4 +172,3 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
   ThirdOrderPolynomialFilterParameter::SetterCallbackType m_SetterCallback = {};
   ThirdOrderPolynomialFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
-
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index c49447fb19..7eb86e828b 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2019-2019 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UInt64FilterParameter.h"
 
@@ -46,7 +46,8 @@ UInt64FilterParameter::~UInt64FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-UInt64FilterParameter::Pointer UInt64FilterParameter::New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+UInt64FilterParameter::Pointer UInt64FilterParameter::New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                          const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   UInt64FilterParameter::Pointer ptr = UInt64FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 507cbd5779..dcca6b0c56 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -51,10 +51,8 @@
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
  */
-#define SIMPL_NEW_UINT64_FP(...) \
-  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, \
-  SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)\
-  (UInt64FilterParameter, __VA_ARGS__))
+#define SIMPL_NEW_UINT64_FP(...)                                                                                                                                                                       \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(UInt64FilterParameter, __VA_ARGS__))
 
 /**
  * @brief The UInt64FilterParameter class is used by filters to instantiate an IntWidget.  By instantiating an instance of
@@ -62,113 +60,112 @@
  */
 class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
 {
-  public:
-    using Self = UInt64FilterParameter;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for UInt64FilterParameter
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for UInt64FilterParameter
-     */
-    static QString ClassName();
-
-    using SetterCallbackType = std::function<void(uint64_t)>;
-    using GetterCallbackType = std::function<uint64_t(void)>;
-
-    /**
-     * @brief New This function instantiates an instance of the UInt64FilterParameter. Although this function is available to be used,
-     * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
-
-     * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-     * @param propertyName The internal property name for this filter parameter.
-     * @param defaultValue The value that this filter parameter will be initialized to by default.
-     * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-     * are three categories: Parameter, Required Arrays, and Created Arrays.
-     * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-     * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-     * @return
-     */
-    static Pointer New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                       int groupIndex = -1);
-
-    ~UInt64FilterParameter() override;
-
-    /**
+public:
+  using Self = UInt64FilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for UInt64FilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for UInt64FilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(uint64_t)>;
+  using GetterCallbackType = std::function<uint64_t(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the UInt64FilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INTEGER_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+
+  ~UInt64FilterParameter() override;
+
+  /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
-
-    /**
-     * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-     * @param json The QJsonObject that the filter parameter reads from.
-     */
-    void readJson(const QJsonObject& json) override;
-
-    /**
-     * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-     * @param json The QJsonObject that the filter parameter writes to.
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * from the filter parameter.
-    */
-    /**
-     * @brief Setter property for SetterCallback
-     */
-    void setSetterCallback(const UInt64FilterParameter::SetterCallbackType& value);
-    /**
-     * @brief Getter property for SetterCallback
-     * @return Value of SetterCallback
-     */
-    UInt64FilterParameter::SetterCallbackType getSetterCallback() const;
-
-    /**
-    * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-    * that this FilterParameter subclass represents.
-    * @return The GetterCallback
-    */
-    /**
-     * @brief Setter property for GetterCallback
-     */
-    void setGetterCallback(const UInt64FilterParameter::GetterCallbackType& value);
-    /**
-     * @brief Getter property for GetterCallback
-     * @return Value of GetterCallback
-     */
-    UInt64FilterParameter::GetterCallbackType getGetterCallback() const;
-
-  protected:
-    /**
-     * @brief UInt64FilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    UInt64FilterParameter();
-
-  public:
-    UInt64FilterParameter(const UInt64FilterParameter&) = delete;            // Copy Constructor Not Implemented
-    UInt64FilterParameter(UInt64FilterParameter&&) = delete;                 // Move Constructor Not Implemented
-    UInt64FilterParameter& operator=(const UInt64FilterParameter&) = delete; // Copy Assignment Not Implemented
-    UInt64FilterParameter& operator=(UInt64FilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    UInt64FilterParameter::SetterCallbackType m_SetterCallback = {};
-    UInt64FilterParameter::GetterCallbackType m_GetterCallback = {};
-};
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
 
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const UInt64FilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  UInt64FilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const UInt64FilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  UInt64FilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief UInt64FilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  UInt64FilterParameter();
+
+public:
+  UInt64FilterParameter(const UInt64FilterParameter&) = delete;            // Copy Constructor Not Implemented
+  UInt64FilterParameter(UInt64FilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  UInt64FilterParameter& operator=(const UInt64FilterParameter&) = delete; // Copy Assignment Not Implemented
+  UInt64FilterParameter& operator=(UInt64FilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  UInt64FilterParameter::SetterCallbackType m_SetterCallback = {};
+  UInt64FilterParameter::GetterCallbackType m_GetterCallback = {};
+};
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
index ab021eeccf..8ca2acdccd 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UnknownFilterParameter.h"
 
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
old mode 100755
new mode 100644
index 509d1c1642..9a29e8a85f
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
@@ -85,21 +84,20 @@ class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
    * this FilterParameter subclass
    * @return
    */
-    QString getWidgetType() const override;
+  QString getWidgetType() const override;
 
-  protected:
-    /**
-     * @brief UnknownFilterParameter The default constructor.  It is protected because this
-     * filter parameter should only be instantiated using its New(...) function or short-form macro.
-     */
-    UnknownFilterParameter();
+protected:
+  /**
+   * @brief UnknownFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  UnknownFilterParameter();
 
-  public:
-    UnknownFilterParameter(const UnknownFilterParameter&) = delete; // Copy Constructor Not Implemented
-    UnknownFilterParameter(UnknownFilterParameter&&) = delete;      // Move Constructor Not Implemented
-    UnknownFilterParameter& operator=(const UnknownFilterParameter&) = delete; // Copy Assignment Not Implemented
-    UnknownFilterParameter& operator=(UnknownFilterParameter&&) = delete;      // Move Assignment Not Implemented
+public:
+  UnknownFilterParameter(const UnknownFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  UnknownFilterParameter(UnknownFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  UnknownFilterParameter& operator=(const UnknownFilterParameter&) = delete; // Copy Assignment Not Implemented
+  UnknownFilterParameter& operator=(UnknownFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.cpp b/Source/SIMPLib/Filtering/AbstractComparison.cpp
index 2b038a7211..57957fffc0 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.cpp
+++ b/Source/SIMPLib/Filtering/AbstractComparison.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractComparison.h"
 
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index f2b05860da..3a5c8aaa09 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,9 +43,9 @@
 #include <QtCore/QJsonObject>
 
 /**
-* @brief The AbstractComparison class is used by ComparisonInputsAdvanced as a
-* base for both ComparisonSet and ComparisonValue.
-*/
+ * @brief The AbstractComparison class is used by ComparisonInputsAdvanced as a
+ * base for both ComparisonSet and ComparisonValue.
+ */
 class SIMPLib_EXPORT AbstractComparison
 {
 
@@ -117,4 +117,3 @@ class SIMPLib_EXPORT AbstractComparison
 
 private:
 };
-
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index fe4256e69b..ba4a7664cb 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <memory>
 
@@ -85,7 +85,6 @@ void AbstractDecisionFilter::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
old mode 100755
new mode 100644
index aa9d36990a..d1dcbe8fca
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,7 +53,7 @@ class AbstractDecisionFilter : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -78,9 +78,9 @@ class AbstractDecisionFilter : public AbstractFilter
   ~AbstractDecisionFilter() override;
 
   /**
-  * @brief
-  * @param jsonDoc
-  */
+   * @brief
+   * @param jsonDoc
+   */
   virtual void extractProperties(const QJsonDocument& jsonDoc);
 
   /**
@@ -129,7 +129,6 @@ class AbstractDecisionFilter : public AbstractFilter
    */
   void execute() override;
 
-
 signals:
   void decisionMade(bool& dm);
   void targetValue(int& value);
@@ -147,11 +146,10 @@ class AbstractDecisionFilter : public AbstractFilter
   void initialize();
 
 public:
-  AbstractDecisionFilter(const AbstractDecisionFilter&) = delete; // Copy Constructor Not Implemented
-  AbstractDecisionFilter(AbstractDecisionFilter&&) = delete;      // Move Constructor Not Implemented
+  AbstractDecisionFilter(const AbstractDecisionFilter&) = delete;            // Copy Constructor Not Implemented
+  AbstractDecisionFilter(AbstractDecisionFilter&&) = delete;                 // Move Constructor Not Implemented
   AbstractDecisionFilter& operator=(const AbstractDecisionFilter&) = delete; // Copy Assignment Not Implemented
   AbstractDecisionFilter& operator=(AbstractDecisionFilter&&) = delete;      // Move Assignment Not Implemented
 
 private:
 };
-
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
old mode 100755
new mode 100644
index d81ae4226f..ed31953b9a
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -76,13 +76,13 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   Q_PROPERTY(int Cancel READ getCancel WRITE setCancel)
   Q_PROPERTY(bool Enabled READ getEnabled WRITE setEnabled)
   Q_PROPERTY(bool Removing READ getRemoving WRITE setRemoving)
-  
+
   // This line MUST be first when exposing a class and properties to Python
 
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(AbstractFilter)
   PYB11_SHARED_POINTERS(AbstractFilter)
-  PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)  
+  PYB11_PROPERTY(QString NameOfClass READ getNameOfClass)
   PYB11_PROPERTY(QString GroupName READ getGroupName)
   PYB11_PROPERTY(QString SubGroupName READ getSubGroupName)
   PYB11_PROPERTY(QString HumanLabel READ getHumanLabel)
@@ -191,41 +191,41 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   virtual void setupFilterParameters();
 
   /**
-  * @brief readFilterParameters Reads the filter parameters from a file
-  * @param reader Reader that is used to read the parameters from a file
-  */
+   * @brief readFilterParameters Reads the filter parameters from a file
+   * @param reader Reader that is used to read the parameters from a file
+   */
   virtual void readFilterParameters(AbstractFilterParametersReader* reader, int index);
 
   /**
-  * @brief readFilterParametersFromJson Reads the filter parameters from a file
-  * @param reader Reader that is used to read the parameters from a file
-  */
+   * @brief readFilterParametersFromJson Reads the filter parameters from a file
+   * @param reader Reader that is used to read the parameters from a file
+   */
   virtual void readFilterParameters(QJsonObject& obj);
 
   /**
    * @brief This method is called just before the writeFilterParameters() completes
-  * @param obj The json object to add the filter parameters into
+   * @param obj The json object to add the filter parameters into
    * @param rootObject The parent object of **obj**
    */
   virtual void preWriteFilterParameters(QJsonObject& obj, QJsonObject& rootObject);
 
   /**
-  * @brief writeFilterParametersToJson Writes the filter parameters to a file
-  * @param obj The json object to add the filter parameters into
-  */
+   * @brief writeFilterParametersToJson Writes the filter parameters to a file
+   * @param obj The json object to add the filter parameters into
+   */
   virtual void writeFilterParameters(QJsonObject& obj) const;
 
   /**
    * @brief This method is called just after the writeFilterParameters() completes
-  * @param obj The json object to add the filter parameters into
+   * @param obj The json object to add the filter parameters into
    * @param rootObject The parent object of **obj**
    */
   virtual void postWriteFilterParameters(QJsonObject& obj, QJsonObject& rootObject);
 
   /**
-  * @brief toJson Returns the filter and its parameters as a QJsonObject
-  * @return
-  */
+   * @brief toJson Returns the filter and its parameters as a QJsonObject
+   * @return
+   */
   virtual QJsonObject toJson();
 
   /**
@@ -329,8 +329,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   // ------------------------------
 
   /**
-  * @brief This property tells which index the filter is in a pipeline
-  */
+   * @brief This property tells which index the filter is in a pipeline
+   */
   /**
    * @brief Setter property for PipelineIndex
    */
@@ -342,8 +342,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   int getPipelineIndex() const;
 
   /**
-  * @brief Returns the previous filter
-  */
+   * @brief Returns the previous filter
+   */
   /**
    * @brief Setter property for PreviousFilter
    */
@@ -355,8 +355,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   AbstractFilter::WeakPointer getPreviousFilter() const;
 
   /**
-  * @brief Returns the next filter in the pipeline
-  */
+   * @brief Returns the next filter in the pipeline
+   */
   /**
    * @brief Setter property for NextFilter
    */
@@ -450,7 +450,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   /**
    * @brief notifyMissingProperty
    * @param filterParameter
-  */
+   */
   void notifyMissingProperty(FilterParameter* filterParameter);
 
   //---------------
@@ -491,10 +491,10 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   void filterInProgress(AbstractFilter* filter);
 
   /**
-  * @brief Signal is emitted when a DataArrayPath property is updated
-  * @param propertyName
-  * @param renamePath
-  */
+   * @brief Signal is emitted when a DataArrayPath property is updated
+   * @param propertyName
+   * @param renamePath
+   */
   void dataArrayPathUpdated(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
   /**
@@ -522,8 +522,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
 public slots:
 
   /**
-    * @brief Cancel the operation
-    */
+   * @brief Cancel the operation
+   */
   virtual void setCancel(bool value);
 
   /**
@@ -534,10 +534,10 @@ public slots:
   virtual void renameDataArrayPath(const DataArrayPath::RenameType& renamePath);
 
   /**
-  * @brief Updates any DataArrayPath properties from the old paths to their corresponding new paths.
-  * For DataArrayPaths longer than the new path, only the values provided by the new path are modified
-  * @param renamedPaths
-  */
+   * @brief Updates any DataArrayPath properties from the old paths to their corresponding new paths.
+   * For DataArrayPaths longer than the new path, only the values provided by the new path are modified
+   * @param renamedPaths
+   */
   inline void renameDataArrayPaths(const DataArrayPath::RenameContainer& renamedPaths)
   {
     for(const DataArrayPath::RenameType& rename : renamedPaths)
@@ -595,9 +595,8 @@ protected slots:
   DataArrayPath::RenameContainer m_RenamedPaths;
 
 public:
-  AbstractFilter(const AbstractFilter&) = delete; // Copy Constructor Not Implemented
-  AbstractFilter(AbstractFilter&&) = delete;      // Move Constructor Not Implemented
+  AbstractFilter(const AbstractFilter&) = delete;            // Copy Constructor Not Implemented
+  AbstractFilter(AbstractFilter&&) = delete;                 // Move Constructor Not Implemented
   AbstractFilter& operator=(const AbstractFilter&) = delete; // Copy Assignment Not Implemented
   AbstractFilter& operator=(AbstractFilter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.cpp b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
index ae93fe4d28..5358952356 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonInputs.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
old mode 100755
new mode 100644
index 73573865e7..384300889a
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,7 +48,7 @@ typedef struct
   PYB11_PROPERTY(QString dataContainerName)
   PYB11_PROPERTY(QString attributeMatrixName)
   PYB11_PROPERTY(QString attributeArrayName)
-  PYB11_PROPERTY(int compOperator) 
+  PYB11_PROPERTY(int compOperator)
   PYB11_PROPERTY(double compValue)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
@@ -134,4 +134,3 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
 
 Q_DECLARE_METATYPE(ComparisonInput_t)
 Q_DECLARE_METATYPE(ComparisonInputs)
-
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
index f66f20b354..8441afd490 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonInputsAdvanced.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index 8f6a454d8d..fbfbf2d402 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -83,12 +83,12 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   int size();
 
   /**
-    * @brief Adds a new input to the list of comparisons
-    * @param unionOperator
-    * @param arrayName
-    * @param compOperator
-    * @param compValue
-    */
+   * @brief Adds a new input to the list of comparisons
+   * @param unionOperator
+   * @param arrayName
+   * @param compOperator
+   * @param compValue
+   */
   void addInput(int unionOperator, const QString arrayName, int compOperator, double compValue);
 
   /**
@@ -137,8 +137,8 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   QString getAttributeMatrixName();
 
   /**
-  * @brief Returns the DataArrayPath to the selected AttributeMatrix
-  */
+   * @brief Returns the DataArrayPath to the selected AttributeMatrix
+   */
   DataArrayPath getAttributeMatrixPath();
 
   /**
@@ -191,7 +191,7 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   void setInvert(bool invert);
 
   /**
-   * @brief Loads data from json 
+   * @brief Loads data from json
    * @param obj
    */
   void readJson(QJsonObject obj);
@@ -211,4 +211,3 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
 };
 
 Q_DECLARE_METATYPE(ComparisonInputsAdvanced)
-
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.cpp b/Source/SIMPLib/Filtering/ComparisonSet.cpp
index 573106545c..7ba48986a1 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonSet.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSet.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 0658bb93a1..2cef417327 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,9 +42,9 @@
 #include <QtCore/QVector>
 
 /**
-* @brief The ComparisonSet class is used by ComparisonInputsAdvanced to group ComparisonValues
-* as a single entity to apply union operators or invert the resulting comparison of the group.
-*/
+ * @brief The ComparisonSet class is used by ComparisonInputsAdvanced to group ComparisonValues
+ * as a single entity to apply union operators or invert the resulting comparison of the group.
+ */
 class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
 {
   using AbstractComparisonPtr = AbstractComparison::Pointer;
@@ -84,66 +84,66 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
   ~ComparisonSet() override;
 
   /**
-  * @brief Write ComparisonSet to JSon
-  * @param json
-  */
+   * @brief Write ComparisonSet to JSon
+   * @param json
+   */
   void writeJson(QJsonObject& json) override;
   /**
-  * @brief Read ComparisonSet from JSon
-  * @param json
-  */
+   * @brief Read ComparisonSet from JSon
+   * @param json
+   */
   bool readJson(QJsonObject& json) override;
 
   /**
-  * @brief Returns whether or not the results from the comparison have their values flipped
-  * @return
-  */
+   * @brief Returns whether or not the results from the comparison have their values flipped
+   * @return
+   */
   bool getInvertComparison();
   /**
-  * @brief Return the comparisons contained by the ComparisonSet
-  * @return
-  */
+   * @brief Return the comparisons contained by the ComparisonSet
+   * @return
+   */
   QVector<AbstractComparison::Pointer> getComparisons();
 
   /**
-  * @brief Specifies whether or not the results from the comparison should have their values flipped
-  * @param invert
-  */
+   * @brief Specifies whether or not the results from the comparison should have their values flipped
+   * @param invert
+   */
   void setInvertComparison(bool invert);
   /**
-  * @brief Changes the comparisons used by the ComparisonSet to a new set
-  * @param comparisonValues
-  */
+   * @brief Changes the comparisons used by the ComparisonSet to a new set
+   * @param comparisonValues
+   */
   void setComparisons(QVector<AbstractComparison::Pointer> comparisonValues);
 
   /**
-  * @brief Adds a new comparison to the end of the ComparisonSet
-  * @param comparison
-  */
+   * @brief Adds a new comparison to the end of the ComparisonSet
+   * @param comparison
+   */
   void addComparison(AbstractComparison::Pointer comparison);
   /**
-  * @brief Adds a new comparison to the ComparisonSet at the given index
-  * @param index
-  * @param comparison
-  */
+   * @brief Adds a new comparison to the ComparisonSet at the given index
+   * @param index
+   * @param comparison
+   */
   void insertComparison(int index, AbstractComparison::Pointer comparison);
 
   /**
-  * @brief Returns whether or not the ComparisonSet contains any ComparisonValues
-  * @return
-  */
+   * @brief Returns whether or not the ComparisonSet contains any ComparisonValues
+   * @return
+   */
   bool hasComparisonValue();
   /**
-  * @brief Returns any ComparisonValues contained within the ComparisonSet
-  * @return
-  */
+   * @brief Returns any ComparisonValues contained within the ComparisonSet
+   * @return
+   */
   QVector<AbstractComparison::Pointer> getComparisonValues();
 
   /**
-  * @brief Checks the comparison's DataArray options based on the renamed path. Returns true if the comparison was changed
-  * @param renamePath
-  * @return
-  */
+   * @brief Checks the comparison's DataArray options based on the renamed path. Returns true if the comparison was changed
+   * @param renamePath
+   * @return
+   */
   bool renameDataArrayPath(DataArrayPath::RenameType renamePath) override;
 
 protected:
@@ -154,4 +154,3 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
 
 private:
 };
-
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.cpp b/Source/SIMPLib/Filtering/ComparisonValue.cpp
index e7e137b271..8c12dbcf52 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonValue.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonValue.h"
 
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 63d1a95fbd..9e06adb4a6 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,9 +43,9 @@
 #include "SIMPLib/Filtering/ComparisonSet.h"
 
 /**
-* @brief The ComparisonValue class is used to store comparison operators, values, and DataArray names
-* to be used for ComparisonInputsAdvanced
-*/
+ * @brief The ComparisonValue class is used to store comparison operators, values, and DataArray names
+ * to be used for ComparisonInputsAdvanced
+ */
 class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
 {
   // Start Python bindings declarations
@@ -82,69 +82,69 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
   ~ComparisonValue() override;
 
   /**
-  * @brief Writes the ComparisonValue to JSon
-  * @param json
-  */
+   * @brief Writes the ComparisonValue to JSon
+   * @param json
+   */
   void writeJson(QJsonObject& json) override;
 
   /**
-  * @brief Reads the ComparisonValue from JSon
-  * @param json
-  */
+   * @brief Reads the ComparisonValue from JSon
+   * @param json
+   */
   bool readJson(QJsonObject& json) override;
 
   /**
-  * @brief Returns the AttributeArray name
-  * @return
-  */
+   * @brief Returns the AttributeArray name
+   * @return
+   */
   QString getAttributeArrayName();
 
   /**
-  * @brief Returns the comparison operator used
-  * @return
-  */
+   * @brief Returns the comparison operator used
+   * @return
+   */
   int getCompOperator();
 
   /**
-  * @brief Returns the value used by the ComparisonValue
-  */
+   * @brief Returns the value used by the ComparisonValue
+   */
   double getCompValue();
 
   /**
-  * @brief Sets the AttributeArrayName used
-  * @param name
-  */
+   * @brief Sets the AttributeArrayName used
+   * @param name
+   */
   void setAttributeArrayName(QString name);
 
   /**
-  * @brief Sets the comparison operator used
-  * @param compOperator
-  */
+   * @brief Sets the comparison operator used
+   * @param compOperator
+   */
   void setCompOperator(int compOperator);
 
   /**
-  * @brief Sets the value used by the comparison
-  * @param value
-  */
+   * @brief Sets the value used by the comparison
+   * @param value
+   */
   void setCompValue(double value);
 
   /**
-  * @brief Returns the parent ComparisonSet
-  * @return
-  */
+   * @brief Returns the parent ComparisonSet
+   * @return
+   */
   ComparisonSet::Pointer getParentSet();
 
   /**
-  * @brief Changes the parent ComparisonSet
-  * @param parentSet
-  */
+   * @brief Changes the parent ComparisonSet
+   * @param parentSet
+   */
   void setParentSet(ComparisonSet::Pointer parentSet);
 
   /**
-  * @brief Checks the comparison's DataArray options based on the renamed path. Returns true if the comparison was changed
-  * @param renamePath
-  * @return
-  */
+   * @brief Checks the comparison's DataArray options based on the renamed path. Returns true if the comparison was changed
+   * @param renamePath
+   * @return
+   */
   bool renameDataArrayPath(DataArrayPath::RenameType renamePath) override;
 
 protected:
diff --git a/Source/SIMPLib/Filtering/CoreConstants.h b/Source/SIMPLib/Filtering/CoreConstants.h
index 2f95915f14..7123273493 100644
--- a/Source/SIMPLib/Filtering/CoreConstants.h
+++ b/Source/SIMPLib/Filtering/CoreConstants.h
@@ -35,24 +35,22 @@
 #include <QtCore/QString>
 
 /**
-* @brief This namespace is used to define some Constants for the plugin itself.
-*/
+ * @brief This namespace is used to define some Constants for the plugin itself.
+ */
 namespace CoreConstants
 {
-  const QString CorePluginFile("CorePlugin");
-  const QString CorePluginDisplayName("Core");
-  const QString CoreBaseName("Core");
-}
+const QString CorePluginFile("CorePlugin");
+const QString CorePluginDisplayName("Core");
+const QString CoreBaseName("Core");
+} // namespace CoreConstants
 
 /**
-* @brief Use this namespace to define any custom GUI widgets that collect FilterParameters
-* for a filter. Do NOT define general reusable widgets here.
-*/
+ * @brief Use this namespace to define any custom GUI widgets that collect FilterParameters
+ * for a filter. Do NOT define general reusable widgets here.
+ */
 namespace FilterParameterWidgetType
 {
 
-  /*  const QString SomeCustomWidget("SomeCustomWidget"); */
+/*  const QString SomeCustomWidget("SomeCustomWidget"); */
 
 }
-
-
diff --git a/Source/SIMPLib/Filtering/CorePlugin.h b/Source/SIMPLib/Filtering/CorePlugin.h
index a31d0285de..59cebaa143 100644
--- a/Source/SIMPLib/Filtering/CorePlugin.h
+++ b/Source/SIMPLib/Filtering/CorePlugin.h
@@ -46,144 +46,140 @@
  */
 class CorePlugin : public QObject, public ISIMPLibPlugin
 {
-    Q_OBJECT
-    Q_INTERFACES(ISIMPLibPlugin)
-    Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.CorePlugin")
-
-
-  public:
-    CorePlugin();
-    ~CorePlugin() override;
-    /**
-     * @brief Returns the name of the plugin that appears on the file system. 
-     * 
-     * Note that if the build is a debug build there will be a _Plugin postfix
-     * to the filename.
-     */
-    QString getPluginFileName() override;
-    
-    /**
-     * @brief getPluginDisplayName The name that should be used for human facing
-     * labels and display strings
-     * @return 
-     */
-    QString getPluginDisplayName() override;
-    
-    /**
-     * @brief getPluginBaseName The Name of the plugin.
-     * 
-     * This typically will NOT have the Plugin suffix.
-     * @return 
-     */
-    QString getPluginBaseName() override;
-
-    /**
-     * @brief Returns the version
-     */
-    QString getVersion() override;
-
-    /**
-    * @brief Returns the compatibility version
-    */
-    QString getCompatibilityVersion() override;
-
-    /**
-    * @brief Returns the name of the vendor
-    */
-    QString getVendor() override;
-
-    /**
-     * @brief Returns the URL of the plugin
-     */
-    QString getURL() override;
-
-    /**
-     * @brief Returns the location of the plugin
-     */
-    QString getLocation() override;
-
-    /**
-     * @brief Returns the description of the plugin
-     */
-    QString getDescription() override;
-
-    /**
-     * @brief Returns the copyright of the plugin
-     */
-    QString getCopyright() override;
-
-    /**
-     * @brief Returns the license of the plugin
-     */
-    QString getLicense() override;
-
-    /**
-     * @brief Returns the filters of the plugin
-     */
-    QList<QString> getFilters() override;
-
-    /**
-     * @brief Returns the third party licenses of the plugin
-     */
-    QMap<QString, QString> getThirdPartyLicenses() override;
-
-    /**
-     * @brief Returns the load status of the plugin
-     */
-    bool getDidLoad() override;
-
-    /**
-     * @brief Sets the load status of the plugin
-     */
-    void setDidLoad(bool didLoad) override;
-
-    /**
-     * @brief Sets the location of the plugin on the file system.
-     * This is required so that we can cache the file path information
-     * as the plugin is loaded.
-     */
-    void setLocation(QString filePath) override;
-
-    /**
-     * @brief Register all the filters with the FilterWidgetFactory
-     */
-    void registerFilterWidgets(FilterWidgetManager* fwm) override;
-
-    /**
-    * @brief This registers the filters that this plugin implements with the Filter Manager that is passed in
-    * @param fm The FilterManager to register the filters into.
-    */
-    void registerFilters(FilterManager* fm) override;
-
-
-    /**
-     * @brief Writes the settings in the input gui to the Application's preference file
-     * @param prefs A valid QSettings pointer.
-     */
-    void writeSettings(QSettings& prefs) override;
-
-    /**
-     * @brief Reads the settings from the Application's preference file and sets
-     * the input GUI widgets accordingly.
-     * @param prefs
-     */
-    void readSettings(QSettings& prefs) override;
-
-  private:
-    QString             m_Version;
-    QString             m_CompatibilityVersion;
-    QString             m_Vendor;
-    QString             m_URL;
-    QString             m_Location;
-    QString             m_Copyright;
-    QList<QString>      m_Filters;
-    bool                m_DidLoad;
-
-  public:
-    CorePlugin(const CorePlugin&) = delete; // Copy Constructor Not Implemented
-    CorePlugin(CorePlugin&&) = delete;      // Move Constructor Not Implemented
-    CorePlugin& operator=(const CorePlugin&) = delete; // Copy Assignment Not Implemented
-    CorePlugin& operator=(CorePlugin&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+  Q_INTERFACES(ISIMPLibPlugin)
+  Q_PLUGIN_METADATA(IID "net.bluequartz.dream3d.CorePlugin")
+
+public:
+  CorePlugin();
+  ~CorePlugin() override;
+  /**
+   * @brief Returns the name of the plugin that appears on the file system.
+   *
+   * Note that if the build is a debug build there will be a _Plugin postfix
+   * to the filename.
+   */
+  QString getPluginFileName() override;
+
+  /**
+   * @brief getPluginDisplayName The name that should be used for human facing
+   * labels and display strings
+   * @return
+   */
+  QString getPluginDisplayName() override;
+
+  /**
+   * @brief getPluginBaseName The Name of the plugin.
+   *
+   * This typically will NOT have the Plugin suffix.
+   * @return
+   */
+  QString getPluginBaseName() override;
+
+  /**
+   * @brief Returns the version
+   */
+  QString getVersion() override;
+
+  /**
+   * @brief Returns the compatibility version
+   */
+  QString getCompatibilityVersion() override;
+
+  /**
+   * @brief Returns the name of the vendor
+   */
+  QString getVendor() override;
+
+  /**
+   * @brief Returns the URL of the plugin
+   */
+  QString getURL() override;
+
+  /**
+   * @brief Returns the location of the plugin
+   */
+  QString getLocation() override;
+
+  /**
+   * @brief Returns the description of the plugin
+   */
+  QString getDescription() override;
+
+  /**
+   * @brief Returns the copyright of the plugin
+   */
+  QString getCopyright() override;
+
+  /**
+   * @brief Returns the license of the plugin
+   */
+  QString getLicense() override;
+
+  /**
+   * @brief Returns the filters of the plugin
+   */
+  QList<QString> getFilters() override;
+
+  /**
+   * @brief Returns the third party licenses of the plugin
+   */
+  QMap<QString, QString> getThirdPartyLicenses() override;
+
+  /**
+   * @brief Returns the load status of the plugin
+   */
+  bool getDidLoad() override;
+
+  /**
+   * @brief Sets the load status of the plugin
+   */
+  void setDidLoad(bool didLoad) override;
+
+  /**
+   * @brief Sets the location of the plugin on the file system.
+   * This is required so that we can cache the file path information
+   * as the plugin is loaded.
+   */
+  void setLocation(QString filePath) override;
+
+  /**
+   * @brief Register all the filters with the FilterWidgetFactory
+   */
+  void registerFilterWidgets(FilterWidgetManager* fwm) override;
+
+  /**
+   * @brief This registers the filters that this plugin implements with the Filter Manager that is passed in
+   * @param fm The FilterManager to register the filters into.
+   */
+  void registerFilters(FilterManager* fm) override;
+
+  /**
+   * @brief Writes the settings in the input gui to the Application's preference file
+   * @param prefs A valid QSettings pointer.
+   */
+  void writeSettings(QSettings& prefs) override;
+
+  /**
+   * @brief Reads the settings from the Application's preference file and sets
+   * the input GUI widgets accordingly.
+   * @param prefs
+   */
+  void readSettings(QSettings& prefs) override;
+
+private:
+  QString m_Version;
+  QString m_CompatibilityVersion;
+  QString m_Vendor;
+  QString m_URL;
+  QString m_Location;
+  QString m_Copyright;
+  QList<QString> m_Filters;
+  bool m_DidLoad;
+
+public:
+  CorePlugin(const CorePlugin&) = delete;            // Copy Constructor Not Implemented
+  CorePlugin(CorePlugin&&) = delete;                 // Move Constructor Not Implemented
+  CorePlugin& operator=(const CorePlugin&) = delete; // Copy Assignment Not Implemented
+  CorePlugin& operator=(CorePlugin&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
old mode 100755
new mode 100644
index e94722e017..97f1504d3c
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,7 +39,8 @@
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/SIMPLib.h"
 
-template <class T> class FilterFactory : public IFilterFactory
+template <class T>
+class FilterFactory : public IFilterFactory
 {
 public:
   using Self = FilterFactory<T>;
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 3bfe029cdb..9257326def 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterManager.h"
 
@@ -214,7 +214,6 @@ IFilterFactory::Pointer FilterManager::getFactoryFromClassName(const QString& fi
   return IFilterFactory::NullPointer();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -252,13 +251,13 @@ IFilterFactory::Pointer FilterManager::getFactoryFromHumanName(const QString& hu
 QJsonArray FilterManager::toJsonArray() const
 {
   QJsonArray filterArray;
-  
+
   FilterManager::Collection factories = getFactories();
   for(auto factory : factories)
   {
     AbstractFilter::Pointer filter = factory->create();
     QJsonObject filtJson;
-    
+
     filtJson[SIMPL::JSON::Name] = filter->getHumanLabel();
     filtJson[SIMPL::JSON::ClassName] = filter->getNameOfClass();
     filtJson[SIMPL::JSON::Uuid] = filter->getUuid().toString();
@@ -266,7 +265,7 @@ QJsonArray FilterManager::toJsonArray() const
     filtJson[SIMPL::JSON::Version] = filter->getFilterVersion();
     filtJson[SIMPL::JSON::GroupName] = filter->getGroupName();
     filtJson[SIMPL::JSON::SubGroupName] = filter->getSubGroupName();
-    
+
     filterArray.append(filtJson);
   }
   return filterArray;
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
old mode 100755
new mode 100644
index a62f22f799..8ffea60864
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -68,7 +68,7 @@ class SIMPLib_EXPORT FilterManager
 
   typedef QMap<QUuid, IFilterFactory::Pointer> UuidCollection;
   typedef QMapIterator<QUuid, IFilterFactory::Pointer> UuidCollectionIterator;
-  
+
   /**
    * @brief Static instance to retrieve the global instance of this class
    * @return
@@ -140,7 +140,7 @@ class SIMPLib_EXPORT FilterManager
    * @param filterName
    * @return
    */
-  IFilterFactory::Pointer getFactoryFromClassName(const QString& filterName) const; 
+  IFilterFactory::Pointer getFactoryFromClassName(const QString& filterName) const;
 
   /**
    * @brief getFactoryFromClassName Returns a FilterFactory for a given filter
@@ -148,18 +148,18 @@ class SIMPLib_EXPORT FilterManager
    * @return
    */
   IFilterFactory::Pointer getFactoryFromUuid(const QUuid& uuid) const;
-  
+
   /**
    * @brief getFactoryFromClassNameHumanName For a given human label, the FilterFactory is given
    * @param humanName
    * @return
    */
   IFilterFactory::Pointer getFactoryFromHumanName(const QString& humanName);
-  
+
   /**
    * @brief This will return a QJsonArray object that contains information about
    * all available filters
-   * @return 
+   * @return
    */
   QJsonArray toJsonArray() const;
 
@@ -169,7 +169,7 @@ class SIMPLib_EXPORT FilterManager
 private:
   Collection m_Factories;
   UuidCollection m_UuidFactories;
-  
+
   static FilterManager* s_Self;
 
 public:
@@ -178,4 +178,3 @@ class SIMPLib_EXPORT FilterManager
   FilterManager& operator=(const FilterManager&) = delete; // Copy Assignment Not Implemented
   FilterManager& operator=(FilterManager&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
old mode 100755
new mode 100644
index e4d180b536..2f5fcec114
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -84,37 +84,37 @@ class IFilterFactory
 
   /**
    * @brief getFilterClassName
-   * @return 
+   * @return
    */
   virtual QString getFilterClassName() const
   {
     Q_ASSERT(false);
     return "";
   }
-  
+
   /**
    * @brief getFilterGroup
-   * @return 
+   * @return
    */
   virtual QString getFilterGroup() const
   {
     Q_ASSERT(false);
     return "";
   }
-  
+
   /**
    * @brief getFilterSubGroup
-   * @return 
+   * @return
    */
   virtual QString getFilterSubGroup() const
   {
     Q_ASSERT(false);
     return "";
   }
-  
+
   /**
    * @brief getFilterHumanLabel
-   * @return 
+   * @return
    */
   virtual QString getFilterHumanLabel() const
   {
@@ -124,7 +124,7 @@ class IFilterFactory
 
   /**
    * @brief getBrandingString
-   * @return 
+   * @return
    */
   virtual QString getBrandingString() const
   {
@@ -134,7 +134,7 @@ class IFilterFactory
 
   /**
    * @brief getCompiledLibraryName
-   * @return 
+   * @return
    */
   virtual QString getCompiledLibraryName() const
   {
@@ -171,4 +171,3 @@ class IFilterFactory
   IFilterFactory& operator=(const IFilterFactory&) = delete; // Copy Assignment Not Implemented
   IFilterFactory& operator=(IFilterFactory&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 53fdbc08ae..a229325186 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QMetaObjectUtilities.h"
 
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
old mode 100755
new mode 100644
index 3ca919350d..8629205f0a
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/SIMPLib.h"
 
 class SIMPLib_EXPORT QMetaObjectUtilities
@@ -49,9 +48,8 @@ class SIMPLib_EXPORT QMetaObjectUtilities
   QMetaObjectUtilities();
 
 public:
-  QMetaObjectUtilities(const QMetaObjectUtilities&) = delete; // Copy Constructor Not Implemented
-  QMetaObjectUtilities(QMetaObjectUtilities&&) = delete;      // Move Constructor Not Implemented
+  QMetaObjectUtilities(const QMetaObjectUtilities&) = delete;            // Copy Constructor Not Implemented
+  QMetaObjectUtilities(QMetaObjectUtilities&&) = delete;                 // Move Constructor Not Implemented
   QMetaObjectUtilities& operator=(const QMetaObjectUtilities&) = delete; // Copy Assignment Not Implemented
   QMetaObjectUtilities& operator=(QMetaObjectUtilities&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
index 9c7dca3fa8..a08f9e7332 100644
--- a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
+++ b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QFile>
 
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
index 187e9e2dfe..445ee0ed5e 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ThresholdFilterHelper.h"
 
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
old mode 100755
new mode 100644
index d0c48e37cc..c1c85a8b8f
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -106,8 +106,8 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   }
 
   /**
-  *
-  */
+   *
+   */
   template <typename T>
   void filterDataNotEqualTo(const IDataArray::Pointer& m_Input)
   {
@@ -124,11 +124,11 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   }
 
   /**
-  * @brief execute
-  * @param input
-  * @param output
-  * @return
-  */
+   * @brief execute
+   * @param input
+   * @param output
+   * @return
+   */
   int execute(const IDataArray::Pointer& input, IDataArray* output);
 
 private:
@@ -137,9 +137,8 @@ class SIMPLib_EXPORT ThresholdFilterHelper : public IDataArrayFilter
   BoolArrayType* m_Output;
 
 public:
-  ThresholdFilterHelper(const ThresholdFilterHelper&) = delete; // Copy Constructor Not Implemented
-  ThresholdFilterHelper(ThresholdFilterHelper&&) = delete;      // Move Constructor Not Implemented
+  ThresholdFilterHelper(const ThresholdFilterHelper&) = delete;            // Copy Constructor Not Implemented
+  ThresholdFilterHelper(ThresholdFilterHelper&&) = delete;                 // Move Constructor Not Implemented
   ThresholdFilterHelper& operator=(const ThresholdFilterHelper&) = delete; // Copy Assignment Not Implemented
   ThresholdFilterHelper& operator=(ThresholdFilterHelper&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index afddd97261..ca68cdf5d0 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CompositeTransformContainer.h"
 
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index f0c76c7d31..e2eb519479 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
index 718348b950..e5a5372c6a 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * DerivativeHelpers re-implements the exterior derivative calculations
@@ -398,8 +398,7 @@ void DerivativeHelpers::TetDeriv::operator()(TetrahedralGeom* tets, size_t tetId
 // -----------------------------------------------------------------------------
 void DerivativeHelpers::HexDeriv::operator()(HexahedralGeom* hexas, size_t hexId, double values[8], double derivs[3])
 {
-  double shapeFunctions[24] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
-                               0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
+  double shapeFunctions[24] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
   size_t verts[8] = {0, 0, 0, 0, 0, 0, 0, 0};
   double sum[3] = {0.0, 0.0, 0.0};
   double pCoords[3] = {0.0, 0.0, 0.0};
@@ -410,7 +409,7 @@ void DerivativeHelpers::HexDeriv::operator()(HexahedralGeom* hexas, size_t hexId
   // Compute 3x3 Jacobian from vertex coordinates and tet shape functions,
   // then find the inverse Jacobian using Eigen
   double jPtr[9] = {
-    0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
+      0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
   };
 
   hexas->getVertsAtHex(hexId, verts);
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.h b/Source/SIMPLib/Geometry/DerivativeHelpers.h
old mode 100755
new mode 100644
index 8e5e44edb9..c26c72b383
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.h
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -44,7 +44,6 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
-
 class EdgeGeom;
 class TriangleGeom;
 class QuadGeom;
@@ -52,14 +51,14 @@ class TetrahedralGeom;
 class HexahedralGeom;
 
 /**
-* @brief This file contains a namespace with classes for computing derivatives on IGeometry objects
-*/
+ * @brief This file contains a namespace with classes for computing derivatives on IGeometry objects
+ */
 namespace DerivativeHelpers
 {
 
-  /**
-   * @brief TriJacobian
-   */
+/**
+ * @brief TriJacobian
+ */
 using TriangleJacobian = Eigen::Matrix<double, 2, 2, Eigen::RowMajor>;
 
 /**
@@ -81,43 +80,42 @@ class EdgeDeriv
 {
 public:
   void operator()(EdgeGeom* edges, size_t edgeId, double values[2], double derivs[3]);
-  };
-
-  /**
-   * @brief The TriangleDeriv class
-   */
-  class TriangleDeriv
-  {
-    public:
-      void operator()(TriangleGeom* triangles, size_t triId, double values[3], double derivs[3]);
-  };
-
-  /**
-   * @brief The QuadDeriv class
-   */
-  class QuadDeriv
-  {
-    public:
-      void operator()(QuadGeom* quads, size_t quadId, double values[4], double derivs[3]);
-  };
-
-  /**
-   * @brief The TetDeriv class
-   */
-  class TetDeriv
-  {
-    public:
-      void operator()(TetrahedralGeom* tets, size_t tetId, double values[4], double derivs[3]);
-  };
-
-  /**
-  * @brief The HexDeriv class
-  */
-  class HexDeriv
-  {
-    public:
-      void operator()(HexahedralGeom* hexas, size_t hexId, double values[8], double derivs[3]);
-  };
-
-}
+};
+
+/**
+ * @brief The TriangleDeriv class
+ */
+class TriangleDeriv
+{
+public:
+  void operator()(TriangleGeom* triangles, size_t triId, double values[3], double derivs[3]);
+};
+
+/**
+ * @brief The QuadDeriv class
+ */
+class QuadDeriv
+{
+public:
+  void operator()(QuadGeom* quads, size_t quadId, double values[4], double derivs[3]);
+};
+
+/**
+ * @brief The TetDeriv class
+ */
+class TetDeriv
+{
+public:
+  void operator()(TetrahedralGeom* tets, size_t tetId, double values[4], double derivs[3]);
+};
+
+/**
+ * @brief The HexDeriv class
+ */
+class HexDeriv
+{
+public:
+  void operator()(HexahedralGeom* hexas, size_t hexId, double values[8], double derivs[3]);
+};
 
+} // namespace DerivativeHelpers
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 5a4bf4d224..fb4f64d679 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * EdgeGeom re-implements code from the following vtk modules:
@@ -107,6 +107,7 @@ class FindEdgeDerivativesImpl
   {
     compute(range.min(), range.max());
   }
+
 private:
   EdgeGeom* m_Edges;
   DoubleArrayType::Pointer m_Field;
@@ -207,7 +208,7 @@ void EdgeGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -562,7 +563,7 @@ QString EdgeGeom::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   return QString();
 }
 
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index ea71992a01..ec60771909 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -421,6 +421,3 @@ class SIMPLib_EXPORT EdgeGeom : public IGeometry
   EdgeGeom& operator=(const EdgeGeom&) = delete; // Copy Assignment Not Implemented
   EdgeGeom& operator=(EdgeGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
old mode 100755
new mode 100644
index 4337e3de26..5fe81507d6
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -53,8 +53,8 @@ class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
 
 /**
-* @brief This file contains a namespace with classes for manipulating IGeometry objects
-*/
+ * @brief This file contains a namespace with classes for manipulating IGeometry objects
+ */
 namespace GeometryHelpers
 {
 
@@ -408,7 +408,8 @@ class Connectivity
    * @param elemList
    * @param edgeList
    */
-  template <typename T> static void Find2DElementEdges(typename DataArray<T>::Pointer elemList, typename DataArray<T>::Pointer edgeList)
+  template <typename T>
+  static void Find2DElementEdges(typename DataArray<T>::Pointer elemList, typename DataArray<T>::Pointer edgeList)
   {
     size_t numElems = elemList->getNumberOfTuples();
     size_t numVertsPerElem = elemList->getNumberOfComponents();
@@ -473,7 +474,8 @@ class Connectivity
    * @param tetList
    * @param edgeList
    */
-  template <typename T> static void FindTetEdges(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer edgeList)
+  template <typename T>
+  static void FindTetEdges(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer edgeList)
   {
     size_t numElems = tetList->getNumberOfTuples();
 
@@ -514,11 +516,12 @@ class Connectivity
   }
 
   /**
-  * @brief FindHexEdges
-  * @param hexList
-  * @param edgeList
-  */
-  template <typename T> static void FindHexEdges(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer edge_List)
+   * @brief FindHexEdges
+   * @param hexList
+   * @param edgeList
+   */
+  template <typename T>
+  static void FindHexEdges(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer edge_List)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -539,13 +542,12 @@ class Connectivity
       std::vector<T> edge6 = {verts[2], verts[6]};
       std::vector<T> edge7 = {verts[3], verts[7]};
 
-      std::vector<T> edge8 =  {verts[4], verts[5]};
-      std::vector<T> edge9 =  {verts[5], verts[6]};
+      std::vector<T> edge8 = {verts[4], verts[5]};
+      std::vector<T> edge9 = {verts[5], verts[6]};
       std::vector<T> edge10 = {verts[6], verts[7]};
       std::vector<T> edge11 = {verts[7], verts[4]};
 
-      std::list<std::vector<T>> edgeList = {edge0, edge1, edge2, edge3, edge4, edge5,
-                                            edge6, edge7, edge8, edge9, edge10, edge11};
+      std::list<std::vector<T>> edgeList = {edge0, edge1, edge2, edge3, edge4, edge5, edge6, edge7, edge8, edge9, edge10, edge11};
 
       for(auto&& uEdge : edgeList)
       {
@@ -573,7 +575,8 @@ class Connectivity
    * @param tetList
    * @param edgeList
    */
-  template <typename T> static void FindTetFaces(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer faceList)
+  template <typename T>
+  static void FindTetFaces(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer faceList)
   {
     size_t numElems = tetList->getNumberOfTuples();
 
@@ -613,11 +616,12 @@ class Connectivity
   }
 
   /**
-  * @brief FindHexFaces
-  * @param hexList
-  * @param edgeList
-  */
-  template <typename T> static void FindHexFaces(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer faceList)
+   * @brief FindHexFaces
+   * @param hexList
+   * @param edgeList
+   */
+  template <typename T>
+  static void FindHexFaces(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer faceList)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -665,7 +669,8 @@ class Connectivity
    * @param elemList
    * @param edgeList
    */
-  template <typename T> static void Find2DUnsharedEdges(typename DataArray<T>::Pointer elemList, typename DataArray<T>::Pointer edgeList)
+  template <typename T>
+  static void Find2DUnsharedEdges(typename DataArray<T>::Pointer elemList, typename DataArray<T>::Pointer edgeList)
   {
     size_t numElems = elemList->getNumberOfTuples();
     size_t numVertsPerElem = elemList->getNumberOfComponents();
@@ -739,11 +744,12 @@ class Connectivity
   }
 
   /**
-  * @brief FindUnsharedTetEdges
-  * @param tetList
-  * @param edgeList
-  */
-  template <typename T> static void FindUnsharedTetEdges(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer edgeList)
+   * @brief FindUnsharedTetEdges
+   * @param tetList
+   * @param edgeList
+   */
+  template <typename T>
+  static void FindUnsharedTetEdges(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer edgeList)
   {
     size_t numElems = tetList->getNumberOfTuples();
 
@@ -797,11 +803,12 @@ class Connectivity
   }
 
   /**
-  * @brief FindUnsharedHexEdges
-  * @param hexList
-  * @param edgeList
-  */
-  template <typename T> static void FindUnsharedHexEdges(typename DataArray<T>::Pointer& hexList, typename DataArray<T>::Pointer& edge_List)
+   * @brief FindUnsharedHexEdges
+   * @param hexList
+   * @param edgeList
+   */
+  template <typename T>
+  static void FindUnsharedHexEdges(typename DataArray<T>::Pointer& hexList, typename DataArray<T>::Pointer& edge_List)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -868,7 +875,8 @@ class Connectivity
    * @param tetList
    * @param edgeList
    */
-  template <typename T> static void FindUnsharedTetFaces(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer faceList)
+  template <typename T>
+  static void FindUnsharedTetFaces(typename DataArray<T>::Pointer tetList, typename DataArray<T>::Pointer faceList)
   {
     size_t numElems = tetList->getNumberOfTuples();
 
@@ -921,11 +929,12 @@ class Connectivity
   }
 
   /**
-  * @brief FindUnsharedHexFaces
-  * @param hexList
-  * @param edgeList
-  */
-  template <typename T> static void FindUnsharedHexFaces(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer faceList)
+   * @brief FindUnsharedHexFaces
+   * @param hexList
+   * @param edgeList
+   */
+  template <typename T>
+  static void FindUnsharedHexFaces(typename DataArray<T>::Pointer hexList, typename DataArray<T>::Pointer faceList)
   {
     size_t numElems = hexList->getNumberOfTuples();
 
@@ -997,7 +1006,8 @@ class Topology
    * @param vertices
    * @param elementCentroids
    */
-  template <typename T> static void FindElementCentroids(typename DataArray<T>::Pointer elemList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer centroids)
+  template <typename T>
+  static void FindElementCentroids(typename DataArray<T>::Pointer elemList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer centroids)
   {
     size_t numElems = elemList->getNumberOfTuples();
     size_t numVertsPerElem = elemList->getNumberOfComponents();
@@ -1027,7 +1037,8 @@ class Topology
    * @param vertices
    * @param areas
    */
-  template <typename T> static void Find2DElementAreas(typename DataArray<T>::Pointer elemList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer areas)
+  template <typename T>
+  static void Find2DElementAreas(typename DataArray<T>::Pointer elemList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer areas)
   {
     float nx, ny, nz;
     int32_t projection;
@@ -1075,18 +1086,15 @@ class Topology
 
         switch(projection)
         {
-        case 0:
-        {
+        case 0: {
           area += coordinates[3 * ((j + 1) % numVertsPerElem) + 1] * (coordinates[3 * ((j + 2) % numVertsPerElem) + 2] - coordinates[3 * j + 2]);
           continue;
         }
-        case 1:
-        {
+        case 1: {
           area += coordinates[3 * ((j + 1) % numVertsPerElem) + 0] * (coordinates[3 * ((j + 2) % numVertsPerElem) + 2] - coordinates[3 * j + 2]);
           continue;
         }
-        case 2:
-        {
+        case 2: {
           area += coordinates[3 * ((j + 1) % numVertsPerElem) + 0] * (coordinates[3 * ((j + 2) % numVertsPerElem) + 1] - coordinates[3 * j + 1]);
           continue;
         }
@@ -1095,18 +1103,15 @@ class Topology
 
       switch(projection)
       {
-      case 0:
-      {
+      case 0: {
         area /= (2.0f * nx);
         break;
       }
-      case 1:
-      {
+      case 1: {
         area /= (2.0f * ny);
         break;
       }
-      case 2:
-      {
+      case 2: {
         area /= (2.0f * nz);
       }
       }
@@ -1120,7 +1125,8 @@ class Topology
    * @param vertices
    * @param volumes
    */
-  template <typename T> static void FindTetVolumes(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer volumes)
+  template <typename T>
+  static void FindTetVolumes(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer volumes)
   {
     size_t numTets = tetList->getNumberOfTuples();
     float* vertex = vertices->getPointer(0);
@@ -1143,12 +1149,13 @@ class Topology
   }
 
   /**
-  * @brief FindHexVolumes
-  * @param hexList
-  * @param vertices
-  * @param volumes
-  */
-  template <typename T> static void FindHexVolumes(typename DataArray<T>::Pointer hexList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer volumes)
+   * @brief FindHexVolumes
+   * @param hexList
+   * @param vertices
+   * @param volumes
+   */
+  template <typename T>
+  static void FindHexVolumes(typename DataArray<T>::Pointer hexList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer volumes)
   {
     size_t numHexas = hexList->getNumberOfTuples();
     float* vertex = vertices->getPointer(0);
@@ -1201,7 +1208,7 @@ class Topology
 
         float vertMatrix[3][3] = {{vert1[0] - vert0[0], vert2[0] - vert0[0], vert3[0] - vert0[0]},
                                   {vert1[1] - vert0[1], vert2[1] - vert0[1], vert3[1] - vert0[1]},
-                                   {vert1[2] - vert0[2], vert2[2] - vert0[2], vert3[2] - vert0[2]}};
+                                  {vert1[2] - vert0[2], vert2[2] - vert0[2], vert3[2] - vert0[2]}};
 
         volume += (MatrixMath::Determinant3x3(vertMatrix) / 6.0f);
       }
@@ -1211,87 +1218,104 @@ class Topology
   }
 
   /**
-  * @brief FindTetJacobians
-  * @param tetList
-  * @param vertices
-  * @param jacobians
-  */
-  template <typename T> static void FindTetJacobians(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer jacobians)
+   * @brief FindTetJacobians
+   * @param tetList
+   * @param vertices
+   * @param jacobians
+   */
+  template <typename T>
+  static void FindTetJacobians(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer jacobians)
   {
-	  size_t numTets = tetList->getNumberOfTuples();
-	  float* vertex = vertices->getPointer(0);
-	  float* jacobianPtr = jacobians->getPointer(0);
-
-	  for (size_t i = 0; i < numTets; i++)
-	  {
-		  T* tet = tetList->getTuplePointer(i);
-		  //get vert positions
-		  float vert0[3] = { vertex[3 * tet[0] + 0], vertex[3 * tet[0] + 1], vertex[3 * tet[0] + 2] };
-		  float vert1[3] = { vertex[3 * tet[1] + 0], vertex[3 * tet[1] + 1], vertex[3 * tet[1] + 2] };
-		  float vert2[3] = { vertex[3 * tet[2] + 0], vertex[3 * tet[2] + 1], vertex[3 * tet[2] + 2] };
-		  float vert3[3] = { vertex[3 * tet[3] + 0], vertex[3 * tet[3] + 1], vertex[3 * tet[3] + 2] };
-		  //build jacobian matrix
-		  float vertMatrix[3][3] = { { vert1[0] - vert0[0], vert2[0] - vert0[0], vert3[0] - vert0[0] },
-		  { vert1[1] - vert0[1], vert2[1] - vert0[1], vert3[1] - vert0[1] },
-		  { vert1[2] - vert0[2], vert2[2] - vert0[2], vert3[2] - vert0[2] } };
-		  //find jacobian, which is determinant of the jacobian matrix
-		  jacobianPtr[i] = MatrixMath::Determinant3x3(vertMatrix);
-	  }
+    size_t numTets = tetList->getNumberOfTuples();
+    float* vertex = vertices->getPointer(0);
+    float* jacobianPtr = jacobians->getPointer(0);
+
+    for(size_t i = 0; i < numTets; i++)
+    {
+      T* tet = tetList->getTuplePointer(i);
+      // get vert positions
+      float vert0[3] = {vertex[3 * tet[0] + 0], vertex[3 * tet[0] + 1], vertex[3 * tet[0] + 2]};
+      float vert1[3] = {vertex[3 * tet[1] + 0], vertex[3 * tet[1] + 1], vertex[3 * tet[1] + 2]};
+      float vert2[3] = {vertex[3 * tet[2] + 0], vertex[3 * tet[2] + 1], vertex[3 * tet[2] + 2]};
+      float vert3[3] = {vertex[3 * tet[3] + 0], vertex[3 * tet[3] + 1], vertex[3 * tet[3] + 2]};
+      // build jacobian matrix
+      float vertMatrix[3][3] = {{vert1[0] - vert0[0], vert2[0] - vert0[0], vert3[0] - vert0[0]},
+                                {vert1[1] - vert0[1], vert2[1] - vert0[1], vert3[1] - vert0[1]},
+                                {vert1[2] - vert0[2], vert2[2] - vert0[2], vert3[2] - vert0[2]}};
+      // find jacobian, which is determinant of the jacobian matrix
+      jacobianPtr[i] = MatrixMath::Determinant3x3(vertMatrix);
+    }
   }
 
   /**
-  * @brief FindTetMinDihedralAngles
-  * @param tetList
-  * @param vertices
-  * @param minAngles
-  */
-  template <typename T> static void FindTetMinDihedralAngles(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer minAngles)
+   * @brief FindTetMinDihedralAngles
+   * @param tetList
+   * @param vertices
+   * @param minAngles
+   */
+  template <typename T>
+  static void FindTetMinDihedralAngles(typename DataArray<T>::Pointer tetList, FloatArrayType::Pointer vertices, FloatArrayType::Pointer minAngles)
   {
-	  size_t numTets = tetList->getNumberOfTuples();
-	  float* vertex = vertices->getPointer(0);
-	  float* minAnglesPtr = minAngles->getPointer(0);
-
-	  for (size_t i = 0; i < numTets; i++)
-	  {
-		  T* tet = tetList->getTuplePointer(i);
-		  //get vert positions
-		  float vert0[3] = { vertex[3 * tet[0] + 0], vertex[3 * tet[0] + 1], vertex[3 * tet[0] + 2] };
-		  float vert1[3] = { vertex[3 * tet[1] + 0], vertex[3 * tet[1] + 1], vertex[3 * tet[1] + 2] };
-		  float vert2[3] = { vertex[3 * tet[2] + 0], vertex[3 * tet[2] + 1], vertex[3 * tet[2] + 2] };
-		  float vert3[3] = { vertex[3 * tet[3] + 0], vertex[3 * tet[3] + 1], vertex[3 * tet[3] + 2] };
-		  //find 5 edges needed to find 4 face normals
-		  float v10[3] = { (vert1[0] - vert0[0]), (vert1[1] - vert0[1]), (vert1[2] - vert0[2]) };
-		  float v20[3] = { (vert2[0] - vert0[0]), (vert2[1] - vert0[1]), (vert2[2] - vert0[2]) };
-		  float v30[3] = { (vert3[0] - vert0[0]), (vert3[1] - vert0[1]), (vert3[2] - vert0[2]) };
-		  float v21[3] = { (vert2[0] - vert1[0]), (vert2[1] - vert1[1]), (vert2[2] - vert1[2]) };
-		  float v31[3] = { (vert3[0] - vert1[0]), (vert3[1] - vert1[1]), (vert3[2] - vert1[2]) };
-		  //find 4 face-to-face normals
-		  float norm1[3] = { (v10[1] * v20[2] - v10[2] * v20[1]), (v10[2] * v20[0] - v10[0] * v20[2]), (v10[0] * v20[1] - v10[1] * v20[0]) };
-		  float norm2[3] = { (v30[1] * v10[2] - v30[2] * v10[1]), (v30[2] * v10[0] - v30[0] * v10[2]), (v30[0] * v10[1] - v30[1] * v10[0]) };
-		  float norm3[3] = { (v20[1] * v30[2] - v20[2] * v30[1]), (v20[2] * v30[0] - v20[0] * v30[2]), (v20[0] * v30[1] - v20[1] * v30[0]) };
-		  float norm4[3] = { (v31[1] * v21[2] - v31[2] * v21[1]), (v31[2] * v21[0] - v31[0] * v21[2]), (v31[0] * v21[1] - v31[1] * v21[0]) };
-		  //find the magnitudes of each normal
-		  float norm1mag = sqrtf(norm1[0] * norm1[0] + norm1[1] * norm1[1] + norm1[2] * norm1[2]);
-		  float norm2mag = sqrtf(norm2[0] * norm2[0] + norm2[1] * norm2[1] + norm2[2] * norm2[2]);
-		  float norm3mag = sqrtf(norm3[0] * norm3[0] + norm3[1] * norm3[1] + norm3[2] * norm3[2]);
-		  float norm4mag = sqrtf(norm4[0] * norm4[0] + norm4[1] * norm4[1] + norm4[2] * norm4[2]);
-		  //find angles between faces
-		  float ang1 = (norm1[0] * norm2[0] + norm1[1] * norm2[1] + norm1[2] * norm2[2]) / (norm1mag * norm2mag);
-		  float ang2 = (norm1[0] * norm3[0] + norm1[1] * norm3[1] + norm1[2] * norm3[2]) / (norm1mag * norm3mag);
-		  float ang3 = (norm1[0] * norm4[0] + norm1[1] * norm4[1] + norm1[2] * norm4[2]) / (norm1mag * norm4mag);
-		  float ang4 = (norm2[0] * norm3[0] + norm2[1] * norm3[1] + norm2[2] * norm3[2]) / (norm2mag * norm3mag);
-		  float ang5 = (norm2[0] * norm4[0] + norm2[1] * norm4[1] + norm2[2] * norm4[2]) / (norm2mag * norm4mag);
-		  float ang6 = (norm3[0] * norm4[0] + norm3[1] * norm4[1] + norm3[2] * norm4[2]) / (norm3mag * norm4mag);
-		  //find the maximum ang value, which will be the minimum angle after the acos
-		  float minAng = ang1;
-		  if (ang2 > minAng) { minAng = ang2; }
-		  if (ang3 > minAng) { minAng = ang3; }
-		  if (ang4 > minAng) { minAng = ang4; }
-		  if (ang5 > minAng) { minAng = ang5; }
-		  if (ang6 > minAng) { minAng = ang6; }
-
-		  minAnglesPtr[i] = SIMPLib::Constants::k_180OverPi * acosf(minAng);
-	  }
+    size_t numTets = tetList->getNumberOfTuples();
+    float* vertex = vertices->getPointer(0);
+    float* minAnglesPtr = minAngles->getPointer(0);
+
+    for(size_t i = 0; i < numTets; i++)
+    {
+      T* tet = tetList->getTuplePointer(i);
+      // get vert positions
+      float vert0[3] = {vertex[3 * tet[0] + 0], vertex[3 * tet[0] + 1], vertex[3 * tet[0] + 2]};
+      float vert1[3] = {vertex[3 * tet[1] + 0], vertex[3 * tet[1] + 1], vertex[3 * tet[1] + 2]};
+      float vert2[3] = {vertex[3 * tet[2] + 0], vertex[3 * tet[2] + 1], vertex[3 * tet[2] + 2]};
+      float vert3[3] = {vertex[3 * tet[3] + 0], vertex[3 * tet[3] + 1], vertex[3 * tet[3] + 2]};
+      // find 5 edges needed to find 4 face normals
+      float v10[3] = {(vert1[0] - vert0[0]), (vert1[1] - vert0[1]), (vert1[2] - vert0[2])};
+      float v20[3] = {(vert2[0] - vert0[0]), (vert2[1] - vert0[1]), (vert2[2] - vert0[2])};
+      float v30[3] = {(vert3[0] - vert0[0]), (vert3[1] - vert0[1]), (vert3[2] - vert0[2])};
+      float v21[3] = {(vert2[0] - vert1[0]), (vert2[1] - vert1[1]), (vert2[2] - vert1[2])};
+      float v31[3] = {(vert3[0] - vert1[0]), (vert3[1] - vert1[1]), (vert3[2] - vert1[2])};
+      // find 4 face-to-face normals
+      float norm1[3] = {(v10[1] * v20[2] - v10[2] * v20[1]), (v10[2] * v20[0] - v10[0] * v20[2]), (v10[0] * v20[1] - v10[1] * v20[0])};
+      float norm2[3] = {(v30[1] * v10[2] - v30[2] * v10[1]), (v30[2] * v10[0] - v30[0] * v10[2]), (v30[0] * v10[1] - v30[1] * v10[0])};
+      float norm3[3] = {(v20[1] * v30[2] - v20[2] * v30[1]), (v20[2] * v30[0] - v20[0] * v30[2]), (v20[0] * v30[1] - v20[1] * v30[0])};
+      float norm4[3] = {(v31[1] * v21[2] - v31[2] * v21[1]), (v31[2] * v21[0] - v31[0] * v21[2]), (v31[0] * v21[1] - v31[1] * v21[0])};
+      // find the magnitudes of each normal
+      float norm1mag = sqrtf(norm1[0] * norm1[0] + norm1[1] * norm1[1] + norm1[2] * norm1[2]);
+      float norm2mag = sqrtf(norm2[0] * norm2[0] + norm2[1] * norm2[1] + norm2[2] * norm2[2]);
+      float norm3mag = sqrtf(norm3[0] * norm3[0] + norm3[1] * norm3[1] + norm3[2] * norm3[2]);
+      float norm4mag = sqrtf(norm4[0] * norm4[0] + norm4[1] * norm4[1] + norm4[2] * norm4[2]);
+      // find angles between faces
+      float ang1 = (norm1[0] * norm2[0] + norm1[1] * norm2[1] + norm1[2] * norm2[2]) / (norm1mag * norm2mag);
+      float ang2 = (norm1[0] * norm3[0] + norm1[1] * norm3[1] + norm1[2] * norm3[2]) / (norm1mag * norm3mag);
+      float ang3 = (norm1[0] * norm4[0] + norm1[1] * norm4[1] + norm1[2] * norm4[2]) / (norm1mag * norm4mag);
+      float ang4 = (norm2[0] * norm3[0] + norm2[1] * norm3[1] + norm2[2] * norm3[2]) / (norm2mag * norm3mag);
+      float ang5 = (norm2[0] * norm4[0] + norm2[1] * norm4[1] + norm2[2] * norm4[2]) / (norm2mag * norm4mag);
+      float ang6 = (norm3[0] * norm4[0] + norm3[1] * norm4[1] + norm3[2] * norm4[2]) / (norm3mag * norm4mag);
+      // find the maximum ang value, which will be the minimum angle after the acos
+      float minAng = ang1;
+      if(ang2 > minAng)
+      {
+        minAng = ang2;
+      }
+      if(ang3 > minAng)
+      {
+        minAng = ang3;
+      }
+      if(ang4 > minAng)
+      {
+        minAng = ang4;
+      }
+      if(ang5 > minAng)
+      {
+        minAng = ang5;
+      }
+      if(ang6 > minAng)
+      {
+        minAng = ang6;
+      }
+
+      minAnglesPtr[i] = SIMPLib::Constants::k_180OverPi * acosf(minAng);
+    }
   }
 };
 
@@ -1310,7 +1334,8 @@ class Generic
    * @param inVertexArray
    * @param outElemArray
    */
-  template <typename T, typename K> static void AverageVertexArrayValues(typename DataArray<T>::Pointer elemList, typename DataArray<K>::Pointer inVertexArray, DataArray<float>::Pointer outElemArray)
+  template <typename T, typename K>
+  static void AverageVertexArrayValues(typename DataArray<T>::Pointer elemList, typename DataArray<K>::Pointer inVertexArray, DataArray<float>::Pointer outElemArray)
   {
     Q_ASSERT(outElemArray->getComponentDimensions() == inVertexArray->getComponentDimensions());
     Q_ASSERT(elemList->getNumberOfTuples() == outElemArray->getNumberOfTuples());
@@ -1427,5 +1452,4 @@ class Generic
     }
   }
 };
-}
-
+} // namespace GeometryHelpers
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index ca8c98a975..4b316efbf1 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -72,6 +72,7 @@ class FindHexDerivativesImpl
   {
     compute(range.min(), range.max());
   }
+
 private:
   HexahedralGeom* m_Hexas;
   DoubleArrayType::Pointer m_Field;
@@ -185,7 +186,7 @@ void HexahedralGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeM
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -368,7 +369,6 @@ void HexahedralGeom::deleteElementCentroids()
   m_HexCentroids = FloatArrayType::NullPointer();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -723,7 +723,7 @@ QString HexahedralGeom::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   return QString();
 }
 
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index e3730a85e7..0501c82de1 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -14,571 +14,568 @@
  */
 class SIMPLib_EXPORT HexahedralGeom : public IGeometry3D
 {
-  public:
-    using Self = HexahedralGeom;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for HexahedralGeom
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for HexahedralGeom
-     */
-    static QString ClassName();
-
-    ~HexahedralGeom() override;
-
-    /**
-     * @brief CreateGeometry
-     * @param numHexas
-     * @param vertices
-     * @param name
-     * @return
-     */
-    static Pointer CreateGeometry(size_t numHexas, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
-
-    /**
-     * @brief CreateGeometry
-     * @param hexas
-     * @param vertices
-     * @param name
-     * @return
-     */
-    static Pointer CreateGeometry(const SharedHexList::Pointer& hexas, const SharedVertexList::Pointer& vertices, const QString& name);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedVertexOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedVertexList
-     * @param numVertices
-     * @return
-     */
-    static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedEdgeOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedEdgeList
-     * @param numEdges
-     * @return
-     */
-    static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedQuadOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedQuadLost
-     * @param numQuads
-     * @return
-     */
-    static SharedQuadList::Pointer CreateSharedQuadList(size_t numQuads, bool allocate = true);
-
-    /**
-     * @brief resizeQuadList
-     * @param newNumQuads
-     */
-    void resizeQuadList(size_t newNumQuads);
-
-    /**
-     * @brief setQuads
-     * @param quads
-     */
-    void setQuads(SharedQuadList::Pointer quads);
-
-    /**
-     * @brief getQuads
-     * @return
-     */
-    SharedQuadList::Pointer getQuads() const;
-
-    /**
-     * @brief setVertsAtQuad
-     * @param quadId
-     * @param verts
-     */
-    void setVertsAtQuad(size_t quadId, size_t verts[4]);
-
-    /**
-     * @brief getVertsAtQuad
-     * @param quadId
-     * @param verts
-     */
-    void getVertsAtQuad(size_t quadId, size_t verts[4]) const;
-
-    /**
-     * @brief getVertCoordsAtQuad
-     * @param quadId
-     * @param vert1
-     * @param vert2
-     * @param vert3
-     * @param vert4
-     */
-    void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
-
-    /**
-     * @brief getPointer
-     * @param i
-     * @return
-     */
-    size_t* getQuadPointer(size_t i) const;
-
-    /**
-     * @brief getNumberOfQuads
-     * @return
-     */
-    size_t getNumberOfQuads() const;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedHexOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedHexList
-     * @param numTets
-     * @return
-     */
-    static SharedHexList::Pointer CreateSharedHexList(size_t numHexas, bool allocate = true);
-
-    /**
-     * @brief resizeHexList
-     * @param newNumHexas
-     */
-    void resizeHexList(size_t newNumHexas);
-
-    /**
-     * @brief setHexahedra
-     * @param tets
-     */
-    void setHexahedra(SharedHexList::Pointer hexas);
-
-   /**
-    * @brief getHexahedra
-    * @return
-    */
-    SharedHexList::Pointer getHexahedra() const;
-
-    /**
-     * @brief setVertsAtHex
-     * @param hexId
-     * @param verts
-     */
-    void setVertsAtHex(size_t hexId, size_t verts[7]);
-
-    /**
-     * @brief getVertsAtHex
-     * @param hexId
-     * @param verts
-     */
-    void getVertsAtHex(size_t hexId, size_t verts[7]) const;
-
-    /**
-     * @brief getVertCoordsAtHex
-     * @param hexId
-     * @param vert1
-     * @param vert2
-     * @param vert3
-     * @param vert4
-     * @param vert5
-     * @param vert6
-     */
-    void getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]) const;
-
-    /**
-     * @brief getHexPointer
-     * @param i
-     * @return
-     */
-    size_t* getHexPointer(size_t i) const;
-
-    /**
-     * @brief getNumberOfHexas
-     * @return
-     */
-    size_t getNumberOfHexas() const;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from IGeometry
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief initializeWithZeros
-     */
-    void initializeWithZeros() override;
-
-    /**
-     * @brief getNumberOfElements
-     * @return
-     */
-    size_t getNumberOfElements() const override;
-
-    /**
-     * @brief findElementSizes
-     * @return
-     */
-    int findElementSizes() override;
-
-    /**
-     * @brief getElementSizes
-     * @return
-     */
-    FloatArrayType::Pointer getElementSizes() const override;
-
-    /**
-     * @brief deleteElementSizes
-     */
-    void deleteElementSizes() override;
-
-    /**
-     * @brief findElementsContainingVert
-     * @return
-     */
-    int findElementsContainingVert() override;
-
-    /**
-     * @brief getElementsContainingVert
-     * @return
-     */
-    ElementDynamicList::Pointer getElementsContainingVert() const override;
-
-    /**
-     * @brief deleteElementsContainingVert
-     */
-    void deleteElementsContainingVert() override;
-
-    /**
-     * @brief findElementNeighbors
-     * @return
-     */
-    int findElementNeighbors() override;
-
-    /**
-     * @brief getElementNeighbors
-     * @return
-     */
-    ElementDynamicList::Pointer getElementNeighbors() const override;
-
-    /**
-     * @brief deleteElementNeighbors
-     */
-    void deleteElementNeighbors() override;
-
-    /**
-     * @brief findElementCentroids
-     * @return
-     */
-    int findElementCentroids() override;
-
-    /**
-     * @brief getElementCentroids
-     * @return
-     */
-    FloatArrayType::Pointer getElementCentroids() const override;
-
-    /**
-     * @brief deleteElementCentroids
-     */
-    void deleteElementCentroids() override;
-
-    /**
-     * @brief getParametricCenter
-     * @param pCoords
-     */
-    void getParametricCenter(double pCoords[3]) const override;
-
-    /**
-     * @brief getShapeFunctions
-     * @param pCoords
-     * @param shape
-     */
-    void getShapeFunctions(double pCoords[3], double* shape) const override;
-
-    /**
-     * @brief findDerivatives
-     * @param field
-     * @param derivatives
-     */
-    void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    QString getInfoString(SIMPL::InfoStringFormat format) const override;
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the geometry.
-     * @return
-     */
-    ToolTipGenerator getToolTipGenerator() const override;
-
-    /**
-     * @brief writeGeometryToHDF5
-     * @param parentId
-     * @param writeXdmf
-     * @return
-     */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
-
-    /**
-     * @brief writeXdmf
-     * @param out
-     * @param dcName
-     * @param hdfFileName
-     * @return
-     */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
-
-    /**
-     * @brief readGeometryFromHDF5
-     * @param parentId
-     * @param preflight
-     * @return
-     */
-    int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
-
-    /**
-     * @brief addOrReplaceAttributeMatrix
-     */
-    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
-
-// -----------------------------------------------------------------------------
-// Inherited from IGeometry3D
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeVertexList
-     * @param newNumVertices
-     */
-    void resizeVertexList(size_t newNumVertices) override;
-
-    /**
-     * @brief setVertices
-     * @param vertices
-     */
-    void setVertices(SharedVertexList::Pointer vertices) override;
-
-    /**
-     * @brief getVertices
-     * @return
-     */
-    SharedVertexList::Pointer getVertices() const override;
-
-    /**
-     * @brief setCoords
-     * @param vertId
-     * @param coords
-     */
-    void setCoords(size_t vertId, float coords[3]) override;
-
-    /**
-     * @brief getCoords
-     * @param vertId
-     * @param coords
-     */
-    void getCoords(size_t vertId, float coords[3]) const override;
-
-    /**
-     * @brief getVertexPointer
-     * @param i
-     * @return
-     */
-    float* getVertexPointer(size_t i) const override;
-
-    /**
-     * @brief getNumberOfVertices
-     * @return
-     */
-    size_t getNumberOfVertices() const override;
-
-    /**
-     * @brief resizeEdgeList
-     * @param newNumEdges
-     */
-    void resizeEdgeList(size_t newNumEdges) override;
-
-    /**
-     * @brief getEdges
-     * @return
-     */
-    SharedEdgeList::Pointer getEdges() const override;
-
-    /**
-     * @brief setVerts
-     * @param edgeId
-     * @param verts
-     */
-    void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
-
-    /**
-     * @brief getVerts
-     * @param edgeId
-     * @param verts
-     */
-    void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
-
-    /**
-     * @brief getVertCoordsAtEdge
-     * @param edgeId
-     * @param vert1
-     * @param vert2
-     */
-    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
-
-    /**
-     * @brief getEdgePointer
-     * @param i
-     * @return
-     */
-    size_t* getEdgePointer(size_t i) const override;
-
-    /**
-     * @brief getNumberOfEdges
-     * @return
-     */
-    size_t getNumberOfEdges() const override;
-
-    /**
-     * @brief findElementEdges
-     * @return
-     */
-    int findEdges() override;
-
-    /**
-     * @brief deleteElementEdges
-     */
-    void deleteEdges() override;
-
-    /**
-     * @brief findFaces
-     * @return
-     */
-    int findFaces() override;
-
-    /**
-     * @brief deleteFaces
-     */
-    void deleteFaces() override;
-
-    /**
-     * @brief findUnsharedEdges
-     */
-    int findUnsharedEdges() override;
-
-    /**
-     * @brief getUnsharedEdges
-     * @return
-     */
-    SharedEdgeList::Pointer getUnsharedEdges() const override;
-
-    /**
-     * @brief deleteUnsharedEdges
-     */
-    void deleteUnsharedEdges() override;
-
-    /**
-     * @brief findUnsharedFaces
-     */
-    int findUnsharedFaces() override;
-
-    /**
-     * @brief getUnsharedFaces
-     * @return
-     */
-    SharedEdgeList::Pointer getUnsharedFaces() const override;
-
-    /**
-     * @brief deleteUnsharedFaces
-     */
-    void deleteUnsharedFaces() override;
-
-  protected:
-
-    HexahedralGeom();
-
-    /**
-     * @brief setElementsContainingVert
-     * @param elementsContainingVert
-     */
-    void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
-
-    /**
-     * @brief setElementNeighbors
-     * @param elementNeighbors
-     */
-    void setElementNeighbors(ElementDynamicList::Pointer elementNeighbors) override;
-
-    /**
-     * @brief setElementCentroids
-     * @param elementCentroids
-     */
-    void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
-
-    /**
-     * @brief setElementSizes
-     * @param elementSizes
-     */
-    void setElementSizes(FloatArrayType::Pointer elementSizes) override;
-
-    /**
-     * @brief setEdges
-     * @param edges
-     */
-    void setEdges(SharedEdgeList::Pointer edges) override;
-
-    /**
-     * @brief setUnsharedEdges
-     * @param bEdgeList
-     */
-    void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) override;
-
-    /**
-     * @brief setUnsharedFaces
-     * @param bFaceList
-     */
-    void setUnsharedFaces(SharedFaceList::Pointer bFaceList) override;
-
-  private:
-    SharedVertexList::Pointer m_VertexList;
-    SharedEdgeList::Pointer m_EdgeList;
-    SharedEdgeList::Pointer m_UnsharedEdgeList;
-    SharedQuadList::Pointer m_QuadList;
-    SharedQuadList::Pointer m_UnsharedQuadList;
-    SharedHexList::Pointer m_HexList;
-    ElementDynamicList::Pointer m_HexasContainingVert;
-    ElementDynamicList::Pointer m_HexNeighbors;
-    FloatArrayType::Pointer m_HexCentroids;
-    FloatArrayType::Pointer m_HexSizes;
-
-    friend class FindHexDerivativesImpl;
-
-  public:
-    HexahedralGeom(const HexahedralGeom&) = delete; // Copy Constructor Not Implemented
-    HexahedralGeom(HexahedralGeom&&) = delete;      // Move Constructor Not Implemented
-    HexahedralGeom& operator=(const HexahedralGeom&) = delete; // Copy Assignment Not Implemented
-    HexahedralGeom& operator=(HexahedralGeom&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = HexahedralGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for HexahedralGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for HexahedralGeom
+   */
+  static QString ClassName();
+
+  ~HexahedralGeom() override;
+
+  /**
+   * @brief CreateGeometry
+   * @param numHexas
+   * @param vertices
+   * @param name
+   * @return
+   */
+  static Pointer CreateGeometry(size_t numHexas, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
+
+  /**
+   * @brief CreateGeometry
+   * @param hexas
+   * @param vertices
+   * @param name
+   * @return
+   */
+  static Pointer CreateGeometry(const SharedHexList::Pointer& hexas, const SharedVertexList::Pointer& vertices, const QString& name);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedVertexOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedVertexList
+   * @param numVertices
+   * @return
+   */
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedEdgeOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedEdgeList
+   * @param numEdges
+   * @return
+   */
+  static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedQuadOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedQuadLost
+   * @param numQuads
+   * @return
+   */
+  static SharedQuadList::Pointer CreateSharedQuadList(size_t numQuads, bool allocate = true);
+
+  /**
+   * @brief resizeQuadList
+   * @param newNumQuads
+   */
+  void resizeQuadList(size_t newNumQuads);
+
+  /**
+   * @brief setQuads
+   * @param quads
+   */
+  void setQuads(SharedQuadList::Pointer quads);
+
+  /**
+   * @brief getQuads
+   * @return
+   */
+  SharedQuadList::Pointer getQuads() const;
+
+  /**
+   * @brief setVertsAtQuad
+   * @param quadId
+   * @param verts
+   */
+  void setVertsAtQuad(size_t quadId, size_t verts[4]);
+
+  /**
+   * @brief getVertsAtQuad
+   * @param quadId
+   * @param verts
+   */
+  void getVertsAtQuad(size_t quadId, size_t verts[4]) const;
+
+  /**
+   * @brief getVertCoordsAtQuad
+   * @param quadId
+   * @param vert1
+   * @param vert2
+   * @param vert3
+   * @param vert4
+   */
+  void getVertCoordsAtQuad(size_t quadId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
+
+  /**
+   * @brief getPointer
+   * @param i
+   * @return
+   */
+  size_t* getQuadPointer(size_t i) const;
+
+  /**
+   * @brief getNumberOfQuads
+   * @return
+   */
+  size_t getNumberOfQuads() const;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedHexOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedHexList
+   * @param numTets
+   * @return
+   */
+  static SharedHexList::Pointer CreateSharedHexList(size_t numHexas, bool allocate = true);
+
+  /**
+   * @brief resizeHexList
+   * @param newNumHexas
+   */
+  void resizeHexList(size_t newNumHexas);
+
+  /**
+   * @brief setHexahedra
+   * @param tets
+   */
+  void setHexahedra(SharedHexList::Pointer hexas);
+
+  /**
+   * @brief getHexahedra
+   * @return
+   */
+  SharedHexList::Pointer getHexahedra() const;
+
+  /**
+   * @brief setVertsAtHex
+   * @param hexId
+   * @param verts
+   */
+  void setVertsAtHex(size_t hexId, size_t verts[7]);
+
+  /**
+   * @brief getVertsAtHex
+   * @param hexId
+   * @param verts
+   */
+  void getVertsAtHex(size_t hexId, size_t verts[7]) const;
+
+  /**
+   * @brief getVertCoordsAtHex
+   * @param hexId
+   * @param vert1
+   * @param vert2
+   * @param vert3
+   * @param vert4
+   * @param vert5
+   * @param vert6
+   */
+  void getVertCoordsAtHex(size_t hexId, float vert1[3], float vert2[3], float vert3[3], float vert4[3], float vert5[3], float vert6[3], float vert7[3], float vert8[3]) const;
+
+  /**
+   * @brief getHexPointer
+   * @param i
+   * @return
+   */
+  size_t* getHexPointer(size_t i) const;
+
+  /**
+   * @brief getNumberOfHexas
+   * @return
+   */
+  size_t getNumberOfHexas() const;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometry
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief initializeWithZeros
+   */
+  void initializeWithZeros() override;
+
+  /**
+   * @brief getNumberOfElements
+   * @return
+   */
+  size_t getNumberOfElements() const override;
+
+  /**
+   * @brief findElementSizes
+   * @return
+   */
+  int findElementSizes() override;
+
+  /**
+   * @brief getElementSizes
+   * @return
+   */
+  FloatArrayType::Pointer getElementSizes() const override;
+
+  /**
+   * @brief deleteElementSizes
+   */
+  void deleteElementSizes() override;
+
+  /**
+   * @brief findElementsContainingVert
+   * @return
+   */
+  int findElementsContainingVert() override;
+
+  /**
+   * @brief getElementsContainingVert
+   * @return
+   */
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
+
+  /**
+   * @brief deleteElementsContainingVert
+   */
+  void deleteElementsContainingVert() override;
+
+  /**
+   * @brief findElementNeighbors
+   * @return
+   */
+  int findElementNeighbors() override;
+
+  /**
+   * @brief getElementNeighbors
+   * @return
+   */
+  ElementDynamicList::Pointer getElementNeighbors() const override;
+
+  /**
+   * @brief deleteElementNeighbors
+   */
+  void deleteElementNeighbors() override;
+
+  /**
+   * @brief findElementCentroids
+   * @return
+   */
+  int findElementCentroids() override;
+
+  /**
+   * @brief getElementCentroids
+   * @return
+   */
+  FloatArrayType::Pointer getElementCentroids() const override;
+
+  /**
+   * @brief deleteElementCentroids
+   */
+  void deleteElementCentroids() override;
+
+  /**
+   * @brief getParametricCenter
+   * @param pCoords
+   */
+  void getParametricCenter(double pCoords[3]) const override;
+
+  /**
+   * @brief getShapeFunctions
+   * @param pCoords
+   * @param shape
+   */
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
+
+  /**
+   * @brief findDerivatives
+   * @param field
+   * @param derivatives
+   */
+  void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
+  /**
+   * @brief writeGeometryToHDF5
+   * @param parentId
+   * @param writeXdmf
+   * @return
+   */
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
+
+  /**
+   * @brief writeXdmf
+   * @param out
+   * @param dcName
+   * @param hdfFileName
+   * @return
+   */
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
+
+  /**
+   * @brief readGeometryFromHDF5
+   * @param parentId
+   * @param preflight
+   * @return
+   */
+  int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
+
+  /**
+   * @brief addOrReplaceAttributeMatrix
+   */
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometry3D
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeVertexList
+   * @param newNumVertices
+   */
+  void resizeVertexList(size_t newNumVertices) override;
+
+  /**
+   * @brief setVertices
+   * @param vertices
+   */
+  void setVertices(SharedVertexList::Pointer vertices) override;
+
+  /**
+   * @brief getVertices
+   * @return
+   */
+  SharedVertexList::Pointer getVertices() const override;
+
+  /**
+   * @brief setCoords
+   * @param vertId
+   * @param coords
+   */
+  void setCoords(size_t vertId, float coords[3]) override;
+
+  /**
+   * @brief getCoords
+   * @param vertId
+   * @param coords
+   */
+  void getCoords(size_t vertId, float coords[3]) const override;
+
+  /**
+   * @brief getVertexPointer
+   * @param i
+   * @return
+   */
+  float* getVertexPointer(size_t i) const override;
+
+  /**
+   * @brief getNumberOfVertices
+   * @return
+   */
+  size_t getNumberOfVertices() const override;
+
+  /**
+   * @brief resizeEdgeList
+   * @param newNumEdges
+   */
+  void resizeEdgeList(size_t newNumEdges) override;
+
+  /**
+   * @brief getEdges
+   * @return
+   */
+  SharedEdgeList::Pointer getEdges() const override;
+
+  /**
+   * @brief setVerts
+   * @param edgeId
+   * @param verts
+   */
+  void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+
+  /**
+   * @brief getVerts
+   * @param edgeId
+   * @param verts
+   */
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
+
+  /**
+   * @brief getVertCoordsAtEdge
+   * @param edgeId
+   * @param vert1
+   * @param vert2
+   */
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
+
+  /**
+   * @brief getEdgePointer
+   * @param i
+   * @return
+   */
+  size_t* getEdgePointer(size_t i) const override;
+
+  /**
+   * @brief getNumberOfEdges
+   * @return
+   */
+  size_t getNumberOfEdges() const override;
+
+  /**
+   * @brief findElementEdges
+   * @return
+   */
+  int findEdges() override;
+
+  /**
+   * @brief deleteElementEdges
+   */
+  void deleteEdges() override;
+
+  /**
+   * @brief findFaces
+   * @return
+   */
+  int findFaces() override;
+
+  /**
+   * @brief deleteFaces
+   */
+  void deleteFaces() override;
+
+  /**
+   * @brief findUnsharedEdges
+   */
+  int findUnsharedEdges() override;
+
+  /**
+   * @brief getUnsharedEdges
+   * @return
+   */
+  SharedEdgeList::Pointer getUnsharedEdges() const override;
+
+  /**
+   * @brief deleteUnsharedEdges
+   */
+  void deleteUnsharedEdges() override;
+
+  /**
+   * @brief findUnsharedFaces
+   */
+  int findUnsharedFaces() override;
+
+  /**
+   * @brief getUnsharedFaces
+   * @return
+   */
+  SharedEdgeList::Pointer getUnsharedFaces() const override;
+
+  /**
+   * @brief deleteUnsharedFaces
+   */
+  void deleteUnsharedFaces() override;
+
+protected:
+  HexahedralGeom();
+
+  /**
+   * @brief setElementsContainingVert
+   * @param elementsContainingVert
+   */
+  void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
+
+  /**
+   * @brief setElementNeighbors
+   * @param elementNeighbors
+   */
+  void setElementNeighbors(ElementDynamicList::Pointer elementNeighbors) override;
+
+  /**
+   * @brief setElementCentroids
+   * @param elementCentroids
+   */
+  void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
+
+  /**
+   * @brief setElementSizes
+   * @param elementSizes
+   */
+  void setElementSizes(FloatArrayType::Pointer elementSizes) override;
+
+  /**
+   * @brief setEdges
+   * @param edges
+   */
+  void setEdges(SharedEdgeList::Pointer edges) override;
+
+  /**
+   * @brief setUnsharedEdges
+   * @param bEdgeList
+   */
+  void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) override;
+
+  /**
+   * @brief setUnsharedFaces
+   * @param bFaceList
+   */
+  void setUnsharedFaces(SharedFaceList::Pointer bFaceList) override;
+
+private:
+  SharedVertexList::Pointer m_VertexList;
+  SharedEdgeList::Pointer m_EdgeList;
+  SharedEdgeList::Pointer m_UnsharedEdgeList;
+  SharedQuadList::Pointer m_QuadList;
+  SharedQuadList::Pointer m_UnsharedQuadList;
+  SharedHexList::Pointer m_HexList;
+  ElementDynamicList::Pointer m_HexasContainingVert;
+  ElementDynamicList::Pointer m_HexNeighbors;
+  FloatArrayType::Pointer m_HexCentroids;
+  FloatArrayType::Pointer m_HexSizes;
+
+  friend class FindHexDerivativesImpl;
+
+public:
+  HexahedralGeom(const HexahedralGeom&) = delete;            // Copy Constructor Not Implemented
+  HexahedralGeom(HexahedralGeom&&) = delete;                 // Move Constructor Not Implemented
+  HexahedralGeom& operator=(const HexahedralGeom&) = delete; // Copy Assignment Not Implemented
+  HexahedralGeom& operator=(HexahedralGeom&&) = delete;      // Move Assignment Not Implemented
 };
 
-
 #endif /* _hexahedralgeom_h_ */
-
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.cpp b/Source/SIMPLib/Geometry/IGeometry2D.cpp
index a9ecd00423..aaccbbc771 100644
--- a/Source/SIMPLib/Geometry/IGeometry2D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry2D.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/Geometry/IGeometry2D.h"
 
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
old mode 100755
new mode 100644
index 74c2427949..fe0ceca270
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.cpp b/Source/SIMPLib/Geometry/IGeometry3D.cpp
index 85fe790594..7839942e4e 100644
--- a/Source/SIMPLib/Geometry/IGeometry3D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry3D.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/Geometry/IGeometry3D.h"
 
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
old mode 100755
new mode 100644
index fe70b3ffde..ae743cd397
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,215 +46,212 @@
  */
 class SIMPLib_EXPORT IGeometry3D : public IGeometry
 {
-  public:
-    using Self = IGeometry3D;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for IGeometry3D
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for IGeometry3D
-     */
-    static QString ClassName();
-
-    IGeometry3D();
-    ~IGeometry3D() override;
-
-// -----------------------------------------------------------------------------
-// Inherited from SharedVertexOps
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeVertexList
-     * @param newNumVertices
-     */
-    virtual void resizeVertexList(size_t newNumVertices) = 0;
-
-    /**
-     * @brief setVertices
-     * @param vertices
-     */
-    virtual void setVertices(SharedVertexList::Pointer vertices) = 0;
-
-    /**
-     * @brief getVertices
-     * @return
-     */
-    virtual SharedVertexList::Pointer getVertices() const = 0;
-
-    /**
-     * @brief setCoords
-     * @param vertId
-     * @param coords
-     */
-    virtual void setCoords(size_t vertId, float coords[3]) = 0;
-
-    /**
-     * @brief getCoords
-     * @param vertId
-     * @param coords
-     */
-    virtual void getCoords(size_t vertId, float coords[3]) const = 0;
-
-    /**
-     * @brief getVertexPointer
-     * @param i
-     * @return
-     */
-    virtual float* getVertexPointer(size_t i) const = 0;
-
-    /**
-     * @brief getNumberOfVertices
-     * @return
-     */
-    virtual size_t getNumberOfVertices() const = 0;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedEdgeOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeEdgeList
-     * @param newNumEdges
-     */
-    virtual void resizeEdgeList(size_t newNumEdges) = 0;
-
-    /**
-     * @brief getEdges
-     * @return
-     */
-    virtual SharedEdgeList::Pointer getEdges() const = 0;
-
-    /**
-     * @brief setVerts
-     * @param edgeId
-     * @param verts
-     */
-    virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
-
-    /**
-     * @brief getVerts
-     * @param edgeId
-     * @param verts
-     */
-    virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
-
-    /**
-     * @brief getVertCoordsAtEdge
-     * @param edgeId
-     * @param vert1
-     * @param vert2
-     */
-    virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
-
-    /**
-     * @brief getEdgePointer
-     * @param i
-     * @return
-     */
-    virtual size_t* getEdgePointer(size_t i) const = 0;
-
-    /**
-     * @brief getNumberOfEdges
-     * @return
-     */
-    virtual size_t getNumberOfEdges() const = 0;
-
-    // -----------------------------------------------------------------------------
-    // Connectivity
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief findElementEdges
-     * @return
-     */
-    virtual int findEdges() = 0;
-
-    /**
-     * @brief deleteElementEdges
-     */
-    virtual void deleteEdges() = 0;
-
-    /**
-     * @brief findFaces
-     * @return
-     */
-    virtual int findFaces() = 0;
-
-    /**
-     * @brief deleteFaces
-     */
-    virtual void deleteFaces() = 0;
-
-// -----------------------------------------------------------------------------
-// Topology
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief findUnsharedEdges
-     */
-    virtual int findUnsharedEdges() = 0;
-
-    /**
-     * @brief getUnsharedEdges
-     * @return
-     */
-    virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
-
-    /**
-     * @brief deleteUnsharedEdges
-     */
-    virtual void deleteUnsharedEdges() = 0;
-
-    /**
-     * @brief findUnsharedFaces
-     */
-    virtual int findUnsharedFaces() = 0;
-
-    /**
-     * @brief getUnsharedFaces
-     * @return
-     */
-    virtual SharedEdgeList::Pointer getUnsharedFaces() const = 0;
-
-    /**
-     * @brief deleteUnsharedFaces
-     */
-    virtual void deleteUnsharedFaces() = 0;
-
-  protected:
-
-    /**
-     * @brief setEdges
-     * @param edges
-     */
-    virtual void setEdges(SharedEdgeList::Pointer edges) = 0;
-
-    /**
-     * @brief setUnsharedEdges
-     * @param bEdgeList
-     */
-    virtual void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) = 0;
-
-    /**
-     * @brief setUnsharedFaces
-     * @param bFaceList
-     */
-    virtual void setUnsharedFaces(SharedFaceList::Pointer bFaceList) = 0;
-
-  public:
-    IGeometry3D(const IGeometry3D&) = delete;    // Copy Constructor Not Implemented
-    IGeometry3D(IGeometry3D&&) = delete;         // Move Constructor Not Implemented
-    IGeometry3D& operator=(const IGeometry3D&) = delete; // Copy Assignment Not Implemented
-    IGeometry3D& operator=(IGeometry3D&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = IGeometry3D;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for IGeometry3D
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for IGeometry3D
+   */
+  static QString ClassName();
+
+  IGeometry3D();
+  ~IGeometry3D() override;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedVertexOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeVertexList
+   * @param newNumVertices
+   */
+  virtual void resizeVertexList(size_t newNumVertices) = 0;
+
+  /**
+   * @brief setVertices
+   * @param vertices
+   */
+  virtual void setVertices(SharedVertexList::Pointer vertices) = 0;
+
+  /**
+   * @brief getVertices
+   * @return
+   */
+  virtual SharedVertexList::Pointer getVertices() const = 0;
+
+  /**
+   * @brief setCoords
+   * @param vertId
+   * @param coords
+   */
+  virtual void setCoords(size_t vertId, float coords[3]) = 0;
+
+  /**
+   * @brief getCoords
+   * @param vertId
+   * @param coords
+   */
+  virtual void getCoords(size_t vertId, float coords[3]) const = 0;
+
+  /**
+   * @brief getVertexPointer
+   * @param i
+   * @return
+   */
+  virtual float* getVertexPointer(size_t i) const = 0;
+
+  /**
+   * @brief getNumberOfVertices
+   * @return
+   */
+  virtual size_t getNumberOfVertices() const = 0;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedEdgeOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeEdgeList
+   * @param newNumEdges
+   */
+  virtual void resizeEdgeList(size_t newNumEdges) = 0;
+
+  /**
+   * @brief getEdges
+   * @return
+   */
+  virtual SharedEdgeList::Pointer getEdges() const = 0;
+
+  /**
+   * @brief setVerts
+   * @param edgeId
+   * @param verts
+   */
+  virtual void setVertsAtEdge(size_t edgeId, size_t verts[2]) = 0;
+
+  /**
+   * @brief getVerts
+   * @param edgeId
+   * @param verts
+   */
+  virtual void getVertsAtEdge(size_t edgeId, size_t verts[2]) const = 0;
+
+  /**
+   * @brief getVertCoordsAtEdge
+   * @param edgeId
+   * @param vert1
+   * @param vert2
+   */
+  virtual void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const = 0;
+
+  /**
+   * @brief getEdgePointer
+   * @param i
+   * @return
+   */
+  virtual size_t* getEdgePointer(size_t i) const = 0;
+
+  /**
+   * @brief getNumberOfEdges
+   * @return
+   */
+  virtual size_t getNumberOfEdges() const = 0;
+
+  // -----------------------------------------------------------------------------
+  // Connectivity
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief findElementEdges
+   * @return
+   */
+  virtual int findEdges() = 0;
+
+  /**
+   * @brief deleteElementEdges
+   */
+  virtual void deleteEdges() = 0;
+
+  /**
+   * @brief findFaces
+   * @return
+   */
+  virtual int findFaces() = 0;
+
+  /**
+   * @brief deleteFaces
+   */
+  virtual void deleteFaces() = 0;
+
+  // -----------------------------------------------------------------------------
+  // Topology
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief findUnsharedEdges
+   */
+  virtual int findUnsharedEdges() = 0;
+
+  /**
+   * @brief getUnsharedEdges
+   * @return
+   */
+  virtual SharedEdgeList::Pointer getUnsharedEdges() const = 0;
+
+  /**
+   * @brief deleteUnsharedEdges
+   */
+  virtual void deleteUnsharedEdges() = 0;
+
+  /**
+   * @brief findUnsharedFaces
+   */
+  virtual int findUnsharedFaces() = 0;
+
+  /**
+   * @brief getUnsharedFaces
+   * @return
+   */
+  virtual SharedEdgeList::Pointer getUnsharedFaces() const = 0;
+
+  /**
+   * @brief deleteUnsharedFaces
+   */
+  virtual void deleteUnsharedFaces() = 0;
+
+protected:
+  /**
+   * @brief setEdges
+   * @param edges
+   */
+  virtual void setEdges(SharedEdgeList::Pointer edges) = 0;
+
+  /**
+   * @brief setUnsharedEdges
+   * @param bEdgeList
+   */
+  virtual void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) = 0;
+
+  /**
+   * @brief setUnsharedFaces
+   * @param bFaceList
+   */
+  virtual void setUnsharedFaces(SharedFaceList::Pointer bFaceList) = 0;
+
+public:
+  IGeometry3D(const IGeometry3D&) = delete;            // Copy Constructor Not Implemented
+  IGeometry3D(IGeometry3D&&) = delete;                 // Move Constructor Not Implemented
+  IGeometry3D& operator=(const IGeometry3D&) = delete; // Copy Assignment Not Implemented
+  IGeometry3D& operator=(IGeometry3D&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.cpp b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
index 181d0ee595..115c5150b5 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.cpp
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/Geometry/IGeometryGrid.h"
 
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 0352d259a4..e5a04159ea 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -42,7 +42,6 @@
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Geometry/IGeometry.h"
 
-
 /**
  * @brief The IGeometryGrid class extends IGeometry for grid type geometries
  */
@@ -81,11 +80,11 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
   virtual size_t getXPoints() const = 0;
   virtual size_t getYPoints() const = 0;
   virtual size_t getZPoints() const = 0;
-  
+
   virtual void getPlaneCoords(size_t idx[3], float coords[3]) const = 0;
   virtual void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
   virtual void getPlaneCoords(size_t idx, float coords[3]) const = 0;
-  
+
   virtual void getPlaneCoords(size_t idx[3], double coords[3]) const = 0;
   virtual void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
   virtual void getPlaneCoords(size_t idx, double coords[3]) const = 0;
@@ -93,7 +92,7 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
   virtual void getCoords(size_t idx[3], float coords[3]) const = 0;
   virtual void getCoords(size_t x, size_t y, size_t z, float coords[3]) const = 0;
   virtual void getCoords(size_t idx, float coords[3]) const = 0;
-  
+
   virtual void getCoords(size_t idx[3], double coords[3]) const = 0;
   virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
   virtual void getCoords(size_t idx, double coords[3]) const = 0;
@@ -104,5 +103,3 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
   IGeometryGrid& operator=(const IGeometryGrid&) = delete; // Copy Assignment Not Implemented
   IGeometryGrid& operator=(IGeometryGrid&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.cpp b/Source/SIMPLib/Geometry/ITransformContainer.cpp
index 06769369c9..0e5c0b1f96 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/ITransformContainer.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ITransformContainer.h"
 
 ITransformContainer::ITransformContainer() = default;
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index db88d2c758..f6e3fdeb7a 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -64,10 +64,9 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
   virtual int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) = 0;
   virtual int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
 
-  
 public:
-  ITransformContainer(const ITransformContainer&) = delete; // Copy Constructor Not Implemented
-  ITransformContainer(ITransformContainer&&) = delete;      // Move Constructor Not Implemented
+  ITransformContainer(const ITransformContainer&) = delete;            // Copy Constructor Not Implemented
+  ITransformContainer(ITransformContainer&&) = delete;                 // Move Constructor Not Implemented
   ITransformContainer& operator=(const ITransformContainer&) = delete; // Copy Assignment Not Implemented
   ITransformContainer& operator=(ITransformContainer&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 0584f17cb3..0d31ab5840 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * ImageGeom re-implements code from the following vtk modules:
@@ -238,8 +238,7 @@ class FindImageDerivativesImpl
 
     switch(directionType)
     {
-    case XDirection:
-    {
+    case XDirection: {
       if(differenceType == LeftSide)
       {
         index1 = (z * dims[1] * dims[0]) + (y * dims[0]) + (x + 1);
@@ -267,8 +266,7 @@ class FindImageDerivativesImpl
       }
       break;
     }
-    case YDirection:
-    {
+    case YDirection: {
       if(differenceType == LeftSide)
       {
         index1 = (z * dims[1] * dims[0]) + ((y + 1) * dims[0]) + x;
@@ -296,8 +294,7 @@ class FindImageDerivativesImpl
       }
       break;
     }
-    case ZDirection:
-    {
+    case ZDirection: {
       if(differenceType == LeftSide)
       {
         index1 = ((z + 1) * dims[1] * dims[0]) + (y * dims[0]) + x;
@@ -325,8 +322,7 @@ class FindImageDerivativesImpl
       }
       break;
     }
-    default:
-    {
+    default: {
       break;
     }
     }
@@ -502,12 +498,12 @@ void ImageGeom::setDimensions(size_t x, size_t y, size_t z)
 // -----------------------------------------------------------------------------
 void ImageGeom::getBoundingBox(float* boundingBox)
 {
-    boundingBox[0] = m_Origin[0];
-    boundingBox[1] = m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]);
-    boundingBox[2] = m_Origin[1];
-    boundingBox[3] = m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]);
-    boundingBox[4] = m_Origin[2];
-    boundingBox[5] = m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]);
+  boundingBox[0] = m_Origin[0];
+  boundingBox[1] = m_Origin[0] + (m_Dimensions[0] * m_Spacing[0]);
+  boundingBox[2] = m_Origin[1];
+  boundingBox[3] = m_Origin[1] + (m_Dimensions[1] * m_Spacing[1]);
+  boundingBox[4] = m_Origin[2];
+  boundingBox[5] = m_Origin[2] + (m_Dimensions[2] * m_Spacing[2]);
 }
 
 // -----------------------------------------------------------------------------
@@ -531,7 +527,7 @@ size_t ImageGeom::getXPoints() const
 //
 // -----------------------------------------------------------------------------
 size_t ImageGeom::getYPoints() const
-{ 
+{
   return m_Dimensions[1];
 }
 
@@ -706,7 +702,7 @@ void ImageGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -924,7 +920,7 @@ void ImageGeom::findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType:
   {
     grain = 1;
   }
-  
+
   ParallelData3DAlgorithm dataAlg;
   dataAlg.setRange(dims[2], dims[1], dims[0]);
   dataAlg.setGrain(grain);
@@ -1019,7 +1015,7 @@ QString ImageGeom::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   QString info;
   QTextStream ss(&info);
   ss << "Requested InfoStringFormat is not supported. " << format;
@@ -1035,11 +1031,11 @@ ToolTipGenerator ImageGeom::getToolTipGenerator() const
   ToolTipGenerator toolTipGen;
 
   QString lengthUnit = IGeometry::LengthUnitToString(static_cast<IGeometry::LengthUnit>(getUnits()));
-  int64_t volDims[3] = { static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints()) };
+  int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
   FloatVec3Type spacing = getSpacing();
   FloatVec3Type origin = getOrigin();
 
-  float halfRes[3] = { spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f };
+  float halfRes[3] = {spacing[0] / 2.0f, spacing[1] / 2.0f, spacing[2] / 2.0f};
   float vol = (volDims[0] * spacing[0]) * (volDims[1] * spacing[1]) * (volDims[2] * spacing[2]);
   QLocale usa(QLocale::English, QLocale::UnitedStates);
 
@@ -1054,9 +1050,12 @@ ToolTipGenerator ImageGeom::getToolTipGenerator() const
   toolTipGen.addValue("Spacing", QString::number(spacing[0]) + ", " + QString::number(spacing[1]) + ", " + QString::number(spacing[2]));
   toolTipGen.addValue("Volume", usa.toString(vol) + " " + lengthUnit + "s ^3");
   toolTipGen.addTitle("Bounds (Cell Centered)");
-  toolTipGen.addValue("X Range", QString::number(origin[0] - halfRes[0]) + " to " + QString::number(origin[0] - halfRes[0] + volDims[0] * spacing[0]) + " (delta: " + QString::number(volDims[0] * spacing[0]) + ")");
-  toolTipGen.addValue("Y Range", QString::number(origin[1] - halfRes[1]) + " to " + QString::number(origin[1] - halfRes[1] + volDims[1] * spacing[1]) + " (delta: " + QString::number(volDims[1] * spacing[1]) + ")");
-  toolTipGen.addValue("Z Range", QString::number(origin[2] - halfRes[2]) + " to " + QString::number(origin[2] - halfRes[2] + volDims[2] * spacing[2]) + " (delta: " + QString::number(volDims[2] * spacing[2]) + ")");
+  toolTipGen.addValue("X Range", QString::number(origin[0] - halfRes[0]) + " to " + QString::number(origin[0] - halfRes[0] + volDims[0] * spacing[0]) +
+                                     " (delta: " + QString::number(volDims[0] * spacing[0]) + ")");
+  toolTipGen.addValue("Y Range", QString::number(origin[1] - halfRes[1]) + " to " + QString::number(origin[1] - halfRes[1] + volDims[1] * spacing[1]) +
+                                     " (delta: " + QString::number(volDims[1] * spacing[1]) + ")");
+  toolTipGen.addValue("Z Range", QString::number(origin[2] - halfRes[2]) + " to " + QString::number(origin[2] - halfRes[2] + volDims[2] * spacing[2]) +
+                                     " (delta: " + QString::number(volDims[2] * spacing[2]) + ")");
 
   return toolTipGen;
 }
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 993fb82929..a71d76c061 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -427,6 +427,3 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   ImageGeom& operator=(const ImageGeom&) = delete; // Copy Assignment Not Implemented
   ImageGeom& operator=(ImageGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/MeshStructs.h b/Source/SIMPLib/Geometry/MeshStructs.h
old mode 100755
new mode 100644
index 996769dfe5..d46e52bed8
--- a/Source/SIMPLib/Geometry/MeshStructs.h
+++ b/Source/SIMPLib/Geometry/MeshStructs.h
@@ -1,43 +1,41 @@
 /* ============================================================================
-* Copyright (c) 2012 Dr. Sukbin Lee (Carnegie-Mellon University)
-* 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 the name of Anthony Rollet, Sukbin Lee, Jason Gruber, Stephen Sintay
-* nor the names of its 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 COPYRIGHT HOLDER 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.
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2012 Dr. Sukbin Lee (Carnegie-Mellon University)
+ * 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 the name of Anthony Rollet, Sukbin Lee, Jason Gruber, Stephen Sintay
+ * nor the names of its 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 COPYRIGHT HOLDER 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-//Qt Includes
+// Qt Includes
 
-//SIMPLib Includes
+// SIMPLib Includes
 #include "SIMPLib/SIMPLib.h"
 
-
-
 // -----------------------------------------------------------------------------
 // These structures are specific to the MultiMaterial Marching Cubes "M3C" algorithms
 // -----------------------------------------------------------------------------
@@ -45,54 +43,53 @@
 
 namespace SurfaceMesh
 {
-  namespace M3C
-  {
-    typedef struct
-    {
-      float coord[3];
-    } VoxelCoord;
-
-    typedef struct
-    {
-      int neigh_id[num_neigh + 1];
-    } Neighbor;
-
-    typedef struct
-    {
-      int64_t site_id[4];    // stores 4 sites at the corners of each square...
-      int64_t edge_id[4];    // stores edge id turned on...others will have dummy -1...
-      int nEdge;         // number of edges on the square...
-      int FCnode;        // face center node...if not, it's -1...
-      int effect;        // 0 if the square is useless; 1 is good...
-    } Face;
+namespace M3C
+{
+typedef struct
+{
+  float coord[3];
+} VoxelCoord;
 
-    typedef struct
-    {
-      int64_t node_id[2];    // the segment heads from node_id[0] to node_id[1]...
-      int edgeKind;      // initially marked as 2; for face edges it's always 2...
-      int nSpin[2];      // 0 is to the left of the arrow; 1 is at right...
-    } Segment;
+typedef struct
+{
+  int neigh_id[num_neigh + 1];
+} Neighbor;
 
-    /* Used for "inner edge" spin calculations */
-    typedef struct
-    {
-      int64_t node_id[2];    // the segment heads from node_id[0] to node_id[1]...
-      int edgeKind;      // initially marked with 2...
-      int nSpin[4];
-    } ISegment;
+typedef struct
+{
+  int64_t site_id[4]; // stores 4 sites at the corners of each square...
+  int64_t edge_id[4]; // stores edge id turned on...others will have dummy -1...
+  int nEdge;          // number of edges on the square...
+  int FCnode;         // face center node...if not, it's -1...
+  int effect;         // 0 if the square is useless; 1 is good...
+} Face;
+
+typedef struct
+{
+  int64_t node_id[2]; // the segment heads from node_id[0] to node_id[1]...
+  int edgeKind;       // initially marked as 2; for face edges it's always 2...
+  int nSpin[2];       // 0 is to the left of the arrow; 1 is at right...
+} Segment;
 
-    typedef struct
-    {
-      int64_t node_id[3];    // stores three new node id for vertices of the triangles...
-      uint64_t e_id[3];       // stores three new edge id for sides of the triangles...
-      int nSpin[2];      // two spins...
-      int edgePlace[3];
-    } Triangle;
+/* Used for "inner edge" spin calculations */
+typedef struct
+{
+  int64_t node_id[2]; // the segment heads from node_id[0] to node_id[1]...
+  int edgeKind;       // initially marked with 2...
+  int nSpin[4];
+} ISegment;
 
-    typedef Triangle Patch; // This is here for compatibility
-  }
-}
+typedef struct
+{
+  int64_t node_id[3]; // stores three new node id for vertices of the triangles...
+  uint64_t e_id[3];   // stores three new edge id for sides of the triangles...
+  int nSpin[2];       // two spins...
+  int edgePlace[3];
+} Triangle;
 
+typedef Triangle Patch; // This is here for compatibility
+} // namespace M3C
+} // namespace SurfaceMesh
 
 // -----------------------------------------------------------------------------
 // These structures are used to write the binary temp files during some of the
@@ -100,32 +97,30 @@ namespace SurfaceMesh
 // -----------------------------------------------------------------------------
 namespace SurfaceMesh
 {
-  namespace NodesFile
-  {
-    typedef struct
-    {
-      int64_t nodeId;
-      int nodeKind;
-      float x;
-      float y;
-      float z;
-    } NodesFileRecord_t;
-    const int ByteCount = sizeof(NodesFileRecord_t);
-  }
-
-  namespace TrianglesFile
-  {
-    typedef struct
-    {
-      int64_t triId;
-      int64_t nodeId_0;
-      int64_t nodeId_1;
-      int64_t nodeId_2;
-      int label_0;
-      int label_1;
-    } TrianglesFileRecord_t;
-    const int ByteCount = sizeof(TrianglesFileRecord_t);
-  }
-}
-
-
+namespace NodesFile
+{
+typedef struct
+{
+  int64_t nodeId;
+  int nodeKind;
+  float x;
+  float y;
+  float z;
+} NodesFileRecord_t;
+const int ByteCount = sizeof(NodesFileRecord_t);
+} // namespace NodesFile
+
+namespace TrianglesFile
+{
+typedef struct
+{
+  int64_t triId;
+  int64_t nodeId_0;
+  int64_t nodeId_1;
+  int64_t nodeId_2;
+  int label_0;
+  int label_1;
+} TrianglesFileRecord_t;
+const int ByteCount = sizeof(TrianglesFileRecord_t);
+} // namespace TrianglesFile
+} // namespace SurfaceMesh
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index c1e4171bcd..e08d3b63e2 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * QuadGeom re-implements code from the following vtk modules:
@@ -109,6 +109,7 @@ class FindQuadDerivativesImpl
   {
     compute(range.min(), range.max());
   }
+
 private:
   QuadGeom* m_Quads;
   DoubleArrayType::Pointer m_Field;
@@ -215,7 +216,7 @@ void QuadGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix:
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -392,7 +393,7 @@ int QuadGeom::findElementSizes()
 }
 
 // -----------------------------------------------------------------------------
-//z
+// z
 // -----------------------------------------------------------------------------
 FloatArrayType::Pointer QuadGeom::getElementSizes() const
 {
@@ -648,7 +649,7 @@ QString QuadGeom::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   return QString();
 }
 
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 132511969e..f5c58a5534 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -529,6 +529,3 @@ class SIMPLib_EXPORT QuadGeom : public IGeometry2D
   QuadGeom& operator=(const QuadGeom&) = delete; // Copy Assignment Not Implemented
   QuadGeom& operator=(QuadGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 6612bfd1e2..5ed4301237 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * RectGridGeom re-implements code from the following vtk modules:
@@ -238,8 +238,7 @@ class FindRectGridDerivativesImpl
 
     switch(directionType)
     {
-    case XDirection:
-    {
+    case XDirection: {
       if(differenceType == LeftSide)
       {
         index1 = (z * dims[1] * dims[0]) + (y * dims[0]) + (x + 1);
@@ -267,8 +266,7 @@ class FindRectGridDerivativesImpl
       }
       break;
     }
-    case YDirection:
-    {
+    case YDirection: {
       if(differenceType == LeftSide)
       {
         index1 = (z * dims[1] * dims[0]) + ((y + 1) * dims[0]) + x;
@@ -296,8 +294,7 @@ class FindRectGridDerivativesImpl
       }
       break;
     }
-    case ZDirection:
-    {
+    case ZDirection: {
       if(differenceType == LeftSide)
       {
         index1 = ((z + 1) * dims[1] * dims[0]) + (y * dims[0]) + x;
@@ -325,8 +322,7 @@ class FindRectGridDerivativesImpl
       }
       break;
     }
-    default:
-    {
+    default: {
       break;
     }
     }
@@ -742,7 +738,7 @@ void RectGridGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMat
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -1032,7 +1028,7 @@ int RectGridGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
     err = GeometryHelpers::GeomIO::WriteListToHDF5(parentId, m_VoxelSizes);
     if(err < 0)
     {
-       return err;
+      return err;
     }
   }
 
@@ -1092,7 +1088,7 @@ QString RectGridGeom::getInfoString(SIMPL::InfoStringFormat format) const
   {
     return getToolTipGenerator().generateHTML();
   }
-  
+
   return QString();
 }
 
@@ -1103,7 +1099,7 @@ ToolTipGenerator RectGridGeom::getToolTipGenerator() const
 {
   ToolTipGenerator toolTipGen;
 
-  int64_t volDims[3] = { static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints()) };
+  int64_t volDims[3] = {static_cast<int64_t>(getXPoints()), static_cast<int64_t>(getYPoints()), static_cast<int64_t>(getZPoints())};
 
   toolTipGen.addTitle("Geometry Info");
   toolTipGen.addValue("Type", TypeToString(getGeometryType()));
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 945eac242d..ac2531a9b4 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,272 +48,268 @@
  */
 class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
 {
-  public:
-    using Self = RectGridGeom;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for RectGridGeom
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for RectGridGeom
-     */
-    static QString ClassName();
-
-    ~RectGridGeom() override;
-
-    /**
-     * @brief CreateGeometry
-     * @param name
-     * @return
-     */
-    static Pointer CreateGeometry(const QString& name);
-
-    void setXBounds(const FloatArrayType::Pointer& xBounds);
-    void setYBounds(const FloatArrayType::Pointer& yBounds);
-    void setZBounds(const FloatArrayType::Pointer& zBounds);
-
-    FloatArrayType::Pointer getXBounds() const;
-    FloatArrayType::Pointer getYBounds() const;
-    FloatArrayType::Pointer getZBounds() const;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from IGeometry
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief initializeWithZeros
-     */
-    void initializeWithZeros() override;
-
-    /**
-     * @brief getNumberOfElements
-     * @return
-     */
-    size_t getNumberOfElements() const override;
-
-    /**
-     * @brief findElementSizes
-     * @return
-     */
-    int findElementSizes() override;
-
-    /**
-     * @brief getElementSizes
-     * @return
-     */
-    FloatArrayType::Pointer getElementSizes() const override;
-
-    /**
-     * @brief deleteElementSizes
-     */
-    void deleteElementSizes() override;
-
-    /**
-     * @brief findElementsContainingVert
-     * @return
-     */
-    int findElementsContainingVert() override;
-
-    /**
-     * @brief getElementsContainingVert
-     * @return
-     */
-    ElementDynamicList::Pointer getElementsContainingVert() const override;
-
-    /**
-     * @brief deleteElementsContainingVert
-     */
-    void deleteElementsContainingVert() override;
-
-    /**
-     * @brief findElementNeighbors
-     * @return
-     */
-    int findElementNeighbors() override;
-
-    /**
-     * @brief getElementNeighbors
-     * @return
-     */
-    ElementDynamicList::Pointer getElementNeighbors() const override;
-
-    /**
-     * @brief deleteElementNeighbors
-     */
-    void deleteElementNeighbors() override;
-
-    /**
-     * @brief findElementCentroids
-     * @return
-     */
-    int findElementCentroids() override;
-
-    /**
-     * @brief getElementCentroids
-     * @return
-     */
-    FloatArrayType::Pointer getElementCentroids() const override;
-
-    /**
-     * @brief deleteElementCentroids
-     */
-    void deleteElementCentroids() override;
-
-    /**
-     * @brief getParametricCenter
-     * @param pCoords
-     */
-    void getParametricCenter(double pCoords[3]) const override;
-
-    /**
-     * @brief getShapeFunctions
-     * @param pCoords
-     * @param shape
-     */
-    void getShapeFunctions(double pCoords[3], double* shape) const override;
-
-    /**
-     * @brief findDerivatives
-     * @param field
-     * @param derivatives
-     */
-    void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    QString getInfoString(SIMPL::InfoStringFormat format) const override;
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the geometry.
-     * @return
-     */
-    ToolTipGenerator getToolTipGenerator() const override;
-
-    /**
-     * @brief writeGeometryToHDF5
-     * @param parentId
-     * @param writeXdmf
-     * @return
-     */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
-
-    /**
-     * @brief writeXdmf
-     * @param out
-     * @param dcName
-     * @param hdfFileName
-     * @return
-     */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
-
-    /**
-     * @brief readGeometryFromHDF5
-     * @param parentId
-     * @param preflight
-     * @return
-     */
-    int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
-
-    /**
-     * @brief addOrReplaceAttributeMatrix
-     */
-    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
-    
-// -----------------------------------------------------------------------------
-// Inherited from IGeometryGrid
-// -----------------------------------------------------------------------------
-    void setDimensions(const SizeVec3Type& dims) override;
-    SizeVec3Type getDimensions() const override;
-
-    size_t getXPoints() const override;
-    size_t getYPoints() const override;
-    size_t getZPoints() const override;
-
-    void getPlaneCoords(size_t idx[3], float coords[3]) const override;
-    void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
-    void getPlaneCoords(size_t idx, float coords[3]) const override;
-    void getPlaneCoords(size_t idx[3], double coords[3]) const override;
-    void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
-    void getPlaneCoords(size_t idx, double coords[3]) const override;
-
-    void getCoords(size_t idx[3], float coords[3]) const override;
-    void getCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
-    void getCoords(size_t idx, float coords[3]) const override;
-    void getCoords(size_t idx[3], double coords[3]) const override;
-    void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
-    void getCoords(size_t idx, double coords[3]) const override;
-
-  protected:
-
-    RectGridGeom();
-
-    /**
-     * @brief Gathers the RectGrid geometry from an HDF5 file
-     * @param parentid
-     * @param volDims
-     * @param spacing
-     * @param origin
-     * @return
-     */
-    virtual int gatherMetaData(hid_t parentid, size_t volDims[3], bool preflight);
-
-    /**
-     * @brief setElementsContaingVert
-     * @param elementsContaingVert
-     */
-    void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
-
-    /**
-     * @brief setElementNeighbors
-     * @param elementNeighbors
-     */
-    void setElementNeighbors(ElementDynamicList::Pointer elementsNeighbors) override;
-
-    /**
-     * @brief setElementCentroids
-     * @param elementCentroids
-     */
-    void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
-
-    /**
-     * @brief setElementSizes
-     * @param elementSizes
-     */
-    void setElementSizes(FloatArrayType::Pointer elementSizes) override;
-
-  private:
-    FloatArrayType::Pointer m_xBounds;
-    FloatArrayType::Pointer m_yBounds;
-    FloatArrayType::Pointer m_zBounds;
-    FloatArrayType::Pointer m_VoxelSizes;
-    SizeVec3Type m_Dimensions;
-
-    friend class FindRectGridDerivativesImpl;
-
-  public:
-    RectGridGeom(const RectGridGeom&) = delete;   // Copy Constructor Not Implemented
-    RectGridGeom(RectGridGeom&&) = delete;        // Move Constructor Not Implemented
-    RectGridGeom& operator=(const RectGridGeom&) = delete; // Copy Assignment Not Implemented
-    RectGridGeom& operator=(RectGridGeom&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = RectGridGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for RectGridGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for RectGridGeom
+   */
+  static QString ClassName();
+
+  ~RectGridGeom() override;
+
+  /**
+   * @brief CreateGeometry
+   * @param name
+   * @return
+   */
+  static Pointer CreateGeometry(const QString& name);
+
+  void setXBounds(const FloatArrayType::Pointer& xBounds);
+  void setYBounds(const FloatArrayType::Pointer& yBounds);
+  void setZBounds(const FloatArrayType::Pointer& zBounds);
+
+  FloatArrayType::Pointer getXBounds() const;
+  FloatArrayType::Pointer getYBounds() const;
+  FloatArrayType::Pointer getZBounds() const;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometry
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief initializeWithZeros
+   */
+  void initializeWithZeros() override;
+
+  /**
+   * @brief getNumberOfElements
+   * @return
+   */
+  size_t getNumberOfElements() const override;
+
+  /**
+   * @brief findElementSizes
+   * @return
+   */
+  int findElementSizes() override;
+
+  /**
+   * @brief getElementSizes
+   * @return
+   */
+  FloatArrayType::Pointer getElementSizes() const override;
+
+  /**
+   * @brief deleteElementSizes
+   */
+  void deleteElementSizes() override;
+
+  /**
+   * @brief findElementsContainingVert
+   * @return
+   */
+  int findElementsContainingVert() override;
+
+  /**
+   * @brief getElementsContainingVert
+   * @return
+   */
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
+
+  /**
+   * @brief deleteElementsContainingVert
+   */
+  void deleteElementsContainingVert() override;
+
+  /**
+   * @brief findElementNeighbors
+   * @return
+   */
+  int findElementNeighbors() override;
+
+  /**
+   * @brief getElementNeighbors
+   * @return
+   */
+  ElementDynamicList::Pointer getElementNeighbors() const override;
+
+  /**
+   * @brief deleteElementNeighbors
+   */
+  void deleteElementNeighbors() override;
+
+  /**
+   * @brief findElementCentroids
+   * @return
+   */
+  int findElementCentroids() override;
+
+  /**
+   * @brief getElementCentroids
+   * @return
+   */
+  FloatArrayType::Pointer getElementCentroids() const override;
+
+  /**
+   * @brief deleteElementCentroids
+   */
+  void deleteElementCentroids() override;
+
+  /**
+   * @brief getParametricCenter
+   * @param pCoords
+   */
+  void getParametricCenter(double pCoords[3]) const override;
+
+  /**
+   * @brief getShapeFunctions
+   * @param pCoords
+   * @param shape
+   */
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
+
+  /**
+   * @brief findDerivatives
+   * @param field
+   * @param derivatives
+   */
+  void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
+  /**
+   * @brief writeGeometryToHDF5
+   * @param parentId
+   * @param writeXdmf
+   * @return
+   */
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
+
+  /**
+   * @brief writeXdmf
+   * @param out
+   * @param dcName
+   * @param hdfFileName
+   * @return
+   */
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
+
+  /**
+   * @brief readGeometryFromHDF5
+   * @param parentId
+   * @param preflight
+   * @return
+   */
+  int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
+
+  /**
+   * @brief addOrReplaceAttributeMatrix
+   */
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometryGrid
+  // -----------------------------------------------------------------------------
+  void setDimensions(const SizeVec3Type& dims) override;
+  SizeVec3Type getDimensions() const override;
+
+  size_t getXPoints() const override;
+  size_t getYPoints() const override;
+  size_t getZPoints() const override;
+
+  void getPlaneCoords(size_t idx[3], float coords[3]) const override;
+  void getPlaneCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+  void getPlaneCoords(size_t idx, float coords[3]) const override;
+  void getPlaneCoords(size_t idx[3], double coords[3]) const override;
+  void getPlaneCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+  void getPlaneCoords(size_t idx, double coords[3]) const override;
+
+  void getCoords(size_t idx[3], float coords[3]) const override;
+  void getCoords(size_t x, size_t y, size_t z, float coords[3]) const override;
+  void getCoords(size_t idx, float coords[3]) const override;
+  void getCoords(size_t idx[3], double coords[3]) const override;
+  void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
+  void getCoords(size_t idx, double coords[3]) const override;
+
+protected:
+  RectGridGeom();
+
+  /**
+   * @brief Gathers the RectGrid geometry from an HDF5 file
+   * @param parentid
+   * @param volDims
+   * @param spacing
+   * @param origin
+   * @return
+   */
+  virtual int gatherMetaData(hid_t parentid, size_t volDims[3], bool preflight);
+
+  /**
+   * @brief setElementsContaingVert
+   * @param elementsContaingVert
+   */
+  void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
+
+  /**
+   * @brief setElementNeighbors
+   * @param elementNeighbors
+   */
+  void setElementNeighbors(ElementDynamicList::Pointer elementsNeighbors) override;
+
+  /**
+   * @brief setElementCentroids
+   * @param elementCentroids
+   */
+  void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
+
+  /**
+   * @brief setElementSizes
+   * @param elementSizes
+   */
+  void setElementSizes(FloatArrayType::Pointer elementSizes) override;
+
+private:
+  FloatArrayType::Pointer m_xBounds;
+  FloatArrayType::Pointer m_yBounds;
+  FloatArrayType::Pointer m_zBounds;
+  FloatArrayType::Pointer m_VoxelSizes;
+  SizeVec3Type m_Dimensions;
+
+  friend class FindRectGridDerivativesImpl;
+
+public:
+  RectGridGeom(const RectGridGeom&) = delete;            // Copy Constructor Not Implemented
+  RectGridGeom(RectGridGeom&&) = delete;                 // Move Constructor Not Implemented
+  RectGridGeom& operator=(const RectGridGeom&) = delete; // Copy Assignment Not Implemented
+  RectGridGeom& operator=(RectGridGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
index 50543bb81b..78e2462fd6 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CubeOctohedronOps.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
old mode 100755
new mode 100644
index f838915813..2b744d0bc0
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,50 +39,49 @@
 
 #include "ShapeOps.h"
 
-
-
 /*
  *
  */
 class SIMPLib_EXPORT CubeOctohedronOps : public ShapeOps
 {
-  public:
-    using Self = CubeOctohedronOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for CubeOctohedronOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CubeOctohedronOps
-     */
-    static QString ClassName();
-
-    static Pointer New();
-
-    ~CubeOctohedronOps() override;
-
-    float radcur1(QMap<ArgName, float> args) override;
-
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
-    void init() override { Gvalue = 0.0f; }
-
-  protected:
-    CubeOctohedronOps();
-  private:
-    float Gvalue;
-
-  public:
-    CubeOctohedronOps(const CubeOctohedronOps&) = delete; // Copy Constructor Not Implemented
-    CubeOctohedronOps(CubeOctohedronOps&&) = delete;      // Move Constructor Not Implemented
-    CubeOctohedronOps& operator=(const CubeOctohedronOps&) = delete; // Copy Assignment Not Implemented
-    CubeOctohedronOps& operator=(CubeOctohedronOps&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = CubeOctohedronOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for CubeOctohedronOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CubeOctohedronOps
+   */
+  static QString ClassName();
+
+  static Pointer New();
+
+  ~CubeOctohedronOps() override;
+
+  float radcur1(QMap<ArgName, float> args) override;
+
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  void init() override
+  {
+    Gvalue = 0.0f;
+  }
+
+protected:
+  CubeOctohedronOps();
+
+private:
+  float Gvalue;
+
+public:
+  CubeOctohedronOps(const CubeOctohedronOps&) = delete;            // Copy Constructor Not Implemented
+  CubeOctohedronOps(CubeOctohedronOps&&) = delete;                 // Move Constructor Not Implemented
+  CubeOctohedronOps& operator=(const CubeOctohedronOps&) = delete; // Copy Assignment Not Implemented
+  CubeOctohedronOps& operator=(CubeOctohedronOps&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
index 56f2daac9b..c5db2e7376 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CylinderAOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
old mode 100755
new mode 100644
index fab7d99a33..7176234d06
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
@@ -1,86 +1,84 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "ShapeOps.h"
 
-
 /*
  *
  */
 class SIMPLib_EXPORT CylinderAOps : public ShapeOps
 {
-  public:
-    using Self = CylinderAOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CylinderAOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for CylinderAOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CylinderAOps
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for CylinderAOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CylinderAOps
+   */
+  static QString ClassName();
 
-    static Pointer New();
+  static Pointer New();
 
-    ~CylinderAOps() override;
+  ~CylinderAOps() override;
 
-    float radcur1(QMap<ArgName, float> args) override;
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
-    void init() override {  }
+  float radcur1(QMap<ArgName, float> args) override;
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  void init() override
+  {
+  }
 
-  protected:
-    CylinderAOps();
+protected:
+  CylinderAOps();
 
-  public:
-    CylinderAOps(const CylinderAOps&) = delete;   // Copy Constructor Not Implemented
-    CylinderAOps(CylinderAOps&&) = delete;        // Move Constructor Not Implemented
-    CylinderAOps& operator=(const CylinderAOps&) = delete; // Copy Assignment Not Implemented
-    CylinderAOps& operator=(CylinderAOps&&) = delete;      // Move Assignment Not Implemented
+public:
+  CylinderAOps(const CylinderAOps&) = delete;            // Copy Constructor Not Implemented
+  CylinderAOps(CylinderAOps&&) = delete;                 // Move Constructor Not Implemented
+  CylinderAOps& operator=(const CylinderAOps&) = delete; // Copy Assignment Not Implemented
+  CylinderAOps& operator=(CylinderAOps&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
index 613397c1a4..c8b481e07a 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CylinderBOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
old mode 100755
new mode 100644
index 27a3e7c53f..d1cf1186fc
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
@@ -1,86 +1,84 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "ShapeOps.h"
 
-
 /*
  *
  */
 class SIMPLib_EXPORT CylinderBOps : public ShapeOps
 {
-  public:
-    using Self = CylinderBOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CylinderBOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for CylinderBOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CylinderBOps
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for CylinderBOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CylinderBOps
+   */
+  static QString ClassName();
 
-    static Pointer New();
+  static Pointer New();
 
-    ~CylinderBOps() override;
+  ~CylinderBOps() override;
 
-    float radcur1(QMap<ArgName, float> args) override;
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
-    void init() override {  }
+  float radcur1(QMap<ArgName, float> args) override;
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  void init() override
+  {
+  }
 
-  protected:
-    CylinderBOps();
+protected:
+  CylinderBOps();
 
-  public:
-    CylinderBOps(const CylinderBOps&) = delete;   // Copy Constructor Not Implemented
-    CylinderBOps(CylinderBOps&&) = delete;        // Move Constructor Not Implemented
-    CylinderBOps& operator=(const CylinderBOps&) = delete; // Copy Assignment Not Implemented
-    CylinderBOps& operator=(CylinderBOps&&) = delete;      // Move Assignment Not Implemented
+public:
+  CylinderBOps(const CylinderBOps&) = delete;            // Copy Constructor Not Implemented
+  CylinderBOps(CylinderBOps&&) = delete;                 // Move Constructor Not Implemented
+  CylinderBOps& operator=(const CylinderBOps&) = delete; // Copy Assignment Not Implemented
+  CylinderBOps& operator=(CylinderBOps&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
index 83aad1b57d..fe9592be97 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CylinderCOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
old mode 100755
new mode 100644
index 4959a055fc..5ce11608d8
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
@@ -1,86 +1,84 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "ShapeOps.h"
 
-
 /*
  *
  */
 class SIMPLib_EXPORT CylinderCOps : public ShapeOps
 {
-  public:
-    using Self = CylinderCOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = CylinderCOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for CylinderCOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for CylinderCOps
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for CylinderCOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for CylinderCOps
+   */
+  static QString ClassName();
 
-    static Pointer New();
+  static Pointer New();
 
-    ~CylinderCOps() override;
+  ~CylinderCOps() override;
 
-    float radcur1(QMap<ArgName, float> args) override;
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
-    void init() override {  }
+  float radcur1(QMap<ArgName, float> args) override;
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  void init() override
+  {
+  }
 
-  protected:
-    CylinderCOps();
+protected:
+  CylinderCOps();
 
-  public:
-    CylinderCOps(const CylinderCOps&) = delete;   // Copy Constructor Not Implemented
-    CylinderCOps(CylinderCOps&&) = delete;        // Move Constructor Not Implemented
-    CylinderCOps& operator=(const CylinderCOps&) = delete; // Copy Assignment Not Implemented
-    CylinderCOps& operator=(CylinderCOps&&) = delete;      // Move Assignment Not Implemented
+public:
+  CylinderCOps(const CylinderCOps&) = delete;            // Copy Constructor Not Implemented
+  CylinderCOps(CylinderCOps&&) = delete;                 // Move Constructor Not Implemented
+  CylinderCOps& operator=(const CylinderCOps&) = delete; // Copy Assignment Not Implemented
+  CylinderCOps& operator=(CylinderCOps&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
index 1d2fe9f318..ecd3c74d73 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "EllipsoidOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
old mode 100755
new mode 100644
index 49ea3db4fb..fb3e174309
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,40 +44,38 @@
  */
 class SIMPLib_EXPORT EllipsoidOps : public ShapeOps
 {
-  public:
-    using Self = EllipsoidOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = EllipsoidOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for EllipsoidOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for EllipsoidOps
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for EllipsoidOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for EllipsoidOps
+   */
+  static QString ClassName();
 
-    static Pointer New();
+  static Pointer New();
 
-    ~EllipsoidOps() override;
+  ~EllipsoidOps() override;
 
-    float radcur1(QMap<ArgName, float> args) override;
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  float radcur1(QMap<ArgName, float> args) override;
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
 
-  protected:
-    EllipsoidOps();
+protected:
+  EllipsoidOps();
 
-  public:
-    EllipsoidOps(const EllipsoidOps&) = delete;   // Copy Constructor Not Implemented
-    EllipsoidOps(EllipsoidOps&&) = delete;        // Move Constructor Not Implemented
-    EllipsoidOps& operator=(const EllipsoidOps&) = delete; // Copy Assignment Not Implemented
-    EllipsoidOps& operator=(EllipsoidOps&&) = delete;      // Move Assignment Not Implemented
+public:
+  EllipsoidOps(const EllipsoidOps&) = delete;            // Copy Constructor Not Implemented
+  EllipsoidOps(EllipsoidOps&&) = delete;                 // Move Constructor Not Implemented
+  EllipsoidOps& operator=(const EllipsoidOps&) = delete; // Copy Assignment Not Implemented
+  EllipsoidOps& operator=(EllipsoidOps&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
index 408d552e0e..e96b951374 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ShapeOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
old mode 100755
new mode 100644
index d7512204d0..5690d3a257
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,67 +48,65 @@
  */
 class SIMPLib_EXPORT ShapeOps
 {
-  public:
-    using Self = ShapeOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for ShapeOps
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for ShapeOps
-     */
-    static QString ClassName();
-
-    static Pointer New();
-
-    virtual ~ShapeOps();
-
-    enum ArgName
-    {
-      Omega3 = 0,
-      B_OverA = 1,
-      C_OverA = 2,
-      VolCur = 3
-    };
-
-    float ShapeClass2Omega[41][2];
-
-    /**
-    * @brief getShapeOpsVector This method returns a vector of each type of ShapeOps placed such that the
-    * index into the vector is the value of the constant at DRAM3D::ShapeType::***
-    * @return Vector of ShapeOps subclasses.
-    */
-    static QVector<ShapeOps::Pointer> getShapeOpsQVector();
-
-    /**
-    * @brief getShapeOpsVector This method returns a vector of each type of Shape placed such that the
-    * index into the vector is the value of the constant at
-    * @return Vector of ShapeOps subclasses.
-    */
-    static std::vector<ShapeOps::Pointer> getShapeOpsVector();
-
-    virtual float radcur1(QMap<ArgName, float> args);
-
-    virtual float inside(float axis1comp, float axis2comp, float axis3comp);
-
-    virtual void init();
-
-  protected:
-    ShapeOps();
-
-  public:
-    ShapeOps(const ShapeOps&) = delete;       // Copy Constructor Not Implemented
-    ShapeOps(ShapeOps&&) = delete;            // Move Constructor Not Implemented
-    ShapeOps& operator=(const ShapeOps&) = delete; // Copy Assignment Not Implemented
-    ShapeOps& operator=(ShapeOps&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = ShapeOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for ShapeOps
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for ShapeOps
+   */
+  static QString ClassName();
+
+  static Pointer New();
+
+  virtual ~ShapeOps();
+
+  enum ArgName
+  {
+    Omega3 = 0,
+    B_OverA = 1,
+    C_OverA = 2,
+    VolCur = 3
+  };
+
+  float ShapeClass2Omega[41][2];
+
+  /**
+   * @brief getShapeOpsVector This method returns a vector of each type of ShapeOps placed such that the
+   * index into the vector is the value of the constant at DRAM3D::ShapeType::***
+   * @return Vector of ShapeOps subclasses.
+   */
+  static QVector<ShapeOps::Pointer> getShapeOpsQVector();
+
+  /**
+   * @brief getShapeOpsVector This method returns a vector of each type of Shape placed such that the
+   * index into the vector is the value of the constant at
+   * @return Vector of ShapeOps subclasses.
+   */
+  static std::vector<ShapeOps::Pointer> getShapeOpsVector();
+
+  virtual float radcur1(QMap<ArgName, float> args);
+
+  virtual float inside(float axis1comp, float axis2comp, float axis3comp);
+
+  virtual void init();
+
+protected:
+  ShapeOps();
+
+public:
+  ShapeOps(const ShapeOps&) = delete;            // Copy Constructor Not Implemented
+  ShapeOps(ShapeOps&&) = delete;                 // Move Constructor Not Implemented
+  ShapeOps& operator=(const ShapeOps&) = delete; // Copy Assignment Not Implemented
+  ShapeOps& operator=(ShapeOps&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
index f94f3f313c..49b8dd423a 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SuperEllipsoidOps.h"
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
old mode 100755
new mode 100644
index f145033e0b..11622b2236
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,48 +39,46 @@
 
 #include "ShapeOps.h"
 
-
 /*
  *
  */
 class SIMPLib_EXPORT SuperEllipsoidOps : public ShapeOps
 {
-  public:
-    using Self = SuperEllipsoidOps;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = SuperEllipsoidOps;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for SuperEllipsoidOps
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for SuperEllipsoidOps
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for SuperEllipsoidOps
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for SuperEllipsoidOps
+   */
+  static QString ClassName();
 
-    static Pointer New();
+  static Pointer New();
 
-    ~SuperEllipsoidOps() override;
+  ~SuperEllipsoidOps() override;
 
-    float radcur1(QMap<ArgName, float> args) override;
+  float radcur1(QMap<ArgName, float> args) override;
 
-    float inside(float axis1comp, float axis2comp, float axis3comp) override;
-    void init() override;
+  float inside(float axis1comp, float axis2comp, float axis3comp) override;
+  void init() override;
 
-  protected:
-    SuperEllipsoidOps();
-  private:
-    float Nvalue;
-
-  public:
-    SuperEllipsoidOps(const SuperEllipsoidOps&) = delete; // Copy Constructor Not Implemented
-    SuperEllipsoidOps(SuperEllipsoidOps&&) = delete;      // Move Constructor Not Implemented
-    SuperEllipsoidOps& operator=(const SuperEllipsoidOps&) = delete; // Copy Assignment Not Implemented
-    SuperEllipsoidOps& operator=(SuperEllipsoidOps&&) = delete;      // Move Assignment Not Implemented
-};
+protected:
+  SuperEllipsoidOps();
 
+private:
+  float Nvalue;
 
+public:
+  SuperEllipsoidOps(const SuperEllipsoidOps&) = delete;            // Copy Constructor Not Implemented
+  SuperEllipsoidOps(SuperEllipsoidOps&&) = delete;                 // Move Constructor Not Implemented
+  SuperEllipsoidOps& operator=(const SuperEllipsoidOps&) = delete; // Copy Assignment Not Implemented
+  SuperEllipsoidOps& operator=(SuperEllipsoidOps&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index 1a2cab361e..ea21af75ab 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index 65fd75338e..cd71cbdb42 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index a1b86373b5..9ede869530 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* RedisTetbution and use in source and binary forms, with or without modification,
-* are permitted provided that the following conditions are met:
-*
-* RedisTetbutions of source code must retain the above copyright notice, this
-* list of conditions and the following disclaimer.
-*
-* RedisTetbutions 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 disTetbution.
-*
-* Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
-* conTetbutors 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 CONTetBUTORS "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 HOLDER OR CONTetBUTORS 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, STetCT 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * RedisTetbution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * RedisTetbutions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * RedisTetbutions 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 disTetbution.
+ *
+ * Neither the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * conTetbutors 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 CONTetBUTORS "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 HOLDER OR CONTetBUTORS 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, STetCT 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index 7a94361269..b60acb6589 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index 7913453078..15057eff8c 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 5c12b2f2e8..9f9162fc8b 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * TetrahedralGeom re-implements code from the following vtk modules:
@@ -107,6 +107,7 @@ class FindTetDerivativesImpl
   {
     compute(range.min(), range.max());
   }
+
 private:
   TetrahedralGeom* m_Tets;
   DoubleArrayType::Pointer m_Field;
@@ -225,7 +226,7 @@ void TetrahedralGeom::addOrReplaceAttributeMatrix(const QString& name, Attribute
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -408,7 +409,6 @@ void TetrahedralGeom::deleteElementCentroids()
   m_TetCentroids = FloatArrayType::NullPointer();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 3811e8d1e1..e593cf3962 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,566 +48,562 @@
  */
 class SIMPLib_EXPORT TetrahedralGeom : public IGeometry3D
 {
-  public:
-    using Self = TetrahedralGeom;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for TetrahedralGeom
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for TetrahedralGeom
-     */
-    static QString ClassName();
-
-    ~TetrahedralGeom() override;
-
-    /**
-     * @brief CreateGeometry
-     * @param numTets
-     * @param vertices
-     * @param name
-     * @return
-     */
-    static Pointer CreateGeometry(size_t numTets, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
-
-    /**
-     * @brief CreateGeometry
-     * @param tets
-     * @param vertices
-     * @param name
-     * @return
-     */
-    static Pointer CreateGeometry(const SharedTetList::Pointer& tets, const SharedVertexList::Pointer& vertices, const QString& name);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedVertexOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedVertexList
-     * @param numVertices
-     * @return
-     */
-    static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedEdgeOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedEdgeList
-     * @param numEdges
-     * @return
-     */
-    static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedTriOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedTriList
-     * @param numTris
-     * @return
-     */
-    static SharedTriList::Pointer CreateSharedTriList(size_t numTris, bool allocate = true);
-
-    /**
-     * @brief resizeTriList
-     * @param newNumTris
-     */
-    void resizeTriList(size_t newNumTris);
-
-    /**
-     * @brief setTriangles
-     * @param triangles
-     */
-    void setTriangles(SharedTriList::Pointer triangles);
-
-    /**
-     * @brief getTriangles
-     * @return
-     */
-    SharedTriList::Pointer getTriangles() const;
-
-    /**
-     * @brief setVertsAtTri
-     * @param triId
-     * @param verts
-     */
-    void setVertsAtTri(size_t triId, size_t verts[3]);
-
-    /**
-     * @brief getVertsAtTri
-     * @param triId
-     * @param verts
-     */
-    void getVertsAtTri(size_t triId, size_t verts[3]) const;
-
-    /**
-     * @brief getVertCoordsAtTri
-     * @param triId
-     * @param vert1
-     * @param vert2
-     * @param vert3
-     */
-    void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]) const;
-
-    /**
-     * @brief getTriPointer
-     * @param i
-     * @return
-     */
-    size_t* getTriPointer(size_t i) const;
-
-    /**
-     * @brief getNumberOfTris
-     * @return
-     */
-    size_t getNumberOfTris() const;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from SharedTetOps
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief CreateSharedTetList
-     * @param numTets
-     * @return
-     */
-    static SharedTriList::Pointer CreateSharedTetList(size_t numTets, bool allocate = true);
-
-    /**
-     * @brief resizeTetList
-     * @param newNumTets
-     */
-    void resizeTetList(size_t newNumTets);
-
-    /**
-     * @brief setTetrahedra
-     * @param tets
-     */
-    void setTetrahedra(SharedTetList::Pointer tets);
-
-   /**
-    * @brief getTetrahedra
-    * @return
-    */
-    SharedTetList::Pointer getTetrahedra() const;
-
-    /**
-     * @brief setVertsAtTet
-     * @param tetId
-     * @param verts
-     */
-    void setVertsAtTet(size_t tetId, size_t verts[4]);
-
-    /**
-     * @brief getVertsAtTet
-     * @param tetId
-     * @param verts
-     */
-    void getVertsAtTet(size_t tetId, size_t verts[4]) const;
-
-    /**
-     * @brief getVertCoordsAtTet
-     * @param tetId
-     * @param vert1
-     * @param vert2
-     * @param vert3
-     */
-    void getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
-
-    /**
-     * @brief getTetPointer
-     * @param i
-     * @return
-     */
-    size_t* getTetPointer(size_t i) const;
-
-    /**
-     * @brief getNumberOfTets
-     * @return
-     */
-    size_t getNumberOfTets() const;
-
-    // -----------------------------------------------------------------------------
-    // Inherited from IGeometry
-    // -----------------------------------------------------------------------------
-
-    /**
-     * @brief initializeWithZeros
-     */
-    void initializeWithZeros() override;
-
-    /**
-     * @brief getNumberOfElements
-     * @return
-     */
-    size_t getNumberOfElements() const override;
-
-    /**
-     * @brief findElementSizes
-     * @return
-     */
-    int findElementSizes() override;
-
-    /**
-     * @brief getElementSizes
-     * @return
-     */
-    FloatArrayType::Pointer getElementSizes() const override;
-
-    /**
-     * @brief deleteElementSizes
-     */
-    void deleteElementSizes() override;
-
-    /**
-     * @brief findElementsContainingVert
-     * @return
-     */
-    int findElementsContainingVert() override;
-
-    /**
-     * @brief getElementsContainingVert
-     * @return
-     */
-    ElementDynamicList::Pointer getElementsContainingVert() const override;
-
-    /**
-     * @brief deleteElementsContainingVert
-     */
-    void deleteElementsContainingVert() override;
-
-    /**
-     * @brief findElementNeighbors
-     * @return
-     */
-    int findElementNeighbors() override;
-
-    /**
-     * @brief getElementNeighbors
-     * @return
-     */
-    ElementDynamicList::Pointer getElementNeighbors() const override;
-
-    /**
-     * @brief deleteElementNeighbors
-     */
-    void deleteElementNeighbors() override;
-
-    /**
-     * @brief findElementCentroids
-     * @return
-     */
-    int findElementCentroids() override;
-
-    /**
-     * @brief getElementCentroids
-     * @return
-     */
-    FloatArrayType::Pointer getElementCentroids() const override;
-
-    /**
-     * @brief deleteElementCentroids
-     */
-    void deleteElementCentroids() override;
-
-    /**
-     * @brief getParametricCenter
-     * @param pCoords
-     */
-    void getParametricCenter(double pCoords[3]) const override;
-
-    /**
-     * @brief getShapeFunctions
-     * @param pCoords
-     * @param shape
-     */
-    void getShapeFunctions(double pCoords[3], double* shape) const override;
-
-    /**
-     * @brief findDerivatives
-     * @param field
-     * @param derivatives
-     */
-    void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
-
-    /**
-     * @brief getInfoString
-     * @return Returns a formatted string that contains general infomation about
-     * the instance of the object.
-     */
-    QString getInfoString(SIMPL::InfoStringFormat format) const override;
-
-    /**
-     * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
-     * with values populated to match the geometry.
-     * @return
-     */
-    ToolTipGenerator getToolTipGenerator() const override;
-
-    /**
-     * @brief writeGeometryToHDF5
-     * @param parentId
-     * @param writeXdmf
-     * @return
-     */
-    int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
-
-    /**
-     * @brief writeXdmf
-     * @param out
-     * @param dcName
-     * @param hdfFileName
-     * @return
-     */
-    int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
-
-    /**
-     * @brief readGeometryFromHDF5
-     * @param parentId
-     * @param preflight
-     * @return
-     */
-    int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
-
-    /**
-     * @brief addOrReplaceAttributeMatrix
-     */
-    void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
-
-// -----------------------------------------------------------------------------
-// Inherited from IGeometry3D
-// -----------------------------------------------------------------------------
-
-    /**
-     * @brief resizeVertexList
-     * @param newNumVertices
-     */
-    void resizeVertexList(size_t newNumVertices) override;
-
-    /**
-     * @brief setVertices
-     * @param vertices
-     */
-    void setVertices(SharedVertexList::Pointer vertices) override;
-
-    /**
-     * @brief getVertices
-     * @return
-     */
-    SharedVertexList::Pointer getVertices() const override;
-
-    /**
-     * @brief setCoords
-     * @param vertId
-     * @param coords
-     */
-    void setCoords(size_t vertId, float coords[3]) override;
-
-    /**
-     * @brief getCoords
-     * @param vertId
-     * @param coords
-     */
-    void getCoords(size_t vertId, float coords[3]) const override;
-
-    /**
-     * @brief getVertexPointer
-     * @param i
-     * @return
-     */
-    float* getVertexPointer(size_t i) const override;
-
-    /**
-     * @brief getNumberOfVertices
-     * @return
-     */
-    size_t getNumberOfVertices() const override;
-
-    /**
-     * @brief resizeEdgeList
-     * @param newNumEdges
-     */
-    void resizeEdgeList(size_t newNumEdges) override;
-
-    /**
-     * @brief getEdges
-     * @return
-     */
-    SharedEdgeList::Pointer getEdges() const override;
-
-    /**
-     * @brief setVerts
-     * @param edgeId
-     * @param verts
-     */
-    void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
-
-    /**
-     * @brief getVerts
-     * @param edgeId
-     * @param verts
-     */
-    void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
-
-    /**
-     * @brief getVertCoordsAtEdge
-     * @param edgeId
-     * @param vert1
-     * @param vert2
-     */
-    void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
-
-    /**
-     * @brief getEdgePointer
-     * @param i
-     * @return
-     */
-    size_t* getEdgePointer(size_t i) const override;
-
-    /**
-     * @brief getNumberOfEdges
-     * @return
-     */
-    size_t getNumberOfEdges() const override;
-
-    /**
-     * @brief findElementEdges
-     * @return
-     */
-    int findEdges() override;
-
-    /**
-     * @brief deleteElementEdges
-     */
-    void deleteEdges() override;
-
-    /**
-     * @brief findFaces
-     * @return
-     */
-    int findFaces() override;
-
-    /**
-     * @brief deleteFaces
-     */
-    void deleteFaces() override;
-
-    /**
-     * @brief findUnsharedEdges
-     */
-    int findUnsharedEdges() override;
-
-    /**
-     * @brief getUnsharedEdges
-     * @return
-     */
-    SharedEdgeList::Pointer getUnsharedEdges() const override;
-
-    /**
-     * @brief deleteUnsharedEdges
-     */
-    void deleteUnsharedEdges() override;
-
-    /**
-     * @brief findUnsharedFaces
-     */
-    int findUnsharedFaces() override;
-
-    /**
-     * @brief getUnsharedFaces
-     * @return
-     */
-    SharedEdgeList::Pointer getUnsharedFaces() const override;
-
-    /**
-     * @brief deleteUnsharedFaces
-     */
-    void deleteUnsharedFaces() override;
-
-  protected:
-
-    TetrahedralGeom();
-
-    /**
-     * @brief setElementsContainingVert
-     * @param elementsContainingVert
-     */
-    void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
-
-    /**
-     * @brief setElementNeighbors
-     * @param elementNeighbors
-     */
-    void setElementNeighbors(ElementDynamicList::Pointer elementNeighbors) override;
-
-    /**
-     * @brief setElementCentroids
-     * @param elementCentroids
-     */
-    void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
-
-    /**
-     * @brief setElementSizes
-     * @param elementSizes
-     */
-    void setElementSizes(FloatArrayType::Pointer elementSizes) override;
-
-    /**
-     * @brief setEdges
-     * @param edges
-     */
-    void setEdges(SharedEdgeList::Pointer edges) override;
-
-    /**
-     * @brief setUnsharedEdges
-     * @param bEdgeList
-     */
-    void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) override;
-
-    /**
-     * @brief setUnsharedFaces
-     * @param bFaceList
-     */
-    void setUnsharedFaces(SharedFaceList::Pointer bFaceList) override;
-
-  private:
-    SharedVertexList::Pointer m_VertexList;
-    SharedEdgeList::Pointer m_EdgeList;
-    SharedEdgeList::Pointer m_UnsharedEdgeList;
-    SharedTriList::Pointer m_TriList;
-    SharedTriList::Pointer m_UnsharedTriList;
-    SharedTetList::Pointer m_TetList;
-    ElementDynamicList::Pointer m_TetsContainingVert;
-    ElementDynamicList::Pointer m_TetNeighbors;
-    FloatArrayType::Pointer m_TetCentroids;
-    FloatArrayType::Pointer m_TetSizes;
-
-    friend class FindTetDerivativesImpl;
-
-  public:
-    TetrahedralGeom(const TetrahedralGeom&) = delete; // Copy Constructor Not Implemented
-    TetrahedralGeom(TetrahedralGeom&&) = delete;      // Move Constructor Not Implemented
-    TetrahedralGeom& operator=(const TetrahedralGeom&) = delete; // Copy Assignment Not Implemented
-    TetrahedralGeom& operator=(TetrahedralGeom&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = TetrahedralGeom;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for TetrahedralGeom
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for TetrahedralGeom
+   */
+  static QString ClassName();
+
+  ~TetrahedralGeom() override;
+
+  /**
+   * @brief CreateGeometry
+   * @param numTets
+   * @param vertices
+   * @param name
+   * @return
+   */
+  static Pointer CreateGeometry(size_t numTets, const SharedVertexList::Pointer& vertices, const QString& name, bool allocate = true);
+
+  /**
+   * @brief CreateGeometry
+   * @param tets
+   * @param vertices
+   * @param name
+   * @return
+   */
+  static Pointer CreateGeometry(const SharedTetList::Pointer& tets, const SharedVertexList::Pointer& vertices, const QString& name);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedVertexOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedVertexList
+   * @param numVertices
+   * @return
+   */
+  static SharedVertexList::Pointer CreateSharedVertexList(size_t numVertices, bool allocate = true);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedEdgeOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedEdgeList
+   * @param numEdges
+   * @return
+   */
+  static SharedEdgeList::Pointer CreateSharedEdgeList(size_t numEdges, bool allocate = true);
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedTriOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedTriList
+   * @param numTris
+   * @return
+   */
+  static SharedTriList::Pointer CreateSharedTriList(size_t numTris, bool allocate = true);
+
+  /**
+   * @brief resizeTriList
+   * @param newNumTris
+   */
+  void resizeTriList(size_t newNumTris);
+
+  /**
+   * @brief setTriangles
+   * @param triangles
+   */
+  void setTriangles(SharedTriList::Pointer triangles);
+
+  /**
+   * @brief getTriangles
+   * @return
+   */
+  SharedTriList::Pointer getTriangles() const;
+
+  /**
+   * @brief setVertsAtTri
+   * @param triId
+   * @param verts
+   */
+  void setVertsAtTri(size_t triId, size_t verts[3]);
+
+  /**
+   * @brief getVertsAtTri
+   * @param triId
+   * @param verts
+   */
+  void getVertsAtTri(size_t triId, size_t verts[3]) const;
+
+  /**
+   * @brief getVertCoordsAtTri
+   * @param triId
+   * @param vert1
+   * @param vert2
+   * @param vert3
+   */
+  void getVertCoordsAtTri(size_t triId, float vert1[3], float vert2[3], float vert3[3]) const;
+
+  /**
+   * @brief getTriPointer
+   * @param i
+   * @return
+   */
+  size_t* getTriPointer(size_t i) const;
+
+  /**
+   * @brief getNumberOfTris
+   * @return
+   */
+  size_t getNumberOfTris() const;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from SharedTetOps
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief CreateSharedTetList
+   * @param numTets
+   * @return
+   */
+  static SharedTriList::Pointer CreateSharedTetList(size_t numTets, bool allocate = true);
+
+  /**
+   * @brief resizeTetList
+   * @param newNumTets
+   */
+  void resizeTetList(size_t newNumTets);
+
+  /**
+   * @brief setTetrahedra
+   * @param tets
+   */
+  void setTetrahedra(SharedTetList::Pointer tets);
+
+  /**
+   * @brief getTetrahedra
+   * @return
+   */
+  SharedTetList::Pointer getTetrahedra() const;
+
+  /**
+   * @brief setVertsAtTet
+   * @param tetId
+   * @param verts
+   */
+  void setVertsAtTet(size_t tetId, size_t verts[4]);
+
+  /**
+   * @brief getVertsAtTet
+   * @param tetId
+   * @param verts
+   */
+  void getVertsAtTet(size_t tetId, size_t verts[4]) const;
+
+  /**
+   * @brief getVertCoordsAtTet
+   * @param tetId
+   * @param vert1
+   * @param vert2
+   * @param vert3
+   */
+  void getVertCoordsAtTet(size_t tetId, float vert1[3], float vert2[3], float vert3[3], float vert4[3]) const;
+
+  /**
+   * @brief getTetPointer
+   * @param i
+   * @return
+   */
+  size_t* getTetPointer(size_t i) const;
+
+  /**
+   * @brief getNumberOfTets
+   * @return
+   */
+  size_t getNumberOfTets() const;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometry
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief initializeWithZeros
+   */
+  void initializeWithZeros() override;
+
+  /**
+   * @brief getNumberOfElements
+   * @return
+   */
+  size_t getNumberOfElements() const override;
+
+  /**
+   * @brief findElementSizes
+   * @return
+   */
+  int findElementSizes() override;
+
+  /**
+   * @brief getElementSizes
+   * @return
+   */
+  FloatArrayType::Pointer getElementSizes() const override;
+
+  /**
+   * @brief deleteElementSizes
+   */
+  void deleteElementSizes() override;
+
+  /**
+   * @brief findElementsContainingVert
+   * @return
+   */
+  int findElementsContainingVert() override;
+
+  /**
+   * @brief getElementsContainingVert
+   * @return
+   */
+  ElementDynamicList::Pointer getElementsContainingVert() const override;
+
+  /**
+   * @brief deleteElementsContainingVert
+   */
+  void deleteElementsContainingVert() override;
+
+  /**
+   * @brief findElementNeighbors
+   * @return
+   */
+  int findElementNeighbors() override;
+
+  /**
+   * @brief getElementNeighbors
+   * @return
+   */
+  ElementDynamicList::Pointer getElementNeighbors() const override;
+
+  /**
+   * @brief deleteElementNeighbors
+   */
+  void deleteElementNeighbors() override;
+
+  /**
+   * @brief findElementCentroids
+   * @return
+   */
+  int findElementCentroids() override;
+
+  /**
+   * @brief getElementCentroids
+   * @return
+   */
+  FloatArrayType::Pointer getElementCentroids() const override;
+
+  /**
+   * @brief deleteElementCentroids
+   */
+  void deleteElementCentroids() override;
+
+  /**
+   * @brief getParametricCenter
+   * @param pCoords
+   */
+  void getParametricCenter(double pCoords[3]) const override;
+
+  /**
+   * @brief getShapeFunctions
+   * @param pCoords
+   * @param shape
+   */
+  void getShapeFunctions(double pCoords[3], double* shape) const override;
+
+  /**
+   * @brief findDerivatives
+   * @param field
+   * @param derivatives
+   */
+  void findDerivatives(DoubleArrayType::Pointer field, DoubleArrayType::Pointer derivatives, Observable* observable = nullptr) override;
+
+  /**
+   * @brief getInfoString
+   * @return Returns a formatted string that contains general infomation about
+   * the instance of the object.
+   */
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
+
+  /**
+   * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
+   * with values populated to match the geometry.
+   * @return
+   */
+  ToolTipGenerator getToolTipGenerator() const override;
+
+  /**
+   * @brief writeGeometryToHDF5
+   * @param parentId
+   * @param writeXdmf
+   * @return
+   */
+  int writeGeometryToHDF5(hid_t parentId, bool writeXdmf) const override;
+
+  /**
+   * @brief writeXdmf
+   * @param out
+   * @param dcName
+   * @param hdfFileName
+   * @return
+   */
+  int writeXdmf(QTextStream& out, QString dcName, QString hdfFileName) const override;
+
+  /**
+   * @brief readGeometryFromHDF5
+   * @param parentId
+   * @param preflight
+   * @return
+   */
+  int readGeometryFromHDF5(hid_t parentId, bool preflight) override;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  IGeometry::Pointer deepCopy(bool forceNoAllocate = false) const override;
+
+  /**
+   * @brief addOrReplaceAttributeMatrix
+   */
+  void addOrReplaceAttributeMatrix(const QString& name, AttributeMatrix::Pointer data) override;
+
+  // -----------------------------------------------------------------------------
+  // Inherited from IGeometry3D
+  // -----------------------------------------------------------------------------
+
+  /**
+   * @brief resizeVertexList
+   * @param newNumVertices
+   */
+  void resizeVertexList(size_t newNumVertices) override;
+
+  /**
+   * @brief setVertices
+   * @param vertices
+   */
+  void setVertices(SharedVertexList::Pointer vertices) override;
+
+  /**
+   * @brief getVertices
+   * @return
+   */
+  SharedVertexList::Pointer getVertices() const override;
+
+  /**
+   * @brief setCoords
+   * @param vertId
+   * @param coords
+   */
+  void setCoords(size_t vertId, float coords[3]) override;
+
+  /**
+   * @brief getCoords
+   * @param vertId
+   * @param coords
+   */
+  void getCoords(size_t vertId, float coords[3]) const override;
+
+  /**
+   * @brief getVertexPointer
+   * @param i
+   * @return
+   */
+  float* getVertexPointer(size_t i) const override;
+
+  /**
+   * @brief getNumberOfVertices
+   * @return
+   */
+  size_t getNumberOfVertices() const override;
+
+  /**
+   * @brief resizeEdgeList
+   * @param newNumEdges
+   */
+  void resizeEdgeList(size_t newNumEdges) override;
+
+  /**
+   * @brief getEdges
+   * @return
+   */
+  SharedEdgeList::Pointer getEdges() const override;
+
+  /**
+   * @brief setVerts
+   * @param edgeId
+   * @param verts
+   */
+  void setVertsAtEdge(size_t edgeId, size_t verts[2]) override;
+
+  /**
+   * @brief getVerts
+   * @param edgeId
+   * @param verts
+   */
+  void getVertsAtEdge(size_t edgeId, size_t verts[2]) const override;
+
+  /**
+   * @brief getVertCoordsAtEdge
+   * @param edgeId
+   * @param vert1
+   * @param vert2
+   */
+  void getVertCoordsAtEdge(size_t edgeId, float vert1[3], float vert2[3]) const override;
+
+  /**
+   * @brief getEdgePointer
+   * @param i
+   * @return
+   */
+  size_t* getEdgePointer(size_t i) const override;
+
+  /**
+   * @brief getNumberOfEdges
+   * @return
+   */
+  size_t getNumberOfEdges() const override;
+
+  /**
+   * @brief findElementEdges
+   * @return
+   */
+  int findEdges() override;
+
+  /**
+   * @brief deleteElementEdges
+   */
+  void deleteEdges() override;
+
+  /**
+   * @brief findFaces
+   * @return
+   */
+  int findFaces() override;
+
+  /**
+   * @brief deleteFaces
+   */
+  void deleteFaces() override;
+
+  /**
+   * @brief findUnsharedEdges
+   */
+  int findUnsharedEdges() override;
+
+  /**
+   * @brief getUnsharedEdges
+   * @return
+   */
+  SharedEdgeList::Pointer getUnsharedEdges() const override;
+
+  /**
+   * @brief deleteUnsharedEdges
+   */
+  void deleteUnsharedEdges() override;
+
+  /**
+   * @brief findUnsharedFaces
+   */
+  int findUnsharedFaces() override;
+
+  /**
+   * @brief getUnsharedFaces
+   * @return
+   */
+  SharedEdgeList::Pointer getUnsharedFaces() const override;
+
+  /**
+   * @brief deleteUnsharedFaces
+   */
+  void deleteUnsharedFaces() override;
+
+protected:
+  TetrahedralGeom();
+
+  /**
+   * @brief setElementsContainingVert
+   * @param elementsContainingVert
+   */
+  void setElementsContainingVert(ElementDynamicList::Pointer elementsContainingVert) override;
+
+  /**
+   * @brief setElementNeighbors
+   * @param elementNeighbors
+   */
+  void setElementNeighbors(ElementDynamicList::Pointer elementNeighbors) override;
+
+  /**
+   * @brief setElementCentroids
+   * @param elementCentroids
+   */
+  void setElementCentroids(FloatArrayType::Pointer elementCentroids) override;
+
+  /**
+   * @brief setElementSizes
+   * @param elementSizes
+   */
+  void setElementSizes(FloatArrayType::Pointer elementSizes) override;
+
+  /**
+   * @brief setEdges
+   * @param edges
+   */
+  void setEdges(SharedEdgeList::Pointer edges) override;
+
+  /**
+   * @brief setUnsharedEdges
+   * @param bEdgeList
+   */
+  void setUnsharedEdges(SharedEdgeList::Pointer bEdgeList) override;
+
+  /**
+   * @brief setUnsharedFaces
+   * @param bFaceList
+   */
+  void setUnsharedFaces(SharedFaceList::Pointer bFaceList) override;
+
+private:
+  SharedVertexList::Pointer m_VertexList;
+  SharedEdgeList::Pointer m_EdgeList;
+  SharedEdgeList::Pointer m_UnsharedEdgeList;
+  SharedTriList::Pointer m_TriList;
+  SharedTriList::Pointer m_UnsharedTriList;
+  SharedTetList::Pointer m_TetList;
+  ElementDynamicList::Pointer m_TetsContainingVert;
+  ElementDynamicList::Pointer m_TetNeighbors;
+  FloatArrayType::Pointer m_TetCentroids;
+  FloatArrayType::Pointer m_TetSizes;
+
+  friend class FindTetDerivativesImpl;
+
+public:
+  TetrahedralGeom(const TetrahedralGeom&) = delete;            // Copy Constructor Not Implemented
+  TetrahedralGeom(TetrahedralGeom&&) = delete;                 // Move Constructor Not Implemented
+  TetrahedralGeom& operator=(const TetrahedralGeom&) = delete; // Copy Assignment Not Implemented
+  TetrahedralGeom& operator=(TetrahedralGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index b0f446950e..5bfd39b87c 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,7 +43,6 @@
 class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 {
 public:
-
   using ParametersValueType = double;
   using TransformParametersType = std::vector<ParametersValueType>;
   using TransformFixedParametersType = std::vector<ParametersValueType>;
@@ -122,7 +121,7 @@ class SIMPLib_EXPORT TransformContainer : public ITransformContainer
   TransformContainer& operator=(const TransformContainer&);
 
   int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
-  
+
   int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
 
 private:
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 42f0a8dddf..ab703666a8 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * TriangleGeom re-implements code from the following vtk modules:
@@ -107,6 +107,7 @@ class FindTriangleDerivativesImpl
   {
     compute(range.min(), range.max());
   }
+
 private:
   TriangleGeom* m_Tris;
   DoubleArrayType::Pointer m_Field;
@@ -213,7 +214,7 @@ void TriangleGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMat
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
@@ -559,7 +560,6 @@ int TriangleGeom::writeGeometryToHDF5(hid_t parentId, bool SIMPL_NOT_USED(writeX
     }
   }
 
-
   if(m_TriangleNeighbors.get() != nullptr)
   {
     size_t numTris = getNumberOfTris();
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index fba4bc56f2..6f69c9d450 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -524,6 +524,3 @@ class SIMPLib_EXPORT TriangleGeom : public IGeometry2D
   TriangleGeom& operator=(const TriangleGeom&) = delete; // Copy Assignment Not Implemented
   TriangleGeom& operator=(TriangleGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 110f374c40..a9034666e6 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* ============================================================================
  * VertexGeom re-implements code from the following vtk modules:
@@ -125,7 +125,7 @@ void VertexGeom::addOrReplaceAttributeMatrix(const QString& name, AttributeMatri
   {
     return;
   }
-  //if(data->getName().compare(name) != 0)
+  // if(data->getName().compare(name) != 0)
   //{
   //  data->setName(name);
   //}
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 1a96f8b5aa..cf278a08f4 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -349,6 +349,3 @@ class SIMPLib_EXPORT VertexGeom : public IGeometry
   VertexGeom& operator=(const VertexGeom&) = delete; // Copy Assignment Not Implemented
   VertexGeom& operator=(VertexGeom&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
index d7f4a25b0d..034724172b 100644
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5BoundaryStatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
old mode 100755
new mode 100644
index 838f71c632..8b6cf77d34
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -1,52 +1,48 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
 
-
 /**
  * @class H5BoundaryStatsDataDelegate H5BoundaryStatsDataDelegate.h DREAM3DLib/HDF5/H5BoundaryStatsDataDelegate.h
  * @brief This class handles reading to and writing from a Statistics file that is
@@ -57,49 +53,47 @@
  */
 class SIMPLib_EXPORT H5BoundaryStatsDataDelegate : public H5StatsDataDelegate
 {
-  public:
-    using Self = H5BoundaryStatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = H5BoundaryStatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5BoundaryStatsDataDelegate
+   */
+  static QString ClassName();
 
-    ~H5BoundaryStatsDataDelegate() override;
+  ~H5BoundaryStatsDataDelegate() override;
 
-    int writeBoundaryStatsData(BoundaryStatsData* data, hid_t groupId);
-    int readBoundaryStatsData(BoundaryStatsData* data, hid_t groupId);
+  int writeBoundaryStatsData(BoundaryStatsData* data, hid_t groupId);
+  int readBoundaryStatsData(BoundaryStatsData* data, hid_t groupId);
 
-  protected:
-    H5BoundaryStatsDataDelegate();
+protected:
+  H5BoundaryStatsDataDelegate();
 
-    int writeBoundaryArea(BoundaryStatsData* data, hid_t groupId);
-    int readBoundaryArea(BoundaryStatsData* data, hid_t groupId);
+  int writeBoundaryArea(BoundaryStatsData* data, hid_t groupId);
+  int readBoundaryArea(BoundaryStatsData* data, hid_t groupId);
 
-    int writePhaseFraction(BoundaryStatsData* data, hid_t groupId);
-    int readPhaseFraction(BoundaryStatsData* data, hid_t groupId);
+  int writePhaseFraction(BoundaryStatsData* data, hid_t groupId);
+  int readPhaseFraction(BoundaryStatsData* data, hid_t groupId);
 
-    int writeParentPhase(BoundaryStatsData* data, hid_t groupId);
-    int readParentPhase(BoundaryStatsData* data, hid_t groupId);
+  int writeParentPhase(BoundaryStatsData* data, hid_t groupId);
+  int readParentPhase(BoundaryStatsData* data, hid_t groupId);
 
-  public:
-    H5BoundaryStatsDataDelegate(const H5BoundaryStatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5BoundaryStatsDataDelegate(H5BoundaryStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5BoundaryStatsDataDelegate& operator=(const H5BoundaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5BoundaryStatsDataDelegate& operator=(H5BoundaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  H5BoundaryStatsDataDelegate(const H5BoundaryStatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5BoundaryStatsDataDelegate(H5BoundaryStatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5BoundaryStatsDataDelegate& operator=(const H5BoundaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5BoundaryStatsDataDelegate& operator=(H5BoundaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index c3d451f071..4f2a9598de 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5DataArrayReader.h"
 
@@ -80,7 +80,7 @@ IDataArray::Pointer readH5Dataset(hid_t locId, const QString& datasetPath, const
   }
   return ptr;
 }
-}
+} // namespace Detail
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.h b/Source/SIMPLib/HDF5/H5DataArrayReader.h
old mode 100755
new mode 100644
index fcf98a2cd1..e1b33cd449
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.h
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,7 +41,6 @@
 
 #include <QtCore/QString>
 
-
 #include "SIMPLib/SIMPLib.h"
 
 class IDataArray;
@@ -57,55 +55,52 @@ using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
  */
 class SIMPLib_EXPORT H5DataArrayReader
 {
-  public:
-    virtual ~H5DataArrayReader();
-
-
-    /**
-     * @brief readRequiredAttributes Reads the required attributes from an HDF5 Data set
-     * @param objType The type (subclass) of IDataArray that is stored in the HDF5 file
-     * @param version The version of the DataArray class
-     * @param tDims The Tuple Dimensions of the data array
-     * @param cDims The Component Dimensions of the data array
-     * @return
-     */
-    static int ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, std::vector<size_t>& tDims, std::vector<size_t>& cDims);
-
-    /**
-     * @brief ReadIDataArray Reads an IDataArray subclass from the HDF5 file
-     * @param gid The HDF5 Group to read the data array from
-     * @param name The name of the data set
-     * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
-     * @return
-     */
-    static IDataArrayShPtrType ReadIDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
-
-    /**
-     * @brief ReadNeighborListData
-     * @param gid The HDF5 Group to read the data array from
-     * @param name The name of the data set
-     * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
-     * @return
-     */
-    static IDataArrayShPtrType ReadNeighborListData(hid_t gid, const QString& name, bool metaDataOnly = false);
-
-    /**
-     * @brief readStringDataArray
-     * @param gid The HDF5 Group to read the data array from
-     * @param name The name of the data set
-     * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
-     * @return
-     */
-    static IDataArrayShPtrType ReadStringDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
-
-  protected:
-    H5DataArrayReader();
-
-  public:
-    H5DataArrayReader(const H5DataArrayReader&) = delete; // Copy Constructor Not Implemented
-    H5DataArrayReader(H5DataArrayReader&&) = delete;      // Move Constructor Not Implemented
-    H5DataArrayReader& operator=(const H5DataArrayReader&) = delete; // Copy Assignment Not Implemented
-    H5DataArrayReader& operator=(H5DataArrayReader&&) = delete;      // Move Assignment Not Implemented
+public:
+  virtual ~H5DataArrayReader();
+
+  /**
+   * @brief readRequiredAttributes Reads the required attributes from an HDF5 Data set
+   * @param objType The type (subclass) of IDataArray that is stored in the HDF5 file
+   * @param version The version of the DataArray class
+   * @param tDims The Tuple Dimensions of the data array
+   * @param cDims The Component Dimensions of the data array
+   * @return
+   */
+  static int ReadRequiredAttributes(hid_t gid, const QString& name, QString& objType, int& version, std::vector<size_t>& tDims, std::vector<size_t>& cDims);
+
+  /**
+   * @brief ReadIDataArray Reads an IDataArray subclass from the HDF5 file
+   * @param gid The HDF5 Group to read the data array from
+   * @param name The name of the data set
+   * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
+   * @return
+   */
+  static IDataArrayShPtrType ReadIDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
+
+  /**
+   * @brief ReadNeighborListData
+   * @param gid The HDF5 Group to read the data array from
+   * @param name The name of the data set
+   * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
+   * @return
+   */
+  static IDataArrayShPtrType ReadNeighborListData(hid_t gid, const QString& name, bool metaDataOnly = false);
+
+  /**
+   * @brief readStringDataArray
+   * @param gid The HDF5 Group to read the data array from
+   * @param name The name of the data set
+   * @param metaDataOnly Read just the meta data about the DataArray or actually read all the data
+   * @return
+   */
+  static IDataArrayShPtrType ReadStringDataArray(hid_t gid, const QString& name, bool metaDataOnly = false);
+
+protected:
+  H5DataArrayReader();
+
+public:
+  H5DataArrayReader(const H5DataArrayReader&) = delete;            // Copy Constructor Not Implemented
+  H5DataArrayReader(H5DataArrayReader&&) = delete;                 // Move Constructor Not Implemented
+  H5DataArrayReader& operator=(const H5DataArrayReader&) = delete; // Copy Assignment Not Implemented
+  H5DataArrayReader& operator=(H5DataArrayReader&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
old mode 100755
new mode 100644
index 71fb69c83a..ac6f0fd814
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,7 +45,6 @@
 #include "SIMPLib/Common/Constants.h"
 //#include "SIMPLib/DataArrays/DataArray.hpp"
 
-
 /**
  * @class H5DataArrayWriter H5DataArrayWriter.h DREAM3DLib/HDF5/H5DataArrayWriter.h
  * @brief This class handles writing of DataArray<T> objects to an HDF5 file
@@ -55,174 +54,174 @@
  */
 class H5DataArrayWriter
 {
-  public:
-    virtual ~H5DataArrayWriter() = default;
-
-    /**
-     * @brief writeDataArrayAttributes
-     * @param gid
-     * @param dataArray
-     * @param tDims
-     * @param cDims
-     * @return
-     */
-    template <typename IDataArrayType>
-    static int writeDataArrayAttributes(hid_t gid, const IDataArrayType* dataArray, const std::vector<size_t>& tDims, const std::vector<size_t>& cDims)
+public:
+  virtual ~H5DataArrayWriter() = default;
+
+  /**
+   * @brief writeDataArrayAttributes
+   * @param gid
+   * @param dataArray
+   * @param tDims
+   * @param cDims
+   * @return
+   */
+  template <typename IDataArrayType>
+  static int writeDataArrayAttributes(hid_t gid, const IDataArrayType* dataArray, const std::vector<size_t>& tDims, const std::vector<size_t>& cDims)
+  {
+    int err = QH5Lite::writeScalarAttribute(gid, dataArray->getName(), SIMPL::HDF5::DataArrayVersion, dataArray->getClassVersion());
+    if(err < 0)
     {
-      int err = QH5Lite::writeScalarAttribute(gid, dataArray->getName(), SIMPL::HDF5::DataArrayVersion, dataArray->getClassVersion());
-      if(err < 0)
-      {
-        return -604;
-      }
-      err = QH5Lite::writeStringAttribute(gid, dataArray->getName(), SIMPL::HDF5::ObjectType, dataArray->getFullNameOfClass());
-      if(err < 0)
-      {
-        return -607;
-      }
-
-
-      // Write the tuple dimensions as an attribute
-      hsize_t size = tDims.size();
-      err = QH5Lite::writePointerAttribute(gid, dataArray->getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
-      if (err < 0)
-      {
-        return -609;
-      }
-
-      // write the component dimensions as  an attribute
-      size = cDims.size();
-      err = QH5Lite::writePointerAttribute(gid, dataArray->getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
-      if (err < 0)
-      {
-        return -610;
-      }
-
-      QString str = QString("x=%1").arg(tDims[0]);
-      if(tDims.size() > 1) { str = str + QString(",y=%1").arg(tDims[1]); }
-      if(tDims.size() > 2) { str = str + QString(",z=%1").arg(tDims[2]); }
-      err = QH5Lite::writeStringAttribute(gid, dataArray->getName(), SIMPL::HDF5::AxisDimensions, str);
-      if (err < 0)
-      {
-        return -611;
-      }
-      return err;
+      return -604;
+    }
+    err = QH5Lite::writeStringAttribute(gid, dataArray->getName(), SIMPL::HDF5::ObjectType, dataArray->getFullNameOfClass());
+    if(err < 0)
+    {
+      return -607;
     }
 
-    /**
-     * @brief writeDataArray
-     * @param gid
-     * @param dataArray
-     * @param tDims
-     * @return
-     */
-    template <class T>
-    static int writeDataArray(hid_t gid, const T* dataArray, const std::vector<size_t>& tDims)
+    // Write the tuple dimensions as an attribute
+    hsize_t size = tDims.size();
+    err = QH5Lite::writePointerAttribute(gid, dataArray->getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
+    if(err < 0)
     {
-      int err = 0;
+      return -609;
+    }
 
-      std::vector<size_t> cDims = dataArray->getComponentDimensions();
-      hsize_t h5Rank = static_cast<hsize_t>(tDims.size()) + cDims.size();
+    // write the component dimensions as  an attribute
+    size = cDims.size();
+    err = QH5Lite::writePointerAttribute(gid, dataArray->getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
+    if(err < 0)
+    {
+      return -610;
+    }
 
-      QVector<hsize_t> h5Dims(tDims.size() + cDims.size());
+    QString str = QString("x=%1").arg(tDims[0]);
+    if(tDims.size() > 1)
+    {
+      str = str + QString(",y=%1").arg(tDims[1]);
+    }
+    if(tDims.size() > 2)
+    {
+      str = str + QString(",z=%1").arg(tDims[2]);
+    }
+    err = QH5Lite::writeStringAttribute(gid, dataArray->getName(), SIMPL::HDF5::AxisDimensions, str);
+    if(err < 0)
+    {
+      return -611;
+    }
+    return err;
+  }
+
+  /**
+   * @brief writeDataArray
+   * @param gid
+   * @param dataArray
+   * @param tDims
+   * @return
+   */
+  template <class T>
+  static int writeDataArray(hid_t gid, const T* dataArray, const std::vector<size_t>& tDims)
+  {
+    int err = 0;
+
+    std::vector<size_t> cDims = dataArray->getComponentDimensions();
+    hsize_t h5Rank = static_cast<hsize_t>(tDims.size()) + cDims.size();
+
+    QVector<hsize_t> h5Dims(tDims.size() + cDims.size());
 
 #if 1
-      /*** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      *  VERY IMPORTANT. MAKE SURE YOU UNDERSTAND THIS NEXT SECTION FULLY BEFORE CHANGING ANYTHING.
-      * HDF5 wants the dimensions written from slowest to fastest, so "C" style or ZYX style. DREAM3D stores
-      * the dimensions in the opposite order (XYZ) (even though the data is laid out in memory correctly). So using the
-      * Small IN100 data set as an example the NCOLS(189) NROWS(201) and NSLICES(117) are stored in the tDims vector as
-      * [189,201,117] BUT we need to reverse the order so that HDF5 can properly interpret the arrays and also properly
-      * load data into the HDFView program. These next few loops will reverse the order in addition to calculating the
-      * total number of elements in the array
-      */
-      qint32 count = tDims.size() - 1;
-      for (int i = count; i >= 0; i--)
-      {
-        //     std::cout << "  " << tDims[i] << std::endl;
-        h5Dims[count - i] = tDims[i];
-      }
-      //  std::cout << "  Comp Dims: " << std::endl;
-      count = cDims.size() - 1;
-      for (int i = count; i >= 0; i--)
-      {
-        //    std::cout << "  " << cDims[i] << std::endl;
-        h5Dims[count - i + tDims.size()] = cDims[i];
-      }
+    /*** !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+     *  VERY IMPORTANT. MAKE SURE YOU UNDERSTAND THIS NEXT SECTION FULLY BEFORE CHANGING ANYTHING.
+     * HDF5 wants the dimensions written from slowest to fastest, so "C" style or ZYX style. DREAM3D stores
+     * the dimensions in the opposite order (XYZ) (even though the data is laid out in memory correctly). So using the
+     * Small IN100 data set as an example the NCOLS(189) NROWS(201) and NSLICES(117) are stored in the tDims vector as
+     * [189,201,117] BUT we need to reverse the order so that HDF5 can properly interpret the arrays and also properly
+     * load data into the HDFView program. These next few loops will reverse the order in addition to calculating the
+     * total number of elements in the array
+     */
+    qint32 count = tDims.size() - 1;
+    for(int i = count; i >= 0; i--)
+    {
+      //     std::cout << "  " << tDims[i] << std::endl;
+      h5Dims[count - i] = tDims[i];
+    }
+    //  std::cout << "  Comp Dims: " << std::endl;
+    count = cDims.size() - 1;
+    for(int i = count; i >= 0; i--)
+    {
+      //    std::cout << "  " << cDims[i] << std::endl;
+      h5Dims[count - i + tDims.size()] = cDims[i];
+    }
 
 #else
-      //  std::cout << dataArray->getName().toStdString() << " Tuple Dims " << std::endl;
-      for (int i = 0; i < tDims.size(); i++)
-      {
-        //    std::cout << i <<  "  " << tDims[i] << std::endl;
-        h5Dims[i] = tDims[i];
-      }
-      //  std::cout << "  Comp Dims: " << std::endl;
-      for(int i = 0; i < cDims.size(); i++)
-      {
-        //   std::cout << (i+tDims.size()) << "  " << cDims[i] << std::endl;
-        h5Dims[i + tDims.size()] = cDims[i];
-      }
+    //  std::cout << dataArray->getName().toStdString() << " Tuple Dims " << std::endl;
+    for(int i = 0; i < tDims.size(); i++)
+    {
+      //    std::cout << i <<  "  " << tDims[i] << std::endl;
+      h5Dims[i] = tDims[i];
+    }
+    //  std::cout << "  Comp Dims: " << std::endl;
+    for(int i = 0; i < cDims.size(); i++)
+    {
+      //   std::cout << (i+tDims.size()) << "  " << cDims[i] << std::endl;
+      h5Dims[i + tDims.size()] = cDims[i];
+    }
 #endif
-      if (QH5Lite::datasetExists(gid, dataArray->getName()) == false)
-      {
-        err = QH5Lite::writePointerDataset(gid, dataArray->getName(), h5Rank, h5Dims.data(), dataArray->getPointer(0));
-        if(err < 0)
-        {
-          return err;
-        }
-      }
-      else
+    if(QH5Lite::datasetExists(gid, dataArray->getName()) == false)
+    {
+      err = QH5Lite::writePointerDataset(gid, dataArray->getName(), h5Rank, h5Dims.data(), dataArray->getPointer(0));
+      if(err < 0)
       {
-        err = QH5Lite::replacePointerDataset(gid, dataArray->getName(), h5Rank, h5Dims.data(), dataArray->getPointer(0));
-        if(err < 0)
-        {
-          return err;
-        }
+        return err;
       }
-
-      err = writeDataArrayAttributes<T>(gid, dataArray, tDims, cDims);
-
-      return err;
     }
-
-
-    /**
-     * @brief writeDataArray
-     * @param gid
-     * @param dataArray
-     * @param tDims
-     * @return
-     */
-    template<class T>
-    static int writeStringDataArray(hid_t gid, const T* dataArray)
+    else
     {
-      int err = 0;
-
-      std::vector<std::string> data(dataArray->getNumberOfTuples());
-      for(int i = 0; i < data.size(); i++)
+      err = QH5Lite::replacePointerDataset(gid, dataArray->getName(), h5Rank, h5Dims.data(), dataArray->getPointer(0));
+      if(err < 0)
       {
-        data[i] = dataArray->getValue(i).toStdString();
+        return err;
       }
-
-      err = H5Lite::writeVectorOfStringsDataset(gid, dataArray->getName().toStdString(), data);
-      std::vector<size_t> tDims(1, dataArray->getNumberOfTuples());
-      std::vector<size_t> cDims(1, 1);
-      err = writeDataArrayAttributes<T>(gid, dataArray, tDims, cDims);
-
-      return err;
     }
 
+    err = writeDataArrayAttributes<T>(gid, dataArray, tDims, cDims);
+
+    return err;
+  }
+
+  /**
+   * @brief writeDataArray
+   * @param gid
+   * @param dataArray
+   * @param tDims
+   * @return
+   */
+  template <class T>
+  static int writeStringDataArray(hid_t gid, const T* dataArray)
+  {
+    int err = 0;
+
+    std::vector<std::string> data(dataArray->getNumberOfTuples());
+    for(int i = 0; i < data.size(); i++)
+    {
+      data[i] = dataArray->getValue(i).toStdString();
+    }
 
-  protected:
-    H5DataArrayWriter() = default;
-
-  private:
-    H5DataArrayWriter(const H5DataArrayWriter&); // Copy Constructor Not Implemented
-    void operator=(const H5DataArrayWriter&);    // Move assignment Not Implemented
-};
+    err = H5Lite::writeVectorOfStringsDataset(gid, dataArray->getName().toStdString(), data);
+    std::vector<size_t> tDims(1, dataArray->getNumberOfTuples());
+    std::vector<size_t> cDims(1, 1);
+    err = writeDataArrayAttributes<T>(gid, dataArray, tDims, cDims);
 
+    return err;
+  }
 
+protected:
+  H5DataArrayWriter() = default;
 
+private:
+  H5DataArrayWriter(const H5DataArrayWriter&); // Copy Constructor Not Implemented
+  void operator=(const H5DataArrayWriter&);    // Move assignment Not Implemented
+};
 
 /**
  * @class H5DataArrayWriter H5DataArrayWriter.h DREAM3DLib/HDF5/H5DataArrayWriter.h
@@ -231,42 +230,40 @@ class H5DataArrayWriter
  * @date Jan 22, 2012
  * @version 1.0
  */
-template<typename T>
+template <typename T>
 class H5GBCDArrayWriter
 {
-  public:
-    virtual ~H5GBCDArrayWriter() = default;
-
-    static int writeArray(hid_t gid, const QString& name, size_t* gbcdDims, T* data, const QString& className)
+public:
+  virtual ~H5GBCDArrayWriter() = default;
+
+  static int writeArray(hid_t gid, const QString& name, size_t* gbcdDims, T* data, const QString& className)
+  {
+    int32_t rank = 5;
+    hsize_t dims[5] = {
+        gbcdDims[0], gbcdDims[1], gbcdDims[2], gbcdDims[3], gbcdDims[4],
+    };
+    int err = 0;
+    if(QH5Lite::datasetExists(gid, name) == false)
     {
-      int32_t rank = 5;
-      hsize_t dims[5] = {gbcdDims[0], gbcdDims[1], gbcdDims[2], gbcdDims[3], gbcdDims[4],};
-      int err = 0;
-      if (QH5Lite::datasetExists(gid, name) == false)
-      {
-        err = QH5Lite::writePointerDataset(gid, name, rank, dims, data);
-        if(err < 0)
-        {
-          return err;
-        }
-      }
-
-      err = QH5Lite::writeStringAttribute(gid, name, SIMPL::HDF5::ObjectType, className);
+      err = QH5Lite::writePointerDataset(gid, name, rank, dims, data);
       if(err < 0)
       {
         return err;
       }
-      return err;
     }
 
+    err = QH5Lite::writeStringAttribute(gid, name, SIMPL::HDF5::ObjectType, className);
+    if(err < 0)
+    {
+      return err;
+    }
+    return err;
+  }
 
-  protected:
-    H5GBCDArrayWriter() = default;
+protected:
+  H5GBCDArrayWriter() = default;
 
-  private:
-    H5GBCDArrayWriter(const H5GBCDArrayWriter&); // Copy Constructor Not Implemented
-    void operator=(const H5GBCDArrayWriter&);    // Move assignment Not Implemented
+private:
+  H5GBCDArrayWriter(const H5GBCDArrayWriter&); // Copy Constructor Not Implemented
+  void operator=(const H5GBCDArrayWriter&);    // Move assignment Not Implemented
 };
-
-
-
diff --git a/Source/SIMPLib/HDF5/H5Macros.h b/Source/SIMPLib/HDF5/H5Macros.h
old mode 100755
new mode 100644
index 1443d03ef2..407e00b1ee
--- a/Source/SIMPLib/HDF5/H5Macros.h
+++ b/Source/SIMPLib/HDF5/H5Macros.h
@@ -1,52 +1,51 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-#define OPEN_HDF5_FILE(fileId, filename)\
-  hid_t fileId = QH5Utilities::openFile(filename, false);\
-  if (fileId < 0) { return fileId; }
-
-
-#define OPEN_RECONSTRUCTION_GROUP(gid, name, fileId)\
-  hid_t gid = H5Gopen(fileId, name, H5P_DEFAULT);\
-  if (gid < 0) { \
-    err = QH5Utilities::closeFile(fileId);\
-    return -1; }
-
-
-
-
+#define OPEN_HDF5_FILE(fileId, filename)                                                                                                                                                               \
+  hid_t fileId = QH5Utilities::openFile(filename, false);                                                                                                                                              \
+  if(fileId < 0)                                                                                                                                                                                       \
+  {                                                                                                                                                                                                    \
+    return fileId;                                                                                                                                                                                     \
+  }
+
+#define OPEN_RECONSTRUCTION_GROUP(gid, name, fileId)                                                                                                                                                   \
+  hid_t gid = H5Gopen(fileId, name, H5P_DEFAULT);                                                                                                                                                      \
+  if(gid < 0)                                                                                                                                                                                          \
+  {                                                                                                                                                                                                    \
+    err = QH5Utilities::closeFile(fileId);                                                                                                                                                             \
+    return -1;                                                                                                                                                                                         \
+  }
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
index 747d76487b..40c2ed0b28 100644
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5MatrixStatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
old mode 100755
new mode 100644
index ae43c7805d..9b1908136f
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -1,47 +1,44 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
@@ -56,43 +53,41 @@
  */
 class SIMPLib_EXPORT H5MatrixStatsDataDelegate : public H5StatsDataDelegate
 {
-  public:
-    using Self = H5MatrixStatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for H5MatrixStatsDataDelegate
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5MatrixStatsDataDelegate
-     */
-    static QString ClassName();
-
-    ~H5MatrixStatsDataDelegate() override;
-
-    int writeMatrixStatsData(MatrixStatsData* data, hid_t groupId);
-    int readMatrixStatsData(MatrixStatsData* data, hid_t groupId);
-
-  protected:
-    H5MatrixStatsDataDelegate();
-
-    int writePhaseFraction(MatrixStatsData* data, hid_t groupId);
-    int readPhaseFraction(MatrixStatsData* data, hid_t groupId);
-
-  public:
-    H5MatrixStatsDataDelegate(const H5MatrixStatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5MatrixStatsDataDelegate(H5MatrixStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5MatrixStatsDataDelegate& operator=(const H5MatrixStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5MatrixStatsDataDelegate& operator=(H5MatrixStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = H5MatrixStatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for H5MatrixStatsDataDelegate
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5MatrixStatsDataDelegate
+   */
+  static QString ClassName();
+
+  ~H5MatrixStatsDataDelegate() override;
+
+  int writeMatrixStatsData(MatrixStatsData* data, hid_t groupId);
+  int readMatrixStatsData(MatrixStatsData* data, hid_t groupId);
+
+protected:
+  H5MatrixStatsDataDelegate();
+
+  int writePhaseFraction(MatrixStatsData* data, hid_t groupId);
+  int readPhaseFraction(MatrixStatsData* data, hid_t groupId);
+
+public:
+  H5MatrixStatsDataDelegate(const H5MatrixStatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5MatrixStatsDataDelegate(H5MatrixStatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5MatrixStatsDataDelegate& operator=(const H5MatrixStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5MatrixStatsDataDelegate& operator=(H5MatrixStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index f5042f0642..04f9ab2504 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5PrecipitateStatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
old mode 100755
new mode 100644
index 858bb02129..73f32c6de8
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,7 +41,6 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
@@ -57,94 +55,82 @@
  */
 class SIMPLib_EXPORT H5PrecipitateStatsDataDelegate : public H5StatsDataDelegate
 {
-  public:
-    using Self = H5PrecipitateStatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = H5PrecipitateStatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5PrecipitateStatsDataDelegate
+   */
+  static QString ClassName();
 
-    ~H5PrecipitateStatsDataDelegate() override;
+  ~H5PrecipitateStatsDataDelegate() override;
 
-    int writePrecipitateStatsData(PrecipitateStatsData* data, hid_t groupId);
-    int readPrecipitateStatsData(PrecipitateStatsData* data, hid_t groupId);
+  int writePrecipitateStatsData(PrecipitateStatsData* data, hid_t groupId);
+  int readPrecipitateStatsData(PrecipitateStatsData* data, hid_t groupId);
 
-  protected:
-    H5PrecipitateStatsDataDelegate();
+protected:
+  H5PrecipitateStatsDataDelegate();
 
-    int writeBoundaryArea(PrecipitateStatsData* data, hid_t groupId);
-    int readBoundaryArea(PrecipitateStatsData* data, hid_t groupId);
+  int writeBoundaryArea(PrecipitateStatsData* data, hid_t groupId);
+  int readBoundaryArea(PrecipitateStatsData* data, hid_t groupId);
 
-    int writePhaseFraction(PrecipitateStatsData* data, hid_t groupId);
-    int readPhaseFraction(PrecipitateStatsData* data, hid_t groupId);
+  int writePhaseFraction(PrecipitateStatsData* data, hid_t groupId);
+  int readPhaseFraction(PrecipitateStatsData* data, hid_t groupId);
 
-    int writePrecipBoundaryFraction(PrecipitateStatsData* data, hid_t groupId);
-    int readPrecipBoundaryFraction(PrecipitateStatsData* data, hid_t groupId);
+  int writePrecipBoundaryFraction(PrecipitateStatsData* data, hid_t groupId);
+  int readPrecipBoundaryFraction(PrecipitateStatsData* data, hid_t groupId);
 
-    int writeFeatureDiameterInfo(PrecipitateStatsData* data, hid_t groupId);
-    int readFeatureDiameterInfo(PrecipitateStatsData* data, hid_t groupId);
+  int writeFeatureDiameterInfo(PrecipitateStatsData* data, hid_t groupId);
+  int readFeatureDiameterInfo(PrecipitateStatsData* data, hid_t groupId);
 
-    int writeBinNumbers(PrecipitateStatsData* data, hid_t groupId);
-    int readBinNumbers(PrecipitateStatsData* data, hid_t groupId);
+  int writeBinNumbers(PrecipitateStatsData* data, hid_t groupId);
+  int readBinNumbers(PrecipitateStatsData* data, hid_t groupId);
 
-    int readMDFWeights(hid_t pid, PrecipitateStatsData* data);
-    int readODFWeights(hid_t pid, PrecipitateStatsData* data);
-    int readAxisODFWeights(hid_t pid, PrecipitateStatsData* data);
+  int readMDFWeights(hid_t pid, PrecipitateStatsData* data);
+  int readODFWeights(hid_t pid, PrecipitateStatsData* data);
+  int readAxisODFWeights(hid_t pid, PrecipitateStatsData* data);
 
-    int writeWeightsData(hid_t pid, const QString& hdf5GroupName,
-                         VectorOfFloatArray colData);
+  int writeWeightsData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    int writeDistributionData(hid_t pid,
-                              uint32_t disType,
-                              const QString& hdf5GroupName,
-                              VectorOfFloatArray colData);
+  int writeDistributionData(hid_t pid, uint32_t disType, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    int writeRDFDistributionData(hid_t pid, RdfData::Pointer rdfData,
-                                 const QString& hdf5GroupName);
+  int writeRDFDistributionData(hid_t pid, RdfData::Pointer rdfData, const QString& hdf5GroupName);
 
-    uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
+  uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
 
-    int readDistributionData(hid_t pid,
-                             const QString& hdf5GroupName,
-                             VectorOfFloatArray colData);
+  int readDistributionData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    int readRDFDistributionData(hid_t pid,
-                                const QString& hdf5GroupName,
-                                RdfData::Pointer rdfData);
+  int readRDFDistributionData(hid_t pid, const QString& hdf5GroupName, RdfData::Pointer rdfData);
 
+  int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
 
-    int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
-    int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  VectorOfFloatArray createDistributionVector(unsigned int distType);
 
-    VectorOfFloatArray createDistributionVector(unsigned int distType);
+  VectorOfFloatArray createBetaDistributionArrays();
 
-    VectorOfFloatArray createBetaDistributionArrays();
+  // VectorOfFloatArray createPowerDistributionArrays();
 
-    // VectorOfFloatArray createPowerDistributionArrays();
+  VectorOfFloatArray createLogNormalDistributionArrays();
 
-    VectorOfFloatArray createLogNormalDistributionArrays();
+  VectorOfFloatArray createRDFMaxMinDistributionArrays();
 
-    VectorOfFloatArray createRDFMaxMinDistributionArrays();
+public:
+  H5PrecipitateStatsDataDelegate(const H5PrecipitateStatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5PrecipitateStatsDataDelegate(H5PrecipitateStatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5PrecipitateStatsDataDelegate& operator=(const H5PrecipitateStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5PrecipitateStatsDataDelegate& operator=(H5PrecipitateStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
 
-  public:
-    H5PrecipitateStatsDataDelegate(const H5PrecipitateStatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5PrecipitateStatsDataDelegate(H5PrecipitateStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5PrecipitateStatsDataDelegate& operator=(const H5PrecipitateStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5PrecipitateStatsDataDelegate& operator=(H5PrecipitateStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
index 3343f765ad..5f339ba093 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5PrimaryStatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
old mode 100755
new mode 100644
index 034d7c9c1e..b096edda1d
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,7 +41,6 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
@@ -57,82 +55,73 @@
  */
 class SIMPLib_EXPORT H5PrimaryStatsDataDelegate : public H5StatsDataDelegate
 {
-  public:
-    using Self = H5PrimaryStatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = H5PrimaryStatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5PrimaryStatsDataDelegate
+   */
+  static QString ClassName();
 
-    ~H5PrimaryStatsDataDelegate() override;
+  ~H5PrimaryStatsDataDelegate() override;
 
-    int writePrimaryStatsData(PrimaryStatsData* data, hid_t groupId);
-    int readPrimaryStatsData(PrimaryStatsData* data, hid_t groupId);
+  int writePrimaryStatsData(PrimaryStatsData* data, hid_t groupId);
+  int readPrimaryStatsData(PrimaryStatsData* data, hid_t groupId);
 
-  protected:
-    H5PrimaryStatsDataDelegate();
+protected:
+  H5PrimaryStatsDataDelegate();
 
-    int writeBoundaryArea(PrimaryStatsData* data, hid_t groupId);
-    int readBoundaryArea(PrimaryStatsData* data, hid_t groupId);
+  int writeBoundaryArea(PrimaryStatsData* data, hid_t groupId);
+  int readBoundaryArea(PrimaryStatsData* data, hid_t groupId);
 
-    int writePhaseFraction(PrimaryStatsData* data, hid_t groupId);
-    int readPhaseFraction(PrimaryStatsData* data, hid_t groupId);
+  int writePhaseFraction(PrimaryStatsData* data, hid_t groupId);
+  int readPhaseFraction(PrimaryStatsData* data, hid_t groupId);
 
-    int writeFeatureDiameterInfo(PrimaryStatsData* data, hid_t groupId);
-    int readFeatureDiameterInfo(PrimaryStatsData* data, hid_t groupId);
+  int writeFeatureDiameterInfo(PrimaryStatsData* data, hid_t groupId);
+  int readFeatureDiameterInfo(PrimaryStatsData* data, hid_t groupId);
 
-    int writeBinNumbers(PrimaryStatsData* data, hid_t groupId);
-    int readBinNumbers(PrimaryStatsData* data, hid_t groupId);
+  int writeBinNumbers(PrimaryStatsData* data, hid_t groupId);
+  int readBinNumbers(PrimaryStatsData* data, hid_t groupId);
 
-    int readMDFWeights(hid_t pid, PrimaryStatsData* data);
-    int readODFWeights(hid_t pid, PrimaryStatsData* data);
-    int readAxisODFWeights(hid_t pid, PrimaryStatsData* data);
+  int readMDFWeights(hid_t pid, PrimaryStatsData* data);
+  int readODFWeights(hid_t pid, PrimaryStatsData* data);
+  int readAxisODFWeights(hid_t pid, PrimaryStatsData* data);
 
-    int writeWeightsData(hid_t pid, const QString& hdf5GroupName,
-                         VectorOfFloatArray colData);
+  int writeWeightsData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    int writeDistributionData(hid_t pid,
-                              uint32_t disType,
-                              const QString& hdf5GroupName,
-                              VectorOfFloatArray colData);
+  int writeDistributionData(hid_t pid, uint32_t disType, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
+  uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
 
-    int readDistributionData(hid_t pid,
-                             const QString& hdf5GroupName,
-                             VectorOfFloatArray colData);
+  int readDistributionData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
+  int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
 
-    int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
-    int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  VectorOfFloatArray createDistributionVector(unsigned int distType);
 
-    VectorOfFloatArray createDistributionVector(unsigned int distType);
+  VectorOfFloatArray createBetaDistributionArrays();
 
-    VectorOfFloatArray createBetaDistributionArrays();
+  //    VectorOfFloatArray createPowerDistributionArrays();
 
-//    VectorOfFloatArray createPowerDistributionArrays();
+  VectorOfFloatArray createLogNormalDistributionArrays();
 
-    VectorOfFloatArray createLogNormalDistributionArrays();
+public:
+  H5PrimaryStatsDataDelegate(const H5PrimaryStatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5PrimaryStatsDataDelegate(H5PrimaryStatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5PrimaryStatsDataDelegate& operator=(const H5PrimaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5PrimaryStatsDataDelegate& operator=(H5PrimaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
 
-  public:
-    H5PrimaryStatsDataDelegate(const H5PrimaryStatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5PrimaryStatsDataDelegate(H5PrimaryStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5PrimaryStatsDataDelegate& operator=(const H5PrimaryStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5PrimaryStatsDataDelegate& operator=(H5PrimaryStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
index 6f6b7698b9..201e83367a 100644
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5StatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
old mode 100755
new mode 100644
index f97e1770a8..de59a5fc8c
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
@@ -1,47 +1,44 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/StatsData.h"
 
@@ -55,42 +52,40 @@
  */
 class SIMPLib_EXPORT H5StatsDataDelegate
 {
-  public:
-    using Self = H5StatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for H5StatsDataDelegate
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for H5StatsDataDelegate
-     */
-    static QString ClassName();
-
-    virtual ~H5StatsDataDelegate();
-
-    int writeStatsData(StatsData* data, hid_t groupId);
-    int readStatsData(StatsData* data, hid_t groupId);
-
-  protected:
-    H5StatsDataDelegate();
-
-    int readStatsDataName(StatsData* data, hid_t groupId);
-
-  public:
-    H5StatsDataDelegate(const H5StatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5StatsDataDelegate(H5StatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5StatsDataDelegate& operator=(const H5StatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5StatsDataDelegate& operator=(H5StatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = H5StatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for H5StatsDataDelegate
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for H5StatsDataDelegate
+   */
+  static QString ClassName();
+
+  virtual ~H5StatsDataDelegate();
+
+  int writeStatsData(StatsData* data, hid_t groupId);
+  int readStatsData(StatsData* data, hid_t groupId);
+
+protected:
+  H5StatsDataDelegate();
+
+  int readStatsDataName(StatsData* data, hid_t groupId);
+
+public:
+  H5StatsDataDelegate(const H5StatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5StatsDataDelegate(H5StatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5StatsDataDelegate& operator=(const H5StatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5StatsDataDelegate& operator=(H5StatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
index 9ab0a3791e..533518c38f 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "H5TransformationStatsDataDelegate.h"
 
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
old mode 100755
new mode 100644
index 0d5daa0532..8ed4d366ff
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,7 +41,6 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/TransformationStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
@@ -57,85 +55,76 @@
  */
 class SIMPLib_EXPORT H5TransformationStatsDataDelegate : public H5StatsDataDelegate
 {
-  public:
-    using Self = H5TransformationStatsDataDelegate;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = H5TransformationStatsDataDelegate;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for H5TransformationStatsDataDelegate
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for H5TransformationStatsDataDelegate
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for H5TransformationStatsDataDelegate
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for H5TransformationStatsDataDelegate
+   */
+  static QString ClassName();
 
-    ~H5TransformationStatsDataDelegate() override;
+  ~H5TransformationStatsDataDelegate() override;
 
-    int writeTransformationStatsData(TransformationStatsData* data, hid_t groupId);
-    int readTransformationStatsData(TransformationStatsData* data, hid_t groupId);
+  int writeTransformationStatsData(TransformationStatsData* data, hid_t groupId);
+  int readTransformationStatsData(TransformationStatsData* data, hid_t groupId);
 
-  protected:
-    H5TransformationStatsDataDelegate();
+protected:
+  H5TransformationStatsDataDelegate();
 
-    int writeBoundaryArea(TransformationStatsData* data, hid_t groupId);
-    int readBoundaryArea(TransformationStatsData* data, hid_t groupId);
+  int writeBoundaryArea(TransformationStatsData* data, hid_t groupId);
+  int readBoundaryArea(TransformationStatsData* data, hid_t groupId);
 
-    int writePhaseFraction(TransformationStatsData* data, hid_t groupId);
-    int readPhaseFraction(TransformationStatsData* data, hid_t groupId);
+  int writePhaseFraction(TransformationStatsData* data, hid_t groupId);
+  int readPhaseFraction(TransformationStatsData* data, hid_t groupId);
 
-    int writeParentPhase(TransformationStatsData* data, hid_t groupId);
-    int readParentPhase(TransformationStatsData* data, hid_t groupId);
+  int writeParentPhase(TransformationStatsData* data, hid_t groupId);
+  int readParentPhase(TransformationStatsData* data, hid_t groupId);
 
-    int writeFeatureDiameterInfo(TransformationStatsData* data, hid_t groupId);
-    int readFeatureDiameterInfo(TransformationStatsData* data, hid_t groupId);
+  int writeFeatureDiameterInfo(TransformationStatsData* data, hid_t groupId);
+  int readFeatureDiameterInfo(TransformationStatsData* data, hid_t groupId);
 
-    int writeBinNumbers(TransformationStatsData* data, hid_t groupId);
-    int readBinNumbers(TransformationStatsData* data, hid_t groupId);
+  int writeBinNumbers(TransformationStatsData* data, hid_t groupId);
+  int readBinNumbers(TransformationStatsData* data, hid_t groupId);
 
-    int readMDFWeights(hid_t pid, TransformationStatsData* data);
-    int readODFWeights(hid_t pid, TransformationStatsData* data);
-    int readAxisODFWeights(hid_t pid, TransformationStatsData* data);
+  int readMDFWeights(hid_t pid, TransformationStatsData* data);
+  int readODFWeights(hid_t pid, TransformationStatsData* data);
+  int readAxisODFWeights(hid_t pid, TransformationStatsData* data);
 
-    int writeWeightsData(hid_t pid, const QString& hdf5GroupName,
-                         VectorOfFloatArray colData);
+  int writeWeightsData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    int writeDistributionData(hid_t pid,
-                              uint32_t disType,
-                              const QString& hdf5GroupName,
-                              VectorOfFloatArray colData);
+  int writeDistributionData(hid_t pid, uint32_t disType, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
-    uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
+  uint32_t readDistributionType(hid_t pid, const QString& hdf5GroupName);
 
-    int readDistributionData(hid_t pid,
-                             const QString& hdf5GroupName,
-                             VectorOfFloatArray colData);
+  int readDistributionData(hid_t pid, const QString& hdf5GroupName, VectorOfFloatArray colData);
 
+  int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
 
-    int writeVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
-    int readVectorOfArrays(hid_t pid, VectorOfFloatArray colData);
+  VectorOfFloatArray createDistributionVector(unsigned int distType);
 
-    VectorOfFloatArray createDistributionVector(unsigned int distType);
-
-    VectorOfFloatArray createBetaDistributionArrays();
+  VectorOfFloatArray createBetaDistributionArrays();
 
   //  VectorOfFloatArray createPowerDistributionArrays();
 
-    VectorOfFloatArray createLogNormalDistributionArrays();
+  VectorOfFloatArray createLogNormalDistributionArrays();
 
-  public:
-    H5TransformationStatsDataDelegate(const H5TransformationStatsDataDelegate&) = delete; // Copy Constructor Not Implemented
-    H5TransformationStatsDataDelegate(H5TransformationStatsDataDelegate&&) = delete;      // Move Constructor Not Implemented
-    H5TransformationStatsDataDelegate& operator=(const H5TransformationStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
-    H5TransformationStatsDataDelegate& operator=(H5TransformationStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  H5TransformationStatsDataDelegate(const H5TransformationStatsDataDelegate&) = delete;            // Copy Constructor Not Implemented
+  H5TransformationStatsDataDelegate(H5TransformationStatsDataDelegate&&) = delete;                 // Move Constructor Not Implemented
+  H5TransformationStatsDataDelegate& operator=(const H5TransformationStatsDataDelegate&) = delete; // Copy Assignment Not Implemented
+  H5TransformationStatsDataDelegate& operator=(H5TransformationStatsDataDelegate&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/HDF5/VTKH5Constants.h b/Source/SIMPLib/HDF5/VTKH5Constants.h
old mode 100755
new mode 100644
index 3e0bf29ebe..fbea7e855c
--- a/Source/SIMPLib/HDF5/VTKH5Constants.h
+++ b/Source/SIMPLib/HDF5/VTKH5Constants.h
@@ -5,16 +5,14 @@
 //  BSD License: http://www.opensource.org/licenses/bsd-license.html
 //
 
-
 #pragma once
 
-
 #define H5_VTK_OBJECT_INDEX_PATH "/VTK_OBJECT_INDEX"
-#define H5_VTK_DATA_OBJECT  "VTK_DATA_OBJECT"
-#define H5_VTK_POLYDATA     "VTK_POLYDATA"
+#define H5_VTK_DATA_OBJECT "VTK_DATA_OBJECT"
+#define H5_VTK_POLYDATA "VTK_POLYDATA"
 #define H5_VTK_UNSTRUCTURED_GRID "VTK_UNSTRUCTURED_GRID"
 #define H5_VTK_STRUCTURED_POINTS "VTK_STRUCTURED_POINTS"
-#define H5_NAME             "NAME"
+#define H5_NAME "NAME"
 #define H5_VTK_DATASET_ATTRIBUTE "VTK_DATASET_ATTRIBUTE"
 
 #define H5_ENSEMBLE_DATA_GROUP_NAME "ENSEMBLE_DATA"
@@ -33,132 +31,129 @@
 #define H5_EDGE_FIELD_DATA_GROUP_NAME "EDGE_FEATURE_DATA"
 #define H5_FACE_FIELD_DATA_GROUP_NAME "FACE_FEATURE_DATA"
 #define H5_CELL_FIELD_DATA_GROUP_NAME "CELL_FEATURE_DATA"
-#define H5_FIELD_DATA_DEFAULT    "FeatureData"
-#define H5_VERTEX_FIELD_DATA_DEFAULT    "VertexFeatureData"
-#define H5_EDGE_FIELD_DATA_DEFAULT    "EdgeFeatureData"
-#define H5_FACE_FIELD_DATA_DEFAULT    "FaceFeatureData"
-#define H5_CELL_FIELD_DATA_DEFAULT    "CellFeatureData"
-#define H5_CELL_DATA_GROUP_NAME  "CELL_DATA"
-#define H5_VERTEX_DATA_GROUP_NAME  "VERTEX_DATA"
+#define H5_FIELD_DATA_DEFAULT "FeatureData"
+#define H5_VERTEX_FIELD_DATA_DEFAULT "VertexFeatureData"
+#define H5_EDGE_FIELD_DATA_DEFAULT "EdgeFeatureData"
+#define H5_FACE_FIELD_DATA_DEFAULT "FaceFeatureData"
+#define H5_CELL_FIELD_DATA_DEFAULT "CellFeatureData"
+#define H5_CELL_DATA_GROUP_NAME "CELL_DATA"
+#define H5_VERTEX_DATA_GROUP_NAME "VERTEX_DATA"
 #define H5_POINT_DATA_GROUP_NAME "POINT_DATA"
 #define H5_SCALAR_DATA_GROUP_NAME "SCALARS"
 #define H5_FACE_DATA_GROUP_NAME "FACE_DATA"
 #define H5_EDGE_DATA_GROUP_NAME "EDGE_DATA"
 
-#define H5_POINTS                "POINTS"
-#define H5_VERTICES              "VERTICES"
-#define H5_LINES                 "LINES"
-#define H5_POLYGONS              "POLYGONS"
-#define H5_TRIANGLE_STRIPS       "TRIANGLE_STRIPS"
+#define H5_POINTS "POINTS"
+#define H5_VERTICES "VERTICES"
+#define H5_LINES "LINES"
+#define H5_POLYGONS "POLYGONS"
+#define H5_TRIANGLE_STRIPS "TRIANGLE_STRIPS"
 
-#define H5_CELLS                  "CELLS"
-#define H5_CELL_TYPES             "CELL_TYPES"
+#define H5_CELLS "CELLS"
+#define H5_CELL_TYPES "CELL_TYPES"
 
-#define H5_NUMCOMPONENTS          "NumComponents"
+#define H5_NUMCOMPONENTS "NumComponents"
 
-#define H5_DEFAULT       "default"
+#define H5_DEFAULT "default"
 
-#define H5_DIMENSIONS          "DIMENSIONS"
-#define H5_ORIGIN              "ORIGIN"
-#define H5_SPACING             "SPACING"
-#define H5_POINT_DATA          "POINT_DATA"
-#define H5_NUMBER_OF_POINTS    "NUM_POINTS"
+#define H5_DIMENSIONS "DIMENSIONS"
+#define H5_ORIGIN "ORIGIN"
+#define H5_SPACING "SPACING"
+#define H5_POINT_DATA "POINT_DATA"
+#define H5_NUMBER_OF_POINTS "NUM_POINTS"
 
-#define H5_ACTIVE_SCALARS      "ActiveScalars"
-#define H5_SCALARS             "SCALARS"
-#define H5_SCALARS_DEFAULT     "scalars"
+#define H5_ACTIVE_SCALARS "ActiveScalars"
+#define H5_SCALARS "SCALARS"
+#define H5_SCALARS_DEFAULT "scalars"
 
-#define H5_COLOR_SCALARS    "COLOR_SCALARS"
+#define H5_COLOR_SCALARS "COLOR_SCALARS"
 #define H5_COlOR_SCALARS_DEFAULT "color_scalars"
 
-#define H5_LOOKUP_TABLE    "LOOKUP_TABLE"
+#define H5_LOOKUP_TABLE "LOOKUP_TABLE"
 #define H5_LOOKUP_TABLE_DEFAULT "lookup_table"
 
-#define H5_ACTIVE_VECTORS      "ActiveVectors"
-#define H5_VECTORS         "VECTORS"
+#define H5_ACTIVE_VECTORS "ActiveVectors"
+#define H5_VECTORS "VECTORS"
 #define H5_VECTORS_DEFAULT "vectors"
 
-#define H5_ACTIVE_NORMALS      "ActiveNormals"
-#define H5_NORMALS    "NORMALS"
+#define H5_ACTIVE_NORMALS "ActiveNormals"
+#define H5_NORMALS "NORMALS"
 #define H5_NORMALS_NAME "Normals"
 #define H5_NORMALS_DEFAULT "normals"
 
-#define H5_ACTIVE_TEXTURE_COORDINATES      "ActiveTextureCoordinates"
-#define H5_TEXTURE_COORDINATES  "TEXTURE_COORDINATES"
+#define H5_ACTIVE_TEXTURE_COORDINATES "ActiveTextureCoordinates"
+#define H5_TEXTURE_COORDINATES "TEXTURE_COORDINATES"
 #define H5_TEXTURE_COORDINATES_DEFAULT "tcoords"
 
-#define H5_ACTIVE_TENSORS      "ActiveTensors"
+#define H5_ACTIVE_TENSORS "ActiveTensors"
 #define H5_TENSORS "TENSORS"
 #define H5_TENSORS_DEFAULT "tensors"
 
-#define H5_ACTIVE_GLOBAL_IDS      "ActiveGlobalIds"
-#define H5_GLOBAL_IDS   "GLOBAL_IDS"
-#define H5_GLOBAL_IDS_DEFAULT  "global_ids"
+#define H5_ACTIVE_GLOBAL_IDS "ActiveGlobalIds"
+#define H5_GLOBAL_IDS "GLOBAL_IDS"
+#define H5_GLOBAL_IDS_DEFAULT "global_ids"
 
-#define H5_ACTIVE_PEDIGREE_IDS      "ActivePedigreeIds"
+#define H5_ACTIVE_PEDIGREE_IDS "ActivePedigreeIds"
 #define H5_PEDIGREE_IDS "PEDIGREE_IDS"
 #define H5_PEDIGREE_IDS_DEFAULT "pedigree_ids"
 
-#define VTK_CELLTYPE_EMPTY_CELL        0
-#define VTK_CELLTYPE_VERTEX            1
-#define VTK_CELLTYPE_POLY_VERTEX       2
-#define VTK_CELLTYPE_LINE              3
-#define VTK_CELLTYPE_POLY_LINE         4
-#define VTK_CELLTYPE_TRIANGLE          5
-#define VTK_CELLTYPE_TRIANGLE_STRIP    6
-#define VTK_CELLTYPE_POLYGON           7
-#define VTK_CELLTYPE_PIXEL             8
-#define VTK_CELLTYPE_QUAD              9
-#define VTK_CELLTYPE_TETRA             10
-#define VTK_CELLTYPE_VOXEL             11
-#define VTK_CELLTYPE_HEXAHEDRON        12
-#define VTK_CELLTYPE_WEDGE             13
-#define VTK_CELLTYPE_PYRAMID           14
-#define VTK_CELLTYPE_PENTAGONAL_PRISM  15
-#define VTK_CELLTYPE_HEXAGONAL_PRISM   16
+#define VTK_CELLTYPE_EMPTY_CELL 0
+#define VTK_CELLTYPE_VERTEX 1
+#define VTK_CELLTYPE_POLY_VERTEX 2
+#define VTK_CELLTYPE_LINE 3
+#define VTK_CELLTYPE_POLY_LINE 4
+#define VTK_CELLTYPE_TRIANGLE 5
+#define VTK_CELLTYPE_TRIANGLE_STRIP 6
+#define VTK_CELLTYPE_POLYGON 7
+#define VTK_CELLTYPE_PIXEL 8
+#define VTK_CELLTYPE_QUAD 9
+#define VTK_CELLTYPE_TETRA 10
+#define VTK_CELLTYPE_VOXEL 11
+#define VTK_CELLTYPE_HEXAHEDRON 12
+#define VTK_CELLTYPE_WEDGE 13
+#define VTK_CELLTYPE_PYRAMID 14
+#define VTK_CELLTYPE_PENTAGONAL_PRISM 15
+#define VTK_CELLTYPE_HEXAGONAL_PRISM 16
 
 // Quadratic isoparametric cells
-#define VTK_CELLTYPE_QUADRATIC_EDGE                    21
-#define VTK_CELLTYPE_QUADRATIC_TRIANGLE                22
-#define VTK_CELLTYPE_QUADRATIC_QUAD                    23
-#define VTK_CELLTYPE_QUADRATIC_TETRA                   24
-#define VTK_CELLTYPE_QUADRATIC_HEXAHEDRON              25
-#define VTK_CELLTYPE_QUADRATIC_WEDGE                   26
-#define VTK_CELLTYPE_QUADRATIC_PYRAMID                 27
-#define VTK_CELLTYPE_BIQUADRATIC_QUAD                  28
-#define VTK_CELLTYPE_TRIQUADRATIC_HEXAHEDRON           29
-#define VTK_CELLTYPE_QUADRATIC_LINEAR_QUAD             30
-#define VTK_CELLTYPE_QUADRATIC_LINEAR_WEDGE            31
-#define VTK_CELLTYPE_BIQUADRATIC_QUADRATIC_WEDGE       32
-#define VTK_CELLTYPE_BIQUADRATIC_QUADRATIC_HEXAHEDRON  33
-#define VTK_CELLTYPE_BIQUADRATIC_TRIANGLE              34
+#define VTK_CELLTYPE_QUADRATIC_EDGE 21
+#define VTK_CELLTYPE_QUADRATIC_TRIANGLE 22
+#define VTK_CELLTYPE_QUADRATIC_QUAD 23
+#define VTK_CELLTYPE_QUADRATIC_TETRA 24
+#define VTK_CELLTYPE_QUADRATIC_HEXAHEDRON 25
+#define VTK_CELLTYPE_QUADRATIC_WEDGE 26
+#define VTK_CELLTYPE_QUADRATIC_PYRAMID 27
+#define VTK_CELLTYPE_BIQUADRATIC_QUAD 28
+#define VTK_CELLTYPE_TRIQUADRATIC_HEXAHEDRON 29
+#define VTK_CELLTYPE_QUADRATIC_LINEAR_QUAD 30
+#define VTK_CELLTYPE_QUADRATIC_LINEAR_WEDGE 31
+#define VTK_CELLTYPE_BIQUADRATIC_QUADRATIC_WEDGE 32
+#define VTK_CELLTYPE_BIQUADRATIC_QUADRATIC_HEXAHEDRON 33
+#define VTK_CELLTYPE_BIQUADRATIC_TRIANGLE 34
 
 // Cubic isoparametric cell
-#define VTK_CELLTYPE_CUBIC_LINE                        35
+#define VTK_CELLTYPE_CUBIC_LINE 35
 
 // Special class of cells formed by convex group of points
-#define VTK_CELLTYPE_CONVEX_POINT_SET  41
+#define VTK_CELLTYPE_CONVEX_POINT_SET 41
 
 // Polyhedron cell (consisting of polygonal faces)
-#define VTK_CELLTYPE_POLYHEDRON  42
+#define VTK_CELLTYPE_POLYHEDRON 42
 
 // Higher order cells in parametric form
-#define VTK_CELLTYPE_PARAMETRIC_CURVE         51
-#define VTK_CELLTYPE_PARAMETRIC_SURFACE       52
-#define VTK_CELLTYPE_PARAMETRIC_TRI_SURFACE   53
-#define VTK_CELLTYPE_PARAMETRIC_QUAD_SURFACE  54
-#define VTK_CELLTYPE_PARAMETRIC_TETRA_REGION  55
-#define VTK_CELLTYPE_PARAMETRIC_HEX_REGION    56
+#define VTK_CELLTYPE_PARAMETRIC_CURVE 51
+#define VTK_CELLTYPE_PARAMETRIC_SURFACE 52
+#define VTK_CELLTYPE_PARAMETRIC_TRI_SURFACE 53
+#define VTK_CELLTYPE_PARAMETRIC_QUAD_SURFACE 54
+#define VTK_CELLTYPE_PARAMETRIC_TETRA_REGION 55
+#define VTK_CELLTYPE_PARAMETRIC_HEX_REGION 56
 
 // Higher order cells
-#define VTK_CELLTYPE_HIGHER_ORDER_EDGE         60
-#define VTK_CELLTYPE_HIGHER_ORDER_TRIANGLE     61
-#define VTK_CELLTYPE_HIGHER_ORDER_QUAD         62
-#define VTK_CELLTYPE_HIGHER_ORDER_POLYGON      63
-#define VTK_CELLTYPE_HIGHER_ORDER_TETRAHEDRON  64
-#define VTK_CELLTYPE_HIGHER_ORDER_WEDGE        65
-#define VTK_CELLTYPE_HIGHER_ORDER_PYRAMID      66
-#define VTK_CELLTYPE_HIGHER_ORDER_HEXAHEDRON   67
-
-
-
+#define VTK_CELLTYPE_HIGHER_ORDER_EDGE 60
+#define VTK_CELLTYPE_HIGHER_ORDER_TRIANGLE 61
+#define VTK_CELLTYPE_HIGHER_ORDER_QUAD 62
+#define VTK_CELLTYPE_HIGHER_ORDER_POLYGON 63
+#define VTK_CELLTYPE_HIGHER_ORDER_TETRAHEDRON 64
+#define VTK_CELLTYPE_HIGHER_ORDER_WEDGE 65
+#define VTK_CELLTYPE_HIGHER_ORDER_PYRAMID 66
+#define VTK_CELLTYPE_HIGHER_ORDER_HEXAHEDRON 67
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 5ee15bcda4..e710687d38 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -200,11 +200,11 @@
 //////////////////////////////////////////////////////////////////////////////
 
 // Expand the value of typeIN to be able to concatenate it with 'DREAM3D_USE' to check if the type is accepted by the filter
-#define Dream3DTemplateAliasMacroCase(typeIN, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename)                      \
+#define Dream3DTemplateAliasMacroCase(typeIN, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename)                                                                              \
   Dream3DTemplateAliasMacroCase0(typeIN, typeOUT, call, var_type, tDims, errorCondition, DREAM3D_USE_##typeIN, isTypeOUT, typeOUTTypename)
-#define Dream3DTemplateAliasMacroCase0(typeIN, typeOUT, call, var_type, tDims, errorCondition, value, isTypeOUT, typeOUTTypename)              \
+#define Dream3DTemplateAliasMacroCase0(typeIN, typeOUT, call, var_type, tDims, errorCondition, value, isTypeOUT, typeOUTTypename)                                                                      \
   Dream3DTemplateAliasMacroCase1(typeIN, typeOUT, call, var_type, tDims, errorCondition, value, isTypeOUT, typeOUTTypename)
-#define Dream3DTemplateAliasMacroCase1(typeIN, typeOUT, call, var_type, tDims, errorCondition, value, isTypeOUT, typeOUTTypename)              \
+#define Dream3DTemplateAliasMacroCase1(typeIN, typeOUT, call, var_type, tDims, errorCondition, value, isTypeOUT, typeOUTTypename)                                                                      \
   Dream3DTemplateAliasMacroCase_##value(typeIN, typeOUT, call, var_type, tDims, errorCondition, QUOTE(typeIN), isTypeOUT, typeOUTTypename)
 
 // Type is not accepted, throw an error message.
@@ -216,19 +216,19 @@
   }
 
 // Type is accepted, select the dimension of the input and output images
-#define Dream3DTemplateAliasMacroCase_1(typeIN, typeOUT, call, var_type, tDims, errorCondition, quotedType, isTypeOUT, typeOUTTypename)        \
-  if(var_type.compare(quotedType) == 0)           \
-  {                   \
-    if(tDims[2] == 1) \
-    {                 \
-      /* 2D image */  \
-      Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, 2)     \
-    }                 \
-    else              \
-    {                 \
-      /* 3D */        \
-      Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, 3)     \
-    }                 \
+#define Dream3DTemplateAliasMacroCase_1(typeIN, typeOUT, call, var_type, tDims, errorCondition, quotedType, isTypeOUT, typeOUTTypename)                                                                \
+  if(var_type.compare(quotedType) == 0)                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    if(tDims[2] == 1)                                                                                                                                                                                  \
+    {                                                                                                                                                                                                  \
+      /* 2D image */                                                                                                                                                                                   \
+      Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, 2)                                                                                         \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      /* 3D */                                                                                                                                                                                         \
+      Dream3DTemplateAliasMacroPixelType(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, 3)                                                                                         \
+    }                                                                                                                                                                                                  \
   }
 
 // Select vector, RGB/RGBA, or scalar images
@@ -258,7 +258,7 @@
 #define Dream3DTemplateAliasMacroCase_1_0(typeIN, typeOUT, call, typeOUTTypename, dimension) Dream3DTemplateAliasMacroCaseIf(typeIN, typeIN, call, typeOUTTypename, dimension)
 
 // Otherwise, just forward the given arguments to the next macro
-#define Dream3DTemplateAliasMacroCase_1_1(typeIN, typeOUT, call, typeOUTTypename, dimension)                       \
+#define Dream3DTemplateAliasMacroCase_1_1(typeIN, typeOUT, call, typeOUTTypename, dimension)                                                                                                           \
   DefineInputImageType##typeOUTTypename(typeIN, dimension) Dream3DTemplateAliasMacroCaseIf(typeIN, typeOUT, call, typeOUTTypename, dimension)
 
 // Call the given function, templated with typeIN, typeOUT, and dimension.
@@ -272,15 +272,15 @@
 //        Handles scalar images      //
 ///////////////////////////////////////////////////////////////////////////////////////////////
 // Expands the value of 'Scalar' that is 0 if the filter does not accept 'Scalar' images, and '1' if it does.
-#define Dream3DTemplateAliasMacroCaseScalarImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)        \
+#define Dream3DTemplateAliasMacroCaseScalarImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)                                                                \
   Dream3DTemplateAliasMacroCaseScalarImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)
-#define Dream3DTemplateAliasMacroCaseScalarImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)        \
+#define Dream3DTemplateAliasMacroCaseScalarImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Scalar)                                                                \
   Dream3DTemplateAliasMacroCaseScalarImage1_##Scalar(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)
 // Scalar images not accepted, throw an error message if a scalar image is given.
 #define Dream3DTemplateAliasMacroCaseScalarImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
   setErrorCondition(errorCondition, "Scalar images not supported. Try RGB/RGBA or vector images");
 // Scalar images accepted
-#define Dream3DTemplateAliasMacroCaseScalarImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)              \
+#define Dream3DTemplateAliasMacroCaseScalarImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)                                                                      \
   Dream3DTemplateAliasMacroCase_1_##isTypeOUT(typeIN, typeOUT, call, typeOUTTypename, dimension)
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
@@ -296,10 +296,10 @@
   using OutputPixelType = typeOUT;
 
 // Expands the value of 'Vector' that is 0 if the filter does not accept 'Vector' images, and '1' if it does.
-#define Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)        \
+#define Dream3DTemplateAliasMacroCaseVectorImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)                                                                \
   Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)
 
-#define Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)        \
+#define Dream3DTemplateAliasMacroCaseVectorImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, Vector)                                                                \
   Dream3DTemplateAliasMacroCaseVectorImage1_##Vector(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension)
 
 // Vector images not accepted, throw an error message if a vector image is given.
@@ -347,9 +347,9 @@
 //                          Handles RGB/RGBA images                         //
 //////////////////////////////////////////////////////////////////////////////
 // Expand 'RGB/RGBA' argument that will be used to call the appropriate macro, depending if the filter accepts 'RGB/RGBA' images or not.
-#define Dream3DTemplateAliasMacroCaseRGBRGBAImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)                    \
+#define Dream3DTemplateAliasMacroCaseRGBRGBAImage0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)                                                \
   Dream3DTemplateAliasMacroCaseRGBRGBAImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)
-#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)                    \
+#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, RGBRGBA, nbComponents)                                                \
   Dream3DTemplateAliasMacroCaseRGBRGBAImage1_##RGBRGBA(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents)
 // If RGB/RGBA not accepted by the current filter, prints an error message
 #define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_0(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents)                                                       \
@@ -357,14 +357,14 @@
       errorCondition,                                                                                                                                                                                  \
       "RGB/RGBA not supported. Try converting the selected input image to an image with scalar components using 'ITK::RGB to Luminance ImageFilter' or 'Convert Rgb To GrayScale' filters");           \
 // If RGB/RGBA accepted by current filter, call the macro that will call the given function
-#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents) \
-  if(nbComponents == 3) \
-  {                   \
-    Dream3DTemplateAliasMacroCase_1_##isTypeOUT(itk::RGBPixel<typeIN>, itk::RGBPixel<typeOUT>, call, typeOUTTypename, dimension)               \
-  }                   \
-  else /* 4 components = RGBA*/                   \
-  {                   \
-    Dream3DTemplateAliasMacroCase_1_##isTypeOUT(itk::RGBAPixel<typeIN>, itk::RGBAPixel<typeOUT>, call, typeOUTTypename, dimension)             \
+#define Dream3DTemplateAliasMacroCaseRGBRGBAImage1_1(typeIN, typeOUT, call, errorCondition, isTypeOUT, typeOUTTypename, dimension, nbComponents)                                                       \
+  if(nbComponents == 3)                                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    Dream3DTemplateAliasMacroCase_1_##isTypeOUT(itk::RGBPixel<typeIN>, itk::RGBPixel<typeOUT>, call, typeOUTTypename, dimension)                                                                       \
+  }                                                                                                                                                                                                    \
+  else /* 4 components = RGBA*/                                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    Dream3DTemplateAliasMacroCase_1_##isTypeOUT(itk::RGBAPixel<typeIN>, itk::RGBAPixel<typeOUT>, call, typeOUTTypename, dimension)                                                                     \
   }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -372,30 +372,41 @@
 //////////////////////////////////////////////////////////////////////////////
 // Define a macro to dispatch calls to a template instantiated over
 // the aliased scalar types.
-#define Dream3DTemplateAliasMacro(call, var_type, typeOUT, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-           Dream3DTemplateAliasMacroCase(double, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(float, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(int8_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(uint8_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(int16_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(uint16_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(int32_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(uint32_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(int64_t, typeOUT, call,  var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) \
-      else Dream3DTemplateAliasMacroCase(uint64_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename)
+#define Dream3DTemplateAliasMacro(call, var_type, typeOUT, tDims, errorCondition, isTypeOUT, typeOUTTypename)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   \
+  Dream3DTemplateAliasMacroCase(                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                \
+      double, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        \
+      typeOUTTypename) else Dream3DTemplateAliasMacroCase(float, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     \
+                                                          typeOUTTypename) else Dream3DTemplateAliasMacroCase(int8_t, typeOUT, call,                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            \
+                                                                                                              var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(uint8_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(int16_t, typeOUT, call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(uint16_t,                                                                                                                                                                                                                                                                                                                                                                                         \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                              typeOUT,                                                                                                                                                                                                                                                                                                                                                                                          \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                              call, var_type, tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(int32_t, typeOUT, call, var_type,                                                                                                                                                                                                                                                           \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(uint32_t,                                                                                                                                                                                             \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          typeOUT,                                                                                                                                                                                              \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          call,                                                                                                                                                                                                 \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          var_type,                                                                                                                                                                                             \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          tDims,                                                                                                                                                                                                \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(int64_t,                                                                                                               \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         typeOUT,                                                                                                               \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         call,                                                                                                                  \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         var_type,                                                                                                              \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         tDims, errorCondition, isTypeOUT, typeOUTTypename) else Dream3DTemplateAliasMacroCase(uint64_t, typeOUT,               \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               call,                            \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               var_type, tDims, errorCondition, \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               isTypeOUT,                       \
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               typeOUTTypename)
 
 // Define a macro that is specific to Dream3D and dispatches calls to a template
 // instantiated over the aliased scalar type based on the type of a data array
 // which is saved in the filter's data container array.
 #define Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, isTypeOUT, typeOUTTypename)                                                                                         \
   {                                                                                                                                                                                                    \
-    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);                                                                            \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);                                                                                                        \
     if(nullptr != ptr)                                                                                                                                                                                 \
     {                                                                                                                                                                                                  \
-      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, path.getDataContainerName());                                    \
+      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, path.getDataContainerName());                                                    \
       if(nullptr != imageGeometry)                                                                                                                                                                     \
       {                                                                                                                                                                                                \
-        std::vector<size_t> tDims = imageGeometry->getDimensions().toContainer<std::vector<size_t>>();                                                                                                     \
+        std::vector<size_t> tDims = imageGeometry->getDimensions().toContainer<std::vector<size_t>>();                                                                                                 \
         if(getErrorCode() >= 0)                                                                                                                                                                        \
         {                                                                                                                                                                                              \
           QString type = ptr->getTypeAsString();                                                                                                                                                       \
@@ -420,15 +431,13 @@
 // Define a macro that is specific to Dream3D and dispatches calls to a template
 // instantiated over the aliased scalar type based on the type of a data array
 // which is saved in the filter's data container array.
-#define Dream3DArraySwitchMacroOutputType(call, path, errorCondition, typeOUT, typeOUTTypename) \
-  Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, 1, typeOUTTypename)
+#define Dream3DArraySwitchMacroOutputType(call, path, errorCondition, typeOUT, typeOUTTypename) Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, typeOUT, 1, typeOUTTypename)
 
 // Define a macro that is specific to Dream3D and dispatches calls to a template
 // instantiated over the aliased scalar type based on the type of a data array
 // which is saved in the filter's data container array. Output type is of the same
 // type as the input data array.
-#define Dream3DArraySwitchMacro(call, path, errorCondition) \
-  Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, "", 0, 0)
+#define Dream3DArraySwitchMacro(call, path, errorCondition) Dream3DArraySwitchMacroLongOutputType(call, path, errorCondition, "", 0, 0)
 
 ///////////////////////////////////////////////////////////////////////////////////////
 //          Entry Point : manually select the output image component type            //
@@ -500,10 +509,10 @@
 //
 #define Dream3DArrayOutputComponentFromDataMacro(call, input2_path, input1_path, errorCondition)                                                                                                       \
   {                                                                                                                                                                                                    \
-    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, input2_path);                                                                     \
+    IDataArrayShPtrType ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, input2_path);                                                                                                 \
     if(ptr.get() != nullptr)                                                                                                                                                                           \
     {                                                                                                                                                                                                  \
-      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, input2_path.getDataContainerName());                             \
+      ImageGeom::Pointer imageGeometry = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, input2_path.getDataContainerName());                                             \
       if(imageGeometry.get() != nullptr)                                                                                                                                                               \
       {                                                                                                                                                                                                \
         std::vector<size_t> tDims(3, 0);                                                                                                                                                               \
diff --git a/Source/SIMPLib/ITK/SimpleITKEnums.h b/Source/SIMPLib/ITK/SimpleITKEnums.h
index bf71316bac..09656cf89f 100644
--- a/Source/SIMPLib/ITK/SimpleITKEnums.h
+++ b/Source/SIMPLib/ITK/SimpleITKEnums.h
@@ -25,4 +25,3 @@ enum SeedEnum
 } // end namespace itk
 
 // end of Copied from sitkKernel.h (SimpleITK)
-
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
index e62337a2b7..29541baaa9 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "itkDream3DTransformContainerTestHelper.h"
 
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
index 723e59fd82..0c3a58c954 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #ifndef itkDream3DTransforContainerTestHelper_h
 #define itkDream3DTransforContainerTestHelper_h
@@ -43,7 +43,8 @@
 using AffineType = itk::AffineTransform<float, 3>;
 using CompositeTransform = itk::CompositeTransform<float, 3>;
 
-template <typename ParameterType> bool CompareITKParameters(ParameterType trans1, ParameterType trans2)
+template <typename ParameterType>
+bool CompareITKParameters(ParameterType trans1, ParameterType trans2)
 {
   DREAM3D_REQUIRE_EQUAL(trans1.GetSize(), trans2.GetSize());
   for(size_t p = 0; p < trans1.GetSize(); p++)
@@ -53,7 +54,8 @@ template <typename ParameterType> bool CompareITKParameters(ParameterType trans1
   return true;
 }
 
-template <typename ParameterType> bool CompareDREAM3DParameters(ParameterType trans1, ParameterType trans2)
+template <typename ParameterType>
+bool CompareDREAM3DParameters(ParameterType trans1, ParameterType trans2)
 {
   DREAM3D_REQUIRE_EQUAL(trans1.size(), trans2.size());
   for(size_t p = 0; p < trans1.size(); p++)
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
index 06bd2ac930..ddea6134f5 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/ITK/itkDream3DTransformContainerToTransform.h"
 
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
index e46d7317f1..91c0204942 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLib/ITK/itkTransformToDream3DITransformContainer.h"
 
 #include "itkDream3DTransformContainerTestHelper.h"
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
index 115d077a59..178ac810c4 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/ITK/itkTransformToDream3DTransformContainer.h"
 
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 63eba8b39d..780f6f81db 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -52,7 +52,8 @@
 // Our Plugin Includes next
 #include "SIMPLib/ITK/itkSupportConstants.h"
 
-template <typename T, typename K, typename ItkOutPixelType> class Dream3DToItkImageConversion
+template <typename T, typename K, typename ItkOutPixelType>
+class Dream3DToItkImageConversion
 {
 public:
   Dream3DToItkImageConversion() = default;
@@ -205,7 +206,8 @@ class ItkBridge2
 };
 #endif
 
-template <typename ComponentType> class CreateItkWrapperForDataPointer
+template <typename ComponentType>
+class CreateItkWrapperForDataPointer
 {
 public:
   CreateItkWrapperForDataPointer() = default;
@@ -275,8 +277,8 @@ template <typename ComponentType> class CreateItkWrapperForDataPointer
   }
 
 public:
-  CreateItkWrapperForDataPointer(const CreateItkWrapperForDataPointer&) = delete; // Copy Constructor Not Implemented
-  CreateItkWrapperForDataPointer(CreateItkWrapperForDataPointer&&) = delete;      // Move Constructor Not Implemented
+  CreateItkWrapperForDataPointer(const CreateItkWrapperForDataPointer&) = delete;            // Copy Constructor Not Implemented
+  CreateItkWrapperForDataPointer(CreateItkWrapperForDataPointer&&) = delete;                 // Move Constructor Not Implemented
   CreateItkWrapperForDataPointer& operator=(const CreateItkWrapperForDataPointer&) = delete; // Copy Assignment Not Implemented
   CreateItkWrapperForDataPointer& operator=(CreateItkWrapperForDataPointer&&) = delete;      // Move Assignment Not Implemented
 };
@@ -467,7 +469,8 @@ class ItkBridge
    * @return
    */
 #if 1
-  template <typename TImage> static typename TImage::Pointer CreateItkWrapperForDataPointer(DataContainer::Pointer m, QString attrMatName, ComponentType* data)
+  template <typename TImage>
+  static typename TImage::Pointer CreateItkWrapperForDataPointer(DataContainer::Pointer m, QString attrMatName, ComponentType* data)
   {
     return Dream3DtoITKImportFilter<typename TImage::PixelType>(m, attrMatName, data)->GetOutput();
   }
@@ -579,4 +582,3 @@ class ItkBridge
 
 //// Create some typedefs for our convenience
 typedef ItkBridge<ImageProcessingConstants::DefaultPixelType> ITKUtilitiesType;
-
diff --git a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
index 0dcfe4f76f..591faf6e6d 100644
--- a/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
+++ b/Source/SIMPLib/ITK/itkDream3DFilterInterruption.h
@@ -67,4 +67,3 @@ class Dream3DFilterInterruption : public Command
 };
 
 } // namespace itk
-
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 75c4185c79..c794912099 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -1,35 +1,35 @@
 /* ============================================================================
  * Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -61,7 +61,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   itkNewMacro(Self);
   itkTypeMacro(Dream3DITransformContainerToTransform, ProcessObject);
 
-  virtual void SetInput(const ITransformContainer::Pointer & transformContainer);
+  virtual void SetInput(const ITransformContainer::Pointer& transformContainer);
   DecoratorType* GetOutput();
 
 protected:
@@ -83,7 +83,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   void CreateTransform(ITKTransformPointer& ptr, const std::string& ClassName);
   using Superclass::SetInput;
 };
-} // end of itk namespace
+} // namespace itk
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkDream3DITransformContainerToTransform.hxx"
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 5d21b636cd..94ff88775a 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,7 +40,8 @@
 
 namespace itk
 {
-template <typename ITKTransformType> class Dream3DTransformContainerToTransform : public ProcessObject
+template <typename ITKTransformType>
+class Dream3DTransformContainerToTransform : public ProcessObject
 {
 public:
   /** Standard class typedefs. */
@@ -73,7 +74,7 @@ template <typename ITKTransformType> class Dream3DTransformContainerToTransform
   Dream3DTransformContainerToTransform(const Dream3DTransformContainerToTransform&) = delete; // Copy Constructor Not Implemented
   void operator=(const Dream3DTransformContainerToTransform&) = delete;                       // Move assignment Not Implemented
 };
-} // end of itk namespace
+} // namespace itk
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkDream3DTransformContainerToTransform.hxx"
diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index b7b5889720..254b81d653 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -62,69 +62,69 @@ using FijiFileData = std::vector<FijiRowData>;
 
 class FijiConfigurationFileReader : public QObject
 {
-  public:
-    FijiFileData parseFijiConfigFile(const QString &configFilePath)
+public:
+  FijiFileData parseFijiConfigFile(const QString& configFilePath)
+  {
+    m_ErrorCondition = 0;
+    itk::FijiFileData fileData;
+
+    itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());
+    for(int i = 0; i < stageTiles.size(); i++)
     {
-      m_ErrorCondition = 0;
-      itk::FijiFileData fileData;
-
-      itk::TileLayout2D stageTiles = itk::ParseTileConfiguration2D(configFilePath.toStdString());
-      for (int i = 0; i < stageTiles.size(); i++)
+      auto tile2D = stageTiles[i];
+      FijiRowData rowData;
+      for(int j = 0; j < tile2D.size(); j++)
       {
-        auto tile2D = stageTiles[i];
-        FijiRowData rowData;
-        for (int j = 0; j < tile2D.size(); j++)
-        {
-          auto tile = tile2D[j];
-
-          QString imageFilePath = QString::fromStdString(tile.FileName);
-          QFileInfo fi(imageFilePath);
-          if (fi.isRelative())
-          {
-            QFileInfo configFi(configFilePath);
-            imageFilePath = configFi.path() + QDir::separator() + imageFilePath;
-          }
-
-          itk::FijiImageTileData imageTileData;
+        auto tile = tile2D[j];
 
-          imageTileData.filePath = imageFilePath;
+        QString imageFilePath = QString::fromStdString(tile.FileName);
+        QFileInfo fi(imageFilePath);
+        if(fi.isRelative())
+        {
+          QFileInfo configFi(configFilePath);
+          imageFilePath = configFi.path() + QDir::separator() + imageFilePath;
+        }
 
-          uint32_t coordsSize = tile.Position.GetPointDimension();
-          if (coordsSize != 2)
-          {
-            m_ErrorMessage = QObject::tr("The dimension size of all tiles in the fiji config file must be equal to 2.");
-            m_ErrorCondition = -2004;
-            return itk::FijiFileData();
-          }
+        itk::FijiImageTileData imageTileData;
 
-          imageTileData.coords = QPointF(tile.Position[0], tile.Position[1]);
-          imageTileData.row = i;
-          imageTileData.col = j;
+        imageTileData.filePath = imageFilePath;
 
-          rowData.push_back(imageTileData);
+        uint32_t coordsSize = tile.Position.GetPointDimension();
+        if(coordsSize != 2)
+        {
+          m_ErrorMessage = QObject::tr("The dimension size of all tiles in the fiji config file must be equal to 2.");
+          m_ErrorCondition = -2004;
+          return itk::FijiFileData();
         }
 
-        fileData.push_back(rowData);
+        imageTileData.coords = QPointF(tile.Position[0], tile.Position[1]);
+        imageTileData.row = i;
+        imageTileData.col = j;
+
+        rowData.push_back(imageTileData);
       }
 
-      return fileData;
+      fileData.push_back(rowData);
     }
 
-    int getErrorCode()
-    {
-      return m_ErrorCondition;
-    }
+    return fileData;
+  }
 
-    QString getErrorMessage()
-    {
-      return m_ErrorMessage;
-    }
+  int getErrorCode()
+  {
+    return m_ErrorCondition;
+  }
+
+  QString getErrorMessage()
+  {
+    return m_ErrorMessage;
+  }
 
-  private:
-    int m_ErrorCondition;
-    QString m_ErrorMessage;
+private:
+  int m_ErrorCondition;
+  QString m_ErrorMessage;
 };
-}
+} // namespace itk
 
 //#ifndef ITK_MANUAL_INSTANTIATION
 //#include "itkFijiConfigurationFileReader.cpp"
diff --git a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
index 0b60b7cf3f..d4233d28ec 100644
--- a/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
+++ b/Source/SIMPLib/ITK/itkGetComponentsDimensions.h
@@ -40,55 +40,64 @@
 namespace ITKDream3DHelper
 {
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(PixelType*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(PixelType*)
 {
   return {1};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 36>*)
 {
   return {36};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 3>*)
 {
   return {3};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 2>*)
 {
   return {2};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 4>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 4>*)
 {
   return {4};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 11>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 11>*)
 {
   return {11};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 10>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::Vector<PixelType, 10>*)
 {
   return {10};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::RGBPixel<PixelType>*)
 {
   return {3};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions_impl(itk::RGBAPixel<PixelType>*)
 {
   return {4};
 }
 
-template <class PixelType> std::vector<size_t> GetComponentsDimensions()
+template <class PixelType>
+std::vector<size_t> GetComponentsDimensions()
 {
   return GetComponentsDimensions_impl(static_cast<PixelType*>(0));
 }
 
 } // namespace ITKDream3DHelper
-
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 691207facf..b928a543e9 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -49,25 +49,20 @@ class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 //
 // -----------------------------------------------------------------------------
 template <typename TComponent>
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, const itk::ImageIOBase::Pointer& imageIO, const QString& filename, bool dataCheck)
 {
   const uint32_t dimensions = imageIO->GetNumberOfDimensions();
   switch(dimensions)
   {
-  case 1:
-  {
+  case 1: {
     readImage<TComponent, 1>(dataArrayPath, imageIO, filename, dataCheck);
     break;
   }
-  case 2:
-  {
+  case 2: {
     readImage<TComponent, 2>(dataArrayPath, imageIO, filename, dataCheck);
     break;
   }
-  default:
-  {
+  default: {
     readImage<TComponent, 3>(dataArrayPath, imageIO, filename, dataCheck);
     break;
   }
@@ -169,9 +164,7 @@ void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void
-ITK_IMAGE_READER_CLASS_NAME
-::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
+void ITK_IMAGE_READER_CLASS_NAME ::readImage(const DataArrayPath& dataArrayPath, bool dataCheck)
 {
   try
   {
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.h b/Source/SIMPLib/ITK/itkImageReaderHelper.h
index 469200f242..f8caf2a83c 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.h
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.h
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 
 #pragma once
diff --git a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
index 771e462e4e..98447cac5b 100644
--- a/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
+++ b/Source/SIMPLib/ITK/itkImportDream3DImageContainer.h
@@ -45,7 +45,8 @@ namespace itk
  * \ingroup ITKCommon
  */
 
-template <typename TElementIdentifier, typename TElement> class ImportDream3DImageContainer : public ImportImageContainer<TElementIdentifier, TElement>
+template <typename TElementIdentifier, typename TElement>
+class ImportDream3DImageContainer : public ImportImageContainer<TElementIdentifier, TElement>
 {
 public:
   /** Standard class typedefs. */
@@ -91,4 +92,3 @@ template <typename TElementIdentifier, typename TElement> class ImportDream3DIma
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkImportDream3DImageContainer.hxx"
 #endif
-
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 609b04af39..2863b5b786 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -39,7 +39,7 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType,
   using ValueType = typename itk::NumericTraits<PixelType>::ValueType;
   using DataArrayPixelType = typename ::DataArray<ValueType>;
   using Superclass = typename itk::ImageSource<ImageType>;
-  //using SizeValueType = typename itk::SizeValueType;
+  // using SizeValueType = typename itk::SizeValueType;
 
   /** Method for creation through the object factory. */
   itkNewMacro(Self);
@@ -89,4 +89,3 @@ class InPlaceDream3DDataToImageFilter : public ImageSource<itk::Image<PixelType,
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkInPlaceDream3DDataToImageFilter.hxx"
 #endif
-
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index 48380472b1..7b267589ba 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -20,8 +20,6 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/ITK/itkSupportConstants.h"
 
-
-
 namespace itk
 {
 template <typename PixelType, unsigned int VDimension>
diff --git a/Source/SIMPLib/ITK/itkReadImageImpl.hpp b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
index 4a32629aa4..808568a350 100644
--- a/Source/SIMPLib/ITK/itkReadImageImpl.hpp
+++ b/Source/SIMPLib/ITK/itkReadImageImpl.hpp
@@ -52,7 +52,8 @@
  * @brief This is a private implementation for the filter that handles the actual algorithm implementation details
  * for us like figuring out if we can use this private implementation with the data array that is assigned.
  */
-template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
+template <typename PixelType, typename AbstractFilter>
+class ItkReadImagePrivate
 {
 public:
   typedef DataArray<PixelType> DataArrayType;
@@ -94,8 +95,7 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
     // read based on pixel type
     switch(pixelType)
     {
-    case itk::ImageIOBase::SCALAR:
-    {
+    case itk::ImageIOBase::SCALAR: {
       typedef itk::Image<PixelType, ImageProcessingConstants::ImageDimension> ImageType;
       typedef itk::ImageFileReader<ImageType> ReaderType;
       typename ReaderType::Pointer reader = ReaderType::New();
@@ -105,8 +105,7 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
     }
     break;
 
-    case itk::ImageIOBase::RGB:
-    {
+    case itk::ImageIOBase::RGB: {
       typedef itk::Image<itk::RGBPixel<PixelType>, ImageProcessingConstants::ImageDimension> ImageType;
       typedef itk::ImageFileReader<ImageType> ReaderType;
       typename ReaderType::Pointer reader = ReaderType::New();
@@ -116,8 +115,7 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
     }
     break;
 
-    case itk::ImageIOBase::RGBA:
-    {
+    case itk::ImageIOBase::RGBA: {
       typedef itk::Image<itk::RGBAPixel<PixelType>, ImageProcessingConstants::ImageDimension> ImageType;
       typedef itk::ImageFileReader<ImageType> ReaderType;
       typename ReaderType::Pointer reader = ReaderType::New();
@@ -168,4 +166,3 @@ template <typename PixelType, typename AbstractFilter> class ItkReadImagePrivate
   ItkReadImagePrivate(const ItkReadImagePrivate&); // Copy Constructor Not Implemented
   void operator=(const ItkReadImagePrivate&);      // Move assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/ITK/itkTemplateUtilities.h b/Source/SIMPLib/ITK/itkTemplateUtilities.h
index fd22b7b0aa..e054e03701 100644
--- a/Source/SIMPLib/ITK/itkTemplateUtilities.h
+++ b/Source/SIMPLib/ITK/itkTemplateUtilities.h
@@ -34,4 +34,3 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
-
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index ff73f6c34c..ceca342112 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +41,8 @@
 
 namespace itk
 {
-template <typename TParametersValueType, unsigned int CompositeNDimensions> class TransformToDream3DITransformContainer : public ProcessObject
+template <typename TParametersValueType, unsigned int CompositeNDimensions>
+class TransformToDream3DITransformContainer : public ProcessObject
 {
 public:
   /** Standard class typedefs. */
@@ -56,7 +57,7 @@ template <typename TParametersValueType, unsigned int CompositeNDimensions> clas
   itkNewMacro(Self);
   itkTypeMacro(TransformToDream3DITransform, ProcessObject);
 
-  virtual void SetInput(const ITKTransformType * transform);
+  virtual void SetInput(const ITKTransformType* transform);
   DecoratorType* GetOutput();
 
 protected:
@@ -73,10 +74,10 @@ template <typename TParametersValueType, unsigned int CompositeNDimensions> clas
   TransformToDream3DITransformContainer(const TransformToDream3DITransformContainer&) = delete; // Copy Constructor Not Implemented
   void operator=(const TransformToDream3DITransformContainer&) = delete;                        // Move assignment Not Implemented
 
-  void GenerateData(::ITransformContainer::Pointer& iTransformContainer, const ITKTransformType * transform);
+  void GenerateData(::ITransformContainer::Pointer& iTransformContainer, const ITKTransformType* transform);
   using Superclass::SetInput;
 };
-} // end of itk namespace
+} // namespace itk
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkTransformToDream3DITransformContainer.hxx"
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
index 5eb71b9b45..fcc6603af5 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +41,8 @@
 
 namespace itk
 {
-template <typename ITKTransformType> class TransformToDream3DTransformContainer : public ProcessObject
+template <typename ITKTransformType>
+class TransformToDream3DTransformContainer : public ProcessObject
 {
 public:
   /** Standard class typedefs. */
@@ -55,7 +56,7 @@ template <typename ITKTransformType> class TransformToDream3DTransformContainer
   itkNewMacro(Self);
   itkTypeMacro(TransformToDream3DTransformContainer, ProcessObject);
 
-  virtual void SetInput(const ITKTransformType * transform);
+  virtual void SetInput(const ITKTransformType* transform);
   DecoratorType* GetOutput();
 
 protected:
@@ -73,7 +74,7 @@ template <typename ITKTransformType> class TransformToDream3DTransformContainer
   void operator=(const TransformToDream3DTransformContainer&) = delete;                       // Move assignment Not Implemented
   using Superclass::SetInput;
 };
-} // end of itk namespace
+} // namespace itk
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #include "itkTransformToDream3DTransformContainer.hxx"
diff --git a/Source/SIMPLib/Math/ArrayHelpers.hpp b/Source/SIMPLib/Math/ArrayHelpers.hpp
old mode 100755
new mode 100644
index 3e7de91f36..2c863075d4
--- a/Source/SIMPLib/Math/ArrayHelpers.hpp
+++ b/Source/SIMPLib/Math/ArrayHelpers.hpp
@@ -15,7 +15,7 @@
  * the [] operators, size() functions.
  * @param K The POD type such as float or double.
  */
-template<typename T, typename K>
+template <typename T, typename K>
 class ArrayHelpers
 {
 public:
@@ -30,144 +30,151 @@ class ArrayHelpers
     }
   }
 
-    static T multiply(const T& a, const T& b)
+  static T multiply(const T& a, const T& b)
+  {
+    T c(a.size());
+    for(size_t i = 0; i < c.size(); i++)
     {
-      T c(a.size());
-      for(size_t i = 0; i < c.size(); i++)
-      {
-        c[i] = a[i] * b[i];
-      }
-      return c;
+      c[i] = a[i] * b[i];
     }
+    return c;
+  }
 
-    static T multiply(const T& a, const T& b, size_t max)
+  static T multiply(const T& a, const T& b, size_t max)
+  {
+    T c(max);
+    for(size_t i = 0; i < max; i++)
     {
-      T c(max);
-      for(size_t i = 0; i < max; i++)
-      {
-        c[i] = a[i] * b[i];
-      }
-      return c;
+      c[i] = a[i] * b[i];
     }
+    return c;
+  }
 
-    static void scalarMultiply(T& a, K b)
+  static void scalarMultiply(T& a, K b)
+  {
+    size_t size = a.size();
+    for(size_t i = 0; i < size; i++)
     {
-      size_t size = a.size();
-      for(size_t i = 0; i < size; i++)
-      {
-        a[i] = a[i] * b;
-      }
+      a[i] = a[i] * b;
     }
+  }
 
-    static void scalarDivide(T& a, K b)
+  static void scalarDivide(T& a, K b)
+  {
+    size_t size = a.size();
+    for(size_t i = 0; i < size; i++)
     {
-      size_t size = a.size();
-      for(size_t i = 0; i < size; i++)
-      {
-        a[i] = a[i] / b;
-      }
+      a[i] = a[i] / b;
     }
+  }
 
-
-    static K sum(const T& a)
+  static K sum(const T& a)
+  {
+    K s = static_cast<K>(0);
+    for(size_t i = 0; i < a.size(); i++)
     {
-      K s = static_cast<K>(0);
-      for(size_t i = 0; i < a.size(); i++)
-      {
-        s += a[i];
-      }
-      return s;
+      s += a[i];
     }
+    return s;
+  }
 
-
-    static K sum(const T& a, size_t max)
+  static K sum(const T& a, size_t max)
+  {
+    K s = static_cast<K>(0);
+    for(size_t i = 0; i < max; i++)
     {
-      K s = static_cast<K>(0);
-      for(size_t i = 0; i < max; i++)
-      {
-        s += a[i];
-      }
-      return s;
+      s += a[i];
     }
+    return s;
+  }
 
-    static K sumofSquares(const T& a)
+  static K sumofSquares(const T& a)
+  {
+    K s = static_cast<K>(0);
+    for(size_t i = 0; i < a.size(); i++)
     {
-      K s = static_cast<K>(0);
-      for(size_t i = 0; i < a.size(); i++)
-      {
-        s += a[i] * a[i];
-      }
-      return s;
+      s += a[i] * a[i];
     }
+    return s;
+  }
 
-    static K maxval(const T& a)
+  static K maxval(const T& a)
+  {
+    K s = a[0];
+    for(size_t i = 1; i < a.size(); i++)
     {
-      K s = a[0];
-      for(size_t i = 1; i < a.size(); i++)
+      if(a[i] > s)
       {
-        if (a[i] > s) { s = a[i]; }
+        s = a[i];
       }
-      return s;
     }
+    return s;
+  }
 
-    static T absValue(const T& a)
+  static T absValue(const T& a)
+  {
+    T c(a.size());
+    for(size_t i = 0; i < c.size(); i++)
     {
-      T c(a.size());
-      for(size_t i = 0; i < c.size(); i++)
-      {
-        c[i] = (a[i] < 0.0 ? -a[i] : a[i]);
-      }
-      return c;
+      c[i] = (a[i] < 0.0 ? -a[i] : a[i]);
     }
+    return c;
+  }
 
-    /* Auxiliary routine: printing eigenvectors */
-    static void print_eigenvectors( const char* desc, int n, float* wi, float* v, int ldv )
+  /* Auxiliary routine: printing eigenvectors */
+  static void print_eigenvectors(const char* desc, int n, float* wi, float* v, int ldv)
+  {
+    int i, j;
+    printf("\n %s\n", desc);
+    for(i = 0; i < n; i++)
     {
-      int i, j;
-      printf( "\n %s\n", desc );
-      for( i = 0; i < n; i++ )
+      j = 0;
+      while(j < n)
       {
-        j = 0;
-        while( j < n )
+        if(wi[j] == (float)0.0)
+        {
+          printf(" %6.2f", v[i + j * ldv]);
+          j++;
+        }
+        else
         {
-          if( wi[j] == (float)0.0 )
-          {
-            printf( " %6.2f", v[i + j * ldv] );
-            j++;
-          }
-          else
-          {
-            printf( " (%6.2f,%6.2f)", v[i + j * ldv], v[i + (j + 1)*ldv] );
-            printf( " (%6.2f,%6.2f)", v[i + j * ldv], -v[i + (j + 1)*ldv] );
-            j += 2;
-          }
+          printf(" (%6.2f,%6.2f)", v[i + j * ldv], v[i + (j + 1) * ldv]);
+          printf(" (%6.2f,%6.2f)", v[i + j * ldv], -v[i + (j + 1) * ldv]);
+          j += 2;
         }
-        printf( "\n" );
       }
+      printf("\n");
     }
+  }
 
-    /**
-     * @brief print
-     * @param c
-     * @param out
-     */
-    static void print(const T& c, std::ostream &out)
+  /**
+   * @brief print
+   * @param c
+   * @param out
+   */
+  static void print(const T& c, std::ostream& out)
+  {
+    out.width(16);
+    for(size_t i = 0; i < c.size(); i++)
     {
-      out.width(16);
-      for(size_t i = 0; i < c.size(); i++)
+      out << std::fixed << std::setprecision(16) << c[i];
+      if(i < c.size() - 1)
       {
-        out << std::fixed << std::setprecision( 16 ) << c[i];
-        if(i < c.size() - 1) { out << " "; }
-        if (i == c.size() - 1) { out << std::endl; }
+        out << " ";
+      }
+      if(i == c.size() - 1)
+      {
+        out << std::endl;
       }
     }
+  }
 
+protected:
+  ArrayHelpers()
+  {
+  }
 
-  protected:
-    ArrayHelpers(){}
-
-  private:
-    ArrayHelpers(const ArrayHelpers&); // Copy Constructor Not Implemented
-    void operator=(const ArrayHelpers&); // Move assignment Not Implemented
+private:
+  ArrayHelpers(const ArrayHelpers&);   // Copy Constructor Not Implemented
+  void operator=(const ArrayHelpers&); // Move assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index c5a7167e5d..0d9284e79f 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "GeometryMath.h"
 
@@ -657,7 +657,10 @@ void GeometryMath::FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId,
 void GeometryMath::FindPolygonNormal(const float* vertices, const int64_t numVerts, float n[3])
 {
   // Return immediately if the  number of vertices cannot form a polygon
-  if(numVerts < 3) { return; }
+  if(numVerts < 3)
+  {
+    return;
+  }
 
   // If the polygon is a triangle, then just compute its normal using simple cross product
   if(numVerts == 3)
@@ -877,28 +880,28 @@ char GeometryMath::RayIntersectsPlane(const float* a, const float* b, const floa
       return 'p';
     }
 
-      return '0';
+    return '0';
   }
 
-    t = num / denom;
-    for(int i = 0; i < 3; i++)
-    {
-      p[i] = q[i] + (t * (r[i] - q[i]));
-    }
-    if(t > 0.0 && t < 1.0)
-    {
-      return '1';
-    }
-    if(num == 0.0)
-    {
-      return 'q';
-    }
-    if(num == denom)
-    {
-      return 'r';
-    }
+  t = num / denom;
+  for(int i = 0; i < 3; i++)
+  {
+    p[i] = q[i] + (t * (r[i] - q[i]));
+  }
+  if(t > 0.0 && t < 1.0)
+  {
+    return '1';
+  }
+  if(num == 0.0)
+  {
+    return 'q';
+  }
+  if(num == denom)
+  {
+    return 'r';
+  }
 
-      return '0';
+  return '0';
 }
 
 // -----------------------------------------------------------------------------
@@ -922,28 +925,28 @@ char GeometryMath::RayIntersectsPlane(const float* n, const float d, const float
       return 'p';
     }
 
-      return '0';
+    return '0';
   }
 
-    t = num / denom;
-    for(int i = 0; i < 3; i++)
-    {
-      p[i] = q[i] + (t * (r[i] - q[i]));
-    }
-    if(t > 0.0 && t < 1.0)
-    {
-      return '1';
-    }
-    if(num == 0.0)
-    {
-      return 'q';
-    }
-    if(num == denom)
-    {
-      return 'r';
-    }
+  t = num / denom;
+  for(int i = 0; i < 3; i++)
+  {
+    p[i] = q[i] + (t * (r[i] - q[i]));
+  }
+  if(t > 0.0 && t < 1.0)
+  {
+    return '1';
+  }
+  if(num == 0.0)
+  {
+    return 'q';
+  }
+  if(num == denom)
+  {
+    return 'r';
+  }
 
-      return '0';
+  return '0';
 }
 
 // -----------------------------------------------------------------------------
@@ -1045,8 +1048,7 @@ char GeometryMath::RayCrossesTriangle(const float* a, const float* b, const floa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll,
-                                     const float* ur, float radius)
+char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius)
 {
   float ray[3]; /* Ray */
   float r[3];   /* Ray endpoint. */
@@ -1128,14 +1130,14 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
     return 'i';
   }
 
-    return 'o';
+  return 'o';
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll,
-                                     const float* ur, float radius, float& distToBoundary)
+char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius,
+                                     float& distToBoundary)
 {
   float ray[3] = {0.0f, 0.0f, 0.0f}; /* Ray */
   float r[3] = {0.0f, 0.0f, 0.0f};   /* Ray endpoint. */
@@ -1229,7 +1231,7 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
     return 'i';
   }
 
-    return 'o';
+  return 'o';
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
old mode 100755
new mode 100644
index 013f04068b..94ab719587
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
@@ -55,340 +53,326 @@ class TriangleGeom;
  */
 class SIMPLib_EXPORT GeometryMath
 {
-  public:
-    using Self = GeometryMath;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for GeometryMath
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for GeometryMath
-     */
-    static QString ClassName();
-
-    virtual ~GeometryMath();
-
-    /**
-     * @brief Calculates the Cosine of the angle between 2 vectors. To get the actual angle the programmer should
-     * use the following form: float radians = acos(GeometryMath::CosThetaBetweenVectors(a, b));
-     * @param a 1x3 Vector
-     * @param b 1x3 Vector
-     * @return
-     */
-    static float CosThetaBetweenVectors(const float a[3], const float b[3]);
-    static double CosThetaBetweenVectors(const double a[3], const double b[3]);
-
-    /**
-     * @brief Computes the angle in RADIANS between 2 vectors.
-     * @param a
-     * @param b
-     * @return
-     */
-    static float AngleBetweenVectors(const float a[3], const float b[3]);
-
-    /**
-     * @brief Computes the area of a triangle defined by 3 points.
-     * @param a
-     * @param b
-     * @param distance
-     * @return
-     */
-    static void FindDistanceBetweenPoints(const float a[3], const float b[3], float& distance);
-
-    /**
-     * @brief Computes the area of a triangle defined by 3 points.
-     * @param a
-     * @param b
-     * @param c
-     * @param area
-     * @return
-     */
-    static void FindTriangleArea(const float a[3], const float b[3], const float c[3], float& area);
-
-    /**
-     * @brief Computes the volume of a tetrahedron defined by 4 points.
-     * @param a
-     * @param b
-     * @param c
-     * @param d
-     * @param volume
-     * @return
-     */
-    static void FindTetrahedronVolume(const float a[3], const float b[3], const float c[3], const float d[3], float& volume);
-
-    /**
-     * @brief Generic function to compute the normal of a planar polygon embedded in 3D.
-     * This functions will consistently handle concave polygons.
-     * @param vertices
-     * @param numVerts
-     * @param n
-     */
-    static void FindPolygonNormal(const float* vertices, const int64_t numVerts, float n[3]);
-
-    /**
-     * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
-     * @param a
-     * @param b
-     * @param c
-     * @param n
-     * @return
-     */
-    static void FindPlaneNormalVector(const float a[3], const float b[3], const float c[3], float n[3]);
-
-    /**
-     * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
-     * @param a
-     * @param b
-     * @param c
-     * @param n
-     * @return
-     */
-    static void FindPlaneNormalVector(const double a[3], const double b[3], const double c[3], double n[3]);
-
-    /**
-     * @brief Computes the coefficients of a plane containing 3 points (AB X AC).
-     * @param a
-     * @param b
-     * @param c
-     * @param n 1x3 Vector
-     * @param d float
-     * @return
-     */
-    static void FindPlaneCoefficients(const float a[3], const float b[3], const float c[3], float n[3], float& d);
-
-    /**
-    * @brief Computes the distance of a point from the centroid of a triangle defined by 3 points
-    * @param q
-    * @param a
-    * @param b
-    * @param c
-    * @param distance
-    * @return
-    */
-    static void FindDistanceToTriangleCentroid(const float* a, const float* b, const float* c, const float* q, float& distance);
-
-    /**
-    * @brief Computes the distance of a point from a plane.
-    * @param q
-    * @param n 1x3 Vector
-    * @param d float
-    * @param distance float
-    * @return
-    */
-    static void FindDistanceFromPlane(const float* q, float n[3], float d, float& distance);
-
-    /**
-     * @brief Determines if a point is inside of a box defined by the lower left and upper right corners
-     * @param p
-     * @param ll
-     * @param ur
-     * @return
-     */
-    static bool PointInBox(const float p[3], const float ll[3], const float ur[3]);
-
-    /**
-     * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-     * @param p
-     * @param lowerLeft
-     * @param upperRight
-     * @param radius
-     * @return
-     */
-    static char PointInPolyhedron(TriangleGeom* faces,
-                                  const Int32Int32DynamicListArray::ElementList& faceIds,
-                                  VertexGeom* faceBBs,
-                                  const float* q,
-                                  const float* ll,
-                                  const float* ur,
-                                  float radius);
-
-    /**
-    * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-    * @param p
-    * @param lowerLeft
-    * @param upperRight
-    * @param radius
-    * @param distToBoundary
-    * @return
-    */
-    static char PointInPolyhedron(TriangleGeom* faces,
-                                  const Int32Int32DynamicListArray::ElementList& faceIds,
-                                  VertexGeom* faceBBs,
-                                  const float* q,
-                                  const float* ll,
-                                  const float* ur,
-                                  float radius,
-                                  float& distToBoundary);
-
-    /**
-       * @brief Determines if a point is inside of a triangle defined by 3 points
-       * @param a
-       * @param b
-       * @param c
-       * @param m int
-       * @param p
-       * @return
-       */
-    static char PointInTriangle3D(const float* a, const float* b, const float* c, int m, const float* p);
-
-    /**
-     * @brief Determines if a point is inside of a triangle defined by 3 points
-     * @param a
-     * @param b
-     * @param c
-     * @param p
-     * @return
-     */
-    static char PointInTriangle2D(const float* a, const float* b, const float* c, const float* p);
-
-    /**
-     * @brief Determines if a segment between two points intersects a box defined by the lower left and upper right corners
-     * @param p
-     * @param q
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static bool RayIntersectsBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
-
-    /**
-     * @brief FindRayIntersectionsWithSphere
-     * @param p
-     * @param R
-     * @param length
-     * @param c
-     * @param radius
-     * @param t1
-     * @param t2
-     * @return
-     */
-    static bool FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2);
-
-    /**
-     * @brief Determines length of a segment between two points that lies within a box defined by the lower left and upper right corners
-     * @param p
-     * @param q
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static float LengthOfRayInBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
-
-    /**
-     * @brief Creates a randomly oriented ray of given length
-     * @param length float
-     * @param ray 1x3 Vector
-     * @return
-     */
-    static void GenerateRandomRay(float length, float ray[3]);
-
-    /**
-     * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-     * @param verts pointer to vertex array
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static void FindBoundingBoxOfVertices(VertexGeom* verts, float* lowerLeft, float* upperRight);
-
-    /**
-     * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-     * @param verts pointer to vertex array
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static void FindBoundingBoxOfFace(TriangleGeom* faces, int faceId, float* lowerLeft, float* upperRight);
-
-    /**
-     * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-     * @param verts pointer to vertex array
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static void FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId, float g[3][3], float* lowerLeft, float* upperRight);
-
-    /**
-     * @brief Determines the bounding box defined by the lower left and upper right corners of a set of faces
-     * @param faces pointer to face array
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static void FindBoundingBoxOfFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float* lowerLeft, float* upperRight);
-
-    /**
-     * @brief Determines the bounding box defined by the lower left and upper right corners of a set of rotated faces
-     * @param faces pointer to face array
-     * param g
-     * @param lowerLeft
-     * @param upperRight
-     * @return
-     */
-    static void FindBoundingBoxOfRotatedFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float g[3][3], float* lowerLeft, float* upperRight);
-
-    /**
-     * @brief Determines if a segment between two points intersects a triangle defined by 3 points
-     * @param q
-     * @param r
-     * @param a
-     * @param b
-     * @param c
-     * @param p
-     * @return
-     */
-    static char RayIntersectsTriangle(const float* a, const float* b, const float* c, const float* q, const float* r, float* p);
-
-    /**
-     * @brief Determines if a segment between two points crosses a triangle defined by 3 points
-     * @param q
-     * @param r
-     * @param a
-     * @param b
-     * @param c
-     * @return
-     */
-    static char RayCrossesTriangle(const float* a, const float* b, const float* c, const float* q, const float* r);
-
-    /**
-     * @brief Determines if a segment between two points intersects a plane defined by 3 points
-     * @param q
-     * @param r
-     * @param a
-     * @param b
-     * @param c
-     * @param p
-     * @return
-     */
-    static char RayIntersectsPlane(const float* a, const float* b, const float* c, const float* q, const float* r, float* p, int& m);
-
-    /**
-    * @brief Determines if a segment between two points intersects a plane defined by a normal and distance
-    * @param n
-    * @param d
-    * @param q
-    * @param r
-    * @param p
-    * @return
-    */
-    static char RayIntersectsPlane(const float* n, const float d, const float* q, const float* r, float* p);
-
-  protected:
-    GeometryMath();
-
-  public:
-    GeometryMath(const GeometryMath&) = delete;   // Copy Constructor Not Implemented
-    GeometryMath(GeometryMath&&) = delete;        // Move Constructor Not Implemented
-    GeometryMath& operator=(const GeometryMath&) = delete; // Copy Assignment Not Implemented
-    GeometryMath& operator=(GeometryMath&&) = delete;      // Move Assignment Not Implemented
-  private:
+public:
+  using Self = GeometryMath;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for GeometryMath
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for GeometryMath
+   */
+  static QString ClassName();
+
+  virtual ~GeometryMath();
+
+  /**
+   * @brief Calculates the Cosine of the angle between 2 vectors. To get the actual angle the programmer should
+   * use the following form: float radians = acos(GeometryMath::CosThetaBetweenVectors(a, b));
+   * @param a 1x3 Vector
+   * @param b 1x3 Vector
+   * @return
+   */
+  static float CosThetaBetweenVectors(const float a[3], const float b[3]);
+  static double CosThetaBetweenVectors(const double a[3], const double b[3]);
+
+  /**
+   * @brief Computes the angle in RADIANS between 2 vectors.
+   * @param a
+   * @param b
+   * @return
+   */
+  static float AngleBetweenVectors(const float a[3], const float b[3]);
+
+  /**
+   * @brief Computes the area of a triangle defined by 3 points.
+   * @param a
+   * @param b
+   * @param distance
+   * @return
+   */
+  static void FindDistanceBetweenPoints(const float a[3], const float b[3], float& distance);
+
+  /**
+   * @brief Computes the area of a triangle defined by 3 points.
+   * @param a
+   * @param b
+   * @param c
+   * @param area
+   * @return
+   */
+  static void FindTriangleArea(const float a[3], const float b[3], const float c[3], float& area);
+
+  /**
+   * @brief Computes the volume of a tetrahedron defined by 4 points.
+   * @param a
+   * @param b
+   * @param c
+   * @param d
+   * @param volume
+   * @return
+   */
+  static void FindTetrahedronVolume(const float a[3], const float b[3], const float c[3], const float d[3], float& volume);
+
+  /**
+   * @brief Generic function to compute the normal of a planar polygon embedded in 3D.
+   * This functions will consistently handle concave polygons.
+   * @param vertices
+   * @param numVerts
+   * @param n
+   */
+  static void FindPolygonNormal(const float* vertices, const int64_t numVerts, float n[3]);
+
+  /**
+   * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
+   * @param a
+   * @param b
+   * @param c
+   * @param n
+   * @return
+   */
+  static void FindPlaneNormalVector(const float a[3], const float b[3], const float c[3], float n[3]);
+
+  /**
+   * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
+   * @param a
+   * @param b
+   * @param c
+   * @param n
+   * @return
+   */
+  static void FindPlaneNormalVector(const double a[3], const double b[3], const double c[3], double n[3]);
+
+  /**
+   * @brief Computes the coefficients of a plane containing 3 points (AB X AC).
+   * @param a
+   * @param b
+   * @param c
+   * @param n 1x3 Vector
+   * @param d float
+   * @return
+   */
+  static void FindPlaneCoefficients(const float a[3], const float b[3], const float c[3], float n[3], float& d);
+
+  /**
+   * @brief Computes the distance of a point from the centroid of a triangle defined by 3 points
+   * @param q
+   * @param a
+   * @param b
+   * @param c
+   * @param distance
+   * @return
+   */
+  static void FindDistanceToTriangleCentroid(const float* a, const float* b, const float* c, const float* q, float& distance);
+
+  /**
+   * @brief Computes the distance of a point from a plane.
+   * @param q
+   * @param n 1x3 Vector
+   * @param d float
+   * @param distance float
+   * @return
+   */
+  static void FindDistanceFromPlane(const float* q, float n[3], float d, float& distance);
+
+  /**
+   * @brief Determines if a point is inside of a box defined by the lower left and upper right corners
+   * @param p
+   * @param ll
+   * @param ur
+   * @return
+   */
+  static bool PointInBox(const float p[3], const float ll[3], const float ur[3]);
+
+  /**
+   * @brief Determines if a point is inside of a polyhedron defined by a set of faces
+   * @param p
+   * @param lowerLeft
+   * @param upperRight
+   * @param radius
+   * @return
+   */
+  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius);
+
+  /**
+   * @brief Determines if a point is inside of a polyhedron defined by a set of faces
+   * @param p
+   * @param lowerLeft
+   * @param upperRight
+   * @param radius
+   * @param distToBoundary
+   * @return
+   */
+  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius,
+                                float& distToBoundary);
+
+  /**
+   * @brief Determines if a point is inside of a triangle defined by 3 points
+   * @param a
+   * @param b
+   * @param c
+   * @param m int
+   * @param p
+   * @return
+   */
+  static char PointInTriangle3D(const float* a, const float* b, const float* c, int m, const float* p);
+
+  /**
+   * @brief Determines if a point is inside of a triangle defined by 3 points
+   * @param a
+   * @param b
+   * @param c
+   * @param p
+   * @return
+   */
+  static char PointInTriangle2D(const float* a, const float* b, const float* c, const float* p);
+
+  /**
+   * @brief Determines if a segment between two points intersects a box defined by the lower left and upper right corners
+   * @param p
+   * @param q
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static bool RayIntersectsBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
+
+  /**
+   * @brief FindRayIntersectionsWithSphere
+   * @param p
+   * @param R
+   * @param length
+   * @param c
+   * @param radius
+   * @param t1
+   * @param t2
+   * @return
+   */
+  static bool FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2);
+
+  /**
+   * @brief Determines length of a segment between two points that lies within a box defined by the lower left and upper right corners
+   * @param p
+   * @param q
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static float LengthOfRayInBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
+
+  /**
+   * @brief Creates a randomly oriented ray of given length
+   * @param length float
+   * @param ray 1x3 Vector
+   * @return
+   */
+  static void GenerateRandomRay(float length, float ray[3]);
+
+  /**
+   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+   * @param verts pointer to vertex array
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static void FindBoundingBoxOfVertices(VertexGeom* verts, float* lowerLeft, float* upperRight);
+
+  /**
+   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+   * @param verts pointer to vertex array
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static void FindBoundingBoxOfFace(TriangleGeom* faces, int faceId, float* lowerLeft, float* upperRight);
+
+  /**
+   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+   * @param verts pointer to vertex array
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static void FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId, float g[3][3], float* lowerLeft, float* upperRight);
+
+  /**
+   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of faces
+   * @param faces pointer to face array
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static void FindBoundingBoxOfFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float* lowerLeft, float* upperRight);
+
+  /**
+   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of rotated faces
+   * @param faces pointer to face array
+   * param g
+   * @param lowerLeft
+   * @param upperRight
+   * @return
+   */
+  static void FindBoundingBoxOfRotatedFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float g[3][3], float* lowerLeft, float* upperRight);
+
+  /**
+   * @brief Determines if a segment between two points intersects a triangle defined by 3 points
+   * @param q
+   * @param r
+   * @param a
+   * @param b
+   * @param c
+   * @param p
+   * @return
+   */
+  static char RayIntersectsTriangle(const float* a, const float* b, const float* c, const float* q, const float* r, float* p);
+
+  /**
+   * @brief Determines if a segment between two points crosses a triangle defined by 3 points
+   * @param q
+   * @param r
+   * @param a
+   * @param b
+   * @param c
+   * @return
+   */
+  static char RayCrossesTriangle(const float* a, const float* b, const float* c, const float* q, const float* r);
+
+  /**
+   * @brief Determines if a segment between two points intersects a plane defined by 3 points
+   * @param q
+   * @param r
+   * @param a
+   * @param b
+   * @param c
+   * @param p
+   * @return
+   */
+  static char RayIntersectsPlane(const float* a, const float* b, const float* c, const float* q, const float* r, float* p, int& m);
+
+  /**
+   * @brief Determines if a segment between two points intersects a plane defined by a normal and distance
+   * @param n
+   * @param d
+   * @param q
+   * @param r
+   * @param p
+   * @return
+   */
+  static char RayIntersectsPlane(const float* n, const float d, const float* q, const float* r, float* p);
+
+protected:
+  GeometryMath();
+
+public:
+  GeometryMath(const GeometryMath&) = delete;            // Copy Constructor Not Implemented
+  GeometryMath(GeometryMath&&) = delete;                 // Move Constructor Not Implemented
+  GeometryMath& operator=(const GeometryMath&) = delete; // Copy Assignment Not Implemented
+  GeometryMath& operator=(GeometryMath&&) = delete;      // Move Assignment Not Implemented
+private:
 };
-
-
diff --git a/Source/SIMPLib/Math/MatrixMath.cpp b/Source/SIMPLib/Math/MatrixMath.cpp
index 5f979c9d8e..e272c65ea1 100644
--- a/Source/SIMPLib/Math/MatrixMath.cpp
+++ b/Source/SIMPLib/Math/MatrixMath.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MatrixMath.h"
 
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.cpp b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
index 8efe337cc9..bbbef4fdce 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.cpp
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RadialDistributionFunction.h"
 
@@ -146,7 +146,7 @@ std::vector<float> RadialDistributionFunction::GenerateRandomDistribution(float
       }
     }
   }
-  
+
   // Normalize the frequencies
   for(size_t i = 0; i < current_num_bins + 1; i++)
   {
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.h b/Source/SIMPLib/Math/RadialDistributionFunction.h
old mode 100755
new mode 100644
index ce98ce9723..89617167fc
--- a/Source/SIMPLib/Math/RadialDistributionFunction.h
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,30 +46,27 @@
  */
 class SIMPLib_EXPORT RadialDistributionFunction
 {
-  public:
+public:
+  virtual ~RadialDistributionFunction();
 
-    virtual ~RadialDistributionFunction();
+  /**
+   * @brief GenerateRandomDistribution This will generate a random distribution
+   * binned up and normalized.
+   * @param minDistance The minimum distance between objects
+   * @param maxDistance The maximum distance between objects
+   * @param numBins The number of bins to generate
+   * @param boxdims
+   * @param boxres
+   * @return An array of values that are the frequency values for the histogram
+   */
+  static std::vector<float> GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::array<float, 3>& boxdims, std::array<float, 3>& boxres);
 
-    /**
-     * @brief GenerateRandomDistribution This will generate a random distribution
-     * binned up and normalized.
-     * @param minDistance The minimum distance between objects
-     * @param maxDistance The maximum distance between objects
-     * @param numBins The number of bins to generate
-     * @param boxdims
-     * @param boxres
-     * @return An array of values that are the frequency values for the histogram
-     */
-    static std::vector<float> GenerateRandomDistribution(float minDistance, float maxDistance, int numBins, std::array<float, 3>& boxdims, std::array<float, 3>& boxres);
+protected:
+  RadialDistributionFunction();
 
-  protected:
-    RadialDistributionFunction();
-
-  public:
-    RadialDistributionFunction(const RadialDistributionFunction&) = delete; // Copy Constructor Not Implemented
-    RadialDistributionFunction(RadialDistributionFunction&&) = delete;      // Move Constructor Not Implemented
-    RadialDistributionFunction& operator=(const RadialDistributionFunction&) = delete; // Copy Assignment Not Implemented
-    RadialDistributionFunction& operator=(RadialDistributionFunction&&) = delete;      // Move Assignment Not Implemented
+public:
+  RadialDistributionFunction(const RadialDistributionFunction&) = delete;            // Copy Constructor Not Implemented
+  RadialDistributionFunction(RadialDistributionFunction&&) = delete;                 // Move Constructor Not Implemented
+  RadialDistributionFunction& operator=(const RadialDistributionFunction&) = delete; // Copy Assignment Not Implemented
+  RadialDistributionFunction& operator=(RadialDistributionFunction&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Math/RdfData.cpp b/Source/SIMPLib/Math/RdfData.cpp
index 533b5e062e..809f7284dd 100644
--- a/Source/SIMPLib/Math/RdfData.cpp
+++ b/Source/SIMPLib/Math/RdfData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RdfData.h"
 
diff --git a/Source/SIMPLib/Math/RdfData.h b/Source/SIMPLib/Math/RdfData.h
index f6a17541d0..18fd03d1d6 100644
--- a/Source/SIMPLib/Math/RdfData.h
+++ b/Source/SIMPLib/Math/RdfData.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -50,140 +50,140 @@
  */
 class SIMPLib_EXPORT RdfData
 {
-  public:
-    using Self = RdfData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for RdfData
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for RdfData
-     */
-    static QString ClassName();
-
-    virtual ~RdfData();
-
-    /**
-     * @brief Setter property for Frequencies
-     */
-    void setFrequencies(const std::vector<float>& value);
-    /**
-     * @brief Getter property for Frequencies
-     * @return Value of Frequencies
-     */
-    std::vector<float> getFrequencies() const;
-
-    /**
-     * @brief Setter property for MinDistance
-     */
-    void setMinDistance(float value);
-    /**
-     * @brief Getter property for MinDistance
-     * @return Value of MinDistance
-     */
-    float getMinDistance() const;
-
-    /**
-     * @brief Setter property for MaxDistance
-     */
-    void setMaxDistance(float value);
-    /**
-     * @brief Getter property for MaxDistance
-     * @return Value of MaxDistance
-     */
-    float getMaxDistance() const;
-
-    /**
-     * @brief Setter property for NumberOfBins
-     */
-    void setNumberOfBins(int value);
-    /**
-     * @brief Getter property for NumberOfBins
-     * @return Value of NumberOfBins
-     */
-    int getNumberOfBins() const;
-
-    /**
-     * @brief Setter property for DistributionType
-     */
-    void setDistributionType(const QString& value);
-    /**
-     * @brief Getter property for DistributionType
-     * @return Value of DistributionType
-     */
-    QString getDistributionType() const;
-
-    /**
-     * @brief Setter property for BoxSize
-     */
-    void setBoxSize(const std::array<float, 3>& value);
-    /**
-     * @brief Setter property for BoxSize
-     */
-    void setBoxSize(float v0, float v1, float v2);
-    /**
-     * @brief Getter property for BoxSize
-     * @return Value of BoxSize
-     */
-    std::array<float, 3> getBoxSize() const;
-
-    /**
-     * @brief Setter property for BoxResolution
-     */
-    void setBoxResolution(const std::array<float, 3>& value);
-    /**
-     * @brief Setter property for BoxResolution
-     */
-    void setBoxResolution(float v0, float v1, float v2);
-    /**
-     * @brief Getter property for BoxResolution
-     * @return Value of BoxResolution
-     */
-    std::array<float, 3> getBoxResolution() const;
-
-    int getFrequencyCount();
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    Pointer deepCopy();
-
-    /**
-     * @brief readJson
-     * @param json
-     * @return
-     */
-    int readJson(const QJsonObject &json);
-
-    /**
-     * @brief writeJson
-     * @param json
-     * @return
-     */
-    int writeJson(QJsonObject &json);
-
-  protected:
-    RdfData();
-
-  private:
-    std::array<float, 3> m_BoxSize = {100.0f, 100.0f, 100.0f};
-    std::array<float, 3> m_BoxResolution{0.1f, 0.1f, 0.1f};
-
-    std::vector<float> m_Frequencies = {};
-    float m_MinDistance = 0.0f;
-    float m_MaxDistance = 0.0f;
-    int m_NumberOfBins = 50;
-    QString m_DistributionType = SIMPL::StringConstants::UnknownDistribution;
-
-    RdfData(const RdfData&) = delete;        // Copy Constructor Not Implemented
-    void operator=(const RdfData&) = delete; // Move assignment Not Implemented
+public:
+  using Self = RdfData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for RdfData
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for RdfData
+   */
+  static QString ClassName();
+
+  virtual ~RdfData();
+
+  /**
+   * @brief Setter property for Frequencies
+   */
+  void setFrequencies(const std::vector<float>& value);
+  /**
+   * @brief Getter property for Frequencies
+   * @return Value of Frequencies
+   */
+  std::vector<float> getFrequencies() const;
+
+  /**
+   * @brief Setter property for MinDistance
+   */
+  void setMinDistance(float value);
+  /**
+   * @brief Getter property for MinDistance
+   * @return Value of MinDistance
+   */
+  float getMinDistance() const;
+
+  /**
+   * @brief Setter property for MaxDistance
+   */
+  void setMaxDistance(float value);
+  /**
+   * @brief Getter property for MaxDistance
+   * @return Value of MaxDistance
+   */
+  float getMaxDistance() const;
+
+  /**
+   * @brief Setter property for NumberOfBins
+   */
+  void setNumberOfBins(int value);
+  /**
+   * @brief Getter property for NumberOfBins
+   * @return Value of NumberOfBins
+   */
+  int getNumberOfBins() const;
+
+  /**
+   * @brief Setter property for DistributionType
+   */
+  void setDistributionType(const QString& value);
+  /**
+   * @brief Getter property for DistributionType
+   * @return Value of DistributionType
+   */
+  QString getDistributionType() const;
+
+  /**
+   * @brief Setter property for BoxSize
+   */
+  void setBoxSize(const std::array<float, 3>& value);
+  /**
+   * @brief Setter property for BoxSize
+   */
+  void setBoxSize(float v0, float v1, float v2);
+  /**
+   * @brief Getter property for BoxSize
+   * @return Value of BoxSize
+   */
+  std::array<float, 3> getBoxSize() const;
+
+  /**
+   * @brief Setter property for BoxResolution
+   */
+  void setBoxResolution(const std::array<float, 3>& value);
+  /**
+   * @brief Setter property for BoxResolution
+   */
+  void setBoxResolution(float v0, float v1, float v2);
+  /**
+   * @brief Getter property for BoxResolution
+   * @return Value of BoxResolution
+   */
+  std::array<float, 3> getBoxResolution() const;
+
+  int getFrequencyCount();
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  Pointer deepCopy();
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  int readJson(const QJsonObject& json);
+
+  /**
+   * @brief writeJson
+   * @param json
+   * @return
+   */
+  int writeJson(QJsonObject& json);
+
+protected:
+  RdfData();
+
+private:
+  std::array<float, 3> m_BoxSize = {100.0f, 100.0f, 100.0f};
+  std::array<float, 3> m_BoxResolution{0.1f, 0.1f, 0.1f};
+
+  std::vector<float> m_Frequencies = {};
+  float m_MinDistance = 0.0f;
+  float m_MaxDistance = 0.0f;
+  int m_NumberOfBins = 50;
+  QString m_DistributionType = SIMPL::StringConstants::UnknownDistribution;
+
+  RdfData(const RdfData&) = delete;        // Copy Constructor Not Implemented
+  void operator=(const RdfData&) = delete; // Move assignment Not Implemented
 };
diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index 21ce62e3d7..38ebcbfc38 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLibMath.h"
 #include <limits>
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
old mode 100755
new mode 100644
index 66d7259895..c13af499dd
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 /** @file SIMPLibMath.h
@@ -40,28 +40,28 @@
  */
 
 #if defined(_MSC_VER)
-  /* [i_a] MSVC again: see the comment from Microsoft's math.h below (MSVC2005).
+/* [i_a] MSVC again: see the comment from Microsoft's math.h below (MSVC2005).
 
-     Other compilers may also lack M_PI / M_PI_2 which both are used in the
-     OpenEXR (test) code.
+   Other compilers may also lack M_PI / M_PI_2 which both are used in the
+   OpenEXR (test) code.
 
-     Microsoft says:
+   Microsoft says:
 
-         Define _USE_MATH_DEFINES before including math.h to expose these macro
-         definitions for common math constants.  These are placed under an #ifdef
-         since these commonly-defined names are not part of the C/C standards.
+       Define _USE_MATH_DEFINES before including math.h to expose these macro
+       definitions for common math constants.  These are placed under an #ifdef
+       since these commonly-defined names are not part of the C/C standards.
 
-     End of quote.
+   End of quote.
 
-     The other defines have been added for completeness sake (they exist on
-     BSD and Linux at least and other code may expect these).
+   The other defines have been added for completeness sake (they exist on
+   BSD and Linux at least and other code may expect these).
 
-     Microsoft doesn't define M_2PI ever, other compilers may lack some of these
-     too, hence the sequence as it is: load math.h, then see what's lacking still.
-  */
-  #ifndef _USE_MATH_DEFINES
-   #define _USE_MATH_DEFINES 1
-  #endif
+   Microsoft doesn't define M_2PI ever, other compilers may lack some of these
+   too, hence the sequence as it is: load math.h, then see what's lacking still.
+*/
+#ifndef _USE_MATH_DEFINES
+#define _USE_MATH_DEFINES 1
+#endif
 
 /*
 "It's a known, long-standing bug in the compiler system's headers.  For
@@ -84,59 +84,59 @@ standard C++ library."
 #include "SIMPLib/SIMPLib.h"
 
 #ifndef M_E
-#define M_E            2.7182818284590452354   /* e */
+#define M_E 2.7182818284590452354 /* e */
 #endif
 
 #ifndef M_LOG2E
-#define M_LOG2E        1.4426950408889634074   /* log_2 e */
+#define M_LOG2E 1.4426950408889634074 /* log_2 e */
 #endif
 
 #ifndef M_LOG10E
-#define M_LOG10E       0.43429448190325182765  /* log_10 e */
+#define M_LOG10E 0.43429448190325182765 /* log_10 e */
 #endif
 
 #ifndef M_LN2
-#define M_LN2          0.69314718055994530942  /* log_e 2 */
+#define M_LN2 0.69314718055994530942 /* log_e 2 */
 #endif
 
 #ifndef M_LN10
-#define M_LN10         2.30258509299404568402  /* log_e 10 */
+#define M_LN10 2.30258509299404568402 /* log_e 10 */
 #endif
 
 #ifndef M_PI_2
-#define M_PI_2         1.57079632679489661923132169163975144   /* pi/2 */
+#define M_PI_2 1.57079632679489661923132169163975144 /* pi/2 */
 #endif
 
 #ifndef M_PI_4
-#define M_PI_4         0.785398163397448309615660845819875721  /* pi/4 */
+#define M_PI_4 0.785398163397448309615660845819875721 /* pi/4 */
 #endif
 
 #ifndef M_1_PI
-#define M_1_PI         0.31830988618379067154  /* 1/pi */
+#define M_1_PI 0.31830988618379067154 /* 1/pi */
 #endif
 
 #ifndef M_2_PI
-#define M_2_PI         0.63661977236758134308  /* 2/pi */
+#define M_2_PI 0.63661977236758134308 /* 2/pi */
 #endif
 
 #ifndef M_2_SQRTPI
-#define M_2_SQRTPI     1.12837916709551257390  /* 2/sqrt(pi) */
+#define M_2_SQRTPI 1.12837916709551257390 /* 2/sqrt(pi) */
 #endif
 
 #ifndef M_SQRT2
-#define M_SQRT2        1.41421356237309504880  /* sqrt(2) */
+#define M_SQRT2 1.41421356237309504880 /* sqrt(2) */
 #endif
 
 #ifndef M_SQRT1_2
-#define M_SQRT1_2      0.70710678118654752440  /* 1/sqrt(2) */
+#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
 #endif
 
 #ifndef M_PI
-#define M_PI        3.14159265358979323846  /* pi */
+#define M_PI 3.14159265358979323846 /* pi */
 #endif
 
 #ifndef M_2PI
-#define M_2PI           6.283185307179586232    /* 2*pi  */
+#define M_2PI 6.283185307179586232 /* 2*pi  */
 #endif
 
 // This next bit is for MSVC compilers. We need to tell it that we already defined some math constants
@@ -146,129 +146,129 @@ standard C++ library."
 
 namespace SIMPLib
 {
-  namespace Constants
-  {
-    static const float k_Pif = static_cast<float>(M_PI);
-    static const double k_Pi = M_PI;
-    static const double k_SqrtPi = sqrt(M_PI);
-    static const double k_2OverSqrtPi = 2.0 / sqrt(M_PI);
-    static const double k_HalfOfSqrtPi = sqrt(M_PI) / 2.0;
-    static const double k_SqrtHalfPi = sqrt(M_PI_2);
-    static const double k_2Pi = 2.0 * M_PI;
-    static const double k_1OverPi = 1.0 / M_PI;
-    static const double k_PiOver180 = M_PI / 180.0;
-    static const double k_360OverPi = 360.0 / M_PI;
-    static const double k_180OverPi = 180.0 / M_PI;
-    static const double k_PiOver2 = M_PI / 2.0;
-    static const double k_PiOver3 = M_PI / 3.0;
-    static const double k_PiOver4 = M_PI / 4.0;
-    static const double k_PiOver8 = M_PI / 8.0;
-    static const double k_PiOver12 = M_PI / 12.0;
-    static const double k_Sqrt2 = sqrt(2.0);
-    static const double k_Sqrt3 = sqrt(3.0);
-    static const double k_HalfSqrt2 = 0.5 * sqrt(2.0);
-    static const double k_1OverRoot2 = 1.0 / sqrt(2.0);
-    static const double k_1OverRoot3 = 1.0 / sqrt(3.0);
-    static const double k_Root3Over2 = sqrt(3.0) / 2.0;
-    static const double k_DegToRad = M_PI / 180.0;
-    static const double k_RadToDeg = 180.0 / M_PI;
-    static const double k_1Point3 = 1.0 + 1.0 / 3.0;
-    static const double k_1Over3 = 1.0 / 3.0;
-
-    static const double k_ACosNeg1 = acos(-1.0);
-    static const double k_ACos1 = acos(1.0);
-
-    static const double k_Tan_OneEigthPi = tan(k_PiOver8);
-    static const double k_Cos_OneEigthPi = cos(k_PiOver8);
-    static const double k_Cos_ThreeEightPi = cos(3.0 * k_PiOver8);
-    static const double k_Sin_ThreeEightPi = sin(3.0 * k_PiOver8);
-
-
-
-  }
-}
-
+namespace Constants
+{
+static const float k_Pif = static_cast<float>(M_PI);
+static const double k_Pi = M_PI;
+static const double k_SqrtPi = sqrt(M_PI);
+static const double k_2OverSqrtPi = 2.0 / sqrt(M_PI);
+static const double k_HalfOfSqrtPi = sqrt(M_PI) / 2.0;
+static const double k_SqrtHalfPi = sqrt(M_PI_2);
+static const double k_2Pi = 2.0 * M_PI;
+static const double k_1OverPi = 1.0 / M_PI;
+static const double k_PiOver180 = M_PI / 180.0;
+static const double k_360OverPi = 360.0 / M_PI;
+static const double k_180OverPi = 180.0 / M_PI;
+static const double k_PiOver2 = M_PI / 2.0;
+static const double k_PiOver3 = M_PI / 3.0;
+static const double k_PiOver4 = M_PI / 4.0;
+static const double k_PiOver8 = M_PI / 8.0;
+static const double k_PiOver12 = M_PI / 12.0;
+static const double k_Sqrt2 = sqrt(2.0);
+static const double k_Sqrt3 = sqrt(3.0);
+static const double k_HalfSqrt2 = 0.5 * sqrt(2.0);
+static const double k_1OverRoot2 = 1.0 / sqrt(2.0);
+static const double k_1OverRoot3 = 1.0 / sqrt(3.0);
+static const double k_Root3Over2 = sqrt(3.0) / 2.0;
+static const double k_DegToRad = M_PI / 180.0;
+static const double k_RadToDeg = 180.0 / M_PI;
+static const double k_1Point3 = 1.0 + 1.0 / 3.0;
+static const double k_1Over3 = 1.0 / 3.0;
+
+static const double k_ACosNeg1 = acos(-1.0);
+static const double k_ACos1 = acos(1.0);
+
+static const double k_Tan_OneEigthPi = tan(k_PiOver8);
+static const double k_Cos_OneEigthPi = cos(k_PiOver8);
+static const double k_Cos_ThreeEightPi = cos(3.0 * k_PiOver8);
+static const double k_Sin_ThreeEightPi = sin(3.0 * k_PiOver8);
+
+} // namespace Constants
+} // namespace SIMPLib
 
 class SIMPLibMath
 {
-  public:
-    virtual ~SIMPLibMath();
+public:
+  virtual ~SIMPLibMath();
 
-    static SIMPLib_EXPORT float Gamma(float);
+  static SIMPLib_EXPORT float Gamma(float);
 
-    template <typename T>
-    static void bound(T& val, T min, T max)
+  template <typename T>
+  static void bound(T& val, T min, T max)
+  {
+    if(val < min)
     {
-      if(val < min)
-      {
-        val = min;
-      }
-      else if(val > max)
-      {
-        val = max;
-      }
+      val = min;
     }
-
-    static SIMPLib_EXPORT float erf(float);
-    static SIMPLib_EXPORT float erfc(float);
-    static SIMPLib_EXPORT float gammastirf(float);
-    static SIMPLib_EXPORT float LnGamma(float, float& );
-    static SIMPLib_EXPORT float incompletebeta(float, float, float);
-    static SIMPLib_EXPORT float incompletebetafe(float, float, float, float, float);
-    static SIMPLib_EXPORT float incompletebetafe2(float, float, float, float, float);
-    static SIMPLib_EXPORT float incompletebetaps(float, float, float, float);
-
-    /**
-     * @brief generates a linearly space array between 2 numbers (inclusive, assumes first number <= second number) [as matlabs linspace]
-     * @param first number
-     * @param second number
-     * @param length of return array
-     * @return
-     */
-    static SIMPLib_EXPORT std::vector<double> linspace(double first, double second, int length);
-
-    /**
-     * @brief closeEnough
-     * @param a
-     * @param b
-     * @param epsilon
-     * @return
-     */
-    template<typename K>
-    static bool closeEnough(const K& a, const K& b,
-                            const K& epsilon = std::numeric_limits<K>::epsilon())
+    else if(val > max)
     {
-      return (epsilon > fabs(a - b));
+      val = max;
     }
+  }
 
+  static SIMPLib_EXPORT float erf(float);
+  static SIMPLib_EXPORT float erfc(float);
+  static SIMPLib_EXPORT float gammastirf(float);
+  static SIMPLib_EXPORT float LnGamma(float, float&);
+  static SIMPLib_EXPORT float incompletebeta(float, float, float);
+  static SIMPLib_EXPORT float incompletebetafe(float, float, float, float, float);
+  static SIMPLib_EXPORT float incompletebetafe2(float, float, float, float, float);
+  static SIMPLib_EXPORT float incompletebetaps(float, float, float, float);
+
+  /**
+   * @brief generates a linearly space array between 2 numbers (inclusive, assumes first number <= second number) [as matlabs linspace]
+   * @param first number
+   * @param second number
+   * @param length of return array
+   * @return
+   */
+  static SIMPLib_EXPORT std::vector<double> linspace(double first, double second, int length);
+
+  /**
+   * @brief closeEnough
+   * @param a
+   * @param b
+   * @param epsilon
+   * @return
+   */
+  template <typename K>
+  static bool closeEnough(const K& a, const K& b, const K& epsilon = std::numeric_limits<K>::epsilon())
+  {
+    return (epsilon > fabs(a - b));
+  }
 
-    /**
-     * @brief transfer_sign
-     * @param a
-     * @param b
-     * @return
-     */
-    template<typename K>
-    static K transfer_sign(K a, K b)
+  /**
+   * @brief transfer_sign
+   * @param a
+   * @param b
+   * @return
+   */
+  template <typename K>
+  static K transfer_sign(K a, K b)
+  {
+    if(a > 0.0 && b > 0.0)
+    {
+      return a;
+    }
+    if(a < 0.0 && b > 0.0)
     {
-      if( a > 0.0 && b > 0.0) { return a; }
-      if( a < 0.0 && b > 0.0) { return -1 * a; }
-
-      if( a < 0.0 && b < 0.0) { return a; }
-
       return -1 * a;
+    }
 
+    if(a < 0.0 && b < 0.0)
+    {
+      return a;
     }
 
+    return -1 * a;
+  }
 
-  protected:
-    SIMPLibMath();
+protected:
+  SIMPLibMath();
 
-  public:
-    SIMPLibMath(const SIMPLibMath&) = delete;    // Copy Constructor Not Implemented
-    SIMPLibMath(SIMPLibMath&&) = delete;         // Move Constructor Not Implemented
-    SIMPLibMath& operator=(const SIMPLibMath&) = delete; // Copy Assignment Not Implemented
-    SIMPLibMath& operator=(SIMPLibMath&&) = delete;      // Move Assignment Not Implemented
+public:
+  SIMPLibMath(const SIMPLibMath&) = delete;            // Copy Constructor Not Implemented
+  SIMPLibMath(SIMPLibMath&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLibMath& operator=(const SIMPLibMath&) = delete; // Copy Assignment Not Implemented
+  SIMPLibMath& operator=(SIMPLibMath&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.cpp b/Source/SIMPLib/Math/SIMPLibRandom.cpp
index 355f14270b..9699f20608 100644
--- a/Source/SIMPLib/Math/SIMPLibRandom.cpp
+++ b/Source/SIMPLib/Math/SIMPLibRandom.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /*
    A C-program for MT19937, with initialization improved 2002/1/26.
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.h b/Source/SIMPLib/Math/SIMPLibRandom.h
old mode 100755
new mode 100644
index 0d23582c7b..8a781d6696
--- a/Source/SIMPLib/Math/SIMPLibRandom.h
+++ b/Source/SIMPLib/Math/SIMPLibRandom.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 /* This class uses the Mersenne Twister pseudorandom number generator code internally.
  * This class should be thread safe as long as only a single thread uses any particular
@@ -186,19 +186,19 @@ class SIMPLib_EXPORT SIMPLibRandom
 #endif
 
 /* Get a seed value based off the system clock. The issue is that this will
-  * be a 64 bit unsigned integer where the high 32 bits will basically not
-  * change where as the lower 32 bits will. The following lines of code will
-  * pull off the low 32 bits from the number. This operation depends on most
-  * significant byte ordering which is different between Big Endian and
-  * Little Endian machines. For Big endian machines the Most Significant Byte
-  * (MSB) is the first 32 bits. For Little Endian machines the MSB is the
-  * second 32 bits.
-  */
+ * be a 64 bit unsigned integer where the high 32 bits will basically not
+ * change where as the lower 32 bits will. The following lines of code will
+ * pull off the low 32 bits from the number. This operation depends on most
+ * significant byte ordering which is different between Big Endian and
+ * Little Endian machines. For Big endian machines the Most Significant Byte
+ * (MSB) is the first 32 bits. For Little Endian machines the MSB is the
+ * second 32 bits.
+ */
 
 #define SIMPL_RANDOMNG_NEW()                                                                                                                                                                           \
   SIMPLibRandom rg;                                                                                                                                                                                    \
   {                                                                                                                                                                                                    \
-    unsigned long long int millisSinceEpoch = static_cast<unsigned long long int>(QDateTime::currentMSecsSinceEpoch());                                                                                                                     \
+    unsigned long long int millisSinceEpoch = static_cast<unsigned long long int>(QDateTime::currentMSecsSinceEpoch());                                                                                \
     unsigned long long int* millisSinceEpochPtr = &millisSinceEpoch;                                                                                                                                   \
     unsigned int* seedPtr = reinterpret_cast<unsigned int*>(millisSinceEpochPtr);                                                                                                                      \
     rg.init_genrand(seedPtr[AIMRNG_OFFSET]);                                                                                                                                                           \
@@ -210,4 +210,3 @@ class SIMPLib_EXPORT SIMPLibRandom
     unsigned int* seedPtr = reinterpret_cast<unsigned int*>(&seed);                                                                                                                                    \
     rg.init_genrand(seedPtr[AIMRNG_OFFSET]);                                                                                                                                                           \
   }
-
diff --git a/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
index 7fced926e1..114441dd94 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/MatrixMathTest.cpp
@@ -19,7 +19,8 @@ class MatrixMathTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  template <typename T> void print3x3(T matrix[3][3], const std::string& name)
+  template <typename T>
+  void print3x3(T matrix[3][3], const std::string& name)
   {
     std::cout << "Matrix: " << name << std::endl;
     std::cout << "[" << matrix[0][0] << " " << matrix[0][1] << " " << matrix[0][2] << "]" << std::endl;
diff --git a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
index 4f7165ecc9..ea91bc0005 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <limits>
 
diff --git a/Source/SIMPLib/Messages/AbstractMessageHandler.cpp b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
index 6a4dd61d6b..11f6e3accb 100644
--- a/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
+++ b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
@@ -53,7 +53,7 @@ AbstractMessageHandler::AbstractMessageHandler() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AbstractMessageHandler::processMessage(const GenericErrorMessage *msg) const
+void AbstractMessageHandler::processMessage(const GenericErrorMessage* msg) const
 {
   /* This is a default method that can be reimplemented in a subclass.  Subclassed message handlers
    * should reimplement this method if they care about processing generic error messages. */
diff --git a/Source/SIMPLib/Messages/AbstractMessageHandler.h b/Source/SIMPLib/Messages/AbstractMessageHandler.h
old mode 100755
new mode 100644
index 01393f7ec2..46f623d62f
--- a/Source/SIMPLib/Messages/AbstractMessageHandler.h
+++ b/Source/SIMPLib/Messages/AbstractMessageHandler.h
@@ -58,24 +58,22 @@ class FilterWarningMessage;
  */
 class SIMPLib_EXPORT AbstractMessageHandler
 {
-  public:
-    virtual void processMessage(const GenericErrorMessage* msg) const;
-    virtual void processMessage(const GenericProgressMessage* msg) const;
-    virtual void processMessage(const GenericStatusMessage* msg) const;
-    virtual void processMessage(const GenericWarningMessage* msg) const;
+public:
+  virtual void processMessage(const GenericErrorMessage* msg) const;
+  virtual void processMessage(const GenericProgressMessage* msg) const;
+  virtual void processMessage(const GenericStatusMessage* msg) const;
+  virtual void processMessage(const GenericWarningMessage* msg) const;
 
-    virtual void processMessage(const PipelineErrorMessage* msg) const;
-    virtual void processMessage(const PipelineProgressMessage* msg) const;
-    virtual void processMessage(const PipelineStatusMessage* msg) const;
-    virtual void processMessage(const PipelineWarningMessage* msg) const;
+  virtual void processMessage(const PipelineErrorMessage* msg) const;
+  virtual void processMessage(const PipelineProgressMessage* msg) const;
+  virtual void processMessage(const PipelineStatusMessage* msg) const;
+  virtual void processMessage(const PipelineWarningMessage* msg) const;
 
-    virtual void processMessage(const FilterErrorMessage* msg) const;
-    virtual void processMessage(const FilterProgressMessage* msg) const;
-    virtual void processMessage(const FilterStatusMessage* msg) const;
-    virtual void processMessage(const FilterWarningMessage* msg) const;
+  virtual void processMessage(const FilterErrorMessage* msg) const;
+  virtual void processMessage(const FilterProgressMessage* msg) const;
+  virtual void processMessage(const FilterStatusMessage* msg) const;
+  virtual void processMessage(const FilterWarningMessage* msg) const;
 
-  protected:
-    AbstractMessageHandler();
+protected:
+  AbstractMessageHandler();
 };
-
-
diff --git a/Source/SIMPLib/Messages/AbstractProgressMessage.cpp b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
index 77b2243591..2199eb5278 100644
--- a/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractProgressMessage.cpp
@@ -34,7 +34,7 @@
 
 AbstractProgressMessage::AbstractProgressMessage() = default;
 
-AbstractProgressMessage::  AbstractProgressMessage(const QString& msgText, int progress)
+AbstractProgressMessage::AbstractProgressMessage(const QString& msgText, int progress)
 : AbstractMessage(msgText)
 , m_ProgressValue(progress)
 {
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.cpp b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
index df48decb22..a170cd395e 100644
--- a/Source/SIMPLib/Messages/FilterErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.cpp
@@ -69,7 +69,7 @@ FilterErrorMessage::~FilterErrorMessage() = default;
 // -----------------------------------------------------------------------------
 FilterErrorMessage::Pointer FilterErrorMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
 {
-  FilterErrorMessage::Pointer shared_ptr (new FilterErrorMessage(className, humanLabel, pipelineIndex, msgText, code));
+  FilterErrorMessage::Pointer shared_ptr(new FilterErrorMessage(className, humanLabel, pipelineIndex, msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/FilterErrorMessage.h b/Source/SIMPLib/Messages/FilterErrorMessage.h
old mode 100755
new mode 100644
index 364c6d2e59..0f9ffa3621
--- a/Source/SIMPLib/Messages/FilterErrorMessage.h
+++ b/Source/SIMPLib/Messages/FilterErrorMessage.h
@@ -133,5 +133,3 @@ class SIMPLib_EXPORT FilterErrorMessage : public AbstractErrorMessage
   int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterErrorMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.cpp b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
index 2c5bf57550..7de9765742 100644
--- a/Source/SIMPLib/Messages/FilterProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
@@ -69,7 +69,7 @@ FilterProgressMessage::~FilterProgressMessage() = default;
 // -----------------------------------------------------------------------------
 FilterProgressMessage::Pointer FilterProgressMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int progress)
 {
-  FilterProgressMessage::Pointer shared_ptr (new FilterProgressMessage(className, humanLabel, pipelineIndex, msgText, progress));
+  FilterProgressMessage::Pointer shared_ptr(new FilterProgressMessage(className, humanLabel, pipelineIndex, msgText, progress));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.h b/Source/SIMPLib/Messages/FilterProgressMessage.h
old mode 100755
new mode 100644
index aedccfb7b2..78cdf9bdac
--- a/Source/SIMPLib/Messages/FilterProgressMessage.h
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.h
@@ -133,5 +133,3 @@ class SIMPLib_EXPORT FilterProgressMessage : public AbstractProgressMessage
   int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterProgressMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.cpp b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
index 46b46454b3..f08b489203 100644
--- a/Source/SIMPLib/Messages/FilterStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.cpp
@@ -67,7 +67,7 @@ FilterStatusMessage::~FilterStatusMessage() = default;
 // -----------------------------------------------------------------------------
 FilterStatusMessage::Pointer FilterStatusMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText)
 {
-  FilterStatusMessage::Pointer shared_ptr (new FilterStatusMessage(className, humanLabel, pipelineIndex, msgText));
+  FilterStatusMessage::Pointer shared_ptr(new FilterStatusMessage(className, humanLabel, pipelineIndex, msgText));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/FilterStatusMessage.h b/Source/SIMPLib/Messages/FilterStatusMessage.h
old mode 100755
new mode 100644
index 8b19b806b5..9b8e789f86
--- a/Source/SIMPLib/Messages/FilterStatusMessage.h
+++ b/Source/SIMPLib/Messages/FilterStatusMessage.h
@@ -132,5 +132,3 @@ class SIMPLib_EXPORT FilterStatusMessage : public AbstractStatusMessage
   int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterStatusMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.cpp b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
index 343dc5b597..9dba7022b1 100644
--- a/Source/SIMPLib/Messages/FilterWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.cpp
@@ -69,7 +69,7 @@ FilterWarningMessage::~FilterWarningMessage() = default;
 // -----------------------------------------------------------------------------
 FilterWarningMessage::Pointer FilterWarningMessage::New(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msgText, int code)
 {
-  FilterWarningMessage::Pointer shared_ptr (new FilterWarningMessage(className, humanLabel, pipelineIndex, msgText, code));
+  FilterWarningMessage::Pointer shared_ptr(new FilterWarningMessage(className, humanLabel, pipelineIndex, msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/FilterWarningMessage.h b/Source/SIMPLib/Messages/FilterWarningMessage.h
old mode 100755
new mode 100644
index 075a3af2d6..b208c41312
--- a/Source/SIMPLib/Messages/FilterWarningMessage.h
+++ b/Source/SIMPLib/Messages/FilterWarningMessage.h
@@ -133,5 +133,3 @@ class SIMPLib_EXPORT FilterWarningMessage : public AbstractWarningMessage
   int m_PipelineIndex = {};
 };
 Q_DECLARE_METATYPE(FilterWarningMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.cpp b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
index ff6533be8d..2db4a3d82b 100644
--- a/Source/SIMPLib/Messages/GenericErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.cpp
@@ -66,7 +66,7 @@ GenericErrorMessage::~GenericErrorMessage() = default;
 // -----------------------------------------------------------------------------
 GenericErrorMessage::Pointer GenericErrorMessage::New(const QString& msgText, int code)
 {
-  GenericErrorMessage::Pointer shared_ptr (new GenericErrorMessage(msgText, code));
+  GenericErrorMessage::Pointer shared_ptr(new GenericErrorMessage(msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/GenericErrorMessage.h b/Source/SIMPLib/Messages/GenericErrorMessage.h
old mode 100755
new mode 100644
index ce257c4203..8e7c23222f
--- a/Source/SIMPLib/Messages/GenericErrorMessage.h
+++ b/Source/SIMPLib/Messages/GenericErrorMessage.h
@@ -97,5 +97,3 @@ class SIMPLib_EXPORT GenericErrorMessage : public AbstractErrorMessage
 private:
 };
 Q_DECLARE_METATYPE(GenericErrorMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.cpp b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
index 2ce235cfdc..e7c3ef0ffe 100644
--- a/Source/SIMPLib/Messages/GenericProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
@@ -66,7 +66,7 @@ GenericProgressMessage::~GenericProgressMessage() = default;
 // -----------------------------------------------------------------------------
 GenericProgressMessage::Pointer GenericProgressMessage::New(const QString& msgText, int progress)
 {
-  GenericProgressMessage::Pointer shared_ptr (new GenericProgressMessage(msgText, progress));
+  GenericProgressMessage::Pointer shared_ptr(new GenericProgressMessage(msgText, progress));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.h b/Source/SIMPLib/Messages/GenericProgressMessage.h
old mode 100755
new mode 100644
index d34c393601..efab753036
--- a/Source/SIMPLib/Messages/GenericProgressMessage.h
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.h
@@ -97,5 +97,3 @@ class SIMPLib_EXPORT GenericProgressMessage : public AbstractProgressMessage
 private:
 };
 Q_DECLARE_METATYPE(GenericProgressMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.cpp b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
index 794b225d69..42680bcef8 100644
--- a/Source/SIMPLib/Messages/GenericStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.cpp
@@ -64,7 +64,7 @@ GenericStatusMessage::~GenericStatusMessage() = default;
 // -----------------------------------------------------------------------------
 GenericStatusMessage::Pointer GenericStatusMessage::New(const QString& msgText)
 {
-  GenericStatusMessage::Pointer shared_ptr (new GenericStatusMessage(msgText));
+  GenericStatusMessage::Pointer shared_ptr(new GenericStatusMessage(msgText));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/GenericStatusMessage.h b/Source/SIMPLib/Messages/GenericStatusMessage.h
old mode 100755
new mode 100644
index 3ecb019640..e21c61f4da
--- a/Source/SIMPLib/Messages/GenericStatusMessage.h
+++ b/Source/SIMPLib/Messages/GenericStatusMessage.h
@@ -97,5 +97,3 @@ class SIMPLib_EXPORT GenericStatusMessage : public AbstractStatusMessage
 private:
 };
 Q_DECLARE_METATYPE(GenericStatusMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.cpp b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
index bb012cd0fc..5c6df91f17 100644
--- a/Source/SIMPLib/Messages/GenericWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.cpp
@@ -66,7 +66,7 @@ GenericWarningMessage::~GenericWarningMessage() = default;
 // -----------------------------------------------------------------------------
 GenericWarningMessage::Pointer GenericWarningMessage::New(const QString& msgText, int code)
 {
-  GenericWarningMessage::Pointer shared_ptr (new GenericWarningMessage(msgText, code));
+  GenericWarningMessage::Pointer shared_ptr(new GenericWarningMessage(msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/GenericWarningMessage.h b/Source/SIMPLib/Messages/GenericWarningMessage.h
old mode 100755
new mode 100644
index 81ae8a06de..8cbbb02d27
--- a/Source/SIMPLib/Messages/GenericWarningMessage.h
+++ b/Source/SIMPLib/Messages/GenericWarningMessage.h
@@ -98,5 +98,3 @@ class SIMPLib_EXPORT GenericWarningMessage : public AbstractWarningMessage
 private:
 };
 Q_DECLARE_METATYPE(GenericWarningMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.cpp b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
index 12a0ca8989..8ce27f85be 100644
--- a/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.cpp
@@ -48,11 +48,10 @@ PipelineErrorMessage::PipelineErrorMessage()
 {
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineErrorMessage::PipelineErrorMessage(const QString &pipelineName, const QString& msgText, int code)
+PipelineErrorMessage::PipelineErrorMessage(const QString& pipelineName, const QString& msgText, int code)
 : AbstractErrorMessage(msgText, code)
 , m_PipelineName(pipelineName)
 {
@@ -66,9 +65,9 @@ PipelineErrorMessage::~PipelineErrorMessage() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineErrorMessage::Pointer PipelineErrorMessage::New(const QString &pipelineName, const QString& msgText, int code)
+PipelineErrorMessage::Pointer PipelineErrorMessage::New(const QString& pipelineName, const QString& msgText, int code)
 {
-  PipelineErrorMessage::Pointer shared_ptr (new PipelineErrorMessage(pipelineName, msgText, code));
+  PipelineErrorMessage::Pointer shared_ptr(new PipelineErrorMessage(pipelineName, msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/PipelineErrorMessage.h b/Source/SIMPLib/Messages/PipelineErrorMessage.h
old mode 100755
new mode 100644
index 07a86f5fd2..e9665fc124
--- a/Source/SIMPLib/Messages/PipelineErrorMessage.h
+++ b/Source/SIMPLib/Messages/PipelineErrorMessage.h
@@ -110,5 +110,3 @@ class SIMPLib_EXPORT PipelineErrorMessage : public AbstractErrorMessage
   QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineErrorMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
index 622363e656..bffa5bd460 100644
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
@@ -51,7 +51,7 @@ PipelineProgressMessage::PipelineProgressMessage()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineProgressMessage::PipelineProgressMessage(const QString &pipelineName, const QString& msgText, int progress)
+PipelineProgressMessage::PipelineProgressMessage(const QString& pipelineName, const QString& msgText, int progress)
 : AbstractProgressMessage(msgText, progress)
 , m_PipelineName(pipelineName)
 {
@@ -65,9 +65,9 @@ PipelineProgressMessage::~PipelineProgressMessage() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineProgressMessage::Pointer PipelineProgressMessage::New(const QString &pipelineName, const QString& msgText, int progress)
+PipelineProgressMessage::Pointer PipelineProgressMessage::New(const QString& pipelineName, const QString& msgText, int progress)
 {
-  PipelineProgressMessage::Pointer shared_ptr (new PipelineProgressMessage(pipelineName, msgText, progress));
+  PipelineProgressMessage::Pointer shared_ptr(new PipelineProgressMessage(pipelineName, msgText, progress));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.h b/Source/SIMPLib/Messages/PipelineProgressMessage.h
old mode 100755
new mode 100644
index 87a6bb7bcc..1d42a3d4c7
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.h
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.h
@@ -110,5 +110,3 @@ class SIMPLib_EXPORT PipelineProgressMessage : public AbstractProgressMessage
   QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineProgressMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.cpp b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
index fc1fe203c1..6f002091fc 100644
--- a/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.cpp
@@ -49,7 +49,7 @@ PipelineStatusMessage::PipelineStatusMessage()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineStatusMessage::PipelineStatusMessage(const QString &pipelineName, const QString& msgText)
+PipelineStatusMessage::PipelineStatusMessage(const QString& pipelineName, const QString& msgText)
 : AbstractStatusMessage(msgText)
 , m_PipelineName(pipelineName)
 {
@@ -63,9 +63,9 @@ PipelineStatusMessage::~PipelineStatusMessage() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineStatusMessage::Pointer PipelineStatusMessage::New(const QString &pipelineName, const QString& msgText)
+PipelineStatusMessage::Pointer PipelineStatusMessage::New(const QString& pipelineName, const QString& msgText)
 {
-  PipelineStatusMessage::Pointer shared_ptr (new PipelineStatusMessage(pipelineName, msgText));
+  PipelineStatusMessage::Pointer shared_ptr(new PipelineStatusMessage(pipelineName, msgText));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/PipelineStatusMessage.h b/Source/SIMPLib/Messages/PipelineStatusMessage.h
old mode 100755
new mode 100644
index f12052fecd..75e6c68ac3
--- a/Source/SIMPLib/Messages/PipelineStatusMessage.h
+++ b/Source/SIMPLib/Messages/PipelineStatusMessage.h
@@ -109,5 +109,3 @@ class SIMPLib_EXPORT PipelineStatusMessage : public AbstractStatusMessage
   QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineStatusMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.cpp b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
index 5080536040..aefaa841d0 100644
--- a/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.cpp
@@ -65,9 +65,9 @@ PipelineWarningMessage::~PipelineWarningMessage() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineWarningMessage::Pointer PipelineWarningMessage::New(const QString &pipelineName, const QString& msgText, int code)
+PipelineWarningMessage::Pointer PipelineWarningMessage::New(const QString& pipelineName, const QString& msgText, int code)
 {
-  PipelineWarningMessage::Pointer shared_ptr (new PipelineWarningMessage(pipelineName, msgText, code));
+  PipelineWarningMessage::Pointer shared_ptr(new PipelineWarningMessage(pipelineName, msgText, code));
   return shared_ptr;
 }
 
diff --git a/Source/SIMPLib/Messages/PipelineWarningMessage.h b/Source/SIMPLib/Messages/PipelineWarningMessage.h
old mode 100755
new mode 100644
index 6e1abbff89..9140736155
--- a/Source/SIMPLib/Messages/PipelineWarningMessage.h
+++ b/Source/SIMPLib/Messages/PipelineWarningMessage.h
@@ -110,5 +110,3 @@ class SIMPLib_EXPORT PipelineWarningMessage : public AbstractWarningMessage
   QString m_PipelineName = {};
 };
 Q_DECLARE_METATYPE(PipelineWarningMessage::Pointer)
-
-
diff --git a/Source/SIMPLib/Montages/AbstractMontage.cpp b/Source/SIMPLib/Montages/AbstractMontage.cpp
index dd93ec3917..9d2a7eb2f3 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.cpp
+++ b/Source/SIMPLib/Montages/AbstractMontage.cpp
@@ -82,5 +82,3 @@ AbstractMontage::Pointer AbstractMontage::NullPointer()
 {
   return Pointer(static_cast<Self*>(nullptr));
 }
-
-
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
index 121958bd30..1f35ffb3f5 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.h
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -61,13 +61,12 @@ using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
 class SIMPLib_EXPORT AbstractMontage : public INamedObject
 {
 public:
-    using Self = AbstractMontage;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
+  using Self = AbstractMontage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
   using CollectionType = std::vector<DataContainerShPtr>;
   using Iterator = CollectionType::iterator;
@@ -167,8 +166,7 @@ class SIMPLib_EXPORT AbstractMontage : public INamedObject
    */
   AbstractMontage(const QString& name);
 
-  private:
-
+private:
 };
 
 using AbstractMontageShPtr = std::shared_ptr<AbstractMontage>;
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.cpp b/Source/SIMPLib/Montages/DataContainerGrid.cpp
index b56d056736..e818069e7e 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.cpp
+++ b/Source/SIMPLib/Montages/DataContainerGrid.cpp
@@ -34,9 +34,9 @@
 
 #include <algorithm>
 
- // -----------------------------------------------------------------------------
- //
- // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 DataContainerGrid::DataContainerGrid(SizeVec3Type dims)
 : m_Dims(dims)
 , m_DataContainerNames(dims[0] * dims[1] * dims[2])
@@ -189,7 +189,7 @@ DataContainerGrid& DataContainerGrid::operator=(const DataContainerGrid& other)
 {
   m_Dims = other.m_Dims;
   m_DataContainerNames = other.m_DataContainerNames;
-  
+
   emit dimensionsChanged(m_Dims);
   return *this;
 }
diff --git a/Source/SIMPLib/Montages/GridMontage.cpp b/Source/SIMPLib/Montages/GridMontage.cpp
index 8046bb5fb1..beb6d82882 100644
--- a/Source/SIMPLib/Montages/GridMontage.cpp
+++ b/Source/SIMPLib/Montages/GridMontage.cpp
@@ -653,5 +653,3 @@ GridMontage::Pointer GridMontage::NullPointer()
 {
   return Pointer(static_cast<Self*>(nullptr));
 }
-
-
diff --git a/Source/SIMPLib/Montages/GridMontage.h b/Source/SIMPLib/Montages/GridMontage.h
index 9789fc77a0..056ac36294 100644
--- a/Source/SIMPLib/Montages/GridMontage.h
+++ b/Source/SIMPLib/Montages/GridMontage.h
@@ -60,13 +60,12 @@ class SIMPLib_EXPORT GridMontage : public AbstractMontage
     SnakeOrder
   };
 
-    using Self = GridMontage;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
+  using Self = GridMontage;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
   /**
    * @brief Creates a new GridMontage with the specified name and size.
@@ -269,7 +268,6 @@ class SIMPLib_EXPORT GridMontage : public AbstractMontage
   size_t getOffsetFromTileId(TileIdType tileID) const;
 
 private:
-
   SizeType m_Size;
   CollectionType m_DataContainers;
 };
diff --git a/Source/SIMPLib/Montages/GridTileIndex.cpp b/Source/SIMPLib/Montages/GridTileIndex.cpp
index 091c46c50c..a3f2d20bef 100644
--- a/Source/SIMPLib/Montages/GridTileIndex.cpp
+++ b/Source/SIMPLib/Montages/GridTileIndex.cpp
@@ -119,7 +119,7 @@ bool GridTileIndex::isValid() const
   {
     sizeCheck &= m_TilePos[i] <= gridSize[i];
   }
-  
+
   return AbstractTileIndex::isValid() && sizeCheck;
 }
 
diff --git a/Source/SIMPLib/Montages/MontageSupport.h b/Source/SIMPLib/Montages/MontageSupport.h
index a84297839d..f8e3a479be 100644
--- a/Source/SIMPLib/Montages/MontageSupport.h
+++ b/Source/SIMPLib/Montages/MontageSupport.h
@@ -44,10 +44,10 @@ using AbstractMontageShPtr = std::shared_ptr<AbstractMontage>;
 
 namespace MontageSupport
 {
-  namespace IO
-  {
-    AbstractMontageShPtr ReadMontageFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
+namespace IO
+{
+AbstractMontageShPtr ReadMontageFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
 
-    DataContainerArray::MontageCollection ReadMontagesFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
-  }
-}
+DataContainerArray::MontageCollection ReadMontagesFromHDF5(hid_t parentId, const DataContainerArrayShPtr& dca, int& err);
+} // namespace IO
+} // namespace MontageSupport
diff --git a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
old mode 100755
new mode 100644
index 6ab34792a8..b93f033ee4
--- a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <memory>
 
 #include <QtCore/QSettings>
@@ -42,40 +41,31 @@
 
 #include "SIMPLib/SIMPLib.h"
 
-
 #ifdef NDEBUG
 
-#define SIMPLib_PLUGIN_2(name)\
-  #name
+#define SIMPLib_PLUGIN_2(name) #name
 
-#define SIMPLib_PLUGIN_3(name)\
-  #name
+#define SIMPLib_PLUGIN_3(name) #name
 
 #else
 
+#define SIMPLib_PLUGIN_1(name) #name
 
-#define SIMPLib_PLUGIN_1(name)\
-  #name
-
-#define SIMPLib_PLUGIN_2(name)\
-  SIMPLib_PLUGIN_1(name##_debug)
+#define SIMPLib_PLUGIN_2(name) SIMPLib_PLUGIN_1(name##_debug)
 
-#define SIMPLib_PLUGIN_3(name)\
-  SIMPLib_PLUGIN_1(name Debug)
+#define SIMPLib_PLUGIN_3(name) SIMPLib_PLUGIN_1(name Debug)
 
 #endif
 
-
-
-#define SIMPLib_PLUGIN_CONSTANTS(libName, human)\
-  namespace SIMPLib\
-  {\
-    namespace UIPlugins\
-    {\
-      const QString libName##File(SIMPLib_PLUGIN_2(libName##Plugin));\
-      const QString libName##DisplayName(SIMPLib_PLUGIN_3(human));\
-      const QString libName##BaseName(#libName);\
-    }\
+#define SIMPLib_PLUGIN_CONSTANTS(libName, human)                                                                                                                                                       \
+  namespace SIMPLib                                                                                                                                                                                    \
+  {                                                                                                                                                                                                    \
+  namespace UIPlugins                                                                                                                                                                                  \
+  {                                                                                                                                                                                                    \
+  const QString libName##File(SIMPLib_PLUGIN_2(libName##Plugin));                                                                                                                                      \
+  const QString libName##DisplayName(SIMPLib_PLUGIN_3(human));                                                                                                                                         \
+  const QString libName##BaseName(#libName);                                                                                                                                                           \
+  }                                                                                                                                                                                                    \
   }
 
 class FilterManager;
@@ -140,134 +130,130 @@ class FilterWidgetManager;
  */
 class SIMPLib_EXPORT ISIMPLibPlugin
 {
-  public:
-    using Self = ISIMPLibPlugin;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    virtual ~ISIMPLibPlugin() = default;
-
-    /**
-     * @brief Returns the name of the plugin that appears on the file system. 
-     * 
-     * Note that if the build is a debug build there will be a _Plugin postfix
-     * to the filename.
-     */
-    virtual QString getPluginFileName() = 0;
-    
-    /**
-     * @brief getPluginDisplayName The name that should be used for human facing
-     * labels and display strings
-     * @return 
-     */
-    virtual QString getPluginDisplayName() = 0;
-    
-    /**
-     * @brief getPluginBaseName The Name of the plugin.
-     * 
-     * This typically will NOT have the Plugin suffix.
-     * @return 
-     */
-    virtual QString getPluginBaseName() = 0;
-    
-    /**
-     * @brief Returns the version of the plugin
-     */
-    virtual QString getVersion() = 0;
-
-    /**
-     * @brief Returns the compatibility version of the plugin
-     */
-    virtual QString getCompatibilityVersion() = 0;
-
-    /**
-     * @brief Returns the name of the vendor of the plugin
-     */
-    virtual QString getVendor() = 0;
-
-    /**
-     * @brief Returns the URL of the plugin
-     */
-    virtual QString getURL() = 0;
-
-    /**
-     * @brief Returns the location of the plugin
-     */
-    virtual QString getLocation() = 0;
-
-    /**
-     * @brief Returns the description of the plugin
-     */
-    virtual QString getDescription() = 0;
-
-    /**
-     * @brief Returns the copyright string of the plugin
-     */
-    virtual QString getCopyright() = 0;
-
-    /**
-     * @brief Returns the license string of the plugin
-     */
-    virtual QString getLicense() = 0;
-
-    /**
-     * @brief Returns the dependencies of the plugin
-     */
-    virtual QList<QString> getFilters() = 0;
-
-    /**
-     * @brief Returns the third party licenses of the plugin
-     */
-    virtual QMap<QString, QString> getThirdPartyLicenses() = 0;
-
-    /**
-     * @brief Returns the load status of the plugin
-     */
-    virtual bool getDidLoad() = 0;
-
-    /**
-     * @brief Sets the load status of the plugin
-     */
-    virtual void setDidLoad(bool didLoad) = 0;
-
-    /**
-     * @brief Sets the location of the plugin on the file system.
-     * This is required so that we can cache the file path information
-     * as the plugin is loaded.
-     */
-    virtual void setLocation(QString filePath) = 0;
-
-    /**
-     * @brief Register all the filters with the FilterWidgetFactory
-     */
-    virtual void registerFilterWidgets(FilterWidgetManager* fwm) = 0;
-
-    /**
-     * @brief registerFilters Registers all the filters for this plugin
-     */
-    virtual void registerFilters(FilterManager* fm) = 0;
-
-    /**
-     * @brief Writes the settings in the input gui to the Application's preference file
-     * @param prefs A valid QSettings pointer.
-     */
-    virtual void writeSettings(QSettings& prefs) = 0;
-
-    /**
-     * @brief Reads the settings from the Application's preference file and sets
-     * the input GUI widgets accordingly.
-     * @param prefs
-     */
-    virtual void readSettings(QSettings& prefs) = 0;
-
-  private:
+public:
+  using Self = ISIMPLibPlugin;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  virtual ~ISIMPLibPlugin() = default;
+
+  /**
+   * @brief Returns the name of the plugin that appears on the file system.
+   *
+   * Note that if the build is a debug build there will be a _Plugin postfix
+   * to the filename.
+   */
+  virtual QString getPluginFileName() = 0;
+
+  /**
+   * @brief getPluginDisplayName The name that should be used for human facing
+   * labels and display strings
+   * @return
+   */
+  virtual QString getPluginDisplayName() = 0;
+
+  /**
+   * @brief getPluginBaseName The Name of the plugin.
+   *
+   * This typically will NOT have the Plugin suffix.
+   * @return
+   */
+  virtual QString getPluginBaseName() = 0;
+
+  /**
+   * @brief Returns the version of the plugin
+   */
+  virtual QString getVersion() = 0;
+
+  /**
+   * @brief Returns the compatibility version of the plugin
+   */
+  virtual QString getCompatibilityVersion() = 0;
+
+  /**
+   * @brief Returns the name of the vendor of the plugin
+   */
+  virtual QString getVendor() = 0;
+
+  /**
+   * @brief Returns the URL of the plugin
+   */
+  virtual QString getURL() = 0;
+
+  /**
+   * @brief Returns the location of the plugin
+   */
+  virtual QString getLocation() = 0;
+
+  /**
+   * @brief Returns the description of the plugin
+   */
+  virtual QString getDescription() = 0;
+
+  /**
+   * @brief Returns the copyright string of the plugin
+   */
+  virtual QString getCopyright() = 0;
+
+  /**
+   * @brief Returns the license string of the plugin
+   */
+  virtual QString getLicense() = 0;
+
+  /**
+   * @brief Returns the dependencies of the plugin
+   */
+  virtual QList<QString> getFilters() = 0;
+
+  /**
+   * @brief Returns the third party licenses of the plugin
+   */
+  virtual QMap<QString, QString> getThirdPartyLicenses() = 0;
+
+  /**
+   * @brief Returns the load status of the plugin
+   */
+  virtual bool getDidLoad() = 0;
+
+  /**
+   * @brief Sets the load status of the plugin
+   */
+  virtual void setDidLoad(bool didLoad) = 0;
+
+  /**
+   * @brief Sets the location of the plugin on the file system.
+   * This is required so that we can cache the file path information
+   * as the plugin is loaded.
+   */
+  virtual void setLocation(QString filePath) = 0;
+
+  /**
+   * @brief Register all the filters with the FilterWidgetFactory
+   */
+  virtual void registerFilterWidgets(FilterWidgetManager* fwm) = 0;
+
+  /**
+   * @brief registerFilters Registers all the filters for this plugin
+   */
+  virtual void registerFilters(FilterManager* fm) = 0;
+
+  /**
+   * @brief Writes the settings in the input gui to the Application's preference file
+   * @param prefs A valid QSettings pointer.
+   */
+  virtual void writeSettings(QSettings& prefs) = 0;
+
+  /**
+   * @brief Reads the settings from the Application's preference file and sets
+   * the input GUI widgets accordingly.
+   * @param prefs
+   */
+  virtual void readSettings(QSettings& prefs) = 0;
+
+private:
 };
 
-
-Q_DECLARE_INTERFACE(ISIMPLibPlugin,
-                    "net.BlueQuartz.ISIMPLibPlugin/1.0")
-
-
+Q_DECLARE_INTERFACE(ISIMPLibPlugin, "net.BlueQuartz.ISIMPLibPlugin/1.0")
diff --git a/Source/SIMPLib/Plugin/PluginManager.cpp b/Source/SIMPLib/Plugin/PluginManager.cpp
index e607441e95..b98ff245cc 100644
--- a/Source/SIMPLib/Plugin/PluginManager.cpp
+++ b/Source/SIMPLib/Plugin/PluginManager.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PluginManager.h"
 
@@ -81,7 +81,7 @@ PluginManager* PluginManager::Instance()
 // -----------------------------------------------------------------------------
 void PluginManager::printPluginNames() const
 {
-  for(auto const plugin : m_Plugins )
+  for(auto const plugin : m_Plugins)
   {
     if(nullptr != plugin)
     {
@@ -104,7 +104,7 @@ void PluginManager::addPlugin(ISIMPLibPlugin* plugin)
 QList<QString> PluginManager::getPluginNames() const
 {
   QList<QString> pluginNames;
-  for(auto const plugin : m_Plugins )
+  for(auto const plugin : m_Plugins)
   {
     if(nullptr != plugin)
     {
@@ -119,7 +119,7 @@ QList<QString> PluginManager::getPluginNames() const
 // -----------------------------------------------------------------------------
 QString PluginManager::getPluginName(QString filtName) const
 {
-  for(auto const plugin : m_Plugins )
+  for(auto const plugin : m_Plugins)
   {
     if(nullptr != plugin)
     {
@@ -145,7 +145,7 @@ QVector<ISIMPLibPlugin*> PluginManager::getPluginsVector() const
 // -----------------------------------------------------------------------------
 ISIMPLibPlugin* PluginManager::findPlugin(QString pluginName)
 {
-  for(auto const plugin : m_Plugins )
+  for(auto const plugin : m_Plugins)
   {
     if(nullptr != plugin)
     {
@@ -166,8 +166,8 @@ QJsonArray PluginManager::toJsonArray() const
 {
   QVector<ISIMPLibPlugin*> plugins = getPluginsVector();
   QJsonArray plugArray;
-  
-  for(auto const plugin : m_Plugins )
+
+  for(auto const plugin : m_Plugins)
   {
     if(nullptr != plugin)
     {
diff --git a/Source/SIMPLib/Plugin/PluginManager.h b/Source/SIMPLib/Plugin/PluginManager.h
old mode 100755
new mode 100644
index 28cbb968ec..e215987180
--- a/Source/SIMPLib/Plugin/PluginManager.h
+++ b/Source/SIMPLib/Plugin/PluginManager.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
@@ -49,82 +48,78 @@ class ISIMPLibPlugin;
  */
 class SIMPLib_EXPORT PluginManager
 {
-  public:
-//    SIMPL_SHARED_POINTERS(PluginManager)
-    /**
-     * @brief Returns the name of the class for PluginManager
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for PluginManager
-     */
-    static QString ClassName();
-
-    virtual ~PluginManager();
-
-    /**
-     * @brief Static instance to retrieve the global instance of this class
-     * @return
-     */
-    static PluginManager* Instance();
-
-
-    /**
-     * @brief PluginManager::printPluginNames
-     */
-    void printPluginNames() const;
-
-    /**
-     * @brief Adds a Plugin to the list
-     * @param plugin
-     */
-    void addPlugin(ISIMPLibPlugin* plugin);
-
-    /**
-     * @brief getPluginNames Returns all plugin names as a QSet
-     * @return
-     */
-    QList<QString> getPluginNames() const;
-
-    /**
-    * @brief getPluginName Returns the plugin name for the given filter name
-    * @return
-    */
-    QString getPluginName(QString filtName) const;
-
-    /**
-     * @brief getPluginList Returns the plugins list
-     * @return
-     */
-    QVector<ISIMPLibPlugin*> getPluginsVector() const;
-
-    /**
-     * @brief findPlugin
-     * @param pluginName
-     * @return
-     */
-    ISIMPLibPlugin* findPlugin(QString pluginName);
-    
-    /**
-     * @brief This method will generate a QJsonObject that will have a tree of
-     * Json objects that represent the information for each of the loaded plugins
-     * @return 
-     */
-    QJsonArray toJsonArray() const;
-
-
-  protected:
-    PluginManager();
-
-  private:
-    QVector<ISIMPLibPlugin*> m_Plugins;
-    static PluginManager* m_Self;
-
-  public:
-    PluginManager(const PluginManager&) = delete;  // Copy Constructor Not Implemented
-    PluginManager(PluginManager&&) = delete;       // Move Constructor Not Implemented
-    PluginManager& operator=(const PluginManager&) = delete; // Copy Assignment Not Implemented
-    PluginManager& operator=(PluginManager&&) = delete;      // Move Assignment Not Implemented
+public:
+  //    SIMPL_SHARED_POINTERS(PluginManager)
+  /**
+   * @brief Returns the name of the class for PluginManager
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for PluginManager
+   */
+  static QString ClassName();
+
+  virtual ~PluginManager();
+
+  /**
+   * @brief Static instance to retrieve the global instance of this class
+   * @return
+   */
+  static PluginManager* Instance();
+
+  /**
+   * @brief PluginManager::printPluginNames
+   */
+  void printPluginNames() const;
+
+  /**
+   * @brief Adds a Plugin to the list
+   * @param plugin
+   */
+  void addPlugin(ISIMPLibPlugin* plugin);
+
+  /**
+   * @brief getPluginNames Returns all plugin names as a QSet
+   * @return
+   */
+  QList<QString> getPluginNames() const;
+
+  /**
+   * @brief getPluginName Returns the plugin name for the given filter name
+   * @return
+   */
+  QString getPluginName(QString filtName) const;
+
+  /**
+   * @brief getPluginList Returns the plugins list
+   * @return
+   */
+  QVector<ISIMPLibPlugin*> getPluginsVector() const;
+
+  /**
+   * @brief findPlugin
+   * @param pluginName
+   * @return
+   */
+  ISIMPLibPlugin* findPlugin(QString pluginName);
+
+  /**
+   * @brief This method will generate a QJsonObject that will have a tree of
+   * Json objects that represent the information for each of the loaded plugins
+   * @return
+   */
+  QJsonArray toJsonArray() const;
+
+protected:
+  PluginManager();
+
+private:
+  QVector<ISIMPLibPlugin*> m_Plugins;
+  static PluginManager* m_Self;
+
+public:
+  PluginManager(const PluginManager&) = delete;            // Copy Constructor Not Implemented
+  PluginManager(PluginManager&&) = delete;                 // Move Constructor Not Implemented
+  PluginManager& operator=(const PluginManager&) = delete; // Copy Assignment Not Implemented
+  PluginManager& operator=(PluginManager&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Plugin/PluginProxy.cpp b/Source/SIMPLib/Plugin/PluginProxy.cpp
index 8b8aed2781..81e5c5f91e 100644
--- a/Source/SIMPLib/Plugin/PluginProxy.cpp
+++ b/Source/SIMPLib/Plugin/PluginProxy.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PluginProxy.h"
 
diff --git a/Source/SIMPLib/Plugin/PluginProxy.h b/Source/SIMPLib/Plugin/PluginProxy.h
old mode 100755
new mode 100644
index 720c6f4607..8c389f0715
--- a/Source/SIMPLib/Plugin/PluginProxy.h
+++ b/Source/SIMPLib/Plugin/PluginProxy.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <QtCore/QString>
@@ -47,46 +46,45 @@
  */
 class SIMPLib_EXPORT PluginProxy
 {
-  public:
-    using Self = PluginProxy;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = PluginProxy;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-     * @brief Returns the name of the class for PluginProxy
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for PluginProxy
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for PluginProxy
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for PluginProxy
+   */
+  static QString ClassName();
 
-    PluginProxy();
-    virtual ~PluginProxy();
+  PluginProxy();
+  virtual ~PluginProxy();
 
-    void setPluginName(QString name);
-    QString getPluginName();
+  void setPluginName(QString name);
+  QString getPluginName();
 
-    void setFilePath(QString path);
-    QString getFilePath();
+  void setFilePath(QString path);
+  QString getFilePath();
 
-    void setEnabled(bool isEnabled);
-    bool getEnabled();
+  void setEnabled(bool isEnabled);
+  bool getEnabled();
 
-  private:
-    QString m_PluginName;
-    QString m_FilePath;
-    bool m_Enabled;
+private:
+  QString m_PluginName;
+  QString m_FilePath;
+  bool m_Enabled;
 
-  public:
-    PluginProxy(const PluginProxy&) = delete;    // Copy Constructor Not Implemented
-    PluginProxy(PluginProxy&&) = delete;         // Move Constructor Not Implemented
-    PluginProxy& operator=(const PluginProxy&) = delete; // Copy Assignment Not Implemented
-    PluginProxy& operator=(PluginProxy&&) = delete;      // Move Assignment Not Implemented
+public:
+  PluginProxy(const PluginProxy&) = delete;            // Copy Constructor Not Implemented
+  PluginProxy(PluginProxy&&) = delete;                 // Move Constructor Not Implemented
+  PluginProxy& operator=(const PluginProxy&) = delete; // Copy Assignment Not Implemented
+  PluginProxy& operator=(PluginProxy&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Plugin/SIMPLPluginConstants.h b/Source/SIMPLib/Plugin/SIMPLPluginConstants.h
index c48f77a96c..654b0e709f 100644
--- a/Source/SIMPLib/Plugin/SIMPLPluginConstants.h
+++ b/Source/SIMPLib/Plugin/SIMPLPluginConstants.h
@@ -6,7 +6,7 @@
 
 namespace SIMPL
 {
-namespace JSON 
+namespace JSON
 {
 const QString ErrorCode("ErrorCode");
 const QString ErrorMessage("ErrorMessage");
@@ -68,6 +68,6 @@ const QString FilterParameterHumanLabel("FilterParameterHumanLabel");
 const QString FilterParameterPropertyName("FilterParameterPropertyName");
 const QString FilterParameterReadOnly("FilterParameterReadOnly");
 const QString FilterParameters("FilterParameters");
-}
+} // namespace JSON
 
-}
+} // namespace SIMPL
diff --git a/Source/SIMPLib/Plugin/SIMPLibPlugin.h b/Source/SIMPLib/Plugin/SIMPLibPlugin.h
old mode 100755
new mode 100644
index 6c43d4475a..1cee63569c
--- a/Source/SIMPLib/Plugin/SIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/SIMPLibPlugin.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <QtCore/QObject>
@@ -40,84 +40,82 @@
 #include "SIMPLib/SIMPLib.h"
 //#include "ISIMPLibPlugin.h"
 
-
 /**
-* @class SIMPLibPlugin SIMPLibPlugin.h
-* @brief
-* @author
-* @date
-* @version 1.0
-*/
+ * @class SIMPLibPlugin SIMPLibPlugin.h
+ * @brief
+ * @author
+ * @date
+ * @version 1.0
+ */
 class SIMPLib_EXPORT SIMPLibPlugin : public QObject
 {
-    Q_OBJECT
-
-  public:
-    SIMPLibPlugin();
-    ~SIMPLibPlugin() override;
-    /**
-    * @brief Returns the name of the plugin
-    */
-    QString getPluginName();
-
-    /**
-    * @brief Sets the plugin name of the plugin
-    */
-    void setPluginName(QString name);
-
-    /**
-    * @brief Returns the version
-    */
-    QString getVersion();
-
-    /**
-    * @brief Sets the version of the plugin
-    */
-    void setVersion(QString version);
-
-    /**
-    * @brief Returns the name of the vendor
-    */
-    QString getVendor();
-
-    /**
-    * @brief Sets the vendor of the plugin
-    */
-    void setVendor(QString vendor);
-
-    /**
-    * @brief Returns the location of the plugin
-    */
-    QString getLocation();
-
-    /**
-    * @brief Sets the location of the plugin on the file system.
-    * This is required so that we can cache the file path information
-    * as the plugin is loaded.
-    */
-    void setLocation(QString filePath);
-
-    /**
-    * @brief Returns the load status of the plugin
-    */
-    QString getStatus();
-
-    /**
-    * @brief Sets the load status of the plugin
-    */
-    void setStatus(QString status);
-
-  private:
-    QString       m_PluginName;
-    QString             m_Version;
-    QString             m_Vendor;
-    QString             m_Location;
-    QString             m_Status;
-
-  public:
-    SIMPLibPlugin(const SIMPLibPlugin&) = delete;  // Copy Constructor Not Implemented
-    SIMPLibPlugin(SIMPLibPlugin&&) = delete;       // Move Constructor Not Implemented
-    SIMPLibPlugin& operator=(const SIMPLibPlugin&) = delete; // Copy Assignment Not Implemented
-    SIMPLibPlugin& operator=(SIMPLibPlugin&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  SIMPLibPlugin();
+  ~SIMPLibPlugin() override;
+  /**
+   * @brief Returns the name of the plugin
+   */
+  QString getPluginName();
+
+  /**
+   * @brief Sets the plugin name of the plugin
+   */
+  void setPluginName(QString name);
+
+  /**
+   * @brief Returns the version
+   */
+  QString getVersion();
+
+  /**
+   * @brief Sets the version of the plugin
+   */
+  void setVersion(QString version);
+
+  /**
+   * @brief Returns the name of the vendor
+   */
+  QString getVendor();
+
+  /**
+   * @brief Sets the vendor of the plugin
+   */
+  void setVendor(QString vendor);
+
+  /**
+   * @brief Returns the location of the plugin
+   */
+  QString getLocation();
+
+  /**
+   * @brief Sets the location of the plugin on the file system.
+   * This is required so that we can cache the file path information
+   * as the plugin is loaded.
+   */
+  void setLocation(QString filePath);
+
+  /**
+   * @brief Returns the load status of the plugin
+   */
+  QString getStatus();
+
+  /**
+   * @brief Sets the load status of the plugin
+   */
+  void setStatus(QString status);
+
+private:
+  QString m_PluginName;
+  QString m_Version;
+  QString m_Vendor;
+  QString m_Location;
+  QString m_Status;
+
+public:
+  SIMPLibPlugin(const SIMPLibPlugin&) = delete;            // Copy Constructor Not Implemented
+  SIMPLibPlugin(SIMPLibPlugin&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLibPlugin& operator=(const SIMPLibPlugin&) = delete; // Copy Assignment Not Implemented
+  SIMPLibPlugin& operator=(SIMPLibPlugin&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
index df9bab14f5..3082e80ef5 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLibPluginLoader.h"
 
@@ -175,7 +175,7 @@ void SIMPLibPluginLoader::LoadPluginFilters(FilterManager* filterManager, bool q
       }
       aPluginDir.cdUp(); // Move back up a directory level
       int no_error = chdir(aPluginDir.absolutePath().toLatin1().constData());
-      if(no_error < 0  && !quiet)
+      if(no_error < 0 && !quiet)
       {
         qDebug() << "Could not set the working directory.";
       }
@@ -268,7 +268,7 @@ void SIMPLibPluginLoader::LoadPluginFilters(FilterManager* filterManager, bool q
       }
       pluginFileNames += fileName;
     }
-    else if(!quiet) 
+    else if(!quiet)
     {
       QString message("The plugin did not load with the following error\n");
       message.append(loader.errorString());
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
old mode 100755
new mode 100644
index b398f5c9c6..72008bb0fb
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
@@ -1,75 +1,67 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
 #include "SIMPLib/SIMPLib.h"
 
 class FilterManager;
 
-
-
 /**
  * @brief The SIMPLibPluginLoader class loads all the plugins that can be
  * found in when DREAM3D starts up.
  */
 class SIMPLib_EXPORT SIMPLibPluginLoader
 {
-  public:
+public:
+  virtual ~SIMPLibPluginLoader();
 
-    virtual ~SIMPLibPluginLoader();
+  /**
+   * @brief LoadPluginFilters
+   * @param filterManager The FilterManager object to load the filters into when
+   * a plugin is loaded
+   * @param quiet Dump progress to std::cout
+   */
+  static void LoadPluginFilters(FilterManager* filterManager, bool quiet = false);
 
-    /**
-     * @brief LoadPluginFilters
-     * @param filterManager The FilterManager object to load the filters into when
-     * a plugin is loaded
-     * @param quiet Dump progress to std::cout
-     */
-    static void LoadPluginFilters(FilterManager* filterManager, bool quiet = false);
+protected:
+  SIMPLibPluginLoader();
 
-
-  protected:
-    SIMPLibPluginLoader();
-
-  public:
-    SIMPLibPluginLoader(const SIMPLibPluginLoader&) = delete; // Copy Constructor Not Implemented
-    SIMPLibPluginLoader(SIMPLibPluginLoader&&) = delete;      // Move Constructor Not Implemented
-    SIMPLibPluginLoader& operator=(const SIMPLibPluginLoader&) = delete; // Copy Assignment Not Implemented
-    SIMPLibPluginLoader& operator=(SIMPLibPluginLoader&&) = delete;      // Move Assignment Not Implemented
+public:
+  SIMPLibPluginLoader(const SIMPLibPluginLoader&) = delete;            // Copy Constructor Not Implemented
+  SIMPLibPluginLoader(SIMPLibPluginLoader&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLibPluginLoader& operator=(const SIMPLibPluginLoader&) = delete; // Copy Assignment Not Implemented
+  SIMPLibPluginLoader& operator=(SIMPLibPluginLoader&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index 6cd336d138..8743086ba3 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -64,4 +64,3 @@ public slots:
   QFile* m_StatusLog;
   QFile* m_StandardOutputLog;
 };
-
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
index 35048002ff..86a69bc6c5 100644
--- a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
@@ -59,7 +59,6 @@
 PipelineListenerMessageHandler::PipelineListenerMessageHandler(PipelineListener* listener)
 : m_Listener(listener)
 {
-
 }
 
 // -----------------------------------------------------------------------------
@@ -153,7 +152,7 @@ void PipelineListenerMessageHandler::processMessage(const FilterProgressMessage*
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineListenerMessageHandler::streamToLog(const QString &msgString, QFile* log) const
+void PipelineListenerMessageHandler::streamToLog(const QString& msgString, QFile* log) const
 {
   if(log && log->open(QIODevice::ReadWrite))
   {
diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.h b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
index 3385300717..c97593ee45 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.h
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
@@ -70,4 +70,3 @@ class SIMPLib_EXPORT SIMPLDirectoryListing
    */
   static QString ParseDirForTable(QDir directory);
 };
-
diff --git a/Source/SIMPLib/REST/SIMPLRequestMapper.h b/Source/SIMPLib/REST/SIMPLRequestMapper.h
index 72b58366df..a99cdf3da4 100644
--- a/Source/SIMPLib/REST/SIMPLRequestMapper.h
+++ b/Source/SIMPLib/REST/SIMPLRequestMapper.h
@@ -66,4 +66,3 @@ class SIMPLib_EXPORT SIMPLRequestMapper : public HttpRequestHandler
   */
   void service(HttpRequest& request, HttpResponse& response);
 };
-
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
old mode 100755
new mode 100644
index c97f69e38c..4526844632
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -160,14 +160,13 @@ class RESTUnitTest
   QUrl getConnectionURL()
   {
     QUrl url;
-    for (auto address : QNetworkInterface::allAddresses())
+    for(auto address : QNetworkInterface::allAddresses())
     {
-      if (address.protocol() == QAbstractSocket::IPv4Protocol && address != QHostAddress(QHostAddress::LocalHost))
+      if(address.protocol() == QAbstractSocket::IPv4Protocol && address != QHostAddress(QHostAddress::LocalHost))
       {
         url.setHost(address.toString());
         break;
       }
-
     }
     url.setScheme("http");
     url.setPort(8080);
@@ -371,7 +370,7 @@ class RESTUnitTest
 
     QHttpMultiPart* multiPart = new QHttpMultiPart(QHttpMultiPart::FormDataType);
 
-	QString pipelineData;
+    QString pipelineData;
     {
       QFile inputFile(UnitTest::RestUnitTest::SmallIN100ArchivePipeline);
       DREAM3D_REQUIRE_EQUAL(inputFile.open(QIODevice::ReadOnly), true);
@@ -391,7 +390,7 @@ class RESTUnitTest
       doc.setObject(rootObj);
       jsonByteArray = doc.toJson();
 
-	  pipelineData = QString::fromStdString(jsonByteArray.toStdString());
+      pipelineData = QString::fromStdString(jsonByteArray.toStdString());
 
       QHttpPart jsonPart;
       jsonPart.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
diff --git a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
index dbbb921f06..8db7df9693 100644
--- a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.cpp
@@ -37,7 +37,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.h b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.h
index cc65d488f7..d0c27dff29 100644
--- a/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ApiNotFoundController.h
@@ -58,4 +58,3 @@ class SIMPLib_EXPORT ApiNotFoundController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 5a08831718..b46f0dc392 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -77,11 +77,11 @@ void ExecutePipelineController::serviceJSON(QJsonObject pipelineObj)
 
   qDebug() << "Number of Filters in Pipeline: " << pipeline->size();
 
-//  QByteArray sessionId = m_ResponseObj[SIMPL::JSON::SessionID].toVariant().toByteArray();
+  //  QByteArray sessionId = m_ResponseObj[SIMPL::JSON::SessionID].toVariant().toByteArray();
 
-//  QString linkAddress = "http://" + getListenHost().toString() + ":" + QString::number(getListenPort()) + QDir::separator() + QString(sessionId) + QDir::separator();
-//  SIMPLStaticFileController* staticFileController = SIMPLStaticFileController::Instance();
-//  QString docRoot = staticFileController->getDocRoot();
+  //  QString linkAddress = "http://" + getListenHost().toString() + ":" + QString::number(getListenPort()) + QDir::separator() + QString(sessionId) + QDir::separator();
+  //  SIMPLStaticFileController* staticFileController = SIMPLStaticFileController::Instance();
+  //  QString docRoot = staticFileController->getDocRoot();
 
   //  QString newFilePath = docRoot + QDir::separator() + QString(sessionId) + QDir::separator();
   //  QJsonArray outputLinks;
@@ -128,47 +128,47 @@ void ExecutePipelineController::serviceJSON(QJsonObject pipelineObj)
   //    }
   //  }
 
-//  // Log Files
+  //  // Log Files
   PipelineListener listener(nullptr);
-//  bool createErrorLog = pipelineObj[SIMPL::JSON::ErrorLog].toBool(false);
-//  bool createWarningLog = pipelineObj[SIMPL::JSON::WarningLog].toBool(false);
-//  bool createStatusLog = pipelineObj[SIMPL::JSON::StatusLog].toBool(false);
-
-//  QDir docRootDir(docRoot);
-//  docRootDir.mkpath(newFilePath);
-
-//  if(createErrorLog)
-//  {
-//    QString filename = pipeline->getName() + "-err.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createErrorLogFile(filepath);
-
-//    outputLinks.append(linkAddress + filename);
-//  }
-
-//  if(createWarningLog)
-//  {
-//    QString filename = pipeline->getName() + "-warning.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createWarningLogFile(filepath);
-
-//    outputLinks.append(linkAddress + filename);
-//  }
-
-//  if(createStatusLog)
-//  {
-//    QString filename = pipeline->getName() + "-status.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createStatusLogFile(filepath);
-
-//    outputLinks.append(linkAddress + filename);
-//  }
-
-//  // Append to the json response payload all the output links
-//  if(outputLinks.isEmpty() == false)
-//  {
-//    m_ResponseObj[SIMPL::JSON::OutputLinks] = outputLinks;
-//  }
+  //  bool createErrorLog = pipelineObj[SIMPL::JSON::ErrorLog].toBool(false);
+  //  bool createWarningLog = pipelineObj[SIMPL::JSON::WarningLog].toBool(false);
+  //  bool createStatusLog = pipelineObj[SIMPL::JSON::StatusLog].toBool(false);
+
+  //  QDir docRootDir(docRoot);
+  //  docRootDir.mkpath(newFilePath);
+
+  //  if(createErrorLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-err.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createErrorLogFile(filepath);
+
+  //    outputLinks.append(linkAddress + filename);
+  //  }
+
+  //  if(createWarningLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-warning.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createWarningLogFile(filepath);
+
+  //    outputLinks.append(linkAddress + filename);
+  //  }
+
+  //  if(createStatusLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-status.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createStatusLogFile(filepath);
+
+  //    outputLinks.append(linkAddress + filename);
+  //  }
+
+  //  // Append to the json response payload all the output links
+  //  if(outputLinks.isEmpty() == false)
+  //  {
+  //    m_ResponseObj[SIMPL::JSON::OutputLinks] = outputLinks;
+  //  }
 
   // Execute the pipeline
   Observer obs; // Create an Observer to report errors/progress from the executing pipeline
@@ -186,7 +186,6 @@ void ExecutePipelineController::serviceJSON(QJsonObject pipelineObj)
     qDebug() << "Pipeline Done Executing...." << pipeline->getErrorCode();
   }
 
-
   // Return messages
   QJsonArray errors;
   QJsonArray warnings;
@@ -417,7 +416,10 @@ QJsonObject ExecutePipelineController::replaceFilterValuesUsingMetadata(const QS
     // Get the IO_Type value - This will tell us whether the property is an input or an output
     if(!propertyMetadataObj.contains("IO_Type"))
     {
-      m_ResponseObj[SIMPL::JSON::ErrorMessage] = tr("%1: Pipeline metadata is not in the right format: the metadata for property '%2' from filter %3 does not contain 'IO_Type' value.").arg(EndPoint()).arg(propertyName).arg(filterKey.toInt() + 1);
+      m_ResponseObj[SIMPL::JSON::ErrorMessage] = tr("%1: Pipeline metadata is not in the right format: the metadata for property '%2' from filter %3 does not contain 'IO_Type' value.")
+                                                     .arg(EndPoint())
+                                                     .arg(propertyName)
+                                                     .arg(filterKey.toInt() + 1);
       m_ResponseObj[SIMPL::JSON::ErrorCode] = -70;
       QJsonDocument jdoc(m_ResponseObj);
 
@@ -426,7 +428,10 @@ QJsonObject ExecutePipelineController::replaceFilterValuesUsingMetadata(const QS
     }
     else if(!propertyMetadataObj["IO_Type"].isString())
     {
-      m_ResponseObj[SIMPL::JSON::ErrorMessage] = tr("%1: Pipeline metadata is not in the right format: the metadata for property '%2' from filter %3 does not have an 'IO_Type' string value.").arg(EndPoint()).arg(propertyName).arg(filterKey.toInt() + 1);
+      m_ResponseObj[SIMPL::JSON::ErrorMessage] = tr("%1: Pipeline metadata is not in the right format: the metadata for property '%2' from filter %3 does not have an 'IO_Type' string value.")
+                                                     .arg(EndPoint())
+                                                     .arg(propertyName)
+                                                     .arg(filterKey.toInt() + 1);
 
       m_ResponseObj[SIMPL::JSON::ErrorCode] = -70;
       QJsonDocument jdoc(m_ResponseObj);
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
index a925d2b93a..31f07976b5 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineMessageHandler.h
@@ -43,44 +43,43 @@
  */
 class SIMPLib_EXPORT ExecutePipelineMessageHandler : public AbstractMessageHandler
 {
-  public:
-    ExecutePipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
+public:
+  ExecutePipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
 
-    /**
-     * @brief Stores pipeline index, human label, message text, and error code
-     *  of incoming FilterErrorMessages into a json object and stores the json
-     * object in the errors json array.
-     */
-    void processMessage(const FilterErrorMessage* msg) const override;
+  /**
+   * @brief Stores pipeline index, human label, message text, and error code
+   *  of incoming FilterErrorMessages into a json object and stores the json
+   * object in the errors json array.
+   */
+  void processMessage(const FilterErrorMessage* msg) const override;
 
-    /**
-     * @brief Stores pipeline index, human label, message text, and warning code
-     *  of incoming FilterWarningMessages into a json object and stores the json
-     * object in the warnings json array.
-     */
-    void processMessage(const FilterWarningMessage* msg) const override;
+  /**
+   * @brief Stores pipeline index, human label, message text, and warning code
+   *  of incoming FilterWarningMessages into a json object and stores the json
+   * object in the warnings json array.
+   */
+  void processMessage(const FilterWarningMessage* msg) const override;
 
-    /**
-     * @brief Stores message text and warning code of incoming PipelineErrorMessages
-     * into a json object and stores the json object in the errors json array.
-     */
-    void processMessage(const PipelineErrorMessage* msg) const override;
+  /**
+   * @brief Stores message text and warning code of incoming PipelineErrorMessages
+   * into a json object and stores the json object in the errors json array.
+   */
+  void processMessage(const PipelineErrorMessage* msg) const override;
 
-    /**
-     * @brief Stores message text and warning code of incoming PipelineWarningMessages
-     * into a json object and stores the json object in the warnings json array.
-     */
-    void processMessage(const PipelineWarningMessage* msg) const override;
+  /**
+   * @brief Stores message text and warning code of incoming PipelineWarningMessages
+   * into a json object and stores the json object in the warnings json array.
+   */
+  void processMessage(const PipelineWarningMessage* msg) const override;
 
-  private:
-    QJsonArray* m_Errors = nullptr;
-    QJsonArray* m_Warnings = nullptr;
+private:
+  QJsonArray* m_Errors = nullptr;
+  QJsonArray* m_Warnings = nullptr;
 
-    /**
-     * @brief writeToJson
-     * @param code
-     * @param msg
-     */
-    QJsonObject writeToJson(int code, const QString &msg) const;
+  /**
+   * @brief writeToJson
+   * @param code
+   * @param msg
+   */
+  QJsonObject writeToJson(int code, const QString& msg) const;
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.h b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.h
index 554d765cdd..b73fe27ca0 100644
--- a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.h
@@ -65,4 +65,3 @@ class SIMPLib_EXPORT ListFilterParametersController : public HttpRequestHandler
    */
   void createFilterParametersJson(const QString& filterName, QJsonObject& rootObject);
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.h b/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.h
index e45bcdff51..619d66acdc 100644
--- a/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.h
+++ b/Source/SIMPLib/REST/V1Controllers/LoadedPluginsController.h
@@ -69,4 +69,3 @@ class SIMPLib_EXPORT LoadedPluginsController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.h b/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.h
index 79e50dbbb1..7353771520 100644
--- a/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.h
+++ b/Source/SIMPLib/REST/V1Controllers/NamesOfFiltersController.h
@@ -73,4 +73,3 @@ class SIMPLib_EXPORT NamesOfFiltersController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
index 12d51469dd..573fa717aa 100644
--- a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.cpp
@@ -36,7 +36,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.h b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.h
index fcd67b01bc..033611a8ea 100644
--- a/Source/SIMPLib/REST/V1Controllers/NumFiltersController.h
+++ b/Source/SIMPLib/REST/V1Controllers/NumFiltersController.h
@@ -69,4 +69,3 @@ class SIMPLib_EXPORT NumFiltersController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
index 985bf1c22c..b856c752d5 100644
--- a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.cpp
@@ -37,7 +37,6 @@
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
-
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.h b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.h
index 994bc7552a..befd8475de 100644
--- a/Source/SIMPLib/REST/V1Controllers/PluginInfoController.h
+++ b/Source/SIMPLib/REST/V1Controllers/PluginInfoController.h
@@ -77,4 +77,3 @@ class SIMPLib_EXPORT PluginInfoController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
index fbe3c5bb3b..b40a85e650 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
@@ -97,11 +97,11 @@ void PreflightPipelineController::service(HttpRequest& request, HttpResponse& re
     return;
   }
 
-//  QString linkAddress = "http://" + getListenHost().toString() + ":" + QString::number(getListenPort()) + QDir::separator() + QString(session.getId()) + QDir::separator();
-//  SIMPLStaticFileController* staticFileController = SIMPLStaticFileController::Instance();
-//  QString docRoot = staticFileController->getDocRoot();
-//  QString newFilePath = docRoot + QDir::separator() + QString(session.getId()) + QDir::separator();
-//  QJsonArray outputLinks;
+  //  QString linkAddress = "http://" + getListenHost().toString() + ":" + QString::number(getListenPort()) + QDir::separator() + QString(session.getId()) + QDir::separator();
+  //  SIMPLStaticFileController* staticFileController = SIMPLStaticFileController::Instance();
+  //  QString docRoot = staticFileController->getDocRoot();
+  //  QString newFilePath = docRoot + QDir::separator() + QString(session.getId()) + QDir::separator();
+  //  QJsonArray outputLinks;
 
   QJsonObject requestObj = requestDoc.object();
   if(!requestObj.contains(SIMPL::JSON::Pipeline))
@@ -128,43 +128,43 @@ void PreflightPipelineController::service(HttpRequest& request, HttpResponse& re
   PipelineListener listener(nullptr);
   pipeline->addMessageReceiver(&listener);
 
-//  // Log Files
-//  bool createErrorLog = requestObj[SIMPL::JSON::ErrorLog].toBool(false);
-//  bool createWarningLog = requestObj[SIMPL::JSON::WarningLog].toBool(false);
-//  bool createStatusLog = requestObj[SIMPL::JSON::StatusLog].toBool(false);
+  //  // Log Files
+  //  bool createErrorLog = requestObj[SIMPL::JSON::ErrorLog].toBool(false);
+  //  bool createWarningLog = requestObj[SIMPL::JSON::WarningLog].toBool(false);
+  //  bool createStatusLog = requestObj[SIMPL::JSON::StatusLog].toBool(false);
 
-//  QDir docRootDir(docRoot);
-//  docRootDir.mkpath(newFilePath);
+  //  QDir docRootDir(docRoot);
+  //  docRootDir.mkpath(newFilePath);
 
-//  if(createErrorLog)
-//  {
-//    QString filename = pipeline->getName() + "-err.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createErrorLogFile(filepath);
+  //  if(createErrorLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-err.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createErrorLogFile(filepath);
 
-//    outputLinks.append(linkAddress + filename);
-//  }
+  //    outputLinks.append(linkAddress + filename);
+  //  }
 
-//  if(createWarningLog)
-//  {
-//    QString filename = pipeline->getName() + "-warning.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createWarningLogFile(filepath);
+  //  if(createWarningLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-warning.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createWarningLogFile(filepath);
 
-//    outputLinks.append(linkAddress + filename);
-//  }
+  //    outputLinks.append(linkAddress + filename);
+  //  }
 
-//  if(createStatusLog)
-//  {
-//    QString filename = pipeline->getName() + "-status.log";
-//    QString filepath = newFilePath + QDir::separator() + filename;
-//    listener.createStatusLogFile(filepath);
+  //  if(createStatusLog)
+  //  {
+  //    QString filename = pipeline->getName() + "-status.log";
+  //    QString filepath = newFilePath + QDir::separator() + filename;
+  //    listener.createStatusLogFile(filepath);
 
-//    outputLinks.append(linkAddress + filename);
-//  }
+  //    outputLinks.append(linkAddress + filename);
+  //  }
 
-//  // Append to the json response payload all the output links
-//  rootObj[SIMPL::JSON::OutputLinks] = outputLinks;
+  //  // Append to the json response payload all the output links
+  //  rootObj[SIMPL::JSON::OutputLinks] = outputLinks;
 
   // Preflight
   pipeline->preflightPipeline();
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
index 014134d492..02e3b360e3 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.h
@@ -31,7 +31,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include "QtWebApp/httpserver/httprequest.h"
 #include "QtWebApp/httpserver/httprequesthandler.h"
 #include "QtWebApp/httpserver/httpresponse.h"
@@ -64,4 +63,3 @@ class SIMPLib_EXPORT PreflightPipelineController : public HttpRequestHandler
    */
   static QString EndPoint();
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
index 3030c1ef6c..cb79a10b56 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h
@@ -43,45 +43,44 @@
  */
 class SIMPLib_EXPORT PreflightPipelineMessageHandler : public AbstractMessageHandler
 {
-  public:
-    PreflightPipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
+public:
+  PreflightPipelineMessageHandler(QJsonArray* errors, QJsonArray* warnings);
 
-    /**
-     * @brief Stores pipeline index, human label, message text, and error code
-     *  of incoming FilterErrorMessages into a json object and stores the json
-     * object in the errors json array.
-     */
-    void processMessage(const FilterErrorMessage* msg) const override;
+  /**
+   * @brief Stores pipeline index, human label, message text, and error code
+   *  of incoming FilterErrorMessages into a json object and stores the json
+   * object in the errors json array.
+   */
+  void processMessage(const FilterErrorMessage* msg) const override;
 
-    /**
-     * @brief Stores pipeline index, human label, message text, and warning code
-     *  of incoming FilterWarningMessages into a json object and stores the json
-     * object in the warnings json array.
-     */
-    void processMessage(const FilterWarningMessage* msg) const override;
+  /**
+   * @brief Stores pipeline index, human label, message text, and warning code
+   *  of incoming FilterWarningMessages into a json object and stores the json
+   * object in the warnings json array.
+   */
+  void processMessage(const FilterWarningMessage* msg) const override;
 
-    /**
-     * @brief Stores message text and warning code of incoming PipelineErrorMessages
-     * into a json object and stores the json object in the errors json array.
-     */
-    void processMessage(const PipelineErrorMessage* msg) const override;
+  /**
+   * @brief Stores message text and warning code of incoming PipelineErrorMessages
+   * into a json object and stores the json object in the errors json array.
+   */
+  void processMessage(const PipelineErrorMessage* msg) const override;
 
-    /**
-     * @brief Stores message text and warning code of incoming PipelineWarningMessages
-     * into a json object and stores the json object in the warnings json array.
-     */
-    void processMessage(const PipelineWarningMessage* msg) const override;
+  /**
+   * @brief Stores message text and warning code of incoming PipelineWarningMessages
+   * into a json object and stores the json object in the warnings json array.
+   */
+  void processMessage(const PipelineWarningMessage* msg) const override;
 
-  private:
-    QJsonArray* m_Errors = nullptr;
-    QJsonArray* m_Warnings = nullptr;
+private:
+  QJsonArray* m_Errors = nullptr;
+  QJsonArray* m_Warnings = nullptr;
 
-    /**
-     * @brief writeToJson
-     * @param code
-     * @param text
-     * @param humanLabel
-     */
-    QJsonObject writeToJson(int code, const QString &text) const;
+  /**
+   * @brief writeToJson
+   * @param code
+   * @param text
+   * @param humanLabel
+   */
+  QJsonObject writeToJson(int code, const QString& text) const;
 };
-
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h
index 5106e25028..8cb78994e2 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h
@@ -87,5 +87,5 @@ class SIMPLib_EXPORT SIMPLStaticFileController : public HttpRequestHandler
   QMutex mutex;
 
   /** Set a content-type header in the response depending on the ending of the filename */
-  void setContentType(const QString &file, HttpResponse& response) const;
+  void setContentType(const QString& file, HttpResponse& response) const;
 };
diff --git a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
index 57511a8400..47de68be69 100644
--- a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.cpp
@@ -31,7 +31,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "V1RequestMapper.h"
 
-
 #include "QtWebApp/logging/filelogger.h"
 
 #include "ApiNotFoundController.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
index 7a378a2d39..7b149fe389 100644
--- a/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
+++ b/Source/SIMPLib/REST/V1Controllers/V1RequestMapper.h
@@ -65,4 +65,3 @@ class SIMPLib_EXPORT V1RequestMapper : public HttpRequestHandler
   */
   void service(HttpRequest& request, HttpResponse& response);
 };
-
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
index be6a42a949..d800eb40b0 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BoundaryStatsData.h"
 
@@ -153,7 +153,6 @@ void BoundaryStatsData::readJson(const QJsonObject& json)
   {
     setName("Boundary");
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
old mode 100755
new mode 100644
index 2dbf47c0d7..9ec8643a58
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -80,126 +80,124 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT BoundaryStatsData : public StatsData
 {
-  public:
-    using Self = BoundaryStatsData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for BoundaryStatsData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for BoundaryStatsData
-     */
-    static QString ClassName();
-
-    ~BoundaryStatsData() override;
-
-    /**
-     * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
-    {
-      xdmfTypeName = getNameOfClass();
-      precision = 0;
-    }
-
-    /**
-     * @brief Creates the Vector of FloatArrayType for a give distribution type
-     * and sized according to numBins
-     * @param distributionType The type of distribution as laid out in the SIMPL::DistributionType
-     * namespace which should be found in Constants.h.
-     * @param numBins The number of bins that the array should be sized to
-     * @return a VectorOfFloatArray object which could be empty if an unrecognized
-     * distribution type is passed in.
-     */
-    static VectorOfFloatArray CreateCorrelatedDistributionArrays(uint32_t distributionType, size_t numBins);
-    static FloatArrayType::Pointer CreateDistributionArrays(uint32_t distributionType);
-
-    /**
-     * @brief Setter property for BoundaryArea
-     */
-    void setBoundaryArea(float value);
-    /**
-     * @brief Getter property for BoundaryArea
-     * @return Value of BoundaryArea
-     */
-    float getBoundaryArea() const;
-
-    /**
-     * @brief Setter property for ParentPhase
-     */
-    void setParentPhase(float value);
-    /**
-     * @brief Getter property for ParentPhase
-     * @return Value of ParentPhase
-     */
-    float getParentPhase() const;
-
-    /**
-     * @brief getStatsType
-     * @return
-     */
-    QString getStatsType() override;
-
-    /**
-     * @brief getPhaseType
-     * @return
-     */
-    PhaseType::Type getPhaseType() override;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    StatsData::Pointer deepCopy() override;
-
-    /**
-     * @brief writeHDF5Data
-     * @param groupId
-     * @return
-     */
-    int writeHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief readHDF5Data
-     * @param groupId
-     * @return
-     */
-    int readHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief writeJson
-     * @param json
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-     * @brief readJson
-     * @param json
-     */
-    void readJson(const QJsonObject& json) override;
-
-  protected:
-    BoundaryStatsData();
-
-  public:
-    BoundaryStatsData(const BoundaryStatsData&) = delete; // Copy Constructor Not Implemented
-    BoundaryStatsData(BoundaryStatsData&&) = delete;      // Move Constructor Not Implemented
-    BoundaryStatsData& operator=(const BoundaryStatsData&) = delete; // Copy Assignment Not Implemented
-    BoundaryStatsData& operator=(BoundaryStatsData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    float m_BoundaryArea = {};
-    float m_ParentPhase = {};
+public:
+  using Self = BoundaryStatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for BoundaryStatsData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for BoundaryStatsData
+   */
+  static QString ClassName();
+
+  ~BoundaryStatsData() override;
+
+  /**
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
+  {
+    xdmfTypeName = getNameOfClass();
+    precision = 0;
+  }
+
+  /**
+   * @brief Creates the Vector of FloatArrayType for a give distribution type
+   * and sized according to numBins
+   * @param distributionType The type of distribution as laid out in the SIMPL::DistributionType
+   * namespace which should be found in Constants.h.
+   * @param numBins The number of bins that the array should be sized to
+   * @return a VectorOfFloatArray object which could be empty if an unrecognized
+   * distribution type is passed in.
+   */
+  static VectorOfFloatArray CreateCorrelatedDistributionArrays(uint32_t distributionType, size_t numBins);
+  static FloatArrayType::Pointer CreateDistributionArrays(uint32_t distributionType);
+
+  /**
+   * @brief Setter property for BoundaryArea
+   */
+  void setBoundaryArea(float value);
+  /**
+   * @brief Getter property for BoundaryArea
+   * @return Value of BoundaryArea
+   */
+  float getBoundaryArea() const;
+
+  /**
+   * @brief Setter property for ParentPhase
+   */
+  void setParentPhase(float value);
+  /**
+   * @brief Getter property for ParentPhase
+   * @return Value of ParentPhase
+   */
+  float getParentPhase() const;
+
+  /**
+   * @brief getStatsType
+   * @return
+   */
+  QString getStatsType() override;
+
+  /**
+   * @brief getPhaseType
+   * @return
+   */
+  PhaseType::Type getPhaseType() override;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  StatsData::Pointer deepCopy() override;
+
+  /**
+   * @brief writeHDF5Data
+   * @param groupId
+   * @return
+   */
+  int writeHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief readHDF5Data
+   * @param groupId
+   * @return
+   */
+  int readHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief readJson
+   * @param json
+   */
+  void readJson(const QJsonObject& json) override;
+
+protected:
+  BoundaryStatsData();
+
+public:
+  BoundaryStatsData(const BoundaryStatsData&) = delete;            // Copy Constructor Not Implemented
+  BoundaryStatsData(BoundaryStatsData&&) = delete;                 // Move Constructor Not Implemented
+  BoundaryStatsData& operator=(const BoundaryStatsData&) = delete; // Copy Assignment Not Implemented
+  BoundaryStatsData& operator=(BoundaryStatsData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  float m_BoundaryArea = {};
+  float m_ParentPhase = {};
 };
-
-
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.cpp b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
index 9912e3acaf..bea2b4554b 100644
--- a/Source/SIMPLib/StatsData/MatrixStatsData.cpp
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MatrixStatsData.h"
 
@@ -62,7 +62,6 @@ StatsData::Pointer MatrixStatsData::deepCopy()
   return ptr;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -132,7 +131,6 @@ void MatrixStatsData::readJson(const QJsonObject& json)
   {
     setName("Matrix");
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.h b/Source/SIMPLib/StatsData/MatrixStatsData.h
old mode 100755
new mode 100644
index 8480095c46..81c515f163
--- a/Source/SIMPLib/StatsData/MatrixStatsData.h
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,7 +39,6 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -83,93 +81,90 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT MatrixStatsData : public StatsData
 {
-  public:
-    using Self = MatrixStatsData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for MatrixStatsData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for MatrixStatsData
-     */
-    static QString ClassName();
-
-    ~MatrixStatsData() override;
-
-    /**
-     * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
-    {
-      xdmfTypeName = getNameOfClass();
-      precision = 0;
-    }
-
-
-    /**
-     * @brief getStatsType
-     * @return
-     */
-    QString getStatsType() override;
-
-    /**
-     * @brief getPhaseType
-     * @return
-     */
-    PhaseType::Type getPhaseType() override;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    StatsData::Pointer deepCopy() override;
-
-    /**
-     * @brief writeHDF5Data
-     * @param groupId
-     * @return
-     */
-    int writeHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief readHDF5Data
-     * @param groupId
-     * @return
-     */
-    int readHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief writeJson
-     * @param json
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-     * @brief readJson
-     * @param json
-     */
-    void readJson(const QJsonObject& json) override;
-
-  protected:
-    MatrixStatsData();
-
-  public:
-    MatrixStatsData(const MatrixStatsData&) = delete; // Copy Constructor Not Implemented
-    MatrixStatsData(MatrixStatsData&&) = delete;      // Move Constructor Not Implemented
-    MatrixStatsData& operator=(const MatrixStatsData&) = delete; // Copy Assignment Not Implemented
-    MatrixStatsData& operator=(MatrixStatsData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = MatrixStatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for MatrixStatsData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MatrixStatsData
+   */
+  static QString ClassName();
+
+  ~MatrixStatsData() override;
+
+  /**
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
+  {
+    xdmfTypeName = getNameOfClass();
+    precision = 0;
+  }
+
+  /**
+   * @brief getStatsType
+   * @return
+   */
+  QString getStatsType() override;
+
+  /**
+   * @brief getPhaseType
+   * @return
+   */
+  PhaseType::Type getPhaseType() override;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  StatsData::Pointer deepCopy() override;
+
+  /**
+   * @brief writeHDF5Data
+   * @param groupId
+   * @return
+   */
+  int writeHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief readHDF5Data
+   * @param groupId
+   * @return
+   */
+  int readHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief readJson
+   * @param json
+   */
+  void readJson(const QJsonObject& json) override;
+
+protected:
+  MatrixStatsData();
+
+public:
+  MatrixStatsData(const MatrixStatsData&) = delete;            // Copy Constructor Not Implemented
+  MatrixStatsData(MatrixStatsData&&) = delete;                 // Move Constructor Not Implemented
+  MatrixStatsData& operator=(const MatrixStatsData&) = delete; // Copy Assignment Not Implemented
+  MatrixStatsData& operator=(MatrixStatsData&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index 0fab5a7cd9..333a05a8ed 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PrecipitateStatsData.h"
 
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
old mode 100755
new mode 100644
index 989a8c3128..a047269d07
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -41,14 +41,12 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
 #include "SIMPLib/Math/RadialDistributionFunction.h"
 #include "SIMPLib/Math/RdfData.h"
 
-
 typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 
 /**
@@ -186,267 +184,282 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
   {
     m_FeatureDiameterInfo[0] = v;
   }
-    float getBinStepSize() { return m_FeatureDiameterInfo[0]; }
-
-    void setMaxFeatureDiameter(float v) { m_FeatureDiameterInfo[1] = v;}
-    float getMaxFeatureDiameter() { return m_FeatureDiameterInfo[1]; }
-
-    void setMinFeatureDiameter(float v) { m_FeatureDiameterInfo[2] = v;}
-    float getMinFeatureDiameter() { return m_FeatureDiameterInfo[2]; }
-
-    /**
-      * @brief The values are encoded into float arrays
-      */
-    /**
-     * @brief Setter property for FeatureSizeDistribution
-     */
-    void setFeatureSizeDistribution(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSizeDistribution
-     * @return Value of FeatureSizeDistribution
-     */
-    VectorOfFloatArray getFeatureSizeDistribution() const;
-
-    /**
-     * @brief Setter property for FeatureSize_DistType
-     */
-    void setFeatureSize_DistType(uint32_t value);
-    /**
-     * @brief Getter property for FeatureSize_DistType
-     * @return Value of FeatureSize_DistType
-     */
-    uint32_t getFeatureSize_DistType() const;
-
-    /**
-     * @brief Setter property for RadialDistFunction
-     */
-    void setRadialDistFunction(const RdfData::Pointer& value);
-    /**
-     * @brief Getter property for RadialDistFunction
-     * @return Value of RadialDistFunction
-     */
-    RdfData::Pointer getRadialDistFunction() const;
-
-    /**
-     * @brief Setter property for BinNumbers
-     */
-    void setBinNumbers(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for BinNumbers
-     * @return Value of BinNumbers
-     */
-    FloatArrayType::Pointer getBinNumbers() const;
-
-    size_t getNumberOfBins()
-    {
-      return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
-    }
-
-    /**
-     * @brief Setter property for FeatureSize_BOverA
-     */
-    void setFeatureSize_BOverA(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_BOverA
-     * @return Value of FeatureSize_BOverA
-     */
-    VectorOfFloatArray getFeatureSize_BOverA() const;
-
-    /**
-     * @brief Setter property for BOverA_DistType
-     */
-    void setBOverA_DistType(uint32_t value);
-    /**
-     * @brief Getter property for BOverA_DistType
-     * @return Value of BOverA_DistType
-     */
-    uint32_t getBOverA_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_COverA
-     */
-    void setFeatureSize_COverA(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_COverA
-     * @return Value of FeatureSize_COverA
-     */
-    VectorOfFloatArray getFeatureSize_COverA() const;
-
-    /**
-     * @brief Setter property for COverA_DistType
-     */
-    void setCOverA_DistType(uint32_t value);
-    /**
-     * @brief Getter property for COverA_DistType
-     * @return Value of COverA_DistType
-     */
-    uint32_t getCOverA_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_Clustering
-     */
-    void setFeatureSize_Clustering(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_Clustering
-     * @return Value of FeatureSize_Clustering
-     */
-    VectorOfFloatArray getFeatureSize_Clustering() const;
-
-    /**
-     * @brief Setter property for Clustering_DistType
-     */
-    void setClustering_DistType(uint32_t value);
-    /**
-     * @brief Getter property for Clustering_DistType
-     * @return Value of Clustering_DistType
-     */
-    uint32_t getClustering_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_Omegas
-     */
-    void setFeatureSize_Omegas(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_Omegas
-     * @return Value of FeatureSize_Omegas
-     */
-    VectorOfFloatArray getFeatureSize_Omegas() const;
-
-    /**
-     * @brief Setter property for Omegas_DistType
-     */
-    void setOmegas_DistType(uint32_t value);
-    /**
-     * @brief Getter property for Omegas_DistType
-     * @return Value of Omegas_DistType
-     */
-    uint32_t getOmegas_DistType() const;
-
-    /**
-     * @brief Setter property for MisorientationBins
-     */
-    void setMisorientationBins(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for MisorientationBins
-     * @return Value of MisorientationBins
-     */
-    FloatArrayType::Pointer getMisorientationBins() const;
-
-    /* 3 Vectors: Angles, Axis, Weights */
-    /**
-     * @brief Setter property for MDF_Weights
-     */
-    void setMDF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for MDF_Weights
-     * @return Value of MDF_Weights
-     */
-    VectorOfFloatArray getMDF_Weights() const;
-
-    /**
-     * @brief Setter property for ODF
-     */
-    void setODF(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for ODF
-     * @return Value of ODF
-     */
-    FloatArrayType::Pointer getODF() const;
-
-    /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    /**
-     * @brief Setter property for ODF_Weights
-     */
-    void setODF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for ODF_Weights
-     * @return Value of ODF_Weights
-     */
-    VectorOfFloatArray getODF_Weights() const;
-
-    /**
-     * @brief Setter property for AxisOrientation
-     */
-    void setAxisOrientation(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for AxisOrientation
-     * @return Value of AxisOrientation
-     */
-    FloatArrayType::Pointer getAxisOrientation() const;
-
-    /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    /**
-     * @brief Setter property for AxisODF_Weights
-     */
-    void setAxisODF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for AxisODF_Weights
-     * @return Value of AxisODF_Weights
-     */
-    VectorOfFloatArray getAxisODF_Weights() const;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    StatsData::Pointer deepCopy() override;
-
-    /**
-     * @brief writeHDF5Data
-     * @param groupId
-     * @return
-     */
-    int writeHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief readHDF5Data
-     * @param groupId
-     * @return
-     */
-    int readHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief writeJson
-     * @param json
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-     * @brief readJson
-     * @param json
-     */
-    void readJson(const QJsonObject& json) override;
-
-  protected:
-    PrecipitateStatsData();
-
-  public:
-    PrecipitateStatsData(const PrecipitateStatsData&) = delete; // Copy Constructor Not Implemented
-    PrecipitateStatsData(PrecipitateStatsData&&) = delete;      // Move Constructor Not Implemented
-    PrecipitateStatsData& operator=(const PrecipitateStatsData&) = delete; // Copy Assignment Not Implemented
-    PrecipitateStatsData& operator=(PrecipitateStatsData&&) = delete;      // Move Assignment Not Implemented
-
-  private:
-    std::array<float, 3> m_FeatureDiameterInfo = {0.1f, 1.0f, 0.1f};
-
-    float m_BoundaryArea = {};
-    float m_PrecipBoundaryFraction = 0.0f;
-    VectorOfFloatArray m_FeatureSizeDistribution = {};
-    uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
-    RdfData::Pointer m_RadialDistFunction = {};
-    FloatArrayType::Pointer m_BinNumbers = {};
-    VectorOfFloatArray m_FeatureSize_BOverA = {};
-    uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
-    VectorOfFloatArray m_FeatureSize_COverA = {};
-    uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
-    VectorOfFloatArray m_FeatureSize_Clustering = {};
-    uint32_t m_Clustering_DistType = SIMPL::DistributionType::LogNormal;
-    VectorOfFloatArray m_FeatureSize_Omegas = {};
-    uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
-    FloatArrayType::Pointer m_MisorientationBins = {};
-    VectorOfFloatArray m_MDF_Weights = {};
-    FloatArrayType::Pointer m_ODF = {};
-    VectorOfFloatArray m_ODF_Weights = {};
-    FloatArrayType::Pointer m_AxisOrientation = {};
-    VectorOfFloatArray m_AxisODF_Weights = {};
+  float getBinStepSize()
+  {
+    return m_FeatureDiameterInfo[0];
+  }
+
+  void setMaxFeatureDiameter(float v)
+  {
+    m_FeatureDiameterInfo[1] = v;
+  }
+  float getMaxFeatureDiameter()
+  {
+    return m_FeatureDiameterInfo[1];
+  }
+
+  void setMinFeatureDiameter(float v)
+  {
+    m_FeatureDiameterInfo[2] = v;
+  }
+  float getMinFeatureDiameter()
+  {
+    return m_FeatureDiameterInfo[2];
+  }
+
+  /**
+   * @brief The values are encoded into float arrays
+   */
+  /**
+   * @brief Setter property for FeatureSizeDistribution
+   */
+  void setFeatureSizeDistribution(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSizeDistribution
+   * @return Value of FeatureSizeDistribution
+   */
+  VectorOfFloatArray getFeatureSizeDistribution() const;
+
+  /**
+   * @brief Setter property for FeatureSize_DistType
+   */
+  void setFeatureSize_DistType(uint32_t value);
+  /**
+   * @brief Getter property for FeatureSize_DistType
+   * @return Value of FeatureSize_DistType
+   */
+  uint32_t getFeatureSize_DistType() const;
+
+  /**
+   * @brief Setter property for RadialDistFunction
+   */
+  void setRadialDistFunction(const RdfData::Pointer& value);
+  /**
+   * @brief Getter property for RadialDistFunction
+   * @return Value of RadialDistFunction
+   */
+  RdfData::Pointer getRadialDistFunction() const;
+
+  /**
+   * @brief Setter property for BinNumbers
+   */
+  void setBinNumbers(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for BinNumbers
+   * @return Value of BinNumbers
+   */
+  FloatArrayType::Pointer getBinNumbers() const;
+
+  size_t getNumberOfBins()
+  {
+    return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
+  }
+
+  /**
+   * @brief Setter property for FeatureSize_BOverA
+   */
+  void setFeatureSize_BOverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_BOverA
+   * @return Value of FeatureSize_BOverA
+   */
+  VectorOfFloatArray getFeatureSize_BOverA() const;
+
+  /**
+   * @brief Setter property for BOverA_DistType
+   */
+  void setBOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for BOverA_DistType
+   * @return Value of BOverA_DistType
+   */
+  uint32_t getBOverA_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_COverA
+   */
+  void setFeatureSize_COverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_COverA
+   * @return Value of FeatureSize_COverA
+   */
+  VectorOfFloatArray getFeatureSize_COverA() const;
+
+  /**
+   * @brief Setter property for COverA_DistType
+   */
+  void setCOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for COverA_DistType
+   * @return Value of COverA_DistType
+   */
+  uint32_t getCOverA_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Clustering
+   */
+  void setFeatureSize_Clustering(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Clustering
+   * @return Value of FeatureSize_Clustering
+   */
+  VectorOfFloatArray getFeatureSize_Clustering() const;
+
+  /**
+   * @brief Setter property for Clustering_DistType
+   */
+  void setClustering_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Clustering_DistType
+   * @return Value of Clustering_DistType
+   */
+  uint32_t getClustering_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Omegas
+   */
+  void setFeatureSize_Omegas(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Omegas
+   * @return Value of FeatureSize_Omegas
+   */
+  VectorOfFloatArray getFeatureSize_Omegas() const;
+
+  /**
+   * @brief Setter property for Omegas_DistType
+   */
+  void setOmegas_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Omegas_DistType
+   * @return Value of Omegas_DistType
+   */
+  uint32_t getOmegas_DistType() const;
+
+  /**
+   * @brief Setter property for MisorientationBins
+   */
+  void setMisorientationBins(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for MisorientationBins
+   * @return Value of MisorientationBins
+   */
+  FloatArrayType::Pointer getMisorientationBins() const;
+
+  /* 3 Vectors: Angles, Axis, Weights */
+  /**
+   * @brief Setter property for MDF_Weights
+   */
+  void setMDF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for MDF_Weights
+   * @return Value of MDF_Weights
+   */
+  VectorOfFloatArray getMDF_Weights() const;
+
+  /**
+   * @brief Setter property for ODF
+   */
+  void setODF(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for ODF
+   * @return Value of ODF
+   */
+  FloatArrayType::Pointer getODF() const;
+
+  /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
+  /**
+   * @brief Setter property for ODF_Weights
+   */
+  void setODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for ODF_Weights
+   * @return Value of ODF_Weights
+   */
+  VectorOfFloatArray getODF_Weights() const;
+
+  /**
+   * @brief Setter property for AxisOrientation
+   */
+  void setAxisOrientation(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for AxisOrientation
+   * @return Value of AxisOrientation
+   */
+  FloatArrayType::Pointer getAxisOrientation() const;
+
+  /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
+  /**
+   * @brief Setter property for AxisODF_Weights
+   */
+  void setAxisODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for AxisODF_Weights
+   * @return Value of AxisODF_Weights
+   */
+  VectorOfFloatArray getAxisODF_Weights() const;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  StatsData::Pointer deepCopy() override;
+
+  /**
+   * @brief writeHDF5Data
+   * @param groupId
+   * @return
+   */
+  int writeHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief readHDF5Data
+   * @param groupId
+   * @return
+   */
+  int readHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief readJson
+   * @param json
+   */
+  void readJson(const QJsonObject& json) override;
+
+protected:
+  PrecipitateStatsData();
+
+public:
+  PrecipitateStatsData(const PrecipitateStatsData&) = delete;            // Copy Constructor Not Implemented
+  PrecipitateStatsData(PrecipitateStatsData&&) = delete;                 // Move Constructor Not Implemented
+  PrecipitateStatsData& operator=(const PrecipitateStatsData&) = delete; // Copy Assignment Not Implemented
+  PrecipitateStatsData& operator=(PrecipitateStatsData&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  std::array<float, 3> m_FeatureDiameterInfo = {0.1f, 1.0f, 0.1f};
+
+  float m_BoundaryArea = {};
+  float m_PrecipBoundaryFraction = 0.0f;
+  VectorOfFloatArray m_FeatureSizeDistribution = {};
+  uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
+  RdfData::Pointer m_RadialDistFunction = {};
+  FloatArrayType::Pointer m_BinNumbers = {};
+  VectorOfFloatArray m_FeatureSize_BOverA = {};
+  uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
+  VectorOfFloatArray m_FeatureSize_COverA = {};
+  uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
+  VectorOfFloatArray m_FeatureSize_Clustering = {};
+  uint32_t m_Clustering_DistType = SIMPL::DistributionType::LogNormal;
+  VectorOfFloatArray m_FeatureSize_Omegas = {};
+  uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
+  FloatArrayType::Pointer m_MisorientationBins = {};
+  VectorOfFloatArray m_MDF_Weights = {};
+  FloatArrayType::Pointer m_ODF = {};
+  VectorOfFloatArray m_ODF_Weights = {};
+  FloatArrayType::Pointer m_AxisOrientation = {};
+  VectorOfFloatArray m_AxisODF_Weights = {};
 };
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 8b3cfd1641..2fbae3a770 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StatsData.h"
 
@@ -294,7 +294,8 @@ void StatsData::writeJsonDistributionArrays(QJsonObject& json, VectorOfFloatArra
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> typename DataArray<T>::Pointer decodeDataArrayFromJsonDoubleArray(const QString& name, const QJsonArray& array)
+template <typename T>
+typename DataArray<T>::Pointer decodeDataArrayFromJsonDoubleArray(const QString& name, const QJsonArray& array)
 {
   int count = array.count();
   typename DataArray<T>::Pointer dataArray = DataArray<T>::CreateArray(count, name, true);
@@ -308,7 +309,8 @@ template <typename T> typename DataArray<T>::Pointer decodeDataArrayFromJsonDoub
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> typename DataArray<T>::Pointer decodeDataArrayFromJsonIntArray(const QString& name, const QJsonArray& array)
+template <typename T>
+typename DataArray<T>::Pointer decodeDataArrayFromJsonIntArray(const QString& name, const QJsonArray& array)
 {
   int count = array.count();
   typename DataArray<T>::Pointer dataArray = DataArray<T>::CreateArray(count, name, true);
@@ -396,9 +398,9 @@ int StatsData::ParseFloat3Vec(const QJsonObject& json, const QString& key, std::
     return 0;
   }
 
-    values[0] = defaultValue;
-    values[1] = defaultValue;
-    values[2] = defaultValue;
+  values[0] = defaultValue;
+  values[1] = defaultValue;
+  values[2] = defaultValue;
 
   return -1;
 }
diff --git a/Source/SIMPLib/StatsData/StatsData.h b/Source/SIMPLib/StatsData/StatsData.h
old mode 100755
new mode 100644
index 36097216ff..a3769f9770
--- a/Source/SIMPLib/StatsData/StatsData.h
+++ b/Source/SIMPLib/StatsData/StatsData.h
@@ -229,7 +229,8 @@ class SIMPLib_EXPORT StatsData
    * @param data
    * @return
    */
-  template <typename T> QJsonArray generateJsonArrayFromDataArray(typename DataArray<T>::Pointer data)
+  template <typename T>
+  QJsonArray generateJsonArrayFromDataArray(typename DataArray<T>::Pointer data)
   {
     QJsonArray json;
     if(nullptr != data.get())
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index 74db13d66d..6937005e79 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TransformationStatsData.h"
 
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.h b/Source/SIMPLib/StatsData/TransformationStatsData.h
old mode 100755
new mode 100644
index 388d6076c3..01fe5a2efd
--- a/Source/SIMPLib/StatsData/TransformationStatsData.h
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,7 +41,6 @@
 
 #include <hdf5.h>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
@@ -84,336 +82,352 @@ typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
  */
 class SIMPLib_EXPORT TransformationStatsData : public StatsData
 {
-  public:
-    using Self = TransformationStatsData;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    /**
-     * @brief Returns the name of the class for TransformationStatsData
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for TransformationStatsData
-     */
-    static QString ClassName();
-
-    ~TransformationStatsData() override;
-
-    /**
-     * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
-     * can be a primitive like char, float, int or the name of a class.
-     * @return
-     */
-    void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
-    {
-      xdmfTypeName = getNameOfClass();
-      precision = 0;
-    }
-
-    QString getStatsType() override;
-    PhaseType::Type getPhaseType() override;
-
-    /**
-     * @brief Setter property for BoundaryArea
-     */
-    void setBoundaryArea(float value);
-    /**
-     * @brief Getter property for BoundaryArea
-     * @return Value of BoundaryArea
-     */
-    float getBoundaryArea() const;
-
-    /**
-     * @brief Setter property for ParentPhase
-     */
-    void setParentPhase(float value);
-    /**
-     * @brief Getter property for ParentPhase
-     * @return Value of ParentPhase
-     */
-    float getParentPhase() const;
-
-    /**
-      * @breif this will generate the Bin Numbers values;
-      */
-    FloatArrayType::Pointer generateBinNumbers();
-    /**
-     * @brief The values are encoded into 3 floats: Average, Max, Min
-     */
-    /**
-     * @brief Setter property for FeatureDiameterInfo
-     */
-    void setFeatureDiameterInfo(const std::array<float, 3>& value);
-    /**
-     * @brief Setter property for FeatureDiameterInfo
-     */
-    void setFeatureDiameterInfo(float v0, float v1, float v2);
-    /**
-     * @brief Getter property for FeatureDiameterInfo
-     * @return Value of FeatureDiameterInfo
-     */
-    std::array<float, 3> getFeatureDiameterInfo() const;
-    void getFeatureDiameterInfo(float* data) const;
-
-    void setBinStepSize(float v) { m_FeatureDiameterInfo[0] = v;}
-    float getBinStepSize() { return m_FeatureDiameterInfo[0]; }
-
-    void setMaxFeatureDiameter(float v) { m_FeatureDiameterInfo[1] = v;}
-    float getMaxFeatureDiameter() { return m_FeatureDiameterInfo[1]; }
-
-    void setMinFeatureDiameter(float v) { m_FeatureDiameterInfo[2] = v;}
-    float getMinFeatureDiameter() { return m_FeatureDiameterInfo[2]; }
-
-    /**
-      * @brief The values are encoded into float arrays
-      */
-    /**
-     * @brief Setter property for FeatureSizeDistribution
-     */
-    void setFeatureSizeDistribution(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSizeDistribution
-     * @return Value of FeatureSizeDistribution
-     */
-    VectorOfFloatArray getFeatureSizeDistribution() const;
-
-    /**
-     * @brief Setter property for FeatureSize_DistType
-     */
-    void setFeatureSize_DistType(uint32_t value);
-    /**
-     * @brief Getter property for FeatureSize_DistType
-     * @return Value of FeatureSize_DistType
-     */
-    uint32_t getFeatureSize_DistType() const;
-
-    /**
-     * @brief Setter property for BinNumbers
-     */
-    void setBinNumbers(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for BinNumbers
-     * @return Value of BinNumbers
-     */
-    FloatArrayType::Pointer getBinNumbers() const;
-
-    size_t getNumberOfBins()
-    {
-      return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
-    }
-
-    /**
-     * @brief Setter property for FeatureSize_BOverA
-     */
-    void setFeatureSize_BOverA(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_BOverA
-     * @return Value of FeatureSize_BOverA
-     */
-    VectorOfFloatArray getFeatureSize_BOverA() const;
-
-    /**
-     * @brief Setter property for BOverA_DistType
-     */
-    void setBOverA_DistType(uint32_t value);
-    /**
-     * @brief Getter property for BOverA_DistType
-     * @return Value of BOverA_DistType
-     */
-    uint32_t getBOverA_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_COverA
-     */
-    void setFeatureSize_COverA(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_COverA
-     * @return Value of FeatureSize_COverA
-     */
-    VectorOfFloatArray getFeatureSize_COverA() const;
-
-    /**
-     * @brief Setter property for COverA_DistType
-     */
-    void setCOverA_DistType(uint32_t value);
-    /**
-     * @brief Getter property for COverA_DistType
-     * @return Value of COverA_DistType
-     */
-    uint32_t getCOverA_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_Neighbors
-     */
-    void setFeatureSize_Neighbors(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_Neighbors
-     * @return Value of FeatureSize_Neighbors
-     */
-    VectorOfFloatArray getFeatureSize_Neighbors() const;
-
-    /**
-     * @brief Setter property for Neighbors_DistType
-     */
-    void setNeighbors_DistType(uint32_t value);
-    /**
-     * @brief Getter property for Neighbors_DistType
-     * @return Value of Neighbors_DistType
-     */
-    uint32_t getNeighbors_DistType() const;
-
-    /**
-     * @brief Setter property for FeatureSize_Omegas
-     */
-    void setFeatureSize_Omegas(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for FeatureSize_Omegas
-     * @return Value of FeatureSize_Omegas
-     */
-    VectorOfFloatArray getFeatureSize_Omegas() const;
-
-    /**
-     * @brief Setter property for Omegas_DistType
-     */
-    void setOmegas_DistType(uint32_t value);
-    /**
-     * @brief Getter property for Omegas_DistType
-     * @return Value of Omegas_DistType
-     */
-    uint32_t getOmegas_DistType() const;
-
-    /**
-     * @brief Setter property for MisorientationBins
-     */
-    void setMisorientationBins(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for MisorientationBins
-     * @return Value of MisorientationBins
-     */
-    FloatArrayType::Pointer getMisorientationBins() const;
-
-    /* 3 Vectors: Angles, Axis, Weights */
-    /**
-     * @brief Setter property for MDF_Weights
-     */
-    void setMDF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for MDF_Weights
-     * @return Value of MDF_Weights
-     */
-    VectorOfFloatArray getMDF_Weights() const;
-
-    /**
-     * @brief Setter property for ODF
-     */
-    void setODF(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for ODF
-     * @return Value of ODF
-     */
-    FloatArrayType::Pointer getODF() const;
-
-    /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    /**
-     * @brief Setter property for ODF_Weights
-     */
-    void setODF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for ODF_Weights
-     * @return Value of ODF_Weights
-     */
-    VectorOfFloatArray getODF_Weights() const;
-
-    /**
-     * @brief Setter property for AxisOrientation
-     */
-    void setAxisOrientation(const FloatArrayType::Pointer& value);
-    /**
-     * @brief Getter property for AxisOrientation
-     * @return Value of AxisOrientation
-     */
-    FloatArrayType::Pointer getAxisOrientation() const;
-
-    /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
-    /**
-     * @brief Setter property for AxisODF_Weights
-     */
-    void setAxisODF_Weights(const VectorOfFloatArray& value);
-    /**
-     * @brief Getter property for AxisODF_Weights
-     * @return Value of AxisODF_Weights
-     */
-    VectorOfFloatArray getAxisODF_Weights() const;
-
-    /**
-     * @brief deepCopy
-     * @return
-     */
-    StatsData::Pointer deepCopy() override;
-
-    /**
-     * @brief writeHDF5Data
-     * @param groupId
-     * @return
-     */
-    int writeHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief readHDF5Data
-     * @param groupId
-     * @return
-     */
-    int readHDF5Data(hid_t groupId) override;
-
-    /**
-     * @brief writeJson
-     * @param json
-     */
-    void writeJson(QJsonObject& json) override;
-
-    /**
-     * @brief readJson
-     * @param json
-     */
-    void readJson(const QJsonObject& json) override;
-
-  protected:
-    TransformationStatsData();
-
-  private:
-    std::array<float, 3> m_FeatureDiameterInfo;
-
-    float m_BoundaryArea = {};
-    float m_ParentPhase = {};
-    VectorOfFloatArray m_FeatureSizeDistribution = {};
-    uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
-    FloatArrayType::Pointer m_BinNumbers = {};
-    VectorOfFloatArray m_FeatureSize_BOverA = {};
-    uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
-    VectorOfFloatArray m_FeatureSize_COverA = {};
-    uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
-    VectorOfFloatArray m_FeatureSize_Neighbors = {};
-    uint32_t m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
-    VectorOfFloatArray m_FeatureSize_Omegas = {};
-    uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
-    FloatArrayType::Pointer m_MisorientationBins = {};
-    VectorOfFloatArray m_MDF_Weights = {};
-    FloatArrayType::Pointer m_ODF = {};
-    VectorOfFloatArray m_ODF_Weights = {};
-    FloatArrayType::Pointer m_AxisOrientation = {};
-    VectorOfFloatArray m_AxisODF_Weights = {};
-
-  public:
-    TransformationStatsData(const TransformationStatsData&) = delete;            // Copy Constructor Not Implemented
-    TransformationStatsData(TransformationStatsData&&) = delete;                 // Move Constructor Not Implemented
-    TransformationStatsData& operator=(const TransformationStatsData&) = delete; // Copy Assignment Not Implemented
-    TransformationStatsData& operator=(TransformationStatsData&&) = delete;      // Move Assignment Not Implemented
+public:
+  using Self = TransformationStatsData;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for TransformationStatsData
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for TransformationStatsData
+   */
+  static QString ClassName();
+
+  ~TransformationStatsData() override;
+
+  /**
+   * @brief GetTypeName Returns a string representation of the type of data that is stored by this class. This
+   * can be a primitive like char, float, int or the name of a class.
+   * @return
+   */
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
+  {
+    xdmfTypeName = getNameOfClass();
+    precision = 0;
+  }
+
+  QString getStatsType() override;
+  PhaseType::Type getPhaseType() override;
+
+  /**
+   * @brief Setter property for BoundaryArea
+   */
+  void setBoundaryArea(float value);
+  /**
+   * @brief Getter property for BoundaryArea
+   * @return Value of BoundaryArea
+   */
+  float getBoundaryArea() const;
+
+  /**
+   * @brief Setter property for ParentPhase
+   */
+  void setParentPhase(float value);
+  /**
+   * @brief Getter property for ParentPhase
+   * @return Value of ParentPhase
+   */
+  float getParentPhase() const;
+
+  /**
+   * @breif this will generate the Bin Numbers values;
+   */
+  FloatArrayType::Pointer generateBinNumbers();
+  /**
+   * @brief The values are encoded into 3 floats: Average, Max, Min
+   */
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(const std::array<float, 3>& value);
+  /**
+   * @brief Setter property for FeatureDiameterInfo
+   */
+  void setFeatureDiameterInfo(float v0, float v1, float v2);
+  /**
+   * @brief Getter property for FeatureDiameterInfo
+   * @return Value of FeatureDiameterInfo
+   */
+  std::array<float, 3> getFeatureDiameterInfo() const;
+  void getFeatureDiameterInfo(float* data) const;
+
+  void setBinStepSize(float v)
+  {
+    m_FeatureDiameterInfo[0] = v;
+  }
+  float getBinStepSize()
+  {
+    return m_FeatureDiameterInfo[0];
+  }
+
+  void setMaxFeatureDiameter(float v)
+  {
+    m_FeatureDiameterInfo[1] = v;
+  }
+  float getMaxFeatureDiameter()
+  {
+    return m_FeatureDiameterInfo[1];
+  }
+
+  void setMinFeatureDiameter(float v)
+  {
+    m_FeatureDiameterInfo[2] = v;
+  }
+  float getMinFeatureDiameter()
+  {
+    return m_FeatureDiameterInfo[2];
+  }
+
+  /**
+   * @brief The values are encoded into float arrays
+   */
+  /**
+   * @brief Setter property for FeatureSizeDistribution
+   */
+  void setFeatureSizeDistribution(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSizeDistribution
+   * @return Value of FeatureSizeDistribution
+   */
+  VectorOfFloatArray getFeatureSizeDistribution() const;
+
+  /**
+   * @brief Setter property for FeatureSize_DistType
+   */
+  void setFeatureSize_DistType(uint32_t value);
+  /**
+   * @brief Getter property for FeatureSize_DistType
+   * @return Value of FeatureSize_DistType
+   */
+  uint32_t getFeatureSize_DistType() const;
+
+  /**
+   * @brief Setter property for BinNumbers
+   */
+  void setBinNumbers(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for BinNumbers
+   * @return Value of BinNumbers
+   */
+  FloatArrayType::Pointer getBinNumbers() const;
+
+  size_t getNumberOfBins()
+  {
+    return (m_BinNumbers.get() == nullptr) ? 0 : m_BinNumbers->getSize();
+  }
+
+  /**
+   * @brief Setter property for FeatureSize_BOverA
+   */
+  void setFeatureSize_BOverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_BOverA
+   * @return Value of FeatureSize_BOverA
+   */
+  VectorOfFloatArray getFeatureSize_BOverA() const;
+
+  /**
+   * @brief Setter property for BOverA_DistType
+   */
+  void setBOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for BOverA_DistType
+   * @return Value of BOverA_DistType
+   */
+  uint32_t getBOverA_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_COverA
+   */
+  void setFeatureSize_COverA(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_COverA
+   * @return Value of FeatureSize_COverA
+   */
+  VectorOfFloatArray getFeatureSize_COverA() const;
+
+  /**
+   * @brief Setter property for COverA_DistType
+   */
+  void setCOverA_DistType(uint32_t value);
+  /**
+   * @brief Getter property for COverA_DistType
+   * @return Value of COverA_DistType
+   */
+  uint32_t getCOverA_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Neighbors
+   */
+  void setFeatureSize_Neighbors(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Neighbors
+   * @return Value of FeatureSize_Neighbors
+   */
+  VectorOfFloatArray getFeatureSize_Neighbors() const;
+
+  /**
+   * @brief Setter property for Neighbors_DistType
+   */
+  void setNeighbors_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Neighbors_DistType
+   * @return Value of Neighbors_DistType
+   */
+  uint32_t getNeighbors_DistType() const;
+
+  /**
+   * @brief Setter property for FeatureSize_Omegas
+   */
+  void setFeatureSize_Omegas(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for FeatureSize_Omegas
+   * @return Value of FeatureSize_Omegas
+   */
+  VectorOfFloatArray getFeatureSize_Omegas() const;
+
+  /**
+   * @brief Setter property for Omegas_DistType
+   */
+  void setOmegas_DistType(uint32_t value);
+  /**
+   * @brief Getter property for Omegas_DistType
+   * @return Value of Omegas_DistType
+   */
+  uint32_t getOmegas_DistType() const;
+
+  /**
+   * @brief Setter property for MisorientationBins
+   */
+  void setMisorientationBins(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for MisorientationBins
+   * @return Value of MisorientationBins
+   */
+  FloatArrayType::Pointer getMisorientationBins() const;
+
+  /* 3 Vectors: Angles, Axis, Weights */
+  /**
+   * @brief Setter property for MDF_Weights
+   */
+  void setMDF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for MDF_Weights
+   * @return Value of MDF_Weights
+   */
+  VectorOfFloatArray getMDF_Weights() const;
+
+  /**
+   * @brief Setter property for ODF
+   */
+  void setODF(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for ODF
+   * @return Value of ODF
+   */
+  FloatArrayType::Pointer getODF() const;
+
+  /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
+  /**
+   * @brief Setter property for ODF_Weights
+   */
+  void setODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for ODF_Weights
+   * @return Value of ODF_Weights
+   */
+  VectorOfFloatArray getODF_Weights() const;
+
+  /**
+   * @brief Setter property for AxisOrientation
+   */
+  void setAxisOrientation(const FloatArrayType::Pointer& value);
+  /**
+   * @brief Getter property for AxisOrientation
+   * @return Value of AxisOrientation
+   */
+  FloatArrayType::Pointer getAxisOrientation() const;
+
+  /* 5 Vectors: Euler 1, Euler 2, Euler 3, Sigma, Weights */
+  /**
+   * @brief Setter property for AxisODF_Weights
+   */
+  void setAxisODF_Weights(const VectorOfFloatArray& value);
+  /**
+   * @brief Getter property for AxisODF_Weights
+   * @return Value of AxisODF_Weights
+   */
+  VectorOfFloatArray getAxisODF_Weights() const;
+
+  /**
+   * @brief deepCopy
+   * @return
+   */
+  StatsData::Pointer deepCopy() override;
+
+  /**
+   * @brief writeHDF5Data
+   * @param groupId
+   * @return
+   */
+  int writeHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief readHDF5Data
+   * @param groupId
+   * @return
+   */
+  int readHDF5Data(hid_t groupId) override;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief readJson
+   * @param json
+   */
+  void readJson(const QJsonObject& json) override;
+
+protected:
+  TransformationStatsData();
+
+private:
+  std::array<float, 3> m_FeatureDiameterInfo;
+
+  float m_BoundaryArea = {};
+  float m_ParentPhase = {};
+  VectorOfFloatArray m_FeatureSizeDistribution = {};
+  uint32_t m_FeatureSize_DistType = SIMPL::DistributionType::LogNormal;
+  FloatArrayType::Pointer m_BinNumbers = {};
+  VectorOfFloatArray m_FeatureSize_BOverA = {};
+  uint32_t m_BOverA_DistType = SIMPL::DistributionType::Beta;
+  VectorOfFloatArray m_FeatureSize_COverA = {};
+  uint32_t m_COverA_DistType = SIMPL::DistributionType::Beta;
+  VectorOfFloatArray m_FeatureSize_Neighbors = {};
+  uint32_t m_Neighbors_DistType = SIMPL::DistributionType::LogNormal;
+  VectorOfFloatArray m_FeatureSize_Omegas = {};
+  uint32_t m_Omegas_DistType = SIMPL::DistributionType::Beta;
+  FloatArrayType::Pointer m_MisorientationBins = {};
+  VectorOfFloatArray m_MDF_Weights = {};
+  FloatArrayType::Pointer m_ODF = {};
+  VectorOfFloatArray m_ODF_Weights = {};
+  FloatArrayType::Pointer m_AxisOrientation = {};
+  VectorOfFloatArray m_AxisODF_Weights = {};
+
+public:
+  TransformationStatsData(const TransformationStatsData&) = delete;            // Copy Constructor Not Implemented
+  TransformationStatsData(TransformationStatsData&&) = delete;                 // Move Constructor Not Implemented
+  TransformationStatsData& operator=(const TransformationStatsData&) = delete; // Copy Assignment Not Implemented
+  TransformationStatsData& operator=(TransformationStatsData&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index 189c948aea..b68db6c8fe 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -134,8 +134,8 @@ void ArraySelectionExample::execute()
 AbstractFilter::Pointer ArraySelectionExample::newFilterInstance(bool copyFilterParameters) const
 {
   /*
-  * DataContainerArrayProxy
-  */
+   * DataContainerArrayProxy
+   */
   ArraySelectionExample::Pointer filter = ArraySelectionExample::New();
   if(copyFilterParameters)
   {
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index f31cc8a907..c2e8c83059 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -111,24 +111,24 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   Q_PROPERTY(DataContainerArrayProxy DataContainerArrayProxy READ getDataContainerArrayProxy WRITE setDataContainerArrayProxy)
 
   /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
+   * @brief This returns the group that the filter belonds to. You can select
+   * a different group if you want. The string returned here will be displayed
+   * in the GUI for the filter
+   */
   QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
   QString getGroupName() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override;
 
   /**
@@ -138,15 +138,15 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   QUuid getUuid() const override;
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
@@ -155,9 +155,9 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   void execute() override;
 
   /**
-  * @brief This function runs some sanity checks on the DataContainer and inputs
-  * in an attempt to ensure the filter can process the inputs.
-  */
+   * @brief This function runs some sanity checks on the DataContainer and inputs
+   * in an attempt to ensure the filter can process the inputs.
+   */
   void preflight() override;
 
 protected:
@@ -174,12 +174,11 @@ class SIMPLib_EXPORT ArraySelectionExample : public AbstractFilter
   void initialize();
 
 public:
-  ArraySelectionExample(const ArraySelectionExample&) = delete; // Copy Constructor Not Implemented
-  ArraySelectionExample(ArraySelectionExample&&) = delete;      // Move Constructor Not Implemented
+  ArraySelectionExample(const ArraySelectionExample&) = delete;            // Copy Constructor Not Implemented
+  ArraySelectionExample(ArraySelectionExample&&) = delete;                 // Move Constructor Not Implemented
   ArraySelectionExample& operator=(const ArraySelectionExample&) = delete; // Copy Assignment Not Implemented
   ArraySelectionExample& operator=(ArraySelectionExample&&) = delete;      // Move Assignment Not Implemented
 
 private:
   DataContainerArrayProxy m_DataContainerArrayProxy = {};
 };
-
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index 9210bbb115..c742b6940c 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <memory>
 
 #include "DynamicTableExample.h"
@@ -165,7 +165,6 @@ void DynamicTableExample::dataCheck()
   // This filter does nothing during the dataCheck!
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index bdb3b43ab3..57f3396688 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -1,38 +1,38 @@
 
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -42,12 +42,12 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
-* @class DynamicTableExample DynamicTableExample.h ExamplePlugin/Code/ExamplePluginFilters/DynamicTableExample.h
-* @brief
-* @author
-* @date
-* @version 1.0
-*/
+ * @class DynamicTableExample DynamicTableExample.h ExamplePlugin/Code/ExamplePluginFilters/DynamicTableExample.h
+ * @brief
+ * @author
+ * @date
+ * @version 1.0
+ */
 class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
 {
   Q_OBJECT
@@ -70,7 +70,7 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -160,15 +160,15 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   QString getGroupName() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override;
 
   /**
@@ -178,23 +178,22 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   QUuid getUuid() const override;
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
-  * @brief Reimplemented from @see AbstractFilter class
-  */
+   * @brief Reimplemented from @see AbstractFilter class
+   */
   void execute() override;
 
-
 protected:
   DynamicTableExample();
 
@@ -209,8 +208,8 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   void initialize();
 
 public:
-  DynamicTableExample(const DynamicTableExample&) = delete; // Copy Constructor Not Implemented
-  DynamicTableExample(DynamicTableExample&&) = delete;      // Move Constructor Not Implemented
+  DynamicTableExample(const DynamicTableExample&) = delete;            // Copy Constructor Not Implemented
+  DynamicTableExample(DynamicTableExample&&) = delete;                 // Move Constructor Not Implemented
   DynamicTableExample& operator=(const DynamicTableExample&) = delete; // Copy Assignment Not Implemented
   DynamicTableExample& operator=(DynamicTableExample&&) = delete;      // Move Assignment Not Implemented
 
@@ -221,4 +220,3 @@ class SIMPLib_EXPORT DynamicTableExample : public AbstractFilter
   DynamicTableData m_DynamicData4 = {};
   DynamicTableData m_DynamicData5 = {};
 };
-
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 4757aa3c24..b5b1c7e3c8 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -105,7 +105,6 @@ void ErrorWarningFilter::dataCheck()
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -133,7 +132,6 @@ void ErrorWarningFilter::execute()
     QString ss = QObject::tr("Intentional execute error generated");
     setErrorCondition(-666001, ss);
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
index 8b8313ee06..fcd5b9ba3e 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.h
@@ -1,34 +1,34 @@
 
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -155,7 +155,7 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -201,23 +201,22 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ErrorWarningFilter();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
-  ErrorWarningFilter(const ErrorWarningFilter&) = delete; // Copy Constructor Not Implemented
-  ErrorWarningFilter(ErrorWarningFilter&&) = delete;      // Move Constructor Not Implemented
+  ErrorWarningFilter(const ErrorWarningFilter&) = delete;            // Copy Constructor Not Implemented
+  ErrorWarningFilter(ErrorWarningFilter&&) = delete;                 // Move Constructor Not Implemented
   ErrorWarningFilter& operator=(const ErrorWarningFilter&) = delete; // Copy Assignment Not Implemented
   ErrorWarningFilter& operator=(ErrorWarningFilter&&) = delete;      // Move Assignment Not Implemented
 
@@ -228,4 +227,3 @@ class SIMPLib_EXPORT ErrorWarningFilter : public AbstractFilter
   bool m_ExecuteError = {};
   bool m_PropertyError = {};
 };
-
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index af36031cbd..9c1c29c339 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -24,7 +24,7 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -88,43 +88,43 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
   int32_t getFilt0_Integer() const;
 
   /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
+   * @brief This returns the group that the filter belonds to. You can select
+   * a different group if you want. The string returned here will be displayed
+   * in the GUI for the filter
+   */
   QString getGroupName() const override
   {
     return SIMPL::FilterGroups::Generic;
   }
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override
   {
     return "Filt0";
   }
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override
   {
     return "Misc";
   }
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
@@ -132,7 +132,6 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   Filt0();
 
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index 5146223ccd..93aaaa05ba 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -12,7 +12,6 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -25,7 +24,7 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -79,43 +78,43 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   int32_t getFilt1_Integer() const;
 
   /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
+   * @brief This returns the group that the filter belonds to. You can select
+   * a different group if you want. The string returned here will be displayed
+   * in the GUI for the filter
+   */
   QString getGroupName() const override
   {
     return "TestFilters";
   }
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override
   {
     return "Filt1";
   }
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override
   {
     return "Test";
   }
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
@@ -123,7 +122,6 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   Filt1();
 
@@ -145,4 +143,3 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
   Filt1(const Filt1&) = delete;          // Copy Constructor Not Implemented
   void operator=(const Filt1&) = delete; // Move assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.cpp b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
index d432725561..ff36f054b1 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup00::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup00::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.h b/Source/SIMPLib/TestFilters/FilterGroup00.h
index cbb81bcbd4..eb2fa687a7 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup00 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup00 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,22 +128,20 @@ class FilterGroup00 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup00();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck();
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 private:
   FilterGroup00(const FilterGroup00&) = delete;  // Copy Constructor Not Implemented
   void operator=(const FilterGroup00&) = delete; // Move assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index d3bdd7d4e5..252874bd5e 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup01::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup01::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.h b/Source/SIMPLib/TestFilters/FilterGroup01.h
index 47f8d5fac6..807d3d5891 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup01 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup01 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup01 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup01();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup01 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index 42bb2e3a64..dea8968ea5 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup02::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup02::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.h b/Source/SIMPLib/TestFilters/FilterGroup02.h
index 2ce8d9ccf2..e7adaa4903 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup02 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup02 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup02 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup02();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup02 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index f7fa0b30aa..e6a30fb8ba 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup03::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup03::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.h b/Source/SIMPLib/TestFilters/FilterGroup03.h
index cd4b6d3dd4..5e2a3265f9 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup03 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup03 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup03 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup03();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup03 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index 4508248550..211e144924 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup04::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup04::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.h b/Source/SIMPLib/TestFilters/FilterGroup04.h
index 6991047479..6860153b34 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup04 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup04 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup04 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup04();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup04 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index dace241b6f..57a5629c68 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup05::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup05::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.h b/Source/SIMPLib/TestFilters/FilterGroup05.h
index f61b288da9..5308fd48b0 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup05 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup05 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup05 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup05();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup05 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index 928a2e275c..26093b19e5 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup06::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup06::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.h b/Source/SIMPLib/TestFilters/FilterGroup06.h
index bed793cb94..3b88f65a52 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup06 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup06 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup06 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup06();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup06 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index c5c7c45b23..159263b2dc 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup07::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup07::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.h b/Source/SIMPLib/TestFilters/FilterGroup07.h
index 1dbbf27aca..4fe79ef8ae 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup07 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup07 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup07 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup07();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup07 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index fd7c9a0883..d16008b772 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup08::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup08::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.h b/Source/SIMPLib/TestFilters/FilterGroup08.h
index 17a389cd1d..0847f09b1d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup08 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup08 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup08 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup08();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup08 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index 1185a7da56..6d690d6540 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup09::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup09::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.h b/Source/SIMPLib/TestFilters/FilterGroup09.h
index 2bf2bd6c23..4e5ac8ba0d 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup09 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup09 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup09 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup09();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup09 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index 625bd89b94..69a0a581e6 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup10::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup10::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.h b/Source/SIMPLib/TestFilters/FilterGroup10.h
index d4ea7e7507..6e7a5964ae 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup10 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup10 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup10 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup10();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup10 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index 3d19957a4c..4f8873192b 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup12::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup12::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.h b/Source/SIMPLib/TestFilters/FilterGroup12.h
index 3f361b496d..69fa56a7a9 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup12 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup12 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup12 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup12();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup12 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index 33b1fb1dcd..b0ae341074 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
@@ -80,7 +80,6 @@ void FilterGroup13::dataCheck()
   clearWarningCode();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -104,7 +103,6 @@ void FilterGroup13::execute()
     setErrorCondition(-99999999, ss);
     return;
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.h b/Source/SIMPLib/TestFilters/FilterGroup13.h
index 9068e4ce8b..6b26a804c2 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,7 +49,7 @@ class FilterGroup13 : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -82,7 +82,7 @@ class FilterGroup13 : public AbstractFilter
    * @brief getBrandingString Returns the branding string for the filter, which is a tag
    * used to denote the filter's association with specific plugins
    * @return Branding string
-  */
+   */
   QString getBrandingString() const override;
 
   /**
@@ -128,18 +128,17 @@ class FilterGroup13 : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   FilterGroup13();
 
   /**
-  * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
-  */
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
   void dataCheck() override;
 
   /**
-  * @brief Initializes all the private instance variables.
-  */
+   * @brief Initializes all the private instance variables.
+   */
   void initialize();
 
 public:
@@ -150,4 +149,3 @@ class FilterGroup13 : public AbstractFilter
 
 private:
 };
-
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index ed1e5b641a..0976942b1f 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <memory>
 
@@ -113,7 +113,6 @@ GenericExample::GenericExample()
   flInfo.FileSuffix = "_suffix";
   flInfo.FileExtension = ".png";
   setInputFileListInfo(flInfo);
-
 }
 
 // -----------------------------------------------------------------------------
@@ -386,10 +385,8 @@ void GenericExample::dataCheck()
   clearWarningCode();
 
   FileSystemPathHelper::CheckOutputFile(this, "Output File Name", getOutputFile(), true);
-
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 393652c40d..738bf8a93e 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -122,7 +122,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -656,15 +656,15 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   QString getGroupName() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override;
 
   /**
@@ -674,27 +674,27 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   QUuid getUuid() const override;
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
-  * @brief readFilterParametersFromJson Reads the filter parameters from a file
-  * @param reader Reader that is used to read the parameters from a file
-  */
+   * @brief readFilterParametersFromJson Reads the filter parameters from a file
+   * @param reader Reader that is used to read the parameters from a file
+   */
   void readFilterParameters(QJsonObject& obj) override;
 
   /**
-  * @brief writeFilterParametersToJson Writes the filter parameters to a file
-  * @param root The root json object
-  */
+   * @brief writeFilterParametersToJson Writes the filter parameters to a file
+   * @param root The root json object
+   */
   void writeFilterParameters(QJsonObject& obj) const override;
 
   /**
@@ -702,7 +702,6 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   GenericExample();
 
@@ -717,8 +716,8 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   void initialize();
 
 public:
-  GenericExample(const GenericExample&) = delete; // Copy Constructor Not Implemented
-  GenericExample(GenericExample&&) = delete;      // Move Constructor Not Implemented
+  GenericExample(const GenericExample&) = delete;            // Copy Constructor Not Implemented
+  GenericExample(GenericExample&&) = delete;                 // Move Constructor Not Implemented
   GenericExample& operator=(const GenericExample&) = delete; // Copy Assignment Not Implemented
   GenericExample& operator=(GenericExample&&) = delete;      // Move Assignment Not Implemented
 
@@ -766,4 +765,3 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   int m_DistanceMetric = {};
   MontageSelection m_MontageSelection = {};
 };
-
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 89ce6a763e..5ff7a1ee28 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <memory>
 
@@ -131,9 +131,8 @@ void MakeDataContainer::dataCheck()
   //  }
 
   std::vector<size_t> dims(1, 1);
-  m_FeatureIdsPtr =
-      cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FeatureIdsPtr = cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                          /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
   }
@@ -159,7 +158,6 @@ void MakeDataContainer::dataCheck()
   m->setGeometry(vertices);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index 8eacda7674..55df2c43f9 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -43,12 +43,12 @@
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
-* @class ReadOrientationData ReadOrientationData.h /FilterCategoryFilters/ReadOrientationData.h
-* @brief
-* @author
-* @date
-* @version 1.0
-*/
+ * @class ReadOrientationData ReadOrientationData.h /FilterCategoryFilters/ReadOrientationData.h
+ * @brief
+ * @author
+ * @date
+ * @version 1.0
+ */
 class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
 {
   Q_OBJECT
@@ -71,7 +71,7 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -145,10 +145,10 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   QString getMaterialNameArrayName() const;
 
   /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
+   * @brief This returns the group that the filter belonds to. You can select
+   * a different group if you want. The string returned here will be displayed
+   * in the GUI for the filter
+   */
   /**
    * @brief Setter property for FeatureIdsArrayName
    */
@@ -214,19 +214,19 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   QString getGroupName() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override;
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override; /**
-*@brief This returns a string that is displayed in the GUI and helps to sort the filters into
-*a subgroup. It should be readable and understandable by humans.
-*/
+                                          *@brief This returns a string that is displayed in the GUI and helps to sort the filters into
+                                          *a subgroup. It should be readable and understandable by humans.
+                                          */
   QString getSubGroupName() const override;
 
   /**
@@ -236,17 +236,16 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   QUuid getUuid() const override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
-  * @brief Reimplemented from @see AbstractFilter class
-  */
+   * @brief Reimplemented from @see AbstractFilter class
+   */
   void execute() override;
 
-
 protected:
   MakeDataContainer();
 
@@ -284,9 +283,8 @@ class SIMPLib_EXPORT MakeDataContainer : public AbstractFilter
   QString m_LatticeConstantsArrayName = {};
 
 public:
-  MakeDataContainer(const MakeDataContainer&) = delete; // Copy Constructor Not Implemented
-  MakeDataContainer(MakeDataContainer&&) = delete;      // Move Constructor Not Implemented
+  MakeDataContainer(const MakeDataContainer&) = delete;            // Copy Constructor Not Implemented
+  MakeDataContainer(MakeDataContainer&&) = delete;                 // Move Constructor Not Implemented
   MakeDataContainer& operator=(const MakeDataContainer&) = delete; // Copy Assignment Not Implemented
   MakeDataContainer& operator=(MakeDataContainer&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index e1ded700dc..6d60b8e8a9 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <memory>
 
@@ -165,7 +165,6 @@ void ThresholdExample::dataCheck()
   */
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -181,13 +180,13 @@ void ThresholdExample::execute()
 AbstractFilter::Pointer ThresholdExample::newFilterInstance(bool copyFilterParameters) const
 {
   /*
-  * CellComparisonInputs
-  * FeatureComparisonInputs
-  * EnsembleComparisonInputs
-  * PointComparisonInputs
-  * FaceComparisonInputs
-  * EdgeComparisonInputs
-  */
+   * CellComparisonInputs
+   * FeatureComparisonInputs
+   * EnsembleComparisonInputs
+   * PointComparisonInputs
+   * FaceComparisonInputs
+   * EdgeComparisonInputs
+   */
   ThresholdExample::Pointer filter = ThresholdExample::New();
   if(copyFilterParameters)
   {
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index 1847b95468..5d4045f3e5 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  
+
   /**
    * @brief Returns a NullPointer wrapped by a shared_ptr<>
    * @return
@@ -129,24 +129,24 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   Q_PROPERTY(ComparisonInputs CellComparisonInputs READ getCellComparisonInputs WRITE setCellComparisonInputs)
 
   /**
-  * @brief This returns the group that the filter belonds to. You can select
-  * a different group if you want. The string returned here will be displayed
-  * in the GUI for the filter
-  */
+   * @brief This returns the group that the filter belonds to. You can select
+   * a different group if you want. The string returned here will be displayed
+   * in the GUI for the filter
+   */
   QString getCompiledLibraryName() const override;
   AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
   QString getGroupName() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI. It should be readable
-  * and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI. It should be readable
+   * and understandable by humans.
+   */
   QString getHumanLabel() const override;
 
   /**
-  * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
-  * a subgroup. It should be readable and understandable by humans.
-  */
+   * @brief This returns a string that is displayed in the GUI and helps to sort the filters into
+   * a subgroup. It should be readable and understandable by humans.
+   */
   QString getSubGroupName() const override;
 
   /**
@@ -156,15 +156,15 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   QUuid getUuid() const override;
 
   /**
-  * @brief This method will instantiate all the end user settable options/parameters
-  * for this filter
-  */
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
   void setupFilterParameters() override;
 
   /**
-  * @brief This method will read the options from a file
-  * @param reader The reader that is used to read the options from a file
-  */
+   * @brief This method will read the options from a file
+   * @param reader The reader that is used to read the options from a file
+   */
   void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
 
   /**
@@ -172,7 +172,6 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
    */
   void execute() override;
 
-
 protected:
   ThresholdExample();
 
@@ -187,8 +186,8 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   void initialize();
 
 public:
-  ThresholdExample(const ThresholdExample&) = delete; // Copy Constructor Not Implemented
-  ThresholdExample(ThresholdExample&&) = delete;      // Move Constructor Not Implemented
+  ThresholdExample(const ThresholdExample&) = delete;            // Copy Constructor Not Implemented
+  ThresholdExample(ThresholdExample&&) = delete;                 // Move Constructor Not Implemented
   ThresholdExample& operator=(const ThresholdExample&) = delete; // Copy Assignment Not Implemented
   ThresholdExample& operator=(ThresholdExample&&) = delete;      // Move Assignment Not Implemented
 
@@ -197,4 +196,3 @@ class SIMPLib_EXPORT ThresholdExample : public AbstractFilter
   QString m_CellAttributeMatrixName = {};
   ComparisonInputs m_CellComparisonInputs = {};
 };
-
diff --git a/Source/SIMPLib/Utilities/ColorTable.h b/Source/SIMPLib/Utilities/ColorTable.h
old mode 100755
new mode 100644
index 5af582460f..7eb95170ae
--- a/Source/SIMPLib/Utilities/ColorTable.h
+++ b/Source/SIMPLib/Utilities/ColorTable.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,56 +45,57 @@
 
 class SIMPLib_EXPORT RgbColor
 {
-  public:
-    /**
-    * @brief Rgb An ARGB quadruplet on the format #AARRGGBB, equivalent to an unsigned int and The type also holds a value for the alpha-channel.
-    */
-    inline static int dRed(SIMPL::Rgb rgb)
-    {
-      return ((rgb >> 16) & 0xff);
-    }
-
-    inline static int dGreen(SIMPL::Rgb rgb)
-    {
-      return ((rgb >> 8) & 0xff);
-    }
-
-    inline static int dBlue(SIMPL::Rgb rgb)
-    {
-      return (rgb & 0xff);
-    }
-
-    inline static int dAlpha(SIMPL::Rgb rgb)
-    {
-      return rgb >> 24;
-    }
-
-    inline static int dGray(SIMPL::Rgb rgb)
-    {
-      return  (((rgb >> 16) & 0xff) * 11 + ((rgb >> 8) & 0xff) * 16 + (rgb & 0xff) * 5) / 32;
-    }
-
-    inline static SIMPL::Rgb dRgb(int r, int g, int b, int a)
-    {
-      return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
-    }
-
-    inline static void print(std::ostream& out, const char& sep, const SIMPL::Rgb& rgb)
-    {
-      out << "rgb: " << RgbColor::dRed(rgb) << sep << RgbColor::dGreen(rgb) << sep << RgbColor::dBlue(rgb);
-    }
-
-    inline static bool compare(const SIMPL::Rgb& left, const SIMPL::Rgb& right)
-    {
-      return left == right;
-    }
-
-    inline static std::tuple<float, float, float> fRgb(SIMPL::Rgb rgb)
-    {
-      return std::make_tuple(static_cast<float>(((rgb >> 16) & 0xff)/255.0f), static_cast<float>(((rgb >> 8) & 0xff)/255.0f), static_cast<float>((rgb & 0xff)/255.0f));
-    }
-  protected:
-    RgbColor() = default;
+public:
+  /**
+   * @brief Rgb An ARGB quadruplet on the format #AARRGGBB, equivalent to an unsigned int and The type also holds a value for the alpha-channel.
+   */
+  inline static int dRed(SIMPL::Rgb rgb)
+  {
+    return ((rgb >> 16) & 0xff);
+  }
+
+  inline static int dGreen(SIMPL::Rgb rgb)
+  {
+    return ((rgb >> 8) & 0xff);
+  }
+
+  inline static int dBlue(SIMPL::Rgb rgb)
+  {
+    return (rgb & 0xff);
+  }
+
+  inline static int dAlpha(SIMPL::Rgb rgb)
+  {
+    return rgb >> 24;
+  }
+
+  inline static int dGray(SIMPL::Rgb rgb)
+  {
+    return (((rgb >> 16) & 0xff) * 11 + ((rgb >> 8) & 0xff) * 16 + (rgb & 0xff) * 5) / 32;
+  }
+
+  inline static SIMPL::Rgb dRgb(int r, int g, int b, int a)
+  {
+    return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
+  }
+
+  inline static void print(std::ostream& out, const char& sep, const SIMPL::Rgb& rgb)
+  {
+    out << "rgb: " << RgbColor::dRed(rgb) << sep << RgbColor::dGreen(rgb) << sep << RgbColor::dBlue(rgb);
+  }
+
+  inline static bool compare(const SIMPL::Rgb& left, const SIMPL::Rgb& right)
+  {
+    return left == right;
+  }
+
+  inline static std::tuple<float, float, float> fRgb(SIMPL::Rgb rgb)
+  {
+    return std::make_tuple(static_cast<float>(((rgb >> 16) & 0xff) / 255.0f), static_cast<float>(((rgb >> 8) & 0xff) / 255.0f), static_cast<float>((rgb & 0xff) / 255.0f));
+  }
+
+protected:
+  RgbColor() = default;
 };
 
 class QJsonArray;
@@ -108,30 +109,29 @@ class QJsonArray;
  */
 class SIMPLib_EXPORT SIMPLColorTable
 {
-  public:
-    SIMPLColorTable();
-    virtual ~SIMPLColorTable();
-
-    /**
-    * @brief Assumes you've already generated min and max -- the extrema for the data
-    * to which you're applying the color map. Then define the number of colorNodes
-    * and make sure there's a row of three float values (representing r, g, and b
-    * in a 0.0-1.0 range) for each node. Then call this method for with parameter
-    * val some float value between min and max inclusive. The corresponding rgb
-    * values will be returned in the reference-to-float parameters r, g, and b.
-    * @param val
-    * @param r [output] The Red Value (0 <= 1.0)
-    * @param g [output] The Green Value (0 <= 1.0)
-    * @param b [output] The Blue Value (0 <= 1.0)
-    * @param max
-    * @param min
-    */
-    static void GetColorTable(int numColors, QVector<float>& colors);
-
-    static std::vector<unsigned char> GetColorTable(size_t numColors, QJsonArray colorNodeArray);
-
-  private:
-    SIMPLColorTable(const SIMPLColorTable&) = delete; // Copy Constructor Not Implemented
-    void operator=(const SIMPLColorTable&) = delete;  // Move assignment Not Implemented
+public:
+  SIMPLColorTable();
+  virtual ~SIMPLColorTable();
+
+  /**
+   * @brief Assumes you've already generated min and max -- the extrema for the data
+   * to which you're applying the color map. Then define the number of colorNodes
+   * and make sure there's a row of three float values (representing r, g, and b
+   * in a 0.0-1.0 range) for each node. Then call this method for with parameter
+   * val some float value between min and max inclusive. The corresponding rgb
+   * values will be returned in the reference-to-float parameters r, g, and b.
+   * @param val
+   * @param r [output] The Red Value (0 <= 1.0)
+   * @param g [output] The Green Value (0 <= 1.0)
+   * @param b [output] The Blue Value (0 <= 1.0)
+   * @param max
+   * @param min
+   */
+  static void GetColorTable(int numColors, QVector<float>& colors);
+
+  static std::vector<unsigned char> GetColorTable(size_t numColors, QJsonArray colorNodeArray);
+
+private:
+  SIMPLColorTable(const SIMPLColorTable&) = delete; // Copy Constructor Not Implemented
+  void operator=(const SIMPLColorTable&) = delete;  // Move assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Utilities/ColorUtilities.cpp b/Source/SIMPLib/Utilities/ColorUtilities.cpp
index 1ab56cc799..5bbf29d799 100644
--- a/Source/SIMPLib/Utilities/ColorUtilities.cpp
+++ b/Source/SIMPLib/Utilities/ColorUtilities.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ColorUtilities.h"
 
diff --git a/Source/SIMPLib/Utilities/ColorUtilities.h b/Source/SIMPLib/Utilities/ColorUtilities.h
old mode 100755
new mode 100644
index 53ba6ce88e..97871a95f5
--- a/Source/SIMPLib/Utilities/ColorUtilities.h
+++ b/Source/SIMPLib/Utilities/ColorUtilities.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,40 +42,37 @@
 
 class SIMPLib_EXPORT ColorUtilities
 {
-  public:
-    ~ColorUtilities();
+public:
+  ~ColorUtilities();
 
-    /**
-     * @brief
-     * @param h 0-1 Range
-     * @param s 0-1 Range
-     * @param v 0-1 Range
-     * @return Rgb Conversion
-     */
-    static SIMPL::Rgb ConvertHSVtoRgb(float h, float s, float v);
+  /**
+   * @brief
+   * @param h 0-1 Range
+   * @param s 0-1 Range
+   * @param v 0-1 Range
+   * @return Rgb Conversion
+   */
+  static SIMPL::Rgb ConvertHSVtoRgb(float h, float s, float v);
 
-    /**
-     * @brief
-     * @param h angle in degrees
-     * @param s a fraction between 0 and 1
-     * @param v a fraction between 0 and 1
-     * @return Rgb Conversion
-     */
-    static SIMPL::Rgb Hsv2Rgb(float h, float s, float v);
+  /**
+   * @brief
+   * @param h angle in degrees
+   * @param s a fraction between 0 and 1
+   * @param v a fraction between 0 and 1
+   * @return Rgb Conversion
+   */
+  static SIMPL::Rgb Hsv2Rgb(float h, float s, float v);
 
-    /**
-     * @brief Generates a vector of colors based on the HSV color wheel. The colors
-     * are evenly distributed around the color wheel by taking 360/count.
-     * @param count The total number of colors
-     * @param saturation Range between 0-255
-     * @param value      Range between 0-255
-     * @return
-     */
-    static QVector<SIMPL::Rgb> GenerateColors(int count, int saturation = 255, int value = 255);
+  /**
+   * @brief Generates a vector of colors based on the HSV color wheel. The colors
+   * are evenly distributed around the color wheel by taking 360/count.
+   * @param count The total number of colors
+   * @param saturation Range between 0-255
+   * @param value      Range between 0-255
+   * @return
+   */
+  static QVector<SIMPL::Rgb> GenerateColors(int count, int saturation = 255, int value = 255);
 
-  protected:
-    ColorUtilities();
+protected:
+  ColorUtilities();
 };
-
-
-
diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.h b/Source/SIMPLib/Utilities/FilePathGenerator.h
old mode 100755
new mode 100644
index 7eb3797dd2..71357310ea
--- a/Source/SIMPLib/Utilities/FilePathGenerator.h
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.h
@@ -48,7 +48,8 @@ class SIMPLib_EXPORT FilePathGenerator
   /**
    * @brief This struct is used for generating Row/Column Indexes
    */
-  template <unsigned Dimension, typename T, class String> struct Tile
+  template <unsigned Dimension, typename T, class String>
+  struct Tile
   {
     std::array<int32_t, Dimension> data; // r, c index
     String FileName;
@@ -118,9 +119,8 @@ class SIMPLib_EXPORT FilePathGenerator
   FilePathGenerator();
 
 public:
-  FilePathGenerator(const FilePathGenerator&) = delete; // Copy Constructor Not Implemented
-  FilePathGenerator(FilePathGenerator&&) = delete;      // Move Constructor Not Implemented
+  FilePathGenerator(const FilePathGenerator&) = delete;            // Copy Constructor Not Implemented
+  FilePathGenerator(FilePathGenerator&&) = delete;                 // Move Constructor Not Implemented
   FilePathGenerator& operator=(const FilePathGenerator&) = delete; // Copy Assignment Not Implemented
   FilePathGenerator& operator=(FilePathGenerator&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
index 654564e411..4513a4494d 100644
--- a/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
+++ b/Source/SIMPLib/Utilities/FileSystemPathHelper.cpp
@@ -46,10 +46,7 @@ FileSystemPathHelper::~FileSystemPathHelper() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter,
-                                           const QString &parameterName,
-                                           const QString &filePath,
-                                           bool requireExtension)
+void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter, const QString& parameterName, const QString& filePath, bool requireExtension)
 {
   if(filePath.isEmpty())
   {
@@ -77,7 +74,6 @@ void FileSystemPathHelper::CheckOutputFile(AbstractFilter* filter,
       QString ss = QObject::tr("The file path for input parameter '%1' does not have a file extension. Please use a file extension to denote the type of file being written.").arg(parameterName);
       filter->setErrorCondition(-903, ss);
     }
-
   }
 
 #ifdef _WIN32
diff --git a/Source/SIMPLib/Utilities/FileSystemPathHelper.h b/Source/SIMPLib/Utilities/FileSystemPathHelper.h
index 92d0142234..b8e669ed79 100644
--- a/Source/SIMPLib/Utilities/FileSystemPathHelper.h
+++ b/Source/SIMPLib/Utilities/FileSystemPathHelper.h
@@ -39,22 +39,18 @@ class AbstractFilter;
 
 class SIMPLib_EXPORT FileSystemPathHelper
 {
-  public:
-    FileSystemPathHelper();
-    ~FileSystemPathHelper();
-
-    /**
-     * @brief CheckOutputFile This will check a file path to see if it is not empty, exists,
-     * is NOT a directory, has proper permissions and optionally require a file extension.
-     * and
-     * @param obs Abstract Filter
-     * @param parameterName The human readable name of the parameter for use in error and warning messages.
-     * @param filePath The proposed path to the output file.
-     * @param requireExtension Should be output file have a file extension set.
-     */
-    static void CheckOutputFile(AbstractFilter *obs,
-                                const QString &parameterName,
-                                const QString& filePath,
-                                bool requireExtension);
+public:
+  FileSystemPathHelper();
+  ~FileSystemPathHelper();
 
+  /**
+   * @brief CheckOutputFile This will check a file path to see if it is not empty, exists,
+   * is NOT a directory, has proper permissions and optionally require a file extension.
+   * and
+   * @param obs Abstract Filter
+   * @param parameterName The human readable name of the parameter for use in error and warning messages.
+   * @param filePath The proposed path to the output file.
+   * @param requireExtension Should be output file have a file extension set.
+   */
+  static void CheckOutputFile(AbstractFilter* obs, const QString& parameterName, const QString& filePath, bool requireExtension);
 };
diff --git a/Source/SIMPLib/Utilities/FloatSummation.h b/Source/SIMPLib/Utilities/FloatSummation.h
index d338bef04b..0f8ce18156 100644
--- a/Source/SIMPLib/Utilities/FloatSummation.h
+++ b/Source/SIMPLib/Utilities/FloatSummation.h
@@ -38,8 +38,8 @@
 #include "SIMPLib/Common/Constants.h"
 
 /**
-* @brief The FloatSummation class contains helper methods for summation of floating point numbers
-*/
+ * @brief The FloatSummation class contains helper methods for summation of floating point numbers
+ */
 class SIMPLib_EXPORT FloatSummation
 {
 public:
@@ -47,35 +47,34 @@ class SIMPLib_EXPORT FloatSummation
   virtual ~FloatSummation();
 
   /**
-  * @brief Performs a Kahan summation over a vector of floating point numbers and returns the result
-  * @param values The vector of floats used for the summation
-  * @returns Kahan summation of floating point numbers
-  */
+   * @brief Performs a Kahan summation over a vector of floating point numbers and returns the result
+   * @param values The vector of floats used for the summation
+   * @returns Kahan summation of floating point numbers
+   */
   static float Kahanf(std::vector<float> values);
   /**
-  * @brief Performs a Kahan summation over a vector of floating point numbers and returns the result
-  * @param values The vector of doubles used for the summation
-  * @returns Kahan summation of floating point numbers
-  */
+   * @brief Performs a Kahan summation over a vector of floating point numbers and returns the result
+   * @param values The vector of doubles used for the summation
+   * @returns Kahan summation of floating point numbers
+   */
   static double Kahan(std::vector<double> values);
 
   /**
-  * @brief Performs a Kahan summation over a list of floating point numbers and returns the result
-  * @param values The initializer_list of floats used for the summation
-  * @returns Kahan summation of floating point numbers
-  */
+   * @brief Performs a Kahan summation over a list of floating point numbers and returns the result
+   * @param values The initializer_list of floats used for the summation
+   * @returns Kahan summation of floating point numbers
+   */
   static float Kahanf(std::initializer_list<float> values);
   /**
-  * @brief Performs a Kahan summation over a list of floating point numbers and returns the result
-  * @param values The initializer_list of doubles used for the summation
-  * @returns Kahan summation of floating point numbers
-  */
+   * @brief Performs a Kahan summation over a list of floating point numbers and returns the result
+   * @param values The initializer_list of doubles used for the summation
+   * @returns Kahan summation of floating point numbers
+   */
   static double Kahan(std::initializer_list<double> values);
 
 public:
-  FloatSummation(const FloatSummation&) = delete; // Copy Constructor Not Implemented
-  FloatSummation(FloatSummation&&) = delete;      // Move Constructor Not Implemented
+  FloatSummation(const FloatSummation&) = delete;            // Copy Constructor Not Implemented
+  FloatSummation(FloatSummation&&) = delete;                 // Move Constructor Not Implemented
   FloatSummation& operator=(const FloatSummation&) = delete; // Copy Assignment Not Implemented
   FloatSummation& operator=(FloatSummation&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
index 42b4a94867..f2b9b37d0b 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
@@ -34,9 +34,9 @@
 
 #include "ParallelData2DAlgorithm.h"
 
- // -----------------------------------------------------------------------------
- //
- // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 ParallelData2DAlgorithm::ParallelData2DAlgorithm()
 : m_Range(SIMPLRange2D())
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -88,7 +88,7 @@ void ParallelData2DAlgorithm::setRange(const SIMPLRange2D& range)
 // -----------------------------------------------------------------------------
 void ParallelData2DAlgorithm::setRange(size_t minRows, size_t minCols, size_t maxRows, size_t maxCols)
 {
-  m_Range = { minRows, minCols, maxRows, maxCols };
+  m_Range = {minRows, minCols, maxRows, maxCols};
 }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
index 7d84b21714..9f8033792c 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
@@ -34,9 +34,9 @@
 
 #include "ParallelData3DAlgorithm.h"
 
- // -----------------------------------------------------------------------------
- //
- // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 ParallelData3DAlgorithm::ParallelData3DAlgorithm()
 : m_Range(SIMPLRange3D())
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -88,7 +88,7 @@ void ParallelData3DAlgorithm::setRange(const SIMPLRange3D& range)
 // -----------------------------------------------------------------------------
 void ParallelData3DAlgorithm::setRange(size_t xMax, size_t yMax, size_t zMax)
 {
-  m_Range = { 0, xMax, 0, yMax, 0, zMax };
+  m_Range = {0, xMax, 0, yMax, 0, zMax};
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
index c215820083..44b011ac4f 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
@@ -34,9 +34,9 @@
 
 #include "ParallelDataAlgorithm.h"
 
- // -----------------------------------------------------------------------------
- //
- // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 ParallelDataAlgorithm::ParallelDataAlgorithm()
 : m_Range(SIMPLRange())
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
@@ -88,7 +88,7 @@ void ParallelDataAlgorithm::setRange(const SIMPLRange& range)
 // -----------------------------------------------------------------------------
 void ParallelDataAlgorithm::setRange(size_t min, size_t max)
 {
-  m_Range = { min, max };
+  m_Range = {min, max};
 }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
index fa3476a7f8..2912a233a8 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -100,12 +100,12 @@ class SIMPLib_EXPORT ParallelDataAlgorithm
    */
   void setPartitioner(const tbb::auto_partitioner& partitioner);
 #endif
-  
+
   /**
    * @brief Runs the data algorithm.  Parallelization is used if appropriate.
    * @param body
    */
-  template<typename Body>
+  template <typename Body>
   void execute(const Body& body)
   {
     bool doParallel = false;
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
index e8c11fb450..c72a21078a 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
@@ -67,29 +67,29 @@ SIMPLDataPathValidator* SIMPLDataPathValidator::Instance()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString SIMPLDataPathValidator::convertToAbsolutePath(const QString &path)
+QString SIMPLDataPathValidator::convertToAbsolutePath(const QString& path)
 {
   QString absolutePath = path;
   QFileInfo fi(absolutePath);
-  if (fi.isRelative())
+  if(fi.isRelative())
   {
     QDir dir = QDir(qApp->applicationDirPath());
 
-	  QString parentPath;
+    QString parentPath;
 
 #if defined(SIMPL_RELATIVE_PATH_CHECK)
-	  parentPath = m_SIMPLDataDirectory;
+    parentPath = m_SIMPLDataDirectory;
 #else
-  #if defined (Q_OS_MAC)
+#if defined(Q_OS_MAC)
     if(dir.dirName() == "MacOS")
     {
       dir.cdUp();
       dir.cdUp();
       dir.cdUp();
     }
-  #elif defined(Q_OS_LINUX)
+#elif defined(Q_OS_LINUX)
     dir.cdUp();
-  #endif
+#endif
 
     parentPath = dir.absolutePath();
 #endif
@@ -100,10 +100,10 @@ QString SIMPLDataPathValidator::convertToAbsolutePath(const QString &path)
     }
     absolutePath.prepend(parentPath);
     absolutePath = QDir::toNativeSeparators(absolutePath);
-    //macOS and Linux do not like to have a ":" character in the path names
-    #if !defined (Q_OS_WIN)
+// macOS and Linux do not like to have a ":" character in the path names
+#if !defined(Q_OS_WIN)
     absolutePath.replace(":", "");
-    #endif
+#endif
   }
 
   return absolutePath;
@@ -112,7 +112,7 @@ QString SIMPLDataPathValidator::convertToAbsolutePath(const QString &path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SIMPLDataPathValidator::setSIMPLDataDirectory(const QString &path)
+void SIMPLDataPathValidator::setSIMPLDataDirectory(const QString& path)
 {
   m_SIMPLDataDirectory = path;
 
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
index 92b660d740..1031dbd908 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
@@ -42,48 +42,48 @@
  */
 class SIMPLib_EXPORT SIMPLDataPathValidator : public QObject
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    ~SIMPLDataPathValidator() override;
+public:
+  ~SIMPLDataPathValidator() override;
 
-    static SIMPLDataPathValidator* Instance();
+  static SIMPLDataPathValidator* Instance();
 
-    /**
-     * @brief Getter property for SIMPLDataDirectory
-     * @return Value of SIMPLDataDirectory
-     */
-    QString getSIMPLDataDirectory() const;
+  /**
+   * @brief Getter property for SIMPLDataDirectory
+   * @return Value of SIMPLDataDirectory
+   */
+  QString getSIMPLDataDirectory() const;
 
-    /**
-     * @brief setSIMPLDataDirectory
-     * @param path
-     */
-    void setSIMPLDataDirectory(const QString &path);
+  /**
+   * @brief setSIMPLDataDirectory
+   * @param path
+   */
+  void setSIMPLDataDirectory(const QString& path);
 
-    /**
-     * @brief This function creates an absolute path based on the location of the application executing the code BUT more
-     * assumes that this code is running from a packaged application in which case there are more assumptions made about
-     * where certain directories. We may try to navigate up/down directories based on platform.
-     * @param relativePath
-     * @return
-     */
-    QString convertToAbsolutePath(const QString &relativePath);
+  /**
+   * @brief This function creates an absolute path based on the location of the application executing the code BUT more
+   * assumes that this code is running from a packaged application in which case there are more assumptions made about
+   * where certain directories. We may try to navigate up/down directories based on platform.
+   * @param relativePath
+   * @return
+   */
+  QString convertToAbsolutePath(const QString& relativePath);
 
-  protected:
-    SIMPLDataPathValidator();
+protected:
+  SIMPLDataPathValidator();
 
-  signals:
-    void dataDirectoryChanged(const QString &path);
+signals:
+  void dataDirectoryChanged(const QString& path);
 
-  private:
-    static SIMPLDataPathValidator* m_Self;
+private:
+  static SIMPLDataPathValidator* m_Self;
 
-    QString m_SIMPLDataDirectory;
+  QString m_SIMPLDataDirectory;
 
-  public:
-    SIMPLDataPathValidator(const SIMPLDataPathValidator&) = delete;            // Copy Constructor Not Implemented
-    SIMPLDataPathValidator(SIMPLDataPathValidator&&) = delete;                 // Move Constructor Not Implemented
-    SIMPLDataPathValidator& operator=(const SIMPLDataPathValidator&) = delete; // Copy Assignment Not Implemented
-    SIMPLDataPathValidator& operator=(SIMPLDataPathValidator&&) = delete;      // Move Assignment Not Implemented
+public:
+  SIMPLDataPathValidator(const SIMPLDataPathValidator&) = delete;            // Copy Constructor Not Implemented
+  SIMPLDataPathValidator(SIMPLDataPathValidator&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLDataPathValidator& operator=(const SIMPLDataPathValidator&) = delete; // Copy Assignment Not Implemented
+  SIMPLDataPathValidator& operator=(SIMPLDataPathValidator&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index bf169ab8d3..026ba7582b 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -58,7 +58,7 @@ SIMPLH5DataReader::SIMPLH5DataReader() = default;
 // -----------------------------------------------------------------------------
 SIMPLH5DataReader::~SIMPLH5DataReader()
 {
-  if (m_FileId >= 0)
+  if(m_FileId >= 0)
   {
     closeFile();
   }
@@ -67,9 +67,9 @@ SIMPLH5DataReader::~SIMPLH5DataReader()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool SIMPLH5DataReader::openFile(const QString &filePath)
+bool SIMPLH5DataReader::openFile(const QString& filePath)
 {
-  if (m_FileId >= 0)
+  if(m_FileId >= 0)
   {
     QString ss = QObject::tr("Error opening input file '%1' - A file is already open with this reader.").arg(filePath);
     emit errorGenerated(Title, ss, -148);
@@ -112,7 +112,7 @@ bool SIMPLH5DataReader::closeFile()
 // -----------------------------------------------------------------------------
 DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataContainerArrayProxy& proxy, bool preflight)
 {
-  if (m_FileId < 0)
+  if(m_FileId < 0)
   {
     QString ss = QObject::tr("File data unable to be read - file was not properly opened");
     emit errorGenerated(Title, ss, -249);
@@ -184,11 +184,11 @@ DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataConta
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPLH5DataReaderRequirements* req, int &err)
+DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPLH5DataReaderRequirements* req, int& err)
 {
   DataContainerArrayProxy proxy;
 
-  if (m_FileId < 0)
+  if(m_FileId < 0)
   {
     return DataContainerArrayProxy();
   }
@@ -239,7 +239,7 @@ DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPL
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool SIMPLH5DataReader::readPipelineJson(QString &json)
+bool SIMPLH5DataReader::readPipelineJson(QString& json)
 {
   herr_t err = 0;
 
@@ -265,7 +265,7 @@ bool SIMPLH5DataReader::readPipelineJson(QString &json)
   hid_t pipelineGroupId = H5Gopen(m_FileId, SIMPL::StringConstants::PipelineGroupName.toLatin1().data(), H5P_DEFAULT);
 
   err = QH5Lite::readStringDataset(pipelineGroupId, "Pipeline", json);
-  if (err < 0)
+  if(err < 0)
   {
     QString ss = QObject::tr("Pipeline unable to be read - JSON dataset could not be read.");
     emit errorGenerated(Title, ss, -254);
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index c6edb4736a..2021d471d7 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -38,7 +38,6 @@
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
-
 class IObserver;
 class DataContainerArrayProxy;
 class SIMPLH5DataReaderRequirements;
@@ -50,93 +49,91 @@ using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
  */
 class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
 {
-    Q_OBJECT
-
-    // Start Python bindings declarations
-    PYB11_BEGIN_BINDINGS(SIMPLH5DataReader)
-    PYB11_SHARED_POINTERS(SIMPLH5DataReader)
-    PYB11_STATIC_NEW_MACRO(SIMPLH5DataReader)
-    PYB11_METHOD(bool openFile ARGS filePath)
-    PYB11_METHOD(bool closeFile)
-    PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS SIMPLH5DataReaderRequirements err)
-    PYB11_END_BINDINGS()
-    // End Python bindings declarations
-
-  public:
-    using Self = SIMPLH5DataReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    static Pointer New();
-
-    SIMPLH5DataReader();
-    ~SIMPLH5DataReader() override;
-
-    /**
-     * @brief openFile
-     * @param filePath
-     * @return
-     */
-    bool openFile(const QString &filePath);
-
-    /**
-     * @brief closeFile
-     * @return
-     */
-    bool closeFile();
-
-    /**
-     * @brief readDataContainerArrayStructure
-     * @param err
-     * @return
-     */
-    DataContainerArrayProxy readDataContainerArrayStructure(SIMPLH5DataReaderRequirements *req, int &err);
-
-    /**
-     * @brief readSIMPLDataUsingProxy
-     * @param proxy
-     * @param preflight
-     * @return
-     */
-    DataContainerArrayShPtrType readSIMPLDataUsingProxy(DataContainerArrayProxy& proxy, bool preflight);
-
-    /**
-     * @brief readPipelineJson
-     * @param json
-     * @return
-     */
-    bool readPipelineJson(QString &json);
-
-    /**
-     * @brief setErrorCondition
-     * @param code
-     * @param str
-     */
-    void setErrorCondition(int code, const QString& str) override;
-
-  signals:
-    void errorGenerated(const QString &title, const QString &msg, const int &code);
-
-  private:
-    QString                           m_CurrentFilePath = "";
-    hid_t                             m_FileId = -1;
-
-    /**
-     * @brief readDataContainerBundles
-     * @param fileId
-     * @param dca
-     * @return
-     */
-    bool readDataContainerBundles(hid_t fileId, const DataContainerArrayShPtrType& dca);
-
-  public:
-    SIMPLH5DataReader(const SIMPLH5DataReader&) = delete; // Copy Constructor Not Implemented
-    SIMPLH5DataReader(SIMPLH5DataReader&&) = delete;      // Move Constructor Not Implemented
-    SIMPLH5DataReader& operator=(const SIMPLH5DataReader&) = delete; // Copy Assignment Not Implemented
-    SIMPLH5DataReader& operator=(SIMPLH5DataReader&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(SIMPLH5DataReader)
+  PYB11_SHARED_POINTERS(SIMPLH5DataReader)
+  PYB11_STATIC_NEW_MACRO(SIMPLH5DataReader)
+  PYB11_METHOD(bool openFile ARGS filePath)
+  PYB11_METHOD(bool closeFile)
+  PYB11_METHOD(DataContainerArrayProxy readDataContainerArrayStructure ARGS SIMPLH5DataReaderRequirements err)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = SIMPLH5DataReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  SIMPLH5DataReader();
+  ~SIMPLH5DataReader() override;
+
+  /**
+   * @brief openFile
+   * @param filePath
+   * @return
+   */
+  bool openFile(const QString& filePath);
+
+  /**
+   * @brief closeFile
+   * @return
+   */
+  bool closeFile();
+
+  /**
+   * @brief readDataContainerArrayStructure
+   * @param err
+   * @return
+   */
+  DataContainerArrayProxy readDataContainerArrayStructure(SIMPLH5DataReaderRequirements* req, int& err);
+
+  /**
+   * @brief readSIMPLDataUsingProxy
+   * @param proxy
+   * @param preflight
+   * @return
+   */
+  DataContainerArrayShPtrType readSIMPLDataUsingProxy(DataContainerArrayProxy& proxy, bool preflight);
+
+  /**
+   * @brief readPipelineJson
+   * @param json
+   * @return
+   */
+  bool readPipelineJson(QString& json);
+
+  /**
+   * @brief setErrorCondition
+   * @param code
+   * @param str
+   */
+  void setErrorCondition(int code, const QString& str) override;
+
+signals:
+  void errorGenerated(const QString& title, const QString& msg, const int& code);
+
+private:
+  QString m_CurrentFilePath = "";
+  hid_t m_FileId = -1;
+
+  /**
+   * @brief readDataContainerBundles
+   * @param fileId
+   * @param dca
+   * @return
+   */
+  bool readDataContainerBundles(hid_t fileId, const DataContainerArrayShPtrType& dca);
+
+public:
+  SIMPLH5DataReader(const SIMPLH5DataReader&) = delete;            // Copy Constructor Not Implemented
+  SIMPLH5DataReader(SIMPLH5DataReader&&) = delete;                 // Move Constructor Not Implemented
+  SIMPLH5DataReader& operator=(const SIMPLH5DataReader&) = delete; // Copy Assignment Not Implemented
+  SIMPLH5DataReader& operator=(SIMPLH5DataReader&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
index 902ba45b2c..d52ac2701d 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.cpp
@@ -39,11 +39,10 @@
 // -----------------------------------------------------------------------------
 SIMPLH5DataReaderRequirements::SIMPLH5DataReaderRequirements() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SIMPLH5DataReaderRequirements::SIMPLH5DataReaderRequirements(const QString &primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
+SIMPLH5DataReaderRequirements::SIMPLH5DataReaderRequirements(const QString& primitiveType, size_t allowedCompDim, AttributeMatrix::Type attributeMatrixType, IGeometry::Type geometryType)
 {
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
index dcf40b6f01..9b442b214b 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h
@@ -34,7 +34,6 @@
 
 #include <vector>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/IGeometry.h"
@@ -104,5 +103,3 @@ class SIMPLib_EXPORT SIMPLH5DataReaderRequirements
   QVector<QString> m_DATypes = {};
   SIMPLH5DataReaderRequirements::QVectorSizeT m_ComponentDimensions = {};
 };
-
-
diff --git a/Source/SIMPLib/Utilities/SIMPLibEndian.h b/Source/SIMPLib/Utilities/SIMPLibEndian.h
old mode 100755
new mode 100644
index bf7802c6d6..f85cda8360
--- a/Source/SIMPLib/Utilities/SIMPLibEndian.h
+++ b/Source/SIMPLib/Utilities/SIMPLibEndian.h
@@ -39,15 +39,12 @@
 
 #pragma once
 
-
 //-- Needed for the memcpy function
 #include <string.h>
 
 #include <iosfwd>
 #include <string>
 
-
-
 #include "SIMPLib/SIMPLib.h"
 
 //
@@ -60,359 +57,289 @@
 //  03       00000001    00000000
 //
 
-
-
 //
 //  Compile-time detection of byte order. See boost/detail/endian.hpp and
 //  http://www.unixpapa.com/incnote/byteorder.html
 //
 
-
 // GNU libc offers the helpful header <endian.h> which defines
 // __BYTE_ORDER
 
-#if defined (__GLIBC__)
+#if defined(__GLIBC__)
 #include <endian.h>
-#if (__BYTE_ORDER == __LITTLE_ENDIAN)
+#if(__BYTE_ORDER == __LITTLE_ENDIAN)
 #define SIMPLib_LITTLE_ENDIAN
-#elif (__BYTE_ORDER == __BIG_ENDIAN)
+#elif(__BYTE_ORDER == __BIG_ENDIAN)
 #define SIMPLib_BIG_ENDIAN
 #else
 #error Unknown machine endianness detected.
 #endif /* Not GCC */
-#elif defined ( __sparc     ) || \
-      defined ( __sparc__   ) || \
-      defined ( __powerpc__ ) || \
-      defined ( __ppc__     ) || \
-      defined ( __hppa      ) || \
-      defined ( _MIPSEB     ) || \
-      defined ( _POWER      ) || \
-      defined ( __BIG_ENDIAN__)
+#elif defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) || defined(_POWER) || defined(__BIG_ENDIAN__)
 #define SIMPLib_BIG_ENDIAN
-#elif defined ( __i386__    ) || \
-      defined ( __alpha__   ) || \
-      defined ( __ia64      ) || \
-      defined ( __ia64__    ) || \
-      defined ( i386        ) || \
-      defined ( __i386__    ) || \
-      defined ( _M_IX86     ) || \
-      defined ( vax         ) || \
-      defined ( __alpha     ) || \
-      defined ( __LITTLE_ENDIAN__ ) || \
-    defined (_M_X64       ) || \
-    defined (_M_IA64      ) || \
-    defined (__x86_64     )
+#elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(i386) || defined(__i386__) || defined(_M_IX86) || defined(vax) || defined(__alpha) ||                 \
+    defined(__LITTLE_ENDIAN__) || defined(_M_X64) || defined(_M_IA64) || defined(__x86_64)
 #define SIMPLib_LITTLE_ENDIAN
 #else
 #error Unknown endian type in SIMPLib/Endian.h
 #endif
 
-
 namespace SIMPLib
 {
-  namespace Endian
-  {
-
+namespace Endian
+{
 
-    const char BIGE[4] = { 'B', 'I', 'G', 'E' };
-    const char LITE[4] = { 'L', 'I', 'T', 'E'};
-    const std::string BIGE_STR ("BIGE");
-    const std::string LITE_STR ("LITE");
+const char BIGE[4] = {'B', 'I', 'G', 'E'};
+const char LITE[4] = {'L', 'I', 'T', 'E'};
+const std::string BIGE_STR("BIGE");
+const std::string LITE_STR("LITE");
 
 //
 //  Run-time checking for big endian.
 //
 
-
-    inline bool isBig()
-    {
-      unsigned long u = 1;
-      return ( 0 == ( *( (char*) &u ) ) );
-    }
-
-
+inline bool isBig()
+{
+  unsigned long u = 1;
+  return (0 == (*((char*)&u)));
+}
 
 //
 //  Run-time checking for little endian.
 //
 
-
-    inline bool isLittle()
-    {
-      return ( false == SIMPLib::Endian::isBig() );
-    }
-
-
+inline bool isLittle()
+{
+  return (false == SIMPLib::Endian::isBig());
+}
 
 //
 //  Details.
 //
 
-
-    namespace Detail
-    {
-
+namespace Detail
+{
 
 //
 //  Reverse the bytes of the integer.
 //
 
-
-      inline void _reverseBytes ( uint16_t& n )
-      {
-        n = ( ((((uint16_t)n) >> 8) & 0x00FF) |
-              ((((uint16_t)n) << 8) & 0xFF00) );
-      }
-
-
+inline void _reverseBytes(uint16_t& n)
+{
+  n = (((((uint16_t)n) >> 8) & 0x00FF) | ((((uint16_t)n) << 8) & 0xFF00));
+}
 
 //
 //  Reverse the bytes of the float.
 //
 
-
-      inline void _reverseBytes ( float32& n )
-      {
-        n = static_cast < float32 >
-            ( ((((uint32_t)n) << 24) & 0xFF000000) |
-              ((((uint32_t)n) << 8) & 0x00FF0000) |
-              ((((uint32_t)n) >> 8) & 0x0000FF00) |
-              ((((uint32_t)n) >> 24) & 0x000000FF) );
-      }
-
+inline void _reverseBytes(float32& n)
+{
+  n = static_cast<float32>(((((uint32_t)n) << 24) & 0xFF000000) | ((((uint32_t)n) << 8) & 0x00FF0000) | ((((uint32_t)n) >> 8) & 0x0000FF00) | ((((uint32_t)n) >> 24) & 0x000000FF));
+}
 
 //
 //  Reverse the bytes of the integer.
 //
 //////////////////////////////////////////////////////////////////////////
 
-      inline void _reverseBytes ( uint32_t& n )
-      {
-        n = ( ((((uint32_t)n) << 24) & 0xFF000000) |
-              ((((uint32_t)n) << 8) & 0x00FF0000) |
-              ((((uint32_t)n) >> 8) & 0x0000FF00) |
-              ((((uint32_t)n) >> 24) & 0x000000FF) );
-      }
-
-
+inline void _reverseBytes(uint32_t& n)
+{
+  n = (((((uint32_t)n) << 24) & 0xFF000000) | ((((uint32_t)n) << 8) & 0x00FF0000) | ((((uint32_t)n) >> 8) & 0x0000FF00) | ((((uint32_t)n) >> 24) & 0x000000FF));
+}
 
 //
 //  Reverse the bytes of the integer.
 //
 
+inline void _reverseBytes(uint64_t& n)
+{
+  typedef uint64_t UInt64;
 
-      inline void _reverseBytes ( uint64_t& n )
-      {
-        typedef uint64_t UInt64;
-
-        n = ( ((((UInt64)n) << 56) & 0xFF00000000000000ULL) |
-              ((((UInt64)n) << 40) & 0x00FF000000000000ULL) |
-              ((((UInt64)n) << 24) & 0x0000FF0000000000ULL) |
-              ((((UInt64)n) << 8) & 0x000000FF00000000ULL) |
-              ((((UInt64)n) >> 8) & 0x00000000FF000000ULL) |
-              ((((UInt64)n) >> 24) & 0x0000000000FF0000ULL) |
-              ((((UInt64)n) >> 40) & 0x000000000000FF00ULL) |
-              ((((UInt64)n) >> 56) & 0x00000000000000FFULL) );
-      }
-
-
+  n = (((((UInt64)n) << 56) & 0xFF00000000000000ULL) | ((((UInt64)n) << 40) & 0x00FF000000000000ULL) | ((((UInt64)n) << 24) & 0x0000FF0000000000ULL) | ((((UInt64)n) << 8) & 0x000000FF00000000ULL) |
+       ((((UInt64)n) >> 8) & 0x00000000FF000000ULL) | ((((UInt64)n) >> 24) & 0x0000000000FF0000ULL) | ((((UInt64)n) >> 40) & 0x000000000000FF00ULL) | ((((UInt64)n) >> 56) & 0x00000000000000FFULL));
+}
 
 //
 //  Template definition and specialization for reversing the bytes.
 //
 
-
-      template < uint32_t Size > struct ReverseBytes;
-      template <> struct ReverseBytes < sizeof ( uint16_t ) >
-      {
-        void operator () ( uint16_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( n );
-      }
-      void operator () ( int16_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( (uint16_t&)n );
-      }
-      };
-      template <> struct ReverseBytes < sizeof ( uint32_t ) >
-      {
-        void operator () ( uint32_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( n );
-      }
-      void operator () ( int32_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( (uint32_t&)n  );
-      }
-      void operator () ( float32& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( ( uint32_t&)n );
-      }
-      };
-      template <> struct ReverseBytes < sizeof ( uint64_t ) >
-      {
-        void operator () ( uint64_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( n );
-      }
-      void operator () ( int64_t& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( (uint64_t&)n );
-      }
-      void operator () ( float64& n ) const
-      {
-        SIMPLib::Endian::Detail::_reverseBytes ( (uint64_t&)n );
-      }
-      };
-
-
+template <uint32_t Size>
+struct ReverseBytes;
+template <>
+struct ReverseBytes<sizeof(uint16_t)>
+{
+  void operator()(uint16_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes(n);
+  }
+  void operator()(int16_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes((uint16_t&)n);
+  }
+};
+template <>
+struct ReverseBytes<sizeof(uint32_t)>
+{
+  void operator()(uint32_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes(n);
+  }
+  void operator()(int32_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes((uint32_t&)n);
+  }
+  void operator()(float32& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes((uint32_t&)n);
+  }
+};
+template <>
+struct ReverseBytes<sizeof(uint64_t)>
+{
+  void operator()(uint64_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes(n);
+  }
+  void operator()(int64_t& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes((uint64_t&)n);
+  }
+  void operator()(float64& n) const
+  {
+    SIMPLib::Endian::Detail::_reverseBytes((uint64_t&)n);
+  }
+};
 
 //
 //  End of details.
 //
 
-
-    }
-
-
+} // namespace Detail
 
 //
 //  Reverse the bytes of the data.
 //
 
-
-    template < class Type >
-    inline void reverseBytes ( Type& n )
-    {
-      typedef SIMPLib::Endian::Detail::ReverseBytes < sizeof ( Type ) > ReverseBytes;
-      ReverseBytes () ( n );
-    }
-
-
+template <class Type>
+inline void reverseBytes(Type& n)
+{
+  typedef SIMPLib::Endian::Detail::ReverseBytes<sizeof(Type)> ReverseBytes;
+  ReverseBytes()(n);
+}
 
 //
 //  Convert the bytes.
 //
 
-
-    struct ByteSwapper
-    {
-      template < class T > static void convert ( T& t )
-      {
-        SIMPLib::Endian::reverseBytes ( t );
-      }
-      template < class T > void operator () ( T& t )
-      {
-        this->convert ( t );
-      }
-
-    };
-
+struct ByteSwapper
+{
+  template <class T>
+  static void convert(T& t)
+  {
+    SIMPLib::Endian::reverseBytes(t);
+  }
+  template <class T>
+  void operator()(T& t)
+  {
+    this->convert(t);
+  }
+};
 
 //
 //  Convert the bytes.
 //
 
-
-    struct FromSystemToBig
-    {
-      template < class T > static void convert ( T& t )
-      {
+struct FromSystemToBig
+{
+  template <class T>
+  static void convert(T& t)
+  {
 #ifdef SIMPLib_LITTLE_ENDIAN
-        SIMPLib::Endian::reverseBytes ( t );
+    SIMPLib::Endian::reverseBytes(t);
 #endif
-      }
-      template < class T > void operator () ( T& t )
-      {
-        this->convert ( t );
-      }
-      void getEndianType(char* type)
-      {
-        ::memcpy(type, SIMPLib::Endian::BIGE, 4);
-      }
-    };
-
-
+  }
+  template <class T>
+  void operator()(T& t)
+  {
+    this->convert(t);
+  }
+  void getEndianType(char* type)
+  {
+    ::memcpy(type, SIMPLib::Endian::BIGE, 4);
+  }
+};
 
 //
 //  Convert the bytes.
 //
 
-
-    struct FromSystemToLittle
-    {
-      template < class T > static void convert ( T& t )
-      {
+struct FromSystemToLittle
+{
+  template <class T>
+  static void convert(T& t)
+  {
 #ifdef SIMPLib_BIG_ENDIAN
-        SIMPLib::Endian::reverseBytes ( t );
+    SIMPLib::Endian::reverseBytes(t);
 #endif
-      }
-      template < class T > void operator () ( T& t )
-      {
-        this->convert ( t );
-      }
-      void getEndianType(char* type)
-      {
-        ::memcpy(type, SIMPLib::Endian::LITE, 4);
-      }
-    };
-
-
+  }
+  template <class T>
+  void operator()(T& t)
+  {
+    this->convert(t);
+  }
+  void getEndianType(char* type)
+  {
+    ::memcpy(type, SIMPLib::Endian::LITE, 4);
+  }
+};
 
 //
 //  Convert the bytes.
 //
 
-
-    struct FromBigToSystem
-    {
-      template < class T > static void convert ( T& t )
-      {
+struct FromBigToSystem
+{
+  template <class T>
+  static void convert(T& t)
+  {
 #ifdef SIMPLib_LITTLE_ENDIAN
-        SIMPLib::Endian::reverseBytes ( t );
+    SIMPLib::Endian::reverseBytes(t);
 #endif
-      }
-      template < class T > void operator () ( T& t )
-      {
-        this->convert ( t );
-      }
-      void getEndianType(char* type)
-      {
-        ::memcpy(type, SIMPLib::Endian::BIGE, 4);
-      }
-    };
-
-
+  }
+  template <class T>
+  void operator()(T& t)
+  {
+    this->convert(t);
+  }
+  void getEndianType(char* type)
+  {
+    ::memcpy(type, SIMPLib::Endian::BIGE, 4);
+  }
+};
 
 //
 //  Convert the bytes.
 //
 
-
-    struct FromLittleToSystem
-    {
-      template < class T > static void convert ( T& t )
-      {
+struct FromLittleToSystem
+{
+  template <class T>
+  static void convert(T& t)
+  {
 #ifdef SIMPLib_BIG_ENDIAN
-        SIMPLib::Endian::reverseBytes ( t );
+    SIMPLib::Endian::reverseBytes(t);
 #endif
-      }
-      template < class T > void operator () ( T& t )
-      {
-        this->convert ( t );
-      }
-      void getEndianType(char* type)
-      {
-        ::memcpy(type, SIMPLib::Endian::LITE, 4);
-      }
-    };
-
-
-
+  }
+  template <class T>
+  void operator()(T& t)
+  {
+    this->convert(t);
+  }
+  void getEndianType(char* type)
+  {
+    ::memcpy(type, SIMPLib::Endian::LITE, 4);
+  }
+};
 
-  } // namespace Endian
+} // namespace Endian
 } // namespace SIMPLib
-
-
-
-
diff --git a/Source/SIMPLib/Utilities/StringOperations.h b/Source/SIMPLib/Utilities/StringOperations.h
old mode 100755
new mode 100644
index 6d1d29af54..f3ec9709f1
--- a/Source/SIMPLib/Utilities/StringOperations.h
+++ b/Source/SIMPLib/Utilities/StringOperations.h
@@ -37,48 +37,46 @@
 
 class SIMPLib_EXPORT StringOperations
 {
-  public:
-    StringOperations();
-    virtual ~StringOperations();
+public:
+  StringOperations();
+  virtual ~StringOperations();
 
-    /**
-    * @brief Static function that will split the strings argument into a list of tokens based on a list of delimiters
-    * @param strings The strings to tokenize
-    * @param delimiters List of delimiters
-    * @param consecutiveDelimiters Boolean that determines if consecutive delimiters should be treated as one delimiter
-    */
-    static QList<QStringList> TokenizeStrings(QStringList strings, QList<char> delimiters, bool consecutiveDelimiters);
+  /**
+   * @brief Static function that will split the strings argument into a list of tokens based on a list of delimiters
+   * @param strings The strings to tokenize
+   * @param delimiters List of delimiters
+   * @param consecutiveDelimiters Boolean that determines if consecutive delimiters should be treated as one delimiter
+   */
+  static QList<QStringList> TokenizeStrings(QStringList strings, QList<char> delimiters, bool consecutiveDelimiters);
 
-    /**
-    * @brief Static function that will split the string argument into a list of tokens based on a list of delimiters
-    * @param string The string to tokenize
-    * @param delimiters List of delimiters
-    * @param consecutiveDelimiters Boolean that determines if consecutive delimiters should be treated as one delimiter
-    */
-    static QStringList TokenizeString(QString string, QList<char> delimiters, bool consecutiveDelimiters);
+  /**
+   * @brief Static function that will split the string argument into a list of tokens based on a list of delimiters
+   * @param string The string to tokenize
+   * @param delimiters List of delimiters
+   * @param consecutiveDelimiters Boolean that determines if consecutive delimiters should be treated as one delimiter
+   */
+  static QStringList TokenizeString(QString string, QList<char> delimiters, bool consecutiveDelimiters);
 
-    /**
-     * @brief This function will createa string with the proper amount of padding for the maximum value.
-     * @param index
-     * @param maxIndex
-     * @return
-     */
-    static QString GenerateIndexString(int index, int maxIndex);
+  /**
+   * @brief This function will createa string with the proper amount of padding for the maximum value.
+   * @param index
+   * @param maxIndex
+   * @return
+   */
+  static QString GenerateIndexString(int index, int maxIndex);
 
-    /**
-     * @brief This function will generate a string with the prescribed number of padding digits
-     * @param value The integer value
-     * @param totalDigits The total number of digits to appear in the string
-     * @param padChar The character to use for the padding.
-     * @return
-     */
-    static QString GeneratePaddedString(int value, int totalDigits, char padChar);
+  /**
+   * @brief This function will generate a string with the prescribed number of padding digits
+   * @param value The integer value
+   * @param totalDigits The total number of digits to appear in the string
+   * @param padChar The character to use for the padding.
+   * @return
+   */
+  static QString GeneratePaddedString(int value, int totalDigits, char padChar);
 
-  public:
-    StringOperations(const StringOperations&) = delete; // Copy Constructor Not Implemented
-    StringOperations(StringOperations&&) = delete;      // Move Constructor Not Implemented
-    StringOperations& operator=(const StringOperations&) = delete; // Copy Assignment Not Implemented
-    StringOperations& operator=(StringOperations&&) = delete;      // Move Assignment Not Implemented
+public:
+  StringOperations(const StringOperations&) = delete;            // Copy Constructor Not Implemented
+  StringOperations(StringOperations&&) = delete;                 // Move Constructor Not Implemented
+  StringOperations& operator=(const StringOperations&) = delete; // Copy Assignment Not Implemented
+  StringOperations& operator=(StringOperations&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/Utilities/TestObserver.h b/Source/SIMPLib/Utilities/TestObserver.h
old mode 100755
new mode 100644
index 60c0d6058b..700d768bde
--- a/Source/SIMPLib/Utilities/TestObserver.h
+++ b/Source/SIMPLib/Utilities/TestObserver.h
@@ -39,31 +39,29 @@
 
 class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    TestObserver();
-    /**
-     * @brief Returns the name of the class for TestObserver
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for TestObserver
-     */
-    static QString ClassName();
+public:
+  TestObserver();
+  /**
+   * @brief Returns the name of the class for TestObserver
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for TestObserver
+   */
+  static QString ClassName();
 
-    ~TestObserver() override;
+  ~TestObserver() override;
 
- public slots:
-   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
+public slots:
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
- public:
-   TestObserver(const TestObserver&) = delete;            // Copy Constructor Not Implemented
-   TestObserver(TestObserver&&) = delete;                 // Move Constructor Not Implemented
-   TestObserver& operator=(const TestObserver&) = delete; // Copy Assignment Not Implemented
-   TestObserver& operator=(TestObserver&&) = delete;      // Move Assignment Not Implemented
+public:
+  TestObserver(const TestObserver&) = delete;            // Copy Constructor Not Implemented
+  TestObserver(TestObserver&&) = delete;                 // Move Constructor Not Implemented
+  TestObserver& operator=(const TestObserver&) = delete; // Copy Assignment Not Implemented
+  TestObserver& operator=(TestObserver&&) = delete;      // Move Assignment Not Implemented
 
- private:
+private:
 };
-
-
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
index d4848adac4..119cb7bcff 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <cmath>
 
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
index ca62db8672..f76981dcd8 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <stdlib.h>
 
diff --git a/Source/SIMPLib/Utilities/TimeUtilities.h b/Source/SIMPLib/Utilities/TimeUtilities.h
old mode 100755
new mode 100644
index d20518c8ee..b825ace89e
--- a/Source/SIMPLib/Utilities/TimeUtilities.h
+++ b/Source/SIMPLib/Utilities/TimeUtilities.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,17 +39,15 @@
 
 namespace DREAM3D
 {
-  inline QString convertMillisToHrsMinSecs(unsigned long long int millis)
-  {
-    QChar fill = '0';
-
-    unsigned long long int Hours = millis / (1000 * 60 * 60);
-    unsigned long long intMinutes = (millis % (1000 * 60 * 60)) / (1000 * 60);
-    unsigned long long intSeconds = ((millis % (1000 * 60 * 60)) % (1000 * 60)) / 1000;
-    QString str = QString("%1:%2:%3").arg(QString::number(Hours), 2, fill).arg(QString::number(intMinutes), 2, fill).arg(QString::number(intSeconds), 2, fill);
-    return str;
-  }
+inline QString convertMillisToHrsMinSecs(unsigned long long int millis)
+{
+  QChar fill = '0';
 
+  unsigned long long int Hours = millis / (1000 * 60 * 60);
+  unsigned long long intMinutes = (millis % (1000 * 60 * 60)) / (1000 * 60);
+  unsigned long long intSeconds = ((millis % (1000 * 60 * 60)) % (1000 * 60)) / 1000;
+  QString str = QString("%1:%2:%3").arg(QString::number(Hours), 2, fill).arg(QString::number(intMinutes), 2, fill).arg(QString::number(intSeconds), 2, fill);
+  return str;
 }
 
-
+} // namespace DREAM3D
diff --git a/Source/SIMPLib/Utilities/ToolTipGenerator.cpp b/Source/SIMPLib/Utilities/ToolTipGenerator.cpp
index 8baa8320ae..a6fce6a5a6 100644
--- a/Source/SIMPLib/Utilities/ToolTipGenerator.cpp
+++ b/Source/SIMPLib/Utilities/ToolTipGenerator.cpp
@@ -34,9 +34,9 @@
 
 #include <QtCore/QTextStream>
 
- // -----------------------------------------------------------------------------
- //
- // -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 ToolTipGenerator::ToolTipGenerator()
 {
 }
@@ -165,6 +165,6 @@ QString ToolTipGenerator::rowToHTML(const RowItem& row) const
     ss << R"(<tr bgcolor=")" << m_RowColorStr << R"("><td></td><td></td></tr>)";
     break;
   }
-  
+
   return html;
 }
diff --git a/Source/SIMPLib/Utilities/ToolTipGenerator.h b/Source/SIMPLib/Utilities/ToolTipGenerator.h
index 28af076e51..8a3f371583 100644
--- a/Source/SIMPLib/Utilities/ToolTipGenerator.h
+++ b/Source/SIMPLib/Utilities/ToolTipGenerator.h
@@ -49,7 +49,12 @@ class SIMPLib_EXPORT ToolTipGenerator
 {
   struct SIMPLib_EXPORT RowItem
   {
-    enum class Type { Title, Value, Spacer };
+    enum class Type
+    {
+      Title,
+      Value,
+      Spacer
+    };
     Type type = Type::Spacer;
     QString name;
     QString value;
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
index 58490326a8..ea19ecf4bf 100644
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <memory>
 
 #include "VTKFileReader.h"
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
old mode 100755
new mode 100644
index 32751bce53..5b99734430
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ b/Source/SIMPLib/VTKUtils/VTKFileReader.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -88,203 +87,198 @@
  */
 class SIMPLib_EXPORT VTKFileReader : public FileReader
 {
-    Q_OBJECT
-  public:
-    using Self = VTKFileReader;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+  Q_OBJECT
+public:
+  using Self = VTKFileReader;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    /**
-     * @brief Returns the name of the class for VTKFileReader
-     */
-    QString getNameOfClass() const override;
-    /**
-     * @brief Returns the name of the class for VTKFileReader
-     */
-    static QString ClassName();
+  /**
+   * @brief Returns the name of the class for VTKFileReader
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for VTKFileReader
+   */
+  static QString ClassName();
 
-    static std::shared_ptr<VTKFileReader> New();
+  static std::shared_ptr<VTKFileReader> New();
 
-    ~VTKFileReader() override;
+  ~VTKFileReader() override;
 
-    /**
-     * @brief Setter property for DataContainerName
-     */
-    void setDataContainerName(const QString& value);
-    /**
-     * @brief Getter property for DataContainerName
-     * @return Value of DataContainerName
-     */
-    QString getDataContainerName() const;
+  /**
+   * @brief Setter property for DataContainerName
+   */
+  void setDataContainerName(const QString& value);
+  /**
+   * @brief Getter property for DataContainerName
+   * @return Value of DataContainerName
+   */
+  QString getDataContainerName() const;
 
-    /**
-     * @brief Setter property for InputFile
-     */
-    void setInputFile(const QString& value);
-    /**
-     * @brief Getter property for InputFile
-     * @return Value of InputFile
-     */
-    QString getInputFile() const;
+  /**
+   * @brief Setter property for InputFile
+   */
+  void setInputFile(const QString& value);
+  /**
+   * @brief Getter property for InputFile
+   * @return Value of InputFile
+   */
+  QString getInputFile() const;
 
-    /**
-     * @brief Setter property for Comment
-     */
-    void setComment(const QString& value);
-    /**
-     * @brief Getter property for Comment
-     * @return Value of Comment
-     */
-    QString getComment() const;
+  /**
+   * @brief Setter property for Comment
+   */
+  void setComment(const QString& value);
+  /**
+   * @brief Getter property for Comment
+   * @return Value of Comment
+   */
+  QString getComment() const;
 
-    /**
-     * @brief Setter property for DatasetType
-     */
-    void setDatasetType(const QString& value);
-    /**
-     * @brief Getter property for DatasetType
-     * @return Value of DatasetType
-     */
-    QString getDatasetType() const;
+  /**
+   * @brief Setter property for DatasetType
+   */
+  void setDatasetType(const QString& value);
+  /**
+   * @brief Getter property for DatasetType
+   * @return Value of DatasetType
+   */
+  QString getDatasetType() const;
 
-    /**
-     * @brief Setter property for FileIsBinary
-     */
-    void setFileIsBinary(bool value);
-    /**
-     * @brief Getter property for FileIsBinary
-     * @return Value of FileIsBinary
-     */
-    bool getFileIsBinary() const;
+  /**
+   * @brief Setter property for FileIsBinary
+   */
+  void setFileIsBinary(bool value);
+  /**
+   * @brief Getter property for FileIsBinary
+   * @return Value of FileIsBinary
+   */
+  bool getFileIsBinary() const;
 
-    /**
-     * @brief Reads the VTK header and sets the values that are described in the header
-     * @return Error Condition. Negative is Error.
-     */
-    int readHeader() override;
+  /**
+   * @brief Reads the VTK header and sets the values that are described in the header
+   * @return Error Condition. Negative is Error.
+   */
+  int readHeader() override;
 
-    /**
-     * @brief This method should be re-implemented in a subclass
-     */
-    int readFile() override
-    {
-      return -1;
-    }
+  /**
+   * @brief This method should be re-implemented in a subclass
+   */
+  int readFile() override
+  {
+    return -1;
+  }
 
-    /**
-     * @brief Parses the byte size from a data set declaration line
-     * @param text
-     * @return
-     */
-    size_t parseByteSize(char text[256]);
+  /**
+   * @brief Parses the byte size from a data set declaration line
+   * @param text
+   * @return
+   */
+  size_t parseByteSize(char text[256]);
 
-    /**
-     *
-     */
-    int ignoreData(std::ifstream& in, int byteSize, char* type, int xDim, int yDim, int zDim);
+  /**
+   *
+   */
+  int ignoreData(std::ifstream& in, int byteSize, char* type, int xDim, int yDim, int zDim);
 
-    /**
-     *
-     */
-    template<typename T>
-    int skipVolume(std::ifstream& inStream, int byteSize, int xDim, int yDim, int zDim, T& diff)
+  /**
+   *
+   */
+  template <typename T>
+  int skipVolume(std::ifstream& inStream, int byteSize, int xDim, int yDim, int zDim, T& diff)
+  {
+    int err = 0;
+    size_t totalSize = xDim * yDim * zDim;
+    if(getFileIsBinary() == true)
     {
-      int err = 0;
-      size_t totalSize = xDim * yDim * zDim;
-      if (getFileIsBinary() == true)
+      T* buffer = new T[totalSize];
+      // Read all the xpoints in one shot into a buffer
+      inStream.read(reinterpret_cast<char*>(buffer), (totalSize * sizeof(T)));
+      if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
       {
-        T* buffer = new T[totalSize];
-        // Read all the xpoints in one shot into a buffer
-        inStream.read(reinterpret_cast<char* > (buffer), (totalSize * sizeof(T)));
-        if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
-        {
-          qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount()
-                   << " vs " << (totalSize * sizeof(T)) ;
-          return -1;
-        }
-        if (totalSize > 1)
-        {
-          diff = buffer[totalSize - 1] - buffer[totalSize - 2];
-        }
-        else
-        {
-          diff = buffer[totalSize];
-        }
-        delete [] buffer;
+        qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount() << " vs " << (totalSize * sizeof(T));
+        return -1;
+      }
+      if(totalSize > 1)
+      {
+        diff = buffer[totalSize - 1] - buffer[totalSize - 2];
       }
       else
       {
-        T tmp;
-        T t2;
-        for (size_t x = 0; x < totalSize; ++x)
+        diff = buffer[totalSize];
+      }
+      delete[] buffer;
+    }
+    else
+    {
+      T tmp;
+      T t2;
+      for(size_t x = 0; x < totalSize; ++x)
+      {
+        if(x == 1)
         {
-          if(x == 1)
-          {
-            t2 = tmp;
-          }
-          inStream >> tmp;
-          if(x == 1)
-          {
-            diff = tmp - t2;
-          }
+          t2 = tmp;
+        }
+        inStream >> tmp;
+        if(x == 1)
+        {
+          diff = tmp - t2;
         }
       }
-      return err;
     }
+    return err;
+  }
 
-    template <typename T>
-    int skipVolume(std::ifstream& inStream, int byteSize, size_t xDim, size_t yDim, size_t zDim)
+  template <typename T>
+  int skipVolume(std::ifstream& inStream, int byteSize, size_t xDim, size_t yDim, size_t zDim)
+  {
+    int err = 0;
+    if(getFileIsBinary() == true)
     {
-      int err = 0;
-      if(getFileIsBinary() == true)
+      size_t totalSize = xDim * yDim * zDim;
+      typename DataArray<T>::Pointer bufferPtr = DataArray<T>::CreateArray(totalSize, "JUNK", true);
+      // Read all the xpoints in one shot into a buffer
+      inStream.read(reinterpret_cast<char*>(bufferPtr->getPointer(0)), (totalSize * sizeof(T)));
+      if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
       {
-        size_t totalSize = xDim * yDim * zDim;
-        typename DataArray<T>::Pointer bufferPtr = DataArray<T>::CreateArray(totalSize, "JUNK", true);
-        // Read all the xpoints in one shot into a buffer
-        inStream.read(reinterpret_cast<char*>(bufferPtr->getPointer(0)), (totalSize * sizeof(T)));
-        if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
-        {
-          qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount() << " vs "
-                   << (totalSize * sizeof(T)) ;
-          return -1;
-        }
+        qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount() << " vs " << (totalSize * sizeof(T));
+        return -1;
       }
-      else
+    }
+    else
+    {
+      T tmp;
+      for(size_t z = 0; z < zDim; ++z)
       {
-        T tmp;
-        for(size_t z = 0; z < zDim; ++z)
+        for(size_t y = 0; y < yDim; ++y)
         {
-          for(size_t y = 0; y < yDim; ++y)
+          for(size_t x = 0; x < xDim; ++x)
           {
-            for(size_t x = 0; x < xDim; ++x)
-            {
-              inStream >> tmp;
-            }
+            inStream >> tmp;
           }
         }
       }
-      return err;
     }
+    return err;
+  }
 
+protected:
+  VTKFileReader();
 
-  protected:
-    VTKFileReader();
-
-  public:
-    VTKFileReader(const VTKFileReader&) = delete;  // Copy Constructor Not Implemented
-    VTKFileReader(VTKFileReader&&) = delete;       // Move Constructor Not Implemented
-    VTKFileReader& operator=(const VTKFileReader&) = delete; // Copy Assignment Not Implemented
-    VTKFileReader& operator=(VTKFileReader&&) = delete;      // Move Assignment Not Implemented
+public:
+  VTKFileReader(const VTKFileReader&) = delete;            // Copy Constructor Not Implemented
+  VTKFileReader(VTKFileReader&&) = delete;                 // Move Constructor Not Implemented
+  VTKFileReader& operator=(const VTKFileReader&) = delete; // Copy Assignment Not Implemented
+  VTKFileReader& operator=(VTKFileReader&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    QString m_DataContainerName = {};
-    QString m_InputFile = {};
-    QString m_Comment = {};
-    QString m_DatasetType = {};
-    bool m_FileIsBinary = {};
+private:
+  QString m_DataContainerName = {};
+  QString m_InputFile = {};
+  QString m_Comment = {};
+  QString m_DatasetType = {};
+  bool m_FileIsBinary = {};
 };
-
-
diff --git a/Source/SIMPLib/VTKUtils/VTKUtil.hpp b/Source/SIMPLib/VTKUtils/VTKUtil.hpp
old mode 100755
new mode 100644
index 773cdb37db..7a37ee81c6
--- a/Source/SIMPLib/VTKUtils/VTKUtil.hpp
+++ b/Source/SIMPLib/VTKUtils/VTKUtil.hpp
@@ -8,82 +8,165 @@
 
 class SIMPLib_EXPORT VTKUtil
 {
-  public:
-
-    /**
-    * @brief Returns the HDF Type for a given primitive value.
-     * @param value A value to use. Can be anything. Just used to get the type info
-     * from
-     * @return The HDF5 native type for the value
-     */
-    template<typename T>
-    static QString TypeForPrimitive(T value)
+public:
+  /**
+   * @brief Returns the HDF Type for a given primitive value.
+   * @param value A value to use. Can be anything. Just used to get the type info
+   * from
+   * @return The HDF5 native type for the value
+   */
+  template <typename T>
+  static QString TypeForPrimitive(T value)
+  {
+
+    if(typeid(value) == typeid(float))
     {
+      return QString("float");
+    }
+    if(typeid(value) == typeid(double))
+    {
+      return QString("double");
+    }
 
-      if (typeid(value) == typeid(float)) { return QString("float"); }
-      if (typeid(value) == typeid(double)) { return QString("double"); }
-
-      if (typeid(value) == typeid(int8_t)) { return QString("char"); }
-      if (typeid(value) == typeid(uint8_t)) { return QString("unsigned_char"); }
-# if CMP_TYPE_CHAR_IS_SIGNED
-      if (typeid(value) == typeid(char)) { return QString("char"); }
+    if(typeid(value) == typeid(int8_t))
+    {
+      return QString("char");
+    }
+    if(typeid(value) == typeid(uint8_t))
+    {
+      return QString("unsigned_char");
+    }
+#if CMP_TYPE_CHAR_IS_SIGNED
+    if(typeid(value) == typeid(char))
+    {
+      return QString("char");
+    }
 #else
-      if (typeid(value) == typeid(char)) { return H5T_NATIVE_UINT8; }
+    if(typeid(value) == typeid(char))
+    {
+      return H5T_NATIVE_UINT8;
+    }
 #endif
-      if (typeid(value) == typeid(signed char)) { return QString("char"); }
-      if (typeid(value) == typeid(unsigned char)) { return QString("char"); }
-
-
-      if (typeid(value) == typeid(int16_t)) { return QString("short"); }
-      if (typeid(value) == typeid(short)) { return QString("short"); }
-      if (typeid(value) == typeid(signed short)) { return QString("short"); }
-      if (typeid(value) == typeid(uint16_t)) { return QString("unsigned_short"); }
-      if (typeid(value) == typeid(unsigned short)) { return QString("unsigned_short"); }
+    if(typeid(value) == typeid(signed char))
+    {
+      return QString("char");
+    }
+    if(typeid(value) == typeid(unsigned char))
+    {
+      return QString("char");
+    }
 
+    if(typeid(value) == typeid(int16_t))
+    {
+      return QString("short");
+    }
+    if(typeid(value) == typeid(short))
+    {
+      return QString("short");
+    }
+    if(typeid(value) == typeid(signed short))
+    {
+      return QString("short");
+    }
+    if(typeid(value) == typeid(uint16_t))
+    {
+      return QString("unsigned_short");
+    }
+    if(typeid(value) == typeid(unsigned short))
+    {
+      return QString("unsigned_short");
+    }
 
-      if (typeid(value) == typeid(int32_t)) { return QString("int"); }
-      if (typeid(value) == typeid(uint32_t)) { return QString("unsigned_int"); }
-#if (CMP_SIZEOF_INT == 4)
-      if (typeid(value) == typeid(int)) { return QString("int"); }
-      if (typeid(value) == typeid(signed int)) { return QString("int"); }
-      if (typeid(value) == typeid(unsigned int)) { return QString("unsigned_int"); }
+    if(typeid(value) == typeid(int32_t))
+    {
+      return QString("int");
+    }
+    if(typeid(value) == typeid(uint32_t))
+    {
+      return QString("unsigned_int");
+    }
+#if(CMP_SIZEOF_INT == 4)
+    if(typeid(value) == typeid(int))
+    {
+      return QString("int");
+    }
+    if(typeid(value) == typeid(signed int))
+    {
+      return QString("int");
+    }
+    if(typeid(value) == typeid(unsigned int))
+    {
+      return QString("unsigned_int");
+    }
 #endif
 
-
-#if (CMP_SIZEOF_LONG == 4)
-      if (typeid(value) == typeid(long int)) { return QString("int"); }
-      if (typeid(value) == typeid(signed long int)) { return QString("int"); }
-      if (typeid(value) == typeid(unsigned long int)) { return QString("unsigned_int"); }
-#elif (CMP_SIZEOF_LONG == 8)
-      if (typeid(value) == typeid(long int)) { return QString("long"); }
-      if (typeid(value) == typeid(signed long int)) { return QString("long"); }
-      if (typeid(value) == typeid(unsigned long int)) { return QString("unsigned_long"); }
+#if(CMP_SIZEOF_LONG == 4)
+    if(typeid(value) == typeid(long int))
+    {
+      return QString("int");
+    }
+    if(typeid(value) == typeid(signed long int))
+    {
+      return QString("int");
+    }
+    if(typeid(value) == typeid(unsigned long int))
+    {
+      return QString("unsigned_int");
+    }
+#elif(CMP_SIZEOF_LONG == 8)
+    if(typeid(value) == typeid(long int))
+    {
+      return QString("long");
+    }
+    if(typeid(value) == typeid(signed long int))
+    {
+      return QString("long");
+    }
+    if(typeid(value) == typeid(unsigned long int))
+    {
+      return QString("unsigned_long");
+    }
 #endif
 
-
-#if (CMP_SIZEOF_LONG_LONG == 8)
-      if (typeid(value) == typeid(long long int)) { return QString("long"); }
-      if (typeid(value) == typeid(signed long long int)) { return QString("long"); }
-      if (typeid(value) == typeid(unsigned long long int)) { return QString("unsigned_long"); }
+#if(CMP_SIZEOF_LONG_LONG == 8)
+    if(typeid(value) == typeid(long long int))
+    {
+      return QString("long");
+    }
+    if(typeid(value) == typeid(signed long long int))
+    {
+      return QString("long");
+    }
+    if(typeid(value) == typeid(unsigned long long int))
+    {
+      return QString("unsigned_long");
+    }
 #endif
-      if (typeid(value) == typeid(int64_t)) { return QString("long"); }
-      if (typeid(value) == typeid(uint64_t)) { return QString("unsigned_long"); }
-
-      if (typeid(value) == typeid(bool)) { return QString("char"); }
+    if(typeid(value) == typeid(int64_t))
+    {
+      return QString("long");
+    }
+    if(typeid(value) == typeid(uint64_t))
+    {
+      return QString("unsigned_long");
+    }
 
-      std::cout  << "Error: VtkTypeForPrimitive - Unknown Type: " << (typeid(value).name()) << std::endl;
-      const char* name = typeid(value).name();
-      if (nullptr != name && name[0] == 'l' )
-      {
-        std::cout << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t." << std::endl;
-      }
-      return QString("");
+    if(typeid(value) == typeid(bool))
+    {
+      return QString("char");
     }
 
+    std::cout << "Error: VtkTypeForPrimitive - Unknown Type: " << (typeid(value).name()) << std::endl;
+    const char* name = typeid(value).name();
+    if(nullptr != name && name[0] == 'l')
+    {
+      std::cout << "You are using 'long int' as a type which is not 32/64 bit safe. Suggest you use one of the H5SupportTypes defined in <Common/H5SupportTypes.h> such as int32_t or uint32_t."
+                << std::endl;
+    }
+    return QString("");
+  }
 
-  private:
-    VTKUtil(const VTKUtil&); // Copy Constructor Not Implemented
-    void operator=(const VTKUtil&); // Move assignment Not Implemented
+private:
+  VTKUtil(const VTKUtil&);        // Copy Constructor Not Implemented
+  void operator=(const VTKUtil&); // Move assignment Not Implemented
 };
-
-
diff --git a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
old mode 100755
new mode 100644
index e736f4b4c4..10b00714a0
--- a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
+++ b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/Utilities/SIMPLibEndian.h"
 #include "SIMPLib/SIMPLibVersion.h"
 
@@ -43,189 +42,218 @@
  * @brief This file contains various macros to write out consistent VTK legacy
  * style files.
  */
-# if defined(__LP64__) && __LP64__
-
-#define WRITE_RECTILINEAR_GRID_HEADER(FILE_TYPE, ptr, xpoints, ypoints, zpoints)\
-  fprintf(f, "# vtk DataFile Version 2.0\n");\
-  fprintf(f, "Data set from %s\n", SIMPLib::Version::PackageComplete().toLatin1().constData());\
-  fprintf(f, FILE_TYPE);\
-  fprintf(f, "\n");\
-  fprintf(f, "DATASET RECTILINEAR_GRID\n");\
-  fprintf(f, "DIMENSIONS %ld %ld %ld\n", xpoints, ypoints, zpoints);\
-
-#define WRITE_STRUCTURED_POINTS_HEADER(FILE_TYPE, ptr)\
-  fprintf(f, "# vtk DataFile Version 2.0\n");\
-  fprintf(f, "Data set from %s\n", SIMPLib::Version::PackageComplete().toLatin1().constData());\
-  fprintf(f, FILE_TYPE); fprintf(f, "\n");\
-  fprintf(f, "DATASET STRUCTURED_POINTS\n");\
-  fprintf(f, "DIMENSIONS %ld %ld %ld\n", ptr->getXPoints(), ptr->getYPoints(), ptr->getZPoints());\
-  fprintf(f, "SPACING %f %f %f\n", ptr->getXRes(), ptr->getYRes(), ptr->getZRes());\
-  fprintf(f, "ORIGIN 0.0 0.0 0.0\n");\
-  fprintf(f, "POINT_DATA %ld\n\n", ptr->getXPoints() * ptr->getYPoints() * ptr->getZPoints() );\
+#if defined(__LP64__) && __LP64__
 
+#define WRITE_RECTILINEAR_GRID_HEADER(FILE_TYPE, ptr, xpoints, ypoints, zpoints)                                                                                                                       \
+  fprintf(f, "# vtk DataFile Version 2.0\n");                                                                                                                                                          \
+  fprintf(f, "Data set from %s\n", SIMPLib::Version::PackageComplete().toLatin1().constData());                                                                                                        \
+  fprintf(f, FILE_TYPE);                                                                                                                                                                               \
+  fprintf(f, "\n");                                                                                                                                                                                    \
+  fprintf(f, "DATASET RECTILINEAR_GRID\n");                                                                                                                                                            \
+  fprintf(f, "DIMENSIONS %ld %ld %ld\n", xpoints, ypoints, zpoints);
 
-#else
+#define WRITE_STRUCTURED_POINTS_HEADER(FILE_TYPE, ptr)                                                                                                                                                 \
+  fprintf(f, "# vtk DataFile Version 2.0\n");                                                                                                                                                          \
+  fprintf(f, "Data set from %s\n", SIMPLib::Version::PackageComplete().toLatin1().constData());                                                                                                        \
+  fprintf(f, FILE_TYPE);                                                                                                                                                                               \
+  fprintf(f, "\n");                                                                                                                                                                                    \
+  fprintf(f, "DATASET STRUCTURED_POINTS\n");                                                                                                                                                           \
+  fprintf(f, "DIMENSIONS %ld %ld %ld\n", ptr->getXPoints(), ptr->getYPoints(), ptr->getZPoints());                                                                                                     \
+  fprintf(f, "SPACING %f %f %f\n", ptr->getXRes(), ptr->getYRes(), ptr->getZRes());                                                                                                                    \
+  fprintf(f, "ORIGIN 0.0 0.0 0.0\n");                                                                                                                                                                  \
+  fprintf(f, "POINT_DATA %ld\n\n", ptr->getXPoints() * ptr->getYPoints() * ptr->getZPoints());
 
-#define WRITE_RECTILINEAR_GRID_HEADER(FILE_TYPE, ptr, xpoints, ypoints, zpoints)\
-  fprintf(f, "# vtk DataFile Version 2.0\n");\
-  fprintf(f, "data set from DREAM3D\n");\
-  fprintf(f, FILE_TYPE); fprintf(f, "\n");\
-  fprintf(f, "DATASET RECTILINEAR_GRID\n");\
-  fprintf(f, "DIMENSIONS %ld %ld %ld\n", xpoints, ypoints, zpoints);\
+#else
 
-#define WRITE_STRUCTURED_POINTS_HEADER(FILE_TYPE, ptr)\
-  fprintf(f, "# vtk DataFile Version 2.0\n");\
-  fprintf(f, "data set from DREAM3D\n");\
-  fprintf(f, FILE_TYPE); fprintf(f, "\n");\
-  fprintf(f, "DATASET STRUCTURED_POINTS\n");\
-  fprintf(f, "DIMENSIONS %ld %ld %ld\n", ptr->getXPoints(), ptr->getYPoints(), ptr->getZPoints());\
-  fprintf(f, "ORIGIN 0.0 0.0 0.0\n");\
-  fprintf(f, "SPACING %f %f %f\n", ptr->getXRes(), ptr->getYRes(), ptr->getZRes());\
-  fprintf(f, "POINT_DATA %lld\n\n", ptr->getXPoints() * ptr->getYPoints() * ptr->getZPoints() );\
+#define WRITE_RECTILINEAR_GRID_HEADER(FILE_TYPE, ptr, xpoints, ypoints, zpoints)                                                                                                                       \
+  fprintf(f, "# vtk DataFile Version 2.0\n");                                                                                                                                                          \
+  fprintf(f, "data set from DREAM3D\n");                                                                                                                                                               \
+  fprintf(f, FILE_TYPE);                                                                                                                                                                               \
+  fprintf(f, "\n");                                                                                                                                                                                    \
+  fprintf(f, "DATASET RECTILINEAR_GRID\n");                                                                                                                                                            \
+  fprintf(f, "DIMENSIONS %ld %ld %ld\n", xpoints, ypoints, zpoints);
 
+#define WRITE_STRUCTURED_POINTS_HEADER(FILE_TYPE, ptr)                                                                                                                                                 \
+  fprintf(f, "# vtk DataFile Version 2.0\n");                                                                                                                                                          \
+  fprintf(f, "data set from DREAM3D\n");                                                                                                                                                               \
+  fprintf(f, FILE_TYPE);                                                                                                                                                                               \
+  fprintf(f, "\n");                                                                                                                                                                                    \
+  fprintf(f, "DATASET STRUCTURED_POINTS\n");                                                                                                                                                           \
+  fprintf(f, "DIMENSIONS %ld %ld %ld\n", ptr->getXPoints(), ptr->getYPoints(), ptr->getZPoints());                                                                                                     \
+  fprintf(f, "ORIGIN 0.0 0.0 0.0\n");                                                                                                                                                                  \
+  fprintf(f, "SPACING %f %f %f\n", ptr->getXRes(), ptr->getYRes(), ptr->getZRes());                                                                                                                    \
+  fprintf(f, "POINT_DATA %lld\n\n", ptr->getXPoints() * ptr->getYPoints() * ptr->getZPoints());
 
 #endif
 
+#define WRITE_VTK_FEATURE_IDS_ASCII(ptr, ScalarName, m_FeatureIds)                                                                                                                                     \
+  fprintf(f, "SCALARS %s int 1\n", ScalarName.toLatin1().data());                                                                                                                                      \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    if(i % 20 == 0 && i > 0)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      fprintf(f, "\n");                                                                                                                                                                                \
+    }                                                                                                                                                                                                  \
+    fprintf(f, "%d ", m_FeatureIds[i]);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  fprintf(f, "\n");
 
-
-#define WRITE_VTK_FEATURE_IDS_ASCII(ptr, ScalarName, m_FeatureIds)\
-  fprintf(f, "SCALARS %s int 1\n", ScalarName.toLatin1().data());\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  for (int64_t i = 0; i < totalPoints; i++) {\
-    if(i%20 == 0 && i > 0) { fprintf(f, "\n"); }\
-    fprintf(f, "%d ", m_FeatureIds[i]);\
-  }\
-  fprintf(f, "\n");\
-
-
-#define WRITE_VTK_FEATURE_IDS_BINARY(ptr, ScalarName)  \
-  fprintf(f, "SCALARS %s int 1\n", ScalarName.toLatin1().data());\
-  fprintf(f, "LOOKUP_TABLE default\n"); \
-  { \
-    std::vector<int> gn(totalPoints, 0);\
-    int t;\
-    for (int64_t i = 0; i < totalPoints; i++) {\
-      t = m_FeatureIds[i];\
-      SIMPLib::Endian::FromSystemToBig::convert(t);\
-      gn[i] = t; \
-    }\
-    int64_t totalWritten = fwrite( &(gn.front()), sizeof(int), totalPoints, f);\
-    if (totalWritten != totalPoints)  {\
-      qDebug() << "Error Writing Binary VTK Data into file " << file ;\
-      fclose(f);\
-      return -1;\
-    }\
+#define WRITE_VTK_FEATURE_IDS_BINARY(ptr, ScalarName)                                                                                                                                                  \
+  fprintf(f, "SCALARS %s int 1\n", ScalarName.toLatin1().data());                                                                                                                                      \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    std::vector<int> gn(totalPoints, 0);                                                                                                                                                               \
+    int t;                                                                                                                                                                                             \
+    for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      t = m_FeatureIds[i];                                                                                                                                                                             \
+      SIMPLib::Endian::FromSystemToBig::convert(t);                                                                                                                                                    \
+      gn[i] = t;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
+    int64_t totalWritten = fwrite(&(gn.front()), sizeof(int), totalPoints, f);                                                                                                                         \
+    if(totalWritten != totalPoints)                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      qDebug() << "Error Writing Binary VTK Data into file " << file;                                                                                                                                  \
+      fclose(f);                                                                                                                                                                                       \
+      return -1;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
   }
 
+#define WRITE_VTK_SCALARS_FROM_VOXEL_ASCII(ptr, name, m_msgType, var, FORMAT)                                                                                                                          \
+  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);                                                                                                                                 \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    if(i % 20 == 0 && i > 0)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      fprintf(f, "\n");                                                                                                                                                                                \
+    }                                                                                                                                                                                                  \
+    fprintf(f, FORMAT, var[i]);                                                                                                                                                                        \
+  }                                                                                                                                                                                                    \
+  fprintf(f, "\n");
 
-#define WRITE_VTK_SCALARS_FROM_VOXEL_ASCII(ptr, name, m_msgType, var, FORMAT)\
-  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  for (int64_t i = 0; i < totalPoints; i++) {\
-    if(i%20 == 0 && i > 0) { fprintf(f, "\n");}\
-    fprintf(f, FORMAT, var[i]);\
-  }fprintf(f,"\n"); \
-
-#define WRITE_VTK_SCALARS_FROM_VOXEL_BINARY(ptr, name, m_msgType, var)\
-  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  { \
-    m_msgType* gn = new m_msgType[totalPoints];\
-    m_msgType t;\
-    for (int64_t i = 0; i < totalPoints; i++) {\
-      t = var[i];\
-      SIMPLib::Endian::FromSystemToBig::convert(t);\
-      gn[i] = t; \
-    }\
-    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);\
-    delete[] gn;\
-    if (totalWritten != totalPoints)  {\
-      qDebug() << "Error Writing Binary VTK Data into file " << file ;\
-      fclose(f);\
-      return -1;\
-    }\
+#define WRITE_VTK_SCALARS_FROM_VOXEL_BINARY(ptr, name, m_msgType, var)                                                                                                                                 \
+  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);                                                                                                                                 \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    m_msgType* gn = new m_msgType[totalPoints];                                                                                                                                                        \
+    m_msgType t;                                                                                                                                                                                       \
+    for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      t = var[i];                                                                                                                                                                                      \
+      SIMPLib::Endian::FromSystemToBig::convert(t);                                                                                                                                                    \
+      gn[i] = t;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
+    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);                                                                                                                              \
+    delete[] gn;                                                                                                                                                                                       \
+    if(totalWritten != totalPoints)                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      qDebug() << "Error Writing Binary VTK Data into file " << file;                                                                                                                                  \
+      fclose(f);                                                                                                                                                                                       \
+      return -1;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
   }
 
-
-#define WRITE_VTK_SCALARS_FROM_VOXEL_BINARY_NOSWAP(ptr, name, m_msgType, var)\
-  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  { \
-    m_msgType* gn = new m_msgType[totalPoints];\
-    for (int64_t i = 0; i < totalPoints; i++) {\
-      gn[i] = var[i];\
-    }\
-    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);\
-    delete[] gn;\
-    if (totalWritten != totalPoints)  {\
-      qDebug() << "Error Writing Binary VTK Data into file " << file ;\
-      fclose(f);\
-      return -1;\
-    }\
+#define WRITE_VTK_SCALARS_FROM_VOXEL_BINARY_NOSWAP(ptr, name, m_msgType, var)                                                                                                                          \
+  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);                                                                                                                                 \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    m_msgType* gn = new m_msgType[totalPoints];                                                                                                                                                        \
+    for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      gn[i] = var[i];                                                                                                                                                                                  \
+    }                                                                                                                                                                                                  \
+    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);                                                                                                                              \
+    delete[] gn;                                                                                                                                                                                       \
+    if(totalWritten != totalPoints)                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      qDebug() << "Error Writing Binary VTK Data into file " << file;                                                                                                                                  \
+      fclose(f);                                                                                                                                                                                       \
+      return -1;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
   }
 
+#define WRITE_VTK_SCALARS_FROM_FIELD_ASCII(ptr, name, m_msgType, var, feature_indicies, FORMAT)                                                                                                        \
+  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);                                                                                                                                 \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                             \
+  {                                                                                                                                                                                                    \
+    if(i % 20 == 0 && i > 0)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      fprintf(f, "\n");                                                                                                                                                                                \
+    }                                                                                                                                                                                                  \
+    fprintf(f, FORMAT, var[feature_indicies[i]]);                                                                                                                                                      \
+  }                                                                                                                                                                                                    \
+  fprintf(f, "\n");
 
-#define WRITE_VTK_SCALARS_FROM_FIELD_ASCII(ptr, name, m_msgType, var, feature_indicies, FORMAT)\
-  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  for (int64_t i = 0; i < totalPoints; i++) {\
-    if(i%20 == 0 && i > 0) { fprintf(f, "\n");}\
-    fprintf(f, FORMAT, var[feature_indicies[i]]);\
-  } fprintf(f,"\n");
-
-#define WRITE_VTK_SCALARS_FROM_FIELD_BINARY(ptr, name, m_msgType, var, feature_indicies)\
-  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);\
-  fprintf(f, "LOOKUP_TABLE default\n");\
-  { \
-    m_msgType* gn = new m_msgType[totalPoints];\
-    m_msgType t;\
-    for (int64_t i = 0; i < totalPoints; i++) {\
-      t = var[feature_indicies[i]];\
-      SIMPLib::Endian::FromSystemToBig::convert(t); \
-      gn[i] = t; \
-    }\
-    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);\
-    delete[] gn;\
-    if (totalWritten != totalPoints)  {\
-      qDebug() << "Error Writing Binary VTK Data into file " << file ;\
-      fclose(f);\
-      return -1;\
-    }\
+#define WRITE_VTK_SCALARS_FROM_FIELD_BINARY(ptr, name, m_msgType, var, feature_indicies)                                                                                                               \
+  fprintf(f, "SCALARS %s %s 1\n", name.toLatin1().data(), #m_msgType);                                                                                                                                 \
+  fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                                \
+  {                                                                                                                                                                                                    \
+    m_msgType* gn = new m_msgType[totalPoints];                                                                                                                                                        \
+    m_msgType t;                                                                                                                                                                                       \
+    for(int64_t i = 0; i < totalPoints; i++)                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      t = var[feature_indicies[i]];                                                                                                                                                                    \
+      SIMPLib::Endian::FromSystemToBig::convert(t);                                                                                                                                                    \
+      gn[i] = t;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
+    int64_t totalWritten = fwrite(gn, sizeof(m_msgType), totalPoints, f);                                                                                                                              \
+    delete[] gn;                                                                                                                                                                                       \
+    if(totalWritten != totalPoints)                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      qDebug() << "Error Writing Binary VTK Data into file " << file;                                                                                                                                  \
+      fclose(f);                                                                                                                                                                                       \
+      return -1;                                                                                                                                                                                       \
+    }                                                                                                                                                                                                  \
   }
 
-  /**
-    *@param
-    * @param
-    * @param
-    * @param
-    */
-#define VTK_WRITE_RECTILINEAR_DATA(ArrayType, iDataPtr, VtkType, Type, Format)\
-  {\
-    ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(iDataPtr);\
-    if(nullptr != array.get()) {\
-      size_t totalElements = array->getSize();\
-      Type* val = array->getPointer(0);\
-      int numComps = array->getNumberOfComponents();\
-      QString dName = array->getName();\
-      dName = dName.replace(" ", "_");\
-      fprintf(f, "SCALARS %s %s %d\n", dName.toLatin1().data(), VtkType, numComps);\
-      fprintf(f, "LOOKUP_TABLE default\n");\
-      if(getWriteBinaryFile()) {\
-        if(BIGENDIAN == 0) {array->byteSwapElements(); }\
-        size_t totalWritten = fwrite(val, array->getTypeSize(), totalElements, f);\
-        if(totalWritten != totalElements) {}\
-        fprintf(f,"\n");\
-        if(BIGENDIAN == 0) {array->byteSwapElements(); }\
-      } else {\
-        for (size_t i = 0; i < totalElements; i++) {\
-          if(i%20 == 0 && i > 0) { fprintf(f, "\n");}\
-          fprintf(f, Format, val[i]);\
-        }\
-        fprintf(f,"\n");\
-      }\
-    }\
+/**
+ *@param
+ * @param
+ * @param
+ * @param
+ */
+#define VTK_WRITE_RECTILINEAR_DATA(ArrayType, iDataPtr, VtkType, Type, Format)                                                                                                                         \
+  {                                                                                                                                                                                                    \
+    ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(iDataPtr);                                                                                                                         \
+    if(nullptr != array.get())                                                                                                                                                                         \
+    {                                                                                                                                                                                                  \
+      size_t totalElements = array->getSize();                                                                                                                                                         \
+      Type* val = array->getPointer(0);                                                                                                                                                                \
+      int numComps = array->getNumberOfComponents();                                                                                                                                                   \
+      QString dName = array->getName();                                                                                                                                                                \
+      dName = dName.replace(" ", "_");                                                                                                                                                                 \
+      fprintf(f, "SCALARS %s %s %d\n", dName.toLatin1().data(), VtkType, numComps);                                                                                                                    \
+      fprintf(f, "LOOKUP_TABLE default\n");                                                                                                                                                            \
+      if(getWriteBinaryFile())                                                                                                                                                                         \
+      {                                                                                                                                                                                                \
+        if(BIGENDIAN == 0)                                                                                                                                                                             \
+        {                                                                                                                                                                                              \
+          array->byteSwapElements();                                                                                                                                                                   \
+        }                                                                                                                                                                                              \
+        size_t totalWritten = fwrite(val, array->getTypeSize(), totalElements, f);                                                                                                                     \
+        if(totalWritten != totalElements)                                                                                                                                                              \
+        {                                                                                                                                                                                              \
+        }                                                                                                                                                                                              \
+        fprintf(f, "\n");                                                                                                                                                                              \
+        if(BIGENDIAN == 0)                                                                                                                                                                             \
+        {                                                                                                                                                                                              \
+          array->byteSwapElements();                                                                                                                                                                   \
+        }                                                                                                                                                                                              \
+      }                                                                                                                                                                                                \
+      else                                                                                                                                                                                             \
+      {                                                                                                                                                                                                \
+        for(size_t i = 0; i < totalElements; i++)                                                                                                                                                      \
+        {                                                                                                                                                                                              \
+          if(i % 20 == 0 && i > 0)                                                                                                                                                                     \
+          {                                                                                                                                                                                            \
+            fprintf(f, "\n");                                                                                                                                                                          \
+          }                                                                                                                                                                                            \
+          fprintf(f, Format, val[i]);                                                                                                                                                                  \
+        }                                                                                                                                                                                              \
+        fprintf(f, "\n");                                                                                                                                                                              \
+      }                                                                                                                                                                                                \
+    }                                                                                                                                                                                                  \
   }
-
-
-
-
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.cpp b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.cpp
index 0ebc789e49..73c031e93a 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.cpp
+++ b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineItemBorderSizeAnimation.h"
 
@@ -37,13 +37,13 @@
 //
 // -----------------------------------------------------------------------------
 PipelineItemBorderSizeAnimation::PipelineItemBorderSizeAnimation(PipelineModel* model, QPersistentModelIndex index)
-  : QVariantAnimation(model),
-    m_Index(index),
-    m_PipelineModel(model)
+: QVariantAnimation(model)
+, m_Index(index)
+, m_PipelineModel(model)
 {
   setStartValue(0);
   setEndValue(2);
-  setDuration(100*2);
+  setDuration(100 * 2);
   connect(this, &PipelineItemBorderSizeAnimation::valueChanged, this, &PipelineItemBorderSizeAnimation::listenValueChanged);
 
   start(QAbstractAnimation::DeleteWhenStopped);
@@ -52,7 +52,7 @@ PipelineItemBorderSizeAnimation::PipelineItemBorderSizeAnimation(PipelineModel*
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineItemBorderSizeAnimation::listenValueChanged(const QVariant & value)
+void PipelineItemBorderSizeAnimation::listenValueChanged(const QVariant& value)
 {
   if(m_PipelineModel != nullptr)
   {
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
old mode 100755
new mode 100644
index 3435994fc0..bb4eb42014
--- a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,22 +40,22 @@ class PipelineModel;
 
 class SVWidgetsLib_EXPORT PipelineItemBorderSizeAnimation : public QVariantAnimation
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    PipelineItemBorderSizeAnimation(PipelineModel* model, QPersistentModelIndex index);
-    ~PipelineItemBorderSizeAnimation() override = default;
+public:
+  PipelineItemBorderSizeAnimation(PipelineModel* model, QPersistentModelIndex index);
+  ~PipelineItemBorderSizeAnimation() override = default;
 
-  private slots:
-    void listenValueChanged(const QVariant & value);
+private slots:
+  void listenValueChanged(const QVariant& value);
 
-  private:
-    QPersistentModelIndex m_Index;
-    PipelineModel* m_PipelineModel;
+private:
+  QPersistentModelIndex m_Index;
+  PipelineModel* m_PipelineModel;
 
-  public:
-    PipelineItemBorderSizeAnimation(const PipelineItemBorderSizeAnimation&) = delete; // Copy Constructor Not Implemented
-    PipelineItemBorderSizeAnimation(PipelineItemBorderSizeAnimation&&) = delete;      // Move Constructor Not Implemented
-    PipelineItemBorderSizeAnimation& operator=(const PipelineItemBorderSizeAnimation&) = delete; // Copy Assignment Not Implemented
-    PipelineItemBorderSizeAnimation& operator=(PipelineItemBorderSizeAnimation&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineItemBorderSizeAnimation(const PipelineItemBorderSizeAnimation&) = delete;            // Copy Constructor Not Implemented
+  PipelineItemBorderSizeAnimation(PipelineItemBorderSizeAnimation&&) = delete;                 // Move Constructor Not Implemented
+  PipelineItemBorderSizeAnimation& operator=(const PipelineItemBorderSizeAnimation&) = delete; // Copy Assignment Not Implemented
+  PipelineItemBorderSizeAnimation& operator=(PipelineItemBorderSizeAnimation&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.cpp b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.cpp
index 7284272d34..909926d2f4 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.cpp
+++ b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineItemHeightAnimation.h"
 
@@ -37,10 +37,10 @@
 //
 // -----------------------------------------------------------------------------
 PipelineItemHeightAnimation::PipelineItemHeightAnimation(PipelineModel* model, QPersistentModelIndex index, AnimationDirection direction, QObject* parent)
-  : QVariantAnimation(parent),
-    m_Index(index),
-    m_PipelineModel(model),
-    m_Direction(direction)
+: QVariantAnimation(parent)
+, m_Index(index)
+, m_PipelineModel(model)
+, m_Direction(direction)
 {
   setStartValue(0);
   setEndValue(10);
@@ -48,8 +48,8 @@ PipelineItemHeightAnimation::PipelineItemHeightAnimation(PipelineModel* model, Q
   int duration = 150;
   setDuration(duration);
 
-//  QSize size = m_PipelineModel->data(m_Index, Qt::SizeHintRole).toSize();
-//  m_PipelineModel->setData(m_Index, size.height(), PipelineModel::Roles::HeightRole);
+  //  QSize size = m_PipelineModel->data(m_Index, Qt::SizeHintRole).toSize();
+  //  m_PipelineModel->setData(m_Index, size.height(), PipelineModel::Roles::HeightRole);
 
   connect(this, &PipelineItemHeightAnimation::valueChanged, this, &PipelineItemHeightAnimation::listenValueChanged);
 }
@@ -57,18 +57,18 @@ PipelineItemHeightAnimation::PipelineItemHeightAnimation(PipelineModel* model, Q
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineItemHeightAnimation::listenValueChanged(const QVariant & value)
+void PipelineItemHeightAnimation::listenValueChanged(const QVariant& value)
 {
   if(m_PipelineModel != nullptr)
   {
     int width = m_PipelineModel->data(m_Index, PipelineModel::Roles::WidthRole).toInt();
-    if (m_Direction == AnimationDirection::Open)
+    if(m_Direction == AnimationDirection::Open)
     {
       int height = PipelineItem::MaxHeight * currentValue().toInt() * 0.1;
       QSize size(width, height);
       m_PipelineModel->setData(m_Index, size, Qt::SizeHintRole);
     }
-    else if (m_Direction == AnimationDirection::Close)
+    else if(m_Direction == AnimationDirection::Close)
     {
       int height = PipelineItem::MaxHeight - (PipelineItem::MaxHeight * currentValue().toInt() * 0.1);
       QSize size(width, height);
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
old mode 100755
new mode 100644
index 0dc4a1f0a5..5874efb277
--- a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,28 +40,28 @@ class PipelineModel;
 
 class SVWidgetsLib_EXPORT PipelineItemHeightAnimation : public QVariantAnimation
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    enum class AnimationDirection : unsigned int
-    {
-      Open,
-      Close
-    };
+public:
+  enum class AnimationDirection : unsigned int
+  {
+    Open,
+    Close
+  };
 
-    PipelineItemHeightAnimation(PipelineModel* model, QPersistentModelIndex index, AnimationDirection direction, QObject* parent = nullptr);
+  PipelineItemHeightAnimation(PipelineModel* model, QPersistentModelIndex index, AnimationDirection direction, QObject* parent = nullptr);
 
-  private slots:
-    void listenValueChanged(const QVariant & value);
+private slots:
+  void listenValueChanged(const QVariant& value);
 
-  private:
-    QPersistentModelIndex m_Index;
-    PipelineModel* m_PipelineModel;
-    AnimationDirection m_Direction;
+private:
+  QPersistentModelIndex m_Index;
+  PipelineModel* m_PipelineModel;
+  AnimationDirection m_Direction;
 
-  public:
-    PipelineItemHeightAnimation(const PipelineItemHeightAnimation&) = delete; // Copy Constructor Not Implemented
-    PipelineItemHeightAnimation(PipelineItemHeightAnimation&&) = delete;      // Move Constructor Not Implemented
-    PipelineItemHeightAnimation& operator=(const PipelineItemHeightAnimation&) = delete; // Copy Assignment Not Implemented
-    PipelineItemHeightAnimation& operator=(PipelineItemHeightAnimation&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineItemHeightAnimation(const PipelineItemHeightAnimation&) = delete;            // Copy Constructor Not Implemented
+  PipelineItemHeightAnimation(PipelineItemHeightAnimation&&) = delete;                 // Move Constructor Not Implemented
+  PipelineItemHeightAnimation& operator=(const PipelineItemHeightAnimation&) = delete; // Copy Assignment Not Implemented
+  PipelineItemHeightAnimation& operator=(PipelineItemHeightAnimation&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.cpp b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.cpp
index 0829a98667..11effc9c99 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.cpp
+++ b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineItemSlideAnimation.h"
 
@@ -37,26 +37,26 @@
 //
 // -----------------------------------------------------------------------------
 PipelineItemSlideAnimation::PipelineItemSlideAnimation(PipelineModel* model, QPersistentModelIndex index, int numberOfPixels, AnimationDirection direction)
-  : QVariantAnimation(model),
-    m_Index(index),
-    m_PipelineModel(model),
-    m_Direction(direction),
-    m_NumberOfPixels(numberOfPixels)
+: QVariantAnimation(model)
+, m_Index(index)
+, m_PipelineModel(model)
+, m_Direction(direction)
+, m_NumberOfPixels(numberOfPixels)
 {
   setStartValue(0);
   setEndValue(200);
 
   setDuration(150);
 
-  if (m_Direction == AnimationDirection::EnterLeft)
+  if(m_Direction == AnimationDirection::EnterLeft)
   {
     m_PipelineModel->setData(m_Index, -m_NumberOfPixels, PipelineModel::Roles::XOffsetRole);
   }
-  else if (m_Direction == AnimationDirection::EnterRight)
+  else if(m_Direction == AnimationDirection::EnterRight)
   {
     m_PipelineModel->setData(m_Index, m_NumberOfPixels, PipelineModel::Roles::XOffsetRole);
   }
-  else if (m_Direction == AnimationDirection::ExitLeft || m_Direction == AnimationDirection::ExitRight)
+  else if(m_Direction == AnimationDirection::ExitLeft || m_Direction == AnimationDirection::ExitRight)
   {
     m_PipelineModel->setData(m_Index, 0, PipelineModel::Roles::XOffsetRole);
   }
@@ -74,19 +74,19 @@ void PipelineItemSlideAnimation::listenValueChanged(const QVariant& value)
 {
   if(m_PipelineModel != nullptr)
   {
-    if (m_Direction == AnimationDirection::EnterLeft)
+    if(m_Direction == AnimationDirection::EnterLeft)
     {
       m_PipelineModel->setData(m_Index, -m_NumberOfPixels + (m_NumberOfPixels * currentValue().toInt() * 0.005), PipelineModel::Roles::XOffsetRole);
     }
-    else if (m_Direction == AnimationDirection::EnterRight)
+    else if(m_Direction == AnimationDirection::EnterRight)
     {
       m_PipelineModel->setData(m_Index, m_NumberOfPixels - (m_NumberOfPixels * currentValue().toInt() * 0.005), PipelineModel::Roles::XOffsetRole);
     }
-    if (m_Direction == AnimationDirection::ExitLeft)
+    if(m_Direction == AnimationDirection::ExitLeft)
     {
       m_PipelineModel->setData(m_Index, 0 - (m_NumberOfPixels * currentValue().toInt() * 0.005), PipelineModel::Roles::XOffsetRole);
     }
-    else if (m_Direction == AnimationDirection::ExitRight)
+    else if(m_Direction == AnimationDirection::ExitRight)
     {
       m_PipelineModel->setData(m_Index, 0 + (m_NumberOfPixels * currentValue().toInt() * 0.005), PipelineModel::Roles::XOffsetRole);
     }
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
old mode 100755
new mode 100644
index 5bad515faa..88998a9f90
--- a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,33 +40,33 @@ class PipelineModel;
 
 class SVWidgetsLib_EXPORT PipelineItemSlideAnimation : public QVariantAnimation
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    enum class AnimationDirection : unsigned int
-    {
-      EnterLeft,
-      EnterRight,
-      ExitLeft,
-      ExitRight
-    };
+public:
+  enum class AnimationDirection : unsigned int
+  {
+    EnterLeft,
+    EnterRight,
+    ExitLeft,
+    ExitRight
+  };
 
-    PipelineItemSlideAnimation(PipelineModel* model, QPersistentModelIndex index, int numberOfPixels, AnimationDirection direction);
-    ~PipelineItemSlideAnimation() override = default;
+  PipelineItemSlideAnimation(PipelineModel* model, QPersistentModelIndex index, int numberOfPixels, AnimationDirection direction);
+  ~PipelineItemSlideAnimation() override = default;
 
-  private slots:
-    void listenValueChanged(const QVariant & value);
+private slots:
+  void listenValueChanged(const QVariant& value);
 
-  private:
-    QPersistentModelIndex m_Index;
-    PipelineModel* m_PipelineModel;
-    AnimationDirection m_Direction;
-    int m_NumberOfPixels = 0;
-    int m_StartX = 0;
+private:
+  QPersistentModelIndex m_Index;
+  PipelineModel* m_PipelineModel;
+  AnimationDirection m_Direction;
+  int m_NumberOfPixels = 0;
+  int m_StartX = 0;
 
-  public:
-    PipelineItemSlideAnimation(const PipelineItemSlideAnimation&) = delete; // Copy Constructor Not Implemented
-    PipelineItemSlideAnimation(PipelineItemSlideAnimation&&) = delete;      // Move Constructor Not Implemented
-    PipelineItemSlideAnimation& operator=(const PipelineItemSlideAnimation&) = delete; // Copy Assignment Not Implemented
-    PipelineItemSlideAnimation& operator=(PipelineItemSlideAnimation&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineItemSlideAnimation(const PipelineItemSlideAnimation&) = delete;            // Copy Constructor Not Implemented
+  PipelineItemSlideAnimation(PipelineItemSlideAnimation&&) = delete;                 // Move Constructor Not Implemented
+  PipelineItemSlideAnimation& operator=(const PipelineItemSlideAnimation&) = delete; // Copy Assignment Not Implemented
+  PipelineItemSlideAnimation& operator=(PipelineItemSlideAnimation&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
index 55335f8dd9..3807b48a50 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterWidgetManager.h"
 
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.h b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
index 8188e8c7eb..3ff272d67a 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.h
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
@@ -1,49 +1,46 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QString>
 #include <QtCore/QMap>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Core/IFilterWidgetFactory.h"
 
-
 /**
  * @class FilterWidgetManager FilterWidgetManager.h FilterWidgets/FilterWidgetManager.h
  * @brief This class is a singleton based manager for creating Qt based widgets
@@ -54,73 +51,70 @@
  */
 class SVWidgetsLib_EXPORT FilterWidgetManager
 {
-  public:
-    //SIMPL_SHARED_POINTERS(FilterWidgetManager)
-    /**
-     * @brief Returns the name of the class for FilterWidgetManager
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for FilterWidgetManager
-     */
-    static QString ClassName();
-
-    virtual ~FilterWidgetManager();
-
-    typedef QMap<QString, IFilterWidgetFactory::Pointer> Collection;
-
-    /**
-     * @brief Static instance to retrieve the global instance of this class
-     * @return
-     */
-    static FilterWidgetManager* Instance();
-
-    /**
-     * @brief Registers a PipelineFilterWidgetFactory instance for a give name
-     * @param name The name of the filter
-     * @param factory An instance of the factory
-     */
-    static void RegisterFilterWidgetFactory(const QString& name, IFilterWidgetFactory::Pointer factory);
-
-    static void RegisterKnownFilterWidgets();
-
-
-    /**
-     * @brief Returns the mapping of names to Factory instances for all the
-     * factories that are registered.
-     * @return
-     */
-    Collection getFactories();
-
-    /**
-       * @brief Adds a Factory that creates PipelineFilterWidgets
-       * @param name
-       * @param factory
-       */
-    void addFilterWidgetFactory(const QString& widgetType, IFilterWidgetFactory::Pointer factory);
-
-    /**
-     * @brief createWidget
-     * @param parameter
-     * @param filter
-     * @param parent
-     * @return
-     */
-    QWidget* createWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent);
-
-  protected:
-    FilterWidgetManager();
-
-  private:
-    Collection m_Factories;
-
-    static FilterWidgetManager* self;
-
-  public:
-    FilterWidgetManager(const FilterWidgetManager&) = delete; // Copy Constructor Not Implemented
-    FilterWidgetManager(FilterWidgetManager&&) = delete;      // Move Constructor Not Implemented
-    FilterWidgetManager& operator=(const FilterWidgetManager&) = delete; // Copy Assignment Not Implemented
-    FilterWidgetManager& operator=(FilterWidgetManager&&) = delete;      // Move Assignment Not Implemented
+public:
+  // SIMPL_SHARED_POINTERS(FilterWidgetManager)
+  /**
+   * @brief Returns the name of the class for FilterWidgetManager
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for FilterWidgetManager
+   */
+  static QString ClassName();
+
+  virtual ~FilterWidgetManager();
+
+  typedef QMap<QString, IFilterWidgetFactory::Pointer> Collection;
+
+  /**
+   * @brief Static instance to retrieve the global instance of this class
+   * @return
+   */
+  static FilterWidgetManager* Instance();
+
+  /**
+   * @brief Registers a PipelineFilterWidgetFactory instance for a give name
+   * @param name The name of the filter
+   * @param factory An instance of the factory
+   */
+  static void RegisterFilterWidgetFactory(const QString& name, IFilterWidgetFactory::Pointer factory);
+
+  static void RegisterKnownFilterWidgets();
+
+  /**
+   * @brief Returns the mapping of names to Factory instances for all the
+   * factories that are registered.
+   * @return
+   */
+  Collection getFactories();
+
+  /**
+   * @brief Adds a Factory that creates PipelineFilterWidgets
+   * @param name
+   * @param factory
+   */
+  void addFilterWidgetFactory(const QString& widgetType, IFilterWidgetFactory::Pointer factory);
+
+  /**
+   * @brief createWidget
+   * @param parameter
+   * @param filter
+   * @param parent
+   * @return
+   */
+  QWidget* createWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent);
+
+protected:
+  FilterWidgetManager();
+
+private:
+  Collection m_Factories;
+
+  static FilterWidgetManager* self;
+
+public:
+  FilterWidgetManager(const FilterWidgetManager&) = delete;            // Copy Constructor Not Implemented
+  FilterWidgetManager(FilterWidgetManager&&) = delete;                 // Move Constructor Not Implemented
+  FilterWidgetManager& operator=(const FilterWidgetManager&) = delete; // Copy Assignment Not Implemented
+  FilterWidgetManager& operator=(FilterWidgetManager&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
index 22caf1481d..950d28c0d1 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IFilterWidgetFactory.h"
 
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
index fc22c7e42e..c9e41e1afa 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -46,54 +44,49 @@
 class FilterParameter;
 class QWidget;
 
-
 /**
  * @brief This class serves as a base class to create Factory classes that can
  * create PipelineFilterWidgets for a GUI based on Qt.
  */
 class SVWidgetsLib_EXPORT IFilterWidgetFactory
 {
-  public:
-    using Self = IFilterWidgetFactory;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
-
-    /**
-     * @brief Returns the name of the class for IFilterWidgetFactory
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for IFilterWidgetFactory
-     */
-    static QString ClassName();
-
-    virtual ~IFilterWidgetFactory();
-
-    /**
-     * @brief This function should NEVER get called. The subclass should ALWAYS implement
-     * this method so we are going to crash the program.t
-     * @param parameter The FilterParameter that this widget will represent
-     * @param filter The instance of the filter that the FilterParameter is a part of
-     * @param parent The Parent QWidget for the created widget
-     * @return
-     */
-    virtual QWidget* createWidget(FilterParameter* parameter,
-                                  AbstractFilter* filter = nullptr,
-                                  QWidget* parent = nullptr);
-
-  protected:
-    IFilterWidgetFactory();
-
-  public:
-    IFilterWidgetFactory(const IFilterWidgetFactory&) = delete; // Copy Constructor Not Implemented
-    IFilterWidgetFactory(IFilterWidgetFactory&&) = delete;      // Move Constructor Not Implemented
-    IFilterWidgetFactory& operator=(const IFilterWidgetFactory&) = delete; // Copy Assignment Not Implemented
-    IFilterWidgetFactory& operator=(IFilterWidgetFactory&&) = delete;      // Move Assignment Not Implemented
-
-  private:
+public:
+  using Self = IFilterWidgetFactory;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  /**
+   * @brief Returns the name of the class for IFilterWidgetFactory
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for IFilterWidgetFactory
+   */
+  static QString ClassName();
+
+  virtual ~IFilterWidgetFactory();
+
+  /**
+   * @brief This function should NEVER get called. The subclass should ALWAYS implement
+   * this method so we are going to crash the program.t
+   * @param parameter The FilterParameter that this widget will represent
+   * @param filter The instance of the filter that the FilterParameter is a part of
+   * @param parent The Parent QWidget for the created widget
+   * @return
+   */
+  virtual QWidget* createWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+protected:
+  IFilterWidgetFactory();
+
+public:
+  IFilterWidgetFactory(const IFilterWidgetFactory&) = delete;            // Copy Constructor Not Implemented
+  IFilterWidgetFactory(IFilterWidgetFactory&&) = delete;                 // Move Constructor Not Implemented
+  IFilterWidgetFactory& operator=(const IFilterWidgetFactory&) = delete; // Copy Assignment Not Implemented
+  IFilterWidgetFactory& operator=(IFilterWidgetFactory&&) = delete;      // Move Assignment Not Implemented
+
+private:
 };
-
-
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h b/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
index 33e7921e0f..aa41b34eaa 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
@@ -1,92 +1,89 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtGui/QColor>
 
-
 namespace SIMPLView
 {
 
-  namespace Defaults
-  {
-    static const QColor BasicColor(215, 215, 215);
-    static const QColor AdvancedColor(200, 200, 212);
-  }
-
-
-  namespace DragAndDrop
-  {
-    const QString FilterListItem("Filter List Item");
-    const QString FilterPipelineItem("Filter Pipeline Item");
-    const QString BookmarkItem("Bookmark Item");
-    const QString Url("text/uri-list");
-    const QString DataArrayPath("DataArrayPath");
-    const QString SelectionWidget("Selection Widget");
-  }
+namespace Defaults
+{
+static const QColor BasicColor(215, 215, 215);
+static const QColor AdvancedColor(200, 200, 212);
+} // namespace Defaults
 
-  namespace GeometryIcons
-  {
-    const QString Image(":SIMPL/icons/images/ImageGeometry.png");
-    const QString Vertex(":SIMPL/icons/images/VertexGeometry.png");
-    const QString Edge(":SIMPL/icons/images/EdgeGeometry.png");
-    const QString Triangle(":SIMPL/icons/images/TriangleGeometry.png");
-    const QString Quad(":SIMPL/icons/images/QuadGeometry.png");
-    const QString Tetetrahedral(":SIMPL/icons/images/TetrahedralGeometry.png");
-    const QString Hexahedral(":SIMPL/icons/images/HexahedralGeometry.png");
-    const QString Rectilinear(":SIMPL/icons/images/RectilinearGeometry.png");
-  }
+namespace DragAndDrop
+{
+const QString FilterListItem("Filter List Item");
+const QString FilterPipelineItem("Filter Pipeline Item");
+const QString BookmarkItem("Bookmark Item");
+const QString Url("text/uri-list");
+const QString DataArrayPath("DataArrayPath");
+const QString SelectionWidget("Selection Widget");
+} // namespace DragAndDrop
 
-  namespace DataArrayPath
-  {
-    const QString BaseNewPathIcon(":SIMPL/icons/images/Asterisk.png");
-  }
+namespace GeometryIcons
+{
+const QString Image(":SIMPL/icons/images/ImageGeometry.png");
+const QString Vertex(":SIMPL/icons/images/VertexGeometry.png");
+const QString Edge(":SIMPL/icons/images/EdgeGeometry.png");
+const QString Triangle(":SIMPL/icons/images/TriangleGeometry.png");
+const QString Quad(":SIMPL/icons/images/QuadGeometry.png");
+const QString Tetetrahedral(":SIMPL/icons/images/TetrahedralGeometry.png");
+const QString Hexahedral(":SIMPL/icons/images/HexahedralGeometry.png");
+const QString Rectilinear(":SIMPL/icons/images/RectilinearGeometry.png");
+} // namespace GeometryIcons
 
-  namespace DockWidgetSettings
-  {
-    const QString GroupName("DockWidgetSettings");
-    const QString IssuesDockGroupName("Issues Dock Widget");
-    const QString StandardOutputGroupName("Standard Output Dock Widget");
-    const QString KeyName("Show / Hide On Error");
-    enum class HideDockSetting : int
-    {
-      Ignore = 0,
-      OnError = 1,
-      OnStatusAndError = 2
-    };
-  }
+namespace DataArrayPath
+{
+const QString BaseNewPathIcon(":SIMPL/icons/images/Asterisk.png");
 }
 
+namespace DockWidgetSettings
+{
+const QString GroupName("DockWidgetSettings");
+const QString IssuesDockGroupName("Issues Dock Widget");
+const QString StandardOutputGroupName("Standard Output Dock Widget");
+const QString KeyName("Show / Hide On Error");
+enum class HideDockSetting : int
+{
+  Ignore = 0,
+  OnError = 1,
+  OnStatusAndError = 2
+};
+} // namespace DockWidgetSettings
+} // namespace SIMPLView
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
index cf8d02ef62..f3a2ab085b 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
@@ -1,55 +1,50 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
-
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-#if defined (_MSC_VER)
-#pragma warning(disable: 4251)
-#pragma warning(disable: 4710)
-#pragma warning(disable: 4820)
-#pragma warning(disable: 4668)
-#pragma warning(disable: 4265)
-#pragma warning(disable: 4189)
-#pragma warning(disable: 4640)
-#pragma warning(disable: 4996)
-#pragma warning(disable: 4548)
+#if defined(_MSC_VER)
+#pragma warning(disable : 4251)
+#pragma warning(disable : 4710)
+#pragma warning(disable : 4820)
+#pragma warning(disable : 4668)
+#pragma warning(disable : 4265)
+#pragma warning(disable : 4189)
+#pragma warning(disable : 4640)
+#pragma warning(disable : 4996)
+#pragma warning(disable : 4548)
 #endif
 
 /* Cmake will define SVWidgetsLib_EXPORTS on Windows when it
@@ -59,19 +54,19 @@ projects by hand you need to define SVWidgetsLib_EXPORTS when
 building on windows.
 */
 
-#if defined (SVWidgetsLib_BUILT_AS_DYNAMIC_LIB)
+#if defined(SVWidgetsLib_BUILT_AS_DYNAMIC_LIB)
 
-#if defined (SVWidgetsLib_EXPORTS)  /* Compiling the SVWidgets DLL/Dylib */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  SVWidgetsLib_EXPORT __declspec(dllexport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define SVWidgetsLib_EXPORT __attribute__ ((visibility("default")))
+#if defined(SVWidgetsLib_EXPORTS) /* Compiling the SVWidgets DLL/Dylib */
+#if defined(_MSC_VER)             /* MSVC Compiler Case */
+#define SVWidgetsLib_EXPORT __declspec(dllexport)
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define SVWidgetsLib_EXPORT __attribute__((visibility("default")))
 #endif
-#else  /* Importing the DLL into another project */
-#if defined (_MSC_VER)  /* MSVC Compiler Case */
-#define  SVWidgetsLib_EXPORT __declspec(dllimport)
-#elif (__GNUC__ >= 4)  /* GCC 4.x has support for visibility options */
-#define SVWidgetsLib_EXPORT __attribute__ ((visibility("default")))
+#else                 /* Importing the DLL into another project */
+#if defined(_MSC_VER) /* MSVC Compiler Case */
+#define SVWidgetsLib_EXPORT __declspec(dllimport)
+#elif(__GNUC__ >= 4) /* GCC 4.x has support for visibility options */
+#define SVWidgetsLib_EXPORT __attribute__((visibility("default")))
 #endif
 #endif
 #endif
@@ -80,6 +75,3 @@ building on windows.
 #ifndef _SVWidgetsLibdllexport_h_
 #define _SVWidgetsLibdllexport_h_
 #endif
-
-
-
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
index 9066de2ee1..b6cfa720db 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "AboutPlugins.h"
 
 #include <QtCore/QPluginLoader>
@@ -51,8 +51,6 @@
 
 #include "PluginDetails.h"
 
-
-
 enum ColumnIndex
 {
   NAME_INDEX = 0,
@@ -119,7 +117,7 @@ void AboutPlugins::setupGui()
 
   // Set default cell to the first item in the list
   pluginsTable->setCurrentCell(0, 0);
-  pluginsTable->setCurrentIndex(pluginsTable->model()->index(0,0));
+  pluginsTable->setCurrentIndex(pluginsTable->model()->index(0, 0));
   QTableWidgetItem* statusItem = pluginsTable->item(pluginsTable->currentRow(), STATUS_INDEX);
 
   if((statusItem != nullptr) && statusItem->text() == NOT_FOUND_STRING)
@@ -132,7 +130,7 @@ void AboutPlugins::setupGui()
   }
 
   setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
-  
+
 #if defined(Q_OS_MAC)
   m_CloseAction = new QAction(this);
   m_CloseAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_W));
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
old mode 100755
new mode 100644
index 721c8f799c..eceeb6a0c1
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
@@ -1,44 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QCheckBox>
 
-
 #include "SIMPLib/Plugin/PluginProxy.h"
 #include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
@@ -52,53 +50,51 @@
 
 class SVWidgetsLib_EXPORT AboutPlugins : public SVDialog, private Ui::AboutPlugins
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    AboutPlugins(QWidget* parent = nullptr);
-    ~AboutPlugins() override;
+public:
+  AboutPlugins(QWidget* parent = nullptr);
+  ~AboutPlugins() override;
 
-    void setupGui();
+  void setupGui();
 
-    void addPluginToTable(ISIMPLibPlugin* plugin, int row);
-    void addPlaceHolderToTable(SIMPLibPlugin* plugin, int row);
+  void addPluginToTable(ISIMPLibPlugin* plugin, int row);
+  void addPlaceHolderToTable(SIMPLibPlugin* plugin, int row);
 
-    void loadPlugins(QList<PluginProxy::Pointer> proxies);
+  void loadPlugins(QList<PluginProxy::Pointer> proxies);
 
-    void readCheckState(QCheckBox* checkBox, QString pluginName);
+  void readCheckState(QCheckBox* checkBox, QString pluginName);
 
-    QList<PluginProxy::Pointer> getPluginCheckBoxSettingsFromGUI();
-    static QList<PluginProxy::Pointer> readPluginCache();
+  QList<PluginProxy::Pointer> getPluginCheckBoxSettingsFromGUI();
+  static QList<PluginProxy::Pointer> readPluginCache();
 
-    void writePluginCache();
+  void writePluginCache();
 
-    bool getLoadPreferencesDidChange();
+  bool getLoadPreferencesDidChange();
 
-    void deletePlugin(QTableWidgetItem* nameItem);
+  void deletePlugin(QTableWidgetItem* nameItem);
 
-    void addPlugin(QString pluginPath);
+  void addPlugin(QString pluginPath);
 
-    void setLoadPreferencesFlag();
+  void setLoadPreferencesFlag();
 
-  public slots:
-    void on_closeBtn_clicked();
-    void on_addPluginBtn_clicked();
-    void on_removePluginBtn_clicked();
-    void on_pluginsTable_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous);
-    void setLoadPreferencesFlag(int state);
-    void togglePluginState(int state);
-    
-    void on_pluginsTable_itemSelectionChanged();
+public slots:
+  void on_closeBtn_clicked();
+  void on_addPluginBtn_clicked();
+  void on_removePluginBtn_clicked();
+  void on_pluginsTable_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous);
+  void setLoadPreferencesFlag(int state);
+  void togglePluginState(int state);
 
+  void on_pluginsTable_itemSelectionChanged();
 
-  private:
-    bool m_loadPreferencesDidChange;
-    QAction* m_CloseAction = nullptr;
+private:
+  bool m_loadPreferencesDidChange;
+  QAction* m_CloseAction = nullptr;
 
-  public:
-    AboutPlugins(const AboutPlugins&) = delete;   // Copy Constructor Not Implemented
-    AboutPlugins(AboutPlugins&&) = delete;        // Move Constructor Not Implemented
-    AboutPlugins& operator=(const AboutPlugins&) = delete; // Copy Assignment Not Implemented
-    AboutPlugins& operator=(AboutPlugins&&) = delete;      // Move Assignment Not Implemented
+public:
+  AboutPlugins(const AboutPlugins&) = delete;            // Copy Constructor Not Implemented
+  AboutPlugins(AboutPlugins&&) = delete;                 // Move Constructor Not Implemented
+  AboutPlugins& operator=(const AboutPlugins&) = delete; // Copy Assignment Not Implemented
+  AboutPlugins& operator=(AboutPlugins&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index 2375ffcc63..a0a746b9ce 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ColorPresets.h"
 
@@ -119,7 +119,7 @@ class ColorPresets::vtkInternals
 //
 // -----------------------------------------------------------------------------
 ColorPresets::ColorPresets()
-  : Internals(new ColorPresets::vtkInternals())
+: Internals(new ColorPresets::vtkInternals())
 {
 }
 
@@ -137,9 +137,8 @@ ColorPresets::~ColorPresets()
 // -----------------------------------------------------------------------------
 QString ColorPresets::GetPresetAsString(unsigned int index)
 {
-  const QJsonArray &presets = this->Internals->GetPresets();
-  return index < static_cast<unsigned int>(presets.size())?
-        presets[index].toString() : QString();
+  const QJsonArray& presets = this->Internals->GetPresets();
+  return index < static_cast<unsigned int>(presets.size()) ? presets[index].toString() : QString();
 }
 
 // -----------------------------------------------------------------------------
@@ -147,9 +146,8 @@ QString ColorPresets::GetPresetAsString(unsigned int index)
 // -----------------------------------------------------------------------------
 QJsonObject ColorPresets::GetPreset(unsigned int index)
 {
-  const QJsonArray &presets = this->Internals->GetPresets();
-  return index < static_cast<unsigned int>(presets.size())?
-        presets[index].toObject() : QJsonObject();
+  const QJsonArray& presets = this->Internals->GetPresets();
+  return index < static_cast<unsigned int>(presets.size()) ? presets[index].toObject() : QJsonObject();
 }
 
 // -----------------------------------------------------------------------------
@@ -163,9 +161,9 @@ QJsonObject ColorPresets::GetFirstPresetWithName(const char* name)
   }
 
   QJsonArray presets = this->Internals->GetPresets();
-  for (int i=0; i<presets.size(); i++)
+  for(int i = 0; i < presets.size(); i++)
   {
-    if (presets[i].isObject() && presets[i].toObject().value("Name").toString() == name)
+    if(presets[i].isObject() && presets[i].toObject().value("Name").toString() == name)
     {
       return presets[i].toObject();
     }
@@ -179,9 +177,8 @@ QJsonObject ColorPresets::GetFirstPresetWithName(const char* name)
 // -----------------------------------------------------------------------------
 QString ColorPresets::GetPresetName(unsigned int index)
 {
-  const QJsonArray &presets = this->Internals->GetPresets();
-  return index < static_cast<unsigned int>(presets.size())?
-        presets[index].toObject().value("Name").toString() : QString();
+  const QJsonArray& presets = this->Internals->GetPresets();
+  return index < static_cast<unsigned int>(presets.size()) ? presets[index].toObject().value("Name").toString() : QString();
 }
 
 // -----------------------------------------------------------------------------
@@ -192,11 +189,11 @@ QPixmap ColorPresets::getPixmapFromPreset(unsigned int index)
   QJsonObject presetObj = GetPreset(index);
   QSize resolution(180, 20);
 
-  if (!presetObj.contains("ColorSpace") || presetObj["ColorSpace"].toString() != "RGB")
+  if(!presetObj.contains("ColorSpace") || presetObj["ColorSpace"].toString() != "RGB")
   {
     return QPixmap();
   }
-  if (presetObj.contains("RGBPoints") && presetObj["RGBPoints"].isArray())
+  if(presetObj.contains("RGBPoints") && presetObj["RGBPoints"].isArray())
   {
     QJsonArray presetArray = presetObj["RGBPoints"].toArray();
     int numSamples = resolution.width();
@@ -204,9 +201,9 @@ QPixmap ColorPresets::getPixmapFromPreset(unsigned int index)
 
     QImage image(numSamples, 1, QImage::Format_RGB888);
 
-    for (int i=0; i < numSamples; ++i)
+    for(int i = 0; i < numSamples; ++i)
     {
-      image.setPixel(i, 0, qRgb(colorValues[3*i + 0], colorValues[3*i + 1], colorValues[3*i + 2]));
+      image.setPixel(i, 0, qRgb(colorValues[3 * i + 0], colorValues[3 * i + 1], colorValues[3 * i + 2]));
     }
 
     image = image.scaled(resolution);
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index aeb8395177..61e02ad570 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 // .NAME ColorPresets - manages presets for color, opacity,
 // and annotation presets.
@@ -51,7 +51,6 @@
 #include <QtCore/QString>
 #include <QtCore/QJsonObject>
 
-
 class QPixmap;
 class vtkPVXMLElement;
 
@@ -97,21 +96,27 @@ class ColorPresets
 
   // Description:
   // Returns true if the preset has opacities i.e. values for a piecewise function.
-  bool GetPresetHasOpacities(const QJsonObject &preset);
+  bool GetPresetHasOpacities(const QJsonObject& preset);
   bool GetPresetHasOpacities(unsigned int index)
-    { return this->GetPresetHasOpacities(this->GetPreset(index)); }
+  {
+    return this->GetPresetHasOpacities(this->GetPreset(index));
+  }
 
   // Description:
   // Returns true is the preset has indexed colors.
-  bool GetPresetHasIndexedColors(const QJsonObject &preset);
+  bool GetPresetHasIndexedColors(const QJsonObject& preset);
   bool GetPresetHasIndexedColors(unsigned int index)
-    { return this->GetPresetHasIndexedColors(this->GetPreset(index)); }
+  {
+    return this->GetPresetHasIndexedColors(this->GetPreset(index));
+  }
 
   // Description:
   // Returns true is the preset has annotations.
-  bool GetPresetHasAnnotations(const QJsonObject &preset);
+  bool GetPresetHasAnnotations(const QJsonObject& preset);
   bool GetPresetHasAnnotations(unsigned int index)
-    { return this->GetPresetHasAnnotations(this->GetPreset(index)); }
+  {
+    return this->GetPresetHasAnnotations(this->GetPreset(index));
+  }
 
 protected:
   ColorPresets();
@@ -121,9 +126,8 @@ class ColorPresets
   vtkInternals* Internals;
 
 public:
-  ColorPresets(const ColorPresets&) = delete;   // Copy Constructor Not Implemented
-  ColorPresets(ColorPresets&&) = delete;        // Move Constructor Not Implemented
+  ColorPresets(const ColorPresets&) = delete;            // Copy Constructor Not Implemented
+  ColorPresets(ColorPresets&&) = delete;                 // Move Constructor Not Implemented
   ColorPresets& operator=(const ColorPresets&) = delete; // Copy Assignment Not Implemented
   ColorPresets& operator=(ColorPresets&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
index de204f832d..d9a4392874 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ColorPresetsDialog.h"
 
-
 #include <QtGui/QPixmap>
 
 #include "SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h"
@@ -49,25 +48,22 @@ class ColorPresetsDialog::pqInternals
   QSharedPointer<ColorPresetsDialogTableModel> Model;
 
   pqInternals(ColorPresetsDialog* self)
-    : Model(new ColorPresetsDialogTableModel(self))
+  : Model(new ColorPresetsDialogTableModel(self))
   {
     this->Ui.setupUi(self);
     this->Ui.gradients->setModel(this->Model.data());
-
   }
 };
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ColorPresetsDialog::ColorPresetsDialog(QWidget* parentObject) :
-  SVDialog(parentObject),
-  Internals(new ColorPresetsDialog::pqInternals(this))
+ColorPresetsDialog::ColorPresetsDialog(QWidget* parentObject)
+: SVDialog(parentObject)
+, Internals(new ColorPresetsDialog::pqInternals(this))
 {
-  const Ui::ColorPresetsDialog &ui = this->Internals->Ui;
-  this->connect(ui.gradients->selectionModel(),
-                SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
-                SLOT(updateEnabledStateForSelection()));
+  const Ui::ColorPresetsDialog& ui = this->Internals->Ui;
+  this->connect(ui.gradients->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), SLOT(updateEnabledStateForSelection()));
   this->updateEnabledStateForSelection();
 
   this->connect(ui.okBtn, SIGNAL(clicked()), SLOT(triggerApply()));
@@ -95,12 +91,11 @@ void ColorPresetsDialog::setCurrentPreset(const char* presetName, bool applyPres
 {
   pqInternals& internals = (*this->Internals);
   QModelIndex idx = internals.Model->indexFromName(presetName);
-  if (idx.isValid())
+  if(idx.isValid())
   {
-    internals.Ui.gradients->selectionModel()->setCurrentIndex(
-          idx, QItemSelectionModel::ClearAndSelect);
+    internals.Ui.gradients->selectionModel()->setCurrentIndex(idx, QItemSelectionModel::ClearAndSelect);
 
-    if (applyPreset)
+    if(applyPreset)
     {
       triggerApply();
     }
@@ -112,9 +107,9 @@ void ColorPresetsDialog::setCurrentPreset(const char* presetName, bool applyPres
 // -----------------------------------------------------------------------------
 void ColorPresetsDialog::updateEnabledStateForSelection()
 {
-  const Ui::ColorPresetsDialog &ui = this->Internals->Ui;
+  const Ui::ColorPresetsDialog& ui = this->Internals->Ui;
   QModelIndexList selectedRows = ui.gradients->selectionModel()->selectedRows();
-  if (selectedRows.size() == 1)
+  if(selectedRows.size() == 1)
   {
     this->updateForSelectedIndex(selectedRows[0]);
   }
@@ -123,7 +118,7 @@ void ColorPresetsDialog::updateEnabledStateForSelection()
     ui.okBtn->setEnabled(false);
 
     bool isEditable = true;
-    foreach (const QModelIndex &idx, selectedRows)
+    foreach(const QModelIndex& idx, selectedRows)
     {
       isEditable &= this->Internals->Model->flags(idx).testFlag(Qt::ItemIsEditable);
     }
@@ -140,7 +135,7 @@ void ColorPresetsDialog::updateForSelectedIndex(const QModelIndex& idx)
   const QJsonObject& preset = internals.Model->getPresets()->GetPreset(idx.row());
   Q_ASSERT(preset.isEmpty() == false);
 
-  const Ui::ColorPresetsDialog &ui = internals.Ui;
+  const Ui::ColorPresetsDialog& ui = internals.Ui;
 
   ui.okBtn->setEnabled(true);
 }
@@ -151,9 +146,9 @@ void ColorPresetsDialog::updateForSelectedIndex(const QModelIndex& idx)
 void ColorPresetsDialog::triggerApply()
 {
   const pqInternals& internals = *this->Internals;
-  const Ui::ColorPresetsDialog &ui = this->Internals->Ui;
+  const Ui::ColorPresetsDialog& ui = this->Internals->Ui;
 
-  const QModelIndex index =  ui.gradients->selectionModel()->currentIndex();
+  const QModelIndex index = ui.gradients->selectionModel()->currentIndex();
   const QJsonObject& preset = internals.Model->getPresets()->GetPreset(index.row());
   QPixmap presetPixmap = internals.Model->data(index, Qt::DecorationRole).value<QPixmap>();
   Q_ASSERT(preset.isEmpty() == false);
@@ -175,9 +170,9 @@ void ColorPresetsDialog::cancel()
 const QJsonObject ColorPresetsDialog::currentPreset()
 {
   const pqInternals& internals = *this->Internals;
-  const Ui::ColorPresetsDialog &ui = this->Internals->Ui;
+  const Ui::ColorPresetsDialog& ui = this->Internals->Ui;
   QModelIndex idx = ui.gradients->selectionModel()->currentIndex();
-  if (idx.isValid())
+  if(idx.isValid())
   {
     const QJsonObject& preset = internals.Model->getPresets()->GetPreset(idx.row());
     Q_ASSERT(preset.empty() == false);
@@ -192,9 +187,9 @@ const QJsonObject ColorPresetsDialog::currentPreset()
 // -----------------------------------------------------------------------------
 int ColorPresetsDialog::currentPresetIndex()
 {
-  const Ui::ColorPresetsDialog &ui = this->Internals->Ui;
+  const Ui::ColorPresetsDialog& ui = this->Internals->Ui;
   QModelIndex idx = ui.gradients->selectionModel()->currentIndex();
-  if (idx.isValid())
+  if(idx.isValid())
   {
     return idx.row();
   }
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
index a9ee25b954..d95d1d251d 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
@@ -1,53 +1,51 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QModelIndex>
 #include <QtCore/QScopedPointer>
 
-
 #include "SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
-
 class QModelIndex;
 namespace Json
 {
-  class Value;
+class Value;
 }
 
 /// ColorPresetsDialog is the dialog used by to show the user with a choice of color
@@ -63,7 +61,7 @@ class SVWidgetsLib_EXPORT ColorPresetsDialog : public SVDialog
   Q_OBJECT
 
 public:
-  ColorPresetsDialog(QWidget* parent=0);
+  ColorPresetsDialog(QWidget* parent = 0);
   ~ColorPresetsDialog() override;
 
   /**
@@ -98,9 +96,8 @@ protected slots:
   const QScopedPointer<pqInternals> Internals;
 
 public:
-  ColorPresetsDialog(const ColorPresetsDialog&) = delete; // Copy Constructor Not Implemented
-  ColorPresetsDialog(ColorPresetsDialog&&) = delete;      // Move Constructor Not Implemented
+  ColorPresetsDialog(const ColorPresetsDialog&) = delete;            // Copy Constructor Not Implemented
+  ColorPresetsDialog(ColorPresetsDialog&&) = delete;                 // Move Constructor Not Implemented
   ColorPresetsDialog& operator=(const ColorPresetsDialog&) = delete; // Copy Assignment Not Implemented
   ColorPresetsDialog& operator=(ColorPresetsDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
index 812ddc22a4..2cd3a7a043 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ColorPresetsDialogTableModel.h"
 
@@ -40,8 +40,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ColorPresetsDialogTableModel::ColorPresetsDialogTableModel(QObject* parentObject) :
-  QAbstractTableModel(parentObject)
+ColorPresetsDialogTableModel::ColorPresetsDialogTableModel(QObject* parentObject)
+: QAbstractTableModel(parentObject)
 {
   Presets = ColorPresets::New();
   this->Pixmaps.reserve(this->Presets->GetNumberOfPresets());
@@ -62,9 +62,9 @@ QModelIndex ColorPresetsDialogTableModel::indexFromName(const char* presetName)
     return QModelIndex();
   }
 
-  for (int cc=0, max=this->rowCount(QModelIndex()); cc < max; ++cc)
+  for(int cc = 0, max = this->rowCount(QModelIndex()); cc < max; ++cc)
   {
-    if (this->Presets->GetPresetName(cc) == presetName)
+    if(this->Presets->GetPresetName(cc) == presetName)
     {
       return this->index(cc, 0, QModelIndex());
     }
@@ -78,13 +78,13 @@ QModelIndex ColorPresetsDialogTableModel::indexFromName(const char* presetName)
 // -----------------------------------------------------------------------------
 int ColorPresetsDialogTableModel::rowCount(const QModelIndex& idx) const
 {
-  return idx.isValid()? 0 : static_cast<int>(this->Presets->GetNumberOfPresets());
+  return idx.isValid() ? 0 : static_cast<int>(this->Presets->GetNumberOfPresets());
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int ColorPresetsDialogTableModel::columnCount(const QModelIndex &parent) const
+int ColorPresetsDialogTableModel::columnCount(const QModelIndex& parent) const
 {
   Q_UNUSED(parent)
 
@@ -94,14 +94,14 @@ int ColorPresetsDialogTableModel::columnCount(const QModelIndex &parent) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVariant ColorPresetsDialogTableModel::data(const QModelIndex &idx, int role) const
+QVariant ColorPresetsDialogTableModel::data(const QModelIndex& idx, int role) const
 {
-  if (!idx.isValid() || idx.model() != this)
+  if(!idx.isValid() || idx.model() != this)
   {
     return QVariant();
   }
 
-  switch (role)
+  switch(role)
   {
   case Qt::DisplayRole:
   case Qt::ToolTipRole:
@@ -114,7 +114,6 @@ QVariant ColorPresetsDialogTableModel::data(const QModelIndex &idx, int role) co
 
   case Qt::UserRole:
     return this->Presets->GetPresetHasIndexedColors(idx.row());
-
   }
   return QVariant();
 }
@@ -122,7 +121,7 @@ QVariant ColorPresetsDialogTableModel::data(const QModelIndex &idx, int role) co
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Qt::ItemFlags ColorPresetsDialogTableModel::flags(const QModelIndex &idx) const
+Qt::ItemFlags ColorPresetsDialogTableModel::flags(const QModelIndex& idx) const
 {
   Qt::ItemFlags flgs = QAbstractTableModel::flags(idx);
   return flgs;
@@ -135,12 +134,12 @@ QVariant ColorPresetsDialogTableModel::headerData(int section, Qt::Orientation o
 {
   Q_UNUSED(section)
 
-  if (orientation == Qt::Vertical)
+  if(orientation == Qt::Vertical)
   {
     return QVariant();
   }
 
-  if (role == Qt::DisplayRole)
+  if(role == Qt::DisplayRole)
   {
     return "Presets";
   }
@@ -153,15 +152,15 @@ QVariant ColorPresetsDialogTableModel::headerData(int section, Qt::Orientation o
 // -----------------------------------------------------------------------------
 const QPixmap& ColorPresetsDialogTableModel::pixmap(int row) const
 {
-  Pixmaps.reserve(row+1);
+  Pixmaps.reserve(row + 1);
 
   // grow Pixmaps if needed.
-  for (int cc=this->Pixmaps.size(); cc <= row; cc++)
+  for(int cc = this->Pixmaps.size(); cc <= row; cc++)
   {
     Pixmaps.push_back(QPixmap());
   }
 
-  if (Pixmaps[row].isNull())
+  if(Pixmaps[row].isNull())
   {
     Pixmaps[row] = Presets->getPixmapFromPreset(row);
   }
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
index edc29d3e15..24735c4118 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QModelIndex>
 
-
 #include "SVWidgetsLib/Dialogs/ColorPresets.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -55,11 +54,11 @@ class SVWidgetsLib_EXPORT ColorPresetsDialogTableModel : public QAbstractTableMo
 
   int rowCount(const QModelIndex& idx) const override;
 
-  int columnCount(const QModelIndex &parent) const override;
+  int columnCount(const QModelIndex& parent) const override;
 
-  QVariant data(const QModelIndex &idx, int role) const override;
+  QVariant data(const QModelIndex& idx, int role) const override;
 
-  Qt::ItemFlags flags(const QModelIndex &idx) const override;
+  Qt::ItemFlags flags(const QModelIndex& idx) const override;
 
   QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
 
@@ -74,9 +73,8 @@ class SVWidgetsLib_EXPORT ColorPresetsDialogTableModel : public QAbstractTableMo
   mutable QList<QPixmap> Pixmaps;
 
 public:
-  ColorPresetsDialogTableModel(const ColorPresetsDialogTableModel&) = delete; // Copy Constructor Not Implemented
-  ColorPresetsDialogTableModel(ColorPresetsDialogTableModel&&) = delete;      // Move Constructor Not Implemented
+  ColorPresetsDialogTableModel(const ColorPresetsDialogTableModel&) = delete;            // Copy Constructor Not Implemented
+  ColorPresetsDialogTableModel(ColorPresetsDialogTableModel&&) = delete;                 // Move Constructor Not Implemented
   ColorPresetsDialogTableModel& operator=(const ColorPresetsDialogTableModel&) = delete; // Copy Assignment Not Implemented
   ColorPresetsDialogTableModel& operator=(ColorPresetsDialogTableModel&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
index 73fb3621b2..ee067b3d2b 100644
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FavoritesChangedDialog.h"
 
@@ -93,7 +93,7 @@ void FavoritesChangedDialog::on_exportBtn_clicked()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FavoritesChangedDialog::setNewDirectory(QString val) 
+void FavoritesChangedDialog::setNewDirectory(QString val)
 {
   outputDir->setText(val);
 }
@@ -101,7 +101,7 @@ void FavoritesChangedDialog::setNewDirectory(QString val)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString FavoritesChangedDialog::getNewDirectory() 
+QString FavoritesChangedDialog::getNewDirectory()
 {
   if(outputDir->text().isEmpty())
   {
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
old mode 100755
new mode 100644
index 7ec4d650bf..be31cda291
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
@@ -47,37 +46,32 @@
  */
 class SVWidgetsLib_EXPORT FavoritesChangedDialog : public SVDialog, private Ui::FavoritesChangedDialog
 {
-    Q_OBJECT
-
-  public:
-
-    FavoritesChangedDialog(QWidget* parent = nullptr);
-    ~FavoritesChangedDialog() override;
+  Q_OBJECT
 
-  protected slots:
+public:
+  FavoritesChangedDialog(QWidget* parent = nullptr);
+  ~FavoritesChangedDialog() override;
 
-    void on_selectBtn_clicked();
-    void on_exportBtn_clicked();
-    void on_outputDir_textChanged(const QString& text);
+protected slots:
 
-  signals:
+  void on_selectBtn_clicked();
+  void on_exportBtn_clicked();
+  void on_outputDir_textChanged(const QString& text);
 
-    void exportBtnPressed(QString directory);
+signals:
 
+  void exportBtnPressed(QString directory);
 
-  protected:
+protected:
+  void setNewDirectory(QString val);
+  QString getNewDirectory();
 
-    void setNewDirectory(QString val);
-    QString getNewDirectory();
+private:
+  QString m_OpenDialogLastFilePath;
 
-  private:
-    QString m_OpenDialogLastFilePath;
-
-  public:
-    FavoritesChangedDialog(const FavoritesChangedDialog&) = delete; // Copy Constructor Not Implemented
-    FavoritesChangedDialog(FavoritesChangedDialog&&) = delete;      // Move Constructor Not Implemented
-    FavoritesChangedDialog& operator=(const FavoritesChangedDialog&) = delete; // Copy Assignment Not Implemented
-    FavoritesChangedDialog& operator=(FavoritesChangedDialog&&) = delete;      // Move Assignment Not Implemented
+public:
+  FavoritesChangedDialog(const FavoritesChangedDialog&) = delete;            // Copy Constructor Not Implemented
+  FavoritesChangedDialog(FavoritesChangedDialog&&) = delete;                 // Move Constructor Not Implemented
+  FavoritesChangedDialog& operator=(const FavoritesChangedDialog&) = delete; // Copy Assignment Not Implemented
+  FavoritesChangedDialog& operator=(FavoritesChangedDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
index dd25e56d38..8adae1d623 100644
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
@@ -1,41 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "PluginDetails.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -87,7 +85,7 @@ void PluginDetails::loadPluginDetails()
   descriptionTextEdit->setText(plugin->getDescription());
   copyrightLabel->setText(plugin->getCopyright());
   licenseTextEdit->setText(plugin->getLicense());
-  
+
   filtersListWidget->clear();
   QList<QString> filters = plugin->getFilters();
   for(QList<QString>::iterator iter = filters.begin(); iter != filters.end(); iter++)
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.h b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
old mode 100755
new mode 100644
index 84b2c7c2ff..562c3dbb75
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.h
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
@@ -1,46 +1,44 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
-
 //-- UIC generated Header
 #include "ui_PluginDetails.h"
 
@@ -48,40 +46,39 @@
 
 class PluginDetails : public QWidget, private Ui::PluginDetails
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    PluginDetails(QWidget* parent = nullptr);
-    ~PluginDetails() override;
+public:
+  PluginDetails(QWidget* parent = nullptr);
+  ~PluginDetails() override;
 
-    /**
-     * @brief Setter property for PluginName
-     */
-    void setPluginName(const QString& value);
-    /**
-     * @brief Getter property for PluginName
-     * @return Value of PluginName
-     */
-    QString getPluginName() const;
+  /**
+   * @brief Setter property for PluginName
+   */
+  void setPluginName(const QString& value);
+  /**
+   * @brief Getter property for PluginName
+   * @return Value of PluginName
+   */
+  QString getPluginName() const;
 
-    /**
-     * @brief Load the details for the plugin name stored in the PluginName property
-     */
-    void loadPluginDetails();
-    
-  protected:
-    /**
-     * @brief Instance specific UI setup codes
-     */
-    void setupGui();
+  /**
+   * @brief Load the details for the plugin name stored in the PluginName property
+   */
+  void loadPluginDetails();
 
-  public:
-    PluginDetails(const PluginDetails&) = delete;  // Copy Constructor Not Implemented
-    PluginDetails(PluginDetails&&) = delete;       // Move Constructor Not Implemented
-    PluginDetails& operator=(const PluginDetails&) = delete; // Copy Assignment Not Implemented
-    PluginDetails& operator=(PluginDetails&&) = delete;      // Move Assignment Not Implemented
+protected:
+  /**
+   * @brief Instance specific UI setup codes
+   */
+  void setupGui();
 
-  private:
-    QString m_PluginName = {};
-};
+public:
+  PluginDetails(const PluginDetails&) = delete;            // Copy Constructor Not Implemented
+  PluginDetails(PluginDetails&&) = delete;                 // Move Constructor Not Implemented
+  PluginDetails& operator=(const PluginDetails&) = delete; // Copy Assignment Not Implemented
+  PluginDetails& operator=(PluginDetails&&) = delete;      // Move Assignment Not Implemented
 
+private:
+  QString m_PluginName = {};
+};
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index 4c73dde24d..52aae409a1 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UpdateCheck.h"
 
@@ -40,7 +40,6 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QSysInfo>
 
-
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkReply>
 #include <QtNetwork/QNetworkRequest>
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
old mode 100755
new mode 100644
index 20eb5077ba..dab1303d6c
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
@@ -1,39 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,50 +44,45 @@ class QNetworkAccessManager;
 class QNetworkReply;
 class UpdateCheckData;
 
-
-
 class SVWidgetsLib_EXPORT UpdateCheck : public QObject
 {
-    Q_OBJECT
-
-  public:
-
-    typedef struct {
-      QString complete;
-      QString major;
-      QString minor;
-      QString patch;
-      QString package;
-      QString revision;
-      QString packageComplete;
-      QString buildDate;
-      QString appName;
-    } SIMPLVersionData_t;
-
-    UpdateCheck(SIMPLVersionData_t versionData, QObject* parent = nullptr);
-    ~UpdateCheck() override;
-
-
-    void checkVersion(QUrl website);
-
-  protected slots:
-    void networkReplied(QNetworkReply* reply);
-
-  signals:
-    void latestVersion(UpdateCheckData*);
-
-  protected:
-    void writeUpdateCheckDate();
-
-  private:
-    QNetworkAccessManager*        m_Nam;
-    UpdateCheck::SIMPLVersionData_t m_VersionData;
-
-  public:
-    UpdateCheck(const UpdateCheck&) = delete;            // Copy Constructor Not Implemented
-    UpdateCheck(UpdateCheck&&) = delete;                 // Move Constructor Not Implemented
-    UpdateCheck& operator=(const UpdateCheck&) = delete; // Copy Assignment Not Implemented
-    UpdateCheck& operator=(UpdateCheck&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  typedef struct
+  {
+    QString complete;
+    QString major;
+    QString minor;
+    QString patch;
+    QString package;
+    QString revision;
+    QString packageComplete;
+    QString buildDate;
+    QString appName;
+  } SIMPLVersionData_t;
+
+  UpdateCheck(SIMPLVersionData_t versionData, QObject* parent = nullptr);
+  ~UpdateCheck() override;
+
+  void checkVersion(QUrl website);
+
+protected slots:
+  void networkReplied(QNetworkReply* reply);
+
+signals:
+  void latestVersion(UpdateCheckData*);
+
+protected:
+  void writeUpdateCheckDate();
+
+private:
+  QNetworkAccessManager* m_Nam;
+  UpdateCheck::SIMPLVersionData_t m_VersionData;
+
+public:
+  UpdateCheck(const UpdateCheck&) = delete;            // Copy Constructor Not Implemented
+  UpdateCheck(UpdateCheck&&) = delete;                 // Move Constructor Not Implemented
+  UpdateCheck& operator=(const UpdateCheck&) = delete; // Copy Assignment Not Implemented
+  UpdateCheck& operator=(UpdateCheck&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
index 7865b1cb69..b58fbfc5df 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UpdateCheckData.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
old mode 100755
new mode 100644
index fef2b9df65..c640097ca5
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
@@ -1,90 +1,82 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-#if defined (QT_CORE_LIB)
+#if defined(QT_CORE_LIB)
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #endif
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 /**
-*
-*/
+ *
+ */
 class SVWidgetsLib_EXPORT UpdateCheckData : public QObject
 {
-    Q_OBJECT
-
-  public:
-    UpdateCheckData(QObject* parent = nullptr);
-    UpdateCheckData(const UpdateCheckData&);
-    void operator=(const UpdateCheckData&);
-    bool operator==(const UpdateCheckData&);
-
-    ~UpdateCheckData() override;
-
-    bool hasUpdate();
-    bool hasError();
-    QString getMessageDescription();
-    QString getAppString();
-    QString getServerString();
-
-    void setHasUpdate(bool val);
-    void setHasError(bool val);
-    void setMessageDescription(QString msg);
-    void setAppString(QString str);
-    void setServerString(QString str);
-
-  private:
-    bool          m_HasUpdate;
-    bool          m_HasError;
-    QString       m_MessageDescription;
-    QString       m_AppString;
-    QString       m_ServerString;
-
-
+  Q_OBJECT
+
+public:
+  UpdateCheckData(QObject* parent = nullptr);
+  UpdateCheckData(const UpdateCheckData&);
+  void operator=(const UpdateCheckData&);
+  bool operator==(const UpdateCheckData&);
+
+  ~UpdateCheckData() override;
+
+  bool hasUpdate();
+  bool hasError();
+  QString getMessageDescription();
+  QString getAppString();
+  QString getServerString();
+
+  void setHasUpdate(bool val);
+  void setHasError(bool val);
+  void setMessageDescription(QString msg);
+  void setAppString(QString str);
+  void setServerString(QString str);
+
+private:
+  bool m_HasUpdate;
+  bool m_HasError;
+  QString m_MessageDescription;
+  QString m_AppString;
+  QString m_ServerString;
 };
 
-#if defined (QT_CORE_LIB)
+#if defined(QT_CORE_LIB)
 Q_DECLARE_METATYPE(UpdateCheckData);
 #endif
-
-
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
index 11f6005aec..487e06fbe5 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UpdateCheckDialog.h"
 
@@ -40,20 +40,16 @@
 #include <QtCore/QDate>
 #include <QtCore/QString>
 
-
 #include <QtWidgets/QAction>
 
-
 #include "SVWidgetsLib/Dialogs/UpdateCheckData.h"
 
-
-
 namespace Detail
 {
 const QString UpdatePreferencesGroup("UpdatePreferences");
 const QString UpdateCheckDateKey("LastUpdateCheckDate");
 const QString UpdateFrequencyKey("Frequency");
-}
+} // namespace Detail
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
old mode 100755
new mode 100644
index fc5fd16f26..17e953e6fa
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -56,99 +56,94 @@ class UpdateCheckData;
  */
 class SVWidgetsLib_EXPORT UpdateCheckDialog : public SVDialog, private Ui::UpdateCheckDialog
 {
-    Q_OBJECT
-
-  public:
-    UpdateCheckDialog(UpdateCheck::SIMPLVersionData_t versionData, QWidget* parent = nullptr);
-    ~UpdateCheckDialog() override;
-
-    enum UpdateType
-    {
-      UpdateCheckDaily,
-      UpdateCheckWeekly,
-      UpdateCheckMonthly,
-      UpdateCheckManual
-    };
-
-    enum DialogState
-    {
-      SimpleDialog,
-      DefaultDialog
-    };
-
-    int getWhenToCheck();
-
-    QString getUpdatePreferencesPath();
-    QLabel* getCurrentVersionLabel();
-    QLabel* getLatestVersionLabel();
-    QString getAppName();
-    QLabel* getFeedbackTextLabel();
-
-    QRadioButton* getAutomaticallyBtn();
-    QRadioButton* getManuallyBtn();
-    QComboBox* getHowOftenComboBox();
-    QPushButton* getCheckNowBtn();
-
-    static QString GetUpdatePreferencesGroup();
-    static QString GetUpdateCheckKey();
-
-
-    void setLastCheckDateTime(QDateTime lastDateTime);
-    void setWhenToCheck(int whenToCheck);
-    void setUpdateWebSite(QString url);
-    void setApplicationName(QString name);
-
-    void readUpdatePreferences(QtSSettings& prefs);
-    void writeUpdatePreferences(QtSSettings& prefs);
-
-    /**
-    * @brief Hides the UI items necessary to change the dialog into a simple prompt
-    * that notifies of new updates and only provides a link to check the website.
-    */
-    void toSimpleUpdateCheckDialog();
-
-    /**
-    * @brief Shows the UI items necessary to change the dialog into its
-    * default, more complex prompt that allows the user to change updates
-    * to manual or automatic, and press a "Check Now" button to manually
-    * check for updates.
-    */
-    void toDefaultUpdateCheckDialog();
-
-    void setupGui();
-
-  public slots:
-    void on_checkNowBtn_clicked();
-    void on_howOften_currentIndexChanged(int);
-    void on_automatically_toggled(bool);
-    void on_manually_toggled(bool);
-
-  protected slots:
-    void LatestVersionReplied(UpdateCheckData*);
-
-  signals:
-    void finished();
-    void hasMessage(const QString& message);
-    void updateFound();
-
-  private:
-    QDateTime         m_LastCheckDateTime;
-    int             m_WhenToCheck;
-    QString           m_UpdatePreferencesPath;
-    QString           m_UpdateWebSite;
-    UpdateCheck*        m_UpdateCheck;
-    DialogState         m_DialogState;
-    UpdateCheck::SIMPLVersionData_t m_VersionData;
-
-    QAction*            m_CloseAction = nullptr;
-
-  public:
-    UpdateCheckDialog(const UpdateCheckDialog&) = delete; // Copy Constructor Not Implemented
-    UpdateCheckDialog(UpdateCheckDialog&&) = delete;      // Move Constructor Not Implemented
-    UpdateCheckDialog& operator=(const UpdateCheckDialog&) = delete; // Copy Assignment Not Implemented
-    UpdateCheckDialog& operator=(UpdateCheckDialog&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  UpdateCheckDialog(UpdateCheck::SIMPLVersionData_t versionData, QWidget* parent = nullptr);
+  ~UpdateCheckDialog() override;
+
+  enum UpdateType
+  {
+    UpdateCheckDaily,
+    UpdateCheckWeekly,
+    UpdateCheckMonthly,
+    UpdateCheckManual
+  };
+
+  enum DialogState
+  {
+    SimpleDialog,
+    DefaultDialog
+  };
+
+  int getWhenToCheck();
+
+  QString getUpdatePreferencesPath();
+  QLabel* getCurrentVersionLabel();
+  QLabel* getLatestVersionLabel();
+  QString getAppName();
+  QLabel* getFeedbackTextLabel();
+
+  QRadioButton* getAutomaticallyBtn();
+  QRadioButton* getManuallyBtn();
+  QComboBox* getHowOftenComboBox();
+  QPushButton* getCheckNowBtn();
+
+  static QString GetUpdatePreferencesGroup();
+  static QString GetUpdateCheckKey();
+
+  void setLastCheckDateTime(QDateTime lastDateTime);
+  void setWhenToCheck(int whenToCheck);
+  void setUpdateWebSite(QString url);
+  void setApplicationName(QString name);
+
+  void readUpdatePreferences(QtSSettings& prefs);
+  void writeUpdatePreferences(QtSSettings& prefs);
+
+  /**
+   * @brief Hides the UI items necessary to change the dialog into a simple prompt
+   * that notifies of new updates and only provides a link to check the website.
+   */
+  void toSimpleUpdateCheckDialog();
+
+  /**
+   * @brief Shows the UI items necessary to change the dialog into its
+   * default, more complex prompt that allows the user to change updates
+   * to manual or automatic, and press a "Check Now" button to manually
+   * check for updates.
+   */
+  void toDefaultUpdateCheckDialog();
+
+  void setupGui();
+
+public slots:
+  void on_checkNowBtn_clicked();
+  void on_howOften_currentIndexChanged(int);
+  void on_automatically_toggled(bool);
+  void on_manually_toggled(bool);
+
+protected slots:
+  void LatestVersionReplied(UpdateCheckData*);
+
+signals:
+  void finished();
+  void hasMessage(const QString& message);
+  void updateFound();
+
+private:
+  QDateTime m_LastCheckDateTime;
+  int m_WhenToCheck;
+  QString m_UpdatePreferencesPath;
+  QString m_UpdateWebSite;
+  UpdateCheck* m_UpdateCheck;
+  DialogState m_DialogState;
+  UpdateCheck::SIMPLVersionData_t m_VersionData;
+
+  QAction* m_CloseAction = nullptr;
+
+public:
+  UpdateCheckDialog(const UpdateCheckDialog&) = delete;            // Copy Constructor Not Implemented
+  UpdateCheckDialog(UpdateCheckDialog&&) = delete;                 // Move Constructor Not Implemented
+  UpdateCheckDialog& operator=(const UpdateCheckDialog&) = delete; // Copy Assignment Not Implemented
+  UpdateCheckDialog& operator=(UpdateCheckDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 11ae033170..2c9f016876 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractIOFileWidget.h"
 
@@ -156,8 +156,8 @@ void AbstractIOFileWidget::setupGui()
 // -----------------------------------------------------------------------------
 void AbstractIOFileWidget::keyPressEvent(QKeyEvent* event)
 {
-  if (event->key() == Qt::Key_Escape)
-  {  
+  if(event->key() == Qt::Key_Escape)
+  {
     SVStyle* style = SVStyle::Instance();
     m_LineEdit->setText(m_CurrentText);
     setValidFilePath(m_LineEdit->text());
@@ -188,11 +188,11 @@ void AbstractIOFileWidget::setupMenuField()
     m_ShowFileAction = new QAction(lineEditMenu);
     m_ShowFileAction->setObjectName(QString::fromUtf8("showFileAction"));
 #if defined(Q_OS_WIN)
-  m_ShowFileAction->setText("Show in Windows Explorer");
+    m_ShowFileAction->setText("Show in Windows Explorer");
 #elif defined(Q_OS_MAC)
-  m_ShowFileAction->setText("Show in Finder");
+    m_ShowFileAction->setText("Show in Finder");
 #else
-  m_ShowFileAction->setText("Show in File System");
+    m_ShowFileAction->setText("Show in File System");
 #endif
     lineEditMenu->addAction(m_ShowFileAction);
     connect(m_ShowFileAction, SIGNAL(triggered()), this, SLOT(showFileInFileSystem()));
@@ -217,7 +217,7 @@ void AbstractIOFileWidget::on_m_LineEdit_editingFinished()
   QString path = validator->convertToAbsolutePath(m_LineEdit->text());
 
   QFileInfo fi(m_LineEdit->text());
-  if (fi.isRelative())
+  if(fi.isRelative())
   {
     absPathLabel->setText(path);
     absPathLabel->show();
@@ -251,9 +251,9 @@ void AbstractIOFileWidget::on_m_LineEdit_textChanged(const QString& text)
 {
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   QString inputPath = validator->convertToAbsolutePath(text);
- 
+
   QFileInfo fi(text);
-  if (fi.isRelative())
+  if(fi.isRelative())
   {
     absPathLabel->setText(inputPath);
   }
@@ -270,7 +270,7 @@ void AbstractIOFileWidget::on_m_LineEdit_textChanged(const QString& text)
 
   SVStyle* style = SVStyle::Instance();
 
-  if (text != m_CurrentText)
+  if(text != m_CurrentText)
   {
     style->LineEditBackgroundErrorStyle(m_LineEdit);
     m_LineEdit->setToolTip("Press the 'Return' key to apply your changes");
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index ccd7192e47..abb9a7e232 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,7 +45,6 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_AbstractIOFileWidget.h"
 
 class QLineEdit;
@@ -54,72 +52,68 @@ class OutputFileFilterParameter;
 class QKeyEvent;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT AbstractIOFileWidget : public FilterParameterWidget, protected Ui::AbstractIOFileWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    AbstractIOFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~AbstractIOFileWidget() override;
-
-    Q_PROPERTY(QPixmap Icon READ getIcon WRITE setIcon)
-    void setIcon(const QPixmap& path);
-    QPixmap getIcon();
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void on_m_LineEdit_fileDropped(const QString& text);
-    void on_m_LineEdit_editingFinished();
-    void on_m_LineEdit_textChanged(const QString& text);
-    void on_m_LineEdit_returnPressed();
-
-
-  protected:
-    void setValue(const QString& val);
-
-    QString getValue();
-
-    /**
-    * @brief
-    * @param event
-    */
-    void keyPressEvent(QKeyEvent* event) override;
-
-    /**
-     * @brief setupMenuField
-     */
-    void setupMenuField();
-
-  private:
-    QAction* m_ShowFileAction = nullptr;
-    QString  m_CurrentText = "";
-    QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
-
-  public:
-    AbstractIOFileWidget(const AbstractIOFileWidget&) = delete; // Copy Constructor Not Implemented
-    AbstractIOFileWidget(AbstractIOFileWidget&&) = delete;      // Move Constructor Not Implemented
-    AbstractIOFileWidget& operator=(const AbstractIOFileWidget&) = delete; // Copy Assignment Not Implemented
-    AbstractIOFileWidget& operator=(AbstractIOFileWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  AbstractIOFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~AbstractIOFileWidget() override;
+
+  Q_PROPERTY(QPixmap Icon READ getIcon WRITE setIcon)
+  void setIcon(const QPixmap& path);
+  QPixmap getIcon();
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void on_m_LineEdit_fileDropped(const QString& text);
+  void on_m_LineEdit_editingFinished();
+  void on_m_LineEdit_textChanged(const QString& text);
+  void on_m_LineEdit_returnPressed();
+
+protected:
+  void setValue(const QString& val);
+
+  QString getValue();
+
+  /**
+   * @brief
+   * @param event
+   */
+  void keyPressEvent(QKeyEvent* event) override;
+
+  /**
+   * @brief setupMenuField
+   */
+  void setupMenuField();
+
+private:
+  QAction* m_ShowFileAction = nullptr;
+  QString m_CurrentText = "";
+  QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
+
+public:
+  AbstractIOFileWidget(const AbstractIOFileWidget&) = delete;            // Copy Constructor Not Implemented
+  AbstractIOFileWidget(AbstractIOFileWidget&&) = delete;                 // Move Constructor Not Implemented
+  AbstractIOFileWidget& operator=(const AbstractIOFileWidget&) = delete; // Copy Assignment Not Implemented
+  AbstractIOFileWidget& operator=(AbstractIOFileWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index 26de071419..f3fb1b2118 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AttributeMatrixCreationWidget.h"
 
-
-
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
@@ -121,15 +118,15 @@ void AttributeMatrixCreationWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &AttributeMatrixCreationWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedDataContainerPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedDataContainerPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedDataContainerPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedDataContainerPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
   connect(m_SelectedDataContainerPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedDataContainerPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedDataContainerPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -149,7 +146,6 @@ void AttributeMatrixCreationWidget::setupGui()
   m_SelectedDataContainerPath->blockSignals(false);
 
   changeStyleSheet(Style::FS_STANDARD_STYLE);
-
 }
 
 // -----------------------------------------------------------------------------
@@ -232,7 +228,10 @@ void AttributeMatrixCreationWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void AttributeMatrixCreationWidget::setSelectedPath(DataArrayPath dcPath)
 {
-  if (dcPath.isEmpty()) { return; }
+  if(dcPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedDataContainerPath->setDataArrayPath(dcPath);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index 050a1766d2..f6f5f949f2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,21 +53,21 @@
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT AttributeMatrixCreationWidget : public FilterParameterWidget, private Ui::AttributeMatrixCreationWidget
 {
   Q_OBJECT
 
 public:
   /**
-  * @brief Constructor
-  * @param parameter The FilterParameter object that this widget represents
-  * @param filter The instance of the filter that this parameter is a part of
-  * @param parent The parent QWidget for this Widget
-  */
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
   AttributeMatrixCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
   AttributeMatrixCreationWidget(QWidget* parent = nullptr);
@@ -77,23 +77,23 @@ class SVWidgetsLib_EXPORT AttributeMatrixCreationWidget : public FilterParameter
   typedef QSharedPointer<QMenu> QMenuPtr;
 
   /**
-  * @brief This method does additional GUI widget connections
-  */
+   * @brief This method does additional GUI widget connections
+   */
   void setupGui() override;
 
   /**
-  * @brief checkStringValues
-  * @param current
-  * @param filt
-  * @return
-  */
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
   QString checkStringValues(QString current, QString filtDcName);
 
   /**
-  * @brief initializeWidget
-  * @param parameter
-  * @param filter
-  */
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
   void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
   /**
@@ -126,20 +126,17 @@ protected slots:
 private slots:
 
 private:
-  bool                                            m_DidCausePreflight;
+  bool m_DidCausePreflight;
 
-  AttributeMatrixCreationFilterParameter*         m_FilterParameter;
+  AttributeMatrixCreationFilterParameter* m_FilterParameter;
 
   void setSelectedPath(QString path);
 
   void setSelectedPath(DataArrayPath dcPath);
 
 public:
-  AttributeMatrixCreationWidget(const AttributeMatrixCreationWidget&) = delete; // Copy Constructor Not Implemented
-  AttributeMatrixCreationWidget(AttributeMatrixCreationWidget&&) = delete;      // Move Constructor Not Implemented
+  AttributeMatrixCreationWidget(const AttributeMatrixCreationWidget&) = delete;            // Copy Constructor Not Implemented
+  AttributeMatrixCreationWidget(AttributeMatrixCreationWidget&&) = delete;                 // Move Constructor Not Implemented
   AttributeMatrixCreationWidget& operator=(const AttributeMatrixCreationWidget&) = delete; // Copy Assignment Not Implemented
   AttributeMatrixCreationWidget& operator=(AttributeMatrixCreationWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index d1ce4228e0..12aaf29632 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AttributeMatrixSelectionWidget.h"
 
-
-
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
@@ -45,7 +42,6 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -102,8 +98,7 @@ void AttributeMatrixSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::preflightExecuted, this, &AttributeMatrixSelectionWidget::afterPreflight);
 
   // Catch when the filter wants its values updated
-  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)),
-          this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
+  connect(getFilter(), SIGNAL(updateFilterParameters(AbstractFilter*)), this, SLOT(filterNeedsInputParameters(AbstractFilter*)));
 
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), &AbstractFilter::dataArrayPathUpdated, this, &AttributeMatrixSelectionWidget::updateDataArrayPath);
@@ -113,8 +108,8 @@ void AttributeMatrixSelectionWidget::setupGui()
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)),
-    this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -208,7 +203,10 @@ void AttributeMatrixSelectionWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void AttributeMatrixSelectionWidget::setSelectedPath(DataArrayPath amPath)
 {
-  if (amPath.isEmpty()) { return; }
+  if(amPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedAttributeMatrixPath->setDataArrayPath(amPath);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index d3a72ee47f..9d5a675b22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -53,72 +52,68 @@
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT AttributeMatrixSelectionWidget : public FilterParameterWidget, private Ui::AttributeMatrixSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    AttributeMatrixSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  Q_OBJECT
 
-    /**
-     * @brief AttributeMatrixSelectionWidget
-     * @param parent
-     */
-    AttributeMatrixSelectionWidget(QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  AttributeMatrixSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    ~AttributeMatrixSelectionWidget() override;
+  /**
+   * @brief AttributeMatrixSelectionWidget
+   * @param parent
+   */
+  AttributeMatrixSelectionWidget(QWidget* parent = nullptr);
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  ~AttributeMatrixSelectionWidget() override;
 
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(QString current, QString filtDcName);
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-    bool eventFilter(QObject* obj, QEvent* event) override;
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+  bool eventFilter(QObject* obj, QEvent* event) override;
 
-    void attributeMatrixSelected(QString path);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
-  protected slots:
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+  void attributeMatrixSelected(QString path);
 
-  private:
+protected slots:
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-    bool m_DidCausePreflight;
+private:
+  bool m_DidCausePreflight;
 
-    AttributeMatrixSelectionFilterParameter*  m_FilterParameter;
+  AttributeMatrixSelectionFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
+  void setSelectedPath(QString path);
 
-    void setSelectedPath(DataArrayPath amPath);
+  void setSelectedPath(DataArrayPath amPath);
 
-  public:
-    AttributeMatrixSelectionWidget(const AttributeMatrixSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    AttributeMatrixSelectionWidget(AttributeMatrixSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    AttributeMatrixSelectionWidget& operator=(const AttributeMatrixSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    AttributeMatrixSelectionWidget& operator=(AttributeMatrixSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  AttributeMatrixSelectionWidget(const AttributeMatrixSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  AttributeMatrixSelectionWidget(AttributeMatrixSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  AttributeMatrixSelectionWidget& operator=(const AttributeMatrixSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  AttributeMatrixSelectionWidget& operator=(AttributeMatrixSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index cc56854106..43d519f59c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AxisAngleWidget.h"
 
-
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index 0373f5f633..aff51e539f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -46,47 +45,43 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/ui_AxisAngleWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT AxisAngleWidget : public FilterParameterWidget, private Ui::AxisAngleWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    AxisAngleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~AxisAngleWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    AxisAngleFilterParameter*  m_FilterParameter;
-
-  public:
-    AxisAngleWidget(const AxisAngleWidget&) = delete; // Copy Constructor Not Implemented
-    AxisAngleWidget(AxisAngleWidget&&) = delete;      // Move Constructor Not Implemented
-    AxisAngleWidget& operator=(const AxisAngleWidget&) = delete; // Copy Assignment Not Implemented
-    AxisAngleWidget& operator=(AxisAngleWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  AxisAngleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~AxisAngleWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  AxisAngleFilterParameter* m_FilterParameter;
+
+public:
+  AxisAngleWidget(const AxisAngleWidget&) = delete;            // Copy Constructor Not Implemented
+  AxisAngleWidget(AxisAngleWidget&&) = delete;                 // Move Constructor Not Implemented
+  AxisAngleWidget& operator=(const AxisAngleWidget&) = delete; // Copy Assignment Not Implemented
+  AxisAngleWidget& operator=(AxisAngleWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index 5dc66480c5..a074dc6d6a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BooleanWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
index c8ea5581ce..3462a90792 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
@@ -1,44 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
@@ -47,51 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_BooleanWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT BooleanWidget : public FilterParameterWidget, private Ui::BooleanWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    BooleanWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~BooleanWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-
-  public slots:
-    void widgetChanged(int state);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    BooleanFilterParameter* m_FilterParameter;
-
-  public:
-    BooleanWidget(const BooleanWidget&) = delete;  // Copy Constructor Not Implemented
-    BooleanWidget(BooleanWidget&&) = delete;       // Move Constructor Not Implemented
-    BooleanWidget& operator=(const BooleanWidget&) = delete; // Copy Assignment Not Implemented
-    BooleanWidget& operator=(BooleanWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  BooleanWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~BooleanWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(int state);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  BooleanFilterParameter* m_FilterParameter;
+
+public:
+  BooleanWidget(const BooleanWidget&) = delete;            // Copy Constructor Not Implemented
+  BooleanWidget(BooleanWidget&&) = delete;                 // Move Constructor Not Implemented
+  BooleanWidget& operator=(const BooleanWidget&) = delete; // Copy Assignment Not Implemented
+  BooleanWidget& operator=(BooleanWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 9eb04198db..27a88e80e2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CalculatorWidget.h"
 
-
 #include <QtWidgets/QMenu>
 #include <QtCore/QDebug>
 
@@ -95,8 +94,7 @@ void CalculatorWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &CalculatorWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(equation, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index cae064947d..d815c3c29b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,82 +46,78 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/ui_CalculatorWidget.h"
 
-
 /**
-* @brief This widget is for Filter Parameters that are of a string type.
-* @author
-* @version
-*/
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT CalculatorWidget : public FilterParameterWidget, private Ui::CalculatorWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    CalculatorWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~CalculatorWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void on_equation_returnPressed();
-    void on_applyChangesBtn_clicked();
-    void widgetChanged(const QString& msg);
-
-    void hideButton();
-
-  protected slots:
-    void printUnaryButtonName();
-    void printButtonName();
-    void printActionName();
-    void updateSelection();
-
-    void on_clearBtn_clicked();
-    void on_backspaceBtn_clicked();
-    void on_radiansBtn_toggled(bool checked);
-    void on_powBtn_clicked();
-    void on_logBtn_clicked();
-    void on_expBtn_clicked();
-    void on_rootBtn_clicked();
-    void on_scalarsBtn_clicked();
-    void on_vectorsBtn_clicked();
-    void on_piBtn_clicked();
-
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
-
-  private:
-    bool                              m_DidCausePreflight;
-
-    ArrayCalculator*                  m_Filter;
-    CalculatorFilterParameter*        m_FilterParameter;
-
-    QMenu*                            m_ScalarsMenu;
-    QMenu*                            m_VectorsMenu;
-
-    QString                           m_SelectedText;
-    int                               m_SelectionStart;
-
-    void printStringToEquation(QString str);
-
-  public:
-    CalculatorWidget(const CalculatorWidget&) = delete; // Copy Constructor Not Implemented
-    CalculatorWidget(CalculatorWidget&&) = delete;      // Move Constructor Not Implemented
-    CalculatorWidget& operator=(const CalculatorWidget&) = delete; // Copy Assignment Not Implemented
-    CalculatorWidget& operator=(CalculatorWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  CalculatorWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~CalculatorWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void on_equation_returnPressed();
+  void on_applyChangesBtn_clicked();
+  void widgetChanged(const QString& msg);
+
+  void hideButton();
+
+protected slots:
+  void printUnaryButtonName();
+  void printButtonName();
+  void printActionName();
+  void updateSelection();
+
+  void on_clearBtn_clicked();
+  void on_backspaceBtn_clicked();
+  void on_radiansBtn_toggled(bool checked);
+  void on_powBtn_clicked();
+  void on_logBtn_clicked();
+  void on_expBtn_clicked();
+  void on_rootBtn_clicked();
+  void on_scalarsBtn_clicked();
+  void on_vectorsBtn_clicked();
+  void on_piBtn_clicked();
+
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  bool m_DidCausePreflight;
+
+  ArrayCalculator* m_Filter;
+  CalculatorFilterParameter* m_FilterParameter;
+
+  QMenu* m_ScalarsMenu;
+  QMenu* m_VectorsMenu;
+
+  QString m_SelectedText;
+  int m_SelectionStart;
+
+  void printStringToEquation(QString str);
+
+public:
+  CalculatorWidget(const CalculatorWidget&) = delete;            // Copy Constructor Not Implemented
+  CalculatorWidget(CalculatorWidget&&) = delete;                 // Move Constructor Not Implemented
+  CalculatorWidget& operator=(const CalculatorWidget&) = delete; // Copy Assignment Not Implemented
+  CalculatorWidget& operator=(CalculatorWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index c65e209f1b..a81a355749 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ChoiceWidget.h"
 
-
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
index 0eb1af2ced..8313e20f9b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -51,53 +50,47 @@ class AbstractFilter;
 class FilterParameter;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ChoiceWidget : public FilterParameterWidget, private Ui::ChoiceWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ChoiceWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~ChoiceWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    int getCurrentIndex();
-
-
-  public slots:
-    void widgetChanged(int index, bool emitParametersChanged = true);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-
-
-  signals:
-    void conditionalPropertyChanged(int);
-
-  private:
-    ChoiceFilterParameter* m_FilterParameter;
-
-  public:
-    ChoiceWidget(const ChoiceWidget&) = delete;   // Copy Constructor Not Implemented
-    ChoiceWidget(ChoiceWidget&&) = delete;        // Move Constructor Not Implemented
-    ChoiceWidget& operator=(const ChoiceWidget&) = delete; // Copy Assignment Not Implemented
-    ChoiceWidget& operator=(ChoiceWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ChoiceWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~ChoiceWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  int getCurrentIndex();
+
+public slots:
+  void widgetChanged(int index, bool emitParametersChanged = true);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+signals:
+  void conditionalPropertyChanged(int);
+
+private:
+  ChoiceFilterParameter* m_FilterParameter;
+
+public:
+  ChoiceWidget(const ChoiceWidget&) = delete;            // Copy Constructor Not Implemented
+  ChoiceWidget(ChoiceWidget&&) = delete;                 // Move Constructor Not Implemented
+  ChoiceWidget& operator=(const ChoiceWidget&) = delete; // Copy Assignment Not Implemented
+  ChoiceWidget& operator=(ChoiceWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
index 7a6fa8f43c..e3365e32c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
@@ -1,44 +1,43 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonContainerWidget.h"
 
 #include <QtCore/QMimeData>
 #include <QtGui/QDrag>
 
-
 #include "SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h"
 #include "SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -46,7 +45,6 @@
 // Border stylesheet requires QFrame
 ComparisonContainerWidget* ComparisonContainerWidget::SelectedItem = nullptr;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -70,8 +68,8 @@ QString ComparisonContainerWidget::BorderStyleSheet()
 {
   QString style;
   QTextStream out(&style);
-  out << "ComparisonContainerWidget#SelectedItem { border-style: inset; border-width: 2px; border-radius: 0px; border-color: "
-      << SVStyle::Instance()->getFilterSelectionColor().name(QColor::HexRgb) << "; }";
+  out << "ComparisonContainerWidget#SelectedItem { border-style: inset; border-width: 2px; border-radius: 0px; border-color: " << SVStyle::Instance()->getFilterSelectionColor().name(QColor::HexRgb)
+      << "; }";
   return style;
 }
 
@@ -90,10 +88,8 @@ void ComparisonContainerWidget::setupGui()
 
   setStyleSheet(ComparisonContainerWidget::BorderStyleSheet());
 
-  connect(removeBtn, SIGNAL(clicked()),
-    this, SLOT(deleteItem()));
-  connect(unionComboBox, SIGNAL(currentIndexChanged(int)),
-    this, SLOT(unionOperatorChanged(int))); 
+  connect(removeBtn, SIGNAL(clicked()), this, SLOT(deleteItem()));
+  connect(unionComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(unionOperatorChanged(int)));
 }
 
 // -----------------------------------------------------------------------------
@@ -109,7 +105,7 @@ int ComparisonContainerWidget::getUnionOperator()
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::setUnionOperator(int unionOperator)
 {
-  if (nullptr != m_comparisonWidget)
+  if(nullptr != m_comparisonWidget)
   {
     m_comparisonWidget->getComparison()->setUnionOperator(unionOperator);
   }
@@ -121,7 +117,7 @@ void ComparisonContainerWidget::setUnionOperator(int unionOperator)
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::unionOperatorChanged(int unionOp)
 {
-  if (nullptr != m_comparisonWidget)
+  if(nullptr != m_comparisonWidget)
   {
     m_comparisonWidget->getComparison()->setUnionOperator(unionOp);
     emit comparisonChanged();
@@ -133,7 +129,7 @@ void ComparisonContainerWidget::unionOperatorChanged(int unionOp)
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::showUnionOperator(bool enabled)
 {
-  if (enabled)
+  if(enabled)
   {
     unionComboBox->show();
   }
@@ -170,8 +166,7 @@ void ComparisonContainerWidget::setComparisonWidget(IComparisonWidget* widget)
   // replace current widget, save pointer
   if(m_comparisonWidget != nullptr)
   {
-    disconnect(m_comparisonWidget, SIGNAL(comparisonChanged()),
-      this, SIGNAL(comparisonChanged()));
+    disconnect(m_comparisonWidget, SIGNAL(comparisonChanged()), this, SIGNAL(comparisonChanged()));
 
     m_comparisonWidget->hide();
     m_comparisonWidget->setParent(nullptr);
@@ -185,8 +180,7 @@ void ComparisonContainerWidget::setComparisonWidget(IComparisonWidget* widget)
 
   m_comparisonWidget = widget;
 
-  connect(widget, SIGNAL(comparisonChanged()),
-    this, SIGNAL(comparisonChanged()));
+  connect(widget, SIGNAL(comparisonChanged()), this, SIGNAL(comparisonChanged()));
 }
 
 // -----------------------------------------------------------------------------
@@ -194,7 +188,7 @@ void ComparisonContainerWidget::setComparisonWidget(IComparisonWidget* widget)
 // -----------------------------------------------------------------------------
 AbstractComparison::Pointer ComparisonContainerWidget::getCurrentComparison()
 {
-  if (nullptr == m_comparisonWidget)
+  if(nullptr == m_comparisonWidget)
   {
     return nullptr;
   }
@@ -228,8 +222,7 @@ void ComparisonContainerWidget::setComparisonSetWidget(ComparisonSetWidget* comp
 {
   if(m_comparisonSetWidget != nullptr)
   {
-    disconnect(this, SIGNAL(comparisonChanged()),
-      m_comparisonSetWidget, SIGNAL(comparisonChanged()));
+    disconnect(this, SIGNAL(comparisonChanged()), m_comparisonSetWidget, SIGNAL(comparisonChanged()));
   }
 
   m_comparisonSetWidget = comparisonSetWidget;
@@ -241,8 +234,7 @@ void ComparisonContainerWidget::setComparisonSetWidget(ComparisonSetWidget* comp
   }
   if(comparisonSetWidget != nullptr)
   {
-    connect(this, SIGNAL(comparisonChanged()),
-      comparisonSetWidget, SIGNAL(comparisonChanged()));
+    connect(this, SIGNAL(comparisonChanged()), comparisonSetWidget, SIGNAL(comparisonChanged()));
   }
 }
 
@@ -275,7 +267,7 @@ void ComparisonContainerWidget::deleteItem()
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::mousePressEvent(QMouseEvent* event)
 {
-  if (!(event->buttons() & Qt::LeftButton))
+  if(!(event->buttons() & Qt::LeftButton))
   {
     return;
   }
@@ -290,7 +282,7 @@ void ComparisonContainerWidget::mousePressEvent(QMouseEvent* event)
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::select()
 {
-  if (nullptr != ComparisonContainerWidget::SelectedItem && this != ComparisonContainerWidget::SelectedItem)
+  if(nullptr != ComparisonContainerWidget::SelectedItem && this != ComparisonContainerWidget::SelectedItem)
   {
     ComparisonContainerWidget::SelectedItem->deselect();
   }
@@ -305,7 +297,7 @@ void ComparisonContainerWidget::select()
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::deselect()
 {
-  if (ComparisonContainerWidget::SelectedItem == this)
+  if(ComparisonContainerWidget::SelectedItem == this)
   {
     ComparisonContainerWidget::SelectedItem = nullptr;
   }
@@ -319,19 +311,18 @@ void ComparisonContainerWidget::deselect()
 // -----------------------------------------------------------------------------
 void ComparisonContainerWidget::mouseMoveEvent(QMouseEvent* event)
 {
-  if (!(event->buttons() & Qt::LeftButton))
+  if(!(event->buttons() & Qt::LeftButton))
   {
     return;
   }
 
-  if ((event->pos() - m_startDragPoint).manhattanLength()
-    < QApplication::startDragDistance())
+  if((event->pos() - m_startDragPoint).manhattanLength() < QApplication::startDragDistance())
   {
     return;
   }
 
-  QDrag *drag = new QDrag(this);
-  QMimeData *mimeData = new QMimeData;
+  QDrag* drag = new QDrag(this);
+  QMimeData* mimeData = new QMimeData;
 
   drag->setMimeData(mimeData);
   drag->exec(Qt::MoveAction);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
index 7aa2b9dafb..a631f94a25 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,124 +48,124 @@
 class ComparisonSetWidget;
 
 /**
-* @brief ComparisonContainerWidget is used to display widgets for AbstractComparisons, edit the comparison's, union operator,
-* and allow the widgets to be dragged and reordered between ComparisonSetWidgets
-*/
+ * @brief ComparisonContainerWidget is used to display widgets for AbstractComparisons, edit the comparison's, union operator,
+ * and allow the widgets to be dragged and reordered between ComparisonSetWidgets
+ */
 class SVWidgetsLib_EXPORT ComparisonContainerWidget : public QFrame, private Ui::ComparisonContainerWidget
 {
   Q_OBJECT
 
 public:
-  ComparisonContainerWidget(QWidget* parent, AbstractComparison::Pointer &comparison);
+  ComparisonContainerWidget(QWidget* parent, AbstractComparison::Pointer& comparison);
   ~ComparisonContainerWidget() override;
 
   /**
-  * @brief Returns the union operator for this comparison
-  * @return
-  */
+   * @brief Returns the union operator for this comparison
+   * @return
+   */
   int getUnionOperator();
   /**
-  * @brief Sets the union operator for this comparison
-  * @param unionOperator Union operator to be used by this comparison
-  */
+   * @brief Sets the union operator for this comparison
+   * @param unionOperator Union operator to be used by this comparison
+   */
   void setUnionOperator(int unionOperator);
 
   /**
-  * @brief Set whether or not the union operator should be shows for this widget
-  * @param enabled Specifies whether or not the union operator is shown
-  */
+   * @brief Set whether or not the union operator should be shows for this widget
+   * @param enabled Specifies whether or not the union operator is shown
+   */
   void showUnionOperator(bool enabled = true);
   /**
-  * @brief Hides the union operator for this widget
-  */
+   * @brief Hides the union operator for this widget
+   */
   void hideUnionOperator();
 
   /**
-  * @brief Sets the comparison this widget represents
-  * @param comparison AbstractComparison to be represented by this widget
-  */
-  void setComparison(AbstractComparison::Pointer &comparison);
+   * @brief Sets the comparison this widget represents
+   * @param comparison AbstractComparison to be represented by this widget
+   */
+  void setComparison(AbstractComparison::Pointer& comparison);
   /**
-  * @brief Sets the comparison widget to be shown in this widget
-  * @param widget the IComparisonWidget that stores the AbstractComparison shown
-  */
+   * @brief Sets the comparison widget to be shown in this widget
+   * @param widget the IComparisonWidget that stores the AbstractComparison shown
+   */
   void setComparisonWidget(IComparisonWidget* widget);
 
   /**
-  * @brief Returns the value of the stored AbstractComparison
-  * @return
-  */
+   * @brief Returns the value of the stored AbstractComparison
+   * @return
+   */
   AbstractComparison::Pointer getCurrentComparison();
   /**
-  * @brief Returns the IComparisonWidget displayed
-  * @return
-  */
+   * @brief Returns the IComparisonWidget displayed
+   * @return
+   */
   IComparisonWidget* getComparisonWidget();
-  
+
   /**
-  * @brief Returns the ComparisonSetWidget this widget belongs to
-  * @return
-  */
+   * @brief Returns the ComparisonSetWidget this widget belongs to
+   * @return
+   */
   ComparisonSetWidget* getComparisonSetWidget();
   /**
-  * @brief Sets a new ComparisonSetWidget to belong to and changes any signal and slot connections to reflect the change
-  * @param comparisonSetWidget The new ComparisonSetWidget to belong to
-  */
+   * @brief Sets a new ComparisonSetWidget to belong to and changes any signal and slot connections to reflect the change
+   * @param comparisonSetWidget The new ComparisonSetWidget to belong to
+   */
   void setComparisonSetWidget(ComparisonSetWidget* comparisonSetWidget);
 
   /**
-  * @brief Selects the current widget and draws a border around it to show which ComparisonContainerWidget is being moved
-  */
+   * @brief Selects the current widget and draws a border around it to show which ComparisonContainerWidget is being moved
+   */
   void select();
   /**
-  * @brief Removes any styling given by select() and clears the selection
-  */
+   * @brief Removes any styling given by select() and clears the selection
+   */
   void deselect();
 
   /**
-  * @brief This method does additional GUI widget connections
-  */
+   * @brief This method does additional GUI widget connections
+   */
   void setupGui();
 
 public slots:
   /**
-  * @brief Delete this and remove the comparison from the current ComparisonSet
-  */
+   * @brief Delete this and remove the comparison from the current ComparisonSet
+   */
   void deleteItem();
 
 signals:
   /**
-  * @brief Signifies that the comparison stored has changed
-  */
+   * @brief Signifies that the comparison stored has changed
+   */
   void comparisonChanged();
 
 protected:
   static ComparisonContainerWidget* SelectedItem; // Currently Selected Widget
-  static QString BorderStyleSheet(); // Style Sheet Used When Selected
+  static QString BorderStyleSheet();              // Style Sheet Used When Selected
 
   /**
-  * @brief MousePressEvent
-  * @param event Move press event
-  */
+   * @brief MousePressEvent
+   * @param event Move press event
+   */
   void mousePressEvent(QMouseEvent* event) override;
 
   /**
-  * @brief MouseMoveEvent
-  * @param event Mouse move event
-  */
+   * @brief MouseMoveEvent
+   * @param event Mouse move event
+   */
   void mouseMoveEvent(QMouseEvent* event) override;
 
   /**
-  * @brief MouseReleaseEvent
-  * @param event Mouse release event
-  */
+   * @brief MouseReleaseEvent
+   * @param event Mouse release event
+   */
   void mouseReleaseEvent(QMouseEvent* event) override;
 
 protected slots:
   /**
-  * @brief Union operator has been changed in the UI and needs to update the comparison
-  * @param unionOp New union operator
-  */
+   * @brief Union operator has been changed in the UI and needs to update the comparison
+   * @param unionOp New union operator
+   */
   void unionOperatorChanged(int unionOp);
 
 private:
@@ -174,4 +174,3 @@ protected slots:
   QString m_BaseName;
   QPoint m_startDragPoint;
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 6b28dbad8b..b48613cf97 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionAdvancedWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -49,8 +48,8 @@
 //
 // -----------------------------------------------------------------------------
 ComparisonSelectionAdvancedWidget::ComparisonSelectionAdvancedWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
-  : FilterParameterWidget(parameter, filter, parent)
-  , m_DidCausePreflight(false)
+: FilterParameterWidget(parameter, filter, parent)
+, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<ComparisonSelectionAdvancedFilterParameter*>(parameter);
   Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ComparisonSelectionAdvancedWidget can ONLY be used with a ComparisonSelectionAdvancedFilterParameter object");
@@ -72,7 +71,7 @@ ComparisonSelectionAdvancedWidget::~ComparisonSelectionAdvancedWidget() = defaul
 ComparisonInputsAdvanced ComparisonSelectionAdvancedWidget::getComparisonInputs()
 {
   ComparisonInputsAdvanced comps;
-  if (comparisonSetWidget == nullptr)
+  if(comparisonSetWidget == nullptr)
   {
     return comps;
   }
@@ -88,7 +87,7 @@ ComparisonInputsAdvanced ComparisonSelectionAdvancedWidget::getComparisonInputs(
 
   QVector<AbstractComparison::Pointer> comparisons = comparisonSetWidget->getComparisons();
 
-  for (int i = 0; i < comparisons.size(); ++i)
+  for(int i = 0; i < comparisons.size(); ++i)
   {
     comps.addInput(comparisons[i]);
   }
@@ -100,11 +99,11 @@ ComparisonInputsAdvanced ComparisonSelectionAdvancedWidget::getComparisonInputs(
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedWidget::setupGui()
 {
-  if (getFilter() == nullptr)
+  if(getFilter() == nullptr)
   {
     return;
   }
-  if (getFilterParameter() == nullptr)
+  if(getFilterParameter() == nullptr)
   {
     return;
   }
@@ -123,17 +122,17 @@ void ComparisonSelectionAdvancedWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ComparisonSelectionAdvancedWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
-  //connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
+  // connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SLOT(attributeMatrixUpdated()));
 
@@ -159,7 +158,7 @@ void ComparisonSelectionAdvancedWidget::setupGui()
   DataArrayPath currentPath;
   currentPath.setDataContainerName(comps.getDataContainerName());
   currentPath.setAttributeMatrixName(comps.getAttributeMatrixName());
-  if (!currentPath.isEmpty())
+  if(!currentPath.isEmpty())
   {
     QStringList names = generateAttributeArrayList(currentPath.getDataContainerName(), currentPath.getAttributeMatrixName());
     presetAttributeMatrix(currentPath);
@@ -220,12 +219,12 @@ QStringList ComparisonSelectionAdvancedWidget::generateAttributeArrayList(const
 {
   DataArrayPath path(currentDCName, currentAttrMatName, "");
   AttributeMatrix::Pointer am = getFilter()->getDataContainerArray()->getAttributeMatrix(path);
-  
+
   if(nullptr == am)
   {
     return QStringList();
   }
-  
+
   return am->getAttributeArrayNames();
 }
 
@@ -234,7 +233,7 @@ QStringList ComparisonSelectionAdvancedWidget::generateAttributeArrayList(const
 // -----------------------------------------------------------------------------
 QString ComparisonSelectionAdvancedWidget::checkStringValues(QString curDcName, QString filtDcName)
 {
-  if (curDcName.isEmpty() && !filtDcName.isEmpty())
+  if(curDcName.isEmpty() && !filtDcName.isEmpty())
   {
     return filtDcName;
   }
@@ -256,7 +255,7 @@ QString ComparisonSelectionAdvancedWidget::checkStringValues(QString curDcName,
 void ComparisonSelectionAdvancedWidget::widgetChanged(const QString& text)
 {
   Q_UNUSED(text)
-    m_DidCausePreflight = true;
+  m_DidCausePreflight = true;
   emit parametersChanged();
   m_DidCausePreflight = false;
 }
@@ -268,7 +267,7 @@ void ComparisonSelectionAdvancedWidget::setComparisons(QVector<AbstractCompariso
 {
   qint32 count = comparisons.size();
 
-  for (int i = 0; i < count; ++i)
+  for(int i = 0; i < count; ++i)
   {
     comparisonSetWidget->addComparison(comparisons[i]);
   }
@@ -296,17 +295,17 @@ void ComparisonSelectionAdvancedWidget::filterNeedsInputParameters(AbstractFilte
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedWidget::beforePreflight()
 {
-  if (nullptr == getFilter())
+  if(nullptr == getFilter())
   {
     return;
   }
-  if (m_DidCausePreflight)
+  if(m_DidCausePreflight)
   {
     // std::cout << "***  ComparisonSelectionAdvancedWidget already caused a preflight, just returning" << std::endl;
     return;
   }
 
-  if (m_SelectedAttributeMatrixPath->text().isEmpty())
+  if(m_SelectedAttributeMatrixPath->text().isEmpty())
   {
     populateButtonText();
   }
@@ -320,19 +319,22 @@ void ComparisonSelectionAdvancedWidget::beforePreflight()
 void ComparisonSelectionAdvancedWidget::afterPreflight()
 {
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if (nullptr == dca) { return; }
+  if(nullptr == dca)
+  {
+    return;
+  }
 
-  if (dca->doesAttributeMatrixExist(m_SelectedAttributeMatrixPath->getDataArrayPath()))
+  if(dca->doesAttributeMatrixExist(m_SelectedAttributeMatrixPath->getDataArrayPath()))
   {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(m_SelectedAttributeMatrixPath->getDataArrayPath());
-    if (nullptr != am.get()) 
+    if(nullptr != am.get())
     {
       DataArrayPath path = m_SelectedAttributeMatrixPath->getDataArrayPath();
       QStringList arrayNames = generateAttributeArrayList(path.getDataContainerName(), path.getAttributeMatrixName());
-      
+
       comparisonSetWidget->setArrayNames(arrayNames);
 
-      if (nullptr == comparisonSetWidget->getAttributeMatrix())
+      if(nullptr == comparisonSetWidget->getAttributeMatrix())
       {
         ComparisonInputsAdvanced comps = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<ComparisonInputsAdvanced>();
         comparisonSetWidget->setAttributeMatrix(am);
@@ -354,13 +356,13 @@ void ComparisonSelectionAdvancedWidget::populateButtonText()
   // Now get the DataContainerArray from the Filter instance
   // We are going to use this to get all the current DataContainers
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if (nullptr == dca)
+  if(nullptr == dca)
   {
     return;
   }
 
   // Check to see if we have any DataContainers to actually populate drop downs with.
-  if (dca->getDataContainers().empty())
+  if(dca->getDataContainers().empty())
   {
     return;
   }
@@ -389,7 +391,7 @@ void ComparisonSelectionAdvancedWidget::populateButtonText()
 // -----------------------------------------------------------------------------
 bool ComparisonSelectionAdvancedWidget::eventFilter(QObject* obj, QEvent* event)
 {
-  if (event->type() == QEvent::Show && obj == m_SelectedAttributeMatrixPath->menu())
+  if(event->type() == QEvent::Show && obj == m_SelectedAttributeMatrixPath->menu())
   {
     QPoint pos = adjustedMenuPosition(m_SelectedAttributeMatrixPath);
     m_SelectedAttributeMatrixPath->menu()->move(pos);
@@ -433,19 +435,22 @@ void ComparisonSelectionAdvancedWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedWidget::setSelectedPath(DataArrayPath amPath)
 {
-  if (amPath.isEmpty()) { return; }
+  if(amPath.isEmpty())
+  {
+    return;
+  }
 
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
-  if (nullptr == dca)
+  if(nullptr == dca)
   {
     return;
   }
 
-  if (dca->doesAttributeMatrixExist(amPath))
+  if(dca->doesAttributeMatrixExist(amPath))
   {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(amPath);
 
-    if (nullptr != comparisonSetWidget->getComparisonSet())
+    if(nullptr != comparisonSetWidget->getComparisonSet())
     {
       comparisonSetWidget->setAttributeMatrix(am);
       comparisonSetWidget->setComparisonSet(ComparisonSet::New());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index d1a30f5490..5c4ecdf716 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -54,130 +54,129 @@
 #include "ui_ComparisonSelectionAdvancedWidget.h"
 
 /**
-* @brief The ComparisonSelectionAdvancedWidget class is used to display, edit, and add AbstractComparisons
-* for the ComparisonSelectionAdvancedFilterParameter class.
-*/
+ * @brief The ComparisonSelectionAdvancedWidget class is used to display, edit, and add AbstractComparisons
+ * for the ComparisonSelectionAdvancedFilterParameter class.
+ */
 class ComparisonSelectionAdvancedWidget : public FilterParameterWidget, private Ui::ComparisonSelectionAdvancedWidget
 {
   Q_OBJECT
 
-  public:
-    ComparisonSelectionAdvancedWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-    ~ComparisonSelectionAdvancedWidget() override;
-
-    /**
-    * @brief setupGui Initializes some of the GUI elements with selections or other GUI related items
-    */
-    void setupGui() override;
-
-    /**
-    * @brief eventFilter
-    * @param obj
-    * @param event
-    * @return
-    */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    /**
-    * @brief beforePreflight
-    */
-    void beforePreflight();
-
-    /**
-    * @brief afterPreflight
-    */
-    void afterPreflight();
-
-    /**
-    * @brief filterNeedsInputParameters
-    * @param filter
-    */
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    /**
-    * @brief attributeMatrixSelected
-    * @param path
-    */
-    void attributeMatrixSelected(QString path);
-
-  protected:
-    /**
-    * @brief setComparisons
-    * @param comparisons
-    */
-    virtual void setComparisons(QVector<AbstractComparison::Pointer> comparisons);
-
-    /**
-    * @brief getComparisonInputs
-    * @return
-    */
-    ComparisonInputsAdvanced getComparisonInputs();
-
-    /**
-    * @brief generateAttributeArrayList
-    * @param currentDCName
-    * @param currentAttrMatName
-    * @return
-    */
-    QStringList generateAttributeArrayList(const QString& currentDCName, const QString &currentAttrMatName);
-
-    /**
-    * @brief checkStringValues
-    * @param curDcName
-    * @param filtDcName
-    * @return
-    */
-    QString checkStringValues(QString curDcName, QString filtDcName);
-
-    /**
-    * @brief populateButtonText
-    */
-    void populateButtonText();
-
-    /**
-    * @brief Sets the AttributeMatrixButton text before any attribute matrixes are loaded.
-    */
-    void presetAttributeMatrix(DataArrayPath path);
-
-  protected slots:
-    /**
-    * @brief widgetChanged
-    * @param text
-    */
-    void widgetChanged(const QString& text);
-
-    /**
-    * @brief setSelectedPath
-    * @param path
-    */
-    void setSelectedPath(QString path);
-
-    /**
-    * @brief setSelectedPath
-    * @param amPath
-    */
-    void setSelectedPath(DataArrayPath amPath);
-
-    /**
-    * @brief Handles changes to an affected DataArrayPath
-    * @param propertyName
-    * @param renamePath
-    */
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
-
-    /**
-    * @brief Handles AttributeMatrix path changes through DataArrayPathSelectionWidget
-    */
-    void attributeMatrixUpdated();
-
-  private:
-    DataContainerArrayProxy m_DcaProxy;
-
-    DataArrayPath m_presetPath;
-
-    bool m_DidCausePreflight;
-
-    ComparisonSelectionAdvancedFilterParameter* m_FilterParameter;
+public:
+  ComparisonSelectionAdvancedWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  ~ComparisonSelectionAdvancedWidget() override;
+
+  /**
+   * @brief setupGui Initializes some of the GUI elements with selections or other GUI related items
+   */
+  void setupGui() override;
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  /**
+   * @brief beforePreflight
+   */
+  void beforePreflight();
+
+  /**
+   * @brief afterPreflight
+   */
+  void afterPreflight();
+
+  /**
+   * @brief filterNeedsInputParameters
+   * @param filter
+   */
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  /**
+   * @brief attributeMatrixSelected
+   * @param path
+   */
+  void attributeMatrixSelected(QString path);
+
+protected:
+  /**
+   * @brief setComparisons
+   * @param comparisons
+   */
+  virtual void setComparisons(QVector<AbstractComparison::Pointer> comparisons);
+
+  /**
+   * @brief getComparisonInputs
+   * @return
+   */
+  ComparisonInputsAdvanced getComparisonInputs();
+
+  /**
+   * @brief generateAttributeArrayList
+   * @param currentDCName
+   * @param currentAttrMatName
+   * @return
+   */
+  QStringList generateAttributeArrayList(const QString& currentDCName, const QString& currentAttrMatName);
+
+  /**
+   * @brief checkStringValues
+   * @param curDcName
+   * @param filtDcName
+   * @return
+   */
+  QString checkStringValues(QString curDcName, QString filtDcName);
+
+  /**
+   * @brief populateButtonText
+   */
+  void populateButtonText();
+
+  /**
+   * @brief Sets the AttributeMatrixButton text before any attribute matrixes are loaded.
+   */
+  void presetAttributeMatrix(DataArrayPath path);
+
+protected slots:
+  /**
+   * @brief widgetChanged
+   * @param text
+   */
+  void widgetChanged(const QString& text);
+
+  /**
+   * @brief setSelectedPath
+   * @param path
+   */
+  void setSelectedPath(QString path);
+
+  /**
+   * @brief setSelectedPath
+   * @param amPath
+   */
+  void setSelectedPath(DataArrayPath amPath);
+
+  /**
+   * @brief Handles changes to an affected DataArrayPath
+   * @param propertyName
+   * @param renamePath
+   */
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+
+  /**
+   * @brief Handles AttributeMatrix path changes through DataArrayPathSelectionWidget
+   */
+  void attributeMatrixUpdated();
+
+private:
+  DataContainerArrayProxy m_DcaProxy;
+
+  DataArrayPath m_presetPath;
+
+  bool m_DidCausePreflight;
+
+  ComparisonSelectionAdvancedFilterParameter* m_FilterParameter;
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
index 4f281fa7f7..1c48180dcd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionItemDelegate.h"
 
@@ -46,8 +46,6 @@
 
 #include "SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -121,8 +119,7 @@ QWidget* ComparisonSelectionItemDelegate::createEditor(QWidget* widgetParent, co
       connect(operatorCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(arrayNameChangedData(int)));
     }
     return operatorCombo;
-  case ComparisonSelectionTableModel::FeatureValue:
-  {
+  case ComparisonSelectionTableModel::FeatureValue: {
     featureValue = new QLineEdit(widgetParent);
     featureValue->setFrame(false);
     featureValueValidator = new QDoubleValidator(featureValue);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
index 4f34e397a5..3cd284b29d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
@@ -1,49 +1,46 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <iostream>
 
-
 #include <QtCore/QModelIndex>
 #include <QtCore/QStringList>
 #include <QtWidgets/QStyledItemDelegate>
 
-
 #include "SIMPLib/Common/Constants.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -55,42 +52,37 @@ class QAbstractItemModel;
 
 class SVWidgetsLib_EXPORT ComparisonSelectionItemDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
-  public:
-    explicit ComparisonSelectionItemDelegate(QStringList possibleFeatures, int numPhases, QObject* parent = nullptr);
+  Q_OBJECT
 
-    ~ComparisonSelectionItemDelegate() override;
+public:
+  explicit ComparisonSelectionItemDelegate(QStringList possibleFeatures, int numPhases, QObject* parent = nullptr);
 
+  ~ComparisonSelectionItemDelegate() override;
 
-    void setNumberOfPhases(int n);
+  void setNumberOfPhases(int n);
 
+  void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setFeatureList(QStringList features);
 
-    void setFeatureList(QStringList features);
+  QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setEditorData(QWidget* editor, const QModelIndex& index) const override;
 
-    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+  void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+public slots:
+  void arrayNameChangedData(int i);
+  void operatorChangedData(int i);
+  void valueChangedData(const QString& text);
 
-  public slots:
-    void arrayNameChangedData(int i);
-    void operatorChangedData(int i);
-    void valueChangedData(const QString& text);
+private:
+  QStringList m_FeatureList;
+  int m_NumberOfPhases;
 
-  private:
-    QStringList m_FeatureList;
-    int m_NumberOfPhases;
-
-  public:
-    ComparisonSelectionItemDelegate(const ComparisonSelectionItemDelegate&) = delete; // Copy Constructor Not Implemented
-    ComparisonSelectionItemDelegate(ComparisonSelectionItemDelegate&&) = delete;      // Move Constructor Not Implemented
-    ComparisonSelectionItemDelegate& operator=(const ComparisonSelectionItemDelegate&) = delete; // Copy Assignment Not Implemented
-    ComparisonSelectionItemDelegate& operator=(ComparisonSelectionItemDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  ComparisonSelectionItemDelegate(const ComparisonSelectionItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  ComparisonSelectionItemDelegate(ComparisonSelectionItemDelegate&&) = delete;                 // Move Constructor Not Implemented
+  ComparisonSelectionItemDelegate& operator=(const ComparisonSelectionItemDelegate&) = delete; // Copy Assignment Not Implemented
+  ComparisonSelectionItemDelegate& operator=(ComparisonSelectionItemDelegate&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
index 90cdc91bb8..d3dc4b3b4b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionTableModel.h"
 
@@ -41,8 +41,6 @@
 
 #include "ComparisonSelectionItemDelegate.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -113,8 +111,7 @@ QVariant ComparisonSelectionTableModel::data(const QModelIndex& index, qint32 ro
 
     switch(index.column())
     {
-    case FeatureName:
-    {
+    case FeatureName: {
       comboBox.currentText = QString("Confidence Index");
       const QString header = headerData(FeatureName, Qt::Horizontal, Qt::DisplayRole).toString();
       if(header.length() > comboBox.currentText.length())
@@ -123,8 +120,7 @@ QVariant ComparisonSelectionTableModel::data(const QModelIndex& index, qint32 ro
       }
       break;
     }
-    case FeatureValue:
-    {
+    case FeatureValue: {
       comboBox.currentText = QString("0.005");
       const QString header = headerData(FeatureName, Qt::Horizontal, Qt::DisplayRole).toString();
       if(header.length() > comboBox.currentText.length())
@@ -133,8 +129,7 @@ QVariant ComparisonSelectionTableModel::data(const QModelIndex& index, qint32 ro
       }
       break;
     }
-    case FeatureOperator:
-    {
+    case FeatureOperator: {
       comboBox.currentText = QString(" > ");
       const QString header = headerData(FeatureOperator, Qt::Horizontal, Qt::DisplayRole).toString();
       if(header.length() > comboBox.currentText.length())
@@ -360,7 +355,7 @@ void ComparisonSelectionTableModel::setTableData(QVector<QString> featureNames,
     {
       m_FeatureOperators[i] = (SIMPL::Comparison::Strings::Equal);
     }
-    if (featureOperators[i] == SIMPL::Comparison::Operator_NotEqual)
+    if(featureOperators[i] == SIMPL::Comparison::Operator_NotEqual)
     {
       m_FeatureOperators[i] = (SIMPL::Comparison::Strings::NotEqual);
     }
@@ -408,7 +403,7 @@ void ComparisonSelectionTableModel::setTableData(ComparisonInputs& comps)
     {
       m_FeatureOperators[i] = (SIMPL::Comparison::Strings::Equal);
     }
-    if (comps[i].compOperator == SIMPL::Comparison::Operator_NotEqual)
+    if(comps[i].compOperator == SIMPL::Comparison::Operator_NotEqual)
     {
       m_FeatureOperators[i] = (SIMPL::Comparison::Strings::NotEqual);
     }
@@ -442,7 +437,7 @@ void ComparisonSelectionTableModel::getTableData(QVector<QString>& featureNames,
     {
       featureOperators[i] = SIMPL::Comparison::Operator_Equal;
     }
-    else if (m_FeatureOperators[i].compare((SIMPL::Comparison::Strings::NotEqual)) == 0)
+    else if(m_FeatureOperators[i].compare((SIMPL::Comparison::Strings::NotEqual)) == 0)
     {
       featureOperators[i] = SIMPL::Comparison::Operator_NotEqual;
     }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
index 971f86b019..3a40a7043d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,7 +44,6 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 class QAbstractItemDelegate;
 
 /*
@@ -53,134 +51,131 @@ class QAbstractItemDelegate;
  */
 class SVWidgetsLib_EXPORT ComparisonSelectionTableModel : public QAbstractTableModel
 {
-    Q_OBJECT
-
-  public:
-    enum ColumnIndexes
-    {
-      FeatureName = 0,
-      FeatureOperator,
-      FeatureValue,
-      ColumnCount
-    };
-
-    ComparisonSelectionTableModel(bool showOperators, QObject* parent = nullptr);
-
-    ~ComparisonSelectionTableModel() override;
-
-    /**
-     *
-     * @param index
-     * @return
-     */
-    Qt::ItemFlags flags(const QModelIndex& index) const override ;
-
-    /**
-     *
-     * @param index
-     * @param role
-     * @return
-     */
-    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override ;
-
-    /**
-     *
-     * @param section
-     * @param orientation
-     * @param role
-     * @return
-     */
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override ;
-
-    /**
-     *
-     * @param parent
-     * @return
-     */
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override ;
-
-    /**
-     *
-     * @param parent
-     * @return
-     */
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override ;
-
-    /**
-     *
-     * @param index
-     * @param value
-     * @param role
-     * @return
-     */
-    bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override ;
-
-    /**
-     *
-     * @param col
-     * @param orientation
-     * @param data
-     * @param role
-     * @return
-     */
-    bool setHeaderData(int col, Qt::Orientation orientation, const QVariant& data, int role = Qt::EditRole) override ;
-
-    /**
-     *
-     * @param row
-     * @param count
-     * @param parent
-     * @return
-     */
-    bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override ;
-
-    /**
-     *
-     * @param row
-     * @param count
-     * @param parent
-     * @return
-     */
-    bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override ;
-
-    /**
-     *
-     * @return
-     */
-    virtual QAbstractItemDelegate* getItemDelegate() ;
-
-
-    void setPossibleFeatures(QStringList features);
-
-    void setPossibleFeatures(QList<QString>& features);
-
-    QStringList getPossibleFeatures();
-
-    virtual void setTableData(QVector<QString> featureNames, QVector<float> featureValues,  QVector<int> featureOperators);
-
-    virtual void setTableData(ComparisonInputs& comps);
-
-    void getTableData( QVector<QString>& featureNames, QVector<float>& featureValues,  QVector<int>& featureOperators);
-
-    void setNumberOfPhases(int n);
-
-    void updateFeatureName(QString oldName, QString newName);
-
-  private:
-    int m_ColumnCount;
-    int m_RowCount;
-    int m_NumberOfPhases;
-
-    QStringList   m_PossibleFeatures;
-    QVector<QString>   m_FeatureNames;
-    QVector<float>     m_FeatureValues;
-    QVector<QString> m_FeatureOperators;
-
-  public:
-    ComparisonSelectionTableModel(const ComparisonSelectionTableModel&) = delete; // Copy Constructor Not Implemented
-    ComparisonSelectionTableModel(ComparisonSelectionTableModel&&) = delete;      // Move Constructor Not Implemented
-    ComparisonSelectionTableModel& operator=(const ComparisonSelectionTableModel&) = delete; // Copy Assignment Not Implemented
-    ComparisonSelectionTableModel& operator=(ComparisonSelectionTableModel&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  enum ColumnIndexes
+  {
+    FeatureName = 0,
+    FeatureOperator,
+    FeatureValue,
+    ColumnCount
+  };
+
+  ComparisonSelectionTableModel(bool showOperators, QObject* parent = nullptr);
+
+  ~ComparisonSelectionTableModel() override;
+
+  /**
+   *
+   * @param index
+   * @return
+   */
+  Qt::ItemFlags flags(const QModelIndex& index) const override;
+
+  /**
+   *
+   * @param index
+   * @param role
+   * @return
+   */
+  QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
+
+  /**
+   *
+   * @param section
+   * @param orientation
+   * @param role
+   * @return
+   */
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
+
+  /**
+   *
+   * @param parent
+   * @return
+   */
+  int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+  /**
+   *
+   * @param parent
+   * @return
+   */
+  int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+
+  /**
+   *
+   * @param index
+   * @param value
+   * @param role
+   * @return
+   */
+  bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override;
+
+  /**
+   *
+   * @param col
+   * @param orientation
+   * @param data
+   * @param role
+   * @return
+   */
+  bool setHeaderData(int col, Qt::Orientation orientation, const QVariant& data, int role = Qt::EditRole) override;
+
+  /**
+   *
+   * @param row
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   *
+   * @param row
+   * @param count
+   * @param parent
+   * @return
+   */
+  bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
+
+  /**
+   *
+   * @return
+   */
+  virtual QAbstractItemDelegate* getItemDelegate();
+
+  void setPossibleFeatures(QStringList features);
+
+  void setPossibleFeatures(QList<QString>& features);
+
+  QStringList getPossibleFeatures();
+
+  virtual void setTableData(QVector<QString> featureNames, QVector<float> featureValues, QVector<int> featureOperators);
+
+  virtual void setTableData(ComparisonInputs& comps);
+
+  void getTableData(QVector<QString>& featureNames, QVector<float>& featureValues, QVector<int>& featureOperators);
+
+  void setNumberOfPhases(int n);
+
+  void updateFeatureName(QString oldName, QString newName);
+
+private:
+  int m_ColumnCount;
+  int m_RowCount;
+  int m_NumberOfPhases;
+
+  QStringList m_PossibleFeatures;
+  QVector<QString> m_FeatureNames;
+  QVector<float> m_FeatureValues;
+  QVector<QString> m_FeatureOperators;
+
+public:
+  ComparisonSelectionTableModel(const ComparisonSelectionTableModel&) = delete;            // Copy Constructor Not Implemented
+  ComparisonSelectionTableModel(ComparisonSelectionTableModel&&) = delete;                 // Move Constructor Not Implemented
+  ComparisonSelectionTableModel& operator=(const ComparisonSelectionTableModel&) = delete; // Copy Assignment Not Implemented
+  ComparisonSelectionTableModel& operator=(ComparisonSelectionTableModel&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 5417582891..48a525af1a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ComparisonSelectionWidget.h"
 
-
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -128,17 +126,17 @@ void ComparisonSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ComparisonSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
-  //connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
+  // connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SLOT(attributeMatrixUpdated()));
 
@@ -160,7 +158,6 @@ void ComparisonSelectionWidget::setupGui()
   matrixPropertyName = matrixPropertyName.replace("Arrays", "Matrix");
   matrixPropertyName = matrixPropertyName.replace("arrays", "matrix");
   m_SelectedAttributeMatrixPath->setPropertyName(matrixPropertyName);
-
 }
 
 #if 0
@@ -369,7 +366,7 @@ void ComparisonSelectionWidget::beforePreflight()
     return;
   }
 
-  if (m_SelectedAttributeMatrixPath->text().isEmpty())
+  if(m_SelectedAttributeMatrixPath->text().isEmpty())
   {
     populateButtonText();
   }
@@ -501,7 +498,10 @@ void ComparisonSelectionWidget::setSelectedPath(const QString& path)
 // -----------------------------------------------------------------------------
 void ComparisonSelectionWidget::setSelectedPath(const DataArrayPath& amPath)
 {
-  if (amPath.isEmpty()) { return; }
+  if(amPath.isEmpty())
+  {
+    return;
+  }
 
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
   if(nullptr == dca.get())
@@ -523,7 +523,7 @@ ComparisonSelectionTableModel* ComparisonSelectionWidget::createComparisonModel(
   ComparisonSelectionTableModel* newModel = new ComparisonSelectionTableModel(m_ShowOperators);
   QAbstractItemModel* oldModel = comparisonSelectionTableView->model();
 
-    delete oldModel;
+  delete oldModel;
 
   comparisonSelectionTableView->setModel(newModel);
   newModel->setNumberOfPhases(1);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 38bfe71d16..52fdd96d62 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -1,46 +1,44 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QObject>
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -50,8 +48,6 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
-
 #include "ComparisonSelectionTableModel.h"
 
 #include "ui_ComparisonSelectionWidget.h"
@@ -70,185 +66,177 @@ class QSignalMapper;
 class ComparisonSelectionWidget : public FilterParameterWidget, private Ui::ComparisonSelectionWidget
 {
 
-    Q_OBJECT
-  public:
-    ComparisonSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-    ~ComparisonSelectionWidget() override;
-
-    enum ArrayListType
-    {
-      CellListType,
-      FeatureListType,
-      EnsembleListType,
-      VertexListType,
-      EdgeListType,
-      FaceListType,
-    };
-
-    /**
-     * @brief Setter property for ArrayListType
-     */
-    void setArrayListType(const ComparisonSelectionWidget::ArrayListType& value);
-    /**
-     * @brief Getter property for ArrayListType
-     * @return Value of ArrayListType
-     */
-    ComparisonSelectionWidget::ArrayListType getArrayListType() const;
-
-    /**
-     * @brief Setter property for ShowOperators
-     */
-    void setShowOperators(bool value);
-    /**
-     * @brief Getter property for ShowOperators
-     * @return Value of ShowOperators
-     */
-    bool getShowOperators() const;
-
-    /**
-     * @brief setupGui Initializes some of the GUI elements with selections or other GUI related items
-     */
-    void setupGui() override;
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    /**
-     * @brief beforePreflight
-     */
-    void beforePreflight();
-
-    /**
-     * @brief afterPreflight
-     */
-    void afterPreflight();
-
-    /**
-     * @brief filterNeedsInputParameters
-     * @param filter
-     */
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void attributeMatrixSelected(const QString& path);
-
-  protected:
-    /**
-     * @brief setComparisons
-     * @param comparisons
-     */
-    virtual void setComparisons(QVector<ComparisonInput_t> comparisons);
-
-    /**
-     * @brief getComparisonInputs
-     * @return
-     */
-    ComparisonInputs getComparisonInputs();
-
-    /**
-     * @brief populateAttributeMatrixList
-     */
-    void populateAttributeMatrixList();
-
-    /**
-     * @brief generateAttributeArrayList
-     * @param currentDCName
-     * @param currentAttrMatName
-     * @return
-     */
-    QStringList generateAttributeArrayList(const QString& currentDCName, const QString &currentAttrMatName);
-
-    /**
-     * @brief checkStringValues
-     * @param curDcName
-     * @param filtDcName
-     * @return
-     */
-    QString checkStringValues(QString curDcName, QString filtDcName);
-
-    /**
-     * @brief populateButtonText
-     */
-    void populateButtonText();
-
-
-  protected slots:
-    /**
-     * @brief on_addComparison_clicked
-     */
-    void on_addComparison_clicked();
-
-    /**
-     * @brief on_removeComparison_clicked
-     */
-    void on_removeComparison_clicked();
-
-    /**
-     * @brief tableDataWasChanged
-     * @param topLeft
-     * @param bottomRight
-     */
-    void tableDataWasChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
-
-    /**
-     * @brief widgetChanged
-     * @param text
-     */
-    void widgetChanged(const QString& text);
-
-    /**
-     * @brief setSelectedPath
-     * @param path
-     */
-    void setSelectedPath(const QString& path);
-
-    void setSelectedPath(const DataArrayPath& amPath);
-
-    /**
-     * @brief Handles changes to an affected DataArrayPath
-     * @param propertyName
-     * @param renamePath
-     */
-    void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
-
-    /**
-    * @brief Handles AttributeMatrix path changes through DataArrayPathSelectionWidget
-    */
-    void attributeMatrixUpdated();
-
-  private:
-    ComparisonSelectionWidget::ArrayListType m_ArrayListType = {};
-    bool m_ShowOperators = {};
-
-    DataContainerArrayProxy m_DcaProxy;
-
-    bool m_DidCausePreflight;
-
-    ComparisonSelectionTableModel* m_ComparisonSelectionTableModel;
-
-    ComparisonSelectionFilterParameter* m_FilterParameter;
-
-
-
-    /**
-     * @brief createComparisonModel
-     * @return
-     */
-    ComparisonSelectionTableModel* createComparisonModel();
-
-  public:
-    ComparisonSelectionWidget(const ComparisonSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    ComparisonSelectionWidget(ComparisonSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    ComparisonSelectionWidget& operator=(const ComparisonSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    ComparisonSelectionWidget& operator=(ComparisonSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  ComparisonSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  ~ComparisonSelectionWidget() override;
+
+  enum ArrayListType
+  {
+    CellListType,
+    FeatureListType,
+    EnsembleListType,
+    VertexListType,
+    EdgeListType,
+    FaceListType,
+  };
+
+  /**
+   * @brief Setter property for ArrayListType
+   */
+  void setArrayListType(const ComparisonSelectionWidget::ArrayListType& value);
+  /**
+   * @brief Getter property for ArrayListType
+   * @return Value of ArrayListType
+   */
+  ComparisonSelectionWidget::ArrayListType getArrayListType() const;
+
+  /**
+   * @brief Setter property for ShowOperators
+   */
+  void setShowOperators(bool value);
+  /**
+   * @brief Getter property for ShowOperators
+   * @return Value of ShowOperators
+   */
+  bool getShowOperators() const;
+
+  /**
+   * @brief setupGui Initializes some of the GUI elements with selections or other GUI related items
+   */
+  void setupGui() override;
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  /**
+   * @brief beforePreflight
+   */
+  void beforePreflight();
+
+  /**
+   * @brief afterPreflight
+   */
+  void afterPreflight();
+
+  /**
+   * @brief filterNeedsInputParameters
+   * @param filter
+   */
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void attributeMatrixSelected(const QString& path);
+
+protected:
+  /**
+   * @brief setComparisons
+   * @param comparisons
+   */
+  virtual void setComparisons(QVector<ComparisonInput_t> comparisons);
+
+  /**
+   * @brief getComparisonInputs
+   * @return
+   */
+  ComparisonInputs getComparisonInputs();
+
+  /**
+   * @brief populateAttributeMatrixList
+   */
+  void populateAttributeMatrixList();
+
+  /**
+   * @brief generateAttributeArrayList
+   * @param currentDCName
+   * @param currentAttrMatName
+   * @return
+   */
+  QStringList generateAttributeArrayList(const QString& currentDCName, const QString& currentAttrMatName);
+
+  /**
+   * @brief checkStringValues
+   * @param curDcName
+   * @param filtDcName
+   * @return
+   */
+  QString checkStringValues(QString curDcName, QString filtDcName);
+
+  /**
+   * @brief populateButtonText
+   */
+  void populateButtonText();
+
+protected slots:
+  /**
+   * @brief on_addComparison_clicked
+   */
+  void on_addComparison_clicked();
+
+  /**
+   * @brief on_removeComparison_clicked
+   */
+  void on_removeComparison_clicked();
+
+  /**
+   * @brief tableDataWasChanged
+   * @param topLeft
+   * @param bottomRight
+   */
+  void tableDataWasChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+
+  /**
+   * @brief widgetChanged
+   * @param text
+   */
+  void widgetChanged(const QString& text);
+
+  /**
+   * @brief setSelectedPath
+   * @param path
+   */
+  void setSelectedPath(const QString& path);
+
+  void setSelectedPath(const DataArrayPath& amPath);
+
+  /**
+   * @brief Handles changes to an affected DataArrayPath
+   * @param propertyName
+   * @param renamePath
+   */
+  void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+
+  /**
+   * @brief Handles AttributeMatrix path changes through DataArrayPathSelectionWidget
+   */
+  void attributeMatrixUpdated();
+
+private:
+  ComparisonSelectionWidget::ArrayListType m_ArrayListType = {};
+  bool m_ShowOperators = {};
+
+  DataContainerArrayProxy m_DcaProxy;
+
+  bool m_DidCausePreflight;
+
+  ComparisonSelectionTableModel* m_ComparisonSelectionTableModel;
+
+  ComparisonSelectionFilterParameter* m_FilterParameter;
+
+  /**
+   * @brief createComparisonModel
+   * @return
+   */
+  ComparisonSelectionTableModel* createComparisonModel();
+
+public:
+  ComparisonSelectionWidget(const ComparisonSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  ComparisonSelectionWidget(ComparisonSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  ComparisonSelectionWidget& operator=(const ComparisonSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  ComparisonSelectionWidget& operator=(ComparisonSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
index 126a3f6a26..b39a0beae9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
@@ -12,7 +12,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonSetWidget::ComparisonSetWidget(QWidget* parent, ComparisonSet::Pointer comparisonSet) : IComparisonWidget(parent)
+ComparisonSetWidget::ComparisonSetWidget(QWidget* parent, ComparisonSet::Pointer comparisonSet)
+: IComparisonWidget(parent)
 {
   setupUi(this);
 
@@ -37,13 +38,9 @@ void ComparisonSetWidget::setupGui()
   conditionalLayout->setSpacing(0);
   setContextMenuPolicy(Qt::CustomContextMenu);
 
-  connect(this, SIGNAL(customContextMenuRequested(QPoint)),
-    this, SLOT(showContextMenu(QPoint)));
-  connect(addItemBtn, SIGNAL(clicked()),
-    this, SLOT(showAddItemMenu()));
-  connect(invertConditionalCheckBox, SIGNAL(stateChanged(int)),
-    this, SLOT(setInverse(int)));
-
+  connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showContextMenu(QPoint)));
+  connect(addItemBtn, SIGNAL(clicked()), this, SLOT(showAddItemMenu()));
+  connect(invertConditionalCheckBox, SIGNAL(stateChanged(int)), this, SLOT(setInverse(int)));
 }
 
 // -----------------------------------------------------------------------------
@@ -51,7 +48,7 @@ void ComparisonSetWidget::setupGui()
 // -----------------------------------------------------------------------------
 QVector<AbstractComparison::Pointer> ComparisonSetWidget::getComparisons()
 {
-  if (nullptr == m_comparisonSet)
+  if(nullptr == m_comparisonSet)
   {
     return QVector<AbstractComparison::Pointer>();
   }
@@ -68,9 +65,9 @@ void ComparisonSetWidget::setComparisons(QVector<AbstractComparison::Pointer> co
   clearSet();
 
   m_comparisonSet->setComparisons(comparisons);
-  
+
   // create widgets
-  for (int i = 0; i < comparisons.size(); i++)
+  for(int i = 0; i < comparisons.size(); i++)
   {
     ComparisonContainerWidget* container = new ComparisonContainerWidget(nullptr, comparisons[i]);
 
@@ -87,7 +84,7 @@ void ComparisonSetWidget::setComparisons(QVector<AbstractComparison::Pointer> co
 void ComparisonSetWidget::addComparison(AbstractComparison::Pointer comparison)
 {
   m_comparisonSet->addComparison(comparison);
-  
+
   ComparisonContainerWidget* container = new ComparisonContainerWidget(nullptr, comparison);
 
   conditionalLayout->insertWidget(insertIndex(), container);
@@ -100,7 +97,7 @@ void ComparisonSetWidget::addComparison(AbstractComparison::Pointer comparison)
 AbstractComparison::Pointer ComparisonSetWidget::getComparison(int index)
 {
   QVector<AbstractComparison::Pointer> comparisons = getComparisons();
-  if (index < 0 || index >= comparisons.size())
+  if(index < 0 || index >= comparisons.size())
   {
     return nullptr;
   }
@@ -129,7 +126,7 @@ void ComparisonSetWidget::setComparisonSet(ComparisonSet::Pointer comparisonSet)
 
   // clear contents
   QObjectList childWidgets = conditionalWidgetContents->children();
-  for (int i = 0; i < childWidgets.size(); i++)
+  for(int i = 0; i < childWidgets.size(); i++)
   {
     ComparisonContainerWidget* widget = dynamic_cast<ComparisonContainerWidget*>(childWidgets.at(i));
 
@@ -143,19 +140,18 @@ void ComparisonSetWidget::setComparisonSet(ComparisonSet::Pointer comparisonSet)
 
   invertConditionalCheckBox->setChecked(comparisonSet->getInvertComparison());
 
-  if (nullptr != comparisonSet)
+  if(nullptr != comparisonSet)
   {
     // set contents of widget to comparisonSet
     QVector<AbstractComparison::Pointer> comparisons = comparisonSet->getComparisons();
-    for (int i = 0; i < comparisons.size(); i++)
+    for(int i = 0; i < comparisons.size(); i++)
     {
       ComparisonContainerWidget* container = new ComparisonContainerWidget(nullptr, comparisons[i]);
 
       conditionalLayout->insertWidget(i, container);
       container->show();
 
-      connect(container, SIGNAL(comparisonChanged()),
-        this, SIGNAL(comparisonChanged()));
+      connect(container, SIGNAL(comparisonChanged()), this, SIGNAL(comparisonChanged()));
     }
 
     updateItems();
@@ -189,13 +185,11 @@ void ComparisonSetWidget::showContextMenu(QPoint pos)
   QMenu menu(tr("New Comparison Menu"), this);
 
   QAction comparisonValueAction(tr("Add Comparison Value"), this);
-  connect(&comparisonValueAction, SIGNAL(triggered()),
-    this, SLOT(createComparisonValue()));
+  connect(&comparisonValueAction, SIGNAL(triggered()), this, SLOT(createComparisonValue()));
   menu.addAction(&comparisonValueAction);
 
   QAction comparisonSetAction(tr("Add Comparison Set"), this);
-  connect(&comparisonSetAction, SIGNAL(triggered()),
-    this, SLOT(createComparisonSet()));
+  connect(&comparisonSetAction, SIGNAL(triggered()), this, SLOT(createComparisonSet()));
   menu.addAction(&comparisonSetAction);
 
   menu.exec(mapToGlobal(pos));
@@ -234,7 +228,7 @@ void ComparisonSetWidget::createComparisonValue()
 // -----------------------------------------------------------------------------
 void ComparisonSetWidget::addComparisonWidget(AbstractComparison::Pointer comparison, int index)
 {
-  if (index < 0)
+  if(index < 0)
   {
     index = insertIndex();
   }
@@ -248,8 +242,7 @@ void ComparisonSetWidget::addComparisonWidget(AbstractComparison::Pointer compar
   updateItems();
   update();
 
-  connect(comparisonWidget, SIGNAL(comparisonChanged()),
-    this, SIGNAL(comparisonChanged()));
+  connect(comparisonWidget, SIGNAL(comparisonChanged()), this, SIGNAL(comparisonChanged()));
 
   emit comparisonChanged();
 }
@@ -262,13 +255,12 @@ int ComparisonSetWidget::insertIndex()
   int index = conditionalWidgetContents->children().size() - 2;
   if(index < 0)
   {
-      index = 0;
+    index = 0;
   }
 
   return index;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -279,7 +271,7 @@ void ComparisonSetWidget::updateItems()
   QVector<AbstractComparison::Pointer> updatedChildComparisons;
   int count = conditionalLayout->count();
 
-  for (int i = 0; i < count; i++)
+  for(int i = 0; i < count; i++)
   {
     ComparisonContainerWidget* itemWidget = dynamic_cast<ComparisonContainerWidget*>(conditionalLayout->itemAt(i)->widget());
 
@@ -294,7 +286,7 @@ void ComparisonSetWidget::updateItems()
 
   m_comparisonSet->setComparisons(updatedChildComparisons);
 
-  //emit comparisonChanged();
+  // emit comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -306,14 +298,14 @@ int ComparisonSetWidget::insertIndexByPoint(QPoint pos, ComparisonContainerWidge
 
   pos = conditionalWidgetContents->mapFrom(this, pos);
 
-  for (int i = 0; i < conditionalWidgetContents->children().size(); i++)
+  for(int i = 0; i < conditionalWidgetContents->children().size(); i++)
   {
     ComparisonContainerWidget* itemWidget = dynamic_cast<ComparisonContainerWidget*>(conditionalWidgetContents->children().at(i));
 
     if((itemWidget != nullptr) && itemWidget != ignore)
     {
       QPoint filterPoint = itemWidget->pos();
-      if (pos.y() > filterPoint.y() + itemWidget->height() / 2)
+      if(pos.y() > filterPoint.y() + itemWidget->height() / 2)
       {
         index++;
       }
@@ -345,7 +337,7 @@ void ComparisonSetWidget::dragMoveEvent(QDragMoveEvent* event)
 void ComparisonSetWidget::dropEvent(QDropEvent* event)
 {
   ComparisonContainerWidget* comparisonItemWidget = dynamic_cast<ComparisonContainerWidget*>(event->source());
-  if (nullptr == comparisonItemWidget)
+  if(nullptr == comparisonItemWidget)
   {
     return;
   }
@@ -387,8 +379,8 @@ void ComparisonSetWidget::setAttributeMatrix(AttributeMatrix::Pointer am)
 
   IComparisonWidget::setAttributeMatrix(am);
 
-  //QVector<IComparisonWidget*> comparisonWidgets = getComparisonWidgets();
-  //for (int i = 0; i < comparisonWidgets.size(); i++)
+  // QVector<IComparisonWidget*> comparisonWidgets = getComparisonWidgets();
+  // for (int i = 0; i < comparisonWidgets.size(); i++)
   //{
   //  comparisonWidgets[i]->setAttributeMatrix(am);
   //}
@@ -401,7 +393,7 @@ QVector<IComparisonWidget*> ComparisonSetWidget::getComparisonWidgets()
 {
   QVector<IComparisonWidget*> comparisonWidgets;
 
-  for (int i = 0; i < conditionalWidgetContents->children().size(); i++)
+  for(int i = 0; i < conditionalWidgetContents->children().size(); i++)
   {
     ComparisonContainerWidget* itemWidget = dynamic_cast<ComparisonContainerWidget*>(conditionalWidgetContents->children().at(i));
 
@@ -420,7 +412,7 @@ QVector<IComparisonWidget*> ComparisonSetWidget::getComparisonWidgets()
 void ComparisonSetWidget::clearSet()
 {
   m_comparisonSet = ComparisonSet::New();
-  for (int i = 0; i < conditionalWidgetContents->children().size(); i++)
+  for(int i = 0; i < conditionalWidgetContents->children().size(); i++)
   {
     ComparisonContainerWidget* container = dynamic_cast<ComparisonContainerWidget*>(conditionalWidgetContents->children().at(i));
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
index e76c7641af..66d00f3543 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,8 +53,8 @@
 class ComparisonContainerWidget;
 
 /**
-* @brief The ComparisonSetWidget class is used to display and edit ComparisonSets for the ComparisonSelectionAdvancedWidget.
-*/
+ * @brief The ComparisonSetWidget class is used to display and edit ComparisonSets for the ComparisonSelectionAdvancedWidget.
+ */
 class SVWidgetsLib_EXPORT ComparisonSetWidget : public IComparisonWidget, private Ui::ComparisonSetWidget
 {
   Q_OBJECT
@@ -64,154 +64,153 @@ class SVWidgetsLib_EXPORT ComparisonSetWidget : public IComparisonWidget, privat
   ~ComparisonSetWidget() override;
 
   /**
-  * @brief Returns the comparisons used by the ComparisonSet
-  * @return
-  */
+   * @brief Returns the comparisons used by the ComparisonSet
+   * @return
+   */
   QVector<AbstractComparison::Pointer> getComparisons();
 
   /**
-  * @brief Sets the comparisons used by the ComparisonSet
-  * @param comparisons New comparisons to assign to the ComparisonSet to replace the current ones
-  */
+   * @brief Sets the comparisons used by the ComparisonSet
+   * @param comparisons New comparisons to assign to the ComparisonSet to replace the current ones
+   */
   void setComparisons(QVector<AbstractComparison::Pointer> comparisons);
 
   /**
-  * @brief Adds a comparison to the ComparisonSet
-  * @param comparison New comparison to add to the ComparisonSet
-  */
+   * @brief Adds a comparison to the ComparisonSet
+   * @param comparison New comparison to add to the ComparisonSet
+   */
   void addComparison(AbstractComparison::Pointer comparison);
 
   /**
-  * @brief Returns the nth comparison used by the ComparisonSet
-  * @param index Which comparison to return
-  * @return
-  */
+   * @brief Returns the nth comparison used by the ComparisonSet
+   * @param index Which comparison to return
+   * @return
+   */
   AbstractComparison::Pointer getComparison(int index);
 
   /**
-  * @brief Returns the ComparisonSet used by the widget
-  * @return
-  */
+   * @brief Returns the ComparisonSet used by the widget
+   * @return
+   */
   ComparisonSet::Pointer getComparisonSet();
 
   /**
-  * @brief Specifies a new ComparisonSet to use by the widget
-  * @param comparisonSet
-  */
+   * @brief Specifies a new ComparisonSet to use by the widget
+   * @param comparisonSet
+   */
   void setComparisonSet(ComparisonSet::Pointer comparisonSet);
 
   /**
-  * @brief returns the ComparisonSet as an AbstractComparison
-  * @return
-  */
+   * @brief returns the ComparisonSet as an AbstractComparison
+   * @return
+   */
   AbstractComparison::Pointer getComparison() override;
 
   /**
-  * @brief Sets the array of names to use in any nested IComparisonWidgets
-  * @param names QStringList of all DataArray names available to use
-  */
+   * @brief Sets the array of names to use in any nested IComparisonWidgets
+   * @param names QStringList of all DataArray names available to use
+   */
   void setArrayNames(QStringList names) override;
 
   /**
-  * @brief Sets the AttributeMatrix used for finding DataArrayNames
-  * @param am
-  */
+   * @brief Sets the AttributeMatrix used for finding DataArrayNames
+   * @param am
+   */
   void setAttributeMatrix(AttributeMatrix::Pointer am) override;
 
   /**
-  * @brief Updates the ComparisonSet using the ComparisonContainerWidgets stored in this widget
-  */
+   * @brief Updates the ComparisonSet using the ComparisonContainerWidgets stored in this widget
+   */
   void updateItems();
 
   /**
-  * @brief This method does additional GUI widget connections
-  */
+   * @brief This method does additional GUI widget connections
+   */
   void setupGui();
 
   /**
-  * @brief Updates all comparisons contained in the set with the updated path
-  * @param renamePath
-  */
+   * @brief Updates all comparisons contained in the set with the updated path
+   * @param renamePath
+   */
   void renameDataArrayPath(DataArrayPath::RenameType renamePath) override;
-  
+
 protected:
   /**
-  * @brief Clears the ComparisonSet of all values and subsets
-  */
+   * @brief Clears the ComparisonSet of all values and subsets
+   */
   void clearSet();
 
   /**
-  * @brief Returns the ComparisonWidgets stored in this widget
-  * @return
-  */
+   * @brief Returns the ComparisonWidgets stored in this widget
+   * @return
+   */
   QVector<IComparisonWidget*> getComparisonWidgets();
 
   /**
-  * @brief Adds a comparison to the ComparisonSet at a given position
-  * @param comparison New comparison to add
-  * @param index Position to add the new comparison
-  */
+   * @brief Adds a comparison to the ComparisonSet at a given position
+   * @param comparison New comparison to add
+   * @param index Position to add the new comparison
+   */
   void addComparisonWidget(AbstractComparison::Pointer comparison, int index = -1);
   /**
-  * @brief Returns the index to insert new items by default
-  * @return
-  */
+   * @brief Returns the index to insert new items by default
+   * @return
+   */
   int insertIndex();
 
   /**
-  * @brief Calculates which index to insert a ComparisonWidget from a given point
-  * @param pos Position used to calculate the index
-  * @param ignore Any ComparisonContainerWidget that should be ignored during calculating the index
-  */
+   * @brief Calculates which index to insert a ComparisonWidget from a given point
+   * @param pos Position used to calculate the index
+   * @param ignore Any ComparisonContainerWidget that should be ignored during calculating the index
+   */
   int insertIndexByPoint(QPoint pos, ComparisonContainerWidget* ignore = nullptr);
 
   /**
-  * @brief Handles dragging ComparisonContainerWidgets into the ComparisonSet
-  * @param event
-  */
+   * @brief Handles dragging ComparisonContainerWidgets into the ComparisonSet
+   * @param event
+   */
   void dragEnterEvent(QDragEnterEvent* event) override;
-  
+
   /**
-  * @brief Handles moving ComparisonContainerWidgets in the ComparisonSet
-  * @param event
-  */
+   * @brief Handles moving ComparisonContainerWidgets in the ComparisonSet
+   * @param event
+   */
   void dragMoveEvent(QDragMoveEvent* event) override;
 
   /**
-  * @brief Handles dropping ComparisonContainerWidgets in the ComparisonSet
-  * @param event
-  */
+   * @brief Handles dropping ComparisonContainerWidgets in the ComparisonSet
+   * @param event
+   */
   void dropEvent(QDropEvent* event) override;
 
 protected slots:
   /**
-  * @brief Show the context menu at a given point
-  * @param pos
-  */
+   * @brief Show the context menu at a given point
+   * @param pos
+   */
   void showContextMenu(QPoint pos);
 
   /**
-  * @brief Shows the context menu at the cursor's location
-  */
+   * @brief Shows the context menu at the cursor's location
+   */
   void showAddItemMenu();
 
   /**
-  * @brief Creates a new ComparisonSet at the end of the current ComparisonSet
-  */
+   * @brief Creates a new ComparisonSet at the end of the current ComparisonSet
+   */
   void createComparisonSet();
 
   /**
-  * @brief Create a new ComparisonValue at the end of the current ComparisonSet
-  */
+   * @brief Create a new ComparisonValue at the end of the current ComparisonSet
+   */
   void createComparisonValue();
 
   /**
-  * @brief Specifies that the results of the ComparisonSet should have their values flipped.
-  * @param newInverse Integer value of the Invert QCheckBox
-  */
+   * @brief Specifies that the results of the ComparisonSet should have their values flipped.
+   * @param newInverse Integer value of the Invert QCheckBox
+   */
   void setInverse(int newInverse);
 
 private:
   ComparisonSet::Pointer m_comparisonSet;
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
index bbb42c75e1..8c50d93680 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
@@ -5,7 +5,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonValueWidget::ComparisonValueWidget(QWidget* parent, ComparisonValue::Pointer comparisonValue) : IComparisonWidget(parent)
+ComparisonValueWidget::ComparisonValueWidget(QWidget* parent, ComparisonValue::Pointer comparisonValue)
+: IComparisonWidget(parent)
 {
   setupUi(this);
 
@@ -30,9 +31,9 @@ ComparisonValue::Pointer ComparisonValueWidget::getComparisonValue()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonValueWidget::setComparisonValue(const ComparisonValue::Pointer &value)
+void ComparisonValueWidget::setComparisonValue(const ComparisonValue::Pointer& value)
 {
-  if (nullptr == value)
+  if(nullptr == value)
   {
     m_comparisonValue = ComparisonValue::New();
   }
@@ -66,7 +67,7 @@ void ComparisonValueWidget::setupDataArrayComboBox()
   arrayNameComboBox->clear();
 
   AttributeMatrix::Pointer am = getAttributeMatrix();
-  if (nullptr != am)
+  if(nullptr != am)
   {
     arrayNameComboBox->addItems(am->getAttributeArrayNames());
   }
@@ -113,7 +114,7 @@ void ComparisonValueWidget::comparisonOperatorChanged(int index)
 // -----------------------------------------------------------------------------
 void ComparisonValueWidget::comparisonValueChanged()
 {
-  
+
   bool ok = false;
   double d = valueSpinBox->text().toDouble(&ok);
   m_comparisonValue->setCompValue(d);
@@ -126,12 +127,9 @@ void ComparisonValueWidget::comparisonValueChanged()
 // -----------------------------------------------------------------------------
 void ComparisonValueWidget::setupGui()
 {
-  connect(arrayNameComboBox, SIGNAL(currentIndexChanged(int)),
-    this, SLOT(dataArrayChanged(int)));
-  connect(operatorComboBox, SIGNAL(currentIndexChanged(int)),
-    this, SLOT(comparisonOperatorChanged(int)));
-  connect(valueSpinBox, SIGNAL(editingFinished()),
-    this, SLOT(comparisonValueChanged()));
+  connect(arrayNameComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(dataArrayChanged(int)));
+  connect(operatorComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(comparisonOperatorChanged(int)));
+  connect(valueSpinBox, SIGNAL(editingFinished()), this, SLOT(comparisonValueChanged()));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
index e3b7134acf..5a0ba0f660 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,8 +45,8 @@
 #include "ui_ComparisonValueWidget.h"
 
 /**
-* @brief The ComparisonValueWidget class is used to display and edit ComparisonValues for ComparisonSelectionAdvancedWidget
-*/
+ * @brief The ComparisonValueWidget class is used to display and edit ComparisonValues for ComparisonSelectionAdvancedWidget
+ */
 class SVWidgetsLib_EXPORT ComparisonValueWidget : public IComparisonWidget, private Ui::ComparisonValueWidget
 {
   Q_OBJECT
@@ -56,70 +56,69 @@ class SVWidgetsLib_EXPORT ComparisonValueWidget : public IComparisonWidget, priv
   ~ComparisonValueWidget() override;
 
   /**
-  * @brief Returns the ComparisonValue used by this widget
-  * @return
-  */
+   * @brief Returns the ComparisonValue used by this widget
+   * @return
+   */
   ComparisonValue::Pointer getComparisonValue();
   /**
-  * @brief Sets the ComparisonValue used by this widget
-  * @param value New ComparisonValue::Pointer to use
-  */
-  void setComparisonValue(const ComparisonValue::Pointer &value);
+   * @brief Sets the ComparisonValue used by this widget
+   * @param value New ComparisonValue::Pointer to use
+   */
+  void setComparisonValue(const ComparisonValue::Pointer& value);
 
   /**
-  * @brief Returns the ComparisonValue used by this widget as an AbstractComparison::Pointer
-  * @return
-  */
+   * @brief Returns the ComparisonValue used by this widget as an AbstractComparison::Pointer
+   * @return
+   */
   AbstractComparison::Pointer getComparison() override;
 
   /**
-  * @brief Sets the array of names to use
-  * @param names QStringList of all DataArray names available to use
-  */
+   * @brief Sets the array of names to use
+   * @param names QStringList of all DataArray names available to use
+   */
   void setArrayNames(QStringList names) override;
 
   /**
-  * @brief Sets the AttributeMatrix used to specify DataArray names
-  * @param am AttributeMatrix to use
-  */
+   * @brief Sets the AttributeMatrix used to specify DataArray names
+   * @param am AttributeMatrix to use
+   */
   void setAttributeMatrix(AttributeMatrix::Pointer am) override;
-  
+
   /**
-  * @brief This method does additional GUI widget connections
-  */
+   * @brief This method does additional GUI widget connections
+   */
   void setupGui();
 
   /**
-  * @brief Updates the comparison array paths based on the renamed DataArrayPath
-  * @param renamePath
-  */
+   * @brief Updates the comparison array paths based on the renamed DataArrayPath
+   * @param renamePath
+   */
   void renameDataArrayPath(DataArrayPath::RenameType renamePath) override;
 
 protected:
   /**
-  * @brief Updates the DataArray combo box with names from the given AttributeMatrix
-  */
+   * @brief Updates the DataArray combo box with names from the given AttributeMatrix
+   */
   void setupDataArrayComboBox();
 
 protected slots:
   /**
-  * @brief Changes the DataArray used by the ComparisonValue
-  * @param index Specifies which DataArray name to use
-  */
+   * @brief Changes the DataArray used by the ComparisonValue
+   * @param index Specifies which DataArray name to use
+   */
   void dataArrayChanged(int index);
-  
+
   /**
-  * @brief Changes the comparison operator for the ComparisonValue
-  * @param index Specifies the new comparisonOperator
-  */
+   * @brief Changes the comparison operator for the ComparisonValue
+   * @param index Specifies the new comparisonOperator
+   */
   void comparisonOperatorChanged(int index);
   /**
-  * @brief Changes the value used by the ComparisonValue
-  * @param value Specifies the new value to use
-  */
+   * @brief Changes the value used by the ComparisonValue
+   * @param value Specifies the new value to use
+   */
   void comparisonValueChanged();
 
 private:
   ComparisonValue::Pointer m_comparisonValue;
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index fa982dce55..172def731b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedDoubleWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -45,8 +44,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedDoubleWidget::ConstrainedDoubleWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent) :
-  FilterParameterWidget(parameter, filter, parent)
+ConstrainedDoubleWidget::ConstrainedDoubleWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
 {
   m_FilterParameter = dynamic_cast<ConstrainedDoubleFilterParameter*>(parameter);
   Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ConstrainedDoubleWidget can ONLY be used with a DoubleFilterParameter object");
@@ -74,18 +73,16 @@ void ConstrainedDoubleWidget::setupGui()
   // Catch when the filter wants its values updated
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ConstrainedDoubleWidget::filterNeedsInputParameters);
 
-  connect(spinBox, static_cast<void(QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged),
-          this, &ConstrainedDoubleWidget::widgetChanged);
+  connect(spinBox, static_cast<void (QDoubleSpinBox::*)(double)>(&QDoubleSpinBox::valueChanged), this, &ConstrainedDoubleWidget::widgetChanged);
 
-  if (getFilterParameter() != nullptr)
+  if(getFilterParameter() != nullptr)
   {
-    label->setText(getFilterParameter()->getHumanLabel() );
+    label->setText(getFilterParameter()->getHumanLabel());
     bool ok = false;
 
-    double d =  getFilter()->property(PROPERTY_NAME_AS_CHAR).toDouble(&ok);
+    double d = getFilter()->property(PROPERTY_NAME_AS_CHAR).toDouble(&ok);
     spinBox->setValue(d);
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
index ce28d1b4fe..7431936e89 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_ConstrainedDoubleWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ConstrainedDoubleWidget : public FilterParameterWidget, private Ui::ConstrainedDoubleWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ConstrainedDoubleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~ConstrainedDoubleWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(double d);// when something in the widget changes
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    ConstrainedDoubleFilterParameter* m_FilterParameter;
-
-  public:
-    ConstrainedDoubleWidget(const ConstrainedDoubleWidget&) = delete; // Copy Constructor Not Implemented
-    ConstrainedDoubleWidget(ConstrainedDoubleWidget&&) = delete;      // Move Constructor Not Implemented
-    ConstrainedDoubleWidget& operator=(const ConstrainedDoubleWidget&) = delete; // Copy Assignment Not Implemented
-    ConstrainedDoubleWidget& operator=(ConstrainedDoubleWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ConstrainedDoubleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~ConstrainedDoubleWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(double d);                            // when something in the widget changes
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  ConstrainedDoubleFilterParameter* m_FilterParameter;
+
+public:
+  ConstrainedDoubleWidget(const ConstrainedDoubleWidget&) = delete;            // Copy Constructor Not Implemented
+  ConstrainedDoubleWidget(ConstrainedDoubleWidget&&) = delete;                 // Move Constructor Not Implemented
+  ConstrainedDoubleWidget& operator=(const ConstrainedDoubleWidget&) = delete; // Copy Assignment Not Implemented
+  ConstrainedDoubleWidget& operator=(ConstrainedDoubleWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index c1b8f87896..cfa27b3ac9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ConstrainedIntWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -45,8 +44,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedIntWidget::ConstrainedIntWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent) :
-  FilterParameterWidget(parameter, filter, parent)
+ConstrainedIntWidget::ConstrainedIntWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
 {
   m_FilterParameter = dynamic_cast<ConstrainedIntFilterParameter*>(parameter);
   Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ConstrainedIntWidget can ONLY be used with a IntFilterParameter object");
@@ -74,19 +73,17 @@ void ConstrainedIntWidget::setupGui()
   // Catch when the filter wants its values updated
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ConstrainedIntWidget::filterNeedsInputParameters);
 
-  connect(spinBox, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged),
-          this, &ConstrainedIntWidget::widgetChanged);
+  connect(spinBox, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &ConstrainedIntWidget::widgetChanged);
 
-  if (getFilterParameter() != nullptr)
+  if(getFilterParameter() != nullptr)
   {
-    label->setText(getFilterParameter()->getHumanLabel() );
+    label->setText(getFilterParameter()->getHumanLabel());
 
     int val = getFilter()->property(PROPERTY_NAME_AS_CHAR).toInt();
     spinBox->setValue(val);
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
index 51d2130466..8a91ff9120 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -51,45 +50,42 @@
 class QLineEdit;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ConstrainedIntWidget : public FilterParameterWidget, private Ui::ConstrainedIntWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ConstrainedIntWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~ConstrainedIntWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(int i);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    ConstrainedIntFilterParameter* m_FilterParameter;
-
-  public:
-    ConstrainedIntWidget(const ConstrainedIntWidget&) = delete; // Copy Constructor Not Implemented
-    ConstrainedIntWidget(ConstrainedIntWidget&&) = delete;      // Move Constructor Not Implemented
-    ConstrainedIntWidget& operator=(const ConstrainedIntWidget&) = delete; // Copy Assignment Not Implemented
-    ConstrainedIntWidget& operator=(ConstrainedIntWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ConstrainedIntWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~ConstrainedIntWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(int i);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  ConstrainedIntFilterParameter* m_FilterParameter;
+
+public:
+  ConstrainedIntWidget(const ConstrainedIntWidget&) = delete;            // Copy Constructor Not Implemented
+  ConstrainedIntWidget(ConstrainedIntWidget&&) = delete;                 // Move Constructor Not Implemented
+  ConstrainedIntWidget& operator=(const ConstrainedIntWidget&) = delete; // Copy Assignment Not Implemented
+  ConstrainedIntWidget& operator=(ConstrainedIntWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
index e9c6db9ce0..52aa5789e2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "CustomWidget.h"
 
-
 #include "FilterWidgetsLib/Widgets/moc_CustomWidget.cxx"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
index 5cb8d9abeb..4f5cf9078a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
-
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -47,40 +44,36 @@
 
 #include "FilterWidgetsLib/ui_CustomWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class FilterWidgetsLib_EXPORT CustomWidget : public QWidget, private Ui::CustomWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    CustomWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    virtual ~CustomWidget();
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui();
-
-  public slots:
-
-  public:
-    CustomWidget(const CustomWidget&) = delete;   // Copy Constructor Not Implemented
-    CustomWidget(CustomWidget&&) = delete;        // Move Constructor Not Implemented
-    CustomWidget& operator=(const CustomWidget&) = delete; // Copy Assignment Not Implemented
-    CustomWidget& operator=(CustomWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  CustomWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  virtual ~CustomWidget();
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui();
+
+public slots:
+
+public:
+  CustomWidget(const CustomWidget&) = delete;            // Copy Constructor Not Implemented
+  CustomWidget(CustomWidget&&) = delete;                 // Move Constructor Not Implemented
+  CustomWidget& operator=(const CustomWidget&) = delete; // Copy Assignment Not Implemented
+  CustomWidget& operator=(CustomWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 2c0ab745e1..4828af96e6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArrayCreationWidget.h"
 
-
-
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
@@ -122,15 +119,15 @@ void DataArrayCreationWidget::setupGui()
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -147,7 +144,6 @@ void DataArrayCreationWidget::setupGui()
   stringEdit->setText(defaultPath.getDataArrayName(), true);
 
   changeStyleSheet(Style::FS_STANDARD_STYLE);
-
 }
 
 // -----------------------------------------------------------------------------
@@ -230,7 +226,10 @@ void DataArrayCreationWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void DataArrayCreationWidget::setSelectedPath(DataArrayPath amPath)
 {
-  if (amPath.isEmpty()) { return; }
+  if(amPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedAttributeMatrixPath->setDataArrayPath(amPath);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index d4bdc7745a..d27c25cf58 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -48,83 +47,78 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_DataArrayCreationWidget.h"
 
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataArrayCreationWidget : public FilterParameterWidget, private Ui::DataArrayCreationWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataArrayCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  Q_OBJECT
 
-    DataArrayCreationWidget(QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataArrayCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    ~DataArrayCreationWidget() override;
+  DataArrayCreationWidget(QWidget* parent = nullptr);
 
-    typedef QSharedPointer<QMenu> QMenuPtr;
+  ~DataArrayCreationWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  typedef QSharedPointer<QMenu> QMenuPtr;
 
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(QString current, QString filtDcName);
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-    /**
-     * @brief initializeWidget
-     * @param parameter
-     * @param filter
-     */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
 
-    bool eventFilter(QObject* obj, QEvent* event) override;
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+  bool eventFilter(QObject* obj, QEvent* event) override;
 
-    void attributeMatrixSelected(QString path);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
-  protected slots:
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+  void attributeMatrixSelected(QString path);
 
-  private:
+protected slots:
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-    bool m_DidCausePreflight;
+private:
+  bool m_DidCausePreflight;
 
-    DataArrayCreationFilterParameter* m_FilterParameter;
+  DataArrayCreationFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
+  void setSelectedPath(QString path);
 
-    void setSelectedPath(DataArrayPath amPath);
+  void setSelectedPath(DataArrayPath amPath);
 
-  public:
-    DataArrayCreationWidget(const DataArrayCreationWidget&) = delete; // Copy Constructor Not Implemented
-    DataArrayCreationWidget(DataArrayCreationWidget&&) = delete;      // Move Constructor Not Implemented
-    DataArrayCreationWidget& operator=(const DataArrayCreationWidget&) = delete; // Copy Assignment Not Implemented
-    DataArrayCreationWidget& operator=(DataArrayCreationWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  DataArrayCreationWidget(const DataArrayCreationWidget&) = delete;            // Copy Constructor Not Implemented
+  DataArrayCreationWidget(DataArrayCreationWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataArrayCreationWidget& operator=(const DataArrayCreationWidget&) = delete; // Copy Assignment Not Implemented
+  DataArrayCreationWidget& operator=(DataArrayCreationWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
index b3f865a856..572c0b9b6d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArrayInformationDisplayWidget.h"
 
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index ec58ce46a0..28f1efc9e5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <memory>
 
 #include <QtWidgets/QWidget>
@@ -47,60 +46,55 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_DataArrayInformationDisplayWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataArrayInformationDisplayWidget : public FilterParameterWidget, private Ui::DataArrayInformationDisplayWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    using Self = DataArrayInformationDisplayWidget;
-    using Pointer = std::shared_ptr<Self>;
-    using ConstPointer = std::shared_ptr<const Self>;
-    using WeakPointer = std::weak_ptr<Self>;
-    using ConstWeakPointer = std::weak_ptr<const Self>;
-    static Pointer NullPointer();
+public:
+  using Self = DataArrayInformationDisplayWidget;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
 
-    static Pointer New();
+  static Pointer New();
 
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataArrayInformationDisplayWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataArrayInformationDisplayWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    DataArrayInformationDisplayWidget(QWidget* parent = nullptr);
+  DataArrayInformationDisplayWidget(QWidget* parent = nullptr);
 
-    virtual ~DataArrayInformationDisplayWidget();
+  virtual ~DataArrayInformationDisplayWidget();
 
-    QString getNameText();
-    void setNameText(QString name);
+  QString getNameText();
+  void setNameText(QString name);
 
-    QString getPathText();
-    void setPathText(QString path);
+  QString getPathText();
+  void setPathText(QString path);
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui();
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui();
 
-  public:
-    DataArrayInformationDisplayWidget(const DataArrayInformationDisplayWidget&) = delete; // Copy Constructor Not Implemented
-    DataArrayInformationDisplayWidget(DataArrayInformationDisplayWidget&&) = delete;      // Move Constructor Not Implemented
-    DataArrayInformationDisplayWidget& operator=(const DataArrayInformationDisplayWidget&) = delete; // Copy Assignment Not Implemented
-    DataArrayInformationDisplayWidget& operator=(DataArrayInformationDisplayWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  DataArrayInformationDisplayWidget(const DataArrayInformationDisplayWidget&) = delete;            // Copy Constructor Not Implemented
+  DataArrayInformationDisplayWidget(DataArrayInformationDisplayWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataArrayInformationDisplayWidget& operator=(const DataArrayInformationDisplayWidget&) = delete; // Copy Assignment Not Implemented
+  DataArrayInformationDisplayWidget& operator=(DataArrayInformationDisplayWidget&&) = delete;      // Move Assignment Not Implemented
 
-  private:
+private:
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 01a5f91fec..c2246f6708 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataArraySelectionWidget.h"
 
@@ -121,15 +121,15 @@ void DataArraySelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataArraySelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedDataArrayPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedDataArrayPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedDataArrayPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedDataArrayPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedDataArrayPath, SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)));
+  connect(m_SelectedDataArrayPath, SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)));
   connect(m_SelectedDataArrayPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedDataArrayPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedDataArrayPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -144,7 +144,6 @@ void DataArraySelectionWidget::setupGui()
   m_SelectedDataArrayPath->setPropertyName(getFilterParameter()->getHumanLabel());
 
   changeStyleSheet(Style::FS_STANDARD_STYLE);
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index 1e9f290989..168642841c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -54,75 +53,71 @@
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataArraySelectionWidget : public FilterParameterWidget, private Ui::DataArraySelectionWidget
 {
-    Q_OBJECT
-
-  public:
+  Q_OBJECT
 
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataArraySelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataArraySelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    DataArraySelectionWidget(QWidget* parent = nullptr);
+  DataArraySelectionWidget(QWidget* parent = nullptr);
 
-    ~DataArraySelectionWidget() override;
+  ~DataArraySelectionWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(QString current, QString filtDcName);
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
 
-    /**
-     * @brief initializeWidget
-     * @param parameter
-     * @param filter
-     */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
-    bool eventFilter(QObject* obj, QEvent* event) override;
+  bool eventFilter(QObject* obj, QEvent* event) override;
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
-    void dataArraySelected(QString path);
+  void dataArraySelected(QString path);
 
-  protected slots:
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+protected slots:
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-  private:
-    bool m_DidCausePreflight;
+private:
+  bool m_DidCausePreflight;
 
-    DataArraySelectionFilterParameter* m_FilterParameter;
+  DataArraySelectionFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
+  void setSelectedPath(QString path);
 
-    void setSelectedPath(DataArrayPath path);
+  void setSelectedPath(DataArrayPath path);
 
-  public:
-    DataArraySelectionWidget(const DataArraySelectionWidget&) = delete; // Copy Constructor Not Implemented
-    DataArraySelectionWidget(DataArraySelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    DataArraySelectionWidget& operator=(const DataArraySelectionWidget&) = delete; // Copy Assignment Not Implemented
-    DataArraySelectionWidget& operator=(DataArraySelectionWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  DataArraySelectionWidget(const DataArraySelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  DataArraySelectionWidget(DataArraySelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataArraySelectionWidget& operator=(const DataArraySelectionWidget&) = delete; // Copy Assignment Not Implemented
+  DataArraySelectionWidget& operator=(DataArraySelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 271f241169..dd2bcc4026 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerArrayProxyWidget.h"
 
@@ -109,8 +109,7 @@ void DataContainerArrayProxyWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerArrayProxyWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   // setStyleSheet("QColumnView { text-decoration-color: red; }");
 
@@ -122,12 +121,9 @@ void DataContainerArrayProxyWidget::setupGui()
   connect(attributeMatrixList, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
   connect(dataArrayList, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemSelected(QListWidgetItem*)));
 
-  connect(selectAllDataContainer, SIGNAL(clicked(bool)),
-    this, SLOT(selectAllDataContainersClicked(bool)));
-  connect(selectAllAttributeMatrix, SIGNAL(clicked(bool)),
-    this, SLOT(selectAllAttributeMatricesClicked(bool)));
-  connect(selectAllDataArray, SIGNAL(clicked(bool)),
-    this, SLOT(selectAllDataArraysClicked(bool)));
+  connect(selectAllDataContainer, SIGNAL(clicked(bool)), this, SLOT(selectAllDataContainersClicked(bool)));
+  connect(selectAllAttributeMatrix, SIGNAL(clicked(bool)), this, SLOT(selectAllAttributeMatricesClicked(bool)));
+  connect(selectAllDataArray, SIGNAL(clicked(bool)), this, SLOT(selectAllDataArraysClicked(bool)));
 
   if(getFilterParameter() != nullptr)
   {
@@ -403,11 +399,11 @@ void DataContainerArrayProxyWidget::updateDataArrayPath(QString propertyName, co
   applyDataContainerArrayProxy(m_DcaProxy);
 
   //// Update widget values
-  //bool oldDcSelected = dataContainerList->currentItem() && dataContainerList->currentItem()->text() == oldPath.getDataContainerName();
-  //bool oldAmSelected = oldDcSelected && attributeMatrixList->currentItem() && attributeMatrixList->currentItem()->text() == oldPath.getAttributeMatrixName();
+  // bool oldDcSelected = dataContainerList->currentItem() && dataContainerList->currentItem()->text() == oldPath.getDataContainerName();
+  // bool oldAmSelected = oldDcSelected && attributeMatrixList->currentItem() && attributeMatrixList->currentItem()->text() == oldPath.getAttributeMatrixName();
 
   //// Selected DataContainer Renamed
-  //if(oldDcSelected)
+  // if(oldDcSelected)
   //{
   //  // Selected AttributeMatrix Renamed
   //  if(oldAmSelected)
@@ -429,8 +425,8 @@ void DataContainerArrayProxyWidget::updateDataArrayPath(QString propertyName, co
   //}
 
   //// Update DataContainer list names
-  //QList<QListWidgetItem*> dcItems = dataContainerList->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive);
-  //for(QListWidgetItem* item : dcItems)
+  // QList<QListWidgetItem*> dcItems = dataContainerList->findItems(oldPath.getDataContainerName(), Qt::MatchFlag::MatchCaseSensitive);
+  // for(QListWidgetItem* item : dcItems)
   //{
   //  item->setText(newPath.getDataContainerName());
   //}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index 12bd67208a..fd4a007733 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -47,103 +46,97 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_DataContainerArrayProxyWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataContainerArrayProxyWidget : public FilterParameterWidget, private Ui::DataContainerArrayProxyWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataContainerArrayProxyWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    /**
-     * @brief DataContainerArrayProxyWidget
-     * @param parent
-     */
-    DataContainerArrayProxyWidget(QWidget* parent = nullptr);
-
-    ~DataContainerArrayProxyWidget() override;
-
-    void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    void setFilterParameter(FilterParameter* value);
-    FilterParameter* getFilterParameter() const;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-    void itemChanged(QListWidgetItem* item);
-    void itemSelected(QListWidgetItem* item);
-
-  protected:
-    QString getDataContainerName();
-    QString getAttrMatrixName();
-
-    void selectDataContainer(const QString& name);
-    void selectAttributeMatrix(const QString& name);
-
-    DataContainerProxy& getDataContainerProxy();
-    AttributeMatrixProxy& getAttributeMatrixProxy();
-
-    void applyDataContainerArrayProxy(DataContainerArrayProxy& proxy);
-    void applyDataContainerProxy();
-    void applyAttributeMatrixProxy();
-
-    //void updateWidgetFromProxy(DataContainerArrayProxy& proxy);
-    void updateProxyFromProxy(DataContainerArrayProxy& current, DataContainerArrayProxy& incoming);
-
-    void updateProxyChecked(QListWidgetItem* item, bool updateSelectAll = true);
-    QList<QListWidgetItem*> getChildItems(QListWidgetItem* item, QList<QListWidgetItem*> otherItems);
-
-    bool shouldStrikeOutItem(QListWidgetItem* item);
-    Qt::CheckState updateSelectAllState(QListWidget* listWidget);
-    QList<QListWidgetItem*> getAllItems(QListWidget* listWidget, bool ignoreSelectAll = true);
-
-    void checkAllItems(QListWidget* listWidget, Qt::CheckState state);
-
-  protected slots:
-    void selectAllDataContainersClicked(bool checked);
-    void selectAllAttributeMatricesClicked(bool checked);
-    void selectAllDataArraysClicked(bool checked);
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
-
-  private:
-
-    DataContainerArrayProxyFilterParameter*  m_FilterParameter;
-    DataContainerArrayProxy m_DcaProxy;
-    QString m_DcName;
-    QString m_AmName;
-    bool m_DidCausePreflight;
-    DataContainerProxy m_EmptyDcProxy;
-    AttributeMatrixProxy m_EmptyAmProxy;
-
-    void toggleStrikeOutFont(QListWidgetItem* item, Qt::CheckState state);
-
-  public:
-    DataContainerArrayProxyWidget(const DataContainerArrayProxyWidget&) = delete; // Copy Constructor Not Implemented
-    DataContainerArrayProxyWidget(DataContainerArrayProxyWidget&&) = delete;      // Move Constructor Not Implemented
-    DataContainerArrayProxyWidget& operator=(const DataContainerArrayProxyWidget&) = delete; // Copy Assignment Not Implemented
-    DataContainerArrayProxyWidget& operator=(DataContainerArrayProxyWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataContainerArrayProxyWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  /**
+   * @brief DataContainerArrayProxyWidget
+   * @param parent
+   */
+  DataContainerArrayProxyWidget(QWidget* parent = nullptr);
+
+  ~DataContainerArrayProxyWidget() override;
+
+  void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  void setFilterParameter(FilterParameter* value);
+  FilterParameter* getFilterParameter() const;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+  void itemChanged(QListWidgetItem* item);
+  void itemSelected(QListWidgetItem* item);
+
+protected:
+  QString getDataContainerName();
+  QString getAttrMatrixName();
+
+  void selectDataContainer(const QString& name);
+  void selectAttributeMatrix(const QString& name);
+
+  DataContainerProxy& getDataContainerProxy();
+  AttributeMatrixProxy& getAttributeMatrixProxy();
+
+  void applyDataContainerArrayProxy(DataContainerArrayProxy& proxy);
+  void applyDataContainerProxy();
+  void applyAttributeMatrixProxy();
+
+  // void updateWidgetFromProxy(DataContainerArrayProxy& proxy);
+  void updateProxyFromProxy(DataContainerArrayProxy& current, DataContainerArrayProxy& incoming);
+
+  void updateProxyChecked(QListWidgetItem* item, bool updateSelectAll = true);
+  QList<QListWidgetItem*> getChildItems(QListWidgetItem* item, QList<QListWidgetItem*> otherItems);
+
+  bool shouldStrikeOutItem(QListWidgetItem* item);
+  Qt::CheckState updateSelectAllState(QListWidget* listWidget);
+  QList<QListWidgetItem*> getAllItems(QListWidget* listWidget, bool ignoreSelectAll = true);
+
+  void checkAllItems(QListWidget* listWidget, Qt::CheckState state);
+
+protected slots:
+  void selectAllDataContainersClicked(bool checked);
+  void selectAllAttributeMatricesClicked(bool checked);
+  void selectAllDataArraysClicked(bool checked);
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  DataContainerArrayProxyFilterParameter* m_FilterParameter;
+  DataContainerArrayProxy m_DcaProxy;
+  QString m_DcName;
+  QString m_AmName;
+  bool m_DidCausePreflight;
+  DataContainerProxy m_EmptyDcProxy;
+  AttributeMatrixProxy m_EmptyAmProxy;
+
+  void toggleStrikeOutFont(QListWidgetItem* item, Qt::CheckState state);
+
+public:
+  DataContainerArrayProxyWidget(const DataContainerArrayProxyWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerArrayProxyWidget(DataContainerArrayProxyWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerArrayProxyWidget& operator=(const DataContainerArrayProxyWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerArrayProxyWidget& operator=(DataContainerArrayProxyWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index f829176ea1..b81832480d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerCreationWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetUtils.hpp"
@@ -94,12 +93,10 @@ void DataContainerCreationWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerCreationWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
   changeStyleSheet(Style::FS_STANDARD_STYLE);
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index 0f11947855..32fc63fe15 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -48,52 +45,47 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_DataContainerCreationWidget.h"
 
-
 /**
-* @brief This widget is for Filter Parameters that are of a string type.
-* @author
-* @version
-*/
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataContainerCreationWidget : public FilterParameterWidget, private Ui::DataContainerCreationWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataContainerCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~DataContainerCreationWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
-
-  private:
-    DataContainerCreationFilterParameter*                 m_FilterParameter;
-
-  public:
-    DataContainerCreationWidget(const DataContainerCreationWidget&) = delete; // Copy Constructor Not Implemented
-    DataContainerCreationWidget(DataContainerCreationWidget&&) = delete;      // Move Constructor Not Implemented
-    DataContainerCreationWidget& operator=(const DataContainerCreationWidget&) = delete; // Copy Assignment Not Implemented
-    DataContainerCreationWidget& operator=(DataContainerCreationWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataContainerCreationWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~DataContainerCreationWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  DataContainerCreationFilterParameter* m_FilterParameter;
+
+public:
+  DataContainerCreationWidget(const DataContainerCreationWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerCreationWidget(DataContainerCreationWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerCreationWidget& operator=(const DataContainerCreationWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerCreationWidget& operator=(DataContainerCreationWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
index b507bb1e9b..01afc87da5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
@@ -88,8 +88,7 @@ QVariant DataContainerGridModel::data(const QModelIndex& index, int role) const
   {
   case Qt::TextAlignmentRole:
     return int(Qt::AlignRight | Qt::AlignVCenter);
-  case Qt::DisplayRole:
-  {
+  case Qt::DisplayRole: {
     int col = index.column();
     int row = index.row();
     SizeVec3Type pos(row, col, m_CurrentDepth);
@@ -142,7 +141,7 @@ void DataContainerGridModel::setCurrentDepth(int depth)
     return;
   }
   m_CurrentDepth = depth;
-  
+
   QModelIndex index;
   emit dataChanged(index, index);
 }
@@ -164,7 +163,7 @@ bool DataContainerGridModel::setData(const QModelIndex& index, const QVariant& v
   {
     return false;
   }
-  
+
   if(role == Qt::DisplayRole)
   {
     SizeVec3Type pos(index.row(), index.column(), m_CurrentDepth);
@@ -242,7 +241,7 @@ Qt::DropActions DataContainerGridModel::supportedDropActions() const
 // -----------------------------------------------------------------------------
 bool DataContainerGridModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
 {
-  //QModelIndex targetIndex = index(row, column, parent);
+  // QModelIndex targetIndex = index(row, column, parent);
   if(!parent.isValid())
   {
     return false;
@@ -257,7 +256,7 @@ bool DataContainerGridModel::canDropMimeData(const QMimeData* data, Qt::DropActi
 // -----------------------------------------------------------------------------
 bool DataContainerGridModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent)
 {
-  //QModelIndex targetIndex = index(row, column, parent);
+  // QModelIndex targetIndex = index(row, column, parent);
   if(!parent.isValid())
   {
     return false;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
index d0ce1b5c10..3da4169231 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
@@ -227,7 +227,7 @@ void DataContainerGridSelectionWidget::increaseDepth()
 {
   int depth = m_GridModel->getCurrentDepth() + 1;
   m_GridModel->setCurrentDepth(depth);
-  
+
   checkDepth();
 }
 
@@ -238,7 +238,7 @@ void DataContainerGridSelectionWidget::decreaseDepth()
 {
   int depth = m_GridModel->getCurrentDepth() - 1;
   m_GridModel->setCurrentDepth(depth);
- 
+
   checkDepth();
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index 705f7cb40a..2358ca7e89 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerReaderWidget.h"
 
@@ -110,7 +110,8 @@ void removeNonExistantChildren(QStandardItem* parent, const QStringList& possibl
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> QStandardItem* getColumnItem(QStandardItem* parent, QString name, T& proxy)
+template <typename T>
+QStandardItem* getColumnItem(QStandardItem* parent, QString name, T& proxy)
 {
   QStandardItem* item = nullptr;
   QList<QStandardItem*> items = findChildItems(parent, name);
@@ -139,7 +140,8 @@ template <typename T> QStandardItem* getColumnItem(QStandardItem* parent, QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-template <typename T> QStandardItem* updateProxyItem(QStandardItem* parent, QString name, T& proxy)
+template <typename T>
+QStandardItem* updateProxyItem(QStandardItem* parent, QString name, T& proxy)
 {
   QStandardItem* item = nullptr;
   if(nullptr == parent)
@@ -365,7 +367,6 @@ void DataContainerReaderWidget::setupGui()
 
     emit parametersChanged();
   }
-
 }
 
 // -----------------------------------------------------------------------------
@@ -395,11 +396,11 @@ void DataContainerReaderWidget::setupMenuField()
     m_ShowFileAction = new QAction(lineEditMenu);
     m_ShowFileAction->setObjectName(QString::fromUtf8("showFileAction"));
 #if defined(Q_OS_WIN)
-  m_ShowFileAction->setText("Show in Windows Explorer");
+    m_ShowFileAction->setText("Show in Windows Explorer");
 #elif defined(Q_OS_MAC)
-  m_ShowFileAction->setText("Show in Finder");
+    m_ShowFileAction->setText("Show in Finder");
 #else
-  m_ShowFileAction->setText("Show in File System");
+    m_ShowFileAction->setText("Show in File System");
 #endif
     lineEditMenu->addAction(m_ShowFileAction);
     connect(m_ShowFileAction, SIGNAL(triggered()), this, SLOT(showFileInFileSystem()));
@@ -413,8 +414,6 @@ void DataContainerReaderWidget::setupMenuField()
   {
     m_ShowFileAction->setDisabled(true);
   }
-
-
 }
 
 // -----------------------------------------------------------------------------
@@ -607,7 +606,6 @@ void DataContainerReaderWidget::afterPreflight()
   updateModelFromProxy(p);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -617,7 +615,7 @@ void DataContainerReaderWidget::checkFilePath(const QString& text)
   QString path = validator->convertToAbsolutePath(text);
 
   QFileInfo fi(text);
-  if (fi.isRelative())
+  if(fi.isRelative())
   {
     absPathLabel->setText(path);
     absPathLabel->show();
@@ -701,15 +699,15 @@ void DataContainerReaderWidget::updateStylingForPath(const QString& text)
   }
 
   SVStyle* style = SVStyle::Instance();
-  
-  if (text != m_CurrentText)
+
+  if(text != m_CurrentText)
   {
     style->LineEditBackgroundErrorStyle(m_LineEdit);
     m_LineEdit->setToolTip("Press the 'Return' key to apply your changes");
   }
   else
   {
-  style->LineEditClearStyle(m_LineEdit);
+    style->LineEditClearStyle(m_LineEdit);
     m_LineEdit->setToolTip("");
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 946ce355af..416cead611 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -56,93 +55,96 @@ class QtSFSDropLabel;
 class QAction;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataContainerReaderWidget : public FilterParameterWidget, private Ui::DataContainerReaderWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataContainerReaderWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    /**
-     * @brief DataContainerReaderWidget
-     * @param parent
-     */
-    DataContainerReaderWidget(QWidget* parent = nullptr);
-
-    ~DataContainerReaderWidget() override;
-
-    void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    void setFilter(AbstractFilter* value);
-    AbstractFilter* getFilter() const;
-
-    void setFilterParameter(FilterParameter* value);
-    FilterParameter* getFilterParameter() const;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-    void itemActivated(const QModelIndex& index);
-
-
-    void on_m_LineEdit_fileDropped(const QString& text);
-    void on_m_LineEdit_editingFinished();
-    void on_m_LineEdit_textChanged(const QString& text);
-    void on_m_LineEdit_returnPressed();
-
-    void on_selectBtn_clicked();
-    void on_dcaProxyView_updatePreviewWidget(const QModelIndex& index);
-
-  protected:
-    void updateProxyFromModel();
-
-    void checkFilePath(const QString& text);
-    void updateDCAProxy(const QString& text);
-    void updateStylingForPath(const QString& text);
-
-    void updateModelFromProxy(DataContainerArrayProxy& proxy);
-    void updateProxyFromProxy(DataContainerArrayProxy& current, DataContainerArrayProxy& incoming);
-
-    static void setOpenDialogLastFilePath(QString val) { m_OpenDialogLastFilePath = val; }
-    static QString getOpenDialogLastFilePath() { return m_OpenDialogLastFilePath; }
-
-    /**
-     * @brief setupMenuField
-     */
-    void setupMenuField();
-
-  protected slots:
-
-
-  private:
-    static QString                       m_OpenDialogLastFilePath;
-    DataContainerReader*                 m_Filter = nullptr;
-    QString                              m_CurrentText = "";
-    DataContainerReaderFilterParameter*  m_FilterParameter;
-    DataContainerArrayProxy              m_DcaProxy;
-    bool                                 m_DidCausePreflight;
-    QAction*                             m_ShowFileAction = nullptr;
-
-  public:
-    DataContainerReaderWidget(const DataContainerReaderWidget&) = delete; // Copy Constructor Not Implemented
-    DataContainerReaderWidget(DataContainerReaderWidget&&) = delete;      // Move Constructor Not Implemented
-    DataContainerReaderWidget& operator=(const DataContainerReaderWidget&) = delete; // Copy Assignment Not Implemented
-    DataContainerReaderWidget& operator=(DataContainerReaderWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataContainerReaderWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  /**
+   * @brief DataContainerReaderWidget
+   * @param parent
+   */
+  DataContainerReaderWidget(QWidget* parent = nullptr);
+
+  ~DataContainerReaderWidget() override;
+
+  void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  void setFilter(AbstractFilter* value);
+  AbstractFilter* getFilter() const;
+
+  void setFilterParameter(FilterParameter* value);
+  FilterParameter* getFilterParameter() const;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+  void itemActivated(const QModelIndex& index);
+
+  void on_m_LineEdit_fileDropped(const QString& text);
+  void on_m_LineEdit_editingFinished();
+  void on_m_LineEdit_textChanged(const QString& text);
+  void on_m_LineEdit_returnPressed();
+
+  void on_selectBtn_clicked();
+  void on_dcaProxyView_updatePreviewWidget(const QModelIndex& index);
+
+protected:
+  void updateProxyFromModel();
+
+  void checkFilePath(const QString& text);
+  void updateDCAProxy(const QString& text);
+  void updateStylingForPath(const QString& text);
+
+  void updateModelFromProxy(DataContainerArrayProxy& proxy);
+  void updateProxyFromProxy(DataContainerArrayProxy& current, DataContainerArrayProxy& incoming);
+
+  static void setOpenDialogLastFilePath(QString val)
+  {
+    m_OpenDialogLastFilePath = val;
+  }
+  static QString getOpenDialogLastFilePath()
+  {
+    return m_OpenDialogLastFilePath;
+  }
+
+  /**
+   * @brief setupMenuField
+   */
+  void setupMenuField();
+
+protected slots:
+
+private:
+  static QString m_OpenDialogLastFilePath;
+  DataContainerReader* m_Filter = nullptr;
+  QString m_CurrentText = "";
+  DataContainerReaderFilterParameter* m_FilterParameter;
+  DataContainerArrayProxy m_DcaProxy;
+  bool m_DidCausePreflight;
+  QAction* m_ShowFileAction = nullptr;
+
+public:
+  DataContainerReaderWidget(const DataContainerReaderWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerReaderWidget(DataContainerReaderWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerReaderWidget& operator=(const DataContainerReaderWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerReaderWidget& operator=(DataContainerReaderWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 419885e140..300a59d6c8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataContainerSelectionWidget.h"
 
-
-
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
@@ -110,15 +107,15 @@ void DataContainerSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &DataContainerSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedDataContainerPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedDataContainerPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedDataContainerPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedDataContainerPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
   connect(m_SelectedDataContainerPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedDataContainerPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedDataContainerPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -221,7 +218,10 @@ void DataContainerSelectionWidget::setSelectedPath(const QString& path)
 // -----------------------------------------------------------------------------
 void DataContainerSelectionWidget::setSelectedPath(const DataArrayPath& dcPath)
 {
-  if (dcPath.isEmpty()) { return; }
+  if(dcPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedDataContainerPath->setDataArrayPath(dcPath);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index 8e11a3987e..c2be027ecf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -1,44 +1,43 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -53,81 +52,77 @@
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DataContainerSelectionWidget : public FilterParameterWidget, private Ui::DataContainerSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    DataContainerSelectionWidget(QWidget* parent = nullptr);
-
-    ~DataContainerSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(const QString& current, const QString& filtDcName);
-
-    /**
-     * @brief initializeWidget
-     * @param parameter
-     * @param filter
-     */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void dataContainerSelected(QString path);
-
-  protected slots:
-    void updateDataArrayPath(const QString &propertyName, const DataArrayPath::RenameType& renamePath);
-
-  private:
-
-    bool m_DidCausePreflight;
-
-    DataContainerSelectionFilterParameter* m_FilterParameter;
-
-    void setSelectedPath(const QString& path);
-
-    void setSelectedPath(const DataArrayPath& dcPath);
-
-  public:
-    DataContainerSelectionWidget(const DataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    DataContainerSelectionWidget(DataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    DataContainerSelectionWidget& operator=(const DataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    DataContainerSelectionWidget& operator=(DataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  DataContainerSelectionWidget(QWidget* parent = nullptr);
+
+  ~DataContainerSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(const QString& current, const QString& filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void dataContainerSelected(QString path);
+
+protected slots:
+  void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  bool m_DidCausePreflight;
+
+  DataContainerSelectionFilterParameter* m_FilterParameter;
+
+  void setSelectedPath(const QString& path);
+
+  void setSelectedPath(const DataArrayPath& dcPath);
+
+public:
+  DataContainerSelectionWidget(const DataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerSelectionWidget(DataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerSelectionWidget& operator=(const DataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerSelectionWidget& operator=(DataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index c8a9a15880..69da31c216 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DoubleWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
index 002e4b0476..ca4cfc4c31 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_DoubleWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DoubleWidget : public FilterParameterWidget, private Ui::DoubleWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DoubleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~DoubleWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);// when something in the widget changes
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    DoubleFilterParameter* m_FilterParameter;
-
-  public:
-    DoubleWidget(const DoubleWidget&) = delete;   // Copy Constructor Not Implemented
-    DoubleWidget(DoubleWidget&&) = delete;        // Move Constructor Not Implemented
-    DoubleWidget& operator=(const DoubleWidget&) = delete; // Copy Assignment Not Implemented
-    DoubleWidget& operator=(DoubleWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DoubleWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~DoubleWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);                  // when something in the widget changes
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  DoubleFilterParameter* m_FilterParameter;
+
+public:
+  DoubleWidget(const DoubleWidget&) = delete;            // Copy Constructor Not Implemented
+  DoubleWidget(DoubleWidget&&) = delete;                 // Move Constructor Not Implemented
+  DoubleWidget& operator=(const DoubleWidget&) = delete; // Copy Assignment Not Implemented
+  DoubleWidget& operator=(DoubleWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index 171f8099a6..b906fcae68 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicChoiceWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index ef907d1e70..84f81d6b0d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -51,53 +50,48 @@
 class DynamicChoiceFilterParameter;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DynamicChoiceWidget : public FilterParameterWidget, private Ui::DynamicChoiceWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DynamicChoiceWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~DynamicChoiceWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-
-    void setFilterParameter(FilterParameter* value);
-    FilterParameter* getFilterParameter() const;
-
-  public slots:
-    void widgetChanged(int index);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-    void updateComboBox();
-
-  private:
-
-    DynamicChoiceFilterParameter*  m_FilterParameter;
-    bool m_DidCausePreflight;
-
-  public:
-    DynamicChoiceWidget(const DynamicChoiceWidget&) = delete; // Copy Constructor Not Implemented
-    DynamicChoiceWidget(DynamicChoiceWidget&&) = delete;      // Move Constructor Not Implemented
-    DynamicChoiceWidget& operator=(const DynamicChoiceWidget&) = delete; // Copy Assignment Not Implemented
-    DynamicChoiceWidget& operator=(DynamicChoiceWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DynamicChoiceWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~DynamicChoiceWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  void setFilterParameter(FilterParameter* value);
+  FilterParameter* getFilterParameter() const;
+
+public slots:
+  void widgetChanged(int index);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+  void updateComboBox();
+
+private:
+  DynamicChoiceFilterParameter* m_FilterParameter;
+  bool m_DidCausePreflight;
+
+public:
+  DynamicChoiceWidget(const DynamicChoiceWidget&) = delete;            // Copy Constructor Not Implemented
+  DynamicChoiceWidget(DynamicChoiceWidget&&) = delete;                 // Move Constructor Not Implemented
+  DynamicChoiceWidget& operator=(const DynamicChoiceWidget&) = delete; // Copy Assignment Not Implemented
+  DynamicChoiceWidget& operator=(DynamicChoiceWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
index a4ce5d6377..9ff79d3381 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DynamicTableItemDelegate.h"
 #include <QtWidgets/QLineEdit>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
index 05ac9cbae7..30dadbabe4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,23 +43,22 @@
 
 class DynamicTableItemDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    explicit DynamicTableItemDelegate(QObject* parent = nullptr);
+public:
+  explicit DynamicTableItemDelegate(QObject* parent = nullptr);
 
-    ~DynamicTableItemDelegate() override;
+  ~DynamicTableItemDelegate() override;
 
-  protected:
-    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
-    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
-    void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+protected:
+  QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+  void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+  void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-  public:
-    DynamicTableItemDelegate(const DynamicTableItemDelegate&) = delete; // Copy Constructor Not Implemented
-    DynamicTableItemDelegate(DynamicTableItemDelegate&&) = delete;      // Move Constructor Not Implemented
-    DynamicTableItemDelegate& operator=(const DynamicTableItemDelegate&) = delete; // Copy Assignment Not Implemented
-    DynamicTableItemDelegate& operator=(DynamicTableItemDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  DynamicTableItemDelegate(const DynamicTableItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  DynamicTableItemDelegate(DynamicTableItemDelegate&&) = delete;                 // Move Constructor Not Implemented
+  DynamicTableItemDelegate& operator=(const DynamicTableItemDelegate&) = delete; // Copy Assignment Not Implemented
+  DynamicTableItemDelegate& operator=(DynamicTableItemDelegate&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 97d2d07027..b78b083616 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DynamicTableWidget.h"
 
 #include <QtWidgets/QMessageBox>
@@ -49,7 +49,6 @@
 #include "SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-
 const QString addRowTT = "Adds a row to the table.";
 const QString addColTT = "Adds a column to the table.";
 const QString deleteRowTT = "Removes the currently selected row from the table.";
@@ -59,7 +58,7 @@ const QString deleteColTT = "Removes the currently selected column from the tabl
 //
 // -----------------------------------------------------------------------------
 DynamicTableWidget::DynamicTableWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
-  : FilterParameterWidget(parameter, filter, parent)
+: FilterParameterWidget(parameter, filter, parent)
 {
   m_FilterParameter = dynamic_cast<DynamicTableFilterParameter*>(parameter);
   Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DynamicTableWidget can ONLY be used with a DynamicTableFilterParameter object");
@@ -145,7 +144,6 @@ void DynamicTableWidget::setupGui()
 void DynamicTableWidget::updateButtonStyles()
 {
   // Set Style
-
 }
 // -----------------------------------------------------------------------------
 //
@@ -420,18 +418,18 @@ void DynamicTableWidget::populateTable()
     // Populate table with filter values
     int numRows = data.getNumRows();
     int numCols = data.getNumCols();
-    if (data.getDefaultRowCount() > numRows)
+    if(data.getDefaultRowCount() > numRows)
     {
       numRows = data.getDefaultRowCount();
-      if (data.getMinRows() > numRows)
+      if(data.getMinRows() > numRows)
       {
         numRows = data.getMinRows();
       }
     }
-    if (data.getDefaultColCount() > numCols)
+    if(data.getDefaultColCount() > numCols)
     {
       numCols = data.getDefaultColCount();
-      if (data.getMinCols() > numCols)
+      if(data.getMinCols() > numCols)
       {
         numCols = data.getMinCols();
       }
@@ -447,7 +445,7 @@ void DynamicTableWidget::populateTable()
         }
 
         QTableWidgetItem* item;
-        if (row >= tableData.size() || col >= tableData[row].size())
+        if(row >= tableData.size() || col >= tableData[row].size())
         {
           item = new QTableWidgetItem("0");
         }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index 8e60e4153e..40dda16424 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -51,70 +50,67 @@ class DynamicTableFilterParameter;
 class DynamicTableItemDelegate;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT DynamicTableWidget : public FilterParameterWidget, private Ui::DynamicTableWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DynamicTableWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~DynamicTableWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-
-    void setFilterParameter(FilterParameter* value);
-    FilterParameter* getFilterParameter() const;
-
-    std::vector<std::vector<double> > getData();
-
-    void updateButtonStyles();
-
-  public slots:
-    void on_dynamicTable_cellChanged(int row, int col);
-    void on_addRowBtn_clicked();
-    void on_deleteRowBtn_clicked();
-    void on_addColBtn_clicked();
-    void on_deleteColBtn_clicked();
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-
-    DynamicTableFilterParameter*  m_FilterParameter;
-    DynamicTableItemDelegate*     m_ItemDelegate = nullptr;
-    bool m_DidCausePreflight;
-
-    void populateTable();
-    void populateHeaders();
-    void renumberDynamicHeaders();
-    void updateDynamicButtons();
-
-  public:
-    DynamicTableWidget(const DynamicTableWidget&) = delete; // Copy Constructor Not Implemented
-    DynamicTableWidget(DynamicTableWidget&&) = delete;      // Move Constructor Not Implemented
-    DynamicTableWidget& operator=(const DynamicTableWidget&) = delete; // Copy Assignment Not Implemented
-    DynamicTableWidget& operator=(DynamicTableWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DynamicTableWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~DynamicTableWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  void setFilterParameter(FilterParameter* value);
+  FilterParameter* getFilterParameter() const;
+
+  std::vector<std::vector<double>> getData();
+
+  void updateButtonStyles();
+
+public slots:
+  void on_dynamicTable_cellChanged(int row, int col);
+  void on_addRowBtn_clicked();
+  void on_deleteRowBtn_clicked();
+  void on_addColBtn_clicked();
+  void on_deleteColBtn_clicked();
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  DynamicTableFilterParameter* m_FilterParameter;
+  DynamicTableItemDelegate* m_ItemDelegate = nullptr;
+  bool m_DidCausePreflight;
+
+  void populateTable();
+  void populateHeaders();
+  void renumberDynamicHeaders();
+  void updateDynamicButtons();
+
+public:
+  DynamicTableWidget(const DynamicTableWidget&) = delete;            // Copy Constructor Not Implemented
+  DynamicTableWidget(DynamicTableWidget&&) = delete;                 // Move Constructor Not Implemented
+  DynamicTableWidget& operator=(const DynamicTableWidget&) = delete; // Copy Assignment Not Implemented
+  DynamicTableWidget& operator=(DynamicTableWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index c23beeca8d..0f9656e6de 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -132,7 +132,7 @@ void FileListInfoWidget::setupGui()
     emit parametersChanged();
   });
 
-//  validateInputFile();
+  //  validateInputFile();
   getGuiParametersFromFilter();
 }
 
@@ -363,7 +363,7 @@ void FileListInfoWidget::inputDir_textChanged(const QString& text)
   QString inputPath = validator->convertToAbsolutePath(text);
 
   QFileInfo fi(text);
-  if (fi.isRelative())
+  if(fi.isRelative())
   {
     m_Ui->absPathLabel->setText(inputPath);
     m_Ui->absPathLabel->show();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 97a606f775..05610fc05c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -169,9 +169,8 @@ protected slots:
   void connectSignalsSlots();
 
 public:
-  FileListInfoWidget(const FileListInfoWidget&) = delete; // Copy Constructor Not Implemented
-  FileListInfoWidget(FileListInfoWidget&&) = delete;      // Move Constructor Not Implemented
+  FileListInfoWidget(const FileListInfoWidget&) = delete;            // Copy Constructor Not Implemented
+  FileListInfoWidget(FileListInfoWidget&&) = delete;                 // Move Constructor Not Implemented
   FileListInfoWidget& operator=(const FileListInfoWidget&) = delete; // Copy Assignment Not Implemented
   FileListInfoWidget& operator=(FileListInfoWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 116a6a25db..9b7b89b40e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -58,7 +58,7 @@ namespace detail
 {
 static const float Max = 1.0;
 static const int Duration = 400;
-}
+} // namespace detail
 
 // -----------------------------------------------------------------------------
 //
@@ -156,10 +156,10 @@ void FilterParameterWidget::setupGui()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString FilterParameterWidget::wrapStringInHtml(const QString &message)
+QString FilterParameterWidget::wrapStringInHtml(const QString& message)
 {
   QString html;
-  QTextStream ss (&html);
+  QTextStream ss(&html);
   ss << "<html><head></head>\n";
   ss << "<body>\n";
   ss << "<b>" << message << "</b>\n";
@@ -200,7 +200,7 @@ void FilterParameterWidget::changeStyleSheet(Style style)
     ss << "color: rgb(200, 50, 50); font: bold;";
     ss << "font: bold;";
 
-    //ss << "background-color: rgb(230, 150, 150);";
+    // ss << "background-color: rgb(230, 150, 150);";
   }
   else if(style == Style::FS_WARNING_STYLE)
   {
@@ -435,7 +435,7 @@ void FilterParameterWidget::showFileInFileSystem()
 {
   QFileInfo fi(m_CurrentlyValidPath);
   QString path;
-  if (fi.isFile())
+  if(fi.isFile())
   {
     path = fi.absoluteFilePath();
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index b57e3fac10..be98bd44bc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +41,6 @@
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QFrame>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -52,10 +51,9 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-
 namespace Detail
 {
-  const QString Delimiter(" / ");
+const QString Delimiter(" / ");
 }
 
 class AbstractFilter;
@@ -70,132 +68,131 @@ class QLineEdit;
  */
 class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
 {
-    Q_OBJECT
-  public:
-    FilterParameterWidget(QWidget* parent = nullptr);
-    FilterParameterWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~FilterParameterWidget() override;
-
-    using EnumType = unsigned int;
-
-    enum class Style : EnumType
-    {
-      FS_STANDARD_STYLE = 0,
-      FS_DRAGGING_STYLE = 1,
-      FS_DOESNOTEXIST_STYLE = 2,
-      FS_WARNING_STYLE = 3
-    };
-
-    /**
-     * @brief Setter property for Filter
-     */
-    void setFilter(AbstractFilter* value);
-    /**
-     * @brief Getter property for Filter
-     * @return Value of Filter
-     */
-    AbstractFilter* getFilter() const;
-
-    /**
-     * @brief Setter property for FilterParameter
-     */
-    void setFilterParameter(FilterParameter* value);
-    /**
-     * @brief Getter property for FilterParameter
-     * @return Value of FilterParameter
-     */
-    FilterParameter* getFilterParameter() const;
-
-    /**
-     * @brief Setter property for WidgetIsExpanding
-     */
-    virtual void setWidgetIsExpanding(bool value);
-    virtual bool isWidgetExpanding() const;
-
-    void setValidFilePath(const QString& filePath);
-
-    void fadeInWidget(QWidget* widget);
-
-    QPointer<QtSFaderWidget> getFaderWidget() const;
-    void setFaderWidget(QPointer<QtSFaderWidget> faderWidget);
-
-    virtual void setupGui();
-
-    QString wrapStringInHtml(const QString& message);
-
-    virtual void changeStyleSheet(Style style);
-
-  signals:
-    void filterPath(DataArrayPath path);
-    void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
-    void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
-    void viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
-    void endViewPaths();
-    void filterPathInput(DataArrayPath);
-    void endViewPathRequirements();
-    void endDataStructureRequirements();
-    void applyPathToFilteringParameter(DataArrayPath path);
-    void dataArrayPathSelectionLocked(QToolButton* selection);
-    void dataArrayPathSelectionUnlocked(QToolButton* button);
-    void lockDataArrayPathSelection(QToolButton* selection);
-    void unlockDataArrayPathSelection(QToolButton* button);
-    void errorSettingFilterParameter(const QString& msg);
-    void parametersChanged(bool preflight = true);
-
-  public slots:
-
-    void setLinkedConditionalState(int state);
-    void setLinkedComboBoxState(int groupId);
-
-    void fadeWidget(QWidget* widget, bool in);
-    void animationFinished();
-
-    /**
-     * @brief showFileInFileSystem
-     */
-    virtual void showFileInFileSystem();
-
-    /**
-     * @brief loadData
-     */
-    virtual void loadData();
-
-  protected:
-
-    /**
-     * @brief adjustedMenuPosition
-     * @param pushButton
-     * @return
-     */
-    QPoint adjustedMenuPosition(QToolButton *pushButton);
-
-  protected slots:
-    void showBorder();
-    void hideBorder();
-
-  private:
-    bool m_WidgetIsExpanding = {};
-
-    AbstractFilter* m_Filter = nullptr;
-    FilterParameter* m_FilterParameter = nullptr;
-
-    QPointer<QtSFaderWidget>         m_FaderWidget;
-
-    float startValue;
-    float endValue;
-    bool fadeIn;
-
-    QTimer*                       m_Timer = nullptr;
-    QPropertyAnimation*           animation;
-    QGraphicsOpacityEffect*       effect;
-    QString                       m_CurrentlyValidPath;
-
-  public:
-    FilterParameterWidget(const FilterParameterWidget&) = delete; // Copy Constructor Not Implemented
-    FilterParameterWidget(FilterParameterWidget&&) = delete;      // Move Constructor Not Implemented
-    FilterParameterWidget& operator=(const FilterParameterWidget&) = delete; // Copy Assignment Not Implemented
-    FilterParameterWidget& operator=(FilterParameterWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  FilterParameterWidget(QWidget* parent = nullptr);
+  FilterParameterWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~FilterParameterWidget() override;
+
+  using EnumType = unsigned int;
+
+  enum class Style : EnumType
+  {
+    FS_STANDARD_STYLE = 0,
+    FS_DRAGGING_STYLE = 1,
+    FS_DOESNOTEXIST_STYLE = 2,
+    FS_WARNING_STYLE = 3
+  };
+
+  /**
+   * @brief Setter property for Filter
+   */
+  void setFilter(AbstractFilter* value);
+  /**
+   * @brief Getter property for Filter
+   * @return Value of Filter
+   */
+  AbstractFilter* getFilter() const;
+
+  /**
+   * @brief Setter property for FilterParameter
+   */
+  void setFilterParameter(FilterParameter* value);
+  /**
+   * @brief Getter property for FilterParameter
+   * @return Value of FilterParameter
+   */
+  FilterParameter* getFilterParameter() const;
+
+  /**
+   * @brief Setter property for WidgetIsExpanding
+   */
+  virtual void setWidgetIsExpanding(bool value);
+  virtual bool isWidgetExpanding() const;
+
+  void setValidFilePath(const QString& filePath);
+
+  void fadeInWidget(QWidget* widget);
+
+  QPointer<QtSFaderWidget> getFaderWidget() const;
+  void setFaderWidget(QPointer<QtSFaderWidget> faderWidget);
+
+  virtual void setupGui();
+
+  QString wrapStringInHtml(const QString& message);
+
+  virtual void changeStyleSheet(Style style);
+
+signals:
+  void filterPath(DataArrayPath path);
+  void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
+  void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
+  void viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
+  void endViewPaths();
+  void filterPathInput(DataArrayPath);
+  void endViewPathRequirements();
+  void endDataStructureRequirements();
+  void applyPathToFilteringParameter(DataArrayPath path);
+  void dataArrayPathSelectionLocked(QToolButton* selection);
+  void dataArrayPathSelectionUnlocked(QToolButton* button);
+  void lockDataArrayPathSelection(QToolButton* selection);
+  void unlockDataArrayPathSelection(QToolButton* button);
+  void errorSettingFilterParameter(const QString& msg);
+  void parametersChanged(bool preflight = true);
+
+public slots:
+
+  void setLinkedConditionalState(int state);
+  void setLinkedComboBoxState(int groupId);
+
+  void fadeWidget(QWidget* widget, bool in);
+  void animationFinished();
+
+  /**
+   * @brief showFileInFileSystem
+   */
+  virtual void showFileInFileSystem();
+
+  /**
+   * @brief loadData
+   */
+  virtual void loadData();
+
+protected:
+  /**
+   * @brief adjustedMenuPosition
+   * @param pushButton
+   * @return
+   */
+  QPoint adjustedMenuPosition(QToolButton* pushButton);
+
+protected slots:
+  void showBorder();
+  void hideBorder();
+
+private:
+  bool m_WidgetIsExpanding = {};
+
+  AbstractFilter* m_Filter = nullptr;
+  FilterParameter* m_FilterParameter = nullptr;
+
+  QPointer<QtSFaderWidget> m_FaderWidget;
+
+  float startValue;
+  float endValue;
+  bool fadeIn;
+
+  QTimer* m_Timer = nullptr;
+  QPropertyAnimation* animation;
+  QGraphicsOpacityEffect* effect;
+  QString m_CurrentlyValidPath;
+
+public:
+  FilterParameterWidget(const FilterParameterWidget&) = delete;            // Copy Constructor Not Implemented
+  FilterParameterWidget(FilterParameterWidget&&) = delete;                 // Move Constructor Not Implemented
+  FilterParameterWidget& operator=(const FilterParameterWidget&) = delete; // Copy Assignment Not Implemented
+  FilterParameterWidget& operator=(FilterParameterWidget&&) = delete;      // Move Assignment Not Implemented
 };
 
 // -----------------------------------------------------------------------------
@@ -206,24 +203,22 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
  * the code into 3 different locations
  */
 
-#define FOPW_SETUP_WIDGET(cell)\
-  connect(cell, SIGNAL(textChanged(const QString&)),\
-          this, SLOT(widgetChanged(const QString&) ) );\
-  QDoubleValidator* cell##Val = new QDoubleValidator(cell);\
-  cell##Val->setLocale(loc);\
+#define FOPW_SETUP_WIDGET(cell)                                                                                                                                                                        \
+  connect(cell, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));                                                                                                       \
+  QDoubleValidator* cell##Val = new QDoubleValidator(cell);                                                                                                                                            \
+  cell##Val->setLocale(loc);                                                                                                                                                                           \
   cell->setValidator(cell##Val);
 
-
-#define FOPW_CHECK_LINEEDIT(cell)\
-{\
-  if(sender() == cell && cell->text().isEmpty())\
-  {\
-    SVStyle::Instance()->LineEditErrorStyle(cell);\
-    SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);\
-    errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());\
-    errorLabel->show();\
-  }\
-}
+#define FOPW_CHECK_LINEEDIT(cell)                                                                                                                                                                      \
+  {                                                                                                                                                                                                    \
+    if(sender() == cell && cell->text().isEmpty())                                                                                                                                                     \
+    {                                                                                                                                                                                                  \
+      SVStyle::Instance()->LineEditErrorStyle(cell);                                                                                                                                                   \
+      SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);                                                                                                                                        \
+      errorLabel->setText("No value entered. Filter will use default value of " + getFilterParameter()->getDefaultValue().toString());                                                                 \
+      errorLabel->show();                                                                                                                                                                              \
+    }                                                                                                                                                                                                  \
+  }
 
 #define FOPW_EXTRACT_VALUE(cell)                                                                                                                                                                       \
   data.cell = loc.toFloat(cell->text(), &ok);                                                                                                                                                          \
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
old mode 100755
new mode 100644
index 17e5cee8f6..61b301af67
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -21,304 +21,315 @@
  */
 class FilterParameterWidgetUtils
 {
-  public:
-
-    /**
-     * @brief PopulateDataContainerComboBox
-     * @param filter
-     * @param filterParameter
-     * @param dcCombo
-     * @param dcaProxy
-     */
-    template<typename FilterParameterType>
-    static void PopulateDataContainerComboBox(AbstractFilter* filter, FilterParameter* filterParameter,
-                                              QComboBox* dcCombo, DataContainerArrayProxy& dcaProxy)
+public:
+  /**
+   * @brief PopulateDataContainerComboBox
+   * @param filter
+   * @param filterParameter
+   * @param dcCombo
+   * @param dcaProxy
+   */
+  template <typename FilterParameterType>
+  static void PopulateDataContainerComboBox(AbstractFilter* filter, FilterParameter* filterParameter, QComboBox* dcCombo, DataContainerArrayProxy& dcaProxy)
+  {
+    FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
+    assert(fp != nullptr);
+    DataContainerArray::Pointer dca = filter->getDataContainerArray();
+    // Populate the DataContainerArray Combo Box with all the DataContainers
+    QList<DataContainerProxy> dcList = dcaProxy.getDataContainers().values();
+    QListIterator<DataContainerProxy> iter(dcList);
+    dcCombo->clear();
+    IGeometry::Types geomTypes = fp->getDefaultGeometryTypes();
+    while(iter.hasNext())
     {
-      FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
-      assert(fp != nullptr);
-      DataContainerArray::Pointer dca = filter->getDataContainerArray();
-      // Populate the DataContainerArray Combo Box with all the DataContainers
-      QList<DataContainerProxy> dcList = dcaProxy.getDataContainers().values();
-      QListIterator<DataContainerProxy> iter(dcList);
-      dcCombo->clear();
-      IGeometry::Types geomTypes = fp->getDefaultGeometryTypes();
-      while(iter.hasNext() )
+      DataContainerProxy dcProxy = iter.next();
+      DataContainer::Pointer dc = dca->getDataContainer(dcProxy.getName());
+      IGeometry::Pointer geom = IGeometry::NullPointer();
+      IGeometry::Type geomType = IGeometry::Type::Unknown;
+      if(nullptr != dc.get())
+      {
+        geom = dc->getGeometry();
+      }
+      if(nullptr != geom.get())
       {
-        DataContainerProxy dcProxy = iter.next();
-        DataContainer::Pointer dc = dca->getDataContainer(dcProxy.getName());
-        IGeometry::Pointer geom = IGeometry::NullPointer();
-        IGeometry::Type geomType = IGeometry::Type::Unknown;
-        if (nullptr != dc.get()) { geom = dc->getGeometry(); }
-        if (nullptr != geom.get()) { geomType = geom->getGeometryType(); }
-        dcCombo->addItem(dcProxy.getName());
+        geomType = geom->getGeometryType();
+      }
+      dcCombo->addItem(dcProxy.getName());
 
-        if(!geomTypes.isEmpty())
+      if(!geomTypes.isEmpty())
+      {
+        if(!geomTypes.contains(geomType))
         {
-          if(!geomTypes.contains(geomType))
+          QStandardItemModel* model = qobject_cast<QStandardItemModel*>(dcCombo->model());
+          if(nullptr != model)
           {
-            QStandardItemModel* model = qobject_cast<QStandardItemModel*>(dcCombo->model());
-            if (nullptr != model)
+            QStandardItem* item = model->item(dcCombo->findText(dcProxy.getName()));
+            if(nullptr != item)
             {
-              QStandardItem* item = model->item(dcCombo->findText(dcProxy.getName()));
-              if (nullptr != item)
-              {
-                item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-              }
+              item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
             }
           }
         }
       }
     }
-
-    /**
-     * @brief PopulateAttributeMatrixComboBox
-     * @param filter
-     * @param filterParameter
-     * @param dcCombo
-     * @param amCombo
-     * @param dcaProxy
-     */
-    template<typename FilterParameterType>
-    static void PopulateAttributeMatrixComboBox(AbstractFilter* filter, FilterParameter* filterParameter,
-                                            QComboBox* dcCombo, QComboBox* amCombo,
-                                            DataContainerArrayProxy& dcaProxy)
+  }
+
+  /**
+   * @brief PopulateAttributeMatrixComboBox
+   * @param filter
+   * @param filterParameter
+   * @param dcCombo
+   * @param amCombo
+   * @param dcaProxy
+   */
+  template <typename FilterParameterType>
+  static void PopulateAttributeMatrixComboBox(AbstractFilter* filter, FilterParameter* filterParameter, QComboBox* dcCombo, QComboBox* amCombo, DataContainerArrayProxy& dcaProxy)
+  {
+    FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
+    assert(fp != nullptr);
+    DataContainerArray::Pointer dca = filter->getDataContainerArray();
+    if(nullptr == dca.get())
     {
-      FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
-      assert(fp != nullptr);
-      DataContainerArray::Pointer dca = filter->getDataContainerArray();
-      if (nullptr == dca.get()) { return; }
+      return;
+    }
 
-      QString dcName = dcCombo->currentText();
+    QString dcName = dcCombo->currentText();
 
-      // Clear the AttributeMatrix List
-      bool alreadyBlocked = false;
-      if(amCombo->signalsBlocked()) { alreadyBlocked = true; }
-      amCombo->blockSignals(true);
-      amCombo->clear();
+    // Clear the AttributeMatrix List
+    bool alreadyBlocked = false;
+    if(amCombo->signalsBlocked())
+    {
+      alreadyBlocked = true;
+    }
+    amCombo->blockSignals(true);
+    amCombo->clear();
+
+    // Loop over the data containers until we find the proper data container
+    QList<DataContainerProxy> containers = dcaProxy.getDataContainers().values();
+    QListIterator<DataContainerProxy> containerIter(containers);
+    QVector<AttributeMatrix::Type> defVec = fp->getDefaultAttributeMatrixTypes();
+    while(containerIter.hasNext())
+    {
+      DataContainerProxy dc = containerIter.next();
 
-      // Loop over the data containers until we find the proper data container
-      QList<DataContainerProxy> containers = dcaProxy.getDataContainers().values();
-      QListIterator<DataContainerProxy> containerIter(containers);
-      QVector<AttributeMatrix::Type> defVec = fp->getDefaultAttributeMatrixTypes();
-      while(containerIter.hasNext())
+      if(dc.getName() == dcName)
       {
-        DataContainerProxy dc = containerIter.next();
-
-        if(dc.getName() == dcName)
+        // We found the proper Data Container, now populate the AttributeMatrix List
+        QMap<QString, AttributeMatrixProxy> attrMats = dc.getAttributeMatricies();
+        QMapIterator<QString, AttributeMatrixProxy> attrMatsIter(attrMats);
+        while(attrMatsIter.hasNext())
         {
-          // We found the proper Data Container, now populate the AttributeMatrix List
-          QMap<QString, AttributeMatrixProxy> attrMats = dc.getAttributeMatricies();
-          QMapIterator<QString, AttributeMatrixProxy> attrMatsIter(attrMats);
-          while(attrMatsIter.hasNext() )
-          {
-            attrMatsIter.next();
-            QString amName = attrMatsIter.key();
-            AttributeMatrix::Pointer am = dca->getAttributeMatrix(DataArrayPath(dc.getName(), amName, ""));
-            amCombo->addItem(amName);
+          attrMatsIter.next();
+          QString amName = attrMatsIter.key();
+          AttributeMatrix::Pointer am = dca->getAttributeMatrix(DataArrayPath(dc.getName(), amName, ""));
+          amCombo->addItem(amName);
 
-            if(nullptr != am.get() && !defVec.isEmpty() && !defVec.contains(am->getType()))
+          if(nullptr != am.get() && !defVec.isEmpty() && !defVec.contains(am->getType()))
+          {
+            QStandardItemModel* model = qobject_cast<QStandardItemModel*>(amCombo->model());
+            if(nullptr != model)
             {
-              QStandardItemModel* model = qobject_cast<QStandardItemModel*>(amCombo->model());
-              if (nullptr != model)
+              QStandardItem* item = model->item(amCombo->findText(amName));
+              if(nullptr != item)
               {
-                QStandardItem* item = model->item(amCombo->findText(amName));
-                if (nullptr != item)
-                {
-                  item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-                }
+                item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
               }
             }
           }
         }
       }
-
-      if(!alreadyBlocked) { // Only unblock if this function blocked the signals.
-        amCombo->blockSignals(false);
-      }
     }
 
-
-    /**
-     * @brief PopulateAttributeArrayComboBox
-     * @param filter
-     * @param filterParameter
-     * @param dcCombo
-     * @param amCombo
-     * @param aaCombo
-     * @param dcaProxy
-     */
-    template<typename FilterParameterType>
-    static void PopulateAttributeArrayComboBox(AbstractFilter* filter, FilterParameter* filterParameter,
-                                      QComboBox* dcCombo, QComboBox* amCombo, QComboBox* aaCombo,
-                                      DataContainerArrayProxy& dcaProxy)
+    if(!alreadyBlocked)
+    { // Only unblock if this function blocked the signals.
+      amCombo->blockSignals(false);
+    }
+  }
+
+  /**
+   * @brief PopulateAttributeArrayComboBox
+   * @param filter
+   * @param filterParameter
+   * @param dcCombo
+   * @param amCombo
+   * @param aaCombo
+   * @param dcaProxy
+   */
+  template <typename FilterParameterType>
+  static void PopulateAttributeArrayComboBox(AbstractFilter* filter, FilterParameter* filterParameter, QComboBox* dcCombo, QComboBox* amCombo, QComboBox* aaCombo, DataContainerArrayProxy& dcaProxy)
+  {
+    FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
+    assert(fp != nullptr);
+
+    DataContainerArray::Pointer dca = filter->getDataContainerArray();
+    if(nullptr == dca.get())
     {
-      FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
-      assert(fp != nullptr);
-
-      DataContainerArray::Pointer dca = filter->getDataContainerArray();
-      if (nullptr == dca.get()) { return; }
-      bool alreadyBlocked = false;
-      if(aaCombo->signalsBlocked()) { alreadyBlocked = true; }
-      aaCombo->blockSignals(true);
-      aaCombo->clear();
+      return;
+    }
+    bool alreadyBlocked = false;
+    if(aaCombo->signalsBlocked())
+    {
+      alreadyBlocked = true;
+    }
+    aaCombo->blockSignals(true);
+    aaCombo->clear();
 
-      // Get the selected Data Container Name from the DataContainerList Widget
-      QString currentDCName = dcCombo->currentText();
-      QString currentAttrMatName = amCombo->currentText();
+    // Get the selected Data Container Name from the DataContainerList Widget
+    QString currentDCName = dcCombo->currentText();
+    QString currentAttrMatName = amCombo->currentText();
 
-      // Loop over the data containers until we find the proper data container
-      DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
+    // Loop over the data containers until we find the proper data container
+    DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
 
-      QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
-      std::vector<std::vector<size_t>> cDims = fp->getDefaultComponentDimensions();
-      for(auto& dc : dcMap)
+    QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
+    std::vector<std::vector<size_t>> cDims = fp->getDefaultComponentDimensions();
+    for(auto& dc : dcMap)
+    {
+      if(dc.getName() == currentDCName)
       {
-        if(dc.getName() == currentDCName)
+        // We found the proper Data Container, now populate the AttributeMatrix List
+        DataContainerProxy::StorageType& attrMats = dc.getAttributeMatricies();
+        for(auto& amProxy : attrMats)
         {
-          // We found the proper Data Container, now populate the AttributeMatrix List
-          DataContainerProxy::StorageType& attrMats = dc.getAttributeMatricies();
-          for(auto& amProxy : attrMats)
+          QString amName = amProxy.getName();
+          if(amName.compare(currentAttrMatName) == 0)
           {
-            QString amName = amProxy.getName();
-            if (amName.compare(currentAttrMatName) == 0)
+            // Clear the list of arrays from the QListWidget
+            aaCombo->clear();
+            // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
+            QMap<QString, DataArrayProxy>& dataArrays = amProxy.getDataArrays();
+            for(auto& daProxy : dataArrays)
             {
-              // Clear the list of arrays from the QListWidget
-              aaCombo->clear();
-              // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
-              QMap<QString, DataArrayProxy>& dataArrays = amProxy.getDataArrays();
-              for(auto& daProxy : dataArrays)
-              {
-                QString daName = daProxy.getName();
-                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
-                aaCombo->addItem(daName);
+              QString daName = daProxy.getName();
+              IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
+              aaCombo->addItem(daName);
 
-                if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.empty() && !VectorContains<size_t>(cDims, da->getComponentDimensions()))))
+              if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.empty() && !VectorContains<size_t>(cDims, da->getComponentDimensions()))))
+              {
+                QStandardItemModel* model = qobject_cast<QStandardItemModel*>(aaCombo->model());
+                if(nullptr != model)
                 {
-                  QStandardItemModel* model = qobject_cast<QStandardItemModel*>(aaCombo->model());
-                  if (nullptr != model)
+                  QStandardItem* item = model->item(aaCombo->findText(daName));
+                  if(nullptr != item)
                   {
-                    QStandardItem* item = model->item(aaCombo->findText(daName));
-                    if (nullptr != item)
-                    {
-                      item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-                    }
+                    item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
                   }
                 }
               }
             }
           }
         }
-
-        aaCombo->setCurrentIndex(-1);
-        if(!alreadyBlocked)
-        {
-          aaCombo->blockSignals(false);
-        }
       }
-    }
 
-    // -----------------------------------------------------------------------------
-    template <typename T>
-    static bool VectorContains(const std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
-    {
-      auto pos = std::find(container.begin(), container.end(), comparison);
-      return (pos != container.end());
+      aaCombo->setCurrentIndex(-1);
+      if(!alreadyBlocked)
+      {
+        aaCombo->blockSignals(false);
+      }
     }
-    // -----------------------------------------------------------------------------
-    template <typename T>
-    static bool VectorContains(std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+  }
+
+  // -----------------------------------------------------------------------------
+  template <typename T>
+  static bool VectorContains(const std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+  {
+    auto pos = std::find(container.begin(), container.end(), comparison);
+    return (pos != container.end());
+  }
+  // -----------------------------------------------------------------------------
+  template <typename T>
+  static bool VectorContains(std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
+  {
+    auto pos = std::find(container.begin(), container.end(), comparison);
+    return (pos != container.end());
+  }
+  /**
+   * @brief PopulateAttributeArrayList This method populates a QListWidget with
+   * items representing AttributeArrays
+   * @param filter
+   * @param filterParameter
+   * @param dcCombo
+   * @param amCombo
+   * @param attributeArraysWidget
+   * @param dcaProxy
+   * @param selectedPaths The paths that need to be set to selected
+   */
+  template <typename FilterParameterType, typename WidgetType>
+  static void PopulateAttributeArrayList(AbstractFilter* filter, FilterParameter* filterParameter, QComboBox* dcCombo, QComboBox* amCombo, WidgetType* attributeArraysWidget,
+                                         DataContainerArrayProxy& dcaProxy, const QVector<DataArrayPath>& selectedPaths)
+  {
+    FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
+    assert(fp != nullptr);
+
+    DataContainerArray::Pointer dca = filter->getDataContainerArray();
+    if(nullptr == dca.get())
     {
-      auto pos = std::find(container.begin(), container.end(), comparison);
-      return (pos != container.end());
+      return;
     }
-    /**
-     * @brief PopulateAttributeArrayList This method populates a QListWidget with
-     * items representing AttributeArrays
-     * @param filter
-     * @param filterParameter
-     * @param dcCombo
-     * @param amCombo
-     * @param attributeArraysWidget
-     * @param dcaProxy
-     * @param selectedPaths The paths that need to be set to selected
-     */
-    template <typename FilterParameterType, typename WidgetType>
-    static void PopulateAttributeArrayList(AbstractFilter* filter, FilterParameter* filterParameter, QComboBox* dcCombo, QComboBox* amCombo, WidgetType* attributeArraysWidget,
-                                           DataContainerArrayProxy& dcaProxy, const QVector<DataArrayPath>& selectedPaths)
-    {
-      FilterParameterType* fp = dynamic_cast<FilterParameterType*>(filterParameter);
-      assert(fp != nullptr);
-
-      DataContainerArray::Pointer dca = filter->getDataContainerArray();
-      if (nullptr == dca.get()) { return; }
 
-      attributeArraysWidget->blockSignals(true);
-      attributeArraysWidget->clear();
+    attributeArraysWidget->blockSignals(true);
+    attributeArraysWidget->clear();
 
-      // Get the selected Data Container Name from the DataContainerList Widget
-      QString currentDCName = dcCombo->currentText();
-      QString currentAttrMatName = amCombo->currentText();
+    // Get the selected Data Container Name from the DataContainerList Widget
+    QString currentDCName = dcCombo->currentText();
+    QString currentAttrMatName = amCombo->currentText();
 
-      // Loop over the data containers until we find the proper data container
-      DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
+    // Loop over the data containers until we find the proper data container
+    DataContainerArrayProxy::StorageType& dcMap = dcaProxy.getDataContainers();
 
-      QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
-      QVector< std::vector<size_t> > cDims = fp->getDefaultComponentDimensions();
-      for(auto& dc : dcMap)
+    QVector<QString> daTypes = fp->getDefaultAttributeArrayTypes();
+    QVector<std::vector<size_t>> cDims = fp->getDefaultComponentDimensions();
+    for(auto& dc : dcMap)
+    {
+      if(dc.getName() == currentDCName)
       {
-        if(dc.getName() == currentDCName)
+        // We found the proper Data Container, now populate the AttributeMatrix List
+        DataContainerProxy::StorageType& attrMats = dc.getAttributeMatricies();
+        for(auto& amProxy : attrMats)
         {
-          // We found the proper Data Container, now populate the AttributeMatrix List
-          DataContainerProxy::StorageType& attrMats = dc.getAttributeMatricies();
-          for(auto& amProxy : attrMats)
+          QString amName = amProxy.getName();
+          if(amName == currentAttrMatName)
           {
-            QString amName = amProxy.getName();
-            if(amName == currentAttrMatName)
+            // Clear the list of arrays from the QListWidget
+            attributeArraysWidget->clear();
+            // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
+            QMap<QString, DataArrayProxy>& dataArrays = amProxy.getDataArrays();
+            for(auto& daProxy : dataArrays)
             {
-              // Clear the list of arrays from the QListWidget
-              attributeArraysWidget->clear();
-              // We found the selected AttributeMatrix, so loop over this attribute matrix arrays and populate the list widget
-              QMap<QString, DataArrayProxy>& dataArrays = amProxy.getDataArrays();
-              for(auto& daProxy : dataArrays)
-              {
-                QString daName = daProxy.getName();
-                QListWidgetItem* daItem = new QListWidgetItem(daName);
-                daItem->setCheckState(Qt::Unchecked);
+              QString daName = daProxy.getName();
+              QListWidgetItem* daItem = new QListWidgetItem(daName);
+              daItem->setCheckState(Qt::Unchecked);
 
-                for(const auto& selectedPath : selectedPaths)
+              for(const auto& selectedPath : selectedPaths)
+              {
+                if(selectedPath.getDataArrayName() == daName)
                 {
-                  if(selectedPath.getDataArrayName() == daName)
-                  {
-                    daItem->setCheckState(Qt::Checked);
-                  }
+                  daItem->setCheckState(Qt::Checked);
                 }
+              }
 
-                IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
-                attributeArraysWidget->addItem(daItem);
+              IDataArray::Pointer da = dca->getPrereqIDataArrayFromPath(nullptr, DataArrayPath(dc.getName(), amProxy.getName(), daName));
+              attributeArraysWidget->addItem(daItem);
 
-                if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.isEmpty() && !cDims.contains(da->getComponentDimensions()))))
+              if(nullptr != da.get() && ((!daTypes.isEmpty() && !daTypes.contains(da->getTypeAsString())) || (!cDims.isEmpty() && !cDims.contains(da->getComponentDimensions()))))
+              {
+                QList<QListWidgetItem*> rejectList = attributeArraysWidget->findItems(daName, Qt::MatchRecursive);
+                for(const auto& item : rejectList)
                 {
-                  QList<QListWidgetItem*> rejectList = attributeArraysWidget->findItems(daName, Qt::MatchRecursive);
-                  for(const auto& item : rejectList)
-                  {
-                    item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-                  }
+                  item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
                 }
               }
             }
           }
         }
       }
-
-      attributeArraysWidget->blockSignals(false);
     }
 
+    attributeArraysWidget->blockSignals(false);
+  }
 
+protected:
+  FilterParameterWidgetUtils() = default;
 
-  protected:
-    FilterParameterWidgetUtils() = default;
-
-  private:
-
+private:
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
index 870129a575..a2e09f4efa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterParameterWidgetsDialogs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
index f71b7a662e..a320904962 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,23 +47,16 @@ class FilterParameter;
  */
 class SVWidgetsLib_EXPORT FilterParameterWidgetsDialogs
 {
-  public:
-
-    ~FilterParameterWidgetsDialogs();
-
-    static void ShowCouldNotSetFilterParameter(AbstractFilter* filter, FilterParameter* filterParameter);
-    static void ShowCouldNotSetConditionalFilterParameter(AbstractFilter* filter, FilterParameter* filterParameter);
-    static void ShowFilterPropertyCastError(AbstractFilter* filter, FilterParameter* filterParameter, const QString& filtType, const QString& widgetType);
-    static void ShowEmptyStringError(AbstractFilter* filter, FilterParameter* filterParameter);
-
-  protected:
-    FilterParameterWidgetsDialogs();
-
-  private:
-
+public:
+  ~FilterParameterWidgetsDialogs();
 
+  static void ShowCouldNotSetFilterParameter(AbstractFilter* filter, FilterParameter* filterParameter);
+  static void ShowCouldNotSetConditionalFilterParameter(AbstractFilter* filter, FilterParameter* filterParameter);
+  static void ShowFilterPropertyCastError(AbstractFilter* filter, FilterParameter* filterParameter, const QString& filtType, const QString& widgetType);
+  static void ShowEmptyStringError(AbstractFilter* filter, FilterParameter* filterParameter);
 
+protected:
+  FilterParameterWidgetsDialogs();
 
+private:
 };
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index 3ccd8c2316..1230f7f6e9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloatVec2Widget.h"
 
-
 #include "SIMPLib/FilterParameters/FloatVec2FilterParameter.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -89,7 +88,6 @@ void FloatVec2Widget::setupGui()
   yData->setValidator(yVal);
   yVal->setLocale(loc);
 
-
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index 964718afdf..5de4ca7ebd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,55 +45,50 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_FloatVec2Widget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT FloatVec2Widget : public FilterParameterWidget, private Ui::FloatVec2Widget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    FloatVec2Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~FloatVec2Widget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-    void xDataChanged(const QString& value);
-    void yDataChanged(const QString& value);
-
-  protected:
-    void widgetChanged(QLineEdit* le, const QString& msg);
-
-  private:
-    FloatVec2FilterParameter* m_FilterParameter;
-
-  public:
-    FloatVec2Widget(const FloatVec2Widget&) = delete; // Copy Constructor Not Implemented
-    FloatVec2Widget(FloatVec2Widget&&) = delete;      // Move Constructor Not Implemented
-    FloatVec2Widget& operator=(const FloatVec2Widget&) = delete; // Copy Assignment Not Implemented
-    FloatVec2Widget& operator=(FloatVec2Widget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  FloatVec2Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~FloatVec2Widget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+  void xDataChanged(const QString& value);
+  void yDataChanged(const QString& value);
+
+protected:
+  void widgetChanged(QLineEdit* le, const QString& msg);
+
+private:
+  FloatVec2FilterParameter* m_FilterParameter;
+
+public:
+  FloatVec2Widget(const FloatVec2Widget&) = delete;            // Copy Constructor Not Implemented
+  FloatVec2Widget(FloatVec2Widget&&) = delete;                 // Move Constructor Not Implemented
+  FloatVec2Widget& operator=(const FloatVec2Widget&) = delete; // Copy Assignment Not Implemented
+  FloatVec2Widget& operator=(FloatVec2Widget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index daf430ad28..2858d2bcca 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloatVec3Widget.h"
 
-
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
index 1a1c0b0c21..40be854e58 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
@@ -1,44 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
-
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
@@ -51,51 +49,48 @@
 class QLineEdit;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT FloatVec3Widget : public FilterParameterWidget, private Ui::FloatVec3Widget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    FloatVec3Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~FloatVec3Widget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight();  // Called just after the dataCheck() is called.
-
-    void xDataChanged(const QString& value);
-    void yDataChanged(const QString& value);
-    void zDataChanged(const QString& value);
-
-  protected:
-    void widgetChanged(QLineEdit* le, const QString& msg);
-
-  private:
-    FloatVec3FilterParameter* m_FilterParameter;
-
-  public:
-    FloatVec3Widget(const FloatVec3Widget&) = delete; // Copy Constructor Not Implemented
-    FloatVec3Widget(FloatVec3Widget&&) = delete;      // Move Constructor Not Implemented
-    FloatVec3Widget& operator=(const FloatVec3Widget&) = delete; // Copy Assignment Not Implemented
-    FloatVec3Widget& operator=(FloatVec3Widget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  FloatVec3Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~FloatVec3Widget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+  void xDataChanged(const QString& value);
+  void yDataChanged(const QString& value);
+  void zDataChanged(const QString& value);
+
+protected:
+  void widgetChanged(QLineEdit* le, const QString& msg);
+
+private:
+  FloatVec3FilterParameter* m_FilterParameter;
+
+public:
+  FloatVec3Widget(const FloatVec3Widget&) = delete;            // Copy Constructor Not Implemented
+  FloatVec3Widget(FloatVec3Widget&&) = delete;                 // Move Constructor Not Implemented
+  FloatVec3Widget& operator=(const FloatVec3Widget&) = delete; // Copy Assignment Not Implemented
+  FloatVec3Widget& operator=(FloatVec3Widget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index 8440a54cad..c877ea368f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FloatWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
index 0ccccf8575..eb0f5f02b1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_FloatWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT FloatWidget : public FilterParameterWidget, private Ui::FloatWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    FloatWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~FloatWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);// when something in the widget changes
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    FloatFilterParameter* m_FilterParameter;
-
-  public:
-    FloatWidget(const FloatWidget&) = delete;    // Copy Constructor Not Implemented
-    FloatWidget(FloatWidget&&) = delete;         // Move Constructor Not Implemented
-    FloatWidget& operator=(const FloatWidget&) = delete; // Copy Assignment Not Implemented
-    FloatWidget& operator=(FloatWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  FloatWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~FloatWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);                  // when something in the widget changes
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  FloatFilterParameter* m_FilterParameter;
+
+public:
+  FloatWidget(const FloatWidget&) = delete;            // Copy Constructor Not Implemented
+  FloatWidget(FloatWidget&&) = delete;                 // Move Constructor Not Implemented
+  FloatWidget& operator=(const FloatWidget&) = delete; // Copy Assignment Not Implemented
+  FloatWidget& operator=(FloatWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index 5e33dac19e..89dede0d0b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FourthOrderPolynomialWidget.h"
 
-
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
index 8cfa0e0f22..14dff3ae68 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_FourthOrderPolynomialWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT FourthOrderPolynomialWidget : public FilterParameterWidget, private Ui::FourthOrderPolynomialWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    FourthOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~FourthOrderPolynomialWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    FourthOrderPolynomialFilterParameter* m_FilterParameter;
-
-  public:
-    FourthOrderPolynomialWidget(const FourthOrderPolynomialWidget&) = delete; // Copy Constructor Not Implemented
-    FourthOrderPolynomialWidget(FourthOrderPolynomialWidget&&) = delete;      // Move Constructor Not Implemented
-    FourthOrderPolynomialWidget& operator=(const FourthOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
-    FourthOrderPolynomialWidget& operator=(FourthOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  FourthOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~FourthOrderPolynomialWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  FourthOrderPolynomialFilterParameter* m_FilterParameter;
+
+public:
+  FourthOrderPolynomialWidget(const FourthOrderPolynomialWidget&) = delete;            // Copy Constructor Not Implemented
+  FourthOrderPolynomialWidget(FourthOrderPolynomialWidget&&) = delete;                 // Move Constructor Not Implemented
+  FourthOrderPolynomialWidget& operator=(const FourthOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
+  FourthOrderPolynomialWidget& operator=(FourthOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
index 78e09b71f5..2d03746015 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "GenerateColorTableWidget.h"
 
@@ -43,9 +43,9 @@
 //
 // -----------------------------------------------------------------------------
 GenerateColorTableWidget::GenerateColorTableWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
-: FilterParameterWidget(parameter, filter, parent),
-  m_PresetsDialog(nullptr),
-  m_DidCausePreflight(false)
+: FilterParameterWidget(parameter, filter, parent)
+, m_PresetsDialog(nullptr)
+, m_DidCausePreflight(false)
 {
   m_FilterParameter = dynamic_cast<GenerateColorTableFilterParameter*>(parameter);
   Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "GenerateColorTableWidget can ONLY be used with a GenerateColorTableFilterParameter object");
@@ -60,11 +60,11 @@ GenerateColorTableWidget::GenerateColorTableWidget(FilterParameter* parameter, A
 //
 // -----------------------------------------------------------------------------
 GenerateColorTableWidget::GenerateColorTableWidget(QWidget* parent)
-: FilterParameterWidget(nullptr, nullptr, parent),
-  m_Filter(nullptr),
-  m_FilterParameter(nullptr),
-  m_PresetsDialog(nullptr),
-  m_DidCausePreflight(false)
+: FilterParameterWidget(nullptr, nullptr, parent)
+, m_Filter(nullptr)
+, m_FilterParameter(nullptr)
+, m_PresetsDialog(nullptr)
+, m_DidCausePreflight(false)
 {
   setupUi(this);
   setupGui();
@@ -132,7 +132,7 @@ void GenerateColorTableWidget::setupGui()
     QString presetName = m_Filter->getSelectedPresetName();
     m_PresetsDialog->setCurrentPreset(presetName.toStdString().c_str());
 
-    if (presetName.isEmpty())
+    if(presetName.isEmpty())
     {
       chosenPresetText->hide();
       imageLabel->hide();
@@ -147,9 +147,9 @@ void GenerateColorTableWidget::on_choosePresetBtn_clicked()
 {
   QJsonObject preset = m_PresetsDialog->currentPreset();
   int exitCode = m_PresetsDialog->exec();
-  if (exitCode == QDialog::Rejected)
+  if(exitCode == QDialog::Rejected)
   {
-    if (preset.contains("Name") && preset["Name"].isString())
+    if(preset.contains("Name") && preset["Name"].isString())
     {
       m_PresetsDialog->setCurrentPreset(preset["Name"].toString().toStdString().c_str(), false);
     }
@@ -162,7 +162,7 @@ void GenerateColorTableWidget::on_choosePresetBtn_clicked()
 void GenerateColorTableWidget::presetSelected(const QJsonObject& preset, const QPixmap& pixmap)
 {
   QString presetName = "Unknown Preset";
-  if (preset.contains("Name") && preset["Name"].isString())
+  if(preset.contains("Name") && preset["Name"].isString())
   {
     presetName = preset["Name"].toString();
   }
@@ -184,12 +184,12 @@ void GenerateColorTableWidget::filterNeedsInputParameters(AbstractFilter* filter
 
   QJsonObject preset = m_PresetsDialog->currentPreset();
 
-  if (preset.contains("Name") && preset["Name"].isString())
+  if(preset.contains("Name") && preset["Name"].isString())
   {
     m_Filter->setSelectedPresetName(preset["Name"].toString());
   }
 
-  if (preset.contains("RGBPoints") && preset["RGBPoints"].isArray())
+  if(preset.contains("RGBPoints") && preset["RGBPoints"].isArray())
   {
     m_Filter->setSelectedPresetControlPoints(preset["RGBPoints"].toArray());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index 5a9b611543..cac7f21e7d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -52,66 +51,63 @@ class GenerateColorTableFilterParameter;
 class ColorPresetsDialog;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT GenerateColorTableWidget : public FilterParameterWidget, private Ui::GenerateColorTableWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    GenerateColorTableWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    /**
-     * @brief GenerateColorTableWidget
-     * @param parent
-     */
-    GenerateColorTableWidget(QWidget* parent = nullptr);
-
-    ~GenerateColorTableWidget() override;
-
-    void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    void setFilter(AbstractFilter* value);
-    AbstractFilter* getFilter() const;
-
-    void setFilterParameter(FilterParameter* value);
-    FilterParameter* getFilterParameter() const;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void on_choosePresetBtn_clicked();
-
-    void presetSelected(const QJsonObject& preset, const QPixmap &pixmap);
-
-  private:
-    GenerateColorTable*                       m_Filter;
-    GenerateColorTableFilterParameter*        m_FilterParameter;
-    QSharedPointer<ColorPresetsDialog>        m_PresetsDialog;
-    bool                                      m_DidCausePreflight;
-
-  public:
-    GenerateColorTableWidget(const GenerateColorTableWidget&) = delete; // Copy Constructor Not Implemented
-    GenerateColorTableWidget(GenerateColorTableWidget&&) = delete;      // Move Constructor Not Implemented
-    GenerateColorTableWidget& operator=(const GenerateColorTableWidget&) = delete; // Copy Assignment Not Implemented
-    GenerateColorTableWidget& operator=(GenerateColorTableWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  GenerateColorTableWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  /**
+   * @brief GenerateColorTableWidget
+   * @param parent
+   */
+  GenerateColorTableWidget(QWidget* parent = nullptr);
+
+  ~GenerateColorTableWidget() override;
+
+  void initialize(FilterParameter* parameter, AbstractFilter* filter = nullptr);
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  void setFilter(AbstractFilter* value);
+  AbstractFilter* getFilter() const;
+
+  void setFilterParameter(FilterParameter* value);
+  FilterParameter* getFilterParameter() const;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void on_choosePresetBtn_clicked();
+
+  void presetSelected(const QJsonObject& preset, const QPixmap& pixmap);
+
+private:
+  GenerateColorTable* m_Filter;
+  GenerateColorTableFilterParameter* m_FilterParameter;
+  QSharedPointer<ColorPresetsDialog> m_PresetsDialog;
+  bool m_DidCausePreflight;
+
+public:
+  GenerateColorTableWidget(const GenerateColorTableWidget&) = delete;            // Copy Constructor Not Implemented
+  GenerateColorTableWidget(GenerateColorTableWidget&&) = delete;                 // Move Constructor Not Implemented
+  GenerateColorTableWidget& operator=(const GenerateColorTableWidget&) = delete; // Copy Assignment Not Implemented
+  GenerateColorTableWidget& operator=(GenerateColorTableWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
index 58df661f9d..232a68e96f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IComparisonWidget.h"
 
@@ -44,7 +44,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IComparisonWidget::IComparisonWidget(QWidget* parent) : QWidget(parent)
+IComparisonWidget::IComparisonWidget(QWidget* parent)
+: QWidget(parent)
 {
   m_attributeMatrix = nullptr;
 }
@@ -61,12 +62,12 @@ IComparisonWidget* IComparisonWidget::CreateWidget(AbstractComparison::Pointer c
 {
   IComparisonWidget* widget = nullptr;
 
-  if (nullptr != std::dynamic_pointer_cast<ComparisonSet>(comparison))
+  if(nullptr != std::dynamic_pointer_cast<ComparisonSet>(comparison))
   {
     ComparisonSet::Pointer comparisonSet = std::dynamic_pointer_cast<ComparisonSet>(comparison);
     widget = new ComparisonSetWidget(nullptr, comparisonSet);
   }
-  else if (nullptr != std::dynamic_pointer_cast<ComparisonValue>(comparison))
+  else if(nullptr != std::dynamic_pointer_cast<ComparisonValue>(comparison))
   {
     ComparisonValue::Pointer comparisonValue = std::dynamic_pointer_cast<ComparisonValue>(comparison);
     widget = new ComparisonValueWidget(nullptr, comparisonValue);
@@ -75,7 +76,6 @@ IComparisonWidget* IComparisonWidget::CreateWidget(AbstractComparison::Pointer c
   return widget;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -83,7 +83,7 @@ void IComparisonWidget::setAttributeMatrix(AttributeMatrix::Pointer am)
 {
   m_attributeMatrix = am;
 
-  if (am != nullptr)
+  if(am != nullptr)
   {
     m_arrayNames = am->getAttributeArrayNames();
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
index bfa593b386..d5d24b1255 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -44,9 +44,9 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 /**
-* @brief The IComparisonWidget is an abstract class used by ComparisonContainerWidget
-* to reference both ComparisonValueWidget and ComparisonSetWidget.
-*/
+ * @brief The IComparisonWidget is an abstract class used by ComparisonContainerWidget
+ * to reference both ComparisonValueWidget and ComparisonSetWidget.
+ */
 class SVWidgetsLib_EXPORT IComparisonWidget : public QWidget
 {
   Q_OBJECT
@@ -56,52 +56,52 @@ class SVWidgetsLib_EXPORT IComparisonWidget : public QWidget
   ~IComparisonWidget() override;
 
   /**
-  * @brief Creates a new IComparisonWidget for a given comparison
-  * @param comparison Comparison used for creating the new widget
-  * @return
-  */
+   * @brief Creates a new IComparisonWidget for a given comparison
+   * @param comparison Comparison used for creating the new widget
+   * @return
+   */
   static IComparisonWidget* CreateWidget(AbstractComparison::Pointer comparison);
 
   /**
-  * @brief Returns the comparison used by the widget as an AbstractComparison
-  * @return
-  */
+   * @brief Returns the comparison used by the widget as an AbstractComparison
+   * @return
+   */
   virtual AbstractComparison::Pointer getComparison() = 0;
 
   /**
-  * @brief Sets the array of names to use in this widget or any nested IComparisonWidgets
-  * @param names QStringList of all DataArray names available to use
-  */
+   * @brief Sets the array of names to use in this widget or any nested IComparisonWidgets
+   * @param names QStringList of all DataArray names available to use
+   */
   virtual void setArrayNames(QStringList names) = 0;
 
   /**
-  * @brief Returns a list of all DataArray names used in this widget or any nested IComparisonWidgets
-  * @return
-  */
+   * @brief Returns a list of all DataArray names used in this widget or any nested IComparisonWidgets
+   * @return
+   */
   virtual QStringList getArrayNames();
 
   /**
-  * @brief Returns the AttributeMatrix used by the widget
-  * @return
-  */
+   * @brief Returns the AttributeMatrix used by the widget
+   * @return
+   */
   AttributeMatrix::Pointer getAttributeMatrix();
 
   /**
-  * @brief Sets the AttributeMatrix used by the widget
-  * @param am
-  */
+   * @brief Sets the AttributeMatrix used by the widget
+   * @param am
+   */
   virtual void setAttributeMatrix(AttributeMatrix::Pointer am);
 
   /**
-  * @brief Updates the comparison's DataArray options based on the renamed path
-  * @param renamePath
-  */
+   * @brief Updates the comparison's DataArray options based on the renamed path
+   * @param renamePath
+   */
   virtual void renameDataArrayPath(DataArrayPath::RenameType renamePath) = 0;
 
 signals:
   /**
-  * @brief Specifies that the comparison used by the widget has changed
-  */
+   * @brief Specifies that the comparison used by the widget has changed
+   */
   void comparisonChanged();
 
 protected:
@@ -110,4 +110,3 @@ class SVWidgetsLib_EXPORT IComparisonWidget : public QWidget
 private:
   AttributeMatrix::Pointer m_attributeMatrix;
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index b35ceec71c..5a71ce6278 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -123,10 +123,10 @@ public slots:
   bool initWithFile(const QString& hdf5File);
 
   /**
-  * @brief Returns the best guess at component dimensions for the given path.  This requires a valid AttributeMatrix, ImageGeometry, and HDF5 path
-  * @param path
-  * @return
-  */
+   * @brief Returns the best guess at component dimensions for the given path.  This requires a valid AttributeMatrix, ImageGeometry, and HDF5 path
+   * @param path
+   * @return
+   */
   std::tuple<herr_t, QString> bestGuessCDims(const QString& path);
 
   /**
@@ -230,8 +230,8 @@ private slots:
   ~ImportHDF5DatasetWidget() override;
 
 public:
-  ImportHDF5DatasetWidget(const ImportHDF5DatasetWidget&) = delete; // Copy Constructor Not Implemented
-  ImportHDF5DatasetWidget(ImportHDF5DatasetWidget&&) = delete;      // Move Constructor Not Implemented
+  ImportHDF5DatasetWidget(const ImportHDF5DatasetWidget&) = delete;            // Copy Constructor Not Implemented
+  ImportHDF5DatasetWidget(ImportHDF5DatasetWidget&&) = delete;                 // Move Constructor Not Implemented
   ImportHDF5DatasetWidget& operator=(const ImportHDF5DatasetWidget&) = delete; // Copy Assignment Not Implemented
   ImportHDF5DatasetWidget& operator=(ImportHDF5DatasetWidget&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index 7cf704e1e5..6c4e2b03ff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "InputFileWidget.h"
 
-
 #include <QtWidgets/QFileDialog>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
@@ -91,6 +90,5 @@ void InputFileWidget::selectInputFile()
   on_m_LineEdit_editingFinished();
 
   //  filterNeedsInputParameters(getFilter());
-  //emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  // emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
index b5db472c66..dab89fbab0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -45,42 +43,39 @@
 class InputFileFilterParameter;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT InputFileWidget : public AbstractIOFileWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    InputFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~InputFileWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void selectInputFile();
-
-  private:
-    InputFileFilterParameter* m_FilterParameter;
-
-  public:
-    InputFileWidget(const InputFileWidget&) = delete; // Copy Constructor Not Implemented
-    InputFileWidget(InputFileWidget&&) = delete;      // Move Constructor Not Implemented
-    InputFileWidget& operator=(const InputFileWidget&) = delete; // Copy Assignment Not Implemented
-    InputFileWidget& operator=(InputFileWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  InputFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~InputFileWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void selectInputFile();
+
+private:
+  InputFileFilterParameter* m_FilterParameter;
+
+public:
+  InputFileWidget(const InputFileWidget&) = delete;            // Copy Constructor Not Implemented
+  InputFileWidget(InputFileWidget&&) = delete;                 // Move Constructor Not Implemented
+  InputFileWidget& operator=(const InputFileWidget&) = delete; // Copy Assignment Not Implemented
+  InputFileWidget& operator=(InputFileWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 43e1318b72..768d246f30 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "InputPathWidget.h"
 
-
 #include <QtWidgets/QFileDialog>
 
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
index be2d6e1296..d2703b0334 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
@@ -44,44 +43,40 @@
 
 class InputPathFilterParameter;
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT InputPathWidget : public AbstractIOFileWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    InputPathWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~InputPathWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void selectInputPath();
-
-  private:
-    InputPathFilterParameter*  m_FilterParameter;
-
-  public:
-    InputPathWidget(const InputPathWidget&) = delete; // Copy Constructor Not Implemented
-    InputPathWidget(InputPathWidget&&) = delete;      // Move Constructor Not Implemented
-    InputPathWidget& operator=(const InputPathWidget&) = delete; // Copy Assignment Not Implemented
-    InputPathWidget& operator=(InputPathWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  InputPathWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~InputPathWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void selectInputPath();
+
+private:
+  InputPathFilterParameter* m_FilterParameter;
+
+public:
+  InputPathWidget(const InputPathWidget&) = delete;            // Copy Constructor Not Implemented
+  InputPathWidget(InputPathWidget&&) = delete;                 // Move Constructor Not Implemented
+  InputPathWidget& operator=(const InputPathWidget&) = delete; // Copy Assignment Not Implemented
+  InputPathWidget& operator=(InputPathWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 8a844c626c..8c213c754d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -33,7 +33,6 @@
 
 #include "IntVec2Widget.h"
 
-
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index afb0caf326..23c6ee71fe 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IntVec3Widget.h"
 
-
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
index a82fff3ff5..f8d22d6b09 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
@@ -1,46 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
-
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
@@ -49,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_IntVec3Widget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT IntVec3Widget : public FilterParameterWidget, private Ui::IntVec3Widget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    IntVec3Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~IntVec3Widget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    IntVec3FilterParameter* m_FilterParameter;
-
-  public:
-    IntVec3Widget(const IntVec3Widget&) = delete;  // Copy Constructor Not Implemented
-    IntVec3Widget(IntVec3Widget&&) = delete;       // Move Constructor Not Implemented
-    IntVec3Widget& operator=(const IntVec3Widget&) = delete; // Copy Assignment Not Implemented
-    IntVec3Widget& operator=(IntVec3Widget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  IntVec3Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~IntVec3Widget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  IntVec3FilterParameter* m_FilterParameter;
+
+public:
+  IntVec3Widget(const IntVec3Widget&) = delete;            // Copy Constructor Not Implemented
+  IntVec3Widget(IntVec3Widget&&) = delete;                 // Move Constructor Not Implemented
+  IntVec3Widget& operator=(const IntVec3Widget&) = delete; // Copy Assignment Not Implemented
+  IntVec3Widget& operator=(IntVec3Widget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 6abb9bce71..8c85d908bd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IntWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
index 2d4d223d83..8047b3ec68 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -51,45 +50,42 @@
 class QLineEdit;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT IntWidget : public FilterParameterWidget, private Ui::IntWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    IntWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~IntWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    IntFilterParameter* m_FilterParameter;
-
-  public:
-    IntWidget(const IntWidget&) = delete;      // Copy Constructor Not Implemented
-    IntWidget(IntWidget&&) = delete;           // Move Constructor Not Implemented
-    IntWidget& operator=(const IntWidget&) = delete; // Copy Assignment Not Implemented
-    IntWidget& operator=(IntWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  IntWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~IntWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  IntFilterParameter* m_FilterParameter;
+
+public:
+  IntWidget(const IntWidget&) = delete;            // Copy Constructor Not Implemented
+  IntWidget(IntWidget&&) = delete;                 // Move Constructor Not Implemented
+  IntWidget& operator=(const IntWidget&) = delete; // Copy Assignment Not Implemented
+  IntWidget& operator=(IntWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 42bb12f5b7..297bc39ae2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedBooleanWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
index ad45bf6cdb..3cc9e30ef2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -48,59 +47,53 @@
 
 #include "SVWidgetsLib/ui_LinkedBooleanWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT LinkedBooleanWidget : public FilterParameterWidget, private Ui::LinkedBooleanWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    LinkedBooleanWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~LinkedBooleanWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-     * @brief updateLinkedWidgets
-     */
-    void updateLinkedWidgets();
-
-    int getLinkedState();
-
-
-  public slots:
-    void widgetChanged(int state);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-
-  signals:
-    void conditionalPropertyChanged(int state);
-
-  private:
-    LinkedBooleanFilterParameter* m_FilterParameter;
-
-  public:
-    LinkedBooleanWidget(const LinkedBooleanWidget&) = delete; // Copy Constructor Not Implemented
-    LinkedBooleanWidget(LinkedBooleanWidget&&) = delete;      // Move Constructor Not Implemented
-    LinkedBooleanWidget& operator=(const LinkedBooleanWidget&) = delete; // Copy Assignment Not Implemented
-    LinkedBooleanWidget& operator=(LinkedBooleanWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  LinkedBooleanWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~LinkedBooleanWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief updateLinkedWidgets
+   */
+  void updateLinkedWidgets();
+
+  int getLinkedState();
+
+public slots:
+  void widgetChanged(int state);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+signals:
+  void conditionalPropertyChanged(int state);
+
+private:
+  LinkedBooleanFilterParameter* m_FilterParameter;
+
+public:
+  LinkedBooleanWidget(const LinkedBooleanWidget&) = delete;            // Copy Constructor Not Implemented
+  LinkedBooleanWidget(LinkedBooleanWidget&&) = delete;                 // Move Constructor Not Implemented
+  LinkedBooleanWidget& operator=(const LinkedBooleanWidget&) = delete; // Copy Assignment Not Implemented
+  LinkedBooleanWidget& operator=(LinkedBooleanWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 9aa4ea32fb..14f385867e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LinkedDataContainerSelectionWidget.h"
 
@@ -115,8 +115,7 @@ void LinkedDataContainerSelectionWidget::setupGui()
   m_SelectedDataContainerPath->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(false));
 
   m_MenuMapper = new QSignalMapper(this);
-  connect(m_MenuMapper, SIGNAL(mapped(QString)),
-            this, SLOT(dataContainerSelected(QString)));
+  connect(m_MenuMapper, SIGNAL(mapped(QString)), this, SLOT(dataContainerSelected(QString)));
 
   QString dcName = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QString>();
   m_SelectedDataContainerPath->setText(dcName);
@@ -132,7 +131,7 @@ void LinkedDataContainerSelectionWidget::widgetChanged()
   int index = -1;
   DataContainerArray::Pointer dca = getFilter()->getDataContainerArray();
   IGeometry::Pointer igeom = dca->getPrereqGeometryFromDataContainer<IGeometry>(nullptr, m_SelectedDataContainerPath->text());
-  
+
   if(igeom)
   {
     index = static_cast<int32_t>(igeom->getGeometryType());
@@ -264,7 +263,10 @@ void LinkedDataContainerSelectionWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void LinkedDataContainerSelectionWidget::setSelectedPath(DataArrayPath dcPath)
 {
-  if (dcPath.isEmpty()) { return; }
+  if(dcPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedDataContainerPath->setText("");
   m_SelectedDataContainerPath->setToolTip("");
@@ -275,7 +277,7 @@ void LinkedDataContainerSelectionWidget::setSelectedPath(DataArrayPath dcPath)
     return;
   }
 
-  if (dca->doesDataContainerExist(dcPath.getDataContainerName()))
+  if(dca->doesDataContainerExist(dcPath.getDataContainerName()))
   {
     DataContainer::Pointer dc = dca->getDataContainer(dcPath.getDataContainerName());
     QString html = dc->getInfoString(SIMPL::HtmlFormat);
@@ -313,10 +315,11 @@ void LinkedDataContainerSelectionWidget::afterPreflight()
     return;
   }
 
-  if (dca->doesDataContainerExist(m_SelectedDataContainerPath->text()))
+  if(dca->doesDataContainerExist(m_SelectedDataContainerPath->text()))
   {
     DataContainer::Pointer dc = dca->getDataContainer(m_SelectedDataContainerPath->text());
-    if (nullptr != dc.get()) {
+    if(nullptr != dc.get())
+    {
       QString html = dc->getInfoString(SIMPL::HtmlFormat);
       m_SelectedDataContainerPath->setToolTip(html);
       m_SelectedDataContainerPath->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(true));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
index 48297d0535..1f2a48c44c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,83 +53,80 @@
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT LinkedDataContainerSelectionWidget : public FilterParameterWidget, private Ui::LinkedDataContainerSelectionWidget
 {
-    Q_OBJECT
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    LinkedDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    LinkedDataContainerSelectionWidget(QWidget* parent = nullptr);
-
-    ~LinkedDataContainerSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-     * @brief initializeWidget
-     * @param parameter
-     * @param filter
-     */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void widgetChanged();
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-    void dataContainerSelected(QString path);
-
-  signals:
-    void conditionalPropertyChanged(int);
-
-  protected:
-    /**
-     * @brief createSelectionMenu
-     */
-    void createSelectionMenu();
-
-  private:
-    bool m_DidCausePreflight;
-    LinkedDataContainerSelectionFilterParameter* m_FilterParameter;
-    QPointer<QSignalMapper> m_MenuMapper;
-    void setSelectedPath(QString path);
-    void setSelectedPath(DataArrayPath dcPath);
-
-  public:
-    LinkedDataContainerSelectionWidget(const LinkedDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    LinkedDataContainerSelectionWidget(LinkedDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    LinkedDataContainerSelectionWidget& operator=(const LinkedDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    LinkedDataContainerSelectionWidget& operator=(LinkedDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  LinkedDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  LinkedDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+  ~LinkedDataContainerSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  void widgetChanged();
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+  void dataContainerSelected(QString path);
+
+signals:
+  void conditionalPropertyChanged(int);
+
+protected:
+  /**
+   * @brief createSelectionMenu
+   */
+  void createSelectionMenu();
+
+private:
+  bool m_DidCausePreflight;
+  LinkedDataContainerSelectionFilterParameter* m_FilterParameter;
+  QPointer<QSignalMapper> m_MenuMapper;
+  void setSelectedPath(QString path);
+  void setSelectedPath(DataArrayPath dcPath);
+
+public:
+  LinkedDataContainerSelectionWidget(const LinkedDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  LinkedDataContainerSelectionWidget(LinkedDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  LinkedDataContainerSelectionWidget& operator=(const LinkedDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  LinkedDataContainerSelectionWidget& operator=(LinkedDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 619acbe003..2d3e157bb3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -33,8 +33,6 @@
 
 #include "LinkedPathCreationWidget.h"
 
-
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
index ab1f32d678..0d4bf94f0e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
@@ -46,7 +46,7 @@
 
 namespace
 {
-  const QString SelectItemText = "-- Select Montage --";
+const QString SelectItemText = "-- Select Montage --";
 }
 
 // -----------------------------------------------------------------------------
@@ -199,7 +199,7 @@ void MontageStructureSelectionWidget::afterPreflight()
 
   QString currentName = m_FilterParameter->getGetterCallback()();
   QStringList montageNames = dca->getMontageCollection().getNameList();
-  
+
   QSignalBlocker blocker(m_Ui->montageSelectionComboBox);
   m_Ui->montageSelectionComboBox->clear();
   m_Ui->montageSelectionComboBox->addItem(::SelectItemText);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index f1a99058c3..69cdd2c4ce 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiAttributeMatrixSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QModelIndex>
 
-
 #include <QtWidgets/QListWidgetItem>
 
 #include <QtCore/QDebug>
@@ -132,15 +131,15 @@ void MultiAttributeMatrixSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiAttributeMatrixSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedDataContainerPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedDataContainerPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedDataContainerPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedDataContainerPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedDataContainerPath, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)));
   connect(m_SelectedDataContainerPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedDataContainerPath, SIGNAL(pathChanged()), this, SIGNAL(parametersChanged()));
   connect(m_SelectedDataContainerPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -154,7 +153,7 @@ void MultiAttributeMatrixSelectionWidget::setupGui()
   DataArrayPath amPath = DataArrayPath::GetAttributeMatrixPath(selectedPaths);
   m_SelectedDataContainerPath->setText(amPath.getDataContainerName());
   m_SelectedDataContainerPath->setPropertyName(getFilterParameter()->getHumanLabel());
-  for (int i=0; i<selectedPaths.size(); i++)
+  for(int i = 0; i < selectedPaths.size(); i++)
   {
     DataArrayPath selectedPath = selectedPaths[i];
     attributeMatricesOrderWidget->addItem(selectedPath.getAttributeMatrixName());
@@ -202,7 +201,7 @@ bool MultiAttributeMatrixSelectionWidget::eventFilter(QObject* obj, QEvent* even
   {
     on_attributeMatricesOrderWidget_itemSelectionChanged();
   }
-  else if ( event->type() == QEvent::FocusIn && obj == attributeMatricesSelectWidget )
+  else if(event->type() == QEvent::FocusIn && obj == attributeMatricesSelectWidget)
   {
     on_attributeMatricesSelectWidget_itemSelectionChanged();
   }
@@ -254,7 +253,7 @@ void MultiAttributeMatrixSelectionWidget::on_selectBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = attributeMatricesSelectWidget->takeItem(row);
@@ -280,7 +279,7 @@ void MultiAttributeMatrixSelectionWidget::on_deselectBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = attributeMatricesOrderWidget->takeItem(row);
@@ -301,7 +300,7 @@ void MultiAttributeMatrixSelectionWidget::on_deselectBtn_clicked()
 //
 // -----------------------------------------------------------------------------
 void MultiAttributeMatrixSelectionWidget::on_upBtn_clicked()
-{ 
+{
   int currentIndex = attributeMatricesOrderWidget->currentRow();
 
   if(currentIndex > 0)
@@ -344,7 +343,7 @@ void MultiAttributeMatrixSelectionWidget::on_removeBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = attributeMatricesOrderWidget->item(row);
@@ -428,23 +427,23 @@ void MultiAttributeMatrixSelectionWidget::selectionChanged()
   int selectSize = attributeMatricesSelectWidget->selectionModel()->selectedRows().size();
   int orderSize = attributeMatricesOrderWidget->selectionModel()->selectedRows().size();
 
-  if (selectSize > 0)
+  if(selectSize > 0)
   {
     selectBtn->setEnabled(true);
   }
 
-  if (orderSize > 0)
+  if(orderSize > 0)
   {
     deselectBtn->setEnabled(true);
 
-    if (orderSize == 1)
+    if(orderSize == 1)
     {
       upBtn->setEnabled(true);
       downBtn->setEnabled(true);
     }
 
     bool allErrorRows = true;
-    for (int i=0; i<orderSize; i++)
+    for(int i = 0; i < orderSize; i++)
     {
       int row = attributeMatricesOrderWidget->selectionModel()->selectedRows()[i].row();
       if(attributeMatricesOrderWidget->item(row)->background() != QColor(235, 110, 110))
@@ -496,25 +495,25 @@ void MultiAttributeMatrixSelectionWidget::beforePreflight()
   if(dca->doesDataContainerExist(m_SelectedDataContainerPath->getDataArrayPath().getDataContainerName()))
   {
     DataContainer::Pointer dc = dca->getDataContainer(m_SelectedDataContainerPath->getDataArrayPath());
-    if(nullptr != dc.get()) 
+    if(nullptr != dc.get())
     {
       QList<QString> matrixNames = dc->getAttributeMatrixNames();
 
       QList<QString> selectListNames;
-      for(int i = 0; i<attributeMatricesSelectWidget->count(); i++)
+      for(int i = 0; i < attributeMatricesSelectWidget->count(); i++)
       {
         selectListNames.append(attributeMatricesSelectWidget->item(i)->text());
       }
 
       QList<QString> orderListNames;
-      for(int i = 0; i<attributeMatricesOrderWidget->count(); i++)
+      for(int i = 0; i < attributeMatricesOrderWidget->count(); i++)
       {
         QListWidgetItem* item = attributeMatricesOrderWidget->item(i);
         QString name = item->text();
         orderListNames.append(name);
         if(!matrixNames.contains(name))
         {
-          //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+          // item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
           item->setBackground(QColor(235, 110, 110));
         }
         else
@@ -523,7 +522,7 @@ void MultiAttributeMatrixSelectionWidget::beforePreflight()
         }
       }
 
-      for(int i = 0; i<matrixNames.size(); i++)
+      for(int i = 0; i < matrixNames.size(); i++)
       {
         if(!selectListNames.contains(matrixNames[i]) && !orderListNames.contains(matrixNames[i]))
         {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index d3c6398b6d..18fa96fa56 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -44,11 +43,9 @@
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_MultiAttributeMatrixSelectionWidget.h"
 
 class FilterParameter;
@@ -57,93 +54,90 @@ class MultiAttributeMatrixSelectionFilterParameter;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT MultiAttributeMatrixSelectionWidget : public FilterParameterWidget, private Ui::MultiAttributeMatrixSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    MultiAttributeMatrixSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    MultiAttributeMatrixSelectionWidget(QWidget* parent = nullptr);
-
-    ~MultiAttributeMatrixSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief checkStringValues
-    * @param current
-    * @param filt
-    * @return
-    */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void dataContainerSelected(QString path);
-
-  protected slots:
-    void on_upBtn_clicked();
-    void on_downBtn_clicked();
-    void on_selectBtn_clicked();
-    void on_deselectBtn_clicked();
-    void on_removeBtn_clicked();
-
-    void on_attributeMatricesSelectWidget_itemSelectionChanged();
-    void on_attributeMatricesOrderWidget_itemSelectionChanged();
-
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
-
-  private:
-    bool m_DidCausePreflight;
-
-    MultiAttributeMatrixSelectionFilterParameter* m_FilterParameter;
-
-    void setSelectedPath(QString path);
-
-    void setSelectedPath(DataArrayPath amPath);
-
-    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
-
-    void selectionChanged();
-
-  public:
-    MultiAttributeMatrixSelectionWidget(const MultiAttributeMatrixSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    MultiAttributeMatrixSelectionWidget(MultiAttributeMatrixSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    MultiAttributeMatrixSelectionWidget& operator=(const MultiAttributeMatrixSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    MultiAttributeMatrixSelectionWidget& operator=(MultiAttributeMatrixSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiAttributeMatrixSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  MultiAttributeMatrixSelectionWidget(QWidget* parent = nullptr);
+
+  ~MultiAttributeMatrixSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void dataContainerSelected(QString path);
+
+protected slots:
+  void on_upBtn_clicked();
+  void on_downBtn_clicked();
+  void on_selectBtn_clicked();
+  void on_deselectBtn_clicked();
+  void on_removeBtn_clicked();
+
+  void on_attributeMatricesSelectWidget_itemSelectionChanged();
+  void on_attributeMatricesOrderWidget_itemSelectionChanged();
+
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+
+private:
+  bool m_DidCausePreflight;
+
+  MultiAttributeMatrixSelectionFilterParameter* m_FilterParameter;
+
+  void setSelectedPath(QString path);
+
+  void setSelectedPath(DataArrayPath amPath);
+
+  void removeNonexistantPaths(QVector<DataArrayPath>& paths);
+
+  void selectionChanged();
+
+public:
+  MultiAttributeMatrixSelectionWidget(const MultiAttributeMatrixSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiAttributeMatrixSelectionWidget(MultiAttributeMatrixSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiAttributeMatrixSelectionWidget& operator=(const MultiAttributeMatrixSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MultiAttributeMatrixSelectionWidget& operator=(MultiAttributeMatrixSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 1e00fdd4b5..9fb6fad7ea 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataArraySelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QModelIndex>
 
-
 #include <QtWidgets/QListWidgetItem>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -128,15 +127,15 @@ void MultiDataArraySelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiDataArraySelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SLOT(attributeMatrixPathUpdated()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -150,7 +149,7 @@ void MultiDataArraySelectionWidget::setupGui()
   DataArrayPath amPath = DataArrayPath::GetAttributeMatrixPath(selectedPaths);
   m_SelectedAttributeMatrixPath->setText(amPath.serialize(Detail::Delimiter));
   m_SelectedAttributeMatrixPath->setPropertyName(getFilterParameter()->getHumanLabel());
-  for (int i=0; i<selectedPaths.size(); i++)
+  for(int i = 0; i < selectedPaths.size(); i++)
   {
     DataArrayPath selectedPath = selectedPaths[i];
     QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataArrayName());
@@ -252,7 +251,7 @@ void MultiDataArraySelectionWidget::on_selectBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = availableArraysListWidget->takeItem(row);
@@ -333,7 +332,7 @@ void MultiDataArraySelectionWidget::on_removeBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = selectedArraysListWidget->item(row);
@@ -413,23 +412,23 @@ void MultiDataArraySelectionWidget::selectionChanged()
   int selectSize = availableArraysListWidget->selectionModel()->selectedRows().size();
   int orderSize = selectedArraysListWidget->selectionModel()->selectedRows().size();
 
-  if (selectSize > 0)
+  if(selectSize > 0)
   {
     selectBtn->setEnabled(true);
   }
 
-  if (orderSize > 0)
+  if(orderSize > 0)
   {
     deselectBtn->setEnabled(true);
 
-    if (orderSize == 1)
+    if(orderSize == 1)
     {
       upBtn->setEnabled(true);
       downBtn->setEnabled(true);
     }
 
     bool allErrorRows = true;
-    for (int i=0; i<orderSize; i++)
+    for(int i = 0; i < orderSize; i++)
     {
       int row = selectedArraysListWidget->selectionModel()->selectedRows()[i].row();
       if(selectedArraysListWidget->item(row)->background() != QColor(235, 110, 110))
@@ -481,7 +480,7 @@ void MultiDataArraySelectionWidget::beforePreflight()
   if(dca->doesAttributeMatrixExist(m_SelectedAttributeMatrixPath->getDataArrayPath()))
   {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(m_SelectedAttributeMatrixPath->getDataArrayPath());
-    if(nullptr != am.get()) 
+    if(nullptr != am.get())
     {
       QList<QString> arrayNames = am->getAttributeArrayNames();
 
@@ -499,7 +498,7 @@ void MultiDataArraySelectionWidget::beforePreflight()
         orderListNames.append(name);
         if(!arrayNames.contains(name))
         {
-          //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+          // item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
           // item->setBackgroundColor(QColor(235, 110, 110));
           item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
         }
@@ -510,7 +509,7 @@ void MultiDataArraySelectionWidget::beforePreflight()
         }
       }
 
-      for(int i = 0; i<arrayNames.size(); i++)
+      for(int i = 0; i < arrayNames.size(); i++)
       {
         if(!selectListNames.contains(arrayNames[i]) && !orderListNames.contains(arrayNames[i]))
         {
@@ -593,7 +592,7 @@ void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, co
           for(int i = 0; i < renamedCount; i++)
           {
             QListWidgetItem* item = renamedItems[i];
-            //availableArraysListWidget->removeItemWidget(item);
+            // availableArraysListWidget->removeItemWidget(item);
             item->setText(newPath.getDataArrayName());
           }
         }
@@ -612,7 +611,7 @@ void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, co
             }
           }
         }
-      }// End DataArray section
+      } // End DataArray section
 
       // Update the AttributeMatrix Selection widget
       if(!hasDA)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 56f80ca302..3c7a8f96e6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -44,11 +43,9 @@
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_MultiDataArraySelectionWidget.h"
 
 class FilterParameter;
@@ -57,94 +54,91 @@ class MultiDataArraySelectionFilterParameter;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT MultiDataArraySelectionWidget : public FilterParameterWidget, private Ui::MultiDataArraySelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    MultiDataArraySelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    MultiDataArraySelectionWidget(QWidget* parent = nullptr);
-
-    ~MultiDataArraySelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief checkStringValues
-    * @param current
-    * @param filt
-    * @return
-    */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void on_upBtn_clicked();
-    void on_downBtn_clicked();
-    void on_selectBtn_clicked();
-    void on_deselectBtn_clicked();
-    void on_removeBtn_clicked();
-
-    void on_availableArraysListWidget_itemSelectionChanged();
-    void on_selectedArraysListWidget_itemSelectionChanged();
-
-    void on_availableArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
-    void on_selectedArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
-
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
-
-    void attributeMatrixPathUpdated();
-
-  private:
-    bool m_DidCausePreflight;
-
-    MultiDataArraySelectionFilterParameter* m_FilterParameter;
-
-    void setSelectedPath(const DataArrayPath& amPath);
-
-    void removeNonexistantPaths(QVector<DataArrayPath> &paths);
-
-    void selectionChanged();
-
-  public:
-    MultiDataArraySelectionWidget(const MultiDataArraySelectionWidget&) = delete; // Copy Constructor Not Implemented
-    MultiDataArraySelectionWidget(MultiDataArraySelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    MultiDataArraySelectionWidget& operator=(const MultiDataArraySelectionWidget&) = delete; // Copy Assignment Not Implemented
-    MultiDataArraySelectionWidget& operator=(MultiDataArraySelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiDataArraySelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  MultiDataArraySelectionWidget(QWidget* parent = nullptr);
+
+  ~MultiDataArraySelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void on_upBtn_clicked();
+  void on_downBtn_clicked();
+  void on_selectBtn_clicked();
+  void on_deselectBtn_clicked();
+  void on_removeBtn_clicked();
+
+  void on_availableArraysListWidget_itemSelectionChanged();
+  void on_selectedArraysListWidget_itemSelectionChanged();
+
+  void on_availableArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
+  void on_selectedArraysListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+
+  void attributeMatrixPathUpdated();
+
+private:
+  bool m_DidCausePreflight;
+
+  MultiDataArraySelectionFilterParameter* m_FilterParameter;
+
+  void setSelectedPath(const DataArrayPath& amPath);
+
+  void removeNonexistantPaths(QVector<DataArrayPath>& paths);
+
+  void selectionChanged();
+
+public:
+  MultiDataArraySelectionWidget(const MultiDataArraySelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiDataArraySelectionWidget(MultiDataArraySelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataArraySelectionWidget& operator=(const MultiDataArraySelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MultiDataArraySelectionWidget& operator=(MultiDataArraySelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 191b8a9428..9077d911ba 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "MultiDataContainerSelectionWidget.h"
 
 #include <QtCore/QList>
 #include <QtCore/QModelIndex>
 
-
 #include <QtWidgets/QListWidgetItem>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -111,7 +110,7 @@ void MultiDataContainerSelectionWidget::setupGui()
   availableDataContainersListWidget->installEventFilter(this);
 
   // Generate the text for the QLabel
-  //label->setText(getFilterParameter()->getHumanLabel());
+  // label->setText(getFilterParameter()->getHumanLabel());
 
   // Lastly, hook up the filter's signals and slots to our own signals and slots
   // Catch when the filter is about to execute the preflight
@@ -124,11 +123,10 @@ void MultiDataContainerSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiDataContainerSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
-  for (int i=0; i<dcNames.size(); i++)
+  for(int i = 0; i < dcNames.size(); i++)
   {
     QString dcName = dcNames[i];
     QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
@@ -201,7 +199,7 @@ void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = availableDataContainersListWidget->takeItem(row);
@@ -283,7 +281,7 @@ void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
   if(!indexList.empty())
   {
     int offset = 0;
-    for (int i=0; i<indexList.size(); i++)
+    for(int i = 0; i < indexList.size(); i++)
     {
       int row = indexList[i].row() - offset;
       QListWidgetItem* item = selectedDataContainersListWidget->item(row);
@@ -312,23 +310,23 @@ void MultiDataContainerSelectionWidget::selectionChanged()
   int selectSize = availableDataContainersListWidget->selectionModel()->selectedRows().size();
   int orderSize = selectedDataContainersListWidget->selectionModel()->selectedRows().size();
 
-  if (selectSize > 0)
+  if(selectSize > 0)
   {
     selectBtn->setEnabled(true);
   }
 
-  if (orderSize > 0)
+  if(orderSize > 0)
   {
     deselectBtn->setEnabled(true);
 
-    if (orderSize == 1)
+    if(orderSize == 1)
     {
       upBtn->setEnabled(true);
       downBtn->setEnabled(true);
     }
 
     bool allErrorRows = true;
-    for (int i=0; i<orderSize; i++)
+    for(int i = 0; i < orderSize; i++)
     {
       int row = selectedDataContainersListWidget->selectionModel()->selectedRows()[i].row();
       if(selectedDataContainersListWidget->item(row)->background() != QColor(235, 110, 110))
@@ -373,9 +371,9 @@ void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
 
   QList<QString> dcNames = dca->getDataContainerNames();
 
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  for(int i = 0; i < availableDataContainersListWidget->count(); i++)
   {
-    if (!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
+    if(!dcNames.contains(availableDataContainersListWidget->item(i)->text()))
     {
       QListWidgetItem* item = availableDataContainersListWidget->takeItem(i);
       delete item;
@@ -383,9 +381,9 @@ void MultiDataContainerSelectionWidget::clearNonexistantDataContainers()
     }
   }
 
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  for(int i = 0; i < selectedDataContainersListWidget->count(); i++)
   {
-    if (!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
+    if(!dcNames.contains(selectedDataContainersListWidget->item(i)->text()))
     {
       QListWidgetItem* item = selectedDataContainersListWidget->takeItem(i);
       delete item;
@@ -416,37 +414,37 @@ void MultiDataContainerSelectionWidget::beforePreflight()
   QList<QString> dcNames = dca->getDataContainerNames();
 
   QList<QString> selectListNames;
-  for (int i = 0; i < availableDataContainersListWidget->count(); i++)
+  for(int i = 0; i < availableDataContainersListWidget->count(); i++)
   {
-	  selectListNames.append(availableDataContainersListWidget->item(i)->text());
+    selectListNames.append(availableDataContainersListWidget->item(i)->text());
   }
 
   QList<QString> orderListNames;
-  for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  for(int i = 0; i < selectedDataContainersListWidget->count(); i++)
   {
-	  QListWidgetItem* item = selectedDataContainersListWidget->item(i);
-	  QString name = item->text();
-	  orderListNames.append(name);
-	  if (!dcNames.contains(name))
-	  {
-		  //item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
-		  // item->setBackgroundColor(QColor(235, 110, 110));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
-	  }
-	  else
-	  {
-		  // item->setBackgroundColor(QColor(255, 255, 255));
-		  item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
-	  }
+    QListWidgetItem* item = selectedDataContainersListWidget->item(i);
+    QString name = item->text();
+    orderListNames.append(name);
+    if(!dcNames.contains(name))
+    {
+      // item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
+      // item->setBackgroundColor(QColor(235, 110, 110));
+      item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_red.png"));
+    }
+    else
+    {
+      // item->setBackgroundColor(QColor(255, 255, 255));
+      item->setIcon(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"));
+    }
   }
 
-  for (int i = 0; i < dcNames.size(); i++)
+  for(int i = 0; i < dcNames.size(); i++)
   {
-	  if (!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
-	  {
-		  QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
-		  availableDataContainersListWidget->addItem(item);
-	  }
+    if(!selectListNames.contains(dcNames[i]) && !orderListNames.contains(dcNames[i]))
+    {
+      QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcNames[i]);
+      availableDataContainersListWidget->addItem(item);
+    }
   }
 }
 
@@ -463,10 +461,10 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   QStringList dcNames;
-	for (int i = 0; i < selectedDataContainersListWidget->count(); i++)
-	{
+  for(int i = 0; i < selectedDataContainersListWidget->count(); i++)
+  {
     dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
-	}
+  }
   Q_UNUSED(filter)
   MultiDataContainerSelectionFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
   if(setter)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 3a20e690a9..e79a114d30 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
@@ -44,11 +43,9 @@
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
 class FilterParameter;
@@ -57,93 +54,90 @@ class MultiDataContainerSelectionFilterParameter;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParameterWidget, private Ui::MultiDataContainerSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
-
-    ~MultiDataContainerSelectionWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-    /**
-    * @brief checkStringValues
-    * @param current
-    * @param filt
-    * @return
-    */
-    QString checkStringValues(QString current, QString filtDcName);
-
-    /**
-    * @brief initializeWidget
-    * @param parameter
-    * @param filter
-    */
-    void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  protected slots:
-    void on_upBtn_clicked();
-    void on_downBtn_clicked();
-    void on_selectBtn_clicked();
-    void on_deselectBtn_clicked();
-    void on_removeBtn_clicked();
-
-    void on_availableDataContainersListWidget_itemSelectionChanged();
-    void on_selectedDataContainersListWidget_itemSelectionChanged();
-
-    void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-    void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
-
-    void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
-
-  private:
-    bool m_DidCausePreflight;
-
-    MultiDataContainerSelectionFilterParameter* m_FilterParameter;
-
-    void selectionChanged();
-
-    /**
-     * @brief clearNonexistantDataContainers
-     */
-    void clearNonexistantDataContainers();
-
-  public:
-    MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiDataContainerSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  MultiDataContainerSelectionWidget(QWidget* parent = nullptr);
+
+  ~MultiDataContainerSelectionWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
+
+  /**
+   * @brief initializeWidget
+   * @param parameter
+   * @param filter
+   */
+  void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected slots:
+  void on_upBtn_clicked();
+  void on_downBtn_clicked();
+  void on_selectBtn_clicked();
+  void on_deselectBtn_clicked();
+  void on_removeBtn_clicked();
+
+  void on_availableDataContainersListWidget_itemSelectionChanged();
+  void on_selectedDataContainersListWidget_itemSelectionChanged();
+
+  void on_availableDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+  void on_selectedDataContainersListWidget_itemDoubleClicked(QListWidgetItem* item);
+
+  void updateDataArrayPath(QString propertyName, DataArrayPath::RenameType renamePath);
+
+private:
+  bool m_DidCausePreflight;
+
+  MultiDataContainerSelectionFilterParameter* m_FilterParameter;
+
+  void selectionChanged();
+
+  /**
+   * @brief clearNonexistantDataContainers
+   */
+  void clearNonexistantDataContainers();
+
+public:
+  MultiDataContainerSelectionWidget(const MultiDataContainerSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiDataContainerSelectionWidget(MultiDataContainerSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiDataContainerSelectionWidget& operator=(const MultiDataContainerSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  MultiDataContainerSelectionWidget& operator=(MultiDataContainerSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index b609dee473..02b3c1663d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "NumericTypeWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -108,7 +107,7 @@ void NumericTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
     errorLabel->setText("Invalid numeric type selected. The filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-      
+
     i = defValue;
   }
   else
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
index f7a6a56b3c..0ddccea070 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -48,47 +47,43 @@
 
 #include "SVWidgetsLib/ui_NumericTypeWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT NumericTypeWidget : public FilterParameterWidget, private Ui::NumericTypeWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    NumericTypeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~NumericTypeWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(int index);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    NumericTypeFilterParameter* m_FilterParameter;
-
-  public:
-    NumericTypeWidget(const NumericTypeWidget&) = delete; // Copy Constructor Not Implemented
-    NumericTypeWidget(NumericTypeWidget&&) = delete;      // Move Constructor Not Implemented
-    NumericTypeWidget& operator=(const NumericTypeWidget&) = delete; // Copy Assignment Not Implemented
-    NumericTypeWidget& operator=(NumericTypeWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  NumericTypeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~NumericTypeWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(int index);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  NumericTypeFilterParameter* m_FilterParameter;
+
+public:
+  NumericTypeWidget(const NumericTypeWidget&) = delete;            // Copy Constructor Not Implemented
+  NumericTypeWidget(NumericTypeWidget&&) = delete;                 // Move Constructor Not Implemented
+  NumericTypeWidget& operator=(const NumericTypeWidget&) = delete; // Copy Assignment Not Implemented
+  NumericTypeWidget& operator=(NumericTypeWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
index f24e8dfd94..a6d6c6d624 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "OutputFileWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
index 8333587974..c55e6bded6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
@@ -1,83 +1,79 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT OutputFileWidget : public AbstractIOFileWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    OutputFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  OutputFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    ~OutputFileWidget() override;
+  ~OutputFileWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-  public slots:
-    void selectOutputFile();
+public slots:
+  void selectOutputFile();
 
-  private:
-    OutputFileFilterParameter*  m_FilterParameter;
+private:
+  OutputFileFilterParameter* m_FilterParameter;
 
-  public:
-    OutputFileWidget(const OutputFileWidget&) = delete; // Copy Constructor Not Implemented
-    OutputFileWidget(OutputFileWidget&&) = delete;      // Move Constructor Not Implemented
-    OutputFileWidget& operator=(const OutputFileWidget&) = delete; // Copy Assignment Not Implemented
-    OutputFileWidget& operator=(OutputFileWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  OutputFileWidget(const OutputFileWidget&) = delete;            // Copy Constructor Not Implemented
+  OutputFileWidget(OutputFileWidget&&) = delete;                 // Move Constructor Not Implemented
+  OutputFileWidget& operator=(const OutputFileWidget&) = delete; // Copy Assignment Not Implemented
+  OutputFileWidget& operator=(OutputFileWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index 58cdcd48dc..8231209a25 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "OutputPathWidget.h"
 
-
 #include <QtWidgets/QFileDialog>
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
index aa59775755..c00596aa41 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
@@ -1,83 +1,79 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT OutputPathWidget : public AbstractIOFileWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    OutputPathWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  OutputPathWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    ~OutputPathWidget() override;
+  ~OutputPathWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-  public slots:
-    void selectOutputPath();
+public slots:
+  void selectOutputPath();
 
-  private:
-    OutputPathFilterParameter*  m_FilterParameter;
+private:
+  OutputPathFilterParameter* m_FilterParameter;
 
-  public:
-    OutputPathWidget(const OutputPathWidget&) = delete; // Copy Constructor Not Implemented
-    OutputPathWidget(OutputPathWidget&&) = delete;      // Move Constructor Not Implemented
-    OutputPathWidget& operator=(const OutputPathWidget&) = delete; // Copy Assignment Not Implemented
-    OutputPathWidget& operator=(OutputPathWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  OutputPathWidget(const OutputPathWidget&) = delete;            // Copy Constructor Not Implemented
+  OutputPathWidget(OutputPathWidget&&) = delete;                 // Move Constructor Not Implemented
+  OutputPathWidget& operator=(const OutputPathWidget&) = delete; // Copy Assignment Not Implemented
+  OutputPathWidget& operator=(OutputPathWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index 13c1017951..f8017458cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -1,39 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ParagraphWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
index ed76b0f10f..4d49347f4f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the following contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -46,28 +46,28 @@
 #include "SVWidgetsLib/ui_ParagraphWidget.h"
 
 /**
-* @brief This widget is for Filter Parameters that are of a string type.
-* @author
-* @version
-*/
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ParagraphWidget : public FilterParameterWidget, private Ui::ParagraphWidget
 {
   Q_OBJECT
 
 public:
   /**
-  * @brief Constructor
-  * @param parameter The FilterParameter object that this widget represents
-  * @param filter The instance of the filter that this parameter is a part of
-  * @param parent The parent QWidget for this Widget
-  */
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
   ParagraphWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
   ~ParagraphWidget() override;
 
   /**
-  * @brief This method does additional GUI widget connections
-  */
+   * @brief This method does additional GUI widget connections
+   */
   void setupGui() override;
 
 public slots:
@@ -83,9 +83,8 @@ public slots:
   ParagraphFilterParameter* m_FilterParameter;
 
 public:
-  ParagraphWidget(const ParagraphWidget&) = delete; // Copy Constructor Not Implemented
-  ParagraphWidget(ParagraphWidget&&) = delete;      // Move Constructor Not Implemented
+  ParagraphWidget(const ParagraphWidget&) = delete;            // Copy Constructor Not Implemented
+  ParagraphWidget(ParagraphWidget&&) = delete;                 // Move Constructor Not Implemented
   ParagraphWidget& operator=(const ParagraphWidget&) = delete; // Copy Assignment Not Implemented
   ParagraphWidget& operator=(ParagraphWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 1a8f24ea3c..238434b2f8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PhaseTypeSelectionWidget.h"
 
@@ -97,8 +97,8 @@ void PhaseTypeSelectionWidget::setupGui()
   m_SelectedAttributeMatrixPath->setAttrMatrixRequirements(AttributeMatrixSelectionFilterParameter::RequirementType());
   m_SelectedAttributeMatrixPath->setFilter(getFilter());
 
-  //m_MenuMapper = new QSignalMapper(this);
-  //connect(m_MenuMapper, SIGNAL(mapped(QString)), this, SLOT(attributeMatrixSelected(QString)));
+  // m_MenuMapper = new QSignalMapper(this);
+  // connect(m_MenuMapper, SIGNAL(mapped(QString)), this, SLOT(attributeMatrixSelected(QString)));
 
   // Catch when the filter is about to execute the preflight
   connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &PhaseTypeSelectionWidget::beforePreflight);
@@ -110,16 +110,15 @@ void PhaseTypeSelectionWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &PhaseTypeSelectionWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   connect(this, SIGNAL(filterPathInput(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(checkDragPath(DataArrayPath)));
   connect(this, SIGNAL(endViewPathRequirements()), m_SelectedAttributeMatrixPath, SLOT(clearPathFiltering()));
   connect(this, SIGNAL(endDataStructureRequirements()), m_SelectedAttributeMatrixPath, SLOT(endExternalFiltering()));
   connect(this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), m_SelectedAttributeMatrixPath, SLOT(setFilteredDataArrayPath(DataArrayPath)));
 
-  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)),
-    this, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+  connect(m_SelectedAttributeMatrixPath, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+          SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(pathChanged()), this, SLOT(attributeMatrixUpdated()));
   connect(m_SelectedAttributeMatrixPath, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
@@ -224,7 +223,10 @@ void PhaseTypeSelectionWidget::setSelectedPath(QString path)
 // -----------------------------------------------------------------------------
 void PhaseTypeSelectionWidget::setSelectedPath(DataArrayPath amPath)
 {
-  if (amPath.isEmpty()) { return; }
+  if(amPath.isEmpty())
+  {
+    return;
+  }
 
   m_SelectedAttributeMatrixPath->setText("");
   m_SelectedAttributeMatrixPath->setToolTip("");
@@ -235,7 +237,7 @@ void PhaseTypeSelectionWidget::setSelectedPath(DataArrayPath amPath)
     return;
   }
 
-  if (dca->doesAttributeMatrixExist(amPath))
+  if(dca->doesAttributeMatrixExist(amPath))
   {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(amPath);
     QString html = am->getInfoString(SIMPL::HtmlFormat);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index 8395ed5604..51d5aa6f65 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -1,44 +1,43 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -48,7 +47,6 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_PhaseTypeSelectionWidget.h"
 
 class QComboBox;
@@ -56,75 +54,72 @@ class QLabel;
 class QSignalMapper;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT PhaseTypeSelectionWidget : public FilterParameterWidget, private Ui::PhaseTypeSelectionWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    PhaseTypeSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  PhaseTypeSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    PhaseTypeSelectionWidget(QWidget* parent = nullptr);
+  PhaseTypeSelectionWidget(QWidget* parent = nullptr);
 
-    ~PhaseTypeSelectionWidget() override;
+  ~PhaseTypeSelectionWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-    /**
-     * @brief checkStringValues
-     * @param current
-     * @param filt
-     * @return
-     */
-    QString checkStringValues(QString current, QString filtDcName);
+  /**
+   * @brief checkStringValues
+   * @param current
+   * @param filt
+   * @return
+   */
+  QString checkStringValues(QString current, QString filtDcName);
 
-    bool eventFilter(QObject* obj, QEvent* event) override;
+  bool eventFilter(QObject* obj, QEvent* event) override;
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
-    void phaseTypeComboBoxChanged(int index);
+  void phaseTypeComboBoxChanged(int index);
 
-    void attributeMatrixSelected(QString path);
-    void attributeMatrixUpdated();
+  void attributeMatrixSelected(QString path);
+  void attributeMatrixUpdated();
 
-  protected:
-    void updatePhaseComboBoxes();
+protected:
+  void updatePhaseComboBoxes();
 
-    void resetPhaseComboBoxes();
+  void resetPhaseComboBoxes();
 
-  protected slots:
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+protected slots:
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-  private:
-    bool              m_DidCausePreflight;
+private:
+  bool m_DidCausePreflight;
 
-    PhaseTypeSelectionFilterParameter* m_FilterParameter;
+  PhaseTypeSelectionFilterParameter* m_FilterParameter;
 
-    void setSelectedPath(QString path);
+  void setSelectedPath(QString path);
 
-    void setSelectedPath(DataArrayPath amPath);
+  void setSelectedPath(DataArrayPath amPath);
 
-  public:
-    PhaseTypeSelectionWidget(const PhaseTypeSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    PhaseTypeSelectionWidget(PhaseTypeSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    PhaseTypeSelectionWidget& operator=(const PhaseTypeSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    PhaseTypeSelectionWidget& operator=(PhaseTypeSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  PhaseTypeSelectionWidget(const PhaseTypeSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  PhaseTypeSelectionWidget(PhaseTypeSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  PhaseTypeSelectionWidget& operator=(const PhaseTypeSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  PhaseTypeSelectionWidget& operator=(PhaseTypeSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index 19e49dd281..e435aa3c02 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PreflightUpdatedValueWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
index 58c23e9f9b..93865a61c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -47,50 +45,44 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_PreflightUpdatedValueWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT PreflightUpdatedValueWidget : public FilterParameterWidget, private Ui::PreflightUpdatedValueWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    PreflightUpdatedValueWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~PreflightUpdatedValueWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-
-    PreflightUpdatedValueFilterParameter* m_FilterParameter;
-
-  public:
-    PreflightUpdatedValueWidget(const PreflightUpdatedValueWidget&) = delete; // Copy Constructor Not Implemented
-    PreflightUpdatedValueWidget(PreflightUpdatedValueWidget&&) = delete;      // Move Constructor Not Implemented
-    PreflightUpdatedValueWidget& operator=(const PreflightUpdatedValueWidget&) = delete; // Copy Assignment Not Implemented
-    PreflightUpdatedValueWidget& operator=(PreflightUpdatedValueWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  PreflightUpdatedValueWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~PreflightUpdatedValueWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  PreflightUpdatedValueFilterParameter* m_FilterParameter;
+
+public:
+  PreflightUpdatedValueWidget(const PreflightUpdatedValueWidget&) = delete;            // Copy Constructor Not Implemented
+  PreflightUpdatedValueWidget(PreflightUpdatedValueWidget&&) = delete;                 // Move Constructor Not Implemented
+  PreflightUpdatedValueWidget& operator=(const PreflightUpdatedValueWidget&) = delete; // Copy Assignment Not Implemented
+  PreflightUpdatedValueWidget& operator=(PreflightUpdatedValueWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index 606ef58b6f..0173c0bca7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "RangeWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index 710675b6b4..b00905106b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -48,52 +45,47 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_RangeWidget.h"
 
-
 /**
-* @brief This widget is for Filter Parameters that are of a string type.
-* @author
-* @version
-*/
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT RangeWidget : public FilterParameterWidget, private Ui::RangeWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    RangeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~RangeWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-    void on_minValue_textChanged(const QString& text);
-    void on_maxValue_textChanged(const QString& text);
-
-  private:
-    RangeFilterParameter* m_FilterParameter;
-
-  public:
-    RangeWidget(const RangeWidget&) = delete;    // Copy Constructor Not Implemented
-    RangeWidget(RangeWidget&&) = delete;         // Move Constructor Not Implemented
-    RangeWidget& operator=(const RangeWidget&) = delete; // Copy Assignment Not Implemented
-    RangeWidget& operator=(RangeWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  RangeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~RangeWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+  void on_minValue_textChanged(const QString& text);
+  void on_maxValue_textChanged(const QString& text);
+
+private:
+  RangeFilterParameter* m_FilterParameter;
+
+public:
+  RangeWidget(const RangeWidget&) = delete;            // Copy Constructor Not Implemented
+  RangeWidget(RangeWidget&&) = delete;                 // Move Constructor Not Implemented
+  RangeWidget& operator=(const RangeWidget&) = delete; // Copy Assignment Not Implemented
+  RangeWidget& operator=(RangeWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index f9a4d281a3..53b55ebccc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -107,8 +107,7 @@ void ReadASCIIDataWidget::setupGui()
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ReadASCIIDataWidget::filterNeedsInputParameters);
 
   // If the DataArrayPath is updated in the filter, update the widget
-  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)),
-    this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
+  connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
   // If the filter was loaded from a pipeline file, fill in the information in the widget
   if(!m_Filter->getWizardData().isEmpty())
@@ -322,8 +321,9 @@ void ReadASCIIDataWidget::on_importFileBtn_clicked()
       if(!hasNewLines && !hasCarriageReturns && !hasTabs)
       {
         // This might be a binary file, so throw up a warning dialog
-        QString warningStr = "The file \"" + m_FilePath + "\" might be a binary file, because line-feed, tab, or carriage return characters have not been detected.\nWarning: Using this file may "
-                                                          "crash the program or cause unexpected results.\n\nWould you still like to continue importing the file?";
+        QString warningStr = "The file \"" + m_FilePath +
+                             "\" might be a binary file, because line-feed, tab, or carriage return characters have not been detected.\nWarning: Using this file may "
+                             "crash the program or cause unexpected results.\n\nWould you still like to continue importing the file?";
         int ret = QMessageBox::warning(this, tr("ASCII Data Import Warning"), tr(warningStr.toStdString().c_str()), QMessageBox::No | QMessageBox::Yes, QMessageBox::Yes);
 
         if(ret == QMessageBox::No)
@@ -473,7 +473,7 @@ void ReadASCIIDataWidget::filterNeedsInputParameters(AbstractFilter* filter)
     data.dataHeaders = m_ImportWizard->getHeaders();
     data.headerIsCustom = !data.dataHeaders.empty();
     data.headerLine = data.headerIsCustom ? -1 : m_ImportWizard->getBeginningLineNum() - 1;
-//        data.headerUsesDefaults =
+    //        data.headerUsesDefaults =
     data.numberOfLines = numOfLines;
     data.beginIndex = m_ImportWizard->getBeginningLineNum();
     data.dataTypes = m_ImportWizard->getDataTypes();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
index ca312db8c8..feb59ac2d6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
@@ -1,44 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QThread>
 
-
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
@@ -55,53 +53,52 @@ class SVWidgetsLib_EXPORT ReadASCIIDataWidget : public FilterParameterWidget, pr
 {
   Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ReadASCIIDataWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ReadASCIIDataWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    ~ReadASCIIDataWidget() override;
+  ~ReadASCIIDataWidget() override;
 
-    /**
-     * @brief Initializes some of the GUI elements with selections or other GUI related items
-     */
-    void setupGui() override;
+  /**
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
+  void setupGui() override;
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
-  protected slots:
-    void on_importFileBtn_clicked();
-    void on_resetWizardBtn_clicked();
-    void on_editImportSettings_clicked();
+protected slots:
+  void on_importFileBtn_clicked();
+  void on_resetWizardBtn_clicked();
+  void on_editImportSettings_clicked();
 
-    void lineCountDidFinish();
-    void updateProgress(double percentage);
+  void lineCountDidFinish();
+  void updateProgress(double percentage);
 
-    void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
+  void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-  private:
-    ReadASCIIDataFilterParameter*                   m_FilterParameter;
-    ReadASCIIData*                                    m_Filter;
+private:
+  ReadASCIIDataFilterParameter* m_FilterParameter;
+  ReadASCIIData* m_Filter;
 
-    ImportASCIIDataWizard*                            m_ImportWizard;
+  ImportASCIIDataWizard* m_ImportWizard;
 
-    QString                                           m_FilePath;
-    static QString                                    m_OpenDialogLastDirectory;
+  QString m_FilePath;
+  static QString m_OpenDialogLastDirectory;
 
-    QThread*                                          m_WorkerThread;
-    LineCounterObject*                                m_LineCounter;
+  QThread* m_WorkerThread;
+  LineCounterObject* m_LineCounter;
 
-  public:
-    ReadASCIIDataWidget(const ReadASCIIDataWidget&) = delete; // Copy Constructor Not Implemented
-    ReadASCIIDataWidget(ReadASCIIDataWidget&&) = delete;      // Move Constructor Not Implemented
-    ReadASCIIDataWidget& operator=(const ReadASCIIDataWidget&) = delete; // Copy Assignment Not Implemented
-    ReadASCIIDataWidget& operator=(ReadASCIIDataWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  ReadASCIIDataWidget(const ReadASCIIDataWidget&) = delete;            // Copy Constructor Not Implemented
+  ReadASCIIDataWidget(ReadASCIIDataWidget&&) = delete;                 // Move Constructor Not Implemented
+  ReadASCIIDataWidget& operator=(const ReadASCIIDataWidget&) = delete; // Copy Assignment Not Implemented
+  ReadASCIIDataWidget& operator=(ReadASCIIDataWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index 42f55b27fc..b19b55961f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ScalarTypeWidget.h"
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -108,7 +107,7 @@ void ScalarTypeWidget::filterNeedsInputParameters(AbstractFilter* filter)
     SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
     errorLabel->setText("Invalid scalar type selected. The filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
     errorLabel->show();
-      
+
     i = defValue;
   }
   else
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
index 5701ec8b01..3e66df17d2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -48,47 +47,43 @@
 
 #include "SVWidgetsLib/ui_ScalarTypeWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ScalarTypeWidget : public FilterParameterWidget, private Ui::ScalarTypeWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ScalarTypeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~ScalarTypeWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(int index);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    ScalarTypeFilterParameter* m_FilterParameter;
-
-  public:
-    ScalarTypeWidget(const ScalarTypeWidget&) = delete; // Copy Constructor Not Implemented
-    ScalarTypeWidget(ScalarTypeWidget&&) = delete;      // Move Constructor Not Implemented
-    ScalarTypeWidget& operator=(const ScalarTypeWidget&) = delete; // Copy Assignment Not Implemented
-    ScalarTypeWidget& operator=(ScalarTypeWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ScalarTypeWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~ScalarTypeWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(int index);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  ScalarTypeFilterParameter* m_FilterParameter;
+
+public:
+  ScalarTypeWidget(const ScalarTypeWidget&) = delete;            // Copy Constructor Not Implemented
+  ScalarTypeWidget(ScalarTypeWidget&&) = delete;                 // Move Constructor Not Implemented
+  ScalarTypeWidget& operator=(const ScalarTypeWidget&) = delete; // Copy Assignment Not Implemented
+  ScalarTypeWidget& operator=(ScalarTypeWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index ab1b4c68c3..4e4a889ffa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SecondOrderPolynomialWidget.h"
 
-
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
index b255bc9a43..a03b3af567 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_SecondOrderPolynomialWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT SecondOrderPolynomialWidget : public FilterParameterWidget, private Ui::SecondOrderPolynomialWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    SecondOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~SecondOrderPolynomialWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    SecondOrderPolynomialFilterParameter* m_FilterParameter;
-
-  public:
-    SecondOrderPolynomialWidget(const SecondOrderPolynomialWidget&) = delete; // Copy Constructor Not Implemented
-    SecondOrderPolynomialWidget(SecondOrderPolynomialWidget&&) = delete;      // Move Constructor Not Implemented
-    SecondOrderPolynomialWidget& operator=(const SecondOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
-    SecondOrderPolynomialWidget& operator=(SecondOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  SecondOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~SecondOrderPolynomialWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  SecondOrderPolynomialFilterParameter* m_FilterParameter;
+
+public:
+  SecondOrderPolynomialWidget(const SecondOrderPolynomialWidget&) = delete;            // Copy Constructor Not Implemented
+  SecondOrderPolynomialWidget(SecondOrderPolynomialWidget&&) = delete;                 // Move Constructor Not Implemented
+  SecondOrderPolynomialWidget& operator=(const SecondOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
+  SecondOrderPolynomialWidget& operator=(SecondOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
index bf58138e46..d8ee73d223 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SeparatorWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -60,7 +59,6 @@ SeparatorWidget::SeparatorWidget(FilterParameter* parameter, AbstractFilter* fil
 // -----------------------------------------------------------------------------
 SeparatorWidget::~SeparatorWidget() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
index 28f2f0967e..f5e789f875 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,51 +45,44 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_SeparatorWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT SeparatorWidget : public FilterParameterWidget, private Ui::SeparatorWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    SeparatorWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~SeparatorWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-
-    SeparatorFilterParameter* m_FilterParameter;
-
-  public:
-    SeparatorWidget(const SeparatorWidget&) = delete; // Copy Constructor Not Implemented
-    SeparatorWidget(SeparatorWidget&&) = delete;      // Move Constructor Not Implemented
-    SeparatorWidget& operator=(const SeparatorWidget&) = delete; // Copy Assignment Not Implemented
-    SeparatorWidget& operator=(SeparatorWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  SeparatorWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~SeparatorWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  SeparatorFilterParameter* m_FilterParameter;
+
+public:
+  SeparatorWidget(const SeparatorWidget&) = delete;            // Copy Constructor Not Implemented
+  SeparatorWidget(SeparatorWidget&&) = delete;                 // Move Constructor Not Implemented
+  SeparatorWidget& operator=(const SeparatorWidget&) = delete; // Copy Assignment Not Implemented
+  SeparatorWidget& operator=(SeparatorWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index dbdc3e883a..0463d2ef9e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ShapeTypeSelectionWidget.h"
 
-
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QLabel>
 
@@ -133,7 +132,6 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
     }
   }
 
-
   bool ok = false;
   // setup the list of choices for the widget
   ShapeTypeSelectionFilterParameter* shapeType = dynamic_cast<ShapeTypeSelectionFilterParameter*>(getFilterParameter());
@@ -145,7 +143,7 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
   }
 
   ShapeType::Types shapeTypesFromFilter = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<ShapeType::Types>();
-  if (shapeTypesFromFilter.size() > 1 && numPhases <= 0)
+  if(shapeTypesFromFilter.size() > 1 && numPhases <= 0)
   {
     numPhases = shapeTypesFromFilter.size();
   }
@@ -170,7 +168,7 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
   {
     shapeTypeLabel = nullptr;
     shapeTypeComboBox = nullptr;
-    if(i > m_ShapeTypeLabels.size() )
+    if(i > m_ShapeTypeLabels.size())
     {
       shapeTypeLabel = new QLabel(m_ShapeTypeScrollContents);
       QString str;
@@ -188,7 +186,7 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
       shapeTypeLabel->setText(str);
       shapeTypeLabel->setObjectName(str);
       m_ShapeTypeLabels.push_back(shapeTypeLabel);
-      m_ShapeTypeScrollContentsLayout->setWidget(i-1, QFormLayout::LabelRole, shapeTypeLabel);
+      m_ShapeTypeScrollContentsLayout->setWidget(i - 1, QFormLayout::LabelRole, shapeTypeLabel);
       shapeTypeComboBox = new QComboBox(m_ShapeTypeScrollContents);
       str.append(" ComboBox");
       shapeTypeComboBox->setObjectName(str);
@@ -198,13 +196,13 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
         shapeTypeComboBox->setItemData(static_cast<int>(s), static_cast<ShapeType::EnumType>(shapeTypeEnums[s]), Qt::UserRole);
       }
       m_ShapeTypeCombos.push_back(shapeTypeComboBox);
-      m_ShapeTypeScrollContentsLayout->setWidget(i-1, QFormLayout::FieldRole, shapeTypeComboBox);
+      m_ShapeTypeScrollContentsLayout->setWidget(i - 1, QFormLayout::FieldRole, shapeTypeComboBox);
       connect(shapeTypeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(comboboxChanged(int)));
-
     }
-    else {
-      shapeTypeLabel = m_ShapeTypeLabels.at(i-1);
-      shapeTypeComboBox = m_ShapeTypeCombos.at(i-1);
+    else
+    {
+      shapeTypeLabel = m_ShapeTypeLabels.at(i - 1);
+      shapeTypeComboBox = m_ShapeTypeCombos.at(i - 1);
 
       QString str;
       if((names.get() != nullptr) && names->getNumberOfTuples() > 0)
@@ -220,8 +218,9 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
       shapeTypeLabel->setText(str);
     }
 
-    if(i<shapeTypesFromFilter.size()) {
-      shapeTypeComboBox->setCurrentIndex( static_cast<int>(shapeTypesFromFilter[i]));
+    if(i < shapeTypesFromFilter.size())
+    {
+      shapeTypeComboBox->setCurrentIndex(static_cast<int>(shapeTypesFromFilter[i]));
     }
   }
 
@@ -242,7 +241,6 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
       shapeTypeComboBox->deleteLater();
     }
   }
-
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
index e145ba28d1..0a82f3e00a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
@@ -46,66 +45,59 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_ShapeTypeSelectionWidget.h"
 
 class QComboBox;
 class QLabel;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ShapeTypeSelectionWidget : public FilterParameterWidget, private Ui::ShapeTypeSelectionWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ShapeTypeSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ShapeTypeSelectionWidget(QWidget* parent = nullptr);
+  Q_OBJECT
 
-    ~ShapeTypeSelectionWidget() override;
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ShapeTypeSelectionWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
+  ShapeTypeSelectionWidget(QWidget* parent = nullptr);
 
+  ~ShapeTypeSelectionWidget() override;
 
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
 
-    void comboboxChanged(int index);
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
 
+  void comboboxChanged(int index);
 
-  protected:
-    void updateComboBoxes();
+protected:
+  void updateComboBoxes();
 
-  private:
+private:
+  bool m_DidCausePreflight;
 
-    bool              m_DidCausePreflight;
+  QList<QLabel*> m_ShapeTypeLabels;
+  QList<QComboBox*> m_ShapeTypeCombos;
 
-    QList<QLabel*>              m_ShapeTypeLabels;
-    QList<QComboBox*>           m_ShapeTypeCombos;
+  ShapeTypeSelectionFilterParameter* m_FilterParameter;
 
-    ShapeTypeSelectionFilterParameter* m_FilterParameter;
-
-  public:
-    ShapeTypeSelectionWidget(const ShapeTypeSelectionWidget&) = delete; // Copy Constructor Not Implemented
-    ShapeTypeSelectionWidget(ShapeTypeSelectionWidget&&) = delete;      // Move Constructor Not Implemented
-    ShapeTypeSelectionWidget& operator=(const ShapeTypeSelectionWidget&) = delete; // Copy Assignment Not Implemented
-    ShapeTypeSelectionWidget& operator=(ShapeTypeSelectionWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  ShapeTypeSelectionWidget(const ShapeTypeSelectionWidget&) = delete;            // Copy Constructor Not Implemented
+  ShapeTypeSelectionWidget(ShapeTypeSelectionWidget&&) = delete;                 // Move Constructor Not Implemented
+  ShapeTypeSelectionWidget& operator=(const ShapeTypeSelectionWidget&) = delete; // Copy Assignment Not Implemented
+  ShapeTypeSelectionWidget& operator=(ShapeTypeSelectionWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index 8291da4b6a..03320ee814 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StringWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
index e218e137d7..2f3b582bfb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,49 +45,44 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_StringWidget.h"
 
-
 /**
-* @brief This widget is for Filter Parameters that are of a string type.
-* @author
-* @version
-*/
+ * @brief This widget is for Filter Parameters that are of a string type.
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT StringWidget : public FilterParameterWidget, private Ui::StringWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    StringWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~StringWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    StringFilterParameter* m_FilterParameter;
-
-  public:
-    StringWidget(const StringWidget&) = delete;   // Copy Constructor Not Implemented
-    StringWidget(StringWidget&&) = delete;        // Move Constructor Not Implemented
-    StringWidget& operator=(const StringWidget&) = delete; // Copy Assignment Not Implemented
-    StringWidget& operator=(StringWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  StringWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~StringWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  StringFilterParameter* m_FilterParameter;
+
+public:
+  StringWidget(const StringWidget&) = delete;            // Copy Constructor Not Implemented
+  StringWidget(StringWidget&&) = delete;                 // Move Constructor Not Implemented
+  StringWidget& operator=(const StringWidget&) = delete; // Copy Assignment Not Implemented
+  StringWidget& operator=(StringWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index 5354920db9..a83ea31f45 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ThirdOrderPolynomialWidget.h"
 
-
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
index 533d800a01..b029745cab 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -46,50 +45,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_ThirdOrderPolynomialWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT ThirdOrderPolynomialWidget : public FilterParameterWidget, private Ui::ThirdOrderPolynomialWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ThirdOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~ThirdOrderPolynomialWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
-    void beforePreflight(); // Called just before the "dataCheck()" is called
-    void afterPreflight(); // Called just after the dataCheck() is called.
-
-  private:
-    ThirdOrderPolynomialFilterParameter* m_FilterParameter;
-
-  public:
-    ThirdOrderPolynomialWidget(const ThirdOrderPolynomialWidget&) = delete; // Copy Constructor Not Implemented
-    ThirdOrderPolynomialWidget(ThirdOrderPolynomialWidget&&) = delete;      // Move Constructor Not Implemented
-    ThirdOrderPolynomialWidget& operator=(const ThirdOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
-    ThirdOrderPolynomialWidget& operator=(ThirdOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ThirdOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~ThirdOrderPolynomialWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
+  void beforePreflight();                                  // Called just before the "dataCheck()" is called
+  void afterPreflight();                                   // Called just after the dataCheck() is called.
+
+private:
+  ThirdOrderPolynomialFilterParameter* m_FilterParameter;
+
+public:
+  ThirdOrderPolynomialWidget(const ThirdOrderPolynomialWidget&) = delete;            // Copy Constructor Not Implemented
+  ThirdOrderPolynomialWidget(ThirdOrderPolynomialWidget&&) = delete;                 // Move Constructor Not Implemented
+  ThirdOrderPolynomialWidget& operator=(const ThirdOrderPolynomialWidget&) = delete; // Copy Assignment Not Implemented
+  ThirdOrderPolynomialWidget& operator=(ThirdOrderPolynomialWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 157284d0bd..a70a6ca8a3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -1,39 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2019-2019 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "UInt64Widget.h"
 
-
 #include "SIMPLib/FilterParameters/UInt64FilterParameter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
index 931f8810eb..49fda19403 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
@@ -1,39 +1,38 @@
 /* ============================================================================
-* Copyright (c) 2019-2019 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2019-2019 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -49,45 +48,42 @@ class QLineEdit;
 class UInt64FilterParameter;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT UInt64Widget : public FilterParameterWidget, private Ui::UInt64Widget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    UInt64Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~UInt64Widget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-    UInt64FilterParameter* m_FilterParameter;
-
-  public:
-    UInt64Widget(const UInt64Widget&) = delete;      // Copy Constructor Not Implemented
-    UInt64Widget(UInt64Widget&&) = delete;           // Move Constructor Not Implemented
-    UInt64Widget& operator=(const UInt64Widget&) = delete; // Copy Assignment Not Implemented
-    UInt64Widget& operator=(UInt64Widget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  UInt64Widget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~UInt64Widget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  UInt64FilterParameter* m_FilterParameter;
+
+public:
+  UInt64Widget(const UInt64Widget&) = delete;            // Copy Constructor Not Implemented
+  UInt64Widget(UInt64Widget&&) = delete;                 // Move Constructor Not Implemented
+  UInt64Widget& operator=(const UInt64Widget&) = delete; // Copy Assignment Not Implemented
+  UInt64Widget& operator=(UInt64Widget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
index 5f5d2b24eb..5cf71debf6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "UnknownWidget.h"
 
-
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
index 8d9b19207f..383317e4e5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -45,51 +44,45 @@
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
-
 #include "SVWidgetsLib/ui_UnknownWidget.h"
 
-
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class SVWidgetsLib_EXPORT UnknownWidget : public FilterParameterWidget, private Ui::UnknownWidget
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    UnknownWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
-
-    ~UnknownWidget() override;
-
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui() override;
-
-  public slots:
-    void widgetChanged(const QString& msg);
-    void beforePreflight();
-    void afterPreflight();
-    void filterNeedsInputParameters(AbstractFilter* filter);
-
-  private:
-
-    UnknownFilterParameter* m_FilterParameter;
-
-  public:
-    UnknownWidget(const UnknownWidget&) = delete;  // Copy Constructor Not Implemented
-    UnknownWidget(UnknownWidget&&) = delete;       // Move Constructor Not Implemented
-    UnknownWidget& operator=(const UnknownWidget&) = delete; // Copy Assignment Not Implemented
-    UnknownWidget& operator=(UnknownWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  UnknownWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~UnknownWidget() override;
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void widgetChanged(const QString& msg);
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+private:
+  UnknownFilterParameter* m_FilterParameter;
+
+public:
+  UnknownWidget(const UnknownWidget&) = delete;            // Copy Constructor Not Implemented
+  UnknownWidget(UnknownWidget&&) = delete;                 // Move Constructor Not Implemented
+  UnknownWidget& operator=(const UnknownWidget&) = delete; // Copy Assignment Not Implemented
+  UnknownWidget& operator=(UnknownWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
index d332fef578..9737818f5c 100644
--- a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
@@ -16,153 +16,153 @@
  *
  */
 
-
 #include "QRoundProgressBar.h"
 
 #include <QtGui/QPainter>
 
-QRoundProgressBar::QRoundProgressBar(QWidget *parent) :
-    QWidget(parent),
-    m_min(0), m_max(100),
-    m_value(25),
-    m_nullPosition(PositionTop),
-    m_barStyle(StyleDonut),
-    m_outlinePenWidth(1),
-    m_dataPenWidth(1),
-    m_rebuildBrush(false),
-    m_format("%p%"),
-    m_decimals(1),
-    m_updateFlags(UF_PERCENT)
+QRoundProgressBar::QRoundProgressBar(QWidget* parent)
+: QWidget(parent)
+, m_min(0)
+, m_max(100)
+, m_value(25)
+, m_nullPosition(PositionTop)
+, m_barStyle(StyleDonut)
+, m_outlinePenWidth(1)
+, m_dataPenWidth(1)
+, m_rebuildBrush(false)
+, m_format("%p%")
+, m_decimals(1)
+, m_updateFlags(UF_PERCENT)
 {
 }
 
 void QRoundProgressBar::setRange(double min, double max)
 {
-    m_min = min;
-    m_max = max;
+  m_min = min;
+  m_max = max;
 
-    if(m_max < m_min)
-    {
-      qSwap(m_max, m_min);
-    }
+  if(m_max < m_min)
+  {
+    qSwap(m_max, m_min);
+  }
 
-    if(m_value < m_min)
-    {
-      m_value = m_min;
-    }
-    else if(m_value > m_max)
-    {
-      m_value = m_max;
-    }
+  if(m_value < m_min)
+  {
+    m_value = m_min;
+  }
+  else if(m_value > m_max)
+  {
+    m_value = m_max;
+  }
 
-    if(!m_gradientData.isEmpty())
-    {
-      m_rebuildBrush = true;
-    }
+  if(!m_gradientData.isEmpty())
+  {
+    m_rebuildBrush = true;
+  }
 
-    update();
+  update();
 }
 
 void QRoundProgressBar::setMinimum(double min)
 {
-    setRange(min, m_max);
+  setRange(min, m_max);
 }
 
 void QRoundProgressBar::setMaximum(double max)
 {
-    setRange(m_min, max);
+  setRange(m_min, max);
 }
 
 void QRoundProgressBar::setValue(double val)
 {
-    if (m_value != val)
+  if(m_value != val)
+  {
+    if(val < m_min)
+    {
+      m_value = m_min;
+    }
+    else if(val > m_max)
+    {
+      m_value = m_max;
+    }
+    else
     {
-      if(val < m_min)
-      {
-        m_value = m_min;
-      }
-      else if(val > m_max)
-      {
-        m_value = m_max;
-      }
-      else
-      {
-        m_value = val;
-      }
-
-        update();
+      m_value = val;
     }
+
+    update();
+  }
 }
 
 void QRoundProgressBar::setValue(int val)
 {
-    setValue(double(val));
+  setValue(double(val));
 }
 
 void QRoundProgressBar::setNullPosition(double position)
 {
-    if (position != m_nullPosition)
-    {
-        m_nullPosition = position;
-
-        if(!m_gradientData.isEmpty())
-        {
-          m_rebuildBrush = true;
-        }
+  if(position != m_nullPosition)
+  {
+    m_nullPosition = position;
 
-        update();
+    if(!m_gradientData.isEmpty())
+    {
+      m_rebuildBrush = true;
     }
+
+    update();
+  }
 }
 
 void QRoundProgressBar::setBarStyle(QRoundProgressBar::BarStyle style)
 {
-    if (style != m_barStyle)
-    {
-        m_barStyle = style;
+  if(style != m_barStyle)
+  {
+    m_barStyle = style;
 
-        update();
-    }
+    update();
+  }
 }
 
 void QRoundProgressBar::setOutlinePenWidth(double penWidth)
 {
-    if (penWidth != m_outlinePenWidth)
-    {
-        m_outlinePenWidth = penWidth;
+  if(penWidth != m_outlinePenWidth)
+  {
+    m_outlinePenWidth = penWidth;
 
-        update();
-    }
+    update();
+  }
 }
 
 void QRoundProgressBar::setDataPenWidth(double penWidth)
 {
-    if (penWidth != m_dataPenWidth)
-    {
-        m_dataPenWidth = penWidth;
+  if(penWidth != m_dataPenWidth)
+  {
+    m_dataPenWidth = penWidth;
 
-        update();
-    }
+    update();
+  }
 }
 
-void QRoundProgressBar::setDataColors(const QGradientStops &stopPoints)
+void QRoundProgressBar::setDataColors(const QGradientStops& stopPoints)
 {
-    if (stopPoints != m_gradientData)
-    {
-        m_gradientData = stopPoints;
-        m_rebuildBrush = true;
+  if(stopPoints != m_gradientData)
+  {
+    m_gradientData = stopPoints;
+    m_rebuildBrush = true;
 
-        update();
-    }
+    update();
+  }
 }
 
-void QRoundProgressBar::setFormat(const QString &format)
+void QRoundProgressBar::setFormat(const QString& format)
 {
-    if (format != m_format)
-    {
-        m_format = format;
+  if(format != m_format)
+  {
+    m_format = format;
 
-        valueFormatChanged();
-    }
+    valueFormatChanged();
+  }
 }
 
 void QRoundProgressBar::resetFormat()
@@ -174,230 +174,224 @@ void QRoundProgressBar::resetFormat()
 
 void QRoundProgressBar::setDecimals(int count)
 {
-    if (count >= 0 && count != m_decimals)
-    {
-        m_decimals = count;
+  if(count >= 0 && count != m_decimals)
+  {
+    m_decimals = count;
 
-        valueFormatChanged();
-    }
+    valueFormatChanged();
+  }
 }
 
 void QRoundProgressBar::paintEvent(QPaintEvent* /*event*/)
 {
-    double outerRadius = qMin(width(), height());
-    QRectF baseRect(1, 1, outerRadius-2, outerRadius-2);
+  double outerRadius = qMin(width(), height());
+  QRectF baseRect(1, 1, outerRadius - 2, outerRadius - 2);
 
-    QImage buffer(outerRadius, outerRadius, QImage::Format_ARGB32_Premultiplied);
+  QImage buffer(outerRadius, outerRadius, QImage::Format_ARGB32_Premultiplied);
 
-    QPainter p(&buffer);
-    p.setRenderHint(QPainter::Antialiasing);
+  QPainter p(&buffer);
+  p.setRenderHint(QPainter::Antialiasing);
 
-    // data brush
-    rebuildDataBrushIfNeeded();
+  // data brush
+  rebuildDataBrushIfNeeded();
 
-    // background
-    drawBackground(p, buffer.rect());
+  // background
+  drawBackground(p, buffer.rect());
 
-    // base circle
-    drawBase(p, baseRect);
+  // base circle
+  drawBase(p, baseRect);
 
-    // data circle
-    double arcStep = 360.0 / (m_max - m_min) * m_value;
-    drawValue(p, baseRect, m_value, arcStep);
+  // data circle
+  double arcStep = 360.0 / (m_max - m_min) * m_value;
+  drawValue(p, baseRect, m_value, arcStep);
 
-    // center circle
-    double innerRadius(0);
-    QRectF innerRect;
-    calculateInnerRect(baseRect, outerRadius, innerRect, innerRadius);
-    drawInnerBackground(p, innerRect);
+  // center circle
+  double innerRadius(0);
+  QRectF innerRect;
+  calculateInnerRect(baseRect, outerRadius, innerRect, innerRadius);
+  drawInnerBackground(p, innerRect);
 
-    // text
-    drawText(p, innerRect, innerRadius, m_value);
+  // text
+  drawText(p, innerRect, innerRadius, m_value);
 
-    // finally draw the bar
-    p.end();
+  // finally draw the bar
+  p.end();
 
-    QPainter painter(this);
-    painter.fillRect(baseRect, palette().window());
-    painter.drawImage(0,0, buffer);
+  QPainter painter(this);
+  painter.fillRect(baseRect, palette().window());
+  painter.drawImage(0, 0, buffer);
 }
 
-void QRoundProgressBar::drawBackground(QPainter &p, const QRectF &baseRect)
+void QRoundProgressBar::drawBackground(QPainter& p, const QRectF& baseRect)
 {
   p.fillRect(baseRect, palette().window());
 }
 
-void QRoundProgressBar::drawBase(QPainter &p, const QRectF &baseRect)
+void QRoundProgressBar::drawBase(QPainter& p, const QRectF& baseRect)
 {
-    switch (m_barStyle)
-    {
-    case StyleDonut:
-        p.setPen(QPen(palette().shadow().color(), m_outlinePenWidth));
-        p.setBrush(palette().base());
-        p.drawEllipse(baseRect);
-        break;
-
-    case StylePie:
-        p.setPen(QPen(palette().base().color(), m_outlinePenWidth));
-        p.setBrush(palette().base());
-        p.drawEllipse(baseRect);
-        break;
-
-    case StyleLine:
-        p.setPen(QPen(palette().base().color(), m_outlinePenWidth));
-        p.setBrush(Qt::NoBrush);
-        p.drawEllipse(baseRect.adjusted(m_outlinePenWidth/2, m_outlinePenWidth/2, -m_outlinePenWidth/2, -m_outlinePenWidth/2));
-        break;
-
-    default:;
-    }
-
+  switch(m_barStyle)
+  {
+  case StyleDonut:
+    p.setPen(QPen(palette().shadow().color(), m_outlinePenWidth));
+    p.setBrush(palette().base());
+    p.drawEllipse(baseRect);
+    break;
+
+  case StylePie:
+    p.setPen(QPen(palette().base().color(), m_outlinePenWidth));
+    p.setBrush(palette().base());
+    p.drawEllipse(baseRect);
+    break;
+
+  case StyleLine:
+    p.setPen(QPen(palette().base().color(), m_outlinePenWidth));
+    p.setBrush(Qt::NoBrush);
+    p.drawEllipse(baseRect.adjusted(m_outlinePenWidth / 2, m_outlinePenWidth / 2, -m_outlinePenWidth / 2, -m_outlinePenWidth / 2));
+    break;
+
+  default:;
+  }
 }
 
-void QRoundProgressBar::drawValue(QPainter &p, const QRectF &baseRect, double value, double arcLength)
+void QRoundProgressBar::drawValue(QPainter& p, const QRectF& baseRect, double value, double arcLength)
 {
-    // nothing to draw
-    if(value == m_min)
-    {
-      return;
-    }
+  // nothing to draw
+  if(value == m_min)
+  {
+    return;
+  }
 
-    // for Line style
-    if (m_barStyle == StyleLine)
-    {
-        p.setPen(QPen(palette().highlight().color(), m_dataPenWidth));
-        p.setBrush(Qt::NoBrush);
-        p.drawArc(baseRect.adjusted(m_outlinePenWidth/2, m_outlinePenWidth/2, -m_outlinePenWidth/2, -m_outlinePenWidth/2),
-                  m_nullPosition * 16,
-                  -arcLength * 16);
-        return;
-    }
+  // for Line style
+  if(m_barStyle == StyleLine)
+  {
+    p.setPen(QPen(palette().highlight().color(), m_dataPenWidth));
+    p.setBrush(Qt::NoBrush);
+    p.drawArc(baseRect.adjusted(m_outlinePenWidth / 2, m_outlinePenWidth / 2, -m_outlinePenWidth / 2, -m_outlinePenWidth / 2), m_nullPosition * 16, -arcLength * 16);
+    return;
+  }
 
-    // for Pie and Donut styles
-    QPainterPath dataPath;
-    dataPath.setFillRule(Qt::WindingFill);
+  // for Pie and Donut styles
+  QPainterPath dataPath;
+  dataPath.setFillRule(Qt::WindingFill);
 
-    // pie segment outer
-    dataPath.moveTo(baseRect.center());
-    dataPath.arcTo(baseRect, m_nullPosition, -arcLength);
-    dataPath.lineTo(baseRect.center());
+  // pie segment outer
+  dataPath.moveTo(baseRect.center());
+  dataPath.arcTo(baseRect, m_nullPosition, -arcLength);
+  dataPath.lineTo(baseRect.center());
 
-    p.setBrush(palette().highlight());
-    p.setPen(QPen(palette().shadow().color(), m_dataPenWidth));
-    p.drawPath(dataPath);
+  p.setBrush(palette().highlight());
+  p.setPen(QPen(palette().shadow().color(), m_dataPenWidth));
+  p.drawPath(dataPath);
 }
 
-void QRoundProgressBar::calculateInnerRect(const QRectF &/*baseRect*/, double outerRadius, QRectF &innerRect, double &innerRadius)
+void QRoundProgressBar::calculateInnerRect(const QRectF& /*baseRect*/, double outerRadius, QRectF& innerRect, double& innerRadius)
 {
-    // for Line style
-    if (m_barStyle == StyleLine)
-    {
-        innerRadius = outerRadius - m_outlinePenWidth;
-    }
-    else    // for Pie and Donut styles
-    {
-        innerRadius = outerRadius * 0.75;
-    }
+  // for Line style
+  if(m_barStyle == StyleLine)
+  {
+    innerRadius = outerRadius - m_outlinePenWidth;
+  }
+  else // for Pie and Donut styles
+  {
+    innerRadius = outerRadius * 0.75;
+  }
 
-    double delta = (outerRadius - innerRadius) / 2;
-    innerRect = QRectF(delta, delta, innerRadius, innerRadius);
+  double delta = (outerRadius - innerRadius) / 2;
+  innerRect = QRectF(delta, delta, innerRadius, innerRadius);
 }
 
-void QRoundProgressBar::drawInnerBackground(QPainter &p, const QRectF &innerRect)
+void QRoundProgressBar::drawInnerBackground(QPainter& p, const QRectF& innerRect)
 {
-    if (m_barStyle == StyleDonut)
-    {
-        p.setBrush(palette().alternateBase());
-        p.drawEllipse(innerRect);
-    }
+  if(m_barStyle == StyleDonut)
+  {
+    p.setBrush(palette().alternateBase());
+    p.drawEllipse(innerRect);
+  }
 }
 
-void QRoundProgressBar::drawText(QPainter &p, const QRectF &innerRect, double innerRadius, double value)
+void QRoundProgressBar::drawText(QPainter& p, const QRectF& innerRect, double innerRadius, double value)
 {
   if(m_format.isEmpty())
   {
     return;
   }
 
-    // !!! to revise
-    QFont f(font());
-    f.setPixelSize(innerRadius * qMax(0.05, (0.35 - (double)m_decimals * 0.08)));
-    p.setFont(f);
+  // !!! to revise
+  QFont f(font());
+  f.setPixelSize(innerRadius * qMax(0.05, (0.35 - (double)m_decimals * 0.08)));
+  p.setFont(f);
 
-    QRectF textRect(innerRect);
-    p.setPen(palette().text().color());
-    p.drawText(textRect, Qt::AlignCenter, valueToText(value));
+  QRectF textRect(innerRect);
+  p.setPen(palette().text().color());
+  p.drawText(textRect, Qt::AlignCenter, valueToText(value));
 }
 
 QString QRoundProgressBar::valueToText(double value) const
 {
-    QString textToDraw(m_format);
+  QString textToDraw(m_format);
 
-    if((m_updateFlags & UF_VALUE) != 0)
-    {
-      textToDraw.replace("%v", QString::number(value, 'f', m_decimals));
-    }
+  if((m_updateFlags & UF_VALUE) != 0)
+  {
+    textToDraw.replace("%v", QString::number(value, 'f', m_decimals));
+  }
 
-    if((m_updateFlags & UF_PERCENT) != 0)
-    {
-        double procent = (value - m_min) / (m_max - m_min) * 100.0;
-        textToDraw.replace("%p", QString::number(procent, 'f', m_decimals));
-    }
+  if((m_updateFlags & UF_PERCENT) != 0)
+  {
+    double procent = (value - m_min) / (m_max - m_min) * 100.0;
+    textToDraw.replace("%p", QString::number(procent, 'f', m_decimals));
+  }
 
-    if((m_updateFlags & UF_MAX) != 0)
-    {
-      textToDraw.replace("%m", QString::number(m_max - m_min + 1, 'f', m_decimals));
-    }
+  if((m_updateFlags & UF_MAX) != 0)
+  {
+    textToDraw.replace("%m", QString::number(m_max - m_min + 1, 'f', m_decimals));
+  }
 
-    return textToDraw;
+  return textToDraw;
 }
 
 void QRoundProgressBar::valueFormatChanged()
 {
-    m_updateFlags = 0;
+  m_updateFlags = 0;
 
-    if(m_format.contains("%v"))
-    {
-      m_updateFlags |= UF_VALUE;
-    }
+  if(m_format.contains("%v"))
+  {
+    m_updateFlags |= UF_VALUE;
+  }
 
-    if(m_format.contains("%p"))
-    {
-      m_updateFlags |= UF_PERCENT;
-    }
+  if(m_format.contains("%p"))
+  {
+    m_updateFlags |= UF_PERCENT;
+  }
 
-    if(m_format.contains("%m"))
-    {
-      m_updateFlags |= UF_MAX;
-    }
+  if(m_format.contains("%m"))
+  {
+    m_updateFlags |= UF_MAX;
+  }
 
-    update();
+  update();
 }
 
 void QRoundProgressBar::rebuildDataBrushIfNeeded()
 {
-    if (m_rebuildBrush)
-    {
-        m_rebuildBrush = false;
-
-        QConicalGradient dataBrush;
-        dataBrush.setCenter(0.5,0.5);
-        dataBrush.setCoordinateMode(QGradient::StretchToDeviceMode);
-
-        // invert colors
-        for (int i = 0; i < m_gradientData.count(); i++)
-        {
-            dataBrush.setColorAt(1.0 - m_gradientData.at(i).first, m_gradientData.at(i).second);
-        }
+  if(m_rebuildBrush)
+  {
+    m_rebuildBrush = false;
 
-        // angle
-        dataBrush.setAngle(m_nullPosition);
+    QConicalGradient dataBrush;
+    dataBrush.setCenter(0.5, 0.5);
+    dataBrush.setCoordinateMode(QGradient::StretchToDeviceMode);
 
-        QPalette p(palette());
-        p.setBrush(QPalette::Highlight, dataBrush);
-        setPalette(p);
+    // invert colors
+    for(int i = 0; i < m_gradientData.count(); i++)
+    {
+      dataBrush.setColorAt(1.0 - m_gradientData.at(i).first, m_gradientData.at(i).second);
     }
-}
-
 
+    // angle
+    dataBrush.setAngle(m_nullPosition);
 
+    QPalette p(palette());
+    p.setBrush(QPalette::Highlight, dataBrush);
+    setPalette(p);
+  }
+}
diff --git a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.h b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.h
old mode 100755
new mode 100644
index ed26f02ab3..c0c0280e1c
--- a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.h
+++ b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.h
@@ -60,193 +60,228 @@
  */
 class SVWidgetsLib_EXPORT QRoundProgressBar : public QWidget
 {
-    Q_OBJECT
-public:    
-    explicit QRoundProgressBar(QWidget *parent = 0);
-
-    static const int PositionLeft = 180;
-    static const int PositionTop = 90;
-    static const int PositionRight = 0;
-    static const int PositionBottom = -90;
-
-    /**
-     * @brief Return position (in degrees) of minimum value.
-     * \sa setNullPosition
-     */
-    double nullPosition() const { return m_nullPosition; }
-    /**
-     * @brief Defines position of minimum value.
-     * @param position position on the circle (in degrees) of minimum value
-     * \sa nullPosition
-     */
-    void setNullPosition(double position);
-
-    /**
-     * @brief The BarStyle enum defines general look of the progress bar.
-     */
-    enum BarStyle
-    {
-        /// Donut style (filled torus around the text)
-        StyleDonut,
-        /// Pie style (filled pie segment with the text in center)
-        StylePie,
-        /// Line style (thin round line around the text)
-        StyleLine
-    };
-    /**
-     * @brief Sets visual style of the widget.
-     * \sa barStyle
-     */
-    void setBarStyle(BarStyle style);
-    /**
-     * @brief Returns current progree bar style.
-     * \sa setBarStyle
-     */
-    BarStyle barStyle() const { return m_barStyle; }
-
-    /**
-     * @brief Sets width of the outline circle pen.
-     * @param penWidth width of the outline circle pen (in pixels)
-     */
-    void setOutlinePenWidth(double penWidth);
-    /**
-     * @brief Returns width of the outline circle pen.
-     */
-    double outlinePenWidth() const { return m_outlinePenWidth; }
-
-    /**
-     * @brief Sets width of the data circle pen.
-     * @param penWidth width of the data circle pen (in pixels)
-     */
-    void setDataPenWidth(double penWidth);
-    /**
-     * @brief Returns width of the data circle pen.
-     */
-    double dataPenWidth() const { return m_dataPenWidth; }
-
-    /**
-     * @brief Sets colors of the visible data and makes gradient brush from them.
-     * Gradient colors can be set for \a Donut and \a Pie styles (see setBarStyle() function).
-     *
-     * *Warning*: this function will override widget's `palette()` to set dynamically created gradient brush.
-     *
-     * @param stopPoints List of colors (should have at least 2 values, see Qt's \a QGradientStops for more details).
-     * Color value at point 0 corresponds to the minimum() value, while color value at point 1
-     * corresponds to the maximum(). Other colors will be distributed accordingly to the defined ranges (see setRange()).
-     */
-    void setDataColors(const QGradientStops& stopPoints);
-
-    /**
-     * @brief Defines the string used to generate the current text.
-     * If no format is set, no text will be shown.
-     * @param format see \a QProgressBar's format description
-     * \sa setDecimals
-     */
-    void setFormat(const QString& format);
-    /**
-     * @brief Sets format string to empty string. No text will be shown therefore.
-     * See setFormat() for more information.
-     */
-    void resetFormat();
-    /**
-     * @brief Returns the string used to generate the current text.
-     */
-    QString	format() const { return m_format; }
-
-    /**
-     * @brief Sets number of decimals to show after the comma (default is 1).
-     * \sa setFormat
-     */
-    void setDecimals(int count);
-    /**
-     * @brief Returns number of decimals to show after the comma (default is 1).
-     * \sa setFormat, setDecimals
-     */
-    int decimals() const { return m_decimals; }
-
-    /**
-     * @brief Returns current value shown on the widget.
-     * \sa setValue()
-     */
-    double value() const { return m_value; }
-    /**
-     * @brief Returns minimum of the allowed value range.
-     * \sa setMinimum, setRange
-     */
-    double minimum() const { return m_min; }
-    /**
-     * @brief Returns maximum of the allowed value range.
-    * \sa setMaximum, setRange
-     */
-    double maximum() const { return m_max; }
+  Q_OBJECT
+public:
+  explicit QRoundProgressBar(QWidget* parent = 0);
+
+  static const int PositionLeft = 180;
+  static const int PositionTop = 90;
+  static const int PositionRight = 0;
+  static const int PositionBottom = -90;
+
+  /**
+   * @brief Return position (in degrees) of minimum value.
+   * \sa setNullPosition
+   */
+  double nullPosition() const
+  {
+    return m_nullPosition;
+  }
+  /**
+   * @brief Defines position of minimum value.
+   * @param position position on the circle (in degrees) of minimum value
+   * \sa nullPosition
+   */
+  void setNullPosition(double position);
+
+  /**
+   * @brief The BarStyle enum defines general look of the progress bar.
+   */
+  enum BarStyle
+  {
+    /// Donut style (filled torus around the text)
+    StyleDonut,
+    /// Pie style (filled pie segment with the text in center)
+    StylePie,
+    /// Line style (thin round line around the text)
+    StyleLine
+  };
+  /**
+   * @brief Sets visual style of the widget.
+   * \sa barStyle
+   */
+  void setBarStyle(BarStyle style);
+  /**
+   * @brief Returns current progree bar style.
+   * \sa setBarStyle
+   */
+  BarStyle barStyle() const
+  {
+    return m_barStyle;
+  }
+
+  /**
+   * @brief Sets width of the outline circle pen.
+   * @param penWidth width of the outline circle pen (in pixels)
+   */
+  void setOutlinePenWidth(double penWidth);
+  /**
+   * @brief Returns width of the outline circle pen.
+   */
+  double outlinePenWidth() const
+  {
+    return m_outlinePenWidth;
+  }
+
+  /**
+   * @brief Sets width of the data circle pen.
+   * @param penWidth width of the data circle pen (in pixels)
+   */
+  void setDataPenWidth(double penWidth);
+  /**
+   * @brief Returns width of the data circle pen.
+   */
+  double dataPenWidth() const
+  {
+    return m_dataPenWidth;
+  }
+
+  /**
+   * @brief Sets colors of the visible data and makes gradient brush from them.
+   * Gradient colors can be set for \a Donut and \a Pie styles (see setBarStyle() function).
+   *
+   * *Warning*: this function will override widget's `palette()` to set dynamically created gradient brush.
+   *
+   * @param stopPoints List of colors (should have at least 2 values, see Qt's \a QGradientStops for more details).
+   * Color value at point 0 corresponds to the minimum() value, while color value at point 1
+   * corresponds to the maximum(). Other colors will be distributed accordingly to the defined ranges (see setRange()).
+   */
+  void setDataColors(const QGradientStops& stopPoints);
+
+  /**
+   * @brief Defines the string used to generate the current text.
+   * If no format is set, no text will be shown.
+   * @param format see \a QProgressBar's format description
+   * \sa setDecimals
+   */
+  void setFormat(const QString& format);
+  /**
+   * @brief Sets format string to empty string. No text will be shown therefore.
+   * See setFormat() for more information.
+   */
+  void resetFormat();
+  /**
+   * @brief Returns the string used to generate the current text.
+   */
+  QString format() const
+  {
+    return m_format;
+  }
+
+  /**
+   * @brief Sets number of decimals to show after the comma (default is 1).
+   * \sa setFormat
+   */
+  void setDecimals(int count);
+  /**
+   * @brief Returns number of decimals to show after the comma (default is 1).
+   * \sa setFormat, setDecimals
+   */
+  int decimals() const
+  {
+    return m_decimals;
+  }
+
+  /**
+   * @brief Returns current value shown on the widget.
+   * \sa setValue()
+   */
+  double value() const
+  {
+    return m_value;
+  }
+  /**
+   * @brief Returns minimum of the allowed value range.
+   * \sa setMinimum, setRange
+   */
+  double minimum() const
+  {
+    return m_min;
+  }
+  /**
+   * @brief Returns maximum of the allowed value range.
+   * \sa setMaximum, setRange
+   */
+  double maximum() const
+  {
+    return m_max;
+  }
 
 public Q_SLOTS:
-    /**
-     * @brief Defines minimum und maximum of the allowed value range.
-     * If the current value does not fit into the range, it will be automatically adjusted.
-     * @param min minimum of the allowed value range
-     * @param max maximum of the allowed value range
-     */
-    void setRange(double min, double max);
-    /**
-     * @brief Defines minimum of the allowed value range.
-     * If the current value does not fit into the range, it will be automatically adjusted.
-     * @param min minimum of the allowed value range
-     * \sa setRange
-     */
-    void setMinimum(double min);
-    /**
-     * @brief Defines maximum of the allowed value range.
-     * If the current value does not fit into the range, it will be automatically adjusted.
-     * @param max maximum of the allowed value range
-     * \sa setRange
-     */
-    void setMaximum(double max);
-    /**
-     * @brief Sets a value which will be shown on the widget.
-     * @param val must be between minimum() and maximum()
-     */
-    void setValue(double val);
-    /**
-     * @brief Integer version of the previous slot.
-     * @param val must be between minimum() and maximum()
-     */
-    void setValue(int val);
+  /**
+   * @brief Defines minimum und maximum of the allowed value range.
+   * If the current value does not fit into the range, it will be automatically adjusted.
+   * @param min minimum of the allowed value range
+   * @param max maximum of the allowed value range
+   */
+  void setRange(double min, double max);
+  /**
+   * @brief Defines minimum of the allowed value range.
+   * If the current value does not fit into the range, it will be automatically adjusted.
+   * @param min minimum of the allowed value range
+   * \sa setRange
+   */
+  void setMinimum(double min);
+  /**
+   * @brief Defines maximum of the allowed value range.
+   * If the current value does not fit into the range, it will be automatically adjusted.
+   * @param max maximum of the allowed value range
+   * \sa setRange
+   */
+  void setMaximum(double max);
+  /**
+   * @brief Sets a value which will be shown on the widget.
+   * @param val must be between minimum() and maximum()
+   */
+  void setValue(double val);
+  /**
+   * @brief Integer version of the previous slot.
+   * @param val must be between minimum() and maximum()
+   */
+  void setValue(int val);
 
 protected:
-    void paintEvent(QPaintEvent *event) override;
-    virtual void drawBackground(QPainter& p, const QRectF& baseRect);
-    virtual void drawBase(QPainter& p, const QRectF& baseRect);
-    virtual void drawValue(QPainter& p, const QRectF& baseRect, double value, double arcLength);
-    virtual void calculateInnerRect(const QRectF& baseRect, double outerRadius, QRectF& innerRect, double& innerRadius);
-    virtual void drawInnerBackground(QPainter& p, const QRectF& innerRect);
-    virtual void drawText(QPainter& p, const QRectF& innerRect, double innerRadius, double value);
-    virtual QString valueToText(double value) const;
-    virtual void valueFormatChanged();
+  void paintEvent(QPaintEvent* event) override;
+  virtual void drawBackground(QPainter& p, const QRectF& baseRect);
+  virtual void drawBase(QPainter& p, const QRectF& baseRect);
+  virtual void drawValue(QPainter& p, const QRectF& baseRect, double value, double arcLength);
+  virtual void calculateInnerRect(const QRectF& baseRect, double outerRadius, QRectF& innerRect, double& innerRadius);
+  virtual void drawInnerBackground(QPainter& p, const QRectF& innerRect);
+  virtual void drawText(QPainter& p, const QRectF& innerRect, double innerRadius, double value);
+  virtual QString valueToText(double value) const;
+  virtual void valueFormatChanged();
 
-    QSize minimumSizeHint() const override { return QSize(32,32); }
+  QSize minimumSizeHint() const override
+  {
+    return QSize(32, 32);
+  }
 
-    bool hasHeightForWidth() const override { return true; }
-    int heightForWidth(int w) const override { return w; }
+  bool hasHeightForWidth() const override
+  {
+    return true;
+  }
+  int heightForWidth(int w) const override
+  {
+    return w;
+  }
 
-    void rebuildDataBrushIfNeeded();
+  void rebuildDataBrushIfNeeded();
 
-    double m_min, m_max;
-    double m_value;
+  double m_min, m_max;
+  double m_value;
 
-    double m_nullPosition;
-    BarStyle m_barStyle;
-    double m_outlinePenWidth, m_dataPenWidth;
+  double m_nullPosition;
+  BarStyle m_barStyle;
+  double m_outlinePenWidth, m_dataPenWidth;
 
-    QGradientStops m_gradientData;
-    bool m_rebuildBrush;
+  QGradientStops m_gradientData;
+  bool m_rebuildBrush;
 
-    QString m_format;
-    int m_decimals;
+  QString m_format;
+  int m_decimals;
 
-    static const int UF_VALUE = 1;
-    static const int UF_PERCENT = 2;
-    static const int UF_MAX = 4;
-    int m_updateFlags;
+  static const int UF_VALUE = 1;
+  static const int UF_PERCENT = 2;
+  static const int UF_MAX = 4;
+  int m_updateFlags;
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
index c5eb30d107..e008181224 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSApplicationAboutBoxDialog.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
old mode 100755
new mode 100644
index 7c1fd1e35b..0cc1a74f10
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
@@ -1,51 +1,47 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QDialog>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 //-- UIC generated Header
 #include <ui_QtSApplicationAboutBoxDialog.h>
 
-
 /**
  * @class QtSApplicationAboutBoxDialog QtSApplicationAboutBoxDialog.h R3D/Common/Qt/QtSApplicationAboutBoxDialog.h
  * @brief This will display a simple dialog box that acts like an "About Box" for
@@ -54,51 +50,46 @@
  * @date Sept 14, 2010
  * @version 1.0
  */
-class SVWidgetsLib_EXPORT QtSApplicationAboutBoxDialog: public QDialog, private Ui::QtSApplicationAboutBoxDialog
+class SVWidgetsLib_EXPORT QtSApplicationAboutBoxDialog : public QDialog, private Ui::QtSApplicationAboutBoxDialog
 {
-    Q_OBJECT
-
-  public:
-    QtSApplicationAboutBoxDialog(QStringList files, QWidget* parent = nullptr);
-    ~QtSApplicationAboutBoxDialog() override;
-
-    /**
-     * @brief Sets information about the application
-     * @param appName
-     * @param appVersion
-     */
-    void setApplicationInfo( QString appName, QString appVersion);
-
-    /**
-     * @brief This will set the list of licenses that can be viewed by the
-     * about box. The list should contain values such as ":/SomeLicense.license" which
-     * are defined in a Qt resource file (*.qrc).
-     * @param files The QString list of files to allow the About Box to load.
-     */
-    void setLicenseFiles(QStringList files);
-
-
-  protected slots:
-    void on_licenseCombo_currentIndexChanged(int index);
-
-
-  protected:
-
-    /**
-     * @brief Loads a file that is stored as a resource in the applications Qt resource
-     * system.
-     * @param qresourceFile The source file to load of the form ":/SomeFile.xxx"
-     */
-    void loadResourceFile(const QString qresourceFile);
-
-  private:
-    QStringList m_licenseFiles;
-
-  public:
-    QtSApplicationAboutBoxDialog(const QtSApplicationAboutBoxDialog&) = delete; // Copy Constructor Not Implemented
-    QtSApplicationAboutBoxDialog(QtSApplicationAboutBoxDialog&&) = delete;      // Move Constructor Not Implemented
-    QtSApplicationAboutBoxDialog& operator=(const QtSApplicationAboutBoxDialog&) = delete; // Copy Assignment Not Implemented
-    QtSApplicationAboutBoxDialog& operator=(QtSApplicationAboutBoxDialog&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  QtSApplicationAboutBoxDialog(QStringList files, QWidget* parent = nullptr);
+  ~QtSApplicationAboutBoxDialog() override;
+
+  /**
+   * @brief Sets information about the application
+   * @param appName
+   * @param appVersion
+   */
+  void setApplicationInfo(QString appName, QString appVersion);
+
+  /**
+   * @brief This will set the list of licenses that can be viewed by the
+   * about box. The list should contain values such as ":/SomeLicense.license" which
+   * are defined in a Qt resource file (*.qrc).
+   * @param files The QString list of files to allow the About Box to load.
+   */
+  void setLicenseFiles(QStringList files);
+
+protected slots:
+  void on_licenseCombo_currentIndexChanged(int index);
+
+protected:
+  /**
+   * @brief Loads a file that is stored as a resource in the applications Qt resource
+   * system.
+   * @param qresourceFile The source file to load of the form ":/SomeFile.xxx"
+   */
+  void loadResourceFile(const QString qresourceFile);
+
+private:
+  QStringList m_licenseFiles;
+
+public:
+  QtSApplicationAboutBoxDialog(const QtSApplicationAboutBoxDialog&) = delete;            // Copy Constructor Not Implemented
+  QtSApplicationAboutBoxDialog(QtSApplicationAboutBoxDialog&&) = delete;                 // Move Constructor Not Implemented
+  QtSApplicationAboutBoxDialog& operator=(const QtSApplicationAboutBoxDialog&) = delete; // Copy Assignment Not Implemented
+  QtSApplicationAboutBoxDialog& operator=(QtSApplicationAboutBoxDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
index 5babb72346..1a16cccf2f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSApplicationFileInfo.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
old mode 100755
new mode 100644
index 52e88fb7ed..5c7c30cdf2
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,20 +39,18 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 class SVWidgetsLib_EXPORT QtSApplicationFileInfo
 {
 
-  public:
-    QtSApplicationFileInfo();
-    ~QtSApplicationFileInfo();
+public:
+  QtSApplicationFileInfo();
+  ~QtSApplicationFileInfo();
 
-    static QString GenerateFileSystemPath(QString pathEnding);
+  static QString GenerateFileSystemPath(QString pathEnding);
 
-  public:
-    QtSApplicationFileInfo(const QtSApplicationFileInfo&) = delete;            // Copy Constructor Not Implemented
-    QtSApplicationFileInfo(QtSApplicationFileInfo&&) = delete;                 // Move Constructor Not Implemented
-    QtSApplicationFileInfo& operator=(const QtSApplicationFileInfo&) = delete; // Copy Assignment Not Implemented
-    QtSApplicationFileInfo& operator=(QtSApplicationFileInfo&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSApplicationFileInfo(const QtSApplicationFileInfo&) = delete;            // Copy Constructor Not Implemented
+  QtSApplicationFileInfo(QtSApplicationFileInfo&&) = delete;                 // Move Constructor Not Implemented
+  QtSApplicationFileInfo& operator=(const QtSApplicationFileInfo&) = delete; // Copy Assignment Not Implemented
+  QtSApplicationFileInfo& operator=(QtSApplicationFileInfo&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
index 61cccd1ca5..4adac1745b 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSBookmarkMissingDialog.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
old mode 100755
new mode 100644
index ad5723ca9d..1fb90423ca
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,29 +42,26 @@
 //-- UIC generated Header
 #include <ui_QtSBookmarkMissingDialog.h>
 
-
 class SVWidgetsLib_EXPORT QtSBookmarkMissingDialog : public QDialog, private Ui::QtSBookmarkMissingDialog
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    QtSBookmarkMissingDialog(QWidget* parent = nullptr, Qt::WindowFlags flags = 0);
-    ~QtSBookmarkMissingDialog() override;
+public:
+  QtSBookmarkMissingDialog(QWidget* parent = nullptr, Qt::WindowFlags flags = 0);
+  ~QtSBookmarkMissingDialog() override;
 
-    void setBookmarkName(QString name);
+  void setBookmarkName(QString name);
 
-  protected slots:
-    void on_locateBtn_clicked();
-    void on_cancelBtn_clicked();
+protected slots:
+  void on_locateBtn_clicked();
+  void on_cancelBtn_clicked();
 
-  private:
-    QString m_OpenDialogLastFilePath;
+private:
+  QString m_OpenDialogLastFilePath;
 
-  public:
-    QtSBookmarkMissingDialog(const QtSBookmarkMissingDialog&) = delete; // Copy Constructor Not Implemented
-    QtSBookmarkMissingDialog(QtSBookmarkMissingDialog&&) = delete;      // Move Constructor Not Implemented
-    QtSBookmarkMissingDialog& operator=(const QtSBookmarkMissingDialog&) = delete; // Copy Assignment Not Implemented
-    QtSBookmarkMissingDialog& operator=(QtSBookmarkMissingDialog&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSBookmarkMissingDialog(const QtSBookmarkMissingDialog&) = delete;            // Copy Constructor Not Implemented
+  QtSBookmarkMissingDialog(QtSBookmarkMissingDialog&&) = delete;                 // Move Constructor Not Implemented
+  QtSBookmarkMissingDialog& operator=(const QtSBookmarkMissingDialog&) = delete; // Copy Assignment Not Implemented
+  QtSBookmarkMissingDialog& operator=(QtSBookmarkMissingDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
index d7de8ae0c4..fe6b259675 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSCheckboxDialog.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
old mode 100755
new mode 100644
index a37f4bc2a4..01038a5702
--- a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -44,33 +43,30 @@
 
 class QCheckBox;
 
-
 /*
  *
  */
 class SVWidgetsLib_EXPORT QtSCheckboxDialog : public QDialog
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    QtSCheckboxDialog(QVector<QString> list, QWidget* parent = nullptr);
-    ~QtSCheckboxDialog() override;
+public:
+  QtSCheckboxDialog(QVector<QString> list, QWidget* parent = nullptr);
+  ~QtSCheckboxDialog() override;
 
-    bool getValue(QString key);
-    void setValue(QString key, bool value);
+  bool getValue(QString key);
+  void setValue(QString key, bool value);
 
-  protected:
-    void setupGui();
+protected:
+  void setupGui();
 
-  private:
-    QVector<QString>    m_List;
-    QMap<QString, QCheckBox*>   m_WidgetMap;
+private:
+  QVector<QString> m_List;
+  QMap<QString, QCheckBox*> m_WidgetMap;
 
-  public:
-    QtSCheckboxDialog(const QtSCheckboxDialog&) = delete; // Copy Constructor Not Implemented
-    QtSCheckboxDialog(QtSCheckboxDialog&&) = delete;      // Move Constructor Not Implemented
-    QtSCheckboxDialog& operator=(const QtSCheckboxDialog&) = delete; // Copy Assignment Not Implemented
-    QtSCheckboxDialog& operator=(QtSCheckboxDialog&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSCheckboxDialog(const QtSCheckboxDialog&) = delete;            // Copy Constructor Not Implemented
+  QtSCheckboxDialog(QtSCheckboxDialog&&) = delete;                 // Move Constructor Not Implemented
+  QtSCheckboxDialog& operator=(const QtSCheckboxDialog&) = delete; // Copy Assignment Not Implemented
+  QtSCheckboxDialog& operator=(QtSCheckboxDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
index 0598cde885..491d0c6805 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSColorComboPicker.h"
 #include <QtGui/QColor>
diff --git a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
old mode 100755
new mode 100644
index 1ccb511446..257111b642
--- a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,18 +44,16 @@ class QWidget;
 
 class SVWidgetsLib_EXPORT QtSColorComboPicker : public QComboBox
 {
-    Q_OBJECT
-    Q_PROPERTY(QColor color READ color WRITE setColor USER true)
+  Q_OBJECT
+  Q_PROPERTY(QColor color READ color WRITE setColor USER true)
 
-  public:
-    QtSColorComboPicker(QWidget* widget = 0);
+public:
+  QtSColorComboPicker(QWidget* widget = 0);
 
-  public:
-    QColor color() const;
-    void setColor(QColor c);
+public:
+  QColor color() const;
+  void setColor(QColor c);
 
-  private:
-    void populateList();
+private:
+  void populateList();
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
index a1751307a0..0dab1adbec 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
@@ -40,16 +40,13 @@
 
 #include <QtCore/QPropertyAnimation>
 
-
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 QtSDisclosableWidget::QtSDisclosableWidget(QWidget* parent)
 : QWidget(parent)
 {
-//  connect(this, SIGNAL(toggled(bool)), this, SLOT(disclose(bool)));
+  //  connect(this, SIGNAL(toggled(bool)), this, SLOT(disclose(bool)));
 
   toggleButton.setStyleSheet("QToolButton { border: none; }");
   toggleButton.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@@ -61,7 +58,7 @@ QtSDisclosableWidget::QtSDisclosableWidget(QWidget* parent)
   headerLine.setFrameShadow(QFrame::Sunken);
   headerLine.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
 
-//  contentArea.setStyleSheet("QScrollArea { border: none; }");
+  //  contentArea.setStyleSheet("QScrollArea { border: none; }");
   contentArea.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
   contentArea.setMaximumHeight(0);
   contentArea.setMinimumHeight(0);
@@ -106,13 +103,12 @@ void QtSDisclosableWidget::updateWidgetStyle()
 // -----------------------------------------------------------------------------
 void QtSDisclosableWidget::setupGui()
 {
-
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSDisclosableWidget::setTitle(const QString &title)
+void QtSDisclosableWidget::setTitle(const QString& title)
 {
   toggleButton.setText(title);
 }
@@ -126,13 +122,14 @@ void QtSDisclosableWidget::setContentLayout(QLayout* contentLayout)
   contentArea.setLayout(contentLayout);
   const auto collapsedHeight = sizeHint().height() - contentArea.maximumHeight();
   auto contentHeight = contentLayout->sizeHint().height();
-  for (int i = 0; i < toggleAnimation.animationCount() - 1; ++i) {
-    QPropertyAnimation * spoilerAnimation = static_cast<QPropertyAnimation *>(toggleAnimation.animationAt(i));
+  for(int i = 0; i < toggleAnimation.animationCount() - 1; ++i)
+  {
+    QPropertyAnimation* spoilerAnimation = static_cast<QPropertyAnimation*>(toggleAnimation.animationAt(i));
     spoilerAnimation->setDuration(animationDuration);
     spoilerAnimation->setStartValue(collapsedHeight);
     spoilerAnimation->setEndValue(collapsedHeight + contentHeight);
   }
-  QPropertyAnimation * contentAnimation = static_cast<QPropertyAnimation *>(toggleAnimation.animationAt(toggleAnimation.animationCount() - 1));
+  QPropertyAnimation* contentAnimation = static_cast<QPropertyAnimation*>(toggleAnimation.animationAt(toggleAnimation.animationCount() - 1));
   contentAnimation->setDuration(animationDuration);
   contentAnimation->setStartValue(0);
   contentAnimation->setEndValue(contentHeight);
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
index 38a469b93f..b72d7339d2 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
@@ -68,24 +68,24 @@ class SVWidgetsLib_EXPORT QtSDisclosableWidget : public QWidget
 
   void setContentLayout(QLayout* contentLayout);
 
-  void setTitle(const QString &title);
+  void setTitle(const QString& title);
 
 signals:
   void dragStarted(QtSDisclosableWidget* widget);
 
 public slots:
-//  void disclose(bool on);
+  //  void disclose(bool on);
 
   /**
-      * @brief Sets the style of the Widget to indicate a selected or non-selected
-      * state
-      * @param selected Is the widget selected or not.
-      */
+   * @brief Sets the style of the Widget to indicate a selected or non-selected
+   * state
+   * @param selected Is the widget selected or not.
+   */
   void changeStyle();
 
   /**
-      *@brief
-      */
+   *@brief
+   */
   void updateWidgetStyle();
 
 private:
@@ -97,9 +97,8 @@ public slots:
   int animationDuration = 300;
 
 public:
-  QtSDisclosableWidget(const QtSDisclosableWidget&) = delete; // Copy Constructor Not Implemented
-  QtSDisclosableWidget(QtSDisclosableWidget&&) = delete;      // Move Constructor Not Implemented
+  QtSDisclosableWidget(const QtSDisclosableWidget&) = delete;            // Copy Constructor Not Implemented
+  QtSDisclosableWidget(QtSDisclosableWidget&&) = delete;                 // Move Constructor Not Implemented
   QtSDisclosableWidget& operator=(const QtSDisclosableWidget&) = delete; // Copy Assignment Not Implemented
   QtSDisclosableWidget& operator=(QtSDisclosableWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
index 60bc7b54c7..3efff4a1f7 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSDistributionTypeWidget.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
old mode 100755
new mode 100644
index 3f0089a17e..8fee11ab68
--- a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
@@ -1,72 +1,66 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 #include "ui_QtSDistributionTypeWidget.h"
 
 /**
-  * @brief The QtSDistributionTypeWidget class
-  */
+ * @brief The QtSDistributionTypeWidget class
+ */
 class SVWidgetsLib_EXPORT QtSDistributionTypeWidget : public QWidget, private Ui::QtSDistributionTypeWidget
 {
-    Q_OBJECT
-  public:
-    QtSDistributionTypeWidget(QString distributionName, QWidget* parent = nullptr);
-    ~QtSDistributionTypeWidget() override;
-
+  Q_OBJECT
+public:
+  QtSDistributionTypeWidget(QString distributionName, QWidget* parent = nullptr);
+  ~QtSDistributionTypeWidget() override;
 
-    void setDistributionName(QString name);
-    bool isChecked();
-    int getFitType();
+  void setDistributionName(QString name);
+  bool isChecked();
+  int getFitType();
 
-  protected:
-    void setupGui();
+protected:
+  void setupGui();
 
-  public:
-    QtSDistributionTypeWidget(const QtSDistributionTypeWidget&) = delete; // Copy Constructor Not Implemented
-    QtSDistributionTypeWidget(QtSDistributionTypeWidget&&) = delete;      // Move Constructor Not Implemented
-    QtSDistributionTypeWidget& operator=(const QtSDistributionTypeWidget&) = delete; // Copy Assignment Not Implemented
-    QtSDistributionTypeWidget& operator=(QtSDistributionTypeWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSDistributionTypeWidget(const QtSDistributionTypeWidget&) = delete;            // Copy Constructor Not Implemented
+  QtSDistributionTypeWidget(QtSDistributionTypeWidget&&) = delete;                 // Move Constructor Not Implemented
+  QtSDistributionTypeWidget& operator=(const QtSDistributionTypeWidget&) = delete; // Copy Assignment Not Implemented
+  QtSDistributionTypeWidget& operator=(QtSDistributionTypeWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
index 2cabe64570..010e4ca6ee 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <memory>
 
 #include "QtSDocServer.h"
@@ -63,7 +63,7 @@ namespace
 {
 const int k_Port = 32456;
 const QString k_IPAddress = QString("127.0.0.1");
-}
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
@@ -124,7 +124,7 @@ QString QtSDocServer::GetHelpRootDir()
 #elif defined(Q_OS_WIN)
   // This is where the help _should_ be for either a deployed app or when NOT using VS IDE to run/build
   helpDir = QDir(appPath + "/Help/" + QApplication::applicationName());
-  if (!helpDir.exists())
+  if(!helpDir.exists())
   {
     // Try one level up as we may be running from a Visual Studio Instance
     helpDir = QDir(appPath);
@@ -135,7 +135,7 @@ QString QtSDocServer::GetHelpRootDir()
 #else
   // This is where the help _should_ be for either a deployed app or when NOT using VS IDE to run/build
   helpDir = QDir(appPath + "/Help/" + QApplication::applicationName());
-  if (!helpDir.exists())
+  if(!helpDir.exists())
   {
     // Try one level up as we may be running from a Visual Studio Instance
     helpDir = QDir(appPath);
@@ -185,7 +185,7 @@ int QtSDocServer::GetPort()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QUrl QtSDocServer::GenerateHTMLUrl(const QString &className)
+QUrl QtSDocServer::GenerateHTMLUrl(const QString& className)
 {
 
   QString s = QString("http://%1:%2").arg(QtSDocServer::GetIPAddress()).arg(QtSDocServer::GetPort());
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.h b/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
index 19a18e52e1..080b75ce25 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <memory>
@@ -80,15 +80,15 @@ class SVWidgetsLib_EXPORT QtSDocServer : public QObject
   static int GetPort();
 
   /**
-  * @brief Returns the root of the help directory
-  */
+   * @brief Returns the root of the help directory
+   */
   static QString GetHelpRootDir();
 
   /**
-  * @brief Generates a help URL from the given lowercase name.
-  * @param className The name of the filter class that we are generating a URL
-  */
-  static QUrl GenerateHTMLUrl(const QString &className);
+   * @brief Generates a help URL from the given lowercase name.
+   * @param className The name of the filter class that we are generating a URL
+   */
+  static QUrl GenerateHTMLUrl(const QString& className);
 
 protected:
   explicit QtSDocServer(QObject* parent = nullptr);
@@ -107,8 +107,8 @@ class SVWidgetsLib_EXPORT QtSDocServer : public QObject
   std::shared_ptr<QtSStaticFileController> m_QtSStaticFileController;
 
 public:
-  QtSDocServer(const QtSDocServer&) = delete;   // Copy Constructor Not Implemented
-  QtSDocServer(QtSDocServer&&) = delete;        // Move Constructor Not Implemented
+  QtSDocServer(const QtSDocServer&) = delete;            // Copy Constructor Not Implemented
+  QtSDocServer(QtSDocServer&&) = delete;                 // Move Constructor Not Implemented
   QtSDocServer& operator=(const QtSDocServer&) = delete; // Copy Assignment Not Implemented
   QtSDocServer& operator=(QtSDocServer&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
index 113728a8e2..da234cd712 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSDroppableScrollArea.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
old mode 100755
new mode 100644
index 8932a6cf58..ca05ec3609
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QScrollArea>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 /*
@@ -45,20 +44,17 @@
  */
 class SVWidgetsLib_EXPORT QtSDroppableScrollArea : public QScrollArea
 {
-    Q_OBJECT
-
-  public:
-    QtSDroppableScrollArea(QWidget* parent = nullptr);
+  Q_OBJECT
 
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
-    void dragMoveEvent( QDragMoveEvent* event) override;
+public:
+  QtSDroppableScrollArea(QWidget* parent = nullptr);
 
-  signals:
-    void filterDropped(QString filter);
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
+  void dragMoveEvent(QDragMoveEvent* event) override;
 
-  private:
+signals:
+  void filterDropped(QString filter);
 
+private:
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
index 6cbce75993..905c471bc6 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSFSDropLabel.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
old mode 100755
new mode 100644
index 1fd9cc5fab..68fc93729e
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
@@ -1,79 +1,72 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtWidgets/QLabel>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 /**
-* @class QtSFSDropLabel QtSFSDropLabel.h EmMpm/Common/Qt/QtSFSDropLabel.h
-* @brief
-* @author Michael A. Jackson for BlueQuartz Software
-* @date Feb 5, 2010
-* @version 1.0
-*/
+ * @class QtSFSDropLabel QtSFSDropLabel.h EmMpm/Common/Qt/QtSFSDropLabel.h
+ * @brief
+ * @author Michael A. Jackson for BlueQuartz Software
+ * @date Feb 5, 2010
+ * @version 1.0
+ */
 class SVWidgetsLib_EXPORT QtSFSDropLabel : public QLabel
 {
-    Q_OBJECT
-
-  public:
-    enum Styles
-    {
-      FS_STANDARD_STYLE,
-      FS_DRAGGING_STYLE,
-      FS_DOESNOTEXIST_STYLE,
-      FS_WARNING_STYLE
-    };
-    QtSFSDropLabel(QWidget* parent = nullptr);
+  Q_OBJECT
 
+public:
+  enum Styles
+  {
+    FS_STANDARD_STYLE,
+    FS_DRAGGING_STYLE,
+    FS_DOESNOTEXIST_STYLE,
+    FS_WARNING_STYLE
+  };
+  QtSFSDropLabel(QWidget* parent = nullptr);
 
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
-    void dragLeaveEvent(QDragLeaveEvent* event) override;
-    void changeStyleSheet(int style);
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
+  void dragLeaveEvent(QDragLeaveEvent* event) override;
+  void changeStyleSheet(int style);
 
-  signals:
-    void fileDropped(const QString& file);
-
-  private:
+signals:
+  void fileDropped(const QString& file);
 
+private:
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
index 13c54f1ee1..72a29234ac 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSFSDropLineEdit.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
old mode 100755
new mode 100644
index 80ae870393..4d18a10312
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,40 +39,35 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 /**
-* @class QtSFSDropLineEdit QtSFSDropLineEdit.h EmMpm/Common/Qt/QtSFSDropLineEdit.h
-* @brief
-* @author Michael A. Jackson for BlueQuartz Software
-* @date Feb 5, 2010
-* @version 1.0
-*/
+ * @class QtSFSDropLineEdit QtSFSDropLineEdit.h EmMpm/Common/Qt/QtSFSDropLineEdit.h
+ * @brief
+ * @author Michael A. Jackson for BlueQuartz Software
+ * @date Feb 5, 2010
+ * @version 1.0
+ */
 class SVWidgetsLib_EXPORT QtSFSDropLineEdit : public QLineEdit
 {
-    Q_OBJECT
-
-  public:
+  Q_OBJECT
 
-    enum Styles
-    {
-      FS_STANDARD_STYLE,
-      FS_DRAGGING_STYLE,
-      FS_DOESNOTEXIST_STYLE,
-      FS_WARNING_STYLE
-    };
+public:
+  enum Styles
+  {
+    FS_STANDARD_STYLE,
+    FS_DRAGGING_STYLE,
+    FS_DOESNOTEXIST_STYLE,
+    FS_WARNING_STYLE
+  };
 
-    QtSFSDropLineEdit(QWidget* parent = nullptr);
+  QtSFSDropLineEdit(QWidget* parent = nullptr);
 
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
 
-    void changeStyleSheet(int style);
+  void changeStyleSheet(int style);
 
-  signals:
-    void fileDropped(const QString& file);
-
-  private:
+signals:
+  void fileDropped(const QString& file);
 
+private:
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
old mode 100755
new mode 100644
index aea22d2db8..1739b22522
--- a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
@@ -31,39 +31,49 @@ class QTimer;
 
 class SVWidgetsLib_EXPORT QtSFaderWidget : public QWidget
 {
-    Q_OBJECT
-    Q_PROPERTY(QColor fadeColor READ fadeColor WRITE setFadeColor)
-    Q_PROPERTY(int fadeDuration READ fadeDuration WRITE setFadeDuration)
-  public:
+  Q_OBJECT
+  Q_PROPERTY(QColor fadeColor READ fadeColor WRITE setFadeColor)
+  Q_PROPERTY(int fadeDuration READ fadeDuration WRITE setFadeDuration)
+public:
+  QtSFaderWidget(QWidget* parent);
+  ~QtSFaderWidget() override;
 
-    QtSFaderWidget(QWidget* parent);
-    ~QtSFaderWidget() override;
+  QColor fadeColor() const
+  {
+    return startColor;
+  }
+  void setFadeColor(const QColor& newColor)
+  {
+    startColor = newColor;
+  }
 
-    QColor fadeColor() const { return startColor; }
-    void setFadeColor(const QColor& newColor) { startColor = newColor; }
+  void setFadeIn();
+  void setFadeOut();
 
-    void setFadeIn();
-    void setFadeOut();
+  void setStartColor(QColor color);
+  QColor getStartColor();
 
-    void setStartColor(QColor color);
-    QColor getStartColor();
+  int fadeDuration() const
+  {
+    return duration;
+  }
+  void setFadeDuration(int milliseconds)
+  {
+    duration = milliseconds;
+  }
 
-    int fadeDuration() const { return duration; }
-    void setFadeDuration(int milliseconds) { duration = milliseconds; }
+  void start();
 
-    void start();
+signals:
+  void animationComplete();
 
-  signals:
-    void animationComplete();
+protected:
+  void paintEvent(QPaintEvent* event) override;
 
-  protected:
-    void paintEvent(QPaintEvent* event) override;
-
-  private:
-    QTimer* timer;
-    QColor startColor;
-    int currentAlpha;
-    int duration;
-    bool fadeIn;
+private:
+  QTimer* timer;
+  QColor startColor;
+  int currentAlpha;
+  int duration;
+  bool fadeIn;
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
index c1bc6176c0..2b4b78c3c1 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "QtSFileCompleter.h"
 
 #include <QtWidgets/QDirModel>
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
old mode 100755
new mode 100644
index 64164e717d..a54994c68f
--- a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,10 +42,8 @@
 
 class SVWidgetsLib_EXPORT QtSFileCompleter : public QCompleter
 {
-    Q_OBJECT
-  public:
-    QtSFileCompleter(QObject* o, bool dirs);
-    QString pathFromIndex(const QModelIndex& idx) const override;
+  Q_OBJECT
+public:
+  QtSFileCompleter(QObject* o, bool dirs);
+  QString pathFromIndex(const QModelIndex& idx) const override;
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
index e084a86ebe..6cf07065ed 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSFileDragMessageBox.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
old mode 100755
new mode 100644
index c0a6be8c43..79413baf67
--- a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,25 +48,23 @@ enum ExtractionType
   Prepend
 };
 
-
 class SVWidgetsLib_EXPORT QtSFileDragMessageBox : public QDialog, private Ui::QtSFileDragMessageBox
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    QtSFileDragMessageBox(QWidget* parent = nullptr);
+public:
+  QtSFileDragMessageBox(QWidget* parent = nullptr);
 
-    bool didPressOkBtn();
-    bool cancelled();
+  bool didPressOkBtn();
+  bool cancelled();
 
-    bool isExtractPipelineBtnChecked();
+  bool isExtractPipelineBtnChecked();
 
-  protected slots:
-    void on_okBtn_clicked();
-    void on_cancelBtn_clicked();
+protected slots:
+  void on_okBtn_clicked();
+  void on_cancelBtn_clicked();
 
-  private:
-    bool okBtnPressed = false;
-    bool m_Cancelled = false;
+private:
+  bool okBtnPressed = false;
+  bool m_Cancelled = false;
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
index bda226d08d..58a6fd0a3a 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSGraphicsView.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
old mode 100755
new mode 100644
index e6fc121673..fe0660ff60
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -44,140 +43,133 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
 class UserInitArea;
 class EmMpmWorkbench;
 
 namespace EmMpm_Constants
 {
 
-  enum ImageDisplayType
-  {
-    OriginalImage = 0,
-    SegmentedImage,
-    CompositedImage,
-    UnknownDisplayType
-  };
-
-  enum CompositeType
-  {
-    Exclusion,
-    Difference,
-    Alpha_Blend,
-    Plus,
-    Multiply,
-    Screen,
-    Darken,
-    Lighten,
-    ColorDodge,
-    ColorBurn,
-    HardLight,
-    SoftLight,
-    Destination,
-    Source,
-    DestinationOver,
-    SourceIn,
-    DestinationIn,
-    DestinationOut,
-    SourceAtop,
-    DestinationAtop,
-    Overlay,
-    Clear,
-    UnknownCompositeType
-  };
-
-}
-
-class SVWidgetsLib_EXPORT QtSGraphicsView : public QGraphicsView
+enum ImageDisplayType
 {
-    Q_OBJECT;
-
-  public:
-
-    QtSGraphicsView( QWidget* parent = nullptr);
+  OriginalImage = 0,
+  SegmentedImage,
+  CompositedImage,
+  UnknownDisplayType
+};
 
-    /**
-    * @brief Over-riding implementation from base class
-    * @param event QDragEnterEvent Event fired when dragging enters the QGraphicsView
-    */
-    void dragEnterEvent(QDragEnterEvent* event) override;
+enum CompositeType
+{
+  Exclusion,
+  Difference,
+  Alpha_Blend,
+  Plus,
+  Multiply,
+  Screen,
+  Darken,
+  Lighten,
+  ColorDodge,
+  ColorBurn,
+  HardLight,
+  SoftLight,
+  Destination,
+  Source,
+  DestinationOver,
+  SourceIn,
+  DestinationIn,
+  DestinationOut,
+  SourceAtop,
+  DestinationAtop,
+  Overlay,
+  Clear,
+  UnknownCompositeType
+};
 
-    /**
-    * @brief Over-riding implementation from base class
-    * @param event QDropEvent Event fired when object is dropped on QGraphicsView
-    */
-    void dropEvent(QDropEvent* event) override;
+} // namespace EmMpm_Constants
 
-    /**
-    * @brief Over-riding implementation from base class
-    * @param event QDragLeaveEvent Event fired when dragging leaves QGraphicsView
-    */
-    void dragLeaveEvent(QDragLeaveEvent* event) override;
+class SVWidgetsLib_EXPORT QtSGraphicsView : public QGraphicsView
+{
+  Q_OBJECT;
 
-//    void mousePressEvent( QMouseEvent* event );
-//    void mouseMoveEvent( QMouseEvent* event );
-//    void mouseReleaseEvent( QMouseEvent* event );
+public:
+  QtSGraphicsView(QWidget* parent = nullptr);
 
-    void setBaseImage(QImage image);
-    QImage getBaseImage();
+  /**
+   * @brief Over-riding implementation from base class
+   * @param event QDragEnterEvent Event fired when dragging enters the QGraphicsView
+   */
+  void dragEnterEvent(QDragEnterEvent* event) override;
 
-    //void setOverlayImage(QImage image);
-    //QImage getOverlayImage();
+  /**
+   * @brief Over-riding implementation from base class
+   * @param event QDropEvent Event fired when object is dropped on QGraphicsView
+   */
+  void dropEvent(QDropEvent* event) override;
 
-    //QImage getCompositedImage();
+  /**
+   * @brief Over-riding implementation from base class
+   * @param event QDragLeaveEvent Event fired when dragging leaves QGraphicsView
+   */
+  void dragLeaveEvent(QDragLeaveEvent* event) override;
 
-//    void loadBaseImageFile(const QString &filename);
-//    void loadOverlayImageFile(const QString &filename);
+  //    void mousePressEvent( QMouseEvent* event );
+  //    void mouseMoveEvent( QMouseEvent* event );
+  //    void mouseReleaseEvent( QMouseEvent* event );
 
-    QImage& blend(QImage& src, QImage& dst, float opacity);
+  void setBaseImage(QImage image);
+  QImage getBaseImage();
 
+  // void setOverlayImage(QImage image);
+  // QImage getOverlayImage();
 
-    void updateColorTables(QVector<QRgb> colorTable);
-    void useCustomColorTable(bool b);
+  // QImage getCompositedImage();
 
-  public slots:
-    void zoomIn();
+  //    void loadBaseImageFile(const QString &filename);
+  //    void loadOverlayImageFile(const QString &filename);
 
-    void zoomOut();
+  QImage& blend(QImage& src, QImage& dst, float opacity);
 
-    void setOverlayTransparency(float f);
+  void updateColorTables(QVector<QRgb> colorTable);
+  void useCustomColorTable(bool b);
 
-    void setZoomIndex(int index);
+public slots:
+  void zoomIn();
 
-    void setImageDisplayType(EmMpm_Constants::ImageDisplayType displayType);
+  void zoomOut();
 
-    void setCompositeMode(EmMpm_Constants::CompositeType mode);
+  void setOverlayTransparency(float f);
 
-    void updateDisplay();
+  void setZoomIndex(int index);
 
+  void setImageDisplayType(EmMpm_Constants::ImageDisplayType displayType);
 
-  signals:
-    void fireBaseImageFileLoaded(const QString& filename);
-    void fireOverlayImageFileLoaded(const QString& filename);
+  void setCompositeMode(EmMpm_Constants::CompositeType mode);
 
-  protected:
+  void updateDisplay();
 
+signals:
+  void fireBaseImageFileLoaded(const QString& filename);
+  void fireOverlayImageFileLoaded(const QString& filename);
 
-  private:
-    QGraphicsItem* m_ImageGraphicsItem;
-    QImage         m_BaseImage;
+protected:
+private:
+  QGraphicsItem* m_ImageGraphicsItem;
+  QImage m_BaseImage;
 
-    QPoint         m_MouseClickOrigin;
-    float          m_ZoomFactors[10];
+  QPoint m_MouseClickOrigin;
+  float m_ZoomFactors[10];
 
-    EmMpm_Constants::ImageDisplayType           m_ImageDisplayType;
-    QPainter::CompositionMode m_composition_mode;
-    float          m_OverlayTransparency;
+  EmMpm_Constants::ImageDisplayType m_ImageDisplayType;
+  QPainter::CompositionMode m_composition_mode;
+  float m_OverlayTransparency;
 
-    bool           m_UseColorTable;
+  bool m_UseColorTable;
 
-    QVector<QRgb> m_CustomColorTable;
-    QVector<QRgb> m_OriginalColorTable;
+  QVector<QRgb> m_CustomColorTable;
+  QVector<QRgb> m_OriginalColorTable;
 
-  public:
-    QtSGraphicsView(const QtSGraphicsView&) = delete; // Copy Constructor Not Implemented
-    QtSGraphicsView(QtSGraphicsView&&) = delete;      // Move Constructor Not Implemented
-    QtSGraphicsView& operator=(const QtSGraphicsView&) = delete; // Copy Assignment Not Implemented
-    QtSGraphicsView& operator=(QtSGraphicsView&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSGraphicsView(const QtSGraphicsView&) = delete;            // Copy Constructor Not Implemented
+  QtSGraphicsView(QtSGraphicsView&&) = delete;                 // Move Constructor Not Implemented
+  QtSGraphicsView& operator=(const QtSGraphicsView&) = delete; // Copy Assignment Not Implemented
+  QtSGraphicsView& operator=(QtSGraphicsView&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
index 2af8521560..50434af72a 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSHelpUrlGenerator.h"
 
@@ -47,8 +47,6 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -77,10 +75,10 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
     helpDir.cdUp();
     // Check if we are running from a .app installation where the Help dir is embeded in the app bundle.
     QFileInfo fi(helpDir.absolutePath() + "/Resources/Help");
-    
+
     if(fi.exists())
     {
-     helpDir.cd("Resources");
+      helpDir.cd("Resources");
     }
     else
     {
@@ -93,7 +91,7 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
 #ifdef SIMPL_USE_MKDOCS
   {
     FilterManager* fm = FilterManager::Instance();
-    
+
     IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
     QString pluginName;
     if(factory.get() != nullptr)
@@ -101,11 +99,7 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
       pluginName = "/Filters/" + factory->getCompiledLibraryName();
     }
 
-    QString helpFilePath = QString("/%2%3Filters/%4/index.html")
-            .arg(helpDir.absolutePath())
-            .arg(QCoreApplication::instance()->applicationName())
-            .arg(pluginName)
-            .arg(htmlName);
+    QString helpFilePath = QString("/%2%3Filters/%4/index.html").arg(helpDir.absolutePath()).arg(QCoreApplication::instance()->applicationName()).arg(pluginName).arg(htmlName);
     QFileInfo fi(helpFilePath);
     if(!fi.exists())
     {
@@ -114,7 +108,7 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
       helpDir.cdUp();
       helpFilePath = QString("%1/Help/%2%3/%4/%4.html").arg(helpDir.absolutePath()).arg(QCoreApplication::instance()->applicationName()).arg(pluginName).arg(htmlName);
     }
-    
+
     s = s + helpFilePath;
   }
 #endif
@@ -122,7 +116,7 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
 #ifdef SIMPL_USE_DISCOUNT
   {
     FilterManager* fm = FilterManager::Instance();
-    
+
     IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
     QString pluginName;
     if(factory.get())
@@ -139,15 +133,14 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
       helpDir.cdUp();
       helpFilePath = QString("%1/Help/%2%3/%4.html").arg(helpDir.absolutePath()).arg(QCoreApplication::instance()->applicationName()).arg(pluginName).arg(htmlName);
     }
-    
+
     s = s + helpFilePath;
   }
-#endif 
-  
+#endif
+
   return QUrl(s);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
old mode 100755
new mode 100644
index 3447922178..cc84b29990
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <QtCore/QUrl>
@@ -47,32 +47,30 @@ class QWidget;
 class SVWidgetsLib_EXPORT QtSHelpUrlGenerator
 {
 
-  public:
-    QtSHelpUrlGenerator();
-    virtual ~QtSHelpUrlGenerator();
+public:
+  QtSHelpUrlGenerator();
+  virtual ~QtSHelpUrlGenerator();
 
-    /**
-    * @brief Generates a help URL from the given lowercase name.
-    */
-    static QUrl GenerateHTMLUrl(QString helpName);
+  /**
+   * @brief Generates a help URL from the given lowercase name.
+   */
+  static QUrl GenerateHTMLUrl(QString helpName);
 
-    /**
-    * @brief Opens the URL specified in a web browser.  The variable "parent" is needed
-    * to pop-up a dialog box if the opening process fails.
-    */
-    static void openHTMLUrl(QUrl URL, QWidget* parent);
+  /**
+   * @brief Opens the URL specified in a web browser.  The variable "parent" is needed
+   * to pop-up a dialog box if the opening process fails.
+   */
+  static void openHTMLUrl(QUrl URL, QWidget* parent);
 
-    /**
-    * @brief This function both generates a URL and opens it in a browser.  It is simply
-    * a combination of the two previous functions, for convenience.
-    */
-    static void generateAndOpenHTMLUrl(QString helpName, QWidget* parent);
+  /**
+   * @brief This function both generates a URL and opens it in a browser.  It is simply
+   * a combination of the two previous functions, for convenience.
+   */
+  static void generateAndOpenHTMLUrl(QString helpName, QWidget* parent);
 
-  public:
-    QtSHelpUrlGenerator(const QtSHelpUrlGenerator&) = delete; // Copy Constructor Not Implemented
-    QtSHelpUrlGenerator(QtSHelpUrlGenerator&&) = delete;      // Move Constructor Not Implemented
-    QtSHelpUrlGenerator& operator=(const QtSHelpUrlGenerator&) = delete; // Copy Assignment Not Implemented
-    QtSHelpUrlGenerator& operator=(QtSHelpUrlGenerator&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSHelpUrlGenerator(const QtSHelpUrlGenerator&) = delete;            // Copy Constructor Not Implemented
+  QtSHelpUrlGenerator(QtSHelpUrlGenerator&&) = delete;                 // Move Constructor Not Implemented
+  QtSHelpUrlGenerator& operator=(const QtSHelpUrlGenerator&) = delete; // Copy Assignment Not Implemented
+  QtSHelpUrlGenerator& operator=(QtSHelpUrlGenerator&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
index 61a7c50a25..3aca3f8688 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSHoverButton.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
old mode 100755
new mode 100644
index 47159376ec..a97a3a679c
--- a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,19 +41,18 @@
 
 class SVWidgetsLib_EXPORT QtSHoverButton : public QPushButton
 {
-    Q_OBJECT
-  public:
-    explicit QtSHoverButton(QWidget* parent = nullptr);
+  Q_OBJECT
+public:
+  explicit QtSHoverButton(QWidget* parent = nullptr);
 
-    ~QtSHoverButton() override;
+  ~QtSHoverButton() override;
 
-  protected:
-    bool event(QEvent* event) override;
+protected:
+  bool event(QEvent* event) override;
 
-  public:
-    QtSHoverButton(const QtSHoverButton&) = delete; // Copy Constructor Not Implemented
-    QtSHoverButton(QtSHoverButton&&) = delete;      // Move Constructor Not Implemented
-    QtSHoverButton& operator=(const QtSHoverButton&) = delete; // Copy Assignment Not Implemented
-    QtSHoverButton& operator=(QtSHoverButton&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSHoverButton(const QtSHoverButton&) = delete;            // Copy Constructor Not Implemented
+  QtSHoverButton(QtSHoverButton&&) = delete;                 // Move Constructor Not Implemented
+  QtSHoverButton& operator=(const QtSHoverButton&) = delete; // Copy Assignment Not Implemented
+  QtSHoverButton& operator=(QtSHoverButton&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
index 0a80af2d6a..0312c7e986 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSImageGraphicsDelegate.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
old mode 100755
new mode 100644
index 86af561503..18bf398f5e
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 //-- Qt Includes
 #include <QtCore/QObject>
 #include <QtCore/QString>
@@ -43,7 +42,6 @@
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 // --- Forward declarations of Classes ----
@@ -52,7 +50,6 @@ class QGraphicsItem;
 class QGraphicsView;
 class QGraphicsScene;
 
-
 /**
  * @class QtSImageGraphicsDelegate QtSImageGraphicsDelegate.h QtSImageGraphicsDelegate.h
  * @brief A Delegate class that renders HDF5 Data to various outputs
@@ -62,164 +59,233 @@ class QGraphicsScene;
  */
 class SVWidgetsLib_EXPORT QtSImageGraphicsDelegate : public QObject
 {
-    Q_OBJECT
-
-  public:
-    QtSImageGraphicsDelegate(QObject* parent = nullptr);
-    ~QtSImageGraphicsDelegate() override;
-
-    /**
-     * @brief Setter property for MainWindow
-     */
-    void setMainWindow(QMainWindow* value);
-    /**
-     * @brief Getter property for MainWindow
-     * @return Value of MainWindow
-     */
-    QMainWindow* getMainWindow() const;
-
-    /**
-     * @brief Setter property for GraphicsView
-     */
-    void setGraphicsView(QGraphicsView* value);
-    /**
-     * @brief Getter property for GraphicsView
-     * @return Value of GraphicsView
-     */
-    QGraphicsView* getGraphicsView() const;
-
-    /**
-     * @brief Setter property for GraphicsScene
-     */
-    void setGraphicsScene(QGraphicsScene* value);
-    /**
-     * @brief Getter property for GraphicsScene
-     * @return Value of GraphicsScene
-     */
-    QGraphicsScene* getGraphicsScene() const;
-
-    /**
-     * @brief Setter property for CachedImage
-     */
-    void setCachedImage(const QImage& value);
-    /**
-     * @brief Getter property for CachedImage
-     * @return Value of CachedImage
-     */
-    QImage getCachedImage() const;
-
-    /**
-     * @brief Setter property for OverlayImage
-     */
-    void setOverlayImage(const QImage& value);
-    /**
-     * @brief Getter property for OverlayImage
-     * @return Value of OverlayImage
-     */
-    QImage getOverlayImage() const;
-
-    /**
-     * @brief Setter property for CompositeImages
-     */
-    void setCompositeImages(bool value);
-    /**
-     * @brief Getter property for CompositeImages
-     * @return Value of CompositeImages
-     */
-    bool getCompositeImages() const;
-
-    /**
-     * @brief Displays a Text message in the graphics view. This is typically used
-     * when there is an error. You should NOT use this to display general String
-     * data. Use an QHDFStringDataWindow instead
-     * @param message The message to display
-     */
-    void displayTextMessage(QString message);
-
-    /**
-     * @brief sets all cached values to nullptr or empty
-     */
-    void resetCaches();
-
-
-  public slots:
-    void on_parentResized();
-
-    /**
-     * @brief Sets the zoom value. This is expressed in a floating point number
-     * where 1.0 is 100% or NO ZOOM and -1.0 represents fit to current window.
-     * @param zoomFactor The value of the zoom Factor
-     */
-    void setZoomFactor(double zoomFactor);
-
-    void increaseZoom();
-
-    void decreaseZoom();
-
-    void fitToWindow();
-
-    void updateGraphicsScene(bool update = true);
-
-    //  void compositeWithImage(QImage* image, bool update = true);
-
-  public slots:
-    void setClearMode() { m_composition_mode = QPainter::CompositionMode_Clear;  }
-    void setSourceMode() { m_composition_mode = QPainter::CompositionMode_Source;  }
-    void setDestinationMode() { m_composition_mode = QPainter::CompositionMode_Destination;  }
-    void setSourceOverMode() { m_composition_mode = QPainter::CompositionMode_SourceOver;  }
-    void setDestinationOverMode() { m_composition_mode = QPainter::CompositionMode_DestinationOver;  }
-    void setSourceInMode() { m_composition_mode = QPainter::CompositionMode_SourceIn;  }
-    void setDestInMode() { m_composition_mode = QPainter::CompositionMode_DestinationIn;  }
-    void setSourceOutMode() { m_composition_mode = QPainter::CompositionMode_SourceOut;  }
-    void setDestOutMode() { m_composition_mode = QPainter::CompositionMode_DestinationOut;  }
-    void setSourceAtopMode() { m_composition_mode = QPainter::CompositionMode_SourceAtop;  }
-    void setDestAtopMode() { m_composition_mode = QPainter::CompositionMode_DestinationAtop;  }
-    void setXorMode() { m_composition_mode = QPainter::CompositionMode_Xor;  }
-    void setPlusMode() { m_composition_mode = QPainter::CompositionMode_Plus;  }
-    void setMultiplyMode() { m_composition_mode = QPainter::CompositionMode_Multiply;  }
-    void setScreenMode() { m_composition_mode = QPainter::CompositionMode_Screen;  }
-    void setOverlayMode() { m_composition_mode = QPainter::CompositionMode_Overlay;  }
-    void setDarkenMode() { m_composition_mode = QPainter::CompositionMode_Darken;  }
-    void setLightenMode() { m_composition_mode = QPainter::CompositionMode_Lighten;  }
-    void setColorDodgeMode() { m_composition_mode = QPainter::CompositionMode_ColorDodge;  }
-    void setColorBurnMode() { m_composition_mode = QPainter::CompositionMode_ColorBurn;  }
-    void setHardLightMode() { m_composition_mode = QPainter::CompositionMode_HardLight;  }
-    void setSoftLightMode() { m_composition_mode = QPainter::CompositionMode_SoftLight;  }
-    void setDifferenceMode() { m_composition_mode = QPainter::CompositionMode_Difference;  }
-    void setExclusionMode() { m_composition_mode = QPainter::CompositionMode_Exclusion;  }
-
-  private:
-    QMainWindow* m_MainWindow = nullptr;
-    QGraphicsView* m_GraphicsView = nullptr;
-    QGraphicsScene* m_GraphicsScene = nullptr;
-
-    QImage m_CachedImage = {};
-    QImage m_OverlayImage = {};
-    bool m_CompositeImages = {};
-
-    QGraphicsPixmapItem*    m_CurrentGraphicsItem;
-
-    double            _zoomFactor;
-    double            _zoomFactors[10];
-    int               _zoomIndex;
-    bool              _shouldFitToWindow;
-    QPainter::CompositionMode m_composition_mode;
-
-    /**
-    * @brief Displays a Text message in the QGraphicsScene
-    * @param message The message to display
-    */
-    void _displayTextMessage(QString message);
-
-    /**
-     * @brief Scales the image by a _zoomFactor
-     * @return Returns a QImage that is scaled copy of the cached image
-     */
-    QImage _scaleImage();
-    QImage _scaleImage(QImage image);
-
-    QtSImageGraphicsDelegate(const QtSImageGraphicsDelegate&); //Copy Constructor Not Implemented
-    void operator=(const QtSImageGraphicsDelegate&); //Copy Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  QtSImageGraphicsDelegate(QObject* parent = nullptr);
+  ~QtSImageGraphicsDelegate() override;
+
+  /**
+   * @brief Setter property for MainWindow
+   */
+  void setMainWindow(QMainWindow* value);
+  /**
+   * @brief Getter property for MainWindow
+   * @return Value of MainWindow
+   */
+  QMainWindow* getMainWindow() const;
+
+  /**
+   * @brief Setter property for GraphicsView
+   */
+  void setGraphicsView(QGraphicsView* value);
+  /**
+   * @brief Getter property for GraphicsView
+   * @return Value of GraphicsView
+   */
+  QGraphicsView* getGraphicsView() const;
+
+  /**
+   * @brief Setter property for GraphicsScene
+   */
+  void setGraphicsScene(QGraphicsScene* value);
+  /**
+   * @brief Getter property for GraphicsScene
+   * @return Value of GraphicsScene
+   */
+  QGraphicsScene* getGraphicsScene() const;
+
+  /**
+   * @brief Setter property for CachedImage
+   */
+  void setCachedImage(const QImage& value);
+  /**
+   * @brief Getter property for CachedImage
+   * @return Value of CachedImage
+   */
+  QImage getCachedImage() const;
+
+  /**
+   * @brief Setter property for OverlayImage
+   */
+  void setOverlayImage(const QImage& value);
+  /**
+   * @brief Getter property for OverlayImage
+   * @return Value of OverlayImage
+   */
+  QImage getOverlayImage() const;
+
+  /**
+   * @brief Setter property for CompositeImages
+   */
+  void setCompositeImages(bool value);
+  /**
+   * @brief Getter property for CompositeImages
+   * @return Value of CompositeImages
+   */
+  bool getCompositeImages() const;
+
+  /**
+   * @brief Displays a Text message in the graphics view. This is typically used
+   * when there is an error. You should NOT use this to display general String
+   * data. Use an QHDFStringDataWindow instead
+   * @param message The message to display
+   */
+  void displayTextMessage(QString message);
+
+  /**
+   * @brief sets all cached values to nullptr or empty
+   */
+  void resetCaches();
+
+public slots:
+  void on_parentResized();
+
+  /**
+   * @brief Sets the zoom value. This is expressed in a floating point number
+   * where 1.0 is 100% or NO ZOOM and -1.0 represents fit to current window.
+   * @param zoomFactor The value of the zoom Factor
+   */
+  void setZoomFactor(double zoomFactor);
+
+  void increaseZoom();
+
+  void decreaseZoom();
+
+  void fitToWindow();
+
+  void updateGraphicsScene(bool update = true);
+
+  //  void compositeWithImage(QImage* image, bool update = true);
+
+public slots:
+  void setClearMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Clear;
+  }
+  void setSourceMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Source;
+  }
+  void setDestinationMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Destination;
+  }
+  void setSourceOverMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_SourceOver;
+  }
+  void setDestinationOverMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_DestinationOver;
+  }
+  void setSourceInMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_SourceIn;
+  }
+  void setDestInMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_DestinationIn;
+  }
+  void setSourceOutMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_SourceOut;
+  }
+  void setDestOutMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_DestinationOut;
+  }
+  void setSourceAtopMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_SourceAtop;
+  }
+  void setDestAtopMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_DestinationAtop;
+  }
+  void setXorMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Xor;
+  }
+  void setPlusMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Plus;
+  }
+  void setMultiplyMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Multiply;
+  }
+  void setScreenMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Screen;
+  }
+  void setOverlayMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Overlay;
+  }
+  void setDarkenMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Darken;
+  }
+  void setLightenMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Lighten;
+  }
+  void setColorDodgeMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_ColorDodge;
+  }
+  void setColorBurnMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_ColorBurn;
+  }
+  void setHardLightMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_HardLight;
+  }
+  void setSoftLightMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_SoftLight;
+  }
+  void setDifferenceMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Difference;
+  }
+  void setExclusionMode()
+  {
+    m_composition_mode = QPainter::CompositionMode_Exclusion;
+  }
+
+private:
+  QMainWindow* m_MainWindow = nullptr;
+  QGraphicsView* m_GraphicsView = nullptr;
+  QGraphicsScene* m_GraphicsScene = nullptr;
+
+  QImage m_CachedImage = {};
+  QImage m_OverlayImage = {};
+  bool m_CompositeImages = {};
+
+  QGraphicsPixmapItem* m_CurrentGraphicsItem;
+
+  double _zoomFactor;
+  double _zoomFactors[10];
+  int _zoomIndex;
+  bool _shouldFitToWindow;
+  QPainter::CompositionMode m_composition_mode;
+
+  /**
+   * @brief Displays a Text message in the QGraphicsScene
+   * @param message The message to display
+   */
+  void _displayTextMessage(QString message);
+
+  /**
+   * @brief Scales the image by a _zoomFactor
+   * @return Returns a QImage that is scaled copy of the cached image
+   */
+  QImage _scaleImage();
+  QImage _scaleImage(QImage image);
+
+  QtSImageGraphicsDelegate(const QtSImageGraphicsDelegate&); // Copy Constructor Not Implemented
+  void operator=(const QtSImageGraphicsDelegate&);           // Copy Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
old mode 100755
new mode 100644
index c653629caf..c07182d2e2
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
@@ -43,26 +43,46 @@ class SearchLineEditPrivate;
  */
 class SVWidgetsLib_EXPORT IconButton : public QAbstractButton
 {
-    Q_OBJECT
-    Q_PROPERTY(float iconOpacity READ iconOpacity WRITE setIconOpacity)
-    Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide)
-    Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
-  public:
-    explicit IconButton(QWidget* parent = nullptr);
-    void paintEvent(QPaintEvent* event) override;
-    void setPixmap(const QPixmap& pixmap) { m_pixmap = pixmap; update(); }
-    QPixmap pixmap() const { return m_pixmap; }
-    float iconOpacity() { return m_iconOpacity; }
-    void setIconOpacity(float value) { m_iconOpacity = value; update(); }
-    void animateShow(bool visible);
-
-    void setAutoHide(bool hide) { m_autoHide = hide; }
-    bool hasAutoHide() const { return m_autoHide; }
-
-  private:
-    float         m_iconOpacity;
-    bool          m_autoHide;
-    QPixmap       m_pixmap;
+  Q_OBJECT
+  Q_PROPERTY(float iconOpacity READ iconOpacity WRITE setIconOpacity)
+  Q_PROPERTY(bool autoHide READ hasAutoHide WRITE setAutoHide)
+  Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
+public:
+  explicit IconButton(QWidget* parent = nullptr);
+  void paintEvent(QPaintEvent* event) override;
+  void setPixmap(const QPixmap& pixmap)
+  {
+    m_pixmap = pixmap;
+    update();
+  }
+  QPixmap pixmap() const
+  {
+    return m_pixmap;
+  }
+  float iconOpacity()
+  {
+    return m_iconOpacity;
+  }
+  void setIconOpacity(float value)
+  {
+    m_iconOpacity = value;
+    update();
+  }
+  void animateShow(bool visible);
+
+  void setAutoHide(bool hide)
+  {
+    m_autoHide = hide;
+  }
+  bool hasAutoHide() const
+  {
+    return m_autoHide;
+  }
+
+private:
+  float m_iconOpacity;
+  bool m_autoHide;
+  QPixmap m_pixmap;
 };
 
 /**
@@ -77,67 +97,68 @@ class SVWidgetsLib_EXPORT IconButton : public QAbstractButton
  */
 class SVWidgetsLib_EXPORT QtSLineEdit : public SVLineEdit
 {
-    Q_OBJECT
-    Q_ENUMS(Side)
+  Q_OBJECT
+  Q_ENUMS(Side)
 
-  public:
-    enum Side {Left = 0, Right = 1};
+public:
+  enum Side
+  {
+    Left = 0,
+    Right = 1
+  };
 
-    explicit QtSLineEdit(QWidget* parent = nullptr);
-    ~QtSLineEdit() override;
+  explicit QtSLineEdit(QWidget* parent = nullptr);
+  ~QtSLineEdit() override;
 
-    QPixmap buttonPixmap(Side side) const;
-    void setButtonPixmap(Side side, const QPixmap& pixmap);
+  QPixmap buttonPixmap(Side side) const;
+  void setButtonPixmap(Side side, const QPixmap& pixmap);
 
-    QMenu* buttonMenu(Side side) const;
-    void setButtonMenu(Side side, QMenu* menu);
+  QMenu* buttonMenu(Side side) const;
+  void setButtonMenu(Side side, QMenu* menu);
 
-    void setButtonVisible(Side side, bool visible);
-    bool isButtonVisible(Side side) const;
+  void setButtonVisible(Side side, bool visible);
+  bool isButtonVisible(Side side) const;
 
-    void setButtonDisabled(Side side, bool disabled);
-    void setButtonEnabled(Side side, bool enabled);
-    bool isButtonEnabled(Side side) const;
+  void setButtonDisabled(Side side, bool disabled);
+  void setButtonEnabled(Side side, bool enabled);
+  bool isButtonEnabled(Side side) const;
 
-    void setButtonToolTip(Side side, const QString&);
-    void setButtonFocusPolicy(Side side, Qt::FocusPolicy policy);
+  void setButtonToolTip(Side side, const QString&);
+  void setButtonFocusPolicy(Side side, Qt::FocusPolicy policy);
 
-    // Set whether tabbing in will trigger the menu.
-    void setMenuTabFocusTrigger(Side side, bool v);
-    bool hasMenuTabFocusTrigger(Side side) const;
+  // Set whether tabbing in will trigger the menu.
+  void setMenuTabFocusTrigger(Side side, bool v);
+  bool hasMenuTabFocusTrigger(Side side) const;
 
-    // Set if icon should be hidden when text is empty
-    void setAutoHideButton(Side side, bool h);
-    bool hasAutoHideButton(Side side) const;
+  // Set if icon should be hidden when text is empty
+  void setAutoHideButton(Side side, bool h);
+  bool hasAutoHideButton(Side side) const;
 
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
 
-  signals:
-    void buttonClicked(QtSLineEdit::Side side);
-    void leftButtonClicked();
-    void rightButtonClicked();
-    void fileDropped(const QString& file);
+signals:
+  void buttonClicked(QtSLineEdit::Side side);
+  void leftButtonClicked();
+  void rightButtonClicked();
+  void fileDropped(const QString& file);
 
-    void keyPressed(QKeyEvent* event);
+  void keyPressed(QKeyEvent* event);
 
-  private slots:
-    void checkButtons(const QString&);
-    void iconClicked();
+private slots:
+  void checkButtons(const QString&);
+  void iconClicked();
 
-  protected:
-    void resizeEvent(QResizeEvent* e) override;
+protected:
+  void resizeEvent(QResizeEvent* e) override;
 
-    void keyPressEvent(QKeyEvent* event) override;
+  void keyPressEvent(QKeyEvent* event) override;
 
-  private:
+private:
+  void updateMargins();
+  void updateButtonPositions();
+  friend class SearchLineEditPrivate;
 
-    void updateMargins();
-    void updateButtonPositions();
-    friend class SearchLineEditPrivate;
-
-    SearchLineEditPrivate* d;
-    QString m_OldText;
+  SearchLineEditPrivate* d;
+  QString m_OldText;
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSMacros.h b/Source/SVWidgetsLib/QtSupport/QtSMacros.h
old mode 100755
new mode 100644
index d58a336359..3b5903f198
--- a/Source/SVWidgetsLib/QtSupport/QtSMacros.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSMacros.h
@@ -1,182 +1,192 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
+#define READ_CHECKBOX_SETTING(prefs, prefix, tag, emptyValue)                                                                                                                                          \
+  {                                                                                                                                                                                                    \
+    QString s = prefs.value(#tag).toString();                                                                                                                                                          \
+    if(s.isEmpty() == false)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      bool bb = prefs.value(#tag).toBool();                                                                                                                                                            \
+      prefix##tag->setChecked(bb);                                                                                                                                                                     \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      prefix##tag->setChecked(emptyValue);                                                                                                                                                             \
+    }                                                                                                                                                                                                  \
+  }
 
-#define READ_CHECKBOX_SETTING(prefs, prefix, tag, emptyValue)\
-  { QString s = prefs.value(#tag).toString();\
-    if (s.isEmpty() == false) {\
-      bool bb = prefs.value(#tag).toBool();\
-      prefix##tag->setChecked(bb); } else { prefix##tag->setChecked(emptyValue); } }
-
-
-
-#define READ_STRING_SETTING(prefs, prefix, var, emptyValue)\
-  prefix##var->setText( prefs.value(#var).toString() );\
-  if (prefix##var->text().isEmpty() == true) { prefix##var->setText(emptyValue); }
+#define READ_STRING_SETTING(prefs, prefix, var, emptyValue)                                                                                                                                            \
+  prefix##var->setText(prefs.value(#var).toString());                                                                                                                                                  \
+  if(prefix##var->text().isEmpty() == true)                                                                                                                                                            \
+  {                                                                                                                                                                                                    \
+    prefix##var->setText(emptyValue);                                                                                                                                                                  \
+  }
 
-#define READ_FILEPATH_SETTING(prefs, prefix, var, emptyValue)\
-  prefix##var->blockSignals(true);\
-  QString var = prefs.value(#var).toString();\
-  var = QDir::toNativeSeparators(var);\
-  prefix##var->setText(var );\
-  QtSFileUtils::VerifyPathExists(var, prefix##var);\
-  if (prefix##var->text().isEmpty() == true) { prefix##var->setText(emptyValue); }\
+#define READ_FILEPATH_SETTING(prefs, prefix, var, emptyValue)                                                                                                                                          \
+  prefix##var->blockSignals(true);                                                                                                                                                                     \
+  QString var = prefs.value(#var).toString();                                                                                                                                                          \
+  var = QDir::toNativeSeparators(var);                                                                                                                                                                 \
+  prefix##var->setText(var);                                                                                                                                                                           \
+  QtSFileUtils::VerifyPathExists(var, prefix##var);                                                                                                                                                    \
+  if(prefix##var->text().isEmpty() == true)                                                                                                                                                            \
+  {                                                                                                                                                                                                    \
+    prefix##var->setText(emptyValue);                                                                                                                                                                  \
+  }                                                                                                                                                                                                    \
   prefix##var->blockSignals(false);
 
-#define READ_SETTING(prefs, prefix, var, ok, temp, default, type)\
-  ok = false;\
-  temp = prefs.value(#var).to##type(&ok);\
-  if (false == ok) {temp = default;}\
+#define READ_SETTING(prefs, prefix, var, ok, temp, default, type)                                                                                                                                      \
+  ok = false;                                                                                                                                                                                          \
+  temp = prefs.value(#var).to##type(&ok);                                                                                                                                                              \
+  if(false == ok)                                                                                                                                                                                      \
+  {                                                                                                                                                                                                    \
+    temp = default;                                                                                                                                                                                    \
+  }                                                                                                                                                                                                    \
   prefix##var->setValue(temp);
 
-#define READ_BOOL_SETTING(prefs, prefix, tag, emptyValue)\
-  { QString s = prefs.value(#tag).toString();\
-    if (s.isEmpty() == false) {\
-      bool bb = prefs.value(#tag).toBool();\
-      prefix##tag = (bb); } else { prefix##tag = (emptyValue); } }
-
-#define WRITE_BOOL_SETTING(prefs, prefix, tag,  b)\
-  prefs.setValue(#tag, (b) );
-
-#define WRITE_STRING_SETTING(prefs, prefix, var)\
-  prefs.setValue(#var , this->prefix##var->text());
-
-#define WRITE_SETTING(prefs, prefix, var)\
-  prefs.setValue(#var, this->prefix##var->value());
-
+#define READ_BOOL_SETTING(prefs, prefix, tag, emptyValue)                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    QString s = prefs.value(#tag).toString();                                                                                                                                                          \
+    if(s.isEmpty() == false)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      bool bb = prefs.value(#tag).toBool();                                                                                                                                                            \
+      prefix##tag = (bb);                                                                                                                                                                              \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      prefix##tag = (emptyValue);                                                                                                                                                                      \
+    }                                                                                                                                                                                                  \
+  }
 
-#define WRITE_CHECKBOX_SETTING(prefs, prefix, o)\
-  prefs.setValue( #o, prefix##o->isChecked() );
+#define WRITE_BOOL_SETTING(prefs, prefix, tag, b) prefs.setValue(#tag, (b));
 
-#define WRITE_COMBO_BOX(prefs, prefix, combobox)\
-  prefs.setValue(#combobox, this->prefix##combobox->currentIndex());
+#define WRITE_STRING_SETTING(prefs, prefix, var) prefs.setValue(#var, this->prefix##var->text());
 
+#define WRITE_SETTING(prefs, prefix, var) prefs.setValue(#var, this->prefix##var->value());
 
-#define READ_COMBO_BOX(prefs, prefix, combobox)\
-  { bool ok = false;\
-    int i = prefs.value(#combobox).toInt(&ok);\
-    if (false == ok) {i=0;}\
-    prefix##combobox->setCurrentIndex(i); }
+#define WRITE_CHECKBOX_SETTING(prefs, prefix, o) prefs.setValue(#o, prefix##o->isChecked());
 
-#define WRITE_INT_SETTING(prefs, var)\
-  prefs.setValue(#var, var);
+#define WRITE_COMBO_BOX(prefs, prefix, combobox) prefs.setValue(#combobox, this->prefix##combobox->currentIndex());
 
-#define READ_INT_SETTING(prefs, var, def)\
-  { bool ok = false;\
-    var = prefs.value(#var).toInt(&ok);\
-    if (false == ok) {i=def;} }
+#define READ_COMBO_BOX(prefs, prefix, combobox)                                                                                                                                                        \
+  {                                                                                                                                                                                                    \
+    bool ok = false;                                                                                                                                                                                   \
+    int i = prefs.value(#combobox).toInt(&ok);                                                                                                                                                         \
+    if(false == ok)                                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      i = 0;                                                                                                                                                                                           \
+    }                                                                                                                                                                                                  \
+    prefix##combobox->setCurrentIndex(i);                                                                                                                                                              \
+  }
 
+#define WRITE_INT_SETTING(prefs, var) prefs.setValue(#var, var);
 
-#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON_BODY1(ns, prefixname, name)\
-  prefixname->setText(m_OutputFilePrefix->text() + ns::name.c_str());\
-  prefixname##Icon->setPixmap(QPixmap(iconFile));\
+#define READ_INT_SETTING(prefs, var, def)                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    bool ok = false;                                                                                                                                                                                   \
+    var = prefs.value(#var).toInt(&ok);                                                                                                                                                                \
+    if(false == ok)                                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      i = def;                                                                                                                                                                                         \
+    }                                                                                                                                                                                                  \
+  }
 
-#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefixname, name)\
-  prefixname->setText(m_OutputFilePrefix->text() + ns::name.c_str());
+#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON_BODY1(ns, prefixname, name)                                                                                                                               \
+  prefixname->setText(m_OutputFilePrefix->text() + ns::name.c_str());                                                                                                                                  \
+  prefixname##Icon->setPixmap(QPixmap(iconFile));
 
+#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefixname, name) prefixname->setText(m_OutputFilePrefix->text() + ns::name.c_str());
 
-#define CHECK_QLABEL_OUTPUT_FILE_EXISTS(ns, prefix, name) \
-  { \
-    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();\
-    absPath = QDir::toNativeSeparators(absPath);\
-    QFileInfo fi ( absPath );\
-    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)\
+#define CHECK_QLABEL_OUTPUT_FILE_EXISTS(ns, prefix, name)                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();                                                                                   \
+    absPath = QDir::toNativeSeparators(absPath);                                                                                                                                                       \
+    QFileInfo fi(absPath);                                                                                                                                                                             \
+    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)                                                                                                                                      \
   }
 
-
-#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON(ns, prefix, name) \
-  { \
-    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();\
-    absPath = QDir::toNativeSeparators(absPath);\
-    QFileInfo fi ( absPath );\
-    CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON_BODY1(ns, prefix##name, name)\
+#define CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON(ns, prefix, name)                                                                                                                                         \
+  {                                                                                                                                                                                                    \
+    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();                                                                                   \
+    absPath = QDir::toNativeSeparators(absPath);                                                                                                                                                       \
+    QFileInfo fi(absPath);                                                                                                                                                                             \
+    CHECK_QLABEL_OUTPUT_FILE_EXISTS_ICON_BODY1(ns, prefix##name, name)                                                                                                                                 \
   }
 
-
-#define CHECK_QCHECKBOX_OUTPUT_FILE_EXISTS(ns, prefix, name) \
-  { \
-    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();\
-    absPath = QDir::toNativeSeparators(absPath);\
-    QFileInfo fi ( absPath );\
-    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)\
+#define CHECK_QCHECKBOX_OUTPUT_FILE_EXISTS(ns, prefix, name)                                                                                                                                           \
+  {                                                                                                                                                                                                    \
+    QString absPath = prefix##OutputDir->text() + QDir::separator() + m_OutputFilePrefix->text() + ns::name.c_str();                                                                                   \
+    absPath = QDir::toNativeSeparators(absPath);                                                                                                                                                       \
+    QFileInfo fi(absPath);                                                                                                                                                                             \
+    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)                                                                                                                                      \
   }
 
-
-#define SANITY_CHECK_INPUT(prefix, input)\
-  if (QtSFileUtils::VerifyPathExists(prefix##input->text(), prefix##input) == false) {\
-    QMessageBox::critical(this, tr("SIMPLView"),\
-                          tr("The input " #input " does not exist. Please ensure the file or folder exists before starting the operation"),\
-                          QMessageBox::Ok,\
-                          QMessageBox::Ok);\
-    return;\
+#define SANITY_CHECK_INPUT(prefix, input)                                                                                                                                                              \
+  if(QtSFileUtils::VerifyPathExists(prefix##input->text(), prefix##input) == false)                                                                                                                    \
+  {                                                                                                                                                                                                    \
+    QMessageBox::critical(this, tr("SIMPLView"), tr("The input " #input " does not exist. Please ensure the file or folder exists before starting the operation"), QMessageBox::Ok, QMessageBox::Ok);  \
+    return;                                                                                                                                                                                            \
   }
 
-
-#define SANITY_CHECK_QLABEL_FILE(ns, prefix, input) \
-  { \
-    QString absPath = prefix##InputDir->text() + QDir::separator() + ns::input.c_str();\
-    absPath = QDir::toNativeSeparators(absPath);\
-    QFileInfo fi ( absPath );\
-    QString theMessage = QString("The input ") + QString(ns::input.c_str()) + \
-                         QString(" does not exist. Please ensure the file or folder exists before starting the operation");\
-    if ( fi.exists() == false)  {\
-      QMessageBox::critical(this, tr("SIMPLView"),\
-                            theMessage,\
-                            QMessageBox::Ok,\
-                            QMessageBox::Ok);\
-      return;\
-    }\
+#define SANITY_CHECK_QLABEL_FILE(ns, prefix, input)                                                                                                                                                    \
+  {                                                                                                                                                                                                    \
+    QString absPath = prefix##InputDir->text() + QDir::separator() + ns::input.c_str();                                                                                                                \
+    absPath = QDir::toNativeSeparators(absPath);                                                                                                                                                       \
+    QFileInfo fi(absPath);                                                                                                                                                                             \
+    QString theMessage = QString("The input ") + QString(ns::input.c_str()) + QString(" does not exist. Please ensure the file or folder exists before starting the operation");                       \
+    if(fi.exists() == false)                                                                                                                                                                           \
+    {                                                                                                                                                                                                  \
+      QMessageBox::critical(this, tr("SIMPLView"), theMessage, QMessageBox::Ok, QMessageBox::Ok);                                                                                                      \
+      return;                                                                                                                                                                                          \
+    }                                                                                                                                                                                                  \
   }
 
-#define CHECK_QLABEL_INPUT_FILE_EXISTS(ns, prefix, name) \
-  { \
-    QString absPath = prefix##InputDir->text() + QDir::separator() + ns::name.c_str();\
-    absPath = QDir::toNativeSeparators(absPath);\
-    QFileInfo fi ( absPath );\
-    QString iconFile;\
-    if ( fi.exists() )  {\
-      iconFile = QString(":/SIMPL/icons/images/") + QString("Check") + QString("-16x16.png");\
-    } else {\
-      iconFile = QString(":/SIMPL/icons/images/") + QString("Delete") + QString("-16x16.png");\
-    }\
-    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)\
+#define CHECK_QLABEL_INPUT_FILE_EXISTS(ns, prefix, name)                                                                                                                                               \
+  {                                                                                                                                                                                                    \
+    QString absPath = prefix##InputDir->text() + QDir::separator() + ns::name.c_str();                                                                                                                 \
+    absPath = QDir::toNativeSeparators(absPath);                                                                                                                                                       \
+    QFileInfo fi(absPath);                                                                                                                                                                             \
+    QString iconFile;                                                                                                                                                                                  \
+    if(fi.exists())                                                                                                                                                                                    \
+    {                                                                                                                                                                                                  \
+      iconFile = QString(":/SIMPL/icons/images/") + QString("Check") + QString("-16x16.png");                                                                                                          \
+    }                                                                                                                                                                                                  \
+    else                                                                                                                                                                                               \
+    {                                                                                                                                                                                                  \
+      iconFile = QString(":/SIMPL/icons/images/") + QString("Delete") + QString("-16x16.png");                                                                                                         \
+    }                                                                                                                                                                                                  \
+    CHECK_QLABEL_OUTPUT_FILE_EXISTS_BODY1(ns, prefix##name, name)                                                                                                                                      \
   }
-
-
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
index f3846d62b9..df69c9ad9e 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSPluginFrame.h"
 
@@ -124,7 +124,7 @@ bool QtSPluginFrame::sanityCheckOutputDirectory(QLineEdit* le, QString msgTitle)
           return false;
         }
 
-          return true;
+        return true;
       }
     }
   }
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
old mode 100755
new mode 100644
index 738a11cc36..98e0ad2175
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -48,7 +47,6 @@
 
 class QLineEdit;
 
-
 /**
  * @class QtSPluginFrame QtSPluginFrame.h QtSupportLib/QtSPluginFrame.h
  * @brief This class is a super class for any High Level User Interface element
@@ -61,132 +59,129 @@ class QLineEdit;
  */
 class SVWidgetsLib_EXPORT QtSPluginFrame : public QFrame
 {
-    Q_OBJECT
-
-  public:
-    QtSPluginFrame(QWidget* parent = nullptr);
-    ~QtSPluginFrame() override;
-
-
-    /**
-      * @brief Reads the Preferences from the users pref file
-      */
-    virtual void readSettings(QSettings& prefs, bool shouldClear);
-
-    /**
-     * @brief Writes the preferences to the users pref file
-     */
-    virtual void writeSettings(QSettings& prefs);
-
-    /**
-     * @brief Enables or Disables all the widgets in a list
-     * @param b Enable or Disable the widgets.
-     */
-    virtual void setWidgetListEnabled(bool b) = 0;
-
-    /**
-     * @brief Verifies that a parent path exists on the file system.
-     * @param outFilePath The parent file path to check
-     * @param lineEdit The QLineEdit object to modify visuals of (Usually by placing a red line around the QLineEdit widget)
-     */
-    bool verifyOutputPathParentExists(QString outFilePath, QLineEdit* lineEdit);
-
-    /**
-     * @brief Initializes some of the GUI elements with selections or other GUI related items
-     */
-    virtual void setupGui() = 0;
-
-    /**
-     * @brief Checks for the existance of output files
-     */
-    virtual void checkIOFiles() = 0;
-
-    /**
-     * @brief Sets the status bar object for the frame
-     * @param statusBar
-     */
-    virtual void setStatusBar(QStatusBar* statusBar);
-
-    /**
-     * @brief Returns a pointer to the QStatusBar being used
-     * @return
-     */
-    virtual QStatusBar* statusBar();
-
-    /**
-     * @brief Runs checks on the output files to let the user know which output
-     * files already exist in the output directory location potentially warning
-     * them of an over writing situation
-     * @param le The QLineEdit where the output directory is defined
-     * @param msgTitle A message to display.
-     * @return
-     */
-    virtual bool sanityCheckOutputDirectory(QLineEdit* le, QString msgTitle);
-
-    /**
-     * @brief Displays a Type Dialog box used for errors that occur
-     * during the execution of the program.
-     * @param title
-     * @param text
-     */
-    virtual void displayDialogBox(QString title, QString text, QMessageBox::Icon icon);
-
-  signals:
-
-    /**
-     * @brief Signal emitted when a process is started
-     */
-    void pipelineStarted();
-
-    /**
-     * @brief Signal Emitted when a process has ended.
-     */
-    void pipelineEnded();
-
-    /**
-     * @brief Signal Emitted when the process has been canceled.
-     */
-    void cancelPipeline();
-
-    /**
-     * @brief Signal emitted when a message is available for display to the user
-     * @param
-     */
-    void pipelineWarningMessage(const QString&);
-    void pipelineErrorMessage(const QString&);
-
-  private slots:
-    /**
-     * @brief Slot to add a message to display to the user
-     * @param message
-     */
-    virtual void addMessage(AbstractMessage::Pointer msg) = 0;
-
-    /**
-     * @brief Slot to add a Progress message to display to the user
-     * @param message
-     */
-    virtual void addProgressMessage(QString message) = 0;
-
-    /**
-     * @brief Slot to catch signals when the processing thread is finished.
-     */
-    virtual void pipelineComplete() = 0;
-
-    /**
-     * @brief Slot to catch signals when a processing thread has made progress
-     * @param value The value of the progress, Typically between 0 and 100.
-     */
-    virtual void pipelineProgress(int value) = 0;
-
-  private:
-    QStatusBar*    m_StatusBar;
-
-  public:
-    QtSPluginFrame(const QtSPluginFrame&) = delete; // Copy Constructor Not Implemented
-    QtSPluginFrame(QtSPluginFrame&&) = delete;      // Move Constructor Not Implemented
-    QtSPluginFrame& operator=(const QtSPluginFrame&) = delete; // Copy Assignment Not Implemented
-    QtSPluginFrame& operator=(QtSPluginFrame&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  QtSPluginFrame(QWidget* parent = nullptr);
+  ~QtSPluginFrame() override;
+
+  /**
+   * @brief Reads the Preferences from the users pref file
+   */
+  virtual void readSettings(QSettings& prefs, bool shouldClear);
+
+  /**
+   * @brief Writes the preferences to the users pref file
+   */
+  virtual void writeSettings(QSettings& prefs);
+
+  /**
+   * @brief Enables or Disables all the widgets in a list
+   * @param b Enable or Disable the widgets.
+   */
+  virtual void setWidgetListEnabled(bool b) = 0;
+
+  /**
+   * @brief Verifies that a parent path exists on the file system.
+   * @param outFilePath The parent file path to check
+   * @param lineEdit The QLineEdit object to modify visuals of (Usually by placing a red line around the QLineEdit widget)
+   */
+  bool verifyOutputPathParentExists(QString outFilePath, QLineEdit* lineEdit);
+
+  /**
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
+  virtual void setupGui() = 0;
+
+  /**
+   * @brief Checks for the existance of output files
+   */
+  virtual void checkIOFiles() = 0;
+
+  /**
+   * @brief Sets the status bar object for the frame
+   * @param statusBar
+   */
+  virtual void setStatusBar(QStatusBar* statusBar);
+
+  /**
+   * @brief Returns a pointer to the QStatusBar being used
+   * @return
+   */
+  virtual QStatusBar* statusBar();
+
+  /**
+   * @brief Runs checks on the output files to let the user know which output
+   * files already exist in the output directory location potentially warning
+   * them of an over writing situation
+   * @param le The QLineEdit where the output directory is defined
+   * @param msgTitle A message to display.
+   * @return
+   */
+  virtual bool sanityCheckOutputDirectory(QLineEdit* le, QString msgTitle);
+
+  /**
+   * @brief Displays a Type Dialog box used for errors that occur
+   * during the execution of the program.
+   * @param title
+   * @param text
+   */
+  virtual void displayDialogBox(QString title, QString text, QMessageBox::Icon icon);
+
+signals:
+
+  /**
+   * @brief Signal emitted when a process is started
+   */
+  void pipelineStarted();
+
+  /**
+   * @brief Signal Emitted when a process has ended.
+   */
+  void pipelineEnded();
+
+  /**
+   * @brief Signal Emitted when the process has been canceled.
+   */
+  void cancelPipeline();
+
+  /**
+   * @brief Signal emitted when a message is available for display to the user
+   * @param
+   */
+  void pipelineWarningMessage(const QString&);
+  void pipelineErrorMessage(const QString&);
+
+private slots:
+  /**
+   * @brief Slot to add a message to display to the user
+   * @param message
+   */
+  virtual void addMessage(AbstractMessage::Pointer msg) = 0;
+
+  /**
+   * @brief Slot to add a Progress message to display to the user
+   * @param message
+   */
+  virtual void addProgressMessage(QString message) = 0;
+
+  /**
+   * @brief Slot to catch signals when the processing thread is finished.
+   */
+  virtual void pipelineComplete() = 0;
+
+  /**
+   * @brief Slot to catch signals when a processing thread has made progress
+   * @param value The value of the progress, Typically between 0 and 100.
+   */
+  virtual void pipelineProgress(int value) = 0;
+
+private:
+  QStatusBar* m_StatusBar;
+
+public:
+  QtSPluginFrame(const QtSPluginFrame&) = delete;            // Copy Constructor Not Implemented
+  QtSPluginFrame(QtSPluginFrame&&) = delete;                 // Move Constructor Not Implemented
+  QtSPluginFrame& operator=(const QtSPluginFrame&) = delete; // Copy Assignment Not Implemented
+  QtSPluginFrame& operator=(QtSPluginFrame&&) = delete;      // Move Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
index 02f28929d3..4cf0364d06 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSRecentFileList.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
old mode 100755
new mode 100644
index e3532e0166..a55e9084c2
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +40,6 @@
 #include <QtCore/QSettings>
 #include <QtCore/QFileSystemWatcher>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
@@ -61,104 +59,99 @@ class QMenu;
  * @date Oct 2008
  * @version $Revision: 1.2 $
  */
-class SVWidgetsLib_EXPORT QtSRecentFileList: public QObject
+class SVWidgetsLib_EXPORT QtSRecentFileList : public QObject
 {
 
-    Q_OBJECT
-
-  public:
-    QtSRecentFileList(int maxListSize = 7, QObject* parent = nullptr);
-
-    /**
-     * @brief Returns the singleton instance of this class.
-     * @return Instance of this class
-     */
-    static QtSRecentFileList* Instance(int maxListSize = 7, QObject* parent = nullptr);
-
-    /**
-     * @brief Stripps the path from a file argument given as a full path.
-     * @param fullfilepath The filename to extract
-     * @return File name
-     */
-    static QString strippedName(const QString& fullfilepath);
-
-    /**
-     * @brief Returns the Filename plus it's parent folder name
-     * @param file The path to the file including its filename
-     * @return
-     */
-    static QString parentAndFileName(const QString& file);
-
-    /**
-     * @brief Returns the current list of 'Recent Files' for this application
-     * @return
-     */
-    QStringList fileList();
-
-    /**
-     * @brief Adds a file to the recent files
-     * @param file The file to add to the list
-     */
-    void addFile(const QString& file, AddType type = PREPEND);
-
-    /**
-     * @brief Writes the list of files to a preference file.
-     * @param prefs The QSettings object to use.
-     */
-    void writeList(QtSSettings* prefs);
-
-    /**
-     * @brief Reads the list of Recent Files from the preferences file
-     * @param prefs The QSettins object to use
-     */
-    void readList(QtSSettings* prefs);
-
-    /**
-    * @brief Clears the list of recent files
-    */
-    void clear();
-
-  public slots:
-
-    /**
-    * @brief Removes a file from the list of recent files.
-    * @param file The file to remove
-    */
-    void removeFile(const QString& file);
-
-    /* ******************* Begin Qt Signals ********************************* */
-  signals:
-
-    /**
-     * @brief Qt Signal emitted when the list of files has changed.
-     * @param file The newly added file
-     */
-    void fileListChanged(const QString& file);
-
-  protected:
-
-    /**
-     * @brief Returns true if the list already contains the file.
-     * @param file The file to check.
-     */
-    bool contains(const QString& file);
-
-  private:
-    static QtSRecentFileList* self;
-
-    ~QtSRecentFileList() override;
-
-    QStringList recentFiles;
-    int m_MaxListSize = 0;
-
-    QFileSystemWatcher* m_Watcher;
-    // QList<QAction*> actions;
-    // QMenu* recentFileMenu;
-
-
-    QtSRecentFileList(const QtSRecentFileList&); //Copy Constructor Not Implemented
-    void operator=(const QtSRecentFileList&); //Copy Assignment Not Implemented
-
+  Q_OBJECT
+
+public:
+  QtSRecentFileList(int maxListSize = 7, QObject* parent = nullptr);
+
+  /**
+   * @brief Returns the singleton instance of this class.
+   * @return Instance of this class
+   */
+  static QtSRecentFileList* Instance(int maxListSize = 7, QObject* parent = nullptr);
+
+  /**
+   * @brief Stripps the path from a file argument given as a full path.
+   * @param fullfilepath The filename to extract
+   * @return File name
+   */
+  static QString strippedName(const QString& fullfilepath);
+
+  /**
+   * @brief Returns the Filename plus it's parent folder name
+   * @param file The path to the file including its filename
+   * @return
+   */
+  static QString parentAndFileName(const QString& file);
+
+  /**
+   * @brief Returns the current list of 'Recent Files' for this application
+   * @return
+   */
+  QStringList fileList();
+
+  /**
+   * @brief Adds a file to the recent files
+   * @param file The file to add to the list
+   */
+  void addFile(const QString& file, AddType type = PREPEND);
+
+  /**
+   * @brief Writes the list of files to a preference file.
+   * @param prefs The QSettings object to use.
+   */
+  void writeList(QtSSettings* prefs);
+
+  /**
+   * @brief Reads the list of Recent Files from the preferences file
+   * @param prefs The QSettins object to use
+   */
+  void readList(QtSSettings* prefs);
+
+  /**
+   * @brief Clears the list of recent files
+   */
+  void clear();
+
+public slots:
+
+  /**
+   * @brief Removes a file from the list of recent files.
+   * @param file The file to remove
+   */
+  void removeFile(const QString& file);
+
+  /* ******************* Begin Qt Signals ********************************* */
+signals:
+
+  /**
+   * @brief Qt Signal emitted when the list of files has changed.
+   * @param file The newly added file
+   */
+  void fileListChanged(const QString& file);
+
+protected:
+  /**
+   * @brief Returns true if the list already contains the file.
+   * @param file The file to check.
+   */
+  bool contains(const QString& file);
+
+private:
+  static QtSRecentFileList* self;
+
+  ~QtSRecentFileList() override;
+
+  QStringList recentFiles;
+  int m_MaxListSize = 0;
+
+  QFileSystemWatcher* m_Watcher;
+  // QList<QAction*> actions;
+  // QMenu* recentFileMenu;
+
+  QtSRecentFileList(const QtSRecentFileList&); // Copy Constructor Not Implemented
+  void operator=(const QtSRecentFileList&);    // Copy Assignment Not Implemented
 };
-
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
index 927dfea418..b734d7b0b0 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSSettings.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.h b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
old mode 100755
new mode 100644
index 8a05b5d8b3..39fcde5bf3
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,12 +42,9 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QStack>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 
-
-
 struct SIMPLViewSettingsGroup
 {
   SIMPLViewSettingsGroup(QString name, QJsonObject object)
@@ -63,55 +60,53 @@ struct SIMPLViewSettingsGroup
 
 class SVWidgetsLib_EXPORT QtSSettings : public QObject
 {
-    Q_OBJECT
-
-  public:
-    QtSSettings(QObject* parent = nullptr);
-    QtSSettings(const QString& filePath, QObject* parent = nullptr);
-    ~QtSSettings() override;
+  Q_OBJECT
 
-    QString fileName();
+public:
+  QtSSettings(QObject* parent = nullptr);
+  QtSSettings(const QString& filePath, QObject* parent = nullptr);
+  ~QtSSettings() override;
 
-    bool contains(const QString& key);
+  QString fileName();
 
-    bool beginGroup(const QString& prefix);
-    void endGroup();
+  bool contains(const QString& key);
 
-    QStringList childGroups();
+  bool beginGroup(const QString& prefix);
+  void endGroup();
 
-    void remove(const QString& key);
+  QStringList childGroups();
 
-    void clear();
+  void remove(const QString& key);
 
-    QVariant value(const QString& key, const QVariant& defaultValue = QVariant());
-    QJsonObject value(const QString& key, const QJsonObject& defaultObject = QJsonObject());
-    QStringList value(const QString& key, const QStringList& defaultList = QStringList());
-    QByteArray value(const QString& key, const QByteArray& defaultValue);
+  void clear();
 
+  QVariant value(const QString& key, const QVariant& defaultValue = QVariant());
+  QJsonObject value(const QString& key, const QJsonObject& defaultObject = QJsonObject());
+  QStringList value(const QString& key, const QStringList& defaultList = QStringList());
+  QByteArray value(const QString& key, const QByteArray& defaultValue);
 
-    void setValue(const QString& key, const QVariant& value);
-    void setValue(const QString& key, const QJsonObject& object);
-    void setValue(const QString& key, const QStringList& list);
-    void setValue(const QString& key, const QByteArray& value);
+  void setValue(const QString& key, const QVariant& value);
+  void setValue(const QString& key, const QJsonObject& object);
+  void setValue(const QString& key, const QStringList& list);
+  void setValue(const QString& key, const QByteArray& value);
 
-  private:
-    QString m_FilePath;
-    QStack<SIMPLViewSettingsGroup::Pointer> m_Stack;
+private:
+  QString m_FilePath;
+  QStack<SIMPLViewSettingsGroup::Pointer> m_Stack;
 
-    void openFile();
-    void closeFile();
-    void writeToFile();
+  void openFile();
+  void closeFile();
+  void writeToFile();
 
-    enum MultiValueLabels
-    {
-      Value,
-      Type
-    };
-
-  public:
-    QtSSettings(const QtSSettings&) = delete;            // Copy Constructor Not Implemented
-    QtSSettings(QtSSettings&&) = delete;                 // Move Constructor Not Implemented
-    QtSSettings& operator=(const QtSSettings&) = delete; // Copy Assignment Not Implemented
-    QtSSettings& operator=(QtSSettings&&) = delete;      // Move Assignment Not Implemented
+  enum MultiValueLabels
+  {
+    Value,
+    Type
+  };
+
+public:
+  QtSSettings(const QtSSettings&) = delete;            // Copy Constructor Not Implemented
+  QtSSettings(QtSSettings&&) = delete;                 // Move Constructor Not Implemented
+  QtSSettings& operator=(const QtSSettings&) = delete; // Copy Assignment Not Implemented
+  QtSSettings& operator=(QtSSettings&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
index 9571893a30..431ac7e8b9 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "QtSSplitter.h"
 
 #include <iostream>
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitter.h b/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
old mode 100755
new mode 100644
index 69c5594c63..29c3464f57
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,22 +42,21 @@
 class QSplitterHandle;
 
 /**
-* @brief The QtSSplitter class is a sub-class of the QSplitter class.
-*/
+ * @brief The QtSSplitter class is a sub-class of the QSplitter class.
+ */
 class SVWidgetsLib_EXPORT QtSSplitter : public QSplitter
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    QtSSplitter(QWidget* parent = nullptr);
-    ~QtSSplitter() override;
+public:
+  QtSSplitter(QWidget* parent = nullptr);
+  ~QtSSplitter() override;
 
-    QSplitterHandle* createHandle() override;
+  QSplitterHandle* createHandle() override;
 
-  public:
-    QtSSplitter(const QtSSplitter&) = delete;    // Copy Constructor Not Implemented
-    QtSSplitter(QtSSplitter&&) = delete;         // Move Constructor Not Implemented
-    QtSSplitter& operator=(const QtSSplitter&) = delete; // Copy Assignment Not Implemented
-    QtSSplitter& operator=(QtSSplitter&&) = delete;      // Move Assignment Not Implemented
+public:
+  QtSSplitter(const QtSSplitter&) = delete;            // Copy Constructor Not Implemented
+  QtSSplitter(QtSSplitter&&) = delete;                 // Move Constructor Not Implemented
+  QtSSplitter& operator=(const QtSSplitter&) = delete; // Copy Assignment Not Implemented
+  QtSSplitter& operator=(QtSSplitter&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
index 8e70f19688..89b33f4f02 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
@@ -1,42 +1,41 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "QtSSplitterHandle.h"
 
 #include <QtGui/QPainter>
 
-
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
old mode 100755
new mode 100644
index fec15f9c5a..c5892fd10e
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,15 +41,16 @@
 
 class SVWidgetsLib_EXPORT QtSSplitterHandle : public QSplitterHandle
 {
-    Q_OBJECT
-  public:
-    QtSSplitterHandle(Qt::Orientation orientation, QSplitter* parent)
-      : QSplitterHandle(orientation, parent) {   }
+  Q_OBJECT
+public:
+  QtSSplitterHandle(Qt::Orientation orientation, QSplitter* parent)
+  : QSplitterHandle(orientation, parent)
+  {
+  }
 
-    // Paint the horizontal handle as a gradient, paint
-    // the vertical handle as a line.
-    void paintEvent(QPaintEvent* evt) override;
+  // Paint the horizontal handle as a gradient, paint
+  // the vertical handle as a line.
+  void paintEvent(QPaintEvent* evt) override;
 
-    QSize sizeHint() const override;
+  QSize sizeHint() const override;
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
index 15ab6fe5f6..e60a72c717 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "QtSStringEdit.h"
 
@@ -40,7 +40,8 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QtSStringEdit::QtSStringEdit(QWidget* parent) : QWidget(parent)
+QtSStringEdit::QtSStringEdit(QWidget* parent)
+: QWidget(parent)
 {
   setupUi(this);
   setupGui();
@@ -156,7 +157,7 @@ void QtSStringEdit::widgetChanged(const QString& text)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void QtSStringEdit::setValidator(const QValidator *v)
+void QtSStringEdit::setValidator(const QValidator* v)
 {
   value->setValidator(v);
 }
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
index 84dd8e6024..373f486a11 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -60,7 +60,7 @@ class QtSStringEdit : public QWidget, private Ui::QtSStringEdit
   QString getText();
   void setText(QString value, bool blockSignals = false);
 
-  void setValidator(const QValidator *v);
+  void setValidator(const QValidator* v);
 
 signals:
   void valueChanged(QString value);
@@ -78,4 +78,3 @@ public slots:
 private:
   QString m_storedValue;
 };
-
diff --git a/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.cpp b/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.cpp
index 1bcd018735..2e263a5c1d 100644
--- a/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.cpp
+++ b/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.cpp
@@ -4,8 +4,8 @@
 */
 
 /**
-* @brief Small changes to add support for json text files
-*/
+ * @brief Small changes to add support for json text files
+ */
 #include "QtSStaticFileController.h"
 
 #include <QtCore/QDateTime>
@@ -21,7 +21,7 @@ QtSStaticFileController::QtSStaticFileController(ServerSettings* settings, QObje
   docroot = settings->docRootPath;
   if(!(docroot.startsWith(":/") || docroot.startsWith("qrc://")))
   {
-// Convert relative path to absolute, based on the directory of the config file.
+    // Convert relative path to absolute, based on the directory of the config file.
     if(QDir::isRelativePath(docroot))
     {
       QFileInfo configFile(settings->configFileName);
diff --git a/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.h b/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.h
index 2b41931de7..f0f0986f6f 100644
--- a/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.h
+++ b/Source/SVWidgetsLib/QtSupport/httpserver/QtSStaticFileController.h
@@ -88,4 +88,3 @@ class SVWidgetsLib_EXPORT QtSStaticFileController : public HttpRequestHandler
 
   bool verbose = false;
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
index 11a60d0209..ad56ab8909 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "BookmarksItem.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.h b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
old mode 100755
new mode 100644
index 7c3fc46ae6..0de050ad8b
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,124 +39,122 @@
 
 #include <QtGui/QIcon>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class SVWidgetsLib_EXPORT BookmarksItem
 {
-  public:
-    BookmarksItem(const QString &name, const QString &path = "", BookmarksItem* parent = 0);
-    virtual ~BookmarksItem();
-
-    enum BookmarkItemData
-    {
-      Contents
-    };
-
-    enum class ItemType : unsigned int
-    {
-      Folder,
-      Bookmark
-    };
-
-    void setExpanded(bool value);
-    bool isExpanded() const;
-
-    /**
-     * @brief Setter property for Name
-     */
-    void setName(const QString& value);
-    /**
-     * @brief Getter property for Name
-     * @return Value of Name
-     */
-    QString getName() const;
-
-    /**
-     * @brief Setter property for Path
-     */
-    void setPath(const QString& value);
-    /**
-     * @brief Getter property for Path
-     * @return Value of Path
-     */
-    QString getPath() const;
-
-    /**
-     * @brief Setter property for HasErrors
-     */
-    void setHasErrors(bool value);
-    /**
-     * @brief Getter property for HasErrors
-     * @return Value of HasErrors
-     */
-    bool getHasErrors() const;
-
-    Q_PROPERTY(bool HasErrors READ getHasErrors WRITE setHasErrors)
-
-    /**
-     * @brief Setter property for ItemTooltip
-     */
-    void setItemTooltip(const QString& value);
-    /**
-     * @brief Getter property for ItemTooltip
-     * @return Value of ItemTooltip
-     */
-    QString getItemTooltip() const;
-
-    /**
-     * @brief Setter property for Icon
-     */
-    void setIcon(const QIcon& value);
-    /**
-     * @brief Getter property for Icon
-     * @return Value of Icon
-     */
-    QIcon getIcon() const;
-
-    /**
-     * @brief Setter property for ItemType
-     */
-    void setItemType(const BookmarksItem::ItemType& value);
-    /**
-     * @brief Getter property for ItemType
-     * @return Value of ItemType
-     */
-    BookmarksItem::ItemType getItemType() const;
-
-    BookmarksItem* child(int number);
-    BookmarksItem* parent();
-
-    int childCount() const;
-
-    bool insertChild(int position, BookmarksItem* child);
-    bool insertChildren(int position, int count, int columns);
-
-    bool removeChild(int position);
-    bool removeChildren(int position, int count);
-
-    int childNumber() const;
-
-    void setParent(BookmarksItem* parent);
-
-    static QString TopLevelString();
-
-  private:
-    QString m_Name = {};
-    QString m_Path = {};
-    bool m_HasErrors = {};
-    QString m_ItemTooltip = {};
-    QIcon m_Icon = {};
-    BookmarksItem::ItemType m_ItemType = {};
-    bool m_Expanded = false;
-
-    QList<BookmarksItem*> m_ChildItems;
-    BookmarksItem*                      m_ParentItem;
-
-  public:
-    BookmarksItem(const BookmarksItem&) = delete;            // Copy Constructor Not Implemented
-    BookmarksItem(BookmarksItem&&) = delete;                 // Move Constructor Not Implemented
-    BookmarksItem& operator=(const BookmarksItem&) = delete; // Copy Assignment Not Implemented
-    BookmarksItem& operator=(BookmarksItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  BookmarksItem(const QString& name, const QString& path = "", BookmarksItem* parent = 0);
+  virtual ~BookmarksItem();
+
+  enum BookmarkItemData
+  {
+    Contents
+  };
+
+  enum class ItemType : unsigned int
+  {
+    Folder,
+    Bookmark
+  };
+
+  void setExpanded(bool value);
+  bool isExpanded() const;
+
+  /**
+   * @brief Setter property for Name
+   */
+  void setName(const QString& value);
+  /**
+   * @brief Getter property for Name
+   * @return Value of Name
+   */
+  QString getName() const;
+
+  /**
+   * @brief Setter property for Path
+   */
+  void setPath(const QString& value);
+  /**
+   * @brief Getter property for Path
+   * @return Value of Path
+   */
+  QString getPath() const;
+
+  /**
+   * @brief Setter property for HasErrors
+   */
+  void setHasErrors(bool value);
+  /**
+   * @brief Getter property for HasErrors
+   * @return Value of HasErrors
+   */
+  bool getHasErrors() const;
+
+  Q_PROPERTY(bool HasErrors READ getHasErrors WRITE setHasErrors)
+
+  /**
+   * @brief Setter property for ItemTooltip
+   */
+  void setItemTooltip(const QString& value);
+  /**
+   * @brief Getter property for ItemTooltip
+   * @return Value of ItemTooltip
+   */
+  QString getItemTooltip() const;
+
+  /**
+   * @brief Setter property for Icon
+   */
+  void setIcon(const QIcon& value);
+  /**
+   * @brief Getter property for Icon
+   * @return Value of Icon
+   */
+  QIcon getIcon() const;
+
+  /**
+   * @brief Setter property for ItemType
+   */
+  void setItemType(const BookmarksItem::ItemType& value);
+  /**
+   * @brief Getter property for ItemType
+   * @return Value of ItemType
+   */
+  BookmarksItem::ItemType getItemType() const;
+
+  BookmarksItem* child(int number);
+  BookmarksItem* parent();
+
+  int childCount() const;
+
+  bool insertChild(int position, BookmarksItem* child);
+  bool insertChildren(int position, int count, int columns);
+
+  bool removeChild(int position);
+  bool removeChildren(int position, int count);
+
+  int childNumber() const;
+
+  void setParent(BookmarksItem* parent);
+
+  static QString TopLevelString();
+
+private:
+  QString m_Name = {};
+  QString m_Path = {};
+  bool m_HasErrors = {};
+  QString m_ItemTooltip = {};
+  QIcon m_Icon = {};
+  BookmarksItem::ItemType m_ItemType = {};
+  bool m_Expanded = false;
+
+  QList<BookmarksItem*> m_ChildItems;
+  BookmarksItem* m_ParentItem;
+
+public:
+  BookmarksItem(const BookmarksItem&) = delete;            // Copy Constructor Not Implemented
+  BookmarksItem(BookmarksItem&&) = delete;                 // Move Constructor Not Implemented
+  BookmarksItem& operator=(const BookmarksItem&) = delete; // Copy Assignment Not Implemented
+  BookmarksItem& operator=(BookmarksItem&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
index 30c971b74c..b8b9fb6bde 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <QtWidgets/QLineEdit>
 
 #include <QtGui/QPainter>
@@ -101,7 +101,7 @@ void BookmarksItemDelegate::updateEditorGeometry(QWidget* editor, const QStyleOp
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QSize BookmarksItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
+QSize BookmarksItemDelegate::sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
   QSize size = QStyledItemDelegate::sizeHint(option, index);
   return QSize(size.width(), 20);
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
old mode 100755
new mode 100644
index d319c21175..87e4e29629
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,26 +41,25 @@
 
 class BookmarksItemDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    explicit BookmarksItemDelegate(QObject* parent = nullptr);
+public:
+  explicit BookmarksItemDelegate(QObject* parent = nullptr);
 
-    ~BookmarksItemDelegate() override;
+  ~BookmarksItemDelegate() override;
 
-  protected:
-    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
-    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
-    void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+protected:
+  QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+  void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+  void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+  QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-  public:
-    BookmarksItemDelegate(const BookmarksItemDelegate&) = delete; // Copy Constructor Not Implemented
-    BookmarksItemDelegate(BookmarksItemDelegate&&) = delete;      // Move Constructor Not Implemented
-    BookmarksItemDelegate& operator=(const BookmarksItemDelegate&) = delete; // Copy Assignment Not Implemented
-    BookmarksItemDelegate& operator=(BookmarksItemDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  BookmarksItemDelegate(const BookmarksItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  BookmarksItemDelegate(BookmarksItemDelegate&&) = delete;                 // Move Constructor Not Implemented
+  BookmarksItemDelegate& operator=(const BookmarksItemDelegate&) = delete; // Copy Assignment Not Implemented
+  BookmarksItemDelegate& operator=(BookmarksItemDelegate&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index 24530c4b1a..d6fc0f5418 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QDebug>
 
@@ -77,13 +77,12 @@ BookmarksModel* BookmarksModel::Instance()
   {
     self = new BookmarksModel();
     self->loadModel();
-    self->writeBookmarksToPrefsFile();  // Write out any "sanity check" changes that were made while loading the model
+    self->writeBookmarksToPrefsFile(); // Write out any "sanity check" changes that were made while loading the model
   }
 
   return self;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -179,7 +178,7 @@ QVariant BookmarksModel::data(const QModelIndex& index, int role) const
       return styles->getQTreeViewItem_error_color();
     }
 
-      return styles->getQTreeViewItem_color();
+    return styles->getQTreeViewItem_color();
   }
   else if(role == Qt::ToolTipRole && item->getItemType() == BookmarksItem::ItemType::Bookmark)
   {
@@ -229,8 +228,8 @@ Qt::ItemFlags BookmarksModel::flags(const QModelIndex& index) const
     return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled);
   }
 
-    // This is a leaf
-    return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled);
+  // This is a leaf
+  return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled);
 }
 
 // -----------------------------------------------------------------------------
@@ -267,7 +266,7 @@ QModelIndex BookmarksModel::index(int row, int column, const QModelIndex& parent
     return createIndex(row, column, childItem);
   }
 
-    return QModelIndex();
+  return QModelIndex();
 }
 
 // -----------------------------------------------------------------------------
@@ -577,11 +576,11 @@ void BookmarksModel::unwrapModel(QString objectName, QJsonObject object, QModelI
   QFileInfo fi(path);
 
   // Sanity check to make sure that all bookmark items that are read in have the proper type
-  if (fi.isFile() && fi.completeSuffix() == "json" && itemType == BookmarksItem::ItemType::Folder)
+  if(fi.isFile() && fi.completeSuffix() == "json" && itemType == BookmarksItem::ItemType::Folder)
   {
     itemType = BookmarksItem::ItemType::Bookmark;
   }
-  else if (path.isEmpty() && itemType == BookmarksItem::ItemType::Bookmark)
+  else if(path.isEmpty() && itemType == BookmarksItem::ItemType::Bookmark)
   {
     itemType = BookmarksItem::ItemType::Folder;
   }
@@ -839,13 +838,13 @@ QDir BookmarksModel::findPipelinesDirectory()
     pipelinesDir.cdUp();
     // Can we change directory into the "PrebuiltPipeliines" directory at this level.
     QString pbpDir = QString("Resources/%1").arg(PREBUILT_PIPELINES_DIR);
-    if (pipelinesDir.cd(pbpDir))
+    if(pipelinesDir.cd(pbpDir))
     {
       return pipelinesDir;
     }
     pipelinesDir.cdUp();
     pipelinesDir.cdUp();
-    if (pipelinesDir.cd(PREBUILT_PIPELINES_DIR) )
+    if(pipelinesDir.cd(PREBUILT_PIPELINES_DIR))
     {
       return pipelinesDir;
     }
@@ -870,7 +869,8 @@ QDir BookmarksModel::findPipelinesDirectory()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void BookmarksModel::addPipelinesRecursively(QDir currentDir, QModelIndex parent, QJsonObject prebuiltsObj, QString iconFileName, bool allowEditing, QStringList filters, FilterLibraryTreeWidget::ItemType itemType)
+void BookmarksModel::addPipelinesRecursively(QDir currentDir, QModelIndex parent, QJsonObject prebuiltsObj, QString iconFileName, bool allowEditing, QStringList filters,
+                                             FilterLibraryTreeWidget::ItemType itemType)
 {
   QModelIndex nextIndex;
 
@@ -921,8 +921,8 @@ void BookmarksModel::addPipelinesRecursively(QDir currentDir, QModelIndex parent
     addTreeItem(parent, itemName, QIcon(iconFileName), itemInfo.absoluteFilePath(), row, BookmarksItem::ItemType::Bookmark, false);
     nextIndex = index(row, BookmarksItem::Contents, parent);
 
-//    QString htmlFormattedString = generateHtmlFilterListFromPipelineFile(itemInfo.absoluteFilePath());
-//    model->setData(nextIndex, htmlFormattedString, Qt::ToolTipRole);
+    //    QString htmlFormattedString = generateHtmlFilterListFromPipelineFile(itemInfo.absoluteFilePath());
+    //    model->setData(nextIndex, htmlFormattedString, Qt::ToolTipRole);
   }
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.h b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
old mode 100755
new mode 100644
index 6ae9086fbd..dfa88e7271
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +41,6 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileSystemWatcher>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 #include "SVWidgetsLib/Widgets/BookmarksItem.h"
@@ -57,164 +56,157 @@ class BookmarksItem;
 
 class SVWidgetsLib_EXPORT BookmarksModel : public QAbstractItemModel
 {
-    Q_OBJECT
-
-  public:
-    /**
-     * @brief Returns the name of the class for BookmarksModel
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for BookmarksModel
-     */
-    static QString ClassName();
+  Q_OBJECT
 
-    enum ErrorCodes
-    {
-      UNRECOGNIZED_EXT = -1
-    };
+public:
+  /**
+   * @brief Returns the name of the class for BookmarksModel
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for BookmarksModel
+   */
+  static QString ClassName();
 
-    enum Roles
-    {
-      PathRole = Qt::UserRole + 1,
-      ExpandedRole,
-      ErrorsRole,
-      ItemTypeRole
-    };
+  enum ErrorCodes
+  {
+    UNRECOGNIZED_EXT = -1
+  };
 
-    ~BookmarksModel() override;
+  enum Roles
+  {
+    PathRole = Qt::UserRole + 1,
+    ExpandedRole,
+    ErrorsRole,
+    ItemTypeRole
+  };
 
-    /**
-     * @brief Instance
-     * @return
-     */
-    static BookmarksModel* Instance();
+  ~BookmarksModel() override;
 
-    /**
-    * @brief toJsonObject
-    */
-    QJsonObject toJsonObject();
+  /**
+   * @brief Instance
+   * @return
+   */
+  static BookmarksModel* Instance();
 
-    QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
+  /**
+   * @brief toJsonObject
+   */
+  QJsonObject toJsonObject();
 
-    bool isEmpty();
+  QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
 
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  bool isEmpty();
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
 
-    bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
-    bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 
-    bool moveRows(const QModelIndex & sourceParent, int sourceRow, int count, const QModelIndex & destinationParent, int destinationChild) Q_DECL_OVERRIDE;
+  bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
 
-    Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  bool moveRows(const QModelIndex& sourceParent, int sourceRow, int count, const QModelIndex& destinationParent, int destinationChild) Q_DECL_OVERRIDE;
 
-    bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
+  Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
 
-    BookmarksItem* getRootItem();
+  bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
 
-    void addFileToTree(QString& path, QModelIndex& specifiedParent);
+  BookmarksItem* getRootItem();
 
-    QStringList getFilePaths();
+  void addFileToTree(QString& path, QModelIndex& specifiedParent);
 
-    QModelIndexList findIndexByPath(QString filePath);
+  QStringList getFilePaths();
 
-    void setFileSystemWatcher(QFileSystemWatcher* watcher);
-    QFileSystemWatcher* getFileSystemWatcher();
+  QModelIndexList findIndexByPath(QString filePath);
 
-    /**
-     * @brief readPrebuiltPipelines
-     */
-    void readPrebuiltPipelines();
+  void setFileSystemWatcher(QFileSystemWatcher* watcher);
+  QFileSystemWatcher* getFileSystemWatcher();
 
-    /**
-     * @brief readBookmarksFromPrefsFile
-     */
-    void readBookmarksFromPrefsFile();
+  /**
+   * @brief readPrebuiltPipelines
+   */
+  void readPrebuiltPipelines();
 
-    /**
-     * @brief writeBookmarksToPrefsFile
-     */
-    void writeBookmarksToPrefsFile();
+  /**
+   * @brief readBookmarksFromPrefsFile
+   */
+  void readBookmarksFromPrefsFile();
 
-  public slots:
-    /**
-     * @brief addTreeItem
-     * @param parent
-     * @param favoriteTitle
-     * @param icon
-     * @param favoritePath
-     * @param insertIndex
-     * @param type
-     * @param isExpanded
-     * @return
-     */
-    QModelIndex addTreeItem(QModelIndex parent,
-                    QString& favoriteTitle,
-                    QIcon icon,
-                    QString favoritePath,
-                    int insertIndex, BookmarksItem::ItemType type,
-                    bool isExpanded);
+  /**
+   * @brief writeBookmarksToPrefsFile
+   */
+  void writeBookmarksToPrefsFile();
 
-  protected:
-    BookmarksModel(QObject* parent = nullptr);
+public slots:
+  /**
+   * @brief addTreeItem
+   * @param parent
+   * @param favoriteTitle
+   * @param icon
+   * @param favoritePath
+   * @param insertIndex
+   * @param type
+   * @param isExpanded
+   * @return
+   */
+  QModelIndex addTreeItem(QModelIndex parent, QString& favoriteTitle, QIcon icon, QString favoritePath, int insertIndex, BookmarksItem::ItemType type, bool isExpanded);
 
-    void initialize();
+protected:
+  BookmarksModel(QObject* parent = nullptr);
 
-    QDir findPipelinesDirectory();
+  void initialize();
 
-    void addPipelinesRecursively(QDir currentDir, QModelIndex parent, QJsonObject prebuiltsObj, QString iconFileName,
-                                 bool allowEditing, QStringList filters, FilterLibraryTreeWidget::ItemType itemType);
+  QDir findPipelinesDirectory();
 
-  protected slots:
-    void updateRowState(const QString& path);
-    void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+  void addPipelinesRecursively(QDir currentDir, QModelIndex parent, QJsonObject prebuiltsObj, QString iconFileName, bool allowEditing, QStringList filters, FilterLibraryTreeWidget::ItemType itemType);
 
-  private:
-    static BookmarksModel*    self;
-    bool m_LoadingModel = false;
+protected slots:
+  void updateRowState(const QString& path);
+  void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
-    BookmarksItem*            rootItem;
-    QFileSystemWatcher*       m_Watcher;
+private:
+  static BookmarksModel* self;
+  bool m_LoadingModel = false;
 
-    BookmarksItem* getItem(const QModelIndex& index) const;
+  BookmarksItem* rootItem;
+  QFileSystemWatcher* m_Watcher;
 
-    QStringList getFilePaths(BookmarksItem* item);
+  BookmarksItem* getItem(const QModelIndex& index) const;
 
-    QModelIndexList findIndexByPath(const QModelIndex& index, QString filePath);
+  QStringList getFilePaths(BookmarksItem* item);
 
-    /**
-    * @brief fromJsonObject
-    * @param modelObject
-    */
-    void fromJsonObject(QJsonObject modelObject);
+  QModelIndexList findIndexByPath(const QModelIndex& index, QString filePath);
 
-    QJsonObject wrapModel(QModelIndex index);
-    void unwrapModel(QString objectName, QJsonObject object, QModelIndex parentIndex);
+  /**
+   * @brief fromJsonObject
+   * @param modelObject
+   */
+  void fromJsonObject(QJsonObject modelObject);
 
-    /**
-    * @brief getBookmarksPrefsPath
-    */
-    QString getBookmarksPrefsPath();
+  QJsonObject wrapModel(QModelIndex index);
+  void unwrapModel(QString objectName, QJsonObject object, QModelIndex parentIndex);
 
-    /**
-     * @brief getBookmarksPrefsObject
-     * @return
-     */
-    QJsonObject getBookmarksPrefsObject();
+  /**
+   * @brief getBookmarksPrefsPath
+   */
+  QString getBookmarksPrefsPath();
 
-    /**
-     * @brief loadModel
-     */
-    void loadModel();
+  /**
+   * @brief getBookmarksPrefsObject
+   * @return
+   */
+  QJsonObject getBookmarksPrefsObject();
 
-  public:
-    BookmarksModel(const BookmarksModel&) = delete;            // Copy Constructor Not Implemented
-    BookmarksModel(BookmarksModel&&) = delete;                 // Move Constructor Not Implemented
-    BookmarksModel& operator=(const BookmarksModel&) = delete; // Copy Assignment Not Implemented
-    BookmarksModel& operator=(BookmarksModel&&) = delete;      // Move Assignment Not Implemented
-};
+  /**
+   * @brief loadModel
+   */
+  void loadModel();
 
+public:
+  BookmarksModel(const BookmarksModel&) = delete;            // Copy Constructor Not Implemented
+  BookmarksModel(BookmarksModel&&) = delete;                 // Move Constructor Not Implemented
+  BookmarksModel& operator=(const BookmarksModel&) = delete; // Copy Assignment Not Implemented
+  BookmarksModel& operator=(BookmarksModel&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index fdeb09e08b..60873106fb 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BookmarksToolboxWidget.h"
 
@@ -103,7 +103,7 @@ void BookmarksToolboxWidget::setupGui()
 
   connect(bookmarksTreeView, &BookmarksTreeView::locateBookmarkTriggered, this, &BookmarksToolboxWidget::listenLocateBookmarkTriggered);
 
-  //bookmarksTreeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+  // bookmarksTreeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
 }
 
 // -----------------------------------------------------------------------------
@@ -210,10 +210,10 @@ void BookmarksToolboxWidget::on_bookmarksTreeView_doubleClicked(const QModelInde
       delete dialog;
       bookmarksTreeView->blockSignals(false);
 
-      if (ret == QDialog::Accepted)
+      if(ret == QDialog::Accepted)
       {
         bool result = locateBookmark();
-        if (result)
+        if(result)
         {
           QString filePath = model->data(index, BookmarksModel::Roles::PathRole).toString();
           emit bookmarkActivated(filePath);
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
old mode 100755
new mode 100644
index d4fbde2720..8bd9639d65
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <QtCore/QSettings>
@@ -60,119 +60,118 @@ class QAction;
 class SVWidgetsLib_EXPORT BookmarksToolboxWidget : public QWidget, private Ui::BookmarksToolboxWidget
 {
 
-    Q_OBJECT
-  public:
-    /**
-     * @brief BookmarksToolboxWidget
-     * @param parent
-     */
-    BookmarksToolboxWidget(QWidget* parent = nullptr);
-    ~BookmarksToolboxWidget() override;
-
-    /**
-     * @brief setupGui
-     */
-    virtual void setupGui();
-
-    /**
-     * @brief connectFilterList
-     * @param filterListWidget
-     */
-    void connectFilterList(FilterListToolboxWidget* filterListWidget);
-
-    /**
-       @brief Delete a directory along with all of its contents.
-       @param dirName Path of directory to remove.
-       @return true on success; false on error.
-    */
-    static bool removeDir(const QString& dirName);
-
-    /**
-     * @brief getBookmarksTreeView
-     * @return
-     */
-    BookmarksTreeView* getBookmarksTreeView();
-
-    /**
-    * @brief Reads the preferences from the users pref file
-    */
-    void readSettings(QtSSettings* prefs);
-
-    /**
-    * @brief Writes the preferences to the users pref file
-    */
-    void writeSettings(QtSSettings* prefs);
-
-    /**
-    * @brief writeSettings
-    */
-    void writeSettings();
-
-    virtual QDir findV4FavoritesDirectory();
-
-  protected:
-    QStringList generateFilterListFromPipelineFile(QString path);
-    QString generateHtmlFilterListFromPipelineFile(QString path);
-
-    void populateFilterList(QStringList filterNames);
-    QString writeNewFavoriteFilePath(QString newFavoriteTitle, QString favoritePath, QTreeWidgetItem* item);
-
-  protected slots:
-
-    //// Slots to catch signals from the QTreeWidget
-    void on_bookmarksTreeView_clicked(const QModelIndex& index);
-    void on_bookmarksTreeView_doubleClicked(const QModelIndex& index);
-
-    void listenLocateBookmarkTriggered();
-
-  signals:
-
-    void fireWriteSettings();
-
-    /**
-     * @brief pipelineNeedsToBeSaved
-     * @param path The absolute path to the pipeline file
-     * @param name The name that the favorite will show up as in the GUI
-     */
-    void pipelineNeedsToBeSaved(const QString& path, const QString& name);
-
-    /**
-     * @brief filterListGenerated
-     * @param filterList
-     */
-    void filterListGenerated(const QStringList& filterList, bool sort);
-
-    /**
-    * @brief This signal is emitted when a new SIMPLView instance is needed.  A filePath is used to populate the new
-    * SIMPLView instance with a pipeline, if necessary.
-    * @param filePath The absolute path to the pipeline file.  If empty, the instance will not have a pipeline in it.
-    * @param execute A boolean that decides whether to execute the pipeline or not
-    */
-    void bookmarkActivated(const QString& filePath, bool execute = false);
-
-    void raiseBookmarksDockWidget();
-
-    void updateStatusBar(const QString& msg);
-
-  private:
-    QString                 m_OpenDialogLastFilePath;
-
-    /**
-    * @brief serializeTreePath
-    * @param treePath
-    */
-    QList<QString> deserializeTreePath(QString treePath);
-
-    /**
-     * @brief locateBookmark
-     * @return
-     */
-    bool locateBookmark();
-
-  public:
-    BookmarksToolboxWidget(const BookmarksToolboxWidget&) = delete; // Copy Constructor Not Implemented
-    BookmarksToolboxWidget(BookmarksToolboxWidget&&) = delete;      // Move Constructor Not Implemented
-    BookmarksToolboxWidget& operator=(const BookmarksToolboxWidget&) = delete; // Copy Assignment Not Implemented
-    BookmarksToolboxWidget& operator=(BookmarksToolboxWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  /**
+   * @brief BookmarksToolboxWidget
+   * @param parent
+   */
+  BookmarksToolboxWidget(QWidget* parent = nullptr);
+  ~BookmarksToolboxWidget() override;
+
+  /**
+   * @brief setupGui
+   */
+  virtual void setupGui();
+
+  /**
+   * @brief connectFilterList
+   * @param filterListWidget
+   */
+  void connectFilterList(FilterListToolboxWidget* filterListWidget);
+
+  /**
+     @brief Delete a directory along with all of its contents.
+     @param dirName Path of directory to remove.
+     @return true on success; false on error.
+  */
+  static bool removeDir(const QString& dirName);
+
+  /**
+   * @brief getBookmarksTreeView
+   * @return
+   */
+  BookmarksTreeView* getBookmarksTreeView();
+
+  /**
+   * @brief Reads the preferences from the users pref file
+   */
+  void readSettings(QtSSettings* prefs);
+
+  /**
+   * @brief Writes the preferences to the users pref file
+   */
+  void writeSettings(QtSSettings* prefs);
+
+  /**
+   * @brief writeSettings
+   */
+  void writeSettings();
+
+  virtual QDir findV4FavoritesDirectory();
+
+protected:
+  QStringList generateFilterListFromPipelineFile(QString path);
+  QString generateHtmlFilterListFromPipelineFile(QString path);
+
+  void populateFilterList(QStringList filterNames);
+  QString writeNewFavoriteFilePath(QString newFavoriteTitle, QString favoritePath, QTreeWidgetItem* item);
+
+protected slots:
+
+  //// Slots to catch signals from the QTreeWidget
+  void on_bookmarksTreeView_clicked(const QModelIndex& index);
+  void on_bookmarksTreeView_doubleClicked(const QModelIndex& index);
+
+  void listenLocateBookmarkTriggered();
+
+signals:
+
+  void fireWriteSettings();
+
+  /**
+   * @brief pipelineNeedsToBeSaved
+   * @param path The absolute path to the pipeline file
+   * @param name The name that the favorite will show up as in the GUI
+   */
+  void pipelineNeedsToBeSaved(const QString& path, const QString& name);
+
+  /**
+   * @brief filterListGenerated
+   * @param filterList
+   */
+  void filterListGenerated(const QStringList& filterList, bool sort);
+
+  /**
+   * @brief This signal is emitted when a new SIMPLView instance is needed.  A filePath is used to populate the new
+   * SIMPLView instance with a pipeline, if necessary.
+   * @param filePath The absolute path to the pipeline file.  If empty, the instance will not have a pipeline in it.
+   * @param execute A boolean that decides whether to execute the pipeline or not
+   */
+  void bookmarkActivated(const QString& filePath, bool execute = false);
+
+  void raiseBookmarksDockWidget();
+
+  void updateStatusBar(const QString& msg);
+
+private:
+  QString m_OpenDialogLastFilePath;
+
+  /**
+   * @brief serializeTreePath
+   * @param treePath
+   */
+  QList<QString> deserializeTreePath(QString treePath);
+
+  /**
+   * @brief locateBookmark
+   * @return
+   */
+  bool locateBookmark();
+
+public:
+  BookmarksToolboxWidget(const BookmarksToolboxWidget&) = delete;            // Copy Constructor Not Implemented
+  BookmarksToolboxWidget(BookmarksToolboxWidget&&) = delete;                 // Move Constructor Not Implemented
+  BookmarksToolboxWidget& operator=(const BookmarksToolboxWidget&) = delete; // Copy Assignment Not Implemented
+  BookmarksToolboxWidget& operator=(BookmarksToolboxWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index 1cf863a95a..325f24be83 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "BookmarksTreeView.h"
 
@@ -72,9 +72,9 @@ BookmarksTreeView::BookmarksTreeView(QWidget* parent)
 
   BookmarksItemDelegate* dlg = new BookmarksItemDelegate(this);
   setItemDelegate(dlg);
-  
+
   setAttribute(Qt::WA_MacShowFocusRect, false);
-  
+
 #if defined(Q_OS_WIN)
   m_ActionShowBookmarkInFileSystem->setText("Show in Windows Explorer");
 #elif defined(Q_OS_MAC)
@@ -82,7 +82,7 @@ BookmarksTreeView::BookmarksTreeView(QWidget* parent)
 #else
   m_ActionShowBookmarkInFileSystem->setText("Show in File System");
 #endif
-  
+
   m_ActionAddBookmark->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B));
   m_ActionAddBookmarkFolder->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_F));
 
@@ -300,14 +300,14 @@ void BookmarksTreeView::listenOpenBookmarkTriggered()
     return; // The user double clicked a folder, so don't do anything
   }
 
-    QFileInfo fi(pipelinePath);
-    if(fi.exists())
-    {
-      emit newSIMPLViewInstanceTriggered(pipelinePath);
+  QFileInfo fi(pipelinePath);
+  if(fi.exists())
+  {
+    emit newSIMPLViewInstanceTriggered(pipelinePath);
 
-      // Cache the last directory on old instance
-      m_OpenDialogLastFilePath = pipelinePath;
-    }
+    // Cache the last directory on old instance
+    m_OpenDialogLastFilePath = pipelinePath;
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -328,14 +328,14 @@ void BookmarksTreeView::listenExecuteBookmarkTriggered()
     return; // The user double clicked a folder, so don't do anything
   }
 
-    QFileInfo fi(pipelinePath);
-    if(fi.exists())
-    {
-      emit newSIMPLViewInstanceTriggered(pipelinePath, true);
+  QFileInfo fi(pipelinePath);
+  if(fi.exists())
+  {
+    emit newSIMPLViewInstanceTriggered(pipelinePath, true);
 
-      // Cache the last directory on old instance
-      m_OpenDialogLastFilePath = pipelinePath;
-    }
+    // Cache the last directory on old instance
+    m_OpenDialogLastFilePath = pipelinePath;
+  }
 }
 
 // -----------------------------------------------------------------------------
@@ -598,10 +598,10 @@ void BookmarksTreeView::performDrag()
   mimeData->setData(SIMPLView::DragAndDrop::BookmarkItem, jsonArray);
 
   QString dragText = "";
-  if (m_IndexesBeingDragged.size() == 1)
+  if(m_IndexesBeingDragged.size() == 1)
   {
     BookmarksItem::ItemType type = static_cast<BookmarksItem::ItemType>(model->data(m_IndexesBeingDragged[0], static_cast<int>(BookmarksModel::Roles::ItemTypeRole)).toInt());
-    if (type == BookmarksItem::ItemType::Bookmark)
+    if(type == BookmarksItem::ItemType::Bookmark)
     {
       dragText = model->data(m_IndexesBeingDragged[0], Qt::DisplayRole).toString();
     }
@@ -763,9 +763,9 @@ void BookmarksTreeView::dropEvent(QDropEvent* event)
             {
               QString newParentName = model->data(newParent, Qt::DisplayRole).toString();
               QString draggedIndexName = model->data(m_IndexesBeingDragged[i], Qt::DisplayRole).toString();
-              QMessageBox::critical(this, "Bookmarks Error", "Cannot move bookmarks.\nThe destination folder \"" + newParentName +
-                                                                 "\" is a subfolder of the source folder \"" + draggedIndexName + "\".",
-                                    QMessageBox::Ok, QMessageBox::Ok);
+              QMessageBox::critical(this, "Bookmarks Error",
+                                    "Cannot move bookmarks.\nThe destination folder \"" + newParentName + "\" is a subfolder of the source folder \"" + draggedIndexName + "\".", QMessageBox::Ok,
+                                    QMessageBox::Ok);
               return;
             }
           }
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
old mode 100755
new mode 100644
index 91684cb0f8..12d0457d5d
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -1,43 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
-
 #include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QTreeWidget>
@@ -47,180 +44,178 @@
 
 #include "SVWidgetsLib/Widgets/BookmarksModel.h"
 
-
 class PipelineBuilderWidget;
 class QAction;
 class QTreeWidgetItem;
 
 class SVWidgetsLib_EXPORT BookmarksTreeView : public QTreeView
 {
-    Q_OBJECT
-
-  public:
-    enum ItemType
-    {
-      Node_Item_Type = 1,
-      Leaf_Item_Type = 2,
-      Unknown_Item_Type = 3
-    };
-
-    /**
-     * @brief Getter property for ActionRenameBookmark
-     * @return Value of ActionRenameBookmark
-     */
-    QAction* getActionRenameBookmark() const;
-
-    /**
-     * @brief Getter property for ActionRemoveBookmark
-     * @return Value of ActionRemoveBookmark
-     */
-    QAction* getActionRemoveBookmark() const;
-
-    /**
-     * @brief Getter property for ActionShowBookmarkInFileSystem
-     * @return Value of ActionShowBookmarkInFileSystem
-     */
-    QAction* getActionShowBookmarkInFileSystem() const;
-
-    /**
-     * @brief Getter property for ActionClearBookmarks
-     * @return Value of ActionClearBookmarks
-     */
-    QAction* getActionClearBookmarks() const;
-
-    /**
-     * @brief Getter property for ActionAddBookmark
-     * @return Value of ActionAddBookmark
-     */
-    QAction* getActionAddBookmark() const;
-
-    /**
-     * @brief Getter property for ActionAddBookmarkFolder
-     * @return Value of ActionAddBookmarkFolder
-     */
-    QAction* getActionAddBookmarkFolder() const;
-
-    /**
-     * @brief Getter property for ActionLocateFile
-     * @return Value of ActionLocateFile
-     */
-    QAction* getActionLocateFile() const;
-
-    /**
-     * @brief Getter property for ActionOpenBookmark
-     * @return Value of ActionOpenBookmark
-     */
-    QAction* getActionOpenBookmark() const;
-
-    /**
-     * @brief Getter property for ActionExecuteBookmark
-     * @return Value of ActionExecuteBookmark
-     */
-    QAction* getActionExecuteBookmark() const;
-
-    /**
-    * @brief BookmarksTreeView
-    * @param parent
-    */
-    BookmarksTreeView(QWidget* parent = nullptr);
-
-    /**
-    * @brief ~BookmarksTreeView()
-    */
-    ~BookmarksTreeView() override;
-
-    /**
-    * @brief setModel
-    * @param model
-    */
-    void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
-
-    /**
-    * @brief BookmarksToolboxWidget::addBookmark
-    * @param filePath
-    * @param parent
-    */
-    void addBookmark(const QString& filePath, const QModelIndex& parent);
-
-    /**
-    * @brief filterOutDescendants
-    * @param indexLis
-    */
-    QModelIndexList filterOutDescendants(QModelIndexList indexList);
-
-  public slots:
-    void collapseIndex(const QModelIndex& index);
-    void expandIndex(const QModelIndex& index);
-
-  protected:
-    void mouseMoveEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
-    void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
-    void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
-    void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
-    void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
-
-    void currentChanged(const QModelIndex& current, const QModelIndex& previous) Q_DECL_OVERRIDE;
-
-    /**
-    * @brief Adds the actions in the actionList parameter to the right-click menu
-    */
-    void addActionList(QList<QAction*> actionList);
-
-  protected slots:
-    void listenAddBookmarkTriggered();
-    void listenAddBookmarkFolderTriggered();
-    void listenRenameBookmarkTriggered();
-    void listenRemoveBookmarkTriggered();
-    void listenShowBookmarkInFileSystemTriggered();
-    void listenExecuteBookmarkTriggered();
-    void listenClearBookmarksTriggered();
-    void listenOpenBookmarkTriggered();
-
-  signals:
-    void currentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
-    void folderChangedState(const QModelIndex& index, bool expand);
-
-    void raiseBookmarksWidget();
-    void locateBookmarkTriggered();
-
-    void newSIMPLViewInstanceTriggered(const QString &filePath = "", bool execute = false);
-
-    void fireWriteSettings();
-    void updateStatusBar(const QString& msg);
-
-  private slots:
-
-    /**
-    * @brief mousePressEvent
-    * @param event
-    */
-    void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
-
-    void requestContextMenu(const QPoint &pos);
-
-  private:
-    QPoint                                        m_StartPos;
-    QString                                       m_OpenDialogLastFilePath;
-    QMenu                                         m_Menu;
-    QList<QAction*>                               m_NodeActions;
-    QList<QAction*>                               m_LeafActions;
-    QList<QAction*>                               m_LeafErrorActions;
-    QList<QAction*>                               m_DefaultActions;
-    QList<QPersistentModelIndex>                  m_IndexesBeingDragged;
-    QPersistentModelIndex                         m_ActiveIndexBeingDragged;
-    QModelIndex                                   m_TopLevelItemPlaceholder;
-
-    QAction* m_ActionRenameBookmark = new QAction("Rename Pipeline", this);
-    QAction* m_ActionRemoveBookmark = new QAction("Remove Bookmark", this);
-    QAction* m_ActionShowBookmarkInFileSystem = new QAction(this);
-    QAction* m_ActionClearBookmarks = new QAction("Clear Bookmarks", this);
-    QAction* m_ActionAddBookmark = new QAction("Add Bookmark", this);
-    QAction* m_ActionAddBookmarkFolder = new QAction("Add Bookmark Folder", this);
-    QAction* m_ActionLocateFile = new QAction("Locate File", this);
-    QAction* m_ActionOpenBookmark = new QAction("Open Bookmark", this);
-    QAction* m_ActionExecuteBookmark = new QAction("Execute Bookmark", this);
-
-    void performDrag();
-    void expandChildren(const QModelIndex& parent, BookmarksModel* model);
+  Q_OBJECT
+
+public:
+  enum ItemType
+  {
+    Node_Item_Type = 1,
+    Leaf_Item_Type = 2,
+    Unknown_Item_Type = 3
+  };
+
+  /**
+   * @brief Getter property for ActionRenameBookmark
+   * @return Value of ActionRenameBookmark
+   */
+  QAction* getActionRenameBookmark() const;
+
+  /**
+   * @brief Getter property for ActionRemoveBookmark
+   * @return Value of ActionRemoveBookmark
+   */
+  QAction* getActionRemoveBookmark() const;
+
+  /**
+   * @brief Getter property for ActionShowBookmarkInFileSystem
+   * @return Value of ActionShowBookmarkInFileSystem
+   */
+  QAction* getActionShowBookmarkInFileSystem() const;
+
+  /**
+   * @brief Getter property for ActionClearBookmarks
+   * @return Value of ActionClearBookmarks
+   */
+  QAction* getActionClearBookmarks() const;
+
+  /**
+   * @brief Getter property for ActionAddBookmark
+   * @return Value of ActionAddBookmark
+   */
+  QAction* getActionAddBookmark() const;
+
+  /**
+   * @brief Getter property for ActionAddBookmarkFolder
+   * @return Value of ActionAddBookmarkFolder
+   */
+  QAction* getActionAddBookmarkFolder() const;
+
+  /**
+   * @brief Getter property for ActionLocateFile
+   * @return Value of ActionLocateFile
+   */
+  QAction* getActionLocateFile() const;
+
+  /**
+   * @brief Getter property for ActionOpenBookmark
+   * @return Value of ActionOpenBookmark
+   */
+  QAction* getActionOpenBookmark() const;
+
+  /**
+   * @brief Getter property for ActionExecuteBookmark
+   * @return Value of ActionExecuteBookmark
+   */
+  QAction* getActionExecuteBookmark() const;
+
+  /**
+   * @brief BookmarksTreeView
+   * @param parent
+   */
+  BookmarksTreeView(QWidget* parent = nullptr);
+
+  /**
+   * @brief ~BookmarksTreeView()
+   */
+  ~BookmarksTreeView() override;
+
+  /**
+   * @brief setModel
+   * @param model
+   */
+  void setModel(QAbstractItemModel* model) Q_DECL_OVERRIDE;
+
+  /**
+   * @brief BookmarksToolboxWidget::addBookmark
+   * @param filePath
+   * @param parent
+   */
+  void addBookmark(const QString& filePath, const QModelIndex& parent);
+
+  /**
+   * @brief filterOutDescendants
+   * @param indexLis
+   */
+  QModelIndexList filterOutDescendants(QModelIndexList indexList);
+
+public slots:
+  void collapseIndex(const QModelIndex& index);
+  void expandIndex(const QModelIndex& index);
+
+protected:
+  void mouseMoveEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+  void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE;
+  void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE;
+  void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE;
+  void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE;
+
+  void currentChanged(const QModelIndex& current, const QModelIndex& previous) Q_DECL_OVERRIDE;
+
+  /**
+   * @brief Adds the actions in the actionList parameter to the right-click menu
+   */
+  void addActionList(QList<QAction*> actionList);
+
+protected slots:
+  void listenAddBookmarkTriggered();
+  void listenAddBookmarkFolderTriggered();
+  void listenRenameBookmarkTriggered();
+  void listenRemoveBookmarkTriggered();
+  void listenShowBookmarkInFileSystemTriggered();
+  void listenExecuteBookmarkTriggered();
+  void listenClearBookmarksTriggered();
+  void listenOpenBookmarkTriggered();
+
+signals:
+  void currentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
+  void folderChangedState(const QModelIndex& index, bool expand);
+
+  void raiseBookmarksWidget();
+  void locateBookmarkTriggered();
+
+  void newSIMPLViewInstanceTriggered(const QString& filePath = "", bool execute = false);
+
+  void fireWriteSettings();
+  void updateStatusBar(const QString& msg);
+
+private slots:
+
+  /**
+   * @brief mousePressEvent
+   * @param event
+   */
+  void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
+
+  void requestContextMenu(const QPoint& pos);
+
+private:
+  QPoint m_StartPos;
+  QString m_OpenDialogLastFilePath;
+  QMenu m_Menu;
+  QList<QAction*> m_NodeActions;
+  QList<QAction*> m_LeafActions;
+  QList<QAction*> m_LeafErrorActions;
+  QList<QAction*> m_DefaultActions;
+  QList<QPersistentModelIndex> m_IndexesBeingDragged;
+  QPersistentModelIndex m_ActiveIndexBeingDragged;
+  QModelIndex m_TopLevelItemPlaceholder;
+
+  QAction* m_ActionRenameBookmark = new QAction("Rename Pipeline", this);
+  QAction* m_ActionRemoveBookmark = new QAction("Remove Bookmark", this);
+  QAction* m_ActionShowBookmarkInFileSystem = new QAction(this);
+  QAction* m_ActionClearBookmarks = new QAction("Clear Bookmarks", this);
+  QAction* m_ActionAddBookmark = new QAction("Add Bookmark", this);
+  QAction* m_ActionAddBookmarkFolder = new QAction("Add Bookmark Folder", this);
+  QAction* m_ActionLocateFile = new QAction("Locate File", this);
+  QAction* m_ActionOpenBookmark = new QAction("Open Bookmark", this);
+  QAction* m_ActionExecuteBookmark = new QAction("Execute Bookmark", this);
+
+  void performDrag();
+  void expandChildren(const QModelIndex& parent, BookmarksModel* model);
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
index a719361f83..6724240689 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DREAM3DListWidget.h"
 
@@ -43,8 +43,6 @@
 #include <QtGui/QDrag>
 #include <QtGui/QDropEvent>
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
index fe61b523ca..d4d359d365 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2015 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2015 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,27 +42,25 @@
 /*
  *
  */
-class SVWidgetsLib_EXPORT DREAM3DListWidget: public QListWidget
+class SVWidgetsLib_EXPORT DREAM3DListWidget : public QListWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    DREAM3DListWidget(QWidget* parent = nullptr);
-    ~DREAM3DListWidget() override;
+public:
+  DREAM3DListWidget(QWidget* parent = nullptr);
+  ~DREAM3DListWidget() override;
 
-  protected:
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
+protected:
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void mousePressEvent(QMouseEvent* event) override;
+  void mouseMoveEvent(QMouseEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
 
-  signals:
-    void dropOccurred();
+signals:
+  void dropOccurred();
 
-  private:
-    void performDrag();
+private:
+  void performDrag();
 
-    QPoint startPos;
+  QPoint startPos;
 };
-
-
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
index cedb81a645..85045bbd48 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
@@ -200,7 +200,7 @@ DataArrayPath DataArrayPathDisplay::getDataArrayPath() const
   case DataArrayPathHelper::DataType::None:
     break;
   }
-  
+
   return DataArrayPath(dcName, amName, daName);
 }
 
@@ -250,8 +250,7 @@ void DataArrayPathDisplay::afterPreflight()
       found = true;
     }
     break;
-  case DataArrayPathHelper::DataType::DataArray:
-  {
+  case DataArrayPathHelper::DataType::DataArray: {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(getDataArrayPath());
     if(am && am->getAttributeArray(getDataArrayPath().getDataArrayName()))
     {
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
index 2bee3ce764..9c07ede6db 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
@@ -43,20 +43,19 @@
 
 namespace Ui
 {
-  class DataArrayPathDisplay;
+class DataArrayPathDisplay;
 }
 
 /**
-* @class DataArrayPathDisplay DataArrayPathDisplay.h
-* SVWidgetsLib/Widgets/DataArrayPathDisplay.h
-* @brief This class handles DataArrayPath selection and mouse over signals for filter parameter widgets.
-*/
+ * @class DataArrayPathDisplay DataArrayPathDisplay.h
+ * SVWidgetsLib/Widgets/DataArrayPathDisplay.h
+ * @brief This class handles DataArrayPath selection and mouse over signals for filter parameter widgets.
+ */
 class DataArrayPathDisplay : public QWidget
 {
   Q_OBJECT
 
 public:
-
   static const QColor GetActiveColor(DataArrayPathHelper::DataType type);
   static const QColor GetCheckedColor(DataArrayPathHelper::DataType type);
 
@@ -90,9 +89,9 @@ class DataArrayPathDisplay : public QWidget
   DataArrayPathHelper::DataType getDataType() const;
 
   /**
-  * @brief Sets the filter the selection widget operates on
-  * @param filter
-  */
+   * @brief Sets the filter the selection widget operates on
+   * @param filter
+   */
   void setFilter(AbstractFilter* filter);
 
   /**
@@ -101,13 +100,13 @@ class DataArrayPathDisplay : public QWidget
   void beforePreflight();
 
   /**
-  * @brief Checks path validity
-  */
+   * @brief Checks path validity
+   */
   void afterPreflight();
 
   /**
-  * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
-  */
+   * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
+   */
   QSize minimumSizeHint() const override;
 
   /**
@@ -116,15 +115,15 @@ class DataArrayPathDisplay : public QWidget
   QSize sizeHint() const override;
 
   /**
-  * @brief Returns the property name set for this widget
-  * @return
-  */
+   * @brief Returns the property name set for this widget
+   * @return
+   */
   QString getPropertyName();
 
   /**
-  * @brief Sets the property name
-  * @param propName
-  */
+   * @brief Sets the property name
+   * @param propName
+   */
   void setPropertyName(QString propName);
 
 protected:
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index da26b682b2..da90ba3535 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -1120,8 +1120,7 @@ void DataArrayPathSelectionWidget::afterPreflight()
       found = true;
     }
     break;
-  case DataArrayPathHelper::DataType::DataArray:
-  {
+  case DataArrayPathHelper::DataType::DataArray: {
     AttributeMatrix::Pointer am = dca->getAttributeMatrix(getDataArrayPath());
     if(am && am->getAttributeArray(getDataArrayPath().getDataArrayName()))
     {
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index c1a30d4765..ff80a3449c 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,10 +51,10 @@
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 /**
-* @class DataArrayPathSelectionWidget DataArrayPathSelectionWidget.h 
-* SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
-* @brief This class handles DataArrayPath selection and mouse over signals for filter parameter widgets.
-*/
+ * @class DataArrayPathSelectionWidget DataArrayPathSelectionWidget.h
+ * SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+ * @brief This class handles DataArrayPath selection and mouse over signals for filter parameter widgets.
+ */
 class DataArrayPathSelectionWidget : public QToolButton
 {
   Q_OBJECT
@@ -86,72 +86,72 @@ class DataArrayPathSelectionWidget : public QToolButton
   Q_PROPERTY(State State READ getState)
 
   /**
-  * @brief Returns the type of DataArrayPath this widget can handle
-  * @return
-  */
+   * @brief Returns the type of DataArrayPath this widget can handle
+   * @return
+   */
   DataArrayPathHelper::DataType getDataType() const;
 
   /**
-  * @brief Sets the DataContainer requirements and sets the DataType to DataContainer
-  * @param dcReqs
-  */
+   * @brief Sets the DataContainer requirements and sets the DataType to DataContainer
+   * @param dcReqs
+   */
   void setDataContainerRequirements(const DataContainerSelectionFilterParameter::RequirementType& dcReqs);
 
   /**
-  * @brief Sets the AttributeMatrix requirements and sets the DataType to AttributeMatrix
-  * @param amReqs
-  */
+   * @brief Sets the AttributeMatrix requirements and sets the DataType to AttributeMatrix
+   * @param amReqs
+   */
   void setAttrMatrixRequirements(const AttributeMatrixSelectionFilterParameter::RequirementType& amReqs);
 
   /**
-  * @brief Sets the DataArray requirements and sets the DataType to DataArray
-  * @param daReqs
-  */
+   * @brief Sets the DataArray requirements and sets the DataType to DataArray
+   * @param daReqs
+   */
   void setDataArrayRequirements(const DataArraySelectionFilterParameter::RequirementType& daReqs);
 
   /**
-  * @brief Returns the DataContainer requirements
-  * @return
-  */
+   * @brief Returns the DataContainer requirements
+   * @return
+   */
   DataContainerSelectionFilterParameter::RequirementType getDataContainerRequirements() const;
 
   /**
-  * @brief Returns the AttributeMatrix requirements
-  * @return
-  */
+   * @brief Returns the AttributeMatrix requirements
+   * @return
+   */
   AttributeMatrixSelectionFilterParameter::RequirementType getAttrMatrixRequirements() const;
 
   /**
-  * @brief Returns the DataArray requirements
-  * @return
-  */
+   * @brief Returns the DataArray requirements
+   * @return
+   */
   DataArraySelectionFilterParameter::RequirementType getDataArrayRequirements() const;
 
   /**
-  * @brief Checks the requirements for the current path
-  * @return
-  */
+   * @brief Checks the requirements for the current path
+   * @return
+   */
   bool checkCurrentPath() const;
 
   /**
-  * @brief Checks requirements against the given DataArrayPath
-  * @param path
-  * @return
-  */
+   * @brief Checks requirements against the given DataArrayPath
+   * @param path
+   * @return
+   */
   bool checkPathReqs(const DataArrayPath& path) const;
 
   /**
-  * @brief Checks DataContainer requirements against the given DataArrayPath
-  * @param path
-  * @return
-  */
+   * @brief Checks DataContainer requirements against the given DataArrayPath
+   * @param path
+   * @return
+   */
   bool checkDataContainerReqs(const DataArrayPath& path) const;
 
   /**
-  * @brief Checks AttributeMatrix requirements against the given DataArrayPath
-  * @param path
-  * @return
-  */
+   * @brief Checks AttributeMatrix requirements against the given DataArrayPath
+   * @param path
+   * @return
+   */
   bool checkAttributeMatrixReqs(const DataArrayPath& path) const;
 
   /**
@@ -161,15 +161,15 @@ class DataArrayPathSelectionWidget : public QToolButton
   void setDataArrayPath(const DataArrayPath& dap);
 
   /**
-  * @brief Returns the DataArrayPath
-  * @return
-  */
+   * @brief Returns the DataArrayPath
+   * @return
+   */
   DataArrayPath getDataArrayPath() const;
 
   /**
-  * @brief Sets the filter the selection widget operates on
-  * @param filter
-  */
+   * @brief Sets the filter the selection widget operates on
+   * @param filter
+   */
   void setFilter(AbstractFilter* filter);
 
   /**
@@ -178,13 +178,13 @@ class DataArrayPathSelectionWidget : public QToolButton
   void beforePreflight();
 
   /**
-  * @brief Checks path validity
-  */
+   * @brief Checks path validity
+   */
   void afterPreflight();
 
   /**
-  * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
-  */
+   * @brief Override the minimumSizeHint for extending the widget enough to paint the active color
+   */
   QSize minimumSizeHint() const override;
 
   /**
@@ -193,27 +193,27 @@ class DataArrayPathSelectionWidget : public QToolButton
   QSize sizeHint() const override;
 
   /**
-  * @brief Returns the property name set for this widget
-  * @return
-  */
+   * @brief Returns the property name set for this widget
+   * @return
+   */
   QString getPropertyName() const;
 
   /**
-  * @brief Sets the property name
-  * @param propName
-  */
+   * @brief Sets the property name
+   * @param propName
+   */
   void setPropertyName(QString propName);
 
 public slots:
   /**
-  * @brief Sets whether or not filtering is forced active or not
-  * @param active
-  */
+   * @brief Sets whether or not filtering is forced active or not
+   * @param active
+   */
   void setPathFiltering(bool active);
 
   /**
-  * @brief Resets the styling and clears the check state
-  */
+   * @brief Resets the styling and clears the check state
+   */
   void resetStyle();
 
   /**
@@ -228,8 +228,8 @@ public slots:
   void clearPathFiltering();
 
   /**
-  * @brief Clears the enable / disable state but leaves the checked state.  This is used for filtering from the DataStructure.
-  */
+   * @brief Clears the enable / disable state but leaves the checked state.  This is used for filtering from the DataStructure.
+   */
   void endExternalFiltering();
 
   /**
@@ -245,9 +245,9 @@ public slots:
   void selectionWidgetLocked(QToolButton* selection);
 
   /**
-    * @brief Enables filtering the DataStructure due to the current locking DataArrayPathSelectionWidget is unchecked
-    * @param selection
-    */
+   * @brief Enables filtering the DataStructure due to the current locking DataArrayPathSelectionWidget is unchecked
+   * @param selection
+   */
   void selectionWidgetUnlocked(QToolButton* selection);
 
 signals:
@@ -273,9 +273,9 @@ public slots:
   State getState() const;
 
   /**
-  * @brief Change the stylesheet based on the widget state
-  * @param styleType
-  */
+   * @brief Change the stylesheet based on the widget state
+   * @param styleType
+   */
   void setState(State styleType);
 
   /**
@@ -313,40 +313,40 @@ public slots:
   QSize updatedSizeHint(QSize sizeHint) const;
 
   /**
-  * @brief Handles the mouse-enter event and emits the appropriate viewPaths signal
-  * @param event
-  */
+   * @brief Handles the mouse-enter event and emits the appropriate viewPaths signal
+   * @param event
+   */
   void enterEvent(QEvent* event) override;
 
   /**
-  * @brief Handles the mouse-leave event and emits the endViewPaths signal
-  * @param event
-  */
+   * @brief Handles the mouse-leave event and emits the endViewPaths signal
+   * @param event
+   */
   void leaveEvent(QEvent* event) override;
 
   /**
-  * @brief Checks DataArray requirements against the given DataArrayPath
-  * @param path
-  * @return
-  */
+   * @brief Checks DataArray requirements against the given DataArrayPath
+   * @param path
+   * @return
+   */
   bool checkDataArrayReqs(const DataArrayPath& path) const;
 
   /**
-  * @brief dragEnterEvent
-  * @param event
-  */
+   * @brief dragEnterEvent
+   * @param event
+   */
   void dragEnterEvent(QDragEnterEvent* event) override;
 
   /**
-  * @brief dragLeaveEvent
-  * @param event
-  */
+   * @brief dragLeaveEvent
+   * @param event
+   */
   void dragLeaveEvent(QDragLeaveEvent* event) override;
 
   /**
-  * @brief dropEvent
-  * @param event
-  */
+   * @brief dropEvent
+   * @param event
+   */
   void dropEvent(QDropEvent* event) override;
 
   /**
@@ -362,82 +362,82 @@ public slots:
   QString createTooltipFooter() const;
 
   /**
-  * @brief Create the IGeometry::Type requirements part of the tooltip
-  * @param geomTypes
-  * @return
-  */
+   * @brief Create the IGeometry::Type requirements part of the tooltip
+   * @param geomTypes
+   * @return
+   */
   QString createGeomReqString(QVector<IGeometry::Type> geomTypes) const;
 
   /**
-  * @brief Create the AttributeMatrix::Type requirements part of the tooltip
-  * @param amTypes
-  * @return
-  */
+   * @brief Create the AttributeMatrix::Type requirements part of the tooltip
+   * @param amTypes
+   * @return
+   */
   QString createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes) const;
 
   /**
-  * @brief Create the DataArray type requirements part of the tooltip
-  * @param daTypes
-  * @return
-  */
+   * @brief Create the DataArray type requirements part of the tooltip
+   * @param daTypes
+   * @return
+   */
   QString createDataArrayTypeString(QVector<QString> daTypes) const;
 
   /**
-  * @brief Create the component requirements part of the tooltip
-  * @param compDims
-  * @return
-  */
+   * @brief Create the component requirements part of the tooltip
+   * @param compDims
+   * @return
+   */
   QString createComponentReqString(std::vector<std::vector<size_t>> compDims) const;
 
   /**
-  * @brief mouseMoveEvent
-  * @param event
-  */
+   * @brief mouseMoveEvent
+   * @param event
+   */
   void mouseMoveEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
 
   /**
-  * @brief Returns the color code for the given State
-  * @param state
-  */
+   * @brief Returns the color code for the given State
+   * @param state
+   */
   const QColor getBorderColor(State state) const;
 
   /**
-  * @brief Override the paint event to mark the DataType required
-  * @param event
-  */
+   * @brief Override the paint event to mark the DataType required
+   * @param event
+   */
   void paintEvent(QPaintEvent* event) override;
 
   /**
-  * @brief Creates the legacy selection menu
-  * @return
-  */
+   * @brief Creates the legacy selection menu
+   * @return
+   */
   QMenu* createSelectionMenu();
 
   /**
-  * @brief Returns true if the given path is created by this filter. Returns false otherwise.
-  * @param path
-  * @return
-  */
+   * @brief Returns true if the given path is created by this filter. Returns false otherwise.
+   * @param path
+   * @return
+   */
   bool isCreatedPath(const DataArrayPath& path) const;
 
 protected slots:
   /**
-  * @brief Show the legacy menu when right-clicking
-  * @param pos
-  */
+   * @brief Show the legacy menu when right-clicking
+   * @param pos
+   */
   void showContextMenu(const QPoint& pos);
 
   /**
-  * @brief Emits the appropriate signal when the check state is changed
-  * @param checked
-  */
+   * @brief Emits the appropriate signal when the check state is changed
+   * @param checked
+   */
   void updateCheckState(bool checked);
 
 private slots:
   /**
-  * @brief mousePressEvent
-  * @param event
-  */
+   * @brief mousePressEvent
+   * @param event
+   */
   void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE;
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index f36038048e..59c99997e5 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerArrayWidget.h"
 
 #include <QtCore/QTextStream>
@@ -45,8 +45,6 @@
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
old mode 100755
new mode 100644
index 95d7bfa51d..b2c953104a
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
@@ -1,6 +1,5 @@
 #pragma once
 
-
 #include <QtWidgets/QWidget>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -11,54 +10,46 @@
 
 #include "ui_DataContainerArrayWidget.h"
 
-
 class QStandardItem;
 class AbstractFilter;
 class DataContainerArray;
 
 class SVWidgetsLib_EXPORT DataContainerArrayWidget : public QWidget, private Ui::DataContainerArrayWidget
 {
-    Q_OBJECT
-
-  public:
-    DataContainerArrayWidget(QWidget* parent = nullptr);
-    DataContainerArrayWidget(AbstractFilter* filter, QWidget* parent = nullptr);
-
-    ~DataContainerArrayWidget() override;
-
+  Q_OBJECT
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui();
+public:
+  DataContainerArrayWidget(QWidget* parent = nullptr);
+  DataContainerArrayWidget(AbstractFilter* filter, QWidget* parent = nullptr);
 
-    void initializeWithFilter(AbstractFilter* filter);
+  ~DataContainerArrayWidget() override;
 
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui();
 
+  void initializeWithFilter(AbstractFilter* filter);
 
-  protected slots:
+protected slots:
 
-    void updateView();
+  void updateView();
 
-    void preflightCompleted();
+  void preflightCompleted();
 
-    void dcaProxyView_indexChanged(const QModelIndex& current, const QModelIndex& previous);
+  void dcaProxyView_indexChanged(const QModelIndex& current, const QModelIndex& previous);
 
-    void on_dcaProxyView_updatePreviewWidget(const QModelIndex& index);
+  void on_dcaProxyView_updatePreviewWidget(const QModelIndex& index);
 
+protected:
+  void clearStandardItemModel();
 
+private:
+  AbstractFilter* m_Filter;
 
-  protected:
-
-    void clearStandardItemModel();
-
-  private:
-    AbstractFilter*     m_Filter;
-
-  public:
-    DataContainerArrayWidget(const DataContainerArrayWidget&) = delete; // Copy Constructor Not Implemented
-    DataContainerArrayWidget(DataContainerArrayWidget&&) = delete;      // Move Constructor Not Implemented
-    DataContainerArrayWidget& operator=(const DataContainerArrayWidget&) = delete; // Copy Assignment Not Implemented
-    DataContainerArrayWidget& operator=(DataContainerArrayWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  DataContainerArrayWidget(const DataContainerArrayWidget&) = delete;            // Copy Constructor Not Implemented
+  DataContainerArrayWidget(DataContainerArrayWidget&&) = delete;                 // Move Constructor Not Implemented
+  DataContainerArrayWidget& operator=(const DataContainerArrayWidget&) = delete; // Copy Assignment Not Implemented
+  DataContainerArrayWidget& operator=(DataContainerArrayWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
index 174e9cf2f9..37d89f9c83 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
@@ -65,8 +65,8 @@ DataPathLabel::DataPathLabel(QWidget* parent)
 : QLabel(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
-  //setAutoFillBackground(true);
-  //setFrameShape(QFrame::StyledPanel);
+  // setAutoFillBackground(true);
+  // setFrameShape(QFrame::StyledPanel);
 }
 
 // -----------------------------------------------------------------------------
@@ -160,7 +160,7 @@ QRect DataPathLabel::getStyledBorderRect() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-//void DataPathLabel::paintEvent(QPaintEvent* event)
+// void DataPathLabel::paintEvent(QPaintEvent* event)
 //{
 //  const int radius = 4;
 //  const int rectWidth = getStyledBorderRect().width() - margin() * 2;
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.h b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
index 2dec40bbc1..40ba6fc74b 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.h
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
@@ -65,7 +65,7 @@ class SVWidgetsLib_EXPORT DataPathLabel : public QLabel
   int getYMargin() const;
   QRect getStyledContentsRect() const;
   QRect getStyledBorderRect() const;
-  //void paintEvent(QPaintEvent* event) override;
+  // void paintEvent(QPaintEvent* event) override;
 
 private:
   DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
index 4fd7ec6ad6..9df6642bcd 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataStructureItem.h"
 
 #include <QtGui/QColor>
@@ -308,7 +308,6 @@ void DataStructureItem::setItemType(DataStructureItem::ItemType itemType)
   m_ItemType = itemType;
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -316,18 +315,18 @@ QColor DataStructureItem::backgroundColor()
 {
   switch(m_ItemType)
   {
-    case ItemType::DataContainerArray:
-      return QColor(0, 77, 245);
-    case ItemType::DataContainer:
-      return QColor(153, 97, 242);
-    case ItemType::AttributeMatrix:
-      return QColor(0, 142, 30);
-    case ItemType::AttributeArray:
-      return QColor(215, 104, 0);
-    case ItemType::RootItem:
-      return QColor(100, 100, 100);
-    case ItemType::Unknown:
-      return QColor(215, 0, 0);
+  case ItemType::DataContainerArray:
+    return QColor(0, 77, 245);
+  case ItemType::DataContainer:
+    return QColor(153, 97, 242);
+  case ItemType::AttributeMatrix:
+    return QColor(0, 142, 30);
+  case ItemType::AttributeArray:
+    return QColor(215, 104, 0);
+  case ItemType::RootItem:
+    return QColor(100, 100, 100);
+  case ItemType::Unknown:
+    return QColor(215, 0, 0);
   }
 
   return QColor(255, 255, 255);
@@ -340,19 +339,19 @@ QColor DataStructureItem::foregroundColor()
 {
   switch(m_ItemType)
   {
-    case ItemType::DataContainerArray:
-      return QColor(255, 255, 255);
-    case ItemType::DataContainer:
-      return QColor(255, 255, 255);
-    case ItemType::AttributeMatrix:
-      return QColor(255, 255, 255);
-    case ItemType::AttributeArray:
-      return QColor(255, 255, 255);
-    case ItemType::RootItem:
-      return QColor(255, 255, 255);
-    case ItemType::Unknown:
-      return QColor(255, 255, 255);
+  case ItemType::DataContainerArray:
+    return QColor(255, 255, 255);
+  case ItemType::DataContainer:
+    return QColor(255, 255, 255);
+  case ItemType::AttributeMatrix:
+    return QColor(255, 255, 255);
+  case ItemType::AttributeArray:
+    return QColor(255, 255, 255);
+  case ItemType::RootItem:
+    return QColor(255, 255, 255);
+  case ItemType::Unknown:
+    return QColor(255, 255, 255);
   }
 
-  return QColor(0,0,0);
+  return QColor(0, 0, 0);
 }
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.h b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
old mode 100755
new mode 100644
index 74decf90f5..f9828da480
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,91 +43,87 @@
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
-
-
 class SVWidgetsLib_EXPORT DataStructureItem
 {
-  public:
-    enum ColumnData
-    {
-      Name,
-      Path
-    };
-
-    using EnumType = unsigned int;
-
-    enum class ItemType : EnumType
-    {
-      DataContainerArray = 0,
-      DataContainer = 1,
-      AttributeMatrix = 2,
-      AttributeArray = 3,
-      RootItem = 4,
-      Unknown = 5
-    };
-
-    /**
-     * @brief DataStructureItem
-     * @param data
-     * @param itemType
-     * @param parent
-     */
-    DataStructureItem(const QVector<QVariant>& data, ItemType itemType, DataStructureItem* parent = 0);
-
-    virtual ~DataStructureItem();
-
-    ItemType itemType();
-    void setItemType(ItemType itemType);
-
-    QColor backgroundColor();
-    QColor foregroundColor();
-
-    DataStructureItem* child(int number);
-    DataStructureItem* parent();
-
-    int childCount() const;
-    int columnCount() const;
-
-    QVariant data(int column) const;
-    bool setData(int column, const QVariant& value);
-
-    QString getItemTooltip();
-    bool setItemTooltip(const QString& value);
-
-    QIcon getIcon();
-    bool setIcon(const QIcon& icon);
-
-    bool needsToBeExpanded();
-    void setNeedsToBeExpanded(bool value);
-
-    bool insertChild(int position, DataStructureItem* child);
-    bool insertChildren(int position, int count, int columns);
-    bool insertColumns(int position, int columns);
-
-    bool removeChild(int position);
-    bool removeChildren(int position, int count);
-    bool removeColumns(int position, int columns);
-
-    int childNumber() const;
-
-    void setParent(DataStructureItem* parent);
-
-    static QString TopLevelString();
-
-  private:
-    QList<DataStructureItem*>               m_ChildItems;
-    QVector<QVariant>                   m_ItemData;
-    DataStructureItem*                      m_ParentItem;
-    QString                             m_ItemTooltip;
-    bool                                m_NeedsToBeExpanded;
-    QIcon                               m_Icon;
-    ItemType                            m_ItemType;
-
-  public:
-    DataStructureItem(const DataStructureItem&) = delete;            // Copy Constructor Not Implemented
-    DataStructureItem(DataStructureItem&&) = delete;                 // Move Constructor Not Implemented
-    DataStructureItem& operator=(const DataStructureItem&) = delete; // Copy Assignment Not Implemented
-    DataStructureItem& operator=(DataStructureItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  enum ColumnData
+  {
+    Name,
+    Path
+  };
+
+  using EnumType = unsigned int;
+
+  enum class ItemType : EnumType
+  {
+    DataContainerArray = 0,
+    DataContainer = 1,
+    AttributeMatrix = 2,
+    AttributeArray = 3,
+    RootItem = 4,
+    Unknown = 5
+  };
+
+  /**
+   * @brief DataStructureItem
+   * @param data
+   * @param itemType
+   * @param parent
+   */
+  DataStructureItem(const QVector<QVariant>& data, ItemType itemType, DataStructureItem* parent = 0);
+
+  virtual ~DataStructureItem();
+
+  ItemType itemType();
+  void setItemType(ItemType itemType);
+
+  QColor backgroundColor();
+  QColor foregroundColor();
+
+  DataStructureItem* child(int number);
+  DataStructureItem* parent();
+
+  int childCount() const;
+  int columnCount() const;
+
+  QVariant data(int column) const;
+  bool setData(int column, const QVariant& value);
+
+  QString getItemTooltip();
+  bool setItemTooltip(const QString& value);
+
+  QIcon getIcon();
+  bool setIcon(const QIcon& icon);
+
+  bool needsToBeExpanded();
+  void setNeedsToBeExpanded(bool value);
+
+  bool insertChild(int position, DataStructureItem* child);
+  bool insertChildren(int position, int count, int columns);
+  bool insertColumns(int position, int columns);
+
+  bool removeChild(int position);
+  bool removeChildren(int position, int count);
+  bool removeColumns(int position, int columns);
+
+  int childNumber() const;
+
+  void setParent(DataStructureItem* parent);
+
+  static QString TopLevelString();
+
+private:
+  QList<DataStructureItem*> m_ChildItems;
+  QVector<QVariant> m_ItemData;
+  DataStructureItem* m_ParentItem;
+  QString m_ItemTooltip;
+  bool m_NeedsToBeExpanded;
+  QIcon m_Icon;
+  ItemType m_ItemType;
+
+public:
+  DataStructureItem(const DataStructureItem&) = delete;            // Copy Constructor Not Implemented
+  DataStructureItem(DataStructureItem&&) = delete;                 // Move Constructor Not Implemented
+  DataStructureItem& operator=(const DataStructureItem&) = delete; // Copy Assignment Not Implemented
+  DataStructureItem& operator=(DataStructureItem&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index bbaa826b57..07db9c5b78 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -45,12 +45,12 @@
 
 namespace Detail
 {
-  const QString Delimiter(" / ");
+const QString Delimiter(" / ");
 }
 
 namespace
 {
-  QColor InvalidColor(100, 100, 100);
+QColor InvalidColor(100, 100, 100);
 }
 
 // -----------------------------------------------------------------------------
@@ -103,22 +103,22 @@ void DataStructureItemDelegate::createNewPathIcons()
       daPixel.setAlphaF(alpha);
       invalidPixel.setAlphaF(alpha);
 
-      if (dcPixel.isValid())
+      if(dcPixel.isValid())
       {
         dcImage.setPixelColor(x, y, dcPixel);
       }
 
-      if (amPixel.isValid())
+      if(amPixel.isValid())
       {
         amImage.setPixelColor(x, y, amPixel);
       }
 
-      if (daPixel.isValid())
+      if(daPixel.isValid())
       {
         daImage.setPixelColor(x, y, daPixel);
       }
 
-      if (invalidPixel.isValid())
+      if(invalidPixel.isValid())
       {
         invalidImage.setPixelColor(x, y, invalidPixel);
       }
@@ -250,11 +250,11 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
   SVStyle* styles = SVStyle::Instance();
 
   QColor bgColor;
-  if (option.state & QStyle::State_Selected)
+  if(option.state & QStyle::State_Selected)
   {
     bgColor = styles->getQTreeViewItemSelectedActive_background_color();
   }
-  else if (option.state & QStyle::State_MouseOver)
+  else if(option.state & QStyle::State_MouseOver)
   {
     bgColor = styles->getQTreeViewItemHover_background_color();
   }
@@ -263,13 +263,13 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
     bgColor = styles->getQTreeViewItem_background_color();
   }
 
-  if (!bgColor.isValid())
+  if(!bgColor.isValid())
   {
-    if (option.state & QStyle::State_Selected)
+    if(option.state & QStyle::State_Selected)
     {
       bgColor = option.palette.color(QPalette::Highlight);
     }
-    else if (option.features & QStyleOptionViewItem::Alternate)
+    else if(option.features & QStyleOptionViewItem::Alternate)
     {
       bgColor = option.palette.color(QPalette::AlternateBase);
     }
@@ -336,10 +336,10 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
       QColor color = DataArrayPathSelectionWidget::GetActiveColor(path.getDataType());
       op.palette.setColor(QPalette::Normal, QPalette::WindowText, color);
     }
-    else if (option.state & QStyle::State_Selected)
+    else if(option.state & QStyle::State_Selected)
     {
       QColor color;
-      if (option.state & QStyle::State_Active)
+      if(option.state & QStyle::State_Active)
       {
         color = styles->getQTreeViewItemSelectedActive_color();
       }
@@ -375,7 +375,7 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
     int radius = 1;
     int rounded = 2;
     int xPadding = 4;
-    
+
     // Rect dimensions
     int xPos = op.rect.x() + textOffset - xPadding;
     int yPos = op.rect.y() - (radius / 2);
@@ -387,7 +387,6 @@ void DataStructureItemDelegate::paint(QPainter* painter, const QStyleOptionViewI
     QColor bgColor = DataArrayPathSelectionWidget::GetActiveColor(path.getDataType());
     op.palette.setColor(QPalette::ColorRole::WindowText, QColor(255, 255, 255));
 
-
     painter->setPen(penColor);
     painter->setBrush(bgColor);
     painter->drawRoundedRect(borderRect, rounded, rounded);
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
old mode 100755
new mode 100644
index e84d1d9e5f..7026c7c9ac
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
@@ -119,13 +119,13 @@ class DataStructureItemDelegate : public QStyledItemDelegate
   DataArrayPath getDataArrayPath(const QModelIndex& index) const;
 
   /**
-  * @brief Create colored icons for new DataArrayPath from the base image
-  */
+   * @brief Create colored icons for new DataArrayPath from the base image
+   */
   void createNewPathIcons();
 
 public:
-  DataStructureItemDelegate(const DataStructureItemDelegate&) = delete; // Copy Constructor Not Implemented
-  DataStructureItemDelegate(DataStructureItemDelegate&&) = delete;      // Move Constructor Not Implemented
+  DataStructureItemDelegate(const DataStructureItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  DataStructureItemDelegate(DataStructureItemDelegate&&) = delete;                 // Move Constructor Not Implemented
   DataStructureItemDelegate& operator=(const DataStructureItemDelegate&) = delete; // Copy Assignment Not Implemented
   DataStructureItemDelegate& operator=(DataStructureItemDelegate&&) = delete;      // Move Assignment Not Implemented
 
@@ -140,4 +140,3 @@ class DataStructureItemDelegate : public QStyledItemDelegate
   QIcon m_CreatedDaIcon;
   QIcon m_CreatedInvalidIcon;
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index b929ff0b37..e490926ff7 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include <QtCore/QVector>
 
@@ -53,8 +53,7 @@ DataStructureModel::DataStructureModel(QObject* parent)
   vector.push_back("Type");
   rootItem = new DataStructureItem(vector, DataStructureItem::ItemType::RootItem);
 
-  connect(this, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
-          this, SLOT(updateModel(const QModelIndex&, const QModelIndex&)));
+  connect(this, SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(updateModel(const QModelIndex&, const QModelIndex&)));
 }
 
 // -----------------------------------------------------------------------------
@@ -83,7 +82,7 @@ QModelIndex DataStructureModel::index(int row, int column, const QModelIndex& pa
     return createIndex(row, column, childItem);
   }
 
-    return QModelIndex();
+  return QModelIndex();
 }
 
 // -----------------------------------------------------------------------------
@@ -143,16 +142,16 @@ QVariant DataStructureModel::data(const QModelIndex& index, int role) const
   }
   if(role == Qt::UserRole)
   {
-    //return item->getItemHasErrors();
+    // return item->getItemHasErrors();
   }
   else if(role == Qt::BackgroundRole)
   {
-//    return item->backgroundColor();
+    //    return item->backgroundColor();
     return QVariant();
   }
   else if(role == Qt::ForegroundRole)
   {
-//    return item->foregroundColor();
+    //    return item->foregroundColor();
     return QVariant();
   }
   else if(role == Qt::ToolTipRole)
@@ -169,7 +168,7 @@ QVariant DataStructureModel::data(const QModelIndex& index, int role) const
       return item->getIcon();
     }
 
-      return QVariant();
+    return QVariant();
   }
 
   return QVariant();
@@ -198,7 +197,7 @@ bool DataStructureModel::setData(const QModelIndex& index, const QVariant& value
 
   if(role == Qt::UserRole)
   {
-   // result = item->setItemHasErrors(value.value<bool>());
+    // result = item->setItemHasErrors(value.value<bool>());
   }
   else if(role == Qt::DecorationRole)
   {
@@ -241,11 +240,10 @@ Qt::ItemFlags DataStructureModel::flags(const QModelIndex& index) const
     return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled);
   }
 
-    // This is a leaf
-    return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled);
+  // This is a leaf
+  return (defaultFlags | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -268,7 +266,6 @@ void DataStructureModel::setNeedsToBeExpanded(const QModelIndex& index, bool val
 {
   DataStructureItem* item = getItem(index);
   item->setNeedsToBeExpanded(value);
-
 }
 
 // -----------------------------------------------------------------------------
@@ -505,7 +502,6 @@ QModelIndex DataStructureModel::sibling(int row, int column, const QModelIndex&
   }
 }
 
-
 #endif
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
old mode 100755
new mode 100644
index 55ff94caa2..810dcd5d03
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -1,80 +1,77 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtCore/QModelIndex>
 #include <QtCore/QVariant>
 #include <QtGui/QStandardItemModel>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 #include "SVWidgetsLib/Widgets/DataStructureItem.h"
 
-
 class QtSSettings;
 class DataStructureItem;
 
 class SVWidgetsLib_EXPORT DataStructureModel : public QStandardItemModel
 {
-    Q_OBJECT
-
-  public:
-    /**
-     * @brief Returns the name of the class for DataStructureModel
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for DataStructureModel
-     */
-    static QString ClassName();
-
-    DataStructureModel(QObject* parent = nullptr);
-    ~DataStructureModel() override;
-
-    using EnumType = unsigned int;
-
-    enum class IndexState : EnumType
-    {
-      Error = 0,
-      Default = 1
-    };
-
-    /*
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Returns the name of the class for DataStructureModel
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for DataStructureModel
+   */
+  static QString ClassName();
+
+  DataStructureModel(QObject* parent = nullptr);
+  ~DataStructureModel() override;
+
+  using EnumType = unsigned int;
+
+  enum class IndexState : EnumType
+  {
+    Error = 0,
+    Default = 1
+  };
+
+  /*
 When subclassing QAbstractItemModel, at the very least you must implement index(), parent(),
 rowCount(), columnCount(), and data().
 These functions are used in all read-only models, and form the basis of editable models.
@@ -87,69 +84,64 @@ to ensure that ItemIsEditable is returned. You can also reimplement headerData()
 to control the way the headers for your model are presented.
 The dataChanged() and headerDataChanged() signals must be emitted explicitly when reimplementing
 the setData() and setHeaderData() functions, respectively.
-    */
-
-    // Read Only Model Methods
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  */
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  // Read Only Model Methods
+  QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
 
-    QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+  QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
 
-    // Editable Model Methods
-    bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
-    Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
-    // void setHeaderData()
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
+  // Editable Model Methods
+  bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
+  Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  // void setHeaderData()
 
-    // Extra Convenince Methods
-    DataStructureItem* getRootItem();
-    /**
-     * @brief syncDataModel
-     * @param dca
-     */
-    void syncDataModel(DataContainerArrayShPtrType dca);
+  // Extra Convenince Methods
+  DataStructureItem* getRootItem();
+  /**
+   * @brief syncDataModel
+   * @param dca
+   */
+  void syncDataModel(DataContainerArrayShPtrType dca);
 
-    bool needsToBeExpanded(const QModelIndex& index);
-    void setNeedsToBeExpanded(const QModelIndex& index, bool value);
+  bool needsToBeExpanded(const QModelIndex& index);
+  void setNeedsToBeExpanded(const QModelIndex& index, bool value);
 
-    /*
-    virtual QModelIndex sibling(int row, int column, const QModelIndex& idx) const Q_DECL_OVERRIDE;
+  /*
+  virtual QModelIndex sibling(int row, int column, const QModelIndex& idx) const Q_DECL_OVERRIDE;
 
-    bool isEmpty();
+  bool isEmpty();
 
-    bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
-    bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
 
-    bool moveRows(const QModelIndex & sourceParent, int sourceRow, int count, const QModelIndex & destinationParent, int destinationChild) Q_DECL_OVERRIDE;
+  bool moveRows(const QModelIndex & sourceParent, int sourceRow, int count, const QModelIndex & destinationParent, int destinationChild) Q_DECL_OVERRIDE;
 
 
 
-    QModelIndexList findIndexByPath(QString filePath);
+  QModelIndexList findIndexByPath(QString filePath);
 */
 
+protected slots:
+  //    void updateRowState(const QString& path);
+  //    void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
+private:
+  DataStructureItem* rootItem;
 
+  DataStructureItem* getItem(const QModelIndex& index) const;
 
-  protected slots:
-//    void updateRowState(const QString& path);
-//    void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
+  //    QModelIndexList findIndexByPath(const QModelIndex& index, QString filePath);
 
-  private:
-    DataStructureItem*            rootItem;
-
-    DataStructureItem* getItem(const QModelIndex& index) const;
-
-    //    QModelIndexList findIndexByPath(const QModelIndex& index, QString filePath);
-
-  public:
-    DataStructureModel(const DataStructureModel&) = delete;            // Copy Constructor Not Implemented
-    DataStructureModel(DataStructureModel&&) = delete;                 // Move Constructor Not Implemented
-    DataStructureModel& operator=(const DataStructureModel&) = delete; // Copy Assignment Not Implemented
-    DataStructureModel& operator=(DataStructureModel&&) = delete;      // Move Assignment Not Implemented
+public:
+  DataStructureModel(const DataStructureModel&) = delete;            // Copy Constructor Not Implemented
+  DataStructureModel(DataStructureModel&&) = delete;                 // Move Constructor Not Implemented
+  DataStructureModel& operator=(const DataStructureModel&) = delete; // Copy Assignment Not Implemented
+  DataStructureModel& operator=(DataStructureModel&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 39bf98e9c5..3364b8a3f0 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -55,9 +55,9 @@
 
 namespace
 {
-  const int InfoStringRole = Qt::UserRole + 1;
-  const int MontageRole = Qt::UserRole + 2;
-}
+const int InfoStringRole = Qt::UserRole + 1;
+const int MontageRole = Qt::UserRole + 2;
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index 43a7ab9eb6..3c55556c5a 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -36,7 +36,6 @@
 
 #include "DataStructureWidget.h"
 
-
 #include <QtGui/QStandardItemModel>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -70,7 +69,7 @@ void DataStructureWidget::setupGui()
   connect(m_Ui->dataBrowserTreeView, SIGNAL(filterPath(DataArrayPath)), this, SIGNAL(filterPath(DataArrayPath)));
   connect(m_Ui->dataBrowserTreeView, SIGNAL(endDataStructureFiltering()), this, SIGNAL(endDataStructureFiltering()));
   connect(m_Ui->dataBrowserTreeView, SIGNAL(applyPathToFilteringParameter(DataArrayPath)), this, SIGNAL(applyPathToFilteringParameter(DataArrayPath)));
-  
+
   connect(m_Ui->collapseAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::collapseAll);
   connect(m_Ui->expandAllBtn, &QPushButton::clicked, m_Ui->dataBrowserTreeView, &DataStructureTreeView::expandAll);
 
@@ -218,7 +217,7 @@ void DataStructureWidget::setHexahedralGeomIcon(const QIcon& path)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataStructureWidget::setRectilinearGeomIcon(const QIcon &path)
+void DataStructureWidget::setRectilinearGeomIcon(const QIcon& path)
 {
   m_Ui->dataBrowserTreeView->setRectilinearGeomIcon(path);
 }
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
old mode 100755
new mode 100644
index d05cfc30f0..84cdc834a6
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -124,26 +124,26 @@ public slots:
   void handleFilterRemoved(PipelineFilterObject* object);
 
   /**
-  * @brief Sets the DataContainer requirements
-  * @param dcReqs
-  */
+   * @brief Sets the DataContainer requirements
+   * @param dcReqs
+   */
   void setViewReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
 
   /**
-  * @brief Sets the AttributeMatrix requirements
-  * @param amReqs
-  */
+   * @brief Sets the AttributeMatrix requirements
+   * @param amReqs
+   */
   void setViewReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
 
   /**
-  * @brief Sets the DataArray requirements
-  * @param daReqs
-  */
+   * @brief Sets the DataArray requirements
+   * @param daReqs
+   */
   void setViewReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
 
   /**
-  * @brief Clears the requirements
-  */
+   * @brief Clears the requirements
+   */
   void clearViewRequirements();
 
 signals:
@@ -159,12 +159,11 @@ public slots:
 
 private:
   DataContainerArrayShPtrType m_Dca = nullptr;
-  QSharedPointer<Ui::DataStructureWidget>       m_Ui;
-  
+  QSharedPointer<Ui::DataStructureWidget> m_Ui;
+
 public:
-  DataStructureWidget(const DataStructureWidget&) = delete; // Copy Constructor Not Implemented
-  DataStructureWidget(DataStructureWidget&&) = delete;      // Move Constructor Not Implemented
+  DataStructureWidget(const DataStructureWidget&) = delete;            // Copy Constructor Not Implemented
+  DataStructureWidget(DataStructureWidget&&) = delete;                 // Move Constructor Not Implemented
   DataStructureWidget& operator=(const DataStructureWidget&) = delete; // Copy Assignment Not Implemented
   DataStructureWidget& operator=(DataStructureWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index b545afb875..3706764b98 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterInputWidget.h"
 
@@ -65,14 +65,11 @@
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/DataContainerArrayWidget.h"
 
-
 #if 0
 #include "ctkCollapsibleGroupBox.h"
 #define QGroupBox ctkCollapsibleGroupBox
 #endif
 
-
-
 // Initialize private static member variable
 QString FilterInputWidget::m_OpenDialogLastFilePath = "";
 
@@ -178,11 +175,11 @@ bool FilterInputWidget::eventFilter(QObject* o, QEvent* e)
 // -----------------------------------------------------------------------------
 void FilterInputWidget::setupGui()
 {
-//  QFont humanLabelFont = SVStyle::Instance()->GetHumanLabelFont();
-//  QFont brandingFont = SVStyle::Instance()->GetBrandingLabelFont();
+  //  QFont humanLabelFont = SVStyle::Instance()->GetHumanLabelFont();
+  //  QFont brandingFont = SVStyle::Instance()->GetBrandingLabelFont();
 
-//  m_Ui->filterHumanLabel->setFont(humanLabelFont);
-//  m_Ui->filterIndex->setFont(humanLabelFont);
+  //  m_Ui->filterHumanLabel->setFont(humanLabelFont);
+  //  m_Ui->filterIndex->setFont(humanLabelFont);
 
   QString releaseType = QString::fromLatin1(SIMPLViewProj_RELEASE_TYPE);
   if(releaseType.compare("Official") == 0)
@@ -191,12 +188,11 @@ void FilterInputWidget::setupGui()
   }
   else
   {
-    //m_Ui->brandingLabel->setFont(brandingFont);
+    // m_Ui->brandingLabel->setFont(brandingFont);
     m_Ui->brandingLabel->installEventFilter(this);
   }
-  
-  connect(m_Ui->informationBtn, SIGNAL(clicked()),
-           this, SLOT(showHelp()));
+
+  connect(m_Ui->informationBtn, SIGNAL(clicked()), this, SLOT(showHelp()));
 }
 
 // -----------------------------------------------------------------------------
@@ -250,39 +246,39 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
 
   QString groupBoxStyle;
   QTextStream ss(&groupBoxStyle);
-//  ss << "QGroupBox {";
-//  ss << "    font-weight: bold;";
-//  ss << "}";
-//  ss << "QGroupBox::title {";
-//  ss << "    subcontrol-origin: margin;";
-//  ss << "    subcontrol-position: top left;";
-//  ss << "    padding: 0 5px;";
-//  ss << "    font-weight: bold;";
-//  ss << "}";
+  //  ss << "QGroupBox {";
+  //  ss << "    font-weight: bold;";
+  //  ss << "}";
+  //  ss << "QGroupBox::title {";
+  //  ss << "    subcontrol-origin: margin;";
+  //  ss << "    subcontrol-position: top left;";
+  //  ss << "    padding: 0 5px;";
+  //  ss << "    font-weight: bold;";
+  //  ss << "}";
 
   QGroupBox* parametersGroupBox = new QGroupBox("Parameters", this);
   QVBoxLayout* pLayout = new QVBoxLayout(parametersGroupBox);
   pLayout->setContentsMargins(0, 0, 0, 0);
   pLayout->setSpacing(0);
-  //parametersGroupBox->setStyleSheet(groupBoxStyle);
+  // parametersGroupBox->setStyleSheet(groupBoxStyle);
 
   QGroupBox* requiredGroupBox = new QGroupBox("Required Objects", this);
   QVBoxLayout* rLayout = new QVBoxLayout(requiredGroupBox);
   rLayout->setContentsMargins(0, 0, 0, 0);
   rLayout->setSpacing(0);
-  //requiredGroupBox->setStyleSheet(groupBoxStyle);
+  // requiredGroupBox->setStyleSheet(groupBoxStyle);
 
   QGroupBox* createdGroupBox = new QGroupBox("Created Objects", this);
   QVBoxLayout* cLayout = new QVBoxLayout(createdGroupBox);
   cLayout->setContentsMargins(0, 0, 0, 0);
   cLayout->setSpacing(0);
-  //createdGroupBox->setStyleSheet(groupBoxStyle);
+  // createdGroupBox->setStyleSheet(groupBoxStyle);
 
   QGroupBox* noCategoryGroupBox = new QGroupBox("Uncategorized", this);
   QVBoxLayout* nLayout = new QVBoxLayout(noCategoryGroupBox);
   nLayout->setContentsMargins(0, 0, 0, 0);
   nLayout->setSpacing(0);
-  //noCategoryGroupBox->setStyleSheet(groupBoxStyle);
+  // noCategoryGroupBox->setStyleSheet(groupBoxStyle);
 
   // Get the FilterWidgetManagere instance so we can instantiate new FilterParameterWidgets
   FilterWidgetManager* fwm = FilterWidgetManager::Instance();
@@ -296,19 +292,22 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
   {
     FilterParameter* parameter = (*iter).get();
 
-//    // Check to make sure that this is in fact a file system filter parameter
-//    if(nullptr != dynamic_cast<InputFileFilterParameter*>(parameter) || nullptr != dynamic_cast<InputPathFilterParameter*>(parameter) ||
-//       nullptr != dynamic_cast<DataContainerReaderFilterParameter*>(parameter))
-//    {
-//      validateFileSystemFilterParameter(parameter, filter);
-//    }
+    //    // Check to make sure that this is in fact a file system filter parameter
+    //    if(nullptr != dynamic_cast<InputFileFilterParameter*>(parameter) || nullptr != dynamic_cast<InputPathFilterParameter*>(parameter) ||
+    //       nullptr != dynamic_cast<DataContainerReaderFilterParameter*>(parameter))
+    //    {
+    //      validateFileSystemFilterParameter(parameter, filter);
+    //    }
 
     QWidget* filterParameterWidget = fwm->createWidget(parameter, filter, this);
     m_PropertyToWidget.insert(parameter->getPropertyName(), filterParameterWidget); // Update our Map of Filter Parameter Properties to the Widget
     // Alert to DataArrayPath requirements
-    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this, SLOT(getEmittedPathReqs(DataContainerSelectionFilterParameter::RequirementType)));
-    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this, SLOT(getEmittedPathReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
-    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)), this, SLOT(getEmittedPathReqs(DataArraySelectionFilterParameter::RequirementType)));
+    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType)), this,
+            SLOT(getEmittedPathReqs(DataContainerSelectionFilterParameter::RequirementType)));
+    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType)), this,
+            SLOT(getEmittedPathReqs(AttributeMatrixSelectionFilterParameter::RequirementType)));
+    connect(filterParameterWidget, SIGNAL(viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType)), this,
+            SLOT(getEmittedPathReqs(DataArraySelectionFilterParameter::RequirementType)));
     connect(filterParameterWidget, SIGNAL(endViewPaths()), this, SIGNAL(endViewPaths()));
     // Alert to DataArrayPaths from the DataStructureWidget
     connect(this, SIGNAL(filterPath(DataArrayPath)), filterParameterWidget, SIGNAL(filterPathInput(DataArrayPath)));
@@ -325,7 +324,6 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
     connect(filterParameterWidget, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
     connect(this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), filterParameterWidget, SIGNAL(unlockDataArrayPathSelection(QToolButton*)));
 
-
     if(nullptr == filterParameterWidget)
     {
       continue;
@@ -646,17 +644,16 @@ void FilterInputWidget::displayFilterParameters(AbstractFilter::Pointer filter)
     m_VariablesWidget->setVisible(true);
   }
 
-
-    ISIMPLibPlugin* plug = filter->getPluginInstance();
-    if(nullptr != plug)
-    {
-      m_BrandingLabel = QString("Plugin: %1 (%2) Filter Name: %3").arg(plug->getPluginDisplayName()).arg(plug->getVersion()).arg(filter->getNameOfClass());
-    }
-    else
-    {
-      m_BrandingLabel = QString("Plugin: Unknown Plugin. Filter Name: %1").arg(filter->getNameOfClass());
-    }
-    m_Ui->brandingLabel->setText(m_BrandingLabel);
+  ISIMPLibPlugin* plug = filter->getPluginInstance();
+  if(nullptr != plug)
+  {
+    m_BrandingLabel = QString("Plugin: %1 (%2) Filter Name: %3").arg(plug->getPluginDisplayName()).arg(plug->getVersion()).arg(filter->getNameOfClass());
+  }
+  else
+  {
+    m_BrandingLabel = QString("Plugin: Unknown Plugin. Filter Name: %1").arg(filter->getNameOfClass());
+  }
+  m_Ui->brandingLabel->setText(m_BrandingLabel);
 
   // Add a label at the top of the Inputs Tabs to show what filter we are working on
   m_Ui->filterHumanLabel->setText(filter->getHumanLabel());
@@ -665,22 +662,21 @@ void FilterInputWidget::displayFilterParameters(AbstractFilter::Pointer filter)
   // m_Ui->filterIndex->clear();
   QString style;
 
-
   QString filterGroup;
   QTextStream groupStream(&filterGroup);
   groupStream << "Group: " << filter->getGroupName() << "\n";
   groupStream << "Subgroup: " << filter->getSubGroupName();
   m_Ui->filterHumanLabel->setToolTip(filterGroup);
 
-//  QColor bgColor =  w->getGroupColor();
-//  QColor borderColor = QColor::fromHsv(bgColor.hue(), 100, 120);
+  //  QColor bgColor =  w->getGroupColor();
+  //  QColor borderColor = QColor::fromHsv(bgColor.hue(), 100, 120);
 
   QTextStream styleStream(&style);
   styleStream << "QFrame#" << m_Ui->labelFrame->objectName() << "{";
   styleStream << "border-bottom: 0px solid;";
-//  styleStream << "border-bottom-color: " << borderColor.name() << ";";
- // styleStream << "background-color: " << bgColor.name() << ";";
- // styleStream << "border-radius: 0 0 0 0px;";
+  //  styleStream << "border-bottom-color: " << borderColor.name() << ";";
+  // styleStream << "background-color: " << bgColor.name() << ";";
+  // styleStream << "border-radius: 0 0 0 0px;";
   styleStream << "}";
 
 #if 0
@@ -742,8 +738,8 @@ void FilterInputWidget::getEmittedPathReqs(DataContainerSelectionFilterParameter
 {
   emit viewPathsMatchingReqs(dcReqs);
 
-  //QObject* obj = this->sender();
-  //for(QWidget* widget : m_PropertyToWidget)
+  // QObject* obj = this->sender();
+  // for(QWidget* widget : m_PropertyToWidget)
   //{
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
@@ -760,8 +756,8 @@ void FilterInputWidget::getEmittedPathReqs(AttributeMatrixSelectionFilterParamet
 {
   emit viewPathsMatchingReqs(amReqs);
 
-  //QObject* obj = this->sender();
-  //for(QWidget* widget : m_PropertyToWidget)
+  // QObject* obj = this->sender();
+  // for(QWidget* widget : m_PropertyToWidget)
   //{
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
@@ -778,8 +774,8 @@ void FilterInputWidget::getEmittedPathReqs(DataArraySelectionFilterParameter::Re
 {
   emit viewPathsMatchingReqs(daReqs);
 
-  //QObject* obj = this->sender();
-  //for(QWidget* widget : m_PropertyToWidget)
+  // QObject* obj = this->sender();
+  // for(QWidget* widget : m_PropertyToWidget)
   //{
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
old mode 100755
new mode 100644
index ed28d07789..f191a2ff01
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -58,85 +58,84 @@ class PipelineFilterObject;
  */
 class SVWidgetsLib_EXPORT FilterInputWidget : public QWidget
 {
-    Q_OBJECT
-
-  public:
-    FilterInputWidget(AbstractFilter::Pointer filter, QWidget* parent = nullptr);
-    ~FilterInputWidget() override;
-
-    virtual void setupGui();
-
-    void setFilterIndex(const QString& index);
-
-    bool eventFilter(QObject* o, QEvent* e) override;
-
-    void toRunningState();
-    void toIdleState();
-
-    QWidget* getVariablesTabContentsWidget();
-
-  public slots :
-    void clearInputWidgets();
-    void showHelp();
-    void displayFilterParameters(AbstractFilter::Pointer filter);
-
-  signals:
-    void filterParametersChanged(bool preflight = true);
-    void errorSettingFilterParameter(const QString &text);
-
-    void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
-    void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
-    void viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
-    void endViewPaths();
-    void endDataStructureFiltering();
-    void filterPath(DataArrayPath path);
-    void endPathFiltering();
-    void applyPathToFilteringParameter(DataArrayPath path);
-    void dataArrayPathSelectionLocked(QToolButton* selection);
-    void dataArrayPathSelectionUnlocked(QToolButton* button);
-
-  private slots:
-    void fadeInWidget(QWidget* widget);
-    void fadeOutWidget(QWidget* widget);
-    
-    void getEmittedPathReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
-    void getEmittedPathReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
-    void getEmittedPathReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
-    void emitFilterPath(DataArrayPath path);
-
-  private:
-    QSharedPointer<Ui::FilterInputWidget> m_Ui;
-    QString                           m_FilterClassName;
-    QPointer<QtSFaderWidget>          m_FaderWidget;
-    bool                              m_AdvFadedOut;
-    QString                           m_BrandingLabel;
-    static QString                    m_OpenDialogLastFilePath;
-
-    QVBoxLayout*                      m_VariablesVerticalLayout = nullptr;
-    QWidget*                          m_VariablesWidget = nullptr;
-    QMap<QString, QWidget*>           m_PropertyToWidget;
-
-    /**
-     * @brief layoutWidgets
-     */
-    void layoutWidgets(AbstractFilter* filter);
-
-    /**
-     * @brief validateFileSystemFilterParameter
-     * @param option
-     */
-    void validateFileSystemFilterParameter(FilterParameter* parameter, AbstractFilter* filter);
-
-    /**
-     * @brief linkConditionalWidgets
-     * @param filterParameters
-     */
-    void linkConditionalWidgets(FilterParameterVectorType& filterParameters);
-
-  public:
-    FilterInputWidget(const FilterInputWidget&) = delete; // Copy Constructor Not Implemented
-    FilterInputWidget(FilterInputWidget&&) = delete;      // Move Constructor Not Implemented
-    FilterInputWidget& operator=(const FilterInputWidget&) = delete; // Copy Assignment Not Implemented
-    FilterInputWidget& operator=(FilterInputWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  FilterInputWidget(AbstractFilter::Pointer filter, QWidget* parent = nullptr);
+  ~FilterInputWidget() override;
+
+  virtual void setupGui();
+
+  void setFilterIndex(const QString& index);
+
+  bool eventFilter(QObject* o, QEvent* e) override;
+
+  void toRunningState();
+  void toIdleState();
+
+  QWidget* getVariablesTabContentsWidget();
+
+public slots:
+  void clearInputWidgets();
+  void showHelp();
+  void displayFilterParameters(AbstractFilter::Pointer filter);
+
+signals:
+  void filterParametersChanged(bool preflight = true);
+  void errorSettingFilterParameter(const QString& text);
+
+  void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
+  void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
+  void viewPathsMatchingReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
+  void endViewPaths();
+  void endDataStructureFiltering();
+  void filterPath(DataArrayPath path);
+  void endPathFiltering();
+  void applyPathToFilteringParameter(DataArrayPath path);
+  void dataArrayPathSelectionLocked(QToolButton* selection);
+  void dataArrayPathSelectionUnlocked(QToolButton* button);
+
+private slots:
+  void fadeInWidget(QWidget* widget);
+  void fadeOutWidget(QWidget* widget);
+
+  void getEmittedPathReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
+  void getEmittedPathReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
+  void getEmittedPathReqs(DataArraySelectionFilterParameter::RequirementType daReqs);
+  void emitFilterPath(DataArrayPath path);
+
+private:
+  QSharedPointer<Ui::FilterInputWidget> m_Ui;
+  QString m_FilterClassName;
+  QPointer<QtSFaderWidget> m_FaderWidget;
+  bool m_AdvFadedOut;
+  QString m_BrandingLabel;
+  static QString m_OpenDialogLastFilePath;
+
+  QVBoxLayout* m_VariablesVerticalLayout = nullptr;
+  QWidget* m_VariablesWidget = nullptr;
+  QMap<QString, QWidget*> m_PropertyToWidget;
+
+  /**
+   * @brief layoutWidgets
+   */
+  void layoutWidgets(AbstractFilter* filter);
+
+  /**
+   * @brief validateFileSystemFilterParameter
+   * @param option
+   */
+  void validateFileSystemFilterParameter(FilterParameter* parameter, AbstractFilter* filter);
+
+  /**
+   * @brief linkConditionalWidgets
+   * @param filterParameters
+   */
+  void linkConditionalWidgets(FilterParameterVectorType& filterParameters);
+
+public:
+  FilterInputWidget(const FilterInputWidget&) = delete;            // Copy Constructor Not Implemented
+  FilterInputWidget(FilterInputWidget&&) = delete;                 // Move Constructor Not Implemented
+  FilterInputWidget& operator=(const FilterInputWidget&) = delete; // Copy Assignment Not Implemented
+  FilterInputWidget& operator=(FilterInputWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index a981dc4465..a823b9d778 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterLibraryToolboxWidget.h"
 
 #include <QtCore/QFileInfo>
@@ -45,9 +45,6 @@
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-
-
-
 #define LIBRARY_NODE_TYPE 0
 #define PLUGIN_NODE_TYPE 1
 #define SUBGROUP_NODE_TYPE 2
@@ -184,7 +181,7 @@ void FilterLibraryToolboxWidget::refreshFilterGroups()
 void FilterLibraryToolboxWidget::setupGui()
 {
   refreshFilterGroups();
-//  QString css(" QToolTip {\
+  //  QString css(" QToolTip {\
 //              border: 2px solid #434343;\
 //              padding: 2px;\
 //              border-radius: 3px;\
@@ -192,7 +189,7 @@ void FilterLibraryToolboxWidget::setupGui()
 //              background-color: #FFFFFF;\
 //              color: #000000;\
 //              }");
-//  bookmarksTreeView->setStyleSheet(css);
+  //  bookmarksTreeView->setStyleSheet(css);
 
   filterLibrary->setContextMenuPolicy(Qt::CustomContextMenu);
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
old mode 100755
new mode 100644
index 7c2209988e..222eb76b74
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QMenu>
 
 #include <QtCore/QSignalMapper>
@@ -50,86 +49,84 @@
 
 class FilterListToolboxWidget;
 
-
 class SVWidgetsLib_EXPORT FilterLibraryToolboxWidget : public QWidget, private Ui::FilterLibraryToolboxWidget
 {
 
-    Q_OBJECT
-  public:
-    /**
-     * @brief FilterLibraryToolboxWidget
-     * @param parent
-     */
-    FilterLibraryToolboxWidget(QWidget* parent = nullptr);
-    ~FilterLibraryToolboxWidget() override;
-
-    /**
-     * @brief setupGui
-     */
-    virtual void setupGui();
-
-    /**
-     * @brief connectFilterList
-     * @param filterListWidget
-     */
-    void connectFilterList(FilterListToolboxWidget* filterListWidget);
-
-    /**
-     * @brief refreshFilterGroups
-     */
-    void refreshFilterGroups();
-
-    /**
-    * @brief Reads the preferences from the users pref file
-    */
-    void readSettings(QtSSettings* prefs);
-
-    /**
-    * @brief Writes the preferences to the users pref file
-    */
-    void writeSettings(QtSSettings* prefs);
-
-  protected:
-    void updateFilterGroupList(FilterManager::Collection& factories);
-
-  protected slots:
-    void on_filterLibrary_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous );
-    void on_filterLibrary_itemDoubleClicked( QTreeWidgetItem* item, int column );
-
-    /**
-    * @brief showContextMenuForWidget
-    * @param pos
-    */
-    void showContextMenuForWidget(const QPoint& pos);
-
-    /**
-    * @brief launchHelpForItem
-    * @param name
-    */
-    void launchHelpForItem(QString name);
-
-  signals:
-    /**
-     * @brief filterItemDoubleClicked
-     * @param filterName
-     */
-    void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
-
-    /**
-     * @brief filterListGenerated
-     * @param filterList
-     * @param sort
-     */
-    void filterListGenerated(const QStringList& filterList, bool sort);
-
-  private:
-    QMenu* m_ContextMenu;
-    QSignalMapper* m_Mapper;
-
-  public:
-    FilterLibraryToolboxWidget(const FilterLibraryToolboxWidget&) = delete; // Copy Constructor Not Implemented
-    FilterLibraryToolboxWidget(FilterLibraryToolboxWidget&&) = delete;      // Move Constructor Not Implemented
-    FilterLibraryToolboxWidget& operator=(const FilterLibraryToolboxWidget&) = delete; // Copy Assignment Not Implemented
-    FilterLibraryToolboxWidget& operator=(FilterLibraryToolboxWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  /**
+   * @brief FilterLibraryToolboxWidget
+   * @param parent
+   */
+  FilterLibraryToolboxWidget(QWidget* parent = nullptr);
+  ~FilterLibraryToolboxWidget() override;
+
+  /**
+   * @brief setupGui
+   */
+  virtual void setupGui();
+
+  /**
+   * @brief connectFilterList
+   * @param filterListWidget
+   */
+  void connectFilterList(FilterListToolboxWidget* filterListWidget);
+
+  /**
+   * @brief refreshFilterGroups
+   */
+  void refreshFilterGroups();
+
+  /**
+   * @brief Reads the preferences from the users pref file
+   */
+  void readSettings(QtSSettings* prefs);
+
+  /**
+   * @brief Writes the preferences to the users pref file
+   */
+  void writeSettings(QtSSettings* prefs);
+
+protected:
+  void updateFilterGroupList(FilterManager::Collection& factories);
+
+protected slots:
+  void on_filterLibrary_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous);
+  void on_filterLibrary_itemDoubleClicked(QTreeWidgetItem* item, int column);
+
+  /**
+   * @brief showContextMenuForWidget
+   * @param pos
+   */
+  void showContextMenuForWidget(const QPoint& pos);
+
+  /**
+   * @brief launchHelpForItem
+   * @param name
+   */
+  void launchHelpForItem(QString name);
+
+signals:
+  /**
+   * @brief filterItemDoubleClicked
+   * @param filterName
+   */
+  void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
+
+  /**
+   * @brief filterListGenerated
+   * @param filterList
+   * @param sort
+   */
+  void filterListGenerated(const QStringList& filterList, bool sort);
+
+private:
+  QMenu* m_ContextMenu;
+  QSignalMapper* m_Mapper;
+
+public:
+  FilterLibraryToolboxWidget(const FilterLibraryToolboxWidget&) = delete;            // Copy Constructor Not Implemented
+  FilterLibraryToolboxWidget(FilterLibraryToolboxWidget&&) = delete;                 // Move Constructor Not Implemented
+  FilterLibraryToolboxWidget& operator=(const FilterLibraryToolboxWidget&) = delete; // Copy Assignment Not Implemented
+  FilterLibraryToolboxWidget& operator=(FilterLibraryToolboxWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
index 06c48cacb9..fb848479f9 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterLibraryTreeWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
old mode 100755
new mode 100644
index 19ae02945e..cbaf4628ac
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
@@ -1,75 +1,71 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QPoint>
 #include <QtWidgets/QTreeWidget>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 /*
  *
  */
-class SVWidgetsLib_EXPORT FilterLibraryTreeWidget: public QTreeWidget
+class SVWidgetsLib_EXPORT FilterLibraryTreeWidget : public QTreeWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    FilterLibraryTreeWidget(QWidget* parent = nullptr);
-    ~FilterLibraryTreeWidget() override;
+public:
+  FilterLibraryTreeWidget(QWidget* parent = nullptr);
+  ~FilterLibraryTreeWidget() override;
 
-    enum ItemType
-    {
-      Node_Item_Type = 1,
-      Leaf_Item_Type = 2,
-      Unknown_Item_Type = 3
-    };
+  enum ItemType
+  {
+    Node_Item_Type = 1,
+    Leaf_Item_Type = 2,
+    Unknown_Item_Type = 3
+  };
 
-  protected:
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
+protected:
+  void mousePressEvent(QMouseEvent* event) override;
+  void mouseMoveEvent(QMouseEvent* event) override;
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dragMoveEvent(QDragMoveEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
 
-  private:
-    void performDrag();
+private:
+  void performDrag();
 
-    QPoint startPos;
+  QPoint startPos;
 };
-
-
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
index 46e9edf3e9..19c9aec9db 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
@@ -1,48 +1,47 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterListItem.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FilterListItem::FilterListItem(const QString &name, FilterListItem* parent)
-  : m_Name(name)
-  , m_ItemTooltip("")
-  , m_Icon(QIcon())
-  , m_ParentItem(parent)
+FilterListItem::FilterListItem(const QString& name, FilterListItem* parent)
+: m_Name(name)
+, m_ItemTooltip("")
+, m_Icon(QIcon())
+, m_ParentItem(parent)
 {
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.h b/Source/SVWidgetsLib/Widgets/FilterListItem.h
old mode 100755
new mode 100644
index 1a85c7a43e..3f2d24ee32
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,100 +39,99 @@
 
 #include <QtGui/QIcon>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class SVWidgetsLib_EXPORT FilterListItem
 {
-  public:
-    FilterListItem(const QString &name, FilterListItem* parent = 0);
-    virtual ~FilterListItem();
-
-    enum ItemType
-    {
-      Filter,
-      Group,
-      Unknown
-    };
-
-    /**
-     * @brief Setter property for Name
-     */
-    void setName(const QString& value);
-    /**
-     * @brief Getter property for Name
-     * @return Value of Name
-     */
-    QString getName() const;
-
-    /**
-     * @brief Setter property for ItemTooltip
-     */
-    void setItemTooltip(const QString& value);
-    /**
-     * @brief Getter property for ItemTooltip
-     * @return Value of ItemTooltip
-     */
-    QString getItemTooltip() const;
-
-    /**
-     * @brief Setter property for ClassName
-     */
-    void setClassName(const QString& value);
-    /**
-     * @brief Getter property for ClassName
-     * @return Value of ClassName
-     */
-    QString getClassName() const;
-
-    /**
-     * @brief Setter property for Icon
-     */
-    void setIcon(const QIcon& value);
-    /**
-     * @brief Getter property for Icon
-     * @return Value of Icon
-     */
-    QIcon getIcon() const;
-
-    /**
-     * @brief Setter property for ItemType
-     */
-    void setItemType(const FilterListItem::ItemType& value);
-    /**
-     * @brief Getter property for ItemType
-     * @return Value of ItemType
-     */
-    FilterListItem::ItemType getItemType() const;
-
-    FilterListItem* child(int number);
-    FilterListItem* parent();
-
-    int childCount() const;
-
-    bool insertChild(int position, FilterListItem* child);
-    bool insertChildren(int position, int count, int columns);
-
-    bool removeChild(int position);
-    bool removeChildren(int position, int count);
-
-    int childNumber() const;
-
-    void setParent(FilterListItem* parent);
-
-  private:
-    QString m_Name = {};
-    QString m_ItemTooltip = {};
-    QString m_ClassName = {};
-    QIcon m_Icon = {};
-    FilterListItem::ItemType m_ItemType = {};
-
-    QList<FilterListItem*>               m_ChildItems;
-    FilterListItem*                      m_ParentItem;
-
-  public:
-    FilterListItem(const FilterListItem&) = delete;            // Copy Constructor Not Implemented
-    FilterListItem(FilterListItem&&) = delete;                 // Move Constructor Not Implemented
-    FilterListItem& operator=(const FilterListItem&) = delete; // Copy Assignment Not Implemented
-    FilterListItem& operator=(FilterListItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  FilterListItem(const QString& name, FilterListItem* parent = 0);
+  virtual ~FilterListItem();
+
+  enum ItemType
+  {
+    Filter,
+    Group,
+    Unknown
+  };
+
+  /**
+   * @brief Setter property for Name
+   */
+  void setName(const QString& value);
+  /**
+   * @brief Getter property for Name
+   * @return Value of Name
+   */
+  QString getName() const;
+
+  /**
+   * @brief Setter property for ItemTooltip
+   */
+  void setItemTooltip(const QString& value);
+  /**
+   * @brief Getter property for ItemTooltip
+   * @return Value of ItemTooltip
+   */
+  QString getItemTooltip() const;
+
+  /**
+   * @brief Setter property for ClassName
+   */
+  void setClassName(const QString& value);
+  /**
+   * @brief Getter property for ClassName
+   * @return Value of ClassName
+   */
+  QString getClassName() const;
+
+  /**
+   * @brief Setter property for Icon
+   */
+  void setIcon(const QIcon& value);
+  /**
+   * @brief Getter property for Icon
+   * @return Value of Icon
+   */
+  QIcon getIcon() const;
+
+  /**
+   * @brief Setter property for ItemType
+   */
+  void setItemType(const FilterListItem::ItemType& value);
+  /**
+   * @brief Getter property for ItemType
+   * @return Value of ItemType
+   */
+  FilterListItem::ItemType getItemType() const;
+
+  FilterListItem* child(int number);
+  FilterListItem* parent();
+
+  int childCount() const;
+
+  bool insertChild(int position, FilterListItem* child);
+  bool insertChildren(int position, int count, int columns);
+
+  bool removeChild(int position);
+  bool removeChildren(int position, int count);
+
+  int childNumber() const;
+
+  void setParent(FilterListItem* parent);
+
+private:
+  QString m_Name = {};
+  QString m_ItemTooltip = {};
+  QString m_ClassName = {};
+  QIcon m_Icon = {};
+  FilterListItem::ItemType m_ItemType = {};
+
+  QList<FilterListItem*> m_ChildItems;
+  FilterListItem* m_ParentItem;
+
+public:
+  FilterListItem(const FilterListItem&) = delete;            // Copy Constructor Not Implemented
+  FilterListItem(FilterListItem&&) = delete;                 // Move Constructor Not Implemented
+  FilterListItem& operator=(const FilterListItem&) = delete; // Copy Assignment Not Implemented
+  FilterListItem& operator=(FilterListItem&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
index 88ba8d6402..6bfd24ff52 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterListModel.h"
 
@@ -88,7 +88,7 @@ QVariant FilterListModel::data(const QModelIndex& index, int role) const
 
   if(role == Qt::DisplayRole)
   {
-    if (item->getItemType() == FilterListItem::ItemType::Group)
+    if(item->getItemType() == FilterListItem::ItemType::Group)
     {
       QString text = item->getName();
       text.append(tr(" (%1)").arg(rowCount(index)));
@@ -106,7 +106,7 @@ QVariant FilterListModel::data(const QModelIndex& index, int role) const
   }
   if(role == Qt::FontRole)
   {
-    if (item->getItemType() == FilterListItem::Group)
+    if(item->getItemType() == FilterListItem::Group)
     {
       QFont font;
       font.setBold(true);
@@ -119,9 +119,9 @@ QVariant FilterListModel::data(const QModelIndex& index, int role) const
   {
     return item->getItemTooltip();
   }
-  else if (role == Qt::BackgroundRole)
+  else if(role == Qt::BackgroundRole)
   {
-    if (item->getItemType() == FilterListItem::Group)
+    if(item->getItemType() == FilterListItem::Group)
     {
       return QColor(225, 219, 225);
     }
@@ -154,8 +154,8 @@ Qt::ItemFlags FilterListModel::flags(const QModelIndex& index) const
     return (Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled);
   }
 
-    // This is a leaf
-    return Qt::ItemIsEnabled;
+  // This is a leaf
+  return Qt::ItemIsEnabled;
 }
 
 // -----------------------------------------------------------------------------
@@ -192,7 +192,7 @@ QModelIndex FilterListModel::index(int row, int column, const QModelIndex& paren
     return createIndex(row, column, childItem);
   }
 
-    return QModelIndex();
+  return QModelIndex();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.h b/Source/SVWidgetsLib/Widgets/FilterListModel.h
old mode 100755
new mode 100644
index 5c6d63a244..9ed5b71a86
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QAbstractItemModel>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class FilterListItem;
@@ -47,63 +46,63 @@ class FilterListItem;
  */
 class SVWidgetsLib_EXPORT FilterListModel : public QAbstractItemModel
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-     * @brief Returns the name of the class for FilterListModel
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for FilterListModel
-     */
-    static QString ClassName();
+public:
+  /**
+   * @brief Returns the name of the class for FilterListModel
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for FilterListModel
+   */
+  static QString ClassName();
 
-    enum Column
-    {
-      Contents
-    };
+  enum Column
+  {
+    Contents
+  };
 
-    enum Roles
-    {
-      ItemTypeRole = Qt::UserRole + 1,
-      ClassNameRole
-    };
+  enum Roles
+  {
+    ItemTypeRole = Qt::UserRole + 1,
+    ClassNameRole
+  };
 
-    FilterListModel(QObject* parent = nullptr);
+  FilterListModel(QObject* parent = nullptr);
 
-    ~FilterListModel() override;
+  ~FilterListModel() override;
 
-    QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
+  QVariant data(const QModelIndex& index, int role) const Q_DECL_OVERRIDE;
 
-    bool isEmpty();
+  bool isEmpty();
 
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE;
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
 
-    bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
-    bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
+  bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
 
-    Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
+  Qt::ItemFlags flags(const QModelIndex& index) const Q_DECL_OVERRIDE;
 
-    bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
+  bool setData(const QModelIndex& index, const QVariant& value, int role) Q_DECL_OVERRIDE;
 
-    FilterListItem* getRootItem();
+  FilterListItem* getRootItem();
 
-  protected:
-    void initialize();
+protected:
+  void initialize();
 
-  private:
-    FilterListItem*            rootItem;
+private:
+  FilterListItem* rootItem;
 
-    FilterListItem* getItem(const QModelIndex& index) const;
+  FilterListItem* getItem(const QModelIndex& index) const;
 
-  public:
-    FilterListModel(const FilterListModel&) = delete;            // Copy Constructor Not Implemented
-    FilterListModel(FilterListModel&&) = delete;                 // Move Constructor Not Implemented
-    FilterListModel& operator=(const FilterListModel&) = delete; // Copy Assignment Not Implemented
-    FilterListModel& operator=(FilterListModel&&) = delete;      // Move Assignment Not Implemented
+public:
+  FilterListModel(const FilterListModel&) = delete;            // Copy Constructor Not Implemented
+  FilterListModel(FilterListModel&&) = delete;                 // Move Constructor Not Implemented
+  FilterListModel& operator=(const FilterListModel&) = delete; // Copy Assignment Not Implemented
+  FilterListModel& operator=(FilterListModel&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
index 8c5f454bf3..f5847c9beb 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterListToolboxWidget.h"
 
 #include <QtCore/QBitArray>
@@ -73,7 +73,7 @@ void FilterListToolboxWidget::setupGui()
 {
   setupSearchField();
 
-//  QString css(" QToolTip {\
+  //  QString css(" QToolTip {\
 //              border: 2px solid #434343;\
 //              padding: 2px;\
 //              border-radius: 3px;\
@@ -81,7 +81,7 @@ void FilterListToolboxWidget::setupGui()
 //              background-color: #FFFFFF;\
 //              color: #000000;\
 //              }");
-  //filterListView->setStyleSheet(css);
+  // filterListView->setStyleSheet(css);
 
   filterListView->setContextMenuPolicy(Qt::CustomContextMenu);
 
@@ -213,7 +213,7 @@ void FilterListToolboxWidget::searchFilters(QString text)
   matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::SubgroupName);
   matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::BrandingName);
   matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::CompiledLibraryName);
-//  matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::Keywords);
+  //  matchFiltersToSearchGroup(filters, addedFiltersSet, searchTokens, FilterListView::SearchGroup::Keywords);
 
   QString countText = QObject::tr("Unique Filter Count: %1").arg(addedFiltersSet.size());
   filterCountLabel->setText(countText);
@@ -297,36 +297,30 @@ int FilterListToolboxWidget::getMatchingWordCountForFilter(QStringList searchTok
   QString searchGroupTerm = "";
   switch(searchGroup)
   {
-    case FilterListView::SearchGroup::HumanLabel:
-    {
-      searchGroupTerm = factory->getFilterHumanLabel();
-      break;
-    }
-    case FilterListView::SearchGroup::GroupName:
-    {
-      searchGroupTerm = factory->getFilterGroup();
-      break;
-    }
-    case FilterListView::SearchGroup::SubgroupName:
-    {
-      searchGroupTerm = factory->getFilterSubGroup();
-      break;
-    }
-    case FilterListView::SearchGroup::BrandingName:
-    {
-      searchGroupTerm = factory->getBrandingString();
-      break;
-    }
-    case FilterListView::SearchGroup::CompiledLibraryName:
-    {
-      searchGroupTerm = factory->getCompiledLibraryName();
-      break;
-    }
-    case FilterListView::SearchGroup::Keywords:
-    {
-      // Implement Keywords
-      break;
-    }
+  case FilterListView::SearchGroup::HumanLabel: {
+    searchGroupTerm = factory->getFilterHumanLabel();
+    break;
+  }
+  case FilterListView::SearchGroup::GroupName: {
+    searchGroupTerm = factory->getFilterGroup();
+    break;
+  }
+  case FilterListView::SearchGroup::SubgroupName: {
+    searchGroupTerm = factory->getFilterSubGroup();
+    break;
+  }
+  case FilterListView::SearchGroup::BrandingName: {
+    searchGroupTerm = factory->getBrandingString();
+    break;
+  }
+  case FilterListView::SearchGroup::CompiledLibraryName: {
+    searchGroupTerm = factory->getCompiledLibraryName();
+    break;
+  }
+  case FilterListView::SearchGroup::Keywords: {
+    // Implement Keywords
+    break;
+  }
   }
 
   QBitArray bitArray(searchTokens.size(), false);
@@ -352,36 +346,30 @@ int FilterListToolboxWidget::getMatchingRelevanceForFilter(QStringList searchTok
   QString searchGroupTerm = "";
   switch(searchGroup)
   {
-    case FilterListView::SearchGroup::HumanLabel:
-    {
-      searchGroupTerm = factory->getFilterHumanLabel();
-      break;
-    }
-    case FilterListView::SearchGroup::GroupName:
-    {
-      searchGroupTerm = factory->getFilterGroup();
-      break;
-    }
-    case FilterListView::SearchGroup::SubgroupName:
-    {
-      searchGroupTerm = factory->getFilterSubGroup();
-      break;
-    }
-    case FilterListView::SearchGroup::BrandingName:
-    {
-      searchGroupTerm = factory->getBrandingString();
-      break;
-    }
-    case FilterListView::SearchGroup::CompiledLibraryName:
-    {
-      searchGroupTerm = factory->getCompiledLibraryName();
-      break;
-    }
-    case FilterListView::SearchGroup::Keywords:
-    {
-      // Implement Keywords
-      break;
-    }
+  case FilterListView::SearchGroup::HumanLabel: {
+    searchGroupTerm = factory->getFilterHumanLabel();
+    break;
+  }
+  case FilterListView::SearchGroup::GroupName: {
+    searchGroupTerm = factory->getFilterGroup();
+    break;
+  }
+  case FilterListView::SearchGroup::SubgroupName: {
+    searchGroupTerm = factory->getFilterSubGroup();
+    break;
+  }
+  case FilterListView::SearchGroup::BrandingName: {
+    searchGroupTerm = factory->getBrandingString();
+    break;
+  }
+  case FilterListView::SearchGroup::CompiledLibraryName: {
+    searchGroupTerm = factory->getCompiledLibraryName();
+    break;
+  }
+  case FilterListView::SearchGroup::Keywords: {
+    // Implement Keywords
+    break;
+  }
   }
 
   QBitArray bitArray(searchTokens.size(), false);
@@ -472,7 +460,7 @@ QAction* FilterListToolboxWidget::getActiveSearchAction()
     return m_ActionAnyWords;
   }
 
-    return m_ActionAllWords;
+  return m_ActionAllWords;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
old mode 100755
new mode 100644
index 1fa24cc9c4..dae26af7f2
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,7 +41,6 @@
 #include <QtCore/QSignalMapper>
 #include <QtCore/QList>
 
-
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 
@@ -55,97 +54,94 @@
  */
 class SVWidgetsLib_EXPORT FilterListToolboxWidget : public QWidget, private Ui::FilterListToolboxWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    FilterListToolboxWidget(QWidget* parent = nullptr);
-    ~FilterListToolboxWidget() override;
+public:
+  FilterListToolboxWidget(QWidget* parent = nullptr);
+  ~FilterListToolboxWidget() override;
 
-    /**
-    * @brief Reads the preferences from the users pref file
-    */
-    void readSettings(QtSSettings* prefs);
+  /**
+   * @brief Reads the preferences from the users pref file
+   */
+  void readSettings(QtSSettings* prefs);
 
-    /**
-    * @brief Writes the preferences to the users pref file
-    */
-    void writeSettings(QtSSettings* prefs);
+  /**
+   * @brief Writes the preferences to the users pref file
+   */
+  void writeSettings(QtSSettings* prefs);
 
-  public slots:
+public slots:
 
-    /**
-    * @brief searchFilters triggered when the user types something in the Search Field
-    */
-    void searchFilters(QString text);
+  /**
+   * @brief searchFilters triggered when the user types something in the Search Field
+   */
+  void searchFilters(QString text);
 
-    /**
-     * @brief updateFilterList This method extracts all the names of the filters that have been
-     * loaded into the application
-     */
-    void loadFilterList();
+  /**
+   * @brief updateFilterList This method extracts all the names of the filters that have been
+   * loaded into the application
+   */
+  void loadFilterList();
 
-    /**
-    * @brief searchFieldsChanged
-    */
-    void searchFieldsChanged(bool isChecked);
+  /**
+   * @brief searchFieldsChanged
+   */
+  void searchFieldsChanged(bool isChecked);
 
-    /**
-    * @brief getActiveSearchAction
-    */
-    QAction* getActiveSearchAction();
+  /**
+   * @brief getActiveSearchAction
+   */
+  QAction* getActiveSearchAction();
 
-    /**
-    * @brief setActiveSearchAction
-    */
-    void setActiveSearchAction(QAction* action);
+  /**
+   * @brief setActiveSearchAction
+   */
+  void setActiveSearchAction(QAction* action);
 
-    /**
-    * @brief getActiveSearchAction
-    */
-    QList<QAction*> getSearchActionList();
+  /**
+   * @brief getActiveSearchAction
+   */
+  QList<QAction*> getSearchActionList();
 
-  protected:
-    /**
-     * @brief setupGui Called to get everything in the GUI setup correctly
-     */
-    void setupGui();
+protected:
+  /**
+   * @brief setupGui Called to get everything in the GUI setup correctly
+   */
+  void setupGui();
 
-    /**
-     * @brief setupSearchFieldActions
-     */
-    void setupSearchField();
+  /**
+   * @brief setupSearchFieldActions
+   */
+  void setupSearchField();
 
-  signals:
-    void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
+signals:
+  void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
 
-  private:
-    QMenu* m_ContextMenu;
-    QSignalMapper* m_Mapper;
+private:
+  QMenu* m_ContextMenu;
+  QSignalMapper* m_Mapper;
 
-    bool m_SearchAnyWords;
-    bool m_SearchExactPhrase;
-    bool m_SearchAllWords;
+  bool m_SearchAnyWords;
+  bool m_SearchExactPhrase;
+  bool m_SearchAllWords;
 
-    QAction* m_ActionAnyWords;
-    QAction* m_ActionExactPhrase;
-    QAction* m_ActionAllWords;
+  QAction* m_ActionAnyWords;
+  QAction* m_ActionExactPhrase;
+  QAction* m_ActionAllWords;
 
-    FilterManager::Collection  m_LoadedFilters;
+  FilterManager::Collection m_LoadedFilters;
 
-    QMap<QString, IFilterFactory::Pointer> getHumanNameMap(const QList<IFilterFactory::Pointer>& list);
+  QMap<QString, IFilterFactory::Pointer> getHumanNameMap(const QList<IFilterFactory::Pointer>& list);
 
-    void matchFiltersToSearchGroup(std::vector<IFilterFactory::Pointer> filters, QSet<IFilterFactory*>& addedFiltersSet, const QStringList& searchTokens, FilterListView::SearchGroup searchGroup);
+  void matchFiltersToSearchGroup(std::vector<IFilterFactory::Pointer> filters, QSet<IFilterFactory*>& addedFiltersSet, const QStringList& searchTokens, FilterListView::SearchGroup searchGroup);
 
-    int getMatchingWordCountForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
+  int getMatchingWordCountForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
 
-    int getMatchingRelevanceForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
+  int getMatchingRelevanceForFilter(QStringList searchTokens, IFilterFactory::Pointer filter, FilterListView::SearchGroup searchGroup);
 
-  public:
-    FilterListToolboxWidget(const FilterListToolboxWidget&) = delete; // Copy Constructor Not Implemented
-    FilterListToolboxWidget(FilterListToolboxWidget&&) = delete;      // Move Constructor Not Implemented
-    FilterListToolboxWidget& operator=(const FilterListToolboxWidget&) = delete; // Copy Assignment Not Implemented
-    FilterListToolboxWidget& operator=(FilterListToolboxWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  FilterListToolboxWidget(const FilterListToolboxWidget&) = delete;            // Copy Constructor Not Implemented
+  FilterListToolboxWidget(FilterListToolboxWidget&&) = delete;                 // Move Constructor Not Implemented
+  FilterListToolboxWidget& operator=(const FilterListToolboxWidget&) = delete; // Copy Assignment Not Implemented
+  FilterListToolboxWidget& operator=(FilterListToolboxWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
-
-
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.cpp b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
index 430839583b..ad657c7d56 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterListView.h"
 
@@ -63,7 +63,7 @@ FilterListView::FilterListView(QWidget* parent)
 
   setRootIsDecorated(false);
   setAttribute(Qt::WA_MacShowFocusRect, false);
-  
+
   FilterListModel* model = new FilterListModel(this);
   setModel(model);
 
@@ -82,7 +82,7 @@ void FilterListView::connectSignalsSlots()
 {
   connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(requestContextMenu(const QPoint&)));
 
-  connect(this, &FilterListView::doubleClicked, [=] (const QModelIndex &index) {
+  connect(this, &FilterListView::doubleClicked, [=](const QModelIndex& index) {
     FilterListModel* model = getFilterListModel();
 
     QString filterClassName = model->data(index, FilterListModel::Roles::ClassNameRole).toString();
@@ -156,38 +156,32 @@ void FilterListView::addGroup(SearchGroup group)
 
   QModelIndex index = model->index(row, FilterListModel::Column::Contents);
 
-  switch (group)
+  switch(group)
   {
-    case SearchGroup::HumanLabel:
-    {
-      model->setData(index, "Human Label", Qt::DisplayRole);
-      break;
-    }
-    case SearchGroup::GroupName:
-    {
-      model->setData(index, "Group Name", Qt::DisplayRole);
-      break;
-    }
-    case SearchGroup::SubgroupName:
-    {
-      model->setData(index, "Subgroup Name", Qt::DisplayRole);
-      break;
-    }
-    case SearchGroup::BrandingName:
-    {
-      model->setData(index, "Branding Name", Qt::DisplayRole);
-      break;
-    }
-    case SearchGroup::CompiledLibraryName:
-    {
-      model->setData(index, "Compiled Library Name", Qt::DisplayRole);
-      break;
-    }
-    case SearchGroup::Keywords:
-    {
-      model->setData(index, "Keywords", Qt::DisplayRole);
-      break;
-    }
+  case SearchGroup::HumanLabel: {
+    model->setData(index, "Human Label", Qt::DisplayRole);
+    break;
+  }
+  case SearchGroup::GroupName: {
+    model->setData(index, "Group Name", Qt::DisplayRole);
+    break;
+  }
+  case SearchGroup::SubgroupName: {
+    model->setData(index, "Subgroup Name", Qt::DisplayRole);
+    break;
+  }
+  case SearchGroup::BrandingName: {
+    model->setData(index, "Branding Name", Qt::DisplayRole);
+    break;
+  }
+  case SearchGroup::CompiledLibraryName: {
+    model->setData(index, "Compiled Library Name", Qt::DisplayRole);
+    break;
+  }
+  case SearchGroup::Keywords: {
+    model->setData(index, "Keywords", Qt::DisplayRole);
+    break;
+  }
   }
 
   m_SearchGroupIndexMap.insert(group, index);
@@ -200,14 +194,14 @@ void FilterListView::addGroup(SearchGroup group)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QModelIndex FilterListView::findIndexByName(const QString &name)
+QModelIndex FilterListView::findIndexByName(const QString& name)
 {
   FilterListModel* model = getFilterListModel();
-  for (int i = 0; i < model->rowCount(); i++)
+  for(int i = 0; i < model->rowCount(); i++)
   {
     QModelIndex index = model->index(i, FilterListModel::Column::Contents);
     QString filterHumanLabel = model->data(index, Qt::DisplayRole).toString();
-    if (filterHumanLabel == name)
+    if(filterHumanLabel == name)
     {
       return index;
     }
@@ -241,14 +235,14 @@ void FilterListView::keyPressEvent(QKeyEvent* event)
 void FilterListView::listenKeyPressed(QKeyEvent* event)
 {
   FilterListModel* model = getFilterListModel();
-  if (model->rowCount() > 0)
+  if(model->rowCount() > 0)
   {
     QModelIndexList selectedIndexes = selectionModel()->selectedRows();
 
     if(event->key() == Qt::Key_Down)
     {
       QModelIndex index = findNextSelectableIndex();
-      if (index.isValid())
+      if(index.isValid())
       {
         scrollTo(index);
         selectionModel()->select(index, QItemSelectionModel::SelectCurrent);
@@ -260,9 +254,9 @@ void FilterListView::listenKeyPressed(QKeyEvent* event)
     if(event->key() == Qt::Key_Up)
     {
       QModelIndex index = findPreviousSelectableIndex();
-      if (index.isValid())
+      if(index.isValid())
       {
-        if (index.row() == 0)
+        if(index.row() == 0)
         {
           scrollTo(index.parent());
         }
@@ -303,12 +297,12 @@ QModelIndex FilterListView::findNextSelectableIndex()
   FilterListModel* model = getFilterListModel();
 
   QModelIndexList selectedIndexes = selectionModel()->selectedRows();
-  if (selectedIndexes.size() > 1)
+  if(selectedIndexes.size() > 1)
   {
     return QModelIndex();
   }
 
-  if (selectedIndexes.isEmpty())
+  if(selectedIndexes.isEmpty())
   {
     QModelIndex parent = model->index(0, FilterListModel::Column::Contents);
     return model->index(0, FilterListModel::Column::Contents, parent);
@@ -316,15 +310,15 @@ QModelIndex FilterListView::findNextSelectableIndex()
 
   QModelIndex parent = selectedIndexes[0].parent();
 
-  if (selectedIndexes[0].row() == (model->rowCount(parent) - 1))
+  if(selectedIndexes[0].row() == (model->rowCount(parent) - 1))
   {
     QModelIndex nextParent = model->index(parent.row() + 1, FilterListModel::Column::Contents);
-    if (nextParent.isValid())
+    if(nextParent.isValid())
     {
       return model->index(0, FilterListModel::Column::Contents, nextParent);
     }
 
-      return selectedIndexes[0];
+    return selectedIndexes[0];
   }
 
   return model->index(selectedIndexes[0].row() + 1, FilterListModel::Column::Contents, parent);
@@ -340,22 +334,22 @@ QModelIndex FilterListView::findPreviousSelectableIndex()
   FilterListModel* model = getFilterListModel();
 
   QModelIndexList selectedIndexes = selectionModel()->selectedRows();
-  if (selectedIndexes.size() > 1)
+  if(selectedIndexes.size() > 1)
   {
     return QModelIndex();
   }
 
-  if (selectedIndexes.isEmpty())
+  if(selectedIndexes.isEmpty())
   {
     return QModelIndex();
   }
 
   QModelIndex parent = selectedIndexes[0].parent();
 
-  if (selectedIndexes[0].row() == 0)
+  if(selectedIndexes[0].row() == 0)
   {
     QModelIndex previousParent = model->index(parent.row() - 1, FilterListModel::Column::Contents);
-    if (previousParent.isValid())
+    if(previousParent.isValid())
     {
       return model->index(model->rowCount(previousParent) - 1, FilterListModel::Column::Contents, previousParent);
     }
@@ -436,7 +430,7 @@ void FilterListView::requestContextMenu(const QPoint& pos)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterListView::launchHelpForItem(const QString &humanLabel)
+void FilterListView::launchHelpForItem(const QString& humanLabel)
 {
   FilterManager* fm = FilterManager::Instance();
   if(nullptr == fm)
@@ -463,13 +457,13 @@ void FilterListView::launchHelpForItem(const QString &humanLabel)
 //
 // -----------------------------------------------------------------------------
 void FilterListView::performDrag()
-{  
+{
   QModelIndex index = indexAt(m_StartPos);
   if(index.isValid())
   {
     FilterListModel* model = getFilterListModel();
 
-    if (static_cast<FilterListItem::ItemType>(model->data(index, FilterListModel::ItemTypeRole).toInt()) == FilterListItem::ItemType::Filter)
+    if(static_cast<FilterListItem::ItemType>(model->data(index, FilterListModel::ItemTypeRole).toInt()) == FilterListItem::ItemType::Filter)
     {
       QJsonObject obj;
       QString filterHumanLabel = model->data(index, Qt::DisplayRole).toString();
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.h b/Source/SVWidgetsLib/Widgets/FilterListView.h
old mode 100755
new mode 100644
index b51e164ad7..6c8fc0bfe5
--- a/Source/SVWidgetsLib/Widgets/FilterListView.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QTreeView>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -49,139 +48,139 @@ class FilterListModel;
  */
 class SVWidgetsLib_EXPORT FilterListView : public QTreeView
 {
-    Q_OBJECT
-
-  public:
-    /**
-    * @brief FilterListView
-    * @param parent
-    */
-    FilterListView(QWidget* parent = nullptr);
-
-    /**
-    * @brief ~FilterListView()
-    */
-    ~FilterListView() override;
-
-    enum class SearchGroup : unsigned int
-    {
-      HumanLabel,
-      GroupName,
-      SubgroupName,
-      BrandingName,
-      CompiledLibraryName,
-      Keywords
-    };
-
-    /**
-     * @brief addFilter
-     * @param filter
-     */
-    void addFilter(const IFilterFactory::Pointer& factory);
-
-    /**
-     * @brief addFilter
-     * @param filter
-     * @param group
-     */
-    void addFilter(const IFilterFactory::Pointer& factory, SearchGroup group);
-
-    /**
-     * @brief addGroup
-     * @param group
-     */
-    void addGroup(SearchGroup group);
-
-    /**
-     * @brief findIndexByName
-     * @param name
-     * @return
-     */
-    QModelIndex findIndexByName(const QString &name);
-
-    /**
-     * @brief clear
-     */
-    void clear();
-
-  public slots:
-    /**
-     * @brief listenKeyPressed
-     * @param event
-     */
-    void listenKeyPressed(QKeyEvent* event);
-
-  protected:
-    /**
-    * @brief Detect a key press
-    */
-    void keyPressEvent(QKeyEvent* event) override;
-
-    /**
-    * @brief mousePressEvent
-    * @param event
-    */
-    void mousePressEvent(QMouseEvent* event) override;
-
-    /**
-     * @brief mouseMoveEvent
-     * @param event
-     */
-    void mouseMoveEvent(QMouseEvent* event) override;
-
-  signals:
-    void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
-
-  private slots:
-    /**
-     * @brief requestContextMenu
-     * @param pos
-     */
-    void requestContextMenu(const QPoint &pos);
-
-  private:
-    QPoint m_StartPos;
-
-    QMap<SearchGroup, QPersistentModelIndex> m_SearchGroupIndexMap;
-
-    /**
-     * @brief addFilter
-     * @param filter
-     * @param parent
-     */
-    void addFilter(const IFilterFactory::Pointer &factory, const QModelIndex &parent);
-
-    /**
-     * @brief connectSignalsSlots
-     */
-    void connectSignalsSlots();
-
-    /**
-     * @brief performDrag
-     */
-    void performDrag();
-
-    /**
-    * @brief launchHelpForItem
-    * @param name
-    */
-    void launchHelpForItem(const QString &name);
-
-    /**
-     * @brief findFirstSelectableIndex
-     * @return
-     */
-    QModelIndex findNextSelectableIndex();
-
-    /**
-     * @brief findPreviousSelectableIndex
-     * @return
-     */
-    QModelIndex findPreviousSelectableIndex();
-
-    /**
-     * @brief getFilterListModel
-     * @return
-     */
-    FilterListModel* getFilterListModel();
+  Q_OBJECT
+
+public:
+  /**
+   * @brief FilterListView
+   * @param parent
+   */
+  FilterListView(QWidget* parent = nullptr);
+
+  /**
+   * @brief ~FilterListView()
+   */
+  ~FilterListView() override;
+
+  enum class SearchGroup : unsigned int
+  {
+    HumanLabel,
+    GroupName,
+    SubgroupName,
+    BrandingName,
+    CompiledLibraryName,
+    Keywords
+  };
+
+  /**
+   * @brief addFilter
+   * @param filter
+   */
+  void addFilter(const IFilterFactory::Pointer& factory);
+
+  /**
+   * @brief addFilter
+   * @param filter
+   * @param group
+   */
+  void addFilter(const IFilterFactory::Pointer& factory, SearchGroup group);
+
+  /**
+   * @brief addGroup
+   * @param group
+   */
+  void addGroup(SearchGroup group);
+
+  /**
+   * @brief findIndexByName
+   * @param name
+   * @return
+   */
+  QModelIndex findIndexByName(const QString& name);
+
+  /**
+   * @brief clear
+   */
+  void clear();
+
+public slots:
+  /**
+   * @brief listenKeyPressed
+   * @param event
+   */
+  void listenKeyPressed(QKeyEvent* event);
+
+protected:
+  /**
+   * @brief Detect a key press
+   */
+  void keyPressEvent(QKeyEvent* event) override;
+
+  /**
+   * @brief mousePressEvent
+   * @param event
+   */
+  void mousePressEvent(QMouseEvent* event) override;
+
+  /**
+   * @brief mouseMoveEvent
+   * @param event
+   */
+  void mouseMoveEvent(QMouseEvent* event) override;
+
+signals:
+  void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
+
+private slots:
+  /**
+   * @brief requestContextMenu
+   * @param pos
+   */
+  void requestContextMenu(const QPoint& pos);
+
+private:
+  QPoint m_StartPos;
+
+  QMap<SearchGroup, QPersistentModelIndex> m_SearchGroupIndexMap;
+
+  /**
+   * @brief addFilter
+   * @param filter
+   * @param parent
+   */
+  void addFilter(const IFilterFactory::Pointer& factory, const QModelIndex& parent);
+
+  /**
+   * @brief connectSignalsSlots
+   */
+  void connectSignalsSlots();
+
+  /**
+   * @brief performDrag
+   */
+  void performDrag();
+
+  /**
+   * @brief launchHelpForItem
+   * @param name
+   */
+  void launchHelpForItem(const QString& name);
+
+  /**
+   * @brief findFirstSelectableIndex
+   * @return
+   */
+  QModelIndex findNextSelectableIndex();
+
+  /**
+   * @brief findPreviousSelectableIndex
+   * @return
+   */
+  QModelIndex findPreviousSelectableIndex();
+
+  /**
+   * @brief getFilterListModel
+   * @return
+   */
+  FilterListModel* getFilterListModel();
 };
diff --git a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
index 6cc4c6dbf2..0f9eda630d 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "FilterListWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListWidget.h b/Source/SVWidgetsLib/Widgets/FilterListWidget.h
old mode 100755
new mode 100644
index 3d877019eb..8959168476
--- a/Source/SVWidgetsLib/Widgets/FilterListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListWidget.h
@@ -1,70 +1,66 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QPoint>
 #include <QtWidgets/QListWidget>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 /*
  *
  */
-class SVWidgetsLib_EXPORT FilterListWidget: public QListWidget
+class SVWidgetsLib_EXPORT FilterListWidget : public QListWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    FilterListWidget(QWidget* parent = nullptr);
-    ~FilterListWidget() override;
+public:
+  FilterListWidget(QWidget* parent = nullptr);
+  ~FilterListWidget() override;
 
-  protected:
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void dragEnterEvent(QDragEnterEvent* event) override;
-    void dragMoveEvent(QDragMoveEvent* event) override;
-    void dropEvent(QDropEvent* event) override;
+protected:
+  void mousePressEvent(QMouseEvent* event) override;
+  void mouseMoveEvent(QMouseEvent* event) override;
+  void dragEnterEvent(QDragEnterEvent* event) override;
+  void dragMoveEvent(QDragMoveEvent* event) override;
+  void dropEvent(QDropEvent* event) override;
 
-  private:
-    QPoint startPos;
+private:
+  QPoint startPos;
 
-    void performDrag();
+  void performDrag();
 
-    const QPixmap CreateDragIcon(QString text);
+  const QPixmap CreateDragIcon(QString text);
 };
-
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
index ac5776ff31..4b7a0cc290 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ASCIIDataItem.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
index e29afe9f03..3c8472eff7 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -60,9 +60,9 @@ class ASCIIDataItem
   void setOriginalString(const QString& value);
 
 private:
-  QVector<QVariant>                                             m_ItemData;
+  QVector<QVariant> m_ItemData;
 
-  QString                                                       m_OriginalString;
+  QString m_OriginalString;
 
 public:
   ASCIIDataItem(const ASCIIDataItem&) = delete;            // Copy Constructor Not Implemented
@@ -70,4 +70,3 @@ class ASCIIDataItem
   ASCIIDataItem& operator=(const ASCIIDataItem&) = delete; // Copy Assignment Not Implemented
   ASCIIDataItem& operator=(ASCIIDataItem&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
index 6a09e96fe3..ac104369b9 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ASCIIDataModel.h"
 
@@ -83,9 +83,9 @@ QVariant ASCIIDataModel::data(const QModelIndex& index, int role) const
       return dataType;
     }
 
-      QModelIndex actualIndex = this->index(index.row() - 1, index.column());
-      ASCIIDataItem* item = getItem(actualIndex);
-      return item->data(index.column());
+    QModelIndex actualIndex = this->index(index.row() - 1, index.column());
+    ASCIIDataItem* item = getItem(actualIndex);
+    return item->data(index.column());
   }
   if(role == Qt::FontRole)
   {
@@ -108,7 +108,7 @@ QVariant ASCIIDataModel::data(const QModelIndex& index, int role) const
       return QColor(255, 191, 193);
     }
 
-      return QVariant();
+    return QVariant();
   }
 
   return QVariant();
@@ -165,7 +165,7 @@ QVariant ASCIIDataModel::headerData(int section, Qt::Orientation orientation, in
       return "Data Type";
     }
 
-      return m_VerticalHeaders[section - 1];
+    return m_VerticalHeaders[section - 1];
   }
 
   return QVariant();
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
index b82d5fbfad..7de3bb394a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
@@ -1,43 +1,42 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
 #include <QtCore/QAbstractTableModel>
 
-
 class ASCIIDataItem;
 
 class ASCIIDataModel : public QAbstractTableModel
@@ -65,7 +64,7 @@ class ASCIIDataModel : public QAbstractTableModel
   QVariant data(const QModelIndex& index, int role) const override;
   QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
 
-  bool setHeaderData(int section, Qt::Orientation orientation, const QVariant & value, int role = Qt::DisplayRole) override;
+  bool setHeaderData(int section, Qt::Orientation orientation, const QVariant& value, int role = Qt::DisplayRole) override;
 
   int rowCount(const QModelIndex& parent = QModelIndex()) const override;
   int columnCount(const QModelIndex& parent = QModelIndex()) const override;
@@ -92,17 +91,16 @@ class ASCIIDataModel : public QAbstractTableModel
   void setOriginalString(int row, const QString& value);
 
 protected:
-
 private:
-  static ASCIIDataModel*                            self;
+  static ASCIIDataModel* self;
 
-  QVector<ASCIIDataItem*>                           m_TableItems;
+  QVector<ASCIIDataItem*> m_TableItems;
 
-  QVector<QString>                                  m_HorizontalHeaders;
-  QVector<QString>                                  m_VerticalHeaders;
+  QVector<QString> m_HorizontalHeaders;
+  QVector<QString> m_VerticalHeaders;
 
-  QVector<QString>                                  m_ColumnDataType;
-  QVector<bool>                                     m_ColumnHasErrors;
+  QVector<QString> m_ColumnDataType;
+  QVector<bool> m_ColumnHasErrors;
 
   ASCIIDataItem* getItem(const QModelIndex& index) const;
 
@@ -112,4 +110,3 @@ class ASCIIDataModel : public QAbstractTableModel
   ASCIIDataModel& operator=(const ASCIIDataModel&) = delete; // Copy Assignment Not Implemented
   ASCIIDataModel& operator=(ASCIIDataModel&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
index c24243d26a..c597ff6222 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "AbstractWizardPage.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
index 5172c84bad..29d05a2429 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -42,28 +41,27 @@ class AbstractWizardPage : public QWizardPage
 {
   Q_OBJECT
 
-  public:
-    ~AbstractWizardPage() override;
+public:
+  ~AbstractWizardPage() override;
 
-    /**
-    * @brief Polymorphic function that refreshes the model based on what page we are currently on
-    */
-    virtual void refreshModel();
+  /**
+   * @brief Polymorphic function that refreshes the model based on what page we are currently on
+   */
+  virtual void refreshModel();
 
-    /**
-    * @brief Controls which page to navigate to after the user clicks "Next" button
-    */
-    int nextId() const override;
+  /**
+   * @brief Controls which page to navigate to after the user clicks "Next" button
+   */
+  int nextId() const override;
 
-  protected:
-    AbstractWizardPage(const QString &inputFilePath, QWidget* parent = nullptr);
+protected:
+  AbstractWizardPage(const QString& inputFilePath, QWidget* parent = nullptr);
 
-    QString                                         m_InputFilePath;
+  QString m_InputFilePath;
 
-  public:
-    AbstractWizardPage(const AbstractWizardPage&) = delete; // Copy Constructor Not Implemented
-    AbstractWizardPage(AbstractWizardPage&&) = delete;      // Move Constructor Not Implemented
-    AbstractWizardPage& operator=(const AbstractWizardPage&) = delete; // Copy Assignment Not Implemented
-    AbstractWizardPage& operator=(AbstractWizardPage&&) = delete;      // Move Assignment Not Implemented
+public:
+  AbstractWizardPage(const AbstractWizardPage&) = delete;            // Copy Constructor Not Implemented
+  AbstractWizardPage(AbstractWizardPage&&) = delete;                 // Move Constructor Not Implemented
+  AbstractWizardPage& operator=(const AbstractWizardPage&) = delete; // Copy Assignment Not Implemented
+  AbstractWizardPage& operator=(AbstractWizardPage&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 13640e0ca4..51176ca46b 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DataFormatPage.h"
 
@@ -56,7 +56,7 @@
 
 namespace Detail
 {
-  const QString Delimiter(" / ");
+const QString Delimiter(" / ");
 }
 
 // -----------------------------------------------------------------------------
@@ -112,11 +112,11 @@ void DataFormatPage::setupGui()
   dataTypeCB->addItems(dataTypes);
   dataTypeCB->setCurrentIndex(0);
 
-  //int beginIndex = startRowSpin->value();
+  // int beginIndex = startRowSpin->value();
   int numOfDataLines = m_NumLines;
   linesImportedLabel->setText(QString::number(numOfDataLines));
   linesInFileLabel->setText(QString::number(m_NumLines));
-//  amTuplesLabel->setText(QString::number(numOfDataLines));
+  //  amTuplesLabel->setText(QString::number(numOfDataLines));
 
   tupleDimsTable->blockSignals(true);
   tupleDimsTable->addTupleDimensions(std::vector<size_t>(1, numOfDataLines));
@@ -126,12 +126,10 @@ void DataFormatPage::setupGui()
   selectedAMBtn->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(false));
 
   m_AMMenuMapper = new QSignalMapper(this);
-  connect(m_AMMenuMapper, SIGNAL(mapped(QString)),
-            this, SLOT(amItemSelected(QString)));
+  connect(m_AMMenuMapper, SIGNAL(mapped(QString)), this, SLOT(amItemSelected(QString)));
 
   m_DCMenuMapper = new QSignalMapper(this);
-  connect(m_DCMenuMapper, SIGNAL(mapped(QString)),
-            this, SLOT(dcItemSelected(QString)));
+  connect(m_DCMenuMapper, SIGNAL(mapped(QString)), this, SLOT(dcItemSelected(QString)));
 
   editHeadersBtn->setDisabled(true);
   columnDataGroupBox->setDisabled(true);
@@ -156,7 +154,6 @@ void DataFormatPage::setupGui()
 
   createDCSelectionMenu();
   createAMSelectionMenu();
-
 }
 
 // -----------------------------------------------------------------------------
@@ -188,13 +185,13 @@ void DataFormatPage::setUseCustomHeaders(bool value)
 // -----------------------------------------------------------------------------
 void DataFormatPage::setHeaderLine(int line)
 {
-  if(line >= 0) {
+  if(line >= 0)
+  {
     hasHeadersRadio->setChecked(true);
     headersIndexLineEdit->setText(QString::number(line));
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -230,14 +227,14 @@ void DataFormatPage::showEvent(QShowEvent* event)
     }
   }
 
-//  if (amAutomatically->isChecked())
-//  {
-//    tupleDimsGB->hide();
-//  }
-//  else
-//  {
-//    tupleDimsGB->show();
-//  }
+  //  if (amAutomatically->isChecked())
+  //  {
+  //    tupleDimsGB->hide();
+  //  }
+  //  else
+  //  {
+  //    tupleDimsGB->show();
+  //  }
 
   if(isComplete())
   {
@@ -258,7 +255,7 @@ void DataFormatPage::amItemSelected(QString path)
 
   DataArrayPath dap = DataArrayPath::Deserialize(path, Detail::Delimiter);
 
-  AttributeMatrix::Pointer am = m_Dca->getAttributeMatrix(dap);   // This will always be valid, because we create the selection options
+  AttributeMatrix::Pointer am = m_Dca->getAttributeMatrix(dap); // This will always be valid, because we create the selection options
 
   if(nullptr == am.get())
   {
@@ -267,24 +264,27 @@ void DataFormatPage::amItemSelected(QString path)
   }
   else
   {
-    //amSelectionError->hide();
+    // amSelectionError->hide();
     amSelectionError->setText("The tuple dimensions of the selected Attribute Matrix will be used for the Attribute Arrays.");
     selectedAMBtn->setStyleSheet(SVStyle::Instance()->QToolSelectionButtonStyle(true));
   }
 
   ImportASCIIDataWizard* importWizard = dynamic_cast<ImportASCIIDataWizard*>(wizard());
-  if (importWizard == nullptr) { return; }
+  if(importWizard == nullptr)
+  {
+    return;
+  }
 
   QStringList headers = importWizard->getHeaders();
 
   QStringList amArrays = am->getAttributeArrayNames();
-  for (int i = 0; i < amArrays.size(); i++)
+  for(int i = 0; i < amArrays.size(); i++)
   {
     QString amArrayName = amArrays[i];
-    for (int j = 0; j < headers.size(); j++)
+    for(int j = 0; j < headers.size(); j++)
     {
       QString headerName = headers[j];
-      if (amArrayName == headerName)
+      if(amArrayName == headerName)
       {
         QString ss = "The header name \"" + headerName + "\" matches an array name that already exists in the selected attribute matrix.";
         amSelectionError->setText(ss);
@@ -363,11 +363,9 @@ void DataFormatPage::on_useAMRadio_toggled(bool b)
     {
       emit completeChanged();
     }
-
   }
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -393,14 +391,13 @@ void DataFormatPage::on_applyChangesBtn_clicked()
   QPointer<QtSFaderWidget> faderWidget = new QtSFaderWidget(applyChangesBtn);
   m_FaderWidget = faderWidget;
 
-  if (m_FaderWidget != nullptr)
+  if(m_FaderWidget != nullptr)
   {
     m_FaderWidget->close();
   }
   m_FaderWidget = new QtSFaderWidget(applyChangesBtn);
   m_FaderWidget->setFadeOut();
-  connect(m_FaderWidget, SIGNAL(animationComplete()),
-    this, SLOT(hideButton()));
+  connect(m_FaderWidget, SIGNAL(animationComplete()), this, SLOT(hideButton()));
   m_FaderWidget->start();
 
   dcItemSelected(selectedDCBtn->text());
@@ -455,10 +452,10 @@ void DataFormatPage::createAMSelectionMenu()
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
   DataContainerArray::Container containers = dca->getDataContainers();
-  QVector<QString> daTypes;// = m_FilterParameter->getDefaultAttributeArrayTypes();
-  QVector<std::vector<size_t>> cDims;// = m_FilterParameter->getDefaultComponentDimensions();
-  QVector<AttributeMatrix::Type> amTypes;// = m_FilterParameter->getDefaultAttributeMatrixTypes();
-  IGeometry::Types geomTypes;// = m_FilterParameter->getDefaultGeometryTypes();
+  QVector<QString> daTypes;               // = m_FilterParameter->getDefaultAttributeArrayTypes();
+  QVector<std::vector<size_t>> cDims;     // = m_FilterParameter->getDefaultComponentDimensions();
+  QVector<AttributeMatrix::Type> amTypes; // = m_FilterParameter->getDefaultAttributeMatrixTypes();
+  IGeometry::Types geomTypes;             // = m_FilterParameter->getDefaultGeometryTypes();
 
   for(DataContainer::Pointer dc : containers)
   {
@@ -511,7 +508,7 @@ void DataFormatPage::createAMSelectionMenu()
 // -----------------------------------------------------------------------------
 void DataFormatPage::createDCSelectionMenu()
 {
-   // Now get the DataContainerArray from the Filter instance
+  // Now get the DataContainerArray from the Filter instance
   // We are going to use this to get all the current DataContainers
   DataContainerArray::Pointer dca = m_Dca;
   if(nullptr == dca.get())
@@ -575,9 +572,9 @@ void DataFormatPage::createDCSelectionMenu()
 // -----------------------------------------------------------------------------
 bool DataFormatPage::eventFilter(QObject* obj, QEvent* event)
 {
-  if (event->type() == QEvent::Show)
+  if(event->type() == QEvent::Show)
   {
-    if (obj == selectedAMBtn->menu())
+    if(obj == selectedAMBtn->menu())
     {
       QPoint pos = adjustedMenuPosition(selectedAMBtn);
       selectedAMBtn->menu()->move(pos);
@@ -653,7 +650,7 @@ QPoint DataFormatPage::adjustedMenuPosition(QPushButton* pushButton)
   QPoint localButtonCoords = pushButton->geometry().bottomLeft();
   QPoint globalButtonCoords = mapToGlobal(localButtonCoords);
 
-  //point.setY(globalButtonCoords.y());
+  // point.setY(globalButtonCoords.y());
 
   int screenNum = QApplication::desktop()->screenNumber(pushButton);
   int desktopHeight = screens.at(screenNum)->availableGeometry().height();
@@ -676,7 +673,7 @@ void DataFormatPage::on_startRowSpin_valueChanged(int value)
   if(value > m_NumLines)
   {
     wizard()->button(QWizard::FinishButton)->setDisabled(true);
-//    amTuplesLabel->setText("ERR");
+    //    amTuplesLabel->setText("ERR");
     return;
   }
 
@@ -735,15 +732,13 @@ bool DataFormatPage::isComplete() const
 
   bool stage2 = true;
 
-  if (useAMRadio->isChecked()
-      && selectedAMBtn->text().isEmpty())
+  if(useAMRadio->isChecked() && selectedAMBtn->text().isEmpty())
   {
     stage2 = false;
   }
 
   bool stage3 = true;
-  if (createAMRadio->isChecked()
-      && ( selectedDCBtn->text().isEmpty() || amName->text().isEmpty() ) )
+  if(createAMRadio->isChecked() && (selectedDCBtn->text().isEmpty() || amName->text().isEmpty()))
   {
     stage3 = false;
   }
@@ -787,14 +782,14 @@ void DataFormatPage::on_doesNotHaveHeadersRadio_toggled(bool checked)
     headersIndexLineEdit->setDisabled(true);
 
     QVector<QString> headers;
-    if (m_EditHeadersDialog != nullptr)
+    if(m_EditHeadersDialog != nullptr)
     {
       headers = m_EditHeadersDialog->getHeaders();
     }
 
     for(int i = 0; i < m_ASCIIDataModel->columnCount(); i++)
     {
-      if (i < headers.size())
+      if(i < headers.size())
       {
         m_ASCIIDataModel->setHeaderData(i, Qt::Horizontal, headers[i], Qt::DisplayRole);
       }
@@ -822,7 +817,7 @@ void DataFormatPage::on_useDefaultHeaders_toggled(bool checked)
 
     for(int i = 0; i < m_ASCIIDataModel->columnCount(); i++)
     {
-      QString arrayName = "Array " + QString::number(i+1);
+      QString arrayName = "Array " + QString::number(i + 1);
       m_ASCIIDataModel->setHeaderData(i, Qt::Horizontal, arrayName, Qt::DisplayRole);
     }
 
@@ -969,11 +964,11 @@ bool DataFormatPage::checkTupleDimensions(std::vector<size_t> tupleDims)
     return false;
   }
 
-    tupleTableErrLabel->setText("");
-    tupleTableErrLabel->hide();
-    m_TupleDimsHasErrors = false;
-    emit completeChanged();
-    return true;
+  tupleTableErrLabel->setText("");
+  tupleTableErrLabel->hide();
+  m_TupleDimsHasErrors = false;
+  emit completeChanged();
+  return true;
 }
 
 // -----------------------------------------------------------------------------
@@ -987,7 +982,7 @@ bool DataFormatPage::validateTupleDimensions(std::vector<size_t> tupleDims)
   {
     tupleTotal = tupleTotal * tupleDims[i];
   }
-//  amTuplesLabel->setText(QString::number(tupleTotal));
+  //  amTuplesLabel->setText(QString::number(tupleTotal));
   size_t beginIndex = static_cast<size_t>(startRowSpin->value());
   size_t numOfDataLines = m_NumLines - beginIndex + 1;
   return tupleTotal == numOfDataLines;
@@ -1235,9 +1230,9 @@ bool DataFormatPage::validateHeaders(QVector<QString> headers)
     return false;
   }
 
-    arrayErrLabel->setText("");
-    arrayErrLabel->hide();
-    return true;
+  arrayErrLabel->setText("");
+  arrayErrLabel->hide();
+  return true;
 }
 
 // -----------------------------------------------------------------------------
@@ -1269,18 +1264,18 @@ bool DataFormatPage::getAutomaticAM()
 // -----------------------------------------------------------------------------
 DataArrayPath DataFormatPage::getSelectedPath()
 {
-  if (createAMRadio->isChecked())
+  if(createAMRadio->isChecked())
   {
     return DataArrayPath::Deserialize(selectedDCBtn->text(), Detail::Delimiter);
   }
 
-    return DataArrayPath::Deserialize(selectedAMBtn->text(), Detail::Delimiter);
+  return DataArrayPath::Deserialize(selectedAMBtn->text(), Detail::Delimiter);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataFormatPage::setAutomaticAttrMatrixName(const QString &name)
+void DataFormatPage::setAutomaticAttrMatrixName(const QString& name)
 {
   amName->setText(name);
 }
@@ -1288,7 +1283,7 @@ void DataFormatPage::setAutomaticAttrMatrixName(const QString &name)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataFormatPage::setAutomaticAttrMatrixName(const DataArrayPath &path)
+void DataFormatPage::setAutomaticAttrMatrixName(const DataArrayPath& path)
 {
   amName->setText(path.getAttributeMatrixName());
   selectedDCBtn->setText(path.getDataContainerName());
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index 80dbdce621..ad70369a3c 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -61,250 +60,248 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
 {
   Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DataFormatPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
-
-    ~DataFormatPage() override;
-
-    /**
-     * @brief Initializes some of the GUI elements with selections or other GUI related items
-     */
-    virtual void setupGui();
-
-    /**
-    * @brief Refreshes the model
-    */
-    void refreshModel() override;
-
-    /**
-    * @brief Launches the "Edit Headers" dialog
-    */
-    void launchEditHeadersDialog();
-
-    /**
-     * @brief checkHeaders
-     */
-    void checkHeaders();
-
-    /**
-     * @brief checkHeaders
-     * @param headers
-     */
-    void checkHeaders(QVector<QString> headers);
-
-    /**
-    * @brief Controls which page to navigate to after the user clicks "Next" button
-    */
-    int nextId() const override;
-
-    /**
-    * @brief Resets the page when the user hits the "Back" button
-    */
-    void cleanupPage() override;
-
-    /**
-     * @brief isComplete
-     * @return
-     */
-    bool isComplete() const override;
-
-    /**
-     * @brief getTupleTable
-     * @return
-     */
-    TupleTableWidget* getTupleTable();
-
-    /**
-     * @brief setAutomaticAM
-     * @param automatic
-     */
-    void setAutomaticAM(bool automatic);
-
-    /**
-     * @brief getAutomaticAM
-     * @return
-     */
-    bool getAutomaticAM();
-
-    /**
-     * @brief getSelectedPath
-     * @return
-     */
-    DataArrayPath getSelectedPath();
-
-    /**
-     * @brief setAutomaticAttrMatrixName
-     * @param name
-     */
-    void setAutomaticAttrMatrixName(const QString &name);
-
-    /**
-     * @brief setAutomaticAttrMatrixName
-     * @param path
-     */
-    void setAutomaticAttrMatrixName(const DataArrayPath &path);
-
-    /**
-     * @brief getAMName
-     * @return
-     */
-    QString getAutomaticAttrMatrixName();
-
-    /**
-     * @brief setAttributeMatrixType
-     * @param t
-     */
-    void setAttributeMatrixType(int t);
-
-    /**
-     * @brief getAttributeMatrixType
-     * @return
-     */
-    int getAttributeMatrixType();
-
-    /**
-     * @brief setUseDefaultHeaders
-     * @param ok
-     */
-    void setUseDefaultHeaders(bool ok);
-
-    /**
-     * @brief setUseCustomHeaders
-     * @param value
-     */
-    void setUseCustomHeaders(bool value);
-
-    /**
-     * @brief setHeaderLine
-     * @param line
-     */
-    void setHeaderLine(int line);
-
-    /**
-     * @brief setEditSettings
-     * @param value
-     */
-    void setEditSettings(bool value);
-
-    /**
-     * @brief eventFilter
-     * @param obj
-     * @param event
-     * @return
-     */
-    bool eventFilter(QObject* obj, QEvent* event) override;
-
-    /**
-    * @brief Handle DataArrayPath changes if necessary
-    * @param renamePath
-    */
-    void updateDataArrayPath(DataArrayPath::RenameType renamePath);
-
-  public slots:
-    /**
-     * @brief dcaItemSelected
-     * @param path
-     */
-    void amItemSelected(QString path);
-
-    /**
-     * @brief dcaItemSelected
-     * @param path
-     */
-    void dcItemSelected(QString path);
-
-    /**
-     * @brief on_amName_returnPressed
-     */
-//    void on_amName_returnPressed();
-
-    /**
-     * @brief on_applyChangesBtn_clicked
-     */
-    void on_applyChangesBtn_clicked();
-
-    /**
-     * @brief hideButton
-     */
-    void hideButton();
-
-    /**
-     * @brief widgetChanged
-     * @param msg
-     */
-    void widgetChanged(const QString& msg);
-
-  protected:
-    /**
-     * @brief showEvent
-     * @param event
-     */
-    void showEvent(QShowEvent* event) override;
-
-    /**
-     * @brief adjustedMenuPosition
-     * @param pushButton
-     * @return
-     */
-    QPoint adjustedMenuPosition(QPushButton* pushButton);
-
-    void createDCSelectionMenu();
-    void createAMSelectionMenu();
-
-
-  private slots:
-    void on_startRowSpin_valueChanged(int i);
-    void on_hasHeadersRadio_toggled(bool checked);
-    void on_doesNotHaveHeadersRadio_toggled(bool checked);
-    void on_useDefaultHeaders_toggled(bool checked);
-
-    void on_headersIndexLineEdit_textChanged(const QString &text);
-    void on_editHeadersBtn_clicked();
-    void on_dataTypeRadio_clicked();
-    void on_skipRadio_clicked();
-    void on_dataTypeCB_currentTextChanged(const QString &text);
-
-    void on_amName_returnPressed();
-
-    void updateSelection(const QItemSelection &selected, const QItemSelection &deselected);
-    bool checkTupleDimensions(std::vector<size_t> tupleDims);
-
-    void on_createAMRadio_toggled(bool b);
-    void on_useAMRadio_toggled(bool b);
-
-  private:
-    int                                             m_NumLines = -1;
-    EditHeadersDialog*                              m_EditHeadersDialog = nullptr;
-    DataContainerArrayShPtrType m_Dca;
-    QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
-    QSignalMapper*                                  m_AMMenuMapper = nullptr;
-    QSignalMapper*                                  m_DCMenuMapper = nullptr;
-
-    QPointer<QtSFaderWidget>                        m_FaderWidget;
-    bool                                            m_EditSettings = false;
-
-    QMenu*                                          m_DCMenuPtr = nullptr;
-    bool                                            m_OwnsDCMenuPtr = false;
-
-    QMenu*                                          m_AttrMatMenuPtr = nullptr;
-    bool                                            m_OwnsAttrMatMenuPtr = false;
-
-    bool                                            m_TupleDimsHasErrors = false;
-    bool                                            m_HeadersHasErrors = false;
-
-    bool validateHeaders(QVector<QString> headers);
-    bool validateTupleDimensions(std::vector<size_t> tupleDims);
-  
-  public:
-    DataFormatPage(const DataFormatPage&) = delete; // Copy Constructor Not Implemented
-    DataFormatPage(DataFormatPage&&) = delete;      // Move Constructor Not Implemented
-    DataFormatPage& operator=(const DataFormatPage&) = delete; // Copy Assignment Not Implemented
-    DataFormatPage& operator=(DataFormatPage&&) = delete;      // Move Assignment Not Implemented
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DataFormatPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
+
+  ~DataFormatPage() override;
+
+  /**
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
+  virtual void setupGui();
+
+  /**
+   * @brief Refreshes the model
+   */
+  void refreshModel() override;
+
+  /**
+   * @brief Launches the "Edit Headers" dialog
+   */
+  void launchEditHeadersDialog();
+
+  /**
+   * @brief checkHeaders
+   */
+  void checkHeaders();
+
+  /**
+   * @brief checkHeaders
+   * @param headers
+   */
+  void checkHeaders(QVector<QString> headers);
+
+  /**
+   * @brief Controls which page to navigate to after the user clicks "Next" button
+   */
+  int nextId() const override;
+
+  /**
+   * @brief Resets the page when the user hits the "Back" button
+   */
+  void cleanupPage() override;
+
+  /**
+   * @brief isComplete
+   * @return
+   */
+  bool isComplete() const override;
+
+  /**
+   * @brief getTupleTable
+   * @return
+   */
+  TupleTableWidget* getTupleTable();
+
+  /**
+   * @brief setAutomaticAM
+   * @param automatic
+   */
+  void setAutomaticAM(bool automatic);
+
+  /**
+   * @brief getAutomaticAM
+   * @return
+   */
+  bool getAutomaticAM();
+
+  /**
+   * @brief getSelectedPath
+   * @return
+   */
+  DataArrayPath getSelectedPath();
+
+  /**
+   * @brief setAutomaticAttrMatrixName
+   * @param name
+   */
+  void setAutomaticAttrMatrixName(const QString& name);
+
+  /**
+   * @brief setAutomaticAttrMatrixName
+   * @param path
+   */
+  void setAutomaticAttrMatrixName(const DataArrayPath& path);
+
+  /**
+   * @brief getAMName
+   * @return
+   */
+  QString getAutomaticAttrMatrixName();
+
+  /**
+   * @brief setAttributeMatrixType
+   * @param t
+   */
+  void setAttributeMatrixType(int t);
+
+  /**
+   * @brief getAttributeMatrixType
+   * @return
+   */
+  int getAttributeMatrixType();
+
+  /**
+   * @brief setUseDefaultHeaders
+   * @param ok
+   */
+  void setUseDefaultHeaders(bool ok);
+
+  /**
+   * @brief setUseCustomHeaders
+   * @param value
+   */
+  void setUseCustomHeaders(bool value);
+
+  /**
+   * @brief setHeaderLine
+   * @param line
+   */
+  void setHeaderLine(int line);
+
+  /**
+   * @brief setEditSettings
+   * @param value
+   */
+  void setEditSettings(bool value);
+
+  /**
+   * @brief eventFilter
+   * @param obj
+   * @param event
+   * @return
+   */
+  bool eventFilter(QObject* obj, QEvent* event) override;
+
+  /**
+   * @brief Handle DataArrayPath changes if necessary
+   * @param renamePath
+   */
+  void updateDataArrayPath(DataArrayPath::RenameType renamePath);
+
+public slots:
+  /**
+   * @brief dcaItemSelected
+   * @param path
+   */
+  void amItemSelected(QString path);
+
+  /**
+   * @brief dcaItemSelected
+   * @param path
+   */
+  void dcItemSelected(QString path);
+
+  /**
+   * @brief on_amName_returnPressed
+   */
+  //    void on_amName_returnPressed();
+
+  /**
+   * @brief on_applyChangesBtn_clicked
+   */
+  void on_applyChangesBtn_clicked();
+
+  /**
+   * @brief hideButton
+   */
+  void hideButton();
+
+  /**
+   * @brief widgetChanged
+   * @param msg
+   */
+  void widgetChanged(const QString& msg);
+
+protected:
+  /**
+   * @brief showEvent
+   * @param event
+   */
+  void showEvent(QShowEvent* event) override;
+
+  /**
+   * @brief adjustedMenuPosition
+   * @param pushButton
+   * @return
+   */
+  QPoint adjustedMenuPosition(QPushButton* pushButton);
+
+  void createDCSelectionMenu();
+  void createAMSelectionMenu();
+
+private slots:
+  void on_startRowSpin_valueChanged(int i);
+  void on_hasHeadersRadio_toggled(bool checked);
+  void on_doesNotHaveHeadersRadio_toggled(bool checked);
+  void on_useDefaultHeaders_toggled(bool checked);
+
+  void on_headersIndexLineEdit_textChanged(const QString& text);
+  void on_editHeadersBtn_clicked();
+  void on_dataTypeRadio_clicked();
+  void on_skipRadio_clicked();
+  void on_dataTypeCB_currentTextChanged(const QString& text);
+
+  void on_amName_returnPressed();
+
+  void updateSelection(const QItemSelection& selected, const QItemSelection& deselected);
+  bool checkTupleDimensions(std::vector<size_t> tupleDims);
+
+  void on_createAMRadio_toggled(bool b);
+  void on_useAMRadio_toggled(bool b);
+
+private:
+  int m_NumLines = -1;
+  EditHeadersDialog* m_EditHeadersDialog = nullptr;
+  DataContainerArrayShPtrType m_Dca;
+  QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
+  QSignalMapper* m_AMMenuMapper = nullptr;
+  QSignalMapper* m_DCMenuMapper = nullptr;
+
+  QPointer<QtSFaderWidget> m_FaderWidget;
+  bool m_EditSettings = false;
+
+  QMenu* m_DCMenuPtr = nullptr;
+  bool m_OwnsDCMenuPtr = false;
+
+  QMenu* m_AttrMatMenuPtr = nullptr;
+  bool m_OwnsAttrMatMenuPtr = false;
+
+  bool m_TupleDimsHasErrors = false;
+  bool m_HeadersHasErrors = false;
+
+  bool validateHeaders(QVector<QString> headers);
+  bool validateTupleDimensions(std::vector<size_t> tupleDims);
+
+public:
+  DataFormatPage(const DataFormatPage&) = delete;            // Copy Constructor Not Implemented
+  DataFormatPage(DataFormatPage&&) = delete;                 // Move Constructor Not Implemented
+  DataFormatPage& operator=(const DataFormatPage&) = delete; // Copy Assignment Not Implemented
+  DataFormatPage& operator=(DataFormatPage&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
index 8dfb734ffe..bd8767c8ed 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "DelimitedPage.h"
 
@@ -63,7 +63,7 @@ DelimitedPage::~DelimitedPage() = default;
 // -----------------------------------------------------------------------------
 void DelimitedPage::setEditSettings(bool value)
 {
-    m_EditSettings = value;
+  m_EditSettings = value;
 }
 
 // -----------------------------------------------------------------------------
@@ -140,7 +140,7 @@ void DelimitedPage::refreshModel()
 // -----------------------------------------------------------------------------
 void DelimitedPage::showEvent(QShowEvent*)
 {
-  if( !m_EditSettings)
+  if(!m_EditSettings)
   {
     m_ASCIIDataModel->clearContents();
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
index aa80b1ad98..bd636d94fe 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "AbstractWizardPage.h"
 
 #include "ui_DelimitedPage.h"
@@ -47,47 +45,46 @@ class DelimitedPage : public AbstractWizardPage, private Ui::DelimitedPage
 {
   Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    DelimitedPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, QWidget* parent = nullptr);
-
-    ~DelimitedPage() override;
-
-    /**
-     * @brief Initializes some of the GUI elements with selections or other GUI related items
-     */
-    virtual void setupGui();
-
-    /**
-    * @brief Refreshes the model
-    */
-    void refreshModel() override;
-
-    /**
-    * @brief Controls which page to navigate to after the user clicks "Next" button
-    */
-    int nextId() const override;
-
-    void setEditSettings(bool value);
-
-  protected slots:
-    void showEvent(QShowEvent* event) override;
-    void checkBox_Toggled(int state);
-
-  private:
-    QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
-    int m_NumLines = -1;
-    bool m_EditSettings = false;
-
-  public:
-    DelimitedPage(const DelimitedPage&) = delete;  // Copy Constructor Not Implemented
-    DelimitedPage(DelimitedPage&&) = delete;       // Move Constructor Not Implemented
-    DelimitedPage& operator=(const DelimitedPage&) = delete; // Copy Assignment Not Implemented
-    DelimitedPage& operator=(DelimitedPage&&) = delete;      // Move Assignment Not Implemented
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  DelimitedPage(QSharedPointer<ASCIIDataModel> model, const QString& inputFilePath, int numLines, QWidget* parent = nullptr);
+
+  ~DelimitedPage() override;
+
+  /**
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
+  virtual void setupGui();
+
+  /**
+   * @brief Refreshes the model
+   */
+  void refreshModel() override;
+
+  /**
+   * @brief Controls which page to navigate to after the user clicks "Next" button
+   */
+  int nextId() const override;
+
+  void setEditSettings(bool value);
+
+protected slots:
+  void showEvent(QShowEvent* event) override;
+  void checkBox_Toggled(int state);
+
+private:
+  QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
+  int m_NumLines = -1;
+  bool m_EditSettings = false;
+
+public:
+  DelimitedPage(const DelimitedPage&) = delete;            // Copy Constructor Not Implemented
+  DelimitedPage(DelimitedPage&&) = delete;                 // Move Constructor Not Implemented
+  DelimitedPage& operator=(const DelimitedPage&) = delete; // Copy Assignment Not Implemented
+  DelimitedPage& operator=(DelimitedPage&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
index d5f53a5ed9..c9e77f6c5d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "EditHeadersDialog.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
index 11faaf7767..026bf538a4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -53,8 +52,8 @@ class EditHeadersDialog : public QDialog, private Ui::EditHeadersDialog
   ~EditHeadersDialog() override;
 
   /**
-  * @brief Initializes some of the GUI elements with selections or other GUI related items
-  */
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
   virtual void setupGui();
 
   QVector<QString> getHeaders();
@@ -65,14 +64,13 @@ protected slots:
   void m_ButtonBox_rejected();
 
 private:
-  QDialogButtonBox*                                         m_ButtonBox;
-  QVector<QString>                                          m_Headers;
+  QDialogButtonBox* m_ButtonBox;
+  QVector<QString> m_Headers;
   QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
 
 public:
-  EditHeadersDialog(const EditHeadersDialog&) = delete; // Copy Constructor Not Implemented
-  EditHeadersDialog(EditHeadersDialog&&) = delete;      // Move Constructor Not Implemented
+  EditHeadersDialog(const EditHeadersDialog&) = delete;            // Copy Constructor Not Implemented
+  EditHeadersDialog(EditHeadersDialog&&) = delete;                 // Move Constructor Not Implemented
   EditHeadersDialog& operator=(const EditHeadersDialog&) = delete; // Copy Assignment Not Implemented
   EditHeadersDialog& operator=(EditHeadersDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index e8fd268d74..221f2da897 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "ImportASCIIDataWizard.h"
 
@@ -97,7 +97,6 @@ void ImportASCIIDataWizard::setEditSettings(bool value)
   {
     dataFormatPage->setEditSettings(value);
   }
-
 }
 
 // -----------------------------------------------------------------------------
@@ -134,7 +133,6 @@ ImportASCIIDataWizard::ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataCo
   dfPage->setHeaderLine(0);
   dfPage->setUseCustomHeaders(false);
 
-
   if(wizardData->headerUsesDefaults)
   {
     dfPage->setUseDefaultHeaders(true);
@@ -176,7 +174,6 @@ ImportASCIIDataWizard::ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataCo
 
   setField("startRow", wizardData->beginIndex);
 
-
   QStringList dataHeaders = wizardData->dataHeaders;
 
   if(m_ASCIIDataModel->columnCount() < dataHeaders.size())
@@ -501,14 +498,13 @@ DataArrayPath ImportASCIIDataWizard::getSelectedPath()
   return DataArrayPath();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 int ImportASCIIDataWizard::getAttributeMatrixType()
 {
   DataFormatPage* dfPage = dynamic_cast<DataFormatPage*>(page(DataFormat));
-  if (nullptr != dfPage)
+  if(nullptr != dfPage)
   {
     int dap = dfPage->getAttributeMatrixType();
     return dap;
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
index e40ab305b6..49f68be290 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,11 +46,11 @@
  */
 struct ImportASCIIDataBundle
 {
-  QVector<QString>                            m_ColumnTypes;
-  QVector<QString>                            m_ColumnNames;
-  int                                         m_StartLine;
-  char                                        m_Delimiter;
-  int                                         m_DataSize;
+  QVector<QString> m_ColumnTypes;
+  QVector<QString> m_ColumnNames;
+  int m_StartLine;
+  char m_Delimiter;
+  int m_DataSize;
 };
 
 Q_DECLARE_METATYPE(ImportASCIIDataBundle)
@@ -69,110 +68,110 @@ class ImportASCIIDataWizard : public QWizard
 {
   Q_OBJECT
 
-  public:
-    enum WizardPages
-    {
-      Delimited,
-      DataFormat
-    };
-
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    ImportASCIIDataWizard(const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
-
-    /**
-     * @brief ImportASCIIDataWizard
-     * @param wizardData
-     */
-    ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
-
-    ~ImportASCIIDataWizard() override;
-
-    static const int TotalPreviewLines = 50;
-
-    /**
-    * @brief Static function that converts the boolean delimiter values to a list of delimiter characters
-    */
-    static QList<char> ConvertToDelimiters(bool tabAsDelimiter, bool semicolonAsDelimiter, bool commaAsDelimiter, bool spaceAsDelimiter);
-
-    /**
-    * @brief Static function that will read 'numOfLines' lines from the file at 'inputFilePath', starting at line 'beginIndex'
-    * @param inputFilePath The path to the file
-    * @param beginLine The line to begin reading at in the file
-    * @param numOfLines The number of lines to read from the file
-    */
-    static QStringList ReadLines(const QString &inputFilePath, int beginLine, int numOfLines);
-
-    /**
-    * @brief Static convenience function that will read a certain line from the file 'inputFilePath'.
-    * @param inputFilePath The path to the file
-    * @param line The line to read from the file
-    */
-    static QString ReadLine(const QString &inputFilePath, int line);
-
-    /**
-    * @brief Static function that loads lines into the table objects.  The full lines are stored in the ASCIIDataItem object that backs up each table item, and are not actually displayed in the table yet.
-    * @param inputFilePath The path to the file to load
-    * @param beginLine The line to begin loading at in the file
-    */
-    static void LoadOriginalLines(QStringList lines, ASCIIDataModel* model);
-
-    /**
-    * @brief Static function that will insert the tokenized lines into the preview table.
-    * @param tokenizedLines List of tokenized lines
-    * @param firstRowHeaderIndex The name of the first row's header (an index, such as '2' or '5')
-    */
-    static void InsertTokenizedLines(QList<QStringList> tokenizedLines, int firstRowHeaderIndex, ASCIIDataModel* model);
-
-    /**
-    * @brief Static function that inserts the full strings stored in each row item into one column in the preview table.
-    * @param lines List of lines
-    * @param firstRowHeaderIndex The name of the first row's header (an index, such as '2' or '5')
-    */
-    static void InsertLines(QStringList lines, int firstRowHeaderIndex, ASCIIDataModel* model);
-
-    /**
-    * @brief Updates the DataArrayPath used for importing data
-    * @param renamePath
-    */
-    void updateDataArrayPath(DataArrayPath::RenameType renamePath);
-
-    QList<char> getDelimiters();
-    bool getConsecutiveDelimiters();
-    QStringList getHeaders();
-    QStringList getDataTypes();
-    int getBeginningLineNum();
-    QString getInputFilePath();
-    std::vector<size_t> getTupleDims();
-    bool getAutomaticAM();
-    DataArrayPath getSelectedPath();
-    int getAttributeMatrixType();
-
-    void setInputFilePath(const QString &inputFilePath);
-
-    void setEditSettings(bool value);
-
-  protected slots:
-    void refreshModel();
-    void cleanupPage(int id) override;
-
-  private:
-    QString                                             m_InputFilePath;
-    int                                                 m_NumLines = -1;
-    bool                                                m_EditSettings = false;
-    DataContainerArrayShPtrType m_Dca = nullptr;
-
-    QPushButton*                                        m_RefreshBtn = nullptr;
-    QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
-
-  public:
-    ImportASCIIDataWizard(const ImportASCIIDataWizard&) = delete; // Copy Constructor Not Implemented
-    ImportASCIIDataWizard(ImportASCIIDataWizard&&) = delete;      // Move Constructor Not Implemented
-    ImportASCIIDataWizard& operator=(const ImportASCIIDataWizard&) = delete; // Copy Assignment Not Implemented
-    ImportASCIIDataWizard& operator=(ImportASCIIDataWizard&&) = delete;      // Move Assignment Not Implemented
+public:
+  enum WizardPages
+  {
+    Delimited,
+    DataFormat
+  };
+
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  ImportASCIIDataWizard(const QString& inputFilePath, int numLines, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
+
+  /**
+   * @brief ImportASCIIDataWizard
+   * @param wizardData
+   */
+  ImportASCIIDataWizard(ASCIIWizardData* wizardData, DataContainerArrayShPtrType dca, QWidget* parent = nullptr);
+
+  ~ImportASCIIDataWizard() override;
+
+  static const int TotalPreviewLines = 50;
+
+  /**
+   * @brief Static function that converts the boolean delimiter values to a list of delimiter characters
+   */
+  static QList<char> ConvertToDelimiters(bool tabAsDelimiter, bool semicolonAsDelimiter, bool commaAsDelimiter, bool spaceAsDelimiter);
+
+  /**
+   * @brief Static function that will read 'numOfLines' lines from the file at 'inputFilePath', starting at line 'beginIndex'
+   * @param inputFilePath The path to the file
+   * @param beginLine The line to begin reading at in the file
+   * @param numOfLines The number of lines to read from the file
+   */
+  static QStringList ReadLines(const QString& inputFilePath, int beginLine, int numOfLines);
+
+  /**
+   * @brief Static convenience function that will read a certain line from the file 'inputFilePath'.
+   * @param inputFilePath The path to the file
+   * @param line The line to read from the file
+   */
+  static QString ReadLine(const QString& inputFilePath, int line);
+
+  /**
+   * @brief Static function that loads lines into the table objects.  The full lines are stored in the ASCIIDataItem object that backs up each table item, and are not actually displayed in the table
+   * yet.
+   * @param inputFilePath The path to the file to load
+   * @param beginLine The line to begin loading at in the file
+   */
+  static void LoadOriginalLines(QStringList lines, ASCIIDataModel* model);
+
+  /**
+   * @brief Static function that will insert the tokenized lines into the preview table.
+   * @param tokenizedLines List of tokenized lines
+   * @param firstRowHeaderIndex The name of the first row's header (an index, such as '2' or '5')
+   */
+  static void InsertTokenizedLines(QList<QStringList> tokenizedLines, int firstRowHeaderIndex, ASCIIDataModel* model);
+
+  /**
+   * @brief Static function that inserts the full strings stored in each row item into one column in the preview table.
+   * @param lines List of lines
+   * @param firstRowHeaderIndex The name of the first row's header (an index, such as '2' or '5')
+   */
+  static void InsertLines(QStringList lines, int firstRowHeaderIndex, ASCIIDataModel* model);
+
+  /**
+   * @brief Updates the DataArrayPath used for importing data
+   * @param renamePath
+   */
+  void updateDataArrayPath(DataArrayPath::RenameType renamePath);
+
+  QList<char> getDelimiters();
+  bool getConsecutiveDelimiters();
+  QStringList getHeaders();
+  QStringList getDataTypes();
+  int getBeginningLineNum();
+  QString getInputFilePath();
+  std::vector<size_t> getTupleDims();
+  bool getAutomaticAM();
+  DataArrayPath getSelectedPath();
+  int getAttributeMatrixType();
+
+  void setInputFilePath(const QString& inputFilePath);
+
+  void setEditSettings(bool value);
+
+protected slots:
+  void refreshModel();
+  void cleanupPage(int id) override;
+
+private:
+  QString m_InputFilePath;
+  int m_NumLines = -1;
+  bool m_EditSettings = false;
+  DataContainerArrayShPtrType m_Dca = nullptr;
+
+  QPushButton* m_RefreshBtn = nullptr;
+  QSharedPointer<ASCIIDataModel> m_ASCIIDataModel;
+
+public:
+  ImportASCIIDataWizard(const ImportASCIIDataWizard&) = delete;            // Copy Constructor Not Implemented
+  ImportASCIIDataWizard(ImportASCIIDataWizard&&) = delete;                 // Move Constructor Not Implemented
+  ImportASCIIDataWizard& operator=(const ImportASCIIDataWizard&) = delete; // Copy Assignment Not Implemented
+  ImportASCIIDataWizard& operator=(ImportASCIIDataWizard&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
index 5f3b63fbb4..ca1730066d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "LineCounterObject.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
index 44bd14f4ae..17e4087bf7 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <stdio.h>
@@ -46,18 +46,18 @@ class LineCounterObject : public QObject
 
 public:
   /**
- * @brief LineCounterObject
- * @param filePath
- * @param parent
- */
+   * @brief LineCounterObject
+   * @param filePath
+   * @param parent
+   */
   LineCounterObject(const QString& filePath, QObject* parent = nullptr);
 
   /**
- * @brief LineCounterObject
- * @param filePath
- * @param numLines
- * @param parent
- */
+   * @brief LineCounterObject
+   * @param filePath
+   * @param numLines
+   * @param parent
+   */
   LineCounterObject(const QString& filePath, int numLines, QObject* parent = nullptr);
 
   ~LineCounterObject() override;
@@ -93,9 +93,8 @@ protected slots:
   int m_NumOfLines;
 
 public:
-  LineCounterObject(const LineCounterObject&) = delete; // Copy Constructor Not Implemented
-  LineCounterObject(LineCounterObject&&) = delete;      // Move Constructor Not Implemented
+  LineCounterObject(const LineCounterObject&) = delete;            // Copy Constructor Not Implemented
+  LineCounterObject(LineCounterObject&&) = delete;                 // Move Constructor Not Implemented
   LineCounterObject& operator=(const LineCounterObject&) = delete; // Copy Assignment Not Implemented
   LineCounterObject& operator=(LineCounterObject&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
index 31b23431e8..3332feb2d8 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TupleSelectionPage.h"
 
-
 #include "SIMPLib/Common/Constants.h"
 
 #include "ASCIIDataModel.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
index 5b085507df..af0c59d6a3 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
@@ -1,42 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include "AbstractWizardPage.h"
 
 #include "ui_TupleSelectionPage.h"
@@ -47,36 +45,35 @@ class TupleSelectionPage : public AbstractWizardPage, private Ui::TupleSelection
 {
   Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    TupleSelectionPage(const QString &inputFilePath, QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  TupleSelectionPage(const QString& inputFilePath, QWidget* parent = nullptr);
 
-    virtual ~TupleSelectionPage();
+  virtual ~TupleSelectionPage();
 
-    /**
-     * @brief Initializes some of the GUI elements with selections or other GUI related items
-     */
-    virtual void setupGui();
+  /**
+   * @brief Initializes some of the GUI elements with selections or other GUI related items
+   */
+  virtual void setupGui();
 
-    /**
-    * @brief Refreshes the model
-    */
-    virtual void refreshModel();
+  /**
+   * @brief Refreshes the model
+   */
+  virtual void refreshModel();
 
-    /**
-    * @brief Controls which page to navigate to after the user clicks "Next" button
-    */
-    virtual int nextId() const;
+  /**
+   * @brief Controls which page to navigate to after the user clicks "Next" button
+   */
+  virtual int nextId() const;
 
-  public:
-    TupleSelectionPage(const TupleSelectionPage&) = delete; // Copy Constructor Not Implemented
-    TupleSelectionPage(TupleSelectionPage&&) = delete;      // Move Constructor Not Implemented
-    TupleSelectionPage& operator=(const TupleSelectionPage&) = delete; // Copy Assignment Not Implemented
-    TupleSelectionPage& operator=(TupleSelectionPage&&) = delete;      // Move Assignment Not Implemented
+public:
+  TupleSelectionPage(const TupleSelectionPage&) = delete;            // Copy Constructor Not Implemented
+  TupleSelectionPage(TupleSelectionPage&&) = delete;                 // Move Constructor Not Implemented
+  TupleSelectionPage& operator=(const TupleSelectionPage&) = delete; // Copy Assignment Not Implemented
+  TupleSelectionPage& operator=(TupleSelectionPage&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
index bbbf3601cc..2c6b8692bf 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TupleTableItemDelegate.h"
 #include <QtWidgets/QLineEdit>
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
index 51d8dce30f..b783bb2b3d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,23 +43,22 @@
 
 class TupleTableItemDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    explicit TupleTableItemDelegate(QObject* parent = nullptr);
+public:
+  explicit TupleTableItemDelegate(QObject* parent = nullptr);
 
-    ~TupleTableItemDelegate() override;
+  ~TupleTableItemDelegate() override;
 
-  protected:
-    QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    void setEditorData(QWidget* editor, const QModelIndex& index) const override;
-    void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
-    void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+protected:
+  QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  void setEditorData(QWidget* editor, const QModelIndex& index) const override;
+  void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
+  void updateEditorGeometry(QWidget* editor, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
 
-  public:
-    TupleTableItemDelegate(const TupleTableItemDelegate&) = delete; // Copy Constructor Not Implemented
-    TupleTableItemDelegate(TupleTableItemDelegate&&) = delete;      // Move Constructor Not Implemented
-    TupleTableItemDelegate& operator=(const TupleTableItemDelegate&) = delete; // Copy Assignment Not Implemented
-    TupleTableItemDelegate& operator=(TupleTableItemDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  TupleTableItemDelegate(const TupleTableItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  TupleTableItemDelegate(TupleTableItemDelegate&&) = delete;                 // Move Constructor Not Implemented
+  TupleTableItemDelegate& operator=(const TupleTableItemDelegate&) = delete; // Copy Assignment Not Implemented
+  TupleTableItemDelegate& operator=(TupleTableItemDelegate&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
index 110b1f9c57..986d6e2d5d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
@@ -1,40 +1,39 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "TupleTableWidget.h"
 
-
 #include <QtWidgets/QTableWidgetItem>
 
 #include "TupleTableItemDelegate.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
index 6362ae944a..1213048abd 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
 #include <QtWidgets/QWidget>
@@ -41,59 +41,58 @@
 class DynamicTableFilterParameter;
 
 /**
-* @brief
-* @author
-* @version
-*/
+ * @brief
+ * @author
+ * @version
+ */
 class TupleTableWidget : public QWidget, private Ui::TupleTableWidget
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-    * @brief Constructor
-    * @param parameter The FilterParameter object that this widget represents
-    * @param filter The instance of the filter that this parameter is a part of
-    * @param parent The parent QWidget for this Widget
-    */
-    TupleTableWidget(QWidget* parent = nullptr);
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  TupleTableWidget(QWidget* parent = nullptr);
 
-    ~TupleTableWidget() override;
+  ~TupleTableWidget() override;
 
-    /**
-    * @brief This method does additional GUI widget connections
-    */
-    void setupGui();
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui();
 
-    std::vector<size_t> getData();
+  std::vector<size_t> getData();
 
-    void addTupleDimensions(std::vector<size_t> tupleDims);
-    void clearTupleDimensions();
+  void addTupleDimensions(std::vector<size_t> tupleDims);
+  void clearTupleDimensions();
 
-    bool didUseEdit();
+  bool didUseEdit();
 
-  public slots:
-    void on_addTupleBtn_clicked();
-    void on_deleteTupleBtn_clicked();
+public slots:
+  void on_addTupleBtn_clicked();
+  void on_deleteTupleBtn_clicked();
 
-  protected:
-    void addColumn(int value);
+protected:
+  void addColumn(int value);
 
-  protected slots:
-    void on_tupleTable_itemChanged(QTableWidgetItem* item);
+protected slots:
+  void on_tupleTable_itemChanged(QTableWidgetItem* item);
 
-  signals:
-    void tupleDimsChanged(std::vector<size_t> tupleDims);
+signals:
+  void tupleDimsChanged(std::vector<size_t> tupleDims);
 
-  private:
-    void updateDynamicButtons();
+private:
+  void updateDynamicButtons();
 
-    bool m_UserEdited = false;
+  bool m_UserEdited = false;
 
-  public:
-    TupleTableWidget(const TupleTableWidget&) = delete; // Copy Constructor Not Implemented
-    TupleTableWidget(TupleTableWidget&&) = delete;      // Move Constructor Not Implemented
-    TupleTableWidget& operator=(const TupleTableWidget&) = delete; // Copy Assignment Not Implemented
-    TupleTableWidget& operator=(TupleTableWidget&&) = delete;      // Move Assignment Not Implemented
+public:
+  TupleTableWidget(const TupleTableWidget&) = delete;            // Copy Constructor Not Implemented
+  TupleTableWidget(TupleTableWidget&&) = delete;                 // Move Constructor Not Implemented
+  TupleTableWidget& operator=(const TupleTableWidget&) = delete; // Copy Assignment Not Implemented
+  TupleTableWidget& operator=(TupleTableWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
index 91ec93f030..dd19bdb864 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.cpp
@@ -32,7 +32,6 @@
 
 #include "ImportHDF5TreeModelItem.h"
 
-
 #include "H5Support/H5Utilities.h"
 
 ImportHDF5TreeModelItem::ImportHDF5TreeModelItem(hid_t fileId, const QString& data, ImportHDF5TreeModelItem* parent)
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
index 7ec7ab9aa2..04a6b5af6a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModelItem.h
@@ -38,7 +38,6 @@
 
 #include <hdf5.h>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class SVWidgetsLib_EXPORT ImportHDF5TreeModelItem
@@ -103,4 +102,3 @@ class SVWidgetsLib_EXPORT ImportHDF5TreeModelItem
   std::string m_DataType = "";
   Qt::CheckState m_CheckState = Qt::Unchecked;
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 5c701388db..979696593c 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IssuesWidget.h"
 
@@ -50,10 +50,10 @@
 
 namespace
 {
-  const int FilterIndexDefaultColumnWidth = 50;
-  const int FilterNameDefaultColumnWidth = 150;
-  const int ErrorCodeDefaultColumnWidth = 50;
-}
+const int FilterIndexDefaultColumnWidth = 50;
+const int FilterNameDefaultColumnWidth = 150;
+const int ErrorCodeDefaultColumnWidth = 50;
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
@@ -116,7 +116,6 @@ void IssuesWidget::setupGui()
   ui->errorTableWidget->horizontalHeader()->setSectionResizeMode(Description, QHeaderView::Stretch);
   ui->errorTableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
-
   ui->errorTableWidget->horizontalHeader()->resizeSection(FilterIndex, FilterIndexDefaultColumnWidth);
   ui->errorTableWidget->horizontalHeader()->resizeSection(FilterName, FilterNameDefaultColumnWidth);
   ui->errorTableWidget->horizontalHeader()->resizeSection(ErrorCode, ErrorCodeDefaultColumnWidth);
@@ -165,7 +164,7 @@ void IssuesWidget::displayCachedMessages()
 
   emit tableHasErrors(errCount > 0, errCount, warnCount);
 
-  if (ui->errorTableWidget->rowCount() > 0)
+  if(ui->errorTableWidget->rowCount() > 0)
   {
     ui->errorTableWidget->horizontalHeader()->setSectionResizeMode(FilterIndex, QHeaderView::ResizeToContents);
     ui->errorTableWidget->horizontalHeader()->setSectionResizeMode(FilterName, QHeaderView::ResizeToContents);
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
old mode 100755
new mode 100644
index 9f9ef7318b..4a3f0de35e
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -63,54 +63,52 @@ class IssuesWidgetMessageHandler;
  */
 class SVWidgetsLib_EXPORT IssuesWidget : public QWidget, public IObserver
 {
-    Q_OBJECT
-  public:
-    static SIMPLView::DockWidgetSettings::HideDockSetting GetHideDockSetting();
-    static void SetHideDockSetting(SIMPLView::DockWidgetSettings::HideDockSetting setting);
-
-    IssuesWidget(QWidget* parent = nullptr);
-    ~IssuesWidget() override;
-
-    friend IssuesWidgetMessageHandler;
-
-    static const int FilterIndex = 0;
-    static const int FilterName = 1;
-    static const int Description = 2;
-    static const int ErrorCode = 3;
-
-    /**
-     * @brief getIssuesTable
-     * @return
-     */
-    QTableWidget* getIssuesTable();
-
-  public slots:
-    void processPipelineMessage(const AbstractMessage::Pointer& msg) override;
-    void clearIssues();
-    void on_errorTableWidget_itemClicked( QTableWidgetItem* item );
-    void displayCachedMessages();
-
-    void showFilterHelp(const QString &url);
-
-  signals:
-    void tableHasErrors(bool b, int errCount, int warnCount);
-    void showTable(bool b);
-
-  protected:
-    /**
-     * @brief setupGui
-     */
-    void setupGui();
-
-
-  private:
-    QSharedPointer<Ui::IssuesWidget> ui = nullptr;
-    std::vector<AbstractMessage::Pointer> m_CachedMessages;
-
-  public:
-    IssuesWidget(const IssuesWidget&) = delete;   // Copy Constructor Not Implemented
-    IssuesWidget(IssuesWidget&&) = delete;        // Move Constructor Not Implemented
-    IssuesWidget& operator=(const IssuesWidget&) = delete; // Copy Assignment Not Implemented
-    IssuesWidget& operator=(IssuesWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+public:
+  static SIMPLView::DockWidgetSettings::HideDockSetting GetHideDockSetting();
+  static void SetHideDockSetting(SIMPLView::DockWidgetSettings::HideDockSetting setting);
+
+  IssuesWidget(QWidget* parent = nullptr);
+  ~IssuesWidget() override;
+
+  friend IssuesWidgetMessageHandler;
+
+  static const int FilterIndex = 0;
+  static const int FilterName = 1;
+  static const int Description = 2;
+  static const int ErrorCode = 3;
+
+  /**
+   * @brief getIssuesTable
+   * @return
+   */
+  QTableWidget* getIssuesTable();
+
+public slots:
+  void processPipelineMessage(const AbstractMessage::Pointer& msg) override;
+  void clearIssues();
+  void on_errorTableWidget_itemClicked(QTableWidgetItem* item);
+  void displayCachedMessages();
+
+  void showFilterHelp(const QString& url);
+
+signals:
+  void tableHasErrors(bool b, int errCount, int warnCount);
+  void showTable(bool b);
+
+protected:
+  /**
+   * @brief setupGui
+   */
+  void setupGui();
+
+private:
+  QSharedPointer<Ui::IssuesWidget> ui = nullptr;
+  std::vector<AbstractMessage::Pointer> m_CachedMessages;
+
+public:
+  IssuesWidget(const IssuesWidget&) = delete;            // Copy Constructor Not Implemented
+  IssuesWidget(IssuesWidget&&) = delete;                 // Move Constructor Not Implemented
+  IssuesWidget& operator=(const IssuesWidget&) = delete; // Copy Assignment Not Implemented
+  IssuesWidget& operator=(IssuesWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
old mode 100755
new mode 100644
index fae522a46a..5370f503a6
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "IssuesWidgetMessageHandler.h"
 
@@ -64,7 +64,6 @@ IssuesWidgetMessageHandler::IssuesWidgetMessageHandler(IssuesWidget* issuesWidge
 , m_ErrCount(errCount)
 , m_WarningCount(warningCount)
 {
-
 }
 
 // -----------------------------------------------------------------------------
@@ -136,7 +135,7 @@ void IssuesWidgetMessageHandler::addItemToIssuesTable(const QString& className,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QLabel* IssuesWidgetMessageHandler::createHyperlinkLabel(const QString &filterClassName, const QString &filterHumanLabel) const
+QLabel* IssuesWidgetMessageHandler::createHyperlinkLabel(const QString& filterClassName, const QString& filterHumanLabel) const
 {
   if(filterClassName.isEmpty() || filterHumanLabel.isEmpty())
   {
@@ -166,5 +165,3 @@ QLabel* IssuesWidgetMessageHandler::createHyperlinkLabel(const QString &filterCl
 
   return hyperlinkLabel;
 }
-
-
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
old mode 100755
new mode 100644
index 1784e46b00..d5573a9f4f
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -47,44 +47,42 @@ class QLabel;
  */
 class SVWidgetsLib_EXPORT IssuesWidgetMessageHandler : public AbstractMessageHandler
 {
-  public:
-    explicit IssuesWidgetMessageHandler(IssuesWidget* issuesWidget, int* count, int* errCount, int* warningCount);
+public:
+  explicit IssuesWidgetMessageHandler(IssuesWidget* issuesWidget, int* count, int* errCount, int* warningCount);
 
-    /**
-     * @brief Adds incoming FilterErrorMessages to the issues table.
-     * @param msg
-     */
-    void processMessage(const FilterErrorMessage* msg) const override;
+  /**
+   * @brief Adds incoming FilterErrorMessages to the issues table.
+   * @param msg
+   */
+  void processMessage(const FilterErrorMessage* msg) const override;
 
-    /**
-     * @brief Adds incoming FilterWarningMessages to the issues table.
-     * @param msg
-     */
-    void processMessage(const FilterWarningMessage* msg) const override;
+  /**
+   * @brief Adds incoming FilterWarningMessages to the issues table.
+   * @param msg
+   */
+  void processMessage(const FilterWarningMessage* msg) const override;
 
-  private:
-    IssuesWidget* m_IssuesWidget = nullptr;
-    int* m_Count = nullptr;
-    int* m_ErrCount = nullptr;
-    int* m_WarningCount = nullptr;
+private:
+  IssuesWidget* m_IssuesWidget = nullptr;
+  int* m_Count = nullptr;
+  int* m_ErrCount = nullptr;
+  int* m_WarningCount = nullptr;
 
-    /**
-     * @brief addItemToIssuesTable
-     * @param className
-     * @param humanLabel
-     * @param pipelineIndex
-     * @param msg
-     * @param code
-     * @param msgColor
-     */
-    void addItemToIssuesTable(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msg, int code, QColor msgColor) const;
+  /**
+   * @brief addItemToIssuesTable
+   * @param className
+   * @param humanLabel
+   * @param pipelineIndex
+   * @param msg
+   * @param code
+   * @param msgColor
+   */
+  void addItemToIssuesTable(const QString& className, const QString& humanLabel, int pipelineIndex, const QString& msg, int code, QColor msgColor) const;
 
-    /**
-     * @brief createHyperlinkLabel
-     * @param msg
-     * @return
-     */
-    QLabel* createHyperlinkLabel(const QString &filterClassName, const QString &filterHumanLabel) const;
+  /**
+   * @brief createHyperlinkLabel
+   * @param msg
+   * @return
+   */
+  QLabel* createHyperlinkLabel(const QString& filterClassName, const QString& filterHumanLabel) const;
 };
-
-
diff --git a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
index 7afd7c000f..e81a22fe61 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.cpp
@@ -1,31 +1,31 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineFilterMimeData.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
index 1c1d9bd987..7c2720333b 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineFilterMimeData.h
@@ -1,31 +1,31 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -37,31 +37,31 @@
 
 class SVWidgetsLib_EXPORT PipelineFilterMimeData : public QMimeData
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    PipelineFilterMimeData();
-    ~PipelineFilterMimeData() override;
+public:
+  PipelineFilterMimeData();
+  ~PipelineFilterMimeData() override;
 
-    using FilterDragMetadata = std::pair<AbstractFilter::Pointer, int>;
-    using FilterDragMetadataContainer = std::vector<PipelineFilterMimeData::FilterDragMetadata>;
+  using FilterDragMetadata = std::pair<AbstractFilter::Pointer, int>;
+  using FilterDragMetadataContainer = std::vector<PipelineFilterMimeData::FilterDragMetadata>;
 
-    /**
-     * @brief Setter property for FilterDragData
-     */
-    void setFilterDragData(const PipelineFilterMimeData::FilterDragMetadataContainer& value);
-    /**
-     * @brief Getter property for FilterDragData
-     * @return Value of FilterDragData
-     */
-    PipelineFilterMimeData::FilterDragMetadataContainer getFilterDragData() const;
+  /**
+   * @brief Setter property for FilterDragData
+   */
+  void setFilterDragData(const PipelineFilterMimeData::FilterDragMetadataContainer& value);
+  /**
+   * @brief Getter property for FilterDragData
+   * @return Value of FilterDragData
+   */
+  PipelineFilterMimeData::FilterDragMetadataContainer getFilterDragData() const;
 
-  public:
-    PipelineFilterMimeData(const PipelineFilterMimeData&) = delete; // Copy Constructor Not Implemented
-    PipelineFilterMimeData(PipelineFilterMimeData&&) = delete;      // Move Constructor Not Implemented
-    PipelineFilterMimeData& operator=(const PipelineFilterMimeData&) = delete; // Copy Assignment Not Implemented
-    PipelineFilterMimeData& operator=(PipelineFilterMimeData&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineFilterMimeData(const PipelineFilterMimeData&) = delete;            // Copy Constructor Not Implemented
+  PipelineFilterMimeData(PipelineFilterMimeData&&) = delete;                 // Move Constructor Not Implemented
+  PipelineFilterMimeData& operator=(const PipelineFilterMimeData&) = delete; // Copy Assignment Not Implemented
+  PipelineFilterMimeData& operator=(PipelineFilterMimeData&&) = delete;      // Move Assignment Not Implemented
 
-  private:
-    PipelineFilterMimeData::FilterDragMetadataContainer m_FilterDragData = {};
+private:
+  PipelineFilterMimeData::FilterDragMetadataContainer m_FilterDragData = {};
 };
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index 8e59fe327c..a3eb8f6bb9 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -1,37 +1,36 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineItem.h"
 
-
 #include "SVWidgetsLib/Widgets/FilterInputWidget.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.h b/Source/SVWidgetsLib/Widgets/PipelineItem.h
old mode 100755
new mode 100644
index 133c95cf31..e082e9982f
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,288 +45,287 @@ class FilterInputWidget;
 
 class SVWidgetsLib_EXPORT PipelineItem
 {
-  public:
-    PipelineItem(const QVector<QVariant>& data, PipelineItem* parent = nullptr);
-    virtual ~PipelineItem();
-
-    /**
-     * @brief Setter property for FilterInputWidget
-     */
-    void setFilterInputWidget(FilterInputWidget* value);
-    /**
-     * @brief Getter property for FilterInputWidget
-     * @return Value of FilterInputWidget
-     */
-    FilterInputWidget* getFilterInputWidget() const;
-
-    /**
-     * @brief Setter property for FilterEnabled
-     */
-    void setFilterEnabled(bool value);
-    /**
-     * @brief Getter property for FilterEnabled
-     * @return Value of FilterEnabled
-     */
-    bool getFilterEnabled() const;
-
-    void setActivePipeline(bool value);
-    bool isActivePipeline() const;
-
-    void setPipelineSaved(bool value);
-    bool isPipelineSaved() const;
-
-    /**
-     * @brief Setter property for Icon
-     */
-    void setIcon(const QIcon& value);
-    /**
-     * @brief Getter property for Icon
-     * @return Value of Icon
-     */
-    QIcon getIcon() const;
-
-    /**
-     * @brief Setter property for Expanded
-     */
-    void setExpanded(bool value);
-    /**
-     * @brief Getter property for Expanded
-     * @return Value of Expanded
-     */
-    bool getExpanded() const;
-
-    /**
-     * @brief Setter property for ItemTooltip
-     */
-    void setItemTooltip(const QString& value);
-    /**
-     * @brief Getter property for ItemTooltip
-     * @return Value of ItemTooltip
-     */
-    QString getItemTooltip() const;
-
-    /**
-     * @brief Setter property for DropIndicatorText
-     */
-    void setDropIndicatorText(const QString& value);
-    /**
-     * @brief Getter property for DropIndicatorText
-     * @return Value of DropIndicatorText
-     */
-    QString getDropIndicatorText() const;
-
-    /**
-     * @brief Setter property for BorderSize
-     */
-    void setBorderSize(int value);
-    /**
-     * @brief Getter property for BorderSize
-     * @return Value of BorderSize
-     */
-    int getBorderSize() const;
-
-    /**
-     * @brief Setter property for Size
-     */
-    void setSize(const QSize& value);
-    /**
-     * @brief Getter property for Size
-     * @return Value of Size
-     */
-    QSize getSize() const;
-
-    /**
-     * @brief Setter property for Height
-     */
-    void setHeight(int value);
-    /**
-     * @brief Getter property for Height
-     * @return Value of Height
-     */
-    int getHeight() const;
-
-    /**
-     * @brief Setter property for Width
-     */
-    void setWidth(int value);
-    /**
-     * @brief Getter property for Width
-     * @return Value of Width
-     */
-    int getWidth() const;
-
-    /**
-     * @brief Setter property for XOffset
-     */
-    void setXOffset(int value);
-    /**
-     * @brief Getter property for XOffset
-     * @return Value of XOffset
-     */
-    int getXOffset() const;
-
-    /**
-     * @brief Setter property for YOffset
-     */
-    void setYOffset(int value);
-    /**
-     * @brief Getter property for YOffset
-     * @return Value of YOffset
-     */
-    int getYOffset() const;
-
-    static const int MaxHeight = 28;
-
-    enum AnimationType
-    {
-      None,
-      Add,
-      Remove
-    };
-
-    /**
-     * @brief Setter property for CurrentAnimationType
-     */
-    void setCurrentAnimationType(const PipelineItem::AnimationType& value);
-    /**
-     * @brief Getter property for CurrentAnimationType
-     * @return Value of CurrentAnimationType
-     */
-    PipelineItem::AnimationType getCurrentAnimationType() const;
-
-    enum PipelineItemData
-    {
-      Contents
-    };
-
-    using EnumType = unsigned int;
-
-    enum class WidgetState : EnumType
-    {
-      Ready = 0,      //!<
-      Executing = 1, //!<
-      Completed = 2, //!<
-      Disabled = 3
-    };
-    /**
-     * @brief Setter property for WidgetState
-     */
-    void setWidgetState(const PipelineItem::WidgetState& value);
-    /**
-     * @brief Getter property for WidgetState
-     * @return Value of WidgetState
-     */
-    PipelineItem::WidgetState getWidgetState() const;
-
-    enum class PipelineState : EnumType
-    {
-      Running = 0,
-      Stopped = 1,
-      Paused = 4,
-    };
-    /**
-     * @brief Setter property for PipelineState
-     */
-    void setPipelineState(const PipelineItem::PipelineState& value);
-    /**
-     * @brief Getter property for PipelineState
-     * @return Value of PipelineState
-     */
-    PipelineItem::PipelineState getPipelineState() const;
-
-    enum class ErrorState : EnumType
-    {
-      Ok = 0,
-      Error = 1,
-      Warning = 2,
-    };
-    /**
-     * @brief Setter property for ErrorState
-     */
-    void setErrorState(const PipelineItem::ErrorState& value);
-    /**
-     * @brief Getter property for ErrorState
-     * @return Value of ErrorState
-     */
-    PipelineItem::ErrorState getErrorState() const;
-
-    enum class ItemType : EnumType
-    {
-      Pipeline,
-      Filter,
-      DropIndicator,
-      Unknown
-    };
-    /**
-     * @brief Setter property for ItemType
-     */
-    void setItemType(const PipelineItem::ItemType& value);
-    /**
-     * @brief Getter property for ItemType
-     * @return Value of ItemType
-     */
-    PipelineItem::ItemType getItemType() const;
-
-    PipelineItem* child(int number);
-    PipelineItem* parent();
-
-    int childCount() const;
-    int columnCount() const;
-
-    QVariant data(int column) const;
-    bool setData(int column, const QVariant& value);
-
-    AbstractFilter::Pointer getFilter();
-    void setFilter(AbstractFilter::Pointer filter);
-
-    bool insertChild(int position, PipelineItem* child);
-    bool insertChildren(int position, int count, int columns);
-    bool insertColumns(int position, int columns);
-
-    bool removeChild(int position);
-    bool removeChildren(int position, int count);
-    bool removeColumns(int position, int columns);
-
-    int childNumber() const;
-
-    void setParent(PipelineItem* parent);
-
-    static QString TopLevelString();
-
-  private:
-    FilterInputWidget* m_FilterInputWidget = nullptr;
-
-    bool m_FilterEnabled = true;
-    QIcon m_Icon;
-    bool m_Expanded = false;
-    QString m_ItemTooltip = "";
-    QString m_DropIndicatorText = "";
-    int m_BorderSize = 0;
-    QSize m_Size = QSize(0, MaxHeight);
-    int m_Height = 0;
-    int m_Width = 0;
-    int m_XOffset = 0;
-    int m_YOffset = 0;
-    PipelineItem::AnimationType m_CurrentAnimationType = {};
-    PipelineItem::WidgetState m_WidgetState = {};
-    PipelineItem::PipelineState m_PipelineState = {};
-    PipelineItem::ErrorState m_ErrorState = {};
-    PipelineItem::ItemType m_ItemType = {};
-
-    QList<PipelineItem*>                    m_ChildItems;
-    QVector<QVariant>                       m_ItemData;
-    AbstractFilter::Pointer                 m_Filter = nullptr;
-    PipelineItem* m_ParentItem = nullptr;
-
-    bool m_ActivePipeline = false;
-    bool m_PipelineSaved = false;
-
-    void setupFilterInputWidget();
-
-  public:
-    PipelineItem(const PipelineItem&) = delete;            // Copy Constructor Not Implemented
-    PipelineItem(PipelineItem&&) = delete;                 // Move Constructor Not Implemented
-    PipelineItem& operator=(const PipelineItem&) = delete; // Copy Assignment Not Implemented
-    PipelineItem& operator=(PipelineItem&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineItem(const QVector<QVariant>& data, PipelineItem* parent = nullptr);
+  virtual ~PipelineItem();
+
+  /**
+   * @brief Setter property for FilterInputWidget
+   */
+  void setFilterInputWidget(FilterInputWidget* value);
+  /**
+   * @brief Getter property for FilterInputWidget
+   * @return Value of FilterInputWidget
+   */
+  FilterInputWidget* getFilterInputWidget() const;
+
+  /**
+   * @brief Setter property for FilterEnabled
+   */
+  void setFilterEnabled(bool value);
+  /**
+   * @brief Getter property for FilterEnabled
+   * @return Value of FilterEnabled
+   */
+  bool getFilterEnabled() const;
+
+  void setActivePipeline(bool value);
+  bool isActivePipeline() const;
+
+  void setPipelineSaved(bool value);
+  bool isPipelineSaved() const;
+
+  /**
+   * @brief Setter property for Icon
+   */
+  void setIcon(const QIcon& value);
+  /**
+   * @brief Getter property for Icon
+   * @return Value of Icon
+   */
+  QIcon getIcon() const;
+
+  /**
+   * @brief Setter property for Expanded
+   */
+  void setExpanded(bool value);
+  /**
+   * @brief Getter property for Expanded
+   * @return Value of Expanded
+   */
+  bool getExpanded() const;
+
+  /**
+   * @brief Setter property for ItemTooltip
+   */
+  void setItemTooltip(const QString& value);
+  /**
+   * @brief Getter property for ItemTooltip
+   * @return Value of ItemTooltip
+   */
+  QString getItemTooltip() const;
+
+  /**
+   * @brief Setter property for DropIndicatorText
+   */
+  void setDropIndicatorText(const QString& value);
+  /**
+   * @brief Getter property for DropIndicatorText
+   * @return Value of DropIndicatorText
+   */
+  QString getDropIndicatorText() const;
+
+  /**
+   * @brief Setter property for BorderSize
+   */
+  void setBorderSize(int value);
+  /**
+   * @brief Getter property for BorderSize
+   * @return Value of BorderSize
+   */
+  int getBorderSize() const;
+
+  /**
+   * @brief Setter property for Size
+   */
+  void setSize(const QSize& value);
+  /**
+   * @brief Getter property for Size
+   * @return Value of Size
+   */
+  QSize getSize() const;
+
+  /**
+   * @brief Setter property for Height
+   */
+  void setHeight(int value);
+  /**
+   * @brief Getter property for Height
+   * @return Value of Height
+   */
+  int getHeight() const;
+
+  /**
+   * @brief Setter property for Width
+   */
+  void setWidth(int value);
+  /**
+   * @brief Getter property for Width
+   * @return Value of Width
+   */
+  int getWidth() const;
+
+  /**
+   * @brief Setter property for XOffset
+   */
+  void setXOffset(int value);
+  /**
+   * @brief Getter property for XOffset
+   * @return Value of XOffset
+   */
+  int getXOffset() const;
+
+  /**
+   * @brief Setter property for YOffset
+   */
+  void setYOffset(int value);
+  /**
+   * @brief Getter property for YOffset
+   * @return Value of YOffset
+   */
+  int getYOffset() const;
+
+  static const int MaxHeight = 28;
+
+  enum AnimationType
+  {
+    None,
+    Add,
+    Remove
+  };
+
+  /**
+   * @brief Setter property for CurrentAnimationType
+   */
+  void setCurrentAnimationType(const PipelineItem::AnimationType& value);
+  /**
+   * @brief Getter property for CurrentAnimationType
+   * @return Value of CurrentAnimationType
+   */
+  PipelineItem::AnimationType getCurrentAnimationType() const;
+
+  enum PipelineItemData
+  {
+    Contents
+  };
+
+  using EnumType = unsigned int;
+
+  enum class WidgetState : EnumType
+  {
+    Ready = 0,     //!<
+    Executing = 1, //!<
+    Completed = 2, //!<
+    Disabled = 3
+  };
+  /**
+   * @brief Setter property for WidgetState
+   */
+  void setWidgetState(const PipelineItem::WidgetState& value);
+  /**
+   * @brief Getter property for WidgetState
+   * @return Value of WidgetState
+   */
+  PipelineItem::WidgetState getWidgetState() const;
+
+  enum class PipelineState : EnumType
+  {
+    Running = 0,
+    Stopped = 1,
+    Paused = 4,
+  };
+  /**
+   * @brief Setter property for PipelineState
+   */
+  void setPipelineState(const PipelineItem::PipelineState& value);
+  /**
+   * @brief Getter property for PipelineState
+   * @return Value of PipelineState
+   */
+  PipelineItem::PipelineState getPipelineState() const;
+
+  enum class ErrorState : EnumType
+  {
+    Ok = 0,
+    Error = 1,
+    Warning = 2,
+  };
+  /**
+   * @brief Setter property for ErrorState
+   */
+  void setErrorState(const PipelineItem::ErrorState& value);
+  /**
+   * @brief Getter property for ErrorState
+   * @return Value of ErrorState
+   */
+  PipelineItem::ErrorState getErrorState() const;
+
+  enum class ItemType : EnumType
+  {
+    Pipeline,
+    Filter,
+    DropIndicator,
+    Unknown
+  };
+  /**
+   * @brief Setter property for ItemType
+   */
+  void setItemType(const PipelineItem::ItemType& value);
+  /**
+   * @brief Getter property for ItemType
+   * @return Value of ItemType
+   */
+  PipelineItem::ItemType getItemType() const;
+
+  PipelineItem* child(int number);
+  PipelineItem* parent();
+
+  int childCount() const;
+  int columnCount() const;
+
+  QVariant data(int column) const;
+  bool setData(int column, const QVariant& value);
+
+  AbstractFilter::Pointer getFilter();
+  void setFilter(AbstractFilter::Pointer filter);
+
+  bool insertChild(int position, PipelineItem* child);
+  bool insertChildren(int position, int count, int columns);
+  bool insertColumns(int position, int columns);
+
+  bool removeChild(int position);
+  bool removeChildren(int position, int count);
+  bool removeColumns(int position, int columns);
+
+  int childNumber() const;
+
+  void setParent(PipelineItem* parent);
+
+  static QString TopLevelString();
+
+private:
+  FilterInputWidget* m_FilterInputWidget = nullptr;
+
+  bool m_FilterEnabled = true;
+  QIcon m_Icon;
+  bool m_Expanded = false;
+  QString m_ItemTooltip = "";
+  QString m_DropIndicatorText = "";
+  int m_BorderSize = 0;
+  QSize m_Size = QSize(0, MaxHeight);
+  int m_Height = 0;
+  int m_Width = 0;
+  int m_XOffset = 0;
+  int m_YOffset = 0;
+  PipelineItem::AnimationType m_CurrentAnimationType = {};
+  PipelineItem::WidgetState m_WidgetState = {};
+  PipelineItem::PipelineState m_PipelineState = {};
+  PipelineItem::ErrorState m_ErrorState = {};
+  PipelineItem::ItemType m_ItemType = {};
+
+  QList<PipelineItem*> m_ChildItems;
+  QVector<QVariant> m_ItemData;
+  AbstractFilter::Pointer m_Filter = nullptr;
+  PipelineItem* m_ParentItem = nullptr;
+
+  bool m_ActivePipeline = false;
+  bool m_PipelineSaved = false;
+
+  void setupFilterInputWidget();
+
+public:
+  PipelineItem(const PipelineItem&) = delete;            // Copy Constructor Not Implemented
+  PipelineItem(PipelineItem&&) = delete;                 // Move Constructor Not Implemented
+  PipelineItem& operator=(const PipelineItem&) = delete; // Copy Assignment Not Implemented
+  PipelineItem& operator=(PipelineItem&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
index 9a3b078264..5495f95ae2 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
@@ -1,61 +1,59 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
 
-
 #include "SVWidgetsLib/Widgets/PipelineItem.h"
 #include "SVWidgetsLib/Widgets/PipelineItemDelegate.h"
 #include "SVWidgetsLib/Widgets/PipelineModel.h"
 #include "SVWidgetsLib/Widgets/SVPipelineView.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-namespace {
-  const int k_ButtonSize = 24;
-  const int k_TextMargin = 4;
+namespace
+{
+const int k_ButtonSize = 24;
+const int k_TextMargin = 4;
 
-  const QColor k_DropIndicatorWidgetBackgroundColor = QColor(150, 150, 150);
-  const QColor k_DropIndicatorIndexBackgroundColor = QColor(48, 48, 48);
-  const QColor k_DropIndicatorLabelColor = QColor(242, 242, 242);
-}
+const QColor k_DropIndicatorWidgetBackgroundColor = QColor(150, 150, 150);
+const QColor k_DropIndicatorIndexBackgroundColor = QColor(48, 48, 48);
+const QColor k_DropIndicatorLabelColor = QColor(242, 242, 242);
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 PipelineItemDelegate::PipelineItemDelegate(SVPipelineView* view)
-  : QStyledItemDelegate(nullptr)
-  , m_View(view)
+: QStyledItemDelegate(nullptr)
+, m_View(view)
 {
 }
 
@@ -81,7 +79,7 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
 
   AbstractFilter::Pointer filter = model->filter(index);
   QColor grpColor;
-  if (filter.get() != nullptr)
+  if(filter.get() != nullptr)
   {
     QString grpName = filter->getGroupName();
     grpColor = SVStyle::Instance()->GetFilterBackgroundColor();
@@ -91,11 +89,11 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   QColor labelColor = SVStyle::Instance()->GetFilterFontColor();
   QColor indexBackgroundColor;
   QColor bgColor = grpColor;
-  #if 1
-    QColor selectedBgColor = SVStyle::Instance()->GetFilterSelectionColor();
-  #else
+#if 1
+  QColor selectedBgColor = SVStyle::Instance()->GetFilterSelectionColor();
+#else
   QColor selectedBgColor = m_View->palette().color(QPalette::Highlight);
-  #endif
+#endif
   QColor disabledBgColor = QColor(124, 124, 124);
 
   bool drawButtons = false;
@@ -120,27 +118,27 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
 
   switch(wState)
   {
-    case PipelineItem::WidgetState::Ready:
-      widgetBackgroundColor = bgColor;
-      //labelColor = QColor(240, 240, 240);
-      indexBackgroundColor = QColor(48, 48, 48);
-      break;
-    case PipelineItem::WidgetState::Executing:
-      widgetBackgroundColor = QColor(130, 130, 130);
-      //labelColor = QColor(20, 20, 20);
-      indexBackgroundColor = QColor(6, 140, 190);
-      break;
-    case PipelineItem::WidgetState::Completed:
-      widgetBackgroundColor = bgColor.name();
-      //labelColor = QColor(240, 240, 240);
-      indexBackgroundColor = QColor(6, 118, 6);
-      break;
-    case PipelineItem::WidgetState::Disabled:
-      bgColor = disabledBgColor;
-      widgetBackgroundColor = disabledBgColor.name();
-      //labelColor = QColor(240, 240, 240);
-      indexBackgroundColor = QColor(96, 96, 96);
-      break;
+  case PipelineItem::WidgetState::Ready:
+    widgetBackgroundColor = bgColor;
+    // labelColor = QColor(240, 240, 240);
+    indexBackgroundColor = QColor(48, 48, 48);
+    break;
+  case PipelineItem::WidgetState::Executing:
+    widgetBackgroundColor = QColor(130, 130, 130);
+    // labelColor = QColor(20, 20, 20);
+    indexBackgroundColor = QColor(6, 140, 190);
+    break;
+  case PipelineItem::WidgetState::Completed:
+    widgetBackgroundColor = bgColor.name();
+    // labelColor = QColor(240, 240, 240);
+    indexBackgroundColor = QColor(6, 118, 6);
+    break;
+  case PipelineItem::WidgetState::Disabled:
+    bgColor = disabledBgColor;
+    widgetBackgroundColor = disabledBgColor.name();
+    // labelColor = QColor(240, 240, 240);
+    indexBackgroundColor = QColor(96, 96, 96);
+    break;
   }
   QColor selectedColor = QColor::fromHsv(bgColor.hue(), 100, 120);
 
@@ -149,31 +147,31 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   {
     switch(pState)
     {
-      case PipelineItem::PipelineState::Running:
-        widgetBackgroundColor = selectedColor.name();
-        labelColor = QColor(20, 20, 20);
-        break;
-      case PipelineItem::PipelineState::Stopped:
-        widgetBackgroundColor = bgColor.name();
-        //labelColor = QColor(240, 240, 240);
-        break;
-      case PipelineItem::PipelineState::Paused:
-        widgetBackgroundColor = QColor(160, 160, 160);
-        labelColor = QColor(0, 0, 0);
-        break;
+    case PipelineItem::PipelineState::Running:
+      widgetBackgroundColor = selectedColor.name();
+      labelColor = QColor(20, 20, 20);
+      break;
+    case PipelineItem::PipelineState::Stopped:
+      widgetBackgroundColor = bgColor.name();
+      // labelColor = QColor(240, 240, 240);
+      break;
+    case PipelineItem::PipelineState::Paused:
+      widgetBackgroundColor = QColor(160, 160, 160);
+      labelColor = QColor(0, 0, 0);
+      break;
     }
 
     switch(eState)
     {
-      case PipelineItem::ErrorState::Ok:
-
-        break;
-      case PipelineItem::ErrorState::Error:
-        indexBackgroundColor = QColor(179, 2, 5);
-        break;
-      case PipelineItem::ErrorState::Warning:
-        indexBackgroundColor = QColor(232, 189, 0);
-        break;
+    case PipelineItem::ErrorState::Ok:
+
+      break;
+    case PipelineItem::ErrorState::Error:
+      indexBackgroundColor = QColor(179, 2, 5);
+      break;
+    case PipelineItem::ErrorState::Warning:
+      indexBackgroundColor = QColor(232, 189, 0);
+      break;
     }
   }
 
@@ -185,7 +183,7 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   QColor indexFontColor(242, 242, 242);
 
   PipelineItem::ItemType itemType = static_cast<PipelineItem::ItemType>(model->data(index, PipelineModel::ItemTypeRole).toInt());
-  if (itemType == PipelineItem::ItemType::DropIndicator)
+  if(itemType == PipelineItem::ItemType::DropIndicator)
   {
     indexBackgroundColor = k_DropIndicatorIndexBackgroundColor;
     widgetBackgroundColor = k_DropIndicatorWidgetBackgroundColor;
@@ -234,28 +232,29 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
   indexRect.setWidth(2 * textMargin + indexFontWidth);
 
   // If the width hint is less than the index area, draw only part of the index area
-//  int itemWidth = model->data(index, Qt::SizeHintRole).toSize().width();
-//  qDebug() << "ItemWidth: " << itemWidth;
-//  if (itemWidth < indexRect.width())
-//  {
-//    indexRect.setWidth(itemWidth);
-//  }
-//  qDebug() << "IndexRect: " << indexRect;
+  //  int itemWidth = model->data(index, Qt::SizeHintRole).toSize().width();
+  //  qDebug() << "ItemWidth: " << itemWidth;
+  //  if (itemWidth < indexRect.width())
+  //  {
+  //    indexRect.setWidth(itemWidth);
+  //  }
+  //  qDebug() << "IndexRect: " << indexRect;
   painter->fillRect(indexRect, indexBackgroundColor);
 
   // Draw the Title area
-  QRect coloredRect(2 * textMargin + indexFontWidth + xOffset, rect.y() + yOffset, rect.width() - (2 * textMargin + indexFontWidth), indexRect.height()); // +4? without it it does not paint to the edge
+  QRect coloredRect(2 * textMargin + indexFontWidth + xOffset, rect.y() + yOffset, rect.width() - (2 * textMargin + indexFontWidth),
+                    indexRect.height()); // +4? without it it does not paint to the edge
   painter->fillRect(coloredRect, widgetBackgroundColor);
 
   // Draw the border that separates the Index area and the Title area
   painter->setPen(QPen(QBrush(QColor(Qt::black)), m_BorderSize));
-//  painter->setPen(QPen(QBrush(QColor(48, 48, 48)), m_BorderSize));
+  //  painter->setPen(QPen(QBrush(QColor(48, 48, 48)), m_BorderSize));
   painter->drawLine(2 * textMargin + indexFontWidth + xOffset, rect.y() + yOffset + 1, 2 * textMargin + indexFontWidth + xOffset, rect.y() + yOffset + indexRect.height() - 0.5);
 
   // Draw the Index number
   painter->setPen(QPen(indexFontColor));
   QString number = getFilterIndexString(index); // format the index number with a leading zero
-  if (fontHeight <= indexRect.height())
+  if(fontHeight <= indexRect.height())
   {
     painter->drawText(rect.x() + textMargin + xOffset, rect.y() + fontMargin + fontHeight + yOffset, number);
   }
@@ -269,7 +268,7 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
     // Draw the "delete" button
     QRectF deleteBtnRect;
     deleteBtnRect.setX(option.rect.width() - ::k_ButtonSize - ::k_TextMargin);
-    deleteBtnRect.setY(option.rect.y() + ( (option.rect.height() / 2) - (::k_ButtonSize / 2) ) );
+    deleteBtnRect.setY(option.rect.y() + ((option.rect.height() / 2) - (::k_ButtonSize / 2)));
     deleteBtnRect.setWidth(::k_ButtonSize);
     deleteBtnRect.setHeight(::k_ButtonSize);
 
@@ -280,7 +279,7 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
     if(deleteBtnRect.contains(mousePos))
     {
       deleteBtnPixmap = m_View->getDeleteBtnHoveredPixmap(option.state & QStyle::State_Selected);
-      if (painter->device()->devicePixelRatio() == 2)
+      if(painter->device()->devicePixelRatio() == 2)
       {
         deleteBtnPixmap = m_View->getHighDPIDeleteBtnHoveredPixmap(option.state & QStyle::State_Selected);
       }
@@ -288,58 +287,60 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
     else
     {
       deleteBtnPixmap = m_View->getDeleteBtnPixmap(option.state & QStyle::State_Selected);
-      if (painter->device()->devicePixelRatio() == 2)
+      if(painter->device()->devicePixelRatio() == 2)
       {
         deleteBtnPixmap = m_View->getHighDPIDeleteBtnPixmap(option.state & QStyle::State_Selected);
       }
     }
 
-    painter->drawPixmap(deleteBtnRect.center().x() - (deleteBtnRect.width() / 2) + xOffset, deleteBtnRect.center().y() - (deleteBtnRect.height() / 2 + 1) + yOffset, deleteBtnPixmap);  // y is 1px offset due to how the images were cut
+    painter->drawPixmap(deleteBtnRect.center().x() - (deleteBtnRect.width() / 2) + xOffset, deleteBtnRect.center().y() - (deleteBtnRect.height() / 2 + 1) + yOffset,
+                        deleteBtnPixmap); // y is 1px offset due to how the images were cut
 
     // Draw the "disable" button
     QRectF disableBtnRect;
     disableBtnRect.setX(deleteBtnRect.x() - ::k_TextMargin - ::k_ButtonSize);
-    disableBtnRect.setY(option.rect.y() + ( (option.rect.height() / 2) - (::k_ButtonSize / 2) ) );
+    disableBtnRect.setY(option.rect.y() + ((option.rect.height() / 2) - (::k_ButtonSize / 2)));
     disableBtnRect.setWidth(::k_ButtonSize);
     disableBtnRect.setHeight(::k_ButtonSize);
 
     QPixmap disableBtnPixmap;
     PipelineItem::WidgetState wState = static_cast<PipelineItem::WidgetState>(model->data(index, PipelineModel::WidgetStateRole).toInt());
-    if (wState == PipelineItem::WidgetState::Disabled)
+    if(wState == PipelineItem::WidgetState::Disabled)
     {
       disableBtnPixmap = m_View->getDisableBtnActivatedPixmap(option.state & QStyle::State_Selected);
-      if (painter->device()->devicePixelRatio() == 2)
+      if(painter->device()->devicePixelRatio() == 2)
       {
-         disableBtnPixmap = m_View->getHighDPIDisableBtnActivatedPixmap(option.state & QStyle::State_Selected);
+        disableBtnPixmap = m_View->getHighDPIDisableBtnActivatedPixmap(option.state & QStyle::State_Selected);
       }
     }
     else if(disableBtnRect.contains(mousePos))
     {
       disableBtnPixmap = m_View->getDisableBtnHoveredPixmap(option.state & QStyle::State_Selected);
-      if (painter->device()->devicePixelRatio() == 2)
+      if(painter->device()->devicePixelRatio() == 2)
       {
-         disableBtnPixmap = m_View->getHighDPIDisableBtnHoveredPixmap(option.state & QStyle::State_Selected);
+        disableBtnPixmap = m_View->getHighDPIDisableBtnHoveredPixmap(option.state & QStyle::State_Selected);
       }
     }
     else
     {
       disableBtnPixmap = m_View->getDisableBtnPixmap(option.state & QStyle::State_Selected);
-      if (painter->device()->devicePixelRatio() == 2)
+      if(painter->device()->devicePixelRatio() == 2)
       {
-         disableBtnPixmap = m_View->getHighDPIDisableBtnPixmap(option.state & QStyle::State_Selected);
+        disableBtnPixmap = m_View->getHighDPIDisableBtnPixmap(option.state & QStyle::State_Selected);
       }
     }
 
     allowableWidth -= deleteBtnRect.width();
     allowableWidth -= disableBtnRect.width();
 
-    painter->drawPixmap(disableBtnRect.center().x() - (disableBtnRect.width() / 2) + xOffset, disableBtnRect.center().y() - (disableBtnRect.height() / 2 + 1) + yOffset, disableBtnPixmap);  // y is 1px offset due to how the images were cut
+    painter->drawPixmap(disableBtnRect.center().x() - (disableBtnRect.width() / 2) + xOffset, disableBtnRect.center().y() - (disableBtnRect.height() / 2 + 1) + yOffset,
+                        disableBtnPixmap); // y is 1px offset due to how the images were cut
   }
 
-//  QString elidedHumanLabel = fontMetrics.elidedText(m_FilterHumanLabel, Qt::ElideRight, allowableWidth);
+  //  QString elidedHumanLabel = fontMetrics.elidedText(m_FilterHumanLabel, Qt::ElideRight, allowableWidth);
 
-  int humanLabelWidth;  
-  if (itemType == PipelineItem::ItemType::DropIndicator)
+  int humanLabelWidth;
+  if(itemType == PipelineItem::ItemType::DropIndicator)
   {
     QString dropIndicatorText = model->dropIndicatorText(index);
     humanLabelWidth = fontMetrics.QFONTMETRICS_WIDTH(dropIndicatorText);
@@ -373,21 +374,21 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
     painter->setPen(pen);
   }
 
-  if (fontHeight <= indexRect.height())
+  if(fontHeight <= indexRect.height())
   {
-    if (itemType == PipelineItem::ItemType::DropIndicator)
+    if(itemType == PipelineItem::ItemType::DropIndicator)
     {
       QString text = model->dropIndicatorText(index);
       painter->drawText(rect.x() + indexBoxWidth + textMargin + xOffset, rect.y() + fontMargin + fontHeight + yOffset, text);
     }
-    else if (itemType == PipelineItem::ItemType::Filter)
+    else if(itemType == PipelineItem::ItemType::Filter)
     {
       painter->drawText(rect.x() + indexBoxWidth + textMargin + xOffset, rect.y() + fontMargin + fontHeight + yOffset, filter->getHumanLabel());
     }
   }
 
   QPen pen(QBrush(QColor(Qt::black)), m_BorderSize);
-//  QPen pen(QBrush(QColor(48, 48, 48)), m_BorderSize);
+  //  QPen pen(QBrush(QColor(48, 48, 48)), m_BorderSize);
   painter->setPen(pen);
 
   // Draw inside option.rect to avoid painting artifacts
@@ -401,13 +402,13 @@ void PipelineItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem &option, const QModelIndex &index)
+bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index)
 {
   PipelineModel* pipelineModel = dynamic_cast<PipelineModel*>(model);
 
   QRect deleteBtnRect;
   deleteBtnRect.setX(option.rect.width() - ::k_ButtonSize - ::k_TextMargin);
-  deleteBtnRect.setY(option.rect.y() + (option.rect.height()/2 - ::k_ButtonSize/2));
+  deleteBtnRect.setY(option.rect.y() + (option.rect.height() / 2 - ::k_ButtonSize / 2));
   deleteBtnRect.setWidth(::k_ButtonSize);
   deleteBtnRect.setHeight(::k_ButtonSize);
 
@@ -416,31 +417,31 @@ bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
 
   // Looking for click in the delete button area
   QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-  if (mouseEvent != nullptr)
+  if(mouseEvent != nullptr)
   {
     if(event->type() == QEvent::MouseMove)
     {
-      if (deleteBtnRect.contains(mouseEvent->pos()))
+      if(deleteBtnRect.contains(mouseEvent->pos()))
       {
         // We are inside the delete button
-        if (m_CurrentlyHoveredItem != HoverItem::DeleteButton)
+        if(m_CurrentlyHoveredItem != HoverItem::DeleteButton)
         {
           // We were not inside the delete button before, so set the current hovered item to DeleteButton and schedule a repaint
           m_CurrentlyHoveredItem = HoverItem::DeleteButton;
           return true;
         }
       }
-      else if (disableBtnRect.contains(mouseEvent->pos()))
+      else if(disableBtnRect.contains(mouseEvent->pos()))
       {
         // We are inside the disable button
-        if (m_CurrentlyHoveredItem != HoverItem::DisableButton)
+        if(m_CurrentlyHoveredItem != HoverItem::DisableButton)
         {
           // We were not inside the disable button before, so set the current hovered item to DisableButton and schedule a repaint
           m_CurrentlyHoveredItem = HoverItem::DisableButton;
           return true;
         }
       }
-      else if (m_CurrentlyHoveredItem != HoverItem::Widget)
+      else if(m_CurrentlyHoveredItem != HoverItem::Widget)
       {
         // Otherwise, we have to be inside the main widget.
         // We were not inside the main widget before, so set the current hovered item to Widget and schedule a repaint
@@ -454,7 +455,7 @@ bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
       if(deleteBtnRect.contains(mouseEvent->pos()) || disableBtnRect.contains(mouseEvent->pos()))
       {
         m_MousePressIndex = index.row();
-        return true;  // don't call the base class, we handled the event here
+        return true; // don't call the base class, we handled the event here
       }
     }
 
@@ -463,7 +464,7 @@ bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
       if(deleteBtnRect.contains(mouseEvent->pos()) || disableBtnRect.contains(mouseEvent->pos()))
       {
         m_MousePressIndex = -1;
-        //qDebug() << "Clicked the Pipeline Filter delete button on: " << index.data(Qt::DisplayRole).toString();
+        // qDebug() << "Clicked the Pipeline Filter delete button on: " << index.data(Qt::DisplayRole).toString();
 
         if(deleteBtnRect.contains(mouseEvent->pos()) && m_View->getPipelineState() != SVPipelineView::PipelineViewState::Running)
         {
@@ -475,7 +476,7 @@ bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
         {
           AbstractFilter::Pointer filter = pipelineModel->filter(index);
           bool enabled = filter->getEnabled();
-          if (enabled)
+          if(enabled)
           {
             filter->setEnabled(false);
             model->setData(index, static_cast<int>(PipelineItem::WidgetState::Disabled), PipelineModel::WidgetStateRole);
@@ -499,7 +500,7 @@ bool PipelineItemDelegate::editorEvent(QEvent* event, QAbstractItemModel* model,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString PipelineItemDelegate::getFilterIndexString(const QModelIndex &index) const
+QString PipelineItemDelegate::getFilterIndexString(const QModelIndex& index) const
 {
   const PipelineModel* model = getPipelineModel(index);
   int numFilters = model->rowCount();
@@ -534,7 +535,7 @@ QString PipelineItemDelegate::getFilterIndexString(const QModelIndex &index) con
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QPixmap PipelineItemDelegate::createPixmap(const QModelIndex &index) const
+QPixmap PipelineItemDelegate::createPixmap(const QModelIndex& index) const
 {
   QRect indexRect = m_View->visualRect(index);
 
@@ -558,7 +559,7 @@ QPixmap PipelineItemDelegate::createPixmap(const QModelIndex &index) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-const PipelineModel* PipelineItemDelegate::getPipelineModel(const QModelIndex &index) const
+const PipelineModel* PipelineItemDelegate::getPipelineModel(const QModelIndex& index) const
 {
   return dynamic_cast<const PipelineModel*>(index.model());
 }
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
old mode 100755
new mode 100644
index 73f7f52c40..3ecb30f5d6
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -43,50 +43,50 @@ class PipelineModel;
 
 class SVWidgetsLib_EXPORT PipelineItemDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:    
-    explicit PipelineItemDelegate(SVPipelineView* view);
+public:
+  explicit PipelineItemDelegate(SVPipelineView* view);
 
-    ~PipelineItemDelegate() override;
+  ~PipelineItemDelegate() override;
 
-    QPixmap createPixmap(const QModelIndex &index) const;
+  QPixmap createPixmap(const QModelIndex& index) const;
 
-  protected:
-    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) override;
+protected:
+  void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override;
+  bool editorEvent(QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index) override;
 
-  private:
-    enum class HoverItem : unsigned int
-    {
-      DeleteButton,
-      DisableButton,
-      Widget,
-      Unknown
-    };
+private:
+  enum class HoverItem : unsigned int
+  {
+    DeleteButton,
+    DisableButton,
+    Widget,
+    Unknown
+  };
 
-    SVPipelineView* m_View = nullptr;
-    int m_MousePressIndex = -1;
-    HoverItem m_CurrentlyHoveredItem = HoverItem::Unknown;
-    const qreal m_BorderSize = 1;
+  SVPipelineView* m_View = nullptr;
+  int m_MousePressIndex = -1;
+  HoverItem m_CurrentlyHoveredItem = HoverItem::Unknown;
+  const qreal m_BorderSize = 1;
 
-    /**
-     * @brief Gets the proper filter index string that refers to the specified index
-     * @param index
-     * @return
-     */
-    QString getFilterIndexString(const QModelIndex &index) const;
+  /**
+   * @brief Gets the proper filter index string that refers to the specified index
+   * @param index
+   * @return
+   */
+  QString getFilterIndexString(const QModelIndex& index) const;
 
-    /**
-     * @brief Convenience method to get the PipelineModel instance
-     * @param index
-     * @return
-     */
-    const PipelineModel* getPipelineModel(const QModelIndex &index) const;
+  /**
+   * @brief Convenience method to get the PipelineModel instance
+   * @param index
+   * @return
+   */
+  const PipelineModel* getPipelineModel(const QModelIndex& index) const;
 
-  public:
-    PipelineItemDelegate(const PipelineItemDelegate&) = delete; // Copy Constructor Not Implemented
-    PipelineItemDelegate(PipelineItemDelegate&&) = delete;      // Move Constructor Not Implemented
-    PipelineItemDelegate& operator=(const PipelineItemDelegate&) = delete; // Copy Assignment Not Implemented
-    PipelineItemDelegate& operator=(PipelineItemDelegate&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineItemDelegate(const PipelineItemDelegate&) = delete;            // Copy Constructor Not Implemented
+  PipelineItemDelegate(PipelineItemDelegate&&) = delete;                 // Move Constructor Not Implemented
+  PipelineItemDelegate& operator=(const PipelineItemDelegate&) = delete; // Copy Assignment Not Implemented
+  PipelineItemDelegate& operator=(PipelineItemDelegate&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
index 04dd4e1cd0..bfd42cbf37 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
@@ -1,31 +1,31 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineListWidget.h"
 
@@ -36,7 +36,7 @@
 //
 // -----------------------------------------------------------------------------
 PipelineListWidget::PipelineListWidget(QWidget* parent)
-  : QFrame(parent)
+: QFrame(parent)
 {
   setupUi(this);
 
@@ -84,7 +84,7 @@ void PipelineListWidget::on_startPipelineBtn_clicked()
     return;
   }
 
-  if (model->rowCount() > 0)
+  if(model->rowCount() > 0)
   {
     setPipelineState(SVPipelineView::PipelineViewState::Running);
     pipelineView->executePipeline();
diff --git a/Source/SVWidgetsLib/Widgets/PipelineListWidget.h b/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
index 9b287356d9..858d84cf4d 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
@@ -1,31 +1,31 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -37,75 +37,72 @@
 
 class SVWidgetsLib_EXPORT PipelineListWidget : public QFrame, private Ui::PipelineListWidget
 {
-    Q_OBJECT
-
-  public:
-    PipelineListWidget(QWidget* parent = nullptr);
-    ~PipelineListWidget() override;
-
-    /**
-     * @brief getPipelineView
-     * @return
-     */
-    SVPipelineView* getPipelineView();
-
-    /**
-     * @brief setProgressValue
-     * @param percent
-     */
-    void setProgressValue(float percent);
-
-  public slots:
-    /**
-     * @brief on_startPipelineBtn_clicked
-     */
-    void on_startPipelineBtn_clicked();
-
-    /**
-     * @brief preflightFinished
-     */
-    void preflightFinished(int pipelineFilterCount, int err);
-
-    /**
-     * @brief pipelineFinished
-     */
-    void pipelineFinished();
-
-  protected:
-
-    /**
-     * @brief setupGui
-     */
-    void setupGui();
-
-  signals:
-    void pipelineCanceled(const QModelIndex &pipelineIndex);
-
-  private:
-
-    /**
-     * @brief getStartPipelineIdleStyle
-     * @return
-     */
-    QString getStartPipelineIdleStyle();
-
-    /**
-     * @brief getStartPipelineInProgressStyle
-     * @param percent
-     * @return
-     */
-    QString getStartPipelineInProgressStyle(float percent);
-
-    /**
-     * @brief Sets the PipelineState and updates the UI to match
-     * @param state
-     */
-    void setPipelineState(SVPipelineView::PipelineViewState state);
-
-  public:
-    PipelineListWidget(const PipelineListWidget&) = delete; // Copy Constructor Not Implemented
-    PipelineListWidget(PipelineListWidget&&) = delete;      // Move Constructor Not Implemented
-    PipelineListWidget& operator=(const PipelineListWidget&) = delete; // Copy Assignment Not Implemented
-    PipelineListWidget& operator=(PipelineListWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  PipelineListWidget(QWidget* parent = nullptr);
+  ~PipelineListWidget() override;
+
+  /**
+   * @brief getPipelineView
+   * @return
+   */
+  SVPipelineView* getPipelineView();
+
+  /**
+   * @brief setProgressValue
+   * @param percent
+   */
+  void setProgressValue(float percent);
+
+public slots:
+  /**
+   * @brief on_startPipelineBtn_clicked
+   */
+  void on_startPipelineBtn_clicked();
+
+  /**
+   * @brief preflightFinished
+   */
+  void preflightFinished(int pipelineFilterCount, int err);
+
+  /**
+   * @brief pipelineFinished
+   */
+  void pipelineFinished();
+
+protected:
+  /**
+   * @brief setupGui
+   */
+  void setupGui();
+
+signals:
+  void pipelineCanceled(const QModelIndex& pipelineIndex);
+
+private:
+  /**
+   * @brief getStartPipelineIdleStyle
+   * @return
+   */
+  QString getStartPipelineIdleStyle();
+
+  /**
+   * @brief getStartPipelineInProgressStyle
+   * @param percent
+   * @return
+   */
+  QString getStartPipelineInProgressStyle(float percent);
+
+  /**
+   * @brief Sets the PipelineState and updates the UI to match
+   * @param state
+   */
+  void setPipelineState(SVPipelineView::PipelineViewState state);
+
+public:
+  PipelineListWidget(const PipelineListWidget&) = delete;            // Copy Constructor Not Implemented
+  PipelineListWidget(PipelineListWidget&&) = delete;                 // Move Constructor Not Implemented
+  PipelineListWidget& operator=(const PipelineListWidget&) = delete; // Copy Assignment Not Implemented
+  PipelineListWidget& operator=(PipelineListWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
index 09155fec0c..409edae253 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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 "PipelineModel.h"
 
@@ -64,7 +64,7 @@ PipelineModel::~PipelineModel()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineModel::updateActivePipeline(const QModelIndex &pipelineIdx)
+void PipelineModel::updateActivePipeline(const QModelIndex& pipelineIdx)
 {
   emit clearIssuesTriggered();
 
@@ -99,7 +99,7 @@ QVariant PipelineModel::data(const QModelIndex& index, int role) const
 
   PipelineItem* item = getItem(index);
 
-  if (role == PipelineModel::Roles::WidgetStateRole)
+  if(role == PipelineModel::Roles::WidgetStateRole)
   {
     return static_cast<int>(item->getWidgetState());
   }
@@ -115,31 +115,31 @@ QVariant PipelineModel::data(const QModelIndex& index, int role) const
   {
     return static_cast<int>(item->getItemType());
   }
-  else if (role == PipelineModel::Roles::BorderSizeRole)
+  else if(role == PipelineModel::Roles::BorderSizeRole)
   {
     return item->getBorderSize();
   }
-  else if (role == PipelineModel::Roles::HeightRole)
+  else if(role == PipelineModel::Roles::HeightRole)
   {
     return item->getHeight();
   }
-  else if (role == PipelineModel::Roles::WidthRole)
+  else if(role == PipelineModel::Roles::WidthRole)
   {
     return item->getWidth();
   }
-  else if (role == PipelineModel::Roles::XOffsetRole)
+  else if(role == PipelineModel::Roles::XOffsetRole)
   {
     return item->getXOffset();
   }
-  else if (role == PipelineModel::Roles::YOffsetRole)
+  else if(role == PipelineModel::Roles::YOffsetRole)
   {
     return item->getYOffset();
   }
-  else if (role == PipelineModel::Roles::ExpandedRole)
+  else if(role == PipelineModel::Roles::ExpandedRole)
   {
     return item->getExpanded();
   }
-  else if (role == PipelineModel::Roles::AnimationTypeRole)
+  else if(role == PipelineModel::Roles::AnimationTypeRole)
   {
     return item->getCurrentAnimationType();
   }
@@ -151,16 +151,16 @@ QVariant PipelineModel::data(const QModelIndex& index, int role) const
   {
     return item->getSize();
   }
-  else if (role == Qt::FontRole)
+  else if(role == Qt::FontRole)
   {
-    if (item->isActivePipeline())
+    if(item->isActivePipeline())
     {
       QFont font;
       font.setBold(true);
       return font;
     }
 
-      return QVariant();
+    return QVariant();
   }
   else if(role == Qt::ForegroundRole)
   {
@@ -180,7 +180,7 @@ QVariant PipelineModel::data(const QModelIndex& index, int role) const
       return item->getIcon();
     }
 
-      return QVariant();
+    return QVariant();
   }
 
   return QVariant();
@@ -189,7 +189,7 @@ QVariant PipelineModel::data(const QModelIndex& index, int role) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AbstractFilter::Pointer PipelineModel::filter(const QModelIndex &index) const
+AbstractFilter::Pointer PipelineModel::filter(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
@@ -197,7 +197,7 @@ AbstractFilter::Pointer PipelineModel::filter(const QModelIndex &index) const
   }
 
   PipelineItem* item = getItem(index);
-  if (item == nullptr)
+  if(item == nullptr)
   {
     return AbstractFilter::NullPointer();
   }
@@ -208,7 +208,7 @@ AbstractFilter::Pointer PipelineModel::filter(const QModelIndex &index) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineModel::setFilter(const QModelIndex &index, AbstractFilter::Pointer filter)
+void PipelineModel::setFilter(const QModelIndex& index, AbstractFilter::Pointer filter)
 {
   if(!index.isValid())
   {
@@ -216,7 +216,7 @@ void PipelineModel::setFilter(const QModelIndex &index, AbstractFilter::Pointer
   }
 
   PipelineItem* item = getItem(index);
-  if (item == nullptr)
+  if(item == nullptr)
   {
     return;
   }
@@ -229,7 +229,7 @@ void PipelineModel::setFilter(const QModelIndex &index, AbstractFilter::Pointer
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString PipelineModel::dropIndicatorText(const QModelIndex &index) const
+QString PipelineModel::dropIndicatorText(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
@@ -237,7 +237,7 @@ QString PipelineModel::dropIndicatorText(const QModelIndex &index) const
   }
 
   PipelineItem* item = getItem(index);
-  if (item == nullptr)
+  if(item == nullptr)
   {
     return QString();
   }
@@ -248,7 +248,7 @@ QString PipelineModel::dropIndicatorText(const QModelIndex &index) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineModel::setDropIndicatorText(const QModelIndex &index, const QString &text)
+void PipelineModel::setDropIndicatorText(const QModelIndex& index, const QString& text)
 {
   if(!index.isValid())
   {
@@ -256,7 +256,7 @@ void PipelineModel::setDropIndicatorText(const QModelIndex &index, const QString
   }
 
   PipelineItem* item = getItem(index);
-  if (item == nullptr)
+  if(item == nullptr)
   {
     return;
   }
@@ -269,12 +269,12 @@ void PipelineModel::setDropIndicatorText(const QModelIndex &index, const QString
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QModelIndex PipelineModel::indexOfFilter(AbstractFilter* filter, const QModelIndex &parent)
+QModelIndex PipelineModel::indexOfFilter(AbstractFilter* filter, const QModelIndex& parent)
 {
-  for (int i = 0; i < rowCount(parent); i++)
+  for(int i = 0; i < rowCount(parent); i++)
   {
     QModelIndex childIndex = index(i, PipelineItem::Contents, parent);
-    if (this->filter(childIndex).get() == filter)
+    if(this->filter(childIndex).get() == filter)
     {
       return childIndex;
     }
@@ -294,12 +294,12 @@ QModelIndex PipelineModel::getActivePipeline()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineModel::setActivePipeline(const QModelIndex &index, bool value)
+void PipelineModel::setActivePipeline(const QModelIndex& index, bool value)
 {
   PipelineItem* item = getItem(index);
   item->setActivePipeline(value);
-  
-  if (value)
+
+  if(value)
   {
     m_ActivePipelineIndex = index;
   }
@@ -323,7 +323,7 @@ void PipelineModel::clearActivePipeline()
 // -----------------------------------------------------------------------------
 Qt::ItemFlags PipelineModel::flags(const QModelIndex& index) const
 {
-  if (!index.isValid() || index.model() != this)
+  if(!index.isValid() || index.model() != this)
   {
     return Qt::ItemIsDropEnabled;
   }
@@ -347,25 +347,23 @@ QStringList PipelineModel::mimeTypes() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool PipelineModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const
+bool PipelineModel::canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const
 {
   Q_UNUSED(row);
   Q_UNUSED(parent);
 
-  if (action == Qt::IgnoreAction)
+  if(action == Qt::IgnoreAction)
   {
     return false;
   }
 
-  if (!data->hasFormat(SIMPLView::DragAndDrop::FilterPipelineItem)
-      && !data->hasFormat(SIMPLView::DragAndDrop::FilterListItem)
-      && !data->hasFormat(SIMPLView::DragAndDrop::BookmarkItem)
-      && !data->hasFormat(SIMPLView::DragAndDrop::Url))
+  if(!data->hasFormat(SIMPLView::DragAndDrop::FilterPipelineItem) && !data->hasFormat(SIMPLView::DragAndDrop::FilterListItem) && !data->hasFormat(SIMPLView::DragAndDrop::BookmarkItem) &&
+     !data->hasFormat(SIMPLView::DragAndDrop::Url))
   {
     return false;
   }
 
-  if (column > 0)
+  if(column > 0)
   {
     return false;
   }
@@ -392,7 +390,7 @@ PipelineItem* PipelineModel::getItem(const QModelIndex& index) const
 //// -----------------------------------------------------------------------------
 ////
 //// -----------------------------------------------------------------------------
-//QVariant PipelineModel::headerData(int section, Qt::Orientation orientation, int role) const
+// QVariant PipelineModel::headerData(int section, Qt::Orientation orientation, int role) const
 //{
 //  if(orientation == Qt::Horizontal && role == Qt::DisplayRole)
 //  {
@@ -420,7 +418,7 @@ QModelIndex PipelineModel::index(int row, int column, const QModelIndex& parent)
     return createIndex(row, column, childItem);
   }
 
-    return QModelIndex();
+  return QModelIndex();
 }
 
 // -----------------------------------------------------------------------------
@@ -521,7 +519,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 {
   PipelineItem* item = getItem(index);
 
-  if (role == PipelineModel::Roles::WidgetStateRole)
+  if(role == PipelineModel::Roles::WidgetStateRole)
   {
     bool ok = false;
     int intValue = value.toInt(&ok);
@@ -533,7 +531,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     PipelineItem::WidgetState value = static_cast<PipelineItem::WidgetState>(intValue);
     item->setWidgetState(value);
   }
-  else if (role == PipelineModel::Roles::ErrorStateRole)
+  else if(role == PipelineModel::Roles::ErrorStateRole)
   {
     bool ok = false;
     int intValue = value.toInt(&ok);
@@ -545,7 +543,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     PipelineItem::ErrorState value = static_cast<PipelineItem::ErrorState>(intValue);
     item->setErrorState(value);
   }
-  else if (role == PipelineModel::Roles::PipelineStateRole)
+  else if(role == PipelineModel::Roles::PipelineStateRole)
   {
     bool ok = false;
     int intValue = value.toInt(&ok);
@@ -557,7 +555,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     PipelineItem::PipelineState value = static_cast<PipelineItem::PipelineState>(intValue);
     item->setPipelineState(value);
   }
-  else if (role == PipelineModel::Roles::ItemTypeRole)
+  else if(role == PipelineModel::Roles::ItemTypeRole)
   {
     bool ok = false;
     int intValue = value.toInt(&ok);
@@ -569,7 +567,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     PipelineItem::ItemType value = static_cast<PipelineItem::ItemType>(intValue);
     item->setItemType(value);
   }
-  else if (role == PipelineModel::Roles::BorderSizeRole)
+  else if(role == PipelineModel::Roles::BorderSizeRole)
   {
     bool ok = false;
     int borderSize = value.toInt(&ok);
@@ -580,7 +578,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 
     item->setBorderSize(borderSize);
   }
-  else if (role == PipelineModel::Roles::HeightRole)
+  else if(role == PipelineModel::Roles::HeightRole)
   {
     bool ok = false;
     int height = value.toInt(&ok);
@@ -591,7 +589,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 
     item->setHeight(height);
   }
-  else if (role == PipelineModel::Roles::WidthRole)
+  else if(role == PipelineModel::Roles::WidthRole)
   {
     bool ok = false;
     int width = value.toInt(&ok);
@@ -602,7 +600,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 
     item->setWidth(width);
   }
-  else if (role == PipelineModel::Roles::XOffsetRole)
+  else if(role == PipelineModel::Roles::XOffsetRole)
   {
     bool ok = false;
     int offset = value.toInt(&ok);
@@ -613,7 +611,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 
     item->setXOffset(offset);
   }
-  else if (role == PipelineModel::Roles::YOffsetRole)
+  else if(role == PipelineModel::Roles::YOffsetRole)
   {
     bool ok = false;
     int offset = value.toInt(&ok);
@@ -624,7 +622,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
 
     item->setYOffset(offset);
   }
-  else if (role == PipelineModel::Roles::AnimationTypeRole)
+  else if(role == PipelineModel::Roles::AnimationTypeRole)
   {
     bool ok = false;
     int animationInt = value.toInt(&ok);
@@ -636,7 +634,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     PipelineItem::AnimationType animationType = static_cast<PipelineItem::AnimationType>(animationInt);
     item->setCurrentAnimationType(animationType);
   }
-  else if (role == PipelineModel::Roles::ExpandedRole)
+  else if(role == PipelineModel::Roles::ExpandedRole)
   {
     int expanded = static_cast<int>(value.toBool());
     item->setExpanded(expanded != 0);
@@ -649,11 +647,11 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
   {
     item->setItemTooltip(value.toString());
   }
-  else if (role == Qt::DisplayRole)
+  else if(role == Qt::DisplayRole)
   {
     item->setData(index.column(), value);
   }
-  else if (role == Qt::SizeHintRole)
+  else if(role == Qt::SizeHintRole)
   {
     item->setSize(value.toSize());
   }
@@ -708,7 +706,7 @@ int PipelineModel::getMaxFilterCount() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool PipelineModel::pipelineSaved(const QModelIndex &index)
+bool PipelineModel::pipelineSaved(const QModelIndex& index)
 {
   PipelineItem* item = getItem(index);
   return item->isPipelineSaved();
@@ -717,7 +715,7 @@ bool PipelineModel::pipelineSaved(const QModelIndex &index)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PipelineModel::setPipelineSaved(const QModelIndex &index, bool saved)
+void PipelineModel::setPipelineSaved(const QModelIndex& index, bool saved)
 {
   PipelineItem* item = getItem(index);
   item->setPipelineSaved(saved);
@@ -728,7 +726,7 @@ void PipelineModel::setPipelineSaved(const QModelIndex &index, bool saved)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FilterInputWidget* PipelineModel::filterInputWidget(const QModelIndex &index)
+FilterInputWidget* PipelineModel::filterInputWidget(const QModelIndex& index)
 {
   PipelineItem* item = getItem(index);
   return item->getFilterInputWidget();
@@ -753,7 +751,7 @@ bool PipelineModel::isEmpty()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QColor PipelineModel::getForegroundColor(const QModelIndex &index) const
+QColor PipelineModel::getForegroundColor(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.h b/Source/SVWidgetsLib/Widgets/PipelineModel.h
old mode 100755
new mode 100644
index 07cf8c1caa..8db90035b2
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.h
@@ -1,33 +1,33 @@
 /* ============================================================================
-* Copyright (c) 2017 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2017 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -35,7 +35,6 @@
 #include <QtCore/QModelIndex>
 #include <QtCore/QVariant>
 
-
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 
@@ -47,127 +46,126 @@ class QtSSettings;
 
 class SVWidgetsLib_EXPORT PipelineModel : public QAbstractItemModel
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    /**
-     * @brief Returns the name of the class for PipelineModel
-     */
-    QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for PipelineModel
-     */
-    static QString ClassName();
+public:
+  /**
+   * @brief Returns the name of the class for PipelineModel
+   */
+  QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for PipelineModel
+   */
+  static QString ClassName();
 
-    PipelineModel(QObject* parent = nullptr);
+  PipelineModel(QObject* parent = nullptr);
 
-    ~PipelineModel() override;
+  ~PipelineModel() override;
 
-    enum Roles
-    {
-      WidgetStateRole = Qt::UserRole + 1,
-      ErrorStateRole,
-      PipelineStateRole,
-      ItemTypeRole,
-      ExpandedRole,
-      BorderSizeRole,
-      HeightRole,
-      WidthRole,
-      XOffsetRole,
-      YOffsetRole,
-      AnimationTypeRole
-    };
+  enum Roles
+  {
+    WidgetStateRole = Qt::UserRole + 1,
+    ErrorStateRole,
+    PipelineStateRole,
+    ItemTypeRole,
+    ExpandedRole,
+    BorderSizeRole,
+    HeightRole,
+    WidthRole,
+    XOffsetRole,
+    YOffsetRole,
+    AnimationTypeRole
+  };
 
-    /**
-     * @brief Setter property for MaxNumberOfPipelines
-     */
-    void setMaxNumberOfPipelines(int value);
-    /**
-     * @brief Getter property for MaxNumberOfPipelines
-     * @return Value of MaxNumberOfPipelines
-     */
-    int getMaxNumberOfPipelines() const;
+  /**
+   * @brief Setter property for MaxNumberOfPipelines
+   */
+  void setMaxNumberOfPipelines(int value);
+  /**
+   * @brief Getter property for MaxNumberOfPipelines
+   * @return Value of MaxNumberOfPipelines
+   */
+  int getMaxNumberOfPipelines() const;
 
-    /**
-     * @brief updateActivePipeline
-     * @param pipelineIdx
-     */
-    void updateActivePipeline(const QModelIndex &pipelineIdx);
+  /**
+   * @brief updateActivePipeline
+   * @param pipelineIdx
+   */
+  void updateActivePipeline(const QModelIndex& pipelineIdx);
 
-    QVariant data(const QModelIndex& index, int role) const override;
-//    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+  QVariant data(const QModelIndex& index, int role) const override;
+  //    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
-    AbstractFilter::Pointer filter(const QModelIndex &index) const;
-    void setFilter(const QModelIndex &index, AbstractFilter::Pointer filter);
+  AbstractFilter::Pointer filter(const QModelIndex& index) const;
+  void setFilter(const QModelIndex& index, AbstractFilter::Pointer filter);
 
-    QString dropIndicatorText(const QModelIndex &index) const;
-    void setDropIndicatorText(const QModelIndex &index, const QString &text);
+  QString dropIndicatorText(const QModelIndex& index) const;
+  void setDropIndicatorText(const QModelIndex& index, const QString& text);
 
-    QModelIndex indexOfFilter(AbstractFilter *filter, const QModelIndex &parent = QModelIndex());
+  QModelIndex indexOfFilter(AbstractFilter* filter, const QModelIndex& parent = QModelIndex());
 
-    FilterInputWidget* filterInputWidget(const QModelIndex &index);
+  FilterInputWidget* filterInputWidget(const QModelIndex& index);
 
-    bool isEmpty();
+  bool isEmpty();
 
-    QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
-    QModelIndex parent(const QModelIndex& index) const override;
+  QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
+  QModelIndex parent(const QModelIndex& index) const override;
 
-    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
-    int columnCount(const QModelIndex& parent = QModelIndex()) const override;
+  int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+  int columnCount(const QModelIndex& parent = QModelIndex()) const override;
 
-    bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) override;
-    bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) override;
+  bool insertRows(int position, int rows, const QModelIndex& parent = QModelIndex()) override;
+  bool removeRows(int position, int rows, const QModelIndex& parent = QModelIndex()) override;
 
-    bool moveRows(const QModelIndex & sourceParent, int sourceRow, int count, const QModelIndex & destinationParent, int destinationChild) override;
+  bool moveRows(const QModelIndex& sourceParent, int sourceRow, int count, const QModelIndex& destinationParent, int destinationChild) override;
 
-    Qt::ItemFlags flags(const QModelIndex& index) const override;
+  Qt::ItemFlags flags(const QModelIndex& index) const override;
 
-    Qt::DropActions supportedDropActions() const override;
+  Qt::DropActions supportedDropActions() const override;
 
-    QStringList mimeTypes() const override;
-    
-    bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override;
+  QStringList mimeTypes() const override;
 
-    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
+  bool canDropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) const override;
 
-    bool pipelineSaved(const QModelIndex &index);
-    void setPipelineSaved(const QModelIndex &index, bool saved);
+  bool setData(const QModelIndex& index, const QVariant& value, int role) override;
 
-    QModelIndex getActivePipeline();
-    void setActivePipeline(const QModelIndex &index, bool value);
-    void clearActivePipeline();
+  bool pipelineSaved(const QModelIndex& index);
+  void setPipelineSaved(const QModelIndex& index, bool saved);
 
-    PipelineItem* getRootItem();
+  QModelIndex getActivePipeline();
+  void setActivePipeline(const QModelIndex& index, bool value);
+  void clearActivePipeline();
 
-    int getMaxFilterCount() const;
+  PipelineItem* getRootItem();
 
-    QList<QObject*> getPipelineMessageObservers();
+  int getMaxFilterCount() const;
 
-  signals:
-    void clearIssuesTriggered();
+  QList<QObject*> getPipelineMessageObservers();
 
-    void preflightTriggered(const QModelIndex &pipelineIndex, PipelineModel* model);
+signals:
+  void clearIssuesTriggered();
 
-    void pipelineDataChanged(const QModelIndex &pipelineIndex);
+  void preflightTriggered(const QModelIndex& pipelineIndex, PipelineModel* model);
 
-    void statusMessageGenerated(const QString &msg);
-    void standardOutputMessageGenerated(const QString &msg);
+  void pipelineDataChanged(const QModelIndex& pipelineIndex);
 
-  private:
-    int m_MaxNumberOfPipelines = {};
+  void statusMessageGenerated(const QString& msg);
+  void standardOutputMessageGenerated(const QString& msg);
 
-    PipelineItem*                       m_RootItem;
+private:
+  int m_MaxNumberOfPipelines = {};
 
-    QPersistentModelIndex               m_ActivePipelineIndex;
+  PipelineItem* m_RootItem;
 
-    PipelineItem* getItem(const QModelIndex& index) const;
+  QPersistentModelIndex m_ActivePipelineIndex;
 
-    QColor getForegroundColor(const QModelIndex &index) const;
+  PipelineItem* getItem(const QModelIndex& index) const;
 
-  public:
-    PipelineModel(const PipelineModel&) = delete;            // Copy Constructor Not Implemented
-    PipelineModel(PipelineModel&&) = delete;                 // Move Constructor Not Implemented
-    PipelineModel& operator=(const PipelineModel&) = delete; // Copy Assignment Not Implemented
-    PipelineModel& operator=(PipelineModel&&) = delete;      // Move Assignment Not Implemented
-};
+  QColor getForegroundColor(const QModelIndex& index) const;
 
+public:
+  PipelineModel(const PipelineModel&) = delete;            // Copy Constructor Not Implemented
+  PipelineModel(PipelineModel&&) = delete;                 // Move Constructor Not Implemented
+  PipelineModel& operator=(const PipelineModel&) = delete; // Copy Assignment Not Implemented
+  PipelineModel& operator=(PipelineModel&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.cpp b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
index ad5025461f..c6fbd79bb8 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "PipelineView.h"
 
@@ -65,7 +65,7 @@ void PipelineView::addUndoCommand(QUndoCommand* cmd)
 void PipelineView::setupUndoStack()
 {
   m_UndoStack = QSharedPointer<QUndoStack>(new QUndoStack());
- // m_UndoStack->setUndoLimit(4);
+  // m_UndoStack->setUndoLimit(4);
 
   m_ActionUndo = m_UndoStack->createUndoAction(m_UndoStack.data());
   m_ActionRedo = m_UndoStack->createRedoAction(m_UndoStack.data());
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.h b/Source/SVWidgetsLib/Widgets/PipelineView.h
old mode 100755
new mode 100644
index 18ed70d568..2e0ba9f877
--- a/Source/SVWidgetsLib/Widgets/PipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.h
@@ -1,38 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -51,53 +50,51 @@ class QUndoStack;
  */
 class SVWidgetsLib_EXPORT PipelineView
 {
-  public:
-
-    PipelineView();
-    virtual ~PipelineView();
-
-    /**
-     * @brief addUndoCommand
-     * @param cmd
-     */
-    void addUndoCommand(QUndoCommand* cmd);
-
-    /**
-     * @brief undo
-     */
-    void undo();
-
-    /**
-     * @brief redo
-     */
-    void redo();
-
-    /**
-     * @brief getActionUndo
-     * @return
-     */
-    QAction* getActionUndo();
-
-    /**
-     * @brief getActionRedo
-     * @return
-     */
-    QAction* getActionRedo();
-
-  private:
-    QSharedPointer<QUndoStack> m_UndoStack;
-    QAction* m_ActionUndo = nullptr;
-    QAction* m_ActionRedo = nullptr;
-
-    /**
-     * @brief setupUndoStack
-     */
-    void setupUndoStack();
-
-  public:
-    PipelineView(const PipelineView&) = delete;   // Copy Constructor Not Implemented
-    PipelineView(PipelineView&&) = delete;        // Move Constructor Not Implemented
-    PipelineView& operator=(const PipelineView&) = delete; // Copy Assignment Not Implemented
-    PipelineView& operator=(PipelineView&&) = delete;      // Move Assignment Not Implemented
+public:
+  PipelineView();
+  virtual ~PipelineView();
+
+  /**
+   * @brief addUndoCommand
+   * @param cmd
+   */
+  void addUndoCommand(QUndoCommand* cmd);
+
+  /**
+   * @brief undo
+   */
+  void undo();
+
+  /**
+   * @brief redo
+   */
+  void redo();
+
+  /**
+   * @brief getActionUndo
+   * @return
+   */
+  QAction* getActionUndo();
+
+  /**
+   * @brief getActionRedo
+   * @return
+   */
+  QAction* getActionRedo();
+
+private:
+  QSharedPointer<QUndoStack> m_UndoStack;
+  QAction* m_ActionUndo = nullptr;
+  QAction* m_ActionRedo = nullptr;
+
+  /**
+   * @brief setupUndoStack
+   */
+  void setupUndoStack();
+
+public:
+  PipelineView(const PipelineView&) = delete;            // Copy Constructor Not Implemented
+  PipelineView(PipelineView&&) = delete;                 // Move Constructor Not Implemented
+  PipelineView& operator=(const PipelineView&) = delete; // Copy Assignment Not Implemented
+  PipelineView& operator=(PipelineView&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
index 426d79e3e9..0239e72e8a 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
@@ -33,14 +33,13 @@
 
 #include <QtGui/QPainter>
 
-
 #include "moc_PopUpWidget.cpp"
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PopUpWidget::PopUpWidget(QWidget *parent)
-  : QWidget (parent)
+PopUpWidget::PopUpWidget(QWidget* parent)
+: QWidget(parent)
 {
   setupUi(this);
 
@@ -72,34 +71,33 @@ void PopUpWidget::paintEvent(QPaintEvent* event)
   QPainterPath painterPath;
   QPolygonF polygon;
 
-  if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Left)
+  if(m_ArrowOrientation == PopUpWidget::ArrowOrientation::Left)
   {
     setContentsMargins(m_ArrowHeight, 0, 0, 0);
-    polygon << QPointF(m_ArrowHeight, m_ArrowOffset) << QPointF(0, m_ArrowOffset + m_ArrowWidth / 2)
-            << QPointF(m_ArrowHeight, m_ArrowOffset + m_ArrowWidth) << QPointF(m_ArrowHeight, m_ArrowOffset);
+    polygon << QPointF(m_ArrowHeight, m_ArrowOffset) << QPointF(0, m_ArrowOffset + m_ArrowWidth / 2) << QPointF(m_ArrowHeight, m_ArrowOffset + m_ArrowWidth) << QPointF(m_ArrowHeight, m_ArrowOffset);
     painterPath.addPolygon(polygon);
   }
-  else if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Right)
+  else if(m_ArrowOrientation == PopUpWidget::ArrowOrientation::Right)
   {
     setContentsMargins(0, 0, m_ArrowHeight, 0);
     polygon << QPointF(size().width() - m_ArrowHeight, m_ArrowOffset) << QPointF(size().width(), m_ArrowOffset + m_ArrowWidth / 2)
             << QPointF(size().width() - m_ArrowHeight, m_ArrowOffset + m_ArrowWidth) << QPointF(size().width() - m_ArrowHeight, m_ArrowOffset);
     painterPath.addPolygon(polygon);
   }
-//  else if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Top)
-//  {
-//    setContentsMargins(0, m_ArrowHeight, 0, 0);
-//    polygon << QPointF(m_ArrowOffset, m_ArrowHeight) << QPointF(m_ArrowOffset + m_ArrowWidth / 2, 0)
-//            << QPointF(m_ArrowOffset + m_ArrowWidth, m_ArrowHeight) << QPointF(m_ArrowOffset, m_ArrowHeight);
-//    painterPath.addPolygon(polygon);
-//  }
-//  else if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Bottom)
-//  {
-//    setContentsMargins(0, 0, 0, m_ArrowHeight);
-//    polygon << QPointF(m_ArrowOffset, size().height()) << QPointF(m_ArrowOffset + m_ArrowWidth / 2, size().height() + m_ArrowHeight)
-//            << QPointF(m_ArrowOffset + m_ArrowWidth, size().height()) << QPointF(m_ArrowOffset, size().height());
-//    painterPath.addPolygon(polygon);
-//  }
+  //  else if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Top)
+  //  {
+  //    setContentsMargins(0, m_ArrowHeight, 0, 0);
+  //    polygon << QPointF(m_ArrowOffset, m_ArrowHeight) << QPointF(m_ArrowOffset + m_ArrowWidth / 2, 0)
+  //            << QPointF(m_ArrowOffset + m_ArrowWidth, m_ArrowHeight) << QPointF(m_ArrowOffset, m_ArrowHeight);
+  //    painterPath.addPolygon(polygon);
+  //  }
+  //  else if (m_ArrowOrientation == PopUpWidget::ArrowOrientation::Bottom)
+  //  {
+  //    setContentsMargins(0, 0, 0, m_ArrowHeight);
+  //    polygon << QPointF(m_ArrowOffset, size().height()) << QPointF(m_ArrowOffset + m_ArrowWidth / 2, size().height() + m_ArrowHeight)
+  //            << QPointF(m_ArrowOffset + m_ArrowWidth, size().height()) << QPointF(m_ArrowOffset, size().height());
+  //    painterPath.addPolygon(polygon);
+  //  }
   else if(m_ArrowOrientation == PopUpWidget::ArrowOrientation::None)
   {
     setContentsMargins(0, 0, 0, 0);
@@ -129,17 +127,17 @@ void PopUpWidget::setWidget(QWidget* widget)
     return;
   }
 
-//  // Clear the existing widget
-//  QLayoutItem* item = gridLayout->takeAt(0);
-//  if(item)
-//  {
-//    QWidget* w = item->widget();
-//    if(w)
-//    {
-//      w->hide();
-//      w->setParent(nullptr);
-//    }
-//  }
+  //  // Clear the existing widget
+  //  QLayoutItem* item = gridLayout->takeAt(0);
+  //  if(item)
+  //  {
+  //    QWidget* w = item->widget();
+  //    if(w)
+  //    {
+  //      w->hide();
+  //      w->setParent(nullptr);
+  //    }
+  //  }
 
   // Set the widget into the frame
   scrollArea->setWidget(widget);
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.h b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
index a6c889e3f6..2467a60f06 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
@@ -33,7 +33,6 @@
 
 #include <QtWidgets/QWidget>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_PopUpWidget.h"
@@ -43,84 +42,83 @@
  */
 class SVWidgetsLib_EXPORT PopUpWidget : public QWidget, private Ui::PopUpWidget
 {
-    Q_OBJECT
-
-  public:
-    PopUpWidget(QWidget *parent = Q_NULLPTR);
-    ~PopUpWidget() override;
-
-    using EnumType = unsigned int;
-
-    enum class ArrowOrientation : EnumType
-    {
-      Top,
-      Bottom,
-      Left,
-      Right,
-      None
-    };
-
-    /**
-     * @brief Setter property for ArrowHeight
-     */
-    void setArrowHeight(int value);
-    /**
-     * @brief Getter property for ArrowHeight
-     * @return Value of ArrowHeight
-     */
-    int getArrowHeight() const;
-
-    /**
-     * @brief Setter property for ArrowWidth
-     */
-    void setArrowWidth(int value);
-    /**
-     * @brief Getter property for ArrowWidth
-     * @return Value of ArrowWidth
-     */
-    int getArrowWidth() const;
-
-    /**
-     * @brief Setter property for ArrowOffset
-     */
-    void setArrowOffset(int value);
-    /**
-     * @brief Getter property for ArrowOffset
-     * @return Value of ArrowOffset
-     */
-    int getArrowOffset() const;
-
-    /**
-     * @brief setupGui
-     */
-    void setupGui();
-
-    /**
-     * @brief setWidget
-     * @param widget
-     */
-    void setWidget(QWidget* widget);
-
-    /**
-     * @brief setArrowOrientation
-     * @param orientation
-     */
-    void setArrowOrientation(ArrowOrientation orientation);
-
-  protected:
-    void paintEvent(QPaintEvent* event) override;
-
-  private:
-    int m_ArrowHeight = {};
-    int m_ArrowWidth = {};
-    int m_ArrowOffset = {};
-
-    ArrowOrientation                    m_ArrowOrientation;
-
-  public:
-    PopUpWidget(const PopUpWidget&) = delete;            // Copy Constructor Not Implemented
-    PopUpWidget(PopUpWidget&&) = delete;                 // Move Constructor Not Implemented
-    PopUpWidget& operator=(const PopUpWidget&) = delete; // Copy Assignment Not Implemented
-    PopUpWidget& operator=(PopUpWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  PopUpWidget(QWidget* parent = Q_NULLPTR);
+  ~PopUpWidget() override;
+
+  using EnumType = unsigned int;
+
+  enum class ArrowOrientation : EnumType
+  {
+    Top,
+    Bottom,
+    Left,
+    Right,
+    None
+  };
+
+  /**
+   * @brief Setter property for ArrowHeight
+   */
+  void setArrowHeight(int value);
+  /**
+   * @brief Getter property for ArrowHeight
+   * @return Value of ArrowHeight
+   */
+  int getArrowHeight() const;
+
+  /**
+   * @brief Setter property for ArrowWidth
+   */
+  void setArrowWidth(int value);
+  /**
+   * @brief Getter property for ArrowWidth
+   * @return Value of ArrowWidth
+   */
+  int getArrowWidth() const;
+
+  /**
+   * @brief Setter property for ArrowOffset
+   */
+  void setArrowOffset(int value);
+  /**
+   * @brief Getter property for ArrowOffset
+   * @return Value of ArrowOffset
+   */
+  int getArrowOffset() const;
+
+  /**
+   * @brief setupGui
+   */
+  void setupGui();
+
+  /**
+   * @brief setWidget
+   * @param widget
+   */
+  void setWidget(QWidget* widget);
+
+  /**
+   * @brief setArrowOrientation
+   * @param orientation
+   */
+  void setArrowOrientation(ArrowOrientation orientation);
+
+protected:
+  void paintEvent(QPaintEvent* event) override;
+
+private:
+  int m_ArrowHeight = {};
+  int m_ArrowWidth = {};
+  int m_ArrowOffset = {};
+
+  ArrowOrientation m_ArrowOrientation;
+
+public:
+  PopUpWidget(const PopUpWidget&) = delete;            // Copy Constructor Not Implemented
+  PopUpWidget(PopUpWidget&&) = delete;                 // Move Constructor Not Implemented
+  PopUpWidget& operator=(const PopUpWidget&) = delete; // Copy Assignment Not Implemented
+  PopUpWidget& operator=(PopUpWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/ProgressDialog.h b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
index 72b62d4fba..4af54b345c 100644
--- a/Source/SVWidgetsLib/Widgets/ProgressDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
@@ -31,15 +31,14 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-
 #include "SIMPLib/Messages/AbstractMessage.h"
 
 #include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-
-namespace Ui {
+namespace Ui
+{
 class ProgressDialog;
 }
 
@@ -50,23 +49,20 @@ class ProgressDialogMessageHandler;
  */
 class SVWidgetsLib_EXPORT ProgressDialog : public QDialog
 {
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    ProgressDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
-    ~ProgressDialog() override;
+public:
+  ProgressDialog(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags());
+  ~ProgressDialog() override;
 
-    friend ProgressDialogMessageHandler;
+  friend ProgressDialogMessageHandler;
 
-  public slots:
+public slots:
 
-    void setLabelText(const QString& text);
-    void processPipelineMessage(const AbstractMessage::Pointer& msg);
+  void setLabelText(const QString& text);
+  void processPipelineMessage(const AbstractMessage::Pointer& msg);
 
-  protected:
-
-
-  private:
-    QSharedPointer<Ui::ProgressDialog>  m_Ui;
+protected:
+private:
+  QSharedPointer<Ui::ProgressDialog> m_Ui;
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/SVControlWidgets.cpp b/Source/SVWidgetsLib/Widgets/SVControlWidgets.cpp
index c5ea334ba1..cad5b0e940 100644
--- a/Source/SVWidgetsLib/Widgets/SVControlWidgets.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVControlWidgets.cpp
@@ -1,42 +1,41 @@
 
 #include "SVControlWidgets.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVPushButton::SVPushButton(QWidget* parent) :
-QPushButton(parent)
-{}
+SVPushButton::SVPushButton(QWidget* parent)
+: QPushButton(parent)
+{
+}
 
 SVPushButton::~SVPushButton() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVIconPushButton::SVIconPushButton(QWidget* parent) :
-QPushButton(parent)
-{}
+SVIconPushButton::SVIconPushButton(QWidget* parent)
+: QPushButton(parent)
+{
+}
 
 SVIconPushButton::~SVIconPushButton() = default;
 
-
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVToolButton::SVToolButton(QWidget* parent) :
-QToolButton(parent)
-{}
+SVToolButton::SVToolButton(QWidget* parent)
+: QToolButton(parent)
+{
+}
 
 SVToolButton::~SVToolButton() = default;
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVSpinBox::SVSpinBox(QWidget* parent) :
-QSpinBox(parent)
+SVSpinBox::SVSpinBox(QWidget* parent)
+: QSpinBox(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
@@ -46,20 +45,19 @@ SVSpinBox::~SVSpinBox() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVDoubleSpinBox::SVDoubleSpinBox(QWidget* parent) :
-QDoubleSpinBox(parent)
+SVDoubleSpinBox::SVDoubleSpinBox(QWidget* parent)
+: QDoubleSpinBox(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
 
 SVDoubleSpinBox::~SVDoubleSpinBox() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVLineEdit::SVLineEdit(QWidget* parent) :
-QLineEdit(parent)
+SVLineEdit::SVLineEdit(QWidget* parent)
+: QLineEdit(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
@@ -69,44 +67,41 @@ SVLineEdit::~SVLineEdit() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVSmallLabel::SVSmallLabel(QWidget* parent) :
-QLabel(parent)
+SVSmallLabel::SVSmallLabel(QWidget* parent)
+: QLabel(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
 
 SVSmallLabel::~SVSmallLabel() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVTreeView::SVTreeView(QWidget* parent) :
-QTreeView(parent)
+SVTreeView::SVTreeView(QWidget* parent)
+: QTreeView(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
 
 SVTreeView::~SVTreeView() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVListView::SVListView(QWidget* parent) :
-QListView(parent)
+SVListView::SVListView(QWidget* parent)
+: QListView(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
 
 SVListView::~SVListView() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVListWidget::SVListWidget(QWidget* parent) :
-QListWidget(parent)
+SVListWidget::SVListWidget(QWidget* parent)
+: QListWidget(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
@@ -116,8 +111,8 @@ SVListWidget::~SVListWidget() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVTreeWidget::SVTreeWidget(QWidget* parent) :
-QTreeWidget(parent)
+SVTreeWidget::SVTreeWidget(QWidget* parent)
+: QTreeWidget(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
@@ -127,20 +122,19 @@ SVTreeWidget::~SVTreeWidget() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVTabWidget::SVTabWidget(QWidget* parent) :
-  QTabWidget(parent)
+SVTabWidget::SVTabWidget(QWidget* parent)
+: QTabWidget(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
 
 SVTabWidget::~SVTabWidget() = default;
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SVDialog::SVDialog(QWidget* parent) :
-  QDialog(parent)
+SVDialog::SVDialog(QWidget* parent)
+: QDialog(parent)
 {
   setAttribute(Qt::WA_MacShowFocusRect, false);
 }
diff --git a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
index 20c449add9..900794ff2e 100644
--- a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
+++ b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
@@ -21,11 +21,10 @@
 class SVWidgetsLib_EXPORT SVPushButton : public QPushButton
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVPushButton(QWidget* parent = nullptr);
   ~SVPushButton() override;
-  
 };
 
 /**
@@ -35,25 +34,22 @@ class SVWidgetsLib_EXPORT SVPushButton : public QPushButton
 class SVWidgetsLib_EXPORT SVIconPushButton : public QPushButton
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVIconPushButton(QWidget* parent = nullptr);
   ~SVIconPushButton() override;
-  
 };
 
-
 /**
  * @brief The SVToolButton class
  */
 class SVWidgetsLib_EXPORT SVToolButton : public QToolButton
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVToolButton(QWidget* parent = nullptr);
   ~SVToolButton() override;
-  
 };
 
 /**
@@ -64,10 +60,9 @@ class SVWidgetsLib_EXPORT SVSpinBox : public QSpinBox
 {
   Q_OBJECT
 
-  public:
+public:
   SVSpinBox(QWidget* parent = nullptr);
   ~SVSpinBox() override;
-
 };
 
 /**
@@ -78,24 +73,21 @@ class SVWidgetsLib_EXPORT SVDoubleSpinBox : public QDoubleSpinBox
 {
   Q_OBJECT
 
-  public:
+public:
   SVDoubleSpinBox(QWidget* parent = nullptr);
   ~SVDoubleSpinBox() override;
-
 };
 
-
 /**
  * @brief The SVLineEdit class
  */
 class SVWidgetsLib_EXPORT SVLineEdit : public QLineEdit
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVLineEdit(QWidget* parent = nullptr);
   ~SVLineEdit() override;
-  
 };
 
 /**
@@ -104,57 +96,46 @@ class SVWidgetsLib_EXPORT SVLineEdit : public QLineEdit
 class SVWidgetsLib_EXPORT SVSmallLabel : public QLabel
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVSmallLabel(QWidget* parent = nullptr);
   ~SVSmallLabel() override;
-  
 };
 
-
-
-
 /**
  * @brief The SVTreeView class
  */
 class SVWidgetsLib_EXPORT SVTreeView : public QTreeView
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVTreeView(QWidget* parent = nullptr);
   ~SVTreeView() override;
-  
 };
 
-
-
-
 /**
  * @brief The SVListView class
  */
 class SVWidgetsLib_EXPORT SVListView : public QListView
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVListView(QWidget* parent = nullptr);
   ~SVListView() override;
-  
 };
 
-
 /**
  * @brief The SVListWidget class
  */
 class SVWidgetsLib_EXPORT SVListWidget : public QListWidget
 {
   Q_OBJECT
-  
-  public:
+
+public:
   SVListWidget(QWidget* parent = nullptr);
   ~SVListWidget() override;
-  
 };
 
 /**
@@ -164,15 +145,14 @@ class SVWidgetsLib_EXPORT SVTreeWidget : public QTreeWidget
 {
   Q_OBJECT
 
-  public:
+public:
   SVTreeWidget(QWidget* parent = nullptr);
   ~SVTreeWidget() override;
-
 };
 
 /**
-* @brief The SVTabWidget class
-*/
+ * @brief The SVTabWidget class
+ */
 class SVWidgetsLib_EXPORT SVTabWidget : public QTabWidget
 {
   Q_OBJECT
@@ -180,13 +160,11 @@ class SVWidgetsLib_EXPORT SVTabWidget : public QTabWidget
 public:
   SVTabWidget(QWidget* parent = nullptr);
   ~SVTabWidget() override;
-
 };
 
-
 /**
-* @brief The SVDialog class
-*/
+ * @brief The SVDialog class
+ */
 class SVWidgetsLib_EXPORT SVDialog : public QDialog
 {
   Q_OBJECT
@@ -194,7 +172,6 @@ class SVWidgetsLib_EXPORT SVDialog : public QDialog
 public:
   SVDialog(QWidget* parent = nullptr);
   ~SVDialog() override;
-
 };
 
 /**
diff --git a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
index 77f4e8b9bc..de2d0ef404 100644
--- a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
@@ -461,15 +461,15 @@ double SVOverlayWidgetButton::getEndValue() const
       return m_Target->size().width();
     }
 
-      return m_Target->size().height();
+    return m_Target->size().height();
   }
 
-    if(TargetSide::Left == m_Side || TargetSide::Right == m_Side)
-    {
-      return m_Source->sizeHint().width() + m_Layout->margin() * 2;
-    }
+  if(TargetSide::Left == m_Side || TargetSide::Right == m_Side)
+  {
+    return m_Source->sizeHint().width() + m_Layout->margin() * 2;
+  }
 
-      return m_Source->sizeHint().height() + m_Layout->margin() * 2;
+  return m_Source->sizeHint().height() + m_Layout->margin() * 2;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 29062307d5..3d68a9b373 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -335,7 +335,7 @@ void SVPipelineView::preflightPipeline()
   // Create a Pipeline Object and fill it with the filters from this View
   FilterPipeline::Pointer pipeline = getFilterPipeline();
 
-  //qDebug() << "Prepping Filters for preflight... ";
+  // qDebug() << "Prepping Filters for preflight... ";
 
   FilterPipeline::FilterContainerType filters = pipeline->getFilterContainer();
   for(int i = 0; i < filters.size(); i++)
@@ -578,7 +578,7 @@ FilterPipeline::Pointer SVPipelineView::getFilterPipeline()
         connect(pipeline.get(), SIGNAL(pipelineCanceled()), breakpoint.get(), SLOT(resumePipeline()));
       }
 
-      pipeline->pushBack(filter); 
+      pipeline->pushBack(filter);
     }
   }
 
@@ -659,7 +659,7 @@ int SVPipelineView::writePipeline(const QString& outputPath)
     return -1;
   }
 
-    emit statusMessage(tr("The pipeline has been saved successfully to '%1'.").arg(fi.fileName()));
+  emit statusMessage(tr("The pipeline has been saved successfully to '%1'.").arg(fi.fileName()));
 
   return 0;
 }
@@ -1192,7 +1192,7 @@ int SVPipelineView::findPreviousRow(const QPoint& pos)
     return index.row();
   }
 
-    return 0;
+  return 0;
 }
 
 // -----------------------------------------------------------------------------
@@ -1694,7 +1694,6 @@ void SVPipelineView::requestFilterItemContextMenu(const QPoint& pos, const QMode
   menu.addAction(actionPasteBelow);
   menu.addSeparator();
 
-
   int count = selectedIndexes.size();
   bool widgetEnabled = true;
 
@@ -1930,7 +1929,7 @@ void SVPipelineView::setModel(QAbstractItemModel* model)
 {
   QAbstractItemModel* oldModel = this->model();
 
-    delete oldModel;
+  delete oldModel;
 
   QListView::setModel(model);
 
@@ -1992,7 +1991,7 @@ QPixmap SVPipelineView::getDisableBtnPixmap(bool highlighted)
     return m_DisableHighlightedPixmap;
   }
 
-    return m_DisableBtnPixmap;
+  return m_DisableBtnPixmap;
 }
 
 // -----------------------------------------------------------------------------
@@ -2018,7 +2017,7 @@ QPixmap SVPipelineView::getHighDPIDisableBtnPixmap(bool highlighted)
     return m_DisableBtnHighlightedPixmap2x;
   }
 
-    return m_DisableBtnPixmap2x;
+  return m_DisableBtnPixmap2x;
 }
 
 // -----------------------------------------------------------------------------
@@ -2074,7 +2073,7 @@ QPixmap SVPipelineView::getDisableBtnHoveredPixmap(bool highlighted)
     return m_DisableBtnHoveredHighlightedPixmap;
   }
 
-    return m_DisableBtnHoveredPixmap;
+  return m_DisableBtnHoveredPixmap;
 }
 
 // -----------------------------------------------------------------------------
@@ -2100,7 +2099,7 @@ QPixmap SVPipelineView::getHighDPIDisableBtnHoveredPixmap(bool highlighted)
     return m_DisableBtnHoveredHighlightedPixmap2x;
   }
 
-    return m_DisableBtnHoveredPixmap2x;
+  return m_DisableBtnHoveredPixmap2x;
 }
 
 // -----------------------------------------------------------------------------
@@ -2126,7 +2125,7 @@ QPixmap SVPipelineView::getDeleteBtnPixmap(bool highlighted)
     return m_DeleteBtnHighlightedPixmap;
   }
 
-    return m_DeleteBtnPixmap;
+  return m_DeleteBtnPixmap;
 }
 
 // -----------------------------------------------------------------------------
@@ -2152,7 +2151,7 @@ QPixmap SVPipelineView::getHighDPIDeleteBtnPixmap(bool highlighted)
     return m_DeleteBtnHighlightedPixmap2x;
   }
 
-    return m_DeleteBtnPixmap2x;
+  return m_DeleteBtnPixmap2x;
 }
 
 // -----------------------------------------------------------------------------
@@ -2178,7 +2177,7 @@ QPixmap SVPipelineView::getDeleteBtnHoveredPixmap(bool highlighted)
     return m_DeleteBtnHoveredHighlightedPixmap;
   }
 
-    return m_DeleteBtnHoveredPixmap;
+  return m_DeleteBtnHoveredPixmap;
 }
 
 // -----------------------------------------------------------------------------
@@ -2204,7 +2203,7 @@ QPixmap SVPipelineView::getHighDPIDeleteBtnHoveredPixmap(bool highlighted)
     return m_DeleteBtnHoveredHighlightedPixmap2x;
   }
 
-    return m_DeleteBtnHoveredPixmap2x;
+  return m_DeleteBtnHoveredPixmap2x;
 }
 
 // -----------------------------------------------------------------------------
@@ -2223,7 +2222,7 @@ QPixmap SVPipelineView::setPixmapColor(const QPixmap& pixmap, const QColor& pixm
 
       color.setAlpha(alpha);
 
-      if (color.isValid())
+      if(color.isValid())
       {
         image.setPixelColor(x, y, color);
       }
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
old mode 100755
new mode 100644
index 19a021de57..f1e181e343
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -40,7 +40,6 @@
 #include <stack>
 #include <vector>
 
-
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QListView>
 
@@ -581,8 +580,8 @@ private slots:
   QPixmap setPixmapColor(const QPixmap& pixmap, const QColor& pixmapColor);
 
 public:
-  SVPipelineView(const SVPipelineView&) = delete; // Copy Constructor Not Implemented
-  SVPipelineView(SVPipelineView&&) = delete;      // Move Constructor Not Implemented
+  SVPipelineView(const SVPipelineView&) = delete;            // Copy Constructor Not Implemented
+  SVPipelineView(SVPipelineView&&) = delete;                 // Move Constructor Not Implemented
   SVPipelineView& operator=(const SVPipelineView&) = delete; // Copy Assignment Not Implemented
   SVPipelineView& operator=(SVPipelineView&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index f35639ca2c..f8dc0e6327 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SVStyle.h"
 
@@ -53,10 +53,11 @@ static QMap<QString, QImage> s_NameToImage;
 
 SVStyle* SVStyle::self = nullptr;
 
-namespace  {
+namespace
+{
 const QString kNormalColor("#8f8f91");
 const QString kErrorColor("#BC0000");
-}
+} // namespace
 
 // -----------------------------------------------------------------------------
 //
@@ -67,10 +68,10 @@ SVStyle::SVStyle()
   SVStyle::self = this;
 
   const QMetaObject* metaObj = metaObject();
-  for (int i = metaObj->propertyOffset(); i < metaObj->propertyCount(); ++i)
+  for(int i = metaObj->propertyOffset(); i < metaObj->propertyCount(); ++i)
   {
     QMetaProperty property = metaObj->property(i);
-    if (property.type() == QVariant::Color)
+    if(property.type() == QVariant::Color)
     {
       m_ColorProperties.push_back(property.name());
     }
@@ -99,7 +100,7 @@ SVStyle* SVStyle::Instance()
 // -----------------------------------------------------------------------------
 void SVStyle::invalidateColorProperties()
 {
-  for (int i = 0; i < m_ColorProperties.size(); i++)
+  for(int i = 0; i < m_ColorProperties.size(); i++)
   {
     QString colorPropertyName = m_ColorProperties[i];
     setProperty(colorPropertyName.toStdString().c_str(), QColor());
@@ -109,22 +110,22 @@ void SVStyle::invalidateColorProperties()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
+bool SVStyle::loadStyleSheet(const QString& jsonFilePath)
 {
-//  qDebug() << "SVStyle::loadStyleSheet() " << jsonFilePath;
+  //  qDebug() << "SVStyle::loadStyleSheet() " << jsonFilePath;
   invalidateColorProperties();
 
   bool success = true;
-  
+
   QFileInfo jsonFileInfo(jsonFilePath);
-  
+
   QFile jsonFile(jsonFilePath);
   if(!jsonFile.open(QFile::ReadOnly))
   {
     qDebug() << "Could not open JSON File " << jsonFilePath;
-    return false; 
+    return false;
   }
-  
+
   QByteArray jsonContent = jsonFile.readAll();
   QJsonParseError parseError;
   QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonContent, &parseError);
@@ -135,32 +136,32 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
     return false;
   }
   QJsonObject rootObj = jsonDoc.object();
-  
+
   // Create the CSS File Path and try to read the CSS template file
   QString cssFileName = rootObj["CSS_File_Name"].toString();
   cssFileName = QString("%1/%2").arg(jsonFileInfo.absolutePath(), 1).arg(cssFileName, 2);
-  
+
   QFile cssFile(cssFileName);
   if(!cssFile.open(QFile::ReadOnly))
   {
     qDebug() << "Could not open CSS File " << cssFileName;
-    return false; 
+    return false;
   }
   QString cssContent = QString::fromLatin1(cssFile.readAll());
-  
+
   // Read the variable mapping from the JSON file
   QJsonObject varMapping = rootObj["Named_Variables"].toObject();
-  
+
   // Get the CSS Replacements that need to be made
   QJsonObject cssRepl = rootObj["CSS_Replacements"].toObject();
   QStringList keys = cssRepl.keys();
   QStringList::const_iterator constIterator;
-  for (constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
+  for(constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
   {
     const QString key = *constIterator;
 
     QString value = loadStringProperty(key, cssRepl, varMapping);
-    if (!value.isNull())
+    if(!value.isNull())
     {
       // Do the replacement
       cssContent = cssContent.replace(key, value);
@@ -187,16 +188,18 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
       }
       else
       {
-        this->setProperty( key.toLocal8Bit().constData(), QColor(value));
+        this->setProperty(key.toLocal8Bit().constData(), QColor(value));
       }
     }
   }
-  
+
   //
   //
   keys.clear();
-  keys << "FilterBackgroundColor"  << "FilterSelectionColor" << "FilterFontColor";
-  for (constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
+  keys << "FilterBackgroundColor"
+       << "FilterSelectionColor"
+       << "FilterFontColor";
+  for(constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
   {
     const QString key = *constIterator;
     QString value = rootObj[key].toString();
@@ -206,10 +209,10 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
     {
       value = varMapping[value].toString();
     }
-    
+
     if(value.startsWith("#"))
     {
-      this->setProperty( key.toLocal8Bit().constData(), QColor(value));
+      this->setProperty(key.toLocal8Bit().constData(), QColor(value));
     }
     else
     {
@@ -223,7 +226,7 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
         int r = tokens[0].toInt(&ok);
         int g = tokens[1].toInt(&ok);
         int b = tokens[2].toInt(&ok);
-        bool didSet = this->setProperty( key.toLocal8Bit().constData(), QColor(r, g, b));
+        bool didSet = this->setProperty(key.toLocal8Bit().constData(), QColor(r, g, b));
         if(!didSet)
         {
           qDebug() << "Property: " << key << " was not set correctly";
@@ -231,31 +234,31 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
       }
     }
   }
-  
+
   keys.clear();
 
   // Get the CSS Font replacements that need to be made
   QJsonObject fontRepl = rootObj["Font_Replacements"].toObject();
   keys = fontRepl.keys();
-  #if defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
   QString os("macOS");
 #elif defined(Q_OS_WIN)
   QString os("Windows");
 #else
   QString os("Linux");
 #endif
-  
+
   QJsonObject osFontRepl = fontRepl[os].toObject();
   keys = osFontRepl.keys();
-  for (constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
+  for(constIterator = keys.constBegin(); constIterator != keys.constEnd(); ++constIterator)
   {
     const QString key = *constIterator;
     QString value = osFontRepl[key].toString();
     cssContent = cssContent.replace(key, value);
   }
-  
+
   m_CurrentThemeFilePath = jsonFilePath;
-  
+
   // FINALLY, Set the style sheet into the app object
   qApp->setStyleSheet(cssContent);
   emit styleSheetLoaded(jsonFilePath);
@@ -265,14 +268,14 @@ bool SVStyle::loadStyleSheet(const QString &jsonFilePath)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString SVStyle::loadStringProperty(const QString &key, QJsonObject cssRepl, QJsonObject varMapping)
+QString SVStyle::loadStringProperty(const QString& key, QJsonObject cssRepl, QJsonObject varMapping)
 {
   QString value = cssRepl[key].toString();
-  if (!value.isNull())
+  if(!value.isNull())
   {
     // See if it is a variable and if it is, then get the real value from
     // the Named_Variables section
-    for (QJsonObject::iterator iter = varMapping.begin(); iter != varMapping.end(); iter++)
+    for(QJsonObject::iterator iter = varMapping.begin(); iter != varMapping.end(); iter++)
     {
       QString mapKey = iter.key();
       QString mapValue = iter.value().toString();
@@ -288,14 +291,14 @@ QString SVStyle::loadStringProperty(const QString &key, QJsonObject cssRepl, QJs
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int SVStyle::loadIntegerProperty(const QString &key, QJsonObject cssRepl, QJsonObject varMapping)
+int SVStyle::loadIntegerProperty(const QString& key, QJsonObject cssRepl, QJsonObject varMapping)
 {
   QString value = cssRepl[key].toString();
-  if (!value.isNull())
+  if(!value.isNull())
   {
     // See if it is a variable and if it is, then get the real value from
     // the Named_Variables section
-    if (varMapping.contains(value))
+    if(varMapping.contains(value))
     {
       int intValue = varMapping[value].toInt();
       return intValue;
@@ -425,11 +428,8 @@ void SVStyle::LineEditErrorStyle(QLineEdit* lineEdit)
   QString str;
   QTextStream ss(&str);
   ss << "QLineEdit#" << lineEdit->objectName() << "{";
-  ss << "border: 1px solid rgb("
-  << m_Widget_Error_color.red() << ", "
-  << m_Widget_Error_color.green() << ", "
-  << m_Widget_Error_color.blue() << ");"
-  << "}";
+  ss << "border: 1px solid rgb(" << m_Widget_Error_color.red() << ", " << m_Widget_Error_color.green() << ", " << m_Widget_Error_color.blue() << ");"
+     << "}";
   lineEdit->setStyleSheet(str);
 }
 
@@ -450,30 +450,24 @@ void SVStyle::LineEditBackgroundErrorStyle(QLineEdit* lineEdit)
   QTextStream ss(&str);
   ss << "QLineEdit#" << lineEdit->objectName() << "{";
   //  ss << "border: 1px solid rgb(180, 0, 0);";
-  ss << "background-color: rgb("
-  << m_QLineEditError_background_color.red() << ", "
-  << m_QLineEditError_background_color.green() << ", "
-  << m_QLineEditError_background_color.blue() << ");"
-  << "}";
-  
+  ss << "background-color: rgb(" << m_QLineEditError_background_color.red() << ", " << m_QLineEditError_background_color.green() << ", " << m_QLineEditError_background_color.blue() << ");"
+     << "}";
+
   lineEdit->setStyleSheet(str);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SVStyle::SetErrorColor(const QString &widgetType, QWidget* widget)
+void SVStyle::SetErrorColor(const QString& widgetType, QWidget* widget)
 {
   QString str;
   QTextStream ss(&str);
   ss << widgetType << "#" << widget->objectName() << "{";
   //  ss << "border: 1px solid rgb(180, 0, 0);";
-  ss << "color: rgb("
-  << m_Text_Error_color.red() << ", "
-  << m_Text_Error_color.green() << ", "
-  << m_Text_Error_color.blue() << ");"
-  << "}";
-  
+  ss << "color: rgb(" << m_Text_Error_color.red() << ", " << m_Text_Error_color.green() << ", " << m_Text_Error_color.blue() << ");"
+     << "}";
+
   widget->setStyleSheet(str);
 }
 
@@ -483,7 +477,7 @@ void SVStyle::SetErrorColor(const QString &widgetType, QWidget* widget)
 QString SVStyle::QToolSelectionButtonStyle(bool exists)
 {
   QString str;
-  #if 0
+#if 0
   QTextStream ss(&str);
 
   QFont font;
@@ -558,7 +552,7 @@ QString SVStyle::QToolSelectionButtonStyle(bool exists)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QColor SVStyle::ColorForFilterGroup(const QString &grpName)
+QColor SVStyle::ColorForFilterGroup(const QString& grpName)
 {
   QColor color(102, 96, 255);
 
@@ -647,7 +641,6 @@ QColor SVStyle::ColorForFilterGroup(const QString &grpName)
     }
   }
 
-
   return color;
 }
 
@@ -678,12 +671,12 @@ QColor SVStyle::GetFilterFontColor()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QIcon SVStyle::IconForGroup(const QString &grpName)
+QIcon SVStyle::IconForGroup(const QString& grpName)
 {
-  
+
   QColor color = ColorForFilterGroup(grpName);
   QImage grpImage;
-  
+
   if(s_NameToImage.contains(grpName))
   {
     return QIcon(QPixmap::fromImage(s_NameToImage[grpName]));
@@ -707,7 +700,7 @@ QIcon SVStyle::IconForGroup(const QString &grpName)
           pixel.setGreenF((pixel.greenF() * 1.50 > 1.0) ? 1.0 : pixel.greenF() * 1.50);
           pixel.setBlueF((pixel.blueF() * 1.50 > 1.0) ? 1.0 : pixel.blueF() * 1.50);
 
-          if (pixel.isValid())
+          if(pixel.isValid())
           {
             grpImage.setPixelColor(w, h, pixel);
           }
@@ -719,7 +712,7 @@ QIcon SVStyle::IconForGroup(const QString &grpName)
           //          pixel.setRedF(pixel.redF() * 1.50);
           //          pixel.setGreenF(pixel.greenF() * 1.50);
           //          pixel.setBlueF(pixel.blueF() * 1.50);
-          if (pixel.isValid())
+          if(pixel.isValid())
           {
             grpImage.setPixelColor(w, h, pixel);
           }
@@ -732,7 +725,7 @@ QIcon SVStyle::IconForGroup(const QString &grpName)
           pixel.setGreenF(pixel.greenF() * .50);
           pixel.setBlueF(pixel.blueF() * .50);
 
-          if (pixel.isValid())
+          if(pixel.isValid())
           {
             grpImage.setPixelColor(w, h, pixel);
           }
@@ -758,7 +751,8 @@ QString SVStyle::WrapTextWithHtmlStyle(const QString& msg, bool bold) const
   {
     out << "<b ";
   }
-  else {
+  else
+  {
     out << "<span ";
   }
   out << "style=\"color: " << getQLabel_color().name(QColor::HexRgb) << ";\">";
@@ -767,7 +761,8 @@ QString SVStyle::WrapTextWithHtmlStyle(const QString& msg, bool bold) const
   {
     out << " </b>";
   }
-  else {
+  else
+  {
     out << "</span>";
   }
   return formattedMessage;
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index 52d48ab1d9..626610c233 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -41,7 +41,6 @@
 #include <QtGui/QFont>
 #include <QtGui/QIcon>
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 class QLineEdit;
@@ -68,1756 +67,1757 @@ const QString InformationImagePath(":/SIMPL/icons/images/information.png");
 
 class SVWidgetsLib_EXPORT SVStyle : public QObject
 {
-    Q_OBJECT
-  public:
-    /**
-     * @brief Returns the name of the class for SVStyle
-     */
-    virtual QString getNameOfClass() const;
-    /**
-     * @brief Returns the name of the class for SVStyle
-     */
-    static QString ClassName();
-
-    ~SVStyle() override;
-    
-    /**
-     * @brief
-     * @return
-     */
-    static SVStyle* Instance();
-
-    QString getCurrentThemeFilePath() const;
-
-    /**
-     * @brief Setter property for Fader_color
-     */
-    void setFader_color(const QColor& value);
-    /**
-     * @brief Getter property for Fader_color
-     * @return Value of Fader_color
-     */
-    QColor getFader_color() const;
-
-    Q_PROPERTY(QColor Fader_color READ getFader_color WRITE setFader_color)
-
-    /**
-     * @brief Setter property for Widget_Error_color
-     */
-    void setWidget_Error_color(const QColor& value);
-    /**
-     * @brief Getter property for Widget_Error_color
-     * @return Value of Widget_Error_color
-     */
-    QColor getWidget_Error_color() const;
-
-    Q_PROPERTY(QColor Widget_Error_color READ getWidget_Error_color WRITE setWidget_Error_color)
-
-    /**
-     * @brief Setter property for Text_Error_color
-     */
-    void setText_Error_color(const QColor& value);
-    /**
-     * @brief Getter property for Text_Error_color
-     * @return Value of Text_Error_color
-     */
-    QColor getText_Error_color() const;
-
-    Q_PROPERTY(QColor Text_Error_color READ getText_Error_color WRITE setText_Error_color)
-
-    /**
-     * @brief Setter property for CentralWidget_background_color
-     */
-    void setCentralWidget_background_color(const QColor& value);
-    /**
-     * @brief Getter property for CentralWidget_background_color
-     * @return Value of CentralWidget_background_color
-     */
-    QColor getCentralWidget_background_color() const;
-
-    Q_PROPERTY(QColor CentralWidget_background_color READ getCentralWidget_background_color WRITE setCentralWidget_background_color)
-
-    /**
-     * @brief Setter property for QLabel_color
-     */
-    void setQLabel_color(const QColor& value);
-    /**
-     * @brief Getter property for QLabel_color
-     * @return Value of QLabel_color
-     */
-    QColor getQLabel_color() const;
-
-    Q_PROPERTY(QColor QLabel_color READ getQLabel_color WRITE setQLabel_color)
-
-    /**
-     * @brief Setter property for FilterInputWidget_background_color
-     */
-    void setFilterInputWidget_background_color(const QColor& value);
-    /**
-     * @brief Getter property for FilterInputWidget_background_color
-     * @return Value of FilterInputWidget_background_color
-     */
-    QColor getFilterInputWidget_background_color() const;
-
-    Q_PROPERTY(QColor FilterInputWidget_background_color READ getFilterInputWidget_background_color WRITE setFilterInputWidget_background_color)
-
-    /**
-     * @brief Setter property for QScrollArea_background_color
-     */
-    void setQScrollArea_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QScrollArea_background_color
-     * @return Value of QScrollArea_background_color
-     */
-    QColor getQScrollArea_background_color() const;
-
-    Q_PROPERTY(QColor QScrollArea_background_color READ getQScrollArea_background_color WRITE setQScrollArea_background_color)
-
-    /**
-     * @brief Setter property for VariablesTabContents_background_color
-     */
-    void setVariablesTabContents_background_color(const QColor& value);
-    /**
-     * @brief Getter property for VariablesTabContents_background_color
-     * @return Value of VariablesTabContents_background_color
-     */
-    QColor getVariablesTabContents_background_color() const;
-
-    Q_PROPERTY(QColor VariablesTabContents_background_color READ getVariablesTabContents_background_color WRITE setVariablesTabContents_background_color)
-
-    /**
-     * @brief Setter property for FilterParameterWidget_background_color
-     */
-    void setFilterParameterWidget_background_color(const QColor& value);
-    /**
-     * @brief Getter property for FilterParameterWidget_background_color
-     * @return Value of FilterParameterWidget_background_color
-     */
-    QColor getFilterParameterWidget_background_color() const;
-
-    Q_PROPERTY(QColor FilterParameterWidget_background_color READ getFilterParameterWidget_background_color WRITE setFilterParameterWidget_background_color)
-
-    /**
-     * @brief Setter property for FilterParameterWidget_border_color
-     */
-    void setFilterParameterWidget_border_color(const QColor& value);
-    /**
-     * @brief Getter property for FilterParameterWidget_border_color
-     * @return Value of FilterParameterWidget_border_color
-     */
-    QColor getFilterParameterWidget_border_color() const;
-
-    Q_PROPERTY(QColor FilterParameterWidget_border_color READ getFilterParameterWidget_border_color WRITE setFilterParameterWidget_border_color)
-
-    /**
-     * @brief Setter property for QGroupBoxTitle_background_color
-     */
-    void setQGroupBoxTitle_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QGroupBoxTitle_background_color
-     * @return Value of QGroupBoxTitle_background_color
-     */
-    QColor getQGroupBoxTitle_background_color() const;
-
-    Q_PROPERTY(QColor QGroupBoxTitle_background_color READ getQGroupBoxTitle_background_color WRITE setQGroupBoxTitle_background_color)
-
-    /**
-     * @brief Setter property for QGroupBox_background_color
-     */
-    void setQGroupBox_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QGroupBox_background_color
-     * @return Value of QGroupBox_background_color
-     */
-    QColor getQGroupBox_background_color() const;
-
-    Q_PROPERTY(QColor QGroupBox_background_color READ getQGroupBox_background_color WRITE setQGroupBox_background_color)
-
-    /**
-     * @brief Setter property for QDockWidget_border_color
-     */
-    void setQDockWidget_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QDockWidget_border_color
-     * @return Value of QDockWidget_border_color
-     */
-    QColor getQDockWidget_border_color() const;
-
-    Q_PROPERTY(QColor QDockWidget_border_color READ getQDockWidget_border_color WRITE setQDockWidget_border_color)
-
-    /**
-     * @brief Setter property for QDockWidget_color
-     */
-    void setQDockWidget_color(const QColor& value);
-    /**
-     * @brief Getter property for QDockWidget_color
-     * @return Value of QDockWidget_color
-     */
-    QColor getQDockWidget_color() const;
-
-    Q_PROPERTY(QColor QDockWidget_color READ getQDockWidget_color WRITE setQDockWidget_color)
-
-    /**
-     * @brief Setter property for QDockWidgetTitle_background_color
-     */
-    void setQDockWidgetTitle_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QDockWidgetTitle_background_color
-     * @return Value of QDockWidgetTitle_background_color
-     */
-    QColor getQDockWidgetTitle_background_color() const;
-
-    Q_PROPERTY(QColor QDockWidgetTitle_background_color READ getQDockWidgetTitle_background_color WRITE setQDockWidgetTitle_background_color)
-
-    /**
-     * @brief Setter property for QDockWidgetTitle_color
-     */
-    void setQDockWidgetTitle_color(const QColor& value);
-    /**
-     * @brief Getter property for QDockWidgetTitle_color
-     * @return Value of QDockWidgetTitle_color
-     */
-    QColor getQDockWidgetTitle_color() const;
-
-    Q_PROPERTY(QColor QDockWidgetTitle_color READ getQDockWidgetTitle_color WRITE setQDockWidgetTitle_color)
-
-    /**
-     * @brief Setter property for QListView_background_color
-     */
-    void setQListView_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QListView_background_color
-     * @return Value of QListView_background_color
-     */
-    QColor getQListView_background_color() const;
-
-    Q_PROPERTY(QColor QListView_background_color READ getQListView_background_color WRITE setQListView_background_color)
-
-    /**
-     * @brief Setter property for QListView_color
-     */
-    void setQListView_color(const QColor& value);
-    /**
-     * @brief Getter property for QListView_color
-     * @return Value of QListView_color
-     */
-    QColor getQListView_color() const;
-
-    Q_PROPERTY(QColor QListView_color READ getQListView_color WRITE setQListView_color)
-
-    /**
-     * @brief Setter property for QListViewItemHover_background_color
-     */
-    void setQListViewItemHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QListViewItemHover_background_color
-     * @return Value of QListViewItemHover_background_color
-     */
-    QColor getQListViewItemHover_background_color() const;
-
-    Q_PROPERTY(QColor QListViewItemHover_background_color READ getQListViewItemHover_background_color WRITE setQListViewItemHover_background_color)
-
-    /**
-     * @brief Setter property for QListViewItemHover_color
-     */
-    void setQListViewItemHover_color(const QColor& value);
-    /**
-     * @brief Getter property for QListViewItemHover_color
-     * @return Value of QListViewItemHover_color
-     */
-    QColor getQListViewItemHover_color() const;
-
-    Q_PROPERTY(QColor QListViewItemHover_color READ getQListViewItemHover_color WRITE setQListViewItemHover_color)
-
-    /**
-     * @brief Setter property for QListViewItemSelected_background_color
-     */
-    void setQListViewItemSelected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QListViewItemSelected_background_color
-     * @return Value of QListViewItemSelected_background_color
-     */
-    QColor getQListViewItemSelected_background_color() const;
-
-    Q_PROPERTY(QColor QListViewItemSelected_background_color READ getQListViewItemSelected_background_color WRITE setQListViewItemSelected_background_color)
-
-    /**
-     * @brief Setter property for QListViewItemSelected_color
-     */
-    void setQListViewItemSelected_color(const QColor& value);
-    /**
-     * @brief Getter property for QListViewItemSelected_color
-     * @return Value of QListViewItemSelected_color
-     */
-    QColor getQListViewItemSelected_color() const;
-
-    Q_PROPERTY(QColor QListViewItemSelected_color READ getQListViewItemSelected_color WRITE setQListViewItemSelected_color)
-
-    /**
-     * @brief Setter property for QMainWindowSeparator_background_color
-     */
-    void setQMainWindowSeparator_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMainWindowSeparator_background_color
-     * @return Value of QMainWindowSeparator_background_color
-     */
-    QColor getQMainWindowSeparator_background_color() const;
-
-    Q_PROPERTY(QColor QMainWindowSeparator_background_color READ getQMainWindowSeparator_background_color WRITE setQMainWindowSeparator_background_color)
-
-    /**
-     * @brief Setter property for QMenuBar_background_color
-     */
-    void setQMenuBar_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuBar_background_color
-     * @return Value of QMenuBar_background_color
-     */
-    QColor getQMenuBar_background_color() const;
-
-    Q_PROPERTY(QColor QMenuBar_background_color READ getQMenuBar_background_color WRITE setQMenuBar_background_color)
-
-    /**
-     * @brief Setter property for QMenuBarItem_color
-     */
-    void setQMenuBarItem_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuBarItem_color
-     * @return Value of QMenuBarItem_color
-     */
-    QColor getQMenuBarItem_color() const;
-
-    Q_PROPERTY(QColor QMenuBarItem_color READ getQMenuBarItem_color WRITE setQMenuBarItem_color)
-
-    /**
-     * @brief Setter property for QMenuBarItemPressed_color
-     */
-    void setQMenuBarItemPressed_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuBarItemPressed_color
-     * @return Value of QMenuBarItemPressed_color
-     */
-    QColor getQMenuBarItemPressed_color() const;
-
-    Q_PROPERTY(QColor QMenuBarItemPressed_color READ getQMenuBarItemPressed_color WRITE setQMenuBarItemPressed_color)
-
-    /**
-     * @brief Setter property for QMenuBarItemSelected_background_color
-     */
-    void setQMenuBarItemSelected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuBarItemSelected_background_color
-     * @return Value of QMenuBarItemSelected_background_color
-     */
-    QColor getQMenuBarItemSelected_background_color() const;
-
-    Q_PROPERTY(QColor QMenuBarItemSelected_background_color READ getQMenuBarItemSelected_background_color WRITE setQMenuBarItemSelected_background_color)
-
-    /**
-     * @brief Setter property for QMenuBarItemSelected_color
-     */
-    void setQMenuBarItemSelected_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuBarItemSelected_color
-     * @return Value of QMenuBarItemSelected_color
-     */
-    QColor getQMenuBarItemSelected_color() const;
-
-    Q_PROPERTY(QColor QMenuBarItemSelected_color READ getQMenuBarItemSelected_color WRITE setQMenuBarItemSelected_color)
-
-    /**
-     * @brief Setter property for QMenu_background_color
-     */
-    void setQMenu_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenu_background_color
-     * @return Value of QMenu_background_color
-     */
-    QColor getQMenu_background_color() const;
-
-    Q_PROPERTY(QColor QMenu_background_color READ getQMenu_background_color WRITE setQMenu_background_color)
-
-    /**
-     * @brief Setter property for QMenu_color
-     */
-    void setQMenu_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenu_color
-     * @return Value of QMenu_color
-     */
-    QColor getQMenu_color() const;
-
-    Q_PROPERTY(QColor QMenu_color READ getQMenu_color WRITE setQMenu_color)
-
-    /**
-     * @brief Setter property for QMenuItemSelected_background_color
-     */
-    void setQMenuItemSelected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuItemSelected_background_color
-     * @return Value of QMenuItemSelected_background_color
-     */
-    QColor getQMenuItemSelected_background_color() const;
-
-    Q_PROPERTY(QColor QMenuItemSelected_background_color READ getQMenuItemSelected_background_color WRITE setQMenuItemSelected_background_color)
-
-    /**
-     * @brief Setter property for QMenuItemSelected_color
-     */
-    void setQMenuItemSelected_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuItemSelected_color
-     * @return Value of QMenuItemSelected_color
-     */
-    QColor getQMenuItemSelected_color() const;
-
-    Q_PROPERTY(QColor QMenuItemSelected_color READ getQMenuItemSelected_color WRITE setQMenuItemSelected_color)
-
-    /**
-     * @brief Setter property for QMenuItemDisabled_background_color
-     */
-    void setQMenuItemDisabled_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QMenuItemDisabled_background_color
-     * @return Value of QMenuItemDisabled_background_color
-     */
-    QColor getQMenuItemDisabled_background_color() const;
-
-    Q_PROPERTY(QColor QMenuItemDisabled_background_color READ getQMenuItemDisabled_background_color WRITE setQMenuItemDisabled_background_color)
-
-    /**
-     * @brief Setter property for QPushButton_background_color
-     */
-    void setQPushButton_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButton_background_color
-     * @return Value of QPushButton_background_color
-     */
-    QColor getQPushButton_background_color() const;
-
-    Q_PROPERTY(QColor QPushButton_background_color READ getQPushButton_background_color WRITE setQPushButton_background_color)
-
-    /**
-     * @brief Setter property for QPushButton_border_color
-     */
-    void setQPushButton_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButton_border_color
-     * @return Value of QPushButton_border_color
-     */
-    QColor getQPushButton_border_color() const;
-
-    Q_PROPERTY(QColor QPushButton_border_color READ getQPushButton_border_color WRITE setQPushButton_border_color)
-
-    /**
-     * @brief Setter property for QPushButtonHover_background_color
-     */
-    void setQPushButtonHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonHover_background_color
-     * @return Value of QPushButtonHover_background_color
-     */
-    QColor getQPushButtonHover_background_color() const;
-
-    Q_PROPERTY(QColor QPushButtonHover_background_color READ getQPushButtonHover_background_color WRITE setQPushButtonHover_background_color)
-
-    /**
-     * @brief Setter property for QPushButtonPressed_background_color
-     */
-    void setQPushButtonPressed_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonPressed_background_color
-     * @return Value of QPushButtonPressed_background_color
-     */
-    QColor getQPushButtonPressed_background_color() const;
-
-    Q_PROPERTY(QColor QPushButtonPressed_background_color READ getQPushButtonPressed_background_color WRITE setQPushButtonPressed_background_color)
-
-    /**
-     * @brief Setter property for QPushButtonDefault_background_color
-     */
-    void setQPushButtonDefault_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonDefault_background_color
-     * @return Value of QPushButtonDefault_background_color
-     */
-    QColor getQPushButtonDefault_background_color() const;
-
-    Q_PROPERTY(QColor QPushButtonDefault_background_color READ getQPushButtonDefault_background_color WRITE setQPushButtonDefault_background_color)
-
-    /**
-     * @brief Setter property for QPushButtonDefaultPressed_background_color
-     */
-    void setQPushButtonDefaultPressed_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonDefaultPressed_background_color
-     * @return Value of QPushButtonDefaultPressed_background_color
-     */
-    QColor getQPushButtonDefaultPressed_background_color() const;
-
-    Q_PROPERTY(QColor QPushButtonDefaultPressed_background_color READ getQPushButtonDefaultPressed_background_color WRITE setQPushButtonDefaultPressed_background_color)
-
-    /**
-     * @brief Setter property for QPushButtonDefaultHover_background_color
-     */
-    void setQPushButtonDefaultHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonDefaultHover_background_color
-     * @return Value of QPushButtonDefaultHover_background_color
-     */
-    QColor getQPushButtonDefaultHover_background_color() const;
-
-    Q_PROPERTY(QColor QPushButtonDefaultHover_background_color READ getQPushButtonDefaultHover_background_color WRITE setQPushButtonDefaultHover_background_color)
-
-    /**
-     * @brief Setter property for QPushButtonDefault_border_color
-     */
-    void setQPushButtonDefault_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonDefault_border_color
-     * @return Value of QPushButtonDefault_border_color
-     */
-    QColor getQPushButtonDefault_border_color() const;
-
-    Q_PROPERTY(QColor QPushButtonDefault_border_color READ getQPushButtonDefault_border_color WRITE setQPushButtonDefault_border_color)
-
-    /**
-     * @brief Setter property for QPushButtonDefault_text_color
-     */
-    void setQPushButtonDefault_text_color(const QColor& value);
-    /**
-     * @brief Getter property for QPushButtonDefault_text_color
-     * @return Value of QPushButtonDefault_text_color
-     */
-    QColor getQPushButtonDefault_text_color() const;
-
-    Q_PROPERTY(QColor QPushButtonDefault_text_color READ getQPushButtonDefault_text_color WRITE setQPushButtonDefault_text_color)
-
-    /**
-     * @brief Setter property for QSplitter_handle_start_color
-     */
-    void setQSplitter_handle_start_color(const QColor& value);
-    /**
-     * @brief Getter property for QSplitter_handle_start_color
-     * @return Value of QSplitter_handle_start_color
-     */
-    QColor getQSplitter_handle_start_color() const;
-
-    Q_PROPERTY(QColor QSplitter_handle_start_color READ getQSplitter_handle_start_color WRITE setQSplitter_handle_start_color)
-
-    /**
-     * @brief Setter property for QSplitter_handle_end_color
-     */
-    void setQSplitter_handle_end_color(const QColor& value);
-    /**
-     * @brief Getter property for QSplitter_handle_end_color
-     * @return Value of QSplitter_handle_end_color
-     */
-    QColor getQSplitter_handle_end_color() const;
-
-    Q_PROPERTY(QColor QSplitter_handle_end_color READ getQSplitter_handle_end_color WRITE setQSplitter_handle_end_color)
-
-    /**
-     * @brief Setter property for QToolButton_background_color
-     */
-    void setQToolButton_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButton_background_color
-     * @return Value of QToolButton_background_color
-     */
-    QColor getQToolButton_background_color() const;
-
-    Q_PROPERTY(QColor QToolButton_background_color READ getQToolButton_background_color WRITE setQToolButton_background_color)
-
-    /**
-     * @brief Setter property for QToolButton_color
-     */
-    void setQToolButton_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButton_color
-     * @return Value of QToolButton_color
-     */
-    QColor getQToolButton_color() const;
-
-    Q_PROPERTY(QColor QToolButton_color READ getQToolButton_color WRITE setQToolButton_color)
-
-    /**
-     * @brief Setter property for QToolButton_border_color
-     */
-    void setQToolButton_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButton_border_color
-     * @return Value of QToolButton_border_color
-     */
-    QColor getQToolButton_border_color() const;
-
-    Q_PROPERTY(QColor QToolButton_border_color READ getQToolButton_border_color WRITE setQToolButton_border_color)
-
-    /**
-     * @brief Setter property for QToolButtonChecked_background_color
-     */
-    void setQToolButtonChecked_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButtonChecked_background_color
-     * @return Value of QToolButtonChecked_background_color
-     */
-    QColor getQToolButtonChecked_background_color() const;
-
-    Q_PROPERTY(QColor QToolButtonChecked_background_color READ getQToolButtonChecked_background_color WRITE setQToolButtonChecked_background_color)
-
-    /**
-     * @brief Setter property for QToolButtonDisabled_background_color
-     */
-    void setQToolButtonDisabled_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButtonDisabled_background_color
-     * @return Value of QToolButtonDisabled_background_color
-     */
-    QColor getQToolButtonDisabled_background_color() const;
-
-    Q_PROPERTY(QColor QToolButtonDisabled_background_color READ getQToolButtonDisabled_background_color WRITE setQToolButtonDisabled_background_color)
-
-    /**
-     * @brief Setter property for QToolButtonDisabled_color
-     */
-    void setQToolButtonDisabled_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolButtonDisabled_color
-     * @return Value of QToolButtonDisabled_color
-     */
-    QColor getQToolButtonDisabled_color() const;
-
-    Q_PROPERTY(QColor QToolButtonDisabled_color READ getQToolButtonDisabled_color WRITE setQToolButtonDisabled_color)
-
-    /**
-     * @brief Setter property for QStatusBar_border_color
-     */
-    void setQStatusBar_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QStatusBar_border_color
-     * @return Value of QStatusBar_border_color
-     */
-    QColor getQStatusBar_border_color() const;
-
-    Q_PROPERTY(QColor QStatusBar_border_color READ getQStatusBar_border_color WRITE setQStatusBar_border_color)
-
-    /**
-     * @brief Setter property for QTableWidget_color
-     */
-    void setQTableWidget_color(const QColor& value);
-    /**
-     * @brief Getter property for QTableWidget_color
-     * @return Value of QTableWidget_color
-     */
-    QColor getQTableWidget_color() const;
-
-    Q_PROPERTY(QColor QTableWidget_color READ getQTableWidget_color WRITE setQTableWidget_color)
-
-    /**
-     * @brief Setter property for QTableWidget_selected_background_color
-     */
-    void setQTableWidget_selected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTableWidget_selected_background_color
-     * @return Value of QTableWidget_selected_background_color
-     */
-    QColor getQTableWidget_selected_background_color() const;
-
-    Q_PROPERTY(QColor QTableWidget_selected_background_color READ getQTableWidget_selected_background_color WRITE setQTableWidget_selected_background_color)
-
-    /**
-     * @brief Setter property for QHeaderView_background_color
-     */
-    void setQHeaderView_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderView_background_color
-     * @return Value of QHeaderView_background_color
-     */
-    QColor getQHeaderView_background_color() const;
-
-    Q_PROPERTY(QColor QHeaderView_background_color READ getQHeaderView_background_color WRITE setQHeaderView_background_color)
-
-    /**
-     * @brief Setter property for QHeaderView_border_color
-     */
-    void setQHeaderView_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderView_border_color
-     * @return Value of QHeaderView_border_color
-     */
-    QColor getQHeaderView_border_color() const;
-
-    Q_PROPERTY(QColor QHeaderView_border_color READ getQHeaderView_border_color WRITE setQHeaderView_border_color)
-
-    /**
-     * @brief Setter property for QHeaderView_color
-     */
-    void setQHeaderView_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderView_color
-     * @return Value of QHeaderView_color
-     */
-    QColor getQHeaderView_color() const;
-
-    Q_PROPERTY(QColor QHeaderView_color READ getQHeaderView_color WRITE setQHeaderView_color)
-
-    /**
-     * @brief Setter property for QHeaderViewDisabled_background_color
-     */
-    void setQHeaderViewDisabled_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderViewDisabled_background_color
-     * @return Value of QHeaderViewDisabled_background_color
-     */
-    QColor getQHeaderViewDisabled_background_color() const;
-
-    Q_PROPERTY(QColor QHeaderViewDisabled_background_color READ getQHeaderViewDisabled_background_color WRITE setQHeaderViewDisabled_background_color)
-
-    /**
-     * @brief Setter property for QHeaderViewDisabled_border_color
-     */
-    void setQHeaderViewDisabled_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderViewDisabled_border_color
-     * @return Value of QHeaderViewDisabled_border_color
-     */
-    QColor getQHeaderViewDisabled_border_color() const;
-
-    Q_PROPERTY(QColor QHeaderViewDisabled_border_color READ getQHeaderViewDisabled_border_color WRITE setQHeaderViewDisabled_border_color)
-
-    /**
-     * @brief Setter property for QHeaderViewDisabled_color
-     */
-    void setQHeaderViewDisabled_color(const QColor& value);
-    /**
-     * @brief Getter property for QHeaderViewDisabled_color
-     * @return Value of QHeaderViewDisabled_color
-     */
-    QColor getQHeaderViewDisabled_color() const;
-
-    Q_PROPERTY(QColor QHeaderViewDisabled_color READ getQHeaderViewDisabled_color WRITE setQHeaderViewDisabled_color)
-
-    /**
-     * @brief Setter property for QTabWidgetPane_border_color
-     */
-    void setQTabWidgetPane_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabWidgetPane_border_color
-     * @return Value of QTabWidgetPane_border_color
-     */
-    QColor getQTabWidgetPane_border_color() const;
-
-    Q_PROPERTY(QColor QTabWidgetPane_border_color READ getQTabWidgetPane_border_color WRITE setQTabWidgetPane_border_color)
-
-    /**
-     * @brief Setter property for QTabWidgetPane_background_color
-     */
-    void setQTabWidgetPane_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabWidgetPane_background_color
-     * @return Value of QTabWidgetPane_background_color
-     */
-    QColor getQTabWidgetPane_background_color() const;
-
-    Q_PROPERTY(QColor QTabWidgetPane_background_color READ getQTabWidgetPane_background_color WRITE setQTabWidgetPane_background_color)
-
-    /**
-     * @brief Setter property for QTabBarTab_border_color
-     */
-    void setQTabBarTab_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabBarTab_border_color
-     * @return Value of QTabBarTab_border_color
-     */
-    QColor getQTabBarTab_border_color() const;
-
-    Q_PROPERTY(QColor QTabBarTab_border_color READ getQTabBarTab_border_color WRITE setQTabBarTab_border_color)
-
-    /**
-     * @brief Setter property for QTabBarTabSelected_background_color
-     */
-    void setQTabBarTabSelected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabBarTabSelected_background_color
-     * @return Value of QTabBarTabSelected_background_color
-     */
-    QColor getQTabBarTabSelected_background_color() const;
-
-    Q_PROPERTY(QColor QTabBarTabSelected_background_color READ getQTabBarTabSelected_background_color WRITE setQTabBarTabSelected_background_color)
-
-    /**
-     * @brief Setter property for QTabBarTabSelected_color
-     */
-    void setQTabBarTabSelected_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabBarTabSelected_color
-     * @return Value of QTabBarTabSelected_color
-     */
-    QColor getQTabBarTabSelected_color() const;
-
-    Q_PROPERTY(QColor QTabBarTabSelected_color READ getQTabBarTabSelected_color WRITE setQTabBarTabSelected_color)
-
-    /**
-     * @brief Setter property for QTabBarTabNotSelected_background_color
-     */
-    void setQTabBarTabNotSelected_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabBarTabNotSelected_background_color
-     * @return Value of QTabBarTabNotSelected_background_color
-     */
-    QColor getQTabBarTabNotSelected_background_color() const;
-
-    Q_PROPERTY(QColor QTabBarTabNotSelected_background_color READ getQTabBarTabNotSelected_background_color WRITE setQTabBarTabNotSelected_background_color)
-
-    /**
-     * @brief Setter property for QTabBarTabNotSelectedHover_background_color
-     */
-    void setQTabBarTabNotSelectedHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTabBarTabNotSelectedHover_background_color
-     * @return Value of QTabBarTabNotSelectedHover_background_color
-     */
-    QColor getQTabBarTabNotSelectedHover_background_color() const;
-
-    Q_PROPERTY(QColor QTabBarTabNotSelectedHover_background_color READ getQTabBarTabNotSelectedHover_background_color WRITE setQTabBarTabNotSelectedHover_background_color)
-
-    /**
-     * @brief Setter property for QTextEdit_background_color
-     */
-    void setQTextEdit_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTextEdit_background_color
-     * @return Value of QTextEdit_background_color
-     */
-    QColor getQTextEdit_background_color() const;
-
-    Q_PROPERTY(QColor QTextEdit_background_color READ getQTextEdit_background_color WRITE setQTextEdit_background_color)
-
-    /**
-     * @brief Setter property for QTextEdit_color
-     */
-    void setQTextEdit_color(const QColor& value);
-    /**
-     * @brief Getter property for QTextEdit_color
-     * @return Value of QTextEdit_color
-     */
-    QColor getQTextEdit_color() const;
-
-    Q_PROPERTY(QColor QTextEdit_color READ getQTextEdit_color WRITE setQTextEdit_color)
-
-    /**
-     * @brief Setter property for QLineEdit_color
-     */
-    void setQLineEdit_color(const QColor& value);
-    /**
-     * @brief Getter property for QLineEdit_color
-     * @return Value of QLineEdit_color
-     */
-    QColor getQLineEdit_color() const;
-
-    Q_PROPERTY(QColor QLineEdit_color READ getQLineEdit_color WRITE setQLineEdit_color)
-
-    /**
-     * @brief Setter property for QLineEdit_background_color
-     */
-    void setQLineEdit_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QLineEdit_background_color
-     * @return Value of QLineEdit_background_color
-     */
-    QColor getQLineEdit_background_color() const;
-
-    Q_PROPERTY(QColor QLineEdit_background_color READ getQLineEdit_background_color WRITE setQLineEdit_background_color)
-
-    /**
-     * @brief Setter property for QLineEdit_border_color
-     */
-    void setQLineEdit_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QLineEdit_border_color
-     * @return Value of QLineEdit_border_color
-     */
-    QColor getQLineEdit_border_color() const;
-
-    Q_PROPERTY(QColor QLineEdit_border_color READ getQLineEdit_border_color WRITE setQLineEdit_border_color)
-
-    /**
-     * @brief Setter property for QLineEditDisabled_background_color
-     */
-    void setQLineEditDisabled_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QLineEditDisabled_background_color
-     * @return Value of QLineEditDisabled_background_color
-     */
-    QColor getQLineEditDisabled_background_color() const;
-
-    Q_PROPERTY(QColor QLineEditDisabled_background_color READ getQLineEditDisabled_background_color WRITE setQLineEditDisabled_background_color)
-
-    /**
-     * @brief Setter property for QLineEditError_background_color
-     */
-    void setQLineEditError_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QLineEditError_background_color
-     * @return Value of QLineEditError_background_color
-     */
-    QColor getQLineEditError_background_color() const;
-
-    Q_PROPERTY(QColor QLineEditError_background_color READ getQLineEditError_background_color WRITE setQLineEditError_background_color)
-
-    /**
-     * @brief Setter property for QSpinBoxArrow_background_color
-     */
-    void setQSpinBoxArrow_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QSpinBoxArrow_background_color
-     * @return Value of QSpinBoxArrow_background_color
-     */
-    QColor getQSpinBoxArrow_background_color() const;
-
-    Q_PROPERTY(QColor QSpinBoxArrow_background_color READ getQSpinBoxArrow_background_color WRITE setQSpinBoxArrow_background_color)
-
-    /**
-     * @brief Setter property for QSpinBoxArrow_hover_background_color
-     */
-    void setQSpinBoxArrow_hover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QSpinBoxArrow_hover_background_color
-     * @return Value of QSpinBoxArrow_hover_background_color
-     */
-    QColor getQSpinBoxArrow_hover_background_color() const;
-
-    Q_PROPERTY(QColor QSpinBoxArrow_hover_background_color READ getQSpinBoxArrow_hover_background_color WRITE setQSpinBoxArrow_hover_background_color)
-
-    /**
-     * @brief Setter property for QComboBox_border_color
-     */
-    void setQComboBox_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBox_border_color
-     * @return Value of QComboBox_border_color
-     */
-    QColor getQComboBox_border_color() const;
-
-    Q_PROPERTY(QColor QComboBox_border_color READ getQComboBox_border_color WRITE setQComboBox_border_color)
-
-    /**
-     * @brief Setter property for QComboBox_background_color
-     */
-    void setQComboBox_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBox_background_color
-     * @return Value of QComboBox_background_color
-     */
-    QColor getQComboBox_background_color() const;
-
-    Q_PROPERTY(QColor QComboBox_background_color READ getQComboBox_background_color WRITE setQComboBox_background_color)
-
-    /**
-     * @brief Setter property for QComboBoxArrow_background_color
-     */
-    void setQComboBoxArrow_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxArrow_background_color
-     * @return Value of QComboBoxArrow_background_color
-     */
-    QColor getQComboBoxArrow_background_color() const;
-
-    Q_PROPERTY(QColor QComboBoxArrow_background_color READ getQComboBoxArrow_background_color WRITE setQComboBoxArrow_background_color)
-
-    /**
-     * @brief Setter property for QComboBoxArrow_hover_background_color
-     */
-    void setQComboBoxArrow_hover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxArrow_hover_background_color
-     * @return Value of QComboBoxArrow_hover_background_color
-     */
-    QColor getQComboBoxArrow_hover_background_color() const;
-
-    Q_PROPERTY(QColor QComboBoxArrow_hover_background_color READ getQComboBoxArrow_hover_background_color WRITE setQComboBoxArrow_hover_background_color)
-
-    /**
-     * @brief Setter property for QComboBoxItem_border_color
-     */
-    void setQComboBoxItem_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxItem_border_color
-     * @return Value of QComboBoxItem_border_color
-     */
-    QColor getQComboBoxItem_border_color() const;
-
-    Q_PROPERTY(QColor QComboBoxItem_border_color READ getQComboBoxItem_border_color WRITE setQComboBoxItem_border_color)
-
-    /**
-     * @brief Setter property for QComboBoxItem_selection_color
-     */
-    void setQComboBoxItem_selection_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxItem_selection_color
-     * @return Value of QComboBoxItem_selection_color
-     */
-    QColor getQComboBoxItem_selection_color() const;
-
-    Q_PROPERTY(QColor QComboBoxItem_selection_color READ getQComboBoxItem_selection_color WRITE setQComboBoxItem_selection_color)
-
-    /**
-     * @brief Setter property for QComboBoxItem_background_color
-     */
-    void setQComboBoxItem_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxItem_background_color
-     * @return Value of QComboBoxItem_background_color
-     */
-    QColor getQComboBoxItem_background_color() const;
-
-    Q_PROPERTY(QColor QComboBoxItem_background_color READ getQComboBoxItem_background_color WRITE setQComboBoxItem_background_color)
-
-    /**
-     * @brief Setter property for QComboBoxDisabled_background_color
-     */
-    void setQComboBoxDisabled_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxDisabled_background_color
-     * @return Value of QComboBoxDisabled_background_color
-     */
-    QColor getQComboBoxDisabled_background_color() const;
-
-    Q_PROPERTY(QColor QComboBoxDisabled_background_color READ getQComboBoxDisabled_background_color WRITE setQComboBoxDisabled_background_color)
-
-    /**
-     * @brief Setter property for QComboBoxDisabled_color
-     */
-    void setQComboBoxDisabled_color(const QColor& value);
-    /**
-     * @brief Getter property for QComboBoxDisabled_color
-     * @return Value of QComboBoxDisabled_color
-     */
-    QColor getQComboBoxDisabled_color() const;
-
-    Q_PROPERTY(QColor QComboBoxDisabled_color READ getQComboBoxDisabled_color WRITE setQComboBoxDisabled_color)
-
-    /**
-     * @brief Setter property for QToolBar_background_color
-     */
-    void setQToolBar_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolBar_background_color
-     * @return Value of QToolBar_background_color
-     */
-    QColor getQToolBar_background_color() const;
-
-    Q_PROPERTY(QColor QToolBar_background_color READ getQToolBar_background_color WRITE setQToolBar_background_color)
-
-    /**
-     * @brief Setter property for QToolBar_border_color
-     */
-    void setQToolBar_border_color(const QColor& value);
-    /**
-     * @brief Getter property for QToolBar_border_color
-     * @return Value of QToolBar_border_color
-     */
-    QColor getQToolBar_border_color() const;
-
-    Q_PROPERTY(QColor QToolBar_border_color READ getQToolBar_border_color WRITE setQToolBar_border_color)
-
-    /**
-     * @brief Setter property for QTreeView_background_color
-     */
-    void setQTreeView_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeView_background_color
-     * @return Value of QTreeView_background_color
-     */
-    QColor getQTreeView_background_color() const;
-
-    Q_PROPERTY(QColor QTreeView_background_color READ getQTreeView_background_color WRITE setQTreeView_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItem_background_color
-     */
-    void setQTreeViewItem_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItem_background_color
-     * @return Value of QTreeViewItem_background_color
-     */
-    QColor getQTreeViewItem_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItem_background_color READ getQTreeViewItem_background_color WRITE setQTreeViewItem_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItem_error_background_color
-     */
-    void setQTreeViewItem_error_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItem_error_background_color
-     * @return Value of QTreeViewItem_error_background_color
-     */
-    QColor getQTreeViewItem_error_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItem_error_background_color READ getQTreeViewItem_error_background_color WRITE setQTreeViewItem_error_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItem_color
-     */
-    void setQTreeViewItem_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItem_color
-     * @return Value of QTreeViewItem_color
-     */
-    QColor getQTreeViewItem_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItem_color READ getQTreeViewItem_color WRITE setQTreeViewItem_color)
-
-    /**
-     * @brief Setter property for QTreeViewItem_error_color
-     */
-    void setQTreeViewItem_error_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItem_error_color
-     * @return Value of QTreeViewItem_error_color
-     */
-    QColor getQTreeViewItem_error_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItem_error_color READ getQTreeViewItem_error_color WRITE setQTreeViewItem_error_color)
-
-    /**
-     * @brief Setter property for QTreeViewItem_font_size
-     */
-    void setQTreeViewItem_font_size(int value);
-    /**
-     * @brief Getter property for QTreeViewItem_font_size
-     * @return Value of QTreeViewItem_font_size
-     */
-    int getQTreeViewItem_font_size() const;
-
-    Q_PROPERTY(int QTreeViewItem_font_size READ getQTreeViewItem_font_size WRITE setQTreeViewItem_font_size)
-
-    /**
-     * @brief Setter property for QTreeViewItemHover_background_color
-     */
-    void setQTreeViewItemHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemHover_background_color
-     * @return Value of QTreeViewItemHover_background_color
-     */
-    QColor getQTreeViewItemHover_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemHover_background_color READ getQTreeViewItemHover_background_color WRITE setQTreeViewItemHover_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItemHover_color
-     */
-    void setQTreeViewItemHover_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemHover_color
-     * @return Value of QTreeViewItemHover_color
-     */
-    QColor getQTreeViewItemHover_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemHover_color READ getQTreeViewItemHover_color WRITE setQTreeViewItemHover_color)
-
-    /**
-     * @brief Setter property for QTreeViewItemSelectedActive_background_color
-     */
-    void setQTreeViewItemSelectedActive_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemSelectedActive_background_color
-     * @return Value of QTreeViewItemSelectedActive_background_color
-     */
-    QColor getQTreeViewItemSelectedActive_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemSelectedActive_background_color READ getQTreeViewItemSelectedActive_background_color WRITE setQTreeViewItemSelectedActive_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItemSelectedActive_color
-     */
-    void setQTreeViewItemSelectedActive_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemSelectedActive_color
-     * @return Value of QTreeViewItemSelectedActive_color
-     */
-    QColor getQTreeViewItemSelectedActive_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemSelectedActive_color READ getQTreeViewItemSelectedActive_color WRITE setQTreeViewItemSelectedActive_color)
-
-    /**
-     * @brief Setter property for QTreeViewItemSelectedNotActive_background_color
-     */
-    void setQTreeViewItemSelectedNotActive_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemSelectedNotActive_background_color
-     * @return Value of QTreeViewItemSelectedNotActive_background_color
-     */
-    QColor getQTreeViewItemSelectedNotActive_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_background_color READ getQTreeViewItemSelectedNotActive_background_color WRITE setQTreeViewItemSelectedNotActive_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewItemSelectedNotActive_color
-     */
-    void setQTreeViewItemSelectedNotActive_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewItemSelectedNotActive_color
-     * @return Value of QTreeViewItemSelectedNotActive_color
-     */
-    QColor getQTreeViewItemSelectedNotActive_color() const;
-
-    Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_color READ getQTreeViewItemSelectedNotActive_color WRITE setQTreeViewItemSelectedNotActive_color)
-
-    /**
-     * @brief Setter property for QTreeViewBranch_background_color
-     */
-    void setQTreeViewBranch_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewBranch_background_color
-     * @return Value of QTreeViewBranch_background_color
-     */
-    QColor getQTreeViewBranch_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewBranch_background_color READ getQTreeViewBranch_background_color WRITE setQTreeViewBranch_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewBranchHover_background_color
-     */
-    void setQTreeViewBranchHover_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewBranchHover_background_color
-     * @return Value of QTreeViewBranchHover_background_color
-     */
-    QColor getQTreeViewBranchHover_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewBranchHover_background_color READ getQTreeViewBranchHover_background_color WRITE setQTreeViewBranchHover_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewBranchHover_color
-     */
-    void setQTreeViewBranchHover_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewBranchHover_color
-     * @return Value of QTreeViewBranchHover_color
-     */
-    QColor getQTreeViewBranchHover_color() const;
-
-    Q_PROPERTY(QColor QTreeViewBranchHover_color READ getQTreeViewBranchHover_color WRITE setQTreeViewBranchHover_color)
-
-    /**
-     * @brief Setter property for QTreeViewBranchSelectedActive_background_color
-     */
-    void setQTreeViewBranchSelectedActive_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewBranchSelectedActive_background_color
-     * @return Value of QTreeViewBranchSelectedActive_background_color
-     */
-    QColor getQTreeViewBranchSelectedActive_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewBranchSelectedActive_background_color READ getQTreeViewBranchSelectedActive_background_color WRITE setQTreeViewBranchSelectedActive_background_color)
-
-    /**
-     * @brief Setter property for QTreeViewBranchSelectedNotActive_background_color
-     */
-    void setQTreeViewBranchSelectedNotActive_background_color(const QColor& value);
-    /**
-     * @brief Getter property for QTreeViewBranchSelectedNotActive_background_color
-     * @return Value of QTreeViewBranchSelectedNotActive_background_color
-     */
-    QColor getQTreeViewBranchSelectedNotActive_background_color() const;
-
-    Q_PROPERTY(QColor QTreeViewBranchSelectedNotActive_background_color READ getQTreeViewBranchSelectedNotActive_background_color WRITE setQTreeViewBranchSelectedNotActive_background_color)
-
-    /**
-     * @brief Setter property for FilterBackgroundColor
-     */
-    void setFilterBackgroundColor(const QColor& value);
-    /**
-     * @brief Getter property for FilterBackgroundColor
-     * @return Value of FilterBackgroundColor
-     */
-    QColor getFilterBackgroundColor() const;
-
-    Q_PROPERTY(QColor FilterBackgroundColor READ getFilterBackgroundColor WRITE setFilterBackgroundColor)
-
-    /**
-     * @brief Setter property for FilterSelectionColor
-     */
-    void setFilterSelectionColor(const QColor& value);
-    /**
-     * @brief Getter property for FilterSelectionColor
-     * @return Value of FilterSelectionColor
-     */
-    QColor getFilterSelectionColor() const;
-
-    Q_PROPERTY(QColor FilterSelectionColor READ getFilterSelectionColor WRITE setFilterSelectionColor)
-
-    /**
-     * @brief Setter property for FilterFontColor
-     */
-    void setFilterFontColor(const QColor& value);
-    /**
-     * @brief Getter property for FilterFontColor
-     * @return Value of FilterFontColor
-     */
-    QColor getFilterFontColor() const;
-
-    Q_PROPERTY(QColor FilterFontColor READ getFilterFontColor WRITE setFilterFontColor)
-
-    /**
-     * @brief Setter property for DataArrayPath_DataContainer_color
-     */
-    void setDataArrayPath_DataContainer_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_DataContainer_color
-     * @return Value of DataArrayPath_DataContainer_color
-     */
-    QColor getDataArrayPath_DataContainer_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_DataContainer_color READ getDataArrayPath_DataContainer_color WRITE setDataArrayPath_DataContainer_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_AttributeMatrix_color
-     */
-    void setDataArrayPath_AttributeMatrix_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_AttributeMatrix_color
-     * @return Value of DataArrayPath_AttributeMatrix_color
-     */
-    QColor getDataArrayPath_AttributeMatrix_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_color READ getDataArrayPath_AttributeMatrix_color WRITE setDataArrayPath_AttributeMatrix_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_DataArray_color
-     */
-    void setDataArrayPath_DataArray_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_DataArray_color
-     * @return Value of DataArrayPath_DataArray_color
-     */
-    QColor getDataArrayPath_DataArray_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_DataArray_color READ getDataArrayPath_DataArray_color WRITE setDataArrayPath_DataArray_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_Invalid_color
-     */
-    void setDataArrayPath_Invalid_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_Invalid_color
-     * @return Value of DataArrayPath_Invalid_color
-     */
-    QColor getDataArrayPath_Invalid_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_Invalid_color READ getDataArrayPath_Invalid_color WRITE setDataArrayPath_Invalid_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_DataContainer_background_color
-     */
-    void setDataArrayPath_DataContainer_background_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_DataContainer_background_color
-     * @return Value of DataArrayPath_DataContainer_background_color
-     */
-    QColor getDataArrayPath_DataContainer_background_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_DataContainer_background_color READ getDataArrayPath_DataContainer_background_color WRITE setDataArrayPath_DataContainer_background_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_AttributeMatrix_background_color
-     */
-    void setDataArrayPath_AttributeMatrix_background_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_AttributeMatrix_background_color
-     * @return Value of DataArrayPath_AttributeMatrix_background_color
-     */
-    QColor getDataArrayPath_AttributeMatrix_background_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_background_color READ getDataArrayPath_AttributeMatrix_background_color WRITE setDataArrayPath_AttributeMatrix_background_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_DataArray_background_color
-     */
-    void setDataArrayPath_DataArray_background_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_DataArray_background_color
-     * @return Value of DataArrayPath_DataArray_background_color
-     */
-    QColor getDataArrayPath_DataArray_background_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_DataArray_background_color READ getDataArrayPath_DataArray_background_color WRITE setDataArrayPath_DataArray_background_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_Invalid_background_color
-     */
-    void setDataArrayPath_Invalid_background_color(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_Invalid_background_color
-     * @return Value of DataArrayPath_Invalid_background_color
-     */
-    QColor getDataArrayPath_Invalid_background_color() const;
-
-    Q_PROPERTY(QColor DataArrayPath_Invalid_background_color READ getDataArrayPath_Invalid_background_color WRITE setDataArrayPath_Invalid_background_color)
-
-    /**
-     * @brief Setter property for DataArrayPath_border_normal
-     */
-    void setDataArrayPath_border_normal(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_border_normal
-     * @return Value of DataArrayPath_border_normal
-     */
-    QColor getDataArrayPath_border_normal() const;
-
-    Q_PROPERTY(QColor DataArrayPath_border_normal READ getDataArrayPath_border_normal WRITE setDataArrayPath_border_normal)
-
-    /**
-     * @brief Setter property for DataArrayPath_border_not_found
-     */
-    void setDataArrayPath_border_not_found(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_border_not_found
-     * @return Value of DataArrayPath_border_not_found
-     */
-    QColor getDataArrayPath_border_not_found() const;
-
-    Q_PROPERTY(QColor DataArrayPath_border_not_found READ getDataArrayPath_border_not_found WRITE setDataArrayPath_border_not_found)
-
-    /**
-     * @brief Setter property for DataArrayPath_border_drag_enabled
-     */
-    void setDataArrayPath_border_drag_enabled(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_border_drag_enabled
-     * @return Value of DataArrayPath_border_drag_enabled
-     */
-    QColor getDataArrayPath_border_drag_enabled() const;
-
-    Q_PROPERTY(QColor DataArrayPath_border_drag_enabled READ getDataArrayPath_border_drag_enabled WRITE setDataArrayPath_border_drag_enabled)
-
-    /**
-     * @brief Setter property for DataArrayPath_border_drag_disabled
-     */
-    void setDataArrayPath_border_drag_disabled(const QColor& value);
-    /**
-     * @brief Getter property for DataArrayPath_border_drag_disabled
-     * @return Value of DataArrayPath_border_drag_disabled
-     */
-    QColor getDataArrayPath_border_drag_disabled() const;
-
-    Q_PROPERTY(QColor DataArrayPath_border_drag_disabled READ getDataArrayPath_border_drag_disabled WRITE setDataArrayPath_border_drag_disabled)
-
-    /**
-     * @brief Setter property for DataPathLabel_color
-     */
-    void setDataPathLabel_color(const QColor& value);
-    /**
-     * @brief Getter property for DataPathLabel_color
-     * @return Value of DataPathLabel_color
-     */
-    QColor getDataPathLabel_color() const;
-
-    Q_PROPERTY(QColor DataPathLabel_color READ getDataPathLabel_color WRITE setDataPathLabel_color)
-
-    /**
-     * @brief Setter property for DataPathLabel_Disabled_color
-     */
-    void setDataPathLabel_Disabled_color(const QColor& value);
-    /**
-     * @brief Getter property for DataPathLabel_Disabled_color
-     * @return Value of DataPathLabel_Disabled_color
-     */
-    QColor getDataPathLabel_Disabled_color() const;
-
-    Q_PROPERTY(QColor DataPathLabel_Disabled_color READ getDataPathLabel_Disabled_color WRITE setDataPathLabel_Disabled_color)
-
-    /**
-     * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
-     */
-    void setSIMPLViewPipelineDockWidgetTitle_inactive_background_color(const QColor& value);
-    /**
-     * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
-     * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_background_color
-     */
-    QColor getSIMPLViewPipelineDockWidgetTitle_inactive_background_color() const;
-
-    Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_background_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_background_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_background_color)
-
-    /**
-     * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
-     */
-    void setSIMPLViewPipelineDockWidgetTitle_inactive_text_color(const QColor& value);
-    /**
-     * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
-     * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_text_color
-     */
-    QColor getSIMPLViewPipelineDockWidgetTitle_inactive_text_color() const;
-
-    Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_text_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_text_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_text_color)
-        
-    /**
-     * @brief loadStyleSheet
-     * @param jsonFilePath
-     * @return
-     */
-    bool loadStyleSheet(const QString &jsonFilePath);
-    
-    /**
-     * @brief
-     * @return
-     */
-    QString GetUIFont();
-    
-    /**
-     * @brief GetHumanLabelFont
-     * @return
-     */
-    QFont GetHumanLabelFont();
-    
-    /**
-     * @brief GetBrandingLabelFont
-     * @return
-     */
-    QFont GetBrandingLabelFont();
-    
-    /**
-     * @brief GetCategoryFont
-     * @return
-     */
-    QFont GetCategoryFont();
-    
-    /**
-     * @brief GetTitleFont
-     * @return
-     */
-    QFont GetTitleFont();
-    
-    /**
-     * @brief GetFilterBackgroundColor
-     * @return
-     */
-    QColor GetFilterBackgroundColor();
-    
-    /**
-     * @brief GetFilterSelectionColor
-     * @return 
-     */
-    QColor GetFilterSelectionColor();
-    
-    /**
-     * @brief GetFilterFontColor
-     * @return 
-     */
-    QColor GetFilterFontColor();
-    
-    /**
-     * @brief LineEditErrorStyle
-     * @param lineEdit
-     */
-    void LineEditErrorStyle(QLineEdit* lineEdit);
-    
-    /**
-     * @brief LineEditClearStyle
-     * @param lineEdit
-     */
-    void LineEditClearStyle(QLineEdit* lineEdit);
-    
-    /**
-     * @brief LineEditRedErrorStyle
-     * @param lineEdit
-     */
-    void LineEditBackgroundErrorStyle(QLineEdit* lineEdit);
-    
-    /**
-     * @brief SetErrorColor
-     * @param widget
-     */
-    void SetErrorColor(const QString &widgetType, QWidget* widget);
-    
-    /**
-     * @brief DAPSelectionButtonStyle
-     * @param exists
-     * @return
-     */
-    QString QToolSelectionButtonStyle(bool exists);
-    
-    /**
-     * @brief SVStyle::ColorForFilterGroup
-     * @param grpName
-     * @return
-     */
-    QColor ColorForFilterGroup(const QString &grpName);
-    
-    /**
-     * @brief SVStyle::IconForGroup
-     * @param grpName
-     * @return
-     */
-    QIcon IconForGroup(const QString &grpName);
-
-    /**
-     * @brief WrapTextWithHtmlStyle This method will take an existing QString and wrap the contents
-     * with some HTML <b> or <span> with an internal "style=..." html snippet of code. This makes
-     * the string suitable for a QTextEdit. An option to create bold text is also provided.
-     * @param msg
-     * @param bold
-     * @return
-     */
-    QString WrapTextWithHtmlStyle(const QString& msg, bool bold) const;
-
-  protected:
-    SVStyle();
-
-    /**
-     * @brief initialize
-     */
-    void initialize();
-
-  signals:
-    void styleSheetLoaded(const QString &styleFilePath);
-    
-  private:
-    QColor m_Fader_color = {};
-    QColor m_Widget_Error_color = {};
-    QColor m_Text_Error_color = {};
-    QColor m_CentralWidget_background_color = {};
-    QColor m_QLabel_color = {};
-    QColor m_FilterInputWidget_background_color = {};
-    QColor m_QScrollArea_background_color = {};
-    QColor m_VariablesTabContents_background_color = {};
-    QColor m_FilterParameterWidget_background_color = {};
-    QColor m_FilterParameterWidget_border_color = {};
-    QColor m_QGroupBoxTitle_background_color = {};
-    QColor m_QGroupBox_background_color = {};
-    QColor m_QDockWidget_border_color = {};
-    QColor m_QDockWidget_color = {};
-    QColor m_QDockWidgetTitle_background_color = {};
-    QColor m_QDockWidgetTitle_color = {};
-    QColor m_QListView_background_color = {};
-    QColor m_QListView_color = {};
-    QColor m_QListViewItemHover_background_color = {};
-    QColor m_QListViewItemHover_color = {};
-    QColor m_QListViewItemSelected_background_color = {};
-    QColor m_QListViewItemSelected_color = {};
-    QColor m_QMainWindowSeparator_background_color = {};
-    QColor m_QMenuBar_background_color = {};
-    QColor m_QMenuBarItem_color = {};
-    QColor m_QMenuBarItemPressed_color = {};
-    QColor m_QMenuBarItemSelected_background_color = {};
-    QColor m_QMenuBarItemSelected_color = {};
-    QColor m_QMenu_background_color = {};
-    QColor m_QMenu_color = {};
-    QColor m_QMenuItemSelected_background_color = {};
-    QColor m_QMenuItemSelected_color = {};
-    QColor m_QMenuItemDisabled_background_color = {};
-    QColor m_QPushButton_background_color = {};
-    QColor m_QPushButton_border_color = {};
-    QColor m_QPushButtonHover_background_color = {};
-    QColor m_QPushButtonPressed_background_color = {};
-    QColor m_QPushButtonDefault_background_color = {};
-    QColor m_QPushButtonDefaultPressed_background_color = {};
-    QColor m_QPushButtonDefaultHover_background_color = {};
-    QColor m_QPushButtonDefault_border_color = {};
-    QColor m_QPushButtonDefault_text_color = {};
-    QColor m_QSplitter_handle_start_color = {};
-    QColor m_QSplitter_handle_end_color = {};
-    QColor m_QToolButton_background_color = {};
-    QColor m_QToolButton_color = {};
-    QColor m_QToolButton_border_color = {};
-    QColor m_QToolButtonChecked_background_color = {};
-    QColor m_QToolButtonDisabled_background_color = {};
-    QColor m_QToolButtonDisabled_color = {};
-    QColor m_QStatusBar_border_color = {};
-    QColor m_QTableWidget_color = {};
-    QColor m_QTableWidget_selected_background_color = {};
-    QColor m_QHeaderView_background_color = {};
-    QColor m_QHeaderView_border_color = {};
-    QColor m_QHeaderView_color = {};
-    QColor m_QHeaderViewDisabled_background_color = {};
-    QColor m_QHeaderViewDisabled_border_color = {};
-    QColor m_QHeaderViewDisabled_color = {};
-    QColor m_QTabWidgetPane_border_color = {};
-    QColor m_QTabWidgetPane_background_color = {};
-    QColor m_QTabBarTab_border_color = {};
-    QColor m_QTabBarTabSelected_background_color = {};
-    QColor m_QTabBarTabSelected_color = {};
-    QColor m_QTabBarTabNotSelected_background_color = {};
-    QColor m_QTabBarTabNotSelectedHover_background_color = {};
-    QColor m_QTextEdit_background_color = {};
-    QColor m_QTextEdit_color = {};
-    QColor m_QLineEdit_color = {};
-    QColor m_QLineEdit_background_color = {};
-    QColor m_QLineEdit_border_color = {};
-    QColor m_QLineEditDisabled_background_color = {};
-    QColor m_QLineEditError_background_color = {};
-    QColor m_QSpinBoxArrow_background_color = {};
-    QColor m_QSpinBoxArrow_hover_background_color = {};
-    QColor m_QComboBox_border_color = {};
-    QColor m_QComboBox_background_color = {};
-    QColor m_QComboBoxArrow_background_color = {};
-    QColor m_QComboBoxArrow_hover_background_color = {};
-    QColor m_QComboBoxItem_border_color = {};
-    QColor m_QComboBoxItem_selection_color = {};
-    QColor m_QComboBoxItem_background_color = {};
-    QColor m_QComboBoxDisabled_background_color = {};
-    QColor m_QComboBoxDisabled_color = {};
-    QColor m_QToolBar_background_color = {};
-    QColor m_QToolBar_border_color = {};
-    QColor m_QTreeView_background_color = {};
-    QColor m_QTreeViewItem_background_color = {};
-    QColor m_QTreeViewItem_error_background_color = {};
-    QColor m_QTreeViewItem_color = {};
-    QColor m_QTreeViewItem_error_color = {};
-    int m_QTreeViewItem_font_size = {};
-    QColor m_QTreeViewItemHover_background_color = {};
-    QColor m_QTreeViewItemHover_color = {};
-    QColor m_QTreeViewItemSelectedActive_background_color = {};
-    QColor m_QTreeViewItemSelectedActive_color = {};
-    QColor m_QTreeViewItemSelectedNotActive_background_color = {};
-    QColor m_QTreeViewItemSelectedNotActive_color = {};
-    QColor m_QTreeViewBranch_background_color = {};
-    QColor m_QTreeViewBranchHover_background_color = {};
-    QColor m_QTreeViewBranchHover_color = {};
-    QColor m_QTreeViewBranchSelectedActive_background_color = {};
-    QColor m_QTreeViewBranchSelectedNotActive_background_color = {};
-    QColor m_FilterBackgroundColor = {};
-    QColor m_FilterSelectionColor = {};
-    QColor m_FilterFontColor = {};
-    QColor m_DataArrayPath_DataContainer_color = {};
-    QColor m_DataArrayPath_AttributeMatrix_color = {};
-    QColor m_DataArrayPath_DataArray_color = {};
-    QColor m_DataArrayPath_Invalid_color = {};
-    QColor m_DataArrayPath_DataContainer_background_color = {};
-    QColor m_DataArrayPath_AttributeMatrix_background_color = {};
-    QColor m_DataArrayPath_DataArray_background_color = {};
-    QColor m_DataArrayPath_Invalid_background_color = {};
-    QColor m_DataArrayPath_border_normal = {};
-    QColor m_DataArrayPath_border_not_found = {};
-    QColor m_DataArrayPath_border_drag_enabled = {};
-    QColor m_DataArrayPath_border_drag_disabled = {};
-    QColor m_DataPathLabel_color = {};
-    QColor m_DataPathLabel_Disabled_color = {};
-    QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_background_color = {};
-    QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_text_color = {};
-
-    static SVStyle* self;
-
-    QString m_CurrentThemeFilePath = ":/SIMPL/StyleSheets/Default.json";
-
-    QStringList m_ColorProperties;
-
-    /**
-     * @brief invalidateColorProperties
-     */
-    void invalidateColorProperties();
-
-    /**
-     * @brief loadStringProperty
-     * @return
-     */
-    QString loadStringProperty(const QString &key, QJsonObject cssRepl, QJsonObject varMapping);
-
-    /**
-     * @brief loadIntegerProperty
-     * @return
-     */
-    int loadIntegerProperty(const QString &key, QJsonObject cssRepl, QJsonObject varMapping);
+  Q_OBJECT
+public:
+  /**
+   * @brief Returns the name of the class for SVStyle
+   */
+  virtual QString getNameOfClass() const;
+  /**
+   * @brief Returns the name of the class for SVStyle
+   */
+  static QString ClassName();
+
+  ~SVStyle() override;
+
+  /**
+   * @brief
+   * @return
+   */
+  static SVStyle* Instance();
+
+  QString getCurrentThemeFilePath() const;
+
+  /**
+   * @brief Setter property for Fader_color
+   */
+  void setFader_color(const QColor& value);
+  /**
+   * @brief Getter property for Fader_color
+   * @return Value of Fader_color
+   */
+  QColor getFader_color() const;
+
+  Q_PROPERTY(QColor Fader_color READ getFader_color WRITE setFader_color)
+
+  /**
+   * @brief Setter property for Widget_Error_color
+   */
+  void setWidget_Error_color(const QColor& value);
+  /**
+   * @brief Getter property for Widget_Error_color
+   * @return Value of Widget_Error_color
+   */
+  QColor getWidget_Error_color() const;
+
+  Q_PROPERTY(QColor Widget_Error_color READ getWidget_Error_color WRITE setWidget_Error_color)
+
+  /**
+   * @brief Setter property for Text_Error_color
+   */
+  void setText_Error_color(const QColor& value);
+  /**
+   * @brief Getter property for Text_Error_color
+   * @return Value of Text_Error_color
+   */
+  QColor getText_Error_color() const;
+
+  Q_PROPERTY(QColor Text_Error_color READ getText_Error_color WRITE setText_Error_color)
+
+  /**
+   * @brief Setter property for CentralWidget_background_color
+   */
+  void setCentralWidget_background_color(const QColor& value);
+  /**
+   * @brief Getter property for CentralWidget_background_color
+   * @return Value of CentralWidget_background_color
+   */
+  QColor getCentralWidget_background_color() const;
+
+  Q_PROPERTY(QColor CentralWidget_background_color READ getCentralWidget_background_color WRITE setCentralWidget_background_color)
+
+  /**
+   * @brief Setter property for QLabel_color
+   */
+  void setQLabel_color(const QColor& value);
+  /**
+   * @brief Getter property for QLabel_color
+   * @return Value of QLabel_color
+   */
+  QColor getQLabel_color() const;
+
+  Q_PROPERTY(QColor QLabel_color READ getQLabel_color WRITE setQLabel_color)
+
+  /**
+   * @brief Setter property for FilterInputWidget_background_color
+   */
+  void setFilterInputWidget_background_color(const QColor& value);
+  /**
+   * @brief Getter property for FilterInputWidget_background_color
+   * @return Value of FilterInputWidget_background_color
+   */
+  QColor getFilterInputWidget_background_color() const;
+
+  Q_PROPERTY(QColor FilterInputWidget_background_color READ getFilterInputWidget_background_color WRITE setFilterInputWidget_background_color)
+
+  /**
+   * @brief Setter property for QScrollArea_background_color
+   */
+  void setQScrollArea_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QScrollArea_background_color
+   * @return Value of QScrollArea_background_color
+   */
+  QColor getQScrollArea_background_color() const;
+
+  Q_PROPERTY(QColor QScrollArea_background_color READ getQScrollArea_background_color WRITE setQScrollArea_background_color)
+
+  /**
+   * @brief Setter property for VariablesTabContents_background_color
+   */
+  void setVariablesTabContents_background_color(const QColor& value);
+  /**
+   * @brief Getter property for VariablesTabContents_background_color
+   * @return Value of VariablesTabContents_background_color
+   */
+  QColor getVariablesTabContents_background_color() const;
+
+  Q_PROPERTY(QColor VariablesTabContents_background_color READ getVariablesTabContents_background_color WRITE setVariablesTabContents_background_color)
+
+  /**
+   * @brief Setter property for FilterParameterWidget_background_color
+   */
+  void setFilterParameterWidget_background_color(const QColor& value);
+  /**
+   * @brief Getter property for FilterParameterWidget_background_color
+   * @return Value of FilterParameterWidget_background_color
+   */
+  QColor getFilterParameterWidget_background_color() const;
+
+  Q_PROPERTY(QColor FilterParameterWidget_background_color READ getFilterParameterWidget_background_color WRITE setFilterParameterWidget_background_color)
+
+  /**
+   * @brief Setter property for FilterParameterWidget_border_color
+   */
+  void setFilterParameterWidget_border_color(const QColor& value);
+  /**
+   * @brief Getter property for FilterParameterWidget_border_color
+   * @return Value of FilterParameterWidget_border_color
+   */
+  QColor getFilterParameterWidget_border_color() const;
+
+  Q_PROPERTY(QColor FilterParameterWidget_border_color READ getFilterParameterWidget_border_color WRITE setFilterParameterWidget_border_color)
+
+  /**
+   * @brief Setter property for QGroupBoxTitle_background_color
+   */
+  void setQGroupBoxTitle_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QGroupBoxTitle_background_color
+   * @return Value of QGroupBoxTitle_background_color
+   */
+  QColor getQGroupBoxTitle_background_color() const;
+
+  Q_PROPERTY(QColor QGroupBoxTitle_background_color READ getQGroupBoxTitle_background_color WRITE setQGroupBoxTitle_background_color)
+
+  /**
+   * @brief Setter property for QGroupBox_background_color
+   */
+  void setQGroupBox_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QGroupBox_background_color
+   * @return Value of QGroupBox_background_color
+   */
+  QColor getQGroupBox_background_color() const;
+
+  Q_PROPERTY(QColor QGroupBox_background_color READ getQGroupBox_background_color WRITE setQGroupBox_background_color)
+
+  /**
+   * @brief Setter property for QDockWidget_border_color
+   */
+  void setQDockWidget_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QDockWidget_border_color
+   * @return Value of QDockWidget_border_color
+   */
+  QColor getQDockWidget_border_color() const;
+
+  Q_PROPERTY(QColor QDockWidget_border_color READ getQDockWidget_border_color WRITE setQDockWidget_border_color)
+
+  /**
+   * @brief Setter property for QDockWidget_color
+   */
+  void setQDockWidget_color(const QColor& value);
+  /**
+   * @brief Getter property for QDockWidget_color
+   * @return Value of QDockWidget_color
+   */
+  QColor getQDockWidget_color() const;
+
+  Q_PROPERTY(QColor QDockWidget_color READ getQDockWidget_color WRITE setQDockWidget_color)
+
+  /**
+   * @brief Setter property for QDockWidgetTitle_background_color
+   */
+  void setQDockWidgetTitle_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QDockWidgetTitle_background_color
+   * @return Value of QDockWidgetTitle_background_color
+   */
+  QColor getQDockWidgetTitle_background_color() const;
+
+  Q_PROPERTY(QColor QDockWidgetTitle_background_color READ getQDockWidgetTitle_background_color WRITE setQDockWidgetTitle_background_color)
+
+  /**
+   * @brief Setter property for QDockWidgetTitle_color
+   */
+  void setQDockWidgetTitle_color(const QColor& value);
+  /**
+   * @brief Getter property for QDockWidgetTitle_color
+   * @return Value of QDockWidgetTitle_color
+   */
+  QColor getQDockWidgetTitle_color() const;
+
+  Q_PROPERTY(QColor QDockWidgetTitle_color READ getQDockWidgetTitle_color WRITE setQDockWidgetTitle_color)
+
+  /**
+   * @brief Setter property for QListView_background_color
+   */
+  void setQListView_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QListView_background_color
+   * @return Value of QListView_background_color
+   */
+  QColor getQListView_background_color() const;
+
+  Q_PROPERTY(QColor QListView_background_color READ getQListView_background_color WRITE setQListView_background_color)
+
+  /**
+   * @brief Setter property for QListView_color
+   */
+  void setQListView_color(const QColor& value);
+  /**
+   * @brief Getter property for QListView_color
+   * @return Value of QListView_color
+   */
+  QColor getQListView_color() const;
+
+  Q_PROPERTY(QColor QListView_color READ getQListView_color WRITE setQListView_color)
+
+  /**
+   * @brief Setter property for QListViewItemHover_background_color
+   */
+  void setQListViewItemHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QListViewItemHover_background_color
+   * @return Value of QListViewItemHover_background_color
+   */
+  QColor getQListViewItemHover_background_color() const;
+
+  Q_PROPERTY(QColor QListViewItemHover_background_color READ getQListViewItemHover_background_color WRITE setQListViewItemHover_background_color)
+
+  /**
+   * @brief Setter property for QListViewItemHover_color
+   */
+  void setQListViewItemHover_color(const QColor& value);
+  /**
+   * @brief Getter property for QListViewItemHover_color
+   * @return Value of QListViewItemHover_color
+   */
+  QColor getQListViewItemHover_color() const;
+
+  Q_PROPERTY(QColor QListViewItemHover_color READ getQListViewItemHover_color WRITE setQListViewItemHover_color)
+
+  /**
+   * @brief Setter property for QListViewItemSelected_background_color
+   */
+  void setQListViewItemSelected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QListViewItemSelected_background_color
+   * @return Value of QListViewItemSelected_background_color
+   */
+  QColor getQListViewItemSelected_background_color() const;
+
+  Q_PROPERTY(QColor QListViewItemSelected_background_color READ getQListViewItemSelected_background_color WRITE setQListViewItemSelected_background_color)
+
+  /**
+   * @brief Setter property for QListViewItemSelected_color
+   */
+  void setQListViewItemSelected_color(const QColor& value);
+  /**
+   * @brief Getter property for QListViewItemSelected_color
+   * @return Value of QListViewItemSelected_color
+   */
+  QColor getQListViewItemSelected_color() const;
+
+  Q_PROPERTY(QColor QListViewItemSelected_color READ getQListViewItemSelected_color WRITE setQListViewItemSelected_color)
+
+  /**
+   * @brief Setter property for QMainWindowSeparator_background_color
+   */
+  void setQMainWindowSeparator_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMainWindowSeparator_background_color
+   * @return Value of QMainWindowSeparator_background_color
+   */
+  QColor getQMainWindowSeparator_background_color() const;
+
+  Q_PROPERTY(QColor QMainWindowSeparator_background_color READ getQMainWindowSeparator_background_color WRITE setQMainWindowSeparator_background_color)
+
+  /**
+   * @brief Setter property for QMenuBar_background_color
+   */
+  void setQMenuBar_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuBar_background_color
+   * @return Value of QMenuBar_background_color
+   */
+  QColor getQMenuBar_background_color() const;
+
+  Q_PROPERTY(QColor QMenuBar_background_color READ getQMenuBar_background_color WRITE setQMenuBar_background_color)
+
+  /**
+   * @brief Setter property for QMenuBarItem_color
+   */
+  void setQMenuBarItem_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuBarItem_color
+   * @return Value of QMenuBarItem_color
+   */
+  QColor getQMenuBarItem_color() const;
+
+  Q_PROPERTY(QColor QMenuBarItem_color READ getQMenuBarItem_color WRITE setQMenuBarItem_color)
+
+  /**
+   * @brief Setter property for QMenuBarItemPressed_color
+   */
+  void setQMenuBarItemPressed_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuBarItemPressed_color
+   * @return Value of QMenuBarItemPressed_color
+   */
+  QColor getQMenuBarItemPressed_color() const;
+
+  Q_PROPERTY(QColor QMenuBarItemPressed_color READ getQMenuBarItemPressed_color WRITE setQMenuBarItemPressed_color)
+
+  /**
+   * @brief Setter property for QMenuBarItemSelected_background_color
+   */
+  void setQMenuBarItemSelected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuBarItemSelected_background_color
+   * @return Value of QMenuBarItemSelected_background_color
+   */
+  QColor getQMenuBarItemSelected_background_color() const;
+
+  Q_PROPERTY(QColor QMenuBarItemSelected_background_color READ getQMenuBarItemSelected_background_color WRITE setQMenuBarItemSelected_background_color)
+
+  /**
+   * @brief Setter property for QMenuBarItemSelected_color
+   */
+  void setQMenuBarItemSelected_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuBarItemSelected_color
+   * @return Value of QMenuBarItemSelected_color
+   */
+  QColor getQMenuBarItemSelected_color() const;
+
+  Q_PROPERTY(QColor QMenuBarItemSelected_color READ getQMenuBarItemSelected_color WRITE setQMenuBarItemSelected_color)
+
+  /**
+   * @brief Setter property for QMenu_background_color
+   */
+  void setQMenu_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenu_background_color
+   * @return Value of QMenu_background_color
+   */
+  QColor getQMenu_background_color() const;
+
+  Q_PROPERTY(QColor QMenu_background_color READ getQMenu_background_color WRITE setQMenu_background_color)
+
+  /**
+   * @brief Setter property for QMenu_color
+   */
+  void setQMenu_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenu_color
+   * @return Value of QMenu_color
+   */
+  QColor getQMenu_color() const;
+
+  Q_PROPERTY(QColor QMenu_color READ getQMenu_color WRITE setQMenu_color)
+
+  /**
+   * @brief Setter property for QMenuItemSelected_background_color
+   */
+  void setQMenuItemSelected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuItemSelected_background_color
+   * @return Value of QMenuItemSelected_background_color
+   */
+  QColor getQMenuItemSelected_background_color() const;
+
+  Q_PROPERTY(QColor QMenuItemSelected_background_color READ getQMenuItemSelected_background_color WRITE setQMenuItemSelected_background_color)
+
+  /**
+   * @brief Setter property for QMenuItemSelected_color
+   */
+  void setQMenuItemSelected_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuItemSelected_color
+   * @return Value of QMenuItemSelected_color
+   */
+  QColor getQMenuItemSelected_color() const;
+
+  Q_PROPERTY(QColor QMenuItemSelected_color READ getQMenuItemSelected_color WRITE setQMenuItemSelected_color)
+
+  /**
+   * @brief Setter property for QMenuItemDisabled_background_color
+   */
+  void setQMenuItemDisabled_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QMenuItemDisabled_background_color
+   * @return Value of QMenuItemDisabled_background_color
+   */
+  QColor getQMenuItemDisabled_background_color() const;
+
+  Q_PROPERTY(QColor QMenuItemDisabled_background_color READ getQMenuItemDisabled_background_color WRITE setQMenuItemDisabled_background_color)
+
+  /**
+   * @brief Setter property for QPushButton_background_color
+   */
+  void setQPushButton_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButton_background_color
+   * @return Value of QPushButton_background_color
+   */
+  QColor getQPushButton_background_color() const;
+
+  Q_PROPERTY(QColor QPushButton_background_color READ getQPushButton_background_color WRITE setQPushButton_background_color)
+
+  /**
+   * @brief Setter property for QPushButton_border_color
+   */
+  void setQPushButton_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButton_border_color
+   * @return Value of QPushButton_border_color
+   */
+  QColor getQPushButton_border_color() const;
+
+  Q_PROPERTY(QColor QPushButton_border_color READ getQPushButton_border_color WRITE setQPushButton_border_color)
+
+  /**
+   * @brief Setter property for QPushButtonHover_background_color
+   */
+  void setQPushButtonHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonHover_background_color
+   * @return Value of QPushButtonHover_background_color
+   */
+  QColor getQPushButtonHover_background_color() const;
+
+  Q_PROPERTY(QColor QPushButtonHover_background_color READ getQPushButtonHover_background_color WRITE setQPushButtonHover_background_color)
+
+  /**
+   * @brief Setter property for QPushButtonPressed_background_color
+   */
+  void setQPushButtonPressed_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonPressed_background_color
+   * @return Value of QPushButtonPressed_background_color
+   */
+  QColor getQPushButtonPressed_background_color() const;
+
+  Q_PROPERTY(QColor QPushButtonPressed_background_color READ getQPushButtonPressed_background_color WRITE setQPushButtonPressed_background_color)
+
+  /**
+   * @brief Setter property for QPushButtonDefault_background_color
+   */
+  void setQPushButtonDefault_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonDefault_background_color
+   * @return Value of QPushButtonDefault_background_color
+   */
+  QColor getQPushButtonDefault_background_color() const;
+
+  Q_PROPERTY(QColor QPushButtonDefault_background_color READ getQPushButtonDefault_background_color WRITE setQPushButtonDefault_background_color)
+
+  /**
+   * @brief Setter property for QPushButtonDefaultPressed_background_color
+   */
+  void setQPushButtonDefaultPressed_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonDefaultPressed_background_color
+   * @return Value of QPushButtonDefaultPressed_background_color
+   */
+  QColor getQPushButtonDefaultPressed_background_color() const;
+
+  Q_PROPERTY(QColor QPushButtonDefaultPressed_background_color READ getQPushButtonDefaultPressed_background_color WRITE setQPushButtonDefaultPressed_background_color)
+
+  /**
+   * @brief Setter property for QPushButtonDefaultHover_background_color
+   */
+  void setQPushButtonDefaultHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonDefaultHover_background_color
+   * @return Value of QPushButtonDefaultHover_background_color
+   */
+  QColor getQPushButtonDefaultHover_background_color() const;
+
+  Q_PROPERTY(QColor QPushButtonDefaultHover_background_color READ getQPushButtonDefaultHover_background_color WRITE setQPushButtonDefaultHover_background_color)
+
+  /**
+   * @brief Setter property for QPushButtonDefault_border_color
+   */
+  void setQPushButtonDefault_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonDefault_border_color
+   * @return Value of QPushButtonDefault_border_color
+   */
+  QColor getQPushButtonDefault_border_color() const;
+
+  Q_PROPERTY(QColor QPushButtonDefault_border_color READ getQPushButtonDefault_border_color WRITE setQPushButtonDefault_border_color)
+
+  /**
+   * @brief Setter property for QPushButtonDefault_text_color
+   */
+  void setQPushButtonDefault_text_color(const QColor& value);
+  /**
+   * @brief Getter property for QPushButtonDefault_text_color
+   * @return Value of QPushButtonDefault_text_color
+   */
+  QColor getQPushButtonDefault_text_color() const;
+
+  Q_PROPERTY(QColor QPushButtonDefault_text_color READ getQPushButtonDefault_text_color WRITE setQPushButtonDefault_text_color)
+
+  /**
+   * @brief Setter property for QSplitter_handle_start_color
+   */
+  void setQSplitter_handle_start_color(const QColor& value);
+  /**
+   * @brief Getter property for QSplitter_handle_start_color
+   * @return Value of QSplitter_handle_start_color
+   */
+  QColor getQSplitter_handle_start_color() const;
+
+  Q_PROPERTY(QColor QSplitter_handle_start_color READ getQSplitter_handle_start_color WRITE setQSplitter_handle_start_color)
+
+  /**
+   * @brief Setter property for QSplitter_handle_end_color
+   */
+  void setQSplitter_handle_end_color(const QColor& value);
+  /**
+   * @brief Getter property for QSplitter_handle_end_color
+   * @return Value of QSplitter_handle_end_color
+   */
+  QColor getQSplitter_handle_end_color() const;
+
+  Q_PROPERTY(QColor QSplitter_handle_end_color READ getQSplitter_handle_end_color WRITE setQSplitter_handle_end_color)
+
+  /**
+   * @brief Setter property for QToolButton_background_color
+   */
+  void setQToolButton_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButton_background_color
+   * @return Value of QToolButton_background_color
+   */
+  QColor getQToolButton_background_color() const;
+
+  Q_PROPERTY(QColor QToolButton_background_color READ getQToolButton_background_color WRITE setQToolButton_background_color)
+
+  /**
+   * @brief Setter property for QToolButton_color
+   */
+  void setQToolButton_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButton_color
+   * @return Value of QToolButton_color
+   */
+  QColor getQToolButton_color() const;
+
+  Q_PROPERTY(QColor QToolButton_color READ getQToolButton_color WRITE setQToolButton_color)
+
+  /**
+   * @brief Setter property for QToolButton_border_color
+   */
+  void setQToolButton_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButton_border_color
+   * @return Value of QToolButton_border_color
+   */
+  QColor getQToolButton_border_color() const;
+
+  Q_PROPERTY(QColor QToolButton_border_color READ getQToolButton_border_color WRITE setQToolButton_border_color)
+
+  /**
+   * @brief Setter property for QToolButtonChecked_background_color
+   */
+  void setQToolButtonChecked_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButtonChecked_background_color
+   * @return Value of QToolButtonChecked_background_color
+   */
+  QColor getQToolButtonChecked_background_color() const;
+
+  Q_PROPERTY(QColor QToolButtonChecked_background_color READ getQToolButtonChecked_background_color WRITE setQToolButtonChecked_background_color)
+
+  /**
+   * @brief Setter property for QToolButtonDisabled_background_color
+   */
+  void setQToolButtonDisabled_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButtonDisabled_background_color
+   * @return Value of QToolButtonDisabled_background_color
+   */
+  QColor getQToolButtonDisabled_background_color() const;
+
+  Q_PROPERTY(QColor QToolButtonDisabled_background_color READ getQToolButtonDisabled_background_color WRITE setQToolButtonDisabled_background_color)
+
+  /**
+   * @brief Setter property for QToolButtonDisabled_color
+   */
+  void setQToolButtonDisabled_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolButtonDisabled_color
+   * @return Value of QToolButtonDisabled_color
+   */
+  QColor getQToolButtonDisabled_color() const;
+
+  Q_PROPERTY(QColor QToolButtonDisabled_color READ getQToolButtonDisabled_color WRITE setQToolButtonDisabled_color)
+
+  /**
+   * @brief Setter property for QStatusBar_border_color
+   */
+  void setQStatusBar_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QStatusBar_border_color
+   * @return Value of QStatusBar_border_color
+   */
+  QColor getQStatusBar_border_color() const;
+
+  Q_PROPERTY(QColor QStatusBar_border_color READ getQStatusBar_border_color WRITE setQStatusBar_border_color)
+
+  /**
+   * @brief Setter property for QTableWidget_color
+   */
+  void setQTableWidget_color(const QColor& value);
+  /**
+   * @brief Getter property for QTableWidget_color
+   * @return Value of QTableWidget_color
+   */
+  QColor getQTableWidget_color() const;
+
+  Q_PROPERTY(QColor QTableWidget_color READ getQTableWidget_color WRITE setQTableWidget_color)
+
+  /**
+   * @brief Setter property for QTableWidget_selected_background_color
+   */
+  void setQTableWidget_selected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTableWidget_selected_background_color
+   * @return Value of QTableWidget_selected_background_color
+   */
+  QColor getQTableWidget_selected_background_color() const;
+
+  Q_PROPERTY(QColor QTableWidget_selected_background_color READ getQTableWidget_selected_background_color WRITE setQTableWidget_selected_background_color)
+
+  /**
+   * @brief Setter property for QHeaderView_background_color
+   */
+  void setQHeaderView_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderView_background_color
+   * @return Value of QHeaderView_background_color
+   */
+  QColor getQHeaderView_background_color() const;
+
+  Q_PROPERTY(QColor QHeaderView_background_color READ getQHeaderView_background_color WRITE setQHeaderView_background_color)
+
+  /**
+   * @brief Setter property for QHeaderView_border_color
+   */
+  void setQHeaderView_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderView_border_color
+   * @return Value of QHeaderView_border_color
+   */
+  QColor getQHeaderView_border_color() const;
+
+  Q_PROPERTY(QColor QHeaderView_border_color READ getQHeaderView_border_color WRITE setQHeaderView_border_color)
+
+  /**
+   * @brief Setter property for QHeaderView_color
+   */
+  void setQHeaderView_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderView_color
+   * @return Value of QHeaderView_color
+   */
+  QColor getQHeaderView_color() const;
+
+  Q_PROPERTY(QColor QHeaderView_color READ getQHeaderView_color WRITE setQHeaderView_color)
+
+  /**
+   * @brief Setter property for QHeaderViewDisabled_background_color
+   */
+  void setQHeaderViewDisabled_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderViewDisabled_background_color
+   * @return Value of QHeaderViewDisabled_background_color
+   */
+  QColor getQHeaderViewDisabled_background_color() const;
+
+  Q_PROPERTY(QColor QHeaderViewDisabled_background_color READ getQHeaderViewDisabled_background_color WRITE setQHeaderViewDisabled_background_color)
+
+  /**
+   * @brief Setter property for QHeaderViewDisabled_border_color
+   */
+  void setQHeaderViewDisabled_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderViewDisabled_border_color
+   * @return Value of QHeaderViewDisabled_border_color
+   */
+  QColor getQHeaderViewDisabled_border_color() const;
+
+  Q_PROPERTY(QColor QHeaderViewDisabled_border_color READ getQHeaderViewDisabled_border_color WRITE setQHeaderViewDisabled_border_color)
+
+  /**
+   * @brief Setter property for QHeaderViewDisabled_color
+   */
+  void setQHeaderViewDisabled_color(const QColor& value);
+  /**
+   * @brief Getter property for QHeaderViewDisabled_color
+   * @return Value of QHeaderViewDisabled_color
+   */
+  QColor getQHeaderViewDisabled_color() const;
+
+  Q_PROPERTY(QColor QHeaderViewDisabled_color READ getQHeaderViewDisabled_color WRITE setQHeaderViewDisabled_color)
+
+  /**
+   * @brief Setter property for QTabWidgetPane_border_color
+   */
+  void setQTabWidgetPane_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabWidgetPane_border_color
+   * @return Value of QTabWidgetPane_border_color
+   */
+  QColor getQTabWidgetPane_border_color() const;
+
+  Q_PROPERTY(QColor QTabWidgetPane_border_color READ getQTabWidgetPane_border_color WRITE setQTabWidgetPane_border_color)
+
+  /**
+   * @brief Setter property for QTabWidgetPane_background_color
+   */
+  void setQTabWidgetPane_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabWidgetPane_background_color
+   * @return Value of QTabWidgetPane_background_color
+   */
+  QColor getQTabWidgetPane_background_color() const;
+
+  Q_PROPERTY(QColor QTabWidgetPane_background_color READ getQTabWidgetPane_background_color WRITE setQTabWidgetPane_background_color)
+
+  /**
+   * @brief Setter property for QTabBarTab_border_color
+   */
+  void setQTabBarTab_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabBarTab_border_color
+   * @return Value of QTabBarTab_border_color
+   */
+  QColor getQTabBarTab_border_color() const;
+
+  Q_PROPERTY(QColor QTabBarTab_border_color READ getQTabBarTab_border_color WRITE setQTabBarTab_border_color)
+
+  /**
+   * @brief Setter property for QTabBarTabSelected_background_color
+   */
+  void setQTabBarTabSelected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabBarTabSelected_background_color
+   * @return Value of QTabBarTabSelected_background_color
+   */
+  QColor getQTabBarTabSelected_background_color() const;
+
+  Q_PROPERTY(QColor QTabBarTabSelected_background_color READ getQTabBarTabSelected_background_color WRITE setQTabBarTabSelected_background_color)
+
+  /**
+   * @brief Setter property for QTabBarTabSelected_color
+   */
+  void setQTabBarTabSelected_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabBarTabSelected_color
+   * @return Value of QTabBarTabSelected_color
+   */
+  QColor getQTabBarTabSelected_color() const;
+
+  Q_PROPERTY(QColor QTabBarTabSelected_color READ getQTabBarTabSelected_color WRITE setQTabBarTabSelected_color)
+
+  /**
+   * @brief Setter property for QTabBarTabNotSelected_background_color
+   */
+  void setQTabBarTabNotSelected_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabBarTabNotSelected_background_color
+   * @return Value of QTabBarTabNotSelected_background_color
+   */
+  QColor getQTabBarTabNotSelected_background_color() const;
+
+  Q_PROPERTY(QColor QTabBarTabNotSelected_background_color READ getQTabBarTabNotSelected_background_color WRITE setQTabBarTabNotSelected_background_color)
+
+  /**
+   * @brief Setter property for QTabBarTabNotSelectedHover_background_color
+   */
+  void setQTabBarTabNotSelectedHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTabBarTabNotSelectedHover_background_color
+   * @return Value of QTabBarTabNotSelectedHover_background_color
+   */
+  QColor getQTabBarTabNotSelectedHover_background_color() const;
+
+  Q_PROPERTY(QColor QTabBarTabNotSelectedHover_background_color READ getQTabBarTabNotSelectedHover_background_color WRITE setQTabBarTabNotSelectedHover_background_color)
+
+  /**
+   * @brief Setter property for QTextEdit_background_color
+   */
+  void setQTextEdit_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTextEdit_background_color
+   * @return Value of QTextEdit_background_color
+   */
+  QColor getQTextEdit_background_color() const;
+
+  Q_PROPERTY(QColor QTextEdit_background_color READ getQTextEdit_background_color WRITE setQTextEdit_background_color)
+
+  /**
+   * @brief Setter property for QTextEdit_color
+   */
+  void setQTextEdit_color(const QColor& value);
+  /**
+   * @brief Getter property for QTextEdit_color
+   * @return Value of QTextEdit_color
+   */
+  QColor getQTextEdit_color() const;
+
+  Q_PROPERTY(QColor QTextEdit_color READ getQTextEdit_color WRITE setQTextEdit_color)
+
+  /**
+   * @brief Setter property for QLineEdit_color
+   */
+  void setQLineEdit_color(const QColor& value);
+  /**
+   * @brief Getter property for QLineEdit_color
+   * @return Value of QLineEdit_color
+   */
+  QColor getQLineEdit_color() const;
+
+  Q_PROPERTY(QColor QLineEdit_color READ getQLineEdit_color WRITE setQLineEdit_color)
+
+  /**
+   * @brief Setter property for QLineEdit_background_color
+   */
+  void setQLineEdit_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QLineEdit_background_color
+   * @return Value of QLineEdit_background_color
+   */
+  QColor getQLineEdit_background_color() const;
+
+  Q_PROPERTY(QColor QLineEdit_background_color READ getQLineEdit_background_color WRITE setQLineEdit_background_color)
+
+  /**
+   * @brief Setter property for QLineEdit_border_color
+   */
+  void setQLineEdit_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QLineEdit_border_color
+   * @return Value of QLineEdit_border_color
+   */
+  QColor getQLineEdit_border_color() const;
+
+  Q_PROPERTY(QColor QLineEdit_border_color READ getQLineEdit_border_color WRITE setQLineEdit_border_color)
+
+  /**
+   * @brief Setter property for QLineEditDisabled_background_color
+   */
+  void setQLineEditDisabled_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QLineEditDisabled_background_color
+   * @return Value of QLineEditDisabled_background_color
+   */
+  QColor getQLineEditDisabled_background_color() const;
+
+  Q_PROPERTY(QColor QLineEditDisabled_background_color READ getQLineEditDisabled_background_color WRITE setQLineEditDisabled_background_color)
+
+  /**
+   * @brief Setter property for QLineEditError_background_color
+   */
+  void setQLineEditError_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QLineEditError_background_color
+   * @return Value of QLineEditError_background_color
+   */
+  QColor getQLineEditError_background_color() const;
+
+  Q_PROPERTY(QColor QLineEditError_background_color READ getQLineEditError_background_color WRITE setQLineEditError_background_color)
+
+  /**
+   * @brief Setter property for QSpinBoxArrow_background_color
+   */
+  void setQSpinBoxArrow_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QSpinBoxArrow_background_color
+   * @return Value of QSpinBoxArrow_background_color
+   */
+  QColor getQSpinBoxArrow_background_color() const;
+
+  Q_PROPERTY(QColor QSpinBoxArrow_background_color READ getQSpinBoxArrow_background_color WRITE setQSpinBoxArrow_background_color)
+
+  /**
+   * @brief Setter property for QSpinBoxArrow_hover_background_color
+   */
+  void setQSpinBoxArrow_hover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QSpinBoxArrow_hover_background_color
+   * @return Value of QSpinBoxArrow_hover_background_color
+   */
+  QColor getQSpinBoxArrow_hover_background_color() const;
+
+  Q_PROPERTY(QColor QSpinBoxArrow_hover_background_color READ getQSpinBoxArrow_hover_background_color WRITE setQSpinBoxArrow_hover_background_color)
+
+  /**
+   * @brief Setter property for QComboBox_border_color
+   */
+  void setQComboBox_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBox_border_color
+   * @return Value of QComboBox_border_color
+   */
+  QColor getQComboBox_border_color() const;
+
+  Q_PROPERTY(QColor QComboBox_border_color READ getQComboBox_border_color WRITE setQComboBox_border_color)
+
+  /**
+   * @brief Setter property for QComboBox_background_color
+   */
+  void setQComboBox_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBox_background_color
+   * @return Value of QComboBox_background_color
+   */
+  QColor getQComboBox_background_color() const;
+
+  Q_PROPERTY(QColor QComboBox_background_color READ getQComboBox_background_color WRITE setQComboBox_background_color)
+
+  /**
+   * @brief Setter property for QComboBoxArrow_background_color
+   */
+  void setQComboBoxArrow_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxArrow_background_color
+   * @return Value of QComboBoxArrow_background_color
+   */
+  QColor getQComboBoxArrow_background_color() const;
+
+  Q_PROPERTY(QColor QComboBoxArrow_background_color READ getQComboBoxArrow_background_color WRITE setQComboBoxArrow_background_color)
+
+  /**
+   * @brief Setter property for QComboBoxArrow_hover_background_color
+   */
+  void setQComboBoxArrow_hover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxArrow_hover_background_color
+   * @return Value of QComboBoxArrow_hover_background_color
+   */
+  QColor getQComboBoxArrow_hover_background_color() const;
+
+  Q_PROPERTY(QColor QComboBoxArrow_hover_background_color READ getQComboBoxArrow_hover_background_color WRITE setQComboBoxArrow_hover_background_color)
+
+  /**
+   * @brief Setter property for QComboBoxItem_border_color
+   */
+  void setQComboBoxItem_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxItem_border_color
+   * @return Value of QComboBoxItem_border_color
+   */
+  QColor getQComboBoxItem_border_color() const;
+
+  Q_PROPERTY(QColor QComboBoxItem_border_color READ getQComboBoxItem_border_color WRITE setQComboBoxItem_border_color)
+
+  /**
+   * @brief Setter property for QComboBoxItem_selection_color
+   */
+  void setQComboBoxItem_selection_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxItem_selection_color
+   * @return Value of QComboBoxItem_selection_color
+   */
+  QColor getQComboBoxItem_selection_color() const;
+
+  Q_PROPERTY(QColor QComboBoxItem_selection_color READ getQComboBoxItem_selection_color WRITE setQComboBoxItem_selection_color)
+
+  /**
+   * @brief Setter property for QComboBoxItem_background_color
+   */
+  void setQComboBoxItem_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxItem_background_color
+   * @return Value of QComboBoxItem_background_color
+   */
+  QColor getQComboBoxItem_background_color() const;
+
+  Q_PROPERTY(QColor QComboBoxItem_background_color READ getQComboBoxItem_background_color WRITE setQComboBoxItem_background_color)
+
+  /**
+   * @brief Setter property for QComboBoxDisabled_background_color
+   */
+  void setQComboBoxDisabled_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxDisabled_background_color
+   * @return Value of QComboBoxDisabled_background_color
+   */
+  QColor getQComboBoxDisabled_background_color() const;
+
+  Q_PROPERTY(QColor QComboBoxDisabled_background_color READ getQComboBoxDisabled_background_color WRITE setQComboBoxDisabled_background_color)
+
+  /**
+   * @brief Setter property for QComboBoxDisabled_color
+   */
+  void setQComboBoxDisabled_color(const QColor& value);
+  /**
+   * @brief Getter property for QComboBoxDisabled_color
+   * @return Value of QComboBoxDisabled_color
+   */
+  QColor getQComboBoxDisabled_color() const;
+
+  Q_PROPERTY(QColor QComboBoxDisabled_color READ getQComboBoxDisabled_color WRITE setQComboBoxDisabled_color)
+
+  /**
+   * @brief Setter property for QToolBar_background_color
+   */
+  void setQToolBar_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolBar_background_color
+   * @return Value of QToolBar_background_color
+   */
+  QColor getQToolBar_background_color() const;
+
+  Q_PROPERTY(QColor QToolBar_background_color READ getQToolBar_background_color WRITE setQToolBar_background_color)
+
+  /**
+   * @brief Setter property for QToolBar_border_color
+   */
+  void setQToolBar_border_color(const QColor& value);
+  /**
+   * @brief Getter property for QToolBar_border_color
+   * @return Value of QToolBar_border_color
+   */
+  QColor getQToolBar_border_color() const;
+
+  Q_PROPERTY(QColor QToolBar_border_color READ getQToolBar_border_color WRITE setQToolBar_border_color)
+
+  /**
+   * @brief Setter property for QTreeView_background_color
+   */
+  void setQTreeView_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeView_background_color
+   * @return Value of QTreeView_background_color
+   */
+  QColor getQTreeView_background_color() const;
+
+  Q_PROPERTY(QColor QTreeView_background_color READ getQTreeView_background_color WRITE setQTreeView_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItem_background_color
+   */
+  void setQTreeViewItem_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItem_background_color
+   * @return Value of QTreeViewItem_background_color
+   */
+  QColor getQTreeViewItem_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItem_background_color READ getQTreeViewItem_background_color WRITE setQTreeViewItem_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItem_error_background_color
+   */
+  void setQTreeViewItem_error_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItem_error_background_color
+   * @return Value of QTreeViewItem_error_background_color
+   */
+  QColor getQTreeViewItem_error_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItem_error_background_color READ getQTreeViewItem_error_background_color WRITE setQTreeViewItem_error_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItem_color
+   */
+  void setQTreeViewItem_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItem_color
+   * @return Value of QTreeViewItem_color
+   */
+  QColor getQTreeViewItem_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItem_color READ getQTreeViewItem_color WRITE setQTreeViewItem_color)
+
+  /**
+   * @brief Setter property for QTreeViewItem_error_color
+   */
+  void setQTreeViewItem_error_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItem_error_color
+   * @return Value of QTreeViewItem_error_color
+   */
+  QColor getQTreeViewItem_error_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItem_error_color READ getQTreeViewItem_error_color WRITE setQTreeViewItem_error_color)
+
+  /**
+   * @brief Setter property for QTreeViewItem_font_size
+   */
+  void setQTreeViewItem_font_size(int value);
+  /**
+   * @brief Getter property for QTreeViewItem_font_size
+   * @return Value of QTreeViewItem_font_size
+   */
+  int getQTreeViewItem_font_size() const;
+
+  Q_PROPERTY(int QTreeViewItem_font_size READ getQTreeViewItem_font_size WRITE setQTreeViewItem_font_size)
+
+  /**
+   * @brief Setter property for QTreeViewItemHover_background_color
+   */
+  void setQTreeViewItemHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemHover_background_color
+   * @return Value of QTreeViewItemHover_background_color
+   */
+  QColor getQTreeViewItemHover_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemHover_background_color READ getQTreeViewItemHover_background_color WRITE setQTreeViewItemHover_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItemHover_color
+   */
+  void setQTreeViewItemHover_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemHover_color
+   * @return Value of QTreeViewItemHover_color
+   */
+  QColor getQTreeViewItemHover_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemHover_color READ getQTreeViewItemHover_color WRITE setQTreeViewItemHover_color)
+
+  /**
+   * @brief Setter property for QTreeViewItemSelectedActive_background_color
+   */
+  void setQTreeViewItemSelectedActive_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemSelectedActive_background_color
+   * @return Value of QTreeViewItemSelectedActive_background_color
+   */
+  QColor getQTreeViewItemSelectedActive_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemSelectedActive_background_color READ getQTreeViewItemSelectedActive_background_color WRITE setQTreeViewItemSelectedActive_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItemSelectedActive_color
+   */
+  void setQTreeViewItemSelectedActive_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemSelectedActive_color
+   * @return Value of QTreeViewItemSelectedActive_color
+   */
+  QColor getQTreeViewItemSelectedActive_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemSelectedActive_color READ getQTreeViewItemSelectedActive_color WRITE setQTreeViewItemSelectedActive_color)
+
+  /**
+   * @brief Setter property for QTreeViewItemSelectedNotActive_background_color
+   */
+  void setQTreeViewItemSelectedNotActive_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemSelectedNotActive_background_color
+   * @return Value of QTreeViewItemSelectedNotActive_background_color
+   */
+  QColor getQTreeViewItemSelectedNotActive_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_background_color READ getQTreeViewItemSelectedNotActive_background_color WRITE setQTreeViewItemSelectedNotActive_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewItemSelectedNotActive_color
+   */
+  void setQTreeViewItemSelectedNotActive_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewItemSelectedNotActive_color
+   * @return Value of QTreeViewItemSelectedNotActive_color
+   */
+  QColor getQTreeViewItemSelectedNotActive_color() const;
+
+  Q_PROPERTY(QColor QTreeViewItemSelectedNotActive_color READ getQTreeViewItemSelectedNotActive_color WRITE setQTreeViewItemSelectedNotActive_color)
+
+  /**
+   * @brief Setter property for QTreeViewBranch_background_color
+   */
+  void setQTreeViewBranch_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewBranch_background_color
+   * @return Value of QTreeViewBranch_background_color
+   */
+  QColor getQTreeViewBranch_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewBranch_background_color READ getQTreeViewBranch_background_color WRITE setQTreeViewBranch_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewBranchHover_background_color
+   */
+  void setQTreeViewBranchHover_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewBranchHover_background_color
+   * @return Value of QTreeViewBranchHover_background_color
+   */
+  QColor getQTreeViewBranchHover_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewBranchHover_background_color READ getQTreeViewBranchHover_background_color WRITE setQTreeViewBranchHover_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewBranchHover_color
+   */
+  void setQTreeViewBranchHover_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewBranchHover_color
+   * @return Value of QTreeViewBranchHover_color
+   */
+  QColor getQTreeViewBranchHover_color() const;
+
+  Q_PROPERTY(QColor QTreeViewBranchHover_color READ getQTreeViewBranchHover_color WRITE setQTreeViewBranchHover_color)
+
+  /**
+   * @brief Setter property for QTreeViewBranchSelectedActive_background_color
+   */
+  void setQTreeViewBranchSelectedActive_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewBranchSelectedActive_background_color
+   * @return Value of QTreeViewBranchSelectedActive_background_color
+   */
+  QColor getQTreeViewBranchSelectedActive_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewBranchSelectedActive_background_color READ getQTreeViewBranchSelectedActive_background_color WRITE setQTreeViewBranchSelectedActive_background_color)
+
+  /**
+   * @brief Setter property for QTreeViewBranchSelectedNotActive_background_color
+   */
+  void setQTreeViewBranchSelectedNotActive_background_color(const QColor& value);
+  /**
+   * @brief Getter property for QTreeViewBranchSelectedNotActive_background_color
+   * @return Value of QTreeViewBranchSelectedNotActive_background_color
+   */
+  QColor getQTreeViewBranchSelectedNotActive_background_color() const;
+
+  Q_PROPERTY(QColor QTreeViewBranchSelectedNotActive_background_color READ getQTreeViewBranchSelectedNotActive_background_color WRITE setQTreeViewBranchSelectedNotActive_background_color)
+
+  /**
+   * @brief Setter property for FilterBackgroundColor
+   */
+  void setFilterBackgroundColor(const QColor& value);
+  /**
+   * @brief Getter property for FilterBackgroundColor
+   * @return Value of FilterBackgroundColor
+   */
+  QColor getFilterBackgroundColor() const;
+
+  Q_PROPERTY(QColor FilterBackgroundColor READ getFilterBackgroundColor WRITE setFilterBackgroundColor)
+
+  /**
+   * @brief Setter property for FilterSelectionColor
+   */
+  void setFilterSelectionColor(const QColor& value);
+  /**
+   * @brief Getter property for FilterSelectionColor
+   * @return Value of FilterSelectionColor
+   */
+  QColor getFilterSelectionColor() const;
+
+  Q_PROPERTY(QColor FilterSelectionColor READ getFilterSelectionColor WRITE setFilterSelectionColor)
+
+  /**
+   * @brief Setter property for FilterFontColor
+   */
+  void setFilterFontColor(const QColor& value);
+  /**
+   * @brief Getter property for FilterFontColor
+   * @return Value of FilterFontColor
+   */
+  QColor getFilterFontColor() const;
+
+  Q_PROPERTY(QColor FilterFontColor READ getFilterFontColor WRITE setFilterFontColor)
+
+  /**
+   * @brief Setter property for DataArrayPath_DataContainer_color
+   */
+  void setDataArrayPath_DataContainer_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_DataContainer_color
+   * @return Value of DataArrayPath_DataContainer_color
+   */
+  QColor getDataArrayPath_DataContainer_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_DataContainer_color READ getDataArrayPath_DataContainer_color WRITE setDataArrayPath_DataContainer_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_AttributeMatrix_color
+   */
+  void setDataArrayPath_AttributeMatrix_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_AttributeMatrix_color
+   * @return Value of DataArrayPath_AttributeMatrix_color
+   */
+  QColor getDataArrayPath_AttributeMatrix_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_color READ getDataArrayPath_AttributeMatrix_color WRITE setDataArrayPath_AttributeMatrix_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_DataArray_color
+   */
+  void setDataArrayPath_DataArray_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_DataArray_color
+   * @return Value of DataArrayPath_DataArray_color
+   */
+  QColor getDataArrayPath_DataArray_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_DataArray_color READ getDataArrayPath_DataArray_color WRITE setDataArrayPath_DataArray_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_Invalid_color
+   */
+  void setDataArrayPath_Invalid_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_Invalid_color
+   * @return Value of DataArrayPath_Invalid_color
+   */
+  QColor getDataArrayPath_Invalid_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_Invalid_color READ getDataArrayPath_Invalid_color WRITE setDataArrayPath_Invalid_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_DataContainer_background_color
+   */
+  void setDataArrayPath_DataContainer_background_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_DataContainer_background_color
+   * @return Value of DataArrayPath_DataContainer_background_color
+   */
+  QColor getDataArrayPath_DataContainer_background_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_DataContainer_background_color READ getDataArrayPath_DataContainer_background_color WRITE setDataArrayPath_DataContainer_background_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_AttributeMatrix_background_color
+   */
+  void setDataArrayPath_AttributeMatrix_background_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_AttributeMatrix_background_color
+   * @return Value of DataArrayPath_AttributeMatrix_background_color
+   */
+  QColor getDataArrayPath_AttributeMatrix_background_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_AttributeMatrix_background_color READ getDataArrayPath_AttributeMatrix_background_color WRITE setDataArrayPath_AttributeMatrix_background_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_DataArray_background_color
+   */
+  void setDataArrayPath_DataArray_background_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_DataArray_background_color
+   * @return Value of DataArrayPath_DataArray_background_color
+   */
+  QColor getDataArrayPath_DataArray_background_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_DataArray_background_color READ getDataArrayPath_DataArray_background_color WRITE setDataArrayPath_DataArray_background_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_Invalid_background_color
+   */
+  void setDataArrayPath_Invalid_background_color(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_Invalid_background_color
+   * @return Value of DataArrayPath_Invalid_background_color
+   */
+  QColor getDataArrayPath_Invalid_background_color() const;
+
+  Q_PROPERTY(QColor DataArrayPath_Invalid_background_color READ getDataArrayPath_Invalid_background_color WRITE setDataArrayPath_Invalid_background_color)
+
+  /**
+   * @brief Setter property for DataArrayPath_border_normal
+   */
+  void setDataArrayPath_border_normal(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_border_normal
+   * @return Value of DataArrayPath_border_normal
+   */
+  QColor getDataArrayPath_border_normal() const;
+
+  Q_PROPERTY(QColor DataArrayPath_border_normal READ getDataArrayPath_border_normal WRITE setDataArrayPath_border_normal)
+
+  /**
+   * @brief Setter property for DataArrayPath_border_not_found
+   */
+  void setDataArrayPath_border_not_found(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_border_not_found
+   * @return Value of DataArrayPath_border_not_found
+   */
+  QColor getDataArrayPath_border_not_found() const;
+
+  Q_PROPERTY(QColor DataArrayPath_border_not_found READ getDataArrayPath_border_not_found WRITE setDataArrayPath_border_not_found)
+
+  /**
+   * @brief Setter property for DataArrayPath_border_drag_enabled
+   */
+  void setDataArrayPath_border_drag_enabled(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_border_drag_enabled
+   * @return Value of DataArrayPath_border_drag_enabled
+   */
+  QColor getDataArrayPath_border_drag_enabled() const;
+
+  Q_PROPERTY(QColor DataArrayPath_border_drag_enabled READ getDataArrayPath_border_drag_enabled WRITE setDataArrayPath_border_drag_enabled)
+
+  /**
+   * @brief Setter property for DataArrayPath_border_drag_disabled
+   */
+  void setDataArrayPath_border_drag_disabled(const QColor& value);
+  /**
+   * @brief Getter property for DataArrayPath_border_drag_disabled
+   * @return Value of DataArrayPath_border_drag_disabled
+   */
+  QColor getDataArrayPath_border_drag_disabled() const;
+
+  Q_PROPERTY(QColor DataArrayPath_border_drag_disabled READ getDataArrayPath_border_drag_disabled WRITE setDataArrayPath_border_drag_disabled)
+
+  /**
+   * @brief Setter property for DataPathLabel_color
+   */
+  void setDataPathLabel_color(const QColor& value);
+  /**
+   * @brief Getter property for DataPathLabel_color
+   * @return Value of DataPathLabel_color
+   */
+  QColor getDataPathLabel_color() const;
+
+  Q_PROPERTY(QColor DataPathLabel_color READ getDataPathLabel_color WRITE setDataPathLabel_color)
+
+  /**
+   * @brief Setter property for DataPathLabel_Disabled_color
+   */
+  void setDataPathLabel_Disabled_color(const QColor& value);
+  /**
+   * @brief Getter property for DataPathLabel_Disabled_color
+   * @return Value of DataPathLabel_Disabled_color
+   */
+  QColor getDataPathLabel_Disabled_color() const;
+
+  Q_PROPERTY(QColor DataPathLabel_Disabled_color READ getDataPathLabel_Disabled_color WRITE setDataPathLabel_Disabled_color)
+
+  /**
+   * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+   */
+  void setSIMPLViewPipelineDockWidgetTitle_inactive_background_color(const QColor& value);
+  /**
+   * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+   * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_background_color
+   */
+  QColor getSIMPLViewPipelineDockWidgetTitle_inactive_background_color() const;
+
+  Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_background_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_background_color WRITE
+                 setSIMPLViewPipelineDockWidgetTitle_inactive_background_color)
+
+  /**
+   * @brief Setter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+   */
+  void setSIMPLViewPipelineDockWidgetTitle_inactive_text_color(const QColor& value);
+  /**
+   * @brief Getter property for SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+   * @return Value of SIMPLViewPipelineDockWidgetTitle_inactive_text_color
+   */
+  QColor getSIMPLViewPipelineDockWidgetTitle_inactive_text_color() const;
+
+  Q_PROPERTY(QColor SIMPLViewPipelineDockWidgetTitle_inactive_text_color READ getSIMPLViewPipelineDockWidgetTitle_inactive_text_color WRITE setSIMPLViewPipelineDockWidgetTitle_inactive_text_color)
+
+  /**
+   * @brief loadStyleSheet
+   * @param jsonFilePath
+   * @return
+   */
+  bool loadStyleSheet(const QString& jsonFilePath);
+
+  /**
+   * @brief
+   * @return
+   */
+  QString GetUIFont();
+
+  /**
+   * @brief GetHumanLabelFont
+   * @return
+   */
+  QFont GetHumanLabelFont();
+
+  /**
+   * @brief GetBrandingLabelFont
+   * @return
+   */
+  QFont GetBrandingLabelFont();
+
+  /**
+   * @brief GetCategoryFont
+   * @return
+   */
+  QFont GetCategoryFont();
+
+  /**
+   * @brief GetTitleFont
+   * @return
+   */
+  QFont GetTitleFont();
+
+  /**
+   * @brief GetFilterBackgroundColor
+   * @return
+   */
+  QColor GetFilterBackgroundColor();
+
+  /**
+   * @brief GetFilterSelectionColor
+   * @return
+   */
+  QColor GetFilterSelectionColor();
+
+  /**
+   * @brief GetFilterFontColor
+   * @return
+   */
+  QColor GetFilterFontColor();
+
+  /**
+   * @brief LineEditErrorStyle
+   * @param lineEdit
+   */
+  void LineEditErrorStyle(QLineEdit* lineEdit);
+
+  /**
+   * @brief LineEditClearStyle
+   * @param lineEdit
+   */
+  void LineEditClearStyle(QLineEdit* lineEdit);
+
+  /**
+   * @brief LineEditRedErrorStyle
+   * @param lineEdit
+   */
+  void LineEditBackgroundErrorStyle(QLineEdit* lineEdit);
+
+  /**
+   * @brief SetErrorColor
+   * @param widget
+   */
+  void SetErrorColor(const QString& widgetType, QWidget* widget);
+
+  /**
+   * @brief DAPSelectionButtonStyle
+   * @param exists
+   * @return
+   */
+  QString QToolSelectionButtonStyle(bool exists);
+
+  /**
+   * @brief SVStyle::ColorForFilterGroup
+   * @param grpName
+   * @return
+   */
+  QColor ColorForFilterGroup(const QString& grpName);
+
+  /**
+   * @brief SVStyle::IconForGroup
+   * @param grpName
+   * @return
+   */
+  QIcon IconForGroup(const QString& grpName);
+
+  /**
+   * @brief WrapTextWithHtmlStyle This method will take an existing QString and wrap the contents
+   * with some HTML <b> or <span> with an internal "style=..." html snippet of code. This makes
+   * the string suitable for a QTextEdit. An option to create bold text is also provided.
+   * @param msg
+   * @param bold
+   * @return
+   */
+  QString WrapTextWithHtmlStyle(const QString& msg, bool bold) const;
+
+protected:
+  SVStyle();
+
+  /**
+   * @brief initialize
+   */
+  void initialize();
+
+signals:
+  void styleSheetLoaded(const QString& styleFilePath);
+
+private:
+  QColor m_Fader_color = {};
+  QColor m_Widget_Error_color = {};
+  QColor m_Text_Error_color = {};
+  QColor m_CentralWidget_background_color = {};
+  QColor m_QLabel_color = {};
+  QColor m_FilterInputWidget_background_color = {};
+  QColor m_QScrollArea_background_color = {};
+  QColor m_VariablesTabContents_background_color = {};
+  QColor m_FilterParameterWidget_background_color = {};
+  QColor m_FilterParameterWidget_border_color = {};
+  QColor m_QGroupBoxTitle_background_color = {};
+  QColor m_QGroupBox_background_color = {};
+  QColor m_QDockWidget_border_color = {};
+  QColor m_QDockWidget_color = {};
+  QColor m_QDockWidgetTitle_background_color = {};
+  QColor m_QDockWidgetTitle_color = {};
+  QColor m_QListView_background_color = {};
+  QColor m_QListView_color = {};
+  QColor m_QListViewItemHover_background_color = {};
+  QColor m_QListViewItemHover_color = {};
+  QColor m_QListViewItemSelected_background_color = {};
+  QColor m_QListViewItemSelected_color = {};
+  QColor m_QMainWindowSeparator_background_color = {};
+  QColor m_QMenuBar_background_color = {};
+  QColor m_QMenuBarItem_color = {};
+  QColor m_QMenuBarItemPressed_color = {};
+  QColor m_QMenuBarItemSelected_background_color = {};
+  QColor m_QMenuBarItemSelected_color = {};
+  QColor m_QMenu_background_color = {};
+  QColor m_QMenu_color = {};
+  QColor m_QMenuItemSelected_background_color = {};
+  QColor m_QMenuItemSelected_color = {};
+  QColor m_QMenuItemDisabled_background_color = {};
+  QColor m_QPushButton_background_color = {};
+  QColor m_QPushButton_border_color = {};
+  QColor m_QPushButtonHover_background_color = {};
+  QColor m_QPushButtonPressed_background_color = {};
+  QColor m_QPushButtonDefault_background_color = {};
+  QColor m_QPushButtonDefaultPressed_background_color = {};
+  QColor m_QPushButtonDefaultHover_background_color = {};
+  QColor m_QPushButtonDefault_border_color = {};
+  QColor m_QPushButtonDefault_text_color = {};
+  QColor m_QSplitter_handle_start_color = {};
+  QColor m_QSplitter_handle_end_color = {};
+  QColor m_QToolButton_background_color = {};
+  QColor m_QToolButton_color = {};
+  QColor m_QToolButton_border_color = {};
+  QColor m_QToolButtonChecked_background_color = {};
+  QColor m_QToolButtonDisabled_background_color = {};
+  QColor m_QToolButtonDisabled_color = {};
+  QColor m_QStatusBar_border_color = {};
+  QColor m_QTableWidget_color = {};
+  QColor m_QTableWidget_selected_background_color = {};
+  QColor m_QHeaderView_background_color = {};
+  QColor m_QHeaderView_border_color = {};
+  QColor m_QHeaderView_color = {};
+  QColor m_QHeaderViewDisabled_background_color = {};
+  QColor m_QHeaderViewDisabled_border_color = {};
+  QColor m_QHeaderViewDisabled_color = {};
+  QColor m_QTabWidgetPane_border_color = {};
+  QColor m_QTabWidgetPane_background_color = {};
+  QColor m_QTabBarTab_border_color = {};
+  QColor m_QTabBarTabSelected_background_color = {};
+  QColor m_QTabBarTabSelected_color = {};
+  QColor m_QTabBarTabNotSelected_background_color = {};
+  QColor m_QTabBarTabNotSelectedHover_background_color = {};
+  QColor m_QTextEdit_background_color = {};
+  QColor m_QTextEdit_color = {};
+  QColor m_QLineEdit_color = {};
+  QColor m_QLineEdit_background_color = {};
+  QColor m_QLineEdit_border_color = {};
+  QColor m_QLineEditDisabled_background_color = {};
+  QColor m_QLineEditError_background_color = {};
+  QColor m_QSpinBoxArrow_background_color = {};
+  QColor m_QSpinBoxArrow_hover_background_color = {};
+  QColor m_QComboBox_border_color = {};
+  QColor m_QComboBox_background_color = {};
+  QColor m_QComboBoxArrow_background_color = {};
+  QColor m_QComboBoxArrow_hover_background_color = {};
+  QColor m_QComboBoxItem_border_color = {};
+  QColor m_QComboBoxItem_selection_color = {};
+  QColor m_QComboBoxItem_background_color = {};
+  QColor m_QComboBoxDisabled_background_color = {};
+  QColor m_QComboBoxDisabled_color = {};
+  QColor m_QToolBar_background_color = {};
+  QColor m_QToolBar_border_color = {};
+  QColor m_QTreeView_background_color = {};
+  QColor m_QTreeViewItem_background_color = {};
+  QColor m_QTreeViewItem_error_background_color = {};
+  QColor m_QTreeViewItem_color = {};
+  QColor m_QTreeViewItem_error_color = {};
+  int m_QTreeViewItem_font_size = {};
+  QColor m_QTreeViewItemHover_background_color = {};
+  QColor m_QTreeViewItemHover_color = {};
+  QColor m_QTreeViewItemSelectedActive_background_color = {};
+  QColor m_QTreeViewItemSelectedActive_color = {};
+  QColor m_QTreeViewItemSelectedNotActive_background_color = {};
+  QColor m_QTreeViewItemSelectedNotActive_color = {};
+  QColor m_QTreeViewBranch_background_color = {};
+  QColor m_QTreeViewBranchHover_background_color = {};
+  QColor m_QTreeViewBranchHover_color = {};
+  QColor m_QTreeViewBranchSelectedActive_background_color = {};
+  QColor m_QTreeViewBranchSelectedNotActive_background_color = {};
+  QColor m_FilterBackgroundColor = {};
+  QColor m_FilterSelectionColor = {};
+  QColor m_FilterFontColor = {};
+  QColor m_DataArrayPath_DataContainer_color = {};
+  QColor m_DataArrayPath_AttributeMatrix_color = {};
+  QColor m_DataArrayPath_DataArray_color = {};
+  QColor m_DataArrayPath_Invalid_color = {};
+  QColor m_DataArrayPath_DataContainer_background_color = {};
+  QColor m_DataArrayPath_AttributeMatrix_background_color = {};
+  QColor m_DataArrayPath_DataArray_background_color = {};
+  QColor m_DataArrayPath_Invalid_background_color = {};
+  QColor m_DataArrayPath_border_normal = {};
+  QColor m_DataArrayPath_border_not_found = {};
+  QColor m_DataArrayPath_border_drag_enabled = {};
+  QColor m_DataArrayPath_border_drag_disabled = {};
+  QColor m_DataPathLabel_color = {};
+  QColor m_DataPathLabel_Disabled_color = {};
+  QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_background_color = {};
+  QColor m_SIMPLViewPipelineDockWidgetTitle_inactive_text_color = {};
+
+  static SVStyle* self;
+
+  QString m_CurrentThemeFilePath = ":/SIMPL/StyleSheets/Default.json";
+
+  QStringList m_ColorProperties;
+
+  /**
+   * @brief invalidateColorProperties
+   */
+  void invalidateColorProperties();
+
+  /**
+   * @brief loadStringProperty
+   * @return
+   */
+  QString loadStringProperty(const QString& key, QJsonObject cssRepl, QJsonObject varMapping);
+
+  /**
+   * @brief loadIntegerProperty
+   * @return
+   */
+  int loadIntegerProperty(const QString& key, QJsonObject cssRepl, QJsonObject varMapping);
 };
diff --git a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
old mode 100755
new mode 100644
index 17dbbb6719..09f6137204
--- a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SVUserManualDialog.h"
 
-
 #include <QtWidgets/QAction>
 
 #include <QtWebEngineWidgets/QWebEngineHistory>
@@ -90,7 +89,6 @@ SVUserManualDialog::SVUserManualDialog(QWidget* parent)
   connect(m_WebView, SIGNAL(loadFinished(bool)), this, SLOT(updateButtons(bool)));
   connect(m_WebView, SIGNAL(urlChanged(QUrl)), this, SLOT(updateUrlLineEdit(QUrl)));
   connect(m_WebView, SIGNAL(titleChanged(QString)), this, SLOT(webViewTitleChanged(QString)));
-  
 }
 
 // -----------------------------------------------------------------------------
@@ -131,7 +129,7 @@ void SVUserManualDialog::LaunchHelpDialog(QUrl url)
 {
   SVUserManualDialog* dialog = SVUserManualDialog::Instance();
   dialog->loadWebPage(url);
-  
+
   if(!dialog->isVisible())
   {
     dialog->show();
@@ -143,7 +141,7 @@ void SVUserManualDialog::LaunchHelpDialog(QUrl url)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SVUserManualDialog::loadWebPage(const QUrl &url)
+void SVUserManualDialog::loadWebPage(const QUrl& url)
 {
   urlLineEdit->setText(url.toString());
   getWebView()->load(url);
@@ -195,13 +193,12 @@ void SVUserManualDialog::on_refreshBtn_clicked()
   m_WebView->reload();
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 void SVUserManualDialog::updateUrlLineEdit(QUrl url)
 {
-  
+
   urlLineEdit->setText(url.toString());
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
old mode 100755
new mode 100644
index e43af544e4..4c2d47bcfe
--- a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
+++ b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -52,41 +52,41 @@ class SVWidgetsLib_EXPORT SVUserManualDialog : public QWidget, public Ui::SVUser
 
 public:
   /**
-  * @brief Destructor
-  * @return
-  */
+   * @brief Destructor
+   * @return
+   */
   virtual ~SVUserManualDialog();
 
   /**
-  * @brief Static instance to retrieve the global instance of this class
-  * @return
-  */
+   * @brief Static instance to retrieve the global instance of this class
+   * @return
+   */
   static SVUserManualDialog* Instance(QWidget* parent = nullptr);
 
   /**
-  * @brief Static function to launch the help dialog with the given URL
-  * @return
-  */
+   * @brief Static function to launch the help dialog with the given URL
+   * @return
+   */
   static void LaunchHelpDialog(QUrl url);
 
   /**
-  * @brief Static function to launch the help dialog with the given filter's classname
-  * @param className The name of the Filter's class in C++ as given by the "getNameOfClass()" static function of the filter.
-  * @return
-  */
+   * @brief Static function to launch the help dialog with the given filter's classname
+   * @param className The name of the Filter's class in C++ as given by the "getNameOfClass()" static function of the filter.
+   * @return
+   */
   static void LaunchHelpDialog(QString className);
 
   /**
-  * @brief getWebView
-  * @return QWebEngineView*
-  */
+   * @brief getWebView
+   * @return QWebEngineView*
+   */
   QWebEngineView* getWebView();
-  
+
   /**
    * @brief loadWebPage
    * @param url
    */
-  void loadWebPage(const QUrl &url);
+  void loadWebPage(const QUrl& url);
 
 protected:
   explicit SVUserManualDialog(QWidget* parent = nullptr);
@@ -108,9 +108,8 @@ protected slots:
   QAction* m_CloseAction = nullptr;
 
 public:
-  SVUserManualDialog(const SVUserManualDialog&) = delete; // Copy Constructor Not Implemented
-  SVUserManualDialog(SVUserManualDialog&&) = delete;      // Move Constructor Not Implemented
+  SVUserManualDialog(const SVUserManualDialog&) = delete;            // Copy Constructor Not Implemented
+  SVUserManualDialog(SVUserManualDialog&&) = delete;                 // Move Constructor Not Implemented
   SVUserManualDialog& operator=(const SVUserManualDialog&) = delete; // Copy Assignment Not Implemented
   SVUserManualDialog& operator=(SVUserManualDialog&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
index 8f073cf0f5..74a8a6d695 100644
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StandardOutputWidget.h"
 
@@ -141,7 +141,7 @@ void StandardOutputWidget::saveLog()
   m_LastPathOpened = fi.path();
 
   QFile file(filePath);
-  if (file.open(QFile::WriteOnly))
+  if(file.open(QFile::WriteOnly))
   {
     file.write(stdOutTextEdit->toPlainText().toStdString().c_str());
     file.close();
@@ -181,7 +181,7 @@ void StandardOutputWidget::clearLog()
     answer = QMessageBox::Yes;
   }
 
-  if (answer == QMessageBox::Yes)
+  if(answer == QMessageBox::Yes)
   {
     stdOutTextEdit->clear();
   }
@@ -190,7 +190,7 @@ void StandardOutputWidget::clearLog()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StandardOutputWidget::appendText(const QString &text)
+void StandardOutputWidget::appendText(const QString& text)
 {
   stdOutTextEdit->append(text);
   stdOutTextEdit->ensureCursorVisible();
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
old mode 100755
new mode 100644
index 9fc3466b5f..f4f04eabfa
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -49,46 +49,45 @@ class QtSSettings;
 
 class SVWidgetsLib_EXPORT StandardOutputWidget : public QWidget, public IObserver, private Ui::StandardOutputWidget
 {
-    Q_OBJECT
-
-  public:
-    static SIMPLView::DockWidgetSettings::HideDockSetting GetHideDockSetting();
-    static void SetHideDockSetting(SIMPLView::DockWidgetSettings::HideDockSetting setting);
-
-    StandardOutputWidget(QWidget* parent = nullptr);
-    ~StandardOutputWidget() override;
-
-    /**
-     * @brief appendText
-     * @param text
-     */
-    void appendText(const QString &text);
-
-  protected:
-    void setupGui();
-
-  public slots:
-    void requestContextMenu(const QPoint& pos);
-
-  protected slots:
-    /**
-     * @brief saveLog
-     */
-    void saveLog();
-
-    /**
-     * @brief clearLog
-     */
-    void clearLog();
-
-  private:
-    QString             m_LastPathOpened = "";
-    QPoint m_ContextMenuPoint;
-
-  public:
-    StandardOutputWidget(const StandardOutputWidget&) = delete; // Copy Constructor Not Implemented
-    StandardOutputWidget(StandardOutputWidget&&) = delete;      // Move Constructor Not Implemented
-    StandardOutputWidget& operator=(const StandardOutputWidget&) = delete; // Copy Assignment Not Implemented
-    StandardOutputWidget& operator=(StandardOutputWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  static SIMPLView::DockWidgetSettings::HideDockSetting GetHideDockSetting();
+  static void SetHideDockSetting(SIMPLView::DockWidgetSettings::HideDockSetting setting);
+
+  StandardOutputWidget(QWidget* parent = nullptr);
+  ~StandardOutputWidget() override;
+
+  /**
+   * @brief appendText
+   * @param text
+   */
+  void appendText(const QString& text);
+
+protected:
+  void setupGui();
+
+public slots:
+  void requestContextMenu(const QPoint& pos);
+
+protected slots:
+  /**
+   * @brief saveLog
+   */
+  void saveLog();
+
+  /**
+   * @brief clearLog
+   */
+  void clearLog();
+
+private:
+  QString m_LastPathOpened = "";
+  QPoint m_ContextMenuPoint;
+
+public:
+  StandardOutputWidget(const StandardOutputWidget&) = delete;            // Copy Constructor Not Implemented
+  StandardOutputWidget(StandardOutputWidget&&) = delete;                 // Move Constructor Not Implemented
+  StandardOutputWidget& operator=(const StandardOutputWidget&) = delete; // Copy Assignment Not Implemented
+  StandardOutputWidget& operator=(StandardOutputWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
index e19950e51d..013ad8fc43 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
@@ -1,6 +1,5 @@
 #include "StatusBarButton.h"
 
-
 #include <QtCore/QDebug>
 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
@@ -13,7 +12,7 @@
 //
 // -----------------------------------------------------------------------------
 StatusBarButton::StatusBarButton(QWidget* parent)
-: QToolButton (parent)
+: QToolButton(parent)
 {
   //  QFont font = SVStyle::Instance()->GetHumanLabelFont();
 
@@ -100,13 +99,12 @@ void StatusBarButton::paintEvent(QPaintEvent* event)
     borderColor = QColor(200, 200, 200);
     fontColor = QColor(240, 240, 240);
   }
-  
+
   if(m_Pressed && isChecked())
   {
     backgroundColor = QColor(200, 200, 200);
     fontColor = QColor(50, 50, 50);
     borderColor = QColor(120, 120, 120);
-
   }
   if(m_Pressed && !isChecked())
   {
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.h b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
index bd3f218dfa..5673ed4b0f 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
@@ -6,53 +6,52 @@
 
 class SVWidgetsLib_EXPORT StatusBarButton : public QToolButton
 {
-    Q_OBJECT
-  public:
-    StatusBarButton(QWidget* parent = nullptr);
-    
-    ~StatusBarButton() override;
-    
-    /**
+  Q_OBJECT
+public:
+  StatusBarButton(QWidget* parent = nullptr);
+
+  ~StatusBarButton() override;
+
+  /**
    * @brief paintEvent
    * @param event
    */
-    void paintEvent(QPaintEvent* event) override;
-    
-    void setFlat(bool b){};
-
-  protected:
-    /**
-     * @brief mousePressEvent
-     * @param event
-     */
-    void mousePressEvent( QMouseEvent* event ) override;
-    
-    /**
-     * @brief mouseReleaseEvent
-     * @param event
-     */
-    void mouseReleaseEvent( QMouseEvent* event ) override;
-
-    virtual void updateMinimumWidth();
-
-    /**
-     * @brief getTextMargin
-     * @return
-     */
-    int getTextMargin();
-
-  signals:
-    void visibilityChanged(bool visible);
-
-  private:
-    int m_TextMargin = 6;
-    
-    bool m_Pressed = false;
-
-  public:
-    StatusBarButton(const StatusBarButton&) = delete; // Copy Constructor Not Implemented
-    StatusBarButton(StatusBarButton&&) = delete;      // Move Constructor Not Implemented
-    StatusBarButton& operator=(const StatusBarButton&) = delete; // Copy Assignment Not Implemented
-    StatusBarButton& operator=(StatusBarButton&&) = delete;      // Move Assignment Not Implemented
-};
+  void paintEvent(QPaintEvent* event) override;
 
+  void setFlat(bool b){};
+
+protected:
+  /**
+   * @brief mousePressEvent
+   * @param event
+   */
+  void mousePressEvent(QMouseEvent* event) override;
+
+  /**
+   * @brief mouseReleaseEvent
+   * @param event
+   */
+  void mouseReleaseEvent(QMouseEvent* event) override;
+
+  virtual void updateMinimumWidth();
+
+  /**
+   * @brief getTextMargin
+   * @return
+   */
+  int getTextMargin();
+
+signals:
+  void visibilityChanged(bool visible);
+
+private:
+  int m_TextMargin = 6;
+
+  bool m_Pressed = false;
+
+public:
+  StatusBarButton(const StatusBarButton&) = delete;            // Copy Constructor Not Implemented
+  StatusBarButton(StatusBarButton&&) = delete;                 // Move Constructor Not Implemented
+  StatusBarButton& operator=(const StatusBarButton&) = delete; // Copy Assignment Not Implemented
+  StatusBarButton& operator=(StatusBarButton&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
index 6268a0480f..674b77cbf0 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
@@ -1,6 +1,5 @@
 #include "StatusBarIssuesButton.h"
 
-
 #include <QtCore/QDebug>
 #include <QtGui/QPainter>
 #include <QtWidgets/QStyleOption>
@@ -107,7 +106,7 @@ void StatusBarIssuesButton::paintEvent(QPaintEvent* event)
     badgeBgColor = QColor(200, 200, 200);
     badgeFontColor = QColor(96, 96, 96);
   }
-  
+
   QRect rect = this->rect();
 
   int btnCenterY = rect.height() / 2;
@@ -120,10 +119,10 @@ void StatusBarIssuesButton::paintEvent(QPaintEvent* event)
 
     QPainterPath badgePath;
     badgePath.addRoundedRect(rect.width() - m_BadgeWidth - getTextMargin(), // X
-                             4,                                          // Y
-                             m_BadgeWidth,                               // Width
-                             minimumHeight() - 8,                        // Height
-                             7.0, 7.0);                                  // X & Y Radius
+                             4,                                             // Y
+                             m_BadgeWidth,                                  // Width
+                             minimumHeight() - 8,                           // Height
+                             7.0, 7.0);                                     // X & Y Radius
 
     QPen pen(badgeBgColor, 2);
     painter.setPen(pen);
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
index c11f55d455..f6b4c317df 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
@@ -1,40 +1,39 @@
 #pragma once
 
-
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/StatusBarButton.h"
 
 class SVWidgetsLib_EXPORT StatusBarIssuesButton : public StatusBarButton
 {
-    Q_OBJECT
-  public:
-    StatusBarIssuesButton(QWidget* parent = nullptr);
-    
-    ~StatusBarIssuesButton() override;
-    
-    /**
+  Q_OBJECT
+public:
+  StatusBarIssuesButton(QWidget* parent = nullptr);
+
+  ~StatusBarIssuesButton() override;
+
+  /**
    * @brief paintEvent
    * @param event
    */
-    void paintEvent(QPaintEvent* event) override;
-    
-  public slots:
-    void setErrorBadgeCount(int count);
-    void setWarningBadgeCount(int count);
-
-  protected:
-    void updateMinimumWidth() override;
-
-  private:
-    int m_ErrorBadgeCount = 0;
-    int m_WarningBadgeCount = 0;
-    
-    int m_BadgeMargin = 4;
-    int m_BadgeWidth = 0;
-
-  public:
-    StatusBarIssuesButton(const StatusBarIssuesButton&) = delete; // Copy Constructor Not Implemented
-    StatusBarIssuesButton(StatusBarIssuesButton&&) = delete;      // Move Constructor Not Implemented
-    StatusBarIssuesButton& operator=(const StatusBarIssuesButton&) = delete; // Copy Assignment Not Implemented
-    StatusBarIssuesButton& operator=(StatusBarIssuesButton&&) = delete;      // Move Assignment Not Implemented
+  void paintEvent(QPaintEvent* event) override;
+
+public slots:
+  void setErrorBadgeCount(int count);
+  void setWarningBadgeCount(int count);
+
+protected:
+  void updateMinimumWidth() override;
+
+private:
+  int m_ErrorBadgeCount = 0;
+  int m_WarningBadgeCount = 0;
+
+  int m_BadgeMargin = 4;
+  int m_BadgeWidth = 0;
+
+public:
+  StatusBarIssuesButton(const StatusBarIssuesButton&) = delete;            // Copy Constructor Not Implemented
+  StatusBarIssuesButton(StatusBarIssuesButton&&) = delete;                 // Move Constructor Not Implemented
+  StatusBarIssuesButton& operator=(const StatusBarIssuesButton&) = delete; // Copy Assignment Not Implemented
+  StatusBarIssuesButton& operator=(StatusBarIssuesButton&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
index e4ad10e51d..d8eecd75a2 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "StatusBarWidget.h"
 
@@ -47,7 +47,7 @@
 //
 // -----------------------------------------------------------------------------
 StatusBarWidget::StatusBarWidget(QWidget* parent)
-  : QFrame(parent)
+: QFrame(parent)
 {
   this->setupUi(this);
 
@@ -64,16 +64,14 @@ StatusBarWidget::~StatusBarWidget() = default;
 // -----------------------------------------------------------------------------
 void StatusBarWidget::setupGui()
 {
-//  QString style = generateStyleSheet(false);
-//  consoleBtn->setStyleSheet(style);
-//  issuesBtn->setStyleSheet(style);
-//  dataBrowserBtn->setStyleSheet(style);
+  //  QString style = generateStyleSheet(false);
+  //  consoleBtn->setStyleSheet(style);
+  //  issuesBtn->setStyleSheet(style);
+  //  dataBrowserBtn->setStyleSheet(style);
 
   m_ButtonListMenu = new QMenu(buttonListBtn);
 
-  connect(buttonListBtn, &QPushButton::clicked, [=] {
-    m_ButtonListMenu->exec(QCursor::pos());
-  });
+  connect(buttonListBtn, &QPushButton::clicked, [=] { m_ButtonListMenu->exec(QCursor::pos()); });
 }
 
 // -----------------------------------------------------------------------------
@@ -286,55 +284,48 @@ void StatusBarWidget::setButtonAction(QDockWidget* dock, Button btn)
 {
   switch(btn)
   {
-    case Button::Issues:
-    {
-      connect(issuesBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::issuesVisibilityChanged);
-      m_IssuesBtnToggleAction = addButtonVisibilityAction(issuesBtn);
-      break;
-    }
-    case Button::Console:
-    {
-      connect(consoleBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::consoleVisibilityChanged);
-      m_ConsoleBtnToggleAction = addButtonVisibilityAction(consoleBtn);
-      break;
-    }
-    case Button::DataStructure:
-    {
-      connect(dataBrowserBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::dataBrowserVisibilityChanged);
-      m_DataBrowserBtnToggleAction = addButtonVisibilityAction(dataBrowserBtn);
-      break;
-    }
-    case Button::Pipeline:
-    {
-      connect(pipelineBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::pipelineVisibilityChanged);
-      m_PipelineBtnToggleAction = addButtonVisibilityAction(pipelineBtn);
-      break;
-    }
-    case Button::FilterList:
-    {
-      connect(filterListBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::filterListVisibilityChanged);
-      m_FilterListBtnToggleAction = addButtonVisibilityAction(filterListBtn);
-      break;
-    }
-    case Button::FilterLibrary:
-    {
-      connect(filterLibraryBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::filterLibraryVisibilityChanged);
-      m_FilterLibraryBtnToggleAction = addButtonVisibilityAction(filterLibraryBtn);
-      break;
-    }
-    case Button::Bookmarks:
-    {
-      connect(bookmarksBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
-      connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::bookmarksVisibilityChanged);
-      m_BookmarksBtnToggleAction = addButtonVisibilityAction(bookmarksBtn);
-      break;
-    }
+  case Button::Issues: {
+    connect(issuesBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::issuesVisibilityChanged);
+    m_IssuesBtnToggleAction = addButtonVisibilityAction(issuesBtn);
+    break;
+  }
+  case Button::Console: {
+    connect(consoleBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::consoleVisibilityChanged);
+    m_ConsoleBtnToggleAction = addButtonVisibilityAction(consoleBtn);
+    break;
+  }
+  case Button::DataStructure: {
+    connect(dataBrowserBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::dataBrowserVisibilityChanged);
+    m_DataBrowserBtnToggleAction = addButtonVisibilityAction(dataBrowserBtn);
+    break;
+  }
+  case Button::Pipeline: {
+    connect(pipelineBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::pipelineVisibilityChanged);
+    m_PipelineBtnToggleAction = addButtonVisibilityAction(pipelineBtn);
+    break;
+  }
+  case Button::FilterList: {
+    connect(filterListBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::filterListVisibilityChanged);
+    m_FilterListBtnToggleAction = addButtonVisibilityAction(filterListBtn);
+    break;
+  }
+  case Button::FilterLibrary: {
+    connect(filterLibraryBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::filterLibraryVisibilityChanged);
+    m_FilterLibraryBtnToggleAction = addButtonVisibilityAction(filterLibraryBtn);
+    break;
+  }
+  case Button::Bookmarks: {
+    connect(bookmarksBtn, &StatusBarButton::toggled, dock->toggleViewAction(), &QAction::trigger);
+    connect(dock->toggleViewAction(), &QAction::toggled, this, &StatusBarWidget::bookmarksVisibilityChanged);
+    m_BookmarksBtnToggleAction = addButtonVisibilityAction(bookmarksBtn);
+    break;
+  }
   }
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
index 9c1a33de42..6ea73d38d6 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,130 +45,127 @@ class QMainWindow;
 class SVWidgetsLib_EXPORT StatusBarWidget : public QFrame, private Ui::StatusBarWidget
 {
 
-    Q_OBJECT
-
-  public:
-    StatusBarWidget(QWidget* parent = nullptr);
-    ~StatusBarWidget() override;
-
-
-    using EnumType = unsigned int;
-
-    enum class Button : EnumType
-    {
-      Issues = 0,
-      Console = 1,
-      DataStructure = 2,
-      Pipeline = 3,
-      FilterList = 4,
-      FilterLibrary = 5,
-      Bookmarks = 6
-    };
-
-    /**
-     * @brief readSettings
-     */
-    void readSettings();
-
-    /**
-     * @brief writeSettings
-     */
-    void writeSettings();
-
-    /**
-     * @brief setButtonAction
-     * @param action
-     * @param btn
-     */
-    void setButtonAction(QDockWidget *dock, Button btn);
-
-    /**
-     * @brief updateStyle
-     */
-    void updateStyle();
-
-    /**
-     * @brief generateStyleSheet
-     * @param error
-     * @return
-     */
-    QString generateStyleSheet(bool error);
-
-  public slots:
-    /**
-     * @brief issuesVisibilityChanged
-     * @param b
-     */
-    void issuesVisibilityChanged(bool b);
-    /**
-     * @brief consoleVisibilityChanged
-     * @param b
-     */
-    void consoleVisibilityChanged(bool b);
-    /**
-     * @brief dataBrowserVisibilityChanged
-     * @param b
-     */
-    void dataBrowserVisibilityChanged(bool b);
-
-    /**
-     * @brief pipelineVisibilityChanged
-     * @param b
-     */
-    void pipelineVisibilityChanged(bool b);
-
-    /**
-     * @brief filterListVisibilityChanged
-     * @param b
-     */
-    void filterListVisibilityChanged(bool b);
-
-    /**
-     * @brief filterLibraryVisibilityChanged
-     * @param b
-     */
-    void filterLibraryVisibilityChanged(bool b);
-
-    /**
-     * @brief bookmarksVisibilityChanged
-     * @param b
-     */
-    void bookmarksVisibilityChanged(bool b);
-    
-    /**
-     * @brief issuesTableHasErrors
-     * @param b
-     */
-    void issuesTableHasErrors(bool b, int errCount, int warnCount);
-
-  protected:
-
-    /**
-     * @brief setupGui
-     */
-    void setupGui();
-
-  private:
-    QMenu* m_ButtonListMenu = nullptr;
-
-    QAction* m_IssuesBtnToggleAction = nullptr;
-    QAction* m_ConsoleBtnToggleAction = nullptr;
-    QAction* m_DataBrowserBtnToggleAction = nullptr;
-    QAction* m_PipelineBtnToggleAction = nullptr;
-    QAction* m_FilterListBtnToggleAction = nullptr;
-    QAction* m_FilterLibraryBtnToggleAction = nullptr;
-    QAction* m_BookmarksBtnToggleAction = nullptr;
-
-    /**
-     * @brief addButtonVisibilityAction
-     * @param button
-     */
-    QAction* addButtonVisibilityAction(StatusBarButton* button);
-
-  public:
-    StatusBarWidget(const StatusBarWidget&) = delete; // Copy Constructor Not Implemented
-    StatusBarWidget(StatusBarWidget&&) = delete;      // Move Constructor Not Implemented
-    StatusBarWidget& operator=(const StatusBarWidget&) = delete; // Copy Assignment Not Implemented
-    StatusBarWidget& operator=(StatusBarWidget&&) = delete;      // Move Assignment Not Implemented
+  Q_OBJECT
+
+public:
+  StatusBarWidget(QWidget* parent = nullptr);
+  ~StatusBarWidget() override;
+
+  using EnumType = unsigned int;
+
+  enum class Button : EnumType
+  {
+    Issues = 0,
+    Console = 1,
+    DataStructure = 2,
+    Pipeline = 3,
+    FilterList = 4,
+    FilterLibrary = 5,
+    Bookmarks = 6
+  };
+
+  /**
+   * @brief readSettings
+   */
+  void readSettings();
+
+  /**
+   * @brief writeSettings
+   */
+  void writeSettings();
+
+  /**
+   * @brief setButtonAction
+   * @param action
+   * @param btn
+   */
+  void setButtonAction(QDockWidget* dock, Button btn);
+
+  /**
+   * @brief updateStyle
+   */
+  void updateStyle();
+
+  /**
+   * @brief generateStyleSheet
+   * @param error
+   * @return
+   */
+  QString generateStyleSheet(bool error);
+
+public slots:
+  /**
+   * @brief issuesVisibilityChanged
+   * @param b
+   */
+  void issuesVisibilityChanged(bool b);
+  /**
+   * @brief consoleVisibilityChanged
+   * @param b
+   */
+  void consoleVisibilityChanged(bool b);
+  /**
+   * @brief dataBrowserVisibilityChanged
+   * @param b
+   */
+  void dataBrowserVisibilityChanged(bool b);
+
+  /**
+   * @brief pipelineVisibilityChanged
+   * @param b
+   */
+  void pipelineVisibilityChanged(bool b);
+
+  /**
+   * @brief filterListVisibilityChanged
+   * @param b
+   */
+  void filterListVisibilityChanged(bool b);
+
+  /**
+   * @brief filterLibraryVisibilityChanged
+   * @param b
+   */
+  void filterLibraryVisibilityChanged(bool b);
+
+  /**
+   * @brief bookmarksVisibilityChanged
+   * @param b
+   */
+  void bookmarksVisibilityChanged(bool b);
+
+  /**
+   * @brief issuesTableHasErrors
+   * @param b
+   */
+  void issuesTableHasErrors(bool b, int errCount, int warnCount);
+
+protected:
+  /**
+   * @brief setupGui
+   */
+  void setupGui();
+
+private:
+  QMenu* m_ButtonListMenu = nullptr;
+
+  QAction* m_IssuesBtnToggleAction = nullptr;
+  QAction* m_ConsoleBtnToggleAction = nullptr;
+  QAction* m_DataBrowserBtnToggleAction = nullptr;
+  QAction* m_PipelineBtnToggleAction = nullptr;
+  QAction* m_FilterListBtnToggleAction = nullptr;
+  QAction* m_FilterLibraryBtnToggleAction = nullptr;
+  QAction* m_BookmarksBtnToggleAction = nullptr;
+
+  /**
+   * @brief addButtonVisibilityAction
+   * @param button
+   */
+  QAction* addButtonVisibilityAction(StatusBarButton* button);
+
+public:
+  StatusBarWidget(const StatusBarWidget&) = delete;            // Copy Constructor Not Implemented
+  StatusBarWidget(StatusBarWidget&&) = delete;                 // Move Constructor Not Implemented
+  StatusBarWidget& operator=(const StatusBarWidget&) = delete; // Copy Assignment Not Implemented
+  StatusBarWidget& operator=(StatusBarWidget&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
index 9d1d3ff6db..5fa7eeb26f 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
@@ -48,7 +48,6 @@
 #include "SVWidgetsLib/Widgets/SVPipelineView.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -75,7 +74,8 @@ AddFilterCommand::AddFilterCommand(const AbstractFilter::Pointer& filter, SVPipe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AddFilterCommand::AddFilterCommand(const std::vector<AbstractFilter::Pointer>& filters, SVPipelineView* view, int insertIndex, const QString& actionText, bool useAnimationOnFirstRun, QUndoCommand* parent)
+AddFilterCommand::AddFilterCommand(const std::vector<AbstractFilter::Pointer>& filters, SVPipelineView* view, int insertIndex, const QString& actionText, bool useAnimationOnFirstRun,
+                                   QUndoCommand* parent)
 : QUndoCommand(parent)
 , m_Filters(filters)
 , m_ActionText(actionText)
@@ -149,7 +149,7 @@ void AddFilterCommand::undo()
   emit m_PipelineView->pipelineChanged();
 
   emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage,false));
+  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -193,13 +193,13 @@ void AddFilterCommand::redo()
   }
 
   emit model->statusMessageGenerated(statusMessage);
-  emit model->standardOutputMessageGenerated(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage,false));
+  emit model->standardOutputMessageGenerated(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AddFilterCommand::addFilter(const AbstractFilter::Pointer &filter, int insertionIndex)
+void AddFilterCommand::addFilter(const AbstractFilter::Pointer& filter, int insertionIndex)
 {
   // Reset the filter's Removing property
   filter->setRemoving(false);
@@ -279,7 +279,7 @@ void AddFilterCommand::connectFilterSignalsSlots(const AbstractFilter::Pointer&
   FilterInputWidget* fiw = model->filterInputWidget(index);
 
   QMetaObject::Connection connection = QObject::connect(fiw, &FilterInputWidget::filterParametersChanged, [=](bool preflight) {
-    if (preflight)
+    if(preflight)
     {
       m_PipelineView->preflightPipeline();
     }
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
index ab25e189c3..22fb4665ef 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
@@ -37,7 +37,6 @@
 
 #include <vector>
 
-
 #include <QtWidgets/QUndoCommand>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -95,12 +94,11 @@ class SVWidgetsLib_EXPORT AddFilterCommand : public QUndoCommand
    * @brief disconnectFilterSignalsSlots
    * @param filter
    */
-  void disconnectFilterSignalsSlots(const AbstractFilter::Pointer &filter);
+  void disconnectFilterSignalsSlots(const AbstractFilter::Pointer& filter);
 
 public:
-  AddFilterCommand(const AddFilterCommand&) = delete; // Copy Constructor Not Implemented
-  AddFilterCommand(AddFilterCommand&&) = delete;      // Move Constructor Not Implemented
+  AddFilterCommand(const AddFilterCommand&) = delete;            // Copy Constructor Not Implemented
+  AddFilterCommand(AddFilterCommand&&) = delete;                 // Move Constructor Not Implemented
   AddFilterCommand& operator=(const AddFilterCommand&) = delete; // Copy Assignment Not Implemented
   AddFilterCommand& operator=(AddFilterCommand&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
index 10a366f137..8990188b77 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
@@ -1,37 +1,37 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "MoveFilterCommand.h"
 
@@ -74,51 +74,51 @@ MoveFilterCommand::~MoveFilterCommand() = default;
 // -----------------------------------------------------------------------------
 void MoveFilterCommand::undo()
 {
-//  if(m_OriginView == nullptr || m_DestinationView == nullptr)
-//  {
-//    return;
-//  }
-
-//  PipelineModel* originModel = m_DestinationView->getPipelineModel();
-//  PipelineModel* destinationModel = m_OriginView->getPipelineModel();
-
-//  bool itemsMoved = false;
-
-//  originModel->blockSignals(true);
-//  destinationModel->blockSignals(true);
-//  size_t destinationIndex = m_DestinationIndex;
-//  for (size_t i = 0; i < m_Filters.size(); i++)
-//  {
-//    AbstractFilter::Pointer filter = m_Filters[i];
-//    QModelIndex originModelIndex = originModel->indexOfFilter(filter);
-//    size_t originIndex = originModelIndex.row();
-
-//    removeFilter(originIndex, originModel);
-
-//    addFilter(filter, destinationModel, originIndexes[i]);
-
-//    itemsMoved = true;
-//    destinationIndex++;
-//  }
-//  originModel->blockSignals(false);
-//  destinationModel->blockSignals(false);
-
-//  if (itemsMoved)
-//  {
-//    m_OriginView->preflightPipeline();
-//    m_DestinationView->preflightPipeline();
-
-//    if (m_Filters.size() == 1)
-//    {
-//      emit m_DestinationView->statusMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
-//      emit m_DestinationView->stdOutMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
-//    }
-//    else
-//    {
-//      emit m_DestinationView->statusMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
-//      emit m_DestinationView->stdOutMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
-//    }
-//  }
+  //  if(m_OriginView == nullptr || m_DestinationView == nullptr)
+  //  {
+  //    return;
+  //  }
+
+  //  PipelineModel* originModel = m_DestinationView->getPipelineModel();
+  //  PipelineModel* destinationModel = m_OriginView->getPipelineModel();
+
+  //  bool itemsMoved = false;
+
+  //  originModel->blockSignals(true);
+  //  destinationModel->blockSignals(true);
+  //  size_t destinationIndex = m_DestinationIndex;
+  //  for (size_t i = 0; i < m_Filters.size(); i++)
+  //  {
+  //    AbstractFilter::Pointer filter = m_Filters[i];
+  //    QModelIndex originModelIndex = originModel->indexOfFilter(filter);
+  //    size_t originIndex = originModelIndex.row();
+
+  //    removeFilter(originIndex, originModel);
+
+  //    addFilter(filter, destinationModel, originIndexes[i]);
+
+  //    itemsMoved = true;
+  //    destinationIndex++;
+  //  }
+  //  originModel->blockSignals(false);
+  //  destinationModel->blockSignals(false);
+
+  //  if (itemsMoved)
+  //  {
+  //    m_OriginView->preflightPipeline();
+  //    m_DestinationView->preflightPipeline();
+
+  //    if (m_Filters.size() == 1)
+  //    {
+  //      emit m_DestinationView->statusMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
+  //      emit m_DestinationView->stdOutMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
+  //    }
+  //    else
+  //    {
+  //      emit m_DestinationView->statusMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
+  //      emit m_DestinationView->stdOutMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
+  //    }
+  //  }
 }
 
 // -----------------------------------------------------------------------------
@@ -141,7 +141,7 @@ void MoveFilterCommand::redo()
     {
       QModelIndex filterIndex = model->indexOfFilter(m_Filters[i].get());
 
-  //    m_RemovalIndexes.push_back(filterIndex.row() + filterOffset);
+      //    m_RemovalIndexes.push_back(filterIndex.row() + filterOffset);
 
       removeFilter(filterIndex.row());
 
@@ -158,7 +158,7 @@ void MoveFilterCommand::redo()
   }
 
   QString statusMessage;
-  if (m_Filters.size() > 1)
+  if(m_Filters.size() > 1)
   {
     statusMessage = QObject::tr("Moved %1 filters").arg(m_Filters.size());
   }
@@ -194,7 +194,7 @@ void MoveFilterCommand::addFilter(AbstractFilter::Pointer filter, int insertionI
   model->insertRow(insertionIndex);
 
   QModelIndex filterIndex = model->index(insertionIndex, PipelineItem::Contents);
-//  model->setData(filterIndex, filter->getHumanLabel(), Qt::DisplayRole);
+  //  model->setData(filterIndex, filter->getHumanLabel(), Qt::DisplayRole);
   model->setData(filterIndex, static_cast<int>(PipelineItem::ItemType::Filter), PipelineModel::ItemTypeRole);
   model->setFilter(filterIndex, filter);
 
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
index 6388505468..afcac9e045 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
@@ -1,41 +1,40 @@
 /* ============================================================================
-* Copyright (c) 2009-2016 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-07-D-5800
-*    United States Air Force Prime Contract FA8650-10-D-5210
-*    United States Prime Contract Navy N00173-07-C-2068
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-
 #include <QtWidgets/QUndoCommand>
 
 #include <SIMPLib/Filtering/AbstractFilter.h>
@@ -51,8 +50,7 @@ class PipelineModel;
 class SVWidgetsLib_EXPORT MoveFilterCommand : public QUndoCommand
 {
 public:
-
-    /**
+  /**
    * @brief MoveFilterCommand
    * @param filter
    * @param view
@@ -102,9 +100,8 @@ class SVWidgetsLib_EXPORT MoveFilterCommand : public QUndoCommand
   void removeFilter(int filterIndex);
 
 public:
-  MoveFilterCommand(const MoveFilterCommand&) = delete; // Copy Constructor Not Implemented
-  MoveFilterCommand(MoveFilterCommand&&) = delete;      // Move Constructor Not Implemented
+  MoveFilterCommand(const MoveFilterCommand&) = delete;            // Copy Constructor Not Implemented
+  MoveFilterCommand(MoveFilterCommand&&) = delete;                 // Move Constructor Not Implemented
   MoveFilterCommand& operator=(const MoveFilterCommand&) = delete; // Copy Assignment Not Implemented
   MoveFilterCommand& operator=(MoveFilterCommand&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
index 02d346b8cf..84f83d9c03 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
@@ -134,7 +134,7 @@ void RemoveFilterCommand::undo()
   }
 
   emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage,false));
+  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -187,7 +187,7 @@ void RemoveFilterCommand::redo()
   emit m_PipelineView->pipelineChanged();
 
   emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage,false));
+  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -273,7 +273,7 @@ void RemoveFilterCommand::connectFilterSignalsSlots(const AbstractFilter::Pointe
   FilterInputWidget* fiw = model->filterInputWidget(index);
 
   QMetaObject::Connection connection = QObject::connect(fiw, &FilterInputWidget::filterParametersChanged, [=](bool preflight) {
-    if (preflight)
+    if(preflight)
     {
       m_PipelineView->preflightPipeline();
     }
@@ -285,13 +285,13 @@ void RemoveFilterCommand::connectFilterSignalsSlots(const AbstractFilter::Pointe
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RemoveFilterCommand::disconnectFilterSignalsSlots(const AbstractFilter::Pointer &filter)
+void RemoveFilterCommand::disconnectFilterSignalsSlots(const AbstractFilter::Pointer& filter)
 {
   if(filter.get() == nullptr)
   {
     return;
   }
-  //PipelineModel* model = m_PipelineView->getPipelineModel();
+  // PipelineModel* model = m_PipelineView->getPipelineModel();
 
   QObject::disconnect(filter.get(), &AbstractFilter::filterCompleted, nullptr, nullptr);
 
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
index bd8e3902a1..b62e296165 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
@@ -37,7 +37,6 @@
 
 #include <vector>
 
-
 #include <QtWidgets/QUndoCommand>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -71,7 +70,7 @@ class SVWidgetsLib_EXPORT RemoveFilterCommand : public QUndoCommand
    * @param filter
    * @param insertionIndex
    */
-  void addFilter(const AbstractFilter::Pointer &filter, int insertionIndex = -1);
+  void addFilter(const AbstractFilter::Pointer& filter, int insertionIndex = -1);
 
   /**
    * @brief removeFilter
@@ -92,9 +91,8 @@ class SVWidgetsLib_EXPORT RemoveFilterCommand : public QUndoCommand
   void disconnectFilterSignalsSlots(const AbstractFilter::Pointer& filter);
 
 public:
-  RemoveFilterCommand(const RemoveFilterCommand&) = delete; // Copy Constructor Not Implemented
-  RemoveFilterCommand(RemoveFilterCommand&&) = delete;      // Move Constructor Not Implemented
+  RemoveFilterCommand(const RemoveFilterCommand&) = delete;            // Copy Constructor Not Implemented
+  RemoveFilterCommand(RemoveFilterCommand&&) = delete;                 // Move Constructor Not Implemented
   RemoveFilterCommand& operator=(const RemoveFilterCommand&) = delete; // Copy Assignment Not Implemented
   RemoveFilterCommand& operator=(RemoveFilterCommand&&) = delete;      // Move Assignment Not Implemented
 };
-
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
index 99d02cfc51..905de5be0c 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicit.h
@@ -1,40 +1,39 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 __sitkExplicit_h
 #define __sitkExplicit_h
 
 #include "sitkMacro.h"
-#if defined( SITKDLL ) && !defined( SITK_SimpleITKExplit_STATIC )
-  #ifdef SimpleITKExplicit_EXPORTS
-    #define SITKExplicit_EXPORT SITK_ABI_EXPORT
-  #else
-    #define SITKExplicit_EXPORT SITK_ABI_IMPORT
-  #endif  /* SimpleITKExplicit_EXPORTS */
+#if defined(SITKDLL) && !defined(SITK_SimpleITKExplit_STATIC)
+#ifdef SimpleITKExplicit_EXPORTS
+#define SITKExplicit_EXPORT SITK_ABI_EXPORT
 #else
-  // Don't hide symbols in the static SimpleITKExplicit library in case
-  // -fvisibility=hidden is used
-  #define SITKExplicit_EXPORT
+#define SITKExplicit_EXPORT SITK_ABI_IMPORT
+#endif /* SimpleITKExplicit_EXPORTS */
+#else
+// Don't hide symbols in the static SimpleITKExplicit library in case
+// -fvisibility=hidden is used
+#define SITKExplicit_EXPORT
 #endif
 
 #define SITKExplicit_HIDDEN SITK_ABI_HIDDEN
 
-
-#if defined( SimpleITKExplicit_EXPORTS )
+#if defined(SimpleITKExplicit_EXPORTS)
 // don't use export
 #define SITKExplicit_EXPORT_EXPLICIT
 #else
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
index 3ef747718f..e60577086c 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITK_h
 #define sitkExplicitITK_h
 
@@ -26,7 +26,6 @@
 
 #include "sitkExplicitITKImageRegion.h"
 
-
 #include "sitkExplicitITKDefaultPixelAccessor.h"
 #include "sitkExplicitITKDefaultVectorPixelAccessor.h"
 #include "sitkExplicitITKImportImageContainer.h"
@@ -35,7 +34,6 @@
 #include "sitkExplicitITKLabelMap.h"
 #include "sitkExplicitITKVectorImage.h"
 
-
 #include "sitkExplicitITKImageConstIterator.h"
 #include "sitkExplicitITKImageRegionConstIterator.h"
 #include "sitkExplicitITKImageScanlineConstIterator.h"
@@ -48,8 +46,4 @@
 #include "sitkExplicitITKComposeImageFilter.h"
 #include "sitkExplicitITKVectorIndexSelectionCastImageFilter.h"
 
-
-
-
-
 #endif // sitkExplicitITK_h
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
index 6d6142b073..e649da8d5a 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
@@ -1,49 +1,49 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKComposeImageFilter_h__
 #define sitkExplicitITKComposeImageFilter_h__
 #include "sitkExplicit.h"
 #include "itkComposeImageFilter.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 2u>, itk::VectorImage<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 3u>, itk::VectorImage<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 2u>, itk::VectorImage<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 3u>, itk::VectorImage<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 2u>, itk::VectorImage<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<long long, 3u>, itk::VectorImage<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 2u>, itk::VectorImage<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned long long, 3u>, itk::VectorImage<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKComposeImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
index 00c70416c2..1660abe606 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKDefaultPixelAccessor_h__
 #define sitkExplicitITKDefaultPixelAccessor_h__
 #include "sitkExplicit.h"
@@ -26,24 +26,24 @@ extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<cha
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<double>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<float>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<int>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::CovariantVector<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Offset<3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<itk::Vector<float, 3u>>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<long>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<long long>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<short>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<signed char>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<double> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<float> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<double>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<std::complex<float>>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned char>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned int>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<unsigned long>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
index 05205fa9d5..d9b82e2183 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKDefaultVectorPixelAccessor_h__
 #define sitkExplicitITKDefaultVectorPixelAccessor_h__
 #include "sitkExplicit.h"
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
index 9f17b31e76..7c465afffc 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImage_h__
 #define sitkExplicitITKImage_h__
 #include "sitkExplicit.h"
@@ -61,8 +61,8 @@ extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<doubl
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<double>, 3u>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<float>, 2u>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::complex<float>, 3u>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > >, 1u>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > >, 2u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u>>>, 1u>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u>>>, 2u>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 1u>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 2u>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<unsigned char, 3u>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
index 7c97da93b1..5bf6a6cc53 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageBase_h__
 #define sitkExplicitITKImageBase_h__
 #include "sitkExplicit.h"
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
index 2a7f97296b..2191b36960 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
@@ -1,68 +1,68 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageConstIterator_h__
 #define sitkExplicitITKImageConstIterator_h__
 #include "sitkExplicit.h"
 #include "itkImageConstIterator.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 1u>, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<itk::Vector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<unsigned short, 3u>>;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<double, 2u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<double, 3u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::VectorImage<float, 2u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
index 8681381a3d..0899fa0f8c 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageRegion_h__
 #define sitkExplicitITKImageRegion_h__
 #include "sitkExplicit.h"
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
index f62540f303..ec40aff7a3 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
@@ -1,66 +1,66 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageRegionConstIterator_h__
 #define sitkExplicitITKImageRegionConstIterator_h__
 #include "sitkExplicit.h"
 #include "itkImageRegionConstIterator.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 1u>, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<unsigned short, 3u>>;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<double, 2u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<double, 3u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::VectorImage<float, 2u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
index 867ea7a706..d54c034ad2 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
@@ -1,63 +1,63 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageScanlineConstIterator_h__
 #define sitkExplicitITKImageScanlineConstIterator_h__
 #include "sitkExplicit.h"
 #include "itkImageScanlineConstIterator.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::CovariantVector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 1u>, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<itk::Vector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<unsigned short, 3u>>;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<double, 2u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<double, 3u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::VectorImage<float, 2u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
index ed703ebc51..3ebc2cd951 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
@@ -1,61 +1,61 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageScanlineIterator_h__
 #define sitkExplicitITKImageScanlineIterator_h__
 #include "sitkExplicit.h"
 #include "itkImageScanlineIterator.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 1u>, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 1u>, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<itk::Vector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<unsigned short, 3u>>;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<double, 2u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<double, 3u> >;
 // extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::VectorImage<float, 2u> >;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
index f17fa58e72..cbc7e9d77d 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
@@ -1,106 +1,106 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageSource_h__
 #define sitkExplicitITKImageSource_h__
 #include "sitkExplicit.h"
 #include "itkImageSource.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 1u>, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::CovariantVector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 1u>, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<itk::Vector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned long long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::VectorImage<unsigned short, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKImageSource_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
index c0b2b182d0..b920f437c0 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
@@ -1,645 +1,647 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImageToImageFilter_h__
 #define sitkExplicitITKImageToImageFilter_h__
 #include "sitkExplicit.h"
 #include "itkImageToImageFilter.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 2u>, itk::Image<bool, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 3u>, itk::Image<bool, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 2u>, 2u>, itk::Image<itk::Vector<float, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 3u>, 3u>, itk::Image<itk::Vector<float, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::LabelMap<itk::LabelObject<unsigned char, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u> >, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::LabelMap<itk::LabelObject<unsigned char, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u> >, itk::VectorImage<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::LabelMap<itk::LabelObject<unsigned int, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u> >, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::LabelMap<itk::LabelObject<unsigned int, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u> >, itk::VectorImage<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::LabelMap<itk::LabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u> >, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::LabelMap<itk::LabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u> >, itk::VectorImage<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::LabelMap<itk::LabelObject<unsigned short, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u> >, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::LabelMap<itk::LabelObject<unsigned short, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u> >, itk::VectorImage<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 2u>, itk::Image<bool, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 3u>, itk::Image<bool, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<double, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<itk::CovariantVector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<itk::CovariantVector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<float, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<int, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 2u>, 2u>, itk::Image<itk::Vector<float, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<itk::Vector<float, 3u>, 3u>, itk::Image<itk::Vector<float, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<long, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<short, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<signed char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned char, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned char, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::LabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::LabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::LabelObject<unsigned short, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::LabelObject<unsigned short, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT
+    itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT
+    itk::ImageToImageFilter<itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>, itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::LabelMap<itk::LabelObject<unsigned char, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 2u>>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::LabelMap<itk::LabelObject<unsigned char, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned char, 3u>>, itk::VectorImage<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::LabelMap<itk::LabelObject<unsigned int, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 2u>>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::LabelMap<itk::LabelObject<unsigned int, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned int, 3u>>, itk::VectorImage<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::LabelMap<itk::LabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 2u>>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::LabelMap<itk::LabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned long, 3u>>, itk::VectorImage<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::LabelMap<itk::LabelObject<unsigned short, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 2u>>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::LabelMap<itk::LabelObject<unsigned short, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::LabelObject<unsigned short, 3u>>, itk::VectorImage<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>, itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKImageToImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
index 0736708d1a..d54be6470a 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKImportImageContainer_h__
 #define sitkExplicitITKImportImageContainer_h__
 #include "sitkExplicit.h"
@@ -26,28 +26,28 @@ extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, double>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, float>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, int>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::CovariantVector<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::FixedArray<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Offset<3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, itk::Vector<float, 3u>>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, long>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, long long>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, short>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, signed char>;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<double> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<float> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u> > > >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u> > > >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<double>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::complex<float>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<2u>, std::allocator<itk::LabelObjectLine<2u>>>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, std::deque<itk::LabelObjectLine<3u>, std::allocator<itk::LabelObjectLine<3u>>>>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned char>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned int>;
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, unsigned long>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
index b1b03d97b3..5ffba689f1 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
@@ -1,319 +1,319 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKInPlaceImageFilter_h__
 #define sitkExplicitITKInPlaceImageFilter_h__
 #include "sitkExplicit.h"
 #include "itkInPlaceImageFilter.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<float, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<int, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 2u>, 2u>, itk::Image<itk::Vector<double, 2u>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<double, 3u>, 3u>, itk::Image<itk::Vector<double, 3u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<itk::Vector<float, 1u>, 3u>, itk::Image<itk::Vector<float, 1u>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<long, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<signed char, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 2u>, itk::Image<std::complex<double>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<double>, 3u>, itk::Image<std::complex<double>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 2u>, itk::Image<std::complex<float>, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<std::complex<float>, 3u>, itk::Image<std::complex<float>, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 1u>, itk::Image<unsigned char, 1u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned int, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned long, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<unsigned short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<double, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<float, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 2u>, itk::VectorImage<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<int, 3u>, itk::VectorImage<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 2u>, itk::VectorImage<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<long, 3u>, itk::VectorImage<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 2u>, itk::VectorImage<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<short, 3u>, itk::VectorImage<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 2u>, itk::VectorImage<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<signed char, 3u>, itk::VectorImage<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 2u>, itk::VectorImage<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned char, 3u>, itk::VectorImage<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 2u>, itk::VectorImage<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned int, 3u>, itk::VectorImage<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 2u>, itk::VectorImage<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned long, 3u>, itk::VectorImage<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 2u>, itk::VectorImage<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::VectorImage<unsigned short, 3u>, itk::VectorImage<unsigned short, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKInPlaceImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
index 297dbe4c7b..ee789965a1 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
@@ -1,43 +1,43 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKLabelMap_h__
 #define sitkExplicitITKLabelMap_h__
 #include "sitkExplicit.h"
 #include "itkLabelMap.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 3u, bool>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 2u, bool>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long long, 3u, bool>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::LabelObject<unsigned short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::ShapeLabelObject<unsigned long long, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKLabelMap_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
index 28676580cf..7ee902cbdd 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKVectorImage_h__
 #define sitkExplicitITKVectorImage_h__
 #include "sitkExplicit.h"
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
index a7ed049760..87efded9c6 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
@@ -1,49 +1,49 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
 #define sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
 #include "sitkExplicit.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 2u>, itk::Image<long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 3u>, itk::Image<long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 2u>, itk::Image<unsigned long long, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 3u>, itk::Image<unsigned long long, 3u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u> >;
-extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u> >;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 3u>, itk::Image<double, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 2u>, itk::Image<float, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<float, 3u>, itk::Image<float, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 2u>, itk::Image<int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<int, 3u>, itk::Image<int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 2u>, itk::Image<long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long, 3u>, itk::Image<long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 2u>, itk::Image<long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<long long, 3u>, itk::Image<long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 2u>, itk::Image<short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<short, 3u>, itk::Image<short, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 2u>, itk::Image<signed char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<signed char, 3u>, itk::Image<signed char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 2u>, itk::Image<unsigned char, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned char, 3u>, itk::Image<unsigned char, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 2u>, itk::Image<unsigned int, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned int, 3u>, itk::Image<unsigned int, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 2u>, itk::Image<unsigned long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long, 3u>, itk::Image<unsigned long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 2u>, itk::Image<unsigned long long, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned long long, 3u>, itk::Image<unsigned long long, 3u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 2u>, itk::Image<unsigned short, 2u>>;
+extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<unsigned short, 3u>, itk::Image<unsigned short, 3u>>;
 #endif // SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 #endif // sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
index c1f57bef15..3b691f76af 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
@@ -1,20 +1,20 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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 __sitkMacro_h
 #define __sitkMacro_h
 
@@ -26,42 +26,43 @@
 
 #include "sitkConfigure.h"
 
-
 // Setup symbol exports
 //
 #if defined _WIN32 || defined __CYGWIN__
-   #ifdef __GNUC__
-    #define SITK_ABI_EXPORT __attribute__ ((dllexport))
-    #define SITK_ABI_IMPORT __attribute__ ((dllimport))
-    #define SITK_ABI_HIDDEN
-  #else
-    #define SITK_ABI_EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.
-    #define SITK_ABI_IMPORT __declspec(dllimport) // Note: actually gcc seems to also supports this syntax.
-    #define SITK_ABI_HIDDEN
-  #endif
+#ifdef __GNUC__
+#define SITK_ABI_EXPORT __attribute__((dllexport))
+#define SITK_ABI_IMPORT __attribute__((dllimport))
+#define SITK_ABI_HIDDEN
+#else
+#define SITK_ABI_EXPORT __declspec(dllexport) // Note: actually gcc seems to also supports this syntax.
+#define SITK_ABI_IMPORT __declspec(dllimport) // Note: actually gcc seems to also supports this syntax.
+#define SITK_ABI_HIDDEN
+#endif
 #else
-  #if __GNUC__ >= 4
-    #define SITK_ABI_EXPORT __attribute__ ((visibility ("default")))
-    #define SITK_ABI_IMPORT __attribute__ ((visibility ("default")))
-    #define SITK_ABI_HIDDEN  __attribute__ ((visibility ("hidden")))
-  #else
-    #define SITK_ABI_EXPORT
-    #define SITK_ABI_IMPORT
-    #define SITK_ABI_HIDDEN
-  #endif
+#if __GNUC__ >= 4
+#define SITK_ABI_EXPORT __attribute__((visibility("default")))
+#define SITK_ABI_IMPORT __attribute__((visibility("default")))
+#define SITK_ABI_HIDDEN __attribute__((visibility("hidden")))
+#else
+#define SITK_ABI_EXPORT
+#define SITK_ABI_IMPORT
+#define SITK_ABI_HIDDEN
+#endif
 #endif
 
-namespace itk {
+namespace itk
+{
 
-namespace simple {
+namespace simple
+{
 
 class GenericException;
 
-#define sitkExceptionMacro(x)                                           \
-  {                                                                     \
-    std::ostringstream message;                                         \
-    message << "sitk::ERROR: " x;                                       \
-    throw ::itk::simple::GenericException(__FILE__, __LINE__, message.str().c_str()); \
+#define sitkExceptionMacro(x)                                                                                                                                                                          \
+  {                                                                                                                                                                                                    \
+    std::ostringstream message;                                                                                                                                                                        \
+    message << "sitk::ERROR: " x;                                                                                                                                                                      \
+    throw ::itk::simple::GenericException(__FILE__, __LINE__, message.str().c_str());                                                                                                                  \
   }
 
 #if defined(SITK_HAS_CXX11_NULLPTR) && !defined(SITK_HAS_TR1_SUB_INCLUDE)
@@ -70,26 +71,35 @@ class GenericException;
 #define SITK_NULLPTR nullptr
 #endif
 
-
 #ifdef SITK_HAS_CXX11_STATIC_ASSERT
 // utilize the c++11 static_assert if available
-#define sitkStaticAssert( expr, str) static_assert( expr, str )
+#define sitkStaticAssert(expr, str) static_assert(expr, str)
 #else
 
-template<bool> struct StaticAssertFailure;
-template<> struct StaticAssertFailure<true>{ enum { Value = 1 }; };
-
-#define BOOST_JOIN( X, Y ) BOOST_DO_JOIN( X, Y )
-#define BOOST_DO_JOIN( X, Y ) BOOST_DO_JOIN2(X,Y)
-#define BOOST_DO_JOIN2( X, Y ) X##Y
-
-#define sitkStaticAssert( expr, str ) enum { BOOST_JOIN( static_assert_typedef, __LINE__) = sizeof( itk::simple::StaticAssertFailure<((expr) == 0 ? false : true )> ) };
-
+template <bool>
+struct StaticAssertFailure;
+template <>
+struct StaticAssertFailure<true>
+{
+  enum
+  {
+    Value = 1
+  };
+};
+
+#define BOOST_JOIN(X, Y) BOOST_DO_JOIN(X, Y)
+#define BOOST_DO_JOIN(X, Y) BOOST_DO_JOIN2(X, Y)
+#define BOOST_DO_JOIN2(X, Y) X##Y
+
+#define sitkStaticAssert(expr, str)                                                                                                                                                                    \
+  enum                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    BOOST_JOIN(static_assert_typedef, __LINE__) = sizeof(itk::simple::StaticAssertFailure<((expr) == 0 ? false : true)>)                                                                               \
+  };
 
 #endif
 
-
-}
-}
+} // namespace simple
+} // namespace itk
 
 #endif
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h b/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
index 5cf6f649e2..87cce3b68d 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkVersionConfig.h
@@ -1,23 +1,23 @@
 /*=========================================================================
-*
-*  Copyright Insight Software Consortium
-*
-*  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.
-*
-*=========================================================================*/
+ *
+ *  Copyright Insight Software Consortium
+ *
+ *  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.
+ *
+ *=========================================================================*/
 
 #define SimpleITK_VERSION_MAJOR 0
 #define SimpleITK_VERSION_MINOR 9
 #define SimpleITK_VERSION_PATCH 0
-#define SimpleITK_VERSION_TWEAK 
+#define SimpleITK_VERSION_TWEAK
 #define SimpleITK_VERSION "0.9.0-g45317"
diff --git a/ThirdParty/QtWebApp/httpserver/ServerSettings.h b/ThirdParty/QtWebApp/httpserver/ServerSettings.h
index d625d75220..fb47b123ae 100644
--- a/ThirdParty/QtWebApp/httpserver/ServerSettings.h
+++ b/ThirdParty/QtWebApp/httpserver/ServerSettings.h
@@ -12,8 +12,8 @@ class QtWebAppLib_EXPORT ServerSettings
   ~ServerSettings();
   ServerSettings();
 
-  ServerSettings(const ServerSettings&) = delete; // Copy Constructor Not Implemented
-  ServerSettings(ServerSettings&&) = delete;      // Move Constructor Not Implemented
+  ServerSettings(const ServerSettings&) = delete;            // Copy Constructor Not Implemented
+  ServerSettings(ServerSettings&&) = delete;                 // Move Constructor Not Implemented
   ServerSettings& operator=(const ServerSettings&) = delete; // Copy Assignment Not Implemented
   ServerSettings& operator=(ServerSettings&&) = delete;      // Move Assignment Not Implemented
 
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
index ccac1db09a..e3b73b5a81 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
@@ -117,4 +117,3 @@ private slots:
   /** Received from the socket when a connection has been closed */
   void disconnected();
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
index 07a03871f4..4d3a5f0040 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
@@ -134,7 +134,10 @@ void HttpConnectionHandlerPool::loadSslConfig()
     sslConfiguration->setPeerVerifyMode(QSslSocket::VerifyNone);
     sslConfiguration->setProtocol(QSsl::TlsV1SslV3);
 
-   if(verbose) { qDebug("HttpConnectionHandlerPool: SSL settings loaded"); }
+    if(verbose)
+    {
+      qDebug("HttpConnectionHandlerPool: SSL settings loaded");
+    }
 #endif
   }
 }
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
index 49b98a3bdf..6691f5e5ad 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
@@ -93,6 +93,4 @@ private slots:
 private:
   /** Should we print out all sorts of diagnostics */
   bool verbose = false;
-
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpcookie.h b/ThirdParty/QtWebApp/httpserver/httpcookie.h
index bf066f8443..671b21f41f 100644
--- a/ThirdParty/QtWebApp/httpserver/httpcookie.h
+++ b/ThirdParty/QtWebApp/httpserver/httpcookie.h
@@ -112,4 +112,3 @@ class QtWebAppLib_EXPORT HttpCookie
   bool httpOnly;
   int version;
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpglobal.h b/ThirdParty/QtWebApp/httpserver/httpglobal.h
index ba183815c7..912329f913 100644
--- a/ThirdParty/QtWebApp/httpserver/httpglobal.h
+++ b/ThirdParty/QtWebApp/httpserver/httpglobal.h
@@ -28,12 +28,10 @@ building the DLL on windows.
 #endif
 #endif
 
-
 /* If QtWebAppLib_EXPORT was never defined, define it here */
 #ifndef QtWebAppLib_EXPORT
 #define QtWebAppLib_EXPORT
 #endif
 
-
 /** Get the library version number */
 QtWebAppLib_EXPORT const char* getQtWebAppLibVersion();
diff --git a/ThirdParty/QtWebApp/httpserver/httplistener.cpp b/ThirdParty/QtWebApp/httpserver/httplistener.cpp
index cd81a47947..408831941a 100644
--- a/ThirdParty/QtWebApp/httpserver/httplistener.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httplistener.cpp
@@ -74,7 +74,7 @@ void HttpListener::listen()
   }
   else
   {
-//    qDebug() << "HttpListener: Listening on " << hostAddress.toString() << ":" << port;
+    //    qDebug() << "HttpListener: Listening on " << hostAddress.toString() << ":" << port;
   }
 
   // Pass the IPv4 address into the request handler so it has this proper information
diff --git a/ThirdParty/QtWebApp/httpserver/httplistener.h b/ThirdParty/QtWebApp/httpserver/httplistener.h
index df229bae93..096fa0e731 100644
--- a/ThirdParty/QtWebApp/httpserver/httplistener.h
+++ b/ThirdParty/QtWebApp/httpserver/httplistener.h
@@ -93,4 +93,3 @@ class QtWebAppLib_EXPORT HttpListener : public QTcpServer
 
   void handleConnection(tSocketDescriptor socketDescriptor);
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httprequest.cpp b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
index 5ef6ade095..8870bb246e 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequest.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
@@ -460,9 +460,9 @@ void HttpRequest::parseMultiPartFile()
           // last field was a form field
           fieldValue.remove(fieldValue.size() - 2, 2);
           parameters.insert(fieldName, fieldValue);
-          #ifdef SUPERVERBOSE
+#ifdef SUPERVERBOSE
           qDebug("HttpRequest: set parameter %s=%s", fieldName.data(), fieldValue.data());
-          #endif
+#endif
         }
         else if(!fileName.isEmpty() && !fieldName.isEmpty())
         {
@@ -485,26 +485,26 @@ void HttpRequest::parseMultiPartFile()
         break;
       }
 
-        if(fileName.isEmpty() && !fieldName.isEmpty())
+      if(fileName.isEmpty() && !fieldName.isEmpty())
+      {
+        // this is a form field.
+        currentSize += line.size();
+        fieldValue.append(line);
+      }
+      else if(!fileName.isEmpty() && !fieldName.isEmpty())
+      {
+        // this is a file
+        if(uploadedFile == nullptr)
         {
-          // this is a form field.
-          currentSize += line.size();
-          fieldValue.append(line);
+          uploadedFile = new QTemporaryFile();
+          uploadedFile->open();
         }
-        else if(!fileName.isEmpty() && !fieldName.isEmpty())
+        uploadedFile->write(line);
+        if(uploadedFile->error() != 0u)
         {
-          // this is a file
-          if(uploadedFile == nullptr)
-          {
-            uploadedFile = new QTemporaryFile();
-            uploadedFile->open();
-          }
-          uploadedFile->write(line);
-          if(uploadedFile->error() != 0u)
-          {
-            qCritical("HttpRequest: error writing temp file, %s", qPrintable(uploadedFile->errorString()));
-          }
+          qCritical("HttpRequest: error writing temp file, %s", qPrintable(uploadedFile->errorString()));
         }
+      }
     }
   }
   if(tempFile->error() != 0u)
diff --git a/ThirdParty/QtWebApp/httpserver/httprequest.h b/ThirdParty/QtWebApp/httpserver/httprequest.h
index 1f30de62bd..dd2fb5301e 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequest.h
+++ b/ThirdParty/QtWebApp/httpserver/httprequest.h
@@ -236,4 +236,3 @@ class QtWebAppLib_EXPORT HttpRequest
   /** Buffer for collecting characters of request and header lines */
   QByteArray lineBuffer;
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httprequesthandler.h b/ThirdParty/QtWebApp/httpserver/httprequesthandler.h
index 7dec681e19..695829bcc0 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequesthandler.h
+++ b/ThirdParty/QtWebApp/httpserver/httprequesthandler.h
@@ -27,9 +27,9 @@ class QtWebAppLib_EXPORT HttpRequestHandler : public QObject
   Q_DISABLE_COPY(HttpRequestHandler)
 public:
   /**
- * Constructor.
- * @param parent Parent object.
- */
+   * Constructor.
+   * @param parent Parent object.
+   */
   HttpRequestHandler(QObject* parent = NULL);
 
   /** Destructor */
@@ -44,25 +44,24 @@ class QtWebAppLib_EXPORT HttpRequestHandler : public QObject
   virtual void service(HttpRequest& request, HttpResponse& response);
 
   /**
- * @brief setListenHost
- * @param hostAddress
- */
+   * @brief setListenHost
+   * @param hostAddress
+   */
   void setListenHost(const QHostAddress& hostAddress, const int port);
 
   /**
- * @brief getListenHost
- * @return
- */
+   * @brief getListenHost
+   * @return
+   */
   QHostAddress getListenHost() const;
 
   /**
-  * @brief getListenPort
-  * @return
-  */
+   * @brief getListenPort
+   * @return
+   */
   int getListenPort() const;
 
 private:
   QHostAddress m_HostAddress;
   int m_Port;
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpresponse.h b/ThirdParty/QtWebApp/httpserver/httpresponse.h
index 2b4d58ecb2..0928062c51 100644
--- a/ThirdParty/QtWebApp/httpserver/httpresponse.h
+++ b/ThirdParty/QtWebApp/httpserver/httpresponse.h
@@ -34,56 +34,55 @@ class QtWebAppLib_EXPORT HttpResponse
 {
   Q_DISABLE_COPY(HttpResponse)
 public:
-
-    enum class HttpStatusCode : unsigned int
-    {
-      Unknown = 0,
-
-      Continue = 100,
-      SwitchingProtocols = 101,
-
-      OK = 200,
-      Created = 201,
-      Accepted = 202,
-      NonAuthoritativeInformation = 203,
-      NoContent = 204,
-      ResetContent = 205,
-      PartialContent = 206,
-
-      MultipleChoices = 300,
-      MovedPermanently = 301,
-      Found = 302,
-      SeeOther = 303,
-      NotModified = 304,
-      UseProxy = 305,
-      TemporaryRedirect = 307,
-
-      BadRequest = 400,
-      Unauthorized = 401,
-      PaymentRequired = 402,
-      Forbidden = 403,
-      NotFound = 404,
-      MethodNotAllowed = 405,
-      NotAcceptable = 406,
-      ProxyAuthenticationRequired = 407,
-      RequestTimeout = 408,
-      Conflict = 409,
-      Gone = 410,
-      LengthRequired = 411,
-      PreconditionFailed = 412,
-      RequestEntityTooLarge = 413,
-      RequestURITooLarge = 414,
-      UnsupportedMediaType = 415,
-      RequestedRangeNotSatisfiable = 416,
-      ExpectationFailed = 417,
-
-      InternalServerError = 500,
-      NotImplemented = 501,
-      BadGateway = 502,
-      ServiceUnavailable = 503,
-      GatewayTimeout = 504,
-      HTTPVersionNotSupported = 505
-    };
+  enum class HttpStatusCode : unsigned int
+  {
+    Unknown = 0,
+
+    Continue = 100,
+    SwitchingProtocols = 101,
+
+    OK = 200,
+    Created = 201,
+    Accepted = 202,
+    NonAuthoritativeInformation = 203,
+    NoContent = 204,
+    ResetContent = 205,
+    PartialContent = 206,
+
+    MultipleChoices = 300,
+    MovedPermanently = 301,
+    Found = 302,
+    SeeOther = 303,
+    NotModified = 304,
+    UseProxy = 305,
+    TemporaryRedirect = 307,
+
+    BadRequest = 400,
+    Unauthorized = 401,
+    PaymentRequired = 402,
+    Forbidden = 403,
+    NotFound = 404,
+    MethodNotAllowed = 405,
+    NotAcceptable = 406,
+    ProxyAuthenticationRequired = 407,
+    RequestTimeout = 408,
+    Conflict = 409,
+    Gone = 410,
+    LengthRequired = 411,
+    PreconditionFailed = 412,
+    RequestEntityTooLarge = 413,
+    RequestURITooLarge = 414,
+    UnsupportedMediaType = 415,
+    RequestedRangeNotSatisfiable = 416,
+    ExpectationFailed = 417,
+
+    InternalServerError = 500,
+    NotImplemented = 501,
+    BadGateway = 502,
+    ServiceUnavailable = 503,
+    GatewayTimeout = 504,
+    HTTPVersionNotSupported = 505
+  };
 
   /**
     Constructor.
@@ -191,7 +190,7 @@ class QtWebAppLib_EXPORT HttpResponse
   QMap<QByteArray, HttpCookie> cookies;
 
   /* The mapping between status codes and their descriptions */
-  QMap<HttpStatusCode,QByteArray> m_StatusCodeLookup;
+  QMap<HttpStatusCode, QByteArray> m_StatusCodeLookup;
 
   /** Write raw data to the socket. This method blocks until all bytes have been passed to the TCP buffer */
   bool writeToSocket(QByteArray data);
@@ -208,4 +207,3 @@ class QtWebAppLib_EXPORT HttpResponse
    */
   void createStatusCodeLookup();
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpsession.cpp b/ThirdParty/QtWebApp/httpserver/httpsession.cpp
index fc97cac68e..f1fe515556 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsession.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpsession.cpp
@@ -132,7 +132,7 @@ QByteArray HttpSession::getId() const
     return dataPtr->m_SessionId;
   }
 
-    return QByteArray();
+  return QByteArray();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/ThirdParty/QtWebApp/httpserver/httpsession.h b/ThirdParty/QtWebApp/httpserver/httpsession.h
index 1d125bab0e..bc49fed157 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsession.h
+++ b/ThirdParty/QtWebApp/httpserver/httpsession.h
@@ -110,4 +110,3 @@ class QtWebAppLib_EXPORT HttpSession
   /** Pointer to the shared data. */
   HttpSessionData* dataPtr;
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/httpsessionstore.cpp b/ThirdParty/QtWebApp/httpserver/httpsessionstore.cpp
index 18b58bafe1..6d05ce6333 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsessionstore.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpsessionstore.cpp
@@ -27,7 +27,7 @@ HttpSessionStore::HttpSessionStore(ServerSettings* settings, QObject* parent)
     cookieName = settings->cookieName;
     expirationTime = settings->expirationTime;
   }
-//  qDebug() << "HttpSessionStore: Sessions expire after " << expirationTime << " milliseconds";
+  //  qDebug() << "HttpSessionStore: Sessions expire after " << expirationTime << " milliseconds";
 }
 
 // -----------------------------------------------------------------------------
@@ -139,7 +139,7 @@ HttpSession HttpSessionStore::getSession(HttpRequest& request, HttpResponse& res
     //    QByteArray cookieDomain = settings->value("cookieDomain").toByteArray();
 
     HttpSession session(true);
-//    qDebug() << "HttpSessionStore: create new session with ID " << session.getId().data();
+    //    qDebug() << "HttpSessionStore: create new session with ID " << session.getId().data();
     sessions.insert(session.getId(), session);
     // response.setCookie(HttpCookie(cookieName, session.getId(), expirationTime / 1000, cookiePath, cookieComment, cookieDomain));
     return session;
diff --git a/ThirdParty/QtWebApp/httpserver/httpsessionstore.h b/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
index cdf55dca69..fce57bcc3f 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
+++ b/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
@@ -120,4 +120,3 @@ private slots:
 private:
   static HttpSessionStore* self;
 };
-
diff --git a/ThirdParty/QtWebApp/httpserver/staticfilecontroller.h b/ThirdParty/QtWebApp/httpserver/staticfilecontroller.h
index 5fa61112d1..04b4f7de60 100644
--- a/ThirdParty/QtWebApp/httpserver/staticfilecontroller.h
+++ b/ThirdParty/QtWebApp/httpserver/staticfilecontroller.h
@@ -83,4 +83,3 @@ class QtWebAppLib_EXPORT StaticFileController : public HttpRequestHandler
   /** Set a content-type header in the response depending on the ending of the filename */
   void setContentType(QString file, HttpResponse& response) const;
 };
-
diff --git a/ThirdParty/QtWebApp/logging/dualfilelogger.h b/ThirdParty/QtWebApp/logging/dualfilelogger.h
index 47ede3b1a0..ae4d173dbf 100644
--- a/ThirdParty/QtWebApp/logging/dualfilelogger.h
+++ b/ThirdParty/QtWebApp/logging/dualfilelogger.h
@@ -63,4 +63,3 @@ class QtWebAppLib_EXPORT DualFileLogger : public Logger
   /** Second logger */
   FileLogger* secondLogger;
 };
-
diff --git a/ThirdParty/QtWebApp/logging/filelogger.h b/ThirdParty/QtWebApp/logging/filelogger.h
index 335060c6e2..81420f0913 100644
--- a/ThirdParty/QtWebApp/logging/filelogger.h
+++ b/ThirdParty/QtWebApp/logging/filelogger.h
@@ -115,4 +115,3 @@ class QtWebAppLib_EXPORT FileLogger : public Logger
   */
   void refreshSettings();
 };
-
diff --git a/ThirdParty/QtWebApp/logging/logger.h b/ThirdParty/QtWebApp/logging/logger.h
index 7bac445255..bd958c62d1 100644
--- a/ThirdParty/QtWebApp/logging/logger.h
+++ b/ThirdParty/QtWebApp/logging/logger.h
@@ -175,4 +175,3 @@ class QtWebAppLib_EXPORT Logger : public QObject
   /** Thread local backtrace buffers */
   QThreadStorage<QList<LogMessage*>*> buffers;
 };
-
diff --git a/ThirdParty/QtWebApp/logging/logglobal.h b/ThirdParty/QtWebApp/logging/logglobal.h
index 4065c41fdd..1b0910333e 100644
--- a/ThirdParty/QtWebApp/logging/logglobal.h
+++ b/ThirdParty/QtWebApp/logging/logglobal.h
@@ -18,4 +18,3 @@
 #if !defined(QtWebAppLib_EXPORT)
 #define QtWebAppLib_EXPORT
 #endif
-
diff --git a/ThirdParty/QtWebApp/logging/logmessage.h b/ThirdParty/QtWebApp/logging/logmessage.h
index 718f246bfb..745d8cd670 100644
--- a/ThirdParty/QtWebApp/logging/logmessage.h
+++ b/ThirdParty/QtWebApp/logging/logmessage.h
@@ -85,4 +85,3 @@ class QtWebAppLib_EXPORT LogMessage
   /** Line number where the message was generated */
   int line;
 };
-
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice.h b/ThirdParty/QtWebApp/qtservice/qtservice.h
index 0adcab2bb7..584cf679d4 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice.h
+++ b/ThirdParty/QtWebApp/qtservice/qtservice.h
@@ -157,7 +157,8 @@ class QtWebAppLib_EXPORT QtServiceBase
   QtServiceBasePrivate* d_ptr;
 };
 
-template <typename Application> class QtService : public QtServiceBase
+template <typename Application>
+class QtService : public QtServiceBase
 {
 public:
   QtService(int argc, char** argv, const QString& name)
@@ -192,4 +193,3 @@ template <typename Application> class QtService : public QtServiceBase
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QtServiceBase::ServiceFlags)
-
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice_p.h b/ThirdParty/QtWebApp/qtservice/qtservice_p.h
index fa47be334e..a6725891da 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice_p.h
+++ b/ThirdParty/QtWebApp/qtservice/qtservice_p.h
@@ -81,4 +81,3 @@ class QtServiceBasePrivate
   void sysCleanup();
   class QtServiceSysPrivate* sysd;
 };
-
diff --git a/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h b/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
index 57f61ba980..1de46d3227 100644
--- a/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
+++ b/ThirdParty/QtWebApp/qtservice/qtunixserversocket.h
@@ -55,4 +55,3 @@ class QtUnixServerSocket : public QTcpServer
 private:
   QString path_;
 };
-
diff --git a/ThirdParty/QtWebApp/qtservice/qtunixsocket.h b/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
index b61611a2db..ef8809796f 100644
--- a/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
+++ b/ThirdParty/QtWebApp/qtservice/qtunixsocket.h
@@ -50,4 +50,3 @@ class QtUnixSocket : public QTcpSocket
 
   bool connectTo(const QString& path);
 };
-
diff --git a/ThirdParty/QtWebApp/templateengine/template.h b/ThirdParty/QtWebApp/templateengine/template.h
index 6f027c503c..98ee5355b2 100644
--- a/ThirdParty/QtWebApp/templateengine/template.h
+++ b/ThirdParty/QtWebApp/templateengine/template.h
@@ -162,4 +162,3 @@ class QtWebAppLib_EXPORT Template : public QString
   /** Enables warnings, if true */
   bool warnings;
 };
-
diff --git a/ThirdParty/QtWebApp/templateengine/templatecache.h b/ThirdParty/QtWebApp/templateengine/templatecache.h
index 46e7e0d728..d89111a20d 100644
--- a/ThirdParty/QtWebApp/templateengine/templatecache.h
+++ b/ThirdParty/QtWebApp/templateengine/templatecache.h
@@ -74,4 +74,3 @@ class QtWebAppLib_EXPORT TemplateCache : public TemplateLoader
   /** Used to synchronize threads */
   QMutex mutex;
 };
-
diff --git a/ThirdParty/QtWebApp/templateengine/templateglobal.h b/ThirdParty/QtWebApp/templateengine/templateglobal.h
index 4065c41fdd..1b0910333e 100644
--- a/ThirdParty/QtWebApp/templateengine/templateglobal.h
+++ b/ThirdParty/QtWebApp/templateengine/templateglobal.h
@@ -18,4 +18,3 @@
 #if !defined(QtWebAppLib_EXPORT)
 #define QtWebAppLib_EXPORT
 #endif
-
diff --git a/ThirdParty/QtWebApp/templateengine/templateloader.h b/ThirdParty/QtWebApp/templateengine/templateloader.h
index 0dc69fdf3b..e5b1b64ba4 100644
--- a/ThirdParty/QtWebApp/templateengine/templateloader.h
+++ b/ThirdParty/QtWebApp/templateengine/templateloader.h
@@ -77,4 +77,3 @@ class QtWebAppLib_EXPORT TemplateLoader : public QObject
   /** Codec for decoding the files */
   QTextCodec* textCodec;
 };
-
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index b4439a0182..06d41a1ebe 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -31,18 +31,15 @@ registerSIMPLArray<int32_t, 6>(mod, "IntVec6");
 py::implicitly_convertible<QString, DataArrayPath>();
 
 py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
-  .def(py::init<float, float, float, float>())
-  .def_readwrite("angle", &AxisAngleInput_t::angle)
-  .def_readwrite("h", &AxisAngleInput_t::h)
-  .def_readwrite("k", &AxisAngleInput_t::k)
-  .def_readwrite("l", &AxisAngleInput_t::l)
-;
+    .def(py::init<float, float, float, float>())
+    .def_readwrite("angle", &AxisAngleInput_t::angle)
+    .def_readwrite("h", &AxisAngleInput_t::h)
+    .def_readwrite("k", &AxisAngleInput_t::k)
+    .def_readwrite("l", &AxisAngleInput_t::l);
 
 py::class_<StackFileListInfo>(mod, "FileListInfo")
-  .def(py::init<>([] (int32_t paddingDigits, uint32_t ordering, int32_t startIndex,
-    int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
-    const QString& fileSuffix, const QString& fileExtension)
-    {
+    .def(py::init<>([](int32_t paddingDigits, uint32_t ordering, int32_t startIndex, int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
+                       const QString& fileSuffix, const QString& fileExtension) {
       StackFileListInfo fileListInfo;
       fileListInfo.PaddingDigits = paddingDigits;
       fileListInfo.Ordering = ordering;
@@ -54,51 +51,45 @@ py::class_<StackFileListInfo>(mod, "FileListInfo")
       fileListInfo.FileSuffix = fileSuffix;
       fileListInfo.FileExtension = fileExtension;
       return fileListInfo;
-    }))
-;
-
-py::class_<QSet<QString>>(mod, "StringSet")
-  .def(py::init<>([](py::set stringSet) {
-    QSet<QString> newQStringSet = QSet<QString>();
-    for(auto newString : stringSet)
-    {
-      newQStringSet.insert(py::cast<QString>(newString));
-    }
-    return newQStringSet;
-  }))
-;
-
-py::class_<QDateTime>(mod, "DateTime")
-  .def(py::init<>([](int year, int month, int day, int seconds) {
-    QDateTime dateTime(QDate(year, month, day));
-    dateTime.setTime_t(seconds);
-    return dateTime;
-  }))
-;
-
-py::class_<QJsonArray>(mod, "JsonArray")
-  .def(py::init<>([](py::list values) {
-    QJsonArray qJsonArray;
-    for(auto value : values) {
-      QJsonValue qJsonValue(py::cast<double>(value));
-      qJsonArray.push_back(qJsonValue);
-    }
-    return qJsonArray;
-  }))
-;
-
-py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList")
-  .def(py::init<>([](py::list values) {
-    QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
-    for(auto value : values) {
-      py::list valueAsList = py::cast<py::list>(value);
-      ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
-      datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
-      datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
-      datasetImportInfoList.push_back(datasetImportInfo);
-    }
-    return datasetImportInfoList;
-  }));
+    }));
+
+py::class_<QSet<QString>>(mod, "StringSet").def(py::init<>([](py::set stringSet) {
+  QSet<QString> newQStringSet = QSet<QString>();
+  for(auto newString : stringSet)
+  {
+    newQStringSet.insert(py::cast<QString>(newString));
+  }
+  return newQStringSet;
+}));
+
+py::class_<QDateTime>(mod, "DateTime").def(py::init<>([](int year, int month, int day, int seconds) {
+  QDateTime dateTime(QDate(year, month, day));
+  dateTime.setTime_t(seconds);
+  return dateTime;
+}));
+
+py::class_<QJsonArray>(mod, "JsonArray").def(py::init<>([](py::list values) {
+  QJsonArray qJsonArray;
+  for(auto value : values)
+  {
+    QJsonValue qJsonValue(py::cast<double>(value));
+    qJsonArray.push_back(qJsonValue);
+  }
+  return qJsonArray;
+}));
+
+py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList").def(py::init<>([](py::list values) {
+  QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
+  for(auto value : values)
+  {
+    py::list valueAsList = py::cast<py::list>(value);
+    ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
+    datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
+    datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
+    datasetImportInfoList.push_back(datasetImportInfo);
+  }
+  return datasetImportInfoList;
+}));
 
 py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8");
 py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8");
@@ -118,110 +109,94 @@ py::bind_vector<std::vector<double>>(mod, "VectorDouble");
 if(py::detail::get_type_info(typeid(std::vector<size_t>)))
 {
   mod.attr("VectorSizeT") = mod.attr("VectorUInt64");
-} 
-else 
+}
+else
 {
   py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT");
 }
 
 py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
-  .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
-  .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
-  .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
-  .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
-  .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
-  .export_values()
-;
+    .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
+    .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
+    .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
+    .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
+    .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
+    .export_values();
 
 py::enum_<SIMPL::DelimiterTypes::Type>(mod, "DelimiterTypes")
-  .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
-  .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
-  .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
-  .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
-  .value("Space", SIMPL::DelimiterTypes::Type::Space)
-;
+    .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
+    .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
+    .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
+    .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
+    .value("Space", SIMPL::DelimiterTypes::Type::Space);
 
 py::enum_<PhaseType::Type>(mod, "PhaseType")
-  .value("Primary", PhaseType::Type::Primary)
-  .value("Precipitate", PhaseType::Type::Precipitate)
-  .value("Transformation", PhaseType::Type::Transformation)
-  .value("Matrix", PhaseType::Type::Matrix)
-  .value("Boundary", PhaseType::Type::Boundary)
-  .value("Unknown", PhaseType::Type::Unknown)
-  .value("Any", PhaseType::Type::Any)
-;
+    .value("Primary", PhaseType::Type::Primary)
+    .value("Precipitate", PhaseType::Type::Precipitate)
+    .value("Transformation", PhaseType::Type::Transformation)
+    .value("Matrix", PhaseType::Type::Matrix)
+    .value("Boundary", PhaseType::Type::Boundary)
+    .value("Unknown", PhaseType::Type::Unknown)
+    .value("Any", PhaseType::Type::Any);
 
 py::enum_<ShapeType::Type>(mod, "ShapeType")
-  .value("Ellipsoid", ShapeType::Type::Ellipsoid)
-  .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
-  .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
-  .value("CylinderA", ShapeType::Type::CylinderA)
-  .value("CylinderB", ShapeType::Type::CylinderB)
-  .value("CylinderC", ShapeType::Type::CylinderC)
-  .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
-  .value("Unknown", ShapeType::Type::Unknown)
-  .value("Any", ShapeType::Type::Any)
-;
+    .value("Ellipsoid", ShapeType::Type::Ellipsoid)
+    .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
+    .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
+    .value("CylinderA", ShapeType::Type::CylinderA)
+    .value("CylinderB", ShapeType::Type::CylinderB)
+    .value("CylinderC", ShapeType::Type::CylinderC)
+    .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
+    .value("Unknown", ShapeType::Type::Unknown)
+    .value("Any", ShapeType::Type::Any);
 
 py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
-  .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
-  .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
-  .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
-  .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
-  .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
-  .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
-  .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
-  .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
-  .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
-  .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
-  .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
-  .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure)
-;
+    .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
+    .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
+    .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
+    .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
+    .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
+    .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
+    .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
+    .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
+    .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
+    .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
+    .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
+    .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure);
 
 py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
-  .value("Int8", SIMPL::ScalarTypes::Type::Int8)
-  .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
-  .value("Int16", SIMPL::ScalarTypes::Type::Int16)
-  .value("UInt16", SIMPL::ScalarTypes::Type::UInt16)
-  .value("Int32", SIMPL::ScalarTypes::Type::Int32)
-  .value("UInt32", SIMPL::ScalarTypes::Type::UInt32)
-  .value("Int64", SIMPL::ScalarTypes::Type::Int64)
-  .value("UInt64", SIMPL::ScalarTypes::Type::UInt64)
-  .value("Float", SIMPL::ScalarTypes::Type::Float)
-  .value("Double", SIMPL::ScalarTypes::Type::Double)
-  .value("Bool", SIMPL::ScalarTypes::Type::Bool)
-;
+    .value("Int8", SIMPL::ScalarTypes::Type::Int8)
+    .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
+    .value("Int16", SIMPL::ScalarTypes::Type::Int16)
+    .value("UInt16", SIMPL::ScalarTypes::Type::UInt16)
+    .value("Int32", SIMPL::ScalarTypes::Type::Int32)
+    .value("UInt32", SIMPL::ScalarTypes::Type::UInt32)
+    .value("Int64", SIMPL::ScalarTypes::Type::Int64)
+    .value("UInt64", SIMPL::ScalarTypes::Type::UInt64)
+    .value("Float", SIMPL::ScalarTypes::Type::Float)
+    .value("Double", SIMPL::ScalarTypes::Type::Double)
+    .value("Bool", SIMPL::ScalarTypes::Type::Bool);
 
 py::enum_<CreateDataArray::InitializationChoices>(mod, "InitializationType")
-  .value("Manual", CreateDataArray::InitializationChoices::Manual)
-  .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
-  .export_values()
-;
+    .value("Manual", CreateDataArray::InitializationChoices::Manual)
+    .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
+    .export_values();
 
-py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits")
-  .value("Radians", ArrayCalculator::AngleUnits::Radians)
-  .value("Degrees", ArrayCalculator::AngleUnits::Degrees)
-  .export_values()
-;
+py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits").value("Radians", ArrayCalculator::AngleUnits::Radians).value("Degrees", ArrayCalculator::AngleUnits::Degrees).export_values();
 
 py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
-  .value("Int8", SIMPL::NumericTypes::Type::Int8)
-  .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
-  .value("Int16", SIMPL::NumericTypes::Type::Int16)
-  .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
-  .value("Int32", SIMPL::NumericTypes::Type::Int32)
-  .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
-  .value("Int64", SIMPL::NumericTypes::Type::Int64)
-  .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
-  .value("Float", SIMPL::NumericTypes::Type::Float)
-  .value("Double", SIMPL::NumericTypes::Type::Double)
-  .value("Bool", SIMPL::NumericTypes::Type::Bool)
-  .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
-  .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType)
-;
-
-py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat")
-  .value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat)
-  .value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat)
-  .export_values()
-;
+    .value("Int8", SIMPL::NumericTypes::Type::Int8)
+    .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
+    .value("Int16", SIMPL::NumericTypes::Type::Int16)
+    .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
+    .value("Int32", SIMPL::NumericTypes::Type::Int32)
+    .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
+    .value("Int64", SIMPL::NumericTypes::Type::Int64)
+    .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
+    .value("Float", SIMPL::NumericTypes::Type::Float)
+    .value("Double", SIMPL::NumericTypes::Type::Double)
+    .value("Bool", SIMPL::NumericTypes::Type::Bool)
+    .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
+    .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType);
+
+py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat").value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat).value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat).export_values();
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
index ddfe677f24..c069dcc609 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
@@ -59,10 +59,10 @@ int main(int argc, char* argv[])
     return EXIT_FAILURE;
   }
 
-//   std::cout << "Source Directory: " << argv[1] << std::endl;
-//   std::cout << "Characters to strip: " << argv[2] << std::endl;
-//   std::cout << "Name of the Library: " << argv[3] << std::endl;
-//   std::cout << "Generated Dir: " << argv[4] << std::endl;
+  //   std::cout << "Source Directory: " << argv[1] << std::endl;
+  //   std::cout << "Characters to strip: " << argv[2] << std::endl;
+  //   std::cout << "Name of the Library: " << argv[3] << std::endl;
+  //   std::cout << "Generated Dir: " << argv[4] << std::endl;
 
   QString charsToStrip = QString::fromLatin1(argv[2]);
   if(charsToStrip == "-")
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index fc008b15c9..80d7b56c7e 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -12,8 +12,8 @@
 
 #define PYB11_TRUE 0
 //-----------------------------------------------------------------------------
-PyBind11Generator::PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, 
-const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib, const QString& cfgIntDir)
+PyBind11Generator::PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib,
+                                     const QString& cfgIntDir)
 : m_TopLevelDir(topLevelDir)
 , m_CharsToStrip(charsToStrip)
 , m_LibNameUpper(libName)
@@ -23,7 +23,7 @@ const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPL
 , m_CfgIntDir(cfgIntDir)
 {
 
-  m_LibName = m_LibNameUpper.toLower();// + "_py";
+  m_LibName = m_LibNameUpper.toLower(); // + "_py";
   m_SourceDir = m_TopLevelDir;
   m_SourceDir.cdUp();
 
@@ -39,7 +39,7 @@ PyBind11Generator::~PyBind11Generator() = default;
 void PyBind11Generator::readFilterList()
 {
   QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib =="TRUE")
+  if(m_IsSIMPLib == "TRUE")
   {
     libName = QString("SIMPLib");
   }
@@ -47,9 +47,7 @@ void PyBind11Generator::readFilterList()
   QFileInfo listFileInfo(listFilePath);
   if(!listFileInfo.exists())
   {
-    qDebug() << "Needed Input file to generate Python Bindings was not found for Plugin '" << libName 
-    << "'. The file should have been generated at "
-    << listFileInfo.absoluteFilePath();
+    qDebug() << "Needed Input file to generate Python Bindings was not found for Plugin '" << libName << "'. The file should have been generated at " << listFileInfo.absoluteFilePath();
   }
 
   m_FilterList.clear();
@@ -98,25 +96,24 @@ void PyBind11Generator::execute()
   ss << m_GenDir << "/" << m_LibName << "_pybind11_module" << ext;
 
   m_ModuleCode.generateModuleFile(genHeaderPath, m_IsSIMPLib);
-  
+
   genHeaderPath = QString("");
   QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib =="TRUE")
+  if(m_IsSIMPLib == "TRUE")
   {
     libName = QString("simpl");
   }
   ss << SIMPL::PyBind11::RuntimeOutputDir << "/UnitTest/" << libName << "/" << libName << "_UnitTest.py";
   genHeaderPath = genHeaderPath.replace("/./", "/");
   m_ModuleCode.generatePythonTestFile(genHeaderPath, m_IsSIMPLib);
-  
+
   genHeaderPath = QString("");
   libName = m_LibNameUpper;
-  if(m_IsSIMPLib =="TRUE")
+  if(m_IsSIMPLib == "TRUE")
   {
     libName = QString("simpl");
   }
-  ss << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName 
-    << "/" << libName.toLower() << "py.py";
+  ss << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName << "/" << libName.toLower() << "py.py";
   genHeaderPath = genHeaderPath.replace("/./", "/");
   m_ModuleCode.generatePythonicInterface(genHeaderPath, m_IsSIMPLib);
 
@@ -129,7 +126,7 @@ void PyBind11Generator::execute()
 //-----------------------------------------------------------------------------
 void PyBind11Generator::generateModuleInitPy()
 {
-  //std::cout << "PyBind11Generator::generateModuleInitPy(): " << m_LibName.toStdString() << std::endl;
+  // std::cout << "PyBind11Generator::generateModuleInitPy(): " << m_LibName.toStdString() << std::endl;
   QString filePath;
   QTextStream out(&filePath);
   out << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName << "/__init__.py";
@@ -139,12 +136,10 @@ void PyBind11Generator::generateModuleInitPy()
     f.open(QIODevice::WriteOnly | QIODevice::Text);
     QTextStream fout(&f);
     fout << "\"\"\" DREAM.3D Python Library\n"
-    << "This file is auto generated during each build.\n"
-    << "Do NOT edit this file directly.\n"
-    << "PyBind11Generator.cpp:" << __LINE__ << "\n"
-    << "\"\"\"\n"
-    ;
-
+         << "This file is auto generated during each build.\n"
+         << "Do NOT edit this file directly.\n"
+         << "PyBind11Generator.cpp:" << __LINE__ << "\n"
+         << "\"\"\"\n";
 
     QFile sourceFile(SIMPL::PyBind11::SIMPLProjBinaryDir + "/Pybind11Plugins.txt");
     sourceFile.open(QFile::ReadOnly);
@@ -152,25 +147,26 @@ void PyBind11Generator::generateModuleInitPy()
     sourceFile.close();
     QStringList tokens = contents.split("\n");
     QStringList::const_iterator constIterator;
-    for (constIterator = tokens.constBegin(); constIterator != tokens.constEnd(); ++constIterator)
+    for(constIterator = tokens.constBegin(); constIterator != tokens.constEnd(); ++constIterator)
     {
-      QString lower =  (*constIterator).toLower().trimmed();
-      if(lower.isEmpty()) { continue; }
-      fout 
-
-      << "# This imports the pythonic interface from the local site-packages\n"
-      << "from . import " << lower << "py\n"
-      << "# This imports the "<< lower << " submodule from the native python module\n"
-      << "from .dream3d import " << lower << "\n"
-      << "\n";
-    }
+      QString lower = (*constIterator).toLower().trimmed();
+      if(lower.isEmpty())
+      {
+        continue;
+      }
+      fout
 
-    fout
-    << "# Import the helper pure python modules\n"
-    << "from . import simpl_helpers\n"
-    << "from . import simpl_test_dirs\n"
-    << "\n";
+          << "# This imports the pythonic interface from the local site-packages\n"
+          << "from . import " << lower << "py\n"
+          << "# This imports the " << lower << " submodule from the native python module\n"
+          << "from .dream3d import " << lower << "\n"
+          << "\n";
+    }
 
+    fout << "# Import the helper pure python modules\n"
+         << "from . import simpl_helpers\n"
+         << "from . import simpl_test_dirs\n"
+         << "\n";
   }
   // else
   // {
@@ -190,17 +186,16 @@ void PyBind11Generator::copyPyInitFiles()
 
   QString inputPath;
   QTextStream ip(&inputPath);
-  ip << SIMPL::PyBind11::PythonWrappingDir << "/" << "SIMPL";
+  ip << SIMPL::PyBind11::PythonWrappingDir << "/"
+     << "SIMPL";
   QDir currentDir(inputPath);
 
-
   QString outputPath;
   QTextStream op(&outputPath);
-  op << SIMPL::PyBind11::RuntimeOutputDir <<  "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName;
+  op << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName;
   QDir dir;
   dir.mkpath(outputPath);
 
-
   QStringList filters;
   filters.append("*.py");
   // QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
@@ -211,11 +206,11 @@ void PyBind11Generator::copyPyInitFiles()
   {
     QString pyFilePath = itemInfo.absoluteFilePath();
 
-    // qDebug() << "Copy File: " << itemInfo.absoluteFilePath() << "\n   " 
+    // qDebug() << "Copy File: " << itemInfo.absoluteFilePath() << "\n   "
     //  << "DEST: " << outputPath + "/" + itemInfo.fileName();
-    if( pyFilePath.contains(".in.") )
+    if(pyFilePath.contains(".in."))
     {
-      //qDebug() << "CONFIGURE FILE: " << pyFilePath;
+      // qDebug() << "CONFIGURE FILE: " << pyFilePath;
       QFile source(pyFilePath);
       source.open(QFile::ReadOnly);
       QString contents = source.readAll();
@@ -223,7 +218,7 @@ void PyBind11Generator::copyPyInitFiles()
 
       QString outName = outputPath + "/" + itemInfo.fileName();
       outName = outName.replace(".in.", ".");
-      //qDebug() << "  outName:" << outName;
+      // qDebug() << "  outName:" << outName;
       contents = contents.replace("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}", SIMPL::PyBind11::BuildDirectory);
       contents.replace("${SIMPLProj_BINARY_DIR}", SIMPL::PyBind11::SIMPLProjBinaryDir);
       contents.replace("${DREAM3D_DATA_DIR}", SIMPL::PyBind11::DataDirectory);
@@ -258,7 +253,6 @@ void PyBind11Generator::copyPyInitFiles()
       }
     }
   }
-
 }
 
 //-----------------------------------------------------------------------------
@@ -271,7 +265,7 @@ void PyBind11Generator::recursiveSearch(const QDir& currentDir)
   // If the currently generated library is SIMPLib itself then ignore the list of
   // files and do a recursive search for the PYBIND macros since everything in
   // SIMPL is going to need to be wrapped.
-  if(m_IsSIMPLib =="TRUE")
+  if(m_IsSIMPLib == "TRUE")
   {
     // Get a list of all the directories
     QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
@@ -290,7 +284,9 @@ void PyBind11Generator::recursiveSearch(const QDir& currentDir)
       QString headerFilePath = itemInfo.absoluteFilePath();
       generatePybind11Header(headerFilePath);
     }
-  } else {
+  }
+  else
+  {
     for(const auto& item : m_FilterList)
     {
       QString filePath = currentDir.absolutePath() + QDir::separator() + item;
@@ -301,7 +297,6 @@ void PyBind11Generator::recursiveSearch(const QDir& currentDir)
       }
     }
   }
-
 }
 //-----------------------------------------------------------------------------
 void PyBind11Generator::generatePybind11Header(const QString& hFile)
@@ -336,7 +331,8 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
 
   QString genHeaderPath;
   QTextStream ss(&genHeaderPath);
-  ss << m_GenDir << "/" << subPath
+  ss << m_GenDir << "/"
+     << subPath
      //<< "pybind11"
      << "/" << fi.baseName() << "_PY11.h";
 
@@ -451,7 +447,7 @@ void PyBind11Generator::generatePybind11Header(const QString& hFile)
           }
           bindingClass.addEnumeration(enum_, values);
           enumerations.removeAll(enum_);
-        }    
+        }
       }
     }
   }
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
index eebe908e0e..8118098663 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
@@ -14,31 +14,31 @@ class PyBind11Generator
 
 public:
   /**
- * @brief PyBind11Generator
- * @param topLevelDir
- * @param charsToStrip
- * @param libName
- */
-  PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, 
-                   const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib, const QString& cfgIntDir);
+   * @brief PyBind11Generator
+   * @param topLevelDir
+   * @param charsToStrip
+   * @param libName
+   */
+  PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib,
+                    const QString& cfgIntDir);
 
   ~PyBind11Generator();
 
   /**
- * @brief execute
- */
+   * @brief execute
+   */
   void execute();
 
   /**
- * @brief recursiveSearch
- * @param currentDir
- */
+   * @brief recursiveSearch
+   * @param currentDir
+   */
   void recursiveSearch(const QDir& currentDir);
 
   /**
- * @brief generatePybind11Header
- * @param hFile
- */
+   * @brief generatePybind11Header
+   * @param hFile
+   */
   void generatePybind11Header(const QString& hFile);
 
   /**
@@ -47,15 +47,15 @@ class PyBind11Generator
   void copyPyInitFiles();
 
   /**
-   * 
+   *
    */
   void generateModuleInitPy();
 
   /**
-  *
-  */
+   *
+   */
   void readFilterList();
-  
+
 private:
   QDir m_TopLevelDir;
   QDir m_SourceDir;
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
index 13a394ecc3..1439cb9218 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
@@ -46,7 +46,7 @@ class PythonBindingClass : public QObject
   SIMPL_INSTANCE_PROPERTY(QVector<QString>, StaticNewMethods)
   void addStaticCreation(const QString& method);
   void clearStaticCreation();
- 
+
   SIMPL_INSTANCE_PROPERTY(QVector<QString>, Constructors)
   void addConstructor(const QString& constructor);
   void clearConstructors();
@@ -59,18 +59,18 @@ class PythonBindingClass : public QObject
   bool writeBindingFile(const QString& outputFilePath);
 
   /**
-  *@brief quote
-  *@param str
-  *@return
-  */
+   *@brief quote
+   *@param str
+   *@return
+   */
   QString quote(const QString& str);
 
   /**
-  *@brief writeOutput
-  *@param didReplace
-  *@param outLines
-  *@param filename
-  */
+   *@brief writeOutput
+   *@param didReplace
+   *@param outLines
+   *@param filename
+   */
   bool writeOutput(bool didReplace, const QString& outLines, const QString& filename);
 
 protected:
@@ -87,12 +87,12 @@ class PythonBindingClass : public QObject
   QString generatePropertiesCode();
 
   QString generateMethodCode();
-  
+
   QString generateEnumerationCode();
 
   QString generateFooterCode();
 
-  QByteArray md5FileContents(const QString &filename);
+  QByteArray md5FileContents(const QString& filename);
 
   QString generatePythonTestCode();
 
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
index 028bd19a15..a7686cacfc 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
@@ -329,7 +329,7 @@ void PythonBindingsModule::generatePythonTestFile(const QString& outputPath, con
   out << "\"\"\"\n"
       << "This is a basic unit test file to ensure that the filters can be instantiated\n"
       << "This file is AUTO GENERATED as part of the 'CodeScraper' program that is executed\n"
-      << "during the compilation phase. PythonBindingsModule.cpp at line " << __LINE__  << "\n"
+      << "during the compilation phase. PythonBindingsModule.cpp at line " << __LINE__ << "\n"
       << "m_LibName=" << m_LibName << "\n"
       << "isSIMPLib:" << isSIMPLib << "\n"
       << "\"\"\"\n";
@@ -392,13 +392,13 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
 
   out << QStringLiteral("\"\"\"") << "\n";
   out << "\n";
-  out  << "from .dream3d import simpl\n";
+  out << "from .dream3d import simpl\n";
 
   QString shortLibName = m_LibName;
   shortLibName.replace("_py", "");
   if(isSIMPLib != "TRUE")
   {
-    out  << "from .dream3d import " << shortLibName << "\n\n\n";
+    out << "from .dream3d import " << shortLibName << "\n\n\n";
   }
 
   iter.toFront();
@@ -421,13 +421,13 @@ void PythonBindingsModule::generatePythonicInterface(const QString& outputPath,
     {
       docCodes = pythonicCodes[2];
     }
-    
+
     if(shortLibName == "dream3d")
     {
       shortLibName = "simpl";
     }
     bodyCodes = bodyCodes.replace("@shortLibName@", shortLibName);
-    
+
     if(aClass.compare("AbstractFilter") == 0 && isSIMPLib.compare("FALSE") == 0)
     {
       continue;
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
index 4e0a79c138..1975b0faac 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
@@ -39,7 +39,7 @@ class PythonBindingsModule
   SIMPL_INSTANCE_PROPERTY(MapperType2, PythonicCodes)
   void addPythonicCodes(const QString& className, const QVector<QString>& pyCode);
   void clearPythonicCodes();
-    
+
   /**
    * @brief addDependency
    * @param superClassName
@@ -61,23 +61,21 @@ class PythonBindingsModule
    * @param isSIMPLib
    */
   void generateModuleFile(const QString& outputPath, const QString& isSIMPLib);
-  
+
   /**
    * @brief generatePythonTestFile
    * @param outputPath
    * @param isSIMPLib
    */
   void generatePythonTestFile(const QString& outputPath, const QString& isSIMPLib);
-  
-  
+
   /**
    * @brief generatePythonicInterface
    * @param outputPath
    * @param isSIMPLib
    */
   void generatePythonicInterface(const QString& outputPath, const QString& isSIMPLib);
-  
-  
+
 protected:
   /**
    * @brief dumpRecursivePythonCode
@@ -106,9 +104,9 @@ class PythonBindingsModule
   /**
    * @brief md5FileContents
    * @param filename
-   * @return 
+   * @return
    */
-  QByteArray md5FileContents(const QString &filename);
+  QByteArray md5FileContents(const QString& filename);
 
 private:
   std::vector<QObject*> m_ClassVector;
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h b/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
index d1d21bfa62..3d09bddc23 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
@@ -1,24 +1,22 @@
 #pragma once
 
-
 #include <QtCore/QString>
 #include <QtCore/QRegularExpression>
 
-
 namespace SIMPL
 {
 namespace Python
 {
 
-static QString fromCamelCase(const QString &s)
+static QString fromCamelCase(const QString& s)
 {
-  static QRegularExpression regExp1 {"(.)([A-Z][a-z]+)"};
-  static QRegularExpression regExp2 {"([a-z0-9])([A-Z])"};
-  
+  static QRegularExpression regExp1{"(.)([A-Z][a-z]+)"};
+  static QRegularExpression regExp2{"([a-z0-9])([A-Z])"};
+
   QString result = s;
   result.replace(regExp1, "\\1_\\2");
   result.replace(regExp2, "\\1_\\2");
-  
+
   return result.toLower();
 }
 
@@ -34,5 +32,5 @@ static QString toCamelCase(const QString& s)
 }
 #endif
 
-}
-}
+} // namespace Python
+} // namespace SIMPL

From 742814be293d15667b282c4d2bcf06259618c13a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 11 May 2020 15:53:19 -0400
Subject: [PATCH 222/397] Create Data Array. Initing multiple components only
 needs semicolon separated values

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   | 152 ++++++------------
 .../Testing/Cxx/CreateDataArrayTest.cpp       |  53 ++----
 .../CoreFilters/CreateDataArray.md            |   4 +-
 3 files changed, 71 insertions(+), 138 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 1102c515d4..e73a094a60 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -92,8 +92,6 @@ CDA_CREATE_CONVERTOR(float, toDouble)
 CDA_CREATE_CONVERTOR(double, toDouble)
 
 constexpr char CDA_SEP = ';';
-constexpr char CDA_LB = '[';
-constexpr char CDA_RB = ']';
 
 /**
  *
@@ -105,39 +103,30 @@ std::vector<T> createInitVector(AbstractFilter* filter, const QString& initializ
   ConvertOutputType conversionResult;
   std::vector<T> values(numComponents);
 
-  if(initializationValue.startsWith(CDA_LB) && initializationValue.endsWith(CDA_RB))
-  {
-    QString input = initializationValue;
-    input = input.replace('[', "");
-    input = input.replace(']', "");
-    QStringList tokens = input.split(CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
+  QStringList tokens = initializationValue.split(CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
 
-    for(int32_t i = 0; i < numComponents; i++)
+  for(int32_t i = 0; i < numComponents; i++)
+  {
+    int32_t idx = (tokens.size() == 1 ? 0 : i);
+    if(idx >= tokens.size())
     {
-      int32_t idx = (tokens.size() == 1 ? 0 : i);
-      conversionResult = convert_from<T>::convert(tokens[idx]);
-      if(conversionResult.second)
-      {
-        values[i] = conversionResult.first;
-      }
-      else
-      {
-        if(filter)
-        {
-          QString msg = QString("Input String '%1' could not be converted to a numeric value. ").arg(tokens[0]);
-          filter->setErrorCondition(-5400, msg);
-          values.clear();
-          return values;
-        }
-      }
+      values.clear();
+      return values;
     }
-  }
-  else
-  {
-    conversionResult = convert_from<T>::convert(initializationValue);
+    conversionResult = convert_from<T>::convert(tokens[idx]);
     if(conversionResult.second)
     {
-      values.assign(numComponents, conversionResult.first);
+      values[i] = conversionResult.first;
+    }
+    else
+    {
+      if(filter)
+      {
+        QString msg = QString("Input String '%1' could not be converted to a numeric value(s). ").arg(tokens[0]);
+        filter->setErrorCondition(-5400, msg);
+        values.clear();
+        return values;
+      }
     }
   }
   return values;
@@ -151,12 +140,13 @@ std::vector<T> createInitVector(AbstractFilter* filter, const QString& initializ
  * @param p The array that will be initialized
  */
 template <typename T>
-void initializeArrayWithInts(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const std::vector<T>& initValues)
+void initializeArrayWithInts(CreateDataArray* filter, IDataArray::Pointer outputArrayPtr, FPRangePair initializationRange)
 {
+  std::vector<T> initValues = CDA::createInitVector<T>(filter, filter->getInitializationValue(), filter->getNumberOfComponents());
   typename DataArray<T>::Pointer array = std::dynamic_pointer_cast<DataArray<T>>(outputArrayPtr);
   size_t numTuples = array->getNumberOfTuples();
 
-  if(initializationType == CreateDataArray::Manual)
+  if(filter->getInitializationType() == CreateDataArray::Manual)
   {
     for(size_t t = 0; t < numTuples; t++)
     {
@@ -189,12 +179,13 @@ void initializeArrayWithInts(IDataArray::Pointer outputArrayPtr, int initializat
  * unexpected results when passing anything other than an integer as a template parameter.
  * @param p The array that will be initialized
  */
-void initializeArrayWithBool(IDataArray::Pointer outputArrayPtr, int initializationType, const std::vector<bool>& initValues)
+void initializeArrayWithBool(CreateDataArray* filter, IDataArray::Pointer outputArrayPtr)
 {
+  std::vector<bool> initValues = CDA::createInitVector<bool>(filter, filter->getInitializationValue(), filter->getNumberOfComponents());
   DataArray<bool>::Pointer array = std::dynamic_pointer_cast<DataArray<bool>>(outputArrayPtr);
   size_t numTuples = array->getNumberOfTuples();
   int32_t numComp = array->getNumberOfComponents();
-  if(initializationType == CreateDataArray::Manual)
+  if(filter->getInitializationType() == CreateDataArray::Manual)
   {
     for(size_t t = 0; t < numTuples; t++)
     {
@@ -236,12 +227,14 @@ void initializeArrayWithBool(IDataArray::Pointer outputArrayPtr, int initializat
  * @param p The array that will be initialized
  */
 template <typename T>
-void initializeArrayWithReals(IDataArray::Pointer outputArrayPtr, int initializationType, FPRangePair initializationRange, const std::vector<T>& initValues)
+void initializeArrayWithReals(CreateDataArray* filter, IDataArray::Pointer outputArrayPtr, FPRangePair initializationRange)
 {
+  std::vector<T> initValues = CDA::createInitVector<T>(filter, filter->getInitializationValue(), filter->getNumberOfComponents());
+
   typename DataArray<T>::Pointer array = std::dynamic_pointer_cast<DataArray<T>>(outputArrayPtr);
   size_t numTuples = array->getNumberOfTuples();
 
-  if(initializationType == CreateDataArray::Manual)
+  if(filter->getInitializationType() == CreateDataArray::Manual)
   {
     for(size_t t = 0; t < numTuples; t++)
     {
@@ -383,18 +376,6 @@ void CreateDataArray::dataCheck()
     return;
   }
 
-  // Sanity check input string at this point for well formedness
-  // Check to see if we have multiple values
-  bool startsWithSqBracket = m_InitializationValue.trimmed().startsWith(CDA::CDA_LB);
-  bool endsWithSqBracket = m_InitializationValue.trimmed().endsWith(CDA::CDA_RB);
-  // If only 1 bracket appears that is bad.
-  if((!startsWithSqBracket && endsWithSqBracket) || (startsWithSqBracket && !endsWithSqBracket))
-  {
-    QString ss = QString("Init string is not valid. Starting or ending square brackets are missing.");
-    setErrorCondition(-5458, ss);
-    return;
-  }
-
   // Create the data array and initialize it to a placeholder value
   m_OutputArrayPtr = TemplateHelpers::CreateNonPrereqArrayFromTypeEnum()(this, getNewArray(), cDims, static_cast<int>(getScalarType()), 0, DataArrayID);
 
@@ -461,58 +442,47 @@ void CreateDataArray::execute()
 
   if(m_ScalarType == SIMPL::ScalarTypes::Type::Int8)
   {
-    std::vector<int8_t> values = CDA::createInitVector<int8_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<int8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<int8_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int16)
   {
-    std::vector<int16_t> values = CDA::createInitVector<int16_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<int16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<int16_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int32)
   {
-    std::vector<int32_t> values = CDA::createInitVector<int32_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<int32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<int32_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Int64)
   {
-    std::vector<int64_t> values = CDA::createInitVector<int64_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<int64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<int64_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt8)
   {
-    std::vector<uint8_t> values = CDA::createInitVector<uint8_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<uint8_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<uint8_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt16)
   {
-    std::vector<uint16_t> values = CDA::createInitVector<uint16_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<uint16_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<uint16_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt32)
   {
-    std::vector<uint32_t> values = CDA::createInitVector<uint32_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<uint32_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<uint32_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::UInt64)
   {
-    std::vector<uint64_t> values = CDA::createInitVector<uint64_t>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithInts<uint64_t>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithInts<uint64_t>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Float)
   {
-    std::vector<float> values = CDA::createInitVector<float>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithReals<float>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithReals<float>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Double)
   {
-    std::vector<double> values = CDA::createInitVector<double>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithReals<double>(m_OutputArrayPtr.lock(), m_InitializationType, m_InitializationRange, values);
+    CDA::initializeArrayWithReals<double>(this, m_OutputArrayPtr.lock(), m_InitializationRange);
   }
   else if(m_ScalarType == SIMPL::ScalarTypes::Type::Bool)
   {
-    std::vector<bool> values = CDA::createInitVector<bool>(this, m_InitializationValue, m_NumberOfComponents);
-    CDA::initializeArrayWithBool(m_OutputArrayPtr.lock(), m_InitializationType, values);
+    CDA::initializeArrayWithBool(this, m_OutputArrayPtr.lock());
   }
 }
 
@@ -524,42 +494,26 @@ void CreateDataArray::checkInitialization(QString dataArrayName)
 {
   if(m_InitializationType == Manual)
   {
-    // Check to see if we have multiple values
-    bool startsWithSqBracket = m_InitializationValue.trimmed().startsWith(CDA::CDA_LB);
-    bool endsWithSqBracket = m_InitializationValue.trimmed().endsWith(CDA::CDA_RB);
-
-    // If there are no brackets then the string should be able to be converted to a number.
-    if(!startsWithSqBracket && !endsWithSqBracket)
+    // This next part will just ignore the return as we are looking for the ability to actually convert all the inputs
+    // into valid numbers. The method will report through the filter if there were errors attempting this conversion
+    std::vector<T> initValues = CDA::createInitVector<T>(this, m_InitializationValue, m_NumberOfComponents);
+    if(getErrorCode() < 0)
     {
-      QString input = m_InitializationValue.trimmed();
-      CDA::convert_from<T> convertor;
-      std::pair<T, bool> conversionResult = convertor.convert(input);
-      if(!conversionResult.second)
-      {
-        QString ss =
-            QString("Init string cannot be converted to a number. If this is a multicomponent surround the string with square brackets [ ] or check the range of the type you are trying to convert.");
-        setErrorCondition(-5457, ss);
-      }
       return;
     }
+    bool ok = false;
+    if((initValues.size() == 1 && getNumberOfComponents() == 1) || (initValues.size() == 1 && getNumberOfComponents() > 1) || (initValues.size() == getNumberOfComponents()))
+    {
+      ok = true;
+    }
 
-    if(startsWithSqBracket && endsWithSqBracket)
+    if(!ok)
     {
-      QString input = m_InitializationValue.trimmed();
-      input = input.replace('[', "");
-      input = input.replace(']', "");
-      QStringList tokens = input.split(CDA::CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
-      if(m_NumberOfComponents != tokens.size() && tokens.size() != 1)
-      {
-        QString ss = QString("Number of initialization components does not match number of components.%1 vs %2").arg(tokens.size()).arg(m_NumberOfComponents);
-        setErrorCondition(-5459, ss);
-        return;
-      }
-      // This next part will just ignore the return as we are looking for the ability to actually convert all the inputs
-      // into valid numbers. The method will report through the filter if there were errors attempting this conversion
-      std::ignore = CDA::createInitVector<T>(this, m_InitializationValue, m_NumberOfComponents);
+      QString ss("Number of init values does not match number of components or number of init values not equal to 1");
+      setErrorCondition(-5548, ss);
       return;
     }
+    return;
   }
   else if(m_InitializationType == RandomWithRange)
   {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 5498e09801..83429a80a6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -129,42 +129,28 @@ class CreateDataArrayTest
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->setNumberOfComponents(k_NumComponents);
-    filter->setInitializationValue("[2;3;4");
-    filter->preflight();
-    err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5458);
-
-    dca = CreateDataContainerArray();
-    filter->setDataContainerArray(dca);
-    filter->setInitializationValue("2;3;4]");
-    filter->preflight();
-    err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5458);
-
-    dca = CreateDataContainerArray();
-    filter->setDataContainerArray(dca);
     filter->setInitializationValue("2;3;4");
     filter->preflight();
     err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5457);
+    DREAM3D_REQUIRE_EQUAL(err, 0);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[2;4]");
+    filter->setInitializationValue("2;4");
     filter->preflight();
     err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5459);
+    DREAM3D_REQUIRE_EQUAL(err, -5548);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
     filter->setInitializationValue("2;3;hfi4");
     filter->preflight();
     err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5457);
+    DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[2;3;hfi4]");
+    filter->setInitializationValue("2;3;hfi4");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
@@ -191,21 +177,21 @@ class CreateDataArrayTest
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->setInitializationValue("65.333;78.666;88.432347");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[-65;78;88]");
+    filter->setInitializationValue("-65;78;88");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65;78;88]");
+    filter->setInitializationValue("65;78;88");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
@@ -243,14 +229,14 @@ class CreateDataArrayTest
     // Now try with muliple components but a single value in the string
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[-65]");
+    filter->setInitializationValue("-65");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65]");
+    filter->setInitializationValue("65");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
@@ -291,13 +277,6 @@ class CreateDataArrayTest
     filter->setInitializationValue("-65");
     filter->preflight();
     err = filter->getErrorCode();
-    DREAM3D_REQUIRE_EQUAL(err, -5457);
-
-    dca = CreateDataContainerArray();
-    filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[-65]");
-    filter->preflight();
-    err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
@@ -359,14 +338,14 @@ class CreateDataArrayTest
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->setInitializationValue("65.333;78.666;88.432347");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, -5400);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[-65;78;88]");
+    filter->setInitializationValue("-65;78;88");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
@@ -404,7 +383,7 @@ class CreateDataArrayTest
     // Now try with muliple components but a single value in the string
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[-65]");
+    filter->setInitializationValue("-65");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
@@ -499,14 +478,14 @@ class CreateDataArrayTest
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65.333;78.666;88.432347]");
+    filter->setInitializationValue("65.333;78.666;88.432347");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
 
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65;78;88]");
+    filter->setInitializationValue("65;78;88");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
@@ -544,7 +523,7 @@ class CreateDataArrayTest
     // Now try with muliple components but a single value in the string
     dca = CreateDataContainerArray();
     filter->setDataContainerArray(dca);
-    filter->setInitializationValue("[65]");
+    filter->setInitializationValue("65");
     filter->preflight();
     err = filter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(err, 0);
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
index 8bef29c6f1..e270c20ebf 100755
--- a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/CreateDataArray.md
@@ -10,13 +10,13 @@ This **Filter** creates an **Attribute Array** of any primitive type with any nu
 
 When initializing a multicomponent array square bracket notation can be used to specify different initialization values for each component. For example say that I want to intialize a 2 component array where the first component is 0 and the second component is 1 we would use the following input string for the *Initialization Value*
 
-    [0;1]
+    0;1
 
 We are using semicolons instead of commas or decimal points due to different international standards (European versus United States?).
 
 Another example is if you want to create a floating point array where each tuple has 10 components but you just want the value of 2.5 to be used for each, then simply use:
 
-    [2.5] or 2.5
+    2.5
 
 ### Scalar Type Values ###
 

From 7053d5de0f1a6cf7c2d1d00abd2f52d51767fadd Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 15 May 2020 15:18:52 -0400
Subject: [PATCH 223/397] Moved all generated Python files to Bin

* Made PYTHON_EXECUTABLE visible as non-advanced variable
* Added more detailed error message when ANACONDA_DIR and
ANACONDA_ENVIRONMENT_NAME are not set
* Added caching of ANACONDA_DIR and ANACONDA_ENVIRONMENT_NAME as
NOTFOUND variables to be more obvious when they are not set
* Added summary text to SIMPL_CONDA_EXECUTABLE and made it an
advanced variable
* Added echo statements for various variables in anaconda_test.bat
like in anaconda_test.sh

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                | 42 ++++++++++++++-----
 .../Python/Binding/CreatePybind11Module.cmake | 13 +++---
 Wrapping/Python/Binding/anaconda_test.bat     | 11 +++++
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 320797e4e5..bdc7b56dba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -470,20 +470,29 @@ option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
 if(SIMPL_ENABLE_PYTHON)
   option(SIMPL_USE_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
 
-  if(SIMPL_USE_ANACONDA_PYTHON)
-    if(NOT ANACONDA_DIR)
-      message(FATAL_ERROR "ANACONDA_DIR is not set.")
-    endif()
+  mark_as_advanced(CLEAR PYTHON_EXECUTABLE)
 
-    if(NOT ANACONDA_ENVIRONMENT_NAME)
-      message(FATAL_ERROR "ANACONDA_ENVIRONMENT_NAME is not set.")
+  if(SIMPL_USE_ANACONDA_PYTHON)
+    if(NOT ANACONDA_DIR OR NOT ANACONDA_ENVIRONMENT_NAME)
+      set(ANACONDA_DIR "ANACONDA_DIR-NOTFOUND" CACHE PATH "Path to Anaconda directory")
+      set(ANACONDA_ENVIRONMENT_NAME "ANACONDA_ENVIRONMENT_NAME-NOTFOUND" CACHE STRING "Anaconda virtual environment to use")
+      set(ANACONDA_ERROR_MESSAGE "ANACONDA_DIR = ${ANACONDA_DIR}\nANACONDA_ENVIRONMENT_NAME = ${ANACONDA_ENVIRONMENT_NAME}\n")
+      if(NOT ANACONDA_DIR)
+        string(APPEND ANACONDA_ERROR_MESSAGE "ANACONDA_DIR is not set.\n")
+      endif()
+      if(NOT ANACONDA_ENVIRONMENT_NAME)
+        string(APPEND ANACONDA_ERROR_MESSAGE "ANACONDA_ENVIRONMENT_NAME is not set.\n")
+      endif()
+      message(FATAL_ERROR ${ANACONDA_ERROR_MESSAGE})
     endif()
 
     if(WIN32)
-      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda.bat CACHE FILEPATH "")
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda.bat CACHE FILEPATH "Path to conda executable")
     else()
-      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda CACHE FILEPATH "")
+      set(SIMPL_CONDA_EXECUTABLE ${ANACONDA_DIR}/condabin/conda CACHE FILEPATH "Path to conda executable")
     endif()
+
+    mark_as_advanced(SIMPL_CONDA_EXECUTABLE)
   endif()
 
   include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/CreatePybind11Module.cmake)
@@ -494,17 +503,30 @@ if(SIMPL_ENABLE_PYTHON)
 
   file(WRITE ${SIMPL_PY_SOURCES_FILE} "${SIMPL_PY_SOURCES}")
 
+  get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
   CreatePybind11Module(MODULE_NAME "simpl"
     OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
     FILE_LIST_PATH ${SIMPL_PY_SOURCES_FILE}
     SOURCE_DIR "${SIMPLProj_SOURCE_DIR}/Source"
     HEADER_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLHeader.cpp"
     BODY_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBody.cpp"
-    PYTHON_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
+    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
     LINK_LIBRARIES SIMPLib
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
   )
 
+  add_custom_target(CopyPythonSupport ALL
+    COMMAND ${CMAKE_COMMAND} -E copy
+      ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers.py
+      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
+    COMMENT "Copying simpl_helpers.py to binary directory"
+  )
+
+  add_dependencies(simpl CopyPythonSupport)
+
+  set_property(TARGET CopyPythonSupport PROPERTY FOLDER "ZZ_COPY_FILES")
+
   if(SIMPL_BUILD_TESTING)
     file(READ ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_test_dirs.in.py SIMPL_TEST_DIRS_FILE)
 
@@ -513,7 +535,7 @@ if(SIMPL_ENABLE_PYTHON)
     string(REPLACE "\${DREAM3D_DATA_DIR}" ${DREAM3D_DATA_DIR} SIMPL_TEST_DIRS_FILE ${SIMPL_TEST_DIRS_FILE})
 
     file(GENERATE
-      OUTPUT ${SIMPLProj_BINARY_DIR}/Wrapping/dream3d/$<CONFIG>/simpl_test_dirs.py
+      OUTPUT "$<TARGET_FILE_DIR:simpl>/simpl_test_dirs.py"
       CONTENT ${SIMPL_TEST_DIRS_FILE}
     )
 
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index fdebffcc4a..14fea0c915 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -68,7 +68,6 @@ function(CreatePybind11Module)
   set(PYTHON_UNIT_TEST_FILE ${ARGS_PYTHON_OUTPUT_DIR}/${ARGS_MODULE_NAME}_UnitTest.py)
 
   file(MAKE_DIRECTORY ${ARGS_OUTPUT_DIR})
-  file(MAKE_DIRECTORY ${ARGS_PYTHON_OUTPUT_DIR})
 
   set(PY_GENERATOR ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/generate_python_bindings.py)
 
@@ -89,6 +88,11 @@ function(CreatePybind11Module)
 
   set_property(TARGET ${CREATE_PYTHON_BINDINGS_TARGET} PROPERTY FOLDER "Python/Generator")
 
+  add_custom_command(TARGET ${CREATE_PYTHON_BINDINGS_TARGET}
+    PRE_BUILD
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${ARGS_PYTHON_OUTPUT_DIR}
+  )
+
   pybind11_add_module(${ARGS_MODULE_NAME}
     ${PYTHON_MODULE_SOURCE_FILE}
   )
@@ -130,12 +134,14 @@ function(CreatePybind11Plugin)
 
   string(TOLOWER ${ARGS_PLUGIN_NAME} PLUGIN_NAME_lower)
 
+  get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
   CreatePybind11Module(MODULE_NAME ${PLUGIN_NAME_lower}
     OUTPUT_DIR "${${ARGS_PLUGIN_NAME}_BINARY_DIR}/Wrapping/PythonCore"
     FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/${ARGS_PLUGIN_NAME}PublicFilters.txt"
     SOURCE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/${ARGS_PLUGIN_NAME}Filters"
     INCLUDE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}"
-    PYTHON_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
+    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
     HEADER_PATH ${ARGS_HEADER_PATH}
     BODY_PATH ${ARGS_BODY_PATH}
     LINK_LIBRARIES ${ARGS_PLUGIN_TARGET}
@@ -152,9 +158,6 @@ function(CreatePythonTests)
 
   set(TESTS_PYTHONPATH
     "$<TARGET_FILE_DIR:simpl>"
-    "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL"
-    "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d"
-    "${SIMPLProj_BINARY_DIR}/Wrapping/dream3d/$<CONFIG>"
   )
 
   foreach(test ${ARGS_TEST_NAMES})
diff --git a/Wrapping/Python/Binding/anaconda_test.bat b/Wrapping/Python/Binding/anaconda_test.bat
index c7cc92572e..87044ce86c 100644
--- a/Wrapping/Python/Binding/anaconda_test.bat
+++ b/Wrapping/Python/Binding/anaconda_test.bat
@@ -1,5 +1,16 @@
 @echo off
 
+echo "SIMPL_CONDA_EXECUTABLE: %SIMPL_CONDA_EXECUTABLE%"
+echo "SIMPL_CONDA_ENV: %SIMPL_CONDA_ENV%"
+echo "PYTHON_TEST_FILE: %PYTHON_TEST_FILE%"
+echo "PYTHONPATH: %PYTHONPATH%"
+
 CALL "%SIMPL_CONDA_EXECUTABLE%" activate "%SIMPL_CONDA_ENV%"
 
+echo "PATH: %PATH%"
+echo "Where is Python: "
+where python
+echo "Python Version: "
+python --version
+
 python "%PYTHON_TEST_FILE%"

From e380877d3fdb12a1ef77e94e072654832bd0a446 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 19 May 2020 22:12:26 -0400
Subject: [PATCH 224/397] Add clang pragma to quiet ITK compiler warning

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 11 ++++++++-
 .../itkDream3DTransformContainerTestHelper.h  | 21 ++++++++++++----
 Source/SIMPLib/ITK/itkBridge.h                | 24 ++++++++++++++-----
 Source/SIMPLib/ITK/itkImageReaderHelper.h     | 17 ++++++++++---
 Source/SIMPLib/ITK/itkSupportConstants.h      |  8 +++----
 5 files changed, 62 insertions(+), 19 deletions(-)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index e710687d38..e2dd0a80d6 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -77,10 +77,13 @@
 #pragma once
 
 #include <itkConfigure.h>
-
 #if(ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1)
 #include <itkCommonEnums.h>
 #else
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
 #include <itkImageIOBase.h>
 #endif
 
@@ -534,3 +537,9 @@
       setErrorCondition(errorCondition, "Array not found");                                                                                                                                            \
     }                                                                                                                                                                                                  \
   }
+
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
index 0c3a58c954..8ce1c75734 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
@@ -31,15 +31,22 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#ifndef itkDream3DTransforContainerTestHelper_h
-#define itkDream3DTransforContainerTestHelper_h
+#pragma once
 
-#include "itkAffineTransform.h"
-#include "itkCompositeTransform.h"
 
 #include "SIMPLib/Geometry/CompositeTransformContainer.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
 
+#include <itkConfigure.h>
+#if(ITK_VERSION_MAJOR == 4) 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
+#include "itkAffineTransform.h"
+#include "itkCompositeTransform.h"
+
 using AffineType = itk::AffineTransform<float, 3>;
 using CompositeTransform = itk::CompositeTransform<float, 3>;
 
@@ -102,4 +109,8 @@ typename TransformContainer::Pointer GetTransformContainerFromITKAffineTransform
   return transformContainer;
 }
 
-#endif
\ No newline at end of file
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 780f6f81db..faf13c98f2 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -35,13 +35,8 @@
 
 #pragma once
 
-// ITK Includes first
 #include <memory>
 
-#include "itkExtractImageFilter.h"
-#include "itkRGBAPixel.h"
-#include "itkRGBPixel.h"
-
 // DREAM3D Includes next
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
@@ -49,9 +44,21 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/SIMPLib.h"
 
-// Our Plugin Includes next
+
+#include <itkConfigure.h>
+#if(ITK_VERSION_MAJOR == 4) 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
 #include "SIMPLib/ITK/itkSupportConstants.h"
 
+// ITK Includes first
+#include "itkExtractImageFilter.h"
+#include "itkRGBAPixel.h"
+#include "itkRGBPixel.h"
+
 template <typename T, typename K, typename ItkOutPixelType>
 class Dream3DToItkImageConversion
 {
@@ -582,3 +589,8 @@ class ItkBridge
 
 //// Create some typedefs for our convenience
 typedef ItkBridge<ImageProcessingConstants::DefaultPixelType> ITKUtilitiesType;
+
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.h b/Source/SIMPLib/ITK/itkImageReaderHelper.h
index f8caf2a83c..5fdf106dd9 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.h
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.h
@@ -1,9 +1,14 @@
-/**
- *
- */
 
 #pragma once
 
+#include <itkConfigure.h>
+#if(ITK_VERSION_MAJOR == 4) 
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wself-assign-field"
+#endif
+#endif
+
 #include "itkImage.h"
 
 #define ITK_IMAGE_READER_HELPER_ImageDataArrayName()                                                                                                                                                   \
@@ -32,3 +37,9 @@ private:
                                                                                                                                                                                                        \
   template <typename TPixel, unsigned int dimensions>                                                                                                                                                  \
   void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
+
+
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
diff --git a/Source/SIMPLib/ITK/itkSupportConstants.h b/Source/SIMPLib/ITK/itkSupportConstants.h
index 6948c9b8ba..113409abc9 100644
--- a/Source/SIMPLib/ITK/itkSupportConstants.h
+++ b/Source/SIMPLib/ITK/itkSupportConstants.h
@@ -35,16 +35,16 @@
 
 #pragma once
 
+#include <QtCore/QString>
+
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
 #include "itkImage.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageToImageFilter.h"
 #include "itkImportImageFilter.h"
 #include "itkRGBPixel.h"
 
-#include <QtCore/QString>
-
-#include "SIMPLib/DataArrays/DataArray.hpp"
-
 #if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
 #define ITKv5_CONST
 #endif

From a49a0ba0a219ba3de5d0ca289693f7b300becce6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 20 May 2020 10:36:25 -0400
Subject: [PATCH 225/397] FORMAT: use quote style for SIMPLib includes since it
 is part of the project

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Math/ArrayHelpers.hpp                 | 2 +-
 Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Math/ArrayHelpers.hpp b/Source/SIMPLib/Math/ArrayHelpers.hpp
index 2c863075d4..b1bee05612 100644
--- a/Source/SIMPLib/Math/ArrayHelpers.hpp
+++ b/Source/SIMPLib/Math/ArrayHelpers.hpp
@@ -6,7 +6,7 @@
 #include <limits>
 #include <iomanip>
 
-#include <SIMPLib/Math/SIMPLibMath.h>
+#include "SIMPLib/Math/SIMPLibMath.h"
 
 /**
  * @brief ArrayHelpers: Some quick methods that act on an "array" of POD values.
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
index afcac9e045..b0361e0d0c 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
@@ -37,7 +37,7 @@
 
 #include <QtWidgets/QUndoCommand>
 
-#include <SIMPLib/Filtering/AbstractFilter.h>
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 

From 52af2dec24923166ca8cda704da428c57e1ae028 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 20 May 2020 13:30:24 -0400
Subject: [PATCH 226/397] Fixed missing include for latest MSVC

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLRange.cpp   | 2 ++
 Source/SIMPLib/Common/SIMPLRange2D.cpp | 2 ++
 Source/SIMPLib/Common/SIMPLRange3D.cpp | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/Source/SIMPLib/Common/SIMPLRange.cpp b/Source/SIMPLib/Common/SIMPLRange.cpp
index 88bbcb3d0a..711c824eef 100644
--- a/Source/SIMPLib/Common/SIMPLRange.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange.cpp
@@ -33,6 +33,8 @@
 
 #include "SIMPLib/Common/SIMPLRange.h"
 
+#include <stdexcept>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.cpp b/Source/SIMPLib/Common/SIMPLRange2D.cpp
index b2e0eb4ef1..003a36bd59 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange2D.cpp
@@ -33,6 +33,8 @@
 
 #include "SIMPLib/Common/SIMPLRange2D.h"
 
+#include <stdexcept>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.cpp b/Source/SIMPLib/Common/SIMPLRange3D.cpp
index 2753cede76..c709c161f8 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange3D.cpp
@@ -33,6 +33,8 @@
 
 #include "SIMPLib/Common/SIMPLRange3D.h"
 
+#include <stdexcept>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------

From 345ab21f5d57820f2b7ffd56f48e2ec371073c9f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 22 May 2020 08:20:12 -0400
Subject: [PATCH 227/397] Add utility function to determine if a file has the
 UTF8 BOM bytes (#403)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Utilities/SourceList.cmake |  1 +
 Source/SIMPLib/Utilities/UTFUtilities.hpp | 73 +++++++++++++++++++++++
 2 files changed, 74 insertions(+)
 create mode 100644 Source/SIMPLib/Utilities/UTFUtilities.hpp

diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index 116454d1f9..c67211fa2c 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -34,6 +34,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringOperations.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TimeUtilities.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ToolTipGenerator.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UTFUtilities.hpp
 )
 
 set(SIMPLib_Utilities_SRCS
diff --git a/Source/SIMPLib/Utilities/UTFUtilities.hpp b/Source/SIMPLib/Utilities/UTFUtilities.hpp
new file mode 100644
index 0000000000..ef8296f916
--- /dev/null
+++ b/Source/SIMPLib/Utilities/UTFUtilities.hpp
@@ -0,0 +1,73 @@
+/* ============================================================================
+ * Copyright (c) 2020 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <cstdio>
+#include <string>
+#include <tuple>
+#include <cstdint>
+#include <array>
+
+namespace UTFUtilities
+{
+
+/**
+ * @brief Determines if the file has the UTF8 BOM block of 3 bytes at the beginning of the file. This
+ * does NOT mean definitively that the file is UTF8, just that the UTF8 BOM bytes are the first 3 bytes of the
+ * file. If you know the file is a text file (and not some purely binary data file) then this method can be used
+ * to determine if thie file has the UTF8 BOM marker at the start.
+ * @param filePath The path to the file
+ * @return std::pair<bool, int32_t> where the first value is whether the BOM showed up and the second
+ * is an error code. 0 Denotes NO error where negative error values are errors.
+ */
+std::pair<bool, int32_t> IsUtf8(const std::string& filePath)
+{
+  FILE* f = fopen(filePath.c_str(), "rb");
+  if(nullptr == f)
+  {
+    return {false, -1};
+  }
+  std::array<uint8_t, 3> buf = {0, 0, 0};
+  if(fread(buf.data(), 1, 3, f) != 3)
+  {
+    std::ignore = fclose(f);
+    return {false, -1};
+  }
+  std::ignore = fclose(f);
+  if(buf[0] == 0xEF && buf[1] == 0xBB && buf[2] == 0xBF)
+  {
+    return {true, 0};
+  }
+  return {false, 0};
+}
+
+} // namespace UTFUtilities

From bccdee90d6889c50fda9e1cecc73def8d692f976 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 22 May 2020 13:35:42 -0400
Subject: [PATCH 228/397] Merge Documentation Updates from SIMPL PR #402

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   6 +-
 Source/SIMPLib/SIMPLibMacros.cmake            | 112 ++++++++++++++----
 .../SVWidgetsLib/QtSupport/QtSDocServer.cpp   |   2 +-
 .../QtSupport/QtSHelpUrlGenerator.cpp         |  29 +++--
 .../Python/Binding/CreatePybind11Module.cmake |  34 +++++-
 .../CodeScraper/PyBind11Generator.cpp         |   2 +-
 6 files changed, 140 insertions(+), 45 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 0e1154fd00..27bb28bba7 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -96,8 +96,7 @@ set_property(GLOBAL PROPERTY PluginNumFilters ${PluginNumFilters})
 foreach(f ${_PublicFilters} )
   ADD_SIMPL_FILTER(  "SIMPLib" "FilterWidgetsLib"
                         ${_filterGroupName} ${f}
-                        ${SIMPLib_FILTER_DOC_DIR}/${_filterGroupName}/${f}.md TRUE
-                        ${SIMPLProj_BINARY_DIR})
+                        ${SIMPLib_FILTER_DOC_DIR}/${_filterGroupName}/${f}.md TRUE)
 endforeach()
 
 
@@ -118,8 +117,7 @@ set(_PrivateFilters
 foreach(f ${_PrivateFilters} )
   ADD_SIMPL_FILTER(  "SIMPLib" "FilterWidgetsLib"
                         ${_filterGroupName} ${f}
-                        ${SIMPLib_FILTER_DOC_DIR}/${_filterGroupName}/${f}.md FALSE
-                        ${SIMPLProj_BINARY_DIR})
+                        ${SIMPLib_FILTER_DOC_DIR}/${_filterGroupName}/${f}.md FALSE)
 endforeach()
 
 source_group("${SIMPLib_SOURCE_DIR} ${_filterGroupName} util" FILES ${HEADERS} ${SOURCES})
diff --git a/Source/SIMPLib/SIMPLibMacros.cmake b/Source/SIMPLib/SIMPLibMacros.cmake
index 36134acd30..37b3220856 100755
--- a/Source/SIMPLib/SIMPLibMacros.cmake
+++ b/Source/SIMPLib/SIMPLibMacros.cmake
@@ -1,6 +1,15 @@
 #-------------------------------------------------------------------------------
 # Add Unit Test for Plugins and Filters
-# 
+#
+# @param USE_QTGUI
+# @param PLUGIN_NAME
+# @param TEST_DATA_DIR
+# @param SOURCES
+# @param LINK_LIBRARIES
+# @param INCLUDE_DIRS
+# @param EXTRA_SOURCES
+#
+#-------------------------------------------------------------------------------
 function(SIMPL_GenerateUnitTestFile)
   set(options USE_QTGUI)
   set(oneValueArgs PLUGIN_NAME TEST_DATA_DIR)
@@ -110,7 +119,10 @@ endfunction()
 
 #-------------------------------------------------------------------------------
 # SIMPL_ADD_UNIT_TEST
-# 
+#
+# @param TEST_NAMES
+# @param UNIT_TEST_SOURCE_DIR
+#-------------------------------------------------------------------------------
 macro(SIMPL_ADD_UNIT_TEST TEST_NAMES UNIT_TEST_SOURCE_DIR)
   foreach(name ${TEST_NAMES})
     set( ${SIMPL_UNIT_TEST}_TEST_SRCS
@@ -133,10 +145,11 @@ endmacro()
 
 #-------------------------------------------------------------------------------
 # SIMPL_ADD_UNIT_TEST_MOC_FILE
-# 
+#
+# @param SOURCE_FILE
+# @param UNIT_TEST_SOURCE_DIR
+#-------------------------------------------------------------------------------
 macro(SIMPL_ADD_UNIT_TEST_MOC_FILE SOURCE_FILE UNIT_TEST_SOURCE_DIR)
-
-  # QT5_WRAP_CPP( simpl_unit_test_moc ${UNIT_TEST_SOURCE_DIR}/${SOURCE_FILE}.cpp)
   set_source_files_properties( ${simpl_unit_test_moc} PROPERTIES GENERATED TRUE)
   set_source_files_properties( ${simpl_unit_test_moc} PROPERTIES HEADER_FILE_ONLY TRUE)
 
@@ -152,8 +165,8 @@ endmacro()
 # @param REGISTER_KNOWN_FILTERS_FILE
 # @param FILTER_GROUP
 # @param BINARY_DIR
+#-------------------------------------------------------------------------------
 function(SIMPL_START_FILTER_GROUP)
-
   set(options)
   set(oneValueArgs ALL_FILTERS_HEADERFILE REGISTER_KNOWN_FILTERS_FILE FILTER_GROUP BINARY_DIR)
   set(multiValueArgs)
@@ -174,7 +187,8 @@ function(SIMPL_START_FILTER_GROUP)
   if("${P_FILTER_GROUP}" STREQUAL "Core")
     set(P_FILTER_GROUP "SIMPLib")
   endif()
-  file(WRITE "${SIMPLProj_BINARY_DIR}/${P_FILTER_GROUP}PublicFilters.txt" "# ${P_FILTER_GROUP} Public Filters\n")
+  file(WRITE "${SIMPLProj_BINARY_DIR}/Documentation/${P_FILTER_GROUP}Filters.txt" "# ${P_FILTER_GROUP} Public Filters\n")
+  file(WRITE "${SIMPLProj_BINARY_DIR}/Wrapping/${P_FILTER_GROUP}Filters.txt" "# ${P_FILTER_GROUP} Python Filters\n")
 endfunction()
 
 #-------------------------------------------------------------------------------
@@ -182,11 +196,13 @@ endfunction()
 # @param WidgetsBinaryDir
 # @param filterGroup
 # @param humanGroup
+#-------------------------------------------------------------------------------
 macro(SIMPL_END_FILTER_GROUP WidgetsBinaryDir filterGroup humanGroup)
 endmacro()
 
 #-------------------------------------------------------------------------------
 # Macro ADD_SIMPL_SUPPORT_HEADER
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_SUPPORT_HEADER SourceDir filterGroup headerFileName)
     set(Project_SRCS ${Project_SRCS}
                     ${SourceDir}/${filterGroup}/${headerFileName})
@@ -195,20 +211,17 @@ endmacro()
 
 #-------------------------------------------------------------------------------
 # Macro ADD_SIMPL_SUPPORT_MOC_HEADER
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_SUPPORT_MOC_HEADER SourceDir filterGroup headerFileName)
-  # QT5_WRAP_CPP( _moc_filter_source  ${SourceDir}/${filterGroup}/${headerFileName})
-  # set_source_files_properties( ${_moc_filter_source} PROPERTIES GENERATED TRUE)
-  # set_source_files_properties( ${_moc_filter_source} PROPERTIES HEADER_FILE_ONLY TRUE)
-
   set(Project_SRCS ${Project_SRCS}
                     ${SourceDir}/${filterGroup}/${headerFileName}
-  #                  ${_moc_filter_source}
   )
   cmp_IDE_SOURCE_PROPERTIES( "${filterGroup}" "${SourceDir}/${filterGroup}/${headerFileName}" "" "0")
 endmacro()
 
 #-------------------------------------------------------------------------------
 # Macro ADD_SIMPL_SUPPORT_HEADER_SUBDIR
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_SUPPORT_HEADER_SUBDIR SourceDir filterGroup headerFileName subdir)
     set(Project_SRCS ${Project_SRCS}
                     ${SourceDir}/${filterGroup}/${subdir}/${headerFileName})
@@ -217,13 +230,16 @@ endmacro()
 
 #-------------------------------------------------------------------------------
 # Macro ADD_SIMPL_SUPPORT_SOURCE
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_SUPPORT_SOURCE SourceDir filterGroup sourceFileName)
     set(Project_SRCS ${Project_SRCS}
                     ${SourceDir}/${filterGroup}/${sourceFileName})
     cmp_IDE_SOURCE_PROPERTIES( "${filterGroup}" "" "${SourceDir}/${filterGroup}/${sourceFileName}" "0")
 endmacro()
+
 #-------------------------------------------------------------------------------
 # Macro ADD_SIMPL_SUPPORT_CLASS
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_SUPPORT_CLASS SourceDir filterGroup className)
     set(Project_SRCS ${Project_SRCS}
                     ${SourceDir}/${filterGroup}/${className}.h
@@ -240,9 +256,8 @@ endmacro()
 # @param filterName The base filename of the filter, i.e., SomeFilter.cpp would be "SomeFilter"
 # @param filterDocPath The absolute path to the .md documentation file
 # @param publicFilter  Boolean TRUE or FALSE
+#-------------------------------------------------------------------------------
 macro(ADD_SIMPL_FILTER FilterLib WidgetLib filterGroup filterName filterDocPath publicFilter)
-
-  # QT5_WRAP_CPP( _moc_filter_source  ${${FilterLib}_SOURCE_DIR}/${filterGroup}/${filterName}.h)
   set_source_files_properties( ${_moc_filter_source} PROPERTIES GENERATED TRUE)
   set_source_files_properties( ${_moc_filter_source} PROPERTIES HEADER_FILE_ONLY TRUE)
 
@@ -265,24 +280,75 @@ macro(ADD_SIMPL_FILTER FilterLib WidgetLib filterGroup filterName filterDocPath
   file(APPEND ${AllFiltersHeaderFile} "#include \"${FilterLib}/${filterGroup}/${filterName}.h\"\n")
 
   if( ${publicFilter} STREQUAL TRUE)
-      file(APPEND ${RegisterKnownFiltersFile} "   FilterFactory<${filterName}>::Pointer ${filterName}Factory = FilterFactory<${filterName}>::New();\n")
-      file(APPEND ${RegisterKnownFiltersFile} "   fm->addFilterFactory(\"${filterName}\",${filterName}Factory);\n\n")
+    file(APPEND ${RegisterKnownFiltersFile} "   FilterFactory<${filterName}>::Pointer ${filterName}Factory = FilterFactory<${filterName}>::New();\n")
+    file(APPEND ${RegisterKnownFiltersFile} "   fm->addFilterFactory(\"${filterName}\",${filterName}Factory);\n\n")
 
-      #-- Check to make sure we have a Documentation file for the filter
-      if(NOT EXISTS ${filterDocPath} )
-        message(FATAL_ERROR "*** Missing Documentation File for ${filterDocPath}")
-      endif()
+    #-- Check to make sure we have a Documentation file for the filter
+    if(NOT EXISTS ${filterDocPath} )
+      message(FATAL_ERROR "*** Missing Documentation File for ${filterDocPath}")
+    endif()
 
-      get_property(DREAM3DDocRoot GLOBAL PROPERTY DREAM3DDocRoot)
-      set_property(GLOBAL APPEND PROPERTY DREAM3DDoc_${filterGroup} ${filterDocPath})
+    get_property(DREAM3DDocRoot GLOBAL PROPERTY DREAM3DDocRoot)
+    set_property(GLOBAL APPEND PROPERTY DREAM3DDoc_${filterGroup} ${filterDocPath})
+    # This bit of code creates a text file that the Python Bindings Generator is going to read from. We have to
+    # special case the "Core" filters that are part of SIMPLib to get the file naming correct.
+    if("${filterGroup}" STREQUAL "CoreFilters")
+      file(APPEND "${SIMPLProj_BINARY_DIR}/Documentation/SIMPLibFilters.txt" "${filterName}.h\n")
+      file(APPEND "${SIMPLProj_BINARY_DIR}/Wrapping/SIMPLibFilters.txt" "${filterName}.h\n")
+    else()
+      file(APPEND "${SIMPLProj_BINARY_DIR}/Documentation/${filterGroup}.txt" "${filterName}.h\n")
+      file(APPEND "${SIMPLProj_BINARY_DIR}/Wrapping/${filterGroup}.txt" "${filterName}.h\n")
+    endif()    
   endif()
+endmacro()
+
+#-------------------------------------------------------------------------------
+# Macro ADD_SIMPL_FILTER_SUPERCLASS
+# @brief This macros is needed if the developer creates a C++ class that is a subclass
+# of AbstractFilter AND that filter is *never* intended to be instantiated through 
+# the user interface. If those conditions apply then this is the macro for you.
+#
+# *IF* you are simply subclassing from an existing filter then you do *not* need
+# to call this macro, instead just call the ADD_SIMPL_FILTER instaed.
+#
+#
+# @param FilterLib The basename of the compiled plugin library
+# @param WidgetLib The widget library 
+# @param filterGroup The group that the filter is in.
+# @param filterName The name of the filter
+#-------------------------------------------------------------------------------
+macro(ADD_SIMPL_SUPERCLASS_FILTER FilterLib WidgetLib filterGroup filterName)
+  set_source_files_properties( ${_moc_filter_source} PROPERTIES GENERATED TRUE)
+  set_source_files_properties( ${_moc_filter_source} PROPERTIES HEADER_FILE_ONLY TRUE)
+
+  set(Project_SRCS ${Project_SRCS}
+                  ${${FilterLib}_SOURCE_DIR}/${filterGroup}/${filterName}.h
+                  ${${FilterLib}_SOURCE_DIR}/${filterGroup}/${filterName}.cpp
+                  ${_moc_filter_source}
+                  )
+  #--- Organize inside the Visual Studio/Xcode Projects
+  cmp_IDE_SOURCE_PROPERTIES( "${filterGroup}" "${${FilterLib}_SOURCE_DIR}/${filterGroup}/${filterName}.h" "${${FilterLib}_SOURCE_DIR}/${filterGroup}/${filterName}.cpp" ${PROJECT_INSTALL_HEADERS})
+  cmp_IDE_GENERATED_PROPERTIES ( "Generated/${FilterLib}/${filterGroup}" "" "${_moc_filter_source}" "0")
+
+  file(APPEND ${AllFiltersHeaderFile} "#include \"${FilterLib}/${filterGroup}/${filterName}.h\"\n")
 
-  file(APPEND ${SIMPLProj_BINARY_DIR}/${FilterLib}PublicFilters.txt "${filterName}.h\n")
+  #file(APPEND ${RegisterKnownFiltersFile} "   FilterFactory<${filterName}>::Pointer ${filterName}Factory = FilterFactory<${filterName}>::New();\n")
+  #file(APPEND ${RegisterKnownFiltersFile} "   fm->addFilterFactory(\"${filterName}\",${filterName}Factory);\n\n")
+
+  # This bit of code creates a text file that the Python Bindings Generator is going to read from. We have to
+  # special case the "Core" filters that are part of SIMPLib to get the file naming correct.
+  if("${filterGroup}" STREQUAL "CoreFilters")
+    file(APPEND "${SIMPLProj_BINARY_DIR}/Wrapping/SIMPLibFilters.txt" "${filterName}.h\n")
+  else()
+    file(APPEND "${SIMPLProj_BINARY_DIR}/Wrapping/${filterGroup}.txt" "${filterName}.h\n")
+  endif()    
 
 endmacro()
 
+
 #-------------------------------------------------------------------------------
 # Macro ADD_FILTER_LIST
+#-------------------------------------------------------------------------------
 macro(ADD_FILTER_LIST)
 
   file(APPEND ${RegisterKnownFiltersFile} "    QList<QString> pluginList;\n\n")
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
index 010e4ca6ee..b374c8f94d 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
@@ -198,7 +198,7 @@ QUrl QtSDocServer::GenerateHTMLUrl(const QString& className)
     QString pluginName;
     if(factory)
     {
-      pluginName = "/Filters/" + factory->getCompiledLibraryName() + "Filters";
+      pluginName = "/Filters/" + factory->getCompiledLibraryName() + "_Filters";
     }
     s = s.append(pluginName).append("/").append(className).append("/index.html");
     return QUrl(s);
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
index 50434af72a..2d5bcb4e7c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
@@ -35,9 +35,14 @@
 
 #include "QtSHelpUrlGenerator.h"
 
+#include <iostream>
+
+#include <QtCore/QTextStream>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
+
 #include <QtGui/QDesktopServices>
+
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QWidget>
@@ -88,36 +93,30 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
   }
 #endif
 
-#ifdef SIMPL_USE_MKDOCS
-  {
     FilterManager* fm = FilterManager::Instance();
 
     IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
-    QString pluginName;
-    if(factory.get() != nullptr)
-    {
-      pluginName = "/Filters/" + factory->getCompiledLibraryName();
-    }
 
-    QString helpFilePath = QString("/%2%3Filters/%4/index.html").arg(helpDir.absolutePath()).arg(QCoreApplication::instance()->applicationName()).arg(pluginName).arg(htmlName);
+#ifdef SIMPL_USE_MKDOCS
+  {
+    QString helpFilePath;
+    QTextStream out(&helpFilePath);
+    out << helpDir.absolutePath() << "/"
+        << "Filters" << factory->getCompiledLibraryName() << "_Filters" << htmlName;
     QFileInfo fi(helpFilePath);
     if(!fi.exists())
     {
-      // The help file does not exist at the default location because we are probably running from Visual Studio or Xcode
-      // Try up one more directory
       helpDir.cdUp();
-      helpFilePath = QString("%1/Help/%2%3/%4/%4.html").arg(helpDir.absolutePath()).arg(QCoreApplication::instance()->applicationName()).arg(pluginName).arg(htmlName);
+      helpFilePath.clear();
+      out << helpDir.absolutePath() << "/"
+          << "Filters" << factory->getCompiledLibraryName() << "_Filters" << htmlName;
     }
-
     s = s + helpFilePath;
   }
 #endif
 
 #ifdef SIMPL_USE_DISCOUNT
   {
-    FilterManager* fm = FilterManager::Instance();
-
-    IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
     QString pluginName;
     if(factory.get())
     {
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 14fea0c915..6a597159d2 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -1,3 +1,10 @@
+
+#-------------------------------------------------------------------------------
+# @Brief function AddPythonTest
+# @ NAME
+# @ FILE
+# @ PYTHONPATH
+#-------------------------------------------------------------------------------
 function(AddPythonTest)
   set(options )
   set(oneValueArgs NAME FILE)
@@ -50,6 +57,17 @@ function(AddPythonTest)
   )
 endfunction()
 
+#-------------------------------------------------------------------------------
+# @Brief function CreatePybind11Module
+# @ MODULE_NAME
+# @ OUTPUT_DIR
+# @ FILE_LIST_PATH
+# @ SOURCE_DIR
+# @ HEADER_PATH
+# @ BODY_PATH
+# @ INCLUDE_DIR
+# @ PYTHON_OUTPUT_DIR
+#-------------------------------------------------------------------------------
 function(CreatePybind11Module)
   set(options PLUGIN)
   set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
@@ -126,6 +144,13 @@ function(CreatePybind11Module)
   )
 endfunction()
 
+#-------------------------------------------------------------------------------
+# @Brief function CreatePybind11Plugin
+# @ PLUGIN_NAME
+# @ PLUGIN_TARGET
+# @ HEADER_PATH
+# @ BODY_PATH
+#-------------------------------------------------------------------------------
 function(CreatePybind11Plugin)
   set(options)
   set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH)
@@ -138,7 +163,7 @@ function(CreatePybind11Plugin)
 
   CreatePybind11Module(MODULE_NAME ${PLUGIN_NAME_lower}
     OUTPUT_DIR "${${ARGS_PLUGIN_NAME}_BINARY_DIR}/Wrapping/PythonCore"
-    FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/${ARGS_PLUGIN_NAME}PublicFilters.txt"
+    FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/Wrapping/${ARGS_PLUGIN_NAME}Filters.txt"
     SOURCE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/${ARGS_PLUGIN_NAME}Filters"
     INCLUDE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}"
     PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
@@ -150,6 +175,13 @@ function(CreatePybind11Plugin)
   )
 endfunction()
 
+
+#-------------------------------------------------------------------------------
+# @Brief function CreatePythonTests
+# @ PREFIX
+# @ INPUT_DIR
+# @ TEST_NAMES
+#-------------------------------------------------------------------------------
 function(CreatePythonTests)
   set(options)
   set(oneValueArgs PREFIX INPUT_DIR)
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index 80d7b56c7e..d504e7faf4 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -43,7 +43,7 @@ void PyBind11Generator::readFilterList()
   {
     libName = QString("SIMPLib");
   }
-  QString listFilePath = SIMPL::PyBind11::SIMPLProjBinaryDir + "/" + libName + "PublicFilters.txt";
+  QString listFilePath = SIMPL::PyBind11::SIMPLProjBinaryDir + "/" + libName + "Filters.txt";
   QFileInfo listFileInfo(listFilePath);
   if(!listFileInfo.exists())
   {

From 693072088689cedee1d4af2368b96e8b2035e476 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 20 May 2020 21:00:25 -0400
Subject: [PATCH 229/397] Fixed MSVC warning about old C style struct typedef
 definitions

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Testing/Cxx/StructArrayTest.cpp           |  4 +-
 .../DataArrayCreationFilterParameter.h        |  4 +-
 .../FourthOrderPolynomialFilterParameter.h    | 59 +++++++------------
 ...iAttributeMatrixSelectionFilterParameter.h |  4 +-
 .../MultiDataArraySelectionFilterParameter.h  |  4 +-
 .../SecondOrderPolynomialFilterParameter.h    | 22 +++----
 .../FilterParameters/ThirdOrderPolynomial.h   | 28 ++++-----
 Source/SIMPLib/Filtering/ComparisonInputs.h   | 12 ++--
 Source/SIMPLib/Geometry/MeshStructs.h         | 32 +++++-----
 Source/SVWidgetsLib/Dialogs/UpdateCheck.h     |  4 +-
 10 files changed, 77 insertions(+), 96 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index c90143ba23..7ded1befad 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -87,10 +87,10 @@ class StructArrayTest
   }
   virtual ~StructArrayTest() = default;
 
-  typedef struct
+  struct Vec3Int_t
   {
     uint32_t pos[3];
-  } Vec3Int_t;
+  };
 
   typedef StructArray<Vec3Int_t> Vec3IntList_t;
   typedef Vec3IntList_t::Pointer Vec3IntListPointer_t;
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index fd20eaab4f..cc4bb41e55 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -90,11 +90,11 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  typedef struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
-  } RequirementType;
+  };
 
   /**
    * @brief New This function instantiates an instance of the DataArrayCreationFilterParameter.  Specifying a RequirementType will
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 82821ee911..712f9e90af 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -41,44 +41,25 @@
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
-typedef struct
+struct Float4thOrderPoly_t
 {
-  float c40;
-  float c04;
-  float c31;
-  float c13;
-  float c22;
-  float c30;
-  float c03;
-  float c21;
-  float c12;
-  float c20;
-  float c02;
-  float c11;
-  float c10;
-  float c01;
-  float c00;
-
-  void Float4thOrderPoly(float C40, float C04, float C31, float C13, float C22, float C30, float C03, float C21, float C12, float C20, float C02, float C11, float C10, float C01, float C00)
-  {
-    c40 = C40;
-    c04 = C04;
-    c31 = C31;
-    c13 = C13;
-    c22 = C22;
-    c30 = C30;
-    c03 = C03;
-    c21 = C21;
-    c12 = C12;
-    c20 = C20;
-    c02 = C02;
-    c11 = C11;
-    c10 = C10;
-    c01 = C01;
-    c00 = C00;
-  }
-
-  void writeJson(QJsonObject& json)
+  float c40 = 0.0f;
+  float c04 = 0.0f;
+  float c31 = 0.0f;
+  float c13 = 0.0f;
+  float c22 = 0.0f;
+  float c30 = 0.0f;
+  float c03 = 0.0f;
+  float c21 = 0.0f;
+  float c12 = 0.0f;
+  float c20 = 0.0f;
+  float c02 = 0.0f;
+  float c11 = 0.0f;
+  float c10 = 0.0f;
+  float c01 = 0.0f;
+  float c00 = 0.0f;
+
+  void writeJson(QJsonObject& json) const
   {
     json["c40"] = static_cast<double>(c40);
     json["c04"] = static_cast<double>(c04);
@@ -97,7 +78,7 @@ typedef struct
     json["c00"] = static_cast<double>(c00);
   }
 
-  bool readJson(QJsonObject& json)
+  bool readJson(const QJsonObject& json)
   {
     if(json["c40"].isDouble() && json["c04"].isDouble() && json["c31"].isDouble() && json["c13"].isDouble() && json["c22"].isDouble() && json["c30"].isDouble() && json["c03"].isDouble() &&
        json["c21"].isDouble() && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() &&
@@ -122,7 +103,7 @@ typedef struct
     }
     return false;
   }
-} Float4thOrderPoly_t;
+};
 
 Q_DECLARE_METATYPE(Float4thOrderPoly_t)
 
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 96210f559b..3faa94687e 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -88,13 +88,13 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
   typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
 
-  typedef struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
     QVector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
-  } RequirementType;
+  };
 
   /**
    * @brief New This function instantiates an instance of the MultiAttributeMatrixSelectionFilterParameter.  Specifying a RequirementType will
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index bfd2ba2e00..61a1d0811b 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -88,13 +88,13 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
   typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
 
-  typedef struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
     QVector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
-  } RequirementType;
+  };
 
   /**
    * @brief New This function instantiates an instance of the MultiDataArraySelectionFilterParameter.  Specifying a RequirementType will
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index 1c4c82e4b0..e0d43ba7f6 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -41,16 +41,16 @@
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
-typedef struct
+struct Float2ndOrderPoly_t
 {
-  float c20;
-  float c02;
-  float c11;
-  float c10;
-  float c01;
-  float c00;
-
-  void writeJson(QJsonObject& json)
+  float c20 = 0.0f;
+  float c02 = 0.0f;
+  float c11 = 0.0f;
+  float c10 = 0.0f;
+  float c01 = 0.0f;
+  float c00 = 0.0f;
+
+  void writeJson(QJsonObject& json) const
   {
     json["c20"] = c20;
     json["c02"] = c02;
@@ -60,7 +60,7 @@ typedef struct
     json["c00"] = c00;
   }
 
-  bool readJson(QJsonObject& json)
+  bool readJson(const QJsonObject& json)
   {
     if(json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
     {
@@ -74,7 +74,7 @@ typedef struct
     }
     return false;
   }
-} Float2ndOrderPoly_t;
+};
 
 Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
 
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomial.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomial.h
index 0985e413a6..762856ed53 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomial.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomial.h
@@ -31,20 +31,20 @@
 
 #include <QtCore/QJsonObject>
 
-typedef struct
+struct Float3rdOrderPoly_t
 {
-  float c30;
-  float c03;
-  float c21;
-  float c12;
-  float c20;
-  float c02;
-  float c11;
-  float c10;
-  float c01;
-  float c00;
+  float c30 = 0.0f;
+  float c03 = 0.0f;
+  float c21 = 0.0f;
+  float c12 = 0.0f;
+  float c20 = 0.0f;
+  float c02 = 0.0f;
+  float c11 = 0.0f;
+  float c10 = 0.0f;
+  float c01 = 0.0f;
+  float c00 = 0.0f;
 
-  void writeJson(QJsonObject& json)
+  void writeJson(QJsonObject& json) const
   {
     json["c30"] = c30;
     json["c03"] = c03;
@@ -58,7 +58,7 @@ typedef struct
     json["c00"] = c00;
   }
 
-  bool readJson(QJsonObject& json)
+  bool readJson(const QJsonObject& json)
   {
     if(json["c30"].isDouble() && json["c03"].isDouble() && json["c21"].isDouble() && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() &&
        json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
@@ -77,6 +77,6 @@ typedef struct
     }
     return false;
   }
-} Float3rdOrderPoly_t;
+};
 
 Q_DECLARE_METATYPE(Float3rdOrderPoly_t)
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index 384300889a..330445af10 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -41,7 +41,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 
-typedef struct
+struct ComparisonInput_t
 {
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ComparisonInput_t)
@@ -56,10 +56,10 @@ typedef struct
   QString dataContainerName;
   QString attributeMatrixName;
   QString attributeArrayName;
-  int compOperator;
-  double compValue;
+  int compOperator = 0;
+  double compValue = 0.0;
 
-  void writeJson(QJsonObject& json)
+  void writeJson(QJsonObject& json) const
   {
     json["Data Container Name"] = dataContainerName;
     json["Attribute Matrix Name"] = attributeMatrixName;
@@ -68,7 +68,7 @@ typedef struct
     json["Comparison Value"] = compValue;
   }
 
-  bool readJson(QJsonObject& json)
+  bool readJson(const QJsonObject& json)
   {
     if(json["Data Container Name"].isString() && json["Attribute Matrix Name"].isString() && json["Attribute Array Name"].isString() && json["Comparison Operator"].isDouble() &&
        json["Comparison Value"].isDouble())
@@ -83,7 +83,7 @@ typedef struct
     return false;
   }
 
-} ComparisonInput_t;
+};
 
 /**
  * @class ComparisonInputs ComparisonInputs.h DREAM3DLib/Common/ComparisonInputs.h
diff --git a/Source/SIMPLib/Geometry/MeshStructs.h b/Source/SIMPLib/Geometry/MeshStructs.h
index d46e52bed8..18f220c5f0 100644
--- a/Source/SIMPLib/Geometry/MeshStructs.h
+++ b/Source/SIMPLib/Geometry/MeshStructs.h
@@ -45,47 +45,47 @@ namespace SurfaceMesh
 {
 namespace M3C
 {
-typedef struct
+struct VoxelCoord
 {
   float coord[3];
-} VoxelCoord;
+};
 
-typedef struct
+struct Neighbor
 {
   int neigh_id[num_neigh + 1];
-} Neighbor;
+};
 
-typedef struct
+struct Face
 {
   int64_t site_id[4]; // stores 4 sites at the corners of each square...
   int64_t edge_id[4]; // stores edge id turned on...others will have dummy -1...
   int nEdge;          // number of edges on the square...
   int FCnode;         // face center node...if not, it's -1...
   int effect;         // 0 if the square is useless; 1 is good...
-} Face;
+};
 
-typedef struct
+struct Segment
 {
   int64_t node_id[2]; // the segment heads from node_id[0] to node_id[1]...
   int edgeKind;       // initially marked as 2; for face edges it's always 2...
   int nSpin[2];       // 0 is to the left of the arrow; 1 is at right...
-} Segment;
+};
 
 /* Used for "inner edge" spin calculations */
-typedef struct
+struct ISegment
 {
   int64_t node_id[2]; // the segment heads from node_id[0] to node_id[1]...
   int edgeKind;       // initially marked with 2...
   int nSpin[4];
-} ISegment;
+};
 
-typedef struct
+struct Triangle
 {
   int64_t node_id[3]; // stores three new node id for vertices of the triangles...
   uint64_t e_id[3];   // stores three new edge id for sides of the triangles...
   int nSpin[2];       // two spins...
   int edgePlace[3];
-} Triangle;
+};
 
 typedef Triangle Patch; // This is here for compatibility
 } // namespace M3C
@@ -99,20 +99,20 @@ namespace SurfaceMesh
 {
 namespace NodesFile
 {
-typedef struct
+struct NodesFileRecord_t
 {
   int64_t nodeId;
   int nodeKind;
   float x;
   float y;
   float z;
-} NodesFileRecord_t;
+};
 const int ByteCount = sizeof(NodesFileRecord_t);
 } // namespace NodesFile
 
 namespace TrianglesFile
 {
-typedef struct
+struct TrianglesFileRecord_t
 {
   int64_t triId;
   int64_t nodeId_0;
@@ -120,7 +120,7 @@ typedef struct
   int64_t nodeId_2;
   int label_0;
   int label_1;
-} TrianglesFileRecord_t;
+};
 const int ByteCount = sizeof(TrianglesFileRecord_t);
 } // namespace TrianglesFile
 } // namespace SurfaceMesh
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
index dab1303d6c..bd428c2a71 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
@@ -49,7 +49,7 @@ class SVWidgetsLib_EXPORT UpdateCheck : public QObject
   Q_OBJECT
 
 public:
-  typedef struct
+  struct SIMPLVersionData_t
   {
     QString complete;
     QString major;
@@ -60,7 +60,7 @@ class SVWidgetsLib_EXPORT UpdateCheck : public QObject
     QString packageComplete;
     QString buildDate;
     QString appName;
-  } SIMPLVersionData_t;
+  };
 
   UpdateCheck(SIMPLVersionData_t versionData, QObject* parent = nullptr);
   ~UpdateCheck() override;

From fd811a84d328e822f00ed4fff9d20e9a0c15f4eb Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 22 May 2020 15:23:09 -0400
Subject: [PATCH 230/397] Changed to non-throwing new so error path would work
 in DataArray

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 1c51a9a9f5..f1ffdaf5fd 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -629,7 +629,7 @@ int32_t DataArray<T>::allocate()
   }
 
   size_t newSize = m_Size;
-  m_Array = new T[newSize]();
+  m_Array = new(std::nothrow) T[newSize]();
   if(!m_Array)
   {
     qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";
@@ -1520,7 +1520,7 @@ T* DataArray<T>::resizeAndExtend(size_t size)
     return m_Array;
   }
 
-  newArray = new T[newSize]();
+  newArray = new(std::nothrow) T[newSize]();
   if(!newArray)
   {
     qDebug() << "Unable to allocate " << newSize << " elements of size " << sizeof(T) << " bytes. ";

From f0e7f50ff89346836ff7686ba3a530888b3f98e1 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 26 May 2020 13:09:48 -0400
Subject: [PATCH 231/397] Removed VTKFileReader as it was unused

* Use VTKStructedPointsReader in ImportExport plugin instead

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/VTKUtils/SourceList.cmake  |   4 +-
 Source/SIMPLib/VTKUtils/VTKFileReader.cpp | 392 ----------------------
 Source/SIMPLib/VTKUtils/VTKFileReader.h   | 284 ----------------
 3 files changed, 2 insertions(+), 678 deletions(-)
 delete mode 100644 Source/SIMPLib/VTKUtils/VTKFileReader.cpp
 delete mode 100644 Source/SIMPLib/VTKUtils/VTKFileReader.h

diff --git a/Source/SIMPLib/VTKUtils/SourceList.cmake b/Source/SIMPLib/VTKUtils/SourceList.cmake
index f7c463c86c..8429503e8a 100755
--- a/Source/SIMPLib/VTKUtils/SourceList.cmake
+++ b/Source/SIMPLib/VTKUtils/SourceList.cmake
@@ -38,7 +38,7 @@ set(SUBDIR_NAME VTKUtils)
 
 # Any Class that inherits from QObject, either directly or through the heirarchy needs to have its header listed here
 set(SIMPLib_VTKUtils_Moc_HDRS
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/VTKFileReader.h
+
 )
 # --------------------------------------------------------------------
 # Run Qts automoc program to generate some source files that get compiled
@@ -54,7 +54,7 @@ set(SIMPLib_VTKUtils_HDRS
 )
 
 set(SIMPLib_VTKUtils_SRCS
-  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/VTKFileReader.cpp
+
 )
 
 
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp b/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
deleted file mode 100644
index ea19ecf4bf..0000000000
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.cpp
+++ /dev/null
@@ -1,392 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-#include <memory>
-
-#include "VTKFileReader.h"
-
-#include <cstring>
-
-#include <limits>
-#include <sstream>
-
-#include <QtCore/QByteArray>
-#include <QtCore/QFile>
-#include <QtCore/QDebug>
-
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
-
-#define kBufferSize 1024
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-VTKFileReader::VTKFileReader()
-: m_DataContainerName(SIMPL::Defaults::DataContainerName)
-, m_InputFile("")
-{
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-VTKFileReader::~VTKFileReader() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-size_t VTKFileReader::parseByteSize(char text[256])
-{
-
-  char cunsigned_char[64] = "unsigned_char";
-  char cchar[64] = "char";
-  char cunsigned_short[64] = "unsigned_short";
-  char cshort[64] = "short";
-  char cunsigned_int[64] = "unsigned_int";
-  char cint[64] = "int";
-  char cunsigned_long[64] = " unsigned_long";
-  char clong[64] = "long";
-  char cfloat[64] = "float";
-  char cdouble[64] = " double";
-
-  if(strcmp(text, cunsigned_char) == 0)
-  {
-    return 1;
-  }
-  if(strcmp(text, cchar) == 0)
-  {
-    return 1;
-  }
-  if(strcmp(text, cunsigned_short) == 0)
-  {
-    return 2;
-  }
-  if(strcmp(text, cshort) == 0)
-  {
-    return 2;
-  }
-  if(strcmp(text, cunsigned_int) == 0)
-  {
-    return 4;
-  }
-  if(strcmp(text, cint) == 0)
-  {
-    return 4;
-  }
-  if(strcmp(text, cunsigned_long) == 0)
-  {
-    return 8;
-  }
-  if(strcmp(text, clong) == 0)
-  {
-    return 8;
-  }
-  if(strcmp(text, cfloat) == 0)
-  {
-    return 4;
-  }
-  if(strcmp(text, cdouble) == 0)
-  {
-    return 8;
-  }
-  return 0;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int VTKFileReader::ignoreData(std::ifstream& in, int byteSize, char* text, int xDim, int yDim, int zDim)
-{
-  char cunsigned_char[64] = "unsigned_char";
-  char cchar[64] = "char";
-  char cunsigned_short[64] = "unsigned_short";
-  char cshort[64] = "short";
-  char cunsigned_int[64] = "unsigned_int";
-  char cint[64] = "int";
-  char cunsigned_long[64] = " unsigned_long";
-  char clong[64] = "long";
-  char cfloat[64] = "float";
-  char cdouble[64] = " double";
-  int err = 0;
-  if(strcmp(text, cunsigned_char) == 0)
-  {
-    err |= skipVolume<uint8_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cchar) == 0)
-  {
-    err |= skipVolume<int8_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cunsigned_short) == 0)
-  {
-    err |= skipVolume<uint16_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cshort) == 0)
-  {
-    err |= skipVolume<int16_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cunsigned_int) == 0)
-  {
-    err |= skipVolume<uint32_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cint) == 0)
-  {
-    err |= skipVolume<int32_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cunsigned_long) == 0)
-  {
-    err |= skipVolume<uint64_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, clong) == 0)
-  {
-    err |= skipVolume<int64_t>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cfloat) == 0)
-  {
-    err |= skipVolume<float>(in, byteSize, xDim, yDim, zDim);
-  }
-  if(strcmp(text, cdouble) == 0)
-  {
-    err |= skipVolume<double>(in, byteSize, xDim, yDim, zDim);
-  }
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int VTKFileReader::readHeader()
-{
-
-  int err = 0;
-  if(getInputFile().isEmpty())
-  {
-    setErrorCondition(-1, "FileName was not set and must be valid");
-    return -1;
-  }
-
-  if(nullptr == getDataContainerArray()->getDataContainer(getDataContainerName()).get())
-  {
-    setErrorCondition(-1, "DataContainer Pointer was nullptr and must be valid");
-    return -1;
-  }
-
-  QFile in(getInputFile());
-  if(!in.open(QIODevice::ReadOnly | QIODevice::Text))
-  {
-    QString msg = QObject::tr("VTF file could not be opened: %1").arg(getInputFile());
-    setErrorCondition(-100, msg);
-    return -100;
-  }
-
-  QByteArray buf;
-  buf = in.readLine(); // Read Line 1 - VTK Version Info
-
-  buf = in.readLine(); // Read Line 2 - User Comment
-  setComment(QString(buf.trimmed()));
-
-  buf = in.readLine(); // Read Line 3 - BINARY or ASCII
-  QString fileType(buf);
-  if(fileType.startsWith("BINARY"))
-  {
-    setFileIsBinary(true);
-  }
-  else if(fileType.startsWith("ASCII"))
-  {
-    setFileIsBinary(false);
-  }
-  else
-  {
-    err = -1;
-    qDebug() << "The file type of the VTK legacy file could not be determined. It should be ASCII' or 'BINARY' and should appear on line 3 of the file.";
-    return err;
-  }
-
-  QList<QByteArray> tokens;
-  buf = in.readLine(); // Read Line 4 - Type of Dataset
-  {
-    tokens = buf.split(' ');
-    setDatasetType(QString(tokens[1]));
-  }
-
-  buf = in.readLine(); // Read Line 5 which is the Dimension values
-  bool ok = false;
-  int64_t dims[3];
-  tokens = buf.split(' ');
-  dims[0] = tokens[1].toLongLong(&ok, 10);
-  dims[1] = tokens[2].toLongLong(&ok, 10);
-  dims[2] = tokens[3].toLongLong(&ok, 10);
-#if(CMP_SIZEOF_SSIZE_T == 4)
-  constexpr int64_t max = std::numeric_limits<size_t>::max();
-#else
-  constexpr int64_t max = std::numeric_limits<int64_t>::max();
-#endif
-  if(dims[0] * dims[1] * dims[2] > max)
-  {
-    err = -1;
-    QString ss = QObject::tr("The total number of elements '%1' is greater than this program can hold. Try the 64 bit version.").arg(dims[0] * dims[1] * dims[2]);
-    setErrorCondition(err, ss);
-    return err;
-  }
-
-  if(dims[0] > max || dims[1] > max || dims[2] > max)
-  {
-    err = -1;
-    QString ss = QObject::tr("One of the dimensions is greater than the max index for this sysem. Try the 64 bit version. dim[0]=%1  dim[1]=%2im[2]=%3").arg(dims[0]).arg(dims[1]).arg(dims[2]);
-    setErrorCondition(err, ss);
-    return err;
-  }
-
-  size_t dcDims[3] = {static_cast<size_t>(dims[0]), static_cast<size_t>(dims[1]), static_cast<size_t>(dims[2])};
-  DataContainer::Pointer dc = getDataContainerArray()->getDataContainer(getDataContainerName());
-  if(dc.get() == nullptr)
-  {
-    return -1;
-  }
-  ImageGeom::Pointer image = dc->getGeometryAs<ImageGeom>();
-  if(image.get() == nullptr)
-  {
-    return -1;
-  }
-  image->setDimensions(dcDims);
-
-  buf = in.readLine(); // Read Line 6 which is the Origin values
-  float origin[3];
-  tokens = buf.split(' ');
-  origin[0] = tokens[1].toFloat(&ok);
-  origin[1] = tokens[2].toFloat(&ok);
-  origin[2] = tokens[3].toFloat(&ok);
-  image->setOrigin(origin);
-
-  buf = in.readLine(); // Read Line 7 which is the Scaling values
-  float resolution[3];
-  tokens = buf.split(' ');
-  resolution[0] = tokens[1].toFloat(&ok);
-  resolution[1] = tokens[2].toFloat(&ok);
-  resolution[2] = tokens[3].toFloat(&ok);
-  image->setSpacing(resolution);
-
-  return err;
-}
-
-// -----------------------------------------------------------------------------
-VTKFileReader::Pointer VTKFileReader::NullPointer()
-{
-  return Pointer(static_cast<Self*>(nullptr));
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::getNameOfClass() const
-{
-  return QString("VTKFileReader");
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::ClassName()
-{
-  return QString("VTKFileReader");
-}
-
-// -----------------------------------------------------------------------------
-std::shared_ptr<VTKFileReader> VTKFileReader::New()
-{
-  struct make_shared_enabler : public VTKFileReader
-  {
-  };
-  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
-  val->setupFilterParameters();
-  return val;
-}
-
-// -----------------------------------------------------------------------------
-void VTKFileReader::setDataContainerName(const QString& value)
-{
-  m_DataContainerName = value;
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::getDataContainerName() const
-{
-  return m_DataContainerName;
-}
-
-// -----------------------------------------------------------------------------
-void VTKFileReader::setInputFile(const QString& value)
-{
-  m_InputFile = value;
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::getInputFile() const
-{
-  return m_InputFile;
-}
-
-// -----------------------------------------------------------------------------
-void VTKFileReader::setComment(const QString& value)
-{
-  m_Comment = value;
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::getComment() const
-{
-  return m_Comment;
-}
-
-// -----------------------------------------------------------------------------
-void VTKFileReader::setDatasetType(const QString& value)
-{
-  m_DatasetType = value;
-}
-
-// -----------------------------------------------------------------------------
-QString VTKFileReader::getDatasetType() const
-{
-  return m_DatasetType;
-}
-
-// -----------------------------------------------------------------------------
-void VTKFileReader::setFileIsBinary(bool value)
-{
-  m_FileIsBinary = value;
-}
-
-// -----------------------------------------------------------------------------
-bool VTKFileReader::getFileIsBinary() const
-{
-  return m_FileIsBinary;
-}
diff --git a/Source/SIMPLib/VTKUtils/VTKFileReader.h b/Source/SIMPLib/VTKUtils/VTKFileReader.h
deleted file mode 100644
index 5b99734430..0000000000
--- a/Source/SIMPLib/VTKUtils/VTKFileReader.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include <memory>
-
-#include <fstream>
-
-#include <QtCore/QDebug>
-
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/CoreFilters/FileReader.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
-
-/**
- * @class VTKFileReader VTKFileReader.h PathToHeader/VTKFileReader.h
- * @brief This class holds some basic methods to read various items from a legacy
- * VTK file.
- *
- * <b>Legacy VTK File Header </b>
- * @code
-   1: # vtk DataFile Version 2.0
-   2: NRL TiBeta Stack
-   3: BINARY
-   4: DATASET STRUCTURED_POINTS
-   5: DIMENSIONS 1670 770 201
-   6: ORIGIN 0.00 0.00 0.00
-   7: SPACING 0.665 0.665 1.48
-   8: POINT_DATA 258465900
-   9:
-   10: SCALARS FeatureID int 1
-   11: LOOKUP_TABLE default
-
-   OR
-
-   1: # vtk DataFile Version 2.0
-   2: data set from FFT2dx_GB
-   3: ASCII
-   4: DATASET STRUCTURED_POINTS
-   5: DIMENSIONS 189 201 100
-   6: ORIGIN 0.0 0.0 0.0
-   7: SPACING 0.25 0.25 0.25
-   8: POINT_DATA 3798900
-   9:
-   10: SCALARS FeatureID int 1
-   11: LOOKUP_TABLE default
- * @endcode
- *
- *
- *
- *
- * @date May 19, 2011
- * @version 1.0
- */
-class SIMPLib_EXPORT VTKFileReader : public FileReader
-{
-  Q_OBJECT
-public:
-  using Self = VTKFileReader;
-  using Pointer = std::shared_ptr<Self>;
-  using ConstPointer = std::shared_ptr<const Self>;
-  using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<const Self>;
-  static Pointer NullPointer();
-
-  /**
-   * @brief Returns the name of the class for VTKFileReader
-   */
-  QString getNameOfClass() const override;
-  /**
-   * @brief Returns the name of the class for VTKFileReader
-   */
-  static QString ClassName();
-
-  static std::shared_ptr<VTKFileReader> New();
-
-  ~VTKFileReader() override;
-
-  /**
-   * @brief Setter property for DataContainerName
-   */
-  void setDataContainerName(const QString& value);
-  /**
-   * @brief Getter property for DataContainerName
-   * @return Value of DataContainerName
-   */
-  QString getDataContainerName() const;
-
-  /**
-   * @brief Setter property for InputFile
-   */
-  void setInputFile(const QString& value);
-  /**
-   * @brief Getter property for InputFile
-   * @return Value of InputFile
-   */
-  QString getInputFile() const;
-
-  /**
-   * @brief Setter property for Comment
-   */
-  void setComment(const QString& value);
-  /**
-   * @brief Getter property for Comment
-   * @return Value of Comment
-   */
-  QString getComment() const;
-
-  /**
-   * @brief Setter property for DatasetType
-   */
-  void setDatasetType(const QString& value);
-  /**
-   * @brief Getter property for DatasetType
-   * @return Value of DatasetType
-   */
-  QString getDatasetType() const;
-
-  /**
-   * @brief Setter property for FileIsBinary
-   */
-  void setFileIsBinary(bool value);
-  /**
-   * @brief Getter property for FileIsBinary
-   * @return Value of FileIsBinary
-   */
-  bool getFileIsBinary() const;
-
-  /**
-   * @brief Reads the VTK header and sets the values that are described in the header
-   * @return Error Condition. Negative is Error.
-   */
-  int readHeader() override;
-
-  /**
-   * @brief This method should be re-implemented in a subclass
-   */
-  int readFile() override
-  {
-    return -1;
-  }
-
-  /**
-   * @brief Parses the byte size from a data set declaration line
-   * @param text
-   * @return
-   */
-  size_t parseByteSize(char text[256]);
-
-  /**
-   *
-   */
-  int ignoreData(std::ifstream& in, int byteSize, char* type, int xDim, int yDim, int zDim);
-
-  /**
-   *
-   */
-  template <typename T>
-  int skipVolume(std::ifstream& inStream, int byteSize, int xDim, int yDim, int zDim, T& diff)
-  {
-    int err = 0;
-    size_t totalSize = xDim * yDim * zDim;
-    if(getFileIsBinary() == true)
-    {
-      T* buffer = new T[totalSize];
-      // Read all the xpoints in one shot into a buffer
-      inStream.read(reinterpret_cast<char*>(buffer), (totalSize * sizeof(T)));
-      if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
-      {
-        qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount() << " vs " << (totalSize * sizeof(T));
-        return -1;
-      }
-      if(totalSize > 1)
-      {
-        diff = buffer[totalSize - 1] - buffer[totalSize - 2];
-      }
-      else
-      {
-        diff = buffer[totalSize];
-      }
-      delete[] buffer;
-    }
-    else
-    {
-      T tmp;
-      T t2;
-      for(size_t x = 0; x < totalSize; ++x)
-      {
-        if(x == 1)
-        {
-          t2 = tmp;
-        }
-        inStream >> tmp;
-        if(x == 1)
-        {
-          diff = tmp - t2;
-        }
-      }
-    }
-    return err;
-  }
-
-  template <typename T>
-  int skipVolume(std::ifstream& inStream, int byteSize, size_t xDim, size_t yDim, size_t zDim)
-  {
-    int err = 0;
-    if(getFileIsBinary() == true)
-    {
-      size_t totalSize = xDim * yDim * zDim;
-      typename DataArray<T>::Pointer bufferPtr = DataArray<T>::CreateArray(totalSize, "JUNK", true);
-      // Read all the xpoints in one shot into a buffer
-      inStream.read(reinterpret_cast<char*>(bufferPtr->getPointer(0)), (totalSize * sizeof(T)));
-      if(inStream.gcount() != static_cast<std::streamsize>(totalSize * sizeof(T)))
-      {
-        qDebug() << " ERROR READING BINARY FILE. Bytes read was not the same as func->xDim *. " << byteSize << "." << inStream.gcount() << " vs " << (totalSize * sizeof(T));
-        return -1;
-      }
-    }
-    else
-    {
-      T tmp;
-      for(size_t z = 0; z < zDim; ++z)
-      {
-        for(size_t y = 0; y < yDim; ++y)
-        {
-          for(size_t x = 0; x < xDim; ++x)
-          {
-            inStream >> tmp;
-          }
-        }
-      }
-    }
-    return err;
-  }
-
-protected:
-  VTKFileReader();
-
-public:
-  VTKFileReader(const VTKFileReader&) = delete;            // Copy Constructor Not Implemented
-  VTKFileReader(VTKFileReader&&) = delete;                 // Move Constructor Not Implemented
-  VTKFileReader& operator=(const VTKFileReader&) = delete; // Copy Assignment Not Implemented
-  VTKFileReader& operator=(VTKFileReader&&) = delete;      // Move Assignment Not Implemented
-
-private:
-  QString m_DataContainerName = {};
-  QString m_InputFile = {};
-  QString m_Comment = {};
-  QString m_DatasetType = {};
-  bool m_FileIsBinary = {};
-};

From 83c38d95ffc113705e2027fb93083f0abf2a7c6c Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 26 May 2020 13:28:21 -0400
Subject: [PATCH 232/397] Changed getNameOfClass and getUuid to pure virtual in
 AbstractFilter

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Filtering/AbstractFilter.cpp | 14 --------------
 Source/SIMPLib/Filtering/AbstractFilter.h   |  5 +++--
 Source/SIMPLib/TestFilters/Filt0.cpp        |  7 +++++++
 Source/SIMPLib/TestFilters/Filt0.h          |  2 ++
 Source/SIMPLib/TestFilters/Filt1.cpp        |  7 +++++++
 Source/SIMPLib/TestFilters/Filt1.h          |  2 ++
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 0607cb3558..0dc049f7ed 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -486,14 +486,6 @@ QString AbstractFilter::getFilterVersion() const
   return QString("0.0.0");
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QUuid AbstractFilter::getUuid() const
-{
-  return QUuid();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -647,12 +639,6 @@ AbstractFilter::Pointer AbstractFilter::NullPointer()
   return Pointer(static_cast<Self*>(nullptr));
 }
 
-// -----------------------------------------------------------------------------
-QString AbstractFilter::getNameOfClass() const
-{
-  return QString("AbstractFilter");
-}
-
 // -----------------------------------------------------------------------------
 QString AbstractFilter::ClassName()
 {
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index ed31953b9a..f3ea806add 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -121,7 +121,8 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   /**
    * @brief Returns the name of the class for AbstractFilter
    */
-  QString getNameOfClass() const override;
+  virtual QString getNameOfClass() const = 0;
+
   /**
    * @brief Returns the name of the class for AbstractFilter
    */
@@ -154,7 +155,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    * @brief getUuid Return the unique identifier for this filter.
    * @return A QUuid object.
    */
-  virtual QUuid getUuid() const;
+  virtual QUuid getUuid() const = 0;
 
   /**
    * @brief getHumanLabel Returns the human label for the filter, which determines its
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index 727280b760..5bd7476ac7 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -96,6 +96,13 @@ void Filt0::execute()
   /* Place all your code to execute your filter here. */
 }
 
+// -----------------------------------------------------------------------------
+QUuid Filt0::getUuid() const
+{
+  return QUuid("{2df74121-7513-598e-8d73-9a990303c600}");
+}
+
+
 // -----------------------------------------------------------------------------
 Filt0::Pointer Filt0::NullPointer()
 {
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index 9c1c29c339..6548258a0e 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -115,6 +115,8 @@ class SIMPLib_EXPORT Filt0 : public AbstractFilter
     return "Misc";
   }
 
+  QUuid getUuid() const override;
+
   /**
    * @brief This method will instantiate all the end user settable options/parameters
    * for this filter
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index fc27b8479c..90aa555482 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -96,6 +96,13 @@ void Filt1::execute()
   /* Place all your code to execute your filter here. */
 }
 
+// -----------------------------------------------------------------------------
+QUuid Filt1::getUuid() const
+{
+  return QUuid("{436a83fd-20f0-5920-89d1-4bfde900499e}");
+}
+
+
 // -----------------------------------------------------------------------------
 Filt1::Pointer Filt1::NullPointer()
 {
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index 93aaaa05ba..7434fcf44d 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -105,6 +105,8 @@ class SIMPLib_EXPORT Filt1 : public AbstractFilter
     return "Test";
   }
 
+  QUuid getUuid() const override;
+
   /**
    * @brief This method will instantiate all the end user settable options/parameters
    * for this filter

From 7706b0ba344e91f1eacb40c9112dde5f07cbaed2 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 26 May 2020 13:30:14 -0400
Subject: [PATCH 233/397] Removed extra virtual keyword in FileReader.h

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/FileReader.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index 0d31d878a5..4e57c0be77 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -91,7 +91,7 @@ class SIMPLib_EXPORT FileReader : public AbstractFilter
   /**
    * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
    */
-  virtual void dataCheck() override;
+  void dataCheck() override;
 
   /**
    * @brief Initializes all the private instance variables.

From 3f0e9c247054cee3c0524fe702fa2b89439fc381 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 26 May 2020 16:06:08 -0400
Subject: [PATCH 234/397] Fixed formatting in TestFilters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/TestFilters/Filt0.cpp | 1 -
 Source/SIMPLib/TestFilters/Filt1.cpp | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index 5bd7476ac7..3686603b79 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -102,7 +102,6 @@ QUuid Filt0::getUuid() const
   return QUuid("{2df74121-7513-598e-8d73-9a990303c600}");
 }
 
-
 // -----------------------------------------------------------------------------
 Filt0::Pointer Filt0::NullPointer()
 {
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index 90aa555482..84fdcd529d 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -102,7 +102,6 @@ QUuid Filt1::getUuid() const
   return QUuid("{436a83fd-20f0-5920-89d1-4bfde900499e}");
 }
 
-
 // -----------------------------------------------------------------------------
 Filt1::Pointer Filt1::NullPointer()
 {

From 8a5c2ff675b2bd48643477187a3aa30fa3b6d093 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 28 May 2020 16:08:45 -0400
Subject: [PATCH 235/397] Observer and JsonFilterParameterReader Python
 Bindings (#404)

* Wrap Pipeline Reader and Observer in Python Bindings
* Allows python programmers to get feedback for a running pipeline.
* Apply suggestions from code review

Co-authored-by: JDuffeyBQ <jared.duffey@bluequartz.net>
Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/Observer.h              |  8 ++++++++
 .../JsonFilterParametersReader.h              | 11 +++++++++++
 Source/SIMPLib/Filtering/FilterPipeline.cpp   | 19 +++++++++++++++++++
 Source/SIMPLib/Filtering/FilterPipeline.h     |  6 ++++++
 4 files changed, 44 insertions(+)

diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index dc8fcc588c..23e75321aa 100644
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -54,8 +54,16 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
 {
   Q_OBJECT
 
+   // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(Observer)
+  PYB11_SHARED_POINTERS(Observer)
+  PYB11_CREATION()
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   Observer();
+
   /**
    * @brief Returns the name of the class for Observer
    */
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 9b66a6af9f..46387220f5 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -51,6 +51,17 @@
  */
 class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParametersReader
 {
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(JsonFilterParametersReader)
+  PYB11_SHARED_POINTERS(JsonFilterParametersReader)
+  PYB11_STATIC_NEW_MACRO(JsonFilterParametersReader)
+
+  PYB11_METHOD(FilterPipeline::Pointer readPipelineFromFile)
+
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   using Self = JsonFilterParametersReader;
   using Pointer = std::shared_ptr<Self>;
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index de7abd1bf9..78bcdbfa66 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -689,6 +689,25 @@ void FilterPipeline::removeMessageReceiver(QObject* obj)
   m_MessageReceivers.removeAll(obj);
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::addObserver(Observer* obj)
+{
+  connect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), obj, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
+  m_MessageReceivers.push_back(obj);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void FilterPipeline::removeObserver(Observer* obj)
+{
+  disconnect(this, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), obj, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
+  m_MessageReceivers.removeAll(obj);
+}
+
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 769ab6e4e7..404589d86a 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -86,6 +86,8 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
   PYB11_METHOD(bool empty)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
+  PYB11_METHOD(void addObserver ARGS Observer)
+  PYB11_METHOD(void removeObserver ARGS Observer)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
@@ -232,6 +234,10 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
 
   void removeMessageReceiver(QObject* obj);
 
+  void addObserver(Observer* obj);
+
+  void removeObserver(Observer* obj);
+
   void connectFilterNotifications(AbstractFilter* filter);
   void disconnectFilterNotifications(AbstractFilter* filter);
 

From 5cadcd6b59e5ff6612a6d1ea8116956e47f94ce2 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 28 May 2020 16:11:24 -0400
Subject: [PATCH 236/397] Fix clang-format so SIMPLib/SIMPLib.h always is at
 the top of the SIMPLib group

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .clang-format | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.clang-format b/.clang-format
index d476640446..550a29d47b 100644
--- a/.clang-format
+++ b/.clang-format
@@ -46,13 +46,17 @@ ConstructorInitializerIndentWidth: 0
 # DisableFormat:   false
 # ExperimentalAutoDetectBinPacking: false
 # ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-# IncludeCategories: 
-#   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-#     Priority:        2
-#   - Regex:           '^(<|"(gtest|isl|json)/)'
-#     Priority:        3
-#   - Regex:           '.*'
-#     Priority:        1
+SortIncludes: true
+#IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^(<|"(QtCore|QtWidgets|QtGui|QtNetwork)/)'
+    Priority:        5
+  - Regex:           '^"(SIMPL|llvm-c|clang|clang-c)/'
+    Priority:        100
+  - Regex:           '^"(SIMPLib/SIMPLib)'
+    Priority:        90
+  - Regex:           '.*'
+    Priority:        1000
 # IndentCaseLabels: false
 # IndentWidth:     2
 # IndentWrappedFunctionNames: false
@@ -72,7 +76,6 @@ ConstructorInitializerIndentWidth: 0
 # PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Left
 # ReflowComments:  true
-SortIncludes:    false
 # SpaceAfterCStyleCast: false
 # SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: Never
@@ -84,7 +87,7 @@ SpaceBeforeParens: Never
 # SpacesInParentheses: false
 # SpacesInSquareBrackets: false
 Standard:        Cpp11
-TabWidth:        2
+TabWidth:        4
 UseTab:          Never
 ...
 

From 9a3311c1a47b46b4bfa719b754b91936829120d2 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 29 May 2020 15:10:19 -0400
Subject: [PATCH 237/397] Fix clang-format typo: Tabs should be 2 spaces

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 550a29d47b..2f8961f913 100644
--- a/.clang-format
+++ b/.clang-format
@@ -87,7 +87,7 @@ SpaceBeforeParens: Never
 # SpacesInParentheses: false
 # SpacesInSquareBrackets: false
 Standard:        Cpp11
-TabWidth:        4
+TabWidth:        2
 UseTab:          Never
 ...
 

From dae45074b9a3ef13f5f0ded01c3f952831bb16de Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Jun 2020 09:08:21 -0400
Subject: [PATCH 238/397] Additional Python binding improvements. (#405)

* JsonFilterParameterWriter: Add bindings to write a pipeline to a json file
* JsonFilterParameterReader: Add bindings to read a pipeline from a json file
* Add bindings for IObserver and Observer to show output from a filter/pipeline
* Register all filters of a plugin/python module when the module is loaded
* Generate a dream3d.py module that imports all the other python modules.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/IObserver.h             |  8 +++
 Source/SIMPLib/Common/Observer.h              |  2 +-
 .../JsonFilterParametersReader.cpp            | 17 +++++--
 .../JsonFilterParametersReader.h              |  2 -
 .../JsonFilterParametersWriter.cpp            | 15 ++++++
 .../JsonFilterParametersWriter.h              | 23 ++++++++-
 .../Python/Binding/CreatePybind11Module.cmake | 51 +++++++++++++------
 .../Binding/generate_python_bindings.py       | 24 ++++++---
 8 files changed, 112 insertions(+), 30 deletions(-)

diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
index 0428284c06..f83ac6ad04 100644
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -40,6 +40,14 @@
 
 class SIMPLib_EXPORT IObserver
 {
+  
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(IObserver)
+  PYB11_SHARED_POINTERS(IObserver)
+  PYB11_CREATION()
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   IObserver();
   virtual ~IObserver();
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index 23e75321aa..f6be24c876 100644
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -55,7 +55,7 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
   Q_OBJECT
 
    // Start Python bindings declarations
-  PYB11_BEGIN_BINDINGS(Observer)
+  PYB11_BEGIN_BINDINGS(Observer SUPERCLASS IObserver)
   PYB11_SHARED_POINTERS(Observer)
   PYB11_CREATION()
   PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 5694273598..5db498c08c 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -466,13 +466,20 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
 
       if(nullptr != obs)
       {
-        QString ss = QObject::tr("An attempt to instantiate a filter from the pipeline file resulted in an error.\
-                                 Possible reasons include a name change of the filter, plugin not loading or a simple spelling mistake? A \
-                                                                                                                                        blank filter has been inserted in its place. Possible error message is: %1")
-                         .arg(filterName);
+        QString msg;
+        QTextStream ss(&msg);
+        ss << "An attempt to instantiate a filter from the pipeline file resulted in an error.\n"
+           << "Possible reasons include a name change of the filter, plugin not loading or a simple spelling mistake? A \n"
+           << "blank filter has been inserted in its place. The filter name is: " << filterName << "\n";
+
+        // FilterManager::Collection factories = filtManager->getFactories();
+        // for(const auto& factory : factories)
+        // {
+        //   ss << factory->getFilterClassName() << "\n";
+        // }
 
         QString prefix = "JsonFilterParametersReader::ReadPipelineFromFile()";
-        PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(prefix).arg(ss), -66066);
+        PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(prefix).arg(msg), -66066);
         obs->processPipelineMessage(pm);
       }
     }
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 46387220f5..0769df0ea6 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -56,9 +56,7 @@ class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParameter
   PYB11_BEGIN_BINDINGS(JsonFilterParametersReader)
   PYB11_SHARED_POINTERS(JsonFilterParametersReader)
   PYB11_STATIC_NEW_MACRO(JsonFilterParametersReader)
-
   PYB11_METHOD(FilterPipeline::Pointer readPipelineFromFile)
-
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 70424e66d8..516820ce95 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -83,6 +83,21 @@ int JsonFilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipe
   return err;
 }
 
+// -----------------------------------------------------------------------------
+int JsonFilterParametersWriter::exportPipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, IObserver* obs)
+{
+  int err = 0;
+  err = populateWriter(pipeline, pipelineName, expandPipeline, {obs});
+  if(err < 0)
+  {
+    return err;
+  }
+
+  setFileName(filePath);
+  writePipeline();
+  clearWriter();
+  return err;
+}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index 297b1ec01e..ddd5076639 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -55,6 +55,14 @@
  */
 class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParametersWriter
 {
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(JsonFilterParametersWriter)
+  PYB11_SHARED_POINTERS(JsonFilterParametersWriter)
+  PYB11_STATIC_NEW_MACRO(JsonFilterParametersWriter)
+  PYB11_METHOD(FilterPipeline::Pointer exportPipelineToFile)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
 public:
   using Self = JsonFilterParametersWriter;
   using Pointer = std::shared_ptr<Self>;
@@ -111,11 +119,24 @@ class SIMPLib_EXPORT JsonFilterParametersWriter : public AbstractFilterParameter
    * @param filePath The file path to write
    * @param pipelineName The name of the pipeline (Typically the name of the file)
    * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
-   * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+   * @param obs Any list of observers that we can pass error/warning messages back to in case something goes wrong.
    * @return
    */
   int writePipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipelines, QList<IObserver*> obs = QList<IObserver*>()) override;
 
+  /**
+   * @brief exportPipelineToFile This function will write a pipeline to a
+   * JSON file. The file path passed in <b>WILL BE OVER WRITTEN</b> by this
+   * function <b>WITHOUT WARNING</b>
+   * @param pipeline The pipeline to be written
+   * @param filePath The file path to write
+   * @param pipelineName The name of the pipeline (Typically the name of the file)
+   * @param expandPipeline Expand any embeded pipelines that are in DataContainerReader filters
+   * @param obs Any observer that we can pass error/warning messages back to in case something goes wrong.
+   * @return
+   */
+  int exportPipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipelines, IObserver* obs = nullptr);
+
   /**
    * @brief WritePipelineToString This function will write a pipeline to a QString.
    * @param pipeline The pipeline to be written
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 6a597159d2..3d125d56c2 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -81,9 +81,33 @@ function(CreatePybind11Module)
     set(PLUGIN_ARG "--plugin")
   endif()
 
-  set(CREATE_PYTHON_BINDINGS_TARGET ${ARGS_MODULE_NAME}CreatePythonBindings)
-  set(PYTHON_MODULE_SOURCE_FILE ${ARGS_OUTPUT_DIR}/py_${ARGS_MODULE_NAME}.cpp)
-  set(PYTHON_UNIT_TEST_FILE ${ARGS_PYTHON_OUTPUT_DIR}/${ARGS_MODULE_NAME}_UnitTest.py)
+  string(TOLOWER ${ARGS_MODULE_NAME} MODULE_NAME_lower)
+
+set(d3dAllModules "${SIMPLProj_BINARY_DIR}/CreateDream3dAll.py")
+if("${ARGS_MODULE_NAME}" STREQUAL "simpl")
+  file(WRITE "${d3dAllModules}" "import argparse\n")
+  file(APPEND "${d3dAllModules}" "import os\n")
+  file(APPEND "${d3dAllModules}" "import re\n")
+  file(APPEND "${d3dAllModules}" "from pathlib import Path\n")
+
+  file(APPEND "${d3dAllModules}" "if __name__ == '__main__':\n")
+  file(APPEND "${d3dAllModules}" "  parser = argparse.ArgumentParser()\n")
+  file(APPEND "${d3dAllModules}" "  parser.add_argument('python_output_dir')\n")
+  file(APPEND "${d3dAllModules}" "  args = parser.parse_args()\n")
+  file(APPEND "${d3dAllModules}" "  with open(f'{args.python_output_dir}/dream3d.py', 'w') as d3d_file:\n")
+  file(APPEND "${d3dAllModules}" "    d3d_file.write(f'import ${MODULE_NAME_lower}py\\n')\n")
+
+  add_custom_target(CreateDream3dModuleFile ALL
+      COMMAND ${PYTHON_EXECUTABLE} ${d3dAllModules} "${ARGS_PYTHON_OUTPUT_DIR}"
+      COMMENT "Creating dream3d.py module file")
+
+else()
+  file(APPEND "${d3dAllModules}" "    d3d_file.write(f'import ${MODULE_NAME_lower}py\\n')\n")
+endif()
+
+  set(CREATE_PYTHON_BINDINGS_TARGET ${MODULE_NAME_lower}CreatePythonBindings)
+  set(PYTHON_MODULE_SOURCE_FILE ${ARGS_OUTPUT_DIR}/py_${MODULE_NAME_lower}.cpp)
+  set(PYTHON_UNIT_TEST_FILE ${ARGS_PYTHON_OUTPUT_DIR}/${MODULE_NAME_lower}_UnitTest.py)
 
   file(MAKE_DIRECTORY ${ARGS_OUTPUT_DIR})
 
@@ -97,13 +121,13 @@ function(CreatePybind11Module)
       "${PLUGIN_ARG}"
       "${ARGS_PYTHON_OUTPUT_DIR}"
       "--include_dir=${ARGS_INCLUDE_DIR}"
-      "--module_name=${ARGS_MODULE_NAME}"
+      "--module_name=${MODULE_NAME_lower}"
       "--header_path=${ARGS_HEADER_PATH}"
       "--body_path=${ARGS_BODY_PATH}"
+      "--plugin_name=${ARGS_MODULE_NAME}"
       COMMENT "${ARGS_MODULE_NAME}: Generating Python bindings"
       BYPRODUCTS ${PYTHON_MODULE_SOURCE_FILE}
   )
-
   set_property(TARGET ${CREATE_PYTHON_BINDINGS_TARGET} PROPERTY FOLDER "Python/Generator")
 
   add_custom_command(TARGET ${CREATE_PYTHON_BINDINGS_TARGET}
@@ -111,25 +135,25 @@ function(CreatePybind11Module)
     COMMAND ${CMAKE_COMMAND} -E make_directory ${ARGS_PYTHON_OUTPUT_DIR}
   )
 
-  pybind11_add_module(${ARGS_MODULE_NAME}
+  pybind11_add_module(${MODULE_NAME_lower}
     ${PYTHON_MODULE_SOURCE_FILE}
   )
 
-  set_property(TARGET ${ARGS_MODULE_NAME} PROPERTY FOLDER "Python/Bindings")
+  set_property(TARGET ${MODULE_NAME_lower} PROPERTY FOLDER "Python/Bindings")
 
   set_source_files_properties(${PYTHON_MODULE_SOURCE_FILE}
     PROPERTIES  
       SKIP_AUTOMOC ON
   )
 
-  add_dependencies(${ARGS_MODULE_NAME} ${CREATE_PYTHON_BINDINGS_TARGET})
+  add_dependencies(${MODULE_NAME_lower} ${CREATE_PYTHON_BINDINGS_TARGET})
 
-  target_link_libraries(${ARGS_MODULE_NAME}
+  target_link_libraries(${MODULE_NAME_lower}
     PUBLIC
       ${ARGS_LINK_LIBRARIES}
   )
 
-  target_include_directories(${ARGS_MODULE_NAME}
+  target_include_directories(${MODULE_NAME_lower}
     PUBLIC
       ${ARGS_INCLUDE_DIRS}
   )
@@ -138,7 +162,7 @@ function(CreatePybind11Module)
     "$<TARGET_FILE_DIR:simpl>"
   )
 
-  AddPythonTest(NAME PY_${ARGS_MODULE_NAME}_UnitTest
+  AddPythonTest(NAME PY_${MODULE_NAME_lower}_UnitTest
     FILE ${PYTHON_UNIT_TEST_FILE}
     PYTHONPATH ${TESTS_PYTHONPATH}
   )
@@ -156,12 +180,9 @@ function(CreatePybind11Plugin)
   set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH)
   set(multiValueArgs)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-  string(TOLOWER ${ARGS_PLUGIN_NAME} PLUGIN_NAME_lower)
-
   get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
-  CreatePybind11Module(MODULE_NAME ${PLUGIN_NAME_lower}
+  CreatePybind11Module(MODULE_NAME ${ARGS_PLUGIN_NAME}
     OUTPUT_DIR "${${ARGS_PLUGIN_NAME}_BINARY_DIR}/Wrapping/PythonCore"
     FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/Wrapping/${ARGS_PLUGIN_NAME}Filters.txt"
     SOURCE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/${ARGS_PLUGIN_NAME}Filters"
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 59f05d601e..82eefcc8ed 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -439,7 +439,7 @@ def sort_inherited_classes(classes: List[PyClass]) -> List[PyClass]:
 
   return result
 
-def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str) -> None:
+def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str) -> None:
   with open(f'{output_dir}/py_simpl.cpp', 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
     with open(header_path, 'r') as header_file:
       header_code = header_file.read()
@@ -487,7 +487,8 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
 
     module_file.write('}\n')
 
-def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, header_path: str = '', body_path: str = '') -> None:
+
+def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, header_path: str = '', body_path: str = '', plugin_name: str = '') -> None:
   with open(f'{output_dir}/py_{module_name}.cpp', 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
     includes = files
     if include_dir:
@@ -512,9 +513,12 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
         custom_body_code = body_file.read()
 
     header_code = (
+      '// This header is automatically generated during build time by the "generate_python_bindings.py" file\n\n'
       '#include <memory>\n\n'
       '#include \"pybind11/pybind11.h\"\n\n'
+      '#include \"SIMPLib/Filtering/FilterManager.h\"\n\n'
       '#include \"Binding/Pybind11CustomTypeCasts.h\"\n\n'
+      f'#include \"{plugin_name}/{plugin_name}Plugin.h\"\n'
       f'{custom_header_code}\n'
       f'{include_code}\n\n'
       'namespace py = pybind11;\n'
@@ -554,8 +558,11 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
     test_file.write(f'  print(\'{module_name} UnitTest Complete\')\n')
 
     module_file.write(f'{custom_body_code}\n')
-
-    module_file.write('}\n')
+    
+    module_file.write(f'  //Ensure all the filters are loaded when this module loads\n')
+    module_file.write(f'  {plugin_name}Plugin {module_name}Plugin;\n')
+    module_file.write(f'  {module_name}Plugin.registerFilters(FilterManager::Instance());\n')
+    module_file.write('\n}\n')
 
 def read_plugin_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = []
@@ -593,19 +600,24 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   parser.add_argument('--header_path')
   parser.add_argument('--body_path')
   parser.add_argument('--include_dir')
+  parser.add_argument('--plugin_name')
   parser.add_argument('--plugin', action='store_true')
 
+
   args = parser.parse_args()
 
   if args.plugin:
     if args.module_name is None:
       parser.error('--plugin requires --module_name')
     files = read_plugin_file_list(args.file_list_path, args.source_dir)
-    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.header_path, args.body_path)
+    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.header_path, args.body_path, args.plugin_name)
+
   else:
     if args.header_path is None:
       parser.error('requires --header_path')
     if args.body_path is None:
       parser.error('requires --body_path')
     files = read_simpl_file_list(args.file_list_path, args.source_dir)
-    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir)
+    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name)
+
+

From e253df9c55449048ce5e526285d00d308a33969d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Jun 2020 12:23:33 -0400
Subject: [PATCH 239/397] Use 'Complete' version for plugins

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Filtering/CorePlugin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Filtering/CorePlugin.cpp b/Source/SIMPLib/Filtering/CorePlugin.cpp
index 66df9134bc..249442210e 100644
--- a/Source/SIMPLib/Filtering/CorePlugin.cpp
+++ b/Source/SIMPLib/Filtering/CorePlugin.cpp
@@ -46,7 +46,7 @@
 //
 // -----------------------------------------------------------------------------
 CorePlugin::CorePlugin()
-: m_Version(SIMPLib::Version::Package())
+: m_Version(SIMPLib::Version::Complete())
 , m_CompatibilityVersion(SIMPLib::Version::Package())
 , m_Vendor("OpenSource")
 , m_URL("http://www.bluequartz.net")

From 19a5caf5ccb3012449ac52f5bcaf884d2c782be8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Jun 2020 18:34:58 -0400
Subject: [PATCH 240/397] Fixes CreateGeometry to properly generate a RectGrid
 Geometry.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 74611c27dc..a9c9476dc1 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -346,13 +346,21 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      rectgrid->setXBounds(m_XBoundsPtr.lock());
-      rectgrid->setYBounds(m_YBoundsPtr.lock());
-      rectgrid->setZBounds(m_ZBoundsPtr.lock());
 
-      getDataContainerArray()->getAttributeMatrix(getXBoundsArrayPath())->removeAttributeArray(getXBoundsArrayPath().getDataArrayName());
-      getDataContainerArray()->getAttributeMatrix(getYBoundsArrayPath())->removeAttributeArray(getYBoundsArrayPath().getDataArrayName());
-      getDataContainerArray()->getAttributeMatrix(getZBoundsArrayPath())->removeAttributeArray(getZBoundsArrayPath().getDataArrayName());
+      DataContainerArray::Pointer dca = getDataContainerArray();
+      DataContainer::Pointer dc = dca->getDataContainer(getXBoundsArrayPath());
+      AttributeMatrix::Pointer am = dc->getAttributeMatrix(getXBoundsArrayPath());
+
+      auto nameList = am->getAttributeArrayNames();
+
+      FloatArrayType::Pointer farray = std::dynamic_pointer_cast<FloatArrayType>(am->removeAttributeArray(getXBoundsArrayPath().getDataArrayName()));
+      rectgrid->setXBounds(farray);
+
+      farray = std::dynamic_pointer_cast<FloatArrayType>(am->removeAttributeArray(getYBoundsArrayPath().getDataArrayName()));
+      rectgrid->setYBounds(farray);
+
+      farray = std::dynamic_pointer_cast<FloatArrayType>(am->removeAttributeArray(getZBoundsArrayPath().getDataArrayName()));
+      rectgrid->setZBounds(farray);
     }
     rectgrid->setDimensions(SizeVec3Type(m_XBoundsPtr.lock()->getNumberOfTuples() - 1, m_YBoundsPtr.lock()->getNumberOfTuples() - 1, m_ZBoundsPtr.lock()->getNumberOfTuples() - 1));
     dc->setGeometry(rectgrid);

From 44bbc9d59bbb33796a9a4354db6fedc3ebcb8559 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 2 Jun 2020 11:22:08 -0400
Subject: [PATCH 241/397] Check generated python bindings file against previous
 run.

If the generated .cpp file is the same as the previous run then do nothing,
otherwise use the newly generated file. This saves a lot of compile time on subsequent
compiles when the bindings are not changing.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Binding/generate_python_bindings.py       | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 82eefcc8ed..2ed40a05d6 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -1,6 +1,8 @@
 import argparse
 import os
 import re
+import pathlib
+import filecmp
 
 from collections import Counter, defaultdict
 from pathlib import Path
@@ -440,7 +442,7 @@ def sort_inherited_classes(classes: List[PyClass]) -> List[PyClass]:
   return result
 
 def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str) -> None:
-  with open(f'{output_dir}/py_simpl.cpp', 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
+  with open(f'{output_dir}/py_simpl_temp.cpp', 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
     with open(header_path, 'r') as header_file:
       header_code = header_file.read()
       module_file.write(header_code)
@@ -489,7 +491,7 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
 
 
 def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, header_path: str = '', body_path: str = '', plugin_name: str = '') -> None:
-  with open(f'{output_dir}/py_{module_name}.cpp', 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
+  with open(f'{output_dir}/py_{module_name}_temp.cpp', 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
     includes = files
     if include_dir:
       includes = []
@@ -590,6 +592,21 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = list(dict.fromkeys(files))
   return files
 
+def move_file(temp_file, target_file):
+  final_file_path = pathlib.Path(target_file)
+  
+  if final_file_path.exists ():
+      #print ("Final File exists, comparing contents...")
+      if filecmp.cmp(temp_file, target_file, shallow=False):
+        #print("   Contents are the same. Removing temp file...")
+        os.remove(temp_file)
+      else:
+        #print ("  Contents differ, moving new file into place...")
+        os.rename(temp_file, target_file)
+  else:
+      #print("File Does NOT Exist. Renaming Temp file...")
+      os.rename(temp_file, target_file)
+
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()
   parser.add_argument('output_dir')
@@ -611,6 +628,7 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
       parser.error('--plugin requires --module_name')
     files = read_plugin_file_list(args.file_list_path, args.source_dir)
     generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.header_path, args.body_path, args.plugin_name)
+    move_file(f'{args.output_dir}/py_{args.module_name}_temp.cpp', f'{args.output_dir}/py_{args.module_name}.cpp')
 
   else:
     if args.header_path is None:
@@ -619,5 +637,6 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
       parser.error('requires --body_path')
     files = read_simpl_file_list(args.file_list_path, args.source_dir)
     generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name)
+    move_file(f'{args.output_dir}/py_simpl_temp.cpp', f'{args.output_dir}/py_simpl.cpp')
 
 

From 5a8fecfe7fd36cc3da6c84a91e4299825ee57f52 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 3 Jun 2020 12:58:37 -0400
Subject: [PATCH 242/397] Update Clang Tidy to report unused return values

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .clang-tidy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 9ece682801..aec8266d45 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,4 +1,4 @@
-Checks:          '-*,modernize-use-nullptr,modernize-deprecated-headers,modernize-shrink-to-fit,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-override,modernize-use-equals-default,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-container-size-empty,readability-delete-null-pointer,readability-else-after-return,readability-implicit-bool-conversion,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-member-init,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare'
+Checks:          '-*,modernize-use-nullptr,modernize-deprecated-headers,modernize-shrink-to-fit,modernize-use-bool-literals,modernize-use-default-member-init,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-override,modernize-use-equals-default,readability-avoid-const-params-in-decls,readability-braces-around-statements,readability-container-size-empty,readability-delete-null-pointer,readability-else-after-return,readability-implicit-bool-conversion,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-member-init,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-boolean-expr,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,bugprone-unused-return-value'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false

From 307ca6c1286add643ff90552a5bcff5be4c48814 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 3 Jun 2020 14:50:44 -0400
Subject: [PATCH 243/397] General Code Cleanups based on Clang-Tidy feedback
 (#406)

* General Code cleanup based on clang-tidy feedback
* Fix GCC Compiler error in Unit Test

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/NamedCollection.hpp     |  7 ++----
 .../CoreFilters/GenerateTiltSeries.cpp        | 25 ++++++++++++++++---
 Source/SIMPLib/DataContainers/DataArrayPath.h |  2 +-
 .../DataContainers/IDataStructureNode.cpp     |  2 +-
 .../DataContainers/IDataStructureNode.h       |  2 +-
 .../FilterParameters/StackFileListInfo.cpp    |  9 +++++++
 .../FilterParameters/StackFileListInfo.h      |  2 ++
 .../Testing/Cxx/FilterParametersRWTest.cpp    |  2 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |  2 +-
 Source/SIMPLib/Filtering/ComparisonInputs.cpp |  2 +-
 Source/SIMPLib/Filtering/ComparisonInputs.h   |  4 +--
 .../Filtering/ComparisonInputsAdvanced.cpp    |  2 +-
 .../Filtering/ComparisonInputsAdvanced.h      |  4 +--
 Source/SIMPLib/Math/GeometryMath.cpp          |  4 +--
 Source/SIMPLib/Math/GeometryMath.h            |  4 +--
 Source/SIMPLib/Montages/AbstractMontage.h     |  2 +-
 16 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/Source/SIMPLib/Common/NamedCollection.hpp b/Source/SIMPLib/Common/NamedCollection.hpp
index b7863406de..031bfc1ae4 100644
--- a/Source/SIMPLib/Common/NamedCollection.hpp
+++ b/Source/SIMPLib/Common/NamedCollection.hpp
@@ -118,10 +118,7 @@ class NamedCollection : public INamedCollection
   /**
    * @brief Default constructor
    */
-  NamedCollection()
-  {
-  }
-
+  NamedCollection() = default;
   // NamedCollection(const NamedCollection<T>& other)
   //: m_Items(other.m_Items)
   //{
@@ -134,7 +131,7 @@ class NamedCollection : public INamedCollection
   /**
    * @brief Remove all children from the collection before it is destroyed.
    */
-  virtual ~NamedCollection()
+  ~NamedCollection() override
   {
     clear();
   }
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index f06f855d0b..cd62e82fa1 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -94,12 +94,19 @@ class ResampleGrid
   using CoordinateType = FloatVec3Type;
   using OrientationMatrixType = std::vector<float>;
 
-  ResampleGrid(GenerateTiltSeries* filter, const FloatArrayType::Pointer& inputGrid, const DataContainer::Pointer& outDc, const AxisAngleType& rotationAxis, size_t gridIndex)
+  ResampleGrid(GenerateTiltSeries* filter, const FloatArrayType::Pointer& inputGrid, const DataContainer::Pointer& outDc, const AxisAngleType& rotationAxis
+#if GTS_GENERATE_DEBUG_ARRAYS
+               ,
+               size_t gridIndex
+#endif
+               )
   : m_Filter(filter)
   , m_Coords(inputGrid)
   , m_OutputDC(outDc)
   , m_RotationAxis(rotationAxis)
+#if GTS_GENERATE_DEBUG_ARRAYS
   , m_GridIndex(gridIndex)
+#endif
   {
   }
   ~ResampleGrid() = default;
@@ -297,7 +304,9 @@ class ResampleGrid
   FloatArrayType::Pointer m_Coords;
   DataContainer::Pointer m_OutputDC;
   std::array<float, 4> m_RotationAxis;
+#if GTS_GENERATE_DEBUG_ARRAYS
   size_t m_GridIndex = 0;
+#endif
 };
 
 } // namespace Detail
@@ -489,7 +498,12 @@ void GenerateTiltSeries::execute()
     }
 
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
-    g->run(Detail::ResampleGrid(this, gridCoords, gridDC, rotationAxis, gridIndex));
+    g->run(Detail::ResampleGrid(this, gridCoords, gridDC, rotationAxis
+#if GTS_GENERATE_DEBUG_ARRAYS
+                                ,
+                                gridIndex
+#endif
+                                ));
     threadCount++;
     if(threadCount == nthreads)
     {
@@ -498,7 +512,12 @@ void GenerateTiltSeries::execute()
     }
 #else
     //    std::cout << "Resample Deg = " << currentDeg << std::endl;
-    Detail::ResampleGrid impl(this, gridCoords, gridDC, rotationAxis, gridIndex);
+    Detail::ResampleGrid impl(this, gridCoords, gridDC, rotationAxis
+#if GTS_GENERATE_DEBUG_ARRAYS
+                              ,
+                              gridIndex
+#endif
+    );
     impl();
 #endif
 
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 76d7360421..96ebcb8546 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -69,7 +69,7 @@ class SIMPLib_EXPORT DataArrayPathHelper final : public QObject
   };
   Q_ENUM(DataType)
 
-  ~DataArrayPathHelper() = default;
+  ~DataArrayPathHelper() override = default;
 
 private:
   DataArrayPathHelper() = default;
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
index de4e0a4f4c..c1cf7886ed 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
@@ -131,7 +131,7 @@ IDataStructureNode::ParentType* IDataStructureNode::getParentNode() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IDataStructureNode::setParentNode(ParentType* const parent)
+void IDataStructureNode::setParentNode(ParentType* parent)
 {
   if(parent == m_Parent)
   {
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index 42869b4c0f..45eea53ccd 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -96,7 +96,7 @@ class SIMPLib_EXPORT IDataStructureNode
    * IDataStructureNode::clearParentNode.  THIS DOES NOT ADD THE NODE TO THE TARGET PARENT!
    * @param parent
    */
-  void setParentNode(ParentType* const parent);
+  void setParentNode(ParentType* parent);
 
   /**
    * @brief Clears the parent pointer and removes this from its parent constainer.
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
index 1d08cb78f6..292e8c8392 100644
--- a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
@@ -35,6 +35,15 @@
 // -----------------------------------------------------------------------------
 StackFileListInfo::StackFileListInfo() = default;
 
+// -----------------------------------------------------------------------------
+StackFileListInfo::StackFileListInfo(const QString& extension, int32_t startIndex, int32_t endIndex, int32_t padding)
+{
+  FileExtension = extension;
+  StartIndex = startIndex;
+  EndIndex = endIndex;
+  PaddingDigits = padding;
+}
+
 // -----------------------------------------------------------------------------
 StackFileListInfo::~StackFileListInfo() = default;
 
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.h b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
index 191c76003a..a4b53f518d 100644
--- a/Source/SIMPLib/FilterParameters/StackFileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
@@ -43,6 +43,8 @@ class SIMPLib_EXPORT StackFileListInfo : public FileListInfo
   StackFileListInfo();
   ~StackFileListInfo() override;
 
+  StackFileListInfo(const QString& extension, int32_t startIndex, int32_t endIndex, int32_t padding);
+
   qint32 StartIndex = 0;
   qint32 EndIndex = 1;
 
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 027a9c7ffa..43c527f25b 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -107,7 +107,7 @@ class FilterParametersRWTest
     m_AxisAngle1.k = 6.4f;
     m_AxisAngle1.l = 8.2f;
 
-    m_ComparisonInputs1.addInput("DataContainer", "AttributeMatrix", "DataArrayName", 2, 4.6);
+    m_ComparisonInputs1.addInput(QString("DataContainer"), QString("AttributeMatrix"), QString("DataArrayName"), 2, 4.6);
 
     {
       DataArrayProxy daProxy = DataArrayProxy("TestPath", "TestName");
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index f3ea806add..e5715b77f8 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -121,7 +121,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   /**
    * @brief Returns the name of the class for AbstractFilter
    */
-  virtual QString getNameOfClass() const = 0;
+  QString getNameOfClass() const override = 0;
 
   /**
    * @brief Returns the name of the class for AbstractFilter
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.cpp b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
index 5358952356..e356658788 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
@@ -72,7 +72,7 @@ int ComparisonInputs::size()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonInputs::addInput(const QString dataContainerName, const QString attributeMatrixName, const QString arrayName, int compOperator, double compValue)
+void ComparisonInputs::addInput(const QString& dataContainerName, const QString& attributeMatrixName, const QString& arrayName, int compOperator, double compValue)
 {
   ComparisonInput_t v;
   v.dataContainerName = dataContainerName;
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index 330445af10..729e9987b5 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -100,7 +100,7 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
   PYB11_BEGIN_BINDINGS(ComparisonInputs)
   PYB11_CREATION()  
   PYB11_PROPERTY(QVector<ComparisonInput_t> Inputs READ getInputs)
-  PYB11_METHOD(void addInput OVERLOAD const.QString,dataContainerName const.QString,attributeMatrixName const.QString,arrayName int,compOperator double,compValue)
+  PYB11_METHOD(void addInput OVERLOAD const.QString.&,dataContainerName const.QString.&,attributeMatrixName const.QString.&,arrayName int,compOperator double,compValue)
   PYB11_METHOD(void addInput OVERLOAD const.ComparisonInput_t.&,input)
   //PYB11_METHOD(ComparisonInput_t& getInput ARGS index)
   //PYB11_METHOD(ComparisonInput_t& operator[] ARGS index)
@@ -118,7 +118,7 @@ class SIMPLib_EXPORT ComparisonInputs : public QObject
 
   int size();
 
-  void addInput(const QString dataContainerName, const QString attributeMatrixName, const QString arrayName, int compOperator, double compValue);
+  void addInput(const QString& dataContainerName, const QString& attributeMatrixName, const QString& arrayName, int compOperator, double compValue);
   void addInput(const ComparisonInput_t& input);
 
   ComparisonInput_t& getInput(int index);
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
index 8441afd490..731d7830f7 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
@@ -126,7 +126,7 @@ int ComparisonInputsAdvanced::size()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonInputsAdvanced::addInput(int unionOperator, const QString arrayName, int compOperator, double compValue)
+void ComparisonInputsAdvanced::addInput(int unionOperator, const QString& arrayName, int compOperator, double compValue)
 {
   ComparisonValue::Pointer v = ComparisonValue::New();
   v->setUnionOperator(unionOperator);
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index fbfbf2d402..da8260758e 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -62,7 +62,7 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
   PYB11_PROPERTY(QVector<AbstractComparison::Pointer> Inputs READ getInputs)
   PYB11_PROPERTY(DataArrayPath DataContainerName READ getDataContainerName WRITE setDataContainerName)
   PYB11_PROPERTY(QString AttributeMatrixName READ getAttributeMatrixName WRITE setAttributeMatrixName)
-  PYB11_METHOD(void addInput OVERLOAD int,unionOperator const.QString,arrayName int,compOperator double,compValue)
+  PYB11_METHOD(void addInput OVERLOAD int,unionOperator const.QString.&,arrayName int,compOperator double,compValue)
   PYB11_METHOD(void addInput OVERLOAD int,unionOperator bool,invertComparison QVector<AbstractComparison::Pointer>,comparisons)
   PYB11_METHOD(void addInput OVERLOAD AbstractComparison::Pointer,input)
   PYB11_METHOD(int size)
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT ComparisonInputsAdvanced : public QObject
    * @param compOperator
    * @param compValue
    */
-  void addInput(int unionOperator, const QString arrayName, int compOperator, double compValue);
+  void addInput(int unionOperator, const QString& arrayName, int compOperator, double compValue);
 
   /**
    * @brief Adds a new input to the list of comparisons
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 0d9284e79f..844b71a1da 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -654,7 +654,7 @@ void GeometryMath::FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GeometryMath::FindPolygonNormal(const float* vertices, const int64_t numVerts, float n[3])
+void GeometryMath::FindPolygonNormal(const float* vertices, int64_t numVerts, float n[3])
 {
   // Return immediately if the  number of vertices cannot form a polygon
   if(numVerts < 3)
@@ -907,7 +907,7 @@ char GeometryMath::RayIntersectsPlane(const float* a, const float* b, const floa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-char GeometryMath::RayIntersectsPlane(const float* n, const float d, const float* q, const float* r, float* p)
+char GeometryMath::RayIntersectsPlane(const float* n, float d, const float* q, const float* r, float* p)
 {
   float rq[3];
   float num, denom, t;
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 94ab719587..409323ae54 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -127,7 +127,7 @@ class SIMPLib_EXPORT GeometryMath
    * @param numVerts
    * @param n
    */
-  static void FindPolygonNormal(const float* vertices, const int64_t numVerts, float n[3]);
+  static void FindPolygonNormal(const float* vertices, int64_t numVerts, float n[3]);
 
   /**
    * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
@@ -364,7 +364,7 @@ class SIMPLib_EXPORT GeometryMath
    * @param p
    * @return
    */
-  static char RayIntersectsPlane(const float* n, const float d, const float* q, const float* r, float* p);
+  static char RayIntersectsPlane(const float* n, float d, const float* q, const float* r, float* p);
 
 protected:
   GeometryMath();
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
index 1f35ffb3f5..ff6fe4ad2f 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.h
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -72,7 +72,7 @@ class SIMPLib_EXPORT AbstractMontage : public INamedObject
   using Iterator = CollectionType::iterator;
   using ConstIterator = CollectionType::const_iterator;
 
-  virtual ~AbstractMontage();
+  ~AbstractMontage() override;
 
   /**
    * @brief Checks if the montage's values are valid.

From b3bde210fe818f22facabb939726ac29fb57fdb9 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 2 Jun 2020 23:43:17 -0400
Subject: [PATCH 244/397] Implemented exportPipelineToFile with
 writePipelineToFile

* Removed commented out debug code

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameters/JsonFilterParametersReader.cpp |  6 ------
 .../FilterParameters/JsonFilterParametersWriter.cpp | 13 ++-----------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 5db498c08c..c23651d7ef 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -472,12 +472,6 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
            << "Possible reasons include a name change of the filter, plugin not loading or a simple spelling mistake? A \n"
            << "blank filter has been inserted in its place. The filter name is: " << filterName << "\n";
 
-        // FilterManager::Collection factories = filtManager->getFactories();
-        // for(const auto& factory : factories)
-        // {
-        //   ss << factory->getFilterClassName() << "\n";
-        // }
-
         QString prefix = "JsonFilterParametersReader::ReadPipelineFromFile()";
         PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(pipeline->getName(), QObject::tr("%1: %2").arg(prefix).arg(msg), -66066);
         obs->processPipelineMessage(pm);
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 516820ce95..2cd282eea5 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -86,18 +86,9 @@ int JsonFilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipe
 // -----------------------------------------------------------------------------
 int JsonFilterParametersWriter::exportPipelineToFile(FilterPipeline::Pointer pipeline, QString filePath, QString pipelineName, bool expandPipeline, IObserver* obs)
 {
-  int err = 0;
-  err = populateWriter(pipeline, pipelineName, expandPipeline, {obs});
-  if(err < 0)
-  {
-    return err;
-  }
-
-  setFileName(filePath);
-  writePipeline();
-  clearWriter();
-  return err;
+  return writePipelineToFile(pipeline, filePath, pipelineName, expandPipeline, {obs});
 }
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------

From ddfe8823a146f3cb8009017e294e18c783674a41 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 2 Jun 2020 23:45:59 -0400
Subject: [PATCH 245/397] Moved all Python all modules generation to separate
 script

* Moved path separator into generator expression
* Minor tweaks to checking previous run of Python generation

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                | 19 ++++++-
 .../Python/Binding/CreatePybind11Module.cmake | 28 ++--------
 .../Binding/generate_all_modules_file.py      | 14 +++++
 .../Binding/generate_python_bindings.py       | 56 +++++++++----------
 4 files changed, 63 insertions(+), 54 deletions(-)
 create mode 100644 Wrapping/Python/Binding/generate_all_modules_file.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdc7b56dba..f8f0cec049 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,15 +503,30 @@ if(SIMPL_ENABLE_PYTHON)
 
   file(WRITE ${SIMPL_PY_SOURCES_FILE} "${SIMPL_PY_SOURCES}")
 
+  set(PY_ALL_MODULES_GENERATOR ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/generate_all_modules_file.py)
+  set(PY_ALL_MODULES_FILE ${SIMPLProj_BINARY_DIR}/Wrapping/all_modules.txt)
+  set_property(GLOBAL PROPERTY PY_ALL_MODULES_FILE ${PY_ALL_MODULES_FILE})
+
+  file(WRITE ${PY_ALL_MODULES_FILE} "")
+
   get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
+  add_custom_target(CreateDream3dModuleFile ALL
+    COMMAND ${PYTHON_EXECUTABLE} ${PY_ALL_MODULES_GENERATOR}
+    "${PY_ALL_MODULES_FILE}"
+    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
+    COMMENT "Creating dream3d.py module file"
+  )
+
+  set_property(TARGET CreateDream3dModuleFile PROPERTY FOLDER "Python")
+
   CreatePybind11Module(MODULE_NAME "simpl"
     OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
     FILE_LIST_PATH ${SIMPL_PY_SOURCES_FILE}
     SOURCE_DIR "${SIMPLProj_SOURCE_DIR}/Source"
     HEADER_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLHeader.cpp"
     BODY_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBody.cpp"
-    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
+    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     LINK_LIBRARIES SIMPLib
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
   )
@@ -519,7 +534,7 @@ if(SIMPL_ENABLE_PYTHON)
   add_custom_target(CopyPythonSupport ALL
     COMMAND ${CMAKE_COMMAND} -E copy
       ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers.py
-      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
+      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     COMMENT "Copying simpl_helpers.py to binary directory"
   )
 
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 3d125d56c2..02987d2f41 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -83,27 +83,9 @@ function(CreatePybind11Module)
 
   string(TOLOWER ${ARGS_MODULE_NAME} MODULE_NAME_lower)
 
-set(d3dAllModules "${SIMPLProj_BINARY_DIR}/CreateDream3dAll.py")
-if("${ARGS_MODULE_NAME}" STREQUAL "simpl")
-  file(WRITE "${d3dAllModules}" "import argparse\n")
-  file(APPEND "${d3dAllModules}" "import os\n")
-  file(APPEND "${d3dAllModules}" "import re\n")
-  file(APPEND "${d3dAllModules}" "from pathlib import Path\n")
-
-  file(APPEND "${d3dAllModules}" "if __name__ == '__main__':\n")
-  file(APPEND "${d3dAllModules}" "  parser = argparse.ArgumentParser()\n")
-  file(APPEND "${d3dAllModules}" "  parser.add_argument('python_output_dir')\n")
-  file(APPEND "${d3dAllModules}" "  args = parser.parse_args()\n")
-  file(APPEND "${d3dAllModules}" "  with open(f'{args.python_output_dir}/dream3d.py', 'w') as d3d_file:\n")
-  file(APPEND "${d3dAllModules}" "    d3d_file.write(f'import ${MODULE_NAME_lower}py\\n')\n")
-
-  add_custom_target(CreateDream3dModuleFile ALL
-      COMMAND ${PYTHON_EXECUTABLE} ${d3dAllModules} "${ARGS_PYTHON_OUTPUT_DIR}"
-      COMMENT "Creating dream3d.py module file")
-
-else()
-  file(APPEND "${d3dAllModules}" "    d3d_file.write(f'import ${MODULE_NAME_lower}py\\n')\n")
-endif()
+  get_property(PY_ALL_MODULES_FILE GLOBAL PROPERTY PY_ALL_MODULES_FILE)
+
+  file(APPEND ${PY_ALL_MODULES_FILE} "${MODULE_NAME_lower}\n")
 
   set(CREATE_PYTHON_BINDINGS_TARGET ${MODULE_NAME_lower}CreatePythonBindings)
   set(PYTHON_MODULE_SOURCE_FILE ${ARGS_OUTPUT_DIR}/py_${MODULE_NAME_lower}.cpp)
@@ -128,6 +110,7 @@ endif()
       COMMENT "${ARGS_MODULE_NAME}: Generating Python bindings"
       BYPRODUCTS ${PYTHON_MODULE_SOURCE_FILE}
   )
+
   set_property(TARGET ${CREATE_PYTHON_BINDINGS_TARGET} PROPERTY FOLDER "Python/Generator")
 
   add_custom_command(TARGET ${CREATE_PYTHON_BINDINGS_TARGET}
@@ -180,6 +163,7 @@ function(CreatePybind11Plugin)
   set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH)
   set(multiValueArgs)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
   get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
   CreatePybind11Module(MODULE_NAME ${ARGS_PLUGIN_NAME}
@@ -187,7 +171,7 @@ function(CreatePybind11Plugin)
     FILE_LIST_PATH "${SIMPLProj_BINARY_DIR}/Wrapping/${ARGS_PLUGIN_NAME}Filters.txt"
     SOURCE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}/${ARGS_PLUGIN_NAME}Filters"
     INCLUDE_DIR "${${ARGS_PLUGIN_NAME}_SOURCE_DIR}"
-    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/$<${_isMultiConfig}:$<CONFIG>>"
+    PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     HEADER_PATH ${ARGS_HEADER_PATH}
     BODY_PATH ${ARGS_BODY_PATH}
     LINK_LIBRARIES ${ARGS_PLUGIN_TARGET}
diff --git a/Wrapping/Python/Binding/generate_all_modules_file.py b/Wrapping/Python/Binding/generate_all_modules_file.py
new file mode 100644
index 0000000000..898af7b1b7
--- /dev/null
+++ b/Wrapping/Python/Binding/generate_all_modules_file.py
@@ -0,0 +1,14 @@
+import argparse
+
+if __name__ == '__main__':
+  parser = argparse.ArgumentParser()
+  parser.add_argument('module_list_file')
+  parser.add_argument('output_dir')
+  
+  args = parser.parse_args()
+
+  with open(args.module_list_file, 'r') as module_list_file, open(f'{args.output_dir}/dream3d.py', 'w') as d3d_file:
+    lines = module_list_file.readlines()
+    for line in lines:
+      line = line.strip()
+      d3d_file.write(f'import {line}py\n')
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 2ed40a05d6..85fd6e5c41 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -1,8 +1,7 @@
 import argparse
+import filecmp
 import os
 import re
-import pathlib
-import filecmp
 
 from collections import Counter, defaultdict
 from pathlib import Path
@@ -441,10 +440,25 @@ def sort_inherited_classes(classes: List[PyClass]) -> List[PyClass]:
 
   return result
 
+def replace_file_if_different(temp_file: str, target_file: str) -> None:
+  target_file_path = Path(target_file)
+  
+  if target_file_path.exists():
+    if filecmp.cmp(temp_file, target_file, shallow=False):
+      os.remove(temp_file)
+    else:
+      os.remove(target_file)
+      os.rename(temp_file, target_file)
+  else:
+    os.rename(temp_file, target_file)
+
 def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str) -> None:
-  with open(f'{output_dir}/py_simpl_temp.cpp', 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
+  module_target_file_path = f'{output_dir}/py_simpl.cpp'
+  module_temp_file_path = f'{module_target_file_path}.temp'
+  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
     with open(header_path, 'r') as header_file:
       header_code = header_file.read()
+      module_file.write(f'// This file is automatically generated during build time by {__file__}\n\n')
       module_file.write(header_code)
 
     module_file.write('\n')
@@ -488,10 +502,12 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
       module_file.write(body_code)
 
     module_file.write('}\n')
+  replace_file_if_different(module_temp_file_path, module_target_file_path)
 
-
-def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, header_path: str = '', body_path: str = '', plugin_name: str = '') -> None:
-  with open(f'{output_dir}/py_{module_name}_temp.cpp', 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
+def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, plugin_name: str, header_path: str = '', body_path: str = '') -> None:
+  module_target_file_path = f'{output_dir}/py_{module_name}.cpp'
+  module_temp_file_path = f'{module_target_file_path}.temp'
+  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
     includes = files
     if include_dir:
       includes = []
@@ -515,12 +531,12 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
         custom_body_code = body_file.read()
 
     header_code = (
-      '// This header is automatically generated during build time by the "generate_python_bindings.py" file\n\n'
+      f'// This file is automatically generated during build time by {__file__}\n\n'
       '#include <memory>\n\n'
       '#include \"pybind11/pybind11.h\"\n\n'
       '#include \"SIMPLib/Filtering/FilterManager.h\"\n\n'
+      f'#include \"{plugin_name}/{plugin_name}Plugin.h\"\n\n'
       '#include \"Binding/Pybind11CustomTypeCasts.h\"\n\n'
-      f'#include \"{plugin_name}/{plugin_name}Plugin.h\"\n'
       f'{custom_header_code}\n'
       f'{include_code}\n\n'
       'namespace py = pybind11;\n'
@@ -565,6 +581,7 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
     module_file.write(f'  {plugin_name}Plugin {module_name}Plugin;\n')
     module_file.write(f'  {module_name}Plugin.registerFilters(FilterManager::Instance());\n')
     module_file.write('\n}\n')
+  replace_file_if_different(module_temp_file_path, module_target_file_path)
 
 def read_plugin_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = []
@@ -592,21 +609,6 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = list(dict.fromkeys(files))
   return files
 
-def move_file(temp_file, target_file):
-  final_file_path = pathlib.Path(target_file)
-  
-  if final_file_path.exists ():
-      #print ("Final File exists, comparing contents...")
-      if filecmp.cmp(temp_file, target_file, shallow=False):
-        #print("   Contents are the same. Removing temp file...")
-        os.remove(temp_file)
-      else:
-        #print ("  Contents differ, moving new file into place...")
-        os.rename(temp_file, target_file)
-  else:
-      #print("File Does NOT Exist. Renaming Temp file...")
-      os.rename(temp_file, target_file)
-
 if __name__ == '__main__':
   parser = argparse.ArgumentParser()
   parser.add_argument('output_dir')
@@ -620,16 +622,13 @@ def move_file(temp_file, target_file):
   parser.add_argument('--plugin_name')
   parser.add_argument('--plugin', action='store_true')
 
-
   args = parser.parse_args()
 
   if args.plugin:
     if args.module_name is None:
       parser.error('--plugin requires --module_name')
     files = read_plugin_file_list(args.file_list_path, args.source_dir)
-    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.header_path, args.body_path, args.plugin_name)
-    move_file(f'{args.output_dir}/py_{args.module_name}_temp.cpp', f'{args.output_dir}/py_{args.module_name}.cpp')
-
+    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.plugin_name, args.header_path, args.body_path)
   else:
     if args.header_path is None:
       parser.error('requires --header_path')
@@ -637,6 +636,3 @@ def move_file(temp_file, target_file):
       parser.error('requires --body_path')
     files = read_simpl_file_list(args.file_list_path, args.source_dir)
     generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name)
-    move_file(f'{args.output_dir}/py_simpl_temp.cpp', f'{args.output_dir}/py_simpl.cpp')
-
-

From 2b5f9860ddd58dabaf4727d5495a724be3b1bcdd Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 2 Jun 2020 23:46:28 -0400
Subject: [PATCH 246/397] Added docstring to generated Pythonic interface for
 filters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/generate_python_bindings.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 85fd6e5c41..e581b16508 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -153,6 +153,12 @@ def generate_python_interface(self, module_name: str) -> str:
     if args_text:
       args_text = ', ' + args_text
     code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}):\n'
+    code += '  \"\"\"\n'
+    code += f'  {self.name}\n\n'
+    code += '  :param DataContainerArray data_container_array\n'
+    for prop in self.properties:
+      code += f'  :param {prop.type} {prop.name}\n'
+    code += ' \"\"\"\n\n'
     code += f'  filter = {module_name}.{self.name}()\n'
     code += f'  filter.setDataContainerArray(data_container_array)\n'
 

From 03645b97a560231d96acdffcd7af4bb77c44da1a Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 22 Apr 2020 13:28:25 -0400
Subject: [PATCH 247/397] Changed H5Support to use CMake interface target

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CMakeLists.txt | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index 2f2fcf5ade..affc4a4e33 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -177,7 +177,7 @@ cmpReplaceFileIfDifferent(OLD_FILE_PATH  ${SIMPLib_BINARY_DIR}/CoreFilters/Regis
                           NEW_FILE_PATH  ${RegisterKnownFiltersFile} )
 
 
-set(${PROJECT_NAME}_LINK_LIBS Qt5::Core Qt5::Network)
+set(${PROJECT_NAME}_LINK_LIBS Qt5::Core Qt5::Network H5Support::H5Support)
 
 if( "${SIMPL_USE_MULTITHREADED_ALGOS}" STREQUAL "ON")
   list(APPEND ${PROJECT_NAME}_LINK_LIBS TBB::tbb TBB::tbbmalloc)
@@ -196,24 +196,8 @@ endif()
 add_library(${PROJECT_NAME} ${LIB_TYPE} ${Project_SRCS} )
 CMP_AddDefinitions(TARGET ${PROJECT_NAME})
 
-#-------------------------------------------------------------------------------
-# Add in the H5Support Header Only Library
-set(H5Support_HDRS
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Lite.h       
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Macros.h   
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5ScopedErrorHandler.h 
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5ScopedSentinel.h   
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Support.h         
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5SupportVersion.h   
-  ${H5Support_SOURCE_DIR}/Source/H5Support/H5Utilities.h     
-  ${H5Support_SOURCE_DIR}/Source/H5Support/QH5Lite.h          
-  ${H5Support_SOURCE_DIR}/Source/H5Support/QH5Utilities.h
-)
-target_sources(${PROJECT_NAME}  PUBLIC ${H5Support_HDRS})
-source_group("${SIMPLibPRoj_SOURCE_DIR}/H5Support" FILES ${H5Support_HDRS})
-list(APPEND ${PROJECT_NAME}_LINK_LIBS ${HDF5_C_TARGET_NAME})
-target_compile_definitions( ${PROJECT_NAME} PUBLIC -DH5Support_USE_QT)
-target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${H5Support_SOURCE_DIR}/Source>)
+# Add H5Support
+add_subdirectory(${H5Support_SOURCE_DIR} ${PROJECT_BINARY_DIR}/H5Support)
 
 #-- Add Target specific definitions
 if(WIN32 AND BUILD_SHARED_LIBS)

From 11394f956b9eaa36d04a6fe0bf30144ced66e03a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 9 Jun 2020 22:20:21 -0400
Subject: [PATCH 248/397] RectGrid Geometry: Copy the units from the source
 geometry (Deep Copy)

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Geometry/RectGridGeom.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 5ed4301237..544759110f 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -1145,6 +1145,7 @@ IGeometry::Pointer RectGridGeom::deepCopy(bool forceNoAllocate) const
   copy->setZBounds(zBounds);
   copy->setElementSizes(elementSizes);
   copy->setSpatialDimensionality(getSpatialDimensionality());
+  copy->setUnits(getUnits());
 
   return copy;
 }

From 5dce1f40c2acc789bf51481f2782c927980609f5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Jun 2020 13:31:45 -0400
Subject: [PATCH 249/397] Fix runtime exception in ImportHDF5DatasetWidget.

* Passing in a scalar value instead of an array to a possible array of data.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../ImportHDF5DatasetWidget.cpp               | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 73bab534a0..abd574aab9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -821,15 +821,25 @@ herr_t ImportHDF5DatasetWidget::updateAttributeTable(const QString& path)
         }
         if(classType == H5T_INTEGER)
         {
-          int data = 0;
-          err = QH5Lite::readScalarAttribute(parentLoc, objName, key, data);
-          strData = QString::number(data);
+          std::vector<int32_t> data;
+          err = QH5Lite::readVectorAttribute(parentLoc, objName, key, data);
+          strData.clear();
+          QTextStream ss(&strData);
+          for(const auto& i : data)
+          {
+            ss << i << " ";
+          }
         }
         if(classType == H5T_FLOAT)
         {
-          float data = 0.0f;
-          err = QH5Lite::readScalarAttribute(parentLoc, objName, key, data);
-          strData = QString::number(data);
+          std::vector<float> data;
+          err = QH5Lite::readVectorAttribute(parentLoc, objName, key, data);
+          strData.clear();
+          QTextStream ss(&strData);
+          for(const auto& i : data)
+          {
+            ss << i << " ";
+          }
         }
         if(classType == H5T_TIME)
         {

From fbea021afe58b8a7cf852c44d92213449c1bfc80 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 12 Jun 2020 13:24:32 -0400
Subject: [PATCH 250/397] Updated to C++ 17

* Updated constants to use constexpr and fixed width integer types
* Removed extra whitespace from some string constants
* Updated some code to use C++ 17 features

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                          |   4 +-
 Source/SIMPLib/Common/Constants.h       | 268 ++++++++++++------------
 Source/SIMPLib/DataArrays/DataArray.cpp | 131 ++++++------
 Source/SIMPLib/DataArrays/DataArray.hpp |  32 +--
 Wrapping/Python/Binding/pySIMPLBody.cpp |  22 +-
 5 files changed, 219 insertions(+), 238 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8f0cec049..1fa607fdc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,8 +24,8 @@ if(NOT "${DREAM3D_SDK}" STREQUAL "")
   endif()
 endif()
 
-# Request C++11 standard, using new CMake variables.
-set(CMAKE_CXX_STANDARD 14)
+# Request C++17 standard, using new CMake variables.
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_CXX_EXTENSIONS False)
 
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 2db5138c89..fca773b4e2 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -66,11 +66,11 @@ namespace SIMPL
 {
 
 using Rgb = uint32_t;
-const Rgb RGB_MASK = 0x00ffffff; // masks RGB values
+constexpr Rgb RGB_MASK = 0x00ffffff; // masks RGB values
 const QString PathSep("|");
-const uint8_t Unchecked = 0;
-const uint8_t PartiallyChecked = 1;
-const uint8_t Checked = 2;
+constexpr uint8_t Unchecked = 0;
+constexpr uint8_t PartiallyChecked = 1;
+constexpr uint8_t Checked = 2;
 
 enum InfoStringFormat
 {
@@ -85,9 +85,9 @@ enum InfoStringFormat
 /** @brief Constants defined for the Stacking order of images into a 3D Volume */
 namespace RefFrameZDir
 {
-const unsigned int LowtoHigh = 0;
-const unsigned int HightoLow = 1;
-const unsigned int UnknownRefFrameZDirection = 2;
+constexpr uint32_t LowtoHigh = 0;
+constexpr uint32_t HightoLow = 1;
+constexpr uint32_t UnknownRefFrameZDirection = 2;
 } // namespace RefFrameZDir
 
 namespace TypeNames
@@ -116,20 +116,20 @@ const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray
 
 namespace TypeEnums
 {
-const int Int8 = 0;
-const int UInt8 = 1;
-const int Int16 = 2;
-const int UInt16 = 3;
-const int Int32 = 4;
-const int UInt32 = 5;
-const int Int64 = 6;
-const int UInt64 = 7;
-const int Float = 8;
-const int Double = 9;
-const int Bool = 10;
-const int SizeT = 11;
-
-const int UnknownType = 12;
+constexpr int32_t Int8 = 0;
+constexpr int32_t UInt8 = 1;
+constexpr int32_t Int16 = 2;
+constexpr int32_t UInt16 = 3;
+constexpr int32_t Int32 = 4;
+constexpr int32_t UInt32 = 5;
+constexpr int32_t Int64 = 6;
+constexpr int32_t UInt64 = 7;
+constexpr int32_t Float = 8;
+constexpr int32_t Double = 9;
+constexpr int32_t Bool = 10;
+constexpr int32_t SizeT = 11;
+
+constexpr int32_t UnknownType = 12;
 const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
                                 TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
 } // namespace TypeEnums
@@ -138,21 +138,21 @@ namespace NumericTypes
 {
 namespace Names
 {
-const QString Int8("signed   int 8  bit");
-const QString UInt8("unsigned int 8  bit");
-const QString Int16("signed   int 16 bit");
+const QString Int8("signed int 8 bit");
+const QString UInt8("unsigned int 8 bit");
+const QString Int16("signed int 16 bit");
 const QString UInt16("unsigned int 16 bit");
-const QString Int32("signed   int 32 bit");
+const QString Int32("signed int 32 bit");
 const QString UInt32("unsigned int 32 bit");
-const QString Int64("signed   int 64 bit");
+const QString Int64("signed int 64 bit");
 const QString UInt64("unsigned int 64 bit");
-const QString Float("       Float 32 bit");
-const QString Double("      Double 64 bit");
+const QString Float("Float 32 bit");
+const QString Double("Double 64 bit");
 const QString Bool("Bool");
 const QString SizeT("size_t");
 } // namespace Names
 
-enum class Type : int
+enum class Type : int32_t
 {
   Int8 = 0,
   UInt8,
@@ -176,7 +176,7 @@ const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes:
 
 namespace DelimiterTypes
 {
-enum class Type : int
+enum class Type : int32_t
 {
   Comma = 0,
   Semicolon = 1,
@@ -188,7 +188,7 @@ enum class Type : int
 
 namespace ScalarTypes
 {
-enum class Type : int
+enum class Type : int32_t
 {
   Int8 = 0,
   UInt8,
@@ -215,8 +215,8 @@ namespace Defaults
 const QString None("None");
 const QString AnyPrimitive("Any");
 const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
-// const uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
-// const uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
+// constexpr uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
+// constexpr uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
 
 const QString AttributeMatrixName("AttributeMatrix");
 const QString ElementAttributeMatrixName("ElementAttributeMatrix");
@@ -273,7 +273,7 @@ const QString NewAttributeMatrixName("NewAttributeMatrixName");
 
 namespace PipelineVersionNumbers
 {
-const int CurrentVersion(6);
+constexpr int32_t CurrentVersion(6);
 }
 
 namespace FilterGroups
@@ -719,12 +719,12 @@ const QString Node("Node");
 
 // namespace PhaseType
 //{
-//  //const unsigned int PrimaryPhase = 0;              //!<
-//  //const unsigned int PrecipitatePhase = 1;          //!<
-//  //const unsigned int TransformationPhase = 2;       //!<
-//  //const unsigned int MatrixPhase = 3;              //!<
-//  //const unsigned int BoundaryPhase = 4;              //!<
-//  //const unsigned int Unknown = 999;    //!<
+//  //constexpr uint32_t PrimaryPhase = 0;              //!<
+//  //constexpr uint32_t PrecipitatePhase = 1;          //!<
+//  //constexpr uint32_t TransformationPhase = 2;       //!<
+//  //constexpr uint32_t MatrixPhase = 3;              //!<
+//  //constexpr uint32_t BoundaryPhase = 4;              //!<
+//  //constexpr uint32_t Unknown = 999;    //!<
 
 //  const QString Primary("Primary");
 //  const QString Precipitate("Precipitate");
@@ -736,33 +736,33 @@ const QString Node("Node");
 
 namespace AlignmentMethod
 {
-const unsigned int OuterBoundary = 0;            //!<
-const unsigned int Misorientation = 1;           //!<
-const unsigned int MutualInformation = 2;        //!<
-const unsigned int Count = 3;                    //!<
-const unsigned int UnknownAlignmentMethod = 999; //!<
+constexpr uint32_t OuterBoundary = 0;            //!<
+constexpr uint32_t Misorientation = 1;           //!<
+constexpr uint32_t MutualInformation = 2;        //!<
+constexpr uint32_t Count = 3;                    //!<
+constexpr uint32_t UnknownAlignmentMethod = 999; //!<
 } // namespace AlignmentMethod
 
 namespace StatisticsType
 {
-const unsigned int Feature_SizeVBoverA = 0;      //!<
-const unsigned int Feature_SizeVCoverA = 1;      //!<
-const unsigned int Feature_SizeVNeighbors = 2;   //!<
-const unsigned int Feature_SizeVOmega3 = 3;      //!<
-const unsigned int Feature_SizeVClustering = 4;  //!<
-const unsigned int UnknownStatisticsGroup = 999; //!<
+constexpr uint32_t Feature_SizeVBoverA = 0;      //!<
+constexpr uint32_t Feature_SizeVCoverA = 1;      //!<
+constexpr uint32_t Feature_SizeVNeighbors = 2;   //!<
+constexpr uint32_t Feature_SizeVOmega3 = 3;      //!<
+constexpr uint32_t Feature_SizeVClustering = 4;  //!<
+constexpr uint32_t UnknownStatisticsGroup = 999; //!<
 
 } // namespace StatisticsType
 
 namespace DistributionType
 {
-const unsigned int Beta = 0;                    //!<
-const unsigned int LogNormal = 1;               //!<
-const unsigned int Power = 2;                   //!<
-const unsigned int RDFFrequency = 3;            //!<
-const unsigned int RDFMaxMin = 4;               //!<
-const unsigned int UnknownDistributionType = 5; //!<
-const unsigned int Count = 6;                   //!<
+constexpr uint32_t Beta = 0;                    //!<
+constexpr uint32_t LogNormal = 1;               //!<
+constexpr uint32_t Power = 2;                   //!<
+constexpr uint32_t RDFFrequency = 3;            //!<
+constexpr uint32_t RDFMaxMin = 4;               //!<
+constexpr uint32_t UnknownDistributionType = 5; //!<
+constexpr uint32_t Count = 6;                   //!<
 
 enum ColumnCount
 {
@@ -777,83 +777,83 @@ enum ColumnCount
 
 namespace EulerAngleConversionType
 {
-const unsigned int DegreesToRadians = 0; //!<
-const unsigned int RadiansToDegrees = 1; //!<
+constexpr uint32_t DegreesToRadians = 0; //!<
+constexpr uint32_t RadiansToDegrees = 1; //!<
 } // namespace EulerAngleConversionType
 
 namespace FlattenImageMethod
 {
-const unsigned int Lightness = 0;  //!<
-const unsigned int Average = 1;    //!<
-const unsigned int Luminosity = 2; //!<
+constexpr uint32_t Lightness = 0;  //!<
+constexpr uint32_t Average = 1;    //!<
+constexpr uint32_t Luminosity = 2; //!<
 } // namespace FlattenImageMethod
 
 namespace EulerFrameRotationAxis
 {
-const unsigned int RD = 0;   //!<
-const unsigned int TD = 1;   //!<
-const unsigned int ND = 2;   //!<
-const unsigned int None = 3; //!<
+constexpr uint32_t RD = 0;   //!<
+constexpr uint32_t TD = 1;   //!<
+constexpr uint32_t ND = 2;   //!<
+constexpr uint32_t None = 3; //!<
 } // namespace EulerFrameRotationAxis
 
 namespace SampleFrameRotationAxis
 {
-const unsigned int X = 0;    //!<
-const unsigned int Y = 1;    //!<
-const unsigned int Z = 2;    //!<
-const unsigned int None = 3; //!<
+constexpr uint32_t X = 0;    //!<
+constexpr uint32_t Y = 1;    //!<
+constexpr uint32_t Z = 2;    //!<
+constexpr uint32_t None = 3; //!<
 } // namespace SampleFrameRotationAxis
 
 namespace RefFrameRotationAngle
 {
-const unsigned int Ninety = 0;     //!<
-const unsigned int oneEighty = 1;  //!<
-const unsigned int twoSeventy = 2; //!<
-const unsigned int Mirror = 3;     //!<
-const unsigned int Zero = 4;       //!<
+constexpr uint32_t Ninety = 0;     //!<
+constexpr uint32_t oneEighty = 1;  //!<
+constexpr uint32_t twoSeventy = 2; //!<
+constexpr uint32_t Mirror = 3;     //!<
+constexpr uint32_t Zero = 4;       //!<
 } // namespace RefFrameRotationAngle
 
 namespace Overlap
 {
-const unsigned int Rigid = 0;            //!<
-const unsigned int Progressive = 1;      //!<
-const unsigned int UnknownOverlap = 999; //!<
+constexpr uint32_t Rigid = 0;            //!<
+constexpr uint32_t Progressive = 1;      //!<
+constexpr uint32_t UnknownOverlap = 999; //!<
 } // namespace Overlap
 
 //  namespace DataContainerType
 //  {
-//    const unsigned int VolumeDataContainer = 0; //!<
-//    const unsigned int SurfaceDataContainer = 1; //!<
-//    const unsigned int EdgeDataContainer = 2; //!<
-//    const unsigned int VertexDataContainer = 3; //!<
-//    const unsigned int UnknownDataContainer = 999; //!<
+//    constexpr uint32_t VolumeDataContainer = 0; //!<
+//    constexpr uint32_t SurfaceDataContainer = 1; //!<
+//    constexpr uint32_t EdgeDataContainer = 2; //!<
+//    constexpr uint32_t VertexDataContainer = 3; //!<
+//    constexpr uint32_t UnknownDataContainer = 999; //!<
 //  }
 
 //  namespace AttributeMatrixType
 //  {
-//    const unsigned int Vertex = 0; //!<
-//    const unsigned int Edge = 1; //!<
-//    const unsigned int Face = 2; //!<
-//    const unsigned int Cell = 3; //!<
-//    const unsigned int VertexFeature = 4; //!<
-//    const unsigned int EdgeFeature = 5; //!<
-//    const unsigned int FaceFeature = 6; //!<
-//    const unsigned int CellFeature = 7; //!<
-//    const unsigned int VertexEnsemble = 8; //!<
-//    const unsigned int EdgeEnsemble = 9; //!<
-//    const unsigned int FaceEnsemble = 10; //!<
-//    const unsigned int CellEnsemble = 11; //!<
-//    const unsigned int MetaData = 12; //!<
-//    const unsigned int Generic = 13; //!<
-//    const unsigned int Unknown = 999; //!<
+//    constexpr uint32_t Vertex = 0; //!<
+//    constexpr uint32_t Edge = 1; //!<
+//    constexpr uint32_t Face = 2; //!<
+//    constexpr uint32_t Cell = 3; //!<
+//    constexpr uint32_t VertexFeature = 4; //!<
+//    constexpr uint32_t EdgeFeature = 5; //!<
+//    constexpr uint32_t FaceFeature = 6; //!<
+//    constexpr uint32_t CellFeature = 7; //!<
+//    constexpr uint32_t VertexEnsemble = 8; //!<
+//    constexpr uint32_t EdgeEnsemble = 9; //!<
+//    constexpr uint32_t FaceEnsemble = 10; //!<
+//    constexpr uint32_t CellEnsemble = 11; //!<
+//    constexpr uint32_t MetaData = 12; //!<
+//    constexpr uint32_t Generic = 13; //!<
+//    constexpr uint32_t Unknown = 999; //!<
 //  }
 
 //  namespace AttributeMatrixObjectType
 //  {
-//    const unsigned int Element = 0;
-//    const unsigned int Feature = 1;
-//    const unsigned int Ensemble = 2;
-//    const unsigned int Any = 3;
+//    constexpr uint32_t Element = 0;
+//    constexpr uint32_t Feature = 1;
+//    constexpr uint32_t Ensemble = 2;
+//    constexpr uint32_t Any = 3;
 //  }
 
 namespace Geometry
@@ -933,21 +933,21 @@ const QString k_Unknown("Unknown");
 
 //  namespace GeometryType
 //  {
-//    const unsigned int ImageGeometry = 11;
-//    const unsigned int RectGridGeometry = 11;
-//    const unsigned int VertexGeometry = 1;
-//    const unsigned int EdgeGeometry = 3;
-//    const unsigned int TriangleGeometry = 5;
-//    const unsigned int QuadGeometry = 9;
-//    const unsigned int TetrahedralGeometry = 10;
-//    const unsigned int UnknownGeometry = 999;
+//    constexpr uint32_t ImageGeometry = 11;
+//    constexpr uint32_t RectGridGeometry = 11;
+//    constexpr uint32_t VertexGeometry = 1;
+//    constexpr uint32_t EdgeGeometry = 3;
+//    constexpr uint32_t TriangleGeometry = 5;
+//    constexpr uint32_t QuadGeometry = 9;
+//    constexpr uint32_t TetrahedralGeometry = 10;
+//    constexpr uint32_t UnknownGeometry = 999;
 //  }
 
 namespace XdmfGridType
 {
-const unsigned int PolyData = 0;
-const unsigned int RectilinearGrid = 1;
-const unsigned int UnknownGrid = 0xFFFFFFFF;
+constexpr uint32_t PolyData = 0;
+constexpr uint32_t RectilinearGrid = 1;
+constexpr uint32_t UnknownGrid = 0xFFFFFFFF;
 } // namespace XdmfGridType
 
 namespace XdmfCenterType
@@ -961,17 +961,17 @@ const QString Grid("Grid");
 
 // namespace ShapeType
 //{
-//  const unsigned int EllipsoidShape = 0; //!<
-//  const unsigned int SuperEllipsoidShape = 1; //!<
-//  const unsigned int CubeOctahedronShape = 2; //!<
-//  const unsigned int CylinderAShape = 3; //!<
-//  const unsigned int CylinderBShape = 4; //!<
-//  const unsigned int CylinderCShape = 5; //!<
-//  const unsigned int ShapeTypeEnd = 6;
-//  const unsigned int UnknownShapeType = 999; //!<
+//  constexpr uint32_t EllipsoidShape = 0; //!<
+//  constexpr uint32_t SuperEllipsoidShape = 1; //!<
+//  constexpr uint32_t CubeOctahedronShape = 2; //!<
+//  constexpr uint32_t CylinderAShape = 3; //!<
+//  constexpr uint32_t CylinderBShape = 4; //!<
+//  constexpr uint32_t CylinderCShape = 5; //!<
+//  constexpr uint32_t ShapeTypeEnd = 6;
+//  constexpr uint32_t UnknownShapeType = 999; //!<
 //}
 
-enum class Precipitates : unsigned int
+enum class Precipitates : uint32_t
 {
   NoPrecipitates = 0,       //!<
   BoundaryPrecipitates = 1, //!<
@@ -1006,17 +1006,17 @@ namespace SurfaceMesh
 {
 namespace NodeType
 {
-const signed char Unused = 0;
-const signed char Default = 2;
-const signed char TriplePoint = 3;
-const signed char QuadPoint = 4;
-const signed char SurfaceDefault = 12;
-const signed char SurfaceTriplePoint = 13;
-const signed char SurfaceQuadPoint = 14;
+constexpr int8_t Unused = 0;
+constexpr int8_t Default = 2;
+constexpr int8_t TriplePoint = 3;
+constexpr int8_t QuadPoint = 4;
+constexpr int8_t SurfaceDefault = 12;
+constexpr int8_t SurfaceTriplePoint = 13;
+constexpr int8_t SurfaceQuadPoint = 14;
 } // namespace NodeType
 namespace NodeId
 {
-const signed char Unused = -1;
+constexpr int8_t Unused = -1;
 }
 } // namespace SurfaceMesh
 
@@ -1065,9 +1065,9 @@ enum Enumeration
 
 namespace Layout
 {
-const signed int Horizontal = 0;
-const signed int Vertical = 1;
-const signed int Square = 2;
+constexpr int32_t Horizontal = 0;
+constexpr int32_t Vertical = 1;
+constexpr int32_t Square = 2;
 }; // namespace Layout
 } // namespace SIMPL
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index f1ffdaf5fd..d17edaac6b 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -81,42 +81,39 @@ To bit_cast(const From& src) noexcept
   return dst;
 }
 
-// SFINAE can be replaced with if constexpr in C++ 17
-
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint8_t)>* = nullptr>
-T byteSwap(T value)
-{
-  return value;
-}
-
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint16_t)>* = nullptr>
+template <class T>
 T byteSwap(T value)
 {
-  return SIMPL_BYTE_SWAP_16(value);
-}
+  static_assert(std::is_arithmetic_v<T>, "byteSwap only works on arithmetic types");
 
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint32_t) && !std::is_floating_point<T>::value>* = nullptr>
-T byteSwap(T value)
-{
-  return SIMPL_BYTE_SWAP_32(value);
-}
-
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint32_t) && std::is_floating_point<T>::value>* = nullptr>
-T byteSwap(T value)
-{
-  return bit_cast<T>(SIMPL_BYTE_SWAP_32(bit_cast<uint32_t>(value)));
-}
-
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint64_t) && !std::is_floating_point<T>::value>* = nullptr>
-T byteSwap(T value)
-{
-  return SIMPL_BYTE_SWAP_64(value);
-}
+  if constexpr(sizeof(T) == sizeof(uint16_t))
+  {
+    return SIMPL_BYTE_SWAP_16(value);
+  }
+  else if constexpr(sizeof(T) == sizeof(uint32_t))
+  {
+    if constexpr(std::is_floating_point_v<T>)
+    {
+      return bit_cast<T>(SIMPL_BYTE_SWAP_32(bit_cast<uint32_t>(value)));
+    }
+    else
+    {
+      return SIMPL_BYTE_SWAP_32(value);
+    }
+  }
+  else if constexpr(sizeof(T) == sizeof(uint64_t))
+  {
+    if constexpr(std::is_floating_point_v<T>)
+    {
+      return bit_cast<T>(SIMPL_BYTE_SWAP_64(bit_cast<uint64_t>(value)));
+    }
+    else
+    {
+      return SIMPL_BYTE_SWAP_64(value);
+    }
+  }
 
-template <class T, std::enable_if_t<sizeof(T) == sizeof(uint64_t) && std::is_floating_point<T>::value>* = nullptr>
-T byteSwap(T value)
-{
-  return bit_cast<T>(SIMPL_BYTE_SWAP_64(bit_cast<uint64_t>(value)));
+  return value;
 }
 
 } // namespace
@@ -407,47 +404,47 @@ IDataArray::Pointer DataArray<T>::deepCopy(bool forceNoAllocate) const
 template <typename T>
 SIMPL::NumericTypes::Type DataArray<T>::getType() const
 {
-  if(std::is_same<T, int8_t>::value)
+  if constexpr(std::is_same_v<T, int8_t>)
   {
     return SIMPL::NumericTypes::Type::Int8;
   }
-  else if(std::is_same<T, uint8_t>::value)
+  else if constexpr(std::is_same_v<T, uint8_t>)
   {
     return SIMPL::NumericTypes::Type::UInt8;
   }
-  else if(std::is_same<T, int16_t>::value)
+  else if constexpr(std::is_same_v<T, int16_t>)
   {
     return SIMPL::NumericTypes::Type::Int16;
   }
-  else if(std::is_same<T, uint16_t>::value)
+  else if constexpr(std::is_same_v<T, uint16_t>)
   {
     return SIMPL::NumericTypes::Type::UInt16;
   }
-  else if(std::is_same<T, int32_t>::value)
+  else if constexpr(std::is_same_v<T, int32_t>)
   {
     return SIMPL::NumericTypes::Type::Int32;
   }
-  else if(std::is_same<T, uint32_t>::value)
+  else if constexpr(std::is_same_v<T, uint32_t>)
   {
     return SIMPL::NumericTypes::Type::UInt32;
   }
-  else if(std::is_same<T, int64_t>::value)
+  else if constexpr(std::is_same_v<T, int64_t>)
   {
     return SIMPL::NumericTypes::Type::Int64;
   }
-  else if(std::is_same<T, uint64_t>::value)
+  else if constexpr(std::is_same_v<T, uint64_t>)
   {
     return SIMPL::NumericTypes::Type::UInt64;
   }
-  else if(std::is_same<T, float>::value)
+  else if constexpr(std::is_same_v<T, float>)
   {
     return SIMPL::NumericTypes::Type::Float;
   }
-  else if(std::is_same<T, double>::value)
+  else if constexpr(std::is_same_v<T, double>)
   {
     return SIMPL::NumericTypes::Type::Double;
   }
-  else if(std::is_same<T, bool>::value)
+  else if constexpr(std::is_same_v<T, bool>)
   {
     return SIMPL::NumericTypes::Type::Bool;
   }
@@ -462,57 +459,57 @@ void DataArray<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int32_t& precision)
   xdmfTypeName = "UNKNOWN";
   precision = 0;
 
-  if(std::is_same<T, int8_t>::value)
+  if constexpr(std::is_same_v<T, int8_t>)
   {
     xdmfTypeName = "Char";
     precision = 1;
   }
-  else if(std::is_same<T, uint8_t>::value)
+  else if constexpr(std::is_same_v<T, uint8_t>)
   {
     xdmfTypeName = "UChar";
     precision = 1;
   }
-  else if(std::is_same<T, int16_t>::value)
+  else if constexpr(std::is_same_v<T, int16_t>)
   {
     xdmfTypeName = "Int";
     precision = 2;
   }
-  else if(std::is_same<T, uint16_t>::value)
+  else if constexpr(std::is_same_v<T, uint16_t>)
   {
     xdmfTypeName = "UInt";
     precision = 2;
   }
-  else if(std::is_same<T, int32_t>::value)
+  else if constexpr(std::is_same_v<T, int32_t>)
   {
     xdmfTypeName = "Int";
     precision = 4;
   }
-  else if(std::is_same<T, uint32_t>::value)
+  else if constexpr(std::is_same_v<T, uint32_t>)
   {
     xdmfTypeName = "UInt";
     precision = 4;
   }
-  else if(std::is_same<T, int64_t>::value)
+  else if constexpr(std::is_same_v<T, int64_t>)
   {
     xdmfTypeName = "Int";
     precision = 8;
   }
-  else if(std::is_same<T, uint64_t>::value)
+  else if constexpr(std::is_same_v<T, uint64_t>)
   {
     xdmfTypeName = "UInt";
     precision = 8;
   }
-  else if(std::is_same<T, float>::value)
+  else if constexpr(std::is_same_v<T, float>)
   {
     xdmfTypeName = "Float";
     precision = 4;
   }
-  else if(std::is_same<T, double>::value)
+  else if constexpr(std::is_same_v<T, double>)
   {
     xdmfTypeName = "Float";
     precision = 8;
   }
-  else if(std::is_same<T, bool>::value)
+  else if constexpr(std::is_same_v<T, bool>)
   {
     xdmfTypeName = "UChar";
     precision = 1;
@@ -986,11 +983,11 @@ template <typename T>
 void DataArray<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
 {
   int32_t precision = out.realNumberPrecision();
-  if(std::is_same<T, float>::value)
+  if constexpr(std::is_same_v<T, float>)
   {
     out.setRealNumberPrecision(8);
   }
-  else if(std::is_same<T, double>::value)
+  else if constexpr(std::is_same_v<T, double>)
   {
     out.setRealNumberPrecision(16);
   }
@@ -1026,47 +1023,47 @@ QString DataArray<T>::getFullNameOfClass() const
 template <typename T>
 QString DataArray<T>::getTypeAsString() const
 {
-  if(std::is_same<T, int8_t>::value)
+  if constexpr(std::is_same_v<T, int8_t>)
   {
     return "int8_t";
   }
-  else if(std::is_same<T, uint8_t>::value)
+  else if constexpr(std::is_same_v<T, uint8_t>)
   {
     return "uint8_t";
   }
-  else if(std::is_same<T, int16_t>::value)
+  else if constexpr(std::is_same_v<T, int16_t>)
   {
     return "int16_t";
   }
-  else if(std::is_same<T, uint16_t>::value)
+  else if constexpr(std::is_same_v<T, uint16_t>)
   {
     return "uint16_t";
   }
-  else if(std::is_same<T, int32_t>::value)
+  else if constexpr(std::is_same_v<T, int32_t>)
   {
     return "int32_t";
   }
-  else if(std::is_same<T, uint32_t>::value)
+  else if constexpr(std::is_same_v<T, uint32_t>)
   {
     return "uint32_t";
   }
-  else if(std::is_same<T, int64_t>::value)
+  else if constexpr(std::is_same_v<T, int64_t>)
   {
     return "int64_t";
   }
-  else if(std::is_same<T, uint64_t>::value)
+  else if constexpr(std::is_same_v<T, uint64_t>)
   {
     return "uint64_t";
   }
-  else if(std::is_same<T, float>::value)
+  else if constexpr(std::is_same_v<T, float>)
   {
     return "float";
   }
-  else if(std::is_same<T, double>::value)
+  else if constexpr(std::is_same_v<T, double>)
   {
     return "double";
   }
-  else if(std::is_same<T, bool>::value)
+  else if constexpr(std::is_same_v<T, bool>)
   {
     return "bool";
   }
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 0798077727..3913607596 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -581,10 +581,8 @@ class DataArray : public IDataArray
       ptr_ += num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t unused)
+    self_type operator++([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_ += num_comps_;
       return i;
@@ -594,10 +592,8 @@ class DataArray : public IDataArray
       ptr_ -= num_comps_;
       return *this;
     } // PREFIX
-    self_type operator--(int32_t unused)
+    self_type operator--([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_ -= num_comps_;
       return i;
@@ -701,10 +697,8 @@ class DataArray : public IDataArray
       ptr_ += num_comps_;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t unused)
+    self_type operator++([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_ += num_comps_;
       return i;
@@ -714,10 +708,8 @@ class DataArray : public IDataArray
       ptr_ -= num_comps_;
       return *this;
     } // PREFIX
-    self_type operator--(int32_t unused)
+    self_type operator--([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_ -= num_comps_;
       return i;
@@ -826,10 +818,8 @@ class DataArray : public IDataArray
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t unused)
+    self_type operator++([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_++;
       return i;
@@ -839,10 +829,8 @@ class DataArray : public IDataArray
       ptr_--;
       return *this;
     } // PREFIX
-    self_type operator--(int32_t unused)
+    self_type operator--([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_--;
       return i;
@@ -946,10 +934,8 @@ class DataArray : public IDataArray
       ptr_++;
       return *this;
     } // PREFIX
-    self_type operator++(int32_t unused)
+    self_type operator++([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_++;
       return i;
@@ -959,10 +945,8 @@ class DataArray : public IDataArray
       ptr_--;
       return *this;
     } // PREFIX
-    self_type operator--(int32_t unused)
+    self_type operator--([[maybe_unused]] int32_t unused)
     {
-      // Replace with [[maybe_unused]] in C++ 17
-      (void)unused;
       self_type i = *this;
       ptr_--;
       return i;
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index 06d41a1ebe..b85ffa01ef 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -91,20 +91,20 @@ py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoL
   return datasetImportInfoList;
 }));
 
-py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8");
-py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8");
+py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8", "std::vector<int8_t> binding");
+py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8", "std::vector<uint8_t> binding");
 
-py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16");
-py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16");
+py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16", "std::vector<int16_t> binding");
+py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16", "std::vector<uint16_t> binding");
 
-py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32");
-py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32");
+py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32", "std::vector<int32_t> binding");
+py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32", "std::vector<uint32_t> binding");
 
-py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64");
-py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64");
+py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64", "std::vector<int64_t> binding");
+py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64", "std::vector<uint64_t> binding");
 
-py::bind_vector<std::vector<float>>(mod, "VectorFloat");
-py::bind_vector<std::vector<double>>(mod, "VectorDouble");
+py::bind_vector<std::vector<float>>(mod, "VectorFloat", "std::vector<float> binding");
+py::bind_vector<std::vector<double>>(mod, "VectorDouble", "std::vector<double> binding");
 
 if(py::detail::get_type_info(typeid(std::vector<size_t>)))
 {
@@ -112,7 +112,7 @@ if(py::detail::get_type_info(typeid(std::vector<size_t>)))
 }
 else
 {
-  py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT");
+  py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT", "std::vector<size_t> binding");
 }
 
 py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")

From caf11839a0529e94fba7aea9b27d5d6213f7a4c9 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 15 Jun 2020 14:58:23 -0400
Subject: [PATCH 251/397] Add another entry into the QtBackwards Compatibility
 Macros

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
index 610f7a5fa6..65b85fcd10 100644
--- a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
+++ b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
@@ -10,6 +10,13 @@
 #define QFONTMETRICS_WIDTH horizontalAdvance
 #endif
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
+#define QFOREGROUND QPalette::Foreground
+#else
+#define QFOREGROUND QPalette::WindowText
+
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
 
 #ifndef QVECTOR_FROM_STD_VECTOR

From 7356642690919b00d91437f9e3687ed77392d8b4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 16 Jun 2020 16:55:38 -0400
Subject: [PATCH 252/397] Speed up FindPointInPolyhedron by using mersenne
 twister for random numbers

Each loop iteration a new random generator was created that slaved out to the
random_device on the machine. On Unix and macOS this can be a slow file read
which can also become a bottle-neck during multi-threaded operations. The code
was changed to use use the mersenne-twister algorithm that is seeded through
the std::chrono clock.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Math/GeometryMath.cpp | 49 ++++++++++++++++++++--------
 Source/SIMPLib/Math/GeometryMath.h   | 19 +++++++----
 2 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 844b71a1da..5f58fb2524 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -42,7 +42,6 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Math/MatrixMath.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-//#include "SIMPLib/Math/SIMPLibRandom.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -334,18 +333,19 @@ float GeometryMath::LengthOfRayInBox(const float* p, const float* q, const float
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GeometryMath::GenerateRandomRay(float length, float ray[3])
+void GeometryMath::GenerateRandomRay(float length, float ray[3], float rand1, float rand2)
 {
   float w, t;
-
+#if 0
   std::random_device randomDevice;           // Will be used to obtain a seed for the random number engine
   std::mt19937_64 generator(randomDevice()); // Standard mersenne_twister_engine seeded with rd()
   std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
   generator.seed(seed);
   std::uniform_real_distribution<> distribution(0.0, 1.0);
+#endif
 
-  ray[2] = (2.0f * distribution(generator)) - 1.0f;
-  t = (SIMPLib::Constants::k_2Pi * distribution(generator));
+  ray[2] = (2.0f * rand1) - 1.0f;
+  t = (SIMPLib::Constants::k_2Pi * rand2);
   w = sqrtf(1.0f - (ray[2] * ray[2]));
   ray[0] = w * cosf(t);
   ray[1] = w * sinf(t);
@@ -1072,16 +1072,23 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
   p[1] = 0;
   p[2] = 0;
 
-LOOP:
+  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
+  std::mt19937_64 generator(seed);
+  std::uniform_real_distribution<> distribution(0.0, 1.0);
+
   while(k++ < numFaces)
   {
     crossings = 0;
 
+    float rand1 = distribution(generator);
+    float rand2 = distribution(generator);
+
     // Generate and add ray to point to find other end
-    GenerateRandomRay(radius, ray);
+    GenerateRandomRay(radius, ray, rand1, rand2);
     r[0] = q[0] + ray[0];
     r[1] = q[1] + ray[1];
     r[2] = q[2] + ray[2];
+    bool doNextCheck = false;
 
     for(f = 0; f < numFaces; f++)
     {
@@ -1102,7 +1109,8 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
       /* If ray is degenerate, then goto outer while to generate another. */
       if(code == 'p' || code == 'v' || code == 'e' || code == '?')
       {
-        goto LOOP;
+        doNextCheck = true;
+        break;
       }
 
       /* If ray hits face at interior point, increment crossings. */
@@ -1118,7 +1126,10 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
       }
 
     } /* End check each face */
-
+    if(doNextCheck)
+    {
+      continue;
+    }
     /* No degeneracies encountered: ray is generic, so finished. */
     break;
 
@@ -1165,17 +1176,23 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
   p[1] = 0;
   p[2] = 0;
 
-LOOP:
+  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
+  std::mt19937_64 generator(seed);
+  std::uniform_real_distribution<> distribution(0.0, 1.0);
+
   while(k++ < numFaces)
   {
     crossings = 0;
 
+    float rand1 = distribution(generator);
+    float rand2 = distribution(generator);
+
     // Generate and add ray to point to find other end
-    GenerateRandomRay(radius, ray);
+    GenerateRandomRay(radius, ray, rand1, rand2);
     r[0] = q[0] + ray[0];
     r[1] = q[1] + ray[1];
     r[2] = q[2] + ray[2];
-
+    bool doNextCheck = false;
     for(f = 0; f < numFaces; f++)
     {
       /* Begin check each face */
@@ -1203,7 +1220,8 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
       /* If ray is degenerate, then goto outer while to generate another. */
       if(code == 'p' || code == 'v' || code == 'e' || code == '?')
       {
-        goto LOOP;
+        doNextCheck = true;
+        break;
       }
 
       /* If ray hits face at interior point, increment crossings. */
@@ -1219,7 +1237,10 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
       }
 
     } /* End check each face */
-
+    if(doNextCheck)
+    {
+      continue;
+    }
     /* No degeneracies encountered: ray is generic, so finished. */
     break;
 
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 409323ae54..456abad168 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -192,25 +192,32 @@ class SIMPLib_EXPORT GeometryMath
 
   /**
    * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-   * @param p
+   * @param faces
+   * @param faceIds
+   * @param vertices
+   * @param point
    * @param lowerLeft
    * @param upperRight
    * @param radius
    * @return
    */
-  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius);
+  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
+                                float radius);
 
   /**
    * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-   * @param p
+   * @param faces
+   * @param faceIds
+   * @param vertices
+   * @param point
    * @param lowerLeft
    * @param upperRight
    * @param radius
    * @param distToBoundary
    * @return
    */
-  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* faceBBs, const float* q, const float* ll, const float* ur, float radius,
-                                float& distToBoundary);
+  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
+                                float radius, float& distToBoundary);
 
   /**
    * @brief Determines if a point is inside of a triangle defined by 3 points
@@ -272,7 +279,7 @@ class SIMPLib_EXPORT GeometryMath
    * @param ray 1x3 Vector
    * @return
    */
-  static void GenerateRandomRay(float length, float ray[3]);
+  static void GenerateRandomRay(float length, float ray[3], float rand1, float rand2);
 
   /**
    * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices

From 7e75d77e76e0599825576c62a1598b34eb84e412 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 16 Jun 2020 18:00:46 -0400
Subject: [PATCH 253/397] Fix the GenerateRandomRay so it does what the name
 suggests.

Only use a mersenne-twister seeded from the clock as the random number generator

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Math/GeometryMath.cpp | 41 +++++++++-------------------
 Source/SIMPLib/Math/GeometryMath.h   |  2 +-
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 5f58fb2524..f5b1f6102d 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -159,7 +159,7 @@ bool GeometryMath::FindRayIntersectionsWithSphere(float* p, float* R, float leng
   }
 
   // determine distance along ray from where perpendicular distance is calculated to point on sphere
-  float t1c = sqrt(radius2 - d2);
+  float t1c = std::sqrt(radius2 - d2);
 
   // determine intersection points on sphere by combining tc and t1c
   t1 = tc - t1c;
@@ -333,22 +333,20 @@ float GeometryMath::LengthOfRayInBox(const float* p, const float* q, const float
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void GeometryMath::GenerateRandomRay(float length, float ray[3], float rand1, float rand2)
+void GeometryMath::GenerateRandomRay(float length, float* ray)
 {
-  float w, t;
-#if 0
-  std::random_device randomDevice;           // Will be used to obtain a seed for the random number engine
-  std::mt19937_64 generator(randomDevice()); // Standard mersenne_twister_engine seeded with rd()
   std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
-  generator.seed(seed);
+  std::mt19937_64 generator(seed);
   std::uniform_real_distribution<> distribution(0.0, 1.0);
-#endif
+
+  float rand1 = distribution(generator);
+  float rand2 = distribution(generator);
 
   ray[2] = (2.0f * rand1) - 1.0f;
-  t = (SIMPLib::Constants::k_2Pi * rand2);
-  w = sqrtf(1.0f - (ray[2] * ray[2]));
-  ray[0] = w * cosf(t);
-  ray[1] = w * sinf(t);
+  float t = static_cast<float>(SIMPLib::Constants::k_2Pi) * rand2;
+  float w = std::sqrt(1.0f - (ray[2] * ray[2]));
+  ray[0] = w * std::cos(t);
+  ray[1] = w * std::sin(t);
   ray[0] *= length;
   ray[1] *= length;
   ray[2] *= length;
@@ -1072,19 +1070,12 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
   p[1] = 0;
   p[2] = 0;
 
-  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
-  std::mt19937_64 generator(seed);
-  std::uniform_real_distribution<> distribution(0.0, 1.0);
-
   while(k++ < numFaces)
   {
     crossings = 0;
 
-    float rand1 = distribution(generator);
-    float rand2 = distribution(generator);
-
     // Generate and add ray to point to find other end
-    GenerateRandomRay(radius, ray, rand1, rand2);
+    GenerateRandomRay(radius, ray);
     r[0] = q[0] + ray[0];
     r[1] = q[1] + ray[1];
     r[2] = q[2] + ray[2];
@@ -1176,19 +1167,13 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
   p[1] = 0;
   p[2] = 0;
 
-  std::mt19937_64::result_type seed = static_cast<std::mt19937_64::result_type>(std::chrono::steady_clock::now().time_since_epoch().count());
-  std::mt19937_64 generator(seed);
-  std::uniform_real_distribution<> distribution(0.0, 1.0);
-
   while(k++ < numFaces)
   {
     crossings = 0;
 
-    float rand1 = distribution(generator);
-    float rand2 = distribution(generator);
-
     // Generate and add ray to point to find other end
-    GenerateRandomRay(radius, ray, rand1, rand2);
+    GenerateRandomRay(radius, ray);
+
     r[0] = q[0] + ray[0];
     r[1] = q[1] + ray[1];
     r[2] = q[2] + ray[2];
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 456abad168..970e2ca7a2 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -279,7 +279,7 @@ class SIMPLib_EXPORT GeometryMath
    * @param ray 1x3 Vector
    * @return
    */
-  static void GenerateRandomRay(float length, float ray[3], float rand1, float rand2);
+  static void GenerateRandomRay(float length, float* ray);
 
   /**
    * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices

From ce57eef836d54ee200ae4d31ce68f441826c2270 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Sat, 20 Jun 2020 10:36:24 -0400
Subject: [PATCH 254/397] Add more Qt backward compatibility macros

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
index 65b85fcd10..e4e3026b8b 100644
--- a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
+++ b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
@@ -12,9 +12,10 @@
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 13, 0)
 #define QFOREGROUND QPalette::Foreground
+#define QBACKGROUND QPalette::Background
 #else
 #define QFOREGROUND QPalette::WindowText
-
+#define QBACKGROUND QPalette::Window
 #endif
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)

From 647e8247d70f7c0a22db97fd6ac649df07b0bc62 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 9 Jul 2020 15:19:15 -0400
Subject: [PATCH 255/397] Changes to allow compiling without TBB support

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Cxx/ConvertColorToGrayScaleTest.cpp       | 23 ++++++++-----------
 .../Utilities/ParallelTaskAlgorithm.cpp       |  2 +-
 .../SIMPLib/Utilities/ParallelTaskAlgorithm.h |  4 ++--
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index c0777983e2..080a6fbc79 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -40,25 +40,23 @@
 
 #include <QtCore/QDebug>
 
-#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
-
-#include <tbb/parallel_for.h>
 
 class ConvertColorToGrayScaleTest
 {
@@ -352,12 +350,11 @@ class ConvertColorToGrayScaleTest
     std::vector<uint8_t> colorArray{algorithmMap[algoMapIndex]};
 
     int wrongValues = 0;
-    tbb::parallel_for(tbb::blocked_range<size_t>(0, colorArray.size()), [&](const tbb::blocked_range<size_t>& r) {
-      for(size_t index = r.begin(); index < r.end(); ++index)
-      {
-        wrongValues += (testArray->getValue(index) == colorArray[index]) ? 0 : 1;
-      }
-    });
+    for(size_t index = 0; index < colorArray.size(); ++index)
+    {
+      wrongValues += (testArray->getValue(index) == colorArray[index]) ? 0 : 1;
+    }
+
     return wrongValues;
   }
 
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
index e10459c7dc..ce227594aa 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
@@ -42,8 +42,8 @@
 // -----------------------------------------------------------------------------
 ParallelTaskAlgorithm::ParallelTaskAlgorithm()
 : m_Parallelization(true)
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
 , m_MaxThreads(std::thread::hardware_concurrency())
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
 , m_TaskGroup(new tbb::task_group)
 #endif
 {
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
index 7b8e32b81c..a6f9f52683 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -92,8 +92,8 @@ class SIMPLib_EXPORT ParallelTaskAlgorithm
   template <typename Body>
   void execute(const Body& body)
   {
-    bool doParallel = false;
 #ifdef SIMPL_USE_PARALLEL_ALGORITHMS
+    bool doParallel = false;
     doParallel = m_Parallelization;
     if(doParallel)
     {
@@ -116,8 +116,8 @@ class SIMPLib_EXPORT ParallelTaskAlgorithm
 
 private:
   bool m_Parallelization = false;
-#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   uint32_t m_MaxThreads = 1;
+#ifdef SIMPL_USE_PARALLEL_ALGORITHMS
   uint32_t m_CurThreads = 0;
   std::shared_ptr<tbb::task_group> m_TaskGroup;
 #endif

From 16a2c862eebbe86219f38eaaf0a56d76a02439fb Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 9 Jul 2020 16:56:08 -0400
Subject: [PATCH 256/397] Add more information to unit test output for Python
 tests

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Binding/anaconda_test.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Wrapping/Python/Binding/anaconda_test.sh b/Wrapping/Python/Binding/anaconda_test.sh
index dc6fb9eb9f..d2e920e3f0 100755
--- a/Wrapping/Python/Binding/anaconda_test.sh
+++ b/Wrapping/Python/Binding/anaconda_test.sh
@@ -5,13 +5,16 @@ echo "SIMPL_CONDA_ENV: $SIMPL_CONDA_ENV"
 echo "PYTHON_TEST_FILE: $PYTHON_TEST_FILE"
 echo "PYTHONPATH: $PYTHONPATH"
 
+echo "Sourcing $SIMPL_ANACONDA_DIR/etc/profile.d/conda.sh"
 source "$SIMPL_ANACONDA_DIR"/etc/profile.d/conda.sh
 
+echo "Activating Conda environment $SIMPL_CONDA_ENV"
 conda activate "$SIMPL_CONDA_ENV"
 
 echo "PATH: $PATH"
 echo "Where is Python: " `which python`
 echo "Where is Conda: " `which conda`
-echo "Python Version: " `python --version`
+PYTHONEXE=$SIMPL_ANACONDA_DIR/envs/$SIMPL_CONDA_ENV/bin/python
+echo "Python Version: " `${PYTHONEXE}  --version`
 
-python "$PYTHON_TEST_FILE"
+${PYTHONEXE} "$PYTHON_TEST_FILE"

From 43690b69f2e3ed4fccbbc3dfed673bc7299ac94c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 15 Jul 2020 09:14:58 -0400
Subject: [PATCH 257/397] Ebsd API Updates (EbsdLib removed dependency on Qt5)
 (#408)

* Update DataArray::CreateArray to add ability to take std::string as name
* Use Smart Pointer to manage raw pointers

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/CombineAttributeArrays.cpp    |  6 +--
 .../CoreFilters/FeatureDataCSVWriter.cpp      |  2 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |  2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |  4 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |  2 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |  6 +--
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |  4 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |  8 ++--
 .../Testing/Cxx/DataContainerTest.cpp         |  2 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |  2 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       | 13 +++--
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |  2 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  | 12 ++---
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |  6 +--
 Source/SIMPLib/DataArrays/DataArray.cpp       | 21 ++++++++
 Source/SIMPLib/DataArrays/DataArray.hpp       |  1 +
 Source/SIMPLib/DataArrays/NeighborList.hpp    | 23 ++++++++-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  | 17 ++++++-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |  1 +
 Source/SIMPLib/DataArrays/StringDataArray.cpp | 12 ++++-
 Source/SIMPLib/DataArrays/StringDataArray.h   |  4 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     | 48 ++++++++++++++-----
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  | 14 +++---
 .../SIMPLib/DataContainers/AttributeMatrix.h  |  4 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |  4 +-
 25 files changed, 155 insertions(+), 65 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 43d0d3c412..4f08f15ab8 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -170,9 +170,9 @@ class CombineAttributeArraysTemplatePrivate
     }
   }
 
-private:
-  CombineAttributeArraysTemplatePrivate(const CombineAttributeArraysTemplatePrivate&); // Copy Constructor Not Implemented
-  void operator=(const CombineAttributeArraysTemplatePrivate&);                        // Move assignment Not Implemented
+public:
+  CombineAttributeArraysTemplatePrivate(const CombineAttributeArraysTemplatePrivate&) = delete; // Copy Constructor Not Implemented
+  void operator=(const CombineAttributeArraysTemplatePrivate&) = delete;                        // Move assignment Not Implemented
 };
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index fd8d794900..d9b2de9883 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -203,7 +203,7 @@ void FeatureDataCSVWriter::execute()
   std::vector<IDataArray::Pointer> data;
 
   // For checking if an array is a neighborlist
-  NeighborList<int32_t>::Pointer neighborlistPtr = NeighborList<int32_t>::CreateArray(0, "_INTERNAL_USE_ONLY_JunkNeighborList", false);
+  NeighborList<int32_t>::Pointer neighborlistPtr = NeighborList<int32_t>::CreateArray(0, std::string("_INTERNAL_USE_ONLY_JunkNeighborList"), false);
 
   // Print the FeatureIds Header before the rest of the headers
   outFile << SIMPL::FeatureData::FeatureID;
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 0f3305bb1c..a3471c0534 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -214,7 +214,7 @@ void MultiThresholdObjects::execute()
   {
     // Get the total number of tuples, create and initialize an array to use for these results
     int64_t totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-    BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
+    BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, std::string("_INTERNAL_USE_ONLY_TEMP"), true);
 
     // Loop on the remaining Comparison objects updating our final result array as we go
     for(int32_t i = 1; i < m_SelectedThresholds.size(); ++i)
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 2e3680bd51..5824bf8a01 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -256,7 +256,7 @@ void MultiThresholdObjects2::createBoolArray(int64_t& totalTuples, BoolArrayType
 
   // Get the total number of tuples, create and initialize an array to use for these results
   totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-  thresholdArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
+  thresholdArrayPtr = BoolArrayType::CreateArray(totalTuples, std::string("_INTERNAL_USE_ONLY_TEMP"), true);
 
   // Initialize the array to false
   thresholdArrayPtr->initializeWithZeros();
@@ -385,7 +385,7 @@ void MultiThresholdObjects2::thresholdValue(ComparisonValue::Pointer comparisonV
 
   // Get the total number of tuples, create and initialize an array to use for these results
   int64_t totalTuples = static_cast<int64_t>(m->getAttributeMatrix(amName)->getNumberOfTuples());
-  BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, "_INTERNAL_USE_ONLY_TEMP", true);
+  BoolArrayType::Pointer currentArrayPtr = BoolArrayType::CreateArray(totalTuples, std::string("_INTERNAL_USE_ONLY_TEMP"), true);
 
   // Initialize the array to false
   currentArrayPtr->initializeWithZeros();
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index ffb3ec467f..dbc2bd0107 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -555,7 +555,7 @@ void RotateSampleRefFrame::execute()
 
   int64_t newNumCellTuples = p_Impl->m_Params.xpNew * p_Impl->m_Params.ypNew * p_Impl->m_Params.zpNew;
 
-  DataArray<int64_t>::Pointer newIndiciesPtr = DataArray<int64_t>::CreateArray(newNumCellTuples, "_INTERNAL_USE_ONLY_RotateSampleRef_NewIndicies", true);
+  DataArray<int64_t>::Pointer newIndiciesPtr = DataArray<int64_t>::CreateArray(newNumCellTuples, std::string("_INTERNAL_USE_ONLY_RotateSampleRef_NewIndicies"), true);
   newIndiciesPtr->initializeWithValue(-1);
   int64_t* newindicies = newIndiciesPtr->getPointer(0);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index f136f95938..160c56ff7f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -118,11 +118,11 @@ class ArrayCalculatorTest
     DataContainer::Pointer dc = DataContainer::New("DataContainer");
     AttributeMatrix::Pointer am1 = AttributeMatrix::New(std::vector<size_t>(1, 10), "AttributeMatrix", AttributeMatrix::Type::Cell);
     AttributeMatrix::Pointer am2 = AttributeMatrix::New(std::vector<size_t>(1, 1), "NumericMatrix", AttributeMatrix::Type::Cell);
-    FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, "InputArray1", true);
+    FloatArrayType::Pointer array1 = FloatArrayType::CreateArray(10, std::string("InputArray1"), true);
     array1->initializeWithValue(-12);
-    UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, "InputArray2", true);
+    UInt32ArrayType::Pointer array2 = UInt32ArrayType::CreateArray(10, std::string("InputArray2"), true);
     array2->initializeWithValue(10);
-    UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, "Spaced Array", true);
+    UInt32ArrayType::Pointer sArray = UInt32ArrayType::CreateArray(10, std::string("Spaced Array"), true);
     sArray->initializeWithValue(2);
 
     UInt32ArrayType::Pointer mcArray1 = UInt32ArrayType::CreateArray(std::vector<size_t>(1, 10), std::vector<size_t>(1, 3), "MultiComponent Array1", true);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 684f2c4d2f..976bf0c786 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -360,8 +360,8 @@ class CreateAttributeMatrixTest
     std::vector<size_t> tDims = {10, 10};
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "Test", AttributeMatrix::Type::Cell);
 
-    FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, "Float", true);
-    Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(100, "Int32", true);
+    FloatArrayType::Pointer floatArray = FloatArrayType::CreateArray(100, std::string("Float"), true);
+    Int32ArrayType::Pointer int32Array = Int32ArrayType::CreateArray(100, std::string("Int32"), true);
   }
   // -----------------------------------------------------------------------------
   //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 3edffb1251..2e8e41e0f8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -95,7 +95,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, std::string("FeatureIds"), true);
         size_t numTuples = featureIds->getNumberOfTuples();
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
@@ -122,7 +122,7 @@ class CreateFeatureArrayFromElementArrayTest
         featureIds->initializeTuple(14, &value);
         featureIds->initializeTuple(15, &value);
 
-        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, "CellData", true);
+        DataArray<float>::Pointer cellDataArray = DataArray<float>::CreateArray(16, std::string("CellData"), true);
         numTuples = cellDataArray->getNumberOfTuples();
         for(size_t i = 0; i < numTuples; i++)
         {
@@ -185,7 +185,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, std::string("FeatureIds"), true);
         size_t numTuples = featureIds->getNumberOfTuples();
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
@@ -276,7 +276,7 @@ class CreateFeatureArrayFromElementArrayTest
         AttributeMatrix::Pointer cellAttr = AttributeMatrix::New(std::vector<size_t>(1, 16), "Cell Attribute Matrix", AttributeMatrix::Type::Cell);
         AttributeMatrix::Pointer featureAttr = AttributeMatrix::New(std::vector<size_t>(1, 5), "Feature Attribute Matrix", AttributeMatrix::Type::Cell);
 
-        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, "FeatureIds", true);
+        DataArray<int32_t>::Pointer featureIds = DataArray<int32_t>::CreateArray(16, std::string("FeatureIds"), true);
         int32_t value = 1;
         featureIds->initializeTuple(0, &value);
         featureIds->initializeTuple(1, &value);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index af90d5c197..c0946f9515 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -485,7 +485,7 @@ class DataContainerTest
     DREAM3D_REQUIRE_VALID_POINTER(attrMat.get())
 
     // Now create an Array and add it to the Attribute Matrix
-    typename T::Pointer p = T::CreateArray(5, "Test", true);
+    typename T::Pointer p = T::CreateArray(5, std::string("Test"), true);
 
     tDims[0] = 5;
     attrMat->resizeAttributeArrays(tDims);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index d8e87479c4..6d017dbdd8 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -181,7 +181,7 @@ class FeatureDataCSVWriterTest
     std::vector<IDataArray::Pointer> nlList;
     int originalNumColumns = 0;
 
-    NeighborList<int32_t>::Pointer neighborlistPtr = NeighborList<int32_t>::CreateArray(0, "_INTERNAL_USE_ONLY_JunkNeighborList", false);
+    NeighborList<int32_t>::Pointer neighborlistPtr = NeighborList<int32_t>::CreateArray(0, std::string("_INTERNAL_USE_ONLY_JunkNeighborList"), false);
 
     for(int i = 0; i < daNames.size(); i++)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index c489806440..5669d599a4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -229,8 +229,7 @@ class RawBinaryReaderTest
     //// qDebug() << "Testing case 1: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
-                                                                     true); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"), true);
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -337,7 +336,7 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 2: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"),
                                                                      true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
@@ -434,7 +433,7 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 3: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp__",
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp__"),
                                                                      true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
@@ -547,7 +546,7 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 4: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"),
                                                                      true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
@@ -688,7 +687,7 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 5: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"),
                                                                      true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
@@ -801,7 +800,7 @@ class RawBinaryReaderTest
     // qDebug() << "Testing case 6: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, "_Temp_",
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"),
                                                                      true); // This makes sure our allocated array is deleted when we leave
     T* dataArray = array->getPointer(0);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 5ee2150654..a4ffc11e0e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -193,7 +193,7 @@ class ReadASCIIDataTest
   {
     char delimiter = '\t';
     using DataArrayType = DataArray<T>;
-    typename DataArrayType::Pointer output = DataArrayType::CreateArray(1, "OutputArray", false);
+    typename DataArrayType::Pointer output = DataArrayType::CreateArray(1, std::string("OutputArray"), false);
     QString outputType = output->getTypeAsString();
 
     ASCIIWizardData data;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index 7b27135991..e2e81c0466 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -129,7 +129,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, std::string("DataArray"), true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -167,7 +167,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, std::string("DataArray"), true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -207,7 +207,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, std::string("DataArray"), true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -245,7 +245,7 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, std::string("DataArray"), true);
     am->insertOrAssign(da);
 
     filter->setDataContainerArray(dca);
@@ -282,9 +282,9 @@ class RenameAttributeArrayTest
     AttributeMatrix::Pointer am = AttributeMatrix::New(dims, "AttributeMatrix", AttributeMatrix::Type::Any);
     dc->addOrReplaceAttributeMatrix(am);
 
-    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, "DataArray", true);
+    DataArray<int>::Pointer da = DataArray<int>::CreateArray(1, std::string("DataArray"), true);
     am->insertOrAssign(da);
-    DataArray<int>::Pointer da2 = DataArray<int>::CreateArray(1, "DataArray_2", true);
+    DataArray<int>::Pointer da2 = DataArray<int>::CreateArray(1, std::string("DataArray_2"), true);
     am->insertOrAssign(da2);
 
     filter->setDataContainerArray(dca);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index e48e512c4e..6c817c6f4d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -140,7 +140,7 @@ class WriteASCIIDataTest
     // Back to MultiFile mode
     writer->setOutputStyle(WriteASCIIData::MultiFile);
 
-    NeighborList<int32_t>::Pointer neighborList = NeighborList<int32_t>::CreateArray(k_ArraySize, "NeighborList", true);
+    NeighborList<int32_t>::Pointer neighborList = NeighborList<int32_t>::CreateArray(k_ArraySize, std::string("NeighborList"), true);
     am->insertOrAssign(neighborList);
 
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "NeighborList")};
@@ -153,7 +153,7 @@ class WriteASCIIDataTest
     err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
-    StructArray<int32_t>::Pointer structArray = StructArray<int32_t>::CreateArray(k_ArraySize, "StructArray", true);
+    StructArray<int32_t>::Pointer structArray = StructArray<int32_t>::CreateArray(k_ArraySize, std::string("StructArray"), true);
     am->insertOrAssign(structArray);
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StructArray")};
     writer->setSelectedDataArrayPaths(paths);
@@ -165,7 +165,7 @@ class WriteASCIIDataTest
     err = writer->getErrorCode();
     DREAM3D_REQUIRE(err < 0)
 
-    StatsDataArray::Pointer statsDataArray = StatsDataArray::CreateArray(k_ArraySize, "StatsDataArray", true);
+    StatsDataArray::Pointer statsDataArray = StatsDataArray::CreateArray(k_ArraySize, std::string("StatsDataArray"), true);
     am->insertOrAssign(statsDataArray);
     paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "StatsDataArray")};
     writer->setSelectedDataArrayPaths(paths);
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index d17edaac6b..e54022ca2e 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -216,6 +216,7 @@ DataArray<T>::~DataArray()
   clear();
 }
 
+// -----------------------------------------------------------------------------
 template <typename T>
 typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const QString& name, bool allocate)
 {
@@ -235,6 +236,26 @@ typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const
   }
   return d;
 }
+// -----------------------------------------------------------------------------
+template <typename T>
+typename DataArray<T>::Pointer DataArray<T>::CreateArray(size_t numTuples, const std::string& name, bool allocate)
+{
+  if(name.empty())
+  {
+    return nullptr;
+  }
+  comp_dims_type cDims = {1};
+  auto d = std::make_shared<DataArray<T>>(numTuples, QString::fromStdString(name), cDims, static_cast<T>(0), allocate);
+  if(allocate)
+  {
+    if(d->allocate() < 0)
+    {
+      // Could not allocate enough memory, reset the pointer to null and return
+      return nullptr;
+    }
+  }
+  return d;
+}
 
 // -----------------------------------------------------------------------------
 template <typename T>
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 3913607596..c2db472ce3 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -140,6 +140,7 @@ class DataArray : public IDataArray
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
   static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate);
+  static Pointer CreateArray(size_t numTuples, const std::string& name, bool allocate);
 
   /**
    * @brief Static constructor
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 4b6c3116b1..7fc2277dd6 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -109,7 +109,7 @@ class NeighborList : public IDataArray
 
   static Pointer New()
   {
-    return CreateArray(0, "NeighborList", false);
+    return CreateArray(0, std::string("NeighborList"), false);
   }
 
   /**
@@ -133,6 +133,27 @@ class NeighborList : public IDataArray
     }
     return ptr;
   }
+  /**
+   * @brief CreateArray
+   * @param numTuples
+   * @param name
+   * @param allocate
+   * @return
+   */
+  static Pointer CreateArray(size_t numTuples, const std::string& name, bool allocate = true)
+  {
+    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+    if(name.empty())
+    {
+      return NullPointer();
+    }
+    Pointer ptr = Pointer(new NeighborList<T>(numTuples, QString::fromStdString(name)));
+    if(allocate)
+    {
+      ptr->resizeTuples(numTuples);
+    }
+    return ptr;
+  }
 
   /**
    * @brief CreateArray
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 923f8ebc7e..42eb329fe8 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -83,7 +83,22 @@ StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numElements, const QS
   }
   return ptr;
 }
-
+// -----------------------------------------------------------------------------
+StatsDataArray::Pointer StatsDataArray::CreateArray(size_t numElements, const std::string& name, bool allocate)
+{
+  if(name.empty())
+  {
+    return NullPointer();
+  }
+  StatsDataArray::Pointer ptr = StatsDataArray::New();
+  ptr->setName(QString::fromStdString(name));
+  std::vector<PhaseType::Type> phase_types(numElements, PhaseType::Type::Unknown);
+  if(allocate && numElements > 0)
+  {
+    ptr->fillArrayWithNewStatsData(numElements, &(phase_types.front()));
+  }
+  return ptr;
+}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index f26e10070e..8216729da3 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -96,6 +96,7 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @return Std::Shared_Ptr wrapping an instance of DataArrayTemplate<T>
    */
   static Pointer CreateArray(size_t numElements, const QString& name, bool allocate = true);
+  static Pointer CreateArray(size_t numElements, const std::string& name, bool allocate = true);
 
   /**
    * @brief CreateArray
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index bcf57a58a5..fb6a57eb2b 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -71,7 +71,17 @@ StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const QS
   Pointer ptr(d);
   return ptr;
 }
-
+// -----------------------------------------------------------------------------
+StringDataArray::Pointer StringDataArray::CreateArray(size_t numTuples, const std::string& name, bool allocate)
+{
+  if(name.empty())
+  {
+    return NullPointer();
+  }
+  StringDataArray* d = new StringDataArray(numTuples, QString::fromStdString(name), allocate);
+  Pointer ptr(d);
+  return ptr;
+}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 8934edf453..5f3864c585 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <memory>
-
 #include <string>
 #include <vector>
 
@@ -104,7 +103,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @return
    */
   static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true);
-
+  static Pointer CreateArray(size_t numTuples, const std::string& name, bool allocate = true);
   /**
    * @brief CreateArray
    * @param numTuples
@@ -379,7 +378,6 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param value
    */
   void setValue(size_t i, const QString& value);
-
   /**
    * @brief getValue
    * @param i
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 4e62c7e1ac..2090d77c71 100644
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -98,18 +98,39 @@ class StructArray : public IDataArray
     {
       return NullPointer();
     }
-    StructArray<T>* d = new StructArray<T>(numElements, true);
+    Pointer ptr = std::shared_ptr<Self>(new Self(numElements, true));
     if(allocate)
     {
-      if(d->Allocate() < 0)
+      if(ptr->Allocate() < 0)
       {
-        // Could not allocate enough memory, reset the pointer to null and return
-        delete d;
-        return StructArray<T>::NullPointer();
+        return Self::NullPointer();
       }
     }
-    d->setName(name);
-    Pointer ptr(d);
+    ptr->setName(name);
+    return ptr;
+  }
+
+  /**
+   * @brief Static constructor
+   * @param numElements The number of elements in the internal array.
+   * @param name The name of the array
+   * @return Std::Shared_Ptr wrapping an instance of StructArrayTemplate<T>
+   */
+  static Pointer CreateArray(size_t numElements, const std::string& name, bool allocate = true)
+  {
+    if(name.empty())
+    {
+      return NullPointer();
+    }
+    Pointer ptr = std::shared_ptr<Self>(new Self(numElements, true));
+    if(allocate)
+    {
+      if(ptr->Allocate() < 0)
+      {
+        return Self::NullPointer();
+      }
+    }
+    ptr->setName(QString::fromStdString(name));
     return ptr;
   }
 
@@ -138,7 +159,7 @@ class StructArray : public IDataArray
   ~StructArray() override
   {
     // qDebug() << "~StructArrayTemplate '" << m_Name << "'" ;
-    if((nullptr != m_Array) && (true == m_OwnsData))
+    if((nullptr != m_Array) && (m_OwnsData))
     {
       deallocate();
     }
@@ -210,7 +231,7 @@ class StructArray : public IDataArray
    */
   int32_t Allocate()
   {
-    if((nullptr != m_Array) && (true == m_OwnsData))
+    if((nullptr != m_Array) && (m_OwnsData))
     {
       deallocate();
     }
@@ -242,7 +263,7 @@ class StructArray : public IDataArray
    */
   virtual void initialize()
   {
-    if(nullptr != m_Array && true == m_OwnsData)
+    if(nullptr != m_Array && m_OwnsData)
     {
       deallocate();
     }
@@ -899,6 +920,9 @@ class StructArray : public IDataArray
   //   unsigned long long int MUD_FLAP_3;
   //  unsigned long long int MUD_FLAP_5;
 
-  StructArray(const StructArray&);    // Not Implemented
-  void operator=(const StructArray&); // Not Implemented
+public:
+  StructArray(const StructArray&) = delete;            // Copy Constructor Not Implemented
+  StructArray(StructArray&&) = delete;                 // Move Constructor Not Implemented
+  StructArray& operator=(const StructArray&) = delete; // Copy Assignment Not Implemented
+  StructArray& operator=(StructArray&&) = delete;      // Move Assignment Not Implemented
 };
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index f87a362f06..c3a3379e1d 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -190,7 +190,7 @@ class DataArrayTest
   {
     // Test dropping of front elements only
     {
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS, "Test1", true);
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(NUM_ELEMENTS, std::string("Test1"), true);
       DREAM3D_REQUIRE_EQUAL(array->isAllocated(), true);
       for(size_t i = 0; i < NUM_ELEMENTS; ++i)
       {
@@ -419,7 +419,7 @@ class DataArrayTest
 
 #define TEST_TYPE_STRING(type)                                                                                                                                                                         \
   {                                                                                                                                                                                                    \
-    DataArray<type>::Pointer p_##type = DataArray<type>::CreateArray(1, "Test", false);                                                                                                                \
+    DataArray<type>::Pointer p_##type = DataArray<type>::CreateArray(1, std::string("Test"), false);                                                                                                   \
     QString s_##type = p_##type->getTypeAsString();                                                                                                                                                    \
     s_##type = s_##type; /* qDebug() << #type << s_##type; */                                                                                                                                          \
     auto value = static_cast<type>(1);                                                                                                                                                                 \
@@ -458,7 +458,7 @@ class DataArrayTest
   {
     int32_t* ptr = nullptr;
     {
-      Int32ArrayType::Pointer d = Int32ArrayType::CreateArray(0, "Test7", true);
+      Int32ArrayType::Pointer d = Int32ArrayType::CreateArray(0, std::string("Test7"), true);
       DREAM3D_REQUIRE_EQUAL(0, d->getSize());
       DREAM3D_REQUIRE_EQUAL(0, d->getNumberOfTuples());
       ptr = d->getPointer(0);
@@ -636,7 +636,7 @@ class DataArrayTest
     std::vector<size_t> tDims(10);
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, "AttributeMatrix", AttributeMatrix::Type::Cell);
 
-    typename NeighborList<T>::Pointer neiList = NeighborList<T>::CreateArray(10, "NeighborList", true);
+    typename NeighborList<T>::Pointer neiList = NeighborList<T>::CreateArray(10, std::string("NeighborList"), true);
 
     for(int i = 0; i < 10; ++i)
     {
@@ -815,7 +815,7 @@ class DataArrayTest
     size_t dims[RANK] = {DIM0, DIM1, DIM2};
     int numComp = 1;
     {
-      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, "TEST", true);
+      typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(numTuples, std::string("TEST"), true);
       err = ValidateArrayForType<T>(array, numTuples, numComp);
       DREAM3D_REQUIRED(err, >=, 0)
     }
@@ -1170,7 +1170,7 @@ true);
   // -----------------------------------------------------------------------------
   void TestPrintDataArray()
   {
-    FloatArrayType::Pointer floats = FloatArrayType::CreateArray(1, "Test_Float", true);
+    FloatArrayType::Pointer floats = FloatArrayType::CreateArray(1, std::string("Test_Float"), true);
     floats->setValue(0, SIMPLib::Constants::k_Pif);
     QString outStr;
     QTextStream out(&outStr);
@@ -1183,7 +1183,7 @@ true);
     DREAM3D_REQUIRE_EQUAL(comp, 0);
 
     outStr.clear();
-    DoubleArrayType::Pointer doubles = DoubleArrayType::CreateArray(1, "Test_Double", true);
+    DoubleArrayType::Pointer doubles = DoubleArrayType::CreateArray(1, std::string("Test_Double"), true);
     doubles->setValue(0, SIMPLib::Constants::k_Pi);
     doubles->printTuple(out, 0);
     matchString = "3.141592653589793";
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 5f841a8adb..dc066d87d5 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -497,7 +497,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     {
       if(nullptr != filter)
       {
-        typename ArrayType::Pointer validTargetArray = ArrayType::CreateArray(1, "JUNK_INTERNAL_ARRAY", false);
+        typename ArrayType::Pointer validTargetArray = ArrayType::CreateArray(1, std::string("JUNK_INTERNAL_ARRAY"), false);
         IDataArrayShPtrType srcArray = getAttributeArray(arrayName);
         QString srcDesc = srcArray->getTypeAsString();
         QString desc = validTargetArray->getTypeAsString();
@@ -541,7 +541,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     typename ArrayType::Pointer array = std::dynamic_pointer_cast<ArrayType>(targetDestArray);
     if(nullptr == array.get())
     {
-      typename ArrayType::Pointer dat = ArrayType::CreateArray(1, "JUNK-INTERNAL-USE-ONLY", true);
+      typename ArrayType::Pointer dat = ArrayType::CreateArray(1, std::string("JUNK-INTERNAL-USE-ONLY"), true);
       QString ss = QObject::tr(" - The filter requested an array named '%1' with type '%2' from the filter '%3'.\n"
                                "An Array with name '%4' is stored in the %5 but is of type %6\n")
                        .arg(arrayName)
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index 5fe81507d6..40b9be5c01 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -242,7 +242,7 @@ class Connectivity
     size_t elemId = 0;
 
     // Fill out lists with number of references to cells
-    typename DataArray<K>::Pointer linkLocPtr = DataArray<K>::CreateArray(numVerts, "_INTERNAL_USE_ONLY_Vertices", true);
+    typename DataArray<K>::Pointer linkLocPtr = DataArray<K>::CreateArray(numVerts, std::string("_INTERNAL_USE_ONLY_Vertices"), true);
     linkLocPtr->initializeWithValue(0);
     K* linkLoc = linkLocPtr->getPointer(0);
     K* verts = nullptr;
@@ -329,7 +329,7 @@ class Connectivity
     dynamicList->allocateLists(linkCount);
 
     // Allocate an array of bools that we use each iteration so that we don't put duplicates into the array
-    typename DataArray<bool>::Pointer visitedPtr = DataArray<bool>::CreateArray(numElems, "_INTERNAL_USE_ONLY_Visited", true);
+    typename DataArray<bool>::Pointer visitedPtr = DataArray<bool>::CreateArray(numElems, std::string("_INTERNAL_USE_ONLY_Visited"), true);
     visitedPtr->initializeWithValue(false);
     bool* visited = visitedPtr->getPointer(0);
 

From 018d3f50cf6cf18b4297b11b012531ff965f3ae0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 16 Jul 2020 18:42:42 -0400
Subject: [PATCH 258/397] Fix Convert Color To GrayScale when not run in
 parallel

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index f3cd6cc905..a595ab557e 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -116,7 +116,7 @@ class LightnessImpl
   {
     for(size_t i = start; i < end; i++)
     {
-      std::pair<uint8_t*, uint8_t*> minmax{std::minmax_element(m_ImageData + (start * m_NumComp), m_ImageData + (end * m_NumComp))};
+      std::pair<uint8_t*, uint8_t*> minmax{std::minmax_element(m_ImageData + (i * m_NumComp), m_ImageData + (i * m_NumComp + 3))};
       m_FlatImageData[i] = static_cast<uint8_t>(roundf((minmax.first[0] + minmax.second[0]) / 2.0f));
     }
   }

From dd2dbb0a0154125553aedd8edad0b654177677f6 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 17 Jul 2020 14:32:47 -0400
Subject: [PATCH 259/397] Correct comment to remove dead URL.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ApplyImageTransforms.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index 714be80419..e45c57172b 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -153,7 +153,7 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
 
 public:
   /* Rule of 5: All special member functions should be defined if any are defined.
-   * https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c21-if-you-define-or-delete-any-default-operation-define-or-delete-them-all
+   * CppCoreGuidelines #c21 if you define or delete any default operation define or delete them all
    */
   ApplyImageTransforms(const ApplyImageTransforms&) = delete;            // Copy Constructor Not Implemented
   ApplyImageTransforms& operator=(const ApplyImageTransforms&) = delete; // Copy Assignment Not Implemented

From f2aca07c2772c6913391017d9e85f4763c06ec4e Mon Sep 17 00:00:00 2001
From: JDuffeyBQ <jared.duffey@bluequartz.net>
Date: Mon, 20 Jul 2020 17:38:07 -0400
Subject: [PATCH 260/397] Feature/python assert (#411)

* Python tests now assert on filter error conditions so they will properly report their failures
* Fixed several Python tests which were previously silently failing
* Changed simpl_helpers import alias from "sc" to "sh"
* Removed unnecessary sleep calls from Python tests

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Python/Testing/Array_Calculator_Test.py   |   6 +-
 .../Python/Testing/AttributeMatrixTest.py     |   4 +-
 .../Convert_Attribute_Array_Data_Type.py      |   8 +-
 Wrapping/Python/Testing/Copy_Object_Test.py   |  16 +--
 .../Python/Testing/Create_Edge_Geometry.py    |  75 ++--------
 .../Python/Testing/Create_Quad_Geometry.py    |  96 ++-----------
 .../Python/Testing/Create_RectilinearGrid.py  |  49 +++----
 .../Testing/Create_Triangle_Geometry.py       |  94 ++----------
 .../Python/Testing/Create_Vertex_Geometry.py  |  22 ++-
 .../Python/Testing/Crop_Vertex_Geometry.py    |  28 ++--
 Wrapping/Python/Testing/DataArrayTest.py      |  12 +-
 .../Python/Testing/DataContainerArrayTest.py  |  20 +--
 Wrapping/Python/Testing/DataContainerTest.py  |  10 +-
 .../Testing/Export_Triangle_Geometry.py       |  98 +++----------
 Wrapping/Python/Testing/GeometryTest.py       |   2 +-
 Wrapping/Python/Testing/ImageReadTest.py      |  10 +-
 .../Python/Testing/Import_Ascii_Data_Array.py |  12 +-
 .../Python/Testing/Import_Hdf5_Dataset.py     |  18 +--
 Wrapping/Python/Testing/NumPy_Round_Trip.py   |  36 +++--
 .../Testing/Remove_Component_From_Array.py    |  13 +-
 .../Python/Testing/Rename_Attribute_Array.py  | 136 ++----------------
 .../Python/Testing/Split_Attribute_Array.py   |  13 +-
 Wrapping/Python/Testing/TestBindings.py       |   6 +-
 23 files changed, 189 insertions(+), 595 deletions(-)

diff --git a/Wrapping/Python/Testing/Array_Calculator_Test.py b/Wrapping/Python/Testing/Array_Calculator_Test.py
index 8cf7689d29..5b44e1968e 100644
--- a/Wrapping/Python/Testing/Array_Calculator_Test.py
+++ b/Wrapping/Python/Testing/Array_Calculator_Test.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def array_calculator_test():
@@ -16,7 +16,7 @@ def array_calculator_test():
 
     # Create an Attribute Matrix
     amDims = [[4, 5, 6]]
-    tableData = sc.CreateDynamicTableData(amDims)
+    tableData = sh.CreateDynamicTableData(amDims)
     dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
@@ -34,7 +34,7 @@ def array_calculator_test():
     assert err == 0
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory()
                               + '/Data/Output/CoreFilterTests/ArrayCalculatorTest.dream3d', dca)
     assert err == 0
 
diff --git a/Wrapping/Python/Testing/AttributeMatrixTest.py b/Wrapping/Python/Testing/AttributeMatrixTest.py
index 5e366f79e6..4db1ebf1ea 100644
--- a/Wrapping/Python/Testing/AttributeMatrixTest.py
+++ b/Wrapping/Python/Testing/AttributeMatrixTest.py
@@ -1,6 +1,6 @@
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def AttributeMatrixTest():
@@ -8,7 +8,7 @@ def AttributeMatrixTest():
     amType = simpl.AttributeMatrix.Type.Cell
     tupleDims = simpl.VectorSizeT([5,4,3])
     amName = 'CellAttributeMatrix'
-    am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
+    am = sh.CreateAttributeMatrix(tupleDims, amName, amType)
 
     print('Name: %s' % am.Name)
 
diff --git a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
index 16c8e3ce3b..ca5d3df9a2 100644
--- a/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
+++ b/Wrapping/Python/Testing/Convert_Attribute_Array_Data_Type.py
@@ -4,7 +4,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 import datetime
@@ -14,11 +14,11 @@ def convert_data_test():
     dca = simpl.DataContainerArray()
 
     # Create a Data Container
-    dc = sc.CreateDataContainer('ImageDataContainer')
+    dc = sh.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
  
     shape = simpl.VectorSizeT([4, 5, 2])
-    cellAm = sc.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
+    cellAm = sh.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)   
     
     dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data')
@@ -32,7 +32,7 @@ def convert_data_test():
     assert err == 0
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory()
                               + '/Data/Output/CoreFilterTests/ConvertAttributeArrayDataType.dream3d', dca)
     assert err == 0
 
diff --git a/Wrapping/Python/Testing/Copy_Object_Test.py b/Wrapping/Python/Testing/Copy_Object_Test.py
index c108dcc306..3e46babb0d 100644
--- a/Wrapping/Python/Testing/Copy_Object_Test.py
+++ b/Wrapping/Python/Testing/Copy_Object_Test.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def copy_object_test():
@@ -16,7 +16,7 @@ def copy_object_test():
 
     # Create an Attribute Matrix
     amDims = [[4, 5, 6]]
-    tableData = sc.CreateDynamicTableData(amDims)
+    tableData = sh.CreateDynamicTableData(amDims)
     dap = simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
@@ -28,20 +28,16 @@ def copy_object_test():
     assert err == 0
 
     # Test: Copy Object
-    err = simplpy.copy_object(dca, sc.ObjectToCopy.AttributeArray, '', 
+    err = simplpy.copy_object(dca, sh.ObjectToCopy.AttributeArray, '', 
                               simpl.DataArrayPath('', '', ''),
                               simpl.DataArrayPath('ImageDataContainer', 'CellAttributeMatrix', 'Int32Data'),
                               'Int32Data_Copy')
-    if err < 0:
-        print('copy_object ErrorCondition %d' % err)
-    assert err == 0
+    assert err == 0, f'CopyObject ErrorCondition: {err}'
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory()
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory()
                               + '/Data/Output/CoreFilterTests/CopyObjectTest.dream3d', dca)
-    if err < 0:
-        print('WriteDREAM3DFile ErrorCondition: %d' % err)
-    assert err == 0
+    assert err == 0, f'WriteDREAM3DFile ErrorCondition: {err}'
 
 if __name__ == '__main__':
     copy_object_test()
diff --git a/Wrapping/Python/Testing/Create_Edge_Geometry.py b/Wrapping/Python/Testing/Create_Edge_Geometry.py
index dfaefe0fd7..8fd8c2c0d8 100644
--- a/Wrapping/Python/Testing/Create_Edge_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Edge_Geometry.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy as d3d
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def CreateEdgeGeometryTest():
@@ -11,77 +11,32 @@ def CreateEdgeGeometryTest():
 
   # Create the Data Container
   err = d3d.create_data_container(dca, 'DataContainer')
-  if err < 0:
-    print('DataContainer ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainer ErrorCondition: {err}'
 
-  # Import ASCII Data - #1 - Vertex Coordinates (Using helper function)
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
+  # Read vertices
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Bounds', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[144]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  err = d3d.read_ascii_data(dca, sc.CreateAsciiWizardData(importFile, 2, 145, [','], False, True, 
-  simpl.DataArrayPath('DataContainer', 'Bounds', ''), ['x', 'y', 'z'], 3,
-  [144], ['float', 'float', 'float']))
-  if err < 0:
-    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
-  
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'), simpl.NumericTypes.Float, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
-  # Import ASCII Data - #2 - Edge Connectivity (Without using helper function)
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/EdgeConnectivity.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 265,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'EdgeList', ''),
-    'headers': ['V1', 'V0'],
-    'attrMatType': 3,
-    'tupleDimensions': [264],
-    'dataTypes': ['int64_t', 'int64_t']
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
+  # Read edges
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'EdgeList', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[264]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
-  if err < 0:
-    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
-
-  # Delete Data # 1
-  # Remove array helper function:
-  err = sc.RemoveArrays(dca, [('DataContainer', 'Bounds', 'x'), ('DataContainer', 'Bounds', 'y'), ('DataContainer', 'Bounds', 'z')])
-  if err < 0:
-    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
-
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'EdgeList', 'V0'), 
-  simpl.DataArrayPath('DataContainer', 'EdgeList', 'V1')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Edges', False)
-  if err < 0:
-    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
-
-  # Delete Data # 2
-  # Remove array helper function:
-  err = sc.RemoveArrays(dca, [('DataContainer', 'EdgeList', 'V0'), ('DataContainer', 'EdgeList', 'V1')])
-  if err < 0:
-    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'EdgeList', 'Edges'), simpl.NumericTypes.SizeT, 2, 1, sd.GetBuildDirectory() + '/Data/SIMPL/EdgeConnectivity.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, sc.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, 'DataContainer', False, 
+  err = sh.CreateGeometry(dca, sh.ArrayHandling.CopyArrays, simpl.IGeometry.Type.Edge, 'DataContainer', False, 
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
   shared_edge_list_array_path = simpl.DataArrayPath('DataContainer', 'EdgeList', 'Edges'),
   vertex_attribute_matrix_name = 'VertexData',
   edge_attribute_matrix_name = 'EdgeData')
-  if err < 0:
-    print('Create Geometry -  ErrorCondition: %d' % err)
+  assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateEdgeGeometry.dream3d', True, False)
-  if err < 0:
-    print('DataContainerWriter ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
   CreateEdgeGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Quad_Geometry.py b/Wrapping/Python/Testing/Create_Quad_Geometry.py
index 4593202fd8..05afe74a9e 100644
--- a/Wrapping/Python/Testing/Create_Quad_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Quad_Geometry.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy as d3d
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def CreateQuadGeometryTest():
@@ -11,98 +11,32 @@ def CreateQuadGeometryTest():
 
   # Create the Data Container
   err = d3d.create_data_container(dca, 'DataContainer')
-  if err < 0:
-    print('DataContainer ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainer ErrorCondition: {err}'
 
-  # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 145,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
-    'headers': ['x', 'y', 'z'],
-    'attrMatType': 3,
-    'tupleDimensions': [144],
-    'dataTypes': ['float', 'float', 'float']
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
-  
-  # Import ASCII Data - #2 - Edge Connectivity
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/QuadConnectivity.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 122,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'QuadList', ''),
-    'headers': ['V0', 'V1', 'V2', 'V3'],
-    'attrMatType': 3,
-    'tupleDimensions': [121],
-    'dataTypes': ['int64_t', 'int64_t','int64_t', 'int64_t']
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
+  # Read vertices
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Bounds', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[144]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
-  if err < 0:
-    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'), simpl.NumericTypes.Float, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
-  # Delete Data # 1
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy('DataContainer').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
+  # Read quads
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'QuadList', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[121]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'QuadList', 'V0'), 
-  simpl.DataArrayPath('DataContainer', 'QuadList', 'V1'), simpl.DataArrayPath('DataContainer', 'QuadList', 'V2'), 
-  simpl.DataArrayPath('DataContainer', 'QuadList', 'V3')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Quads', False)
-  if err < 0:
-    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
-
-  # Delete Data # 2
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy('DataContainer').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V0').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V1').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V2').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('QuadList').getDataArrayProxy('V3').Flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'QuadList', 'Quads'), simpl.NumericTypes.SizeT, 4, 1, sd.GetBuildDirectory() + '/Data/SIMPL/QuadConnectivity.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, 'DataContainer', False, 
+  err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Quad, 'DataContainer', False, 
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
   shared_quad_list_array_path = simpl.DataArrayPath('DataContainer', 'QuadList', 'Quads'),
   vertex_attribute_matrix_name = 'VertexData',
   face_attribute_matrix_name = 'FaceData')
-  if err < 0:
-    print('Create Geometry -  ErrorCondition: %d' % err)
+  assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateQuadGeometry.dream3d', True, False)
-  if err < 0:
-    print('DataContainerWriter ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
   CreateQuadGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_RectilinearGrid.py b/Wrapping/Python/Testing/Create_RectilinearGrid.py
index 1d2d4a7d0a..cfe62fd6da 100644
--- a/Wrapping/Python/Testing/Create_RectilinearGrid.py
+++ b/Wrapping/Python/Testing/Create_RectilinearGrid.py
@@ -1,11 +1,8 @@
-
 # Based on CreateRectilinearGrid example
 
-# As of 9-13-18, this example will not work as the input file is not available
-
 import simpl
 import simplpy as d3d
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def CreateRectilinearGridTest():
@@ -14,40 +11,30 @@ def CreateRectilinearGridTest():
 
   # Create the Data Container
   err = d3d.create_data_container(dca, 'DataContainer')
-  if err < 0:
-    print('DataContainer ErrorCondition: %d' % err)
-
-  # Import ASCII Data - Rectilinear Grid
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/RectilinearGrid.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 15,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
-    'headers': ['x', 'y', 'z'],
-    'attrMatType': 3,
-    'tupleDimensions': [14],
-    'dataTypes': ['float', 'float', 'float']
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainer ErrorCondition: {err}'
+
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Bounds', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[14]]))
+  assert err == 0, f'CreateAttributeMatrix ErrorCondition: {err}'
+
+  err = d3d.create_data_array(dca, simpl.ScalarTypes.Float, 1, simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 1, '0', (-50.0, 50.0))
+  assert err == 0, f'CreateDataArray ErrorCondition: {err}'
+
+  err = d3d.create_data_array(dca, simpl.ScalarTypes.Float, 1, simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 1, '0', (-50.0, 50.0))
+  assert err == 0, f'CreateDataArray ErrorCondition: {err}'
+
+  err = d3d.create_data_array(dca, simpl.ScalarTypes.Float, 1, simpl.DataArrayPath('DataContainer', 'Bounds', 'z'), 1, '0', (-50.0, 50.0))
+  assert err == 0, f'CreateDataArray ErrorCondition: {err}'
   
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False, 
+  err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.RectGrid, 'DataContainer', False, 
   x_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
   y_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
   z_bounds_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'z'),
-  face_attribute_matrix_name = 'CellData')
-  if err < 0:
-    print('Create Geometry -  ErrorCondition: %d' % err)
+  cell_attribute_matrix_name = 'CellData')
+  assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateRectilinearGrid.dream3d', True, False)
-  if err < 0:
-    print('DataContainerWriter ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
   CreateRectilinearGridTest()
diff --git a/Wrapping/Python/Testing/Create_Triangle_Geometry.py b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
index f997e4bfbc..06fe02f20e 100644
--- a/Wrapping/Python/Testing/Create_Triangle_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Triangle_Geometry.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy as d3d
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def CreateTriangleGeometryTest():
@@ -11,96 +11,32 @@ def CreateTriangleGeometryTest():
 
   # Create the Data Container
   err = d3d.create_data_container(dca, 'DataContainer')
-  if err < 0:
-    print('DataContainer ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainer ErrorCondition: {err}'
 
-  # Import ASCII Data - #1 - Vertex Coordinates
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 145,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
-    'headers': ['x', 'y', 'z'],
-    'attrMatType': 3,
-    'tupleDimensions': [144],
-    'dataTypes': ['float', 'float', 'float']
-  }
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
-  
-  # Combine Attribute Arrays # 1:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
-  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
-  if err < 0:
-    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
+  # Read vertices
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Bounds', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[144]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  # Delete Data # 1
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy('DataContainer').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'), simpl.NumericTypes.Float, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
-  # Import ASCII Data - #2 - Triangle Connectivity
-  importFile = sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv'
-  wizardData = {
-    'inputFilePath': importFile,
-    'beginIndex': 2,
-    'numberOfLines': 243,
-    'delimiters': [','],    
-    'consecutiveDelimiters': False,
-    'automaticAM': True,
-    'selectedPath': simpl.DataArrayPath('DataContainer', 'Triangles', ''),
-    'headers': ['V0', 'V1', 'V2'],
-    'attrMatType': 3,
-    'tupleDimensions': [242],
-    'dataTypes': ['int64_t', 'int64_t','int64_t']
-  }  
-  err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
+  # Read triangles
+  err = d3d.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Triangles', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[242]]))
+  assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-  # Combine Attribute Arrays #2:
-  selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Triangles', 'V0'), 
-  simpl.DataArrayPath('DataContainer', 'Triangles', 'V1'), simpl.DataArrayPath('DataContainer', 'Triangles', 'V2')]
-  err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Triangles', False)
-  if err < 0:
-    print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
-
-  # Delete Data # 2
-  dcap = simpl.DataContainerArrayProxy()
-  dcap.getDataContainerProxy('DataContainer').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').Flag = 0
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V0').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V1').Flag = 2
-  dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V2').Flag = 2
-  err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print('Remove Arrays #2 -  ErrorCondition: %d' % err)
+  err = d3d.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'), simpl.NumericTypes.SizeT, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv', 0)
+  assert err == 0, f'ImportAsciDataArray - Error {err}'
 
   # Create Geometry
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False, 
+  err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False, 
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
   shared_tri_list_array_path = simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'),
   vertex_attribute_matrix_name = 'VertexData',
   face_attribute_matrix_name = 'FaceData')
-  if err < 0:
-    print('Create Geometry -  ErrorCondition: %d' % err)
+  assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateTriangleGeometry.dream3d', True, False)
-  if err < 0:
-    print('DataContainerWriter ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
   CreateTriangleGeometryTest()
diff --git a/Wrapping/Python/Testing/Create_Vertex_Geometry.py b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
index 24c6d6cbd4..e5eec49eb8 100644
--- a/Wrapping/Python/Testing/Create_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy as d3d
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def CreateVertexGeometryTest():
@@ -11,8 +11,7 @@ def CreateVertexGeometryTest():
 
   # Create the Data Container
   err = d3d.create_data_container(dca, 'DataContainer')
-  if err < 0:
-    print('DataContainer ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainer ErrorCondition: {err}'
 
   # Import ASCII Data - #1 - Vertex Coordinates
   importFile = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
@@ -30,16 +29,14 @@ def CreateVertexGeometryTest():
     'dataTypes': ['float', 'float', 'float']
   }
   err = d3d.read_ascii_data(dca, wizardData)
-  if err < 0:
-    print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
+  assert err == 0, f'Import ASCII Data #1 -  ErrorCondition: {err}'
   
   # Combine Attribute Arrays # 1:
   selectedDataArrayPaths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'), 
   simpl.DataArrayPath('DataContainer', 'Bounds', 'y'), 
   simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
   err = d3d.combine_attribute_arrays(dca, selectedDataArrayPaths, 'Vertices', False)
-  if err < 0:
-    print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
+  assert err == 0, f'Combined Attribute Arrays #1 -  ErrorCondition: {err}'
 
   # Delete Data # 1
   dcap = simpl.DataContainerArrayProxy()
@@ -49,22 +46,19 @@ def CreateVertexGeometryTest():
   dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
   dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
   err = d3d.remove_arrays(dca, dcap)
-  if err < 0:
-    print('Remove Arrays #1 -  ErrorCondition: %d' % err)
+  assert err == 0, f'Remove Arrays #1 -  ErrorCondition: {err}'
 
   # Create Geometry
   data_container_name = 'DataContainer'
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices')
   vertex_attribute_matrix_name = 'VertexData'
-  err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False, 
+  err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False, 
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
   vertex_attribute_matrix_name = 'VertexData')
-  if err < 0:
-    print('Create Geometry -  ErrorCondition: %d' % err)
+  assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateVertexGeometry.dream3d', True, False)
-  if err < 0:
-    print('DataContainerWriter ErrorCondition: %d' % err)
+  assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
   CreateVertexGeometryTest()
diff --git a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
index 654e542f83..cc9623fa07 100644
--- a/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Crop_Vertex_Geometry.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def crop_vertex_geometry_test():
@@ -12,8 +12,7 @@ def crop_vertex_geometry_test():
 
     # Create the Data Container
     err = simplpy.create_data_container(dca, 'DataContainer')
-    if err < 0:
-        print('DataContainer ErrorCondition: %d' % err)
+    assert err == 0, f'DataContainer ErrorCondition: {err}'
 
     # Import ASCII Data - #1 - Vertex Coordinates
     import_file = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
@@ -31,16 +30,14 @@ def crop_vertex_geometry_test():
         'dataTypes': ['float', 'float', 'float']
     }
     err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
+    assert err == 0, f'Import ASCII Data #1 -  ErrorCondition: {err}'
 
     # Combine Attribute Arrays # 1:
     selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
                                  simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
                                  simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
     err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Vertices', False)
-    if err < 0:
-        print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
+    assert err == 0, f'Combined Attribute Arrays #1 -  ErrorCondition: {err}'
 
     # Delete Data # 1
     dcap = simpl.DataContainerArrayProxy()
@@ -50,21 +47,18 @@ def crop_vertex_geometry_test():
     dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
     dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print('Remove Arrays #1 -  ErrorCondition: %d' % err)
+    assert err == 0, f'Remove Arrays #1 -  ErrorCondition: {err}'
 
     # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False,
+    err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False,
                             shared_vertex_list_array_path=simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
                             vertex_attribute_matrix_name='VertexData')
-    if err < 0:
-        print('Create Geometry -  ErrorCondition: %d' % err)
+    assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
     # Crop Geometry (Vertex)
     err = simplpy.crop_vertex_geometry(dca, 'DataContainer', 'CroppedDataContainer',
                                        -0.5, -0.5, 0.0, 0.5, 0.5, 1)
-    if err < 0:
-        print('CropVertexGeometry -  ErrorCondition: %d' % err)
+    assert err == 0, f'CropVertexGeometry -  ErrorCondition: {err}'
 
     # Delete Data #2
     dcap = simpl.DataContainerArrayProxy()
@@ -73,15 +67,13 @@ def crop_vertex_geometry_test():
     dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('VertexData').Flag = 2
     dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('Vertices').Flag = 2
     err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print('Remove Arrays #2 -  ErrorCondition: %d' % err)
+    assert err == 0, f'Remove Arrays #2 -  ErrorCondition: {err}'
 
     # Write to DREAM.3D File
     err = simplpy.data_container_writer(dca, sd.GetBuildDirectory() +
                                         '/Data/Output/CoreFilters/' +
                                         'CropVertexGeometry.dream3d', True, False)
-    if err < 0:
-        print('DataContainerWriter ErrorCondition: %d' % err)
+    assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
 if __name__ == '__main__':
     crop_vertex_geometry_test()
diff --git a/Wrapping/Python/Testing/DataArrayTest.py b/Wrapping/Python/Testing/DataArrayTest.py
index 2ba9141c92..0feec05395 100644
--- a/Wrapping/Python/Testing/DataArrayTest.py
+++ b/Wrapping/Python/Testing/DataArrayTest.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def DataArrayTest():
@@ -10,13 +10,13 @@ def DataArrayTest():
     This is the Top level to test the creation of Data Arrays from numpy and placing those
     arrays into a DREAM3D DataContainer heirarchy.
     '''
-    dca = sc.CreateDataContainerArray()
+    dca = sh.CreateDataContainerArray()
 
-    dc = sc.CreateDataContainer('ImageDataContainer')
+    dc = sh.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
 
     shape = simpl.VectorSizeT([4, 5, 2])
-    cellAm = sc.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
+    cellAm = sh.CreateAttributeMatrix(shape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
     shape = [4, 5, 2]
     # Create the Component Dimensions for the Array, 1 Component in this case
@@ -30,7 +30,7 @@ def DataArrayTest():
 
     for index, item in enumerate(arrayTypes):
         # print('+++ Creating Array: %s' % item)
-        z_flat, array = sc.CreateDataArray(arrayTypes[index].__name__, shape, cDims, item)
+        z_flat, array = sh.CreateDataArray(arrayTypes[index].__name__, shape, cDims, item)
         cellAm.addOrReplaceAttributeArray(array)
         arrayList.append(z_flat)
         # Now add an array that is purely allocated on the C++/SIMPL side of things.
@@ -50,7 +50,7 @@ def DataArrayTest():
     imageGeom.setOrigin(5.5, -9.0, 0.0)
     dc.setGeometry(imageGeom)
 
-    err = sc.WriteDREAM3DFile(sd.GetTestTempDirectory() + '/DataArrayTest.dream3d', dca, True)
+    err = sh.WriteDREAM3DFile(sd.GetTestTempDirectory() + '/DataArrayTest.dream3d', dca, True)
     assert err == 0
 
 if __name__ == '__main__':
diff --git a/Wrapping/Python/Testing/DataContainerArrayTest.py b/Wrapping/Python/Testing/DataContainerArrayTest.py
index bcece84ea9..07fa13a280 100644
--- a/Wrapping/Python/Testing/DataContainerArrayTest.py
+++ b/Wrapping/Python/Testing/DataContainerArrayTest.py
@@ -1,6 +1,6 @@
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def AttributeMatrixAccessTest():
@@ -9,8 +9,8 @@ def AttributeMatrixAccessTest():
     and DataContainerArray
     '''
     print('Starting AttributeMatrixAccessTest....')
-    dca = sc.CreateDataContainerArray()
-    dc = sc.CreateDataContainer('AM Test')
+    dca = sh.CreateDataContainerArray()
+    dc = sh.CreateDataContainer('AM Test')
     dca.addOrReplaceDataContainer(dc)
     
     amType = simpl.AttributeMatrix.Type.Cell
@@ -22,13 +22,13 @@ def AttributeMatrixAccessTest():
     dap = simpl.DataArrayPath('AM Test', 'CellAttributeMatrix', '')
     am0 = dca.getAttributeMatrix(dap)
     assert am0 == am
-    assert True == dca.doesAttributeMatrixExist(dap)
+    assert dca.doesAttributeMatrixExist(dap)
 
     # Change the data array path to something that does not exist.
     dap.update('AM Test', 'Foo', '')
     am0 = dca.getAttributeMatrix(dap)
     assert am0 != am
-    assert False == dca.doesAttributeMatrixExist(dap)
+    assert not dca.doesAttributeMatrixExist(dap)
 
 def DataContainerTest():
     '''
@@ -36,9 +36,9 @@ def DataContainerTest():
     This needs to be updated as more methods are exposed to Python
     '''
     print('Starting DataContainerTest....')
-    dca = sc.CreateDataContainerArray()
-    dc0 = sc.CreateDataContainer('dc0')
-    dc1 = sc.CreateDataContainer('dc1')
+    dca = sh.CreateDataContainerArray()
+    dc0 = sh.CreateDataContainer('dc0')
+    dc1 = sh.CreateDataContainer('dc1')
 
     dca.addOrReplaceDataContainer(dc0)
     dca.addOrReplaceDataContainer(dc1)
@@ -66,8 +66,8 @@ def DataContainerTest():
 
 def MiscTest():
     print('Starting MiscTest')
-    dca = sc.CreateDataContainerArray()
-    dc = sc.CreateDataContainer('My New DataContainer')
+    dca = sh.CreateDataContainerArray()
+    dc = sh.CreateDataContainer('My New DataContainer')
     dca.addOrReplaceDataContainer(dc)
 
 if __name__ == '__main__':
diff --git a/Wrapping/Python/Testing/DataContainerTest.py b/Wrapping/Python/Testing/DataContainerTest.py
index 5b61656880..7597667616 100644
--- a/Wrapping/Python/Testing/DataContainerTest.py
+++ b/Wrapping/Python/Testing/DataContainerTest.py
@@ -1,6 +1,6 @@
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def DataContainerTest() :
@@ -8,7 +8,7 @@ def DataContainerTest() :
   Tests various methods of the DataContainer Class
   '''
 
-  dca = sc.CreateDataContainerArray()
+  dca = sh.CreateDataContainerArray()
 
   # Create a DataContainer
   dc = simpl.DataContainer('Default Name')
@@ -19,13 +19,11 @@ def DataContainerTest() :
   amType = simpl.AttributeMatrix.Type.Cell
   tupleDims = simpl.VectorSizeT([5, 4, 3])
   amName = 'CellAttributeMatrix'
-  am = sc.CreateAttributeMatrix(tupleDims, amName, amType)
+  am = sh.CreateAttributeMatrix(tupleDims, amName, amType)
 
   dc.addOrReplaceAttributeMatrix(am)
 
-  exists = dc.doesAttributeMatrixExist('CellAttributeMatrix')
-  
-  print('Exists: %s' % exists)
+  assert dc.doesAttributeMatrixExist(amName)
 
 if __name__ == '__main__':
   DataContainerTest()
diff --git a/Wrapping/Python/Testing/Export_Triangle_Geometry.py b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
index 012a459aa1..4f9ae584be 100644
--- a/Wrapping/Python/Testing/Export_Triangle_Geometry.py
+++ b/Wrapping/Python/Testing/Export_Triangle_Geometry.py
@@ -1,6 +1,6 @@
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def export_triangle_geometry():
@@ -9,106 +9,40 @@ def export_triangle_geometry():
 
     # Create the Data Container
     err = simplpy.create_data_container(dca, 'DataContainer')
-    if err < 0:
-        print('DataContainer ErrorCondition: %d' % err)
+    assert err == 0, f'DataContainer ErrorCondition: {err}'
 
-    # Import ASCII Data - #1 - Vertex Coordinates
-    import_file = sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv'
-    wizard_data = {
-        'inputFilePath': import_file,
-        'beginIndex': 2,
-        'numberOfLines': 145,
-        'delimiters': [','],
-        'consecutiveDelimiters': False,
-        'automaticAM': True,
-        'selectedPath': simpl.DataArrayPath('DataContainer', 'Bounds', ''),
-        'headers': ['x', 'y', 'z'],
-        'attrMatType': 3,
-        'tupleDimensions': [144],
-        'dataTypes': ['float', 'float', 'float']
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print('Import ASCII Data #1 -  ErrorCondition: %d' % err)
+    # Read vertices
+    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Bounds', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[144]]))
+    assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-    # Combine Attribute Arrays # 1:
-    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Bounds', 'x'),
-                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'y'),
-                                 simpl.DataArrayPath('DataContainer', 'Bounds', 'z')]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Vertices', False)
-    if err < 0:
-        print('Combined Attribute Arrays #1 -  ErrorCondition: %d' % err)
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'), simpl.NumericTypes.Float, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv', 0)
+    assert err == 0, f'ImportAsciDataArray - Error {err}'
 
-    # Delete Data # 1
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy('DataContainer').Flag = 0
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').Flag = 0
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('x').Flag = 2
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('y').Flag = 2
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Bounds').getDataArrayProxy('z').Flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print('Remove Arrays #1 -  ErrorCondition: %d' % err)
+    # Read triangles
+    err = simplpy.create_attribute_matrix(dca, simpl.DataArrayPath('DataContainer', 'Triangles', ''), simpl.AttributeMatrix.Type.Cell, sh.CreateDynamicTableData([[242]]))
+    assert err == 0, f'CreateAttributeMatrix - Error: {err}'
 
-    # Import ASCII Data - #2 - Triangle Connectivity
-    import_file = sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv'
-    wizard_data = {
-        'inputFilePath': import_file,
-        'beginIndex': 2,
-        'numberOfLines': 243,
-        'delimiters': [','],
-        'consecutiveDelimiters': False,
-        'automaticAM': True,
-        'selectedPath': simpl.DataArrayPath('DataContainer', 'Triangles', ''),
-        'headers': ['V0', 'V1', 'V2'],
-        'attrMatType': 3,
-        'tupleDimensions': [242],
-        'dataTypes': ['int64_t', 'int64_t', 'int64_t']
-    }
-    err = simplpy.read_ascii_data(dca, wizard_data)
-    if err < 0:
-        print('Import ASCII Data #2 -  ErrorCondition: %d' % err)
-
-    # Combine Attribute Arrays #2:
-    selected_data_array_paths = [simpl.DataArrayPath('DataContainer', 'Triangles', 'V0'),
-                                 simpl.DataArrayPath('DataContainer', 'Triangles', 'V1'),
-                                 simpl.DataArrayPath('DataContainer', 'Triangles', 'V2')]
-    err = simplpy.combine_attribute_arrays(dca, selected_data_array_paths, 'Triangles', False)
-    if err < 0:
-        print('Combined Attribute Arrays #2 -  ErrorCondition: %d' % err)
-
-    # Delete Data # 2
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy('DataContainer').Flag = 0
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').Flag = 0
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V0').Flag = 2
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V1').Flag = 2
-    dcap.getDataContainerProxy('DataContainer').getAttributeMatrixProxy('Triangles').getDataArrayProxy('V2').Flag = 2
-    err = simplpy.remove_arrays(dca, dcap)
-    if err < 0:
-        print('Remove Arrays #2 -  ErrorCondition: %d' % err)
+    err = simplpy.import_asci_data_array(dca, simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'), simpl.NumericTypes.SizeT, 3, 1, sd.GetBuildDirectory() + '/Data/SIMPL/TriangleConnectivity.csv', 0)
+    assert err == 0, f'ImportAsciDataArray - Error {err}'
 
     # Create Geometry
-    err = sc.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False,
+    err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Triangle, 'DataContainer', False,
                             shared_vertex_list_array_path=simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
                             shared_tri_list_array_path=simpl.DataArrayPath('DataContainer', 'Triangles', 'Triangles'),
                             vertex_attribute_matrix_name='VertexData',
                             face_attribute_matrix_name='FaceData')
-    if err < 0:
-        print('Create Geometry -  ErrorCondition: %d' % err)
+    assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
     # Write to DREAM3D File
     err = simplpy.data_container_writer(dca, sd.GetTestTempDirectory() + '/Data/Output/CoreFilters/ExportTriangleGeometry.dream3d', True, False)
-    if err < 0:
-        print('DataContainerWriter ErrorCondition: %d' % err)
+    assert err == 0, f'DataContainerWriter ErrorCondition: {err}'
 
     # Export Triangle Geometry
     err = simplpy.write_triangle_geometry(dca, 'DataContainer', sd.GetBuildDirectory() +
                                           '/Data/Output/CoreFilters/output_nodes.txt',
                                           sd.GetBuildDirectory() +
                                           '/Data/Output/CoreFilters/output_triangles.txt')
-    if err < 0:
-        print('WriteTriangleGeometry ErrorCondition: %d' % err)
+    assert err == 0, f'WriteTriangleGeometry ErrorCondition: {err}'
 
 if __name__ == '__main__':
     export_triangle_geometry()
diff --git a/Wrapping/Python/Testing/GeometryTest.py b/Wrapping/Python/Testing/GeometryTest.py
index da56bc4e0c..ebe9a9da6e 100644
--- a/Wrapping/Python/Testing/GeometryTest.py
+++ b/Wrapping/Python/Testing/GeometryTest.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def GeometryTest():
diff --git a/Wrapping/Python/Testing/ImageReadTest.py b/Wrapping/Python/Testing/ImageReadTest.py
index 60b77d3bbf..181ba072d5 100644
--- a/Wrapping/Python/Testing/ImageReadTest.py
+++ b/Wrapping/Python/Testing/ImageReadTest.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def ImageReadTest():
@@ -23,15 +23,15 @@ def ImageReadTest():
     z_flat = np.ravel(z)
 
     # Create the DataContainerArray
-    dca = sc.CreateDataContainerArray()
+    dca = sh.CreateDataContainerArray()
 
     # Create the DataContainer
-    dc = sc.CreateDataContainer('ImageDataContainer')
+    dc = sh.CreateDataContainer('ImageDataContainer')
     dca.addOrReplaceDataContainer(dc)
 
     # Create an AttributeMatrix and add it to the DataContainer
     amShape = simpl.VectorSizeT([shape[1], shape[0], 1])
-    cellAm = sc.CreateAttributeMatrix(amShape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
+    cellAm = sh.CreateAttributeMatrix(amShape, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
     dc.addOrReplaceAttributeMatrix(cellAm)
 
     # Create an AttributeArray from the image data and add it to the AttributeMatrix
@@ -47,7 +47,7 @@ def ImageReadTest():
     dc.setGeometry(imageGeom)
 
     # Write the file out
-    err = sc.WriteDREAM3DFile( sd.GetBuildDirectory() + '/Data/Output/PythonTest/ImageReadTest.dream3d', dca, True)
+    err = sh.WriteDREAM3DFile( sd.GetBuildDirectory() + '/Data/Output/PythonTest/ImageReadTest.dream3d', dca, True)
     assert err == 0
 
 if __name__ == '__main__':
diff --git a/Wrapping/Python/Testing/Import_Ascii_Data_Array.py b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
index 8cb91e224e..f6243388d4 100644
--- a/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
+++ b/Wrapping/Python/Testing/Import_Ascii_Data_Array.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def import_ascii_array_test():
@@ -15,7 +15,7 @@ def import_ascii_array_test():
 
     # Create an Attribute Matrix
     amDims = [[143, 1, 1]]
-    tableData = sc.CreateDynamicTableData(amDims)
+    tableData = sh.CreateDynamicTableData(amDims)
     dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
@@ -25,9 +25,7 @@ def import_ascii_array_test():
                                          simpl.NumericTypes.Float, 3, 1,
                                          sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv',
                                          simpl.DelimiterTypes.Comma)
-    if err < 0:
-        print('ImportAsciiDataArray ErrorCondition: %d' % err)
-    assert err == 0
+    assert err == 0, f'ImportAsciiDataArray ErrorCondition: {err}'
 
     # Export ASCII Data
     # Output Style = 0 Means Multiple Files, Style = 1 Means a Single file
@@ -37,9 +35,7 @@ def import_ascii_array_test():
                                    sd.GetBuildDirectory() + '/Data/Output/CoreFilters', # Only needed for Multi-File output
                                    sd.GetBuildDirectory() + '/Data/Output/CoreFilters/AcsiiOutput.csv', # Only needed for Single File Style
                                    simpl.DelimiterTypes.Comma, '.csv', 10, outStyle)
-    if err < 0:
-        print('WriteAsciiData ErrorCondition: %d' % err)
-    assert err == 0
+    assert err == 0, f'WriteAsciiData ErrorCondition: {err}'
 
 if __name__ == '__main__':
     import_ascii_array_test()
diff --git a/Wrapping/Python/Testing/Import_Hdf5_Dataset.py b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
index b02bb44cb6..eb97825116 100644
--- a/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
+++ b/Wrapping/Python/Testing/Import_Hdf5_Dataset.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def createInputFile():
@@ -15,7 +15,7 @@ def createInputFile():
 
     # Create an Attribute Matrix
     amDims = [[143, 1, 1]]
-    tableData = sc.CreateDynamicTableData(amDims)
+    tableData = sh.CreateDynamicTableData(amDims)
     dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
@@ -25,12 +25,10 @@ def createInputFile():
                                          simpl.NumericTypes.Float, 3, 1,
                                          sd.GetBuildDirectory() + '/Data/SIMPL/VertexCoordinates.csv',
                                          simpl.DelimiterTypes.Comma)
-    if err < 0:
-        print('ImportAsciiDataArray ErrorCondition: %d' % err)
-    assert err == 0
+    assert err == 0, f'ImportAsciiDataArray ErrorCondition: {err}'
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.h5', dca)
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.h5', dca)
     assert err == 0
 
 def import_hdf5_dataset_test():
@@ -43,7 +41,7 @@ def import_hdf5_dataset_test():
 
     # Create an Attribute Matrix
     amDims = [[143, 1, 1]]
-    tableData = sc.CreateDynamicTableData(amDims)
+    tableData = sh.CreateDynamicTableData(amDims)
     dap = simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', '')
     err = simplpy.create_attribute_matrix(dca, dap, simpl.AttributeMatrix.Type.Cell, tableData)
     assert err == 0
@@ -53,12 +51,10 @@ def import_hdf5_dataset_test():
     err = simplpy.import_hdf5_dataset(dca, sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.h5',
                                       dataset_import_info_list,
                                       simpl.DataArrayPath('DataContainer', 'CellAttributeMatrix', ''))
-    if err < 0:
-        print('ImportHdf5Dataset ErrorCondition: %d' % err)
-    assert err == 0
+    assert err == 0, f'ImportHdf5Dataset ErrorCondition: {err}'
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.dream3d', dca)
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilters/ImportHDF5.dream3d', dca)
     assert err == 0
 
 if __name__ == '__main__':
diff --git a/Wrapping/Python/Testing/NumPy_Round_Trip.py b/Wrapping/Python/Testing/NumPy_Round_Trip.py
index 5321f605c9..a12fc3f08d 100644
--- a/Wrapping/Python/Testing/NumPy_Round_Trip.py
+++ b/Wrapping/Python/Testing/NumPy_Round_Trip.py
@@ -2,7 +2,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 import orientationanalysispy as orient
 
@@ -28,13 +28,13 @@ def Test1():
   print(z[0])
 
   # Create the DataContainerArray
-  dca = sc.CreateDataContainerArray()
+  dca = sh.CreateDataContainerArray()
   # Create and add a DataContainer to the DataContainerArray
-  dc = sc.CreateDataContainer('DC')
+  dc = sh.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
   # Create and add an AttributeMatrix to the DataContainerArray
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
+  cellAm = sh.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
 
   # Create the wrapped DataArray<float> array
@@ -46,8 +46,7 @@ def Test1():
   dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
   # Run the filter ChangeAngleRepresentation since this filter acts on data 'in place'
   err = orient.change_angle_representation(dca, 1, dap)
-  if err < 0:
-    print('change_angle_representation ErrorCondition: %d' % err)
+  assert err == 0, f'change_angle_representation ErrorCondition: {err}'
 
   roundtrip = np.asarray(eulers)
 
@@ -62,18 +61,18 @@ def Test2():
   python side of things.
   '''
   print('===================== Test 2 =====================')
-  dca = sc.CreateDataContainerArray()
+  dca = sh.CreateDataContainerArray()
 
-  dc = sc.CreateDataContainer('DC')
+  dc = sh.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
 
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
+  cellAm = sh.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
   # Create the Component Dimensions for the Array, 3 Component in this case
   cDims = simpl.VectorSizeT([3])
   # Create the array which wraps a Numpy contiguous array 
-  npyArray, eulers = sc.CreateDataArray('Eulers', shape, cDims, np.float32)
+  npyArray, eulers = sh.CreateDataArray('Eulers', shape, cDims, np.float32)
   npyArray.fill(3.1415927)
   # Add the DataArray to the AttributeMatrix
   cellAm.addOrReplaceAttributeArray(eulers)
@@ -82,8 +81,7 @@ def Test2():
   dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
   # Run the filter ChangeAngleRepresentation since this filter acts on data 'in place'
   err = orient.change_angle_representation(dca, 1, dap)
-  if err < 0:
-    print('change_angle_representation ErrorCondition: %d' % err)
+  assert err == 0, f'change_angle_representation ErrorCondition: {err}'
 
 
 def Test3():
@@ -94,13 +92,13 @@ def Test3():
   '''
   print('===================== Test 3 =====================')
 
-  dca = sc.CreateDataContainerArray()
+  dca = sh.CreateDataContainerArray()
 
-  dc = sc.CreateDataContainer('DC')
+  dc = sh.CreateDataContainer('DC')
   dca.addOrReplaceDataContainer(dc)
   # The shape is in XYZ order
   shape = simpl.VectorSizeT([4, 3, 2])
-  cellAm = sc.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
+  cellAm = sh.CreateAttributeMatrix(shape, 'CAM', simpl.AttributeMatrix.Type.Cell)
   dc.addOrReplaceAttributeMatrix(cellAm)
 
   # Create the Component Dimensions for the Array, 3 Component in this case
@@ -111,8 +109,7 @@ def Test3():
   # now build up a pipeline to act on the Data Structure that we just created
   dap = simpl.DataArrayPath('DC', 'CAM', 'Eulers')
   err = orient.change_angle_representation(dca, 1, dap)
-  if err < 0:
-    print('change_angle_representation ErrorCondition: %d' % err)
+  assert err == 0, f'change_angle_representation ErrorCondition: {err}'
 
   # Convert in-place to an numpy array
   np_eulers = np.asarray(eulers)
@@ -131,9 +128,8 @@ def Test3():
   cellAm.addOrReplaceAttributeArray(simpl_rads)
 
   # Write to DREAM3D file
-  err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/Python_RoundTrip/RoundTripTest.dream3d', dca)
-  if err < 0:
-      print('WriteDREAM3DFile ErrorCondition: %d' % err)
+  err = sh.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/Python_RoundTrip/RoundTripTest.dream3d', dca)
+  assert err == 0, f'WriteDREAM3DFile ErrorCondition: {err}'
 
 if __name__ == '__main__':
   Test1()
diff --git a/Wrapping/Python/Testing/Remove_Component_From_Array.py b/Wrapping/Python/Testing/Remove_Component_From_Array.py
index d0d134fe3e..088950191f 100644
--- a/Wrapping/Python/Testing/Remove_Component_From_Array.py
+++ b/Wrapping/Python/Testing/Remove_Component_From_Array.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def remove_component_from_array_test():
@@ -117,8 +117,7 @@ def remove_component_from_array_test():
                                         sd.GetBuildDirectory() +
                                         '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
                                         False, dcap)
-    if err < 0:
-        print('DataContainerReader ErrorCondition %d' % err)
+    assert err == 0, f'DataContainerReader ErrorCondition {err}'
         
     # Remove Component From Array
     err = simplpy.remove_component_from_array(dca,
@@ -127,15 +126,13 @@ def remove_component_from_array_test():
                                                                   'AxisEulerAngles'), 2, True,
                                               'AxisEulerAngles_RemovedComp',
                                               'AxisEulerAngles_Reduced')
-    if err < 0:
-        print('RemoveComponentFromArray ErrorCondition %d' % err)
+    assert err == 0, f'RemoveComponentFromArray ErrorCondition {err}'
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
                               'RemoveComponentFromArray.dream3d',
                               dca)
-    if err < 0:
-        print('WriteDREAM3DFile ErrorCondition: %d' % err)
+    assert err == 0, f'WriteDREAM3DFile ErrorCondition: {err}'
 
 if __name__ == '__main__':
     remove_component_from_array_test()
diff --git a/Wrapping/Python/Testing/Rename_Attribute_Array.py b/Wrapping/Python/Testing/Rename_Attribute_Array.py
index 766a207810..63a0417a33 100644
--- a/Wrapping/Python/Testing/Rename_Attribute_Array.py
+++ b/Wrapping/Python/Testing/Rename_Attribute_Array.py
@@ -3,137 +3,27 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def rename_array_test():
     # Create Data Container Array
-    dca = simpl.DataContainerArray()
-
-    # Read DREAM3D File
-    dcap = simpl.DataContainerArrayProxy()
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Confidence Index').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'CriticalField').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'EulerAngles').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'FeatureIds').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'FeatureReferenceMisorientations').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Fit').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'GBManhattanDistances').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'IPFColor').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Image Quality').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'KernelAverageMisorientations').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Mask').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'ParentIds').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Phases').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'QPManhattanDistances').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'Quats').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'SEM Signal').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('EBSD Scan Data').getDataArrayProxy(
-        'TJManhattanDistances').Flag = 2
-
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
-        'CrystalStructures').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
-        'LatticeConstants').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Phase Data').getDataArrayProxy(
-        'MaterialName').Flag = 2
+    dc_name = 'foo'
+    am_name = 'bar'
+    da_name = 'baz'
 
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Active').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AspectRatios').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AvgEuler').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AvgEulerAngles').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AvgQuats').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AxisEulerAngles').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'AxisLengths').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Centroids').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'CriticalFields').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'EquivalentDiameters').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'FeatureAvgMisorientations').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'MisorientationList').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'NeighborList').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'NeighborhoodList').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Neighborhoods').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'NumElements').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'NumNeighbors').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'NumNeighbors2').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Omega3s').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'ParentIds').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Poles').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy('Phases').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Schmids').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Shape Volumes').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'SharedSurfaceAreaList').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Size Volumes').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'SlipSystems').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'Sphericity').Flag = 2
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('Grain Data').getDataArrayProxy(
-        'SurfaceAreaVolumeRatio').Flag = 2
+    dca = simpl.DataContainerArray()
+    dc = simpl.DataContainer(dc_name)
+    am = simpl.AttributeMatrix(simpl.VectorSizeT([10]), am_name, simpl.AttributeMatrix.Type.Generic)
+    da = simpl.Int32Array(10, da_name, 0)
 
-    dcap.getDataContainerProxy('Small IN100').getAttributeMatrixProxy('NewGrain Data').getDataArrayProxy(
-        'Active').Flag = 2
+    am.addOrReplaceAttributeArray(da)
+    dc.addOrReplaceAttributeMatrix(am)
+    dca.addOrReplaceDataContainer(dc)
 
-    err = simplpy.data_container_reader(dca,
-                                        sd.GetBuildDirectory() +
-                                        '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
-                                        False, dcap)
-    if err < 0:
-        print('DataContainerReader ErrorCondition %d' % err)
-        
     # Rename Attribute Array
-    err = simplpy.rename_attribute_array(dca,
-                                         simpl.DataArrayPath('Small IN100', 'EBSD Scan Data',
-                                                             'IPFColor'),
-                                         'InversePoleFigureColor')
-    if err < 0:
-        print('RenameAttributeArray ErrorCondition %d' % err)
-
-    # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
-                              'RenameAttributeArray.dream3d',
-                              dca)
-    if err < 0:
-        print('WriteDREAM3DFile ErrorCondition: %d' % err)
+    err = simplpy.rename_attribute_array(dca, simpl.DataArrayPath(dc_name, am_name, da_name), 'qux')
+    assert err == 0, f'RenameAttributeArray ErrorCondition {err}'
 
 if __name__ == '__main__':
     rename_array_test()
diff --git a/Wrapping/Python/Testing/Split_Attribute_Array.py b/Wrapping/Python/Testing/Split_Attribute_Array.py
index 425748d0b6..0df24184e8 100644
--- a/Wrapping/Python/Testing/Split_Attribute_Array.py
+++ b/Wrapping/Python/Testing/Split_Attribute_Array.py
@@ -3,7 +3,7 @@
 
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 import datetime
@@ -122,23 +122,20 @@ def split_array_test():
                                         sd.GetBuildDirectory() +
                                         '/Data/Output/Statistics/SmallIN100_CrystalStats.dream3d',
                                         False, dcap)
-    if err < 0:
-        print('DataContainerReader ErrorCondition %d' % err)
+    assert err == 0, f'DataContainerReader ErrorCondition {err}'
         
     # Split Attribute Array
     err = simplpy.split_attribute_array(dca,
                                         simpl.DataArrayPath('Small IN100', 'Grain Data',
                                                             'Centroids'),
                                         '_Component_')
-    if err < 0:
-        print('SplitAttributeArray ErrorCondition %d' % err)
+    assert err == 0, f'SplitAttributeArray ErrorCondition {err}'
 
     # Write to DREAM3D file
-    err = sc.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
+    err = sh.WriteDREAM3DFile(sd.GetBuildDirectory() + '/Data/Output/CoreFilterTests/' +
                               'SplitAttributeArray.dream3d',
                               dca)
-    if err < 0:
-        print('WriteDREAM3DFile ErrorCondition: %d' % err)
+    assert err == 0, f'WriteDREAM3DFile ErrorCondition: {err}'
 
 if __name__ == '__main__':
     split_array_test()
diff --git a/Wrapping/Python/Testing/TestBindings.py b/Wrapping/Python/Testing/TestBindings.py
index ff97f421de..d5a21efd7d 100644
--- a/Wrapping/Python/Testing/TestBindings.py
+++ b/Wrapping/Python/Testing/TestBindings.py
@@ -1,9 +1,7 @@
-import time
-
 # These are the simpl_py python modules
 import simpl
 import simplpy
-import simpl_helpers as sc
+import simpl_helpers as sh
 import simpl_test_dirs as sd
 
 def PipelineTest():
@@ -50,8 +48,6 @@ def PipelineTest():
   filterCount = pipeline.size()
   print('Filter Count: %d' % filterCount)
 
-  time.sleep(2)
-
 if __name__ == '__main__':
   PipelineTest()
   print('Test Complete')

From d2010e1edcb103b834599a3118819e4c6ec13450 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 21 Jul 2020 11:41:39 -0400
Subject: [PATCH 261/397] Changed constants to be inline

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/Constants.h | 1426 ++++++++++++++---------------
 1 file changed, 713 insertions(+), 713 deletions(-)

diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index fca773b4e2..8df13e4ad6 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -66,11 +66,11 @@ namespace SIMPL
 {
 
 using Rgb = uint32_t;
-constexpr Rgb RGB_MASK = 0x00ffffff; // masks RGB values
-const QString PathSep("|");
-constexpr uint8_t Unchecked = 0;
-constexpr uint8_t PartiallyChecked = 1;
-constexpr uint8_t Checked = 2;
+inline constexpr Rgb RGB_MASK = 0x00ffffff; // masks RGB values
+inline const QString PathSep("|");
+inline constexpr uint8_t Unchecked = 0;
+inline constexpr uint8_t PartiallyChecked = 1;
+inline constexpr uint8_t Checked = 2;
 
 enum InfoStringFormat
 {
@@ -85,52 +85,52 @@ enum InfoStringFormat
 /** @brief Constants defined for the Stacking order of images into a 3D Volume */
 namespace RefFrameZDir
 {
-constexpr uint32_t LowtoHigh = 0;
-constexpr uint32_t HightoLow = 1;
-constexpr uint32_t UnknownRefFrameZDirection = 2;
+inline constexpr uint32_t LowtoHigh = 0;
+inline constexpr uint32_t HightoLow = 1;
+inline constexpr uint32_t UnknownRefFrameZDirection = 2;
 } // namespace RefFrameZDir
 
 namespace TypeNames
 {
-const QString Bool("bool");
-const QString Float("float");
-const QString Double("double");
-const QString Int8("int8_t");
-const QString UInt8("uint8_t");
-const QString Int16("int16_t");
-const QString UInt16("uint16_t");
-const QString Int32("int32_t");
-const QString UInt32("uint32_t");
-const QString Int64("int64_t");
-const QString UInt64("uint64_t");
-const QString SizeT("size_t");
-const QString String("string");
-const QString StatsDataArray("StatsDataArray");
-const QString NeighborList("NeighborList<T>");
-const QString StringArray("StringDataArray");
-const QString Unknown("Unknown");
-const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " +
+inline const QString Bool("bool");
+inline const QString Float("float");
+inline const QString Double("double");
+inline const QString Int8("int8_t");
+inline const QString UInt8("uint8_t");
+inline const QString Int16("int16_t");
+inline const QString UInt16("uint16_t");
+inline const QString Int32("int32_t");
+inline const QString UInt32("uint32_t");
+inline const QString Int64("int64_t");
+inline const QString UInt64("uint64_t");
+inline const QString SizeT("size_t");
+inline const QString String("string");
+inline const QString StatsDataArray("StatsDataArray");
+inline const QString NeighborList("NeighborList<T>");
+inline const QString StringArray("StringDataArray");
+inline const QString Unknown("Unknown");
+inline const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " +
                                 TypeNames::Int32 + ", " + TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " +
                                 TypeNames::SizeT);
 } // namespace TypeNames
 
 namespace TypeEnums
 {
-constexpr int32_t Int8 = 0;
-constexpr int32_t UInt8 = 1;
-constexpr int32_t Int16 = 2;
-constexpr int32_t UInt16 = 3;
-constexpr int32_t Int32 = 4;
-constexpr int32_t UInt32 = 5;
-constexpr int32_t Int64 = 6;
-constexpr int32_t UInt64 = 7;
-constexpr int32_t Float = 8;
-constexpr int32_t Double = 9;
-constexpr int32_t Bool = 10;
-constexpr int32_t SizeT = 11;
-
-constexpr int32_t UnknownType = 12;
-const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
+inline constexpr int32_t Int8 = 0;
+inline constexpr int32_t UInt8 = 1;
+inline constexpr int32_t Int16 = 2;
+inline constexpr int32_t UInt16 = 3;
+inline constexpr int32_t Int32 = 4;
+inline constexpr int32_t UInt32 = 5;
+inline constexpr int32_t Int64 = 6;
+inline constexpr int32_t UInt64 = 7;
+inline constexpr int32_t Float = 8;
+inline constexpr int32_t Double = 9;
+inline constexpr int32_t Bool = 10;
+inline constexpr int32_t SizeT = 11;
+
+inline constexpr int32_t UnknownType = 12;
+inline const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
                                 TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
 } // namespace TypeEnums
 
@@ -138,18 +138,18 @@ namespace NumericTypes
 {
 namespace Names
 {
-const QString Int8("signed int 8 bit");
-const QString UInt8("unsigned int 8 bit");
-const QString Int16("signed int 16 bit");
-const QString UInt16("unsigned int 16 bit");
-const QString Int32("signed int 32 bit");
-const QString UInt32("unsigned int 32 bit");
-const QString Int64("signed int 64 bit");
-const QString UInt64("unsigned int 64 bit");
-const QString Float("Float 32 bit");
-const QString Double("Double 64 bit");
-const QString Bool("Bool");
-const QString SizeT("size_t");
+inline const QString Int8("signed int 8 bit");
+inline const QString UInt8("unsigned int 8 bit");
+inline const QString Int16("signed int 16 bit");
+inline const QString UInt16("unsigned int 16 bit");
+inline const QString Int32("signed int 32 bit");
+inline const QString UInt32("unsigned int 32 bit");
+inline const QString Int64("signed int 64 bit");
+inline const QString UInt64("unsigned int 64 bit");
+inline const QString Float("Float 32 bit");
+inline const QString Double("Double 64 bit");
+inline const QString Bool("Bool");
+inline const QString SizeT("size_t");
 } // namespace Names
 
 enum class Type : int32_t
@@ -169,7 +169,7 @@ enum class Type : int32_t
   UnknownNumType
 };
 
-const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes::Names::UInt8 + ", " + NumericTypes::Names::Int16 + ", " + NumericTypes::Names::UInt16 + ", " +
+inline const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes::Names::UInt8 + ", " + NumericTypes::Names::Int16 + ", " + NumericTypes::Names::UInt16 + ", " +
                                 NumericTypes::Names::Int32 + ", " + NumericTypes::Names::UInt32 + ", " + NumericTypes::Names::Int64 + ", " + NumericTypes::Names::UInt64 + ", " +
                                 NumericTypes::Names::Float + ", " + NumericTypes::Names::Double + ", " + NumericTypes::Names::Bool + ", " + NumericTypes::Names::SizeT);
 } // namespace NumericTypes
@@ -207,562 +207,562 @@ enum class Type : int32_t
 
 namespace IO
 {
-const QString DAPSettingsHeader("Path");
+inline const QString DAPSettingsHeader("Path");
 }
 
 namespace Defaults
 {
-const QString None("None");
-const QString AnyPrimitive("Any");
-const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
-// constexpr uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
-// constexpr uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
-
-const QString AttributeMatrixName("AttributeMatrix");
-const QString ElementAttributeMatrixName("ElementAttributeMatrix");
-const QString FeatureAttributeMatrixName("FeatureAttributeMatrix");
-const QString EnsembleAttributeMatrixName("EnsembleAttributeMatrix");
-
-const QString ImageDataContainerName("ImageDataContainer");
-const QString NewImageDataContainerName("NewImageDataContainer");
-const QString TriangleDataContainerName("TriangleDataContainer");
-const QString QuadDataContainerName("QuadDataContainer");
-const QString TetrahedralDataContainerName("TetrahedralDataContainer");
-const QString HexahedralDataContainerName("HexahedralDataContainer");
-
-const QString VertexDataContainerName("VertexDataContainer");
-const QString VertexAttributeMatrixName("VertexData");
-const QString VertexFeatureAttributeMatrixName("VertexFeatureData");
-const QString VertexEnsembleAttributeMatrixName("VertexEnsembleData");
-
-const QString EdgeDataContainerName("EdgeDataContainer");
-const QString EdgeAttributeMatrixName("EdgeData");
-const QString EdgeFeatureAttributeMatrixName("EdgeFeatureData");
-const QString EdgeEnsembleAttributeMatrixName("EdgeEnsembleData");
-
-const QString SurfaceDataContainerName("SurfaceDataContainer");
-const QString FaceAttributeMatrixName("FaceData");
-const QString FaceFeatureAttributeMatrixName("FaceFeatureData");
-const QString FaceEnsembleAttributeMatrixName("FaceEnsembleData");
-
-const QString VolumeDataContainerName("VolumeDataContainer");
-const QString NewVolumeDataContainerName("NewVolumeDataContainer");
-const QString CellAttributeMatrixName("CellData");
-const QString NewCellAttributeMatrixName("NewCellData");
-const QString CellFeatureAttributeMatrixName("CellFeatureData");
-const QString NewCellFeatureAttributeMatrixName("NewCellFeatureData");
-const QString CellEnsembleAttributeMatrixName("CellEnsembleData");
-
-const QString VoxelDataName("VoxelData");
-
-const QString SyntheticVolumeDataContainerName("SyntheticVolumeDataContainer");
-const QString StatsGenerator("StatsGeneratorDataContainer");
-
-const QString SomePath("SomeDataContainer|SomeAttributeMatrix|SomeDataArray");
-
-const QString GenericBundleName("GenericBundle");
-const QString TimeSeriesBundleName("TimeSeriesBundle");
-
-const QString GenericBundleAttributeMatrixName("GenericBundleAttributeMatrix");
-const QString TimeSeriesBundleAttributeMatrixName("TimeSeriesBundleAttributeMatrix");
-
-const QString DataContainerName("DataContainer");
-const QString NewDataContainerName("NewDataContainer");
-const QString NewAttributeMatrixName("NewAttributeMatrixName");
+inline const QString None("None");
+inline const QString AnyPrimitive("Any");
+inline const size_t AnyComponentSize = std::numeric_limits<size_t>::max();
+// inline constexpr uint32_t AnyAttributeMatrix = std::numeric_limits<uint32_t>::max();
+// inline constexpr uint32_t AnyGeometry = std::numeric_limits<uint32_t>::max();
+
+inline const QString AttributeMatrixName("AttributeMatrix");
+inline const QString ElementAttributeMatrixName("ElementAttributeMatrix");
+inline const QString FeatureAttributeMatrixName("FeatureAttributeMatrix");
+inline const QString EnsembleAttributeMatrixName("EnsembleAttributeMatrix");
+
+inline const QString ImageDataContainerName("ImageDataContainer");
+inline const QString NewImageDataContainerName("NewImageDataContainer");
+inline const QString TriangleDataContainerName("TriangleDataContainer");
+inline const QString QuadDataContainerName("QuadDataContainer");
+inline const QString TetrahedralDataContainerName("TetrahedralDataContainer");
+inline const QString HexahedralDataContainerName("HexahedralDataContainer");
+
+inline const QString VertexDataContainerName("VertexDataContainer");
+inline const QString VertexAttributeMatrixName("VertexData");
+inline const QString VertexFeatureAttributeMatrixName("VertexFeatureData");
+inline const QString VertexEnsembleAttributeMatrixName("VertexEnsembleData");
+
+inline const QString EdgeDataContainerName("EdgeDataContainer");
+inline const QString EdgeAttributeMatrixName("EdgeData");
+inline const QString EdgeFeatureAttributeMatrixName("EdgeFeatureData");
+inline const QString EdgeEnsembleAttributeMatrixName("EdgeEnsembleData");
+
+inline const QString SurfaceDataContainerName("SurfaceDataContainer");
+inline const QString FaceAttributeMatrixName("FaceData");
+inline const QString FaceFeatureAttributeMatrixName("FaceFeatureData");
+inline const QString FaceEnsembleAttributeMatrixName("FaceEnsembleData");
+
+inline const QString VolumeDataContainerName("VolumeDataContainer");
+inline const QString NewVolumeDataContainerName("NewVolumeDataContainer");
+inline const QString CellAttributeMatrixName("CellData");
+inline const QString NewCellAttributeMatrixName("NewCellData");
+inline const QString CellFeatureAttributeMatrixName("CellFeatureData");
+inline const QString NewCellFeatureAttributeMatrixName("NewCellFeatureData");
+inline const QString CellEnsembleAttributeMatrixName("CellEnsembleData");
+
+inline const QString VoxelDataName("VoxelData");
+
+inline const QString SyntheticVolumeDataContainerName("SyntheticVolumeDataContainer");
+inline const QString StatsGenerator("StatsGeneratorDataContainer");
+
+inline const QString SomePath("SomeDataContainer|SomeAttributeMatrix|SomeDataArray");
+
+inline const QString GenericBundleName("GenericBundle");
+inline const QString TimeSeriesBundleName("TimeSeriesBundle");
+
+inline const QString GenericBundleAttributeMatrixName("GenericBundleAttributeMatrix");
+inline const QString TimeSeriesBundleAttributeMatrixName("TimeSeriesBundleAttributeMatrix");
+
+inline const QString DataContainerName("DataContainer");
+inline const QString NewDataContainerName("NewDataContainer");
+inline const QString NewAttributeMatrixName("NewAttributeMatrixName");
 } // namespace Defaults
 
 namespace PipelineVersionNumbers
 {
-constexpr int32_t CurrentVersion(6);
+inline constexpr int32_t CurrentVersion(6);
 }
 
 namespace FilterGroups
 {
-const QString CoreFilters("Core");
-const QString Generic("Generic");
-const QString IOFilters("IO");
-const QString ProcessingFilters("Processing");
-const QString ReconstructionFilters("Reconstruction");
-const QString SamplingFilters("Sampling");
-const QString StatisticsFilters("Statistics");
-const QString SyntheticBuildingFilters("Synthetic Building");
-const QString SurfaceMeshingFilters("Surface Meshing");
-const QString Utilities("Utilities");
-const QString CustomFilters("Custom");
-const QString Unsupported("Unsupported");
+inline const QString CoreFilters("Core");
+inline const QString Generic("Generic");
+inline const QString IOFilters("IO");
+inline const QString ProcessingFilters("Processing");
+inline const QString ReconstructionFilters("Reconstruction");
+inline const QString SamplingFilters("Sampling");
+inline const QString StatisticsFilters("Statistics");
+inline const QString SyntheticBuildingFilters("Synthetic Building");
+inline const QString SurfaceMeshingFilters("Surface Meshing");
+inline const QString Utilities("Utilities");
+inline const QString CustomFilters("Custom");
+inline const QString Unsupported("Unsupported");
 } // namespace FilterGroups
 
 namespace FilterSubGroups
 {
-const QString EnsembleStatsFilters("Ensemble");
-const QString MemoryManagementFilters("Memory/Management");
-const QString SpatialFilters("Spatial");
-const QString StatisticsFilters("Statistics");
-const QString FeatureIdentificationFilters("FeatureIdentification");
-const QString OutputFilters("Output");
-const QString InputFilters("Input");
-const QString ImageFilters("Image");
-const QString CleanupFilters("Cleanup");
-const QString ThresholdFilters("Threshold");
-const QString RegularizationFilters("Regularization");
-const QString ConversionFilters("Conversion");
-const QString FusionFilters("Fusion");
-const QString WarpingFilters("Warping");
-const QString AlignmentFilters("Alignment");
-const QString SegmentationFilters("Segmentation");
-const QString GroupingFilters("Grouping");
-const QString CropCutFilters("Croping/Cutting");
-const QString RotationTransformationFilters("Rotating/Transforming");
-const QString ResolutionFilters("Spacing");
-const QString MorphologicalFilters("Morphological");
-const QString PackingFilters("Packing");
-const QString CrystallographyFilters("Crystallography");
-const QString GenerationFilters("Generation");
-const QString SmoothingFilters("Smoothing");
-const QString CurvatureFilters("Curvature");
-const QString ConnectivityArrangementFilters("Connectivity/Arrangement");
-const QString MappingFilters("Mapping");
-const QString MiscFilters("Misc");
-const QString GeometryFilters("Geometry");
-const QString ImportFilters("Import");
-const QString ExportFilters("Export");
+inline const QString EnsembleStatsFilters("Ensemble");
+inline const QString MemoryManagementFilters("Memory/Management");
+inline const QString SpatialFilters("Spatial");
+inline const QString StatisticsFilters("Statistics");
+inline const QString FeatureIdentificationFilters("FeatureIdentification");
+inline const QString OutputFilters("Output");
+inline const QString InputFilters("Input");
+inline const QString ImageFilters("Image");
+inline const QString CleanupFilters("Cleanup");
+inline const QString ThresholdFilters("Threshold");
+inline const QString RegularizationFilters("Regularization");
+inline const QString ConversionFilters("Conversion");
+inline const QString FusionFilters("Fusion");
+inline const QString WarpingFilters("Warping");
+inline const QString AlignmentFilters("Alignment");
+inline const QString SegmentationFilters("Segmentation");
+inline const QString GroupingFilters("Grouping");
+inline const QString CropCutFilters("Croping/Cutting");
+inline const QString RotationTransformationFilters("Rotating/Transforming");
+inline const QString ResolutionFilters("Spacing");
+inline const QString MorphologicalFilters("Morphological");
+inline const QString PackingFilters("Packing");
+inline const QString CrystallographyFilters("Crystallography");
+inline const QString GenerationFilters("Generation");
+inline const QString SmoothingFilters("Smoothing");
+inline const QString CurvatureFilters("Curvature");
+inline const QString ConnectivityArrangementFilters("Connectivity/Arrangement");
+inline const QString MappingFilters("Mapping");
+inline const QString MiscFilters("Misc");
+inline const QString GeometryFilters("Geometry");
+inline const QString ImportFilters("Import");
+inline const QString ExportFilters("Export");
 } // namespace FilterSubGroups
 
 namespace GeneralData
 {
-const QString CombinedData("CombinedData");
-const QString ThresholdArray("ThresholdArray");
-const QString Mask("Mask");
+inline const QString CombinedData("CombinedData");
+inline const QString ThresholdArray("ThresholdArray");
+inline const QString Mask("Mask");
 } // namespace GeneralData
 
 namespace CellData
 {
-const QString AxisAngles("AxisAngles");
-const QString BC("BandContrasts");
-const QString BandContrast("BandContrast");
-const QString CellPhases("Phases");
-const QString ConfidenceIndex("Confidence Index");
-const QString CAxisLocation("CAxisLocation");
-const QString ConfidenceIndexNoSpace("ConfidenceIndex");
-const QString Current("Current");
-const QString DislocationTensors("DislocationTensors");
-const QString EulerAngles("EulerAngles");
-const QString EulerColor("EulerColor");
-const QString FarFeatureQuats("FarFeatureQuats");
-const QString FarFeatureZoneIds("FarFeatureZoneIds");
-const QString FitQuality("FitQuality");
-const QString FlatImageData("FlatImageData");
-const QString GBEuclideanDistances("GBEuclideanDistances");
-const QString GBManhattanDistances("GBManhattanDistances");
-const QString GlobAlpha("GlobAlpha");
-const QString GoodVoxels("GoodVoxels");
-const QString FeatureIds("FeatureIds");
-const QString FeatureReferenceCAxisMisorientations("FeatureReferenceCAxisMisorientations");
-const QString FeatureReferenceMisorientations("FeatureReferenceMisorientations");
-const QString IPFColor("IPFColor");
-const QString ImageData("ImageData");
-const QString ImageQuality("Image Quality");
-const QString ImageQualityNoSpace("ImageQuality");
-const QString KernelAverageMisorientations("KernelAverageMisorientations");
-const QString Mask("Mask");
-const QString MotionDirection("MotionDirection");
-const QString MicroTexVolFrac("MicroTexVolFrac");
-const QString MisorientationColor("MisorientationColor");
-const QString ParentDensity("ParentDensity");
-const QString MTRgKAM("MTRgKAM");
-const QString NearestNeighbors("NearestNeighbors");
-const QString ParentIds("ParentIds");
-const QString Phases("Phases");
-const QString ProjectedImageMin("ProjectedImageMin");
-const QString ProjectedImageMax("ProjectedImageMax");
-const QString ProjectedImageAvg("ProjectedImageAvg");
-const QString ProjectedImageStd("ProjectedImageStd");
-const QString ProjectedImageVar("ProjectedImageVar");
-const QString QPEuclideanDistances("QPEuclideanDistances");
-const QString QPManhattanDistances("QPManhattanDistances");
-const QString Quats("Quats");
-const QString RodriguesColor("RodriguesColor");
-const QString RodriguesVectors("RodriguesVectors");
-const QString SolidMeshNodes("SolidMeshNodes");
-const QString SineParams("SineParams");
-const QString SolidMeshTetrahedrons("SolidMeshTetrahedrons");
-const QString Speed("Speed");
-const QString SurfaceMeshCells("SurfaceMeshCells");
-const QString BoundaryCells("BoundaryCells");
-const QString TJManhattanDistances("TJManhattanDistances");
-const QString TJEuclideanDistances("TJEuclideanDistances");
-const QString VectorColor("VectorColor");
-const QString VectorData("VectorData");
-const QString Histogram("Histogram");
+inline const QString AxisAngles("AxisAngles");
+inline const QString BC("BandContrasts");
+inline const QString BandContrast("BandContrast");
+inline const QString CellPhases("Phases");
+inline const QString ConfidenceIndex("Confidence Index");
+inline const QString CAxisLocation("CAxisLocation");
+inline const QString ConfidenceIndexNoSpace("ConfidenceIndex");
+inline const QString Current("Current");
+inline const QString DislocationTensors("DislocationTensors");
+inline const QString EulerAngles("EulerAngles");
+inline const QString EulerColor("EulerColor");
+inline const QString FarFeatureQuats("FarFeatureQuats");
+inline const QString FarFeatureZoneIds("FarFeatureZoneIds");
+inline const QString FitQuality("FitQuality");
+inline const QString FlatImageData("FlatImageData");
+inline const QString GBEuclideanDistances("GBEuclideanDistances");
+inline const QString GBManhattanDistances("GBManhattanDistances");
+inline const QString GlobAlpha("GlobAlpha");
+inline const QString GoodVoxels("GoodVoxels");
+inline const QString FeatureIds("FeatureIds");
+inline const QString FeatureReferenceCAxisMisorientations("FeatureReferenceCAxisMisorientations");
+inline const QString FeatureReferenceMisorientations("FeatureReferenceMisorientations");
+inline const QString IPFColor("IPFColor");
+inline const QString ImageData("ImageData");
+inline const QString ImageQuality("Image Quality");
+inline const QString ImageQualityNoSpace("ImageQuality");
+inline const QString KernelAverageMisorientations("KernelAverageMisorientations");
+inline const QString Mask("Mask");
+inline const QString MotionDirection("MotionDirection");
+inline const QString MicroTexVolFrac("MicroTexVolFrac");
+inline const QString MisorientationColor("MisorientationColor");
+inline const QString ParentDensity("ParentDensity");
+inline const QString MTRgKAM("MTRgKAM");
+inline const QString NearestNeighbors("NearestNeighbors");
+inline const QString ParentIds("ParentIds");
+inline const QString Phases("Phases");
+inline const QString ProjectedImageMin("ProjectedImageMin");
+inline const QString ProjectedImageMax("ProjectedImageMax");
+inline const QString ProjectedImageAvg("ProjectedImageAvg");
+inline const QString ProjectedImageStd("ProjectedImageStd");
+inline const QString ProjectedImageVar("ProjectedImageVar");
+inline const QString QPEuclideanDistances("QPEuclideanDistances");
+inline const QString QPManhattanDistances("QPManhattanDistances");
+inline const QString Quats("Quats");
+inline const QString RodriguesColor("RodriguesColor");
+inline const QString RodriguesVectors("RodriguesVectors");
+inline const QString SolidMeshNodes("SolidMeshNodes");
+inline const QString SineParams("SineParams");
+inline const QString SolidMeshTetrahedrons("SolidMeshTetrahedrons");
+inline const QString Speed("Speed");
+inline const QString SurfaceMeshCells("SurfaceMeshCells");
+inline const QString BoundaryCells("BoundaryCells");
+inline const QString TJManhattanDistances("TJManhattanDistances");
+inline const QString TJEuclideanDistances("TJEuclideanDistances");
+inline const QString VectorColor("VectorColor");
+inline const QString VectorData("VectorData");
+inline const QString Histogram("Histogram");
 } // namespace CellData
 
 namespace FeatureData
 {
-const QString FeatureID("Feature_ID");
-const QString Active("Active");
-const QString AspectRatios("AspectRatios");
-const QString AvgCAxes("AvgCAxes");
-const QString AvgCAxisMisalignments("AvgCAxisMisalignments");
-const QString LocalCAxisMisalignments("LocalCAxisMisalignments");
-const QString UnbiasedLocalCAxisMisalignments("UnbiasedLocalCAxisMisalignments");
-const QString AvgQuats("AvgQuats");
-const QString AxisEulerAngles("AxisEulerAngles");
-const QString AxisLengths("AxisLengths");
-const QString BasalLoadingFactor("BasalLoadingFactor");
-const QString BiasedFeatures("BiasedFeatures");
-const QString CAxisMisalignmentList("CAxisMisalignmentList");
-const QString Centroids("Centroids");
-const QString ClusteringList("ClusteringList");
-const QString ElasticStrains("ElasticStrains");
-const QString EquivalentDiameters("EquivalentDiameters");
-const QString SaltykovEquivalentDiameters("SaltykovEquivalentDiameters");
-const QString EulerAngles("EulerAngles");
-const QString AvgEulerAngles("AvgEulerAngles");
-const QString F1List("F1List");
-const QString F1sptList("F1sptList");
-const QString F7List("F7List");
-const QString FarFeatureOrientations("FarFeatureOrientations");
-const QString FeaturePhases("Phases");
-const QString GoodFeatures("GoodFeatures");
-const QString FeatureAvgCAxisMisorientations("FeatureAvgCAxisMisorientations");
-const QString FeatureAvgMisorientations("FeatureAvgMisorientations");
-const QString FeatureStdevCAxisMisorientations("FeatureStdevCAxisMisorientations");
-const QString KernelAvgMisorientations("KernelAvgMisorientations");
-const QString LMG("LMG");
-const QString LargestCrossSections("LargestCrossSections");
-const QString Mask("Mask");
-const QString MTRdensity("MTRdensity");
-const QString MTRgKAM("MTRgKAM");
-
-const QString MisorientationList("MisorientationList");
-const QString NeighborList("NeighborList");
-const QString NeighborhoodList("NeighborhoodList");
-const QString Neighborhoods("Neighborhoods");
-const QString NumCells("NumCells");
-const QString NumElements("NumElements");
-const QString NumFeaturesPerParent("NumFeaturesPerParent");
-const QString NumNeighbors("NumNeighbors");
-const QString Omega3s("Omega3s");
-const QString ParentIds("ParentIds");
-const QString Phases("Phases");
-const QString Poles("Poles");
-const QString RGBs("RGBs");
-const QString Schmids("Schmids");
-const QString SharedSurfaceAreaList("SharedSurfaceAreaList");
-const QString SlipSystems("SlipSystems");
-const QString SurfaceAreaVol("SurfaceAreaVolumeRatio");
-const QString SurfaceFeatures("SurfaceFeatures");
-const QString SurfaceElementFractions("SurfaceElementFractions");
-const QString Volumes("Volumes");
-const QString AvgMisorientations("AvgMisorientations");
-const QString mPrimeList("mPrimeList");
-const QString NumBins("NumBins");
-const QString ScalarAverages("ScalarAverages");
+inline const QString FeatureID("Feature_ID");
+inline const QString Active("Active");
+inline const QString AspectRatios("AspectRatios");
+inline const QString AvgCAxes("AvgCAxes");
+inline const QString AvgCAxisMisalignments("AvgCAxisMisalignments");
+inline const QString LocalCAxisMisalignments("LocalCAxisMisalignments");
+inline const QString UnbiasedLocalCAxisMisalignments("UnbiasedLocalCAxisMisalignments");
+inline const QString AvgQuats("AvgQuats");
+inline const QString AxisEulerAngles("AxisEulerAngles");
+inline const QString AxisLengths("AxisLengths");
+inline const QString BasalLoadingFactor("BasalLoadingFactor");
+inline const QString BiasedFeatures("BiasedFeatures");
+inline const QString CAxisMisalignmentList("CAxisMisalignmentList");
+inline const QString Centroids("Centroids");
+inline const QString ClusteringList("ClusteringList");
+inline const QString ElasticStrains("ElasticStrains");
+inline const QString EquivalentDiameters("EquivalentDiameters");
+inline const QString SaltykovEquivalentDiameters("SaltykovEquivalentDiameters");
+inline const QString EulerAngles("EulerAngles");
+inline const QString AvgEulerAngles("AvgEulerAngles");
+inline const QString F1List("F1List");
+inline const QString F1sptList("F1sptList");
+inline const QString F7List("F7List");
+inline const QString FarFeatureOrientations("FarFeatureOrientations");
+inline const QString FeaturePhases("Phases");
+inline const QString GoodFeatures("GoodFeatures");
+inline const QString FeatureAvgCAxisMisorientations("FeatureAvgCAxisMisorientations");
+inline const QString FeatureAvgMisorientations("FeatureAvgMisorientations");
+inline const QString FeatureStdevCAxisMisorientations("FeatureStdevCAxisMisorientations");
+inline const QString KernelAvgMisorientations("KernelAvgMisorientations");
+inline const QString LMG("LMG");
+inline const QString LargestCrossSections("LargestCrossSections");
+inline const QString Mask("Mask");
+inline const QString MTRdensity("MTRdensity");
+inline const QString MTRgKAM("MTRgKAM");
+
+inline const QString MisorientationList("MisorientationList");
+inline const QString NeighborList("NeighborList");
+inline const QString NeighborhoodList("NeighborhoodList");
+inline const QString Neighborhoods("Neighborhoods");
+inline const QString NumCells("NumCells");
+inline const QString NumElements("NumElements");
+inline const QString NumFeaturesPerParent("NumFeaturesPerParent");
+inline const QString NumNeighbors("NumNeighbors");
+inline const QString Omega3s("Omega3s");
+inline const QString ParentIds("ParentIds");
+inline const QString Phases("Phases");
+inline const QString Poles("Poles");
+inline const QString RGBs("RGBs");
+inline const QString Schmids("Schmids");
+inline const QString SharedSurfaceAreaList("SharedSurfaceAreaList");
+inline const QString SlipSystems("SlipSystems");
+inline const QString SurfaceAreaVol("SurfaceAreaVolumeRatio");
+inline const QString SurfaceFeatures("SurfaceFeatures");
+inline const QString SurfaceElementFractions("SurfaceElementFractions");
+inline const QString Volumes("Volumes");
+inline const QString AvgMisorientations("AvgMisorientations");
+inline const QString mPrimeList("mPrimeList");
+inline const QString NumBins("NumBins");
+inline const QString ScalarAverages("ScalarAverages");
 
 } // namespace FeatureData
 
 namespace EnsembleData
 {
-const QString NumFeatures("NumFeatures");
-const QString VolFractions("VolFractions");
-const QString TotalSurfaceAreas("TotalSurfaceAreas");
-const QString CrystalSymmetry("Crystal Symmetry");
-const QString CrystalStructures("CrystalStructures");
-const QString PhaseTypes("PhaseTypes");
-const QString BravaisLattice("BravaisLattice");
-const QString PrecipitateFractions("PrecipitateFractions");
-const QString ShapeTypes("ShapeTypes");
-const QString Statistics("Statistics");
-const QString PhaseName("PhaseName");
-const QString LatticeConstants("LatticeConstants");
-const QString GBCD("GBCD");
-const QString GBCDdimensions("GBCDdimensions");
-const QString FitParameters("FitParameters");
-const QString MaterialName("MaterialName");
+inline const QString NumFeatures("NumFeatures");
+inline const QString VolFractions("VolFractions");
+inline const QString TotalSurfaceAreas("TotalSurfaceAreas");
+inline const QString CrystalSymmetry("Crystal Symmetry");
+inline const QString CrystalStructures("CrystalStructures");
+inline const QString PhaseTypes("PhaseTypes");
+inline const QString BravaisLattice("BravaisLattice");
+inline const QString PrecipitateFractions("PrecipitateFractions");
+inline const QString ShapeTypes("ShapeTypes");
+inline const QString Statistics("Statistics");
+inline const QString PhaseName("PhaseName");
+inline const QString LatticeConstants("LatticeConstants");
+inline const QString GBCD("GBCD");
+inline const QString GBCDdimensions("GBCDdimensions");
+inline const QString FitParameters("FitParameters");
+inline const QString MaterialName("MaterialName");
 } // namespace EnsembleData
 
 namespace VertexData
 {
-const QString AtomVelocities("AtomVelocities");
-const QString AtomTypes("AtomTypes");
-const QString AtomFeatureLabels("AtomFeatureLabels");
-const QString NumberOfArms("NumberOfArms");
-const QString NodeConstraints("NodeConstraints");
-const QString SurfaceMeshNodes("Nodes");
-const QString SurfaceMeshNodeType("NodeType");
-const QString SurfaceMeshNodeNormals("NodeNormals");
-const QString SurfaceMeshNodeFaces("NodeFaces");
+inline const QString AtomVelocities("AtomVelocities");
+inline const QString AtomTypes("AtomTypes");
+inline const QString AtomFeatureLabels("AtomFeatureLabels");
+inline const QString NumberOfArms("NumberOfArms");
+inline const QString NodeConstraints("NodeConstraints");
+inline const QString SurfaceMeshNodes("Nodes");
+inline const QString SurfaceMeshNodeType("NodeType");
+inline const QString SurfaceMeshNodeNormals("NodeNormals");
+inline const QString SurfaceMeshNodeFaces("NodeFaces");
 } // namespace VertexData
 
 namespace FaceData
 {
-const QString SurfaceMeshFaces("Faces");
-const QString SurfaceMeshFaceIPFColors("IPFColors");
-const QString SurfaceMeshFaceMisorientationColors("MisorientationColors");
-const QString SurfaceMeshFaceSchuhMisorientationColors("SchuhMisorientationColors");
-const QString SurfaceMeshFaceLabels("FaceLabels");
-const QString SurfaceMeshFacePhases("Phases");
-const QString SurfaceMeshF1s("F1s");
-const QString SurfaceMeshF1spts("F1spts");
-const QString SurfaceMeshF7s("F7s");
-const QString SurfaceMeshmPrimes("mPrimes");
-const QString SurfaceMeshVoxels("SurfaceMeshVoxels");
-const QString SurfaceMeshFaceCentroids("FaceCentroids");
-const QString SurfaceMeshFaceAreas("FaceAreas");
-const QString SurfaceMeshTwinBoundary("TwinBoundary");
-const QString SurfaceMeshTwinBoundaryIncoherence("TwinBoundaryIncoherence");
-const QString SurfaceMeshTwinBoundarySchmidFactors("TwinBoundarySchmidFactors");
-const QString SurfaceMeshFaceDihedralAngles("FaceDihedralAngles");
-const QString SurfaceMeshFaceNormals("FaceNormals");
-const QString SurfaceMeshFeatureFaceId("FeatureFaceId");
-const QString SurfaceMeshGaussianCurvatures("GaussianCurvatures");
-const QString SurfaceMeshMeanCurvatures("MeanCurvatures");
-const QString SurfaceMeshPrincipalCurvature1("PrincipalCurvature1");
-const QString SurfaceMeshPrincipalCurvature2("PrincipalCurvature2");
-const QString SurfaceMeshPrincipalDirection1("PrincipalDirection1");
-const QString SurfaceMeshPrincipalDirection2("PrincipalDirection2");
+inline const QString SurfaceMeshFaces("Faces");
+inline const QString SurfaceMeshFaceIPFColors("IPFColors");
+inline const QString SurfaceMeshFaceMisorientationColors("MisorientationColors");
+inline const QString SurfaceMeshFaceSchuhMisorientationColors("SchuhMisorientationColors");
+inline const QString SurfaceMeshFaceLabels("FaceLabels");
+inline const QString SurfaceMeshFacePhases("Phases");
+inline const QString SurfaceMeshF1s("F1s");
+inline const QString SurfaceMeshF1spts("F1spts");
+inline const QString SurfaceMeshF7s("F7s");
+inline const QString SurfaceMeshmPrimes("mPrimes");
+inline const QString SurfaceMeshVoxels("SurfaceMeshVoxels");
+inline const QString SurfaceMeshFaceCentroids("FaceCentroids");
+inline const QString SurfaceMeshFaceAreas("FaceAreas");
+inline const QString SurfaceMeshTwinBoundary("TwinBoundary");
+inline const QString SurfaceMeshTwinBoundaryIncoherence("TwinBoundaryIncoherence");
+inline const QString SurfaceMeshTwinBoundarySchmidFactors("TwinBoundarySchmidFactors");
+inline const QString SurfaceMeshFaceDihedralAngles("FaceDihedralAngles");
+inline const QString SurfaceMeshFaceNormals("FaceNormals");
+inline const QString SurfaceMeshFeatureFaceId("FeatureFaceId");
+inline const QString SurfaceMeshGaussianCurvatures("GaussianCurvatures");
+inline const QString SurfaceMeshMeanCurvatures("MeanCurvatures");
+inline const QString SurfaceMeshPrincipalCurvature1("PrincipalCurvature1");
+inline const QString SurfaceMeshPrincipalCurvature2("PrincipalCurvature2");
+inline const QString SurfaceMeshPrincipalDirection1("PrincipalDirection1");
+inline const QString SurfaceMeshPrincipalDirection2("PrincipalDirection2");
 } // namespace FaceData
 
 namespace EdgeData
 {
-const QString DislocationIds("DislocationIds");
-const QString BurgersVectors("BurgersVectors");
-const QString SlipPlaneNormals("SlipPlaneNormals");
-const QString SurfaceMeshEdges("SurfaceMeshEdges");
-const QString SurfaceMeshUniqueEdges("SurfaceMeshUniqueEdges");
-const QString SurfaceMeshInternalEdges("SurfaceMeshInternalEdges");
-const QString SurfaceMeshTriangleEdges("SurfaceMeshTriangleEdges");
-const QString SurfaceMeshEdgeFaces("SurfaceMeshEdgeFaces");
+inline const QString DislocationIds("DislocationIds");
+inline const QString BurgersVectors("BurgersVectors");
+inline const QString SlipPlaneNormals("SlipPlaneNormals");
+inline const QString SurfaceMeshEdges("SurfaceMeshEdges");
+inline const QString SurfaceMeshUniqueEdges("SurfaceMeshUniqueEdges");
+inline const QString SurfaceMeshInternalEdges("SurfaceMeshInternalEdges");
+inline const QString SurfaceMeshTriangleEdges("SurfaceMeshTriangleEdges");
+inline const QString SurfaceMeshEdgeFaces("SurfaceMeshEdgeFaces");
 } // namespace EdgeData
 
 namespace Settings
 {
-const QString Library("Filter Library");
-const QString PrebuiltPipelines("Prebuilt Pipelines");
-const QString FavoritePipelines("Favorite Pipelines");
-const QString PipelineBuilderGroup("PipelineBuilder");
-const QString FavoriteConfig("favorite_config");
-const QString NumFilters("Number_Filters");
-const QString PipelineName("Name");
-const QString FilterName("Filter_Name");
-const QString FilterUuid("Filter_Uuid");
-const QString FilterVersion("FilterVersion");
-const QString HumanLabel("Filter_Human_Label");
-const QString FilterEnabled("Filter_Enabled");
-const QString GroupName("GroupName");
-const QString SubGroupName("SubGroupName");
-const QString BrandingString("BrandingString");
-const QString CompiledLibraryName("CompiledLibraryName");
-const QString Version("Version");
-const QString PipelineBuilderGeomertry("PipelineBuilderGeometry");
+inline const QString Library("Filter Library");
+inline const QString PrebuiltPipelines("Prebuilt Pipelines");
+inline const QString FavoritePipelines("Favorite Pipelines");
+inline const QString PipelineBuilderGroup("PipelineBuilder");
+inline const QString FavoriteConfig("favorite_config");
+inline const QString NumFilters("Number_Filters");
+inline const QString PipelineName("Name");
+inline const QString FilterName("Filter_Name");
+inline const QString FilterUuid("Filter_Uuid");
+inline const QString FilterVersion("FilterVersion");
+inline const QString HumanLabel("Filter_Human_Label");
+inline const QString FilterEnabled("Filter_Enabled");
+inline const QString GroupName("GroupName");
+inline const QString SubGroupName("SubGroupName");
+inline const QString BrandingString("BrandingString");
+inline const QString CompiledLibraryName("CompiledLibraryName");
+inline const QString Version("Version");
+inline const QString PipelineBuilderGeomertry("PipelineBuilderGeometry");
 } // namespace Settings
 
 namespace HDF5
 {
-const QString FileVersion("7.0");
-const QString FileVersionName("FileVersion");
-const QString DREAM3DVersion("DREAM3D Version");
-const QString ObjectType("ObjectType");
-const QString Rank("Rank");
-const QString TupleDimensions("TupleDimensions");
-const QString ComponentDimensions("ComponentDimensions");
-const QString AxisDimensions("Tuple Axis Dimensions");
-const QString DataArrayVersion("DataArrayVersion");
+inline const QString FileVersion("7.0");
+inline const QString FileVersionName("FileVersion");
+inline const QString DREAM3DVersion("DREAM3D Version");
+inline const QString ObjectType("ObjectType");
+inline const QString Rank("Rank");
+inline const QString TupleDimensions("TupleDimensions");
+inline const QString ComponentDimensions("ComponentDimensions");
+inline const QString AxisDimensions("Tuple Axis Dimensions");
+inline const QString DataArrayVersion("DataArrayVersion");
 } // namespace HDF5
 
 namespace StringConstants
 {
-const QString Alpha("Alpha");
-const QString Angle("Angle");
-
-const QString Average("Average");
-const QString Axis("Axis");
-const QString AxisODFWeights("AxisODF-Weights");
-const QString AxisOrientation("AxisOrientation");
-const QString Beta("Beta");
-const QString BetaDistribution("Beta Distribution");
-const QString BinNumber("BinNumber");
-const QString BinCount("Bin Count");
-const QString BinStepSize("Bin Step Size");
-const QString BoundaryArea("BoundaryArea");
-const QString BoundaryStatsData("BoundaryStatsData");
-const QString CellNeighbors("CellNeighbors");
-
-const QString CellsContainingVert("CellsContainingVert");
-const QString CellsName("Cells");
-const QString CrystalStructure("CrystalStructure");
-const QString DataContainerGroupName("DataContainers");
-const QString DataContainerBundleGroupName("DataContainerBundles");
-const QString DataContainerNames("DataContainerNames");
-const QString MetaDataArrays("MetaDataArrays");
-const QString MontageGroupName("Montages");
-const QString DataContainerType("DataContainerType");
-const QString AttributeMatrixType("AttributeMatrixType");
-
-const QString Dims("Dims");
-const QString DistributionType("Distribution Type");
-
-const QString EdgeNeighbors("EdgeNeighbors");
-const QString EdgesContainingVert("EdgesContainingVert");
-const QString EdgesName("Edges");
-const QString EdgeCentroids("EdgeCentroids");
-const QString EdgeLengths("EdgeLengths");
-const QString Euler1("Euler 1");
-const QString Euler2("Euler 2");
-const QString Euler3("Euler 3");
-const QString Exp_k("K");
-
-const QString FaceNeighbors("FaceNeighbors");
-const QString FacesContainingVert("FacesContainingVert");
-const QString FacesName("Faces");
-const QString TrianglesName("Triangles");
-const QString TriangleNeighbors("TriangleNeighbors");
-const QString TrianglesContainingVert("TrianglesContainingVert");
-const QString TriangleCentroids("TriangleCentroids");
-const QString TriangleAreas("TriangleAreas");
-const QString Frequencies("Frequencies");
-
-const QString QuadsName("Quadrilaterals");
-const QString QuadNeighbors("QuadrilateralNeighbors");
-const QString QuadsContainingVert("QuadrilateralsContainingVerts");
-const QString QuadCentroids("QuadrilateralCentroids");
-const QString QuadAreas("QuadrilateralAreas");
-
-const QString TetsName("Tetrahedra");
-const QString TetNeighbors("TetrahedralNeighbors");
-const QString TetsContainingVert("TetrahedraContainingVerts");
-const QString TetCentroids("TetrahedralCentroids");
-const QString TetVolumes("TetrahedralVolumes");
-
-const QString HexasName("Hexahedra");
-const QString HexNeighbors("HexahedralNeighbors");
-const QString HexasContainingVert("HexahedraContainingVerts");
-const QString HexCentroids("HexahedralCentroids");
-const QString HexVolumes("HexahedralVolumes");
-
-const QString VoxelSizes("VoxelSizes");
-const QString VertexSizes("VertexSizes");
-
-const QString GBCD("GBCD");
-const QString FeatureAvgDisorientation("FeatureAvgDisorientation");
-const QString Feature_Diameter_Info("Feature_Diameter_Info");
-const QString Feature_SizeVBoverA_Distributions("FeatureSize Vs B Over A Distributions");
-const QString Feature_SizeVCoverA_Distributions("FeatureSize Vs C Over A Distributions");
-const QString Feature_SizeVNeighbors_Distributions("FeatureSize Vs Neighbors Distributions");
-const QString Feature_SizeVOmega3_Distributions("FeatureSize Vs Omega3 Distributions");
-const QString Feature_SizeVClustering_Distributions("FeatureSize Vs Clustering Distributions");
-const QString Feature_Size_Distribution("FeatureSize Distribution");
-const QString KernelAvgDisorientation("KernelAvgDisorientation");
-const QString LogNormalDistribution("Log Normal Distribution");
-const QString MDFWeights("MDF-Weights");
-const QString MatrixStatsData("MatrixStatsData");
-const QString MeshFaceNeighborLists("MeshFaceNeighborLists");
-const QString MicroTextureBins("MicroTextureBins");
-const QString MinimumValue("Minimum Value");
-const QString MinMaxNoOfBins("MinMaxNoOfBins");
-const QString MisorientationBins("MisorientationBins");
-const QString Neighbor_Feature_ID_List("Neighbor_Feature_ID_List");
-
-const QString ODF("ODF");
-const QString ODFWeights("ODF-Weights");
-
-const QString ParentPhase("Parent Phase");
-const QString PhaseFraction("PhaseFraction");
-const QString PhaseType("PhaseType");
-const QString PipelineGroupName("Pipeline");
-const QString PipelineVersionName("Pipeline Version");
-const QString PipelineCurrentName("Current Pipeline");
-const QString PowerLawDistribution("Power Law Distribution");
-const QString PrecipitateBoundaryFraction("Precipitate Boundary Fraction");
-const QString PrecipitateStatsData("PrecipitateStatsData");
-const QString PrimaryStatsData("PrimaryStatsData");
-const QString PresetName("PresetName");
-
-const QString RadialDistFunc("Radial Distribution Function");
-const QString RdfMinDistance("Min");
-const QString RdfMaxDistance("Max");
-const QString RdfBoxDims("BoxDims");
-const QString RdfBoxRes("BoxRes");
-
-const QString Sigma("Sigma");
-const QString StandardDeviation("Standard Deviation");
-const QString Statistics("Statistics");
-const QString Stats("Stats");
-const QString StatsData("StatsData");
-const QString StatsType("StatsType");
-
-const QString TransformationStatsData("TransformationStatsData");
-const QString UnknownDistribution("Unknown Distribution");
-
-const QString VerticesName("Vertices");
-const QString VertsName("Verts");
-const QString ImageName("Image");
-
-const QString Weight("Weight");
-
-const QString MetaData("_META_DATA");
-
-const QString Name("Name");
-const QString Index("Index");
+inline const QString Alpha("Alpha");
+inline const QString Angle("Angle");
+
+inline const QString Average("Average");
+inline const QString Axis("Axis");
+inline const QString AxisODFWeights("AxisODF-Weights");
+inline const QString AxisOrientation("AxisOrientation");
+inline const QString Beta("Beta");
+inline const QString BetaDistribution("Beta Distribution");
+inline const QString BinNumber("BinNumber");
+inline const QString BinCount("Bin Count");
+inline const QString BinStepSize("Bin Step Size");
+inline const QString BoundaryArea("BoundaryArea");
+inline const QString BoundaryStatsData("BoundaryStatsData");
+inline const QString CellNeighbors("CellNeighbors");
+
+inline const QString CellsContainingVert("CellsContainingVert");
+inline const QString CellsName("Cells");
+inline const QString CrystalStructure("CrystalStructure");
+inline const QString DataContainerGroupName("DataContainers");
+inline const QString DataContainerBundleGroupName("DataContainerBundles");
+inline const QString DataContainerNames("DataContainerNames");
+inline const QString MetaDataArrays("MetaDataArrays");
+inline const QString MontageGroupName("Montages");
+inline const QString DataContainerType("DataContainerType");
+inline const QString AttributeMatrixType("AttributeMatrixType");
+
+inline const QString Dims("Dims");
+inline const QString DistributionType("Distribution Type");
+
+inline const QString EdgeNeighbors("EdgeNeighbors");
+inline const QString EdgesContainingVert("EdgesContainingVert");
+inline const QString EdgesName("Edges");
+inline const QString EdgeCentroids("EdgeCentroids");
+inline const QString EdgeLengths("EdgeLengths");
+inline const QString Euler1("Euler 1");
+inline const QString Euler2("Euler 2");
+inline const QString Euler3("Euler 3");
+inline const QString Exp_k("K");
+
+inline const QString FaceNeighbors("FaceNeighbors");
+inline const QString FacesContainingVert("FacesContainingVert");
+inline const QString FacesName("Faces");
+inline const QString TrianglesName("Triangles");
+inline const QString TriangleNeighbors("TriangleNeighbors");
+inline const QString TrianglesContainingVert("TrianglesContainingVert");
+inline const QString TriangleCentroids("TriangleCentroids");
+inline const QString TriangleAreas("TriangleAreas");
+inline const QString Frequencies("Frequencies");
+
+inline const QString QuadsName("Quadrilaterals");
+inline const QString QuadNeighbors("QuadrilateralNeighbors");
+inline const QString QuadsContainingVert("QuadrilateralsContainingVerts");
+inline const QString QuadCentroids("QuadrilateralCentroids");
+inline const QString QuadAreas("QuadrilateralAreas");
+
+inline const QString TetsName("Tetrahedra");
+inline const QString TetNeighbors("TetrahedralNeighbors");
+inline const QString TetsContainingVert("TetrahedraContainingVerts");
+inline const QString TetCentroids("TetrahedralCentroids");
+inline const QString TetVolumes("TetrahedralVolumes");
+
+inline const QString HexasName("Hexahedra");
+inline const QString HexNeighbors("HexahedralNeighbors");
+inline const QString HexasContainingVert("HexahedraContainingVerts");
+inline const QString HexCentroids("HexahedralCentroids");
+inline const QString HexVolumes("HexahedralVolumes");
+
+inline const QString VoxelSizes("VoxelSizes");
+inline const QString VertexSizes("VertexSizes");
+
+inline const QString GBCD("GBCD");
+inline const QString FeatureAvgDisorientation("FeatureAvgDisorientation");
+inline const QString Feature_Diameter_Info("Feature_Diameter_Info");
+inline const QString Feature_SizeVBoverA_Distributions("FeatureSize Vs B Over A Distributions");
+inline const QString Feature_SizeVCoverA_Distributions("FeatureSize Vs C Over A Distributions");
+inline const QString Feature_SizeVNeighbors_Distributions("FeatureSize Vs Neighbors Distributions");
+inline const QString Feature_SizeVOmega3_Distributions("FeatureSize Vs Omega3 Distributions");
+inline const QString Feature_SizeVClustering_Distributions("FeatureSize Vs Clustering Distributions");
+inline const QString Feature_Size_Distribution("FeatureSize Distribution");
+inline const QString KernelAvgDisorientation("KernelAvgDisorientation");
+inline const QString LogNormalDistribution("Log Normal Distribution");
+inline const QString MDFWeights("MDF-Weights");
+inline const QString MatrixStatsData("MatrixStatsData");
+inline const QString MeshFaceNeighborLists("MeshFaceNeighborLists");
+inline const QString MicroTextureBins("MicroTextureBins");
+inline const QString MinimumValue("Minimum Value");
+inline const QString MinMaxNoOfBins("MinMaxNoOfBins");
+inline const QString MisorientationBins("MisorientationBins");
+inline const QString Neighbor_Feature_ID_List("Neighbor_Feature_ID_List");
+
+inline const QString ODF("ODF");
+inline const QString ODFWeights("ODF-Weights");
+
+inline const QString ParentPhase("Parent Phase");
+inline const QString PhaseFraction("PhaseFraction");
+inline const QString PhaseType("PhaseType");
+inline const QString PipelineGroupName("Pipeline");
+inline const QString PipelineVersionName("Pipeline Version");
+inline const QString PipelineCurrentName("Current Pipeline");
+inline const QString PowerLawDistribution("Power Law Distribution");
+inline const QString PrecipitateBoundaryFraction("Precipitate Boundary Fraction");
+inline const QString PrecipitateStatsData("PrecipitateStatsData");
+inline const QString PrimaryStatsData("PrimaryStatsData");
+inline const QString PresetName("PresetName");
+
+inline const QString RadialDistFunc("Radial Distribution Function");
+inline const QString RdfMinDistance("Min");
+inline const QString RdfMaxDistance("Max");
+inline const QString RdfBoxDims("BoxDims");
+inline const QString RdfBoxRes("BoxRes");
+
+inline const QString Sigma("Sigma");
+inline const QString StandardDeviation("Standard Deviation");
+inline const QString Statistics("Statistics");
+inline const QString Stats("Stats");
+inline const QString StatsData("StatsData");
+inline const QString StatsType("StatsType");
+
+inline const QString TransformationStatsData("TransformationStatsData");
+inline const QString UnknownDistribution("Unknown Distribution");
+
+inline const QString VerticesName("Vertices");
+inline const QString VertsName("Verts");
+inline const QString ImageName("Image");
+
+inline const QString Weight("Weight");
+
+inline const QString MetaData("_META_DATA");
+
+inline const QString Name("Name");
+inline const QString Index("Index");
 } // namespace StringConstants
 
 namespace CellType
 {
-const QString Quadrilateral("Quadrilateral");
-const QString Tetrahedron("Tetrahedron");
-const QString Triangle("Triangle");
-const QString Face("Face");
-const QString Edge("Edge");
-const QString Vertex("Vertex");
-const QString Node("Node");
+inline const QString Quadrilateral("Quadrilateral");
+inline const QString Tetrahedron("Tetrahedron");
+inline const QString Triangle("Triangle");
+inline const QString Face("Face");
+inline const QString Edge("Edge");
+inline const QString Vertex("Vertex");
+inline const QString Node("Node");
 } // namespace CellType
 
 // namespace PhaseType
 //{
-//  //constexpr uint32_t PrimaryPhase = 0;              //!<
-//  //constexpr uint32_t PrecipitatePhase = 1;          //!<
-//  //constexpr uint32_t TransformationPhase = 2;       //!<
-//  //constexpr uint32_t MatrixPhase = 3;              //!<
-//  //constexpr uint32_t BoundaryPhase = 4;              //!<
-//  //constexpr uint32_t Unknown = 999;    //!<
-
-//  const QString Primary("Primary");
-//  const QString Precipitate("Precipitate");
-//  const QString Transformation("Transformation");
-//  const QString Matrix("Matrix");
-//  const QString Boundary("Boundary");
-//  const QString UnknownPhase("Unknown");
+//  //inline constexpr uint32_t PrimaryPhase = 0;              //!<
+//  //inline constexpr uint32_t PrecipitatePhase = 1;          //!<
+//  //inline constexpr uint32_t TransformationPhase = 2;       //!<
+//  //inline constexpr uint32_t MatrixPhase = 3;              //!<
+//  //inline constexpr uint32_t BoundaryPhase = 4;              //!<
+//  //inline constexpr uint32_t Unknown = 999;    //!<
+
+//  inline const QString Primary("Primary");
+//  inline const QString Precipitate("Precipitate");
+//  inline const QString Transformation("Transformation");
+//  inline const QString Matrix("Matrix");
+//  inline const QString Boundary("Boundary");
+//  inline const QString UnknownPhase("Unknown");
 //}
 
 namespace AlignmentMethod
 {
-constexpr uint32_t OuterBoundary = 0;            //!<
-constexpr uint32_t Misorientation = 1;           //!<
-constexpr uint32_t MutualInformation = 2;        //!<
-constexpr uint32_t Count = 3;                    //!<
-constexpr uint32_t UnknownAlignmentMethod = 999; //!<
+inline constexpr uint32_t OuterBoundary = 0;            //!<
+inline constexpr uint32_t Misorientation = 1;           //!<
+inline constexpr uint32_t MutualInformation = 2;        //!<
+inline constexpr uint32_t Count = 3;                    //!<
+inline constexpr uint32_t UnknownAlignmentMethod = 999; //!<
 } // namespace AlignmentMethod
 
 namespace StatisticsType
 {
-constexpr uint32_t Feature_SizeVBoverA = 0;      //!<
-constexpr uint32_t Feature_SizeVCoverA = 1;      //!<
-constexpr uint32_t Feature_SizeVNeighbors = 2;   //!<
-constexpr uint32_t Feature_SizeVOmega3 = 3;      //!<
-constexpr uint32_t Feature_SizeVClustering = 4;  //!<
-constexpr uint32_t UnknownStatisticsGroup = 999; //!<
+inline constexpr uint32_t Feature_SizeVBoverA = 0;      //!<
+inline constexpr uint32_t Feature_SizeVCoverA = 1;      //!<
+inline constexpr uint32_t Feature_SizeVNeighbors = 2;   //!<
+inline constexpr uint32_t Feature_SizeVOmega3 = 3;      //!<
+inline constexpr uint32_t Feature_SizeVClustering = 4;  //!<
+inline constexpr uint32_t UnknownStatisticsGroup = 999; //!<
 
 } // namespace StatisticsType
 
 namespace DistributionType
 {
-constexpr uint32_t Beta = 0;                    //!<
-constexpr uint32_t LogNormal = 1;               //!<
-constexpr uint32_t Power = 2;                   //!<
-constexpr uint32_t RDFFrequency = 3;            //!<
-constexpr uint32_t RDFMaxMin = 4;               //!<
-constexpr uint32_t UnknownDistributionType = 5; //!<
-constexpr uint32_t Count = 6;                   //!<
+inline constexpr uint32_t Beta = 0;                    //!<
+inline constexpr uint32_t LogNormal = 1;               //!<
+inline constexpr uint32_t Power = 2;                   //!<
+inline constexpr uint32_t RDFFrequency = 3;            //!<
+inline constexpr uint32_t RDFMaxMin = 4;               //!<
+inline constexpr uint32_t UnknownDistributionType = 5; //!<
+inline constexpr uint32_t Count = 6;                   //!<
 
 enum ColumnCount
 {
@@ -777,198 +777,198 @@ enum ColumnCount
 
 namespace EulerAngleConversionType
 {
-constexpr uint32_t DegreesToRadians = 0; //!<
-constexpr uint32_t RadiansToDegrees = 1; //!<
+inline constexpr uint32_t DegreesToRadians = 0; //!<
+inline constexpr uint32_t RadiansToDegrees = 1; //!<
 } // namespace EulerAngleConversionType
 
 namespace FlattenImageMethod
 {
-constexpr uint32_t Lightness = 0;  //!<
-constexpr uint32_t Average = 1;    //!<
-constexpr uint32_t Luminosity = 2; //!<
+inline constexpr uint32_t Lightness = 0;  //!<
+inline constexpr uint32_t Average = 1;    //!<
+inline constexpr uint32_t Luminosity = 2; //!<
 } // namespace FlattenImageMethod
 
 namespace EulerFrameRotationAxis
 {
-constexpr uint32_t RD = 0;   //!<
-constexpr uint32_t TD = 1;   //!<
-constexpr uint32_t ND = 2;   //!<
-constexpr uint32_t None = 3; //!<
+inline constexpr uint32_t RD = 0;   //!<
+inline constexpr uint32_t TD = 1;   //!<
+inline constexpr uint32_t ND = 2;   //!<
+inline constexpr uint32_t None = 3; //!<
 } // namespace EulerFrameRotationAxis
 
 namespace SampleFrameRotationAxis
 {
-constexpr uint32_t X = 0;    //!<
-constexpr uint32_t Y = 1;    //!<
-constexpr uint32_t Z = 2;    //!<
-constexpr uint32_t None = 3; //!<
+inline constexpr uint32_t X = 0;    //!<
+inline constexpr uint32_t Y = 1;    //!<
+inline constexpr uint32_t Z = 2;    //!<
+inline constexpr uint32_t None = 3; //!<
 } // namespace SampleFrameRotationAxis
 
 namespace RefFrameRotationAngle
 {
-constexpr uint32_t Ninety = 0;     //!<
-constexpr uint32_t oneEighty = 1;  //!<
-constexpr uint32_t twoSeventy = 2; //!<
-constexpr uint32_t Mirror = 3;     //!<
-constexpr uint32_t Zero = 4;       //!<
+inline constexpr uint32_t Ninety = 0;     //!<
+inline constexpr uint32_t oneEighty = 1;  //!<
+inline constexpr uint32_t twoSeventy = 2; //!<
+inline constexpr uint32_t Mirror = 3;     //!<
+inline constexpr uint32_t Zero = 4;       //!<
 } // namespace RefFrameRotationAngle
 
 namespace Overlap
 {
-constexpr uint32_t Rigid = 0;            //!<
-constexpr uint32_t Progressive = 1;      //!<
-constexpr uint32_t UnknownOverlap = 999; //!<
+inline constexpr uint32_t Rigid = 0;            //!<
+inline constexpr uint32_t Progressive = 1;      //!<
+inline constexpr uint32_t UnknownOverlap = 999; //!<
 } // namespace Overlap
 
 //  namespace DataContainerType
 //  {
-//    constexpr uint32_t VolumeDataContainer = 0; //!<
-//    constexpr uint32_t SurfaceDataContainer = 1; //!<
-//    constexpr uint32_t EdgeDataContainer = 2; //!<
-//    constexpr uint32_t VertexDataContainer = 3; //!<
-//    constexpr uint32_t UnknownDataContainer = 999; //!<
+//    inline constexpr uint32_t VolumeDataContainer = 0; //!<
+//    inline constexpr uint32_t SurfaceDataContainer = 1; //!<
+//    inline constexpr uint32_t EdgeDataContainer = 2; //!<
+//    inline constexpr uint32_t VertexDataContainer = 3; //!<
+//    inline constexpr uint32_t UnknownDataContainer = 999; //!<
 //  }
 
 //  namespace AttributeMatrixType
 //  {
-//    constexpr uint32_t Vertex = 0; //!<
-//    constexpr uint32_t Edge = 1; //!<
-//    constexpr uint32_t Face = 2; //!<
-//    constexpr uint32_t Cell = 3; //!<
-//    constexpr uint32_t VertexFeature = 4; //!<
-//    constexpr uint32_t EdgeFeature = 5; //!<
-//    constexpr uint32_t FaceFeature = 6; //!<
-//    constexpr uint32_t CellFeature = 7; //!<
-//    constexpr uint32_t VertexEnsemble = 8; //!<
-//    constexpr uint32_t EdgeEnsemble = 9; //!<
-//    constexpr uint32_t FaceEnsemble = 10; //!<
-//    constexpr uint32_t CellEnsemble = 11; //!<
-//    constexpr uint32_t MetaData = 12; //!<
-//    constexpr uint32_t Generic = 13; //!<
-//    constexpr uint32_t Unknown = 999; //!<
+//    inline constexpr uint32_t Vertex = 0; //!<
+//    inline constexpr uint32_t Edge = 1; //!<
+//    inline constexpr uint32_t Face = 2; //!<
+//    inline constexpr uint32_t Cell = 3; //!<
+//    inline constexpr uint32_t VertexFeature = 4; //!<
+//    inline constexpr uint32_t EdgeFeature = 5; //!<
+//    inline constexpr uint32_t FaceFeature = 6; //!<
+//    inline constexpr uint32_t CellFeature = 7; //!<
+//    inline constexpr uint32_t VertexEnsemble = 8; //!<
+//    inline constexpr uint32_t EdgeEnsemble = 9; //!<
+//    inline constexpr uint32_t FaceEnsemble = 10; //!<
+//    inline constexpr uint32_t CellEnsemble = 11; //!<
+//    inline constexpr uint32_t MetaData = 12; //!<
+//    inline constexpr uint32_t Generic = 13; //!<
+//    inline constexpr uint32_t Unknown = 999; //!<
 //  }
 
 //  namespace AttributeMatrixObjectType
 //  {
-//    constexpr uint32_t Element = 0;
-//    constexpr uint32_t Feature = 1;
-//    constexpr uint32_t Ensemble = 2;
-//    constexpr uint32_t Any = 3;
+//    inline constexpr uint32_t Element = 0;
+//    inline constexpr uint32_t Feature = 1;
+//    inline constexpr uint32_t Ensemble = 2;
+//    inline constexpr uint32_t Any = 3;
 //  }
 
 namespace Geometry
 {
-const QString Geometry("_SIMPL_GEOMETRY");
-const QString GeometryName("GeometryName");
-const QString GeometryType("GeometryType");
-const QString GeometryTypeName("GeometryTypeName");
-const QString NumberOfTuples("NumberOfTuples");
-const QString UnitDimensionality("UnitDimensionality");
-const QString SpatialDimensionality("SpatialDimensionality");
-
-const QString AnyGeometry("AnyGeometry");
-const QString UnknownGeometry("UnkownGeometry");
-const QString ImageGeometry("ImageGeometry");
-const QString RectGridGeometry("RectGridGeometry");
-const QString VertexGeometry("VertexGeometry");
-const QString EdgeGeometry("EdgeGeometry");
-const QString TriangleGeometry("TriangleGeometry");
-const QString QuadGeometry("QuadrilateralGeometry");
-const QString TetrahedralGeometry("TetrahedralGeometry");
-const QString HexahedralGeometry("HexahedralGeometry");
-
-const QString xBoundsList("xBounds");
-const QString yBoundsList("yBounds");
-const QString zBoundsList("zBounds");
-const QString SharedVertexList("SharedVertexList");
-const QString SharedEdgeList("SharedEdgeList");
-const QString SharedTriList("SharedTriList");
-const QString SharedQuadList("SharedQuadList");
-const QString SharedTetList("SharedTetList");
-const QString SharedHexList("SharedHexList");
-const QString UnsharedEdgeList("UnsharedEdgeList");
-const QString UnsharedFaceList("UnsharedFaceList");
-
-const QString TransformContainerGroup("TransformContainerGroup");
-const QString TransformContainer("TransformContainer");
-const QString CompositeTransformContainer("CompositeTransformContainer");
-const QString TransformContainerTypeName("TransformContainerTypeName");
-const QString UnknownTransformContainer("UnknownTransformContainer");
-const QString TransformContainerParameters("TransformParameters");
-const QString TransformContainerFixedParameters("TransformFixedParameters");
-const QString TransformContainerTypeAsString("TransformType");
-const QString TransformContainerMovingName("TransformMovingName");
-const QString TransformContainerReferenceName("TransformReferenceName");
-
-const QString k_Yoctometer("Yoctometer");
-const QString k_Zeptometer("Zeptometer");
-const QString k_Attometer("Attometer");
-const QString k_Femtometer("Femtometer");
-const QString k_Picometer("Picometer");
-const QString k_Nanometer("Nanometer");
-const QString k_Micrometer("Micrometer");
-const QString k_Millimeter("Millimeter");
-const QString k_Centimeter("Centimeter");
-const QString k_Decimeter("Decimeter");
-const QString k_Meter("Meter");
-const QString k_Decameter("Decameter");
-const QString k_Hectometer("Hectometer");
-const QString k_Kilometer("Kilometer");
-const QString k_Megameter("Megameter");
-const QString k_Gigameter("Gigameter");
-const QString k_Terameter("Terameter");
-const QString k_Petameter("Petameter");
-const QString k_Exameter("Exameter");
-const QString k_Zettameter("Zettameter");
-const QString k_Yottameter("Yottameter");
-const QString k_Angstrom("Angstrom");
-const QString k_Mil("Mil");
-const QString k_Inch("Inch");
-const QString k_Foot("Foot");
-const QString k_Mile("Mile");
-const QString k_Fathom("Fathom");
-const QString k_Unspecified("Unspecified");
-const QString k_Unknown("Unknown");
+inline const QString Geometry("_SIMPL_GEOMETRY");
+inline const QString GeometryName("GeometryName");
+inline const QString GeometryType("GeometryType");
+inline const QString GeometryTypeName("GeometryTypeName");
+inline const QString NumberOfTuples("NumberOfTuples");
+inline const QString UnitDimensionality("UnitDimensionality");
+inline const QString SpatialDimensionality("SpatialDimensionality");
+
+inline const QString AnyGeometry("AnyGeometry");
+inline const QString UnknownGeometry("UnkownGeometry");
+inline const QString ImageGeometry("ImageGeometry");
+inline const QString RectGridGeometry("RectGridGeometry");
+inline const QString VertexGeometry("VertexGeometry");
+inline const QString EdgeGeometry("EdgeGeometry");
+inline const QString TriangleGeometry("TriangleGeometry");
+inline const QString QuadGeometry("QuadrilateralGeometry");
+inline const QString TetrahedralGeometry("TetrahedralGeometry");
+inline const QString HexahedralGeometry("HexahedralGeometry");
+
+inline const QString xBoundsList("xBounds");
+inline const QString yBoundsList("yBounds");
+inline const QString zBoundsList("zBounds");
+inline const QString SharedVertexList("SharedVertexList");
+inline const QString SharedEdgeList("SharedEdgeList");
+inline const QString SharedTriList("SharedTriList");
+inline const QString SharedQuadList("SharedQuadList");
+inline const QString SharedTetList("SharedTetList");
+inline const QString SharedHexList("SharedHexList");
+inline const QString UnsharedEdgeList("UnsharedEdgeList");
+inline const QString UnsharedFaceList("UnsharedFaceList");
+
+inline const QString TransformContainerGroup("TransformContainerGroup");
+inline const QString TransformContainer("TransformContainer");
+inline const QString CompositeTransformContainer("CompositeTransformContainer");
+inline const QString TransformContainerTypeName("TransformContainerTypeName");
+inline const QString UnknownTransformContainer("UnknownTransformContainer");
+inline const QString TransformContainerParameters("TransformParameters");
+inline const QString TransformContainerFixedParameters("TransformFixedParameters");
+inline const QString TransformContainerTypeAsString("TransformType");
+inline const QString TransformContainerMovingName("TransformMovingName");
+inline const QString TransformContainerReferenceName("TransformReferenceName");
+
+inline const QString k_Yoctometer("Yoctometer");
+inline const QString k_Zeptometer("Zeptometer");
+inline const QString k_Attometer("Attometer");
+inline const QString k_Femtometer("Femtometer");
+inline const QString k_Picometer("Picometer");
+inline const QString k_Nanometer("Nanometer");
+inline const QString k_Micrometer("Micrometer");
+inline const QString k_Millimeter("Millimeter");
+inline const QString k_Centimeter("Centimeter");
+inline const QString k_Decimeter("Decimeter");
+inline const QString k_Meter("Meter");
+inline const QString k_Decameter("Decameter");
+inline const QString k_Hectometer("Hectometer");
+inline const QString k_Kilometer("Kilometer");
+inline const QString k_Megameter("Megameter");
+inline const QString k_Gigameter("Gigameter");
+inline const QString k_Terameter("Terameter");
+inline const QString k_Petameter("Petameter");
+inline const QString k_Exameter("Exameter");
+inline const QString k_Zettameter("Zettameter");
+inline const QString k_Yottameter("Yottameter");
+inline const QString k_Angstrom("Angstrom");
+inline const QString k_Mil("Mil");
+inline const QString k_Inch("Inch");
+inline const QString k_Foot("Foot");
+inline const QString k_Mile("Mile");
+inline const QString k_Fathom("Fathom");
+inline const QString k_Unspecified("Unspecified");
+inline const QString k_Unknown("Unknown");
 } // namespace Geometry
 
 //  namespace GeometryType
 //  {
-//    constexpr uint32_t ImageGeometry = 11;
-//    constexpr uint32_t RectGridGeometry = 11;
-//    constexpr uint32_t VertexGeometry = 1;
-//    constexpr uint32_t EdgeGeometry = 3;
-//    constexpr uint32_t TriangleGeometry = 5;
-//    constexpr uint32_t QuadGeometry = 9;
-//    constexpr uint32_t TetrahedralGeometry = 10;
-//    constexpr uint32_t UnknownGeometry = 999;
+//    inline constexpr uint32_t ImageGeometry = 11;
+//    inline constexpr uint32_t RectGridGeometry = 11;
+//    inline constexpr uint32_t VertexGeometry = 1;
+//    inline constexpr uint32_t EdgeGeometry = 3;
+//    inline constexpr uint32_t TriangleGeometry = 5;
+//    inline constexpr uint32_t QuadGeometry = 9;
+//    inline constexpr uint32_t TetrahedralGeometry = 10;
+//    inline constexpr uint32_t UnknownGeometry = 999;
 //  }
 
 namespace XdmfGridType
 {
-constexpr uint32_t PolyData = 0;
-constexpr uint32_t RectilinearGrid = 1;
-constexpr uint32_t UnknownGrid = 0xFFFFFFFF;
+inline constexpr uint32_t PolyData = 0;
+inline constexpr uint32_t RectilinearGrid = 1;
+inline constexpr uint32_t UnknownGrid = 0xFFFFFFFF;
 } // namespace XdmfGridType
 
 namespace XdmfCenterType
 {
-const QString Node("Node");
-const QString Edge("Edge");
-const QString Face("Face");
-const QString Cell("Cell");
-const QString Grid("Grid");
+inline const QString Node("Node");
+inline const QString Edge("Edge");
+inline const QString Face("Face");
+inline const QString Cell("Cell");
+inline const QString Grid("Grid");
 } // namespace XdmfCenterType
 
 // namespace ShapeType
 //{
-//  constexpr uint32_t EllipsoidShape = 0; //!<
-//  constexpr uint32_t SuperEllipsoidShape = 1; //!<
-//  constexpr uint32_t CubeOctahedronShape = 2; //!<
-//  constexpr uint32_t CylinderAShape = 3; //!<
-//  constexpr uint32_t CylinderBShape = 4; //!<
-//  constexpr uint32_t CylinderCShape = 5; //!<
-//  constexpr uint32_t ShapeTypeEnd = 6;
-//  constexpr uint32_t UnknownShapeType = 999; //!<
+//  inline constexpr uint32_t EllipsoidShape = 0; //!<
+//  inline constexpr uint32_t SuperEllipsoidShape = 1; //!<
+//  inline constexpr uint32_t CubeOctahedronShape = 2; //!<
+//  inline constexpr uint32_t CylinderAShape = 3; //!<
+//  inline constexpr uint32_t CylinderBShape = 4; //!<
+//  inline constexpr uint32_t CylinderCShape = 5; //!<
+//  inline constexpr uint32_t ShapeTypeEnd = 6;
+//  inline constexpr uint32_t UnknownShapeType = 999; //!<
 //}
 
 enum class Precipitates : uint32_t
@@ -982,23 +982,23 @@ enum class Precipitates : uint32_t
 namespace Reconstruction
 {
 /*    Reconstruction related */
-const QString H5VoxelFile("VoxelData.h5voxel");
+inline const QString H5VoxelFile("VoxelData.h5voxel");
 
-const QString VisualizationVizFile("Visualization.vtk");           // 11
-const QString DownSampledVizFile("DownSampled_Visualization.vtk"); // 11
-const QString HDF5FeatureFile("Features.h5feature");
+inline const QString VisualizationVizFile("Visualization.vtk");           // 11
+inline const QString DownSampledVizFile("DownSampled_Visualization.vtk"); // 11
+inline const QString HDF5FeatureFile("Features.h5feature");
 } // namespace Reconstruction
 
 namespace SyntheticBuilder
 {
-const QString FeatureDataFile("FeatureData.csv");
-const QString H5VoxelFile("VoxelData.h5voxel");
+inline const QString FeatureDataFile("FeatureData.csv");
+inline const QString H5VoxelFile("VoxelData.h5voxel");
 
-const QString VisualizationVizFile("Visualization.vtk");
-const QString HDF5FeatureFile("Features.h5feature");
+inline const QString VisualizationVizFile("Visualization.vtk");
+inline const QString HDF5FeatureFile("Features.h5feature");
 
-const QString ErrorFile("Error.txt");
-const QString VtkFile("Test.vtk");
+inline const QString ErrorFile("Error.txt");
+inline const QString VtkFile("Test.vtk");
 } // namespace SyntheticBuilder
 
 /*   Surface Meshing Related   */
@@ -1006,35 +1006,35 @@ namespace SurfaceMesh
 {
 namespace NodeType
 {
-constexpr int8_t Unused = 0;
-constexpr int8_t Default = 2;
-constexpr int8_t TriplePoint = 3;
-constexpr int8_t QuadPoint = 4;
-constexpr int8_t SurfaceDefault = 12;
-constexpr int8_t SurfaceTriplePoint = 13;
-constexpr int8_t SurfaceQuadPoint = 14;
+inline constexpr int8_t Unused = 0;
+inline constexpr int8_t Default = 2;
+inline constexpr int8_t TriplePoint = 3;
+inline constexpr int8_t QuadPoint = 4;
+inline constexpr int8_t SurfaceDefault = 12;
+inline constexpr int8_t SurfaceTriplePoint = 13;
+inline constexpr int8_t SurfaceQuadPoint = 14;
 } // namespace NodeType
 namespace NodeId
 {
-constexpr int8_t Unused = -1;
+inline constexpr int8_t Unused = -1;
 }
 } // namespace SurfaceMesh
 
 namespace SolidMeshing
 {
 /* Solid Meshing Related */
-const QString MeshFile("solid_mesh_v5_1.vtk");
-const QString MeshFile2("solid_mesh_v5_2.vtk");
-const QString ElementQualityFile("element_quality_measures_v5.txt");
-const QString VoxelsFile("voxels_v5.txt");
+inline const QString MeshFile("solid_mesh_v5_1.vtk");
+inline const QString MeshFile2("solid_mesh_v5_2.vtk");
+inline const QString ElementQualityFile("element_quality_measures_v5.txt");
+inline const QString VoxelsFile("voxels_v5.txt");
 } // namespace SolidMeshing
 
 namespace Union
 {
 namespace Strings
 {
-const QString And("And");
-const QString Or("Or");
+inline const QString And("And");
+inline const QString Or("Or");
 } // namespace Strings
 enum Enumeration
 {
@@ -1048,10 +1048,10 @@ namespace Comparison
 {
 namespace Strings
 {
-const QString LessThan("<");
-const QString GreaterThan(">");
-const QString Equal("=");
-const QString NotEqual("!=");
+inline const QString LessThan("<");
+inline const QString GreaterThan(">");
+inline const QString Equal("=");
+inline const QString NotEqual("!=");
 } // namespace Strings
 enum Enumeration
 {
@@ -1065,22 +1065,22 @@ enum Enumeration
 
 namespace Layout
 {
-constexpr int32_t Horizontal = 0;
-constexpr int32_t Vertical = 1;
-constexpr int32_t Square = 2;
+inline constexpr int32_t Horizontal = 0;
+inline constexpr int32_t Vertical = 1;
+inline constexpr int32_t Square = 2;
 }; // namespace Layout
 } // namespace SIMPL
 
 namespace Core
 {
-const QString CoreBaseName("Core");
+inline const QString CoreBaseName("Core");
 }
 
 namespace Test
 {
-const QString TestPluginFile("TestPlugin");
-const QString TestPluginDisplayName("Test Plugin");
-const QString TestBaseName("Test");
+inline const QString TestPluginFile("TestPlugin");
+inline const QString TestPluginDisplayName("Test Plugin");
+inline const QString TestBaseName("Test");
 } // namespace Test
 
 Q_DECLARE_METATYPE(SIMPL::NumericTypes::Type)
@@ -1090,15 +1090,15 @@ Q_DECLARE_METATYPE(SIMPL::DelimiterTypes::Type)
 #if 0
 namespace Generic
 {
-  const QString GenericPluginFile("GenericPlugin");
-  const QString GenericPluginDisplayName("Generic Plugin");
-  const QString GenericBaseName("Generic");
+  inline const QString GenericPluginFile("GenericPlugin");
+  inline const QString GenericPluginDisplayName("Generic Plugin");
+  inline const QString GenericBaseName("Generic");
 }
 
 namespace IO
 {
-  const QString IOPluginFile("IOPlugin");
-  const QString IOPluginDisplayName("IO Plugin");
-  const QString IOBaseName("IO");
+  inline const QString IOPluginFile("IOPlugin");
+  inline const QString IOPluginDisplayName("IO Plugin");
+  inline const QString IOBaseName("IO");
 }
 #endif

From adbfe519742f977bb4f89ddb38dbea6b5e2fb602 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 23 Jul 2020 14:45:32 -0400
Subject: [PATCH 262/397] Changing API for hid_t so includes can be moved to
 .cpp files.

This cleans up compile dependencies.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp              |  6 ++++--
 Source/SIMPLib/DataArrays/DataArray.hpp              |  5 ++---
 Source/SIMPLib/DataArrays/IDataArray.cpp             |  2 ++
 Source/SIMPLib/DataArrays/IDataArray.h               |  8 +++-----
 Source/SIMPLib/DataArrays/NeighborList.hpp           |  4 ++--
 Source/SIMPLib/DataArrays/StatsDataArray.cpp         |  4 ++--
 Source/SIMPLib/DataArrays/StatsDataArray.h           |  4 ++--
 Source/SIMPLib/DataArrays/StringDataArray.cpp        |  4 ++--
 Source/SIMPLib/DataArrays/StringDataArray.h          |  4 ++--
 Source/SIMPLib/DataArrays/StructArray.hpp            |  4 ++--
 Source/SIMPLib/DataContainers/AttributeMatrix.cpp    | 11 +++++------
 Source/SIMPLib/DataContainers/AttributeMatrix.h      |  4 +---
 Source/SIMPLib/DataContainers/DataArrayProxy.cpp     |  3 ++-
 Source/SIMPLib/DataContainers/DataArrayProxy.h       |  5 ++---
 Source/SIMPLib/DataContainers/DataContainerArray.cpp |  4 +++-
 Source/SIMPLib/DataContainers/DataContainerArray.h   |  2 +-
 .../SIMPLib/Geometry/CompositeTransformContainer.cpp |  5 +++--
 .../SIMPLib/Geometry/CompositeTransformContainer.h   |  6 ++----
 Source/SIMPLib/Geometry/ITransformContainer.h        |  6 +++---
 Source/SIMPLib/Geometry/TransformContainer.cpp       | 12 ++++++++----
 Source/SIMPLib/Geometry/TransformContainer.h         |  6 ++----
 Source/SIMPLib/Montages/AbstractMontage.h            |  9 ++++-----
 Source/SIMPLib/Montages/GridMontage.cpp              |  4 +++-
 Source/SIMPLib/Montages/GridMontage.h                |  2 +-
 Source/SIMPLib/Montages/MontageSupport.cpp           |  2 ++
 25 files changed, 65 insertions(+), 61 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index e54022ca2e..0a5d65d9e0 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -66,6 +66,8 @@
 #include <iostream>
 #include <numeric>
 
+#include <hdf5.h>
+
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
@@ -1094,7 +1096,7 @@ QString DataArray<T>::getTypeAsString() const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int32_t DataArray<T>::writeH5Data(hid_t parentId, const comp_dims_type& tDims) const
+int32_t DataArray<T>::writeH5Data(const hid_t& parentId, const comp_dims_type& tDims) const
 {
   if(m_Array == nullptr)
   {
@@ -1223,7 +1225,7 @@ QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int32_t DataArray<T>::readH5Data(hid_t parentId)
+int32_t DataArray<T>::readH5Data(const hid_t& parentId)
 {
   int32_t err = 0;
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index c2db472ce3..6c0584217f 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -35,7 +35,6 @@
 
 #pragma once
 
-#include <hdf5.h>
 
 // STL Includes
 #include <cassert>
@@ -502,7 +501,7 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int32_t writeH5Data(hid_t parentId, const comp_dims_type& tDims) const override;
+  int32_t writeH5Data(const hid_t& parentId, const comp_dims_type& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -556,7 +555,7 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int32_t readH5Data(hid_t parentId) override;
+  int32_t readH5Data(const hid_t& parentId) override;
 
   /**
    * @brief
diff --git a/Source/SIMPLib/DataArrays/IDataArray.cpp b/Source/SIMPLib/DataArrays/IDataArray.cpp
index 22b04f9532..68edbe9715 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArray.cpp
@@ -11,6 +11,8 @@
 
 #include "IDataArray.h"
 
+#include <hdf5.h>
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index f4ac8e7d24..86eaee9a5a 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -14,8 +14,6 @@
 #include <memory>
 #include <vector>
 
-#include <hdf5.h>
-
 //--Qt Includes
 #include <QtCore/QString>
 #include <QtCore/QtDebug>
@@ -27,7 +25,7 @@
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
-
+using hid_t = int64_t;
 /**
  * @class IDataArray IDataArray.h PathToHeader/IDataArray.h
  * @brief This class holds a raw pointer to some allocated data that can be stored
@@ -254,14 +252,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
    * @param tDims
    * @return
    */
-  virtual int32_t writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const = 0;
+  virtual int32_t writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const = 0;
 
   /**
    * @brief readH5Data
    * @param parentId
    * @return
    */
-  virtual int32_t readH5Data(hid_t parentId) = 0;
+  virtual int32_t readH5Data(const hid_t& parentId) = 0;
 
   /**
    * @brief writeXdmfAttribute
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 7fc2277dd6..9d3af9a437 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -784,7 +784,7 @@ class NeighborList : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override
   {
     int err = 0;
 
@@ -981,7 +981,7 @@ class NeighborList : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override
+  int readH5Data(const hid_t& parentId) override
   {
     int err = 0;
 
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 42eb329fe8..db7b16630b 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -447,7 +447,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
+int StatsDataArray::writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const
 {
   herr_t err = 0;
   hid_t gid = QH5Utilities::createGroup(parentId, getName());
@@ -481,7 +481,7 @@ int StatsDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::readH5Data(hid_t parentId)
+int StatsDataArray::readH5Data(const hid_t& parentId)
 {
   bool ok = false;
   int err = 0;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 8216729da3..6c4fb0f26d 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -351,14 +351,14 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
+  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief readH5Data
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override;
+  int readH5Data(const hid_t& parentId) override;
 
   /**
    * @brief writeXdmfAttribute
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index fb6a57eb2b..efbb5c0332 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -459,7 +459,7 @@ QString StringDataArray::getFullNameOfClass() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
+int StringDataArray::writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const
 {
   return H5DataArrayWriter::writeStringDataArray<StringDataArray>(parentId, this);
 }
@@ -507,7 +507,7 @@ ToolTipGenerator StringDataArray::getToolTipGenerator() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::readH5Data(hid_t parentId)
+int StringDataArray::readH5Data(const hid_t& parentId)
 {
   int err = 0;
   this->resizeTuples(0);
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 5f3864c585..7b32627044 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -339,7 +339,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
+  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -370,7 +370,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override;
+  int readH5Data(const hid_t& parentId) override;
 
   /**
    * @brief setValue
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 2090d77c71..11fe51fc75 100644
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -705,7 +705,7 @@ class StructArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
+  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override
   {
     Q_ASSERT(false);
     return -1;
@@ -765,7 +765,7 @@ class StructArray : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override
+  int readH5Data(const hid_t& parentId) override
   {
     Q_ASSERT(false);
     int err = -1;
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index ad4faea4b0..1d835ee194 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -33,22 +33,21 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtCore/QTextStream>
-#include <QtCore/QDebug>
-
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 
-// C Includes
-
 // C++ Includes
 #include <fstream>
 #include <iostream>
 
 // HDF5 Includes
+#include <hdf5.h>
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 
+#include <QtCore/QDebug>
+#include <QtCore/QTextStream>
+
 // DREAM3D Includes
 #include "SIMPLib/DataArrays/StatsDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -542,7 +541,7 @@ AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AttributeMatrix::writeAttributeArraysToHDF5(hid_t parentId) const
+int AttributeMatrix::writeAttributeArraysToHDF5(const hid_t& parentId) const
 {
   int err = 0;
 
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index dc066d87d5..93ca47e069 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -43,8 +43,6 @@
 #include <memory>
 #include <vector>
 
-#include <hdf5.h>
-
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QVector>
@@ -596,7 +594,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    * @param parentId
    * @return
    */
-  virtual int writeAttributeArraysToHDF5(hid_t parentId) const;
+  virtual int writeAttributeArraysToHDF5(const hid_t& parentId) const;
 
   /**
    * @brief addAttributeArrayFromHDF5Path
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index 3eedd0134a..2b8aeba306 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -31,6 +31,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataArrayProxy.h"
 
+#include <hdf5.h>
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
@@ -114,7 +115,7 @@ bool DataArrayProxy::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath)
+void DataArrayProxy::ReadDataArrayStructure(const hid_t& attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath)
 {
 
   QList<QString> dataArrayNames;
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index 02c6ce1d7d..9d84d76cc5 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -37,8 +37,6 @@
 
 #include <vector>
 
-#include <hdf5.h>
-
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
 #include <QtCore/QString>
@@ -48,6 +46,7 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 class SIMPLH5DataReaderRequirements;
+using hid_t = int64_t;
 
 /**
  * @brief The DataArrayProxy class
@@ -151,7 +150,7 @@ class SIMPLib_EXPORT DataArrayProxy
    * @param dataArrays
    * @param h5InternalPath
    */
-  static void ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath);
+  static void ReadDataArrayStructure(const hid_t& attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath);
 
   /**
    * @brief Updates the proxy to match a renamed DataArrayPath
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 7c2ab143ad..56c29555ee 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -37,6 +37,8 @@
 
 #include <QtCore/QTextStream>
 
+#include <hdf5.h>
+
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
@@ -238,7 +240,7 @@ void DataContainerArray::printDataContainerNames(QTextStream& out) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs)
+int DataContainerArray::readDataContainersFromHDF5(bool preflight, const hid_t& dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs)
 {
   int err = 0;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index c938a23639..aff80c5f2e 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param obs
    * @return
    */
-  virtual int readDataContainersFromHDF5(bool preflight, hid_t dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs = nullptr);
+  virtual int readDataContainersFromHDF5(bool preflight, const hid_t& dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs = nullptr);
 
   /**
    * @brief setDataContainerBundles
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index ca68cdf5d0..bb2d5567ca 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -37,6 +37,7 @@
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
+
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
 
@@ -47,7 +48,7 @@ CompositeTransformContainer::CompositeTransformContainer() = default;
 // -----------------------------------------------------------------------------
 CompositeTransformContainer::~CompositeTransformContainer() = default;
 
-int CompositeTransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName)
+int CompositeTransformContainer::writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName)
 {
   herr_t err = 0;
 
@@ -84,7 +85,7 @@ int CompositeTransformContainer::writeTransformContainerToHDF5(hid_t parentId, c
   return err;
 }
 
-int CompositeTransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName)
+int CompositeTransformContainer::readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName)
 {
   herr_t err = 0;
 
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index e2eb519479..4b44af83e5 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -38,8 +38,6 @@
 #include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
 
-#include "H5Support/H5Lite.h"
-
 class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
 {
 public:
@@ -64,8 +62,8 @@ class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
   CompositeTransformContainer();
   ~CompositeTransformContainer() override;
   CompositeTransformContainer& operator=(const CompositeTransformContainer&);
-  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
-  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
+  int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) override;
+  int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) override;
   /**
    * @brief Setter property for TransformContainers
    */
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index f6e3fdeb7a..37454d0d41 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -37,7 +37,7 @@
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/SIMPLib.h"
 
-#include <hdf5.h>
+using hid_t = int64_t;
 
 class SIMPLib_EXPORT ITransformContainer : public Observable
 {
@@ -61,8 +61,8 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
   ITransformContainer();
   ~ITransformContainer() override;
 
-  virtual int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) = 0;
-  virtual int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
+  virtual int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) = 0;
+  virtual int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
 
 public:
   ITransformContainer(const ITransformContainer&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/TransformContainer.cpp b/Source/SIMPLib/Geometry/TransformContainer.cpp
index 2606af7be8..ffdefd3794 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/TransformContainer.cpp
@@ -32,14 +32,18 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "TransformContainer.h"
+
 #include "H5Support/H5Lite.h"
+#include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
-#include "SIMPLib/Common/Constants.h"
 
-#include "H5Support/H5ScopedSentinel.h"
+#include "SIMPLib/Common/Constants.h"
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
 TransformContainer::TransformContainer() = default;
 
 // -----------------------------------------------------------------------------
@@ -47,7 +51,7 @@ TransformContainer::TransformContainer() = default;
 // -----------------------------------------------------------------------------
 TransformContainer::~TransformContainer() = default;
 
-int TransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std::string& transformName)
+int TransformContainer::writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformName)
 {
   herr_t err = 0;
   err = H5Utilities::createGroupsFromPath(transformName, parentId);
@@ -99,7 +103,7 @@ int TransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std:
   return err;
 }
 
-int TransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformName)
+int TransformContainer::readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformName)
 {
   herr_t err = 0;
   err = H5Utilities::createGroupsFromPath(transformName, parentId);
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index 5bfd39b87c..529672f99d 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -38,8 +38,6 @@
 #include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
 
-#include "H5Support/H5Lite.h"
-
 class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 {
 public:
@@ -120,9 +118,9 @@ class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 
   TransformContainer& operator=(const TransformContainer&);
 
-  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
+  int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) override;
 
-  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
+  int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) override;
 
 private:
   TransformContainer::TransformParametersType m_Parameters = {};
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
index ff6fe4ad2f..3909ecfe9f 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.h
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -34,12 +34,9 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/INamedObject.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/SIMPLib.h"
-
-#include "H5Support/H5ScopedSentinel.h"
-#include "H5Support/QH5Utilities.h"
 
 class AbstractTileIndex;
 using AbstractTileIndexShPtr = std::shared_ptr<AbstractTileIndex>;
@@ -50,6 +47,8 @@ using DataContainerShPtr = std::shared_ptr<DataContainer>;
 class DataContainerArray;
 using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
 
+using hid_t = int64_t;
+
 /**
  * @brief The AbstractMontage class is the base for the various types of montages and
  * contains the common API between the types.  It does not have access to individual tiles,
@@ -131,7 +130,7 @@ class SIMPLib_EXPORT AbstractMontage : public INamedObject
    * @param groupId
    * @return error code
    */
-  virtual int writeH5Data(hid_t groupId) const = 0;
+  virtual int writeH5Data(const hid_t& groupId) const = 0;
 
   /* -------- Begin iterator support -------- */
   /**
diff --git a/Source/SIMPLib/Montages/GridMontage.cpp b/Source/SIMPLib/Montages/GridMontage.cpp
index beb6d82882..d4483e2399 100644
--- a/Source/SIMPLib/Montages/GridMontage.cpp
+++ b/Source/SIMPLib/Montages/GridMontage.cpp
@@ -35,7 +35,9 @@
 #include <memory>
 #include <typeinfo>
 
+#include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Geometry/IGeometry3D.h"
@@ -572,7 +574,7 @@ QString GridMontage::getInfoString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int GridMontage::writeH5Data(hid_t groupId) const
+int GridMontage::writeH5Data(const hid_t& groupId) const
 {
   hid_t montageId = QH5Utilities::createGroup(groupId, getName());
   // This object will make sure the HDF5 Group id is closed when it goes out of scope.
diff --git a/Source/SIMPLib/Montages/GridMontage.h b/Source/SIMPLib/Montages/GridMontage.h
index 056ac36294..b1f2b74400 100644
--- a/Source/SIMPLib/Montages/GridMontage.h
+++ b/Source/SIMPLib/Montages/GridMontage.h
@@ -247,7 +247,7 @@ class SIMPLib_EXPORT GridMontage : public AbstractMontage
    * @param groupId
    * @return error code
    */
-  int writeH5Data(hid_t groupId) const override;
+  int writeH5Data(const hid_t& groupId) const override;
 
   /**
    * @brief Sets the DataContainer vector for the montage.
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
index 2b420fc236..b17e5e3353 100644
--- a/Source/SIMPLib/Montages/MontageSupport.cpp
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -34,7 +34,9 @@
 
 #include <QtCore/QString>
 
+#include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/H5Utilities.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"

From 7601f73cffb2789f994096604a36eaf67ff5d8f0 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 23 Jul 2020 17:28:46 -0400
Subject: [PATCH 263/397] Use the header file instead of defining the alias for
 hid_t

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/IDataArray.h                | 4 +++-
 Source/SIMPLib/DataContainers/DataArrayProxy.h        | 4 +++-
 Source/SIMPLib/Geometry/CompositeTransformContainer.h | 2 ++
 Source/SIMPLib/Geometry/ITransformContainer.h         | 4 +++-
 Source/SIMPLib/Montages/AbstractMontage.h             | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 86eaee9a5a..69798094a6 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -14,6 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 //--Qt Includes
 #include <QtCore/QString>
 #include <QtCore/QtDebug>
@@ -25,7 +27,7 @@
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
-using hid_t = int64_t;
+
 /**
  * @class IDataArray IDataArray.h PathToHeader/IDataArray.h
  * @brief This class holds a raw pointer to some allocated data that can be stored
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index 9d84d76cc5..16de149887 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -41,12 +41,14 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QString>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
 class SIMPLH5DataReaderRequirements;
-using hid_t = int64_t;
+
 
 /**
  * @brief The DataArrayProxy class
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index 4b44af83e5..cf329c3437 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -35,6 +35,8 @@
 
 #include <memory>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 #include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
 
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index 37454d0d41..a577bfd6dc 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -34,10 +34,12 @@
 
 #include <memory>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/SIMPLib.h"
 
-using hid_t = int64_t;
+
 
 class SIMPLib_EXPORT ITransformContainer : public Observable
 {
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
index 3909ecfe9f..f9873273e7 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.h
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -34,6 +34,8 @@
 
 #include <QtCore/QString>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/INamedObject.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -47,8 +49,6 @@ using DataContainerShPtr = std::shared_ptr<DataContainer>;
 class DataContainerArray;
 using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
 
-using hid_t = int64_t;
-
 /**
  * @brief The AbstractMontage class is the base for the various types of montages and
  * contains the common API between the types.  It does not have access to individual tiles,

From 4b782131978673e8a17402a2708375134c705235 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 24 Jul 2020 10:16:20 -0400
Subject: [PATCH 264/397] Changed function parameters from const hid_t& to
 hid_t

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp                      | 4 ++--
 Source/SIMPLib/DataArrays/DataArray.hpp                      | 4 ++--
 Source/SIMPLib/DataArrays/IDataArray.h                       | 4 ++--
 Source/SIMPLib/DataArrays/NeighborList.hpp                   | 4 ++--
 Source/SIMPLib/DataArrays/StatsDataArray.cpp                 | 4 ++--
 Source/SIMPLib/DataArrays/StatsDataArray.h                   | 4 ++--
 Source/SIMPLib/DataArrays/StringDataArray.cpp                | 4 ++--
 Source/SIMPLib/DataArrays/StringDataArray.h                  | 4 ++--
 Source/SIMPLib/DataArrays/StructArray.hpp                    | 4 ++--
 Source/SIMPLib/DataContainers/AttributeMatrix.cpp            | 2 +-
 Source/SIMPLib/DataContainers/AttributeMatrix.h              | 2 +-
 Source/SIMPLib/DataContainers/DataArrayProxy.cpp             | 2 +-
 Source/SIMPLib/DataContainers/DataArrayProxy.h               | 2 +-
 Source/SIMPLib/DataContainers/DataContainerArray.cpp         | 2 +-
 Source/SIMPLib/DataContainers/DataContainerArray.h           | 2 +-
 Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp | 2 +-
 Source/SIMPLib/FilterParameters/H5FilterParametersReader.h   | 2 +-
 Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp | 4 ++--
 Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h   | 4 ++--
 Source/SIMPLib/Geometry/CompositeTransformContainer.cpp      | 4 ++--
 Source/SIMPLib/Geometry/CompositeTransformContainer.h        | 4 ++--
 Source/SIMPLib/Geometry/ITransformContainer.h                | 4 ++--
 Source/SIMPLib/Geometry/TransformContainer.cpp               | 4 ++--
 Source/SIMPLib/Geometry/TransformContainer.h                 | 4 ++--
 Source/SIMPLib/Montages/AbstractMontage.h                    | 2 +-
 Source/SIMPLib/Montages/GridMontage.cpp                      | 2 +-
 Source/SIMPLib/Montages/GridMontage.h                        | 2 +-
 27 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 0a5d65d9e0..989b14b6c4 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -1096,7 +1096,7 @@ QString DataArray<T>::getTypeAsString() const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int32_t DataArray<T>::writeH5Data(const hid_t& parentId, const comp_dims_type& tDims) const
+int32_t DataArray<T>::writeH5Data(hid_t parentId, const comp_dims_type& tDims) const
 {
   if(m_Array == nullptr)
   {
@@ -1225,7 +1225,7 @@ QString DataArray<T>::getInfoString(SIMPL::InfoStringFormat format) const
 
 // -----------------------------------------------------------------------------
 template <typename T>
-int32_t DataArray<T>::readH5Data(const hid_t& parentId)
+int32_t DataArray<T>::readH5Data(hid_t parentId)
 {
   int32_t err = 0;
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 6c0584217f..11e21de1c7 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -501,7 +501,7 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int32_t writeH5Data(const hid_t& parentId, const comp_dims_type& tDims) const override;
+  int32_t writeH5Data(hid_t parentId, const comp_dims_type& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -555,7 +555,7 @@ class DataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int32_t readH5Data(const hid_t& parentId) override;
+  int32_t readH5Data(hid_t parentId) override;
 
   /**
    * @brief
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 69798094a6..131dc14f87 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -254,14 +254,14 @@ class SIMPLib_EXPORT IDataArray : public IDataStructureNode
    * @param tDims
    * @return
    */
-  virtual int32_t writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const = 0;
+  virtual int32_t writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const = 0;
 
   /**
    * @brief readH5Data
    * @param parentId
    * @return
    */
-  virtual int32_t readH5Data(const hid_t& parentId) = 0;
+  virtual int32_t readH5Data(hid_t parentId) = 0;
 
   /**
    * @brief writeXdmfAttribute
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 9d3af9a437..7fc2277dd6 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -784,7 +784,7 @@ class NeighborList : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
   {
     int err = 0;
 
@@ -981,7 +981,7 @@ class NeighborList : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(const hid_t& parentId) override
+  int readH5Data(hid_t parentId) override
   {
     int err = 0;
 
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index db7b16630b..42eb329fe8 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -447,7 +447,7 @@ void StatsDataArray::printComponent(QTextStream& out, size_t i, int j) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const
+int StatsDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
 {
   herr_t err = 0;
   hid_t gid = QH5Utilities::createGroup(parentId, getName());
@@ -481,7 +481,7 @@ int StatsDataArray::writeH5Data(const hid_t& parentId, const std::vector<size_t>
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StatsDataArray::readH5Data(const hid_t& parentId)
+int StatsDataArray::readH5Data(hid_t parentId)
 {
   bool ok = false;
   int err = 0;
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 6c4fb0f26d..8216729da3 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -351,14 +351,14 @@ class SIMPLib_EXPORT StatsDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override;
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief readH5Data
    * @param parentId
    * @return
    */
-  int readH5Data(const hid_t& parentId) override;
+  int readH5Data(hid_t parentId) override;
 
   /**
    * @brief writeXdmfAttribute
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index efbb5c0332..fb6a57eb2b 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -459,7 +459,7 @@ QString StringDataArray::getFullNameOfClass() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const
+int StringDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
 {
   return H5DataArrayWriter::writeStringDataArray<StringDataArray>(parentId, this);
 }
@@ -507,7 +507,7 @@ ToolTipGenerator StringDataArray::getToolTipGenerator() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int StringDataArray::readH5Data(const hid_t& parentId)
+int StringDataArray::readH5Data(hid_t parentId)
 {
   int err = 0;
   this->resizeTuples(0);
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 7b32627044..5f3864c585 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -339,7 +339,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override;
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -370,7 +370,7 @@ class SIMPLib_EXPORT StringDataArray : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(const hid_t& parentId) override;
+  int readH5Data(hid_t parentId) override;
 
   /**
    * @brief setValue
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 11fe51fc75..2090d77c71 100644
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -705,7 +705,7 @@ class StructArray : public IDataArray
    * @param parentId
    * @return
    */
-  int writeH5Data(const hid_t& parentId, const std::vector<size_t>& tDims) const override
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
   {
     Q_ASSERT(false);
     return -1;
@@ -765,7 +765,7 @@ class StructArray : public IDataArray
    * @param parentId
    * @return
    */
-  int readH5Data(const hid_t& parentId) override
+  int readH5Data(hid_t parentId) override
   {
     Q_ASSERT(false);
     int err = -1;
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 1d835ee194..78de210267 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -541,7 +541,7 @@ AttributeMatrix::Pointer AttributeMatrix::deepCopy(bool forceNoAllocate) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AttributeMatrix::writeAttributeArraysToHDF5(const hid_t& parentId) const
+int AttributeMatrix::writeAttributeArraysToHDF5(hid_t parentId) const
 {
   int err = 0;
 
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 93ca47e069..c8a6f322b7 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -594,7 +594,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
    * @param parentId
    * @return
    */
-  virtual int writeAttributeArraysToHDF5(const hid_t& parentId) const;
+  virtual int writeAttributeArraysToHDF5(hid_t parentId) const;
 
   /**
    * @brief addAttributeArrayFromHDF5Path
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index 2b8aeba306..5cedb490bd 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -115,7 +115,7 @@ bool DataArrayProxy::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayProxy::ReadDataArrayStructure(const hid_t& attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath)
+void DataArrayProxy::ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath)
 {
 
   QList<QString> dataArrayNames;
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index 16de149887..a098f35bf0 100755
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -152,7 +152,7 @@ class SIMPLib_EXPORT DataArrayProxy
    * @param dataArrays
    * @param h5InternalPath
    */
-  static void ReadDataArrayStructure(const hid_t& attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath);
+  static void ReadDataArrayStructure(hid_t attrMatGid, QMap<QString, DataArrayProxy>& dataArrays, SIMPLH5DataReaderRequirements* req, QString h5InternalPath);
 
   /**
    * @brief Updates the proxy to match a renamed DataArrayPath
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 56c29555ee..ba5a190ac0 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -240,7 +240,7 @@ void DataContainerArray::printDataContainerNames(QTextStream& out) const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int DataContainerArray::readDataContainersFromHDF5(bool preflight, const hid_t& dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs)
+int DataContainerArray::readDataContainersFromHDF5(bool preflight, hid_t dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs)
 {
   int err = 0;
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index aff80c5f2e..c938a23639 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -250,7 +250,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    * @param obs
    * @return
    */
-  virtual int readDataContainersFromHDF5(bool preflight, const hid_t& dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs = nullptr);
+  virtual int readDataContainersFromHDF5(bool preflight, hid_t dcaGid, DataContainerArrayProxy& dcaProxy, Observable* obs = nullptr);
 
   /**
    * @brief setDataContainerBundles
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 78f0d3cb3f..84390af5b8 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -1288,7 +1288,7 @@ QString H5FilterParametersReader::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void H5FilterParametersReader::setPipelineGroupId(const hid_t& value)
+void H5FilterParametersReader::setPipelineGroupId(hid_t value)
 {
   m_PipelineGroupId = value;
 }
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index 3060a91840..cdad1a77c9 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -87,7 +87,7 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
   /**
    * @brief Setter property for PipelineGroupId
    */
-  void setPipelineGroupId(const hid_t& value);
+  void setPipelineGroupId(hid_t value);
   /**
    * @brief Getter property for PipelineGroupId
    * @return Value of PipelineGroupId
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 2e9fa662db..cb89a21249 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -852,7 +852,7 @@ QString H5FilterParametersWriter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void H5FilterParametersWriter::setPipelineGroupId(const hid_t& value)
+void H5FilterParametersWriter::setPipelineGroupId(hid_t value)
 {
   m_PipelineGroupId = value;
 }
@@ -864,7 +864,7 @@ hid_t H5FilterParametersWriter::getPipelineGroupId() const
 }
 
 // -----------------------------------------------------------------------------
-void H5FilterParametersWriter::setGroupId(const hid_t& value)
+void H5FilterParametersWriter::setGroupId(hid_t value)
 {
   m_GroupId = value;
 }
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index a3c54e2ac4..9431dc5d48 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -86,7 +86,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
   /**
    * @brief Setter property for PipelineGroupId
    */
-  void setPipelineGroupId(const hid_t& value);
+  void setPipelineGroupId(hid_t value);
   /**
    * @brief Getter property for PipelineGroupId
    * @return Value of PipelineGroupId
@@ -98,7 +98,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
   /**
    * @brief Setter property for GroupId
    */
-  void setGroupId(const hid_t& value);
+  void setGroupId(hid_t value);
   /**
    * @brief Getter property for GroupId
    * @return Value of GroupId
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index bb2d5567ca..4142039065 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -48,7 +48,7 @@ CompositeTransformContainer::CompositeTransformContainer() = default;
 // -----------------------------------------------------------------------------
 CompositeTransformContainer::~CompositeTransformContainer() = default;
 
-int CompositeTransformContainer::writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName)
+int CompositeTransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName)
 {
   herr_t err = 0;
 
@@ -85,7 +85,7 @@ int CompositeTransformContainer::writeTransformContainerToHDF5(const hid_t& pare
   return err;
 }
 
-int CompositeTransformContainer::readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName)
+int CompositeTransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName)
 {
   herr_t err = 0;
 
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index cf329c3437..58d511dae4 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -64,8 +64,8 @@ class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
   CompositeTransformContainer();
   ~CompositeTransformContainer() override;
   CompositeTransformContainer& operator=(const CompositeTransformContainer&);
-  int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) override;
-  int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) override;
+  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
+  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
   /**
    * @brief Setter property for TransformContainers
    */
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index a577bfd6dc..5b9fbf11ae 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -63,8 +63,8 @@ class SIMPLib_EXPORT ITransformContainer : public Observable
   ITransformContainer();
   ~ITransformContainer() override;
 
-  virtual int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) = 0;
-  virtual int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
+  virtual int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) = 0;
+  virtual int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) = 0;
 
 public:
   ITransformContainer(const ITransformContainer&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/TransformContainer.cpp b/Source/SIMPLib/Geometry/TransformContainer.cpp
index ffdefd3794..eb6de371a1 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/TransformContainer.cpp
@@ -51,7 +51,7 @@ TransformContainer::TransformContainer() = default;
 // -----------------------------------------------------------------------------
 TransformContainer::~TransformContainer() = default;
 
-int TransformContainer::writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformName)
+int TransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std::string& transformName)
 {
   herr_t err = 0;
   err = H5Utilities::createGroupsFromPath(transformName, parentId);
@@ -103,7 +103,7 @@ int TransformContainer::writeTransformContainerToHDF5(const hid_t& parentId, con
   return err;
 }
 
-int TransformContainer::readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformName)
+int TransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformName)
 {
   herr_t err = 0;
   err = H5Utilities::createGroupsFromPath(transformName, parentId);
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index 529672f99d..190967e955 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -118,9 +118,9 @@ class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 
   TransformContainer& operator=(const TransformContainer&);
 
-  int writeTransformContainerToHDF5(const hid_t& parentId, const std::string& transformContainerName) override;
+  int writeTransformContainerToHDF5(hid_t parentId, const std::string& transformContainerName) override;
 
-  int readTransformContainerFromHDF5(const hid_t& parentId, bool metaDataOnly, const std::string& transformContainerName) override;
+  int readTransformContainerFromHDF5(hid_t parentId, bool metaDataOnly, const std::string& transformContainerName) override;
 
 private:
   TransformContainer::TransformParametersType m_Parameters = {};
diff --git a/Source/SIMPLib/Montages/AbstractMontage.h b/Source/SIMPLib/Montages/AbstractMontage.h
index f9873273e7..bb7cfa38dd 100644
--- a/Source/SIMPLib/Montages/AbstractMontage.h
+++ b/Source/SIMPLib/Montages/AbstractMontage.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT AbstractMontage : public INamedObject
    * @param groupId
    * @return error code
    */
-  virtual int writeH5Data(const hid_t& groupId) const = 0;
+  virtual int writeH5Data(hid_t groupId) const = 0;
 
   /* -------- Begin iterator support -------- */
   /**
diff --git a/Source/SIMPLib/Montages/GridMontage.cpp b/Source/SIMPLib/Montages/GridMontage.cpp
index d4483e2399..ccf214139e 100644
--- a/Source/SIMPLib/Montages/GridMontage.cpp
+++ b/Source/SIMPLib/Montages/GridMontage.cpp
@@ -574,7 +574,7 @@ QString GridMontage::getInfoString() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int GridMontage::writeH5Data(const hid_t& groupId) const
+int GridMontage::writeH5Data(hid_t groupId) const
 {
   hid_t montageId = QH5Utilities::createGroup(groupId, getName());
   // This object will make sure the HDF5 Group id is closed when it goes out of scope.
diff --git a/Source/SIMPLib/Montages/GridMontage.h b/Source/SIMPLib/Montages/GridMontage.h
index b1f2b74400..056ac36294 100644
--- a/Source/SIMPLib/Montages/GridMontage.h
+++ b/Source/SIMPLib/Montages/GridMontage.h
@@ -247,7 +247,7 @@ class SIMPLib_EXPORT GridMontage : public AbstractMontage
    * @param groupId
    * @return error code
    */
-  int writeH5Data(const hid_t& groupId) const override;
+  int writeH5Data(hid_t groupId) const override;
 
   /**
    * @brief Sets the DataContainer vector for the montage.

From 3d7f067bb147017b3d169e9dd5384b3c2f7fde9e Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 27 Jul 2020 14:33:40 -0400
Subject: [PATCH 265/397] Now use ITK_INCLUDE_DIRS instead of relying on
 IncludeITK.cmake

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Testing/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Testing/CMakeLists.txt b/Source/SIMPLib/Testing/CMakeLists.txt
index 16649b0b97..0d48384a40 100644
--- a/Source/SIMPLib/Testing/CMakeLists.txt
+++ b/Source/SIMPLib/Testing/CMakeLists.txt
@@ -58,7 +58,10 @@ AddSIMPLUnitTest(TESTNAME SIMPLUnitTest
   LINK_LIBRARIES ${LINKED_LIBRARIES}
   INCLUDE_DIRS 
 			${${PLUGIN_NAME}Test_SOURCE_DIR}
-			${${PLUGIN_NAME}Test_BINARY_DIR}
+      ${${PLUGIN_NAME}Test_BINARY_DIR}
+      ${ITK_INCLUDE_DIRS}
+  LINK_LIBRARIES
+      ${ITK_LIBRARIES}
   )
 
 if(MSVC)

From 9a4f87dbc2607df1fae6081e8e1df8f30d8a543c Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 31 Jul 2020 18:45:10 -0400
Subject: [PATCH 266/397] Removing some comments that are not needed any more

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/CombineAttributeMatrices.cpp   | 10 +++++-----
 .../CoreFilters/CopyFeatureArrayToElementArray.cpp     |  6 +++---
 .../CoreFilters/CreateFeatureArrayFromElementArray.cpp |  4 ++--
 Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp    |  4 ++--
 Source/SIMPLib/CoreFilters/FindDerivatives.cpp         |  4 ++--
 .../CoreFilters/LinkFeatureMapToElementArray.cpp       |  8 ++++----
 Source/SIMPLib/CoreFilters/MaskCountDecision.cpp       |  4 ++--
 Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp   |  2 +-
 Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp  |  2 +-
 Source/SIMPLib/DataContainers/DataContainerArray.cpp   |  2 +-
 Source/SIMPLib/DataContainers/DataContainerArray.h     |  2 +-
 Source/SIMPLib/DataContainers/DataStructureUtilities.h |  4 ++--
 Source/SIMPLib/TestFilters/MakeDataContainer.cpp       |  4 ++--
 13 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index d3ca03e951..56e7888af3 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -212,8 +212,8 @@ void CombineAttributeMatrices::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
   m_FirstIndexPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FirstIndexPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(), cDims); 
+  if(nullptr != m_FirstIndexPtr.lock())                                                                           
   {
     m_FirstIndex = m_FirstIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -223,8 +223,8 @@ void CombineAttributeMatrices::dataCheck()
   }
 
   m_SecondIndexPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_SecondIndexPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(), cDims); 
+  if(nullptr != m_SecondIndexPtr.lock())                                                                           
   {
     m_SecondIndex = m_SecondIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -262,7 +262,7 @@ void CombineAttributeMatrices::dataCheck()
 
   tempPath.update(getFirstIndexArrayPath().getDataContainerName(), getFirstIndexArrayPath().getAttributeMatrixName(), getNewIndexArrayName());
   m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>>(this, tempPath, 0, cDims);
-  if(nullptr != m_NewIndexPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  if(nullptr != m_NewIndexPtr.lock()) 
   {
     m_NewIndex = m_NewIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 0370c2c910..005cddf9c7 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -127,13 +127,13 @@ void CopyFeatureArrayToElementArray::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
   m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); 
 
   DataArrayPath tempPath(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), "");
   getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, tempPath, -301);
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 989bbcfc79..654d4c43f0 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -130,8 +130,8 @@ void CreateFeatureArrayFromElementArray::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
   m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 2c4c17c5d2..e290a2d6da 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -108,8 +108,8 @@ void FeatureCountDecision::dataCheck()
   std::vector<size_t> cDims(1, 1);
 
   m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 7e7787f194..5c3a854b53 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -371,8 +371,8 @@ void FindDerivatives::dataCheck()
   std::vector<size_t> dims(1, cDims);
 
   m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(this, getDerivativesArrayPath(), 0, dims, "",
-                                                                                                   DerivativesArrayID); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_DerivativesArrayPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+                                                                                                   DerivativesArrayID); 
+  if(nullptr != m_DerivativesArrayPtr.lock()) 
   {
     m_DerivativesArray = m_DerivativesArrayPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 42bf78569b..c646979f61 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -105,7 +105,7 @@ void LinkFeatureMapToElementArray::updateFeatureInstancePointers()
   clearErrorCode();
   clearWarningCode();
 
-  if(nullptr != m_ActivePtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  if(nullptr != m_ActivePtr.lock()) 
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -138,8 +138,8 @@ void LinkFeatureMapToElementArray::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
   m_SelectedCellDataPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_SelectedCellDataPtr.lock())                                                                       /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(), cDims); 
+  if(nullptr != m_SelectedCellDataPtr.lock())                                                                       
   {
     m_SelectedCellData = m_SelectedCellDataPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -151,7 +151,7 @@ void LinkFeatureMapToElementArray::dataCheck()
 
   tempPath.update(getSelectedCellArrayPath().getDataContainerName(), getCellFeatureAttributeMatrixName(), getActiveArrayName());
   m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, false, cDims, "", DataArrayID);
-  if(nullptr != m_ActivePtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  if(nullptr != m_ActivePtr.lock()) 
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index aa12992d3c..bc5d06371b 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -99,8 +99,8 @@ void MaskCountDecision::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
 
-  m_MaskPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_MaskPtr.lock())                                                                                /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_MaskPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); 
+  if(nullptr != m_MaskPtr.lock())                                                                                
   {
     m_Mask = m_MaskPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index a3471c0534..a9b4f508c3 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -145,7 +145,7 @@ void MultiThresholdObjects::dataCheck()
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(comp.dataContainerName, comp.attributeMatrixName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
-    if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+    if(nullptr != m_DestinationPtr.lock()) 
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
     } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 5824bf8a01..bce2af95a4 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -140,7 +140,7 @@ void MultiThresholdObjects2::dataCheck()
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
-    if(nullptr != m_DestinationPtr.lock()) /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+    if(nullptr != m_DestinationPtr.lock()) 
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
     } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index ba5a190ac0..ffc95ef4ef 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -924,6 +924,6 @@ IDataArray::Pointer DataContainerArray::getPrereqIDataArrayFromPath(AbstractFilt
     return dataArray;
   }
 
-  dataArray = attrMat->getPrereqIDataArray(filter, daName, -90002); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+  dataArray = attrMat->getPrereqIDataArray(filter, daName, -90002); 
   return dataArray;
 }
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index c938a23639..f0bdca05f7 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -509,7 +509,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       return dataArray;
     }
 
-    dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); 
     return dataArray;
   }
 
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
index 1c0eb212f4..d3ea3adc8a 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.h
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -206,7 +206,7 @@ class SIMPLib_EXPORT DataStructureUtilities
       return dataArray;
     }
 
-    dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims); 
     return dataArray;
   }
 
@@ -271,7 +271,7 @@ class SIMPLib_EXPORT DataStructureUtilities
       return dataArray;
     }
 
-    dataArray = std::dynamic_pointer_cast<ArrayType>(attrMat->getPrereqIDataArray(filter, daName, -90002)); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
+    dataArray = std::dynamic_pointer_cast<ArrayType>(attrMat->getPrereqIDataArray(filter, daName, -90002)); 
     return dataArray;
   }
 
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 5ff7a1ee28..924b504425 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -131,8 +131,8 @@ void MakeDataContainer::dataCheck()
   //  }
 
   std::vector<size_t> dims(1, 1);
-  m_FeatureIdsPtr = cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); /* Assigns the shared_ptr<> to an instance variable that is a weak_ptr<> */
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                          /* Validate the Weak Pointer wraps a non-nullptr pointer to a DataArray<T> object */
+  m_FeatureIdsPtr = cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); 
+  if(nullptr != m_FeatureIdsPtr.lock())                                                                          
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
   }

From ae3326d1d76df2b60d2333f12a0e865114666593 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 4 Aug 2020 22:11:24 -0400
Subject: [PATCH 267/397] Updated usage of HDFTypeForPrimitiveAsStr for API
 changes

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp     | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index 5e1d37f8dc..fcdfdd4593 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -55,8 +55,6 @@ class ImportHDF5DatasetTest
   template <typename T>
   herr_t writePointer1DArrayDataset(hid_t loc_id)
   {
-
-    T value = 0x0;
     herr_t err = 1;
     int32_t rank = 1;
     // Create the Dimensions
@@ -72,7 +70,7 @@ class ImportHDF5DatasetTest
       data[i] = static_cast<T>(i * 5);
     }
 
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
+    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>();
     dsetName = "Pointer1DArrayDataset<" + dsetName + ">";
     err = QH5Lite::writePointerDataset(loc_id, dsetName, rank, dims, &(data.front()));
     DREAM3D_REQUIRE(err >= 0);
@@ -86,8 +84,6 @@ class ImportHDF5DatasetTest
   template <typename T>
   herr_t writePointer2DArrayDataset(hid_t loc_id)
   {
-
-    T value = 0x0;
     herr_t err = 1;
     int32_t rank = 2;
     // Create the Dimensions
@@ -104,7 +100,7 @@ class ImportHDF5DatasetTest
       data[i] = static_cast<T>(i * 5);
     }
 
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
+    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>();
     dsetName = "Pointer2DArrayDataset<" + dsetName + ">";
     err = QH5Lite::writePointerDataset(loc_id, dsetName, rank, dims, &(data.front()));
     DREAM3D_REQUIRE(err >= 0);
@@ -118,8 +114,6 @@ class ImportHDF5DatasetTest
   template <typename T>
   herr_t writePointer3DArrayDataset(hid_t loc_id)
   {
-
-    T value = 0x0;
     herr_t err = 1;
     int32_t rank = 3;
     // Create the Dimensions
@@ -137,7 +131,7 @@ class ImportHDF5DatasetTest
       data[i] = static_cast<T>(i * 5);
     }
 
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
+    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>();
     dsetName = "Pointer3DArrayDataset<" + dsetName + ">";
     err = QH5Lite::writePointerDataset(loc_id, dsetName, rank, dims, &(data.front()));
     DREAM3D_REQUIRE(err >= 0);
@@ -151,8 +145,6 @@ class ImportHDF5DatasetTest
   template <typename T>
   herr_t writePointer4DArrayDataset(hid_t loc_id)
   {
-
-    T value = 0x0;
     herr_t err = 1;
     int32_t rank = 4;
     // Create the Dimensions
@@ -171,7 +163,7 @@ class ImportHDF5DatasetTest
       data[i] = static_cast<T>(i * 5);
     }
 
-    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr(value);
+    QString dsetName = QH5Lite::HDFTypeForPrimitiveAsStr<T>();
     dsetName = "Pointer4DArrayDataset<" + dsetName + ">";
     err = QH5Lite::writePointerDataset(loc_id, dsetName, rank, dims, &(data.front()));
     DREAM3D_REQUIRE(err >= 0);
@@ -299,8 +291,7 @@ class ImportHDF5DatasetTest
 
     // Fill in Dataset Path with a valid path so that we can continue our error checks
     importInfoList.clear();
-    int8_t dummyVal = 0x0;
-    QString typeStr = QH5Lite::HDFTypeForPrimitiveAsStr(dummyVal);
+    QString typeStr = QH5Lite::HDFTypeForPrimitiveAsStr<int8_t>();
     importInfo.dataSetPath = "Pointer/Pointer1DArrayDataset<" + typeStr + ">";
     importInfoList.push_back(importInfo);
     filter->setDatasetImportInfoList(importInfoList);
@@ -370,8 +361,7 @@ class ImportHDF5DatasetTest
       return;
     }
 
-    T value = 0x0;
-    QString typeStr = QH5Lite::HDFTypeForPrimitiveAsStr(value);
+    QString typeStr = QH5Lite::HDFTypeForPrimitiveAsStr<T>();
 
     DataContainerArray::Pointer dca = createDataContainerArray(amDims);
     filter->setDataContainerArray(dca);

From dccf715ff07575ed14203255aa580231fe79be08 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 10 Aug 2020 11:25:35 -0400
Subject: [PATCH 268/397] Include directive cleanups to have less dependencies
 on H5Lite and NeighborList

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.hpp       |    2 +
 Source/SIMPLib/DataArrays/NeighborList.cpp    | 1026 +++++++++++++++++
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  937 ++-------------
 Source/SIMPLib/DataArrays/SourceList.cmake    |    2 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |    2 +
 Source/SIMPLib/DataArrays/StringDataArray.h   |    2 -
 .../SIMPLib/DataContainers/DataContainer.cpp  |    4 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |    1 -
 Source/SIMPLib/Geometry/VertexGeom.cpp        |    1 +
 Source/SIMPLib/Geometry/VertexGeom.h          |    1 -
 Source/SIMPLib/Montages/MontageSupport.cpp    |    1 +
 Source/SIMPLib/Montages/MontageSupport.h      |    3 +-
 12 files changed, 1122 insertions(+), 860 deletions(-)
 create mode 100644 Source/SIMPLib/DataArrays/NeighborList.cpp

diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 11e21de1c7..1c1bc68b1e 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -45,6 +45,8 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "H5Support/H5SupportTypeDefs.h"
+
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
diff --git a/Source/SIMPLib/DataArrays/NeighborList.cpp b/Source/SIMPLib/DataArrays/NeighborList.cpp
new file mode 100644
index 0000000000..0da1cc9c15
--- /dev/null
+++ b/Source/SIMPLib/DataArrays/NeighborList.cpp
@@ -0,0 +1,1026 @@
+#include "NeighborList.hpp"
+
+#include <QtCore/QMap>
+#include <QtCore/QTextStream>
+
+#include "H5Support/H5Lite.h"
+#include "H5Support/H5Utilities.h"
+#include "H5Support/QH5Lite.h"
+
+#include "SIMPLib/Common/Constants.h"
+
+#include "SIMPLib/DataArrays/DataArray.hpp"
+
+// -----------------------------------------------------------------------------
+template <typename T>
+NeighborList<T>::NeighborList(size_t numTuples, const QString name)
+: IDataArray(name)
+, m_NumTuples(numTuples)
+, m_IsAllocated(false)
+{
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::getNameOfClass() const
+{
+  return QString("NeighborList<T>");
+}
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::ClassName()
+{
+  return QString("NeighborList<T>");
+}
+// -----------------------------------------------------------------------------
+template <typename T>
+int32_t NeighborList<T>::getClassVersion() const
+{
+  return 2;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::setNumNeighborsArrayName(const QString& name)
+{
+  m_NumNeighborsArrayName = name;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::getNumNeighborsArrayName()
+{
+  return m_NumNeighborsArrayName;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::New()
+{
+  return CreateArray(0, std::string("NeighborList"), false);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::CreateArray(size_t numTuples, const QString& name, bool allocate)
+{
+  // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  NeighborList<T>::Pointer ptr = Pointer(new NeighborList<T>(numTuples, name));
+  if(allocate)
+  {
+    ptr->resizeTuples(numTuples);
+  }
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::CreateArray(size_t numTuples, const std::string& name, bool allocate)
+{
+  // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+  if(name.empty())
+  {
+    return NullPointer();
+  }
+  NeighborList<T>::Pointer ptr = Pointer(new NeighborList<T>(numTuples, QString::fromStdString(name)));
+  if(allocate)
+  {
+    ptr->resizeTuples(numTuples);
+  }
+  return ptr;
+}
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate)
+{
+  // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+
+  size_t numElements = numTuples;
+  for(int iter = 0; iter < rank; iter++)
+  {
+    numElements *= dims[iter];
+  }
+  NeighborList<T>::Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+  if(allocate)
+  {
+    ptr->resizeTuples(numElements);
+  }
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  size_t numElements = std::accumulate(cDims.begin(), cDims.end(), numTuples, std::multiplies<>());
+
+  NeighborList<T>::Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+  if(allocate)
+  {
+    ptr->resizeTuples(numElements);
+  }
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::Pointer NeighborList<T>::CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate)
+{
+  if(name.isEmpty())
+  {
+    return NullPointer();
+  }
+  size_t numElements = tDims[0];
+  for(int iter = 1; iter < tDims.size(); iter++)
+  {
+    numElements *= tDims[iter];
+  }
+  for(int iter = 0; iter < cDims.size(); iter++)
+  {
+    numElements *= cDims[iter];
+  }
+  NeighborList<T>::Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
+  if(allocate)
+  {
+    ptr->resizeTuples(numElements);
+  }
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+IDataArray::Pointer NeighborList<T>::createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate) const
+{
+  return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+IDataArray::Pointer NeighborList<T>::createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate) const
+{
+  return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
+}
+
+/**
+ * @brief isAllocated
+ * @return
+ */
+// -----------------------------------------------------------------------------
+template <typename T>
+bool NeighborList<T>::isAllocated() const
+{
+  return true;
+}
+
+/**
+ * @brief Gives this array a human readable name
+ * @param name The name of this array
+ */
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::setInitValue(T initValue)
+{
+  m_InitValue = initValue;
+}
+
+/**
+ * @brief Sets all the values to value.
+ */
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::initializeWithValue(T initValue, size_t offset)
+{
+}
+
+/**
+ * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
+ * can be a primitive like char, float, int or the name of a class.
+ * @return
+ */
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
+{
+  T value = 0x00;
+  xdmfTypeName = "UNKNOWN";
+  precision = 0;
+  if(typeid(value) == typeid(int8_t))
+  {
+    xdmfTypeName = "Char";
+    precision = 1;
+  }
+  if(typeid(value) == typeid(uint8_t))
+  {
+    xdmfTypeName = "UChar";
+    precision = 1;
+  }
+
+  if(typeid(value) == typeid(int16_t))
+  {
+    xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
+    precision = 0;
+  }
+  if(typeid(value) == typeid(uint16_t))
+  {
+    xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
+    precision = 0;
+  }
+
+  if(typeid(value) == typeid(int32_t))
+  {
+    xdmfTypeName = "Int";
+    precision = 4;
+  }
+  if(typeid(value) == typeid(uint32_t))
+  {
+    xdmfTypeName = "UInt";
+    precision = 4;
+  }
+
+  if(typeid(value) == typeid(int64_t))
+  {
+    xdmfTypeName = "Int";
+    precision = 8;
+  }
+  if(typeid(value) == typeid(uint64_t))
+  {
+    xdmfTypeName = "UInt";
+    precision = 8;
+  }
+
+  if(typeid(value) == typeid(float))
+  {
+    xdmfTypeName = "Float";
+    precision = 4;
+  }
+  if(typeid(value) == typeid(double))
+  {
+    xdmfTypeName = "Float";
+    precision = 8;
+  }
+
+  if(typeid(value) == typeid(bool))
+  {
+    xdmfTypeName = "uchar";
+    precision = 1;
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::getTypeAsString() const
+{
+  return NeighborList<T>::ClassName();
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::takeOwnership()
+{
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::releaseOwnership()
+{
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void* NeighborList<T>::getVoidPointer(size_t i)
+{
+  return nullptr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::eraseTuples(const std::vector<size_t>& idxs)
+{
+  int err = 0;
+  // If nothing is to be erased just return
+  if(idxs.empty())
+  {
+    return 0;
+  }
+
+  size_t idxsSize = static_cast<size_t>(idxs.size());
+  if(idxsSize >= getNumberOfTuples())
+  {
+    resizeTuples(0);
+    return 0;
+  }
+
+  size_t arraySize = m_Array.size();
+  // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
+  // off the end of the array and return an error code.
+  for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
+  {
+    if(idxs[i] >= arraySize)
+    {
+      return -100;
+    }
+  }
+
+  std::vector<SharedVectorType> replacement(arraySize - idxsSize);
+
+  size_t idxsIndex = 0;
+  size_t rIdx = 0;
+  for(size_t dIdx = 0; dIdx < arraySize; ++dIdx)
+  {
+    if(dIdx != idxs[idxsIndex])
+    {
+      replacement[rIdx] = m_Array[dIdx];
+      ++rIdx;
+    }
+    else
+    {
+      ++idxsIndex;
+      if(idxsIndex == idxsSize)
+      {
+        idxsIndex--;
+      }
+    }
+  }
+  m_Array = replacement;
+  m_NumTuples = m_Array.size();
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::copyTuple(size_t currentPos, size_t newPos)
+{
+  m_Array[newPos] = m_Array[currentPos];
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+bool NeighborList<T>::copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples)
+{
+  if(!m_IsAllocated)
+  {
+    return false;
+  }
+  if(destTupleOffset >= m_Array.size())
+  {
+    return false;
+  }
+  if(!sourceArray->isAllocated())
+  {
+    return false;
+  }
+  const Self* source = dynamic_cast<const Self*>(sourceArray.get());
+
+  if(source == nullptr)
+  {
+    return false;
+  }
+
+  if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
+  {
+    return false;
+  }
+
+  if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
+  {
+    return false;
+  }
+
+  if(totalSrcTuples * sourceArray->getNumberOfComponents() + destTupleOffset * getNumberOfComponents() > m_Array.size())
+  {
+    return false;
+  }
+
+  for(size_t i = srcTupleOffset; i < srcTupleOffset + totalSrcTuples; i++)
+  {
+    m_Array[destTupleOffset + i] = source->getList(i);
+  }
+  return true;
+
+  //      if(!m_IsAllocated) { return false; }
+  //      if(nullptr == m_Array) { return false; }
+  //      if(destTupleOffset > m_MaxId) { return false; }
+  //      if(!sourceArray->isAllocated()) { return false; }
+  //      Self* source = dynamic_cast<Self*>(sourceArray.get());
+  //      if(nullptr == source->getPointer(0)) { return false; }
+
+  //      if(sourceArray->getNumberOfComponents() != getNumberOfComponents()) { return false; }
+
+  //      if (srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples()) { return false; }
+
+  //      if( totalSrcTuples*sourceArray->getNumberOfComponents() + destTupleOffset*getNumberOfComponents() > m_Size) { return false; }
+
+  //      size_t elementStart = destTupleOffset*getNumberOfComponents();
+  //      size_t totalBytes = (totalSrcTuples*sourceArray->getNumberOfComponents()) * sizeof(T);
+  //      std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * sourceArray->getNumberOfComponents()), totalBytes);
+  //      return true;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::initializeTuple(size_t i, const void* p)
+{
+  Q_UNUSED(i);
+  Q_UNUSED(p);
+  Q_ASSERT(false);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t NeighborList<T>::getNumberOfTuples() const
+{
+  return m_NumTuples;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t NeighborList<T>::getSize() const
+{
+  size_t total = 0;
+  for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+  {
+    total += m_Array[dIdx]->size();
+  }
+  return total;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::setNumberOfComponents(int nc)
+{
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::getNumberOfComponents() const
+{
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+std::vector<size_t> NeighborList<T>::getComponentDimensions() const
+{
+  std::vector<size_t> dims = {1};
+  return dims;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::SetRank(int rnk)
+{
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::getRank() const
+{
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+size_t NeighborList<T>::getTypeSize() const
+{
+  return sizeof(SharedVectorType);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::initializeWithZeros()
+{
+  m_Array.clear();
+  m_IsAllocated = false;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+IDataArray::Pointer NeighborList<T>::deepCopy(bool forceNoAllocate) const
+{
+  bool allocate = m_IsAllocated;
+  if(forceNoAllocate)
+  {
+    allocate = false;
+  }
+
+  typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), allocate);
+
+  if(m_IsAllocated && !forceNoAllocate)
+  {
+    size_t count = (m_IsAllocated ? getNumberOfTuples() : 0);
+    for(size_t i = 0; i < count; i++)
+    {
+      typename NeighborList<T>::SharedVectorType sharedNeiLst(new std::vector<T>(*(m_Array[i])));
+      daCopyPtr->setList(static_cast<int>(i), sharedNeiLst);
+    }
+  }
+  return daCopyPtr;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int32_t NeighborList<T>::resizeTotalElements(size_t size)
+{
+  // std::cout << "NeighborList::resizeTotalElements(" << size << ")" << std::endl;
+  size_t old = m_Array.size();
+  m_Array.resize(size);
+  m_NumTuples = size;
+  if(size == 0)
+  {
+    m_IsAllocated = false;
+  }
+  else
+  {
+    m_IsAllocated = true;
+  }
+  // Initialize with zero length Vectors
+  for(size_t i = old; i < m_Array.size(); ++i)
+  {
+    m_Array[i] = SharedVectorType(new VectorType);
+  }
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::resizeTuples(size_t numTuples)
+{
+  resizeTotalElements(numTuples);
+}
+
+// FIXME: These need to be implemented
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::printTuple(QTextStream& out, size_t i, char delimiter) const
+{
+  SharedVectorType sharedVec = m_Array[i];
+  VectorType* vec = sharedVec.get();
+  size_t size = vec->size();
+  out << size;
+  for(size_t j = 0; j < size; j++)
+  {
+    out << delimiter << vec->at(j);
+  }
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::printComponent(QTextStream& out, size_t i, int j) const
+{
+  Q_ASSERT(false);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const
+{
+  int err = 0;
+
+  // Generate the NumNeighbors array and also compute the total number
+  // of elements that would be needed to flatten the array so we
+  // can compare this with what is written in the file. If they are
+  // different we are going to overwrite what is in the file with what
+  // we compute here.
+
+  QString numNeighborsArrayName = m_NumNeighborsArrayName;
+
+  if(numNeighborsArrayName.isEmpty())
+  {
+    numNeighborsArrayName = getName() + "_NumNeighbors";
+  }
+
+  Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), numNeighborsArrayName, true);
+  int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
+  size_t total = 0;
+  for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+  {
+    numNeighbors[dIdx] = static_cast<int32_t>(m_Array[dIdx]->size());
+    total += m_Array[dIdx]->size();
+  }
+
+  // Check to see if the NumNeighbors is already written to the file
+  bool rewrite = false;
+  if(!QH5Lite::datasetExists(parentId, numNeighborsArrayName))
+  {
+    // The NumNeighbors Array is NOT already in the file so write it to the file
+    numNeighborsPtr->writeH5Data(parentId, tDims);
+  }
+  else
+  {
+    // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
+    // we have in memory.
+    std::vector<int32_t> fileNumNeigh(m_Array.size());
+    err = H5Lite::readVectorDataset(parentId, numNeighborsArrayName.toStdString(), fileNumNeigh);
+    if(err < 0)
+    {
+      return -602;
+    }
+
+    // Compare the 2 vectors to make sure they are exactly the same;
+    if(fileNumNeigh.size() != numNeighborsPtr->getNumberOfTuples())
+    {
+      rewrite = true;
+    }
+    // The sizes are the same, now compare each value;
+    int32_t* fileNumNeiPtr = &(fileNumNeigh.front());
+    size_t nBytes = numNeighborsPtr->getNumberOfTuples() * sizeof(int32_t);
+    if(::memcmp(numNeighbors, fileNumNeiPtr, nBytes) != 0)
+    {
+      rewrite = true;
+    }
+  }
+
+  // Write out the NumNeighbors Array because something was different between what we computed at
+  // the top of the function versus what is in memory
+  if(rewrite)
+  {
+    numNeighborsPtr->writeH5Data(parentId, tDims);
+  }
+
+  // Allocate an array of the proper size so we can concatenate all the arrays together into a single array that
+  // can be written to the HDF5 File. This operation can ballon the memory size temporarily until this operation
+  // is complete.
+  QVector<T> flat(total);
+  size_t currentStart = 0;
+  for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
+  {
+    size_t nEle = m_Array[dIdx]->size();
+    if(nEle == 0)
+    {
+      continue;
+    }
+    T* start = m_Array[dIdx]->data(); // get theNeighborList<T>::Pointer to the front of the array
+    //    T* end = start + nEle; // get theNeighborList<T>::Pointer to the end of the array
+    T* dst = flat.data() + currentStart;
+    ::memcpy(dst, start, nEle * sizeof(T));
+
+    currentStart += m_Array[dIdx]->size();
+  }
+
+  // Now we can actually write the actual array data.
+  int32_t rank = 1;
+  hsize_t dims[1] = {total};
+  if(total > 0)
+  {
+    err = QH5Lite::writePointerDataset(parentId, getName(), rank, dims, flat.data());
+    if(err < 0)
+    {
+      return -605;
+    }
+
+    err = QH5Lite::writeScalarAttribute(parentId, getName(), SIMPL::HDF5::DataArrayVersion, getClassVersion());
+    if(err < 0)
+    {
+      return -604;
+    }
+    err = QH5Lite::writeStringAttribute(parentId, getName(), SIMPL::HDF5::ObjectType, getNameOfClass());
+    if(err < 0)
+    {
+      return -607;
+    }
+
+    // Write the tuple dimensions as an attribute
+    hsize_t size = tDims.size();
+    err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
+    if(err < 0)
+    {
+      return -609;
+    }
+
+    std::vector<size_t> cDims = getComponentDimensions();
+    // write the component dimensions as  an attribute
+    size = cDims.size();
+    err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
+    if(err < 0)
+    {
+      return -610;
+    }
+
+    err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
+    if(err < 0)
+    {
+      return -608;
+    }
+  }
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const
+{
+  int precision = 0;
+  QString xdmfTypeName;
+  getXdmfTypeAndSize(xdmfTypeName, precision);
+
+  out << "    <Attribute Name=\"" << getName() << label << "\" AttributeType=\"Scalar\" Center=\"Node\">";
+  out << "      <DataItem Format=\"HDF\" Dimensions=\"" << volDims[0] << " " << volDims[1] << " " << volDims[2] << "\" ";
+  out << "NumberType=\"" << xdmfTypeName << "\" "
+      << "Precision=\"" << precision << "\" >";
+  out << "        " << hdfFileName.toLatin1().data() << groupPath.toLatin1().data() << "/" << getName();
+  out << "      </DataItem>";
+  out << "    </Attribute>";
+  return 1;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+ToolTipGenerator NeighborList<T>::getToolTipGenerator() const
+{
+  ToolTipGenerator toolTipGen;
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  toolTipGen.addTitle("Attribute Array Info");
+  toolTipGen.addValue("Name", getName());
+  toolTipGen.addValue("Type", getTypeAsString());
+  toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
+  toolTipGen.addValue("Number of Lists", usa.toString(static_cast<qlonglong>(getNumberOfLists())));
+
+  return toolTipGen;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::getInfoString(SIMPL::InfoStringFormat format) const
+{
+  if(format == SIMPL::HtmlFormat)
+  {
+    return getToolTipGenerator().generateHTML();
+  }
+  else
+  {
+  }
+  return QString();
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::readH5Data(hid_t parentId)
+{
+  int err = 0;
+
+  std::vector<T> flat;
+  err = QH5Lite::readVectorDataset(parentId, getName(), flat);
+  if(err < 0)
+  {
+    return err;
+  }
+
+  QString numNeighborsArrayName = m_NumNeighborsArrayName;
+
+  if(numNeighborsArrayName.isEmpty())
+  {
+    numNeighborsArrayName = getName() + "_NumNeighbors";
+  }
+
+  // Read the Attribute Off the data set to find the name of the array that holds all the sizes
+  err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
+  if(err < 0)
+  {
+    return err;
+  }
+  // Generate the number of neighbors array and also compute the total number
+  // of elements that would be needed to flatten the array
+  std::vector<int32_t> numNeighbors;
+
+  // Check to see if the NumNeighbors exists in the file, which it must.
+  if(QH5Lite::datasetExists(parentId, numNeighborsArrayName))
+  {
+    err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, numNeighbors);
+    if(err < 0)
+    {
+      return -702;
+    }
+  }
+  else
+  {
+    return -703;
+  }
+
+  // int32_t totalElements = std::accumulate(numNeighbors.begin(), numNeighbors.end(), 0);
+
+  // Loop over all the entries and make new Vectors to hold the incoming data
+  m_Array.resize(numNeighbors.size());
+  m_IsAllocated = true;
+  size_t currentStart = 0;
+  qint32 count = static_cast<qint32>(numNeighbors.size());
+  for(QVector<int32_t>::size_type dIdx = 0; dIdx < count; ++dIdx)
+  {
+    size_t nEle = numNeighbors[dIdx];
+    if(nEle > 0)
+    {
+      m_Array[dIdx] = SharedVectorType(new VectorType(numNeighbors[dIdx]));
+
+      T* dst = m_Array[dIdx]->data(); // get theNeighborList<T>::Pointer to the front of the array
+      //    T* end = start + nEle; // get theNeighborList<T>::Pointer to the end of the array
+      T* start = flat.data() + currentStart;
+      ::memcpy(dst, start, nEle * sizeof(T));
+      currentStart += nEle;
+    }
+    else
+    {
+      m_Array[dIdx] = SharedVectorType(new VectorType(0));
+    }
+  }
+  m_NumTuples = m_Array.size(); // Sync up the numTuples property with the size of the internal array
+  return err;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::addEntry(int grainId, T value)
+{
+  if(grainId >= static_cast<int>(m_Array.size()))
+  {
+    size_t old = m_Array.size();
+    m_Array.resize(grainId + 1);
+    m_IsAllocated = true;
+    // Initialize with zero length Vectors
+    for(size_t i = old; i < m_Array.size(); ++i)
+    {
+      m_Array[i] = SharedVectorType(new VectorType);
+    }
+  }
+  m_Array[grainId]->push_back(value);
+  m_NumTuples = m_Array.size();
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::clearAllLists()
+{
+  m_Array.clear();
+  m_IsAllocated = false;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void NeighborList<T>::setList(int grainId, SharedVectorType neighborList)
+{
+  if(grainId >= static_cast<int>(m_Array.size()))
+  {
+    size_t old = m_Array.size();
+    m_Array.resize(grainId + 1);
+    m_IsAllocated = true;
+    // Initialize with zero length Vectors
+    for(size_t i = old; i < m_Array.size(); ++i)
+    {
+      m_Array[i] = SharedVectorType(new VectorType);
+    }
+  }
+  m_Array[grainId] = neighborList;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+T NeighborList<T>::getValue(int grainId, int index, bool& ok) const
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+  SharedVectorType vec = m_Array[grainId];
+  if(index < 0 || static_cast<size_t>(index) >= vec->size())
+  {
+    ok = false;
+    return -1;
+  }
+  return (*vec)[index];
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::getNumberOfLists() const
+{
+  return static_cast<int>(m_Array.size());
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+int NeighborList<T>::getListSize(int grainId) const
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+  return static_cast<int>(m_Array[grainId]->size());
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::VectorType& NeighborList<T>::getListReference(int grainId) const
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+  return *(m_Array[grainId]);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::SharedVectorType NeighborList<T>::getList(int grainId) const
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+  return m_Array[grainId];
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::VectorType NeighborList<T>::copyOfList(int grainId) const
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+
+  VectorType copy(*(m_Array[grainId]));
+  return copy;
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::VectorType& NeighborList<T>::operator[](int grainId)
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0u)
+  {
+    Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
+  }
+#endif
+  return *(m_Array[grainId]);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+typename NeighborList<T>::VectorType& NeighborList<T>::operator[](size_t grainId)
+{
+#ifndef NDEBUG
+  if(m_Array.size() > 0ul)
+  {
+    Q_ASSERT(grainId < m_Array.size());
+  }
+#endif
+  return *(m_Array[grainId]);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+#if !defined(__APPLE__) && !defined(_MSC_VER)
+#undef SIMPLib_EXPORT
+#define SIMPLib_EXPORT
+#endif
+
+template class SIMPLib_EXPORT NeighborList<char>;
+
+template class SIMPLib_EXPORT NeighborList<int8_t>;
+template class SIMPLib_EXPORT NeighborList<uint8_t>;
+
+template class SIMPLib_EXPORT NeighborList<int16_t>;
+template class SIMPLib_EXPORT NeighborList<uint16_t>;
+
+template class SIMPLib_EXPORT NeighborList<int32_t>;
+template class SIMPLib_EXPORT NeighborList<uint32_t>;
+
+template class SIMPLib_EXPORT NeighborList<int64_t>;
+template class SIMPLib_EXPORT NeighborList<uint64_t>;
+
+template class SIMPLib_EXPORT NeighborList<float>;
+template class SIMPLib_EXPORT NeighborList<double>;
+
+#if defined(__APPLE__) || defined(_MSC_VER)
+template class SIMPLib_EXPORT NeighborList<size_t>;
+#endif
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 7fc2277dd6..53bb14aca1 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -35,20 +35,16 @@
 
 #pragma once
 
+#include <cstdint>
 #include <vector>
+#include <memory>
 
 #include <QtCore/QString>
-#include <QtCore/QMap>
-#include <QtCore/QTextStream>
 
-#include "H5Support/H5Lite.h"
-#include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Lite.h"
+#include "H5Support/H5SupportTypeDefs.h"
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @class NeighborList NeighborList.hpp DREAM3DLib/Common/NeighborList.hpp
@@ -66,51 +62,31 @@ class NeighborList : public IDataArray
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  static Pointer NullPointer()
-  {
-    return Pointer(static_cast<Self*>(nullptr));
-  }
+
+  static Pointer NullPointer();
 
   using value_type = T;
 
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
-  QString getNameOfClass() const override
-  {
-    return QString("NeighborList<T>");
-  }
+  QString getNameOfClass() const override;
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
-  static QString ClassName()
-  {
-    return QString("NeighborList<T>");
-  }
+  static QString ClassName();
 
   /**
    * @brief Returns the version of this class.
    * @return
    */
-  int32_t getClassVersion() const override
-  {
-    return 2;
-  }
-
-  void setNumNeighborsArrayName(const QString& name)
-  {
-    m_NumNeighborsArrayName = name;
-  }
-
-  QString getNumNeighborsArrayName()
-  {
-    return m_NumNeighborsArrayName;
-  }
-
-  static Pointer New()
-  {
-    return CreateArray(0, std::string("NeighborList"), false);
-  }
+  int32_t getClassVersion() const override;
+
+  void setNumNeighborsArrayName(const QString& name);
+
+  QString getNumNeighborsArrayName();
+
+  static Pointer New();
 
   /**
    * @brief CreateArray
@@ -119,20 +95,7 @@ class NeighborList : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true)
-  {
-    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    Pointer ptr = Pointer(new NeighborList<T>(numTuples, name));
-    if(allocate)
-    {
-      ptr->resizeTuples(numTuples);
-    }
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, const QString& name, bool allocate = true);
   /**
    * @brief CreateArray
    * @param numTuples
@@ -140,20 +103,7 @@ class NeighborList : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, const std::string& name, bool allocate = true)
-  {
-    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
-    if(name.empty())
-    {
-      return NullPointer();
-    }
-    Pointer ptr = Pointer(new NeighborList<T>(numTuples, QString::fromStdString(name)));
-    if(allocate)
-    {
-      ptr->resizeTuples(numTuples);
-    }
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, const std::string& name, bool allocate = true);
 
   /**
    * @brief CreateArray
@@ -164,26 +114,7 @@ class NeighborList : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true)
-  {
-    // std::cout << "NeighborList::CreateArray  name= " << name.toStdString() << "   numTuples= " << numTuples << std::endl;
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-
-    size_t numElements = numTuples;
-    for(int iter = 0; iter < rank; iter++)
-    {
-      numElements *= dims[iter];
-    }
-    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-    if(allocate)
-    {
-      ptr->resizeTuples(numElements);
-    }
-    return ptr;
-  }
+  static Pointer CreateArray(size_t numTuples, int rank, const size_t* dims, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateArray
@@ -193,48 +124,7 @@ class NeighborList : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    size_t numElements = std::accumulate(cDims.begin(), cDims.end(), numTuples, std::multiplies<>());
-
-    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-    if(allocate)
-    {
-      ptr->resizeTuples(numElements);
-    }
-    return ptr;
-  }
-
-  /**
-   * @brief CreateArray
-   * @param numTuples
-   * @param cDims
-   * @param name
-   * @param allocate
-   * @return
-   */
-  //    static Pointer CreateArray(size_t numTuples, std::vector<size_t> cDims, const QString& name, bool allocate = true)
-  //    {
-  //      if(name.isEmpty())
-  //      {
-  //        return NullPointer();
-  //      }
-  //      size_t numElements = numTuples;
-  //      for(int iter = 0; iter < cDims.size(); iter++)
-  //      {
-  //        numElements *= cDims[iter];
-  //      }
-  //      Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-  //      if(allocate)
-  //      {
-  //        ptr->resizeTuples(numElements);
-  //      }
-  //      return ptr;
-  //    }
+  static Pointer CreateArray(size_t numTuples, const std::vector<size_t>& cDims, const QString& name, bool allocate = true);
 
   /**
    * @brief CreateArray
@@ -244,28 +134,7 @@ class NeighborList : public IDataArray
    * @param allocate
    * @return
    */
-  static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate = true)
-  {
-    if(name.isEmpty())
-    {
-      return NullPointer();
-    }
-    size_t numElements = tDims[0];
-    for(int iter = 1; iter < tDims.size(); iter++)
-    {
-      numElements *= tDims[iter];
-    }
-    for(int iter = 0; iter < cDims.size(); iter++)
-    {
-      numElements *= cDims[iter];
-    }
-    Pointer ptr = Pointer(new NeighborList<T>(numElements, name));
-    if(allocate)
-    {
-      ptr->resizeTuples(numElements);
-    }
-    return ptr;
-  }
+  static Pointer CreateArray(const std::vector<size_t>& tDims, const std::vector<size_t>& cDims, const QString& name, bool allocate);
 
   /**
    * @brief createNewArray
@@ -275,10 +144,7 @@ class NeighborList : public IDataArray
    * @param name
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override
-  {
-    return NeighborList<T>::CreateArray(numElements, rank, dims, name, allocate);
-  }
+  IDataArray::Pointer createNewArray(size_t numElements, int rank, const size_t* dims, const QString& name, bool allocate = true) const override;
 
   /**
    * @brief createNewArray
@@ -287,22 +153,8 @@ class NeighborList : public IDataArray
    * @param name
    * @return
    */
-  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override
-  {
-    return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
-  }
+  IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override;
 
-  /**
-   * @brief createNewArray
-   * @param numElements
-   * @param dims
-   * @param name
-   * @return
-   */
-  //    IDataArray::Pointer createNewArray(size_t numElements, std::vector<size_t> dims, const QString& name, bool allocate = true) override
-  //    {
-  //      return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
-  //    }
 
   using VectorType = std::vector<T>;
   using SharedVectorType = std::shared_ptr<VectorType>;
@@ -314,131 +166,47 @@ class NeighborList : public IDataArray
    * @brief isAllocated
    * @return
    */
-  bool isAllocated() const override
-  {
-    return true;
-  }
+  bool isAllocated() const override;
 
   /**
    * @brief Gives this array a human readable name
    * @param name The name of this array
    */
-  virtual void setInitValue(T initValue)
-  {
-    m_InitValue = initValue;
-  }
+  virtual void setInitValue(T initValue);
 
   /**
    * @brief Sets all the values to value.
    */
-  virtual void initializeWithValue(T initValue, size_t offset = 0)
-  {
-  }
-
+  virtual void initializeWithValue(T initValue, size_t offset = 0);
   /**
    * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
    * can be a primitive like char, float, int or the name of a class.
    * @return
    */
-  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override
-  {
-    T value = 0x00;
-    xdmfTypeName = "UNKNOWN";
-    precision = 0;
-    if(typeid(value) == typeid(int8_t))
-    {
-      xdmfTypeName = "Char";
-      precision = 1;
-    }
-    if(typeid(value) == typeid(uint8_t))
-    {
-      xdmfTypeName = "UChar";
-      precision = 1;
-    }
-
-    if(typeid(value) == typeid(int16_t))
-    {
-      xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
-      precision = 0;
-    }
-    if(typeid(value) == typeid(uint16_t))
-    {
-      xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
-      precision = 0;
-    }
-
-    if(typeid(value) == typeid(int32_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 4;
-    }
-    if(typeid(value) == typeid(uint32_t))
-    {
-      xdmfTypeName = "UInt";
-      precision = 4;
-    }
-
-    if(typeid(value) == typeid(int64_t))
-    {
-      xdmfTypeName = "Int";
-      precision = 8;
-    }
-    if(typeid(value) == typeid(uint64_t))
-    {
-      xdmfTypeName = "UInt";
-      precision = 8;
-    }
-
-    if(typeid(value) == typeid(float))
-    {
-      xdmfTypeName = "Float";
-      precision = 4;
-    }
-    if(typeid(value) == typeid(double))
-    {
-      xdmfTypeName = "Float";
-      precision = 8;
-    }
-
-    if(typeid(value) == typeid(bool))
-    {
-      xdmfTypeName = "uchar";
-      precision = 1;
-    }
-  }
+  void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
 
   /**
    * @brief getTypeAsString
    * @return
    */
-  QString getTypeAsString() const override
-  {
-    return NeighborList<T>::ClassName();
-  }
+  QString getTypeAsString() const override;
 
   /**
    * @brief takeOwnership
    */
-  void takeOwnership() override
-  {
-  }
+  void takeOwnership() override;
 
   /**
    * @brief releaseOwnership
    */
-  void releaseOwnership() override
-  {
-  }
+  void releaseOwnership() override;
 
   /**
    * @brief getVoidPointer
    * @param i
    * @return
    */
-  void* getVoidPointer(size_t i) override
-  {
-    return nullptr;
-  }
+  void* getVoidPointer(size_t i) override;
 
   /**
    * @brief Removes Tuples from the Array. If the size of the vector is Zero nothing is done. If the size of the
@@ -448,57 +216,7 @@ class NeighborList : public IDataArray
    * @param idxs The indices to remove
    * @return error code.
    */
-  int eraseTuples(const std::vector<size_t>& idxs) override
-  {
-    int err = 0;
-    // If nothing is to be erased just return
-    if(idxs.empty())
-    {
-      return 0;
-    }
-
-    size_t idxsSize = static_cast<size_t>(idxs.size());
-    if(idxsSize >= getNumberOfTuples())
-    {
-      resizeTuples(0);
-      return 0;
-    }
-
-    size_t arraySize = m_Array.size();
-    // Sanity Check the Indices in the vector to make sure we are not trying to remove any indices that are
-    // off the end of the array and return an error code.
-    for(std::vector<size_t>::size_type i = 0; i < idxs.size(); ++i)
-    {
-      if(idxs[i] >= arraySize)
-      {
-        return -100;
-      }
-    }
-
-    std::vector<SharedVectorType> replacement(arraySize - idxsSize);
-
-    size_t idxsIndex = 0;
-    size_t rIdx = 0;
-    for(size_t dIdx = 0; dIdx < arraySize; ++dIdx)
-    {
-      if(dIdx != idxs[idxsIndex])
-      {
-        replacement[rIdx] = m_Array[dIdx];
-        ++rIdx;
-      }
-      else
-      {
-        ++idxsIndex;
-        if(idxsIndex == idxsSize)
-        {
-          idxsIndex--;
-        }
-      }
-    }
-    m_Array = replacement;
-    m_NumTuples = m_Array.size();
-    return err;
-  }
+  int eraseTuples(const std::vector<size_t>& idxs) override;
 
   /**
    * @brief copyTuple
@@ -506,11 +224,7 @@ class NeighborList : public IDataArray
    * @param newPos
    * @return
    */
-  int copyTuple(size_t currentPos, size_t newPos) override
-  {
-    m_Array[newPos] = m_Array[currentPos];
-    return 0;
-  }
+  int copyTuple(size_t currentPos, size_t newPos) override;
 
   // This line must be here, because we are overloading the copyData pure virtual function in IDataArray.
   // This is required so that other classes can call this version of copyData from the subclasses.
@@ -535,238 +249,88 @@ class NeighborList : public IDataArray
    * @param sourceArray
    * @return
    */
-  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override
-  {
-    if(!m_IsAllocated)
-    {
-      return false;
-    }
-    if(destTupleOffset >= m_Array.size())
-    {
-      return false;
-    }
-    if(!sourceArray->isAllocated())
-    {
-      return false;
-    }
-    const Self* source = dynamic_cast<const Self*>(sourceArray.get());
-
-    if(source == nullptr)
-    {
-      return false;
-    }
-
-    if(sourceArray->getNumberOfComponents() != getNumberOfComponents())
-    {
-      return false;
-    }
-
-    if(srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples())
-    {
-      return false;
-    }
-
-    if(totalSrcTuples * sourceArray->getNumberOfComponents() + destTupleOffset * getNumberOfComponents() > m_Array.size())
-    {
-      return false;
-    }
-
-    for(size_t i = srcTupleOffset; i < srcTupleOffset + totalSrcTuples; i++)
-    {
-      m_Array[destTupleOffset + i] = source->getList(i);
-    }
-    return true;
-
-    //      if(!m_IsAllocated) { return false; }
-    //      if(nullptr == m_Array) { return false; }
-    //      if(destTupleOffset > m_MaxId) { return false; }
-    //      if(!sourceArray->isAllocated()) { return false; }
-    //      Self* source = dynamic_cast<Self*>(sourceArray.get());
-    //      if(nullptr == source->getPointer(0)) { return false; }
-
-    //      if(sourceArray->getNumberOfComponents() != getNumberOfComponents()) { return false; }
-
-    //      if (srcTupleOffset + totalSrcTuples > sourceArray->getNumberOfTuples()) { return false; }
-
-    //      if( totalSrcTuples*sourceArray->getNumberOfComponents() + destTupleOffset*getNumberOfComponents() > m_Size) { return false; }
-
-    //      size_t elementStart = destTupleOffset*getNumberOfComponents();
-    //      size_t totalBytes = (totalSrcTuples*sourceArray->getNumberOfComponents()) * sizeof(T);
-    //      std::memcpy(m_Array + elementStart, source->getPointer(srcTupleOffset * sourceArray->getNumberOfComponents()), totalBytes);
-    //      return true;
-  }
+  bool copyFromArray(size_t destTupleOffset, IDataArray::ConstPointer sourceArray, size_t srcTupleOffset, size_t totalSrcTuples) override;
 
   /**
    * @brief Splats the same value c across all values in the Tuple
    * @param i The index of the Tuple
    * @param c The value to splat across all components in the tuple
    */
-  void initializeTuple(size_t i, const void* p) override
-  {
-    Q_UNUSED(i);
-    Q_UNUSED(p);
-    Q_ASSERT(false);
-  }
-
+  void initializeTuple(size_t i, const void* p) override;
   /**
    * @brief Returns the number of elements in the internal array.
    */
-  size_t getNumberOfTuples() const override
-  {
-    return m_NumTuples;
-  }
+  size_t getNumberOfTuples() const override;
 
   /**
    * @brief getSize Returns the total number of data items that are being stored. This is the sum of all the sizes
    * of the internal storage arrays for this class.
    * @return
    */
-  size_t getSize() const override
-  {
-    size_t total = 0;
-    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
-    {
-      total += m_Array[dIdx]->size();
-    }
-    return total;
-  }
+  size_t getSize() const override;
 
   /**
    * @brief setNumberOfComponents
    * @param nc
    */
-  void setNumberOfComponents(int nc)
-  {
-  }
+  void setNumberOfComponents(int nc);
 
   /**
    * @brief getNumberOfComponents
    * @return
    */
-  int getNumberOfComponents() const override
-  {
-    return 1;
-  }
+  int getNumberOfComponents() const override;
 
   /**
    * @brief getComponentDimensions
    * @return
    */
-  std::vector<size_t> getComponentDimensions() const override
-  {
-    std::vector<size_t> dims = {1};
-    return dims;
-  }
+  std::vector<size_t> getComponentDimensions() const override;
 
   /**
    * @brief SetRank
    * @param rnk
    */
-  void SetRank(int rnk)
-  {
-  }
+  void SetRank(int rnk);
 
   /**
    * @brief getRank
    * @return
    */
-  int getRank() const
-  {
-    return 1;
-  }
+  int getRank() const;
 
   /**
    * @brief getTypeSize
    * @return
    */
-  size_t getTypeSize() const override
-  {
-    return sizeof(SharedVectorType);
-  }
+  size_t getTypeSize() const override;
 
   /**
    * @brief initializeWithZeros
    */
-  void initializeWithZeros() override
-  {
-    m_Array.clear();
-    m_IsAllocated = false;
-  }
+  void initializeWithZeros() override;
 
   /**
    * @brief deepCopy
    * @return
    */
-  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override
-  {
-    bool allocate = m_IsAllocated;
-    if(forceNoAllocate)
-    {
-      allocate = false;
-    }
-
-    typename NeighborList<T>::Pointer daCopyPtr = NeighborList<T>::CreateArray(getNumberOfTuples(), getName(), allocate);
-
-    if(m_IsAllocated && !forceNoAllocate)
-    {
-      size_t count = (m_IsAllocated ? getNumberOfTuples() : 0);
-      for(size_t i = 0; i < count; i++)
-      {
-        typename NeighborList<T>::SharedVectorType sharedNeiLst(new std::vector<T>(*(m_Array[i])));
-        daCopyPtr->setList(static_cast<int>(i), sharedNeiLst);
-      }
-    }
-    return daCopyPtr;
-  }
+  IDataArray::Pointer deepCopy(bool forceNoAllocate = false) const override;
 
   /**
    * @brief resizeTotalElements
    * @param size
    * @return
    */
-  int32_t resizeTotalElements(size_t size) override
-  {
-    // std::cout << "NeighborList::resizeTotalElements(" << size << ")" << std::endl;
-    size_t old = m_Array.size();
-    m_Array.resize(size);
-    m_NumTuples = size;
-    if(size == 0)
-    {
-      m_IsAllocated = false;
-    }
-    else
-    {
-      m_IsAllocated = true;
-    }
-    // Initialize with zero length Vectors
-    for(size_t i = old; i < m_Array.size(); ++i)
-    {
-      m_Array[i] = SharedVectorType(new VectorType);
-    }
-    return 1;
-  }
+  int32_t resizeTotalElements(size_t size) override;
 
   /**
    * @brief Resizes the internal array to accomondate numTuples
    * @param numTuples
    */
-  void resizeTuples(size_t numTuples) override
-  {
-    resizeTotalElements(numTuples);
-  }
+  void resizeTuples(size_t numTuples) override;
 
   // FIXME: These need to be implemented
-  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override
-  {
-    SharedVectorType sharedVec = m_Array[i];
-    VectorType* vec = sharedVec.get();
-    size_t size = vec->size();
-    out << size;
-    for(size_t j = 0; j < size; j++)
-    {
-      out << delimiter << vec->at(j);
-    }
-  }
+  void printTuple(QTextStream& out, size_t i, char delimiter = ',') const override;
 
   /**
    * @brief printComponent
@@ -774,148 +338,14 @@ class NeighborList : public IDataArray
    * @param i
    * @param j
    */
-  void printComponent(QTextStream& out, size_t i, int j) const override
-  {
-    Q_ASSERT(false);
-  }
+  void printComponent(QTextStream& out, size_t i, int j) const override;
 
   /**
    *
    * @param parentId
    * @return
    */
-  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override
-  {
-    int err = 0;
-
-    // Generate the NumNeighbors array and also compute the total number
-    // of elements that would be needed to flatten the array so we
-    // can compare this with what is written in the file. If they are
-    // different we are going to overwrite what is in the file with what
-    // we compute here.
-
-    QString numNeighborsArrayName = m_NumNeighborsArrayName;
-
-    if(numNeighborsArrayName.isEmpty())
-    {
-      numNeighborsArrayName = getName() + "_NumNeighbors";
-    }
-
-    Int32ArrayType::Pointer numNeighborsPtr = Int32ArrayType::CreateArray(m_Array.size(), numNeighborsArrayName, true);
-    int32_t* numNeighbors = numNeighborsPtr->getPointer(0);
-    size_t total = 0;
-    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
-    {
-      numNeighbors[dIdx] = static_cast<int32_t>(m_Array[dIdx]->size());
-      total += m_Array[dIdx]->size();
-    }
-
-    // Check to see if the NumNeighbors is already written to the file
-    bool rewrite = false;
-    if(!QH5Lite::datasetExists(parentId, numNeighborsArrayName))
-    {
-      // The NumNeighbors Array is NOT already in the file so write it to the file
-      numNeighborsPtr->writeH5Data(parentId, tDims);
-    }
-    else
-    {
-      // The NumNeighbors array is in the dream3d file so read it up into memory and compare with what
-      // we have in memory.
-      std::vector<int32_t> fileNumNeigh(m_Array.size());
-      err = H5Lite::readVectorDataset(parentId, numNeighborsArrayName.toStdString(), fileNumNeigh);
-      if(err < 0)
-      {
-        return -602;
-      }
-
-      // Compare the 2 vectors to make sure they are exactly the same;
-      if(fileNumNeigh.size() != numNeighborsPtr->getNumberOfTuples())
-      {
-        rewrite = true;
-      }
-      // The sizes are the same, now compare each value;
-      int32_t* fileNumNeiPtr = &(fileNumNeigh.front());
-      size_t nBytes = numNeighborsPtr->getNumberOfTuples() * sizeof(int32_t);
-      if(::memcmp(numNeighbors, fileNumNeiPtr, nBytes) != 0)
-      {
-        rewrite = true;
-      }
-    }
-
-    // Write out the NumNeighbors Array because something was different between what we computed at
-    // the top of the function versus what is in memory
-    if(rewrite)
-    {
-      numNeighborsPtr->writeH5Data(parentId, tDims);
-    }
-
-    // Allocate an array of the proper size so we can concatenate all the arrays together into a single array that
-    // can be written to the HDF5 File. This operation can ballon the memory size temporarily until this operation
-    // is complete.
-    QVector<T> flat(total);
-    size_t currentStart = 0;
-    for(size_t dIdx = 0; dIdx < m_Array.size(); ++dIdx)
-    {
-      size_t nEle = m_Array[dIdx]->size();
-      if(nEle == 0)
-      {
-        continue;
-      }
-      T* start = m_Array[dIdx]->data(); // get the pointer to the front of the array
-      //    T* end = start + nEle; // get the pointer to the end of the array
-      T* dst = flat.data() + currentStart;
-      ::memcpy(dst, start, nEle * sizeof(T));
-
-      currentStart += m_Array[dIdx]->size();
-    }
-
-    // Now we can actually write the actual array data.
-    int32_t rank = 1;
-    hsize_t dims[1] = {total};
-    if(total > 0)
-    {
-      err = QH5Lite::writePointerDataset(parentId, getName(), rank, dims, flat.data());
-      if(err < 0)
-      {
-        return -605;
-      }
-
-      err = QH5Lite::writeScalarAttribute(parentId, getName(), SIMPL::HDF5::DataArrayVersion, getClassVersion());
-      if(err < 0)
-      {
-        return -604;
-      }
-      err = QH5Lite::writeStringAttribute(parentId, getName(), SIMPL::HDF5::ObjectType, getNameOfClass());
-      if(err < 0)
-      {
-        return -607;
-      }
-
-      // Write the tuple dimensions as an attribute
-      hsize_t size = tDims.size();
-      err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::TupleDimensions, 1, &size, tDims.data());
-      if(err < 0)
-      {
-        return -609;
-      }
-
-      std::vector<size_t> cDims = getComponentDimensions();
-      // write the component dimensions as  an attribute
-      size = cDims.size();
-      err = QH5Lite::writePointerAttribute(parentId, getName(), SIMPL::HDF5::ComponentDimensions, 1, &size, cDims.data());
-      if(err < 0)
-      {
-        return -610;
-      }
-
-      err = QH5Lite::writeStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
-      if(err < 0)
-      {
-        return -608;
-      }
-    }
-    return err;
-  }
+  int writeH5Data(hid_t parentId, const std::vector<size_t>& tDims) const override;
 
   /**
    * @brief writeXdmfAttribute
@@ -925,184 +355,46 @@ class NeighborList : public IDataArray
    * @param groupPath
    * @return
    */
-  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override
-  {
-    int precision = 0;
-    QString xdmfTypeName;
-    getXdmfTypeAndSize(xdmfTypeName, precision);
-
-    out << "    <Attribute Name=\"" << getName() << label << "\" AttributeType=\"Scalar\" Center=\"Node\">";
-    out << "      <DataItem Format=\"HDF\" Dimensions=\"" << volDims[0] << " " << volDims[1] << " " << volDims[2] << "\" ";
-    out << "NumberType=\"" << xdmfTypeName << "\" "
-        << "Precision=\"" << precision << "\" >";
-    out << "        " << hdfFileName.toLatin1().data() << groupPath.toLatin1().data() << "/" << getName();
-    out << "      </DataItem>";
-    out << "    </Attribute>";
-    return 1;
-  }
+  int writeXdmfAttribute(QTextStream& out, const int64_t* volDims, const QString& hdfFileName, const QString& groupPath, const QString& label) const override;
 
   /**
    * @brief Returns a ToolTipGenerator for creating HTML tooltip tables
    * with values populated to match the current DataArray.
    * @return
    */
-  ToolTipGenerator getToolTipGenerator() const override
-  {
-    ToolTipGenerator toolTipGen;
-    QLocale usa(QLocale::English, QLocale::UnitedStates);
-
-    toolTipGen.addTitle("Attribute Array Info");
-    toolTipGen.addValue("Name", getName());
-    toolTipGen.addValue("Type", getTypeAsString());
-    toolTipGen.addValue("Number of Tuples", usa.toString(static_cast<qlonglong>(getNumberOfTuples())));
-    toolTipGen.addValue("Number of Lists", usa.toString(static_cast<qlonglong>(getNumberOfLists())));
-
-    return toolTipGen;
-  }
+  ToolTipGenerator getToolTipGenerator() const override;
 
   /**
    * @brief getInfoString
    * @return Returns a formatted string that contains general infomation about
    * the instance of the object.
    */
-  QString getInfoString(SIMPL::InfoStringFormat format) const override
-  {
-    if(format == SIMPL::HtmlFormat)
-    {
-      return getToolTipGenerator().generateHTML();
-    }
-    else
-    {
-    }
-    return QString();
-  }
+  QString getInfoString(SIMPL::InfoStringFormat format) const override;
   /**
    *
    * @param parentId
    * @return
    */
-  int readH5Data(hid_t parentId) override
-  {
-    int err = 0;
-
-    std::vector<T> flat;
-    err = QH5Lite::readVectorDataset(parentId, getName(), flat);
-    if(err < 0)
-    {
-      return err;
-    }
-
-    QString numNeighborsArrayName = m_NumNeighborsArrayName;
-
-    if(numNeighborsArrayName.isEmpty())
-    {
-      numNeighborsArrayName = getName() + "_NumNeighbors";
-    }
-
-    // Read the Attribute Off the data set to find the name of the array that holds all the sizes
-    err = QH5Lite::readStringAttribute(parentId, getName(), "Linked NumNeighbors Dataset", numNeighborsArrayName);
-    if(err < 0)
-    {
-      return err;
-    }
-    // Generate the number of neighbors array and also compute the total number
-    // of elements that would be needed to flatten the array
-    std::vector<int32_t> numNeighbors;
-
-    // Check to see if the NumNeighbors exists in the file, which it must.
-    if(QH5Lite::datasetExists(parentId, numNeighborsArrayName))
-    {
-      err = QH5Lite::readVectorDataset(parentId, numNeighborsArrayName, numNeighbors);
-      if(err < 0)
-      {
-        return -702;
-      }
-    }
-    else
-    {
-      return -703;
-    }
-
-    // int32_t totalElements = std::accumulate(numNeighbors.begin(), numNeighbors.end(), 0);
-
-    // Loop over all the entries and make new Vectors to hold the incoming data
-    m_Array.resize(numNeighbors.size());
-    m_IsAllocated = true;
-    size_t currentStart = 0;
-    qint32 count = static_cast<qint32>(numNeighbors.size());
-    for(QVector<int32_t>::size_type dIdx = 0; dIdx < count; ++dIdx)
-    {
-      size_t nEle = numNeighbors[dIdx];
-      if(nEle > 0)
-      {
-        m_Array[dIdx] = SharedVectorType(new VectorType(numNeighbors[dIdx]));
-
-        T* dst = m_Array[dIdx]->data(); // get the pointer to the front of the array
-        //    T* end = start + nEle; // get the pointer to the end of the array
-        T* start = flat.data() + currentStart;
-        ::memcpy(dst, start, nEle * sizeof(T));
-        currentStart += nEle;
-      }
-      else
-      {
-        m_Array[dIdx] = SharedVectorType(new VectorType(0));
-      }
-    }
-    m_NumTuples = m_Array.size(); // Sync up the numTuples property with the size of the internal array
-    return err;
-  }
+  int readH5Data(hid_t parentId) override;
 
   /**
    * @brief addEntry
    * @param grainId
    * @param value
    */
-  void addEntry(int grainId, T value)
-  {
-    if(grainId >= static_cast<int>(m_Array.size()))
-    {
-      size_t old = m_Array.size();
-      m_Array.resize(grainId + 1);
-      m_IsAllocated = true;
-      // Initialize with zero length Vectors
-      for(size_t i = old; i < m_Array.size(); ++i)
-      {
-        m_Array[i] = SharedVectorType(new VectorType);
-      }
-    }
-    m_Array[grainId]->push_back(value);
-    m_NumTuples = m_Array.size();
-  }
+  void addEntry(int grainId, T value);
 
   /**
    * @brief clearAllLists
    */
-  void clearAllLists()
-  {
-    m_Array.clear();
-    m_IsAllocated = false;
-  }
+  void clearAllLists();
 
   /**
    * @brief setList
    * @param grainId
    * @param neighborList
    */
-  void setList(int grainId, SharedVectorType neighborList)
-  {
-    if(grainId >= static_cast<int>(m_Array.size()))
-    {
-      size_t old = m_Array.size();
-      m_Array.resize(grainId + 1);
-      m_IsAllocated = true;
-      // Initialize with zero length Vectors
-      for(size_t i = old; i < m_Array.size(); ++i)
-      {
-        m_Array[i] = SharedVectorType(new VectorType);
-      }
-    }
-    m_Array[grainId] = neighborList;
-  }
+  void setList(int grainId, SharedVectorType neighborList);
 
   /**
    * @brief getValue
@@ -1111,135 +403,56 @@ class NeighborList : public IDataArray
    * @param ok
    * @return
    */
-  T getValue(int grainId, int index, bool& ok) const
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-    SharedVectorType vec = m_Array[grainId];
-    if(index < 0 || static_cast<size_t>(index) >= vec->size())
-    {
-      ok = false;
-      return -1;
-    }
-    return (*vec)[index];
-  }
+  T getValue(int grainId, int index, bool& ok) const;
 
   /**
    * @brief getNumberOfLists
    * @return
    */
-  int getNumberOfLists() const
-  {
-    return static_cast<int>(m_Array.size());
-  }
+  int getNumberOfLists() const;
 
   /**
    * @brief getListSize
    * @param grainId
    * @return
    */
-  int getListSize(int grainId) const
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-    return static_cast<int>(m_Array[grainId]->size());
-  }
-
-  VectorType& getListReference(int grainId) const
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-    return *(m_Array[grainId]);
-  }
+  int getListSize(int grainId) const;
+
+  VectorType& getListReference(int grainId) const;
 
   /**
    * @brief getList
    * @param grainId
    * @return
    */
-  SharedVectorType getList(int grainId) const
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-    return m_Array[grainId];
-  }
+  SharedVectorType getList(int grainId) const;
 
   /**
    * @brief copyOfList
    * @param grainId
    * @return
    */
-  VectorType copyOfList(int grainId) const
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-
-    VectorType copy(*(m_Array[grainId]));
-    return copy;
-  }
+  VectorType copyOfList(int grainId) const;
 
   /**
    * @brief operator []
    * @param grainId
    * @return
    */
-  VectorType& operator[](int grainId)
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0u)
-    {
-      Q_ASSERT(grainId < static_cast<int>(m_Array.size()));
-    }
-#endif
-    return *(m_Array[grainId]);
-  }
+  VectorType& operator[](int grainId);
 
   /**
    * @brief operator []
    * @param grainId
    * @return
    */
-  VectorType& operator[](size_t grainId)
-  {
-#ifndef NDEBUG
-    if(m_Array.size() > 0ul)
-    {
-      Q_ASSERT(grainId < m_Array.size());
-    }
-#endif
-    return *(m_Array[grainId]);
-  }
+  VectorType& operator[](size_t grainId);
 
 protected:
   /**
    * @brief NeighborList
    */
-  NeighborList(size_t numTuples, const QString name)
-  : IDataArray(name)
-  , m_NumTuples(numTuples)
-  , m_IsAllocated(false)
-  {
-  }
+  NeighborList(size_t numTuples, const QString name);
 
 private:
   QString m_NumNeighborsArrayName;
@@ -1257,3 +470,23 @@ class NeighborList : public IDataArray
 
 using Int32NeighborListType = NeighborList<int32_t>;
 using FloatNeighborListType = NeighborList<float>;
+
+// -----------------------------------------------------------------------------
+// Declare our extern templates
+
+extern template class NeighborList<char>;
+extern template class NeighborList<unsigned char>;
+
+extern template class NeighborList<int8_t>;
+extern template class NeighborList<uint8_t>;
+extern template class NeighborList<int16_t>;
+extern template class NeighborList<uint16_t>;
+extern template class NeighborList<int32_t>;
+extern template class NeighborList<uint32_t>;
+extern template class NeighborList<int64_t>;
+extern template class NeighborList<uint64_t>;
+
+extern template class NeighborList<float>;
+extern template class NeighborList<double>;
+
+extern template class NeighborList<size_t>;
diff --git a/Source/SIMPLib/DataArrays/SourceList.cmake b/Source/SIMPLib/DataArrays/SourceList.cmake
index 1e5be31f3e..7535a33ba9 100755
--- a/Source/SIMPLib/DataArrays/SourceList.cmake
+++ b/Source/SIMPLib/DataArrays/SourceList.cmake
@@ -19,11 +19,11 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/IDataArrayFilter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StatsDataArray.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/StringDataArray.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/NeighborList.cpp
 )
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
 cmp_IDE_SOURCE_PROPERTIES( "Generated/${SUBDIR_NAME}" "" "${SIMPLib_${SUBDIR_NAME}_Generated_MOC_SRCS}" "0")
 
-message(STATUS "SIMPL_BUILD_TESTING: ${SIMPL_BUILD_TESTING}")
 #-------------------------------------------------------------------------------
 # Add the unit testing sources
 # -------------------------------------------------------------------- 
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index fb6a57eb2b..bd362164d8 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -36,6 +36,8 @@
 
 #include <QtCore/QTextStream>
 
+#include "H5Support/H5Lite.h"
+
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 5f3864c585..29d2e3b2db 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -42,8 +42,6 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
-#include "H5Support/H5Lite.h"
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 9c4f4cdb3c..02fa66aabc 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -39,10 +39,12 @@
 
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
+#include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -52,9 +54,9 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index 40b9be5c01..b43d959f34 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -32,7 +32,6 @@
 #pragma once
 
 #include <memory>
-
 #include <cmath>
 #include <map>
 #include <set>
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index a9034666e6..07266725db 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -44,6 +44,7 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index cf278a08f4..606a9149cf 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -42,7 +42,6 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
index b17e5e3353..6c69d742aa 100644
--- a/Source/SIMPLib/Montages/MontageSupport.cpp
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -36,6 +36,7 @@
 
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/H5Utilities.h"
+#include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/Montages/MontageSupport.h b/Source/SIMPLib/Montages/MontageSupport.h
index f8e3a479be..6fbc008ad4 100644
--- a/Source/SIMPLib/Montages/MontageSupport.h
+++ b/Source/SIMPLib/Montages/MontageSupport.h
@@ -34,8 +34,7 @@
 
 #include <memory>
 
-#include "H5Support/QH5Lite.h"
-#include "H5Support/H5ScopedErrorHandler.h"
+#include "H5Support/H5SupportTypeDefs.h"
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 

From d7a3223074973bcee9b8437dcdea66d6227af6fa Mon Sep 17 00:00:00 2001
From: Joey Kleingers <joey.kleingers@bluequartz.net>
Date: Tue, 11 Aug 2020 15:05:22 -0400
Subject: [PATCH 269/397] Topic/rect grid geom get index (#412)

* Added getIndex methods to IGeometryGrid and subclasses.
* Added RectGridGeom unit test, initially testing new getIndex method.
---
 Source/SIMPLib/Geometry/IGeometryGrid.h       |  3 +
 Source/SIMPLib/Geometry/ImageGeom.cpp         | 24 +++++
 Source/SIMPLib/Geometry/ImageGeom.h           |  3 +
 Source/SIMPLib/Geometry/RectGridGeom.cpp      | 67 +++++++++++++
 Source/SIMPLib/Geometry/RectGridGeom.h        |  3 +
 .../Geometry/Testing/Cxx/RectGridGeomTest.cpp | 98 +++++++++++++++++++
 .../Geometry/Testing/Cxx/SourceList.cmake     |  1 +
 7 files changed, 199 insertions(+)
 create mode 100644 Source/SIMPLib/Geometry/Testing/Cxx/RectGridGeomTest.cpp

diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index e5a04159ea..04caa16138 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -97,6 +97,9 @@ class SIMPLib_EXPORT IGeometryGrid : public IGeometry
   virtual void getCoords(size_t x, size_t y, size_t z, double coords[3]) const = 0;
   virtual void getCoords(size_t idx, double coords[3]) const = 0;
 
+  virtual std::optional<size_t> getIndex(float xCoord, float yCoord, float zCoord) const = 0;
+  virtual std::optional<size_t> getIndex(double xCoord, double yCoord, double zCoord) const = 0;
+
 public:
   IGeometryGrid(const IGeometryGrid&) = delete;            // Copy Constructor Not Implemented
   IGeometryGrid(IGeometryGrid&&) = delete;                 // Move Constructor Not Implemented
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 0d31ab5840..b0a19583c4 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -675,6 +675,30 @@ void ImageGeom::getCoords(size_t idx, double coords[3]) const
   coords[2] = static_cast<double>(plane) * m_Spacing[2] + m_Origin[2] + (0.5 * m_Spacing[2]);
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::optional<size_t> ImageGeom::getIndex(float xCoord, float yCoord, float zCoord) const
+{
+  size_t x = (xCoord - (0.5f * m_Spacing[0]) - m_Origin[0]) / m_Spacing[0];
+  size_t y = (yCoord - (0.5f * m_Spacing[1]) - m_Origin[1]) / m_Spacing[1];
+  size_t z = (zCoord - (0.5f * m_Spacing[2]) - m_Origin[2]) / m_Spacing[2];
+
+  return (m_Dimensions[1] * m_Dimensions[0] * z) + (m_Dimensions[0] * y) + x;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::optional<size_t> ImageGeom::getIndex(double xCoord, double yCoord, double zCoord) const
+{
+  size_t x = (xCoord - (0.5 * m_Spacing[0]) - m_Origin[0]) / m_Spacing[0];
+  size_t y = (yCoord - (0.5 * m_Spacing[1]) - m_Origin[1]) / m_Spacing[1];
+  size_t z = (zCoord - (0.5 * m_Spacing[2]) - m_Origin[2]) / m_Spacing[2];
+
+  return (m_Dimensions[1] * m_Dimensions[0] * z) + (m_Dimensions[0] * y) + x;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index a71d76c061..88c333772e 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -321,6 +321,9 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
   void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
   void getCoords(size_t idx, double coords[3]) const override;
 
+  std::optional<size_t> getIndex(float xCoord, float yCoord, float zCoord) const override;
+  std::optional<size_t> getIndex(double xCoord, double yCoord, double zCoord) const override;
+
   // -----------------------------------------------------------------------------
   // Misc. ImageGeometry Methods
   // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 544759110f..31be001f15 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -710,6 +710,73 @@ void RectGridGeom::getCoords(size_t idx, double coords[3]) const
   coords[2] = 0.5 * (static_cast<double>(zBnds[plane]) + zBnds[plane + 1]);
 }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::optional<size_t> RectGridGeom::getIndex(float xCoord, float yCoord, float zCoord) const
+{
+  FloatArrayType& xBnds = *m_xBounds;
+  FloatArrayType& yBnds = *m_yBounds;
+  FloatArrayType& zBnds = *m_zBounds;
+
+  if(xCoord < xBnds.front() || xCoord >= xBnds.back())
+  {
+    return {};
+  }
+
+  if(yCoord < yBnds.front() || yCoord >= yBnds.back())
+  {
+    return {};
+  }
+
+  if(zCoord < zBnds.front() || zCoord >= zBnds.back())
+  {
+    return {};
+  }
+
+  size_t x = std::distance(xBnds.cbegin(), std::adjacent_find(xBnds.cbegin(), xBnds.cend(), [xCoord](const float a, const float b) { return (xCoord >= a && xCoord < b); }));
+  size_t y = std::distance(yBnds.cbegin(), std::adjacent_find(yBnds.cbegin(), yBnds.cend(), [yCoord](const float a, const float b) { return (yCoord >= a && yCoord < b); }));
+  size_t z = std::distance(zBnds.cbegin(), std::adjacent_find(zBnds.cbegin(), zBnds.cend(), [zCoord](const float a, const float b) { return (zCoord >= a && zCoord < b); }));
+
+  size_t xSize = xBnds.size() - 1;
+  size_t ySize = yBnds.size() - 1;
+  return (ySize * xSize * z) + (xSize * y) + x;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+std::optional<size_t> RectGridGeom::getIndex(double xCoord, double yCoord, double zCoord) const
+{
+  FloatArrayType& xBnds = *m_xBounds;
+  FloatArrayType& yBnds = *m_yBounds;
+  FloatArrayType& zBnds = *m_zBounds;
+
+  if(xCoord < xBnds.front() || xCoord >= xBnds.back())
+  {
+    return {};
+  }
+
+  if(yCoord < yBnds.front() || yCoord >= yBnds.back())
+  {
+    return {};
+  }
+
+  if(zCoord < zBnds.front() || zCoord >= zBnds.back())
+  {
+    return {};
+  }
+
+  // Use standard distance to get the index of the returned iterator from adjacent_find
+  size_t x = std::distance(xBnds.cbegin(), std::adjacent_find(xBnds.cbegin(), xBnds.cend(), [xCoord](const float a, const float b) { return (xCoord >= a && xCoord < b); }));
+  size_t y = std::distance(yBnds.cbegin(), std::adjacent_find(yBnds.cbegin(), yBnds.cend(), [yCoord](const float a, const float b) { return (yCoord >= a && yCoord < b); }));
+  size_t z = std::distance(zBnds.cbegin(), std::adjacent_find(zBnds.cbegin(), zBnds.cend(), [zCoord](const float a, const float b) { return (zCoord >= a && zCoord < b); }));
+
+  size_t xSize = xBnds.size() - 1;
+  size_t ySize = yBnds.size() - 1;
+  return (ySize * xSize * z) + (xSize * y) + x;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index ac2531a9b4..bedf62228c 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -261,6 +261,9 @@ class SIMPLib_EXPORT RectGridGeom : public IGeometryGrid
   void getCoords(size_t x, size_t y, size_t z, double coords[3]) const override;
   void getCoords(size_t idx, double coords[3]) const override;
 
+  std::optional<size_t> getIndex(float xCoord, float yCoord, float zCoord) const override;
+  std::optional<size_t> getIndex(double xCoord, double yCoord, double zCoord) const override;
+
 protected:
   RectGridGeom();
 
diff --git a/Source/SIMPLib/Geometry/Testing/Cxx/RectGridGeomTest.cpp b/Source/SIMPLib/Geometry/Testing/Cxx/RectGridGeomTest.cpp
new file mode 100644
index 0000000000..d1cfd08551
--- /dev/null
+++ b/Source/SIMPLib/Geometry/Testing/Cxx/RectGridGeomTest.cpp
@@ -0,0 +1,98 @@
+
+#include "SIMPLib/Geometry/RectGridGeom.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+class RectGridGeomTest
+{
+public:
+  RectGridGeomTest() = default;
+
+  virtual ~RectGridGeomTest() = default;
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void TestGetIndex()
+  {
+    RectGridGeom::Pointer geom = RectGridGeom::CreateGeometry("Test Geometry");
+    SizeVec3Type dims(5, 5, 5);
+    FloatArrayType::Pointer xBnds = FloatArrayType::CreateArray(6, QString("xBnds"), true);
+    FloatArrayType::Pointer yBnds = FloatArrayType::CreateArray(6, QString("yBnds"), true);
+    FloatArrayType::Pointer zBnds = FloatArrayType::CreateArray(6, QString("zBnds"), true);
+
+    // Fill all three arrays with 0, 1, 2, 3, 4, 5
+    std::generate(xBnds->begin(), xBnds->end(), [n = -1]() mutable { return n += 1; });
+    std::generate(yBnds->begin(), yBnds->end(), [n = -1]() mutable { return n += 1; });
+    std::generate(zBnds->begin(), zBnds->end(), [n = -1]() mutable { return n += 1; });
+
+    geom->setDimensions(dims);
+    geom->setXBounds(xBnds);
+    geom->setYBounds(yBnds);
+    geom->setZBounds(zBnds);
+
+    // All three coordinates inside voxel (0, 0, 0)
+    auto idxOpt = geom->getIndex(0.4, 0.4, 0.4);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), true)
+    DREAM3D_REQUIRE_EQUAL(*idxOpt, 0)
+
+    // All three coordinates inside voxel (4, 4, 4)
+    idxOpt = geom->getIndex(4.99, 4.99, 4.99);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), true)
+    DREAM3D_REQUIRE_EQUAL(*idxOpt, 124)
+
+    // X Coordinate outside range (min)
+    idxOpt = geom->getIndex(-0.01, 4.99, 4.99);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // X Coordinate outside range (max)
+    idxOpt = geom->getIndex(5.0, 4.99, 4.99);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // Y Coordinate outside range (min)
+    idxOpt = geom->getIndex(4.99, -0.01, 4.99);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // Y Coordinate outside range (max)
+    idxOpt = geom->getIndex(4.99, 5.0, 4.99);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // Z Coordinate outside range (min)
+    idxOpt = geom->getIndex(4.99, 4.99, -0.01);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // Z Coordinate outside range (max)
+    idxOpt = geom->getIndex(4.99, 4.99, 5.0);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    // More tests
+    idxOpt = geom->getIndex(0.0, 3.2, 4.1);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), true)
+    DREAM3D_REQUIRE_EQUAL(*idxOpt, 115)
+
+    idxOpt = geom->getIndex(1.2, 1.9, 0.9);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), true)
+    DREAM3D_REQUIRE_EQUAL(*idxOpt, 6)
+
+    idxOpt = geom->getIndex(-56.0, -12.1, -2.3);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+
+    idxOpt = geom->getIndex(43.2, 51.9, 82.1);
+    DREAM3D_REQUIRE_EQUAL(idxOpt.has_value(), false)
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    std::cout << "#### RectGridGeomTest Starting ####" << std::endl;
+    int err = EXIT_SUCCESS;
+
+    // Use this to register a specific function that will run a test
+    DREAM3D_REGISTER_TEST(TestGetIndex());
+  }
+
+private:
+  RectGridGeomTest(const RectGridGeomTest&) = delete; // Copy Constructor Not Implemented
+  void operator=(const RectGridGeomTest&) = delete;   // Move assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Geometry/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/Geometry/Testing/Cxx/SourceList.cmake
index ba032dcc09..67c59efe37 100644
--- a/Source/SIMPLib/Geometry/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/Geometry/Testing/Cxx/SourceList.cmake
@@ -1,6 +1,7 @@
 
 set(TEST_${SUBDIR_NAME}_NAMES
   ImageGeomTest
+  RectGridGeomTest
 )
 
 SIMPL_ADD_UNIT_TEST("${TEST_${SUBDIR_NAME}_NAMES}" "${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx")

From 0f6f43f45321c0664798369643b336074e832f3b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 11 Aug 2020 18:28:58 -0400
Subject: [PATCH 270/397] Fixed compile issue on Windows due to missing header

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Geometry/IGeometryGrid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 04caa16138..7dd34768cd 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -35,7 +35,7 @@
 #pragma once
 
 #include <memory>
-
+#include <optional>
 #include <tuple>
 
 #include "SIMPLib/SIMPLib.h"

From c6dcc7c9f02aaad40564b554abd4f74fdd52ea47 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 13 Aug 2020 17:08:36 -0400
Subject: [PATCH 271/397] Fixed pragma clang diagnostic pairing in ITK header

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index e2dd0a80d6..de90efa2db 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -77,7 +77,8 @@
 #pragma once
 
 #include <itkConfigure.h>
-#if(ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1)
+#define ITK_VERSION_CHECK ((ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1))
+#if ITK_VERSION_CHECK
 #include <itkCommonEnums.h>
 #else
 #ifdef __clang__
@@ -538,8 +539,8 @@
     }                                                                                                                                                                                                  \
   }
 
-
+#if !ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-
+#endif

From a69f4b92b311805e68fb0afe373a83bd05c32580 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 14 Aug 2020 14:41:51 -0400
Subject: [PATCH 272/397] Fixed additional pragma clang diagnostic pairing in
 ITK header

* Changed macro from ITK_VERSION_CHECK to SIMPL_ITK_VERSION_CHECK
* #undef macro at end of file

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h | 7 ++++---
 Source/SIMPLib/ITK/itkImageReaderHelper.h      | 7 +++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index de90efa2db..0373a212f1 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -77,8 +77,8 @@
 #pragma once
 
 #include <itkConfigure.h>
-#define ITK_VERSION_CHECK ((ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1))
-#if ITK_VERSION_CHECK
+#define SIMPL_ITK_VERSION_CHECK ((ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1))
+#if SIMPL_ITK_VERSION_CHECK
 #include <itkCommonEnums.h>
 #else
 #ifdef __clang__
@@ -539,8 +539,9 @@
     }                                                                                                                                                                                                  \
   }
 
-#if !ITK_VERSION_CHECK
+#if !SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
 #endif
+#undef SIMPL_ITK_VERSION_CHECK
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.h b/Source/SIMPLib/ITK/itkImageReaderHelper.h
index 5fdf106dd9..c00cb8f8fb 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.h
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.h
@@ -2,7 +2,8 @@
 #pragma once
 
 #include <itkConfigure.h>
-#if(ITK_VERSION_MAJOR == 4) 
+#define SIMPL_ITK_VERSION_CHECK (ITK_VERSION_MAJOR == 4)
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-assign-field"
@@ -39,7 +40,9 @@ private:
   void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
 
 
-
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+#endif
+#undef SIMPL_ITK_VERSION_CHECK

From 90879d1354a1a1ad578882221fbd8d89f586dd84 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 14 Aug 2020 16:22:54 -0400
Subject: [PATCH 273/397] Fixed more pragma clang diagnostic pairings in ITK
 header

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Testing/Cxx/itkDream3DTransformContainerTestHelper.h  | 8 +++++---
 Source/SIMPLib/ITK/itkBridge.h                            | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
index 8ce1c75734..1bcb306aa8 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
@@ -38,7 +38,8 @@
 #include "SIMPLib/Geometry/TransformContainer.h"
 
 #include <itkConfigure.h>
-#if(ITK_VERSION_MAJOR == 4) 
+#define SIMPL_ITK_VERSION_CHECK (ITK_VERSION_MAJOR == 4)
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-assign-field"
@@ -109,8 +110,9 @@ typename TransformContainer::Pointer GetTransformContainerFromITKAffineTransform
   return transformContainer;
 }
 
-
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-
+#endif
+#undef SIMPL_ITK_VERSION_CHECK
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index faf13c98f2..2e85e9fa27 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -46,7 +46,8 @@
 
 
 #include <itkConfigure.h>
-#if(ITK_VERSION_MAJOR == 4) 
+#define SIMPL_ITK_VERSION_CHECK (ITK_VERSION_MAJOR == 4)
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wself-assign-field"
@@ -590,7 +591,9 @@ class ItkBridge
 //// Create some typedefs for our convenience
 typedef ItkBridge<ImageProcessingConstants::DefaultPixelType> ITKUtilitiesType;
 
-
+#if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
+#endif
+#undef SIMPL_ITK_VERSION_CHECK

From 1dbb4d2fd9b738b59b3d8114acfe8fab2d5c64d6 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 21 Aug 2020 06:36:18 -0400
Subject: [PATCH 274/397] Now the user can define environment variables for
 Python tests

* SIMPL_PYTHON_TEST_ENV is a list of environment variables

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                     | 2 ++
 Wrapping/Python/Binding/CreatePybind11Module.cmake | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fa607fdc4..7d973892d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -468,6 +468,8 @@ include(${SIMPLProj_SOURCE_DIR}/Support/Support.cmake)
 # Find the Pybind11 installation
 option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
 if(SIMPL_ENABLE_PYTHON)
+  set(SIMPL_PYTHON_TEST_ENV ${SIMPL_PYTHON_TEST_ENV} CACHE STRING "A semicolon delimited list of environment variables used for Python tests")
+
   option(SIMPL_USE_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
 
   mark_as_advanced(CLEAR PYTHON_EXECUTABLE)
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 02987d2f41..bbb2ba5242 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -54,6 +54,7 @@ function(AddPythonTest)
     PROPERTY
       ENVIRONMENT
       "PYTHONPATH=${ARGS_PYTHONPATH}"
+      "${SIMPL_PYTHON_TEST_ENV}"
   )
 endfunction()
 

From bcb6f6e1397ff4ed16aa6732788947ce2e4bc943 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 21 Aug 2020 23:19:29 -0400
Subject: [PATCH 275/397] Fixed inconsistent override

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h         | 2 +-
 Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp        | 2 +-
 Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h | 2 +-
 Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h | 2 +-
 Source/SIMPLib/REST/PipelineListener.h                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 252da0b610..667a3dc6d2 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -219,7 +219,7 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
    * @brief Returns the list of deleted data paths.
    * @return
    */
-  std::list<DataArrayPath> getDeletedPaths();
+  std::list<DataArrayPath> getDeletedPaths() override;
 
 protected:
   CombineAttributeMatrices();
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index ec950ad6f2..a2d676576a 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -133,7 +133,7 @@ class Parser : public AbstractDataParser
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
-  virtual QString getNameOfClass() const
+  QString getNameOfClass() const override
   {
     return QString("Parser<ArrayType, F>");
   }
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index c794912099..652fc1e545 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -68,7 +68,7 @@ class Dream3DITransformContainerToTransform : public ProcessObject
   Dream3DITransformContainerToTransform();
   ~Dream3DITransformContainerToTransform() override;
 
-  void VerifyPreconditions() ITKv5_CONST;
+  void VerifyPreconditions() ITKv5_CONST override;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index ceca342112..bf88155441 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -64,7 +64,7 @@ class TransformToDream3DITransformContainer : public ProcessObject
   TransformToDream3DITransformContainer();
   ~TransformToDream3DITransformContainer() override;
 
-  void VerifyPreconditions() ITKv5_CONST;
+  void VerifyPreconditions() ITKv5_CONST override;
 
   void GenerateData() override;
   ProcessObject::DataObjectPointer MakeOutput(ProcessObject::DataObjectPointerArraySizeType) override;
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index 8743086ba3..c1c95b10d6 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -49,7 +49,7 @@ class SIMPLib_EXPORT PipelineListener : public QObject, public IObserver
   QString getStatusLog();
 
 public slots:
-  void processPipelineMessage(const AbstractMessage::Pointer& pm);
+  void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
 private:
   std::vector<AbstractMessage::Pointer> m_SharedMessages;

From edaf2c2755bb83b72866206ff6450ab05721b266 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 24 Aug 2020 14:03:49 -0400
Subject: [PATCH 276/397] Changed GeometryMath from a class to a namespace

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Math/GeometryMath.cpp |  28 --
 Source/SIMPLib/Math/GeometryMath.h   | 633 +++++++++++++--------------
 2 files changed, 302 insertions(+), 359 deletions(-)

diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index f5b1f6102d..86b850dac0 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -43,16 +43,6 @@
 #include "SIMPLib/Math/MatrixMath.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-GeometryMath::GeometryMath() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-GeometryMath::~GeometryMath() = default;
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -1239,21 +1229,3 @@ char GeometryMath::PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynami
 
   return 'o';
 }
-
-// -----------------------------------------------------------------------------
-GeometryMath::Pointer GeometryMath::NullPointer()
-{
-  return Pointer(static_cast<Self*>(nullptr));
-}
-
-// -----------------------------------------------------------------------------
-QString GeometryMath::getNameOfClass() const
-{
-  return QString("GeometryMath");
-}
-
-// -----------------------------------------------------------------------------
-QString GeometryMath::ClassName()
-{
-  return QString("GeometryMath");
-}
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 970e2ca7a2..8b56d9420c 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -51,335 +51,306 @@ class TriangleGeom;
  * @date Feb 19, 2011
  * @version 1.0
  */
-class SIMPLib_EXPORT GeometryMath
+namespace GeometryMath
 {
-public:
-  using Self = GeometryMath;
-  using Pointer = std::shared_ptr<Self>;
-  using ConstPointer = std::shared_ptr<const Self>;
-  using WeakPointer = std::weak_ptr<Self>;
-  using ConstWeakPointer = std::weak_ptr<const Self>;
-  static Pointer NullPointer();
-
-  /**
-   * @brief Returns the name of the class for GeometryMath
-   */
-  QString getNameOfClass() const;
-  /**
-   * @brief Returns the name of the class for GeometryMath
-   */
-  static QString ClassName();
-
-  virtual ~GeometryMath();
-
-  /**
-   * @brief Calculates the Cosine of the angle between 2 vectors. To get the actual angle the programmer should
-   * use the following form: float radians = acos(GeometryMath::CosThetaBetweenVectors(a, b));
-   * @param a 1x3 Vector
-   * @param b 1x3 Vector
-   * @return
-   */
-  static float CosThetaBetweenVectors(const float a[3], const float b[3]);
-  static double CosThetaBetweenVectors(const double a[3], const double b[3]);
-
-  /**
-   * @brief Computes the angle in RADIANS between 2 vectors.
-   * @param a
-   * @param b
-   * @return
-   */
-  static float AngleBetweenVectors(const float a[3], const float b[3]);
-
-  /**
-   * @brief Computes the area of a triangle defined by 3 points.
-   * @param a
-   * @param b
-   * @param distance
-   * @return
-   */
-  static void FindDistanceBetweenPoints(const float a[3], const float b[3], float& distance);
-
-  /**
-   * @brief Computes the area of a triangle defined by 3 points.
-   * @param a
-   * @param b
-   * @param c
-   * @param area
-   * @return
-   */
-  static void FindTriangleArea(const float a[3], const float b[3], const float c[3], float& area);
-
-  /**
-   * @brief Computes the volume of a tetrahedron defined by 4 points.
-   * @param a
-   * @param b
-   * @param c
-   * @param d
-   * @param volume
-   * @return
-   */
-  static void FindTetrahedronVolume(const float a[3], const float b[3], const float c[3], const float d[3], float& volume);
-
-  /**
-   * @brief Generic function to compute the normal of a planar polygon embedded in 3D.
-   * This functions will consistently handle concave polygons.
-   * @param vertices
-   * @param numVerts
-   * @param n
-   */
-  static void FindPolygonNormal(const float* vertices, int64_t numVerts, float n[3]);
-
-  /**
-   * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
-   * @param a
-   * @param b
-   * @param c
-   * @param n
-   * @return
-   */
-  static void FindPlaneNormalVector(const float a[3], const float b[3], const float c[3], float n[3]);
-
-  /**
-   * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
-   * @param a
-   * @param b
-   * @param c
-   * @param n
-   * @return
-   */
-  static void FindPlaneNormalVector(const double a[3], const double b[3], const double c[3], double n[3]);
-
-  /**
-   * @brief Computes the coefficients of a plane containing 3 points (AB X AC).
-   * @param a
-   * @param b
-   * @param c
-   * @param n 1x3 Vector
-   * @param d float
-   * @return
-   */
-  static void FindPlaneCoefficients(const float a[3], const float b[3], const float c[3], float n[3], float& d);
-
-  /**
-   * @brief Computes the distance of a point from the centroid of a triangle defined by 3 points
-   * @param q
-   * @param a
-   * @param b
-   * @param c
-   * @param distance
-   * @return
-   */
-  static void FindDistanceToTriangleCentroid(const float* a, const float* b, const float* c, const float* q, float& distance);
-
-  /**
-   * @brief Computes the distance of a point from a plane.
-   * @param q
-   * @param n 1x3 Vector
-   * @param d float
-   * @param distance float
-   * @return
-   */
-  static void FindDistanceFromPlane(const float* q, float n[3], float d, float& distance);
-
-  /**
-   * @brief Determines if a point is inside of a box defined by the lower left and upper right corners
-   * @param p
-   * @param ll
-   * @param ur
-   * @return
-   */
-  static bool PointInBox(const float p[3], const float ll[3], const float ur[3]);
-
-  /**
-   * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-   * @param faces
-   * @param faceIds
-   * @param vertices
-   * @param point
-   * @param lowerLeft
-   * @param upperRight
-   * @param radius
-   * @return
-   */
-  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
-                                float radius);
-
-  /**
-   * @brief Determines if a point is inside of a polyhedron defined by a set of faces
-   * @param faces
-   * @param faceIds
-   * @param vertices
-   * @param point
-   * @param lowerLeft
-   * @param upperRight
-   * @param radius
-   * @param distToBoundary
-   * @return
-   */
-  static char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
-                                float radius, float& distToBoundary);
-
-  /**
-   * @brief Determines if a point is inside of a triangle defined by 3 points
-   * @param a
-   * @param b
-   * @param c
-   * @param m int
-   * @param p
-   * @return
-   */
-  static char PointInTriangle3D(const float* a, const float* b, const float* c, int m, const float* p);
-
-  /**
-   * @brief Determines if a point is inside of a triangle defined by 3 points
-   * @param a
-   * @param b
-   * @param c
-   * @param p
-   * @return
-   */
-  static char PointInTriangle2D(const float* a, const float* b, const float* c, const float* p);
-
-  /**
-   * @brief Determines if a segment between two points intersects a box defined by the lower left and upper right corners
-   * @param p
-   * @param q
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static bool RayIntersectsBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
-
-  /**
-   * @brief FindRayIntersectionsWithSphere
-   * @param p
-   * @param R
-   * @param length
-   * @param c
-   * @param radius
-   * @param t1
-   * @param t2
-   * @return
-   */
-  static bool FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2);
-
-  /**
-   * @brief Determines length of a segment between two points that lies within a box defined by the lower left and upper right corners
-   * @param p
-   * @param q
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static float LengthOfRayInBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
-
-  /**
-   * @brief Creates a randomly oriented ray of given length
-   * @param length float
-   * @param ray 1x3 Vector
-   * @return
-   */
-  static void GenerateRandomRay(float length, float* ray);
-
-  /**
-   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-   * @param verts pointer to vertex array
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static void FindBoundingBoxOfVertices(VertexGeom* verts, float* lowerLeft, float* upperRight);
-
-  /**
-   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-   * @param verts pointer to vertex array
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static void FindBoundingBoxOfFace(TriangleGeom* faces, int faceId, float* lowerLeft, float* upperRight);
-
-  /**
-   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
-   * @param verts pointer to vertex array
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static void FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId, float g[3][3], float* lowerLeft, float* upperRight);
-
-  /**
-   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of faces
-   * @param faces pointer to face array
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static void FindBoundingBoxOfFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float* lowerLeft, float* upperRight);
-
-  /**
-   * @brief Determines the bounding box defined by the lower left and upper right corners of a set of rotated faces
-   * @param faces pointer to face array
-   * param g
-   * @param lowerLeft
-   * @param upperRight
-   * @return
-   */
-  static void FindBoundingBoxOfRotatedFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float g[3][3], float* lowerLeft, float* upperRight);
-
-  /**
-   * @brief Determines if a segment between two points intersects a triangle defined by 3 points
-   * @param q
-   * @param r
-   * @param a
-   * @param b
-   * @param c
-   * @param p
-   * @return
-   */
-  static char RayIntersectsTriangle(const float* a, const float* b, const float* c, const float* q, const float* r, float* p);
-
-  /**
-   * @brief Determines if a segment between two points crosses a triangle defined by 3 points
-   * @param q
-   * @param r
-   * @param a
-   * @param b
-   * @param c
-   * @return
-   */
-  static char RayCrossesTriangle(const float* a, const float* b, const float* c, const float* q, const float* r);
-
-  /**
-   * @brief Determines if a segment between two points intersects a plane defined by 3 points
-   * @param q
-   * @param r
-   * @param a
-   * @param b
-   * @param c
-   * @param p
-   * @return
-   */
-  static char RayIntersectsPlane(const float* a, const float* b, const float* c, const float* q, const float* r, float* p, int& m);
-
-  /**
-   * @brief Determines if a segment between two points intersects a plane defined by a normal and distance
-   * @param n
-   * @param d
-   * @param q
-   * @param r
-   * @param p
-   * @return
-   */
-  static char RayIntersectsPlane(const float* n, float d, const float* q, const float* r, float* p);
-
-protected:
-  GeometryMath();
-
-public:
-  GeometryMath(const GeometryMath&) = delete;            // Copy Constructor Not Implemented
-  GeometryMath(GeometryMath&&) = delete;                 // Move Constructor Not Implemented
-  GeometryMath& operator=(const GeometryMath&) = delete; // Copy Assignment Not Implemented
-  GeometryMath& operator=(GeometryMath&&) = delete;      // Move Assignment Not Implemented
-private:
-};
+/**
+ * @brief Calculates the Cosine of the angle between 2 vectors. To get the actual angle the programmer should
+ * use the following form: float radians = acos(GeometryMath::CosThetaBetweenVectors(a, b));
+ * @param a 1x3 Vector
+ * @param b 1x3 Vector
+ * @return
+ */
+SIMPLib_EXPORT float CosThetaBetweenVectors(const float a[3], const float b[3]);
+SIMPLib_EXPORT double CosThetaBetweenVectors(const double a[3], const double b[3]);
+
+/**
+ * @brief Computes the angle in RADIANS between 2 vectors.
+ * @param a
+ * @param b
+ * @return
+ */
+SIMPLib_EXPORT float AngleBetweenVectors(const float a[3], const float b[3]);
+
+/**
+ * @brief Computes the area of a triangle defined by 3 points.
+ * @param a
+ * @param b
+ * @param distance
+ * @return
+ */
+SIMPLib_EXPORT void FindDistanceBetweenPoints(const float a[3], const float b[3], float& distance);
+
+/**
+ * @brief Computes the area of a triangle defined by 3 points.
+ * @param a
+ * @param b
+ * @param c
+ * @param area
+ * @return
+ */
+SIMPLib_EXPORT void FindTriangleArea(const float a[3], const float b[3], const float c[3], float& area);
+
+/**
+ * @brief Computes the volume of a tetrahedron defined by 4 points.
+ * @param a
+ * @param b
+ * @param c
+ * @param d
+ * @param volume
+ * @return
+ */
+SIMPLib_EXPORT void FindTetrahedronVolume(const float a[3], const float b[3], const float c[3], const float d[3], float& volume);
+
+/**
+ * @brief Generic function to compute the normal of a planar polygon embedded in 3D.
+ * This functions will consistently handle concave polygons.
+ * @param vertices
+ * @param numVerts
+ * @param n
+ */
+SIMPLib_EXPORT void FindPolygonNormal(const float* vertices, int64_t numVerts, float n[3]);
+
+/**
+ * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
+ * @param a
+ * @param b
+ * @param c
+ * @param n
+ * @return
+ */
+SIMPLib_EXPORT void FindPlaneNormalVector(const float a[3], const float b[3], const float c[3], float n[3]);
+
+/**
+ * @brief Computes the normal vector to a plane containing 3 points (AB X AC).
+ * @param a
+ * @param b
+ * @param c
+ * @param n
+ * @return
+ */
+SIMPLib_EXPORT void FindPlaneNormalVector(const double a[3], const double b[3], const double c[3], double n[3]);
+
+/**
+ * @brief Computes the coefficients of a plane containing 3 points (AB X AC).
+ * @param a
+ * @param b
+ * @param c
+ * @param n 1x3 Vector
+ * @param d float
+ * @return
+ */
+SIMPLib_EXPORT void FindPlaneCoefficients(const float a[3], const float b[3], const float c[3], float n[3], float& d);
+
+/**
+ * @brief Computes the distance of a point from the centroid of a triangle defined by 3 points
+ * @param q
+ * @param a
+ * @param b
+ * @param c
+ * @param distance
+ * @return
+ */
+SIMPLib_EXPORT void FindDistanceToTriangleCentroid(const float* a, const float* b, const float* c, const float* q, float& distance);
+
+/**
+ * @brief Computes the distance of a point from a plane.
+ * @param q
+ * @param n 1x3 Vector
+ * @param d float
+ * @param distance float
+ * @return
+ */
+SIMPLib_EXPORT void FindDistanceFromPlane(const float* q, float n[3], float d, float& distance);
+
+/**
+ * @brief Determines if a point is inside of a box defined by the lower left and upper right corners
+ * @param p
+ * @param ll
+ * @param ur
+ * @return
+ */
+SIMPLib_EXPORT bool PointInBox(const float p[3], const float ll[3], const float ur[3]);
+
+/**
+ * @brief Determines if a point is inside of a polyhedron defined by a set of faces
+ * @param faces
+ * @param faceIds
+ * @param vertices
+ * @param point
+ * @param lowerLeft
+ * @param upperRight
+ * @param radius
+ * @return
+ */
+SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
+                              float radius);
+
+/**
+ * @brief Determines if a point is inside of a polyhedron defined by a set of faces
+ * @param faces
+ * @param faceIds
+ * @param vertices
+ * @param point
+ * @param lowerLeft
+ * @param upperRight
+ * @param radius
+ * @param distToBoundary
+ * @return
+ */
+SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
+                              float radius, float& distToBoundary);
+
+/**
+ * @brief Determines if a point is inside of a triangle defined by 3 points
+ * @param a
+ * @param b
+ * @param c
+ * @param m int
+ * @param p
+ * @return
+ */
+SIMPLib_EXPORT char PointInTriangle3D(const float* a, const float* b, const float* c, int m, const float* p);
+
+/**
+ * @brief Determines if a point is inside of a triangle defined by 3 points
+ * @param a
+ * @param b
+ * @param c
+ * @param p
+ * @return
+ */
+SIMPLib_EXPORT char PointInTriangle2D(const float* a, const float* b, const float* c, const float* p);
+
+/**
+ * @brief Determines if a segment between two points intersects a box defined by the lower left and upper right corners
+ * @param p
+ * @param q
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT bool RayIntersectsBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
+
+/**
+ * @brief FindRayIntersectionsWithSphere
+ * @param p
+ * @param R
+ * @param length
+ * @param c
+ * @param radius
+ * @param t1
+ * @param t2
+ * @return
+ */
+SIMPLib_EXPORT bool FindRayIntersectionsWithSphere(float* p, float* R, float length, float* c, float radius, float& t1, float& t2);
+
+/**
+ * @brief Determines length of a segment between two points that lies within a box defined by the lower left and upper right corners
+ * @param p
+ * @param q
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT float LengthOfRayInBox(const float* p, const float* q, const float* lowerLeft, const float* upperRight);
+
+/**
+ * @brief Creates a randomly oriented ray of given length
+ * @param length float
+ * @param ray 1x3 Vector
+ * @return
+ */
+SIMPLib_EXPORT void GenerateRandomRay(float length, float* ray);
+
+/**
+ * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+ * @param verts pointer to vertex array
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT void FindBoundingBoxOfVertices(VertexGeom* verts, float* lowerLeft, float* upperRight);
+
+/**
+ * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+ * @param verts pointer to vertex array
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT void FindBoundingBoxOfFace(TriangleGeom* faces, int faceId, float* lowerLeft, float* upperRight);
+
+/**
+ * @brief Determines the bounding box defined by the lower left and upper right corners of a set of vertices
+ * @param verts pointer to vertex array
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT void FindBoundingBoxOfRotatedFace(TriangleGeom* faces, int faceId, float g[3][3], float* lowerLeft, float* upperRight);
+
+/**
+ * @brief Determines the bounding box defined by the lower left and upper right corners of a set of faces
+ * @param faces pointer to face array
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT void FindBoundingBoxOfFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float* lowerLeft, float* upperRight);
+
+/**
+ * @brief Determines the bounding box defined by the lower left and upper right corners of a set of rotated faces
+ * @param faces pointer to face array
+ * param g
+ * @param lowerLeft
+ * @param upperRight
+ * @return
+ */
+SIMPLib_EXPORT void FindBoundingBoxOfRotatedFaces(TriangleGeom* faces, Int32Int32DynamicListArray::ElementList faceIds, float g[3][3], float* lowerLeft, float* upperRight);
+
+/**
+ * @brief Determines if a segment between two points intersects a triangle defined by 3 points
+ * @param q
+ * @param r
+ * @param a
+ * @param b
+ * @param c
+ * @param p
+ * @return
+ */
+SIMPLib_EXPORT char RayIntersectsTriangle(const float* a, const float* b, const float* c, const float* q, const float* r, float* p);
+
+/**
+ * @brief Determines if a segment between two points crosses a triangle defined by 3 points
+ * @param q
+ * @param r
+ * @param a
+ * @param b
+ * @param c
+ * @return
+ */
+SIMPLib_EXPORT char RayCrossesTriangle(const float* a, const float* b, const float* c, const float* q, const float* r);
+
+/**
+ * @brief Determines if a segment between two points intersects a plane defined by 3 points
+ * @param q
+ * @param r
+ * @param a
+ * @param b
+ * @param c
+ * @param p
+ * @return
+ */
+SIMPLib_EXPORT char RayIntersectsPlane(const float* a, const float* b, const float* c, const float* q, const float* r, float* p, int& m);
+
+/**
+ * @brief Determines if a segment between two points intersects a plane defined by a normal and distance
+ * @param n
+ * @param d
+ * @param q
+ * @param r
+ * @param p
+ * @return
+ */
+SIMPLib_EXPORT char RayIntersectsPlane(const float* n, float d, const float* q, const float* r, float* p);
+} // namespace GeometryMath

From 24046d8ee2dbb387517fa7dc8f0e4b080399783c Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 24 Aug 2020 19:48:39 -0400
Subject: [PATCH 277/397] Changed to pass HDF5 ids by value to scoped sentinels

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/DataContainerReader.cpp |  6 +++---
 Source/SIMPLib/CoreFilters/DataContainerWriter.cpp | 10 +++++-----
 Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp   |  4 ++--
 .../Testing/Cxx/ImportHDF5DatasetTest.cpp          |  4 ++--
 Source/SIMPLib/DataArrays/StatsDataArray.cpp       |  2 +-
 Source/SIMPLib/DataContainers/AttributeMatrix.cpp  |  2 +-
 Source/SIMPLib/DataContainers/DataContainer.cpp    |  8 ++++----
 .../SIMPLib/DataContainers/DataContainerBundle.cpp |  2 +-
 .../FilterParameters/H5FilterParametersReader.cpp  | 14 +++++++-------
 .../FilterParameters/H5FilterParametersWriter.cpp  |  4 ++--
 .../Geometry/CompositeTransformContainer.cpp       |  4 ++--
 Source/SIMPLib/Geometry/TransformContainer.cpp     |  4 ++--
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp        |  4 ++--
 Source/SIMPLib/Montages/GridMontage.cpp            |  2 +-
 Source/SIMPLib/Montages/MontageSupport.cpp         |  2 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp     |  4 ++--
 16 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index a7a731bcb1..3df76ba199 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -268,7 +268,7 @@ DataContainerArray::Pointer DataContainerReader::readData(DataContainerArrayProx
     setErrorCondition(-150, ss);
     return DataContainerArray::NullPointer();
   }
-  H5ScopedFileSentinel sentinel(&fileId, true);
+  H5ScopedFileSentinel sentinel(fileId, true);
 
   if(!getInPreflight())
   {
@@ -296,10 +296,10 @@ DataContainerArray::MontageCollection DataContainerReader::readMontageGroup(cons
     setErrorCondition(-155, ss);
     return DataContainerArray::MontageCollection();
   }
-  H5ScopedFileSentinel sentinel(&fileId, true);
+  H5ScopedFileSentinel sentinel(fileId, true);
 
   hid_t groupId = QH5Utilities::openHDF5Object(fileId, SIMPL::StringConstants::MontageGroupName);
-  sentinel.addGroupId(&groupId);
+  sentinel.addGroupId(groupId);
   int err = 0;
   DataContainerArray::MontageCollection montages = MontageSupport::IO::ReadMontagesFromHDF5(groupId, dca, err);
   if(err < 0)
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 52de771a84..0e6e6f50ef 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -168,7 +168,7 @@ void DataContainerWriter::execute()
   // qDebug() << "DREAM3D File: " << m_OutputFile;
 
   // This will make sure if we return early from this method that the HDF5 File is properly closed.
-  H5ScopedFileSentinel scopedFileSentinel(&m_FileId, true);
+  H5ScopedFileSentinel scopedFileSentinel(m_FileId, true);
 
   // Write our File Version string to the Root "/" group
   QH5Lite::writeStringAttribute(m_FileId, "/", SIMPL::HDF5::FileVersionName, SIMPL::HDF5::FileVersion);
@@ -205,7 +205,7 @@ void DataContainerWriter::execute()
     return;
   }
   hid_t dcaGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), H5P_DEFAULT);
-  scopedFileSentinel.addGroupId(&dcaGid);
+  scopedFileSentinel.addGroupId(dcaGid);
 
   QList<QString> dcNames = getDataContainerArray()->getDataContainerNames();
   for(int iter = 0; iter < getDataContainerArray()->getNumDataContainers(); iter++)
@@ -221,7 +221,7 @@ void DataContainerWriter::execute()
     }
 
     hid_t dcGid = H5Gopen(dcaGid, dcNames[iter].toLatin1().data(), H5P_DEFAULT);
-    H5ScopedGroupSentinel groupSentinel(&dcGid, false);
+    H5ScopedGroupSentinel groupSentinel(dcGid, false);
     // QString ss = QObject::tr("Writing %2 DataContainer").arg(dcNames[iter]);
 
     // Have the DataContainer write all of its Attribute Matrices and its Mesh
@@ -303,7 +303,7 @@ int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
   }
   hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerBundleGroupName.toLatin1().data(), H5P_DEFAULT);
 
-  H5GroupAutoCloser groupCloser(&dcbGid);
+  H5GroupAutoCloser groupCloser(dcbGid);
 
   QMap<QString, IDataContainerBundle::Pointer>& bundles = getDataContainerArray()->getDataContainerBundles();
   QMapIterator<QString, IDataContainerBundle::Pointer> iter(bundles);
@@ -336,7 +336,7 @@ int DataContainerWriter::writeMontages(hid_t fileId)
   }
   hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::MontageGroupName.toLatin1().data(), H5P_DEFAULT);
 
-  H5GroupAutoCloser groupCloser(&dcbGid);
+  H5GroupAutoCloser groupCloser(dcbGid);
 
   DataContainerArray::MontageCollection montages = getDataContainerArray()->getMontageCollection();
   for(const auto& montage : montages)
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 215770bd75..4302871b6d 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -168,7 +168,7 @@ void ImportHDF5Dataset::dataCheck()
     std::cout << "Error Reading HDF5 file: " << m_HDF5FilePath.toStdString() << std::endl;
     return;
   }
-  H5ScopedFileSentinel sentinel(&fileId, true);
+  H5ScopedFileSentinel sentinel(fileId, true);
 
   QMap<QString, hid_t> openedParentPathsMap;
   for(int i = 0; i < m_DatasetImportInfoList.size(); i++)
@@ -186,7 +186,7 @@ void ImportHDF5Dataset::dataCheck()
       if(!openedParentPathsMap.contains(parentPath))
       {
         parentId = QH5Utilities::openHDF5Object(fileId, parentPath);
-        sentinel.addGroupId(&parentId);
+        sentinel.addGroupId(parentId);
         openedParentPathsMap.insert(parentPath, parentId);
       }
       else
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
index fcdfdd4593..a3686d7e3f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ImportHDF5DatasetTest.cpp
@@ -187,11 +187,11 @@ class ImportHDF5DatasetTest
 
     hid_t file_id = QH5Utilities::createFile(m_FilePath);
     DREAM3D_REQUIRE(file_id > 0);
-    H5ScopedFileSentinel sentinel(&file_id, false);
+    H5ScopedFileSentinel sentinel(file_id, false);
 
     // Create the Pointer group
     hid_t ptrId = QH5Utilities::createGroup(file_id, "Pointer");
-    sentinel.addGroupId(&ptrId);
+    sentinel.addGroupId(ptrId);
     DREAM3D_REQUIRED(ptrId, >, 0);
 
     DREAM3D_REQUIRE(writePointer1DArrayDataset<int8_t>(ptrId) >= 0);
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index 42eb329fe8..abc1ba6f51 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -455,7 +455,7 @@ int StatsDataArray::writeH5Data(hid_t parentId, const std::vector<size_t>& tDims
   {
     return -1;
   }
-  H5ScopedGroupSentinel scopedFileSentinel(&gid, false); // This makes sure our H5Group is closed up as we exit this function
+  H5ScopedGroupSentinel scopedFileSentinel(gid, false); // This makes sure our H5Group is closed up as we exit this function
 
   // We start numbering our phases at 1. Anything in slot 0 is considered "Dummy" or invalid
   for(qint32 i = 1; i < m_StatsDataArray.size(); ++i)
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 78de210267..bbc4aee63f 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -244,7 +244,7 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
       {
         continue;
       }
-      H5ScopedGroupSentinel sentinel(&attrMatGid, true);
+      H5ScopedGroupSentinel sentinel(attrMatGid, true);
 
       AttributeMatrixProxy amProxy(attributeMatrixName);
       amProxy.setName(attributeMatrixName);
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 02fa66aabc..13f7d04a79 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -126,7 +126,7 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
     {
       continue;
     }
-    H5ScopedGroupSentinel sentinel(&containerGid, false);
+    H5ScopedGroupSentinel sentinel(containerGid, false);
 
     DataContainerProxy dcProxy(dataContainerName);
     dcProxy.setName(dataContainerName);
@@ -250,7 +250,7 @@ int DataContainer::writeAttributeMatricesToHDF5(hid_t parentId) const
       return err;
     }
     attributeMatrixId = H5Gopen(parentId, attrMat->getName().toLatin1().data(), H5P_DEFAULT);
-    H5ScopedGroupSentinel gSentinel(&attributeMatrixId, false);
+    H5ScopedGroupSentinel gSentinel(attributeMatrixId, false);
 
     AttributeMatrix::EnumType attrMatType = static_cast<AttributeMatrix::EnumType>(attrMat->getType());
     err = QH5Lite::writeScalarAttribute(parentId, amName, SIMPL::StringConstants::AttributeMatrixType, attrMatType);
@@ -373,7 +373,7 @@ int DataContainer::writeMeshToHDF5(hid_t dcGid, bool writeXdmf) const
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&geometryId, false);
+  H5ScopedGroupSentinel gSentinel(geometryId, false);
 
   if(nullptr == m_Geometry.get())
   {
@@ -645,7 +645,7 @@ int DataContainer::readMeshDataFromHDF5(hid_t dcGid, bool preflight)
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&geometryId, false);
+  H5ScopedGroupSentinel gSentinel(geometryId, false);
 
   IGeometry::Pointer geomPtr = IGeometry::NullPointer();
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index 610b5bff80..5c35aaefa5 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -226,7 +226,7 @@ int DataContainerBundle::writeH5Data(hid_t groupId)
 {
   hid_t bundleId = QH5Utilities::createGroup(groupId, getName());
   // This object will make sure the HDF5 Group id is closed when it goes out of scope.
-  H5GroupAutoCloser bundleIdClose(&bundleId);
+  H5GroupAutoCloser bundleIdClose(bundleId);
 
   size_t count = static_cast<size_t>(m_DataContainers.size());
   QStringList dcNameList;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 84390af5b8..5b1b890414 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -111,7 +111,7 @@ FilterPipeline::Pointer H5FilterParametersReader::readPipelineFromFile(hid_t fid
     return FilterPipeline::NullPointer();
   }
 
-  H5ScopedGroupSentinel sentinel(&pipelineGroupId, true);
+  H5ScopedGroupSentinel sentinel(pipelineGroupId, true);
 
   setPipelineGroupId(pipelineGroupId);
 
@@ -196,7 +196,7 @@ FilterPipeline::Pointer H5FilterParametersReader::readPipelineFromFile(QString f
     return FilterPipeline::NullPointer();
   }
 
-  H5ScopedFileSentinel sentinel(&fid, true);
+  H5ScopedFileSentinel sentinel(fid, true);
 
   FilterPipeline::Pointer pipeline = readPipelineFromFile(fid, obs);
   return pipeline;
@@ -214,7 +214,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
     return QString();
   }
 
-  H5ScopedFileSentinel sentinel(&fid, true);
+  H5ScopedFileSentinel sentinel(fid, true);
 
   // Open the Pipeline Group
   hid_t pipelineGroupId = H5Gopen(fid, SIMPL::StringConstants::PipelineGroupName.toLatin1().data(), H5P_DEFAULT);
@@ -225,7 +225,7 @@ QString H5FilterParametersReader::getJsonFromFile(QString filePath, IObserver* o
     return QString();
   }
 
-  sentinel.addGroupId(&pipelineGroupId);
+  sentinel.addGroupId(pipelineGroupId);
 
   setPipelineGroupId(pipelineGroupId);
 
@@ -1104,7 +1104,7 @@ DataContainerArrayProxy H5FilterParametersReader::readDataContainerArrayProxy(co
   DataContainerArrayProxy dcaProxy;
   // Open the top level group that holds all the values for this filter parameter
   hid_t dcaGid = QH5Utilities::openHDF5Object(m_CurrentGroupId, name);
-  H5ScopedGroupSentinel sentinel(&dcaGid, true);
+  H5ScopedGroupSentinel sentinel(dcaGid, true);
   if(dcaGid < 0)
   {
     return defValue;
@@ -1119,7 +1119,7 @@ DataContainerArrayProxy H5FilterParametersReader::readDataContainerArrayProxy(co
   for(const auto& dcName : dcaNames)
   {
     hid_t dcGid = QH5Utilities::openHDF5Object(dcaGid, dcName);
-    H5ScopedGroupSentinel sentinal_dc(&dcGid, false);
+    H5ScopedGroupSentinel sentinal_dc(dcGid, false);
     DataContainerProxy dcProxy;
     dcProxy.setName(dcName);
     dcProxy.setFlag(Qt::Checked);
@@ -1134,7 +1134,7 @@ DataContainerArrayProxy H5FilterParametersReader::readDataContainerArrayProxy(co
     for(const auto& amName : amNames)
     {
       hid_t amGid = QH5Utilities::openHDF5Object(dcGid, amName);
-      H5ScopedGroupSentinel sentinal_am(&amGid, false);
+      H5ScopedGroupSentinel sentinal_am(amGid, false);
       AttributeMatrixProxy amProxy(amName, 1u);
       amProxy.setFlag(Qt::Checked);
       QString data; // Output will be read into this object
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index cb89a21249..1f2dcdb887 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -126,14 +126,14 @@ int H5FilterParametersWriter::writePipelineToFile(FilterPipeline::Pointer pipeli
   // This will make sure if we return early from this method that the HDF5 File is properly closed.
   // This will also take care of making sure all groups and file ids are closed
   // before this method returns.
-  H5ScopedFileSentinel scopedFileSentinel(&fileId, true);
+  H5ScopedFileSentinel scopedFileSentinel(fileId, true);
 
   // Write our File Version string to the Root "/" group
   QH5Lite::writeStringAttribute(fileId, "/", SIMPL::HDF5::FileVersionName, SIMPL::HDF5::FileVersion);
   QH5Lite::writeStringAttribute(fileId, "/", SIMPL::HDF5::DREAM3DVersion, SIMPLib::Version::Complete());
 
   hid_t pipelineGroupId = QH5Utilities::createGroup(fileId, SIMPL::StringConstants::PipelineGroupName);
-  scopedFileSentinel.addGroupId(&pipelineGroupId);
+  scopedFileSentinel.addGroupId(pipelineGroupId);
   setGroupId(pipelineGroupId);
 
   QH5Lite::writeScalarAttribute(pipelineGroupId, "/" + SIMPL::StringConstants::PipelineGroupName, SIMPL::StringConstants::PipelineVersionName, 2);
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index 4142039065..fc40a65c0b 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -63,7 +63,7 @@ int CompositeTransformContainer::writeTransformContainerToHDF5(hid_t parentId, c
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&transformContainerId, false);
+  H5ScopedGroupSentinel gSentinel(transformContainerId, false);
 
   err = QH5Lite::writeStringAttribute(parentId, transformContainerName.c_str(), SIMPL::Geometry::TransformContainerTypeName, SIMPL::Geometry::CompositeTransformContainer);
   if(err < 0)
@@ -94,7 +94,7 @@ int CompositeTransformContainer::readTransformContainerFromHDF5(hid_t parentId,
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&transformContainerGrpId, false);
+  H5ScopedGroupSentinel gSentinel(transformContainerGrpId, false);
 
   hsize_t idx = 0;
   H5Gget_num_objs(transformContainerGrpId, &idx);
diff --git a/Source/SIMPLib/Geometry/TransformContainer.cpp b/Source/SIMPLib/Geometry/TransformContainer.cpp
index eb6de371a1..45047fe820 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/TransformContainer.cpp
@@ -64,7 +64,7 @@ int TransformContainer::writeTransformContainerToHDF5(hid_t parentId, const std:
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&transformId, false);
+  H5ScopedGroupSentinel gSentinel(transformId, false);
   std::vector<hsize_t> dims(1);
   TransformParametersType parameters = this->getParameters();
   dims[0] = parameters.size();
@@ -116,7 +116,7 @@ int TransformContainer::readTransformContainerFromHDF5(hid_t parentId, bool meta
   {
     return -1;
   }
-  H5ScopedGroupSentinel gSentinel(&transformId, false);
+  H5ScopedGroupSentinel gSentinel(transformId, false);
   TransformParametersType parameters;
   err = H5Lite::readVectorDataset(transformId, SIMPL::Geometry::TransformContainerParameters.toLatin1().data(), parameters);
   if(err < 0)
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index 04f9ab2504..66fc7a312e 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -537,7 +537,7 @@ int H5PrecipitateStatsDataDelegate::writeRDFDistributionData(hid_t pid, RdfData:
     hid_t disId = QH5Utilities::createGroup(pid, hdf5GroupName);
     if(disId > 0)
     {
-      H5ScopedGroupSentinel sentinel(&disId, false);
+      H5ScopedGroupSentinel sentinel(disId, false);
       std::vector<hsize_t> dims(1);
       // Write the Frequencies
       std::vector<float> freqs = rdfData->getFrequencies();
@@ -652,7 +652,7 @@ int H5PrecipitateStatsDataDelegate::readRDFDistributionData(hid_t pid, const QSt
   {
     return -1;
   }
-  H5ScopedGroupSentinel sentinel(&disId, false);
+  H5ScopedGroupSentinel sentinel(disId, false);
 
   std::vector<float> freqs;
   err = H5Lite::readVectorDataset(disId, SIMPL::StringConstants::Frequencies.toStdString(), freqs);
diff --git a/Source/SIMPLib/Montages/GridMontage.cpp b/Source/SIMPLib/Montages/GridMontage.cpp
index ccf214139e..0556850782 100644
--- a/Source/SIMPLib/Montages/GridMontage.cpp
+++ b/Source/SIMPLib/Montages/GridMontage.cpp
@@ -578,7 +578,7 @@ int GridMontage::writeH5Data(hid_t groupId) const
 {
   hid_t montageId = QH5Utilities::createGroup(groupId, getName());
   // This object will make sure the HDF5 Group id is closed when it goes out of scope.
-  H5GroupAutoCloser bundleIdClose(&montageId);
+  H5GroupAutoCloser bundleIdClose(montageId);
 
   int err = QH5Lite::writeStringDataset(montageId, "Montage Type", "GridMontage");
   if(err < 0)
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
index 6c69d742aa..be9f1156de 100644
--- a/Source/SIMPLib/Montages/MontageSupport.cpp
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -130,7 +130,7 @@ DataContainerArray::MontageCollection MontageSupport::IO::ReadMontagesFromHDF5(h
   {
     hid_t montageId = QH5Utilities::openHDF5Object(parentId, name);
     // This object will make sure the HDF5 Group id is closed when it goes out of scope.
-    H5GroupAutoCloser bundleIdClose(&montageId);
+    H5GroupAutoCloser bundleIdClose(montageId);
 
     if(!montageCollection.insert(ReadMontageFromHDF5(montageId, dca, err)))
     {
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 026ba7582b..b7ba7497b2 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -292,7 +292,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
     return false;
   }
 
-  H5ScopedGroupSentinel sentinel(&dcbGroupId, false);
+  H5ScopedGroupSentinel sentinel(dcbGroupId, false);
 
   QList<QString> groupNames;
   err = QH5Utilities::getGroupObjects(dcbGroupId, H5Utilities::CustomHDFDataTypes::Group, groupNames);
@@ -311,7 +311,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
     DataContainerBundle::Pointer bundle = DataContainerBundle::New(bundleName);
 
     hid_t bundleId = H5Gopen(dcbGroupId, bundleName.toLatin1().constData(), H5P_DEFAULT);
-    sentinel.addGroupId(&bundleId); // Make sure this group gets closed
+    sentinel.addGroupId(bundleId); // Make sure this group gets closed
 
     // Read in the Data Container Names
     QString dcNames;

From ec595e2ca1447b8139c86382971bd21467347611 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 24 Aug 2020 21:53:53 -0400
Subject: [PATCH 278/397] Fixed memory leak in
 LinkedPathCreationFilterParameter

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../LinkedPathCreationFilterParameter.cpp     | 39 ++++++++++---------
 .../LinkedPathCreationFilterParameter.h       | 20 +++++-----
 2 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 59e379fe61..9a3964b029 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -38,59 +38,60 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedDataPath::GetterCallbackType callback, DataArrayPathHelper::DataType dataType)
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedDataPath::GetterCallbackType callback, DataArrayPathHelper::DataType dataType)
 {
-  return new LinkedDataPath(callback, dataType);
+  return std::make_unique<LinkedDataPath>(callback, dataType);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback)
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback)
 {
-  return new LinkedStringPath(dcCallback);
+  return std::make_unique<LinkedStringPath>(dcCallback);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback, LinkedStringPath::GetterCallbackType amCallback)
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedStringPath::GetterCallbackType dcCallback,
+                                                                                                                    LinkedStringPath::GetterCallbackType amCallback)
 {
-  return new LinkedStringPath(dcCallback, amCallback);
+  return std::make_unique<LinkedStringPath>(dcCallback, amCallback);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
                                                                                                     LinkedMixedPath::PathGetterCallbackType amCallback)
 {
-  return new LinkedMixedPath(dcCallback, amCallback);
+  return std::make_unique<LinkedMixedPath>(dcCallback, amCallback);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
                                                                                                     LinkedMixedPath::StringGetterCallbackType amCallback)
 {
-  return new LinkedMixedPath(dcCallback, amCallback);
+  return std::make_unique<LinkedMixedPath>(dcCallback, amCallback);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType pathCallback)
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType pathCallback)
 {
-  return new LinkedDataPath(pathCallback, DataArrayPathHelper::DataType::DataContainer);
+  return std::make_unique<LinkedDataPath>(pathCallback, DataArrayPathHelper::DataType::DataContainer);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::ILinkedPath* LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType callback)
+std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType callback)
 {
-  return new LinkedAdvComparisonPath(callback);
+  return std::make_unique<LinkedAdvComparisonPath>(callback);
 }
 
 // -----------------------------------------------------------------------------
@@ -107,7 +108,8 @@ LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = defaul
 //
 // -----------------------------------------------------------------------------
 LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, ILinkedPath* linkedPath,
+                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                  std::unique_ptr<ILinkedPath> linkedPath,
                                                                                   int groupIndex)
 {
 
@@ -115,7 +117,7 @@ LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::Ne
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
   ptr->setDefaultValue(defaultValue);
-  ptr->setLinkedPath(linkedPath);
+  ptr->setLinkedPath(std::move(linkedPath));
   ptr->setCategory(category);
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
@@ -307,10 +309,9 @@ DataArrayPath LinkedPathCreationFilterParameter::LinkedAdvComparisonPath::genera
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void LinkedPathCreationFilterParameter::setLinkedPath(ILinkedPath* linkedPath)
+void LinkedPathCreationFilterParameter::setLinkedPath(std::unique_ptr<ILinkedPath> linkedPath)
 {
-  delete m_LinkedPath;
-  m_LinkedPath = linkedPath;
+  m_LinkedPath = std::move(linkedPath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index a777508324..16e6068b49 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -247,14 +247,14 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param DataType
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedDataPath::GetterCallbackType, DataArrayPathHelper::DataType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedDataPath::GetterCallbackType, DataArrayPathHelper::DataType);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
    * @param QString getter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedStringPath::GetterCallbackType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedStringPath::GetterCallbackType);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
@@ -262,7 +262,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param QString getter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedStringPath::GetterCallbackType, LinkedStringPath::GetterCallbackType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedStringPath::GetterCallbackType, LinkedStringPath::GetterCallbackType);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
@@ -270,7 +270,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param DataArrayPath getter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::PathGetterCallbackType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::PathGetterCallbackType);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
@@ -278,21 +278,21 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param QString getter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::StringGetterCallbackType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType, LinkedMixedPath::StringGetterCallbackType);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
    * @param DataArrayPath dcGetter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcGetter);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcGetter);
 
   /**
    * @brief Create and return an ILinkedPath based on the given Parameters
    * @param AdvancedComparison getter
    * @return
    */
-  static ILinkedPath* CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType);
+  static std::unique_ptr<ILinkedPath> CreateLinkedPath(LinkedAdvComparisonPath::GetterCallbackType);
 
   /**
    * @brief New This function instantiates an instance of the LinkedPathCreationFilterParameter. Although this function is available to be used,
@@ -311,7 +311,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @return
    */
   static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, ILinkedPath* linkedPath, int groupIndex = -1);
+                     const GetterCallbackType& getterCallback, std::unique_ptr<ILinkedPath> linkedPath, int groupIndex = -1);
 
   ~LinkedPathCreationFilterParameter() override;
 
@@ -368,7 +368,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @brief Set the ILinkedPath for determining what the parent container is
    * @param linkedPath
    */
-  void setLinkedPath(ILinkedPath* linkedPath);
+  void setLinkedPath(std::unique_ptr<ILinkedPath> linkedPath);
 
   /**
    * @brief Returned the linked DataArrayPath
@@ -387,7 +387,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
   LinkedPathCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
   LinkedPathCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 
-  ILinkedPath* m_LinkedPath = nullptr;
+  std::unique_ptr<ILinkedPath> m_LinkedPath = nullptr;
 
 public:
   LinkedPathCreationFilterParameter(const LinkedPathCreationFilterParameter&) = delete;            // Copy Constructor Not Implemented

From 9f8d221df34988983320ae882b697efe626b299b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 25 Aug 2020 11:59:16 -0400
Subject: [PATCH 279/397] Fixed out of bounds access in IVec3 constructor

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 0a591e6853..0bcbe9e61e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -100,7 +100,7 @@ class MultiThresholdObjectsTest
     // Set up geometry for tuples, a cuboid with dimensions 20, 10, 1
     ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
     vdc->setGeometry(image);
-    size_t dims[1] = {20};
+    std::array<size_t, 3> dims = {20, 1, 1};
     image->setDimensions(dims);
 
     std::vector<size_t> tDims(1, 0);

From 7905313984a49aab9a6a74ad89cd2b10d65c0c07 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 25 Aug 2020 12:53:59 -0400
Subject: [PATCH 280/397] Fixed double close of HDF5 objects

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../CoreFilters/DataContainerWriter.cpp       | 94 ++++++-------------
 .../SIMPLib/CoreFilters/DataContainerWriter.h | 15 ---
 2 files changed, 29 insertions(+), 80 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 0e6e6f50ef..84932421b8 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -57,9 +57,6 @@
 extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
 #endif
 
-#define APPEND_DATA_TRUE 1
-#define APPEND_DATA_FALSE 0
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -69,17 +66,13 @@ DataContainerWriter::DataContainerWriter()
 , m_WriteXdmfFile(true)
 , m_WriteTimeSeries(false)
 , m_AppendToExisting(false)
-, m_FileId(-1)
 {
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerWriter::~DataContainerWriter()
-{
-  closeFile();
-}
+DataContainerWriter::~DataContainerWriter() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -111,7 +104,6 @@ void DataContainerWriter::readFilterParameters(AbstractFilterParametersReader* r
 // -----------------------------------------------------------------------------
 void DataContainerWriter::initialize()
 {
-  m_FileId = -1;
 }
 
 // -----------------------------------------------------------------------------
@@ -144,8 +136,6 @@ void DataContainerWriter::execute()
     return;
   }
 
-  int err = 0;
-
   // Make sure any directory path is also available as the user may have just typed
   // in a path without actually creating the full path
   QFileInfo fi(m_OutputFile);
@@ -158,8 +148,20 @@ void DataContainerWriter::execute()
     return;
   }
 
-  err = openFile(m_AppendToExisting); // Do NOT append to any existing file
-  if(err < 0)
+  hid_t fileId = -1;
+
+  // Try to open a file to append data into
+  if(m_AppendToExisting)
+  {
+    fileId = QH5Utilities::openFile(m_OutputFile, false);
+  }
+  // No file was found or we are writing new data only to a clean file
+  if(!m_AppendToExisting || fileId < 0)
+  {
+    fileId = QH5Utilities::createFile(m_OutputFile);
+  }
+
+  if(fileId < 0)
   {
     QString ss = QObject::tr("The HDF5 file could not be opened or created.\n The given filename was:\n\t[%1]").arg(m_OutputFile);
     setErrorCondition(-11112, ss);
@@ -168,11 +170,11 @@ void DataContainerWriter::execute()
   // qDebug() << "DREAM3D File: " << m_OutputFile;
 
   // This will make sure if we return early from this method that the HDF5 File is properly closed.
-  H5ScopedFileSentinel scopedFileSentinel(m_FileId, true);
+  H5ScopedFileSentinel scopedFileSentinel(fileId, true);
 
   // Write our File Version string to the Root "/" group
-  QH5Lite::writeStringAttribute(m_FileId, "/", SIMPL::HDF5::FileVersionName, SIMPL::HDF5::FileVersion);
-  QH5Lite::writeStringAttribute(m_FileId, "/", SIMPL::HDF5::DREAM3DVersion, SIMPLib::Version::Complete());
+  QH5Lite::writeStringAttribute(fileId, "/", SIMPL::HDF5::FileVersionName, SIMPL::HDF5::FileVersion);
+  QH5Lite::writeStringAttribute(fileId, "/", SIMPL::HDF5::DREAM3DVersion, SIMPLib::Version::Complete());
   QFile xdmfFile;
   QTextStream xdmfOut(&xdmfFile);
   if(m_WriteXdmfFile)
@@ -195,16 +197,16 @@ void DataContainerWriter::execute()
   }
 
   // Write the Pipeline to the File
-  err = writePipeline();
+  int err = writePipeline();
 
-  err = H5Utilities::createGroupsFromPath(SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), m_FileId);
+  err = H5Utilities::createGroupsFromPath(SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), fileId);
   if(err < 0)
   {
     QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerGroupName);
     setErrorCondition(-60, ss);
     return;
   }
-  hid_t dcaGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), H5P_DEFAULT);
+  hid_t dcaGid = H5Gopen(fileId, SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), H5P_DEFAULT);
   scopedFileSentinel.addGroupId(dcaGid);
 
   QList<QString> dcNames = getDataContainerArray()->getDataContainerNames();
@@ -250,7 +252,7 @@ void DataContainerWriter::execute()
       dc->getGeometry()->setTemporalDataPath(DataArrayPath(dc->getName(), SIMPL::StringConstants::MetaData, "Step #"));
 #endif
 
-      QString hdfFileName = QH5Utilities::fileNameFromFileId(m_FileId);
+      QString hdfFileName = QH5Utilities::fileNameFromFileId(fileId);
       err = dc->writeXdmf(xdmfOut, hdfFileName);
       if(err < 0)
       {
@@ -261,7 +263,7 @@ void DataContainerWriter::execute()
   }
 
   // Write the Data ContainerBundles
-  err = writeDataContainerBundles(m_FileId);
+  err = writeDataContainerBundles(fileId);
   if(err < 0)
   {
     QString ss = QObject::tr("Error writing DataContainerBundles");
@@ -270,7 +272,7 @@ void DataContainerWriter::execute()
   }
 
   // Write Montages
-  err = writeMontages(m_FileId);
+  err = writeMontages(fileId);
   if(err < 0)
   {
     QString ss = QObject::tr("Error writing montages");
@@ -283,10 +285,6 @@ void DataContainerWriter::execute()
   {
     writeXdmfFooter(xdmfOut);
   }
-
-  H5Gclose(dcaGid);
-
-  dcaGid = -1;
 }
 
 // -----------------------------------------------------------------------------
@@ -294,14 +292,14 @@ void DataContainerWriter::execute()
 // -----------------------------------------------------------------------------
 int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
 {
-  int err = QH5Utilities::createGroupsFromPath(SIMPL::StringConstants::DataContainerBundleGroupName, m_FileId);
+  int err = QH5Utilities::createGroupsFromPath(SIMPL::StringConstants::DataContainerBundleGroupName, fileId);
   if(err < 0)
   {
     QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerBundleGroupName);
     setErrorCondition(-61, ss);
     return -1;
   }
-  hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerBundleGroupName.toLatin1().data(), H5P_DEFAULT);
+  hid_t dcbGid = H5Gopen(fileId, SIMPL::StringConstants::DataContainerBundleGroupName.toLatin1().data(), H5P_DEFAULT);
 
   H5GroupAutoCloser groupCloser(dcbGid);
 
@@ -317,8 +315,6 @@ int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
       return err;
     }
   }
-  H5Gclose(dcbGid);
-  dcbGid = -1;
   return 0;
 }
 
@@ -327,14 +323,14 @@ int DataContainerWriter::writeDataContainerBundles(hid_t fileId)
 // -----------------------------------------------------------------------------
 int DataContainerWriter::writeMontages(hid_t fileId)
 {
-  int err = QH5Utilities::createGroupsFromPath(SIMPL::StringConstants::MontageGroupName, m_FileId);
+  int err = QH5Utilities::createGroupsFromPath(SIMPL::StringConstants::MontageGroupName, fileId);
   if(err < 0)
   {
     QString ss = QObject::tr("Error creating HDF5 Group '%1'").arg(SIMPL::StringConstants::MontageGroupName);
     setErrorCondition(-62, ss);
     return -1;
   }
-  hid_t dcbGid = H5Gopen(m_FileId, SIMPL::StringConstants::MontageGroupName.toLatin1().data(), H5P_DEFAULT);
+  hid_t dcbGid = H5Gopen(fileId, SIMPL::StringConstants::MontageGroupName.toLatin1().data(), H5P_DEFAULT);
 
   H5GroupAutoCloser groupCloser(dcbGid);
 
@@ -347,8 +343,7 @@ int DataContainerWriter::writeMontages(hid_t fileId)
       return err;
     }
   }
-  H5Gclose(dcbGid);
-  dcbGid = -1;
+
   return 0;
 }
 
@@ -422,37 +417,6 @@ int DataContainerWriter::writePipeline()
   return writer->writePipelineToFile(pipeline, m_OutputFile, SIMPL::StringConstants::PipelineGroupName, true);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-hid_t DataContainerWriter::openFile(bool appendData)
-{
-  // Try to open a file to append data into
-  if(APPEND_DATA_TRUE == static_cast<int>(appendData))
-  {
-    m_FileId = QH5Utilities::openFile(m_OutputFile, false);
-  }
-  // No file was found or we are writing new data only to a clean file
-  if(APPEND_DATA_FALSE == static_cast<int>(appendData) || m_FileId < 0)
-  {
-    m_FileId = QH5Utilities::createFile(m_OutputFile);
-  }
-  return m_FileId;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-herr_t DataContainerWriter::closeFile()
-{
-  // Close the file when we are finished with it
-  if(m_FileId > 0)
-  {
-    return QH5Utilities::closeFile(m_FileId);
-  }
-  return 1;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 3c1f823ed3..85353648c6 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -213,19 +213,6 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
    */
   void initialize();
 
-  /**
-   * @brief openFile Opens or creates an HDF5 file to write data into
-   * @param append Should a new file be created or append data to a currently existing file
-   * @return
-   */
-  hid_t openFile(bool append = false);
-
-  /**
-   * @brief closeFile Closes the currently open file
-   * @return Integer error value
-   */
-  herr_t closeFile();
-
   /**
    * @brief writePipeline Writes the existing pipeline to the HDF5 file
    * @return
@@ -265,8 +252,6 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
   bool m_WriteTimeSeries = {};
   bool m_AppendToExisting = {};
 
-  hid_t m_FileId;
-
 public:
   DataContainerWriter(const DataContainerWriter&) = delete;            // Copy Constructor Not Implemented
   DataContainerWriter(DataContainerWriter&&) = delete;                 // Move Constructor Not Implemented

From 2cb4bed6c582626c18737a9323fbcc292bebd71b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 27 Aug 2020 20:09:01 -0400
Subject: [PATCH 281/397] Added ghcFilesystem to SIMPL

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                           | 14 ++++++++++++++
 Source/SIMPLib/CMakeLists.txt            |  4 ++++
 Source/SIMPLib/SIMPLibConfiguration.h.in |  9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d973892d2..bbb30c0fd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -419,6 +419,20 @@ if(SIMPL_USE_ITK)
   endif()
 endif()
 
+if(NOT DEFINED SIMPL_USE_GHC_FILESYSTEM)
+  set(SIMPL_USE_GHC_FILESYSTEM OFF)
+
+  if(APPLE OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    set(SIMPL_USE_GHC_FILESYSTEM ON)
+  elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" AND "${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
+    set(SIMPL_USE_GHC_FILESYSTEM ON)
+  endif()
+endif()
+
+if(SIMPL_USE_GHC_FILESYSTEM)
+  find_package(ghcFilesystem REQUIRED)
+endif()
+
 # -----------------------------------------------------------------------
 # -- Add in the SIMPL Sources into a library
 add_subdirectory( ${SIMPLProj_SOURCE_DIR}/Source/SIMPLib ${PROJECT_BINARY_DIR}/SIMPLib)
diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index affc4a4e33..45d3bd8c38 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -191,6 +191,10 @@ if(APPLE AND "${ITK_VERSION_MAJOR}" STREQUAL "5" AND SIMPL_USE_ITK)
   list(APPEND ${PROJECT_NAME}_LINK_LIBS SimpleITKExplicit)
 endif()
 
+if(SIMPL_USE_GHC_FILESYSTEM)
+  list(APPEND ${PROJECT_NAME}_LINK_LIBS ghcFilesystem::ghc_filesystem)
+endif()
+
 #-------------------------------------------------------------------------------
 # Add the SIMPLib Library
 add_library(${PROJECT_NAME} ${LIB_TYPE} ${Project_SRCS} )
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index 2bae925cff..249dcf1822 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -109,3 +109,12 @@ Q_DECLARE_METATYPE(uint64_t)
 Q_DECLARE_METATYPE(int64_t)
 
 #endif
+
+#cmakedefine SIMPL_USE_GHC_FILESYSTEM
+#ifdef SIMPL_USE_GHC_FILESYSTEM
+#include <ghc/filesystem.hpp>
+namespace fs = ghc::filesystem;
+#else
+#include <filesystem>
+namespace fs = std::filesystem;
+#endif

From 37ffefcac6c0d09daa2b3d55fe97ff2c37a96239 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 28 Aug 2020 10:23:43 -0400
Subject: [PATCH 282/397] Fixed out of bounds access in
 MultiThresholdObjects2Test

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index b52f945116..bdfa3c8602 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -33,6 +33,8 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <array>
+
 #include <QtCore/QString>
 
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -102,7 +104,7 @@ class MultiThresholdObjects2Test
     // Set up geometry for tuples, a cuboid with dimensions 20, 10, 1
     ImageGeom::Pointer image = ImageGeom::CreateGeometry(SIMPL::Geometry::ImageGeometry);
     vdc->setGeometry(image);
-    size_t dims[1] = {20};
+    std::array<size_t, 3> dims = {20, 1, 1};
     image->setDimensions(dims);
 
     std::vector<size_t> tDims(1, 0);

From 2a4137de2b30eaa268ddb3d1da18f4d7cdd76f32 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 3 Sep 2020 09:58:27 -0400
Subject: [PATCH 283/397] Fix memory leak in the RawBinaryReader Unit Test

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Testing/Cxx/RawBinaryReaderTest.cpp       | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 5669d599a4..08c771a64b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -791,10 +791,10 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase6: This tests when skipHeaderBytes equals the file size
   template <typename T, size_t N>
-  void testCase6_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase6_Execute(SIMPL::NumericTypes::Type scalarType)
   {
-    int dataArraySize = 1000;
-    int junkArraySize = k_ArraySize * N;
+    size_t dataArraySize = 1000;
+    size_t junkArraySize = k_ArraySize * N;
     int skipHeaderBytes = junkArraySize * sizeof(T);
     int err = 0;
     // qDebug() << "Testing case 6: " << name << " with num comps " << N;
@@ -811,16 +811,10 @@ class RawBinaryReaderTest
     }
 
     // Create junkArray
-    T* junkArray = new T[junkArraySize];
-
-    // Write a pattern into junkArray
-    for(size_t i = 0; i < junkArraySize; ++i)
-    {
-      junkArray[i] = (unsigned)0xAB;
-    }
+    std::vector<T> junkArray(junkArraySize, 0xAB);
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
-    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::Start);
+    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray.data(), junkArraySize, Detail::Start);
 
     // Test to make sure that the file was created and written to successfully
     DREAM3D_REQUIRED(result, ==, true)
@@ -854,11 +848,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase6_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase6_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase6_Execute<T, 1>(name, scalarType);
-    testCase6_Execute<T, 2>(name, scalarType);
-    testCase6_Execute<T, 3>(name, scalarType);
+    testCase6_Execute<T, 1>(scalarType);
+    testCase6_Execute<T, 2>(scalarType);
+    testCase6_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -875,16 +869,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase6_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase6_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase6_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase6_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase6_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase6_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase6_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase6_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase6_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase6_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase6_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase6_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase6_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase6_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase6_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase6_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase6_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase6_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase6_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase6_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------

From 271bf496f3da41b2c27fa26d1185cea60a51c4dd Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 3 Sep 2020 10:40:46 -0400
Subject: [PATCH 284/397] Fix more memory leaks in RawBinaryReaderTest

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Testing/Cxx/RawBinaryReaderTest.cpp        | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 08c771a64b..d0b8fc3201 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -557,13 +557,10 @@ class RawBinaryReaderTest
     }
 
     // Create junkArray
-    T* junkArray = new T[junkArraySize];
-
+    std::vector<T> junkArray(junkArraySize, 0xAB);
+    
     // Write a pattern into junkArray
-    for(size_t i = 0; i < junkArraySize; ++i)
-    {
-      junkArray[i] = (unsigned)0xAB;
-    }
+    ::memset(reinterpret_cast<uint8_t*>(junkArray.data()), 0xAB, junkArraySize * sizeof(T))
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
     bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::Start);
@@ -698,13 +695,10 @@ class RawBinaryReaderTest
     }
 
     // Create junkArray
-    T* junkArray = new T[junkArraySize];
-
+    std::vector<T> junkArray(junkArraySize, 0xAB);
+    
     // Write a pattern into junkArray
-    for(size_t i = 0; i < junkArraySize; ++i)
-    {
-      junkArray[i] = (unsigned)0xAB;
-    }
+    ::memset(reinterpret_cast<uint8_t*>(junkArray.data()), 0xAB, junkArraySize * sizeof(T))
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
     bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::Both);

From 32e879402baccde336195d4ca2cf4ec6b78aab0f Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 3 Sep 2020 12:27:05 -0400
Subject: [PATCH 285/397] Fixed compile errors in RawBinaryReaderTest

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index d0b8fc3201..32953bfc42 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -560,10 +560,10 @@ class RawBinaryReaderTest
     std::vector<T> junkArray(junkArraySize, 0xAB);
     
     // Write a pattern into junkArray
-    ::memset(reinterpret_cast<uint8_t*>(junkArray.data()), 0xAB, junkArraySize * sizeof(T))
+    std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
-    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::Start);
+    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray.data(), junkArray.size(), Detail::Start);
 
     // Test to make sure that the file was created and written to successfully
     DREAM3D_REQUIRED(result, ==, true)
@@ -698,10 +698,10 @@ class RawBinaryReaderTest
     std::vector<T> junkArray(junkArraySize, 0xAB);
     
     // Write a pattern into junkArray
-    ::memset(reinterpret_cast<uint8_t*>(junkArray.data()), 0xAB, junkArraySize * sizeof(T))
+    std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
-    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::Both);
+    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray.data(), junkArray.size(), Detail::Both);
 
     // Test to make sure that the file was created and written to successfully
     DREAM3D_REQUIRED(result, ==, true)

From 34dd47351d0003bf23dc048088465042807a0c61 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 3 Sep 2020 18:39:35 -0400
Subject: [PATCH 286/397] Changed QCoreApplication to be on the stack

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/PipelineRunner/PipelineRunner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 29c03a3842..1c968cb222 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -71,7 +71,7 @@ int main(int argc, char* argv[])
 {
 
   // Instantiate the QCoreApplication that we need to get the current path and load plugins.
-  QCoreApplication* app = new QCoreApplication(argc, argv);
+  QCoreApplication app(argc, argv);
   QCoreApplication::setOrganizationName("BlueQuartz Software");
   QCoreApplication::setOrganizationDomain("bluequartz.net");
   QCoreApplication::setApplicationName("PipelineRunner");
@@ -93,7 +93,7 @@ int main(int argc, char* argv[])
   parser.addOption(pipelineFileArg);
 
   // Process the actual command line arguments given by the user
-  parser.process(*app);
+  parser.process(app);
 
   QString pipelineFile = parser.value(pipelineFileArg);
 

From fbc63d8a9146eb108a75224856d38ded63a83a9b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 3 Sep 2020 18:50:17 -0400
Subject: [PATCH 287/397] Removed unused member variables from PostSlackMessage
 filter

* Possible fix for random segfaults

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/PostSlackMessage.cpp |  6 +-----
 Source/SIMPLib/CoreFilters/PostSlackMessage.h   | 10 ----------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 8dde30f2b4..994a87567e 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -57,16 +57,12 @@ PostSlackMessage::PostSlackMessage()
 {
   m_SlackUser = "[DREAM.3D@" + QSysInfo::machineHostName() + "]";
   initialize();
-  m_NetworkManager = new QNetworkAccessManager(this);
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PostSlackMessage::~PostSlackMessage()
-{
-  delete m_NetworkManager;
-}
+PostSlackMessage::~PostSlackMessage() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index e9e15f4559..47cc0b4639 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -34,15 +34,9 @@
 
 #include <memory>
 
-#include <QtCore/QWaitCondition>
-#include <QtCore/QMutex>
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-class QNetworkAccessManager;
-class QNetworkReply;
-
 /**
  * @brief The PostSlackMessage class. See [Filter documentation](@ref postslackmessage) for details.
  */
@@ -214,10 +208,6 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   QString m_SlackMessage = {};
   bool m_WarningsAsError = {};
 
-  QWaitCondition m_WaitCondition;
-  QMutex m_Mutex;
-  QNetworkAccessManager* m_NetworkManager;
-
 public:
   PostSlackMessage(const PostSlackMessage&) = delete;            // Copy Constructor Not Implemented
   PostSlackMessage(PostSlackMessage&&) = delete;                 // Move Constructor Not Implemented

From 98d91a3e59ee1784f50ef8ab7f425746b4dd72fb Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 4 Sep 2020 16:36:53 -0400
Subject: [PATCH 288/397] Fixing memory leaks detected by ASAN.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Testing/Cxx/RawBinaryReaderTest.cpp       | 196 +++++++++---------
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |  24 +--
 .../ExecutePipelineController.cpp             |   6 +
 .../V1Controllers/ExecutePipelineController.h |   1 +
 4 files changed, 109 insertions(+), 118 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index 32953bfc42..d335d0232b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -220,13 +220,12 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase1: This tests when the file size is equal to the allocated size, and checks to see if the data read is the same as the data written.
   template <typename T, size_t N>
-  int testCase1_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  int testCase1_Execute(SIMPL::NumericTypes::Type scalarType)
   {
+    size_t dataArraySize = k_ArraySize * N;
+    size_t junkArraySize = 0;
+    size_t skipHeaderBytes = 0;
     int err = 0;
-    int dataArraySize = k_ArraySize * N;
-    int junkArraySize = 0;
-    int skipHeaderBytes = 0;
-    //// qDebug() << "Testing case 1: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
     typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"), true);
@@ -289,11 +288,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase1_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase1_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase1_Execute<T, 1>(name, scalarType);
-    testCase1_Execute<T, 2>(name, scalarType);
-    testCase1_Execute<T, 3>(name, scalarType);
+    testCase1_Execute<T, 1>(scalarType);
+    testCase1_Execute<T, 2>(scalarType);
+    testCase1_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -310,16 +309,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase1_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase1_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase1_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase1_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase1_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase1_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase1_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase1_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase1_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase1_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase1_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase1_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase1_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase1_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase1_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase1_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase1_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase1_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase1_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase1_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------
@@ -327,12 +326,12 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase2: This tests when the file size is smaller than the allocated size. (Reading past the end of the file)
   template <typename T, size_t N>
-  void testCase2_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase2_Execute(SIMPL::NumericTypes::Type scalarType)
   {
+    size_t dataArraySize = k_ArraySize * N / 2; // We don't care what is written...we just need the data array size to be less than the file size
+    size_t junkArraySize = 0;
+    size_t skipHeaderBytes = junkArraySize * sizeof(T);
     int err = 0;
-    int dataArraySize = k_ArraySize * N / 2; // We don't care what is written...we just need the data array size to be less than the file size
-    int junkArraySize = 0;
-    int skipHeaderBytes = junkArraySize * sizeof(T);
     // qDebug() << "Testing case 2: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
@@ -386,11 +385,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase2_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase2_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase2_Execute<T, 1>(name, scalarType);
-    testCase2_Execute<T, 2>(name, scalarType);
-    testCase2_Execute<T, 3>(name, scalarType);
+    testCase2_Execute<T, 1>(scalarType);
+    testCase2_Execute<T, 2>(scalarType);
+    testCase2_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -407,16 +406,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase2_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase2_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase2_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase2_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase2_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase2_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase2_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase2_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase2_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase2_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase2_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase2_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase2_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase2_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase2_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase2_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase2_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase2_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase2_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase2_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------
@@ -424,11 +423,11 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase3: This tests when the file size is larger than the allocated size and there is junk at the end of the file.
   template <typename T, size_t N>
-  void testCase3_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase3_Execute(SIMPL::NumericTypes::Type scalarType)
   {
-    int dataArraySize = k_ArraySize * N;
-    int junkArraySize = 10;
-    int skipHeaderBytes = 0;
+    size_t dataArraySize = k_ArraySize * N;
+    size_t junkArraySize = 10;
+    size_t skipHeaderBytes = 0;
     int err = 0;
     // qDebug() << "Testing case 3: " << name << " with num comps " << N;
 
@@ -444,16 +443,13 @@ class RawBinaryReaderTest
     }
 
     // Create junkArray
-    T* junkArray = new T[junkArraySize];
+    std::vector<T> junkArray(junkArraySize);
 
     // Write a pattern into junkArray
-    for(size_t i = 0; i < junkArraySize; ++i)
-    {
-      junkArray[i] = (unsigned)0xAB;
-    }
+    std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
 
     // Create the file and write to it.  If any of the information is wrong, the result will be false
-    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray, junkArraySize, Detail::End);
+    bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray.data(), junkArraySize, Detail::End);
 
     // Test to make sure that the file was created and written to successfully
     DREAM3D_REQUIRED(result, ==, true)
@@ -499,11 +495,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase3_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase3_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase3_Execute<T, 1>(name, scalarType);
-    testCase3_Execute<T, 2>(name, scalarType);
-    testCase3_Execute<T, 3>(name, scalarType);
+    testCase3_Execute<T, 1>(scalarType);
+    testCase3_Execute<T, 2>(scalarType);
+    testCase3_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -520,16 +516,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase3_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase3_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase3_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase3_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase3_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase3_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase3_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase3_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase3_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase3_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase3_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase3_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase3_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase3_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase3_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase3_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase3_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase3_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase3_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase3_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------
@@ -537,17 +533,16 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase4: This tests when the file size is larger than the allocated size and there is junk at the beginning of the file.
   template <typename T, size_t N>
-  void testCase4_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase4_Execute(SIMPL::NumericTypes::Type scalarType)
   {
-    int dataArraySize = k_ArraySize * N;
-    int junkArraySize = 5;
-    int skipHeaderBytes = junkArraySize * sizeof(T);
+    size_t dataArraySize = k_ArraySize * N;
+    size_t junkArraySize = 5;
+    size_t skipHeaderBytes = junkArraySize * sizeof(T);
     int err = 0;
     // qDebug() << "Testing case 4: " << name << " with num comps " << N;
 
     // Allocate an array, and get the dataArray from that array
-    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"),
-                                                                     true); // This makes sure our allocated array is deleted when we leave
+    typename DataArray<T>::Pointer array = DataArray<T>::CreateArray(dataArraySize, std::string("_Temp_"), true);
     T* dataArray = array->getPointer(0);
 
     // Write some data into the data array
@@ -637,11 +632,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase4_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase4_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase4_Execute<T, 1>(name, scalarType);
-    testCase4_Execute<T, 2>(name, scalarType);
-    testCase4_Execute<T, 3>(name, scalarType);
+    testCase4_Execute<T, 1>(scalarType);
+    testCase4_Execute<T, 2>(scalarType);
+    testCase4_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -658,16 +653,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase4_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase4_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase4_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase4_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase4_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase4_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase4_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase4_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase4_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase4_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase4_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase4_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase4_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase4_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase4_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase4_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase4_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase4_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase4_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase4_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------
@@ -675,11 +670,11 @@ class RawBinaryReaderTest
   // -----------------------------------------------------------------------------
   // testCase5: This tests when the file size is larger than the allocated size and there is junk both at the beginning and end of the file.
   template <typename T, size_t N>
-  void testCase5_Execute(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase5_Execute(SIMPL::NumericTypes::Type scalarType)
   {
-    int dataArraySize = k_ArraySize * N;
-    int junkArraySize = 10;
-    int skipHeaderBytes = junkArraySize * sizeof(T);
+    size_t dataArraySize = k_ArraySize * N;
+    size_t junkArraySize = 10;
+    size_t skipHeaderBytes = junkArraySize * sizeof(T);
     int err = 0;
     // qDebug() << "Testing case 5: " << name << " with num comps " << N;
 
@@ -747,11 +742,11 @@ class RawBinaryReaderTest
   //
   // -----------------------------------------------------------------------------
   template <typename T>
-  void testCase5_TestPrimitives(const QString& name, SIMPL::NumericTypes::Type scalarType)
+  void testCase5_TestPrimitives(SIMPL::NumericTypes::Type scalarType)
   {
-    testCase5_Execute<T, 1>(name, scalarType);
-    testCase5_Execute<T, 2>(name, scalarType);
-    testCase5_Execute<T, 3>(name, scalarType);
+    testCase5_Execute<T, 1>(scalarType);
+    testCase5_Execute<T, 2>(scalarType);
+    testCase5_Execute<T, 3>(scalarType);
   }
 
   // -----------------------------------------------------------------------------
@@ -768,16 +763,16 @@ class RawBinaryReaderTest
       return;
     }
 
-    testCase5_TestPrimitives<int8_t>("int8_t", SIMPL::NumericTypes::Type::Int8);
-    testCase5_TestPrimitives<uint8_t>("uint8_t", SIMPL::NumericTypes::Type::UInt8);
-    testCase5_TestPrimitives<int16_t>("int16_t", SIMPL::NumericTypes::Type::Int16);
-    testCase5_TestPrimitives<uint16_t>("uint16_t", SIMPL::NumericTypes::Type::UInt16);
-    testCase5_TestPrimitives<int32_t>("int32_t", SIMPL::NumericTypes::Type::Int32);
-    testCase5_TestPrimitives<uint32_t>("uint32_t", SIMPL::NumericTypes::Type::UInt32);
-    testCase5_TestPrimitives<int64_t>("int64_t", SIMPL::NumericTypes::Type::Int64);
-    testCase5_TestPrimitives<uint64_t>("uint64_t", SIMPL::NumericTypes::Type::UInt64);
-    testCase5_TestPrimitives<float>("float", SIMPL::NumericTypes::Type::Float);
-    testCase5_TestPrimitives<double>("double", SIMPL::NumericTypes::Type::Double);
+    testCase5_TestPrimitives<int8_t>(SIMPL::NumericTypes::Type::Int8);
+    testCase5_TestPrimitives<uint8_t>(SIMPL::NumericTypes::Type::UInt8);
+    testCase5_TestPrimitives<int16_t>(SIMPL::NumericTypes::Type::Int16);
+    testCase5_TestPrimitives<uint16_t>(SIMPL::NumericTypes::Type::UInt16);
+    testCase5_TestPrimitives<int32_t>(SIMPL::NumericTypes::Type::Int32);
+    testCase5_TestPrimitives<uint32_t>(SIMPL::NumericTypes::Type::UInt32);
+    testCase5_TestPrimitives<int64_t>(SIMPL::NumericTypes::Type::Int64);
+    testCase5_TestPrimitives<uint64_t>(SIMPL::NumericTypes::Type::UInt64);
+    testCase5_TestPrimitives<float>(SIMPL::NumericTypes::Type::Float);
+    testCase5_TestPrimitives<double>(SIMPL::NumericTypes::Type::Double);
   }
 
   // -----------------------------------------------------------------------------
@@ -807,6 +802,9 @@ class RawBinaryReaderTest
     // Create junkArray
     std::vector<T> junkArray(junkArraySize, 0xAB);
 
+    // Write a pattern into junkArray
+    std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
+
     // Create the file and write to it.  If any of the information is wrong, the result will be false
     bool result = createAndWriteToFile(dataArray, dataArraySize, junkArray.data(), junkArraySize, Detail::Start);
 
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 9839e3eee3..d8aa073fca 100644
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -43,8 +43,7 @@
 #include "SIMPLib/SIMPLib.h"
 
 /**
- * @brief The MeshFaceNeighbors class contains arrays of Faces for each Node in the mesh. This allows quick query to the node
- * to determine what Cells the node is a part of.
+ * @brief
  */
 template <typename T, typename K>
 class DynamicListArray
@@ -274,24 +273,11 @@ class DynamicListArray
   }
 
   /**
-   * @brief allocateLists
+   * @brief
    * @param linkCounts
    */
-  void allocateLists(QVector<T>& linkCounts)
-  {
-    allocate(linkCounts.size());
-    for(typename std::vector<T>::size_type i = 0; i < linkCounts.size(); i++)
-    {
-      this->m_Array[i].ncells = linkCounts[i];
-      this->m_Array[i].cells = new K[this->m_Array[i].ncells];
-    }
-  }
-
-  /**
-   * @brief allocateLists
-   * @param linkCounts
-   */
-  void allocateLists(std::vector<T>& linkCounts)
+  template <typename Container>
+  void allocateLists(const Container& linkCounts)
   {
     allocate(linkCounts.size());
     for(typename std::vector<T>::size_type i = 0; i < linkCounts.size(); i++)
@@ -307,7 +293,7 @@ class DynamicListArray
   //----------------------------------------------------------------------------
   // This will allocate memory to hold all the NeighborList structures where each
   // structure is initialized to Zero Entries and a nullptr Pointer
-  void allocate(size_t sz, size_t ext = 1000)
+  void allocate(size_t sz)
   {
     static typename DynamicListArray<T, K>::ElementList linkInit = {0, nullptr};
 
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index b46f0dc392..a6fe175ec5 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -61,6 +61,12 @@ ExecutePipelineController::ExecutePipelineController(const QHostAddress& hostAdd
 {
   setListenHost(hostAddress, hostPort);
 }
+// -----------------------------------------------------------------------------
+ExecutePipelineController::~ExecutePipelineController()
+{
+  delete m_TempDir;
+  m_TempDir = nullptr;
+}
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
index d448959cc4..a5f7f6544f 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
@@ -54,6 +54,7 @@ class SIMPLib_EXPORT ExecutePipelineController : public HttpRequestHandler
 public:
   /** Constructor */
   ExecutePipelineController(const QHostAddress& hostAddress, const int hostPort);
+  ~ExecutePipelineController() override;
 
   /** Generates the response */
   void service(HttpRequest& request, HttpResponse& response);

From 7d2aaeaf73c823cb3da416281eabc6a47f1ab6b4 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 4 Sep 2020 16:58:03 -0400
Subject: [PATCH 289/397] Added override keyword to virtual function

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
index a5f7f6544f..97d7850d53 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.h
@@ -57,7 +57,7 @@ class SIMPLib_EXPORT ExecutePipelineController : public HttpRequestHandler
   ~ExecutePipelineController() override;
 
   /** Generates the response */
-  void service(HttpRequest& request, HttpResponse& response);
+  void service(HttpRequest& request, HttpResponse& response) override;
 
   /**
    * @brief Returns the name of the end point that is controller uses

From 2da814b0dfffcb74c7ea746b5fcfbb03fed8184e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 8 Sep 2020 00:28:21 -0400
Subject: [PATCH 290/397] Cleanup memory leaks detected by Address Sanitizer

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Cxx/ConvertColorToGrayScaleTest.cpp       | 38 ++++++++-----------
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp | 16 ++++----
 .../ExecutePipelineController.cpp             |  8 ++--
 3 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 080a6fbc79..863aac26bc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -42,6 +42,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/CoreFilters/ConvertColorToGrayScale.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
@@ -65,7 +66,7 @@ class ConvertColorToGrayScaleTest
   const QString m_filtName = "ConvertColorToGrayScale";
   const QString m_outputArrayPrefix = "grayTestImage";
   const QString m_outputAMName = "grayTestAM";
-  AbstractFilter::Pointer m_colorToGrayscaleFilter;
+  ConvertColorToGrayScale::Pointer m_colorToGrayscaleFilter;
   DataContainerArray::Pointer m_dca;
 
   enum Algorithms
@@ -366,7 +367,7 @@ class ConvertColorToGrayScaleTest
    of the desired geometry is passed in here this method will sort out the input
    data array path and should work as expected
    */
-  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const FloatVec3Type& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
+  void SetUp(const Algorithms& algorithm, const DataContainer::Pointer& dc, const FloatVec3Type& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
   {
     m_dca = DataContainerArray::New();
     m_dca->setName("TEST DATA CONTAINER ARRAY");
@@ -385,26 +386,23 @@ class ConvertColorToGrayScaleTest
       }
     }
 
-    QVariant dataArrayVector{};
-    dataArrayVector.setValue(daps);
-
-    QVariant cw{};
-    cw.setValue(colorWeights);
+    m_colorToGrayscaleFilter = ConvertColorToGrayScale::New();
+    DREAM3D_REQUIRE(m_colorToGrayscaleFilter.get() != nullptr);
 
-    m_colorToGrayscaleFilter->setProperty("ConversionAlgorithm", algorithm);
-    m_colorToGrayscaleFilter->setProperty("OutputArrayPrefix", static_cast<QVariant>(m_outputArrayPrefix));
-    m_colorToGrayscaleFilter->setProperty("ColorWeights", cw);
-    m_colorToGrayscaleFilter->setProperty("ColorChannel", colorChannel);
-    m_colorToGrayscaleFilter->setProperty("CreateNewAttributeMatrix", m_createNewAM);
-    m_colorToGrayscaleFilter->setProperty("OutputAttributeMatrixName", static_cast<QVariant>(m_outputAMName));
-    m_colorToGrayscaleFilter->setProperty("InputDataArrayVector", dataArrayVector);
+    m_colorToGrayscaleFilter->setConversionAlgorithm(algorithm);
+    m_colorToGrayscaleFilter->setOutputArrayPrefix(m_outputArrayPrefix);
+    m_colorToGrayscaleFilter->setColorWeights(colorWeights);
+    m_colorToGrayscaleFilter->setColorChannel(colorChannel);
+    m_colorToGrayscaleFilter->setCreateNewAttributeMatrix(m_createNewAM);
+    m_colorToGrayscaleFilter->setOutputAttributeMatrixName(m_outputAMName);
+    m_colorToGrayscaleFilter->setInputDataArrayVector(daps);
     m_colorToGrayscaleFilter->setDataContainerArray(m_dca);
 
     int wrongParameters = CheckFilterParameters(algorithm, colorWeights, colorChannel);
     DREAM3D_REQUIRE_EQUAL(0, wrongParameters)
   }
 
-  void SetUp(const QVariant& algorithm, const DataContainer::Pointer& dc, const uint8_t& colorChannel)
+  void SetUp(const Algorithms& algorithm, const DataContainer::Pointer& dc, const uint8_t& colorChannel)
   {
     SetUp(algorithm, dc, m_defaultWeights, colorChannel);
   }
@@ -424,7 +422,7 @@ class ConvertColorToGrayScaleTest
   /**
    * @brief Resets the environment for another test
    */
-  void TearDown(const DataContainer::Pointer& dc) const
+  void TearDown(const DataContainer::Pointer& dc)
   {
     for(const auto& eachDC : m_dca->getDataContainers())
     {
@@ -447,6 +445,8 @@ class ConvertColorToGrayScaleTest
     }
 
     m_dca->removeDataContainer(dc->getName());
+    m_dca = DataContainerArray::NullPointer();
+    m_colorToGrayscaleFilter = ConvertColorToGrayScale::NullPointer();
 
 #if REMOVE_TEST_FILES
 //    QFile::remove(UnitTest::ConvertColorToGrayScale::TestOutputPath);
@@ -460,13 +460,7 @@ class ConvertColorToGrayScaleTest
   ConvertColorToGrayScaleTest& operator=(ConvertColorToGrayScaleTest&&) = delete;      // Move Assignment
 
   ConvertColorToGrayScaleTest()
-  : m_dca{DataContainerArray::New()}
   {
-    IFilterFactory::Pointer colorToGrayscaleFactory = FilterManager::Instance()->getFactoryFromClassName(m_filtName);
-    DREAM3D_REQUIRE(colorToGrayscaleFactory.get() != nullptr);
-
-    m_colorToGrayscaleFilter = colorToGrayscaleFactory->create();
-    DREAM3D_REQUIRE(m_colorToGrayscaleFilter.get() != nullptr);
   }
   ~ConvertColorToGrayScaleTest() = default;
 
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 4526844632..e8f25b9956 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -1675,11 +1675,11 @@ class RESTUnitTest
     QString configFileName = UnitTest::RestUnitTest::RestServerConfigFilePath;
     QSettings settings(configFileName, QSettings::IniFormat);
     // Configure session store
-    ServerSettings* sessionSettings = new ServerSettings(settings);
-    m_SessionStore = QSharedPointer<HttpSessionStore>(HttpSessionStore::CreateInstance(sessionSettings));
+    m_SessionSettings = new ServerSettings(settings);
+    m_SessionStore = QSharedPointer<HttpSessionStore>(HttpSessionStore::CreateInstance(m_SessionSettings));
 
     // Configure static file controller
-    SIMPLStaticFileController::CreateInstance(sessionSettings);
+    SIMPLStaticFileController::CreateInstance(m_SessionSettings);
 
     // Configure and start the TCP listener
     for(const QHostAddress& address : QNetworkInterface::allAddresses())
@@ -1687,12 +1687,12 @@ class RESTUnitTest
       if(address.protocol() == QAbstractSocket::IPv4Protocol && address.isLoopback() == false)
       {
         QString localhostIP = address.toString();
-        sessionSettings->host = localhostIP;
+        m_SessionSettings->host = localhostIP;
         break;
       }
     }
 
-    m_HttpListener = QSharedPointer<HttpListener>(new HttpListener(sessionSettings, new SIMPLRequestMapper()));
+    m_HttpListener = QSharedPointer<HttpListener>(new HttpListener(m_SessionSettings, new SIMPLRequestMapper()));
   }
 
   // -----------------------------------------------------------------------------
@@ -1700,8 +1700,9 @@ class RESTUnitTest
   // -----------------------------------------------------------------------------
   void endServer()
   {
-    m_SessionStore = QSharedPointer<HttpSessionStore>();
-    m_HttpListener = QSharedPointer<HttpListener>();
+    m_SessionStore.clear();
+    m_HttpListener.clear();
+    delete m_SessionSettings;
   }
 
   // -----------------------------------------------------------------------------
@@ -1753,6 +1754,7 @@ class RESTUnitTest
   RESTUnitTestObserver m_Observer;
 
   bool m_RunDREAM3DTests = true;
+  ServerSettings* m_SessionSettings = nullptr;
 
   RESTUnitTest(const RESTUnitTest&);   // Copy Constructor Not Implemented
   void operator=(const RESTUnitTest&); // Move assignment Not Implemented
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index a6fe175ec5..0c0d75eb7b 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -544,12 +544,12 @@ void ExecutePipelineController::replaceInputFileParametersUsingMetadata(const QS
       QDir dir;
       dir.mkpath(fi.path());
 
-      QFile* tempFile = new QFile(tempFilePath);
-      if(tempFile->open(QFile::ReadWrite))
+      QFile tempFile(tempFilePath);
+      if(tempFile.open(QFile::ReadWrite))
       {
         // Write out the file data to the temporary file we created on the server
-        tempFile->write(parameterData);
-        tempFile->close();
+        tempFile.write(parameterData);
+        tempFile.close();
 
         // Update the pipeline json with the file path that we just wrote out to
         QString tempPropertyValue = m_TempDir->path();

From 1efbc5f32bb2548948540b30383a0c3397365e0d Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 8 Sep 2020 16:52:56 -0400
Subject: [PATCH 291/397] Fix memory leaks in DynamicListArray and
 ConvertColorToGrayScaleTest

CopyObjectTest was also rewritten to perform an additional sanity check
for the Hexahedral Geometry.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Cxx/ConvertColorToGrayScaleTest.cpp       | 133 +++++++-----------
 .../Testing/Cxx/CopyObjectTest.cpp            | 103 +++++++-------
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |  14 +-
 3 files changed, 104 insertions(+), 146 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 863aac26bc..42d9ed4f0c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -34,7 +34,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QTextStream>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
@@ -66,8 +65,8 @@ class ConvertColorToGrayScaleTest
   const QString m_filtName = "ConvertColorToGrayScale";
   const QString m_outputArrayPrefix = "grayTestImage";
   const QString m_outputAMName = "grayTestAM";
-  ConvertColorToGrayScale::Pointer m_colorToGrayscaleFilter;
-  DataContainerArray::Pointer m_dca;
+  //  ConvertColorToGrayScale::Pointer m_colorToGrayscaleFilter;
+  //  DataContainerArray::Pointer m_dca;
 
   enum Algorithms
   {
@@ -287,6 +286,7 @@ class ConvertColorToGrayScaleTest
                                                        checkGChannelColors,
                                                        checkBChannelColors};
 
+//------------------------------------------------------------------------------
   void SetDataArrayTestValues(DataArray<uint8_t>::Pointer& aa)
   {
     aa->initializeWithValue(0);
@@ -297,6 +297,7 @@ class ConvertColorToGrayScaleTest
     }
   }
 
+//------------------------------------------------------------------------------
   static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const std::vector<size_t>& tDims)
   {
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
@@ -308,14 +309,15 @@ class ConvertColorToGrayScaleTest
     return dc;
   }
 
-  int CheckFilterParameters(const QVariant& algorithm, const FloatVec3Type& cws, const uint8_t& cc)
+//------------------------------------------------------------------------------
+  int CheckFilterParameters(ConvertColorToGrayScale::Pointer filter, const QVariant& algorithm, const FloatVec3Type& cws, const uint8_t& cc)
   {
-    QVariant conversionAlgorithm{m_colorToGrayscaleFilter->property("ConversionAlgorithm")};
-    FloatVec3Type colorWeights = (m_colorToGrayscaleFilter->property("ColorWeights").value<FloatVec3Type>());
-    QVariant outputArrayPrefix{m_colorToGrayscaleFilter->property("OutputArrayPrefix")};
-    QVariant colorChannel{m_colorToGrayscaleFilter->property("ColorChannel")};
-    QVariant createNewAM{m_colorToGrayscaleFilter->property("CreateNewAttributeMatrix")};
-    QVariant outputAMName{m_colorToGrayscaleFilter->property("OutputAttributeMatrixName")};
+    QVariant conversionAlgorithm{filter->property("ConversionAlgorithm")};
+    FloatVec3Type colorWeights = (filter->property("ColorWeights").value<FloatVec3Type>());
+    QVariant outputArrayPrefix{filter->property("OutputArrayPrefix")};
+    QVariant colorChannel{filter->property("ColorChannel")};
+    QVariant createNewAM{filter->property("CreateNewAttributeMatrix")};
+    QVariant outputAMName{filter->property("OutputAttributeMatrixName")};
 
     int wrongParameters = 0;
     wrongParameters += (conversionAlgorithm == algorithm) ? 0 : 1;
@@ -329,10 +331,10 @@ class ConvertColorToGrayScaleTest
     return wrongParameters;
   }
 
-  int CompareResults(const uint8_t& algoMapIndex) const
+//------------------------------------------------------------------------------
+  int CompareResults(const uint8_t& algoMapIndex, DataContainer::Pointer dc) const
   {
     QString amName = m_outputAMName;
-    DataContainer::Pointer dc = m_dca->getDataContainers().front();
     if(!m_createNewAM)
     {
       amName = dc->getAttributeMatrices().front()->getName();
@@ -359,20 +361,25 @@ class ConvertColorToGrayScaleTest
     return wrongValues;
   }
 
-  /**
-   @brief Creates the input data array path from the data container and
-   assigns it, the passed data container, and any other relevant parameters
-   to the filter
-   @details The DCA can hold multiple geometries; as long as the data container
-   of the desired geometry is passed in here this method will sort out the input
-   data array path and should work as expected
-   */
-  void SetUp(const Algorithms& algorithm, const DataContainer::Pointer& dc, const FloatVec3Type& colorWeights = {0.2125f, 0.7154f, 0.0721f}, const uint8_t& colorChannel = 0)
+
+  //------------------------------------------------------------------------------
+  int RunTest(const uint8_t& algoMapIndex, const Algorithms& algorithm, const FloatVec3Type& colorWeights, const uint8_t& colorChannel)
   {
-    m_dca = DataContainerArray::New();
+    const QString aaName = SIMPL::VertexData::SurfaceMeshNodes;
+    const std::vector<size_t> tDims{16};
+    const std::vector<size_t> cDims{3, 1, 1};
+
+    UInt8ArrayType::Pointer testAA = UInt8ArrayType::CreateArray(tDims, cDims, aaName, true);
+    SetDataArrayTestValues(testAA);
+
+    // NOTE: This filter has no geometry requirements
+    DataContainer::Pointer dc = createVertexGeometryDataContainer(testAA, tDims);
+
+    // Setup
+    DataContainerArray::Pointer m_dca = DataContainerArray::New();
     m_dca->setName("TEST DATA CONTAINER ARRAY");
     m_dca->insertOrAssign(dc);
-    QVector<DataArrayPath> daps{};
+    QVector<DataArrayPath> daps;
     for(const AttributeMatrix::Pointer& eachAM : dc->getAttributeMatrices())
     {
       QString amName = eachAM->getName();
@@ -386,7 +393,7 @@ class ConvertColorToGrayScaleTest
       }
     }
 
-    m_colorToGrayscaleFilter = ConvertColorToGrayScale::New();
+    ConvertColorToGrayScale::Pointer m_colorToGrayscaleFilter = ConvertColorToGrayScale::New();
     DREAM3D_REQUIRE(m_colorToGrayscaleFilter.get() != nullptr);
 
     m_colorToGrayscaleFilter->setConversionAlgorithm(algorithm);
@@ -398,32 +405,21 @@ class ConvertColorToGrayScaleTest
     m_colorToGrayscaleFilter->setInputDataArrayVector(daps);
     m_colorToGrayscaleFilter->setDataContainerArray(m_dca);
 
-    int wrongParameters = CheckFilterParameters(algorithm, colorWeights, colorChannel);
+    int wrongParameters = CheckFilterParameters(m_colorToGrayscaleFilter, algorithm, colorWeights, colorChannel);
     DREAM3D_REQUIRE_EQUAL(0, wrongParameters)
-  }
 
-  void SetUp(const Algorithms& algorithm, const DataContainer::Pointer& dc, const uint8_t& colorChannel)
-  {
-    SetUp(algorithm, dc, m_defaultWeights, colorChannel);
-  }
+    // RunTest
 
-  int RunTest(const uint8_t& algoMapIndex)
-  {
     Observer obs;
     m_colorToGrayscaleFilter->connect(m_colorToGrayscaleFilter.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
     m_colorToGrayscaleFilter->execute();
     int erred = m_colorToGrayscaleFilter->getErrorCode();
     DREAM3D_REQUIRE_EQUAL(erred, 0);
-    int wrongValues = CompareResults(algoMapIndex);
+    int wrongValues = CompareResults(algoMapIndex, dc);
     DREAM3D_REQUIRE_EQUAL(wrongValues, 0)
     return erred + wrongValues;
-  }
 
-  /**
-   * @brief Resets the environment for another test
-   */
-  void TearDown(const DataContainer::Pointer& dc)
-  {
+    // Tear Down Tests
     for(const auto& eachDC : m_dca->getDataContainers())
     {
       for(const auto& eachAM : eachDC->getAttributeMatrices())
@@ -447,10 +443,6 @@ class ConvertColorToGrayScaleTest
     m_dca->removeDataContainer(dc->getName());
     m_dca = DataContainerArray::NullPointer();
     m_colorToGrayscaleFilter = ConvertColorToGrayScale::NullPointer();
-
-#if REMOVE_TEST_FILES
-//    QFile::remove(UnitTest::ConvertColorToGrayScale::TestOutputPath);
-#endif
   }
 
 public:
@@ -459,92 +451,61 @@ class ConvertColorToGrayScaleTest
   ConvertColorToGrayScaleTest& operator=(const ConvertColorToGrayScaleTest&) = delete; // Copy Assignment
   ConvertColorToGrayScaleTest& operator=(ConvertColorToGrayScaleTest&&) = delete;      // Move Assignment
 
-  ConvertColorToGrayScaleTest()
-  {
-  }
+  ConvertColorToGrayScaleTest() = default;
   ~ConvertColorToGrayScaleTest() = default;
 
+//------------------------------------------------------------------------------
   void operator()()
   {
     std::cout << "#### ConvertColorToGrayScaleTest Starting ####" << std::endl;
 
     int err = 0;
 
-    const QString aaName = SIMPL::VertexData::SurfaceMeshNodes;
-    const std::vector<size_t> tDims{16};
-    const std::vector<size_t> cDims{3, 1, 1};
-
-    DataArray<uint8_t>::Pointer testAA{DataArray<uint8_t>::CreateArray(tDims, cDims, aaName, true)};
-    SetDataArrayTestValues(testAA);
-
-    // NOTE: This filter has no geometry requirements
-    DataContainer::Pointer vertexDC{createVertexGeometryDataContainer(testAA, tDims)};
-
     // Luminosity Algorithm testing
     // Test defaults
     qDebug() << "Testing luminosity algorithm...";
     qDebug() << "Default weights (0.2125, 0.7154, 0.0721)...";
-    SetUp(Algorithms::LUMINOSITY, vertexDC);
-    DREAM3D_REGISTER_TEST(RunTest(0))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(0, Algorithms::LUMINOSITY, {0.2125f, 0.7154f, 0.0721f}, 0))
 
     // Test custom
     FloatVec3Type colorWeights{0.75, 0.75, 0.75};
     qDebug() << "Custom weights (0.75, 0.75, 0.75)...";
-    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
-    DREAM3D_REGISTER_TEST(RunTest(1))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(1, Algorithms::LUMINOSITY, colorWeights, 0))
 
     // Test <0
     colorWeights = {-0.75, -0.75, -0.75};
     qDebug() << "Testing weights < 0 (-0.75, -0.75, -0.75)...";
-    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
-    DREAM3D_REGISTER_TEST(RunTest(2))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(2, Algorithms::LUMINOSITY, colorWeights, 0))
 
     // Test >1
     colorWeights = {1.75, 1.75, 1.75};
     qDebug() << "Testing weights > 1 (1.75, 1.75, 1.75)...";
-    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
-    DREAM3D_REGISTER_TEST(RunTest(3))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(3, Algorithms::LUMINOSITY, colorWeights, 0))
 
     // Test <-1
     colorWeights = {-1.75, -1.75, -1.75};
     qDebug() << "Testing weights < -1 (-1.75, -1.75, -1.75)...";
-    SetUp(Algorithms::LUMINOSITY, vertexDC, colorWeights);
-    DREAM3D_REGISTER_TEST(RunTest(4))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(4, Algorithms::LUMINOSITY, colorWeights, 0))
 
     // Average Algorithm testing
     qDebug() << "Testing average algorithm...";
-    SetUp(Algorithms::AVERAGE, vertexDC);
-    DREAM3D_REGISTER_TEST(RunTest(5))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(5, Algorithms::AVERAGE, {0.2125f, 0.7154f, 0.0721f}, 0))
 
     // Lightness Algorithm testing
     qDebug() << "Testing lightness algorithm...";
-    SetUp(Algorithms::LIGHTNESS, vertexDC);
-    DREAM3D_REGISTER_TEST(RunTest(6))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(6, Algorithms::LIGHTNESS, {0.2125f, 0.7154f, 0.0721f}, 0))
 
     // Single Channel Algorithm testing
     // Red channel
     qDebug() << "Testing red channel algorithm...";
-    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC);
-    DREAM3D_REGISTER_TEST(RunTest(7))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(7, Algorithms::SINGLE_CHANNEL, {0.2125f, 0.7154f, 0.0721f}, 0))
 
     // Green channel
     qDebug() << "Testing green channel algorithm...";
-    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC, 1);
-    DREAM3D_REGISTER_TEST(RunTest(8))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(8, Algorithms::SINGLE_CHANNEL, {0.2125f, 0.7154f, 0.0721f}, 1))
 
     // Blue channel
     qDebug() << "Testing blue channel algorithm...";
-    SetUp(Algorithms::SINGLE_CHANNEL, vertexDC, 2);
-    DREAM3D_REGISTER_TEST(RunTest(9))
-    TearDown(vertexDC);
+    DREAM3D_REGISTER_TEST(RunTest(9, Algorithms::SINGLE_CHANNEL, {0.2125f, 0.7154f, 0.0721f}, 2))
   }
 };
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 6b190883a1..396a7570a0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -37,17 +37,16 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/CoreFilters/CopyObject.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
-#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -56,9 +55,10 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class CopyObjectTest
 {
@@ -71,23 +71,6 @@ class CopyObjectTest
   CopyObjectTest& operator=(const CopyObjectTest&) = delete; // Copy Assignment
   CopyObjectTest& operator=(CopyObjectTest&&) = delete;      // Move Assignment
 
-  // -----------------------------------------------------------------------------
-  //
-  // -----------------------------------------------------------------------------
-  int TestFilterAvailability()
-  {
-    // Now instantiate the CopyObjectTest Filter from the FilterManager
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(m_FilterName);
-    if(nullptr == filterFactory.get())
-    {
-      std::stringstream ss;
-      ss << "The CopyObjectTest Requires the use of the " << m_FilterName.toStdString() << " filter which is found in Core Filters";
-      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
-    }
-    return 0;
-  }
-
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -557,47 +540,33 @@ class CopyObjectTest
       std::cout << "   " << dca->getDataContainer(dap)->getGeometry()->getName().toStdString();
     }
     std::cout << std::endl;
-    FilterManager* fm = FilterManager::Instance();
-    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(m_FilterName);
-    AbstractFilter::Pointer extractAttributeArraysFromGeometry = filterFactory->create();
 
-    extractAttributeArraysFromGeometry->setDataContainerArray(dca);
+    CopyObject::Pointer copyObject = CopyObject::New();
 
-    // Setup Filter
-
-    QVariant var;
+    copyObject->setDataContainerArray(dca);
 
-    var.setValue(objectToCopy);
-    bool propWasSet = extractAttributeArraysFromGeometry->setProperty("ObjectToCopy", var);
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    // Setup Filter
+    copyObject->setObjectToCopy(objectToCopy);
 
-    var.setValue(copyName);
-    propWasSet = extractAttributeArraysFromGeometry->setProperty("CopiedObjectName", var);
-    DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+    copyObject->setCopiedObjectName(copyName);
 
     if(objectToCopy == 0) // DataContainer
     {
-      var.setValue(dap);
-      propWasSet = extractAttributeArraysFromGeometry->setProperty("DataContainerToCopy", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+      copyObject->setDataContainerToCopy(dap);
     }
     else if(objectToCopy == 1) // AttributeMatrix
     {
-      var.setValue(dap);
-      propWasSet = extractAttributeArraysFromGeometry->setProperty("AttributeMatrixToCopy", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+      copyObject->setAttributeMatrixToCopy(dap);
     }
     else if(objectToCopy == 2) // DataArray
     {
-      var.setValue(dap);
-      propWasSet = extractAttributeArraysFromGeometry->setProperty("AttributeArrayToCopy", var);
-      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+      copyObject->setAttributeArrayToCopy(dap);
     }
 
     // Run Filter
 
-    extractAttributeArraysFromGeometry->execute();
-    DREAM3D_REQUIRED(extractAttributeArraysFromGeometry->getErrorCode(), >=, 0);
+    copyObject->execute();
+    DREAM3D_REQUIRED(copyObject->getErrorCode(), >=, 0);
 
     // Check Filter Results
 
@@ -900,10 +869,10 @@ class CopyObjectTest
     hexGeom->findUnsharedEdges();
     hexGeom->findUnsharedFaces();
     emptyDC->setGeometry(hexGeom);
+
     TestCase(dca, DataArrayPath(k_EmptyDataContainerName), 0, k_CopiedObjectName);
 
     // Test Copy AttributeMatrices
-
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix1Name, ""), 1, k_CopiedObjectName);
 
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, ""), 1, k_CopiedObjectName);
@@ -912,7 +881,6 @@ class CopyObjectTest
     TestCase(dca, DataArrayPath(k_EmptyDataContainerName, k_EmptyAttributeMatrixName, ""), 1, k_CopiedObjectName);
 
     // Test Copy DataArrays
-
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix1Name, k_uint8ArrayName), 2, k_CopiedObjectName);
 
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix1Name, k_int8ArrayName), 2, k_CopiedObjectName);
@@ -932,24 +900,47 @@ class CopyObjectTest
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, k_floatArrayName), 2, k_CopiedObjectName);
 
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, k_doubleArrayName), 2, k_CopiedObjectName);
+  
   }
 
   // -----------------------------------------------------------------------------
-  //
+  void TestHexahedralGeometry()
+  {
+    static const QString k_VerticesDAName("VertexCoordinates");
+    static const QString k_ElementListDAName("Connectivity");
+
+    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
+
+    std::vector<std::vector<MeshIndexType>>  elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
+
+    DataArray<float>::Pointer daHexVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims8, m_Dims3);
+    SharedHexList::Pointer daHexList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims8);
+
+    HexahedralGeom::Pointer hexGeom = HexahedralGeom::CreateGeometry(daHexList, daHexVert, SIMPL::Geometry::HexahedralGeometry);
+    hexGeom->setName("hexGeom");
+
+    hexGeom->findEdges();
+    hexGeom->findElementCentroids();
+    hexGeom->findElementNeighbors();
+    hexGeom->findElementsContainingVert();
+    hexGeom->findElementSizes();
+    hexGeom->findFaces();
+    hexGeom->findUnsharedEdges();
+    hexGeom->findUnsharedFaces();
+  }
+
   // -----------------------------------------------------------------------------
   void operator()()
   {
     int err = EXIT_SUCCESS;
 
     std::cout << "#### CopyObjectTest Starting ####" << std::endl;
-
-    DREAM3D_REGISTER_TEST(TestFilterAvailability());
+    DREAM3D_REGISTER_TEST(TestHexahedralGeometry())
 
     DREAM3D_REGISTER_TEST(TestCopyObjectTest())
   }
 
 private:
-  QString m_FilterName = QString("CopyObject");
   std::vector<size_t> m_Dims1 = {1};
   std::vector<size_t> m_Dims2 = {2};
   std::vector<size_t> m_Dims3 = {3};
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index d8aa073fca..1c4e84e159 100644
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -35,8 +35,9 @@
 
 #pragma once
 
-#include <vector>
+#include <iostream>
 #include <memory>
+#include <vector>
 
 #include <QtCore/QString>
 
@@ -108,7 +109,7 @@ class DynamicListArray
         delete[] this->m_Array[i].cells;
       }
     }
-    // Now delete all the "NeighborLists" structures
+    // Now delete all the "ElementList" structures
     if(this->m_Array != nullptr)
     {
       delete[] this->m_Array;
@@ -191,6 +192,7 @@ class DynamicListArray
     }
     if(nullptr != m_Array[ptId].cells && m_Array[ptId].ncells > 0)
     {
+      delete[] this->m_Array[ptId].cells;
       m_Array[ptId].cells = nullptr;
       m_Array[ptId].ncells = 0;
     }
@@ -217,6 +219,7 @@ class DynamicListArray
     }
     if(nullptr != m_Array[ptId].cells && m_Array[ptId].ncells > 0)
     {
+      delete[] this->m_Array[ptId].cells;
       m_Array[ptId].cells = nullptr;
       m_Array[ptId].ncells = 0;
     }
@@ -283,7 +286,10 @@ class DynamicListArray
     for(typename std::vector<T>::size_type i = 0; i < linkCounts.size(); i++)
     {
       this->m_Array[i].ncells = linkCounts[i];
-      this->m_Array[i].cells = new K[this->m_Array[i].ncells];
+      if(linkCounts[i] > 0)
+      {
+        this->m_Array[i].cells = new K[this->m_Array[i].ncells];
+      }
     }
   }
 
@@ -305,7 +311,7 @@ class DynamicListArray
         delete[] this->m_Array[i].cells;
       }
     }
-    // Now delete all the "NeighborLists" structures
+    // Now delete all the "ElementList" structures
     if(this->m_Array != nullptr)
     {
       delete[] this->m_Array;

From 74e5972223c8a878f0a675a7fc8d27c6ed868643 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 9 Sep 2020 10:29:36 -0400
Subject: [PATCH 292/397] Cleaning up memory leaks in the RestUnitTest

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index e8f25b9956..91b15cf983 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -1676,6 +1676,7 @@ class RESTUnitTest
     QSettings settings(configFileName, QSettings::IniFormat);
     // Configure session store
     m_SessionSettings = new ServerSettings(settings);
+    m_RequestMapper = new SIMPLRequestMapper();
     m_SessionStore = QSharedPointer<HttpSessionStore>(HttpSessionStore::CreateInstance(m_SessionSettings));
 
     // Configure static file controller
@@ -1692,7 +1693,7 @@ class RESTUnitTest
       }
     }
 
-    m_HttpListener = QSharedPointer<HttpListener>(new HttpListener(m_SessionSettings, new SIMPLRequestMapper()));
+    m_HttpListener = QSharedPointer<HttpListener>(new HttpListener(m_SessionSettings, m_RequestMapper));
   }
 
   // -----------------------------------------------------------------------------
@@ -1703,6 +1704,9 @@ class RESTUnitTest
     m_SessionStore.clear();
     m_HttpListener.clear();
     delete m_SessionSettings;
+    m_SessionSettings = nullptr;
+    delete m_RequestMapper;
+    m_RequestMapper = nullptr;
   }
 
   // -----------------------------------------------------------------------------
@@ -1746,6 +1750,9 @@ class RESTUnitTest
   }
 
 private:
+  ServerSettings* m_SessionSettings = nullptr;
+  SIMPLRequestMapper* m_RequestMapper = nullptr;
+
   QSharedPointer<HttpSessionStore> m_SessionStore;
   QSharedPointer<HttpListener> m_HttpListener;
 
@@ -1754,7 +1761,6 @@ class RESTUnitTest
   RESTUnitTestObserver m_Observer;
 
   bool m_RunDREAM3DTests = true;
-  ServerSettings* m_SessionSettings = nullptr;
 
   RESTUnitTest(const RESTUnitTest&);   // Copy Constructor Not Implemented
   void operator=(const RESTUnitTest&); // Move assignment Not Implemented

From c77feac05b9b44f337d739264bf2dcb396d442ed Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 16 Sep 2020 13:01:03 -0400
Subject: [PATCH 293/397] Fixed Python segfault

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/Pybind11CustomTypeCasts.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index 8f43dc93ef..e0c2a7f74e 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -599,7 +599,6 @@ struct type_caster<VectorOfFloatArray>
         {
           PyObject* floatArrayPy = floatArray.ptr();
           floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
-          Py_XDECREF(floatArrayPy);
         }
         else
         {
@@ -608,7 +607,6 @@ struct type_caster<VectorOfFloatArray>
       }
 
       value = floatArrays;
-      Py_XDECREF(source);
       return true;
     }
     return false;

From 288817967b12b12c3429257d1700a0e9a73441b2 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 16 Sep 2020 13:37:25 -0400
Subject: [PATCH 294/397] Fixed variable shadowing

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/Pybind11CustomTypeCasts.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index e0c2a7f74e..ba26006dc3 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -580,15 +580,15 @@ struct type_caster<VectorOfFloatArray>
           std::vector<float> floatArrayVector;
           size_t index = 0;
           QString name;
-          for(auto value : floatArray)
+          for(auto item : floatArray)
           {
             if(index == 0)
             {
-              name = py::cast<QString>(value);
+              name = py::cast<QString>(item);
             }
             else
             {
-              floatArrayVector.push_back(py::cast<float>(value));
+              floatArrayVector.push_back(py::cast<float>(item));
             }
             index++;
           }

From fc88ad0fd36ef343f64dee427bebd5fbfe6cd5f8 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 18 Sep 2020 15:22:10 -0400
Subject: [PATCH 295/397] Updated SIMPLTestFileLocations.h to use inline

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Testing/TestFileLocations.h.in | 200 +++++++++---------
 1 file changed, 100 insertions(+), 100 deletions(-)

diff --git a/Source/SIMPLib/Testing/TestFileLocations.h.in b/Source/SIMPLib/Testing/TestFileLocations.h.in
index 6e8f079de0..b5f871a531 100644
--- a/Source/SIMPLib/Testing/TestFileLocations.h.in
+++ b/Source/SIMPLib/Testing/TestFileLocations.h.in
@@ -15,227 +15,227 @@
 
 namespace UnitTest
 {
+  inline const QString DataDir("@DREAM3D_DATA_DIR@");
+  inline const QString TestTempDir("@TEST_TEMP_DIR@");
+  inline const QString DREAM3DProjDir("@DREAM3DProj_SOURCE_DIR@");
 
-  const QString DataDir("@DREAM3D_DATA_DIR@");
-  const QString TestTempDir("@TEST_TEMP_DIR@");
-  const QString DREAM3DProjDir("@DREAM3DProj_SOURCE_DIR@");
 
   namespace GenerateTiltSeriesTest
   {
-  const QString TestFile1("@DREAM3D_DATA_DIR@/Data/GenerateTiltSeries/GenerateTiltSeriesTest.dream3d");
+    inline const QString TestFile1("@DREAM3D_DATA_DIR@/Data/GenerateTiltSeries/GenerateTiltSeriesTest.dream3d");
   } // namespace GenerateTiltSeriesTest
 
   namespace RecursivePipelineTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@");
-    const QString InputDREAM3DFile("@TEST_TEMP_DIR@/InputDREAM3DFile.dream3d");
-    const QString OutputDREAM3DFile("@TEST_TEMP_DIR@/OutputDREAM3DFile.dream3d");
+    inline const QString TestDir("@TEST_TEMP_DIR@");
+    inline const QString InputDREAM3DFile("@TEST_TEMP_DIR@/InputDREAM3DFile.dream3d");
+    inline const QString OutputDREAM3DFile("@TEST_TEMP_DIR@/OutputDREAM3DFile.dream3d");
   }
 
   namespace ExtractVertexGeometryTest
   {
-   const QString TestFile("@TEST_TEMP_DIR@/TestFile1.dream3d");
-   const QString TestFileXdmf("@TEST_TEMP_DIR@/TestFile1.xdmf");
+    inline const QString TestFile("@TEST_TEMP_DIR@/TestFile1.dream3d");
+    inline const QString TestFileXdmf("@TEST_TEMP_DIR@/TestFile1.xdmf");
   }
 
   namespace DataArrayTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/DataArrayTest");
-    const QString TestFile("@TEST_TEMP_DIR@/DataArrayTest/DataArrayTest.h5");
+    inline const QString TestDir("@TEST_TEMP_DIR@/DataArrayTest");
+    inline const QString TestFile("@TEST_TEMP_DIR@/DataArrayTest/DataArrayTest.h5");
   }
 
   namespace DataContainerBundleTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/DataContainerBundleTest");
-    const QString TestFile("@TEST_TEMP_DIR@/DataContainerBundleTest/DataContainerBundleTest.h5");
+    inline const QString TestDir("@TEST_TEMP_DIR@/DataContainerBundleTest");
+    inline const QString TestFile("@TEST_TEMP_DIR@/DataContainerBundleTest/DataContainerBundleTest.h5");
   }
 
   namespace FeatureIdsTest
   {
-    static const size_t XSize = 3;
-    static const size_t YSize = 4;
-    static const size_t ZSize = 5;
-    static const size_t Offset = 200;
+    inline constexpr size_t XSize = 3;
+    inline constexpr size_t YSize = 4;
+    inline constexpr size_t ZSize = 5;
+    inline constexpr size_t Offset = 200;
   }
   
   namespace FindDerivativesFilterTest
   {
-   const QString TestFile1("@TEST_TEMP_DIR@/TestFile1.txt");
-   const QString TestFile2("@TEST_TEMP_DIR@/TestFile2.txt");
+    inline const QString TestFile1("@TEST_TEMP_DIR@/TestFile1.txt");
+    inline const QString TestFile2("@TEST_TEMP_DIR@/TestFile2.txt");
   }
 
   namespace GenerateColorTableTest
   {
-    const QString ImageFilePath("@TEST_TESTFILES_DIR@/GenerateColorTable/ColorTableTestFile.txt");
-    const QString TestFilesDir("@TEST_TESTFILES_DIR@");
-    const QString BlackBlueWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackBlueWhite.txt");
-    const QString BlackBodyRadiationFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackBodyRadiation.txt");
-    const QString BlackOrangeWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackOrangeWhite.txt");
-    const QString BlueToYellowFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlueToYellow.txt");
-    const QString ColdAndHotFile("@TEST_TESTFILES_DIR@/GenerateColorTable/ColdAndHot.txt");
-    const QString GrayscaleFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Grayscale.txt");
-    const QString HazeFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Haze.txt");
-    const QString HsvFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Hsv.txt");
-    const QString JetFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Jet.txt");
-    const QString RainbowFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Rainbow.txt");
-    const QString RainbowBlendedBlackFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedBlack.txt");
-    const QString RainbowBlendedGreyFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedGrey.txt");
-    const QString RainbowBlendedWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedWhite.txt");
-    const QString RainbowDesaturatedFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowDesaturated.txt");
-    const QString XRayFile("@TEST_TESTFILES_DIR@/GenerateColorTable/XRay.txt");
+    inline const QString ImageFilePath("@TEST_TESTFILES_DIR@/GenerateColorTable/ColorTableTestFile.txt");
+    inline const QString TestFilesDir("@TEST_TESTFILES_DIR@");
+    inline const QString BlackBlueWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackBlueWhite.txt");
+    inline const QString BlackBodyRadiationFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackBodyRadiation.txt");
+    inline const QString BlackOrangeWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlackOrangeWhite.txt");
+    inline const QString BlueToYellowFile("@TEST_TESTFILES_DIR@/GenerateColorTable/BlueToYellow.txt");
+    inline const QString ColdAndHotFile("@TEST_TESTFILES_DIR@/GenerateColorTable/ColdAndHot.txt");
+    inline const QString GrayscaleFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Grayscale.txt");
+    inline const QString HazeFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Haze.txt");
+    inline const QString HsvFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Hsv.txt");
+    inline const QString JetFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Jet.txt");
+    inline const QString RainbowFile("@TEST_TESTFILES_DIR@/GenerateColorTable/Rainbow.txt");
+    inline const QString RainbowBlendedBlackFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedBlack.txt");
+    inline const QString RainbowBlendedGreyFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedGrey.txt");
+    inline const QString RainbowBlendedWhiteFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowBlendedWhite.txt");
+    inline const QString RainbowDesaturatedFile("@TEST_TESTFILES_DIR@/GenerateColorTable/RainbowDesaturated.txt");
+    inline const QString XRayFile("@TEST_TESTFILES_DIR@/GenerateColorTable/XRay.txt");
   }
 
   namespace VtkGrainIdIOTest
   {
-    const QString TestFile("@TEST_TEMP_DIR@/VtkGrainIdIOTest.vtk");
-    static const size_t XSize = 5;
-    static const size_t YSize = 4;
-    static const size_t ZSize = 3;
-    static const size_t Offset = 300;
+    inline const QString TestFile("@TEST_TEMP_DIR@/VtkGrainIdIOTest.vtk");
+    inline constexpr size_t XSize = 5;
+    inline constexpr size_t YSize = 4;
+    inline constexpr size_t ZSize = 3;
+    inline constexpr size_t Offset = 300;
   }
 
   namespace VTKFileWritersTest
   {
-    static const QString TestFile("@TEST_TEMP_DIR@/VtkIOTest.vtk");
-    static const size_t XSize = 2;
-    static const size_t YSize = 10;
-    static const size_t ZSize = 5;
-    static const size_t Offset = 66;
+    inline const QString TestFile("@TEST_TEMP_DIR@/VtkIOTest.vtk");
+    inline constexpr size_t XSize = 2;
+    inline constexpr size_t YSize = 10;
+    inline constexpr size_t ZSize = 5;
+    inline constexpr size_t Offset = 66;
   }
 
   namespace NeighborListTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/NeighborListTest");
+    inline const QString TestDir("@TEST_TEMP_DIR@/NeighborListTest");
   }
 
   namespace SyntheticBuilderTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/SyntheticBuilderTest");
-    const QString CsvFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.csv");
-    const QString OutputFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.h5");
-    const QString VtkOutputFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.vtk");
+    inline const QString TestDir("@TEST_TEMP_DIR@/SyntheticBuilderTest");
+    inline const QString CsvFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.csv");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.h5");
+    inline const QString VtkOutputFile("@TEST_TEMP_DIR@/SyntheticBuilderTest/SyntheticBuilderTest.vtk");
 
   }
 
   namespace FindNeighborTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/FindNeighborTest");
-    const QString OutputFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest.h5");
-    const QString StatsFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest_Stats.h5");
-    const QString OutputFile2("@TEST_TEMP_DIR@/FindNeighborTest/OtherTestOutput.h5");
-    const QString VtkOutputFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest.vtk");
+    inline const QString TestDir("@TEST_TEMP_DIR@/FindNeighborTest");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest.h5");
+    inline const QString StatsFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest_Stats.h5");
+    inline const QString OutputFile2("@TEST_TEMP_DIR@/FindNeighborTest/OtherTestOutput.h5");
+    inline const QString VtkOutputFile("@TEST_TEMP_DIR@/FindNeighborTest/FindNeighborTest.vtk");
   }
 
   namespace DREAM3DSettingsTest
   {
-    const QString TestFile("@TEST_TEMP_DIR@/DREAM3DSettingsTest/DREAM3DSettingsTest.json");
+    inline const QString TestFile("@TEST_TEMP_DIR@/DREAM3DSettingsTest/DREAM3DSettingsTest.json");
   }
 
   namespace StatsDataTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/StatsDataTest");
-    const QString TestFile("@TEST_TEMP_DIR@/StatsDataTest/StatsDataTest.h5");
-    const QString TestFile2("@TEST_TEMP_DIR@/StatsDataTest/StatsDataTest_rewrite.h5");
+    inline const QString TestDir("@TEST_TEMP_DIR@/StatsDataTest");
+    inline const QString TestFile("@TEST_TEMP_DIR@/StatsDataTest/StatsDataTest.h5");
+    inline const QString TestFile2("@TEST_TEMP_DIR@/StatsDataTest/StatsDataTest_rewrite.h5");
   }
 
   namespace RawBinaryReaderTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/RawBinaryReaderTest");
-    const QString OutputFile("@TEST_TEMP_DIR@/RawBinaryReaderTest/Output.bin");
+    inline const QString TestDir("@TEST_TEMP_DIR@/RawBinaryReaderTest");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/RawBinaryReaderTest/Output.bin");
   }
 
   namespace SyntheticTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/SyntheticTest");
-    const QString MatrixPrecipitateInputFile("@DREAM3D_SUPPORT_DIR@/Data/2Phase_Matrix_Precipitate.dream3d");
-    const QString OutputFile("@TEST_TEMP_DIR@/SyntheticTestOutput.dream3d");
+    inline const QString TestDir("@TEST_TEMP_DIR@/SyntheticTest");
+    inline const QString MatrixPrecipitateInputFile("@DREAM3D_SUPPORT_DIR@/Data/2Phase_Matrix_Precipitate.dream3d");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/SyntheticTestOutput.dream3d");
   }
 
   namespace FilterParametersRWTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/FilterParametersRWTest");
-    const QString ArraySelectionFile("@TEST_TEMP_DIR@/FilterParametersRWTest/ArraySelectionFile.h5");
-    const QString ArraySelectionFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/ArraySelectionFile.ini");
-    const QString GenericExampleFile("@TEST_TEMP_DIR@/FilterParametersRWTest/GenericExampleFile.h5");
-    const QString GenericExampleFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/GenericExampleFile.ini");
-    const QString ThresholdFile("@TEST_TEMP_DIR@/FilterParametersRWTest/ThresholdFile.h5");
-    const QString ThresholdFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/ThresholdFile.ini");
-    const QString TestFile_1("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_1.h5");
-    const QString TestFile_2("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_2.h5");
-    const QString TestFile_3("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_3.h5");
+    inline const QString TestDir("@TEST_TEMP_DIR@/FilterParametersRWTest");
+    inline const QString ArraySelectionFile("@TEST_TEMP_DIR@/FilterParametersRWTest/ArraySelectionFile.h5");
+    inline const QString ArraySelectionFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/ArraySelectionFile.ini");
+    inline const QString GenericExampleFile("@TEST_TEMP_DIR@/FilterParametersRWTest/GenericExampleFile.h5");
+    inline const QString GenericExampleFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/GenericExampleFile.ini");
+    inline const QString ThresholdFile("@TEST_TEMP_DIR@/FilterParametersRWTest/ThresholdFile.h5");
+    inline const QString ThresholdFileQSettings("@TEST_TEMP_DIR@/FilterParametersRWTest/ThresholdFile.ini");
+    inline const QString TestFile_1("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_1.h5");
+    inline const QString TestFile_2("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_2.h5");
+    inline const QString TestFile_3("@TEST_TEMP_DIR@/FilterParametersRWTest/TestFile_3.h5");
   }
 
   namespace PFTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/PoleFigureTest/");
+    inline const QString TestDir("@TEST_TEMP_DIR@/PoleFigureTest/");
   }
 
   namespace AngleFileLoaderTest
   {
-    const QString TestDir("@TEST_TEMP_DIR@/AngleFileLoaderTest");
-    const QString OutputFile("@TEST_TEMP_DIR@/AngleFileLoaderTest/AngleTestFile.txt");
+    inline const QString TestDir("@TEST_TEMP_DIR@/AngleFileLoaderTest");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/AngleFileLoaderTest/AngleTestFile.txt");
   }
 
   namespace LambertRWTest
   {
-    const QString TestFile("@TEST_TEMP_DIR@/LambertRWTest.h5");
+    inline const QString TestFile("@TEST_TEMP_DIR@/LambertRWTest.h5");
   }
 
 
   namespace FilterParametersRWTest
   {
-    const QString OutputFile("@TEST_TEMP_DIR@/FilterParametersRWTest/OutputFile.json");
-    const QString OutputDir("@TEST_TEMP_DIR@/FilterParametersRWTest/");
+    inline const QString OutputFile("@TEST_TEMP_DIR@/FilterParametersRWTest/OutputFile.json");
+    inline const QString OutputDir("@TEST_TEMP_DIR@/FilterParametersRWTest/");
   }
 
   namespace ExecuteProcessTest
   {
-    const QString QMakeVersionString("@QMAKE_VERSION@");
-    const QString QMakeLocation("@QtQMake_location@");
+    inline const QString QMakeVersionString("@QMAKE_VERSION@");
+    inline const QString QMakeLocation("@QtQMake_location@");
 
-    const QString CMakeLocation("@CMAKE_COMMAND@");
-    const QString CMakeVersionString("@CMake_VersionString@");
+    inline const QString CMakeLocation("@CMAKE_COMMAND@");
+    inline const QString CMakeVersionString("@CMake_VersionString@");
   }
 
   namespace ReadASCIIDataTest
   {
-   const QString TestFile1("@TEST_TEMP_DIR@/TestFile1.txt");
-   const QString TestFile2("@TEST_TEMP_DIR@/TestFile2.txt");
+    inline const QString TestFile1("@TEST_TEMP_DIR@/TestFile1.txt");
+    inline const QString TestFile2("@TEST_TEMP_DIR@/TestFile2.txt");
   }
 
   namespace WriteTriangleGeometryTest
   {
-    const QString NodesFile("@TEST_TEMP_DIR@/WriteTriangleGeometryNodesFile.txt");
-    const QString TrianglesFile("@TEST_TEMP_DIR@/WriteTriangleGeometryTrianglesFile.txt");
+    inline const QString NodesFile("@TEST_TEMP_DIR@/WriteTriangleGeometryNodesFile.txt");
+    inline const QString TrianglesFile("@TEST_TEMP_DIR@/WriteTriangleGeometryTrianglesFile.txt");
   }
   
   namespace FeatureDataCSVWriterTest
   {
-   const QString OutputFile("@TEST_TEMP_DIR@/FeatureDataCSVOutputTestFile.txt");
+   inline const QString OutputFile("@TEST_TEMP_DIR@/FeatureDataCSVOutputTestFile.txt");
   }
 
   namespace RotateSampleRefFrameTest
   {
-    const QString TestFile1("@DREAM3D_DATA_DIR@/Data/RotateSampleRefFrame/RotateSampleRefFrameTest.dream3d");
+    inline const QString TestFile1("@DREAM3D_DATA_DIR@/Data/RotateSampleRefFrame/RotateSampleRefFrameTest.dream3d");
   }
 
   namespace RestUnitTest
   {
     // Server Configuration File
-    const QString RestServerConfigFilePath("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/RESTServer.ini");
+    inline const QString RestServerConfigFilePath("@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/RESTServer.ini");
     // Test Pipeline File
-    const QString SmallIN100ArchivePipeline("@DREAM3DProj_SOURCE_DIR@/Support/PrebuiltPipelines/Workshop/EBSD Reconstruction/(01) SmallIN100 Archive.json");
+    inline const QString SmallIN100ArchivePipeline("@DREAM3DProj_SOURCE_DIR@/Support/PrebuiltPipelines/Workshop/EBSD Reconstruction/(01) SmallIN100 Archive.json");
     // Location of Test Data
-    const QString SmallIN100ArchiveInputFolderPath("@DREAM3D_DATA_DIR@/Data/SmallIN100");
+    inline const QString SmallIN100ArchiveInputFolderPath("@DREAM3D_DATA_DIR@/Data/SmallIN100");
     // Output File Location
-    const QString SmallIN100ArchiveOutputFilePath("@TEST_TEMP_DIR@/SmallIN100.h5ebsd");
+    inline const QString SmallIN100ArchiveOutputFilePath("@TEST_TEMP_DIR@/SmallIN100.h5ebsd");
 
     // Additional Pipeline file locations
-    const QString RESTErrorPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTErrorPipeline.json");
-    const QString RESTFileIOPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTFileIOPipeline.json");
-    const QString RESTPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTPipeline.json");
+    inline const QString RESTErrorPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTErrorPipeline.json");
+    inline const QString RESTFileIOPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTFileIOPipeline.json");
+    inline const QString RESTPipelineFilePath("@SIMPLib_SOURCE_DIR@/REST/Testing/Cxx/RESTPipeline.json");
     // Output/Temp .dream3d files to write and read
-    const QString RESTFileIOInputDataFilePath("@TEST_TEMP_DIR@/RESTFileIOInputData.dream3d");
-    const QString RESTFileIOOutputDataFilePath("@TEST_TEMP_DIR@/RESTFileIOOutputData.dream3d");
+    inline const QString RESTFileIOInputDataFilePath("@TEST_TEMP_DIR@/RESTFileIOInputData.dream3d");
+    inline const QString RESTFileIOOutputDataFilePath("@TEST_TEMP_DIR@/RESTFileIOOutputData.dream3d");
   }
 }

From e7f10485415af2380338160ef8bc1d0cb4f8d472 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 18 Sep 2020 16:40:22 -0400
Subject: [PATCH 296/397] Moved ExportDataTest from ImportExport to SIMPL

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Testing/Cxx/ExportDataTest.cpp            | 316 ++++++++++++++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 Source/SIMPLib/Testing/TestFileLocations.h.in |   4 +
 3 files changed, 321 insertions(+)
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
new file mode 100644
index 0000000000..6e69a9472c
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
@@ -0,0 +1,316 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include <QtCore/QDir>
+
+#include <cstdio>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/CoreFilters/DataContainerWriter.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
+
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+
+class ExportDataTest
+{
+public:
+  ExportDataTest() = default;
+  virtual ~ExportDataTest() = default;
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  void RemoveTestFiles()
+  {
+#if REMOVE_TEST_FILES
+    QFile::remove(UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "ExportTest.dream3d");
+    QFile::remove(UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "ExportTest.xdmf");
+    QFile::remove(UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "ConfidenceIndex.txt");
+    QFile::remove(UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "Phases.txt");
+    QFile::remove(UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "ThresholdArray.txt");
+#endif
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestFilterAvailability()
+  {
+    // Now instantiate the WriteASCIIData Filter from the FilterManager
+    QString filtName = "WriteASCIIData";
+    FilterManager* fm = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
+    if(nullptr == filterFactory.get())
+    {
+      std::stringstream ss;
+      ss << "The ExportDataTest Requires the use of the " << filtName.toStdString() << " filter which is found in the IO Plugin";
+      DREAM3D_TEST_THROW_EXCEPTION(ss.str())
+    }
+    return EXIT_SUCCESS;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestExportDataWriter()
+  {
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+
+    // A DataContainer that mimics some real data
+    DataContainer::Pointer m = DataContainer::New(SIMPL::Defaults::DataContainerName);
+    dca->addOrReplaceDataContainer(m);
+
+    AttributeMatrix::Pointer attrMatrix = AttributeMatrix::New(std::vector<size_t>(1, 20), SIMPL::Defaults::AttributeMatrixName, AttributeMatrix::Type::Generic);
+    m->addOrReplaceAttributeMatrix(attrMatrix);
+
+    AttributeMatrix::Pointer attrMatrix2 = AttributeMatrix::New(std::vector<size_t>(1, 20), SIMPL::Defaults::CellAttributeMatrixName, AttributeMatrix::Type::Cell);
+    m->addOrReplaceAttributeMatrix(attrMatrix2);
+    int size = 20;
+
+    {
+      Int32ArrayType::Pointer intArray = Int32ArrayType::CreateArray(size, SIMPL::CellData::CellPhases, true);
+      for(int i = 0; i < size; ++i) // create an array with values 20 to 39
+      {
+        intArray->setValue(i, i + 20);
+      }
+      attrMatrix->insertOrAssign(intArray);
+    }
+    {
+      Int32ArrayType::Pointer intArray = Int32ArrayType::CreateArray(size, SIMPL::CellData::ConfidenceIndexNoSpace, true);
+      for(int i = 0; i < size; ++i) // create an array with values 20 to 39
+      {
+        intArray->setValue(i, i + 20);
+      }
+      attrMatrix->insertOrAssign(intArray);
+    }
+    {
+      BoolArrayType::Pointer boolArray = BoolArrayType::CreateArray(size, SIMPL::GeneralData::ThresholdArray, true);
+      for(int i = 0; i < size; ++i) // create an bool array with true and false values
+      {
+        if(i % 2 == 0)
+        {
+          boolArray->setValue(i, false);
+        }
+        else
+        {
+          boolArray->setValue(i, true);
+        }
+      }
+      attrMatrix->insertOrAssign(boolArray);
+    }
+    {
+      Int32ArrayType::Pointer intArray = Int32ArrayType::CreateArray(size, SIMPL::CellData::ConfidenceIndexNoSpace, true);
+      for(int i = 0; i < size; ++i) // create an array with values 20 to 39
+      {
+        intArray->setValue(i, i + 20);
+      }
+      attrMatrix2->insertOrAssign(intArray);
+    }
+
+    Observer obs;
+    // Send progress messages from PipelineBuilder to this object for display
+    DataContainerWriter::Pointer writer = DataContainerWriter::New();
+    writer->setDataContainerArray(dca);
+    QString exportArrayFile = UnitTest::ExportDataTest::TestTempDir + QDir::separator() + "ExportTest.dream3d";
+    writer->setOutputFile(exportArrayFile);
+
+    // Since we are NOT using the Pipeline Object to execute the filter but instead we are directly executing the filter
+    // and we want to know about any error/warning/progress messages we need to connect the filter to our Observer object
+    // manually. Normally the Pipeline Object would do this for us. We are NOT using a Pipeline Object because using the
+    // Pipeline Object would over write the DataContainer Array that we have created with a blank one thus defeating the
+    // entire purpose of the test.
+    QObject::connect(writer.get(), SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), &obs, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
+
+    writer->execute();
+    int err = writer->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0);
+
+    // Now instantiate the EnsembleInfoReader Filter from the FilterManager
+    QString filtName = "WriteASCIIData";
+    FilterManager* fm = FilterManager::Instance();
+    IFilterFactory::Pointer filterFactory = fm->getFactoryFromClassName(filtName);
+    if(nullptr != filterFactory.get())
+    {
+      // If we get this far, the Factory is good so creating the filter should not fail unless something has
+      // horribly gone wrong in which case the system is going to come down quickly after this.
+      AbstractFilter::Pointer filter = filterFactory->create();
+
+      QVariant var;
+      int err = 0;
+      bool propWasSet;
+      filter->setDataContainerArray(dca);
+
+      var.setValue(2);
+      propWasSet = filter->setProperty("Delimiter", var); // delimiter is a space
+      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+
+      var.setValue(10);
+      propWasSet = filter->setProperty("MaxValPerLine", var); // 10 array elements per line
+      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+
+      var.setValue(UnitTest::ExportDataTest::TestTempDir);
+      propWasSet = filter->setProperty("OutputPath", var); // output file to write array
+      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+
+      DataArrayPath path1 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, SIMPL::CellData::CellPhases);
+
+      DataArrayPath path2 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, SIMPL::CellData::ConfidenceIndexNoSpace);
+
+      DataArrayPath path4 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, SIMPL::GeneralData::ThresholdArray);
+
+      QVector<DataArrayPath> vector;
+      vector.push_back(path1);
+      vector.push_back(path2);
+      vector.push_back(path4);
+
+      var.setValue(vector);
+      propWasSet = filter->setProperty("SelectedDataArrayPaths", var); // arrays just created above
+      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+
+      filter->execute();
+      err = filter->getErrorCode();
+      DREAM3D_REQUIRE_EQUAL(err, 0);
+
+      DataArrayPath path3 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::CellAttributeMatrixName, SIMPL::CellData::ConfidenceIndexNoSpace);
+
+      vector.push_back(path3);
+
+      var.setValue(vector);
+      propWasSet = filter->setProperty("SelectedDataArrayPaths", var); // arrays just created above
+      DREAM3D_REQUIRE_EQUAL(propWasSet, true)
+
+      filter->execute();
+      err = filter->getErrorCode();
+      DREAM3D_REQUIRE_EQUAL(err, -11008);
+    }
+    else
+    {
+      QString ss = QObject::tr("ExportDataTest Error creating filter '%1'. Filter was not created/executed. Please notify the developers.").arg(filtName);
+      DREAM3D_REQUIRE_EQUAL(0, 1)
+    }
+    return EXIT_SUCCESS;
+  }
+
+  // -----------------------------------------------------------------------------
+  //
+  // -----------------------------------------------------------------------------
+  int TestExportDataReader()
+  {
+    {
+      int num = 0;
+      FILE* f = nullptr;
+      QString exportArrayFile = UnitTest::ExportDataTest::TestTempDir + QDir::separator() + SIMPL::CellData::CellPhases + ".txt";
+      f = std::fopen(exportArrayFile.toLatin1().data(), "r"); // open file created from array
+      DREAM3D_REQUIRE_VALID_POINTER(f)
+
+      for(int i = 0; i < 20; i++) // compare file to what was written in array
+      {
+        int32_t fieldsRead = std::fscanf(f, "%d,", &num);
+        DREAM3D_REQUIRE_EQUAL(fieldsRead, 1)
+        if(i + 20 != num)
+        {
+          DREAM3D_REQUIRE_EQUAL(0, -3)
+        }
+      }
+      fclose(f);
+    }
+    {
+      int num = 0;
+      FILE* f = nullptr;
+      QString exportArrayFile = UnitTest::ExportDataTest::TestTempDir + QDir::separator() + SIMPL::CellData::ConfidenceIndexNoSpace + ".txt";
+      f = std::fopen(exportArrayFile.toLatin1().data(), "r"); // open file created from array
+      DREAM3D_REQUIRE_VALID_POINTER(f)
+
+      for(int i = 0; i < 20; i++) // compare file to what was written in array
+      {
+        int32_t fieldsRead = std::fscanf(f, "%d,", &num);
+        DREAM3D_REQUIRE_EQUAL(fieldsRead, 1)
+        if(i + 20 != num)
+        {
+          DREAM3D_REQUIRE_EQUAL(0, -3)
+        }
+      }
+      fclose(f);
+    }
+    {
+      int num = 0;
+      FILE* f = nullptr;
+      QString exportArrayFile = UnitTest::ExportDataTest::TestTempDir + QDir::separator() + SIMPL::GeneralData::ThresholdArray + ".txt";
+      f = std::fopen(exportArrayFile.toLatin1().data(), "r"); // open file created from array
+      DREAM3D_REQUIRE_VALID_POINTER(f)
+      for(int i = 0; i < 20; i++) // compare file to what was written in bool array
+      {
+        int32_t fieldsRead = std::fscanf(f, "%d,", &num);
+        DREAM3D_REQUIRE_EQUAL(fieldsRead, 1)
+        if((i % 2 == 0 && num == 1) || (i % 2 != 0 && num == 0))
+        {
+          DREAM3D_REQUIRE_EQUAL(0, -3)
+        }
+      }
+      fclose(f);
+    }
+    return EXIT_SUCCESS;
+  }
+
+  /**
+   * @brief
+   */
+  void operator()()
+  {
+    int err = EXIT_SUCCESS;
+    std::cout << "<===== Start ExportDataTest " << std::endl;
+    DREAM3D_REGISTER_TEST(TestFilterAvailability());
+
+    DREAM3D_REGISTER_TEST(TestExportDataWriter())
+    DREAM3D_REGISTER_TEST(TestExportDataReader())
+
+    DREAM3D_REGISTER_TEST(RemoveTestFiles())
+  }
+
+private:
+  ExportDataTest(const ExportDataTest&); // Copy Constructor Not Implemented
+  void operator=(const ExportDataTest&); // Move assignment Not Implemented
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index 7549683d5b..2b5298a813 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -22,6 +22,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   DataContainerTest
   ErrorMessageTest
   ExecuteProcessTest
+  ExportDataTest
   ExtractAttributeArraysFromGeometryTest
   ExtractComponentAsArrayTest
   ExtractVertexGeometryTest
diff --git a/Source/SIMPLib/Testing/TestFileLocations.h.in b/Source/SIMPLib/Testing/TestFileLocations.h.in
index b5f871a531..e39aebe48b 100644
--- a/Source/SIMPLib/Testing/TestFileLocations.h.in
+++ b/Source/SIMPLib/Testing/TestFileLocations.h.in
@@ -19,6 +19,10 @@ namespace UnitTest
   inline const QString TestTempDir("@TEST_TEMP_DIR@");
   inline const QString DREAM3DProjDir("@DREAM3DProj_SOURCE_DIR@");
 
+  namespace ExportDataTest
+  {
+    inline const QString TestTempDir("@TEST_TEMP_DIR@");
+  }
 
   namespace GenerateTiltSeriesTest
   {

From 8eff7f7befb80b8ca25dc25a4fdb4708d7f77a59 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 24 Sep 2020 15:05:40 -0400
Subject: [PATCH 297/397] Removed unused variables in Pybind11CustomTypeCasts.h

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/Pybind11CustomTypeCasts.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index ba26006dc3..a63a803ccb 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -568,8 +568,6 @@ struct type_caster<VectorOfFloatArray>
     }
     if(py::isinstance<py::list>(src))
     {
-      /* Extract PyObject from handle */
-      PyObject* source = src.ptr();
       /* Try converting into a Python integer value */
       VectorOfFloatArray floatArrays;
       for(auto floatArray : src)
@@ -597,7 +595,6 @@ struct type_caster<VectorOfFloatArray>
         }
         else if(py::isinstance<FloatArrayType>(floatArray))
         {
-          PyObject* floatArrayPy = floatArray.ptr();
           floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
         }
         else

From 35448106797d584605da513e586bd53f8340b982 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 25 Sep 2020 12:50:41 -0400
Subject: [PATCH 298/397] Changed SIMPLibMath from class to namespace

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Math/SIMPLibMath.cpp |   4 -
 Source/SIMPLib/Math/SIMPLibMath.h   | 138 +++++++++++++---------------
 2 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index 38ebcbfc38..fa7ec65774 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -40,10 +40,6 @@ static const float k_MachineEpsilon = 5E-16f;
 // static const float k_MaxRealNumber = 1E300;
 // static const float k_MinRealNumber = 1E-300;
 
-SIMPLibMath::SIMPLibMath() = default;
-
-SIMPLibMath::~SIMPLibMath() = default;
-
 float SIMPLibMath::Gamma(float x)
 {
   int i, k, m;
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index c13af499dd..6a60e89225 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -186,89 +186,77 @@ static const double k_Sin_ThreeEightPi = sin(3.0 * k_PiOver8);
 } // namespace Constants
 } // namespace SIMPLib
 
-class SIMPLibMath
+namespace SIMPLibMath
 {
-public:
-  virtual ~SIMPLibMath();
+SIMPLib_EXPORT float Gamma(float);
 
-  static SIMPLib_EXPORT float Gamma(float);
-
-  template <typename T>
-  static void bound(T& val, T min, T max)
+template <typename T>
+void bound(T& val, T min, T max)
+{
+  if(val < min)
   {
-    if(val < min)
-    {
-      val = min;
-    }
-    else if(val > max)
-    {
-      val = max;
-    }
+    val = min;
   }
-
-  static SIMPLib_EXPORT float erf(float);
-  static SIMPLib_EXPORT float erfc(float);
-  static SIMPLib_EXPORT float gammastirf(float);
-  static SIMPLib_EXPORT float LnGamma(float, float&);
-  static SIMPLib_EXPORT float incompletebeta(float, float, float);
-  static SIMPLib_EXPORT float incompletebetafe(float, float, float, float, float);
-  static SIMPLib_EXPORT float incompletebetafe2(float, float, float, float, float);
-  static SIMPLib_EXPORT float incompletebetaps(float, float, float, float);
-
-  /**
-   * @brief generates a linearly space array between 2 numbers (inclusive, assumes first number <= second number) [as matlabs linspace]
-   * @param first number
-   * @param second number
-   * @param length of return array
-   * @return
-   */
-  static SIMPLib_EXPORT std::vector<double> linspace(double first, double second, int length);
-
-  /**
-   * @brief closeEnough
-   * @param a
-   * @param b
-   * @param epsilon
-   * @return
-   */
-  template <typename K>
-  static bool closeEnough(const K& a, const K& b, const K& epsilon = std::numeric_limits<K>::epsilon())
+  else if(val > max)
   {
-    return (epsilon > fabs(a - b));
+    val = max;
   }
-
-  /**
-   * @brief transfer_sign
-   * @param a
-   * @param b
-   * @return
-   */
-  template <typename K>
-  static K transfer_sign(K a, K b)
+}
+
+SIMPLib_EXPORT float erf(float);
+SIMPLib_EXPORT float erfc(float);
+SIMPLib_EXPORT float gammastirf(float);
+SIMPLib_EXPORT float LnGamma(float, float&);
+SIMPLib_EXPORT float incompletebeta(float, float, float);
+SIMPLib_EXPORT float incompletebetafe(float, float, float, float, float);
+SIMPLib_EXPORT float incompletebetafe2(float, float, float, float, float);
+SIMPLib_EXPORT float incompletebetaps(float, float, float, float);
+
+/**
+ * @brief generates a linearly space array between 2 numbers (inclusive, assumes first number <= second number) [as matlabs linspace]
+ * @param first number
+ * @param second number
+ * @param length of return array
+ * @return
+ */
+SIMPLib_EXPORT std::vector<double> linspace(double first, double second, int length);
+
+/**
+ * @brief closeEnough
+ * @param a
+ * @param b
+ * @param epsilon
+ * @return
+ */
+template <typename K>
+bool closeEnough(const K& a, const K& b, const K& epsilon = std::numeric_limits<K>::epsilon())
+{
+  return (epsilon > fabs(a - b));
+}
+
+/**
+ * @brief transfer_sign
+ * @param a
+ * @param b
+ * @return
+ */
+template <typename K>
+K transfer_sign(K a, K b)
+{
+  if(a > 0.0 && b > 0.0)
+  {
+    return a;
+  }
+  if(a < 0.0 && b > 0.0)
   {
-    if(a > 0.0 && b > 0.0)
-    {
-      return a;
-    }
-    if(a < 0.0 && b > 0.0)
-    {
-      return -1 * a;
-    }
-
-    if(a < 0.0 && b < 0.0)
-    {
-      return a;
-    }
-
     return -1 * a;
   }
 
-protected:
-  SIMPLibMath();
+  if(a < 0.0 && b < 0.0)
+  {
+    return a;
+  }
 
-public:
-  SIMPLibMath(const SIMPLibMath&) = delete;            // Copy Constructor Not Implemented
-  SIMPLibMath(SIMPLibMath&&) = delete;                 // Move Constructor Not Implemented
-  SIMPLibMath& operator=(const SIMPLibMath&) = delete; // Copy Assignment Not Implemented
-  SIMPLibMath& operator=(SIMPLibMath&&) = delete;      // Move Assignment Not Implemented
-};
+  return -1 * a;
+}
+} // namespace SIMPLibMath

From 61d385f3b4f04176e8211b9b881ddec7d4c3cb31 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 25 Sep 2020 13:19:03 -0400
Subject: [PATCH 299/397] Changed SIMPLib::Constants to inline constexpr
 template variables

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../CoreFilters/GenerateTiltSeries.cpp        |   2 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |   2 +-
 .../Testing/Cxx/RotateSampleRefFrameTest.cpp  |   2 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |   4 +-
 Source/SIMPLib/Geometry/GeometryHelpers.h     |   2 +-
 .../Geometry/ShapeOps/CylinderAOps.cpp        |   2 +-
 .../Geometry/ShapeOps/CylinderBOps.cpp        |   2 +-
 .../Geometry/ShapeOps/CylinderCOps.cpp        |   2 +-
 .../Geometry/ShapeOps/EllipsoidOps.cpp        |   2 +-
 Source/SIMPLib/Math/GeometryMath.cpp          |   2 +-
 Source/SIMPLib/Math/SIMPLibMath.cpp           |   4 +-
 Source/SIMPLib/Math/SIMPLibMath.h             | 226 +++++++++++++++---
 12 files changed, 203 insertions(+), 49 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index cd62e82fa1..ba93c30c83 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -483,7 +483,7 @@ void GenerateTiltSeries::execute()
     DataContainer::Pointer gridDC = dca->getDataContainer(gridDCName);
 
     std::array<float, 4> rotationAxis = {0.0f, 0.0f, 0.0f, 0.0f};
-    float radians = currentDeg * SIMPLib::Constants::k_PiOver180;
+    float radians = currentDeg * SIMPLib::Constants::k_PiOver180D;
     if(k_XAxis == rotAxisSelection)
     {
       rotationAxis = {1.0f, 0.0f, 0.0f, radians};
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index dbc2bd0107..4975e29ecc 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -459,7 +459,7 @@ void RotateSampleRefFrame::dataCheck()
       setWarningCondition(-45003, ss);
     }
 
-    float rotationAngleRadians = m_RotationAngle * SIMPLib::Constants::k_DegToRad;
+    float rotationAngleRadians = m_RotationAngle * SIMPLib::Constants::k_DegToRadD;
 
     Eigen::AngleAxisf axisAngle(rotationAngleRadians, rotationAxis.normalized());
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
index 56f67af0ab..43fae3856b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
@@ -422,7 +422,7 @@ class RotateSampleRefFrameTest
         // Set properties
 
         Eigen::Vector3f axis(x, y, z);
-        float angleRadians = angle * static_cast<float>(SIMPLib::Constants::k_DegToRad);
+        float angleRadians = angle * SIMPLib::Constants::k_DegToRadF;
         Eigen::AngleAxisf axisAngle(angleRadians, axis);
 
         Eigen::Matrix3f rotationMatrix = axisAngle.toRotationMatrix();
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index c3a3379e1d..6242c381c3 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -1171,7 +1171,7 @@ true);
   void TestPrintDataArray()
   {
     FloatArrayType::Pointer floats = FloatArrayType::CreateArray(1, std::string("Test_Float"), true);
-    floats->setValue(0, SIMPLib::Constants::k_Pif);
+    floats->setValue(0, SIMPLib::Constants::k_PiF);
     QString outStr;
     QTextStream out(&outStr);
     floats->printTuple(out, 0);
@@ -1184,7 +1184,7 @@ true);
 
     outStr.clear();
     DoubleArrayType::Pointer doubles = DoubleArrayType::CreateArray(1, std::string("Test_Double"), true);
-    doubles->setValue(0, SIMPLib::Constants::k_Pi);
+    doubles->setValue(0, SIMPLib::Constants::k_PiD);
     doubles->printTuple(out, 0);
     matchString = "3.141592653589793";
     length = outStr.length();
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index b43d959f34..ba71dd32f6 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -1313,7 +1313,7 @@ class Topology
         minAng = ang6;
       }
 
-      minAnglesPtr[i] = SIMPLib::Constants::k_180OverPi * acosf(minAng);
+      minAnglesPtr[i] = SIMPLib::Constants::k_180OverPiD * acosf(minAng);
     }
   }
 };
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
index c5db2e7376..6bf45b58c0 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
@@ -61,7 +61,7 @@ float CylinderAOps::radcur1(QMap<ArgName, float> args)
   // the equation for volume for an A cylinder is pi*b*c*h where b and c are semi axis lengths, but
   // h is a full axis length - meaning h = 2a. However, since our aspect ratios relate semi axis lengths, the 2.0
   // factor can be ingored in this part
-  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPi * (1.0f / bovera) * (1.0f / covera)));
+  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPiD * (1.0f / bovera) * (1.0f / covera)));
   radcur1 = powf(radcur1, 0.333333333333f);
   return radcur1;
 }
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
index c8b481e07a..7a19c353d6 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
@@ -61,7 +61,7 @@ float CylinderBOps::radcur1(QMap<ArgName, float> args)
   // the equation for volume for a B cylinder is pi*a*c*h where a and c are semi axis lengths, but
   // h is a full axis length - meaning h = 2b.  However, since our aspect ratios relate semi axis lengths, the 2.0
   // factor can be ingored in this part
-  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPi * (1.0f / bovera) * (1.0f / covera)));
+  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPiD * (1.0f / bovera) * (1.0f / covera)));
   radcur1 = powf(radcur1, 0.333333333333f);
   return radcur1;
 }
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
index fe9592be97..687ded5a51 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
@@ -61,7 +61,7 @@ float CylinderCOps::radcur1(QMap<ArgName, float> args)
   // the equation for volume for a C cylinder is pi*a*b*h where a and b are semi axis lengths, but
   // h is a full axis length - meaning h = 2c.  However, since our aspect ratios relate semi axis lengths, the 2.0
   // factor can be ingored in this part
-  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPi * (1.0f / bovera) * (1.0f / covera)));
+  radcur1 = static_cast<float>((volcur * SIMPLib::Constants::k_1OverPiD * (1.0f / bovera) * (1.0f / covera)));
   radcur1 = powf(radcur1, 0.333333333333f);
   return radcur1;
 }
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
index ecd3c74d73..8840dc0436 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
@@ -58,7 +58,7 @@ float EllipsoidOps::radcur1(QMap<ArgName, float> args)
   float bovera = args[B_OverA];
   float covera = args[C_OverA];
 
-  radcur1 = (volcur * 0.75f * (SIMPLib::Constants::k_1OverPi) * (1.0f / bovera) * (1.0f / covera));
+  radcur1 = (volcur * 0.75f * (SIMPLib::Constants::k_1OverPiD) * (1.0f / bovera) * (1.0f / covera));
   radcur1 = powf(radcur1, 0.333333333333f);
   return radcur1;
 }
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 86b850dac0..9f1d328412 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -333,7 +333,7 @@ void GeometryMath::GenerateRandomRay(float length, float* ray)
   float rand2 = distribution(generator);
 
   ray[2] = (2.0f * rand1) - 1.0f;
-  float t = static_cast<float>(SIMPLib::Constants::k_2Pi) * rand2;
+  float t = SIMPLib::Constants::k_2PiF * rand2;
   float w = std::sqrt(1.0f - (ray[2] * ray[2]));
   ray[0] = w * std::cos(t);
   ray[1] = w * std::sin(t);
diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index fa7ec65774..a0c501ad80 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -118,7 +118,7 @@ float SIMPLibMath::Gamma(float x)
       ga *= r;
       if(x < 0.0f)
       {
-        ga = -1 * SIMPLib::Constants::k_Pif / (x * ga * sinf(SIMPLib::Constants::k_Pif * x));
+        ga = -1 * SIMPLib::Constants::k_PiF / (x * ga * sinf(SIMPLib::Constants::k_PiF * x));
       }
     }
   }
@@ -192,7 +192,7 @@ float SIMPLibMath::LnGamma(float x, float& sgngam)
       p = p + 1;
       z = p - q;
     }
-    z = q * sinf(SIMPLib::Constants::k_Pif * z);
+    z = q * sinf(SIMPLib::Constants::k_PiF * z);
     result = logpi - log(z) - w;
     return result;
   }
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index 6a60e89225..851dcf43c0 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -76,10 +76,11 @@ standard C++ library."
 
 #endif
 
-#include <cstddef>
 #include <cmath>
-#include <vector>
+#include <cstddef>
 #include <limits>
+#include <type_traits>
+#include <vector>
 
 #include "SIMPLib/SIMPLib.h"
 
@@ -148,40 +149,193 @@ namespace SIMPLib
 {
 namespace Constants
 {
-static const float k_Pif = static_cast<float>(M_PI);
-static const double k_Pi = M_PI;
-static const double k_SqrtPi = sqrt(M_PI);
-static const double k_2OverSqrtPi = 2.0 / sqrt(M_PI);
-static const double k_HalfOfSqrtPi = sqrt(M_PI) / 2.0;
-static const double k_SqrtHalfPi = sqrt(M_PI_2);
-static const double k_2Pi = 2.0 * M_PI;
-static const double k_1OverPi = 1.0 / M_PI;
-static const double k_PiOver180 = M_PI / 180.0;
-static const double k_360OverPi = 360.0 / M_PI;
-static const double k_180OverPi = 180.0 / M_PI;
-static const double k_PiOver2 = M_PI / 2.0;
-static const double k_PiOver3 = M_PI / 3.0;
-static const double k_PiOver4 = M_PI / 4.0;
-static const double k_PiOver8 = M_PI / 8.0;
-static const double k_PiOver12 = M_PI / 12.0;
-static const double k_Sqrt2 = sqrt(2.0);
-static const double k_Sqrt3 = sqrt(3.0);
-static const double k_HalfSqrt2 = 0.5 * sqrt(2.0);
-static const double k_1OverRoot2 = 1.0 / sqrt(2.0);
-static const double k_1OverRoot3 = 1.0 / sqrt(3.0);
-static const double k_Root3Over2 = sqrt(3.0) / 2.0;
-static const double k_DegToRad = M_PI / 180.0;
-static const double k_RadToDeg = 180.0 / M_PI;
-static const double k_1Point3 = 1.0 + 1.0 / 3.0;
-static const double k_1Over3 = 1.0 / 3.0;
-
-static const double k_ACosNeg1 = acos(-1.0);
-static const double k_ACos1 = acos(1.0);
-
-static const double k_Tan_OneEigthPi = tan(k_PiOver8);
-static const double k_Cos_OneEigthPi = cos(k_PiOver8);
-static const double k_Cos_ThreeEightPi = cos(3.0 * k_PiOver8);
-static const double k_Sin_ThreeEightPi = sin(3.0 * k_PiOver8);
+// In C++ 20, can be replaced with <numbers> header
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Pi = static_cast<T>(3.1415926535897932384);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_SqrtPi = static_cast<T>(1.7724538509055159);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_2OverSqrtPi = static_cast<T>(1.1283791670955126);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_HalfOfSqrtPi = static_cast<T>(0.88622692545275794);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_SqrtHalfPi = static_cast<T>(1.2533141373155001);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_2Pi = static_cast<T>(6.2831853071795862);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_1OverPi = static_cast<T>(0.31830988618379069);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver180 = static_cast<T>(0.017453292519943295);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_360OverPi = static_cast<T>(114.59155902616465);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_180OverPi = static_cast<T>(57.295779513082323);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver2 = static_cast<T>(1.5707963267948966);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver3 = static_cast<T>(1.0471975511965976);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver4 = static_cast<T>(0.78539816339744828);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver8 = static_cast<T>(0.39269908169872414);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_PiOver12 = static_cast<T>(0.26179938779914941);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Sqrt2 = static_cast<T>(1.4142135623730951);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Sqrt3 = static_cast<T>(1.7320508075688772);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_HalfSqrt2 = static_cast<T>(0.70710678118654757);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_1OverRoot2 = static_cast<T>(0.70710678118654746);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_1OverRoot3 = static_cast<T>(0.57735026918962584);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Root3Over2 = static_cast<T>(0.8660254037844386);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_DegToRad = static_cast<T>(0.017453292519943295);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_RadToDeg = static_cast<T>(57.295779513082323);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_1Point3 = static_cast<T>(1.3333333333333333);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_1Over3 = static_cast<T>(0.33333333333333331);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_ACosNeg1 = k_Pi<T>;
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_ACos1 = static_cast<T>(0.0);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Tan_OneEigthPi = static_cast<T>(0.41421356237309503);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Cos_OneEigthPi = static_cast<T>(0.92387953251128674);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Cos_ThreeEightPi = static_cast<T>(0.38268343236508984);
+
+template <class T, class = std::enable_if_t<std::is_floating_point_v<T>>>
+inline constexpr T k_Sin_ThreeEightPi = static_cast<T>(0.92387953251128674);
+
+inline constexpr float k_PiF = k_Pi<float>;
+inline constexpr double k_PiD = k_Pi<double>;
+
+inline constexpr float k_SqrtPiF = k_SqrtPi<float>;
+inline constexpr double k_SqrtPiD = k_SqrtPi<double>;
+
+inline constexpr float k_2OverSqrtPiF = k_2OverSqrtPi<float>;
+inline constexpr double k_2OverSqrtPiD = k_2OverSqrtPi<double>;
+
+inline constexpr float k_HalfOfSqrtPiF = k_HalfOfSqrtPi<float>;
+inline constexpr double k_HalfOfSqrtPiD = k_HalfOfSqrtPi<double>;
+
+inline constexpr float k_SqrtHalfPiF = k_SqrtHalfPi<float>;
+inline constexpr double k_SqrtHalfPiD = k_SqrtHalfPi<double>;
+
+inline constexpr float k_2PiF = k_2Pi<float>;
+inline constexpr double k_2PiD = k_2Pi<double>;
+
+inline constexpr float k_1OverPiF = k_1OverPi<float>;
+inline constexpr double k_1OverPiD = k_1OverPi<double>;
+
+inline constexpr float k_PiOver180F = k_PiOver180<float>;
+inline constexpr double k_PiOver180D = k_PiOver180<double>;
+
+inline constexpr float k_360OverPiF = k_360OverPi<float>;
+inline constexpr double k_360OverPiD = k_360OverPi<double>;
+
+inline constexpr float k_180OverPiF = k_180OverPi<float>;
+inline constexpr double k_180OverPiD = k_180OverPi<double>;
+
+inline constexpr float k_PiOver2F = k_PiOver2<float>;
+inline constexpr double k_PiOver2D = k_PiOver2<double>;
+
+inline constexpr float k_PiOver3F = k_PiOver3<float>;
+inline constexpr double k_PiOver3D = k_PiOver3<double>;
+
+inline constexpr float k_PiOver4F = k_PiOver4<float>;
+inline constexpr double k_PiOver4D = k_PiOver4<double>;
+
+inline constexpr float k_PiOver8F = k_PiOver8<float>;
+inline constexpr double k_PiOver8D = k_PiOver8<double>;
+
+inline constexpr float k_PiOver12F = k_PiOver12<float>;
+inline constexpr double k_PiOver12D = k_PiOver12<double>;
+
+inline constexpr float k_Sqrt2F = k_Sqrt2<float>;
+inline constexpr double k_Sqrt2D = k_Sqrt2<double>;
+
+inline constexpr float k_Sqrt3F = k_Sqrt3<float>;
+inline constexpr double k_Sqrt3D = k_Sqrt3<double>;
+
+inline constexpr float k_HalfSqrt2F = k_HalfSqrt2<float>;
+inline constexpr double k_HalfSqrt2D = k_HalfSqrt2<double>;
+
+inline constexpr float k_1OverRoot2F = k_1OverRoot2<float>;
+inline constexpr double k_1OverRoot2D = k_1OverRoot2<double>;
+
+inline constexpr float k_1OverRoot3F = k_1OverRoot3<float>;
+inline constexpr double k_1OverRoot3D = k_1OverRoot3<double>;
+
+inline constexpr float k_Root3Over2F = k_Root3Over2<float>;
+inline constexpr double k_Root3Over2D = k_Root3Over2<double>;
+
+inline constexpr float k_DegToRadF = k_DegToRad<float>;
+inline constexpr double k_DegToRadD = k_DegToRad<double>;
+
+inline constexpr float k_RadToDegF = k_RadToDeg<float>;
+inline constexpr double k_RadToDegD = k_RadToDeg<double>;
+
+inline constexpr float k_1Point3F = k_1Point3<float>;
+inline constexpr double k_1Point3D = k_1Point3<double>;
+
+inline constexpr float k_1Over3F = k_1Over3<float>;
+inline constexpr double k_1Over3D = k_1Over3<double>;
+
+inline constexpr float k_ACosNeg1F = k_ACosNeg1<float>;
+inline constexpr double k_ACosNeg1D = k_ACosNeg1<double>;
+
+inline constexpr float k_ACos1F = k_ACos1<float>;
+inline constexpr double k_ACos1D = k_ACos1<double>;
+
+inline constexpr float k_Tan_OneEigthPiF = k_Tan_OneEigthPi<float>;
+inline constexpr double k_Tan_OneEigthPiD = k_Tan_OneEigthPi<double>;
+
+inline constexpr float k_Cos_OneEigthPiF = k_Cos_OneEigthPi<float>;
+inline constexpr double k_Cos_OneEigthPiD = k_Cos_OneEigthPi<double>;
+
+inline constexpr float k_Cos_ThreeEightPiF = k_Cos_ThreeEightPi<float>;
+inline constexpr double k_Cos_ThreeEightPiD = k_Cos_ThreeEightPi<double>;
+
+inline constexpr float k_Sin_ThreeEightPiF = k_Sin_ThreeEightPi<float>;
+inline constexpr double k_Sin_ThreeEightPiD = k_Sin_ThreeEightPi<double>;
 
 } // namespace Constants
 } // namespace SIMPLib

From fd747553f22227d262adefefab421fe9013276e5 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 8 Oct 2020 17:54:39 -0400
Subject: [PATCH 300/397] Now properly cleanup QThread in
 ~ReadASCIIDataWidget()

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameterWidgets/ReadASCIIDataWidget.cpp           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 53b55ebccc..8be9389d2d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -90,6 +90,11 @@ ReadASCIIDataWidget::~ReadASCIIDataWidget()
   {
     m_LineCounter->deleteLater();
   }
+
+  if(nullptr != m_WorkerThread)
+  {
+    m_WorkerThread->deleteLater();
+  }
 }
 
 // -----------------------------------------------------------------------------

From 74a54f26478be271e118368706ca9ba14099cf27 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 8 Oct 2020 18:49:24 -0400
Subject: [PATCH 301/397] Fixed truncation of constant value warnings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 6242c381c3..f1a2340049 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -1464,10 +1464,10 @@ true);
   void TestByteSwapElements()
   {
     TestByteSwapElementType<uint8_t>(0xAB);
-    TestByteSwapElementType<int8_t>(0xAB);
+    TestByteSwapElementType<int8_t>(static_cast<int8_t>(0xAB));
 
     TestByteSwapElementType<uint16_t>(0xABCD);
-    TestByteSwapElementType<int16_t>(0xABCD);
+    TestByteSwapElementType<int16_t>(static_cast<int16_t>(0xABCD));
 
     TestByteSwapElementType<uint32_t>(0x55ABCDEF);
     TestByteSwapElementType<int32_t>(0x55ABCDEF);

From 6081b6fc75329720b69a10832cff7202336fe651 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 9 Oct 2020 16:50:32 -0400
Subject: [PATCH 302/397] Removed unnecessary code after return statement

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Cxx/ConvertColorToGrayScaleTest.cpp       | 25 -------------------
 1 file changed, 25 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 42d9ed4f0c..59265dd522 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -418,31 +418,6 @@ class ConvertColorToGrayScaleTest
     int wrongValues = CompareResults(algoMapIndex, dc);
     DREAM3D_REQUIRE_EQUAL(wrongValues, 0)
     return erred + wrongValues;
-
-    // Tear Down Tests
-    for(const auto& eachDC : m_dca->getDataContainers())
-    {
-      for(const auto& eachAM : eachDC->getAttributeMatrices())
-      {
-        for(const auto& eachAAName : eachAM->getAttributeArrayNames())
-        {
-          if(eachAAName.contains(m_outputArrayPrefix))
-          {
-            eachAM->getAttributeArray(eachAAName)->releaseOwnership();
-            eachAM->removeAttributeArray(eachAAName);
-            bool doesAAStillExist = m_dca->doesAttributeArrayExist(DataArrayPath(eachDC->getName(), eachAM->getName(), eachAAName));
-            DREAM3D_REQUIRE_EQUAL(false, doesAAStillExist)
-          }
-        }
-        eachDC->removeAttributeMatrix(m_outputAMName);
-        bool doesAMStillExist = eachDC->doesAttributeMatrixExist(m_outputAMName);
-        DREAM3D_REQUIRE_EQUAL(false, doesAMStillExist)
-      }
-    }
-
-    m_dca->removeDataContainer(dc->getName());
-    m_dca = DataContainerArray::NullPointer();
-    m_colorToGrayscaleFilter = ConvertColorToGrayScale::NullPointer();
   }
 
 public:

From cd523cdf023327752660fa16a185eeaa5816dfa7 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 19 Oct 2020 21:40:16 -0400
Subject: [PATCH 303/397] Fix issue where values from filter parameter were not
 populated correctly.

The use of QPair<double, double> caused a silent runtime error converting
the value.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp | 5 +++--
 Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h   | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index 0173c0bca7..16e7a73656 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -66,8 +66,9 @@ void RangeWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QPair<double, double> range = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QPair<double, double>>();
+    // Get the "Getter Callback" standard function and use it to get the values from the filter
+    RangeFilterParameter::GetterCallbackType fpGetter = m_FilterParameter->getGetterCallback();
+    FPRangePair range = fpGetter();
     minValue->setText(QString::number(range.first));
     maxValue->setText(QString::number(range.second));
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index b00905106b..128d7dcd39 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -37,11 +37,10 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
-
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 

From 2ae26a185be8011b537b11fe8db3e163200b932d Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 13 Oct 2020 17:29:52 -0400
Subject: [PATCH 304/397] Added DataArray::fillTuple()

* Functions like initialize tuple but is type safe

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 19 +++++++++++++------
 Source/SIMPLib/DataArrays/DataArray.hpp |  7 +++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index 989b14b6c4..d0c28e1a0b 100755
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -958,6 +958,18 @@ void DataArray<T>::setTuple(size_t tupleIndex, const std::vector<T>& data)
 // -----------------------------------------------------------------------------
 template <typename T>
 void DataArray<T>::initializeTuple(size_t i, const void* p)
+{
+  if(p == nullptr)
+  {
+    return;
+  }
+  const T* c = reinterpret_cast<const T*>(p);
+  fillTuple(i, *c);
+}
+
+// -----------------------------------------------------------------------------
+template <typename T>
+void DataArray<T>::fillTuple(size_t i, T value)
 {
   if(!m_IsAllocated)
   {
@@ -969,12 +981,7 @@ void DataArray<T>::initializeTuple(size_t i, const void* p)
     Q_ASSERT(i * m_NumComponents < m_Size);
   }
 #endif
-  if(nullptr == p)
-  {
-    return;
-  }
-  const T* c = reinterpret_cast<const T*>(p);
-  std::fill_n(begin() + (i * m_NumComponents), m_NumComponents, *c);
+  std::fill_n(begin() + (i * m_NumComponents), m_NumComponents, value);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 1c1bc68b1e..453ad73877 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -455,6 +455,13 @@ class DataArray : public IDataArray
    */
   void initializeTuple(size_t i, const void* p) override;
 
+  /**
+   * @brief Sets all the components of tuple i to value
+   * @param i
+   * @param value
+   */
+  void fillTuple(size_t i, T value);
+
   /**
    * @brief getTuplePointer Returns the pointer to a specific tuple
    * @param tupleIndex The index of tuple

From d066e4b159a4a33743ec91316186f299e22be831 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 23 Oct 2020 12:08:48 -0400
Subject: [PATCH 305/397] Cleaned up ScopedFileMonitor

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/ScopedFileMonitor.hpp | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/Common/ScopedFileMonitor.hpp b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
index b700608ad8..561e72564c 100644
--- a/Source/SIMPLib/Common/ScopedFileMonitor.hpp
+++ b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
@@ -35,7 +35,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 
 /**
  * @brief The ScopedFileMonitor class will automatically close an open FILE pointer
@@ -48,14 +48,23 @@ class ScopedFileMonitor
   : m_File(f)
   {
   }
-  virtual ~ScopedFileMonitor()
+
+  ~ScopedFileMonitor() noexcept
   {
-    if(nullptr != m_File)
-      fclose(m_File);
+    if(m_File != nullptr)
+    {
+      [[maybe_unused]] auto result = std::fclose(m_File);
+    }
   }
 
+  ScopedFileMonitor() = delete;
+
+  ScopedFileMonitor(const ScopedFileMonitor&) = delete;
+  ScopedFileMonitor& operator=(const ScopedFileMonitor&) = delete;
+
+  ScopedFileMonitor(ScopedFileMonitor&&) noexcept = delete;
+  ScopedFileMonitor& operator=(ScopedFileMonitor&&) noexcept = delete;
+
 private:
   FILE* m_File;
-  ScopedFileMonitor(const ScopedFileMonitor&); // Copy Constructor Not Implemented
-  void operator=(const ScopedFileMonitor&);    // Move assignment Not Implemented
 };

From e2acca6563ec7bf021fc2725722425c1a398ee61 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 23 Oct 2020 12:09:32 -0400
Subject: [PATCH 306/397] Changed DEFAULT_BLOCKSIZE from macro to constexpr
 variable

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/Constants.h              | 3 +--
 Source/SIMPLib/CoreFilters/RawBinaryReader.cpp | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 8df13e4ad6..95cd790cb2 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -57,13 +57,12 @@
 
 #include "SIMPLib/SIMPLib.h"
 
-#define DEFAULT_BLOCKSIZE 1048576
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 namespace SIMPL
 {
+inline constexpr size_t DEFAULT_BLOCKSIZE = 1048576;
 
 using Rgb = uint32_t;
 inline constexpr Rgb RGB_MASK = 0x00ffffff; // masks RGB values
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 02291e7208..4ee97a4373 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -137,9 +137,9 @@ int32_t readBinaryFile(RawBinaryReader* filter, const std::vector<size_t>& cDims
   }
   numRead = 0;
   // Now start reading the data in chunks if needed.
-  size_t chunkSize = DEFAULT_BLOCKSIZE;
+  size_t chunkSize = SIMPL::DEFAULT_BLOCKSIZE;
 
-  if(numBytesToRead < DEFAULT_BLOCKSIZE)
+  if(numBytesToRead < SIMPL::DEFAULT_BLOCKSIZE)
   {
     chunkSize = numBytesToRead;
   }

From e260720c4d1da9cad77778a159d5f354e4cae136 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 23 Oct 2020 12:34:50 -0400
Subject: [PATCH 307/397] Cleaned up RawBinaryReader

* Replaced macros
* Replaced QFileInfo with std::filesystem
* Removed unused member variable

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   | 296 +++++++++---------
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |  39 +--
 2 files changed, 163 insertions(+), 172 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 4ee97a4373..55d78713db 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -33,15 +33,20 @@
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #include "RawBinaryReader.h"
 
-#include <QtCore/QFileInfo>
+#include <algorithm>
+#include <cstddef>
+
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
@@ -51,33 +56,34 @@
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/UInt64FilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
-#define RBR_FILE_NOT_OPEN -1000
-#define RBR_FILE_TOO_SMALL -1010
-#define RBR_FILE_TOO_BIG -1020
-#define RBR_READ_EOF -1030
-#define RBR_NO_ERROR 0
+#if defined(_MSC_VER)
+#define FSEEK _fseeki64
+#else
+#define FSEEK std::fseek
+#endif
 
+namespace
+{
 #ifdef CMP_WORDS_BIGENDIAN
-#define SWAP_ARRAY(array)                                                                                                                                                                              \
-  if(filter->getEndian() == 0)                                                                                                                                                                         \
-  {                                                                                                                                                                                                    \
-    array->byteSwapElements();                                                                                                                                                                         \
-  }
-
+constexpr int32_t k_EndianCheck = 0;
 #else
-#define SWAP_ARRAY(array)                                                                                                                                                                              \
-  if(filter->getEndian() == 1)                                                                                                                                                                         \
-  {                                                                                                                                                                                                    \
-    array->byteSwapElements();                                                                                                                                                                         \
-  }
-
+constexpr int32_t k_EndianCheck = 1;
 #endif
 
-// -----------------------------------------------------------------------------
-//
+constexpr int32_t RBR_NO_ERROR = 0;
+constexpr int32_t RBR_FILENAME_EMPTY = -387;
+constexpr int32_t RBR_FILE_NOT_EXIST = -388;
+constexpr int32_t RBR_NUM_COMPONENTS_ERROR = -391;
+constexpr int32_t RBR_FILE_NOT_OPEN = -1000;
+constexpr int32_t RBR_FILE_TOO_SMALL = -1010;
+constexpr int32_t RBR_FILE_TOO_BIG = -1020;
+constexpr int32_t RBR_READ_EOF = -1030;
+constexpr int32_t RBR_DCA_ERROR = -1040;
+constexpr int32_t RBR_DA_ERROR = -1050;
+constexpr int32_t RBR_COMPONENT_ERROR = -1060;
+constexpr int32_t RBR_DA_NULL = -1070;
+
 // -----------------------------------------------------------------------------
 int32_t SanityCheckFileSizeVersusAllocatedSize(size_t allocatedBytes, size_t fileSize, size_t skipHeaderBytes)
 {
@@ -89,86 +95,73 @@ int32_t SanityCheckFileSizeVersusAllocatedSize(size_t allocatedBytes, size_t fil
   {
     return 1;
   }
-  // File Size and Allocated Size are equal so we  are good to go
+  // File Size and Allocated Size are equal so we are good to go
   return 0;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 template <typename T>
-int32_t readBinaryFile(RawBinaryReader* filter, const std::vector<size_t>& cDims)
+int32_t readBinaryFile(IDataArray* dataArrayPtr, const std::string& filename, uint64_t skipHeaderBytes, int32_t endian)
 {
-  typename DataArray<T>::Pointer p = filter->getDataContainerArray()->getPrereqArrayFromPath<DataArray<T>>(filter, filter->getCreatedAttributeArrayPath(), cDims);
-  QString filename = filter->getInputFile();
-  int64_t skipHeaderBytes = filter->getSkipHeaderBytes();
+  auto dataArray = dynamic_cast<DataArray<T>*>(dataArrayPtr);
 
-  int32_t err = 0;
-  QFileInfo fi(filename);
-  uint64_t fileSize = static_cast<size_t>(fi.size());
-  size_t allocatedBytes = p->getSize() * sizeof(T);
-  err = SanityCheckFileSizeVersusAllocatedSize(allocatedBytes, fileSize, skipHeaderBytes);
+  if(dataArray == nullptr)
+  {
+    return RBR_DA_NULL;
+  }
+
+  const size_t fileSize = fs::file_size(filename);
+  const size_t numBytesToRead = dataArray->getSize() * sizeof(T);
+  int32_t err = SanityCheckFileSizeVersusAllocatedSize(numBytesToRead, fileSize, skipHeaderBytes);
 
   if(err < 0)
   {
     return RBR_FILE_TOO_SMALL;
   }
 
-  FILE* f = fopen(filename.toLatin1().data(), "rb");
-  if(nullptr == f)
+  FILE* f = std::fopen(filename.c_str(), "rb");
+  if(f == nullptr)
   {
     return RBR_FILE_NOT_OPEN;
   }
 
   ScopedFileMonitor monitor(f);
-  size_t numBytesToRead = p->getNumberOfTuples() * static_cast<size_t>(p->getNumberOfComponents()) * sizeof(T);
-  size_t numRead = 0;
-
-  uint8_t* chunkptr = reinterpret_cast<uint8_t*>(p->getPointer(0));
 
   // Skip some header bytes if the user asked for it.
   if(skipHeaderBytes > 0)
   {
-#if defined(_MSC_VER)
-    _fseeki64(f, skipHeaderBytes, SEEK_SET);
-#else
-    fseek(f, skipHeaderBytes, SEEK_SET);
-#endif
+    FSEEK(f, skipHeaderBytes, SEEK_SET);
   }
-  numRead = 0;
-  // Now start reading the data in chunks if needed.
-  size_t chunkSize = SIMPL::DEFAULT_BLOCKSIZE;
 
-  if(numBytesToRead < SIMPL::DEFAULT_BLOCKSIZE)
-  {
-    chunkSize = numBytesToRead;
-  }
+  std::byte* chunkptr = reinterpret_cast<std::byte*>(dataArray->data());
+
+  // Now start reading the data in chunks if needed.
+  size_t chunkSize = std::min(numBytesToRead, SIMPL::DEFAULT_BLOCKSIZE);
 
   size_t master_counter = 0;
-  size_t bytes_read = 0;
-  while(true)
+  while(master_counter < numBytesToRead)
   {
-    bytes_read = fread(chunkptr, sizeof(uint8_t), chunkSize, f);
-    chunkptr = chunkptr + bytes_read;
+    size_t bytes_read = std::fread(chunkptr, sizeof(std::byte), chunkSize, f);
+    chunkptr += bytes_read;
     master_counter += bytes_read;
 
-    if(numBytesToRead - master_counter < chunkSize)
-    {
-      chunkSize = numBytesToRead - master_counter;
-    }
-    if(master_counter >= numBytesToRead)
+    size_t bytesLeft = numBytesToRead - master_counter;
+
+    if(bytesLeft < chunkSize)
     {
-      break;
+      chunkSize = bytesLeft;
     }
   }
 
-  SWAP_ARRAY(p)
+  if(endian == k_EndianCheck)
+  {
+    dataArray->byteSwapElements();
+  }
 
   return RBR_NO_ERROR;
 }
+} // namespace
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 RawBinaryReader::RawBinaryReader()
 : m_CreatedAttributeArrayPath("")
@@ -180,13 +173,9 @@ RawBinaryReader::RawBinaryReader()
 {
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 RawBinaryReader::~RawBinaryReader() = default;
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 void RawBinaryReader::setupFilterParameters()
 {
@@ -217,8 +206,6 @@ void RawBinaryReader::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 void RawBinaryReader::readFilterParameters(AbstractFilterParametersReader* reader, int index)
 {
@@ -233,104 +220,99 @@ void RawBinaryReader::readFilterParameters(AbstractFilterParametersReader* reade
   reader->closeFilterGroup();
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void RawBinaryReader::initialize()
-{
-}
-
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 void RawBinaryReader::dataCheck()
 {
   clearErrorCode();
   clearWarningCode();
 
-  QFileInfo fi(getInputFile());
-  if(getInputFile().isEmpty())
+  auto dca = getDataContainerArray();
+
+  const std::string inputFile = m_InputFile.toStdString();
+
+  if(inputFile.empty())
   {
     QString ss = QObject::tr("The input file must be set");
-    setErrorCondition(-387, ss);
+    setErrorCondition(RBR_FILENAME_EMPTY, ss);
   }
-  else if(!fi.exists())
+  else if(!fs::exists(inputFile))
   {
     QString ss = QObject::tr("The input file does not exist: %1").arg(getInputFile());
-    setErrorCondition(-388, ss);
+    setErrorCondition(RBR_FILE_NOT_EXIST, ss);
   }
 
   if(m_NumberOfComponents < 1)
   {
     QString ss = QObject::tr("The number of components must be positive");
-    setErrorCondition(-391, ss);
+    setErrorCondition(RBR_NUM_COMPONENTS_ERROR, ss);
   }
 
-  AttributeMatrix::Pointer attrMat = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, getCreatedAttributeArrayPath(), -30003);
+  AttributeMatrix::Pointer attrMat = dca->getPrereqAttributeMatrixFromPath(this, getCreatedAttributeArrayPath(), -30003);
   if(getErrorCode() < 0)
   {
     return;
   }
 
-  std::vector<size_t> tDims = attrMat->getTupleDimensions();
-  size_t totalDim = std::accumulate(tDims.begin(), tDims.end(), static_cast<size_t>(1), std::multiplies<size_t>());
+  const std::vector<size_t> tDims = attrMat->getTupleDimensions();
+  const size_t totalDim = std::accumulate(tDims.cbegin(), tDims.cend(), static_cast<size_t>(1), std::multiplies<size_t>());
+  const size_t totalSize = m_NumberOfComponents * totalDim;
 
   size_t allocatedBytes = 0;
-  std::vector<size_t> cDims(1, m_NumberOfComponents);
+  std::vector<size_t> cDims = {static_cast<size_t>(m_NumberOfComponents)};
   if(m_ScalarType == SIMPL::NumericTypes::Type::Int8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(int8_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<Int8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(int8_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt8)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(uint8_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<UInt8ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(uint8_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(int16_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<Int16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(int16_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt16)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(uint16_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<UInt16ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(uint16_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(int32_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<Int32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(int32_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt32)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(uint32_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<UInt32ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(uint32_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Int64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(int64_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<Int64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(int64_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::UInt64)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(uint64_t) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<UInt64ArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(uint64_t) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Float)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(float) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<FloatArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(float) * totalSize;
   }
   else if(m_ScalarType == SIMPL::NumericTypes::Type::Double)
   {
-    getDataContainerArray()->createNonPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
-    allocatedBytes = sizeof(double) * m_NumberOfComponents * totalDim;
+    dca->createNonPrereqArrayFromPath<DoubleArrayType>(this, getCreatedAttributeArrayPath(), 0, cDims, "CreatedAttributeArrayPath");
+    allocatedBytes = sizeof(double) * totalSize;
   }
 
   // Sanity Check Allocated Bytes versus size of file
-  uint64_t fileSize = fi.size();
-  int32_t check = SanityCheckFileSizeVersusAllocatedSize(allocatedBytes, fileSize, m_SkipHeaderBytes);
+  const uint64_t fileSize = fs::file_size(inputFile);
+  const int32_t check = SanityCheckFileSizeVersusAllocatedSize(allocatedBytes, fileSize, m_SkipHeaderBytes);
   if(check == -1)
   {
 
@@ -351,8 +333,6 @@ void RawBinaryReader::dataCheck()
   }
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 void RawBinaryReader::execute()
 {
@@ -364,48 +344,70 @@ void RawBinaryReader::execute()
     return;
   }
 
-  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(getCreatedAttributeArrayPath().getDataContainerName());
+  auto dca = getDataContainerArray();
 
-  std::vector<size_t> cDims(1, m_NumberOfComponents);
+  if(dca == nullptr)
+  {
+    setErrorCondition(RBR_DCA_ERROR, "Failed to acquire DataContainerArray");
+    return;
+  }
+
+  const std::vector<size_t> cDims = {static_cast<size_t>(m_NumberOfComponents)};
+
+  auto dataArray = dca->getPrereqIDataArrayFromPath(this, getCreatedAttributeArrayPath());
+
+  if(dataArray == nullptr)
+  {
+    setErrorCondition(RBR_DA_ERROR, "Failed to acquire DataArray");
+    return;
+  }
+
+  if(dataArray->getComponentDimensions() != cDims)
+  {
+    setErrorCondition(RBR_COMPONENT_ERROR, "Failed to acquire DataArray with the correct dimensions");
+    return;
+  }
+
+  const std::string inputFile = m_InputFile.toStdString();
 
   int32_t err = 0;
   switch(m_ScalarType)
   {
   case SIMPL::NumericTypes::Type::Int8:
-    err = readBinaryFile<int8_t>(this, cDims);
+    err = readBinaryFile<int8_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::UInt8:
-    err = readBinaryFile<uint8_t>(this, cDims);
+    err = readBinaryFile<uint8_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Int16:
-    err = readBinaryFile<int16_t>(this, cDims);
+    err = readBinaryFile<int16_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::UInt16:
-    err = readBinaryFile<uint16_t>(this, cDims);
+    err = readBinaryFile<uint16_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Int32:
-    err = readBinaryFile<int32_t>(this, cDims);
+    err = readBinaryFile<int32_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::UInt32:
-    err = readBinaryFile<uint32_t>(this, cDims);
+    err = readBinaryFile<uint32_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Int64:
-    err = readBinaryFile<int64_t>(this, cDims);
+    err = readBinaryFile<int64_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::UInt64:
-    err = readBinaryFile<uint64_t>(this, cDims);
+    err = readBinaryFile<uint64_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Float:
-    err = readBinaryFile<float>(this, cDims);
+    err = readBinaryFile<float>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Double:
-    err = readBinaryFile<double>(this, cDims);
+    err = readBinaryFile<double>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::Bool:
-    err = readBinaryFile<uint8_t>(this, cDims);
+    err = readBinaryFile<uint8_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::SizeT:
-    err = readBinaryFile<size_t>(this, cDims);
+    err = readBinaryFile<size_t>(dataArray.get(), inputFile, m_SkipHeaderBytes, m_Endian);
     break;
   case SIMPL::NumericTypes::Type::UnknownNumType:
     break;
@@ -427,10 +429,12 @@ void RawBinaryReader::execute()
   {
     setErrorCondition(RBR_READ_EOF, "RawBinaryReader read past the end of the specified file");
   }
+  else if(err == RBR_DA_NULL)
+  {
+    setErrorCondition(RBR_DA_NULL, "Failed DataArray cast");
+  }
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 AbstractFilter::Pointer RawBinaryReader::newFilterInstance(bool copyFilterParameters) const
 {
@@ -442,24 +446,18 @@ AbstractFilter::Pointer RawBinaryReader::newFilterInstance(bool copyFilterParame
   return filter;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getCompiledLibraryName() const
 {
   return Core::CoreBaseName;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getBrandingString() const
 {
   return "SIMPLib Core Filter";
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getFilterVersion() const
 {
@@ -469,32 +467,24 @@ QString RawBinaryReader::getFilterVersion() const
   return version;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getGroupName() const
 {
   return SIMPL::FilterGroups::IOFilters;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QUuid RawBinaryReader::getUuid() const
 {
   return QUuid("{0791f556-3d73-5b1e-b275-db3f7bb6850d}");
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getSubGroupName() const
 {
   return SIMPL::FilterSubGroups::InputFilters;
 }
 
-// -----------------------------------------------------------------------------
-//
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getHumanLabel() const
 {
@@ -504,11 +494,11 @@ QString RawBinaryReader::getHumanLabel() const
 // -----------------------------------------------------------------------------
 RawBinaryReader::Pointer RawBinaryReader::NullPointer()
 {
-  return Pointer(static_cast<Self*>(nullptr));
+  return nullptr;
 }
 
 // -----------------------------------------------------------------------------
-std::shared_ptr<RawBinaryReader> RawBinaryReader::New()
+RawBinaryReader::Pointer RawBinaryReader::New()
 {
   struct make_shared_enabler : public RawBinaryReader
   {
@@ -521,13 +511,13 @@ std::shared_ptr<RawBinaryReader> RawBinaryReader::New()
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::getNameOfClass() const
 {
-  return QString("RawBinaryReader");
+  return ClassName();
 }
 
 // -----------------------------------------------------------------------------
 QString RawBinaryReader::ClassName()
 {
-  return QString("RawBinaryReader");
+  return "RawBinaryReader";
 }
 
 // -----------------------------------------------------------------------------
@@ -555,25 +545,25 @@ SIMPL::NumericTypes::Type RawBinaryReader::getScalarType() const
 }
 
 // -----------------------------------------------------------------------------
-void RawBinaryReader::setEndian(int value)
+void RawBinaryReader::setEndian(int32_t value)
 {
   m_Endian = value;
 }
 
 // -----------------------------------------------------------------------------
-int RawBinaryReader::getEndian() const
+int32_t RawBinaryReader::getEndian() const
 {
   return m_Endian;
 }
 
 // -----------------------------------------------------------------------------
-void RawBinaryReader::setNumberOfComponents(int value)
+void RawBinaryReader::setNumberOfComponents(int32_t value)
 {
   m_NumberOfComponents = value;
 }
 
 // -----------------------------------------------------------------------------
-int RawBinaryReader::getNumberOfComponents() const
+int32_t RawBinaryReader::getNumberOfComponents() const
 {
   return m_NumberOfComponents;
 }
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index 0c06d39a71..e539097429 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -39,8 +39,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
@@ -59,8 +59,8 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
   PYB11_FILTER_NEW_MACRO(RawBinaryReader)
   PYB11_PROPERTY(DataArrayPath CreatedAttributeArrayPath READ getCreatedAttributeArrayPath WRITE setCreatedAttributeArrayPath)
   PYB11_PROPERTY(SIMPL::NumericTypes::Type ScalarType READ getScalarType WRITE setScalarType)
-  PYB11_PROPERTY(int Endian READ getEndian WRITE setEndian)
-  PYB11_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  PYB11_PROPERTY(int32_t Endian READ getEndian WRITE setEndian)
+  PYB11_PROPERTY(int32_t NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
   PYB11_PROPERTY(uint64_t SkipHeaderBytes READ getSkipHeaderBytes WRITE setSkipHeaderBytes)
   PYB11_PROPERTY(QString InputFile READ getInputFile WRITE setInputFile)
   PYB11_END_BINDINGS()
@@ -72,14 +72,16 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer();
 
-  static std::shared_ptr<RawBinaryReader> New();
+  static Pointer New();
 
   /**
    * @brief Returns the name of the class for RawBinaryReader
    */
   QString getNameOfClass() const override;
+
   /**
    * @brief Returns the name of the class for RawBinaryReader
    */
@@ -91,6 +93,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
    * @brief Setter property for CreatedAttributeArrayPath
    */
   void setCreatedAttributeArrayPath(const DataArrayPath& value);
+
   /**
    * @brief Getter property for CreatedAttributeArrayPath
    * @return Value of CreatedAttributeArrayPath
@@ -103,6 +106,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
    * @brief Setter property for ScalarType
    */
   void setScalarType(SIMPL::NumericTypes::Type value);
+
   /**
    * @brief Getter property for ScalarType
    * @return Value of ScalarType
@@ -114,31 +118,34 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
   /**
    * @brief Setter property for Endian
    */
-  void setEndian(int value);
+  void setEndian(int32_t value);
+
   /**
    * @brief Getter property for Endian
    * @return Value of Endian
    */
-  int getEndian() const;
+  int32_t getEndian() const;
 
-  Q_PROPERTY(int Endian READ getEndian WRITE setEndian)
+  Q_PROPERTY(int32_t Endian READ getEndian WRITE setEndian)
 
   /**
    * @brief Setter property for NumberOfComponents
    */
-  void setNumberOfComponents(int value);
+  void setNumberOfComponents(int32_t value);
+
   /**
    * @brief Getter property for NumberOfComponents
    * @return Value of NumberOfComponents
    */
-  int getNumberOfComponents() const;
+  int32_t getNumberOfComponents() const;
 
-  Q_PROPERTY(int NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
+  Q_PROPERTY(int32_t NumberOfComponents READ getNumberOfComponents WRITE setNumberOfComponents)
 
   /**
    * @brief Setter property for SkipHeaderBytes
    */
   void setSkipHeaderBytes(uint64_t value);
+
   /**
    * @brief Getter property for SkipHeaderBytes
    * @return Value of SkipHeaderBytes
@@ -151,6 +158,7 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
    * @brief Setter property for InputFile
    */
   void setInputFile(const QString& value);
+
   /**
    * @brief Getter property for InputFile
    * @return Value of InputFile
@@ -227,21 +235,14 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
    */
   void dataCheck() override;
 
-  /**
-   * @brief Initializes all the private instance variables.
-   */
-  void initialize();
-
 private:
   DataArrayPath m_CreatedAttributeArrayPath = {};
   SIMPL::NumericTypes::Type m_ScalarType = {};
-  int m_Endian = {};
-  int m_NumberOfComponents = {};
+  int32_t m_Endian = {};
+  int32_t m_NumberOfComponents = {};
   uint64_t m_SkipHeaderBytes = {};
   QString m_InputFile = {};
 
-  IDataArrayShPtrType m_Array;
-
 public:
   RawBinaryReader(const RawBinaryReader&) = delete;            // Copy Constructor Not Implemented
   RawBinaryReader(RawBinaryReader&&) = delete;                 // Move Constructor Not Implemented

From 6ac4ae6457aff026e8592092e751eda31217d4bd Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 23 Oct 2020 20:41:10 -0400
Subject: [PATCH 308/397] Applied clang-format

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameterCallbackExample.cpp         |  2 +-
 Source/MakeFilterUuid/MakeFilterUuid.cpp       |  4 ++--
 Source/PipelineRunner/PipelineRunner.cpp       |  6 +++---
 Source/RESTClient/mrestrequestqueue.h          |  2 +-
 Source/RESTServer/main.cpp                     |  4 ++--
 Source/SIMPLib/Common/Constants.h              | 12 ++++++------
 .../Common/CreatedArrayHelpIndexEntry.h        |  2 +-
 Source/SIMPLib/Common/INamedObject.h           |  2 +-
 Source/SIMPLib/Common/IObserver.h              |  2 +-
 Source/SIMPLib/Common/Observable.h             |  2 +-
 Source/SIMPLib/Common/Observer.h               |  2 +-
 Source/SIMPLib/Common/SIMPLArray.hpp           |  2 +-
 Source/SIMPLib/Common/SIMPLRange.h             |  2 +-
 Source/SIMPLib/Common/SIMPLRange2D.h           |  2 +-
 Source/SIMPLib/Common/SIMPLRange3D.h           |  2 +-
 Source/SIMPLib/Common/ShapeType.h              |  2 +-
 Source/SIMPLib/Common/TemplateHelpers.cpp      |  6 +++---
 Source/SIMPLib/Common/TemplateHelpers.h        |  2 +-
 .../Common/Testing/Cxx/SIMPLArrayTest.cpp      |  2 +-
 .../CoreFilters/ApplyImageTransforms.cpp       |  6 +++---
 Source/SIMPLib/CoreFilters/ArrayCalculator.cpp |  4 ++--
 Source/SIMPLib/CoreFilters/Breakpoint.cpp      |  2 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h        |  2 +-
 .../CoreFilters/CombineAttributeArrays.cpp     |  6 +++---
 .../CoreFilters/CombineAttributeMatrices.cpp   | 18 ++++++++----------
 .../CoreFilters/CombineAttributeMatrices.h     |  2 +-
 .../CoreFilters/ConditionalSetValue.cpp        |  4 ++--
 .../SIMPLib/CoreFilters/ConditionalSetValue.h  |  4 ++--
 .../CoreFilters/ConvertColorToGrayScale.cpp    |  6 +++---
 Source/SIMPLib/CoreFilters/ConvertData.cpp     |  8 ++++----
 Source/SIMPLib/CoreFilters/ConvertData.h       |  2 +-
 .../CopyFeatureArrayToElementArray.cpp         | 11 +++++------
 .../CopyFeatureArrayToElementArray.h           |  2 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp      |  6 +++---
 .../CoreFilters/CreateAttributeMatrix.cpp      |  6 +++---
 Source/SIMPLib/CoreFilters/CreateDataArray.cpp |  4 ++--
 Source/SIMPLib/CoreFilters/CreateDataArray.h   |  2 +-
 .../CoreFilters/CreateDataContainer.cpp        |  6 +++---
 .../CreateFeatureArrayFromElementArray.cpp     |  9 ++++-----
 .../CreateFeatureArrayFromElementArray.h       |  2 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp  |  8 ++++----
 Source/SIMPLib/CoreFilters/CreateGeometry.h    |  2 +-
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp  |  2 +-
 Source/SIMPLib/CoreFilters/CreateGridMontage.h |  2 +-
 .../CoreFilters/CreateImageGeometry.cpp        |  6 +++---
 .../SIMPLib/CoreFilters/CreateStringArray.cpp  |  4 ++--
 Source/SIMPLib/CoreFilters/CreateStringArray.h |  2 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.cpp |  6 +++---
 .../CoreFilters/DataContainerReader.cpp        |  8 ++++----
 .../SIMPLib/CoreFilters/DataContainerReader.h  |  2 +-
 .../CoreFilters/DataContainerWriter.cpp        | 12 ++++++------
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp     |  2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp  |  2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h    |  4 ++--
 .../ExtractAttributeArraysFromGeometry.cpp     |  4 ++--
 .../ExtractAttributeArraysFromGeometry.h       |  2 +-
 .../CoreFilters/ExtractComponentAsArray.cpp    |  4 ++--
 .../CoreFilters/ExtractVertexGeometry.cpp      |  6 +++---
 .../CoreFilters/FeatureCountDecision.cpp       |  9 ++++-----
 .../SIMPLib/CoreFilters/FeatureCountDecision.h |  4 ++--
 .../CoreFilters/FeatureDataCSVWriter.cpp       |  4 ++--
 .../SIMPLib/CoreFilters/FeatureDataCSVWriter.h |  2 +-
 Source/SIMPLib/CoreFilters/FileReader.cpp      |  2 +-
 Source/SIMPLib/CoreFilters/FileReader.h        |  3 +--
 Source/SIMPLib/CoreFilters/FileWriter.cpp      |  2 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.cpp | 13 ++++++-------
 Source/SIMPLib/CoreFilters/FindDerivatives.h   |  2 +-
 .../SIMPLib/CoreFilters/GenerateColorTable.cpp |  6 +++---
 .../SIMPLib/CoreFilters/GenerateTiltSeries.cpp |  8 ++++----
 .../SIMPLib/CoreFilters/GenerateTiltSeries.h   |  4 ++--
 .../CoreFilters/ImportAsciDataArray.cpp        | 12 ++++++------
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h  |  2 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp  | 10 +++++-----
 Source/SIMPLib/CoreFilters/InitializeData.cpp  | 10 +++++-----
 .../LinkFeatureMapToElementArray.cpp           | 15 +++++++--------
 .../CoreFilters/LinkFeatureMapToElementArray.h |  2 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp  |  8 ++++----
 Source/SIMPLib/CoreFilters/MaskCountDecision.h |  4 ++--
 Source/SIMPLib/CoreFilters/MassCreateData.cpp  |  4 ++--
 Source/SIMPLib/CoreFilters/MoveData.cpp        |  6 +++---
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp   |  6 +++---
 .../CoreFilters/MultiThresholdObjects.cpp      |  8 ++++----
 .../CoreFilters/MultiThresholdObjects.h        |  2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp     |  8 ++++----
 .../CoreFilters/MultiThresholdObjects2.h       |  2 +-
 .../SIMPLib/CoreFilters/PipelineAnnotation.cpp |  2 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp   |  4 ++--
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp   |  6 +++---
 Source/SIMPLib/CoreFilters/ReadASCIIData.h     |  2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp    |  6 +++---
 .../CoreFilters/RemoveComponentFromArray.cpp   |  4 ++--
 .../CoreFilters/RenameAttributeArray.cpp       |  4 ++--
 .../CoreFilters/RenameAttributeMatrix.cpp      |  6 +++---
 .../CoreFilters/RenameDataContainer.cpp        |  6 +++---
 .../CoreFilters/ReplaceValueInArray.cpp        |  6 +++---
 .../SIMPLib/CoreFilters/RequiredZThickness.cpp |  4 ++--
 .../SIMPLib/CoreFilters/RequiredZThickness.h   |  4 ++--
 .../CoreFilters/RotateSampleRefFrame.cpp       |  4 ++--
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp     |  8 ++++----
 .../SetOriginResolutionImageGeom.cpp           |  6 +++---
 .../CoreFilters/SplitAttributeArray.cpp        |  6 +++---
 .../Testing/Cxx/ApplyImageTransformsTest.cpp   |  2 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp        | 14 +++++++-------
 .../Testing/Cxx/CombineAttributeArraysTest.cpp |  8 ++++----
 .../Cxx/CombineAttributeMatricesTest.cpp       |  6 +++---
 .../Testing/Cxx/ConditionalSetValueTest.cpp    |  6 +++---
 .../Cxx/ConvertColorToGrayScaleTest.cpp        | 11 +++++------
 .../Testing/Cxx/ConvertDataTest.cpp            |  6 +++---
 .../Cxx/CopyFeatureArrayToElementArrayTest.cpp |  8 ++++----
 .../CoreFilters/Testing/Cxx/CopyObjectTest.cpp |  6 +++---
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp  |  8 ++++----
 .../Testing/Cxx/CreateDataArrayTest.cpp        |  6 +++---
 .../Testing/Cxx/CreateDataContainerTest.cpp    |  8 ++++----
 .../CreateFeatureArrayFromElementArrayTest.cpp |  6 +++---
 .../Testing/Cxx/CreateGeometryTest.cpp         | 16 ++++++++--------
 .../Testing/Cxx/CreateImageGeometryTest.cpp    |  6 +++---
 .../Testing/Cxx/CreateStringArrayTest.cpp      | 10 +++++-----
 .../Testing/Cxx/CropVertexGeometryTest.cpp     |  8 ++++----
 .../Testing/Cxx/DataContainerTest.cpp          | 12 ++++++------
 .../Testing/Cxx/ErrorMessageTest.cpp           |  4 ++--
 .../Testing/Cxx/ExecuteProcessTest.cpp         |  5 ++---
 .../ExtractAttributeArraysFromGeometryTest.cpp | 14 +++++++-------
 .../Cxx/ExtractComponentAsArrayTest.cpp        |  8 ++++----
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp  |  8 ++++----
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp   |  8 ++++----
 .../Testing/Cxx/FindDerivativesFilterTest.cpp  |  8 ++++----
 .../Testing/Cxx/GenerateColorTableTest.cpp     |  8 ++++----
 .../Testing/Cxx/GenerateTiltSeriesTest.cpp     |  6 +++---
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp   | 10 +++++-----
 .../Testing/Cxx/MoveMultiDataTest.cpp          | 10 +++++-----
 .../Testing/Cxx/MultiThresholdObjects2Test.cpp |  6 +++---
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp  |  6 +++---
 .../Testing/Cxx/PipelinePauseTest.cpp          |  8 ++++----
 .../Testing/Cxx/PostSlackMessageTest.cpp       |  2 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp        | 12 ++++++------
 .../Testing/Cxx/ReadASCIIDataTest.cpp          | 10 +++++-----
 .../Testing/Cxx/RemoveArraysObserver.h         |  2 +-
 .../Testing/Cxx/RemoveArraysTest.cpp           |  8 ++++----
 .../Cxx/RemoveComponentFromArrayTest.cpp       |  4 ++--
 .../Testing/Cxx/RenameAttributeArrayTest.cpp   |  8 ++++----
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp  |  8 ++++----
 .../Testing/Cxx/RenameDataContainerTest.cpp    |  8 ++++----
 .../Testing/Cxx/RenameTimingTest.cpp           |  6 +++---
 .../Testing/Cxx/ReplaceValueTest.cpp           |  6 +++---
 .../Testing/Cxx/RequiredZThicknessTest.cpp     | 12 ++++++------
 .../Testing/Cxx/RotateSampleRefFrameTest.cpp   | 12 ++++++------
 .../Testing/Cxx/ScaleVolumeTest.cpp            | 12 ++++++------
 .../Cxx/SetOriginResolutionImageGeomTest.cpp   | 12 ++++++------
 .../Testing/Cxx/SplitAttributeArrayTest.cpp    |  6 +++---
 .../Testing/Cxx/WriteASCIIDataTest.cpp         |  6 +++---
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp  |  8 ++++----
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp  |  6 +++---
 .../CoreFilters/WriteTriangleGeometry.cpp      |  6 +++---
 .../CoreFilters/util/ASCIIWizardData.hpp       |  4 ++--
 .../CoreFilters/util/AbstractDataParser.hpp    |  4 ++--
 .../CoreFilters/util/CalculatorArray.hpp       |  2 +-
 .../CoreFilters/util/CalculatorOperator.h      |  2 +-
 Source/SIMPLib/DataArrays/DataArray.cpp        |  2 +-
 Source/SIMPLib/DataArrays/DataArray.hpp        |  3 +--
 Source/SIMPLib/DataArrays/IDataArray.h         |  2 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp     |  3 +--
 Source/SIMPLib/DataArrays/StatsDataArray.cpp   |  6 +++---
 Source/SIMPLib/DataArrays/StatsDataArray.h     |  4 ++--
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp   |  8 ++++----
 .../Testing/Cxx/StringDataArrayTest.cpp        |  2 +-
 .../DataArrays/Testing/Cxx/StructArrayTest.cpp |  2 +-
 .../SIMPLib/DataContainers/AttributeMatrix.cpp |  6 +++---
 .../SIMPLib/DataContainers/AttributeMatrix.h   |  7 +++----
 .../SIMPLib/DataContainers/DataArrayPath.cpp   |  2 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h  |  4 ++--
 Source/SIMPLib/DataContainers/DataArrayProxy.h |  1 -
 Source/SIMPLib/DataContainers/DataContainer.h  |  5 ++---
 .../DataContainers/DataContainerArray.cpp      |  4 ++--
 .../DataContainers/DataContainerArray.h        |  8 ++++----
 .../DataContainers/DataContainerBundle.cpp     |  4 ++--
 .../DataContainers/DataStructureUtilities.h    |  6 +++---
 .../DataContainers/IDataStructureNode.h        |  2 +-
 .../SIMPLib/DataContainers/RenameDataPath.cpp  |  2 +-
 .../Testing/Cxx/DataContainerBundleTest.cpp    |  2 +-
 .../AbstractFilterParametersReader.h           |  4 ++--
 .../AbstractFilterParametersWriter.h           |  2 +-
 .../AttributeMatrixCreationFilterParameter.h   |  2 +-
 .../AttributeMatrixSelectionFilterParameter.h  |  4 ++--
 .../AxisAngleFilterParameter.h                 |  2 +-
 .../CalculatorFilterParameter.cpp              |  2 +-
 .../DataArrayCreationFilterParameter.h         |  4 ++--
 .../DataArraySelectionFilterParameter.h        |  2 +-
 .../DataContainerArrayProxyFilterParameter.h   |  2 +-
 .../DynamicTableFilterParameter.h              |  2 +-
 .../FileListInfoFilterParameter.h              |  6 +++---
 .../FilterParameters/FilterParameter.cpp       |  2 +-
 .../SIMPLib/FilterParameters/FilterParameter.h |  2 +-
 .../FloatVec2FilterParameter.h                 |  4 ++--
 .../FloatVec3FilterParameter.h                 |  4 ++--
 .../H5FilterParametersReader.cpp               |  4 ++--
 .../H5FilterParametersReader.h                 |  2 +-
 .../H5FilterParametersWriter.cpp               |  6 +++---
 .../H5FilterParametersWriter.h                 |  2 +-
 .../JsonFilterParametersReader.h               |  2 +-
 .../JsonFilterParametersWriter.cpp             |  4 ++--
 .../JsonFilterParametersWriter.h               |  2 +-
 .../LinkedChoicesFilterParameter.h             |  2 +-
 .../LinkedPathCreationFilterParameter.cpp      |  7 +++----
 ...tiAttributeMatrixSelectionFilterParameter.h |  4 ++--
 .../MultiDataArraySelectionFilterParameter.h   |  4 ++--
 ...ultiDataContainerSelectionFilterParameter.h |  4 ++--
 .../NumericTypeFilterParameter.h               |  2 +-
 .../ScalarTypeFilterParameter.h                |  2 +-
 .../ShapeTypeSelectionFilterParameter.h        |  2 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp     |  3 +--
 .../SIMPLib/Filtering/AbstractDecisionFilter.h |  2 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp    | 10 +++++-----
 Source/SIMPLib/Filtering/AbstractFilter.h      |  4 ++--
 Source/SIMPLib/Filtering/ComparisonInputs.h    |  1 -
 Source/SIMPLib/Filtering/CorePlugin.cpp        |  2 +-
 Source/SIMPLib/Filtering/FilterFactory.hpp     |  2 +-
 Source/SIMPLib/Filtering/FilterManager.cpp     |  4 ++--
 Source/SIMPLib/Filtering/FilterManager.h       |  4 ++--
 Source/SIMPLib/Filtering/FilterPipeline.cpp    | 18 ++++++++----------
 Source/SIMPLib/Filtering/IFilterFactory.hpp    |  2 +-
 .../SIMPLib/Filtering/QMetaObjectUtilities.cpp |  2 +-
 .../Testing/Cxx/FilterPipelineTest.cpp         |  4 ++--
 .../SIMPLib/Filtering/ThresholdFilterHelper.h  |  2 +-
 .../Geometry/CompositeTransformContainer.h     |  2 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.cpp  |  4 ++--
 Source/SIMPLib/Geometry/EdgeGeom.cpp           |  2 +-
 Source/SIMPLib/Geometry/EdgeGeom.h             |  4 ++--
 Source/SIMPLib/Geometry/GeometryHelpers.h      |  4 ++--
 Source/SIMPLib/Geometry/HexahedralGeom.cpp     |  2 +-
 Source/SIMPLib/Geometry/HexahedralGeom.h       |  4 ++--
 Source/SIMPLib/Geometry/IGeometry.cpp          |  2 +-
 Source/SIMPLib/Geometry/ITransformContainer.h  |  4 +---
 Source/SIMPLib/Geometry/ImageGeom.h            |  4 ++--
 Source/SIMPLib/Geometry/QuadGeom.h             |  4 ++--
 Source/SIMPLib/Geometry/RectGridGeom.h         |  4 ++--
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp  |  2 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h    |  2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp    |  2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h      |  4 ++--
 Source/SIMPLib/Geometry/TransformContainer.h   |  2 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp       |  2 +-
 Source/SIMPLib/Geometry/TriangleGeom.h         |  4 ++--
 Source/SIMPLib/Geometry/VertexGeom.h           |  4 ++--
 .../SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h |  2 +-
 .../SIMPLib/HDF5/H5MatrixStatsDataDelegate.h   |  2 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.h      |  2 +-
 .../SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h  |  2 +-
 .../HDF5/H5TransformationStatsDataDelegate.h   |  2 +-
 .../itkDream3DTransformContainerTestHelper.h   |  1 -
 Source/SIMPLib/ITK/itkBridge.h                 |  3 +--
 .../ITK/itkFijiConfigurationFileReader.hpp     |  6 +++---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp    |  4 ++--
 Source/SIMPLib/ITK/itkImageReaderHelper.h      |  1 -
 .../ITK/itkInPlaceDream3DDataToImageFilter.h   |  2 +-
 .../ITK/itkInPlaceImageToDream3DDataFilter.h   |  2 +-
 Source/SIMPLib/Math/ArrayHelpers.hpp           |  6 +++---
 Source/SIMPLib/Math/GeometryMath.h             |  8 ++++----
 .../SIMPLib/Math/RadialDistributionFunction.h  |  2 +-
 Source/SIMPLib/Math/RdfData.cpp                |  2 +-
 .../Math/Testing/Cxx/QuaternionMathTest.cpp    |  2 +-
 .../Messages/AbstractMessageHandler.cpp        |  8 ++++----
 Source/SIMPLib/Montages/DataContainerGrid.h    |  2 +-
 Source/SIMPLib/Plugin/PluginManager.cpp        |  4 ++--
 Source/SIMPLib/REST/PipelineListener.cpp       |  2 +-
 Source/SIMPLib/REST/PipelineListener.h         |  2 +-
 .../REST/PipelineListenerMessageHandler.cpp    | 16 ++++++++--------
 .../REST/PipelineListenerMessageHandler.h      |  2 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp  | 17 ++++++++---------
 .../ExecutePipelineController.cpp              |  2 +-
 .../PreflightPipelineController.cpp            |  2 +-
 .../SIMPLStaticFileController.cpp              |  2 +-
 .../V1Controllers/SIMPLibVersionController.cpp |  2 +-
 Source/SIMPLib/StatsData/BoundaryStatsData.h   |  2 +-
 .../SIMPLib/StatsData/PrecipitateStatsData.h   |  2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp  |  2 +-
 .../Testing/Cxx/StatsDataJsonRWTest.cpp        |  4 ++--
 .../TestFilters/ArraySelectionExample.cpp      |  2 +-
 .../SIMPLib/TestFilters/ErrorWarningFilter.cpp |  2 +-
 Source/SIMPLib/TestFilters/Filt0.cpp           |  4 ++--
 Source/SIMPLib/TestFilters/Filt0.h             |  2 +-
 Source/SIMPLib/TestFilters/Filt1.cpp           |  4 ++--
 Source/SIMPLib/TestFilters/Filt1.h             |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup00.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup01.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup01.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup02.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup02.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup03.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup03.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup04.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup04.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup05.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup05.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup06.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup06.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup07.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup07.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup08.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup08.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup09.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup09.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup10.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup10.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup12.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup12.h     |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup13.cpp   |  2 +-
 Source/SIMPLib/TestFilters/FilterGroup13.h     |  2 +-
 Source/SIMPLib/TestFilters/GenericExample.h    |  4 ++--
 .../SIMPLib/TestFilters/MakeDataContainer.cpp  |  8 ++++----
 Source/SIMPLib/TestFilters/MakeDataContainer.h |  2 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp   |  4 ++--
 Source/SIMPLib/Utilities/ColorTable.h          |  2 +-
 Source/SIMPLib/Utilities/FloatSummation.h      |  2 +-
 .../Utilities/ParallelData2DAlgorithm.h        |  2 +-
 .../Utilities/ParallelData3DAlgorithm.h        |  2 +-
 .../SIMPLib/Utilities/ParallelDataAlgorithm.h  |  2 +-
 Source/SIMPLib/Utilities/PythonSupport.h       |  2 +-
 .../Utilities/SIMPLDataPathValidator.cpp       |  2 +-
 Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp |  4 ++--
 .../Testing/Cxx/FloatSummationTest.cpp         |  4 ++--
 .../Testing/Cxx/StringOperationsTest.cpp       |  2 +-
 Source/SIMPLib/Utilities/UTFUtilities.hpp      |  4 ++--
 Source/SIMPLib/VTKUtils/VTKWriterMacros.h      |  2 +-
 Source/SVWidgetsLib/Core/FilterWidgetManager.h |  4 ++--
 Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp   |  2 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.h     |  4 ++--
 Source/SVWidgetsLib/Dialogs/ColorPresets.h     |  2 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.h    |  2 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp    |  2 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckDialog.h   |  4 ++--
 .../AbstractIOFileWidget.cpp                   |  4 ++--
 .../AbstractIOFileWidget.h                     |  2 +-
 .../AttributeMatrixCreationWidget.h            |  4 ++--
 .../AttributeMatrixSelectionWidget.cpp         |  2 +-
 .../AttributeMatrixSelectionWidget.h           |  2 +-
 .../FilterParameterWidgets/AxisAngleWidget.h   |  4 ++--
 .../FilterParameterWidgets/BooleanWidget.h     |  2 +-
 .../CalculatorWidget.cpp                       |  3 +--
 .../FilterParameterWidgets/CalculatorWidget.h  |  2 +-
 .../FilterParameterWidgets/ChoiceWidget.h      |  2 +-
 .../ComparisonContainerWidget.h                |  4 ++--
 .../ComparisonSelectionAdvancedWidget.cpp      |  2 +-
 .../ComparisonSelectionAdvancedWidget.h        |  2 +-
 .../ComparisonSelectionTableModel.h            |  4 ++--
 .../ComparisonSelectionWidget.cpp              |  3 +--
 .../ComparisonSelectionWidget.h                |  2 +-
 .../ComparisonSetWidget.cpp                    |  2 +-
 .../ComparisonSetWidget.h                      |  2 +-
 .../ComparisonValueWidget.h                    |  2 +-
 .../ConstrainedDoubleWidget.h                  |  2 +-
 .../ConstrainedIntWidget.h                     |  2 +-
 .../FilterParameterWidgets/CustomWidget.h      |  2 +-
 .../DataArrayCreationWidget.h                  |  2 +-
 .../DataArrayInformationDisplayWidget.h        |  2 +-
 .../DataArraySelectionWidget.cpp               |  2 +-
 .../DataArraySelectionWidget.h                 |  2 +-
 .../DataContainerArrayProxyWidget.cpp          |  2 +-
 .../DataContainerArrayProxyWidget.h            |  2 +-
 .../DataContainerCreationWidget.h              |  2 +-
 .../DataContainerReaderWidget.cpp              |  4 ++--
 .../DataContainerReaderWidget.h                |  2 +-
 .../DataContainerSelectionWidget.h             |  2 +-
 .../FilterParameterWidgets/DoubleWidget.h      |  2 +-
 .../DynamicChoiceWidget.h                      |  2 +-
 .../DynamicTableWidget.h                       |  2 +-
 .../FileListInfoWidget.cpp                     |  4 ++--
 .../FilterParameterWidget.cpp                  |  6 +++---
 .../FilterParameterWidget.h                    |  4 ++--
 .../FilterParameterWidgetUtils.hpp             |  4 ++--
 .../FilterParameterWidgets/FloatVec2Widget.h   |  2 +-
 .../FilterParameterWidgets/FloatWidget.h       |  2 +-
 .../FourthOrderPolynomialWidget.h              |  2 +-
 .../GenerateColorTableWidget.h                 |  2 +-
 .../ImportHDF5DatasetWidget.cpp                |  6 +++---
 .../FilterParameterWidgets/InputFileWidget.h   |  2 +-
 .../FilterParameterWidgets/InputPathWidget.h   |  4 ++--
 .../FilterParameterWidgets/IntVec3Widget.h     |  2 +-
 .../FilterParameterWidgets/IntWidget.h         |  2 +-
 .../LinkedBooleanWidget.h                      |  2 +-
 .../LinkedDataContainerSelectionWidget.cpp     |  6 +++---
 .../LinkedDataContainerSelectionWidget.h       |  2 +-
 .../MontageSelectionWidget.cpp                 |  2 +-
 .../MultiAttributeMatrixSelectionWidget.cpp    |  4 ++--
 .../MultiAttributeMatrixSelectionWidget.h      |  4 ++--
 .../MultiDataArraySelectionWidget.cpp          |  2 +-
 .../MultiDataArraySelectionWidget.h            |  4 ++--
 .../MultiDataContainerSelectionWidget.cpp      |  2 +-
 .../MultiDataContainerSelectionWidget.h        |  4 ++--
 .../FilterParameterWidgets/NumericTypeWidget.h |  2 +-
 .../FilterParameterWidgets/OutputFileWidget.h  |  2 +-
 .../FilterParameterWidgets/OutputPathWidget.h  |  2 +-
 .../PhaseTypeSelectionWidget.cpp               |  2 +-
 .../PhaseTypeSelectionWidget.h                 |  2 +-
 .../PreflightUpdatedValueWidget.h              |  2 +-
 .../FilterParameterWidgets/RangeWidget.h       |  2 +-
 .../ReadASCIIDataWidget.cpp                    |  2 +-
 .../FilterParameterWidgets/ScalarTypeWidget.h  |  2 +-
 .../SecondOrderPolynomialWidget.h              |  2 +-
 .../FilterParameterWidgets/SeparatorWidget.h   |  2 +-
 .../ShapeTypeSelectionWidget.cpp               |  4 ++--
 .../ShapeTypeSelectionWidget.h                 |  2 +-
 .../FilterParameterWidgets/StringWidget.h      |  2 +-
 .../ThirdOrderPolynomialWidget.h               |  2 +-
 .../FilterParameterWidgets/UInt64Widget.h      |  2 +-
 .../FilterParameterWidgets/UnknownWidget.h     |  2 +-
 .../QtSupport/QtSDisclosableWidget.h           |  6 +++---
 .../SVWidgetsLib/QtSupport/QtSGraphicsView.h   |  2 +-
 .../QtSupport/QtSHelpUrlGenerator.cpp          |  6 +++---
 .../QtSupport/QtSHelpUrlGenerator.h            |  2 +-
 .../QtSupport/QtSImageGraphicsDelegate.h       |  4 ++--
 Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h |  4 ++--
 .../SVWidgetsLib/QtSupport/QtSRecentFileList.h |  6 +++---
 Source/SVWidgetsLib/QtSupport/QtSSettings.h    |  6 +++---
 Source/SVWidgetsLib/QtSupport/QtSStringEdit.h  |  2 +-
 .../Widgets/BookmarksItemDelegate.cpp          |  2 +-
 Source/SVWidgetsLib/Widgets/BookmarksModel.cpp |  4 ++--
 Source/SVWidgetsLib/Widgets/BookmarksModel.h   |  6 +++---
 .../Widgets/BookmarksToolboxWidget.cpp         |  2 +-
 .../SVWidgetsLib/Widgets/BookmarksTreeView.cpp |  2 +-
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h   |  2 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp   |  4 ++--
 .../Widgets/DataArrayPathSelectionWidget.h     |  6 +++---
 .../Widgets/DataContainerArrayWidget.cpp       |  4 ++--
 Source/SVWidgetsLib/Widgets/DataPathLabel.cpp  |  2 +-
 Source/SVWidgetsLib/Widgets/DataPathLabel.h    |  2 +-
 .../Widgets/DataStructureItemDelegate.cpp      |  2 +-
 .../Widgets/DataStructureModel.cpp             |  4 ++--
 .../SVWidgetsLib/Widgets/DataStructureModel.h  |  2 +-
 .../Widgets/DataStructureWidget.cpp            |  4 ++--
 .../SVWidgetsLib/Widgets/DataStructureWidget.h |  4 ++--
 .../SVWidgetsLib/Widgets/FilterInputWidget.cpp |  2 +-
 .../SVWidgetsLib/Widgets/FilterInputWidget.h   |  2 +-
 .../Widgets/FilterLibraryToolboxWidget.cpp     |  4 ++--
 .../Widgets/FilterLibraryTreeWidget.cpp        |  2 +-
 .../Widgets/FilterListToolboxWidget.cpp        |  2 +-
 .../Widgets/FilterListToolboxWidget.h          |  6 +++---
 Source/SVWidgetsLib/Widgets/FilterListView.cpp |  8 ++++----
 .../SVWidgetsLib/Widgets/FilterListWidget.cpp  |  2 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp   |  8 ++++----
 .../ImportASCIIDataWizard/DataFormatPage.h     |  2 +-
 .../ImportASCIIDataWizard.cpp                  |  4 ++--
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp   |  2 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.h     |  2 +-
 .../Widgets/IssuesWidgetMessageHandler.cpp     |  4 ++--
 .../Widgets/IssuesWidgetMessageHandler.h       |  2 +-
 .../Widgets/PipelineItemDelegate.cpp           |  2 +-
 Source/SVWidgetsLib/Widgets/PipelineModel.cpp  |  8 ++++----
 Source/SVWidgetsLib/Widgets/PipelineView.cpp   |  2 +-
 Source/SVWidgetsLib/Widgets/SVControlWidgets.h | 12 ++++++------
 Source/SVWidgetsLib/Widgets/SVPipelineView.cpp | 13 +++++--------
 Source/SVWidgetsLib/Widgets/SVPipelineView.h   |  2 +-
 Source/SVWidgetsLib/Widgets/SVStyle.cpp        |  8 ++++----
 .../SVWidgetsLib/Widgets/StatusBarButton.cpp   |  4 ++--
 .../SVWidgetsLib/Widgets/StatusBarWidget.cpp   |  2 +-
 .../Explicit/include/sitkExplicitITK.h         |  4 ++--
 .../sitkExplicitITKComposeImageFilter.h        |  2 +-
 .../sitkExplicitITKDefaultPixelAccessor.h      |  2 +-
 ...sitkExplicitITKDefaultVectorPixelAccessor.h |  2 +-
 .../Explicit/include/sitkExplicitITKImage.h    |  2 +-
 .../include/sitkExplicitITKImageBase.h         |  2 +-
 .../sitkExplicitITKImageConstIterator.h        |  2 +-
 .../include/sitkExplicitITKImageRegion.h       |  2 +-
 .../sitkExplicitITKImageRegionConstIterator.h  |  2 +-
 ...sitkExplicitITKImageScanlineConstIterator.h |  2 +-
 .../sitkExplicitITKImageScanlineIterator.h     |  2 +-
 .../include/sitkExplicitITKImageSource.h       |  2 +-
 .../sitkExplicitITKImageToImageFilter.h        |  2 +-
 .../sitkExplicitITKImportImageContainer.h      |  2 +-
 .../sitkExplicitITKInPlaceImageFilter.h        |  2 +-
 .../Explicit/include/sitkExplicitITKLabelMap.h |  2 +-
 .../include/sitkExplicitITKVectorImage.h       |  2 +-
 ...citITKVectorIndexSelectionCastImageFilter.h |  2 +-
 .../Explicit/include/sitkMacro.h               |  6 +++---
 .../httpserver/httpconnectionhandler.h         |  2 +-
 .../httpserver/httpconnectionhandlerpool.cpp   |  2 +-
 ThirdParty/QtWebApp/httpserver/httpcookie.h    |  2 +-
 ThirdParty/QtWebApp/httpserver/httprequest.cpp |  2 +-
 ThirdParty/QtWebApp/httpserver/httprequest.h   |  2 +-
 ThirdParty/QtWebApp/httpserver/httpresponse.h  |  4 ++--
 ThirdParty/QtWebApp/httpserver/httpsession.h   |  2 +-
 ThirdParty/QtWebApp/logging/dualfilelogger.h   |  6 +++---
 ThirdParty/QtWebApp/logging/filelogger.h       |  4 ++--
 ThirdParty/QtWebApp/logging/logger.h           |  4 ++--
 ThirdParty/QtWebApp/logging/logmessage.h       |  2 +-
 ThirdParty/QtWebApp/qtservice/qtservice.cpp    |  2 +-
 ThirdParty/QtWebApp/qtservice/qtservice_p.h    |  2 +-
 .../QtWebApp/qtservice/qtservice_unix.cpp      |  8 ++++----
 .../QtWebApp/qtservice/qtservice_win.cpp       |  4 ++--
 ThirdParty/QtWebApp/templateengine/template.h  |  3 +--
 .../QtWebApp/templateengine/templatecache.h    |  2 +-
 .../QtWebApp/templateengine/templateloader.h   |  4 ++--
 .../Python/Binding/Pybind11CustomTypeCasts.h   |  4 ++--
 Wrapping/Python/Binding/pySIMPLHeader.cpp      |  4 ++--
 Wrapping/Python/Binding/pySupport.h            |  2 +-
 .../Pybind11/CodeScraper/PyBind11Generator.cpp |  2 +-
 .../Python/Pybind11/CodeScraper/PythonUtils.h  |  2 +-
 496 files changed, 967 insertions(+), 999 deletions(-)
 mode change 100755 => 100644 Source/SIMPLib/DataArrays/DataArray.cpp
 mode change 100755 => 100644 Source/SIMPLib/DataContainers/DataArrayProxy.h

diff --git a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
index 9a1cef4313..8f946be4ec 100644
--- a/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
+++ b/Source/Experimental/FilterCallback/FilterParameterCallbackExample.cpp
@@ -9,8 +9,8 @@
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
-#include "IFilter.h"
 #include "FilterWidget.h"
+#include "IFilter.h"
 
 //#define ADD_NEW_FILTER_PARAMETER(Params, Class, Desc, Prop, Category, Type)                                                                                                                                             \
 //  Class::SetterCallbackType _##Prop##_ParamSetter = [this](Type i) { return this->set##Prop(i); };                                                                                                       \
diff --git a/Source/MakeFilterUuid/MakeFilterUuid.cpp b/Source/MakeFilterUuid/MakeFilterUuid.cpp
index 885c9b1c15..7800c041b8 100644
--- a/Source/MakeFilterUuid/MakeFilterUuid.cpp
+++ b/Source/MakeFilterUuid/MakeFilterUuid.cpp
@@ -1,9 +1,9 @@
 
 
+#include <QtCore/QDebug>
 #include <QtCore/QString>
-#include <QtCore/QUuid>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <QtCore/QUuid>
 
 /**
  * @brief main
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 1c968cb222..f84d8e5e50 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -43,15 +43,17 @@
 // Qt Includes
 #include <QtCore/QCommandLineOption>
 #include <QtCore/QCommandLineParser>
-#include <QtCore/QFileInfo>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 #include <QtCore/QString>
 
 // DREAM3DLib includes
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
@@ -61,8 +63,6 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/RESTClient/mrestrequestqueue.h b/Source/RESTClient/mrestrequestqueue.h
index f817b0b9ec..73b2273652 100644
--- a/Source/RESTClient/mrestrequestqueue.h
+++ b/Source/RESTClient/mrestrequestqueue.h
@@ -23,8 +23,8 @@ SOFTWARE.
 
 #pragma once
 
-#include "mrestrequestptr.h"
 #include <QQueue>
+#include "mrestrequestptr.h"
 
 #include "RESTClient/RESTClient.h"
 
diff --git a/Source/RESTServer/main.cpp b/Source/RESTServer/main.cpp
index f2eae7cd89..1e32f68e88 100644
--- a/Source/RESTServer/main.cpp
+++ b/Source/RESTServer/main.cpp
@@ -51,6 +51,8 @@
 #include "QtWebApp/logging/filelogger.h"
 
 // DREAM3DLib includes
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
@@ -62,8 +64,6 @@
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/REST/SIMPLRequestMapper.h"
 #include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 // Search the configuration file
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 95cd790cb2..9fe7bc6cc7 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -50,8 +50,8 @@
 #endif
 #endif
 
-#include <limits>
 #include <cstdint>
+#include <limits>
 
 #include <QtCore/QString>
 
@@ -109,8 +109,8 @@ inline const QString NeighborList("NeighborList<T>");
 inline const QString StringArray("StringDataArray");
 inline const QString Unknown("Unknown");
 inline const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::StringArray + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " +
-                                TypeNames::Int32 + ", " + TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " +
-                                TypeNames::SizeT);
+                                       TypeNames::Int32 + ", " + TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " +
+                                       TypeNames::SizeT);
 } // namespace TypeNames
 
 namespace TypeEnums
@@ -130,7 +130,7 @@ inline constexpr int32_t SizeT = 11;
 
 inline constexpr int32_t UnknownType = 12;
 inline const QString SupportedTypeList(TypeNames::Bool + ", " + TypeNames::Int8 + ", " + TypeNames::UInt8 + ", " + TypeNames::Int16 + ", " + TypeNames::UInt16 + ", " + TypeNames::Int32 + ", " +
-                                TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
+                                       TypeNames::UInt32 + ", " + TypeNames::Int64 + ", " + TypeNames::UInt64 + ", " + TypeNames::Float + ", " + TypeNames::Double + ", " + TypeNames::SizeT);
 } // namespace TypeEnums
 
 namespace NumericTypes
@@ -169,8 +169,8 @@ enum class Type : int32_t
 };
 
 inline const QString SupportedTypeList(NumericTypes::Names::Int8 + ", " + NumericTypes::Names::UInt8 + ", " + NumericTypes::Names::Int16 + ", " + NumericTypes::Names::UInt16 + ", " +
-                                NumericTypes::Names::Int32 + ", " + NumericTypes::Names::UInt32 + ", " + NumericTypes::Names::Int64 + ", " + NumericTypes::Names::UInt64 + ", " +
-                                NumericTypes::Names::Float + ", " + NumericTypes::Names::Double + ", " + NumericTypes::Names::Bool + ", " + NumericTypes::Names::SizeT);
+                                       NumericTypes::Names::Int32 + ", " + NumericTypes::Names::UInt32 + ", " + NumericTypes::Names::Int64 + ", " + NumericTypes::Names::UInt64 + ", " +
+                                       NumericTypes::Names::Float + ", " + NumericTypes::Names::Double + ", " + NumericTypes::Names::Bool + ", " + NumericTypes::Names::SizeT);
 } // namespace NumericTypes
 
 namespace DelimiterTypes
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
index 1ac17360c8..3ddf9dbbfc 100644
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <QtCore/QString>
 
diff --git a/Source/SIMPLib/Common/INamedObject.h b/Source/SIMPLib/Common/INamedObject.h
index 989bd9f13b..168ebcf7f6 100644
--- a/Source/SIMPLib/Common/INamedObject.h
+++ b/Source/SIMPLib/Common/INamedObject.h
@@ -38,8 +38,8 @@
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
-#include "SIMPLib/Common/INamedCollection.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/INamedCollection.h"
 
 /**
  * @class INamedObject INamedObject.h SIMPLib/Common/INamedObject.h
diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
index f83ac6ad04..ada017b6fd 100644
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -40,7 +40,7 @@
 
 class SIMPLib_EXPORT IObserver
 {
-  
+
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(IObserver)
   PYB11_SHARED_POINTERS(IObserver)
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index bb8e1a9265..429d7121e0 100644
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QObject>
+#include <QtCore/QString>
 
 #include "SIMPLib/Messages/AbstractMessage.h"
 
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index f6be24c876..d06b1905c0 100644
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
 {
   Q_OBJECT
 
-   // Start Python bindings declarations
+  // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(Observer SUPERCLASS IObserver)
   PYB11_SHARED_POINTERS(Observer)
   PYB11_CREATION()
diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 2f7ec45337..0e958e8770 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -32,8 +32,8 @@
 #pragma once
 
 #include <array>
-#include <tuple>
 #include <cassert>
+#include <tuple>
 #include <vector>
 
 /**
diff --git a/Source/SIMPLib/Common/SIMPLRange.h b/Source/SIMPLib/Common/SIMPLRange.h
index 831fc350c0..d44edd3d05 100644
--- a/Source/SIMPLib/Common/SIMPLRange.h
+++ b/Source/SIMPLib/Common/SIMPLRange.h
@@ -35,8 +35,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.h b/Source/SIMPLib/Common/SIMPLRange2D.h
index d92a5ce821..d831249ef9 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.h
+++ b/Source/SIMPLib/Common/SIMPLRange2D.h
@@ -35,8 +35,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
index 66bde0f602..666313a6d7 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.h
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -35,8 +35,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Common/ShapeType.h b/Source/SIMPLib/Common/ShapeType.h
index 7cc1270aae..b8e29f8e1a 100644
--- a/Source/SIMPLib/Common/ShapeType.h
+++ b/Source/SIMPLib/Common/ShapeType.h
@@ -39,8 +39,8 @@
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 
 /**
  * @class ShapeType ShapeType.h PathToHeader/ShapeType.h
diff --git a/Source/SIMPLib/Common/TemplateHelpers.cpp b/Source/SIMPLib/Common/TemplateHelpers.cpp
index ac750538f3..a7fcd0eaa9 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.cpp
+++ b/Source/SIMPLib/Common/TemplateHelpers.cpp
@@ -31,11 +31,11 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "TemplateHelpers.h"
 
-#include "SIMPLib/DataArrays/IDataArray.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 using namespace TemplateHelpers;
 
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 3d06db02a7..7bc71ec4c0 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -40,9 +40,9 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 class AbstractFilter;
 
diff --git a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
index e02f3cbc11..31a6d7c2bb 100644
--- a/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
+++ b/Source/SIMPLib/Common/Testing/Cxx/SIMPLArrayTest.cpp
@@ -38,8 +38,8 @@
 
 #include <QtCore/QVector>
 
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index 5cda8fa40e..aaf6e32059 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -36,14 +36,14 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index eba2064bfe..82fe72cc74 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -37,15 +37,15 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/CalculatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/ScalarTypeFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "util/ABSOperator.h"
 #include "util/ACosOperator.h"
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 5b7f3b2fab..cb706693c6 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -36,9 +36,9 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index a80c59e386..c1f8c1242a 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -37,8 +37,8 @@
 
 #include <memory>
 
-#include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 4f08f15ab8..9be7dcf5ea 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 56e7888af3..71358c882f 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -37,17 +37,17 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -211,9 +211,8 @@ void CombineAttributeMatrices::dataCheck()
   AttributeMatrix::Pointer combinedAttrMat = m->getAttributeMatrix(getCombinedAttributeMatrixName());
 
   std::vector<size_t> cDims(1, 1);
-  m_FirstIndexPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(), cDims); 
-  if(nullptr != m_FirstIndexPtr.lock())                                                                           
+  m_FirstIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFirstIndexArrayPath(), cDims);
+  if(nullptr != m_FirstIndexPtr.lock())
   {
     m_FirstIndex = m_FirstIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -222,9 +221,8 @@ void CombineAttributeMatrices::dataCheck()
     return;
   }
 
-  m_SecondIndexPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(), cDims); 
-  if(nullptr != m_SecondIndexPtr.lock())                                                                           
+  m_SecondIndexPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSecondIndexArrayPath(), cDims);
+  if(nullptr != m_SecondIndexPtr.lock())
   {
     m_SecondIndex = m_SecondIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -262,7 +260,7 @@ void CombineAttributeMatrices::dataCheck()
 
   tempPath.update(getFirstIndexArrayPath().getDataContainerName(), getFirstIndexArrayPath().getAttributeMatrixName(), getNewIndexArrayName());
   m_NewIndexPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<int32_t>>(this, tempPath, 0, cDims);
-  if(nullptr != m_NewIndexPtr.lock()) 
+  if(nullptr != m_NewIndexPtr.lock())
   {
     m_NewIndex = m_NewIndexPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 667a3dc6d2..df748b5a2e 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The CombineAttributeMatrices class. See [Filter documentation](@ref CombineAttributeMatrices) for details.
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 8f960b40f7..39453ee509 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -38,13 +38,13 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index abc4fc6b10..2566be30f3 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The ConditionalSetValue class. See [Filter documentation](@ref conditionalsetvalue) for details.
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index a595ab557e..77ed2024ad 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -41,8 +41,10 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
@@ -52,8 +54,6 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class LuminosityImpl
 {
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 1c168eef0f..95182134a0 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -38,15 +38,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
-#include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define CHECK_AND_CONVERT(Type, DataContainer, ScalarType, Array, AttributeMatrixName, OutputName)                                                                                                     \
   if(false == completed)                                                                                                                                                                               \
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 64fad29072..0c17b39949 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The ConvertData class. See [Filter documentation](@ref convertdata) for details.
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 005cddf9c7..e27b084fb8 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -126,14 +126,13 @@ void CopyFeatureArrayToElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims);
+  if(nullptr != m_FeatureIdsPtr.lock())
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
 
-  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath()); 
+  m_InArrayPtr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, getSelectedFeatureArrayPath());
 
   DataArrayPath tempPath(getFeatureIdsArrayPath().getDataContainerName(), getFeatureIdsArrayPath().getAttributeMatrixName(), "");
   getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, tempPath, -301);
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 2b8cdf5758..6cede554a0 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index b8e26c47d4..080c13caaa 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -36,7 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -44,9 +47,6 @@
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 7659da7e56..9416f0c1b4 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -36,14 +36,14 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index e73a094a60..fbe491634f 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -35,13 +35,14 @@
 
 #include "CreateDataArray.h"
 
+#include <chrono>
 #include <limits>
 #include <random>
-#include <chrono>
 #include <utility>
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
@@ -51,7 +52,6 @@
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/ScalarTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index 7bbc15e7b7..dac5e4118c 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Common/Constants.h"
 
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 3b1db40bd4..20df79ccf5 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -36,12 +36,12 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 654d4c43f0..13aee85785 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -36,16 +36,16 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -129,9 +129,8 @@ void CreateFeatureArrayFromElementArray::dataCheck()
   }
 
   std::vector<size_t> cDims(1, 1);
-  m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims);
+  if(nullptr != m_FeatureIdsPtr.lock())
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 7f3eeda9c4..189b71e8e8 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index a9c9476dc1..9bba99ca2b 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -36,7 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
@@ -47,16 +50,13 @@
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
+#include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/QuadGeom.h"
 #include "SIMPLib/Geometry/RectGridGeom.h"
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/Geometry/HexahedralGeom.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index fc3dd37b4c..d86b7873ca 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -36,10 +36,10 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The CreateGeometry class. See [Filter documentation](@ref creategeometry) for details.
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
index 782e05d798..ed86c68d67 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -32,12 +32,12 @@
 
 #include "CreateGridMontage.h"
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
index 63182bd3e2..79ccbea98e 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.h
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -34,10 +34,10 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Montages/DataContainerGrid.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The CreateGridMontage class. See [Filter documentation](@ref CreateGridMontage) for details.
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 1d05c9e113..9693d3efb2 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -37,17 +37,17 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 7bd4ccb268..c9e6402444 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -36,8 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
@@ -45,8 +47,6 @@
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 4c40004e8c..0dedf8cff3 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The CreateStringArray class. See [Filter documentation](@ref CreateStringArray) for details.
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 32d665965b..1b8ab32a6c 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -38,17 +38,17 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 3df76ba199..94905dd56f 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -34,16 +34,18 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerReader.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
 
 #include "H5Support/H5ScopedSentinel.h"
-#include "H5Support/QH5Utilities.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
@@ -51,10 +53,8 @@
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Montages/MontageSupport.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 07436e3c87..89c686c515 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -40,8 +40,8 @@
 #include <QtCore/QDateTime>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReader.h"
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 84932421b8..7774c2d19d 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -34,24 +34,24 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerWriter.h"
 
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
+#include <QtCore/QTextStream>
 
-#include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Utilities.h"
 #include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/H5Utilities.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef _WIN32
 extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index e315da2316..a012113b1b 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -36,10 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index e9a0a360fb..c8b7d8b7ff 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -39,11 +39,11 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 9f79b44ca4..86eedf6226 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -37,10 +37,10 @@
 
 #include <memory>
 
-#include <QtCore/QProcess>
-#include <QtCore/QWaitCondition>
 #include <QtCore/QMutex>
+#include <QtCore/QProcess>
 #include <QtCore/QSharedPointer>
+#include <QtCore/QWaitCondition>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index b2956c3855..ec58e827d8 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -39,7 +39,9 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h"
@@ -51,8 +53,6 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 0650cbbbd4..1480266e9e 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 using MeshIndexType = size_t;
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index e2bf390004..9dd263f099 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -36,16 +36,16 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 1cb58f2fa5..12b429fd4d 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -38,15 +38,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index e290a2d6da..d0669a56a9 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -35,16 +35,16 @@
 
 #include "FeatureCountDecision.h"
 
-#include <QtCore/QJsonDocument>
 #include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -107,9 +107,8 @@ void FeatureCountDecision::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
 
-  m_FeatureIdsPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims); 
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                           
+  m_FeatureIdsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getFeatureIdsArrayPath(), cDims);
+  if(nullptr != m_FeatureIdsPtr.lock())
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 8c0d751a98..0298686312 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FeatureCountDecision class. See [Filter documentation](@ref featurecountdecision) for details.
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index d9b2de9883..6c6fd36a36 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -37,17 +37,17 @@
 #include <QtCore/QDir>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index e8722cac08..669ba9adde 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FeatureDataCSVWriter class. See [Filter documentation](@ref featuredatacsvwriter) for details.
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index d126ff4ef0..ab9b130a71 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -34,8 +34,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FileReader.h"
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index 4e57c0be77..0640790e96 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -37,9 +37,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FileReader class serves as a superclass for reader filters.
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index f86637b24d..92e83edd90 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -36,8 +36,8 @@
 
 #include <QtCore/QDir>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 5c3a854b53..122af06e15 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -36,7 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -49,13 +52,10 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Math/SIMPLibRandom.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SIMPLib/Messages/GenericErrorMessage.h"
 #include "SIMPLib/Messages/GenericProgressMessage.h"
 #include "SIMPLib/Messages/GenericStatusMessage.h"
-#include "SIMPLib/Messages/GenericErrorMessage.h"
 #include "SIMPLib/Messages/GenericWarningMessage.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief This message handler is used by the FindDerivatives filter to re-emit incoming generic
@@ -370,9 +370,8 @@ void FindDerivatives::dataCheck()
   cDims *= 3;
   std::vector<size_t> dims(1, cDims);
 
-  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(this, getDerivativesArrayPath(), 0, dims, "",
-                                                                                                   DerivativesArrayID); 
-  if(nullptr != m_DerivativesArrayPtr.lock()) 
+  m_DerivativesArrayPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<double>>(this, getDerivativesArrayPath(), 0, dims, "", DerivativesArrayID);
+  if(nullptr != m_DerivativesArrayPtr.lock())
   {
     m_DerivativesArray = m_DerivativesArrayPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 12e9584a44..e25bfe296f 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -40,8 +40,8 @@
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayWkPtrType = std::weak_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 4388f75572..d44aea78a7 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -6,15 +6,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h"
 #include "SIMPLib/Utilities/ColorTable.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index ba93c30c83..aba189b24d 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -32,8 +32,8 @@
 
 #include "GenerateTiltSeries.h"
 
-#include <thread>
 #include <cmath>
+#include <thread>
 
 #define GTS_GENERATE_DEBUG_ARRAYS 0
 // If we are writing out all the arrays for debugging then we MUST be single threaded.
@@ -45,20 +45,20 @@
 #include <tbb/task_group.h>
 #endif
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 #ifndef DREAM3D_PASSIVE_ROTATION
 #define DREAM3D_PASSIVE_ROTATION 1
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
index 378faee846..541485d236 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.h
@@ -35,10 +35,10 @@
 #include <memory>
 #include <utility>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
 
 /**
  * @brief The GenerateTiltSeries class. See [Filter documentation](@ref GenerateTiltSeries) for details.
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index ba1fb452df..148a49b75d 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -34,27 +34,27 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ImportAsciDataArray.h"
 
-#include <locale>
 #include <fstream>
+#include <locale>
 
-#include <QtCore/QFileInfo>
 #include <QtCore/QDateTime>
+#include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
-#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 904ffa02f7..aa88174368 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -40,8 +40,8 @@
 #include <QtCore/QScopedPointer>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 4302871b6d..8f9a9bd6ac 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -31,22 +31,22 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ImportHDF5Dataset.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
 
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Utilities.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 namespace Detail
 {
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 95b5c083bc..d36564efc6 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -34,14 +34,17 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "InitializeData.h"
 
-#include <random>
 #include <chrono>
+#include <random>
 
 #include <QtCore/QCoreApplication>
-#include <QtCore/QTime>
 #include <QtCore/QTextStream>
+#include <QtCore/QTime>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
@@ -49,9 +52,6 @@
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index c646979f61..c7dbdfea3c 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -105,7 +105,7 @@ void LinkFeatureMapToElementArray::updateFeatureInstancePointers()
   clearErrorCode();
   clearWarningCode();
 
-  if(nullptr != m_ActivePtr.lock()) 
+  if(nullptr != m_ActivePtr.lock())
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -137,9 +137,8 @@ void LinkFeatureMapToElementArray::dataCheck()
   m->createNonPrereqAttributeMatrix(this, getCellFeatureAttributeMatrixName(), tDims, AttributeMatrix::Type::CellFeature, AttributeMatrixID);
 
   std::vector<size_t> cDims(1, 1);
-  m_SelectedCellDataPtr =
-      getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(), cDims); 
-  if(nullptr != m_SelectedCellDataPtr.lock())                                                                       
+  m_SelectedCellDataPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<int32_t>>(this, getSelectedCellArrayPath(), cDims);
+  if(nullptr != m_SelectedCellDataPtr.lock())
   {
     m_SelectedCellData = m_SelectedCellDataPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
@@ -151,7 +150,7 @@ void LinkFeatureMapToElementArray::dataCheck()
 
   tempPath.update(getSelectedCellArrayPath().getDataContainerName(), getCellFeatureAttributeMatrixName(), getActiveArrayName());
   m_ActivePtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, false, cDims, "", DataArrayID);
-  if(nullptr != m_ActivePtr.lock()) 
+  if(nullptr != m_ActivePtr.lock())
   {
     m_Active = m_ActivePtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index 91bd27891d..d0871360b2 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -38,8 +38,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The LinkFeatureMapToElementArray class. See [Filter documentation](@ref linkfeaturemaptoelementarray) for details.
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index bc5d06371b..3aca17280b 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -35,14 +35,14 @@
 
 #include "MaskCountDecision.h"
 
-#include <QtCore/QJsonDocument>
 #include <QtCore/QDebug>
+#include <QtCore/QJsonDocument>
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
@@ -99,8 +99,8 @@ void MaskCountDecision::dataCheck()
 
   std::vector<size_t> cDims(1, 1);
 
-  m_MaskPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims); 
-  if(nullptr != m_MaskPtr.lock())                                                                                
+  m_MaskPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<bool>>(this, getMaskArrayPath(), cDims);
+  if(nullptr != m_MaskPtr.lock())
   {
     m_Mask = m_MaskPtr.lock()->getPointer(0);
   } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index c54f0a0b72..435806bfd9 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The MaskCountDecision class. See [Filter documentation](@ref MaskCountDecision) for details.
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index ad9f2cd14e..24bbd35828 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -36,11 +36,11 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index bf760f327f..9152596f01 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace
 {
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index ba436e096c..4dd9ce2982 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -36,17 +36,17 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace
 {
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index a9b4f508c3..2b81468574 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -145,7 +145,7 @@ void MultiThresholdObjects::dataCheck()
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(comp.dataContainerName, comp.attributeMatrixName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
-    if(nullptr != m_DestinationPtr.lock()) 
+    if(nullptr != m_DestinationPtr.lock())
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
     } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index 175630de60..b5bd1e3913 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The MultiThresholdObjects class. See [Filter documentation](@ref multithresholdobjects) for details.
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index bce2af95a4..39e9a59562 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -36,16 +36,16 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/ThresholdFilterHelper.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -140,7 +140,7 @@ void MultiThresholdObjects2::dataCheck()
     std::vector<size_t> cDims(1, 1);
     DataArrayPath tempPath(dcName, amName, getDestinationArrayName());
     m_DestinationPtr = getDataContainerArray()->createNonPrereqArrayFromPath<DataArray<bool>>(this, tempPath, true, cDims, "", ThresholdArrayID);
-    if(nullptr != m_DestinationPtr.lock()) 
+    if(nullptr != m_DestinationPtr.lock())
     {
       m_Destination = m_DestinationPtr.lock()->getPointer(0);
     } /* Now assign the raw pointer to data from the DataArray<T> object */
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 688527437c..fa48d12c51 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -38,11 +38,11 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 #include "SIMPLib/Filtering/ComparisonSet.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief The MultiThresholdObjects2 class. See [Filter documentation](@ref multithresholdobjects2) for details.
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 0b2d127e45..4026952691 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -34,10 +34,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ParagraphFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index 994a87567e..fd15ca5dbe 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -41,10 +41,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index d22c0b9558..7582bc4503 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -7,18 +7,18 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
-#include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
-#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Utilities/StringOperations.h"
 
 #include "SIMPLib/CoreFilters/util/AbstractDataParser.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 namespace
 {
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 0913416a7f..b2cf6282a2 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -36,8 +36,8 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 5198dc4658..2c2b18d7e2 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -36,12 +36,12 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 91d59920ab..8f2e33572a 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -36,8 +36,10 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
@@ -45,8 +47,6 @@
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 0baf32ec02..6290cb7cf2 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -36,12 +36,12 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index 91b573a6ae..ee61c110f7 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -36,13 +36,13 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index b1c795f72e..294a2d4909 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -36,13 +36,13 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 5f29c3701a..16166b52ac 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -36,14 +36,14 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 8057dfe080..57f3eb4a70 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -38,6 +38,8 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
@@ -45,8 +47,6 @@
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 331c9435ae..e679681d5a 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -38,9 +38,9 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractDecisionFilter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The RequiredZThickness class. See [Filter documentation](@ref requiredzthickness) for details.
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 4975e29ecc..0ad96da678 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -48,9 +48,10 @@
 
 #include <Eigen/Dense>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
@@ -60,7 +61,6 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Math/MatrixMath.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 namespace
 {
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index b4ae6b37f8..0c9a83db02 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -36,17 +36,17 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry2D.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The CalculateCentroidsImpl class implements a threaded algorithm that scales the
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 728e758da0..15cad18bb2 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
  * @brief The SetOriginResolutionImageUpdateVerticesImpl class implements a threaded algorithm that adjusts the
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 838d3ecc66..d9b0c010eb 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -36,14 +36,14 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
index ee028f584b..7443ec2ab9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ApplyImageTransformsTest.cpp
@@ -4,6 +4,7 @@
 #pragma once
 
 #include "SIMPLib/CoreFilters/ApplyImageTransforms.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -11,7 +12,6 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 160c56ff7f..763bdfc178 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -32,7 +32,14 @@
  *    United States Prime Contract Navy N00173-07-C-2068
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "SIMPLib/CoreFilters/ArrayCalculator.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/CoreFilters/CreateDataArray.h"
+#include "SIMPLib/CoreFilters/util/CalculatorOperator.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -41,15 +48,8 @@
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/CoreFilters/ArrayCalculator.h"
-#include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/util/CalculatorOperator.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class DummyObserver : public Observer
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 0733ac8936..7f9ce22d86 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -35,20 +35,20 @@
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index eff4c16815..0a43c2e920 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -35,18 +35,18 @@
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 6e3ca894c4..740406158a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -36,18 +36,18 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/ConditionalSetValue.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-#include "SIMPLib/CoreFilters/ConditionalSetValue.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index 59265dd522..e11a4ef126 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -286,7 +286,7 @@ class ConvertColorToGrayScaleTest
                                                        checkGChannelColors,
                                                        checkBChannelColors};
 
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
   void SetDataArrayTestValues(DataArray<uint8_t>::Pointer& aa)
   {
     aa->initializeWithValue(0);
@@ -297,7 +297,7 @@ class ConvertColorToGrayScaleTest
     }
   }
 
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
   static DataContainer::Pointer createVertexGeometryDataContainer(const DataArray<uint8_t>::Pointer& aa, const std::vector<size_t>& tDims)
   {
     AttributeMatrix::Pointer am = AttributeMatrix::New(tDims, SIMPL::Defaults::VertexAttributeMatrixName, AttributeMatrix::Type::Vertex);
@@ -309,7 +309,7 @@ class ConvertColorToGrayScaleTest
     return dc;
   }
 
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
   int CheckFilterParameters(ConvertColorToGrayScale::Pointer filter, const QVariant& algorithm, const FloatVec3Type& cws, const uint8_t& cc)
   {
     QVariant conversionAlgorithm{filter->property("ConversionAlgorithm")};
@@ -331,7 +331,7 @@ class ConvertColorToGrayScaleTest
     return wrongParameters;
   }
 
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
   int CompareResults(const uint8_t& algoMapIndex, DataContainer::Pointer dc) const
   {
     QString amName = m_outputAMName;
@@ -361,7 +361,6 @@ class ConvertColorToGrayScaleTest
     return wrongValues;
   }
 
-
   //------------------------------------------------------------------------------
   int RunTest(const uint8_t& algoMapIndex, const Algorithms& algorithm, const FloatVec3Type& colorWeights, const uint8_t& colorChannel)
   {
@@ -429,7 +428,7 @@ class ConvertColorToGrayScaleTest
   ConvertColorToGrayScaleTest() = default;
   ~ConvertColorToGrayScaleTest() = default;
 
-//------------------------------------------------------------------------------
+  //------------------------------------------------------------------------------
   void operator()()
   {
     std::cout << "#### ConvertColorToGrayScaleTest Starting ####" << std::endl;
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index 4445e26c8d..a10a20e656 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -39,19 +39,19 @@
 #include <cstdint>
 #include <vector>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/CoreFilters/ConvertData.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ConvertDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index 1961b528fd..dc6510086c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -39,19 +39,19 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CopyFeatureArrayToElementArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index 396a7570a0..beb78882f9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -900,7 +900,6 @@ class CopyObjectTest
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, k_floatArrayName), 2, k_CopiedObjectName);
 
     TestCase(dca, DataArrayPath(k_DataContainerName, k_AttributeMatrix2Name, k_doubleArrayName), 2, k_CopiedObjectName);
-  
   }
 
   // -----------------------------------------------------------------------------
@@ -909,9 +908,10 @@ class CopyObjectTest
     static const QString k_VerticesDAName("VertexCoordinates");
     static const QString k_ElementListDAName("Connectivity");
 
-    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f}, {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
+    std::vector<std::vector<float>> vertices = {{1.0f, 1.0f, 1.55f}, {3.0f, 1.0f, 1.55f}, {2.0f, 3.0f, 1.55f}, {2.0f, 2.0f, 3.55f},
+                                                {2.5f, 1.0f, 1.55f}, {4.3f, 1.0f, 1.55f}, {5.1f, 3.0f, 1.55f}, {7.63f, 2.0f, 3.55f}};
 
-    std::vector<std::vector<MeshIndexType>>  elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
+    std::vector<std::vector<MeshIndexType>> elements = {{0, 1, 2, 3, 4, 5, 6, 7}};
 
     DataArray<float>::Pointer daHexVert = createDataArray<float>(k_VerticesDAName, vertices, m_Dims8, m_Dims3);
     SharedHexList::Pointer daHexList = createDataArray<MeshIndexType>(k_ElementListDAName, elements, m_Dims1, m_Dims8);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 976bf0c786..9c0d1df15e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -34,6 +34,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <cassert>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -41,13 +43,11 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateAttributeMatrixTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 83429a80a6..33bb9dfaf7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -34,20 +34,20 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
-#include "SIMPLib/CoreFilters/CreateDataContainer.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
+#include "SIMPLib/CoreFilters/CreateDataContainer.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class CreateDataArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index 2627898eba..65eb69fcaa 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -34,19 +34,19 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include <assert.h>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/CreateDataContainer.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/CreateDataContainer.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateDataContainerTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 2e8e41e0f8..15ecdaff19 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -33,18 +33,18 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class CreateFeatureArrayFromElementArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index de992c4cd9..c6a6fa7897 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -37,19 +37,20 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -58,9 +59,8 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class CreateGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 60ee7a1366..9f20dfb145 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -33,9 +33,11 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "SIMPLib/CoreFilters/CreateImageGeometry.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
@@ -43,8 +45,6 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include <QVector>
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index d96209ae1c..b1e54e47a5 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -35,20 +35,20 @@
 
 #pragma once
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class CreateStringArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index ec1f7a612d..55b7b98dc2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -37,22 +37,22 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
+#include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/Geometry/VertexGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class CropVertexGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index c0946f9515..c0dba33c3e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -44,22 +44,22 @@
 #include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/CoreFilters/DataContainerWriter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataArrays/StructArray.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/CoreFilters/DataContainerReader.h"
-#include "SIMPLib/CoreFilters/DataContainerWriter.h"
-#include "SIMPLib/DataArrays/StringDataArray.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index b86e5468c1..127bd79d33 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -35,12 +35,12 @@
 
 #include <string>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
-#include "SIMPLib/Filtering/BadFilter.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index f7a7de1cea..cc1806cc40 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -35,6 +35,8 @@
 
 #include <QtCore/QObject>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/ExecuteProcess.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -43,13 +45,10 @@
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/PipelineStatusMessage.h"
-#include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/ExecuteProcess.h"
 
 /**
  * @brief This message handler is used by the ExecuteProcessTest to append filter and pipeline status messages
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index 709deb0d77..bb0c509124 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -37,17 +37,18 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/QuadGeom.h"
@@ -55,9 +56,8 @@
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class ExtractAttributeArraysFromGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index 5514d5b16f..b0bc5dc354 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -33,19 +33,19 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/ExtractComponentAsArray.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/ExtractComponentAsArray.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class ExtractComponentAsArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index daa6c9ada0..bf022039b0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -8,6 +8,8 @@
 
 #include <QtCore/QFile>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/ExtractVertexGeometry.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -18,14 +20,12 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/ExtractVertexGeometry.h"
 
 // This header is auto-generated during cmake time
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 
 class ExtractVertexGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 6d017dbdd8..4087f8df02 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -37,7 +37,11 @@
 
 #include <QtCore/QFile>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -45,12 +49,8 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class FeatureDataCSVWriterTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index 6ef574ceff..f15794523e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -37,7 +37,11 @@
 #include <QtCore/QFile>
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -51,12 +55,8 @@
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define FDTEST_CREATE_DATA_CONTAINER(name, geom, dca)                                                                                                                                                  \
   DataContainer::Pointer _##geom##Container = DataContainer::New(#name);                                                                                                                               \
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 3b5f1c7295..72d2745407 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -41,19 +41,19 @@
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/GenerateColorTable.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/GenerateColorTable.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
index 0199468fe2..c5f853dd2a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateTiltSeriesTest.cpp
@@ -32,17 +32,17 @@
 
 #pragma once
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/CoreFilters/GenerateTiltSeries.h"
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 
 // These Headers are generated into the build directory
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index 01024fc3f6..c5e47163c7 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -37,20 +37,20 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class MoveDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index 8dcf79f1e9..bb18414b85 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -37,20 +37,20 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class MoveMultiDataTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index bdfa3c8602..ac1d1d6967 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -37,7 +37,10 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 #include "SIMPLib/Filtering/ComparisonSet.h"
 #include "SIMPLib/Filtering/ComparisonValue.h"
@@ -48,10 +51,7 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MultiThresholdObjects2Test
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 0bcbe9e61e..5e9a6a50df 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -35,7 +35,10 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -44,10 +47,7 @@
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class MultiThresholdObjectsTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index ac8264e9f6..8bf1af5329 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -38,8 +38,11 @@
 #include <QtCore/QThread>
 #include <QtCore/QTimer>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.hpp"
+#include "SIMPLib/CoreFilters/Breakpoint.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -47,12 +50,9 @@
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/TestFilters/ChangeGlobalValue.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/Breakpoint.h"
-#include "SIMPLib/TestFilters/ChangeGlobalValue.h"
 
 int GlobalVariable = 0;
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
index b260f814ee..fb29f904a9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PostSlackMessageTest.cpp
@@ -4,6 +4,7 @@
 
 #include <QtCore/QFile>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
@@ -12,7 +13,6 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index d335d0232b..d9996a0763 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -36,19 +36,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QString>
 #include <QtCore/QVector>
-#include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/ScopedFileMonitor.hpp"
 #include "SIMPLib/CoreFilters/RawBinaryReader.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 /* Testing Notes:
  *
@@ -553,7 +553,7 @@ class RawBinaryReaderTest
 
     // Create junkArray
     std::vector<T> junkArray(junkArraySize, 0xAB);
-    
+
     // Write a pattern into junkArray
     std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
 
@@ -691,7 +691,7 @@ class RawBinaryReaderTest
 
     // Create junkArray
     std::vector<T> junkArray(junkArraySize, 0xAB);
-    
+
     // Write a pattern into junkArray
     std::memset(junkArray.data(), 0xAB, junkArray.size() * sizeof(T));
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index a4ffc11e0e..726eecbd1e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -37,7 +37,12 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/ReadASCIIData.h"
+#include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
@@ -45,13 +50,8 @@
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/ReadASCIIData.h"
-#include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 const QString DataContainerName = "DataContainer";
 const QString AttributeMatrixName = "AttributeMatrix";
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
index 51e5561973..cc823a9eb0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
@@ -5,9 +5,9 @@
 #include <QtCore/QList>
 #include <QtCore/QObject>
 
-#include "SIMPLib/Common/PipelineMessage.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/PipelineMessage.h"
 
 class RemoveArraysObserver : public QObject
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index 85d35a558f..c93a51b51d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -35,19 +35,19 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/RemoveArrays.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RemoveArrays.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RemoveArraysTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index c41bd11746..b53c94f6d4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -33,18 +33,18 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class RemoveComponentFromArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index e2e81c0466..e120d0f152 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -33,19 +33,19 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/RenameAttributeArray.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RenameAttributeArray.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameAttributeArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 5f00fa8e7c..6bf635152d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -33,19 +33,19 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/RenameAttributeMatrix.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RenameAttributeMatrix.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameAttributeMatrixTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 309663cc4f..86ebf7eabb 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -33,19 +33,19 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/RenameDataContainer.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RenameDataContainer.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RenameDataContainerTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
index 82d31a05e3..fbfb03b3dd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -33,11 +33,13 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <ctime>
 #include <chrono>
+#include <ctime>
 #include <iostream>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLibSetGetMacros.h"
+#include "SIMPLib/CoreFilters/RenameDataContainer.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -45,10 +47,8 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RenameDataContainer.h"
 
 class RenameTimingTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index baa265536e..c1ac89444b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -35,18 +35,18 @@
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #ifdef CREATE_DATA_ARRAY
 #undef CREATE_DATA_ARRAY
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index 5aa1470fa7..e3d2280185 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -33,21 +33,21 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/RequiredZThickness.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/RequiredZThickness.h"
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/Geometry/TriangleGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class RequiredZThicknessTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
index 43fae3856b..4d815c902c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
@@ -38,19 +38,19 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/DynamicTableData.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
-#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/Testing/UnitTestSupport.hpp"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/FilterParameters/DynamicTableData.h"
-#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
 
 class RotateSampleRefFrameTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index 750ec5b28b..a2d6d68b94 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -33,21 +33,21 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/ScaleVolume.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/ScaleVolume.h"
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/Geometry/TriangleGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace ScaleVolumeTestConsts
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index 49e7587df5..d819dfc6f0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -33,21 +33,21 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include "SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h"
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h"
-#include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/Geometry/TriangleGeom.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 namespace SetOriginResolutionImageGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 7ecab6d2eb..47606ae276 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -35,18 +35,18 @@
 
 #include <memory>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class SplitAttributeArrayTest
 {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 6c817c6f4d..b197be9014 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -40,6 +40,7 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/CoreFilters/WriteASCIIData.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
@@ -47,13 +48,12 @@
 #include "SIMPLib/DataArrays/StatsDataArray.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataArrays/StructArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/MeshStructs.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 /**
  * @brief The WriteASCIIDataTest class
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 1920203a1e..a18ab66179 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -38,22 +38,22 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/Geometry/TriangleGeom.h"
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 class WriteTriangleGeometryTest
 {
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index ebb1399f21..ecd1cc7011 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -37,10 +37,13 @@
 #include <QtCore/QDir>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/TemplateHelpers.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
@@ -49,9 +52,6 @@
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 
 /**
  * @brief The ExportDataPrivate class is a templated class that implements a method to generically
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index e469409db3..01001d9655 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -39,16 +39,16 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Utilities/FileSystemPathHelper.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #define WRITE_EDGES_FILE 0
 
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index 5f227713eb..a4cab7beb4 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -37,9 +37,9 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QList>
-#include <QtCore/QVector>
-#include <QtCore/QStringList>
 #include <QtCore/QMetaType>
+#include <QtCore/QStringList>
+#include <QtCore/QVector>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
index a2d676576a..8572a5be44 100644
--- a/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
+++ b/Source/SIMPLib/CoreFilters/util/AbstractDataParser.hpp
@@ -31,10 +31,10 @@
 
 #include <QtCore/QString>
 
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/CoreFilters/util/ParserFunctors.hpp"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataArrays/StringDataArray.h"
 
 class AbstractDataParser
 {
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index e56e811016..720717637f 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -37,8 +37,8 @@
 
 #include <QtCore/QObject>
 
-#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 #include "ICalculatorArray.h"
 
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index e17b3b4834..e0a1d0b7eb 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -42,10 +42,10 @@
 #include "SIMPLib/SIMPLib.h"
 
 #include "CalculatorArray.hpp"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataArrays/DataArray.hpp"
 
 class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
 {
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
old mode 100755
new mode 100644
index d0c28e1a0b..fccceaf4a7
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -60,11 +60,11 @@
 #define SIMPL_BYTE_SWAP_64(x) bswap_64(x)
 #endif
 
-#include <string>
 #include <cstring>
 #include <functional>
 #include <iostream>
 #include <numeric>
+#include <string>
 
 #include <hdf5.h>
 
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 453ad73877..5739162bf1 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -35,12 +35,11 @@
 
 #pragma once
 
-
 // STL Includes
 #include <cassert>
-#include <vector>
 #include <iterator>
 #include <memory>
+#include <vector>
 
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
diff --git a/Source/SIMPLib/DataArrays/IDataArray.h b/Source/SIMPLib/DataArrays/IDataArray.h
index 131dc14f87..cca04ff1eb 100644
--- a/Source/SIMPLib/DataArrays/IDataArray.h
+++ b/Source/SIMPLib/DataArrays/IDataArray.h
@@ -18,8 +18,8 @@
 
 //--Qt Includes
 #include <QtCore/QString>
-#include <QtCore/QtDebug>
 #include <QtCore/QTextStream>
+#include <QtCore/QtDebug>
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/IDataStructureNode.h"
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 53bb14aca1..8cc73732b6 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -36,8 +36,8 @@
 #pragma once
 
 #include <cstdint>
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <QtCore/QString>
 
@@ -155,7 +155,6 @@ class NeighborList : public IDataArray
    */
   IDataArray::Pointer createNewArray(size_t numElements, const std::vector<size_t>& dims, const QString& name, bool allocate = true) const override;
 
-
   using VectorType = std::vector<T>;
   using SharedVectorType = std::shared_ptr<VectorType>;
 
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index abc1ba6f51..d3ea8a44c2 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -35,21 +35,21 @@
 
 #include "StatsDataArray.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QList>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
 
 #include "H5Support/H5ScopedSentinel.h"
-#include "H5Support/QH5Utilities.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/PhaseType.h"
+#include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/StatsData/TransformationStatsData.h"
-#include "SIMPLib/HDF5/H5DataArrayWriter.hpp"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 8216729da3..130dcb0405 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -39,9 +39,9 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/StatsData/StatsData.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/StatsData/StatsData.h"
 
 /**
  * @brief The StatsDataArray class
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index f1a2340049..6d4e92d3d3 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -33,29 +33,29 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#include <array>
 #include <cstdint>
 #include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <map>
 #include <vector>
-#include <cstring>
-#include <array>
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QString>
-#include <QtCore/QVector>
 #include <QtCore/QTextStream>
+#include <QtCore/QVector>
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 5842de1d86..42484374d4 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -38,10 +38,10 @@
 #include <iostream>
 #include <string>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/Geometry/MeshStructs.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index 7ded1befad..82a405c48e 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -38,10 +38,10 @@
 #include <iostream>
 #include <string>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/StructArray.hpp"
 #include "SIMPLib/Geometry/MeshStructs.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index bbc4aee63f..2f7a2064de 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -49,13 +49,13 @@
 #include <QtCore/QTextStream>
 
 // DREAM3D Includes
-#include "SIMPLib/DataArrays/StatsDataArray.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataArrays/StatsDataArray.h"
+#include "SIMPLib/DataContainers/AttributeMatrixProxy.h"
+#include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/HDF5/H5DataArrayReader.h"
 #include "SIMPLib/HDF5/VTKH5Constants.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/DataContainers/AttributeMatrixProxy.h"
-#include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index c8a6f322b7..be0e2d8df8 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -51,13 +51,12 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/Observable.h"
+#include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Utilities/ToolTipGenerator.h"
-#include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/ToolTipGenerator.h"
 
 class AttributeMatrixProxy;
 class DataContainerProxy;
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index c3fd1bc6c3..542a96aa2f 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -39,8 +39,8 @@
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 96ebcb8546..0eb99b78b4 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -41,12 +41,12 @@
 #include <QtCore/QVector>
 
 #include <list>
+#include <memory>
 #include <set>
 #include <utility>
-#include <memory>
 
-#include "SIMPLib/Common/SIMPLibDLLExport.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLibDLLExport.h"
 
 class DataContainerArray;
 using DataContainerArrayShPtr = std::shared_ptr<DataContainerArray>;
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
old mode 100755
new mode 100644
index a098f35bf0..43be1b2a14
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -49,7 +49,6 @@
 
 class SIMPLH5DataReaderRequirements;
 
-
 /**
  * @brief The DataArrayProxy class
  */
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 0e073db082..322d6c8fc5 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -41,19 +41,18 @@
 
 #include <QtCore/QMap>
 #include <QtCore/QString>
-#include <QtCore/QVector>
 #include <QtCore/QTextStream>
+#include <QtCore/QVector>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Utilities/ToolTipGenerator.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index ffc95ef4ef..9b4effa695 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -39,9 +39,9 @@
 
 #include <hdf5.h>
 
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Montages/AbstractMontage.h"
 #include "SIMPLib/Montages/GridMontage.h"
@@ -924,6 +924,6 @@ IDataArray::Pointer DataContainerArray::getPrereqIDataArrayFromPath(AbstractFilt
     return dataArray;
   }
 
-  dataArray = attrMat->getPrereqIDataArray(filter, daName, -90002); 
+  dataArray = attrMat->getPrereqIDataArray(filter, daName, -90002);
   return dataArray;
 }
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index f0bdca05f7..66bbccab8a 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -43,14 +43,14 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/NamedCollection.hpp"
-#include "SIMPLib/DataContainers/IDataContainerBundle.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/IDataContainerBundle.h"
 #include "SIMPLib/DataContainers/IDataStructureContainerNode.hpp"
 #include "SIMPLib/DataContainers/RenameDataPath.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Montages/AbstractMontage.h"
 #include "SIMPLib/Montages/GridMontage.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 
 class DataContainer;
 using DataContainerShPtr = std::shared_ptr<DataContainer>;
@@ -509,7 +509,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
       return dataArray;
     }
 
-    dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims); 
+    dataArray = attrMat->getPrereqArray<ArrayType>(filter, daName, -80002, cDims);
     return dataArray;
   }
 
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index 5c35aaefa5..fe6d2d0d80 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -37,9 +37,9 @@
 
 #include <QtCore/QDebug>
 
-#include "H5Support/QH5Utilities.h"
-#include "H5Support/QH5Lite.h"
 #include "H5Support/H5ScopedSentinel.h"
+#include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
index d3ea3adc8a..6ba83b87b3 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.h
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -35,8 +35,8 @@
 #include <memory>
 #include <vector>
 
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
 class IDataArray;
 using IDataArrayShPtrType = std::shared_ptr<IDataArray>;
@@ -206,7 +206,7 @@ class SIMPLib_EXPORT DataStructureUtilities
       return dataArray;
     }
 
-    dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims); 
+    dataArray = attrMat->getPrereqArray<ArrayType, Filter>(filter, daName, -80002, cDims);
     return dataArray;
   }
 
@@ -271,7 +271,7 @@ class SIMPLib_EXPORT DataStructureUtilities
       return dataArray;
     }
 
-    dataArray = std::dynamic_pointer_cast<ArrayType>(attrMat->getPrereqIDataArray(filter, daName, -90002)); 
+    dataArray = std::dynamic_pointer_cast<ArrayType>(attrMat->getPrereqIDataArray(filter, daName, -90002));
     return dataArray;
   }
 
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index 45eea53ccd..22356a87c4 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -41,8 +41,8 @@
 
 #include <QString>
 
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
 
 class AbstractDataStructureContainer;
 
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.cpp b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
index 26ac42204a..2476fae455 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.cpp
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
@@ -33,9 +33,9 @@
 
 #include "RenameDataPath.h"
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index 8ff8b22ee3..eda143e4bb 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -36,6 +36,7 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
@@ -43,7 +44,6 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 33847ad99e..8a01d51c01 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -38,6 +38,7 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
@@ -47,12 +48,11 @@
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
-#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
-#include "SIMPLib/SIMPLib.h"
 
 class AbstractFilter;
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index dc4032aa72..36ad509229 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -39,6 +39,7 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
@@ -51,7 +52,6 @@
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
 
 class AbstractFilter;
 
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 3f6c762fce..db197cccc0 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 class AbstractFilter;
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index 4be5ad363e..42f5ca883b 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index c0f3602165..5e2aaae786 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_AXISANGLE_FP This macro is a short-form way of instantiating an
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index a220c05454..ea23ee3d27 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -35,8 +35,8 @@
 
 #include "CalculatorFilterParameter.h"
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index cc4bb41e55..fe5acf7886 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 class AbstractFilter;
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 7d5839731e..9a55d173e0 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 class AbstractFilter;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 0062c92a8f..04ba39becc 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_DCA_PROXY_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 2cefe5e12a..0a2be9e284 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_DYN_TABLE_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index f4bf38e0f5..bdace44c70 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -37,12 +37,12 @@
 
 #include <memory>
 
-#include <QtCore/QString>
 #include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
-#include "SIMPLib/FilterParameters/StackFileListInfo.h"
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/StackFileListInfo.h"
 
 /**
  * @brief SIMPL_NEW_FILELISTINFO_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 335c904ff6..a3159eda7e 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -37,8 +37,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 724fec7c22..fac3de891e 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -38,8 +38,8 @@
 #include <functional>
 #include <memory>
 
-#include <QtCore/QVariant>
 #include <QtCore/QString>
+#include <QtCore/QVariant>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 1616654a64..018fb7b0e4 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -40,12 +40,12 @@
 #include <cmath>
 #include <functional>
 
-#include <QtCore/QString>
 #include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief SIMPL_NEW_FLOAT_VEC3_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 3697aed53b..6492feb09e 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -40,12 +40,12 @@
 #include <cmath>
 #include <functional>
 
-#include <QtCore/QString>
 #include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief SIMPL_NEW_FLOAT_VEC3_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 5b1b890414..3d1daddb4a 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -43,12 +43,12 @@
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
 
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index cdad1a77c9..966a2ea0fa 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -41,12 +41,12 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
 
 /*
  *
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 1f2dcdb887..366cb3258d 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -41,16 +41,16 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
-#include "H5Support/H5ScopedSentinel.h"
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
-#include "SIMPLib/Messages/PipelineErrorMessage.h"
 #include "SIMPLib/Messages/GenericErrorMessage.h"
-#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Messages/PipelineErrorMessage.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index 9431dc5d48..e50680b9df 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -41,11 +41,11 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersWriter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
 
 /*
  *
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 0769df0ea6..133c112cde 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -39,12 +39,12 @@
 #include <QtCore/QJsonParseError>
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The JsonFilterParametersReader class
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 2cd282eea5..396e2a9825 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -38,12 +38,12 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
-#include "JsonFilterParametersWriter.h"
 #include <QtCore/QTextStream>
+#include "JsonFilterParametersWriter.h"
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/Filtering/BadFilter.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index ddd5076639..f76cb6b967 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -39,12 +39,12 @@
 
 #include <QtCore/QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @class
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index 5cd9f5300a..7af8516025 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief The LinkedChoicesFilterParameter class is used by filters to instantiate an LinkedChoicesWidget.  By instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 9a3964b029..d2853a4af9 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -64,7 +64,7 @@ std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreati
 //
 // -----------------------------------------------------------------------------
 std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
-                                                                                                    LinkedMixedPath::PathGetterCallbackType amCallback)
+                                                                                                                    LinkedMixedPath::PathGetterCallbackType amCallback)
 {
   return std::make_unique<LinkedMixedPath>(dcCallback, amCallback);
 }
@@ -73,7 +73,7 @@ std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreati
 //
 // -----------------------------------------------------------------------------
 std::unique_ptr<LinkedPathCreationFilterParameter::ILinkedPath> LinkedPathCreationFilterParameter::CreateLinkedPath(LinkedMixedPath::PathGetterCallbackType dcCallback,
-                                                                                                    LinkedMixedPath::StringGetterCallbackType amCallback)
+                                                                                                                    LinkedMixedPath::StringGetterCallbackType amCallback)
 {
   return std::make_unique<LinkedMixedPath>(dcCallback, amCallback);
 }
@@ -109,8 +109,7 @@ LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
                                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                  std::unique_ptr<ILinkedPath> linkedPath,
-                                                                                  int groupIndex)
+                                                                                  std::unique_ptr<ILinkedPath> linkedPath, int groupIndex)
 {
 
   LinkedPathCreationFilterParameter::Pointer ptr = LinkedPathCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 3faa94687e..7b84111e3d 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 61a1d0811b..6859cb28d2 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 70dbd656ff..d5cc3dcf94 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
-#include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Geometry/IGeometry.h"
 
 /**
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index 15ae76cb70..9a8f7ad977 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index 81f7851ad8..ee729446d9 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_NUMERICTYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index c3c2ca01d3..8b30979167 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -39,8 +39,8 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Common/ShapeType.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_SHAPETYPE_SELECTION_FP This macro is a short-form way of instantiating an instance of
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 43c527f25b..22e437e3a9 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -35,6 +35,7 @@
 
 #include <QtCore/QPair>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
@@ -77,7 +78,6 @@
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
-#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -85,7 +85,6 @@
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index d1dcbe8fca..7058456a7b 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -37,8 +37,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The AbstractDecisionFilter class. This class serves as a superclass for other classes
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 0dc049f7ed..8a5c157a08 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -35,18 +35,18 @@
 
 #include "AbstractFilter.h"
 
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
+#include <QtCore/QTextStream>
 
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
 #include "SIMPLib/Plugin/PluginManager.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Filtering/FilterManager.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index e5715b77f8..04dbc9b79d 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -35,12 +35,12 @@
 
 #pragma once
 
-#include <memory>
 #include <map>
+#include <memory>
 
+#include <QtCore/QJsonObject>
 #include <QtCore/QString>
 #include <QtCore/QUuid>
-#include <QtCore/QJsonObject>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observable.h"
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index 729e9987b5..4def45cb16 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -82,7 +82,6 @@ struct ComparisonInput_t
     }
     return false;
   }
-
 };
 
 /**
diff --git a/Source/SIMPLib/Filtering/CorePlugin.cpp b/Source/SIMPLib/Filtering/CorePlugin.cpp
index 249442210e..5d7ba99eba 100644
--- a/Source/SIMPLib/Filtering/CorePlugin.cpp
+++ b/Source/SIMPLib/Filtering/CorePlugin.cpp
@@ -36,11 +36,11 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Filtering/CoreConstants.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
index 97f1504d3c..4a6da96373 100644
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -35,9 +35,9 @@
 
 #pragma once
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
-#include "SIMPLib/SIMPLib.h"
 
 template <class T>
 class FilterFactory : public IFilterFactory
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 9257326def..348a9274a5 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -35,12 +35,12 @@
 
 #include "FilterManager.h"
 
-#include <QtCore/QJsonObject>
 #include <QtCore/QDebug>
+#include <QtCore/QJsonObject>
 #include <QtCore/QSet>
 
-#include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/CorePlugin.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 
 FilterManager* FilterManager::s_Self = nullptr;
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
index 8ffea60864..fc89bb67d3 100644
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -35,14 +35,14 @@
 
 #pragma once
 
+#include <QtCore/QJsonArray>
 #include <QtCore/QMap>
 #include <QtCore/QMapIterator>
 #include <QtCore/QString>
 #include <QtCore/QUuid>
-#include <QtCore/QJsonArray>
 
-#include "SIMPLib/Filtering/IFilterFactory.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/IFilterFactory.hpp"
 
 /**
  * @brief The FilterManager class manages instances of filters and is mainly used to instantiate
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 78bcdbfa66..b8d6eb1b42 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -37,8 +37,15 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/CoreFilters/DataContainerReader.h"
+#include "SIMPLib/CoreFilters/EmptyFilter.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/DataContainers/RenameDataPath.h"
+#include "SIMPLib/Filtering/BadFilter.h"
+#include "SIMPLib/Filtering/FilterFactory.hpp"
+#include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
-#include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
@@ -47,15 +54,7 @@
 #include "SIMPLib/Messages/PipelineProgressMessage.h"
 #include "SIMPLib/Messages/PipelineStatusMessage.h"
 #include "SIMPLib/Messages/PipelineWarningMessage.h"
-#include "SIMPLib/CoreFilters/DataContainerReader.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/RenameDataPath.h"
 #include "SIMPLib/Utilities/StringOperations.h"
-#include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Filtering/BadFilter.h"
-#include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/CoreFilters/EmptyFilter.h"
 
 #define RENAME_ENABLED 1
 
@@ -707,7 +706,6 @@ void FilterPipeline::removeObserver(Observer* obj)
   m_MessageReceivers.removeAll(obj);
 }
 
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index 2f5fcec114..761868d7d5 100644
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -37,8 +37,8 @@
 
 #include <QtCore/QUuid>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief This class serves as a base class to create Factory classes that can
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index a229325186..f1e96cb74f 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -43,7 +43,6 @@
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
-#include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
@@ -52,6 +51,7 @@
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
+#include "SIMPLib/Filtering/FilterPipeline.h"
 
 // These Streams need to be implemented so that our 3 Element Vectors can be read/write to disk/prefs files
 QDataStream& operator<<(QDataStream& out, const IntVec3Type& v)
diff --git a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
index a08f9e7332..c68e6714b4 100644
--- a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
+++ b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
@@ -37,11 +37,11 @@
 
 //#include "Applications/DREAM3D/DREAM3DApplication.h"
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Observer.h"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
-#include "SIMPLib/SIMPLib.h"
 
 #ifdef SIMPL_BUILD_TEST_FILTERS
 #include "SIMPLib/TestFilters/ArraySelectionExample.h"
@@ -51,9 +51,9 @@
 #include "SIMPLib/TestFilters/ThresholdExample.h"
 #endif
 
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 class FilterPipelineTest
 {
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
index c1c85a8b8f..488cfedf85 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
@@ -35,11 +35,11 @@
 
 #pragma once
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataArrays/IDataArrayFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 /**
  * @brief The ThresholdFilterHelper class
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index 58d511dae4..981821c527 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -37,8 +37,8 @@
 
 #include "H5Support/H5SupportTypeDefs.h"
 
-#include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Geometry/ITransformContainer.h"
 
 class SIMPLib_EXPORT CompositeTransformContainer : public ITransformContainer
 {
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
index e5a5372c6a..51d28944b7 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
@@ -54,13 +54,13 @@
 #include <Eigen/Eigenvalues>
 #include <Eigen/LU>
 
-#include "SIMPLib/Math/GeometryMath.h"
-#include "SIMPLib/Math/MatrixMath.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/QuadGeom.h"
 #include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/TriangleGeom.h"
+#include "SIMPLib/Math/GeometryMath.h"
+#include "SIMPLib/Math/MatrixMath.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index fb4f64d679..68d8e5f886 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -46,8 +46,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
+#include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index ec60771909..5449036299 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -39,9 +39,9 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry.h"
 
 /**
  * @brief The EdgeGeom class represents a collection of line segments
diff --git a/Source/SIMPLib/Geometry/GeometryHelpers.h b/Source/SIMPLib/Geometry/GeometryHelpers.h
index ba71dd32f6..681dcd7b99 100644
--- a/Source/SIMPLib/Geometry/GeometryHelpers.h
+++ b/Source/SIMPLib/Geometry/GeometryHelpers.h
@@ -31,15 +31,15 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <memory>
 #include <cmath>
 #include <map>
+#include <memory>
 #include <set>
 
 #include <QtCore/QString>
 
-#include "H5Support/QH5Lite.h"
 #include "H5Support/H5ScopedErrorHandler.h"
+#include "H5Support/QH5Lite.h"
 
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.cpp b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
index 4b316efbf1..7f331bc135 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.cpp
@@ -11,9 +11,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
diff --git a/Source/SIMPLib/Geometry/HexahedralGeom.h b/Source/SIMPLib/Geometry/HexahedralGeom.h
index 0501c82de1..8f837c4795 100644
--- a/Source/SIMPLib/Geometry/HexahedralGeom.h
+++ b/Source/SIMPLib/Geometry/HexahedralGeom.h
@@ -5,9 +5,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/IGeometry3D.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry3D.h"
 
 /**
  * @brief The HexahedralGeom class represents a collection of hexahedra
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index 40484c7eaa..e0112cadb4 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -36,9 +36,9 @@
 #include "SIMPLib/Geometry/IGeometry.h"
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Utilities.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/Geometry/CompositeTransformContainer.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index 5b9fbf11ae..d5e876767f 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -36,10 +36,8 @@
 
 #include "H5Support/H5SupportTypeDefs.h"
 
-#include "SIMPLib/Common/Observable.h"
 #include "SIMPLib/SIMPLib.h"
-
-
+#include "SIMPLib/Common/Observable.h"
 
 class SIMPLib_EXPORT ITransformContainer : public Observable
 {
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 88c333772e..6c83e6fe76 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -40,9 +40,9 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
-#include "SIMPLib/Geometry/IGeometryGrid.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometryGrid.h"
 
 /**
  * @brief The ImageGeom class represents a structured rectlinear grid
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index f5c58a5534..916e864b08 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -39,9 +39,9 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Geometry/IGeometry2D.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry2D.h"
 
 /**
  * @brief The QuadGeom class represents a collection of quadrilaterals
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index bedf62228c..98a5a1830b 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/IGeometryGrid.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometryGrid.h"
 
 /**
  * @brief The RectGridGeom class represents a structured rectlinear grid
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
index e96b951374..1b1e01b0ea 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
@@ -35,13 +35,13 @@
 
 #include "ShapeOps.h"
 
-#include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h"
 #include "SIMPLib/Geometry/ShapeOps/CylinderAOps.h"
 #include "SIMPLib/Geometry/ShapeOps/CylinderBOps.h"
 #include "SIMPLib/Geometry/ShapeOps/CylinderCOps.h"
 #include "SIMPLib/Geometry/ShapeOps/EllipsoidOps.h"
 #include "SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h"
+#include "SIMPLib/Math/SIMPLibMath.h"
 
 static const float cube_root_of_one = powf(1.0f, 0.333333333f);
 
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
index 5690d3a257..f4c890aa2b 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <QtCore/QMap>
 #include <QtCore/QVector>
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index 9f9162fc8b..e2bb2b184c 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -46,9 +46,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Geometry/TetrahedralGeom.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index e593cf3962..205b296682 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -39,9 +39,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/IGeometry3D.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry3D.h"
 
 /**
  * @brief The TetrahedralGeom class represents a collection of tetrahedra
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index 190967e955..af8e233760 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -35,8 +35,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Geometry/ITransformContainer.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Geometry/ITransformContainer.h"
 
 class SIMPLib_EXPORT TransformContainer : public ITransformContainer
 {
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index ab703666a8..63919ea6ef 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -46,9 +46,9 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/DerivativeHelpers.h"
 #include "SIMPLib/Geometry/GeometryHelpers.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Utilities/ParallelDataAlgorithm.h"
 
 /**
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 6f69c9d450..5225eb7aff 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -39,9 +39,9 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Geometry/IGeometry2D.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry2D.h"
 
 /**
  * @brief The TriangleGeom class represents a collection of triangles
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index 606a9149cf..cd426c3d46 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -41,9 +41,9 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Geometry/IGeometry.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Geometry/IGeometry.h"
 
 /**
  * @brief The VertexGeom class represents a point cloud
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
index 8b6cf77d34..eb955747f4 100644
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -40,8 +40,8 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
+#include "SIMPLib/StatsData/BoundaryStatsData.h"
 
 /**
  * @class H5BoundaryStatsDataDelegate H5BoundaryStatsDataDelegate.h DREAM3DLib/HDF5/H5BoundaryStatsDataDelegate.h
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
index 9b1908136f..3d9c1b1e50 100644
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -40,8 +40,8 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
+#include "SIMPLib/StatsData/MatrixStatsData.h"
 
 /**
  * @class H5MatrixStatsDataDelegate H5MatrixStatsDataDelegate.h DREAM3DLib/HDF5/H5MatrixStatsDataDelegate.h
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
index 73f32c6de8..05de4f3429 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
@@ -42,8 +42,8 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/PrecipitateStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
+#include "SIMPLib/StatsData/PrecipitateStatsData.h"
 
 /**
  * @class H5PrecipitateStatsDataDelegate H5PrecipitateStatsDataDelegate.h DREAM3DLib/HDF5/H5PrecipitateStatsDataDelegate.h
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
index b096edda1d..5cd5591bc9 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
@@ -42,8 +42,8 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/PrimaryStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
+#include "SIMPLib/StatsData/PrimaryStatsData.h"
 
 /**
  * @class H5PrimaryStatsDataDelegate H5PrimaryStatsDataDelegate.h DREAM3DLib/HDF5/H5PrimaryStatsDataDelegate.h
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
index 8ed4d366ff..98268a92a9 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
@@ -42,8 +42,8 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/StatsData/TransformationStatsData.h"
 #include "SIMPLib/HDF5/H5StatsDataDelegate.h"
+#include "SIMPLib/StatsData/TransformationStatsData.h"
 
 /**
  * @class H5TransformationStatsDataDelegate H5TransformationStatsDataDelegate.h DREAM3DLib/HDF5/H5TransformationStatsDataDelegate.h
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
index 1bcb306aa8..614b259ce5 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
@@ -33,7 +33,6 @@
 
 #pragma once
 
-
 #include "SIMPLib/Geometry/CompositeTransformContainer.h"
 #include "SIMPLib/Geometry/TransformContainer.h"
 
diff --git a/Source/SIMPLib/ITK/itkBridge.h b/Source/SIMPLib/ITK/itkBridge.h
index 2e85e9fa27..4c191c9959 100644
--- a/Source/SIMPLib/ITK/itkBridge.h
+++ b/Source/SIMPLib/ITK/itkBridge.h
@@ -38,12 +38,11 @@
 #include <memory>
 
 // DREAM3D Includes next
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
-#include "SIMPLib/SIMPLib.h"
-
 
 #include <itkConfigure.h>
 #define SIMPL_ITK_VERSION_CHECK (ITK_VERSION_MAJOR == 4)
diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index 254b81d653..2c937e7bac 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -39,11 +39,11 @@
 #error This file can ONLY be used if ITK Version 5 with the Montage module is being used.
 #endif
 
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtCore/QObject>
-#include <QtCore/QString>
 #include <QtCore/QPointF>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
+#include <QtCore/QString>
 
 #include "itkParseTileConfiguration.h"
 
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index b928a543e9..956880f967 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -9,11 +9,11 @@
 #ifndef ITK_IMAGE_READER_CLASS_NAME
 #define ITK_IMAGE_READER_CLASS_NAME Foo
 #include "SIMPLib/ITK/itkImageReaderHelper.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/ITK/itkGetComponentsDimensions.h"
 #include "SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include <itkImageFileReader.h>
 
diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.h b/Source/SIMPLib/ITK/itkImageReaderHelper.h
index c00cb8f8fb..513e90c037 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.h
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.h
@@ -39,7 +39,6 @@ private:
   template <typename TPixel, unsigned int dimensions>                                                                                                                                                  \
   void readImageOutputInformation(const DataArrayPath& dataArrayPath, typename itk::ImageFileReader<itk::Image<TPixel, dimensions>>::Pointer& reader, DataContainer::Pointer& container);
 
-
 #if SIMPL_ITK_VERSION_CHECK
 #ifdef __clang__
 #pragma clang diagnostic pop
diff --git a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
index 2863b5b786..a2dfd42ab9 100644
--- a/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceDream3DDataToImageFilter.h
@@ -16,8 +16,8 @@
 #include <itkNumericTraitsRGBPixel.h>
 #include <itkNumericTraitsVectorPixel.h>
 
-#include "SIMPLib/ITK/itkImportDream3DImageContainer.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/ITK/itkImportDream3DImageContainer.h"
 
 class DataContainer;
 using DataContainerShPtrType = std::shared_ptr<DataContainer>;
diff --git a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
index 7b267589ba..38777429a8 100644
--- a/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
+++ b/Source/SIMPLib/ITK/itkInPlaceImageToDream3DDataFilter.h
@@ -16,8 +16,8 @@
 #include <itkProcessObject.h>
 #include <itkSimpleDataObjectDecorator.h>
 
-#include "SIMPLib/ITK/itkGetComponentsDimensions.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/ITK/itkGetComponentsDimensions.h"
 #include "SIMPLib/ITK/itkSupportConstants.h"
 
 namespace itk
diff --git a/Source/SIMPLib/Math/ArrayHelpers.hpp b/Source/SIMPLib/Math/ArrayHelpers.hpp
index b1bee05612..be1de0681a 100644
--- a/Source/SIMPLib/Math/ArrayHelpers.hpp
+++ b/Source/SIMPLib/Math/ArrayHelpers.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <stdio.h>
-#include <iostream>
 #include <algorithm>
-#include <limits>
 #include <iomanip>
+#include <iostream>
+#include <limits>
+#include <stdio.h>
 
 #include "SIMPLib/Math/SIMPLibMath.h"
 
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 8b56d9420c..4ba936278f 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -182,8 +182,8 @@ SIMPLib_EXPORT bool PointInBox(const float p[3], const float ll[3], const float
  * @param radius
  * @return
  */
-SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
-                              float radius);
+SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft,
+                                      const float* upperRight, float radius);
 
 /**
  * @brief Determines if a point is inside of a polyhedron defined by a set of faces
@@ -197,8 +197,8 @@ SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32Dynam
  * @param distToBoundary
  * @return
  */
-SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft, const float* upperRight,
-                              float radius, float& distToBoundary);
+SIMPLib_EXPORT char PointInPolyhedron(TriangleGeom* faces, const Int32Int32DynamicListArray::ElementList& faceIds, VertexGeom* vertices, const float* point, const float* lowerLeft,
+                                      const float* upperRight, float radius, float& distToBoundary);
 
 /**
  * @brief Determines if a point is inside of a triangle defined by 3 points
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.h b/Source/SIMPLib/Math/RadialDistributionFunction.h
index 89617167fc..ce80cde6ca 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.h
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <vector>
 #include <array>
+#include <vector>
 
 #include "SIMPLib/SIMPLib.h"
 
diff --git a/Source/SIMPLib/Math/RdfData.cpp b/Source/SIMPLib/Math/RdfData.cpp
index 809f7284dd..7d6a8e331b 100644
--- a/Source/SIMPLib/Math/RdfData.cpp
+++ b/Source/SIMPLib/Math/RdfData.cpp
@@ -35,8 +35,8 @@
 
 #include "RdfData.h"
 
-#include "SIMPLib/Math/RadialDistributionFunction.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Math/RadialDistributionFunction.h"
 #include "SIMPLib/StatsData/StatsData.h"
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
index ea91bc0005..3b9967e352 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
@@ -39,9 +39,9 @@
 #include <Eigen/Dense>
 #include <Eigen/Eigen>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Math/MatrixMath.h"
 #include "SIMPLib/Math/QuaternionMath.hpp"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
diff --git a/Source/SIMPLib/Messages/AbstractMessageHandler.cpp b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
index 11f6e3accb..3839f4b01a 100644
--- a/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
+++ b/Source/SIMPLib/Messages/AbstractMessageHandler.cpp
@@ -36,14 +36,14 @@
 
 #include "AbstractMessageHandler.h"
 
-#include "SIMPLib/Messages/GenericErrorMessage.h"
-#include "SIMPLib/Messages/GenericProgressMessage.h"
-#include "SIMPLib/Messages/GenericStatusMessage.h"
-#include "SIMPLib/Messages/GenericWarningMessage.h"
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterProgressMessage.h"
 #include "SIMPLib/Messages/FilterStatusMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
+#include "SIMPLib/Messages/GenericErrorMessage.h"
+#include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.h b/Source/SIMPLib/Montages/DataContainerGrid.h
index 4450bad1c7..bc7c720fd7 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.h
+++ b/Source/SIMPLib/Montages/DataContainerGrid.h
@@ -37,8 +37,8 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 
-#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 
 class SIMPLib_EXPORT DataContainerGrid : public QObject
 {
diff --git a/Source/SIMPLib/Plugin/PluginManager.cpp b/Source/SIMPLib/Plugin/PluginManager.cpp
index b98ff245cc..b15ed2a5ba 100644
--- a/Source/SIMPLib/Plugin/PluginManager.cpp
+++ b/Source/SIMPLib/Plugin/PluginManager.cpp
@@ -35,13 +35,13 @@
 
 #include "PluginManager.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
-#include <QtCore/QDebug>
 
+#include "ISIMPLibPlugin.h"
 #include "SIMPLib/Filtering/CorePlugin.h"
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
-#include "ISIMPLibPlugin.h"
 
 PluginManager* PluginManager::m_Self = nullptr;
 
diff --git a/Source/SIMPLib/REST/PipelineListener.cpp b/Source/SIMPLib/REST/PipelineListener.cpp
index cdd777ecae..f78bc487f8 100644
--- a/Source/SIMPLib/REST/PipelineListener.cpp
+++ b/Source/SIMPLib/REST/PipelineListener.cpp
@@ -3,8 +3,8 @@
 #include "REST/PipelineListenerMessageHandler.h"
 
 #include "SIMPLib/Messages/AbstractErrorMessage.h"
-#include "SIMPLib/Messages/AbstractWarningMessage.h"
 #include "SIMPLib/Messages/AbstractStatusMessage.h"
+#include "SIMPLib/Messages/AbstractWarningMessage.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index c1c95b10d6..925237cf7b 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -4,9 +4,9 @@
 
 #include <QtCore/QFile>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/IObserver.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
-#include "SIMPLib/SIMPLib.h"
 
 class PipelineListenerMessageHandler;
 
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
index 86a69bc6c5..e8b4540cba 100644
--- a/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.cpp
@@ -38,18 +38,18 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/Messages/FilterErrorMessage.h"
+#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/FilterStatusMessage.h"
+#include "SIMPLib/Messages/FilterWarningMessage.h"
 #include "SIMPLib/Messages/GenericErrorMessage.h"
-#include "SIMPLib/Messages/GenericWarningMessage.h"
-#include "SIMPLib/Messages/GenericStatusMessage.h"
 #include "SIMPLib/Messages/GenericProgressMessage.h"
+#include "SIMPLib/Messages/GenericStatusMessage.h"
+#include "SIMPLib/Messages/GenericWarningMessage.h"
 #include "SIMPLib/Messages/PipelineErrorMessage.h"
-#include "SIMPLib/Messages/PipelineWarningMessage.h"
-#include "SIMPLib/Messages/PipelineStatusMessage.h"
 #include "SIMPLib/Messages/PipelineProgressMessage.h"
-#include "SIMPLib/Messages/FilterErrorMessage.h"
-#include "SIMPLib/Messages/FilterWarningMessage.h"
-#include "SIMPLib/Messages/FilterStatusMessage.h"
-#include "SIMPLib/Messages/FilterProgressMessage.h"
+#include "SIMPLib/Messages/PipelineStatusMessage.h"
+#include "SIMPLib/Messages/PipelineWarningMessage.h"
 
 #include "REST/PipelineListener.h"
 
diff --git a/Source/SIMPLib/REST/PipelineListenerMessageHandler.h b/Source/SIMPLib/REST/PipelineListenerMessageHandler.h
index db1642c542..418a79f0a7 100644
--- a/Source/SIMPLib/REST/PipelineListenerMessageHandler.h
+++ b/Source/SIMPLib/REST/PipelineListenerMessageHandler.h
@@ -36,8 +36,8 @@
 
 #pragma once
 
-#include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
 
 class QFile;
 class PipelineListener;
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 91b15cf983..e38fd44eff 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -52,10 +52,15 @@
 #include "QtWebApp/httpserver/httplistener.h"
 #include "QtWebApp/httpserver/httpsessionstore.h"
 
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
+#include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
+#include "SIMPLib/CoreFilters/CreateDataArray.h"
+#include "SIMPLib/CoreFilters/CreateDataContainer.h"
+#include "SIMPLib/CoreFilters/DataContainerWriter.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
@@ -69,19 +74,13 @@
 #include "SIMPLib/REST/PipelineListener.h"
 #include "SIMPLib/REST/SIMPLRequestMapper.h"
 #include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
-#include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
-#include "SIMPLib/CoreFilters/CreateDataArray.h"
-#include "SIMPLib/CoreFilters/CreateDataContainer.h"
-#include "SIMPLib/CoreFilters/DataContainerWriter.h"
 
 #include "RESTClient/SIMPLRestClient.h"
 
-#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 
 /**
  * @brief
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 0c0d75eb7b..69fed9c8b7 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -31,12 +31,12 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ExecutePipelineController.h"
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 #include <QtCore/QProcess>
-#include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
index b40a85e650..f60b189f3c 100644
--- a/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/PreflightPipelineController.cpp
@@ -47,8 +47,8 @@
 #include "QtWebApp/httpserver/httpsessionstore.h"
 
 #include "SIMPLib/REST/PipelineListener.h"
-#include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
 #include "SIMPLib/REST/V1Controllers/PreflightPipelineMessageHandler.h"
+#include "SIMPLib/REST/V1Controllers/SIMPLStaticFileController.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
index 01015bd4e6..e1fce00e53 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLStaticFileController.cpp
@@ -1,9 +1,9 @@
 
 #include "SIMPLStaticFileController.h"
 #include <QtCore/QDateTime>
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
 
 #include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/REST/SIMPLDirectoryListing.h"
diff --git a/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp b/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
index c55ba4ed90..7661047d92 100644
--- a/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/SIMPLibVersionController.cpp
@@ -35,8 +35,8 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Plugin/SIMPLPluginConstants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index 9ec8643a58..a2450c5047 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -39,9 +39,9 @@
 #include <hdf5.h>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/StatsData/StatsData.h"
-#include "SIMPLib/Common/PhaseType.h"
 
 typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index a047269d07..a9b2eaac2f 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -43,9 +43,9 @@
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/StatsData/StatsData.h"
 #include "SIMPLib/Math/RadialDistributionFunction.h"
 #include "SIMPLib/Math/RdfData.h"
+#include "SIMPLib/StatsData/StatsData.h"
 
 typedef QVector<FloatArrayType::Pointer> VectorOfFloatArray;
 
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index 5188b5481e..d822666afd 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -37,9 +37,9 @@
 
 #include <vector>
 
+#include <QtCore/QDebug>
 #include <QtCore/QJsonArray>
 #include <QtCore/QString>
-#include <QtCore/QDebug>
 
 #include "H5Support/H5Utilities.h"
 
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index 0eca78a26b..cbc9c79747 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -35,13 +35,13 @@
 
 #include <iostream>
 
+#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QJsonDocument>
-#include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
-#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/StatsData/BoundaryStatsData.h"
 #include "SIMPLib/StatsData/MatrixStatsData.h"
 #include "SIMPLib/StatsData/PrecipitateStatsData.h"
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index b68db6c8fe..ab02589183 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -32,10 +32,10 @@
 #include <memory>
 
 #include "ArraySelectionExample.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index b5b1c7e3c8..3944d3ad3b 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -35,9 +35,9 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index 3686603b79..d0a4e01128 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -5,11 +5,11 @@
 #include <memory>
 
 #include "Filt0.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/Filt0.h b/Source/SIMPLib/TestFilters/Filt0.h
index 6548258a0e..b2a3e11bec 100644
--- a/Source/SIMPLib/TestFilters/Filt0.h
+++ b/Source/SIMPLib/TestFilters/Filt0.h
@@ -8,9 +8,9 @@
 
 #include <QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index 84fdcd529d..afe31ba9c8 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -5,11 +5,11 @@
 #include <memory>
 
 #include "Filt1.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/Filt1.h b/Source/SIMPLib/TestFilters/Filt1.h
index 7434fcf44d..39e1e6ea06 100644
--- a/Source/SIMPLib/TestFilters/Filt1.h
+++ b/Source/SIMPLib/TestFilters/Filt1.h
@@ -8,9 +8,9 @@
 
 #include <QString>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/SIMPLib.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup00.h b/Source/SIMPLib/TestFilters/FilterGroup00.h
index eb2fa687a7..a4d96fdfed 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup00.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup00.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup00 class. See [Filter documentation](@ref FilterGroup00) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.cpp b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
index 252874bd5e..1467188a69 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup01.h b/Source/SIMPLib/TestFilters/FilterGroup01.h
index 807d3d5891..88a1921402 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup01.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup01.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup01 class. See [Filter documentation](@ref FilterGroup01) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.cpp b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
index dea8968ea5..f7cd3fc122 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup02.h b/Source/SIMPLib/TestFilters/FilterGroup02.h
index e7adaa4903..d9154559dc 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup02.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup02.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup02 class. See [Filter documentation](@ref FilterGroup02) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.cpp b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
index e6a30fb8ba..31ba03dc06 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup03.h b/Source/SIMPLib/TestFilters/FilterGroup03.h
index 5e2a3265f9..ce0637b7a8 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup03.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup03.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup03 class. See [Filter documentation](@ref FilterGroup03) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.cpp b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
index 211e144924..7c8810e565 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup04.h b/Source/SIMPLib/TestFilters/FilterGroup04.h
index 6860153b34..00ccacf97c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup04.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup04.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup04 class. See [Filter documentation](@ref FilterGroup04) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.cpp b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
index 57a5629c68..53ae5af396 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup05.h b/Source/SIMPLib/TestFilters/FilterGroup05.h
index 5308fd48b0..5a787bac39 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup05.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup05.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup05 class. See [Filter documentation](@ref FilterGroup05) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.cpp b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
index 26093b19e5..9037ed4b97 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup06.h b/Source/SIMPLib/TestFilters/FilterGroup06.h
index 3b88f65a52..d2f7fae061 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup06.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup06.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup06 class. See [Filter documentation](@ref FilterGroup06) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.cpp b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
index 159263b2dc..b3d4a969a8 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup07.h b/Source/SIMPLib/TestFilters/FilterGroup07.h
index 4fe79ef8ae..a82004c222 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup07.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup07.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup07 class. See [Filter documentation](@ref FilterGroup07) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.cpp b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
index d16008b772..f9aef941f3 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup08.h b/Source/SIMPLib/TestFilters/FilterGroup08.h
index 0847f09b1d..f519bbf93c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup08.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup08.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup08 class. See [Filter documentation](@ref FilterGroup08) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.cpp b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
index 6d690d6540..1edab7d102 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup09.h b/Source/SIMPLib/TestFilters/FilterGroup09.h
index 4e5ac8ba0d..1c2ea4e27e 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup09.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup09.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup09 class. See [Filter documentation](@ref FilterGroup09) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.cpp b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
index 69a0a581e6..5839bcf0a7 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup10.h b/Source/SIMPLib/TestFilters/FilterGroup10.h
index 6e7a5964ae..af6062f2a0 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup10.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup10.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup10 class. See [Filter documentation](@ref FilterGroup10) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.cpp b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
index 4f8873192b..3a8584b449 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup12.h b/Source/SIMPLib/TestFilters/FilterGroup12.h
index 69fa56a7a9..b5e26b2569 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup12.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup12.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup12 class. See [Filter documentation](@ref FilterGroup12) for details.
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.cpp b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
index b0ae341074..3d2ca5927c 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.cpp
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.cpp
@@ -35,8 +35,8 @@
 
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/TestFilters/FilterGroup13.h b/Source/SIMPLib/TestFilters/FilterGroup13.h
index 6b26a804c2..a2d9086998 100644
--- a/Source/SIMPLib/TestFilters/FilterGroup13.h
+++ b/Source/SIMPLib/TestFilters/FilterGroup13.h
@@ -33,8 +33,8 @@
 
 #include <memory>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @brief The FilterGroup13 class. See [Filter documentation](@ref FilterGroup13) for details.
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 738bf8a93e..55362ad6d4 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -42,6 +42,7 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
@@ -49,12 +50,11 @@
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
-#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
 /**
  * @class GenericExample GenericExample.h ExamplePlugin/Code/ExamplePluginFilters/GenericExample.h
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 924b504425..906e860d6e 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -38,14 +38,14 @@
 #include "MakeDataContainer.h"
 
 #include "SIMPLib/DataArrays/StringDataArray.h"
-#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
@@ -131,8 +131,8 @@ void MakeDataContainer::dataCheck()
   //  }
 
   std::vector<size_t> dims(1, 1);
-  m_FeatureIdsPtr = cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims); 
-  if(nullptr != m_FeatureIdsPtr.lock())                                                                          
+  m_FeatureIdsPtr = cellAttrMat->createNonPrereqArray<DataArray<int32_t>>(this, m_FeatureIdsArrayName, 0, dims);
+  if(nullptr != m_FeatureIdsPtr.lock())
   {
     m_FeatureIds = m_FeatureIdsPtr.lock()->getPointer(0); /* Now assign the raw pointer to data from the DataArray<T> object */
   }
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index 55df2c43f9..f02e99b1c5 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -39,8 +39,8 @@
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
  * @class ReadOrientationData ReadOrientationData.h /FilterCategoryFilters/ReadOrientationData.h
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index 6d60b8e8a9..ace7436402 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -37,9 +37,9 @@
 
 #include "ThresholdExample.h"
 
-#include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/Utilities/ColorTable.h b/Source/SIMPLib/Utilities/ColorTable.h
index 7eb95170ae..5f1f73b32d 100644
--- a/Source/SIMPLib/Utilities/ColorTable.h
+++ b/Source/SIMPLib/Utilities/ColorTable.h
@@ -40,8 +40,8 @@
 
 #include <QtCore/QVector>
 
-#include "SIMPLib/Common/SIMPLibDLLExport.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/SIMPLibDLLExport.h"
 
 class SIMPLib_EXPORT RgbColor
 {
diff --git a/Source/SIMPLib/Utilities/FloatSummation.h b/Source/SIMPLib/Utilities/FloatSummation.h
index 0f8ce18156..773edc0d7f 100644
--- a/Source/SIMPLib/Utilities/FloatSummation.h
+++ b/Source/SIMPLib/Utilities/FloatSummation.h
@@ -31,8 +31,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <vector>
 #include <initializer_list>
+#include <vector>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
index 299269e925..734d248030 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
@@ -36,8 +36,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLRange2D.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLRange2D.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
index b9f14ceb40..87b22c638a 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
@@ -36,8 +36,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLRange3D.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLRange3D.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
index 2912a233a8..980b05ea3a 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -36,8 +36,8 @@
 
 #include <array>
 
-#include "SIMPLib/Common/SIMPLRange.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLRange.h"
 
 // SIMPLib.h MUST be included before this or the guard will block the include but not its uses below.
 // This is consistent with previous behavior, only earlier parallelization split the includes between
diff --git a/Source/SIMPLib/Utilities/PythonSupport.h b/Source/SIMPLib/Utilities/PythonSupport.h
index 2a6199cdf1..b906f69b45 100644
--- a/Source/SIMPLib/Utilities/PythonSupport.h
+++ b/Source/SIMPLib/Utilities/PythonSupport.h
@@ -32,8 +32,8 @@
 
 #pragma once
 
-#include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
 
 /**
  * @brief This class is here for the sole reason of fixing dynamic_pointer_cast across library boundaries when the python
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
index c72a21078a..2ec33c7985 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
@@ -32,8 +32,8 @@
 
 #include "SIMPLDataPathValidator.h"
 
-#include <QtCore/QDir>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
 
 SIMPLDataPathValidator* SIMPLDataPathValidator::m_Self = nullptr;
 
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index b7ba7497b2..595b0f26a3 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -36,15 +36,15 @@
 
 #include <QtCore/QDebug>
 
+#include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
 #include "H5Support/QH5Utilities.h"
-#include "H5Support/H5ScopedSentinel.h"
 
 #include "SIMPLib/Common/IObserver.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerBundle.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 const QString Title = "HDF5 Read Error";
 
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
index 119cb7bcff..b60807242f 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
@@ -35,8 +35,8 @@
 
 #include <cmath>
 
-#include "SIMPLib/Common/Observer.h"
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Observer.h"
 
 #ifdef SIMPL_BUILD_TEST_FILTERS
 #include "SIMPLib/TestFilters/ArraySelectionExample.h"
@@ -46,9 +46,9 @@
 #include "SIMPLib/TestFilters/ThresholdExample.h"
 #endif
 
-#include "SIMPLib/Utilities/FloatSummation.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/Utilities/FloatSummation.h"
 
 class FloatSummationTest
 {
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
index f76981dcd8..db0a76e7f3 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
@@ -40,9 +40,9 @@
 
 #include <QtCore/QDebug>
 
-#include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
+#include "SIMPLib/Utilities/StringOperations.h"
 
 /**
  * @brief The StringOperationsTest class
diff --git a/Source/SIMPLib/Utilities/UTFUtilities.hpp b/Source/SIMPLib/Utilities/UTFUtilities.hpp
index ef8296f916..0782b5b7a3 100644
--- a/Source/SIMPLib/Utilities/UTFUtilities.hpp
+++ b/Source/SIMPLib/Utilities/UTFUtilities.hpp
@@ -31,11 +31,11 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
+#include <array>
+#include <cstdint>
 #include <cstdio>
 #include <string>
 #include <tuple>
-#include <cstdint>
-#include <array>
 
 namespace UTFUtilities
 {
diff --git a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
index 10b00714a0..4da087bbe5 100644
--- a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
+++ b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include "SIMPLib/Utilities/SIMPLibEndian.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Utilities/SIMPLibEndian.h"
 
 /**@file VTKWriterMacros.h
  * @brief This file contains various macros to write out consistent VTK legacy
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.h b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
index 3ff272d67a..780963b274 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.h
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
@@ -35,11 +35,11 @@
 
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QMap>
+#include <QtCore/QString>
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Core/IFilterWidgetFactory.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 /**
  * @class FilterWidgetManager FilterWidgetManager.h FilterWidgets/FilterWidgetManager.h
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
index b6cfa720db..683f798857 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
@@ -37,9 +37,9 @@
 #include <QtCore/QPluginLoader>
 #include <QtCore/QTextStream>
 
+#include <QtWidgets/QAction>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMessageBox>
-#include <QtWidgets/QAction>
 
 #include <QtCore/QDebug>
 
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
index eceeb6a0c1..c35c736667 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
@@ -37,9 +37,9 @@
 
 #include <QtWidgets/QCheckBox>
 
-#include "SIMPLib/Plugin/PluginProxy.h"
-#include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/PluginManager.h"
+#include "SIMPLib/Plugin/PluginProxy.h"
 #include "SIMPLib/Plugin/SIMPLibPlugin.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index 61e02ad570..d63ffcb174 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -48,8 +48,8 @@
 
 #include <memory>
 
-#include <QtCore/QString>
 #include <QtCore/QJsonObject>
+#include <QtCore/QString>
 
 class QPixmap;
 class vtkPVXMLElement;
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.h b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
index 562c3dbb75..a007e6bff7 100644
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.h
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
@@ -34,8 +34,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include "SIMPLib/Plugin/PluginManager.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Plugin/PluginManager.h"
 
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index 52aae409a1..5eff1ee645 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -46,9 +46,9 @@
 
 #include <QtCore/QTextStream>
 
+#include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/AppVersion.h"
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/SIMPLibVersion.h"
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
index 17e953e6fa..39ee2d58d1 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
@@ -35,13 +35,13 @@
 
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QDateTime>
+#include <QtCore/QString>
 #include <QtWidgets/QWidget>
 
+#include "SVWidgetsLib/Dialogs/UpdateCheck.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/Dialogs/UpdateCheck.h"
 #include "SVWidgetsLib/Widgets/SVControlWidgets.h"
 
 #include "ui_UpdateCheckDialog.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 2c9f016876..fce82d2e9a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -38,18 +38,18 @@
 #include <QtCore/QDir>
 #include <QtCore/QFileInfo>
 
-#include <QtGui/QPainter>
 #include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
 
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
 #include "SVWidgetsLib/QtSupport/QtSFileUtils.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "FilterParameterWidgetsDialogs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index abb9a7e232..3647bd7b42 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_AbstractIOFileWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index f6f5f949f2..ecbc9f4c8a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <QtCore/QSharedPointer>
 #include <QtCore/QObject>
+#include <QtCore/QSharedPointer>
 #include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -45,8 +45,8 @@
 #include "SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_AttributeMatrixCreationWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index 12aaf29632..e35b5122a6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -35,9 +35,9 @@
 
 #include "AttributeMatrixSelectionWidget.h"
 
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index 9d5a675b22..d60a497db6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -44,8 +44,8 @@
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_AttributeMatrixSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index aff51e539f..a8dd69747c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -37,12 +37,12 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/ui_AxisAngleWidget.h"
 
 /**
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
index 3462a90792..893309f92a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/BooleanFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_BooleanWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 27a88e80e2..e1744b48b9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -35,10 +35,9 @@
 
 #include "CalculatorWidget.h"
 
-#include <QtWidgets/QMenu>
 #include <QtCore/QDebug>
+#include <QtWidgets/QMenu>
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index d815c3c29b..2566c6c425 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -41,9 +41,9 @@
 #include "SIMPLib/FilterParameters/CalculatorFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/ui_CalculatorWidget.h"
 
 /**
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
index 8313e20f9b..57a93d4b9a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
@@ -41,8 +41,8 @@
 
 #include "SIMPLib/FilterParameters/ChoiceFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ChoiceWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
index a631f94a25..c47c34523b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
@@ -35,13 +35,13 @@
 
 #pragma once
 
-#include <QtWidgets/QFrame>
 #include <QtGui/QMouseEvent>
+#include <QtWidgets/QFrame>
 
 #include "SIMPLib/Filtering/AbstractComparison.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "ui_ComparisonContainerWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index b48613cf97..af43f05179 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -41,8 +41,8 @@
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
 
-#include "SIMPLib/Filtering/ComparisonValue.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/ComparisonValue.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index 5c4ecdf716..3c16f3509f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -45,8 +45,8 @@
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SIMPLib/Filtering/AbstractComparison.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
index 3a40a7043d..69f5ee8b61 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
@@ -36,9 +36,9 @@
 #pragma once
 
 #include <QtCore/QAbstractTableModel>
-#include <QtCore/QVector>
-#include <QtCore/QVariant>
 #include <QtCore/QStringList>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
 
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 48a525af1a..778da79637 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -35,10 +35,9 @@
 
 #include "ComparisonSelectionWidget.h"
 
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 52fdd96d62..267d1693da 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -45,8 +45,8 @@
 #include "SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "ComparisonSelectionTableModel.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
index b39a0beae9..7fe95fc9c0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
@@ -1,7 +1,7 @@
 #include "ComparisonSetWidget.h"
 
-#include <QtWidgets/QMenu>
 #include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
 
 #include "SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
index 66d00f3543..464e5b90fa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
@@ -35,10 +35,10 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragMoveEvent>
 #include <QtGui/QDropEvent>
+#include <QtWidgets/QWidget>
 
 #include <vector>
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
index 5a0ba0f660..1bfd4d62f4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
@@ -37,8 +37,8 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SIMPLib/Filtering/ComparisonValue.h"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/Filtering/ComparisonValue.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
index 7431936e89..178327aa8d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ConstrainedDoubleWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
index 8a91ff9120..83a92fdc97 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ConstrainedIntWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
index 4f5cf9078a..c95d939a19 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
@@ -39,8 +39,8 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "FilterWidgetsLib/QFilterParameterWidget.h"
 #include "FilterWidgetsLib/FilterWidgetsLib.h"
+#include "FilterWidgetsLib/QFilterParameterWidget.h"
 
 #include "FilterWidgetsLib/ui_CustomWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index d27c25cf58..92f729dd73 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -44,8 +44,8 @@
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataArrayCreationWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index 28f1efc9e5..777348f5a7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -43,8 +43,8 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataArrayInformationDisplayWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index c2246f6708..e744e59eba 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -42,8 +42,8 @@
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/DataContainerArrayWidget.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "FilterParameterWidgetUtils.hpp"
 #include "FilterParameterWidgetsDialogs.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index 168642841c..2adea3f4c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -44,9 +44,9 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataArraySelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index dd2bcc4026..984412612a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -37,10 +37,10 @@
 
 #include <cassert>
 
+#include <QtCore/QDebug>
 #include <QtGui/QBrush>
 #include <QtGui/QColor>
 #include <QtGui/QFont>
-#include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index fd4a007733..88a840e096 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -43,8 +43,8 @@
 #include "SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataContainerArrayProxyWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index 32fc63fe15..2ab18cbda5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataContainerCreationWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index 2358ca7e89..75566c5c74 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -41,16 +41,16 @@
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 
-#include <QtGui/QStandardItemModel>
 #include <QtGui/QPainter>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 
 #include <QtCore/QDebug>
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
-#include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 416cead611..474e260318 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -43,8 +43,8 @@
 #include "SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataContainerReaderWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index c2be027ecf..f3680ef967 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -44,8 +44,8 @@
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DataContainerSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
index ca4cfc4c31..17eb70b48d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/DoubleFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DoubleWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index 84f81d6b0d..d3fa7c8ce2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DynamicChoiceWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index 40dda16424..27b2e80285 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -41,8 +41,8 @@
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_DynamicTableWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 0f9656e6de..4bc78adf79 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -45,11 +45,11 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Utilities/FilePathGenerator.h"
-#include "SIMPLib/Utilities/StringOperations.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/Utilities/StringOperations.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 9b7b89b40e..636e30028c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -34,11 +34,11 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterParameterWidget.h"
 
-#include <QtCore/QPropertyAnimation>
-#include <QtCore/QTimer>
+#include <QtCore/QDebug>
 #include <QtCore/QFileInfo>
+#include <QtCore/QPropertyAnimation>
 #include <QtCore/QTextStream>
-#include <QtCore/QDebug>
+#include <QtCore/QTimer>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index be98bd44bc..b4d54b4c33 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -37,18 +37,18 @@
 
 #include <QtCore/QPointer>
 
+#include <QtWidgets/QFrame>
 #include <QtWidgets/QToolButton>
 #include <QtWidgets/QWidget>
-#include <QtWidgets/QFrame>
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 namespace Detail
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
index 61b301af67..7e4815e71b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -3,16 +3,16 @@
 #include <cassert>
 
 #include <QtCore/QString>
+#include <QtGui/QStandardItemModel>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QListWidgetItem>
-#include <QtGui/QStandardItemModel>
 
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 
 /**
  * @brief The FilterParameterWidgetUtils class implements some common methods that
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index 5de4ca7ebd..29c4ef5ed7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/FloatVec2FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_FloatVec2Widget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
index eb0f5f02b1..e2b7153727 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/FloatFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_FloatWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
index 14dff3ae68..6e4c6a03b7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_FourthOrderPolynomialWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index cac7f21e7d..f57dbf0c7f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -41,8 +41,8 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_GenerateColorTableWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index abd574aab9..c7c560cd2b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -40,22 +40,22 @@
 #include <QtCore/QString>
 #include <QtCore/QUrl>
 
+#include <QtCore/QTextStream>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QPainter>
-#include <QtCore/QTextStream>
 
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QMenu>
 
 #include "H5Support/H5Lite.h"
 #include "H5Support/H5Utilities.h"
-#include "H5Support/QH5Utilities.h"
 #include "H5Support/QH5Lite.h"
+#include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
index dab89fbab0..5cf5db8440 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
@@ -37,8 +37,8 @@
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 class InputFileFilterParameter;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
index d2703b0334..7f7065aaf5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
@@ -37,9 +37,9 @@
 
 #include "SIMPLib/FilterParameters/InputPathFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 class InputPathFilterParameter;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
index f8d22d6b09..dd141f712b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_IntVec3Widget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
index 8047b3ec68..c3a23418b2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_IntWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
index 3cc9e30ef2..a71ddb818e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_LinkedBooleanWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 14f385867e..5ba964dbd5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -38,15 +38,15 @@
 #include <QtCore/QSignalMapper>
 #include <QtWidgets/QMenu>
 
-#include "SIMPLib/Geometry/IGeometry.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Geometry/IGeometry.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
index 1f2a48c44c..9d99ae6a96 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
@@ -42,9 +42,9 @@
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
 #include "SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index ae50108d1b..60fbde661d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -35,8 +35,8 @@
 
 #include "MontageSelectionWidget.h"
 
-#include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
 
 #include "SVWidgetsLib/ui_MontageSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 69cdd2c4ce..f76df11a20 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -42,11 +42,11 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index 18fa96fa56..df79dbd582 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -40,11 +40,11 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiAttributeMatrixSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 9fb6fad7ea..ac9de7c26b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -40,10 +40,10 @@
 #include <QtWidgets/QListWidgetItem>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 3c7a8f96e6..cfa098d1d9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -40,11 +40,11 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiDataArraySelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9077d911ba..9e62c90512 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -40,10 +40,10 @@
 #include <QtWidgets/QListWidgetItem>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index e79a114d30..e8e59b1a5e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -40,11 +40,11 @@
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiDataContainerSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
index 0ddccea070..25b034cc50 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_NumericTypeWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
index c55e6bded6..5e8bf0a36b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
@@ -37,8 +37,8 @@
 
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 /**
  * @brief
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
index c00596aa41..b35b36f170 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
@@ -37,8 +37,8 @@
 
 #include "SIMPLib/FilterParameters/OutputPathFilterParameter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 /**
  * @brief
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 238434b2f8..d081ae80f1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -42,9 +42,9 @@
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index 51d5aa6f65..c0a8166bbf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -44,8 +44,8 @@
 #include "SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_PhaseTypeSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
index 93865a61c5..f1f0b41850 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_PreflightUpdatedValueWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index 128d7dcd39..1158ad668e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -40,9 +40,9 @@
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 
 #include "SVWidgetsLib/ui_RangeWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 8be9389d2d..a9b51bd8ae 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -44,10 +44,10 @@
 #include "SIMPLib/CoreFilters/ReadASCIIData.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/CoreFilters/util/AbstractDataParser.hpp"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "Widgets/ImportASCIIDataWizard/DataFormatPage.h"
 #include "Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
index 3e66df17d2..50f7e2da8d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/ScalarTypeFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ScalarTypeWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
index a03b3af567..21f8619fc5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_SecondOrderPolynomialWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
index f5e789f875..d7432ead14 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_SeparatorWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index 0463d2ef9e..5d16156572 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -41,10 +41,10 @@
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/DataArrays/StringDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
-#include "SIMPLib/DataContainers/DataContainer.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
index 0a82f3e00a..623d1f37a1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ShapeTypeSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
index 2f3b582bfb..99a718d084 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_StringWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
index b029745cab..d6e4dafacd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_ThirdOrderPolynomialWidget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
index 49fda19403..83cb8302fd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
@@ -39,8 +39,8 @@
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_UInt64Widget.h"
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
index 383317e4e5..44ef150552 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
@@ -41,8 +41,8 @@
 #include "SIMPLib/FilterParameters/UnknownFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_UnknownWidget.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
index b72d7339d2..7ab26e1c04 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
@@ -35,11 +35,11 @@
 
 #include <QtCore/QParallelAnimationGroup>
 
-#include <QtWidgets/QWidget>
-#include <QtWidgets/QGridLayout>
 #include <QtWidgets/QFrame>
-#include <QtWidgets/QToolButton>
+#include <QtWidgets/QGridLayout>
 #include <QtWidgets/QScrollArea>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QWidget>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
index fe0660ff60..e58c8f806d 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
@@ -38,8 +38,8 @@
 #include <iostream>
 
 #include <QtCore/QVector>
-#include <QtWidgets/QGraphicsView>
 #include <QtWidgets/QGraphicsItem>
+#include <QtWidgets/QGraphicsView>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
index 2d5bcb4e7c..5b80264d17 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
@@ -37,9 +37,9 @@
 
 #include <iostream>
 
-#include <QtCore/QTextStream>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
+#include <QtCore/QTextStream>
 
 #include <QtGui/QDesktopServices>
 
@@ -93,9 +93,9 @@ QUrl QtSHelpUrlGenerator::GenerateHTMLUrl(QString htmlName)
   }
 #endif
 
-    FilterManager* fm = FilterManager::Instance();
+  FilterManager* fm = FilterManager::Instance();
 
-    IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
+  IFilterFactory::Pointer factory = fm->getFactoryFromClassName(htmlName);
 
 #ifdef SIMPL_USE_MKDOCS
   {
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
index cc84b29990..ab12e7d00f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
@@ -34,8 +34,8 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
 
-#include <QtCore/QUrl>
 #include <QtCore/QString>
+#include <QtCore/QUrl>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
index 18bf398f5e..bf2b3b6a89 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
@@ -38,9 +38,9 @@
 //-- Qt Includes
 #include <QtCore/QObject>
 #include <QtCore/QString>
-#include <QtWidgets/QGraphicsPixmapItem>
-#include <QtGui/QPainter>
 #include <QtGui/QImage>
+#include <QtGui/QPainter>
+#include <QtWidgets/QGraphicsPixmapItem>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
index 98e0ad2175..7456ae5e5e 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -35,11 +35,11 @@
 
 #pragma once
 
+#include <QtCore/QSettings>
 #include <QtCore/QString>
 #include <QtWidgets/QFrame>
-#include <QtCore/QSettings>
-#include <QtWidgets/QStatusBar>
 #include <QtWidgets/QMessageBox>
+#include <QtWidgets/QStatusBar>
 
 #include "SIMPLib/Messages/AbstractMessage.h"
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
index a55e9084c2..c530724638 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
@@ -35,13 +35,13 @@
 
 #pragma once
 
+#include <QtCore/QFileSystemWatcher>
 #include <QtCore/QObject>
-#include <QtCore/QStringList>
 #include <QtCore/QSettings>
-#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QStringList>
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 enum AddType
 {
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.h b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
index 39fcde5bf3..78547618ac 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
@@ -35,12 +35,12 @@
 
 #pragma once
 
+#include <QtCore/QJsonObject>
+#include <QtCore/QObject>
 #include <QtCore/QSharedPointer>
+#include <QtCore/QStack>
 #include <QtCore/QString>
-#include <QtCore/QObject>
 #include <QtCore/QVariant>
-#include <QtCore/QJsonObject>
-#include <QtCore/QStack>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
index 373f486a11..bd90052d06 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
@@ -42,8 +42,8 @@
 #include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include <ui_QtSStringEdit.h>
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
index b8b9fb6bde..edadfe481a 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
@@ -36,10 +36,10 @@
 
 #include <QtGui/QPainter>
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/BookmarksItem.h"
 #include "SVWidgetsLib/Widgets/BookmarksItemDelegate.h"
 #include "SVWidgetsLib/Widgets/BookmarksModel.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index d6fc0f5418..bae50cad95 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -35,17 +35,17 @@
 
 #include <QtCore/QDebug>
 
-#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDir>
 #include <QtCore/QDirIterator>
 
+#include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/BookmarksModel.h"
 #include "SVWidgetsLib/Widgets/BookmarksTreeView.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
 #define PREBUILT_PIPELINES_DIR "PrebuiltPipelines"
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.h b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
index dfa88e7271..f830f037ad 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
@@ -36,14 +36,14 @@
 #pragma once
 
 #include <QtCore/QAbstractItemModel>
-#include <QtCore/QModelIndex>
-#include <QtCore/QVariant>
 #include <QtCore/QDir>
 #include <QtCore/QFileSystemWatcher>
+#include <QtCore/QModelIndex>
+#include <QtCore/QVariant>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 #include "SVWidgetsLib/Widgets/BookmarksItem.h"
+#include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 
 enum IndexState
 {
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index 60873106fb..7bdd8589de 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -44,10 +44,10 @@
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QTreeWidgetItem>
 
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/Common/Constants.h"
 
 #include "SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index 325f24be83..e6bcefdf97 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -50,9 +50,9 @@
 #include <QtWidgets/QMessageBox>
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/QtSupport/QtSFileUtils.h"
 #include "SVWidgetsLib/Widgets/BookmarksItemDelegate.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
-#include "SVWidgetsLib/QtSupport/QtSFileUtils.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
index 12d0457d5d..74204f826c 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
+#include <QtWidgets/QMenu>
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QTreeWidgetItem>
 
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index da90ba3535..0c3eb3eb6e 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -36,14 +36,14 @@
 #include "DataArrayPathSelectionWidget.h"
 
 #include <QtCore/QMimeData>
+#include <QtCore/QTextStream>
 #include <QtGui/QDrag>
 #include <QtGui/QPainter>
 #include <QtGui/QTextDocument>
 #include <QtWidgets/QApplication>
-#include <QtCore/QTextStream>
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index ff80a3449c..d46318e6fe 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -36,17 +36,17 @@
 #pragma once
 
 #include <QtCore/QPoint>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QToolButton>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragLeaveEvent>
 #include <QtGui/QDropEvent>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolButton>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 59c99997e5..96ccc90e77 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -34,11 +34,11 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "DataContainerArrayWidget.h"
 
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
+#include <QtCore/QTextStream>
 
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include <QtGui/QStandardItem>
 #include <QtGui/QStandardItemModel>
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
index 37d89f9c83..5ac13310d7 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
@@ -35,8 +35,8 @@
 
 #include <algorithm>
 
-#include <QtWidgets/QStyleOptionFrame>
 #include <QtGui/QPainter>
+#include <QtWidgets/QStyleOptionFrame>
 
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.h b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
index 40ba6fc74b..7019c318ab 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.h
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
@@ -33,8 +33,8 @@
 
 #pragma once
 
-#include <QtGui/QColor>
 #include <QtCore/QRect>
+#include <QtGui/QColor>
 #include <QtWidgets/QLabel>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index 07db9c5b78..c8eae6335f 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -37,11 +37,11 @@
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
 #include "SVWidgetsLib/Widgets/DataStructureItem.h"
 #include "SVWidgetsLib/Widgets/DataStructureItemDelegate.h"
 #include "SVWidgetsLib/Widgets/DataStructureModel.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 namespace Detail
 {
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index e490926ff7..25d75a688b 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -35,12 +35,12 @@
 
 #include <QtCore/QVector>
 
-#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 
+#include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/DataStructureModel.h"
 #include "SVWidgetsLib/Widgets/DataStructureTreeView.h"
-#include "SVWidgetsLib/QtSupport/QtSSettings.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index 810dcd5d03..ad7b78c263 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -40,8 +40,8 @@
 #include <QtGui/QStandardItemModel>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 #include "SVWidgetsLib/Widgets/DataStructureItem.h"
+#include "SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h"
 
 class QtSSettings;
 class DataStructureItem;
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index 3c55556c5a..b578ce22bc 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -38,9 +38,9 @@
 
 #include <QtGui/QStandardItemModel>
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index 84cdc834a6..e9227fe19e 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -40,12 +40,12 @@
 #include <QtGui/QIcon>
 #include <QtWidgets/QWidget>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
-#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 class DataContainerArray;
 using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 3706764b98..7b2c953b99 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -42,8 +42,8 @@
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QVBoxLayout>
 
-#include <QtCore/QTextStream>
 #include <QtCore/QDebug>
+#include <QtCore/QTextStream>
 
 #include "SIMPLib/Common/DocRequestManager.h"
 #include "SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h"
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
index f191a2ff01..8871b8d229 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -41,10 +41,10 @@
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
-#include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
 #include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index a823b9d778..0e3d7fe60b 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -34,12 +34,12 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "FilterLibraryToolboxWidget.h"
 
-#include <QtCore/QFileInfo>
 #include <QtCore/QDebug>
+#include <QtCore/QFileInfo>
 
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Common/DocRequestManager.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
-#include "SIMPLib/Common/Constants.h"
 
 #include "FilterListToolboxWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
index fb848479f9..f77c5bc535 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
@@ -46,8 +46,8 @@
 #include "SIMPLib/Filtering/FilterManager.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
index f5847c9beb..cb855dec96 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
@@ -42,8 +42,8 @@
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/FilterListModel.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
index dae26af7f2..9c064c4981 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -35,17 +35,17 @@
 
 #pragma once
 
-#include <QtWidgets/QWidget>
 #include <QtWidgets/QMenu>
+#include <QtWidgets/QWidget>
 
-#include <QtCore/QSignalMapper>
 #include <QtCore/QList>
+#include <QtCore/QSignalMapper>
 
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "ui_FilterListToolboxWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.cpp b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
index ad657c7d56..1a91f92b92 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
@@ -38,8 +38,8 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QMimeData>
 
-#include <QtGui/QMouseEvent>
 #include <QtGui/QDrag>
+#include <QtGui/QMouseEvent>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QMenu>
@@ -48,10 +48,10 @@
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SVWidgetsLib/Widgets/FilterListModel.h"
-#include "SVWidgetsLib/Widgets/FilterListItem.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
+#include "SVWidgetsLib/Widgets/FilterListItem.h"
+#include "SVWidgetsLib/Widgets/FilterListModel.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
index 0f9eda630d..98a5cfad31 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
@@ -46,8 +46,8 @@
 #include "SIMPLib/Filtering/FilterManager.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 51176ca46b..c073ebb72f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -35,20 +35,20 @@
 
 #include "DataFormatPage.h"
 
-#include <QtCore/QSignalMapper>
 #include <QtCore/QDebug>
+#include <QtCore/QSignalMapper>
 
 #include <QtGui/QScreen>
 #include <QtWidgets/QDesktopWidget>
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/Utilities/StringOperations.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/StringOperations.h"
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "ASCIIDataModel.h"
 #include "EditHeadersDialog.h"
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index ad70369a3c..4b9affc0f0 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -37,8 +37,8 @@
 
 #include <memory>
 
-#include <QtCore/QPointer>
 #include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index 221f2da897..bb7f46e22e 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -38,10 +38,10 @@
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
 
-#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
-#include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "ASCIIDataModel.h"
 #include "DataFormatPage.h"
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 979696593c..6d27d5e570 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -43,8 +43,8 @@
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "ui_IssuesWidget.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
index 4a3f0de35e..aac5d981ac 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -39,8 +39,8 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/IObserver.h"
-#include "SIMPLib/Messages/AbstractMessageHandler.h"
 #include "SIMPLib/Messages/AbstractMessage.h"
+#include "SIMPLib/Messages/AbstractMessageHandler.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
index 5370f503a6..07d614d11c 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -35,11 +35,11 @@
 
 #include "IssuesWidgetMessageHandler.h"
 
-#include <QtCore/QUrl>
 #include <QtCore/QTextStream>
+#include <QtCore/QUrl>
 
-#include <QtWidgets/QTableWidgetItem>
 #include <QtWidgets/QLabel>
+#include <QtWidgets/QTableWidgetItem>
 
 #include "SIMPLib/Messages/FilterErrorMessage.h"
 #include "SIMPLib/Messages/FilterWarningMessage.h"
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
index d5573a9f4f..85efafd2a5 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include "SVWidgetsLib/SVWidgetsLib.h"
 #include "SIMPLib/Messages/AbstractMessageHandler.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
 
 class IssuesWidget;
 class QLabel;
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
index 5495f95ae2..f89532bec8 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItemDelegate.cpp
@@ -29,8 +29,8 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 
 #include "SVWidgetsLib/Widgets/PipelineItem.h"
 #include "SVWidgetsLib/Widgets/PipelineItemDelegate.h"
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
index 409edae253..3de5c7900b 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
@@ -31,15 +31,15 @@
 
 #include "PipelineModel.h"
 
-#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
-#include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
+#include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
+#include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
-#include "SVWidgetsLib/Widgets/PipelineItem.h"
-#include "SVWidgetsLib/Widgets/PipelineFilterMimeData.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/Widgets/PipelineFilterMimeData.h"
+#include "SVWidgetsLib/Widgets/PipelineItem.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.cpp b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
index c6fbd79bb8..7dfaf91fce 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
@@ -35,8 +35,8 @@
 
 #include "PipelineView.h"
 
-#include <QtWidgets/QUndoStack>
 #include <QtWidgets/QUndoCommand>
+#include <QtWidgets/QUndoStack>
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
index 900794ff2e..2e940d9301 100644
--- a/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
+++ b/Source/SVWidgetsLib/Widgets/SVControlWidgets.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QDialog>
 #include <QtWidgets/QDoubleSpinBox>
-#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLabel>
 #include <QtWidgets/QLineEdit>
-#include <QtWidgets/QTreeView>
 #include <QtWidgets/QListView>
 #include <QtWidgets/QListWidget>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTreeView>
 #include <QtWidgets/QTreeWidget>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QDialog>
 
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 3d68a9b373..7e07c07161 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -60,14 +60,14 @@
 
 #include <QtCore/QDebug>
 
+#include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/DocRequestManager.h"
 #include "SIMPLib/CoreFilters/Breakpoint.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
-#include "SIMPLib/SIMPLib.h"
-#include "SIMPLib/DataContainers/DataContainerArray.h"
 
 #include "SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h"
 
@@ -79,19 +79,16 @@
 #include "SVWidgetsLib/QtSupport/QtSRecentFileList.h"
 #include "SVWidgetsLib/Widgets/DataStructureWidget.h"
 #include "SVWidgetsLib/Widgets/FilterInputWidget.h"
+#include "SVWidgetsLib/Widgets/IssuesWidget.h"
 #include "SVWidgetsLib/Widgets/PipelineFilterMimeData.h"
 #include "SVWidgetsLib/Widgets/PipelineItemDelegate.h"
 #include "SVWidgetsLib/Widgets/PipelineModel.h"
 #include "SVWidgetsLib/Widgets/ProgressDialog.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+#include "SVWidgetsLib/Widgets/StandardOutputWidget.h"
 #include "SVWidgetsLib/Widgets/util/AddFilterCommand.h"
 #include "SVWidgetsLib/Widgets/util/MoveFilterCommand.h"
 #include "SVWidgetsLib/Widgets/util/RemoveFilterCommand.h"
-#include "SVWidgetsLib/Widgets/DataStructureWidget.h"
-#include "SVWidgetsLib/Widgets/IssuesWidget.h"
-#include "SVWidgetsLib/Widgets/ProgressDialog.h"
-#include "SVWidgetsLib/Widgets/StandardOutputWidget.h"
-#include "SVWidgetsLib/Widgets/SVStyle.h"
-#include "SVWidgetsLib/QtSupport/QtSRecentFileList.h"
 
 class ExecutionResultInvalidException : public std::exception
 {
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index f1e181e343..6e32c138c6 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -44,11 +44,11 @@
 #include <QtWidgets/QListView>
 
 #include "SIMPLib/Common/Observer.h"
-#include "SIMPLib/Messages/AbstractMessage.h"
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersReader.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersWriter.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
+#include "SIMPLib/Messages/AbstractMessage.h"
 class DataContainerArray;
 using DataContainerArrayShPtrType = std::shared_ptr<DataContainerArray>;
 
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index f8dc0e6327..302496beb6 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -36,13 +36,13 @@
 #include "SVStyle.h"
 
 #include <QtCore/QDebug>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
-#include <QtCore/QTextStream>
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonObject>
 #include <QtCore/QJsonValue>
+#include <QtCore/QMetaProperty>
+#include <QtCore/QTextStream>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QLineEdit>
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
index 013ad8fc43..2e307a935d 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
@@ -1,12 +1,12 @@
 #include "StatusBarButton.h"
 
 #include <QtCore/QDebug>
-#include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
+#include <QtGui/QPainter>
 #include <QtWidgets/QStyleOption>
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
index d8eecd75a2..6c1fbc0193 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
@@ -40,8 +40,8 @@
 #include <QtWidgets/QDockWidget>
 #include <QtWidgets/QMenu>
 
-#include "SVWidgetsLib/Widgets/SVStyle.h"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
index e60577086c..19ed5228d3 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITK.h
@@ -28,9 +28,9 @@
 
 #include "sitkExplicitITKDefaultPixelAccessor.h"
 #include "sitkExplicitITKDefaultVectorPixelAccessor.h"
-#include "sitkExplicitITKImportImageContainer.h"
-#include "sitkExplicitITKImageBase.h"
 #include "sitkExplicitITKImage.h"
+#include "sitkExplicitITKImageBase.h"
+#include "sitkExplicitITKImportImageContainer.h"
 #include "sitkExplicitITKLabelMap.h"
 #include "sitkExplicitITKVectorImage.h"
 
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
index e649da8d5a..9349d57c83 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKComposeImageFilter.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKComposeImageFilter_h__
 #define sitkExplicitITKComposeImageFilter_h__
-#include "sitkExplicit.h"
 #include "itkComposeImageFilter.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ComposeImageFilter<itk::Image<double, 2u>, itk::VectorImage<double, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
index 1660abe606..cc686b4ad8 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultPixelAccessor.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKDefaultPixelAccessor_h__
 #define sitkExplicitITKDefaultPixelAccessor_h__
-#include "sitkExplicit.h"
 #include "itkDefaultPixelAccessor.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultPixelAccessor<bool>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
index d9b82e2183..ed3f580bf7 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKDefaultVectorPixelAccessor.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKDefaultVectorPixelAccessor_h__
 #define sitkExplicitITKDefaultVectorPixelAccessor_h__
-#include "sitkExplicit.h"
 #include "itkDefaultVectorPixelAccessor.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::DefaultVectorPixelAccessor<double>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
index 7c465afffc..f3949cf3f6 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImage.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImage_h__
 #define sitkExplicitITKImage_h__
-#include "sitkExplicit.h"
 #include "itkImage.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::Image<bool, 2u>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
index 5bf6a6cc53..d060bd1e96 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageBase.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageBase_h__
 #define sitkExplicitITKImageBase_h__
-#include "sitkExplicit.h"
 #include "itkImageBase.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageBase<1u>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
index 2191b36960..1d1f82d91f 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageConstIterator.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageConstIterator_h__
 #define sitkExplicitITKImageConstIterator_h__
-#include "sitkExplicit.h"
 #include "itkImageConstIterator.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageConstIterator<itk::Image<bool, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
index 0899fa0f8c..95250bf5d4 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegion.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageRegion_h__
 #define sitkExplicitITKImageRegion_h__
-#include "sitkExplicit.h"
 #include "itkImageRegion.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegion<1u>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
index ec40aff7a3..4afe62a292 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageRegionConstIterator.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageRegionConstIterator_h__
 #define sitkExplicitITKImageRegionConstIterator_h__
-#include "sitkExplicit.h"
 #include "itkImageRegionConstIterator.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageRegionConstIterator<itk::Image<bool, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
index d54c034ad2..1996299701 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineConstIterator.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageScanlineConstIterator_h__
 #define sitkExplicitITKImageScanlineConstIterator_h__
-#include "sitkExplicit.h"
 #include "itkImageScanlineConstIterator.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineConstIterator<itk::Image<double, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
index 3ebc2cd951..0146645dbb 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageScanlineIterator.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageScanlineIterator_h__
 #define sitkExplicitITKImageScanlineIterator_h__
-#include "sitkExplicit.h"
 #include "itkImageScanlineIterator.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageScanlineIterator<itk::Image<double, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
index cbc7e9d77d..3a6e6f77f0 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageSource.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageSource_h__
 #define sitkExplicitITKImageSource_h__
-#include "sitkExplicit.h"
 #include "itkImageSource.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageSource<itk::Image<bool, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
index b920f437c0..81987ba395 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImageToImageFilter.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImageToImageFilter_h__
 #define sitkExplicitITKImageToImageFilter_h__
-#include "sitkExplicit.h"
 #include "itkImageToImageFilter.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImageToImageFilter<itk::Image<bool, 2u>, itk::Image<bool, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
index d54be6470a..0340977d5c 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKImportImageContainer.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKImportImageContainer_h__
 #define sitkExplicitITKImportImageContainer_h__
-#include "sitkExplicit.h"
 #include "itkImportImageContainer.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::ImportImageContainer<itk::SizeValueType, bool>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
index 5ffba689f1..db6f802927 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKInPlaceImageFilter.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKInPlaceImageFilter_h__
 #define sitkExplicitITKInPlaceImageFilter_h__
-#include "sitkExplicit.h"
 #include "itkInPlaceImageFilter.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::InPlaceImageFilter<itk::Image<double, 2u>, itk::Image<double, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
index ee789965a1..99b99f0698 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKLabelMap.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKLabelMap_h__
 #define sitkExplicitITKLabelMap_h__
-#include "sitkExplicit.h"
 #include "itkLabelMap.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::LabelMap<itk::AttributeLabelObject<unsigned long, 2u, bool>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
index 7ee902cbdd..91f6af8517 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorImage.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKVectorImage_h__
 #define sitkExplicitITKVectorImage_h__
-#include "sitkExplicit.h"
 #include "itkVectorImage.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorImage<double, 2u>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
index 87efded9c6..ad4ae656ad 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkExplicitITKVectorIndexSelectionCastImageFilter.h
@@ -17,8 +17,8 @@
  *=========================================================================*/
 #ifndef sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
 #define sitkExplicitITKVectorIndexSelectionCastImageFilter_h__
-#include "sitkExplicit.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
+#include "sitkExplicit.h"
 
 #ifndef SITK_TEMPLATE_EXPLICIT_EXPLICITITK
 extern template class SITKExplicit_EXPORT_EXPLICIT itk::VectorIndexSelectionCastImageFilter<itk::VectorImage<double, 2u>, itk::Image<double, 2u>>;
diff --git a/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
index 3b691f76af..c769c9046a 100644
--- a/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
+++ b/Source/SimpleITKExplicit/Explicit/include/sitkMacro.h
@@ -18,11 +18,11 @@
 #ifndef __sitkMacro_h
 #define __sitkMacro_h
 
-#include <stdint.h>
-#include <stddef.h>
 #include <cassert>
-#include <sstream>
 #include <limits>
+#include <sstream>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "sitkConfigure.h"
 
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
index e3b73b5a81..899b9669df 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
@@ -13,10 +13,10 @@
 #include <QSslConfiguration>
 #endif
 
+#include "ServerSettings.h"
 #include "httpglobal.h"
 #include "httprequest.h"
 #include "httprequesthandler.h"
-#include "ServerSettings.h"
 
 /** Alias type definition, for compatibility to different Qt versions */
 #if QT_VERSION >= 0x050000
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
index 4d3a5f0040..b6da919a57 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
@@ -4,8 +4,8 @@
 #include <QSslKey>
 #include <QSslSocket>
 #endif
-#include "httpconnectionhandlerpool.h"
 #include <QDir>
+#include "httpconnectionhandlerpool.h"
 
 HttpConnectionHandlerPool::HttpConnectionHandlerPool(ServerSettings* settings, HttpRequestHandler* requestHandler)
 {
diff --git a/ThirdParty/QtWebApp/httpserver/httpcookie.h b/ThirdParty/QtWebApp/httpserver/httpcookie.h
index 671b21f41f..adbe06b443 100644
--- a/ThirdParty/QtWebApp/httpserver/httpcookie.h
+++ b/ThirdParty/QtWebApp/httpserver/httpcookie.h
@@ -5,9 +5,9 @@
 
 #pragma once
 
-#include "httpglobal.h"
 #include <QByteArray>
 #include <QList>
+#include "httpglobal.h"
 
 /**
   HTTP cookie as defined in RFC 2109. This class can also parse
diff --git a/ThirdParty/QtWebApp/httpserver/httprequest.cpp b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
index 8870bb246e..2a1ac63eba 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequest.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
@@ -4,9 +4,9 @@
 */
 
 #include "httprequest.h"
-#include "httpcookie.h"
 #include <QDir>
 #include <QList>
+#include "httpcookie.h"
 
 HttpRequest::HttpRequest(ServerSettings* settings)
 {
diff --git a/ThirdParty/QtWebApp/httpserver/httprequest.h b/ThirdParty/QtWebApp/httpserver/httprequest.h
index dd2fb5301e..4e9227be70 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequest.h
+++ b/ThirdParty/QtWebApp/httpserver/httprequest.h
@@ -13,8 +13,8 @@
 #include <QTemporaryFile>
 #include <QUuid>
 
-#include "httpglobal.h"
 #include "ServerSettings.h"
+#include "httpglobal.h"
 
 /**
   This object represents a single HTTP request. It reads the request
diff --git a/ThirdParty/QtWebApp/httpserver/httpresponse.h b/ThirdParty/QtWebApp/httpserver/httpresponse.h
index 0928062c51..f76bb07f42 100644
--- a/ThirdParty/QtWebApp/httpserver/httpresponse.h
+++ b/ThirdParty/QtWebApp/httpserver/httpresponse.h
@@ -5,11 +5,11 @@
 
 #pragma once
 
-#include "httpcookie.h"
-#include "httpglobal.h"
 #include <QMap>
 #include <QString>
 #include <QTcpSocket>
+#include "httpcookie.h"
+#include "httpglobal.h"
 
 /**
   This object represents a HTTP response, used to return something to the web client.
diff --git a/ThirdParty/QtWebApp/httpserver/httpsession.h b/ThirdParty/QtWebApp/httpserver/httpsession.h
index bc49fed157..df6b1b4999 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsession.h
+++ b/ThirdParty/QtWebApp/httpserver/httpsession.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include "httpglobal.h"
 #include <QByteArray>
 #include <QReadWriteLock>
 #include <QtCore/QVariant>
+#include "httpglobal.h"
 
 /**
   This class stores data for a single HTTP session.
diff --git a/ThirdParty/QtWebApp/logging/dualfilelogger.h b/ThirdParty/QtWebApp/logging/dualfilelogger.h
index ae4d173dbf..da269b65bd 100644
--- a/ThirdParty/QtWebApp/logging/dualfilelogger.h
+++ b/ThirdParty/QtWebApp/logging/dualfilelogger.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include "filelogger.h"
-#include "logger.h"
-#include "logglobal.h"
 #include <QSettings>
 #include <QString>
 #include <QtGlobal>
+#include "filelogger.h"
+#include "logger.h"
+#include "logglobal.h"
 
 /**
   Logs messages into two log files simultaneously.
diff --git a/ThirdParty/QtWebApp/logging/filelogger.h b/ThirdParty/QtWebApp/logging/filelogger.h
index 81420f0913..6ec25610c2 100644
--- a/ThirdParty/QtWebApp/logging/filelogger.h
+++ b/ThirdParty/QtWebApp/logging/filelogger.h
@@ -5,13 +5,13 @@
 
 #pragma once
 
-#include "logger.h"
-#include "logglobal.h"
 #include <QBasicTimer>
 #include <QFile>
 #include <QMutex>
 #include <QSettings>
 #include <QtGlobal>
+#include "logger.h"
+#include "logglobal.h"
 
 /**
   Logger that uses a text file for output. Settings are read from a
diff --git a/ThirdParty/QtWebApp/logging/logger.h b/ThirdParty/QtWebApp/logging/logger.h
index bd958c62d1..a7e9abb470 100644
--- a/ThirdParty/QtWebApp/logging/logger.h
+++ b/ThirdParty/QtWebApp/logging/logger.h
@@ -5,14 +5,14 @@
 
 #pragma once
 
-#include "logglobal.h"
-#include "logmessage.h"
 #include <QHash>
 #include <QMutex>
 #include <QObject>
 #include <QStringList>
 #include <QThreadStorage>
 #include <QtGlobal>
+#include "logglobal.h"
+#include "logmessage.h"
 
 /**
   Decorates and writes log messages to the console, stderr.
diff --git a/ThirdParty/QtWebApp/logging/logmessage.h b/ThirdParty/QtWebApp/logging/logmessage.h
index 745d8cd670..50461dff0e 100644
--- a/ThirdParty/QtWebApp/logging/logmessage.h
+++ b/ThirdParty/QtWebApp/logging/logmessage.h
@@ -5,10 +5,10 @@
 
 #pragma once
 
-#include "logglobal.h"
 #include <QHash>
 #include <QtCore/QDateTime>
 #include <QtGlobal>
+#include "logglobal.h"
 
 /**
   Represents a single log message together with some data
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice.cpp b/ThirdParty/QtWebApp/qtservice/qtservice.cpp
index 3f6bd46321..cf49a2eba3 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice.cpp
+++ b/ThirdParty/QtWebApp/qtservice/qtservice.cpp
@@ -39,12 +39,12 @@
 ****************************************************************************/
 
 #include "qtservice.h"
-#include "qtservice_p.h"
 #include <QCoreApplication>
 #include <QProcess>
 #include <QTimer>
 #include <QVector>
 #include <stdio.h>
+#include "qtservice_p.h"
 
 #if defined(QTSERVICE_DEBUG)
 #include <QDebug>
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice_p.h b/ThirdParty/QtWebApp/qtservice/qtservice_p.h
index a6725891da..50bfe10559 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice_p.h
+++ b/ThirdParty/QtWebApp/qtservice/qtservice_p.h
@@ -40,8 +40,8 @@
 
 #pragma once
 
-#include "qtservice.h"
 #include <QStringList>
+#include "qtservice.h"
 
 class QtServiceControllerPrivate
 {
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp b/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
index 9bb16b524c..50dbbae933 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
+++ b/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
@@ -38,10 +38,6 @@
 **
 ****************************************************************************/
 
-#include "qtservice.h"
-#include "qtservice_p.h"
-#include "qtunixserversocket.h"
-#include "qtunixsocket.h"
 #include <QCoreApplication>
 #include <QDir>
 #include <QFile>
@@ -58,6 +54,10 @@
 #include <sys/stat.h>
 #include <syslog.h>
 #include <unistd.h>
+#include "qtservice.h"
+#include "qtservice_p.h"
+#include "qtunixserversocket.h"
+#include "qtunixsocket.h"
 
 /** Alias type definition, for compatibility to different Qt versions */
 #if QT_VERSION >= 0x050000
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice_win.cpp b/ThirdParty/QtWebApp/qtservice/qtservice_win.cpp
index 10647199a8..842b926c77 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice_win.cpp
+++ b/ThirdParty/QtWebApp/qtservice/qtservice_win.cpp
@@ -38,8 +38,6 @@
 **
 ****************************************************************************/
 
-#include "qtservice.h"
-#include "qtservice_p.h"
 #include <QAbstractEventDispatcher>
 #include <QCoreApplication>
 #include <QDateTime>
@@ -54,6 +52,8 @@
 #include <QVector>
 #include <QWaitCondition>
 #include <qt_windows.h>
+#include "qtservice.h"
+#include "qtservice_p.h"
 #if QT_VERSION >= 0x050000
 #include <QAbstractNativeEventFilter>
 #endif
diff --git a/ThirdParty/QtWebApp/templateengine/template.h b/ThirdParty/QtWebApp/templateengine/template.h
index 98ee5355b2..5bc3cb1a6b 100644
--- a/ThirdParty/QtWebApp/templateengine/template.h
+++ b/ThirdParty/QtWebApp/templateengine/template.h
@@ -5,13 +5,12 @@
 
 #pragma once
 
-#include "templateglobal.h"
 #include <QFile>
 #include <QIODevice>
 #include <QRegExp>
 #include <QString>
-#include <QString>
 #include <QTextCodec>
+#include "templateglobal.h"
 
 /**
  Enhanced version of QString for template processing. Templates
diff --git a/ThirdParty/QtWebApp/templateengine/templatecache.h b/ThirdParty/QtWebApp/templateengine/templatecache.h
index d89111a20d..0efa0c33a4 100644
--- a/ThirdParty/QtWebApp/templateengine/templatecache.h
+++ b/ThirdParty/QtWebApp/templateengine/templatecache.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include <QCache>
 #include "templateglobal.h"
 #include "templateloader.h"
-#include <QCache>
 
 /**
   Caching template loader, reduces the amount of I/O and improves performance
diff --git a/ThirdParty/QtWebApp/templateengine/templateloader.h b/ThirdParty/QtWebApp/templateengine/templateloader.h
index e5b1b64ba4..a13329ff50 100644
--- a/ThirdParty/QtWebApp/templateengine/templateloader.h
+++ b/ThirdParty/QtWebApp/templateengine/templateloader.h
@@ -5,12 +5,12 @@
 
 #pragma once
 
-#include "template.h"
-#include "templateglobal.h"
 #include <QMutex>
 #include <QSettings>
 #include <QString>
 #include <QTextCodec>
+#include "template.h"
+#include "templateglobal.h"
 
 /**
   Loads localized versions of template files. If the caller requests a file with the
diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index a63a803ccb..f15595fb31 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -9,12 +9,12 @@
 
 namespace py = pybind11;
 
+#include "SIMPLib/Common/PhaseType.h"
+#include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
-#include "SIMPLib/Common/ShapeType.h"
-#include "SIMPLib/Common/PhaseType.h"
 
 using DataContainersMap = QMap<QString, DataContainerProxy>;
 using AttributeMatricesMap = QMap<QString, AttributeMatrixProxy>;
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
index 1fd1038f78..fee6ae8ccc 100644
--- a/Wrapping/Python/Binding/pySIMPLHeader.cpp
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -7,17 +7,17 @@
 
 #include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
-#include "pybind11/stl_bind.h"
 #include "pybind11/stl.h"
+#include "pybind11/stl_bind.h"
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/Common/ShapeType.h"
-#include "SIMPLib/Utilities/PythonSupport.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/FilterParameters/AxisAngleInput.h"
 #include "SIMPLib/FilterParameters/StackFileListInfo.h"
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
+#include "SIMPLib/Utilities/PythonSupport.h"
 
 namespace py = pybind11;
 using namespace py::literals;
diff --git a/Wrapping/Python/Binding/pySupport.h b/Wrapping/Python/Binding/pySupport.h
index b275a4c8e7..638f40d79a 100644
--- a/Wrapping/Python/Binding/pySupport.h
+++ b/Wrapping/Python/Binding/pySupport.h
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "pybind11/numpy.h"
 #include "pybind11/pybind11.h"
 #include "pybind11/stl.h"
-#include "pybind11/numpy.h"
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/DataArrays/DataArray.hpp"
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index d504e7faf4..dad6f76eb1 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -7,8 +7,8 @@
 #include "PythonBindingClass.h"
 
 #include "CodeScraper/CodeScraperConstants.h"
-#include "CodeScraper/SIMPLPyBind11Config.h"
 #include "CodeScraper/PythonUtils.h"
+#include "CodeScraper/SIMPLPyBind11Config.h"
 
 #define PYB11_TRUE 0
 //-----------------------------------------------------------------------------
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h b/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
index 3d09bddc23..abda6d564e 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
+++ b/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QtCore/QString>
 #include <QtCore/QRegularExpression>
+#include <QtCore/QString>
 
 namespace SIMPL
 {

From 6bff272a25ff3caba9a5e51afaa4fac1ee7e0e45 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 26 Oct 2020 12:42:31 -0400
Subject: [PATCH 309/397] Only encapsulate the needed class definition in the
 #ifndef

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/itkImageReaderHelper.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
index 956880f967..86b1a6676e 100644
--- a/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
+++ b/Source/SIMPLib/ITK/itkImageReaderHelper.cpp
@@ -6,8 +6,6 @@
  * The developer can use the SIMPLib/ITK/ITKImageReaderHelper.h file in thier header file
  */
 
-#ifndef ITK_IMAGE_READER_CLASS_NAME
-#define ITK_IMAGE_READER_CLASS_NAME Foo
 #include "SIMPLib/ITK/itkImageReaderHelper.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
@@ -17,6 +15,9 @@
 
 #include <itkImageFileReader.h>
 
+#ifndef ITK_IMAGE_READER_CLASS_NAME
+#define ITK_IMAGE_READER_CLASS_NAME Foo
+
 class ITK_IMAGE_READER_CLASS_NAME : public AbstractFilter
 {
 public:

From b5deab83304ace9fd29ae21a663abeb452ebe06e Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 26 Oct 2020 12:57:50 -0400
Subject: [PATCH 310/397] Added clang-format check GitHub workflow

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .github/workflows/clang-format.yml            | 23 +++++++++++++++++++
 .../{travis => }/run_clang_format_diff.sh     |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/clang-format.yml
 rename Support/Scripts/{travis => }/run_clang_format_diff.sh (93%)

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
new file mode 100644
index 0000000000..59087d88bc
--- /dev/null
+++ b/.github/workflows/clang-format.yml
@@ -0,0 +1,23 @@
+name: clang-format check
+
+on:
+  pull_request:
+    branches: [ develop ]
+  push:
+    branches: [ develop ]
+
+jobs:
+  clang_format_check:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+            fetch-depth: 2
+
+      - name: Run clang-format on diff
+        run: ./Support/Scripts/run_clang_format_diff.sh HEAD^ HEAD
diff --git a/Support/Scripts/travis/run_clang_format_diff.sh b/Support/Scripts/run_clang_format_diff.sh
similarity index 93%
rename from Support/Scripts/travis/run_clang_format_diff.sh
rename to Support/Scripts/run_clang_format_diff.sh
index ba7e21257d..5da64158a2 100755
--- a/Support/Scripts/travis/run_clang_format_diff.sh
+++ b/Support/Scripts/run_clang_format_diff.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
-DIFF=`git diff -U0 $1...$2 -- '*.h' '*.hpp' '*.cpp' | clang-format-diff-3.8 -p1`
+DIFF=`git diff -U0 $1...$2 -- '*.h' '*.hpp' '*.cpp' | clang-format-diff-9 -p1`
 if [ -z "$DIFF" ]; then
   exit 0
 else
   printf "ERROR: clang-format-diff detected formatting issues. Please run clang-format on your branch.\nThe following formatting changes are suggested:\n\n%s" "$DIFF"
   exit 1
-fi
\ No newline at end of file
+fi

From e7bff00c11f605ca762c105ead47929d008eb390 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 27 Oct 2020 15:59:21 -0400
Subject: [PATCH 311/397] Added default argument of None for Pythonic filter
 interface

* Allows the user to not have to specify filter parameters that
aren't needed
* Added Python parameter name to docstring in addition to C++ name
* Changed generated Python unit test to use assert

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Python/Binding/generate_python_bindings.py    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index e581b16508..411499c0ba 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -149,21 +149,23 @@ def generate_bindings(self) -> str:
 
   def generate_python_interface(self, module_name: str) -> str:
     arg_list = [replace_python_keywords(camel_to_snake(prop.name)) for prop in self.properties]
-    args_text = ', '.join(arg_list)
+    parameter_list = [f'{prop} = None' for prop in arg_list]
+    args_text = ', '.join(parameter_list)
     if args_text:
       args_text = ', ' + args_text
     code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}):\n'
     code += '  \"\"\"\n'
     code += f'  {self.name}\n\n'
-    code += '  :param DataContainerArray data_container_array\n'
-    for prop in self.properties:
-      code += f'  :param {prop.type} {prop.name}\n'
+    code += '  :param data_container_array | DataContainerArray\n'
+    for prop, arg in zip(self.properties, arg_list):
+      code += f'  :param {arg} | {prop.type} {prop.name}\n'
     code += ' \"\"\"\n\n'
     code += f'  filter = {module_name}.{self.name}()\n'
     code += f'  filter.setDataContainerArray(data_container_array)\n'
 
     for prop, arg in zip(self.properties, arg_list):
-      code += f'  filter.{prop.name} = {arg}\n'
+      code += f'  if {arg} is not None:\n'
+      code += f'    filter.{prop.name} = {arg}\n'
 
     code += '  filter.execute()\n'
     code += '  return filter.ErrorCode\n\n'
@@ -173,8 +175,7 @@ def generate_unit_test_snippet(self, module_name: str) -> str:
     code = f'  print(\'# --- {self.name}\')\n'
     code += f'  filter = {module_name}.{self.name}()\n'
     code += f'  filter.preflight()\n'
-    code += f'  if filter.NameOfClass != \'{self.name}\':\n'
-    code += f'    print(\'  Error: Filter class name is not correct. %s != {self.name}\' % filter.NameOfClass)\n\n'
+    code += f'  assert filter.NameOfClass == \'{self.name}\', f\'Error: Filter class name is not correct. {{filter.NameOfClass}} != {self.name}\'\n\n'
     return code
 
 def replace_python_keywords(text: str) -> str:

From 6ba3eb1cc6c46402ca5c17af171f757bc82ac61e Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 18 Nov 2020 17:00:13 -0500
Subject: [PATCH 312/397] Fix compiler warnings about making copies in loops

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp          | 2 +-
 Source/SIMPLib/DataContainers/DataArrayProxy.cpp                | 2 +-
 Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp       | 2 +-
 .../MultiDataContainerSelectionFilterParameter.cpp              | 2 +-
 Source/SIMPLib/Filtering/FilterManager.cpp                      | 2 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
index bed0cecb5d..3a751c7d25 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.cpp
@@ -134,7 +134,7 @@ QJsonArray AttributeMatrixProxy::writeMap(const QMap<QString, DataArrayProxy>& m
 QMap<QString, DataArrayProxy> AttributeMatrixProxy::readMap(QJsonArray jsonArray)
 {
   QMap<QString, DataArrayProxy> map;
-  for(const auto& val : jsonArray)
+  for(const auto val : jsonArray)
   {
     if(val.isObject())
     {
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
index 5cedb490bd..bc611f2513 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.cpp
@@ -214,7 +214,7 @@ QJsonArray DataArrayProxy::writeVector(const std::vector<size_t>& vector) const
 std::vector<size_t> DataArrayProxy::readVector(QJsonArray jsonArray)
 {
   std::vector<size_t> vector;
-  for(const auto& val : jsonArray)
+  for(const auto val : jsonArray)
   {
     if(val.isDouble())
     {
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 85e450f27f..567f7d903f 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -520,7 +520,7 @@ QJsonArray DataContainerArrayProxy::writeMap(const QMap<QString, DataContainerPr
 QMap<QString, DataContainerProxy> DataContainerArrayProxy::readMap(QJsonArray jsonArray)
 {
   QMap<QString, DataContainerProxy> map;
-  for(const auto& val : jsonArray)
+  for(const auto val : jsonArray)
   {
     if(val.isObject())
     {
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 7b9683efb5..bfd2b64a4c 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -175,7 +175,7 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   {
     QJsonArray arrayObj = jsonValue.toArray();
     QStringList dcList;
-    for(const auto& obj : arrayObj)
+    for(const auto obj : arrayObj)
     {
       QString dcName = obj.toString();
       dcList.push_back(dcName);
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 348a9274a5..21408754c9 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -108,7 +108,7 @@ FilterManager::Collection FilterManager::getFactories() const
 void FilterManager::printFactoryNames() const
 {
   QList<QString> keys = m_Factories.keys();
-  for(auto const key : keys)
+  for(const auto& key : keys)
   {
     qDebug() << "Name: " << key << "\n";
   }
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index a0a746b9ce..7603ece75e 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -96,7 +96,7 @@ class ColorPresets::vtkInternals
       }
 
       QJsonArray allPresets = doc.array();
-      for(const auto& preset : allPresets)
+      for(const auto preset : allPresets)
       {
         QJsonObject obj = preset.toObject();
         if((obj["ColorSpace"].toString() == "RGB")

From f4f2a7243ed2b2ce6f8e9918198a0693d0074e39 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 24 Nov 2020 10:33:49 -0500
Subject: [PATCH 313/397] Pybind11 introduced more verbose Find messages. Turn
 off by default

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Binding/CreatePybind11Module.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index bbb2ba5242..22b863f387 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -75,6 +75,7 @@ function(CreatePybind11Module)
   set(multiValueArgs LINK_LIBRARIES INCLUDE_DIRS)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
+  set(pybind11_FIND_QUIETLY TRUE)
   find_package(pybind11 REQUIRED)
 
   set(PLUGIN_ARG "")

From 408183a4fa29206f83b83e3cbd00de02fda44280 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 24 Nov 2020 10:53:45 -0500
Subject: [PATCH 314/397] Fix bad signal/slot hookup that was declared in the
 .ui file.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../QtSupport/QtSApplicationAboutBoxDialog.cpp |  6 ++++++
 .../QtSupport/QtSApplicationAboutBoxDialog.h   |  2 ++
 .../UI_Files/QtSApplicationAboutBoxDialog.ui   | 18 ------------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
index e008181224..216263da97 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
@@ -94,6 +94,12 @@ void QtSApplicationAboutBoxDialog::on_licenseCombo_currentIndexChanged(int index
   loadResourceFile(resourceFile);
 }
 
+// -----------------------------------------------------------------------------
+void QtSApplicationAboutBoxDialog::on_okButton_clicked()
+{
+  this->close();
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
index 0cc1a74f10..e70719c141 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
@@ -75,6 +75,8 @@ class SVWidgetsLib_EXPORT QtSApplicationAboutBoxDialog : public QDialog, private
 
 protected slots:
   void on_licenseCombo_currentIndexChanged(int index);
+  
+  void on_okButton_clicked();
 
 protected:
   /**
diff --git a/Source/SVWidgetsLib/QtSupport/UI_Files/QtSApplicationAboutBoxDialog.ui b/Source/SVWidgetsLib/QtSupport/UI_Files/QtSApplicationAboutBoxDialog.ui
index 983b0bbf82..86ff4e877a 100755
--- a/Source/SVWidgetsLib/QtSupport/UI_Files/QtSApplicationAboutBoxDialog.ui
+++ b/Source/SVWidgetsLib/QtSupport/UI_Files/QtSApplicationAboutBoxDialog.ui
@@ -138,22 +138,4 @@
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>okButton</sender>
-   <signal>clicked()</signal>
-   <receiver>ApplicationAboutBoxDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>243</x>
-     <y>222</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>444</x>
-     <y>221</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
 </ui>

From d9ca796275d6407db564c046f54be5e4837934c8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 25 Nov 2020 14:14:16 -0500
Subject: [PATCH 315/397] Adding a new Dark mode theme file that should better
 match macOS dark theme.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Resources/SIMPL.qrc                           |   3 +
 .../SIMPL/StyleSheets/Default_DarkMode.css    | 334 ++++++++++++++++++
 .../SIMPL/StyleSheets/Default_DarkMode.json   | 202 +++++++++++
 Source/SVWidgetsLib/CMakeLists.txt            |   1 +
 4 files changed, 540 insertions(+)
 create mode 100644 Resources/SIMPL/StyleSheets/Default_DarkMode.css
 create mode 100644 Resources/SIMPL/StyleSheets/Default_DarkMode.json

diff --git a/Resources/SIMPL.qrc b/Resources/SIMPL.qrc
index fd8eba37e2..e25acd621b 100644
--- a/Resources/SIMPL.qrc
+++ b/Resources/SIMPL.qrc
@@ -26,6 +26,9 @@
     <file>SIMPL/StyleSheets/Default.css</file>
     <file>SIMPL/StyleSheets/Default.json</file>
 
+    <file>SIMPL/StyleSheets/Default_DarkMode.css</file>
+    <file>SIMPL/StyleSheets/Default_DarkMode.json</file>
+
     <!-- Icon Resources -->
     <file>SIMPL/icons/images/expand_all.png</file>
     <file>SIMPL/icons/images/expand_all@2x.png</file>
diff --git a/Resources/SIMPL/StyleSheets/Default_DarkMode.css b/Resources/SIMPL/StyleSheets/Default_DarkMode.css
new file mode 100644
index 0000000000..459c1f8134
--- /dev/null
+++ b/Resources/SIMPL/StyleSheets/Default_DarkMode.css
@@ -0,0 +1,334 @@
+/* STYLESHEET=DEFAULT */
+
+/* ----------------------------------------------------------------------------
+* QGroupBox Section
+* ----------------------------------------------------------------------------*/
+QGroupBox::title
+{
+    /* height: 185px; */
+    subcontrol-origin: margin;
+    subcontrol-position: top left;
+    padding: 0 0px;
+}
+
+QGroupBox
+{
+    font-family: "Lato-Bold";
+    font-weight: bold;
+    font-size: 16px;
+}
+
+
+/* ----------------------------------------------------------------------------
+* Section
+* ----------------------------------------------------------------------------*/
+SVSmallLabel
+{
+    font-style:italic;
+    font-size: Font_Size_Small;
+}
+
+DataArrayPathSelectionWidget 
+{
+    /* font-family: "Lato";
+    font-weight: normal; */
+    font-size: Font_Size_Small;
+    border: 1px solid QLineEdit_border_color;
+    border-radius: 5px;
+    background-color: QToolButton_background_color;
+    padding-left: 0px;
+    padding-right: 4px;
+    padding-top: 2px;
+    padding-bottom: 2px;
+}
+
+DataArrayPathSelectionWidget:disabled
+{
+  background-color: QToolButtonDisabled_background_color;
+}
+
+/*
+ * State: { Normal, Active, NotFound, DragEnabled, DragDisabled }
+ * PathType: { DataContainer, AttributeMatrix, DataArray, None }
+ */
+DataArrayPathSelectionWidget[State="0"]
+{ 
+  border-color: DataArrayPath_border_normal;
+}
+DataArrayPathSelectionWidget[State="1"][PathType="0"]
+{ 
+  border-color: DataArrayPath_DataContainer_color;
+}
+DataArrayPathSelectionWidget[State="1"][PathType="1"]
+{ 
+  border-color: DataArrayPath_AttributeMatrix_color;
+}
+DataArrayPathSelectionWidget[State="1"][PathType="2"]
+{ 
+  border-color: DataArrayPath_DataArray_color;
+}
+DataArrayPathSelectionWidget[State="2"]
+{ 
+  border-color : DataArrayPath_border_not_found;
+}
+DataArrayPathSelectionWidget[State="3"]
+{ 
+  border-color: DataArrayPath_border_drag_enabled;
+}
+DataArrayPathSelectionWidget[State="4"]
+{ 
+  border-color: DataArrayPath_border_drag_disabled;
+}
+
+DataArrayPathSelectionWidget:checked[PathType="0"]
+{ 
+  background-color: DataArrayPath_DataContainer_background_color;
+}
+DataArrayPathSelectionWidget:checked[PathType="1"]
+{ 
+  background-color: DataArrayPath_AttributeMatrix_background_color;
+}
+DataArrayPathSelectionWidget:checked[PathType="2"]
+{ 
+  background-color: DataArrayPath_DataArray_background_color;
+}
+
+DataArrayPathSelectionWidget::menu-indicator {
+ subcontrol-origin: content;
+ subcontrol-position:  right; /* */
+}
+DataArrayPathSelectionWidget::menu-indicator:pressed, DataArrayPathSelectionWidget::menu-indicator:open {
+ position: relative;
+}
+DataArrayPathSelectionWidget:flat {
+ border: none;
+}
+
+DataArrayPathSelectionWidget > QToolTip {
+  border: 2px solid #434343;
+  padding: 2px;
+  border-radius: 3px;
+  opacity: 255;
+  background-color: #FFFCEA;
+  color: #000000;
+ }
+
+DataPathLabel {
+    font-family: "Lato-Bold";
+    font-weight: bold;
+    font-size: Font_Size_Small;
+    border-radius: 4px;
+}
+DataPathLabel:disabled {
+    color: DataPathLabel_Disabled_color;
+}
+DataPathLabel:enabled[DataTypei="0"] {
+    color: DataArrayPath_DataContainer_color;
+}
+DataPathLabel:enabled[DataTypei="1"] {
+    color: DataArrayPath_AttributeMatrix_color;
+}
+DataPathLabel:enabled[DataTypei="2"] {
+    color: DataArrayPath_DataArray_color;
+}
+
+/* ----------------------------------------------------------------------------
+* SVPushButton Section
+* ----------------------------------------------------------------------------*/
+SVIconPushButton 
+{
+    background-repeat: no-repeat;
+    background-position: center center;
+    padding-left: 0px;
+    padding-top: 0px;
+}
+
+SVIconPushButton:hover 
+{
+    border: 1px solid;
+    border-radius: 5px;
+    border-color: rgb(190, 190, 190);
+    background-color: rgb(190, 190, 190);
+}
+
+SVIconPushButton:pressed
+{
+    border: 1px solid;
+    border-radius: 5px;
+    border-color: rgb(170, 170, 170);
+    background-color: rgb(170, 170, 170);
+    padding-left: 2px;
+    padding-top: 2px;
+}
+
+SVIconPushButton:disabled
+{
+    border: 1px solid;
+    border-radius: 5px;
+    border-color: rgb(130, 130, 130);
+    background-color: rgb(130, 130, 130);
+    padding-left: 0px;
+    padding-top: 0px; 
+}
+
+FilterParameterWidget
+{
+    margin: 2px;
+    background-position: top left;
+    background-origin: content;
+    background-clip: margin;
+}
+
+/* This is here for the search box at the top of the FilterLibrary */
+QtSLineEdit#filterSearch
+{
+    border-radius: 0;
+    min-height: 24;
+}
+
+/* ****************************************************************************
+*
+******************************************************************************/
+QwtPlot
+{
+    background-color: white;
+    border: 1px solid #6b6b6b;
+    border-radius: 5px;
+}
+
+QwtPlotCanvas
+{
+    background-color: white;
+}
+
+QwtPlotGLCanvas
+{
+    border: 1px solid white;
+    background-color: #616d7e;
+}
+
+QwtScaleWidget
+{
+    color: black;
+}
+
+QwtTextLabel#QwtPlotTitle
+{
+    color: black;
+    padding: 0px;
+    margin: 0px;
+}
+
+QwtTextLabel#QwtPlotFooter
+{
+    color: black;
+}
+
+QwtLegend
+{
+    border: 1px solid black;
+    border-radius: 0px;
+    padding: 2px;
+    background: #616d7e;
+}
+
+QwtLegendLabel
+{
+    color: black;
+}
+
+/* ----------------------------------------------------------------------------
+* QTableView Section
+* ----------------------------------------------------------------------------*/
+QTableView
+{
+    font-family: "Lato";
+    color: #b1b1b1;
+    font-size: Font_Size_Small;
+    background: rgb-primary-2;
+    outline: none;  /* removes the "focus rect" */
+    border: 1px solid rgb( 68,  89, 100);
+}
+QTableView::item 
+{
+   padding: 2 0 2 0px;
+   border-top-color: transparent;
+   border-bottom-color: transparent;
+   border: 0px solid transparent;
+   color: #b1b1b1;
+}
+
+QTableView::item:selected 
+{
+    background:  rgb-primary-2;
+    color: rgb-primary-0;
+}
+
+/* ----------------------------------------------------------------------------
+* QTableWidget Section
+* ----------------------------------------------------------------------------*/
+
+/* See QHeaderView on how to style the QTableWidget header */
+QTableWidget
+{
+    font-family: "Lato";
+    color: #b1b1b1;
+    font-size: Font_Size_Small;
+    background: rgb-primary-2;
+    outline: none;  /* removes the "focus rect" */
+    border: 1px solid rgb-primary-3;
+}
+
+QTableWidget::item:selected 
+{
+    background:  rgb-primary-3;
+    color: #F1F1F1;
+}
+
+QTableWidget::item 
+{
+}
+
+QTableWidget::item:hover 
+{
+    background:  rgb-primary-3;
+    border: 0px;
+}
+
+QTableWidget::item:selected:hover 
+{
+    background:  rgb-primary-3;
+    color: #F1F1F1;
+}
+
+QTableView QTableCornerButton::section 
+{
+    background-color: QHeaderView_background_color;
+}
+
+/* ----------------------------------------------------------------------------
+* QTextEdit Section
+* ----------------------------------------------------------------------------*/
+QTextEdit
+{
+    background-color: QLineEdit_background_color;
+    color: QLineEdit_color;
+}
+
+QTextEdit:focus
+{
+    /* border: 1px solid rgb-primary-0;
+    background-color: #3F3F3F; */
+}
+
+QTextEdit:disabled
+{
+    color: QLineEdit_color;
+    background-color: QLineEditDisabled_background_color;
+}
+
+StandardOutputWidget
+{
+  background-color: QLineEdit_background_color;
+  color: QLineEdit_color;
+}
\ No newline at end of file
diff --git a/Resources/SIMPL/StyleSheets/Default_DarkMode.json b/Resources/SIMPL/StyleSheets/Default_DarkMode.json
new file mode 100644
index 0000000000..3dd9841f1b
--- /dev/null
+++ b/Resources/SIMPL/StyleSheets/Default_DarkMode.json
@@ -0,0 +1,202 @@
+{
+  "Theme_Name": "Default Dark",
+  "CSS_File_Name": "Default_DarkMode.css",
+
+  "_comment1": "The next set of colors MUST be in HEX notation as they are being converted to a QColor",
+  "FilterBackgroundColor" : "#5b337a",
+  "FilterSelectionColor" : "#A788Be",
+  "FilterFontColor" : "#DDDDDD",
+
+  "Named_Variables":
+  {
+    "white" : "rgb(255,255,255)",
+    "black" : "rgb(0,0,0)",
+    "light_gray": "rgb(239,239,239)",
+    "light_yellow": "rgb(255,252,225)",
+    "light_yellow_disabled": "rgb(141,141,140)",
+
+    "rgb-primary-0" : "#1e1e1e",
+    "rgb-primary-1" : "#252526",
+    "rgb-primary-2" : "#333333",
+    "rgb-primary-3" : "#444444",
+    
+    "rgb-complement-0" : "#d7801a",
+    "rgb-complement-1" : "#d77300",
+    "rgb-complement-2" : "#b1b1b1",
+    "rgb-complement-3" : "#F6F6F6",
+    "rgb-complement-4" : "#ACACAC",
+    "rgb-complement-5" : "#C0C0C0",
+    "rgb-complement-6" : "#75450e"
+  },
+
+  "Font_Replacements":
+  {
+    "macOS":
+    {
+      "Font_Size_Very_Small": "10pt",
+      "Font_Size_Small": "12pt",
+      "Font_Size_Medium": "13pt",
+      "Font_Size_Large": "14pt",
+      "Font_Size_Very_Large": "16pt"
+    },
+    "Windows":
+    {
+      "Font_Size_Very_Small": "8pt",
+      "Font_Size_Small": "9pt",
+      "Font_Size_Medium": "10pt",
+      "Font_Size_Large": "11pt",
+      "Font_Size_Very_Large": "14pt"
+    },
+    "Linux":
+    {
+      "Font_Size_Very_Small": "9pt",
+      "Font_Size_Small": "10pt",
+      "Font_Size_Medium": "11pt",
+      "Font_Size_Large": "12pt",
+      "Font_Size_Very_Large": "14pt"
+    }
+  },
+  
+  "CSS_Replacements": {
+    "_comment2" : "These colors can be in any standard CSS notation.",
+    "rgb-primary-0" : "rgb-primary-0",
+    "rgb-primary-1" : "rgb-primary-1",
+    "rgb-primary-2" : "rgb-primary-2",
+    "rgb-primary-3" : "rgb-primary-3",
+
+    "rgb-complement-0" : "rgb-complement-0",
+    "rgb-complement-1" : "rgb-complement-1",
+    "rgb-complement-2" : "rgb-complement-2",
+    "rgb-complement-3" : "rgb-complement-3",
+    "rgb-complement-4" : "rgb-complement-4",
+    "rgb-complement-5" : "rgb-complement-5",
+    "rgb-complement-6" : "rgb-complement-6",
+
+    "Fader_color" : "rgb-complement-2",
+    "QLabel_color" : "rgb-complement-4",
+    "Widget_Error_color": "rgb(25,0,0)",
+    "QLineEditError_background_color": "rgb(100, 50, 50)",
+    "Text_Error_color": "rgb(200, 65, 65)",
+
+    "CentralWidget_background_color" : "rgb-primary-0",
+    "FilterInputWidget_background_color": "rgb-primary-0",
+    "QScrollArea_background_color": "rgb-primary-0",
+    "VariablesTabContents_background_color": "rgb-primary-0",
+    
+    "FilterParameterWidget_background_color": "rgb-primary-0",
+    "FilterParameterWidget_border_color": "rgb-primary-2",
+    
+    "QDockWidget_border_color" : "rgb-primary-2",
+    "QDockWidget_color": "rgb-complement-0",
+    "QDockWidgetTitle_background_color": "rgb-primary-0",
+    "QDockWidgetTitle_color": "white",
+    
+    "SIMPLViewPipelineDockWidgetTitle_inactive_background_color": "rgb-complement-3",
+    "SIMPLViewPipelineDockWidgetTitle_inactive_text_color": "rgb-complement-4",
+    
+    "QListView_background_color": "rgb-primary-0",
+    "QListView_color": "rgb-complement-5",
+    "QListViewItemHover_background_color": "rgb-primary-1",
+    "QListViewItemHover_color": "rgb-complement-1",
+    "QListViewItemSelected_background_color": "rgb-primary-2",
+    "QListViewItemSelected_color": "rgb-complement-5",
+
+    "QMainWindowSeparator_background_color" : "rgb-primary-0",
+
+    "QMenuBar_background_color": "rgb-primary-0",
+    "QMenuBarItem_color" : "white",
+    "QMenuBarItemPressed_color" : "rgb-complement-2",
+    "QMenuBarItemSelected_background_color" : "rgb( 93, 114, 126)",
+    "QMenuBarItemSelected_color": "rgb-complement-5",
+
+    "QMenu_background_color": "rgb-primary-2",
+    "QMenu_color": "rgb-complement-5",
+    "QMenuItemSelected_background_color": "#4F4F4F",
+    "QMenuItemDisabled_background_color": "rgb-primary-2",
+    "QMenuItemSelected_color": "white",
+    
+    "QPushButtonPressed_background_color": "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #505050, stop:1 #808080)",
+    "QPushButton_border_color":            "rgb-primary-1",
+    "QPushButtonHover_background_color":   "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #808080, stop:1 #505050)",
+    "QPushButton_background_color":        "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #808080, stop:1 #505050)",
+    
+    "QSplitter_handle_start_color": "rgb-primary-0",
+    "QSplitter_handle_end_color": "rgb-primary-1",
+
+    "QToolButton_background_color": "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #333333, stop:1 #1e1e1e)",
+    "QToolButton_color": "rgb-complement-1",
+    "QToolButton_border_color": "rgb-complement-4",
+    "QToolButtonChecked_background_color": "rgb(200,236,255)",
+    "QToolButtonDisabled_background_color": "disabled_color",
+    "QToolButtonDisabled_color": "disabled_text_color",
+
+    "QStatusBar_border_color": "rgb-primary-2",
+
+    "QTableWidget_color": "rgb-complement-2",
+    "QTableWidget_selected_background_color": "rgb-complement-2",
+    "QHeaderView_background_color": "rgb-primary-0",
+    "QHeaderView_border_color": "rgb-complement-4",
+    "QHeaderView_color": "rgb-complement-2",
+    "QHeaderViewDisabled_background_color": "disabled_color",
+    "QHeaderViewDisabled_border_color": "disabled_text_color",
+    "QHeaderViewDisabled_color": "disabled_text_color",
+
+    "QTabWidgetPane_border_color": "rgb-complement-2",
+    "QTabWidgetPane_background_color": "rgb-primary-0",
+    "QTabBarTab_border_color": "rgb-complement-2",
+    "QTabBarTabSelected_background_color": "#413930",
+    "QTabBarTabSelected_color":"rgb-complement-0",
+    "QTabBarTabNotSelected_background_color": "rgb-primary-1",
+    "QTabBarTabNotSelectedHover_background_color": "rgb-primary-2",
+
+    "QTextEdit_background_color": "black",
+    "QTextEdit_color": "white",
+
+    "QLineEdit_color": "rgb-complement-2",
+    "QLineEdit_background_color": "#2e2e2e",
+    "QLineEdit_border_color": "rgb-complement-2",
+    "QLineEditDisabled_background_color": "disabled_color",
+
+    "QSpinBoxArrow_background_color": "rgb(70,124,214)",
+    "QSpinBoxArrow_hover_background_color": "rgb(98,145,224)",
+
+    "QToolBar_background_color": "rgb(240,248,253)",
+    "QToolBar_border_color": "rgb(64,119,149)",
+
+    "QTreeView_background_color": "rgb-primary-1",
+    "QTreeViewItem_background_color": "rgb-primary-1",
+    "QTreeViewItem_color": "rgb-complement-5",
+    "QTreeViewBranch_background_color": "rgb-primary-1",
+    "QTreeViewBranchSelectedActive_background_color": "rgb-primary-1",
+    "QTreeViewBranchSelectedNotActive_background_color": "rgb-primary-2",
+    "QTreeViewItemHover_background_color": "rgb-primary-2",
+    "QTreeViewItemHover_color": "rgb-complement-5",
+    "QTreeViewBranchHover_background_color": "rgb-primary-2",
+    "QTreeViewBranchHover_color": "rgb-complement-5",
+    "QTreeViewItemSelectedActive_background_color": "rgb-primary-1",
+    "QTreeViewItemSelectedActive_color": "rgb-complement-2",
+    "QTreeViewItemSelectedNotActive_background_color": "rgb-primary-2",
+    "QTreeViewItemSelectedNotActive_color": "rgb-complement-1",
+    "QTreeViewItem_error_color": "#FF0000",
+    "QTreeViewItem_error_background_color": "#00FFFFFF",
+
+    "DataArrayPath_DataContainer_color": "#56c551",
+    "DataArrayPath_AttributeMatrix_color": "#a96bdb",
+    "DataArrayPath_DataArray_color": "#3a89e9",
+    "DataArrayPath_Invalid_color": "#dddddd",
+
+    "DataArrayPath_DataContainer_background_color": "#507F4E",
+    "DataArrayPath_AttributeMatrix_background_color": "#886CA0",
+    "DataArrayPath_DataArray_background_color": "#2E527F",
+    "DataArrayPath_Invalid_background_color": "#FFFFFF",
+
+    "DataArrayPath_border_normal": "#8f8f91",
+    "DataArrayPath_border_not_found": "#AA4444",
+    "DataArrayPath_border_drag_enabled": "#009104",
+    "DataArrayPath_border_drag_disabled": "#BC0000",
+
+    "DataPathLabel_color": "rgb-complement-5",
+    "DataPathLabel_Disabled_color": "disabled_text_color"
+  }
+
+}
diff --git a/Source/SVWidgetsLib/CMakeLists.txt b/Source/SVWidgetsLib/CMakeLists.txt
index 34d5038bb7..752e8da41f 100755
--- a/Source/SVWidgetsLib/CMakeLists.txt
+++ b/Source/SVWidgetsLib/CMakeLists.txt
@@ -90,6 +90,7 @@ cmp_IDE_GENERATED_PROPERTIES("Generated" "${${PROJECT_NAME}_Generated_HDRS}" "${
 # -- Add the resources into the resource system
 QT5_ADD_RESOURCES( SVWidgetsLib_Generated_RC_SRCS "${SIMPLProj_SOURCE_DIR}/Resources/SIMPL.qrc")
 
+
 foreach(h ${SVWidgetsLib_Generated_RC_SRCS})
   set_property(SOURCE ${h} PROPERTY SKIP_AUTOMOC ON)
 endforeach()

From b736cfed64d6ddcc4f4700e032b1ffbffeac28d8 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 28 Dec 2020 10:56:52 -0500
Subject: [PATCH 316/397] NeighborList code updates. Template macros moved
 around. Unit test updated.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/TemplateHelpers.h       | 64 ++++++++++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |  2 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |  7 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  6 +-
 Source/SIMPLib/DataArrays/NeighborList.cpp    | 88 ++++++++++++++++++-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  8 ++
 .../SIMPLib/ITK/Dream3DTemplateAliasMacro.h   | 50 -----------
 7 files changed, 164 insertions(+), 61 deletions(-)

diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 7bc71ec4c0..95696c19b0 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -58,6 +58,70 @@ using IDataArrayShPtr = std::shared_ptr<IDataArray>;
 namespace TemplateHelpers
 {
 
+/**
+ * @brief This macro does NOT include the 'bool' type due to some templated classes not being able
+ * to template over the 'bool' type.
+ */
+#define EXECUTE_FUNCTION_TEMPLATE_NO_BOOL(IDataArraySubClass, observableObj, templateName, inputData, ...)                                                                                             \
+  if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<float>>()(inputData))                                                                                                                          \
+  {                                                                                                                                                                                                    \
+    templateName<float>(__VA_ARGS__);                                                                                                                                                                  \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<double>>()(inputData))                                                                                                                    \
+  {                                                                                                                                                                                                    \
+    templateName<double>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<int8_t>>()(inputData))                                                                                                                    \
+  {                                                                                                                                                                                                    \
+    templateName<int8_t>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<uint8_t>>()(inputData))                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    templateName<uint8_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<int16_t>>()(inputData))                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    templateName<int16_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<uint16_t>>()(inputData))                                                                                                                  \
+  {                                                                                                                                                                                                    \
+    templateName<uint16_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<int32_t>>()(inputData))                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    templateName<int32_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<uint32_t>>()(inputData))                                                                                                                  \
+  {                                                                                                                                                                                                    \
+    templateName<uint32_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<int64_t>>()(inputData))                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    templateName<int64_t>(__VA_ARGS__);                                                                                                                                                                \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<uint64_t>>()(inputData))                                                                                                                  \
+  {                                                                                                                                                                                                    \
+    templateName<uint64_t>(__VA_ARGS__);                                                                                                                                                               \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<size_t>>()(inputData))                                                                                                                    \
+  {                                                                                                                                                                                                    \
+    templateName<size_t>(__VA_ARGS__);                                                                                                                                                                 \
+  }                                                                                                                                                                                                    \
+  else if(TemplateHelpers::CanDynamicCast<IDataArraySubClass<bool>>()(inputData))                                                                                                                      \
+  {                                                                                                                                                                                                    \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, "Boolean input arrays are not supported");                                                 \
+  }                                                                                                                                                                                                    \
+  else                                                                                                                                                                                                 \
+  {                                                                                                                                                                                                    \
+    QString msg;                                                                                                                                                                                       \
+    QTextStream out(&msg);                                                                                                                                                                             \
+    out << "The input array " << inputData->getDataArrayPath().serialize("/") << " is not a supported type. Type is: " << inputData->getNameOfClass() << "<" << inputData->getTypeAsString() << ">";   \
+    observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, msg);                                                                                      \
+  }
+
+/**
+ * @brief This macro includes the 'bool' type.
+ */
 #define EXECUTE_FUNCTION_TEMPLATE(observableObj, templateName, inputData, ...)                                                                                                                         \
   if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
   {                                                                                                                                                                                                    \
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index 2b5298a813..feecf71bf3 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -2,6 +2,7 @@
 set(TEST_TESTFILES_DIR ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Testing/Cxx/TestFiles)
 
 set(TEST_${SUBDIR_NAME}_NAMES
+  WriteASCIIDataTest
   ApplyImageTransformsTest
   ArrayCalculatorTest
   CombineAttributeArraysTest
@@ -50,7 +51,6 @@ set(TEST_${SUBDIR_NAME}_NAMES
   ScaleVolumeTest
   SetOriginResolutionImageGeomTest
   SplitAttributeArrayTest
-  WriteASCIIDataTest
   WriteTriangleGeometryTest
 )
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index b197be9014..06d486da08 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -42,6 +42,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/TemplateHelpers.h"
 #include "SIMPLib/CoreFilters/WriteASCIIData.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/DataArrays/NeighborList.hpp"
@@ -147,7 +148,7 @@ class WriteASCIIDataTest
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
     err = writer->getErrorCode();
-    DREAM3D_REQUIRE(err < 0)
+    DREAM3D_REQUIRED(err, ==, TemplateHelpers::Errors::UnsupportedDataType)
 
     writer->execute();
     err = writer->getErrorCode();
@@ -159,7 +160,7 @@ class WriteASCIIDataTest
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
     err = writer->getErrorCode();
-    DREAM3D_REQUIRE(err < 0)
+    DREAM3D_REQUIRED(err, ==, TemplateHelpers::Errors::UnsupportedDataType)
 
     writer->execute();
     err = writer->getErrorCode();
@@ -171,7 +172,7 @@ class WriteASCIIDataTest
     writer->setSelectedDataArrayPaths(paths);
     writer->preflight();
     err = writer->getErrorCode();
-    DREAM3D_REQUIRE(err < 0)
+    DREAM3D_REQUIRED(err, ==, TemplateHelpers::Errors::UnsupportedDataType)
 
     writer->execute();
     err = writer->getErrorCode();
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index ecd1cc7011..036836e6f0 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -303,15 +303,15 @@ void WriteASCIIData::dataCheck()
       return;
     }
 
-    if(ptr.lock()->getTypeAsString().compare("NeighborList<T>") == 0)
+    if(ptr.lock()->getNameOfClass() == "NeighborList<T>")
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "NeighborList is unsupported when writing ASCII Data.");
     }
-    else if(ptr.lock()->getTypeAsString().compare("struct") == 0)
+    else if(ptr.lock()->getTypeAsString() == "struct")
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StructArray is unsupported when writing ASCII Data.");
     }
-    else if(ptr.lock()->getTypeAsString().compare("StatsDataArray") == 0)
+    else if(ptr.lock()->getTypeAsString() == "StatsDataArray")
     {
       setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "StatsDataArray is unsupported when writing ASCII Data.");
     }
diff --git a/Source/SIMPLib/DataArrays/NeighborList.cpp b/Source/SIMPLib/DataArrays/NeighborList.cpp
index 0da1cc9c15..6e2293b07f 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.cpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.cpp
@@ -284,11 +284,65 @@ void NeighborList<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
   }
 }
 
+// -----------------------------------------------------------------------------
+template <typename T>
+QString NeighborList<T>::getFullNameOfClass() const
+{
+  QString theType = getTypeAsString();
+  theType = "NeighborList<" + theType + ">";
+  return theType;
+}
+
 // -----------------------------------------------------------------------------
 template <typename T>
 QString NeighborList<T>::getTypeAsString() const
 {
-  return NeighborList<T>::ClassName();
+  if constexpr(std::is_same_v<T, int8_t>)
+  {
+    return "int8_t";
+  }
+  else if constexpr(std::is_same_v<T, uint8_t>)
+  {
+    return "uint8_t";
+  }
+  else if constexpr(std::is_same_v<T, int16_t>)
+  {
+    return "int16_t";
+  }
+  else if constexpr(std::is_same_v<T, uint16_t>)
+  {
+    return "uint16_t";
+  }
+  else if constexpr(std::is_same_v<T, int32_t>)
+  {
+    return "int32_t";
+  }
+  else if constexpr(std::is_same_v<T, uint32_t>)
+  {
+    return "uint32_t";
+  }
+  else if constexpr(std::is_same_v<T, int64_t>)
+  {
+    return "int64_t";
+  }
+  else if constexpr(std::is_same_v<T, uint64_t>)
+  {
+    return "uint64_t";
+  }
+  else if constexpr(std::is_same_v<T, float>)
+  {
+    return "float";
+  }
+  else if constexpr(std::is_same_v<T, double>)
+  {
+    return "double";
+  }
+  else if constexpr(std::is_same_v<T, bool>)
+  {
+    return "bool";
+  }
+
+  return "UnknownType";
 }
 
 // -----------------------------------------------------------------------------
@@ -762,14 +816,40 @@ ToolTipGenerator NeighborList<T>::getToolTipGenerator() const
 template <typename T>
 QString NeighborList<T>::getInfoString(SIMPL::InfoStringFormat format) const
 {
+  QLocale usa(QLocale::English, QLocale::UnitedStates);
+
+  QString info;
+  QTextStream ss(&info);
+
   if(format == SIMPL::HtmlFormat)
   {
-    return getToolTipGenerator().generateHTML();
+    ss << "<html><head></head>\n";
+    ss << "<body>\n";
+    ss << "<table cellpadding=\"4\" cellspacing=\"0\" border=\"0\">\n";
+    ss << "<tbody>\n";
+    ss << "<tr bgcolor=\"#FFFCEA\"><th colspan=2>Attribute Array Info</th></tr>";
+
+    ss << R"(<tr bgcolor="#E9E7D6"><th align="right">Name:</th><td>)" << getName() << "</td></tr>";
+
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Type:</th><td> NeighborList&lt;)" << getTypeAsString() << "&gt;</td></tr>";
+    QString numStr = usa.toString(static_cast<qlonglong>(getNumberOfTuples()));
+    ss << R"(<tr bgcolor="#FFFCEA"><th align="right">Number of Tuples:</th><td>)" << numStr << "</td></tr>";
+
+    ss << "</tbody></table>\n";
+    ss << "</body></html>";
   }
-  else
+  else if(format == SIMPL::MarkDown)
   {
+    ss << "+ Name: " << getName() << "\n";
+    ss << "+ Type: " << getTypeAsString() << "\n";
+    ss << "+ Num. Tuple: " << getNumberOfTuples() << "\n";
+    QString compDimStr = "(variable)";
+
+    ss << "+ Comp. Dims: " << compDimStr << "\n";
+    ss << "+ Total Elements:  " << m_Array.size() << "\n";
+    ss << "+ Minimum Memory: " << (m_Array.size() * sizeof(T)) << "\n";
   }
-  return QString();
+  return info;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 8cc73732b6..cede348fa8 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -184,6 +184,14 @@ class NeighborList : public IDataArray
    */
   void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
 
+  /**
+   * @brief Returns the HDF Type for a given primitive value.
+   * @param value A value to use. Can be anything. Just used to get the type info
+   * from
+   * @return The HDF5 native type for the value
+   */
+  QString getFullNameOfClass() const;
+
   /**
    * @brief getTypeAsString
    * @return
diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 0373a212f1..59bdc33a7d 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -88,56 +88,6 @@
 #include <itkImageIOBase.h>
 #endif
 
-#define EXECUTE_FUNCTION_TEMPLATE_NO_BOOL(observableObj, templateName, inputData, ...)                                                                                                                 \
-  if(TemplateHelpers::CanDynamicCast<FloatArrayType>()(inputData))                                                                                                                                     \
-  {                                                                                                                                                                                                    \
-    templateName<float>(__VA_ARGS__);                                                                                                                                                                  \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<DoubleArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    templateName<double>(__VA_ARGS__);                                                                                                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int8ArrayType>()(inputData))                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    templateName<int8_t>(__VA_ARGS__);                                                                                                                                                                 \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt8ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    templateName<uint8_t>(__VA_ARGS__);                                                                                                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int16ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    templateName<int16_t>(__VA_ARGS__);                                                                                                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt16ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    templateName<uint16_t>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int32ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    templateName<int32_t>(__VA_ARGS__);                                                                                                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt32ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    templateName<uint32_t>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<Int64ArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    templateName<int64_t>(__VA_ARGS__);                                                                                                                                                                \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<UInt64ArrayType>()(inputData))                                                                                                                               \
-  {                                                                                                                                                                                                    \
-    templateName<uint64_t>(__VA_ARGS__);                                                                                                                                                               \
-  }                                                                                                                                                                                                    \
-  else if(TemplateHelpers::CanDynamicCast<SizeTArrayType>()(inputData))                                                                                                                                \
-  {                                                                                                                                                                                                    \
-    templateName<size_t>(__VA_ARGS__);                                                                                                                                                                 \
-  }                                                                                                                                                                                                    \
-  else                                                                                                                                                                                                 \
-  {                                                                                                                                                                                                    \
-    observableObj->setErrorCondition(TemplateHelpers::Errors::UnsupportedDataType, "The input array was of unsupported type");                                                                         \
-  }
-
 //--------------------------------------------------------------------------
 // Allow individual switching of support for each scalar size/signedness and
 // pixel type.

From 99bdc3d2b857e64872895db37214a2f693bbf7e1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 6 Jan 2021 09:15:57 -0500
Subject: [PATCH 317/397] Use constants that are within the range of the type
 being tested.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 6d4e92d3d3..165e1069f3 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -1463,11 +1463,11 @@ true);
   // -----------------------------------------------------------------------------
   void TestByteSwapElements()
   {
-    TestByteSwapElementType<uint8_t>(0xAB);
-    TestByteSwapElementType<int8_t>(static_cast<int8_t>(0xAB));
+    TestByteSwapElementType<uint8_t>(0x7F);
+    TestByteSwapElementType<int8_t>(static_cast<int8_t>(0x7F));
 
     TestByteSwapElementType<uint16_t>(0xABCD);
-    TestByteSwapElementType<int16_t>(static_cast<int16_t>(0xABCD));
+    TestByteSwapElementType<int16_t>(static_cast<int16_t>(0x8ACF));
 
     TestByteSwapElementType<uint32_t>(0x55ABCDEF);
     TestByteSwapElementType<int32_t>(0x55ABCDEF);
@@ -1476,7 +1476,7 @@ true);
     TestByteSwapElementType<int64_t>(0x5566778899ABCDEF);
 
     TestByteSwapElementType<float>(-151057.0f);
-    TestByteSwapElementType<double>(0x412abe865d8413c8);
+    TestByteSwapElementType<double>(0x412ABE865D841400);
   }
 
   // -----------------------------------------------------------------------------

From a9971f36eaf2fd58e60db5f8843622a99a4a9203 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 13 Jan 2021 18:54:59 -0500
Subject: [PATCH 318/397] Fix include paths that changed with Qt 5.15

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp          | 1 +
 Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp | 1 +
 Source/SVWidgetsLib/Widgets/PopUpWidget.cpp                  | 1 +
 Source/SVWidgetsLib/Widgets/StatusBarButton.cpp              | 3 +++
 Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp        | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
index 9737818f5c..a0e88d27cc 100644
--- a/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QRoundProgressBar.cpp
@@ -19,6 +19,7 @@
 #include "QRoundProgressBar.h"
 
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
 
 QRoundProgressBar::QRoundProgressBar(QWidget* parent)
 : QWidget(parent)
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 0c3eb3eb6e..b981111873 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -39,6 +39,7 @@
 #include <QtCore/QTextStream>
 #include <QtGui/QDrag>
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
 #include <QtGui/QTextDocument>
 #include <QtWidgets/QApplication>
 
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
index 0239e72e8a..fc46f07501 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.cpp
@@ -32,6 +32,7 @@
 #include "PopUpWidget.h"
 
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
 
 #include "moc_PopUpWidget.cpp"
 
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
index 2e307a935d..c8571d0557 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.cpp
@@ -2,7 +2,10 @@
 
 #include <QtCore/QDebug>
 #include <QtGui/QMouseEvent>
+
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
+
 #include <QtWidgets/QStyleOption>
 
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
index 674b77cbf0..62aa5447b7 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.cpp
@@ -1,7 +1,10 @@
 #include "StatusBarIssuesButton.h"
 
 #include <QtCore/QDebug>
+
 #include <QtGui/QPainter>
+#include <QtGui/QPainterPath>
+
 #include <QtWidgets/QStyleOption>
 
 #include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"

From 86fd464c3385bf4c560ce69ba03993e5c99abc9a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 13 Jan 2021 18:55:36 -0500
Subject: [PATCH 319/397] Update file to separate the ITK dependent bits

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
index 59bdc33a7d..e15eb1c6b7 100644
--- a/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
+++ b/Source/SIMPLib/ITK/Dream3DTemplateAliasMacro.h
@@ -76,6 +76,9 @@
 
 #pragma once
 
+#include "SIMPLib/SIMPLib.h"
+
+#if defined(SIMPL_USE_ITK)
 #include <itkConfigure.h>
 #define SIMPL_ITK_VERSION_CHECK ((ITK_VERSION_MAJOR == 5) && (ITK_VERSION_MINOR >= 1))
 #if SIMPL_ITK_VERSION_CHECK
@@ -88,6 +91,8 @@
 #include <itkImageIOBase.h>
 #endif
 
+#endif
+
 //--------------------------------------------------------------------------
 // Allow individual switching of support for each scalar size/signedness and
 // pixel type.

From 5fdad08004fce8e1b7fb92e00dd46b748c5bf533 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 19 Jan 2021 17:27:08 -0500
Subject: [PATCH 320/397] Fix compiler warnings about Qt 5.15 deprecation
 through QtBackwardsCompatibility.h

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/RESTClient/mrestrequest.cpp            |  5 +++++
 .../Common/QtBackwardCompatibilityMacro.h     |  8 +++++++
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  2 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |  2 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  3 ++-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |  8 +++----
 .../H5FilterParametersReader.cpp              |  9 ++++----
 Source/SIMPLib/Montages/MontageSupport.cpp    |  3 ++-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |  5 +++--
 .../ExecutePipelineController.cpp             | 21 ++++++++++---------
 .../ImportHDF5DatasetWidget.cpp               |  2 +-
 .../UI_Files/ComparisonValueWidget.ui         |  2 +-
 .../QtSupport/QtSBookmarkMissingDialog.h      |  2 +-
 .../QtSupport/QtSFileCompleter.cpp            | 18 ++++++++--------
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |  2 +-
 .../Widgets/DataStructureModel.cpp            |  2 +-
 .../SVWidgetsLib/Widgets/FilterListModel.cpp  |  2 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.cpp  |  2 +-
 .../Widgets/ImportHDF5TreeModel.cpp           |  6 ++++--
 19 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/Source/RESTClient/mrestrequest.cpp b/Source/RESTClient/mrestrequest.cpp
index 2b2884ef10..475fd4861f 100644
--- a/Source/RESTClient/mrestrequest.cpp
+++ b/Source/RESTClient/mrestrequest.cpp
@@ -208,7 +208,12 @@ void MRestRequest::send()
   connect(mActiveReply, &QNetworkReply::finished, this, &MRestRequest::onReplyFinished);
   connect(mActiveReply, &QNetworkReply::readyRead, mRequestTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
   connect(mActiveReply, &QNetworkReply::readyRead, this, &MRestRequest::onReadyRead);
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
   connect(mActiveReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::error), this, &MRestRequest::onReplyError);
+#else
+  connect(mActiveReply, static_cast<void (QNetworkReply::*)(QNetworkReply::NetworkError)>(&QNetworkReply::errorOccurred), this, &MRestRequest::onReplyError);
+#endif
+
   mRequestTimer->start();
 }
 
diff --git a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
index e4e3026b8b..0816ffb283 100644
--- a/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
+++ b/Source/SIMPLib/Common/QtBackwardCompatibilityMacro.h
@@ -4,6 +4,14 @@
 
 #include <QtCore/QtGlobal>
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+#define QSTRING_KEEP_EMPTY_PARTS QString::KeepEmptyParts
+#define QSTRING_SKIP_EMPTY_PARTS QString::SkipEmptyParts
+#else
+#define QSTRING_KEEP_EMPTY_PARTS Qt::KeepEmptyParts
+#define QSTRING_SKIP_EMPTY_PARTS Qt::SkipEmptyParts
+#endif
+
 #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
 #define QFONTMETRICS_WIDTH width
 #else
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 82fe72cc74..66e64bbd1a 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -232,7 +232,7 @@ void ArrayCalculator::dataCheck()
     return;
   }
 
-  if(m_InfixEquation.isEmpty() || m_InfixEquation.split(" ", QString::SkipEmptyParts).empty())
+  if(m_InfixEquation.isEmpty() || m_InfixEquation.split(" ", QSTRING_SKIP_EMPTY_PARTS).empty())
   {
     QString ss = QObject::tr("The infix expression is empty");
     setErrorCondition(static_cast<int>(CalculatorItem::ErrorCode::EMPTY_EQUATION), ss);
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index fbe491634f..562bc2c4d4 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -103,7 +103,7 @@ std::vector<T> createInitVector(AbstractFilter* filter, const QString& initializ
   ConvertOutputType conversionResult;
   std::vector<T> values(numComponents);
 
-  QStringList tokens = initializationValue.split(CDA_SEP, QString::SplitBehavior::KeepEmptyParts);
+  QStringList tokens = initializationValue.split(CDA_SEP, QSTRING_KEEP_EMPTY_PARTS);
 
   for(int32_t i = 0; i < numComponents; i++)
   {
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 8f9a9bd6ac..8da79803ef 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -42,6 +42,7 @@
 
 #include "SIMPLib/SIMPLibVersion.h"
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/DataArrays/IDataArray.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h"
@@ -368,7 +369,7 @@ void ImportHDF5Dataset::execute()
 std::vector<size_t> ImportHDF5Dataset::createComponentDimensions(const QString& cDimsStr)
 {
   std::vector<size_t> cDims;
-  QStringList dimsStrVec = cDimsStr.split(',', QString::SkipEmptyParts);
+  QStringList dimsStrVec = cDimsStr.split(',', QSTRING_SKIP_EMPTY_PARTS);
   for(int i = 0; i < dimsStrVec.size(); i++)
   {
     QString dimsStr = dimsStrVec[i];
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index a18ab66179..8d81d7b502 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -39,15 +39,15 @@
 #include <QtCore/QTextStream>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/DataArrays/DataArray.hpp"
 #include "SIMPLib/Filtering/FilterFactory.hpp"
 #include "SIMPLib/Filtering/FilterManager.h"
 #include "SIMPLib/Filtering/FilterPipeline.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
-
-#include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Testing/SIMPLTestFileLocations.h"
 #include "SIMPLib/Testing/UnitTestSupport.hpp"
 
@@ -217,7 +217,7 @@ class WriteTriangleGeometryTest
     for(MeshIndexType i = 0; i < triGeom->getNumberOfVertices(); i++)
     {
       line = inFileNodes.readLine();
-      list = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+      list = line.split(QRegExp("\\s+"), QSTRING_SKIP_EMPTY_PARTS);
       for(MeshIndexType j = 0; j < daTriVert->getNumberOfComponents(); j++)
       {
         DREAM3D_REQUIRE(list[j] == QString::number(daTriVert->getComponent(i, j), 'f', 5))
@@ -284,7 +284,7 @@ class WriteTriangleGeometryTest
     for(MeshIndexType i = 0; i < triGeom->getNumberOfTris(); i++)
     {
       line = inFileTriangles.readLine();
-      list = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+      list = line.split(QRegExp("\\s+"), QSTRING_SKIP_EMPTY_PARTS);
       for(MeshIndexType j = 0; j < daTriList->getNumberOfComponents(); j++)
       {
         DREAM3D_REQUIRE(list[j].toULongLong() == daTriList->getComponent(i, j))
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 3d1daddb4a..5535057ca1 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -44,6 +44,7 @@
 #include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/FilterParameters/H5FilterParametersConstants.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/JsonFilterParametersWriter.h"
@@ -941,7 +942,7 @@ ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString& n
   // Now read the the attribute that says how many arrays are in the data set.
   err = QH5Lite::readScalarAttribute(m_CurrentGroupId, name, "NumInputs", size);
 
-  QStringList strVector = strData.split('\n', QString::SkipEmptyParts);
+  QStringList strVector = strData.split('\n', QSTRING_SKIP_EMPTY_PARTS);
   qint32 strVecSize = strVector.size();
   if(strVecSize != size)
   {
@@ -954,7 +955,7 @@ ComparisonInputs H5FilterParametersReader::readComparisonInputs(const QString& n
   for(qint32 i = 0; i < size; ++i)
   {
     ComparisonInput_t v;
-    QStringList tokens = strVector[i].split(',', QString::SkipEmptyParts);
+    QStringList tokens = strVector[i].split(',', QSTRING_SKIP_EMPTY_PARTS);
     if(!tokens.empty())
     {
       v.dataContainerName = tokens[0];
@@ -1004,7 +1005,7 @@ ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(
   // Now read the the attribute that says how many arrays are in the data set.
   err = QH5Lite::readScalarAttribute(m_CurrentGroupId, name, "NumInputs", size);
 
-  QStringList strVector = strData.split('\n', QString::SkipEmptyParts);
+  QStringList strVector = strData.split('\n', QSTRING_SKIP_EMPTY_PARTS);
   qint32 strVecSize = strVector.size();
   if(strVecSize != size)
   {
@@ -1081,7 +1082,7 @@ QSet<QString> H5FilterParametersReader::readArraySelections(const QString& name,
   // Now read the the attribute that says how many arrays are in the data set.
   err = QH5Lite::readScalarAttribute(m_CurrentGroupId, name, "NumArrays", size);
 
-  QStringList strVector = strData.split('\n', QString::SkipEmptyParts);
+  QStringList strVector = strData.split('\n', QSTRING_SKIP_EMPTY_PARTS);
   qint32 strVecSize = strVector.size();
   if(strVecSize != size)
   {
diff --git a/Source/SIMPLib/Montages/MontageSupport.cpp b/Source/SIMPLib/Montages/MontageSupport.cpp
index be9f1156de..fa1d192b1b 100644
--- a/Source/SIMPLib/Montages/MontageSupport.cpp
+++ b/Source/SIMPLib/Montages/MontageSupport.cpp
@@ -40,6 +40,7 @@
 #include "H5Support/QH5Utilities.h"
 
 #include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/Montages/GridMontage.h"
 
@@ -82,7 +83,7 @@ GridMontage::Pointer readGridMontageFromHDF5(hid_t parentId, const DataContainer
   char sep = 0x1E; // Use the ASCII 'record separator' value (Decimal value 30) to separate the names
   QString dcNameCollection;
   err = QH5Lite::readStringDataset(parentId, SIMPL::StringConstants::DataContainerNames, dcNameCollection);
-  QStringList dcNames = dcNameCollection.split(sep, QString::KeepEmptyParts);
+  QStringList dcNames = dcNameCollection.split(sep, QSTRING_KEEP_EMPTY_PARTS);
 
   std::vector<DataContainerShPtr> dataContainers;
   for(const QString& dcName : dcNames)
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index e38fd44eff..2db95bf9c5 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -57,6 +57,7 @@
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/CoreFilters/CreateAttributeMatrix.h"
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/CoreFilters/CreateDataContainer.h"
@@ -468,7 +469,7 @@ class RESTUnitTest
 
     QString bodyData = QString::fromStdString(reply->readAll().toStdString());
 
-    QStringList bodyPartDataList = bodyData.split(boundary + "\r\n", QString::SplitBehavior::SkipEmptyParts);
+    QStringList bodyPartDataList = bodyData.split(boundary + "\r\n", QSTRING_SKIP_EMPTY_PARTS);
     DREAM3D_REQUIRE_EQUAL(bodyPartDataList.size(), 2);
 
     for(int i = 0; i < bodyPartDataList.size(); i++)
@@ -718,7 +719,7 @@ class RESTUnitTest
 
     QString bodyData = QString::fromStdString(reply->readAll().toStdString());
 
-    QStringList bodyPartDataList = bodyData.split(boundary + "\r\n", QString::SplitBehavior::SkipEmptyParts);
+    QStringList bodyPartDataList = bodyData.split(boundary + "\r\n", QSTRING_SKIP_EMPTY_PARTS);
     DREAM3D_REQUIRE_EQUAL(bodyPartDataList.size(), 2);
 
     for(int i = 0; i < bodyPartDataList.size(); i++)
diff --git a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
index 69fed9c8b7..0d816310f0 100644
--- a/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ExecutePipelineController.cpp
@@ -308,13 +308,14 @@ void ExecutePipelineController::serviceMultiPart()
 
   m_Response->setHeader("Content-Type", QByteArray::fromStdString(tr("multipart/form-data; boundary=\"%1\"").arg(boundary).toStdString()));
 
-  QByteArray body;
+  QString body;
+  QTextStream bodyOut(&body);
 
   // Add pipeline response part to the body
-  body.append(boundary + "\r\n");
-  body.append("Content-Disposition: form-data; name=\"pipelineResponse\"\r\n");
-  body.append("\r\n");
-  body.append(jdoc.toJson() + "\n");
+  bodyOut << boundary << "\r\n";
+  bodyOut << "Content-Disposition: form-data; name=\"pipelineResponse\"\r\n";
+  bodyOut << "\r\n";
+  bodyOut << jdoc.toJson() << "\n";
 
   // Add output file data to the body
   for(int i = 0; i < m_TemporaryOutputFilePaths.size(); i++)
@@ -327,10 +328,10 @@ void ExecutePipelineController::serviceMultiPart()
       QByteArray fileData = file.readAll();
       fileData = fileData.toBase64();
 
-      body.append(boundary + "\r\n");
-      body.append(tr("Content-Disposition: form-data; name=\"%1\"\r\n").arg(filePath));
-      body.append("\r\n");
-      body.append(fileData + "\n");
+      bodyOut << boundary << "\r\n";
+      bodyOut << tr("Content-Disposition: form-data; name=\"%1\"\r\n").arg(filePath);
+      bodyOut << "\r\n";
+      bodyOut << fileData + "\n";
     }
     else
     {
@@ -341,7 +342,7 @@ void ExecutePipelineController::serviceMultiPart()
     }
   }
 
-  m_Response->write(body, true);
+  m_Response->write(body.toUtf8(), true);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index c7c560cd2b..81b9699714 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -350,7 +350,7 @@ void ImportHDF5DatasetWidget::initializeHDF5Paths()
     for(const auto& importInfo : importInfoList)
     {
       QString hdf5Path = importInfo.dataSetPath;
-      QStringList hdf5PathTokens = hdf5Path.split("/", QString::SkipEmptyParts);
+      QStringList hdf5PathTokens = hdf5Path.split("/", QSTRING_SKIP_EMPTY_PARTS);
       QModelIndex parentIdx = treeModel->index(0, 0);
       hdfTreeView->expand(parentIdx);
       treeModel->setData(parentIdx, Qt::Checked, Qt::CheckStateRole);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/ComparisonValueWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/ComparisonValueWidget.ui
index dfaa0282e5..fcb1082be9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/ComparisonValueWidget.ui
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/ComparisonValueWidget.ui
@@ -99,7 +99,7 @@
       </sizepolicy>
      </property>
      <property name="sizeAdjustPolicy">
-      <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+      <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
      </property>
     </widget>
    </item>
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
index 1fb90423ca..f9f1cc8acc 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
@@ -47,7 +47,7 @@ class SVWidgetsLib_EXPORT QtSBookmarkMissingDialog : public QDialog, private Ui:
   Q_OBJECT
 
 public:
-  QtSBookmarkMissingDialog(QWidget* parent = nullptr, Qt::WindowFlags flags = 0);
+  QtSBookmarkMissingDialog(QWidget* parent = nullptr, Qt::WindowFlags flags = {});
   ~QtSBookmarkMissingDialog() override;
 
   void setBookmarkName(QString name);
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
index 2b4b78c3c1..da9c02132c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
@@ -34,17 +34,17 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "QtSFileCompleter.h"
 
-#include <QtWidgets/QDirModel>
+#include <QtWidgets/QFileSystemModel>
 
 // -----------------------------------------------------------------------------
-// use same QDirModel for all completers
+// use same QFileSystemModel for all completers
 // -----------------------------------------------------------------------------
-static QDirModel* fileDirModel()
+static QFileSystemModel* fileDirModel()
 {
-  static QDirModel* m = nullptr;
+  static QFileSystemModel* m = nullptr;
   if(m == nullptr)
   {
-    m = new QDirModel();
+    m = new QFileSystemModel();
     QStringList nameFilters;
     nameFilters << "*.*";
     m->setNameFilters(nameFilters);
@@ -56,12 +56,12 @@ static QDirModel* fileDirModel()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-static QDirModel* pathDirModel()
+static QFileSystemModel* pathDirModel()
 {
-  static QDirModel* m = nullptr;
+  static QFileSystemModel* m = nullptr;
   if(m == nullptr)
   {
-    m = new QDirModel();
+    m = new QFileSystemModel();
     m->setFilter(QDir::AllDirs | QDir::Drives | QDir::NoDotAndDotDot);
   }
   return m;
@@ -73,7 +73,7 @@ static QDirModel* pathDirModel()
 QtSFileCompleter::QtSFileCompleter(QObject* o, bool dirs)
 : QCompleter(o)
 {
-  QDirModel* m = dirs ? pathDirModel() : fileDirModel();
+  QFileSystemModel* m = dirs ? pathDirModel() : fileDirModel();
   this->setModel(m);
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index bae50cad95..ab437aeee8 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -215,7 +215,7 @@ Qt::ItemFlags BookmarksModel::flags(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
-    return nullptr;
+    return {};
   }
 
   Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index 25d75a688b..4eb6cd72f1 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -227,7 +227,7 @@ Qt::ItemFlags DataStructureModel::flags(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
-    return nullptr;
+    return {};
   }
 
   Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
index 6bfd24ff52..2c6f727375 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
@@ -143,7 +143,7 @@ Qt::ItemFlags FilterListModel::flags(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
-    return nullptr;
+    return {};
   }
 
   FilterListItem* item = getItem(index);
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
index ac104369b9..8d2a757120 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
@@ -121,7 +121,7 @@ Qt::ItemFlags ASCIIDataModel::flags(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
-    return nullptr;
+    return {};
   }
 
   Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
index dbf445e11e..3cb50331ee 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
@@ -34,6 +34,8 @@
 #include "ImportHDF5TreeModel.h"
 #include "ImportHDF5TreeModelItem.h"
 
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -149,7 +151,7 @@ Qt::ItemFlags ImportHDF5TreeModel::flags(const QModelIndex& index) const
 {
   if(!index.isValid())
   {
-    return nullptr;
+    return {};
   }
 
   ImportHDF5TreeModelItem* item = static_cast<ImportHDF5TreeModelItem*>(index.internalPointer());
@@ -302,7 +304,7 @@ QString ImportHDF5TreeModel::indexToHDF5Path(const QModelIndex& index)
 // -----------------------------------------------------------------------------
 QModelIndex ImportHDF5TreeModel::hdf5PathToIndex(const QString& hdf5Path)
 {
-  QStringList hdf5PathTokens = hdf5Path.split("/", QString::SplitBehavior::SkipEmptyParts);
+  QStringList hdf5PathTokens = hdf5Path.split("/", QSTRING_SKIP_EMPTY_PARTS);
   if(!hdf5PathTokens.empty())
   {
     QModelIndex rootIndex = index(0, 0);

From 3eec8e54983310b4d4cb80c20d12b9c6af168022 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 19 Jan 2021 17:41:01 -0500
Subject: [PATCH 321/397] Fix Qt 5.15 deprecation warnings for QDateTime

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Binding/pySIMPLBody.cpp   | 4 ++++
 Wrapping/Python/Binding/pySIMPLHeader.cpp | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index b85ffa01ef..a52003fe24 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -63,7 +63,11 @@ py::class_<QSet<QString>>(mod, "StringSet").def(py::init<>([](py::set stringSet)
 }));
 
 py::class_<QDateTime>(mod, "DateTime").def(py::init<>([](int year, int month, int day, int seconds) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
   QDateTime dateTime(QDate(year, month, day));
+#else
+  QDateTime dateTime = QDate(year, month, day).startOfDay();
+#endif
   dateTime.setTime_t(seconds);
   return dateTime;
 }));
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
index fee6ae8ccc..85d57b78ae 100644
--- a/Wrapping/Python/Binding/pySIMPLHeader.cpp
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -11,6 +11,7 @@
 #include "pybind11/stl_bind.h"
 
 #include "SIMPLib/Common/PhaseType.h"
+#include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"

From a7356ba2e400c8418b9c6014d6da9411a3bab435 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 19 Jan 2021 14:58:36 -0500
Subject: [PATCH 322/397] Added assert for DataArray operator[]

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 5739162bf1..7173fb4e0e 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -1085,11 +1085,13 @@ class DataArray : public IDataArray
 
   inline reference operator[](size_type index)
   {
+    assert(index < m_Size);
     return m_Array[index];
   }
 
   inline const T& operator[](size_type index) const
   {
+    assert(index < m_Size);
     return m_Array[index];
   }
 

From fdea2bbe895957d895173f05a791de0c31b34b54 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 21 Jan 2021 17:53:42 -0500
Subject: [PATCH 323/397] Return proper class string description for size_t
 arrays

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/DataArray.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index fccceaf4a7..d1ed3e017e 100644
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -1097,7 +1097,10 @@ QString DataArray<T>::getTypeAsString() const
   {
     return "bool";
   }
-
+  else if constexpr(std::is_same_v<T, size_t>)
+  {
+    return "size_t";
+  }
   return "UnknownType";
 }
 

From 7cdb1222b37ab3120965441a2be3955073edad09 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 22 Jan 2021 09:57:46 -0500
Subject: [PATCH 324/397] Changes to underlying calls to ClassName for
 NeighborList<T>

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/TemplateHelpers.h    | 2 +-
 Source/SIMPLib/DataArrays/NeighborList.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index 95696c19b0..bdc523b944 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -115,7 +115,7 @@ namespace TemplateHelpers
   {                                                                                                                                                                                                    \
     QString msg;                                                                                                                                                                                       \
     QTextStream out(&msg);                                                                                                                                                                             \
-    out << "The input array " << inputData->getDataArrayPath().serialize("/") << " is not a supported type. Type is: " << inputData->getNameOfClass() << "<" << inputData->getTypeAsString() << ">";   \
+    out << "The input array " << inputData->getDataArrayPath().serialize("/") << " is not a supported type. Type is: " << inputData->getTypeAsString();                                                \
     observableObj->setErrorConditionWithPrefix(TemplateHelpers::Errors::UnsupportedDataType, #templateName, msg);                                                                                      \
   }
 
diff --git a/Source/SIMPLib/DataArrays/NeighborList.cpp b/Source/SIMPLib/DataArrays/NeighborList.cpp
index 6e2293b07f..55035fe648 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.cpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.cpp
@@ -30,7 +30,7 @@ typename NeighborList<T>::Pointer NeighborList<T>::NullPointer()
 template <typename T>
 QString NeighborList<T>::getNameOfClass() const
 {
-  return QString("NeighborList<T>");
+  return ClassName();
 }
 // -----------------------------------------------------------------------------
 template <typename T>

From f3157c7c20407979bfe89fb1e9c648b259923570 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 26 Jan 2021 14:04:13 -0500
Subject: [PATCH 325/397] Fixed bug where a HttpSession would be created with a
 duplicate id

* The createUuid call used the current time and occasionally two
sessions would get created at the same time and therefore with the
same id. Then one of the sessions would fail to be cleaned up
properly.

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 ThirdParty/QtWebApp/httpserver/httpsession.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThirdParty/QtWebApp/httpserver/httpsession.cpp b/ThirdParty/QtWebApp/httpserver/httpsession.cpp
index f1fe515556..082fb7570f 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsession.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpsession.cpp
@@ -18,7 +18,7 @@ HttpSession::HttpSession(bool canStore)
     dataPtr = new HttpSessionData();
     dataPtr->refCount = 1;
     dataPtr->lastAccess = QDateTime::currentMSecsSinceEpoch();
-#if 1
+#if 0
     uint l = 100;
     ushort w1 = 200;
     ushort w2 = 500;

From 07e2f0f93888e68033b1a7d664c221bd47f5b2ba Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 29 Jan 2021 17:21:50 -0500
Subject: [PATCH 326/397] Added function to connect an observer to a filter in
 Python

* Added disconnect function for observer
* Changed Python binding generation to give all classes a variable
name so that functions can be added manually later (required for
above)

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/generate_python_bindings.py | 9 +++------
 Wrapping/Python/Binding/pySIMPLBody.cpp             | 5 +++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 411499c0ba..2741198137 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -86,13 +86,10 @@ def generate_bindings(self) -> str:
     if self.uses_shared_pointer:
       template_param += f', std::shared_ptr<{self.name}>'
 
-    if self.enums:
-      instance = f'instance{self.name}'
-      code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
+    instance = f'instance{self.name}'
+    code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
 
-      code += f'{instance}\n'
-    else:
-      code = f'py::class_<{template_param}>(mod, \"{self.name}\")\n'
+    code += f'{instance}\n'
 
     for constructor in self.constructors:
       args = ', '.join(constructor.args)
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index a52003fe24..7a706e88be 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -204,3 +204,8 @@ py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
     .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType);
 
 py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat").value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat).value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat).export_values();
+
+instanceAbstractFilter.def("connectObserver",
+                           [](AbstractFilter& filter, Observer& observer) { QObject::connect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });
+instanceAbstractFilter.def("disconnectObserver",
+                           [](AbstractFilter& filter, Observer& observer) { QObject::disconnect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });

From 296328a76759350dc50648c64dd7d4ba78b006c0 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 1 Feb 2021 15:37:27 -0500
Subject: [PATCH 327/397] Added observer argument to Pythonic interface

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/generate_python_bindings.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 2741198137..c4bfb7f3f7 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -30,6 +30,8 @@
 PYB11_ARGS: str = 'ARGS'
 PYB11_OVERLOAD: str = 'OVERLOAD'
 
+OBSERVER_ARG_NAME: str = 'observer'
+
 class PyProperty():
   def __init__(self):
     self.name: str = ''
@@ -146,19 +148,24 @@ def generate_bindings(self) -> str:
 
   def generate_python_interface(self, module_name: str) -> str:
     arg_list = [replace_python_keywords(camel_to_snake(prop.name)) for prop in self.properties]
+    if OBSERVER_ARG_NAME in arg_list:
+      raise RuntimeError(f'A filter parameter in \"{self.name}\" is called \"{OBSERVER_ARG_NAME}\" which conflicts with the Pythonic interface')
     parameter_list = [f'{prop} = None' for prop in arg_list]
     args_text = ', '.join(parameter_list)
     if args_text:
       args_text = ', ' + args_text
-    code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}):\n'
+    code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}, observer = None):\n'
     code += '  \"\"\"\n'
     code += f'  {self.name}\n\n'
     code += '  :param data_container_array | DataContainerArray\n'
     for prop, arg in zip(self.properties, arg_list):
       code += f'  :param {arg} | {prop.type} {prop.name}\n'
+    code += '  :param observer | Observer\n'
     code += ' \"\"\"\n\n'
     code += f'  filter = {module_name}.{self.name}()\n'
     code += f'  filter.setDataContainerArray(data_container_array)\n'
+    code += '  if observer is not None:\n'
+    code += '    filter.connectObserver(observer)\n'
 
     for prop, arg in zip(self.properties, arg_list):
       code += f'  if {arg} is not None:\n'

From f5468a85f829db1bc27f8d8eceacb29013adaf69 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 1 Feb 2021 15:04:33 -0500
Subject: [PATCH 328/397] Added return type annotation to generated Pythonic
 interface

* Fixed comment formatting

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/generate_python_bindings.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index c4bfb7f3f7..817ae56120 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -154,14 +154,14 @@ def generate_python_interface(self, module_name: str) -> str:
     args_text = ', '.join(parameter_list)
     if args_text:
       args_text = ', ' + args_text
-    code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}, observer = None):\n'
+    code = f'def {camel_to_snake(self.name)}(data_container_array{args_text}, observer = None) -> int:\n'
     code += '  \"\"\"\n'
     code += f'  {self.name}\n\n'
     code += '  :param data_container_array | DataContainerArray\n'
     for prop, arg in zip(self.properties, arg_list):
       code += f'  :param {arg} | {prop.type} {prop.name}\n'
     code += '  :param observer | Observer\n'
-    code += ' \"\"\"\n\n'
+    code += '  \"\"\"\n\n'
     code += f'  filter = {module_name}.{self.name}()\n'
     code += f'  filter.setDataContainerArray(data_container_array)\n'
     code += '  if observer is not None:\n'

From 8a829f9661aa644c0f9b8d9c32016c1697cd3b84 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 1 Feb 2021 14:43:25 -0500
Subject: [PATCH 329/397] Added PY11_CUSTOM macro to allow user created
 bindings per class

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLPythonMacros.h        |  5 +++++
 Source/SIMPLib/Filtering/AbstractFilter.h        |  1 +
 .../Python/Binding/generate_python_bindings.py   | 16 +++++++++++++---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
index 2ff965857b..6307cbf3e8 100644
--- a/Source/SIMPLib/Common/SIMPLPythonMacros.h
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -199,6 +199,11 @@
  */
 #define PYB11_FILTER(...)
 
+/**
+ * @brief PYB11_CUSTOM This macro is used to allow user created bindings on a per class basis.
+ */
+#define PYB11_CUSTOM(...)
+
 // End of PYBIND11 Macro Definitions
 /* *****************************************************************************
  * *****************************************************************************
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 04dbc9b79d..27fa6bb5bf 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -104,6 +104,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_METHOD(void notifyProgressMessage ARGS progress messageText)
   PYB11_METHOD(void clearErrorCode)
   PYB11_METHOD(void clearWarningCode)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 817ae56120..4024696a85 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -20,6 +20,7 @@
 PYB11_FILTER_NEW_MACRO: str = 'PYB11_FILTER_NEW_MACRO'
 PYB11_SHARED_POINTERS: str = 'PYB11_SHARED_POINTERS'
 PYB11_FILTER: str = 'PYB11_FILTER'
+PYB11_CUSTOM: str = 'PYB11_CUSTOM'
 
 PYB11_SUPERCLASS: str = 'SUPERCLASS'
 PYB11_READ: str = 'READ'
@@ -77,6 +78,7 @@ def __init__(self):
     self.has_static_new: bool = False
     self.uses_shared_pointer: bool = False
     self.is_filter: bool = False
+    self.is_custom: bool = False
 
   def __repr__(self):
     return self.name
@@ -88,10 +90,13 @@ def generate_bindings(self) -> str:
     if self.uses_shared_pointer:
       template_param += f', std::shared_ptr<{self.name}>'
 
-    instance = f'instance{self.name}'
-    code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
+    if self.enums or self.is_custom:
+      instance = f'instance{self.name}'
+      code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
 
-    code += f'{instance}\n'
+      code += f'{instance}\n'
+    else:
+      code = f'py::class_<{template_param}>(mod, \"{self.name}\")\n'
 
     for constructor in self.constructors:
       args = ', '.join(constructor.args)
@@ -340,6 +345,9 @@ def parse_shared_pointers(line: str) -> bool:
 def parse_filter(line: str) -> bool:
   return True
 
+def parse_custom(line: str) -> bool:
+  return True
+
 def parse_bindings(class_line: str, file: Generator[str, None, None]) -> PyClass:
   py_class = parse_class(class_line)
   line: str
@@ -365,6 +373,8 @@ def parse_bindings(class_line: str, file: Generator[str, None, None]) -> PyClass
       py_class.uses_shared_pointer = parse_shared_pointers(line)
     elif line.startswith(PYB11_FILTER):
       py_class.is_filter = parse_filter(line)
+    elif line.startswith(PYB11_CUSTOM):
+      py_class.is_custom = parse_custom(line)
   return py_class
 
 def parse_file(file_path: str) -> List[PyClass]:

From 3d391f58f20a2a59db92c96463e54d2ca8f97d4a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 1 Feb 2021 17:50:46 -0500
Subject: [PATCH 330/397] Fix null pointer exception when deep copy a geometry
 without a name.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Geometry/ImageGeom.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index b0a19583c4..6e41cd35f6 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -1109,8 +1109,8 @@ int ImageGeom::readGeometryFromHDF5(hid_t parentId, bool preflight)
 // -----------------------------------------------------------------------------
 IGeometry::Pointer ImageGeom::deepCopy(bool forceNoAllocate) const
 {
-  ImageGeom::Pointer imageCopy = ImageGeom::CreateGeometry(getName());
-
+  ImageGeom::Pointer imageCopy = ImageGeom::New();
+  imageCopy->setName(getName());
   SizeVec3Type volDims = getDimensions();
   FloatVec3Type spacing = getSpacing();
   FloatVec3Type origin = getOrigin();

From 7eb9c8bbb98e53745563c1f5b3a7c4d738a71a33 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 10 Feb 2021 18:51:55 -0500
Subject: [PATCH 331/397] Add MultiFile Input Widget and Filter Parameter
 (#415)

* Add MultiInputFile filter parameter and widget
* cleanup the MultiInputFileWidget codes to remove dead code and fix bugs
* Code cleanups
* Fix printing of a double %% for progress updates.
* Ensure that clearErrorCode() and clearWarningCode() are called at the start of dataCheck()

Remove pattern of execute(), clearErrorCode(),clearWarningCode(),dataCheck() since
those are done in dataCheck().

* Create a utilities namespace to convert QStringList to std::vector<std::string>
* Make namespace functions static. Add docs

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/PipelineRunner/PipelineRunner.cpp      |   2 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   2 -
 .../CoreFilters/CombineAttributeArrays.cpp    |   2 -
 .../CoreFilters/CombineAttributeMatrices.cpp  |   2 -
 .../CoreFilters/ConditionalSetValue.cpp       |   2 -
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   2 -
 .../CopyFeatureArrayToElementArray.cpp        |   2 -
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |   2 -
 .../CoreFilters/CreateAttributeMatrix.cpp     |   2 -
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   2 -
 .../CoreFilters/CreateDataContainer.cpp       |   2 -
 .../CreateFeatureArrayFromElementArray.cpp    |   2 -
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |   2 -
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp |   2 -
 .../CoreFilters/CreateImageGeometry.cpp       |   2 -
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   2 -
 .../CoreFilters/CropVertexGeometry.cpp        |   2 -
 .../CoreFilters/DataContainerReader.cpp       |   2 +
 .../CoreFilters/DataContainerWriter.cpp       |   2 -
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   2 -
 .../CoreFilters/ExtractComponentAsArray.cpp   |   2 -
 .../CoreFilters/FeatureCountDecision.cpp      |   2 -
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   2 -
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |   2 -
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |   1 +
 Source/SIMPLib/CoreFilters/InitializeData.cpp |   2 -
 .../LinkFeatureMapToElementArray.cpp          |   2 -
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   2 -
 .../CoreFilters/MultiThresholdObjects.cpp     |   2 -
 .../CoreFilters/MultiThresholdObjects2.cpp    |   2 -
 .../CoreFilters/PipelineAnnotation.cpp        |   2 -
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   2 -
 .../CoreFilters/RemoveComponentFromArray.cpp  |   2 -
 .../CoreFilters/RenameAttributeArray.cpp      |   2 -
 .../CoreFilters/RenameAttributeMatrix.cpp     |   2 -
 .../CoreFilters/RenameDataContainer.cpp       |   2 -
 .../CoreFilters/ReplaceValueInArray.cpp       |   2 -
 .../CoreFilters/RequiredZThickness.cpp        |   2 -
 .../CoreFilters/RotateSampleRefFrame.cpp      |   2 -
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |   2 -
 .../SetOriginResolutionImageGeom.cpp          |   2 -
 .../CoreFilters/SplitAttributeArray.cpp       |   2 -
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |   6 +-
 .../DataContainers/AttributeMatrix.cpp        |   3 +-
 .../MultiInputFileFilterParameter.cpp         | 188 ++++++++++++++++
 .../MultiInputFileFilterParameter.h           | 204 ++++++++++++++++++
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 .../Filtering/AbstractDecisionFilter.cpp      |   2 -
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |  14 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |  10 +-
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |   2 +-
 .../Filtering/QMetaObjectUtilities.cpp        |   4 +
 .../Messages/FilterProgressMessage.cpp        |   7 +-
 .../Messages/GenericProgressMessage.cpp       |   2 +-
 .../Messages/PipelineProgressMessage.cpp      |   7 +-
 .../TestFilters/ArraySelectionExample.cpp     |   2 -
 Source/SIMPLib/TestFilters/GenericExample.cpp |   2 +-
 Source/SIMPLib/Testing/CMakeLists.txt         |   1 +
 Source/SIMPLib/Testing/TestMain.cpp.in        |   8 +-
 Source/SIMPLib/Utilities/QtConverter.hpp      |  76 +++++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   1 +
 .../AbstractIOFileWidget.h                    |   2 +-
 .../MultiInputFileWidget.cpp                  | 189 ++++++++++++++++
 .../MultiInputFileWidget.h                    |  97 +++++++++
 .../FilterParameterWidgets/SourceList.cmake   |   1 +
 .../UI_Files/MultiInputFileWidget.ui          |  86 ++++++++
 66 files changed, 879 insertions(+), 120 deletions(-)
 create mode 100644 Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
 create mode 100644 Source/SIMPLib/Utilities/QtConverter.hpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
 create mode 100644 Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
 create mode 100755 Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiInputFileWidget.ui

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index f84d8e5e50..15c12d4ed2 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -142,7 +142,7 @@ int main(int argc, char* argv[])
     return EXIT_FAILURE;
   }
 
-  std::cout << "Pipeline Count: " << pipeline->size() << std::endl;
+  std::cout << "Filter Count: " << pipeline->size() << std::endl;
   Observer obs; // Create an Observer to report errors/progress from the executing pipeline
   pipeline->addMessageReceiver(&obs);
   // Preflight the pipeline
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 66e64bbd1a..d2eb0308c7 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -389,8 +389,6 @@ void ArrayCalculator::dataCheck()
 // -----------------------------------------------------------------------------
 void ArrayCalculator::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 9be7dcf5ea..5bef9914bd 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -312,8 +312,6 @@ void CombineAttributeArrays::dataCheck()
 // -----------------------------------------------------------------------------
 void CombineAttributeArrays::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index 71358c882f..aca033f5d0 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -288,8 +288,6 @@ void copyData(IDataArray::Pointer fromData, IDataArray::Pointer toData, size_t l
 // -----------------------------------------------------------------------------
 void CombineAttributeMatrices::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 39453ee509..5d6455a3cb 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -245,8 +245,6 @@ void ConditionalSetValue::dataCheck()
 // -----------------------------------------------------------------------------
 void ConditionalSetValue::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 95182134a0..e315c5514a 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -326,8 +326,6 @@ void ConvertData::dataCheck()
 // -----------------------------------------------------------------------------
 void ConvertData::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index e27b084fb8..e892302ed0 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -189,8 +189,6 @@ IDataArray::Pointer copyData(IDataArray::Pointer inputData, size_t totalPoints,
 // -----------------------------------------------------------------------------
 void CopyFeatureArrayToElementArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 080c13caaa..d95272f89e 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -230,8 +230,6 @@ void CopyObject::dataCheck()
 // -----------------------------------------------------------------------------
 void CopyObject::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 9416f0c1b4..127489afb4 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -162,8 +162,6 @@ void CreateAttributeMatrix::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateAttributeMatrix::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 562bc2c4d4..06527ba1f5 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -432,8 +432,6 @@ void CreateDataArray::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateDataArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 20df79ccf5..abf067097d 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -103,8 +103,6 @@ void CreateDataContainer::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateDataContainer::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 13aee85785..62d87f37fa 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -217,8 +217,6 @@ IDataArray::Pointer copyCellData(AbstractFilter* filter, IDataArray::Pointer inp
 // -----------------------------------------------------------------------------
 void CreateFeatureArrayFromElementArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 9bba99ca2b..c14de2252e 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -619,8 +619,6 @@ void CreateGeometry::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateGeometry::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
index ed86c68d67..652dabf5bb 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -100,8 +100,6 @@ void CreateGridMontage::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateGridMontage::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 9693d3efb2..37be70aeae 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -154,8 +154,6 @@ void CreateImageGeometry::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateImageGeometry::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index c9e6402444..5267db6a6a 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -167,8 +167,6 @@ void CreateStringArray::dataCheck()
 // -----------------------------------------------------------------------------
 void CreateStringArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 1b8ab32a6c..2e417a2613 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -233,8 +233,6 @@ void copyDataToCroppedGeometry(IDataArray::Pointer inDataPtr, IDataArray::Pointe
 // -----------------------------------------------------------------------------
 void CropVertexGeometry::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index 94905dd56f..e4f010e839 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -145,6 +145,8 @@ void DataContainerReader::initialize()
 // -----------------------------------------------------------------------------
 void DataContainerReader::dataCheck()
 {
+  clearErrorCode();
+  clearWarningCode();
 
   // Sync the file proxy and cached proxy if the time stamps are different
   QFileInfo fi(getInputFile());
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 7774c2d19d..9efc5512ad 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -128,8 +128,6 @@ void DataContainerWriter::dataCheck()
 // -----------------------------------------------------------------------------
 void DataContainerWriter::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index c8b7d8b7ff..5b03920e8c 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -118,8 +118,6 @@ void ExecuteProcess::dataCheck()
 // -----------------------------------------------------------------------------
 void ExecuteProcess::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 9dd263f099..d36740d505 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -187,8 +187,6 @@ void extractComponent(IDataArray::Pointer inputData, IDataArray::Pointer newData
 // -----------------------------------------------------------------------------
 void ExtractComponentAsArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index d0669a56a9..56d3aab47f 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -119,8 +119,6 @@ void FeatureCountDecision::dataCheck()
 // -----------------------------------------------------------------------------
 void FeatureCountDecision::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 6c6fd36a36..4d8b99f82b 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -161,8 +161,6 @@ void FeatureDataCSVWriter::dataCheck()
 // -----------------------------------------------------------------------------
 void FeatureDataCSVWriter::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 122af06e15..1280d11187 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -382,8 +382,6 @@ void FindDerivatives::dataCheck()
 // -----------------------------------------------------------------------------
 void FindDerivatives::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 8da79803ef..6213042b53 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -124,6 +124,7 @@ void ImportHDF5Dataset::setupFilterParameters()
 void ImportHDF5Dataset::dataCheck()
 {
   clearErrorCode();
+  clearWarningCode();
   m_DatasetPathsWithErrors.clear();
 
   if(m_HDF5FilePath.isEmpty())
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index d36564efc6..fcdc496285 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -336,8 +336,6 @@ void InitializeData::checkInitialization(IDataArray::Pointer p)
 // -----------------------------------------------------------------------------
 void InitializeData::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index c7dbdfea3c..ca4afc2506 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -161,8 +161,6 @@ void LinkFeatureMapToElementArray::dataCheck()
 // -----------------------------------------------------------------------------
 void LinkFeatureMapToElementArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 3aca17280b..70908394e5 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -111,8 +111,6 @@ void MaskCountDecision::dataCheck()
 // -----------------------------------------------------------------------------
 void MaskCountDecision::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 2b81468574..00f611c384 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -179,8 +179,6 @@ void MultiThresholdObjects::dataCheck()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 39e9a59562..ed1593c455 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -178,8 +178,6 @@ void MultiThresholdObjects2::dataCheck()
 // -----------------------------------------------------------------------------
 void MultiThresholdObjects2::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 4026952691..13cba68c0c 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -82,8 +82,6 @@ void PipelineAnnotation::dataCheck()
 // -----------------------------------------------------------------------------
 void PipelineAnnotation::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 55d78713db..7936cb9fa3 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -336,8 +336,6 @@ void RawBinaryReader::dataCheck()
 // -----------------------------------------------------------------------------
 void RawBinaryReader::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 8f2e33572a..ccfeb9feb5 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -262,8 +262,6 @@ void reduceArrayOnly(IDataArray::Pointer inputData, IDataArray::Pointer reducedD
 // -----------------------------------------------------------------------------
 void RemoveComponentFromArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 6290cb7cf2..697597a24e 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -158,8 +158,6 @@ void RenameAttributeArray::dataCheck()
 // -----------------------------------------------------------------------------
 void RenameAttributeArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index ee61c110f7..5ad5f460df 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -147,8 +147,6 @@ void RenameAttributeMatrix::dataCheck()
 // -----------------------------------------------------------------------------
 void RenameAttributeMatrix::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 294a2d4909..20d5bbbebd 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -130,8 +130,6 @@ void RenameDataContainer::dataCheck()
 // -----------------------------------------------------------------------------
 void RenameDataContainer::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck(); // calling the dataCheck will rename the array, so nothing is required here
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 16166b52ac..15348ceb5b 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -248,8 +248,6 @@ void ReplaceValueInArray::dataCheck()
 // -----------------------------------------------------------------------------
 void ReplaceValueInArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 57f3eb4a70..ae6dcb7f37 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -153,8 +153,6 @@ void RequiredZThickness::dataCheck()
 // -----------------------------------------------------------------------------
 void RequiredZThickness::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 0ad96da678..03ca9a7fbc 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -536,8 +536,6 @@ void RotateSampleRefFrame::dataCheck()
 // -----------------------------------------------------------------------------
 void RotateSampleRefFrame::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 0c9a83db02..1c7e09e170 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -229,8 +229,6 @@ void ScaleVolume::updateSurfaceMesh()
 // -----------------------------------------------------------------------------
 void ScaleVolume::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 15cad18bb2..1aa2d78f66 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -177,8 +177,6 @@ void SetOriginResolutionImageGeom::dataCheck()
 // -----------------------------------------------------------------------------
 void SetOriginResolutionImageGeom::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index d9b0c010eb..16726f0b84 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -183,8 +183,6 @@ void splitMulticomponentArray(IDataArray::Pointer inputArray, std::vector<IDataA
 // -----------------------------------------------------------------------------
 void SplitAttributeArray::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 036836e6f0..80322fd35a 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -224,12 +224,12 @@ void WriteASCIIData::initialize()
 // -----------------------------------------------------------------------------
 void WriteASCIIData::dataCheck()
 {
-  // Make sure the weak pointer vector is cleared before we begin...
-  m_SelectedWeakPtrVector.clear();
-
   clearErrorCode();
   clearWarningCode();
 
+  // Make sure the weak pointer vector is cleared before we begin...
+  m_SelectedWeakPtrVector.clear();
+
   //**************** MultiFile Checks ******************
   if(m_OutputStyle == MultiFile)
   {
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 2f7a2064de..5dbfd8a86a 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -898,8 +898,7 @@ QString AttributeMatrix::writeXdmfAttributeData(const IDataArray::Pointer& array
   array->getXdmfTypeAndSize(xdmfTypeName, precision);
   if(0 == precision)
   {
-    out << "<!-- " << array->getName() << " has unkown type or unsupported type or precision for XDMF to understand"
-        << " -->"
+    out << "<!-- " << array->getName() << " has unkown type or unsupported type or precision for XDMF to understand. " << xdmfTypeName << " of type size " << precision << " -->"
         << "\n";
     return xdmfText;
   }
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
new file mode 100644
index 0000000000..5edefebd12
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
@@ -0,0 +1,188 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MultiInputFileFilterParameter.h"
+
+#include <QtCore/QJsonArray>
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::MultiInputFileFilterParameter()
+: m_FileExtension("")
+, m_FileType("")
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::~MultiInputFileFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::Pointer MultiInputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category,
+                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                          const QString& fileType, int groupIndex)
+{
+  MultiInputFileFilterParameter::Pointer ptr = MultiInputFileFilterParameter::New();
+  ptr->setHumanLabel(humanLabel);
+  ptr->setPropertyName(propertyName);
+  // ptr->setDefaultValue(defaultValue);
+  ptr->setCategory(category);
+  ptr->setFileExtension(fileExtension);
+  ptr->setFileType(fileType);
+  ptr->setGroupIndex(groupIndex);
+  ptr->setSetterCallback(setterCallback);
+  ptr->setGetterCallback(getterCallback);
+
+  return ptr;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString MultiInputFileFilterParameter::getWidgetType() const
+{
+  return QString("MultiInputFileWidget");
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonArray jFiles = json[getPropertyName()].toArray();
+  if(m_SetterCallback)
+  {
+    std::vector<std::string> files;
+    files.reserve(jFiles.size());
+    for(const auto filePath : jFiles)
+    {
+      files.push_back(filePath.toString().toStdString());
+    }
+    m_SetterCallback(files);
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    std::vector<std::string> files = m_GetterCallback();
+    QJsonArray jFiles;
+    for(const auto& filePath : files)
+    {
+      jFiles.append(QString::fromStdString(filePath));
+    }
+    json[getPropertyName()] = jFiles;
+  }
+}
+
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::Pointer MultiInputFileFilterParameter::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::Pointer MultiInputFileFilterParameter::New()
+{
+  Pointer sharedPtr(new(MultiInputFileFilterParameter));
+  return sharedPtr;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiInputFileFilterParameter::getNameOfClass() const
+{
+  return QString("MultiInputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+QString MultiInputFileFilterParameter::ClassName()
+{
+  return QString("MultiInputFileFilterParameter");
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::setFileExtension(const QString& value)
+{
+  m_FileExtension = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiInputFileFilterParameter::getFileExtension() const
+{
+  return m_FileExtension;
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::setFileType(const QString& value)
+{
+  m_FileType = value;
+}
+
+// -----------------------------------------------------------------------------
+QString MultiInputFileFilterParameter::getFileType() const
+{
+  return m_FileType;
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::setSetterCallback(const MultiInputFileFilterParameter::SetterCallbackType& value)
+{
+  m_SetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::SetterCallbackType MultiInputFileFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileFilterParameter::setGetterCallback(const MultiInputFileFilterParameter::GetterCallbackType& value)
+{
+  m_GetterCallback = value;
+}
+
+// -----------------------------------------------------------------------------
+MultiInputFileFilterParameter::GetterCallbackType MultiInputFileFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
new file mode 100644
index 0000000000..af50d4b8e8
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
@@ -0,0 +1,204 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include <QtCore/QJsonObject>
+#include <QtCore/QStringList>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+
+/**
+ * @brief SIMPL_NEW_MULTI_INPUT_FILE_FP This macro is a short-form way of instantiating an instance of
+ * MultiInputFileFilterParameter. There are 4 required parameters and 3 optional parameter
+ * that are always passed to this macro in the following order: HumanLabel, PropertyName, Category,
+ * FilterName (class name), RequirementType, GroupIndex (optional).
+ *
+ * Therefore, the macro should be written like this (this is a concrete example):
+ * SIMPL_NEW_MULTI_INPUT_FILE_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
+ *
+ * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
+ * SIMPL_NEW_MULTI_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, GenericExample, "*.txt", "", 1);
+ */
+#define SIMPL_NEW_MULTI_INPUT_FILE_FP(...)                                                                                                                                                             \
+  SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiInputFileFilterParameter, __VA_ARGS__))
+
+/**
+ * @brief The MultiInputFileFilterParameter class is used by filters to instantiate an InputFileWidget.  By instantiating an instance of
+ * this class in a filter's setupFilterParameters() method, an InputFileWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
+ */
+class SIMPLib_EXPORT MultiInputFileFilterParameter : public FilterParameter
+{
+public:
+  using Self = MultiInputFileFilterParameter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+  static Pointer NullPointer();
+
+  static Pointer New();
+
+  using VecString = std::vector<std::string>;
+
+  /**
+   * @brief Returns the name of the class for MultiInputFileFilterParameter
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for MultiInputFileFilterParameter
+   */
+  static QString ClassName();
+
+  using SetterCallbackType = std::function<void(VecString)>;
+  using GetterCallbackType = std::function<VecString(void)>;
+
+  /**
+   * @brief New This function instantiates an instance of the MultiInputFileFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_MULTI_INPUT_FILE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+  * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+  * that this FilterParameter subclass represents.
+  * @param fileExtension The possible file extensions that this InputFileWidget accepts.
+  * @param fileType The possible file types that this InputFileWidget accepts.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
+  static Pointer New(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+
+  ~MultiInputFileFilterParameter() override;
+
+  /**
+   * @brief Setter property for FileExtension
+   */
+  void setFileExtension(const QString& value);
+  /**
+   * @brief Getter property for FileExtension
+   * @return Value of FileExtension
+   */
+  QString getFileExtension() const;
+
+  /**
+   * @brief Setter property for FileType
+   */
+  void setFileType(const QString& value);
+  /**
+   * @brief Getter property for FileType
+   * @return Value of FileType
+   */
+  QString getFileType() const;
+
+  /**
+   * @brief getWidgetType Returns the type of widget that displays and controls
+   * this FilterParameter subclass
+   * @return
+   */
+  QString getWidgetType() const override;
+
+  /**
+   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
+   * @param json The QJsonObject that the filter parameter reads from.
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
+   * @param json The QJsonObject that the filter parameter writes to.
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * from the filter parameter.
+   */
+  /**
+   * @brief Setter property for SetterCallback
+   */
+  void setSetterCallback(const MultiInputFileFilterParameter::SetterCallbackType& value);
+  /**
+   * @brief Getter property for SetterCallback
+   * @return Value of SetterCallback
+   */
+  MultiInputFileFilterParameter::SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @return The GetterCallback
+   */
+  /**
+   * @brief Setter property for GetterCallback
+   */
+  void setGetterCallback(const MultiInputFileFilterParameter::GetterCallbackType& value);
+  /**
+   * @brief Getter property for GetterCallback
+   * @return Value of GetterCallback
+   */
+  MultiInputFileFilterParameter::GetterCallbackType getGetterCallback() const;
+
+protected:
+  /**
+   * @brief MultiInputFileFilterParameter The default constructor.  It is protected because this
+   * filter parameter should only be instantiated using its New(...) function or short-form macro.
+   */
+  MultiInputFileFilterParameter();
+
+public:
+  MultiInputFileFilterParameter(const MultiInputFileFilterParameter&) = delete;            // Copy Constructor Not Implemented
+  MultiInputFileFilterParameter(MultiInputFileFilterParameter&&) = delete;                 // Move Constructor Not Implemented
+  MultiInputFileFilterParameter& operator=(const MultiInputFileFilterParameter&) = delete; // Copy Assignment Not Implemented
+  MultiInputFileFilterParameter& operator=(MultiInputFileFilterParameter&&) = delete;      // Move Assignment Not Implemented
+
+private:
+  QString m_FileExtension = {};
+  QString m_FileType = {};
+  MultiInputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
+  MultiInputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
+};
+
+Q_DECLARE_METATYPE(std::vector<std::string>);
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index dd326e67d4..a57417a08c 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -83,6 +83,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ThirdOrderPolynomialFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UInt64FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UnknownFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.h
 )
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
@@ -154,6 +155,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ThirdOrderPolynomialFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UInt64FilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UnknownFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.cpp
 )
 
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index ba4a7664cb..eca65ffdb2 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -90,8 +90,6 @@ void AbstractDecisionFilter::dataCheck()
 // -----------------------------------------------------------------------------
 void AbstractDecisionFilter::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 8a5c157a08..eb7a82647c 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -52,11 +52,6 @@
 //
 // -----------------------------------------------------------------------------
 AbstractFilter::AbstractFilter()
-: m_InPreflight(false)
-, m_Enabled(true)
-, m_Removing(false)
-, m_PipelineIndex(0)
-, m_Cancel(false)
 {
   m_DataContainerArray = DataContainerArray::New();
   m_PreviousFilter = NullPointer();
@@ -587,8 +582,7 @@ void AbstractFilter::notifyMissingProperty(FilterParameter* filterParameter)
   QString ss =
       QString("Error occurred transferring the Filter Parameter '%1' in Filter '%2' to the filter instance. The pipeline may run but the underlying filter will NOT be using the values from the GUI."
               " Please report this issue to the developers of this filter.")
-          .arg(filterParameter->getPropertyName())
-          .arg(getHumanLabel());
+          .arg(filterParameter->getPropertyName(), getHumanLabel());
 
   setWarningCondition(-1, ss);
 }
@@ -602,12 +596,14 @@ bool AbstractFilter::checkIfPathRenamed(const RenameDataPath::DataID_t id, const
   {
     return false;
   }
-  else if(m_CreatedPaths.find(id) == m_CreatedPaths.end())
+
+  if(m_CreatedPaths.find(id) == m_CreatedPaths.end())
   {
     m_CreatedPaths[id] = path;
     return false;
   }
-  else if(m_CreatedPaths[id] == path)
+
+  if(m_CreatedPaths[id] == path)
   {
     return false;
   }
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 27fa6bb5bf..18a72eafa4 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -582,14 +582,14 @@ protected slots:
 private:
   DataContainerArrayShPtrType m_DataContainerArray = {};
   FilterParameterVectorType m_FilterParameters = {};
-  bool m_InPreflight = {};
-  bool m_Enabled = {};
-  bool m_Removing = {};
-  int m_PipelineIndex = {};
+  bool m_InPreflight = {false};
+  bool m_Enabled = {true};
+  bool m_Removing = {false};
+  int m_PipelineIndex = {0};
   AbstractFilter::WeakPointer m_PreviousFilter = {};
   AbstractFilter::WeakPointer m_NextFilter = {};
 
-  bool m_Cancel;
+  bool m_Cancel = false;
   int m_ErrorCode = 0;
   int m_WarningCode = 0;
 
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index b8d6eb1b42..4a422d29c7 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -732,7 +732,7 @@ void FilterPipeline::disconnectFilterNotifications(AbstractFilter* filter)
     disconnect(filter, SIGNAL(messageGenerated(const AbstractMessage::Pointer&)), messageReceiver, SLOT(processPipelineMessage(const AbstractMessage::Pointer&)));
   }
 
-  disconnect(filter, &AbstractFilter::messageGenerated, 0, 0);
+  disconnect(filter, &AbstractFilter::messageGenerated, nullptr, nullptr);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index f1e96cb74f..9e117e4132 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -36,6 +36,8 @@
 #include "QMetaObjectUtilities.h"
 
 #include <cassert>
+#include <string>
+#include <vector>
 
 #include <QtCore/QDataStream>
 
@@ -144,6 +146,7 @@ QMetaObjectUtilities::~QMetaObjectUtilities() = default;
 // -----------------------------------------------------------------------------
 void QMetaObjectUtilities::RegisterMetaTypes()
 {
+  using VectString = std::vector<std::string>;
   qRegisterMetaType<AbstractMessage::Pointer>("AbstractMessage::Pointer");
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
   qRegisterMetaType<DataArrayPath>("DataArrayPath");
@@ -157,6 +160,7 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<FPRangePair>("FPRangePair");
   qRegisterMetaType<DynamicTableData>("DynamicTableData");
   qRegisterMetaType<PhaseType::Types>("PhaseType::Types");
+  qRegisterMetaType<VectString>("VectString");
   qRegisterMetaTypeStreamOperators<IntVec3Type>("IntVec3Type");
   qRegisterMetaTypeStreamOperators<FloatVec3Type>("FloatVec3Type");
   qRegisterMetaTypeStreamOperators<PhaseType::Types>("PhaseType::Types");
diff --git a/Source/SIMPLib/Messages/FilterProgressMessage.cpp b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
index 7de9765742..8571bbec62 100644
--- a/Source/SIMPLib/Messages/FilterProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/FilterProgressMessage.cpp
@@ -43,10 +43,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FilterProgressMessage::FilterProgressMessage()
-: AbstractProgressMessage()
-{
-}
+FilterProgressMessage::FilterProgressMessage() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -78,7 +75,7 @@ FilterProgressMessage::Pointer FilterProgressMessage::New(const QString& classNa
 // -----------------------------------------------------------------------------
 QString FilterProgressMessage::generateMessageString() const
 {
-  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  QString ss = QObject::tr("%1 %2%").arg(getMessageText()).arg(getProgressValue());
   return ss;
 }
 
diff --git a/Source/SIMPLib/Messages/GenericProgressMessage.cpp b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
index e7c3ef0ffe..8b3434c08a 100644
--- a/Source/SIMPLib/Messages/GenericProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/GenericProgressMessage.cpp
@@ -75,7 +75,7 @@ GenericProgressMessage::Pointer GenericProgressMessage::New(const QString& msgTe
 // -----------------------------------------------------------------------------
 QString GenericProgressMessage::generateMessageString() const
 {
-  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  QString ss = QObject::tr("%1 %2%").arg(getMessageText()).arg(getProgressValue());
   return ss;
 }
 
diff --git a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
index bffa5bd460..24f0cdeba1 100644
--- a/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
+++ b/Source/SIMPLib/Messages/PipelineProgressMessage.cpp
@@ -43,10 +43,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PipelineProgressMessage::PipelineProgressMessage()
-: AbstractProgressMessage()
-{
-}
+PipelineProgressMessage::PipelineProgressMessage() = default;
 
 // -----------------------------------------------------------------------------
 //
@@ -76,7 +73,7 @@ PipelineProgressMessage::Pointer PipelineProgressMessage::New(const QString& pip
 // -----------------------------------------------------------------------------
 QString PipelineProgressMessage::generateMessageString() const
 {
-  QString ss = QObject::tr("%1 %2%%").arg(getMessageText()).arg(getProgressValue());
+  QString ss = QObject::tr("%1 %2%").arg(getMessageText()).arg(getProgressValue());
   return ss;
 }
 
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index ab02589183..dc0a04332d 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -117,8 +117,6 @@ void ArraySelectionExample::preflight()
 // -----------------------------------------------------------------------------
 void ArraySelectionExample::execute()
 {
-  clearErrorCode();
-  clearWarningCode();
   dataCheck();
   if(getErrorCode() < 0)
   {
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 0976942b1f..51e06878a2 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -380,9 +380,9 @@ void GenericExample::initialize()
 // -----------------------------------------------------------------------------
 void GenericExample::dataCheck()
 {
-  DataArrayPath tempPath;
   clearErrorCode();
   clearWarningCode();
+  DataArrayPath tempPath;
 
   FileSystemPathHelper::CheckOutputFile(this, "Output File Name", getOutputFile(), true);
 }
diff --git a/Source/SIMPLib/Testing/CMakeLists.txt b/Source/SIMPLib/Testing/CMakeLists.txt
index 0d48384a40..95ab5e2496 100644
--- a/Source/SIMPLib/Testing/CMakeLists.txt
+++ b/Source/SIMPLib/Testing/CMakeLists.txt
@@ -33,6 +33,7 @@ set(FilterTestIncludes  "${SIMPLib_UnitTest_Includes}")
 
 set(QT_APPLICATION_CLASS_HEADER "#include <QtCore/QCoreApplication>")
 set(QT_APPLICATION_CLASS "QCoreApplication")
+set(PluginName "SIMPLibUnitTest")
 
 configure_file(${SIMPLTest_SOURCE_DIR}/TestMain.cpp.in
           ${SIMPLTest_BINARY_DIR}/SIMPLUnitTest.cpp @ONLY)
diff --git a/Source/SIMPLib/Testing/TestMain.cpp.in b/Source/SIMPLib/Testing/TestMain.cpp.in
index 77036f57f6..217ce874fe 100644
--- a/Source/SIMPLib/Testing/TestMain.cpp.in
+++ b/Source/SIMPLib/Testing/TestMain.cpp.in
@@ -1,8 +1,8 @@
 /*
-This file is automatically generated during each CMake run. DO NOT EDIT the
-generated file. Edit the original file
-*/
-
+ * This file is automatically generated during each CMake run. DO NOT EDIT the
+ * generated file. Edit the original file at
+ * @CMAKE_CURRENT_LIST_DIR@/TestMain.cpp.in
+ */
 
 #ifdef __clang__
 #pragma clang diagnostic push
diff --git a/Source/SIMPLib/Utilities/QtConverter.hpp b/Source/SIMPLib/Utilities/QtConverter.hpp
new file mode 100644
index 0000000000..084dab55c3
--- /dev/null
+++ b/Source/SIMPLib/Utilities/QtConverter.hpp
@@ -0,0 +1,76 @@
+/* ============================================================================
+ * Copyright (c) 2021-2021 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <QtCore/QStringList>
+
+#include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
+
+namespace QtConverter
+{
+
+/**
+ * @brief Converts a std::vector<std::string> to a QStringList
+ * @param items The list of strings to convert
+ * @return QStringList of Items
+ */
+static QStringList ToQStringList(const std::vector<std::string>& items)
+{
+  QStringList out;
+  for(const auto& item : items)
+  {
+    out << QString::fromStdString(item);
+  }
+  return out;
+}
+
+/**
+ * @brief Converts a QStringList of assumed file paths to a std::vector<std::string>
+ * @param items The file paths to convert
+ * @return The converted list
+ */
+static std::vector<std::string> FromQStringFileList(const QStringList& items)
+{
+  std::vector<std::string> out;
+  SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
+  for(const auto& filePath : items)
+  {
+    out.push_back(validator->convertToAbsolutePath(filePath).toStdString());
+  }
+  return out;
+}
+
+} // namespace QtConverter
\ No newline at end of file
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index c67211fa2c..d055f10ea7 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -35,6 +35,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/TimeUtilities.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ToolTipGenerator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UTFUtilities.hpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QtConverter.hpp
 )
 
 set(SIMPLib_Utilities_SRCS
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index 3647bd7b42..f8877e591f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -37,12 +37,12 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_AbstractIOFileWidget.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
new file mode 100644
index 0000000000..e39d0ee4f0
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
@@ -0,0 +1,189 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "MultiInputFileWidget.h"
+
+#include <tuple>
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+
+#include <QtGui/QKeyEvent>
+#include <QtGui/QPainter>
+
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenu>
+
+#include "SIMPLib/FilterParameters/MultiInputFileFilterParameter.h"
+#include "SIMPLib/Utilities/QtConverter.hpp"
+
+#include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
+#include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
+#include "SVWidgetsLib/QtSupport/QtSFileUtils.h"
+#include "SVWidgetsLib/Widgets/SVStyle.h"
+
+#include "ui_MultiInputFileWidget.h"
+
+static QString s_LastUsedDir;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiInputFileWidget::MultiInputFileWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
+: FilterParameterWidget(parameter, filter, parent)
+, m_Ui(new Ui::MultiInputFileWidget)
+{
+  m_FilterParameter = dynamic_cast<MultiInputFileFilterParameter*>(parameter);
+  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiInputFileWidget can ONLY be used with a MultiInputFileFilterParameter object");
+
+  m_Ui->setupUi(this);
+  setupGui();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+MultiInputFileWidget::~MultiInputFileWidget() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::setupGui()
+{
+  // Catch when the filter is about to execute the preflight
+  connect(getFilter(), &AbstractFilter::preflightAboutToExecute, this, &MultiInputFileWidget::beforePreflight);
+
+  // Catch when the filter is finished running the preflight
+  connect(getFilter(), &AbstractFilter::preflightExecuted, this, &MultiInputFileWidget::afterPreflight);
+
+  // Catch when the filter wants its values updated
+  connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &MultiInputFileWidget::filterNeedsInputParameters);
+
+  connect(m_Ui->selectBtn, &QPushButton::clicked, this, &MultiInputFileWidget::selectMultiInputFile);
+
+  s_LastUsedDir = QDir::homePath();
+
+  // Loop through all of the input files, find the first non-empty one and use that.
+  if(getFilter() != nullptr && getFilterParameter() != nullptr)
+  {
+    MultiInputFileFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+    m_SelectedFiles = QtConverter::ToQStringList(getter());
+    for(const auto& inputFile : m_SelectedFiles)
+    {
+      if(!inputFile.isEmpty())
+      {
+        QFileInfo fi(inputFile);
+        s_LastUsedDir = fi.absolutePath();
+        break;
+      }
+    }
+    m_Ui->m_HumanLabel->setText(m_FilterParameter->getHumanLabel());
+  }
+
+  createSummaryText();
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::selectMultiInputFile()
+{
+  QString Ftype = m_FilterParameter->getFileType();
+  QString ext = m_FilterParameter->getFileExtension();
+  QString s = QString("%1 Files (%2);;All Files (*.*)").arg(Ftype, ext);
+
+  QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Input File(s)"), s_LastUsedDir, s);
+
+  if(files.isEmpty())
+  {
+    return;
+  }
+
+  m_SelectedFiles = files;
+
+  createSummaryText();
+}
+
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::createSummaryText()
+{
+  if(m_SelectedFiles.isEmpty())
+  {
+    m_Ui->m_SummaryLabel->hide();
+    return;
+  }
+  QString file = m_SelectedFiles.at(0);
+  file = QDir::toNativeSeparators(file);
+  // Store the last used directory into the private instance variable
+  QFileInfo fi(file);
+  s_LastUsedDir = fi.absolutePath();
+  QString msg;
+  QTextStream out(&msg);
+  out << s_LastUsedDir << "\nNumber of Files Selected: " << m_SelectedFiles.size();
+  m_Ui->m_SummaryLabel->setText(msg);
+  m_Ui->m_SummaryLabel->setVisible(true);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::filterNeedsInputParameters(AbstractFilter* filter)
+{
+  std::ignore = filter;
+
+  std::vector<std::string> files = QtConverter::FromQStringFileList(m_SelectedFiles);
+  MultiInputFileFilterParameter::SetterCallbackType setter = m_FilterParameter->getSetterCallback();
+
+  if(setter)
+  {
+    setter(files);
+  }
+  else
+  {
+    getFilter()->notifyMissingProperty(getFilterParameter());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::beforePreflight()
+{
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void MultiInputFileWidget::afterPreflight()
+{
+}
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
new file mode 100644
index 0000000000..e72e238bc3
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
@@ -0,0 +1,97 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+
+#include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/SVWidgetsLib.h"
+
+namespace Ui
+{
+class MultiInputFileWidget;
+}
+class MultiInputFileFilterParameter;
+
+/**
+ * @brief
+ * @author
+ * @version
+ */
+class SVWidgetsLib_EXPORT MultiInputFileWidget : public FilterParameterWidget
+{
+  Q_OBJECT
+
+public:
+  /**
+   * @brief Constructor
+   * @param parameter The FilterParameter object that this widget represents
+   * @param filter The instance of the filter that this parameter is a part of
+   * @param parent The parent QWidget for this Widget
+   */
+  MultiInputFileWidget(FilterParameter* parameter, AbstractFilter* filter = nullptr, QWidget* parent = nullptr);
+
+  ~MultiInputFileWidget() override;
+
+  MultiInputFileWidget(const MultiInputFileWidget&) = delete;            // Copy Constructor Not Implemented
+  MultiInputFileWidget(MultiInputFileWidget&&) = delete;                 // Move Constructor Not Implemented
+  MultiInputFileWidget& operator=(const MultiInputFileWidget&) = delete; // Copy Assignment Not Implemented
+  MultiInputFileWidget& operator=(MultiInputFileWidget&&) = delete;      // Move Assignment Not Implemented
+
+  /**
+   * @brief This method does additional GUI widget connections
+   */
+  void setupGui() override;
+
+public slots:
+  void selectMultiInputFile();
+  void beforePreflight();
+  void afterPreflight();
+  void filterNeedsInputParameters(AbstractFilter* filter);
+
+protected:
+  void createSummaryText();
+
+private:
+  QSharedPointer<Ui::MultiInputFileWidget> m_Ui;
+
+  MultiInputFileFilterParameter* m_FilterParameter = nullptr;
+
+  QAction* m_ShowFileAction = nullptr;
+  QString m_CurrentText = "";
+  QStringList m_SelectedFiles;
+};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
index 8515c7f74d..0d22e84b2a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SourceList.cmake
@@ -50,6 +50,7 @@ set(SIMPLView_PARAMETER_WIDGETS
     StringWidget
     ThirdOrderPolynomialWidget
     UInt64Widget
+    MultiInputFileWidget
 )
 
 set(SIMPLView_PARAMETER_WIDGETS_NO_UI
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiInputFileWidget.ui b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiInputFileWidget.ui
new file mode 100755
index 0000000000..30963ef5ea
--- /dev/null
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UI_Files/MultiInputFileWidget.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MultiInputFileWidget</class>
+ <widget class="QFrame" name="MultiInputFileWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>585</width>
+    <height>32</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>2</number>
+   </property>
+   <property name="topMargin">
+    <number>2</number>
+   </property>
+   <property name="rightMargin">
+    <number>2</number>
+   </property>
+   <property name="bottomMargin">
+    <number>2</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="m_HumanLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Property</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QPushButton" name="selectBtn">
+     <property name="text">
+      <string>Select...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="SVSmallLabel" name="m_SummaryLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="font">
+      <font>
+       <italic>false</italic>
+      </font>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>SVSmallLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">SVControlWidgets.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../../../Resources/SIMPL.qrc"/>
+ </resources>
+ <connections/>
+</ui>

From a5871fcb3be75a3940eaf0d334b66efa665d667f Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 12 Feb 2021 15:18:13 -0500
Subject: [PATCH 332/397] Changed functions to inline in QtConverter.hpp

* Added newline to end of file

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Utilities/QtConverter.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Source/SIMPLib/Utilities/QtConverter.hpp b/Source/SIMPLib/Utilities/QtConverter.hpp
index 084dab55c3..e39223d7b6 100644
--- a/Source/SIMPLib/Utilities/QtConverter.hpp
+++ b/Source/SIMPLib/Utilities/QtConverter.hpp
@@ -47,7 +47,7 @@ namespace QtConverter
  * @param items The list of strings to convert
  * @return QStringList of Items
  */
-static QStringList ToQStringList(const std::vector<std::string>& items)
+inline QStringList ToQStringList(const std::vector<std::string>& items)
 {
   QStringList out;
   for(const auto& item : items)
@@ -62,7 +62,7 @@ static QStringList ToQStringList(const std::vector<std::string>& items)
  * @param items The file paths to convert
  * @return The converted list
  */
-static std::vector<std::string> FromQStringFileList(const QStringList& items)
+inline std::vector<std::string> FromQStringFileList(const QStringList& items)
 {
   std::vector<std::string> out;
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
@@ -73,4 +73,4 @@ static std::vector<std::string> FromQStringFileList(const QStringList& items)
   return out;
 }
 
-} // namespace QtConverter
\ No newline at end of file
+} // namespace QtConverter

From bd2598fe735a379c0e0a8343b2bac3384f6ad498 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Feb 2021 21:29:22 -0500
Subject: [PATCH 333/397] Change AttributeMatrix/IGeometry Types Enumeration to
 std::vector from QVector (#416)

* Change AttributeMatrix/IGeometry Types Enumeration to std::vector from QVector
* Created SIMPL namespace and created contains() function.
* Remove constexpr because it is C++20
* SIMPL uses C++17

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/CombineAttributeMatrices.cpp  |   2 +-
 .../DataContainers/AttributeMatrix.cpp        |   9 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   2 +-
 .../SIMPLib/DataContainers/DataContainer.cpp  |   9 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   6 +-
 .../AttributeMatrixSelectionFilterParameter.h |   6 +-
 .../DataArrayCreationFilterParameter.cpp      |   6 +-
 .../DataArrayCreationFilterParameter.h        |   6 +-
 .../DataArraySelectionFilterParameter.cpp     |   8 +-
 .../DataArraySelectionFilterParameter.h       |   9 +-
 ...ataContainerGridSelectionFilterParameter.h |   4 -
 ...ttributeMatrixSelectionFilterParameter.cpp |  14 +-
 ...iAttributeMatrixSelectionFilterParameter.h |  14 +-
 ...MultiDataArraySelectionFilterParameter.cpp |  14 +-
 .../MultiDataArraySelectionFilterParameter.h  |  14 +-
 ...iDataContainerSelectionFilterParameter.cpp |  14 +-
 ...ltiDataContainerSelectionFilterParameter.h |  15 +-
 Source/SIMPLib/Geometry/IGeometry.h           |   7 +-
 Source/SIMPLib/Utilities/STLUtilities.hpp     |  76 ++++++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   1 +
 .../FilterParameterWidgetUtils.hpp            |   9 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   3 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  | 181 +++++++-----------
 .../Widgets/DataArrayPathSelectionWidget.h    |   6 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |  20 +-
 25 files changed, 241 insertions(+), 214 deletions(-)
 create mode 100644 Source/SIMPLib/Utilities/STLUtilities.hpp

diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index aca033f5d0..e725cb4fa8 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -110,7 +110,7 @@ void CombineAttributeMatrices::setupFilterParameters()
     amTypes.push_back(AttributeMatrix::Type::FaceFeature);
     amTypes.push_back(AttributeMatrix::Type::Vertex);
     amTypes.push_back(AttributeMatrix::Type::VertexFeature);
-    QVector<QString> daTypes;
+    std::vector<QString> daTypes;
     daTypes.push_back(SIMPL::TypeNames::Int32);
     std::vector<std::vector<size_t>> compDims;
     compDims.resize(1);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 5dbfd8a86a..3f3d638794 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -57,6 +57,7 @@
 #include "SIMPLib/HDF5/VTKH5Constants.h"
 #include "SIMPLib/Math/SIMPLibMath.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 
 // -----------------------------------------------------------------------------
 //
@@ -257,7 +258,7 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
         if(req != nullptr)
         {
           AttributeMatrix::Types amTypes = req->getAMTypes();
-          if(amTypes.empty() || amTypes.contains(static_cast<AttributeMatrix::Type>(amTypeTmp)))
+          if(amTypes.empty() || SIMPL::contains(amTypes, static_cast<AttributeMatrix::Type>(amTypeTmp))) // amTypes.contains(static_cast<AttributeMatrix::Type>(amTypeTmp)))
           {
             amProxy.setFlag(Qt::Checked);
           }
@@ -394,7 +395,7 @@ size_t AttributeMatrix::getNumberOfTuples() const
   }
 
   size_t numTuples = m_TupleDims[0];
-  for(int i = 1; i < m_TupleDims.size(); i++)
+  for(size_t i = 1; i < m_TupleDims.size(); i++)
   {
     numTuples *= m_TupleDims[i];
   }
@@ -480,7 +481,7 @@ void AttributeMatrix::resizeAttributeArrays(const std::vector<size_t>& tDims)
 {
   m_TupleDims = tDims;
   size_t numTuples = m_TupleDims[0];
-  for(int i = 1; i < m_TupleDims.size(); i++)
+  for(size_t i = 1; i < m_TupleDims.size(); i++)
   {
     numTuples *= m_TupleDims[i];
   }
@@ -762,7 +763,7 @@ ToolTipGenerator AttributeMatrix::getToolTipGenerator() const
 
   QLocale usa(QLocale::English, QLocale::UnitedStates);
   QString tupleStr = "(";
-  for(int i = 0; i < m_TupleDims.size(); i++)
+  for(size_t i = 0; i < m_TupleDims.size(); i++)
   {
     QString numStr = usa.toString(static_cast<qlonglong>(m_TupleDims[i]));
     tupleStr = tupleStr + numStr;
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index be0e2d8df8..306bc0c0d6 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -150,7 +150,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
     Any = 4294967295U
   };
 
-  using Types = QVector<Type>;
+  using Types = std::vector<Type>;
 
   /**
    * @brief TypeToString Returns a String representation of the AttributeMatrix Type
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 13f7d04a79..82e9341f6a 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -54,6 +54,7 @@
 #include "SIMPLib/Geometry/TriangleGeom.h"
 #include "SIMPLib/Geometry/VertexGeom.h"
 #include "SIMPLib/Utilities/SIMPLH5DataReaderRequirements.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 
 #include "H5Support/H5ScopedSentinel.h"
 #include "H5Support/QH5Lite.h"
@@ -132,7 +133,7 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
     dcProxy.setName(dataContainerName);
     dcProxy.setFlag(Qt::Unchecked);
 
-    int32_t geometryType;
+    uint32_t geometryType;
     herr_t err = QH5Lite::readScalarAttribute(containerGid, SIMPL::Geometry::Geometry, SIMPL::Geometry::GeometryType, geometryType);
     if(err >= 0)
     {
@@ -140,14 +141,12 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
       if(req != nullptr)
       {
         IGeometry::Types geomTypes = req->getDCGeometryTypes();
-        if(geomTypes.empty() || geomTypes.contains(static_cast<IGeometry::Type>(geometryType)))
+        if(geomTypes.empty() || SIMPL::contains(geomTypes, static_cast<IGeometry::Type>(geometryType)))
         {
+          dcProxy.setFlag(Qt::Checked);
         }
-
-        dcProxy.setFlag(Qt::Checked);
       }
     }
-
     QString h5Path = h5InternalPath + "/" + dataContainerName;
     // Read the Attribute Matricies for this Data Container
     AttributeMatrix::ReadAttributeMatrixStructure(containerGid, &dcProxy, req, h5Path);
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index c6f31cf9a6..f732a95467 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -122,7 +122,7 @@ AttributeMatrixSelectionFilterParameter::RequirementType AttributeMatrixSelectio
   AttributeMatrixSelectionFilterParameter::RequirementType req;
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    req.amTypes = QVector<AttributeMatrix::Type>(1, attributeMatrixType);
+    req.amTypes = AttributeMatrix::Types(1, attributeMatrixType);
   }
   if(IGeometry::Type::Any != geometryType)
   {
@@ -234,13 +234,13 @@ IGeometry::Types AttributeMatrixSelectionFilterParameter::getDefaultGeometryType
 }
 
 // -----------------------------------------------------------------------------
-void AttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void AttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> AttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types AttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index 42f5ca883b..5ecf8aa539 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -180,12 +180,12 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
   /**
    * @brief Setter property for DefaultAttributeMatrixTypes
    */
-  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
   /**
    * @brief Getter property for DefaultAttributeMatrixTypes
    * @return Value of DefaultAttributeMatrixTypes
    */
-  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -237,7 +237,7 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
 
 private:
   IGeometry::Types m_DefaultGeometryTypes = {};
-  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   AttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   AttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index a8bb5e1352..c430835d09 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -120,7 +120,7 @@ DataArrayCreationFilterParameter::RequirementType DataArrayCreationFilterParamet
   DataArrayCreationFilterParameter::RequirementType req;
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    req.amTypes = QVector<AttributeMatrix::Type>(1, attributeMatrixType);
+    req.amTypes = AttributeMatrix::Types(1, attributeMatrixType);
   }
   if(IGeometry::Type::Any != geometryType)
   {
@@ -220,13 +220,13 @@ IGeometry::Types DataArrayCreationFilterParameter::getDefaultGeometryTypes() con
 }
 
 // -----------------------------------------------------------------------------
-void DataArrayCreationFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void DataArrayCreationFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> DataArrayCreationFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types DataArrayCreationFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index fe5acf7886..95b8d79f4b 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -176,12 +176,12 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
   /**
    * @brief Setter property for DefaultAttributeMatrixTypes
    */
-  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
   /**
    * @brief Getter property for DefaultAttributeMatrixTypes
    * @return Value of DefaultAttributeMatrixTypes
    */
-  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
@@ -233,7 +233,7 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
 
 private:
   IGeometry::Types m_DefaultGeometryTypes = {};
-  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   DataArrayCreationFilterParameter::SetterCallbackType m_SetterCallback = {};
   DataArrayCreationFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index c3f3053b86..15e7d4c5d6 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -114,7 +114,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
   req.amTypes = amTypes;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -137,7 +137,7 @@ DataArraySelectionFilterParameter::RequirementType DataArraySelectionFilterParam
   DataArraySelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -305,13 +305,13 @@ AttributeMatrix::Types DataArraySelectionFilterParameter::getDefaultAttributeMat
 }
 
 // -----------------------------------------------------------------------------
-void DataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+void DataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const std::vector<QString>& value)
 {
   m_DefaultAttributeArrayTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> DataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
+std::vector<QString> DataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
 {
   return m_DefaultAttributeArrayTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 9a55d173e0..c0b88218cb 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 
 #include <QtCore/QJsonObject>
 
@@ -94,7 +95,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
-    QVector<QString> daTypes;
+    std::vector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
   };
 
@@ -212,12 +213,12 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
   /**
    * @brief Setter property for DefaultAttributeArrayTypes
    */
-  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  void setDefaultAttributeArrayTypes(const std::vector<QString>& value);
   /**
    * @brief Getter property for DefaultAttributeArrayTypes
    * @return Value of DefaultAttributeArrayTypes
    */
-  QVector<QString> getDefaultAttributeArrayTypes() const;
+  std::vector<QString> getDefaultAttributeArrayTypes() const;
 
   /**
    * @param DefaultComponentDimensions Default component dimensions required for Attribute Array selections
@@ -284,7 +285,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 private:
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
-  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  std::vector<QString> m_DefaultAttributeArrayTypes = {};
   std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
   DataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   DataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
index aa94e43d88..a63e09e598 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -86,10 +86,6 @@ class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterPa
   using SetterCallbackType = std::function<void(DataContainerGrid)>;
   using GetterCallbackType = std::function<DataContainerGrid(void)>;
 
-  // using RequirementType = struct
-  //{
-  //  IGeometry::Types dcGeometryTypes;
-  //};
 
   /**
    * @brief New This function instantiates an instance of the DataContainerGridSelectionFilterParameter.  Specifying a RequirementType will
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index e277564228..ae8a16a757 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -121,7 +121,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   req.amTypes = amTypes;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -144,7 +144,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -152,7 +152,7 @@ MultiAttributeMatrixSelectionFilterParameter::RequirementType MultiAttributeMatr
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+    AttributeMatrix::Types amTypes(1, attributeMatrixType);
     req.amTypes = amTypes;
   }
   if(IGeometry::Type::Any != geometryType)
@@ -286,25 +286,25 @@ IGeometry::Types MultiAttributeMatrixSelectionFilterParameter::getDefaultGeometr
 }
 
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
 
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultAttributeArrayTypes(const std::vector<QString>& value)
 {
   m_DefaultAttributeArrayTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeArrayTypes() const
+std::vector<QString> MultiAttributeMatrixSelectionFilterParameter::getDefaultAttributeArrayTypes() const
 {
   return m_DefaultAttributeArrayTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 7b84111e3d..99dfe96ce6 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -92,7 +92,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
-    QVector<QString> daTypes;
+    std::vector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
   };
 
@@ -182,22 +182,22 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   /**
    * @brief Setter property for DefaultAttributeMatrixTypes
    */
-  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
   /**
    * @brief Getter property for DefaultAttributeMatrixTypes
    * @return Value of DefaultAttributeMatrixTypes
    */
-  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
    * @brief Setter property for DefaultAttributeArrayTypes
    */
-  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  void setDefaultAttributeArrayTypes(const std::vector<QString>& value);
   /**
    * @brief Getter property for DefaultAttributeArrayTypes
    * @return Value of DefaultAttributeArrayTypes
    */
-  QVector<QString> getDefaultAttributeArrayTypes() const;
+  std::vector<QString> getDefaultAttributeArrayTypes() const;
 
   /**
    * @brief Setter property for DefaultComponentDimensions
@@ -262,8 +262,8 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
 private:
   QVector<DataArrayPath> m_DefaultPaths = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
-  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  std::vector<QString> m_DefaultAttributeArrayTypes = {};
   std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
   MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index c96df52ea9..fd5252a816 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -120,7 +120,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   req.amTypes = amTypes;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -143,7 +143,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   MultiDataArraySelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -151,7 +151,7 @@ MultiDataArraySelectionFilterParameter::RequirementType MultiDataArraySelectionF
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+    AttributeMatrix::Types amTypes(1, attributeMatrixType);
     req.amTypes = amTypes;
   }
   if(IGeometry::Type::Any != geometryType)
@@ -285,25 +285,25 @@ IGeometry::Types MultiDataArraySelectionFilterParameter::getDefaultGeometryTypes
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void MultiDataArraySelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> MultiDataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types MultiDataArraySelectionFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+void MultiDataArraySelectionFilterParameter::setDefaultAttributeArrayTypes(const std::vector<QString>& value)
 {
   m_DefaultAttributeArrayTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> MultiDataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
+std::vector<QString> MultiDataArraySelectionFilterParameter::getDefaultAttributeArrayTypes() const
 {
   return m_DefaultAttributeArrayTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 6859cb28d2..887fd1cd50 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -92,7 +92,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
-    QVector<QString> daTypes;
+    std::vector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
   };
 
@@ -182,22 +182,22 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   /**
    * @brief Setter property for DefaultAttributeMatrixTypes
    */
-  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
   /**
    * @brief Getter property for DefaultAttributeMatrixTypes
    * @return Value of DefaultAttributeMatrixTypes
    */
-  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
    * @brief Setter property for DefaultAttributeArrayTypes
    */
-  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  void setDefaultAttributeArrayTypes(const std::vector<QString>& value);
   /**
    * @brief Getter property for DefaultAttributeArrayTypes
    * @return Value of DefaultAttributeArrayTypes
    */
-  QVector<QString> getDefaultAttributeArrayTypes() const;
+  std::vector<QString> getDefaultAttributeArrayTypes() const;
 
   /**
    * @brief Setter property for DefaultComponentDimensions
@@ -262,8 +262,8 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
 private:
   QVector<DataArrayPath> m_DefaultPaths = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
-  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  std::vector<QString> m_DefaultAttributeArrayTypes = {};
   std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
   MultiDataArraySelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   MultiDataArraySelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index bfd2b64a4c..2381cf6830 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -120,7 +120,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
   req.amTypes = amTypes;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -143,7 +143,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
   MultiDataContainerSelectionFilterParameter::RequirementType req;
   if(primitiveType.compare(SIMPL::Defaults::AnyPrimitive) != 0)
   {
-    req.daTypes = QVector<QString>(1, primitiveType);
+    req.daTypes = std::vector<QString>(1, primitiveType);
   }
   if(SIMPL::Defaults::AnyComponentSize != allowedCompDim)
   {
@@ -151,7 +151,7 @@ MultiDataContainerSelectionFilterParameter::RequirementType MultiDataContainerSe
   }
   if(AttributeMatrix::Type::Any != attributeMatrixType)
   {
-    QVector<AttributeMatrix::Type> amTypes(1, attributeMatrixType);
+    AttributeMatrix::Types amTypes(1, attributeMatrixType);
     req.amTypes = amTypes;
   }
   if(IGeometry::Type::Any != geometryType)
@@ -281,25 +281,25 @@ IGeometry::Types MultiDataContainerSelectionFilterParameter::getDefaultGeometryT
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionFilterParameter::setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value)
+void MultiDataContainerSelectionFilterParameter::setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value)
 {
   m_DefaultAttributeMatrixTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<AttributeMatrix::Type> MultiDataContainerSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
+AttributeMatrix::Types MultiDataContainerSelectionFilterParameter::getDefaultAttributeMatrixTypes() const
 {
   return m_DefaultAttributeMatrixTypes;
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionFilterParameter::setDefaultAttributeArrayTypes(const QVector<QString>& value)
+void MultiDataContainerSelectionFilterParameter::setDefaultAttributeArrayTypes(const std::vector<QString>& value)
 {
   m_DefaultAttributeArrayTypes = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> MultiDataContainerSelectionFilterParameter::getDefaultAttributeArrayTypes() const
+std::vector<QString> MultiDataContainerSelectionFilterParameter::getDefaultAttributeArrayTypes() const
 {
   return m_DefaultAttributeArrayTypes;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index d5cc3dcf94..7cc1321197 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 
 #include <QtCore/QJsonObject>
 
@@ -92,7 +93,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
-    QVector<QString> daTypes;
+    std::vector<QString> daTypes;
     std::vector<std::vector<size_t>> componentDimensions;
   };
 
@@ -182,22 +183,22 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   /**
    * @brief Setter property for DefaultAttributeMatrixTypes
    */
-  void setDefaultAttributeMatrixTypes(const QVector<AttributeMatrix::Type>& value);
+  void setDefaultAttributeMatrixTypes(const AttributeMatrix::Types& value);
   /**
    * @brief Getter property for DefaultAttributeMatrixTypes
    * @return Value of DefaultAttributeMatrixTypes
    */
-  QVector<AttributeMatrix::Type> getDefaultAttributeMatrixTypes() const;
+  AttributeMatrix::Types getDefaultAttributeMatrixTypes() const;
 
   /**
    * @brief Setter property for DefaultAttributeArrayTypes
    */
-  void setDefaultAttributeArrayTypes(const QVector<QString>& value);
+  void setDefaultAttributeArrayTypes(const std::vector<QString>& value);
   /**
    * @brief Getter property for DefaultAttributeArrayTypes
    * @return Value of DefaultAttributeArrayTypes
    */
-  QVector<QString> getDefaultAttributeArrayTypes() const;
+  std::vector<QString> getDefaultAttributeArrayTypes() const;
 
   /**
    * @brief Setter property for DefaultComponentDimensions
@@ -262,8 +263,8 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
 private:
   QStringList m_DefaultNames = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
-  QVector<AttributeMatrix::Type> m_DefaultAttributeMatrixTypes = {};
-  QVector<QString> m_DefaultAttributeArrayTypes = {};
+  AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
+  std::vector<QString> m_DefaultAttributeArrayTypes = {};
   std::vector<std::vector<size_t>> m_DefaultComponentDimensions = {};
   MultiDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   MultiDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 4ab94c4727..43c1ef84ed 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -35,7 +35,10 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <QMutex>
 #include <QtCore/QMap>
@@ -188,8 +191,8 @@ class SIMPLib_EXPORT IGeometry : public Observable
     Unknown = 101U
   };
 
-  using VtkCellTypes = QVector<VtkCellType>;
-  using Types = QVector<Type>;
+  using VtkCellTypes = std::vector<VtkCellType>;
+  using Types = std::vector<Type>;
 
   /**
    * @brief AttributeMatrixMap_t
diff --git a/Source/SIMPLib/Utilities/STLUtilities.hpp b/Source/SIMPLib/Utilities/STLUtilities.hpp
new file mode 100644
index 0000000000..8dfa763bd8
--- /dev/null
+++ b/Source/SIMPLib/Utilities/STLUtilities.hpp
@@ -0,0 +1,76 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+
+#include <algorithm>
+
+namespace SIMPL
+{
+
+/**
+ * @brief Returns boolean value if the container contains the value
+ * @param first STL Compatible Iterator
+ * @param last STL Compatible Iterator
+ * @param value Value to find in the container
+ * @return If the value is in the container using the "==" operator
+ */
+template <class Iterator, class T>
+constexpr bool contains(Iterator first, Iterator last, const T& value)
+{
+  // Can't use std::find in the implemention for constexpr until C++20
+
+  for(; first != last; ++first)
+  {
+    if(*first == value)
+    {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+/**
+ * @brief Returns boolean value if the container contains the value. The container **must** be STL compatible and
+ * implement the .cbegin() and cend() methods that return iterators
+ * @param container The container to check
+ * @param value The value to look for
+ * @return If the container has the value
+ */
+template <class T, typename K>
+bool contains(const T& container, const K& value)
+{
+  auto result = std::find(container.cbegin(), container.cend(), value);
+  return result != container.cend();
+}
+
+} // namespace SIMPL
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index d055f10ea7..c6968c4a1b 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -36,6 +36,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ToolTipGenerator.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UTFUtilities.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QtConverter.hpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/STLUtilities.hpp
 )
 
 set(SIMPLib_Utilities_SRCS
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
index 7e4815e71b..1579d7d056 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp
@@ -13,6 +13,7 @@
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 
 /**
  * @brief The FilterParameterWidgetUtils class implements some common methods that
@@ -56,9 +57,9 @@ class FilterParameterWidgetUtils
       }
       dcCombo->addItem(dcProxy.getName());
 
-      if(!geomTypes.isEmpty())
+      if(!geomTypes.empty())
       {
-        if(!geomTypes.contains(geomType))
+        if(!SIMPL::contains(geomTypes, geomType))
         {
           QStandardItemModel* model = qobject_cast<QStandardItemModel*>(dcCombo->model());
           if(nullptr != model)
@@ -107,7 +108,7 @@ class FilterParameterWidgetUtils
     // Loop over the data containers until we find the proper data container
     QList<DataContainerProxy> containers = dcaProxy.getDataContainers().values();
     QListIterator<DataContainerProxy> containerIter(containers);
-    QVector<AttributeMatrix::Type> defVec = fp->getDefaultAttributeMatrixTypes();
+    AttributeMatrix::Types defAmTypes = fp->getDefaultAttributeMatrixTypes();
     while(containerIter.hasNext())
     {
       DataContainerProxy dc = containerIter.next();
@@ -124,7 +125,7 @@ class FilterParameterWidgetUtils
           AttributeMatrix::Pointer am = dca->getAttributeMatrix(DataArrayPath(dc.getName(), amName, ""));
           amCombo->addItem(amName);
 
-          if(nullptr != am.get() && !defVec.isEmpty() && !defVec.contains(am->getType()))
+          if(nullptr != am.get() && !defAmTypes.empty() && !SIMPL::contains(defAmTypes, am->getType()))
           {
             QStandardItemModel* model = qobject_cast<QStandardItemModel*>(amCombo->model());
             if(nullptr != model)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 5ba964dbd5..c6100eb3c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -42,6 +42,7 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
@@ -215,7 +216,7 @@ void LinkedDataContainerSelectionWidget::createSelectionMenu()
     m_MenuMapper->setMapping(action, path);
     menu->addAction(action);
 
-    if(!geomTypes.isEmpty() && !geomTypes.contains(geomType) && !geomTypes.contains(IGeometry::Type::Any))
+    if(!geomTypes.empty() && !SIMPL::contains(geomTypes, geomType) && !SIMPL::contains(geomTypes, IGeometry::Type::Any))
     {
       action->setDisabled(true);
     }
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index b981111873..1d9559823f 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -45,12 +45,64 @@
 
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetUtils.hpp"
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
+namespace
+{
+
+/**
+ * @brief CheckPathRequirements This is a common function that 3 other methods below implement
+ * @param filter AbstractFilter
+ * @param path The DataArrayPath
+ * @param reqs The requirements
+ * @return Boolean if we pass or not.
+ */
+template <typename RequirementsType>
+bool CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const RequirementsType& reqs)
+{
+  if(nullptr == filter)
+  {
+    return false;
+  }
+  if(nullptr == filter->getDataContainerArray())
+  {
+    return false;
+  }
+
+  // Check that the DataContainer exists
+  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
+  if(nullptr == dc)
+  {
+    return false;
+  }
+
+  // Check Geometry
+  if(!reqs.dcGeometryTypes.empty())
+  {
+    // Unknown Geometry gets a pass
+    if(!SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Unknown))
+    {
+      IGeometry::Pointer geom = dc->getGeometry();
+      if(nullptr == geom)
+      {
+        return false;
+      }
+      if(!SIMPL::contains(reqs.dcGeometryTypes, geom->getGeometryType()) && !SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Any))
+      {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+} // namespace
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -179,41 +231,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-  if(nullptr == filter)
-  {
-    return false;
-  }
-  if(nullptr == filter->getDataContainerArray())
-  {
-    return false;
-  }
-
-  // Check that the DataContainer exists
-  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
-  if(nullptr == dc)
-  {
-    return false;
-  }
-
-  // Check Geometry
-  if(!reqs.dcGeometryTypes.empty())
-  {
-    // Unknown Geometry gets a pass
-    if(!reqs.dcGeometryTypes.contains(IGeometry::Type::Unknown))
-    {
-      IGeometry::Pointer geom = dc->getGeometry();
-      if(nullptr == geom)
-      {
-        return false;
-      }
-      if(!reqs.dcGeometryTypes.contains(geom->getGeometryType()) && !reqs.dcGeometryTypes.contains(IGeometry::Type::Any))
-      {
-        return false;
-      }
-    }
-  }
-
-  return true;
+  return CheckPathRequirements(filter, path, reqs);
 }
 
 // -----------------------------------------------------------------------------
@@ -225,39 +243,13 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-  if(nullptr == filter)
-  {
-    return false;
-  }
-  if(nullptr == filter->getDataContainerArray())
-  {
-    return false;
-  }
 
-  // Check that the DataContainer exists
-  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
-  if(nullptr == dc)
+  if(!CheckPathRequirements(filter, path, reqs))
   {
     return false;
   }
-
-  // Check if geometry exists and matches the requirements only if a geometry is required
-  if(!reqs.dcGeometryTypes.empty())
-  {
-    // Unknown Geometry gets a pass
-    if(!reqs.dcGeometryTypes.contains(IGeometry::Type::Unknown))
-    {
-      IGeometry::Pointer geom = dc->getGeometry();
-      if(nullptr == geom)
-      {
-        return false;
-      }
-      if(!reqs.dcGeometryTypes.contains(geom->getGeometryType()) && !reqs.dcGeometryTypes.contains(IGeometry::Type::Any))
-      {
-        return false;
-      }
-    }
-  }
+  // This is OK because one of the checks in the function above is if "dc" would be nullptr
+  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
 
   // Check AttributeMatrix
   AttributeMatrix::Pointer am = dc->getAttributeMatrix(path);
@@ -266,9 +258,9 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!reqs.amTypes.contains(AttributeMatrix::Type::Unknown))
+  if(!SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Unknown))
   {
-    if(!reqs.amTypes.empty() && !(reqs.amTypes.contains(am->getType()) || reqs.amTypes.contains(AttributeMatrix::Type::Any)))
+    if(!reqs.amTypes.empty() && !(SIMPL::contains(reqs.amTypes, am->getType()) || SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Any)))
     {
       return false;
     }
@@ -277,19 +269,6 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   return true;
 }
 
-// -----------------------------------------------------------------------------
-template <typename T>
-bool vectorContains(const std::vector<std::vector<T>>& container, const std::vector<T>& comparison)
-{
-  for(const auto& value : container)
-  {
-    if(value == comparison)
-    {
-      return true;
-    }
-  }
-  return false;
-}
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -299,39 +278,13 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-  if(nullptr == filter)
-  {
-    return false;
-  }
-  if(nullptr == filter->getDataContainerArray())
-  {
-    return false;
-  }
 
-  // Check that the DataContainer exists
-  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
-  if(nullptr == dc)
+  if(!CheckPathRequirements(filter, path, reqs))
   {
     return false;
   }
-
-  // Check if geometry exists and matches the requirements only if a geometry is required
-  if(!reqs.dcGeometryTypes.empty())
-  {
-    // Unknown Geometry gets a pass
-    if(!reqs.dcGeometryTypes.contains(IGeometry::Type::Unknown))
-    {
-      IGeometry::Pointer geom = dc->getGeometry();
-      if(nullptr == geom)
-      {
-        return false;
-      }
-      if(!reqs.dcGeometryTypes.contains(geom->getGeometryType()) && !reqs.dcGeometryTypes.contains(IGeometry::Type::Any))
-      {
-        return false;
-      }
-    }
-  }
+  // This is OK because one of the checks in the function above is if "dc" would be nullptr
+  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
 
   // Check AttributeMatrix
   AttributeMatrix::Pointer am = dc->getAttributeMatrix(path);
@@ -340,9 +293,9 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!reqs.amTypes.contains(AttributeMatrix::Type::Unknown))
+  if(!SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Unknown))
   {
-    if(!reqs.amTypes.empty() && !reqs.amTypes.contains(am->getType()) && !reqs.amTypes.contains(AttributeMatrix::Type::Any))
+    if(!reqs.amTypes.empty() && !(SIMPL::contains(reqs.amTypes, am->getType()) && SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Any)))
     {
       return false;
     }
@@ -355,7 +308,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!reqs.daTypes.empty() && !reqs.daTypes.contains(da->getTypeAsString()))
+  if(!reqs.daTypes.empty() && !SIMPL::contains(reqs.daTypes, da->getTypeAsString()))
   {
     return false;
   }
@@ -498,7 +451,7 @@ QString DataArrayPathSelectionWidget::createTooltipFooter() const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createGeomReqString(QVector<IGeometry::Type> geomTypes) const
+QString DataArrayPathSelectionWidget::createGeomReqString(const IGeometry::Types& geomTypes) const
 {
   QString reqStr = "<tr><td><i>Required Geometries:</i></td>";
   if(geomTypes.empty())
@@ -552,7 +505,7 @@ QString DataArrayPathSelectionWidget::createGeomReqString(QVector<IGeometry::Typ
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes) const
+QString DataArrayPathSelectionWidget::createAttrMatrixReqString(const AttributeMatrix::Types& amTypes) const
 {
   QString reqStr = "<tr><td><i>Required Matrix Type:</i></td>";
   if(amTypes.empty())
@@ -624,7 +577,7 @@ QString DataArrayPathSelectionWidget::createAttrMatrixReqString(QVector<Attribut
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QString DataArrayPathSelectionWidget::createDataArrayTypeString(QVector<QString> daTypes) const
+QString DataArrayPathSelectionWidget::createDataArrayTypeString(const std::vector<QString>& daTypes) const
 {
   QString reqStr = "<tr><td><i>Required Array Type:</i></td>";
   if(daTypes.empty())
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index d46318e6fe..00e95c0611 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -366,21 +366,21 @@ public slots:
    * @param geomTypes
    * @return
    */
-  QString createGeomReqString(QVector<IGeometry::Type> geomTypes) const;
+  QString createGeomReqString(const IGeometry::Types& geomTypes) const;
 
   /**
    * @brief Create the AttributeMatrix::Type requirements part of the tooltip
    * @param amTypes
    * @return
    */
-  QString createAttrMatrixReqString(QVector<AttributeMatrix::Type> amTypes) const;
+  QString createAttrMatrixReqString(const AttributeMatrix::Types& amTypes) const;
 
   /**
    * @brief Create the DataArray type requirements part of the tooltip
    * @param daTypes
    * @return
    */
-  QString createDataArrayTypeString(QVector<QString> daTypes) const;
+  QString createDataArrayTypeString(const std::vector<QString>& daTypes) const;
 
   /**
    * @brief Create the component requirements part of the tooltip
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index c073ebb72f..6803fb8a83 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -45,6 +45,7 @@
 #include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/STLUtilities.hpp"
 #include "SIMPLib/Utilities/StringOperations.h"
 
 #include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
@@ -452,9 +453,9 @@ void DataFormatPage::createAMSelectionMenu()
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
   DataContainerArray::Container containers = dca->getDataContainers();
-  QVector<QString> daTypes;               // = m_FilterParameter->getDefaultAttributeArrayTypes();
+  std::vector<QString> daTypes;           // = m_FilterParameter->getDefaultAttributeArrayTypes();
   QVector<std::vector<size_t>> cDims;     // = m_FilterParameter->getDefaultComponentDimensions();
-  QVector<AttributeMatrix::Type> amTypes; // = m_FilterParameter->getDefaultAttributeMatrixTypes();
+  AttributeMatrix::Types amTypes;         // = m_FilterParameter->getDefaultAttributeMatrixTypes();
   IGeometry::Types geomTypes;             // = m_FilterParameter->getDefaultGeometryTypes();
 
   for(DataContainer::Pointer dc : containers)
@@ -473,7 +474,7 @@ void DataFormatPage::createAMSelectionMenu()
     QMenu* dcMenu = btnMenu->addMenu(dc->getName()); // BtnMenu owns the new QMenu
     dcMenu->setDisabled(false);
 
-    if(!geomTypes.isEmpty() && !geomTypes.contains(geomType) && !geomTypes.contains(IGeometry::Type::Any))
+    if(!geomTypes.empty() && !SIMPL::contains(geomTypes, geomType) && !SIMPL::contains(geomTypes, IGeometry::Type::Any))
     {
       dcMenu->setDisabled(true);
     }
@@ -493,7 +494,7 @@ void DataFormatPage::createAMSelectionMenu()
       m_AMMenuMapper->setMapping(amAction, path);
 
       bool amIsNotNull = nullptr != am.get();
-      bool amValidType = !amTypes.isEmpty() && !amTypes.contains(am->getType());
+      bool amValidType = !amTypes.empty() && !SIMPL::contains(amTypes, am->getType());
 
       if(amIsNotNull && amValidType)
       {
@@ -560,7 +561,7 @@ void DataFormatPage::createDCSelectionMenu()
     connect(dcAction, SIGNAL(triggered(bool)), m_DCMenuMapper, SLOT(map()));
     m_DCMenuMapper->setMapping(dcAction, path);
 
-    if(!geomTypes.isEmpty() && !geomTypes.contains(geomType) && !geomTypes.contains(IGeometry::Type::Any))
+    if(!geomTypes.empty() && !SIMPL::contains(geomTypes, geomType) && !SIMPL::contains(geomTypes, IGeometry::Type::Any))
     {
       dcAction->setDisabled(true);
     }
@@ -1144,14 +1145,7 @@ void DataFormatPage::checkHeaders()
 // -----------------------------------------------------------------------------
 void DataFormatPage::checkHeaders(QVector<QString> headers)
 {
-  if(validateHeaders(headers))
-  {
-    m_HeadersHasErrors = false;
-  }
-  else
-  {
-    m_HeadersHasErrors = true;
-  }
+  m_HeadersHasErrors = !validateHeaders(headers);
 }
 
 // -----------------------------------------------------------------------------

From a441d713f1aaeed193ebc5fb1704c5aac6db1b3b Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 15 Feb 2021 16:39:41 -0500
Subject: [PATCH 334/397] Replace use of qproperties with FilterParameter
 callbacks instead (#418)

* Replace use of qproperties with FilterParameter callbacks instead
* Wrap FilterParameters with Python
* Update various FilterParameter types.
* Additional python wrapping of FilterParameter classes
* Convert from enum to type enum
* Fix Python runtime crash due to multiple AxisAngleInput definitions
* Other python wrapping improvements
* Register QMetaObjects for SIMPLArray type alias.
* Change StackFileListInfo to match Python expectations

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Common/ShapeType.h             |   2 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |   2 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   8 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |   8 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |  20 +-
 .../CoreFilters/ConditionalSetValue.cpp       |   6 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  15 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |   2 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   7 +-
 .../CopyFeatureArrayToElementArray.cpp        |  12 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  10 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   6 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |  12 +-
 .../CoreFilters/CreateDataContainer.cpp       |   2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  14 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  70 +++----
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp |   4 +-
 .../CoreFilters/CreateImageGeometry.cpp       |  10 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   4 +-
 .../CoreFilters/CropVertexGeometry.cpp        |  16 +-
 .../CoreFilters/DataContainerReader.cpp       |   4 +-
 .../CoreFilters/DataContainerWriter.cpp       |   6 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   2 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |  36 ++--
 .../CoreFilters/ExtractComponentAsArray.cpp   |   7 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |  10 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   6 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |  12 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |   4 +-
 .../CoreFilters/GenerateColorTable.cpp        |   6 +-
 .../CoreFilters/GenerateTiltSeries.cpp        |  10 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |  14 +-
 .../SIMPLib/CoreFilters/ImportHDF5Dataset.cpp |  14 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |  22 +-
 .../LinkFeatureMapToElementArray.cpp          |  12 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   4 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |   2 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  10 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  10 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   4 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   4 +-
 .../CoreFilters/PipelineAnnotation.cpp        |   2 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |   8 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |  12 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |   2 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |  11 +-
 .../CoreFilters/RenameAttributeArray.cpp      |   4 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |   4 +-
 .../CoreFilters/RenameDataContainer.cpp       |   4 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |   6 +-
 .../CoreFilters/RequiredZThickness.cpp        |   6 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |  10 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  10 +-
 .../SetOriginResolutionImageGeom.cpp          |  10 +-
 .../CoreFilters/SplitAttributeArray.cpp       |   4 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  14 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   6 +-
 .../AbstractFilterParametersReader.cpp        |  16 +-
 .../AbstractFilterParametersReader.h          |  21 +-
 .../AbstractFilterParametersWriter.cpp        |  10 +-
 .../AbstractFilterParametersWriter.h          |  10 +-
 ...AttributeMatrixCreationFilterParameter.cpp |   6 +-
 .../AttributeMatrixCreationFilterParameter.h  |  14 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   6 +-
 .../AttributeMatrixSelectionFilterParameter.h |  14 +-
 .../AxisAngleFilterParameter.cpp              |   8 +-
 .../AxisAngleFilterParameter.h                |  18 +-
 .../FilterParameters/AxisAngleInput.cpp       |  63 ++++++
 .../SIMPLib/FilterParameters/AxisAngleInput.h |  59 ++++--
 .../BooleanFilterParameter.cpp                |   4 +-
 .../FilterParameters/BooleanFilterParameter.h |  14 +-
 .../CalculatorFilterParameter.cpp             |   4 +-
 .../CalculatorFilterParameter.h               |  14 +-
 .../ChoiceFilterParameter.cpp                 |   4 +-
 .../FilterParameters/ChoiceFilterParameter.h  |  14 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   8 +-
 ...mparisonSelectionAdvancedFilterParameter.h |  14 +-
 .../ComparisonSelectionFilterParameter.cpp    |   6 +-
 .../ComparisonSelectionFilterParameter.h      |  14 +-
 .../ConstrainedDoubleFilterParameter.cpp      |   7 +-
 .../ConstrainedDoubleFilterParameter.h        |  20 +-
 .../ConstrainedFilterParameter.h              |  66 ++++--
 .../ConstrainedIntFilterParameter.cpp         |   6 +-
 .../ConstrainedIntFilterParameter.h           |  19 +-
 .../DataArrayCreationFilterParameter.cpp      |   5 +-
 .../DataArrayCreationFilterParameter.h        |  14 +-
 .../DataArraySelectionFilterParameter.cpp     |   6 +-
 .../DataArraySelectionFilterParameter.h       |  14 +-
 ...DataContainerArrayProxyFilterParameter.cpp |   6 +-
 .../DataContainerArrayProxyFilterParameter.h  |  14 +-
 .../DataContainerCreationFilterParameter.cpp  |   4 +-
 .../DataContainerCreationFilterParameter.h    |  14 +-
 ...aContainerGridSelectionFilterParameter.cpp |   6 +-
 ...ataContainerGridSelectionFilterParameter.h |  14 +-
 .../DataContainerReaderFilterParameter.cpp    |   4 +-
 .../DataContainerReaderFilterParameter.h      |  10 +-
 .../DataContainerSelectionFilterParameter.cpp |   6 +-
 .../DataContainerSelectionFilterParameter.h   |  14 +-
 .../DoubleFilterParameter.cpp                 |  23 +--
 .../FilterParameters/DoubleFilterParameter.h  |  33 +--
 .../DynamicChoiceFilterParameter.cpp          |   5 +-
 .../DynamicChoiceFilterParameter.h            |  14 +-
 .../DynamicTableFilterParameter.cpp           |   4 +-
 .../DynamicTableFilterParameter.h             |  14 +-
 .../SIMPLib/FilterParameters/FileListInfo.h   |   1 +
 .../FileListInfoFilterParameter.cpp           |   4 +-
 .../FileListInfoFilterParameter.h             |  12 +-
 .../FilterParameters/FilterParameter.cpp      |   2 +-
 .../FilterParameters/FilterParameter.h        |  31 ++-
 ...ameter.cpp => Float2ndOrderPolynomial.cpp} |  71 +++----
 .../Float2ndOrderPolynomial.h                 |  86 ++++++++
 .../Float4thOrderPolynomial.cpp               |  69 +++++++
 .../Float4thOrderPolynomial.h                 |  53 +++++
 .../FilterParameters/FloatFilterParameter.cpp |   4 +-
 .../FilterParameters/FloatFilterParameter.h   |  16 +-
 .../FloatVec2FilterParameter.cpp              |   4 +-
 .../FloatVec2FilterParameter.h                |  14 +-
 .../FloatVec3FilterParameter.cpp              |   4 +-
 .../FloatVec3FilterParameter.h                |  14 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |  10 +-
 .../FourthOrderPolynomialFilterParameter.h    |  86 ++------
 .../GenerateColorTableFilterParameter.cpp     |   4 +-
 .../GenerateColorTableFilterParameter.h       |  10 +-
 .../H5FilterParametersReader.cpp              |  16 +-
 .../H5FilterParametersReader.h                |   8 +-
 .../H5FilterParametersWriter.cpp              |  10 +-
 .../H5FilterParametersWriter.h                |  10 +-
 .../ImportHDF5DatasetFilterParameter.cpp      |   4 +-
 .../ImportHDF5DatasetFilterParameter.h        |  12 +-
 .../InputFileFilterParameter.cpp              |   6 +-
 .../InputFileFilterParameter.h                |  14 +-
 .../InputPathFilterParameter.cpp              |   6 +-
 .../InputPathFilterParameter.h                |  14 +-
 .../FilterParameters/IntFilterParameter.cpp   |   4 +-
 .../FilterParameters/IntFilterParameter.h     |  14 +-
 .../IntVec2FilterParameter.cpp                |   4 +-
 .../FilterParameters/IntVec2FilterParameter.h |  15 +-
 .../IntVec3FilterParameter.cpp                |   4 +-
 .../FilterParameters/IntVec3FilterParameter.h |  15 +-
 .../LinkedBooleanFilterParameter.cpp          |   6 +-
 .../LinkedBooleanFilterParameter.h            |  14 +-
 .../LinkedChoicesFilterParameter.cpp          |   6 +-
 .../LinkedChoicesFilterParameter.h            |  13 +-
 ...dDataContainerSelectionFilterParameter.cpp |   8 +-
 ...kedDataContainerSelectionFilterParameter.h |  12 +-
 .../LinkedPathCreationFilterParameter.cpp     |   6 +-
 .../LinkedPathCreationFilterParameter.h       |  42 ++--
 .../FilterParameters/MontageFileListInfo.cpp  |   9 +
 .../FilterParameters/MontageFileListInfo.h    |  15 +-
 .../MontageSelectionFilterParameter.cpp       |   4 +-
 .../MontageSelectionFilterParameter.h         |  14 +-
 ...ntageStructureSelectionFilterParameter.cpp |   5 +-
 ...MontageStructureSelectionFilterParameter.h |  14 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   8 +-
 ...iAttributeMatrixSelectionFilterParameter.h |  14 +-
 ...MultiDataArraySelectionFilterParameter.cpp |   6 +-
 .../MultiDataArraySelectionFilterParameter.h  |  14 +-
 ...iDataContainerSelectionFilterParameter.cpp |   6 +-
 ...ltiDataContainerSelectionFilterParameter.h |  14 +-
 .../MultiInputFileFilterParameter.cpp         |   6 +-
 .../MultiInputFileFilterParameter.h           |  14 +-
 .../NumericTypeFilterParameter.cpp            |   4 +-
 .../NumericTypeFilterParameter.h              |  14 +-
 .../OutputFileFilterParameter.cpp             |   6 +-
 .../OutputFileFilterParameter.h               |  14 +-
 .../OutputPathFilterParameter.cpp             |   6 +-
 .../OutputPathFilterParameter.h               |  14 +-
 .../ParagraphFilterParameter.cpp              |   4 +-
 .../ParagraphFilterParameter.h                |  14 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |   8 +-
 .../PhaseTypeSelectionFilterParameter.h       |  14 +-
 .../PreflightUpdatedValueFilterParameter.cpp  |   4 +-
 .../PreflightUpdatedValueFilterParameter.h    |  12 +-
 .../FilterParameters/RangeFilterParameter.cpp |   4 +-
 .../FilterParameters/RangeFilterParameter.h   |  14 +-
 .../ReadASCIIDataFilterParameter.cpp          |   2 +-
 .../ReadASCIIDataFilterParameter.h            |  19 +-
 .../ScalarTypeFilterParameter.cpp             |   4 +-
 .../ScalarTypeFilterParameter.h               |  14 +-
 .../SecondOrderPolynomialFilterParameter.cpp  |  10 +-
 .../SecondOrderPolynomialFilterParameter.h    |  56 ++---
 .../SeparatorFilterParameter.cpp              |   2 +-
 .../SeparatorFilterParameter.h                |  11 +-
 .../ShapeTypeSelectionFilterParameter.cpp     |   6 +-
 .../ShapeTypeSelectionFilterParameter.h       |  14 +-
 .../SIMPLib/FilterParameters/SourceList.cmake |   6 +
 .../FilterParameters/StackFileListInfo.cpp    |  15 ++
 .../FilterParameters/StackFileListInfo.h      |  67 +++++-
 .../StringFilterParameter.cpp                 |   4 +-
 .../FilterParameters/StringFilterParameter.h  |  14 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp    | 194 +++++++++---------
 .../ThirdOrderPolynomialFilterParameter.cpp   |   6 +-
 .../ThirdOrderPolynomialFilterParameter.h     |  14 +-
 .../UInt64FilterParameter.cpp                 |   4 +-
 .../FilterParameters/UInt64FilterParameter.h  |  14 +-
 .../UnknownFilterParameter.cpp                |   2 +-
 .../FilterParameters/UnknownFilterParameter.h |  10 +-
 .../Filtering/QMetaObjectUtilities.cpp        |  24 ++-
 Source/SIMPLib/Geometry/IGeometry.h           |   2 +-
 Source/SIMPLib/Geometry/ImageGeom.h           |   2 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |   2 +-
 .../ListFilterParametersController.cpp        |   2 +-
 .../TestFilters/ArraySelectionExample.cpp     |  12 +-
 .../TestFilters/DynamicTableExample.cpp       |  10 +-
 .../TestFilters/ErrorWarningFilter.cpp        |  10 +-
 Source/SIMPLib/TestFilters/Filt0.cpp          |   4 +-
 Source/SIMPLib/TestFilters/Filt1.cpp          |   4 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  94 ++++-----
 Source/SIMPLib/TestFilters/GenericExample.h   |  30 +--
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |  10 +-
 .../AttributeMatrixCreationWidget.cpp         |  12 +-
 .../AttributeMatrixSelectionWidget.cpp        |   8 +-
 .../AxisAngleWidget.cpp                       |   6 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |  13 +-
 .../CalculatorWidget.cpp                      |   4 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   2 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |   9 +-
 .../ComparisonSelectionAdvancedWidget.h       |  12 +-
 .../ConstrainedDoubleWidget.cpp               |   5 +-
 .../ConstrainedIntWidget.cpp                  |   4 +-
 .../DataArrayCreationWidget.cpp               |   7 +-
 .../DataArraySelectionWidget.cpp              |   7 +-
 .../DataContainerArrayProxyWidget.cpp         |   2 +-
 .../DataContainerCreationWidget.cpp           |   5 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |   7 +-
 .../DynamicChoiceWidget.cpp                   |   2 +-
 .../DynamicTableWidget.cpp                    |  14 +-
 .../FileListInfoWidget.cpp                    |  11 +-
 .../FilterParameterWidget.h                   |   2 +-
 .../FloatVec2Widget.cpp                       |   2 +-
 .../FloatVec3Widget.cpp                       |   2 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |   7 +-
 .../FourthOrderPolynomialWidget.cpp           |   6 +-
 .../InputFileWidget.cpp                       |   2 -
 .../InputPathWidget.cpp                       |   4 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |   2 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   2 +-
 .../FilterParameterWidgets/IntWidget.cpp      |   5 +-
 .../LinkedBooleanWidget.cpp                   |  14 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   4 +-
 .../LinkedPathCreationWidget.cpp              |   4 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |  11 +-
 .../MultiAttributeMatrixSelectionWidget.h     |   4 +-
 .../MultiDataArraySelectionWidget.cpp         |   2 +-
 .../MultiDataContainerSelectionWidget.cpp     |   2 +-
 .../NumericTypeWidget.cpp                     |   4 +-
 .../OutputFileWidget.cpp                      |   2 +-
 .../OutputPathWidget.cpp                      |   4 +-
 .../ParagraphWidget.cpp                       |  12 +-
 .../PhaseTypeSelectionWidget.cpp              |   3 +-
 .../PreflightUpdatedValueWidget.cpp           |  16 +-
 .../ReadASCIIDataWidget.cpp                   |   2 +-
 .../ScalarTypeWidget.cpp                      |   5 +-
 .../SecondOrderPolynomialWidget.cpp           |   6 +-
 .../ShapeTypeSelectionWidget.cpp              |   2 +-
 .../FilterParameterWidgets/StringWidget.cpp   |   4 +-
 .../ThirdOrderPolynomialWidget.cpp            |   2 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |   4 +-
 .../SVWidgetsLib/Widgets/DataStructureItem.h  |   2 +-
 .../SVWidgetsLib/Widgets/DataStructureModel.h |   2 +-
 .../Widgets/FilterInputWidget.cpp             |   6 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.h    |   2 +-
 Source/SVWidgetsLib/Widgets/PopUpWidget.h     |   2 +-
 Source/SVWidgetsLib/Widgets/StatusBarWidget.h |   2 +-
 Wrapping/Python/Binding/pySIMPLBody.cpp       |  23 ---
 Wrapping/Python/Binding/pySIMPLHeader.cpp     |   3 -
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  |   2 +-
 269 files changed, 1985 insertions(+), 1286 deletions(-)
 create mode 100644 Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
 rename Source/SIMPLib/FilterParameters/{ConstrainedFilterParameter.cpp => Float2ndOrderPolynomial.cpp} (62%)
 create mode 100644 Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
 create mode 100644 Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.h

diff --git a/Source/SIMPLib/Common/ShapeType.h b/Source/SIMPLib/Common/ShapeType.h
index b8e29f8e1a..e6e4db987a 100644
--- a/Source/SIMPLib/Common/ShapeType.h
+++ b/Source/SIMPLib/Common/ShapeType.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT ShapeType
 public:
   virtual ~ShapeType();
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class Type : EnumType
   {
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index aaf6e32059..a719b7a45a 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -79,7 +79,7 @@ void ApplyImageTransforms::setupFilterParameters()
   {
     MultiDataContainerSelectionFilterParameter::RequirementType req =
         MultiDataContainerSelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Cell, IGeometry::Type::Image);
-    parameters.push_back(SIMPL_NEW_MDC_SELECTION_FP("Image Data Containers", ImageDataContainers, FilterParameter::RequiredArray, ApplyImageTransforms, req));
+    parameters.push_back(SIMPL_NEW_MDC_SELECTION_FP("Image Data Containers", ImageDataContainers, FilterParameter::Category::RequiredArray, ApplyImageTransforms, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index d2eb0308c7..5aac72d93e 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -162,16 +162,16 @@ void ArrayCalculator::setupFilterParameters()
   FilterParameterVectorType parameters;
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::Any, IGeometry::Type::Any);
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", SelectedAttributeMatrix, FilterParameter::Parameter, ArrayCalculator, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", SelectedAttributeMatrix, FilterParameter::Category::Parameter, ArrayCalculator, req));
   }
 
-  parameters.push_back(SIMPL_NEW_CALC_FP("Infix Expression", InfixEquation, FilterParameter::Parameter, ArrayCalculator));
+  parameters.push_back(SIMPL_NEW_CALC_FP("Infix Expression", InfixEquation, FilterParameter::Category::Parameter, ArrayCalculator));
 
-  parameters.push_back(SIMPL_NEW_SCALARTYPE_FP("Scalar Type", ScalarType, FilterParameter::CreatedArray, ArrayCalculator));
+  parameters.push_back(SIMPL_NEW_SCALARTYPE_FP("Scalar Type", ScalarType, FilterParameter::Category::CreatedArray, ArrayCalculator));
 
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Any, IGeometry::Type::Any);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Calculated Array", CalculatedArray, FilterParameter::CreatedArray, ArrayCalculator, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Calculated Array", CalculatedArray, FilterParameter::Category::CreatedArray, ArrayCalculator, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 5bef9914bd..e057207a8e 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -197,14 +197,14 @@ CombineAttributeArrays::~CombineAttributeArrays() = default;
 void CombineAttributeArrays::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Normalize Data", NormalizeData, FilterParameter::Parameter, CombineAttributeArrays));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Move Data", MoveValues, FilterParameter::Parameter, CombineAttributeArrays));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Normalize Data", NormalizeData, FilterParameter::Category::Parameter, CombineAttributeArrays));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Move Data", MoveValues, FilterParameter::Category::Parameter, CombineAttributeArrays));
   {
     MultiDataArraySelectionFilterParameter::RequirementType req =
         MultiDataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Arrays to Combine", SelectedDataArrayPaths, FilterParameter::RequiredArray, CombineAttributeArrays, req));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Arrays to Combine", SelectedDataArrayPaths, FilterParameter::Category::RequiredArray, CombineAttributeArrays, req));
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Combined Data", StackedDataArrayName, FilterParameter::CreatedArray, CombineAttributeArrays));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Combined Data", StackedDataArrayName, FilterParameter::Category::CreatedArray, CombineAttributeArrays));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index e725cb4fa8..b1d802b8d5 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -78,7 +78,7 @@ CombineAttributeMatrices::~CombineAttributeMatrices() = default;
 void CombineAttributeMatrices::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SeparatorFilterParameter::New("Feature/Ensemble Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature/Ensemble Data", FilterParameter::Category::RequiredArray));
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
     IGeometry::Types dcGeomTypes;
@@ -94,8 +94,8 @@ void CombineAttributeMatrices::setupFilterParameters()
     dcGeomTypes.push_back(IGeometry::Type::Any);
     req.amTypes = amTypes;
     req.dcGeometryTypes = dcGeomTypes;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("First Feature/Ensemble Attribute Matrix", FirstAttributeMatrixPath, FilterParameter::RequiredArray, CombineAttributeMatrices, req));
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Second Feature/Ensemble Attribute Matrix", SecondAttributeMatrixPath, FilterParameter::RequiredArray, CombineAttributeMatrices, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("First Feature/Ensemble Attribute Matrix", FirstAttributeMatrixPath, FilterParameter::Category::RequiredArray, CombineAttributeMatrices, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Second Feature/Ensemble Attribute Matrix", SecondAttributeMatrixPath, FilterParameter::Category::RequiredArray, CombineAttributeMatrices, req));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req;
@@ -120,14 +120,16 @@ void CombineAttributeMatrices::setupFilterParameters()
     req.amTypes = amTypes;
     req.daTypes = daTypes;
     req.componentDimensions = compDims;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("First Index Array", FirstIndexArrayPath, FilterParameter::RequiredArray, CombineAttributeMatrices, req));
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Second Index Array", SecondIndexArrayPath, FilterParameter::RequiredArray, CombineAttributeMatrices, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("First Index Array", FirstIndexArrayPath, FilterParameter::Category::RequiredArray, CombineAttributeMatrices, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Second Index Array", SecondIndexArrayPath, FilterParameter::Category::RequiredArray, CombineAttributeMatrices, req));
   }
 
-  parameters.push_back(SeparatorFilterParameter::New("Cell/Feature Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("New Index Array", NewIndexArrayName, FirstIndexArrayPath, FirstIndexArrayPath, FilterParameter::CreatedArray, CombineAttributeMatrices));
-  parameters.push_back(SeparatorFilterParameter::New("Feature/Ensemble Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Combined Attribute Matrix", CombinedAttributeMatrixName, FirstAttributeMatrixPath, FilterParameter::CreatedArray, CombineAttributeMatrices));
+  parameters.push_back(SeparatorFilterParameter::Create("Cell/Feature Data", FilterParameter::Category::CreatedArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("New Index Array", NewIndexArrayName, FirstIndexArrayPath, FirstIndexArrayPath, FilterParameter::Category::CreatedArray, CombineAttributeMatrices));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature/Ensemble Data", FilterParameter::Category::CreatedArray));
+  parameters.push_back(
+      SIMPL_NEW_AM_WITH_LINKED_DC_FP("Combined Attribute Matrix", CombinedAttributeMatrixName, FirstAttributeMatrixPath, FilterParameter::Category::CreatedArray, CombineAttributeMatrices));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 5d6455a3cb..6479fe8072 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -68,14 +68,14 @@ ConditionalSetValue::~ConditionalSetValue() = default;
 void ConditionalSetValue::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Parameter, ConditionalSetValue));
+  parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Category::Parameter, ConditionalSetValue));
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Conditional Array", ConditionalArrayPath, FilterParameter::RequiredArray, ConditionalSetValue, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Conditional Array", ConditionalArrayPath, FilterParameter::Category::RequiredArray, ConditionalSetValue, req));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, ConditionalSetValue, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array", SelectedArrayPath, FilterParameter::Category::RequiredArray, ConditionalSetValue, req));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 77ed2024ad..4336f98633 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -47,6 +47,7 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/AbstractFilterParametersReader.h"
 #include "SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h"
+#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
@@ -227,24 +228,24 @@ void ConvertColorToGrayScale::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(ConvertColorToGrayScale, this, ConversionAlgorithm));
     parameter->setChoices(choices);
     parameter->setLinkedProperties(linkedProps);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
 
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Color Weighting", ColorWeights, FilterParameter::Parameter, ConvertColorToGrayScale, 0));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Color Weighting", ColorWeights, FilterParameter::Category::Parameter, ConvertColorToGrayScale, 0));
 
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Color Channel", ColorChannel, FilterParameter::Parameter, ConvertColorToGrayScale, 3));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Color Channel", ColorChannel, FilterParameter::Category::Parameter, ConvertColorToGrayScale, 3));
 
   MultiDataArraySelectionFilterParameter::RequirementType req;
   req.dcGeometryTypes = IGeometry::Types(1, IGeometry::Type::Image);
   req.amTypes = AttributeMatrix::Types(1, AttributeMatrix::Type::Cell);
-  parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Input Attribute Arrays", InputDataArrayVector, FilterParameter::RequiredArray, ConvertColorToGrayScale, req));
+  parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Input Attribute Arrays", InputDataArrayVector, FilterParameter::Category::RequiredArray, ConvertColorToGrayScale, req));
 
   QStringList linkedProps("OutputAttributeMatrixName");
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Create Attribute Matrix", CreateNewAttributeMatrix, FilterParameter::Parameter, ConvertColorToGrayScale, linkedProps));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Output Cell Attribute Matrix", OutputAttributeMatrixName, FilterParameter::CreatedArray, ConvertColorToGrayScale));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Create Attribute Matrix", CreateNewAttributeMatrix, FilterParameter::Category::Parameter, ConvertColorToGrayScale, linkedProps));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Output Cell Attribute Matrix", OutputAttributeMatrixName, FilterParameter::Category::CreatedArray, ConvertColorToGrayScale));
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Output Array Prefix", OutputArrayPrefix, FilterParameter::CreatedArray, ConvertColorToGrayScale));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Output Array Prefix", OutputArrayPrefix, FilterParameter::Category::CreatedArray, ConvertColorToGrayScale));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 21e7ad26bb..a4e89b1af6 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -92,7 +92,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
 
   ~ConvertColorToGrayScale() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
   enum class ConversionType : EnumType
   {
     Luminosity = 0,
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index e315c5514a..c265e78efa 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -208,14 +208,15 @@ void ConvertData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, ConvertData));
+  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Category::Parameter, ConvertData));
 
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Convert", SelectedCellArrayPath, FilterParameter::RequiredArray, ConvertData, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Convert", SelectedCellArrayPath, FilterParameter::Category::RequiredArray, ConvertData, req));
   }
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Converted Attribute Array", OutputArrayName, SelectedCellArrayPath, SelectedCellArrayPath, FilterParameter::CreatedArray, ConvertData));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Converted Attribute Array", OutputArrayName, SelectedCellArrayPath, SelectedCellArrayPath, FilterParameter::Category::CreatedArray, ConvertData));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index e892302ed0..100f212d2d 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -72,22 +72,22 @@ CopyFeatureArrayToElementArray::~CopyFeatureArrayToElementArray() = default;
 void CopyFeatureArrayToElementArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature Data", FilterParameter::Category::RequiredArray));
 
   {
     DataArraySelectionFilterParameter::RequirementType req =
         DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Category::Feature);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Data to Copy to Element Data", SelectedFeatureArrayPath, FilterParameter::RequiredArray, CopyFeatureArrayToElementArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Data to Copy to Element Data", SelectedFeatureArrayPath, FilterParameter::Category::RequiredArray, CopyFeatureArrayToElementArray, req));
   }
-  parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Element Data", FilterParameter::Category::RequiredArray));
 
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int32, 1, AttributeMatrix::Category::Element);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::RequiredArray, CopyFeatureArrayToElementArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Category::RequiredArray, CopyFeatureArrayToElementArray, req));
   }
-  parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::CreatedArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Element Data", FilterParameter::Category::CreatedArray));
   parameters.push_back(
-      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, FeatureIdsArrayPath, FeatureIdsArrayPath, FilterParameter::CreatedArray, CopyFeatureArrayToElementArray));
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, FeatureIdsArrayPath, FeatureIdsArrayPath, FilterParameter::Category::CreatedArray, CopyFeatureArrayToElementArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index d95272f89e..acd86c9cb4 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -95,22 +95,22 @@ void CopyObject::setupFilterParameters()
                 << "AttributeArrayToCopy";
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container to Copy", DataContainerToCopy, FilterParameter::RequiredArray, CopyObject, req, 0));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container to Copy", DataContainerToCopy, FilterParameter::Category::RequiredArray, CopyObject, req, 0));
   }
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix to Copy", AttributeMatrixToCopy, FilterParameter::RequiredArray, CopyObject, req, 1));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix to Copy", AttributeMatrixToCopy, FilterParameter::Category::RequiredArray, CopyObject, req, 1));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Copy", AttributeArrayToCopy, FilterParameter::RequiredArray, CopyObject, req, 2));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Copy", AttributeArrayToCopy, FilterParameter::Category::RequiredArray, CopyObject, req, 2));
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Copied Object Name", CopiedObjectName, FilterParameter::CreatedArray, CopyObject));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Copied Object Name", CopiedObjectName, FilterParameter::Category::CreatedArray, CopyObject));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 127489afb4..43ecbcdcfa 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -87,14 +87,14 @@ void CreateAttributeMatrix::setupFilterParameters()
     choices.push_back("CellEnsemble");
     choices.push_back("MetaData");
     choices.push_back("Generic");
-    parameters.push_back(SIMPL_NEW_CHOICE_FP("Attribute Matrix Type", AttributeMatrixType, FilterParameter::Parameter, CreateAttributeMatrix, choices, false));
+    parameters.push_back(SIMPL_NEW_CHOICE_FP("Attribute Matrix Type", AttributeMatrixType, FilterParameter::Category::Parameter, CreateAttributeMatrix, choices, false));
   }
 
   m_TupleDimensions.setDynamicCols(true);
-  parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Tuple Dimensions", TupleDimensions, FilterParameter::Parameter, CreateAttributeMatrix));
+  parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Tuple Dimensions", TupleDimensions, FilterParameter::Category::Parameter, CreateAttributeMatrix));
   {
     AttributeMatrixCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::CreatedArray, CreateAttributeMatrix, req));
+    parameters.push_back(SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::Category::CreatedArray, CreateAttributeMatrix, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 06527ba1f5..c177db1132 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -279,8 +279,8 @@ void CreateDataArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_SCALARTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, CreateDataArray));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Parameter, CreateDataArray));
+  parameters.push_back(SIMPL_NEW_SCALARTYPE_FP("Scalar Type", ScalarType, FilterParameter::Category::Parameter, CreateDataArray));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Category::Parameter, CreateDataArray));
 
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
@@ -300,14 +300,14 @@ void CreateDataArray::setupFilterParameters()
                 << "InitializationRange";
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Initialization Value", InitializationValue, FilterParameter::Parameter, CreateDataArray, Manual));
-  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitializationRange, FilterParameter::Parameter, CreateDataArray, RandomWithRange));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Initialization Value", InitializationValue, FilterParameter::Category::Parameter, CreateDataArray, Manual));
+  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitializationRange, FilterParameter::Category::Parameter, CreateDataArray, RandomWithRange));
   {
     DataArrayCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Attribute Array", NewArray, FilterParameter::CreatedArray, CreateDataArray, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Attribute Array", NewArray, FilterParameter::Category::CreatedArray, CreateDataArray, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index abf067097d..73e78c5031 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -67,7 +67,7 @@ CreateDataContainer::~CreateDataContainer() = default;
 void CreateDataContainer::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::CreatedArray, CreateDataContainer));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::Category::CreatedArray, CreateDataContainer));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 62d87f37fa..bd54a82829 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -74,23 +74,23 @@ CreateFeatureArrayFromElementArray::~CreateFeatureArrayFromElementArray() = defa
 void CreateFeatureArrayFromElementArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Element Data", FilterParameter::Category::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req =
         DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Category::Element);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Element Data to Copy to Feature Data", SelectedCellArrayPath, FilterParameter::RequiredArray, CreateFeatureArrayFromElementArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Element Data to Copy to Feature Data", SelectedCellArrayPath, FilterParameter::Category::RequiredArray, CreateFeatureArrayFromElementArray, req));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int32, 1, AttributeMatrix::Category::Element);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::RequiredArray, CreateFeatureArrayFromElementArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Category::RequiredArray, CreateFeatureArrayFromElementArray, req));
   }
-  parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::CreatedArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature Data", FilterParameter::Category::CreatedArray));
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::CellFeature, IGeometry::Type::Any);
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, CreateFeatureArrayFromElementArray, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, FilterParameter::Category::CreatedArray, CreateFeatureArrayFromElementArray, req));
   }
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, CellFeatureAttributeMatrixName, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray,
-                                                      CreateFeatureArrayFromElementArray));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Copied Attribute Array", CreatedArrayName, CellFeatureAttributeMatrixName, CellFeatureAttributeMatrixName,
+                                                      FilterParameter::Category::CreatedArray, CreateFeatureArrayFromElementArray));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index c14de2252e..9cb01bef14 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -160,81 +160,81 @@ void CreateGeometry::setupFilterParameters()
                                "HexCellAttributeMatrixName"}; // HexahedralGeom
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Treat Geometry Warnings as Errors", TreatWarningsAsErrors, FilterParameter::Parameter, CreateGeometry));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Treat Geometry Warnings as Errors", TreatWarningsAsErrors, FilterParameter::Category::Parameter, CreateGeometry));
 
   {
     QVector<QString> choices = {"Copy Arrays", "Move Arrays"};
-    parameters.push_back(SIMPL_NEW_CHOICE_FP("Array Handling", ArrayHandling, FilterParameter::Parameter, CreateGeometry, choices, false));
+    parameters.push_back(SIMPL_NEW_CHOICE_FP("Array Handling", ArrayHandling, FilterParameter::Category::Parameter, CreateGeometry, choices, false));
   }
 
   DataContainerSelectionFilterParameter::RequirementType req;
-  parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::RequiredArray, CreateGeometry, req));
+  parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Category::RequiredArray, CreateGeometry, req));
   {
-    parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateGeometry, 0));
-    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateGeometry, 0));
-    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Category::Parameter, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Category::Parameter, CreateGeometry, 0));
     parameters.back()->setLegacyPropertyName("Resolution");
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 0));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", ImageCellAttributeMatrixName, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 0));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 1, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("X Bounds", XBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Y Bounds", YBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Z Bounds", ZBoundsArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 1));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", RectGridCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 1));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("X Bounds", XBoundsArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 1));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Y Bounds", YBoundsArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 1));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Z Bounds", ZBoundsArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 1));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", RectGridCellAttributeMatrixName, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 1));
 
-    PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateGeometry);
+    PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Category::Parameter, CreateGeometry);
     param->setReadOnly(true);
     param->setGroupIndex(0);
     parameters.push_back(param);
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Vertex List", SharedVertexListArrayPath0, FilterParameter::RequiredArray, CreateGeometry, req, 2));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName0, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 2));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Vertex List", SharedVertexListArrayPath0, FilterParameter::Category::RequiredArray, CreateGeometry, req, 2));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName0, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 2));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::RequiredArray, CreateGeometry, req, 3));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::Category::RequiredArray, CreateGeometry, req, 3));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 2, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 3));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Edge Attribute Matrix", EdgeAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 3));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 3));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName1, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 3));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Edge Attribute Matrix", EdgeAttributeMatrixName, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 3));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::RequiredArray, CreateGeometry, req, 4));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::Category::RequiredArray, CreateGeometry, req, 4));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 4));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName2, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName0, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 4));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 4));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName2, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 4));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName0, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 4));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::RequiredArray, CreateGeometry, req, 5));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::Category::RequiredArray, CreateGeometry, req, 5));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 4, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 5));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName3, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName1, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 5));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 5));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName3, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 5));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Face Attribute Matrix", FaceAttributeMatrixName1, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 5));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::RequiredArray, CreateGeometry, req, 6));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::Category::RequiredArray, CreateGeometry, req, 6));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 4, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 6));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName4, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", TetCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 6));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 6));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName4, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 6));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", TetCellAttributeMatrixName, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 6));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Float, 3, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::RequiredArray, CreateGeometry, req, 7));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::Category::RequiredArray, CreateGeometry, req, 7));
     req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::UInt64, 8, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::RequiredArray, CreateGeometry, req, 7));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName5, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));
-    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", HexCellAttributeMatrixName, DataContainerName, FilterParameter::CreatedArray, CreateGeometry, 7));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::Category::RequiredArray, CreateGeometry, req, 7));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Vertex Attribute Matrix", VertexAttributeMatrixName5, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 7));
+    parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Attribute Matrix", HexCellAttributeMatrixName, DataContainerName, FilterParameter::Category::CreatedArray, CreateGeometry, 7));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
index 652dabf5bb..85f99ee997 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -63,8 +63,8 @@ CreateGridMontage::~CreateGridMontage() = default;
 void CreateGridMontage::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container Grid", GridSelection, FilterParameter::Parameter, CreateGridMontage));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Created Montage Name", MontageName, FilterParameter::CreatedArray, CreateGridMontage));
+  parameters.push_back(SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container Grid", GridSelection, FilterParameter::Category::Parameter, CreateGridMontage));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Created Montage Name", MontageName, FilterParameter::Category::CreatedArray, CreateGridMontage));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 37be70aeae..9af4688780 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -81,15 +81,15 @@ void CreateImageGeometry::setupFilterParameters()
   FilterParameterVectorType parameters;
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", SelectedDataContainer, FilterParameter::Parameter, CreateImageGeometry, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", SelectedDataContainer, FilterParameter::Category::Parameter, CreateImageGeometry, req));
   }
-  parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Parameter, CreateImageGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, CreateImageGeometry));
+  parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions", Dimensions, FilterParameter::Category::Parameter, CreateImageGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, CreateImageGeometry));
 
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, CreateImageGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Category::Parameter, CreateImageGeometry));
   parameters.back()->setLegacyPropertyName("Resolution");
 
-  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Parameter, CreateImageGeometry);
+  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Box Size in Length Units", BoxDimensions, FilterParameter::Category::Parameter, CreateImageGeometry);
   param->setReadOnly(true);
   parameters.push_back(param);
 
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 5267db6a6a..40a52fa861 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -91,10 +91,10 @@ void CreateStringArray::setupFilterParameters()
   // Do not let the user change the number of components in a StringDataArray
   setNumberOfComponents(1);
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Initialization Value", InitializationValue, FilterParameter::Parameter, CreateStringArray));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Initialization Value", InitializationValue, FilterParameter::Category::Parameter, CreateStringArray));
   {
     DataArrayCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Attribute Array", NewArray, FilterParameter::CreatedArray, CreateStringArray, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Attribute Array", NewArray, FilterParameter::Category::CreatedArray, CreateStringArray, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 2e417a2613..214a4f8bf3 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -84,14 +84,14 @@ void CropVertexGeometry::setupFilterParameters()
   DataContainerSelectionFilterParameter::RequirementType req;
   IGeometry::Types reqGeom = {IGeometry::Type::Vertex};
   req.dcGeometryTypes = reqGeom;
-  parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Vertex Geometry to Crop", DataContainerName, FilterParameter::RequiredArray, CropVertexGeometry, req));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("X Min", XMin, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Y Min", YMin, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Z Min", ZMin, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("X Max", XMax, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Y Max", YMax, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Z Max", ZMax, FilterParameter::Parameter, CropVertexGeometry));
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Cropped Data Container", CroppedDataContainerName, FilterParameter::CreatedArray, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Vertex Geometry to Crop", DataContainerName, FilterParameter::Category::RequiredArray, CropVertexGeometry, req));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("X Min", XMin, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Y Min", YMin, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Z Min", ZMin, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("X Max", XMax, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Y Max", YMax, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Z Max", ZMax, FilterParameter::Category::Parameter, CropVertexGeometry));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Cropped Data Container", CroppedDataContainerName, FilterParameter::Category::CreatedArray, CropVertexGeometry));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index e4f010e839..b3ceb6f7e0 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -80,14 +80,14 @@ void DataContainerReader::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Overwrite Existing Data Containers", OverwriteExistingDataContainers, FilterParameter::Parameter, DataContainerReader));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Overwrite Existing Data Containers", OverwriteExistingDataContainers, FilterParameter::Category::Parameter, DataContainerReader));
   {
     DataContainerReaderFilterParameter::Pointer parameter = DataContainerReaderFilterParameter::New();
     parameter->setHumanLabel("Select Arrays from Input File");
     parameter->setPropertyName("InputFileDataContainerArrayProxy");
     parameter->setDefaultFlagValue(Qt::Checked);
     parameter->setInputFileProperty("InputFile");
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setFilter(this);
     parameters.push_back(parameter);
   }
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 9efc5512ad..077cb3eee4 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -81,9 +81,9 @@ void DataContainerWriter::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Parameter, DataContainerWriter, "*.dream3d", ""));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Xdmf File", WriteXdmfFile, FilterParameter::Parameter, DataContainerWriter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Include Xdmf Time Markers", WriteTimeSeries, FilterParameter::Parameter, DataContainerWriter));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Category::Parameter, DataContainerWriter, "*.dream3d", ""));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Xdmf File", WriteXdmfFile, FilterParameter::Category::Parameter, DataContainerWriter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Include Xdmf Time Markers", WriteTimeSeries, FilterParameter::Category::Parameter, DataContainerWriter));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index a012113b1b..74bda2fcd6 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -66,7 +66,7 @@ void EmptyFilter::setupFilterParameters()
   ss << "The original filter '<b><i>" << getOriginalFilterName() << "</i></b>' was not loaded. ";
   ss << "Either a plugin with the original filter was not loaded or the original ";
   ss << "filter has been renamed.";
-  parameters.push_back(UnknownFilterParameter::New(str, "OriginalFilterName", getOriginalFilterName(), FilterParameter::Parameter));
+  parameters.push_back(UnknownFilterParameter::Create(str, "OriginalFilterName", getOriginalFilterName(), FilterParameter::Category::Parameter));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index 5b03920e8c..05202551d6 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -62,7 +62,7 @@ void ExecuteProcess::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Command Line Arguments", Arguments, FilterParameter::Parameter, ExecuteProcess));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Command Line Arguments", Arguments, FilterParameter::Category::Parameter, ExecuteProcess));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index ec58e827d8..dd14f12da2 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -132,7 +132,7 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
         "SharedVertexListArrayPath5", "SharedHexListArrayPath"                       // HexahedralGeom
     };
     parameter->setLinkedProperties(linkedProps);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     IGeometry::Types geomTypes = {IGeometry::Type::RectGrid, IGeometry::Type::Vertex,      IGeometry::Type::Edge,      IGeometry::Type::Triangle,
                                   IGeometry::Type::Quad,     IGeometry::Type::Tetrahedral, IGeometry::Type::Hexahedral};
     parameter->setDefaultGeometryTypes(geomTypes);
@@ -141,55 +141,55 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Any, IGeometry::Type::RectGrid);
     parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("X Bounds", XBoundsArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
+        SIMPL_NEW_DA_CREATION_FP("X Bounds", XBoundsArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
     parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Y Bounds", YBoundsArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
+        SIMPL_NEW_DA_CREATION_FP("Y Bounds", YBoundsArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
     parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Z Bounds", ZBoundsArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
+        SIMPL_NEW_DA_CREATION_FP("Z Bounds", ZBoundsArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::RectGrid)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Vertex);
-    parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Vertex List", SharedVertexListArrayPath0, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::Vertex)));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Vertex List", SharedVertexListArrayPath0, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+                                                  static_cast<int32_t>(IGeometry::Type::Vertex)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Edge);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath1, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Edge)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Edge, IGeometry::Type::Edge);
     parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::Edge)));
+        SIMPL_NEW_DA_CREATION_FP("Edge List", SharedEdgeListArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::Edge)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Triangle);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath2, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Triangle)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Face, IGeometry::Type::Triangle);
-    parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::Triangle)));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Triangle List", SharedTriListArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+                                                  static_cast<int32_t>(IGeometry::Type::Triangle)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Quad);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath3, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Quad)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Face, IGeometry::Type::Quad);
-    parameters.push_back(
-        SIMPL_NEW_DA_CREATION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req, static_cast<int32_t>(IGeometry::Type::Quad)));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Quadrilateral List", SharedQuadListArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+                                                  static_cast<int32_t>(IGeometry::Type::Quad)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Tetrahedral);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath4, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Tetrahedral)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Cell, IGeometry::Type::Tetrahedral);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Tetrahedral List", SharedTetListArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Tetrahedral)));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Vertex, IGeometry::Type::Hexahedral);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Shared Vertex List", SharedVertexListArrayPath5, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Hexahedral)));
     req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Type::Cell, IGeometry::Type::Hexahedral);
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::RequiredArray, ExtractAttributeArraysFromGeometry, req,
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Hexahedral List", SharedHexListArrayPath, FilterParameter::Category::RequiredArray, ExtractAttributeArraysFromGeometry, req,
                                                   static_cast<int32_t>(IGeometry::Type::Hexahedral)));
   }
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index d36740d505..0ac066ac48 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -74,14 +74,15 @@ void ExtractComponentAsArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Extract", CompNumber, FilterParameter::Parameter, ExtractComponentAsArray));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Extract", CompNumber, FilterParameter::Category::Parameter, ExtractComponentAsArray));
 
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, ExtractComponentAsArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::Category::RequiredArray, ExtractComponentAsArray, req));
   }
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Scalar Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, ExtractComponentAsArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Scalar Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::Category::CreatedArray, ExtractComponentAsArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 12b429fd4d..dd9b219836 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -93,14 +93,14 @@ void ExtractVertexGeometry::setupFilterParameters()
   //  {
   //    m_NewDCGeometryChoices.push_back("Vertex Geometry");
   //    // Create the Choice Filter Parameter and add it to the list of parameters
-  //    parameters.push_back(SIMPL_NEW_CHOICE_FP("New Data Container Geometry", NewDataContainerGeometry, FilterParameter::Parameter, ExtractVertexGeometry, m_NewDCGeometryChoices, false));
+  //    parameters.push_back(SIMPL_NEW_CHOICE_FP("New Data Container Geometry", NewDataContainerGeometry, FilterParameter::Category::Parameter, ExtractVertexGeometry, m_NewDCGeometryChoices, false));
   //  }
 
   {
     m_ArrayHandlingChoices.push_back("Move Attribute Arrays");
     m_ArrayHandlingChoices.push_back("Copy Attribute Arrays");
     // Create the Choice Filter Parameter and add it to the list of parameters
-    parameters.push_back(SIMPL_NEW_CHOICE_FP("Array Handling", ArrayHandling, FilterParameter::Parameter, ExtractVertexGeometry, m_ArrayHandlingChoices, false));
+    parameters.push_back(SIMPL_NEW_CHOICE_FP("Array Handling", ArrayHandling, FilterParameter::Category::Parameter, ExtractVertexGeometry, m_ArrayHandlingChoices, false));
   }
 
   {
@@ -108,16 +108,16 @@ void ExtractVertexGeometry::setupFilterParameters()
     req.dcGeometryTypes = IGeometry::Types(2);
     req.dcGeometryTypes[0] = IGeometry::Type::Image;
     req.dcGeometryTypes[0] = IGeometry::Type::RectGrid;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container with Input Geometry", SelectedDataContainerName, FilterParameter::RequiredArray, ExtractVertexGeometry, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container with Input Geometry", SelectedDataContainerName, FilterParameter::Category::RequiredArray, ExtractVertexGeometry, req));
   }
 
   {
     MultiDataArraySelectionFilterParameter::RequirementType req;
     req.amTypes = AttributeMatrix::Types(1, AttributeMatrix::Type::Cell);
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Included Attribute Arrays", IncludedDataArrayPaths, FilterParameter::RequiredArray, ExtractVertexGeometry, req));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Included Attribute Arrays", IncludedDataArrayPaths, FilterParameter::Category::RequiredArray, ExtractVertexGeometry, req));
   }
 
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Vertex Data Container Name", VertexDataContainerName, FilterParameter::CreatedArray, ExtractVertexGeometry));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Vertex Data Container Name", VertexDataContainerName, FilterParameter::Category::CreatedArray, ExtractVertexGeometry));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 56d3aab47f..dda84959ff 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -66,13 +66,13 @@ FeatureCountDecision::~FeatureCountDecision() = default;
 void FeatureCountDecision::setupFilterParameters()
 {
   FilterParameterVectorType parameters = getFilterParameters();
-  parameters.push_back(SeparatorFilterParameter::New("Cell Ensemble Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Cell Ensemble Data", FilterParameter::Category::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req =
         DataArraySelectionFilterParameter::CreateRequirement(SIMPL::TypeNames::Int32, 1, AttributeMatrix::Type::CellEnsemble, IGeometry::Type::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::RequiredArray, FeatureCountDecision, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Category::RequiredArray, FeatureCountDecision, req));
   }
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Maximum Number of Features", MaxGrains, FilterParameter::Parameter, FeatureCountDecision, 0));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Maximum Number of Features", MaxGrains, FilterParameter::Category::Parameter, FeatureCountDecision, 0));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 4d8b99f82b..e2ed189cca 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -72,9 +72,9 @@ FeatureDataCSVWriter::~FeatureDataCSVWriter() = default;
 void FeatureDataCSVWriter::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", FeatureDataFile, FilterParameter::Parameter, FeatureDataCSVWriter, "*.csv", "Comma Separated Data"));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Neighbor Data", WriteNeighborListData, FilterParameter::Parameter, FeatureDataCSVWriter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Number of Features Line", WriteNumFeaturesLine, FilterParameter::Parameter, FeatureDataCSVWriter));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", FeatureDataFile, FilterParameter::Category::Parameter, FeatureDataCSVWriter, "*.csv", "Comma Separated Data"));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Neighbor Data", WriteNeighborListData, FilterParameter::Category::Parameter, FeatureDataCSVWriter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Number of Features Line", WriteNumFeaturesLine, FilterParameter::Category::Parameter, FeatureDataCSVWriter));
 
   {
     QVector<QString> choices;
@@ -84,13 +84,13 @@ void FeatureDataCSVWriter::setupFilterParameters()
     choices.push_back("Tab");
     choices.push_back("Space");
 
-    parameters.push_back(SIMPL_NEW_CHOICE_FP("Delimiter", DelimiterChoiceInt, FilterParameter::Parameter, FeatureDataCSVWriter, choices, false));
+    parameters.push_back(SIMPL_NEW_CHOICE_FP("Delimiter", DelimiterChoiceInt, FilterParameter::Category::Parameter, FeatureDataCSVWriter, choices, false));
   }
 
-  parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature Data", FilterParameter::Category::RequiredArray));
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Category::Feature);
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixPath, FilterParameter::RequiredArray, FeatureDataCSVWriter, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixPath, FilterParameter::Category::RequiredArray, FeatureDataCSVWriter, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 1280d11187..21f462e84a 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -143,7 +143,7 @@ void FindDerivatives::setupFilterParameters()
     amTypes.push_back(AttributeMatrix::Type::Edge);
     amTypes.push_back(AttributeMatrix::Type::Vertex);
     req.amTypes = amTypes;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Data Array to Process", SelectedArrayPath, FilterParameter::RequiredArray, FindDerivatives, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Data Array to Process", SelectedArrayPath, FilterParameter::Category::RequiredArray, FindDerivatives, req));
   }
   {
     DataArrayCreationFilterParameter::RequirementType req = DataArrayCreationFilterParameter::CreateRequirement(AttributeMatrix::Category::Unknown);
@@ -153,7 +153,7 @@ void FindDerivatives::setupFilterParameters()
     amTypes.push_back(AttributeMatrix::Type::Edge);
     amTypes.push_back(AttributeMatrix::Type::Vertex);
     req.amTypes = amTypes;
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Derivatives Array", DerivativesArrayPath, FilterParameter::CreatedArray, FindDerivatives, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Derivatives Array", DerivativesArrayPath, FilterParameter::Category::CreatedArray, FindDerivatives, req));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index d44aea78a7..24b2c3e8a0 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -244,7 +244,7 @@ void GenerateColorTable::setupFilterParameters()
   {
     GenerateColorTableFilterParameter::Pointer parameter = GenerateColorTableFilterParameter::New();
     parameter->setHumanLabel("Select Preset...");
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setPropertyName("SelectedPresetName");
     parameter->setFilter(this);
     parameters.push_back(parameter);
@@ -252,10 +252,10 @@ void GenerateColorTable::setupFilterParameters()
 
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Data Array", SelectedDataArrayPath, FilterParameter::RequiredArray, GenerateColorTable, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Data Array", SelectedDataArrayPath, FilterParameter::Category::RequiredArray, GenerateColorTable, req));
   }
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("RGB Array Name", RgbArrayName, SelectedDataArrayPath, SelectedDataArrayPath, FilterParameter::CreatedArray, GenerateColorTable));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("RGB Array Name", RgbArrayName, SelectedDataArrayPath, SelectedDataArrayPath, FilterParameter::Category::CreatedArray, GenerateColorTable));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index aba189b24d..acc0e81d84 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -350,19 +350,19 @@ void GenerateTiltSeries::setupFilterParameters()
             << "Y Axis"
             << "Z Axis";
     parameter->setChoices(choices);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setSetterCallback(SIMPL_BIND_SETTER(GenerateTiltSeries, this, RotationAxis));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(GenerateTiltSeries, this, RotationAxis));
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Limits (Start, Stop, Increment) Degrees", RotationLimits, FilterParameter::Parameter, GenerateTiltSeries));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resample Spacing", Spacing, FilterParameter::Parameter, GenerateTiltSeries));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Limits (Start, Stop, Increment) Degrees", RotationLimits, FilterParameter::Category::Parameter, GenerateTiltSeries));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Resample Spacing", Spacing, FilterParameter::Category::Parameter, GenerateTiltSeries));
   //  DataArrayCreationFilterParameter::RequirementType dacReq;
-  //  parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Array Path", CreatedArrayPath, FilterParameter::Parameter, GenerateTiltSeries, dacReq));
+  //  parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Array Path", CreatedArrayPath, FilterParameter::Category::Parameter, GenerateTiltSeries, dacReq));
   DataArraySelectionFilterParameter::RequirementType dasReq;
   dasReq.dcGeometryTypes = {IGeometry::Type::Image};
   dasReq.amTypes = {AttributeMatrix::Type::Cell};
-  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Input Data Array Path", InputDataArrayPath, FilterParameter::Parameter, GenerateTiltSeries, dasReq));
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Input Data Array Path", InputDataArrayPath, FilterParameter::Category::Parameter, GenerateTiltSeries, dasReq));
   parameters.push_back(SIMPL_NEW_STRING_FP("DataContainer Prefix", OutputPrefix, FilterParameter::Category::Parameter, GenerateTiltSeries));
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 148a49b75d..0f126bb5a8 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -391,11 +391,11 @@ void ImportAsciDataArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, ImportAsciDataArray, "*.*"));
-  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, ImportAsciDataArray));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Parameter, ImportAsciDataArray));
+  parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, ImportAsciDataArray, "*.*"));
+  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Category::Parameter, ImportAsciDataArray));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Category::Parameter, ImportAsciDataArray));
 
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Skip Header Lines", SkipHeaderLines, FilterParameter::Parameter, ImportAsciDataArray));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Skip Header Lines", SkipHeaderLines, FilterParameter::Category::Parameter, ImportAsciDataArray));
   {
     ChoiceFilterParameter::Pointer parameter = ChoiceFilterParameter::New();
     parameter->setHumanLabel("Delimiter");
@@ -410,16 +410,16 @@ void ImportAsciDataArray::setupFilterParameters()
     choices.push_back(": (colon)");
     choices.push_back("\\t (Tab)");
     parameter->setChoices(choices);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
 
   {
     DataArrayCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Output Attribute Array", CreatedAttributeArrayPath, FilterParameter::CreatedArray, ImportAsciDataArray, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Output Attribute Array", CreatedAttributeArrayPath, FilterParameter::Category::CreatedArray, ImportAsciDataArray, req));
   }
 
-  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("First Line of Data:", FirstLine, FilterParameter::Parameter, ImportAsciDataArray);
+  PreflightUpdatedValueFilterParameter::Pointer param = SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("First Line of Data:", FirstLine, FilterParameter::Category::Parameter, ImportAsciDataArray);
   param->setReadOnly(true);
   parameters.push_back(param);
 
diff --git a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
index 6213042b53..78a12f2895 100644
--- a/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportHDF5Dataset.cpp
@@ -102,17 +102,17 @@ void ImportHDF5Dataset::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  ImportHDF5DatasetFilterParameter::Pointer parameter = ImportHDF5DatasetFilterParameter::New(QString("Select HDF5 File"), // Human Label
-                                                                                              QString("ImportHDF5File"),   // Property Name
-                                                                                              QString(""),                 // File Path Default Value
-                                                                                              QString(""),                 // Dataset Default value
-                                                                                              FilterParameter::Parameter,  // Category
-                                                                                              this, -1);
+  ImportHDF5DatasetFilterParameter::Pointer parameter = ImportHDF5DatasetFilterParameter::Create(QString("Select HDF5 File"),          // Human Label
+                                                                                                 QString("ImportHDF5File"),            // Property Name
+                                                                                                 QString(""),                          // File Path Default Value
+                                                                                                 QString(""),                          // Dataset Default value
+                                                                                                 FilterParameter::Category::Parameter, // Category
+                                                                                                 this, -1);
   parameters.push_back(parameter);
 
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", SelectedAttributeMatrix, FilterParameter::RequiredArray, ImportHDF5Dataset, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", SelectedAttributeMatrix, FilterParameter::Category::RequiredArray, ImportHDF5Dataset, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index fcdc496285..a8def8ac81 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -92,18 +92,18 @@ void InitializeData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Cell Data", FilterParameter::Category::RequiredArray));
   {
     MultiDataArraySelectionFilterParameter::RequirementType req =
         MultiDataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Cell, IGeometry::Type::Image);
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Cell Arrays", CellAttributeMatrixPaths, FilterParameter::RequiredArray, InitializeData, req));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Cell Arrays", CellAttributeMatrixPaths, FilterParameter::Category::RequiredArray, InitializeData, req));
   }
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Min (Column)", XMin, FilterParameter::Parameter, InitializeData));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Min (Row)", YMin, FilterParameter::Parameter, InitializeData));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Min (Plane)", ZMin, FilterParameter::Parameter, InitializeData));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Max (Column)", XMax, FilterParameter::Parameter, InitializeData));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Max (Row)", YMax, FilterParameter::Parameter, InitializeData));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Max (Plane)", ZMax, FilterParameter::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Min (Column)", XMin, FilterParameter::Category::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Min (Row)", YMin, FilterParameter::Category::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Min (Plane)", ZMin, FilterParameter::Category::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("X Max (Column)", XMax, FilterParameter::Category::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Y Max (Row)", YMax, FilterParameter::Category::Parameter, InitializeData));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Z Max (Plane)", ZMax, FilterParameter::Category::Parameter, InitializeData));
 
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
@@ -124,11 +124,11 @@ void InitializeData::setupFilterParameters()
                 << "InitRange";
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_DOUBLE_FP("Initialization Value", InitValue, FilterParameter::Parameter, InitializeData, Manual));
-  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, InitializeData, RandomWithRange));
+  parameters.push_back(SIMPL_NEW_DOUBLE_FP("Initialization Value", InitValue, FilterParameter::Category::Parameter, InitializeData, Manual));
+  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Category::Parameter, InitializeData, RandomWithRange));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index ca4afc2506..784bd98726 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -73,14 +73,16 @@ LinkFeatureMapToElementArray::~LinkFeatureMapToElementArray() = default;
 void LinkFeatureMapToElementArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SeparatorFilterParameter::New("Element Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Element Data", FilterParameter::Category::RequiredArray));
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::TypeNames::Int32, 1, AttributeMatrix::Category::Element);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Element Attribute Array to Link", SelectedCellArrayPath, FilterParameter::RequiredArray, LinkFeatureMapToElementArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Element Attribute Array to Link", SelectedCellArrayPath, FilterParameter::Category::RequiredArray, LinkFeatureMapToElementArray, req));
   }
-  parameters.push_back(SeparatorFilterParameter::New("Feature Data", FilterParameter::CreatedArray));
-  parameters.push_back(SIMPL_NEW_AM_WITH_LINKED_DC_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, SelectedCellArrayPath, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Active", ActiveArrayName, SelectedCellArrayPath, CellFeatureAttributeMatrixName, FilterParameter::CreatedArray, LinkFeatureMapToElementArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Feature Data", FilterParameter::Category::CreatedArray));
+  parameters.push_back(
+      SIMPL_NEW_AM_WITH_LINKED_DC_FP("Feature Attribute Matrix", CellFeatureAttributeMatrixName, SelectedCellArrayPath, FilterParameter::Category::CreatedArray, LinkFeatureMapToElementArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Active", ActiveArrayName, SelectedCellArrayPath, CellFeatureAttributeMatrixName, FilterParameter::Category::CreatedArray, LinkFeatureMapToElementArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 70908394e5..982e6c5398 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -65,8 +65,8 @@ void MaskCountDecision::setupFilterParameters()
 {
   FilterParameterVectorType parameters = getFilterParameters();
   DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateRequirement(SIMPL::TypeNames::Bool, 1, AttributeMatrix::Type::Any, IGeometry::Type::Any);
-  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Mask", MaskArrayPath, FilterParameter::RequiredArray, MaskCountDecision, req));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of True Instances", NumberOfTrues, FilterParameter::Parameter, MaskCountDecision, 0));
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Mask", MaskArrayPath, FilterParameter::Category::RequiredArray, MaskCountDecision, req));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of True Instances", NumberOfTrues, FilterParameter::Category::Parameter, MaskCountDecision, 0));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 24bbd35828..fabb8d6791 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -66,7 +66,7 @@ MassCreateData::~MassCreateData() = default;
 void MassCreateData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::CreatedArray, MassCreateData));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Data Container Name", DataContainerName, FilterParameter::Category::CreatedArray, MassCreateData));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 9152596f01..a2d345232b 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -91,25 +91,25 @@ void MoveData::setupFilterParameters()
     parameter->setChoices(choices);
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
 
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Source", AttributeMatrixSource, FilterParameter::RequiredArray, MoveData, req, 0));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Source", AttributeMatrixSource, FilterParameter::Category::RequiredArray, MoveData, req, 0));
   }
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", DataContainerDestination, FilterParameter::RequiredArray, MoveData, req, 0));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", DataContainerDestination, FilterParameter::Category::RequiredArray, MoveData, req, 0));
   }
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array Source", DataArraySource, FilterParameter::RequiredArray, MoveData, req, 1));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array Source", DataArraySource, FilterParameter::Category::RequiredArray, MoveData, req, 1));
   }
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Destination", AttributeMatrixDestination, FilterParameter::RequiredArray, MoveData, req, 1));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Destination", AttributeMatrixDestination, FilterParameter::Category::RequiredArray, MoveData, req, 1));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 4dd9ce2982..07df13bc73 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -94,25 +94,25 @@ void MoveMultiData::setupFilterParameters()
     parameter->setChoices(choices);
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
 
   {
     MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_MAM_SELECTION_FP("Attribute Matrix Sources", AttributeMatrixSources, FilterParameter::RequiredArray, MoveMultiData, req, 0));
+    parameters.push_back(SIMPL_NEW_MAM_SELECTION_FP("Attribute Matrix Sources", AttributeMatrixSources, FilterParameter::Category::RequiredArray, MoveMultiData, req, 0));
   }
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", DataContainerDestination, FilterParameter::RequiredArray, MoveMultiData, req, 0));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Destination", DataContainerDestination, FilterParameter::Category::RequiredArray, MoveMultiData, req, 0));
   }
   {
     MultiDataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Array Sources", DataArraySources, FilterParameter::RequiredArray, MoveMultiData, req, 1));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Array Sources", DataArraySources, FilterParameter::Category::RequiredArray, MoveMultiData, req, 1));
   }
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Destination", AttributeMatrixDestination, FilterParameter::RequiredArray, MoveMultiData, req, 1));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix Destination", AttributeMatrixDestination, FilterParameter::Category::RequiredArray, MoveMultiData, req, 1));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 00f611c384..e5afaa7ad1 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -76,12 +76,12 @@ void MultiThresholdObjects::setupFilterParameters()
     parameter->setPropertyName("SelectedThresholds");
 
     parameter->setShowOperators(true);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setSetterCallback(SIMPL_BIND_SETTER(MultiThresholdObjects, this, SelectedThresholds));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(MultiThresholdObjects, this, SelectedThresholds));
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_STRING_FP("Output Attribute Array", DestinationArrayName, FilterParameter::CreatedArray, MultiThresholdObjects));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Output Attribute Array", DestinationArrayName, FilterParameter::Category::CreatedArray, MultiThresholdObjects));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index ed1593c455..7339986bfe 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -77,12 +77,12 @@ void MultiThresholdObjects2::setupFilterParameters()
     parameter->setPropertyName("SelectedThresholds");
 
     parameter->setShowOperators(true);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setSetterCallback(SIMPL_BIND_SETTER(MultiThresholdObjects2, this, SelectedThresholds));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(MultiThresholdObjects2, this, SelectedThresholds));
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Output Attribute Array", DestinationArrayName, SelectedThresholds, FilterParameter::CreatedArray, MultiThresholdObjects2));
+  parameters.push_back(SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Output Attribute Array", DestinationArrayName, SelectedThresholds, FilterParameter::Category::CreatedArray, MultiThresholdObjects2));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
index 13cba68c0c..ec34837b2a 100644
--- a/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
+++ b/Source/SIMPLib/CoreFilters/PipelineAnnotation.cpp
@@ -56,7 +56,7 @@ void PipelineAnnotation::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_PARAGRAPH_FP("", Summary, FilterParameter::Parameter, PipelineAnnotation, false));
+  parameters.push_back(SIMPL_NEW_PARAGRAPH_FP("", Summary, FilterParameter::Category::Parameter, PipelineAnnotation, false));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index fd15ca5dbe..c9f2cfceee 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -81,10 +81,10 @@ void PostSlackMessage::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("Slack User", SlackUser, FilterParameter::Parameter, PostSlackMessage));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Slack Url", SlackUrl, FilterParameter::Parameter, PostSlackMessage));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Slack Message", SlackMessage, FilterParameter::Parameter, PostSlackMessage));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Treat a Warning as an Error", WarningsAsError, FilterParameter::Parameter, PostSlackMessage));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Slack User", SlackUser, FilterParameter::Category::Parameter, PostSlackMessage));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Slack Url", SlackUrl, FilterParameter::Category::Parameter, PostSlackMessage));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Slack Message", SlackMessage, FilterParameter::Category::Parameter, PostSlackMessage));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Treat a Warning as an Error", WarningsAsError, FilterParameter::Category::Parameter, PostSlackMessage));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 7936cb9fa3..958b19fe2c 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -181,9 +181,9 @@ void RawBinaryReader::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, RawBinaryReader, "*.raw *.bin"));
-  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Parameter, RawBinaryReader));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Parameter, RawBinaryReader));
+  parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, RawBinaryReader, "*.raw *.bin"));
+  parameters.push_back(SIMPL_NEW_NUMERICTYPE_FP("Scalar Type", ScalarType, FilterParameter::Category::Parameter, RawBinaryReader));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Number of Components", NumberOfComponents, FilterParameter::Category::Parameter, RawBinaryReader));
   {
     ChoiceFilterParameter::Pointer parameter = ChoiceFilterParameter::New();
     parameter->setHumanLabel("Endian");
@@ -195,13 +195,13 @@ void RawBinaryReader::setupFilterParameters()
     choices.push_back("Little");
     choices.push_back("Big");
     parameter->setChoices(choices);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
-  parameters.push_back(SIMPL_NEW_UINT64_FP("Skip Header Bytes", SkipHeaderBytes, FilterParameter::Parameter, RawBinaryReader));
+  parameters.push_back(SIMPL_NEW_UINT64_FP("Skip Header Bytes", SkipHeaderBytes, FilterParameter::Category::Parameter, RawBinaryReader));
   {
     DataArrayCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Output Attribute Array", CreatedAttributeArrayPath, FilterParameter::CreatedArray, RawBinaryReader, req));
+    parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Output Attribute Array", CreatedAttributeArrayPath, FilterParameter::Category::CreatedArray, RawBinaryReader, req));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 7582bc4503..783e38a364 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -42,7 +42,7 @@ void ReadASCIIData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(ReadASCIIDataFilterParameter::New("ASCII Wizard Data", "WizardData", "WizardData", FilterParameter::Parameter));
+  parameters.push_back(ReadASCIIDataFilterParameter::Create("ASCII Wizard Data", "WizardData", "WizardData", FilterParameter::Category::Parameter));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 2c2b18d7e2..110c97c91f 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -68,7 +68,7 @@ void RemoveArrays::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(RemoveArrays, this, DataArraysToRemove));
 
     parameter->setDefaultFlagValue(Qt::Unchecked);
-    parameter->setCategory(FilterParameter::RequiredArray);
+    parameter->setCategory(FilterParameter::Category::RequiredArray);
     parameters.push_back(parameter);
   }
 
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index ccfeb9feb5..360ffaa901 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -77,21 +77,22 @@ void RemoveComponentFromArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Remove", CompNumber, FilterParameter::Parameter, RemoveComponentFromArray));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Component Number to Remove", CompNumber, FilterParameter::Category::Parameter, RemoveComponentFromArray));
 
   DataArraySelectionFilterParameter::RequirementType req =
       DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Category::Any);
-  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::RequiredArray, RemoveComponentFromArray, req));
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", SelectedArrayPath, FilterParameter::Category::RequiredArray, RemoveComponentFromArray, req));
 
   parameters.push_back(
-      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Removed Component Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Removed Component Attribute Array", NewArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::Category::CreatedArray, RemoveComponentFromArray));
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("Reduced Attribute Array", ReducedArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::CreatedArray, RemoveComponentFromArray));
+  parameters.push_back(
+      SIMPL_NEW_DA_WITH_LINKED_AM_FP("Reduced Attribute Array", ReducedArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::Category::CreatedArray, RemoveComponentFromArray));
 
   QStringList linkedProps;
   linkedProps.clear();
   linkedProps << "NewArrayArrayName";
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Save Removed Component in New Array", SaveRemovedComponent, FilterParameter::Parameter, RemoveComponentFromArray, linkedProps));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Save Removed Component in New Array", SaveRemovedComponent, FilterParameter::Category::Parameter, RemoveComponentFromArray, linkedProps));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 697597a24e..d2fb490cfd 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -65,9 +65,9 @@ void RenameAttributeArray::setupFilterParameters()
   FilterParameterVectorType parameters;
 
   DataArraySelectionFilterParameter::RequirementType req;
-  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Rename", SelectedArrayPath, FilterParameter::RequiredArray, RenameAttributeArray, req));
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array to Rename", SelectedArrayPath, FilterParameter::Category::RequiredArray, RenameAttributeArray, req));
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("New Attribute Array Name", NewArrayName, FilterParameter::Parameter, RenameAttributeArray));
+  parameters.push_back(SIMPL_NEW_STRING_FP("New Attribute Array Name", NewArrayName, FilterParameter::Category::Parameter, RenameAttributeArray));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index 5ad5f460df..e4a23c5206 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -67,10 +67,10 @@ void RenameAttributeMatrix::setupFilterParameters()
 
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix to Rename", SelectedAttributeMatrixPath, FilterParameter::RequiredArray, RenameAttributeMatrix, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix to Rename", SelectedAttributeMatrixPath, FilterParameter::Category::RequiredArray, RenameAttributeMatrix, req));
   }
 
-  parameters.push_back(SIMPL_NEW_STRING_FP("New Attribute Matrix Name", NewAttributeMatrix, FilterParameter::Parameter, RenameAttributeMatrix));
+  parameters.push_back(SIMPL_NEW_STRING_FP("New Attribute Matrix Name", NewAttributeMatrix, FilterParameter::Category::Parameter, RenameAttributeMatrix));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 20d5bbbebd..8bd184641e 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -67,10 +67,10 @@ void RenameDataContainer::setupFilterParameters()
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container to Rename", SelectedDataContainerName, FilterParameter::RequiredArray, RenameDataContainer, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container to Rename", SelectedDataContainerName, FilterParameter::Category::RequiredArray, RenameDataContainer, req));
   }
 
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("New Data Container Name", NewDataContainerName, FilterParameter::Parameter, RenameDataContainer));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("New Data Container Name", NewDataContainerName, FilterParameter::Category::Parameter, RenameDataContainer));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 15348ceb5b..4248aca6fe 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -66,12 +66,12 @@ ReplaceValueInArray::~ReplaceValueInArray() = default;
 void ReplaceValueInArray::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
-  parameters.push_back(SIMPL_NEW_DOUBLE_FP("Value to Replace", RemoveValue, FilterParameter::Parameter, ReplaceValueInArray));
+  parameters.push_back(SIMPL_NEW_DOUBLE_FP("Value to Replace", RemoveValue, FilterParameter::Category::Parameter, ReplaceValueInArray));
 
-  parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Parameter, ReplaceValueInArray));
+  parameters.push_back(SIMPL_NEW_DOUBLE_FP("New Value", ReplaceValue, FilterParameter::Category::Parameter, ReplaceValueInArray));
   {
     DataArraySelectionFilterParameter::RequirementType req = DataArraySelectionFilterParameter::CreateCategoryRequirement(SIMPL::Defaults::AnyPrimitive, 1, AttributeMatrix::Category::Any);
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array", SelectedArray, FilterParameter::RequiredArray, ReplaceValueInArray, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Attribute Array", SelectedArray, FilterParameter::Category::RequiredArray, ReplaceValueInArray, req));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index ae6dcb7f37..33e895ff2b 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -72,10 +72,10 @@ void RequiredZThickness::setupFilterParameters()
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("DataContainer", DataContainerSelection, FilterParameter::RequiredArray, RequiredZThickness, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("DataContainer", DataContainerSelection, FilterParameter::Category::RequiredArray, RequiredZThickness, req));
   }
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Minimum Z Dimension", NumZVoxels, FilterParameter::Parameter, RequiredZThickness, 0));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Check", PreflightCheck, FilterParameter::Parameter, RequiredZThickness));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Minimum Z Dimension", NumZVoxels, FilterParameter::Category::Parameter, RequiredZThickness, 0));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Check", PreflightCheck, FilterParameter::Category::Parameter, RequiredZThickness));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 03ca9a7fbc..9375d407d4 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -362,19 +362,19 @@ void RotateSampleRefFrame::setupFilterParameters()
 
   // Axis Angle Parameters
 
-  parameters.push_back(SIMPL_NEW_FLOAT_FP("Rotation Angle (Degrees)", RotationAngle, FilterParameter::Parameter, RotateSampleRefFrame, 0));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Axis (ijk)", RotationAxis, FilterParameter::Parameter, RotateSampleRefFrame, 0));
+  parameters.push_back(SIMPL_NEW_FLOAT_FP("Rotation Angle (Degrees)", RotationAngle, FilterParameter::Category::Parameter, RotateSampleRefFrame, 0));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Rotation Axis (ijk)", RotationAxis, FilterParameter::Category::Parameter, RotateSampleRefFrame, 0));
 
   // Rotation Matrix Parameters
 
-  parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Rotation Matrix", RotationTable, FilterParameter::Parameter, RotateSampleRefFrame, 1));
+  parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Rotation Matrix", RotationTable, FilterParameter::Category::Parameter, RotateSampleRefFrame, 1));
 
   // Required Arrays
 
-  parameters.push_back(SeparatorFilterParameter::New("Cell Data", FilterParameter::RequiredArray));
+  parameters.push_back(SeparatorFilterParameter::Create("Cell Data", FilterParameter::Category::RequiredArray));
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req = AttributeMatrixSelectionFilterParameter::CreateRequirement(AttributeMatrix::Type::Cell, IGeometry::Type::Image);
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", CellAttributeMatrixPath, FilterParameter::RequiredArray, RotateSampleRefFrame, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Cell Attribute Matrix", CellAttributeMatrixPath, FilterParameter::Category::RequiredArray, RotateSampleRefFrame, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 1c7e09e170..ac4ce56d6d 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -109,25 +109,25 @@ void ScaleVolume::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Scaling Factor", ScaleFactor, FilterParameter::Parameter, ScaleVolume));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Scaling Factor", ScaleFactor, FilterParameter::Category::Parameter, ScaleVolume));
 
   QStringList linkedProps("DataContainerName");
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Image Geometry", ApplyToVoxelVolume, FilterParameter::Parameter, ScaleVolume, linkedProps));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Image Geometry", ApplyToVoxelVolume, FilterParameter::Category::Parameter, ScaleVolume, linkedProps));
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     req.dcGeometryTypes = IGeometry::Types(1, IGeometry::Type::Image);
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Scale", DataContainerName, FilterParameter::RequiredArray, ScaleVolume, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Scale", DataContainerName, FilterParameter::Category::RequiredArray, ScaleVolume, req));
   }
   linkedProps.clear();
   linkedProps << "SurfaceDataContainerName";
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Surface Geometry", ApplyToSurfaceMesh, FilterParameter::Parameter, ScaleVolume, linkedProps));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Surface Geometry", ApplyToSurfaceMesh, FilterParameter::Category::Parameter, ScaleVolume, linkedProps));
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     IGeometry::Types dcGeometryTypes;
     dcGeometryTypes.push_back(IGeometry::Type::Triangle);
     dcGeometryTypes.push_back(IGeometry::Type::Quad);
     req.dcGeometryTypes = dcGeometryTypes;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Surface Geometry to Scale", SurfaceDataContainerName, FilterParameter::RequiredArray, ScaleVolume, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Surface Geometry to Scale", SurfaceDataContainerName, FilterParameter::Category::RequiredArray, ScaleVolume, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 1aa2d78f66..d0b0524cc4 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -112,17 +112,17 @@ void SetOriginResolutionImageGeom::setupFilterParameters()
   {
     DataContainerSelectionFilterParameter::RequirementType req;
     req.dcGeometryTypes = IGeometry::Types(1, IGeometry::Type::Image);
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Modify", DataContainerName, FilterParameter::RequiredArray, SetOriginResolutionImageGeom, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Modify", DataContainerName, FilterParameter::Category::RequiredArray, SetOriginResolutionImageGeom, req));
   }
 
   QStringList linkedProps("Origin");
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Origin", ChangeOrigin, FilterParameter::Parameter, SetOriginResolutionImageGeom, linkedProps));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, SetOriginResolutionImageGeom));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Origin", ChangeOrigin, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom, linkedProps));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom));
 
   linkedProps.clear();
   linkedProps << "Spacing";
-  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Spacing", ChangeResolution, FilterParameter::Parameter, SetOriginResolutionImageGeom, linkedProps));
-  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Parameter, SetOriginResolutionImageGeom));
+  parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Spacing", ChangeResolution, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom, linkedProps));
+  parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom));
   parameters.back()->setLegacyPropertyName("Resolution");
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 16726f0b84..4cff07ca40 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -73,8 +73,8 @@ void SplitAttributeArray::setupFilterParameters()
   FilterParameterVectorType parameters;
   DataArraySelectionFilterParameter::RequirementType dasReq =
       DataArraySelectionFilterParameter::CreateRequirement(SIMPL::Defaults::AnyPrimitive, SIMPL::Defaults::AnyComponentSize, AttributeMatrix::Type::Any, IGeometry::Type::Any);
-  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", InputArrayPath, FilterParameter::RequiredArray, SplitAttributeArray, dasReq));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Postfix", SplitArraysSuffix, FilterParameter::Parameter, SplitAttributeArray));
+  parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Multicomponent Attribute Array", InputArrayPath, FilterParameter::Category::RequiredArray, SplitAttributeArray, dasReq));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Postfix", SplitArraysSuffix, FilterParameter::Category::Parameter, SplitAttributeArray));
   setFilterParameters(parameters);
 }
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 80322fd35a..a9c4d983b0 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -160,18 +160,18 @@ void WriteASCIIData::setupFilterParameters()
     QStringList linkedProps = {"OutputPath", "FileExtension", "MaxValPerLine", "OutputFilePath"};
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
     linkedProps.clear();
   }
 
   // Multiple File Output
-  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Parameter, WriteASCIIData, "*", "*", 0));
-  parameters.push_back(SIMPL_NEW_STRING_FP("File Extension", FileExtension, FilterParameter::Parameter, WriteASCIIData, 0));
-  parameters.push_back(SIMPL_NEW_INTEGER_FP("Maximum Tuples Per Line", MaxValPerLine, FilterParameter::Parameter, WriteASCIIData, 0));
+  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Category::Parameter, WriteASCIIData, "*", "*", 0));
+  parameters.push_back(SIMPL_NEW_STRING_FP("File Extension", FileExtension, FilterParameter::Category::Parameter, WriteASCIIData, 0));
+  parameters.push_back(SIMPL_NEW_INTEGER_FP("Maximum Tuples Per Line", MaxValPerLine, FilterParameter::Category::Parameter, WriteASCIIData, 0));
 
   // Single File Output
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File Path", OutputFilePath, FilterParameter::Parameter, WriteASCIIData, "*", "*", 1));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File Path", OutputFilePath, FilterParameter::Category::Parameter, WriteASCIIData, "*", "*", 1));
 
   {
     ChoiceFilterParameter::Pointer parameter = ChoiceFilterParameter::New(); // Delimiter choice
@@ -187,12 +187,12 @@ void WriteASCIIData::setupFilterParameters()
     choices.push_back(": (colon)");
     choices.push_back("\\t (Tab)");
     parameter->setChoices(choices);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
   {
     MultiDataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Arrays to Export", SelectedDataArrayPaths, FilterParameter::RequiredArray, WriteASCIIData, req));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Attribute Arrays to Export", SelectedDataArrayPaths, FilterParameter::Category::RequiredArray, WriteASCIIData, req));
   }
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index 01001d9655..cfce8265eb 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -74,12 +74,12 @@ void WriteTriangleGeometry::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Nodes File", OutputNodesFile, FilterParameter::Parameter, WriteTriangleGeometry));
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Triangles File", OutputTrianglesFile, FilterParameter::Parameter, WriteTriangleGeometry));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Nodes File", OutputNodesFile, FilterParameter::Category::Parameter, WriteTriangleGeometry));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output Triangles File", OutputTrianglesFile, FilterParameter::Category::Parameter, WriteTriangleGeometry));
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("DataContainer", DataContainerSelection, FilterParameter::RequiredArray, WriteTriangleGeometry, req));
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("DataContainer", DataContainerSelection, FilterParameter::Category::RequiredArray, WriteTriangleGeometry, req));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index b0f46e8759..7346aa7d83 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -374,13 +374,13 @@ FloatVec3Type AbstractFilterParametersReader::readFloatVec3(const QString& name,
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float2ndOrderPoly_t AbstractFilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t defaultValue)
+Float2ndOrderPolynomial AbstractFilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPolynomial defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
 
   // This should never be executed
-  return Float2ndOrderPoly_t();
+  return Float2ndOrderPolynomial();
 }
 
 // -----------------------------------------------------------------------------
@@ -398,13 +398,13 @@ Float3rdOrderPoly_t AbstractFilterParametersReader::readFloat3rdOrderPoly(const
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float4thOrderPoly_t AbstractFilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t defaultValue)
+Float4thOrderPolynomial AbstractFilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPolynomial defaultValue)
 {
   Q_UNUSED(name)
   Q_UNUSED(defaultValue)
 
   // This should never be executed
-  return Float4thOrderPoly_t();
+  return Float4thOrderPolynomial();
 }
 
 // -----------------------------------------------------------------------------
@@ -459,26 +459,26 @@ ComparisonInputsAdvanced AbstractFilterParametersReader::readComparisonInputsAdv
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AxisAngleInput_t AbstractFilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos)
+AxisAngleInput AbstractFilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput v, int vectorPos)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
   Q_UNUSED(vectorPos)
 
   // This should never be executed
-  return AxisAngleInput_t();
+  return AxisAngleInput();
 }
 
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<AxisAngleInput_t> AbstractFilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v)
+QVector<AxisAngleInput> AbstractFilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput> v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
 
   // This should never be executed
-  return QVector<AxisAngleInput_t>();
+  return QVector<AxisAngleInput>();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 8a01d51c01..5962de7d18 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -39,18 +39,17 @@
 #include <QtCore/QString>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
-#include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
+#include "SIMPLib/FilterParameters/AxisAngleInput.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
-#include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
-#include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
-#include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
-#include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
+#include "SIMPLib/FilterParameters/Float2ndOrderPolynomial.h"
+#include "SIMPLib/FilterParameters/Float4thOrderPolynomial.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
-#include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
-#include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
+#include "SIMPLib/FilterParameters/StackFileListInfo.h"
+#include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
 #include "SIMPLib/Filtering/ComparisonInputs.h"
 #include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 
@@ -112,15 +111,15 @@ class SIMPLib_EXPORT AbstractFilterParametersReader
 
   virtual IntVec3Type readIntVec3(const QString& name, IntVec3Type v);
   virtual FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v);
-  virtual Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v);
+  virtual Float2ndOrderPolynomial readFloat2ndOrderPoly(const QString& name, Float2ndOrderPolynomial v);
   virtual Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v);
-  virtual Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v);
+  virtual Float4thOrderPolynomial readFloat4thOrderPoly(const QString& name, Float4thOrderPolynomial v);
   virtual StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v);
   virtual ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos);
   virtual ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v);
   virtual ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v);
-  virtual AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos);
-  virtual QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v);
+  virtual AxisAngleInput readAxisAngle(const QString& name, AxisAngleInput v, int vectorPos);
+  virtual QVector<AxisAngleInput> readAxisAngles(const QString& name, QVector<AxisAngleInput> v);
   virtual QSet<QString> readArraySelections(const QString& name, QSet<QString> v);
 
   virtual DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v);
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index a03d244abc..22e3f7a364 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -350,7 +350,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, FloatVec3Typ
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, Float2ndOrderPoly_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, Float2ndOrderPolynomial v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -374,7 +374,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, Float3rdOrde
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, Float4thOrderPoly_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, Float4thOrderPolynomial v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -422,7 +422,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, ComparisonIn
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInput v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
@@ -434,7 +434,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInp
 // -----------------------------------------------------------------------------
 // These are actually written as a binary 4x1 float array as an attribute
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v, int vectorPos)
+int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInput v, int vectorPos)
 {
   Q_UNUSED(name)
   Q_UNUSED(vectorPos)
@@ -446,7 +446,7 @@ int AbstractFilterParametersWriter::writeValue(const QString& name, AxisAngleInp
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int AbstractFilterParametersWriter::writeValue(const QString& name, QVector<AxisAngleInput_t> v)
+int AbstractFilterParametersWriter::writeValue(const QString& name, QVector<AxisAngleInput> v)
 {
   Q_UNUSED(name)
   Q_UNUSED(v)
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index 36ad509229..e5478c9a22 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -111,21 +111,21 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
 
   virtual int writeValue(const QString& name, IntVec3Type v);
   virtual int writeValue(const QString& name, FloatVec3Type v);
-  virtual int writeValue(const QString& name, Float2ndOrderPoly_t v);
+  virtual int writeValue(const QString& name, Float2ndOrderPolynomial v);
   virtual int writeValue(const QString& name, Float3rdOrderPoly_t v);
-  virtual int writeValue(const QString& name, Float4thOrderPoly_t v);
+  virtual int writeValue(const QString& name, Float4thOrderPolynomial v);
   virtual int writeValue(const QString& name, StackFileListInfo v);
 
   virtual int writeValue(const QString& name, ComparisonInput_t v);
   virtual int writeValue(const QString& name, ComparisonInputs v);
 
-  virtual int writeValue(const QString& name, QVector<AxisAngleInput_t> v);
+  virtual int writeValue(const QString& name, QVector<AxisAngleInput> v);
 
   virtual int writeArraySelections(const QString& name, QSet<QString> v);
 
   virtual int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy);
 
-  virtual int writeValue(const QString& name, AxisAngleInput_t v);
+  virtual int writeValue(const QString& name, AxisAngleInput v);
 
   virtual int writeValue(const QString& name, const DataArrayPath& path);
 
@@ -138,7 +138,7 @@ class SIMPLib_EXPORT AbstractFilterParametersWriter
 protected:
   AbstractFilterParametersWriter();
 
-  virtual int writeValue(const QString& name, AxisAngleInput_t v, int vectorPos);
+  virtual int writeValue(const QString& name, AxisAngleInput v, int vectorPos);
 
 public:
   AbstractFilterParametersWriter(const AbstractFilterParametersWriter&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 01aa8d4426..37990d8700 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -49,9 +49,9 @@ AttributeMatrixCreationFilterParameter::~AttributeMatrixCreationFilterParameter(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixCreationFilterParameter::Pointer AttributeMatrixCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
-                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                            const RequirementType& req, int groupIndex)
+AttributeMatrixCreationFilterParameter::Pointer AttributeMatrixCreationFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
+                                                                                               Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                               const RequirementType& req, int groupIndex)
 {
   AttributeMatrixCreationFilterParameter::Pointer ptr = AttributeMatrixCreationFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index db197cccc0..085c2c5299 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -56,7 +56,7 @@ class AbstractFilter;
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * AttributeMatrixCreationFilterParameter::RequirementType req;
- * SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::CreatedArray, GenericExample, req);
+ * SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::Category::CreatedArray, GenericExample, req);
  */
 #define SIMPL_NEW_AM_CREATION_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AttributeMatrixCreationFilterParameter, __VA_ARGS__))
@@ -67,6 +67,14 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(AttributeMatrixCreationFilterParameter)
+  PYB11_SHARED_POINTERS(AttributeMatrixCreationFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category AttributeMatrixCreationFilterParameter::SetterCallbackType AttributeMatrixCreationFilterParameter::GetterCallbackType AttributeMatrixCreationFilterParameter::RequirementType int)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = AttributeMatrixCreationFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -115,8 +123,8 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
   ~AttributeMatrixCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index f732a95467..b11da28fc3 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -52,9 +52,9 @@ AttributeMatrixSelectionFilterParameter::~AttributeMatrixSelectionFilterParamete
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AttributeMatrixSelectionFilterParameter::Pointer AttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
-                                                                                              Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                              const RequirementType& req, int groupIndex)
+AttributeMatrixSelectionFilterParameter::Pointer AttributeMatrixSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
+                                                                                                 Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                                 const RequirementType& req, int groupIndex)
 {
 
   AttributeMatrixSelectionFilterParameter::Pointer ptr = AttributeMatrixSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index 5ecf8aa539..b26e2d5e3e 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -55,7 +55,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * AttributeMatrixSelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", AttributeMatrixPath, FilterParameter::Parameter, GenericExample, req);
+ * SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", AttributeMatrixPath, FilterParameter::Category::Parameter, GenericExample, req);
  */
 #define SIMPL_NEW_AM_SELECTION_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AttributeMatrixSelectionFilterParameter, __VA_ARGS__))
@@ -66,6 +66,14 @@
  */
 class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(AttributeMatrixSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(AttributeMatrixSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category AttributeMatrixSelectionFilterParameter::SetterCallbackType AttributeMatrixSelectionFilterParameter::GetterCallbackType AttributeMatrixSelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = AttributeMatrixSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -114,8 +122,8 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
   ~AttributeMatrixSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 044bacea8a..1d1b64d4a8 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -48,8 +48,8 @@ AxisAngleFilterParameter::~AxisAngleFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AxisAngleFilterParameter::Pointer AxisAngleFilterParameter::New(const QString& humanLabel, const QString& propertyName, const AxisAngleInput_t& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+AxisAngleFilterParameter::Pointer AxisAngleFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const AxisAngleInput& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   AxisAngleFilterParameter::Pointer ptr = AxisAngleFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -86,7 +86,7 @@ void AxisAngleFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject axisObj = jsonValue.toObject();
-    AxisAngleInput_t axisAngle;
+    AxisAngleInput axisAngle;
     axisAngle.readJson(axisObj);
     m_SetterCallback(axisAngle);
   }
@@ -100,7 +100,7 @@ void AxisAngleFilterParameter::writeJson(QJsonObject& json)
   if(m_GetterCallback)
   {
     QJsonObject axisObj;
-    AxisAngleInput_t axisAngle = m_GetterCallback();
+    AxisAngleInput axisAngle = m_GetterCallback();
     axisAngle.writeJson(axisObj);
     json[getPropertyName()] = axisObj;
   }
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index 5e2aaae786..9e9fe6d078 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -52,7 +52,7 @@
  * SIMPL_NEW_AXISANGLE_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_AXISANGLE_FP("Crystal Rotations", CrystalSymmetryRotations, FilterParameter::Parameter, GenericExample, 2);
+ * SIMPL_NEW_AXISANGLE_FP("Crystal Rotations", CrystalSymmetryRotations, FilterParameter::Category::Parameter, GenericExample, 2);
  */
 #define SIMPL_NEW_AXISANGLE_FP(...)                                                                                                                                                                    \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(AxisAngleFilterParameter, __VA_ARGS__))
@@ -63,6 +63,14 @@
  */
 class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(AxisAngleFilterParameter)
+  PYB11_SHARED_POINTERS(AxisAngleFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString AxisAngleInput FilterParameter::Category AxisAngleFilterParameter::SetterCallbackType AxisAngleFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = AxisAngleFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -82,8 +90,8 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(AxisAngleInput_t)>;
-  using GetterCallbackType = std::function<AxisAngleInput_t(void)>;
+  using SetterCallbackType = std::function<void(AxisAngleInput)>;
+  using GetterCallbackType = std::function<AxisAngleInput(void)>;
 
   /**
    * @brief New This function instantiates an instance of the AxisAngleFilterParameter. Although this function is available to be used,
@@ -101,8 +109,8 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const AxisAngleInput_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const AxisAngleInput& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~AxisAngleFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp b/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
new file mode 100644
index 0000000000..d76aec43eb
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
@@ -0,0 +1,63 @@
+/* ============================================================================
+ * Copyright (c) 2021-2021 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "AxisAngleInput.h"
+
+AxisAngleInput::AxisAngleInput() = default;
+AxisAngleInput::~AxisAngleInput() = default;
+
+AxisAngleInput::AxisAngleInput(float h, float k, float l, float angle)
+: h(h)
+, k(k)
+, l(l)
+, angle(angle)
+{
+}
+void AxisAngleInput::writeJson(QJsonObject& json) const
+{
+  json["angle"] = angle;
+  json["h"] = h;
+  json["k"] = k;
+  json["l"] = l;
+}
+
+bool AxisAngleInput::readJson(const QJsonObject& json)
+{
+  if(json["angle"].isDouble() && json["h"].isDouble() && json["k"].isDouble() && json["l"].isDouble())
+  {
+    angle = static_cast<float>(json["angle"].toDouble());
+    h = static_cast<float>(json["h"].toDouble());
+    k = static_cast<float>(json["k"].toDouble());
+    l = static_cast<float>(json["l"].toDouble());
+    return true;
+  }
+  return false;
+}
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleInput.h b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
index bce8ae1fdd..6c704aa6df 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleInput.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleInput.h
@@ -33,36 +33,51 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QMetaType>
 
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLPythonMacros.h"
+
 /**
  * @brief
  */
-struct AxisAngleInput_t
+class SIMPLib_EXPORT AxisAngleInput
 {
-  float angle = 0.0f;
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(AxisAngleInput)
+  PYB11_CREATION(float float float float)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
+
+public:
+  AxisAngleInput();
+  ~AxisAngleInput();
+
+  AxisAngleInput(float h, float k, float l, float angle);
+
   float h = 0.0f;
   float k = 0.0f;
   float l = 0.0f;
+  float angle = 0.0f;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) const;
 
-  void writeJson(QJsonObject& json) const
-  {
-    json["angle"] = angle;
-    json["h"] = h;
-    json["k"] = k;
-    json["l"] = l;
-  }
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  bool readJson(const QJsonObject& json);
 
-  bool readJson(const QJsonObject& json)
-  {
-    if(json["angle"].isDouble() && json["h"].isDouble() && json["k"].isDouble() && json["l"].isDouble())
-    {
-      angle = static_cast<float>(json["angle"].toDouble());
-      h = static_cast<float>(json["h"].toDouble());
-      k = static_cast<float>(json["k"].toDouble());
-      l = static_cast<float>(json["l"].toDouble());
-      return true;
-    }
-    return false;
-  }
+public:
+  AxisAngleInput(const AxisAngleInput&) = default;
+  AxisAngleInput(AxisAngleInput&&) = default;
+  AxisAngleInput& operator=(const AxisAngleInput&) = default;
+  AxisAngleInput& operator=(AxisAngleInput&&) = default;
 };
 
-Q_DECLARE_METATYPE(AxisAngleInput_t)
+Q_DECLARE_METATYPE(AxisAngleInput)
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index 8929b22bf0..08e886a0ce 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -48,8 +48,8 @@ BooleanFilterParameter::~BooleanFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-BooleanFilterParameter::Pointer BooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
-                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+BooleanFilterParameter::Pointer BooleanFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
+                                                               const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   BooleanFilterParameter::Pointer ptr = BooleanFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 7e110b7006..f41bd78032 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_BOOL_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_BOOL_FP("Write Alignment Shift File", WriteAlignmentShifts, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_BOOL_FP("Write Alignment Shift File", WriteAlignmentShifts, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_BOOL_FP(...)                                                                                                                                                                         \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(BooleanFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(BooleanFilterParameter)
+  PYB11_SHARED_POINTERS(BooleanFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString bool FilterParameter::Category BooleanFilterParameter::SetterCallbackType BooleanFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = BooleanFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +108,8 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~BooleanFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index ea23ee3d27..73bd639edc 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -51,8 +51,8 @@ CalculatorFilterParameter::~CalculatorFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CalculatorFilterParameter::Pointer CalculatorFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+CalculatorFilterParameter::Pointer CalculatorFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   CalculatorFilterParameter::Pointer ptr = CalculatorFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 432af5bdf4..556d8ac376 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_CALC_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_CALC_FP("Calculator Expression", CalcExpression, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_CALC_FP("Calculator Expression", CalcExpression, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_CALC_FP(...)                                                                                                                                                                         \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(CalculatorFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(CalculatorFilterParameter)
+  PYB11_SHARED_POINTERS(CalculatorFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category CalculatorFilterParameter::SetterCallbackType CalculatorFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = CalculatorFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +108,8 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~CalculatorFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index 9f1280c97e..1d2d2e6726 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -51,8 +51,8 @@ ChoiceFilterParameter::~ChoiceFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ChoiceFilterParameter::Pointer ChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                          const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
+ChoiceFilterParameter::Pointer ChoiceFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                             const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
 
 {
   ChoiceFilterParameter::Pointer ptr = ChoiceFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index 4270722fa9..53dc3fd405 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_CHOICE_FP("HumanLabel", PropertyName, Category, FilterName, Choices, Editable, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_CHOICE_FP("Size Distribution Fit Type", SizeDistributionFitType, FilterParameter::Parameter, GenericExample, choices, false);
+ * SIMPL_NEW_CHOICE_FP("Size Distribution Fit Type", SizeDistributionFitType, FilterParameter::Category::Parameter, GenericExample, choices, false);
  */
 #define SIMPL_NEW_CHOICE_FP(...)                                                                                                                                                                       \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ChoiceFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ChoiceFilterParameter)
+  PYB11_SHARED_POINTERS(ChoiceFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category ChoiceFilterParameter::SetterCallbackType ChoiceFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ChoiceFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +110,8 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     QVector<QString> choices, bool editable, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                        QVector<QString> choices, bool editable, int groupIndex = -1);
 
   ~ChoiceFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index df9424aed2..d967774ebf 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -54,10 +54,10 @@ ComparisonSelectionAdvancedFilterParameter::~ComparisonSelectionAdvancedFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue,
-                                                                                                    Category category, const SetterCallbackType& setterCallback,
-                                                                                                    const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
-                                                                                                    int groupIndex)
+ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::Create(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue,
+                                                                                                       Category category, const SetterCallbackType& setterCallback,
+                                                                                                       const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
+                                                                                                       int groupIndex)
 {
   ComparisonSelectionAdvancedFilterParameter::Pointer ptr = ComparisonSelectionAdvancedFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 3f270ce84f..7c62c308e2 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -55,7 +55,7 @@
  * SIMPL_NEW_COMP_SEL_ADV_FP("HumanLabel", PropertyName, Category, FilterName, Choices, ShowOperators, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_COMP_SEL_ADV_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Parameter, GenericExample, choices, true);
+ * SIMPL_NEW_COMP_SEL_ADV_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Category::Parameter, GenericExample, choices, true);
  */
 #define SIMPL_NEW_COMP_SEL_ADV_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ComparisonSelectionAdvancedFilterParameter, __VA_ARGS__))
@@ -66,6 +66,14 @@
  */
 class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ComparisonSelectionAdvancedFilterParameter)
+  PYB11_SHARED_POINTERS(ComparisonSelectionAdvancedFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString ComparisonInputsAdvanced FilterParameter::Category ComparisonSelectionAdvancedFilterParameter::SetterCallbackType ComparisonSelectionAdvancedFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ComparisonSelectionAdvancedFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -106,8 +114,8 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
 
   ~ComparisonSelectionAdvancedFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index fcde88b379..e313d855ac 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -55,9 +55,9 @@ ComparisonSelectionFilterParameter::~ComparisonSelectionFilterParameter() = defa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category,
-                                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                                                                                    bool showOperators, int groupIndex)
+ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category,
+                                                                                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
+                                                                                       bool showOperators, int groupIndex)
 {
   ComparisonSelectionFilterParameter::Pointer ptr = ComparisonSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index b317c564d4..022325565d 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -54,7 +54,7 @@
  * SIMPL_NEW_COMP_SEL_FP("HumanLabel", PropertyName, Category, FilterName, Choices, ShowOperators, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_COMP_SEL_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Parameter, GenericExample, choices, true);
+ * SIMPL_NEW_COMP_SEL_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Category::Parameter, GenericExample, choices, true);
  */
 #define SIMPL_NEW_COMP_SEL_FP(...)                                                                                                                                                                     \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ComparisonSelectionFilterParameter, __VA_ARGS__))
@@ -65,6 +65,14 @@
  */
 class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ComparisonSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(ComparisonSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString ComparisonInputs FilterParameter::Category ComparisonSelectionFilterParameter::SetterCallbackType ComparisonSelectionFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ComparisonSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -105,8 +113,8 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
 
   ~ComparisonSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index 53a7070be8..e0721cc85d 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -48,8 +48,9 @@ ConstrainedDoubleFilterParameter::~ConstrainedDoubleFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category,
-                                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::Create(const QString& humanLabel, const QString& propertyName, double min, double max, double defaultValue,
+                                                                                   Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                   int groupIndex)
 {
 
   ConstrainedDoubleFilterParameter::Pointer ptr = ConstrainedDoubleFilterParameter::New();
@@ -60,6 +61,8 @@ ConstrainedDoubleFilterParameter::Pointer ConstrainedDoubleFilterParameter::New(
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
   ptr->setGetterCallback(getterCallback);
+  ptr->setMinimum(min);
+  ptr->setMaximum(max);
 
   return ptr;
 }
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 45b04c4f08..5a7cb96906 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -39,7 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/ConstrainedFilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_DOUBLE_FP This macro is a short-form way of instantiating an instance of
@@ -51,7 +51,7 @@
  * SIMPL_NEW_DOUBLE_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_CONSTRAINED_DOUBLE_FP(...)                                                                                                                                                           \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ConstrainedDoubleFilterParameter, __VA_ARGS__))
@@ -60,8 +60,16 @@
  * @brief The ConstrainedDoubleFilterParameter class is used by filters to instantiate an DoubleWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, a DoubleWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
+class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public ConstrainedFilterParameter<double>
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ConstrainedDoubleFilterParameter)
+  PYB11_SHARED_POINTERS(ConstrainedDoubleFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString double double double FilterParameter::Category ConstrainedDoubleFilterParameter::SetterCallbackType ConstrainedDoubleFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ConstrainedDoubleFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -90,6 +98,8 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
 
    * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
    * @param propertyName The internal property name for this filter parameter.
+   * @param min value
+   * @param max value
    * @param defaultValue The value that this filter parameter will be initialized to by default.
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
@@ -100,8 +110,8 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, double min, double max, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ConstrainedDoubleFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
index 3e2898672a..08f725ef69 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -36,67 +36,100 @@
 #pragma once
 
 #include <memory>
+#include <numeric>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 template <typename T>
 class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+//  PYB11_BEGIN_BINDINGS(ConstrainedFilterParameter)
+//  PYB11_SHARED_POINTERS(ConstrainedFilterParameter)
+//  PYB11_STATIC_CREATION(Create)
+//  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ConstrainedFilterParameter<T>;
   using Pointer = std::shared_ptr<Self>;
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
-  static Pointer NullPointer();
+  static Pointer NullPointer()
+  {
+    return Pointer(static_cast<Self*>(nullptr));
+  }
 
-  static Pointer New();
+  static Pointer New()
+  {
+    Pointer sharedPtr(new(ConstrainedFilterParameter<T>));
+    return sharedPtr;
+  }
 
   /**
    * @brief Returns the name of the class for ConstrainedFilterParameter<T>
    */
-  QString getNameOfClass() const override;
+  QString getNameOfClass() const override
+  {
+    return QString("ConstrainedFilterParameter<T>");
+  }
   /**
    * @brief Returns the name of the class for ConstrainedFilterParameter<T>
    */
-  static QString ClassName();
-
-  virtual ~ConstrainedFilterParameter()
+  static QString ClassName()
   {
+    return "ConstrainedFilterParameter";
   }
 
+  virtual ~ConstrainedFilterParameter() = default;
+
   /**
    * @brief Setter property for Minimum
    */
-  void setMinimum(const T& value);
+  void setMinimum(const T& value)
+  {
+    m_Minimum = value;
+  }
   /**
    * @brief Getter property for Minimum
    * @return Value of Minimum
    */
-  T getMinimum() const;
+  T getMinimum() const
+  {
+    return m_Minimum;
+  }
 
   /**
    * @brief Setter property for Maximum
    */
-  void setMaximum(const T& value);
+  void setMaximum(const T& value)
+  {
+    m_Maximum = value;
+  }
   /**
    * @brief Getter property for Maximum
    * @return Value of Maximum
    */
-  T getMaximum() const;
+  T getMaximum() const
+  {
+    return m_Maximum;
+  }
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
    * @return
    */
-  QString getWidgetType() const override;
-
-protected:
-  ConstrainedFilterParameter()
+  QString getWidgetType() const override
   {
+    return "SUBCLASS IMPLEMENTS THIS METHOD";
   }
 
+protected:
+  ConstrainedFilterParameter() = default;
+
 public:
   ConstrainedFilterParameter(const ConstrainedFilterParameter&) = delete;            // Copy Constructor Not Implemented
   ConstrainedFilterParameter(ConstrainedFilterParameter&&) = delete;                 // Move Constructor Not Implemented
@@ -104,6 +137,7 @@ class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
   ConstrainedFilterParameter& operator=(ConstrainedFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  T m_Minimum = {};
-  T m_Maximum = {};
+  T m_Minimum = std::numeric_limits<T>::min();
+  T m_Maximum = std::numeric_limits<T>::max();
+  ;
 };
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index 6e79c30e50..9351b8e0c7 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -48,8 +48,8 @@ ConstrainedIntFilterParameter::~ConstrainedIntFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
-                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int32_t min, int32_t max, int32_t defaultValue, Category category,
+                                                                             const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   ConstrainedIntFilterParameter::Pointer ptr = ConstrainedIntFilterParameter::New();
@@ -60,6 +60,8 @@ ConstrainedIntFilterParameter::Pointer ConstrainedIntFilterParameter::New(const
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
   ptr->setGetterCallback(getterCallback);
+  ptr->setMinimum(min);
+  ptr->setMaximum(max);
 
   return ptr;
 }
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index db7ba8dbec..364aa240b1 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -39,6 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
+#include "SIMPLib/FilterParameters/ConstrainedFilterParameter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 
 /**
@@ -51,7 +52,7 @@
  * SIMPL_NEW_INTEGER_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
+ * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Category::Parameter, GenericExample, 0);
  */
 #define SIMPL_NEW_CONSTRAINED_INT_FP(...)                                                                                                                                                              \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ConstrainedIntFilterParameter, __VA_ARGS__))
@@ -60,8 +61,16 @@
  * @brief The ConstrainedIntFilterParameter class is used by filters to instantiate an IntWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, an IntWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
+class SIMPLib_EXPORT ConstrainedIntFilterParameter : public ConstrainedFilterParameter<int32_t>
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ConstrainedIntFilterParameter)
+  PYB11_SHARED_POINTERS(ConstrainedIntFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString int32_t int32_t int32_t FilterParameter::Category ConstrainedIntFilterParameter::SetterCallbackType ConstrainedIntFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ConstrainedIntFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -90,6 +99,8 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
 
    * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
    * @param propertyName The internal property name for this filter parameter.
+   * @param min
+   * @param max
    * @param defaultValue The value that this filter parameter will be initialized to by default.
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
@@ -100,8 +111,8 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, int min, int max, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ConstrainedIntFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index c430835d09..024e254d65 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -51,8 +51,9 @@ DataArrayCreationFilterParameter::~DataArrayCreationFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArrayCreationFilterParameter::Pointer DataArrayCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req, int groupIndex)
+DataArrayCreationFilterParameter::Pointer DataArrayCreationFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req,
+                                                                                   int groupIndex)
 {
 
   DataArrayCreationFilterParameter::Pointer ptr = DataArrayCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 95b8d79f4b..3c3dc52cdd 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -57,7 +57,7 @@ class AbstractFilter;
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * DataArrayCreationFilterParameter::RequirementType req;
- * SIMPL_NEW_DA_CREATION_FP("Created Data Array", CreatedDataArray, FilterParameter::Parameter, GenericExample, req, 0);
+ * SIMPL_NEW_DA_CREATION_FP("Created Data Array", CreatedDataArray, FilterParameter::Category::Parameter, GenericExample, req, 0);
  */
 #define SIMPL_NEW_DA_CREATION_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataArrayCreationFilterParameter, __VA_ARGS__))
@@ -68,6 +68,14 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataArrayCreationFilterParameter)
+  PYB11_SHARED_POINTERS(DataArrayCreationFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataArrayCreationFilterParameter::SetterCallbackType DataArrayCreationFilterParameter::GetterCallbackType DataArrayCreationFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataArrayCreationFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -116,8 +124,8 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~DataArrayCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 15e7d4c5d6..5652c0c9a9 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -50,9 +50,9 @@ DataArraySelectionFilterParameter::~DataArraySelectionFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req,
-                                                                                  int groupIndex)
+DataArraySelectionFilterParameter::Pointer DataArraySelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, RequirementType req,
+                                                                                     int groupIndex)
 {
 
   DataArraySelectionFilterParameter::Pointer ptr = DataArraySelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index c0b88218cb..068f60d6ab 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -58,7 +58,7 @@ class AbstractFilter;
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * DataArraySelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Parameter, GenericExample, req);
+ * SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Category::Parameter, GenericExample, req);
  */
 #define SIMPL_NEW_DA_SELECTION_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataArraySelectionFilterParameter, __VA_ARGS__))
@@ -69,6 +69,14 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataArraySelectionFilterParameter)
+  PYB11_SHARED_POINTERS(DataArraySelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataArraySelectionFilterParameter::SetterCallbackType DataArraySelectionFilterParameter::GetterCallbackType DataArraySelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataArraySelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -119,8 +127,8 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~DataArraySelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index b8eef22841..bf338fa34a 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -53,9 +53,9 @@ DataContainerArrayProxyFilterParameter::~DataContainerArrayProxyFilterParameter(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerArrayProxyFilterParameter::Pointer DataContainerArrayProxyFilterParameter::New(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue,
-                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                            DataContainerArrayProxy proxy, Qt::CheckState defValue, int groupIndex)
+DataContainerArrayProxyFilterParameter::Pointer DataContainerArrayProxyFilterParameter::Create(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue,
+                                                                                               Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                               DataContainerArrayProxy proxy, Qt::CheckState defValue, int groupIndex)
 {
   DataContainerArrayProxyFilterParameter::Pointer ptr = DataContainerArrayProxyFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 04ba39becc..1ab8b1fdfc 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -53,7 +53,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
  * DataContainerArrayProxy proxy;
- * SIMPL_NEW_DCA_PROXY_FP("Array to Select", DcaProxy, FilterParameter::Parameter, GenericExample, proxy, Qt::Checked);
+ * SIMPL_NEW_DCA_PROXY_FP("Array to Select", DcaProxy, FilterParameter::Category::Parameter, GenericExample, proxy, Qt::Checked);
  */
 #define SIMPL_NEW_DCA_PROXY_FP(...)                                                                                                                                                                    \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerArrayProxyFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataContainerArrayProxyFilterParameter)
+  PYB11_SHARED_POINTERS(DataContainerArrayProxyFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataContainerArrayProxy FilterParameter::Category DataContainerArrayProxyFilterParameter::SetterCallbackType DataContainerArrayProxyFilterParameter::GetterCallbackType DataContainerArrayProxy Qt::CheckState int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataContainerArrayProxyFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -104,8 +112,8 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, DataContainerArrayProxy proxy, Qt::CheckState defState, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, DataContainerArrayProxy defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, DataContainerArrayProxy proxy, Qt::CheckState defState, int groupIndex = -1);
 
   ~DataContainerArrayProxyFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 1fc89c5b16..997e57d4af 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -50,8 +50,8 @@ DataContainerCreationFilterParameter::~DataContainerCreationFilterParameter() =
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+DataContainerCreationFilterParameter::Pointer DataContainerCreationFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
+                                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DataContainerCreationFilterParameter::Pointer ptr = DataContainerCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index ca7efa3551..01c6af876d 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -52,7 +52,7 @@
  * SIMPL_NEW_DC_CREATION_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::CreatedArray, GenericExample);
+ * SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::Category::CreatedArray, GenericExample);
  */
 #define SIMPL_NEW_DC_CREATION_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerCreationFilterParameter, __VA_ARGS__))
@@ -63,6 +63,14 @@
  */
 class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataContainerCreationFilterParameter)
+  PYB11_SHARED_POINTERS(DataContainerCreationFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataContainerCreationFilterParameter::SetterCallbackType DataContainerCreationFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataContainerCreationFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -101,8 +109,8 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~DataContainerCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
index 26f815df01..7d4888467f 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -47,9 +47,9 @@ DataContainerGridSelectionFilterParameter::~DataContainerGridSelectionFilterPara
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerGridSelectionFilterParameter::Pointer DataContainerGridSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue,
-                                                                                                  Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                                                                                                  int groupIndex)
+DataContainerGridSelectionFilterParameter::Pointer DataContainerGridSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue,
+                                                                                                     Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                                     int groupIndex)
 {
   DataContainerGridSelectionFilterParameter::Pointer ptr = DataContainerGridSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
index a63e09e598..4c951ec9fd 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -53,7 +53,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * DataContainerGridSelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Parameter, GenericExample, req, 2);
+ * SIMPL_NEW_DC_GRID_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Category::Parameter, GenericExample, req, 2);
  */
 #define SIMPL_NEW_DC_GRID_SELECTION_FP(...)                                                                                                                                                            \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerGridSelectionFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataContainerGridSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(DataContainerGridSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataContainerGrid FilterParameter::Category DataContainerGridSelectionFilterParameter::SetterCallbackType DataContainerGridSelectionFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataContainerGridSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -107,8 +115,8 @@ class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterPa
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue, Category category, SetterCallbackType setterCallback,
-                     GetterCallbackType getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataContainerGrid& defaultValue, Category category, SetterCallbackType setterCallback,
+                        GetterCallbackType getterCallback, int groupIndex = -1);
 
   ~DataContainerGridSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index 38ec0483bd..61ad76a290 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -53,8 +53,8 @@ DataContainerReaderFilterParameter::~DataContainerReaderFilterParameter() = defa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerReaderFilterParameter::Pointer DataContainerReaderFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                    DataContainerReader* filter, int groupIndex)
+DataContainerReaderFilterParameter::Pointer DataContainerReaderFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                       DataContainerReader* filter, int groupIndex)
 {
   DataContainerReaderFilterParameter::Pointer ptr = DataContainerReaderFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index 5328b770b2..94d4ad13db 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -49,6 +49,14 @@
  */
 class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataContainerReaderFilterParameter)
+  PYB11_SHARED_POINTERS(DataContainerReaderFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category DataContainerReader* int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataContainerReaderFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -79,7 +87,7 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, DataContainerReader* filter, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, DataContainerReader* filter, int groupIndex = -1);
 
   ~DataContainerReaderFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index a5f16ca475..92ded6c8c2 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -50,9 +50,9 @@ DataContainerSelectionFilterParameter::~DataContainerSelectionFilterParameter()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category,
-                                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                          const RequirementType& req, int groupIndex)
+DataContainerSelectionFilterParameter::Pointer DataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
+                                                                                             Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                             const RequirementType& req, int groupIndex)
 {
   DataContainerSelectionFilterParameter::Pointer ptr = DataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index de6578c013..5071bf23da 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -54,7 +54,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * DataContainerSelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Parameter, GenericExample, req, 2);
+ * SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Category::Parameter, GenericExample, req, 2);
  */
 #define SIMPL_NEW_DC_SELECTION_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DataContainerSelectionFilterParameter, __VA_ARGS__))
@@ -65,6 +65,14 @@
  */
 class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DataContainerSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(DataContainerSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataContainerSelectionFilterParameter::SetterCallbackType DataContainerSelectionFilterParameter::GetterCallbackType DataContainerSelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DataContainerSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -112,8 +120,8 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
   ~DataContainerSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 7b91ab1626..9a0f3c4eae 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -48,27 +48,8 @@ DoubleFilterParameter::~DoubleFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                          const GetterCallbackType& getterCallback, int groupIndex)
-{
-
-  DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
-  ptr->setHumanLabel(humanLabel);
-  ptr->setPropertyName(propertyName);
-  ptr->setDefaultValue(defaultValue);
-  ptr->setCategory(category);
-  ptr->setGroupIndex(groupIndex);
-  ptr->setSetterCallback(setterCallback);
-  ptr->setGetterCallback(getterCallback);
-
-  return ptr;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-DoubleFilterParameter::Pointer DoubleFilterParameter::New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                          const GetterCallbackType& getterCallback, int groupIndex)
+DoubleFilterParameter::Pointer DoubleFilterParameter::Create(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                             const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   DoubleFilterParameter::Pointer ptr = DoubleFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index ebdfee4b3e..535eda7e37 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_DOUBLE_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_DOUBLE_FP(...)                                                                                                                                                                       \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DoubleFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DoubleFilterParameter)
+  PYB11_SHARED_POINTERS(DoubleFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString double FilterParameter::Category DoubleFilterParameter::SetterCallbackType DoubleFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DoubleFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,27 +108,8 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
-
-  /**
-   * @brief New This function instantiates an instance of the DoubleFilterParameter. Although this function is available to be used,
-   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_DOUBLE_FP(...) macro at the top of this file.
-
-   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
-   * @param propertyName The internal property name for this filter parameter.
-   * @param defaultValue The value that this filter parameter will be initialized to by default.
-   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
-   * are three categories: Parameter, Required Arrays, and Created Arrays.
-   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
-   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
-   * @return
-   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, double defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~DoubleFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 6284862b6c..69507f1255 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -48,8 +48,9 @@ DynamicChoiceFilterParameter::~DynamicChoiceFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicChoiceFilterParameter::Pointer DynamicChoiceFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& listProperty, int groupIndex)
+DynamicChoiceFilterParameter::Pointer DynamicChoiceFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& listProperty,
+                                                                           int groupIndex)
 {
   DynamicChoiceFilterParameter::Pointer ptr = DynamicChoiceFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index 32362e936e..1ad1a8e09d 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_DYN_CHOICE_FP("HumanLabel", PropertyName, Category, FilterName, ListProperty, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::CreatedArray, GenericExample, "DataArrayList");
+ * SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::Category::CreatedArray, GenericExample, "DataArrayList");
  */
 #define SIMPL_NEW_DYN_CHOICE_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DynamicChoiceFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DynamicChoiceFilterParameter)
+  PYB11_SHARED_POINTERS(DynamicChoiceFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category DynamicChoiceFilterParameter::SetterCallbackType DynamicChoiceFilterParameter::GetterCallbackType QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DynamicChoiceFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -101,8 +109,8 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& listProperty, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& listProperty, int groupIndex = -1);
 
   ~DynamicChoiceFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 05a255f669..bcf20b29dd 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -53,8 +53,8 @@ DynamicTableFilterParameter::~DynamicTableFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category,
-                                                                      const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+DynamicTableFilterParameter::Pointer DynamicTableFilterParameter::Create(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category,
+                                                                         const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   DynamicTableFilterParameter::Pointer ptr = DynamicTableFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 0a2be9e284..066b231469 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -53,7 +53,7 @@
  * IsColsDynamic (opt.), MinRowCount (opt.), MinColCount (opt.), GroupIndex (opt.))
  *
  * Example 1 (instantiated within a filter called [DynamicTableExample](@ref dynamictableexample), with 5 optional parameters):
- * SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 5", DynamicData5, FilterParameter::Parameter, DynamicTableExample, true, true, 0, 0, 0);
+ * SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 5", DynamicData5, FilterParameter::Category::Parameter, DynamicTableExample, true, true, 0, 0, 0);
  */
 #define SIMPL_NEW_DYN_TABLE_FP(...)                                                                                                                                                                    \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(DynamicTableFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(DynamicTableFilterParameter)
+  PYB11_SHARED_POINTERS(DynamicTableFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DynamicTableData FilterParameter::Category DynamicTableFilterParameter::SetterCallbackType DynamicTableFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = DynamicTableFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -106,8 +114,8 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, DynamicTableData defaultTableData, FilterParameter::Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~DynamicTableFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FileListInfo.h b/Source/SIMPLib/FilterParameters/FileListInfo.h
index 6d93131885..536f526473 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfo.h
@@ -39,6 +39,7 @@
 
 class SIMPLib_EXPORT FileListInfo
 {
+
 public:
   virtual ~FileListInfo();
 
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 729a928e50..46ff528186 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -51,8 +51,8 @@ FileListInfoFilterParameter::~FileListInfoFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::New(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue, FilterParameter::Category category,
-                                                                      SetterCallbackType setterCallback, GetterCallbackType getterCallback)
+FileListInfoFilterParameter::Pointer FileListInfoFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue,
+                                                                         FilterParameter::Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback)
 {
 
   FileListInfoFilterParameter::Pointer ptr = FileListInfoFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index bdace44c70..9b466ac405 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -53,7 +53,7 @@
  * SIMPL_NEW_FILELISTINFO_FP("HumanLabel", PropertyName, Category, FilterName)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample)):
- * SIMPL_NEW_FILELISTINFO_FP("Input File List", InputFileListInfo, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_FILELISTINFO_FP("Input File List", InputFileListInfo, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_FILELISTINFO_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FileListInfoFilterParameter, __VA_ARGS__))
@@ -64,6 +64,12 @@
  */
 class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
 {
+
+  PYB11_BEGIN_BINDINGS(FileListInfoFilterParameter)
+  PYB11_SHARED_POINTERS(FileListInfoFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString StackFileListInfo FilterParameter::Category FileListInfoFilterParameter::SetterCallbackType FileListInfoFilterParameter::GetterCallbackType)
+  PYB11_END_BINDINGS()
+
 public:
   using Self = FileListInfoFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +108,8 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
   * that this FilterParameter subclass represents.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue, Category category, SetterCallbackType setterCallback,
-                     GetterCallbackType getterCallback);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const StackFileListInfo& defaultValue, Category category, SetterCallbackType setterCallback,
+                        GetterCallbackType getterCallback);
 
   ~FileListInfoFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index a3159eda7e..a693505094 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -46,7 +46,7 @@
 FilterParameter::FilterParameter()
 : m_HumanLabel("")
 , m_PropertyName("")
-, m_Category(Uncategorized)
+, m_Category(FilterParameter::Category::Uncategorized)
 , m_ReadOnly(false)
 , m_GroupIndex(-1)
 {
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index fac3de891e..8c15dc5e57 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -56,6 +56,16 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT FilterParameter
 {
+
+  // clang-format off
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(FilterParameter)
+  PYB11_SHARED_POINTERS(FilterParameter)
+
+  PYB11_ENUMERATION(Category)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -73,7 +83,9 @@ class SIMPLib_EXPORT FilterParameter
    */
   static QString ClassName();
 
-  enum Category
+  using EnumType = uint32_t;
+
+  enum class Category : EnumType
   {
     Parameter = 0,
     RequiredArray = 1,
@@ -223,24 +235,25 @@ using FilterParameterVectorType = std::vector<FilterParameter::Pointer>;
 // to the constructor. These macros support a minimum of 4 arguments.
 
 #define SIMPL_NEW_FP_9(Class, Desc, Prop, Category, Filter, Index, A, B, C, D)                                                                                                                         \
-  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C, D)
+  Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C, D)
 
 #define SIMPL_NEW_FP_8(Class, Desc, Prop, Category, Filter, Index, A, B, C)                                                                                                                            \
-  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C)
+  Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B, C)
 
 #define SIMPL_NEW_FP_7(Class, Desc, Prop, Category, Filter, Index, A, B)                                                                                                                               \
-  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B)
+  Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A, B)
 
 #define SIMPL_NEW_FP_6(Class, Desc, Prop, Category, Filter, Index, A)                                                                                                                                  \
-  Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A)
+  Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index, A)
 
-#define SIMPL_NEW_FP_5(Class, Desc, Prop, Category, Filter, Index) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index)
+#define SIMPL_NEW_FP_5(Class, Desc, Prop, Category, Filter, Index)                                                                                                                                     \
+  Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop), Index)
 
-#define SIMPL_NEW_FP_4(Class, Desc, Prop, Category, Filter) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop))
+#define SIMPL_NEW_FP_4(Class, Desc, Prop, Category, Filter) Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop))
 
-#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5(Class, Desc, Prop, Category, Filter, Index) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop), Index)
+#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5(Class, Desc, Prop, Category, Filter, Index) Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop), Index)
 
-#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4(Class, Desc, Prop, Category, Filter) Class::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop))
+#define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4(Class, Desc, Prop, Category, Filter) Class::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_GETTER(Filter, this, Prop))
 
 /**
  * @brief This macro is needed for Visual Studio due to differences of VAR_ARGS when
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
similarity index 62%
rename from Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
rename to Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
index 2a212642cd..5e7ba6c0b9 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
@@ -1,5 +1,5 @@
 /* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ * Copyright (c) 2021-2021 BlueQuartz Software, LLC
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -27,59 +27,50 @@
  * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
+ *    United States Air Force Prime Contract FA8650-15-D-5231
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "ConstrainedFilterParameter.h"
-
-// -----------------------------------------------------------------------------
-ConstrainedFilterParameter::Pointer ConstrainedFilterParameter::NullPointer()
-{
-  return Pointer(static_cast<Self*>(nullptr));
-}
-
-// -----------------------------------------------------------------------------
-ConstrainedFilterParameter::Pointer ConstrainedFilterParameter::New()
-{
-  Pointer sharedPtr(new(ConstrainedFilterParameter<T>));
-  return sharedPtr;
-}
+#include "Float2ndOrderPolynomial.h"
 
 // -----------------------------------------------------------------------------
-QString ConstrainedFilterParameter::getNameOfClass() const
-{
-  return QString("ConstrainedFilterParameter<T>");
-}
+Float2ndOrderPolynomial::Float2ndOrderPolynomial() = default;
 
 // -----------------------------------------------------------------------------
-QString ConstrainedFilterParameter::ClassName()
-{
-  return QString("ConstrainedFilterParameter<T>");
-}
-
-// -----------------------------------------------------------------------------
-void ConstrainedFilterParameter::setMinimum(const T& value)
-{
-  m_Minimum = value;
-}
+Float2ndOrderPolynomial::~Float2ndOrderPolynomial() = default;
 
 // -----------------------------------------------------------------------------
-T ConstrainedFilterParameter::getMinimum() const
+Float2ndOrderPolynomial::Float2ndOrderPolynomial(float c00, float c01, float c10, float c11, float c02, float c20)
+: c20(c20)
+, c02(c02)
+, c11(c11)
+, c10(c10)
+, c01(c01)
+, c00(c00)
 {
-  return m_Minimum;
 }
 
 // -----------------------------------------------------------------------------
-void ConstrainedFilterParameter::setMaximum(const T& value)
+void Float2ndOrderPolynomial::writeJson(QJsonObject& json) const
 {
-  m_Maximum = value;
+  json["c20"] = c20;
+  json["c02"] = c02;
+  json["c11"] = c11;
+  json["c10"] = c10;
+  json["c01"] = c01;
+  json["c00"] = c00;
 }
 
 // -----------------------------------------------------------------------------
-T ConstrainedFilterParameter::getMaximum() const
+bool Float2ndOrderPolynomial::readJson(const QJsonObject& json)
 {
-  return m_Maximum;
+  if(json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
+  {
+    c20 = static_cast<float>(json["c20"].toDouble());
+    c02 = static_cast<float>(json["c02"].toDouble());
+    c11 = static_cast<float>(json["c11"].toDouble());
+    c10 = static_cast<float>(json["c10"].toDouble());
+    c01 = static_cast<float>(json["c01"].toDouble());
+    c00 = static_cast<float>(json["c00"].toDouble());
+    return true;
+  }
+  return false;
 }
diff --git a/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
new file mode 100644
index 0000000000..767d005f97
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
@@ -0,0 +1,86 @@
+/* ============================================================================
+ * Copyright (c) 2021-2021 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#pragma once
+#include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QString>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLPythonMacros.h"
+
+/**
+ * @brief The Float2ndOrderPolynomial class
+ */
+class SIMPLib_EXPORT Float2ndOrderPolynomial
+{
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(Float2ndOrderPolynomial)
+  PYB11_CREATION(float float float float float float)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+public:
+  Float2ndOrderPolynomial();
+  ~Float2ndOrderPolynomial();
+
+  /**
+   * @brief Float2ndOrderPolynomial
+   * @param c00
+   * @param c01
+   * @param c10
+   * @param c11
+   * @param c02
+   * @param c20
+   */
+  Float2ndOrderPolynomial(float c00, float c01, float c10, float c11, float c02, float c20);
+
+  float c20 = 0.0f;
+  float c02 = 0.0f;
+  float c11 = 0.0f;
+  float c10 = 0.0f;
+  float c01 = 0.0f;
+  float c00 = 0.0f;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) const;
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  bool readJson(const QJsonObject& json);
+};
+
+Q_DECLARE_METATYPE(Float2ndOrderPolynomial)
diff --git a/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.cpp b/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.cpp
new file mode 100644
index 0000000000..13df9554ed
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.cpp
@@ -0,0 +1,69 @@
+#include "Float4thOrderPolynomial.h"
+
+Float4thOrderPolynomial::Float4thOrderPolynomial() = default;
+
+Float4thOrderPolynomial::~Float4thOrderPolynomial() = default;
+
+Float4thOrderPolynomial::Float4thOrderPolynomial(float c00, float c01, float c10, float c11, float c02, float c20, float c12, float c21, float c03, float c30, float c22, float c13, float c31,
+                                                 float c04, float c40)
+: c40(c40)
+, c04(c04)
+, c31(c31)
+, c13(c13)
+, c22(c22)
+, c30(c30)
+, c03(c03)
+, c21(c21)
+, c12(c12)
+, c20(c20)
+, c02(c02)
+, c11(c11)
+, c10(c10)
+, c01(c01)
+, c00(c00)
+{
+}
+void Float4thOrderPolynomial::writeJson(QJsonObject& json) const
+{
+  json["c40"] = static_cast<double>(c40);
+  json["c04"] = static_cast<double>(c04);
+  json["c31"] = static_cast<double>(c31);
+  json["c13"] = static_cast<double>(c13);
+  json["c22"] = static_cast<double>(c22);
+  json["c30"] = static_cast<double>(c30);
+  json["c03"] = static_cast<double>(c03);
+  json["c21"] = static_cast<double>(c21);
+  json["c12"] = static_cast<double>(c12);
+  json["c20"] = static_cast<double>(c20);
+  json["c02"] = static_cast<double>(c02);
+  json["c11"] = static_cast<double>(c11);
+  json["c10"] = static_cast<double>(c10);
+  json["c01"] = static_cast<double>(c01);
+  json["c00"] = static_cast<double>(c00);
+}
+
+bool Float4thOrderPolynomial::readJson(const QJsonObject& json)
+{
+  if(json["c40"].isDouble() && json["c04"].isDouble() && json["c31"].isDouble() && json["c13"].isDouble() && json["c22"].isDouble() && json["c30"].isDouble() && json["c03"].isDouble() &&
+     json["c21"].isDouble() && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() &&
+     json["c00"].isDouble())
+  {
+    c40 = static_cast<float>(json["c40"].toDouble());
+    c04 = static_cast<float>(json["c04"].toDouble());
+    c31 = static_cast<float>(json["c31"].toDouble());
+    c13 = static_cast<float>(json["c13"].toDouble());
+    c22 = static_cast<float>(json["c22"].toDouble());
+    c30 = static_cast<float>(json["c30"].toDouble());
+    c03 = static_cast<float>(json["c03"].toDouble());
+    c21 = static_cast<float>(json["c21"].toDouble());
+    c12 = static_cast<float>(json["c12"].toDouble());
+    c20 = static_cast<float>(json["c20"].toDouble());
+    c02 = static_cast<float>(json["c02"].toDouble());
+    c11 = static_cast<float>(json["c11"].toDouble());
+    c10 = static_cast<float>(json["c10"].toDouble());
+    c01 = static_cast<float>(json["c01"].toDouble());
+    c00 = static_cast<float>(json["c00"].toDouble());
+    return true;
+  }
+  return false;
+}
diff --git a/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.h b/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.h
new file mode 100644
index 0000000000..fd0c239ecb
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/Float4thOrderPolynomial.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <QtCore/QJsonObject>
+#include <QtCore/QMetaType>
+#include <QtCore/QString>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/SIMPLPythonMacros.h"
+
+class SIMPLib_EXPORT Float4thOrderPolynomial
+{
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(Float4thOrderPolynomial)
+  PYB11_CREATION(float float float float float float float float float float float float float float float)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+public:
+  Float4thOrderPolynomial();
+  ~Float4thOrderPolynomial();
+
+  Float4thOrderPolynomial(float c00, float c01, float c10, float c11, float c02, float c20, float c12, float c21, float c03, float c30, float c22, float c13, float c31, float c04, float c40);
+
+  float c40 = 0.0f;
+  float c04 = 0.0f;
+  float c31 = 0.0f;
+  float c13 = 0.0f;
+  float c22 = 0.0f;
+  float c30 = 0.0f;
+  float c03 = 0.0f;
+  float c21 = 0.0f;
+  float c12 = 0.0f;
+  float c20 = 0.0f;
+  float c02 = 0.0f;
+  float c11 = 0.0f;
+  float c10 = 0.0f;
+  float c01 = 0.0f;
+  float c00 = 0.0f;
+
+  /**
+   * @brief writeJson
+   * @param json
+   */
+  void writeJson(QJsonObject& json) const;
+
+  /**
+   * @brief readJson
+   * @param json
+   * @return
+   */
+  bool readJson(const QJsonObject& json);
+};
+
+Q_DECLARE_METATYPE(Float4thOrderPolynomial)
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index a8c4a2dfe9..e30f17a6f8 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -44,8 +44,8 @@ FloatFilterParameter::~FloatFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatFilterParameter::Pointer FloatFilterParameter::New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                        const GetterCallbackType& getterCallback, int groupIndex)
+FloatFilterParameter::Pointer FloatFilterParameter::Create(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                           const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatFilterParameter::Pointer ptr = FloatFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 4cef5de327..ccb0c640eb 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_FLOAT_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_FLOAT_FP("Float 2", Float2, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_FLOAT_FP("Float 2", Float2, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_FLOAT_FP(...)                                                                                                                                                                        \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatFilterParameter, __VA_ARGS__))
@@ -62,6 +62,16 @@
  */
 class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
 {
+
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(FloatFilterParameter)
+  PYB11_SHARED_POINTERS(FloatFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString float FilterParameter::Category FloatFilterParameter::SetterCallbackType FloatFilterParameter::GetterCallbackType int)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
+
 public:
   using Self = FloatFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +110,8 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, float defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~FloatFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index cce8ba95aa..3e48f6b68d 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -46,8 +46,8 @@ FloatVec2FilterParameter::~FloatVec2FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+FloatVec2FilterParameter::Pointer FloatVec2FilterParameter::Create(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatVec2FilterParameter::Pointer ptr = FloatVec2FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index 018fb7b0e4..e3a2618a5f 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -57,7 +57,7 @@
  * SIMPL_NEW_FLOAT_VEC3_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, GenericExample, 1);
+ * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, GenericExample, 1);
  */
 #define SIMPL_NEW_FLOAT_VEC2_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatVec2FilterParameter, __VA_ARGS__))
@@ -68,6 +68,14 @@
  */
 class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(FloatVec2FilterParameter)
+  PYB11_SHARED_POINTERS(FloatVec2FilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString FloatVec2Type FilterParameter::Category FloatVec2FilterParameter::SetterCallbackType FloatVec2FilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = FloatVec2FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -106,8 +114,8 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const FloatVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~FloatVec2FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 8512f48211..04eae6fc8f 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -48,8 +48,8 @@ FloatVec3FilterParameter::~FloatVec3FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+FloatVec3FilterParameter::Pointer FloatVec3FilterParameter::Create(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   FloatVec3FilterParameter::Pointer ptr = FloatVec3FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 6492feb09e..9083c8e707 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -57,7 +57,7 @@
  * SIMPL_NEW_FLOAT_VEC3_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, GenericExample, 1);
+ * SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, GenericExample, 1);
  */
 #define SIMPL_NEW_FLOAT_VEC3_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FloatVec3FilterParameter, __VA_ARGS__))
@@ -68,6 +68,14 @@
  */
 class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(FloatVec3FilterParameter)
+  PYB11_SHARED_POINTERS(FloatVec3FilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString FloatVec3Type FilterParameter::Category FloatVec3FilterParameter::SetterCallbackType FloatVec3FilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = FloatVec3FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -106,8 +114,8 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const FloatVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~FloatVec3FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index 40aea5e430..ad7ecff7f9 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -48,9 +48,9 @@ FourthOrderPolynomialFilterParameter::~FourthOrderPolynomialFilterParameter() =
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue,
-                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                        int groupIndex)
+FourthOrderPolynomialFilterParameter::Pointer FourthOrderPolynomialFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const Float4thOrderPolynomial& defaultValue,
+                                                                                           Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                           int groupIndex)
 {
 
   FourthOrderPolynomialFilterParameter::Pointer ptr = FourthOrderPolynomialFilterParameter::New();
@@ -88,7 +88,7 @@ void FourthOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
-    Float4thOrderPoly_t poly;
+    Float4thOrderPolynomial poly;
     poly.readJson(obj);
     m_SetterCallback(poly);
   }
@@ -101,7 +101,7 @@ void FourthOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    Float4thOrderPoly_t poly = m_GetterCallback();
+    Float4thOrderPolynomial poly = m_GetterCallback();
     QJsonObject obj;
     poly.writeJson(obj);
     json[getPropertyName()] = obj;
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 712f9e90af..aaad3961e0 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -40,73 +40,7 @@
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-
-struct Float4thOrderPoly_t
-{
-  float c40 = 0.0f;
-  float c04 = 0.0f;
-  float c31 = 0.0f;
-  float c13 = 0.0f;
-  float c22 = 0.0f;
-  float c30 = 0.0f;
-  float c03 = 0.0f;
-  float c21 = 0.0f;
-  float c12 = 0.0f;
-  float c20 = 0.0f;
-  float c02 = 0.0f;
-  float c11 = 0.0f;
-  float c10 = 0.0f;
-  float c01 = 0.0f;
-  float c00 = 0.0f;
-
-  void writeJson(QJsonObject& json) const
-  {
-    json["c40"] = static_cast<double>(c40);
-    json["c04"] = static_cast<double>(c04);
-    json["c31"] = static_cast<double>(c31);
-    json["c13"] = static_cast<double>(c13);
-    json["c22"] = static_cast<double>(c22);
-    json["c30"] = static_cast<double>(c30);
-    json["c03"] = static_cast<double>(c03);
-    json["c21"] = static_cast<double>(c21);
-    json["c12"] = static_cast<double>(c12);
-    json["c20"] = static_cast<double>(c20);
-    json["c02"] = static_cast<double>(c02);
-    json["c11"] = static_cast<double>(c11);
-    json["c10"] = static_cast<double>(c10);
-    json["c01"] = static_cast<double>(c01);
-    json["c00"] = static_cast<double>(c00);
-  }
-
-  bool readJson(const QJsonObject& json)
-  {
-    if(json["c40"].isDouble() && json["c04"].isDouble() && json["c31"].isDouble() && json["c13"].isDouble() && json["c22"].isDouble() && json["c30"].isDouble() && json["c03"].isDouble() &&
-       json["c21"].isDouble() && json["c12"].isDouble() && json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() &&
-       json["c00"].isDouble())
-    {
-      c40 = static_cast<float>(json["c40"].toDouble());
-      c04 = static_cast<float>(json["c04"].toDouble());
-      c31 = static_cast<float>(json["c31"].toDouble());
-      c13 = static_cast<float>(json["c13"].toDouble());
-      c22 = static_cast<float>(json["c22"].toDouble());
-      c30 = static_cast<float>(json["c30"].toDouble());
-      c03 = static_cast<float>(json["c03"].toDouble());
-      c21 = static_cast<float>(json["c21"].toDouble());
-      c12 = static_cast<float>(json["c12"].toDouble());
-      c20 = static_cast<float>(json["c20"].toDouble());
-      c02 = static_cast<float>(json["c02"].toDouble());
-      c11 = static_cast<float>(json["c11"].toDouble());
-      c10 = static_cast<float>(json["c10"].toDouble());
-      c01 = static_cast<float>(json["c01"].toDouble());
-      c00 = static_cast<float>(json["c00"].toDouble());
-      return true;
-    }
-    return false;
-  }
-};
-
-Q_DECLARE_METATYPE(Float4thOrderPoly_t)
-
+#include "SIMPLib/FilterParameters/Float4thOrderPolynomial.h"
 /**
  * @brief SIMPL_NEW_FourthO_POLY_FP This macro is a short-form way of instantiating an instance of
  * FourthOrderPolynomialFilterParameter. There are 4 required parameters and 1 optional parameter
@@ -117,7 +51,7 @@ Q_DECLARE_METATYPE(Float4thOrderPoly_t)
  * SIMPL_NEW_FourthO_POLY_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_FourthO_POLY_FP("Fourth Order A Coefficients", FourthOrderACoeff, FilterParameter::Parameter, GenericExample, 2);
+ * SIMPL_NEW_FourthO_POLY_FP("Fourth Order A Coefficients", FourthOrderACoeff, FilterParameter::Category::Parameter, GenericExample, 2);
  */
 #define SIMPL_NEW_FourthO_POLY_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(FourthOrderPolynomialFilterParameter, __VA_ARGS__))
@@ -128,6 +62,14 @@ Q_DECLARE_METATYPE(Float4thOrderPoly_t)
  */
 class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(FourthOrderPolynomialFilterParameter)
+  PYB11_SHARED_POINTERS(FourthOrderPolynomialFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString Float4thOrderPolynomial FilterParameter::Category FourthOrderPolynomialFilterParameter::SetterCallbackType FourthOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = FourthOrderPolynomialFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -138,8 +80,8 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
 
   static Pointer New();
 
-  using SetterCallbackType = std::function<void(Float4thOrderPoly_t)>;
-  using GetterCallbackType = std::function<Float4thOrderPoly_t(void)>;
+  using SetterCallbackType = std::function<void(Float4thOrderPolynomial)>;
+  using GetterCallbackType = std::function<Float4thOrderPolynomial(void)>;
 
   /**
    * @brief New This function instantiates an instance of the FourthOrderPolynomialFilterParameter. Although this function is available to be used,
@@ -157,8 +99,8 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float4thOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const Float4thOrderPolynomial& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   /**
    * @brief Returns the name of the class for FourthOrderPolynomialFilterParameter
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
index ac1a10ccbc..f98ea15033 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
@@ -48,8 +48,8 @@ GenerateColorTableFilterParameter::~GenerateColorTableFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-GenerateColorTableFilterParameter::Pointer GenerateColorTableFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                  GenerateColorTable* filter, int groupIndex)
+GenerateColorTableFilterParameter::Pointer GenerateColorTableFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                     GenerateColorTable* filter, int groupIndex)
 {
   GenerateColorTableFilterParameter::Pointer ptr = GenerateColorTableFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index b99376f86f..fd7bdf3bad 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -49,6 +49,14 @@
  */
 class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(GenerateColorTableFilterParameter)
+  PYB11_SHARED_POINTERS(GenerateColorTableFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category GenerateColorTable* int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = GenerateColorTableFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -79,7 +87,7 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GenerateColorTable* filter, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GenerateColorTable* filter, int groupIndex = -1);
 
   ~GenerateColorTableFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 5535057ca1..785f9fb43a 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -808,10 +808,10 @@ FloatVec3Type H5FilterParametersReader::readFloatVec3(const QString& name, Float
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float2ndOrderPoly_t H5FilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t defaultValue)
+Float2ndOrderPolynomial H5FilterParametersReader::readFloat2ndOrderPoly(const QString& name, Float2ndOrderPolynomial defaultValue)
 {
   int err = 0;
-  Float2ndOrderPoly_t v;
+  Float2ndOrderPolynomial v;
   err = QH5Lite::readPointerDataset<float>(m_CurrentGroupId, name, reinterpret_cast<float*>(&v));
   if(err < 0)
   {
@@ -838,10 +838,10 @@ Float3rdOrderPoly_t H5FilterParametersReader::readFloat3rdOrderPoly(const QStrin
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-Float4thOrderPoly_t H5FilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t defaultValue)
+Float4thOrderPolynomial H5FilterParametersReader::readFloat4thOrderPoly(const QString& name, Float4thOrderPolynomial defaultValue)
 {
   int err = 0;
-  Float4thOrderPoly_t v;
+  Float4thOrderPolynomial v;
   err = QH5Lite::readPointerDataset<float>(m_CurrentGroupId, name, reinterpret_cast<float*>(&v));
   if(err < 0)
   {
@@ -1023,7 +1023,7 @@ ComparisonInputsAdvanced H5FilterParametersReader::readComparisonInputsAdvanced(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos)
+AxisAngleInput H5FilterParametersReader::readAxisAngle(const QString& name, AxisAngleInput v, int vectorPos)
 {
   int err = 0;
 
@@ -1042,11 +1042,11 @@ AxisAngleInput_t H5FilterParametersReader::readAxisAngle(const QString& name, Ax
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<AxisAngleInput_t> H5FilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput_t> v)
+QVector<AxisAngleInput> H5FilterParametersReader::readAxisAngles(const QString& name, QVector<AxisAngleInput> v)
 {
   std::ignore = v;
-  QVector<AxisAngleInput_t> axisAngleInputsVector;
-  AxisAngleInput_t axisAngleDummyInput;
+  QVector<AxisAngleInput> axisAngleInputsVector;
+  AxisAngleInput axisAngleDummyInput;
   axisAngleDummyInput.angle = 0.0f;
   axisAngleDummyInput.h = 0.0f;
   axisAngleDummyInput.k = 0.0f;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index 966a2ea0fa..3a6aba533f 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -153,15 +153,15 @@ class SIMPLib_EXPORT H5FilterParametersReader : public AbstractFilterParametersR
   IntVec3Type readIntVec3(const QString& name, IntVec3Type v) override;
   FloatVec3Type readFloatVec3(const QString& name, FloatVec3Type v) override;
 
-  Float2ndOrderPoly_t readFloat2ndOrderPoly(const QString& name, Float2ndOrderPoly_t v) override;
+  Float2ndOrderPolynomial readFloat2ndOrderPoly(const QString& name, Float2ndOrderPolynomial v) override;
   Float3rdOrderPoly_t readFloat3rdOrderPoly(const QString& name, Float3rdOrderPoly_t v) override;
-  Float4thOrderPoly_t readFloat4thOrderPoly(const QString& name, Float4thOrderPoly_t v) override;
+  Float4thOrderPolynomial readFloat4thOrderPoly(const QString& name, Float4thOrderPolynomial v) override;
   StackFileListInfo readFileListInfo(const QString& name, StackFileListInfo v) override;
   ComparisonInput_t readComparisonInput(const QString& name, ComparisonInput_t v, int vectorPos) override;
   ComparisonInputs readComparisonInputs(const QString& name, ComparisonInputs v) override;
   ComparisonInputsAdvanced readComparisonInputsAdvanced(const QString& name, ComparisonInputsAdvanced v) override;
-  AxisAngleInput_t readAxisAngle(const QString& name, AxisAngleInput_t v, int vectorPos) override;
-  QVector<AxisAngleInput_t> readAxisAngles(const QString& name, QVector<AxisAngleInput_t> defValue) override;
+  AxisAngleInput readAxisAngle(const QString& name, AxisAngleInput v, int vectorPos) override;
+  QVector<AxisAngleInput> readAxisAngles(const QString& name, QVector<AxisAngleInput> defValue) override;
   QSet<QString> readArraySelections(const QString& name, QSet<QString> v) override;
 
   DataContainerArrayProxy readDataContainerArrayProxy(const QString& name, DataContainerArrayProxy v) override;
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 366cb3258d..7182153d96 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -502,7 +502,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, FloatVec3Type v)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, Float2ndOrderPoly_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, Float2ndOrderPolynomial v)
 {
   int err = 0;
   int32_t rank = 1;
@@ -526,7 +526,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, Float3rdOrderPoly_
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, Float4thOrderPoly_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, Float4thOrderPolynomial v)
 {
   int err = 0;
   int32_t rank = 1;
@@ -603,7 +603,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, ComparisonInputs v
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v)
+int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput v)
 {
   int numQFilters = static_cast<int>(1);
   int err = writeValue(name, numQFilters);
@@ -628,7 +628,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v
 // -----------------------------------------------------------------------------
 // These are actually written as a binary 4x1 float array as an attribute
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v, int vectorPos)
+int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput v, int vectorPos)
 {
   int err = 0;
   int32_t rank = 1;
@@ -643,7 +643,7 @@ int H5FilterParametersWriter::writeValue(const QString& name, AxisAngleInput_t v
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-int H5FilterParametersWriter::writeValue(const QString& name, QVector<AxisAngleInput_t> v)
+int H5FilterParametersWriter::writeValue(const QString& name, QVector<AxisAngleInput> v)
 {
   int numQFilters = static_cast<int>(v.size());
   int err = writeValue(name, numQFilters);
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index e50680b9df..b679572490 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -139,16 +139,16 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
   int writeValue(const QString& name, IntVec3Type v) override;
   int writeValue(const QString& name, FloatVec3Type v) override;
 
-  int writeValue(const QString& name, Float2ndOrderPoly_t v) override;
+  int writeValue(const QString& name, Float2ndOrderPolynomial v) override;
   int writeValue(const QString& name, Float3rdOrderPoly_t v) override;
-  int writeValue(const QString& name, Float4thOrderPoly_t v) override;
+  int writeValue(const QString& name, Float4thOrderPolynomial v) override;
   int writeValue(const QString& name, StackFileListInfo v) override;
 
   int writeValue(const QString& name, ComparisonInput_t v) override;
   int writeValue(const QString& name, ComparisonInputs v) override;
 
-  int writeValue(const QString& name, AxisAngleInput_t v) override;
-  int writeValue(const QString& name, QVector<AxisAngleInput_t> v) override;
+  int writeValue(const QString& name, AxisAngleInput v) override;
+  int writeValue(const QString& name, QVector<AxisAngleInput> v) override;
 
   int writeArraySelections(const QString& name, QSet<QString> v) override;
   int writeValue(const QString& name, DataContainerArrayProxy& dcaProxy) override;
@@ -162,7 +162,7 @@ class SIMPLib_EXPORT H5FilterParametersWriter : public AbstractFilterParametersW
 protected:
   H5FilterParametersWriter();
 
-  int writeValue(const QString& name, AxisAngleInput_t v, int notUsed) override;
+  int writeValue(const QString& name, AxisAngleInput v, int notUsed) override;
 
 private:
   hid_t m_PipelineGroupId = {};
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
index ebd3d4464e..4ec9ed52d8 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
@@ -50,8 +50,8 @@ ImportHDF5DatasetFilterParameter::~ImportHDF5DatasetFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue,
-                                                                                const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter, int groupIndex)
+ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue,
+                                                                                   const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter, int groupIndex)
 {
   ImportHDF5DatasetFilterParameter::Pointer ptr = ImportHDF5DatasetFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index cf7171bee0..516a74e182 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -40,6 +40,14 @@ class ImportHDF5Dataset;
 
 class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ImportHDF5DatasetFilterParameter)
+  PYB11_SHARED_POINTERS(ImportHDF5DatasetFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QVariant QVariant FilterParameter::Category ImportHDF5Dataset* int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ImportHDF5DatasetFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -59,8 +67,8 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
    */
   static QString ClassName();
 
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue, const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue, const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter,
+                        int groupIndex = -1);
 
   ~ImportHDF5DatasetFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index db60643dbb..25d2e47290 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -52,9 +52,9 @@ InputFileFilterParameter::~InputFileFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-InputFileFilterParameter::Pointer InputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                const QString& fileType, int groupIndex)
+InputFileFilterParameter::Pointer InputFileFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                   const QString& fileType, int groupIndex)
 {
   InputFileFilterParameter::Pointer ptr = InputFileFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index a5b5e199ee..adfef7a18a 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_INPUT_FILE_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
- * SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, GenericExample, "*.txt", "", 1);
+ * SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 1);
  */
 #define SIMPL_NEW_INPUT_FILE_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(InputFileFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(InputFileFilterParameter)
+  PYB11_SHARED_POINTERS(InputFileFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category InputFileFilterParameter::SetterCallbackType InputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = InputFileFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +110,8 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
   ~InputFileFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index 680bdabf4b..ef465ab832 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -48,9 +48,9 @@ InputPathFilterParameter::~InputPathFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-InputPathFilterParameter::Pointer InputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                const QString& fileType, int groupIndex)
+InputPathFilterParameter::Pointer InputPathFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                   const QString& fileType, int groupIndex)
 {
   InputPathFilterParameter::Pointer ptr = InputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index fff5dba7cc..d453aa9ad7 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_INPUT_PATH_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
- * SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Parameter, GenericExample, "*.txt", "", 2);
+ * SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 2);
  */
 #define SIMPL_NEW_INPUT_PATH_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(InputPathFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(InputPathFilterParameter)
+  PYB11_SHARED_POINTERS(InputPathFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category InputPathFilterParameter::SetterCallbackType InputPathFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = InputPathFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +110,8 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
   ~InputPathFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index 1431cb1088..f656950f6b 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -48,8 +48,8 @@ IntFilterParameter::~IntFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntFilterParameter::Pointer IntFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                    const GetterCallbackType& getterCallback, int groupIndex)
+IntFilterParameter::Pointer IntFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                       const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   IntFilterParameter::Pointer ptr = IntFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 8017fc08d7..184763259b 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_INTEGER_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
+ * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Category::Parameter, GenericExample, 0);
  */
 #define SIMPL_NEW_INTEGER_FP(...)                                                                                                                                                                      \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(IntFilterParameter)
+  PYB11_SHARED_POINTERS(IntFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category IntFilterParameter::SetterCallbackType IntFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = IntFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +108,8 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                        int groupIndex = -1);
 
   ~IntFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
index 9e657da8e4..e7dedcf300 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -46,8 +46,8 @@ IntVec2FilterParameter::~IntVec2FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec2FilterParameter::Pointer IntVec2FilterParameter::New(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category,
-                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+IntVec2FilterParameter::Pointer IntVec2FilterParameter::Create(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category,
+                                                               const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   IntVec2FilterParameter::Pointer ptr = IntVec2FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index a88bc08f1a..9a2d2fc255 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -34,7 +34,6 @@
 #pragma once
 
 #include <memory>
-
 #include <functional>
 
 #include <QtCore/QJsonObject>
@@ -52,7 +51,7 @@
  * SIMPL_NEW_INT_VEC2_FP("HumanLabel", PropertyName, Category, FilterName, Units, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
- * SIMPL_NEW_INT_VEC2_FP("Dimensions (XY)", Dimensions, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_INT_VEC2_FP("Dimensions (XY)", Dimensions, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_INT_VEC2_FP(...)                                                                                                                                                                     \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntVec2FilterParameter, __VA_ARGS__))
@@ -63,6 +62,14 @@
  */
 class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(IntVec2FilterParameter)
+  PYB11_SHARED_POINTERS(IntVec2FilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString IntVec2Type FilterParameter::Category IntVec2FilterParameter::SetterCallbackType IntVec2FilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = IntVec2FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -101,8 +108,8 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const IntVec2Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~IntVec2FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index 4e346cb2c3..c05c393b0c 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -48,8 +48,8 @@ IntVec3FilterParameter::~IntVec3FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-IntVec3FilterParameter::Pointer IntVec3FilterParameter::New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category,
-                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+IntVec3FilterParameter::Pointer IntVec3FilterParameter::Create(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category,
+                                                               const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   IntVec3FilterParameter::Pointer ptr = IntVec3FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index 844a657ad0..20623e3d24 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -36,7 +36,6 @@
 #pragma once
 
 #include <memory>
-
 #include <functional>
 
 #include <QtCore/QJsonObject>
@@ -54,7 +53,7 @@
  * SIMPL_NEW_INT_VEC3_FP("HumanLabel", PropertyName, Category, FilterName, Units, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
- * SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_INT_VEC3_FP(...)                                                                                                                                                                     \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(IntVec3FilterParameter, __VA_ARGS__))
@@ -65,6 +64,14 @@
  */
 class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(IntVec3FilterParameter)
+  PYB11_SHARED_POINTERS(IntVec3FilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString IntVec3Type FilterParameter::Category IntVec3FilterParameter::SetterCallbackType IntVec3FilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = IntVec3FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -103,8 +110,8 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const IntVec3Type& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~IntVec3FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 9bbb3ab1ed..02074cf53c 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -48,9 +48,9 @@ LinkedBooleanFilterParameter::~LinkedBooleanFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
-                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties,
-                                                                        int groupIndex)
+LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
+                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties,
+                                                                           int groupIndex)
 {
   LinkedBooleanFilterParameter::Pointer ptr = LinkedBooleanFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index a094c837de..8a51a7ef4e 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_LINKED_BOOL_FP("HumanLabel", PropertyName, Category, FilterName, ConditionalProperties, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Parameter, GenericExample, linkedProps);
+ * SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Category::Parameter, GenericExample, linkedProps);
  */
 #define SIMPL_NEW_LINKED_BOOL_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(LinkedBooleanFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(LinkedBooleanFilterParameter)
+  PYB11_SHARED_POINTERS(LinkedBooleanFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString bool FilterParameter::Category LinkedBooleanFilterParameter::SetterCallbackType LinkedBooleanFilterParameter::GetterCallbackType QStringList int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = LinkedBooleanFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -101,8 +109,8 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex = -1);
 
   ~LinkedBooleanFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 0093aca31f..a095770159 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -48,9 +48,9 @@ LinkedChoicesFilterParameter::~LinkedChoicesFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
-                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                                                                        QStringList linkedProperties, int groupIndex)
+LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
+                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
+                                                                           QStringList linkedProperties, int groupIndex)
 {
   LinkedChoicesFilterParameter::Pointer ptr = LinkedChoicesFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index 7af8516025..fd1138ccc9 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -48,6 +48,15 @@
  */
 class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(LinkedChoicesFilterParameter)
+  PYB11_SHARED_POINTERS(LinkedChoicesFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category LinkedChoicesFilterParameter::SetterCallbackType LinkedChoicesFilterParameter::GetterCallbackType QVector<QString> QStringList int)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
+
 public:
   using Self = LinkedChoicesFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -85,8 +94,8 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                     QVector<QString> choices, QStringList linkedProperties, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                        QVector<QString> choices, QStringList linkedProperties, int groupIndex = -1);
 
   ~LinkedChoicesFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index 16940049dd..06788659cf 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -49,10 +49,10 @@ LinkedDataContainerSelectionFilterParameter::~LinkedDataContainerSelectionFilter
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
-                                                                                                      Category category, const SetterCallbackType& setterCallback,
-                                                                                                      const GetterCallbackType& getterCallback, const RequirementType& req,
-                                                                                                      const QStringList& linkedProperties, int groupIndex)
+LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
+                                                                                                         Category category, const SetterCallbackType& setterCallback,
+                                                                                                         const GetterCallbackType& getterCallback, const RequirementType& req,
+                                                                                                         const QStringList& linkedProperties, int groupIndex)
 {
   LinkedDataContainerSelectionFilterParameter::Pointer ptr = LinkedDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index 860e620513..a31e8ec4a3 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -61,6 +61,14 @@ class AbstractFilter;
  */
 class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(LinkedDataContainerSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(LinkedDataContainerSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category LinkedDataContainerSelectionFilterParameter::SetterCallbackType LinkedDataContainerSelectionFilterParameter::GetterCallbackType LinkedDataContainerSelectionFilterParameter::RequirementType QStringList int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = LinkedDataContainerSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -106,8 +114,8 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
 
   ~LinkedDataContainerSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index d2853a4af9..18d5ab4bd5 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -107,9 +107,9 @@ LinkedPathCreationFilterParameter::~LinkedPathCreationFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                  std::unique_ptr<ILinkedPath> linkedPath, int groupIndex)
+LinkedPathCreationFilterParameter::Pointer LinkedPathCreationFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                     std::unique_ptr<ILinkedPath> linkedPath, int groupIndex)
 {
 
   LinkedPathCreationFilterParameter::Pointer ptr = LinkedPathCreationFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 16e6068b49..8c5b1f13f4 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -48,24 +48,24 @@
 
 // Helper macros: Index / NoIndex implementations
 #define SIMPL_NEW_DA_FROM_ADV_COMPARISON_NoIndex(Desc, Prop, LinkedComp, Category, Filter)                                                                                                             \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp))
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp))
 #define SIMPL_NEW_DA_FROM_ADV_COMPARISON_Index(Desc, Prop, LinkedComp, Category, Filter, Index)                                                                                                        \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp), Index)
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_ADV_COMPARE(Filter, this, LinkedComp), Index)
 
 #define SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_Index(Desc, Prop, LinkedDcProp, LinkedAmProp, Category, Filter, Index)                                                                                       \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp), Index)
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp), Index)
 #define SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_NoIndex(Desc, Prop, LinkedDcProp, LinkedAmProp, Category, Filter)                                                                                            \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp))
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_AM_PATH(Filter, this, LinkedDcProp, LinkedAmProp))
 #define SIMPL_NEW_LINKED_DATA_CONTAINER_Index(Desc, Prop, LinkedProp, Category, Filter, Index)                                                                                                         \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp), Index)
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp), Index)
 #define SIMPL_NEW_LINKED_DATA_CONTAINER_NoIndex(Desc, Prop, LinkedProp, Category, Filter)                                                                                                              \
-  LinkedPathCreationFilterParameter::New(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                             \
-                                         SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp))
+  LinkedPathCreationFilterParameter::Create(Desc, #Prop, get##Prop(), Category, SIMPL_BIND_SETTER(Filter, this, Prop), SIMPL_BIND_GETTER(Filter, this, Prop),                                          \
+                                            SIMPL_NEW_LINKED_DC_PATH(Filter, this, LinkedProp))
 
 // Helper macros: Expansion
 #define _FP_GET_OVERRIDE6(A, B, C, D, E, F, NAME, ...) NAME
@@ -82,7 +82,7 @@
  * SIMPL_NEW_AM_WITH_LINKED_DC_FP("HumanLabel", PropertyName, DcName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Matrix", CellMatrixName, DcName, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_AM_WITH_LINKED_DC_FP("Cell Matrix", CellMatrixName, DcName, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_AM_WITH_LINKED_DC_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE6(__VA_ARGS__, SIMPL_NEW_LINKED_DATA_CONTAINER_Index, SIMPL_NEW_LINKED_DATA_CONTAINER_NoIndex)(__VA_ARGS__))
 
@@ -96,7 +96,7 @@
  * SIMPL_NEW_DA_WITH_LINKED_AM_FP("HumanLabel", PropertyName, DcName, AmName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DA_WITH_LINKED_AM_FP("Feature Id", CellMatrixName, DcName, AmName, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_DA_WITH_LINKED_AM_FP("Feature Id", CellMatrixName, DcName, AmName, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_DA_WITH_LINKED_AM_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE7(__VA_ARGS__, SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_Index, SIMPL_NEW_LINKED_ATTRIBUTE_MATRIX_NoIndex)(__VA_ARGS__))
 
@@ -111,7 +111,7 @@
  * SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("HumanLabel", PropertyName, LinkedAdvComparisonProperty, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Mask", MaskName, AdvComparison, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP("Mask", MaskName, AdvComparison, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_DA_FROM_ADV_COMPARISON_FP(...) SIMPL_EXPAND(_FP_GET_OVERRIDE6(__VA_ARGS__, SIMPL_NEW_DA_FROM_ADV_COMPARISON_Index, SIMPL_NEW_DA_FROM_ADV_COMPARISON_NoIndex)(__VA_ARGS__))
 
@@ -121,6 +121,14 @@
  */
 class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+//  PYB11_BEGIN_BINDINGS(LinkedPathCreationFilterParameter)
+//  PYB11_SHARED_POINTERS(LinkedPathCreationFilterParameter)
+//  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category LinkedPathCreationFilterParameter::SetterCallbackType LinkedPathCreationFilterParameter::GetterCallbackType std::unique_ptr<ILinkedPath> int )
+//  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = LinkedPathCreationFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -310,8 +318,8 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, std::unique_ptr<ILinkedPath> linkedPath, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, std::unique_ptr<ILinkedPath> linkedPath, int groupIndex = -1);
 
   ~LinkedPathCreationFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp b/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
index 3e5eef2af7..6dc0222919 100644
--- a/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageFileListInfo.cpp
@@ -38,6 +38,15 @@ MontageFileListInfo::MontageFileListInfo() = default;
 // -----------------------------------------------------------------------------
 MontageFileListInfo::~MontageFileListInfo() = default;
 
+// -----------------------------------------------------------------------------
+MontageFileListInfo::MontageFileListInfo(int32_t rowStart, int32_t rowEnd, int32_t colStart, int32_t colEnd)
+: RowStart(rowStart)
+, RowEnd(rowEnd)
+, ColStart(colStart)
+, ColEnd(colEnd)
+{
+}
+
 // -----------------------------------------------------------------------------
 void MontageFileListInfo::writeJson(QJsonObject& json) const
 {
diff --git a/Source/SIMPLib/FilterParameters/MontageFileListInfo.h b/Source/SIMPLib/FilterParameters/MontageFileListInfo.h
index 9b0afa5c70..9addc643cc 100644
--- a/Source/SIMPLib/FilterParameters/MontageFileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/MontageFileListInfo.h
@@ -39,14 +39,21 @@
 
 class SIMPLib_EXPORT MontageFileListInfo : public FileListInfo
 {
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(MontageFileListInfo)
+  PYB11_CREATION(int32_t int32_t int32_t int32_t)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 public:
   MontageFileListInfo();
   ~MontageFileListInfo() override;
 
-  qint32 RowStart = 0;
-  qint32 RowEnd = 2;
-  qint32 ColStart = 0;
-  qint32 ColEnd = 2;
+  MontageFileListInfo(int32_t rowStart, int32_t rowEnd, int32_t colStart, int32_t colEnd);
+
+  int32_t RowStart = 0;
+  int32_t RowEnd = 2;
+  int32_t ColStart = 0;
+  int32_t ColEnd = 2;
 
   /**
    * @brief writeJson
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index f25650ba27..afbf05728c 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -47,8 +47,8 @@ MontageSelectionFilterParameter::~MontageSelectionFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MontageSelectionFilterParameter::Pointer MontageSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category,
-                                                                              const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+MontageSelectionFilterParameter::Pointer MontageSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category,
+                                                                                 const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   MontageSelectionFilterParameter::Pointer ptr = MontageSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index d9043f8483..c09030b6b2 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_MONTAGE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_MONTAGE_SELECTION_FP("Montage 2", Montage2, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_MONTAGE_SELECTION_FP("Montage 2", Montage2, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_MONTAGE_SELECTION_FP(...)                                                                                                                                                            \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MontageSelectionFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MontageSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(MontageSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString MontageSelection FilterParameter::Category MontageSelectionFilterParameter::SetterCallbackType MontageSelectionFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MontageSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +108,8 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const MontageSelection& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~MontageSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
index 2e24a26578..04bc014287 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -47,8 +47,9 @@ MontageStructureSelectionFilterParameter::~MontageStructureSelectionFilterParame
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                                SetterCallbackType setterCallback, GetterCallbackType getterCallback, int groupIndex)
+MontageStructureSelectionFilterParameter::Pointer MontageStructureSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue,
+                                                                                                   Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                                                                                                   int groupIndex)
 {
   MontageStructureSelectionFilterParameter::Pointer ptr = MontageStructureSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
index 87dbb006b8..4c3014e744 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
@@ -47,7 +47,7 @@
  * SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP("Montage", NameName, FilterParameter::Parameter, GenericExample, 2);
+ * SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP("Montage", NameName, FilterParameter::Category::Parameter, GenericExample, 2);
  */
 #define SIMPL_NEW_MONTAGE_STRUCTURE_SELECTION_FP(...)                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MontageStructureSelectionFilterParameter, __VA_ARGS__))
@@ -58,6 +58,14 @@
  */
 class SIMPLib_EXPORT MontageStructureSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MontageStructureSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(MontageStructureSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category MontageStructureSelectionFilterParameter::SetterCallbackType MontageStructureSelectionFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MontageStructureSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -98,8 +106,8 @@ class SIMPLib_EXPORT MontageStructureSelectionFilterParameter : public FilterPar
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
-                     int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, SetterCallbackType setterCallback, GetterCallbackType getterCallback,
+                        int groupIndex = -1);
 
   ~MontageStructureSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index ae8a16a757..10637d9183 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -56,10 +56,10 @@ MultiAttributeMatrixSelectionFilterParameter::~MultiAttributeMatrixSelectionFilt
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName,
-                                                                                                        const QVector<DataArrayPath>& defaultValue, Category category,
-                                                                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                                        RequirementType req, int groupIndex)
+MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName,
+                                                                                                           const QVector<DataArrayPath>& defaultValue, Category category,
+                                                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                                           RequirementType req, int groupIndex)
 {
 
   MultiAttributeMatrixSelectionFilterParameter::Pointer ptr = MultiAttributeMatrixSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 99dfe96ce6..15f43facae 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -55,7 +55,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * MultiAttributeMatrixSelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0);
+ * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Category::Parameter, GenericExample, req, 0);
  */
 #define SIMPL_NEW_MAM_SELECTION_FP(...)                                                                                                                                                                \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiAttributeMatrixSelectionFilterParameter, __VA_ARGS__))
@@ -66,6 +66,14 @@
  */
 class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MultiAttributeMatrixSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(MultiAttributeMatrixSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QVector<DataArrayPath> FilterParameter::Category MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType MultiAttributeMatrixSelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MultiAttributeMatrixSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -116,8 +124,8 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~MultiAttributeMatrixSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index fd5252a816..2073486ea0 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -56,9 +56,9 @@ MultiDataArraySelectionFilterParameter::~MultiDataArraySelectionFilterParameter(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
-                                                                                            Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                            RequirementType req, int groupIndex)
+MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+                                                                                               Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                               RequirementType req, int groupIndex)
 {
 
   MultiDataArraySelectionFilterParameter::Pointer ptr = MultiDataArraySelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 887fd1cd50..3e5e4d0dd3 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -55,7 +55,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * MultiDataArraySelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0);
+ * SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Category::Parameter, GenericExample, req, 0);
  */
 #define SIMPL_NEW_MDA_SELECTION_FP(...)                                                                                                                                                                \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiDataArraySelectionFilterParameter, __VA_ARGS__))
@@ -66,6 +66,14 @@
  */
 class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MultiDataArraySelectionFilterParameter)
+  PYB11_SHARED_POINTERS(MultiDataArraySelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QVector<DataArrayPath> FilterParameter::Category MultiDataArraySelectionFilterParameter::SetterCallbackType MultiDataArraySelectionFilterParameter::GetterCallbackType MultiDataArraySelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MultiDataArraySelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -116,8 +124,8 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~MultiDataArraySelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 2381cf6830..8767729619 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -56,9 +56,9 @@ MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue,
-                                                                                                    Category category, const SetterCallbackType& setterCallback,
-                                                                                                    const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex)
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue,
+                                                                                                       Category category, const SetterCallbackType& setterCallback,
+                                                                                                       const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex)
 {
 
   MultiDataContainerSelectionFilterParameter::Pointer ptr = MultiDataContainerSelectionFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 7cc1321197..083dd5b1e3 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -56,7 +56,7 @@
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
  * MultiDataContainerSelectionFilterParameter::RequirementType req;
- * SIMPL_NEW_MCA_SELECTION_FP("Multi Data Container Test", SelectedMultiDataContainers, FilterParameter::Parameter, GenericExample, req, 0);
+ * SIMPL_NEW_MCA_SELECTION_FP("Multi Data Container Test", SelectedMultiDataContainers, FilterParameter::Category::Parameter, GenericExample, req, 0);
  */
 #define SIMPL_NEW_MDC_SELECTION_FP(...)                                                                                                                                                                \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiDataContainerSelectionFilterParameter, __VA_ARGS__))
@@ -67,6 +67,14 @@
  */
 class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MultiDataContainerSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QStringList FilterParameter::Category MultiDataContainerSelectionFilterParameter::SetterCallbackType MultiDataContainerSelectionFilterParameter::GetterCallbackType MultiDataContainerSelectionFilterParameter::RequirementType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MultiDataContainerSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -117,8 +125,8 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
   ~MultiDataContainerSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
index 5edefebd12..b298be40c4 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
@@ -53,9 +53,9 @@ MultiInputFileFilterParameter::~MultiInputFileFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiInputFileFilterParameter::Pointer MultiInputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category,
-                                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                          const QString& fileType, int groupIndex)
+MultiInputFileFilterParameter::Pointer MultiInputFileFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category,
+                                                                             const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                             const QString& fileType, int groupIndex)
 {
   MultiInputFileFilterParameter::Pointer ptr = MultiInputFileFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
index af50d4b8e8..9cc42539e3 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
@@ -54,7 +54,7 @@
  * SIMPL_NEW_MULTI_INPUT_FILE_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional parameters):
- * SIMPL_NEW_MULTI_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, GenericExample, "*.txt", "", 1);
+ * SIMPL_NEW_MULTI_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 1);
  */
 #define SIMPL_NEW_MULTI_INPUT_FILE_FP(...)                                                                                                                                                             \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(MultiInputFileFilterParameter, __VA_ARGS__))
@@ -65,6 +65,14 @@
  */
 class SIMPLib_EXPORT MultiInputFileFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(MultiInputFileFilterParameter)
+  PYB11_SHARED_POINTERS(MultiInputFileFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString MultiInputFileFilterParameter::VecString FilterParameter::Category MultiInputFileFilterParameter::SetterCallbackType MultiInputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = MultiInputFileFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -107,8 +115,8 @@ class SIMPLib_EXPORT MultiInputFileFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const VecString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
   ~MultiInputFileFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index ef56880a89..14ebdfba9c 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -48,8 +48,8 @@ NumericTypeFilterParameter::~NumericTypeFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category,
-                                                                    const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+NumericTypeFilterParameter::Pointer NumericTypeFilterParameter::Create(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category,
+                                                                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   NumericTypeFilterParameter::Pointer ptr = NumericTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index 9a8f7ad977..99cc4eea6b 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -53,7 +53,7 @@
  * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_NUMERICTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ * SIMPL_NEW_NUMERICTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::Category::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
  */
 #define SIMPL_NEW_NUMERICTYPE_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(NumericTypeFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(NumericTypeFilterParameter)
+  PYB11_SHARED_POINTERS(NumericTypeFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString SIMPL::NumericTypes::Type FilterParameter::Category NumericTypeFilterParameter::SetterCallbackType NumericTypeFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = NumericTypeFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -104,8 +112,8 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, SIMPL::NumericTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~NumericTypeFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index 0906fd4ac8..dceea91045 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -48,9 +48,9 @@ OutputFileFilterParameter::~OutputFileFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-OutputFileFilterParameter::Pointer OutputFileFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                  const QString& fileType, int groupIndex)
+OutputFileFilterParameter::Pointer OutputFileFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                     const QString& fileType, int groupIndex)
 {
   OutputFileFilterParameter::Pointer ptr = OutputFileFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index 20795fc553..be8e1a482c 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_OUTPUT_FILE_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
- * SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_OUTPUT_FILE_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(OutputFileFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(OutputFileFilterParameter)
+  PYB11_SHARED_POINTERS(OutputFileFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category OutputFileFilterParameter::SetterCallbackType OutputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = OutputFileFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +110,8 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
  * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
  * @return
  */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
   ~OutputFileFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index f372d49c72..65fbca716f 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -48,9 +48,9 @@ OutputPathFilterParameter::~OutputPathFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-OutputPathFilterParameter::Pointer OutputPathFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                  const QString& fileType, int groupIndex)
+OutputPathFilterParameter::Pointer OutputPathFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
+                                                                     const QString& fileType, int groupIndex)
 {
   OutputPathFilterParameter::Pointer ptr = OutputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index 5dce9f5dad..ff1c1e5649 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_OUTPUT_PATH_FP("HumanLabel", PropertyName, Category, FilterName, FileExtension, FileType, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional parameters):
- * SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_OUTPUT_PATH_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(OutputPathFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(OutputPathFilterParameter)
+  PYB11_SHARED_POINTERS(OutputPathFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category OutputPathFilterParameter::SetterCallbackType OutputPathFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = OutputPathFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -102,8 +110,8 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
   ~OutputPathFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index 38bbb35f22..b3844af0fc 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -46,8 +46,8 @@ ParagraphFilterParameter::~ParagraphFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ParagraphFilterParameter::Pointer ParagraphFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, bool allowPreflight, int groupIndex)
+ParagraphFilterParameter::Pointer ParagraphFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, bool allowPreflight, int groupIndex)
 {
 
   ParagraphFilterParameter::Pointer ptr = ParagraphFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index e6c8d24225..0080f95a7a 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -49,7 +49,7 @@
  * SIMPL_NEW_PARAGRAPH_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_PARAGRAPH_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_PARAGRAPH_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_PARAGRAPH_FP(...)                                                                                                                                                                    \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ParagraphFilterParameter, __VA_ARGS__))
@@ -60,6 +60,14 @@
  */
 class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ParagraphFilterParameter)
+  PYB11_SHARED_POINTERS(ParagraphFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category ParagraphFilterParameter::SetterCallbackType ParagraphFilterParameter::GetterCallbackType bool int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ParagraphFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -98,8 +106,8 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, bool allowPreflight = true, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, bool allowPreflight = true, int groupIndex = -1);
 
   ~ParagraphFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index a0e1a3a099..705696508b 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -52,10 +52,10 @@ PhaseTypeSelectionFilterParameter::~PhaseTypeSelectionFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault,
-                                                                                  Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                  const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                                                                                  const QStringList& phaseListChoices, int groupIndex)
+PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::Create(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault,
+                                                                                     Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                     const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
+                                                                                     const QStringList& phaseListChoices, int groupIndex)
 {
   PhaseTypeSelectionFilterParameter::Pointer ptr = PhaseTypeSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 645474dbdf..5fb31f7a9f 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+//  PYB11_BEGIN_BINDINGS(PhaseTypeSelectionFilterParameter)
+//  PYB11_SHARED_POINTERS(PhaseTypeSelectionFilterParameter)
+//  PYB11_STATIC_CREATION(Create)
+//  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = PhaseTypeSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -104,9 +112,9 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                     const QStringList& phaseListChoices, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
+                        const QStringList& phaseListChoices, int groupIndex = -1);
 
   ~PhaseTypeSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index e35980990f..a219527f80 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -50,8 +50,8 @@ PreflightUpdatedValueFilterParameter::~PreflightUpdatedValueFilterParameter() =
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-PreflightUpdatedValueFilterParameter::Pointer PreflightUpdatedValueFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                                        GetterCallbackType getterCallback, int groupIndex)
+PreflightUpdatedValueFilterParameter::Pointer PreflightUpdatedValueFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                                                           GetterCallbackType getterCallback, int groupIndex)
 {
   PreflightUpdatedValueFilterParameter::Pointer ptr = PreflightUpdatedValueFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 6e691558d5..d6651b5a7d 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -49,7 +49,7 @@
  * SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Estimated Primary Features", EstimatedPrimaryFeatures, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Estimated Primary Features", EstimatedPrimaryFeatures, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP(...)                                                                                                                                                        \
   SIMPL_EXPAND(_FP_GET_PREFLIGHTUPDATEDVALUE_OVERRIDE(__VA_ARGS__, SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_5, SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP_4)(PreflightUpdatedValueFilterParameter, __VA_ARGS__))
@@ -60,6 +60,14 @@
  */
 class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(PreflightUpdatedValueFilterParameter)
+  PYB11_SHARED_POINTERS(PreflightUpdatedValueFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category PreflightUpdatedValueFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = PreflightUpdatedValueFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -96,7 +104,7 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GetterCallbackType getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, GetterCallbackType getterCallback, int groupIndex = -1);
 
   ~PreflightUpdatedValueFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index d1ea2056cb..8c89b8afc8 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -48,8 +48,8 @@ RangeFilterParameter::~RangeFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RangeFilterParameter::Pointer RangeFilterParameter::New(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category,
-                                                        const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+RangeFilterParameter::Pointer RangeFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category,
+                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   RangeFilterParameter::Pointer ptr = RangeFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 244175c2a8..831bdf9fd6 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -54,7 +54,7 @@ typedef std::pair<double, double> FPRangePair;
  * SIMPL_NEW_RANGE_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_RANGE_FP(...)                                                                                                                                                                        \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(RangeFilterParameter, __VA_ARGS__))
@@ -65,6 +65,14 @@ typedef std::pair<double, double> FPRangePair;
  */
 class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(RangeFilterParameter)
+  PYB11_SHARED_POINTERS(RangeFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString FPRangePair FilterParameter::Category RangeFilterParameter::SetterCallbackType RangeFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = RangeFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -94,8 +102,8 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const FPRangePair& defaultPair, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   /**
    * @brief Returns the name of the class for RangeFilterParameter
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index f0a57b93ef..17682f07f5 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -51,7 +51,7 @@ ReadASCIIDataFilterParameter::~ReadASCIIDataFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex)
+ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex)
 {
   ReadASCIIDataFilterParameter::Pointer ptr = ReadASCIIDataFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index a0c41a12de..56cf794674 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -43,6 +43,14 @@ class ASCIIWizardData;
 
 class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ReadASCIIDataFilterParameter)
+  PYB11_SHARED_POINTERS(ReadASCIIDataFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QVariant FilterParameter::Category int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ReadASCIIDataFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -62,7 +70,16 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
    */
   static QString ClassName();
 
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex = -1);
+  /**
+   * @brief Create
+   * @param humanLabel
+   * @param propertyName
+   * @param defaultValue
+   * @param category
+   * @param groupIndex
+   * @return
+   */
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex = -1);
 
   ~ReadASCIIDataFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index 59e8477f68..e1801127c6 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -48,8 +48,8 @@ ScalarTypeFilterParameter::~ScalarTypeFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category,
-                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+ScalarTypeFilterParameter::Pointer ScalarTypeFilterParameter::Create(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category,
+                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   ScalarTypeFilterParameter::Pointer ptr = ScalarTypeFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index ee729446d9..f85ca53e8b 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -53,7 +53,7 @@
  * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_SCALARTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ * SIMPL_NEW_SCALARTYPE_FP("Shape Types", ShapeTypeData, FilterParameter::Category::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
  */
 #define SIMPL_NEW_SCALARTYPE_FP(...)                                                                                                                                                                   \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ScalarTypeFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ScalarTypeFilterParameter)
+  PYB11_SHARED_POINTERS(ScalarTypeFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString SIMPL::ScalarTypes::Type FilterParameter::Category ScalarTypeFilterParameter::SetterCallbackType ScalarTypeFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ScalarTypeFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -104,8 +112,8 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, SIMPL::ScalarTypes::Type defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ScalarTypeFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 2aba723a36..6d11fda256 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -48,9 +48,9 @@ SecondOrderPolynomialFilterParameter::~SecondOrderPolynomialFilterParameter() =
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPoly_t& defaultValue,
-                                                                                        Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                        int groupIndex)
+SecondOrderPolynomialFilterParameter::Pointer SecondOrderPolynomialFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPolynomial& defaultValue,
+                                                                                           Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                           int groupIndex)
 {
 
   SecondOrderPolynomialFilterParameter::Pointer ptr = SecondOrderPolynomialFilterParameter::New();
@@ -88,7 +88,7 @@ void SecondOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonObject obj = jsonValue.toObject();
-    Float2ndOrderPoly_t poly;
+    Float2ndOrderPolynomial poly;
     poly.readJson(obj);
     m_SetterCallback(poly);
   }
@@ -101,7 +101,7 @@ void SecondOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    Float2ndOrderPoly_t poly = m_GetterCallback();
+    Float2ndOrderPolynomial poly = m_GetterCallback();
     QJsonObject obj;
     poly.writeJson(obj);
     json[getPropertyName()] = obj;
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index e0d43ba7f6..f66c757a7b 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -40,43 +40,7 @@
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
-
-struct Float2ndOrderPoly_t
-{
-  float c20 = 0.0f;
-  float c02 = 0.0f;
-  float c11 = 0.0f;
-  float c10 = 0.0f;
-  float c01 = 0.0f;
-  float c00 = 0.0f;
-
-  void writeJson(QJsonObject& json) const
-  {
-    json["c20"] = c20;
-    json["c02"] = c02;
-    json["c11"] = c11;
-    json["c10"] = c10;
-    json["c01"] = c01;
-    json["c00"] = c00;
-  }
-
-  bool readJson(const QJsonObject& json)
-  {
-    if(json["c20"].isDouble() && json["c02"].isDouble() && json["c11"].isDouble() && json["c10"].isDouble() && json["c01"].isDouble() && json["c00"].isDouble())
-    {
-      c20 = static_cast<float>(json["c20"].toDouble());
-      c02 = static_cast<float>(json["c02"].toDouble());
-      c11 = static_cast<float>(json["c11"].toDouble());
-      c10 = static_cast<float>(json["c10"].toDouble());
-      c01 = static_cast<float>(json["c01"].toDouble());
-      c00 = static_cast<float>(json["c00"].toDouble());
-      return true;
-    }
-    return false;
-  }
-};
-
-Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
+#include "SIMPLib/FilterParameters/Float2ndOrderPolynomial.h"
 
 /**
  * @brief SIMPL_NEW_SecondO_POLY_FP This macro is a short-form way of instantiating an instance of
@@ -88,7 +52,7 @@ Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
  * SIMPL_NEW_SecondO_POLY_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_SecondO_POLY_FP("Second Order A Coefficients", SecondOrderACoeff, FilterParameter::Parameter, GenericExample, 0);
+ * SIMPL_NEW_SecondO_POLY_FP("Second Order A Coefficients", SecondOrderACoeff, FilterParameter::Category::Parameter, GenericExample, 0);
  */
 #define SIMPL_NEW_SecondO_POLY_FP(...)                                                                                                                                                                 \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(SecondOrderPolynomialFilterParameter, __VA_ARGS__))
@@ -99,6 +63,14 @@ Q_DECLARE_METATYPE(Float2ndOrderPoly_t)
  */
 class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(SecondOrderPolynomialFilterParameter)
+  PYB11_SHARED_POINTERS(SecondOrderPolynomialFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString Float2ndOrderPolynomial FilterParameter::Category SecondOrderPolynomialFilterParameter::SetterCallbackType SecondOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = SecondOrderPolynomialFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -118,8 +90,8 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(Float2ndOrderPoly_t)>;
-  using GetterCallbackType = std::function<Float2ndOrderPoly_t(void)>;
+  using SetterCallbackType = std::function<void(Float2ndOrderPolynomial)>;
+  using GetterCallbackType = std::function<Float2ndOrderPolynomial(void)>;
 
   /**
    * @brief New This function instantiates an instance of the SecondOrderPolynomialFilterParameter. Although this function is available to be used,
@@ -137,8 +109,8 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const Float2ndOrderPolynomial& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~SecondOrderPolynomialFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
index 0ba55b9496..fab2ef16a2 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
@@ -48,7 +48,7 @@ SeparatorFilterParameter::~SeparatorFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-SeparatorFilterParameter::Pointer SeparatorFilterParameter::New(const QString& humanLabel, FilterParameter::Category category)
+SeparatorFilterParameter::Pointer SeparatorFilterParameter::Create(const QString& humanLabel, FilterParameter::Category category)
 {
   SeparatorFilterParameter::Pointer ptr = SeparatorFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
index 94be4257a8..e49e8727ee 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -45,6 +45,14 @@
  */
 class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(SeparatorFilterParameter)
+  PYB11_SHARED_POINTERS(SeparatorFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString FilterParameter::Category)
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = SeparatorFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -66,13 +74,12 @@ class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
 
   /**
    * @brief New This function instantiates an instance of the SeparatorFilterParameter.
-
    * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
    * @return
    */
-  static Pointer New(const QString& humanLabel, FilterParameter::Category category);
+  static Pointer Create(const QString& humanLabel, FilterParameter::Category category);
 
   ~SeparatorFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 931195665a..a40f1797e0 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -50,9 +50,9 @@ ShapeTypeSelectionFilterParameter::~ShapeTypeSelectionFilterParameter() = defaul
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category,
-                                                                                  const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                  const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex)
+ShapeTypeSelectionFilterParameter::Pointer ShapeTypeSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category,
+                                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                     const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex)
 {
   ShapeTypeSelectionFilterParameter::Pointer ptr = ShapeTypeSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index 8b30979167..8886d3e136 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -53,7 +53,7 @@
  * PhaseTypeCountProperty, PhaseTypeArrayPathProperty, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
+ * SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::Category::CreatedArray, EstablishShapeTypes, "PhaseCount", "InputPhaseTypesArrayPath");
  */
 #define SIMPL_NEW_SHAPETYPE_SELECTION_FP(...)                                                                                                                                                          \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ShapeTypeSelectionFilterParameter, __VA_ARGS__))
@@ -64,6 +64,14 @@
  */
 class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ShapeTypeSelectionFilterParameter)
+  PYB11_SHARED_POINTERS(ShapeTypeSelectionFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString ShapeType::Types FilterParameter::Category ShapeTypeSelectionFilterParameter::SetterCallbackType ShapeTypeSelectionFilterParameter::GetterCallbackType QString QString int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ShapeTypeSelectionFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -104,8 +112,8 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
   * @return
   */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, ShapeType::Types defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, const QString& phaseTypeCountProperty, const QString& phaseTypeArrayPathProperty, int groupIndex = -1);
 
   ~ShapeTypeSelectionFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index a57417a08c..e2f6b795ef 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -24,6 +24,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ChoiceFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonSelectionAdvancedFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ComparisonSelectionFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ConstrainedFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ConstrainedDoubleFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ConstrainedIntFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/DataArrayCreationFilterParameter.h
@@ -84,6 +85,8 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UInt64FilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UnknownFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float4thOrderPolynomial.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float2ndOrderPolynomial.h
 )
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
@@ -92,6 +95,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AttributeMatrixCreationFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AttributeMatrixSelectionFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AxisAngleFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AxisAngleInput.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/BooleanFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/CalculatorFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/ChoiceFilterParameter.cpp
@@ -156,6 +160,8 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UInt64FilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UnknownFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float4thOrderPolynomial.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float2ndOrderPolynomial.cpp
 )
 
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
index 292e8c8392..79dc5ed180 100644
--- a/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.cpp
@@ -44,6 +44,21 @@ StackFileListInfo::StackFileListInfo(const QString& extension, int32_t startInde
   PaddingDigits = padding;
 }
 
+// -----------------------------------------------------------------------------
+StackFileListInfo::StackFileListInfo(int32_t paddingDigits, uint32_t ordering, int32_t startIndex, int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
+                                     const QString& fileSuffix, const QString& fileExtension)
+{
+  PaddingDigits = paddingDigits;
+  Ordering = ordering;
+  IncrementIndex = incrementIndex;
+  InputPath = inputPath;
+  FilePrefix = filePrefix;
+  FileSuffix = fileSuffix;
+  FileExtension = fileExtension;
+  StartIndex = startIndex;
+  EndIndex = endIndex;
+}
+
 // -----------------------------------------------------------------------------
 StackFileListInfo::~StackFileListInfo() = default;
 
diff --git a/Source/SIMPLib/FilterParameters/StackFileListInfo.h b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
index a4b53f518d..44b4a9b4cd 100644
--- a/Source/SIMPLib/FilterParameters/StackFileListInfo.h
+++ b/Source/SIMPLib/FilterParameters/StackFileListInfo.h
@@ -35,16 +35,81 @@
 #include <QtCore/QMetaType>
 #include <QtCore/QString>
 
+#include "SIMPLib/Common/SIMPLPythonMacros.h"
 #include "SIMPLib/FilterParameters/FileListInfo.h"
 
+#define FP_SET_PROPERTY(type, prpty)                                                                                                                                                                   \
+  void set##prpty(const type& value)                                                                                                                                                                   \
+  {                                                                                                                                                                                                    \
+    this->prpty = value;                                                                                                                                                                               \
+  }
+
+#define FP_GET_PROPERTY(type, prpty)                                                                                                                                                                   \
+  type get##prpty() const                                                                                                                                                                              \
+  {                                                                                                                                                                                                    \
+    return prpty;                                                                                                                                                                                      \
+  }
+
+#define FP_PROP_DEC_DEF(type, prpty)                                                                                                                                                                   \
+  FP_SET_PROPERTY(type, prpty)                                                                                                                                                                         \
+  FP_GET_PROPERTY(type, prpty)
+
 class SIMPLib_EXPORT StackFileListInfo : public FileListInfo
 {
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(StackFileListInfo)
+  PYB11_CREATION(QString int32_t int32_t int32_t)
+  PYB11_CREATION(int32_t uint32_t int32_t int32_t int32_t QString QString QString QString)
+  PYB11_PROPERTY(int32_t PaddingDigits READ getPaddingDigits WRITE setPaddingDigits)
+  PYB11_PROPERTY(uint32_t Ordering READ getOrdering WRITE setOrdering)
+  PYB11_PROPERTY(int32_t IncrementIndex READ getIncrementIndex WRITE setIncrementIndex)
+  PYB11_PROPERTY(QString InputPath READ getInputPath WRITE setInputPath)
+  PYB11_PROPERTY(QString FilePrefix READ getFilePrefix WRITE setFilePrefix)
+  PYB11_PROPERTY(QString FileSuffix READ getFileSuffix WRITE setFileSuffix)
+  PYB11_PROPERTY(QString FileExtension READ getFileExtension WRITE setFileExtension)
+  PYB11_PROPERTY(int32_t StartIndex READ getStartIndex WRITE setStartIndex)
+  PYB11_PROPERTY(int32_t EndIndex READ getEndIndex WRITE setEndIndex)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
 public:
   StackFileListInfo();
   ~StackFileListInfo() override;
-
+  /**
+   * @brief StackFileListInfo
+   * @param extension
+   * @param startIndex
+   * @param endIndex
+   * @param padding
+   */
   StackFileListInfo(const QString& extension, int32_t startIndex, int32_t endIndex, int32_t padding);
 
+  /**
+   * @brief StackFileListInfo
+   * @param paddingDigits
+   * @param ordering
+   * @param startIndex
+   * @param endIndex
+   * @param incrementIndex
+   * @param inputPath
+   * @param filePrefix
+   * @param fileSuffix
+   * @param fileExtension
+   */
+  StackFileListInfo(int32_t paddingDigits, uint32_t ordering, int32_t startIndex, int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
+                    const QString& fileSuffix, const QString& fileExtension);
+
+  // These are from the super class
+  FP_PROP_DEC_DEF(int32_t, PaddingDigits)
+  FP_PROP_DEC_DEF(uint32_t, Ordering)
+  FP_PROP_DEC_DEF(int32_t, IncrementIndex)
+  FP_PROP_DEC_DEF(QString, InputPath)
+  FP_PROP_DEC_DEF(QString, FilePrefix)
+  FP_PROP_DEC_DEF(QString, FileSuffix)
+  FP_PROP_DEC_DEF(QString, FileExtension)
+  // These are from this subclass
+  FP_PROP_DEC_DEF(int32_t, StartIndex)
+  FP_PROP_DEC_DEF(int32_t, EndIndex)
+
   qint32 StartIndex = 0;
   qint32 EndIndex = 1;
 
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index a985d39190..0bebad25a7 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -48,8 +48,8 @@ StringFilterParameter::~StringFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-StringFilterParameter::Pointer StringFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                          const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
+StringFilterParameter::Pointer StringFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
+                                                             const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   StringFilterParameter::Pointer ptr = StringFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 4bbd3afed4..475c2c451b 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -51,7 +51,7 @@
  * SIMPL_NEW_STRING_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), without optional GroupIndex parameter):
- * SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Parameter, GenericExample);
+ * SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Category::Parameter, GenericExample);
  */
 #define SIMPL_NEW_STRING_FP(...)                                                                                                                                                                       \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(StringFilterParameter, __VA_ARGS__))
@@ -62,6 +62,14 @@
  */
 class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(StringFilterParameter)
+  PYB11_SHARED_POINTERS(StringFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category StringFilterParameter::SetterCallbackType StringFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = StringFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -100,8 +108,8 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~StringFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 22e437e3a9..44a364d233 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -390,31 +390,31 @@ class FilterParametersRWTest
   Q_PROPERTY(DataArrayPath ArrayPath2 READ getArrayPath2 WRITE setArrayPath2)
 
   // -----------------------------------------------------------------------------
-  void setAxisAngle1(const AxisAngleInput_t& value)
+  void setAxisAngle1(const AxisAngleInput& value)
   {
     m_AxisAngle1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  AxisAngleInput_t getAxisAngle1() const
+  AxisAngleInput getAxisAngle1() const
   {
     return m_AxisAngle1;
   }
 
-  Q_PROPERTY(AxisAngleInput_t AxisAngle1 READ getAxisAngle1 WRITE setAxisAngle1)
+  Q_PROPERTY(AxisAngleInput AxisAngle1 READ getAxisAngle1 WRITE setAxisAngle1)
   // -----------------------------------------------------------------------------
-  void setAxisAngle2(const AxisAngleInput_t& value)
+  void setAxisAngle2(const AxisAngleInput& value)
   {
     m_AxisAngle2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  AxisAngleInput_t getAxisAngle2() const
+  AxisAngleInput getAxisAngle2() const
   {
     return m_AxisAngle2;
   }
 
-  Q_PROPERTY(AxisAngleInput_t AxisAngle2 READ getAxisAngle2 WRITE setAxisAngle2)
+  Q_PROPERTY(AxisAngleInput AxisAngle2 READ getAxisAngle2 WRITE setAxisAngle2)
 
   // -----------------------------------------------------------------------------
   void setComparisonInputs1(const ComparisonInputs& value)
@@ -579,31 +579,31 @@ class FilterParametersRWTest
   Q_PROPERTY(FloatVec3Type FloatVec3_2 READ getFloatVec3_2 WRITE setFloatVec3_2)
 
   // -----------------------------------------------------------------------------
-  void setFloat2ndOrderPoly_1(const Float2ndOrderPoly_t& value)
+  void setFloat2ndOrderPoly_1(const Float2ndOrderPolynomial& value)
   {
     m_Float2ndOrderPoly_1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  Float2ndOrderPoly_t getFloat2ndOrderPoly_1() const
+  Float2ndOrderPolynomial getFloat2ndOrderPoly_1() const
   {
     return m_Float2ndOrderPoly_1;
   }
 
-  Q_PROPERTY(Float2ndOrderPoly_t Float2ndOrderPoly_1 READ getFloat2ndOrderPoly_1 WRITE setFloat2ndOrderPoly_1)
+  Q_PROPERTY(Float2ndOrderPolynomial Float2ndOrderPoly_1 READ getFloat2ndOrderPoly_1 WRITE setFloat2ndOrderPoly_1)
   // -----------------------------------------------------------------------------
-  void setFloat2ndOrderPoly_2(const Float2ndOrderPoly_t& value)
+  void setFloat2ndOrderPoly_2(const Float2ndOrderPolynomial& value)
   {
     m_Float2ndOrderPoly_2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  Float2ndOrderPoly_t getFloat2ndOrderPoly_2() const
+  Float2ndOrderPolynomial getFloat2ndOrderPoly_2() const
   {
     return m_Float2ndOrderPoly_2;
   }
 
-  Q_PROPERTY(Float2ndOrderPoly_t Float2ndOrderPoly_2 READ getFloat2ndOrderPoly_2 WRITE setFloat2ndOrderPoly_2)
+  Q_PROPERTY(Float2ndOrderPolynomial Float2ndOrderPoly_2 READ getFloat2ndOrderPoly_2 WRITE setFloat2ndOrderPoly_2)
 
   // -----------------------------------------------------------------------------
   void setFloat3rdOrderPoly_1(const Float3rdOrderPoly_t& value)
@@ -633,31 +633,31 @@ class FilterParametersRWTest
   Q_PROPERTY(Float3rdOrderPoly_t Float3rdOrderPoly_2 READ getFloat3rdOrderPoly_2 WRITE setFloat3rdOrderPoly_2)
 
   // -----------------------------------------------------------------------------
-  void setFloat4thOrderPoly_1(const Float4thOrderPoly_t& value)
+  void setFloat4thOrderPoly_1(const Float4thOrderPolynomial& value)
   {
     m_Float4thOrderPoly_1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  Float4thOrderPoly_t getFloat4thOrderPoly_1() const
+  Float4thOrderPolynomial getFloat4thOrderPoly_1() const
   {
     return m_Float4thOrderPoly_1;
   }
 
-  Q_PROPERTY(Float4thOrderPoly_t Float4thOrderPoly_1 READ getFloat4thOrderPoly_1 WRITE setFloat4thOrderPoly_1)
+  Q_PROPERTY(Float4thOrderPolynomial Float4thOrderPoly_1 READ getFloat4thOrderPoly_1 WRITE setFloat4thOrderPoly_1)
   // -----------------------------------------------------------------------------
-  void setFloat4thOrderPoly_2(const Float4thOrderPoly_t& value)
+  void setFloat4thOrderPoly_2(const Float4thOrderPolynomial& value)
   {
     m_Float4thOrderPoly_2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  Float4thOrderPoly_t getFloat4thOrderPoly_2() const
+  Float4thOrderPolynomial getFloat4thOrderPoly_2() const
   {
     return m_Float4thOrderPoly_2;
   }
 
-  Q_PROPERTY(Float4thOrderPoly_t Float4thOrderPoly_2 READ getFloat4thOrderPoly_2 WRITE setFloat4thOrderPoly_2)
+  Q_PROPERTY(Float4thOrderPolynomial Float4thOrderPoly_2 READ getFloat4thOrderPoly_2 WRITE setFloat4thOrderPoly_2)
 
   // -----------------------------------------------------------------------------
   void setDataArrayPaths1(const QVector<DataArrayPath>& value)
@@ -790,8 +790,8 @@ class FilterParametersRWTest
     {
       AttributeMatrixCreationFilterParameter::RequirementType req;
       AttributeMatrixCreationFilterParameter::Pointer fp =
-          AttributeMatrixCreationFilterParameter::New("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
-                                                      SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
+          AttributeMatrixCreationFilterParameter::Create("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
+                                                         SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -807,8 +807,8 @@ class FilterParametersRWTest
     {
       AttributeMatrixSelectionFilterParameter::RequirementType req;
       AttributeMatrixSelectionFilterParameter::Pointer fp =
-          AttributeMatrixSelectionFilterParameter::New("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
-                                                       SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
+          AttributeMatrixSelectionFilterParameter::Create("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
+                                                          SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -822,8 +822,8 @@ class FilterParametersRWTest
     }
 
     {
-      AxisAngleFilterParameter::Pointer fp = AxisAngleFilterParameter::New("Test", "AxisAngle1", getAxisAngle1(), FilterParameter::Parameter,
-                                                                           SIMPL_BIND_SETTER(FilterParametersRWTest, this, AxisAngle2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, AxisAngle1));
+      AxisAngleFilterParameter::Pointer fp = AxisAngleFilterParameter::Create("Test", "AxisAngle1", getAxisAngle1(), FilterParameter::Category::Parameter,
+                                                                              SIMPL_BIND_SETTER(FilterParametersRWTest, this, AxisAngle2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, AxisAngle1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -834,12 +834,12 @@ class FilterParametersRWTest
       DREAM3D_REQUIRE_EQUAL(m_AxisAngle1.k, m_AxisAngle2.k)
       DREAM3D_REQUIRE_EQUAL(m_AxisAngle1.l, m_AxisAngle2.l)
 
-      m_AxisAngle2 = AxisAngleInput_t();
+      m_AxisAngle2 = AxisAngleInput();
     }
 
     {
-      BooleanFilterParameter::Pointer fp = BooleanFilterParameter::New("Test", "Bool1", getBool1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Bool2),
-                                                                       SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1));
+      BooleanFilterParameter::Pointer fp = BooleanFilterParameter::Create("Test", "Bool1", getBool1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Bool2),
+                                                                          SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -851,8 +851,8 @@ class FilterParametersRWTest
     }
 
     {
-      CalculatorFilterParameter::Pointer fp = CalculatorFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                             SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      CalculatorFilterParameter::Pointer fp = CalculatorFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter,
+                                                                                SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -864,8 +864,8 @@ class FilterParametersRWTest
     }
 
     {
-      ChoiceFilterParameter::Pointer fp = ChoiceFilterParameter::New("Test", "Int1", getInt1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
-                                                                     SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), true);
+      ChoiceFilterParameter::Pointer fp = ChoiceFilterParameter::Create("Test", "Int1", getInt1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
+                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), true);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -877,9 +877,9 @@ class FilterParametersRWTest
     }
 
     {
-      ComparisonSelectionFilterParameter::Pointer fp =
-          ComparisonSelectionFilterParameter::New("Test", "ComparisonInputs1", ComparisonInputs(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ComparisonInputs2),
-                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ComparisonInputs1), QVector<QString>(), true);
+      ComparisonSelectionFilterParameter::Pointer fp = ComparisonSelectionFilterParameter::Create("Test", "ComparisonInputs1", ComparisonInputs(), FilterParameter::Category::Parameter,
+                                                                                                  SIMPL_BIND_SETTER(FilterParametersRWTest, this, ComparisonInputs2),
+                                                                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ComparisonInputs1), QVector<QString>(), true);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -903,8 +903,8 @@ class FilterParametersRWTest
     {
       DataArrayCreationFilterParameter::RequirementType req;
       DataArrayCreationFilterParameter::Pointer fp =
-          DataArrayCreationFilterParameter::New("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
-                                                SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
+          DataArrayCreationFilterParameter::Create("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
+                                                   SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -920,8 +920,8 @@ class FilterParametersRWTest
     {
       DataArraySelectionFilterParameter::RequirementType req;
       DataArraySelectionFilterParameter::Pointer fp =
-          DataArraySelectionFilterParameter::New("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
-                                                 SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
+          DataArraySelectionFilterParameter::Create("Test", "ArrayPath1", getArrayPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ArrayPath2),
+                                                    SIMPL_BIND_GETTER(FilterParametersRWTest, this, ArrayPath1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -936,8 +936,8 @@ class FilterParametersRWTest
 
     {
       DataContainerArrayProxyFilterParameter::Pointer fp =
-          DataContainerArrayProxyFilterParameter::New("Test", "String1", DataContainerArrayProxy(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, DcaProxy2),
-                                                      SIMPL_BIND_GETTER(FilterParametersRWTest, this, DcaProxy1), DataContainerArrayProxy(), Qt::Checked);
+          DataContainerArrayProxyFilterParameter::Create("Test", "String1", DataContainerArrayProxy(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, DcaProxy2),
+                                                         SIMPL_BIND_GETTER(FilterParametersRWTest, this, DcaProxy1), DataContainerArrayProxy(), Qt::Checked);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -952,8 +952,8 @@ class FilterParametersRWTest
     }
 
     {
-      DataContainerCreationFilterParameter::Pointer fp = DataContainerCreationFilterParameter::New(
-          "Test", "Path1", getPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1));
+      DataContainerCreationFilterParameter::Pointer fp = DataContainerCreationFilterParameter::Create(
+          "Test", "Path1", getPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -966,8 +966,8 @@ class FilterParametersRWTest
 
     {
       DataContainerSelectionFilterParameter::RequirementType req;
-      DataContainerSelectionFilterParameter::Pointer fp = DataContainerSelectionFilterParameter::New(
-          "Test", "Path1", getPath1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1), req);
+      DataContainerSelectionFilterParameter::Pointer fp = DataContainerSelectionFilterParameter::Create(
+          "Test", "Path1", getPath1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Path2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Path1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -979,8 +979,8 @@ class FilterParametersRWTest
     }
 
     {
-      DoubleFilterParameter::Pointer fp = DoubleFilterParameter::New("Test", "Double1", getDouble1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Double2),
-                                                                     SIMPL_BIND_GETTER(FilterParametersRWTest, this, Double1));
+      DoubleFilterParameter::Pointer fp = DoubleFilterParameter::Create("Test", "Double1", getDouble1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Double2),
+                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, Double1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -992,8 +992,9 @@ class FilterParametersRWTest
     }
 
     {
-      DynamicChoiceFilterParameter::Pointer fp = DynamicChoiceFilterParameter::New(
-          "Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1), "");
+      DynamicChoiceFilterParameter::Pointer fp =
+          DynamicChoiceFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
+                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1), "");
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1006,8 +1007,8 @@ class FilterParametersRWTest
 
     {
       DynamicTableFilterParameter::Pointer fp =
-          DynamicTableFilterParameter::New("Test", "DynamicData1", DynamicTableData(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, DynamicData2),
-                                           SIMPL_BIND_GETTER(FilterParametersRWTest, this, DynamicData1));
+          DynamicTableFilterParameter::Create("Test", "DynamicData1", DynamicTableData(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, DynamicData2),
+                                              SIMPL_BIND_GETTER(FilterParametersRWTest, this, DynamicData1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1023,8 +1024,8 @@ class FilterParametersRWTest
 
     {
       FileListInfoFilterParameter::Pointer fp =
-          FileListInfoFilterParameter::New("Test", "FileListInfo1", StackFileListInfo(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, FileListInfo2),
-                                           SIMPL_BIND_GETTER(FilterParametersRWTest, this, FileListInfo1));
+          FileListInfoFilterParameter::Create("Test", "FileListInfo1", StackFileListInfo(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, FileListInfo2),
+                                              SIMPL_BIND_GETTER(FilterParametersRWTest, this, FileListInfo1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1043,8 +1044,9 @@ class FilterParametersRWTest
     }
 
     {
-      FloatVec3FilterParameter::Pointer fp = FloatVec3FilterParameter::New("Test", "FloatVec3_1", FloatVec3Type(), FilterParameter::Parameter,
-                                                                           SIMPL_BIND_SETTER(FilterParametersRWTest, this, FloatVec3_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, FloatVec3_1));
+      FloatVec3FilterParameter::Pointer fp =
+          FloatVec3FilterParameter::Create("Test", "FloatVec3_1", FloatVec3Type(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, FloatVec3_2),
+                                           SIMPL_BIND_GETTER(FilterParametersRWTest, this, FloatVec3_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1059,8 +1061,8 @@ class FilterParametersRWTest
 
     {
       FourthOrderPolynomialFilterParameter::Pointer fp =
-          FourthOrderPolynomialFilterParameter::New("Test", "Float4thOrderPoly_1", Float4thOrderPoly_t(), FilterParameter::Parameter,
-                                                    SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float4thOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float4thOrderPoly_1));
+          FourthOrderPolynomialFilterParameter::Create("Test", "Float4thOrderPoly_1", Float4thOrderPolynomial(), FilterParameter::Category::Parameter,
+                                                       SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float4thOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float4thOrderPoly_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1082,12 +1084,12 @@ class FilterParametersRWTest
       DREAM3D_REQUIRE_EQUAL(m_Float4thOrderPoly_1.c31, m_Float4thOrderPoly_2.c31)
       DREAM3D_REQUIRE_EQUAL(m_Float4thOrderPoly_1.c40, m_Float4thOrderPoly_2.c40)
 
-      m_Float4thOrderPoly_2 = Float4thOrderPoly_t();
+      m_Float4thOrderPoly_2 = Float4thOrderPolynomial();
     }
 
     {
-      InputFileFilterParameter::Pointer fp = InputFileFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                           SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      InputFileFilterParameter::Pointer fp = InputFileFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter,
+                                                                              SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1099,8 +1101,8 @@ class FilterParametersRWTest
     }
 
     {
-      InputPathFilterParameter::Pointer fp = InputPathFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                           SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      InputPathFilterParameter::Pointer fp = InputPathFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter,
+                                                                              SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1112,8 +1114,8 @@ class FilterParametersRWTest
     }
 
     {
-      IntFilterParameter::Pointer fp =
-          IntFilterParameter::New("Test", "Int1", getInt1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1));
+      IntFilterParameter::Pointer fp = IntFilterParameter::Create("Test", "Int1", getInt1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
+                                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1125,8 +1127,8 @@ class FilterParametersRWTest
     }
 
     {
-      IntVec3FilterParameter::Pointer fp = IntVec3FilterParameter::New("Test", "IntVec3_1", IntVec3Type(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, IntVec3_2),
-                                                                       SIMPL_BIND_GETTER(FilterParametersRWTest, this, IntVec3_1));
+      IntVec3FilterParameter::Pointer fp = IntVec3FilterParameter::Create("Test", "IntVec3_1", IntVec3Type(), FilterParameter::Category::Parameter,
+                                                                          SIMPL_BIND_SETTER(FilterParametersRWTest, this, IntVec3_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, IntVec3_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1140,8 +1142,9 @@ class FilterParametersRWTest
     }
 
     {
-      LinkedBooleanFilterParameter::Pointer fp = LinkedBooleanFilterParameter::New("Test", "Bool1", getBool1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Bool2),
-                                                                                   SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1), QStringList());
+      LinkedBooleanFilterParameter::Pointer fp =
+          LinkedBooleanFilterParameter::Create("Test", "Bool1", getBool1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Bool2),
+                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1), QStringList());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1153,8 +1156,9 @@ class FilterParametersRWTest
     }
 
     {
-      LinkedChoicesFilterParameter::Pointer fp = LinkedChoicesFilterParameter::New("Test", "Int1", getInt1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
-                                                                                   SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), QStringList());
+      LinkedChoicesFilterParameter::Pointer fp =
+          LinkedChoicesFilterParameter::Create("Test", "Int1", getInt1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
+                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), QStringList());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1168,8 +1172,8 @@ class FilterParametersRWTest
     {
       MultiDataArraySelectionFilterParameter::RequirementType req;
       MultiDataArraySelectionFilterParameter::Pointer fp =
-          MultiDataArraySelectionFilterParameter::New("Test", "DataArrayPaths1", getDataArrayPaths1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, DataArrayPaths2),
-                                                      SIMPL_BIND_GETTER(FilterParametersRWTest, this, DataArrayPaths1), req);
+          MultiDataArraySelectionFilterParameter::Create("Test", "DataArrayPaths1", getDataArrayPaths1(), FilterParameter::Category::Parameter,
+                                                         SIMPL_BIND_SETTER(FilterParametersRWTest, this, DataArrayPaths2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, DataArrayPaths1), req);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1188,8 +1192,8 @@ class FilterParametersRWTest
     }
 
     {
-      OutputFileFilterParameter::Pointer fp = OutputFileFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                             SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      OutputFileFilterParameter::Pointer fp = OutputFileFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter,
+                                                                                SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1201,8 +1205,8 @@ class FilterParametersRWTest
     }
 
     {
-      OutputPathFilterParameter::Pointer fp = OutputPathFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                             SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      OutputPathFilterParameter::Pointer fp = OutputPathFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter,
+                                                                                SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1214,9 +1218,9 @@ class FilterParametersRWTest
     }
 
     {
-      PhaseTypeSelectionFilterParameter::Pointer fp =
-          PhaseTypeSelectionFilterParameter::New("Test", "PhaseTypeVector_2", DataArrayPath(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, PhaseTypeVector_2),
-                                                 SIMPL_BIND_GETTER(FilterParametersRWTest, this, PhaseTypeVector_1), "", "", "", QStringList());
+      PhaseTypeSelectionFilterParameter::Pointer fp = PhaseTypeSelectionFilterParameter::Create("Test", "PhaseTypeVector_2", DataArrayPath(), FilterParameter::Category::Parameter,
+                                                                                                SIMPL_BIND_SETTER(FilterParametersRWTest, this, PhaseTypeVector_2),
+                                                                                                SIMPL_BIND_GETTER(FilterParametersRWTest, this, PhaseTypeVector_1), "", "", "", QStringList());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1236,7 +1240,7 @@ class FilterParametersRWTest
 This Filter Parameter is NOT tesed since nothing is read or written for the filter parameter.
     {
       PreflightUpdatedValueFilterParameter::Pointer fp =
-          PreflightUpdatedValueFilterParameter::New("Test", "String2", getString1(), FilterParameter::Parameter, SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+          PreflightUpdatedValueFilterParameter::Create("Test", "String2", getString1(), FilterParameter::Category::Parameter, SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1252,8 +1256,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
     }
 #endif
     {
-      RangeFilterParameter::Pointer fp = RangeFilterParameter::New("Test", "Pair1", getPair1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Pair2),
-                                                                   SIMPL_BIND_GETTER(FilterParametersRWTest, this, Pair1));
+      RangeFilterParameter::Pointer fp = RangeFilterParameter::Create("Test", "Pair1", getPair1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Pair2),
+                                                                      SIMPL_BIND_GETTER(FilterParametersRWTest, this, Pair1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1267,8 +1271,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
 
     {
       SecondOrderPolynomialFilterParameter::Pointer fp =
-          SecondOrderPolynomialFilterParameter::New("Test", "Float2ndOrderPoly_1", Float2ndOrderPoly_t(), FilterParameter::Parameter,
-                                                    SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float2ndOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float2ndOrderPoly_1));
+          SecondOrderPolynomialFilterParameter::Create("Test", "Float2ndOrderPoly_1", Float2ndOrderPolynomial(), FilterParameter::Category::Parameter,
+                                                       SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float2ndOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float2ndOrderPoly_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1281,13 +1285,13 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
       DREAM3D_REQUIRE_EQUAL(m_Float2ndOrderPoly_1.c11, m_Float2ndOrderPoly_2.c11)
       DREAM3D_REQUIRE_EQUAL(m_Float2ndOrderPoly_1.c20, m_Float2ndOrderPoly_2.c20)
 
-      m_Float2ndOrderPoly_2 = Float2ndOrderPoly_t();
+      m_Float2ndOrderPoly_2 = Float2ndOrderPolynomial();
     }
 #if 0
     {
       ShapeType::Types shapeData;
       ShapeTypeSelectionFilterParameter::Pointer fp =
-          ShapeTypeSelectionFilterParameter::New("Test", "String1", shapeData, FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ShapeType::Types),
+          ShapeTypeSelectionFilterParameter::Create("Test", "String1", shapeData, FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, ShapeType::Types),
                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ShapeType::Types), "String1", "");
 
       QJsonObject obj;
@@ -1305,8 +1309,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
     }
 #endif
     {
-      StringFilterParameter::Pointer fp = StringFilterParameter::New("Test", "String1", getString1(), FilterParameter::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
-                                                                     SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
+      StringFilterParameter::Pointer fp = StringFilterParameter::Create("Test", "String1", getString1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, String2),
+                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, String1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1319,8 +1323,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
 
     {
       ThirdOrderPolynomialFilterParameter::Pointer fp =
-          ThirdOrderPolynomialFilterParameter::New("Test", "Float3rdOrderPoly_1", Float3rdOrderPoly_t(), FilterParameter::Parameter,
-                                                   SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float3rdOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float3rdOrderPoly_1));
+          ThirdOrderPolynomialFilterParameter::Create("Test", "Float3rdOrderPoly_1", Float3rdOrderPoly_t(), FilterParameter::Category::Parameter,
+                                                      SIMPL_BIND_SETTER(FilterParametersRWTest, this, Float3rdOrderPoly_2), SIMPL_BIND_GETTER(FilterParametersRWTest, this, Float3rdOrderPoly_1));
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1420,8 +1424,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   DataArrayPath m_Path2 = {};
   DataArrayPath m_ArrayPath1 = {};
   DataArrayPath m_ArrayPath2 = {};
-  AxisAngleInput_t m_AxisAngle1 = {};
-  AxisAngleInput_t m_AxisAngle2 = {};
+  AxisAngleInput m_AxisAngle1 = {};
+  AxisAngleInput m_AxisAngle2 = {};
   ComparisonInputs m_ComparisonInputs1 = {};
   ComparisonInputs m_ComparisonInputs2 = {};
   DataContainerArrayProxy m_DcaProxy1 = {};
@@ -1434,12 +1438,12 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   IntVec3Type m_IntVec3_2 = {};
   FloatVec3Type m_FloatVec3_1 = {};
   FloatVec3Type m_FloatVec3_2 = {};
-  Float2ndOrderPoly_t m_Float2ndOrderPoly_1 = {};
-  Float2ndOrderPoly_t m_Float2ndOrderPoly_2 = {};
+  Float2ndOrderPolynomial m_Float2ndOrderPoly_1 = {};
+  Float2ndOrderPolynomial m_Float2ndOrderPoly_2 = {};
   Float3rdOrderPoly_t m_Float3rdOrderPoly_1 = {};
   Float3rdOrderPoly_t m_Float3rdOrderPoly_2 = {};
-  Float4thOrderPoly_t m_Float4thOrderPoly_1 = {};
-  Float4thOrderPoly_t m_Float4thOrderPoly_2 = {};
+  Float4thOrderPolynomial m_Float4thOrderPoly_1 = {};
+  Float4thOrderPolynomial m_Float4thOrderPoly_2 = {};
   QVector<DataArrayPath> m_DataArrayPaths1 = {};
   QVector<DataArrayPath> m_DataArrayPaths2 = {};
   ShapeType::Types m_ShapeTypeVector_1 = {};
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index 8fee8ac4dc..e25a09d4fe 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -48,9 +48,9 @@ ThirdOrderPolynomialFilterParameter::~ThirdOrderPolynomialFilterParameter() = de
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::New(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue,
-                                                                                      Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                                                                                      int groupIndex)
+ThirdOrderPolynomialFilterParameter::Pointer ThirdOrderPolynomialFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue,
+                                                                                         Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                         int groupIndex)
 {
 
   ThirdOrderPolynomialFilterParameter::Pointer ptr = ThirdOrderPolynomialFilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index 12421b67c8..367aea7a54 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -52,7 +52,7 @@
  * SIMPL_NEW_ThirdO_POLY_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_ThirdO_POLY_FP("Third Order A Coefficients", ThirdOrderACoeff, FilterParameter::Parameter, WarpRegularGrid, 1);
+ * SIMPL_NEW_ThirdO_POLY_FP("Third Order A Coefficients", ThirdOrderACoeff, FilterParameter::Category::Parameter, WarpRegularGrid, 1);
  */
 #define SIMPL_NEW_ThirdO_POLY_FP(...)                                                                                                                                                                  \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(ThirdOrderPolynomialFilterParameter, __VA_ARGS__))
@@ -63,6 +63,14 @@
  */
 class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(ThirdOrderPolynomialFilterParameter)
+  PYB11_SHARED_POINTERS(ThirdOrderPolynomialFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString Float3rdOrderPoly_t FilterParameter::Category ThirdOrderPolynomialFilterParameter::SetterCallbackType ThirdOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = ThirdOrderPolynomialFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -101,8 +109,8 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const Float3rdOrderPoly_t& defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~ThirdOrderPolynomialFilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 7eb86e828b..714390b0ed 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -46,8 +46,8 @@ UInt64FilterParameter::~UInt64FilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-UInt64FilterParameter::Pointer UInt64FilterParameter::New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                          const GetterCallbackType& getterCallback, int groupIndex)
+UInt64FilterParameter::Pointer UInt64FilterParameter::Create(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
+                                                             const GetterCallbackType& getterCallback, int groupIndex)
 {
 
   UInt64FilterParameter::Pointer ptr = UInt64FilterParameter::New();
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index dcca6b0c56..61ee0244ed 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -49,7 +49,7 @@
  * SIMPL_NEW_INTEGER_FP("HumanLabel", PropertyName, Category, FilterName, GroupIndex)
  *
  * Example 1 (instantiated within a filter called [GenericExample](@ref genericexample), with optional GroupIndex parameter):
- * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0);
+ * SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Category::Parameter, GenericExample, 0);
  */
 #define SIMPL_NEW_UINT64_FP(...)                                                                                                                                                                       \
   SIMPL_EXPAND(_FP_GET_OVERRIDE(__VA_ARGS__, SIMPL_NEW_FP_9, SIMPL_NEW_FP_8, SIMPL_NEW_FP_7, SIMPL_NEW_FP_6, SIMPL_NEW_FP_5, SIMPL_NEW_FP_4)(UInt64FilterParameter, __VA_ARGS__))
@@ -60,6 +60,14 @@
  */
 class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(UInt64FilterParameter)
+  PYB11_SHARED_POINTERS(UInt64FilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString uint64_t FilterParameter::Category UInt64FilterParameter::SetterCallbackType UInt64FilterParameter::GetterCallbackType int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = UInt64FilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -98,8 +106,8 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
-                     const GetterCallbackType& getterCallback, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, uint64_t defaultValue, Category category, const SetterCallbackType& setterCallback,
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~UInt64FilterParameter() override;
 
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
index 8ca2acdccd..ec097beb07 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
@@ -48,7 +48,7 @@ UnknownFilterParameter::~UnknownFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-UnknownFilterParameter::Pointer UnknownFilterParameter::New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex)
+UnknownFilterParameter::Pointer UnknownFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex)
 {
   UnknownFilterParameter::Pointer ptr = UnknownFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index 9a29e8a85f..ca19e7c5e5 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -45,6 +45,14 @@
  */
 class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
 {
+  // Start Python bindings declarations
+  // clang-format off
+  PYB11_BEGIN_BINDINGS(UnknownFilterParameter)
+  PYB11_SHARED_POINTERS(UnknownFilterParameter)
+  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category int )
+  PYB11_END_BINDINGS()
+  // clang-format on
+  // End Python bindings declarations
 public:
   using Self = UnknownFilterParameter;
   using Pointer = std::shared_ptr<Self>;
@@ -75,7 +83,7 @@ class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer New(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex = -1);
 
   ~UnknownFilterParameter() override;
 
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 9e117e4132..8614d0c589 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -45,7 +45,7 @@
 #include "SIMPLib/CoreFilters/CreateDataArray.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
-#include "SIMPLib/FilterParameters/AxisAngleFilterParameter.h"
+#include "SIMPLib/FilterParameters/AxisAngleInput.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
@@ -150,7 +150,7 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<AbstractMessage::Pointer>("AbstractMessage::Pointer");
   qRegisterMetaType<DataContainerArrayProxy>("DataContainerArrayProxy");
   qRegisterMetaType<DataArrayPath>("DataArrayPath");
-  qRegisterMetaType<AxisAngleInput_t>("AxisAngleInput_t");
+  qRegisterMetaType<AxisAngleInput>("AxisAngleInput");
   qRegisterMetaType<ComparisonInput_t>("ComparisonInput_t");
   qRegisterMetaType<ComparisonInputs>("ComparisonInputs");
   qRegisterMetaType<ComparisonInputsAdvanced>("ComparisonInputsAdvanced");
@@ -161,8 +161,24 @@ void QMetaObjectUtilities::RegisterMetaTypes()
   qRegisterMetaType<DynamicTableData>("DynamicTableData");
   qRegisterMetaType<PhaseType::Types>("PhaseType::Types");
   qRegisterMetaType<VectString>("VectString");
-  qRegisterMetaTypeStreamOperators<IntVec3Type>("IntVec3Type");
-  qRegisterMetaTypeStreamOperators<FloatVec3Type>("FloatVec3Type");
+  qRegisterMetaType<IVec2<float>>("FloatVec2Type");
+  qRegisterMetaType<IVec3<float>>("FloatVec3Type");
+  qRegisterMetaType<IVec4<float>>("FloatVec4Type");
+  qRegisterMetaType<IVec6<float>>("FloatVec6Type");
+  qRegisterMetaType<IVec7<float>>("FloatVec7Type");
+
+  qRegisterMetaType<IVec2<int>>("IntVec2Type");
+  qRegisterMetaType<IVec3<int>>("IntVec3Type");
+  qRegisterMetaType<IVec4<int>>("IntVec4Type");
+  qRegisterMetaType<IVec6<int>>("IntVec6Type");
+  qRegisterMetaType<IVec7<int>>("IntVec7Type");
+
+  qRegisterMetaType<IVec2<size_t>>("SizeVec2Type");
+  qRegisterMetaType<IVec3<size_t>>("SizeVec3Type");
+  qRegisterMetaType<IVec4<size_t>>("SizeVec4Type");
+  qRegisterMetaType<IVec6<size_t>>("SizeVec6Type");
+  qRegisterMetaType<IVec7<size_t>>("SizeVec7Type");
+
   qRegisterMetaTypeStreamOperators<PhaseType::Types>("PhaseType::Types");
   qRegisterMetaTypeStreamOperators<EnsembleInfo>("EnsembleInfo");
 }
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 43c1ef84ed..503a2b773c 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -122,7 +122,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
   IGeometry();
   ~IGeometry() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   /**
    * @brief The VtkCellType enum
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 6c83e6fe76..315749adcb 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -91,7 +91,7 @@ class SIMPLib_EXPORT ImageGeom : public IGeometryGrid
 
   ~ImageGeom() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class ErrorType : EnumType
   {
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 2db95bf9c5..2442d284ae 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -1001,7 +1001,7 @@ class RESTUnitTest
 
         DREAM3D_REQUIRE_EQUAL(responseFPObject.contains(SIMPL::JSON::FilterParameterCategory), true);
         DREAM3D_REQUIRE_EQUAL(responseFPObject[SIMPL::JSON::FilterParameterCategory].isDouble(), true);
-        DREAM3D_REQUIRE_EQUAL(responseFPObject[SIMPL::JSON::FilterParameterCategory].toInt(), parameters[i]->getCategory());
+        DREAM3D_REQUIRE_EQUAL(responseFPObject[SIMPL::JSON::FilterParameterCategory].toInt(), static_cast<int32_t>(parameters[i]->getCategory()));
 
         DREAM3D_REQUIRE_EQUAL(responseFPObject.contains(SIMPL::JSON::FilterParameterGroupIndex), true);
         DREAM3D_REQUIRE_EQUAL(responseFPObject[SIMPL::JSON::FilterParameterGroupIndex].isDouble(), true);
diff --git a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
index 911cb60be5..82a0abc6ef 100644
--- a/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
+++ b/Source/SIMPLib/REST/V1Controllers/ListFilterParametersController.cpp
@@ -81,7 +81,7 @@ void ListFilterParametersController::createFilterParametersJson(const QString& f
     QJsonObject filterObj;
     filterObj[SIMPL::JSON::FilterParameterName] = parameter->getNameOfClass();
     filterObj[SIMPL::JSON::FilterParameterWidget] = parameter->getWidgetType();
-    filterObj[SIMPL::JSON::FilterParameterCategory] = parameter->getCategory();
+    filterObj[SIMPL::JSON::FilterParameterCategory] = static_cast<int32_t>(parameter->getCategory());
     filterObj[SIMPL::JSON::FilterParameterGroupIndex] = parameter->getGroupIndex();
     filterObj[SIMPL::JSON::FilterParameterHumanLabel] = parameter->getHumanLabel();
     filterObj[SIMPL::JSON::FilterParameterPropertyName] = parameter->getPropertyName();
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index dc0a04332d..6522837497 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -55,13 +55,13 @@ void ArraySelectionExample::setupFilterParameters()
   FilterParameterVectorType parameters;
   DataContainerArrayProxy proxy;
   /* To select arrays */
-  // parameters.push_back(DataContainerArrayProxyFilterParameter::New("Array to Select", "DataContainerArrayProxy", "", FilterParameter::Parameter, SIMPL_BIND_SETTER(ArraySelectionExample, this,
-  // DataContainerArrayProxy), SIMPL_BIND_GETTER(ArraySelectionExample, this, DataContainerArrayProxy), proxy, Qt::Checked));
-  // parameters.push_back(SIMPL_NEW_DCA_PROXY_FP("Array to Select", DataContainerArrayProxy, FilterParameter::Parameter, ArraySelectionExample, proxy, Qt::Checked));
+  // parameters.push_back(DataContainerArrayProxyFilterParameter::Create("Array to Select", "DataContainerArrayProxy", "", FilterParameter::Category::Parameter,
+  // SIMPL_BIND_SETTER(ArraySelectionExample, this, DataContainerArrayProxy), SIMPL_BIND_GETTER(ArraySelectionExample, this, DataContainerArrayProxy), proxy, Qt::Checked));
+  // parameters.push_back(SIMPL_NEW_DCA_PROXY_FP("Array to Select", DataContainerArrayProxy, FilterParameter::Category::Parameter, ArraySelectionExample, proxy, Qt::Checked));
 
-  parameters.push_back(DataContainerArrayProxyFilterParameter::New("Array to Select", "DataContainerArrayProxy", getDataContainerArrayProxy(), FilterParameter::Parameter,
-                                                                   SIMPL_BIND_SETTER(ArraySelectionExample, this, DataContainerArrayProxy),
-                                                                   SIMPL_BIND_GETTER(ArraySelectionExample, this, DataContainerArrayProxy), proxy, Qt::Checked));
+  parameters.push_back(DataContainerArrayProxyFilterParameter::Create("Array to Select", "DataContainerArrayProxy", getDataContainerArrayProxy(), FilterParameter::Category::Parameter,
+                                                                      SIMPL_BIND_SETTER(ArraySelectionExample, this, DataContainerArrayProxy),
+                                                                      SIMPL_BIND_GETTER(ArraySelectionExample, this, DataContainerArrayProxy), proxy, Qt::Checked));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index c742b6940c..bbbc461161 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -60,7 +60,7 @@ void DynamicTableExample::setupFilterParameters()
   // Table 1 - Fixed rows and columns, no default data passed in
   {
     // We are using the expanded way to create the filter parameter, because the getter and setter variables are different
-    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 1", DynamicData1, FilterParameter::Parameter, DynamicTableExample));
+    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 1", DynamicData1, FilterParameter::Category::Parameter, DynamicTableExample));
   }
 
   // Table 2 - Fixed rows and columns, default data passed in
@@ -75,7 +75,7 @@ void DynamicTableExample::setupFilterParameters()
     m_DynamicData2.setColHeaders(cHeaders);
     m_DynamicData2.setRowHeaders(rHeaders);
     m_DynamicData2.setTableData(defaultTable);
-    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 2", DynamicData2, FilterParameter::Parameter, DynamicTableExample));
+    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 2", DynamicData2, FilterParameter::Category::Parameter, DynamicTableExample));
   }
 
   // Table 3 - Dynamic rows and fixed columns, default data passed in
@@ -94,7 +94,7 @@ void DynamicTableExample::setupFilterParameters()
     m_DynamicData3.setRowHeaders(rHeaders);
     m_DynamicData3.setTableData(defaultTable);
     m_DynamicData3.setDynamicRows(true);
-    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 3", DynamicData3, FilterParameter::Parameter, DynamicTableExample));
+    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 3", DynamicData3, FilterParameter::Category::Parameter, DynamicTableExample));
   }
 
   // Table 4 - Fixed rows and dynamic columns, default data passed in
@@ -109,7 +109,7 @@ void DynamicTableExample::setupFilterParameters()
     m_DynamicData4.setRowHeaders(rHeaders);
     m_DynamicData4.setTableData(defaultTable);
     m_DynamicData4.setDynamicCols(true);
-    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 4", DynamicData4, FilterParameter::Parameter, DynamicTableExample));
+    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 4", DynamicData4, FilterParameter::Category::Parameter, DynamicTableExample));
   }
 
   // Table 5 - Dynamic rows and dynamic columns, default data passed in
@@ -129,7 +129,7 @@ void DynamicTableExample::setupFilterParameters()
     m_DynamicData5.setDefaultRowCount(3);
     m_DynamicData5.setMinCols(3);
     m_DynamicData5.setDefaultColCount(5);
-    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 5", DynamicData5, FilterParameter::Parameter, DynamicTableExample));
+    parameters.push_back(SIMPL_NEW_DYN_TABLE_FP("Dynamic Table 5", DynamicData5, FilterParameter::Category::Parameter, DynamicTableExample));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
index 3944d3ad3b..3215b29c97 100644
--- a/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
+++ b/Source/SIMPLib/TestFilters/ErrorWarningFilter.cpp
@@ -74,11 +74,11 @@ void ErrorWarningFilter::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Warning", PreflightWarning, FilterParameter::Parameter, ErrorWarningFilter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Error", PreflightError, FilterParameter::Parameter, ErrorWarningFilter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Execute Warning", ExecuteWarning, FilterParameter::Parameter, ErrorWarningFilter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Execute Error", ExecuteError, FilterParameter::Parameter, ErrorWarningFilter));
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Property Error", PropertyError, FilterParameter::Parameter, ErrorWarningFilter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Warning", PreflightWarning, FilterParameter::Category::Parameter, ErrorWarningFilter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Preflight Error", PreflightError, FilterParameter::Category::Parameter, ErrorWarningFilter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Execute Warning", ExecuteWarning, FilterParameter::Category::Parameter, ErrorWarningFilter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Execute Error", ExecuteError, FilterParameter::Category::Parameter, ErrorWarningFilter));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Property Error", PropertyError, FilterParameter::Category::Parameter, ErrorWarningFilter));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SIMPLib/TestFilters/Filt0.cpp b/Source/SIMPLib/TestFilters/Filt0.cpp
index d0a4e01128..9194467b40 100644
--- a/Source/SIMPLib/TestFilters/Filt0.cpp
+++ b/Source/SIMPLib/TestFilters/Filt0.cpp
@@ -37,11 +37,11 @@ void Filt0::setupFilterParameters()
 
   /*  For an Integer use this code*/
   {
-    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt0_Integer, FilterParameter::Parameter, Filt0));
+    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt0_Integer, FilterParameter::Category::Parameter, Filt0));
   }
   /*  For a Floating point value use this code*/
   {
-    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt0_Float, FilterParameter::Parameter, Filt0));
+    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt0_Float, FilterParameter::Category::Parameter, Filt0));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/TestFilters/Filt1.cpp b/Source/SIMPLib/TestFilters/Filt1.cpp
index afe31ba9c8..ad5033abcc 100644
--- a/Source/SIMPLib/TestFilters/Filt1.cpp
+++ b/Source/SIMPLib/TestFilters/Filt1.cpp
@@ -37,11 +37,11 @@ void Filt1::setupFilterParameters()
 
   /*  For an Integer use this code*/
   {
-    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt1_Integer, FilterParameter::Parameter, Filt1));
+    parameters.push_back(SIMPL_NEW_INTEGER_FP("Int Value", Filt1_Integer, FilterParameter::Category::Parameter, Filt1));
   }
   /*  For a Floating point value use this code*/
   {
-    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt1_Float, FilterParameter::Parameter, Filt1));
+    parameters.push_back(SIMPL_NEW_FLOAT_FP("Float Value", Filt1_Float, FilterParameter::Category::Parameter, Filt1));
   }
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 51e06878a2..1506e8725e 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -128,25 +128,25 @@ void GenericExample::setupFilterParameters()
   FilterParameterVectorType parameters;
   /* Place all your option initialization code here */
   /* For String input use this code */
-  parameters.push_back(SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_STRING_FP("STL Output Prefix", StlFilePrefix, FilterParameter::Category::Parameter, GenericExample));
 
   /*   For an output file use this code*/
-  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_OUTPUT_FILE_FP("Output File", OutputFile, FilterParameter::Category::Parameter, GenericExample));
   /*   For an output path use this code*/
-  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Category::Parameter, GenericExample));
   /*   For a simple true/false boolean use this code*/
-  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Alignment Shift File", WriteAlignmentShifts, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_BOOL_FP("Write Alignment Shift File", WriteAlignmentShifts, FilterParameter::Category::Parameter, GenericExample));
 
-  parameters.push_back(SeparatorFilterParameter::New("Choice Example", FilterParameter::Parameter));
+  parameters.push_back(SeparatorFilterParameter::Create("Choice Example", FilterParameter::Category::Parameter));
 
-  parameters.push_back(SIMPL_NEW_FILELISTINFO_FP("Input File List", InputFileListInfo, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_FILELISTINFO_FP("Input File List", InputFileListInfo, FilterParameter::Category::Parameter, GenericExample));
 
   {
     QVector<QString> choices;
     choices.push_back("Beta");
     choices.push_back("Lognormal");
     choices.push_back("Power");
-    parameters.push_back(SIMPL_NEW_CHOICE_FP("Size Distribution Fit Type", SizeDistributionFitType, FilterParameter::Parameter, GenericExample, choices, false));
+    parameters.push_back(SIMPL_NEW_CHOICE_FP("Size Distribution Fit Type", SizeDistributionFitType, FilterParameter::Category::Parameter, GenericExample, choices, false));
   }
 
   {
@@ -154,7 +154,7 @@ void GenericExample::setupFilterParameters()
     choices.push_back("CellData");
     choices.push_back("CellEnsemble");
     choices.push_back("FeatureIds");
-    parameters.push_back(SIMPL_NEW_COMP_SEL_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Parameter, GenericExample, choices, true));
+    parameters.push_back(SIMPL_NEW_COMP_SEL_FP("Select Arrays to Threshold", SelectedThresholds, FilterParameter::Category::Parameter, GenericExample, choices, true));
   }
 
   /*   For presenting a set of choices to the user use this code*/
@@ -170,60 +170,60 @@ void GenericExample::setupFilterParameters()
     choices.push_back("Degrees To Radians");
     choices.push_back("Radians To Degrees");
     parameter->setChoices(choices);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
   }
 
-  parameters.push_back(SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Estimated Primary Features", EstimatedPrimaryFeatures, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_PREFLIGHTUPDATEDVALUE_FP("Estimated Primary Features", EstimatedPrimaryFeatures, FilterParameter::Category::Parameter, GenericExample));
 
   /* Display a group of 3 text boxes to collect 3 integer values */
-  parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Parameter, GenericExample));
-  parameters.push_back(SIMPL_NEW_INT_VEC2_FP("Range (XY)", Range, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_INT_VEC3_FP("Dimensions (XYZ)", Dimensions, FilterParameter::Category::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_INT_VEC2_FP("Range (XY)", Range, FilterParameter::Category::Parameter, GenericExample));
 
-  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SIMPL_NEW_RANGE_FP("Initialization Range", InitRange, FilterParameter::Category::Parameter, GenericExample));
 
-  parameters.push_back(SIMPL_NEW_SecondO_POLY_FP("Second Order A Coefficients", SecondOrderACoeff, FilterParameter::Parameter, GenericExample, 0));
+  parameters.push_back(SIMPL_NEW_SecondO_POLY_FP("Second Order A Coefficients", SecondOrderACoeff, FilterParameter::Category::Parameter, GenericExample, 0));
 
-  parameters.push_back(SIMPL_NEW_ThirdO_POLY_FP("Third Order A Coefficients", ThirdOrderACoeff, FilterParameter::Parameter, GenericExample, 1));
+  parameters.push_back(SIMPL_NEW_ThirdO_POLY_FP("Third Order A Coefficients", ThirdOrderACoeff, FilterParameter::Category::Parameter, GenericExample, 1));
 
-  parameters.push_back(SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::CreatedArray, GenericExample, "PhaseCount", "InputPhaseTypesArrayPath"));
+  parameters.push_back(SIMPL_NEW_SHAPETYPE_SELECTION_FP("Shape Types", ShapeTypeData, FilterParameter::Category::CreatedArray, GenericExample, "PhaseCount", "InputPhaseTypesArrayPath"));
 
   {
     DataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Parameter, GenericExample, req));
+    parameters.push_back(SIMPL_NEW_DA_SELECTION_FP("Feature Ids", FeatureIdsArrayPath, FilterParameter::Category::Parameter, GenericExample, req));
   }
 
   {
     DataContainerArrayProxy proxy;
-    parameters.push_back(SIMPL_NEW_DCA_PROXY_FP("Array to Select", DcaProxy, FilterParameter::Parameter, GenericExample, proxy, Qt::Checked));
+    parameters.push_back(SIMPL_NEW_DCA_PROXY_FP("Array to Select", DcaProxy, FilterParameter::Category::Parameter, GenericExample, proxy, Qt::Checked));
   }
 
-  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::CreatedArray, GenericExample));
+  parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::Category::CreatedArray, GenericExample));
 
   {
     QStringList linkedProps;
     linkedProps << "Bool2"
                 << "Double2";
-    parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Parameter, GenericExample, linkedProps));
-    parameters.push_back(SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Parameter, GenericExample));
+    parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Category::Parameter, GenericExample, linkedProps));
+    parameters.push_back(SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Category::Parameter, GenericExample));
   }
 
-  parameters.push_back(SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::CreatedArray, GenericExample, "DataArrayList"));
+  parameters.push_back(SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::Category::CreatedArray, GenericExample, "DataArrayList"));
 
   {
     QStringList linkedProps;
     linkedProps << "AttributeMatrixPath";
-    parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool2", Bool2, FilterParameter::Parameter, GenericExample, linkedProps));
+    parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool2", Bool2, FilterParameter::Category::Parameter, GenericExample, linkedProps));
   }
   {
     AttributeMatrixSelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", AttributeMatrixPath, FilterParameter::Parameter, GenericExample, req));
+    parameters.push_back(SIMPL_NEW_AM_SELECTION_FP("Attribute Matrix", AttributeMatrixPath, FilterParameter::Category::Parameter, GenericExample, req));
   }
   {
     AttributeMatrixCreationFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::CreatedArray, GenericExample, req));
+    parameters.push_back(SIMPL_NEW_AM_CREATION_FP("Created Attribute Matrix", CreatedAttributeMatrix, FilterParameter::Category::CreatedArray, GenericExample, req));
   }
-  parameters.push_back(SeparatorFilterParameter::New("Linked Combo Box Example (1)", FilterParameter::Parameter));
+  parameters.push_back(SeparatorFilterParameter::Create("Linked Combo Box Example (1)", FilterParameter::Category::Parameter));
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Select Distance Metric");
@@ -245,21 +245,21 @@ void GenericExample::setupFilterParameters()
                 << "InputPath";
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
 
     /*  For an Integer use this code*/
-    parameters.push_back(SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Parameter, GenericExample, 0)); /*  For a Floating point value use this code*/
-    parameters.push_back(SIMPL_NEW_DOUBLE_FP("Misorientation Tolerance", MisorientationTolerance, FilterParameter::Parameter, GenericExample, 1));
+    parameters.push_back(SIMPL_NEW_INTEGER_FP("Max Iterations", MaxIterations, FilterParameter::Category::Parameter, GenericExample, 0)); /*  For a Floating point value use this code*/
+    parameters.push_back(SIMPL_NEW_DOUBLE_FP("Misorientation Tolerance", MisorientationTolerance, FilterParameter::Category::Parameter, GenericExample, 1));
     /*   For an input file use this code*/
-    parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Parameter, GenericExample, "*.txt", "", 1));
+    parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 1));
     /*   For an input path use this code*/
-    parameters.push_back(SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Parameter, GenericExample, "*.txt", "", 2));
+    parameters.push_back(SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 2));
   }
 
   //------------------
 
-  parameters.push_back(SeparatorFilterParameter::New("Linked Combo Box Example (2)", FilterParameter::Parameter));
+  parameters.push_back(SeparatorFilterParameter::Create("Linked Combo Box Example (2)", FilterParameter::Category::Parameter));
 
   /*   For presenting a set of choices to the user use this code*/
   {
@@ -283,24 +283,24 @@ void GenericExample::setupFilterParameters()
                 << "DataContainerName";
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
-    parameter->setCategory(FilterParameter::Parameter);
+    parameter->setCategory(FilterParameter::Category::Parameter);
     parameters.push_back(parameter);
 
     {
       DataArrayCreationFilterParameter::RequirementType req;
-      parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Data Array", CreatedDataArray, FilterParameter::Parameter, GenericExample, req, 0));
+      parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Data Array", CreatedDataArray, FilterParameter::Category::Parameter, GenericExample, req, 0));
     }
     /* Display a group of 3 text boxes to collect 3 float values */
-    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Parameter, GenericExample, 1));
+    parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, GenericExample, 1));
 
     /* Display the AxisAngleWidget to collect Axis-Angle pairs from the user */
-    parameters.push_back(SIMPL_NEW_AXISANGLE_FP("Crystal Rotations", CrystalSymmetryRotations, FilterParameter::Parameter, GenericExample, 2));
+    parameters.push_back(SIMPL_NEW_AXISANGLE_FP("Crystal Rotations", CrystalSymmetryRotations, FilterParameter::Category::Parameter, GenericExample, 2));
 
-    parameters.push_back(SIMPL_NEW_FourthO_POLY_FP("Fourth Order A Coefficients", FourthOrderACoeff, FilterParameter::Parameter, GenericExample, 2));
+    parameters.push_back(SIMPL_NEW_FourthO_POLY_FP("Fourth Order A Coefficients", FourthOrderACoeff, FilterParameter::Category::Parameter, GenericExample, 2));
 
     {
       DataContainerSelectionFilterParameter::RequirementType req;
-      parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Parameter, GenericExample, req, 2));
+      parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container", DataContainerName, FilterParameter::Category::Parameter, GenericExample, req, 2));
     }
   }
   QVector<DataArrayPath> paths;
@@ -309,11 +309,11 @@ void GenericExample::setupFilterParameters()
 
   {
     MultiDataArraySelectionFilterParameter::RequirementType req;
-    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Parameter, GenericExample, req, 0));
+    parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Multi Data Array Test", SelectedMultiArrayPaths, FilterParameter::Category::Parameter, GenericExample, req, 0));
   }
 
-  parameters.push_back(SeparatorFilterParameter::New("Montage Selection Example", FilterParameter::Parameter));
-  parameters.push_back(SIMPL_NEW_MONTAGE_SELECTION_FP("Montage Selection", MontageSelection, FilterParameter::Parameter, GenericExample));
+  parameters.push_back(SeparatorFilterParameter::Create("Montage Selection Example", FilterParameter::Category::Parameter));
+  parameters.push_back(SIMPL_NEW_MONTAGE_SELECTION_FP("Montage Selection", MontageSelection, FilterParameter::Category::Parameter, GenericExample));
 
   setFilterParameters(parameters);
 }
@@ -531,13 +531,13 @@ int GenericExample::getMaxIterations() const
 }
 
 // -----------------------------------------------------------------------------
-void GenericExample::setSecondOrderACoeff(const Float2ndOrderPoly_t& value)
+void GenericExample::setSecondOrderACoeff(const Float2ndOrderPolynomial& value)
 {
   m_SecondOrderACoeff = value;
 }
 
 // -----------------------------------------------------------------------------
-Float2ndOrderPoly_t GenericExample::getSecondOrderACoeff() const
+Float2ndOrderPolynomial GenericExample::getSecondOrderACoeff() const
 {
   return m_SecondOrderACoeff;
 }
@@ -555,13 +555,13 @@ Float3rdOrderPoly_t GenericExample::getThirdOrderACoeff() const
 }
 
 // -----------------------------------------------------------------------------
-void GenericExample::setFourthOrderACoeff(const Float4thOrderPoly_t& value)
+void GenericExample::setFourthOrderACoeff(const Float4thOrderPolynomial& value)
 {
   m_FourthOrderACoeff = value;
 }
 
 // -----------------------------------------------------------------------------
-Float4thOrderPoly_t GenericExample::getFourthOrderACoeff() const
+Float4thOrderPolynomial GenericExample::getFourthOrderACoeff() const
 {
   return m_FourthOrderACoeff;
 }
@@ -819,13 +819,13 @@ FloatVec3Type GenericExample::getOrigin() const
 }
 
 // -----------------------------------------------------------------------------
-void GenericExample::setCrystalSymmetryRotations(const AxisAngleInput_t& value)
+void GenericExample::setCrystalSymmetryRotations(const AxisAngleInput& value)
 {
   m_CrystalSymmetryRotations = value;
 }
 
 // -----------------------------------------------------------------------------
-AxisAngleInput_t GenericExample::getCrystalSymmetryRotations() const
+AxisAngleInput GenericExample::getCrystalSymmetryRotations() const
 {
   return m_CrystalSymmetryRotations;
 }
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 55362ad6d4..9a1f204cfc 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -74,9 +74,9 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(QString StlFilePrefix READ getStlFilePrefix WRITE setStlFilePrefix)
   PYB11_PROPERTY(bool ShowPrefix READ getShowPrefix WRITE setShowPrefix)
   PYB11_PROPERTY(int MaxIterations READ getMaxIterations WRITE setMaxIterations)
-  PYB11_PROPERTY(Float2ndOrderPoly_t SecondOrderACoeff READ getSecondOrderACoeff WRITE setSecondOrderACoeff)
+  PYB11_PROPERTY(Float2ndOrderPolynomial SecondOrderACoeff READ getSecondOrderACoeff WRITE setSecondOrderACoeff)
   PYB11_PROPERTY(Float3rdOrderPoly_t ThirdOrderACoeff READ getThirdOrderACoeff WRITE setThirdOrderACoeff)
-  PYB11_PROPERTY(Float4thOrderPoly_t FourthOrderACoeff READ getFourthOrderACoeff WRITE setFourthOrderACoeff)
+  PYB11_PROPERTY(Float4thOrderPolynomial FourthOrderACoeff READ getFourthOrderACoeff WRITE setFourthOrderACoeff)
   PYB11_PROPERTY(double MisorientationTolerance READ getMisorientationTolerance WRITE setMisorientationTolerance)
   PYB11_PROPERTY(DataArrayPath InputPhaseTypesArrayPath READ getInputPhaseTypesArrayPath WRITE setInputPhaseTypesArrayPath)
   PYB11_PROPERTY(ShapeType::Types ShapeTypeData READ getShapeTypeData WRITE setShapeTypeData)
@@ -98,7 +98,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
   PYB11_PROPERTY(IntVec2Type Range READ getRange WRITE setRange)
   PYB11_PROPERTY(FloatVec3Type Origin READ getOrigin WRITE setOrigin)
-  PYB11_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
+  PYB11_PROPERTY(AxisAngleInput CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
   PYB11_PROPERTY(DataArrayPath FeatureIdsArrayPath READ getFeatureIdsArrayPath WRITE setFeatureIdsArrayPath)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixPath READ getAttributeMatrixPath WRITE setAttributeMatrixPath)
   PYB11_PROPERTY(DataArrayPath CreatedAttributeMatrix READ getCreatedAttributeMatrix WRITE setCreatedAttributeMatrix)
@@ -186,14 +186,14 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief Setter property for SecondOrderACoeff
    */
-  void setSecondOrderACoeff(const Float2ndOrderPoly_t& value);
+  void setSecondOrderACoeff(const Float2ndOrderPolynomial& value);
   /**
    * @brief Getter property for SecondOrderACoeff
    * @return Value of SecondOrderACoeff
    */
-  Float2ndOrderPoly_t getSecondOrderACoeff() const;
+  Float2ndOrderPolynomial getSecondOrderACoeff() const;
 
-  Q_PROPERTY(Float2ndOrderPoly_t SecondOrderACoeff READ getSecondOrderACoeff WRITE setSecondOrderACoeff)
+  Q_PROPERTY(Float2ndOrderPolynomial SecondOrderACoeff READ getSecondOrderACoeff WRITE setSecondOrderACoeff)
 
   /**
    * @brief Setter property for ThirdOrderACoeff
@@ -210,14 +210,14 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief Setter property for FourthOrderACoeff
    */
-  void setFourthOrderACoeff(const Float4thOrderPoly_t& value);
+  void setFourthOrderACoeff(const Float4thOrderPolynomial& value);
   /**
    * @brief Getter property for FourthOrderACoeff
    * @return Value of FourthOrderACoeff
    */
-  Float4thOrderPoly_t getFourthOrderACoeff() const;
+  Float4thOrderPolynomial getFourthOrderACoeff() const;
 
-  Q_PROPERTY(Float4thOrderPoly_t FourthOrderACoeff READ getFourthOrderACoeff WRITE setFourthOrderACoeff)
+  Q_PROPERTY(Float4thOrderPolynomial FourthOrderACoeff READ getFourthOrderACoeff WRITE setFourthOrderACoeff)
 
   /**
    * @brief Setter property for MisorientationTolerance
@@ -474,14 +474,14 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief Setter property for CrystalSymmetryRotations
    */
-  void setCrystalSymmetryRotations(const AxisAngleInput_t& value);
+  void setCrystalSymmetryRotations(const AxisAngleInput& value);
   /**
    * @brief Getter property for CrystalSymmetryRotations
    * @return Value of CrystalSymmetryRotations
    */
-  AxisAngleInput_t getCrystalSymmetryRotations() const;
+  AxisAngleInput getCrystalSymmetryRotations() const;
 
-  Q_PROPERTY(AxisAngleInput_t CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
+  Q_PROPERTY(AxisAngleInput CrystalSymmetryRotations READ getCrystalSymmetryRotations WRITE setCrystalSymmetryRotations)
 
   /**
    * @brief Setter property for FeatureIdsArrayPath
@@ -725,9 +725,9 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   QString m_StlFilePrefix = {};
   bool m_ShowPrefix = {};
   int m_MaxIterations = {};
-  Float2ndOrderPoly_t m_SecondOrderACoeff = {};
+  Float2ndOrderPolynomial m_SecondOrderACoeff = {};
   Float3rdOrderPoly_t m_ThirdOrderACoeff = {};
-  Float4thOrderPoly_t m_FourthOrderACoeff = {};
+  Float4thOrderPolynomial m_FourthOrderACoeff = {};
   double m_MisorientationTolerance = {};
   DataArrayPath m_InputPhaseTypesArrayPath = {};
   ShapeType::Types m_ShapeTypeData = {};
@@ -749,7 +749,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   IntVec3Type m_Dimensions = {};
   IntVec2Type m_Range = {};
   FloatVec3Type m_Origin = {};
-  AxisAngleInput_t m_CrystalSymmetryRotations = {};
+  AxisAngleInput m_CrystalSymmetryRotations = {};
   DataArrayPath m_FeatureIdsArrayPath = {};
   DataArrayPath m_AttributeMatrixPath = {};
   DataArrayPath m_CreatedAttributeMatrix = {};
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 906e860d6e..97553c76c5 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -80,11 +80,11 @@ void MakeDataContainer::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("FeatureIds", FeatureIdsArrayName, DataContainerName, CellAttributeMatrixName, FilterParameter::CreatedArray, MakeDataContainer));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Cell Euler Angles", CellEulerAnglesArrayName, FilterParameter::CreatedArray, MakeDataContainer));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Cell Phases", CellPhasesArrayName, FilterParameter::CreatedArray, MakeDataContainer));
-  parameters.push_back(SIMPL_NEW_STRING_FP("Crystal Structures", CrystalStructuresArrayName, FilterParameter::CreatedArray, MakeDataContainer));
-  parameters.push_back(SIMPL_NEW_STRING_FP("LatticeConstants", LatticeConstantsArrayName, FilterParameter::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_DA_WITH_LINKED_AM_FP("FeatureIds", FeatureIdsArrayName, DataContainerName, CellAttributeMatrixName, FilterParameter::Category::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Cell Euler Angles", CellEulerAnglesArrayName, FilterParameter::Category::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Cell Phases", CellPhasesArrayName, FilterParameter::Category::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_STRING_FP("Crystal Structures", CrystalStructuresArrayName, FilterParameter::Category::CreatedArray, MakeDataContainer));
+  parameters.push_back(SIMPL_NEW_STRING_FP("LatticeConstants", LatticeConstantsArrayName, FilterParameter::Category::CreatedArray, MakeDataContainer));
 
   setFilterParameters(parameters);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index f3fb1b2118..40d6b38400 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -94,8 +94,9 @@ void AttributeMatrixCreationWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
-    stringEdit->setText(str, true);
+    AttributeMatrixCreationFilterParameter::GetterCallbackType getter = m_FilterParameter->getGetterCallback();
+    DataArrayPath dap = getter();
+    stringEdit->setText(dap.serialize(), true);
   }
   blockSignals(false);
 
@@ -139,7 +140,7 @@ void AttributeMatrixCreationWidget::setupGui()
   connect(stringEdit, SIGNAL(valueChanged(const QString&)), this, SIGNAL(parametersChanged()));
 
   m_SelectedDataContainerPath->blockSignals(true);
-  DataArrayPath amPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DataArrayPath>();
+  DataArrayPath amPath = m_FilterParameter->getGetterCallback()();
   m_SelectedDataContainerPath->setText(amPath.getDataContainerName());
   m_SelectedDataContainerPath->setPropertyName(getFilterParameter()->getHumanLabel());
   stringEdit->setText(amPath.getAttributeMatrixName(), true);
@@ -188,10 +189,9 @@ bool AttributeMatrixCreationWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 void AttributeMatrixCreationWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
+    DataArrayPath updatedPath = m_FilterParameter->getGetterCallback()();
     QString amName = updatedPath.getAttributeMatrixName();
     updatedPath.setAttributeMatrixName("");
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index e35b5122a6..e47f705f43 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -119,7 +119,7 @@ void AttributeMatrixSelectionWidget::setupGui()
   connect(m_SelectedAttributeMatrixPath, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
   connect(this, SIGNAL(unlockDataArrayPathSelection(QToolButton*)), m_SelectedAttributeMatrixPath, SLOT(selectionWidgetUnlocked(QToolButton*)));
 
-  DataArrayPath defaultPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DataArrayPath>();
+  DataArrayPath defaultPath = m_FilterParameter->getGetterCallback()();
   m_SelectedAttributeMatrixPath->setText(defaultPath.serialize(Detail::Delimiter));
   m_SelectedAttributeMatrixPath->setPropertyName(getFilterParameter()->getHumanLabel());
 
@@ -166,11 +166,9 @@ bool AttributeMatrixSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 void AttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
-
+    DataArrayPath updatedPath = m_FilterParameter->getGetterCallback()();
     blockSignals(true);
     setSelectedPath(updatedPath);
     blockSignals(false);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index 43d519f59c..9d520eebf2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -90,7 +90,7 @@ void AxisAngleWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-    AxisAngleInput_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<AxisAngleInput_t>();
+    AxisAngleInput data = m_FilterParameter->getGetterCallback()();
     h->setText(loc.toString(data.h));
     k->setText(loc.toString(data.k));
     l->setText(loc.toString(data.l));
@@ -115,8 +115,8 @@ void AxisAngleWidget::filterNeedsInputParameters(AbstractFilter* filter)
   Q_UNUSED(filter)
 
   bool ok = false;
-  AxisAngleInput_t data;
-  AxisAngleInput_t defValue = m_FilterParameter->getDefaultValue().value<AxisAngleInput_t>();
+  AxisAngleInput data;
+  AxisAngleInput defValue = m_FilterParameter->getDefaultValue().value<AxisAngleInput>();
 
   QLabel* errorLabel = nullptr;
   QLocale loc;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index a074dc6d6a..9d9d158c7a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -77,18 +77,7 @@ void BooleanWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QVariant objValue = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    if(objValue.isValid())
-    {
-      value->setChecked(objValue.toBool());
-    }
-    else
-    {
-      QString ss = QObject::tr("Error occurred getting Filter Parameter %1 for filter %2").arg(getFilterParameter()->getPropertyName()).arg(getFilter()->getNameOfClass());
-      emit errorSettingFilterParameter(ss);
-      qDebug() << ss;
-    }
+    value->setChecked(m_FilterParameter->getGetterCallback()());
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index e1744b48b9..3e978434d2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -78,7 +78,7 @@ void CalculatorWidget::setupGui()
   blockSignals(true);
   if(getFilterParameter() != nullptr)
   {
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString str = m_FilterParameter->getGetterCallback()();
     equation->setText(str);
   }
   blockSignals(false);
@@ -459,7 +459,7 @@ void CalculatorWidget::updateDataArrayPath(QString propertyName, const DataArray
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
     QString inputStr = equation->text();
     inputStr.replace(oldPath.getDataArrayName(), newPath.getDataArrayName());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index a81a355749..c1591bf91e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -91,7 +91,7 @@ void ChoiceWidget::setupGui()
       value->blockSignals(false);
     }
     // Get the Default value from the filter
-    int i = getFilter()->property(PROPERTY_NAME_AS_CHAR).toInt();
+    int i = m_FilterParameter->getGetterCallback()();
     value->setCurrentIndex(i);
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index af43f05179..1ab934588f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -336,7 +336,7 @@ void ComparisonSelectionAdvancedWidget::afterPreflight()
 
       if(nullptr == comparisonSetWidget->getAttributeMatrix())
       {
-        ComparisonInputsAdvanced comps = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<ComparisonInputsAdvanced>();
+        ComparisonInputsAdvanced comps = m_FilterParameter->getGetterCallback()();
         comparisonSetWidget->setAttributeMatrix(am);
         comparisonSetWidget->setComparisons(comps.getInputs());
       }
@@ -375,7 +375,7 @@ void ComparisonSelectionAdvancedWidget::populateButtonText()
   QString curAmName = "";
 
   // Get what is in the filter
-  ComparisonInputsAdvanced comps = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<ComparisonInputsAdvanced>();
+  ComparisonInputsAdvanced comps = m_FilterParameter->getGetterCallback()();
 
   QString filtDcName = comps.getDataContainerName();
   QString filtAmName = comps.getAttributeMatrixName();
@@ -472,14 +472,13 @@ void ComparisonSelectionAdvancedWidget::presetAttributeMatrix(DataArrayPath amPa
 // -----------------------------------------------------------------------------
 void ComparisonSelectionAdvancedWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
     DataArrayPath oldPath;
     DataArrayPath newPath;
     std::tie(oldPath, newPath) = renamePath;
 
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    ComparisonInputsAdvanced inputs = var.value<ComparisonInputsAdvanced>();
+    ComparisonInputsAdvanced inputs = m_FilterParameter->getGetterCallback()();
     DataArrayPath amPath = inputs.getAttributeMatrixPath();
     AbstractComparison::Pointer input = inputs[0];
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index 3c16f3509f..c7644c4942 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -39,20 +39,20 @@
 
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
-
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 #include "SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractComparison.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
-#include "SIMPLib/Filtering/AbstractComparison.h"
-#include "SIMPLib/Filtering/ComparisonInputsAdvanced.h"
-
 #include "ui_ComparisonSelectionAdvancedWidget.h"
 
+class ComparisonSelectionAdvancedFilterParameter;
+
 /**
  * @brief The ComparisonSelectionAdvancedWidget class is used to display, edit, and add AbstractComparisons
  * for the ComparisonSelectionAdvancedFilterParameter class.
@@ -178,5 +178,5 @@ protected slots:
 
   bool m_DidCausePreflight;
 
-  ComparisonSelectionAdvancedFilterParameter* m_FilterParameter;
+  ComparisonSelectionAdvancedFilterParameter* m_FilterParameter = nullptr;
 };
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index 172def731b..38efe16325 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -78,10 +78,7 @@ void ConstrainedDoubleWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-    bool ok = false;
-
-    double d = getFilter()->property(PROPERTY_NAME_AS_CHAR).toDouble(&ok);
-    spinBox->setValue(d);
+    spinBox->setValue(m_FilterParameter->getGetterCallback()());
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index cfa27b3ac9..16328f2356 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -78,9 +78,7 @@ void ConstrainedIntWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    int val = getFilter()->property(PROPERTY_NAME_AS_CHAR).toInt();
-    spinBox->setValue(val);
+    spinBox->setValue(m_FilterParameter->getGetterCallback()());
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 4828af96e6..621fc8dd47 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -137,7 +137,7 @@ void DataArrayCreationWidget::setupGui()
   connect(m_SelectedAttributeMatrixPath, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
   connect(this, SIGNAL(unlockDataArrayPathSelection(QToolButton*)), m_SelectedAttributeMatrixPath, SLOT(selectionWidgetUnlocked(QToolButton*)));
 
-  DataArrayPath defaultPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DataArrayPath>();
+  DataArrayPath defaultPath = m_FilterParameter->getGetterCallback()();
   DataArrayPath amPath(defaultPath.getDataContainerName(), defaultPath.getAttributeMatrixName(), "");
   m_SelectedAttributeMatrixPath->setText(amPath.serialize(Detail::Delimiter));
   m_SelectedAttributeMatrixPath->setPropertyName(getFilterParameter()->getHumanLabel());
@@ -186,10 +186,9 @@ bool DataArrayCreationWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 void DataArrayCreationWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
+    DataArrayPath updatedPath = m_FilterParameter->getGetterCallback()();
     QString dataArrayName = updatedPath.getDataArrayName();
     updatedPath.setDataArrayName("");
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index e744e59eba..0c9af050ed 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -139,7 +139,7 @@ void DataArraySelectionWidget::setupGui()
   connect(m_SelectedDataArrayPath, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
   connect(this, SIGNAL(unlockDataArrayPathSelection(QToolButton*)), m_SelectedDataArrayPath, SLOT(selectionWidgetUnlocked(QToolButton*)));
 
-  DataArrayPath defaultPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DataArrayPath>();
+  DataArrayPath defaultPath = m_FilterParameter->getGetterCallback()();
   m_SelectedDataArrayPath->setText(defaultPath.serialize(Detail::Delimiter));
   m_SelectedDataArrayPath->setPropertyName(getFilterParameter()->getHumanLabel());
 
@@ -165,10 +165,9 @@ bool DataArraySelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 void DataArraySelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
+    DataArrayPath updatedPath = m_FilterParameter->getGetterCallback()();
 
     blockSignals(true);
     setSelectedPath(updatedPath);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 984412612a..6c5f856f71 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -133,7 +133,7 @@ void DataContainerArrayProxyWidget::setupGui()
     // Proxy object at which point nothing is going to be put into the lists. But if the Filter was
     // initialized from a pipeline file then it might actually have a proxy so we need to do something
     // with that proxy?
-    m_DcaProxy = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DataContainerArrayProxy>();
+    m_DcaProxy = m_FilterParameter->getGetterCallback()();
     // m_DcaProxy.print("DataContainerArrayProxyWidget::setupGui()");
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index b81832480d..d0f66057bd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -135,10 +135,9 @@ void DataContainerCreationWidget::filterNeedsInputParameters(AbstractFilter* fil
 // -----------------------------------------------------------------------------
 void DataContainerCreationWidget::updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
+    DataArrayPath updatedPath = m_FilterParameter->getGetterCallback()();
     QString dcName = updatedPath.getDataContainerName();
     updatedPath.setDataContainerName("");
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index 69da31c216..e007101361 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -84,12 +84,7 @@ void DoubleWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-    bool ok = false;
-
-    double d = getFilter()->property(PROPERTY_NAME_AS_CHAR).toDouble(&ok);
-    QString str = loc.toString(d);
-
-    //  QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString str = loc.toString(m_FilterParameter->getGetterCallback()());
     value->setText(str);
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index b906fcae68..b1d7b7565f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -145,7 +145,7 @@ void DynamicChoiceWidget::updateComboBox()
       value->addItems(choices);
     }
     // Get the Default value from the filter
-    QString i = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString i = m_FilterParameter->getGetterCallback()();
     int index = value->findText(i);
     value->setCurrentIndex(index);
     value->blockSignals(false);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index b78b083616..0419cc59cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -180,7 +180,7 @@ void DynamicTableWidget::filterNeedsInputParameters(AbstractFilter* filter)
     }
   }
 
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
   data.setTableData(getData());
   data.setRowHeaders(rHeaders);
   data.setColHeaders(cHeaders);
@@ -322,7 +322,7 @@ void DynamicTableWidget::on_addColBtn_clicked()
 // -----------------------------------------------------------------------------
 void DynamicTableWidget::on_deleteRowBtn_clicked()
 {
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   dynamicTable->removeRow(dynamicTable->currentRow());
 
@@ -349,7 +349,7 @@ void DynamicTableWidget::on_deleteRowBtn_clicked()
 // -----------------------------------------------------------------------------
 void DynamicTableWidget::on_deleteColBtn_clicked()
 {
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   dynamicTable->removeColumn(dynamicTable->currentColumn());
 
@@ -377,7 +377,7 @@ void DynamicTableWidget::on_deleteColBtn_clicked()
 void DynamicTableWidget::populateTable()
 {
   // Get what is in the filter
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   if(m_FilterParameter != nullptr)
   {
@@ -470,7 +470,7 @@ void DynamicTableWidget::populateTable()
 // -----------------------------------------------------------------------------
 void DynamicTableWidget::populateHeaders()
 {
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   if(!data.getDynamicRows())
   {
@@ -489,7 +489,7 @@ void DynamicTableWidget::populateHeaders()
 // -----------------------------------------------------------------------------
 void DynamicTableWidget::renumberDynamicHeaders()
 {
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   if(data.getDynamicRows())
   {
@@ -517,7 +517,7 @@ void DynamicTableWidget::renumberDynamicHeaders()
 // -----------------------------------------------------------------------------
 void DynamicTableWidget::updateDynamicButtons()
 {
-  DynamicTableData data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<DynamicTableData>();
+  DynamicTableData data = m_FilterParameter->getGetterCallback()();
 
   // Hide add/remove row buttons if row count is not dynamic
   if(!data.getDynamicRows())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 4bc78adf79..5a5fdcb2a6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -266,7 +266,7 @@ void FileListInfoWidget::getGuiParametersFromFilter()
 {
   blockSignals(true);
 
-  StackFileListInfo data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<StackFileListInfo>();
+  StackFileListInfo data = m_FilterParameter->getGetterCallback()();
 
   m_Ui->inputDir->setText(data.InputPath);
 
@@ -289,7 +289,7 @@ void FileListInfoWidget::getGuiParametersFromFilter()
 // -----------------------------------------------------------------------------
 void FileListInfoWidget::validateInputFile()
 {
-  StackFileListInfo data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<StackFileListInfo>();
+  StackFileListInfo data = m_FilterParameter->getGetterCallback()();
 
   QString currentPath = data.InputPath;
   QFileInfo fi(currentPath);
@@ -312,12 +312,7 @@ void FileListInfoWidget::validateInputFile()
 
     data.InputPath = file;
 
-    QVariant v;
-    v.setValue(data);
-    bool ok = getFilter()->setProperty(PROPERTY_NAME_AS_CHAR, v);
-    if(!ok)
-    {
-    }
+    m_FilterParameter->getSetterCallback()(data);
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index b4d54b4c33..f68ed1d212 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -75,7 +75,7 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
 
   ~FilterParameterWidget() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class Style : EnumType
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index 1230f7f6e9..faffe1ebd8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -92,7 +92,7 @@ void FloatVec2Widget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    FloatVec2Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec2Type>();
+    FloatVec2Type data = m_FilterParameter->getGetterCallback()();
 
     xData->setText(loc.toString(data[0]));
     yData->setText(loc.toString(data[1]));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index 2858d2bcca..7ba758faa3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -96,7 +96,7 @@ void FloatVec3Widget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    FloatVec3Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<FloatVec3Type>();
+    FloatVec3Type data = m_FilterParameter->getGetterCallback()();
 
     xData->setText(loc.toString(data[0]));
     yData->setText(loc.toString(data[1]));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index c877ea368f..f36865e434 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -84,12 +84,7 @@ void FloatWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-    bool ok = false;
-
-    float d = getFilter()->property(PROPERTY_NAME_AS_CHAR).toFloat(&ok);
-    QString str = loc.toString(d);
-
-    //  QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString str = loc.toString(m_FilterParameter->getGetterCallback()());
     value->setText(str);
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index 89dede0d0b..f90478e9cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -96,7 +96,7 @@ void FourthOrderPolynomialWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    Float4thOrderPoly_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<Float4thOrderPoly_t>();
+    Float4thOrderPolynomial data = m_FilterParameter->getGetterCallback()();
     c40->setText(loc.toString(data.c40));
     c04->setText(loc.toString(data.c04));
     c31->setText(loc.toString(data.c31));
@@ -150,8 +150,8 @@ void FourthOrderPolynomialWidget::widgetChanged(const QString& text)
 void FourthOrderPolynomialWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   bool ok = false;
-  Float4thOrderPoly_t data;
-  Float4thOrderPoly_t defValue = m_FilterParameter->getDefaultValue().value<Float4thOrderPoly_t>();
+  Float4thOrderPolynomial data;
+  Float4thOrderPolynomial defValue = m_FilterParameter->getDefaultValue().value<Float4thOrderPolynomial>();
 
   QLocale loc;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index 6c4e2b03ff..940589f435 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -71,11 +71,9 @@ void InputFileWidget::setupGui()
 // -----------------------------------------------------------------------------
 void InputFileWidget::selectInputFile()
 {
-  // QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
   QString Ftype = m_FilterParameter->getFileType();
   QString ext = m_FilterParameter->getFileExtension();
   QString s = Ftype + QString(" Files (") + ext + QString(");;All Files(*.*)");
-  // QString defaultName = m_OpenDialogLastDirectory + QDir::separator() + "Untitled";
   QString file = QFileDialog::getOpenFileName(this, tr("Select Input File"), getValue(), s);
 
   if(file.isEmpty())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 768d246f30..0315446ded 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -56,7 +56,7 @@ InputPathWidget::InputPathWidget(FilterParameter* parameter, AbstractFilter* fil
 
   if(filter != nullptr)
   {
-    QString currentPath = filter->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString currentPath = m_FilterParameter->getGetterCallback()();
     if(!currentPath.isEmpty())
     {
       currentPath = QDir::toNativeSeparators(currentPath);
@@ -89,7 +89,7 @@ void InputPathWidget::setupGui()
 // -----------------------------------------------------------------------------
 void InputPathWidget::selectInputPath()
 {
-  QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+  QString currentPath = m_FilterParameter->getGetterCallback()();
   if(currentPath.isEmpty())
   {
     currentPath = getValue();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 8c213c754d..ae7d3f936c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -83,7 +83,7 @@ void IntVec2Widget::setupGui()
   {
     IntVec2WidgetLabel->setText(getFilterParameter()->getHumanLabel());
 
-    IntVec2Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<IntVec2Type>();
+    IntVec2Type data = m_FilterParameter->getGetterCallback()();
     xData->setText(QString::number(data[0]));
     yData->setText(QString::number(data[1]));
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index 23c6ee71fe..ba36e4faee 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -88,7 +88,7 @@ void IntVec3Widget::setupGui()
   {
     IntVec3WidgetLabel->setText(getFilterParameter()->getHumanLabel());
 
-    IntVec3Type data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<IntVec3Type>();
+    IntVec3Type data = m_FilterParameter->getGetterCallback()();
     xData->setText(QString::number(data[0]));
     yData->setText(QString::number(data[1]));
     zData->setText(QString::number(data[2]));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 8c85d908bd..08b499d10f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -75,14 +75,15 @@ void IntWidget::setupGui()
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
+  QLocale loc = QLocale::system();
+
   QIntValidator* xVal = new QIntValidator(value);
   value->setValidator(xVal);
 
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString str = loc.toString(m_FilterParameter->getGetterCallback()());
     value->setText(str);
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 297bc39ae2..209261333c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -77,18 +77,7 @@ void LinkedBooleanWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QVariant objValue = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    if(objValue.isValid())
-    {
-      value->setChecked(objValue.toBool());
-    }
-    else
-    {
-      QString ss = QObject::tr("Error occurred getting Filter Parameter %1 for filter %2").arg(getFilterParameter()->getPropertyName()).arg(getFilter()->getNameOfClass());
-      emit errorSettingFilterParameter(ss);
-      qDebug() << ss;
-    }
+    value->setChecked(m_FilterParameter->getGetterCallback()());
   }
 }
 
@@ -97,7 +86,6 @@ void LinkedBooleanWidget::setupGui()
 // -----------------------------------------------------------------------------
 void LinkedBooleanWidget::updateLinkedWidgets()
 {
-  // QVariant objValue = getFilter()->property(PROPERTY_NAME_AS_CHAR);
   int state = value->checkState();
   emit conditionalPropertyChanged(state);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index c6100eb3c5..b76f64177e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -118,8 +118,8 @@ void LinkedDataContainerSelectionWidget::setupGui()
   m_MenuMapper = new QSignalMapper(this);
   connect(m_MenuMapper, SIGNAL(mapped(QString)), this, SLOT(dataContainerSelected(QString)));
 
-  QString dcName = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QString>();
-  m_SelectedDataContainerPath->setText(dcName);
+  DataArrayPath dcPath = m_FilterParameter->getGetterCallback()();
+  m_SelectedDataContainerPath->setText(dcPath.getDataContainerName());
 
   changeStyleSheet(Style::FS_STANDARD_STYLE);
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 2d3e157bb3..0651bbf2d9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -65,9 +65,7 @@ void LinkedPathCreationWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
-    stringEdit->setText(str, true);
+    stringEdit->setText(m_FilterParameter->getGetterCallback()(), true);
   }
   blockSignals(false);
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index f76df11a20..7bbf68f0b9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -579,12 +579,13 @@ void MultiAttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyNa
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
-    QString dataArrayName = updatedPath.getDataArrayName();
-    updatedPath.setDataArrayName("");
+    QVector<DataArrayPath> updatedPaths = m_FilterParameter->getGetterCallback()();
+    DataArrayPath& dap = updatedPaths[0];
+    QString dataArrayName = dap.getDataArrayName();
+    dap.setDataArrayName("");
+    updatedPaths[0] = dap;
 
     blockSignals(true);
     DataArrayPath currentPath = DataArrayPath::Deserialize(m_SelectedDataContainerPath->text(), Detail::Delimiter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index df79dbd582..cf596baf24 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -37,13 +37,13 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
+#include "SVWidgetsLib/QtSupport/QtSFaderWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 #include "SVWidgetsLib/ui_MultiAttributeMatrixSelectionWidget.h"
@@ -125,7 +125,7 @@ protected slots:
 private:
   bool m_DidCausePreflight;
 
-  MultiAttributeMatrixSelectionFilterParameter* m_FilterParameter;
+  MultiAttributeMatrixSelectionFilterParameter* m_FilterParameter = nullptr;
 
   void setSelectedPath(QString path);
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index ac9de7c26b..c58f8cb26d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -567,7 +567,7 @@ void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, co
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
     QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
     DataArrayPath updatedPath = var.value<DataArrayPath>();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 9e62c90512..6f6784d6c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -125,7 +125,7 @@ void MultiDataContainerSelectionWidget::setupGui()
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
-  QStringList dcNames = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QStringList>();
+  QStringList dcNames = m_FilterParameter->getGetterCallback()();
   for(int i = 0; i < dcNames.size(); i++)
   {
     QString dcName = dcNames[i];
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index 02b3c1663d..a83e53ad11 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -79,8 +79,8 @@ void NumericTypeWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    int index = getFilter()->property(PROPERTY_NAME_AS_CHAR).toInt();
-    value->setCurrentIndex(index);
+    SIMPL::NumericTypes::Type t = m_FilterParameter->getGetterCallback()();
+    value->setCurrentIndex(static_cast<int>(t));
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
index a6d6c6d624..6f1733b89d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
@@ -71,7 +71,7 @@ void OutputFileWidget::setupGui()
 // -----------------------------------------------------------------------------
 void OutputFileWidget::selectOutputFile()
 {
-  QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+  QString currentPath = m_FilterParameter->getGetterCallback()();
   if(currentPath.isEmpty())
   {
     currentPath = getValue();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index 8231209a25..0158d1c093 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -50,7 +50,7 @@ OutputPathWidget::OutputPathWidget(FilterParameter* parameter, AbstractFilter* f
 
   if(filter != nullptr)
   {
-    QString currentPath = filter->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString currentPath = m_FilterParameter->getGetterCallback()();
     if(!currentPath.isEmpty())
     {
       currentPath = QDir::toNativeSeparators(currentPath);
@@ -85,7 +85,7 @@ void OutputPathWidget::setupGui()
 // -----------------------------------------------------------------------------
 void OutputPathWidget::selectOutputPath()
 {
-  QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+  QString currentPath = m_FilterParameter->getGetterCallback()();
   if(currentPath.isEmpty())
   {
     currentPath = getValue();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index f8017458cf..082ea2f103 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -63,7 +63,7 @@ void ParagraphWidget::setupGui()
   blockSignals(true);
   if(getFilterParameter() != nullptr)
   {
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString str = m_FilterParameter->getGetterCallback()();
     textEdit->setText(str);
   }
   blockSignals(false);
@@ -77,15 +77,7 @@ void ParagraphWidget::setupGui()
   // Catch when the filter wants its values updated
   connect(getFilter(), &AbstractFilter::updateFilterParameters, this, &ParagraphWidget::filterNeedsInputParameters);
 
-  connect(textEdit, &QTextEdit::textChanged, [=]() {
-    AbstractFilter* filter = this->getFilter();
-    bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, textEdit->toHtml());
-    if(!ok)
-    {
-      qDebug() << "ParagraphWidget: Could not set value of filter parameter '" << getFilterParameter()->getHumanLabel() << "' of filter '" << filter->getHumanLabel()
-               << "' to the current contents of the QTextEdit widget";
-    }
-  });
+  connect(textEdit, &QTextEdit::textChanged, [=]() { m_FilterParameter->getSetterCallback()(textEdit->toHtml()); });
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index d081ae80f1..535dfedaac 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -188,8 +188,9 @@ bool PhaseTypeSelectionWidget::eventFilter(QObject* obj, QEvent* event)
 // -----------------------------------------------------------------------------
 void PhaseTypeSelectionWidget::updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath)
 {
-  if(propertyName.compare(PROPERTY_NAME_AS_CHAR) == 0)
+  if(propertyName == getFilterParameter()->getPropertyName())
   {
+    //    PhaseType::Types t = m_FilterParameter->getGetterCallback()();
     QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
     DataArrayPath updatedPath = var.value<DataArrayPath>();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index e435aa3c02..81ba76cb69 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -76,9 +76,7 @@ void PreflightUpdatedValueWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
-    value->setText(str);
+    value->setText(m_FilterParameter->getGetterCallback()());
   }
   blockSignals(false);
 }
@@ -103,15 +101,5 @@ void PreflightUpdatedValueWidget::beforePreflight()
 // -----------------------------------------------------------------------------
 void PreflightUpdatedValueWidget::afterPreflight()
 {
-  QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-  if(var.isValid())
-  {
-    value->setText(var.toString());
-  }
-  else
-  {
-    QString ss = QObject::tr("Error occurred getting Filter Parameter %1").arg(getFilterParameter()->getPropertyName());
-    emit errorSettingFilterParameter(ss);
-    qDebug() << ss;
-  }
+  value->setText(m_FilterParameter->getGetterCallback()());
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index a9b51bd8ae..2435517a35 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -521,7 +521,7 @@ void ReadASCIIDataWidget::updateDataArrayPath(QString propertyName, const DataAr
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  if(m_ImportWizard != nullptr && propertyName.compare(getFilterParameter()->getPropertyName()) == 0)
+  if(m_ImportWizard != nullptr && propertyName == getFilterParameter()->getPropertyName())
   {
     m_ImportWizard->updateDataArrayPath(renamePath);
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index b19b55961f..e8a2af7a46 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -78,9 +78,8 @@ void ScalarTypeWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    int index = getFilter()->property(PROPERTY_NAME_AS_CHAR).toInt();
-    value->setCurrentIndex(index);
+    SIMPL::ScalarTypes::Type t = m_FilterParameter->getGetterCallback()();
+    value->setCurrentIndex(static_cast<int>(t));
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index 4e4a889ffa..bb18c58311 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -94,7 +94,7 @@ void SecondOrderPolynomialWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    Float2ndOrderPoly_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<Float2ndOrderPoly_t>();
+    Float2ndOrderPolynomial data = m_FilterParameter->getGetterCallback()();
     c20->setText(loc.toString(data.c20));
     c02->setText(loc.toString(data.c02));
     c11->setText(loc.toString(data.c11));
@@ -130,8 +130,8 @@ void SecondOrderPolynomialWidget::widgetChanged(const QString& text)
 void SecondOrderPolynomialWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
   bool ok = false;
-  Float2ndOrderPoly_t data;
-  Float2ndOrderPoly_t defValue = m_FilterParameter->getDefaultValue().value<Float2ndOrderPoly_t>();
+  Float2ndOrderPolynomial data;
+  Float2ndOrderPolynomial defValue = m_FilterParameter->getDefaultValue().value<Float2ndOrderPolynomial>();
 
   QLocale loc;
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index 5d16156572..e42e755cad 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -142,7 +142,7 @@ void ShapeTypeSelectionWidget::updateComboBoxes()
     numPhases = 0;
   }
 
-  ShapeType::Types shapeTypesFromFilter = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<ShapeType::Types>();
+  ShapeType::Types shapeTypesFromFilter = m_FilterParameter->getGetterCallback()();
   if(shapeTypesFromFilter.size() > 1 && numPhases <= 0)
   {
     numPhases = shapeTypesFromFilter.size();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index 03320ee814..b5d62e9946 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -67,9 +67,7 @@ void StringWidget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
-    stringEdit->setText(str, true);
+    stringEdit->setText(m_FilterParameter->getGetterCallback()(), true);
   }
   blockSignals(false);
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index a83ea31f45..07ab4f9309 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -91,7 +91,7 @@ void ThirdOrderPolynomialWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    Float3rdOrderPoly_t data = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<Float3rdOrderPoly_t>();
+    Float3rdOrderPoly_t data = m_FilterParameter->getGetterCallback()();
     c30->setText(loc.toString(data.c30));
     c03->setText(loc.toString(data.c03));
     c21->setText(loc.toString(data.c21));
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index a70a6ca8a3..cf8edc3f22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -80,8 +80,8 @@ void UInt64Widget::setupGui()
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
-
-    QString str = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    uint64_t ui64 = m_FilterParameter->getGetterCallback()();
+    QString str = QString::number(ui64);
     value->setText(str);
   }
 }
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.h b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
index f9828da480..ad3d89a1d6 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
@@ -52,7 +52,7 @@ class SVWidgetsLib_EXPORT DataStructureItem
     Path
   };
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class ItemType : EnumType
   {
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index ad7b78c263..4c65db4876 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -63,7 +63,7 @@ class SVWidgetsLib_EXPORT DataStructureModel : public QStandardItemModel
   DataStructureModel(QObject* parent = nullptr);
   ~DataStructureModel() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class IndexState : EnumType
   {
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 7b2c953b99..ec5f7f2d89 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -330,19 +330,19 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
     }
 
     // Determine which group box to add the widget into
-    if(parameter->getCategory() == FilterParameter::Parameter)
+    if(parameter->getCategory() == FilterParameter::Category::Parameter)
     {
       filterParameterWidget->setParent(m_VariablesWidget);
       pLayout->addWidget(filterParameterWidget);
       pCount++;
     }
-    else if(parameter->getCategory() == FilterParameter::RequiredArray)
+    else if(parameter->getCategory() == FilterParameter::Category::RequiredArray)
     {
       filterParameterWidget->setParent(m_VariablesWidget);
       rLayout->addWidget(filterParameterWidget);
       rCount++;
     }
-    else if(parameter->getCategory() == FilterParameter::CreatedArray)
+    else if(parameter->getCategory() == FilterParameter::Category::CreatedArray)
     {
       filterParameterWidget->setParent(m_VariablesWidget);
       cLayout->addWidget(filterParameterWidget);
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.h b/Source/SVWidgetsLib/Widgets/PipelineItem.h
index e082e9982f..d8c19ebd9d 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.h
@@ -199,7 +199,7 @@ class SVWidgetsLib_EXPORT PipelineItem
     Contents
   };
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class WidgetState : EnumType
   {
diff --git a/Source/SVWidgetsLib/Widgets/PopUpWidget.h b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
index 2467a60f06..b068538c8c 100644
--- a/Source/SVWidgetsLib/Widgets/PopUpWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PopUpWidget.h
@@ -48,7 +48,7 @@ class SVWidgetsLib_EXPORT PopUpWidget : public QWidget, private Ui::PopUpWidget
   PopUpWidget(QWidget* parent = Q_NULLPTR);
   ~PopUpWidget() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class ArrowOrientation : EnumType
   {
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
index 6ea73d38d6..4a4cb60419 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
@@ -51,7 +51,7 @@ class SVWidgetsLib_EXPORT StatusBarWidget : public QFrame, private Ui::StatusBar
   StatusBarWidget(QWidget* parent = nullptr);
   ~StatusBarWidget() override;
 
-  using EnumType = unsigned int;
+  using EnumType = uint32_t;
 
   enum class Button : EnumType
   {
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index 7a706e88be..a5da9e37b4 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -30,29 +30,6 @@ registerSIMPLArray<int32_t, 6>(mod, "IntVec6");
 
 py::implicitly_convertible<QString, DataArrayPath>();
 
-py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
-    .def(py::init<float, float, float, float>())
-    .def_readwrite("angle", &AxisAngleInput_t::angle)
-    .def_readwrite("h", &AxisAngleInput_t::h)
-    .def_readwrite("k", &AxisAngleInput_t::k)
-    .def_readwrite("l", &AxisAngleInput_t::l);
-
-py::class_<StackFileListInfo>(mod, "FileListInfo")
-    .def(py::init<>([](int32_t paddingDigits, uint32_t ordering, int32_t startIndex, int32_t endIndex, int32_t incrementIndex, const QString& inputPath, const QString& filePrefix,
-                       const QString& fileSuffix, const QString& fileExtension) {
-      StackFileListInfo fileListInfo;
-      fileListInfo.PaddingDigits = paddingDigits;
-      fileListInfo.Ordering = ordering;
-      fileListInfo.StartIndex = startIndex;
-      fileListInfo.EndIndex = endIndex;
-      fileListInfo.IncrementIndex = incrementIndex;
-      fileListInfo.InputPath = inputPath;
-      fileListInfo.FilePrefix = filePrefix;
-      fileListInfo.FileSuffix = fileSuffix;
-      fileListInfo.FileExtension = fileExtension;
-      return fileListInfo;
-    }));
-
 py::class_<QSet<QString>>(mod, "StringSet").def(py::init<>([](py::set stringSet) {
   QSet<QString> newQStringSet = QSet<QString>();
   for(auto newString : stringSet)
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
index 85d57b78ae..273ce8829c 100644
--- a/Wrapping/Python/Binding/pySIMPLHeader.cpp
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -15,9 +15,6 @@
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
-#include "SIMPLib/FilterParameters/AxisAngleInput.h"
-#include "SIMPLib/FilterParameters/StackFileListInfo.h"
-#include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
 #include "SIMPLib/Utilities/PythonSupport.h"
 
 namespace py = pybind11;
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
index 3331de4abd..b658801645 100644
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
@@ -326,7 +326,7 @@ PYBIND11_MODULE(dream3d, m)
   PYB11_DEFINE_SIMPLARRAY_6_INIT(float, FloatVec6Type)
   PYB11_DEFINE_SIMPLARRAY_6_INIT(int32_t, IntVec6Type)
 
-  py::class_<AxisAngleInput_t>(mod, "AxisAngleInput")
+  py::class_<AxisAngleInput>(mod, "AxisAngleInput")
     .def(py::init< const float &, const float &, const float &, const float &>())
   ;
 

From a8c1fa9d2228e43323f45a6a9a4aeb1b87a17af6 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 15 Feb 2021 16:30:06 -0500
Subject: [PATCH 335/397] Removed leftover comment in AttributeMatrix.cpp

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/DataContainers/AttributeMatrix.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 3f3d638794..a04d2306ed 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -258,7 +258,7 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
         if(req != nullptr)
         {
           AttributeMatrix::Types amTypes = req->getAMTypes();
-          if(amTypes.empty() || SIMPL::contains(amTypes, static_cast<AttributeMatrix::Type>(amTypeTmp))) // amTypes.contains(static_cast<AttributeMatrix::Type>(amTypeTmp)))
+          if(amTypes.empty() || SIMPL::contains(amTypes, static_cast<AttributeMatrix::Type>(amTypeTmp)))
           {
             amProxy.setFlag(Qt::Checked);
           }

From bd396e04c4a4ee66a565c55f819e2b547e3ba36e Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 15 Feb 2021 16:51:41 -0500
Subject: [PATCH 336/397] Updated PYB11_STATIC_CREATION to allow for no
 arguments case

* Binds directly to static factory function

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/generate_python_bindings.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 4024696a85..2e2094c6e3 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -107,10 +107,13 @@ def generate_bindings(self) -> str:
       code += f'  .def_static(\"New\", &{self.name}::New)\n'
 
     for static_new_method in self.static_creation_methods:
-      args = ', '.join([f'{arg} var_{i}' for i, arg in enumerate(static_new_method.args)])
-      values = ', '.join([f'var_{i}' for i, arg in enumerate(static_new_method.args)])
+      if static_new_method.args:
+        args = ', '.join([f'{arg} var_{i}' for i, arg in enumerate(static_new_method.args)])
+        values = ', '.join([f'var_{i}' for i, arg in enumerate(static_new_method.args)])
 
-      code += f'  .def(py::init([]({args}) {{\n      return {self.name}::{static_new_method.name}({values});\n    }}))\n'
+        code += f'  .def(py::init([]({args}) {{\n      return {self.name}::{static_new_method.name}({values});\n    }}))\n'
+      else:
+        code += f'  .def(py::init(&{self.name}::{static_new_method.name}))\n'
       if not static_new_method.is_overload:
         code += f'  .def_static(\"{static_new_method.name}\", &{self.name}::{static_new_method.name})\n'
 

From 374ef21dab280c71e723ec6638a56587ca8641dd Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 15 Feb 2021 23:46:58 -0500
Subject: [PATCH 337/397] Changed filter parameter bindings to derive from
 FilterParameter

* Removed arguments from PY11_STATIC_CREATION in filter parameters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameters/AttributeMatrixCreationFilterParameter.h | 4 ++--
 .../AttributeMatrixSelectionFilterParameter.h                 | 4 ++--
 Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h    | 4 ++--
 Source/SIMPLib/FilterParameters/BooleanFilterParameter.h      | 4 ++--
 Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h       | 4 ++--
 .../ComparisonSelectionAdvancedFilterParameter.h              | 4 ++--
 .../FilterParameters/ComparisonSelectionFilterParameter.h     | 4 ++--
 .../FilterParameters/ConstrainedDoubleFilterParameter.h       | 4 ++--
 Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h  | 4 ++--
 .../FilterParameters/DataArrayCreationFilterParameter.h       | 4 ++--
 .../FilterParameters/DataArraySelectionFilterParameter.h      | 4 ++--
 .../FilterParameters/DataContainerArrayProxyFilterParameter.h | 4 ++--
 .../FilterParameters/DataContainerCreationFilterParameter.h   | 4 ++--
 .../DataContainerGridSelectionFilterParameter.h               | 4 ++--
 .../FilterParameters/DataContainerReaderFilterParameter.h     | 4 ++--
 .../FilterParameters/DataContainerSelectionFilterParameter.h  | 4 ++--
 Source/SIMPLib/FilterParameters/DoubleFilterParameter.h       | 4 ++--
 .../SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h | 4 ++--
 Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h | 4 ++--
 Source/SIMPLib/FilterParameters/FloatFilterParameter.h        | 4 ++--
 Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h    | 4 ++--
 Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h    | 4 ++--
 .../FilterParameters/FourthOrderPolynomialFilterParameter.h   | 4 ++--
 .../FilterParameters/GenerateColorTableFilterParameter.h      | 4 ++--
 .../FilterParameters/ImportHDF5DatasetFilterParameter.h       | 4 ++--
 Source/SIMPLib/FilterParameters/InputFileFilterParameter.h    | 4 ++--
 Source/SIMPLib/FilterParameters/InputPathFilterParameter.h    | 4 ++--
 Source/SIMPLib/FilterParameters/IntFilterParameter.h          | 4 ++--
 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h      | 4 ++--
 Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h      | 4 ++--
 .../SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h   | 4 ++--
 .../SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h   | 4 ++--
 .../LinkedDataContainerSelectionFilterParameter.h             | 4 ++--
 .../FilterParameters/LinkedPathCreationFilterParameter.h      | 4 ++--
 .../FilterParameters/MontageSelectionFilterParameter.h        | 4 ++--
 .../MontageStructureSelectionFilterParameter.h                | 4 ++--
 .../MultiAttributeMatrixSelectionFilterParameter.h            | 4 ++--
 .../FilterParameters/MultiDataArraySelectionFilterParameter.h | 4 ++--
 .../MultiDataContainerSelectionFilterParameter.h              | 4 ++--
 .../SIMPLib/FilterParameters/MultiInputFileFilterParameter.h  | 4 ++--
 Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h  | 4 ++--
 Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h    | 4 ++--
 .../FilterParameters/PhaseTypeSelectionFilterParameter.h      | 2 +-
 .../FilterParameters/PreflightUpdatedValueFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/RangeFilterParameter.h        | 4 ++--
 .../SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h   | 4 ++--
 .../FilterParameters/SecondOrderPolynomialFilterParameter.h   | 4 ++--
 Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h    | 4 ++--
 .../FilterParameters/ShapeTypeSelectionFilterParameter.h      | 4 ++--
 Source/SIMPLib/FilterParameters/StringFilterParameter.h       | 4 ++--
 .../FilterParameters/ThirdOrderPolynomialFilterParameter.h    | 4 ++--
 Source/SIMPLib/FilterParameters/UInt64FilterParameter.h       | 4 ++--
 Source/SIMPLib/FilterParameters/UnknownFilterParameter.h      | 4 ++--
 59 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 085c2c5299..d9436e94fb 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -69,9 +69,9 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(AttributeMatrixCreationFilterParameter)
+  PYB11_BEGIN_BINDINGS(AttributeMatrixCreationFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(AttributeMatrixCreationFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category AttributeMatrixCreationFilterParameter::SetterCallbackType AttributeMatrixCreationFilterParameter::GetterCallbackType AttributeMatrixCreationFilterParameter::RequirementType int)
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index b26e2d5e3e..dd436cf018 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -68,9 +68,9 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(AttributeMatrixSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(AttributeMatrixSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(AttributeMatrixSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category AttributeMatrixSelectionFilterParameter::SetterCallbackType AttributeMatrixSelectionFilterParameter::GetterCallbackType AttributeMatrixSelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index 9e9fe6d078..9f74baca46 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(AxisAngleFilterParameter)
+  PYB11_BEGIN_BINDINGS(AxisAngleFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(AxisAngleFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString AxisAngleInput FilterParameter::Category AxisAngleFilterParameter::SetterCallbackType AxisAngleFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index f41bd78032..84acad21bd 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(BooleanFilterParameter)
+  PYB11_BEGIN_BINDINGS(BooleanFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(BooleanFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString bool FilterParameter::Category BooleanFilterParameter::SetterCallbackType BooleanFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 556d8ac376..1e72a6e1af 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(CalculatorFilterParameter)
+  PYB11_BEGIN_BINDINGS(CalculatorFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(CalculatorFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category CalculatorFilterParameter::SetterCallbackType CalculatorFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index 53dc3fd405..0dfe5bf232 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ChoiceFilterParameter)
+  PYB11_BEGIN_BINDINGS(ChoiceFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ChoiceFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category ChoiceFilterParameter::SetterCallbackType ChoiceFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 7c62c308e2..6e7b577fef 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -68,9 +68,9 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ComparisonSelectionAdvancedFilterParameter)
+  PYB11_BEGIN_BINDINGS(ComparisonSelectionAdvancedFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ComparisonSelectionAdvancedFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString ComparisonInputsAdvanced FilterParameter::Category ComparisonSelectionAdvancedFilterParameter::SetterCallbackType ComparisonSelectionAdvancedFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index 022325565d..5fe971a642 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -67,9 +67,9 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ComparisonSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(ComparisonSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ComparisonSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString ComparisonInputs FilterParameter::Category ComparisonSelectionFilterParameter::SetterCallbackType ComparisonSelectionFilterParameter::GetterCallbackType QVector<QString> bool int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 5a7cb96906..d91f150edf 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public ConstrainedFilter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ConstrainedDoubleFilterParameter)
+  PYB11_BEGIN_BINDINGS(ConstrainedDoubleFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ConstrainedDoubleFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString double double double FilterParameter::Category ConstrainedDoubleFilterParameter::SetterCallbackType ConstrainedDoubleFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
index 08f725ef69..d36738ee90 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -45,7 +45,7 @@ class SIMPLib_EXPORT ConstrainedFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-//  PYB11_BEGIN_BINDINGS(ConstrainedFilterParameter)
+//  PYB11_BEGIN_BINDINGS(ConstrainedFilterParameter SUPERCLASS FilterParameter)
 //  PYB11_SHARED_POINTERS(ConstrainedFilterParameter)
 //  PYB11_STATIC_CREATION(Create)
 //  PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index 364aa240b1..1c2ad27a0f 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public ConstrainedFilterPar
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ConstrainedIntFilterParameter)
+  PYB11_BEGIN_BINDINGS(ConstrainedIntFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ConstrainedIntFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString int32_t int32_t int32_t FilterParameter::Category ConstrainedIntFilterParameter::SetterCallbackType ConstrainedIntFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 3c3dc52cdd..48936d890e 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -70,9 +70,9 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataArrayCreationFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataArrayCreationFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataArrayCreationFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataArrayCreationFilterParameter::SetterCallbackType DataArrayCreationFilterParameter::GetterCallbackType DataArrayCreationFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 068f60d6ab..31ff2307e6 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -71,9 +71,9 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataArraySelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataArraySelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataArraySelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataArraySelectionFilterParameter::SetterCallbackType DataArraySelectionFilterParameter::GetterCallbackType DataArraySelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index 1ab8b1fdfc..d249cd031b 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataContainerArrayProxyFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataContainerArrayProxyFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerArrayProxyFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataContainerArrayProxy FilterParameter::Category DataContainerArrayProxyFilterParameter::SetterCallbackType DataContainerArrayProxyFilterParameter::GetterCallbackType DataContainerArrayProxy Qt::CheckState int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index 01c6af876d..ef052015a9 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataContainerCreationFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataContainerCreationFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerCreationFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataContainerCreationFilterParameter::SetterCallbackType DataContainerCreationFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
index 4c951ec9fd..89b7693c5e 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterPa
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataContainerGridSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataContainerGridSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerGridSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataContainerGrid FilterParameter::Category DataContainerGridSelectionFilterParameter::SetterCallbackType DataContainerGridSelectionFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index 94d4ad13db..9ba03fa2b4 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -51,9 +51,9 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataContainerReaderFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataContainerReaderFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerReaderFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category DataContainerReader* int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 5071bf23da..8b8bc747c6 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -67,9 +67,9 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DataContainerSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(DataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category DataContainerSelectionFilterParameter::SetterCallbackType DataContainerSelectionFilterParameter::GetterCallbackType DataContainerSelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index 535eda7e37..e9d47adee4 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DoubleFilterParameter)
+  PYB11_BEGIN_BINDINGS(DoubleFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DoubleFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString double FilterParameter::Category DoubleFilterParameter::SetterCallbackType DoubleFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index 1ad1a8e09d..5e53801da6 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DynamicChoiceFilterParameter)
+  PYB11_BEGIN_BINDINGS(DynamicChoiceFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DynamicChoiceFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category DynamicChoiceFilterParameter::SetterCallbackType DynamicChoiceFilterParameter::GetterCallbackType QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 066b231469..1d4822890b 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(DynamicTableFilterParameter)
+  PYB11_BEGIN_BINDINGS(DynamicTableFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DynamicTableFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DynamicTableData FilterParameter::Category DynamicTableFilterParameter::SetterCallbackType DynamicTableFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 9b466ac405..67704d3c9b 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -65,9 +65,9 @@
 class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
 {
 
-  PYB11_BEGIN_BINDINGS(FileListInfoFilterParameter)
+  PYB11_BEGIN_BINDINGS(FileListInfoFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(FileListInfoFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString StackFileListInfo FilterParameter::Category FileListInfoFilterParameter::SetterCallbackType FileListInfoFilterParameter::GetterCallbackType)
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
 
 public:
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index ccb0c640eb..7525d320ba 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
 
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(FloatFilterParameter)
+  PYB11_BEGIN_BINDINGS(FloatFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(FloatFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString float FilterParameter::Category FloatFilterParameter::SetterCallbackType FloatFilterParameter::GetterCallbackType int)
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index e3a2618a5f..e6bb953184 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -70,9 +70,9 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(FloatVec2FilterParameter)
+  PYB11_BEGIN_BINDINGS(FloatVec2FilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(FloatVec2FilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString FloatVec2Type FilterParameter::Category FloatVec2FilterParameter::SetterCallbackType FloatVec2FilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 9083c8e707..7a488edc2e 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -70,9 +70,9 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(FloatVec3FilterParameter)
+  PYB11_BEGIN_BINDINGS(FloatVec3FilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(FloatVec3FilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString FloatVec3Type FilterParameter::Category FloatVec3FilterParameter::SetterCallbackType FloatVec3FilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index aaad3961e0..709350e530 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(FourthOrderPolynomialFilterParameter)
+  PYB11_BEGIN_BINDINGS(FourthOrderPolynomialFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(FourthOrderPolynomialFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString Float4thOrderPolynomial FilterParameter::Category FourthOrderPolynomialFilterParameter::SetterCallbackType FourthOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index fd7bdf3bad..8831a60512 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -51,9 +51,9 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(GenerateColorTableFilterParameter)
+  PYB11_BEGIN_BINDINGS(GenerateColorTableFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(GenerateColorTableFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category GenerateColorTable* int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index 516a74e182..49d9ba6e65 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -42,9 +42,9 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ImportHDF5DatasetFilterParameter)
+  PYB11_BEGIN_BINDINGS(ImportHDF5DatasetFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ImportHDF5DatasetFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QVariant QVariant FilterParameter::Category ImportHDF5Dataset* int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index adfef7a18a..761874f432 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(InputFileFilterParameter)
+  PYB11_BEGIN_BINDINGS(InputFileFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(InputFileFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category InputFileFilterParameter::SetterCallbackType InputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index d453aa9ad7..0f5d2aafd5 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(InputPathFilterParameter)
+  PYB11_BEGIN_BINDINGS(InputPathFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(InputPathFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category InputPathFilterParameter::SetterCallbackType InputPathFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 184763259b..9f92885b66 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(IntFilterParameter)
+  PYB11_BEGIN_BINDINGS(IntFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(IntFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category IntFilterParameter::SetterCallbackType IntFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index 9a2d2fc255..17a1580427 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(IntVec2FilterParameter)
+  PYB11_BEGIN_BINDINGS(IntVec2FilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(IntVec2FilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString IntVec2Type FilterParameter::Category IntVec2FilterParameter::SetterCallbackType IntVec2FilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index 20623e3d24..7224784bff 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(IntVec3FilterParameter)
+  PYB11_BEGIN_BINDINGS(IntVec3FilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(IntVec3FilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString IntVec3Type FilterParameter::Category IntVec3FilterParameter::SetterCallbackType IntVec3FilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index 8a51a7ef4e..1a1071f600 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(LinkedBooleanFilterParameter)
+  PYB11_BEGIN_BINDINGS(LinkedBooleanFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(LinkedBooleanFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString bool FilterParameter::Category LinkedBooleanFilterParameter::SetterCallbackType LinkedBooleanFilterParameter::GetterCallbackType QStringList int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index fd1138ccc9..d71228fef0 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -50,9 +50,9 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(LinkedChoicesFilterParameter)
+  PYB11_BEGIN_BINDINGS(LinkedChoicesFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(LinkedChoicesFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString int FilterParameter::Category LinkedChoicesFilterParameter::SetterCallbackType LinkedChoicesFilterParameter::GetterCallbackType QVector<QString> QStringList int)
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index a31e8ec4a3..e2ff73d246 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -63,9 +63,9 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(LinkedDataContainerSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(LinkedDataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(LinkedDataContainerSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString DataArrayPath FilterParameter::Category LinkedDataContainerSelectionFilterParameter::SetterCallbackType LinkedDataContainerSelectionFilterParameter::GetterCallbackType LinkedDataContainerSelectionFilterParameter::RequirementType QStringList int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 8c5b1f13f4..40272ac126 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -123,9 +123,9 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-//  PYB11_BEGIN_BINDINGS(LinkedPathCreationFilterParameter)
+//  PYB11_BEGIN_BINDINGS(LinkedPathCreationFilterParameter SUPERCLASS FilterParameter)
 //  PYB11_SHARED_POINTERS(LinkedPathCreationFilterParameter)
-//  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category LinkedPathCreationFilterParameter::SetterCallbackType LinkedPathCreationFilterParameter::GetterCallbackType std::unique_ptr<ILinkedPath> int )
+//  PYB11_STATIC_CREATION(Create)
 //  PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index c09030b6b2..f036cada07 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MontageSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(MontageSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MontageSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString MontageSelection FilterParameter::Category MontageSelectionFilterParameter::SetterCallbackType MontageSelectionFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
index 4c3014e744..2602e16673 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
@@ -60,9 +60,9 @@ class SIMPLib_EXPORT MontageStructureSelectionFilterParameter : public FilterPar
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MontageStructureSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(MontageStructureSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MontageStructureSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category MontageStructureSelectionFilterParameter::SetterCallbackType MontageStructureSelectionFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 15f43facae..5026384528 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -68,9 +68,9 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MultiAttributeMatrixSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(MultiAttributeMatrixSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiAttributeMatrixSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QVector<DataArrayPath> FilterParameter::Category MultiAttributeMatrixSelectionFilterParameter::SetterCallbackType MultiAttributeMatrixSelectionFilterParameter::GetterCallbackType MultiAttributeMatrixSelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 3e5e4d0dd3..3ce0a10ee4 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -68,9 +68,9 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MultiDataArraySelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(MultiDataArraySelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiDataArraySelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QVector<DataArrayPath> FilterParameter::Category MultiDataArraySelectionFilterParameter::SetterCallbackType MultiDataArraySelectionFilterParameter::GetterCallbackType MultiDataArraySelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 083dd5b1e3..2bb4c0a821 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -69,9 +69,9 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MultiDataContainerSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(MultiDataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QStringList FilterParameter::Category MultiDataContainerSelectionFilterParameter::SetterCallbackType MultiDataContainerSelectionFilterParameter::GetterCallbackType MultiDataContainerSelectionFilterParameter::RequirementType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
index 9cc42539e3..20b078ff60 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
@@ -67,9 +67,9 @@ class SIMPLib_EXPORT MultiInputFileFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(MultiInputFileFilterParameter)
+  PYB11_BEGIN_BINDINGS(MultiInputFileFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiInputFileFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString MultiInputFileFilterParameter::VecString FilterParameter::Category MultiInputFileFilterParameter::SetterCallbackType MultiInputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index 99cc4eea6b..74e9ccb9f3 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(NumericTypeFilterParameter)
+  PYB11_BEGIN_BINDINGS(NumericTypeFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(NumericTypeFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString SIMPL::NumericTypes::Type FilterParameter::Category NumericTypeFilterParameter::SetterCallbackType NumericTypeFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index be8e1a482c..608749921c 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(OutputFileFilterParameter)
+  PYB11_BEGIN_BINDINGS(OutputFileFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(OutputFileFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category OutputFileFilterParameter::SetterCallbackType OutputFileFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index ff1c1e5649..7c7a342f6c 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(OutputPathFilterParameter)
+  PYB11_BEGIN_BINDINGS(OutputPathFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(OutputPathFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category OutputPathFilterParameter::SetterCallbackType OutputPathFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index 0080f95a7a..57847e135a 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -62,9 +62,9 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ParagraphFilterParameter)
+  PYB11_BEGIN_BINDINGS(ParagraphFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ParagraphFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category ParagraphFilterParameter::SetterCallbackType ParagraphFilterParameter::GetterCallbackType bool int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 5fb31f7a9f..6ca5503a16 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -64,7 +64,7 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-//  PYB11_BEGIN_BINDINGS(PhaseTypeSelectionFilterParameter)
+//  PYB11_BEGIN_BINDINGS(PhaseTypeSelectionFilterParameter SUPERCLASS FilterParameter)
 //  PYB11_SHARED_POINTERS(PhaseTypeSelectionFilterParameter)
 //  PYB11_STATIC_CREATION(Create)
 //  PYB11_END_BINDINGS()
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index d6651b5a7d..e0e6ed8472 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -62,9 +62,9 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(PreflightUpdatedValueFilterParameter)
+  PYB11_BEGIN_BINDINGS(PreflightUpdatedValueFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(PreflightUpdatedValueFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category PreflightUpdatedValueFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 831bdf9fd6..f9f090f38f 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -67,9 +67,9 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(RangeFilterParameter)
+  PYB11_BEGIN_BINDINGS(RangeFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(RangeFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString FPRangePair FilterParameter::Category RangeFilterParameter::SetterCallbackType RangeFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 56cf794674..7d573917d2 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -45,9 +45,9 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ReadASCIIDataFilterParameter)
+  PYB11_BEGIN_BINDINGS(ReadASCIIDataFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ReadASCIIDataFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QVariant FilterParameter::Category int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index f85ca53e8b..0cbb024943 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ScalarTypeFilterParameter)
+  PYB11_BEGIN_BINDINGS(ScalarTypeFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ScalarTypeFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString SIMPL::ScalarTypes::Type FilterParameter::Category ScalarTypeFilterParameter::SetterCallbackType ScalarTypeFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index f66c757a7b..c4f615cce4 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(SecondOrderPolynomialFilterParameter)
+  PYB11_BEGIN_BINDINGS(SecondOrderPolynomialFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(SecondOrderPolynomialFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString Float2ndOrderPolynomial FilterParameter::Category SecondOrderPolynomialFilterParameter::SetterCallbackType SecondOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
index e49e8727ee..0bba1beb1f 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -47,9 +47,9 @@ class SIMPLib_EXPORT SeparatorFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(SeparatorFilterParameter)
+  PYB11_BEGIN_BINDINGS(SeparatorFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(SeparatorFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString FilterParameter::Category)
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index 8886d3e136..76c0668653 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -66,9 +66,9 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ShapeTypeSelectionFilterParameter)
+  PYB11_BEGIN_BINDINGS(ShapeTypeSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ShapeTypeSelectionFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString ShapeType::Types FilterParameter::Category ShapeTypeSelectionFilterParameter::SetterCallbackType ShapeTypeSelectionFilterParameter::GetterCallbackType QString QString int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 475c2c451b..5a70c349e6 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -64,9 +64,9 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(StringFilterParameter)
+  PYB11_BEGIN_BINDINGS(StringFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(StringFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category StringFilterParameter::SetterCallbackType StringFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index 367aea7a54..bccbc2a038 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -65,9 +65,9 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(ThirdOrderPolynomialFilterParameter)
+  PYB11_BEGIN_BINDINGS(ThirdOrderPolynomialFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(ThirdOrderPolynomialFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString Float3rdOrderPoly_t FilterParameter::Category ThirdOrderPolynomialFilterParameter::SetterCallbackType ThirdOrderPolynomialFilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 61ee0244ed..d1e80ace2d 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -62,9 +62,9 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(UInt64FilterParameter)
+  PYB11_BEGIN_BINDINGS(UInt64FilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(UInt64FilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString uint64_t FilterParameter::Category UInt64FilterParameter::SetterCallbackType UInt64FilterParameter::GetterCallbackType int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index ca19e7c5e5..91c6942f46 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -47,9 +47,9 @@ class SIMPLib_EXPORT UnknownFilterParameter : public FilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
-  PYB11_BEGIN_BINDINGS(UnknownFilterParameter)
+  PYB11_BEGIN_BINDINGS(UnknownFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(UnknownFilterParameter)
-  PYB11_STATIC_CREATION(Create ARGS QString QString QString FilterParameter::Category int )
+  PYB11_STATIC_CREATION(Create)
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations

From f995be100744e3d0897f5a8dec1c44511f125167 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 16 Feb 2021 13:21:12 -0500
Subject: [PATCH 338/397] Prevent redundant variable generation in generated
 Python bindings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Python/Binding/generate_python_bindings.py    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 2e2094c6e3..ece40f213a 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -90,13 +90,19 @@ def generate_bindings(self) -> str:
     if self.uses_shared_pointer:
       template_param += f', std::shared_ptr<{self.name}>'
 
+    needs_var: bool = self.constructors or self.has_static_new or self.static_creation_methods or self.properties or self.methods
+
     if self.enums or self.is_custom:
       instance = f'instance{self.name}'
       code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
 
-      code += f'{instance}\n'
+      if needs_var:
+        code += f'{instance}\n'
     else:
-      code = f'py::class_<{template_param}>(mod, \"{self.name}\")\n'
+      code = f'py::class_<{template_param}>(mod, \"{self.name}\")'
+      if not needs_var:
+        code += ';'
+      code += '\n'
 
     for constructor in self.constructors:
       args = ', '.join(constructor.args)
@@ -144,7 +150,10 @@ def generate_bindings(self) -> str:
         code += f', {args}'
       code += ')\n'
 
-    code += ';\n\n'
+    if needs_var:
+      code += ';\n\n'
+    else:
+      code += '\n'
 
     for enum in self.enums:
       code += f'py::enum_<{self.name}::{enum.name}>(instance{self.name}, \"{enum.name}\")\n'

From 889ced996ec741f4454f33c316b5ce8d3058c771 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 16 Feb 2021 13:04:08 -0500
Subject: [PATCH 339/397] Changed "using * = struct" to "struct"

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameters/AttributeMatrixCreationFilterParameter.h   | 2 +-
 .../FilterParameters/AttributeMatrixSelectionFilterParameter.h  | 2 +-
 .../FilterParameters/DataArraySelectionFilterParameter.h        | 2 +-
 .../FilterParameters/DataContainerSelectionFilterParameter.h    | 2 +-
 .../LinkedDataContainerSelectionFilterParameter.h               | 2 +-
 .../MultiDataContainerSelectionFilterParameter.h                | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index d9436e94fb..7ab5146659 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -98,7 +98,7 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
   };
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index dd436cf018..b494be4e8c 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -96,7 +96,7 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 31ff2307e6..9f03c64a97 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -99,7 +99,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 8b8bc747c6..adaeed7c29 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -95,7 +95,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
   };
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index e2ff73d246..f5bbcab1aa 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -91,7 +91,7 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
   using SetterCallbackType = std::function<void(DataArrayPath)>;
   using GetterCallbackType = std::function<DataArrayPath(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
   };
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 2bb4c0a821..e747b626c6 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -97,7 +97,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   using SetterCallbackType = std::function<void(QStringList)>;
   using GetterCallbackType = std::function<QStringList(void)>;
 
-  using RequirementType = struct
+  struct RequirementType
   {
     IGeometry::Types dcGeometryTypes;
     AttributeMatrix::Types amTypes;

From 3d7724575001fec2d087386c11d109ed2aa7a0d2 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 16 Feb 2021 14:03:51 -0500
Subject: [PATCH 340/397] Added PYB11_FIELD to Python binding generation

* Allows binding directly to instance variables
* Replaces broken usage of PYB11_PROPERTY in ComparisonInput_t

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLPythonMacros.h     |  6 ++++
 Source/SIMPLib/Filtering/ComparisonInputs.h   | 10 +++----
 .../Binding/generate_python_bindings.py       | 28 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/Common/SIMPLPythonMacros.h b/Source/SIMPLib/Common/SIMPLPythonMacros.h
index 6307cbf3e8..1f5435dfe6 100644
--- a/Source/SIMPLib/Common/SIMPLPythonMacros.h
+++ b/Source/SIMPLib/Common/SIMPLPythonMacros.h
@@ -204,6 +204,12 @@
  */
 #define PYB11_CUSTOM(...)
 
+/**
+* @brief PYB11_FIELD This macro is used to wrap instance variable of a class.
+* It is similiar to PYB11_PROPERTY but without getters/setters.
+*/
+#define PYB11_FIELD(...)
+
 // End of PYBIND11 Macro Definitions
 /* *****************************************************************************
  * *****************************************************************************
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index 4def45cb16..d5016be9e8 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -45,11 +45,11 @@ struct ComparisonInput_t
 {
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(ComparisonInput_t)
-  PYB11_PROPERTY(QString dataContainerName)
-  PYB11_PROPERTY(QString attributeMatrixName)
-  PYB11_PROPERTY(QString attributeArrayName)
-  PYB11_PROPERTY(int compOperator)
-  PYB11_PROPERTY(double compValue)
+  PYB11_FIELD(dataContainerName)
+  PYB11_FIELD(attributeMatrixName)
+  PYB11_FIELD(attributeArrayName)
+  PYB11_FIELD(compOperator)
+  PYB11_FIELD(compValue)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index ece40f213a..1af2b643b3 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -21,6 +21,7 @@
 PYB11_SHARED_POINTERS: str = 'PYB11_SHARED_POINTERS'
 PYB11_FILTER: str = 'PYB11_FILTER'
 PYB11_CUSTOM: str = 'PYB11_CUSTOM'
+PYB11_FIELD: str = 'PYB11_FIELD'
 
 PYB11_SUPERCLASS: str = 'SUPERCLASS'
 PYB11_READ: str = 'READ'
@@ -33,6 +34,11 @@
 
 OBSERVER_ARG_NAME: str = 'observer'
 
+class PyField():
+  def __init__(self):
+    self.cpp_name: str = ''
+    self.py_name: str = ''
+
 class PyProperty():
   def __init__(self):
     self.name: str = ''
@@ -71,6 +77,7 @@ def __init__(self):
     self.name: str = ''
     self.superclass: str = ''
     self.properties: List[PyProperty] = []
+    self.fields: List[PyField] = []
     self.methods: List[PyMethod] = []
     self.static_creation_methods: List[PyStaticCreation] = []
     self.constructors: List[PyConstructor] = []
@@ -90,7 +97,7 @@ def generate_bindings(self) -> str:
     if self.uses_shared_pointer:
       template_param += f', std::shared_ptr<{self.name}>'
 
-    needs_var: bool = self.constructors or self.has_static_new or self.static_creation_methods or self.properties or self.methods
+    needs_var: bool = self.constructors or self.has_static_new or self.static_creation_methods or self.properties or self.methods or self.fields
 
     if self.enums or self.is_custom:
       instance = f'instance{self.name}'
@@ -134,6 +141,9 @@ def generate_bindings(self) -> str:
       elif prop.write:
         code += f'  .def(\"set{prop.name}\", &{self.name}::set{prop.name}, \"{prop.name}\"_a)\n'
     
+    for field in self.fields:
+      code += f'  .def_readwrite(\"{field.py_name}\", &{self.name}::{field.cpp_name})\n'
+
     for method in self.methods:
       if method.is_overload:
         template_param = ', '.join(method.arg_types)
@@ -360,6 +370,20 @@ def parse_filter(line: str) -> bool:
 def parse_custom(line: str) -> bool:
   return True
 
+def parse_field(line: str) -> PyField:
+  tokens = extract_macro_args(line)
+  field = PyField()
+  size = len(tokens)
+  if size == 2:
+    field.cpp_name = tokens[0]
+    field.py_name = tokens[1]
+  elif size == 1:
+    field.cpp_name = tokens[0]
+    field.py_name = tokens[0]
+  else:
+    raise RuntimeError('incorrect number of arguments for PyField')
+  return field
+
 def parse_bindings(class_line: str, file: Generator[str, None, None]) -> PyClass:
   py_class = parse_class(class_line)
   line: str
@@ -387,6 +411,8 @@ def parse_bindings(class_line: str, file: Generator[str, None, None]) -> PyClass
       py_class.is_filter = parse_filter(line)
     elif line.startswith(PYB11_CUSTOM):
       py_class.is_custom = parse_custom(line)
+    elif line.startswith(PYB11_FIELD):
+      py_class.fields.append(parse_field(line))
   return py_class
 
 def parse_file(file_path: str) -> List[PyClass]:

From db931c839951014afe5cd5e45a0566b44b984a54 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 16 Feb 2021 17:15:02 -0500
Subject: [PATCH 341/397] Fix runtime recursion issue.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 1d9559823f..72df311bf6 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -63,7 +63,7 @@ namespace
  * @return Boolean if we pass or not.
  */
 template <typename RequirementsType>
-bool CheckPathRequirements(AbstractFilter* filter, const DataArrayPath& path, const RequirementsType& reqs)
+bool CheckDataPathAndRequirements(AbstractFilter* filter, const DataArrayPath& path, const RequirementsType& reqs)
 {
   if(nullptr == filter)
   {
@@ -231,7 +231,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-  return CheckPathRequirements(filter, path, reqs);
+  return ::CheckDataPathAndRequirements(filter, path, reqs);
 }
 
 // -----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!CheckPathRequirements(filter, path, reqs))
+  if(!::CheckDataPathAndRequirements(filter, path, reqs))
   {
     return false;
   }
@@ -279,7 +279,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
     return false;
   }
 
-  if(!CheckPathRequirements(filter, path, reqs))
+  if(!::CheckDataPathAndRequirements(filter, path, reqs))
   {
     return false;
   }

From f4a567f8f0824a18eeec4aaa6813190738a1ab09 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 11 Feb 2021 20:39:45 -0500
Subject: [PATCH 342/397] Filters: Initialize member variables in header file

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |  5 --
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  | 10 +--
 .../CoreFilters/CombineAttributeArrays.cpp    |  8 +--
 .../CoreFilters/CombineAttributeArrays.h      |  9 +--
 .../CoreFilters/CombineAttributeMatrices.cpp  | 10 +--
 .../CoreFilters/CombineAttributeMatrices.h    | 12 ++--
 .../CoreFilters/ConditionalSetValue.cpp       |  8 +--
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |  6 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   | 10 +--
 .../CoreFilters/ConvertColorToGrayScale.h     | 10 +--
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |  7 +-
 Source/SIMPLib/CoreFilters/ConvertData.h      |  6 +-
 .../CopyFeatureArrayToElementArray.cpp        |  7 +-
 .../CopyFeatureArrayToElementArray.h          |  6 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  9 +--
 Source/SIMPLib/CoreFilters/CopyObject.h       | 10 +--
 .../CoreFilters/CreateAttributeMatrix.cpp     |  6 +-
 .../CoreFilters/CreateAttributeMatrix.h       |  5 +-
 .../CoreFilters/CreateDataContainer.cpp       |  5 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |  2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |  8 +--
 .../CreateFeatureArrayFromElementArray.h      |  8 +--
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp | 39 +---------
 Source/SIMPLib/CoreFilters/CreateGeometry.h   | 72 +++++++++----------
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp |  5 +-
 .../SIMPLib/CoreFilters/CreateGridMontage.h   |  2 +-
 .../CoreFilters/CreateImageGeometry.cpp       |  1 -
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |  2 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |  7 +-
 .../SIMPLib/CoreFilters/CreateStringArray.h   |  6 +-
 .../CoreFilters/CropVertexGeometry.cpp        | 12 +---
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  | 17 ++---
 .../CoreFilters/DataContainerReader.cpp       |  4 --
 .../SIMPLib/CoreFilters/DataContainerReader.h |  8 +--
 .../CoreFilters/DataContainerWriter.cpp       |  9 +--
 .../SIMPLib/CoreFilters/DataContainerWriter.h |  8 +--
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |  5 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |  2 +-
 .../ExtractAttributeArraysFromGeometry.cpp    | 15 ----
 .../ExtractAttributeArraysFromGeometry.h      | 30 ++++----
 .../CoreFilters/ExtractComponentAsArray.cpp   |  7 +-
 .../CoreFilters/ExtractComponentAsArray.h     |  6 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |  3 -
 .../CoreFilters/ExtractVertexGeometry.h       |  4 +-
 .../CoreFilters/FeatureCountDecision.cpp      |  6 +-
 .../CoreFilters/FeatureCountDecision.h        |  6 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      | 10 +--
 .../CoreFilters/FeatureDataCSVWriter.h        | 12 ++--
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |  5 +-
 Source/SIMPLib/CoreFilters/FileWriter.h       |  2 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  7 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |  6 +-
 .../CoreFilters/GenerateColorTable.cpp        |  4 --
 .../SIMPLib/CoreFilters/GenerateColorTable.h  |  8 +--
 .../CoreFilters/ImportAsciDataArray.cpp       |  5 +-
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |  6 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp | 12 +---
 Source/SIMPLib/CoreFilters/InitializeData.h   | 16 ++---
 .../LinkFeatureMapToElementArray.cpp          |  7 +-
 .../LinkFeatureMapToElementArray.h            |  6 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |  6 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |  4 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |  5 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |  2 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  2 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  6 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |  2 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |  5 +-
 .../CoreFilters/MultiThresholdObjects.h       |  2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |  5 +-
 .../CoreFilters/MultiThresholdObjects2.h      |  2 +-
 .../SIMPLib/CoreFilters/PostSlackMessage.cpp  |  4 --
 Source/SIMPLib/CoreFilters/PostSlackMessage.h |  8 +--
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   | 10 +--
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  | 12 ++--
 .../CoreFilters/RemoveComponentFromArray.cpp  |  8 +--
 .../CoreFilters/RemoveComponentFromArray.h    |  8 +--
 .../CoreFilters/RenameAttributeArray.cpp      |  6 +-
 .../CoreFilters/RenameAttributeArray.h        |  4 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |  6 +-
 .../CoreFilters/RenameAttributeMatrix.h       |  4 +-
 .../CoreFilters/RenameDataContainer.cpp       |  6 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |  4 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |  7 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |  6 +-
 .../CoreFilters/RequiredZThickness.cpp        |  7 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |  6 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |  2 +-
 .../CoreFilters/RotateSampleRefFrame.h        |  3 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |  4 --
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |  8 +--
 .../SetOriginResolutionImageGeom.cpp          |  3 -
 .../SetOriginResolutionImageGeom.h            |  6 +-
 .../CoreFilters/SplitAttributeArray.cpp       |  2 -
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |  4 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  9 +--
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   | 10 +--
 .../CoreFilters/WriteTriangleGeometry.cpp     |  7 +-
 .../CoreFilters/WriteTriangleGeometry.h       |  6 +-
 .../CoreFilters/util/CalculatorOperator.cpp   |  5 +-
 .../CoreFilters/util/CalculatorOperator.h     |  2 +-
 101 files changed, 249 insertions(+), 518 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index 5aac72d93e..b874096fe7 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -139,11 +139,6 @@ enum createdPathID : RenameDataPath::DataID_t
 //
 // -----------------------------------------------------------------------------
 ArrayCalculator::ArrayCalculator()
-: m_SelectedAttributeMatrix("", "", "")
-, m_InfixEquation(QString())
-, m_CalculatedArray("", "", "Output")
-, m_Units(Radians)
-, m_ScalarType(SIMPL::ScalarTypes::Type::Double)
 {
 
   createSymbolMap();
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 909748de98..94498dcc3a 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -254,11 +254,11 @@ class SIMPLib_EXPORT ArrayCalculator : public AbstractFilter
   IDataArrayShPtrType convertArrayType(const IDataArrayShPtrType& inputArray, SIMPL::ScalarTypes::Type scalarType);
 
 private:
-  DataArrayPath m_SelectedAttributeMatrix = {};
-  QString m_InfixEquation = {};
-  DataArrayPath m_CalculatedArray = {};
-  ArrayCalculator::AngleUnits m_Units = {};
-  SIMPL::ScalarTypes::Type m_ScalarType = {};
+  DataArrayPath m_SelectedAttributeMatrix = {"", "", ""};
+  QString m_InfixEquation = {QString()};
+  DataArrayPath m_CalculatedArray = {"", "", "Output"};
+  ArrayCalculator::AngleUnits m_Units = {Radians};
+  SIMPL::ScalarTypes::Type m_ScalarType = {SIMPL::ScalarTypes::Type::Double};
 
   QMap<QString, CalculatorItemShPtrType> m_SymbolMap;
   QStack<ICalculatorArray::Pointer> m_ExecutionStack;
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index e057207a8e..8e432f837a 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -178,13 +178,7 @@ class CombineAttributeArraysTemplatePrivate
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CombineAttributeArrays::CombineAttributeArrays()
-: m_SelectedDataArrayPaths(QVector<DataArrayPath>())
-, m_StackedDataArrayName(SIMPL::GeneralData::CombinedData)
-, m_NormalizeData(false)
-, m_MoveValues(false)
-{
-}
+CombineAttributeArrays::CombineAttributeArrays() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 4052c5acf1..5b4d0072f1 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -38,6 +38,7 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 class IDataArray;
@@ -220,10 +221,10 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
 private:
   IDataArrayWkPtrType m_StackedDataPtr;
 
-  QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
-  QString m_StackedDataArrayName = {};
-  bool m_NormalizeData = {};
-  bool m_MoveValues = {};
+  QVector<DataArrayPath> m_SelectedDataArrayPaths = {QVector<DataArrayPath>()};
+  QString m_StackedDataArrayName = {SIMPL::GeneralData::CombinedData};
+  bool m_NormalizeData = {false};
+  bool m_MoveValues = {false};
 
   QVector<IDataArrayWkPtrType> m_SelectedWeakPtrVector;
 
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index b1d802b8d5..dcdbf354e2 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -57,15 +57,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CombineAttributeMatrices::CombineAttributeMatrices()
-: m_FirstAttributeMatrixPath("", "", "")
-, m_SecondAttributeMatrixPath("", "", "")
-, m_FirstIndexArrayPath("", "", "")
-, m_SecondIndexArrayPath("", "", "")
-, m_CombinedAttributeMatrixName("")
-, m_NewIndexArrayName("")
-{
-}
+CombineAttributeMatrices::CombineAttributeMatrices() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index df748b5a2e..199f9a1c1b 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -246,12 +246,12 @@ class SIMPLib_EXPORT CombineAttributeMatrices : public AbstractFilter
   std::weak_ptr<DataArray<int32_t>> m_NewIndexPtr;
   int32_t* m_NewIndex = nullptr;
 
-  DataArrayPath m_FirstAttributeMatrixPath = {};
-  DataArrayPath m_SecondAttributeMatrixPath = {};
-  DataArrayPath m_FirstIndexArrayPath = {};
-  DataArrayPath m_SecondIndexArrayPath = {};
-  QString m_CombinedAttributeMatrixName = {};
-  QString m_NewIndexArrayName = {};
+  DataArrayPath m_FirstAttributeMatrixPath = {"", "", ""};
+  DataArrayPath m_SecondAttributeMatrixPath = {"", "", ""};
+  DataArrayPath m_FirstIndexArrayPath = {"", "", ""};
+  DataArrayPath m_SecondIndexArrayPath = {"", "", ""};
+  QString m_CombinedAttributeMatrixName = {""};
+  QString m_NewIndexArrayName = {""};
 
 public:
   CombineAttributeMatrices(const CombineAttributeMatrices&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 6479fe8072..3b22c92733 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -50,12 +50,8 @@
 //
 // -----------------------------------------------------------------------------
 ConditionalSetValue::ConditionalSetValue()
-: m_SelectedArrayPath("", "", "")
-, m_ConditionalArrayPath("", "", "")
-, m_ReplaceValue(0.0)
-//, m_Array(nullptr)
-{
-}
+    //, m_Array(nullptr)
+    = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index 2566be30f3..ef31bdee2a 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -193,9 +193,9 @@ class SIMPLib_EXPORT ConditionalSetValue : public AbstractFilter
   std::weak_ptr<DataArray<bool>> m_ConditionalArrayPtr;
   bool* m_ConditionalArray = nullptr;
 
-  DataArrayPath m_SelectedArrayPath = {};
-  DataArrayPath m_ConditionalArrayPath = {};
-  double m_ReplaceValue = {};
+  DataArrayPath m_SelectedArrayPath = {"", "", ""};
+  DataArrayPath m_ConditionalArrayPath = {"", "", ""};
+  double m_ReplaceValue = {0.0};
 
   IDataArray::WeakPointer m_ArrayPtr;
 
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 4336f98633..db0647d03d 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -188,15 +188,7 @@ class ParallelWrapper
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConvertColorToGrayScale::ConvertColorToGrayScale()
-: m_ConversionAlgorithm(0)
-, m_ColorWeights{0.2125f, 0.7154f, 0.0721f}
-, m_ColorChannel(0)
-, m_CreateNewAttributeMatrix(false)
-, m_OutputAttributeMatrixName("GrayScaleData")
-, m_OutputArrayPrefix("")
-{
-}
+ConvertColorToGrayScale::ConvertColorToGrayScale() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index a4e89b1af6..611c1169a0 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -253,12 +253,12 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   void initialize();
 
 private:
-  int m_ConversionAlgorithm = {};
-  FloatVec3Type m_ColorWeights = {};
-  int m_ColorChannel = {};
+  int m_ConversionAlgorithm = {0};
+  FloatVec3Type m_ColorWeights = {0.2125f, 0.7154f, 0.0721f};
+  int m_ColorChannel = {0};
   QVector<DataArrayPath> m_InputDataArrayVector = {};
-  bool m_CreateNewAttributeMatrix = {};
-  QString m_OutputAttributeMatrixName = {};
+  bool m_CreateNewAttributeMatrix = {false};
+  QString m_OutputAttributeMatrixName = {"GrayScaleData"};
   QString m_OutputArrayPrefix = {};
 
   QVector<DataArrayPath> m_OutputArrayPaths;
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index c265e78efa..28f474f9a4 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -189,12 +189,7 @@ void ConvertData(AbstractFilter* filter, T* ptr, const std::vector<size_t>& dims
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ConvertData::ConvertData()
-: m_ScalarType(SIMPL::NumericTypes::Type::Int8)
-, m_OutputArrayName("")
-, m_SelectedCellArrayPath("", "", "")
-{
-}
+ConvertData::ConvertData() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 0c17b39949..7af92ecd91 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -195,7 +195,7 @@ class SIMPLib_EXPORT ConvertData : public AbstractFilter
   ConvertData& operator=(ConvertData&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  SIMPL::NumericTypes::Type m_ScalarType = {};
-  QString m_OutputArrayName = {};
-  DataArrayPath m_SelectedCellArrayPath = {};
+  SIMPL::NumericTypes::Type m_ScalarType = {SIMPL::NumericTypes::Type::Int8};
+  QString m_OutputArrayName = {""};
+  DataArrayPath m_SelectedCellArrayPath = {"", "", ""};
 };
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index 100f212d2d..a6e0577aab 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -54,12 +54,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CopyFeatureArrayToElementArray::CopyFeatureArrayToElementArray()
-: m_SelectedFeatureArrayPath("", "", "")
-, m_FeatureIdsArrayPath("", "", "")
-, m_CreatedArrayName("")
-{
-}
+CopyFeatureArrayToElementArray::CopyFeatureArrayToElementArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 6cede554a0..9ff8eef22d 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -197,9 +197,9 @@ class SIMPLib_EXPORT CopyFeatureArrayToElementArray : public AbstractFilter
 
   IDataArrayWkPtrType m_InArrayPtr;
 
-  DataArrayPath m_SelectedFeatureArrayPath = {};
-  DataArrayPath m_FeatureIdsArrayPath = {};
-  QString m_CreatedArrayName = {};
+  DataArrayPath m_SelectedFeatureArrayPath = {"", "", ""};
+  DataArrayPath m_FeatureIdsArrayPath = {"", "", ""};
+  QString m_CreatedArrayName = {""};
 
 public:
   CopyFeatureArrayToElementArray(const CopyFeatureArrayToElementArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index acd86c9cb4..c968151cd7 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -58,14 +58,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CopyObject::CopyObject()
-: m_ObjectToCopy(0)
-, m_DataContainerToCopy("")
-, m_AttributeMatrixToCopy("", "", "")
-, m_AttributeArrayToCopy("", "", "")
-, m_CopiedObjectName("")
-{
-}
+CopyObject::CopyObject() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 2d316a5d0f..5dc48c3cfd 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -229,9 +229,9 @@ class SIMPLib_EXPORT CopyObject : public AbstractFilter
   CopyObject& operator=(CopyObject&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  int m_ObjectToCopy = {};
-  DataArrayPath m_DataContainerToCopy = {};
-  DataArrayPath m_AttributeMatrixToCopy = {};
-  DataArrayPath m_AttributeArrayToCopy = {};
-  QString m_CopiedObjectName = {};
+  int m_ObjectToCopy = {0};
+  DataArrayPath m_DataContainerToCopy = {"", "", ""};
+  DataArrayPath m_AttributeMatrixToCopy = {"", "", ""};
+  DataArrayPath m_AttributeArrayToCopy = {"", "", ""};
+  QString m_CopiedObjectName = {""};
 };
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 43ecbcdcfa..12b789ddc9 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -53,11 +53,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateAttributeMatrix::CreateAttributeMatrix()
-: m_CreatedAttributeMatrix("", "AttributeMatrix", "")
-, m_AttributeMatrixType(static_cast<int32_t>(AttributeMatrix::Type::Generic))
-{
-}
+CreateAttributeMatrix::CreateAttributeMatrix() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index 98128e04a8..7ba36a2961 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -38,6 +38,7 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
@@ -195,7 +196,7 @@ class SIMPLib_EXPORT CreateAttributeMatrix : public AbstractFilter
   CreateAttributeMatrix& operator=(CreateAttributeMatrix&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_CreatedAttributeMatrix = {};
-  int m_AttributeMatrixType = {};
+  DataArrayPath m_CreatedAttributeMatrix = {"", "AttributeMatrix", ""};
+  int m_AttributeMatrixType = {static_cast<int32_t>(AttributeMatrix::Type::Generic)};
   DynamicTableData m_TupleDimensions = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 73e78c5031..1d14f64421 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -51,10 +51,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateDataContainer::CreateDataContainer()
-: m_DataContainerName("DataContainer")
-{
-}
+CreateDataContainer::CreateDataContainer() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index 4f9d17730f..bf4e914d51 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -168,5 +168,5 @@ class SIMPLib_EXPORT CreateDataContainer : public AbstractFilter
   CreateDataContainer& operator=(CreateDataContainer&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_DataContainerName = {"DataContainer", "", ""};
 };
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index bd54a82829..5eae0b0680 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -55,13 +55,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateFeatureArrayFromElementArray::CreateFeatureArrayFromElementArray()
-: m_CellFeatureAttributeMatrixName("", "", "")
-, m_SelectedCellArrayPath("", "", "")
-, m_CreatedArrayName("")
-, m_FeatureIdsArrayPath("", "", "")
-{
-}
+CreateFeatureArrayFromElementArray::CreateFeatureArrayFromElementArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 189b71e8e8..148dac05d0 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -210,10 +210,10 @@ class SIMPLib_EXPORT CreateFeatureArrayFromElementArray : public AbstractFilter
 
   IDataArrayWkPtrType m_InArrayPtr;
 
-  DataArrayPath m_CellFeatureAttributeMatrixName = {};
-  DataArrayPath m_SelectedCellArrayPath = {};
-  QString m_CreatedArrayName = {};
-  DataArrayPath m_FeatureIdsArrayPath = {};
+  DataArrayPath m_CellFeatureAttributeMatrixName = {"", "", ""};
+  DataArrayPath m_SelectedCellArrayPath = {"", "", ""};
+  QString m_CreatedArrayName = {""};
+  DataArrayPath m_FeatureIdsArrayPath = {"", "", ""};
 
 public:
   CreateFeatureArrayFromElementArray(const CreateFeatureArrayFromElementArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 9cb01bef14..585ffa4001 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -61,44 +61,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateGeometry::CreateGeometry()
-: m_GeometryType(0)
-, m_DataContainerName("")
-, m_SharedVertexListArrayPath0("", "", "")
-, m_SharedVertexListArrayPath1("", "", "")
-, m_SharedVertexListArrayPath2("", "", "")
-, m_SharedVertexListArrayPath3("", "", "")
-, m_SharedVertexListArrayPath4("", "", "")
-, m_SharedVertexListArrayPath5("", "", "")
-, m_SharedEdgeListArrayPath("", "", "")
-, m_SharedTriListArrayPath("", "", "")
-, m_SharedQuadListArrayPath("", "", "")
-, m_SharedTetListArrayPath("", "", "")
-, m_SharedHexListArrayPath("", "", "")
-, m_XBoundsArrayPath("", "", "")
-, m_YBoundsArrayPath("", "", "")
-, m_ZBoundsArrayPath("", "", "")
-, m_Dimensions(0, 0, 0)
-, m_Origin(0.0f, 0.0f, 0.0f)
-, m_Spacing(1.0f, 1.0f, 1.0f)
-, m_ImageCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
-, m_RectGridCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
-, m_VertexAttributeMatrixName0(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_VertexAttributeMatrixName1(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_VertexAttributeMatrixName2(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_VertexAttributeMatrixName3(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_VertexAttributeMatrixName4(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_VertexAttributeMatrixName5(SIMPL::Defaults::VertexAttributeMatrixName)
-, m_EdgeAttributeMatrixName(SIMPL::Defaults::EdgeAttributeMatrixName)
-, m_FaceAttributeMatrixName0(SIMPL::Defaults::FaceAttributeMatrixName)
-, m_FaceAttributeMatrixName1(SIMPL::Defaults::FaceAttributeMatrixName)
-, m_TetCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
-, m_HexCellAttributeMatrixName(SIMPL::Defaults::CellAttributeMatrixName)
-, m_TreatWarningsAsErrors(false)
-, m_ArrayHandling(false)
-, m_NumVerts(0)
-{
-}
+CreateGeometry::CreateGeometry() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index d86b7873ca..d92657c3ee 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -615,42 +615,42 @@ class SIMPLib_EXPORT CreateGeometry : public AbstractFilter
   std::weak_ptr<DataArray<size_t>> m_HexesPtr;
   size_t* m_Hexes = nullptr;
 
-  int m_GeometryType = {};
-  DataArrayPath m_DataContainerName = {};
-  DataArrayPath m_SharedVertexListArrayPath0 = {};
-  DataArrayPath m_SharedVertexListArrayPath1 = {};
-  DataArrayPath m_SharedVertexListArrayPath2 = {};
-  DataArrayPath m_SharedVertexListArrayPath3 = {};
-  DataArrayPath m_SharedVertexListArrayPath4 = {};
-  DataArrayPath m_SharedVertexListArrayPath5 = {};
-  DataArrayPath m_SharedEdgeListArrayPath = {};
-  DataArrayPath m_SharedTriListArrayPath = {};
-  DataArrayPath m_SharedQuadListArrayPath = {};
-  DataArrayPath m_SharedTetListArrayPath = {};
-  DataArrayPath m_SharedHexListArrayPath = {};
-  DataArrayPath m_XBoundsArrayPath = {};
-  DataArrayPath m_YBoundsArrayPath = {};
-  DataArrayPath m_ZBoundsArrayPath = {};
-  IntVec3Type m_Dimensions = {};
-  FloatVec3Type m_Origin = {};
-  FloatVec3Type m_Spacing = {};
-  QString m_ImageCellAttributeMatrixName = {};
-  QString m_RectGridCellAttributeMatrixName = {};
-  QString m_VertexAttributeMatrixName0 = {};
-  QString m_VertexAttributeMatrixName1 = {};
-  QString m_VertexAttributeMatrixName2 = {};
-  QString m_VertexAttributeMatrixName3 = {};
-  QString m_VertexAttributeMatrixName4 = {};
-  QString m_VertexAttributeMatrixName5 = {};
-  QString m_EdgeAttributeMatrixName = {};
-  QString m_FaceAttributeMatrixName0 = {};
-  QString m_FaceAttributeMatrixName1 = {};
-  QString m_TetCellAttributeMatrixName = {};
-  QString m_HexCellAttributeMatrixName = {};
-  bool m_TreatWarningsAsErrors = {};
-  bool m_ArrayHandling = {};
-
-  size_t m_NumVerts;
+  int m_GeometryType = {0};
+  DataArrayPath m_DataContainerName = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath0 = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath1 = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath2 = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath3 = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath4 = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath5 = {"", "", ""};
+  DataArrayPath m_SharedEdgeListArrayPath = {"", "", ""};
+  DataArrayPath m_SharedTriListArrayPath = {"", "", ""};
+  DataArrayPath m_SharedQuadListArrayPath = {"", "", ""};
+  DataArrayPath m_SharedTetListArrayPath = {"", "", ""};
+  DataArrayPath m_SharedHexListArrayPath = {"", "", ""};
+  DataArrayPath m_XBoundsArrayPath = {"", "", ""};
+  DataArrayPath m_YBoundsArrayPath = {"", "", ""};
+  DataArrayPath m_ZBoundsArrayPath = {"", "", ""};
+  IntVec3Type m_Dimensions = {0, 0, 0};
+  FloatVec3Type m_Origin = {0.0f, 0.0f, 0.0f};
+  FloatVec3Type m_Spacing = {1.0f, 1.0f, 1.0f};
+  QString m_ImageCellAttributeMatrixName = {SIMPL::Defaults::CellAttributeMatrixName};
+  QString m_RectGridCellAttributeMatrixName = {SIMPL::Defaults::CellAttributeMatrixName};
+  QString m_VertexAttributeMatrixName0 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_VertexAttributeMatrixName1 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_VertexAttributeMatrixName2 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_VertexAttributeMatrixName3 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_VertexAttributeMatrixName4 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_VertexAttributeMatrixName5 = {SIMPL::Defaults::VertexAttributeMatrixName};
+  QString m_EdgeAttributeMatrixName = {SIMPL::Defaults::EdgeAttributeMatrixName};
+  QString m_FaceAttributeMatrixName0 = {SIMPL::Defaults::FaceAttributeMatrixName};
+  QString m_FaceAttributeMatrixName1 = {SIMPL::Defaults::FaceAttributeMatrixName};
+  QString m_TetCellAttributeMatrixName = {SIMPL::Defaults::CellAttributeMatrixName};
+  QString m_HexCellAttributeMatrixName = {SIMPL::Defaults::CellAttributeMatrixName};
+  bool m_TreatWarningsAsErrors = {false};
+  bool m_ArrayHandling = {false};
+
+  size_t m_NumVerts = {0};
 
 public:
   CreateGeometry(const CreateGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
index 85f99ee997..77b106a9e7 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -48,9 +48,8 @@ enum createdPathID : RenameDataPath::DataID_t
 //
 // -----------------------------------------------------------------------------
 CreateGridMontage::CreateGridMontage()
-: m_MontageName("Grid Montage")
-{
-}
+
+    = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
index 79ccbea98e..48d2cd6e93 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.h
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -189,7 +189,7 @@ class SIMPLib_EXPORT CreateGridMontage : public AbstractFilter
   void initialize();
 
 private:
-  QString m_MontageName;
+  QString m_MontageName = {"Grid Montage"};
   DataContainerGrid m_GridSelection;
   QStringList m_DataContainerNameList;
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index 9af4688780..dd35edb315 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -53,7 +53,6 @@
 //
 // -----------------------------------------------------------------------------
 CreateImageGeometry::CreateImageGeometry()
-: m_SelectedDataContainer("ImageGeomDataContainer")
 {
   m_Dimensions[0] = 0;
   m_Dimensions[1] = 0;
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index 4c7e076696..b95eb1fd74 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -218,7 +218,7 @@ class SIMPLib_EXPORT CreateImageGeometry : public AbstractFilter
   CreateImageGeometry& operator=(CreateImageGeometry&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_SelectedDataContainer = {};
+  DataArrayPath m_SelectedDataContainer = {"ImageGeomDataContainer", "", ""};
   IntVec3Type m_Dimensions = {};
   FloatVec3Type m_Origin = {};
   FloatVec3Type m_Spacing = {};
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 40a52fa861..72ed0f470b 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -69,12 +69,7 @@ void initializeArray(IDataArray::Pointer outputArrayPtr, const QString& initiali
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CreateStringArray::CreateStringArray()
-: m_NumberOfComponents(0)
-, m_NewArray("", "", "")
-, m_InitializationValue("Text")
-{
-}
+CreateStringArray::CreateStringArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index 0dedf8cff3..d33622a642 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -189,9 +189,9 @@ class SIMPLib_EXPORT CreateStringArray : public AbstractFilter
   void initialize();
 
 private:
-  int m_NumberOfComponents = {};
-  DataArrayPath m_NewArray = {};
-  QString m_InitializationValue = {};
+  int m_NumberOfComponents = {0};
+  DataArrayPath m_NewArray = {"", "", ""};
+  QString m_InitializationValue = {"Text"};
 
   IDataArray::WeakPointer m_OutputArrayPtr;
 
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 214a4f8bf3..01e569580c 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -58,17 +58,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CropVertexGeometry::CropVertexGeometry()
-: m_DataContainerName(SIMPL::Defaults::VertexDataContainerName)
-, m_CroppedDataContainerName("CroppedDataContainer")
-, m_XMin(0)
-, m_YMin(0)
-, m_ZMin(0)
-, m_XMax(0)
-, m_YMax(0)
-, m_ZMax(0)
-{
-}
+CropVertexGeometry::CropVertexGeometry() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index 41600a0131..302eb96460 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -38,6 +38,7 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 /**
@@ -262,14 +263,14 @@ class SIMPLib_EXPORT CropVertexGeometry : public AbstractFilter
   void initialize();
 
 private:
-  DataArrayPath m_DataContainerName = {};
-  DataArrayPath m_CroppedDataContainerName = {};
-  float m_XMin = {};
-  float m_YMin = {};
-  float m_ZMin = {};
-  float m_XMax = {};
-  float m_YMax = {};
-  float m_ZMax = {};
+  DataArrayPath m_DataContainerName = {SIMPL::Defaults::VertexDataContainerName, "", ""};
+  DataArrayPath m_CroppedDataContainerName = {"CroppedDataContainer", "", ""};
+  float m_XMin = {0};
+  float m_YMin = {0};
+  float m_ZMin = {0};
+  float m_XMax = {0};
+  float m_YMax = {0};
+  float m_ZMax = {0};
 
   QList<QString> m_AttrMatList;
 
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index b3ceb6f7e0..e91ed35959 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -60,10 +60,6 @@
 //
 // -----------------------------------------------------------------------------
 DataContainerReader::DataContainerReader()
-: m_InputFile("")
-, m_OverwriteExistingDataContainers(false)
-, m_LastFileRead("")
-, m_LastRead(QDateTime::currentDateTime())
 {
   m_PipelineFromFile = FilterPipeline::New();
 }
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 89c686c515..d49639a95b 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -293,10 +293,10 @@ protected slots:
   void cleanupFilter() override;
 
 private:
-  QString m_InputFile = {};
-  bool m_OverwriteExistingDataContainers = {};
-  QString m_LastFileRead = {};
-  QDateTime m_LastRead = {};
+  QString m_InputFile = {""};
+  bool m_OverwriteExistingDataContainers = {false};
+  QString m_LastFileRead = {""};
+  QDateTime m_LastRead = {QDateTime::currentDateTime()};
   DataContainerArrayProxy m_InputFileDataContainerArrayProxy = {};
 
   FilterPipeline::Pointer m_PipelineFromFile;
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 077cb3eee4..63cb4c9580 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -60,14 +60,7 @@ extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-DataContainerWriter::DataContainerWriter()
-: m_OutputFile(QDir::toNativeSeparators(QDir::homePath() + "/Desktop/Untitled.dream3d"))
-, m_WritePipeline(true)
-, m_WriteXdmfFile(true)
-, m_WriteTimeSeries(false)
-, m_AppendToExisting(false)
-{
-}
+DataContainerWriter::DataContainerWriter() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 85353648c6..19bfa58703 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -247,10 +247,10 @@ class SIMPLib_EXPORT DataContainerWriter : public AbstractFilter
 
 private:
   QString m_OutputFile = {};
-  bool m_WritePipeline = {};
-  bool m_WriteXdmfFile = {};
-  bool m_WriteTimeSeries = {};
-  bool m_AppendToExisting = {};
+  bool m_WritePipeline = {true};
+  bool m_WriteXdmfFile = {true};
+  bool m_WriteTimeSeries = {false};
+  bool m_AppendToExisting = {false};
 
 public:
   DataContainerWriter(const DataContainerWriter&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 74bda2fcd6..2c9d2e3cb0 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -44,10 +44,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-EmptyFilter::EmptyFilter()
-: m_HumanLabel("Unknown Filter")
-{
-}
+EmptyFilter::EmptyFilter() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 0769921113..90bc408e5c 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -168,7 +168,7 @@ class SIMPLib_EXPORT EmptyFilter : public AbstractFilter
 private:
   QString m_OriginalFilterName = {};
 
-  QString m_HumanLabel;
+  QString m_HumanLabel = {"Unknown Filter"};
 
 public:
   EmptyFilter(const EmptyFilter&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index dd14f12da2..abeb54805a 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -76,21 +76,6 @@ enum createdPathID : RenameDataPath::DataID_t
 //
 // -----------------------------------------------------------------------------
 ExtractAttributeArraysFromGeometry::ExtractAttributeArraysFromGeometry()
-: m_DataContainerName("")
-, m_SharedVertexListArrayPath0(SIMPL::Defaults::VertexDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedVertexListArrayPath1(SIMPL::Defaults::EdgeDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedVertexListArrayPath2(SIMPL::Defaults::TriangleDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedVertexListArrayPath3(SIMPL::Defaults::QuadDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedVertexListArrayPath4(SIMPL::Defaults::TetrahedralDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedVertexListArrayPath5(SIMPL::Defaults::HexahedralDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates")
-, m_SharedEdgeListArrayPath(SIMPL::Defaults::EdgeDataContainerName, SIMPL::Defaults::EdgeAttributeMatrixName, "EdgeConnectivity")
-, m_SharedTriListArrayPath(SIMPL::Defaults::TriangleDataContainerName, SIMPL::Defaults::FaceAttributeMatrixName, "TriangleConnectivity")
-, m_SharedQuadListArrayPath(SIMPL::Defaults::QuadDataContainerName, SIMPL::Defaults::FaceAttributeMatrixName, "QuadConnectivity")
-, m_SharedTetListArrayPath(SIMPL::Defaults::TetrahedralDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "TetConnectivity")
-, m_SharedHexListArrayPath(SIMPL::Defaults::HexahedralDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "HexConnectivity")
-, m_XBoundsArrayPath("", "", "XBounds")
-, m_YBoundsArrayPath("", "", "YBounds")
-, m_ZBoundsArrayPath("", "", "ZBounds")
 {
   initialize();
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index 1480266e9e..b5acbffa8c 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -373,21 +373,21 @@ class SIMPLib_EXPORT ExtractAttributeArraysFromGeometry : public AbstractFilter
   std::weak_ptr<DataArray<MeshIndexType>> m_TetsPtr;
   MeshIndexType* m_Tets = nullptr;
 
-  DataArrayPath m_DataContainerName = {};
-  DataArrayPath m_SharedVertexListArrayPath0 = {};
-  DataArrayPath m_SharedVertexListArrayPath1 = {};
-  DataArrayPath m_SharedVertexListArrayPath2 = {};
-  DataArrayPath m_SharedVertexListArrayPath3 = {};
-  DataArrayPath m_SharedVertexListArrayPath4 = {};
-  DataArrayPath m_SharedVertexListArrayPath5 = {};
-  DataArrayPath m_SharedEdgeListArrayPath = {};
-  DataArrayPath m_SharedTriListArrayPath = {};
-  DataArrayPath m_SharedQuadListArrayPath = {};
-  DataArrayPath m_SharedTetListArrayPath = {};
-  DataArrayPath m_SharedHexListArrayPath = {};
-  DataArrayPath m_XBoundsArrayPath = {};
-  DataArrayPath m_YBoundsArrayPath = {};
-  DataArrayPath m_ZBoundsArrayPath = {};
+  DataArrayPath m_DataContainerName = {"", "", ""};
+  DataArrayPath m_SharedVertexListArrayPath0 = {SIMPL::Defaults::VertexDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedVertexListArrayPath1 = {SIMPL::Defaults::EdgeDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedVertexListArrayPath2 = {SIMPL::Defaults::TriangleDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedVertexListArrayPath3 = {SIMPL::Defaults::QuadDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedVertexListArrayPath4 = {SIMPL::Defaults::TetrahedralDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedVertexListArrayPath5 = {SIMPL::Defaults::HexahedralDataContainerName, SIMPL::Defaults::VertexAttributeMatrixName, "VertexCoordinates"};
+  DataArrayPath m_SharedEdgeListArrayPath = {SIMPL::Defaults::EdgeDataContainerName, SIMPL::Defaults::EdgeAttributeMatrixName, "EdgeConnectivity"};
+  DataArrayPath m_SharedTriListArrayPath = {SIMPL::Defaults::TriangleDataContainerName, SIMPL::Defaults::FaceAttributeMatrixName, "TriangleConnectivity"};
+  DataArrayPath m_SharedQuadListArrayPath = {SIMPL::Defaults::QuadDataContainerName, SIMPL::Defaults::FaceAttributeMatrixName, "QuadConnectivity"};
+  DataArrayPath m_SharedTetListArrayPath = {SIMPL::Defaults::TetrahedralDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "TetConnectivity"};
+  DataArrayPath m_SharedHexListArrayPath = {SIMPL::Defaults::HexahedralDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "HexConnectivity"};
+  DataArrayPath m_XBoundsArrayPath = {"", "", "XBounds"};
+  DataArrayPath m_YBoundsArrayPath = {"", "", "YBounds"};
+  DataArrayPath m_ZBoundsArrayPath = {"", "", "ZBounds"};
 
 public:
   ExtractAttributeArraysFromGeometry(const ExtractAttributeArraysFromGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 0ac066ac48..4f0cdd959d 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -55,12 +55,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ExtractComponentAsArray::ExtractComponentAsArray()
-: m_SelectedArrayPath("", "", "")
-, m_CompNumber(0)
-, m_NewArrayArrayName("")
-{
-}
+ExtractComponentAsArray::ExtractComponentAsArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index a8ca99797f..977f64f89e 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -196,9 +196,9 @@ class SIMPLib_EXPORT ExtractComponentAsArray : public AbstractFilter
   IDataArrayWkPtrType m_InArrayPtr;
   IDataArrayWkPtrType m_NewArrayPtr;
 
-  DataArrayPath m_SelectedArrayPath = {};
-  int m_CompNumber = {};
-  QString m_NewArrayArrayName = {};
+  DataArrayPath m_SelectedArrayPath = {"", "", ""};
+  int m_CompNumber = {0};
+  QString m_NewArrayArrayName = {""};
 
 public:
   ExtractComponentAsArray(const ExtractComponentAsArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index dd9b219836..4463e98b06 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -58,9 +58,6 @@ enum createdPathID : RenameDataPath::DataID_t
 //
 // -----------------------------------------------------------------------------
 ExtractVertexGeometry::ExtractVertexGeometry()
-: m_ArrayHandling(static_cast<int>(ArrayHandlingType::MoveArrays))
-, m_SelectedDataContainerName()
-, m_VertexDataContainerName("VertexDataContainer")
 {
   initialize();
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index 16c647b9ff..fad611088b 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -215,10 +215,10 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   void initialize();
 
 private:
-  int m_ArrayHandling = {};
+  int m_ArrayHandling = {static_cast<int>(ArrayHandlingType::MoveArrays)};
   DataArrayPath m_SelectedDataContainerName = {};
   QVector<DataArrayPath> m_IncludedDataArrayPaths = {};
-  DataArrayPath m_VertexDataContainerName = {};
+  DataArrayPath m_VertexDataContainerName = {"VertexDataContainer", "", ""};
 
   QVector<QString> m_NewDCGeometryChoices;
   QVector<QString> m_ArrayHandlingChoices;
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index dda84959ff..ecea3f791d 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -50,10 +50,8 @@
 //
 // -----------------------------------------------------------------------------
 FeatureCountDecision::FeatureCountDecision()
-: m_FeatureIdsArrayPath("", "", "")
-, m_MaxGrains(0)
-{
-}
+
+    = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 0298686312..9c200b2113 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -169,11 +169,11 @@ class SIMPLib_EXPORT FeatureCountDecision : public AbstractDecisionFilter
   void initialize();
 
 private:
-  std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
+  std::weak_ptr<Int32ArrayType> m_FeatureIdsPtr;
   int32_t* m_FeatureIds = nullptr;
 
-  DataArrayPath m_FeatureIdsArrayPath = {};
-  int m_MaxGrains = {};
+  DataArrayPath m_FeatureIdsArrayPath = {"", "", ""};
+  int m_MaxGrains = {0};
 
 public:
   FeatureCountDecision(const FeatureCountDecision&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index e2ed189cca..3b3753510b 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -52,15 +52,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FeatureDataCSVWriter::FeatureDataCSVWriter()
-: m_CellFeatureAttributeMatrixPath("", "", "")
-, m_FeatureDataFile("")
-, m_WriteNeighborListData(false)
-, m_DelimiterChoice(0)
-, m_WriteNumFeaturesLine(true)
-, m_Delimiter(',')
-{
-}
+FeatureDataCSVWriter::FeatureDataCSVWriter() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 669ba9adde..933e9cdb38 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -241,10 +241,10 @@ class SIMPLib_EXPORT FeatureDataCSVWriter : public AbstractFilter
   FeatureDataCSVWriter& operator=(FeatureDataCSVWriter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_CellFeatureAttributeMatrixPath = {};
-  QString m_FeatureDataFile = {};
-  bool m_WriteNeighborListData = {};
-  int m_DelimiterChoice = {};
-  bool m_WriteNumFeaturesLine = {};
-  char m_Delimiter = {};
+  DataArrayPath m_CellFeatureAttributeMatrixPath = {"", "", ""};
+  QString m_FeatureDataFile = {""};
+  bool m_WriteNeighborListData = {false};
+  int m_DelimiterChoice = {0};
+  bool m_WriteNumFeaturesLine = {true};
+  char m_Delimiter = {','};
 };
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index 92e83edd90..8809d86422 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -42,10 +42,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FileWriter::FileWriter()
-: m_OutputFile("")
-{
-}
+FileWriter::FileWriter() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 4fc97934e0..8d974388e6 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -109,5 +109,5 @@ class SIMPLib_EXPORT FileWriter : public AbstractFilter
   FileWriter& operator=(FileWriter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QString m_OutputFile = {};
+  QString m_OutputFile = {""};
 };
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 21f462e84a..0ea89a225f 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -116,12 +116,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-FindDerivatives::FindDerivatives()
-: m_SelectedArrayPath("", "", "")
-, m_DerivativesArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "Derivatives")
-, m_Interpolate(false)
-{
-}
+FindDerivatives::FindDerivatives() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index e25bfe296f..826e97978f 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -205,10 +205,10 @@ protected slots:
 
   IDataArrayWkPtrType m_InArrayPtr;
 
-  DataArrayPath m_SelectedArrayPath = {};
-  DataArrayPath m_DerivativesArrayPath = {};
+  DataArrayPath m_SelectedArrayPath = {"", "", ""};
+  DataArrayPath m_DerivativesArrayPath = {SIMPL::Defaults::DataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "Derivatives"};
 
-  bool m_Interpolate;
+  bool m_Interpolate = {false};
 
 public:
   FindDerivatives(const FindDerivatives&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
index 24b2c3e8a0..7669185bf1 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.cpp
@@ -211,10 +211,6 @@ void generateColorArray(typename DataArray<T>::Pointer arrayPtr, QJsonArray pres
 //
 // -----------------------------------------------------------------------------
 GenerateColorTable::GenerateColorTable()
-: m_SelectedPresetName("")
-, m_SelectedPresetControlPoints(QJsonArray())
-, m_SelectedDataArrayPath(DataArrayPath("", "", ""))
-, m_RgbArrayName("")
 {
   initialize();
 }
diff --git a/Source/SIMPLib/CoreFilters/GenerateColorTable.h b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
index 1cab8f129b..66a9e5ec87 100644
--- a/Source/SIMPLib/CoreFilters/GenerateColorTable.h
+++ b/Source/SIMPLib/CoreFilters/GenerateColorTable.h
@@ -183,8 +183,8 @@ class SIMPLib_EXPORT GenerateColorTable : public AbstractFilter
   GenerateColorTable& operator=(GenerateColorTable&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QString m_SelectedPresetName = {};
-  QJsonArray m_SelectedPresetControlPoints = {};
-  DataArrayPath m_SelectedDataArrayPath = {};
-  QString m_RgbArrayName = {};
+  QString m_SelectedPresetName = {""};
+  QJsonArray m_SelectedPresetControlPoints = {QJsonArray()};
+  DataArrayPath m_SelectedDataArrayPath = {DataArrayPath("", "", "")};
+  QString m_RgbArrayName = {""};
 };
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 0f126bb5a8..aecf9603b6 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -254,10 +254,7 @@ ImportAsciDataArrayPrivate::ImportAsciDataArrayPrivate(ImportAsciDataArray* ptr)
 //
 // -----------------------------------------------------------------------------
 ImportAsciDataArray::ImportAsciDataArray()
-: m_CreatedAttributeArrayPath("")
-, m_ScalarType(SIMPL::NumericTypes::Type::Int8)
-, m_InputFile("")
-, d_ptr(new ImportAsciDataArrayPrivate(this))
+: d_ptr(new ImportAsciDataArrayPrivate(this))
 {
 }
 
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index aa88174368..978b99209b 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -296,11 +296,11 @@ class SIMPLib_EXPORT ImportAsciDataArray : public AbstractFilter
   void readHeaderPortion();
 
 private:
-  DataArrayPath m_CreatedAttributeArrayPath = {};
-  SIMPL::NumericTypes::Type m_ScalarType = {};
+  DataArrayPath m_CreatedAttributeArrayPath = {"", "", ""};
+  SIMPL::NumericTypes::Type m_ScalarType = {SIMPL::NumericTypes::Type::Int8};
   int m_NumberOfComponents = {};
   int m_SkipHeaderLines = {};
-  QString m_InputFile = {};
+  QString m_InputFile = {""};
   int m_Delimiter = {};
 
   QScopedPointer<ImportAsciDataArrayPrivate> const d_ptr;
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index a8def8ac81..da5003b327 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -68,17 +68,7 @@ void delay(int seconds)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-InitializeData::InitializeData()
-: m_XMin(0)
-, m_YMin(0)
-, m_ZMin(0)
-, m_XMax(0)
-, m_YMax(0)
-, m_ZMax(0)
-, m_InitType(Manual)
-, m_InitValue(0)
-{
-}
+InitializeData::InitializeData() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 6347d68e3f..25cfaeaae4 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -308,15 +308,15 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
 
 private:
   QVector<DataArrayPath> m_CellAttributeMatrixPaths = {};
-  int m_XMin = {};
-  int m_YMin = {};
-  int m_ZMin = {};
-  int m_XMax = {};
-  int m_YMax = {};
-  int m_ZMax = {};
-  int m_InitType = {};
+  int m_XMin = {0};
+  int m_YMin = {0};
+  int m_ZMin = {0};
+  int m_XMax = {0};
+  int m_YMax = {0};
+  int m_ZMax = {0};
+  int m_InitType = {Manual};
   bool m_Random = {};
-  double m_InitValue = {};
+  double m_InitValue = {0};
   FPRangePair m_InitRange = {};
 
   enum InitChoices
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index 784bd98726..f449e47e18 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -55,12 +55,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-LinkFeatureMapToElementArray::LinkFeatureMapToElementArray()
-: m_CellFeatureAttributeMatrixName("")
-, m_SelectedCellArrayPath("", "", "")
-, m_ActiveArrayName("")
-{
-}
+LinkFeatureMapToElementArray::LinkFeatureMapToElementArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index d0871360b2..e7f30fa2e7 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -199,9 +199,9 @@ class SIMPLib_EXPORT LinkFeatureMapToElementArray : public AbstractFilter
   std::weak_ptr<DataArray<bool>> m_ActivePtr;
   bool* m_Active = nullptr;
 
-  QString m_CellFeatureAttributeMatrixName = {};
-  DataArrayPath m_SelectedCellArrayPath = {};
-  QString m_ActiveArrayName = {};
+  QString m_CellFeatureAttributeMatrixName = {""};
+  DataArrayPath m_SelectedCellArrayPath = {"", "", ""};
+  QString m_ActiveArrayName = {""};
 
 public:
   LinkFeatureMapToElementArray(const LinkFeatureMapToElementArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index 982e6c5398..c13607dee6 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -47,11 +47,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MaskCountDecision::MaskCountDecision()
-: m_MaskArrayPath("", "", "")
-, m_NumberOfTrues(0)
-{
-}
+MaskCountDecision::MaskCountDecision() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 435806bfd9..0a11512013 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -172,8 +172,8 @@ class SIMPLib_EXPORT MaskCountDecision : public AbstractDecisionFilter
   std::weak_ptr<DataArray<bool>> m_MaskPtr;
   bool* m_Mask = nullptr;
 
-  DataArrayPath m_MaskArrayPath = {};
-  int m_NumberOfTrues = {};
+  DataArrayPath m_MaskArrayPath = {"", "", ""};
+  int m_NumberOfTrues = {0};
 
 public:
   MaskCountDecision(const MaskCountDecision&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index fabb8d6791..0364129c20 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -50,10 +50,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MassCreateData::MassCreateData()
-: m_DataContainerName("DataContainer")
-{
-}
+MassCreateData::MassCreateData() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index 3017bd7e7c..230118eceb 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -177,5 +177,5 @@ class SIMPLib_EXPORT MassCreateData : public AbstractFilter
   MassCreateData& operator=(MassCreateData&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_DataContainerName = {};
+  DataArrayPath m_DataContainerName = {"DataContainer", "", ""};
 };
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index a2d345232b..f6f8a21e35 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -56,8 +56,8 @@ const int32_t k_MoveDataArray = 1;
 //
 // -----------------------------------------------------------------------------
 MoveData::MoveData()
-: m_WhatToMove(k_MoveAttributeMatrix)
 {
+  m_WhatToMove = k_MoveAttributeMatrix;
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 07df13bc73..68a67e2c17 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -57,11 +57,7 @@ const int32_t k_MoveMultiDataArray = 1;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MoveMultiData::MoveMultiData()
-: m_WhatToMove(k_MoveAttributeMatrix)
-, m_DataContainerDestination("")
-{
-}
+MoveMultiData::MoveMultiData() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index b2ac334ad9..1e6c95cc19 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -222,7 +222,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 
 private:
   int m_WhatToMove = {};
-  DataArrayPath m_DataContainerDestination = {};
+  DataArrayPath m_DataContainerDestination = {"", "", ""};
   QVector<DataArrayPath> m_AttributeMatrixSources = {};
   DataArrayPath m_AttributeMatrixDestination = {};
   QVector<DataArrayPath> m_DataArraySources = {};
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index e5afaa7ad1..38a1e0a5e9 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -54,10 +54,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiThresholdObjects::MultiThresholdObjects()
-: m_DestinationArrayName(SIMPL::GeneralData::Mask)
-{
-}
+MultiThresholdObjects::MultiThresholdObjects() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index b5bd1e3913..1748d615c9 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -180,7 +180,7 @@ class SIMPLib_EXPORT MultiThresholdObjects : public AbstractFilter
   std::weak_ptr<DataArray<bool>> m_DestinationPtr;
   bool* m_Destination = nullptr;
 
-  QString m_DestinationArrayName = {};
+  QString m_DestinationArrayName = {SIMPL::GeneralData::Mask};
   ComparisonInputs m_SelectedThresholds = {};
 
 public:
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index 7339986bfe..e52e711e65 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -55,10 +55,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiThresholdObjects2::MultiThresholdObjects2()
-: m_DestinationArrayName(SIMPL::GeneralData::Mask)
-{
-}
+MultiThresholdObjects2::MultiThresholdObjects2() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index fa48d12c51..30e3f2be5c 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -224,7 +224,7 @@ class SIMPLib_EXPORT MultiThresholdObjects2 : public AbstractFilter
   std::weak_ptr<DataArray<bool>> m_DestinationPtr;
   bool* m_Destination = nullptr;
 
-  QString m_DestinationArrayName = {};
+  QString m_DestinationArrayName = {SIMPL::GeneralData::Mask};
   ComparisonInputsAdvanced m_SelectedThresholds = {};
 
 public:
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
index c9f2cfceee..ed5d88e41a 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.cpp
@@ -50,10 +50,6 @@
 //
 // -----------------------------------------------------------------------------
 PostSlackMessage::PostSlackMessage()
-: m_SlackUser("")
-, m_SlackUrl("")
-, m_SlackMessage("")
-, m_WarningsAsError(false)
 {
   m_SlackUser = "[DREAM.3D@" + QSysInfo::machineHostName() + "]";
   initialize();
diff --git a/Source/SIMPLib/CoreFilters/PostSlackMessage.h b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
index 47cc0b4639..bccf641347 100644
--- a/Source/SIMPLib/CoreFilters/PostSlackMessage.h
+++ b/Source/SIMPLib/CoreFilters/PostSlackMessage.h
@@ -203,10 +203,10 @@ class SIMPLib_EXPORT PostSlackMessage : public AbstractFilter
   void initialize();
 
 private:
-  QString m_SlackUser = {};
-  QString m_SlackUrl = {};
-  QString m_SlackMessage = {};
-  bool m_WarningsAsError = {};
+  QString m_SlackUser = {""};
+  QString m_SlackUrl = {""};
+  QString m_SlackMessage = {""};
+  bool m_WarningsAsError = {false};
 
 public:
   PostSlackMessage(const PostSlackMessage&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index 958b19fe2c..b6da7c106b 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -163,15 +163,7 @@ int32_t readBinaryFile(IDataArray* dataArrayPtr, const std::string& filename, ui
 } // namespace
 
 // -----------------------------------------------------------------------------
-RawBinaryReader::RawBinaryReader()
-: m_CreatedAttributeArrayPath("")
-, m_ScalarType(SIMPL::NumericTypes::Type::Int8)
-, m_Endian(0)
-, m_NumberOfComponents(0)
-, m_SkipHeaderBytes(0)
-, m_InputFile("")
-{
-}
+RawBinaryReader::RawBinaryReader() = default;
 
 // -----------------------------------------------------------------------------
 RawBinaryReader::~RawBinaryReader() = default;
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index e539097429..69604d4a55 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -236,12 +236,12 @@ class SIMPLib_EXPORT RawBinaryReader : public AbstractFilter
   void dataCheck() override;
 
 private:
-  DataArrayPath m_CreatedAttributeArrayPath = {};
-  SIMPL::NumericTypes::Type m_ScalarType = {};
-  int32_t m_Endian = {};
-  int32_t m_NumberOfComponents = {};
-  uint64_t m_SkipHeaderBytes = {};
-  QString m_InputFile = {};
+  DataArrayPath m_CreatedAttributeArrayPath = {"", "", ""};
+  SIMPL::NumericTypes::Type m_ScalarType = {SIMPL::NumericTypes::Type::Int8};
+  int32_t m_Endian = {0};
+  int32_t m_NumberOfComponents = {0};
+  uint64_t m_SkipHeaderBytes = {0};
+  QString m_InputFile = {""};
 
 public:
   RawBinaryReader(const RawBinaryReader&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 360ffaa901..f34e357ff9 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -57,13 +57,7 @@ enum createdPathID : RenameDataPath::DataID_t
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RemoveComponentFromArray::RemoveComponentFromArray()
-: m_SelectedArrayPath("", "", "")
-, m_CompNumber(0)
-, m_SaveRemovedComponent(false)
-, m_NewArrayArrayName("")
-{
-}
+RemoveComponentFromArray::RemoveComponentFromArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index c3dd66bc66..0b3a8bab03 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -221,10 +221,10 @@ class SIMPLib_EXPORT RemoveComponentFromArray : public AbstractFilter
   IDataArrayWkPtrType m_NewArrayPtr;
   IDataArrayWkPtrType m_ReducedArrayPtr;
 
-  DataArrayPath m_SelectedArrayPath = {};
-  int m_CompNumber = {};
-  bool m_SaveRemovedComponent = {};
-  QString m_NewArrayArrayName = {};
+  DataArrayPath m_SelectedArrayPath = {"", "", ""};
+  int m_CompNumber = {0};
+  bool m_SaveRemovedComponent = {false};
+  QString m_NewArrayArrayName = {""};
   QString m_ReducedArrayArrayName = {};
 
 public:
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index d2fb490cfd..0c649b4a6a 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -46,11 +46,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RenameAttributeArray::RenameAttributeArray()
-: m_SelectedArrayPath("", "", "")
-, m_NewArrayName("")
-{
-}
+RenameAttributeArray::RenameAttributeArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index 8c7989d788..f72bb9c26d 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -181,8 +181,8 @@ class SIMPLib_EXPORT RenameAttributeArray : public AbstractFilter
   void initialize();
 
 private:
-  DataArrayPath m_SelectedArrayPath = {};
-  QString m_NewArrayName = {};
+  DataArrayPath m_SelectedArrayPath = {"", "", ""};
+  QString m_NewArrayName = {""};
 
   QString m_LastArrayName = "";
 
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index e4a23c5206..f45f93f886 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -47,11 +47,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RenameAttributeMatrix::RenameAttributeMatrix()
-: m_SelectedAttributeMatrixPath("", "", "")
-, m_NewAttributeMatrix("")
-{
-}
+RenameAttributeMatrix::RenameAttributeMatrix() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index f5415289ee..c5da680bcb 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -181,8 +181,8 @@ class SIMPLib_EXPORT RenameAttributeMatrix : public AbstractFilter
   void initialize();
 
 private:
-  DataArrayPath m_SelectedAttributeMatrixPath = {};
-  QString m_NewAttributeMatrix = {};
+  DataArrayPath m_SelectedAttributeMatrixPath = {"", "", ""};
+  QString m_NewAttributeMatrix = {""};
 
   QString m_LastMatrixName = "";
 
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 8bd184641e..6198b14774 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -47,11 +47,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RenameDataContainer::RenameDataContainer()
-: m_SelectedDataContainerName("")
-, m_NewDataContainerName("")
-{
-}
+RenameDataContainer::RenameDataContainer() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 14780c8d01..597e32d764 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -176,8 +176,8 @@ class SIMPLib_EXPORT RenameDataContainer : public AbstractFilter
   void initialize();
 
 private:
-  DataArrayPath m_SelectedDataContainerName = {};
-  DataArrayPath m_NewDataContainerName = {};
+  DataArrayPath m_SelectedDataContainerName = {"", "", ""};
+  DataArrayPath m_NewDataContainerName = {"", "", ""};
 
   DataArrayPath m_LastContainerName;
 
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 4248aca6fe..02166f7ccd 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -48,12 +48,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ReplaceValueInArray::ReplaceValueInArray()
-: m_SelectedArray("", "", "")
-, m_RemoveValue(0.0)
-, m_ReplaceValue(0.0)
-{
-}
+ReplaceValueInArray::ReplaceValueInArray() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index 0086a61ac0..57fe22c460 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -195,9 +195,9 @@ class SIMPLib_EXPORT ReplaceValueInArray : public AbstractFilter
 private:
   IDataArrayWkPtrType m_ArrayPtr;
 
-  DataArrayPath m_SelectedArray = {};
-  double m_RemoveValue = {};
-  double m_ReplaceValue = {};
+  DataArrayPath m_SelectedArray = {"", "", ""};
+  double m_RemoveValue = {0.0};
+  double m_ReplaceValue = {0.0};
 
 public:
   ReplaceValueInArray(const ReplaceValueInArray&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 33e895ff2b..c0bb9ab5e3 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -51,12 +51,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-RequiredZThickness::RequiredZThickness()
-: m_DataContainerSelection("")
-, m_NumZVoxels(-1)
-, m_PreflightCheck(false)
-{
-}
+RequiredZThickness::RequiredZThickness() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index e679681d5a..51a2c9a73e 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -181,9 +181,9 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
 private:
   std::weak_ptr<DataArray<int32_t>> m_FeatureIdsPtr;
 
-  DataArrayPath m_DataContainerSelection = {};
-  int m_NumZVoxels = {};
-  bool m_PreflightCheck = {};
+  DataArrayPath m_DataContainerSelection = {"", "", ""};
+  int m_NumZVoxels = {-1};
+  bool m_PreflightCheck = {false};
 
 public:
   RequiredZThickness(const RequiredZThickness&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 9375d407d4..638b1ba0b6 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -321,9 +321,9 @@ struct RotateSampleRefFrame::Impl
 // -----------------------------------------------------------------------------
 RotateSampleRefFrame::RotateSampleRefFrame()
 : p_Impl(std::make_unique<Impl>())
-, m_CellAttributeMatrixPath(SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, "")
 {
   std::vector<std::vector<double>> defaultTable{{1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}};
+
   m_RotationTable.setTableData(defaultTable);
   m_RotationTable.setDynamicRows(false);
   m_RotationTable.setDynamicCols(false);
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index bac957b453..c4dfe4bf84 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -39,6 +39,7 @@
 #include <memory>
 
 #include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Common/Constants.h"
 #include "SIMPLib/FilterParameters/DynamicTableData.h"
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
@@ -288,7 +289,7 @@ class SIMPLib_EXPORT RotateSampleRefFrame : public AbstractFilter
   struct Impl;
   std::unique_ptr<Impl> p_Impl;
 
-  DataArrayPath m_CellAttributeMatrixPath = {};
+  DataArrayPath m_CellAttributeMatrixPath = {SIMPL::Defaults::ImageDataContainerName, SIMPL::Defaults::CellAttributeMatrixName, ""};
   FloatVec3Type m_RotationAxis = {0.0f, 0.0f, 1.0f};
   float m_RotationAngle = 0.0f;
   bool m_SliceBySlice = false;
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index ac4ce56d6d..198389f9ad 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -87,10 +87,6 @@ class ScaleVolumeUpdateVerticesImpl
 //
 // -----------------------------------------------------------------------------
 ScaleVolume::ScaleVolume()
-: m_DataContainerName("")
-, m_SurfaceDataContainerName("")
-, m_ApplyToVoxelVolume(true)
-, m_ApplyToSurfaceMesh(true)
 {
   m_ScaleFactor[0] = 1.0f;
   m_ScaleFactor[1] = 1.0f;
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index d44a01fed8..21b06ed5a9 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -226,9 +226,9 @@ class SIMPLib_EXPORT ScaleVolume : public AbstractFilter
   ScaleVolume& operator=(ScaleVolume&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_DataContainerName = {};
-  DataArrayPath m_SurfaceDataContainerName = {};
-  bool m_ApplyToVoxelVolume = {};
-  bool m_ApplyToSurfaceMesh = {};
+  DataArrayPath m_DataContainerName = {"", "", ""};
+  DataArrayPath m_SurfaceDataContainerName = {"", "", ""};
+  bool m_ApplyToVoxelVolume = {true};
+  bool m_ApplyToSurfaceMesh = {true};
   FloatVec3Type m_ScaleFactor = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index d0b0524cc4..f1d6301599 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -85,9 +85,6 @@ class SetOriginResolutionImageUpdateVerticesImpl
 //
 // -----------------------------------------------------------------------------
 SetOriginResolutionImageGeom::SetOriginResolutionImageGeom()
-: m_DataContainerName("")
-, m_ChangeOrigin(false)
-, m_ChangeResolution(false)
 {
   m_Origin[0] = 0.0f;
   m_Origin[1] = 0.0f;
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index bca2aed24f..a7ae637fd0 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -226,9 +226,9 @@ class SIMPLib_EXPORT SetOriginResolutionImageGeom : public AbstractFilter
   SetOriginResolutionImageGeom& operator=(SetOriginResolutionImageGeom&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_DataContainerName = {};
-  bool m_ChangeOrigin = {};
+  DataArrayPath m_DataContainerName = {"", "", ""};
+  bool m_ChangeOrigin = {false};
   FloatVec3Type m_Origin = {};
-  bool m_ChangeResolution = {};
+  bool m_ChangeResolution = {false};
   FloatVec3Type m_Spacing = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 4cff07ca40..0081e115b7 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -54,8 +54,6 @@ enum createdPathID : RenameDataPath::DataID_t
 //
 // -----------------------------------------------------------------------------
 SplitAttributeArray::SplitAttributeArray()
-: m_InputArrayPath("", "", "")
-, m_SplitArraysSuffix("Component")
 {
   initialize();
 }
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index 8458275239..b5d4b9d3ed 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -194,8 +194,8 @@ class SIMPLib_EXPORT SplitAttributeArray : public AbstractFilter
   IDataArrayWkPtrType m_InputArrayPtr;
   void* m_InputArray = nullptr;
 
-  DataArrayPath m_InputArrayPath = {};
-  QString m_SplitArraysSuffix = {};
+  DataArrayPath m_InputArrayPath = {"", "", ""};
+  QString m_SplitArraysSuffix = {"Component"};
 
   std::vector<IDataArrayShPtrType> m_SplitArraysPtrVector;
 
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index a9c4d983b0..6362513cf1 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -125,14 +125,7 @@ class WriteASCIIDataPrivate
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-WriteASCIIData::WriteASCIIData()
-: m_SelectedDataArrayPaths(QVector<DataArrayPath>())
-, m_OutputPath("")
-, m_Delimiter(0)
-, m_FileExtension(".txt")
-, m_MaxValPerLine(-1)
-{
-}
+WriteASCIIData::WriteASCIIData() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index f3454d916a..28a60dca87 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -259,12 +259,12 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
   void initialize();
 
 private:
-  QVector<DataArrayPath> m_SelectedDataArrayPaths = {};
-  QString m_OutputPath = {};
+  QVector<DataArrayPath> m_SelectedDataArrayPaths = {QVector<DataArrayPath>()};
+  QString m_OutputPath = {""};
   QString m_OutputFilePath = {};
-  int m_Delimiter = {};
-  QString m_FileExtension = {};
-  int m_MaxValPerLine = {};
+  int m_Delimiter = {0};
+  QString m_FileExtension = {".txt"};
+  int m_MaxValPerLine = {-1};
   int m_OutputStyle = {};
 
   /**
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index cfce8265eb..e5a7e8d5af 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -55,12 +55,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-WriteTriangleGeometry::WriteTriangleGeometry()
-: m_DataContainerSelection("")
-, m_OutputNodesFile("")
-, m_OutputTrianglesFile("")
-{
-}
+WriteTriangleGeometry::WriteTriangleGeometry() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index e5b465e177..8e45e79237 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -203,7 +203,7 @@ class SIMPLib_EXPORT WriteTriangleGeometry : public AbstractFilter
   WriteTriangleGeometry& operator=(WriteTriangleGeometry&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  DataArrayPath m_DataContainerSelection = {};
-  QString m_OutputNodesFile = {};
-  QString m_OutputTrianglesFile = {};
+  DataArrayPath m_DataContainerSelection = {"", "", ""};
+  QString m_OutputNodesFile = {""};
+  QString m_OutputTrianglesFile = {""};
 };
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
index 5b2eaecde6..48c534b330 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
@@ -40,10 +40,7 @@
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-CalculatorOperator::CalculatorOperator()
-: m_Precedence(Unknown_Precedence)
-{
-}
+CalculatorOperator::CalculatorOperator() = default;
 
 // -----------------------------------------------------------------------------
 //
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index e0a1d0b7eb..9ecedd4f61 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -95,7 +95,7 @@ class SIMPLib_EXPORT CalculatorOperator : public CalculatorItem
   void setOperatorType(OperatorType type);
 
 private:
-  Precedence m_Precedence;
+  Precedence m_Precedence = {Unknown_Precedence};
   OperatorType m_OperatorType;
 
 public:

From 9cbaa90d6139443f5e867df55cfb2520f007c1f9 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 16 Feb 2021 16:20:38 -0500
Subject: [PATCH 343/397] Added Python bindings for RequirementType for filter
 parameters

* Added <pybind11/functional.h> for filter parameter callbacks
* Changed pybind11 headers to system headers
* Removed unused python header

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../AttributeMatrixCreationFilterParameter.h  |  1 +
 .../AttributeMatrixSelectionFilterParameter.h |  1 +
 .../DataArrayCreationFilterParameter.h        |  1 +
 .../DataArraySelectionFilterParameter.h       |  1 +
 .../DataContainerSelectionFilterParameter.h   |  1 +
 ...kedDataContainerSelectionFilterParameter.h |  1 +
 ...iAttributeMatrixSelectionFilterParameter.h |  1 +
 .../MultiDataArraySelectionFilterParameter.h  |  1 +
 ...ltiDataContainerSelectionFilterParameter.h |  1 +
 .../Binding/generate_python_bindings.py       |  2 +-
 Wrapping/Python/Binding/pySIMPLBody.cpp       | 59 +++++++++++++++++++
 Wrapping/Python/Binding/pySIMPLHeader.cpp     | 11 ++--
 12 files changed, 75 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 7ab5146659..4fe020b3ac 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -72,6 +72,7 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
   PYB11_BEGIN_BINDINGS(AttributeMatrixCreationFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(AttributeMatrixCreationFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index b494be4e8c..be56d29e03 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -71,6 +71,7 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
   PYB11_BEGIN_BINDINGS(AttributeMatrixSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(AttributeMatrixSelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 48936d890e..3600e1f654 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -73,6 +73,7 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
   PYB11_BEGIN_BINDINGS(DataArrayCreationFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataArrayCreationFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index 9f03c64a97..b62fef5fd3 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -74,6 +74,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
   PYB11_BEGIN_BINDINGS(DataArraySelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataArraySelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index adaeed7c29..638e9d19b2 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -70,6 +70,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
   PYB11_BEGIN_BINDINGS(DataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(DataContainerSelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index f5bbcab1aa..9715b6fe02 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -66,6 +66,7 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
   PYB11_BEGIN_BINDINGS(LinkedDataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(LinkedDataContainerSelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 5026384528..465b734a9e 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -71,6 +71,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   PYB11_BEGIN_BINDINGS(MultiAttributeMatrixSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiAttributeMatrixSelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 3ce0a10ee4..d47ae0e2d0 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -71,6 +71,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   PYB11_BEGIN_BINDINGS(MultiDataArraySelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiDataArraySelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index e747b626c6..c6058e3e0d 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -72,6 +72,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   PYB11_BEGIN_BINDINGS(MultiDataContainerSelectionFilterParameter SUPERCLASS FilterParameter)
   PYB11_SHARED_POINTERS(MultiDataContainerSelectionFilterParameter)
   PYB11_STATIC_CREATION(Create)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index 1af2b643b3..bf5b75e533 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -592,7 +592,7 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
     header_code = (
       f'// This file is automatically generated during build time by {__file__}\n\n'
       '#include <memory>\n\n'
-      '#include \"pybind11/pybind11.h\"\n\n'
+      '#include <pybind11/pybind11.h>\n\n'
       '#include \"SIMPLib/Filtering/FilterManager.h\"\n\n'
       f'#include \"{plugin_name}/{plugin_name}Plugin.h\"\n\n'
       '#include \"Binding/Pybind11CustomTypeCasts.h\"\n\n'
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index a5da9e37b4..131a5cd5cc 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -186,3 +186,62 @@ instanceAbstractFilter.def("connectObserver",
                            [](AbstractFilter& filter, Observer& observer) { QObject::connect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });
 instanceAbstractFilter.def("disconnectObserver",
                            [](AbstractFilter& filter, Observer& observer) { QObject::disconnect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });
+
+py::class_<AttributeMatrixCreationFilterParameter::RequirementType>(instanceAttributeMatrixCreationFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&>())
+    .def_readwrite("dcGeometryTypes", &AttributeMatrixCreationFilterParameter::RequirementType::dcGeometryTypes);
+
+py::class_<AttributeMatrixSelectionFilterParameter::RequirementType>(instanceAttributeMatrixSelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&>())
+    .def_readwrite("dcGeometryTypes", &AttributeMatrixSelectionFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &AttributeMatrixSelectionFilterParameter::RequirementType::amTypes);
+
+py::class_<DataArrayCreationFilterParameter::RequirementType>(instanceDataArrayCreationFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&>())
+    .def_readwrite("dcGeometryTypes", &DataArrayCreationFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &DataArrayCreationFilterParameter::RequirementType::amTypes);
+
+py::class_<DataArraySelectionFilterParameter::RequirementType>(instanceDataArraySelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
+    .def_readwrite("dcGeometryTypes", &DataArraySelectionFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &DataArraySelectionFilterParameter::RequirementType::amTypes)
+    .def_readwrite("daTypes", &DataArraySelectionFilterParameter::RequirementType::daTypes)
+    .def_readwrite("componentDimensions", &DataArraySelectionFilterParameter::RequirementType::componentDimensions);
+
+py::class_<DataContainerSelectionFilterParameter::RequirementType>(instanceDataContainerSelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&>())
+    .def_readwrite("dcGeometryTypes", &DataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes);
+
+py::class_<LinkedDataContainerSelectionFilterParameter::RequirementType>(instanceLinkedDataContainerSelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&>())
+    .def_readwrite("dcGeometryTypes", &LinkedDataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes);
+
+py::class_<MultiAttributeMatrixSelectionFilterParameter::RequirementType>(instanceMultiAttributeMatrixSelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
+    .def_readwrite("dcGeometryTypes", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::amTypes)
+    .def_readwrite("daTypes", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::daTypes)
+    .def_readwrite("componentDimensions", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::componentDimensions);
+
+py::class_<MultiDataArraySelectionFilterParameter::RequirementType>(instanceMultiDataArraySelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
+    .def_readwrite("dcGeometryTypes", &MultiDataArraySelectionFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &MultiDataArraySelectionFilterParameter::RequirementType::amTypes)
+    .def_readwrite("daTypes", &MultiDataArraySelectionFilterParameter::RequirementType::daTypes)
+    .def_readwrite("componentDimensions", &MultiDataArraySelectionFilterParameter::RequirementType::componentDimensions);
+
+py::class_<MultiDataContainerSelectionFilterParameter::RequirementType>(instanceMultiDataContainerSelectionFilterParameter, "RequirementType")
+    .def(py::init<>())
+    .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
+    .def_readwrite("dcGeometryTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes)
+    .def_readwrite("amTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::amTypes)
+    .def_readwrite("daTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::daTypes)
+    .def_readwrite("componentDimensions", &MultiDataContainerSelectionFilterParameter::RequirementType::componentDimensions);
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
index 273ce8829c..a4e4e83be2 100644
--- a/Wrapping/Python/Binding/pySIMPLHeader.cpp
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -5,17 +5,18 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QString>
 
-#include "pybind11/numpy.h"
-#include "pybind11/pybind11.h"
-#include "pybind11/stl.h"
-#include "pybind11/stl_bind.h"
+#include <pybind11/pybind11.h>
+
+#include <pybind11/functional.h>
+#include <pybind11/numpy.h>
+#include <pybind11/stl.h>
+#include <pybind11/stl_bind.h>
 
 #include "SIMPLib/Common/PhaseType.h"
 #include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 #include "SIMPLib/Common/ShapeType.h"
 #include "SIMPLib/CoreFilters/ArrayCalculator.h"
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
-#include "SIMPLib/Utilities/PythonSupport.h"
 
 namespace py = pybind11;
 using namespace py::literals;

From 9052ec1be0f34410f5806edad83a2680e2bf31e4 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 16 Feb 2021 19:39:32 -0500
Subject: [PATCH 344/397] Changed StandardOutputWidget to be read only

* Disabled undo/redo in StandardOutputWidget

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Widgets/UI_Files/StandardOutputWidget.ui             | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/Widgets/UI_Files/StandardOutputWidget.ui b/Source/SVWidgetsLib/Widgets/UI_Files/StandardOutputWidget.ui
index 4db16a4caa..27ca4f9c6a 100644
--- a/Source/SVWidgetsLib/Widgets/UI_Files/StandardOutputWidget.ui
+++ b/Source/SVWidgetsLib/Widgets/UI_Files/StandardOutputWidget.ui
@@ -33,7 +33,14 @@
     <number>-1</number>
    </property>
    <item row="0" column="0" colspan="2">
-    <widget class="QTextEdit" name="stdOutTextEdit"/>
+    <widget class="QTextEdit" name="stdOutTextEdit">
+     <property name="undoRedoEnabled">
+      <bool>false</bool>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

From 3a68796e9f310b52e2a8590c3ca1cd29fc73f26b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 17 Feb 2021 14:20:09 -0500
Subject: [PATCH 345/397] Added filter and parameter compatibility checks to
 widgets

* Throws an exception if the widget gets a filter or filter
parameter it does not expect
* Replaces assert that would only occur in debug

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../SIMPLib/Utilities/FilterCompatibility.hpp | 106 ++++++++++++++++++
 Source/SIMPLib/Utilities/SourceList.cmake     |   1 +
 .../AttributeMatrixCreationWidget.cpp         |   4 +-
 .../AttributeMatrixSelectionWidget.cpp        |   4 +-
 .../AxisAngleWidget.cpp                       |   4 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |   5 +-
 .../CalculatorWidget.cpp                      |   8 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   4 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |   5 +-
 .../ComparisonSelectionWidget.cpp             |   4 +-
 .../ConstrainedDoubleWidget.cpp               |   5 +-
 .../ConstrainedIntWidget.cpp                  |   5 +-
 .../DataArrayCreationWidget.cpp               |   4 +-
 .../DataArraySelectionWidget.cpp              |   4 +-
 .../DataContainerArrayProxyWidget.cpp         |   4 +-
 .../DataContainerCreationWidget.cpp           |   5 +-
 .../DataContainerGridSelectionWidget.cpp      |   4 +-
 .../DataContainerReaderWidget.cpp             |   7 +-
 .../DataContainerSelectionWidget.cpp          |   4 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |   5 +-
 .../DynamicChoiceWidget.cpp                   |   4 +-
 .../DynamicTableWidget.cpp                    |   4 +-
 .../FileListInfoWidget.cpp                    |  13 +--
 .../FloatVec2Widget.cpp                       |   4 +-
 .../FloatVec3Widget.cpp                       |   4 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |   5 +-
 .../FourthOrderPolynomialWidget.cpp           |   4 +-
 .../GenerateColorTableWidget.cpp              |   7 +-
 .../ImportHDF5DatasetWidget.cpp               |   8 +-
 .../InputFileWidget.cpp                       |   4 +-
 .../InputPathWidget.cpp                       |   5 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |   4 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   4 +-
 .../FilterParameterWidgets/IntWidget.cpp      |   5 +-
 .../LinkedBooleanWidget.cpp                   |   5 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   4 +-
 .../LinkedPathCreationWidget.cpp              |   5 +-
 .../MontageSelectionWidget.cpp                |   4 +-
 .../MontageStructureSelectionWidget.cpp       |   4 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |   4 +-
 .../MultiDataArraySelectionWidget.cpp         |   4 +-
 .../MultiDataContainerSelectionWidget.cpp     |   4 +-
 .../MultiInputFileWidget.cpp                  |   4 +-
 .../NumericTypeWidget.cpp                     |   5 +-
 .../OutputFileWidget.cpp                      |   5 +-
 .../OutputPathWidget.cpp                      |   5 +-
 .../ParagraphWidget.cpp                       |   5 +-
 .../PhaseTypeSelectionWidget.cpp              |   4 +-
 .../PreflightUpdatedValueWidget.cpp           |   5 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |   5 +-
 .../ReadASCIIDataWidget.cpp                   |   8 +-
 .../ScalarTypeWidget.cpp                      |   5 +-
 .../SecondOrderPolynomialWidget.cpp           |   4 +-
 .../SeparatorWidget.cpp                       |   5 +-
 .../ShapeTypeSelectionWidget.cpp              |   4 +-
 .../FilterParameterWidgets/StringWidget.cpp   |   5 +-
 .../ThirdOrderPolynomialWidget.cpp            |   4 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |   5 +-
 58 files changed, 245 insertions(+), 134 deletions(-)
 create mode 100644 Source/SIMPLib/Utilities/FilterCompatibility.hpp

diff --git a/Source/SIMPLib/Utilities/FilterCompatibility.hpp b/Source/SIMPLib/Utilities/FilterCompatibility.hpp
new file mode 100644
index 0000000000..d64f8dc8c8
--- /dev/null
+++ b/Source/SIMPLib/Utilities/FilterCompatibility.hpp
@@ -0,0 +1,106 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <cstddef>
+#include <sstream>
+#include <stdexcept>
+#include <type_traits>
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+namespace SIMPL
+{
+inline void NullCheck(const void* ptr, const char* name, const char* fileName, size_t lineNumber)
+{
+  if(ptr == nullptr)
+  {
+    std::stringstream ss;
+    ss << name << " is nullptr.";
+    ss << " Occurred on line " << lineNumber << " in file \"" << fileName << "\".";
+    throw std::invalid_argument(ss.str());
+  }
+}
+
+template <class T>
+T* FilterCompatibilityCheck(AbstractFilter* filter, const FilterParameter* parameter, const char* widgetClassName, const char* filterClassName, const char* fileName, size_t lineNumber)
+{
+  static_assert(std::is_base_of_v<AbstractFilter, T>);
+
+  NullCheck(filter, "filter", fileName, lineNumber);
+  NullCheck(parameter, "parameter", fileName, lineNumber);
+
+  auto castedFilter = dynamic_cast<T*>(filter);
+
+  if(castedFilter == nullptr)
+  {
+    std::stringstream ss;
+    ss << widgetClassName << " can ONLY be used with " << filterClassName << " objects. The programmer of the filter has a bug.";
+    ss << " The name of the filter was " << filter->getHumanLabel().toStdString() << " and the name of the Filter Parameter was " << parameter->getHumanLabel().toStdString();
+    ss << " and is trying to get the propery " << parameter->getPropertyName().toStdString() << " in the filter.";
+    ss << " Occurred on line " << lineNumber << " in file \"" << fileName << "\".";
+    throw std::invalid_argument(ss.str());
+  }
+
+  return castedFilter;
+}
+
+template <class T>
+T* FilterParameterCompatibilityCheck(const AbstractFilter* filter, FilterParameter* parameter, const char* widgetClassName, const char* filterParameterClassName, const char* fileName,
+                                     size_t lineNumber)
+{
+  static_assert(std::is_base_of_v<FilterParameter, T>);
+
+  NullCheck(filter, "filter", fileName, lineNumber);
+  NullCheck(parameter, "parameter", fileName, lineNumber);
+
+  auto castedParameter = dynamic_cast<T*>(parameter);
+
+  if(castedParameter == nullptr)
+  {
+    std::stringstream ss;
+    ss << widgetClassName << " can ONLY be used with " << filterParameterClassName << " objects. The programmer of the filter has a bug.";
+    ss << " The name of the filter was " << filter->getHumanLabel().toStdString() << " and the name of the Filter Parameter was " << parameter->getHumanLabel().toStdString();
+    ss << " and is trying to get the propery " << parameter->getPropertyName().toStdString() << " in the filter.";
+    ss << " Occurred on line " << lineNumber << " in file \"" << fileName << "\".";
+    throw std::invalid_argument(ss.str());
+  }
+
+  return castedParameter;
+}
+} // namespace SIMPL
+
+#define SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, widgetClass, filterClass) SIMPL::FilterCompatibilityCheck<filterClass>(filter, parameter, #widgetClass, #filterClass, __FILE__, __LINE__)
+#define SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, widgetClass, filterParemeterClass)                                                                                               \
+  SIMPL::FilterParameterCompatibilityCheck<filterParemeterClass>(filter, parameter, #widgetClass, #filterParemeterClass, __FILE__, __LINE__)
diff --git a/Source/SIMPLib/Utilities/SourceList.cmake b/Source/SIMPLib/Utilities/SourceList.cmake
index c6968c4a1b..acec2a0b0f 100755
--- a/Source/SIMPLib/Utilities/SourceList.cmake
+++ b/Source/SIMPLib/Utilities/SourceList.cmake
@@ -37,6 +37,7 @@ set(SIMPLib_Utilities_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/UTFUtilities.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/QtConverter.hpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/STLUtilities.hpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/FilterCompatibility.hpp
 )
 
 set(SIMPLib_Utilities_SRCS
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index 40d6b38400..05225c6efe 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -37,6 +37,7 @@
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -51,8 +52,7 @@ AttributeMatrixCreationWidget::AttributeMatrixCreationWidget(FilterParameter* pa
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<AttributeMatrixCreationFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "AttributeMatrixCreationWidget can ONLY be used with a AttributeMatrixCreationFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, AttributeMatrixCreationWidget, AttributeMatrixCreationFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index e47f705f43..e43ccfcff2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -36,6 +36,7 @@
 #include "AttributeMatrixSelectionWidget.h"
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -60,8 +61,7 @@ AttributeMatrixSelectionWidget::AttributeMatrixSelectionWidget(FilterParameter*
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<AttributeMatrixSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "AttributeMatrixSelectionWidget can ONLY be used with an AttributeMatrixSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, AttributeMatrixSelectionWidget, AttributeMatrixSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index 9d520eebf2..44af370f10 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -36,6 +36,7 @@
 #include "AxisAngleWidget.h"
 
 #include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -48,8 +49,7 @@
 AxisAngleWidget::AxisAngleWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<AxisAngleFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "AxisAngleWidget can ONLY be used with an AxisAngleFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, AxisAngleWidget, AxisAngleFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index 9d9d158c7a..8d1e6c9945 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "BooleanWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -45,8 +47,7 @@
 BooleanWidget::BooleanWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<BooleanFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "BooleanWidget can ONLY be used with a BooleanFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, BooleanWidget, BooleanFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 3e978434d2..68c085ebb0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -39,6 +39,7 @@
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -55,11 +56,8 @@ CalculatorWidget::CalculatorWidget(FilterParameter* parameter, AbstractFilter* f
 , m_SelectedText("")
 , m_SelectionStart(-1)
 {
-  m_Filter = dynamic_cast<ArrayCalculator*>(filter);
-  Q_ASSERT_X(m_Filter != nullptr, "NULL Pointer", "CalculatorWidget can ONLY be used with an ArrayCalculator filter");
-
-  m_FilterParameter = dynamic_cast<CalculatorFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "CalculatorWidget can ONLY be used with a CalculatorFilterParameter object");
+  m_Filter = SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, CalculatorWidget, ArrayCalculator);
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, CalculatorWidget, CalculatorFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index c1591bf91e..c5359195b8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -37,6 +37,7 @@
 
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "FilterParameterWidgetsDialogs.h"
 
@@ -48,8 +49,7 @@
 ChoiceWidget::ChoiceWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ChoiceFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ChoiceWidget can ONLY be used with a ChoiceFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ChoiceWidget, ChoiceFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index 1ab934588f..bbd195d493 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "ComparisonSelectionAdvancedWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -51,8 +53,7 @@ ComparisonSelectionAdvancedWidget::ComparisonSelectionAdvancedWidget(FilterParam
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<ComparisonSelectionAdvancedFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ComparisonSelectionAdvancedWidget can ONLY be used with a ComparisonSelectionAdvancedFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ComparisonSelectionAdvancedWidget, ComparisonSelectionAdvancedFilterParameter);
 
   QString filterName = getFilter()->getNameOfClass();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 778da79637..5d221433b7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -36,6 +36,7 @@
 #include "ComparisonSelectionWidget.h"
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -53,8 +54,7 @@ ComparisonSelectionWidget::ComparisonSelectionWidget(FilterParameter* parameter,
 , m_DidCausePreflight(false)
 , m_ComparisonSelectionTableModel(nullptr)
 {
-  m_FilterParameter = dynamic_cast<ComparisonSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ComparisonSelectionWidget can ONLY be used with a ComparisonSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ComparisonSelectionWidget, ComparisonSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index 38efe16325..a85a8a1026 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "ConstrainedDoubleWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 ConstrainedDoubleWidget::ConstrainedDoubleWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ConstrainedDoubleFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ConstrainedDoubleWidget can ONLY be used with a DoubleFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ConstrainedDoubleWidget, ConstrainedDoubleFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index 16328f2356..c6f995fbaa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "ConstrainedIntWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 ConstrainedIntWidget::ConstrainedIntWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ConstrainedIntFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ConstrainedIntWidget can ONLY be used with a IntFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ConstrainedIntWidget, ConstrainedIntFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 621fc8dd47..533f9847ff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -37,6 +37,7 @@
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -51,8 +52,7 @@ DataArrayCreationWidget::DataArrayCreationWidget(FilterParameter* parameter, Abs
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<DataArrayCreationFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataArrayCreationWidget can ONLY be used with a DataArrayCreationFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataArrayCreationWidget, DataArrayCreationFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 0c9af050ed..c6e0611675 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -40,6 +40,7 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/DataContainerArrayWidget.h"
@@ -55,8 +56,7 @@ DataArraySelectionWidget::DataArraySelectionWidget(FilterParameter* parameter, A
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<DataArraySelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataArraySelectionWidget can ONLY be used with a DataArraySelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataArraySelectionWidget, DataArraySelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 6c5f856f71..41e1452195 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -43,6 +43,7 @@
 #include <QtGui/QFont>
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
@@ -57,8 +58,7 @@ DataContainerArrayProxyWidget::DataContainerArrayProxyWidget(FilterParameter* pa
 , m_EmptyDcProxy(DataContainerProxy())
 , m_EmptyAmProxy(AttributeMatrixProxy())
 {
-  m_FilterParameter = dynamic_cast<DataContainerArrayProxyFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerArrayProxyWidget can ONLY be used with a DataContainerArrayProxyFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataContainerArrayProxyWidget, DataContainerArrayProxyFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index d0f66057bd..6617ee4dbf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "DataContainerCreationWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetUtils.hpp"
@@ -46,8 +48,7 @@
 DataContainerCreationWidget::DataContainerCreationWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<DataContainerCreationFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerCreationWidget can ONLY be used with a DataContainerCreationFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataContainerCreationWidget, DataContainerCreationFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
index 3da4169231..bb0432d0e6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
@@ -37,6 +37,7 @@
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -53,8 +54,7 @@ DataContainerGridSelectionWidget::DataContainerGridSelectionWidget(FilterParamet
 , m_Ui(new Ui::DataContainerGridSelectionWidget)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<DataContainerGridSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerGridSelectionWidget can ONLY be used with a DataContainerGridSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataContainerGridSelectionWidgetk, DataContainerGridSelectionFilterParameter);
 
   m_Ui->setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index 75566c5c74..21bcc55f12 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -50,6 +50,7 @@
 
 #include "SIMPLib/CoreFilters/DataContainerReader.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -250,10 +251,8 @@ DataContainerReaderWidget::DataContainerReaderWidget(FilterParameter* parameter,
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<DataContainerReaderFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerReaderWidget can ONLY be used with a DataContainerReaderFilterParameter object");
-  m_Filter = dynamic_cast<DataContainerReader*>(filter);
-  Q_ASSERT_X(getFilter() != nullptr, "NULL Pointer", "DataContainerReaderWidget can ONLY be used with a DataContainerReader object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataContainerReaderWidget, DataContainerReaderFilterParameter);
+  m_Filter = SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, DataContainerReaderWidget, DataContainerReader);
 
   if(m_OpenDialogLastFilePath.isEmpty())
   {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 300a59d6c8..24de949fb1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -37,6 +37,7 @@
 
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -51,8 +52,7 @@ DataContainerSelectionWidget::DataContainerSelectionWidget(FilterParameter* para
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<DataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DataContainerSelectionWidget can ONLY be used with a DataContainerSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DataContainerSelectionWidget, DataContainerSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index e007101361..e38659db22 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "DoubleWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 DoubleWidget::DoubleWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<DoubleFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DoubleWidget can ONLY be used with a DoubleFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DoubleWidget, DoubleFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index b1d7b7565f..8872989434 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -38,6 +38,7 @@
 #include <QtCore/QDebug>
 
 #include "SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "FilterParameterWidgetsDialogs.h"
 
@@ -49,8 +50,7 @@
 DynamicChoiceWidget::DynamicChoiceWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<DynamicChoiceFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DynamicChoiceWidget can ONLY be used with a DynamicChoiceFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DynamicChoiceWidget, DynamicChoiceFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 0419cc59cf..4ad975b695 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -42,6 +42,7 @@
 #include "SIMPLib/FilterParameters/DynamicTableFilterParameter.h"
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "FilterParameterWidgetsDialogs.h"
 
@@ -60,8 +61,7 @@ const QString deleteColTT = "Removes the currently selected column from the tabl
 DynamicTableWidget::DynamicTableWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<DynamicTableFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "DynamicTableWidget can ONLY be used with a DynamicTableFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, DynamicTableWidget, DynamicTableFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 5a5fdcb2a6..0ad9a8a17c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -48,6 +48,7 @@
 #include "SIMPLib/FilterParameters/FileListInfoFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 #include "SIMPLib/Utilities/FilePathGenerator.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 #include "SIMPLib/Utilities/StringOperations.h"
 
@@ -67,16 +68,8 @@ FileListInfoWidget::FileListInfoWidget(FilterParameter* parameter, AbstractFilte
 : FilterParameterWidget(parameter, filter, parent)
 , m_Ui(new Ui::FileListInfoWidget)
 {
-  m_FilterParameter = dynamic_cast<FileListInfoFilterParameter*>(parameter);
-  if(nullptr == m_FilterParameter)
-  {
-    QString msg;
-    QTextStream ss(&msg);
-    ss << "FileListInfoWidget can ONLY be used with FileListInfoFilterParameter objects. The programmer of the filter has a bug.";
-    ss << " The name of the filter was " << filter->getHumanLabel() << " and the name of the Filter Parameter was " << parameter->getHumanLabel();
-    ss << " and is trying to get the propery " << parameter->getPropertyName() << " in the filter";
-    Q_ASSERT_X(nullptr != m_FilterParameter, msg.toLatin1().constData(), __FILE__);
-  }
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, FileListInfoWidget, FileListInfoFilterParameter);
+
   m_Ui->setupUi(this);
   setupGui();
   if(m_Ui->inputDir->text().isEmpty())
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index faffe1ebd8..462a27b162 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -36,6 +36,7 @@
 #include "FloatVec2Widget.h"
 
 #include "SIMPLib/FilterParameters/FloatVec2FilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -49,8 +50,7 @@
 FloatVec2Widget::FloatVec2Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<FloatVec2FilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "FloatVec2Widget can ONLY be used with a FloatVec2FilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, FloatVec2Widget, FloatVec2FilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index 7ba758faa3..332913d065 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -36,6 +36,7 @@
 #include "FloatVec3Widget.h"
 
 #include "SIMPLib/FilterParameters/FloatVec3FilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -49,8 +50,7 @@
 FloatVec3Widget::FloatVec3Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<FloatVec3FilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "FloatVec3Widget can ONLY be used with a FloatVec3FilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, FloatVec3Widget, FloatVec3FilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index f36865e434..b9bf4d68d0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "FloatWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 FloatWidget::FloatWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<FloatFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "FloatWidget can ONLY be used with a FloatFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, FloatWidget, FloatFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index f90478e9cf..f0fd0db16d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -36,6 +36,7 @@
 #include "FourthOrderPolynomialWidget.h"
 
 #include "SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -48,8 +49,7 @@
 FourthOrderPolynomialWidget::FourthOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<FourthOrderPolynomialFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "FourthOrderPolynomialWidget can ONLY be used with a FourthOrderPolynomialFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, FourthOrderPolynomialWidget, FourthOrderPolynomialFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
index 2d03746015..f68d681b4d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
@@ -36,6 +36,7 @@
 #include "GenerateColorTableWidget.h"
 
 #include "SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Dialogs/ColorPresetsDialog.h"
 
@@ -47,10 +48,8 @@ GenerateColorTableWidget::GenerateColorTableWidget(FilterParameter* parameter, A
 , m_PresetsDialog(nullptr)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<GenerateColorTableFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "GenerateColorTableWidget can ONLY be used with a GenerateColorTableFilterParameter object");
-  m_Filter = dynamic_cast<GenerateColorTable*>(filter);
-  Q_ASSERT_X(getFilter() != nullptr, "NULL Pointer", "GenerateColorTableWidget can ONLY be used with a GenerateColorTable object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, GenerateColorTableWidget, GenerateColorTableFilterParameter);
+  m_Filter = SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, GenerateColorTableWidget, GenerateColorTable);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index 81b9699714..e6cd141a42 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -55,6 +55,7 @@
 #include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h"
@@ -76,11 +77,8 @@ ImportHDF5DatasetWidget::ImportHDF5DatasetWidget(FilterParameter* parameter, Abs
 , m_CurrentHDFDataPath("")
 , m_FileId(-1)
 {
-  m_FilterParameter = dynamic_cast<ImportHDF5DatasetFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ImportHDF5DatasetWidget can ONLY be used with an ImportHDF5DatasetFilterParameter object");
-
-  m_Filter = dynamic_cast<ImportHDF5Dataset*>(filter);
-  Q_ASSERT_X(m_Filter != nullptr, "NULL Pointer", "ImportHDF5DatasetWidget can ONLY be used with an ImportHDF5Dataset filter");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ImportHDF5DatasetWidget, ImportHDF5DatasetFilterParameter);
+  m_Filter = SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, ImportHDF5DatasetWidget, ImportHDF5Dataset);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index 940589f435..c23c29c3c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -38,6 +38,7 @@
 #include <QtWidgets/QFileDialog>
 
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 // -----------------------------------------------------------------------------
 //
@@ -45,8 +46,7 @@
 InputFileWidget::InputFileWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : AbstractIOFileWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<InputFileFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "InputFileWidget can ONLY be used with a InputFileFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, InputFileWidget, InputFileFilterParameter);
 
   setupGui();
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 0315446ded..39f29bdcc7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -37,6 +37,8 @@
 
 #include <QtWidgets/QFileDialog>
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/QtSupport/QtSFileCompleter.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -49,8 +51,7 @@
 InputPathWidget::InputPathWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : AbstractIOFileWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<InputPathFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "InputPathWidget can ONLY be used with a InputPathFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, InputPathWidget, InputPathFilterParameter);
 
   setupGui();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index ae7d3f936c..5b4b228f11 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -34,6 +34,7 @@
 #include "IntVec2Widget.h"
 
 #include "SIMPLib/FilterParameters/IntVec2FilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
@@ -45,8 +46,7 @@
 IntVec2Widget::IntVec2Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<IntVec2FilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "IntVec2Widget can ONLY be used with a IntVec2FilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, IntVec2Widget, IntVec2FilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index ba36e4faee..4716fc2af4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -36,6 +36,7 @@
 #include "IntVec3Widget.h"
 
 #include "SIMPLib/FilterParameters/IntVec3FilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
@@ -47,8 +48,7 @@
 IntVec3Widget::IntVec3Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<IntVec3FilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "IntVec3Widget can ONLY be used with a IntVec3FilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, IntVec3Widget, IntVec3FilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 08b499d10f..f2160a187e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "IntWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 IntWidget::IntWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<IntFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "IntWidget can ONLY be used with a IntFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, IntWidget, IntFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 209261333c..99eac619b0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "LinkedBooleanWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -45,8 +47,7 @@
 LinkedBooleanWidget::LinkedBooleanWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<LinkedBooleanFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "LinkedBooleanWidget can ONLY be used with a LinkedBooleanFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, LinkedBooleanWidget, LinkedBooleanFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index b76f64177e..83876e3296 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -42,6 +42,7 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/Geometry/IGeometry.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/STLUtilities.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -56,8 +57,7 @@ LinkedDataContainerSelectionWidget::LinkedDataContainerSelectionWidget(FilterPar
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<LinkedDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "LinkedDataContainerSelectionWidget can ONLY be used with a LinkedDataContainerSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, LinkedDataContainerSelectionWidget, LinkedDataContainerSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 0651bbf2d9..27baaabb26 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -33,6 +33,8 @@
 
 #include "LinkedPathCreationWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -43,8 +45,7 @@
 LinkedPathCreationWidget::LinkedPathCreationWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<LinkedPathCreationFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "LinkedPathCreationWidget can ONLY be used with a StringFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, LinkedPathCreationWidget, LinkedPathCreationFilterParameter);
 
   setupGui();
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index 60fbde661d..87964f2c7f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -37,6 +37,7 @@
 
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/MontageSelectionFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/ui_MontageSelectionWidget.h"
 
@@ -48,8 +49,7 @@ MontageSelectionWidget::MontageSelectionWidget(FilterParameter* parameter, Abstr
 , m_DidCausePreflight(false)
 , m_Ui(new Ui::MontageSelectionWidget)
 {
-  m_FilterParameter = dynamic_cast<MontageSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MontageSelectionWidget can ONLY be used with a MontageSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MontageSelectionWidget, MontageSelectionFilterParameter);
 
   m_Ui->setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
index 0d4bf94f0e..893f706c60 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
@@ -35,6 +35,7 @@
 #include <QtCore/QSignalBlocker>
 
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -57,8 +58,7 @@ MontageStructureSelectionWidget::MontageStructureSelectionWidget(FilterParameter
 , m_Ui(new Ui::MontageStructureSelectionWidget)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<MontageStructureSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MontageStructureSelectionWidget can ONLY be used with a MontageStructureSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MontageStructureSelectionWidget, MontageStructureSelectionFilterParameter);
 
   m_Ui->setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 7bbf68f0b9..4eabb0a1ea 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -47,6 +47,7 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -61,8 +62,7 @@ MultiAttributeMatrixSelectionWidget::MultiAttributeMatrixSelectionWidget(FilterP
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<MultiAttributeMatrixSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiAttributeMatrixSelectionWidget can ONLY be used with a MultiAttributeMatrixSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MultiAttributeMatrixSelectionWidget, MultiAttributeMatrixSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index c58f8cb26d..70c297b882 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -44,6 +44,7 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -58,8 +59,7 @@ MultiDataArraySelectionWidget::MultiDataArraySelectionWidget(FilterParameter* pa
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<MultiDataArraySelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataArraySelectionWidget can ONLY be used with a MultiDataArraySelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MultiDataArraySelectionWidget, MultiDataArraySelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 6f6784d6c2..5616849bbb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -44,6 +44,7 @@
 #include "SIMPLib/FilterParameters/FilterParameter.h"
 #include "SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -58,8 +59,7 @@ MultiDataContainerSelectionWidget::MultiDataContainerSelectionWidget(FilterParam
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<MultiDataContainerSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiDataContainerSelectionWidget can ONLY be used with a MultiDataContainerSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MultiDataContainerSelectionWidget, MultiDataContainerSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
index e39d0ee4f0..c91ebff50e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
@@ -47,6 +47,7 @@
 #include <QtWidgets/QMenu>
 
 #include "SIMPLib/FilterParameters/MultiInputFileFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/QtConverter.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -65,8 +66,7 @@ MultiInputFileWidget::MultiInputFileWidget(FilterParameter* parameter, AbstractF
 : FilterParameterWidget(parameter, filter, parent)
 , m_Ui(new Ui::MultiInputFileWidget)
 {
-  m_FilterParameter = dynamic_cast<MultiInputFileFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "MultiInputFileWidget can ONLY be used with a MultiInputFileFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, MultiInputFileWidget, MultiInputFileFilterParameter);
 
   m_Ui->setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index a83e53ad11..5e28380e04 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "NumericTypeWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 NumericTypeWidget::NumericTypeWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<NumericTypeFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "NumericTypeWidget can ONLY be used with a NumericTypeFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, NumericTypeWidget, NumericTypeFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
index 6f1733b89d..e47c7553e1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
@@ -39,14 +39,15 @@
 
 #include <QtWidgets/QFileDialog>
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 OutputFileWidget::OutputFileWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : AbstractIOFileWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<OutputFileFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "OutputFileWidget can ONLY be used with a OutputFileFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, OutputFileWidget, OutputFileFilterParameter);
 
   setupGui();
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index 0158d1c093..4ef24b85e2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -37,14 +37,15 @@
 
 #include <QtWidgets/QFileDialog>
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 OutputPathWidget::OutputPathWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : AbstractIOFileWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<OutputPathFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "OutputPathWidget can ONLY be used with a OutputPathFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, OutputPathWidget, OutputPathFilterParameter);
 
   setupGui();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
index 082ea2f103..5dc67784b1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.cpp
@@ -33,6 +33,8 @@
 
 #include "ParagraphWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -43,8 +45,7 @@
 ParagraphWidget::ParagraphWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ParagraphFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ParagraphWidget can ONLY be used with a ParagraphFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ParagraphWidget, ParagraphFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 535dfedaac..e059b50dcd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -45,6 +45,7 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -58,8 +59,7 @@ PhaseTypeSelectionWidget::PhaseTypeSelectionWidget(FilterParameter* parameter, A
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<PhaseTypeSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "PhaseTypeSelectionWidget can ONLY be used with a PhaseTypeSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, PhaseTypeSelectionWidget, PhaseTypeSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index 81ba76cb69..6600460cbb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "PreflightUpdatedValueWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -45,8 +47,7 @@
 PreflightUpdatedValueWidget::PreflightUpdatedValueWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<PreflightUpdatedValueFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "PreflightUpdatedValueWidget can ONLY be used with a PreflightUpdatedValueFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, PreflightUpdatedValueWidget, PreflightUpdatedValueFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index 16e7a73656..a1177205e7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "RangeWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -45,8 +47,7 @@
 RangeWidget::RangeWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<RangeFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "RangeWidget can ONLY be used with a RangeFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, RangeWidget, RangeFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 2435517a35..8936ce77ed 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -47,6 +47,7 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "Widgets/ImportASCIIDataWizard/DataFormatPage.h"
@@ -65,11 +66,8 @@ ReadASCIIDataWidget::ReadASCIIDataWidget(FilterParameter* parameter, AbstractFil
 , m_WorkerThread(nullptr)
 , m_LineCounter(nullptr)
 {
-  m_FilterParameter = dynamic_cast<ReadASCIIDataFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "nullptr Pointer", "ReadASCIIDataWidget can ONLY be used with an ReadASCIIDataFilterParameter object");
-
-  m_Filter = dynamic_cast<ReadASCIIData*>(filter);
-  Q_ASSERT_X(m_Filter != nullptr, "nullptr Pointer", "ReadASCIIDataWidget can ONLY be used with an ReadASCIIData filter");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ReadASCIIDataWidget, ReadASCIIDataFilterParameter);
+  m_Filter = SIMPL_FILTER_COMPATIBILITY_CHECK(filter, parameter, ReadASCIIDataWidget, ReadASCIIData);
 
   setupUi(this);
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index e8a2af7a46..65c048999b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "ScalarTypeWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -47,8 +49,7 @@
 ScalarTypeWidget::ScalarTypeWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ScalarTypeFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ScalarTypeWidget can ONLY be used with a ScalarFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ScalarTypeWidget, ScalarTypeFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index bb18c58311..f399ba3786 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -36,6 +36,7 @@
 #include "SecondOrderPolynomialWidget.h"
 
 #include "SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -48,8 +49,7 @@
 SecondOrderPolynomialWidget::SecondOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<SecondOrderPolynomialFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "SecondOrderPolynomialWidget can ONLY be used with a SecondOrderPolynomialFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, SecondOrderPolynomialWidget, SecondOrderPolynomialFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
index d8ee73d223..4c203bf722 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "SeparatorWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "SVWidgetsLib/Widgets/SVStyle.h"
@@ -47,8 +49,7 @@
 SeparatorWidget::SeparatorWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<SeparatorFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "SeparatorWidget can ONLY be used with a SeparatorFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, SeparatorWidget, SeparatorFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index e42e755cad..fa036caa72 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -45,6 +45,7 @@
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h"
 #include "SIMPLib/Filtering/QMetaObjectUtilities.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
@@ -57,8 +58,7 @@ ShapeTypeSelectionWidget::ShapeTypeSelectionWidget(FilterParameter* parameter, A
 : FilterParameterWidget(parameter, filter, parent)
 , m_DidCausePreflight(false)
 {
-  m_FilterParameter = dynamic_cast<ShapeTypeSelectionFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ShapeTypeSelectionWidget can ONLY be used with a ShapeTypeSelectionFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ShapeTypeSelectionWidget, ShapeTypeSelectionFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index b5d62e9946..bdda68a571 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -35,6 +35,8 @@
 
 #include "StringWidget.h"
 
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
+
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 
 #include "FilterParameterWidgetsDialogs.h"
@@ -45,8 +47,7 @@
 StringWidget::StringWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<StringFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "StringWidget can ONLY be used with a StringFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, StringWidget, StringFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index 07ab4f9309..a29c9e13e4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -36,6 +36,7 @@
 #include "ThirdOrderPolynomialWidget.h"
 
 #include "SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -48,8 +49,7 @@
 ThirdOrderPolynomialWidget::ThirdOrderPolynomialWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<ThirdOrderPolynomialFilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "ThirdOrderPolynomialWidget can ONLY be used with a ThirdOrderPolynomialFilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, ThirdOrderPolynomialWidget, ThirdOrderPolynomialFilterParameter);
 
   setupUi(this);
   setupGui();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index cf8edc3f22..302cfd1eff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -34,7 +34,7 @@
 #include "UInt64Widget.h"
 
 #include "SIMPLib/FilterParameters/UInt64FilterParameter.h"
-
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
@@ -46,8 +46,7 @@
 UInt64Widget::UInt64Widget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
-  m_FilterParameter = dynamic_cast<UInt64FilterParameter*>(parameter);
-  Q_ASSERT_X(m_FilterParameter != nullptr, "NULL Pointer", "UInt64Widget can ONLY be used with a UInt64FilterParameter object");
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, UInt64Widget, UInt64FilterParameter);
 
   setupUi(this);
   setupGui();

From f1a35cc717b6127874e9a495f7879f1983f5ffc3 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 18 Feb 2021 14:47:52 -0500
Subject: [PATCH 346/397] Fixed double free in StandardOuputWidget

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
index 74a8a6d695..9f2b27ac3f 100644
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
@@ -167,12 +167,12 @@ void StandardOutputWidget::clearLog()
     msgBox.addButton(QMessageBox::No);
     msgBox.addButton(QMessageBox::Yes);
     msgBox.setDefaultButton(QMessageBox::No);
+    // Takes ownership
     msgBox.setCheckBox(cb);
 
     answer = msgBox.exec();
 
     displayDialog = !cb->isChecked();
-    delete cb;
 
     prefs->setValue("DisplayClearMessageBox", displayDialog);
   }

From 40e9e530c7099ac9f686e1d81a75353c65f23cde Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 18 Feb 2021 14:58:37 -0500
Subject: [PATCH 347/397] Fixed button check in DataStructureTreeView

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 3364b8a3f0..d1b2de1771 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -228,7 +228,7 @@ void DataStructureTreeView::mouseMoveEvent(QMouseEvent* event)
 {
   QTreeView::mouseMoveEvent(event);
 
-  if(event->buttons() & static_cast<int>(Qt::LeftButton != 0u != 0u))
+  if(event->buttons() & Qt::MouseButton::LeftButton)
   {
     QModelIndex index = indexAt(m_StartPos);
     if(m_Delegate->isFiltered() && !m_Delegate->indexMatchesReqs(index))

From 1d8ba0be8b99cb1043d4653e7cc765b9e2c148a7 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Thu, 18 Feb 2021 14:45:23 -0500
Subject: [PATCH 348/397] Fixed filter widgets not being destructed

* Changed PipelineItem::setFilterInputWidget to private

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp | 1 +
 Source/SVWidgetsLib/Widgets/PipelineItem.h   | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index a3eb8f6bb9..0cc24fee4a 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -52,6 +52,7 @@ PipelineItem::PipelineItem(const QVector<QVariant>& data, PipelineItem* parent)
 PipelineItem::~PipelineItem()
 {
   qDeleteAll(m_ChildItems);
+  m_FilterInputWidget->deleteLater();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.h b/Source/SVWidgetsLib/Widgets/PipelineItem.h
index d8c19ebd9d..fba87e7b34 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.h
@@ -49,10 +49,6 @@ class SVWidgetsLib_EXPORT PipelineItem
   PipelineItem(const QVector<QVariant>& data, PipelineItem* parent = nullptr);
   virtual ~PipelineItem();
 
-  /**
-   * @brief Setter property for FilterInputWidget
-   */
-  void setFilterInputWidget(FilterInputWidget* value);
   /**
    * @brief Getter property for FilterInputWidget
    * @return Value of FilterInputWidget
@@ -323,6 +319,11 @@ class SVWidgetsLib_EXPORT PipelineItem
 
   void setupFilterInputWidget();
 
+  /**
+   * @brief Setter property for FilterInputWidget
+   */
+  void setFilterInputWidget(FilterInputWidget* value);
+
 public:
   PipelineItem(const PipelineItem&) = delete;            // Copy Constructor Not Implemented
   PipelineItem(PipelineItem&&) = delete;                 // Move Constructor Not Implemented

From dd7bdf0706463e93afc98840a8494a633af60f36 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 19 Feb 2021 12:24:01 -0500
Subject: [PATCH 349/397] Fixing Requirement checking errors in
 DataArrayPathSelectionWidget

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../Widgets/DataArrayPathSelectionWidget.cpp  | 153 +++++++++++-------
 1 file changed, 94 insertions(+), 59 deletions(-)

diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 72df311bf6..2324a10bf6 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -52,57 +52,6 @@
 #include "SVWidgetsLib/QtSupport/QtSSettings.h"
 #include "SVWidgetsLib/Widgets/SVStyle.h"
 
-namespace
-{
-
-/**
- * @brief CheckPathRequirements This is a common function that 3 other methods below implement
- * @param filter AbstractFilter
- * @param path The DataArrayPath
- * @param reqs The requirements
- * @return Boolean if we pass or not.
- */
-template <typename RequirementsType>
-bool CheckDataPathAndRequirements(AbstractFilter* filter, const DataArrayPath& path, const RequirementsType& reqs)
-{
-  if(nullptr == filter)
-  {
-    return false;
-  }
-  if(nullptr == filter->getDataContainerArray())
-  {
-    return false;
-  }
-
-  // Check that the DataContainer exists
-  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
-  if(nullptr == dc)
-  {
-    return false;
-  }
-
-  // Check Geometry
-  if(!reqs.dcGeometryTypes.empty())
-  {
-    // Unknown Geometry gets a pass
-    if(!SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Unknown))
-    {
-      IGeometry::Pointer geom = dc->getGeometry();
-      if(nullptr == geom)
-      {
-        return false;
-      }
-      if(!SIMPL::contains(reqs.dcGeometryTypes, geom->getGeometryType()) && !SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Any))
-      {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-} // namespace
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -231,7 +180,41 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-  return ::CheckDataPathAndRequirements(filter, path, reqs);
+  if(nullptr == filter)
+  {
+    return false;
+  }
+  if(nullptr == filter->getDataContainerArray())
+  {
+    return false;
+  }
+
+  // Check that the DataContainer exists
+  DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
+  if(nullptr == dc)
+  {
+    return false;
+  }
+
+  // Check Geometry
+  if(!reqs.dcGeometryTypes.empty())
+  {
+    // Unknown Geometry gets a pass
+    if(!SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Unknown))
+    {
+      IGeometry::Pointer geom = dc->getGeometry();
+      if(nullptr == geom)
+      {
+        return false;
+      }
+      if(!SIMPL::contains(reqs.dcGeometryTypes, geom->getGeometryType()) && !SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Any))
+      {
+        return false;
+      }
+    }
+  }
+
+  return true;
 }
 
 // -----------------------------------------------------------------------------
@@ -243,13 +226,39 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-
-  if(!::CheckDataPathAndRequirements(filter, path, reqs))
+  if(nullptr == filter)
+  {
+    return false;
+  }
+  if(nullptr == filter->getDataContainerArray())
   {
     return false;
   }
-  // This is OK because one of the checks in the function above is if "dc" would be nullptr
+
+  // Check that the DataContainer exists
   DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
+  if(nullptr == dc)
+  {
+    return false;
+  }
+
+  // Check if geometry exists and matches the requirements only if a geometry is required
+  if(!reqs.dcGeometryTypes.empty())
+  {
+    // Unknown Geometry gets a pass
+    if(!SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Unknown))
+    {
+      IGeometry::Pointer geom = dc->getGeometry();
+      if(nullptr == geom)
+      {
+        return false;
+      }
+      if(!SIMPL::contains(reqs.dcGeometryTypes, geom->getGeometryType()) && !SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Any))
+      {
+        return false;
+      }
+    }
+  }
 
   // Check AttributeMatrix
   AttributeMatrix::Pointer am = dc->getAttributeMatrix(path);
@@ -278,13 +287,39 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
   {
     return false;
   }
-
-  if(!::CheckDataPathAndRequirements(filter, path, reqs))
+  if(nullptr == filter)
   {
     return false;
   }
-  // This is OK because one of the checks in the function above is if "dc" would be nullptr
+  if(nullptr == filter->getDataContainerArray())
+  {
+    return false;
+  }
+
+  // Check that the DataContainer exists
   DataContainer::Pointer dc = filter->getDataContainerArray()->getDataContainer(path);
+  if(nullptr == dc)
+  {
+    return false;
+  }
+
+  // Check if geometry exists and matches the requirements only if a geometry is required
+  if(!reqs.dcGeometryTypes.empty())
+  {
+    // Unknown Geometry gets a pass
+    if(!SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Unknown))
+    {
+      IGeometry::Pointer geom = dc->getGeometry();
+      if(nullptr == geom)
+      {
+        return false;
+      }
+      if(!SIMPL::contains(reqs.dcGeometryTypes, geom->getGeometryType()) && !SIMPL::contains(reqs.dcGeometryTypes, IGeometry::Type::Any))
+      {
+        return false;
+      }
+    }
+  }
 
   // Check AttributeMatrix
   AttributeMatrix::Pointer am = dc->getAttributeMatrix(path);
@@ -295,7 +330,7 @@ bool DataArrayPathSelectionWidget::CheckPathRequirements(AbstractFilter* filter,
 
   if(!SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Unknown))
   {
-    if(!reqs.amTypes.empty() && !(SIMPL::contains(reqs.amTypes, am->getType()) && SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Any)))
+    if(!reqs.amTypes.empty() && !SIMPL::contains(reqs.amTypes, am->getType()) && !SIMPL::contains(reqs.amTypes, AttributeMatrix::Type::Any))
     {
       return false;
     }

From 14456fde7ae15293a6b4f74026796c53831c2e04 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 24 Feb 2021 10:26:15 -0500
Subject: [PATCH 350/397] Remove QtWebEngine from compile. It is not used
 anymore

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                                |   3 +-
 Source/SVWidgetsLib/CMakeLists.txt            |   4 -
 .../Core/SVWidgetsLibConfiguration.h.in       |   3 -
 .../Widgets/SVUserManualDialog.cpp            | 239 ------------------
 .../SVWidgetsLib/Widgets/SVUserManualDialog.h | 115 ---------
 Source/SVWidgetsLib/Widgets/SourceList.cmake  |   7 -
 .../Widgets/UI_Files/SVUserManualDialog.ui    | 223 ----------------
 7 files changed, 1 insertion(+), 593 deletions(-)
 delete mode 100644 Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
 delete mode 100644 Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
 delete mode 100755 Source/SVWidgetsLib/Widgets/UI_Files/SVUserManualDialog.ui

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbb30c0fd6..bed7bffc4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -287,8 +287,7 @@ set(SIMPL_Qt5_COMPONENTS Core Network)
 if( SIMPL_Group_WIDGETS)
   set(SIMPL_Qt5_COMPONENTS Core Widgets Network Gui Concurrent Svg Xml OpenGL PrintSupport)
 endif()
-set(USE_QtWebEngine FALSE)
-CMP_AddQt5Support( "${SIMPL_Qt5_COMPONENTS}" "${USE_QtWebEngine}" "${SIMPLProj_BINARY_DIR}" "SIMPL")
+CMP_AddQt5Support( "${SIMPL_Qt5_COMPONENTS}" "${SIMPLProj_BINARY_DIR}" "SIMPL")
 
 # --------------------------------------------------------------------
 # Should we use enable NTFS file checking on Windows
diff --git a/Source/SVWidgetsLib/CMakeLists.txt b/Source/SVWidgetsLib/CMakeLists.txt
index 752e8da41f..1b085e4314 100755
--- a/Source/SVWidgetsLib/CMakeLists.txt
+++ b/Source/SVWidgetsLib/CMakeLists.txt
@@ -49,15 +49,11 @@ mark_as_advanced(SVWidgetsLib_ENABLE_HDF5)
 
 include(${CMP_SOURCE_DIR}/cmpProject.cmake)
 
-option(SIMPL_USE_QtWebEngine "Use QWebEngine to display Help. OFF=Use default web browser" ON)
-set_property(GLOBAL PROPERTY SIMPL_USE_QtWebEngine "${SIMPL_USE_QtWebEngine}")
-
 # --------------------------------------------------------------------
 # Find and Use the Qt5 Libraries
 include(${CMP_SOURCE_DIR}/ExtLib/Qt5Support.cmake)
 set(SVWidgetsLib_Qt5_Components Core Widgets Network Gui Concurrent Svg Xml OpenGL PrintSupport )
 CMP_AddQt5Support( "${SVWidgetsLib_Qt5_Components}"
-                    "${SIMPL_USE_QtWebEngine}"
                     "${SIMPLProj_BINARY_DIR}"
                     "SVWidgetsLib")
 
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibConfiguration.h.in b/Source/SVWidgetsLib/Core/SVWidgetsLibConfiguration.h.in
index 9132ad96fb..2466ffda48 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibConfiguration.h.in
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibConfiguration.h.in
@@ -36,9 +36,6 @@
 /* Defined if SIMPL uses mkdocs (python utility) for creating HTML documentation */
 #cmakedefine SIMPL_USE_MKDOCS
 
-/* Defined if SIMPL QtWebEngine to display help docs or if the local web browser is used instead */
-#cmakedefine SIMPL_USE_QtWebEngine
-
 #if (_MSC_VER >= 1)
 
   #pragma warning (error: 4715) /* Not all control points return a value */
diff --git a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
deleted file mode 100644
index 09f6137204..0000000000
--- a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#include "SVUserManualDialog.h"
-
-#include <QtWidgets/QAction>
-
-#include <QtWebEngineWidgets/QWebEngineHistory>
-
-#include "SIMPLib/Filtering/FilterManager.h"
-
-#ifdef SIMPL_USE_MKDOCS
-#define URL_GENERATOR QtSDocServer
-#include "SVWidgetsLib/QtSupport/QtSDocServer.h"
-#else
-#define URL_GENERATOR QtSHelpUrlGenerator
-#include "SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h"
-#endif
-
-#if defined(SIMPL_USE_MKDOCS) && defined(SIMPL_USE_DISCOUNT)
-#error Both SIMPL_USE_MKDOCS and SIMPL_USE_DISCOUNT are Defined. Please turn one off.
-#endif
-SVUserManualDialog* SVUserManualDialog::self = nullptr;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-SVUserManualDialog::SVUserManualDialog(QWidget* parent)
-: QWidget(parent)
-{
-  Q_ASSERT_X(!self, "SVUserManualDialog", "There should be only one SVUserManualDialog object");
-
-  setupUi(this);
-  SVUserManualDialog::self = this;
-
-  // Create the web view
-  m_WebView = new QWebEngineView(this);
-  m_WebView->setObjectName(QStringLiteral("m_WebView"));
-  QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding);
-  sizePolicy1.setHorizontalStretch(0);
-  sizePolicy1.setVerticalStretch(0);
-  sizePolicy1.setHeightForWidth(m_WebView->sizePolicy().hasHeightForWidth());
-  m_WebView->setSizePolicy(sizePolicy1);
-  m_WebView->setUrl(QUrl(QStringLiteral("about:blank")));
-  m_WebView->setMinimumHeight(500);
-  gridLayout->addWidget(m_WebView, 2, 0, 1, 1);
-
-  self->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
-
-#if defined(Q_OS_MAC)
-  m_CloseAction = new QAction(this);
-  m_CloseAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_W));
-  connect(m_CloseAction, SIGNAL(triggered()), this, SLOT(close()));
-  addAction(m_CloseAction);
-#endif
-
-  connect(m_WebView, SIGNAL(loadFinished(bool)), this, SLOT(updateButtons(bool)));
-  connect(m_WebView, SIGNAL(urlChanged(QUrl)), this, SLOT(updateUrlLineEdit(QUrl)));
-  connect(m_WebView, SIGNAL(titleChanged(QString)), this, SLOT(webViewTitleChanged(QString)));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-SVUserManualDialog::~SVUserManualDialog()
-{
-  delete m_WebView;
-#if defined(Q_OS_MAC)
-  delete m_CloseAction;
-#endif
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-SVUserManualDialog* SVUserManualDialog::Instance(QWidget* parent)
-{
-  if(!self)
-  {
-    self = new SVUserManualDialog(parent);
-  }
-  return self;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QWebEngineView* SVUserManualDialog::getWebView()
-{
-  return m_WebView;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::LaunchHelpDialog(QUrl url)
-{
-  SVUserManualDialog* dialog = SVUserManualDialog::Instance();
-  dialog->loadWebPage(url);
-
-  if(!dialog->isVisible())
-  {
-    dialog->show();
-  }
-
-  dialog->activateWindow();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::loadWebPage(const QUrl& url)
-{
-  urlLineEdit->setText(url.toString());
-  getWebView()->load(url);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::LaunchHelpDialog(QString className)
-{
-  QUrl helpURL = URL_GENERATOR::GenerateHTMLUrl(className);
-  SVUserManualDialog::LaunchHelpDialog(helpURL);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::on_urlLineEdit_returnPressed()
-{
-  QString url = urlLineEdit->text();
-  if(!url.startsWith("http://"))
-  {
-    url = QString("http://") + url;
-  }
-  loadWebPage(QUrl(url));
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::on_backBtn_clicked()
-{
-  m_WebView->back();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::on_forwardBtn_clicked()
-{
-  m_WebView->forward();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::on_refreshBtn_clicked()
-{
-  m_WebView->reload();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::updateUrlLineEdit(QUrl url)
-{
-
-  urlLineEdit->setText(url.toString());
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::webViewTitleChanged(QString title)
-{
-  this->setWindowTitle(title);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void SVUserManualDialog::updateButtons(bool /* ok */)
-{
-  QWebEngineHistory* history = m_WebView->history();
-
-  // Check forwards navigation
-  if(history->canGoForward() == false)
-  {
-    forwardBtn->setDisabled(true);
-  }
-  else
-  {
-    forwardBtn->setEnabled(true);
-  }
-
-  // Check backwards navigation
-  if(history->canGoBack() == false || history->backItem().url().toDisplayString() == "about:blank")
-  {
-    backBtn->setDisabled(true);
-  }
-  else
-  {
-    backBtn->setEnabled(true);
-  }
-}
diff --git a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h b/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
deleted file mode 100644
index 4c2d47bcfe..0000000000
--- a/Source/SVWidgetsLib/Widgets/SVUserManualDialog.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ============================================================================
- * Copyright (c) 2009-2016 BlueQuartz Software, LLC
- *
- * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
- * 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 COPYRIGHT HOLDER 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.
- *
- * The code contained herein was partially funded by the followig contracts:
- *    United States Air Force Prime Contract FA8650-07-D-5800
- *    United States Air Force Prime Contract FA8650-10-D-5210
- *    United States Prime Contract Navy N00173-07-C-2068
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#pragma once
-
-#include "SVWidgetsLib/SVWidgetsLib.h"
-
-#include <QtWidgets/QWidget>
-
-#include <QtWebEngineWidgets/QWebEngineView>
-
-#include "ui_SVUserManualDialog.h"
-
-/**
- * @brief The SVUserManualDialog class
- */
-class SVWidgetsLib_EXPORT SVUserManualDialog : public QWidget, public Ui::SVUserManualDialog
-{
-  Q_OBJECT
-
-public:
-  /**
-   * @brief Destructor
-   * @return
-   */
-  virtual ~SVUserManualDialog();
-
-  /**
-   * @brief Static instance to retrieve the global instance of this class
-   * @return
-   */
-  static SVUserManualDialog* Instance(QWidget* parent = nullptr);
-
-  /**
-   * @brief Static function to launch the help dialog with the given URL
-   * @return
-   */
-  static void LaunchHelpDialog(QUrl url);
-
-  /**
-   * @brief Static function to launch the help dialog with the given filter's classname
-   * @param className The name of the Filter's class in C++ as given by the "getNameOfClass()" static function of the filter.
-   * @return
-   */
-  static void LaunchHelpDialog(QString className);
-
-  /**
-   * @brief getWebView
-   * @return QWebEngineView*
-   */
-  QWebEngineView* getWebView();
-
-  /**
-   * @brief loadWebPage
-   * @param url
-   */
-  void loadWebPage(const QUrl& url);
-
-protected:
-  explicit SVUserManualDialog(QWidget* parent = nullptr);
-
-protected slots:
-  void on_backBtn_clicked();
-  void on_forwardBtn_clicked();
-  void on_refreshBtn_clicked();
-  void updateButtons(bool ok);
-  void on_urlLineEdit_returnPressed();
-  void updateUrlLineEdit(QUrl url);
-  void webViewTitleChanged(QString title);
-
-private:
-  static SVUserManualDialog* self;
-
-  QWebEngineView* m_WebView;
-
-  QAction* m_CloseAction = nullptr;
-
-public:
-  SVUserManualDialog(const SVUserManualDialog&) = delete;            // Copy Constructor Not Implemented
-  SVUserManualDialog(SVUserManualDialog&&) = delete;                 // Move Constructor Not Implemented
-  SVUserManualDialog& operator=(const SVUserManualDialog&) = delete; // Copy Assignment Not Implemented
-  SVUserManualDialog& operator=(SVUserManualDialog&&) = delete;      // Move Assignment Not Implemented
-};
diff --git a/Source/SVWidgetsLib/Widgets/SourceList.cmake b/Source/SVWidgetsLib/Widgets/SourceList.cmake
index ecefa3080e..c5ab636bf6 100755
--- a/Source/SVWidgetsLib/Widgets/SourceList.cmake
+++ b/Source/SVWidgetsLib/Widgets/SourceList.cmake
@@ -140,13 +140,6 @@ SET(SVWidgetsLib_Widgets_Util_SRCS
   ${SVWidgetsLib_SOURCE_DIR}/Widgets/util/RemoveFilterCommand.cpp
   )
 
-#-- Only include this widget if we are compiling against QtWebEngine
-if(SIMPL_USE_QtWebEngine)
-  set(SVWidgetsLib_Widgets_MOC_HDRS ${SVWidgetsLib_Widgets_MOC_HDRS}  ${SVWidgetsLib_SOURCE_DIR}/Widgets/SVUserManualDialog.h)
-  set(SVWidgetsLib_Widgets_SRCS ${SVWidgetsLib_Widgets_SRCS} ${SVWidgetsLib_SOURCE_DIR}/Widgets/SVUserManualDialog.cpp)
-  set(SVWidgetsLib_Widgets_UIS ${SVWidgetsLib_Widgets_UIS} ${SVWidgetsLib_SOURCE_DIR}/Widgets/UI_Files/SVUserManualDialog.ui)
-endif()
-
 cmp_IDE_SOURCE_PROPERTIES( "SVWidgetsLib/Widgets/util" "${SVWidgetsLib_Widgets_Util_HDRS}" "${SVWidgetsLib_Widgets_Util_SRCS}" "${PROJECT_INSTALL_HEADERS}")
 source_group("${SVWidgetsLib_SOURCE_DIR}/Widgets util" FILES ${HEADERS} ${SOURCES})
 
diff --git a/Source/SVWidgetsLib/Widgets/UI_Files/SVUserManualDialog.ui b/Source/SVWidgetsLib/Widgets/UI_Files/SVUserManualDialog.ui
deleted file mode 100755
index 4140216a1d..0000000000
--- a/Source/SVWidgetsLib/Widgets/UI_Files/SVUserManualDialog.ui
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>SVUserManualDialog</class>
- <widget class="QWidget" name="SVUserManualDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>717</width>
-    <height>34</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>SIMPLView Help</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QFrame" name="frame">
-     <property name="styleSheet">
-      <string notr="true">QFrame {
-	border-bottom: 2px solid;
-	border-bottom-color: rgb(82, 82, 82);
-}</string>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QtSHoverButton" name="backBtn">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Show the previous page</string>
-        </property>
-        <property name="statusTip">
-         <string>Show the previous page</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../icons/images/Icons.qrc">
-          <normaloff>:/SIMPL/icons/images/navigate_left.png</normaloff>:/navigate_left.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QtSHoverButton" name="forwardBtn">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Show the next page</string>
-        </property>
-        <property name="statusTip">
-         <string>Show the next page</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../icons/images/Icons.qrc">
-          <normaloff>:/SIMPL/icons/images/navigate_right.png</normaloff>:/navigate_right.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QtSHoverButton" name="refreshBtn">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Reload this page</string>
-        </property>
-        <property name="statusTip">
-         <string>Reload this page</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../icons/images/Icons.qrc">
-          <normaloff>:/SIMPL/icons/images/refresh.png</normaloff>:/refresh.png</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>32</width>
-          <height>32</height>
-         </size>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="urlLineEdit">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>QtSHoverButton</class>
-   <extends>QPushButton</extends>
-   <header>QtSHoverButton.h</header>
-  </customwidget>
- </customwidgets>
- <resources>
-  <include location="../../../../Resources/SIMPL.qrc"/>
- </resources>
- <connections/>
-</ui>

From 258500ae01fe483efb9216f09b5f99522c6f78b5 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 24 Feb 2021 14:31:36 -0500
Subject: [PATCH 351/397] Changed some FilterParameters to take std::vector

* Fixed bug in MultiDataArraySelectionWidget where it was not
putting the correct requirements on its DataArrayPathSelectionWidget
* Replaced usage of qproperties with FilterParameter callbacks in
MultiDataArraySelectionWidget

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/PhaseType.cpp           |   2 +-
 Source/SIMPLib/Common/PhaseType.h             |   2 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |   4 +-
 .../CoreFilters/ApplyImageTransforms.h        |   8 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |  31 ++--
 .../CoreFilters/CombineAttributeArrays.h      |  15 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |  20 +--
 .../CoreFilters/ConvertColorToGrayScale.h     |  10 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |  10 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   2 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   8 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |  66 ++++----
 .../ExtractAttributeArraysFromGeometry.cpp    |   2 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |   4 +-
 .../CoreFilters/ExtractVertexGeometry.h       |  14 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   2 +-
 .../CoreFilters/GenerateTiltSeries.cpp        |   8 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |   2 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |  43 ++----
 Source/SIMPLib/CoreFilters/InitializeData.h   |  15 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |  12 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |  40 ++---
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |  25 ++-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   2 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   4 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |   4 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |   4 +-
 .../SetOriginResolutionImageGeom.cpp          |   4 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   4 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |   4 +-
 .../Testing/Cxx/ExportDataTest.cpp            |   2 +-
 .../Testing/Cxx/ExtractVertexGeometryTest.cpp |   2 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   4 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |   2 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |  30 +---
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |  15 +-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  | 108 +++++++++----
 Source/SIMPLib/DataContainers/DataArrayPath.h |  22 +++
 .../DataContainers/DataContainerArray.cpp     | 145 ++++++++++--------
 .../DataContainers/DataContainerArray.h       |  11 ++
 .../ChoiceFilterParameter.cpp                 |   6 +-
 .../FilterParameters/ChoiceFilterParameter.h  |   9 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   8 +-
 ...mparisonSelectionAdvancedFilterParameter.h |   8 +-
 .../ComparisonSelectionFilterParameter.cpp    |   8 +-
 .../ComparisonSelectionFilterParameter.h      |   8 +-
 .../LinkedBooleanFilterParameter.cpp          |   8 +-
 .../LinkedBooleanFilterParameter.h            |   8 +-
 .../LinkedChoicesFilterParameter.cpp          |   8 +-
 .../LinkedChoicesFilterParameter.h            |   8 +-
 ...dDataContainerSelectionFilterParameter.cpp |   6 +-
 ...kedDataContainerSelectionFilterParameter.h |   8 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  18 +--
 ...iAttributeMatrixSelectionFilterParameter.h |  12 +-
 ...MultiDataArraySelectionFilterParameter.cpp |  14 +-
 .../MultiDataArraySelectionFilterParameter.h  |  12 +-
 ...iDataContainerSelectionFilterParameter.cpp |  20 +--
 ...ltiDataContainerSelectionFilterParameter.h |  12 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |   6 +-
 .../PhaseTypeSelectionFilterParameter.h       |   8 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp    |  30 ++--
 Source/SIMPLib/Geometry/IGeometry.cpp         |   4 +-
 Source/SIMPLib/Geometry/IGeometry.h           |   2 +-
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   5 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |  68 +++-----
 Source/SIMPLib/TestFilters/GenericExample.h   |  16 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   7 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |   9 +-
 .../MultiDataArraySelectionWidget.cpp         |  13 +-
 .../MultiDataContainerSelectionWidget.cpp     |   6 +-
 .../PhaseTypeSelectionWidget.cpp              |   2 +-
 .../Widgets/FilterInputWidget.cpp             |  22 ++-
 72 files changed, 544 insertions(+), 547 deletions(-)

diff --git a/Source/SIMPLib/Common/PhaseType.cpp b/Source/SIMPLib/Common/PhaseType.cpp
index 5d23b159a9..9b961a84fe 100644
--- a/Source/SIMPLib/Common/PhaseType.cpp
+++ b/Source/SIMPLib/Common/PhaseType.cpp
@@ -177,7 +177,7 @@ PhaseType::Type PhaseType::getPhaseType(const char* str)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PhaseType::getPhaseTypeStrings(QStringList& strings)
+void PhaseType::getPhaseTypeStrings(std::vector<QString>& strings)
 {
   strings.clear();
   strings.push_back(PrimaryStr());
diff --git a/Source/SIMPLib/Common/PhaseType.h b/Source/SIMPLib/Common/PhaseType.h
index 840d34d6bf..9ca2c15ec6 100644
--- a/Source/SIMPLib/Common/PhaseType.h
+++ b/Source/SIMPLib/Common/PhaseType.h
@@ -138,7 +138,7 @@ class SIMPLib_EXPORT PhaseType
    * @brief getPhaseTypeStrings
    * @param strings
    */
-  static void getPhaseTypeStrings(QStringList& strings);
+  static void getPhaseTypeStrings(std::vector<QString>& strings);
 
   /**
    * @brief getPhaseTypeEnums
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index a719b7a45a..cbb058f52b 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -263,13 +263,13 @@ QString ApplyImageTransforms::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void ApplyImageTransforms::setImageDataContainers(const QStringList& value)
+void ApplyImageTransforms::setImageDataContainers(const std::vector<QString>& value)
 {
   m_ImageDataContainers = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList ApplyImageTransforms::getImageDataContainers() const
+std::vector<QString> ApplyImageTransforms::getImageDataContainers() const
 {
   return m_ImageDataContainers;
 }
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index e45c57172b..65392184ae 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -71,14 +71,14 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
   /**
    * @brief Setter property for ImageDataContainers
    */
-  void setImageDataContainers(const QStringList& value);
+  void setImageDataContainers(const std::vector<QString>& value);
   /**
    * @brief Getter property for ImageDataContainers
    * @return Value of ImageDataContainers
    */
-  QStringList getImageDataContainers() const;
+  std::vector<QString> getImageDataContainers() const;
 
-  Q_PROPERTY(QStringList ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
+  Q_PROPERTY(QStringVec ImageDataContainers READ getImageDataContainers WRITE setImageDataContainers)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
@@ -149,7 +149,7 @@ class SIMPLib_EXPORT ApplyImageTransforms : public AbstractFilter
   void initialize();
 
 private:
-  QStringList m_ImageDataContainers = {};
+  std::vector<QString> m_ImageDataContainers = {};
 
 public:
   /* Rule of 5: All special member functions should be defined if any are defined.
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index 8e432f837a..a66fe3b942 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -202,19 +202,6 @@ void CombineAttributeArrays::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void CombineAttributeArrays::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  reader->openFilterGroup(this, index);
-  setSelectedDataArrayPaths(reader->readDataArrayPathVector("SelectedDataArrayPaths", getSelectedDataArrayPaths()));
-  setStackedDataArrayName(reader->readString("StackedDataArrayName", getStackedDataArrayName()));
-  setNormalizeData(reader->readValue("NormalizeData", getNormalizeData()));
-  setMoveValues(reader->readValue("MoveValues", getMoveValues()));
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -255,7 +242,7 @@ void CombineAttributeArrays::dataCheck()
     return;
   }
 
-  QVector<DataArrayPath> paths = getSelectedDataArrayPaths();
+  std::vector<DataArrayPath> paths = getSelectedDataArrayPaths();
 
   if(!DataArrayPath::ValidateVector(paths))
   {
@@ -265,7 +252,7 @@ void CombineAttributeArrays::dataCheck()
 
   int32_t totalComps = 0;
 
-  for(int32_t i = 0; i < paths.count(); i++)
+  for(int32_t i = 0; i < paths.size(); i++)
   {
     DataArrayPath path = paths.at(i);
     IDataArray::WeakPointer ptr = getDataContainerArray()->getPrereqIDataArrayFromPath(this, path);
@@ -292,7 +279,7 @@ void CombineAttributeArrays::dataCheck()
 
   if(getMoveValues() && getInPreflight())
   {
-    QVector<DataArrayPath> paths = getSelectedDataArrayPaths();
+    std::vector<DataArrayPath> paths = getSelectedDataArrayPaths();
     for(DataArrayPath path : paths)
     {
       AttributeMatrix::Pointer attrMat = getDataContainerArray()->getAttributeMatrix(path);
@@ -316,8 +303,8 @@ void CombineAttributeArrays::execute()
 
   if(getMoveValues())
   {
-    QVector<DataArrayPath> paths = getSelectedDataArrayPaths();
-    for(DataArrayPath path : paths)
+    std::vector<DataArrayPath> paths = getSelectedDataArrayPaths();
+    for(const DataArrayPath& path : paths)
     {
       AttributeMatrix::Pointer attrMat = getDataContainerArray()->getAttributeMatrix(path);
       attrMat->removeAttributeArray(path.getDataArrayName());
@@ -332,8 +319,8 @@ std::list<DataArrayPath> CombineAttributeArrays::getDeletedPaths()
 {
   if(getMoveValues())
   {
-    QList<DataArrayPath> tList = getSelectedDataArrayPaths().toList();
-    return std::list<DataArrayPath>(tList.begin(), tList.end());
+    std::vector<DataArrayPath> tList = getSelectedDataArrayPaths();
+    return std::list<DataArrayPath>(tList.cbegin(), tList.cend());
   }
   return std::list<DataArrayPath>();
 }
@@ -440,13 +427,13 @@ QString CombineAttributeArrays::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void CombineAttributeArrays::setSelectedDataArrayPaths(const QVector<DataArrayPath>& value)
+void CombineAttributeArrays::setSelectedDataArrayPaths(const std::vector<DataArrayPath>& value)
 {
   m_SelectedDataArrayPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> CombineAttributeArrays::getSelectedDataArrayPaths() const
+std::vector<DataArrayPath> CombineAttributeArrays::getSelectedDataArrayPaths() const
 {
   return m_SelectedDataArrayPaths;
 }
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index 5b4d0072f1..b49de8b9e5 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -56,7 +56,7 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
   PYB11_FILTER()
   PYB11_SHARED_POINTERS(CombineAttributeArrays)
   PYB11_FILTER_NEW_MACRO(CombineAttributeArrays)
-  PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  PYB11_PROPERTY(std::vector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
   PYB11_PROPERTY(QString StackedDataArrayName READ getStackedDataArrayName WRITE setStackedDataArrayName)
   PYB11_PROPERTY(bool NormalizeData READ getNormalizeData WRITE setNormalizeData)
   PYB11_END_BINDINGS()
@@ -95,14 +95,14 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
   /**
    * @brief Setter property for SelectedDataArrayPaths
    */
-  void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
+  void setSelectedDataArrayPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for SelectedDataArrayPaths
    * @return Value of SelectedDataArrayPaths
    */
-  QVector<DataArrayPath> getSelectedDataArrayPaths() const;
+  std::vector<DataArrayPath> getSelectedDataArrayPaths() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  Q_PROPERTY(DataArrayPathVec SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
 
   /**
    * @brief Setter property for StackedDataArrayName
@@ -190,11 +190,6 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
    */
   void setupFilterParameters() override;
 
-  /**
-   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-   */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
   /**
    * @brief execute Reimplemented from @see AbstractFilter class
    */
@@ -221,7 +216,7 @@ class SIMPLib_EXPORT CombineAttributeArrays : public AbstractFilter
 private:
   IDataArrayWkPtrType m_StackedDataPtr;
 
-  QVector<DataArrayPath> m_SelectedDataArrayPaths = {QVector<DataArrayPath>()};
+  std::vector<DataArrayPath> m_SelectedDataArrayPaths = {};
   QString m_StackedDataArrayName = {SIMPL::GeneralData::CombinedData};
   bool m_NormalizeData = {false};
   bool m_MoveValues = {false};
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index db0647d03d..7f81d1b46e 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -203,15 +203,15 @@ void ConvertColorToGrayScale::setupFilterParameters()
 
   FilterParameterVectorType parameters;
   {
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Luminosity");
     choices.push_back("Average");
     choices.push_back("Lightness");
     choices.push_back("SingleChannel");
 
-    QStringList linkedProps;
-    linkedProps << "ColorWeights"
-                << "ColorChannel";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("ColorWeights");
+    linkedProps.push_back("ColorChannel");
 
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Conversion Algorithm");
@@ -233,7 +233,7 @@ void ConvertColorToGrayScale::setupFilterParameters()
   req.amTypes = AttributeMatrix::Types(1, AttributeMatrix::Type::Cell);
   parameters.push_back(SIMPL_NEW_MDA_SELECTION_FP("Input Attribute Arrays", InputDataArrayVector, FilterParameter::Category::RequiredArray, ConvertColorToGrayScale, req));
 
-  QStringList linkedProps("OutputAttributeMatrixName");
+  std::vector<QString> linkedProps = {"OutputAttributeMatrixName"};
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Create Attribute Matrix", CreateNewAttributeMatrix, FilterParameter::Category::Parameter, ConvertColorToGrayScale, linkedProps));
   parameters.push_back(SIMPL_NEW_STRING_FP("Output Cell Attribute Matrix", OutputAttributeMatrixName, FilterParameter::Category::CreatedArray, ConvertColorToGrayScale));
 
@@ -267,7 +267,7 @@ void ConvertColorToGrayScale::dataCheck()
     setErrorCondition(-62102, message);
   }
 
-  if(getInputDataArrayVector().isEmpty())
+  if(getInputDataArrayVector().empty())
   {
     QString message = QObject::tr("At least one Attribute Array must be selected");
     setErrorCondition(-62103, message);
@@ -299,7 +299,7 @@ void ConvertColorToGrayScale::dataCheck()
   }
 
   // Get the list of checked array names from the input m_Data arrays list
-  QList<QString> arrayNames = DataArrayPath::GetDataArrayNames(getInputDataArrayVector());
+  std::vector<QString> arrayNames = DataArrayPath::GetDataArrayNames(getInputDataArrayVector());
   m_OutputArrayPaths.clear();
   m_OutputArrayPaths.resize(arrayNames.size());
   for(int32_t i = 0; i < arrayNames.size(); i++)
@@ -350,7 +350,7 @@ void ConvertColorToGrayScale::execute()
     return;
   }
 
-  QVector<DataArrayPath> inputArrayPaths = getInputDataArrayVector();
+  std::vector<DataArrayPath> inputArrayPaths = getInputDataArrayVector();
   qint32 size = inputArrayPaths.size();
 
   for(qint32 i = 0; i < size; i++)
@@ -541,13 +541,13 @@ int ConvertColorToGrayScale::getColorChannel() const
 }
 
 // -----------------------------------------------------------------------------
-void ConvertColorToGrayScale::setInputDataArrayVector(const QVector<DataArrayPath>& value)
+void ConvertColorToGrayScale::setInputDataArrayVector(const std::vector<DataArrayPath>& value)
 {
   m_InputDataArrayVector = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> ConvertColorToGrayScale::getInputDataArrayVector() const
+std::vector<DataArrayPath> ConvertColorToGrayScale::getInputDataArrayVector() const
 {
   return m_InputDataArrayVector;
 }
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 611c1169a0..2082c48993 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -55,7 +55,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   PYB11_PROPERTY(int ConversionAlgorithm READ getConversionAlgorithm WRITE setConversionAlgorithm)
   PYB11_PROPERTY(FloatVec3Type ColorWeights READ getColorWeights WRITE setColorWeights)
   PYB11_PROPERTY(int ColorChannel READ getColorChannel WRITE setColorChannel)
-  PYB11_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
+  PYB11_PROPERTY(std::vector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
   PYB11_PROPERTY(bool CreateNewAttributeMatrix READ getCreateNewAttributeMatrix WRITE setCreateNewAttributeMatrix)
   PYB11_PROPERTY(QString OutputAttributeMatrixName READ getOutputAttributeMatrixName WRITE setOutputAttributeMatrixName)
   PYB11_PROPERTY(QString OutputArrayPrefix READ getOutputArrayPrefix WRITE setOutputArrayPrefix)
@@ -140,14 +140,14 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   /**
    * @brief Setter property for InputDataArrayVector
    */
-  void setInputDataArrayVector(const QVector<DataArrayPath>& value);
+  void setInputDataArrayVector(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for InputDataArrayVector
    * @return Value of InputDataArrayVector
    */
-  QVector<DataArrayPath> getInputDataArrayVector() const;
+  std::vector<DataArrayPath> getInputDataArrayVector() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
+  Q_PROPERTY(DataArrayPathVec InputDataArrayVector READ getInputDataArrayVector WRITE setInputDataArrayVector)
 
   /**
    * @brief Setter property for CreateNewAttributeMatrix
@@ -256,7 +256,7 @@ class SIMPLib_EXPORT ConvertColorToGrayScale : public AbstractFilter
   int m_ConversionAlgorithm = {0};
   FloatVec3Type m_ColorWeights = {0.2125f, 0.7154f, 0.0721f};
   int m_ColorChannel = {0};
-  QVector<DataArrayPath> m_InputDataArrayVector = {};
+  std::vector<DataArrayPath> m_InputDataArrayVector = {};
   bool m_CreateNewAttributeMatrix = {false};
   QString m_OutputAttributeMatrixName = {"GrayScaleData"};
   QString m_OutputArrayPrefix = {};
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index c968151cd7..92204fa181 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -77,15 +77,15 @@ void CopyObject::setupFilterParameters()
     parameter->setPropertyName("ObjectToCopy");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(CopyObject, this, ObjectToCopy));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(CopyObject, this, ObjectToCopy));
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Data Container");
     choices.push_back("Attribute Matrix");
     choices.push_back("Attribute Array");
     parameter->setChoices(choices);
-    QStringList linkedProps;
-    linkedProps << "DataContainerToCopy"
-                << "AttributeMatrixToCopy"
-                << "AttributeArrayToCopy";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("DataContainerToCopy");
+    linkedProps.push_back("AttributeMatrixToCopy");
+    linkedProps.push_back("AttributeArrayToCopy");
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 12b789ddc9..71a98171cc 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -68,7 +68,7 @@ void CreateAttributeMatrix::setupFilterParameters()
   FilterParameterVectorType parameters;
 
   {
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Vertex");
     choices.push_back("Edge");
     choices.push_back("Face");
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index c177db1132..31ecfc6f51 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -291,13 +291,13 @@ void CreateDataArray::setupFilterParameters()
 
     parameter->setDefaultValue(Manual);
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Manual");
     choices.push_back("Random With Range");
     parameter->setChoices(choices);
-    QStringList linkedProps;
-    linkedProps << "InitializationValue"
-                << "InitializationRange";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("InitializationValue");
+    linkedProps.push_back("InitializationRange");
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 585ffa4001..51c3f6fa5b 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -80,7 +80,7 @@ void CreateGeometry::setupFilterParameters()
     parameter->setPropertyName("GeometryType");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(CreateGeometry, this, GeometryType));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(CreateGeometry, this, GeometryType));
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Image");
     choices.push_back("Rectilinear Grid");
     choices.push_back("Vertex");
@@ -90,37 +90,37 @@ void CreateGeometry::setupFilterParameters()
     choices.push_back("Tetrahedral");
     choices.push_back("Hexahedral");
     parameter->setChoices(choices);
-    QStringList linkedProps = {"Dimensions",
-                               "Origin",
-                               "Spacing",
-                               "BoxDimensions",
-                               "ImageCellAttributeMatrixName", // ImageGeom
-                               "XBoundsArrayPath",
-                               "YBoundsArrayPath",
-                               "ZBoundsArrayPath",
-                               "RectGridCellAttributeMatrixName", // RectGridGeom
-                               "SharedVertexListArrayPath0",
-                               "VertexAttributeMatrixName0", // VertexGeom
-                               "SharedVertexListArrayPath1",
-                               "SharedEdgeListArrayPath",
-                               "VertexAttributeMatrixName1",
-                               "EdgeAttributeMatrixName", // EdgeGeom
-                               "SharedVertexListArrayPath2",
-                               "SharedTriListArrayPath",
-                               "VertexAttributeMatrixName2",
-                               "FaceAttributeMatrixName0", // TriangleGeom
-                               "SharedVertexListArrayPath3",
-                               "SharedQuadListArrayPath",
-                               "VertexAttributeMatrixName3",
-                               "FaceAttributeMatrixName1", // QuadGeom
-                               "SharedVertexListArrayPath4",
-                               "SharedTetListArrayPath",
-                               "VertexAttributeMatrixName4",
-                               "TetCellAttributeMatrixName", // TetrahedralGeom
-                               "SharedVertexListArrayPath5",
-                               "SharedHexListArrayPath",
-                               "VertexAttributeMatrixName5",
-                               "HexCellAttributeMatrixName"}; // HexahedralGeom
+    std::vector<QString> linkedProps = {"Dimensions",
+                                        "Origin",
+                                        "Spacing",
+                                        "BoxDimensions",
+                                        "ImageCellAttributeMatrixName", // ImageGeom
+                                        "XBoundsArrayPath",
+                                        "YBoundsArrayPath",
+                                        "ZBoundsArrayPath",
+                                        "RectGridCellAttributeMatrixName", // RectGridGeom
+                                        "SharedVertexListArrayPath0",
+                                        "VertexAttributeMatrixName0", // VertexGeom
+                                        "SharedVertexListArrayPath1",
+                                        "SharedEdgeListArrayPath",
+                                        "VertexAttributeMatrixName1",
+                                        "EdgeAttributeMatrixName", // EdgeGeom
+                                        "SharedVertexListArrayPath2",
+                                        "SharedTriListArrayPath",
+                                        "VertexAttributeMatrixName2",
+                                        "FaceAttributeMatrixName0", // TriangleGeom
+                                        "SharedVertexListArrayPath3",
+                                        "SharedQuadListArrayPath",
+                                        "VertexAttributeMatrixName3",
+                                        "FaceAttributeMatrixName1", // QuadGeom
+                                        "SharedVertexListArrayPath4",
+                                        "SharedTetListArrayPath",
+                                        "VertexAttributeMatrixName4",
+                                        "TetCellAttributeMatrixName", // TetrahedralGeom
+                                        "SharedVertexListArrayPath5",
+                                        "SharedHexListArrayPath",
+                                        "VertexAttributeMatrixName5",
+                                        "HexCellAttributeMatrixName"}; // HexahedralGeom
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
@@ -129,7 +129,7 @@ void CreateGeometry::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_BOOL_FP("Treat Geometry Warnings as Errors", TreatWarningsAsErrors, FilterParameter::Category::Parameter, CreateGeometry));
 
   {
-    QVector<QString> choices = {"Copy Arrays", "Move Arrays"};
+    std::vector<QString> choices = {"Copy Arrays", "Move Arrays"};
     parameters.push_back(SIMPL_NEW_CHOICE_FP("Array Handling", ArrayHandling, FilterParameter::Category::Parameter, CreateGeometry, choices, false));
   }
 
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index abeb54805a..91b8cf0290 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -107,7 +107,7 @@ void ExtractAttributeArraysFromGeometry::setupFilterParameters()
     parameter->setPropertyName("DataContainerName");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(ExtractAttributeArraysFromGeometry, this, DataContainerName));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(ExtractAttributeArraysFromGeometry, this, DataContainerName));
-    QStringList linkedProps = {
+    std::vector<QString> linkedProps = {
         "XBoundsArrayPath",           "YBoundsArrayPath",        "ZBoundsArrayPath", // RectGridGeom
         "SharedVertexListArrayPath0",                                                // VertexGeom
         "SharedVertexListArrayPath1", "SharedEdgeListArrayPath",                     // EdgeGeom
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 4463e98b06..4a60fc433e 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -407,13 +407,13 @@ DataArrayPath ExtractVertexGeometry::getSelectedDataContainerName() const
 }
 
 // -----------------------------------------------------------------------------
-void ExtractVertexGeometry::setIncludedDataArrayPaths(const QVector<DataArrayPath>& value)
+void ExtractVertexGeometry::setIncludedDataArrayPaths(const std::vector<DataArrayPath>& value)
 {
   m_IncludedDataArrayPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> ExtractVertexGeometry::getIncludedDataArrayPaths() const
+std::vector<DataArrayPath> ExtractVertexGeometry::getIncludedDataArrayPaths() const
 {
   return m_IncludedDataArrayPaths;
 }
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index fad611088b..a30dea24b2 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -57,7 +57,7 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   PYB11_FILTER_NEW_MACRO(ExtractVertexGeometry)
   PYB11_PROPERTY(int ArrayHandling READ getArrayHandling WRITE setArrayHandling)
   PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
-  PYB11_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
+  PYB11_PROPERTY(std::vector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
   PYB11_PROPERTY(DataArrayPath VertexDataContainerName READ getVertexDataContainerName WRITE setVertexDataContainerName)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
@@ -117,14 +117,14 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
   /**
    * @brief Setter property for IncludedDataArrayPaths
    */
-  void setIncludedDataArrayPaths(const QVector<DataArrayPath>& value);
+  void setIncludedDataArrayPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for IncludedDataArrayPaths
    * @return Value of IncludedDataArrayPaths
    */
-  QVector<DataArrayPath> getIncludedDataArrayPaths() const;
+  std::vector<DataArrayPath> getIncludedDataArrayPaths() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
+  Q_PROPERTY(DataArrayPathVec IncludedDataArrayPaths READ getIncludedDataArrayPaths WRITE setIncludedDataArrayPaths)
 
   /**
    * @brief Setter property for VertexDataContainerName
@@ -217,11 +217,11 @@ class SIMPLib_EXPORT ExtractVertexGeometry : public AbstractFilter
 private:
   int m_ArrayHandling = {static_cast<int>(ArrayHandlingType::MoveArrays)};
   DataArrayPath m_SelectedDataContainerName = {};
-  QVector<DataArrayPath> m_IncludedDataArrayPaths = {};
+  std::vector<DataArrayPath> m_IncludedDataArrayPaths = {};
   DataArrayPath m_VertexDataContainerName = {"VertexDataContainer", "", ""};
 
-  QVector<QString> m_NewDCGeometryChoices;
-  QVector<QString> m_ArrayHandlingChoices;
+  std::vector<QString> m_NewDCGeometryChoices;
+  std::vector<QString> m_ArrayHandlingChoices;
 
 public:
   ExtractVertexGeometry(const ExtractVertexGeometry&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 3b3753510b..548e45098c 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -69,7 +69,7 @@ void FeatureDataCSVWriter::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_BOOL_FP("Write Number of Features Line", WriteNumFeaturesLine, FilterParameter::Category::Parameter, FeatureDataCSVWriter));
 
   {
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back(",");
     choices.push_back(";");
     choices.push_back(":");
diff --git a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
index acc0e81d84..ccb1b46058 100644
--- a/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateTiltSeries.cpp
@@ -345,10 +345,10 @@ void GenerateTiltSeries::setupFilterParameters()
     parameter->setHumanLabel("Rotation Axis");
     parameter->setPropertyName("RotationAxis");
 
-    QVector<QString> choices; // Please add choices to the choices QVector to finish this widget
-    choices << "X Axis"
-            << "Y Axis"
-            << "Z Axis";
+    std::vector<QString> choices; // Please add choices to the choices QVector to finish this widget
+    choices.push_back("X Axis");
+    choices.push_back("Y Axis");
+    choices.push_back("Z Axis");
     parameter->setChoices(choices);
     parameter->setCategory(FilterParameter::Category::Parameter);
     parameter->setSetterCallback(SIMPL_BIND_SETTER(GenerateTiltSeries, this, RotationAxis));
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index aecf9603b6..069ff4e5e1 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -400,7 +400,7 @@ void ImportAsciDataArray::setupFilterParameters()
     parameter->setSetterCallback(SIMPL_BIND_SETTER(ImportAsciDataArray, this, Delimiter));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(ImportAsciDataArray, this, Delimiter));
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back(", (comma)");
     choices.push_back("; (semicolon)");
     choices.push_back("  (space)");
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index da5003b327..d5273d0e2b 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -104,14 +104,14 @@ void InitializeData::setupFilterParameters()
 
     parameter->setDefaultValue(Manual);
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Manual");
     choices.push_back("Random");
     choices.push_back("Random With Range");
     parameter->setChoices(choices);
-    QStringList linkedProps;
-    linkedProps << "InitValue"
-                << "InitRange";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("InitValue");
+    linkedProps.push_back("InitRange");
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
@@ -122,25 +122,6 @@ void InitializeData::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InitializeData::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  reader->openFilterGroup(this, index);
-  setCellAttributeMatrixPaths(reader->readDataArrayPathVector("CellAttributeMatrixPaths", getCellAttributeMatrixPaths()));
-  setXMin(reader->readValue("XMin", getXMin()));
-  setYMin(reader->readValue("YMin", getYMin()));
-  setZMin(reader->readValue("ZMin", getZMin()));
-  setXMax(reader->readValue("XMax", getXMax()));
-  setYMax(reader->readValue("YMax", getYMax()));
-  setZMax(reader->readValue("ZMax", getZMax()));
-  setInitType(reader->readValue("InitType", getInitType()));
-  setInitValue(reader->readValue("InitValue", getInitValue()));
-  setInitRange(reader->readPairOfDoubles("InitRange", getInitRange()));
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -223,11 +204,11 @@ void InitializeData::dataCheck()
   // SizeVec3Type udims = m->getGeometryAs<ImageGeom>()->getDimensions();
 
   QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
-  QList<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
+  std::vector<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
 
-  for(QList<QString>::iterator iter = voxelArrayNames.begin(); iter != voxelArrayNames.end(); ++iter)
+  for(const QString& name : voxelArrayNames)
   {
-    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(*iter);
+    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(name);
 
     QString type = p->getTypeAsString();
     if(type == "int8_t")
@@ -344,11 +325,11 @@ void InitializeData::execute()
   };
 
   QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
-  QList<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
+  std::vector<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
 
-  for(QList<QString>::iterator iter = voxelArrayNames.begin(); iter != voxelArrayNames.end(); ++iter)
+  for(const QString& name : voxelArrayNames)
   {
-    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(*iter);
+    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(name);
 
     QString type = p->getTypeAsString();
     if(type == "int8_t")
@@ -593,13 +574,13 @@ QString InitializeData::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void InitializeData::setCellAttributeMatrixPaths(const QVector<DataArrayPath>& value)
+void InitializeData::setCellAttributeMatrixPaths(const std::vector<DataArrayPath>& value)
 {
   m_CellAttributeMatrixPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> InitializeData::getCellAttributeMatrixPaths() const
+std::vector<DataArrayPath> InitializeData::getCellAttributeMatrixPaths() const
 {
   return m_CellAttributeMatrixPaths;
 }
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 25cfaeaae4..4f873fc802 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -58,7 +58,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   PYB11_FILTER()
   PYB11_SHARED_POINTERS(InitializeData)
   PYB11_FILTER_NEW_MACRO(InitializeData)
-  PYB11_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
+  PYB11_PROPERTY(std::vector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
   PYB11_PROPERTY(int XMin READ getXMin WRITE setXMin)
   PYB11_PROPERTY(int YMin READ getYMin WRITE setYMin)
   PYB11_PROPERTY(int ZMin READ getZMin WRITE setZMin)
@@ -105,14 +105,14 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   /**
    * @brief Setter property for CellAttributeMatrixPaths
    */
-  void setCellAttributeMatrixPaths(const QVector<DataArrayPath>& value);
+  void setCellAttributeMatrixPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for CellAttributeMatrixPaths
    * @return Value of CellAttributeMatrixPaths
    */
-  QVector<DataArrayPath> getCellAttributeMatrixPaths() const;
+  std::vector<DataArrayPath> getCellAttributeMatrixPaths() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
+  Q_PROPERTY(DataArrayPathVec CellAttributeMatrixPaths READ getCellAttributeMatrixPaths WRITE setCellAttributeMatrixPaths)
 
   /**
    * @brief Setter property for XMin
@@ -284,11 +284,6 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
    */
   void setupFilterParameters() override;
 
-  /**
-   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-   */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
   /**
    * @brief execute Reimplemented from @see AbstractFilter class
    */
@@ -307,7 +302,7 @@ class SIMPLib_EXPORT InitializeData : public AbstractFilter
   void initialize();
 
 private:
-  QVector<DataArrayPath> m_CellAttributeMatrixPaths = {};
+  std::vector<DataArrayPath> m_CellAttributeMatrixPaths = {};
   int m_XMin = {0};
   int m_YMin = {0};
   int m_ZMin = {0};
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index f6f8a21e35..82e7d2593e 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -72,11 +72,11 @@ void MoveData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  QStringList linkedProps;
-  linkedProps << "DataContainerDestination"
-              << "AttributeMatrixSource"
-              << "AttributeMatrixDestination"
-              << "DataArraySource";
+  std::vector<QString> linkedProps;
+  linkedProps.push_back("DataContainerDestination");
+  linkedProps.push_back("AttributeMatrixSource");
+  linkedProps.push_back("AttributeMatrixDestination");
+  linkedProps.push_back("DataArraySource");
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Object to Move");
@@ -85,7 +85,7 @@ void MoveData::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(MoveData, this, WhatToMove));
 
     parameter->setDefaultValue(getWhatToMove()); // Just set the first index
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Attribute Matrix");
     choices.push_back("Attribute Array");
     parameter->setChoices(choices);
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index 68a67e2c17..c43f864c20 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -71,11 +71,11 @@ void MoveMultiData::setupFilterParameters()
 {
   FilterParameterVectorType parameters;
 
-  QStringList linkedProps;
-  linkedProps << "DataContainerDestination"
-              << "AttributeMatrixSources"
-              << "AttributeMatrixDestination"
-              << "DataArraySources";
+  std::vector<QString> linkedProps;
+  linkedProps.push_back("DataContainerDestination");
+  linkedProps.push_back("AttributeMatrixSources");
+  linkedProps.push_back("AttributeMatrixDestination");
+  linkedProps.push_back("DataArraySources");
   {
     LinkedChoicesFilterParameter::Pointer parameter = LinkedChoicesFilterParameter::New();
     parameter->setHumanLabel("Object to Move");
@@ -84,7 +84,7 @@ void MoveMultiData::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(MoveMultiData, this, WhatToMove));
 
     parameter->setDefaultValue(getWhatToMove()); // Just set the first index
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Attribute Matrix");
     choices.push_back("Attribute Array");
     parameter->setChoices(choices);
@@ -114,20 +114,6 @@ void MoveMultiData::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void MoveMultiData::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  reader->openFilterGroup(this, index);
-  setWhatToMove(reader->readValue("WhatToMove", getWhatToMove()));
-  setDataContainerDestination(reader->readDataArrayPath("DataContainerDestination", getDataContainerDestination()));
-  setAttributeMatrixSources(reader->readDataArrayPathVector("AttributeMatrixSource", getAttributeMatrixSources()));
-  setAttributeMatrixDestination(reader->readDataArrayPath("AttributeMatrixDestination", getAttributeMatrixDestination()));
-  setDataArraySources(reader->readDataArrayPathVector("DataArraySources", getDataArraySources()));
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -142,16 +128,16 @@ void MoveMultiData::dataCheck()
 {
   clearErrorCode();
   clearWarningCode();
-  QVector<DataArrayPath> amSrcPaths = getAttributeMatrixSources();
+  std::vector<DataArrayPath> amSrcPaths = getAttributeMatrixSources();
   DataArrayPath amDestPath = getAttributeMatrixDestination();
-  QVector<DataArrayPath> daSrcPaths = getDataArraySources();
+  std::vector<DataArrayPath> daSrcPaths = getDataArraySources();
 
   if(getWhatToMove() == k_MoveAttributeMatrix)
   {
     DataContainer::Pointer amDestDataContainer = getDataContainerArray()->getPrereqDataContainer(this, getDataContainerDestination());
 
     // Repeat for each AttributeMatrix
-    for(int i = 0; i < amSrcPaths.size(); i++)
+    for(size_t i = 0; i < amSrcPaths.size(); i++)
     {
       DataContainer::Pointer amSrcDataContainer = getDataContainerArray()->getPrereqDataContainer(this, amSrcPaths[i].getDataContainerName());
       AttributeMatrix::Pointer amSrcAttributeMatrix = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, amSrcPaths[i], -301);
@@ -362,13 +348,13 @@ DataArrayPath MoveMultiData::getDataContainerDestination() const
 }
 
 // -----------------------------------------------------------------------------
-void MoveMultiData::setAttributeMatrixSources(const QVector<DataArrayPath>& value)
+void MoveMultiData::setAttributeMatrixSources(const std::vector<DataArrayPath>& value)
 {
   m_AttributeMatrixSources = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> MoveMultiData::getAttributeMatrixSources() const
+std::vector<DataArrayPath> MoveMultiData::getAttributeMatrixSources() const
 {
   return m_AttributeMatrixSources;
 }
@@ -386,13 +372,13 @@ DataArrayPath MoveMultiData::getAttributeMatrixDestination() const
 }
 
 // -----------------------------------------------------------------------------
-void MoveMultiData::setDataArraySources(const QVector<DataArrayPath>& value)
+void MoveMultiData::setDataArraySources(const std::vector<DataArrayPath>& value)
 {
   m_DataArraySources = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> MoveMultiData::getDataArraySources() const
+std::vector<DataArrayPath> MoveMultiData::getDataArraySources() const
 {
   return m_DataArraySources;
 }
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index 1e6c95cc19..ada37c548c 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -54,9 +54,9 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
   PYB11_FILTER_NEW_MACRO(MoveMultiData)
   PYB11_PROPERTY(int WhatToMove READ getWhatToMove WRITE setWhatToMove)
   PYB11_PROPERTY(DataArrayPath DataContainerDestination READ getDataContainerDestination WRITE setDataContainerDestination)
-  PYB11_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
+  PYB11_PROPERTY(std::vector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
   PYB11_PROPERTY(DataArrayPath AttributeMatrixDestination READ getAttributeMatrixDestination WRITE setAttributeMatrixDestination)
-  PYB11_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
+  PYB11_PROPERTY(std::vector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
@@ -108,14 +108,14 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
   /**
    * @brief Setter property for AttributeMatrixSources
    */
-  void setAttributeMatrixSources(const QVector<DataArrayPath>& value);
+  void setAttributeMatrixSources(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for AttributeMatrixSources
    * @return Value of AttributeMatrixSources
    */
-  QVector<DataArrayPath> getAttributeMatrixSources() const;
+  std::vector<DataArrayPath> getAttributeMatrixSources() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
+  Q_PROPERTY(DataArrayPathVec AttributeMatrixSources READ getAttributeMatrixSources WRITE setAttributeMatrixSources)
 
   /**
    * @brief Setter property for AttributeMatrixDestination
@@ -132,14 +132,14 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
   /**
    * @brief Setter property for DataArraySources
    */
-  void setDataArraySources(const QVector<DataArrayPath>& value);
+  void setDataArraySources(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for DataArraySources
    * @return Value of DataArraySources
    */
-  QVector<DataArrayPath> getDataArraySources() const;
+  std::vector<DataArrayPath> getDataArraySources() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> DataArraySources READ getDataArraySources WRITE setDataArraySources)
+  Q_PROPERTY(DataArrayPathVec DataArraySources READ getDataArraySources WRITE setDataArraySources)
 
   /**
    * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
@@ -191,11 +191,6 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
    */
   void setupFilterParameters() override;
 
-  /**
-   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-   */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
   /**
    * @brief execute Reimplemented from @see AbstractFilter class
    */
@@ -223,7 +218,7 @@ class SIMPLib_EXPORT MoveMultiData : public AbstractFilter
 private:
   int m_WhatToMove = {};
   DataArrayPath m_DataContainerDestination = {"", "", ""};
-  QVector<DataArrayPath> m_AttributeMatrixSources = {};
+  std::vector<DataArrayPath> m_AttributeMatrixSources = {};
   DataArrayPath m_AttributeMatrixDestination = {};
-  QVector<DataArrayPath> m_DataArraySources = {};
+  std::vector<DataArrayPath> m_DataArraySources = {};
 };
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index b6da7c106b..e0ec0021a8 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -183,7 +183,7 @@ void RawBinaryReader::setupFilterParameters()
     parameter->setSetterCallback(SIMPL_BIND_SETTER(RawBinaryReader, this, Endian));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(RawBinaryReader, this, Endian));
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Little");
     choices.push_back("Big");
     parameter->setChoices(choices);
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index f34e357ff9..8cf0509198 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -83,9 +83,9 @@ void RemoveComponentFromArray::setupFilterParameters()
   parameters.push_back(
       SIMPL_NEW_DA_WITH_LINKED_AM_FP("Reduced Attribute Array", ReducedArrayArrayName, SelectedArrayPath, SelectedArrayPath, FilterParameter::Category::CreatedArray, RemoveComponentFromArray));
 
-  QStringList linkedProps;
+  std::vector<QString> linkedProps;
   linkedProps.clear();
-  linkedProps << "NewArrayArrayName";
+  linkedProps.push_back("NewArrayArrayName");
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Save Removed Component in New Array", SaveRemovedComponent, FilterParameter::Category::Parameter, RemoveComponentFromArray, linkedProps));
 
   setFilterParameters(parameters);
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 638b1ba0b6..3cbe47c0c5 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -351,9 +351,9 @@ void RotateSampleRefFrame::setupFilterParameters()
     parameter->setPropertyName("RotationRepresentationChoice");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(RotateSampleRefFrame, this, RotationRepresentationChoice));
-    QVector<QString> choices{"Axis Angle", "Rotation Matrix"};
+    std::vector<QString> choices{"Axis Angle", "Rotation Matrix"};
     parameter->setChoices(choices);
-    QStringList linkedProps{"RotationAngle", "RotationAxis", "RotationTable"};
+    std::vector<QString> linkedProps{"RotationAngle", "RotationAxis", "RotationTable"};
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 198389f9ad..1ac32db3b9 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -107,7 +107,7 @@ void ScaleVolume::setupFilterParameters()
 
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Scaling Factor", ScaleFactor, FilterParameter::Category::Parameter, ScaleVolume));
 
-  QStringList linkedProps("DataContainerName");
+  std::vector<QString> linkedProps = {"DataContainerName"};
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Image Geometry", ApplyToVoxelVolume, FilterParameter::Category::Parameter, ScaleVolume, linkedProps));
   {
     DataContainerSelectionFilterParameter::RequirementType req;
@@ -115,7 +115,7 @@ void ScaleVolume::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Scale", DataContainerName, FilterParameter::Category::RequiredArray, ScaleVolume, req));
   }
   linkedProps.clear();
-  linkedProps << "SurfaceDataContainerName";
+  linkedProps.push_back("SurfaceDataContainerName");
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Apply to Surface Geometry", ApplyToSurfaceMesh, FilterParameter::Category::Parameter, ScaleVolume, linkedProps));
   {
     DataContainerSelectionFilterParameter::RequirementType req;
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index f1d6301599..91bfad4df2 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -112,12 +112,12 @@ void SetOriginResolutionImageGeom::setupFilterParameters()
     parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container Image Geometry to Modify", DataContainerName, FilterParameter::Category::RequiredArray, SetOriginResolutionImageGeom, req));
   }
 
-  QStringList linkedProps("Origin");
+  std::vector<QString> linkedProps = {"Origin"};
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Origin", ChangeOrigin, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom, linkedProps));
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Origin", Origin, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom));
 
   linkedProps.clear();
-  linkedProps << "Spacing";
+  linkedProps.push_back("Spacing");
   parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Change Spacing", ChangeResolution, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom, linkedProps));
   parameters.push_back(SIMPL_NEW_FLOAT_VEC3_FP("Spacing", Spacing, FilterParameter::Category::Parameter, SetOriginResolutionImageGeom));
   parameters.back()->setLegacyPropertyName("Resolution");
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 7f9ce22d86..5e06910ba2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -178,8 +178,8 @@ class CombineAttributeArraysTest
   {
     int32_t err = 0;
 
-    QVector<DataArrayPath> dataArrayPathsVecFirst = {vectorArrayPath, scalarArrayPath};
-    QVector<DataArrayPath> dataArrayPathsScalarFirst = {scalarArrayPath, vectorArrayPath};
+    std::vector<DataArrayPath> dataArrayPathsVecFirst = {vectorArrayPath, scalarArrayPath};
+    std::vector<DataArrayPath> dataArrayPathsScalarFirst = {scalarArrayPath, vectorArrayPath};
 
     bool isBool = false;
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index e11a4ef126..d3367408f2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -378,7 +378,7 @@ class ConvertColorToGrayScaleTest
     DataContainerArray::Pointer m_dca = DataContainerArray::New();
     m_dca->setName("TEST DATA CONTAINER ARRAY");
     m_dca->insertOrAssign(dc);
-    QVector<DataArrayPath> daps;
+    std::vector<DataArrayPath> daps;
     for(const AttributeMatrix::Pointer& eachAM : dc->getAttributeMatrices())
     {
       QString amName = eachAM->getName();
@@ -387,7 +387,7 @@ class ConvertColorToGrayScaleTest
         // Make sure not to add an output AA
         if(!eachAAName.contains(m_outputArrayPrefix))
         {
-          daps.append(DataArrayPath(dc->getName(), amName, eachAAName));
+          daps.push_back(DataArrayPath(dc->getName(), amName, eachAAName));
         }
       }
     }
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
index 6e69a9472c..d5c6e85e7f 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
@@ -201,7 +201,7 @@ class ExportDataTest
 
       DataArrayPath path4 = DataArrayPath(SIMPL::Defaults::DataContainerName, SIMPL::Defaults::AttributeMatrixName, SIMPL::GeneralData::ThresholdArray);
 
-      QVector<DataArrayPath> vector;
+      std::vector<DataArrayPath> vector;
       vector.push_back(path1);
       vector.push_back(path2);
       vector.push_back(path4);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
index bf022039b0..5bd886c2b1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractVertexGeometryTest.cpp
@@ -188,7 +188,7 @@ class ExtractVertexGeometryTest
     extVertGeomFilter->setVertexDataContainerName(k_VertexDataContainerPath);
     extVertGeomFilter->setSelectedDataContainerName(k_ImageGeomDataContainerPath);
     // Set an incorrect AttributeMatrix/DataArray Path
-    QVector<DataArrayPath> includePaths;
+    std::vector<DataArrayPath> includePaths;
     DataArrayPath dap(k_ImageGeomDataContainerName, k_FeatureAttrMatName, k_FeatureArrayName);
     includePaths.push_back(dap);
     extVertGeomFilter->setIncludedDataArrayPaths(includePaths);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index bb18414b85..f20328faba 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -217,7 +217,7 @@ class MoveMultiDataTest
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
-  void TestCase(DataContainerArray::Pointer dca, QVector<DataArrayPath> sources, DataArrayPath dapDst, int whatToMove, int err)
+  void TestCase(DataContainerArray::Pointer dca, const std::vector<DataArrayPath>& sources, DataArrayPath dapDst, int whatToMove, int err)
   {
 
     QVector<AttributeMatrix::Pointer> amSourcesCopy;
@@ -465,7 +465,7 @@ class MoveMultiDataTest
 
     DataContainerArray::Pointer dcaTest = dca->deepCopy();
 
-    QVector<DataArrayPath> sources = {DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, ""), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, "")};
+    std::vector<DataArrayPath> sources = {DataArrayPath(k_DataContainerName, k_AttributeMatrixSrcName, ""), DataArrayPath(k_DataContainerName, k_AttributeMatrixDstName, "")};
 
     DataArrayPath dst(k_DataContainerDstName);
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 06d486da08..6d7419eb74 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -109,7 +109,7 @@ class WriteASCIIDataTest
     dc->addOrReplaceAttributeMatrix(am);
     dca->addOrReplaceDataContainer(dc);
 
-    QVector<DataArrayPath> paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "ASCII_Data")};
+    std::vector<DataArrayPath> paths = {DataArrayPath("DataContainer", "TestAttributeMatrix", "ASCII_Data")};
     WriteASCIIData::Pointer writer = WriteASCIIData::New();
     writer->setDataContainerArray(dca);
     writer->setSelectedDataArrayPaths(paths);
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 6362513cf1..d5b7266380 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -145,12 +145,12 @@ void WriteASCIIData::setupFilterParameters()
     parameter->setPropertyName("OutputStyle");
     parameter->setSetterCallback(SIMPL_BIND_SETTER(WriteASCIIData, this, OutputStyle));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(WriteASCIIData, this, OutputStyle));
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Multiple Files");
     choices.push_back("Single File");
     parameter->setChoices(choices);
 
-    QStringList linkedProps = {"OutputPath", "FileExtension", "MaxValPerLine", "OutputFilePath"};
+    std::vector<QString> linkedProps = {"OutputPath", "FileExtension", "MaxValPerLine", "OutputFilePath"};
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
@@ -173,7 +173,7 @@ void WriteASCIIData::setupFilterParameters()
     parameter->setSetterCallback(SIMPL_BIND_SETTER(WriteASCIIData, this, Delimiter));
     parameter->setGetterCallback(SIMPL_BIND_GETTER(WriteASCIIData, this, Delimiter));
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back(", (comma)");
     choices.push_back("; (semicolon)");
     choices.push_back("  (space)");
@@ -190,20 +190,6 @@ void WriteASCIIData::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void WriteASCIIData::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-  reader->openFilterGroup(this, index);
-  setSelectedDataArrayPaths(reader->readDataArrayPathVector("SelectedDataArrayPaths", getSelectedDataArrayPaths()));
-  setOutputPath(reader->readString("OutputPath", getOutputPath()));
-  setDelimiter(reader->readValue("Delimiter", getDelimiter()));
-  setFileExtension(reader->readString("FileExtension", getFileExtension()));
-  setMaxValPerLine(reader->readValue("MaxValPerLine", getMaxValPerLine()));
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -271,14 +257,14 @@ void WriteASCIIData::dataCheck()
     return;
   }
 
-  if(m_SelectedDataArrayPaths.isEmpty())
+  if(m_SelectedDataArrayPaths.empty())
   {
     QString ss = QObject::tr("At least one Attribute Array must be selected");
     setErrorCondition(-11007, ss);
     return;
   }
 
-  QVector<DataArrayPath> paths = getSelectedDataArrayPaths();
+  std::vector<DataArrayPath> paths = getSelectedDataArrayPaths();
 
   if(!DataArrayPath::ValidateVector(paths))
   {
@@ -329,7 +315,7 @@ void WriteASCIIData::execute()
     return;
   }
 
-  if(m_SelectedDataArrayPaths.count() != m_SelectedWeakPtrVector.count())
+  if(m_SelectedDataArrayPaths.size() != m_SelectedWeakPtrVector.count())
   {
     QString ss = QObject::tr("The number of selected Attribute Arrays does not equal the number of internal weak pointers");
     setErrorCondition(-11010, ss);
@@ -672,13 +658,13 @@ QString WriteASCIIData::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void WriteASCIIData::setSelectedDataArrayPaths(const QVector<DataArrayPath>& value)
+void WriteASCIIData::setSelectedDataArrayPaths(const std::vector<DataArrayPath>& value)
 {
   m_SelectedDataArrayPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> WriteASCIIData::getSelectedDataArrayPaths() const
+std::vector<DataArrayPath> WriteASCIIData::getSelectedDataArrayPaths() const
 {
   return m_SelectedDataArrayPaths;
 }
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index 28a60dca87..b0bb7406ee 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -56,7 +56,7 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
   PYB11_FILTER()
   PYB11_SHARED_POINTERS(WriteASCIIData)
   PYB11_FILTER_NEW_MACRO(WriteASCIIData)
-  PYB11_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  PYB11_PROPERTY(std::vector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
   PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
   PYB11_PROPERTY(QString OutputFilePath READ getOutputFilePath WRITE setOutputFilePath)
   PYB11_PROPERTY(int Delimiter READ getDelimiter WRITE setDelimiter)
@@ -90,14 +90,14 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
   /**
    * @brief Setter property for SelectedDataArrayPaths
    */
-  void setSelectedDataArrayPaths(const QVector<DataArrayPath>& value);
+  void setSelectedDataArrayPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for SelectedDataArrayPaths
    * @return Value of SelectedDataArrayPaths
    */
-  QVector<DataArrayPath> getSelectedDataArrayPaths() const;
+  std::vector<DataArrayPath> getSelectedDataArrayPaths() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
+  Q_PROPERTY(DataArrayPathVec SelectedDataArrayPaths READ getSelectedDataArrayPaths WRITE setSelectedDataArrayPaths)
 
   /**
    * @brief Setter property for OutputPath
@@ -236,11 +236,6 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
    */
   void setupFilterParameters() override;
 
-  /**
-   * @brief readFilterParameters Reimplemented from @see AbstractFilter class
-   */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
   /**
    * @brief execute Reimplemented from @see AbstractFilter class
    */
@@ -259,7 +254,7 @@ class SIMPLib_EXPORT WriteASCIIData : public AbstractFilter
   void initialize();
 
 private:
-  QVector<DataArrayPath> m_SelectedDataArrayPaths = {QVector<DataArrayPath>()};
+  std::vector<DataArrayPath> m_SelectedDataArrayPaths = {};
   QString m_OutputPath = {""};
   QString m_OutputFilePath = {};
   int m_Delimiter = {0};
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 542a96aa2f..7522b261bb 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -35,6 +35,8 @@
 
 #include "DataArrayPath.h"
 
+#include <type_traits>
+
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/Constants.h"
@@ -42,6 +44,64 @@
 #include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
+namespace
+{
+template <class Container>
+bool ValidateVectorImpl(const Container& other)
+{
+  static_assert(std::is_same_v<typename Container::value_type, DataArrayPath>);
+
+  using size_type = typename Container::size_type;
+
+  if(other.size() <= 1)
+  {
+    return true;
+  }
+
+  QString dcName = other.front().getDataContainerName();
+  QString amName = other.front().getAttributeMatrixName();
+
+  for(size_type i = 1; i < other.size(); i++)
+  {
+    if(other.at(i).getDataContainerName() != dcName || other.at(i).getAttributeMatrixName() != amName)
+    {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+template <class OutputContainer, class InputContainer>
+OutputContainer GetDataArrayNamesImpl(const InputContainer& paths)
+{
+  static_assert(std::is_same_v<typename InputContainer::value_type, DataArrayPath>);
+  static_assert(std::is_same_v<typename OutputContainer::value_type, QString>);
+
+  OutputContainer arrayNames;
+  arrayNames.reserve(paths.size());
+  for(const DataArrayPath& path : paths)
+  {
+    arrayNames.push_back(path.getDataArrayName());
+  }
+
+  return arrayNames;
+}
+
+template <class Container>
+DataArrayPath GetAttributeMatrixPathImpl(const Container& paths)
+{
+  static_assert(std::is_same_v<typename Container::value_type, DataArrayPath>);
+
+  if(paths.empty())
+  {
+    return DataArrayPath();
+  }
+
+  return DataArrayPath(paths.front().getDataContainerName(), paths.front().getAttributeMatrixName(), "");
+}
+} // namespace
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -331,13 +391,13 @@ QVector<QString> DataArrayPath::toQVector() const
 // -----------------------------------------------------------------------------
 QList<QString> DataArrayPath::GetDataArrayNames(const QVector<DataArrayPath>& paths)
 {
-  QList<QString> arrayNames;
-  for(int i = 0; i < paths.count(); i++)
-  {
-    arrayNames.push_back(paths.at(i).getDataArrayName());
-  }
+  return GetDataArrayNamesImpl<QList<QString>>(paths);
+}
 
-  return arrayNames;
+// -----------------------------------------------------------------------------
+std::vector<QString> DataArrayPath::GetDataArrayNames(const std::vector<DataArrayPath>& paths)
+{
+  return GetDataArrayNamesImpl<std::vector<QString>>(paths);
 }
 
 // -----------------------------------------------------------------------------
@@ -345,12 +405,13 @@ QList<QString> DataArrayPath::GetDataArrayNames(const QVector<DataArrayPath>& pa
 // -----------------------------------------------------------------------------
 DataArrayPath DataArrayPath::GetAttributeMatrixPath(const QVector<DataArrayPath>& paths)
 {
-  if(paths.isEmpty())
-  {
-    return DataArrayPath();
-  }
+  return GetAttributeMatrixPathImpl(paths);
+}
 
-  return DataArrayPath(paths.first().getDataContainerName(), paths.first().getAttributeMatrixName(), "");
+// -----------------------------------------------------------------------------
+DataArrayPath DataArrayPath::GetAttributeMatrixPath(const std::vector<DataArrayPath>& paths)
+{
+  return GetAttributeMatrixPathImpl(paths);
 }
 
 // -----------------------------------------------------------------------------
@@ -468,26 +529,13 @@ bool DataArrayPath::isSubset(const DataArrayPath& other) const
 // -----------------------------------------------------------------------------
 bool DataArrayPath::ValidateVector(const QVector<DataArrayPath>& other)
 {
-  QString dcName = "";
-  QString amName = "";
-
-  if(other.isEmpty())
-  {
-    return true;
-  }
-
-  dcName = other.first().getDataContainerName();
-  amName = other.first().getAttributeMatrixName();
-
-  for(int i = 0; i < other.size(); ++i)
-  {
-    if(other.at(i).getDataContainerName() != dcName || other.at(i).getAttributeMatrixName() != amName)
-    {
-      return false;
-    }
-  }
+  return ValidateVectorImpl(other);
+}
 
-  return true;
+// -----------------------------------------------------------------------------
+bool DataArrayPath::ValidateVector(const std::vector<DataArrayPath>& other)
+{
+  return ValidateVectorImpl(other);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 0eb99b78b4..58f1a8447f 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -143,12 +143,24 @@ class SIMPLib_EXPORT DataArrayPath
    */
   static bool ValidateVector(const QVector<DataArrayPath>& other);
 
+  /**
+   * @brief checks that a vector of paths have the same data container and attribute matrix
+   * @return true if the paths in the vector have the same data container and attribute matrix, false otherwise
+   */
+  static bool ValidateVector(const std::vector<DataArrayPath>& other);
+
   /**
    * @brief Gets the data array names from a QVector of DataArrayPaths.
    * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
    */
   static QList<QString> GetDataArrayNames(const QVector<DataArrayPath>& paths);
 
+  /**
+   * @brief Gets the data array names from a QVector of DataArrayPaths.
+   * @return Returns the data array names from a QVector of DataArrayPaths, in a QList.
+   */
+  static std::vector<QString> GetDataArrayNames(const std::vector<DataArrayPath>& paths);
+
   /**
    * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
    * @return Returns the attribute matrix path as a DataArrayPath from a QVector
@@ -156,6 +168,13 @@ class SIMPLib_EXPORT DataArrayPath
    */
   static DataArrayPath GetAttributeMatrixPath(const QVector<DataArrayPath>& paths);
 
+  /**
+   * @brief Gets the attribute matrix path from a QVector of DataArrayPaths.
+   * @return Returns the attribute matrix path as a DataArrayPath from a QVector
+   * of DataArrayPaths.
+   */
+  static DataArrayPath GetAttributeMatrixPath(const std::vector<DataArrayPath>& paths);
+
   /**
    * @brief ConvertToQVector Converts a QStringList of DataArrayPaths to a QVector of DataArrayPaths
    * @param paths
@@ -503,5 +522,8 @@ class SIMPLib_EXPORT DataArrayPath
   DataArrayPathHelper::DataType m_DataType = DataArrayPathHelper::DataType::None;
 };
 
+using DataArrayPathVec = std::vector<DataArrayPath>;
+
 Q_DECLARE_METATYPE(DataArrayPath)
 Q_DECLARE_METATYPE(DataArrayPathHelper::DataType)
+Q_DECLARE_METATYPE(DataArrayPathVec)
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 9b4effa695..5da8febd35 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -35,6 +35,8 @@
 
 #include "DataContainerArray.h"
 
+#include <type_traits>
+
 #include <QtCore/QTextStream>
 
 #include <hdf5.h>
@@ -46,6 +48,81 @@
 #include "SIMPLib/Montages/AbstractMontage.h"
 #include "SIMPLib/Montages/GridMontage.h"
 
+namespace
+{
+template <class Container>
+bool validateNumberOfTuplesImpl(const DataContainerArray& dca, AbstractFilter* filter, const Container& paths)
+{
+  static_assert(std::is_same_v<typename Container::value_type, DataArrayPath>);
+
+  using size_type = typename Container::size_type;
+
+  if(paths.size() <= 1)
+  {
+    return false;
+  }
+  QVector<IDataArrayShPtrType> dataArrays;
+  bool valid = true;
+  QString ss;
+  if(!paths.at(0).isValid() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+             .arg(__LINE__)
+             .arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10000, ss);
+    valid = false;
+    return valid;
+  }
+  IDataArrayShPtrType array0 = dca.getPrereqIDataArrayFromPath(filter, paths.at(0));
+  if(nullptr == array0.get() && nullptr != filter)
+  {
+    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
+    filter->setErrorCondition(-10100, ss);
+    valid = false;
+    return valid;
+  }
+
+  dataArrays.push_back(array0);
+  for(size_type i = 1; i < paths.size(); i++)
+  {
+    if(!paths.at(i).isValid() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
+               .arg(__LINE__)
+               .arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10000, ss);
+      valid = false;
+      return valid;
+    }
+    IDataArrayShPtrType nextArray = dca.getPrereqIDataArrayFromPath(filter, paths.at(i));
+    if(nullptr == nextArray.get() && nullptr != filter)
+    {
+      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
+      filter->setErrorCondition(-10100, ss);
+      valid = false;
+      return valid;
+    }
+
+    dataArrays.push_back(nextArray);
+  }
+  size_t numTuples = dataArrays[0]->getNumberOfTuples();
+  for(int32_t i = 1; i < dataArrays.size(); i++)
+  {
+    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
+    {
+      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
+               .arg(dataArrays[0]->getName())
+               .arg(dataArrays[0]->getNumberOfTuples())
+               .arg(dataArrays[i]->getName())
+               .arg(dataArrays[i]->getNumberOfTuples());
+      filter->setErrorCondition(-10200, ss);
+      valid = false;
+    }
+  }
+  return valid;
+}
+} // namespace
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -770,69 +847,13 @@ AttributeMatrix::Pointer DataContainerArray::getPrereqAttributeMatrixFromPath(Ab
 // -----------------------------------------------------------------------------
 bool DataContainerArray::validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const
 {
-  if(paths.size() <= 1)
-  {
-    return false;
-  }
-  QVector<IDataArrayShPtrType> dataArrays;
-  bool valid = true;
-  QString ss;
-  if(!paths.at(0).isValid() && nullptr != filter)
-  {
-    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
-             .arg(__LINE__)
-             .arg(paths.at(0).serialize());
-    filter->setErrorCondition(-10000, ss);
-    valid = false;
-    return valid;
-  }
-  IDataArrayShPtrType array0 = getPrereqIDataArrayFromPath(filter, paths.at(0));
-  if(nullptr == array0.get() && nullptr != filter)
-  {
-    ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(0).serialize());
-    filter->setErrorCondition(-10100, ss);
-    valid = false;
-    return valid;
-  }
-
-  dataArrays.push_back(array0);
-  for(int32_t i = 1; i < paths.size(); i++)
-  {
-    if(!paths.at(i).isValid() && nullptr != filter)
-    {
-      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArrayPath object was not valid meaning one of the strings in the object is empty. The path is %2")
-               .arg(__LINE__)
-               .arg(paths.at(i).serialize());
-      filter->setErrorCondition(-10000, ss);
-      valid = false;
-      return valid;
-    }
-    IDataArrayShPtrType nextArray = getPrereqIDataArrayFromPath(filter, paths.at(i));
-    if(nullptr == nextArray.get() && nullptr != filter)
-    {
-      ss = QObject::tr("DataContainerArray::validateNumberOfTuples Error at line %1. The DataArray object was not available. The path is %2").arg(__LINE__).arg(paths.at(i).serialize());
-      filter->setErrorCondition(-10100, ss);
-      valid = false;
-      return valid;
-    }
+  return validateNumberOfTuplesImpl(*this, filter, paths);
+}
 
-    dataArrays.push_back(nextArray);
-  }
-  size_t numTuples = dataArrays[0]->getNumberOfTuples();
-  for(int32_t i = 1; i < dataArrays.size(); i++)
-  {
-    if(numTuples != dataArrays[i]->getNumberOfTuples() && nullptr != filter)
-    {
-      ss = QObject::tr("The number of tuples for the DataArray %1 is %2 and for DataArray %3 is %4. The number of tuples must match.")
-               .arg(dataArrays[0]->getName())
-               .arg(dataArrays[0]->getNumberOfTuples())
-               .arg(dataArrays[i]->getName())
-               .arg(dataArrays[i]->getNumberOfTuples());
-      filter->setErrorCondition(-10200, ss);
-      valid = false;
-    }
-  }
-  return valid;
+// -----------------------------------------------------------------------------
+bool DataContainerArray::validateNumberOfTuples(AbstractFilter* filter, const std::vector<DataArrayPath>& paths) const
+{
+  return validateNumberOfTuplesImpl(*this, filter, paths);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 66bbccab8a..9fd7442fec 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -631,6 +631,17 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
    */
   bool validateNumberOfTuples(AbstractFilter* filter, const QVector<DataArrayPath>& paths) const;
 
+  /**
+   * @brief validateNumberOfTuples This method will validate that all of the DataArray
+   * paths supplied are valid, return non-nullptr DataArray pointers, and that all have the
+   * same number of tuples.  It will return false if and any of the checks fail, or
+   * if the QVector of input paths has 0 or 1 element.
+   * @param filter The filter calling the validation
+   * @param paths The paths that should be checked
+   * @return bool Validation check
+   */
+  bool validateNumberOfTuples(AbstractFilter* filter, const std::vector<DataArrayPath>& paths) const;
+
   /**
    * @brief validateNumberOfTuples This method will validate that all of the DataArray
    * objects supplied are non-nullptr and that all are have the same number of tuples.
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index 1d2d2e6726..cfa60b877a 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -52,7 +52,7 @@ ChoiceFilterParameter::~ChoiceFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 ChoiceFilterParameter::Pointer ChoiceFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback,
-                                                             const GetterCallbackType& getterCallback, QVector<QString> choices, bool editable, int groupIndex)
+                                                             const GetterCallbackType& getterCallback, const std::vector<QString>& choices, bool editable, int groupIndex)
 
 {
   ChoiceFilterParameter::Pointer ptr = ChoiceFilterParameter::New();
@@ -130,13 +130,13 @@ QString ChoiceFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void ChoiceFilterParameter::setChoices(const QVector<QString>& value)
+void ChoiceFilterParameter::setChoices(const std::vector<QString>& value)
 {
   m_Choices = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> ChoiceFilterParameter::getChoices() const
+std::vector<QString> ChoiceFilterParameter::getChoices() const
 {
   return m_Choices;
 }
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index 0dfe5bf232..45ab213095 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -36,6 +36,7 @@
 #pragma once
 
 #include <memory>
+#include <vector>
 
 #include <QtCore/QJsonObject>
 
@@ -111,19 +112,19 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                        QVector<QString> choices, bool editable, int groupIndex = -1);
+                        const std::vector<QString>& choices, bool editable, int groupIndex = -1);
 
   ~ChoiceFilterParameter() override;
 
   /**
    * @brief Setter property for Choices
    */
-  void setChoices(const QVector<QString>& value);
+  void setChoices(const std::vector<QString>& value);
   /**
    * @brief Getter property for Choices
    * @return Value of Choices
    */
-  QVector<QString> getChoices() const;
+  std::vector<QString> getChoices() const;
 
   /**
    * @brief Setter property for Editable
@@ -198,7 +199,7 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
   ChoiceFilterParameter& operator=(ChoiceFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QVector<QString> m_Choices = {};
+  std::vector<QString> m_Choices = {};
   bool m_Editable = {};
   ChoiceFilterParameter::SetterCallbackType m_SetterCallback = {};
   ChoiceFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index d967774ebf..6b50c52169 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -56,8 +56,8 @@ ComparisonSelectionAdvancedFilterParameter::~ComparisonSelectionAdvancedFilterPa
 // -----------------------------------------------------------------------------
 ComparisonSelectionAdvancedFilterParameter::Pointer ComparisonSelectionAdvancedFilterParameter::Create(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue,
                                                                                                        Category category, const SetterCallbackType& setterCallback,
-                                                                                                       const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators,
-                                                                                                       int groupIndex)
+                                                                                                       const GetterCallbackType& getterCallback, const std::vector<QString>& choices,
+                                                                                                       bool showOperators, int groupIndex)
 {
   ComparisonSelectionAdvancedFilterParameter::Pointer ptr = ComparisonSelectionAdvancedFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -190,13 +190,13 @@ QString ComparisonSelectionAdvancedFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void ComparisonSelectionAdvancedFilterParameter::setChoices(const QVector<QString>& value)
+void ComparisonSelectionAdvancedFilterParameter::setChoices(const std::vector<QString>& value)
 {
   m_Choices = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> ComparisonSelectionAdvancedFilterParameter::getChoices() const
+std::vector<QString> ComparisonSelectionAdvancedFilterParameter::getChoices() const
 {
   return m_Choices;
 }
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 6e7b577fef..d1235e553f 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -115,19 +115,19 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, ComparisonInputsAdvanced defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, const std::vector<QString>& choices, bool showOperators, int groupIndex = -1);
 
   ~ComparisonSelectionAdvancedFilterParameter() override;
 
   /**
    * @brief Setter property for Choices
    */
-  void setChoices(const QVector<QString>& value);
+  void setChoices(const std::vector<QString>& value);
   /**
    * @brief Getter property for Choices
    * @return Value of Choices
    */
-  QVector<QString> getChoices() const;
+  std::vector<QString> getChoices() const;
 
   /**
    * @brief Setter property for ShowOperators
@@ -229,7 +229,7 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
   ComparisonSelectionAdvancedFilterParameter& operator=(ComparisonSelectionAdvancedFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QVector<QString> m_Choices = {};
+  std::vector<QString> m_Choices = {};
   bool m_ShowOperators = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index e313d855ac..2ed36fac1b 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -56,8 +56,8 @@ ComparisonSelectionFilterParameter::~ComparisonSelectionFilterParameter() = defa
 //
 // -----------------------------------------------------------------------------
 ComparisonSelectionFilterParameter::Pointer ComparisonSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category,
-                                                                                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                                                                                       bool showOperators, int groupIndex)
+                                                                                       const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                                       const std::vector<QString>& choices, bool showOperators, int groupIndex)
 {
   ComparisonSelectionFilterParameter::Pointer ptr = ComparisonSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -205,13 +205,13 @@ QString ComparisonSelectionFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void ComparisonSelectionFilterParameter::setChoices(const QVector<QString>& value)
+void ComparisonSelectionFilterParameter::setChoices(const std::vector<QString>& value)
 {
   m_Choices = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<QString> ComparisonSelectionFilterParameter::getChoices() const
+std::vector<QString> ComparisonSelectionFilterParameter::getChoices() const
 {
   return m_Choices;
 }
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index 5fe971a642..35e2d2690b 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -114,19 +114,19 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, ComparisonInputs defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, QVector<QString> choices, bool showOperators, int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, const std::vector<QString>& choices, bool showOperators, int groupIndex = -1);
 
   ~ComparisonSelectionFilterParameter() override;
 
   /**
    * @brief Setter property for Choices
    */
-  void setChoices(const QVector<QString>& value);
+  void setChoices(const std::vector<QString>& value);
   /**
    * @brief Getter property for Choices
    * @return Value of Choices
    */
-  QVector<QString> getChoices() const;
+  std::vector<QString> getChoices() const;
 
   /**
    * @brief Setter property for ShowOperators
@@ -228,7 +228,7 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
   ComparisonSelectionFilterParameter& operator=(ComparisonSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QVector<QString> m_Choices = {};
+  std::vector<QString> m_Choices = {};
   bool m_ShowOperators = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 02074cf53c..4ac0a2fe3c 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -49,8 +49,8 @@ LinkedBooleanFilterParameter::~LinkedBooleanFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedBooleanFilterParameter::Pointer LinkedBooleanFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category,
-                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QStringList conditionalProperties,
-                                                                           int groupIndex)
+                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
+                                                                           const std::vector<QString>& conditionalProperties, int groupIndex)
 {
   LinkedBooleanFilterParameter::Pointer ptr = LinkedBooleanFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -126,13 +126,13 @@ QString LinkedBooleanFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void LinkedBooleanFilterParameter::setConditionalProperties(const QStringList& value)
+void LinkedBooleanFilterParameter::setConditionalProperties(const std::vector<QString>& value)
 {
   m_ConditionalProperties = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList LinkedBooleanFilterParameter::getConditionalProperties() const
+std::vector<QString> LinkedBooleanFilterParameter::getConditionalProperties() const
 {
   return m_ConditionalProperties;
 }
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index 1a1071f600..78c14ffe0c 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -110,19 +110,19 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, const bool& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, QStringList conditionalProperties, int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, const std::vector<QString>& conditionalProperties, int groupIndex = -1);
 
   ~LinkedBooleanFilterParameter() override;
 
   /**
    * @brief Setter property for ConditionalProperties
    */
-  void setConditionalProperties(const QStringList& value);
+  void setConditionalProperties(const std::vector<QString>& value);
   /**
    * @brief Getter property for ConditionalProperties
    * @return Value of ConditionalProperties
    */
-  QStringList getConditionalProperties() const;
+  std::vector<QString> getConditionalProperties() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -187,7 +187,7 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
   LinkedBooleanFilterParameter& operator=(LinkedBooleanFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QStringList m_ConditionalProperties = {};
+  std::vector<QString> m_ConditionalProperties = {};
   LinkedBooleanFilterParameter::SetterCallbackType m_SetterCallback = {};
   LinkedBooleanFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index a095770159..662d6dbeac 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -49,8 +49,8 @@ LinkedChoicesFilterParameter::~LinkedChoicesFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 LinkedChoicesFilterParameter::Pointer LinkedChoicesFilterParameter::Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category,
-                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, QVector<QString> choices,
-                                                                           QStringList linkedProperties, int groupIndex)
+                                                                           const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const std::vector<QString>& choices,
+                                                                           const std::vector<QString>& linkedProperties, int groupIndex)
 {
   LinkedChoicesFilterParameter::Pointer ptr = LinkedChoicesFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -124,13 +124,13 @@ QString LinkedChoicesFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void LinkedChoicesFilterParameter::setLinkedProperties(const QStringList& value)
+void LinkedChoicesFilterParameter::setLinkedProperties(const std::vector<QString>& value)
 {
   m_LinkedProperties = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList LinkedChoicesFilterParameter::getLinkedProperties() const
+std::vector<QString> LinkedChoicesFilterParameter::getLinkedProperties() const
 {
   return m_LinkedProperties;
 }
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index d71228fef0..2b2f3c34f5 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -95,19 +95,19 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, int defaultValue, Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
-                        QVector<QString> choices, QStringList linkedProperties, int groupIndex = -1);
+                        const std::vector<QString>& choices, const std::vector<QString>& linkedProperties, int groupIndex = -1);
 
   ~LinkedChoicesFilterParameter() override;
 
   /**
    * @brief Setter property for LinkedProperties
    */
-  void setLinkedProperties(const QStringList& value);
+  void setLinkedProperties(const std::vector<QString>& value);
   /**
    * @brief Getter property for LinkedProperties
    * @return Value of LinkedProperties
    */
-  QStringList getLinkedProperties() const;
+  std::vector<QString> getLinkedProperties() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -142,5 +142,5 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
   LinkedChoicesFilterParameter& operator=(LinkedChoicesFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QStringList m_LinkedProperties = {};
+  std::vector<QString> m_LinkedProperties = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index 06788659cf..d3cf0eb6ce 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -52,7 +52,7 @@ LinkedDataContainerSelectionFilterParameter::~LinkedDataContainerSelectionFilter
 LinkedDataContainerSelectionFilterParameter::Pointer LinkedDataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue,
                                                                                                          Category category, const SetterCallbackType& setterCallback,
                                                                                                          const GetterCallbackType& getterCallback, const RequirementType& req,
-                                                                                                         const QStringList& linkedProperties, int groupIndex)
+                                                                                                         const std::vector<QString>& linkedProperties, int groupIndex)
 {
   LinkedDataContainerSelectionFilterParameter::Pointer ptr = LinkedDataContainerSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -161,13 +161,13 @@ QString LinkedDataContainerSelectionFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void LinkedDataContainerSelectionFilterParameter::setLinkedProperties(const QStringList& value)
+void LinkedDataContainerSelectionFilterParameter::setLinkedProperties(const std::vector<QString>& value)
 {
   m_LinkedProperties = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList LinkedDataContainerSelectionFilterParameter::getLinkedProperties() const
+std::vector<QString> LinkedDataContainerSelectionFilterParameter::getLinkedProperties() const
 {
   return m_LinkedProperties;
 }
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index 9715b6fe02..e8c9638550 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -116,19 +116,19 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, const DataArrayPath& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, const RequirementType& req, const QStringList& linkedProperties, int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, const RequirementType& req, const std::vector<QString>& linkedProperties, int groupIndex = -1);
 
   ~LinkedDataContainerSelectionFilterParameter() override;
 
   /**
    * @brief Setter property for LinkedProperties
    */
-  void setLinkedProperties(const QStringList& value);
+  void setLinkedProperties(const std::vector<QString>& value);
   /**
    * @brief Getter property for LinkedProperties
    * @return Value of LinkedProperties
    */
-  QStringList getLinkedProperties() const;
+  std::vector<QString> getLinkedProperties() const;
 
   /**
    * @brief Setter property for DefaultGeometryTypes
@@ -208,7 +208,7 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
   LinkedDataContainerSelectionFilterParameter& operator=(LinkedDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QStringList m_LinkedProperties = {};
+  std::vector<QString> m_LinkedProperties = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   LinkedDataContainerSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
   LinkedDataContainerSelectionFilterParameter::GetterCallbackType m_GetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 10637d9183..47d17bc9a9 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -44,7 +44,7 @@
 //
 // -----------------------------------------------------------------------------
 MultiAttributeMatrixSelectionFilterParameter::MultiAttributeMatrixSelectionFilterParameter()
-: m_DefaultPaths(QVector<DataArrayPath>())
+: m_DefaultPaths(std::vector<DataArrayPath>())
 {
 }
 
@@ -57,7 +57,7 @@ MultiAttributeMatrixSelectionFilterParameter::~MultiAttributeMatrixSelectionFilt
 //
 // -----------------------------------------------------------------------------
 MultiAttributeMatrixSelectionFilterParameter::Pointer MultiAttributeMatrixSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName,
-                                                                                                           const QVector<DataArrayPath>& defaultValue, Category category,
+                                                                                                           const std::vector<DataArrayPath>& defaultValue, Category category,
                                                                                                            const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                                                                                                            RequirementType req, int groupIndex)
 {
@@ -175,7 +175,7 @@ void MultiAttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& j
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
-    QVector<DataArrayPath> dapVec;
+    std::vector<DataArrayPath> dapVec;
     for(int i = 0; i < arrayObj.size(); i++)
     {
       QJsonObject obj = arrayObj.at(i).toObject();
@@ -195,7 +195,7 @@ void MultiAttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    std::vector<DataArrayPath> dapVec = m_GetterCallback();
     QJsonArray arrayObj;
 
     for(int i = 0; i < dapVec.size(); i++)
@@ -219,11 +219,11 @@ void MultiAttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(Abstract
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  QVector<DataArrayPath> paths = m_GetterCallback();
-  int count = paths.size();
+  std::vector<DataArrayPath> paths = m_GetterCallback();
+  size_t count = paths.size();
   bool updated = false;
 
-  for(int i = 0; i < count; i++)
+  for(size_t i = 0; i < count; i++)
   {
     if(paths[i] == oldPath)
     {
@@ -262,13 +262,13 @@ QString MultiAttributeMatrixSelectionFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionFilterParameter::setDefaultPaths(const QVector<DataArrayPath>& value)
+void MultiAttributeMatrixSelectionFilterParameter::setDefaultPaths(const std::vector<DataArrayPath>& value)
 {
   m_DefaultPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> MultiAttributeMatrixSelectionFilterParameter::getDefaultPaths() const
+std::vector<DataArrayPath> MultiAttributeMatrixSelectionFilterParameter::getDefaultPaths() const
 {
   return m_DefaultPaths;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 465b734a9e..bfc1e4f2f3 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -94,8 +94,8 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
    */
   static QString ClassName();
 
-  typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-  typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+  using SetterCallbackType = std::function<void(std::vector<DataArrayPath>)>;
+  using GetterCallbackType = std::function<std::vector<DataArrayPath>(void)>;
 
   struct RequirementType
   {
@@ -125,7 +125,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const std::vector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
                         const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~MultiAttributeMatrixSelectionFilterParameter() override;
@@ -152,12 +152,12 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   /**
    * @brief Setter property for DefaultPaths
    */
-  void setDefaultPaths(const QVector<DataArrayPath>& value);
+  void setDefaultPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for DefaultPaths
    * @return Value of DefaultPaths
    */
-  QVector<DataArrayPath> getDefaultPaths() const;
+  std::vector<DataArrayPath> getDefaultPaths() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -269,7 +269,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
   MultiAttributeMatrixSelectionFilterParameter& operator=(MultiAttributeMatrixSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QVector<DataArrayPath> m_DefaultPaths = {};
+  std::vector<DataArrayPath> m_DefaultPaths = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   std::vector<QString> m_DefaultAttributeArrayTypes = {};
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index 2073486ea0..e5d41c7fd4 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -44,7 +44,7 @@
 //
 // -----------------------------------------------------------------------------
 MultiDataArraySelectionFilterParameter::MultiDataArraySelectionFilterParameter()
-: m_DefaultPaths(QVector<DataArrayPath>())
+: m_DefaultPaths(std::vector<DataArrayPath>())
 {
 }
 
@@ -56,7 +56,7 @@ MultiDataArraySelectionFilterParameter::~MultiDataArraySelectionFilterParameter(
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue,
+MultiDataArraySelectionFilterParameter::Pointer MultiDataArraySelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const std::vector<DataArrayPath>& defaultValue,
                                                                                                Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                                                                                                RequirementType req, int groupIndex)
 {
@@ -174,7 +174,7 @@ void MultiDataArraySelectionFilterParameter::readJson(const QJsonObject& json)
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
-    QVector<DataArrayPath> dapVec;
+    std::vector<DataArrayPath> dapVec;
     for(int i = 0; i < arrayObj.size(); i++)
     {
       QJsonObject obj = arrayObj.at(i).toObject();
@@ -194,7 +194,7 @@ void MultiDataArraySelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    QVector<DataArrayPath> dapVec = m_GetterCallback();
+    std::vector<DataArrayPath> dapVec = m_GetterCallback();
     QJsonArray arrayObj;
 
     for(int i = 0; i < dapVec.size(); i++)
@@ -218,7 +218,7 @@ void MultiDataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  QVector<DataArrayPath> paths = m_GetterCallback();
+  std::vector<DataArrayPath> paths = m_GetterCallback();
   int count = paths.size();
   bool updated = false;
 
@@ -261,13 +261,13 @@ QString MultiDataArraySelectionFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionFilterParameter::setDefaultPaths(const QVector<DataArrayPath>& value)
+void MultiDataArraySelectionFilterParameter::setDefaultPaths(const std::vector<DataArrayPath>& value)
 {
   m_DefaultPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> MultiDataArraySelectionFilterParameter::getDefaultPaths() const
+std::vector<DataArrayPath> MultiDataArraySelectionFilterParameter::getDefaultPaths() const
 {
   return m_DefaultPaths;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index d47ae0e2d0..db4bee1169 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -94,8 +94,8 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
    */
   static QString ClassName();
 
-  typedef std::function<void(QVector<DataArrayPath>)> SetterCallbackType;
-  typedef std::function<QVector<DataArrayPath>(void)> GetterCallbackType;
+  using SetterCallbackType = std::function<void(std::vector<DataArrayPath>)>;
+  using GetterCallbackType = std::function<std::vector<DataArrayPath>(void)>;
 
   struct RequirementType
   {
@@ -125,7 +125,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const std::vector<DataArrayPath>& defaultValue, Category category, const SetterCallbackType& setterCallback,
                         const GetterCallbackType& getterCallback, RequirementType req, int groupIndex = -1);
 
   ~MultiDataArraySelectionFilterParameter() override;
@@ -152,12 +152,12 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   /**
    * @brief Setter property for DefaultPaths
    */
-  void setDefaultPaths(const QVector<DataArrayPath>& value);
+  void setDefaultPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for DefaultPaths
    * @return Value of DefaultPaths
    */
-  QVector<DataArrayPath> getDefaultPaths() const;
+  std::vector<DataArrayPath> getDefaultPaths() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -269,7 +269,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
   MultiDataArraySelectionFilterParameter& operator=(MultiDataArraySelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QVector<DataArrayPath> m_DefaultPaths = {};
+  std::vector<DataArrayPath> m_DefaultPaths = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   std::vector<QString> m_DefaultAttributeArrayTypes = {};
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 8767729619..48fbf27a4f 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -44,7 +44,7 @@
 //
 // -----------------------------------------------------------------------------
 MultiDataContainerSelectionFilterParameter::MultiDataContainerSelectionFilterParameter()
-: m_DefaultNames(QStringList())
+: m_DefaultNames(std::vector<QString>())
 {
 }
 
@@ -56,7 +56,7 @@ MultiDataContainerSelectionFilterParameter::~MultiDataContainerSelectionFilterPa
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue,
+MultiDataContainerSelectionFilterParameter::Pointer MultiDataContainerSelectionFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const std::vector<QString>& defaultValue,
                                                                                                        Category category, const SetterCallbackType& setterCallback,
                                                                                                        const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex)
 {
@@ -174,7 +174,7 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
   if(!jsonValue.isUndefined() && m_SetterCallback)
   {
     QJsonArray arrayObj = jsonValue.toArray();
-    QStringList dcList;
+    std::vector<QString> dcList;
     for(const auto obj : arrayObj)
     {
       QString dcName = obj.toString();
@@ -192,10 +192,10 @@ void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
 {
   if(m_GetterCallback)
   {
-    QStringList dcList = m_GetterCallback();
+    std::vector<QString> dcList = m_GetterCallback();
     QJsonArray arrayObj;
 
-    for(int i = 0; i < dcList.size(); i++)
+    for(size_t i = 0; i < dcList.size(); i++)
     {
       QString dcName = dcList[i];
       arrayObj.push_back(dcName);
@@ -214,11 +214,11 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  QStringList dcList = m_GetterCallback();
-  int count = dcList.size();
+  std::vector<QString> dcList = m_GetterCallback();
+  size_t count = dcList.size();
   bool updated = false;
 
-  for(int i = 0; i < count; i++)
+  for(size_t i = 0; i < count; i++)
   {
     if(dcList[i] == oldPath.getDataContainerName())
     {
@@ -257,13 +257,13 @@ QString MultiDataContainerSelectionFilterParameter::ClassName()
 }
 
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionFilterParameter::setDefaultNames(const QStringList& value)
+void MultiDataContainerSelectionFilterParameter::setDefaultNames(const std::vector<QString>& value)
 {
   m_DefaultNames = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList MultiDataContainerSelectionFilterParameter::getDefaultNames() const
+std::vector<QString> MultiDataContainerSelectionFilterParameter::getDefaultNames() const
 {
   return m_DefaultNames;
 }
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index c6058e3e0d..8bc94b6610 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -95,8 +95,8 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(QStringList)>;
-  using GetterCallbackType = std::function<QStringList(void)>;
+  using SetterCallbackType = std::function<void(std::vector<QString>)>;
+  using GetterCallbackType = std::function<std::vector<QString>(void)>;
 
   struct RequirementType
   {
@@ -126,7 +126,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
-  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QStringList& defaultValue, Category category, const SetterCallbackType& setterCallback,
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const std::vector<QString>& defaultValue, Category category, const SetterCallbackType& setterCallback,
                         const GetterCallbackType& getterCallback, const RequirementType& req, int groupIndex = -1);
 
   ~MultiDataContainerSelectionFilterParameter() override;
@@ -153,12 +153,12 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   /**
    * @brief Setter property for DefaultNames
    */
-  void setDefaultNames(const QStringList& value);
+  void setDefaultNames(const std::vector<QString>& value);
   /**
    * @brief Getter property for DefaultNames
    * @return Value of DefaultNames
    */
-  QStringList getDefaultNames() const;
+  std::vector<QString> getDefaultNames() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -270,7 +270,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
   MultiDataContainerSelectionFilterParameter& operator=(MultiDataContainerSelectionFilterParameter&&) = delete;      // Move Assignment Not Implemented
 
 private:
-  QStringList m_DefaultNames = {};
+  std::vector<QString> m_DefaultNames = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   std::vector<QString> m_DefaultAttributeArrayTypes = {};
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 705696508b..3266ce3051 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -55,7 +55,7 @@ PhaseTypeSelectionFilterParameter::~PhaseTypeSelectionFilterParameter() = defaul
 PhaseTypeSelectionFilterParameter::Pointer PhaseTypeSelectionFilterParameter::Create(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault,
                                                                                      Category category, const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback,
                                                                                      const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                                                                                     const QStringList& phaseListChoices, int groupIndex)
+                                                                                     const std::vector<QString>& phaseListChoices, int groupIndex)
 {
   PhaseTypeSelectionFilterParameter::Pointer ptr = PhaseTypeSelectionFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
@@ -214,13 +214,13 @@ DataArrayPath PhaseTypeSelectionFilterParameter::getAttributeMatrixPathDefault()
 }
 
 // -----------------------------------------------------------------------------
-void PhaseTypeSelectionFilterParameter::setPhaseListChoices(const QStringList& value)
+void PhaseTypeSelectionFilterParameter::setPhaseListChoices(const std::vector<QString>& value)
 {
   m_PhaseListChoices = value;
 }
 
 // -----------------------------------------------------------------------------
-QStringList PhaseTypeSelectionFilterParameter::getPhaseListChoices() const
+std::vector<QString> PhaseTypeSelectionFilterParameter::getPhaseListChoices() const
 {
   return m_PhaseListChoices;
 }
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 6ca5503a16..e0d5cda84b 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -114,7 +114,7 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   */
   static Pointer Create(const QString& humanLabel, const QString& phaseTypeDataProperty, const DataArrayPath& attributeMatrixDefault, Category category, const SetterCallbackType& setterCallback,
                         const GetterCallbackType& getterCallback, const QString& PhaseTypesArrayName, const QString& phaseTypeCountProperty, const QString& attributeMatrixProperty,
-                        const QStringList& phaseListChoices, int groupIndex = -1);
+                        const std::vector<QString>& phaseListChoices, int groupIndex = -1);
 
   ~PhaseTypeSelectionFilterParameter() override;
 
@@ -161,12 +161,12 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   /**
    * @brief Setter property for PhaseListChoices
    */
-  void setPhaseListChoices(const QStringList& value);
+  void setPhaseListChoices(const std::vector<QString>& value);
   /**
    * @brief Getter property for PhaseListChoices
    * @return Value of PhaseListChoices
    */
-  QStringList getPhaseListChoices() const;
+  std::vector<QString> getPhaseListChoices() const;
 
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
@@ -260,7 +260,7 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
   QString m_PhaseTypeDataProperty = {};
   QString m_AttributeMatrixPathProperty = {};
   DataArrayPath m_AttributeMatrixPathDefault = {};
-  QStringList m_PhaseListChoices = {};
+  std::vector<QString> m_PhaseListChoices = {};
   IGeometry::Types m_DefaultGeometryTypes = {};
   AttributeMatrix::Types m_DefaultAttributeMatrixTypes = {};
   PhaseTypeSelectionFilterParameter::SetterCallbackType m_SetterCallback = {};
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index 44a364d233..dfc83bb914 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -660,31 +660,31 @@ class FilterParametersRWTest
   Q_PROPERTY(Float4thOrderPolynomial Float4thOrderPoly_2 READ getFloat4thOrderPoly_2 WRITE setFloat4thOrderPoly_2)
 
   // -----------------------------------------------------------------------------
-  void setDataArrayPaths1(const QVector<DataArrayPath>& value)
+  void setDataArrayPaths1(const std::vector<DataArrayPath>& value)
   {
     m_DataArrayPaths1 = value;
   }
 
   // -----------------------------------------------------------------------------
-  QVector<DataArrayPath> getDataArrayPaths1() const
+  std::vector<DataArrayPath> getDataArrayPaths1() const
   {
     return m_DataArrayPaths1;
   }
 
-  Q_PROPERTY(QVector<DataArrayPath> DataArrayPaths1 READ getDataArrayPaths1 WRITE setDataArrayPaths1)
+  Q_PROPERTY(DataArrayPathVec DataArrayPaths1 READ getDataArrayPaths1 WRITE setDataArrayPaths1)
   // -----------------------------------------------------------------------------
-  void setDataArrayPaths2(const QVector<DataArrayPath>& value)
+  void setDataArrayPaths2(const std::vector<DataArrayPath>& value)
   {
     m_DataArrayPaths2 = value;
   }
 
   // -----------------------------------------------------------------------------
-  QVector<DataArrayPath> getDataArrayPaths2() const
+  std::vector<DataArrayPath> getDataArrayPaths2() const
   {
     return m_DataArrayPaths2;
   }
 
-  Q_PROPERTY(QVector<DataArrayPath> DataArrayPaths2 READ getDataArrayPaths2 WRITE setDataArrayPaths2)
+  Q_PROPERTY(DataArrayPathVec DataArrayPaths2 READ getDataArrayPaths2 WRITE setDataArrayPaths2)
 
   // -----------------------------------------------------------------------------
   void setShapeTypeVector_1(const ShapeType::Types& value)
@@ -865,7 +865,7 @@ class FilterParametersRWTest
 
     {
       ChoiceFilterParameter::Pointer fp = ChoiceFilterParameter::Create("Test", "Int1", getInt1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
-                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), true);
+                                                                        SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), std::vector<QString>(), true);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -879,7 +879,7 @@ class FilterParametersRWTest
     {
       ComparisonSelectionFilterParameter::Pointer fp = ComparisonSelectionFilterParameter::Create("Test", "ComparisonInputs1", ComparisonInputs(), FilterParameter::Category::Parameter,
                                                                                                   SIMPL_BIND_SETTER(FilterParametersRWTest, this, ComparisonInputs2),
-                                                                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ComparisonInputs1), QVector<QString>(), true);
+                                                                                                  SIMPL_BIND_GETTER(FilterParametersRWTest, this, ComparisonInputs1), std::vector<QString>(), true);
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1144,7 +1144,7 @@ class FilterParametersRWTest
     {
       LinkedBooleanFilterParameter::Pointer fp =
           LinkedBooleanFilterParameter::Create("Test", "Bool1", getBool1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Bool2),
-                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1), QStringList());
+                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Bool1), std::vector<QString>());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1158,7 +1158,7 @@ class FilterParametersRWTest
     {
       LinkedChoicesFilterParameter::Pointer fp =
           LinkedChoicesFilterParameter::Create("Test", "Int1", getInt1(), FilterParameter::Category::Parameter, SIMPL_BIND_SETTER(FilterParametersRWTest, this, Int2),
-                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), QVector<QString>(), QStringList());
+                                               SIMPL_BIND_GETTER(FilterParametersRWTest, this, Int1), std::vector<QString>(), std::vector<QString>());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1181,14 +1181,14 @@ class FilterParametersRWTest
 
       DREAM3D_REQUIRE_EQUAL(m_DataArrayPaths1.size(), m_DataArrayPaths2.size())
 
-      for(int i = 0; i < m_DataArrayPaths1.size(); i++)
+      for(size_t i = 0; i < m_DataArrayPaths1.size(); i++)
       {
         DREAM3D_REQUIRE_EQUAL(m_DataArrayPaths1[i].getDataContainerName(), m_DataArrayPaths2[i].getDataContainerName())
         DREAM3D_REQUIRE_EQUAL(m_DataArrayPaths1[i].getAttributeMatrixName(), m_DataArrayPaths2[i].getAttributeMatrixName())
         DREAM3D_REQUIRE_EQUAL(m_DataArrayPaths1[i].getDataArrayName(), m_DataArrayPaths2[i].getDataArrayName())
       }
 
-      m_DataArrayPaths2 = QVector<DataArrayPath>();
+      m_DataArrayPaths2 = std::vector<DataArrayPath>();
     }
 
     {
@@ -1220,7 +1220,7 @@ class FilterParametersRWTest
     {
       PhaseTypeSelectionFilterParameter::Pointer fp = PhaseTypeSelectionFilterParameter::Create("Test", "PhaseTypeVector_2", DataArrayPath(), FilterParameter::Category::Parameter,
                                                                                                 SIMPL_BIND_SETTER(FilterParametersRWTest, this, PhaseTypeVector_2),
-                                                                                                SIMPL_BIND_GETTER(FilterParametersRWTest, this, PhaseTypeVector_1), "", "", "", QStringList());
+                                                                                                SIMPL_BIND_GETTER(FilterParametersRWTest, this, PhaseTypeVector_1), "", "", "", std::vector<QString>());
 
       QJsonObject obj;
       fp->writeJson(obj);
@@ -1444,8 +1444,8 @@ This Filter Parameter is NOT tesed since nothing is read or written for the filt
   Float3rdOrderPoly_t m_Float3rdOrderPoly_2 = {};
   Float4thOrderPolynomial m_Float4thOrderPoly_1 = {};
   Float4thOrderPolynomial m_Float4thOrderPoly_2 = {};
-  QVector<DataArrayPath> m_DataArrayPaths1 = {};
-  QVector<DataArrayPath> m_DataArrayPaths2 = {};
+  std::vector<DataArrayPath> m_DataArrayPaths1 = {};
+  std::vector<DataArrayPath> m_DataArrayPaths2 = {};
   ShapeType::Types m_ShapeTypeVector_1 = {};
   ShapeType::Types m_ShapeTypeVector_2 = {};
   PhaseType::Types m_PhaseTypeVector_1 = {};
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index e0112cadb4..66b79eba70 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -375,9 +375,9 @@ QString IGeometry::LengthUnitToString(IGeometry::LengthUnit t)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-QVector<QString> IGeometry::GetAllLengthUnitStrings()
+std::vector<QString> IGeometry::GetAllLengthUnitStrings()
 {
-  QVector<QString> lengthUnits;
+  std::vector<QString> lengthUnits;
 
   lengthUnits.push_back(SIMPL::Geometry::k_Yoctometer);  // ("Yoctometer");
   lengthUnits.push_back(SIMPL::Geometry::k_Zeptometer);  // ("Zeptometer");
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 503a2b773c..6948e5d8e7 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -231,7 +231,7 @@ class SIMPLib_EXPORT IGeometry : public Observable
    * @brief GetAllLengthUnitStrings Returns all the Length Units as a vector of strings. This would be suitable to display as a list to a user.
    * @return
    */
-  static QVector<QString> GetAllLengthUnitStrings();
+  static std::vector<QString> GetAllLengthUnitStrings();
 
   /**
    * @brief Setter property for TimeValue
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index 249dcf1822..e36380d1c3 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -99,6 +99,8 @@
 #include "SIMPLib/Common/QtBackwardCompatibilityMacro.h"
 
 #include <QtCore/QMetaType>
+#include <QtCore/QString>
+#include <vector>
 Q_DECLARE_METATYPE(uint8_t)
 Q_DECLARE_METATYPE(int8_t)
 Q_DECLARE_METATYPE(uint16_t)
@@ -107,7 +109,8 @@ Q_DECLARE_METATYPE(uint32_t)
 Q_DECLARE_METATYPE(int32_t)
 Q_DECLARE_METATYPE(uint64_t)
 Q_DECLARE_METATYPE(int64_t)
-
+using QStringVec = std::vector<QString>;
+Q_DECLARE_METATYPE(QStringVec)
 #endif
 
 #cmakedefine SIMPL_USE_GHC_FILESYSTEM
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 1506e8725e..4e2586e7d5 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -142,7 +142,7 @@ void GenericExample::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_FILELISTINFO_FP("Input File List", InputFileListInfo, FilterParameter::Category::Parameter, GenericExample));
 
   {
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Beta");
     choices.push_back("Lognormal");
     choices.push_back("Power");
@@ -150,7 +150,7 @@ void GenericExample::setupFilterParameters()
   }
 
   {
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("CellData");
     choices.push_back("CellEnsemble");
     choices.push_back("FeatureIds");
@@ -166,7 +166,7 @@ void GenericExample::setupFilterParameters()
     parameter->setGetterCallback(SIMPL_BIND_GETTER(GenericExample, this, ConversionType));
 
     ////parameter->setValueType("unsigned int");
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Degrees To Radians");
     choices.push_back("Radians To Degrees");
     parameter->setChoices(choices);
@@ -201,9 +201,9 @@ void GenericExample::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_DC_CREATION_FP("Created Data Container", CreatedDataContainer, FilterParameter::Category::CreatedArray, GenericExample));
 
   {
-    QStringList linkedProps;
-    linkedProps << "Bool2"
-                << "Double2";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("Bool2");
+    linkedProps.push_back("Double2");
     parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool1", Bool1, FilterParameter::Category::Parameter, GenericExample, linkedProps));
     parameters.push_back(SIMPL_NEW_DOUBLE_FP("Double 2", Double2, FilterParameter::Category::Parameter, GenericExample));
   }
@@ -211,8 +211,8 @@ void GenericExample::setupFilterParameters()
   parameters.push_back(SIMPL_NEW_DYN_CHOICE_FP("X Coordinate Array", SelectedXCoordArrayName, FilterParameter::Category::CreatedArray, GenericExample, "DataArrayList"));
 
   {
-    QStringList linkedProps;
-    linkedProps << "AttributeMatrixPath";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("AttributeMatrixPath");
     parameters.push_back(SIMPL_NEW_LINKED_BOOL_FP("Bool2", Bool2, FilterParameter::Category::Parameter, GenericExample, linkedProps));
   }
   {
@@ -233,16 +233,16 @@ void GenericExample::setupFilterParameters()
 
     parameter->setDefaultValue(getDistanceMetric()); // Just set the first index
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Alt Choice 0");
     choices.push_back("Alt Choice 1");
     choices.push_back("Alt Choice 2");
     parameter->setChoices(choices);
-    QStringList linkedProps;
-    linkedProps << "MaxIterations"
-                << "MisorientationTolerance"
-                << "InputFile"
-                << "InputPath";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("MaxIterations");
+    linkedProps.push_back("MisorientationTolerance");
+    linkedProps.push_back("InputFile");
+    linkedProps.push_back("InputPath");
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
@@ -271,16 +271,16 @@ void GenericExample::setupFilterParameters()
 
     parameter->setDefaultValue(getAlgorithmSelection()); // Just set the first index
 
-    QVector<QString> choices;
+    std::vector<QString> choices;
     choices.push_back("Choice 0");
     choices.push_back("Choice 1");
     choices.push_back("Choice 2");
     parameter->setChoices(choices);
-    QStringList linkedProps;
-    linkedProps << "CreatedDataArray"
-                << "Origin"
-                << "CrystalSymmetryRotations"
-                << "DataContainerName";
+    std::vector<QString> linkedProps;
+    linkedProps.push_back("CreatedDataArray");
+    linkedProps.push_back("Origin");
+    linkedProps.push_back("CrystalSymmetryRotations");
+    linkedProps.push_back("DataContainerName");
     parameter->setLinkedProperties(linkedProps);
     parameter->setEditable(false);
     parameter->setCategory(FilterParameter::Category::Parameter);
@@ -318,30 +318,6 @@ void GenericExample::setupFilterParameters()
   setFilterParameters(parameters);
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void GenericExample::readFilterParameters(AbstractFilterParametersReader* reader, int index)
-{
-
-  reader->openFilterGroup(this, index);
-  setFeatureIdsArrayPath(reader->readDataArrayPath("FeatureIdsArrayPath", getFeatureIdsArrayPath()));
-  setSelectedMultiArrayPaths(reader->readDataArrayPathVector("SelectedMultiArrayPaths", getSelectedMultiArrayPaths()));
-  setStlFilePrefix(reader->readString("StlFilePrefix", getStlFilePrefix()));
-  setMaxIterations(reader->readValue("MaxIterations", getMaxIterations()));
-  setMisorientationTolerance(reader->readValue("MisorientationTolerance", getMisorientationTolerance()));
-  setInputFile(reader->readString("InputFile", getInputFile()));
-  setInputPath(reader->readString("InputPath", getInputPath()));
-  setOutputFile(reader->readString("OutputFile", getOutputFile()));
-  setOutputPath(reader->readString("OutputPath", getOutputPath()));
-  setWriteAlignmentShifts(reader->readValue("WriteAlignmentShifts", getWriteAlignmentShifts()));
-  setConversionType(reader->readValue("ConversionType", getConversionType()));
-  setDimensions(reader->readIntVec3("Dimensions", getDimensions()));
-  setOrigin(reader->readFloatVec3("Origin", getOrigin()));
-
-  reader->closeFilterGroup();
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -747,13 +723,13 @@ QString GenericExample::getOutputPath() const
 }
 
 // -----------------------------------------------------------------------------
-void GenericExample::setSelectedMultiArrayPaths(const QVector<DataArrayPath>& value)
+void GenericExample::setSelectedMultiArrayPaths(const std::vector<DataArrayPath>& value)
 {
   m_SelectedMultiArrayPaths = value;
 }
 
 // -----------------------------------------------------------------------------
-QVector<DataArrayPath> GenericExample::getSelectedMultiArrayPaths() const
+std::vector<DataArrayPath> GenericExample::getSelectedMultiArrayPaths() const
 {
   return m_SelectedMultiArrayPaths;
 }
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index 9a1f204cfc..fd2423a07e 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -92,7 +92,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   PYB11_PROPERTY(QString InputPath READ getInputPath WRITE setInputPath)
   PYB11_PROPERTY(QString OutputFile READ getOutputFile WRITE setOutputFile)
   PYB11_PROPERTY(QString OutputPath READ getOutputPath WRITE setOutputPath)
-  PYB11_PROPERTY(QVector<DataArrayPath> SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
+  PYB11_PROPERTY(std::vector<DataArrayPath> SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
   PYB11_PROPERTY(bool WriteAlignmentShifts READ getWriteAlignmentShifts WRITE setWriteAlignmentShifts)
   PYB11_PROPERTY(int ConversionType READ getConversionType WRITE setConversionType)
   PYB11_PROPERTY(IntVec3Type Dimensions READ getDimensions WRITE setDimensions)
@@ -402,14 +402,14 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   /**
    * @brief Setter property for SelectedMultiArrayPaths
    */
-  void setSelectedMultiArrayPaths(const QVector<DataArrayPath>& value);
+  void setSelectedMultiArrayPaths(const std::vector<DataArrayPath>& value);
   /**
    * @brief Getter property for SelectedMultiArrayPaths
    * @return Value of SelectedMultiArrayPaths
    */
-  QVector<DataArrayPath> getSelectedMultiArrayPaths() const;
+  std::vector<DataArrayPath> getSelectedMultiArrayPaths() const;
 
-  Q_PROPERTY(QVector<DataArrayPath> SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
+  Q_PROPERTY(DataArrayPathVec SelectedMultiArrayPaths READ getSelectedMultiArrayPaths WRITE setSelectedMultiArrayPaths)
 
   /**
    * @brief Setter property for WriteAlignmentShifts
@@ -679,12 +679,6 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
    */
   void setupFilterParameters() override;
 
-  /**
-   * @brief This method will read the options from a file
-   * @param reader The reader that is used to read the options from a file
-   */
-  void readFilterParameters(AbstractFilterParametersReader* reader, int index) override;
-
   /**
    * @brief readFilterParametersFromJson Reads the filter parameters from a file
    * @param reader Reader that is used to read the parameters from a file
@@ -743,7 +737,7 @@ class SIMPLib_EXPORT GenericExample : public AbstractFilter
   QString m_InputPath = {};
   QString m_OutputFile = {};
   QString m_OutputPath = {};
-  QVector<DataArrayPath> m_SelectedMultiArrayPaths = {};
+  std::vector<DataArrayPath> m_SelectedMultiArrayPaths = {};
   bool m_WriteAlignmentShifts = {};
   int m_ConversionType = {};
   IntVec3Type m_Dimensions = {};
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index c5359195b8..a80f9105c2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -85,7 +85,12 @@ void ChoiceWidget::setupGui()
     ChoiceFilterParameter* choice = dynamic_cast<ChoiceFilterParameter*>(getFilterParameter());
     if(choice != nullptr)
     {
-      QList<QString> choices = choice->getChoices().toList();
+      std::vector<QString> choiceVec = choice->getChoices();
+      QList<QString> choices;
+      for(const QString& value : choiceVec)
+      {
+        choices.push_back(value);
+      }
       value->blockSignals(true);
       value->addItems(choices);
       value->blockSignals(false);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 4eabb0a1ea..c95275c4a0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -117,6 +117,7 @@ void MultiAttributeMatrixSelectionWidget::setupGui()
   label->setText(getFilterParameter()->getHumanLabel());
 
   DataContainerSelectionFilterParameter::RequirementType reqs;
+  reqs.dcGeometryTypes = m_FilterParameter->getDefaultGeometryTypes();
   m_SelectedDataContainerPath->setDataContainerRequirements(reqs);
   m_SelectedDataContainerPath->setFilter(getFilter());
 
@@ -149,11 +150,11 @@ void MultiAttributeMatrixSelectionWidget::setupGui()
   connect(m_SelectedDataContainerPath, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
   connect(this, SIGNAL(unlockDataArrayPathSelection(QToolButton*)), m_SelectedDataContainerPath, SLOT(selectionWidgetUnlocked(QToolButton*)));
 
-  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
+  std::vector<DataArrayPath> selectedPaths = m_FilterParameter->getGetterCallback()();
   DataArrayPath amPath = DataArrayPath::GetAttributeMatrixPath(selectedPaths);
   m_SelectedDataContainerPath->setText(amPath.getDataContainerName());
   m_SelectedDataContainerPath->setPropertyName(getFilterParameter()->getHumanLabel());
-  for(int i = 0; i < selectedPaths.size(); i++)
+  for(size_t i = 0; i < selectedPaths.size(); i++)
   {
     DataArrayPath selectedPath = selectedPaths[i];
     attributeMatricesOrderWidget->addItem(selectedPath.getAttributeMatrixName());
@@ -550,7 +551,7 @@ void MultiAttributeMatrixSelectionWidget::filterNeedsInputParameters(AbstractFil
 {
   DataArrayPath amPath = DataArrayPath::Deserialize(m_SelectedDataContainerPath->text(), Detail::Delimiter);
 
-  QVector<DataArrayPath> selectedPaths;
+  std::vector<DataArrayPath> selectedPaths;
   for(int i = 0; i < attributeMatricesOrderWidget->count(); i++)
   {
     DataArrayPath path = amPath;
@@ -581,7 +582,7 @@ void MultiAttributeMatrixSelectionWidget::updateDataArrayPath(QString propertyNa
 
   if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVector<DataArrayPath> updatedPaths = m_FilterParameter->getGetterCallback()();
+    std::vector<DataArrayPath> updatedPaths = m_FilterParameter->getGetterCallback()();
     DataArrayPath& dap = updatedPaths[0];
     QString dataArrayName = dap.getDataArrayName();
     dap.setDataArrayName("");
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 70c297b882..b0bf359423 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -113,6 +113,8 @@ void MultiDataArraySelectionWidget::setupGui()
   label->setText(getFilterParameter()->getHumanLabel());
 
   AttributeMatrixSelectionFilterParameter::RequirementType reqs;
+  reqs.amTypes = m_FilterParameter->getDefaultAttributeMatrixTypes();
+  reqs.dcGeometryTypes = m_FilterParameter->getDefaultGeometryTypes();
   m_SelectedAttributeMatrixPath->setAttrMatrixRequirements(reqs);
   m_SelectedAttributeMatrixPath->setFilter(getFilter());
 
@@ -145,11 +147,11 @@ void MultiDataArraySelectionWidget::setupGui()
   connect(m_SelectedAttributeMatrixPath, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)), this, SIGNAL(dataArrayPathSelectionUnlocked(QToolButton*)));
   connect(this, SIGNAL(unlockDataArrayPathSelection(QToolButton*)), m_SelectedAttributeMatrixPath, SLOT(selectionWidgetUnlocked(QToolButton*)));
 
-  QVector<DataArrayPath> selectedPaths = getFilter()->property(PROPERTY_NAME_AS_CHAR).value<QVector<DataArrayPath>>();
+  std::vector<DataArrayPath> selectedPaths = m_FilterParameter->getGetterCallback()();
   DataArrayPath amPath = DataArrayPath::GetAttributeMatrixPath(selectedPaths);
   m_SelectedAttributeMatrixPath->setText(amPath.serialize(Detail::Delimiter));
   m_SelectedAttributeMatrixPath->setPropertyName(getFilterParameter()->getHumanLabel());
-  for(int i = 0; i < selectedPaths.size(); i++)
+  for(size_t i = 0; i < selectedPaths.size(); i++)
   {
     DataArrayPath selectedPath = selectedPaths[i];
     QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), selectedPath.getDataArrayName());
@@ -538,7 +540,7 @@ void MultiDataArraySelectionWidget::filterNeedsInputParameters(AbstractFilter* f
 {
   DataArrayPath amPath = m_SelectedAttributeMatrixPath->getDataArrayPath();
 
-  QVector<DataArrayPath> selectedPaths;
+  std::vector<DataArrayPath> selectedPaths;
   for(int i = 0; i < selectedArraysListWidget->count(); i++)
   {
     DataArrayPath path = amPath;
@@ -569,11 +571,6 @@ void MultiDataArraySelectionWidget::updateDataArrayPath(QString propertyName, co
 
   if(propertyName == getFilterParameter()->getPropertyName())
   {
-    QVariant var = getFilter()->property(PROPERTY_NAME_AS_CHAR);
-    DataArrayPath updatedPath = var.value<DataArrayPath>();
-    QString dataArrayName = updatedPath.getDataArrayName();
-    updatedPath.setDataArrayName("");
-
     blockSignals(true);
     DataArrayPath currentPath = DataArrayPath::Deserialize(m_SelectedAttributeMatrixPath->text(), Detail::Delimiter);
     if(currentPath.hasSameDataContainer(oldPath))
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 5616849bbb..3b74935c57 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -125,8 +125,8 @@ void MultiDataContainerSelectionWidget::setupGui()
   // If the DataArrayPath is updated in the filter, update the widget
   connect(getFilter(), SIGNAL(dataArrayPathUpdated(QString, DataArrayPath::RenameType)), this, SLOT(updateDataArrayPath(QString, DataArrayPath::RenameType)));
 
-  QStringList dcNames = m_FilterParameter->getGetterCallback()();
-  for(int i = 0; i < dcNames.size(); i++)
+  std::vector<QString> dcNames = m_FilterParameter->getGetterCallback()();
+  for(size_t i = 0; i < dcNames.size(); i++)
   {
     QString dcName = dcNames[i];
     QListWidgetItem* item = new QListWidgetItem(QIcon(":/SIMPL/icons/images/bullet_ball_green.png"), dcName);
@@ -460,7 +460,7 @@ void MultiDataContainerSelectionWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void MultiDataContainerSelectionWidget::filterNeedsInputParameters(AbstractFilter* filter)
 {
-  QStringList dcNames;
+  std::vector<QString> dcNames;
   for(int i = 0; i < selectedDataContainersListWidget->count(); i++)
   {
     dcNames.push_back(selectedDataContainersListWidget->item(i)->text());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index e059b50dcd..5eb65dcffd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -270,7 +270,7 @@ void PhaseTypeSelectionWidget::updatePhaseComboBoxes()
 
   phaseListWidget->clear();
   // Get our list of Phase Type Strings
-  QStringList phaseListChoices = m_FilterParameter->getPhaseListChoices();
+  std::vector<QString> phaseListChoices = m_FilterParameter->getPhaseListChoices();
 
   for(int i = 1; i < phaseCount; i++)
   {
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index ec5f7f2d89..ea4191e908 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -510,13 +510,12 @@ void FilterInputWidget::linkConditionalWidgets(FilterParameterVectorType& filter
 
     if(nullptr != filterParameterPtr)
     {
-      QStringList linkedProps = filterParameterPtr->getConditionalProperties();
+      std::vector<QString> linkedProps = filterParameterPtr->getConditionalProperties();
 
-      QStringListIterator iter = QStringListIterator(linkedProps);
       QWidget* checkboxSource = m_PropertyToWidget[filterParameterPtr->getPropertyName()];
-      while(iter.hasNext())
+
+      for(const QString& propName : linkedProps)
       {
-        QString propName = iter.next();
         QWidget* w = nullptr;
         if(m_PropertyToWidget.contains(propName))
         {
@@ -529,6 +528,7 @@ void FilterInputWidget::linkConditionalWidgets(FilterParameterVectorType& filter
           }
         }
       }
+
       LinkedBooleanWidget* boolWidget = qobject_cast<LinkedBooleanWidget*>(checkboxSource);
       if(nullptr != boolWidget)
       {
@@ -541,14 +541,13 @@ void FilterInputWidget::linkConditionalWidgets(FilterParameterVectorType& filter
 
     if(nullptr != optionPtr2.get())
     {
-      QStringList linkedProps = optionPtr2->getLinkedProperties();
+      std::vector<QString> linkedProps = optionPtr2->getLinkedProperties();
 
-      QStringListIterator iter = QStringListIterator(linkedProps);
       QWidget* checkboxSource = m_PropertyToWidget[optionPtr2->getPropertyName()];
-      while(iter.hasNext())
+
+      for(const QString& propName : linkedProps)
       {
         QWidget* w = nullptr;
-        QString propName = iter.next();
         if(m_PropertyToWidget.contains(propName))
         {
           w = m_PropertyToWidget[propName];
@@ -572,14 +571,13 @@ void FilterInputWidget::linkConditionalWidgets(FilterParameterVectorType& filter
 
     if(nullptr != optionPtr3)
     {
-      QStringList linkedProps = optionPtr3->getLinkedProperties();
+      std::vector<QString> linkedProps = optionPtr3->getLinkedProperties();
 
-      QStringListIterator iter = QStringListIterator(linkedProps);
       QWidget* checkboxSource = m_PropertyToWidget[optionPtr3->getPropertyName()];
-      while(iter.hasNext())
+
+      for(const QString& propName : linkedProps)
       {
         QWidget* w = nullptr;
-        QString propName = iter.next();
         if(m_PropertyToWidget.contains(propName))
         {
           w = m_PropertyToWidget[propName];

From 373d46bafbf90d91632061a80e45f62090da94b9 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 5 Mar 2021 12:59:51 -0500
Subject: [PATCH 352/397] Require 1 argument to the MakeFilterUUID program to
 ensure that duplicates are not created

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/MakeFilterUuid/MakeFilterUuid.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Source/MakeFilterUuid/MakeFilterUuid.cpp b/Source/MakeFilterUuid/MakeFilterUuid.cpp
index 7800c041b8..1671acf832 100644
--- a/Source/MakeFilterUuid/MakeFilterUuid.cpp
+++ b/Source/MakeFilterUuid/MakeFilterUuid.cpp
@@ -1,5 +1,7 @@
 
 
+#include <iostream>
+
 #include <QtCore/QDebug>
 #include <QtCore/QString>
 #include <QtCore/QTextStream>
@@ -13,7 +15,11 @@
  */
 int main(int argc, char* argv[])
 {
-
+  if(argc == 1)
+  {
+    std::cout << "Please supply the name of the filter class or some randome string of characters" << std::endl;
+    return 1;
+  }
   QString libName = QString::fromLatin1(argv[1]);
   QString className = QString::fromLatin1(argv[2]);
 

From 2cd0b573c036349796baa5231a554da6ab6e1da5 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 13:25:05 -0500
Subject: [PATCH 353/397] Changed argument count check to be more precise for
 MakeFilterUuid

* Requires 2 positional arguments

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/MakeFilterUuid/MakeFilterUuid.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Source/MakeFilterUuid/MakeFilterUuid.cpp b/Source/MakeFilterUuid/MakeFilterUuid.cpp
index 1671acf832..3b4e2e071c 100644
--- a/Source/MakeFilterUuid/MakeFilterUuid.cpp
+++ b/Source/MakeFilterUuid/MakeFilterUuid.cpp
@@ -1,5 +1,3 @@
-
-
 #include <iostream>
 
 #include <QtCore/QDebug>
@@ -15,9 +13,9 @@
  */
 int main(int argc, char* argv[])
 {
-  if(argc == 1)
+  if(argc < 3)
   {
-    std::cout << "Please supply the name of the filter class or some randome string of characters" << std::endl;
+    std::cout << "Please supply 2 arguments like the name of the filter class or some randome string of characters\n";
     return 1;
   }
   QString libName = QString::fromLatin1(argv[1]);

From a31997b4158f91aabc0c18b66e93f575cbc859d6 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 13:17:30 -0500
Subject: [PATCH 354/397] Changed IFilterFactory functions to be pure virtual

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Filtering/IFilterFactory.hpp | 66 ++++++---------------
 1 file changed, 17 insertions(+), 49 deletions(-)

diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index 761868d7d5..39aa174f22 100644
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -52,115 +52,83 @@ class IFilterFactory
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer()
   {
-    return Pointer(static_cast<Self*>(nullptr));
+    return nullptr;
   }
+
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
   virtual QString getNameOfClass() const
   {
-    return QString("IFilterFactory");
+    return ClassName();
   }
+
   /**
    * @brief Returns the name of the class for AbstractMessage
    */
   static QString ClassName()
   {
-    return QString("IFilterFactory");
+    return "IFilterFactory";
   }
 
   virtual ~IFilterFactory() = default;
 
-  /** @brief This function should NEVER get called. The subclass should ALWAYS implement
+  /**
+   * @brief This function should NEVER get called. The subclass should ALWAYS implement
    * this method so we are going to crash the program.
    */
-  virtual AbstractFilter::Pointer create() const
-  {
-    Q_ASSERT(false);
-    return AbstractFilter::NullPointer();
-  }
+  virtual AbstractFilter::Pointer create() const = 0;
 
   /**
    * @brief getFilterClassName
    * @return
    */
-  virtual QString getFilterClassName() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getFilterClassName() const = 0;
 
   /**
    * @brief getFilterGroup
    * @return
    */
-  virtual QString getFilterGroup() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getFilterGroup() const = 0;
 
   /**
    * @brief getFilterSubGroup
    * @return
    */
-  virtual QString getFilterSubGroup() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getFilterSubGroup() const = 0;
 
   /**
    * @brief getFilterHumanLabel
    * @return
    */
-  virtual QString getFilterHumanLabel() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getFilterHumanLabel() const = 0;
 
   /**
    * @brief getBrandingString
    * @return
    */
-  virtual QString getBrandingString() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getBrandingString() const = 0;
 
   /**
    * @brief getCompiledLibraryName
    * @return
    */
-  virtual QString getCompiledLibraryName() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getCompiledLibraryName() const = 0;
 
   /**
    * @brief getFilterHtmlSummary
    * @return
    */
-  virtual QString getFilterHtmlSummary() const
-  {
-    Q_ASSERT(false);
-    return "";
-  }
+  virtual QString getFilterHtmlSummary() const = 0;
 
   /**
    * @brief getUuid
    * @return
    */
-  virtual QUuid getUuid() const
-  {
-    Q_ASSERT(false);
-    return QUuid();
-  }
+  virtual QUuid getUuid() const = 0;
 
 protected:
   IFilterFactory() = default;

From ea4bc6b078a344d40b766e12ee82395732f3b77d Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 13:16:53 -0500
Subject: [PATCH 355/397] Added checks for adding duplicate filters in
 FilterManager

* Also guards against empty UUIDs and empty names

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Filtering/FilterManager.cpp | 32 +++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 21408754c9..e8fe2a718b 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -35,6 +35,8 @@
 
 #include "FilterManager.h"
 
+#include <stdexcept>
+
 #include <QtCore/QDebug>
 #include <QtCore/QJsonObject>
 #include <QtCore/QSet>
@@ -155,8 +157,36 @@ FilterManager::Collection FilterManager::getFactories(const QString& groupName,
 void FilterManager::addFilterFactory(const QString& name, IFilterFactory::Pointer factory)
 {
   // std::cout << this << " - Registering Filter: " << name.toStdString() << std::endl;
+  QUuid uuid = factory->getUuid();
+
+  if(uuid.isNull())
+  {
+    throw std::runtime_error(QString("%1 (%2) has an invalid uuid").arg(name, factory->getCompiledLibraryName()).toStdString());
+  }
+
+  if(name.isEmpty())
+  {
+    throw std::runtime_error("Attempted to add a filter with an empty name");
+  }
+
+  if(m_UuidFactories.contains(uuid))
+  {
+    IFilterFactory::Pointer existingFactory = m_UuidFactories[uuid];
+    throw std::runtime_error(QString("Attempted to add %1 (%2), but %3 (%4) has the same uuid")
+                                 .arg(name, factory->getCompiledLibraryName(), existingFactory->getFilterClassName(), existingFactory->getCompiledLibraryName())
+                                 .toStdString());
+  }
+
+  if(m_Factories.contains(name))
+  {
+    IFilterFactory::Pointer existingFactory = m_Factories[name];
+    throw std::runtime_error(QString("Attempted to add %1 (%2), but %3 (%4) has the same name")
+                                 .arg(name, factory->getCompiledLibraryName(), existingFactory->getFilterClassName(), existingFactory->getCompiledLibraryName())
+                                 .toStdString());
+  }
+
   m_Factories[name] = factory;
-  m_UuidFactories[factory->getUuid()] = factory;
+  m_UuidFactories[uuid] = factory;
 }
 
 // -----------------------------------------------------------------------------

From f7927ca80806f656c4a331f10704d93d22450c80 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 10:23:45 -0500
Subject: [PATCH 356/397] Fixed crash in preflight in InitializeData

* dataCheck didn't check whether a DataArray exists before
accessing it

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/InitializeData.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index d5273d0e2b..823fd428ba 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -145,7 +145,11 @@ void InitializeData::dataCheck()
   }
 
   DataArrayPath attributeMatrixPath(m_CellAttributeMatrixPaths[0].getDataContainerName(), m_CellAttributeMatrixPaths[0].getAttributeMatrixName(), "");
-  getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, attributeMatrixPath, -301);
+  AttributeMatrix::Pointer am = getDataContainerArray()->getPrereqAttributeMatrixFromPath(this, attributeMatrixPath, -301);
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
 
   ImageGeom::Pointer image = getDataContainerArray()->getPrereqGeometryFromDataContainer<ImageGeom>(this, attributeMatrixPath.getDataContainerName());
   if(nullptr == image.get())
@@ -199,16 +203,16 @@ void InitializeData::dataCheck()
     setErrorCondition(-5559, ss);
   }
 
-  DataContainer::Pointer m = getDataContainerArray()->getDataContainer(attributeMatrixPath.getDataContainerName());
-
-  // SizeVec3Type udims = m->getGeometryAs<ImageGeom>()->getDimensions();
-
-  QString attrMatName = attributeMatrixPath.getAttributeMatrixName();
   std::vector<QString> voxelArrayNames = DataArrayPath::GetDataArrayNames(m_CellAttributeMatrixPaths);
 
   for(const QString& name : voxelArrayNames)
   {
-    IDataArray::Pointer p = m->getAttributeMatrix(attrMatName)->getAttributeArray(name);
+    IDataArray::Pointer p = am->getAttributeArray(name);
+    if(p == nullptr)
+    {
+      setErrorCondition(-5560, QString("DataArray \"%1\" doesn't exist").arg(name));
+      return;
+    }
 
     QString type = p->getTypeAsString();
     if(type == "int8_t")

From edadad4cee97b70f80488b31e15577ccf0ef15a4 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 15:25:51 -0500
Subject: [PATCH 357/397] Prevent attempting to register EmptyFilter multiple
 times

* Added contains function to FilterManager

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameters/JsonFilterParametersReader.cpp        | 5 ++++-
 Source/SIMPLib/Filtering/FilterManager.cpp                 | 6 ++++++
 Source/SIMPLib/Filtering/FilterManager.h                   | 7 +++++++
 Source/SIMPLib/Filtering/FilterPipeline.cpp                | 5 ++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index c23651d7ef..94f5d96bad 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -395,7 +395,10 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipeline(IObserver* obs)
 {
   FilterManager* filtManager = FilterManager::Instance();
   FilterFactory<EmptyFilter>::Pointer emptyFilterFactory = FilterFactory<EmptyFilter>::New();
-  filtManager->addFilterFactory("EmptyFilter", emptyFilterFactory);
+  if(!filtManager->contains(emptyFilterFactory->getUuid()))
+  {
+    filtManager->addFilterFactory("EmptyFilter", emptyFilterFactory);
+  }
 
   if(!containsGroup(SIMPL::Settings::PipelineBuilderGroup))
   {
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index e8fe2a718b..376ea5c506 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -151,6 +151,12 @@ FilterManager::Collection FilterManager::getFactories(const QString& groupName,
   return groupFactories;
 }
 
+// -----------------------------------------------------------------------------
+bool FilterManager::contains(const QUuid& uuid) const
+{
+  return m_UuidFactories.contains(uuid);
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
index fc89bb67d3..595c0ef6db 100644
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -115,6 +115,13 @@ class SIMPLib_EXPORT FilterManager
    */
   Collection getFactories(const QString& groupName, const QString& subGroupName);
 
+  /**
+   * @brief Returns true if it contains a filter factory with the given UUID
+   * @param uuid
+   * @return
+   */
+  bool contains(const QUuid& uuid) const;
+
   /**
    * @brief Adds a Factory that creates QFilters
    * @param name
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 4a422d29c7..087e7fe2db 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -243,7 +243,10 @@ void FilterPipeline::fromJson(const QJsonObject& json, IObserver* obs)
   // Store FilterManager
   FilterManager* filtManager = FilterManager::Instance();
   FilterFactory<EmptyFilter>::Pointer emptyFilterFactory = FilterFactory<EmptyFilter>::New();
-  filtManager->addFilterFactory("EmptyFilter", emptyFilterFactory);
+  if(!filtManager->contains(emptyFilterFactory->getUuid()))
+  {
+    filtManager->addFilterFactory("EmptyFilter", emptyFilterFactory);
+  }
 
   QJsonObject builderObj = json[SIMPL::Settings::PipelineBuilderGroup].toObject();
   int filterCount = builderObj[SIMPL::Settings::NumFilters].toInt();

From c78c6077d561638a717242835b5b8898918b8126 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 5 Mar 2021 16:29:35 -0500
Subject: [PATCH 358/397] MakeFilterUUID: 3 Args required. Update help string.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/MakeFilterUuid/MakeFilterUuid.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/MakeFilterUuid/MakeFilterUuid.cpp b/Source/MakeFilterUuid/MakeFilterUuid.cpp
index 3b4e2e071c..0709831b24 100644
--- a/Source/MakeFilterUuid/MakeFilterUuid.cpp
+++ b/Source/MakeFilterUuid/MakeFilterUuid.cpp
@@ -13,9 +13,9 @@
  */
 int main(int argc, char* argv[])
 {
-  if(argc < 3)
+  if(argc != 3)
   {
-    std::cout << "Please supply 2 arguments like the name of the filter class or some randome string of characters\n";
+    std::cout << "Please supply 2 arguments\n  LibraryName\n  ClassName\n";
     return 1;
   }
   QString libName = QString::fromLatin1(argv[1]);

From 46f3747b23e53cc3e25c341ccc5ea519cc326769 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Sun, 7 Mar 2021 23:52:35 -0500
Subject: [PATCH 359/397] Fixed text/number conversion bugs in filter widgets

* IntWidget, DoubleWidget, and UInt64Widget did not consistently
use the system locale leading to differences in number conversion
* The system locale allows group separators by default which are
not allowed in the C locale for string to number conversion
* Changed all three widgets to use the system locale for all
conversions with it modified to reject/omit group separators
* Fixed bug in UInt64Widget where the default value was narrowed
to int instead of directly cast from QVariant to uint64

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameterWidgets/DoubleWidget.cpp        |  6 +++---
 .../FilterParameterWidgets/IntWidget.cpp           |  4 +++-
 .../FilterParameterWidgets/UInt64Widget.cpp        | 14 +++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index e38659db22..6e8f5681e1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -77,10 +77,11 @@ void DoubleWidget::setupGui()
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
   QLocale loc = QLocale::system();
+  loc.setNumberOptions(QLocale::NumberOption::RejectGroupSeparator | QLocale::NumberOption::OmitGroupSeparator);
 
   QDoubleValidator* xVal = new QDoubleValidator(value);
-  value->setValidator(xVal);
   xVal->setLocale(loc);
+  value->setValidator(xVal);
 
   if(getFilterParameter() != nullptr)
   {
@@ -106,11 +107,10 @@ void DoubleWidget::filterNeedsInputParameters(AbstractFilter* filter)
   bool ok = true;
   double defValue = getFilterParameter()->getDefaultValue().toDouble();
   double i = defValue;
-  QLocale loc;
   // Next make sure there is something in the
   if(!value->text().isEmpty())
   {
-    i = loc.toDouble(value->text(), &ok);
+    i = value->locale().toDouble(value->text(), &ok);
     // i = value->text().toDouble(&ok);
     //  make sure we can convert the entered value to a 32 bit signed int
     if(!ok)
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index f2160a187e..7b0b221940 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -77,8 +77,10 @@ void IntWidget::setupGui()
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
   QLocale loc = QLocale::system();
+  loc.setNumberOptions(QLocale::NumberOption::RejectGroupSeparator | QLocale::NumberOption::OmitGroupSeparator);
 
   QIntValidator* xVal = new QIntValidator(value);
+  xVal->setLocale(loc);
   value->setValidator(xVal);
 
   if(getFilterParameter() != nullptr)
@@ -109,7 +111,7 @@ void IntWidget::filterNeedsInputParameters(AbstractFilter* filter)
   // Next make sure there is something in the
   if(!value->text().isEmpty())
   {
-    i = value->text().toInt(&ok);
+    i = value->locale().toInt(value->text(), &ok);
     //  make sure we can convert the entered value to a 32 bit signed int
     if(!ok)
     {
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 302cfd1eff..1a1fb9728f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -73,14 +73,18 @@ void UInt64Widget::setupGui()
 
   connect(value, SIGNAL(textChanged(const QString&)), this, SLOT(widgetChanged(const QString&)));
 
+  QLocale loc = QLocale::system();
+  loc.setNumberOptions(QLocale::NumberOption::RejectGroupSeparator | QLocale::NumberOption::OmitGroupSeparator);
+
   QIntValidator* xVal = new QIntValidator(value);
+  xVal->setLocale(loc);
   value->setValidator(xVal);
 
   if(getFilterParameter() != nullptr)
   {
     label->setText(getFilterParameter()->getHumanLabel());
     uint64_t ui64 = m_FilterParameter->getGetterCallback()();
-    QString str = QString::number(ui64);
+    QString str = loc.toString(ui64);
     value->setText(str);
   }
 }
@@ -101,13 +105,13 @@ void UInt64Widget::filterNeedsInputParameters(AbstractFilter* filter)
   Q_UNUSED(filter)
 
   bool ok = true;
-  int defValue = getFilterParameter()->getDefaultValue().toInt();
-  uint64_t i = static_cast<uint64_t>(defValue);
+  uint64_t defValue = getFilterParameter()->getDefaultValue().toULongLong();
+  uint64_t i = defValue;
 
   // Next make sure there is something in the
   if(!value->text().isEmpty())
   {
-    i = value->text().toULongLong(&ok);
+    i = value->locale().toULongLong(value->text(), &ok);
     //  make sure we can convert the entered value to a 32 bit signed int
     if(!ok)
     {
@@ -115,7 +119,7 @@ void UInt64Widget::filterNeedsInputParameters(AbstractFilter* filter)
       SVStyle::Instance()->SetErrorColor("QLabel", errorLabel);
       errorLabel->setText("Value entered is beyond the representable range for a 64 bit integer. The filter will use the default value of " + getFilterParameter()->getDefaultValue().toString());
       errorLabel->show();
-      i = static_cast<uint64_t>(defValue);
+      i = defValue;
     }
     else
     {

From fd6e8b6a1599503e8ea9001b651e2ff6fe7998a5 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 8 Mar 2021 14:43:09 -0500
Subject: [PATCH 360/397] Fixed ambiguous overload for some platforms

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 1a1fb9728f..9658ed8fcc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -84,7 +84,7 @@ void UInt64Widget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
     uint64_t ui64 = m_FilterParameter->getGetterCallback()();
-    QString str = loc.toString(ui64);
+    QString str = loc.toString(static_cast<qulonglong>(ui64));
     value->setText(str);
   }
 }

From 57b19c58670d589969701b965a2fc57f6b6fcfe2 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 5 Mar 2021 10:16:05 -0500
Subject: [PATCH 361/397] Replaced Qt keywords

* When defined, Qt keywords can cause compile issues in 3rd-party
libraries
* signals -> Q_SIGNALS
* slots -> Q_SLOTS
* foreach -> for
* forever -> while(true)

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Experimental/FilterCallback/IFilter.cpp   |  6 +--
 Source/RESTClient/SIMPLClientRequest.cpp      |  6 +--
 Source/RESTClient/SIMPLClientRequest.h        |  2 +-
 Source/RESTClient/SIMPLRestClient.cpp         |  2 +-
 Source/RESTClient/SIMPLRestClient.h           |  2 +-
 Source/RESTClient/config.cpp                  |  4 +-
 Source/RESTClient/mrestrequest.cpp            | 24 ++++-----
 Source/RESTClient/mrestrequest.h              |  6 +--
 Source/RESTClient/mrestrequestmanager.cpp     |  6 +--
 Source/RESTClient/mrestrequestmanager.h       |  4 +-
 Source/RESTServer/main.cpp                    |  4 +-
 Source/SIMPLib/Common/DocRequestManager.cpp   |  4 +-
 Source/SIMPLib/Common/Observable.cpp          |  8 +--
 Source/SIMPLib/Common/Observable.h            |  2 +-
 Source/SIMPLib/Common/Observer.h              |  2 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |  2 +-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |  4 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h       |  4 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |  2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |  2 +-
 .../CoreFilters/FeatureCountDecision.cpp      |  4 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |  8 +--
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |  2 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |  8 +--
 .../CoreFilters/RequiredZThickness.cpp        |  2 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |  2 +-
 .../Testing/Cxx/ErrorMessageTest.cpp          |  8 +--
 .../Testing/Cxx/ExecuteProcessTest.cpp        |  2 +-
 .../Testing/Cxx/PipelinePauseTest.cpp         |  6 +--
 .../Testing/Cxx/RemoveArraysObserver.h        |  2 +-
 .../DataContainers/AttributeMatrix.cpp        |  2 +-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  |  2 +-
 .../SIMPLib/DataContainers/DataContainer.cpp  |  2 +-
 .../DataContainers/DataContainerBundle.cpp    |  2 +-
 .../DataContainers/DataContainerProxy.cpp     |  2 +-
 ...AttributeMatrixCreationFilterParameter.cpp |  2 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  2 +-
 .../CalculatorFilterParameter.cpp             |  2 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |  2 +-
 .../ComparisonSelectionFilterParameter.cpp    |  2 +-
 .../DataArrayCreationFilterParameter.cpp      |  2 +-
 .../DataArraySelectionFilterParameter.cpp     |  2 +-
 ...DataContainerArrayProxyFilterParameter.cpp |  2 +-
 .../DataContainerCreationFilterParameter.cpp  |  2 +-
 ...aContainerGridSelectionFilterParameter.cpp |  2 +-
 .../DataContainerSelectionFilterParameter.cpp |  2 +-
 .../FilterParameters/DynamicTableData.cpp     | 12 ++---
 .../FilterParameters/FilterParameter.cpp      | 10 ++--
 ...dDataContainerSelectionFilterParameter.cpp |  2 +-
 ...ntageStructureSelectionFilterParameter.cpp |  2 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |  2 +-
 ...MultiDataArraySelectionFilterParameter.cpp |  2 +-
 ...iDataContainerSelectionFilterParameter.cpp |  2 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |  2 +-
 .../ReadASCIIDataFilterParameter.cpp          |  2 +-
 .../Filtering/AbstractDecisionFilter.h        |  2 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   | 14 ++---
 Source/SIMPLib/Filtering/AbstractFilter.h     |  6 +--
 Source/SIMPLib/Filtering/FilterPipeline.cpp   | 38 ++++++-------
 Source/SIMPLib/Filtering/FilterPipeline.h     |  4 +-
 Source/SIMPLib/Montages/DataContainerGrid.cpp |  6 +--
 Source/SIMPLib/Montages/DataContainerGrid.h   |  2 +-
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp |  8 +--
 Source/SIMPLib/REST/PipelineListener.h        |  2 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |  8 +--
 .../StatsData/PrecipitateStatsData.cpp        |  2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp |  2 +-
 Source/SIMPLib/StatsData/StatsData.cpp        |  4 +-
 .../StatsData/TransformationStatsData.cpp     |  2 +-
 .../TestFilters/ArraySelectionExample.cpp     |  6 +--
 .../Utilities/SIMPLDataPathValidator.cpp      |  2 +-
 .../Utilities/SIMPLDataPathValidator.h        |  2 +-
 .../SIMPLib/Utilities/SIMPLH5DataReader.cpp   | 40 +++++++-------
 Source/SIMPLib/Utilities/SIMPLH5DataReader.h  |  2 +-
 Source/SIMPLib/Utilities/TestObserver.h       |  2 +-
 .../PipelineItemBorderSizeAnimation.h         |  2 +-
 .../Animations/PipelineItemHeightAnimation.h  |  2 +-
 .../Animations/PipelineItemSlideAnimation.h   |  2 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.h    |  2 +-
 .../Dialogs/ColorPresetsDialog.cpp            |  4 +-
 .../SVWidgetsLib/Dialogs/ColorPresetsDialog.h |  4 +-
 .../Dialogs/FavoritesChangedDialog.cpp        |  2 +-
 .../Dialogs/FavoritesChangedDialog.h          |  4 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp   |  6 +--
 Source/SVWidgetsLib/Dialogs/UpdateCheck.h     |  4 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckDialog.h  |  6 +--
 .../AbstractIOFileWidget.cpp                  |  6 +--
 .../AbstractIOFileWidget.h                    |  2 +-
 .../AttributeMatrixCreationWidget.cpp         |  2 +-
 .../AttributeMatrixCreationWidget.h           |  6 +--
 .../AttributeMatrixSelectionWidget.cpp        |  2 +-
 .../AttributeMatrixSelectionWidget.h          |  4 +-
 .../AxisAngleWidget.cpp                       |  2 +-
 .../FilterParameterWidgets/AxisAngleWidget.h  |  2 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |  2 +-
 .../FilterParameterWidgets/BooleanWidget.h    |  2 +-
 .../CalculatorWidget.cpp                      |  4 +-
 .../FilterParameterWidgets/CalculatorWidget.h |  4 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |  4 +-
 .../FilterParameterWidgets/ChoiceWidget.h     |  4 +-
 .../ComparisonContainerWidget.cpp             |  4 +-
 .../ComparisonContainerWidget.h               |  6 +--
 .../ComparisonSelectionAdvancedWidget.cpp     |  6 +--
 .../ComparisonSelectionAdvancedWidget.h       |  4 +-
 .../ComparisonSelectionItemDelegate.h         |  2 +-
 .../ComparisonSelectionTableModel.cpp         | 10 ++--
 .../ComparisonSelectionWidget.cpp             |  8 +--
 .../ComparisonSelectionWidget.h               |  4 +-
 .../ComparisonSetWidget.cpp                   |  8 +--
 .../ComparisonSetWidget.h                     |  2 +-
 .../ComparisonValueWidget.cpp                 |  6 +--
 .../ComparisonValueWidget.h                   |  2 +-
 .../ConstrainedDoubleWidget.cpp               |  2 +-
 .../ConstrainedDoubleWidget.h                 |  2 +-
 .../ConstrainedIntWidget.cpp                  |  2 +-
 .../ConstrainedIntWidget.h                    |  2 +-
 .../FilterParameterWidgets/CustomWidget.h     |  2 +-
 .../DataArrayCreationWidget.cpp               |  2 +-
 .../DataArrayCreationWidget.h                 |  4 +-
 .../DataArraySelectionWidget.cpp              |  2 +-
 .../DataArraySelectionWidget.h                |  4 +-
 .../DataContainerArrayProxyWidget.cpp         |  8 +--
 .../DataContainerArrayProxyWidget.h           |  4 +-
 .../DataContainerCreationWidget.h             |  4 +-
 .../DataContainerGridModel.cpp                | 18 +++----
 .../DataContainerGridModel.h                  |  2 +-
 .../DataContainerGridSelectionWidget.h        |  2 +-
 .../DataContainerReaderWidget.cpp             | 10 ++--
 .../DataContainerReaderWidget.h               |  4 +-
 .../DataContainerSelectionWidget.cpp          |  2 +-
 .../DataContainerSelectionWidget.h            |  4 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |  2 +-
 .../FilterParameterWidgets/DoubleWidget.h     |  2 +-
 .../DynamicChoiceWidget.cpp                   |  2 +-
 .../DynamicChoiceWidget.h                     |  2 +-
 .../DynamicTableWidget.cpp                    |  2 +-
 .../DynamicTableWidget.h                      |  2 +-
 .../FileListInfoWidget.cpp                    | 28 +++++-----
 .../FileListInfoWidget.h                      |  4 +-
 .../FilterParameterWidget.h                   |  6 +--
 .../FloatVec2Widget.cpp                       |  2 +-
 .../FilterParameterWidgets/FloatVec2Widget.h  |  2 +-
 .../FloatVec3Widget.cpp                       |  2 +-
 .../FilterParameterWidgets/FloatVec3Widget.h  |  2 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |  2 +-
 .../FilterParameterWidgets/FloatWidget.h      |  2 +-
 .../FourthOrderPolynomialWidget.cpp           |  2 +-
 .../FourthOrderPolynomialWidget.h             |  2 +-
 .../GenerateColorTableWidget.cpp              |  2 +-
 .../GenerateColorTableWidget.h                |  4 +-
 .../IComparisonWidget.h                       |  2 +-
 .../ImportHDF5DatasetWidget.cpp               | 10 ++--
 .../ImportHDF5DatasetWidget.h                 |  6 +--
 .../InputFileWidget.cpp                       |  2 +-
 .../FilterParameterWidgets/InputFileWidget.h  |  2 +-
 .../FilterParameterWidgets/InputPathWidget.h  |  2 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |  2 +-
 .../FilterParameterWidgets/IntVec2Widget.h    |  2 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |  2 +-
 .../FilterParameterWidgets/IntVec3Widget.h    |  2 +-
 .../FilterParameterWidgets/IntWidget.cpp      |  2 +-
 .../FilterParameterWidgets/IntWidget.h        |  2 +-
 .../LinkedBooleanWidget.cpp                   |  6 +--
 .../LinkedBooleanWidget.h                     |  4 +-
 .../LinkedDataContainerSelectionWidget.cpp    |  4 +-
 .../LinkedDataContainerSelectionWidget.h      |  4 +-
 .../LinkedPathCreationWidget.h                |  2 +-
 .../MontageSelectionWidget.cpp                |  2 +-
 .../MontageSelectionWidget.h                  |  2 +-
 .../MontageStructureSelectionWidget.cpp       |  2 +-
 .../MontageStructureSelectionWidget.h         |  2 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   | 12 ++---
 .../MultiAttributeMatrixSelectionWidget.h     |  4 +-
 .../MultiDataArraySelectionWidget.cpp         | 14 ++---
 .../MultiDataArraySelectionWidget.h           |  4 +-
 .../MultiDataContainerSelectionWidget.cpp     | 12 ++---
 .../MultiDataContainerSelectionWidget.h       |  4 +-
 .../MultiInputFileWidget.h                    |  2 +-
 .../NumericTypeWidget.cpp                     |  2 +-
 .../NumericTypeWidget.h                       |  2 +-
 .../FilterParameterWidgets/OutputFileWidget.h |  2 +-
 .../FilterParameterWidgets/OutputPathWidget.h |  2 +-
 .../FilterParameterWidgets/ParagraphWidget.h  |  4 +-
 .../PhaseTypeSelectionWidget.cpp              |  6 +--
 .../PhaseTypeSelectionWidget.h                |  4 +-
 .../PreflightUpdatedValueWidget.h             |  2 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |  4 +-
 .../FilterParameterWidgets/RangeWidget.h      |  2 +-
 .../ReadASCIIDataWidget.cpp                   |  8 +--
 .../ReadASCIIDataWidget.h                     |  4 +-
 .../ScalarTypeWidget.cpp                      |  2 +-
 .../FilterParameterWidgets/ScalarTypeWidget.h |  2 +-
 .../SecondOrderPolynomialWidget.cpp           |  2 +-
 .../SecondOrderPolynomialWidget.h             |  2 +-
 .../FilterParameterWidgets/SeparatorWidget.h  |  2 +-
 .../ShapeTypeSelectionWidget.cpp              |  2 +-
 .../ShapeTypeSelectionWidget.h                |  2 +-
 .../FilterParameterWidgets/StringWidget.h     |  2 +-
 .../ThirdOrderPolynomialWidget.cpp            |  2 +-
 .../ThirdOrderPolynomialWidget.h              |  2 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |  2 +-
 .../FilterParameterWidgets/UInt64Widget.h     |  2 +-
 .../FilterParameterWidgets/UnknownWidget.cpp  |  2 +-
 .../FilterParameterWidgets/UnknownWidget.h    |  2 +-
 .../QtSupport/QtSApplicationAboutBoxDialog.h  |  2 +-
 .../QtSupport/QtSBookmarkMissingDialog.h      |  2 +-
 .../QtSupport/QtSCheckboxDialog.cpp           |  2 +-
 .../QtSupport/QtSDisclosableWidget.cpp        |  2 +-
 .../QtSupport/QtSDisclosableWidget.h          |  4 +-
 .../QtSupport/QtSDroppableScrollArea.cpp      |  2 +-
 .../QtSupport/QtSDroppableScrollArea.h        |  2 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp |  2 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.h   |  2 +-
 .../QtSupport/QtSFSDropLineEdit.cpp           |  2 +-
 .../QtSupport/QtSFSDropLineEdit.h             |  2 +-
 .../SVWidgetsLib/QtSupport/QtSFaderWidget.cpp |  2 +-
 .../SVWidgetsLib/QtSupport/QtSFaderWidget.h   |  2 +-
 .../QtSupport/QtSFileDragMessageBox.h         |  2 +-
 .../SVWidgetsLib/QtSupport/QtSFileUtils.cpp   |  2 +-
 .../QtSupport/QtSGraphicsView.cpp             |  4 +-
 .../SVWidgetsLib/QtSupport/QtSGraphicsView.h  |  4 +-
 .../QtSupport/QtSImageGraphicsDelegate.h      |  4 +-
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp | 10 ++--
 Source/SVWidgetsLib/QtSupport/QtSLineEdit.h   |  4 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.h   |  4 +-
 .../QtSupport/QtSRecentFileList.cpp           |  6 +--
 .../QtSupport/QtSRecentFileList.h             |  4 +-
 .../SVWidgetsLib/QtSupport/QtSStringEdit.cpp  |  2 +-
 Source/SVWidgetsLib/QtSupport/QtSStringEdit.h |  4 +-
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |  6 +--
 Source/SVWidgetsLib/Widgets/BookmarksModel.h  |  4 +-
 .../Widgets/BookmarksToolboxWidget.cpp        |  4 +-
 .../Widgets/BookmarksToolboxWidget.h          |  4 +-
 .../Widgets/BookmarksTreeView.cpp             | 14 ++---
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h  |  8 +--
 .../Widgets/DREAM3DListWidget.cpp             |  2 +-
 .../SVWidgetsLib/Widgets/DREAM3DListWidget.h  |  2 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  | 22 ++++----
 .../Widgets/DataArrayPathSelectionWidget.h    |  8 +--
 .../Widgets/DataContainerArrayWidget.h        |  2 +-
 .../Widgets/DataStructureItem.cpp             |  4 +-
 .../Widgets/DataStructureModel.cpp            |  2 +-
 .../SVWidgetsLib/Widgets/DataStructureModel.h |  2 +-
 .../Widgets/DataStructureTreeView.cpp         | 10 ++--
 .../Widgets/DataStructureTreeView.h           |  6 +--
 .../Widgets/DataStructureWidget.h             |  4 +-
 .../Widgets/FilterInputWidget.cpp             | 14 ++---
 .../SVWidgetsLib/Widgets/FilterInputWidget.h  |  6 +--
 .../Widgets/FilterLibraryToolboxWidget.cpp    |  4 +-
 .../Widgets/FilterLibraryToolboxWidget.h      |  4 +-
 .../SVWidgetsLib/Widgets/FilterListModel.cpp  |  2 +-
 .../Widgets/FilterListToolboxWidget.h         |  4 +-
 .../SVWidgetsLib/Widgets/FilterListView.cpp   |  4 +-
 Source/SVWidgetsLib/Widgets/FilterListView.h  |  6 +--
 .../ImportASCIIDataWizard/ASCIIDataModel.cpp  | 12 ++---
 .../ImportASCIIDataWizard/DataFormatPage.cpp  | 24 ++++-----
 .../ImportASCIIDataWizard/DataFormatPage.h    |  4 +-
 .../ImportASCIIDataWizard/DelimitedPage.h     |  2 +-
 .../ImportASCIIDataWizard/EditHeadersDialog.h |  2 +-
 .../ImportASCIIDataWizard.h                   |  2 +-
 .../LineCounterObject.cpp                     |  6 +--
 .../ImportASCIIDataWizard/LineCounterObject.h |  4 +-
 .../TupleTableWidget.cpp                      |  6 +--
 .../ImportASCIIDataWizard/TupleTableWidget.h  |  6 +--
 .../Widgets/ImportHDF5TreeModel.cpp           |  4 +-
 .../Widgets/ImportHDF5TreeModel.h             |  2 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp  |  2 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.h    |  4 +-
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp  |  4 +-
 .../Widgets/PipelineListWidget.cpp            |  2 +-
 .../SVWidgetsLib/Widgets/PipelineListWidget.h |  4 +-
 Source/SVWidgetsLib/Widgets/PipelineModel.cpp | 14 ++---
 Source/SVWidgetsLib/Widgets/PipelineModel.h   |  2 +-
 Source/SVWidgetsLib/Widgets/ProgressDialog.h  |  2 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   | 54 +++++++++----------
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |  8 +--
 Source/SVWidgetsLib/Widgets/SVStyle.cpp       |  2 +-
 Source/SVWidgetsLib/Widgets/SVStyle.h         |  2 +-
 .../Widgets/StandardOutputWidget.h            |  4 +-
 Source/SVWidgetsLib/Widgets/StatusBarButton.h |  2 +-
 .../Widgets/StatusBarIssuesButton.h           |  2 +-
 Source/SVWidgetsLib/Widgets/StatusBarWidget.h |  2 +-
 .../Widgets/util/AddFilterCommand.cpp         | 16 +++---
 .../Widgets/util/MoveFilterCommand.cpp        | 16 +++---
 .../Widgets/util/RemoveFilterCommand.cpp      | 14 ++---
 .../httpserver/httpconnectionhandler.h        |  4 +-
 .../httpserver/httpconnectionhandlerpool.cpp  |  6 +--
 .../httpserver/httpconnectionhandlerpool.h    |  2 +-
 ThirdParty/QtWebApp/httpserver/httpcookie.cpp |  2 +-
 .../QtWebApp/httpserver/httplistener.cpp      |  4 +-
 ThirdParty/QtWebApp/httpserver/httplistener.h |  2 +-
 .../QtWebApp/httpserver/httprequest.cpp       |  8 +--
 .../QtWebApp/httpserver/httpresponse.cpp      |  4 +-
 .../QtWebApp/httpserver/httpsessionstore.h    |  2 +-
 ThirdParty/QtWebApp/logging/filelogger.cpp    |  2 +-
 ThirdParty/QtWebApp/logging/logmessage.cpp    |  2 +-
 ThirdParty/QtWebApp/qtservice/qtservice.cpp   |  2 +-
 .../QtWebApp/qtservice/qtservice_unix.cpp     |  4 +-
 .../templateengine/templateloader.cpp         |  4 +-
 .../CodeScraper/PyBind11Generator.cpp         |  6 +--
 300 files changed, 678 insertions(+), 678 deletions(-)

diff --git a/Source/Experimental/FilterCallback/IFilter.cpp b/Source/Experimental/FilterCallback/IFilter.cpp
index 4974fd2cad..0ab816f408 100644
--- a/Source/Experimental/FilterCallback/IFilter.cpp
+++ b/Source/Experimental/FilterCallback/IFilter.cpp
@@ -105,10 +105,10 @@ void IFilter::dataCheck()
 void IFilter::preflight()
 {
   //  setInPreflight(true);
-  //  emit preflightAboutToExecute();
-  //  emit updateFilterParameters(this);
+  //  Q_EMIT preflightAboutToExecute();
+  //  Q_EMIT updateFilterParameters(this);
   //  dataCheck();
-  //  emit preflightExecuted();
+  //  Q_EMIT preflightExecuted();
   //  setInPreflight(false);
 }
 
diff --git a/Source/RESTClient/SIMPLClientRequest.cpp b/Source/RESTClient/SIMPLClientRequest.cpp
index b74d475899..050d83917a 100644
--- a/Source/RESTClient/SIMPLClientRequest.cpp
+++ b/Source/RESTClient/SIMPLClientRequest.cpp
@@ -68,9 +68,9 @@ void SIMPLClientRequest::parseReplyData()
   const QJsonObject object(mReplyDocument.object());
 
   QByteArray out = mReplyDocument.toJson(QJsonDocument::Indented);
-  emit notifyStatusMessage(out.data());
+  Q_EMIT notifyStatusMessage(out.data());
 
-  emit finished();
+  Q_EMIT finished();
 
-  //    emit replyInfo(cityName, humidity, pressure, temp);
+  //    Q_EMIT replyInfo(cityName, humidity, pressure, temp);
 }
diff --git a/Source/RESTClient/SIMPLClientRequest.h b/Source/RESTClient/SIMPLClientRequest.h
index ea750d8d27..bde65c8a0e 100644
--- a/Source/RESTClient/SIMPLClientRequest.h
+++ b/Source/RESTClient/SIMPLClientRequest.h
@@ -37,7 +37,7 @@ class RESTClient_EXPORT SIMPLClientRequest : public MRestRequest
 public:
   SIMPLClientRequest(QUrl url, Command command, Type msgType, QJsonObject jsonMsg = QJsonObject());
 
-signals:
+Q_SIGNALS:
   void replyInfo(const QString& cityName, int humidity, int pressure, float temp) const;
 
 protected:
diff --git a/Source/RESTClient/SIMPLRestClient.cpp b/Source/RESTClient/SIMPLRestClient.cpp
index 37e2583a40..d6595a05a3 100644
--- a/Source/RESTClient/SIMPLRestClient.cpp
+++ b/Source/RESTClient/SIMPLRestClient.cpp
@@ -141,7 +141,7 @@ QSharedPointer<SIMPLClientRequest> SIMPLRestClient::createRequest(SIMPLClientReq
     m_NumOfActiveRequests--;
     if(m_NumOfActiveRequests <= 0)
     {
-      emit finished();
+      Q_EMIT finished();
     }
   });
 
diff --git a/Source/RESTClient/SIMPLRestClient.h b/Source/RESTClient/SIMPLRestClient.h
index 24b75fa653..55abd96604 100644
--- a/Source/RESTClient/SIMPLRestClient.h
+++ b/Source/RESTClient/SIMPLRestClient.h
@@ -61,7 +61,7 @@ class RESTClient_EXPORT SIMPLRestClient : public MRestRequestManager
 
   void setServerUrl(QUrl url);
 
-signals:
+Q_SIGNALS:
   void notifyErrorMessage(const QString& msg);
   void notifyWarningMessage(const QString& msg);
   void notifyStatusMessage(const QString& msg);
diff --git a/Source/RESTClient/config.cpp b/Source/RESTClient/config.cpp
index 5312f0ecf1..01a0dfd492 100644
--- a/Source/RESTClient/config.cpp
+++ b/Source/RESTClient/config.cpp
@@ -51,7 +51,7 @@ void Config::load()
 {
   QSettings settings;
   settings.beginGroup(mGroupName);
-  foreach(const QByteArray& key, mValues.keys())
+  for(const QByteArray& key : mValues.keys())
   {
     copyValue(mValues.value(key).ptr, mValues.value(key).type, settings.value(key));
   }
@@ -64,7 +64,7 @@ void Config::save()
 {
   QSettings settings;
   settings.beginGroup(mGroupName);
-  foreach(const QByteArray& key, mValues.keys())
+  for(const QByteArray& key : mValues.keys())
   {
     QVariant value(mValues.value(key).type, mValues.value(key).ptr);
     settings.setValue(key, value);
diff --git a/Source/RESTClient/mrestrequest.cpp b/Source/RESTClient/mrestrequest.cpp
index 475fd4861f..b96c21cf9f 100644
--- a/Source/RESTClient/mrestrequest.cpp
+++ b/Source/RESTClient/mrestrequest.cpp
@@ -172,7 +172,7 @@ void MRestRequest::send()
 {
   Q_ASSERT(mNetworkManager);
   QString msg = tr("%1 - Try %2").arg(m_RequestUrl.toDisplayString()).arg(QString::number(mRequestRetryCounter));
-  emit notifyStatusMessage(msg);
+  Q_EMIT notifyStatusMessage(msg);
   mReplyData.clear();
   QNetworkRequest request(m_RequestUrl);
   request.setOriginatingObject(this);
@@ -180,7 +180,7 @@ void MRestRequest::send()
   if(mType == Type::None)
   {
     QString errMsg = "Request type is set to None - can't send. Please set request type to Put, Post, Get or Delete";
-    emit notifyErrorMessage(errMsg);
+    Q_EMIT notifyErrorMessage(errMsg);
   }
   else if(mType == Type::Put)
   {
@@ -234,7 +234,7 @@ void MRestRequest::retry()
     if(mActiveReply->bytesAvailable())
     {
       QString msg = QObject::tr("Retrying request, %1 bytes lost.").arg(mActiveReply->bytesAvailable());
-      emit notifyStatusMessage(msg);
+      Q_EMIT notifyStatusMessage(msg);
       send();
     }
   }
@@ -252,7 +252,7 @@ void MRestRequest::onReplyError(QNetworkReply::NetworkError code)
     reply->deleteLater();
     mRequestTimer->stop();
     mLastError = reply->errorString();
-    emit notifyErrorMessage(mLastError);
+    Q_EMIT notifyErrorMessage(mLastError);
   }
 }
 
@@ -289,8 +289,8 @@ void MRestRequest::onReplyFinished()
 
   if(mReplyData.isEmpty())
   {
-    emit notifyErrorMessage(tr("%1 - %2 - Request reply is empty").arg(requestName).arg(status));
-    emit finished();
+    Q_EMIT notifyErrorMessage(tr("%1 - %2 - Request reply is empty").arg(requestName).arg(status));
+    Q_EMIT finished();
     return;
   }
 
@@ -298,24 +298,24 @@ void MRestRequest::onReplyFinished()
   mReplyDocument = QJsonDocument::fromJson(mReplyData, &parseError);
   if(parseError.error != QJsonParseError::NoError)
   {
-    emit notifyWarningMessage(tr("%1 - %2 - Error while parsing json document: %3").arg(requestName).arg(status).arg(parseError.errorString()));
-    emit finished();
+    Q_EMIT notifyWarningMessage(tr("%1 - %2 - Error while parsing json document: %3").arg(requestName).arg(status).arg(parseError.errorString()));
+    Q_EMIT finished();
     return;
   }
 
-  emit notifyStatusMessage(tr("%1 - request response received").arg(requestName));
+  Q_EMIT notifyStatusMessage(tr("%1 - request response received").arg(requestName));
 
   if(mReplyDocument.isNull())
   {
     mLastError = "JSON document is invalid";
-    emit notifyStatusMessage(tr("%1 - %2").arg(requestName).arg(mLastError));
-    emit finished(); // rawData can still be parsed in another formats
+    Q_EMIT notifyStatusMessage(tr("%1 - %2").arg(requestName).arg(mLastError));
+    Q_EMIT finished(); // rawData can still be parsed in another formats
     return;
   }
 
   // parse json document according to specific request reply format
   parseReplyData();
-  emit finished();
+  Q_EMIT finished();
 }
 
 /*!
diff --git a/Source/RESTClient/mrestrequest.h b/Source/RESTClient/mrestrequest.h
index 7857403de6..89e2797b8c 100644
--- a/Source/RESTClient/mrestrequest.h
+++ b/Source/RESTClient/mrestrequest.h
@@ -73,7 +73,7 @@ class RESTClient_EXPORT MRestRequest : public QObject
   QJsonDocument document() const;
   QByteArray rawData() const;
 
-signals:
+Q_SIGNALS:
   void notifyStatusMessage(const QString& msg);
   void notifyErrorMessage(const QString& msg);
   void notifyWarningMessage(const QString& msg);
@@ -81,7 +81,7 @@ class RESTClient_EXPORT MRestRequest : public QObject
   void finished() const;
   void replyError(const QString& msgs) const;
 
-public slots:
+public Q_SLOTS:
 
 protected:
   enum class Priority
@@ -111,7 +111,7 @@ public slots:
   QJsonDocument mReplyDocument;
   QJsonDocument mRequestDocument;
 
-private slots:
+private Q_SLOTS:
   void onReplyError(QNetworkReply::NetworkError code);
   void onReadyRead();
   void onReplyFinished();
diff --git a/Source/RESTClient/mrestrequestmanager.cpp b/Source/RESTClient/mrestrequestmanager.cpp
index d6b02aa201..a24fcc85e4 100644
--- a/Source/RESTClient/mrestrequestmanager.cpp
+++ b/Source/RESTClient/mrestrequestmanager.cpp
@@ -106,7 +106,7 @@ void MRestRequestManager::removeActiveRequest(QObject* sender)
     return;
   }
 
-  foreach(const MRestRequestPtr& request, mActiveRequests)
+  for(const MRestRequestPtr& request : mActiveRequests)
   {
     if(request.data() == sender)
     {
@@ -136,12 +136,12 @@ void MRestRequestManager::onSslErrors(QNetworkReply* reply, const QList<QSslErro
 
   reply->deleteLater();
   mLastSslErrors.clear();
-  foreach(QSslError error, errors)
+  for(QSslError error : errors)
   {
     mLastSslErrors << error.errorString();
   }
 
-  emit sslErrorsChanged(mLastSslErrors);
+  Q_EMIT sslErrorsChanged(mLastSslErrors);
 }
 
 /*! @} */
diff --git a/Source/RESTClient/mrestrequestmanager.h b/Source/RESTClient/mrestrequestmanager.h
index 1ce18948c4..e43523a0c7 100644
--- a/Source/RESTClient/mrestrequestmanager.h
+++ b/Source/RESTClient/mrestrequestmanager.h
@@ -42,7 +42,7 @@ class RESTClient_EXPORT MRestRequestManager : public QObject
   MRestRequestManager(QObject* parent = nullptr);
   void send(MRestRequestPtr request);
   void ignoreSslErrors();
-signals:
+Q_SIGNALS:
   void sslErrorsChanged(const QStringList& errors);
 
 protected:
@@ -54,6 +54,6 @@ class RESTClient_EXPORT MRestRequestManager : public QObject
   bool mIgnoreSslErrors;
   QNetworkAccessManager* networkManager = nullptr;
   int MaxActiveRequestsCount = 3;
-private slots:
+private Q_SLOTS:
   void onSslErrors(QNetworkReply* reply, const QList<QSslError>& errors);
 };
diff --git a/Source/RESTServer/main.cpp b/Source/RESTServer/main.cpp
index 1e32f68e88..714016bc00 100644
--- a/Source/RESTServer/main.cpp
+++ b/Source/RESTServer/main.cpp
@@ -77,7 +77,7 @@ QString searchConfigFile()
   QStringList searchList;
   searchList.append(binDir);
 
-  foreach(QString dir, searchList)
+  for(QString dir : searchList)
   {
     QFile file(dir + "/" + fileName);
     if(file.exists())
@@ -90,7 +90,7 @@ QString searchConfigFile()
   }
 
   // not found
-  foreach(QString dir, searchList)
+  for(QString dir : searchList)
   {
     qWarning("%s/%s not found", qPrintable(dir), qPrintable(fileName));
   }
diff --git a/Source/SIMPLib/Common/DocRequestManager.cpp b/Source/SIMPLib/Common/DocRequestManager.cpp
index 20324e0ee1..0097a22068 100644
--- a/Source/SIMPLib/Common/DocRequestManager.cpp
+++ b/Source/SIMPLib/Common/DocRequestManager.cpp
@@ -60,7 +60,7 @@ DocRequestManager* DocRequestManager::Instance()
 // -----------------------------------------------------------------------------
 void DocRequestManager::requestFilterDocs(const QString& filter)
 {
-  emit showFilterDocs(filter);
+  Q_EMIT showFilterDocs(filter);
 }
 
 // -----------------------------------------------------------------------------
@@ -68,5 +68,5 @@ void DocRequestManager::requestFilterDocs(const QString& filter)
 // -----------------------------------------------------------------------------
 void DocRequestManager::requestFilterDocUrl(const QUrl& url)
 {
-  emit showFilterDocUrl(url);
+  Q_EMIT showFilterDocUrl(url);
 }
diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index 240864b14f..89156c06b2 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -73,7 +73,7 @@ void Observable::operator=(const Observable&)
 void Observable::setErrorCondition(int code, const QString& messageText)
 {
   GenericErrorMessage::Pointer pm = GenericErrorMessage::New(messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -93,7 +93,7 @@ void Observable::setErrorConditionWithPrefix(int code, const QString& prefix, co
 void Observable::setWarningCondition(int code, const QString& messageText)
 {
   GenericWarningMessage::Pointer pm = GenericWarningMessage::New(messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ void Observable::setWarningConditionWithPrefix(int code, const QString& prefix,
 void Observable::notifyStatusMessage(const QString& messageText) const
 {
   GenericStatusMessage::Pointer pm = GenericStatusMessage::New(messageText);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -133,7 +133,7 @@ void Observable::notifyStatusMessageWithPrefix(const QString& prefix, const QStr
 void Observable::notifyProgressMessage(int progress, const QString& messageText) const
 {
   GenericProgressMessage::Pointer pm = GenericProgressMessage::New(messageText, progress);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index 429d7121e0..b3e89cba69 100644
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -102,7 +102,7 @@ class SIMPLib_EXPORT Observable : public QObject
 
   void notifyProgressMessageWithPrefix(int progress, const QString& prefix, const QString& messageText) const;
 
-signals:
+Q_SIGNALS:
 
   /**
    * @brief messageGenerated This is a Qt Signal that is used when the filter generates Errors, Warnings, Status and Progress Messages
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index d06b1905c0..0f202c6b76 100644
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -75,7 +75,7 @@ class SIMPLib_EXPORT Observer : public QObject, public IObserver
 
   ~Observer() override;
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
 public:
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index 1a7374da12..f184f04638 100644
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -257,7 +257,7 @@ public:
   void set##prpty(const type& value)                                                                                                                                                                   \
   {                                                                                                                                                                                                    \
     this->m_##prpty = value;                                                                                                                                                                           \
-    emit parametersChanged();                                                                                                                                                                          \
+    Q_EMIT parametersChanged();                                                                                                                                                                          \
   }
 
 #define SIMPL_SET_PROPERTY_DECL(type, prpty) void set##prpty(type value);
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index cb706693c6..1e063a68db 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -100,7 +100,7 @@ void Breakpoint::execute()
 void Breakpoint::pause()
 {
   // Pause the pipeline at this point until someone chooses to resume
-  emit pipelineHasPaused();
+  Q_EMIT pipelineHasPaused();
 
   m_Mutex.lock();
   QString ss = "The pipeline is paused - Press \"Resume\" to continue execution.";
@@ -116,7 +116,7 @@ void Breakpoint::resumePipeline()
 {
   // Resume the pipeline
   m_WaitCondition.wakeAll();
-  emit pipelineHasResumed();
+  Q_EMIT pipelineHasResumed();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index c1f8c1242a..0a0fe33f2f 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -148,13 +148,13 @@ class SIMPLib_EXPORT Breakpoint : public AbstractFilter
    */
   void execute() override;
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief resumePipeline Resumes the pipeline
    */
   void resumePipeline();
 
-signals:
+Q_SIGNALS:
   /**
    * @brief pipelineHasPaused Emitted when the pipeline needs to be paused
    */
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index d49639a95b..1d0ead564f 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -286,7 +286,7 @@ class SIMPLib_EXPORT DataContainerReader : public AbstractFilter
    */
   DataContainerArray::MontageCollection readMontageGroup(const DataContainerArray::Pointer& dca);
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief Cleans up the filter after execution
    */
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index 86eedf6226..ab063c5f7b 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -177,7 +177,7 @@ class SIMPLib_EXPORT ExecuteProcess : public AbstractFilter
    */
   void initialize();
 
-protected slots:
+protected Q_SLOTS:
   void processHasFinished(int exitCode, QProcess::ExitStatus exitStatus);
   void processHasErroredOut(QProcess::ProcessError error);
   void sendErrorOutput();
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index ecea3f791d..83c19286cd 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -134,8 +134,8 @@ void FeatureCountDecision::execute()
     dm = false;
   }
 
-  emit decisionMade(dm);
-  emit targetValue(m_FeatureIds[1]);
+  Q_EMIT decisionMade(dm);
+  Q_EMIT targetValue(m_FeatureIds[1]);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 0ea89a225f..976fde87d5 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -75,7 +75,7 @@ class FilterMessageHandler : public AbstractMessageHandler
    */
   void processMessage(const GenericProgressMessage* msg) const override
   {
-    emit m_Filter->notifyProgressMessage(msg->getProgressValue(), msg->getMessageText());
+    Q_EMIT m_Filter->notifyProgressMessage(msg->getProgressValue(), msg->getMessageText());
   }
 
   /**
@@ -85,7 +85,7 @@ class FilterMessageHandler : public AbstractMessageHandler
   void processMessage(const GenericStatusMessage* msg) const override
   {
     QString messageText = QObject::tr("Computing Derivatives || %1").arg(msg->getMessageText());
-    emit m_Filter->notifyStatusMessage(messageText);
+    Q_EMIT m_Filter->notifyStatusMessage(messageText);
   }
 
   /**
@@ -93,7 +93,7 @@ class FilterMessageHandler : public AbstractMessageHandler
    */
   void processMessage(const GenericErrorMessage* msg) const override
   {
-    emit m_Filter->setErrorCondition(msg->getCode(), msg->getMessageText());
+    Q_EMIT m_Filter->setErrorCondition(msg->getCode(), msg->getMessageText());
   }
 
   /**
@@ -101,7 +101,7 @@ class FilterMessageHandler : public AbstractMessageHandler
    */
   void processMessage(const GenericWarningMessage* msg) const override
   {
-    emit m_Filter->setWarningCondition(msg->getCode(), msg->getMessageText());
+    Q_EMIT m_Filter->setWarningCondition(msg->getCode(), msg->getMessageText());
   }
 
 private:
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 826e97978f..7baad4e94a 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -192,7 +192,7 @@ class SIMPLib_EXPORT FindDerivatives : public AbstractFilter
    */
   void initialize();
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief processDerivativesMessage
    * @param msg
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index c13607dee6..f7fa384ffe 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -125,7 +125,7 @@ void MaskCountDecision::execute()
     if(m_NumberOfTrues < 0 && !m_Mask[i])
     {
       qDebug() << "First if check: " << dm;
-      emit decisionMade(dm);
+      Q_EMIT decisionMade(dm);
       return;
     }
     if(m_Mask[i])
@@ -137,15 +137,15 @@ void MaskCountDecision::execute()
       dm = false;
       qDebug() << "Second if check: " << dm;
 
-      emit decisionMade(dm);
-      emit targetValue(trueCount);
+      Q_EMIT decisionMade(dm);
+      Q_EMIT targetValue(trueCount);
       return;
     }
   }
 
   qDebug() << "Fell through: " << dm;
 
-  emit decisionMade(dm);
+  Q_EMIT decisionMade(dm);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index c0bb9ab5e3..00711eb14c 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -174,7 +174,7 @@ void RequiredZThickness::execute()
 
     setErrorCondition(-7788, str);
     bool needMoreData = true;
-    emit decisionMade(needMoreData);
+    Q_EMIT decisionMade(needMoreData);
   }
 }
 
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 51a2c9a73e..8d0d7d5672 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -163,7 +163,7 @@ class SIMPLib_EXPORT RequiredZThickness : public AbstractDecisionFilter
    */
   void execute() override;
 
-  //  signals:
+  //  Q_SIGNALS:
   //    void decisionMade(bool& dm);
 
 protected:
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index 127bd79d33..e86ec4f7e9 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -69,10 +69,10 @@ class ErrorMessageTest
     FilterErrorMessage::Pointer errorMessage = FilterErrorMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Error Message...", -23);
     FilterStatusMessage::Pointer statusMessage = FilterStatusMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Status Message...");
     FilterWarningMessage::Pointer warningMessage = FilterWarningMessage::New(f->getNameOfClass(), f->getHumanLabel(), -1, "Testing Status Message...", 23);
-    emit f->messageGenerated(progressMessage);
-    emit f->messageGenerated(errorMessage);
-    emit f->messageGenerated(statusMessage);
-    emit f->messageGenerated(warningMessage);
+    Q_EMIT f->messageGenerated(progressMessage);
+    Q_EMIT f->messageGenerated(errorMessage);
+    Q_EMIT f->messageGenerated(statusMessage);
+    Q_EMIT f->messageGenerated(warningMessage);
 
     if(true)
     {
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index cc1806cc40..c74b423068 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -106,7 +106,7 @@ class ExecuteProcessObserver : public QObject, public IObserver
     m_StdOutput.clear();
   }
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override
   {
     ExecuteProcessMessageHandler msgHandler(&m_StdOutput);
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index 8bf1af5329..b44c6071ad 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -155,7 +155,7 @@ class PipelinePauseTest : public QObject
     m_WorkerThread->start();
   }
 
-public slots:
+public Q_SLOTS:
   // -----------------------------------------------------------------------------
   //
   // -----------------------------------------------------------------------------
@@ -175,7 +175,7 @@ public slots:
     DREAM3D_REQUIRE_EQUAL(GlobalVariable, 3);
     std::cout << "GlobalVariable = 3" << std::endl;
 
-    emit pipelineIsResuming();
+    Q_EMIT pipelineIsResuming();
   }
 
   // -----------------------------------------------------------------------------
@@ -188,7 +188,7 @@ public slots:
     std::cout << "GlobalVariable = 7" << std::endl;
   }
 
-signals:
+Q_SIGNALS:
   void pipelineIsResuming();
   void testFinished();
 
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
index cc823a9eb0..a9b801f308 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysObserver.h
@@ -51,7 +51,7 @@ class RemoveArraysObserver : public QObject
   {
   }
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const PipelineMessage& msg)
   {
     m_ErrorList.push_back(msg);
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index a04d2306ed..7775d695a6 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -236,7 +236,7 @@ void AttributeMatrix::ReadAttributeMatrixStructure(hid_t containerId, DataContai
 {
   QList<QString> attributeMatrixNames;
   QH5Utilities::getGroupObjects(containerId, H5Utilities::CustomHDFDataTypes::Group, attributeMatrixNames);
-  foreach(QString attributeMatrixName, attributeMatrixNames)
+  for(QString attributeMatrixName : attributeMatrixNames)
   {
     if(attributeMatrixName.compare(SIMPL::Geometry::Geometry) != 0)
     {
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 7522b261bb..088716f158 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -194,7 +194,7 @@ DataArrayPath::~DataArrayPath() = default;
 QVector<DataArrayPath> DataArrayPath::ConvertToQVector(QStringList& paths)
 {
   QVector<DataArrayPath> vPaths;
-  foreach(const QString sPath, paths)
+  for(const QString sPath : paths)
   {
     DataArrayPath p(sPath);
     vPaths.push_back(p);
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 82e9341f6a..2bfa766977 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -120,7 +120,7 @@ void DataContainer::ReadDataContainerStructure(hid_t dcArrayGroupId, DataContain
 {
   QList<QString> dataContainers;
   QH5Utilities::getGroupObjects(dcArrayGroupId, H5Utilities::CustomHDFDataTypes::Group, dataContainers);
-  foreach(QString dataContainerName, dataContainers)
+  for(QString dataContainerName : dataContainers)
   {
     hid_t containerGid = H5Gopen(dcArrayGroupId, dataContainerName.toLatin1().constData(), H5P_DEFAULT);
     if(containerGid < 0)
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index fe6d2d0d80..ba41c598f7 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -195,7 +195,7 @@ QVector<DataArrayPath> DataContainerBundle::findCommonDataArrayPaths(bool filter
     {
       DataArrayPath dc0Path = dc0Paths[i];
       bool match = false;
-      foreach(DataArrayPath path, paths)
+      for(DataArrayPath path : paths)
       {
         // qDebug() << "Comparing " << dc0Path.serialize() << " TO " << path.serialize();
         if(path.hasSameAttributeMatrix(dc0Path) && path.hasSameDataArray(dc0Path))
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
index 306fcbfdb3..d075f6c66a 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
@@ -150,7 +150,7 @@ QJsonArray DataContainerProxy::writeMap(const QMap<QString, AttributeMatrixProxy
 QMap<QString, AttributeMatrixProxy> DataContainerProxy::readMap(QJsonArray jsonArray)
 {
   QMap<QString, AttributeMatrixProxy> map;
-  foreach(QJsonValue val, jsonArray)
+  for(QJsonValue val : jsonArray)
   {
     if(val.isObject())
     {
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 37990d8700..974651d255 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -124,7 +124,7 @@ void AttributeMatrixCreationFilterParameter::dataArrayPathRenamed(AbstractFilter
       {
         m_SetterCallback(path);
       }
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index b11da28fc3..4f1c2f1cad 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -191,7 +191,7 @@ void AttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(AbstractFilte
       {
         m_SetterCallback(path);
       }
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index 73bd639edc..dd389bc081 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -130,7 +130,7 @@ void CalculatorFilterParameter::dataArrayPathRenamed(AbstractFilter* filter, con
       inputStr.replace(oldPath.getDataArrayName(), newPath.getDataArrayName());
       m_SetterCallback(inputStr);
 
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 6b50c52169..20cb12987f 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -160,7 +160,7 @@ void ComparisonSelectionAdvancedFilterParameter::dataArrayPathRenamed(AbstractFi
   if(hasChanges)
   {
     m_SetterCallback(inputs);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index 2ed36fac1b..bf8f9fab69 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -175,7 +175,7 @@ void ComparisonSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fi
   if(hasChanges)
   {
     m_SetterCallback(inputs);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 024e254d65..4443ed946d 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -178,7 +178,7 @@ void DataArrayCreationFilterParameter::dataArrayPathRenamed(AbstractFilter* filt
       {
         m_SetterCallback(path);
       }
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 5652c0c9a9..d7942f7d35 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -250,7 +250,7 @@ void DataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fil
       {
         m_SetterCallback(path);
       }
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index bf338fa34a..12f9c62701 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -127,7 +127,7 @@ void DataContainerArrayProxyFilterParameter::dataArrayPathRenamed(AbstractFilter
   {
     m_SetterCallback(dcaProxy);
   }
-  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 997e57d4af..43512c6bb8 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -129,7 +129,7 @@ void DataContainerCreationFilterParameter::dataArrayPathRenamed(AbstractFilter*
   if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
     m_SetterCallback(newPath);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
index 7d4888467f..132b8c091c 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -129,7 +129,7 @@ void DataContainerGridSelectionFilterParameter::dataArrayPathRenamed(AbstractFil
   if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
     m_SetterCallback(newPath);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
   */
 }
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index 92ded6c8c2..a1fd0ca1ac 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -130,7 +130,7 @@ void DataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter*
   if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
     m_SetterCallback(newPath);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index 8faabb8917..1a16492b64 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -366,14 +366,14 @@ void DynamicTableData::writeJson(QJsonObject& json) const
   writeData(json);
 
   QJsonArray rHeaders;
-  foreach(QString header, m_RowHeaders)
+  for(QString header : m_RowHeaders)
   {
     rHeaders.push_back(header);
   }
   json["Row Headers"] = rHeaders;
 
   QJsonArray cHeaders;
-  foreach(QString header, m_ColHeaders)
+  for(QString header : m_ColHeaders)
   {
     cHeaders.push_back(header);
   }
@@ -403,7 +403,7 @@ bool DynamicTableData::readJson(QJsonObject& json)
   }
 
   QJsonArray rHeaders = json["Row Headers"].toArray();
-  foreach(QJsonValue val, rHeaders)
+  for(QJsonValue val : rHeaders)
   {
     if(val.isString())
     {
@@ -412,7 +412,7 @@ bool DynamicTableData::readJson(QJsonObject& json)
   }
 
   QJsonArray cHeaders = json["Column Headers"].toArray();
-  foreach(QJsonValue val, cHeaders)
+  for(QJsonValue val : cHeaders)
   {
     if(val.isString())
     {
@@ -436,10 +436,10 @@ bool DynamicTableData::readJson(QJsonObject& json)
 void DynamicTableData::writeData(QJsonObject& object) const
 {
   QJsonArray rows;
-  foreach(std::vector<double> vector, m_TableData)
+  for(const std::vector<double>& vector : m_TableData)
   {
     QJsonArray cols;
-    foreach(double val, vector)
+    for(double val : vector)
     {
       cols.push_back(val);
     }
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index a693505094..5bf8ff44c6 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -95,7 +95,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     {
       var.setValue(path);
       filter->setProperty(qPrintable(getPropertyName()), var);
-      emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
     }
   }
   else if(var.canConvert<DataContainerArrayProxy>())
@@ -104,7 +104,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     proxy.updatePath(renamePath);
     var.setValue(proxy);
     filter->setProperty(qPrintable(getPropertyName()), var);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
   else if(var.canConvert<DataContainerProxy>())
   {
@@ -112,7 +112,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     proxy.updatePath(renamePath);
     var.setValue(proxy);
     filter->setProperty(qPrintable(getPropertyName()), var);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
   else if(var.canConvert<AttributeMatrixProxy>())
   {
@@ -120,7 +120,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     proxy.updatePath(renamePath);
     var.setValue(proxy);
     filter->setProperty(qPrintable(getPropertyName()), var);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
   else if(var.canConvert<DataArrayProxy>())
   {
@@ -128,7 +128,7 @@ void FilterParameter::dataArrayPathRenamed(AbstractFilter* filter, const DataArr
     proxy.updatePath(renamePath);
     var.setValue(proxy);
     filter->setProperty(qPrintable(getPropertyName()), var);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index d3cf0eb6ce..e681cc0565 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -131,7 +131,7 @@ void LinkedDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractF
   if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
     m_SetterCallback(newPath);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
index 04bc014287..c225a37692 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -114,7 +114,7 @@ void MontageStructureSelectionFilterParameter::dataArrayPathRenamed(AbstractFilt
   if(oldPath == m_GetterCallback() && oldPath.getDataContainerName() != newPath.getDataContainerName())
   {
     m_SetterCallback(newPath);
-    emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+    Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
   }
 }
 #endif
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 47d17bc9a9..4fdb81ae59 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -233,7 +233,7 @@ void MultiAttributeMatrixSelectionFilterParameter::dataArrayPathRenamed(Abstract
   }
 
   m_SetterCallback(paths);
-  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index e5d41c7fd4..c652f8ab70 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -232,7 +232,7 @@ void MultiDataArraySelectionFilterParameter::dataArrayPathRenamed(AbstractFilter
   }
 
   m_SetterCallback(paths);
-  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 48fbf27a4f..85972c393f 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -228,7 +228,7 @@ void MultiDataContainerSelectionFilterParameter::dataArrayPathRenamed(AbstractFi
   }
 
   m_SetterCallback(dcList);
-  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 3266ce3051..2721347f31 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -135,7 +135,7 @@ void PhaseTypeSelectionFilterParameter::dataArrayPathRenamed(AbstractFilter* fil
     {
       var.setValue(path);
       filter->setProperty(qPrintable(getAttributeMatrixPathProperty()), var);
-      emit filter->dataArrayPathUpdated(getAttributeMatrixPathProperty(), renamePath);
+      Q_EMIT filter->dataArrayPathUpdated(getAttributeMatrixPathProperty(), renamePath);
     }
   }
 }
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index 17682f07f5..612958dcef 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -80,7 +80,7 @@ void ReadASCIIDataFilterParameter::dataArrayPathRenamed(AbstractFilter* filter,
   DataArrayPath newPath;
   std::tie(oldPath, newPath) = renamePath;
 
-  emit filter->dataArrayPathUpdated(getPropertyName(), renamePath);
+  Q_EMIT filter->dataArrayPathUpdated(getPropertyName(), renamePath);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index 7058456a7b..8f9bc3578a 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -129,7 +129,7 @@ class AbstractDecisionFilter : public AbstractFilter
    */
   void execute() override;
 
-signals:
+Q_SIGNALS:
   void decisionMade(bool& dm);
   void targetValue(int& value);
 
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index eb7a82647c..2691bbfe0f 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -143,10 +143,10 @@ void AbstractFilter::setupFilterParameters()
 void AbstractFilter::preflight()
 {
   setInPreflight(true);
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
+  Q_EMIT preflightAboutToExecute();
+  Q_EMIT updateFilterParameters(this);
   dataCheck();
-  emit preflightExecuted();
+  Q_EMIT preflightExecuted();
   setInPreflight(false);
 }
 
@@ -527,7 +527,7 @@ void AbstractFilter::setErrorCondition(int code, const QString& messageText)
 {
   m_ErrorCode = code;
   FilterErrorMessage::Pointer pm = FilterErrorMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -536,7 +536,7 @@ void AbstractFilter::setErrorCondition(int code, const QString& messageText)
 void AbstractFilter::notifyStatusMessage(const QString& messageText) const
 {
   FilterStatusMessage::Pointer pm = FilterStatusMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -546,7 +546,7 @@ void AbstractFilter::setWarningCondition(int code, const QString& messageText)
 {
   m_WarningCode = code;
   FilterWarningMessage::Pointer pm = FilterWarningMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -555,7 +555,7 @@ void AbstractFilter::setWarningCondition(int code, const QString& messageText)
 void AbstractFilter::notifyProgressMessage(int progress, const QString& messageText) const
 {
   FilterProgressMessage::Pointer pm = FilterProgressMessage::New(getNameOfClass(), getHumanLabel(), getPipelineIndex(), messageText, progress);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 18a72eafa4..34be9e8d95 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -481,7 +481,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   void clearRenamedPaths();
 
-signals:
+Q_SIGNALS:
   /**
    * @brief Signal is emitted when filter has completed the execute() method
    */
@@ -521,7 +521,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
    */
   void preflightExecuted();
 
-public slots:
+public Q_SLOTS:
 
   /**
    * @brief Cancel the operation
@@ -572,7 +572,7 @@ public slots:
    */
   void addPathRename(const DataArrayPath& oldPath, const DataArrayPath& newPath);
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief This function will be called after the pipeline is completely done executing.  This can be reimplemented
    * in subclasses to provide cleanup code between pipeline executions. (resetting/clearing variables, updating settings, etc.)
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index 087e7fe2db..bf119e312b 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -123,7 +123,7 @@ void FilterPipeline::setName(const QString& newName)
   QString oldName = m_PipelineName;
   m_PipelineName = newName;
 
-  emit pipelineNameChanged(oldName, newName);
+  Q_EMIT pipelineNameChanged(oldName, newName);
 }
 
 // -----------------------------------------------------------------------------
@@ -370,7 +370,7 @@ DataContainerArray::Pointer FilterPipeline::run()
 {
   m_Dca = execute();
 
-  emit pipelineFinished();
+  Q_EMIT pipelineFinished();
 
   return m_Dca;
 }
@@ -390,7 +390,7 @@ bool FilterPipeline::pushFront(const AbstractFilter::Pointer& f)
 
   m_Pipeline.push_front(f);
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -410,7 +410,7 @@ bool FilterPipeline::popFront()
 
   m_Pipeline.pop_front();
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -428,7 +428,7 @@ bool FilterPipeline::pushBack(const AbstractFilter::Pointer& f)
 
   m_Pipeline.push_back(f);
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -448,7 +448,7 @@ bool FilterPipeline::popBack()
 
   m_Pipeline.pop_back();
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -471,7 +471,7 @@ bool FilterPipeline::insert(size_t index, const AbstractFilter::Pointer& f)
   }
   m_Pipeline.insert(it, f);
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -496,7 +496,7 @@ bool FilterPipeline::erase(size_t index)
   }
   m_Pipeline.erase(it);
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -518,7 +518,7 @@ bool FilterPipeline::clear()
     filter->setNextFilter(AbstractFilter::NullPointer());
   }
   m_Pipeline.clear();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
   return true;
 }
 // -----------------------------------------------------------------------------
@@ -560,7 +560,7 @@ AbstractFilter::Pointer FilterPipeline::removeFirstFilterByName(const QString& n
     }
   }
   updatePrevNextFilters();
-  emit pipelineWasEdited();
+  Q_EMIT pipelineWasEdited();
 
   return f;
 }
@@ -626,7 +626,7 @@ void FilterPipeline::setErrorCondition(int code, const QString& messageText)
 {
   m_ErrorCode = code;
   PipelineErrorMessage::Pointer pm = PipelineErrorMessage::New(getName(), messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -635,7 +635,7 @@ void FilterPipeline::setErrorCondition(int code, const QString& messageText)
 void FilterPipeline::notifyStatusMessage(const QString& messageText) const
 {
   PipelineStatusMessage::Pointer pm = PipelineStatusMessage::New(getName(), messageText);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -645,7 +645,7 @@ void FilterPipeline::setWarningCondition(int code, const QString& messageText)
 {
   m_WarningCode = code;
   PipelineWarningMessage::Pointer pm = PipelineWarningMessage::New(getName(), messageText, code);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -654,7 +654,7 @@ void FilterPipeline::setWarningCondition(int code, const QString& messageText)
 void FilterPipeline::notifyProgressMessage(int progress, const QString& messageText) const
 {
   PipelineProgressMessage::Pointer pm = PipelineProgressMessage::New(getName(), messageText, progress);
-  emit messageGenerated(pm);
+  Q_EMIT messageGenerated(pm);
 }
 
 // -----------------------------------------------------------------------------
@@ -895,7 +895,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
     QString ss = QObject::tr("[%1/%2] %3").arg(filtIndex + 1).arg(m_Pipeline.size()).arg(filt->getHumanLabel());
     notifyStatusMessage(ss);
 
-    emit filt->filterInProgress(filt.get());
+    Q_EMIT filt->filterInProgress(filt.get());
 
     // Do not execute disabled filters
     if(filt->getEnabled())
@@ -915,8 +915,8 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
 
         notifyProgressMessage(100, "");
 
-        emit filt->filterCompleted(filt.get());
-        emit pipelineFinished();
+        Q_EMIT filt->filterCompleted(filt.get());
+        Q_EMIT pipelineFinished();
         disconnectSignalsSlots();
         m_State = FilterPipeline::State::Idle;
         m_ExecutionResult = FilterPipeline::ExecutionResult::Failed;
@@ -932,7 +932,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
     }
 
     // Emit that the filter is completed for those objects that care, even the disabled ones.
-    emit filt->filterCompleted(filt.get());
+    Q_EMIT filt->filterCompleted(filt.get());
 
     notifyProgressMessage(static_cast<int>(static_cast<float>(filtIndex + 1) / (m_Pipeline.size()) * 100.0f), "");
   }
@@ -960,7 +960,7 @@ DataContainerArray::Pointer FilterPipeline::execute(DataContainerArray::Pointer
 
   m_State = FilterPipeline::State::Idle;
 
-  emit pipelineFinished();
+  Q_EMIT pipelineFinished();
 
   return m_Dca;
 }
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index 404589d86a..a8d1171ffc 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -304,7 +304,7 @@ class SIMPLib_EXPORT FilterPipeline : public Observable
    */
   static Pointer FromJson(const QJsonObject& json, IObserver* obs = nullptr);
 
-public slots:
+public Q_SLOTS:
 
   /**
    * @brief This method is called to start the pipeline for a plugin
@@ -323,7 +323,7 @@ public slots:
 
   void updatePrevNextFilters();
 
-signals:
+Q_SIGNALS:
   //  void messageGenerated(AbstractMessage::Pointer message);
 
   /**
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.cpp b/Source/SIMPLib/Montages/DataContainerGrid.cpp
index e818069e7e..f06e07080c 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.cpp
+++ b/Source/SIMPLib/Montages/DataContainerGrid.cpp
@@ -137,7 +137,7 @@ void DataContainerGrid::resizeDimensions(SizeVec3Type newSize)
     }
   }
 
-  emit dimensionsChanged(newSize);
+  Q_EMIT dimensionsChanged(newSize);
 }
 
 // -----------------------------------------------------------------------------
@@ -157,7 +157,7 @@ void DataContainerGrid::setDataContainerName(SizeVec3Type pos, const QString& na
   size_t offset = getOffset(pos);
   m_DataContainerNames[offset] = name;
 
-  emit dataContainerNameChanged();
+  Q_EMIT dataContainerNameChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -190,6 +190,6 @@ DataContainerGrid& DataContainerGrid::operator=(const DataContainerGrid& other)
   m_Dims = other.m_Dims;
   m_DataContainerNames = other.m_DataContainerNames;
 
-  emit dimensionsChanged(m_Dims);
+  Q_EMIT dimensionsChanged(m_Dims);
   return *this;
 }
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.h b/Source/SIMPLib/Montages/DataContainerGrid.h
index bc7c720fd7..d0c2f0ea78 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.h
+++ b/Source/SIMPLib/Montages/DataContainerGrid.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT DataContainerGrid : public QObject
    */
   QStringList getDataContainerNames() const;
 
-signals:
+Q_SIGNALS:
   void dimensionsChanged(SizeVec3Type newDims);
   void dataContainerNameChanged();
 
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
index 3082e80ef5..cef4baa518 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
@@ -194,7 +194,7 @@ void SIMPLibPluginLoader::LoadPluginFilters(FilterManager* filterManager, bool q
   sep = ':';
 #endif
   QList<QByteArray> envPaths = pluginEnvPath.split(sep);
-  foreach(QByteArray envPath, envPaths)
+  for(QByteArray envPath : envPaths)
   {
     if(envPath.size() > 0)
     {
@@ -209,14 +209,14 @@ void SIMPLibPluginLoader::LoadPluginFilters(FilterManager* filterManager, bool q
   }
   QStringList pluginFilePaths;
 
-  foreach(QString pluginDirString, pluginDirs)
+  for(QString pluginDirString : pluginDirs)
   {
     if(!quiet)
     {
       qDebug() << "Plugin Directory being Searched: " << pluginDirString;
     }
     aPluginDir = QDir(pluginDirString);
-    foreach(QString fileName, aPluginDir.entryList(QDir::Files))
+    for(QString fileName : aPluginDir.entryList(QDir::Files))
     {
 //   qDebug() << "File: " << fileName() << "\n";
 #ifdef QT_DEBUG
@@ -241,7 +241,7 @@ void SIMPLibPluginLoader::LoadPluginFilters(FilterManager* filterManager, bool q
 
   // Now that we have a sorted list of plugins, go ahead and load them all from the
   // file system and add each to the toolbar and menu
-  foreach(QString path, pluginFilePaths)
+  for(QString path : pluginFilePaths)
   {
     if(!quiet)
     {
diff --git a/Source/SIMPLib/REST/PipelineListener.h b/Source/SIMPLib/REST/PipelineListener.h
index 925237cf7b..b6d3f2807a 100644
--- a/Source/SIMPLib/REST/PipelineListener.h
+++ b/Source/SIMPLib/REST/PipelineListener.h
@@ -48,7 +48,7 @@ class SIMPLib_EXPORT PipelineListener : public QObject, public IObserver
   QString getWarningLog();
   QString getStatusLog();
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
 private:
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 2442d284ae..6089d0d58a 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -95,7 +95,7 @@ class RESTUnitTestObserver : public QObject
 
   ~RESTUnitTestObserver() override = default;
 
-public slots:
+public Q_SLOTS:
   void processUploadProgress(qint64 bytesSent, qint64 bytesTotal)
   {
     double percent;
@@ -363,7 +363,7 @@ class RESTUnitTest
     DREAM3D_REQUIRE_EQUAL(fileNameList.size(), 117);
 
     QStringList filePathList;
-    foreach(QString fileName, fileNameList)
+    for(QString fileName : fileNameList)
     {
       filePathList.push_back(QObject::tr("%1/%2").arg(smallIN100Dir.path()).arg(fileName));
     }
@@ -453,7 +453,7 @@ class RESTUnitTest
     QList<QNetworkReply::RawHeaderPair> headerPairs = reply->rawHeaderPairs();
 
     bool hasContentTypeHeader = false;
-    foreach(QNetworkReply::RawHeaderPair headerPair, headerPairs)
+    for(QNetworkReply::RawHeaderPair headerPair : headerPairs)
     {
       if(headerPair.first == "Content-Type")
       {
@@ -703,7 +703,7 @@ class RESTUnitTest
     QList<QNetworkReply::RawHeaderPair> headerPairs = reply->rawHeaderPairs();
 
     bool hasContentTypeHeader = false;
-    foreach(QNetworkReply::RawHeaderPair headerPair, headerPairs)
+    for(QNetworkReply::RawHeaderPair headerPair : headerPairs)
     {
       if(headerPair.first == "Content-Type")
       {
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index 333a05a8ed..f5ffd70aae 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -293,7 +293,7 @@ void PrecipitateStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    foreach(const QString key, keys)
+    for(const QString key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index d822666afd..ee2cb80e18 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -280,7 +280,7 @@ void PrimaryStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    foreach(const QString key, keys)
+    for(const QString key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 2fbae3a770..1ab2f9d012 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -346,7 +346,7 @@ VectorOfFloatArray StatsData::ReadJsonDistributionArrays(const QJsonObject& json
   disType = StatsData::EncodeDistributionType(disTypeString);
 
   QStringList arrayNames = StatsData::ArrayNamesFromDistributionType(disTypeString);
-  foreach(const QString arrayName, arrayNames)
+  for(const QString arrayName : arrayNames)
   {
     QJsonArray data = jDistribution[arrayName].toArray();
     DataArray<float>::Pointer array = decodeDataArrayFromJsonDoubleArray<float>(arrayName, data);
@@ -364,7 +364,7 @@ VectorOfFloatArray StatsData::ReadJsonVectorOfFloatsArrays(const QJsonObject& js
   VectorOfFloatArray arrays;
   QJsonObject obj = json[key].toObject();
   QStringList arrayNames = obj.keys();
-  foreach(const QString name, arrayNames)
+  for(const QString name : arrayNames)
   {
     QJsonValue value = obj[name];
     if(value.isArray())
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index 6937005e79..b1cda549f7 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -290,7 +290,7 @@ void TransformationStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    foreach(const QString key, keys)
+    for(const QString key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
index 6522837497..1970b78aa8 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.cpp
@@ -105,10 +105,10 @@ void ArraySelectionExample::preflight()
   // Read up the structure from the file
   m_DataContainerArrayProxy = DataContainerArrayProxy(getDataContainerArray().get());
   // Annouce we are about to preflight
-  emit preflightAboutToExecute();
-  emit updateFilterParameters(this);
+  Q_EMIT preflightAboutToExecute();
+  Q_EMIT updateFilterParameters(this);
   dataCheck();
-  emit preflightExecuted();
+  Q_EMIT preflightExecuted();
   setInPreflight(false);
 }
 
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
index 2ec33c7985..559d161e62 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
@@ -116,7 +116,7 @@ void SIMPLDataPathValidator::setSIMPLDataDirectory(const QString& path)
 {
   m_SIMPLDataDirectory = path;
 
-  emit dataDirectoryChanged(path);
+  Q_EMIT dataDirectoryChanged(path);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
index 1031dbd908..16cab3c4fa 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.h
@@ -73,7 +73,7 @@ class SIMPLib_EXPORT SIMPLDataPathValidator : public QObject
 protected:
   SIMPLDataPathValidator();
 
-signals:
+Q_SIGNALS:
   void dataDirectoryChanged(const QString& path);
 
 private:
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
index 595b0f26a3..1465616911 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.cpp
@@ -72,7 +72,7 @@ bool SIMPLH5DataReader::openFile(const QString& filePath)
   if(m_FileId >= 0)
   {
     QString ss = QObject::tr("Error opening input file '%1' - A file is already open with this reader.").arg(filePath);
-    emit errorGenerated(Title, ss, -148);
+    Q_EMIT errorGenerated(Title, ss, -148);
     return false;
   }
 
@@ -80,7 +80,7 @@ bool SIMPLH5DataReader::openFile(const QString& filePath)
   if(m_FileId < 0)
   {
     QString ss = QObject::tr("Error opening input file '%1'.").arg(filePath);
-    emit errorGenerated(Title, ss, -149);
+    Q_EMIT errorGenerated(Title, ss, -149);
     m_FileId = -1;
     return false;
   }
@@ -98,7 +98,7 @@ bool SIMPLH5DataReader::closeFile()
   if(err < 0)
   {
     QString ss = QObject::tr("Error closing input file '%1'").arg(m_CurrentFilePath);
-    emit errorGenerated(Title, ss, -151);
+    Q_EMIT errorGenerated(Title, ss, -151);
     return false;
   }
 
@@ -115,7 +115,7 @@ DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataConta
   if(m_FileId < 0)
   {
     QString ss = QObject::tr("File data unable to be read - file was not properly opened");
-    emit errorGenerated(Title, ss, -249);
+    Q_EMIT errorGenerated(Title, ss, -249);
     return DataContainerArray::NullPointer();
   }
 
@@ -142,20 +142,20 @@ DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataConta
   if(!check)
   {
     QString ss = QObject::tr("File data unable to be read - file version could not be read");
-    emit errorGenerated(Title, ss, -250);
+    Q_EMIT errorGenerated(Title, ss, -250);
     return DataContainerArray::NullPointer();
   }
   if(fVersion < 7.0)
   {
     ss = QObject::tr("File unable to be read - file structure older than 7.0");
-    emit errorGenerated(Title, ss, -251);
+    Q_EMIT errorGenerated(Title, ss, -251);
     return DataContainerArray::NullPointer();
   }
   hid_t dcaGid = H5Gopen(m_FileId, SIMPL::StringConstants::DataContainerGroupName.toLatin1().data(), 0);
   if(dcaGid < 0)
   {
     QString ss = QObject::tr("Error attempting to open the HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerGroupName);
-    emit errorGenerated(Title, ss, -1923123);
+    Q_EMIT errorGenerated(Title, ss, -1923123);
     return DataContainerArray::NullPointer();
   }
 
@@ -163,7 +163,7 @@ DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataConta
   if(err < 0)
   {
     QString ss = QObject::tr("Error trying to read the DataContainers from the file '%1'").arg(m_CurrentFilePath);
-    emit errorGenerated(Title, ss, err);
+    Q_EMIT errorGenerated(Title, ss, err);
     return DataContainerArray::NullPointer();
   }
 
@@ -174,7 +174,7 @@ DataContainerArray::Pointer SIMPLH5DataReader::readSIMPLDataUsingProxy(DataConta
   if(!result)
   {
     QString ss = QObject::tr("Error trying to read the DataContainerBundles from the file '%1'").arg(m_CurrentFilePath);
-    emit errorGenerated(Title, ss, err);
+    Q_EMIT errorGenerated(Title, ss, err);
     return DataContainerArray::NullPointer();
   }
 
@@ -200,7 +200,7 @@ DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPL
   {
     QString ss = QObject::tr("HDF5 Attribute '%1' was not found on the HDF5 root node and this is required").arg(SIMPL::HDF5::DREAM3DVersion);
     err = -72;
-    emit errorGenerated(Title, ss, err);
+    Q_EMIT errorGenerated(Title, ss, err);
     return DataContainerArrayProxy();
   }
 
@@ -211,7 +211,7 @@ DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPL
     // std::cout << "Attribute '" << SIMPL::HDF5::FileVersionName.toStdString() << " was not found" << std::endl;
     QString ss = QObject::tr("HDF5 Attribute '%1' was not found on the HDF5 root node and this is required").arg(SIMPL::HDF5::FileVersionName);
     err = -73;
-    emit errorGenerated(Title, ss, err);
+    Q_EMIT errorGenerated(Title, ss, err);
     return DataContainerArrayProxy();
   }
   //  else {
@@ -223,7 +223,7 @@ DataContainerArrayProxy SIMPLH5DataReader::readDataContainerArrayStructure(SIMPL
   {
     QString ss = QObject::tr("Error opening HDF5 Group '%1'").arg(SIMPL::StringConstants::DataContainerGroupName);
     err = -74;
-    emit errorGenerated(Title, ss, err);
+    Q_EMIT errorGenerated(Title, ss, err);
     return DataContainerArrayProxy();
   }
 
@@ -251,13 +251,13 @@ bool SIMPLH5DataReader::readPipelineJson(QString& json)
   if(!check)
   {
     QString ss = QObject::tr("Pipeline unable to be read - file version could not be read.");
-    emit errorGenerated(Title, ss, -252);
+    Q_EMIT errorGenerated(Title, ss, -252);
     return false;
   }
   if(fVersion < 7.0)
   {
     QString ss = QObject::tr("Pipeline unable to be read - file version older than 7.0.");
-    emit errorGenerated(Title, ss, -253);
+    Q_EMIT errorGenerated(Title, ss, -253);
     return false;
   }
 
@@ -268,7 +268,7 @@ bool SIMPLH5DataReader::readPipelineJson(QString& json)
   if(err < 0)
   {
     QString ss = QObject::tr("Pipeline unable to be read - JSON dataset could not be read.");
-    emit errorGenerated(Title, ss, -254);
+    Q_EMIT errorGenerated(Title, ss, -254);
     json.clear();
     return false;
   }
@@ -288,7 +288,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
   {
     // NO Bundles are available to read so just return.
     QString ss = QObject::tr("Error opening HDF5 Group '%1' ").arg(SIMPL::StringConstants::DataContainerBundleGroupName);
-    emit errorGenerated(Title, ss, -73);
+    Q_EMIT errorGenerated(Title, ss, -73);
     return false;
   }
 
@@ -299,7 +299,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
   if(err < 0)
   {
     QString ss = QObject::tr("Error getting group objects from HDF5 group '%1' ").arg(SIMPL::StringConstants::DataContainerBundleGroupName);
-    emit errorGenerated(Title, ss, -74);
+    Q_EMIT errorGenerated(Title, ss, -74);
     return false;
   }
 
@@ -319,7 +319,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
     if(err < 0)
     {
       QString ss = QObject::tr("Error reading DataContainer group names from HDF5 group '%1' ").arg(bundleName);
-      emit errorGenerated(Title, ss, -75);
+      Q_EMIT errorGenerated(Title, ss, -75);
       return false;
     }
     QStringList dcNameList = dcNames.split(QString(sep));
@@ -342,7 +342,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
     if(err < 0)
     {
       QString ss = QObject::tr("Error reading DataContainerBundle meta data arrays from HDF5 group '%1' ").arg(bundleName);
-      emit errorGenerated(Title, ss, -76);
+      Q_EMIT errorGenerated(Title, ss, -76);
       return false;
     }
     QStringList metaNameList = metaArrays.split(QString(sep));
@@ -361,7 +361,7 @@ bool SIMPLH5DataReader::readDataContainerBundles(hid_t fileId, const DataContain
 // -----------------------------------------------------------------------------
 void SIMPLH5DataReader::setErrorCondition(int code, const QString& str)
 {
-  emit errorGenerated(Title, str, code);
+  Q_EMIT errorGenerated(Title, str, code);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
index 2021d471d7..63c623d38f 100644
--- a/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
+++ b/Source/SIMPLib/Utilities/SIMPLH5DataReader.h
@@ -116,7 +116,7 @@ class SIMPLib_EXPORT SIMPLH5DataReader : public Observable
    */
   void setErrorCondition(int code, const QString& str) override;
 
-signals:
+Q_SIGNALS:
   void errorGenerated(const QString& title, const QString& msg, const int& code);
 
 private:
diff --git a/Source/SIMPLib/Utilities/TestObserver.h b/Source/SIMPLib/Utilities/TestObserver.h
index 700d768bde..1854aea447 100644
--- a/Source/SIMPLib/Utilities/TestObserver.h
+++ b/Source/SIMPLib/Utilities/TestObserver.h
@@ -54,7 +54,7 @@ class SIMPLib_EXPORT TestObserver : public QObject, public IObserver
 
   ~TestObserver() override;
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
 public:
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
index bb4eb42014..a3fe7ad696 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemBorderSizeAnimation.h
@@ -46,7 +46,7 @@ class SVWidgetsLib_EXPORT PipelineItemBorderSizeAnimation : public QVariantAnima
   PipelineItemBorderSizeAnimation(PipelineModel* model, QPersistentModelIndex index);
   ~PipelineItemBorderSizeAnimation() override = default;
 
-private slots:
+private Q_SLOTS:
   void listenValueChanged(const QVariant& value);
 
 private:
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
index 5874efb277..d88a665cf8 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemHeightAnimation.h
@@ -51,7 +51,7 @@ class SVWidgetsLib_EXPORT PipelineItemHeightAnimation : public QVariantAnimation
 
   PipelineItemHeightAnimation(PipelineModel* model, QPersistentModelIndex index, AnimationDirection direction, QObject* parent = nullptr);
 
-private slots:
+private Q_SLOTS:
   void listenValueChanged(const QVariant& value);
 
 private:
diff --git a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
index 88998a9f90..fd06fdcac1 100644
--- a/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
+++ b/Source/SVWidgetsLib/Animations/PipelineItemSlideAnimation.h
@@ -54,7 +54,7 @@ class SVWidgetsLib_EXPORT PipelineItemSlideAnimation : public QVariantAnimation
   PipelineItemSlideAnimation(PipelineModel* model, QPersistentModelIndex index, int numberOfPixels, AnimationDirection direction);
   ~PipelineItemSlideAnimation() override = default;
 
-private slots:
+private Q_SLOTS:
   void listenValueChanged(const QVariant& value);
 
 private:
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
index c35c736667..5b92e34888 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
@@ -78,7 +78,7 @@ class SVWidgetsLib_EXPORT AboutPlugins : public SVDialog, private Ui::AboutPlugi
 
   void setLoadPreferencesFlag();
 
-public slots:
+public Q_SLOTS:
   void on_closeBtn_clicked();
   void on_addPluginBtn_clicked();
   void on_removePluginBtn_clicked();
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
index d9a4392874..449da70c91 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
@@ -118,7 +118,7 @@ void ColorPresetsDialog::updateEnabledStateForSelection()
     ui.okBtn->setEnabled(false);
 
     bool isEditable = true;
-    foreach(const QModelIndex& idx, selectedRows)
+    for(const QModelIndex& idx : selectedRows)
     {
       isEditable &= this->Internals->Model->flags(idx).testFlag(Qt::ItemIsEditable);
     }
@@ -152,7 +152,7 @@ void ColorPresetsDialog::triggerApply()
   const QJsonObject& preset = internals.Model->getPresets()->GetPreset(index.row());
   QPixmap presetPixmap = internals.Model->data(index, Qt::DecorationRole).value<QPixmap>();
   Q_ASSERT(preset.isEmpty() == false);
-  emit applyPreset(preset, presetPixmap);
+  Q_EMIT applyPreset(preset, presetPixmap);
   done(1);
 }
 
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
index d95d1d251d..eb2fb8c528 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
@@ -82,10 +82,10 @@ class SVWidgetsLib_EXPORT ColorPresetsDialog : public SVDialog
    */
   int currentPresetIndex();
 
-signals:
+Q_SIGNALS:
   void applyPreset(const QJsonObject& preset, const QPixmap& pixmap);
 
-protected slots:
+protected Q_SLOTS:
   void updateEnabledStateForSelection();
   void updateForSelectedIndex(const QModelIndex& idx);
   void triggerApply();
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
index ee067b3d2b..8bf2469fb2 100644
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
@@ -87,7 +87,7 @@ void FavoritesChangedDialog::on_outputDir_textChanged(const QString& text)
 // -----------------------------------------------------------------------------
 void FavoritesChangedDialog::on_exportBtn_clicked()
 {
-  emit exportBtnPressed(outputDir->text());
+  Q_EMIT exportBtnPressed(outputDir->text());
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
index be31cda291..1fd7e73901 100644
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
@@ -52,13 +52,13 @@ class SVWidgetsLib_EXPORT FavoritesChangedDialog : public SVDialog, private Ui::
   FavoritesChangedDialog(QWidget* parent = nullptr);
   ~FavoritesChangedDialog() override;
 
-protected slots:
+protected Q_SLOTS:
 
   void on_selectBtn_clicked();
   void on_exportBtn_clicked();
   void on_outputDir_textChanged(const QString& text);
 
-signals:
+Q_SIGNALS:
 
   void exportBtnPressed(QString directory);
 
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index 5eff1ee645..b76e31ef7e 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -159,7 +159,7 @@ void UpdateCheck::networkReplied(QNetworkReply* reply)
       errorMessage.append("Please contact the SIMPLView developers for more information.\n");
       dataObj->setMessageDescription(errorMessage);
       dataObj->setHasError(true);
-      emit latestVersion(dataObj);
+      Q_EMIT latestVersion(dataObj);
       return;
     }
 
@@ -185,7 +185,7 @@ void UpdateCheck::networkReplied(QNetworkReply* reply)
     dataObj->setAppString(appVersionStr);
     dataObj->setServerString(serverVersionStr);
 
-    emit latestVersion(dataObj);
+    Q_EMIT latestVersion(dataObj);
   }
   // The URL does not exist on the server
   else
@@ -196,7 +196,7 @@ void UpdateCheck::networkReplied(QNetworkReply* reply)
     errorMessage.append(reply->errorString());
     dataObj->setMessageDescription(errorMessage);
     dataObj->setHasError(true);
-    emit latestVersion(dataObj);
+    Q_EMIT latestVersion(dataObj);
     reply->abort();
   }
 }
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
index bd428c2a71..8cb329618d 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
@@ -67,10 +67,10 @@ class SVWidgetsLib_EXPORT UpdateCheck : public QObject
 
   void checkVersion(QUrl website);
 
-protected slots:
+protected Q_SLOTS:
   void networkReplied(QNetworkReply* reply);
 
-signals:
+Q_SIGNALS:
   void latestVersion(UpdateCheckData*);
 
 protected:
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
index 39ee2d58d1..8203acaa4e 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
@@ -116,16 +116,16 @@ class SVWidgetsLib_EXPORT UpdateCheckDialog : public SVDialog, private Ui::Updat
 
   void setupGui();
 
-public slots:
+public Q_SLOTS:
   void on_checkNowBtn_clicked();
   void on_howOften_currentIndexChanged(int);
   void on_automatically_toggled(bool);
   void on_manually_toggled(bool);
 
-protected slots:
+protected Q_SLOTS:
   void LatestVersionReplied(UpdateCheckData*);
 
-signals:
+Q_SIGNALS:
   void finished();
   void hasMessage(const QString& message);
   void updateFound();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index fce82d2e9a..f0c35cccc1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -134,7 +134,7 @@ void AbstractIOFileWidget::setupGui()
     on_m_LineEdit_returnPressed();
     blockSignals(false);
 
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   if(getFilterParameter() != nullptr)
@@ -230,7 +230,7 @@ void AbstractIOFileWidget::on_m_LineEdit_editingFinished()
   QtSFileUtils::VerifyPathExists(path, m_LineEdit);
   if(m_LineEdit->text() != m_CurrentText)
   {
-    emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+    Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
   }
   m_CurrentText = m_LineEdit->text();
   setValidFilePath(m_LineEdit->text());
@@ -295,7 +295,7 @@ void AbstractIOFileWidget::on_m_LineEdit_fileDropped(const QString& text)
   // Set/Remove the red outline if the file does exist
   QtSFileUtils::VerifyPathExists(inputPath, m_LineEdit);
 
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index f8877e591f..800ca2dba6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -80,7 +80,7 @@ class SVWidgetsLib_EXPORT AbstractIOFileWidget : public FilterParameterWidget, p
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index 05225c6efe..a6681aacf0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -210,7 +210,7 @@ void AttributeMatrixCreationWidget::dataContainerSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index ecbc9f4c8a..f5bdedf5b6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -104,7 +104,7 @@ class SVWidgetsLib_EXPORT AttributeMatrixCreationWidget : public FilterParameter
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -120,10 +120,10 @@ public slots:
    */
   void setSelectedPath(QString dcName, QString attrMatName, QString attrArrName);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
-private slots:
+private Q_SLOTS:
 
 private:
   bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index e43ccfcff2..02b701590b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -183,7 +183,7 @@ void AttributeMatrixSelectionWidget::attributeMatrixSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index d60a497db6..06f77d0dd8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -92,14 +92,14 @@ class SVWidgetsLib_EXPORT AttributeMatrixSelectionWidget : public FilterParamete
 
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
   void attributeMatrixSelected(QString path);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index 44af370f10..a27f466dfb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -104,7 +104,7 @@ void AxisAngleWidget::setupGui()
 void AxisAngleWidget::widgetChanged(const QString& text)
 {
   Q_UNUSED(text)
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index a8dd69747c..83fa99886f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -70,7 +70,7 @@ class SVWidgetsLib_EXPORT AxisAngleWidget : public FilterParameterWidget, privat
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index 8d1e6c9945..ec45213a8a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -88,7 +88,7 @@ void BooleanWidget::setupGui()
 void BooleanWidget::widgetChanged(int state)
 {
   Q_UNUSED(state)
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
index 893309f92a..f4af832482 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT BooleanWidget : public FilterParameterWidget, private
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int state);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 68c085ebb0..29b74e7c0d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -221,7 +221,7 @@ void CalculatorWidget::on_backspaceBtn_clicked()
 void CalculatorWidget::on_radiansBtn_toggled(bool checked)
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -433,7 +433,7 @@ void CalculatorWidget::filterNeedsInputParameters(AbstractFilter* filter)
 void CalculatorWidget::on_applyChangesBtn_clicked()
 {
   equation->setStyleSheet(QString(""));
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 
   QPointer<QtSFaderWidget> faderWidget = new QtSFaderWidget(applyChangesBtn);
   setFaderWidget(faderWidget);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index 2566c6c425..f0d3dd55af 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -71,7 +71,7 @@ class SVWidgetsLib_EXPORT CalculatorWidget : public FilterParameterWidget, priva
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -82,7 +82,7 @@ public slots:
 
   void hideButton();
 
-protected slots:
+protected Q_SLOTS:
   void printUnaryButtonName();
   void printButtonName();
   void printActionName();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index a80f9105c2..5d660a5090 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -122,13 +122,13 @@ void ChoiceWidget::widgetChanged(int index, bool emitParametersChanged)
   LinkedChoicesFilterParameter* lnkedChoices = dynamic_cast<LinkedChoicesFilterParameter*>(fp);
   if(lnkedChoices != nullptr)
   {
-    emit conditionalPropertyChanged(index);
+    Q_EMIT conditionalPropertyChanged(index);
   }
 
   // We emit no matter what
   if(emitParametersChanged)
   {
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
index 57a93d4b9a..c8f3812093 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
@@ -76,13 +76,13 @@ class SVWidgetsLib_EXPORT ChoiceWidget : public FilterParameterWidget, private U
 
   int getCurrentIndex();
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int index, bool emitParametersChanged = true);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
   void afterPreflight();                                   // Called just after the dataCheck() is called.
 
-signals:
+Q_SIGNALS:
   void conditionalPropertyChanged(int);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
index e3365e32c2..0d026ca609 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
@@ -120,7 +120,7 @@ void ComparisonContainerWidget::unionOperatorChanged(int unionOp)
   if(nullptr != m_comparisonWidget)
   {
     m_comparisonWidget->getComparison()->setUnionOperator(unionOp);
-    emit comparisonChanged();
+    Q_EMIT comparisonChanged();
   }
 }
 
@@ -249,7 +249,7 @@ void ComparisonContainerWidget::deleteItem()
   if(m_comparisonSetWidget != nullptr)
   {
     m_comparisonSetWidget->updateItems();
-    emit m_comparisonSetWidget->comparisonChanged();
+    Q_EMIT m_comparisonSetWidget->comparisonChanged();
 
     m_comparisonSetWidget->update();
     QCoreApplication::processEvents();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
index c47c34523b..8f7b8e08cf 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
@@ -127,13 +127,13 @@ class SVWidgetsLib_EXPORT ComparisonContainerWidget : public QFrame, private Ui:
    */
   void setupGui();
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief Delete this and remove the comparison from the current ComparisonSet
    */
   void deleteItem();
 
-signals:
+Q_SIGNALS:
   /**
    * @brief Signifies that the comparison stored has changed
    */
@@ -161,7 +161,7 @@ public slots:
    */
   void mouseReleaseEvent(QMouseEvent* event) override;
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief Union operator has been changed in the UI and needs to update the comparison
    * @param unionOp New union operator
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index bbd195d493..dee232a6cd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -207,7 +207,7 @@ void ComparisonSelectionAdvancedWidget::on_conditionalCB_stateChanged(int state)
   linkLeft->setVisible(boolProp);
   linkRight->setVisible(boolProp);
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 
 }
@@ -257,7 +257,7 @@ void ComparisonSelectionAdvancedWidget::widgetChanged(const QString& text)
 {
   Q_UNUSED(text)
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -418,7 +418,7 @@ void ComparisonSelectionAdvancedWidget::attributeMatrixSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index c7644c4942..5c42e9a399 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -78,7 +78,7 @@ class ComparisonSelectionAdvancedWidget : public FilterParameterWidget, private
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief beforePreflight
    */
@@ -140,7 +140,7 @@ public slots:
    */
   void presetAttributeMatrix(DataArrayPath path);
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief widgetChanged
    * @param text
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
index 3cd284b29d..70eea3f3ef 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
@@ -71,7 +71,7 @@ class SVWidgetsLib_EXPORT ComparisonSelectionItemDelegate : public QStyledItemDe
 
   void setModelData(QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const override;
 
-public slots:
+public Q_SLOTS:
   void arrayNameChangedData(int i);
   void operatorChangedData(int i);
   void valueChangedData(const QString& text);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
index d3dc4b3b4b..94e56df2d4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
@@ -266,7 +266,7 @@ bool ComparisonSelectionTableModel::setData(const QModelIndex& index, const QVar
     Q_ASSERT(false);
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -294,7 +294,7 @@ bool ComparisonSelectionTableModel::insertRows(int row, int count, const QModelI
     m_RowCount = m_FeatureNames.count();
   }
   endInsertRows();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -317,7 +317,7 @@ bool ComparisonSelectionTableModel::removeRows(int row, int count, const QModelI
     m_RowCount = m_FeatureNames.count();
   }
   endRemoveRows();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -364,7 +364,7 @@ void ComparisonSelectionTableModel::setTableData(QVector<QString> featureNames,
   endInsertRows();
   QModelIndex topLeft = createIndex(0, 0);
   QModelIndex botRight = createIndex(count - 1, ColumnCount);
-  emit dataChanged(topLeft, botRight);
+  Q_EMIT dataChanged(topLeft, botRight);
 }
 
 // -----------------------------------------------------------------------------
@@ -412,7 +412,7 @@ void ComparisonSelectionTableModel::setTableData(ComparisonInputs& comps)
   endInsertRows();
   QModelIndex topLeft = createIndex(0, 0);
   QModelIndex botRight = createIndex(count - 1, ColumnCount);
-  emit dataChanged(topLeft, botRight);
+  Q_EMIT dataChanged(topLeft, botRight);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index 5d221433b7..b114b41cde 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -177,7 +177,7 @@ void ComparisonSelectionWidget::on_conditionalCB_stateChanged(int state)
   linkLeft->setVisible(boolProp);
   linkRight->setVisible(boolProp);
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 
 }
@@ -257,7 +257,7 @@ void ComparisonSelectionWidget::tableDataWasChanged(const QModelIndex& topLeft,
   Q_UNUSED(topLeft)
   Q_UNUSED(bottomRight)
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -268,7 +268,7 @@ void ComparisonSelectionWidget::widgetChanged(const QString& text)
 {
   Q_UNUSED(text)
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -479,7 +479,7 @@ void ComparisonSelectionWidget::attributeMatrixSelected(const QString& path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 267d1693da..8abb993575 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -114,7 +114,7 @@ class ComparisonSelectionWidget : public FilterParameterWidget, private Ui::Comp
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief beforePreflight
    */
@@ -172,7 +172,7 @@ public slots:
    */
   void populateButtonText();
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief on_addComparison_clicked
    */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
index 7fe95fc9c0..4131891153 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.cpp
@@ -174,7 +174,7 @@ void ComparisonSetWidget::setInverse(int newInverse)
   bool invert = newInverse == Qt::Checked;
   m_comparisonSet->setInvertComparison(invert);
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -244,7 +244,7 @@ void ComparisonSetWidget::addComparisonWidget(AbstractComparison::Pointer compar
 
   connect(comparisonWidget, SIGNAL(comparisonChanged()), this, SIGNAL(comparisonChanged()));
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -286,7 +286,7 @@ void ComparisonSetWidget::updateItems()
 
   m_comparisonSet->setComparisons(updatedChildComparisons);
 
-  // emit comparisonChanged();
+  // Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -365,7 +365,7 @@ void ComparisonSetWidget::dropEvent(QDropEvent* event)
     ownerComparisonSet->updateItems();
   }
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 
   event->acceptProposedAction();
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
index 464e5b90fa..2dbf0dcde6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
@@ -183,7 +183,7 @@ class SVWidgetsLib_EXPORT ComparisonSetWidget : public IComparisonWidget, privat
    */
   void dropEvent(QDropEvent* event) override;
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief Show the context menu at a given point
    * @param pos
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
index 8c50d93680..b7c00ddaea 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.cpp
@@ -96,7 +96,7 @@ void ComparisonValueWidget::dataArrayChanged(int index)
 {
   m_comparisonValue->setAttributeArrayName(arrayNameComboBox->currentText());
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ void ComparisonValueWidget::comparisonOperatorChanged(int index)
 {
   m_comparisonValue->setCompOperator(index);
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -119,7 +119,7 @@ void ComparisonValueWidget::comparisonValueChanged()
   double d = valueSpinBox->text().toDouble(&ok);
   m_comparisonValue->setCompValue(d);
 
-  emit comparisonChanged();
+  Q_EMIT comparisonChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
index 1bfd4d62f4..865df0f8f3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
@@ -101,7 +101,7 @@ class SVWidgetsLib_EXPORT ComparisonValueWidget : public IComparisonWidget, priv
    */
   void setupDataArrayComboBox();
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief Changes the DataArray used by the ComparisonValue
    * @param index Specifies which DataArray name to use
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index a85a8a1026..7f6f27b001 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -88,7 +88,7 @@ void ConstrainedDoubleWidget::setupGui()
 // -----------------------------------------------------------------------------
 void ConstrainedDoubleWidget::widgetChanged(double d)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
index 178327aa8d..5fd75bf99e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT ConstrainedDoubleWidget : public FilterParameterWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(double d);                            // when something in the widget changes
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index c6f995fbaa..628e77ab4a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -88,7 +88,7 @@ void ConstrainedIntWidget::setupGui()
 // -----------------------------------------------------------------------------
 void ConstrainedIntWidget::widgetChanged(int i)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
index 83a92fdc97..c990f15a73 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
@@ -74,7 +74,7 @@ class SVWidgetsLib_EXPORT ConstrainedIntWidget : public FilterParameterWidget, p
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int i);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
index c95d939a19..580b3d8466 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
@@ -69,7 +69,7 @@ class FilterWidgetsLib_EXPORT CustomWidget : public QWidget, private Ui::CustomW
    */
   void setupGui();
 
-public slots:
+public Q_SLOTS:
 
 public:
   CustomWidget(const CustomWidget&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index 533f9847ff..bc0d3c5012 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -207,7 +207,7 @@ void DataArrayCreationWidget::attributeMatrixSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index 92f729dd73..ff23032a9d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -97,14 +97,14 @@ class SVWidgetsLib_EXPORT DataArrayCreationWidget : public FilterParameterWidget
 
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
   void attributeMatrixSelected(QString path);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index c6e0611675..8784b25413 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -183,7 +183,7 @@ void DataArraySelectionWidget::dataArraySelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index 2adea3f4c2..301f04e0cc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -96,14 +96,14 @@ class SVWidgetsLib_EXPORT DataArraySelectionWidget : public FilterParameterWidge
 
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
   void dataArraySelected(QString path);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index 41e1452195..f7f6f43d04 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -152,7 +152,7 @@ void DataContainerArrayProxyWidget::selectAllDataContainersClicked(bool checked)
   applyDataContainerArrayProxy(m_DcaProxy);
   dataContainerList->blockSignals(false);
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -170,7 +170,7 @@ void DataContainerArrayProxyWidget::selectAllAttributeMatricesClicked(bool check
   applyDataContainerProxy();
   attributeMatrixList->blockSignals(false);
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -188,7 +188,7 @@ void DataContainerArrayProxyWidget::selectAllDataArraysClicked(bool checked)
   applyAttributeMatrixProxy();
   dataArrayList->blockSignals(false);
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -208,7 +208,7 @@ void DataContainerArrayProxyWidget::itemChanged(QListWidgetItem* item)
   updateProxyChecked(item);
   item->listWidget()->blockSignals(false);
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index 88a840e096..b6b85ce00d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -84,7 +84,7 @@ class SVWidgetsLib_EXPORT DataContainerArrayProxyWidget : public FilterParameter
   void setFilterParameter(FilterParameter* value);
   FilterParameter* getFilterParameter() const;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -117,7 +117,7 @@ public slots:
 
   void checkAllItems(QListWidget* listWidget, Qt::CheckState state);
 
-protected slots:
+protected Q_SLOTS:
   void selectAllDataContainersClicked(bool checked);
   void selectAllAttributeMatricesClicked(bool checked);
   void selectAllDataArraysClicked(bool checked);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index 2ab18cbda5..bc595262b2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -72,12 +72,12 @@ class SVWidgetsLib_EXPORT DataContainerCreationWidget : public FilterParameterWi
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
index 01afc87da5..51b288bc2b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
@@ -143,7 +143,7 @@ void DataContainerGridModel::setCurrentDepth(int depth)
   m_CurrentDepth = depth;
 
   QModelIndex index;
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
@@ -168,8 +168,8 @@ bool DataContainerGridModel::setData(const QModelIndex& index, const QVariant& v
   {
     SizeVec3Type pos(index.row(), index.column(), m_CurrentDepth);
     m_DCGrid.setDataContainerName(pos, value.toString());
-    emit dataChanged(index, index);
-    emit modelChanged();
+    Q_EMIT dataChanged(index, index);
+    Q_EMIT modelChanged();
     return true;
   }
 
@@ -183,7 +183,7 @@ bool DataContainerGridModel::insertRows(int row, int count, const QModelIndex& i
 {
   beginInsertRows(QModelIndex(), row, row + count - 1);
   endInsertRows();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -198,7 +198,7 @@ bool DataContainerGridModel::removeRows(int row, int count, const QModelIndex& i
   } // No Rows to remove
   beginRemoveRows(QModelIndex(), row, row + count - 1);
   endRemoveRows();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -209,7 +209,7 @@ bool DataContainerGridModel::insertColumns(int col, int count, const QModelIndex
 {
   beginInsertColumns(QModelIndex(), col, col + count - 1);
   endInsertColumns();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -224,7 +224,7 @@ bool DataContainerGridModel::removeColumns(int col, int count, const QModelIndex
   } // No Rows to remove
   beginRemoveColumns(QModelIndex(), col, col + count - 1);
   endRemoveColumns();
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
   return true;
 }
 
@@ -291,8 +291,8 @@ void DataContainerGridModel::setGridData(DataContainerGrid& grid)
   endInsertRows();
   QModelIndex topLeft = createIndex(0, 0);
   QModelIndex botRight = createIndex(rows, cols);
-  emit dataChanged(topLeft, botRight);
-  emit modelChanged();
+  Q_EMIT dataChanged(topLeft, botRight);
+  Q_EMIT modelChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
index 67e97b983d..7580566cc6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
@@ -200,7 +200,7 @@ class SVWidgetsLib_EXPORT DataContainerGridModel : public QAbstractTableModel
    */
   void getGridData(DataContainerGrid& grid);
 
-signals:
+Q_SIGNALS:
   void modelChanged();
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
index e0d941def8..67c463220c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
@@ -89,7 +89,7 @@ class SVWidgetsLib_EXPORT DataContainerGridSelectionWidget : public FilterParame
    */
   void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index 21bcc55f12..e68c08c753 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -346,7 +346,7 @@ void DataContainerReaderWidget::setupGui()
     checkFilePath(m_LineEdit->text());
     blockSignals(false);
 
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   if(getFilterParameter() != nullptr)
@@ -364,7 +364,7 @@ void DataContainerReaderWidget::setupGui()
     checkFilePath(path);
     updateStylingForPath(path);
 
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   }
 }
 
@@ -424,7 +424,7 @@ void DataContainerReaderWidget::itemActivated(const QModelIndex& index)
   updateProxyFromModel();
   m_Filter->setInputFileDataContainerArrayProxy(m_DcaProxy); // Set the new proxy into filter
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -629,7 +629,7 @@ void DataContainerReaderWidget::checkFilePath(const QString& text)
   m_CurrentText = text;
 
   updateDCAProxy(text);
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------
@@ -676,7 +676,7 @@ void DataContainerReaderWidget::updateDCAProxy(const QString& text)
 
       updateModelFromProxy(proxy);
     }
-    emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+    Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
   }
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 474e260318..0b2afc4f40 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -93,7 +93,7 @@ class SVWidgetsLib_EXPORT DataContainerReaderWidget : public FilterParameterWidg
   void setFilterParameter(FilterParameter* value);
   FilterParameter* getFilterParameter() const;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -131,7 +131,7 @@ public slots:
    */
   void setupMenuField();
 
-protected slots:
+protected Q_SLOTS:
 
 private:
   static QString m_OpenDialogLastFilePath;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 24de949fb1..2ec2b67a59 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -200,7 +200,7 @@ void DataContainerSelectionWidget::dataContainerSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index f3680ef967..18f94d10b1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -101,14 +101,14 @@ class SVWidgetsLib_EXPORT DataContainerSelectionWidget : public FilterParameterW
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
   void dataContainerSelected(QString path);
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(const QString& propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index 6e8f5681e1..03abf7f1e1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -96,7 +96,7 @@ void DoubleWidget::setupGui()
 // -----------------------------------------------------------------------------
 void DoubleWidget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
index 17eb70b48d..1777dbceda 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT DoubleWidget : public FilterParameterWidget, private U
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);                  // when something in the widget changes
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index 8872989434..e5bafeb9fb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -158,7 +158,7 @@ void DynamicChoiceWidget::updateComboBox()
 void DynamicChoiceWidget::widgetChanged(int index)
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index d3fa7c8ce2..2cf5c73957 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -77,7 +77,7 @@ class SVWidgetsLib_EXPORT DynamicChoiceWidget : public FilterParameterWidget, pr
   void setFilterParameter(FilterParameter* value);
   FilterParameter* getFilterParameter() const;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int index);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 4ad975b695..8136d3592d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -151,7 +151,7 @@ void DynamicTableWidget::updateButtonStyles()
 void DynamicTableWidget::on_dynamicTable_cellChanged(int /* row */, int /* col */)
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index 27b2e80285..6ee057e91e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -88,7 +88,7 @@ class SVWidgetsLib_EXPORT DynamicTableWidget : public FilterParameterWidget, pri
 
   void updateButtonStyles();
 
-public slots:
+public Q_SLOTS:
   void on_dynamicTable_cellChanged(int row, int col);
   void on_addRowBtn_clicked();
   void on_deleteRowBtn_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index 0ad9a8a17c..a0b77afebd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -88,7 +88,7 @@ FileListInfoWidget::~FileListInfoWidget() = default;
 // -----------------------------------------------------------------------------
 void FileListInfoWidget::setWidgetListEnabled(bool b)
 {
-  foreach(QWidget* w, m_WidgetList)
+  for(QWidget* w : m_WidgetList)
   {
     w->setEnabled(b);
   }
@@ -122,7 +122,7 @@ void FileListInfoWidget::setupGui()
     inputDir_textChanged(m_Ui->inputDir->text());
     blockSignals(false);
 
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   //  validateInputFile();
@@ -153,42 +153,42 @@ void FileListInfoWidget::connectSignalsSlots()
 
   connect(m_Ui->filePrefix, &QtSLineEdit::textChanged, this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->fileSuffix, &QtSLineEdit::textChanged, this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->fileExt, &QtSLineEdit::textChanged, this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->totalDigits, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->startIndex, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->endIndex, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->increment, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   connect(m_Ui->orderAscending, &QRadioButton::toggled, this, [=] {
     generateExampleInputFile();
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 }
 
@@ -382,7 +382,7 @@ void FileListInfoWidget::inputDir_textChanged(const QString& text)
     m_Ui->fileListView->clear();
   }
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -507,7 +507,7 @@ void FileListInfoWidget::findMaxSliceAndPrefix()
   int digitEnd = 0;
   int totalOimFilesFound = 0;
   int minTotalDigits = 1000;
-  foreach(QFileInfo fi, angList)
+  for(QFileInfo fi : angList)
   {
     if((fi.suffix().compare(ext) != 0) && fi.isFile())
     {
@@ -573,7 +573,7 @@ void FileListInfoWidget::findMaxSliceAndPrefix()
 void FileListInfoWidget::widgetChanged(const QString& text)
 {
   Q_UNUSED(text)
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -584,7 +584,7 @@ void FileListInfoWidget::filterNeedsInputParameters(AbstractFilter* filter)
   if(nullptr == filter)
   {
     QString ss = QObject::tr("Error Setting FileListStack Gui values to Filter instance. Filter instance was nullptr.").arg(getFilterParameter()->getPropertyName());
-    emit errorSettingFilterParameter(ss);
+    Q_EMIT errorSettingFilterParameter(ss);
     return;
   }
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 05610fc05c..0821e83534 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -77,13 +77,13 @@ class SVWidgetsLib_EXPORT FileListInfoWidget : public FilterParameterWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
 
   // Slots to catch signals emitted by the various ui widgets
   void inputDirBtn_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index f68ed1d212..66ae789cbc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -124,7 +124,7 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
 
   virtual void changeStyleSheet(Style style);
 
-signals:
+Q_SIGNALS:
   void filterPath(DataArrayPath path);
   void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
   void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
@@ -141,7 +141,7 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
   void errorSettingFilterParameter(const QString& msg);
   void parametersChanged(bool preflight = true);
 
-public slots:
+public Q_SLOTS:
 
   void setLinkedConditionalState(int state);
   void setLinkedComboBoxState(int groupId);
@@ -167,7 +167,7 @@ public slots:
    */
   QPoint adjustedMenuPosition(QToolButton* pushButton);
 
-protected slots:
+protected Q_SLOTS:
   void showBorder();
   void hideBorder();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index 462a27b162..18c30c9eec 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -137,7 +137,7 @@ void FloatVec2Widget::widgetChanged(QLineEdit* le, const QString& msg)
     SVStyle::Instance()->LineEditClearStyle(le);
   }
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index 29c4ef5ed7..a33c8c3d3b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT FloatVec2Widget : public FilterParameterWidget, privat
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
   void afterPreflight();                                   // Called just after the dataCheck() is called.
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index 332913d065..2313d94a61 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -148,7 +148,7 @@ void FloatVec3Widget::widgetChanged(QLineEdit* le, const QString& msg)
     SVStyle::Instance()->LineEditClearStyle(le);
   }
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
index 40be854e58..62d4ad4109 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
@@ -73,7 +73,7 @@ class SVWidgetsLib_EXPORT FloatVec3Widget : public FilterParameterWidget, privat
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
   void afterPreflight();                                   // Called just after the dataCheck() is called.
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index b9bf4d68d0..de40ad1379 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -95,7 +95,7 @@ void FloatWidget::setupGui()
 // -----------------------------------------------------------------------------
 void FloatWidget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
index e2b7153727..1a87f089c6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT FloatWidget : public FilterParameterWidget, private Ui
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);                  // when something in the widget changes
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index f0fd0db16d..b4b9d321ac 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -141,7 +141,7 @@ void FourthOrderPolynomialWidget::widgetChanged(const QString& text)
   FOPW_CHECK_LINEEDIT(c01)
   FOPW_CHECK_LINEEDIT(c00)
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
index 6e4c6a03b7..b43c73aa00 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT FourthOrderPolynomialWidget : public FilterParameterWi
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
index f68d681b4d..0168a860dc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
@@ -171,7 +171,7 @@ void GenerateColorTableWidget::presetSelected(const QJsonObject& preset, const Q
   imageLabel->setPixmap(pixmap);
   imageLabel->show();
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index f57dbf0c7f..d19d2f5cdc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -89,12 +89,12 @@ class SVWidgetsLib_EXPORT GenerateColorTableWidget : public FilterParameterWidge
   void setFilterParameter(FilterParameter* value);
   FilterParameter* getFilterParameter() const;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
   void on_choosePresetBtn_clicked();
 
   void presetSelected(const QJsonObject& preset, const QPixmap& pixmap);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
index d5d24b1255..c4f8a8366d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
@@ -98,7 +98,7 @@ class SVWidgetsLib_EXPORT IComparisonWidget : public QWidget
    */
   virtual void renameDataArrayPath(DataArrayPath::RenameType renamePath) = 0;
 
-signals:
+Q_SIGNALS:
   /**
    * @brief Specifies that the comparison used by the widget has changed
    */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
index e6cd141a42..935bbfcc98 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.cpp
@@ -166,7 +166,7 @@ void ImportHDF5DatasetWidget::setupGui()
     on_value_returnPressed();
     blockSignals(false);
 
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   });
 
   // Allow the widget to fill the entire FilterInputWidget space
@@ -400,7 +400,7 @@ void ImportHDF5DatasetWidget::on_selectBtn_clicked()
   if(initWithFile(file))
   {
     value->setText(file);
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
   }
 
   // Store the last used directory into the private instance variable
@@ -449,7 +449,7 @@ void ImportHDF5DatasetWidget::dropEvent(QDropEvent* e)
     m_OpenDialogLastDirectory = parent.dirName();
     if(initWithFile(file))
     {
-      emit parametersChanged();
+      Q_EMIT parametersChanged();
     }
   }
 }
@@ -545,7 +545,7 @@ void ImportHDF5DatasetWidget::on_cDimsLE_valueChanged(const QString& text)
 {
   m_ComponentDimsMap.insert(QString::fromStdString(m_CurrentHDFDataPath), text);
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -1175,7 +1175,7 @@ void ImportHDF5DatasetWidget::setValue(const QString& text)
     QFileInfo fi(file);
     m_OpenDialogLastDirectory = fi.path();
     setErrorText("");
-    emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+    Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
   }
   errorLabel->update();
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
index 5a71ce6278..bbbae8a91d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ImportHDF5DatasetWidget.h
@@ -73,7 +73,7 @@ class SVWidgetsLib_EXPORT ImportHDF5DatasetWidget : public FilterParameterWidget
   void setIcon(const QPixmap& path);
   QPixmap getIcon();
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -153,10 +153,10 @@ public slots:
    */
   QString getErrorText() const;
 
-protected slots:
+protected Q_SLOTS:
   void on_cDimsLE_valueChanged(const QString& text);
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief Slot to catch events when the DataRecord TreeView selection is changed
    * @param current The currently selected Index
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index c23c29c3c5..1694562ed2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -88,5 +88,5 @@ void InputFileWidget::selectInputFile()
   on_m_LineEdit_editingFinished();
 
   //  filterNeedsInputParameters(getFilter());
-  // emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  // Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
index 5cf5db8440..68a4450712 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
@@ -67,7 +67,7 @@ class SVWidgetsLib_EXPORT InputFileWidget : public AbstractIOFileWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void selectInputFile();
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
index 7f7065aaf5..e929265309 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
@@ -68,7 +68,7 @@ class SVWidgetsLib_EXPORT InputPathWidget : public AbstractIOFileWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void selectInputPath();
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 5b4b228f11..0d04622cfa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -94,7 +94,7 @@ void IntVec2Widget::setupGui()
 // -----------------------------------------------------------------------------
 void IntVec2Widget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
index e67c08cef9..e95a32acfc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
@@ -69,7 +69,7 @@ class SVWidgetsLib_EXPORT IntVec2Widget : public FilterParameterWidget, private
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index 4716fc2af4..dac2039aba 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -100,7 +100,7 @@ void IntVec3Widget::setupGui()
 // -----------------------------------------------------------------------------
 void IntVec3Widget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
index dd141f712b..bf065403a1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT IntVec3Widget : public FilterParameterWidget, private
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 7b0b221940..0a22ecb659 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -96,7 +96,7 @@ void IntWidget::setupGui()
 // -----------------------------------------------------------------------------
 void IntWidget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
index c3a23418b2..b28d775188 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
@@ -74,7 +74,7 @@ class SVWidgetsLib_EXPORT IntWidget : public FilterParameterWidget, private Ui::
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 99eac619b0..8701f06ea0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -88,7 +88,7 @@ void LinkedBooleanWidget::setupGui()
 void LinkedBooleanWidget::updateLinkedWidgets()
 {
   int state = value->checkState();
-  emit conditionalPropertyChanged(state);
+  Q_EMIT conditionalPropertyChanged(state);
 }
 
 // -----------------------------------------------------------------------------
@@ -105,8 +105,8 @@ int LinkedBooleanWidget::getLinkedState()
 void LinkedBooleanWidget::widgetChanged(int state)
 {
   // Let the other widgets that this widget is linked to know that the state changed.
-  emit conditionalPropertyChanged(state);
-  emit parametersChanged();
+  Q_EMIT conditionalPropertyChanged(state);
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
index a71ddb818e..d72bef6297 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
@@ -79,13 +79,13 @@ class SVWidgetsLib_EXPORT LinkedBooleanWidget : public FilterParameterWidget, pr
 
   int getLinkedState();
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int state);
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-signals:
+Q_SIGNALS:
   void conditionalPropertyChanged(int state);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 83876e3296..3e6e817fb0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -138,7 +138,7 @@ void LinkedDataContainerSelectionWidget::widgetChanged()
     index = static_cast<int32_t>(igeom->getGeometryType());
   }
 
-  emit conditionalPropertyChanged(index);
+  Q_EMIT conditionalPropertyChanged(index);
 }
 
 // -----------------------------------------------------------------------------
@@ -246,7 +246,7 @@ void LinkedDataContainerSelectionWidget::dataContainerSelected(QString path)
 
   m_DidCausePreflight = true;
   widgetChanged();
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
index 9d99ae6a96..86cc395998 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
@@ -101,14 +101,14 @@ class SVWidgetsLib_EXPORT LinkedDataContainerSelectionWidget : public FilterPara
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged();
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
   void dataContainerSelected(QString path);
 
-signals:
+Q_SIGNALS:
   void conditionalPropertyChanged(int);
 
 protected:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
index bef7755ea1..020bd2ca03 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
@@ -84,7 +84,7 @@ class SVWidgetsLib_EXPORT LinkedPathCreationWidget : public FilterParameterWidge
    */
   int getDataTypei() const;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index 87964f2c7f..cb9c204b02 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -197,7 +197,7 @@ QIcon MontageSelectionWidget::getDcIcon(const QString& dcName) const
 void MontageSelectionWidget::causePreflight()
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
index 8804a05bd5..161fefbdd1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
@@ -66,7 +66,7 @@ class SVWidgetsLib_EXPORT MontageSelectionWidget : public FilterParameterWidget
    */
   MontageSelection getMontageSelection() const;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
index 893f706c60..2c560f0966 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
@@ -166,7 +166,7 @@ void MontageStructureSelectionWidget::setMontageName(const QString& montage)
   m_Ui->montageSelectionComboBox->setCurrentText(montage);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
index ba24e7ea33..9f3baca9ac 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
@@ -92,7 +92,7 @@ class SVWidgetsLib_EXPORT MontageStructureSelectionWidget : public FilterParamet
    */
   void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index c95275c4a0..5f4413eaf9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -217,7 +217,7 @@ void MultiAttributeMatrixSelectionWidget::dataContainerSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -266,7 +266,7 @@ void MultiAttributeMatrixSelectionWidget::on_selectBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -292,7 +292,7 @@ void MultiAttributeMatrixSelectionWidget::on_deselectBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -311,7 +311,7 @@ void MultiAttributeMatrixSelectionWidget::on_upBtn_clicked()
     attributeMatricesOrderWidget->setCurrentRow(currentIndex - 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -330,7 +330,7 @@ void MultiAttributeMatrixSelectionWidget::on_downBtn_clicked()
     attributeMatricesOrderWidget->setCurrentRow(currentIndex + 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -354,7 +354,7 @@ void MultiAttributeMatrixSelectionWidget::on_removeBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index cf596baf24..9472b2cab8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -103,14 +103,14 @@ class SVWidgetsLib_EXPORT MultiAttributeMatrixSelectionWidget : public FilterPar
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
   void dataContainerSelected(QString path);
 
-protected slots:
+protected Q_SLOTS:
   void on_upBtn_clicked();
   void on_downBtn_clicked();
   void on_selectBtn_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index b0bf359423..6d1fd8d417 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -224,7 +224,7 @@ void MultiDataArraySelectionWidget::setSelectedPath(const DataArrayPath& amPath)
   availableArraysListWidget->clear();
   selectedArraysListWidget->clear();
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -265,7 +265,7 @@ void MultiDataArraySelectionWidget::on_selectBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -276,14 +276,14 @@ void MultiDataArraySelectionWidget::on_selectBtn_clicked()
 void MultiDataArraySelectionWidget::on_deselectBtn_clicked()
 {
   QList<QListWidgetItem*> items = selectedArraysListWidget->selectedItems();
-  foreach(QListWidgetItem* item, items)
+  for(QListWidgetItem* item : items)
   {
     int row = selectedArraysListWidget->row(item);
     selectedArraysListWidget->takeItem(row);
     availableArraysListWidget->addItem(item);
   }
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -301,7 +301,7 @@ void MultiDataArraySelectionWidget::on_upBtn_clicked()
     selectedArraysListWidget->setCurrentRow(currentIndex - 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -320,7 +320,7 @@ void MultiDataArraySelectionWidget::on_downBtn_clicked()
     selectedArraysListWidget->setCurrentRow(currentIndex + 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -344,7 +344,7 @@ void MultiDataArraySelectionWidget::on_removeBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index cfa098d1d9..0158f231df 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -103,12 +103,12 @@ class SVWidgetsLib_EXPORT MultiDataArraySelectionWidget : public FilterParameter
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
   void on_upBtn_clicked();
   void on_downBtn_clicked();
   void on_selectBtn_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index 3b74935c57..d14b9e0f60 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -211,7 +211,7 @@ void MultiDataContainerSelectionWidget::on_selectBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -223,14 +223,14 @@ void MultiDataContainerSelectionWidget::on_deselectBtn_clicked()
 {
   // QModelIndexList indexList = selectedDataContainersListWidget->selectionModel()->selectedRows();
   QList<QListWidgetItem*> items = selectedDataContainersListWidget->selectedItems();
-  foreach(QListWidgetItem* item, items)
+  for(QListWidgetItem* item : items)
   {
     int row = selectedDataContainersListWidget->row(item);
     selectedDataContainersListWidget->takeItem(row);
     availableDataContainersListWidget->addItem(item);
   }
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -248,7 +248,7 @@ void MultiDataContainerSelectionWidget::on_upBtn_clicked()
     selectedDataContainersListWidget->setCurrentRow(currentIndex - 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -267,7 +267,7 @@ void MultiDataContainerSelectionWidget::on_downBtn_clicked()
     selectedDataContainersListWidget->setCurrentRow(currentIndex + 1);
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
@@ -291,7 +291,7 @@ void MultiDataContainerSelectionWidget::on_removeBtn_clicked()
     }
 
     m_DidCausePreflight = true;
-    emit parametersChanged();
+    Q_EMIT parametersChanged();
     m_DidCausePreflight = false;
   }
 }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index e8e59b1a5e..778437c86d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -103,12 +103,12 @@ class SVWidgetsLib_EXPORT MultiDataContainerSelectionWidget : public FilterParam
    */
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
   void on_upBtn_clicked();
   void on_downBtn_clicked();
   void on_selectBtn_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
index e72e238bc3..0e1753d4de 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
@@ -77,7 +77,7 @@ class SVWidgetsLib_EXPORT MultiInputFileWidget : public FilterParameterWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void selectMultiInputFile();
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index 5e28380e04..7ed336f7cd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -90,7 +90,7 @@ void NumericTypeWidget::setupGui()
 // -----------------------------------------------------------------------------
 void NumericTypeWidget::widgetChanged(int index)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
index 25b034cc50..b9c8a37848 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT NumericTypeWidget : public FilterParameterWidget, priv
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int index);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
index 5e8bf0a36b..fb9801359b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
@@ -65,7 +65,7 @@ class SVWidgetsLib_EXPORT OutputFileWidget : public AbstractIOFileWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void selectOutputFile();
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
index b35b36f170..f3ed6da241 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
@@ -65,7 +65,7 @@ class SVWidgetsLib_EXPORT OutputPathWidget : public AbstractIOFileWidget
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void selectOutputPath();
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
index 4d49347f4f..bae028fd97 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ParagraphWidget.h
@@ -70,12 +70,12 @@ class SVWidgetsLib_EXPORT ParagraphWidget : public FilterParameterWidget, privat
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-signals:
+Q_SIGNALS:
 
 private:
   bool m_DidCausePreflight;
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index 5eb65dcffd..e6e52a9b63 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -165,7 +165,7 @@ void PhaseTypeSelectionWidget::attributeMatrixSelected(QString path)
   setSelectedPath(path);
 
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -206,7 +206,7 @@ void PhaseTypeSelectionWidget::updateDataArrayPath(QString propertyName, const D
 void PhaseTypeSelectionWidget::attributeMatrixUpdated()
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
@@ -299,7 +299,7 @@ void PhaseTypeSelectionWidget::updatePhaseComboBoxes()
 void PhaseTypeSelectionWidget::phaseTypeComboBoxChanged(int index)
 {
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index c0a8166bbf..3e33054c05 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -90,7 +90,7 @@ class SVWidgetsLib_EXPORT PhaseTypeSelectionWidget : public FilterParameterWidge
 
   bool eventFilter(QObject* obj, QEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
@@ -105,7 +105,7 @@ public slots:
 
   void resetPhaseComboBoxes();
 
-protected slots:
+protected Q_SLOTS:
   void updateDataArrayPath(QString propertyName, const DataArrayPath::RenameType& renamePath);
 
 private:
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
index f1f0b41850..8b61613483 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT PreflightUpdatedValueWidget : public FilterParameterWi
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index a1177205e7..8136952be4 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -107,7 +107,7 @@ void RangeWidget::afterPreflight()
 // -----------------------------------------------------------------------------
 void RangeWidget::on_minValue_textChanged(const QString& text)
 {
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ void RangeWidget::on_minValue_textChanged(const QString& text)
 // -----------------------------------------------------------------------------
 void RangeWidget::on_maxValue_textChanged(const QString& text)
 {
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index 1158ad668e..cab12fb7c9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -71,7 +71,7 @@ class SVWidgetsLib_EXPORT RangeWidget : public FilterParameterWidget, private Ui
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 8936ce77ed..49ee679bb6 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -205,7 +205,7 @@ void ReadASCIIDataWidget::on_editImportSettings_clicked()
       tupleDimsLabel->show();
       tupleDims->show();
 
-      emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+      Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
     }
     m_ImportWizard->setEditSettings(false);
   }
@@ -392,7 +392,7 @@ void ReadASCIIDataWidget::lineCountDidFinish()
 {
   // This is needed to reset the DataContainer Array into a state that would
   // represent it before this filter runs.
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 
   loadingProgress->setText("0%");
   loadingProgress->hide();
@@ -433,7 +433,7 @@ void ReadASCIIDataWidget::lineCountDidFinish()
     tupleDims->show();
     editImportSettings->show();
 
-    emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+    Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
   }
 }
 
@@ -455,7 +455,7 @@ void ReadASCIIDataWidget::on_resetWizardBtn_clicked()
   tupleDimsLabel->hide();
   editImportSettings->hide();
 
-  emit parametersChanged(); // This should force the preflight to run because we are emitting a signal
+  Q_EMIT parametersChanged(); // This should force the preflight to run because we are emitting a signal
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
index feb59ac2d6..9d3f74fb28 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
@@ -69,12 +69,12 @@ class SVWidgetsLib_EXPORT ReadASCIIDataWidget : public FilterParameterWidget, pr
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
   void on_importFileBtn_clicked();
   void on_resetWizardBtn_clicked();
   void on_editImportSettings_clicked();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index 65c048999b..b114edfe45 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -89,7 +89,7 @@ void ScalarTypeWidget::setupGui()
 // -----------------------------------------------------------------------------
 void ScalarTypeWidget::widgetChanged(int index)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
index 50f7e2da8d..dcec4edeff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT ScalarTypeWidget : public FilterParameterWidget, priva
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(int index);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index f399ba3786..876adc0e4e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -121,7 +121,7 @@ void SecondOrderPolynomialWidget::widgetChanged(const QString& text)
   FOPW_CHECK_LINEEDIT(c01)
   FOPW_CHECK_LINEEDIT(c00)
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
index 21f8619fc5..fb2938cac2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT SecondOrderPolynomialWidget : public FilterParameterWi
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
index d7432ead14..dd28dbb0e3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT SeparatorWidget : public FilterParameterWidget, privat
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index fa036caa72..ad9b47b00a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -250,7 +250,7 @@ void ShapeTypeSelectionWidget::comboboxChanged(int index)
 {
   Q_UNUSED(index)
   m_DidCausePreflight = true;
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
   m_DidCausePreflight = false;
 }
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
index 623d1f37a1..9570f5f98d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
@@ -77,7 +77,7 @@ class SVWidgetsLib_EXPORT ShapeTypeSelectionWidget : public FilterParameterWidge
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
index 99a718d084..4e2d156b29 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT StringWidget : public FilterParameterWidget, private U
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void beforePreflight();
   void afterPreflight();
   void filterNeedsInputParameters(AbstractFilter* filter);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index a29c9e13e4..8937cf9699 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -125,7 +125,7 @@ void ThirdOrderPolynomialWidget::widgetChanged(const QString& text)
   FOPW_CHECK_LINEEDIT(c01)
   FOPW_CHECK_LINEEDIT(c00)
 
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
index d6e4dafacd..6124c453e5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT ThirdOrderPolynomialWidget : public FilterParameterWid
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void filterNeedsInputParameters(AbstractFilter* filter); // When the filter is ready for us to update its input parameter(s) that we are responsible for
   void beforePreflight();                                  // Called just before the "dataCheck()" is called
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 9658ed8fcc..344057a355 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -94,7 +94,7 @@ void UInt64Widget::setupGui()
 // -----------------------------------------------------------------------------
 void UInt64Widget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
index 83cb8302fd..7cd0932eeb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
@@ -72,7 +72,7 @@ class SVWidgetsLib_EXPORT UInt64Widget : public FilterParameterWidget, private U
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
index 5cf71debf6..70f592c78d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
@@ -80,7 +80,7 @@ void UnknownWidget::setupGui()
 // -----------------------------------------------------------------------------
 void UnknownWidget::widgetChanged(const QString& text)
 {
-  emit parametersChanged();
+  Q_EMIT parametersChanged();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
index 44ef150552..fd477088bb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
@@ -71,7 +71,7 @@ class SVWidgetsLib_EXPORT UnknownWidget : public FilterParameterWidget, private
    */
   void setupGui() override;
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void beforePreflight();
   void afterPreflight();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
index e70719c141..30518bbe85 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
@@ -73,7 +73,7 @@ class SVWidgetsLib_EXPORT QtSApplicationAboutBoxDialog : public QDialog, private
    */
   void setLicenseFiles(QStringList files);
 
-protected slots:
+protected Q_SLOTS:
   void on_licenseCombo_currentIndexChanged(int index);
   
   void on_okButton_clicked();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
index f9f1cc8acc..b7719a62e8 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
@@ -52,7 +52,7 @@ class SVWidgetsLib_EXPORT QtSBookmarkMissingDialog : public QDialog, private Ui:
 
   void setBookmarkName(QString name);
 
-protected slots:
+protected Q_SLOTS:
   void on_locateBtn_clicked();
   void on_cancelBtn_clicked();
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
index fe6b259675..a4569a4e2f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
@@ -62,7 +62,7 @@ void QtSCheckboxDialog::setupGui()
 
   QVBoxLayout* verticalLayout_2 = new QVBoxLayout(this);
 
-  foreach(QString str, m_List)
+  for(QString str : m_List)
   {
     QCheckBox* cb = new QCheckBox(this);
     cb->setText(str);
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
index 0dab1adbec..239f99ec45 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.cpp
@@ -151,7 +151,7 @@ void QtSDisclosableWidget::disclose(bool on)
   }
 
   QObjectList objs = children();
-  foreach(QObject* obj, objs)
+  for(QObject* obj : objs)
   {
     QWidget* w = qobject_cast<QWidget*>(obj);
     if(nullptr != w)
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
index 7ab26e1c04..3edeabc98e 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDisclosableWidget.h
@@ -70,10 +70,10 @@ class SVWidgetsLib_EXPORT QtSDisclosableWidget : public QWidget
 
   void setTitle(const QString& title);
 
-signals:
+Q_SIGNALS:
   void dragStarted(QtSDisclosableWidget* widget);
 
-public slots:
+public Q_SLOTS:
   //  void disclose(bool on);
 
   /**
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
index da234cd712..337665394b 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
@@ -83,7 +83,7 @@ void QtSDroppableScrollArea::dropEvent(QDropEvent* event)
     QByteArray dropData = event->mimeData()->data("text/plain");
     QString name(dropData);
     //  qDebug() << "name: " << name() << "\n";
-    emit filterDropped(name);
+    Q_EMIT filterDropped(name);
   }
 
   //  event->acceptProposedAction();
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
index ca05ec3609..5a91fdb052 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
@@ -53,7 +53,7 @@ class SVWidgetsLib_EXPORT QtSDroppableScrollArea : public QScrollArea
   void dropEvent(QDropEvent* event) override;
   void dragMoveEvent(QDragMoveEvent* event) override;
 
-signals:
+Q_SIGNALS:
   void filterDropped(QString filter);
 
 private:
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
index 905c471bc6..fbdb159908 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
@@ -133,7 +133,7 @@ void QtSFSDropLabel::dropEvent(QDropEvent* event)
       fName = QDir::toNativeSeparators(fName);
       info.setFile(fName); // information about file
       setText(fName);      // if is file, setText
-      emit fileDropped(fName);
+      Q_EMIT fileDropped(fName);
     }
   }
   changeStyleSheet(FS_STANDARD_STYLE);
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
index 68fc93729e..62954c43d5 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
@@ -65,7 +65,7 @@ class SVWidgetsLib_EXPORT QtSFSDropLabel : public QLabel
   void dragLeaveEvent(QDragLeaveEvent* event) override;
   void changeStyleSheet(int style);
 
-signals:
+Q_SIGNALS:
   void fileDropped(const QString& file);
 
 private:
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
index 72a29234ac..125c4fabc8 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
@@ -124,7 +124,7 @@ void QtSFSDropLineEdit::dropEvent(QDropEvent* event)
       fName = QDir::toNativeSeparators(fName);
       info.setFile(fName); // information about file
       setText(fName);      // if is file, setText
-      emit fileDropped(fName);
+      Q_EMIT fileDropped(fName);
     }
   }
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
index 4d18a10312..617bddff76 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
@@ -66,7 +66,7 @@ class SVWidgetsLib_EXPORT QtSFSDropLineEdit : public QLineEdit
 
   void changeStyleSheet(int style);
 
-signals:
+Q_SIGNALS:
   void fileDropped(const QString& file);
 
 private:
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.cpp
index 563a2be46b..f47366daf4 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.cpp
@@ -136,6 +136,6 @@ void QtSFaderWidget::paintEvent(QPaintEvent* /* event */)
   {
     timer->stop();
     close();
-    emit animationComplete();
+    Q_EMIT animationComplete();
   }
 }
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
index 1739b22522..8472a57139 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFaderWidget.h
@@ -64,7 +64,7 @@ class SVWidgetsLib_EXPORT QtSFaderWidget : public QWidget
 
   void start();
 
-signals:
+Q_SIGNALS:
   void animationComplete();
 
 protected:
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
index 79413baf67..9a8ea4039e 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
@@ -60,7 +60,7 @@ class SVWidgetsLib_EXPORT QtSFileDragMessageBox : public QDialog, private Ui::Qt
 
   bool isExtractPipelineBtnChecked();
 
-protected slots:
+protected Q_SLOTS:
   void on_okBtn_clicked();
   void on_cancelBtn_clicked();
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
index dfc0b41c00..6ae5cefa9b 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileUtils.cpp
@@ -126,7 +126,7 @@ QStringList QtSFileUtils::GetEnvVar(const QString& envVar)
 QString QtSFileUtils::FindInPath(const QString& exe)
 {
   QStringList paths = QtSFileUtils::GetEnvVar("PATH");
-  foreach(const QString& p, paths)
+  for(const QString& p : paths)
   {
     QFileInfo fi(p + QDir::separator() + exe);
     if(fi.exists())
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
index 58a6fd0a3a..c032f34a32 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
@@ -377,7 +377,7 @@ void QtSGraphicsView::loadBaseImageFile(const QString& filename)
   gScene->setSceneRect(rect);
   centerOn(m_ImageGraphicsItem);
   this->updateDisplay();
-  emit fireBaseImageFileLoaded(filename);
+  Q_EMIT fireBaseImageFileLoaded(filename);
 }
 
 
@@ -396,7 +396,7 @@ void QtSGraphicsView::loadOverlayImageFile(const QString& filename)
 
   m_ImageDisplayType = EmMpm_Constants::CompositedImage;
   setOverlayImage(m_OverlayImage);
-  emit fireOverlayImageFileLoaded(filename);
+  Q_EMIT fireOverlayImageFileLoaded(filename);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
index e58c8f806d..1b3a87e90f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
@@ -131,7 +131,7 @@ class SVWidgetsLib_EXPORT QtSGraphicsView : public QGraphicsView
   void updateColorTables(QVector<QRgb> colorTable);
   void useCustomColorTable(bool b);
 
-public slots:
+public Q_SLOTS:
   void zoomIn();
 
   void zoomOut();
@@ -146,7 +146,7 @@ public slots:
 
   void updateDisplay();
 
-signals:
+Q_SIGNALS:
   void fireBaseImageFileLoaded(const QString& filename);
   void fireOverlayImageFileLoaded(const QString& filename);
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
index bf2b3b6a89..52b58a4aa1 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
@@ -138,7 +138,7 @@ class SVWidgetsLib_EXPORT QtSImageGraphicsDelegate : public QObject
    */
   void resetCaches();
 
-public slots:
+public Q_SLOTS:
   void on_parentResized();
 
   /**
@@ -158,7 +158,7 @@ public slots:
 
   //  void compositeWithImage(QImage* image, bool update = true);
 
-public slots:
+public Q_SLOTS:
   void setClearMode()
   {
     m_composition_mode = QPainter::CompositionMode_Clear;
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
index b4f4f01893..f311ca85b1 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.cpp
@@ -275,14 +275,14 @@ void QtSLineEdit::iconClicked()
   }
   else
   {
-    emit buttonClicked((Side)index);
+    Q_EMIT buttonClicked((Side)index);
     if(index == Left)
     {
-      emit leftButtonClicked();
+      Q_EMIT leftButtonClicked();
     }
     else if(index == Right)
     {
-      emit rightButtonClicked();
+      Q_EMIT rightButtonClicked();
     }
   }
 }
@@ -377,7 +377,7 @@ void QtSLineEdit::dropEvent(QDropEvent* event)
       fName = QDir::toNativeSeparators(fName);
       info.setFile(fName); // information about file
       setText(fName);      // if is file, setText
-      emit fileDropped(fName);
+      Q_EMIT fileDropped(fName);
     }
   }
 
@@ -389,7 +389,7 @@ void QtSLineEdit::dropEvent(QDropEvent* event)
 // -----------------------------------------------------------------------------
 void QtSLineEdit::keyPressEvent(QKeyEvent* event)
 {
-  emit keyPressed(event);
+  Q_EMIT keyPressed(event);
   QLineEdit::keyPressEvent(event);
 }
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
index c07182d2e2..3bad971d43 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSLineEdit.h
@@ -137,7 +137,7 @@ class SVWidgetsLib_EXPORT QtSLineEdit : public SVLineEdit
   void dragEnterEvent(QDragEnterEvent* event) override;
   void dropEvent(QDropEvent* event) override;
 
-signals:
+Q_SIGNALS:
   void buttonClicked(QtSLineEdit::Side side);
   void leftButtonClicked();
   void rightButtonClicked();
@@ -145,7 +145,7 @@ class SVWidgetsLib_EXPORT QtSLineEdit : public SVLineEdit
 
   void keyPressed(QKeyEvent* event);
 
-private slots:
+private Q_SLOTS:
   void checkButtons(const QString&);
   void iconClicked();
 
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
index 7456ae5e5e..e866a173bd 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -128,7 +128,7 @@ class SVWidgetsLib_EXPORT QtSPluginFrame : public QFrame
    */
   virtual void displayDialogBox(QString title, QString text, QMessageBox::Icon icon);
 
-signals:
+Q_SIGNALS:
 
   /**
    * @brief Signal emitted when a process is started
@@ -152,7 +152,7 @@ class SVWidgetsLib_EXPORT QtSPluginFrame : public QFrame
   void pipelineWarningMessage(const QString&);
   void pipelineErrorMessage(const QString&);
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief Slot to add a message to display to the user
    * @param message
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
index 4cf0364d06..5f60dc6d62 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
@@ -111,7 +111,7 @@ void QtSRecentFileList::addFile(const QString& file, AddType type)
     // Add the path to the watcher
     m_Watcher->addPath(file);
 
-    emit fileListChanged(file); // Emit the signal so all the menus can update their contents
+    Q_EMIT fileListChanged(file); // Emit the signal so all the menus can update their contents
   }
 }
 
@@ -133,7 +133,7 @@ void QtSRecentFileList::removeFile(const QString& file)
   // Remove the path from the watcher
   m_Watcher->removePath(file);
 
-  emit fileListChanged(file); // Emit the signal so all the menus can update their contents
+  Q_EMIT fileListChanged(file); // Emit the signal so all the menus can update their contents
 }
 
 // -----------------------------------------------------------------------------
@@ -143,7 +143,7 @@ void QtSRecentFileList::clear()
 {
   this->recentFiles.clear();
 
-  emit fileListChanged(""); // Emit the signal so all the menus can update their contents
+  Q_EMIT fileListChanged(""); // Emit the signal so all the menus can update their contents
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
index c530724638..0ccb7bdcf9 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
@@ -116,7 +116,7 @@ class SVWidgetsLib_EXPORT QtSRecentFileList : public QObject
    */
   void clear();
 
-public slots:
+public Q_SLOTS:
 
   /**
    * @brief Removes a file from the list of recent files.
@@ -125,7 +125,7 @@ public slots:
   void removeFile(const QString& file);
 
   /* ******************* Begin Qt Signals ********************************* */
-signals:
+Q_SIGNALS:
 
   /**
    * @brief Qt Signal emitted when the list of files has changed.
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
index e60a72c717..0d2697cec0 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
@@ -107,7 +107,7 @@ void QtSStringEdit::on_applyChangesBtn_clicked()
 {
   value->setStyleSheet(QString(""));
   m_storedValue = value->text();
-  emit valueChanged(m_storedValue);
+  Q_EMIT valueChanged(m_storedValue);
 
   hideButtons();
 }
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
index bd90052d06..eacba6b128 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
@@ -62,10 +62,10 @@ class QtSStringEdit : public QWidget, private Ui::QtSStringEdit
 
   void setValidator(const QValidator* v);
 
-signals:
+Q_SIGNALS:
   void valueChanged(QString value);
 
-public slots:
+public Q_SLOTS:
   void widgetChanged(const QString& msg);
   void on_applyChangesBtn_clicked();
   void on_cancelChangesBtn_clicked();
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index ab437aeee8..e903365974 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -410,7 +410,7 @@ bool BookmarksModel::setData(const QModelIndex& index, const QVariant& value, in
     return false;
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 
   if(!m_LoadingModel)
   {
@@ -878,7 +878,7 @@ void BookmarksModel::addPipelinesRecursively(QDir currentDir, QModelIndex parent
   QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
   if(!dirList.empty())
   {
-    foreach(QFileInfo fi, dirList)
+    for(QFileInfo fi : dirList)
     {
       // At this point we have the first level of directories and we want to do 2 things:
       // 1.Create an entry in the tree widget with this name
@@ -897,7 +897,7 @@ void BookmarksModel::addPipelinesRecursively(QDir currentDir, QModelIndex parent
   }
 
   QFileInfoList itemList = currentDir.entryInfoList(filters);
-  foreach(QFileInfo itemInfo, itemList)
+  for(QFileInfo itemInfo : itemList)
   {
     QString itemFilePath = itemInfo.absoluteFilePath();
     QString itemName;
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.h b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
index f830f037ad..b2e1845628 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
@@ -139,7 +139,7 @@ class SVWidgetsLib_EXPORT BookmarksModel : public QAbstractItemModel
    */
   void writeBookmarksToPrefsFile();
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief addTreeItem
    * @param parent
@@ -162,7 +162,7 @@ public slots:
 
   void addPipelinesRecursively(QDir currentDir, QModelIndex parent, QJsonObject prebuiltsObj, QString iconFileName, bool allowEditing, QStringList filters, FilterLibraryTreeWidget::ItemType itemType);
 
-protected slots:
+protected Q_SLOTS:
   void updateRowState(const QString& path);
   void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index 7bdd8589de..f5f3b4fa11 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -216,7 +216,7 @@ void BookmarksToolboxWidget::on_bookmarksTreeView_doubleClicked(const QModelInde
         if(result)
         {
           QString filePath = model->data(index, BookmarksModel::Roles::PathRole).toString();
-          emit bookmarkActivated(filePath);
+          Q_EMIT bookmarkActivated(filePath);
         }
       }
     }
@@ -229,7 +229,7 @@ void BookmarksToolboxWidget::on_bookmarksTreeView_doubleClicked(const QModelInde
         model->setData(index, false, static_cast<int>(BookmarksModel::Roles::ErrorsRole));
         model->getFileSystemWatcher()->addPath(path);
       }
-      emit bookmarkActivated(path);
+      Q_EMIT bookmarkActivated(path);
     }
   }
 }
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
index 8bd9639d65..4bb20f0699 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
@@ -117,7 +117,7 @@ class SVWidgetsLib_EXPORT BookmarksToolboxWidget : public QWidget, private Ui::B
   void populateFilterList(QStringList filterNames);
   QString writeNewFavoriteFilePath(QString newFavoriteTitle, QString favoritePath, QTreeWidgetItem* item);
 
-protected slots:
+protected Q_SLOTS:
 
   //// Slots to catch signals from the QTreeWidget
   void on_bookmarksTreeView_clicked(const QModelIndex& index);
@@ -125,7 +125,7 @@ protected slots:
 
   void listenLocateBookmarkTriggered();
 
-signals:
+Q_SIGNALS:
 
   void fireWriteSettings();
 
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index e6bcefdf97..57ccadc191 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -113,12 +113,12 @@ void BookmarksTreeView::addBookmark(const QString& filePath, const QModelIndex&
   QModelIndex index = model->addTreeItem(parent, fileTitle, QIcon(":/SIMPL/icons/images/bookmark.png"), filePath, model->rowCount(parent), BookmarksItem::ItemType::Bookmark, false);
   if(index.isValid())
   {
-    emit updateStatusBar("The pipeline '" + fileTitle + "' has been added successfully.");
+    Q_EMIT updateStatusBar("The pipeline '" + fileTitle + "' has been added successfully.");
     expand(parent);
   }
   else
   {
-    emit updateStatusBar("The pipeline '" + fileTitle + "' could not be added, because the pipeline file extension was not recognized.");
+    Q_EMIT updateStatusBar("The pipeline '" + fileTitle + "' could not be added, because the pipeline file extension was not recognized.");
   }
 }
 
@@ -172,7 +172,7 @@ void BookmarksTreeView::listenAddBookmarkFolderTriggered()
     parent = QModelIndex();
   }
 
-  emit raiseBookmarksWidget();
+  Q_EMIT raiseBookmarksWidget();
 
   QString name = "New Folder";
 
@@ -277,7 +277,7 @@ void BookmarksTreeView::listenRemoveBookmarkTriggered()
     }
 
     // Write these changes out to the preferences file
-    emit fireWriteSettings();
+    Q_EMIT fireWriteSettings();
   }
 }
 
@@ -303,7 +303,7 @@ void BookmarksTreeView::listenOpenBookmarkTriggered()
   QFileInfo fi(pipelinePath);
   if(fi.exists())
   {
-    emit newSIMPLViewInstanceTriggered(pipelinePath);
+    Q_EMIT newSIMPLViewInstanceTriggered(pipelinePath);
 
     // Cache the last directory on old instance
     m_OpenDialogLastFilePath = pipelinePath;
@@ -331,7 +331,7 @@ void BookmarksTreeView::listenExecuteBookmarkTriggered()
   QFileInfo fi(pipelinePath);
   if(fi.exists())
   {
-    emit newSIMPLViewInstanceTriggered(pipelinePath, true);
+    Q_EMIT newSIMPLViewInstanceTriggered(pipelinePath, true);
 
     // Cache the last directory on old instance
     m_OpenDialogLastFilePath = pipelinePath;
@@ -899,7 +899,7 @@ void BookmarksTreeView::expandIndex(const QModelIndex& index)
 // -----------------------------------------------------------------------------
 void BookmarksTreeView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
-  emit currentIndexChanged(current, previous);
+  Q_EMIT currentIndexChanged(current, previous);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
index 74204f826c..c838c39e0b 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -144,7 +144,7 @@ class SVWidgetsLib_EXPORT BookmarksTreeView : public QTreeView
    */
   QModelIndexList filterOutDescendants(QModelIndexList indexList);
 
-public slots:
+public Q_SLOTS:
   void collapseIndex(const QModelIndex& index);
   void expandIndex(const QModelIndex& index);
 
@@ -162,7 +162,7 @@ public slots:
    */
   void addActionList(QList<QAction*> actionList);
 
-protected slots:
+protected Q_SLOTS:
   void listenAddBookmarkTriggered();
   void listenAddBookmarkFolderTriggered();
   void listenRenameBookmarkTriggered();
@@ -172,7 +172,7 @@ protected slots:
   void listenClearBookmarksTriggered();
   void listenOpenBookmarkTriggered();
 
-signals:
+Q_SIGNALS:
   void currentIndexChanged(const QModelIndex& current, const QModelIndex& previous);
   void folderChangedState(const QModelIndex& index, bool expand);
 
@@ -184,7 +184,7 @@ protected slots:
   void fireWriteSettings();
   void updateStatusBar(const QString& msg);
 
-private slots:
+private Q_SLOTS:
 
   /**
    * @brief mousePressEvent
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
index 6724240689..cc70560015 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
@@ -117,7 +117,7 @@ void DREAM3DListWidget::dropEvent(QDropEvent* event)
   if((source != nullptr) && source != this)
   {
     event->setDropAction(Qt::MoveAction);
-    emit dropOccurred(); // We want to emit this signal so that we can respond in a slot when a drop occurs
+    Q_EMIT dropOccurred(); // We want to Q_EMIT this signal so that we can respond in a slot when a drop occurs
     event->accept();
   }
 
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
index d4d359d365..fc2725c3c7 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
@@ -56,7 +56,7 @@ class SVWidgetsLib_EXPORT DREAM3DListWidget : public QListWidget
   void mouseMoveEvent(QMouseEvent* event) override;
   void dropEvent(QDropEvent* event) override;
 
-signals:
+Q_SIGNALS:
   void dropOccurred();
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index 2324a10bf6..bc0a84bfd4 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -705,8 +705,8 @@ void DataArrayPathSelectionWidget::setDataArrayPath(const DataArrayPath& path)
   {
     setText(path.serialize(Detail::Delimiter));
     resetStyle();
-    emit pathChanged();
-    emit endViewPaths();
+    Q_EMIT pathChanged();
+    Q_EMIT endViewPaths();
   }
   else
   {
@@ -728,7 +728,7 @@ void DataArrayPathSelectionWidget::setDataArrayPath(const DataArrayPath& path)
     }
 
     resetStyle();
-    emit pathChanged();
+    Q_EMIT pathChanged();
   }
 }
 
@@ -900,13 +900,13 @@ void DataArrayPathSelectionWidget::emitRequirements()
   switch(m_DataType)
   {
   case DataArrayPathHelper::DataType::DataContainer:
-    emit viewPathsMatchingReqs(m_DataContainerReqs);
+    Q_EMIT viewPathsMatchingReqs(m_DataContainerReqs);
     break;
   case DataArrayPathHelper::DataType::AttributeMatrix:
-    emit viewPathsMatchingReqs(m_AttrMatrixReqs);
+    Q_EMIT viewPathsMatchingReqs(m_AttrMatrixReqs);
     break;
   case DataArrayPathHelper::DataType::DataArray:
-    emit viewPathsMatchingReqs(m_DataArrayReqs);
+    Q_EMIT viewPathsMatchingReqs(m_DataArrayReqs);
     break;
   case DataArrayPathHelper::DataType::None:
     break;
@@ -940,7 +940,7 @@ void DataArrayPathSelectionWidget::leaveEvent(QEvent* event)
   }
 
   m_FilteringPassed = false;
-  emit endViewPaths();
+  Q_EMIT endViewPaths();
   if(checkCurrentPath())
   {
     setState(State::Normal);
@@ -1044,7 +1044,7 @@ void DataArrayPathSelectionWidget::performDrag()
 {
   setChecked(true);
   DataArrayPath path = getDataArrayPath();
-  emit filterPath(path);
+  Q_EMIT filterPath(path);
 
   // MimeData stores the current path AND marks itself as a SelectionWidget drag
   // for connecting to the DataStructureWidget.
@@ -1059,7 +1059,7 @@ void DataArrayPathSelectionWidget::performDrag()
 
   // drag->exec is a blocking method
   resetStyle();
-  emit endViewPaths();
+  Q_EMIT endViewPaths();
 }
 
 // -----------------------------------------------------------------------------
@@ -1139,12 +1139,12 @@ void DataArrayPathSelectionWidget::updateCheckState(bool checked)
 {
   if(checked)
   {
-    emit dataArrayPathSelectionLocked(this);
+    Q_EMIT dataArrayPathSelectionLocked(this);
     emitRequirements();
   }
   else
   {
-    emit dataArrayPathSelectionUnlocked(this);
+    Q_EMIT dataArrayPathSelectionUnlocked(this);
     m_FilteringPassed = false;
 
     if(checkCurrentPath())
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index 00e95c0611..3af06880ed 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -204,7 +204,7 @@ class DataArrayPathSelectionWidget : public QToolButton
    */
   void setPropertyName(QString propName);
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief Sets whether or not filtering is forced active or not
    * @param active
@@ -250,7 +250,7 @@ public slots:
    */
   void selectionWidgetUnlocked(QToolButton* selection);
 
-signals:
+Q_SIGNALS:
   void filterPath(DataArrayPath path);
   void viewPathsMatchingReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs);
   void viewPathsMatchingReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs);
@@ -420,7 +420,7 @@ public slots:
    */
   bool isCreatedPath(const DataArrayPath& path) const;
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief Show the legacy menu when right-clicking
    * @param pos
@@ -433,7 +433,7 @@ protected slots:
    */
   void updateCheckState(bool checked);
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief mousePressEvent
    * @param event
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
index b2c953104a..1cd869fa78 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.h
@@ -31,7 +31,7 @@ class SVWidgetsLib_EXPORT DataContainerArrayWidget : public QWidget, private Ui:
 
   void initializeWithFilter(AbstractFilter* filter);
 
-protected slots:
+protected Q_SLOTS:
 
   void updateView();
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
index 9df6642bcd..cdcee52f00 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
@@ -154,7 +154,7 @@ bool DataStructureItem::insertColumns(int position, int columns)
     m_ItemData.insert(position, QVariant());
   }
 
-  foreach(DataStructureItem* child, m_ChildItems)
+  for(DataStructureItem* child : m_ChildItems)
   {
     child->insertColumns(position, columns);
   }
@@ -212,7 +212,7 @@ bool DataStructureItem::removeColumns(int position, int columns)
     m_ItemData.remove(position);
   }
 
-  foreach(DataStructureItem* child, m_ChildItems)
+  for(DataStructureItem* child : m_ChildItems)
   {
     child->removeColumns(position, columns);
   }
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index 4eb6cd72f1..945ef98289 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -214,7 +214,7 @@ bool DataStructureModel::setData(const QModelIndex& index, const QVariant& value
 
   if(result)
   {
-    emit dataChanged(index, index);
+    Q_EMIT dataChanged(index, index);
   }
 
   return result;
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index 4c65db4876..7d9a06de07 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -128,7 +128,7 @@ the setData() and setHeaderData() functions, respectively.
   QModelIndexList findIndexByPath(QString filePath);
 */
 
-protected slots:
+protected Q_SLOTS:
   //    void updateRowState(const QString& path);
   //    void updateModel(const QModelIndex& topLeft, const QModelIndex& bottomRight);
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index d1b2de1771..1736bc8677 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -200,12 +200,12 @@ void DataStructureTreeView::emitFilterPath(QModelIndex& index)
 
   if(!index.isValid())
   {
-    emit endDataStructureFiltering();
+    Q_EMIT endDataStructureFiltering();
     return;
   }
 
   DataArrayPath path = getDataArrayPath(index);
-  emit filterPath(path);
+  Q_EMIT filterPath(path);
 }
 
 // -----------------------------------------------------------------------------
@@ -266,7 +266,7 @@ void DataStructureTreeView::leaveEvent(QEvent* event)
     return;
   }
 
-  emit endDataStructureFiltering();
+  Q_EMIT endDataStructureFiltering();
 }
 
 // -----------------------------------------------------------------------------
@@ -312,7 +312,7 @@ void DataStructureTreeView::performDrag()
 // -----------------------------------------------------------------------------
 void DataStructureTreeView::dragComplete()
 {
-  emit endDataStructureFiltering();
+  Q_EMIT endDataStructureFiltering();
   m_Dragging = false;
 }
 
@@ -477,7 +477,7 @@ void DataStructureTreeView::mouseDoubleClickEvent(QMouseEvent* event)
   DataArrayPath path = getDataArrayPath(index);
   if(m_Delegate->pathMatchesReqs(path))
   {
-    emit applyPathToFilteringParameter(path);
+    Q_EMIT applyPathToFilteringParameter(path);
   }
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index fb7456a9f3..b1516a0eec 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -161,7 +161,7 @@ class SVWidgetsLib_EXPORT DataStructureTreeView : public QTreeView
    */
   void search(const QString& name);
 
-public slots:
+public Q_SLOTS:
   void displayDataContainers(const DataContainerArrayShPtr& dca);
   void displayMontages(const DataContainerArrayShPtr& dca);
 
@@ -182,7 +182,7 @@ public slots:
   QIcon getHexahedralGeomIcon() const;
   QIcon getRectilinearGeomIcon() const;
 
-signals:
+Q_SIGNALS:
   void filterPath(DataArrayPath path);
   void endDataStructureFiltering();
   void applyPathToFilteringParameter(DataArrayPath path);
@@ -320,7 +320,7 @@ public slots:
    */
   void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE;
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief mousePressEvent
    * @param event
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index e9227fe19e..e20f7d4dab 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -97,7 +97,7 @@ class SVWidgetsLib_EXPORT DataStructureWidget : public QWidget, public IObserver
   Q_PROPERTY(QIcon HexahedralGeomIcon READ getHexahedralGeomIcon WRITE setHexahedralGeomIcon)
   Q_PROPERTY(QIcon RectilinearGeomIcon READ getRectilinearGeomIcon WRITE setRectilinearGeomIcon)
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief Updates the internal DataContainerArray copy from the input DataContainerArray
    * @param dca
@@ -146,7 +146,7 @@ public slots:
    */
   void clearViewRequirements();
 
-signals:
+Q_SIGNALS:
   void filterPath(DataArrayPath path);
   void endDataStructureFiltering();
   void applyPathToFilteringParameter(DataArrayPath path);
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index ea4191e908..7c507a6a7e 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -734,7 +734,7 @@ void FilterInputWidget::fadeOutWidget(QWidget* widget)
 // -----------------------------------------------------------------------------
 void FilterInputWidget::getEmittedPathReqs(DataContainerSelectionFilterParameter::RequirementType dcReqs)
 {
-  emit viewPathsMatchingReqs(dcReqs);
+  Q_EMIT viewPathsMatchingReqs(dcReqs);
 
   // QObject* obj = this->sender();
   // for(QWidget* widget : m_PropertyToWidget)
@@ -742,7 +742,7 @@ void FilterInputWidget::getEmittedPathReqs(DataContainerSelectionFilterParameter
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
   //  {
-  //    emit fpWidget->endViewPathRequirements();
+  //    Q_EMIT fpWidget->endViewPathRequirements();
   //  }
   //}
 }
@@ -752,7 +752,7 @@ void FilterInputWidget::getEmittedPathReqs(DataContainerSelectionFilterParameter
 // -----------------------------------------------------------------------------
 void FilterInputWidget::getEmittedPathReqs(AttributeMatrixSelectionFilterParameter::RequirementType amReqs)
 {
-  emit viewPathsMatchingReqs(amReqs);
+  Q_EMIT viewPathsMatchingReqs(amReqs);
 
   // QObject* obj = this->sender();
   // for(QWidget* widget : m_PropertyToWidget)
@@ -760,7 +760,7 @@ void FilterInputWidget::getEmittedPathReqs(AttributeMatrixSelectionFilterParamet
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
   //  {
-  //    emit fpWidget->endViewPathRequirements();
+  //    Q_EMIT fpWidget->endViewPathRequirements();
   //  }
   //}
 }
@@ -770,7 +770,7 @@ void FilterInputWidget::getEmittedPathReqs(AttributeMatrixSelectionFilterParamet
 // -----------------------------------------------------------------------------
 void FilterInputWidget::getEmittedPathReqs(DataArraySelectionFilterParameter::RequirementType daReqs)
 {
-  emit viewPathsMatchingReqs(daReqs);
+  Q_EMIT viewPathsMatchingReqs(daReqs);
 
   // QObject* obj = this->sender();
   // for(QWidget* widget : m_PropertyToWidget)
@@ -778,7 +778,7 @@ void FilterInputWidget::getEmittedPathReqs(DataArraySelectionFilterParameter::Re
   //  FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
   //  if(fpWidget && fpWidget != obj)
   //  {
-  //    emit fpWidget->endViewPathRequirements();
+  //    Q_EMIT fpWidget->endViewPathRequirements();
   //  }
   //}
 }
@@ -794,7 +794,7 @@ void FilterInputWidget::emitFilterPath(DataArrayPath path)
     FilterParameterWidget* fpWidget = dynamic_cast<FilterParameterWidget*>(widget);
     if((fpWidget != nullptr) && fpWidget != obj)
     {
-      emit fpWidget->filterPathInput(path);
+      Q_EMIT fpWidget->filterPathInput(path);
     }
   }
 }
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
index 8871b8d229..263180d5ec 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -75,12 +75,12 @@ class SVWidgetsLib_EXPORT FilterInputWidget : public QWidget
 
   QWidget* getVariablesTabContentsWidget();
 
-public slots:
+public Q_SLOTS:
   void clearInputWidgets();
   void showHelp();
   void displayFilterParameters(AbstractFilter::Pointer filter);
 
-signals:
+Q_SIGNALS:
   void filterParametersChanged(bool preflight = true);
   void errorSettingFilterParameter(const QString& text);
 
@@ -95,7 +95,7 @@ public slots:
   void dataArrayPathSelectionLocked(QToolButton* selection);
   void dataArrayPathSelectionUnlocked(QToolButton* button);
 
-private slots:
+private Q_SLOTS:
   void fadeInWidget(QWidget* widget);
   void fadeOutWidget(QWidget* widget);
 
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index 0e3d7fe60b..769de31184 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -293,7 +293,7 @@ void FilterLibraryToolboxWidget::on_filterLibrary_itemDoubleClicked(QTreeWidgetI
   if(nodeType.toInt() == FILTER_NODE_TYPE)
   {
     QString filterClassName = item->data(0, Qt::UserRole + 1).toString();
-    emit filterItemDoubleClicked(filterClassName);
+    Q_EMIT filterItemDoubleClicked(filterClassName);
   }
 }
 
@@ -307,7 +307,7 @@ void FilterLibraryToolboxWidget::updateFilterGroupList(FilterManager::Collection
   {
     filterNames << factory.key();
   }
-  emit filterListGenerated(filterNames, true);
+  Q_EMIT filterListGenerated(filterNames, true);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
index 222eb76b74..5e9057921c 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
@@ -90,7 +90,7 @@ class SVWidgetsLib_EXPORT FilterLibraryToolboxWidget : public QWidget, private U
 protected:
   void updateFilterGroupList(FilterManager::Collection& factories);
 
-protected slots:
+protected Q_SLOTS:
   void on_filterLibrary_currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous);
   void on_filterLibrary_itemDoubleClicked(QTreeWidgetItem* item, int column);
 
@@ -106,7 +106,7 @@ protected slots:
    */
   void launchHelpForItem(QString name);
 
-signals:
+Q_SIGNALS:
   /**
    * @brief filterItemDoubleClicked
    * @param filterName
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
index 2c6f727375..043a7d27ac 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
@@ -293,7 +293,7 @@ bool FilterListModel::setData(const QModelIndex& index, const QVariant& value, i
     return false;
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 
   return true;
 }
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
index 9c064c4981..80b225dd9c 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -70,7 +70,7 @@ class SVWidgetsLib_EXPORT FilterListToolboxWidget : public QWidget, private Ui::
    */
   void writeSettings(QtSSettings* prefs);
 
-public slots:
+public Q_SLOTS:
 
   /**
    * @brief searchFilters triggered when the user types something in the Search Field
@@ -114,7 +114,7 @@ public slots:
    */
   void setupSearchField();
 
-signals:
+Q_SIGNALS:
   void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.cpp b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
index 1a91f92b92..d4adf422dd 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
@@ -86,7 +86,7 @@ void FilterListView::connectSignalsSlots()
     FilterListModel* model = getFilterListModel();
 
     QString filterClassName = model->data(index, FilterListModel::Roles::ClassNameRole).toString();
-    emit filterItemDoubleClicked(filterClassName);
+    Q_EMIT filterItemDoubleClicked(filterClassName);
   });
 }
 
@@ -280,7 +280,7 @@ void FilterListView::listenKeyPressed(QKeyEvent* event)
       {
         QModelIndex selectedIndex = selectedIndexes[0];
         QString filterClassName = model->data(selectedIndex, FilterListModel::Roles::ClassNameRole).toString();
-        emit filterItemDoubleClicked(filterClassName);
+        Q_EMIT filterItemDoubleClicked(filterClassName);
         return;
       }
     }
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.h b/Source/SVWidgetsLib/Widgets/FilterListView.h
index 6c8fc0bfe5..2627559df5 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.h
@@ -103,7 +103,7 @@ class SVWidgetsLib_EXPORT FilterListView : public QTreeView
    */
   void clear();
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief listenKeyPressed
    * @param event
@@ -128,10 +128,10 @@ public slots:
    */
   void mouseMoveEvent(QMouseEvent* event) override;
 
-signals:
+Q_SIGNALS:
   void filterItemDoubleClicked(const QString& filterName, int insertIndex = -1, bool useAnimationOnFirstRun = true);
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief requestContextMenu
    * @param pos
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
index 8d2a757120..a93482afc4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
@@ -179,13 +179,13 @@ bool ASCIIDataModel::setHeaderData(int section, Qt::Orientation orientation, con
   if(orientation == Qt::Horizontal && role == Qt::DisplayRole)
   {
     m_HorizontalHeaders[section] = value.toString();
-    emit headerDataChanged(Qt::Horizontal, section, section);
+    Q_EMIT headerDataChanged(Qt::Horizontal, section, section);
     return true;
   }
   if(orientation == Qt::Vertical && role == Qt::DisplayRole)
   {
     m_VerticalHeaders[section] = value.toString();
-    emit headerDataChanged(Qt::Vertical, section, section);
+    Q_EMIT headerDataChanged(Qt::Vertical, section, section);
     return true;
   }
 
@@ -279,7 +279,7 @@ bool ASCIIDataModel::setData(const QModelIndex& index, const QVariant& value, in
 
   if(result)
   {
-    emit dataChanged(index, index);
+    Q_EMIT dataChanged(index, index);
   }
 
   return result;
@@ -330,7 +330,7 @@ void ASCIIDataModel::setColumnDataType(int column, const QString& type)
   m_ColumnDataType[column] = type;
 
   QModelIndex index = this->index(0, column);
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
@@ -396,7 +396,7 @@ void ASCIIDataModel::clearHeaders(Qt::Orientation orientation)
     {
       header = "";
     }
-    emit headerDataChanged(Qt::Horizontal, 0, m_HorizontalHeaders.size() - 1);
+    Q_EMIT headerDataChanged(Qt::Horizontal, 0, m_HorizontalHeaders.size() - 1);
   }
   else if(orientation == Qt::Vertical)
   {
@@ -404,7 +404,7 @@ void ASCIIDataModel::clearHeaders(Qt::Orientation orientation)
     {
       header = "";
     }
-    emit headerDataChanged(Qt::Vertical, 0, m_VerticalHeaders.size() - 1);
+    Q_EMIT headerDataChanged(Qt::Vertical, 0, m_VerticalHeaders.size() - 1);
   }
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 6803fb8a83..5481fb74fe 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -146,7 +146,7 @@ void DataFormatPage::setupGui()
 
   QVector<QString> amTypes = AttributeMatrix::GetTypesAsStrings();
 
-  foreach(const QString amType, amTypes)
+  for(const QString amType : amTypes)
   {
     attributeMatrixType->addItem(amType);
   }
@@ -343,7 +343,7 @@ void DataFormatPage::on_createAMRadio_toggled(bool b)
   if(b)
   {
     checkTupleDimensions(getTupleTable()->getData());
-    emit completeChanged();
+    Q_EMIT completeChanged();
   }
 }
 
@@ -362,7 +362,7 @@ void DataFormatPage::on_useAMRadio_toggled(bool b)
     }
     else
     {
-      emit completeChanged();
+      Q_EMIT completeChanged();
     }
   }
 }
@@ -713,7 +713,7 @@ void DataFormatPage::on_startRowSpin_valueChanged(int value)
   }
   checkTupleDimensions(getTupleTable()->getData());
 
-  emit completeChanged();
+  Q_EMIT completeChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -801,7 +801,7 @@ void DataFormatPage::on_doesNotHaveHeadersRadio_toggled(bool checked)
     }
 
     checkHeaders();
-    emit completeChanged();
+    Q_EMIT completeChanged();
   }
 }
 
@@ -823,7 +823,7 @@ void DataFormatPage::on_useDefaultHeaders_toggled(bool checked)
     }
 
     checkHeaders();
-    emit completeChanged();
+    Q_EMIT completeChanged();
   }
 }
 
@@ -837,7 +837,7 @@ void DataFormatPage::on_headersIndexLineEdit_textChanged(const QString& text)
   {
     m_ASCIIDataModel->clearHeaders(Qt::Horizontal);
     checkHeaders(QVector<QString>());
-    emit completeChanged();
+    Q_EMIT completeChanged();
     return;
   }
 
@@ -848,7 +848,7 @@ void DataFormatPage::on_headersIndexLineEdit_textChanged(const QString& text)
   {
     m_ASCIIDataModel->clearHeaders(Qt::Horizontal);
     checkHeaders(QVector<QString>());
-    emit completeChanged();
+    Q_EMIT completeChanged();
     return;
   }
 
@@ -859,7 +859,7 @@ void DataFormatPage::on_headersIndexLineEdit_textChanged(const QString& text)
   {
     m_ASCIIDataModel->clearHeaders(Qt::Horizontal);
     checkHeaders(QVector<QString>());
-    emit completeChanged();
+    Q_EMIT completeChanged();
     return;
   }
 
@@ -897,7 +897,7 @@ void DataFormatPage::on_headersIndexLineEdit_textChanged(const QString& text)
 
   checkHeaders(headers);
 
-  emit completeChanged();
+  Q_EMIT completeChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -961,14 +961,14 @@ bool DataFormatPage::checkTupleDimensions(std::vector<size_t> tupleDims)
     tupleTableErrLabel->setText("The current number of tuples in the attribute matrix do not match the total number of lines imported.");
     tupleTableErrLabel->show();
     m_TupleDimsHasErrors = true;
-    emit completeChanged();
+    Q_EMIT completeChanged();
     return false;
   }
 
   tupleTableErrLabel->setText("");
   tupleTableErrLabel->hide();
   m_TupleDimsHasErrors = false;
-  emit completeChanged();
+  Q_EMIT completeChanged();
   return true;
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index 4b9affc0f0..4a8b46132c 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -205,7 +205,7 @@ class DataFormatPage : public AbstractWizardPage, private Ui::DataFormatPage
    */
   void updateDataArrayPath(DataArrayPath::RenameType renamePath);
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief dcaItemSelected
    * @param path
@@ -256,7 +256,7 @@ public slots:
   void createDCSelectionMenu();
   void createAMSelectionMenu();
 
-private slots:
+private Q_SLOTS:
   void on_startRowSpin_valueChanged(int i);
   void on_hasHeadersRadio_toggled(bool checked);
   void on_doesNotHaveHeadersRadio_toggled(bool checked);
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
index bd636d94fe..24a7d90608 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
@@ -73,7 +73,7 @@ class DelimitedPage : public AbstractWizardPage, private Ui::DelimitedPage
 
   void setEditSettings(bool value);
 
-protected slots:
+protected Q_SLOTS:
   void showEvent(QShowEvent* event) override;
   void checkBox_Toggled(int state);
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
index 026bf538a4..bb4810a3bf 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
@@ -59,7 +59,7 @@ class EditHeadersDialog : public QDialog, private Ui::EditHeadersDialog
   QVector<QString> getHeaders();
   void setHeaders(QVector<QString> headers);
 
-protected slots:
+protected Q_SLOTS:
   void m_ButtonBox_accepted();
   void m_ButtonBox_rejected();
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
index 49f68be290..c26821405e 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
@@ -156,7 +156,7 @@ class ImportASCIIDataWizard : public QWizard
 
   void setEditSettings(bool value);
 
-protected slots:
+protected Q_SLOTS:
   void refreshModel();
   void cleanupPage(int id) override;
 
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
index ca1730066d..8f0eda8a7b 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
@@ -78,7 +78,7 @@ void LineCounterObject::run()
   if(m_FilePath.isEmpty())
   {
     m_NumOfLines = -1;
-    emit finished();
+    Q_EMIT finished();
     return;
   }
   QFile qFile(m_FilePath);
@@ -126,7 +126,7 @@ void LineCounterObject::run()
       if(currentByte > currentThresh)
       {
         double progress = static_cast<double>(currentByte) / static_cast<double>(fileSize) * 100;
-        emit progressUpdateGenerated(progress);
+        Q_EMIT progressUpdateGenerated(progress);
         currentThresh = currentThresh + fiveThresh;
       }
 
@@ -146,7 +146,7 @@ void LineCounterObject::run()
   // Close the file and free the memory from the buffer
   qFile.close();
 
-  emit finished();
+  Q_EMIT finished();
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
index 17e4087bf7..f181954e78 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
@@ -68,14 +68,14 @@ class LineCounterObject : public QObject
    */
   int getNumberOfLines();
 
-protected slots:
+protected Q_SLOTS:
 
   /**
    * @brief run
    */
   void run();
 
-signals:
+Q_SIGNALS:
 
   /**
    * @brief finished
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
index 986d6e2d5d..3af9a5952f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
@@ -152,7 +152,7 @@ void TupleTableWidget::on_addTupleBtn_clicked()
   addColumn(1);
   m_UserEdited = true;
 
-  emit tupleDimsChanged(getData());
+  Q_EMIT tupleDimsChanged(getData());
 }
 
 // -----------------------------------------------------------------------------
@@ -173,7 +173,7 @@ void TupleTableWidget::on_deleteTupleBtn_clicked()
     m_UserEdited = false;
   }
 
-  emit tupleDimsChanged(getData());
+  Q_EMIT tupleDimsChanged(getData());
 }
 
 // -----------------------------------------------------------------------------
@@ -181,5 +181,5 @@ void TupleTableWidget::on_deleteTupleBtn_clicked()
 // -----------------------------------------------------------------------------
 void TupleTableWidget::on_tupleTable_itemChanged(QTableWidgetItem* item)
 {
-  emit tupleDimsChanged(getData());
+  Q_EMIT tupleDimsChanged(getData());
 }
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
index 1213048abd..fbf136ef1e 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
@@ -72,17 +72,17 @@ class TupleTableWidget : public QWidget, private Ui::TupleTableWidget
 
   bool didUseEdit();
 
-public slots:
+public Q_SLOTS:
   void on_addTupleBtn_clicked();
   void on_deleteTupleBtn_clicked();
 
 protected:
   void addColumn(int value);
 
-protected slots:
+protected Q_SLOTS:
   void on_tupleTable_itemChanged(QTableWidgetItem* item);
 
-signals:
+Q_SIGNALS:
   void tupleDimsChanged(std::vector<size_t> tupleDims);
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
index 3cb50331ee..dbf3507379 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.cpp
@@ -132,14 +132,14 @@ bool ImportHDF5TreeModel::setData(const QModelIndex& index, const QVariant& valu
       m_SelectedHDF5Paths.removeAll(hdf5Path);
     }
 
-    emit selectedHDF5PathsChanged();
+    Q_EMIT selectedHDF5PathsChanged();
   }
   else if(role == Roles::HasErrorsRole)
   {
     item->setHasErrors(value.toBool());
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 
   return true;
 }
diff --git a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
index 3853c68fd7..e29152f673 100644
--- a/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
+++ b/Source/SVWidgetsLib/Widgets/ImportHDF5TreeModel.h
@@ -146,7 +146,7 @@ class SVWidgetsLib_EXPORT ImportHDF5TreeModel : public QAbstractItemModel
    */
   QStringList getSelectedHDF5Paths();
 
-signals:
+Q_SIGNALS:
   void selectedHDF5PathsChanged();
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 6d27d5e570..3bd8f86621 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -162,7 +162,7 @@ void IssuesWidget::displayCachedMessages()
     m_CachedMessages[j]->visit(&messageHandler);
   }
 
-  emit tableHasErrors(errCount > 0, errCount, warnCount);
+  Q_EMIT tableHasErrors(errCount > 0, errCount, warnCount);
 
   if(ui->errorTableWidget->rowCount() > 0)
   {
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
index aac5d981ac..6c5e7a187f 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -84,7 +84,7 @@ class SVWidgetsLib_EXPORT IssuesWidget : public QWidget, public IObserver
    */
   QTableWidget* getIssuesTable();
 
-public slots:
+public Q_SLOTS:
   void processPipelineMessage(const AbstractMessage::Pointer& msg) override;
   void clearIssues();
   void on_errorTableWidget_itemClicked(QTableWidgetItem* item);
@@ -92,7 +92,7 @@ public slots:
 
   void showFilterHelp(const QString& url);
 
-signals:
+Q_SIGNALS:
   void tableHasErrors(bool b, int errCount, int warnCount);
   void showTable(bool b);
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index 0cc24fee4a..42d19a2f76 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -170,7 +170,7 @@ bool PipelineItem::insertColumns(int position, int columns)
     m_ItemData.insert(position, QVariant());
   }
 
-  foreach(PipelineItem* child, m_ChildItems)
+  for(PipelineItem* child : m_ChildItems)
   {
     child->insertColumns(position, columns);
   }
@@ -228,7 +228,7 @@ bool PipelineItem::removeColumns(int position, int columns)
     m_ItemData.remove(position);
   }
 
-  foreach(PipelineItem* child, m_ChildItems)
+  for(PipelineItem* child : m_ChildItems)
   {
     child->removeColumns(position, columns);
   }
diff --git a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
index bfd42cbf37..8c7f2c69d7 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineListWidget.cpp
@@ -66,7 +66,7 @@ void PipelineListWidget::on_startPipelineBtn_clicked()
   if(pipelineView->getPipelineState() == SVPipelineView::PipelineViewState::Running)
   {
     QModelIndex pipelineIndex = model->index(0, PipelineItem::Contents);
-    emit pipelineCanceled(pipelineIndex);
+    Q_EMIT pipelineCanceled(pipelineIndex);
 
     setPipelineState(SVPipelineView::PipelineViewState::Cancelling);
 
diff --git a/Source/SVWidgetsLib/Widgets/PipelineListWidget.h b/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
index 858d84cf4d..fd4b03f898 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineListWidget.h
@@ -55,7 +55,7 @@ class SVWidgetsLib_EXPORT PipelineListWidget : public QFrame, private Ui::Pipeli
    */
   void setProgressValue(float percent);
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief on_startPipelineBtn_clicked
    */
@@ -77,7 +77,7 @@ public slots:
    */
   void setupGui();
 
-signals:
+Q_SIGNALS:
   void pipelineCanceled(const QModelIndex& pipelineIndex);
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
index 3de5c7900b..7ea3502616 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.cpp
@@ -66,7 +66,7 @@ PipelineModel::~PipelineModel()
 // -----------------------------------------------------------------------------
 void PipelineModel::updateActivePipeline(const QModelIndex& pipelineIdx)
 {
-  emit clearIssuesTriggered();
+  Q_EMIT clearIssuesTriggered();
 
   setActivePipeline(m_ActivePipelineIndex, false);
   setActivePipeline(pipelineIdx, true);
@@ -75,7 +75,7 @@ void PipelineModel::updateActivePipeline(const QModelIndex& pipelineIdx)
 
   if(m_ActivePipelineIndex.isValid())
   {
-    emit preflightTriggered(m_ActivePipelineIndex, this);
+    Q_EMIT preflightTriggered(m_ActivePipelineIndex, this);
   }
 }
 
@@ -223,7 +223,7 @@ void PipelineModel::setFilter(const QModelIndex& index, AbstractFilter::Pointer
 
   item->setFilter(filter);
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
@@ -263,7 +263,7 @@ void PipelineModel::setDropIndicatorText(const QModelIndex& index, const QString
 
   item->setDropIndicatorText(text);
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
@@ -308,7 +308,7 @@ void PipelineModel::setActivePipeline(const QModelIndex& index, bool value)
     m_ActivePipelineIndex = QModelIndex();
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
@@ -660,7 +660,7 @@ bool PipelineModel::setData(const QModelIndex& index, const QVariant& value, int
     return false;
   }
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 
   return true;
 }
@@ -720,7 +720,7 @@ void PipelineModel::setPipelineSaved(const QModelIndex& index, bool saved)
   PipelineItem* item = getItem(index);
   item->setPipelineSaved(saved);
 
-  emit dataChanged(index, index);
+  Q_EMIT dataChanged(index, index);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/PipelineModel.h b/Source/SVWidgetsLib/Widgets/PipelineModel.h
index 8db90035b2..c7e856906c 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineModel.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineModel.h
@@ -142,7 +142,7 @@ class SVWidgetsLib_EXPORT PipelineModel : public QAbstractItemModel
 
   QList<QObject*> getPipelineMessageObservers();
 
-signals:
+Q_SIGNALS:
   void clearIssuesTriggered();
 
   void preflightTriggered(const QModelIndex& pipelineIndex, PipelineModel* model);
diff --git a/Source/SVWidgetsLib/Widgets/ProgressDialog.h b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
index 4af54b345c..148b7da7c5 100644
--- a/Source/SVWidgetsLib/Widgets/ProgressDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ProgressDialog.h
@@ -57,7 +57,7 @@ class SVWidgetsLib_EXPORT ProgressDialog : public QDialog
 
   friend ProgressDialogMessageHandler;
 
-public slots:
+public Q_SLOTS:
 
   void setLabelText(const QString& text);
   void processPipelineMessage(const AbstractMessage::Pointer& msg);
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 7e07c07161..f24484de49 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -321,7 +321,7 @@ void SVPipelineView::preflightPipeline()
   {
     return;
   }
-  emit clearIssuesTriggered();
+  Q_EMIT clearIssuesTriggered();
 
   PipelineModel* model = getPipelineModel();
   if(nullptr == model)
@@ -380,7 +380,7 @@ void SVPipelineView::preflightPipeline()
     }
   }
 
-  emit preflightFinished(count, err);
+  Q_EMIT preflightFinished(count, err);
   updateFilterInputWidgetIndices();
 }
 
@@ -401,23 +401,23 @@ void SVPipelineView::executePipeline()
   m_WorkerThread = new QThread(); // Create a new Thread Resource
 
   // Clear out the Issues Table
-  emit clearIssuesTriggered();
+  Q_EMIT clearIssuesTriggered();
 
   // Create a FilterPipeline Object
   //  m_PipelineInFlight = getCopyOfFilterPipeline();
   m_PipelineInFlight = getFilterPipeline();
 
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("Preflight Pipeline.....", true));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("Preflight Pipeline.....", true));
 
   // Give the pipeline one last chance to preflight and get all the latest values from the GUI
   int err = m_PipelineInFlight->preflightPipeline();
   if(err < 0)
   {
     m_PipelineInFlight = FilterPipeline::NullPointer();
-    emit displayIssuesTriggered();
+    Q_EMIT displayIssuesTriggered();
     return;
   }
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("    Preflight Results: 0 Errors", false));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("    Preflight Results: 0 Errors", false));
 
   // Save each of the DataContainerArrays from each of the filters for when the pipeline is complete
   m_PreflightDataContainerArrays.clear();
@@ -428,7 +428,7 @@ void SVPipelineView::executePipeline()
   }
 
   // Save the preferences file NOW in case something happens
-  emit writeSIMPLViewSettingsTriggered();
+  Q_EMIT writeSIMPLViewSettingsTriggered();
 
   toReadyState();
 
@@ -460,8 +460,8 @@ void SVPipelineView::executePipeline()
 
   toRunningState();
   m_WorkerThread->start();
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(" ", false));
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE STARTED ***************", false));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(" ", false));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE STARTED ***************", false));
 }
 
 // -----------------------------------------------------------------------------
@@ -469,7 +469,7 @@ void SVPipelineView::executePipeline()
 // -----------------------------------------------------------------------------
 void SVPipelineView::processPipelineMessage(const AbstractMessage::Pointer& msg)
 {
-  emit pipelineHasMessage(msg);
+  Q_EMIT pipelineHasMessage(msg);
 }
 
 // -----------------------------------------------------------------------------
@@ -519,20 +519,20 @@ void SVPipelineView::finishPipeline()
   switch(m_PipelineInFlight->getExecutionResult())
   {
   case FilterPipeline::ExecutionResult::Canceled:
-    emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE CANCELED ***************", true));
+    Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE CANCELED ***************", true));
     break;
   case FilterPipeline::ExecutionResult::Completed:
-    emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE FINISHED ***************", true));
+    Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE FINISHED ***************", true));
     break;
   case FilterPipeline::ExecutionResult::Failed:
-    emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE FAILED ***************", true));
+    Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("*************** PIPELINE FAILED ***************", true));
     break;
   case FilterPipeline::ExecutionResult::Invalid:
     throw ExecutionResultInvalidException();
     break;
   }
 
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("", false));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle("", false));
 
   // Put back the DataContainerArray for each filter at the conclusion of running
   // the pipeline. this keeps the data browser current and up to date.
@@ -546,8 +546,8 @@ void SVPipelineView::finishPipeline()
 
   toStoppedState();
 
-  emit displayIssuesTriggered();
-  emit pipelineFinished();
+  Q_EMIT displayIssuesTriggered();
+  Q_EMIT pipelineFinished();
 }
 
 // -----------------------------------------------------------------------------
@@ -646,17 +646,17 @@ int SVPipelineView::writePipeline(const QString& outputPath)
   }
   else
   {
-    emit statusMessage(tr("The pipeline was not written to file '%1'. '%2' is an unsupported file extension.").arg(fi.fileName()).arg(ext));
+    Q_EMIT statusMessage(tr("The pipeline was not written to file '%1'. '%2' is an unsupported file extension.").arg(fi.fileName()).arg(ext));
     return -1;
   }
 
   if(err < 0)
   {
-    emit statusMessage(tr("There was an error while saving the pipeline to file '%1'.").arg(fi.fileName()));
+    Q_EMIT statusMessage(tr("There was an error while saving the pipeline to file '%1'.").arg(fi.fileName()));
     return -1;
   }
 
-  emit statusMessage(tr("The pipeline has been saved successfully to '%1'.").arg(fi.fileName()));
+  Q_EMIT statusMessage(tr("The pipeline has been saved successfully to '%1'.").arg(fi.fileName()));
 
   return 0;
 }
@@ -811,7 +811,7 @@ void SVPipelineView::clearPipeline()
   RemoveFilterCommand* removeCmd = new RemoveFilterCommand(filters, this, "Clear");
   addUndoCommand(removeCmd);
 
-  emit clearDataStructureWidgetTriggered();
+  Q_EMIT clearDataStructureWidgetTriggered();
 }
 
 // -----------------------------------------------------------------------------
@@ -1405,7 +1405,7 @@ void SVPipelineView::setFiltersEnabled(QModelIndexList indexes, bool enabled)
   }
 
   preflightPipeline();
-  emit filterEnabledStateChanged();
+  Q_EMIT filterEnabledStateChanged();
 }
 
 // -----------------------------------------------------------------------------
@@ -1427,7 +1427,7 @@ void SVPipelineView::keyPressEvent(QKeyEvent* event)
   {
     if(getPipelineState() == PipelineViewState::Running)
     {
-      emit deleteKeyPressed();
+      Q_EMIT deleteKeyPressed();
     }
   }
   else if(event->key() == Qt::Key_A && qApp->queryKeyboardModifiers() == Qt::ControlModifier)
@@ -1564,8 +1564,8 @@ int SVPipelineView::openPipeline(const QString& filePath, int insertIndex)
   }
 
   // Notify user of successful read
-  emit statusMessage(tr("Opened \"%1\" Pipeline").arg(baseName));
-  emit stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(tr("Opened \"%1\" Pipeline").arg(baseName), false));
+  Q_EMIT statusMessage(tr("Opened \"%1\" Pipeline").arg(baseName));
+  Q_EMIT stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(tr("Opened \"%1\" Pipeline").arg(baseName), false));
 
   QList<AbstractFilter::Pointer> pipelineFilters = pipeline->getFilterContainer();
   std::vector<AbstractFilter::Pointer> filters;
@@ -1577,8 +1577,8 @@ int SVPipelineView::openPipeline(const QString& filePath, int insertIndex)
   // Populate the pipeline view
   addFilters(filters, insertIndex);
 
-  emit pipelineFilePathUpdated(filePath);
-  emit pipelineChanged();
+  Q_EMIT pipelineFilePathUpdated(filePath);
+  Q_EMIT pipelineChanged();
 
   return 0;
 }
@@ -1619,7 +1619,7 @@ void SVPipelineView::mousePressEvent(QMouseEvent* event)
     {
       clearSelection();
 
-      emit filterInputWidgetNeedsCleared();
+      Q_EMIT filterInputWidgetNeedsCleared();
     }
   }
 
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index 6e32c138c6..b210791510 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -246,7 +246,7 @@ class SVWidgetsLib_EXPORT SVPipelineView : public QListView, public PipelineView
    */
   QPixmap getHighDPIDeleteBtnHoveredPixmap(bool highlighted = false);
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief Adds a filter with the specified filterClassName to the current model
    * @param filterClassName
@@ -358,7 +358,7 @@ public slots:
    */
   void processPipelineMessage(const AbstractMessage::Pointer& pm) override;
 
-signals:
+Q_SIGNALS:
   void displayIssuesTriggered();
   void clearIssuesTriggered();
   void clearDataStructureWidgetTriggered();
@@ -411,7 +411,7 @@ public slots:
   void setFiltersEnabled(QModelIndexList indexes, bool enabled);
   void setSelectedFiltersEnabled(bool enabled);
 
-protected slots:
+protected Q_SLOTS:
   void requestContextMenu(const QPoint& pos);
 
   /**
@@ -429,7 +429,7 @@ protected slots:
   void listenPasteTriggered();
   void listenClearPipelineTriggered();
 
-private slots:
+private Q_SLOTS:
   /**
    * @brief listenFilterInProgress
    * @param filter
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index 302496beb6..707a4b1106 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -261,7 +261,7 @@ bool SVStyle::loadStyleSheet(const QString& jsonFilePath)
 
   // FINALLY, Set the style sheet into the app object
   qApp->setStyleSheet(cssContent);
-  emit styleSheetLoaded(jsonFilePath);
+  Q_EMIT styleSheetLoaded(jsonFilePath);
   return success;
 }
 
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index 626610c233..4ede0a769a 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -1671,7 +1671,7 @@ class SVWidgetsLib_EXPORT SVStyle : public QObject
    */
   void initialize();
 
-signals:
+Q_SIGNALS:
   void styleSheetLoaded(const QString& styleFilePath);
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
index f4f04eabfa..fc578659de 100644
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
@@ -67,10 +67,10 @@ class SVWidgetsLib_EXPORT StandardOutputWidget : public QWidget, public IObserve
 protected:
   void setupGui();
 
-public slots:
+public Q_SLOTS:
   void requestContextMenu(const QPoint& pos);
 
-protected slots:
+protected Q_SLOTS:
   /**
    * @brief saveLog
    */
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarButton.h b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
index 5673ed4b0f..14468ffb79 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarButton.h
@@ -41,7 +41,7 @@ class SVWidgetsLib_EXPORT StatusBarButton : public QToolButton
    */
   int getTextMargin();
 
-signals:
+Q_SIGNALS:
   void visibilityChanged(bool visible);
 
 private:
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
index f6b4c317df..3c92136877 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarIssuesButton.h
@@ -17,7 +17,7 @@ class SVWidgetsLib_EXPORT StatusBarIssuesButton : public StatusBarButton
    */
   void paintEvent(QPaintEvent* event) override;
 
-public slots:
+public Q_SLOTS:
   void setErrorBadgeCount(int count);
   void setWarningBadgeCount(int count);
 
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
index 4a4cb60419..acbe05e182 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
@@ -93,7 +93,7 @@ class SVWidgetsLib_EXPORT StatusBarWidget : public QFrame, private Ui::StatusBar
    */
   QString generateStyleSheet(bool error);
 
-public slots:
+public Q_SLOTS:
   /**
    * @brief issuesVisibilityChanged
    * @param b
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
index 5fa7eeb26f..c1aeb86806 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
@@ -146,10 +146,10 @@ void AddFilterCommand::undo()
 
   m_PipelineView->preflightPipeline();
 
-  emit m_PipelineView->pipelineChanged();
+  Q_EMIT m_PipelineView->pipelineChanged();
 
-  emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
+  Q_EMIT m_PipelineView->statusMessage(statusMessage);
+  Q_EMIT m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -169,8 +169,8 @@ void AddFilterCommand::redo()
     addFilter(m_Filters[i], m_FilterRows[i]);
   }
 
-  emit m_PipelineView->preflightPipeline();
-  emit m_PipelineView->pipelineChanged();
+  Q_EMIT m_PipelineView->preflightPipeline();
+  Q_EMIT m_PipelineView->pipelineChanged();
 
   QString statusMessage;
   if(m_Filters.size() > 1)
@@ -192,8 +192,8 @@ void AddFilterCommand::redo()
     m_FirstRun = false;
   }
 
-  emit model->statusMessageGenerated(statusMessage);
-  emit model->standardOutputMessageGenerated(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
+  Q_EMIT model->statusMessageGenerated(statusMessage);
+  Q_EMIT model->standardOutputMessageGenerated(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -283,7 +283,7 @@ void AddFilterCommand::connectFilterSignalsSlots(const AbstractFilter::Pointer&
     {
       m_PipelineView->preflightPipeline();
     }
-    emit m_PipelineView->filterParametersChanged(filter);
+    Q_EMIT m_PipelineView->filterParametersChanged(filter);
   });
   m_Connections[filter] = connection;
 }
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
index 8990188b77..779371b464 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
@@ -110,13 +110,13 @@ void MoveFilterCommand::undo()
 
   //    if (m_Filters.size() == 1)
   //    {
-  //      emit m_DestinationView->statusMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
-  //      emit m_DestinationView->stdOutMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
+  //      Q_EMIT m_DestinationView->statusMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
+  //      Q_EMIT m_DestinationView->stdOutMessage(QObject::tr("Moved \"%1\" filter").arg(m_Filters[0]->getHumanLabel()));
   //    }
   //    else
   //    {
-  //      emit m_DestinationView->statusMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
-  //      emit m_DestinationView->stdOutMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
+  //      Q_EMIT m_DestinationView->statusMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
+  //      Q_EMIT m_DestinationView->stdOutMessage(QObject::tr("Moved %1 filters").arg(m_Filters.size()));
   //    }
   //  }
 }
@@ -177,11 +177,11 @@ void MoveFilterCommand::redo()
     m_FirstRun = false;
   }
 
-  emit m_PipelineView->preflightPipeline();
-  emit model->pipelineDataChanged(QModelIndex());
+  Q_EMIT m_PipelineView->preflightPipeline();
+  Q_EMIT model->pipelineDataChanged(QModelIndex());
 
-  emit model->statusMessageGenerated(statusMessage);
-  emit model->standardOutputMessageGenerated(statusMessage);
+  Q_EMIT model->statusMessageGenerated(statusMessage);
+  Q_EMIT model->standardOutputMessageGenerated(statusMessage);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
index 84f83d9c03..c6c6c7b5bd 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
@@ -115,7 +115,7 @@ void RemoveFilterCommand::undo()
 
   m_PipelineView->preflightPipeline();
 
-  emit m_PipelineView->pipelineChanged();
+  Q_EMIT m_PipelineView->pipelineChanged();
 
   QString statusMessage;
   if(m_Filters.size() > 1)
@@ -133,8 +133,8 @@ void RemoveFilterCommand::undo()
     statusMessage = QObject::tr("Undo \"Removed '%1' filter at index %2\"").arg(m_Filters[0]->getHumanLabel()).arg(m_FilterRows[0] + 1);
   }
 
-  emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
+  Q_EMIT m_PipelineView->statusMessage(statusMessage);
+  Q_EMIT m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -184,10 +184,10 @@ void RemoveFilterCommand::redo()
 
   m_PipelineView->preflightPipeline();
 
-  emit m_PipelineView->pipelineChanged();
+  Q_EMIT m_PipelineView->pipelineChanged();
 
-  emit m_PipelineView->statusMessage(statusMessage);
-  emit m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
+  Q_EMIT m_PipelineView->statusMessage(statusMessage);
+  Q_EMIT m_PipelineView->stdOutMessage(SVStyle::Instance()->WrapTextWithHtmlStyle(statusMessage, false));
 }
 
 // -----------------------------------------------------------------------------
@@ -277,7 +277,7 @@ void RemoveFilterCommand::connectFilterSignalsSlots(const AbstractFilter::Pointe
     {
       m_PipelineView->preflightPipeline();
     }
-    emit m_PipelineView->filterParametersChanged(filter);
+    Q_EMIT m_PipelineView->filterParametersChanged(filter);
   });
   m_Connections[filter] = connection;
 }
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
index 899b9669df..2972419242 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandler.h
@@ -98,7 +98,7 @@ class QtWebAppLib_EXPORT HttpConnectionHandler : public QThread
   /**  Create SSL or TCP socket */
   void createSocket();
 
-public slots:
+public Q_SLOTS:
 
   /**
     Received from from the listener, when the handler shall start processing a new connection.
@@ -106,7 +106,7 @@ public slots:
   */
   void handleConnection(tSocketDescriptor socketDescriptor);
 
-private slots:
+private Q_SLOTS:
 
   /** Received from the socket when a read-timeout occured */
   void readTimeout();
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
index b6da919a57..decb0c8b2e 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.cpp
@@ -22,7 +22,7 @@ HttpConnectionHandlerPool::HttpConnectionHandlerPool(ServerSettings* settings, H
 HttpConnectionHandlerPool::~HttpConnectionHandlerPool()
 {
   // delete all connection handlers and wait until their threads are closed
-  foreach(HttpConnectionHandler* handler, pool)
+  for(HttpConnectionHandler* handler : pool)
   {
     delete handler;
   }
@@ -38,7 +38,7 @@ HttpConnectionHandler* HttpConnectionHandlerPool::getConnectionHandler()
   HttpConnectionHandler* freeHandler = nullptr;
   mutex.lock();
   // find a free handler in pool
-  foreach(HttpConnectionHandler* handler, pool)
+  for(HttpConnectionHandler* handler : pool)
   {
     if(!handler->isBusy())
     {
@@ -67,7 +67,7 @@ void HttpConnectionHandlerPool::cleanup()
   int maxIdleHandlers = settings->minThreads;
   int idleCounter = 0;
   mutex.lock();
-  foreach(HttpConnectionHandler* handler, pool)
+  for(HttpConnectionHandler* handler : pool)
   {
     if(!handler->isBusy())
     {
diff --git a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
index 6691f5e5ad..1aba26d54a 100644
--- a/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
+++ b/ThirdParty/QtWebApp/httpserver/httpconnectionhandlerpool.h
@@ -85,7 +85,7 @@ class QtWebAppLib_EXPORT HttpConnectionHandlerPool : public QObject
   /** Load SSL configuration */
   void loadSslConfig();
 
-private slots:
+private Q_SLOTS:
 
   /** Received from the clean-up timer.  */
   void cleanup();
diff --git a/ThirdParty/QtWebApp/httpserver/httpcookie.cpp b/ThirdParty/QtWebApp/httpserver/httpcookie.cpp
index 4158c7118f..4ab04f3f90 100644
--- a/ThirdParty/QtWebApp/httpserver/httpcookie.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpcookie.cpp
@@ -32,7 +32,7 @@ HttpCookie::HttpCookie(const QByteArray source)
   maxAge = 0;
   secure = false;
   QList<QByteArray> list = splitCSV(source);
-  foreach(QByteArray part, list)
+  for(QByteArray part : list)
   {
 
     // Split the part into name and value
diff --git a/ThirdParty/QtWebApp/httpserver/httplistener.cpp b/ThirdParty/QtWebApp/httpserver/httplistener.cpp
index 408831941a..4cf5314f85 100644
--- a/ThirdParty/QtWebApp/httpserver/httplistener.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httplistener.cpp
@@ -50,12 +50,12 @@ void HttpListener::listen()
   QHostAddress hostAddress(host);
   if(hostAddress.isNull())
   {
-    foreach(const QNetworkInterface& netInterface, QNetworkInterface::allInterfaces())
+    for(const QNetworkInterface& netInterface : QNetworkInterface::allInterfaces())
     {
       QNetworkInterface::InterfaceFlags flags = netInterface.flags();
       if(static_cast<bool>(flags & QNetworkInterface::IsRunning) && !static_cast<bool>(flags & QNetworkInterface::IsLoopBack))
       {
-        foreach(const QNetworkAddressEntry& address, netInterface.addressEntries())
+        for(const QNetworkAddressEntry& address : netInterface.addressEntries())
         {
           if(address.ip().protocol() == QAbstractSocket::IPv4Protocol)
           {
diff --git a/ThirdParty/QtWebApp/httpserver/httplistener.h b/ThirdParty/QtWebApp/httpserver/httplistener.h
index 096fa0e731..1a01af3dc9 100644
--- a/ThirdParty/QtWebApp/httpserver/httplistener.h
+++ b/ThirdParty/QtWebApp/httpserver/httplistener.h
@@ -84,7 +84,7 @@ class QtWebAppLib_EXPORT HttpListener : public QTcpServer
   /** Pool of connection handlers */
   HttpConnectionHandlerPool* pool;
 
-signals:
+Q_SIGNALS:
 
   /**
     Sent to the connection handler to process a new incoming connection.
diff --git a/ThirdParty/QtWebApp/httpserver/httprequest.cpp b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
index 2a1ac63eba..15b3c79af4 100644
--- a/ThirdParty/QtWebApp/httpserver/httprequest.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httprequest.cpp
@@ -239,7 +239,7 @@ void HttpRequest::decodeRequestParams()
   }
   // Split the parameters into pairs of value and name
   QList<QByteArray> list = rawParameters.split('&');
-  foreach(QByteArray part, list)
+  for(QByteArray part : list)
   {
     int equalsChar = part.indexOf('=');
     if(equalsChar >= 0)
@@ -261,10 +261,10 @@ void HttpRequest::extractCookies()
 #ifdef SUPERVERBOSE
   qDebug("HttpRequest: extract cookies");
 #endif
-  foreach(QByteArray cookieStr, headers.values("cookie"))
+  for(QByteArray cookieStr : headers.values("cookie"))
   {
     QList<QByteArray> list = HttpCookie::splitCSV(cookieStr);
-    foreach(QByteArray part, list)
+    for(QByteArray part : list)
     {
 #ifdef SUPERVERBOSE
       qDebug("HttpRequest: found cookie %s", part.data());
@@ -518,7 +518,7 @@ void HttpRequest::parseMultiPartFile()
 
 HttpRequest::~HttpRequest()
 {
-  foreach(QByteArray key, uploadedFiles.keys())
+  for(QByteArray key : uploadedFiles.keys())
   {
     QTemporaryFile* file = uploadedFiles.value(key);
     if(file->isOpen())
diff --git a/ThirdParty/QtWebApp/httpserver/httpresponse.cpp b/ThirdParty/QtWebApp/httpserver/httpresponse.cpp
index bfb03c3665..18d770ca67 100644
--- a/ThirdParty/QtWebApp/httpserver/httpresponse.cpp
+++ b/ThirdParty/QtWebApp/httpserver/httpresponse.cpp
@@ -54,14 +54,14 @@ void HttpResponse::writeHeaders()
   buffer.append(' ');
   buffer.append(m_StatusCodeLookup.value(statusCode));
   buffer.append("\r\n");
-  foreach(QByteArray name, headers.keys())
+  for(QByteArray name : headers.keys())
   {
     buffer.append(name);
     buffer.append(": ");
     buffer.append(headers.value(name));
     buffer.append("\r\n");
   }
-  foreach(HttpCookie cookie, cookies.values())
+  for(HttpCookie cookie : cookies.values())
   {
     buffer.append("Set-Cookie: ");
     buffer.append(cookie.toByteArray());
diff --git a/ThirdParty/QtWebApp/httpserver/httpsessionstore.h b/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
index fce57bcc3f..bceb9037ee 100644
--- a/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
+++ b/ThirdParty/QtWebApp/httpserver/httpsessionstore.h
@@ -112,7 +112,7 @@ class QtWebAppLib_EXPORT HttpSessionStore : public QObject
   /** Used to synchronize threads */
   QMutex mutex;
 
-private slots:
+private Q_SLOTS:
 
   /** Called every minute to cleanup expired sessions. */
   void sessionTimerEvent();
diff --git a/ThirdParty/QtWebApp/logging/filelogger.cpp b/ThirdParty/QtWebApp/logging/filelogger.cpp
index 2760e650f3..91d88538fd 100644
--- a/ThirdParty/QtWebApp/logging/filelogger.cpp
+++ b/ThirdParty/QtWebApp/logging/filelogger.cpp
@@ -132,7 +132,7 @@ void FileLogger::rotate()
 {
   // count current number of existing backup files
   int count = 0;
-  forever
+  while(true)
   {
     QFile bakFile(QString("%1.%2").arg(fileName).arg(count + 1));
     if(bakFile.exists())
diff --git a/ThirdParty/QtWebApp/logging/logmessage.cpp b/ThirdParty/QtWebApp/logging/logmessage.cpp
index 732f153f62..7fd261def4 100644
--- a/ThirdParty/QtWebApp/logging/logmessage.cpp
+++ b/ThirdParty/QtWebApp/logging/logmessage.cpp
@@ -73,7 +73,7 @@ QString LogMessage::toString(const QString& msgFormat, const QString& timestampF
   if(decorated.contains("{") && !logVars.isEmpty())
   {
     QList<QString> keys = logVars.keys();
-    foreach(QString key, keys)
+    for(QString key : keys)
     {
       decorated.replace("{" + key + "}", logVars.value(key));
     }
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice.cpp b/ThirdParty/QtWebApp/qtservice/qtservice.cpp
index cf49a2eba3..e18461b602 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice.cpp
+++ b/ThirdParty/QtWebApp/qtservice/qtservice.cpp
@@ -413,7 +413,7 @@ class QtServiceStarter : public QObject
   , d_ptr(service)
   {
   }
-public slots:
+public Q_SLOTS:
   void slotStart()
   {
     d_ptr->startService();
diff --git a/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp b/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
index 50dbbae933..acbb6bc734 100644
--- a/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
+++ b/ThirdParty/QtWebApp/qtservice/qtservice_unix.cpp
@@ -296,7 +296,7 @@ class QtServiceSysPrivate : public QtUnixServerSocket
 protected:
   void incomingConnection(tSocketDescriptor socketDescriptor) Q_DECL_OVERRIDE;
 
-private slots:
+private Q_SLOTS:
   void slotReady();
   void slotClosed();
 
@@ -489,7 +489,7 @@ void QtServiceBase::logMessage(const QString& message, QtServiceBase::MessageTyp
     ::memcpy(d_ptr->sysd->ident, tmp.toLocal8Bit().constData(), len);
   }
   openlog(d_ptr->sysd->ident, LOG_PID, LOG_DAEMON);
-  foreach(QString line, message.split('\n'))
+  for(QString line : message.split('\n'))
     syslog(st, "%s", line.toLocal8Bit().constData());
   closelog();
 }
diff --git a/ThirdParty/QtWebApp/templateengine/templateloader.cpp b/ThirdParty/QtWebApp/templateengine/templateloader.cpp
index 58abe8db85..3217aadc63 100644
--- a/ThirdParty/QtWebApp/templateengine/templateloader.cpp
+++ b/ThirdParty/QtWebApp/templateengine/templateloader.cpp
@@ -70,7 +70,7 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
   QStringList locs = locales.split(',', QString::SkipEmptyParts);
 
   // Search for exact match
-  foreach(QString loc, locs)
+  for(QString loc : locs)
   {
     loc.replace(QRegExp(";.*"), "");
     loc.replace('-', '_');
@@ -87,7 +87,7 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
   }
 
   // Search for correct language but any country
-  foreach(QString loc, locs)
+  for(QString loc : locs)
   {
     loc.replace(QRegExp("[;_-].*"), "");
     QString localizedName = templateName + "-" + loc.trimmed();
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
index dad6f76eb1..9921a9fdb3 100644
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
@@ -202,7 +202,7 @@ void PyBind11Generator::copyPyInitFiles()
 
   QFileInfoList itemList = currentDir.entryInfoList(filters);
 
-  foreach(QFileInfo itemInfo, itemList)
+  for(QFileInfo itemInfo : itemList)
   {
     QString pyFilePath = itemInfo.absoluteFilePath();
 
@@ -271,7 +271,7 @@ void PyBind11Generator::recursiveSearch(const QDir& currentDir)
     QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
     if(!dirList.empty())
     {
-      foreach(QFileInfo fi, dirList)
+      for(QFileInfo fi : dirList)
       {
         recursiveSearch(QDir(fi.absoluteFilePath())); // Recursive call
       }
@@ -279,7 +279,7 @@ void PyBind11Generator::recursiveSearch(const QDir& currentDir)
     QStringList filters;
     filters.append("*.h");
     QFileInfoList itemList = currentDir.entryInfoList(filters);
-    foreach(QFileInfo itemInfo, itemList)
+    for(QFileInfo itemInfo : itemList)
     {
       QString headerFilePath = itemInfo.absoluteFilePath();
       generatePybind11Header(headerFilePath);

From d7654b52d36d39b0af2ef4d93ffdc01c0c39cb39 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 12 Mar 2021 11:52:39 -0500
Subject: [PATCH 362/397] Compiler Warning cleanups

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataContainers/DataArrayPath.cpp           | 2 --
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp             | 2 +-
 .../DataContainerArrayProxyWidget.h                       | 4 ++--
 .../FilterParameterWidgets/DataContainerReaderWidget.h    | 8 ++++----
 .../FilterParameterWidgets/DynamicChoiceWidget.h          | 4 ++--
 .../FilterParameterWidgets/DynamicTableWidget.h           | 4 ++--
 .../FilterParameterWidgets/FilterParameterWidget.h        | 8 ++++----
 .../FilterParameterWidgets/GenerateColorTableWidget.h     | 8 ++++----
 8 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 088716f158..97b5da176f 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -40,8 +40,6 @@
 #include <QtCore/QJsonObject>
 
 #include "SIMPLib/Common/Constants.h"
-#include "SIMPLib/DataArrays/NeighborList.hpp"
-#include "SIMPLib/DataContainers/DataContainer.h"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 
 namespace
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index ee2cb80e18..55f804699e 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -280,7 +280,7 @@ void PrimaryStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    for(const QString key : keys)
+    for(const QString& key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index b6b85ce00d..4bfdd09302 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -81,8 +81,8 @@ class SVWidgetsLib_EXPORT DataContainerArrayProxyWidget : public FilterParameter
    */
   void setupGui() override;
 
-  void setFilterParameter(FilterParameter* value);
-  FilterParameter* getFilterParameter() const;
+  void setFilterParameter(FilterParameter* value) override;
+  FilterParameter* getFilterParameter() const override;
 
 public Q_SLOTS:
   void beforePreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index 0b2afc4f40..ed2cd0347d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -87,11 +87,11 @@ class SVWidgetsLib_EXPORT DataContainerReaderWidget : public FilterParameterWidg
    */
   void setupGui() override;
 
-  void setFilter(AbstractFilter* value);
-  AbstractFilter* getFilter() const;
+  void setFilter(AbstractFilter* value) override;
+  AbstractFilter* getFilter() const override;
 
-  void setFilterParameter(FilterParameter* value);
-  FilterParameter* getFilterParameter() const;
+  void setFilterParameter(FilterParameter* value) override;
+  FilterParameter* getFilterParameter() const override;
 
 public Q_SLOTS:
   void beforePreflight();
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index 2cf5c73957..908e5f15ab 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -74,8 +74,8 @@ class SVWidgetsLib_EXPORT DynamicChoiceWidget : public FilterParameterWidget, pr
    */
   void setupGui() override;
 
-  void setFilterParameter(FilterParameter* value);
-  FilterParameter* getFilterParameter() const;
+  void setFilterParameter(FilterParameter* value) override;
+  FilterParameter* getFilterParameter() const override;
 
 public Q_SLOTS:
   void widgetChanged(int index);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index 6ee057e91e..e13ac35185 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -81,8 +81,8 @@ class SVWidgetsLib_EXPORT DynamicTableWidget : public FilterParameterWidget, pri
    */
   void initializeWidget(FilterParameter* parameter, AbstractFilter* filter);
 
-  void setFilterParameter(FilterParameter* value);
-  FilterParameter* getFilterParameter() const;
+  void setFilterParameter(FilterParameter* value) override;
+  FilterParameter* getFilterParameter() const override;
 
   std::vector<std::vector<double>> getData();
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 66ae789cbc..2d230307f3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -88,22 +88,22 @@ class SVWidgetsLib_EXPORT FilterParameterWidget : public QFrame
   /**
    * @brief Setter property for Filter
    */
-  void setFilter(AbstractFilter* value);
+  virtual void setFilter(AbstractFilter* value);
   /**
    * @brief Getter property for Filter
    * @return Value of Filter
    */
-  AbstractFilter* getFilter() const;
+  virtual AbstractFilter* getFilter() const;
 
   /**
    * @brief Setter property for FilterParameter
    */
-  void setFilterParameter(FilterParameter* value);
+  virtual void setFilterParameter(FilterParameter* value);
   /**
    * @brief Getter property for FilterParameter
    * @return Value of FilterParameter
    */
-  FilterParameter* getFilterParameter() const;
+  virtual FilterParameter* getFilterParameter() const;
 
   /**
    * @brief Setter property for WidgetIsExpanding
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index d19d2f5cdc..30d8842a4c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -83,11 +83,11 @@ class SVWidgetsLib_EXPORT GenerateColorTableWidget : public FilterParameterWidge
    */
   void setupGui() override;
 
-  void setFilter(AbstractFilter* value);
-  AbstractFilter* getFilter() const;
+  void setFilter(AbstractFilter* value) override;
+  AbstractFilter* getFilter() const override;
 
-  void setFilterParameter(FilterParameter* value);
-  FilterParameter* getFilterParameter() const;
+  void setFilterParameter(FilterParameter* value) override;
+  FilterParameter* getFilterParameter() const override;
 
 public Q_SLOTS:
   void beforePreflight();

From acc9ab6bce40240ed323f25a4f7627c0f0036f2a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 16 Mar 2021 10:34:34 -0400
Subject: [PATCH 363/397] Compiler warning cleanups from earlier 'foreach'
 global replace

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataContainers/DataArrayPath.cpp               | 2 +-
 Source/SIMPLib/StatsData/PrecipitateStatsData.cpp             | 2 +-
 Source/SIMPLib/StatsData/StatsData.cpp                        | 4 ++--
 Source/SIMPLib/StatsData/TransformationStatsData.cpp          | 2 +-
 .../Widgets/ImportASCIIDataWizard/DataFormatPage.cpp          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index 97b5da176f..c9e4a9536f 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -192,7 +192,7 @@ DataArrayPath::~DataArrayPath() = default;
 QVector<DataArrayPath> DataArrayPath::ConvertToQVector(QStringList& paths)
 {
   QVector<DataArrayPath> vPaths;
-  for(const QString sPath : paths)
+  for(const QString& sPath : paths)
   {
     DataArrayPath p(sPath);
     vPaths.push_back(p);
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index f5ffd70aae..ee41d5125a 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -293,7 +293,7 @@ void PrecipitateStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    for(const QString key : keys)
+    for(const QString& key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 1ab2f9d012..6bac04f2ef 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -346,7 +346,7 @@ VectorOfFloatArray StatsData::ReadJsonDistributionArrays(const QJsonObject& json
   disType = StatsData::EncodeDistributionType(disTypeString);
 
   QStringList arrayNames = StatsData::ArrayNamesFromDistributionType(disTypeString);
-  for(const QString arrayName : arrayNames)
+  for(const QString& arrayName : arrayNames)
   {
     QJsonArray data = jDistribution[arrayName].toArray();
     DataArray<float>::Pointer array = decodeDataArrayFromJsonDoubleArray<float>(arrayName, data);
@@ -364,7 +364,7 @@ VectorOfFloatArray StatsData::ReadJsonVectorOfFloatsArrays(const QJsonObject& js
   VectorOfFloatArray arrays;
   QJsonObject obj = json[key].toObject();
   QStringList arrayNames = obj.keys();
-  for(const QString name : arrayNames)
+  for(const QString& name : arrayNames)
   {
     QJsonValue value = obj[name];
     if(value.isArray())
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index b1cda549f7..a624c59128 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -290,7 +290,7 @@ void TransformationStatsData::readJson(const QJsonObject& json)
     QJsonObject avgSizeDist = jsonValue.toObject();
     QStringList keys = avgSizeDist.keys();
     VectorOfFloatArray arrays;
-    for(const QString key : keys)
+    for(const QString& key : keys)
     {
       FloatArrayType::Pointer fArray = FloatArrayType::CreateArray(1, key, true);
       fArray->setValue(0, avgSizeDist[key].toDouble());
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index 5481fb74fe..cb81c84f01 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -146,7 +146,7 @@ void DataFormatPage::setupGui()
 
   QVector<QString> amTypes = AttributeMatrix::GetTypesAsStrings();
 
-  for(const QString amType : amTypes)
+  for(const QString& amType : amTypes)
   {
     attributeMatrixType->addItem(amType);
   }

From 3ca4b5a94688e65ff25f69792e8c6241eb615ed1 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 23 Mar 2021 15:48:11 -0400
Subject: [PATCH 364/397] Find potential out-of-bounds access during filename
 parsing.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index a0b77afebd..c02ec89ff9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -531,7 +531,7 @@ void FileListInfoWidget::findMaxSliceAndPrefix()
         fPrefix = fn.left(pos);
         pos += rx.matchedLength();
       }
-      while(digitEnd >= 0 && fn[digitEnd] >= '0' && fn[digitEnd] <= '9')
+      while(digitEnd >= 0 && digitEnd < fn.size() && fn[digitEnd] >= '0' && fn[digitEnd] <= '9')
       {
         ++digitEnd;
       }

From 61fc722c009c779e175b6abca385a8968893a65f Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 1 Apr 2021 16:52:25 -0400
Subject: [PATCH 365/397] Add filter to generate the voxel cell centers for an
 Image Geometry (#421)

* Add filter to generate the voxel cell centers for an Image Geometry
* Fix bug in ExtractVertexGeoemtry uncovered during code review

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
Co-authored-by: JDuffeyBQ <jared.duffey@bluequartz.net>
---
 .../CoreFilters/ExtractVertexGeometry.cpp     |   4 +-
 .../CoreFilters/GenerateVertexCoordinates.cpp | 288 ++++++++++++++++++
 .../CoreFilters/GenerateVertexCoordinates.h   | 195 ++++++++++++
 Source/SIMPLib/CoreFilters/SourceList.cmake   |   1 +
 .../Cxx/GenerateVertexCoordinatesTest.cpp     | 143 +++++++++
 .../CoreFilters/Testing/Cxx/SourceList.cmake  |   1 +
 .../CoreFilters/GenerateVertexCoordinates.md  |  49 +++
 7 files changed, 678 insertions(+), 3 deletions(-)
 create mode 100644 Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
 create mode 100644 Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
 create mode 100644 Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateVertexCoordinatesTest.cpp
 create mode 100644 Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateVertexCoordinates.md

diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 4a60fc433e..132d7f894e 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -102,9 +102,7 @@ void ExtractVertexGeometry::setupFilterParameters()
 
   {
     DataContainerSelectionFilterParameter::RequirementType req;
-    req.dcGeometryTypes = IGeometry::Types(2);
-    req.dcGeometryTypes[0] = IGeometry::Type::Image;
-    req.dcGeometryTypes[0] = IGeometry::Type::RectGrid;
+    req.dcGeometryTypes = {IGeometry::Type::Image, IGeometry::Type::RectGrid};
     parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container with Input Geometry", SelectedDataContainerName, FilterParameter::Category::RequiredArray, ExtractVertexGeometry, req));
   }
 
diff --git a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
new file mode 100644
index 0000000000..e9ef9ad3fc
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
@@ -0,0 +1,288 @@
+/* ============================================================================
+ * Copyright (c) 2009-2016 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#include "GenerateVertexCoordinates.h"
+
+#include <array>
+#include <numeric>
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
+#include "SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h"
+
+enum createdPathID : RenameDataPath::DataID_t
+{
+  DataArrayID31 = 31
+};
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenerateVertexCoordinates::GenerateVertexCoordinates()
+{
+  initialize();
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+GenerateVertexCoordinates::~GenerateVertexCoordinates() = default;
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::initialize()
+{
+  clearErrorCode();
+  clearWarningCode();
+  setCancel(false);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::setupFilterParameters()
+{
+  FilterParameterVectorType parameters;
+  {
+    DataContainerSelectionFilterParameter::RequirementType req;
+    req.dcGeometryTypes = {IGeometry::Type::Image, IGeometry::Type::RectGrid};
+    parameters.push_back(SIMPL_NEW_DC_SELECTION_FP("Data Container with Input Geometry", SelectedDataContainerName, FilterParameter::Category::RequiredArray, GenerateVertexCoordinates, req));
+  }
+
+  DataArrayCreationFilterParameter::RequirementType req;
+  req.amTypes = {AttributeMatrix::Type::Cell};
+  parameters.push_back(SIMPL_NEW_DA_CREATION_FP("Created Vertex Coordinates", CoordinateArrayPath, FilterParameter::Category::CreatedArray, GenerateVertexCoordinates, req, 0));
+
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  if(m_SelectedDataContainerName.isEmpty())
+  {
+    QString ss = QObject::tr("The name of the input DataContainer is empty. Please specify a value.");
+    setErrorCondition(-2004, ss);
+    return;
+  }
+
+  DataContainer::Pointer dc = getDataContainerArray()->getPrereqDataContainer(this, getSelectedDataContainerName());
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  IGeometry::Pointer fromGeometry = dc->getGeometry();
+  if(nullptr == fromGeometry)
+  {
+    QString ss = QObject::tr("Selected input DataContainer must contain either an Image Geometry or RectLinearGrid Geometry. The DataContainer did not contain a Geometry object.");
+    setErrorCondition(-2008, ss);
+    return;
+  }
+  IGeometry::Type geomType = fromGeometry->getGeometryType();
+  if(IGeometry::Type::Image == geomType || IGeometry::Type::RectGrid == geomType)
+  {
+    m_CoordinatesPtr = getDataContainerArray()->createNonPrereqArrayFromPath<FloatArrayType>(this, getCoordinateArrayPath(), 0, {3}, "", DataArrayID31);
+  }
+  else
+  {
+    QString ss = QObject::tr("Data Container's Geometry type must be either an Image Geometry or RectLinearGrid Geometry. The Geomerty is of type %1").arg(fromGeometry->getGeometryTypeAsString());
+    setErrorCondition(-2010, ss);
+    return;
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::execute()
+{
+  initialize();
+  dataCheck();
+  if(getErrorCode() < 0)
+  {
+    return;
+  }
+
+  IGeometryGrid::Pointer sourceGeometry = getDataContainerArray()->getDataContainer(getSelectedDataContainerName())->getGeometryAs<IGeometryGrid>();
+
+  std::array<float, 3> coords = {0.0f, 0.0f, 0.0f};
+
+  SizeVec3Type dims = sourceGeometry->getDimensions();
+  size_t cellCount = std::accumulate(dims.begin(), dims.end(), static_cast<size_t>(1), std::multiplies<size_t>());
+
+  // Use the APIs from the IGeometryGrid to get the XYZ coord for the center of each cell and then set that into the
+  // the new VertexGeometry
+  for(size_t idx = 0; idx < cellCount; idx++)
+  {
+    sourceGeometry->getCoords(idx, coords.data());
+    m_CoordinatesPtr->setTuple(idx, coords.data());
+  }
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer GenerateVertexCoordinates::newFilterInstance(bool copyFilterParameters) const
+{
+  GenerateVertexCoordinates::Pointer filter = GenerateVertexCoordinates::New();
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getCompiledLibraryName() const
+{
+  return Core::CoreBaseName;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getBrandingString() const
+{
+  return "SIMPLib Core Filter";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getFilterVersion() const
+{
+  QString version;
+  QTextStream vStream(&version);
+  vStream << SIMPLib::Version::Major() << "." << SIMPLib::Version::Minor() << "." << SIMPLib::Version::Patch();
+  return version;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getGroupName() const
+{
+  return SIMPL::FilterGroups::CoreFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getSubGroupName() const
+{
+  return SIMPL::FilterSubGroups::ConversionFilters;
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getHumanLabel() const
+{
+  return "Generate Cell Center Coords";
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+QUuid GenerateVertexCoordinates::getUuid() const
+{
+  return QUuid("{657a79de-7d60-5d9d-9f41-80abb62a3158}");
+}
+
+// -----------------------------------------------------------------------------
+GenerateVertexCoordinates::Pointer GenerateVertexCoordinates::NullPointer()
+{
+  return Pointer(static_cast<Self*>(nullptr));
+}
+
+// -----------------------------------------------------------------------------
+std::shared_ptr<GenerateVertexCoordinates> GenerateVertexCoordinates::New()
+{
+  struct make_shared_enabler : public GenerateVertexCoordinates
+  {
+  };
+  std::shared_ptr<make_shared_enabler> val = std::make_shared<make_shared_enabler>();
+  val->setupFilterParameters();
+  return val;
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::getNameOfClass() const
+{
+  return QString("GenerateVertexCoordinates");
+}
+
+// -----------------------------------------------------------------------------
+QString GenerateVertexCoordinates::ClassName()
+{
+  return QString("GenerateVertexCoordinates");
+}
+
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::setSelectedDataContainerName(const DataArrayPath& value)
+{
+  m_SelectedDataContainerName = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenerateVertexCoordinates::getSelectedDataContainerName() const
+{
+  return m_SelectedDataContainerName;
+}
+
+// -----------------------------------------------------------------------------
+void GenerateVertexCoordinates::setCoordinateArrayPath(const DataArrayPath& value)
+{
+  m_CoordinateArrayPath = value;
+}
+
+// -----------------------------------------------------------------------------
+DataArrayPath GenerateVertexCoordinates::getCoordinateArrayPath() const
+{
+  return m_CoordinateArrayPath;
+}
diff --git a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
new file mode 100644
index 0000000000..b362ded103
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
@@ -0,0 +1,195 @@
+/* ============================================================================
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *    United States Air Force Prime Contract FA8650-07-D-5800
+ *    United States Air Force Prime Contract FA8650-10-D-5210
+ *    United States Prime Contract Navy N00173-07-C-2068
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/RectGridGeom.h"
+#include "SIMPLib/Geometry/VertexGeom.h"
+
+/**
+ * @brief The GenerateVertexCoordinates class. See [Filter documentation](@ref convertdatacontainergeometry) for details.
+ */
+class SIMPLib_EXPORT GenerateVertexCoordinates : public AbstractFilter
+{
+  Q_OBJECT
+
+  // Start Python bindings declarations
+  PYB11_BEGIN_BINDINGS(GenerateVertexCoordinates SUPERCLASS AbstractFilter)
+  PYB11_FILTER()
+  PYB11_SHARED_POINTERS(GenerateVertexCoordinates)
+  PYB11_FILTER_NEW_MACRO(GenerateVertexCoordinates)
+  PYB11_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+  PYB11_PROPERTY(DataArrayPath CoordinateArrayPath READ getCoordinateArrayPath WRITE setCoordinateArrayPath)
+  PYB11_END_BINDINGS()
+  // End Python bindings declarations
+
+public:
+  using Self = GenerateVertexCoordinates;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+
+  ~GenerateVertexCoordinates() override;
+
+  /**
+   * @brief Returns a NullPointer wrapped by a shared_ptr<>
+   * @return
+   */
+  static Pointer NullPointer();
+
+  /**
+   * @brief Creates a new object wrapped in a shared_ptr<>
+   * @return
+   */
+  static Pointer New();
+
+  /**
+   * @brief Returns the name of the class for GenerateVertexCoordinates
+   */
+  QString getNameOfClass() const override;
+  /**
+   * @brief Returns the name of the class for GenerateVertexCoordinates
+   */
+  static QString ClassName();
+
+  /**
+   * @brief Setter property for SelectedDataContainerName
+   */
+  void setSelectedDataContainerName(const DataArrayPath& value);
+  /**
+   * @brief Getter property for SelectedDataContainerName
+   * @return Value of SelectedDataContainerName
+   */
+  DataArrayPath getSelectedDataContainerName() const;
+
+  Q_PROPERTY(DataArrayPath SelectedDataContainerName READ getSelectedDataContainerName WRITE setSelectedDataContainerName)
+
+  /**
+   * @brief Setter property for VertexDataContainerName
+   */
+  void setCoordinateArrayPath(const DataArrayPath& value);
+  /**
+   * @brief Getter property for VertexDataContainerName
+   * @return Value of VertexDataContainerName
+   */
+  DataArrayPath getCoordinateArrayPath() const;
+
+  Q_PROPERTY(DataArrayPath CoordinateArrayPath READ getCoordinateArrayPath WRITE setCoordinateArrayPath)
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief setupFilterParameters Reimplemented from @see AbstractFilter class
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief execute Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  GenerateVertexCoordinates();
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+  /**
+   * @brief Initializes all the private instance variables.
+   */
+  void initialize();
+
+private:
+  DataArrayPath m_SelectedDataContainerName = {};
+  DataArrayPath m_CoordinateArrayPath = {"", "", ""};
+  FloatArrayType::Pointer m_CoordinatesPtr;
+
+public:
+  GenerateVertexCoordinates(const GenerateVertexCoordinates&) = delete;            // Copy Constructor Not Implemented
+  GenerateVertexCoordinates& operator=(const GenerateVertexCoordinates&) = delete; // Copy Assignment Not Implemented
+  GenerateVertexCoordinates(GenerateVertexCoordinates&&) = delete;                 // Move Constructor Not Implemented
+  GenerateVertexCoordinates& operator=(GenerateVertexCoordinates&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/CoreFilters/SourceList.cmake b/Source/SIMPLib/CoreFilters/SourceList.cmake
index 27bb28bba7..354ae0ce0e 100755
--- a/Source/SIMPLib/CoreFilters/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/SourceList.cmake
@@ -24,6 +24,7 @@ SIMPL_START_FILTER_GROUP(
 # List your public filters here
 
 set(_PublicFilters
+  GenerateVertexCoordinates
   ArrayCalculator
   CombineAttributeArrays
   CombineAttributeMatrices
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateVertexCoordinatesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateVertexCoordinatesTest.cpp
new file mode 100644
index 0000000000..852ab0dcec
--- /dev/null
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateVertexCoordinatesTest.cpp
@@ -0,0 +1,143 @@
+// -----------------------------------------------------------------------------
+// Insert your license & copyright information here
+// -----------------------------------------------------------------------------
+#pragma once
+
+#include <array>
+#include <cstring>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/CoreFilters/GenerateVertexCoordinates.h"
+#include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/Geometry/ImageGeom.h"
+#include "SIMPLib/Geometry/VertexGeom.h"
+#include "SIMPLib/Plugin/ISIMPLibPlugin.h"
+#include "SIMPLib/Testing/SIMPLTestFileLocations.h"
+#include "SIMPLib/Testing/UnitTestSupport.hpp"
+
+class GenerateVertexCoordinatesTest
+{
+
+public:
+  GenerateVertexCoordinatesTest() = default;
+  ~GenerateVertexCoordinatesTest() = default;
+  GenerateVertexCoordinatesTest(const GenerateVertexCoordinatesTest&) = delete;            // Copy Constructor
+  GenerateVertexCoordinatesTest(GenerateVertexCoordinatesTest&&) = delete;                 // Move Constructor
+  GenerateVertexCoordinatesTest& operator=(const GenerateVertexCoordinatesTest&) = delete; // Copy Assignment
+  GenerateVertexCoordinatesTest& operator=(GenerateVertexCoordinatesTest&&) = delete;      // Move Assignment
+
+  // -----------------------------------------------------------------------------
+  void RemoveTestFiles()
+  {
+#if REMOVE_TEST_FILES
+
+#endif
+  }
+
+  const std::vector<size_t> k_Dims = {10ULL, 20ULL, 30ULL};
+
+  // -----------------------------------------------------------------------------
+  DataContainerArray::Pointer createDataContainerArray()
+  {
+    // Create the DataContainer Array
+    DataContainerArray::Pointer dca = DataContainerArray::New();
+
+    // Create the DataContainer for the ImageGeometry
+    DataContainer::Pointer imageGeomDC = DataContainer::New(k_ImageGeomDataContainerPath);
+    dca->addOrReplaceDataContainer(imageGeomDC);
+
+    // Create an ImageGeometry
+
+    ImageGeom::Pointer imageGeom = ImageGeom::CreateGeometry("ImageGeometry");
+    imageGeom->setDimensions(k_Dims.data());
+    imageGeomDC->setGeometry(imageGeom);
+
+    // Create the Cell AttributeMatrix
+    AttributeMatrix::Pointer cellAttrMat = AttributeMatrix::New(k_Dims, k_CellAttrMatName, AttributeMatrix::Type::Cell);
+    imageGeomDC->addOrReplaceAttributeMatrix(cellAttrMat);
+
+    return dca;
+  }
+
+  // -----------------------------------------------------------------------------
+  int RunTest()
+  {
+    int32_t err = 0;
+    GenerateVertexCoordinates::Pointer filter = GenerateVertexCoordinates::New();
+
+    DataContainerArray::Pointer dca = createDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->setSelectedDataContainerName({"", "", ""});
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -2004)
+
+    DataContainer::Pointer dc = dca->getDataContainer(k_ImageGeomDataContainerPath);
+    dc->setGeometry(IGeometry::NullPointer());
+    filter->setSelectedDataContainerName(k_ImageGeomDataContainerPath);
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -2008)
+
+    dca = createDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, -80010)
+
+    filter->setCoordinateArrayPath(k_CreatedCoordinatePath);
+    filter->preflight();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0)
+
+    // Reset the Data Container Array to run the filter
+    dca = createDataContainerArray();
+    filter->setDataContainerArray(dca);
+    filter->execute();
+    err = filter->getErrorCode();
+    DREAM3D_REQUIRE_EQUAL(err, 0)
+
+    FloatArrayType::Pointer coords =
+        std::dynamic_pointer_cast<FloatArrayType>(dca->getDataContainer(k_ImageGeomDataContainerPath)->getAttributeMatrix(k_CellAttrMatName)->getAttributeArray(k_CreatedCoordinatePath));
+    std::array<float, 3> origin = {0.0F, 0.0F, 0.0F};
+    std::array<float, 3> spacing = {1.0F, 1.0F, 1.0F};
+    for(size_t z = 0; z < k_Dims[2]; z++)
+    {
+      for(size_t y = 0; y < k_Dims[1]; y++)
+      {
+        for(size_t x = 0; x < k_Dims[0]; x++)
+        {
+          size_t idx = (z * k_Dims[1] * k_Dims[0]) + (y * k_Dims[0]) + x;
+          float crds[3] = {
+              x * spacing[0] + origin[0] + (0.5f * spacing[0]),
+              y * spacing[1] + origin[1] + (0.5f * spacing[1]),
+              z * spacing[2] + origin[2] + (0.5f * spacing[2]),
+          };
+
+          float* ptr = coords->getTuplePointer(idx);
+
+          DREAM3D_REQUIRE_EQUAL(ptr[0], crds[0])
+          DREAM3D_REQUIRE_EQUAL(ptr[1], crds[1])
+          DREAM3D_REQUIRE_EQUAL(ptr[2], crds[2])
+        }
+      }
+    }
+
+    return EXIT_SUCCESS;
+  }
+
+  // -----------------------------------------------------------------------------
+  void operator()()
+  {
+    std::cout << "#### GenerateVertexCoordinatesTest Starting ####" << std::endl;
+    int32_t err; // needed inside the next macro.
+    DREAM3D_REGISTER_TEST(RunTest())
+  }
+
+private:
+  const DataArrayPath k_ImageGeomDataContainerPath = DataArrayPath("ImageGeomDataContainer", "", "");
+  const QString k_CellAttrMatName = QString("CellData");
+  const DataArrayPath k_CreatedCoordinatePath = DataArrayPath("ImageGeomDataContainer", "CellData", "Cell Centers");
+};
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
index feecf71bf3..352cfafeb0 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SourceList.cmake
@@ -52,6 +52,7 @@ set(TEST_${SUBDIR_NAME}_NAMES
   SetOriginResolutionImageGeomTest
   SplitAttributeArrayTest
   WriteTriangleGeometryTest
+  GenerateVertexCoordinatesTest
 )
 
 
diff --git a/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateVertexCoordinates.md b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateVertexCoordinates.md
new file mode 100644
index 0000000000..46e2110584
--- /dev/null
+++ b/Source/SIMPLib/Documentation/SIMPLibFilters/CoreFilters/GenerateVertexCoordinates.md
@@ -0,0 +1,49 @@
+# Generate Cell Centers #
+
+This filter will generate an Float Attribute Array that stores the center point of each voxel in an Image Geometry
+
+## Group (Subgroup) ##
+
+Core Filters (Conversion)
+
+## Description ##
+
+This filter will extract all the voxel centers of an Image Geometry or a RectilinearGrid geometry
+into a new 3x1 Float Attribute Array.
+
+## Parameters ##
+
+| Name | Type | Description |
+|------|------|------|
+| SelectedDataContainerName | string | Name of the DataContainer that has the Image or RectGrid Geometry object |
+| CoordinateArrayPath | string | Name of the newly created AttributeArray that holds the Voxel Center Values |
+
+## Required Geometry ##
+
+Required Geometry Type: **ImageGeom** or **RectilinearGrid**
+
+## Required Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|-----|
+| **Data Container** |  | ImageGeom or RectGridGeom | N/A | Input DataContainer that holds the geometry to extract |
+
+
+## Created Objects ##
+
+| Kind | Default Name | Type | Component Dimensions | Description |
+|------|--------------|-------------|---------|-----|
+| FloatArray | "Cell Centers" |  | N/A | The newly created Voxel Cell Centers |
+
+## Example Pipelines ##
+
+
+
+## License & Copyright ##
+
+Please see the description file distributed with this plugin.
+
+## DREAM3D Mailing Lists ##
+
+If you need more help with a filter, please consider asking your question on the DREAM3D Users mailing list:
+https://groups.google.com/forum/?hl=en#!forum/dream3d-users
\ No newline at end of file

From caec19622a8578bf377d2a92bf5dcb3f0add6a1e Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 2 Apr 2021 10:28:59 -0400
Subject: [PATCH 366/397] Added cbegin/cend to SIMPLArray

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/SIMPLArray.hpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Source/SIMPLib/Common/SIMPLArray.hpp b/Source/SIMPLib/Common/SIMPLArray.hpp
index 0e958e8770..e893e51aff 100644
--- a/Source/SIMPLib/Common/SIMPLArray.hpp
+++ b/Source/SIMPLib/Common/SIMPLArray.hpp
@@ -155,6 +155,24 @@ class SIMPLArray
     return m_Array.cend();
   }
 
+  /**
+   * @brief returns an iterator to the beginning
+   * @return
+   */
+  const_iterator cbegin() const
+  {
+    return m_Array.cbegin();
+  }
+
+  /**
+   * @brief returns an iterator to the end
+   * @return
+   */
+  const_iterator cend() const
+  {
+    return m_Array.cend();
+  }
+
   /**
    * @brief direct access to the underlying array
    * @return

From 326738a079102355ab5770e86366ed441b922fdf Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 14 Apr 2021 20:36:39 -0400
Subject: [PATCH 367/397] Embedded Python (#420)

* Added ability to add code to the top of the generated Python .cpp

* Added pySupport.h and Pybind11CustomTypeCasts.h to project view
for Python targets
* Changed more pybind11 headers to system headers

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added CMake option to embed Python

* Added define SIMPL_EMBED_PYTHON

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added Python code folder and link to pybind11::embed

* Create folder in build directory for Python filters

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added ability to load filters from Python

* Check the Python folder next to the application and
SIMPL_PYTHONPATH for filters to load
* Python files must define a global variable filters which is a
list of strings. Each string is the name of a class that will be
loaded.
* Each Python filter must derive from the Filter base class
* In order to use a Python filter in a FilterPipeline in Python
it must be wrapped with PythonFilter
* AbstractFilter nows has a DataContainerArray property in Python
* When calling Python filters in C++ the GIL must be held/released
appropriately especially in multithreaded environments

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* JsonFilterParameterReader can now read directly from QJsonObject

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Made FilterDelegate functions const where appropriate

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added functions for checking and clearing the undo stack

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added ability to toggle animations when clearing the pipeline

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed compile error when compiling without SIMPL_EMBED_PYTHON

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed lack of return in PythonFilterFactory::NullPointer

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed from WIN32 to _WIN32

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added comment lines

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Removed one redundant GIL acquire guard

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added skeleton cross platform Python path

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added install rule for empty Python directory and Filter.py

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added install rule for Python bindings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Formatted PythonFilterFactory.hpp

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Formatted PythonLoader.cpp

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added warning for non-Windows platforms

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Require at least pybind11 2.6

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added copyright comments

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added Python functions to add/remove filters to/from filter manager

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Formatted PipelineView.h

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Make pybind11::embed a private dependency of SIMPLib

* Allow PipelineRunner to continue without Python if PYTHONHOME is
not found

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added cancel check to PythonFilter

* Added DataContainerArray null check to PythonFilter

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed compile error on gcc in PythonLoader

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* PythonLoader::loadPythonFilters now returns the number loaded

* PipelinerRunner now prints the number of Python filters loaded

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added newline to warning message in PipelineRunner

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added function to add to Python module search path

* Allows application to find Filter.py base class

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Better checking for Filter base class

* Now filters should be a list of types

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added Linux and macOS path handling in PythonLoader

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added Qt version check for environment variable function

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Moved SIMPL_PYTHONPATH to constant

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed wrong return type

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixed visibility warning on gcc

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added preflight property to delegate

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added check against empty name for Python DataArray

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Formatted PythonLoader.h

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added more Python bindings for data structure classes

* Implemented __len__, __contains__, and __getitem__
* Added createNonPrereq* functions to bindings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added Python iterators to data structure classes

* Added dtype property to Python DataArray
* Added __repr__ to Python DataArrayPath

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added example Python filter ported from InitializeData

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Added options for Anaconda build

* Fixed bug in generate_python_binding.py where one of the
arguments of read_plugin_file_list and read_simpl_file_list was
unused

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Fixing install rules for SIMPL and QtWebApp

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>

* Fixed SVWidgets install rule

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Renamed SIMPL_ENABLE_PYTHON to SIMPL_WRAP_PYTHON

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Changed experimental warnings for just macOS

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

* Removed unused CMake lines

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>

Co-authored-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt                                |  85 ++--
 Resources/CPack/PackageProject.cmake          |   6 +-
 Source/PipelineRunner/CMakeLists.txt          |   9 +-
 Source/PipelineRunner/PipelineRunner.cpp      |  43 ++-
 Source/SIMPLib/CMakeLists.txt                 | 111 ++++--
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   1 +
 Source/SIMPLib/DataContainers/DataArrayPath.h |   1 +
 Source/SIMPLib/DataContainers/DataContainer.h |   1 +
 .../DataContainers/DataContainerArray.h       |   1 +
 .../JsonFilterParametersReader.cpp            |  22 ++
 .../JsonFilterParametersReader.h              |  18 +
 Source/SIMPLib/Filtering/AbstractFilter.h     |   1 +
 Source/SIMPLib/Filtering/FilterManager.cpp    |  50 +++
 Source/SIMPLib/Filtering/FilterManager.h      |  42 ++
 Source/SIMPLib/Python/ExampleFilter.py        |  84 ++++
 Source/SIMPLib/Python/Filter.py               |  70 ++++
 Source/SIMPLib/Python/Filter.py.in            |  70 ++++
 Source/SIMPLib/Python/FilterPyObject.h        | 195 ++++++++++
 Source/SIMPLib/Python/PythonFilter.cpp        | 217 +++++++++++
 Source/SIMPLib/Python/PythonFilter.h          | 152 ++++++++
 Source/SIMPLib/Python/PythonFilterFactory.hpp | 162 ++++++++
 Source/SIMPLib/Python/PythonLoader.cpp        | 364 ++++++++++++++++++
 Source/SIMPLib/Python/PythonLoader.h          | 119 ++++++
 Source/SIMPLib/Python/SourceList.cmake        |  14 +
 Source/SIMPLib/Python/initialize_data.py      | 242 ++++++++++++
 Source/SIMPLib/SIMPLibConfiguration.h.in      |   2 +
 .../Utilities/SIMPLDataPathValidator.cpp      |   4 +
 Source/SVWidgetsLib/CMakeLists.txt            |  32 +-
 .../SVWidgetsLib/QtSupport/QtSDocServer.cpp   |   4 +
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   4 +
 Source/SVWidgetsLib/Widgets/PipelineView.cpp  |  12 +
 Source/SVWidgetsLib/Widgets/PipelineView.h    |  11 +
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   4 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   2 +-
 Support/Support.cmake                         |  23 +-
 ThirdParty/QtWebApp/CMakeLists.txt            |  35 +-
 .../Python/Binding/CreatePybind11Module.cmake |  37 +-
 .../Python/Binding/Pybind11CustomTypeCasts.h  |   3 +-
 .../Binding/generate_python_bindings.py       | 101 +++--
 Wrapping/Python/Binding/pySIMPLBody.cpp       |  36 ++
 Wrapping/Python/Binding/pySIMPLHeader.cpp     |   7 +
 Wrapping/Python/Binding/pySupport.h           | 173 ++++++++-
 42 files changed, 2417 insertions(+), 153 deletions(-)
 create mode 100644 Source/SIMPLib/Python/ExampleFilter.py
 create mode 100644 Source/SIMPLib/Python/Filter.py
 create mode 100644 Source/SIMPLib/Python/Filter.py.in
 create mode 100644 Source/SIMPLib/Python/FilterPyObject.h
 create mode 100644 Source/SIMPLib/Python/PythonFilter.cpp
 create mode 100644 Source/SIMPLib/Python/PythonFilter.h
 create mode 100644 Source/SIMPLib/Python/PythonFilterFactory.hpp
 create mode 100644 Source/SIMPLib/Python/PythonLoader.cpp
 create mode 100644 Source/SIMPLib/Python/PythonLoader.h
 create mode 100644 Source/SIMPLib/Python/SourceList.cmake
 create mode 100644 Source/SIMPLib/Python/initialize_data.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bed7bffc4b..96adb22e0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,6 @@ if("${DREAM3D_PACKAGE_DEST_PREFIX}" STREQUAL "")
   set(APPLE_RESOURCES_DIR "share/SIMPL")
 else ()
     set(APPLE_RESOURCES_DIR "${DREAM3D_PACKAGE_DEST_PREFIX}/Resources")
-
 endif()
 get_property(DREAM3D_PACKAGE_DEST_PREFIX GLOBAL PROPERTY DREAM3D_PACKAGE_DEST_PREFIX)
 
@@ -330,16 +329,21 @@ configure_file(${PROJECT_RESOURCES_DIR}/SIMPL/SIMPLLicense.txt
 
 # --------------------------------------------------------------------
 # Generate install rules for the text files
+set(license_install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}")
+
 if(APPLE)
-  install(FILES ${PROJECT_BINARY_DIR}/SIMPL/SIMPLLicense.txt
-          DESTINATION "${APPLE_RESOURCES_DIR}"
-          COMPONENT Applications)
-else()
-  install(FILES ${PROJECT_BINARY_DIR}/SIMPL/SIMPLLicense.txt
-          DESTINATION "${DREAM3D_PACKAGE_DEST_PREFIX}"
-          COMPONENT Applications)
+  set(license_install_dir "${APPLE_RESOURCES_DIR}")
+endif()
+
+if(DREAM3D_ANACONDA)
+  set(license_install_dir "share/DREAM3D")
 endif()
 
+install(FILES ${PROJECT_BINARY_DIR}/SIMPL/SIMPLLicense.txt
+  DESTINATION ${license_install_dir}
+  COMPONENT Applications
+)
+
 # -----------------------------------------------------------------------
 # Setup a Global property that is used to gather Documentation Information
 # into a single known location
@@ -377,15 +381,17 @@ if(APPLE)
   set(ConfigPackageLocation ${DREAM3D_PACKAGE_DEST_PREFIX}${ConfigPackageLocation})
 endif()
 
-install(
-  FILES
-    "${SIMPLProj_SOURCE_DIR}/SIMPLConfig.cmake"
-    "${CMAKE_CURRENT_BINARY_DIR}/SIMPL/SIMPLTargetsConfigVersion.cmake"
-  DESTINATION
-    ${ConfigPackageLocation}
-  COMPONENT
-    Devel
-)
+if(NOT DREAM3D_ANACONDA)
+  install(
+    FILES
+      "${SIMPLProj_SOURCE_DIR}/SIMPLConfig.cmake"
+      "${CMAKE_CURRENT_BINARY_DIR}/SIMPL/SIMPLTargetsConfigVersion.cmake"
+    DESTINATION
+      ${ConfigPackageLocation}
+    COMPONENT
+      Devel
+  )
+endif()
 
 # -----------------------------------------------------------------------
 # Add in the support to host the documentation over a thin-http server
@@ -479,8 +485,15 @@ include(${SIMPLProj_SOURCE_DIR}/Support/Support.cmake)
 
 # --------------------------------------------------------------------------
 # Find the Pybind11 installation
-option(SIMPL_ENABLE_PYTHON "Generate and Compile Python wrapping codes" OFF)
-if(SIMPL_ENABLE_PYTHON)
+option(SIMPL_WRAP_PYTHON "Generate and Compile Python wrapping codes" OFF)
+include(CMakeDependentOption)
+cmake_dependent_option(SIMPL_EMBED_PYTHON "Embed the Python interpreter in SIMPL and allow for loading filters from Python" OFF SIMPL_WRAP_PYTHON OFF)
+if(SIMPL_EMBED_PYTHON)
+  if(APPLE)
+    message(WARNING "Embedding Python is experimental on macOS")
+  endif()
+endif()
+if(SIMPL_WRAP_PYTHON)
   set(SIMPL_PYTHON_TEST_ENV ${SIMPL_PYTHON_TEST_ENV} CACHE STRING "A semicolon delimited list of environment variables used for Python tests")
 
   option(SIMPL_USE_ANACONDA_PYTHON "Whether the selected Python executable is part of an Anaconda environment" OFF)
@@ -526,14 +539,16 @@ if(SIMPL_ENABLE_PYTHON)
 
   get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
 
-  add_custom_target(CreateDream3dModuleFile ALL
-    COMMAND ${PYTHON_EXECUTABLE} ${PY_ALL_MODULES_GENERATOR}
-    "${PY_ALL_MODULES_FILE}"
-    "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
-    COMMENT "Creating dream3d.py module file"
-  )
+  if(NOT DREAM3D_ANACONDA)
+    add_custom_target(CreateDream3dModuleFile ALL
+      COMMAND ${PYTHON_EXECUTABLE} ${PY_ALL_MODULES_GENERATOR}
+      "${PY_ALL_MODULES_FILE}"
+      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
+      COMMENT "Creating dream3d.py module file"
+    )
 
-  set_property(TARGET CreateDream3dModuleFile PROPERTY FOLDER "Python")
+    set_property(TARGET CreateDream3dModuleFile PROPERTY FOLDER "Python")
+  endif()
 
   CreatePybind11Module(MODULE_NAME "simpl"
     OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
@@ -546,16 +561,18 @@ if(SIMPL_ENABLE_PYTHON)
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
   )
 
-  add_custom_target(CopyPythonSupport ALL
-    COMMAND ${CMAKE_COMMAND} -E copy
-      ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers.py
-      "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
-    COMMENT "Copying simpl_helpers.py to binary directory"
-  )
+  if(NOT DREAM3D_ANACONDA)
+    add_custom_target(CopyPythonSupport ALL
+      COMMAND ${CMAKE_COMMAND} -E copy
+        ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers.py
+        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
+      COMMENT "Copying simpl_helpers.py to binary directory"
+    )
 
-  add_dependencies(simpl CopyPythonSupport)
+    add_dependencies(simpl CopyPythonSupport)
 
-  set_property(TARGET CopyPythonSupport PROPERTY FOLDER "ZZ_COPY_FILES")
+    set_property(TARGET CopyPythonSupport PROPERTY FOLDER "ZZ_COPY_FILES")
+  endif()
 
   if(SIMPL_BUILD_TESTING)
     file(READ ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_test_dirs.in.py SIMPL_TEST_DIRS_FILE)
diff --git a/Resources/CPack/PackageProject.cmake b/Resources/CPack/PackageProject.cmake
index 907d7e8ef4..2f1e546cbe 100644
--- a/Resources/CPack/PackageProject.cmake
+++ b/Resources/CPack/PackageProject.cmake
@@ -15,8 +15,10 @@ if(MSVC)
     SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP 1)
     #SET(CMAKE_INSTALL_DEBUG_LIBRARIES OFF)
 
-    # Gather the list of system level runtime libraries
-    INCLUDE (InstallRequiredSystemLibraries)
+    if(NOT DREAM3D_DISABLE_DEPENDENCY_COPY_INSTALL_RULES)
+      # Gather the list of system level runtime libraries
+      include(InstallRequiredSystemLibraries)
+    endif()
 
     # Our own Install rule for Release builds of the MSVC runtime libs
     if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)
diff --git a/Source/PipelineRunner/CMakeLists.txt b/Source/PipelineRunner/CMakeLists.txt
index 75c70f69f6..b31a3c79c6 100644
--- a/Source/PipelineRunner/CMakeLists.txt
+++ b/Source/PipelineRunner/CMakeLists.txt
@@ -17,6 +17,10 @@ elseif(WIN32)
   set(lib_install_dir ".")
 endif()
 
+if(DREAM3D_ANACONDA AND WIN32)
+  set(install_dir "bin")
+  set(lib_install_dir "bin")
+endif()
 
 #-------------------------------------------------------------------------------
 # Function COMPILE_TOOL to help alleviate lots of extra code below for adding
@@ -63,5 +67,8 @@ if(SIMPL_Group_PLUGIN AND SIMPL_Group_BASE AND SIMPL_Group_FILTERS)
       INSTALL_DEST  "${install_dir}"
       LINK_LIBRARIES SIMPLib Qt5::Core
   )
-endif()
 
+  if(DREAM3D_ANACONDA)
+    target_compile_definitions(PipelineRunner PRIVATE DREAM3D_ANACONDA)
+  endif()
+endif()
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 15c12d4ed2..28a7b01d6a 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -64,11 +64,40 @@
 #include "SIMPLib/Plugin/ISIMPLibPlugin.h"
 #include "SIMPLib/Plugin/SIMPLibPluginLoader.h"
 
+#ifdef SIMPL_EMBED_PYTHON
+#include "SIMPLib/Python/PythonLoader.h"
+#endif
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
 int main(int argc, char* argv[])
 {
+#ifdef DREAM3D_ANACONDA
+  {
+    constexpr const char k_PYTHONHOME[] = "PYTHONHOME";
+    QString condaPrefix = qgetenv("CONDA_PREFIX");
+
+    QString pythonHome = qgetenv(k_PYTHONHOME);
+    if(pythonHome.isEmpty() && !condaPrefix.isEmpty())
+    {
+      qputenv(k_PYTHONHOME, condaPrefix.toLocal8Bit());
+    }
+
+    qputenv("DREAM3D_PLUGINS_LOADED", "1");
+  }
+#endif
+
+#ifdef SIMPL_EMBED_PYTHON
+  bool hasPythonHome = PythonLoader::checkPythonHome();
+
+  if(!hasPythonHome)
+  {
+    std::cout << "Warning: \"PYTHONHOME\" not set. This environment variable must be set for embedded Python to work.\n";
+  }
+
+  PythonLoader::ScopedInterpreter interpreter_guard{hasPythonHome};
+#endif
 
   // Instantiate the QCoreApplication that we need to get the current path and load plugins.
   QCoreApplication app(argc, argv);
@@ -104,6 +133,18 @@ int main(int argc, char* argv[])
   FilterManager* fm = FilterManager::Instance();
   SIMPLibPluginLoader::LoadPluginFilters(fm);
 
+#ifdef SIMPL_EMBED_PYTHON
+  if(hasPythonHome)
+  {
+    PythonLoader::addToPythonPath(PythonLoader::defaultSIMPLPythonLibPath());
+    std::cout << "Loading Python filters:\n";
+    auto pythonErrorCallback = [](const std::string& message, const std::string& filePath) { std::cout << message << "\nSkipping file: \"" << filePath << "\"\n"; };
+    auto pythonLoadedCallback = [](const std::string& className, const std::string& filePath) { std::cout << "Loaded \"" << className << "\" from \"" << filePath << "\"\n"; };
+    size_t numLoaded = PythonLoader::loadPythonFilters(*fm, PythonLoader::defaultPythonFilterPaths(), pythonErrorCallback, pythonLoadedCallback);
+    std::cout << "Loaded " << numLoaded << " filters\n";
+  }
+#endif
+
   QMetaObjectUtilities::RegisterMetaTypes();
 
   int err = 0;
@@ -142,7 +183,7 @@ int main(int argc, char* argv[])
     return EXIT_FAILURE;
   }
 
-  std::cout << "Filter Count: " << pipeline->size() << std::endl;
+  std::cout << "Pipeline Count: " << pipeline->size() << std::endl;
   Observer obs; // Create an Observer to report errors/progress from the executing pipeline
   pipeline->addMessageReceiver(&obs);
   // Preflight the pipeline
diff --git a/Source/SIMPLib/CMakeLists.txt b/Source/SIMPLib/CMakeLists.txt
index 45d3bd8c38..7297684c9b 100755
--- a/Source/SIMPLib/CMakeLists.txt
+++ b/Source/SIMPLib/CMakeLists.txt
@@ -195,11 +195,42 @@ if(SIMPL_USE_GHC_FILESYSTEM)
   list(APPEND ${PROJECT_NAME}_LINK_LIBS ghcFilesystem::ghc_filesystem)
 endif()
 
+if(SIMPL_EMBED_PYTHON)
+  D3DCompileDir(Python)
+endif()
+
 #-------------------------------------------------------------------------------
 # Add the SIMPLib Library
 add_library(${PROJECT_NAME} ${LIB_TYPE} ${Project_SRCS} )
 CMP_AddDefinitions(TARGET ${PROJECT_NAME})
 
+if(SIMPL_EMBED_PYTHON)
+  find_package(pybind11 2.6 REQUIRED)
+  target_link_libraries(${PROJECT_NAME} PRIVATE pybind11::embed)
+
+  if(NOT DREAM3D_ANACONDA)
+    add_custom_command(TARGET ${PROJECT_NAME}
+      PRE_BUILD
+      COMMAND ${CMAKE_COMMAND} -E copy ${SIMPLib_SOURCE_DIR}/Python/Filter.py $<TARGET_FILE_DIR:${PROJECT_NAME}>
+      COMMAND ${CMAKE_COMMAND} -E make_directory $<TARGET_FILE_DIR:${PROJECT_NAME}>/Python
+    )
+  endif()
+
+  if(DREAM3D_ANACONDA)
+    configure_file(${SIMPLib_SOURCE_DIR}/Python/Filter.py.in ${DREAM3D_PYTHON_PACKAGE_DIR}/Filter.py COPYONLY)
+    file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import Filter\n")
+  endif()
+
+  if(NOT DREAM3D_ANACONDA)
+    install(DIRECTORY DESTINATION "Python")
+    install(FILES ${SIMPLib_SOURCE_DIR}/Python/Filter.py DESTINATION ".")
+  endif()
+endif()
+
+if(DREAM3D_ANACONDA)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE DREAM3D_ANACONDA)
+endif()
+
 # Add H5Support
 add_subdirectory(${H5Support_SOURCE_DIR} ${PROJECT_BINARY_DIR}/H5Support)
 
@@ -277,13 +308,13 @@ endif()
 if(SIMPL_Group_REST)
   target_include_directories(${PROJECT_NAME} PUBLIC 
                                 $<BUILD_INTERFACE:${SIMPLProj_SOURCE_DIR}/ThirdParty>)
-  target_link_libraries(${PROJECT_NAME} QtWebAppLib)                            
+  target_link_libraries(${PROJECT_NAME} PUBLIC QtWebAppLib)                            
 endif()
 
 #-- Configure Link Libraries for the Target
 LibraryProperties( ${PROJECT_NAME} ${EXE_DEBUG_EXTENSION} )
 #-- Link the Target to its dependent libraries
-target_link_libraries(${PROJECT_NAME} ${${PROJECT_NAME}_LINK_LIBS})
+target_link_libraries(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_LINK_LIBS})
 
 #-- Configure Target Installation Rules
 set(install_dir "tools")
@@ -298,54 +329,60 @@ elseif(WIN32)
   set(lib_install_dir ".")
 endif()
 
-INSTALL(TARGETS ${PROJECT_NAME}
+if(DREAM3D_ANACONDA AND WIN32)
+  set(install_dir "bin")
+  set(lib_install_dir "bin")
+endif()
+
+install(TARGETS ${PROJECT_NAME}
+  COMPONENT Applications
+  RUNTIME DESTINATION ${install_dir}
+  LIBRARY DESTINATION ${lib_install_dir}
+  BUNDLE DESTINATION "."
+)
+
+if(NOT DREAM3D_ANACONDA)
+  install(TARGETS ${PROJECT_NAME}
     EXPORT ${PROJECT_NAME}Targets
     COMPONENT Applications
+    ARCHIVE DESTINATION lib
     RUNTIME DESTINATION ${install_dir}
     LIBRARY DESTINATION ${lib_install_dir}
-    ARCHIVE DESTINATION lib
-    BUNDLE DESTINATION "."
-)
-
-
-# --------------------------------------------------------------------
-# Allow the generation and installation of a CMake configuration file
-# which makes using SIMPL from another project easier.
-# --------------------------------------------------------------------
-export(EXPORT ${PROJECT_NAME}Targets
-  FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
-  NAMESPACE ${PROJECT_NAME}::
-)
-
-if(PROJECT_INSTALL_HEADERS)
-  install(EXPORT SIMPLibTargets
-    FILE
-      SIMPLibTargets.cmake
-    NAMESPACE
-      SIMPL::
-    DESTINATION
-      ${ConfigPackageLocation}
   )
 
-  install(FILES 
-      ${CMP_HEADER_DIR}/${CMP_TOP_HEADER_FILE}
-      ${CMP_HEADER_DIR}/${CMP_TYPES_FILE_NAME}
-      ${CMP_HEADER_DIR}/${CMP_CONFIGURATION_FILE_NAME}
-      ${CMP_HEADER_DIR}/${CMP_VERSION_HEADER_FILE_NAME}
-    DESTINATION
-      include/${PROJECT_NAME}
+  # --------------------------------------------------------------------
+  # Allow the generation and installation of a CMake configuration file
+  # which makes using SIMPL from another project easier.
+  # --------------------------------------------------------------------
+  export(EXPORT ${PROJECT_NAME}Targets
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Targets.cmake"
+    NAMESPACE ${PROJECT_NAME}::
   )
 
+  if(PROJECT_INSTALL_HEADERS)
+    install(EXPORT SIMPLibTargets
+      FILE
+        SIMPLibTargets.cmake
+      NAMESPACE
+        SIMPL::
+      DESTINATION
+        ${ConfigPackageLocation}
+    )
+
+    install(FILES 
+        ${CMP_HEADER_DIR}/${CMP_TOP_HEADER_FILE}
+        ${CMP_HEADER_DIR}/${CMP_TYPES_FILE_NAME}
+        ${CMP_HEADER_DIR}/${CMP_CONFIGURATION_FILE_NAME}
+        ${CMP_HEADER_DIR}/${CMP_VERSION_HEADER_FILE_NAME}
+      DESTINATION
+        include/${PROJECT_NAME}
+    )
+  endif()
 endif()
 
-
 # ------- Enable the CTest testing. ---------------
 # -------------------------------------------------------------------- 
 # If Testing is enabled, turn on the Unit Tests 
 if(SIMPL_BUILD_TESTING)
     include(${SIMPLib_SOURCE_DIR}/Testing/CMakeLists.txt)
 endif()
-
-
-
-
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 306bc0c0d6..9782efa907 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -101,6 +101,7 @@ class SIMPLib_EXPORT AttributeMatrix : public Observable, public IDataStructureC
   PYB11_METHOD(int renameAttributeArray ARGS OldName NewName OverWrite)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.QString.&,Name CONST_METHOD)
   PYB11_METHOD(IDataArray::Pointer getAttributeArray OVERLOAD const.DataArrayPath.&,Path CONST_METHOD)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // clang-format on
   // End Python bindings declarations
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 58f1a8447f..4aac9209d0 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -91,6 +91,7 @@ class SIMPLib_EXPORT DataArrayPath
   PYB11_METHOD(bool isEmpty)
   PYB11_METHOD(bool isValid)
   PYB11_METHOD(void update ARGS dcName amName daName)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // End Python bindings declarations
 
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 322d6c8fc5..3db186e44a 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -91,6 +91,7 @@ class SIMPLib_EXPORT DataContainer : public Observable, public IDataStructureCon
   PYB11_METHOD(bool renameAttributeMatrix ARGS OldName NewName OverWrite)
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS Name)
   PYB11_METHOD(void setGeometry ARGS Geometry)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // End Python bindings declarations
   // clang-format on
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 9fd7442fec..9f29c8b950 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -93,6 +93,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix ARGS DataArrayPath)
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS DataArrayPath)
   PYB11_METHOD(bool doesAttributeArrayExist ARGS DataArrayPath)
+  PYB11_CUSTOM()
   PYB11_END_BINDINGS()
   // End Python bindings declarations
   // clang-format on
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 94f5d96bad..58cf67fe5d 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -388,6 +388,17 @@ FilterPipeline::Pointer JsonFilterParametersReader::readPipelineFromString(QStri
   return pipeline;
 }
 
+// -----------------------------------------------------------------------------
+FilterPipeline::Pointer JsonFilterParametersReader::readPipelineFromJson(const QJsonObject& contents, IObserver* obs)
+{
+  setPipelineContents(contents);
+
+  FilterPipeline::Pointer pipeline = readPipeline(obs);
+  closeFile();
+
+  return pipeline;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -590,6 +601,17 @@ int JsonFilterParametersReader::setPipelineContents(QString contents)
   return err;
 }
 
+// -----------------------------------------------------------------------------
+void JsonFilterParametersReader::setPipelineContents(const QJsonObject& contents)
+{
+  if(!m_Root.isEmpty() || !m_CurrentFilterIndex.isEmpty())
+  {
+    closeFile();
+  }
+
+  m_Root = contents;
+}
+
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index 133c112cde..b2a8bd7a28 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -134,6 +134,17 @@ class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParameter
    */
   FilterPipeline::Pointer readPipelineFromString(QString contents, IObserver* obs = nullptr);
 
+  /**
+   * @brief ReadPipelineFromString Reads the Json and returns a FilterPipeline object
+   * that contains all the filters that could be found. If a filter can not be found then that filter is simply skipped.
+   * If the IObserver is NON-Null then an error message will be passed to it with an error message
+   * @param filePath The path to the INI formatted file
+   * @param format The format of the file which is anything that QSettings understands
+   * @param obs An IObserver object to report errors.
+   * @return Shared Pointer to a FilterPipeline Instance
+   */
+  FilterPipeline::Pointer readPipelineFromJson(const QJsonObject& contents, IObserver* obs = nullptr);
+
   /**
    * @brief Gets the name of the pipeline from a pipeline file
    * @param filePath The absolute path to the pipeline file.
@@ -167,6 +178,13 @@ class SIMPLib_EXPORT JsonFilterParametersReader : public AbstractFilterParameter
    */
   int setPipelineContents(QString contents);
 
+  /**
+   * @brief setPipelineContents
+   * @param contents
+   * @return
+   */
+  void setPipelineContents(const QJsonObject& contents);
+
   /**
    * @brief closeFile
    */
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 34be9e8d95..20f70ebebd 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -88,6 +88,7 @@ class SIMPLib_EXPORT AbstractFilter : public Observable
   PYB11_PROPERTY(QString HumanLabel READ getHumanLabel)
   PYB11_PROPERTY(QString FilterVersion READ getFilterVersion)
   PYB11_PROPERTY(QString CompiledLibraryName READ getCompiledLibraryName)
+  PYB11_PROPERTY(QString DataContainerArray READ getDataContainerArray WRITE setDataContainerArray)
   PYB11_PROPERTY(bool Cancel READ getCancel WRITE setCancel)
   PYB11_PROPERTY(bool Enabled READ getEnabled WRITE setEnabled)
   PYB11_PROPERTY(int ErrorCode READ getErrorCode)
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index 376ea5c506..b9c161d688 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -318,3 +318,53 @@ QString FilterManager::ClassName()
 {
   return QString("FilterManager");
 }
+
+// -----------------------------------------------------------------------------
+bool FilterManager::removeFilterFactory(const QUuid& uuid)
+{
+  if(!m_UuidFactories.contains(uuid))
+  {
+    return false;
+  }
+
+  QString filterName = m_UuidFactories[uuid]->getFilterClassName();
+
+  m_Factories.remove(filterName);
+  m_UuidFactories.remove(uuid);
+#ifdef SIMPL_EMBED_PYTHON
+  m_PythonUuids.remove(uuid);
+#endif
+
+  return true;
+}
+
+#ifdef SIMPL_EMBED_PYTHON
+// -----------------------------------------------------------------------------
+QSet<QUuid> FilterManager::pythonFilterUuids() const
+{
+  return m_PythonUuids;
+}
+
+// -----------------------------------------------------------------------------
+void FilterManager::addPythonFilterFactory(const QString& name, IFilterFactory::Pointer factory)
+{
+  addFilterFactory(name, factory);
+  m_PythonUuids.insert(factory->getUuid());
+}
+
+// -----------------------------------------------------------------------------
+void FilterManager::clearPythonFilterFactories()
+{
+  QSet<QUuid> pythonUuids = m_PythonUuids;
+  for(const QUuid& uuid : pythonUuids)
+  {
+    removeFilterFactory(uuid);
+  }
+}
+
+// -----------------------------------------------------------------------------
+bool FilterManager::isPythonFilter(const QUuid& uuid) const
+{
+  return m_PythonUuids.contains(uuid);
+}
+#endif
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
index 595c0ef6db..1befa60efa 100644
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -44,6 +44,10 @@
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/Filtering/IFilterFactory.hpp"
 
+#ifdef SIMPL_EMBED_PYTHON
+#include <QtCore/QSet>
+#endif
+
 /**
  * @brief The FilterManager class manages instances of filters and is mainly used to instantiate
  * an instance of a filter given its human label or class name. This class uses the Factory design
@@ -129,6 +133,13 @@ class SIMPLib_EXPORT FilterManager
    */
   void addFilterFactory(const QString& name, IFilterFactory::Pointer factory);
 
+  /**
+   * @brief Removes the given filter factory by UUID. Returns true if successful
+   * @param uuid
+   * @return
+   */
+  bool removeFilterFactory(const QUuid& uuid);
+
   /**
    * @brief getGroupNames Returns the uniqe set of group names for all the filters
    * @return
@@ -170,6 +181,33 @@ class SIMPLib_EXPORT FilterManager
    */
   QJsonArray toJsonArray() const;
 
+#ifdef SIMPL_EMBED_PYTHON
+  /**
+   * @brief Adds a factory that creates Python filters
+   * @param name
+   * @param factory
+   */
+  void addPythonFilterFactory(const QString& name, IFilterFactory::Pointer factory);
+
+  /**
+   * @brief Returns set of Python filter uuids
+   * @return
+   */
+  QSet<QUuid> pythonFilterUuids() const;
+
+  /**
+   * @brief Returns true if the given uuid is for a Python filter
+   * @param uuid
+   * @return
+   */
+  bool isPythonFilter(const QUuid& uuid) const;
+
+  /**
+   * @brief Clears all Python filters
+   */
+  void clearPythonFilterFactories();
+#endif
+
 protected:
   FilterManager();
 
@@ -177,6 +215,10 @@ class SIMPLib_EXPORT FilterManager
   Collection m_Factories;
   UuidCollection m_UuidFactories;
 
+#ifdef SIMPL_EMBED_PYTHON
+  QSet<QUuid> m_PythonUuids;
+#endif
+
   static FilterManager* s_Self;
 
 public:
diff --git a/Source/SIMPLib/Python/ExampleFilter.py b/Source/SIMPLib/Python/ExampleFilter.py
new file mode 100644
index 0000000000..d91e657bf6
--- /dev/null
+++ b/Source/SIMPLib/Python/ExampleFilter.py
@@ -0,0 +1,84 @@
+from typing import List, Tuple, Union
+from dream3d.Filter import Filter, FilterDelegatePy
+from dream3d.simpl import DataContainerArray, FilterDelegateCpp, FilterParameter, IntFilterParameter, DataArraySelectionFilterParameter, DataArrayPath
+
+class ExampleFilter(Filter):
+  def __init__(self) -> None:
+    self.foo: int = 5
+    self.path: DataArrayPath = DataArrayPath('', '', '')
+
+  def _set_foo(self, value: int) -> None:
+    self.foo = value
+
+  def _get_foo(self) -> int:
+    return self.foo
+
+  def _set_path(self, value: DataArrayPath) -> None:
+    self.path = value
+
+  def _get_path(self) -> DataArrayPath:
+    return self.path
+
+  @staticmethod
+  def name() -> str:
+    return 'ExampleFilter'
+
+  @staticmethod
+  def uuid() -> str:
+    return '{2f2a6f35-d488-59d7-bd8b-8a234e5700b3}'
+
+  @staticmethod
+  def group_name() -> str:
+    return 'Example'
+
+  @staticmethod
+  def sub_group_name() -> str:
+    return 'Sub Example'
+
+  @staticmethod
+  def human_label() -> str:
+    return 'Example Filter'
+
+  @staticmethod
+  def version() -> str:
+    return '1.0.0'
+
+  @staticmethod
+  def compiled_lib_name() -> str:
+    return 'Python'
+
+  def setup_parameters(self) -> List[FilterParameter]:
+    req = DataArraySelectionFilterParameter.RequirementType()
+    return [
+      IntFilterParameter('Foo', 'Foo', 0, FilterParameter.Category.Parameter, self._set_foo, self._get_foo, -1),
+      DataArraySelectionFilterParameter('Path', 'Path', DataArrayPath('', '', ''), FilterParameter.Category.RequiredArray, self._set_path, self._get_path, req, -1)
+    ]
+
+  def data_check(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    am = dca.getAttributeMatrix(self.path)
+
+    if am is None:
+      return (-1, 'AttributeMatrix is None')
+
+    da = am.getAttributeArray(self.path)
+    if da is None:
+      return (-2, 'DataArray is None')
+
+    delegate.notifyStatusMessage('data_check finished!')
+
+    return (0, 'Success')
+
+  def _execute_impl(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    delegate.notifyStatusMessage(f'foo = {self.foo}')
+
+    da = dca.getAttributeMatrix(self.path).getAttributeArray(self.path)
+
+    data = da.npview()
+    delegate.notifyStatusMessage(f'before = {data}')
+    data += self.foo
+    delegate.notifyStatusMessage(f'after = {data}')
+
+    delegate.notifyStatusMessage('execute finished!')
+    return (0, 'Success')
+
+filters = [ExampleFilter]
diff --git a/Source/SIMPLib/Python/Filter.py b/Source/SIMPLib/Python/Filter.py
new file mode 100644
index 0000000000..ee58ea809e
--- /dev/null
+++ b/Source/SIMPLib/Python/Filter.py
@@ -0,0 +1,70 @@
+from abc import ABC, abstractmethod
+from typing import List, Tuple, Union
+
+from simpl import DataContainerArray, FilterDelegateCpp, FilterParameter
+
+# can use typing.Protocol in 3.8
+class FilterDelegatePy:
+  def __init__(self) -> None:
+      self.warning_code: int = 0
+      self.warning_message: str = ''
+      self.preflight: bool = False
+
+  def notifyStatusMessage(self, message: str) -> None:
+    print(message)
+
+  def notifyProgressMessage(self, progress: int, message: str) -> None:
+    print(f'{progress} {message}')
+
+  def setWarningCondition(self, code: int, message: str) -> None:
+    self.warning_code = code
+    self.warning_message = message
+
+class Filter(ABC):
+  @staticmethod
+  @abstractmethod
+  def name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def group_name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def sub_group_name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def human_label() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def version() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def compiled_lib_name() -> str:
+    raise NotImplementedError
+
+  @abstractmethod
+  def setup_parameters(self) -> List[FilterParameter]:
+    raise NotImplementedError
+
+  @abstractmethod
+  def data_check(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    raise NotImplementedError
+
+  @abstractmethod
+  def _execute_impl(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    raise NotImplementedError
+
+  def execute(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    data_check_result = self.data_check(dca, delegate)
+    if data_check_result[0] < 0:
+      return data_check_result
+    return self._execute_impl(dca, delegate)
diff --git a/Source/SIMPLib/Python/Filter.py.in b/Source/SIMPLib/Python/Filter.py.in
new file mode 100644
index 0000000000..d5c3927565
--- /dev/null
+++ b/Source/SIMPLib/Python/Filter.py.in
@@ -0,0 +1,70 @@
+from abc import ABC, abstractmethod
+from typing import List, Tuple, Union
+
+from . import simpl
+
+# can use typing.Protocol in 3.8
+class FilterDelegatePy:
+  def __init__(self) -> None:
+      self.warning_code: int = 0
+      self.warning_message: str = ''
+      self.preflight: bool = False
+
+  def notifyStatusMessage(self, message: str) -> None:
+    print(message)
+
+  def notifyProgressMessage(self, progress: int, message: str) -> None:
+    print(f'{progress} {message}')
+
+  def setWarningCondition(self, code: int, message: str) -> None:
+    self.warning_code = code
+    self.warning_message = message
+
+class Filter(ABC):
+  @staticmethod
+  @abstractmethod
+  def name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def group_name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def sub_group_name() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def human_label() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def version() -> str:
+    raise NotImplementedError
+
+  @staticmethod
+  @abstractmethod
+  def compiled_lib_name() -> str:
+    raise NotImplementedError
+
+  @abstractmethod
+  def setup_parameters(self) -> List[simpl.FilterParameter]:
+    raise NotImplementedError
+
+  @abstractmethod
+  def data_check(self, dca: simpl.DataContainerArray, delegate: Union[simpl.FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    raise NotImplementedError
+
+  @abstractmethod
+  def _execute_impl(self, dca: simpl.DataContainerArray, delegate: Union[simpl.FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    raise NotImplementedError
+
+  def execute(self, dca: simpl.DataContainerArray, delegate: Union[simpl.FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    data_check_result = self.data_check(dca, delegate)
+    if data_check_result[0] < 0:
+      return data_check_result
+    return self._execute_impl(dca, delegate)
diff --git a/Source/SIMPLib/Python/FilterPyObject.h b/Source/SIMPLib/Python/FilterPyObject.h
new file mode 100644
index 0000000000..492dced8f0
--- /dev/null
+++ b/Source/SIMPLib/Python/FilterPyObject.h
@@ -0,0 +1,195 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+// undef slots since a Python header uses slots
+#undef slots
+
+#include <pybind11/embed.h>
+
+#ifdef __GNUG__
+#define SIMPL_PY_VISIBILITY __attribute__((visibility("hidden")))
+#else
+#define SIMPL_PY_VISIBILITY
+#endif
+
+namespace PythonSupport
+{
+struct FilterDelegate
+{
+  AbstractFilter* filter;
+
+  void notifyStatusMessage(const QString& message) const
+  {
+    if(filter == nullptr)
+    {
+      throw std::runtime_error("filter is nullptr");
+    }
+    filter->notifyStatusMessage(message);
+  }
+
+  void notifyProgressMessage(int progress, const QString& message) const
+  {
+    if(filter == nullptr)
+    {
+      throw std::runtime_error("filter is nullptr");
+    }
+    filter->notifyProgressMessage(progress, message);
+  }
+
+  void setWarningCondition(int code, const QString& message)
+  {
+    if(filter == nullptr)
+    {
+      throw std::runtime_error("filter is nullptr");
+    }
+    filter->setWarningCondition(code, message);
+  }
+
+  bool preflight() const
+  {
+    if(filter == nullptr)
+    {
+      throw std::runtime_error("filter is nullptr");
+    }
+    return filter->getInPreflight();
+  }
+};
+
+class SIMPL_PY_VISIBILITY FilterPyObject
+{
+public:
+  FilterPyObject() = default;
+  FilterPyObject(pybind11::object object)
+  : m_Object(object)
+  {
+  }
+  ~FilterPyObject() = default;
+
+  FilterPyObject(const FilterPyObject&) = default;
+  FilterPyObject(FilterPyObject&&) = default;
+
+  FilterPyObject& operator=(const FilterPyObject&) = default;
+  FilterPyObject& operator=(FilterPyObject&&) = default;
+
+  std::pair<int32_t, std::string> data_check(DataContainerArray::Pointer dca, FilterDelegate cppFilter)
+  {
+    pybind11::tuple result = m_Object.attr("data_check")(dca, cppFilter).cast<pybind11::tuple>();
+    auto status = result[0].cast<int32_t>();
+    auto message = result[1].cast<std::string>();
+    return {status, std::move(message)};
+  }
+
+  std::pair<int32_t, std::string> execute(DataContainerArray::Pointer dca, FilterDelegate cppFilter)
+  {
+    pybind11::tuple result = m_Object.attr("execute")(dca, cppFilter).cast<pybind11::tuple>();
+    auto status = result[0].cast<int32_t>();
+    auto message = result[1].cast<std::string>();
+    return {status, std::move(message)};
+  }
+
+  FilterParameterVectorType setup_parameters()
+  {
+    pybind11::list pyParameters = m_Object.attr("setup_parameters")();
+    FilterParameterVectorType parameters{};
+    parameters.reserve(pyParameters.size());
+
+    for(pybind11::handle item : pyParameters)
+    {
+      parameters.push_back(item.cast<FilterParameter::Pointer>());
+    }
+
+    return parameters;
+  }
+
+  std::string name() const
+  {
+    return m_Object.attr("name")().cast<std::string>();
+  }
+
+  std::string class_name() const
+  {
+    return m_Object.attr("__class__").attr("__name__").cast<std::string>();
+  }
+
+  std::string uuid() const
+  {
+    return m_Object.attr("uuid")().cast<std::string>();
+  }
+
+  std::string group_name() const
+  {
+    return m_Object.attr("group_name")().cast<std::string>();
+  }
+
+  std::string sub_group_name() const
+  {
+    return m_Object.attr("sub_group_name")().cast<std::string>();
+  }
+
+  std::string human_label() const
+  {
+    return m_Object.attr("human_label")().cast<std::string>();
+  }
+
+  std::string version() const
+  {
+    return m_Object.attr("version")().cast<std::string>();
+  }
+
+  std::string compiled_lib_name() const
+  {
+    return m_Object.attr("compiled_lib_name")().cast<std::string>();
+  }
+
+  FilterPyObject create_new() const
+  {
+    pybind11::object typeObject = pybind11::type::of(m_Object);
+    pybind11::object newObject = typeObject();
+    return FilterPyObject(newObject);
+  }
+
+private:
+  pybind11::object m_Object{};
+};
+} // namespace PythonSupport
+
+#define slots Q_SLOTS
diff --git a/Source/SIMPLib/Python/PythonFilter.cpp b/Source/SIMPLib/Python/PythonFilter.cpp
new file mode 100644
index 0000000000..1efc0b3de4
--- /dev/null
+++ b/Source/SIMPLib/Python/PythonFilter.cpp
@@ -0,0 +1,217 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "PythonFilter.h"
+
+#include <QtCore/QTextStream>
+
+#include "SIMPLib/SIMPLibVersion.h"
+#include "SIMPLib/Common/Constants.h"
+#include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
+
+#include "SIMPLib/Python/FilterPyObject.h"
+
+namespace py = pybind11;
+
+struct PythonFilter::Impl
+{
+  PythonSupport::FilterPyObject m_Filter;
+};
+
+// -----------------------------------------------------------------------------
+PythonFilter::PythonFilter(const PythonSupport::FilterPyObject& object)
+: AbstractFilter()
+, m_Impl(std::make_unique<Impl>(Impl{object}))
+{
+  py::gil_scoped_acquire gil_acquire_guard{};
+  setupFilterParameters();
+  m_CompiledLibraryName = QString::fromStdString(m_Impl->m_Filter.compiled_lib_name());
+  m_FilterVersion = QString::fromStdString(m_Impl->m_Filter.version());
+  m_GroupName = QString::fromStdString(m_Impl->m_Filter.group_name());
+  m_SubGroupName = QString::fromStdString(m_Impl->m_Filter.sub_group_name());
+  m_HumanLabel = QString::fromStdString(m_Impl->m_Filter.human_label());
+  m_ClassName = QString::fromStdString(m_Impl->m_Filter.class_name());
+  m_Uuid = QString::fromStdString(m_Impl->m_Filter.uuid());
+}
+
+// -----------------------------------------------------------------------------
+PythonFilter::~PythonFilter() = default;
+
+// -----------------------------------------------------------------------------
+void PythonFilter::setupFilterParameters()
+{
+  py::gil_scoped_acquire gil_acquire_guard{};
+
+  FilterParameterVectorType parameters = m_Impl->m_Filter.setup_parameters();
+
+  setFilterParameters(parameters);
+}
+
+// -----------------------------------------------------------------------------
+void PythonFilter::dataCheck()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  DataContainerArray::Pointer dca = getDataContainerArray();
+
+  py::gil_scoped_acquire gil_acquire_guard{};
+
+  try
+  {
+    auto&& [status, message] = m_Impl->m_Filter.data_check(dca, PythonSupport::FilterDelegate{this});
+    if(status < 0)
+    {
+      setErrorCondition(status, QString::fromStdString(message));
+    }
+  } catch(const py::error_already_set& exception)
+  {
+    setErrorCondition(-1, QString("Python failed with the following error: \n %1").arg(exception.what()));
+  } catch(const std::exception& exception)
+  {
+    setErrorCondition(-2, QString("Caught the following exception: \n %1").arg(exception.what()));
+  }
+}
+
+// -----------------------------------------------------------------------------
+void PythonFilter::execute()
+{
+  clearErrorCode();
+  clearWarningCode();
+
+  if(getCancel())
+  {
+    return;
+  }
+
+  DataContainerArray::Pointer dca = getDataContainerArray();
+
+  if(dca == nullptr)
+  {
+    throw std::runtime_error("DataContainerArray is nullptr");
+  }
+
+  py::gil_scoped_acquire gil_acquire_guard{};
+
+  try
+  {
+    auto&& [status, message] = m_Impl->m_Filter.execute(dca, PythonSupport::FilterDelegate{this});
+    if(status < 0)
+    {
+      setErrorCondition(status, QString::fromStdString(message));
+    }
+  } catch(const py::error_already_set& exception)
+  {
+    setErrorCondition(-3, QString("Python failed with the following error: \n %1").arg(exception.what()));
+  } catch(const std::exception& exception)
+  {
+    setErrorCondition(-4, QString("Caught the following exception: \n %1").arg(exception.what()));
+  }
+}
+
+// -----------------------------------------------------------------------------
+AbstractFilter::Pointer PythonFilter::newFilterInstance(bool copyFilterParameters) const
+{
+  py::gil_scoped_acquire gil_acquire_guard{};
+
+  PythonSupport::FilterPyObject newFilter = m_Impl->m_Filter.create_new();
+
+  PythonFilter::Pointer filter = PythonFilter::New(newFilter);
+  if(copyFilterParameters)
+  {
+    copyFilterParameterInstanceVariables(filter.get());
+  }
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getCompiledLibraryName() const
+{
+  return m_CompiledLibraryName;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getBrandingString() const
+{
+  return "Python Filter";
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getFilterVersion() const
+{
+  return m_FilterVersion;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getGroupName() const
+{
+  return m_GroupName;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getSubGroupName() const
+{
+  return m_SubGroupName;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getHumanLabel() const
+{
+  return m_HumanLabel;
+}
+
+// -----------------------------------------------------------------------------
+QUuid PythonFilter::getUuid() const
+{
+  return m_Uuid;
+}
+
+// -----------------------------------------------------------------------------
+PythonFilter::Pointer PythonFilter::NullPointer()
+{
+  return nullptr;
+}
+
+// -----------------------------------------------------------------------------
+PythonFilter::Pointer PythonFilter::New(const PythonSupport::FilterPyObject& filterObject)
+{
+  py::gil_scoped_acquire gil_acquire_guard{};
+
+  auto filter = PythonFilter::Pointer(new PythonFilter(filterObject));
+
+  return filter;
+}
+
+// -----------------------------------------------------------------------------
+QString PythonFilter::getNameOfClass() const
+{
+  return m_ClassName;
+}
diff --git a/Source/SIMPLib/Python/PythonFilter.h b/Source/SIMPLib/Python/PythonFilter.h
new file mode 100644
index 0000000000..ae06b1d056
--- /dev/null
+++ b/Source/SIMPLib/Python/PythonFilter.h
@@ -0,0 +1,152 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <memory>
+
+#include "SIMPLib/Filtering/AbstractFilter.h"
+
+namespace PythonSupport
+{
+class FilterPyObject;
+}
+
+/**
+ * @brief The PythonFilter class. See [Filter documentation](@ref PythonFilter) for details.
+ */
+class SIMPLib_EXPORT PythonFilter : public AbstractFilter
+{
+  Q_OBJECT
+
+public:
+  using Self = PythonFilter;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+
+  static Pointer NullPointer();
+
+  static Pointer New(const PythonSupport::FilterPyObject& filterObject);
+
+  /**
+   * @brief Returns the name of the class for CreateDataArray
+   */
+  QString getNameOfClass() const override;
+
+  ~PythonFilter() override;
+
+  /**
+   * @brief getCompiledLibraryName Reimplemented from @see AbstractFilter class
+   */
+  QString getCompiledLibraryName() const override;
+
+  /**
+   * @brief getBrandingString Returns the branding string for the filter, which is a tag
+   * used to denote the filter's association with specific plugins
+   * @return Branding string
+   */
+  QString getBrandingString() const override;
+
+  /**
+   * @brief getFilterVersion Returns a version string for this filter. Default
+   * value is an empty string.
+   * @return
+   */
+  QString getFilterVersion() const override;
+
+  /**
+   * @brief newFilterInstance Reimplemented from @see AbstractFilter class
+   */
+  AbstractFilter::Pointer newFilterInstance(bool copyFilterParameters) const override;
+
+  /**
+   * @brief getGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getGroupName() const override;
+
+  /**
+   * @brief getSubGroupName Reimplemented from @see AbstractFilter class
+   */
+  QString getSubGroupName() const override;
+
+  /**
+   * @brief getUuid Return the unique identifier for this filter.
+   * @return A QUuid object.
+   */
+  QUuid getUuid() const override;
+
+  /**
+   * @brief getHumanLabel Reimplemented from @see AbstractFilter class
+   */
+  QString getHumanLabel() const override;
+
+  /**
+   * @brief This method will instantiate all the end user settable options/parameters
+   * for this filter
+   */
+  void setupFilterParameters() override;
+
+  /**
+   * @brief Reimplemented from @see AbstractFilter class
+   */
+  void execute() override;
+
+protected:
+  PythonFilter() = delete;
+  PythonFilter(const PythonSupport::FilterPyObject& object);
+
+  /**
+   * @brief dataCheck Checks for the appropriate parameter values and availability of arrays
+   */
+  void dataCheck() override;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> m_Impl;
+
+  QString m_CompiledLibraryName;
+  QString m_FilterVersion;
+  QString m_GroupName;
+  QString m_SubGroupName;
+  QString m_HumanLabel;
+  QString m_ClassName;
+  QUuid m_Uuid;
+
+public:
+  PythonFilter(const PythonFilter&) = delete;            // Copy Constructor Not Implemented
+  PythonFilter(PythonFilter&&) = delete;                 // Move Constructor Not Implemented
+  PythonFilter& operator=(const PythonFilter&) = delete; // Copy Assignment Not Implemented
+  PythonFilter& operator=(PythonFilter&&) = delete;      // Move Assignment Not Implemented
+};
+
+#define slots Q_SLOTS
diff --git a/Source/SIMPLib/Python/PythonFilterFactory.hpp b/Source/SIMPLib/Python/PythonFilterFactory.hpp
new file mode 100644
index 0000000000..86c430c851
--- /dev/null
+++ b/Source/SIMPLib/Python/PythonFilterFactory.hpp
@@ -0,0 +1,162 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/Filtering/IFilterFactory.hpp"
+
+#include "SIMPLib/Python/PythonFilter.h"
+
+#ifdef __GNUG__
+#define SIMPL_PY_VISIBILITY __attribute__((visibility("hidden")))
+#else
+#define SIMPL_PY_VISIBILITY
+#endif
+
+class SIMPL_PY_VISIBILITY PythonFilterFactory : public IFilterFactory
+{
+public:
+  using Self = PythonFilterFactory;
+  using Pointer = std::shared_ptr<Self>;
+  using ConstPointer = std::shared_ptr<const Self>;
+  using WeakPointer = std::weak_ptr<Self>;
+  using ConstWeakPointer = std::weak_ptr<const Self>;
+
+  static Pointer NullPointer()
+  {
+    return nullptr;
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  QString getNameOfClass() const override
+  {
+    return ClassName();
+  }
+
+  /**
+   * @brief Returns the name of the class for AbstractMessage
+   */
+  static QString ClassName()
+  {
+    return "PythonFilterFactory";
+  }
+
+  static Pointer New(pybind11::object typeObject)
+  {
+    return Pointer(new PythonFilterFactory(typeObject));
+  }
+
+  /**
+   * @brief Creates a new for this filter. The Calling method MUST set
+   * a parent OR take responsibility for deleting this object.
+   * @return
+   */
+  AbstractFilter::Pointer create() const override
+  {
+    pybind11::gil_scoped_acquire gil_acquire_guard{};
+
+    return PythonFilter::New(m_TypeObject());
+  }
+
+  QString getFilterClassName() const override
+  {
+    return m_FilterClassName;
+  }
+
+  QString getFilterGroup() const override
+  {
+    return m_GroupName;
+  }
+
+  QString getFilterSubGroup() const override
+  {
+    return m_SubGroupName;
+  }
+
+  QString getFilterHumanLabel() const override
+  {
+    return m_HumanName;
+  }
+
+  QString getBrandingString() const override
+  {
+    return m_BrandingString;
+  }
+
+  QString getCompiledLibraryName() const override
+  {
+    return m_CompiledLibraryName;
+  }
+
+  QString getFilterHtmlSummary() const override
+  {
+    return m_HtmlSummary;
+  }
+
+  QUuid getUuid() const override
+  {
+    return m_Uuid;
+  }
+
+protected:
+  PythonFilterFactory(pybind11::object typeObject)
+  : m_TypeObject(typeObject)
+  {
+    auto filter = PythonFilter::New(m_TypeObject());
+    m_FilterClassName = filter->getNameOfClass();
+    m_GroupName = filter->getGroupName();
+    m_SubGroupName = filter->getSubGroupName();
+    m_HumanName = filter->getHumanLabel();
+    m_BrandingString = filter->getBrandingString();
+    m_CompiledLibraryName = filter->getCompiledLibraryName();
+    m_Uuid = filter->getUuid();
+    m_HtmlSummary = filter->generateHtmlSummary();
+  }
+
+private:
+  pybind11::object m_TypeObject;
+  QString m_FilterClassName;
+  QString m_GroupName;
+  QString m_SubGroupName;
+  QString m_HumanName;
+  QString m_BrandingString;
+  QString m_CompiledLibraryName;
+  QString m_HtmlSummary;
+  QUuid m_Uuid;
+
+public:
+  PythonFilterFactory(const PythonFilterFactory&) = delete;            // Copy Constructor Not Implemented
+  PythonFilterFactory(PythonFilterFactory&&) = delete;                 // Move Constructor Not Implemented
+  PythonFilterFactory& operator=(const PythonFilterFactory&) = delete; // Copy Assignment Not Implemented
+  PythonFilterFactory& operator=(PythonFilterFactory&&) = delete;      // Move Assignment Not Implemented
+};
diff --git a/Source/SIMPLib/Python/PythonLoader.cpp b/Source/SIMPLib/Python/PythonLoader.cpp
new file mode 100644
index 0000000000..a39ba213a8
--- /dev/null
+++ b/Source/SIMPLib/Python/PythonLoader.cpp
@@ -0,0 +1,364 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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 "SIMPLib/Python/PythonLoader.h"
+
+#include <optional>
+#include <unordered_set>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QtGlobal>
+
+// undef slots since a Python header uses slots
+#undef slots
+
+#include <pybind11/embed.h>
+
+#include "SIMPLib/Python/FilterPyObject.h"
+#include "SIMPLib/Python/PythonFilterFactory.hpp"
+
+namespace
+{
+constexpr char k_PYTHONHOME[] = "PYTHONHOME";
+#ifdef _WIN32
+constexpr char k_Separator = ';';
+#else
+constexpr char k_Separator = ':';
+#endif
+
+constexpr char k_PythonDirName[] = "Python";
+
+constexpr char k_SIMPL_PYTHONPATH[] = "SIMPL_PYTHONPATH";
+
+#if defined(_WIN32)
+// -----------------------------------------------------------------------------
+std::string WindowsPythonPath()
+{
+  return QString("%1/%2").arg(QCoreApplication::applicationDirPath(), k_PythonDirName).toStdString();
+}
+#elif defined(__APPLE__)
+// -----------------------------------------------------------------------------
+std::string MacOSPythonPath()
+{
+  QDir pythonFilterDir = QDir(QCoreApplication::applicationDirPath());
+
+  QString path;
+
+  // Look to see if we are inside an .app package or inside the 'tools' directory
+  if(pythonFilterDir.dirName() == "MacOS")
+  {
+    pythonFilterDir.cdUp();
+
+    path = QString("%1/%2").arg(pythonFilterDir.absolutePath(), k_PythonDirName);
+
+    if(QFileInfo::exists(path))
+    {
+      return path.toStdString();
+    }
+
+    // We are not in a self contained package, so move up 2 more levels
+    pythonFilterDir.cdUp();
+    pythonFilterDir.cdUp();
+  }
+  if(pythonFilterDir.dirName() == "bin")
+  {
+    pythonFilterDir.cdUp();
+  }
+  path = QString("%1/%2").arg(pythonFilterDir.absolutePath(), k_PythonDirName);
+
+  if(!QFileInfo::exists(path))
+  {
+    return "";
+  }
+
+  return path.toStdString();
+}
+#else
+// -----------------------------------------------------------------------------
+std::string LinuxPythonPath()
+{
+  QString path = QString("%1/%2").arg(QCoreApplication::applicationDirPath(), k_PythonDirName);
+  QDir pythonDir(path);
+  if(pythonDir.exists())
+  {
+    return path.toStdString();
+  }
+
+  pythonDir.cd(QString("../../%1").arg(k_PythonDirName));
+
+  if(!pythonDir.exists())
+  {
+    return "";
+  }
+
+  return pythonDir.canonicalPath().toStdString();
+}
+#endif
+
+// -----------------------------------------------------------------------------
+std::string PlatformDependentPythonPath()
+{
+#if defined(_WIN32)
+  return WindowsPythonPath();
+#elif defined(__APPLE__)
+  return MacOSPythonPath();
+#else
+  return LinuxPythonPath();
+#endif
+}
+
+// -----------------------------------------------------------------------------
+QString getEnvironmentVariable(const char* varName)
+{
+#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
+  return qgetenv(varName);
+#else
+  return qEnvironmentVariable(varName);
+#endif
+}
+} // namespace
+
+// -----------------------------------------------------------------------------
+bool PythonLoader::checkPythonHome()
+{
+  return !getEnvironmentVariable(k_PYTHONHOME).isEmpty();
+}
+
+// -----------------------------------------------------------------------------
+std::vector<std::string> PythonLoader::defaultPythonFilterPaths()
+{
+  std::vector<std::string> paths{PlatformDependentPythonPath()};
+  QString pythonPath = getEnvironmentVariable(k_SIMPL_PYTHONPATH);
+  if(!pythonPath.isEmpty())
+  {
+    QStringList pyPaths = pythonPath.split(k_Separator);
+    for(const QString& path : pyPaths)
+    {
+      paths.push_back(path.toStdString());
+    }
+  }
+
+  return paths;
+}
+
+// -----------------------------------------------------------------------------
+std::string PythonLoader::defaultSIMPLPythonLibPath()
+{
+  return QCoreApplication::applicationDirPath().toStdString();
+}
+
+// -----------------------------------------------------------------------------
+bool PythonLoader::setPythonHome(const std::string& value)
+{
+  return qputenv(k_PYTHONHOME, value.c_str());
+}
+
+// -----------------------------------------------------------------------------
+void PythonLoader::addToPythonPath(const std::string& value)
+{
+  pybind11::gil_scoped_acquire gil_acquire_guard{};
+  pybind11::module_::import("sys").attr("path").cast<pybind11::list>().append(value);
+}
+
+// -----------------------------------------------------------------------------
+size_t PythonLoader::loadPythonFilters(FilterManager& filterManager, const std::vector<std::string>& paths, ErrorCallback errorCallBack, LoadedCallback loadedCallback)
+{
+  QFileInfoList files{};
+
+  std::unordered_set<std::string> processedFiles{};
+
+  for(const auto& path : paths)
+  {
+    if(path.empty())
+    {
+      continue;
+    }
+    QDir pythonDir = QDir(QString::fromStdString(path));
+    QFileInfoList pyFiles = pythonDir.entryInfoList({"*.py"}, QDir::Filter::Files);
+    files.append(pyFiles);
+  }
+
+  if(files.empty())
+  {
+    return 0;
+  }
+
+  size_t numberLoaded = 0;
+
+  pybind11::gil_scoped_acquire gil_acquire_guard{};
+
+  pybind11::object filterBaseClass;
+
+  try
+  {
+#ifdef DREAM3D_ANACONDA
+    filterBaseClass = pybind11::module_::import("dream3d.Filter").attr("Filter");
+#else
+    filterBaseClass = pybind11::module_::import("Filter").attr("Filter");
+#endif
+  } catch(const pybind11::error_already_set& exception)
+  {
+    if(errorCallBack)
+    {
+      errorCallBack(exception.what(), "Filter.py");
+    }
+    return 0;
+  }
+
+  pybind11::dict globals = pybind11::globals();
+
+  for(const QFileInfo& fileInfo : files)
+  {
+    QString filePath = fileInfo.canonicalFilePath();
+
+    std::string filePathStr = filePath.toStdString();
+
+    if(processedFiles.count(filePathStr) == 0)
+    {
+      processedFiles.insert(filePathStr);
+    }
+    else
+    {
+      continue;
+    }
+
+    try
+    {
+      auto globalsCopy = pybind11::reinterpret_steal<pybind11::dict>(PyDict_Copy(globals.ptr()));
+      pybind11::eval_file(filePathStr, globalsCopy);
+      pybind11::object filtersObject = pybind11::eval("filters", globalsCopy);
+      if(!pybind11::isinstance(filtersObject, pybind11::type::of(pybind11::list())))
+      {
+        if(errorCallBack)
+        {
+          errorCallBack("\"filters\" is not a List", filePathStr);
+        }
+        continue;
+      }
+      pybind11::list pyFilters = filtersObject.cast<pybind11::list>();
+
+      size_t i = -1;
+      for(pybind11::handle filter : pyFilters)
+      {
+        i++;
+        if(PyType_Check(filter.ptr()) == 0)
+        {
+          QString message = QString("Item %1 in \"filters\" is not a class type").arg(i);
+          errorCallBack(message.toStdString(), filePathStr);
+          continue;
+        }
+        auto pyType = filter.cast<pybind11::type>();
+        auto name = pyType.attr("__name__").cast<std::string>();
+        if(!pybind11::isinstance(pyType(), filterBaseClass))
+        {
+          if(errorCallBack)
+          {
+            QString message = QString("\"%1\" is not derived from Filter").arg(QString::fromStdString(name));
+            errorCallBack(message.toStdString(), filePathStr);
+          }
+          continue;
+        }
+
+        auto filterFactory = PythonFilterFactory::New(pyType);
+        filterManager.addPythonFilterFactory(filterFactory->getFilterClassName(), filterFactory);
+        numberLoaded++;
+        if(loadedCallback)
+        {
+          loadedCallback(name, filePathStr);
+        }
+      }
+    } catch(const pybind11::error_already_set& exception)
+    {
+      if(errorCallBack)
+      {
+        QString message = QString("Python exception: %1").arg(exception.what());
+        errorCallBack(message.toStdString(), filePathStr);
+      }
+      continue;
+    } catch(const std::exception& exception)
+    {
+      if(errorCallBack)
+      {
+        QString message = QString("std::exception: %1").arg(exception.what());
+        errorCallBack(message.toStdString(), filePathStr);
+      }
+      continue;
+    }
+  }
+  return numberLoaded;
+}
+
+// -----------------------------------------------------------------------------
+struct PythonLoader::ScopedInterpreter::Impl
+{
+  pybind11::scoped_interpreter interpreter_guard{};
+};
+
+// -----------------------------------------------------------------------------
+PythonLoader::ScopedInterpreter::ScopedInterpreter(bool enable)
+{
+  m_Impl = enable ? std::make_unique<Impl>() : nullptr;
+}
+
+// -----------------------------------------------------------------------------
+PythonLoader::ScopedInterpreter::~ScopedInterpreter() = default;
+
+// -----------------------------------------------------------------------------
+struct PythonLoader::GILScopedRelease::Impl
+{
+  pybind11::gil_scoped_release gil_release_guard{};
+};
+
+// -----------------------------------------------------------------------------
+PythonLoader::GILScopedRelease::GILScopedRelease(bool enable)
+{
+  m_Impl = enable ? std::make_unique<Impl>() : nullptr;
+}
+
+// -----------------------------------------------------------------------------
+PythonLoader::GILScopedRelease::~GILScopedRelease() = default;
+
+// -----------------------------------------------------------------------------
+struct PythonLoader::GILScopedAcquire::Impl
+{
+  pybind11::gil_scoped_acquire gil_acquire_guard{};
+};
+
+// -----------------------------------------------------------------------------
+PythonLoader::GILScopedAcquire::GILScopedAcquire(bool enable)
+{
+  m_Impl = enable ? std::make_unique<Impl>() : nullptr;
+}
+
+// -----------------------------------------------------------------------------
+PythonLoader::GILScopedAcquire::~GILScopedAcquire() = default;
diff --git a/Source/SIMPLib/Python/PythonLoader.h b/Source/SIMPLib/Python/PythonLoader.h
new file mode 100644
index 0000000000..1cdff15550
--- /dev/null
+++ b/Source/SIMPLib/Python/PythonLoader.h
@@ -0,0 +1,119 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ * 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 the names of any of the BlueQuartz Software 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 COPYRIGHT HOLDER 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.
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "SIMPLib/SIMPLib.h"
+#include "SIMPLib/Filtering/FilterManager.h"
+
+namespace PythonLoader
+{
+// error message, file
+using ErrorCallback = std::function<void(const std::string&, const std::string&)>;
+// class, file
+using LoadedCallback = std::function<void(const std::string&, const std::string&)>;
+
+SIMPLib_EXPORT std::vector<std::string> defaultPythonFilterPaths();
+
+SIMPLib_EXPORT std::string defaultSIMPLPythonLibPath();
+
+SIMPLib_EXPORT size_t loadPythonFilters(FilterManager& filterManager, const std::vector<std::string>& paths = defaultPythonFilterPaths(), ErrorCallback errorCallBack = {},
+                                        LoadedCallback loadedCallback = {});
+
+SIMPLib_EXPORT bool checkPythonHome();
+
+SIMPLib_EXPORT bool setPythonHome(const std::string& value);
+
+SIMPLib_EXPORT void addToPythonPath(const std::string& value);
+
+class SIMPLib_EXPORT ScopedInterpreter
+{
+public:
+  ScopedInterpreter() = delete;
+
+  explicit ScopedInterpreter(bool enable);
+  ~ScopedInterpreter();
+
+  ScopedInterpreter(const ScopedInterpreter&) = delete;
+  ScopedInterpreter(ScopedInterpreter&&) = delete;
+
+  ScopedInterpreter& operator=(const ScopedInterpreter&) = delete;
+  ScopedInterpreter& operator=(ScopedInterpreter&&) = delete;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> m_Impl;
+};
+
+class SIMPLib_EXPORT GILScopedRelease
+{
+public:
+  GILScopedRelease() = delete;
+
+  explicit GILScopedRelease(bool enable);
+  ~GILScopedRelease();
+
+  GILScopedRelease(const GILScopedRelease&) = delete;
+  GILScopedRelease(GILScopedRelease&&) = delete;
+
+  GILScopedRelease& operator=(const GILScopedRelease&) = delete;
+  GILScopedRelease& operator=(GILScopedRelease&&) = delete;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> m_Impl;
+};
+
+class SIMPLib_EXPORT GILScopedAcquire
+{
+public:
+  GILScopedAcquire() = delete;
+
+  explicit GILScopedAcquire(bool enable);
+  ~GILScopedAcquire();
+
+  GILScopedAcquire(const GILScopedAcquire&) = delete;
+  GILScopedAcquire(GILScopedAcquire&&) = delete;
+
+  GILScopedAcquire& operator=(const GILScopedAcquire&) = delete;
+  GILScopedAcquire& operator=(GILScopedAcquire&&) = delete;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> m_Impl;
+};
+
+} // namespace PythonLoader
diff --git a/Source/SIMPLib/Python/SourceList.cmake b/Source/SIMPLib/Python/SourceList.cmake
new file mode 100644
index 0000000000..a7a6c20267
--- /dev/null
+++ b/Source/SIMPLib/Python/SourceList.cmake
@@ -0,0 +1,14 @@
+set(SIMPLib_Python_HDRS
+  ${SIMPLib_SOURCE_DIR}/Python/FilterPyObject.h
+  ${SIMPLib_SOURCE_DIR}/Python/PythonFilter.h
+  ${SIMPLib_SOURCE_DIR}/Python/PythonFilterFactory.hpp
+  ${SIMPLib_SOURCE_DIR}/Python/PythonLoader.h
+)
+
+set(SIMPLib_Python_SRCS
+  ${SIMPLib_SOURCE_DIR}/Python/PythonFilter.cpp
+  ${SIMPLib_SOURCE_DIR}/Python/PythonLoader.cpp
+)
+
+cmp_IDE_SOURCE_PROPERTIES("Python" "${SIMPLib_Python_HDRS};${SIMPLib_Python_Moc_HDRS}" "${SIMPLib_Python_SRCS}" "${PROJECT_INSTALL_HEADERS}")
+cmp_IDE_SOURCE_PROPERTIES("Generated/Python" "" "${SIMPLib_Python_Generated_MOC_SRCS}" "0")
diff --git a/Source/SIMPLib/Python/initialize_data.py b/Source/SIMPLib/Python/initialize_data.py
new file mode 100644
index 0000000000..40dd9be30d
--- /dev/null
+++ b/Source/SIMPLib/Python/initialize_data.py
@@ -0,0 +1,242 @@
+import numpy as np
+
+from enum import IntEnum
+from typing import List, Tuple, Union
+
+from dream3d.Filter import Filter, FilterDelegatePy
+from dream3d.simpl import DataContainerArray, FilterDelegateCpp, FilterParameter, IntFilterParameter, DataArrayPath, MultiDataArraySelectionFilterParameter, IGeometry, AttributeMatrix, LinkedChoicesFilterParameter, DoubleFilterParameter, RangeFilterParameter, SeparatorFilterParameter
+
+class InitType(IntEnum):
+  MANUAL = 0
+  RANDOM = 1
+  RANDOM_WITH_RANGE = 2
+
+class InitializeDataPython(Filter):
+  def __init__(self) -> None:
+    self.cell_attribute_matrix_paths: List[DataArrayPath] = []
+    self.x_min: int = 0
+    self.y_min: int = 0
+    self.z_min: int = 0
+    self.x_max: int = 0
+    self.y_max: int = 0
+    self.z_max: int = 0
+    self.init_type: InitType = InitType.MANUAL
+    self.init_value: float = 0.0
+    self.init_range: Tuple[float, float] = (0.0, 0.0)
+
+  def _set_cell_attribute_matrix_paths(self, value: List[DataArrayPath]) -> None:
+    self.cell_attribute_matrix_paths = value
+
+  def _get_cell_attribute_matrix_paths(self) -> List[DataArrayPath]:
+    return self.cell_attribute_matrix_paths
+
+  def _set_x_min(self, value: int) -> None:
+    self.x_min = value
+
+  def _get_x_min(self) -> int:
+    return self.x_min
+
+  def _set_y_min(self, value: int) -> None:
+    self.y_min = value
+
+  def _get_y_min(self) -> int:
+    return self.y_min
+
+  def _set_z_min(self, value: int) -> None:
+    self.z_min = value
+
+  def _get_z_min(self) -> int:
+    return self.z_min
+
+  def _set_x_max(self, value: int) -> None:
+    self.x_max = value
+
+  def _get_x_max(self) -> int:
+    return self.x_max
+
+  def _set_y_max(self, value: int) -> None:
+    self.y_max = value
+
+  def _get_y_max(self) -> int:
+    return self.y_max
+
+  def _set_z_max(self, value: int) -> None:
+    self.z_max = value
+
+  def _get_z_max(self) -> int:
+    return self.z_max
+
+  def _set_init_type(self, value: InitType) -> None:
+    self.init_type = value
+
+  def _get_init_type(self) -> InitType:
+    return self.init_type
+
+  def _set_init_value(self, value: float) -> None:
+    self.init_value = value
+
+  def _get_init_value(self) -> float:
+    return self.init_value
+
+  def _set_init_range(self, value: Tuple[float, float]) -> None:
+    self.init_range = value
+
+  def _get_init_range(self) -> Tuple[float, float]:
+    return self.init_range
+
+  @staticmethod
+  def name() -> str:
+    return 'InitializeDataPython'
+
+  @staticmethod
+  def uuid() -> str:
+    return '{d386e4ae-0460-4e43-a457-edeb594ccb09}'
+
+  @staticmethod
+  def group_name() -> str:
+    return 'Example'
+
+  @staticmethod
+  def sub_group_name() -> str:
+    return 'Sub Example'
+
+  @staticmethod
+  def human_label() -> str:
+    return 'Initialize Data Python'
+
+  @staticmethod
+  def version() -> str:
+    return '1.0.0'
+
+  @staticmethod
+  def compiled_lib_name() -> str:
+    return 'Python'
+
+  def setup_parameters(self) -> List[FilterParameter]:
+    req = MultiDataArraySelectionFilterParameter.RequirementType([IGeometry.Type.Image], [AttributeMatrix.Type.Cell], [], [])
+    return [
+      SeparatorFilterParameter('Cell Data', FilterParameter.Category.RequiredArray),
+      MultiDataArraySelectionFilterParameter('Cell Arrays', 'cell_attribute_matrix_paths', self.cell_attribute_matrix_paths, FilterParameter.Category.RequiredArray, self._set_cell_attribute_matrix_paths, self._get_cell_attribute_matrix_paths, req, -1),
+      IntFilterParameter('X Min (Column)', 'x_min', self.x_min, FilterParameter.Category.Parameter, self._set_x_min, self._get_x_min, -1),
+      IntFilterParameter('Y Min (Row)', 'y_min', self.y_min, FilterParameter.Category.Parameter, self._set_y_min, self._get_y_min, -1),
+      IntFilterParameter('Z Min (Plane)', 'z_min', self.z_min, FilterParameter.Category.Parameter, self._set_z_min, self._get_z_min, -1),
+      IntFilterParameter('X Max (Column)', 'x_max', self.x_max, FilterParameter.Category.Parameter, self._set_x_max, self._get_x_max, -1),
+      IntFilterParameter('Y Max (Row)', 'y_max', self.y_max, FilterParameter.Category.Parameter, self._set_y_max, self._get_y_max, -1),
+      IntFilterParameter('Z Max (Plane)', 'z_max', self.z_max, FilterParameter.Category.Parameter, self._set_z_max, self._get_z_max, -1),
+      LinkedChoicesFilterParameter('Initialization Type', 'init_type', self.init_type, FilterParameter.Category.Parameter, self._set_init_type, self._get_init_type, ['Manual', 'Random', 'Random With Range'], ['init_value', 'init_range'], -1),
+      DoubleFilterParameter('Initialization Value', 'init_value', self.init_value, FilterParameter.Category.Parameter, self._set_init_value, self._get_init_value, InitType.MANUAL),
+      RangeFilterParameter('Initialization Range', 'init_range', self.init_range, FilterParameter.Category.Parameter, self._set_init_range, self._get_init_range, InitType.RANDOM_WITH_RANGE)
+    ]
+
+  def data_check(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    if not self.cell_attribute_matrix_paths:
+      return (-5550, 'At least one data array must be selected')
+
+    attribute_matrix_path = self.cell_attribute_matrix_paths[0]
+
+    if not dca.doesAttributeMatrixExist(attribute_matrix_path):
+      return (-301, 'Failed to find AttributeMatrix')
+
+    dc = dca.getDataContainer(attribute_matrix_path)
+
+    if not dc.Geometry:
+      return (-302, 'DataContainer has no geometry')
+
+    if dc.Geometry.getGeometryType() != IGeometry.Type.Image:
+      return (-303, 'Wrong geometry type')
+
+    image = dc.Geometry
+
+    if self.x_max < self.x_min:
+      return (-5551, f'X Max ({self.x_max}) less than X Min ({self.x_min})')
+
+    if self.y_max < self.y_min:
+      return (-5552, f'Y Max ({self.y_max}) less than Y Min ({self.y_min})')
+
+    if self.z_max < self.z_min:
+      return (-5553, f'Z Max ({self.z_max}) less than Z Min ({self.z_min})')
+
+    if self.x_min < 0:
+      return (-5554, f'X Min ({self.x_min}) less than 0')
+
+    if self.y_min < 0:
+      return (-5555, f'Y Min ({self.y_min}) less than 0')
+
+    if self.z_min < 0:
+      return (-5556, f'Z Min ({self.z_min}) less than 0')
+
+    if self.x_max > image.getXPoints() - 1:
+      return (-5557, f'The X Max you entered of {self.x_max} is greater than your Max X Point of {image.getXPoints() - 1}')
+
+    if self.y_max > image.getYPoints() - 1:
+      return (-5558, f'The Y Max you entered of {self.y_max} is greater than your Max Y Point of {image.getYPoints() - 1}')
+
+    if self.z_max > image.getZPoints() - 1:
+      return (-5559, f'The Z Max you entered of {self.z_max} is greater than your Max Z Point of {image.getZPoints() - 1}')
+
+    am = dc.getAttributeMatrix(attribute_matrix_path)
+
+    data_arrays = [(array_path, am.getAttributeArray(array_path.DataArrayName)) for array_path in self.cell_attribute_matrix_paths]
+
+    for array_path, data_array in data_arrays:
+      if not data_array:
+        return (-5560, f'{array_path} does not exist')
+      dtype = data_array.dtype
+      if dtype == np.float32 or dtype == np.float64:
+        min_value = np.finfo(dtype).min
+        max_value = np.finfo(dtype).max
+      else:
+        min_value = np.iinfo(dtype).min
+        max_value = np.iinfo(dtype).max
+      if self.init_type == InitType.MANUAL:
+        if self.init_value < min_value or self.init_value > max_value:
+          return (-4000, f'{data_array.name}: The initialization value could not be converted. The valid range is {min_value} to {max_value}')
+      elif self.init_type == InitType.RANDOM_WITH_RANGE:
+        range_min = self.init_range[0]
+        range_max = self.init_range[1]
+        if range_min > range_max:
+          return (-5550, 'Invalid initialization range. Minimum value is larger than maximum value.')
+        if range_min < min_value or range_max > max_value:
+          return (-4001, f'{data_array.name}: The initialization range can only be from {min_value} to {max_value}')
+        if range_min == range_max:
+          return (-4002, 'The initialization range must have differing values')
+
+    return (0, 'Success')
+
+  def _execute_impl(self, dca: DataContainerArray, delegate: Union[FilterDelegateCpp, FilterDelegatePy] = FilterDelegatePy()) -> Tuple[int, str]:
+    path = self.cell_attribute_matrix_paths[0]
+    dc = dca.getDataContainer(path)
+    udims = dc.Geometry.getDimensions()
+    am = dca.getAttributeMatrix(path)
+
+    dims = [np.int64(udims[0]), np.int64(udims[1]), np.int64(udims[2])]
+
+    data_arrays = [am.getAttributeArray(array_path.DataArrayName) for array_path in self.cell_attribute_matrix_paths]
+
+    for data_array in data_arrays:
+      dtype = data_array.dtype
+      data = data_array.npview()
+      data_view = data.view([('', dtype)] * np.prod(data_array.cdims)).reshape(dims)
+      data_slice = data_view[self.z_min:self.z_max + 1, self.y_min:self.y_max + 1, self.x_min:self.x_max + 1]
+      if self.init_type == InitType.MANUAL:
+        data_slice[:] = self.init_value
+      else:
+        if self.init_type == InitType.RANDOM_WITH_RANGE:
+          range_min = self.init_range[0]
+          range_max = self.init_range[1]
+        else:
+          if dtype == np.float32 or dtype == np.float64:
+            range_min = np.finfo(dtype).min
+            range_max = np.finfo(dtype).max
+          else:
+            range_min = np.iinfo(dtype).min
+            range_max = np.iinfo(dtype).max
+        rng = np.random.default_rng()
+        if dtype == np.float32 or dtype == np.float64:
+          data_slice[:] = rng.uniform(range_min, range_max, size=data_slice.size).reshape(data_slice.shape)
+        else:
+          data_slice[:] = rng.integers(range_min, range_max, size=data_slice.size).reshape(data_slice.shape)
+
+    return (0, 'Success')
+
+filters = [InitializeDataPython]
diff --git a/Source/SIMPLib/SIMPLibConfiguration.h.in b/Source/SIMPLib/SIMPLibConfiguration.h.in
index e36380d1c3..fcbc23b87c 100755
--- a/Source/SIMPLib/SIMPLibConfiguration.h.in
+++ b/Source/SIMPLib/SIMPLibConfiguration.h.in
@@ -58,6 +58,8 @@
 /* define to 1 if we are building the Test Filters */
 #cmakedefine SIMPL_BUILD_TEST_FILTERS
 
+#cmakedefine SIMPL_EMBED_PYTHON
+
 /* ****************************************************************************
 * These define misc items from the build
 **************************************************************************** */
diff --git a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
index 559d161e62..688eb96021 100644
--- a/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
+++ b/Source/SIMPLib/Utilities/SIMPLDataPathValidator.cpp
@@ -80,6 +80,9 @@ QString SIMPLDataPathValidator::convertToAbsolutePath(const QString& path)
 #if defined(SIMPL_RELATIVE_PATH_CHECK)
     parentPath = m_SIMPLDataDirectory;
 #else
+#if defined(DREAM3D_ANACONDA)
+    dir.cd(QString("../share/%1").arg(QCoreApplication::applicationName()));
+#else
 #if defined(Q_OS_MAC)
     if(dir.dirName() == "MacOS")
     {
@@ -89,6 +92,7 @@ QString SIMPLDataPathValidator::convertToAbsolutePath(const QString& path)
     }
 #elif defined(Q_OS_LINUX)
     dir.cdUp();
+#endif
 #endif
 
     parentPath = dir.absolutePath();
diff --git a/Source/SVWidgetsLib/CMakeLists.txt b/Source/SVWidgetsLib/CMakeLists.txt
index 1b085e4314..1f2ed8dda4 100755
--- a/Source/SVWidgetsLib/CMakeLists.txt
+++ b/Source/SVWidgetsLib/CMakeLists.txt
@@ -176,6 +176,10 @@ if(WIN32 AND BUILD_SHARED_LIBS)
 endif()
 target_compile_definitions(SVWidgetsLib PRIVATE -DQT_CORE_LIB)
 
+if(DREAM3D_ANACONDA)
+  target_compile_definitions(SVWidgetsLib PRIVATE DREAM3D_ANACONDA)
+endif()
+
 LibraryProperties( SVWidgetsLib ${EXE_DEBUG_EXTENSION})
 target_link_libraries(SVWidgetsLib ${SVWidgetsLib_LINK_LIBRARIES} QtWebAppLib)
 
@@ -186,14 +190,24 @@ if(WIN32)
     set(lib_install_dir "")
 endif()
 
-
-if(BUILD_SHARED_LIBS AND NOT APPLE)
-    INSTALL(TARGETS ${PROJECT_NAME}
-        COMPONENT Applications
-        RUNTIME DESTINATION ${install_dir}
-        LIBRARY DESTINATION ${lib_install_dir}
-        ARCHIVE DESTINATION ${lib_install_dir}
-        BUNDLE DESTINATION "."
+if(NOT DREAM3D_ANACONDA)
+  if(BUILD_SHARED_LIBS AND NOT APPLE)
+    install(TARGETS ${PROJECT_NAME}
+      COMPONENT Applications
+      RUNTIME DESTINATION ${install_dir}
+      LIBRARY DESTINATION ${lib_install_dir}
+      ARCHIVE DESTINATION ${lib_install_dir}
+      BUNDLE DESTINATION "."
     )
+  endif()
+else()
+  if(WIN32)
+    install(TARGETS SVWidgetsLib
+      RUNTIME DESTINATION bin
+    )
+  else()
+    install(TARGETS SVWidgetsLib
+      LIBRARY DESTINATION lib
+    )
+  endif()
 endif()
-
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
index b374c8f94d..f212fcb11c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDocServer.cpp
@@ -101,6 +101,9 @@ QString QtSDocServer::GetHelpRootDir()
 
   QDir helpDir = QDir(appPath);
 
+#if defined(DREAM3D_ANACONDA)
+  helpDir.cd(QString("../share/%1/Help/%1").arg(QApplication::applicationName()));
+#else
 #if defined(Q_OS_MAC)
   if(helpDir.dirName() == "MacOS")
   {
@@ -143,6 +146,7 @@ QString QtSDocServer::GetHelpRootDir()
     helpDir.cd("Help");
     helpDir.cd(QApplication::applicationName());
   }
+#endif
 #endif
   return helpDir.absolutePath();
 }
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index e903365974..cda9b58ff8 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -824,6 +824,9 @@ QDir BookmarksModel::findPipelinesDirectory()
 
   QString appPath = QCoreApplication::applicationDirPath();
   QDir pipelinesDir = QDir(appPath);
+#if defined(DREAM3D_ANACONDA)
+  pipelinesDir.cd(QString("../share/%1").arg(QCoreApplication::applicationName()));
+#else
 #if defined(Q_OS_WIN)
   QFileInfo fi(pipelinesDir.absolutePath() + QDir::separator() + dirName);
   if(fi.exists() == false)
@@ -860,6 +863,7 @@ QDir BookmarksModel::findPipelinesDirectory()
     pipelinesDir.cdUp();
   }
 
+#endif
 #endif
 
   pipelinesDir.setPath(pipelinesDir.absolutePath() + QDir::separator() + dirName);
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.cpp b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
index 7dfaf91fce..f3fb2000d4 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
@@ -104,3 +104,15 @@ QAction* PipelineView::getActionRedo()
 {
   return m_ActionRedo;
 }
+
+// -----------------------------------------------------------------------------
+bool PipelineView::undoStackIsClear() const
+{
+  return m_UndoStack->count() == 0;
+}
+
+// -----------------------------------------------------------------------------
+void PipelineView::clearUndoStack()
+{
+  m_UndoStack->clear();
+}
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.h b/Source/SVWidgetsLib/Widgets/PipelineView.h
index 2e0ba9f877..9e1885f743 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.h
@@ -82,6 +82,17 @@ class SVWidgetsLib_EXPORT PipelineView
    */
   QAction* getActionRedo();
 
+  /**
+   * @brief Returns true if the undo stack is clean
+   * @return
+   */
+  bool undoStackIsClear() const;
+
+  /**
+   * @brief Clears the undo stack
+   */
+  void clearUndoStack();
+
 private:
   QSharedPointer<QUndoStack> m_UndoStack;
   QAction* m_ActionUndo = nullptr;
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index f24484de49..20d0a19d95 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -797,7 +797,7 @@ int SVPipelineView::filterCount()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SVPipelineView::clearPipeline()
+void SVPipelineView::clearPipeline(bool playAnimation)
 {
   PipelineModel* model = getPipelineModel();
 
@@ -808,7 +808,7 @@ void SVPipelineView::clearPipeline()
     filters.push_back(model->filter(filterIndex));
   }
 
-  RemoveFilterCommand* removeCmd = new RemoveFilterCommand(filters, this, "Clear");
+  RemoveFilterCommand* removeCmd = new RemoveFilterCommand(filters, this, "Clear", playAnimation);
   addUndoCommand(removeCmd);
 
   Q_EMIT clearDataStructureWidgetTriggered();
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index b210791510..e7d792d5d9 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -335,7 +335,7 @@ public Q_SLOTS:
   /**
    * @brief clearPipeline
    */
-  void clearPipeline();
+  void clearPipeline(bool playAnimation = true);
 
   /**
    * @brief toReadyState
diff --git a/Support/Support.cmake b/Support/Support.cmake
index f87504bed2..63db3545e3 100644
--- a/Support/Support.cmake
+++ b/Support/Support.cmake
@@ -17,9 +17,14 @@ if(EXISTS ${SIMPLProj_SOURCE_DIR}/Support/ExamplePipelines/${PLUGIN_NAME})
     set(INSTALL_DESTINATION "${DREAM3D_PACKAGE_DEST_PREFIX}/PrebuiltPipelines/Examples")
   endif()
 
+  if(DREAM3D_ANACONDA)
+    set(INSTALL_DESTINATION "share/DREAM3D/PrebuiltPipelines/Examples")
+  endif()
+
   install(DIRECTORY ${SIMPLProj_SOURCE_DIR}/Support/ExamplePipelines/${PLUGIN_NAME}
-          DESTINATION ${INSTALL_DESTINATION}
-          COMPONENT Applications )
+    DESTINATION ${INSTALL_DESTINATION}
+    COMPONENT Applications
+  )
 endif()
 
 
@@ -34,13 +39,13 @@ if(EXISTS ${SIMPLProj_SOURCE_DIR}/Support/Data/${PLUGIN_NAME})
               COMMENT "Copying ${PLUGIN_NAME} Data Folder into Binary Directory")
   set_target_properties(${PLUGIN_NAME}DataFolderCopy PROPERTIES FOLDER ZZ_COPY_FILES)
 
-  if(APPLE)
-    set(INSTALL_DESTINATION "${DREAM3D_PACKAGE_DEST_PREFIX}/Resources/Data")
-  else()
-    set(INSTALL_DESTINATION "${DREAM3D_PACKAGE_DEST_PREFIX}/Data")
+  set(INSTALL_DESTINATION "Data")
+  if(DREAM3D_ANACONDA)
+    set(INSTALL_DESTINATION "share/DREAM3D/Data")
   endif()
 
   install(DIRECTORY ${SIMPLProj_SOURCE_DIR}/Support/Data/${PLUGIN_NAME}
-          DESTINATION Data
-          COMPONENT Applications )
-endif()
\ No newline at end of file
+    DESTINATION ${INSTALL_DESTINATION}
+    COMPONENT Applications
+  )
+endif()
diff --git a/ThirdParty/QtWebApp/CMakeLists.txt b/ThirdParty/QtWebApp/CMakeLists.txt
index 05fad78577..f1a4b23188 100644
--- a/ThirdParty/QtWebApp/CMakeLists.txt
+++ b/ThirdParty/QtWebApp/CMakeLists.txt
@@ -45,18 +45,6 @@ set(QtWebAppLib_SRCS
   )
 
 
-set(install_dir "bin")
-set(lib_install_dir "lib")
-
-if(APPLE)
-  get_property(DREAM3D_PACKAGE_DEST_PREFIX GLOBAL PROPERTY DREAM3D_PACKAGE_DEST_PREFIX)
-  set(install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}bin")
-  set(lib_install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}lib")
-elseif(WIN32)
-  set(install_dir ".")
-  set(lib_install_dir ".")
-endif()
-
 add_library(QtWebAppLib ${LIB_TYPE} ${QtWebAppLib_SRCS})
 CMP_AddDefinitions(TARGET ${PROJECT_NAME})
 target_link_libraries(QtWebAppLib Qt5::Core Qt5::Network)
@@ -77,16 +65,27 @@ elseif(WIN32)
   set(lib_install_dir ".")
 endif()
 
+if(DREAM3D_ANACONDA AND WIN32)
+  set(install_dir "bin")
+  set(lib_install_dir "bin")
+endif()
 
-INSTALL(TARGETS ${PROJECT_NAME}
-    EXPORT QtWebAppLibTargets
+install(TARGETS ${PROJECT_NAME}
+  EXPORT QtWebAppLibTargets
+  COMPONENT Applications
+  RUNTIME DESTINATION ${install_dir}
+  LIBRARY DESTINATION ${lib_install_dir}
+  BUNDLE DESTINATION "."
+)
+
+if(NOT DREAM3D_ANACONDA)
+  install(TARGETS ${PROJECT_NAME}
     COMPONENT Applications
+    ARCHIVE DESTINATION lib
     RUNTIME DESTINATION ${install_dir}
     LIBRARY DESTINATION ${lib_install_dir}
-    ARCHIVE DESTINATION lib
-    BUNDLE DESTINATION "."
-)
-
+  )
+endif()
 
 # --------------------------------------------------------------------
 # Allow the generation and installation of a CMake configuration file
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 22b863f387..3c6b9414fe 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -71,7 +71,7 @@ endfunction()
 #-------------------------------------------------------------------------------
 function(CreatePybind11Module)
   set(options PLUGIN)
-  set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
+  set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH BODY_TOP_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
   set(multiValueArgs LINK_LIBRARIES INCLUDE_DIRS)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -97,6 +97,16 @@ function(CreatePybind11Module)
 
   set(PY_GENERATOR ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/generate_python_bindings.py)
 
+  set(NO_TESTS_ARG "")
+  if(DREAM3D_ANACONDA)
+    set(NO_TESTS_ARG "--no_tests")
+  endif()
+
+  set(RELATIVE_IMPORTS_ARGS "")
+  if(DREAM3D_ANACONDA)
+    set(RELATIVE_IMPORTS_ARGS "--relative_imports")
+  endif()
+
   add_custom_target(${CREATE_PYTHON_BINDINGS_TARGET} ALL
       COMMAND ${PYTHON_EXECUTABLE} ${PY_GENERATOR}
       "${ARGS_OUTPUT_DIR}"
@@ -108,7 +118,10 @@ function(CreatePybind11Module)
       "--module_name=${MODULE_NAME_lower}"
       "--header_path=${ARGS_HEADER_PATH}"
       "--body_path=${ARGS_BODY_PATH}"
+      "--body_top_path=${ARGS_BODY_TOP_PATH}"
       "--plugin_name=${ARGS_MODULE_NAME}"
+      "${NO_TESTS_ARG}"
+      "${RELATIVE_IMPORTS_ARGS}"
       COMMENT "${ARGS_MODULE_NAME}: Generating Python bindings"
       BYPRODUCTS ${PYTHON_MODULE_SOURCE_FILE}
   )
@@ -122,6 +135,8 @@ function(CreatePybind11Module)
 
   pybind11_add_module(${MODULE_NAME_lower}
     ${PYTHON_MODULE_SOURCE_FILE}
+    ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySupport.h
+    ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
   )
 
   set_property(TARGET ${MODULE_NAME_lower} PROPERTY FOLDER "Python/Bindings")
@@ -151,6 +166,23 @@ function(CreatePybind11Module)
     FILE ${PYTHON_UNIT_TEST_FILE}
     PYTHONPATH ${TESTS_PYTHONPATH}
   )
+
+  set(install_dir ".")
+  if(DREAM3D_ANACONDA)
+    set(install_dir "bin")
+  endif()
+
+  if(NOT DREAM3D_ANACONDA)
+    install(TARGETS ${MODULE_NAME_lower}
+      LIBRARY DESTINATION ${install_dir}
+    )
+  endif()
+
+  if(DREAM3D_ANACONDA)
+    file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import ${MODULE_NAME_lower}\n")
+    file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import ${MODULE_NAME_lower}py\n")
+    add_dependencies(CopyPythonPackage ${MODULE_NAME_lower})
+  endif()
 endfunction()
 
 #-------------------------------------------------------------------------------
@@ -162,7 +194,7 @@ endfunction()
 #-------------------------------------------------------------------------------
 function(CreatePybind11Plugin)
   set(options)
-  set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH)
+  set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH BODY_TOP_PATH)
   set(multiValueArgs)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -176,6 +208,7 @@ function(CreatePybind11Plugin)
     PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     HEADER_PATH ${ARGS_HEADER_PATH}
     BODY_PATH ${ARGS_BODY_PATH}
+    BODY_TOP_PATH ${ARGS_BODY_TOP_PATH}
     LINK_LIBRARIES ${ARGS_PLUGIN_TARGET}
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
     PLUGIN
diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index f15595fb31..c007fe7e3d 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -2,8 +2,9 @@
 
 #include <QtCore/QString>
 
-#include <pybind11/numpy.h>
 #include <pybind11/pybind11.h>
+
+#include <pybind11/numpy.h>
 #include <pybind11/stl.h>
 #include <pybind11/stl_bind.h>
 
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index bf5b75e533..c31e46afd3 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -4,6 +4,7 @@
 import re
 
 from collections import Counter, defaultdict
+from contextlib import ExitStack
 from pathlib import Path
 
 # typing.Final isn't available until 3.8+
@@ -511,10 +512,12 @@ def replace_file_if_different(temp_file: str, target_file: str) -> None:
   else:
     os.rename(temp_file, target_file)
 
-def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str) -> None:
+def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str, body_top_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
   module_target_file_path = f'{output_dir}/py_simpl.cpp'
   module_temp_file_path = f'{module_target_file_path}.temp'
-  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, open(f'{python_output_dir}/simpl_UnitTest.py', 'w') as test_file:
+  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, ExitStack() as exit_stack:
+    if not no_tests:
+      test_file = exit_stack.enter_context(open(f'{python_output_dir}/simpl_UnitTest.py', 'w'))
     with open(header_path, 'r') as header_file:
       header_code = header_file.read()
       module_file.write(f'// This file is automatically generated during build time by {__file__}\n\n')
@@ -528,6 +531,11 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
 
     module_file.write('\nPYBIND11_MODULE(simpl, mod)\n{\n')
 
+    if body_top_path:
+      with open(body_top_path, 'r') as body_top_file:
+        custom_body_top_code = body_top_file.read()
+        module_file.write(f'{custom_body_top_code}\n')
+
     module_classes = []
 
     for file_path in files:
@@ -536,10 +544,14 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
 
     module_classes = sort_inherited_classes(module_classes)
 
-    python_file.write(f'import simpl\n\n')
+    if not relative_imports:
+      python_file.write(f'import simpl\n\n')
+    else:
+      python_file.write(f'from . import simpl\n\n')
 
-    test_file.write(f'import simpl\n\n')
-    test_file.write(f'def simplUnitTest():\n')
+    if not no_tests:
+      test_file.write(f'import simpl\n\n')
+      test_file.write(f'def simplUnitTest():\n')
 
     for py_class in module_classes:
       code = py_class.generate_bindings()
@@ -547,14 +559,16 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
       if py_class.is_filter:
         python_code = py_class.generate_python_interface('simpl')
         python_file.write(python_code)
-        test_code = py_class.generate_unit_test_snippet('simpl')
-        test_file.write(test_code)
+        if not no_tests:
+          test_code = py_class.generate_unit_test_snippet('simpl')
+          test_file.write(test_code)
 
-    test_file.write('\n')
-    test_file.write('if __name__ == \'__main__\':\n')
-    test_file.write('  print(\'simpl UnitTest Starting\')\n')
-    test_file.write('  simplUnitTest()\n')
-    test_file.write('  print(\'simpl UnitTest Complete\')\n')
+    if not no_tests:
+      test_file.write('\n')
+      test_file.write('if __name__ == \'__main__\':\n')
+      test_file.write('  print(\'simpl UnitTest Starting\')\n')
+      test_file.write('  simplUnitTest()\n')
+      test_file.write('  print(\'simpl UnitTest Complete\')\n')
 
     with open(body_path, 'r') as body_file:
       body_code = body_file.read()
@@ -563,10 +577,12 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
     module_file.write('}\n')
   replace_file_if_different(module_temp_file_path, module_target_file_path)
 
-def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, plugin_name: str, header_path: str = '', body_path: str = '') -> None:
+def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, plugin_name: str, header_path: str = '', body_path: str = '', body_top_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
   module_target_file_path = f'{output_dir}/py_{module_name}.cpp'
   module_temp_file_path = f'{module_target_file_path}.temp'
-  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w') as test_file:
+  with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, ExitStack() as exit_stack:
+    if not no_tests:
+      test_file = exit_stack.enter_context(open(f'{python_output_dir}/{module_name}_UnitTest.py', 'w'))
     includes = files
     if include_dir:
       includes = []
@@ -589,6 +605,10 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
       with open(body_path, 'r') as body_file:
         custom_body_code = body_file.read()
 
+    relative_import_code = 'simpl'
+    if relative_imports:
+      relative_import_code = 'dream3d.simpl'
+
     header_code = (
       f'// This file is automatically generated during build time by {__file__}\n\n'
       '#include <memory>\n\n'
@@ -602,10 +622,15 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
       'using namespace py::literals;\n\n'
       f'PYBIND11_MODULE({module_name}, mod)\n'
       '{\n'
-      'py::module::import("simpl");\n\n'
+      f'py::module::import("{relative_import_code}");\n\n'
     )
     module_file.write(header_code)
 
+    if body_top_path:
+      with open(body_top_path, 'r') as body_top_file:
+        custom_body_top_code = body_top_file.read()
+        module_file.write(f'{custom_body_top_code}\n')
+
     module_classes = []
 
     for file_path in files:
@@ -614,10 +639,14 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
 
     module_classes = sort_inherited_classes(module_classes)
 
-    python_file.write(f'import {module_name}\n\n')
+    if not relative_imports:
+      python_file.write(f'import {module_name}\n\n')
+    else:
+      python_file.write(f'from . import {module_name}\n\n')
 
-    test_file.write(f'import {module_name}\n\n')
-    test_file.write(f'def {module_name}UnitTest():\n')
+    if not no_tests:
+      test_file.write(f'import {module_name}\n\n')
+      test_file.write(f'def {module_name}UnitTest():\n')
 
     for py_class in module_classes:
       code = py_class.generate_bindings()
@@ -625,26 +654,33 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
       if py_class.is_filter:
         python_code = py_class.generate_python_interface(module_name)
         python_file.write(python_code)
-        test_code = py_class.generate_unit_test_snippet(module_name)
-        test_file.write(test_code)
+        if not no_tests:
+          test_code = py_class.generate_unit_test_snippet(module_name)
+          test_file.write(test_code)
 
-    test_file.write('\n')
-    test_file.write('if __name__ == \'__main__\':\n')
-    test_file.write(f'  print(\'{module_name} UnitTest Starting\')\n')
-    test_file.write(f'  {module_name}UnitTest()\n')
-    test_file.write(f'  print(\'{module_name} UnitTest Complete\')\n')
+    if not no_tests:
+      test_file.write('\n')
+      test_file.write('if __name__ == \'__main__\':\n')
+      test_file.write(f'  print(\'{module_name} UnitTest Starting\')\n')
+      test_file.write(f'  {module_name}UnitTest()\n')
+      test_file.write(f'  print(\'{module_name} UnitTest Complete\')\n')
 
     module_file.write(f'{custom_body_code}\n')
     
     module_file.write(f'  //Ensure all the filters are loaded when this module loads\n')
-    module_file.write(f'  {plugin_name}Plugin {module_name}Plugin;\n')
-    module_file.write(f'  {module_name}Plugin.registerFilters(FilterManager::Instance());\n')
+    module_file.write('  py::module_ os = py::module_::import("os");\n')
+    module_file.write('  auto env_value = os.attr(\"getenv\")(\"DREAM3D_PLUGINS_LOADED\");\n')
+    module_file.write('  if(env_value.is_none())\n')
+    module_file.write('  {\n')
+    module_file.write(f'    {plugin_name}Plugin {module_name}Plugin;\n')
+    module_file.write(f'    {module_name}Plugin.registerFilters(FilterManager::Instance());\n')
+    module_file.write('  }\n')
     module_file.write('\n}\n')
   replace_file_if_different(module_temp_file_path, module_target_file_path)
 
 def read_plugin_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = []
-  with open(args.file_list_path, 'r') as file:
+  with open(file_list_path, 'r') as file:
     lines = file.read().splitlines()
     for line in lines:
       if line.startswith('#'):
@@ -656,7 +692,7 @@ def read_plugin_file_list(file_list_path: str, source_dir: str) -> List[str]:
 
 def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   files = []
-  with open(args.file_list_path, 'r') as file:
+  with open(file_list_path, 'r') as file:
     lines = file.read().split(';')
     for line in lines:
       path = line.strip()
@@ -677,9 +713,12 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   parser.add_argument('--module_name')
   parser.add_argument('--header_path')
   parser.add_argument('--body_path')
+  parser.add_argument('--body_top_path')
   parser.add_argument('--include_dir')
   parser.add_argument('--plugin_name')
   parser.add_argument('--plugin', action='store_true')
+  parser.add_argument('--no_tests', action='store_true')
+  parser.add_argument('--relative_imports', action='store_true')
 
   args = parser.parse_args()
 
@@ -687,11 +726,11 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
     if args.module_name is None:
       parser.error('--plugin requires --module_name')
     files = read_plugin_file_list(args.file_list_path, args.source_dir)
-    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.plugin_name, args.header_path, args.body_path)
+    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.plugin_name, args.header_path, args.body_path, args.body_top_path, args.no_tests, args.relative_imports)
   else:
     if args.header_path is None:
       parser.error('requires --header_path')
     if args.body_path is None:
       parser.error('requires --body_path')
     files = read_simpl_file_list(args.file_list_path, args.source_dir)
-    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name)
+    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name, args.body_top_path, args.no_tests, args.relative_imports)
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index 131a5cd5cc..11ab595f4a 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -245,3 +245,39 @@ py::class_<MultiDataContainerSelectionFilterParameter::RequirementType>(instance
     .def_readwrite("amTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::amTypes)
     .def_readwrite("daTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::daTypes)
     .def_readwrite("componentDimensions", &MultiDataContainerSelectionFilterParameter::RequirementType::componentDimensions);
+
+registerDataContainerArray(instanceDataContainerArray);
+registerDataContainer(instanceDataContainer);
+registerAttributeMatrix(instanceAttributeMatrix);
+registerDataArrayPath(instanceDataArrayPath);
+
+#ifdef SIMPL_EMBED_PYTHON
+py::class_<PythonSupport::FilterDelegate>(mod, "FilterDelegateCpp")
+    .def("notifyStatusMessage", &PythonSupport::FilterDelegate::notifyStatusMessage)
+    .def("notifyProgressMessage", &PythonSupport::FilterDelegate::notifyProgressMessage)
+    .def("setWarningCondition", &PythonSupport::FilterDelegate::setWarningCondition)
+    .def_property_readonly("preflight", &PythonSupport::FilterDelegate::preflight);
+
+py::class_<PythonFilter, AbstractFilter, std::shared_ptr<PythonFilter>>(mod, "PythonFilter").def(py::init([](py::object object) { return PythonFilter::New(object); }));
+
+mod.def("registerPythonFilter", [](py::object object) {
+  auto filterManager = FilterManager::Instance();
+  auto filterFactory = PythonFilterFactory::New(object);
+  filterManager->addPythonFilterFactory(filterFactory->getFilterClassName(), filterFactory);
+});
+
+mod.def("unregisterPythonFilter", [](const std::string& uuidStr) {
+  QUuid uuid(QString::fromStdString(uuidStr));
+  auto filterManager = FilterManager::Instance();
+  if(!filterManager->isPythonFilter(uuid))
+  {
+    return false;
+  }
+  return filterManager->removeFilterFactory(uuid);
+});
+
+mod.def("clearPythonFilters", []() {
+  auto filterManager = FilterManager::Instance();
+  filterManager->clearPythonFilterFactories();
+});
+#endif
diff --git a/Wrapping/Python/Binding/pySIMPLHeader.cpp b/Wrapping/Python/Binding/pySIMPLHeader.cpp
index a4e4e83be2..23065ba2b6 100644
--- a/Wrapping/Python/Binding/pySIMPLHeader.cpp
+++ b/Wrapping/Python/Binding/pySIMPLHeader.cpp
@@ -44,3 +44,10 @@ PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
 
 #include "Binding/Pybind11CustomTypeCasts.h"
 #include "Binding/pySupport.h"
+
+#ifdef SIMPL_EMBED_PYTHON
+#include "SIMPLib/Filtering/FilterManager.h"
+#include "SIMPLib/Python/FilterPyObject.h"
+#include "SIMPLib/Python/PythonFilter.h"
+#include "SIMPLib/Python/PythonFilterFactory.hpp"
+#endif
diff --git a/Wrapping/Python/Binding/pySupport.h b/Wrapping/Python/Binding/pySupport.h
index 638f40d79a..8c5a9924b4 100644
--- a/Wrapping/Python/Binding/pySupport.h
+++ b/Wrapping/Python/Binding/pySupport.h
@@ -1,11 +1,21 @@
 #pragma once
 
-#include "pybind11/numpy.h"
-#include "pybind11/pybind11.h"
-#include "pybind11/stl.h"
+#include <stdexcept>
+
+#include <pybind11/pybind11.h>
+
+#include <pybind11/numpy.h>
+#include <pybind11/stl.h>
 
 #include "SIMPLib/Common/SIMPLArray.hpp"
 #include "SIMPLib/DataArrays/DataArray.hpp"
+#include "SIMPLib/DataContainers/AttributeMatrix.h"
+#include "SIMPLib/DataContainers/DataContainer.h"
+#include "SIMPLib/DataContainers/DataContainerArray.h"
+
+#ifdef SIMPL_EMBED_PYTHON
+#include "SIMPLib/Python/FilterPyObject.h"
+#endif
 
 template <class T>
 void registerDataArray(pybind11::module& mod, const char* name)
@@ -14,8 +24,20 @@ void registerDataArray(pybind11::module& mod, const char* name)
   using namespace py::literals;
   using DataArrayType = DataArray<T>;
   py::class_<DataArrayType, IDataArray, std::shared_ptr<DataArrayType>>(mod, name, py::buffer_protocol())
-      .def(py::init([](size_t numElements, const QString& name, T initValue) { return std::make_shared<DataArrayType>(numElements, name, initValue); }))
-      .def(py::init([](size_t numElements, const std::vector<size_t>& cDims, const QString& name, T initValue) { return std::make_shared<DataArrayType>(numElements, name, cDims, initValue); }))
+      .def(py::init([](size_t numElements, const QString& name, T initValue) {
+        if(name.isEmpty())
+        {
+          throw std::invalid_argument("name cannot be empty");
+        }
+        return std::make_shared<DataArrayType>(numElements, name, initValue);
+      }))
+      .def(py::init([](size_t numElements, const std::vector<size_t>& cDims, const QString& name, T initValue) {
+        if(name.isEmpty())
+        {
+          throw std::invalid_argument("name cannot be empty");
+        }
+        return std::make_shared<DataArrayType>(numElements, name, cDims, initValue);
+      }))
       .def(py::init([](py::array_t<T, py::array::c_style> data, const QString& name, bool ownsData) {
         py::buffer_info buf = data.request();
         const std::vector<ssize_t>& shape = buf.shape;
@@ -59,6 +81,7 @@ void registerDataArray(pybind11::module& mod, const char* name)
                                return dims;
                              })
       .def_property_readonly("tuples", &DataArrayType::getNumberOfTuples)
+      .def_property_readonly_static("dtype", []([[maybe_unused]] py::object self) { return py::dtype::of<T>(); })
       .def(
           "__iter__", [](const DataArrayType& dataArray) { return py::make_iterator(dataArray.begin(), dataArray.end()); }, py::keep_alive<0, 1>())
       .def_buffer([](const DataArrayType& dataArray) -> py::buffer_info {
@@ -183,3 +206,143 @@ void registerSIMPLArray(pybind11::module& mod, const char* name)
            })
       .def("__getitem__", [](const array_t& values, size_t index) { return values.at(index); });
 }
+
+void registerDataContainerArray(pybind11::class_<DataContainerArray, std::shared_ptr<DataContainerArray>>& instance)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+
+  instance.def("__getitem__", [](const DataContainerArray& dca, const QString& name) {
+    if(!dca.doesDataContainerExist(name))
+    {
+      throw pybind11::key_error(name.toStdString());
+    }
+    return dca.getDataContainer(name);
+  });
+
+  instance.def("__contains__", py::overload_cast<const QString&>(&DataContainerArray::doesDataContainerExist, py::const_));
+
+  instance.def("__len__", &DataContainerArray::size);
+  instance.def_property_readonly("size", &DataContainerArray::size);
+
+  instance.def(
+      "__iter__", [](DataContainerArray& dca) { return py::make_iterator(dca.begin(), dca.end()); }, py::keep_alive<0, 1>());
+
+#ifdef SIMPL_EMBED_PYTHON
+  instance.def(
+      "createNonPrereqArrayFromPath",
+      [](DataContainerArray& dca, PythonSupport::FilterDelegate& filter, SIMPL::NumericTypes::Type type, const DataArrayPath& path, py::object initValue, const std::vector<size_t>& compDims,
+         const QString& property, RenameDataPath::DataID_t id) {
+        switch(type)
+        {
+        case SIMPL::NumericTypes::Type::Int8:
+          return py::cast(dca.createNonPrereqArrayFromPath<Int8ArrayType>(filter.filter, path, initValue.cast<int8_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::UInt8:
+          return py::cast(dca.createNonPrereqArrayFromPath<Int8ArrayType>(filter.filter, path, initValue.cast<uint8_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Int16:
+          return py::cast(dca.createNonPrereqArrayFromPath<Int16ArrayType>(filter.filter, path, initValue.cast<int16_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::UInt16:
+          return py::cast(dca.createNonPrereqArrayFromPath<UInt16ArrayType>(filter.filter, path, initValue.cast<uint16_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Int32:
+          return py::cast(dca.createNonPrereqArrayFromPath<Int32ArrayType>(filter.filter, path, initValue.cast<int32_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::UInt32:
+          return py::cast(dca.createNonPrereqArrayFromPath<UInt32ArrayType>(filter.filter, path, initValue.cast<uint32_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Int64:
+          return py::cast(dca.createNonPrereqArrayFromPath<Int64ArrayType>(filter.filter, path, initValue.cast<int64_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::UInt64:
+          return py::cast(dca.createNonPrereqArrayFromPath<UInt64ArrayType>(filter.filter, path, initValue.cast<uint64_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::SizeT:
+          return py::cast(dca.createNonPrereqArrayFromPath<SizeTArrayType>(filter.filter, path, initValue.cast<size_t>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Float:
+          return py::cast(dca.createNonPrereqArrayFromPath<FloatArrayType>(filter.filter, path, initValue.cast<float>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Double:
+          return py::cast(dca.createNonPrereqArrayFromPath<DoubleArrayType>(filter.filter, path, initValue.cast<double>(), compDims, property, id));
+        case SIMPL::NumericTypes::Type::Bool:
+          return py::cast(dca.createNonPrereqArrayFromPath<BoolArrayType>(filter.filter, path, initValue.cast<bool>(), compDims, property, id));
+        default:
+          throw std::invalid_argument("Invalid numeric type");
+        }
+      },
+      "filter"_a, "type"_a, "path"_a, "initValue"_a, "compDims"_a, "property"_a = std::string(""), "id"_a = RenameDataPath::k_Invalid_ID);
+
+  instance.def(
+      "createNonPrereqDataContainer",
+      [](DataContainerArray& dca, PythonSupport::FilterDelegate& filter, const QString& dataContainerName, RenameDataPath::DataID_t id) {
+        return dca.createNonPrereqDataContainer(filter.filter, dataContainerName, id);
+      },
+      "filter"_a, "dataContainerName"_a, "id"_a = RenameDataPath::k_Invalid_ID);
+
+  instance.def(
+      "createNonPrereqDataContainer",
+      [](DataContainerArray& dca, PythonSupport::FilterDelegate& filter, const DataArrayPath& dap, RenameDataPath::DataID_t id) { return dca.createNonPrereqDataContainer(filter.filter, dap, id); },
+      "filter"_a, "dap"_a, "id"_a = RenameDataPath::k_Invalid_ID);
+#endif
+}
+
+void registerDataContainer(pybind11::class_<DataContainer, std::shared_ptr<DataContainer>>& instance)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+
+  instance.def("__getitem__", [](const DataContainer& dc, const QString& name) {
+    if(!dc.doesAttributeMatrixExist(name))
+    {
+      throw pybind11::key_error(name.toStdString());
+    }
+    return dc.getAttributeMatrix(name);
+  });
+
+  instance.def("__contains__", py::overload_cast<const QString&>(&DataContainer::doesAttributeMatrixExist, py::const_));
+
+  instance.def("__len__", &DataContainer::size);
+  instance.def_property_readonly("size", &DataContainer::size);
+
+  instance.def(
+      "__iter__", [](DataContainer& dc) { return py::make_iterator(dc.begin(), dc.end()); }, py::keep_alive<0, 1>());
+
+#ifdef SIMPL_EMBED_PYTHON
+  instance.def(
+      "createNonPrereqAttributeMatrix",
+      [](DataContainer& dc, PythonSupport::FilterDelegate& filter, const DataArrayPath& path, const std::vector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id) {
+        return dc.createNonPrereqAttributeMatrix(filter.filter, path, tDims, amType, id);
+      },
+      "filter"_a, "path"_a, "tDims"_a, "amType"_a, "id"_a = RenameDataPath::k_Invalid_ID);
+
+  instance.def(
+      "createNonPrereqAttributeMatrix",
+      [](DataContainer& dc, PythonSupport::FilterDelegate& filter, const QString& attributeMatrixName, const std::vector<size_t>& tDims, AttributeMatrix::Type amType, RenameDataPath::DataID_t id) {
+        return dc.createNonPrereqAttributeMatrix(filter.filter, attributeMatrixName, tDims, amType, id);
+      },
+      "filter"_a, "attributeMatrixName"_a, "tDims"_a, "amType"_a, "id"_a = RenameDataPath::k_Invalid_ID);
+#endif
+}
+
+void registerAttributeMatrix(pybind11::class_<AttributeMatrix, std::shared_ptr<AttributeMatrix>>& instance)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+
+  instance.def("__contains__", py::overload_cast<const QString&>(&AttributeMatrix::doesAttributeArrayExist, py::const_));
+
+  instance.def("__len__", &AttributeMatrix::size);
+  instance.def_property_readonly("size", &AttributeMatrix::size);
+
+  instance.def(
+      "__iter__", [](AttributeMatrix& am) { return py::make_iterator(am.begin(), am.end()); }, py::keep_alive<0, 1>());
+
+  instance.def("__getitem__", [](const AttributeMatrix& am, const QString& name) {
+    if(!am.doesAttributeArrayExist(name))
+    {
+      throw pybind11::key_error(name.toStdString());
+    }
+    return am.getAttributeArray(name);
+  });
+}
+
+void registerDataArrayPath(py::class_<DataArrayPath>& instance)
+{
+  namespace py = pybind11;
+  using namespace py::literals;
+
+  instance.def("__repr__", [](const DataArrayPath& path) { return QString("DataArrayPath(\"%1\")").arg(path.serialize()); });
+}

From 5d8724aca5cecf5359acd30e225b3be7df1274b9 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 15 Apr 2021 12:17:19 -0400
Subject: [PATCH 368/397] Remove obsoleted files for generating python bindings

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Conda/conda-recipe/LICENSE    |  78 --
 Wrapping/Python/Conda/conda-recipe/bld.bat    |  12 -
 Wrapping/Python/Conda/conda-recipe/build.sh   |   5 -
 Wrapping/Python/Conda/conda-recipe/meta.yaml  |  35 -
 Wrapping/Python/Conda/conda-recipe/setup.py   |  23 -
 Wrapping/Python/Conda/egg-info/MANIFEST.in    |   6 -
 Wrapping/Python/Conda/egg-info/PKG-INFO       |  43 -
 Wrapping/Python/Conda/egg-info/ReadMe.md      |  52 --
 Wrapping/Python/Conda/egg-info/setup.cfg      |   4 -
 Wrapping/Python/Conda/egg-info/setup.py       |  23 -
 Wrapping/Python/Conda/macOS_package.in.sh     | 446 ----------
 Wrapping/Python/Conda/package.in.bat          | 111 ---
 Wrapping/Python/Pybind11/CMakeLists.txt       | 251 ------
 .../Pybind11/CodeScraper/CodeScraper.cpp      |  83 --
 .../CodeScraper/CodeScraperConstants.h        |  44 -
 .../CodeScraper/PyBind11Generator.cpp         | 459 ----------
 .../Pybind11/CodeScraper/PyBind11Generator.h  |  76 --
 .../CodeScraper/PythonBindingClass.cpp        | 809 ------------------
 .../Pybind11/CodeScraper/PythonBindingClass.h | 105 ---
 .../CodeScraper/PythonBindingsModule.cpp      | 573 -------------
 .../CodeScraper/PythonBindingsModule.h        | 113 ---
 .../Python/Pybind11/CodeScraper/PythonUtils.h |  36 -
 .../CodeScraper/SIMPLPyBind11Config.h.in      |  73 --
 Wrapping/Python/Pybind11/Pybind11_Notes.md    |  50 --
 .../DerivedSharedPointerClassInit.in.h        |  25 -
 .../Templates/PluginModuleCodeTemplate.in.cpp |  66 --
 .../Templates/Pybind11CustomTypeCasts.in.h    | 643 --------------
 .../Pybind11/Templates/Pybind11TopMatter.in.h |  34 -
 .../Templates/SIMPLModuleCodeTemplate.in.cpp  | 598 -------------
 .../Templates/SharedPointerClassInit.in.h     |  31 -
 .../Pybind11/Templates/SimpleClassInit.in.h   |  34 -
 .../Pybind11/cmake/WrappingFunctions.cmake    | 218 -----
 .../Python/Pybind11/python_test_driver.bat    |  24 -
 .../Python/Pybind11/python_test_driver.sh     |  37 -
 Wrapping/Python/Pybind11/setup.py             |  11 -
 35 files changed, 5231 deletions(-)
 delete mode 100644 Wrapping/Python/Conda/conda-recipe/LICENSE
 delete mode 100644 Wrapping/Python/Conda/conda-recipe/bld.bat
 delete mode 100755 Wrapping/Python/Conda/conda-recipe/build.sh
 delete mode 100644 Wrapping/Python/Conda/conda-recipe/meta.yaml
 delete mode 100644 Wrapping/Python/Conda/conda-recipe/setup.py
 delete mode 100644 Wrapping/Python/Conda/egg-info/MANIFEST.in
 delete mode 100644 Wrapping/Python/Conda/egg-info/PKG-INFO
 delete mode 100644 Wrapping/Python/Conda/egg-info/ReadMe.md
 delete mode 100644 Wrapping/Python/Conda/egg-info/setup.cfg
 delete mode 100644 Wrapping/Python/Conda/egg-info/setup.py
 delete mode 100755 Wrapping/Python/Conda/macOS_package.in.sh
 delete mode 100644 Wrapping/Python/Conda/package.in.bat
 delete mode 100644 Wrapping/Python/Pybind11/CMakeLists.txt
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
 delete mode 100644 Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
 delete mode 100644 Wrapping/Python/Pybind11/Pybind11_Notes.md
 delete mode 100644 Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
 delete mode 100644 Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
 delete mode 100644 Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
 delete mode 100644 Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
 delete mode 100644 Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
 delete mode 100644 Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
 delete mode 100644 Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
 delete mode 100644 Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
 delete mode 100644 Wrapping/Python/Pybind11/python_test_driver.bat
 delete mode 100755 Wrapping/Python/Pybind11/python_test_driver.sh
 delete mode 100644 Wrapping/Python/Pybind11/setup.py

diff --git a/Wrapping/Python/Conda/conda-recipe/LICENSE b/Wrapping/Python/Conda/conda-recipe/LICENSE
deleted file mode 100644
index c335d10ce4..0000000000
--- a/Wrapping/Python/Conda/conda-recipe/LICENSE
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-  <title>License.txt</title>
-</head>
-<body>
-
-<h2>Copyright Notice</h2>
-<pre>
-This software and ancillary information known as DREAM.3D (and herein
-called "SOFTWARE") is made available under the terms described below.
-
-Unless otherwise indicated, this SOFTWARE has been authored by an
-employee or employees of the U.S. Air Force Research Laboratory or one of
-its contractors or subcontractors.
-
-The United States Government has rights to use, reproduce, and
-distribute this SOFTWARE. The public may copy, distribute, prepare
-derivative works and publicly display this SOFTWARE without charge,
-provided that this Notice and any statement of authorship are
-reproduced on all copies.
-
-Neither the U. S. Government, Universal Technology Corporation or BlueQuartz
-Software makes any warranty, either express or implied, nor assumes any
-liability or responsibility for the use of this SOFTWARE.
-
-If SOFTWARE is modified to produce derivative works, such modified
-SOFTWARE should be clearly marked, so as not to confuse it with the
-version available from the US Air Force Research Laboratories or
-BlueQuartz Software.
-
-Copyright (c) 2009-2016 BlueQuartz Software, LLC, All rights reserved.
-BlueQuartz Software, LLC
-400 S. Pioneer Blvd.
-Springboro, Ohio 45066
-</pre>
-
-
-<h2>BSD Open-Source License</h2>
-<pre>
-Copyright (c) 2009-2018 BlueQuartz Software, LLC
-
-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 the name of BlueQuartz Software, the US Air Force, nor the names of its 
-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 COPYRIGHT HOLDER 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.
-
-</pre>
-
-<h2>Other Licenses</h2>
-<pre>
-Other Licenses apply to third party software frameworks that are used to create
-this software product. Each of those license files can be found included with
-this software product.
-</pre>
-</body>
-</html>
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/conda-recipe/bld.bat b/Wrapping/Python/Conda/conda-recipe/bld.bat
deleted file mode 100644
index 6acf63189b..0000000000
--- a/Wrapping/Python/Conda/conda-recipe/bld.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-
-:: Copy the build artifacts from the normal build directory into the Anaconda package dir
-
-if "%ARCH%" == "32" (set PLATFORM=x86) else (set PLATFORM=x64)
-call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PLATFORM%
-set DISTUTILS_USE_SDK=1
-set MSSdk=1
-
-
-
-"%PYTHON%" setup.py install
-if errorlevel 1 exit 1
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/conda-recipe/build.sh b/Wrapping/Python/Conda/conda-recipe/build.sh
deleted file mode 100755
index 839c39c411..0000000000
--- a/Wrapping/Python/Conda/conda-recipe/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-$PYTHON setup.py install
-
-
diff --git a/Wrapping/Python/Conda/conda-recipe/meta.yaml b/Wrapping/Python/Conda/conda-recipe/meta.yaml
deleted file mode 100644
index 0560d8df30..0000000000
--- a/Wrapping/Python/Conda/conda-recipe/meta.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-{% set name = "@SIMPL_PYTHON_MODULE_NAME@" %}
-{% set version = "@SIMPLProj_VERSION_MAJOR@.@SIMPLProj_VERSION_MINOR@.@SIMPLProj_VERSION_PATCH@" %}
-
-package:
-  name: "{{ name|lower }}"
-  version: "{{ version }}"
-
-source:
-    path: $RECIPE_DIR/../../site-packages
-
-
-requirements:
-  host:
-    - python
-    - numpy
-    - setuptools
-    - pybind11
-    
-  build:
-    - python
-    - numpy
-    - setuptools
-    - pybind11
-
-  run:
-    - python
-    - numpy
-    - setuptools
-    - vs2015_runtime # [win]
-
-about:
-  home: https://github.com/BlueQuartzSoftware/DREAM3D
-  license: BSD
-  license_file: LICENSE
-  summary: An advanced data analysis package suited for material science and engineering.
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/conda-recipe/setup.py b/Wrapping/Python/Conda/conda-recipe/setup.py
deleted file mode 100644
index 0cc074fe3d..0000000000
--- a/Wrapping/Python/Conda/conda-recipe/setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import setuptools
-
-with open("ReadMe.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name="dream3d",
-    version="@SIMPLProj_VERSION_MAJOR@.@SIMPLProj_VERSION_MINOR@.@SIMPLProj_VERSION_PATCH@",
-    author="BlueQuartz Software",
-    author_email="dream3d@bluequartz.net",
-    description="An open source, cross-platform and modular software package that allows users to reconstruct, instantiate, quantify, mesh, handle and visualize multidimensional, multimodal data",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/BlueQuartzSoftware/DREAM3D",
-    packages=setuptools.find_packages(),
-	include_package_data = True,
-	zip_safe = False,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-    ],
-)
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/egg-info/MANIFEST.in b/Wrapping/Python/Conda/egg-info/MANIFEST.in
deleted file mode 100644
index b440633853..0000000000
--- a/Wrapping/Python/Conda/egg-info/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include dream3d/*.pyd
-include dream3d/*.dll
-include dream3d/*.so
-include dream3d/*.dylib
-include dream3d/*.plugin
-exclude dream3d/*Qt5WebEngine*
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/egg-info/PKG-INFO b/Wrapping/Python/Conda/egg-info/PKG-INFO
deleted file mode 100644
index 9bd611d9dc..0000000000
--- a/Wrapping/Python/Conda/egg-info/PKG-INFO
+++ /dev/null
@@ -1,43 +0,0 @@
-Metadata-Version: 2.1
-Name: dream3d
-Version: @SIMPLProj_VERSION_MAJOR@.@SIMPLProj_VERSION_MINOR@.@SIMPLProj_VERSION_PATCH@
-Summary: An open source, cross-platform and modular software package that allows users to reconstruct, instantiate, quantify, mesh, handle and visualize multidimensional, multimodal data
-Home-page: https://github.com/BlueQuartzSoftware/DREAM3D
-Author: BlueQuartz Software
-Author-email: dream3d-developers@bluequartz.net
-License: BSD
-Description: ![](https://github.com/BlueQuartzSoftware/DREAM3D/raw/develop/Resources/OpenSourceEdition/splash/branded_splash.png)
-        
-        # DREAM.3D  #
-        
-        DREAM.3D is an open source, cross-platform and modular software package that allows users to reconstruct, instantiate, quantify, mesh, handle and visualize multidimensional, multimodal data. DREAM.3D is built on top of the SIMPL and SIMPLView software projects and contains a filter suite designed for the materials scientist to utilize to reconstruct 3D  microstructures or synthetically generate microstructures. The core software package has many major functionalities, including:
-        
-        + Import ASCII Data
-        + Import EBSD Vendor Data (.ang, .ctf, .h5)
-        + Import of standard image files (TIFF, PNG, JPEG, BMP)
-        + Archive Raw and processed data to HDF5 files
-        + Alignment, cleaning, reconstruction, segmentation and analysis of imported data
-        + Statistics, either synthetically created or from real data, can be used to generate a statistically equivelent material structure
-        + Reconstructed and synthetic volumes can be surfaced meshed to allow export into FEM or other simulations.
-        + Import/Export of data into/out of ASCII or Binary files
-        + Export Surface Mesh as STL Files
-        + Over 200 filters to process data
-        + Integration with [http://www.itk.org](http://www.itk.org)
-        + Use [ParaView](http://www.paraview.org) to visualize raw and processed data
-        
-        The above items represent only a subset of the specific capabilities of DREAM.3D.  In general, DREAM.3D can be considered a generic tool for processing multidimensional, multimodal data. The main [DREAM.3D web site](http://dream3d.bluequartz.net) has more information on the project, in addition to official binary distributions and example data files. DREAM.3D is built with a **Plugin** system that allows other institutions to build additional **Filters** using their own programming resources and intellectual property and still protect those rights under the BSD license.
-        
-        
-        ## WebSite ##
-        
-        [http://dream3d.bluequartz.net](http://dream3d.bluequartz.net)
-        
-        ## License ##
-        
-        See the Copying.md file for CopyRight & license
-        
-Platform: ALL
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: BSD License
-Classifier: Operating System :: OS Independent
-Description-Content-Type: text/markdown
diff --git a/Wrapping/Python/Conda/egg-info/ReadMe.md b/Wrapping/Python/Conda/egg-info/ReadMe.md
deleted file mode 100644
index 3791b5c5d9..0000000000
--- a/Wrapping/Python/Conda/egg-info/ReadMe.md
+++ /dev/null
@@ -1,52 +0,0 @@
-![](https://github.com/BlueQuartzSoftware/DREAM3D/raw/develop/Resources/OpenSourceEdition/splash/branded_splash.png)
-
-# DREAM.3D  #
-
-DREAM.3D is an open source, cross-platform and modular software package that allows users to reconstruct, instantiate, quantify, mesh, handle and visualize multidimensional, multimodal data. DREAM.3D is built on top of the SIMPL and SIMPLView software projects and contains a filter suite designed for the materials scientist to utilize to reconstruct 3D  microstructures or synthetically generate microstructures. The core software package has many major functionalities, including:
-
-+ Import ASCII Data
-+ Import EBSD Vendor Data (.ang, .ctf, .h5)
-+ Import of standard image files (TIFF, PNG, JPEG, BMP)
-+ Archive Raw and processed data to HDF5 files
-+ Alignment, cleaning, reconstruction, segmentation and analysis of imported data
-+ Statistics, either synthetically created or from real data, can be used to generate a statistically equivelent material structure
-+ Reconstructed and synthetic volumes can be surfaced meshed to allow export into FEM or other simulations.
-+ Import/Export of data into/out of ASCII or Binary files
-+ Export Surface Mesh as STL Files
-+ Over 200 filters to process data
-+ Integration with [http://www.itk.org](http://www.itk.org)
-+ Use [ParaView](http://www.paraview.org) to visualize raw and processed data
-
-The above items represent only a subset of the specific capabilities of DREAM.3D.  In general, DREAM.3D can be considered a generic tool for processing multidimensional, multimodal data. The main [DREAM.3D web site](http://dream3d.bluequartz.net) has more information on the project, in addition to official binary distributions and example data files. DREAM.3D is built with a **Plugin** system that allows other institutions to build additional **Filters** using their own programming resources and intellectual property and still protect those rights under the BSD license.
-
-
-## WebSite ##
-
-[http://dream3d.bluequartz.net](http://dream3d.bluequartz.net)
-
-## License ##
-
-See the Copying.md file for CopyRight & license
-
-
-## Building DREAM.3D ##
-
-For information on building DREAM.3D and all its necessary dependencies, see the Documentation/ReferenceManual/Developer/ directory. [View it here on the GitHub website](https://github.com/BlueQuartzSoftware/DREAM3D/tree/develop/Documentation/ReferenceManual/6_Developer).
-
-Current build status for the build farm is located at [our CDash site.](http://my.cdash.org/index.php?project=DREAM3D)
-
-## Nightly Builds ##
-
-Nightly snapshot builds are available for download [here](http://dream3d.bluequartz.net/binaries/experimental/). These binaries are built every night from the head of the develop branch, and may have bugs or other instabilities.
-
-## Getting Help ##
-
-Please sign up for the [DREAM.3D Users Google group](https://groups.google.com/forum/?hl=en#!forum/dream3d-users). It's the fastest way to ask your DREAM.3D questions, get help with using DREAM.3D, and connect with both developers and the community at large.  If you are interested in contributing to the DREAM.3D project, also sign up to the <a href="https://groups.google.com/forum/?hl=en#!forum/dream3d-developers">DREAM.3D Developers Google group</a> to get help with compiling and adding to DREAM.3D. If you find an error with DREAM.3D or want to request a new feature, please [open up an issue](https://github.com/dream3d/DREAM3D/issues).
-
-## Contributing to DREAM.3D ##
-
-Please reference the Contributing file for more information on contributing to the DREAM.3D project.
-
-## Acknowledgments ##
-
-See the file for contributors to DREAM.3D
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/egg-info/setup.cfg b/Wrapping/Python/Conda/egg-info/setup.cfg
deleted file mode 100644
index 8bfd5a12f8..0000000000
--- a/Wrapping/Python/Conda/egg-info/setup.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-
diff --git a/Wrapping/Python/Conda/egg-info/setup.py b/Wrapping/Python/Conda/egg-info/setup.py
deleted file mode 100644
index b82612b311..0000000000
--- a/Wrapping/Python/Conda/egg-info/setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import setuptools
-
-with open("ReadMe.md", "r") as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name="dream3d",
-    version="@SIMPLProj_VERSION_MAJOR@.@SIMPLProj_VERSION_MINOR@.@SIMPLProj_VERSION_PATCH@",
-    author="BlueQuartz Software",
-    author_email="dream3d-developers@bluequartz.net",
-    description="An open source, cross-platform and modular software package that allows users to reconstruct, instantiate, quantify, mesh, handle and visualize multidimensional, multimodal data",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://github.com/BlueQuartzSoftware/DREAM3D",
-    packages=setuptools.find_packages(),
-	include_package_data = True,
-	zip_safe = False,
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: BSD License",
-        "Operating System :: OS Independent",
-    ],
-)
\ No newline at end of file
diff --git a/Wrapping/Python/Conda/macOS_package.in.sh b/Wrapping/Python/Conda/macOS_package.in.sh
deleted file mode 100755
index 1360f98667..0000000000
--- a/Wrapping/Python/Conda/macOS_package.in.sh
+++ /dev/null
@@ -1,446 +0,0 @@
-#!/bin/bash
-
-# Set some Variables
-BuildDir=@CROD_NATIVE@
-ANACONDA_PACKAGE_DIR=@SCOD_NATIVE@
-ANACONDA_DIR=@ANACONDA_DIR@
-ANACONDA_SCRIPTS_DIR_NAME=@ANACONDA_SCRIPTS_DIR_NAME@
-ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
-PYTHON_SITE_PACKAGES_NAME=@PYTHON_SITE_PACKAGES_NAME@
-SIMPL_PYTHON_MODULE_NAME=@SIMPL_PYTHON_MODULE_NAME@
-
-ENV_CONDA_EXE=${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda
-CMAKE_COMMAND=@CMAKE_COMMAND@
-
-# -----------------------------------------------------------------------------
-#  Conditional Printing
-# -----------------------------------------------------------------------------
-function printStatus()
-{
-#  if [ "@CMAKE_BUILD_TYPE@" = "Debug" ]; then
-  if [ "1" = "1" ]; then
-      echo "${1}"
-  fi
-}
-
-echo "*********************************************************************"
-echo "Starting Conda Package Generation"
-
-
-PYTHON_MODULE_LIBRARY=`find $BuildDir -type f -name "@SIMPL_PYTHON_MODULE_NAME@.cpython*.so"`
-echo "Python Module Library: $PYTHON_MODULE_LIBRARY"
-
-
-InstallPrefix="${ANACONDA_PACKAGE_DIR}/$PYTHON_SITE_PACKAGES_NAME/$SIMPL_PYTHON_MODULE_NAME"
-printStatus "InstallPrefix = ${InstallPrefix}"
-ProjectBinaryDir=$BuildDir
-printStatus "ProjectBinaryDir = ${ProjectBinaryDir}"
-
-PackageInstallDest=$InstallPrefix
-printStatus "InstallPrefix = ${InstallPrefix}"
-
-ApplicationName="@SIMPL_PYTHON_MODULE_NAME@"
-ApplicationExe="${PYTHON_MODULE_LIBRARY}"
-
-LibDirName="."
-LibPath="${InstallPrefix}/${LibDirName}"
-InstallNameLib="@rpath/${LibDirName}"
-FrameworkDirName="Frameworks"
-FrameworkPath="${InstallPrefix}/${FrameworkDirName}"
-InstallNameFramework="@rpath/${FrameworkDirName}"
-PluginDirName="Plugins"
-PluginPath="${ApplicationBundleName}/Contents/${PluginDirName}"
-InstallNamePlugin="@rpath/${PluginDirName}"
-ResourcesDirName="Resources"
-ResourcesPath="${ApplicationBundleName}/Contents/${ResourcesDirName}"
-
-TmpDir="/tmp"
-
-addFrameworksRPath=0
-addLibraryRPath=1
-
-mkdir ${InstallPrefix}/lib
-mkdir ${InstallPrefix}/Frameworks
-
-# -----------------------------------------------------------------------------
-#  $1 is the path to a framework
-#  $2 is the target file to update
-# -----------------------------------------------------------------------------
-function CorrectLinkedFrameworkInstallName()
-{
-  printStatus "      |-  CorrectLinkedFrameworkInstallName"
-  printStatus "          |- 1: ${1}"
-  printStatus "          |- 2: ${2}"
-  oldPath="${1}"
-  libName=`basename ${oldPath}`
-  frameworkName="${libName}.framework"
-  frameworkRootDir="${1%${frameworkName}*}"
-  frameworkBundle="${frameworkRootDir}${frameworkName}"
-  newPath="${InstallNameFramework}/${1#${frameworkRootDir}*}"
-  printStatus "          |- oldPath: ${oldPath}"
-  printStatus "          |- newPath: ${newPath}"
-  install_name_tool -change ${oldPath} ${newPath} ${2}
-}
-
-# -----------------------------------------------------------------------------
-#  uses install_name_tool to correct all the DEPENDENCIES of an input file
-#  $1 is an install_name to check. This was generated from a call to otool -L
-#  $2 is the Library in its final installed location
-# -----------------------------------------------------------------------------
-function CorrectLibraryDependency()
-{
-  pattern=" \(*\)"            # everything between '(' and ')'
-  oldPath="${1%$pattern}"
-  # Filter out System Libraries or those located in /Libary/Frameworks
-  isSystem=`expr  "${oldPath}" : '/System'`
-  isUsrLib=`expr "${oldPath}" : '/usr/lib'`
-  #isLibFrwk=`expr "${oldPath}" : '/Libraray/Frameworks'`
-  isEmbeddedPathExe=`expr "${oldPath}" : '@executable_path/'`
-  isEmbeddedPathLdr=`expr "${oldPath}" : '@loader_path/'`
-  if [[ "$isSystem" = "0" \
-    && "$isUsrLib" = "0" \
-    && "$isEmbeddedPathExe" = "0" \
-    && "$isEmbeddedPathLdr" = "0" ]]; then
-      printStatus "    |-  CorrectLibraryDependency"
-      printStatus "      |-  ${1}"
-      printStatus "      |-  ${2}"
-      libName=`basename ${oldPath}`
-      frameworkName="${libName}.framework"
-      isFramework=` echo ${oldPath} | grep "${frameworkName}"`
-      if [[ "${#isFramework}" = "0" ]]; then
-        libName=`basename ${oldPath}`
-        newPath="${InstallNameLib}/${libName}"
-        install_name_tool -change "${oldPath}" "${newPath}" "${2}"
-      else
-        CorrectLinkedFrameworkInstallName "${oldPath}" "${2}"
-      fi
-   fi
-}
-
-# -----------------------------------------------------------------------------
-#  uses install_name_tool to correct this library's dependencies
-#  $1 is a linked library to update
-# -----------------------------------------------------------------------------
-function UpdateLibraryDependencies()
-{
-  printStatus "    |- UpdateLibraryDependencies ${1}"
-  local libFile
-  local libOutFile
-  local i
-
-  OUTDIR=$RANDOM
-
-  libFile="${1}"
-  libOutFile="${TmpDir}/@SIMPL_PYTHON_MODULE_NAME@-library_$OUTDIR.out"
-  otool -L "${1}" > "${libOutFile}"
-  i=0
-  exec 10<"${libOutFile}"
-  while read -u 10 line
-    do
-    if [[ ${i} -gt 1 ]]; then
-        CorrectLibraryDependency "${line}" "${1}"
-        let i=i+1
-    fi
-    let i=i+1
-  done
-  exec 10<&-
-
-  rm -rf "${libOutFile}"
-}
-
-# -----------------------------------------------------------------------------
-#  uses install_name_tool to correct this framework
-#  $1 is a linked framework
-#  $2 is the executable
-# -----------------------------------------------------------------------------
-function UpdateFrameworkInstallName()
-{
-  printStatus "  |- UpdateFrameworkInstallName"
-  printStatus "     |  1: ${1}"
-  printStatus "     |  2: ${2}"
-  local frameworkBundle
-  local frameworkName
-  local frameworkRootDir
-  local libName
-  local frameworkRootPath
-
-  if [[ -e ${1} ]]; then
-    #-- Copy the Framework using the current "install_name" as the path
-    printStatus "     |  Copying Framework '${1}' into app bundle"
-
-    libName=`basename ${1}`
-
-    frameworkName="${libName}.framework"
-    frameworkRootDir="${1%${frameworkName}*}"
-    frameworkBundle="${frameworkRootDir}${frameworkName}"
-    frameworkRootPath=`dirname ${1#${frameworkRootDir}*}`
-    printStatus "     |  frameworkRootDir: ${frameworkRootDir}"
-    printStatus "     |  frameworkBundle: ${frameworkBundle}"
-    printStatus "     |  frameworkRootPath: ${frameworkRootPath}"
-    printStatus "     |  ${FrameworkPath}/${1#${frameworkRootDir}*}"
-
-    mkdir -p "${FrameworkPath}/${frameworkRootPath}"
-    cp "${1}" "${FrameworkPath}/${frameworkRootPath}/"
-
-    # Update the Executables link path to this library
-    oldPath="${1}"
-    libName=`basename ${oldPath}`
-    newPath="${InstallNameFramework}/${1#${frameworkRootDir}*}"
-    printStatus "     | oldPath: ${oldPath}"
-    printStatus "     | newPath: ${newPath}"
-    printStatus "     | 2: ${2}"
-    install_name_tool -change ${oldPath} ${newPath} ${2}
-
-    # Update the install_name of the library itself
-    install_name_tool -id ${newPath} "${FrameworkPath}/${1#${frameworkRootDir}*}"
-
-    UpdateLibraryDependencies "${FrameworkPath}/${1#${frameworkRootDir}*}"
-  fi
-
-  isRPath=`expr "${1}" : '@rpath/'`
-  if [[ ! "$isRPath" = "0" ]]; then
-    base=`basename ${1}`
-    for p in $(echo $libSearchDirs | sed "s/;/ /g")
-      do
-        pathToCopy=${p}/${base}.framework
-        if [[ -e ${pathToCopy} ]]; then
-          #-- Copy the library from the current build directory as the path
-          printStatus "  |- Copying Framework '${pathToCopy}' into app bundle"
-          libName=$base
-          frameworkName="${libName}.framework"
-          frameworkRootDir="${p%${frameworkName}*}"
-          frameworkBundle="${frameworkRootDir}/${frameworkName}"
-          frameworkRootPath=`dirname ${frameworkRootDir}`
-          printStatus "     |  frameworkRootDir: ${frameworkRootDir}"
-          printStatus "     |  frameworkBundle: ${frameworkBundle}"
-          printStatus "     |  frameworkRootPath: ${frameworkRootPath}"
-          printStatus "     |  ${FrameworkPath}/${p#${frameworkRootDir}*}"
-          addFrameworksRPath=1
-
-          if [[ -e "${FrameworkPath}/${base}.framework" ]]; then
-            rm -rf "${FrameworkPath}/${base}.framework"
-          fi
-
-          mkdir -p "${FrameworkPath}"
-          cp -R "${pathToCopy}" "${FrameworkPath}/"
-
-          if [[ -e "${FrameworkPath}/${base}.framework/Versions/Current/Headers" ]]; then
-            rm -rf "${FrameworkPath}/${base}.framework/Versions/Current/Headers"
-          fi
-          if [[ -e "${FrameworkPath}/${base}.framework/Versions/Current/${base}_debug" ]]; then
-            rm -rf "${FrameworkPath}/${base}.framework/Versions/Current/${base}_debug"
-          fi
-          
-        fi
-    done
-  fi
-}
-
-# -----------------------------------------------------------------------------
-#  Copies a framework
-#  $1 is a linked library
-# -----------------------------------------------------------------------------
-function CopyFramework()
-{
-
-  libName=`basename ${1}`
-
-  frameworkName="${libName}.framework"
-  frameworkRootDir="${1%${frameworkName}*}"
-  frameworkBundle="${frameworkRootDir}${frameworkName}"
-  frameworkRootPath=`dirname ${1#${frameworkRootDir}*}`
-  # printStatus "     |  libName: ${libName}"
-  # printStatus "     |  frameworkRootDir: ${frameworkRootDir}"
-  # printStatus "     |  frameworkBundle: ${frameworkBundle}"
-  # printStatus "     |  frameworkRootPath: ${frameworkRootPath}"
-  # printStatus "     |  ${FrameworkPath}/${1#${frameworkRootDir}*}"
-
-  cp -r $frameworkBundle $FrameworkPath/.
-  rm -rf $FrameworkPath/$frameworkName/Headers
-  rm -rf $FrameworkPath/$frameworkName/*.prl
-  rm -rf $FrameworkPath/$frameworkName/*_debug
-
-}
-
-# -----------------------------------------------------------------------------
-#  uses install_name_tool to correct this library
-#  $1 is a linked library
-#  $2 is the executable
-# -----------------------------------------------------------------------------
-function UpdateDylibInstallName()
-{
-  printStatus "  |- UpdateDylibInstallName | ${1} | ${2}"
-  if [[ -e ${1} ]]; then
-    #-- Copy the library using the current "install_name" as the path
-    printStatus "  |- Copying Library '${1}' into app bundle"
-    cp "${1}" "${LibPath}/."
-
-    # Update the Executables link path to this library
-    oldPath="${1}"
-    libName=`basename ${oldPath}`
-    newPath="${InstallNameLib}/${libName}"
-    #echo "   ${oldPath} \n   ${newPath}\n   ${2}"
-    install_name_tool -change ${oldPath} ${newPath} ${2}
-
-    # Update the install_name of the library itself
-    install_name_tool -id ${newPath} "${LibPath}/${libName}"
-
-    UpdateLibraryDependencies "${LibPath}/${libName}"
-  fi
-
-  pathToCopy=${BuildDir}/${1}
-
-  isRPath=`expr "${1}" : '@rpath/'`
-  if [[ ! "$isRPath" = "0" ]]; then
-    base=`basename ${1}`
-    pathToCopy=${BuildDir}/${base}
-  fi
-
-  if [[ -e ${pathToCopy} ]]; then
-    #-- Copy the library from the current build directory as the path
-    printStatus "  |- Copying Library '${pathToCopy}' into app bundle"
-    cp "${pathToCopy}" "${LibPath}/."
-
-    # Update the Executables link path to this library
-    oldPath="${1}"
-    libName=`basename ${oldPath}`
-    newPath="${InstallNameLib}/${libName}"
-#    echo "   ${oldPath} | ${newPath} | ${2}"
-    install_name_tool -change ${oldPath} ${newPath} ${2}
-
-    # Update the install_name of the library itself
-    install_name_tool -id ${newPath} "${LibPath}/${libName}"
-
-    UpdateLibraryDependencies "${LibPath}/${libName}"
-
-    addLibraryRPath=1
-  fi
-
-}
-
-# -----------------------------------------------------------------------------
-#  uses install_name_tool to correct all the DEPENDENCIES of an input file
-#  $1 is a linked library
-#  $2 is the executable in its final installed location
-# -----------------------------------------------------------------------------
-function UpdateExecutableDependencies()
-{
-  pattern=" \(*\)"            # everything between '(' and ')'
-  oldPath="${1%$pattern}"
-  # Filter out System Libraries or those located in /Libary/Frameworks
-  isSystem=`expr  "${oldPath}" : '/System'`
-  isUsrLib=`expr "${oldPath}" : '/usr/lib'`
-  #isLibFrwk=`expr "${oldPath}" : '/Libraray/Frameworks'`
-  isEmbeddedPathExe=`expr "${oldPath}" : '@rpath/'`
-#  echo "isEmbeddedPathExe: $isEmbeddedPathExe"
-  isEmbeddedPathLdr=`expr "${oldPath}" : '@loader_path/'`
-  if [[ "$isSystem" = "0" \
-    && "$isUsrLib" = "0" \
-    && "$isEmbeddedPathExe" = "0" \
-    && "$isEmbeddedPathLdr" = "0" ]]; then
-      printStatus "- UpdateExecutableDependencies | ${1} | ${2}"
-      #printStatus "      ${1}"
-      #printStatus "      ${2}"
-      libName=`basename ${oldPath}`
-      frameworkName="${libName}.framework"
-      isFramework=` echo ${oldPath} | grep "${frameworkName}"`
-      if [[ "${#isFramework}" = "0" ]]; then
-        UpdateDylibInstallName "${oldPath}" "${2}"
-      else
-        UpdateFrameworkInstallName "${oldPath}" "${2}"
-      fi
-  fi
-
-  if [[ "$isEmbeddedPathExe" = "7" ]]; then
-    #echo "    Item is @rpath....."
-    for d in $libSearchDirs; do
-      dylib=${oldPath//@rpath\//}
-      #echo "|---- Searching for $d/$dylib"
-      if [ -f $d/$dylib ]; then
-        #echo "|=============> $d/$dylib"
-        libName=`basename ${oldPath}`
-        frameworkName="${libName}.framework"
-        isFramework=` echo ${oldPath} | grep "${frameworkName}"`
-        if [[ "${#isFramework}" = "0" ]]; then
-          cp $d/$dylib $InstallPrefix/.
-        else
-          CopyFramework $d/$dylib
-        fi
-      fi
-    done
-
-  fi
-}
-
-# -----------------------------------------------------------------------------
-qtLibDir=`"@QtQMake_location@" -query QT_INSTALL_LIBS`
-
-libSearchDirs=`cat ${BuildDir}/../LibSearchDirs.txt`
-
-libSearchDirs="$libSearchDirs;${qtLibDir}"
-libSearchDirs=`echo $libSearchDirs | tr ";" " "`
-echo "LibSearchDirs"
-echo ${libSearchDirs}
-
-
-# -----------------------------------------------------------------------------
-#  Script really starts here
-# -----------------------------------------------------------------------------
-OUTDIR=$RANDOM
-tmpFile="/tmp/$OUTDIR-$SIMPL_PYTHON_MODULE_NAME.log"
-#mkdir -p "${TmpDir}/$OUTDIR"
-
-cp "${ApplicationExe}" $InstallPrefix/.
-
-ApplicationExe=$InstallPrefix/`basename ${ApplicationExe}`
-echo "ApplicationExe: $ApplicationExe"
-otool -L "${ApplicationExe}" > "${tmpFile}"
-
-i=0
-exec 9<"${tmpFile}"
-while read -u 9 line
-  do
-  if [[ ${i} -gt 0 ]]; then
-    # echo "[====] $line"
-    UpdateExecutableDependencies "${line}" "${ApplicationExe}"
-  fi
-  let i=i+1
-done
-exec 9<&-
-
-
-if [[ "$addFrameworksRPath" = "1" ]]; then
-  install_name_tool -add_rpath "@rpath/Frameworks/" ${ApplicationExe}
-fi
-
-if [[ "$addLibraryRPath" = "1" ]]; then
-  install_name_tool -add_rpath "@rpath/" ${ApplicationExe}
-fi
-
-rm -rf "${tmpFile}"
-
-#---------------------------------------------------------------------------------------
-# This part starts the actual creation and optional installation of the Anaconda package
-
-echo "Preparing to build the Conda package of DREAM3D using Conda environment: ${ANACONDA_ENVIRONMENT_NAME} and Conda installation: ${ANACONDA_DIR}. Activating the environment..."
-${ANACONDA_DIR}/${ANACONDA_SCRIPTS_DIR_NAME}/activate ${ANACONDA_ENVIRONMENT_NAME} 
-
-echo "Ensuring conda-build is installed..."         
-$ENV_CONDA_EXE install conda-build 
-
-echo "Creating output directory for the Conda Package..."
-mkdir -p ${ANACONDA_PACKAGE_DIR}/conda-package
-cd ${ANACONDA_PACKAGE_DIR}/conda-recipe
-
-echo "Building the Conda package..."
-$ENV_CONDA_EXE build --output-folder ${ANACONDA_PACKAGE_DIR}/conda-package . 
-
-echo "Purging the Anaconda Build directory...."
-$ENV_CONDA_EXE build purge 
-
-if [ "@SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL@" = "ON" ]; then
-  echo "Removing any existing dream3d Conda package from ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}"
-  $ENV_CONDA_EXE remove -y ${SIMPL_PYTHON_MODULE_NAME}
-  echo "Installing the dream3d Conda package into ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}"
-  $ENV_CONDA_EXE install -y --use-local  ${SIMPL_PYTHON_MODULE_NAME}
-fi
diff --git a/Wrapping/Python/Conda/package.in.bat b/Wrapping/Python/Conda/package.in.bat
deleted file mode 100644
index e67ac7ae9e..0000000000
--- a/Wrapping/Python/Conda/package.in.bat
+++ /dev/null
@@ -1,111 +0,0 @@
-:: This file was auto generated from:
-:: @SIMPLProj_SOURCE_DIR@/Wrapping/Python/Conda/package.in.bat
-:: Edit that file and NOT this one. CMake will over write this file each time it runs
-
-@echo off
-
-:: Check to see if we were built using the Visual Studio generators, if so
-:: then we need an additional argument to tell this script which configuration
-:: directory to use as the source for the compiled files.
-set CONFIG_DIR=
-IF "@MSVC_IDE@" == "1" (
-    if "%1" == "" goto usage
-    if "%1" == "Debug" goto Debug
-    if "%1" == "Release" goto Release
-    goto usage
-) else (
-    set CONFIG_DIR=
-    goto :package
-)
-
-::-----------------------------------------------------------------------------
-:Debug
-set CONFIG_DIR=\Debug
-goto :package
-
-::-----------------------------------------------------------------------------
-:Release
-set CONFIG_DIR=\Release
-goto :package
-
-::-----------------------------------------------------------------------------
-:: How to use this script when a Visual Studio Generator was used.
-:usage
-echo Error in script usage. The correct usage is:
-echo     %0 [option]
-echo where [option] is: The name of the Configuration (Debug or Release) that was built
-echo:
-echo For example:
-echo     %0 Debug
-goto :eof
-
-::-----------------------------------------------------------------------------
-:: This section of the script does all work.
-:package
-
-::Set some varaibles
-set BUILD_DIR=@CROD_NATIVE@%CONFIG_DIR%
-set ANACONDA_PACKAGE_DIR=@SCOD_NATIVE@
-set ANACONDA_DIR=@PCD_NATIVE@
-set ANACONDA_SCRIPTS_DIR_NAME=@ANACONDA_SCRIPTS_DIR_NAME@
-set ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
-set PYTHON_SITE_PACKAGES_NAME=@PYTHON_SITE_PACKAGES_NAME@
-set SIMPL_PYTHON_MODULE_NAME=@SIMPL_PYTHON_MODULE_NAME@
-set ENV_CONDA_EXE=%ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\conda.exe
-::set ENV_CONDA_EXE=%ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%\%ANACONDA_SCRIPTS_DIR_NAME%\conda.exe
-
-::---------------------------------------------------------------------------------------
-::Copy the build artifacts from the normal build directory into the Anaconda package dir
-@echo "Copy the DREAM.3D Distribution to the packaing directory at %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%"
-xcopy /i /q /y %BUILD_DIR%\*.dll %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-xcopy /i /q /y %BUILD_DIR%\*.pyd %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-xcopy /i /q /y %BUILD_DIR%\*.plugin %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-xcopy /i /q /y %BUILD_DIR%\*.guiplugin %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-xcopy /i /q /y %BUILD_DIR%\@SIMPLView_APPLICATION_NAME@.exe %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-xcopy /i /q /y %BUILD_DIR%\PipelineRunner.exe %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%
-
-@echo "Copy the Data, Help and Prebuilt Pipelines...."
-xcopy /i /q /y /s %BUILD_DIR%\Data %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\Data
-xcopy /i /q /y /s %BUILD_DIR%\Help %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\Help
-xcopy /i /q /y /s %BUILD_DIR%\PrebuiltPipelines %ANACONDA_PACKAGE_DIR%\%PYTHON_SITE_PACKAGES_NAME%\%SIMPL_PYTHON_MODULE_NAME%\PrebuiltPipelines
-
-::-----------------------------------------------------------------------------
-:: The ANACONDA_PREPARE_PACKAGE_ONLY should ONLY be set by CTest Cache files so
-:: that the proper libraries are copied from the build directory into the 
-:: site packages directory. This allows the unit tests to correctly execute on 
-:: Windows due to the DLL path issues. The ANACONDA_PREPARE_PACKAGE_ONLY should
-:: NEVER set by a normal cmake configuration process.
-
-IF "@ANACONDA_PREPARE_PACKAGE_ONLY@" == "" (
-    @echo "Preparing to build the Conda package %PYTHON_SITE_PACKAGES_NAME% using Conda environment: %ANACONDA_ENVIRONMENT_NAME% and Conda installation: %ANACONDA_DIR%. Activating the environment..."
-    call %ANACONDA_DIR%\%ANACONDA_SCRIPTS_DIR_NAME%\activate.bat %ANACONDA_ENVIRONMENT_NAME% 
-
-    @echo "Ensuring conda-build is installed..."         
-    call %ENV_CONDA_EXE% install --update-all conda-build 
-
-    @echo "Creating output directory for the Conda Package..."
-    mkdir %ANACONDA_PACKAGE_DIR%\conda-package
-
-    @echo "Building the Conda %PYTHON_SITE_PACKAGES_NAME%..."
-    cd %ANACONDA_PACKAGE_DIR%\conda-recipe
-    call %ENV_CONDA_EXE% build --output-folder %ANACONDA_PACKAGE_DIR%\conda-package .  
-
-    @echo "Purging the Anaconda Build directory...."
-    call %ENV_CONDA_EXE% build purge 
-
-
-    IF "@SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL@" == "ON" (
-        echo "====================================================================="
-        echo "        Starting Local Install of %SIMPL_PYTHON_MODULE_NAME% into %ANACONDA_DIR%\envs\%ANACONDA_ENVIRONMENT_NAME%"
-        echo "====================================================================="
-        echo "Removing any existing dream3d Conda package"
-        call %ENV_CONDA_EXE% remove -y %SIMPL_PYTHON_MODULE_NAME% 
-        echo "Installing the dream3d Conda package"
-        call %ENV_CONDA_EXE% install -y --use-local  %SIMPL_PYTHON_MODULE_NAME% 
-    )
-
-)
-
-echo "====================================================================="
-echo "       COMPLETED      "
-echo "====================================================================="
diff --git a/Wrapping/Python/Pybind11/CMakeLists.txt b/Wrapping/Python/Pybind11/CMakeLists.txt
deleted file mode 100644
index 8a0d44aacd..0000000000
--- a/Wrapping/Python/Pybind11/CMakeLists.txt
+++ /dev/null
@@ -1,251 +0,0 @@
-#------------------------------------------------------------------------------
-# Create the Top level Project
-#
-project(SIMPLPyBind11 VERSION 0.0.1.0)
-#message(STATUS "pybind11_INCLUDE_DIRS: ${pybind11_INCLUDE_DIRS}")
-
-find_package(PythonInterp REQUIRED)
-
-
-option(SIMPL_ENABLE_ANACONDA_PACKAGE "Build a Conda package" OFF)
-if(DEFINED DREAM3DProj_BINARY_DIR)
-  set(SIMPL_ANACONDA_OUTPUT_DIR "${DREAM3DProj_BINARY_DIR}/Anaconda")
-elseif(TARGET SIMPLView)
-  set(SIMPL_ANACONDA_OUTPUT_DIR "${SIMPLView_BINARY_DIR}/Anaconda")
-else()
-  set(SIMPL_ANACONDA_OUTPUT_DIR "${SIMPLProj_BINARY_DIR}/Anaconda")
-endif()
-
-# --------------------------------------------------------------------------
-# macro to convert a file system path to compatible C++ strings, i.e., on
-# Windows, convert the backslash to forward slash.
-macro(ConvertPathToHeaderCompatible INPUT)
-    if(WIN32)
-      STRING(REPLACE "\\" "\\\\" ${INPUT} ${INPUT} )
-      STRING(REPLACE "/" "\\\\" ${INPUT} ${INPUT}  )
-    endif()
-endmacro()
-
-# --------------------------------------------------------------------------
-# Convert any needed paths before we configure our header file
-set(SIMPLProj_SOURCE_DIR_NORM ${SIMPLProj_SOURCE_DIR})
-ConvertPathToHeaderCompatible(${SIMPLProj_SOURCE_DIR_NORM})
-set(SIMPLPyBind11_SOURCE_DIR_NORM ${SIMPLPyBind11_SOURCE_DIR})
-ConvertPathToHeaderCompatible(${SIMPLPyBind11_SOURCE_DIR_NORM})
-set(SIMPLPyBind11_BINARY_DIR_NORM ${SIMPLPyBind11_BINARY_DIR})
-ConvertPathToHeaderCompatible(${SIMPLPyBind11_BINARY_DIR_NORM})
-
-set(SIMPLPyBind11_LIBRARY_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-ConvertPathToHeaderCompatible(${SIMPLPyBind11_LIBRARY_OUTPUT_DIR})
-
-# --------------------------------------------------------------------------
-# Configure the header file with build specific paths
-set(SIMPL_PYTHON_MODULE_SUFFIX "")
-set_property(GLOBAL PROPERTY SIMPL_PYTHON_MODULE_SUFFIX ${SIMPL_PYTHON_MODULE_SUFFIX})
-set(SIMPL_PYTHON_MODULE_NAME "dream3d")
-set(PYTHON_SITE_PACKAGES_NAME "site-packages")
-set_property(GLOBAL PROPERTY PYTHON_SITE_PACKAGES_NAME ${PYTHON_SITE_PACKAGES_NAME})
-set(TEST_SCRIPT_FILE_EXT "sh")
-if(WIN32)
-  set(TEST_SCRIPT_FILE_EXT "bat")
-endif()
-set_property(GLOBAL PROPERTY SIMPL_PYTHON_TEST_SCRIPT "${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.${TEST_SCRIPT_FILE_EXT}")
-# --------------------------------------------------------------------------
-# Add an executable that will generate our python bindings
-add_executable(GeneratePythonBindings)
-
-get_target_property(GeneratePythonBindings_RUNTIME_OUTPUT_DIR GeneratePythonBindings RUNTIME_OUTPUT_DIRECTORY)
-get_filename_component(SIMPL_PYB11_PARENT_DIR  ${CMAKE_CURRENT_LIST_FILE} DIRECTORY)
-get_filename_component(SIMPL_PYB11_PARENT_DIR  ${SIMPL_PYB11_PARENT_DIR} DIRECTORY)
-
-ConvertPathToHeaderCompatible(${SIMPL_ANACONDA_OUTPUT_DIR})
-configure_file( ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/SIMPLPyBind11Config.h.in
-                ${SIMPLPyBind11_BINARY_DIR}/CodeScraper/SIMPLPyBind11Config.h
-                )
-file(TO_NATIVE_PATH "${SIMPL_ANACONDA_OUTPUT_DIR}" SIMPL_ANACONDA_OUTPUT_DIR)
-set_property(GLOBAL PROPERTY SIMPL_ANACONDA_OUTPUT_DIR "${SIMPL_ANACONDA_OUTPUT_DIR}")
-                
-
-
-target_sources(GeneratePythonBindings PRIVATE ${SIMPLPyBind11_BINARY_DIR}/CodeScraper/SIMPLPyBind11Config.h)
-
-target_sources(GeneratePythonBindings PRIVATE
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/CodeScraper.cpp
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/CodeScraperConstants.h
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PythonBindingClass.h
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PythonBindingClass.cpp
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PythonBindingsModule.h
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PythonBindingsModule.cpp
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PyBind11Generator.h
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PyBind11Generator.cpp
-  ${SIMPLPyBind11_SOURCE_DIR}/CodeScraper/PythonUtils.h
-)
-target_include_directories(GeneratePythonBindings 
-                          PRIVATE
-                            ${SIMPLProj_SOURCE_DIR}/Source
-                            ${SIMPLPyBind11_BINARY_DIR}
-                            )
-
-target_link_libraries(GeneratePythonBindings Qt5::Core)
-
-# --------------------------------------------------------------------------
-# This section starts the main pybind11 code
-include("${SIMPLPyBind11_SOURCE_DIR}/cmake/WrappingFunctions.cmake")
-
-
-CreatePybind11Module(MODULE_NAME ${SIMPL_PYTHON_MODULE_NAME}
-                    SOURCE_DIR "${SIMPLProj_SOURCE_DIR_NORM}/Source/SIMPLib"
-                    PATH_TO_STRIP "SIMPL/Source/"
-                    OUTPUT_PATH "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
-                    BINARY_DIR "${SIMPLProj_BINARY_DIR}"
-                    MODULE_TEMPLATE_FILE "${SIMPLPyBind11_SOURCE_DIR}/Templates/SIMPLModuleCodeTemplate.in.cpp"
-                    MODULE_LINK_LIBRARIES SIMPLib
-                    SIMPLIB
-)
-
-# --------------------------------------------------------------------------
-# Add each of the python scripts as a ctest unit test that should get run
-# during the normal CTest execution
-# --------------------------------------------------------------------------
-if(SIMPL_BUILD_TESTING)
-
-  if("${ANACONDA_DIR}" STREQUAL "")
-    set(ANACONDA_DIR "" CACHE STRING "")
-    message(FATAL_ERROR "Please set the ANACONDA_DIR variable either through the CMake-GUI or through the -DANACONDA_DIR=/path/to/Anaconda3")
-  endif()
-  if(NOT SIMPL_ENABLE_ANACONDA_PACKAGE)
-    message(FATAL_ERROR "Please -DSIMPL_ENABLE_ANACONDA_PACKAGE=ON in order for the Python unit tests to execute correctly.")
-  endif()
-
-  #------------------------------
-  # Initialize the PYTHON_TEST_INPUT_DIR variable to point to the "Testing Directory"
-  file(TO_NATIVE_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Testing" PYTHON_TEST_INPUT_DIR)
-
-  set(SIMPL_PYTHON_TESTS
-    AbstractFilterTest
-    AttributeMatrixTest
-    DataArrayTest
-    DataContainerArrayTest
-    DataContainerTest
-    GeometryTest
-    ImageReadTest
-    TestBindings
-
-    Create_Edge_Geometry
-    Create_Quad_Geometry
-    Create_RectilinearGrid
-    Create_Triangle_Geometry
-    Create_Vertex_Geometry
-    
-    "Array_Calculator_Test"
-    "Convert_Attribute_Array_Data_Type"
-    "Copy_Object_Test"
-    "Crop_Vertex_Geometry"
-    "Export_Triangle_Geometry"
-    "Import_Ascii_Data_Array"
-    "Import_Hdf5_Dataset"
-    "Remove_Component_From_Array"
-    "Rename_Attribute_Array"
-    "Split_Attribute_Array"
-    "NumPy_Round_Trip"
-  )
-
-  foreach(test ${SIMPL_PYTHON_TESTS})
-    set(SIMPL_PYTHON_TEST_DRIVER "${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest/SIMPL/${test}.${TEST_SCRIPT_FILE_EXT}")
-    configure_file(${SIMPLPyBind11_SOURCE_DIR}/python_test_driver.${TEST_SCRIPT_FILE_EXT}
-                  "${SIMPL_PYTHON_TEST_DRIVER}" @ONLY)
-    add_test(NAME PY_SIMPL_${test} COMMAND "${SIMPL_PYTHON_TEST_DRIVER}" )
-  endforeach(test ${SIMPL_PYTHON_TESTS})
-  
-endif()
-
-# --------------------------------------------------------------------------
-# Copy the recipe and egg info for the building Conda package to the 
-# output directory
-if (SIMPL_ENABLE_ANACONDA_PACKAGE)
-  if("${ANACONDA_DIR}" STREQUAL "" OR "${ANACONDA_ENVIRONMENT_NAME}" STREQUAL "")
-    message(FATAL_ERROR "You have enabled Anaconda3 style packaging by setting SIMPL_ENABLE_ANACONDA_PACKAGE=ON, but some required variables are empty or OFF.\
-    The following CMake variables need to be set either through the CMake-Gui, ccmake or the command line:\n\
-    [VAR NAME] = [CURRENT VALUE]\n\
-    ANACONDA_DIR = ${ANACONDA_DIR}\n\
-    ANACONDA_ENVIRONMENT_NAME = ${ANACONDA_ENVIRONMENT_NAME}\n\
-    SIMPL_ENABLE_ANACONDA_PACKAGE = ${SIMPL_ENABLE_ANACONDA_PACKAGE}\n\
-    SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL = ${SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL}\n\
-    **********************************************************\n\
-    ANACONDA_DIR is the top level directory to Anaconda3 such as /usr/local/anaconda3 or C:/Anaconda3\n\
-    ANACONDA_ENVIRONMENT_NAME is the virtual environment name. Leaving this blank might work....\n\
-    SIMPL_ENABLE_ANACONDA_PACKAGE This will enable the creation of a script that will create an Anaconda3 package for DREAM3D/SIMPL\n\
-    SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL Will install the python package to the ANACONDA_ENVIRONMENT_NAME name on your local computer. Use this with caution.\n\
-    \n\
-    The complete CMake configure arguments would be:\n\
-    -DSIMPL_ENABLE_PYTHON=ON -DANACONDA_DIR=  -DANACONDA_ENVIRONMENT_NAME=  -DSIMPL_ENABLE_ANACONDA_PACKAGE=ON -DSIMPL_ENABLE_ANACONDA_LOCAL_INSTALL=OFF
-    ")
-  endif()
-  #if()
-  #  set(ANACONDA_ENVIRONMENT_NAME "" CACHE STRING "")
-  #  message(FATAL_ERROR "Please set the ANACONDA_ENVIRONMENT_NAME variable either through the CMake-GUI or through the -DANACONDA_ENVIRONMENT_NAME=ANACONDA_ENV_NAME")
-  #endif()   
-  
-    
-  set(ANACONDA_SCRIPTS_DIR_NAME "bin")
-  if(WIN32)
-    set(ANACONDA_SCRIPTS_DIR_NAME "Scripts")
-  endif()
-
-  file(MAKE_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}/UnitTest)
-  file(MAKE_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${SIMPL_PYTHON_MODULE_NAME})
-  
-  file(TO_NATIVE_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} CROD_NATIVE)
-  file(TO_NATIVE_PATH ${SIMPL_ANACONDA_OUTPUT_DIR} SCOD_NATIVE)
-  file(TO_NATIVE_PATH ${ANACONDA_DIR} PCD_NATIVE)
-
-  if(WIN32)
-    configure_file(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Conda/package.in.bat
-                ${SIMPL_ANACONDA_OUTPUT_DIR}/package.bat @ONLY)
-    add_custom_target(CreateAnacondaPackage 
-                "${SIMPL_ANACONDA_OUTPUT_DIR}/package.bat" 
-                DEPENDS ${SIMPL_PYTHON_MODULE_NAME}
-                WORKING_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}
-                COMMENT "Building an Anaconda package for ${SIMPL_PYTHON_MODULE_NAME}"
-    )
-  else()
-    configure_file(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Conda/macOS_package.in.sh
-                ${SIMPL_ANACONDA_OUTPUT_DIR}/package.sh @ONLY)
-    add_custom_target(CreateAnacondaPackage 
-                "${SIMPL_ANACONDA_OUTPUT_DIR}/package.sh" 
-                DEPENDS ${SIMPL_PYTHON_MODULE_NAME}
-                WORKING_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}
-                COMMENT "Building an Anaconda package for ${SIMPL_PYTHON_MODULE_NAME}"
-                )
-  endif()
-
-  #--- Copy the Anaconda Recipe files
-  set(conda_recipe_files bld.bat build.sh LICENSE meta.yaml setup.py)
-  foreach(f ${conda_recipe_files})
-    configure_file("${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Conda/conda-recipe/${f}"
-                    "${SIMPL_ANACONDA_OUTPUT_DIR}/conda-recipe/${f}" @ONLY)
-  endforeach(f ${conda_recipe_files})
-  
-  #--- Copy the Anaconda Egg Files
-  set(conda_egg_files MANIFEST.in PKG-INFO ReadMe.md setup.cfg setup.py)
-  foreach(f ${conda_egg_files})
-    configure_file("${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Conda/egg-info/${f}"
-                    "${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${f}" @ONLY)
-  endforeach(f ${conda_recipe_files})    
-
-
-  # option(SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL "Install the dream3d Conda site-package locally" OFF)
-  
-  # if(SIMPL_ENABLE_ANACONDA_LOCAL_INSTALL)
-  #   # Build a new copy of the DREAM3D Conda package in the environments conda-bld folder
-  #   add_custom_command(TARGET dream3d POST_BUILD 
-  #       COMMAND ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda build --quiet ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/conda-recipe 
-  #       COMMAND ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda build purge)
-  #   add_custom_command(TARGET dream3d POST_BUILD 
-  #     COMMAND ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda remove -y dream3d 
-  #     COMMENT "Removing any existing dream3d Conda package")
-  #   add_custom_command(TARGET dream3d POST_BUILD COMMAND ${ANACONDA_DIR}/envs/${ANACONDA_ENVIRONMENT_NAME}/${ANACONDA_SCRIPTS_DIR_NAME}/conda install -y --use-local dream3d 
-  #     COMMENT "Installing the dream3d Conda package")
-  # endif()
-
-endif()
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp b/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
deleted file mode 100644
index c069dcc609..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraper.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#include <cstdint>
-
-#include <iostream>
-#include <map>
-#include <sstream>
-#include <vector>
-
-#include <QtCore/QCoreApplication>
-#include <QtCore/QDebug>
-#include <QtCore/QJsonArray>
-#include <QtCore/QJsonDocument>
-#include <QtCore/QJsonObject>
-#include <QtCore/QJsonValue>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSet>
-#include <QtCore/QString>
-#include <QtCore/QTextStream>
-#include <QtCore/QUuid>
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
-// This file is our generated header file.
-#include "CodeScraper/SIMPLPyBind11Config.h"
-
-#include "PyBind11Generator.h"
-#include "PythonBindingClass.h"
-#include "PythonBindingsModule.h"
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-int main(int argc, char* argv[])
-{
-
-  Q_ASSERT(true); // We don't want anyone to run this program.
-  // Instantiate the QCoreApplication that we need to get the current path and load plugins.
-  QCoreApplication app(argc, argv);
-  QCoreApplication::setOrganizationName("BlueQuartz Software");
-  QCoreApplication::setOrganizationDomain("bluequartz.net");
-  QCoreApplication::setApplicationName("GeneratePythonBindings");
-
-  if(argc != 8)
-  {
-    std::cout << "GeneratePythonBindings needs 7 arguments:" << std::endl;
-    std::cout << "   [1] Path to the source directory to recursively search" << std::endl;
-    std::cout << "   [2] Characters to strip from the path. '-' means do not strip anything" << std::endl;
-    std::cout << "   [3] Name of the Library/Plugin" << std::endl;
-    std::cout << "   [4] Top Level Directory where to write the generated files" << std::endl;
-    std::cout << "   [5] Path to the module template file" << std::endl;
-    std::cout << "   [6] Is this SIMPLib being compiled" << std::endl;
-    std::cout << "   [7] The type of Build this is .|Debug|Release|MinSizeRel|RelWithDebInfo|. Use a '.' for anything OTHER than VisualStudio|XCode";
-    std::cout << "Arguments were:" << std::endl;
-    for(int i = 0; i < argc; i++)
-    {
-      std::cout << "[" << i << "]  " << argv[i] << std::endl;
-    }
-
-    return EXIT_FAILURE;
-  }
-
-  //   std::cout << "Source Directory: " << argv[1] << std::endl;
-  //   std::cout << "Characters to strip: " << argv[2] << std::endl;
-  //   std::cout << "Name of the Library: " << argv[3] << std::endl;
-  //   std::cout << "Generated Dir: " << argv[4] << std::endl;
-
-  QString charsToStrip = QString::fromLatin1(argv[2]);
-  if(charsToStrip == "-")
-  {
-    charsToStrip = "";
-  }
-  QString libName = QString::fromLatin1(argv[3]);
-  QString genDir = QString::fromLatin1(argv[4]);
-  QString modTemplateFile = QString::fromLatin1(argv[5]);
-  QString isSIMPLib = QString::fromLatin1(argv[6]);
-  QString cfgIntDir = QString::fromLatin1(argv[7]);
-
-  PyBind11Generator bindingsGenerator(QDir(QString::fromLatin1(argv[1])), charsToStrip, libName, genDir, modTemplateFile, isSIMPLib, cfgIntDir);
-
-  bindingsGenerator.execute();
-
-  return EXIT_SUCCESS;
-}
diff --git a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h b/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
deleted file mode 100644
index 4dc3a6c7e2..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/CodeScraperConstants.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <QtCore/QString>
-
-#define NEWLINE_SIMPL '\n'
-#define TAB "  "
-
-#define OVERWRITE_SOURCE_FILE 1
-
-/* These are for replacements in the template files */
-#define CLASS_NAME "@CLASS_NAME@"
-#define HEADER_PATH "@HEADER_PATH@"
-#define SUPERCLASS_NAME "@SUPERCLASS_NAME@"
-#define LIB_NAME "@LIB_NAME@"
-#define FULL_LIB_NAME "@FULL_LIB_NAME@"
-#define MODULE_INIT_CODE "@MODULE_INIT_CODE@"
-#define DATE_TIME_GENERATED "@DATE_TIME_GENERATED@"
-
-namespace
-{
-const QString kRead("READ");
-const QString kWrite("WRITE");
-const QString kArgs("ARGS");
-const QString kConst("CONST");
-const QString kConstMethod("CONST_METHOD");
-const QString kSuperClass("SUPERCLASS");
-const QString kOverload("OVERLOAD");
-const QString kReturnValuePolicy("RETURN_VALUE_POLICY");
-const QString kConstGetOverload("CONST_GET_OVERLOAD");
-
-/* These are for the macros that appear in the header files */
-const QString kPYB11_BEGIN_BINDINGS("PYB11_BEGIN_BINDINGS");
-const QString kPYB11_PROPERTY("PYB11_PROPERTY");
-const QString kPYB11_METHOD("PYB11_METHOD");
-const QString kPYB11_STATIC_CREATION("PYB11_STATIC_CREATION");
-const QString kPYB11_CREATION("PYB11_CREATION");
-const QString kPYB11_ENUMERATION("PYB11_ENUMERATION");
-
-const QString kSIMPL_STATIC_NEW_MACRO("PYB11_STATIC_NEW_MACRO");
-const QString kSIMPL_FILTER_NEW_MACRO("PYB11_FILTER_NEW_MACRO");
-const QString kSIMPL_SHARED_POINTERS("PYB11_SHARED_POINTERS");
-const QString kSIMPL_FILTER_PARAMETER("PYB11_FILTER_PARAMETER");
-
-} // namespace
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
deleted file mode 100644
index 9921a9fdb3..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.cpp
+++ /dev/null
@@ -1,459 +0,0 @@
-#include "PyBind11Generator.h"
-
-#include <iostream>
-
-#include <QtCore/QTextStream>
-
-#include "PythonBindingClass.h"
-
-#include "CodeScraper/CodeScraperConstants.h"
-#include "CodeScraper/PythonUtils.h"
-#include "CodeScraper/SIMPLPyBind11Config.h"
-
-#define PYB11_TRUE 0
-//-----------------------------------------------------------------------------
-PyBind11Generator::PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib,
-                                     const QString& cfgIntDir)
-: m_TopLevelDir(topLevelDir)
-, m_CharsToStrip(charsToStrip)
-, m_LibNameUpper(libName)
-, m_GenDir(genDir)
-, m_ModuleTemplatePath(moduleTemplatePath)
-, m_IsSIMPLib(isSIMPLib)
-, m_CfgIntDir(cfgIntDir)
-{
-
-  m_LibName = m_LibNameUpper.toLower(); // + "_py";
-  m_SourceDir = m_TopLevelDir;
-  m_SourceDir.cdUp();
-
-  m_ModuleCode.setLibNameUpper(m_LibNameUpper);
-  m_ModuleCode.setLibName(m_LibName);
-  m_ModuleCode.setTemplatePath(moduleTemplatePath);
-}
-
-//-----------------------------------------------------------------------------
-PyBind11Generator::~PyBind11Generator() = default;
-
-//-----------------------------------------------------------------------------
-void PyBind11Generator::readFilterList()
-{
-  QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib == "TRUE")
-  {
-    libName = QString("SIMPLib");
-  }
-  QString listFilePath = SIMPL::PyBind11::SIMPLProjBinaryDir + "/" + libName + "Filters.txt";
-  QFileInfo listFileInfo(listFilePath);
-  if(!listFileInfo.exists())
-  {
-    qDebug() << "Needed Input file to generate Python Bindings was not found for Plugin '" << libName << "'. The file should have been generated at " << listFileInfo.absoluteFilePath();
-  }
-
-  m_FilterList.clear();
-
-  // Read the Source File
-  QFile source(listFilePath);
-  source.open(QFile::ReadOnly);
-  QString contents = source.readAll();
-  source.close();
-
-  QStringList list = contents.split(QRegExp("\\n"));
-  QStringListIterator sourceLines(list);
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    QString tLine = line.trimmed();
-    if(tLine.startsWith("#")) // Skip the comment line
-    {
-    }
-    else if(!tLine.isEmpty())
-    {
-      m_FilterList << tLine;
-    }
-  }
-  QTextStream out(&m_DiagnosticMessage);
-  out << "Files To Consider: " << m_FilterList.size();
-}
-
-//-----------------------------------------------------------------------------
-void PyBind11Generator::execute()
-{
-  readFilterList();
-
-  recursiveSearch(m_TopLevelDir);
-
-  // If these extensions are changed be sure the WrappingFunctions.cmake file is updated
-  QString ext(".h");
-  if(m_IsSIMPLib.compare("TRUE") == PYB11_TRUE)
-  {
-    ext = ".cxx";
-    copyPyInitFiles();
-  }
-
-  QString genHeaderPath;
-  QTextStream ss(&genHeaderPath);
-  ss << m_GenDir << "/" << m_LibName << "_pybind11_module" << ext;
-
-  m_ModuleCode.generateModuleFile(genHeaderPath, m_IsSIMPLib);
-
-  genHeaderPath = QString("");
-  QString libName = m_LibNameUpper;
-  if(m_IsSIMPLib == "TRUE")
-  {
-    libName = QString("simpl");
-  }
-  ss << SIMPL::PyBind11::RuntimeOutputDir << "/UnitTest/" << libName << "/" << libName << "_UnitTest.py";
-  genHeaderPath = genHeaderPath.replace("/./", "/");
-  m_ModuleCode.generatePythonTestFile(genHeaderPath, m_IsSIMPLib);
-
-  genHeaderPath = QString("");
-  libName = m_LibNameUpper;
-  if(m_IsSIMPLib == "TRUE")
-  {
-    libName = QString("simpl");
-  }
-  ss << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName << "/" << libName.toLower() << "py.py";
-  genHeaderPath = genHeaderPath.replace("/./", "/");
-  m_ModuleCode.generatePythonicInterface(genHeaderPath, m_IsSIMPLib);
-
-  generateModuleInitPy();
-  QTextStream out(&m_DiagnosticMessage);
-  out << "    Generated " << m_FileGenCount;
-  std::cout << "[PyBind11Generator] " << m_DiagnosticMessage.toStdString() << std::endl;
-}
-
-//-----------------------------------------------------------------------------
-void PyBind11Generator::generateModuleInitPy()
-{
-  // std::cout << "PyBind11Generator::generateModuleInitPy(): " << m_LibName.toStdString() << std::endl;
-  QString filePath;
-  QTextStream out(&filePath);
-  out << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName << "/__init__.py";
-  if(m_IsSIMPLib.compare("TRUE") == PYB11_TRUE)
-  {
-    QFile f(filePath);
-    f.open(QIODevice::WriteOnly | QIODevice::Text);
-    QTextStream fout(&f);
-    fout << "\"\"\" DREAM.3D Python Library\n"
-         << "This file is auto generated during each build.\n"
-         << "Do NOT edit this file directly.\n"
-         << "PyBind11Generator.cpp:" << __LINE__ << "\n"
-         << "\"\"\"\n";
-
-    QFile sourceFile(SIMPL::PyBind11::SIMPLProjBinaryDir + "/Pybind11Plugins.txt");
-    sourceFile.open(QFile::ReadOnly);
-    QString contents = sourceFile.readAll();
-    sourceFile.close();
-    QStringList tokens = contents.split("\n");
-    QStringList::const_iterator constIterator;
-    for(constIterator = tokens.constBegin(); constIterator != tokens.constEnd(); ++constIterator)
-    {
-      QString lower = (*constIterator).toLower().trimmed();
-      if(lower.isEmpty())
-      {
-        continue;
-      }
-      fout
-
-          << "# This imports the pythonic interface from the local site-packages\n"
-          << "from . import " << lower << "py\n"
-          << "# This imports the " << lower << " submodule from the native python module\n"
-          << "from .dream3d import " << lower << "\n"
-          << "\n";
-    }
-
-    fout << "# Import the helper pure python modules\n"
-         << "from . import simpl_helpers\n"
-         << "from . import simpl_test_dirs\n"
-         << "\n";
-  }
-  // else
-  // {
-  //   QFile f(filePath);
-  //   f.open(QIODevice::Append | QIODevice::Text);
-  //   QTextStream fout(&f);
-  //   fout << "\n# DREAM3D Plugin " << m_LibName << "\n";
-  //   fout << "from .dream3d import " << m_LibName << "\n";
-  // }
-}
-
-//-----------------------------------------------------------------------------
-void PyBind11Generator::copyPyInitFiles()
-{
-  QString libName = m_LibName;
-  libName = libName.replace("_py", "");
-
-  QString inputPath;
-  QTextStream ip(&inputPath);
-  ip << SIMPL::PyBind11::PythonWrappingDir << "/"
-     << "SIMPL";
-  QDir currentDir(inputPath);
-
-  QString outputPath;
-  QTextStream op(&outputPath);
-  op << SIMPL::PyBind11::RuntimeOutputDir << "/" << SIMPL::PyBind11::SitePackages << "/" << SIMPL::PyBind11::SIMPL_LibraryName;
-  QDir dir;
-  dir.mkpath(outputPath);
-
-  QStringList filters;
-  filters.append("*.py");
-  // QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-
-  QFileInfoList itemList = currentDir.entryInfoList(filters);
-
-  for(QFileInfo itemInfo : itemList)
-  {
-    QString pyFilePath = itemInfo.absoluteFilePath();
-
-    // qDebug() << "Copy File: " << itemInfo.absoluteFilePath() << "\n   "
-    //  << "DEST: " << outputPath + "/" + itemInfo.fileName();
-    if(pyFilePath.contains(".in."))
-    {
-      // qDebug() << "CONFIGURE FILE: " << pyFilePath;
-      QFile source(pyFilePath);
-      source.open(QFile::ReadOnly);
-      QString contents = source.readAll();
-      source.close();
-
-      QString outName = outputPath + "/" + itemInfo.fileName();
-      outName = outName.replace(".in.", ".");
-      // qDebug() << "  outName:" << outName;
-      contents = contents.replace("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}", SIMPL::PyBind11::BuildDirectory);
-      contents.replace("${SIMPLProj_BINARY_DIR}", SIMPL::PyBind11::SIMPLProjBinaryDir);
-      contents.replace("${DREAM3D_DATA_DIR}", SIMPL::PyBind11::DataDirectory);
-      QFile hOut(outName);
-
-      hOut.open(QFile::WriteOnly);
-      QTextStream stream(&hOut);
-      stream << contents;
-      hOut.close();
-    }
-    else
-    {
-      QFile pyFile(pyFilePath);
-      QFileInfo outputFileInfo(outputPath + "/" + itemInfo.fileName());
-      if(outputFileInfo.exists())
-      {
-        std::cout << "[PyBind11Generator] Dest File Exists: " << outputFileInfo.absoluteFilePath().toStdString() << std::endl;
-        QFile outputFile(outputPath + "/" + itemInfo.fileName());
-        bool didDelete = outputFile.remove();
-        if(!didDelete)
-        {
-          qDebug() << "[PyBind11Generator] File was NOT removed: " << outputFileInfo.absoluteFilePath();
-        }
-      }
-      if(!pyFile.copy(outputFileInfo.absoluteFilePath()))
-      {
-        std::cout << "[PyBind11Generator] File '" << pyFilePath.toStdString() << "' could not be copied to '" << outputFileInfo.absoluteFilePath().toStdString() << "'" << std::endl;
-      }
-      else
-      {
-        qDebug() << "[PyBind11Generator] File Copied: " << outputFileInfo.absoluteFilePath();
-      }
-    }
-  }
-}
-
-//-----------------------------------------------------------------------------
-void PyBind11Generator::recursiveSearch(const QDir& currentDir)
-{
-  if(currentDir.dirName().compare("zRel") == 0 || currentDir.dirName().compare("Build") == 0 || currentDir.dirName().compare("pybind11") == 0)
-  {
-    return;
-  }
-  // If the currently generated library is SIMPLib itself then ignore the list of
-  // files and do a recursive search for the PYBIND macros since everything in
-  // SIMPL is going to need to be wrapped.
-  if(m_IsSIMPLib == "TRUE")
-  {
-    // Get a list of all the directories
-    QFileInfoList dirList = currentDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot);
-    if(!dirList.empty())
-    {
-      for(QFileInfo fi : dirList)
-      {
-        recursiveSearch(QDir(fi.absoluteFilePath())); // Recursive call
-      }
-    }
-    QStringList filters;
-    filters.append("*.h");
-    QFileInfoList itemList = currentDir.entryInfoList(filters);
-    for(QFileInfo itemInfo : itemList)
-    {
-      QString headerFilePath = itemInfo.absoluteFilePath();
-      generatePybind11Header(headerFilePath);
-    }
-  }
-  else
-  {
-    for(const auto& item : m_FilterList)
-    {
-      QString filePath = currentDir.absolutePath() + QDir::separator() + item;
-      QFileInfo fi(filePath);
-      if(fi.exists())
-      {
-        generatePybind11Header(fi.absoluteFilePath());
-      }
-    }
-  }
-}
-//-----------------------------------------------------------------------------
-void PyBind11Generator::generatePybind11Header(const QString& hFile)
-{
-  QString contents;
-  QFileInfo fi(hFile);
-
-  if(fi.baseName() == "SIMPLibSetGetMacros")
-  {
-    return;
-  }
-  if(fi.baseName() == "SIMPLPythonMacros")
-  {
-    return;
-  }
-
-  {
-    // Read the Source File
-    QFile source(hFile);
-    source.open(QFile::ReadOnly);
-    contents = source.readAll();
-    source.close();
-  }
-
-  QString subPath = fi.absolutePath();
-  subPath = subPath.replace(m_SourceDir.absolutePath(), ""); // Remove the system dependent file path
-  if(!m_CharsToStrip.isEmpty())
-  {
-    subPath = subPath.replace(m_CharsToStrip, ""); // Remove the system dependent file path
-  }
-  subPath = subPath.remove(0, 1);
-
-  QString genHeaderPath;
-  QTextStream ss(&genHeaderPath);
-  ss << m_GenDir << "/"
-     << subPath
-     //<< "pybind11"
-     << "/" << fi.baseName() << "_PY11.h";
-
-  QString baseName = fi.baseName();
-
-  QStringList list = contents.split(QRegExp("\\n"));
-  QStringListIterator sourceLines(list);
-
-  PythonBindingClass bindingClass(&m_ModuleCode, m_IsSIMPLib);
-  bindingClass.setClassName(baseName);
-  bindingClass.setLibName(m_LibName);
-  bindingClass.setCharsToStrip(m_CharsToStrip);
-  bindingClass.setTopLevelDir(m_TopLevelDir);
-  bindingClass.setSourceDir(m_SourceDir);
-  bindingClass.setSourceFile(hFile);
-
-  QStringList enumerations;
-
-  while(sourceLines.hasNext())
-  {
-    QString line = sourceLines.next();
-    QString tLine = line.trimmed();
-    if(tLine.startsWith("//"))
-    {
-    }
-    else if(line.contains(::kPYB11_ENUMERATION))
-    {
-      line = line.trimmed();
-      QStringList tokens = line.split("(");
-      tokens = tokens[1].replace(")", "").trimmed().split(" ");
-      enumerations << tokens[0];
-    }
-    else if(line.contains(kPYB11_BEGIN_BINDINGS))
-    {
-      bindingClass.setNeedsWrapping(true);
-      line = line.trimmed();
-      QStringList tokens = line.split("(");
-      tokens = tokens[1].replace(")", "").trimmed().split(" ");
-      baseName = tokens[0];
-
-      bindingClass.setClassName(baseName);
-      if(tokens.size() > 1 && tokens[1] == ::kSuperClass)
-      {
-        bindingClass.setHasSuperClass(true);
-        bindingClass.setSuperClass(tokens[2]);
-      }
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kSIMPL_SHARED_POINTERS)) // The class that needs wrapping is a Shared_Pointer type of class.
-    {
-      bindingClass.setIsSharedPointer(true);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kSIMPL_STATIC_NEW_MACRO))
-    {
-      bindingClass.setHasStaticNewMacro(true);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kSIMPL_FILTER_NEW_MACRO))
-    {
-      bindingClass.setHasStaticNewMacro(true);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kPYB11_PROPERTY))
-    {
-      line = line.trimmed();
-      bindingClass.addProperty(line);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kSIMPL_FILTER_PARAMETER))
-    {
-      line = line.trimmed();
-      bindingClass.addSimplFilterParam(line);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kPYB11_METHOD))
-    {
-      line = line.trimmed();
-      bindingClass.addMethod(line);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kPYB11_STATIC_CREATION))
-    {
-      line = line.trimmed();
-      bindingClass.addStaticCreation(line);
-    }
-    else if(bindingClass.getNeedsWrapping() && line.contains(::kPYB11_CREATION))
-    {
-      line = line.trimmed();
-      bindingClass.addConstructor(line);
-    }
-
-    if(!enumerations.empty())
-    {
-      for(const auto& enum_ : enumerations)
-      {
-        QString search = QString("enum class %1").arg(enum_);
-
-        if(tLine.contains(search))
-        {
-          // Find where the opening brace is at.
-          while(!tLine.contains("{"))
-          {
-            line = sourceLines.next();
-            tLine = line.trimmed();
-          }
-          // Grab the first value. They MUST be one value per line.
-          line = sourceLines.next();
-          tLine = line.trimmed();
-
-          // Grab lines until the closing brace
-          QStringList values;
-          while(!tLine.contains("};"))
-          {
-            QStringList tokens = tLine.split(" ");
-            values << tokens[0];
-            line = sourceLines.next();
-            tLine = line.trimmed();
-          }
-          bindingClass.addEnumeration(enum_, values);
-          enumerations.removeAll(enum_);
-        }
-      }
-    }
-  }
-
-  if(bindingClass.writeBindingFile(genHeaderPath))
-  {
-    m_FileGenCount++;
-  }
-}
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h b/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
deleted file mode 100644
index 8118098663..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PyBind11Generator.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#pragma once
-
-#include <QtCore/QDir>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-
-#include "PythonBindingsModule.h"
-/* *****************************************************************************
- *
- *
- ******************************************************************************/
-class PyBind11Generator
-{
-
-public:
-  /**
-   * @brief PyBind11Generator
-   * @param topLevelDir
-   * @param charsToStrip
-   * @param libName
-   */
-  PyBind11Generator(const QDir& topLevelDir, const QString& charsToStrip, const QString& libName, const QString& genDir, const QString& moduleTemplatePath, const QString& isSIMPLib,
-                    const QString& cfgIntDir);
-
-  ~PyBind11Generator();
-
-  /**
-   * @brief execute
-   */
-  void execute();
-
-  /**
-   * @brief recursiveSearch
-   * @param currentDir
-   */
-  void recursiveSearch(const QDir& currentDir);
-
-  /**
-   * @brief generatePybind11Header
-   * @param hFile
-   */
-  void generatePybind11Header(const QString& hFile);
-
-  /**
-   * @brief
-   */
-  void copyPyInitFiles();
-
-  /**
-   *
-   */
-  void generateModuleInitPy();
-
-  /**
-   *
-   */
-  void readFilterList();
-
-private:
-  QDir m_TopLevelDir;
-  QDir m_SourceDir;
-  QString m_CharsToStrip;
-  QString m_LibName;
-  QString m_LibNameUpper;
-  QString m_GenDir;
-  QString m_ModuleTemplatePath;
-  PythonBindingsModule m_ModuleCode;
-  QString m_IsSIMPLib;
-  QString m_CfgIntDir;
-  QStringList m_FilterList;
-  int m_FileGenCount = 0;
-  QString m_DiagnosticMessage;
-
-  PyBind11Generator(const PyBind11Generator&) = delete; // Copy Constructor Not Implemented
-  void operator=(const PyBind11Generator&) = delete;    // Operator '=' Not Implemented
-};
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
deleted file mode 100644
index 2c12de4bf8..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.cpp
+++ /dev/null
@@ -1,809 +0,0 @@
-#include "PythonBindingClass.h"
-
-#include <memory>
-
-#include <iostream>
-
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDateTime>
-#include <QtCore/QRegularExpression>
-#include <QtCore/QTemporaryFile>
-
-#include "CodeScraper/CodeScraperConstants.h"
-#include "CodeScraper/PythonUtils.h"
-#include "CodeScraper/SIMPLPyBind11Config.h"
-#include "PythonBindingsModule.h"
-
-PythonBindingClass::PythonBindingClass(PythonBindingsModule* moduleCode, const QString& isSIMPLib)
-: QObject(nullptr)
-, m_NeedsWrapping(false)
-, m_HasSuperClass(false)
-, m_IsSharedPointer(false)
-, m_HasStaticNewMacro(false)
-, m_Module(moduleCode)
-, m_IsSIMPLib(isSIMPLib)
-{
-}
-
-PythonBindingClass::~PythonBindingClass() = default;
-
-void PythonBindingClass::addSimplFilterParam(const QString& property)
-{
-  m_SimplFilterParams.push_back(property);
-}
-void PythonBindingClass::clearSimplFilterParams()
-{
-  m_SimplFilterParams.clear();
-}
-
-void PythonBindingClass::addProperty(const QString& property)
-{
-  m_Properties.push_back(property);
-}
-void PythonBindingClass::clearProperties()
-{
-  m_Properties.clear();
-}
-
-void PythonBindingClass::addMethod(const QString& method)
-{
-  m_Methods.push_back(method);
-}
-void PythonBindingClass::clearMethods()
-{
-  m_Methods.clear();
-}
-
-void PythonBindingClass::addStaticCreation(const QString& method)
-{
-  m_StaticNewMethods.push_back(method);
-}
-void PythonBindingClass::clearStaticCreation()
-{
-  m_StaticNewMethods.clear();
-}
-
-void PythonBindingClass::addConstructor(const QString& constructor)
-{
-  m_Constructors.push_back(constructor);
-}
-void PythonBindingClass::clearConstructors()
-{
-  m_Constructors.clear();
-}
-
-void PythonBindingClass::addEnumeration(const QString& name, const QStringList& values)
-{
-  m_Enumerations[name] = values;
-}
-void PythonBindingClass::clearEnumerations()
-{
-  m_Enumerations.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool PythonBindingClass::writeBindingFile(const QString& outputFilePath)
-{
-  // Sanity check the Properties against the Filter Parameters
-  for(const auto& property : m_Properties)
-  {
-    bool found = false;
-    for(const auto& param : m_SimplFilterParams)
-    {
-      QString temp = param;
-      temp.replace(::kSIMPL_FILTER_PARAMETER, ::kPYB11_PROPERTY);
-      temp.replace(",", "");
-      temp.replace(")", "");
-      if(property.startsWith(temp))
-      {
-        found = true;
-        continue;
-      }
-      // Now look for the Variable Name...
-      QStringList tokens = temp.split(" ");
-      QString varName = " " + tokens[1] + " ";
-      if(property.contains(varName))
-      {
-        found = true;
-        std::cout << "==> Parameter Inconsistency:" << param.toStdString() << std::endl;
-        std::cout << "    " << getSourceFile().toStdString() << std::endl;
-        std::cout << "    " << property.toStdString() << std::endl;
-        std::cout << "    " << param.toStdString() << std::endl;
-      }
-    }
-  }
-
-  bool didWrite = false;
-  if(getNeedsWrapping())
-  {
-    QString output;
-    QTextStream out(&output);
-    bool hasInstanceVar = false;
-    //  out << "#if 0\n";
-    //  out << "Properties.size(): " << m_Properties.size() << "\n";
-    //  out << "Methods.size(): " << m_Methods.size() << "\n";
-    //  out << "StaticNewMethods.size(): " << m_StaticNewMethods.size() << "\n";
-    //  out << "Constructors.size(): " << m_Constructors.size() << "\n";
-    //  out << "Enumerations.size(): " << m_Enumerations.size() << "\n";
-    //  out << "#endif\n";
-
-    out << generateTopMatterCode();
-
-    // out << "/* BEFORE generateSharedPointerInitCode CODE */" << "\n";
-    out << generateSharedPointerInitCode();
-    // out << "/* AFTER generateSharedPointerInitCode CODE */" << "\n";
-
-    // out << "/* BEFORE generateConstructorsCodes CODE */" << "\n";
-    out << generateConstructorsCodes();
-    // out << "/* AFTER generateConstructorsCodes CODE */" << "\n";
-
-    if(getHasStaticNewMacro() || (!m_StaticNewMethods.isEmpty() && getIsSharedPointer()))
-    {
-      out << "  /* Instantiate the class instance variable*/\n";
-      out << "  instance\n";
-      hasInstanceVar = true;
-    }
-    // out << "/* BEFORE generateStaticNewCode CODE */" << "\n";
-    out << generateStaticNewCode();
-    // out << "/* AFTER generateStaticNewCode CODE */" << "\n";
-
-    if(!getIsSharedPointer())
-    {
-      hasInstanceVar = true;
-    }
-
-    if(!m_Properties.isEmpty() && !hasInstanceVar)
-    {
-      out << "  /* Instantiate the class instance variable*/\n";
-      out << "  instance\n";
-      hasInstanceVar = true;
-    }
-    out << generatePropertiesCode();
-
-    if(!m_Methods.isEmpty() && !hasInstanceVar)
-    {
-      out << "  /* Instantiate the class instance variable*/\n";
-      out << "  instance\n";
-      hasInstanceVar = true;
-    }
-    out << generateMethodCode();
-
-    if(hasInstanceVar)
-    {
-      out << "  ;\n";
-    }
-    out << generateEnumerationCode();
-    out << generateFooterCode();
-
-    didWrite = writeOutput(getNeedsWrapping(), output, outputFilePath);
-
-    QString initCode;
-    QTextStream init(&initCode);
-
-    init << "PySharedPtrClass<" << getClassName() << "> ";
-    init << getLibName() << "_" << getClassName() << " = ";
-    if(getHasSuperClass())
-    {
-      if(m_IsSIMPLib.compare("TRUE") == 0)
-      {
-        //  init << "pybind11_init_" << getLibName() << "_" << getClassName() << "(mod, " << getLibName() << "_" << getSuperClass() << ");\n";
-        init << "declare" << getClassName() << "(mod, " << getLibName() << "_" << getSuperClass() << ");\n";
-      }
-      else
-      {
-        //  init << "pybind11_init_" << getLibName() << "_" << getClassName() << "(mod"
-        init << "declare" << getClassName() << "(mod"
-
-             << ");\n";
-      }
-    }
-    else
-    {
-      // init << "pybind11_init_" << getLibName() << "_" << getClassName() << "(mod);";
-      init << "declare" << getClassName() << "(mod);";
-    }
-
-    m_Module->addInitCode(getClassName(), initCode);
-    m_Module->addPythonCodes(getClassName(), "");
-  }
-  return didWrite;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString quote(const QString& str)
-{
-  return QString("\"%1\"").arg(str);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QByteArray PythonBindingClass::md5FileContents(const QString& filename)
-{
-  QFile destination(filename);
-  destination.open(QFile::ReadOnly);
-  QCryptographicHash destHash(QCryptographicHash::Md5);
-  bool destFileAdded = destHash.addData(&destination);
-  if(!destFileAdded)
-  {
-    qDebug() << "[PythonBindingClass] QCryptographicHash.add(" << filename << ") FAILED.";
-    return QByteArray(nullptr);
-  }
-  QByteArray desHashResult = destHash.result();
-  destination.close();
-  // qDebug() << "MD5: " << desHashResult.toHex();
-  return desHashResult;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-bool PythonBindingClass::writeOutput(bool didReplace, const QString& outLines, const QString& filename)
-{
-  bool didWrite = false;
-  if(didReplace)
-  {
-    QFileInfo fi2(filename);
-    QString parentPath = fi2.path();
-    QDir dir;
-    // std::cout << "Creating Path: " << parentPath.toStdString() << std::endl;
-    if(!dir.mkpath(parentPath))
-    {
-      QString ss = QObject::tr("Error creating parent path '%1'").arg(parentPath);
-      qDebug() << ss;
-      return didWrite;
-    }
-
-    QTemporaryFile tempfile;
-    QString tempFileName;
-    if(tempfile.open())
-    {
-      tempFileName = tempfile.fileName(); // returns the unique file name
-      QTextStream stream(&tempfile);
-      stream << outLines;
-      tempfile.close();
-      // qDebug() << "Wrote " << tempFileName;
-    }
-
-    if(!fi2.exists())
-    {
-      // qDebug() << "DOES NOT EXIST: " << filename;
-      if(!tempfile.copy(filename))
-      {
-        std::cout << "[PythonBindingClass] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
-        didWrite = false;
-      }
-      else
-      {
-        qDebug() << "[PythonBindingClass] Pybind11 Module Generated for: " << fi2.absoluteFilePath();
-        didWrite = true;
-      }
-    }
-    else
-    {
-      QByteArray destMd5Hash = md5FileContents(filename);
-      QByteArray sourceMd5Hash = md5FileContents(tempfile.fileName());
-
-      // The hashes are different so copy the file over.
-      if(destMd5Hash != sourceMd5Hash)
-      {
-        QFile destFile(filename);
-        bool didDelete = destFile.remove();
-        if(!didDelete)
-        {
-          qDebug() << "[PythonBindingClass] Dest File was NOT removed: " << filename;
-          didWrite = false;
-        }
-        if(!tempfile.copy(filename))
-        {
-          std::cout << "[PythonBindingClass] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
-          didWrite = false;
-        }
-        else
-        {
-          qDebug() << "[PythonBindingClass]: New File Generated: " << fi2.absoluteFilePath();
-          didWrite = true;
-        }
-      }
-    }
-  }
-  return didWrite;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateTopMatterCode()
-{
-  QFileInfo fi(m_SourceFile);
-  QString subPath = fi.absolutePath();
-  subPath = subPath.replace(m_SourceDir.absolutePath(), ""); // Remove the system dependent file path
-  subPath = subPath.remove(0, 1);                            // Remove the front / character
-
-  // Create the Top part of the file from a template file
-  QFile source(SIMPL::PyBind11::TemplateDir + "/Pybind11TopMatter.in.h");
-  source.open(QFile::ReadOnly);
-  QString headerTemplate = source.readAll();
-  source.close();
-  headerTemplate = headerTemplate.replace(CLASS_NAME, getClassName());
-  QString headerPath = QString("%1/%2.h").arg(subPath, 1).arg(getClassName(), 2);
-  if(!m_CharsToStrip.isEmpty())
-  {
-    headerPath = headerPath.replace(m_CharsToStrip, "");
-  }
-
-  headerTemplate = headerTemplate.replace(HEADER_PATH, headerPath);
-  headerTemplate = headerTemplate.replace(LIB_NAME, m_LibName);
-  headerTemplate = headerTemplate.replace(DATE_TIME_GENERATED, QDateTime::currentDateTime().toString("yyyy:MM:dd hh::mm::ss.zzz"));
-  return headerTemplate;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateSharedPointerInitCode()
-{
-  if(!getIsSharedPointer())
-  {
-    return QString("");
-  }
-  QFile source;
-  QString headerTemplate;
-
-  if(getHasSuperClass() && !getSuperClass().isEmpty())
-  {
-    source.setFileName(SIMPL::PyBind11::TemplateDir + "/DerivedSharedPointerClassInit.in.h");
-    source.open(QFile::ReadOnly);
-    headerTemplate = source.readAll();
-    source.close();
-
-    QTextStream out(&headerTemplate);
-
-    out << "PySharedPtrClass<@CLASS_NAME@> declare@CLASS_NAME@(py::module &m";
-    if(m_IsSIMPLib.compare("TRUE") == 0)
-    {
-      out << ", PySharedPtrClass<@SUPERCLASS_NAME@>& parent";
-    }
-    out << ")\n{\n";
-
-    if(m_IsSIMPLib.compare("TRUE") == 0)
-    {
-      out << "  PySharedPtrClass<@CLASS_NAME@> instance(m, \"@CLASS_NAME@\", parent);";
-    }
-    else
-    {
-      out << "  /* Create an alias to shorten up the declarations */\n";
-      out << "  using Py@CLASS_NAME@Type = py::class_<@CLASS_NAME@, AbstractFilter, std::shared_ptr<@CLASS_NAME@>>;\n";
-      out << "\n";
-      out << "  /* Import the SIMPL pybind11 module so that we can inherit from AbstractFilter */\n";
-      out << "  //py::module::import(\"" << SIMPL::PyBind11::SIMPL_LibraryName << SIMPL::PyBind11::PythonModuleSuffix << "\");\n"
-          << "  Py@CLASS_NAME@Type instance(m, \"@CLASS_NAME@\");\n"
-          << "\n";
-    }
-  }
-  else
-  {
-    source.setFileName(SIMPL::PyBind11::TemplateDir + "/SharedPointerClassInit.in.h");
-    source.open(QFile::ReadOnly);
-    headerTemplate = source.readAll();
-    source.close();
-  }
-
-  QFileInfo fi(m_SourceFile);
-  QString subPath = fi.absolutePath();
-  subPath = subPath.replace(m_SourceDir.absolutePath(), ""); // Remove the system dependent file path
-  subPath = subPath.remove(0, 1);                            // Remove the front / character
-
-  headerTemplate = headerTemplate.replace(CLASS_NAME, getClassName());
-  QString headerPath = QString("%1/%2.h").arg(subPath, 1).arg(getClassName(), 2);
-  headerTemplate = headerTemplate.replace(HEADER_PATH, headerPath);
-  headerTemplate = headerTemplate.replace(SUPERCLASS_NAME, getSuperClass());
-  headerTemplate = headerTemplate.replace(LIB_NAME, m_LibName);
-
-  //  QString pybind11HeaderPath = QString("%1/pybind11/%2_PY11.h").arg(subPath).arg(getClassName());
-  QString pybind11HeaderPath = QString("%1/%2_PY11.h").arg(subPath, 1).arg(getClassName(), 2);
-  if(!m_CharsToStrip.isEmpty())
-  {
-    pybind11HeaderPath = pybind11HeaderPath.replace(m_CharsToStrip, "");
-  }
-
-  m_Module->addHeader(getClassName(), pybind11HeaderPath);
-  m_Module->addDependency(getSuperClass(), getClassName());
-
-  return headerTemplate;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateStaticNewCode()
-{
-  //      if(!getIsSharedPointer())
-  //      {
-  //        return QString("");
-  //      }
-  QString code;
-  QTextStream constructors(&code);
-
-  if(getHasStaticNewMacro())
-  {
-    constructors << TAB << ".def(py::init([]()\n    { \n      return " << getClassName() << "::New();\n    }))" << NEWLINE_SIMPL;
-    constructors << TAB << ".def_static(\"New\", &" << getClassName() << "::New)" << NEWLINE_SIMPL;
-  }
-
-  for(const auto& line : m_StaticNewMethods)
-  {
-    QStringList tokens = line.split("(");
-    tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    QString methodName = tokens[0];
-    if(tokens.size() > 2) // Second Token is ARGS
-    {
-      QString s1, s2;
-      QTextStream o1(&s1);
-      QTextStream o2(&s2);
-      for(int i = 2; i < tokens.size(); i++)
-      {
-        o1 << tokens[i] << " var_" << i - 2;
-        o2 << "var_" << i - 2;
-        if(i != tokens.size() - 1)
-        {
-          o1 << ", ";
-          o2 << ", ";
-        }
-      }
-      constructors << TAB << ".def(py::init([](" << s1 << ") {\n      return " << getClassName() << "::" << methodName << "(" << s2 << ");\n    }))" << NEWLINE_SIMPL;
-
-      if(tokens.size() < 2 || tokens[1] != ::kOverload)
-      {
-        constructors << TAB << ".def_static(\"" << methodName << "\", &" << getClassName() << "::" << methodName << ")" << NEWLINE_SIMPL;
-      }
-    }
-  }
-
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateConstructorsCodes()
-{
-  if(getIsSharedPointer())
-  {
-    return QString("");
-  }
-
-  QString code;
-  QTextStream constructors(&code);
-
-  QFile source;
-  source.setFileName(SIMPL::PyBind11::TemplateDir + "/SimpleClassInit.in.h");
-  source.open(QFile::ReadOnly);
-  QString headerTemplate = source.readAll();
-  source.close();
-  headerTemplate = headerTemplate.replace(CLASS_NAME, getClassName());
-
-  QFileInfo fi(m_SourceFile);
-  QString subPath = fi.absolutePath();
-  subPath = subPath.replace(m_SourceDir.absolutePath(), ""); // Remove the system dependent file path
-  subPath = subPath.remove(0, 1);                            // Remove the front / character
-
-  QString headerPath = QString("%1/%2.h").arg(subPath, getClassName());
-  headerTemplate = headerTemplate.replace(HEADER_PATH, headerPath);
-  headerTemplate = headerTemplate.replace(SUPERCLASS_NAME, getSuperClass());
-  headerTemplate = headerTemplate.replace(LIB_NAME, m_LibName);
-
-  constructors << headerTemplate;
-  constructors << TAB << "/* Begin default constructor declarations */" << NEWLINE_SIMPL;
-  constructors << TAB << ".def(py::init<" << getClassName() << ">())" << NEWLINE_SIMPL;
-  constructors << TAB << ".def(py::init<" << getClassName() << " const &>())" << NEWLINE_SIMPL;
-  if(!m_Constructors.isEmpty())
-  {
-    constructors << TAB << "/* Number of non-default constructors: " << m_Constructors.size() << "*/" << NEWLINE_SIMPL;
-  }
-  for(const auto& line : m_Constructors)
-  {
-    QStringList tokens = line.split("(");
-    tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    // QString keyword = tokens[0];
-    //.def(py::init<const std::string &>())
-    constructors << TAB << ".def(py::init<";
-    for(int i = 1; i < tokens.size(); i++)
-    {
-      constructors << "const " << tokens[i] << " &";
-      if(i != tokens.size() - 1)
-      {
-        constructors << ", ";
-      }
-    }
-    constructors << ">())" << NEWLINE_SIMPL;
-  }
-
-  QString pybind11HeaderPath = QString("%1/%2_PY11.h").arg(subPath, getClassName());
-  if(!m_CharsToStrip.isEmpty())
-  {
-    pybind11HeaderPath = pybind11HeaderPath.replace(m_CharsToStrip, "");
-  }
-  m_Module->addHeader(getClassName(), pybind11HeaderPath);
-  m_Module->addDependency(getSuperClass(), getClassName());
-
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generatePropertiesCode()
-{
-  QString code;
-  QTextStream out(&code);
-
-  QString args;
-  QTextStream argCode(&args);
-  argCode << "(data_container_array, ";
-  QString docString;
-  QTextStream docCode(&docString);
-
-  docCode << "    :param DataContainerArray data_container_array: The DataContainerArray that the filter will use.\n";
-  QString bodyCodes;
-  QTextStream bcodes(&bodyCodes);
-  QString camelClassName = SIMPL::Python::fromCamelCase(getClassName());
-  bcodes << "    " << camelClassName << " = @shortLibName@." << getClassName() << ".New()\n";
-  bcodes << "    " << camelClassName << ".setDataContainerArray(data_container_array)" << NEWLINE_SIMPL;
-
-  for(int i = 0; i < m_Properties.size(); i++)
-  {
-    QString line = m_Properties.at(i);
-    QStringList tokens = line.split("(");
-    tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    QString pyType = tokens[0];
-    QString varName = tokens[1];
-
-    if(tokens.size() == 7 && tokens[6] == ::kConstGetOverload)
-    {
-      out << TAB << "/* Property accessors for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property(\"" << varName << "\", py::overload_cast<>(&" << getClassName() << "::get" << varName << ", py::const_), &" << getClassName() << "::set" << varName << ")"
-          << NEWLINE_SIMPL;
-
-      argCode << SIMPL::Python::fromCamelCase(varName);
-      docCode << "    :param " << pyType << " " << SIMPL::Python::fromCamelCase(varName) << ": Sets the " << varName << " value.\n";
-      if(i < m_Properties.size() - 1)
-      {
-        argCode << ", ";
-      }
-
-      bcodes << "    " << camelClassName << "." << varName << " = ";
-      if(pyType == "DataArrayPath")
-      {
-        bcodes << "simpl.DataArrayPath(" << SIMPL::Python::fromCamelCase(varName) << ")";
-      }
-      else
-      {
-        bcodes << SIMPL::Python::fromCamelCase(varName);
-      }
-      bcodes << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() == 6)
-    {
-      out << TAB << "/* Property accessors for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property(\"" << varName << "\", &" << getClassName() << "::" << tokens[3] << ", &" << getClassName() << "::" << tokens[5] << ")" << NEWLINE_SIMPL;
-      argCode << SIMPL::Python::fromCamelCase(varName);
-      docCode << "    :param " << pyType << " " << SIMPL::Python::fromCamelCase(varName) << ": Sets the " << varName << " value.\n";
-
-      if(i < m_Properties.size() - 1)
-      {
-        argCode << ", ";
-      }
-      bcodes << "    " << camelClassName << "." << varName << " = ";
-      if(pyType == "DataArrayPath")
-      {
-        bcodes << "simpl.DataArrayPath(" << SIMPL::Python::fromCamelCase(varName) << ")";
-      }
-      else
-      {
-        bcodes << SIMPL::Python::fromCamelCase(varName);
-      }
-      bcodes << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() == 4 && tokens[2] == ::kRead)
-    {
-      out << TAB << "/* Read Only Property for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property_readonly(\"" << varName << "\", &" << getClassName() << "::get" << varName << ")" << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() == 4 && tokens[2] == ::kWrite)
-    {
-      out << TAB << "/* Write Only Property for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def(\"set" << varName << "\", &" << getClassName() << "::set" << varName << ", py::arg(\"" << varName << "\"))" << NEWLINE_SIMPL;
-    }
-  }
-  argCode << ")";
-
-  bcodes
-      //     << "    " << camelClassName << ".preflight()" << NEWLINE_SIMPL
-      //     << "    preflightError = " << camelClassName << ".ErrorCondition" << NEWLINE_SIMPL
-      //     << "    if preflightError >= 0 :" << NEWLINE_SIMPL
-      << "    " << camelClassName << ".execute()" << NEWLINE_SIMPL << "    executeError = " << camelClassName << ".ErrorCode" << NEWLINE_SIMPL << "    return executeError" << NEWLINE_SIMPL;
-  docCode << "    :return: ErrorCode produced by the filter\n"
-          << "    :rtype: int\n";
-  /*
-    Replace any Python keywords in arguments
-     For now, just replace the occurence of 'lambda'
-  */
-  if(args.contains("lambda") || bodyCodes.contains("lambda"))
-  {
-    args.replace("lambda", "lambda_1");
-    bodyCodes.replace("lambda", "lambda_1");
-  }
-
-  QVector<QString> pythonicCodes;
-  pythonicCodes.push_back(args);
-  pythonicCodes.push_back(bodyCodes);
-  pythonicCodes.push_back(docString);
-
-  m_Module->addPythonicCodes(getClassName(), pythonicCodes);
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generatePythonTestCode()
-{
-  QString code;
-  QTextStream out(&code);
-  for(const auto& line : m_Properties)
-  {
-    QStringList tokens = line.split("(");
-    tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    // QString pyType = tokens[0];
-    QString varName = tokens[1];
-
-    if(tokens.size() == 6)
-    {
-      out << TAB << "/* Property accessors for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property(\"" << varName << "\", &" << getClassName() << "::get" << varName << ", &" << getClassName() << "::set" << varName << ")" << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() == 4 && tokens[2] == ::kRead)
-    {
-      out << TAB << "/* Read Only Property for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def_property_readonly(\"" << varName << "\", &" << getClassName() << "::get" << varName << ")" << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() == 4 && tokens[2] == ::kWrite)
-    {
-      out << TAB << "/* Write Only Property for " << varName << " */" << NEWLINE_SIMPL;
-      out << TAB << ".def(\"set" << varName << "\", &" << getClassName() << "::set" << varName << ", py::arg(\"" << varName << "\"))" << NEWLINE_SIMPL;
-    }
-  }
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateMethodCode()
-{
-  QString code;
-  QTextStream out(&code);
-
-  for(const auto& line : m_Methods)
-  {
-    QStringList tokens = line.split("(");
-    tokens = tokens[1].replace(")", "").trimmed().split(" ");
-    // QString returnType = tokens[0];
-    QString methodName = tokens[1];
-    QString returnValuePolicy = "";
-    out << TAB << "/* Class instance method " << methodName << " */" << NEWLINE_SIMPL;
-    bool methodIsConst = false;
-    bool hasReturnValuePolicy = false;
-    if(tokens.last().compare(::kConstMethod) == 0)
-    {
-      methodIsConst = true;
-      tokens.pop_back();
-    }
-    if(tokens.contains(::kReturnValuePolicy))
-    {
-      hasReturnValuePolicy = true;
-      int index = tokens.indexOf(::kReturnValuePolicy);
-      returnValuePolicy = ", " + tokens[index + 1];
-      tokens.removeAt(index);
-      tokens.removeAt(index);
-    }
-    if(tokens.size() == 2)
-    {
-      out << TAB << ".def(\"" << methodName << "\", &" << getClassName() << "::" << methodName << returnValuePolicy << ")" << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() >= 3 && tokens[2] == ::kOverload)
-    {
-      /*
-       * C++14 style
-      .def("set", py::overload_cast<int>(&Pet::set), "Set the pet's age")
-      .def("set", py::overload_cast<const std::string &>(&Pet::set), "Set the pet's name");
-      */
-      out << TAB << ".def(\"" << methodName << "\", py::overload_cast<";
-      for(int32_t i = 3; i < tokens.size(); i++)
-      {
-        QStringList varPair = tokens[i].split(","); // Split the var,type pair using a comma
-        out << varPair[0].replace('.', ' ');
-        if(i != tokens.size() - 1)
-        {
-          out << ", ";
-        }
-      }
-      out << ">(&" << getClassName() << "::" << methodName;
-      if(methodIsConst)
-      {
-        out << ", py::const_";
-      }
-      out << returnValuePolicy << ")";
-
-      for(int32_t i = 3; i < tokens.size(); i++)
-      {
-        QStringList varPair = tokens[i].split(","); // Split the var,type pair using a comma
-        out << ", \n" << TAB << TAB << TAB << TAB << "py::arg(\"" << varPair[1] << "\")";
-      }
-      out << NEWLINE_SIMPL << TAB << TAB << TAB << returnValuePolicy << ")" << NEWLINE_SIMPL;
-    }
-    else if(tokens.size() > 3 && tokens[2] == ::kArgs)
-    {
-      out << TAB << ".def(\"" << methodName << "\", &" << getClassName() << "::" << methodName;
-      for(int32_t i = 3; i < tokens.size(); i++)
-      {
-        out << ", \n" << TAB << TAB << TAB << TAB << "py::arg(\"" << tokens[i] << "\")";
-      }
-      out << NEWLINE_SIMPL << TAB << TAB << TAB << returnValuePolicy << ")" << NEWLINE_SIMPL;
-    }
-  }
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateEnumerationCode()
-{
-  QString code;
-  QTextStream out(&code);
-  EnumerationType::Iterator iter = m_Enumerations.begin();
-
-  for(iter = m_Enumerations.begin(); iter != m_Enumerations.end(); iter++)
-  {
-    out << "\n\n  /* Enumeration code for " << getClassName() << "::" << iter.key() << "  */\n";
-    out << "  py::enum_<" << getClassName() << "::" << iter.key() << ">(instance, \"" << iter.key() << "\")\n";
-    QStringList values = iter.value();
-    for(auto v : values)
-    {
-      if(v.endsWith(',')) // For those enumerations that do not have an actual value.
-      {
-        v = v.remove(',');
-      }
-      out << "    .value(\"" << v << "\", " << getClassName() << "::" << iter.key() << "::" << v << ")\n";
-    }
-    out << "    .export_values();\n";
-  }
-  return code;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QString PythonBindingClass::generateFooterCode()
-{
-  QString code;
-  QTextStream out(&code);
-  // out << TAB << ";" << NEWLINE_SIMPL;
-  out << NEWLINE_SIMPL << "  /* Return the instance */" << NEWLINE_SIMPL;
-  out << TAB << "return instance;" << NEWLINE_SIMPL;
-  out << "}" << NEWLINE_SIMPL;
-  out << "\n\n";
-
-  // Close up the Anonymous namespace
-  out << "} /* End anonymous namespace */\n\n";
-  out << "#if !defined(_MSC_VER)\n";
-  out << "#pragma clang diagnostic pop\n";
-  out << "#endif\n";
-  return code;
-}
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
deleted file mode 100644
index 1439cb9218..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingClass.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#pragma once
-
-#include <QtCore/QDir>
-#include <QtCore/QString>
-#include <QtCore/QVector>
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
-class PythonBindingsModule;
-
-/* *****************************************************************************
- *
- *
- ******************************************************************************/
-class PythonBindingClass : public QObject
-{
-
-public:
-  PythonBindingClass(PythonBindingsModule* moduleCode, const QString& isSIMPLib);
-  ~PythonBindingClass() override;
-
-  SIMPL_INSTANCE_PROPERTY(QString, ClassName)
-  SIMPL_INSTANCE_PROPERTY(QString, SuperClass)
-  SIMPL_INSTANCE_PROPERTY(QDir, TopLevelDir)
-  SIMPL_INSTANCE_PROPERTY(QDir, SourceDir)
-  SIMPL_INSTANCE_PROPERTY(QString, CharsToStrip)
-  SIMPL_INSTANCE_PROPERTY(QString, LibName)
-  SIMPL_INSTANCE_PROPERTY(QString, SourceFile)
-  SIMPL_INSTANCE_PROPERTY(bool, NeedsWrapping)
-  SIMPL_INSTANCE_PROPERTY(bool, HasSuperClass)
-  SIMPL_INSTANCE_PROPERTY(bool, IsSharedPointer)
-  SIMPL_INSTANCE_PROPERTY(bool, HasStaticNewMacro)
-
-  SIMPL_INSTANCE_PROPERTY(QVector<QString>, SimplFilterParams)
-  void addSimplFilterParam(const QString& property);
-  void clearSimplFilterParams();
-
-  SIMPL_INSTANCE_PROPERTY(QVector<QString>, Properties)
-  void addProperty(const QString& property);
-  void clearProperties();
-
-  SIMPL_INSTANCE_PROPERTY(QVector<QString>, Methods)
-  void addMethod(const QString& method);
-  void clearMethods();
-
-  SIMPL_INSTANCE_PROPERTY(QVector<QString>, StaticNewMethods)
-  void addStaticCreation(const QString& method);
-  void clearStaticCreation();
-
-  SIMPL_INSTANCE_PROPERTY(QVector<QString>, Constructors)
-  void addConstructor(const QString& constructor);
-  void clearConstructors();
-
-  using EnumerationType = QMap<QString, QStringList>;
-  SIMPL_INSTANCE_PROPERTY(EnumerationType, Enumerations)
-  void addEnumeration(const QString& name, const QStringList& values);
-  void clearEnumerations();
-
-  bool writeBindingFile(const QString& outputFilePath);
-
-  /**
-   *@brief quote
-   *@param str
-   *@return
-   */
-  QString quote(const QString& str);
-
-  /**
-   *@brief writeOutput
-   *@param didReplace
-   *@param outLines
-   *@param filename
-   */
-  bool writeOutput(bool didReplace, const QString& outLines, const QString& filename);
-
-protected:
-  PythonBindingClass() = delete;
-
-  QString generateTopMatterCode();
-
-  QString generateSharedPointerInitCode();
-
-  QString generateStaticNewCode();
-
-  QString generateConstructorsCodes();
-
-  QString generatePropertiesCode();
-
-  QString generateMethodCode();
-
-  QString generateEnumerationCode();
-
-  QString generateFooterCode();
-
-  QByteArray md5FileContents(const QString& filename);
-
-  QString generatePythonTestCode();
-
-private:
-  PythonBindingsModule* m_Module = nullptr;
-  QString m_IsSIMPLib;
-
-  PythonBindingClass(const PythonBindingClass&) = delete; // Copy Constructor Not Implemented
-  void operator=(const PythonBindingClass&) = delete;     // Operator '=' Not Implemented
-};
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
deleted file mode 100644
index a7686cacfc..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.cpp
+++ /dev/null
@@ -1,573 +0,0 @@
-#include "PythonBindingsModule.h"
-
-#include <iostream>
-
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDateTime>
-#include <QtCore/QListIterator>
-#include <QtCore/QTemporaryFile>
-
-#include "CodeScraper/CodeScraperConstants.h"
-#include "CodeScraper/PythonUtils.h"
-#include "CodeScraper/SIMPLPyBind11Config.h"
-
-#define PBM_TAB "    "
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PythonBindingsModule::PythonBindingsModule() = default;
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-PythonBindingsModule::~PythonBindingsModule() = default;
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::addHeader(const QString& className, const QString& header)
-{
-  m_Headers[className] = header;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::clearHeaders()
-{
-  m_Headers.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::addInitCode(const QString& className, const QString& initCode)
-{
-  m_InitCodes[className] = initCode;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::clearInitCodes()
-{
-  m_InitCodes.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::addPythonCodes(const QString& className, const QString& pyCode)
-{
-  m_PythonCodes[className] = pyCode;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::clearPythonCodes()
-{
-  m_PythonCodes.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::addPythonicCodes(const QString& className, const QVector<QString>& pyCode)
-{
-  m_PythonicCodes[className] = pyCode;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::clearPythonicCodes()
-{
-  m_PythonicCodes.clear();
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::addDependency(QString superClassName, QString className)
-{
-  // qDebug() << "--- SuperClassName: " << superClassName << "  ClassName: " << className;
-  bool superClassAdded = false;
-  bool classNameAdded = false;
-
-  // First check to see if the class has been added as a superclass at some point.
-  for(auto object : m_ClassVector)
-  {
-    if(object->objectName().compare(className) == 0)
-    {
-      classNameAdded = true;
-    }
-  }
-  // If it has been added, then just bail now.
-  if(classNameAdded)
-  {
-    return;
-  }
-
-  for(auto object : m_ClassVector)
-  {
-    if(object->objectName() == superClassName)
-    {
-      QObject* child = new QObject(object);
-      child->setObjectName(className);
-      superClassAdded = true;
-      classNameAdded = true;
-      break;
-    }
-    // First try to find the superclass
-    if(!superClassName.isEmpty())
-    {
-      QObject* superchild = object->findChild<QObject*>(superClassName);
-      if(superchild)
-      {
-        QObject* child = new QObject(superchild);
-        child->setObjectName(className);
-        superClassAdded = true;
-        classNameAdded = true;
-        break;
-      }
-    }
-    else // The className is alread registered as a superclass or top level class.
-    {
-      if(className == object->objectName())
-      {
-        superClassAdded = true;
-        classNameAdded = true;
-        break;
-      }
-    }
-  }
-
-  if(!superClassAdded && !superClassName.isEmpty())
-  {
-    QObject* object = new QObject(nullptr);
-    object->setObjectName(superClassName);
-    object->setProperty("superClass", "");
-    m_ClassVector.push_back(object);
-
-    QObject* obj = new QObject(object);
-    obj->setObjectName(className);
-    object->setProperty("superClass", superClassName);
-    superClassAdded = true;
-    classNameAdded = true;
-  }
-
-  if(!classNameAdded)
-  {
-    QObject* obj = new QObject(nullptr);
-    obj->setObjectName(className);
-    obj->setProperty("superClass", superClassName);
-    m_ClassVector.push_back(obj);
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QByteArray PythonBindingsModule::md5FileContents(const QString& filename)
-{
-  QFile destination(filename);
-  destination.open(QFile::ReadOnly);
-  QCryptographicHash destHash(QCryptographicHash::Md5);
-  bool destFileAdded = destHash.addData(&destination);
-  if(!destFileAdded)
-  {
-    qDebug() << "[PythonBindingsModule] QCryptographicHash.add(" << filename << ") FAILED.";
-    return QByteArray(nullptr);
-  }
-  QByteArray desHashResult = destHash.result();
-  destination.close();
-  // qDebug() << "MD5: " << desHashResult.toHex();
-  return desHashResult;
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::writeOutput(bool didReplace, const QString& outLines, QString filename)
-{
-  // qDebug() << "Writing File: " << filename;
-  if(didReplace)
-  {
-    QFileInfo fi2(filename);
-    QString parentPath = fi2.path();
-    QDir dir;
-    // std::cout << "Creating Path: " << parentPath.toStdString() << std::endl;
-    if(!dir.mkpath(parentPath))
-    {
-      QString ss = QObject::tr("[PythonBindingsModule] Error creating parent path '%1'").arg(parentPath);
-      qDebug() << ss;
-      return;
-    }
-
-    QTemporaryFile tempfile;
-    QString tempFileName;
-    if(tempfile.open())
-    {
-      tempFileName = tempfile.fileName(); // returns the unique file name
-      QTextStream stream(&tempfile);
-      stream << outLines;
-      tempfile.close();
-    }
-
-    if(!fi2.exists())
-    {
-      if(!tempfile.copy(filename))
-      {
-        std::cout << "[PythonBindingsModule] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
-      }
-      else
-      {
-        qDebug() << "[PythonBindingsModule] Fresh File Generated: " << fi2.absoluteFilePath();
-      }
-    }
-    else
-    {
-
-      QByteArray destMd5Hash = md5FileContents(filename);
-      QByteArray sourceMd5Hash = md5FileContents(tempfile.fileName());
-
-      // The hashes are different so copy the file over.
-      if(destMd5Hash != sourceMd5Hash)
-      {
-        QFile destFile(filename);
-        bool didDelete = destFile.remove();
-        if(!didDelete)
-        {
-          qDebug() << "[PythonBindingsModule] Dest File was NOT removed: " << filename;
-        }
-        if(!tempfile.copy(filename))
-        {
-          std::cout << "[PythonBindingsModule] Temp file '" << tempFileName.toStdString() << "' could not be copied to '" << filename.toStdString() << "'" << std::endl;
-        }
-        else
-        {
-          qDebug() << "[PythonBindingsModule]: New File Generated: " << fi2.absoluteFilePath();
-        }
-      }
-    }
-  }
-}
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::generateModuleFile(const QString& outputPath, const QString& isSIMPLib)
-{
-  Q_UNUSED(isSIMPLib);
-
-  // Create the Top part of the file from a template file
-  QFile source(m_TemplatePath);
-  QString headerTemplate;
-
-  if(source.open(QFile::ReadOnly))
-  {
-    headerTemplate = source.readAll();
-  }
-  else
-  {
-    QTextStream in(&headerTemplate);
-    in << "/* *******************************************************************\n";
-    in << "* ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR ERROR \n";
-    in << "* Error generating this header file. Details are below.\n";
-    in << "*/\n";
-    in << "#error There was an error generating the Python Bindings Module file for " << m_LibName << "\n";
-    in << "/*\n";
-    in << "* The headerTemplateFile '" << m_TemplatePath << "' was not opened successfully.\n";
-    QFileInfo fi(m_TemplatePath);
-    if(fi.exists())
-    {
-      in << "* The headerTemplateFile DOES exist at the path " << m_TemplatePath << "\n";
-      in << "* Do you have permissions to access the file?\n";
-    }
-    else
-    {
-      in << "* The headerTemplateFile does NOT exist at the path:\n " << m_TemplatePath << "\n";
-    }
-    in << "*/\n";
-  }
-  source.close();
-
-  QString code;
-  QTextStream out(&code);
-  out << "/* These are all the pybind11 headers for each of the exported classes */\n";
-
-  for(auto object : m_ClassVector)
-  {
-    dumpRecursiveIncludeList(0, object, out);
-  }
-
-  headerTemplate = headerTemplate.replace(HEADER_PATH, code);
-  headerTemplate = headerTemplate.replace(LIB_NAME, m_LibName);
-  headerTemplate = headerTemplate.replace(FULL_LIB_NAME, m_LibName.toUpper());
-
-  code.clear();
-  out << "/* These are all the pybind11 instantiations for each of the exported classes */";
-  for(auto object : m_ClassVector)
-  {
-    out << "\n";
-    dumpRecursiveInitCode(0, object, out);
-  }
-
-  headerTemplate = headerTemplate.replace(MODULE_INIT_CODE, code);
-  headerTemplate = headerTemplate.replace(DATE_TIME_GENERATED, QDateTime::currentDateTime().toString("yyyy:MM:dd hh::mm::ss.zzz"));
-
-  writeOutput(true, headerTemplate, outputPath);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::generatePythonTestFile(const QString& outputPath, const QString& isSIMPLib)
-{
-  QString code;
-  QTextStream out(&code);
-  out << "\"\"\"\n"
-      << "This is a basic unit test file to ensure that the filters can be instantiated\n"
-      << "This file is AUTO GENERATED as part of the 'CodeScraper' program that is executed\n"
-      << "during the compilation phase. PythonBindingsModule.cpp at line " << __LINE__ << "\n"
-      << "m_LibName=" << m_LibName << "\n"
-      << "isSIMPLib:" << isSIMPLib << "\n"
-      << "\"\"\"\n";
-  QString shortLibName = m_LibName;
-  shortLibName.replace("_py", "");
-  if(isSIMPLib.compare("TRUE") == 0)
-  {
-    shortLibName = QString("simpl");
-  }
-  out << "import dream3d\n";
-  out << "from dream3d import " << shortLibName << "\n";
-  out << "\n\n";
-
-  out << "def " << m_LibName << "UnitTest():\n" << PBM_TAB << "\"\"\"\n" << PBM_TAB << "Just Try to instantiate all the filters\n" << PBM_TAB << "\"\"\"\n";
-
-  for(auto object : m_ClassVector)
-  {
-    if(object->property("superClass").toString().compare("AbstractFilter") == 0)
-    {
-      out << "\n";
-      dumpRecursivePythonCode(0, object, out);
-    }
-  }
-
-  out << "\n\n";
-  out << "\"\"\"\n"
-      << "Main Entry point for the python script\n"
-      << "\"\"\"\n";
-  out << "if __name__ == \"__main__\":\n"
-      << PBM_TAB << "print(\"" << m_LibName << " UnitTest Starting\")\n"
-      << PBM_TAB << m_LibName << "UnitTest()\n"
-      << PBM_TAB << "print(\"" << m_LibName << " UnitTest Complete\")\n";
-
-  writeOutput(true, code, outputPath);
-}
-
-// -----------------------------------------------------------------------------
-// https://discourse.itk.org/t/pythonic-interface-to-itk-filters/1106
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::generatePythonicInterface(const QString& outputPath, const QString& isSIMPLib)
-{
-  QList<QString> classes = m_Headers.keys();
-  QListIterator<QString> iter(classes);
-
-  QString code;
-  QTextStream out(&code);
-
-  out << "\"\"\"\n Pythonic Interface to SIMPL Plugin " << getLibNameUpper() << "\n";
-  out << " This file is auto generated during the build of DREAM.3D and the plugin " << getLibNameUpper() << "\n";
-  QString fromFile = QString::fromLatin1(__FILE__);
-  fromFile = fromFile.replace("\\", "/");
-  out << " The code is generate from file " << fromFile << "(" << __LINE__ << ")\n";
-  out << " The Filters that have pythonic interfaces generated for them are:\n";
-
-  while(iter.hasNext())
-  {
-    QString aClass = iter.next();
-    out << "    " << aClass << "\n";
-  }
-
-  out << QStringLiteral("\"\"\"") << "\n";
-  out << "\n";
-  out << "from .dream3d import simpl\n";
-
-  QString shortLibName = m_LibName;
-  shortLibName.replace("_py", "");
-  if(isSIMPLib != "TRUE")
-  {
-    out << "from .dream3d import " << shortLibName << "\n\n\n";
-  }
-
-  iter.toFront();
-  while(iter.hasNext())
-  {
-    QString aClass = iter.next();
-    QVector<QString> pythonicCodes = m_PythonicCodes[aClass];
-    QString initCodes;
-    QString bodyCodes;
-    QString docCodes;
-    if(pythonicCodes.size() >= 1)
-    {
-      initCodes = pythonicCodes[0];
-    }
-    if(pythonicCodes.size() >= 2)
-    {
-      bodyCodes = pythonicCodes[1];
-    }
-    if(pythonicCodes.size() >= 3)
-    {
-      docCodes = pythonicCodes[2];
-    }
-
-    if(shortLibName == "dream3d")
-    {
-      shortLibName = "simpl";
-    }
-    bodyCodes = bodyCodes.replace("@shortLibName@", shortLibName);
-
-    if(aClass.compare("AbstractFilter") == 0 && isSIMPLib.compare("FALSE") == 0)
-    {
-      continue;
-    }
-    if(bodyCodes.isEmpty())
-    {
-      continue;
-    }
-    out << "def " << SIMPL::Python::fromCamelCase(aClass) << initCodes << ":\n"
-        << R"(    ''')"
-        << "\n"
-        << "    Executes the filter " << aClass << " and returns the error.\n"
-        << "\n"
-        << docCodes << "    '''\n\n"
-        << bodyCodes << "\n"
-
-        << "\n\n";
-  }
-  writeOutput(true, code, outputPath);
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::dumpRecursivePythonCode(int level, const QObject* object, QTextStream& out)
-{
-  if(object)
-  {
-    // These are a list of Abstract or Top level classes that do not need to be tested
-    // so let's avoid those.
-    QStringList avoidThese = {"AbstractFilter", "FileReader", "FileWriter", "Observable", "IDataArray", "SegmentFeatures"};
-
-    QByteArray buf;
-    buf.fill(' ', level / 2 * 8);
-    if(level % 2)
-    {
-      buf += "    ";
-    }
-
-    QString initCode = m_PythonCodes[object->objectName()];
-    QString shortLibName = m_LibName;
-    shortLibName.replace("_py", "");
-    if(shortLibName.compare("dream3d") == 0)
-    {
-      shortLibName = QString("simpl");
-    }
-
-    const char* pycode = R"PY(
-    # @FILTER_NAME@
-    # @INIT_CODE@
-    print("# --- @FILTER_NAME@ ")
-    filter = @LIB_NAME@.@FILTER_NAME@.New()
-    filter.preflight()
-    # print("  Preflight Error Code:%s" % filter.ErrorCondition)
-    filterName = filter.NameOfClass
-    if filterName != "@FILTER_NAME@" :
-        print("  Error: Filter class name is not correct. %s != @FILTER_NAME@" % filterName)
-
-)PY";
-
-    if(!avoidThese.contains(object->objectName()))
-    {
-      QString code(pycode);
-      code.replace("@LIB_NAME@", shortLibName);
-      code.replace("@FILTER_NAME@", object->objectName());
-      code.replace("@INIT_CODE@", initCode);
-      out << code;
-    }
-    QObjectList children = object->children();
-    if(!children.isEmpty())
-    {
-      // out << "\n";
-      for(int i = 0; i < children.size(); ++i)
-      {
-        dumpRecursivePythonCode(level + 1, children.at(i), out);
-      }
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::dumpRecursiveIncludeList(int level, const QObject* object, QTextStream& out)
-{
-  if(object)
-  {
-    QByteArray buf;
-    buf.fill(' ', level / 2 * 8);
-    if(level % 2)
-    {
-      buf += "    ";
-    }
-    //    QString name = object->objectName();
-    //    QString flags = QLatin1String("");
-    QString header = m_Headers[object->objectName()];
-    if(header.isEmpty())
-    {
-      // qDebug() << "##### Header was empty: " << object->objectName();
-    }
-    else
-    {
-      out << "#include \"" << header << "\"\n";
-    }
-    QObjectList children = object->children();
-    if(!children.isEmpty())
-    {
-      for(int i = 0; i < children.size(); ++i)
-      {
-        dumpRecursiveIncludeList(level + 1, children.at(i), out);
-      }
-    }
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void PythonBindingsModule::dumpRecursiveInitCode(int level, const QObject* object, QTextStream& out)
-{
-  if(object)
-  {
-    QByteArray buf;
-    buf.fill(' ', level / 2 * 8);
-    if(level % 2)
-    {
-      buf += "    ";
-    }
-
-    QString initCode = m_InitCodes[object->objectName()];
-
-    out << "  " << initCode << "\n";
-    QObjectList children = object->children();
-    if(!children.isEmpty())
-    {
-      // out << "\n";
-      for(int i = 0; i < children.size(); ++i)
-      {
-        dumpRecursiveInitCode(level + 1, children.at(i), out);
-      }
-    }
-  }
-}
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h b/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
deleted file mode 100644
index 1975b0faac..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonBindingsModule.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#pragma once
-
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QMap>
-#include <QtCore/QString>
-
-#include "SIMPLib/Common/SIMPLibSetGetMacros.h"
-
-/* *****************************************************************************
- *
- *
- ******************************************************************************/
-class PythonBindingsModule
-{
-public:
-  PythonBindingsModule();
-  ~PythonBindingsModule();
-
-  SIMPL_INSTANCE_PROPERTY(QString, LibName)
-  SIMPL_INSTANCE_PROPERTY(QString, LibNameUpper)
-  SIMPL_INSTANCE_PROPERTY(QString, TemplatePath)
-
-  using MapperType = QMap<QString, QString>;
-  using MapperType2 = QMap<QString, QVector<QString>>;
-
-  SIMPL_INSTANCE_PROPERTY(MapperType, Headers)
-  void addHeader(const QString& className, const QString& header);
-  void clearHeaders();
-
-  SIMPL_INSTANCE_PROPERTY(MapperType, InitCodes)
-  void addInitCode(const QString& className, const QString& initCode);
-  void clearInitCodes();
-
-  SIMPL_INSTANCE_PROPERTY(MapperType, PythonCodes)
-  void addPythonCodes(const QString& className, const QString& pyCode);
-  void clearPythonCodes();
-
-  SIMPL_INSTANCE_PROPERTY(MapperType2, PythonicCodes)
-  void addPythonicCodes(const QString& className, const QVector<QString>& pyCode);
-  void clearPythonicCodes();
-
-  /**
-   * @brief addDependency
-   * @param superClassName
-   * @param className
-   */
-  void addDependency(QString superClassName, QString className);
-
-  /**
-   * @brief writeOutput
-   * @param didReplace
-   * @param outLines
-   * @param filename
-   */
-  void writeOutput(bool didReplace, const QString& outLines, QString filename);
-
-  /**
-   * @brief generateModuleFile
-   * @param outputPath
-   * @param isSIMPLib
-   */
-  void generateModuleFile(const QString& outputPath, const QString& isSIMPLib);
-
-  /**
-   * @brief generatePythonTestFile
-   * @param outputPath
-   * @param isSIMPLib
-   */
-  void generatePythonTestFile(const QString& outputPath, const QString& isSIMPLib);
-
-  /**
-   * @brief generatePythonicInterface
-   * @param outputPath
-   * @param isSIMPLib
-   */
-  void generatePythonicInterface(const QString& outputPath, const QString& isSIMPLib);
-
-protected:
-  /**
-   * @brief dumpRecursivePythonCode
-   * @param level
-   * @param object
-   * @param out
-   */
-  void dumpRecursivePythonCode(int level, const QObject* object, QTextStream& out);
-
-  /**
-   * @brief dumpRecursiveIncludeList
-   * @param level
-   * @param object
-   * @param out
-   */
-  void dumpRecursiveIncludeList(int level, const QObject* object, QTextStream& out);
-
-  /**
-   * @brief dumpRecursiveInitCode
-   * @param level
-   * @param object
-   * @param out
-   */
-  void dumpRecursiveInitCode(int level, const QObject* object, QTextStream& out);
-
-  /**
-   * @brief md5FileContents
-   * @param filename
-   * @return
-   */
-  QByteArray md5FileContents(const QString& filename);
-
-private:
-  std::vector<QObject*> m_ClassVector;
-};
diff --git a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h b/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
deleted file mode 100644
index abda6d564e..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/PythonUtils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <QtCore/QRegularExpression>
-#include <QtCore/QString>
-
-namespace SIMPL
-{
-namespace Python
-{
-
-static QString fromCamelCase(const QString& s)
-{
-  static QRegularExpression regExp1{"(.)([A-Z][a-z]+)"};
-  static QRegularExpression regExp2{"([a-z0-9])([A-Z])"};
-
-  QString result = s;
-  result.replace(regExp1, "\\1_\\2");
-  result.replace(regExp2, "\\1_\\2");
-
-  return result.toLower();
-}
-
-#if 0
-static QString toCamelCase(const QString& s)
-{
-  QStringList parts = s.split('_', QString::SkipEmptyParts);
-  for (int i=1; i<parts.size(); ++i) 
-  {
-    parts[i].replace(0, 1, parts[i][0].toUpper());
-  }
-  return parts.join("");
-}
-#endif
-
-} // namespace Python
-} // namespace SIMPL
diff --git a/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in b/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
deleted file mode 100644
index 0d619641a9..0000000000
--- a/Wrapping/Python/Pybind11/CodeScraper/SIMPLPyBind11Config.h.in
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#pragma once
-
-#include <QtCore/QString>
-
-
-namespace SIMPL
-{
-  namespace PyBind11
-  {   
-
-
-      /**
-      * @brief Returns the site-packages dir name
-      */
-      static const QString SitePackages("@PYTHON_SITE_PACKAGES_NAME@");
-
-      /**
-      * @brief Returns the Anaconda Package directory
-      */
-      static const QString AnacondaPackageDir("@SIMPL_ANACONDA_OUTPUT_DIR@");
-
-      /**
-       * @brief Returns the path to the RUNTIME_OUTPUT_DIR which should be the "Bin"
-       * directory inside the build directory. Note when building with a multi-configuration
-       * IDE such as Visual Studio or Xcode there is another directory level past that.
-       * @return
-       */
-      //static const QString RuntimeOutputDir("@GeneratePythonBindings_RUNTIME_OUTPUT_DIR@");
-      static const QString RuntimeOutputDir("@SIMPL_ANACONDA_OUTPUT_DIR@");
-
-      /**
-       * @brief Returns the path to where the Python C++ modules will be created.
-       * @return 
-       */
-      static const QString LibraryOutputDirectory("@SIMPLPyBind11_LIBRARY_OUTPUT_DIR@");
-  
-      /**
-       * @brief TemplateDir
-       * @return 
-       */
-      static const QString TemplateDir("@SIMPLPyBind11_SOURCE_DIR_NORM@/Templates");
-
-      /**
-       * @brief PythonWrappingDir
-       * @return 
-       */
-      static const QString PythonWrappingDir("@SIMPL_PYB11_PARENT_DIR@");
-      
-      /**
-       * @brief PythonModuleSuffix
-       */
-      static const QString PythonModuleSuffix("@SIMPL_PYTHON_MODULE_SUFFIX@");
-      
-      /**
-       * @brief SIMPL_LibraryName
-       */
-      static const QString SIMPL_LibraryName("@SIMPL_PYTHON_MODULE_NAME@");
-
-      static const QString SIMPLProjBinaryDir("@SIMPLProj_BINARY_DIR@");
-
-      static const QString BuildDirectory("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@");
-
-      static const QString TestDirectory("@SIMPLProj_BINARY_DIR@/Testing");
-
-      static const QString TestTempDirectory("@SIMPLProj_BINARY_DIR@/Testing/Temporary");
-
-      static const QString DataDirectory("@DREAM3D_DATA_DIR@");
-
-      static const QString IsMSVC("@MSVC_IDE@");
-  }
-  
-}
diff --git a/Wrapping/Python/Pybind11/Pybind11_Notes.md b/Wrapping/Python/Pybind11/Pybind11_Notes.md
deleted file mode 100644
index 46f9170e3a..0000000000
--- a/Wrapping/Python/Pybind11/Pybind11_Notes.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# PyBind 11 Notes #
-
-## Install Python 3 if needed ##
-
-Went to [python.org](http://www.python.org) and downloaded the python 3 installer for my operating system. Be sure to get the correct 64 bit installer.
-
-After installation I needed to run
-
-    pip3 install numpy
-
-at least on macOS.
-
-## Get Pybind11 from its Repository ##
-
-clone from PyBin11 Repository:
-
-    git clone -b v2.2.1 ssh://git@github.com/pybind/pybind11 pybind11-2.2.1
-
-## Run CMake to install ##
-
-Note on macOS 10.12 I had an issue with this error
-
-    CMake Error at tests/CMakeLists.txt:194 (message):
-      Running the tests requires pytest.  Please install it manually (try:
-      /usr/bin/python -m pip install pytest)
-
-so I turned off the PyBind Testing
-
-      cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/Users/Shared/DREAM3D_SDK/pybind11 -DPYBIND11_TEST=OFF ../
-
-      ninja install
-
-We should be setup to do something now.
-
-## Windows Example ##
-
-I downloaded Python 3.6 x64 from python.org and installed into 
-
-    C:/Applications/Python/Python36_64
-
-I would *not* suggest adding python to the system path for all users. This could potentially mess up other Python installations
-
-    cmake -G Ninja -DCMAKE_INSTALL_PREFIX=C:/DREAM3D_SDK/pybind11 -DPYTHON_EXECUTABLE=C:/Applications/Python/Python36_64/python.exe -DPYBIND11_TEST=OFF ../
-
-    ninja install
-
-Don't forget to update the DREAM3D_SDK.cmake file or DREAM3D_SDK_Extra.cmake file with the following:
-
-    set(PyBind11_DIR "C:/DREAM3D_SDK/pybind11/share/cmake/pybind11")
-
diff --git a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
deleted file mode 100644
index efec8b3de4..0000000000
--- a/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <memory>
-
-#include <memory>
-
-/* Template file used is called DerivedSharedPointerClassInit.in.h */
-// clang-format off
-/**
- * @brief This defines a C++11 alias so loading the file by itself into an IDE
- * will allow the proper code completion for a wrapped std::shared_ptr<> class.
- */
-#ifndef PySharedPtrClass_TEMPLATE
-#define PySharedPtrClass_TEMPLATE
-template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
-#endif
-
-/**
- * @brief
- * @param m The Python module
- * @param parent The parent class of the wrapped class
- * @return A std::shared_ptr<T> wrapped instance of the wrapped class properly
- * initialized.
- */
-
-/* END TEMPLATE FILE DerivedSharedPointerClassInit.in.h */
-// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
deleted file mode 100644
index 82209461ca..0000000000
--- a/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* This file is auto-genereated from a template file. If you want changes
- * then edit the template file.
- */
-// clang-format off
-#include <memory>
-
-#include <pybind11/pybind11.h>
-
-#include <utility>
-
-#include <QtCore/QString>
-
-namespace py = pybind11;
-
-#ifndef PySharedPtrClass_TEMPLATE
-#define PySharedPtrClass_TEMPLATE
-template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
-#endif
-
-#define @FULL_LIB_NAME@_PYBIND_11_HEADER
-
-/******************************************************************************
- * These are Plugin specific Headers. Yep sort of hard coded and brittle.
- ******************************************************************************/
-#ifdef ORIENTATIONANALYSIS_PYBIND_11_HEADER
-#include "EbsdLib/OrientationMath/OrientationConverter.hpp"
-#endif
-
-/******************************************************************************
- * This is a list of all the SIMPL headers that are needed/wrapped by Pybind11
- ******************************************************************************/
-@HEADER_PATH@
-
-/**
- * @brief PYBIND11_MODULE This section declares our python module, its name and
- * what classes are available within the module.
- *
- * @param parentModule The parent Python Module that this module will become a part of.
- */
-void Init_@LIB_NAME@(py::module& parentModule)
-{ 
-  /* NOTE: It is important that the submodule variable is "mod" as that is what
-  * the CodeScraper program uses. DO NOT CHANGE IT.
-  */
-
-  py::module mod = parentModule.def_submodule("@LIB_NAME@", "  Python wrapping for @FULL_LIB_NAME@");
-  mod.doc() = "Python wrapping for @LIB_NAME@";
-
-  /* Enumeration code for OrientationType */
-#ifdef ORIENTATIONANALYSIS_PYBIND_11_HEADER
-  py::enum_<OrientationRepresentation::Type>(mod, "OrientationType")
-      .value("Euler", OrientationRepresentation::Type::Euler)
-      .value("OrientationMatrix", OrientationRepresentation::Type::OrientationMatrix)
-      .value("Quaternion", OrientationRepresentation::Type::Quaternion)
-      .value("AxisAngle", OrientationRepresentation::Type::AxisAngle)
-      .value("Rodrigues", OrientationRepresentation::Type::Rodrigues)
-      .value("Homochoric", OrientationRepresentation::Type::Homochoric)
-      .value("Cubochoric", OrientationRepresentation::Type::Cubochoric)
-      .value("Unknown", OrientationRepresentation::Type::Unknown);
-#endif
-
-  /* Init codes for classes in the Module */
-  @MODULE_INIT_CODE@
-}
-
-#undef @FULL_LIB_NAME@_PYBIND_11_HEADER
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
deleted file mode 100644
index 657597fe63..0000000000
--- a/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h
+++ /dev/null
@@ -1,643 +0,0 @@
-
-#if !defined(_MSC_VER)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wreturn-std-move"
-#endif
-
-// clang-format off
-#include <QtCore/QString>
-
-#include <pybind11/numpy.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/stl_bind.h>
-
-namespace py = pybind11;
-
-#include "SIMPLib/CoreFilters/CreateDataArray.h"
-#include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
-#include "SIMPLib/DataContainers/DataContainerProxy.h"
-#include "SIMPLib/FilterParameters/RangeFilterParameter.h"
-#include "SIMPLib/Common/ShapeType.h"
-#include "SIMPLib/Common/PhaseType.h"
-
-using DataContainersMap = QMap<QString, DataContainerProxy>;
-using AttributeMatricesMap = QMap<QString, AttributeMatrixProxy>;
-using VectorOfFloatArray = QVector<FloatArrayType::Pointer>;
-
-namespace pybind11
-{
-namespace detail
-{
-/* Create a TypeCaster for auto python string <--> QString conversion */
-template <> struct type_caster<QString>
-{
-public:
-  /**
-   * This macro establishes the name 'QString' in
-   * function signatures and declares a local variable
-   * 'value' of type QString
-   */
-  PYBIND11_TYPE_CASTER(QString, _("QString"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a PyObject into a QString
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    object temp;
-    handle load_src = src;
-    if(PyUnicode_Check(load_src.ptr()))
-    {
-      temp = reinterpret_steal<object>(PyUnicode_AsUTF8String(load_src.ptr()));
-      if(!temp) /* A UnicodeEncodeError occured */
-      {
-        PyErr_Clear();
-        return false;
-      }
-      load_src = temp;
-    }
-    char* buffer = nullptr;
-    ssize_t length = 0;
-    int err = PYBIND11_BYTES_AS_STRING_AND_SIZE(load_src.ptr(), &buffer, &length);
-    if(err == -1) /* A TypeError occured */
-    {
-      PyErr_Clear();
-      return false;
-    }
-    value = QString::fromUtf8(buffer, static_cast<int>(length));
-    return true;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert an QString instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QString& src, return_value_policy /* policy */, handle /* parent */)
-  {
-#if PY_VERSION_HEX >= 0x03030000 // Python 3.3
-    assert(sizeof(QChar) == 2);
-    return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, src.constData(), src.length());
-#else
-    QByteArray a = src.toUtf8();
-    return PyUnicode_FromStringAndSize(a.data(), (ssize_t)a.length());
-#endif
-  }
-};
-/* Create a TypeCaster for auto python tuple <--> QPair conversion */
-template <> struct type_caster<FPRangePair>
-{
-public:
-  /**
-   * This macro establishes the name 'FPRangePair' in
-   * function signatures and declares a local variable
-   * 'value' of type FPRangePair
-   */
-  PYBIND11_TYPE_CASTER(FPRangePair, _("FPRangePair"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a tuple into a FPRangePair
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::tuple>(src))
-    {
-      py::tuple valuePair = py::cast<py::tuple>(src);
-      value = FPRangePair();
-      value.first = py::cast<double>(valuePair[0]);
-      value.second = py::cast<double>(valuePair[1]);
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert  FPRangePair instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const FPRangePair& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    return py::tuple((src.first, src.second));
-  }
-};
-
-/* Create a TypeCaster for auto python dict <--> ASCIIWizardData conversion */
-template <> struct type_caster<ASCIIWizardData>
-{
-public:
-  /**
-   * This macro establishes the name 'ASCIIWizardData' in
-   * function signatures and declares a local variable
-   * 'value' of type ASCIIWizardData
-   */
-  PYBIND11_TYPE_CASTER(ASCIIWizardData, _("ASCIIWizardData"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a dict into a ASCIIWizardData
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::dict>(src))
-    {
-      py::dict awdDict = py::cast<py::dict>(src);
-      value = ASCIIWizardData();
-      value.inputFilePath = py::cast<QString>(awdDict["inputFilePath"]);
-      value.beginIndex = py::cast<int>(awdDict["beginIndex"]);
-      value.numberOfLines = py::cast<int>(awdDict["numberOfLines"]);
-      QList<char> delimiters;
-      for(auto object : awdDict["delimiters"])
-      {
-        delimiters.push_back(py::cast<char>(object));
-      }
-      value.delimiters = delimiters;
-      value.consecutiveDelimiters = py::cast<bool>(awdDict["consecutiveDelimiters"]);
-      value.automaticAM = py::cast<bool>(awdDict["automaticAM"]);
-      value.selectedPath = py::cast<DataArrayPath>(awdDict["selectedPath"]);
-      QStringList dataHeaders;
-      for(auto header : awdDict["headers"])
-      {
-        dataHeaders.push_back(py::cast<QString>(header));
-      }
-      value.dataHeaders = dataHeaders;
-      value.attrMatType = py::cast<int>(awdDict["attrMatType"]);
-      std::vector<size_t> tupleDims;
-      for(auto tupleDim : awdDict["tupleDimensions"])
-      {
-        tupleDims.push_back(py::cast<size_t>(tupleDim));
-      }
-      value.tupleDims = tupleDims;
-      QStringList dataTypes;
-      for(auto dataType : awdDict["dataTypes"])
-      {
-        dataTypes.push_back(py::cast<QString>(dataType));
-      }
-      value.dataTypes = dataTypes;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert  ASCIIWizardData instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const ASCIIWizardData& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::dict awdDict = py::dict();
-    awdDict["inputFilePath"] = src.inputFilePath;
-    awdDict["beginIndex"] = src.beginIndex;
-    awdDict["numberOfLines"] = src.numberOfLines;
-    awdDict["delimiters"] = src.delimiters;
-    awdDict["consecutiveDelimiters"] = src.consecutiveDelimiters;
-    awdDict["automaticAM"] = src.automaticAM;
-    awdDict["selectedPath"] = src.selectedPath;
-    awdDict["headers"] = src.dataHeaders;
-    awdDict["attrMatType"] = src.attrMatType;
-    awdDict["tupleDimensions"] = src.tupleDims;
-    awdDict["dataTypes"] = src.dataTypes;
-    return awdDict;
-  }
-};
-
-/* Create a TypeCaster for auto python list <--> QVector<DataArrayPath> conversion */
-template <> struct type_caster<QVector<DataArrayPath>>
-{
-public:
-  /**
-   * This macro establishes the name 'QVector<DataArrayPath>' in
-   * function signatures and declares a local variable
-   * 'value' of type QVector<DataArrayPath>
-   */
-  PYBIND11_TYPE_CASTER(QVector<DataArrayPath>, _("QVector<DataArrayPath>"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<DataArrayPath>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      value = QVector<DataArrayPath>();
-      for(auto dataArrayPath : src)
-      {
-        value.push_back(py::cast<DataArrayPath>(dataArrayPath));
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<DataArrayPath> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QVector<DataArrayPath>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list dataArrayPaths = py::list();
-    for(auto dataArrayPath : src)
-    {
-      dataArrayPaths.append(dataArrayPath);
-    }
-    return dataArrayPaths;
-  }
-};
-
-/* Create a TypeCaster for auto python dict <--> QMap<QString, DataContainerProxy> conversion */
-template <> struct type_caster<DataContainersMap>
-{
-public:
-  /**
-   * This macro establishes the name 'QMap<QString, V>' in
-   * function signatures and declares a local variable
-   * 'value' of type QMap<QString, V>
-   */
-  PYBIND11_TYPE_CASTER(DataContainersMap, _("DataContainersMap"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::dict>(src))
-    {
-      std::map<QString, DataContainerProxy> mapDict = py::cast<std::map<QString, DataContainerProxy>>(src);
-      value = QMap<QString, DataContainerProxy>();
-      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
-      {
-        value.insert(it->first, it->second);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QMap<QString, V> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QMap<QString, DataContainerProxy>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    std::map<QString, DataContainerProxy> qmapStd = src.toStdMap();
-    py::dict qmapDict = py::dict();
-    for(auto it = qmapStd.begin(); it != qmapStd.end(); ++it)
-    {
-      QString key(it->first);
-      qmapDict[py::str(key.toStdString())] = py::cast(it->second);
-    }
-    return qmapDict;
-  }
-};
-
-/* Create a TypeCaster for auto python dict <--> QMap<QString, DataContainerProxy> conversion */
-template <> struct type_caster<AttributeMatricesMap>
-{
-public:
-  /**
-   * This macro establishes the name 'QMap<QString, V>' in
-   * function signatures and declares a local variable
-   * 'value' of type QMap<QString, V>
-   */
-  PYBIND11_TYPE_CASTER(AttributeMatricesMap, _("AttributeMatricesMap"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::dict>(src))
-    {
-      std::map<QString, AttributeMatrixProxy> mapDict = py::cast<std::map<QString, AttributeMatrixProxy>>(src);
-      value = QMap<QString, AttributeMatrixProxy>();
-      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
-      {
-        value.insert(it->first, it->second);
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QMap<QString, V> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QMap<QString, AttributeMatrixProxy>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::dict qmapDict = py::dict();
-    std::map<QString, AttributeMatrixProxy> qmapStd = src.toStdMap();
-    for(auto it = qmapStd.begin(); it != qmapStd.end(); ++it)
-    {
-      QString key(it->first);
-      qmapDict[py::str(key.toStdString())] = py::cast(it->second);
-    }
-    return qmapDict;
-  }
-};
-
-/* Create a TypeCaster for auto python list <--> QVector<ShapeType::Type> conversion */
-template <> struct type_caster<QVector<ShapeType::Type>>
-{
-public:
-  /**
-   * This macro establishes the name 'QVector<ShapeType::Type>' in
-   * function signatures and declares a local variable
-   * 'value' of type QVector<ShapeType::Type>
-   */
-  PYBIND11_TYPE_CASTER(QVector<ShapeType::Type>, _("QVector<ShapeType::Type>"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<ShapeType::Type>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      value = QVector<ShapeType::Type>();
-      for(auto shapeType : src)
-      {
-        value.push_back(py::cast<ShapeType::Type>(shapeType));
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<ShapeType::Type> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QVector<ShapeType::Type>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list shapeTypes = py::list();
-    for(auto shapeType : src)
-    {
-      shapeTypes.append(shapeType);
-    }
-    return shapeTypes;
-  }
-};
-
-/* Create a TypeCaster for auto python list <--> QVector<PhaseType::Type> conversion */
-template <> struct type_caster<QVector<PhaseType::Type>>
-{
-public:
-  /**
-   * This macro establishes the name 'QVector<PhaseType::Type>' in
-   * function signatures and declares a local variable
-   * 'value' of type QVector<PhaseType::Type>
-   */
-  PYBIND11_TYPE_CASTER(QVector<PhaseType::Type>, _("QVector<PhaseType::Type>"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<PhaseType::Type>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      value = QVector<PhaseType::Type>();
-      for(auto phaseType : src)
-      {
-        value.push_back(py::cast<PhaseType::Type>(phaseType));
-      }
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<PhaseType::Type> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QVector<PhaseType::Type>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list phaseTypes = py::list();
-    for(PhaseType::Type phaseType : src)
-    {
-      phaseTypes.append(phaseType);
-    }
-    return phaseTypes;
-  }
-};
-
-/* Create a TypeCaster for auto python list <--> VectorOfFloatArray conversion */
-template <> struct type_caster<VectorOfFloatArray>
-{
-public:
-  /**
-   * This macro establishes the name 'VectorOfFloatArray' in
-   * function signatures and declares a local variable
-   * 'value' of type VectorOfFloatArray
-   */
-  PYBIND11_TYPE_CASTER(VectorOfFloatArray, _("VectorOfFloatArray"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a VectorOfFloatArray
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      /* Extract PyObject from handle */
-      PyObject* source = src.ptr();
-      /* Try converting into a Python integer value */
-      VectorOfFloatArray floatArrays;
-      for(auto floatArray : src)
-      {
-        if(py::isinstance<py::list>(floatArray) || py::isinstance<py::tuple>(floatArray))
-        {
-          FloatArrayType::Pointer floatArrayPtr;
-          std::vector<float> floatArrayVector;
-          size_t index = 0;
-          for(auto value : floatArray)
-          {
-            if(index == 0)
-            {
-              QString name = py::cast<QString>(value);
-              floatArrayPtr->setName(name);
-            }
-            else
-            {
-              floatArrayVector.push_back(py::cast<float>(value));
-            }
-          }
-          floatArrayPtr = FloatArrayType::FromStdVector(floatArrayVector, "FloatArrays");
-          floatArrays.push_back(floatArrayPtr);
-        }
-        else if(py::isinstance<FloatArrayType>(floatArray))
-        {
-          PyObject* floatArrayPy = floatArray.ptr();
-          floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
-          Py_XDECREF(floatArrayPy);
-        }
-        else
-        {
-          py::print(floatArray, " is an invalid float array");
-        }
-      }
-
-      value = floatArrays;
-      Py_XDECREF(source);
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert VectorOfFloatArray instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const VectorOfFloatArray& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list floatArrays = py::list();
-    for(FloatArrayType::Pointer floatArray : src)
-    {
-      py::list floatArrayList = py::list();
-      floatArrayList.append(floatArray->getName());
-      for(float value : floatArray->getArray())
-      {
-        floatArrayList.append(value);
-      }
-
-      floatArrays.append(floatArray);
-    }
-    return floatArrays;
-  }
-};
-
-} // namespace detail
-} // namespace pybind11
-// clang-format on
-
-#if !defined(_MSC_VER)
-#pragma clang diagnostic pop
-#endif
diff --git a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h b/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
deleted file mode 100644
index 40b5cb5608..0000000000
--- a/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#pragma once
-
-#if !defined(_MSC_VER)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wreturn-std-move"
-#endif
-
-// clang-format off
-/* =============================================================================
- * BEGIN Template file Pybind11TopMatter.in.h
- * ========================================================================== */
-
-/**
- * @brief This header file is genererated from a program. Make changes with caution.
- *
- *
- * This header file wraps the SIMPL class @CLASS_NAME@ located at
- * @HEADER_PATH@.
- * The Python bindings are created using Pybind11.
- */
-
-#include <pybind11/pybind11.h>
-
-namespace py = pybind11;
-
-#include "@HEADER_PATH@"
-
-namespace
-{ /* Anonymous namespace */
-
-/* =============================================================================
- * END Template file Pybind11TopMatter.in.h
- * ========================================================================== */
-// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp b/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
deleted file mode 100644
index b658801645..0000000000
--- a/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-// clang-format off
-/* =============================================================================
- * BEGIN Template file SIMPLModuleCodeTemplate.in.cpp
- * ========================================================================== */
-
-#include <memory>
-
-#include <pybind11/numpy.h>
-#include <pybind11/pybind11.h>
-#include <pybind11/stl_bind.h>
-#include <pybind11/stl.h>
-
-PYBIND11_MAKE_OPAQUE(std::vector<int8_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<uint8_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<int16_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<uint16_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<int32_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<uint32_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<int64_t>);
-PYBIND11_MAKE_OPAQUE(std::vector<uint64_t>);
-
-PYBIND11_MAKE_OPAQUE(std::vector<float>);
-PYBIND11_MAKE_OPAQUE(std::vector<double>);
-
-/*
- * Linux does not like the below line because unsigned long int and size_t are
- * the same thing. Apple (clang) and Windows (MSVC) do not seem to have a problem
- * with the line.
- */
-#if defined(__APPLE__)
-PYBIND11_MAKE_OPAQUE(std::vector<size_t>);
-#endif
-
-#include <utility>
-#include <typeinfo>
-
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-
-#include "SIMPLib/Common/PhaseType.h"
-#include "SIMPLib/Common/ShapeType.h"
-#include "SIMPLib/Utilities/PythonSupport.h"
-#include "SIMPLib/CoreFilters/ArrayCalculator.h"
-#include "SIMPLib/CoreFilters/ImportHDF5Dataset.h"
-#include "SIMPLib/FilterParameters/AxisAngleInput.h"
-#include "SIMPLib/FilterParameters/StackFileListInfo.h"
-#include "SIMPLib/FilterParameters/ThirdOrderPolynomial.h"
-
-namespace py = pybind11;
-
-PYBIND11_DECLARE_HOLDER_TYPE(T, std::shared_ptr<T>);
-
-//PYBIND11_MAKE_OPAQUE(DataContainersMap)
-//PYBIND11_MAKE_OPAQUE(AttributeMatricesMap)
-
-#include "Templates/Pybind11CustomTypeCasts.in.h"
-
-#ifndef PySharedPtrClass_TEMPLATE
-#define PySharedPtrClass_TEMPLATE
-template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
-#endif
-
-
-/******************************************************************************
- * This is a list of all the SIMPL headers that are needed/wrapped by Pybind11
- ******************************************************************************/
-@HEADER_PATH@
-
-/******************************************************************************
- *
- ******************************************************************************/
-#include "SIMPLib/DataArrays/DataArray.hpp"
-#include "SIMPLib/Common/SIMPLArray.hpp"
-
-/**
- * @brief Initializes a template specialization of DataArray<T>
- * @param T The Type
- * @param NAME The name of the Variable
- */
-#define PYB11_DEFINE_DATAARRAY_INIT(T, NAME)                                                                                                                                                           \
-  PySharedPtrClass<DataArray<T>> declare##NAME(py::module& m, PySharedPtrClass<IDataArray>& parent)                                                                                                    \
-  {                                                                                                                                                                                                    \
-    using DataArrayType = DataArray<T>;                                                                                                                                                                \
-    PySharedPtrClass<DataArrayType> instance(m, #NAME, parent, py::buffer_protocol());                                                                                                                 \
-    instance                                                                                                                                                                                          \
-      .def(py::init([](size_t numElements, QString name, T initValue) {                                                                                                                                 \
-        return PythonSupport::Create##NAME(numElements, name, initValue);            \
-      }))                                                                                                                      \
-      .def(py::init([](size_t numElements, std::vector<size_t> cDims, QString name, T initValue) {                                                                                                  \
-        return PythonSupport::Create##NAME(numElements, cDims, name, initValue);                                                                                                                   \
-      }))                                                                                                                                                                                              \
-      .def(py::init([](T* ptr, size_t numTuples, std::vector<size_t> cDims, QString name, bool ownsData) {                                                                                         \
-        return PythonSupport::Wrap##NAME(ptr, numTuples, cDims, name, ownsData);                                                                                                                    \
-      }))                                                                                                                                                                                              \
-      .def(py::init([](py::array_t<T, py::array::c_style> b, QString name, bool ownsData) {                                                                                                          \
-        py::buffer_info buf = b.request();                                                                                                                                                           \
-        std::vector<ssize_t> shape = buf.shape;                                                                                                                                                      \
-        ssize_t ndim = buf.ndim;                                                                                                                                                                     \
-        size_t numTuples = 0;                                                                                                                                                                        \
-        std::vector<size_t> cDims;                                                                                                                                                                       \
-        if(ndim == 0)                                                                                                                                                                                \
-        {                                                                                                                                                                                            \
-          numTuples = 1;                                                                                                                                                                             \
-          cDims.resize(1);                                                                                                                                                                           \
-          cDims[0] = 1;                                                                                                                                                                              \
-        }                                                                                                                                                                                            \
-        else if(ndim == 1)                                                                                                                                                                           \
-        {                                                                                                                                                                                            \
-          numTuples = static_cast<size_t>(shape.front());                                                                                                                                            \
-          cDims.resize(1);                                                                                                                                                                           \
-          cDims[0] = 1;                                                                                                                                                                              \
-        }                                                                                                                                                                                            \
-        else                                                                                                                                                                                         \
-        {                                                                                                                                                                                            \
-          numTuples = static_cast<size_t>(shape.front());                                                                                                                                            \
-          cDims.resize(ndim - 1);                                                                                                                                                                    \
-          for(ssize_t e = 0; e < ndim - 1; e++)                                                                                                                                                      \
-          {                                                                                                                                                                                          \
-            cDims[e] = static_cast<size_t>(shape[e + 1]);                                                                                                                                            \
-          }                                                                                                                                                                                          \
-        }                                                                                                                                                                                            \
-          return PythonSupport::Wrap##NAME(reinterpret_cast<T*>(b.mutable_data(0)), numTuples, cDims, name, ownsData);                                                                                          \
-      })) /* Class instance method setValue */                                                                                                                                                       \
-      .def("setValue", &DataArrayType::setValue, py::arg("index"), py::arg("value"))                                                                                                                 \
-      .def("getValue", &DataArrayType::getValue, py::arg("index"))                                                                                                                                   \
-      .def_property("Data", &DataArrayType::getArray, &DataArrayType::setArray, py::return_value_policy::reference)                                                                                  \
-      .def_property("Name", &DataArrayType::getName, &DataArrayType::setName)                                                                                                                        \
-      .def("Cleanup", []() { return DataArrayType::NullPointer(); })                                                                                                                                 \
-      .def_buffer([](DataArrayType &m) -> py::buffer_info {                                                                                                                                          \
-        int nComp = m.getNumberOfComponents();                                                                                                                                                       \
-        size_t numTuples = m.getNumberOfTuples();                                                                                                                                                    \
-        ssize_t ndim = 0;                                                                                                                                                                            \
-        std::vector<ssize_t> shape;                                                                                                                                                                  \
-        std::vector<ssize_t> strides;                                                                                                                                                                \
-        if(nComp == 1)                                                                                                                                                                               \
-        {                                                                                                                                                                                            \
-          ndim = 1;                                                                                                                                                                                  \
-          shape.resize(ndim);                                                                                                                                                                        \
-          shape[0] = numTuples;                                                                                                                                                                      \
-          strides.resize(ndim);                                                                                                                                                                      \
-          strides[0] = sizeof(T);                                                                                                                                                                    \
-        }                                                                                                                                                                                            \
-        else                                                                                                                                                                                         \
-        {                                                                                                                                                                                            \
-          std::vector<size_t> cDims = m.getComponentDimensions();                                                                                                                                        \
-          ndim = static_cast<ssize_t>(cDims.size()) + 1;                                                                                                                                             \
-          shape.resize(ndim);                                                                                                                                                                        \
-          shape[0] = numTuples;                                                                                                                                                                      \
-          for(ssize_t e = 0; e < ndim - 1; e++)                                                                                                                                                      \
-          {                                                                                                                                                                                          \
-            shape[e + 1] = static_cast<ssize_t>(cDims[e]);                                                                                                                                           \
-          }                                                                                                                                                                                          \
-          ssize_t cur = 1;                                                                                                                                                                           \
-          std::vector<ssize_t> rshape(shape);                                                                                                                                                        \
-          std::reverse(std::begin(rshape), std::end(rshape));                                                                                                                                        \
-          for(auto val : rshape)                                                                                                                                                                     \
-          {                                                                                                                                                                                          \
-            strides.push_back(cur * val * sizeof(T));                                                                                                                                                \
-            cur *= val;                                                                                                                                                                              \
-          }                                                                                                                                                                                          \
-          strides.pop_back();                                                                                                                                                                        \
-          auto front = std::begin(strides);                                                                                                                                                          \
-          strides.insert(front, sizeof(T));                                                                                                                                                          \
-          std::reverse(std::begin(strides), std::end(strides));                                                                                                                                      \
-        }                                                                                                                                                                                            \
-        return py::buffer_info(                                                                                                                                                                      \
-          m.getPointer(0),                                                                                                                                                                           \
-          sizeof(T),                                                                                                                                                                                 \
-          py::format_descriptor<T>::format(),                                                                                                                                                        \
-          ndim,                                                                                                                                                                                      \
-          shape,                                                                                                                                                                                     \
-          strides                                                                                                                                                                                    \
-        );                                                                                                                                                                                           \
-      })                                \
-      .def("__repr__", [](DataArrayType &a)  {        \
-        std::stringstream ss;\
-        ss <<  "<'" << a.getFullNameOfClass().toStdString() << "  NAME=" << a.getName().toStdString() \
-        << ": TUPLES: " << a.getNumberOfTuples()\
-        << "  COMPONENTS: [";                     \
-        std::vector<size_t> comps = a.getComponentDimensions();  \
-        bool first = true;                            \
-        for(const auto& c : comps)  {             \
-          if(!first) { ss << ","; }                \
-          ss << c;         \
-          first = false;                           \
-        }                                          \
-        ss << "]'>";                \
-        return ss.str();           \
-      })   \
-    ;                                                                                                                                                                                                  \
-    return instance;                                                                                                                                                                                   \
-}
-
-PYB11_DEFINE_DATAARRAY_INIT(int8_t, Int8ArrayType);
-PYB11_DEFINE_DATAARRAY_INIT(uint8_t, UInt8ArrayType);
-
-PYB11_DEFINE_DATAARRAY_INIT(int16_t, Int16ArrayType);
-PYB11_DEFINE_DATAARRAY_INIT(uint16_t, UInt16ArrayType);
-
-PYB11_DEFINE_DATAARRAY_INIT(int32_t, Int32ArrayType);
-PYB11_DEFINE_DATAARRAY_INIT(uint32_t, UInt32ArrayType);
-
-PYB11_DEFINE_DATAARRAY_INIT(int64_t, Int64ArrayType);
-PYB11_DEFINE_DATAARRAY_INIT(uint64_t, UInt64ArrayType);
-
-PYB11_DEFINE_DATAARRAY_INIT(float, FloatArrayType);
-PYB11_DEFINE_DATAARRAY_INIT(double, DoubleArrayType);
-
-
-#define PYB11_DEFINE_SIMPLARRAY_2_INIT(T, NAME)\
-  py::class_<NAME>(mod, #NAME)\
-    .def(py::init<>([](py::list values) {\
-      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]));\
-      return vec;\
-    }))\
-    .def("__repr__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return outValues;\
-    })\
-    .def("__str__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return py::str(outValues);\
-    })\
-    .def("__getitem__", [](const NAME &values, int index) {\
-      return values[index];\
-    })\
-  ;
-
-#define PYB11_DEFINE_SIMPLARRAY_3_INIT(T, NAME)\
-  py::class_<NAME>(mod, #NAME)\
-    .def(py::init<>([](py::list values) {\
-      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]));\
-      return vec;\
-    }))\
-    .def("__repr__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return outValues;\
-    })\
-    .def("__str__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return py::str(outValues);\
-    })\
-    .def("__getitem__", [](const NAME &values, int index) {\
-      return values[index];\
-    })\
-  ;
-
-#define PYB11_DEFINE_SIMPLARRAY_4_INIT(T, NAME)\
-  py::class_<NAME>(mod, #NAME)\
-    .def(py::init<>([](py::list values) {\
-      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]));\
-      return vec;\
-    }))\
-    .def("__repr__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return outValues;\
-    })\
-    .def("__str__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return py::str(outValues);\
-    })\
-    .def("__getitem__", [](const NAME &values, int index) {\
-      return values[index];\
-    })\
-  ;
-
-#define PYB11_DEFINE_SIMPLARRAY_6_INIT(T, NAME)\
-  py::class_<NAME>(mod, #NAME)\
-    .def(py::init<>([](py::list values) {\
-      NAME vec = NAME(py::cast<T>(values[0]), py::cast<T>(values[1]), py::cast<T>(values[2]), py::cast<T>(values[3]), py::cast<T>(values[4]), py::cast<T>(values[5]));\
-      return vec;\
-    }))\
-    .def("__repr__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return outValues;\
-    })\
-    .def("__str__", [](const NAME &inValues) {\
-      py::list outValues;\
-      for (T value : inValues) { outValues.append(value); }\
-      return py::str(outValues);\
-    })\
-    .def("__getitem__", [](const NAME &values, int index) {\
-      return values[index];\
-    })\
-  ;
-
-//------------------------------------------------------------------------------
-// This header file is auto-generated and contains include directives for each
-// cxx file that contains a specific plugins init code.
-//------------------------------------------------------------------------------
-#include "DREAM3D_SubmoduleHeaders.h"
-
-
-/**
- * @brief PYBIND11_MODULE This section declares our python module, its name and
- * what classes are available within the module.
- *
- */
-PYBIND11_MODULE(dream3d, m)
-{
-  m.doc() = "Python wrapping for dream3d";
-
-  /* Define a python submodule for SIMPL */
-  py::module mod = m.def_submodule("simpl", "  Python wrapping for SIMPL");
-
-  // SIMPLArray declarations/definitions
-  PYB11_DEFINE_SIMPLARRAY_2_INIT(float, FloatVec2Type)
-  PYB11_DEFINE_SIMPLARRAY_2_INIT(int32_t, IntVec2Type)
-  PYB11_DEFINE_SIMPLARRAY_2_INIT(size_t, SizeVec2Type)
-
-  PYB11_DEFINE_SIMPLARRAY_3_INIT(float, FloatVec3Type)
-  PYB11_DEFINE_SIMPLARRAY_3_INIT(int, IntVec3Type)
-  PYB11_DEFINE_SIMPLARRAY_3_INIT(size_t, SizeVec3Type)
-
-  PYB11_DEFINE_SIMPLARRAY_4_INIT(float, FloatVec4Type)
-  PYB11_DEFINE_SIMPLARRAY_4_INIT(int, IntVec4Type)
-  PYB11_DEFINE_SIMPLARRAY_4_INIT(size_t, SizeVec4Type)
-
-  PYB11_DEFINE_SIMPLARRAY_6_INIT(float, FloatVec6Type)
-  PYB11_DEFINE_SIMPLARRAY_6_INIT(int32_t, IntVec6Type)
-
-  py::class_<AxisAngleInput>(mod, "AxisAngleInput")
-    .def(py::init< const float &, const float &, const float &, const float &>())
-  ;
-
-  py::class_<StackFileListInfo>(mod, "FileListInfo")
-    .def(py::init <> ([] ( const int & paddingDigits, const unsigned int & ordering, const int & startIndex,
-      const int & endIndex, const int & incrementIndex, const py::str & inputPath, const py::str & filePrefix,
-      const py::str & fileSuffix, const py::str &fileExtension)
-      {
-        StackFileListInfo fileListInfo;
-        fileListInfo.PaddingDigits = paddingDigits;
-        fileListInfo.Ordering = ordering;
-        fileListInfo.StartIndex = startIndex;
-        fileListInfo.EndIndex = endIndex;
-        fileListInfo.IncrementIndex = incrementIndex;
-        QString InputPath = QString::fromStdString(py::cast<std::string>(inputPath));
-        QString FilePrefix = QString::fromStdString(py::cast<std::string>(filePrefix));
-        QString FileSuffix = QString::fromStdString(py::cast<std::string>(fileSuffix));
-        QString FileExtension = QString::fromStdString(py::cast<std::string>(fileExtension));
-        fileListInfo.InputPath = InputPath;
-        fileListInfo.FilePrefix = FilePrefix;
-        fileListInfo.FileSuffix = FileSuffix;
-        fileListInfo.FileExtension = FileExtension;
-        return fileListInfo;
-      }))
-  ;
-
-#if 0
-  // Handle QVector of size_t
-  py::class_<std::vector<size_t>>(mod, "Dims")
-    .def(py::init<>([](py::list dimensions) {
-    std::vector<size_t> dims = std::vector<size_t>();
-    for (auto dimension : dimensions)
-    {
-      dims.push_back(py::cast<size_t>(dimension));
-    }
-    return dims;
-      }))
-    .def("__repr__", [](const std::vector<size_t> &dims) {
-      py::list dimensions;
-      for (size_t dim : dims)
-      {
-        dimensions.append(dim);
-      }
-      return dimensions;
-    })
-    .def("__str__", [](const std::vector<size_t> &dims) {
-      py::list dimensions;
-      for (size_t dim : dims)
-      {
-        dimensions.append(dim);
-      }
-      return py::str(dimensions);
-    })
-    .def("__getitem__", [](const std::vector<size_t> &dims, int key) {
-      return dims[key];
-    })
-  ;
-#endif
-
-  // Handle QSet of QString
-  py::class_<QSet<QString>>(mod, "StringSet")
-    .def(py::init<>([](py::set stringSet) {
-    QSet<QString> newQStringSet = QSet<QString>();
-    for (auto newString : stringSet)
-    {
-      newQStringSet.insert(py::cast<QString>(newString));
-    }
-    return newQStringSet;
-      }))
-  ;
-
-  // Handle QDateTime
-  py::class_<QDateTime>(mod, "DateTime")
-    .def(py::init<>([](int year, int month, int day, int seconds) {
-    QDateTime dateTime(QDate(year, month, day));
-    dateTime.setTime_t(seconds);
-    return dateTime;
-      }))
-  ;
-
-  // Handle QJsonArray
-  py::class_<QJsonArray>(mod, "JsonArray")
-    .def(py::init<>([](py::list values) {
-    QJsonArray qJsonArray;
-    for (auto value : values) {
-      QJsonValue qJsonValue(py::cast<double>(value));
-      qJsonArray.push_back(qJsonValue);
-    }
-    return qJsonArray;
-      }))
-  ;
-
-  py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList")
-     .def(py::init<>([](py::list values) {
-    QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
-    for (auto value : values) {
-      py::list valueAsList = py::cast<py::list>(value);
-      ImportHDF5Dataset::DatasetImportInfo datasetImportInfo;
-      datasetImportInfo.dataSetPath = py::cast<QString>(valueAsList[0]);
-      datasetImportInfo.componentDimensions = py::cast<QString>(valueAsList[1]);
-      datasetImportInfoList.push_back(datasetImportInfo);
-    }
-    return datasetImportInfoList;
-    }));
-
-  /* STL Binding code */
-  py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8");
-  py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8");
-
-  py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16");
-  py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16");
-
-  py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32");
-  py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32");
-
-  py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64");
-  py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64");
-
-  py::bind_vector<std::vector<float>>(mod, "VectorFloat");
-  py::bind_vector<std::vector<double>>(mod, "VectorDouble");
-
-  if(py::detail::get_type_info(typeid(std::vector<size_t>)))
-  {
-    mod.attr("VectorSizeT") = mod.attr("VectorUInt64");
-  } 
-  else 
-  {
-    py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT");
-  }
-
-  /* Enumeration code for Comparison Operators */
-  py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
-    .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
-    .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
-    .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
-    .value("NotEqual", SIMPL::Comparison::Enumeration::Operator_NotEqual)
-    .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
-    .export_values();
-
-  /* Enumeration code for Delimiter types */
-  py::enum_<SIMPL::DelimiterTypes::Type>(mod, "DelimiterTypes")
-    .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
-    .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
-    .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
-    .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
-    .value("Space", SIMPL::DelimiterTypes::Type::Space)
-    .export_values();
-
-  /* Enumeration code for PhaseType */
-  py::enum_<PhaseType::Type>(mod, "PhaseType")
-    .value("Primary", PhaseType::Type::Primary)
-    .value("Precipitate", PhaseType::Type::Precipitate)
-    .value("Transformation", PhaseType::Type::Transformation)
-    .value("Matrix", PhaseType::Type::Matrix)
-    .value("Boundary", PhaseType::Type::Boundary)
-    .value("Unknown", PhaseType::Type::Unknown)
-    .value("Any", PhaseType::Type::Any)
-    .export_values();
-
-  /* Enumeration code for ShapeType */
-  py::enum_<ShapeType::Type>(mod, "ShapeType")
-    .value("Ellipsoid", ShapeType::Type::Ellipsoid)
-    .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
-    .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
-    .value("CylinderA", ShapeType::Type::CylinderA)
-    .value("CylinderB", ShapeType::Type::CylinderB)
-    .value("CylinderC", ShapeType::Type::CylinderC)
-    .value("ShapeTypeEnd", ShapeType::Type::ShapeTypeEnd)
-    .value("Unknown", ShapeType::Type::Unknown)
-    .value("Any", ShapeType::Type::Any)
-    .export_values();
-
-  /* Enumeration code for Crystal Structures */
-  py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
-      .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
-      .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
-      .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
-      .value("Cubic_Low", EnsembleInfo::CrystalStructure::Cubic_Low)
-      .value("Triclinic", EnsembleInfo::CrystalStructure::Triclinic)
-      .value("Monoclinic", EnsembleInfo::CrystalStructure::Monoclinic)
-      .value("OrthoRhombic", EnsembleInfo::CrystalStructure::OrthoRhombic)
-      .value("Tetragonal_Low", EnsembleInfo::CrystalStructure::Tetragonal_Low)
-      .value("Tetragonal_High", EnsembleInfo::CrystalStructure::Tetragonal_High)
-      .value("Trigonal_Low", EnsembleInfo::CrystalStructure::Trigonal_Low)
-      .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
-      .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure)
-      .export_values();
-
-  /* Enumeration code for Data types ******************/
-  py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
-    .value("Int8", SIMPL::ScalarTypes::Type::Int8)
-    .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
-    .value("Int16", SIMPL::ScalarTypes::Type::Int16)
-    .value("UInt16", SIMPL::ScalarTypes::Type::UInt16)
-    .value("Int32", SIMPL::ScalarTypes::Type::Int32)
-    .value("UInt32", SIMPL::ScalarTypes::Type::UInt32)
-    .value("Int64", SIMPL::ScalarTypes::Type::Int64)
-    .value("UInt64", SIMPL::ScalarTypes::Type::UInt64)
-    .value("Float", SIMPL::ScalarTypes::Type::Float)
-    .value("Double", SIMPL::ScalarTypes::Type::Double)
-    .value("Bool", SIMPL::ScalarTypes::Type::Bool)
-    .export_values();
-
-  /* Enumeration code for Initialization Choices */
-  py::enum_<CreateDataArray::InitializationChoices>(mod, "InitializationType")
-      .value("Manual", CreateDataArray::InitializationChoices::Manual)
-      .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
-      .export_values();
-
-  /* Enumeration code for AngleUnits */
-  py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits")
-    .value("Radians", ArrayCalculator::AngleUnits::Radians)
-    .value("Degrees", ArrayCalculator::AngleUnits::Degrees)
-    .export_values();
-
-  py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
-    .value("Int8", SIMPL::NumericTypes::Type::Int8)
-    .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
-    .value("Int16", SIMPL::NumericTypes::Type::Int16)
-    .value("UInt16", SIMPL::NumericTypes::Type::UInt16)
-    .value("Int32", SIMPL::NumericTypes::Type::Int32)
-    .value("UInt32", SIMPL::NumericTypes::Type::UInt32)
-    .value("Int64", SIMPL::NumericTypes::Type::Int64)
-    .value("UInt64", SIMPL::NumericTypes::Type::UInt64)
-    .value("Float", SIMPL::NumericTypes::Type::Float)
-    .value("Double", SIMPL::NumericTypes::Type::Double)
-    .value("Bool", SIMPL::NumericTypes::Type::Bool)
-    .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
-    .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType)
-    .export_values();
-
-
-  /* Init codes for classes in the Module */
-  @MODULE_INIT_CODE@
-
-  /* Init codes for the DataArray<T> classes */
-  PySharedPtrClass<Int8ArrayType> @LIB_NAME@_Int8ArrayType = declareInt8ArrayType(mod, @LIB_NAME@_IDataArray);
-  
-  PySharedPtrClass<UInt8ArrayType> @LIB_NAME@_UInt8ArrayType = declareUInt8ArrayType(mod, @LIB_NAME@_IDataArray);
-
-  PySharedPtrClass<Int16ArrayType> @LIB_NAME@_Int16ArrayType = declareInt16ArrayType(mod, @LIB_NAME@_IDataArray);
-  PySharedPtrClass<UInt16ArrayType> @LIB_NAME@_UInt16ArrayType = declareUInt16ArrayType(mod, @LIB_NAME@_IDataArray);
-
-  PySharedPtrClass<Int32ArrayType> @LIB_NAME@_Int32ArrayType = declareInt32ArrayType(mod, @LIB_NAME@_IDataArray);
-  PySharedPtrClass<UInt32ArrayType> @LIB_NAME@_UInt32ArrayType = declareUInt32ArrayType(mod, @LIB_NAME@_IDataArray);
-
-  PySharedPtrClass<Int64ArrayType> @LIB_NAME@_Int64ArrayType = declareInt64ArrayType(mod, @LIB_NAME@_IDataArray);
-  PySharedPtrClass<UInt64ArrayType> @LIB_NAME@_UInt64ArrayType = declareUInt64ArrayType(mod, @LIB_NAME@_IDataArray);
-
-  PySharedPtrClass<FloatArrayType> @LIB_NAME@_FloatArrayType = declareFloatArrayType(mod, @LIB_NAME@_IDataArray);
-  PySharedPtrClass<DoubleArrayType> @LIB_NAME@_DoubleArrayType = declareDoubleArrayType(mod, @LIB_NAME@_IDataArray);
-
-  py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat").value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat).value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat).export_values();
-
-  
-  //--------------------------------------------------------------------------
-  // This header file is auto-generated and contains some C++ code to create
-  // a submodule for each dream3d plugin
-  //--------------------------------------------------------------------------
-  #include "DREAM3D_SubmoduleInit.hpp"
- 
-}
-
-
-
-/* =============================================================================
- * END Template file SIMPLModuleCodeTemplate.in.cpp
- * ========================================================================== */
-// clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
deleted file mode 100644
index 46e8162feb..0000000000
--- a/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <memory>
-
-#include <memory>
-
-// clang-format off
-/* =============================================================================
- * BEGIN Template file SharedPointerClassInit.in.h
- * ========================================================================== */
-/**
- * @brief This defines a C++11 alias so loading the file by itself into an IDE
- * will allow the proper code completion for a wrapped std::shared_ptr<> class.
- */
-#ifndef PySharedPtrClass_TEMPLATE
-#define PySharedPtrClass_TEMPLATE
-template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
-#endif
-
-/**
- * @brief
- * @param m The Python module
- * @return A std::shared_ptr<T> wrapped instance of the wrapped class properly
- * initialized.
- */
-PySharedPtrClass<@CLASS_NAME@> declare@CLASS_NAME@(py::module& m)
-{
-  PySharedPtrClass<@CLASS_NAME@> instance(m, "@CLASS_NAME@");
-
-/* =============================================================================
- * END Template file SharedPointerClassInit.in.h
- * ========================================================================== */
-  // clang-format on
diff --git a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h b/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
deleted file mode 100644
index 0e214352c6..0000000000
--- a/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <memory>
-
-#include <memory>
-
-// clang-format off
-/* =============================================================================
- * BEGIN Template file SimpleClassInit.in.h
- * ========================================================================== */
-
-/**
- * @brief This defines a C++11 alias so loading the file by itself into an IDE
- * will allow the proper code completion for a wrapped std::shared_ptr<> class.
- */
-#ifndef PySharedPtrClass_TEMPLATE
-#define PySharedPtrClass_TEMPLATE
-template <typename T> using PySharedPtrClass = py::class_<T, std::shared_ptr<T>>;
-#endif
-
-/**
- * @brief
- * @param m The Python module
- * @return A std::shared_ptr<T> wrapped instance of the wrapped class properly
- * initialized.
- */
-PySharedPtrClass<@CLASS_NAME@> declare@CLASS_NAME@(py::module& m)
-{
-  PySharedPtrClass<@CLASS_NAME@> instance(m, "@CLASS_NAME@");
-
-  /* Begin the python properties and methods definitions section */
-  instance
-/* =============================================================================
- * END Template file SimpleClassInit.in.h
- * ========================================================================== */
-  // clang-format on
diff --git a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake b/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
deleted file mode 100644
index 39a277fe56..0000000000
--- a/Wrapping/Python/Pybind11/cmake/WrappingFunctions.cmake
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
-function(CreatePybind11Module)
-  set(options VERBOSE SIMPLIB)
-  set(oneValueArgs MODULE_NAME SOURCE_DIR PATH_TO_STRIP OUTPUT_PATH BINARY_DIR MODULE_TEMPLATE_FILE MODULE_LINK_LIBRARIES)
-  set(multiValueArgs )
-  cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-  if(ARGS_VERBOSE)
-    message(STATUS "[${ARGS_MODULE_NAME}] ## Begin CreatePybind11Module ")
-  endif()
-
-  if(ARGS_VERBOSE)
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
-    message(STATUS "[${ARGS_MODULE_NAME}] Found pybind11 v${pybind11_VERSION}: ${pybind11_INCLUDE_DIRS}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHONLIBS_FOUND: ${PYTHONLIBS_FOUND}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_PREFIX: ${PYTHON_PREFIX}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_LIBRARIES: ${PYTHON_LIBRARIES}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_INCLUDE_DIRS: ${PYTHON_INCLUDE_DIRS}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_MODULE_EXTENSION: ${PYTHON_MODULE_EXTENSION}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_MODULE_PREFIX: ${PYTHON_MODULE_PREFIX}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_SITE_PACKAGES: ${PYTHON_SITE_PACKAGES}")
-    message(STATUS "[${ARGS_MODULE_NAME}] PYTHON_IS_DEBUG: ${PYTHON_IS_DEBUG}")
-  endif()
-
-
-  # --------------------------------------------------------------------------
-  # Find the Pybind11 installation
-  find_package(pybind11 CONFIG REQUIRED)
-
-  if(NOT pybind11_FOUND)
-    message(FATAL_ERROR "[${ARGS_MODULE_NAME}] pybind11 is REQUIRED to build the SIMPL Python bindings")
-  endif()
-  
-  get_property(SIMPL_PYTHON_MODULE_SUFFIX GLOBAL PROPERTY SIMPL_PYTHON_MODULE_SUFFIX)
-
-  # Give our module a name. Python standards dictate ALL lowercase for the module name
-  set(pybind_module_name "${ARGS_MODULE_NAME}${SIMPL_PYTHON_MODULE_SUFFIX}")
-  set(pybind_module_name_CamelCase "${ARGS_MODULE_NAME}")
-  string(TOLOWER ${pybind_module_name} pybind_module_name)
-  set(pybind_plugin_list_file "${SIMPLProj_BINARY_DIR}/Pybind11Plugins.txt")
-
-  set(SIMPL_PY_MODULE_NAME "dream3d")
-
-  # Now create a custom task to scrape through our code and generate all the binding sources
-  add_custom_target(${pybind_module_name}CreatePythonBindings ALL
-      COMMAND GeneratePythonBindings "${ARGS_SOURCE_DIR}"
-      "${ARGS_PATH_TO_STRIP}"
-      "${pybind_module_name_CamelCase}"
-      "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore"
-      "${ARGS_MODULE_TEMPLATE_FILE}"
-      "${ARGS_SIMPLIB}"
-      "${CMAKE_CFG_INTDIR}"
-      DEPENDS GeneratePythonBindings ${COPY_LIBRARY_TARGETS}
-      COMMENT " ${ARGS_MODULE_NAME}: Creating Python Bindings using pybind11"
-    )
-
-  # --------------------------------------------------------------------------
-  # Now compile the Python module using pybind11 cmake functions
-  # Note the name of source file is also explicitly used in the CodeScraper program. If you change
-  # the name below you need to update the CodeScraper program
-  set(file_ext "h")
-  if(${ARGS_SIMPLIB})
-    set(file_ext "cxx")
-  endif()
-  set(pybind_module_file_name "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore/${pybind_module_name}_pybind11_module.${file_ext}")
-  set(submodules_headers_file_name "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore/DREAM3D_SubmoduleHeaders.h")
-  set(submodule_init_cxx_file_name "${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore/DREAM3D_SubmoduleInit.hpp")
-  if(NOT EXISTS "${pybind_module_file_name}")
-    FILE(WRITE "${pybind_module_file_name}" "/* Pybind11 Module code */\n") 
-  endif()
-  if(NOT TARGET ${SIMPL_PY_MODULE_NAME})
-    file(WRITE ${submodules_headers_file_name} "/* This file includes all the submodule CXX files */\n")
-    file(WRITE ${submodule_init_cxx_file_name} "/* This file includes the submodule init code. */\n")
-    file(WRITE ${pybind_plugin_list_file} "SIMPL\n")
-
-    pybind11_add_module(${SIMPL_PY_MODULE_NAME}
-      ${submodules_headers_file_name}
-      ${submodule_init_cxx_file_name}
-      ${pybind_module_file_name}
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h"
-      )
-    set_source_files_properties("${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/DerivedSharedPointerClassInit.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/PluginModuleCodeTemplate.in.cpp"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/Pybind11CustomTypeCasts.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/Pybind11TopMatter.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SIMPLModuleCodeTemplate.in.cpp"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SharedPointerClassInit.in.h"
-      "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Pybind11/Templates/SimpleClassInit.in.h"
-      PROPERTIES  
-        HEADER_FILE_ONLY ON
-        SKIP_AUTOMOC ON
-    )
-    
-    set_source_files_properties("${submodules_headers_file_name}"
-        PROPERTIES  
-            GENERATED TRUE
-            HEADER_FILE_ONLY ON
-            SKIP_AUTOMOC ON
-    )
-    
-    target_link_libraries(${SIMPL_PY_MODULE_NAME} 
-                            LINK_PRIVATE pybind11::module SIMPLib
-    )
-
-    set (SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR})
-    if (SIMPL_ENABLE_ANACONDA_PACKAGE)
-      #message(STATUS "${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${SIMPL_PYTHON_MODULE_NAME}")
-      #message(STATUS "SIMPL_ENABLE_ANACONDA_PACKAGE: ON <================>")
-      set (SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY ${SIMPL_ANACONDA_OUTPUT_DIR}/${PYTHON_SITE_PACKAGES_NAME}/${SIMPL_PYTHON_MODULE_NAME})
-    endif()
-
-  
-    set_target_properties(${SIMPL_PY_MODULE_NAME} PROPERTIES 
-      PREFIX "${PYTHON_MODULE_PREFIX}"
-      SUFFIX "${PYTHON_MODULE_EXTENSION}"
-      OUTPUT_NAME ${SIMPL_PY_MODULE_NAME}
-      LIBRARY_OUTPUT_DIRECTORY ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
-      LIBRARY_OUTPUT_DIRECTORY_DEBUG ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
-      LIBRARY_OUTPUT_DIRECTORY_RELEASE ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
-      LIBRARY_OUTPUT_DIRECTORY_RELWDEBUG ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
-      LIBRARY_OUTPUT_DIRECTORY_RELMINSIZE ${SIMPL_PY_MODULE_LIBRARY_OUTPUT_DIRECTORY}
-      ARCHIVE_OUTPUT_NAME ${PYTHON_MODULE_PREFIX}${SIMPL_PY_MODULE_NAME}${PYTHON_MODULE_EXTENSION}
-      PDB_NAME ${PYTHON_MODULE_PREFIX}${SIMPL_PY_MODULE_NAME}${PYTHON_MODULE_EXTENSION}
-    )
-    set_target_properties(${SIMPL_PY_MODULE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
-    target_compile_features(${SIMPL_PY_MODULE_NAME} PRIVATE cxx_local_type_template_args)
-
-    if(WIN32)
-      # create a list of files to copy
-      set (PLUGIN_DEBUG_EXTENSION $<$<CONFIG:Debug>:"_debug">)
-      set (QT_DEBUG_EXTENSION $<$<CONFIG:Debug>:"d">)
-      set (OTHER_DEBUG_EXTENSION $<$<CONFIG:Debug>:"_D">)
-    endif()
-
-    # Copy all necessary content from the CMake output directory to the "egg" directory
-    # if (SIMPL_ENABLE_ANACONDA_PACKAGE)
-    #   get_property(SIMPL_ANACONDA_OUTPUT_DIR GLOBAL PROPERTY SIMPL_ANACONDA_OUTPUT_DIR)
-    #   add_custom_command(TARGET ${SIMPL_PY_MODULE_NAME} 
-    #         POST_BUILD 
-    #         COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR} ${SIMPL_ANACONDA_OUTPUT_DIR}/package/dream3d)
-    # endif()
-    
-  else()
-
-    file(APPEND ${submodules_headers_file_name} "\n /* Pybind11 Init Code for ${ARGS_MODULE_NAME} */\n")
-    file(APPEND ${submodules_headers_file_name} "#include \"${pybind_module_file_name}\"\n")
-    file(APPEND ${submodule_init_cxx_file_name} "  Init_${pybind_module_name}(m);\n")
-    target_sources(${SIMPL_PY_MODULE_NAME} PRIVATE ${pybind_module_file_name})
-    set_source_files_properties("${pybind_module_file_name}"
-                                PROPERTIES  
-                                  GENERATED TRUE
-                                  HEADER_FILE_ONLY TRUE
-                                  SKIP_AUTOMOC TRUE
-    )
-    file(APPEND ${pybind_plugin_list_file} "${ARGS_MODULE_NAME}\n")
-
-  endif() 
-  #---------------------------------------------------------------------
-  
-  target_include_directories(${SIMPL_PY_MODULE_NAME} PUBLIC
-    #$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${SIMPLib_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${SIMPLProj_BINARY_DIR}/Wrapping/PythonCore>
-    $<BUILD_INTERFACE:${${pybind_module_name}_BINARY_DIR}>
-    )
-  target_link_libraries(${SIMPL_PY_MODULE_NAME} 
-                          LINK_PUBLIC ${ARGS_MODULE_LINK_LIBRARIES}
-  )
-
-  if(SIMPL_USE_ITK)
-    ## YOU MUST INCLUDE THIS FILE TO USE ITK !!!
-    ## Then do not forget to add "${ITK_LIBRARIES}" to the target_link_libraries below
-    include( ${CMP_SOURCE_DIR}/ITKSupport/IncludeITK.cmake)
-    target_include_directories(${SIMPL_PY_MODULE_NAME} PUBLIC $<BUILD_INTERFACE:${ITK_INCLUDE_DIRS}>)
-    target_link_libraries(${SIMPL_PY_MODULE_NAME} LINK_PRIVATE ${ITK_LIBRARIES})
-  endif()
-
-  if(TARGET ${SIMPL_PY_MODULE_NAME} AND TARGET ${pybind_module_name}CreatePythonBindings)
-    add_dependencies(${SIMPL_PY_MODULE_NAME} ${pybind_module_name}CreatePythonBindings)
-  endif()
-
-  
-  if(0)
-    set(install_dir "bin")
-    set(lib_install_dir "lib")
-
-    if(APPLE)
-      get_property(DREAM3D_PACKAGE_DEST_PREFIX GLOBAL PROPERTY DREAM3D_PACKAGE_DEST_PREFIX)
-      set(install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}bin")
-      set(lib_install_dir "${DREAM3D_PACKAGE_DEST_PREFIX}lib")
-    elseif(WIN32)
-      set(install_dir ".")
-      set(lib_install_dir ".")
-    endif()
-
-
-    INSTALL(TARGETS ${SIMPL_PY_MODULE_NAME}
-        COMPONENT Applications
-        RUNTIME DESTINATION ${install_dir}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-        LIBRARY DESTINATION ${lib_install_dir}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-        ARCHIVE DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
-        BUNDLE DESTINATION "."
-    )
-  endif()
-
-  if(ARGS_VERBOSE)
-    message(STATUS "[${ARGS_MODULE_NAME}] ## End CreatePybind11Module ")
-  endif()
-
-endfunction()
-
-
diff --git a/Wrapping/Python/Pybind11/python_test_driver.bat b/Wrapping/Python/Pybind11/python_test_driver.bat
deleted file mode 100644
index 4e023c47a2..0000000000
--- a/Wrapping/Python/Pybind11/python_test_driver.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-@echo off
-
-@echo "Python Test Starting"
-@echo "    [@test@]"
-
-@set ANACONDA_DIR=@ANACONDA_DIR@
-@echo "ANACONDA_DIR: %ANACONDA_DIR%"
-
-@set PATH=%PATH%;%ANACONDA_DIR%;%ANACONDA_DIR%\Scripts
-
-
-@set ANACONDA_ENVIRONMENT_NAME=@ANACONDA_ENVIRONMENT_NAME@
-@echo "Activating anaconda %ANACONDA_ENVIRONMENT_NAME% Environment... "
-CALL %ANACONDA_DIR%\condabin\conda.bat activate %ANACONDA_ENVIRONMENT_NAME%
-
-@set PYTHONPATH=@SIMPL_ANACONDA_OUTPUT_DIR@\@PYTHON_SITE_PACKAGES_NAME@
-@echo "PYTHONPATH: %PYTHONPATH%"
-cd %PYTHONPATH%
-
-@set PYTHON_TEST_INPUT_DIR=@PYTHON_TEST_INPUT_DIR@
-@echo "PYTHON_TEST_INPUT_DIR: @PYTHON_TEST_INPUT_DIR@"
-
-@echo "PYTHON_EXECUTABLE: @PYTHON_EXECUTABLE@"
-"@PYTHON_EXECUTABLE@" "%PYTHON_TEST_INPUT_DIR%\@test@.py"
diff --git a/Wrapping/Python/Pybind11/python_test_driver.sh b/Wrapping/Python/Pybind11/python_test_driver.sh
deleted file mode 100755
index b35f957e34..0000000000
--- a/Wrapping/Python/Pybind11/python_test_driver.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-#set -e
-
-echo "[@test@] SIMPL Python Test Starting"
-
-ANACONDA_DIR=@ANACONDA_DIR@
-# !! Contents within this block are managed by 'conda init' !!
-__conda_setup="$(CONDA_REPORT_ERRORS=false '${ANACONDA_DIR}/bin/conda' shell.bash hook 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    \eval "$__conda_setup"
-else
-    if [ -f "${ANACONDA_DIR}/etc/profile.d/conda.sh" ]; then
-        . "${ANACONDA_DIR}/etc/profile.d/conda.sh"
-        CONDA_CHANGEPS1=false conda activate base
-    else
-        \export PATH="${ANACONDA_DIR}/bin:$PATH"
-    fi
-fi
-unset __conda_setup
-
-export PYTHONPATH="@SIMPL_ANACONDA_OUTPUT_DIR@/@PYTHON_SITE_PACKAGES_NAME@"
-cd "$PYTHONPATH"
-echo "PYTHONPATH: $PYTHONPATH"
-
-PYTHON_TEST_INPUT_DIR="@PYTHON_TEST_INPUT_DIR@"
-
-"@PYTHON_EXECUTABLE@" "${PYTHON_TEST_INPUT_DIR}/@test@.py"
-
-if [ $? -eq 0 ]
-then
-  echo "[@test@] Success"
-  exit 0
-else
-  echo "[@test@] Failure" >&2
-  exit 1
-fi
diff --git a/Wrapping/Python/Pybind11/setup.py b/Wrapping/Python/Pybind11/setup.py
deleted file mode 100644
index 145f484b41..0000000000
--- a/Wrapping/Python/Pybind11/setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from setuptools import setup
-
-setup(name='simpl_dirs',
-      version='0.1',
-      description='Python modules for the SIMP/DREAM3D libraries.',
-      url='http://github.com/bluequartzsoftware/SIMPL',
-      author='BlueQuartz Software',
-      author_email='info@bluequartz.net',
-      license='BSD',
-      packages=['simpl_dirs', 'simpl_common'],
-      zip_safe=False)

From 798dc1db5f940e2091cfc8f94aaaa85c85e13997 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Fri, 16 Apr 2021 09:30:05 -0400
Subject: [PATCH 369/397] Fixed dimension order in initialize_data.py

* Changed name to Initialize Data (Python)

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Python/initialize_data.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/SIMPLib/Python/initialize_data.py b/Source/SIMPLib/Python/initialize_data.py
index 40dd9be30d..c305314647 100644
--- a/Source/SIMPLib/Python/initialize_data.py
+++ b/Source/SIMPLib/Python/initialize_data.py
@@ -102,7 +102,7 @@ def sub_group_name() -> str:
 
   @staticmethod
   def human_label() -> str:
-    return 'Initialize Data Python'
+    return 'Initialize Data (Python)'
 
   @staticmethod
   def version() -> str:
@@ -209,7 +209,7 @@ def _execute_impl(self, dca: DataContainerArray, delegate: Union[FilterDelegateC
     udims = dc.Geometry.getDimensions()
     am = dca.getAttributeMatrix(path)
 
-    dims = [np.int64(udims[0]), np.int64(udims[1]), np.int64(udims[2])]
+    dims = [np.int64(udims[2]), np.int64(udims[1]), np.int64(udims[0])]
 
     data_arrays = [am.getAttributeArray(array_path.DataArrayName) for array_path in self.cell_attribute_matrix_paths]
 

From d0937f3911817029685dc57114c152cf15503a38 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 16 Apr 2021 15:10:27 -0400
Subject: [PATCH 370/397] Fix bug where warning codes were not passed up
 through the chain correctly.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/Messages/AbstractWarningMessage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/SIMPLib/Messages/AbstractWarningMessage.cpp b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
index 815117c07d..328efd67b4 100644
--- a/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
+++ b/Source/SIMPLib/Messages/AbstractWarningMessage.cpp
@@ -37,6 +37,7 @@ AbstractWarningMessage::AbstractWarningMessage() = default;
 
 AbstractWarningMessage::AbstractWarningMessage(const QString& msgText, int32_t code)
 : AbstractMessage(msgText)
+, m_Code(code)
 {
 }
 

From 5bd2f268aeac81dbcc69595c77e797878300fa4f Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 19 Apr 2021 15:52:03 -0400
Subject: [PATCH 371/397] Added DataArray<bool> to registered pybind11 types

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/pySIMPLBody.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index 11ab595f4a..c031270f3f 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -13,6 +13,8 @@ registerDataArray<uint64_t>(mod, "UInt64Array");
 registerDataArray<float>(mod, "FloatArray");
 registerDataArray<double>(mod, "DoubleArray");
 
+registerDataArray<bool>(mod, "BoolArray");
+
 registerSIMPLArray<float, 2>(mod, "FloatVec2");
 registerSIMPLArray<int32_t, 2>(mod, "IntVec2");
 registerSIMPLArray<size_t, 2>(mod, "SizeVec2");

From 1c753c0db11441aa790a871772da115a5814b7e8 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 19 Apr 2021 16:31:01 -0400
Subject: [PATCH 372/397] Added abstract base class AbstractIOFilterParameter

* InputFileFilterParameter, InputPathFilterParameter,
OutputFileFilterParameter, and OutputPathFilterParameter now inherit
from AbstractIOFilterParameter
* Moved common functionality to AbstractIOFilterParameter
* The InputPathFilterParameter and OutputPathFilterParameter no
longer take file extension or type as they were unused

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |   2 +-
 .../AbstractIOFilterParameter.cpp             |  85 +++++++++++
 .../AbstractIOFilterParameter.h               |  98 +++++++++++++
 .../InputFileFilterParameter.cpp              |  51 -------
 .../InputFileFilterParameter.h                |  63 ++-------
 .../InputPathFilterParameter.cpp              |  80 +----------
 .../InputPathFilterParameter.h                |  87 ++----------
 .../OutputFileFilterParameter.cpp             |  51 -------
 .../OutputFileFilterParameter.h               |  89 +++---------
 .../OutputPathFilterParameter.cpp             |  80 +----------
 .../OutputPathFilterParameter.h               |  87 ++----------
 .../SIMPLib/FilterParameters/SourceList.cmake |   2 +
 Source/SIMPLib/TestFilters/GenericExample.cpp |   2 +-
 .../AbstractIOFileWidget.cpp                  |  42 +++---
 .../AbstractIOFileWidget.h                    |   4 +-
 .../InputPathWidget.cpp                       |   7 +-
 .../MultiInputFileWidget.h                    |   2 +-
 .../OutputPathWidget.cpp                      |   7 +-
 .../Widgets/FilterInputWidget.cpp             | 132 ------------------
 .../SVWidgetsLib/Widgets/FilterInputWidget.h  |   6 -
 20 files changed, 268 insertions(+), 709 deletions(-)
 create mode 100644 Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
 create mode 100644 Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h

diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index d5b7266380..9546e31c75 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -159,7 +159,7 @@ void WriteASCIIData::setupFilterParameters()
   }
 
   // Multiple File Output
-  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Category::Parameter, WriteASCIIData, "*", "*", 0));
+  parameters.push_back(SIMPL_NEW_OUTPUT_PATH_FP("Output Path", OutputPath, FilterParameter::Category::Parameter, WriteASCIIData, 0));
   parameters.push_back(SIMPL_NEW_STRING_FP("File Extension", FileExtension, FilterParameter::Category::Parameter, WriteASCIIData, 0));
   parameters.push_back(SIMPL_NEW_INTEGER_FP("Maximum Tuples Per Line", MaxValPerLine, FilterParameter::Category::Parameter, WriteASCIIData, 0));
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
new file mode 100644
index 0000000000..2a821d5f28
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
@@ -0,0 +1,85 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
+
+#include <QtCore/QJsonObject>
+
+// -----------------------------------------------------------------------------
+AbstractIOFilterParameter::AbstractIOFilterParameter() = default;
+
+// -----------------------------------------------------------------------------
+void AbstractIOFilterParameter::readJson(const QJsonObject& json)
+{
+  QJsonValue jsonValue = json[getPropertyName()];
+  if(jsonValue.isUndefined())
+  {
+    jsonValue = json[getLegacyPropertyName()];
+  }
+  if(!jsonValue.isUndefined() && m_SetterCallback)
+  {
+    m_SetterCallback(jsonValue.toString(""));
+  }
+}
+
+// -----------------------------------------------------------------------------
+void AbstractIOFilterParameter::writeJson(QJsonObject& json)
+{
+  if(m_GetterCallback)
+  {
+    json[getPropertyName()] = m_GetterCallback();
+  }
+}
+
+// -----------------------------------------------------------------------------
+void AbstractIOFilterParameter::setSetterCallback(const SetterCallbackType& setter)
+{
+  m_SetterCallback = setter;
+}
+
+// -----------------------------------------------------------------------------
+void AbstractIOFilterParameter::setGetterCallback(const GetterCallbackType& getter)
+{
+  m_GetterCallback = getter;
+}
+
+// -----------------------------------------------------------------------------
+AbstractIOFilterParameter::SetterCallbackType AbstractIOFilterParameter::getSetterCallback() const
+{
+  return m_SetterCallback;
+}
+
+// -----------------------------------------------------------------------------
+AbstractIOFilterParameter::GetterCallbackType AbstractIOFilterParameter::getGetterCallback() const
+{
+  return m_GetterCallback;
+}
diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
new file mode 100644
index 0000000000..ecf7f0685d
--- /dev/null
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
@@ -0,0 +1,98 @@
+/* ============================================================================
+ * Copyright (c) 2021 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the followig contracts:
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#pragma once
+
+#include "SIMPLib/FilterParameters/FilterParameter.h"
+
+/**
+ * @class AbstractIOFilterParameter AbstractIOFilterParameter.h SIMPLib/FilterParameters/AbstractIOFilterParameter.h
+ * @brief Base class for file/path input/output filter parameters
+ */
+class SIMPLib_EXPORT AbstractIOFilterParameter : public FilterParameter
+{
+public:
+  using SetterCallbackType = std::function<void(QString)>;
+  using GetterCallbackType = std::function<QString(void)>;
+
+  ~AbstractIOFilterParameter() override = default;
+
+  AbstractIOFilterParameter(const AbstractIOFilterParameter&) = delete;
+  AbstractIOFilterParameter(AbstractIOFilterParameter&&) = delete;
+  AbstractIOFilterParameter& operator=(const AbstractIOFilterParameter&) = delete;
+  AbstractIOFilterParameter& operator=(AbstractIOFilterParameter&&) = delete;
+
+  /**
+   * @brief readJson
+   * @return
+   */
+  void readJson(const QJsonObject& json) override;
+
+  /**
+   * @brief writeJson
+   * @return
+   */
+  void writeJson(QJsonObject& json) override;
+
+  /**
+   * @brief Sets setter
+   * @param setter
+   * @return
+   */
+  void setSetterCallback(const SetterCallbackType& setter);
+
+  /**
+   * @brief Sets getter
+   * @param getter
+   * @return
+   */
+  void setGetterCallback(const GetterCallbackType& getter);
+
+  /**
+   * @brief Returns setter
+   * @return
+   */
+  SetterCallbackType getSetterCallback() const;
+
+  /**
+   * @brief Returns getter
+   * @return
+   */
+  GetterCallbackType getGetterCallback() const;
+
+protected:
+  AbstractIOFilterParameter();
+
+private:
+  SetterCallbackType m_SetterCallback;
+  GetterCallbackType m_GetterCallback;
+};
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index 25d2e47290..faf62359b6 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -78,33 +78,6 @@ QString InputFileFilterParameter::getWidgetType() const
   return QString("InputFileWidget");
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InputFileFilterParameter::readJson(const QJsonObject& json)
-{
-  QJsonValue jsonValue = json[getPropertyName()];
-  if(jsonValue.isUndefined())
-  {
-    jsonValue = json[getLegacyPropertyName()];
-  }
-  if(!jsonValue.isUndefined() && m_SetterCallback)
-  {
-    m_SetterCallback(jsonValue.toString(""));
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InputFileFilterParameter::writeJson(QJsonObject& json)
-{
-  if(m_GetterCallback)
-  {
-    json[getPropertyName()] = m_GetterCallback();
-  }
-}
-
 // -----------------------------------------------------------------------------
 InputFileFilterParameter::Pointer InputFileFilterParameter::NullPointer()
 {
@@ -153,27 +126,3 @@ QString InputFileFilterParameter::getFileType() const
 {
   return m_FileType;
 }
-
-// -----------------------------------------------------------------------------
-void InputFileFilterParameter::setSetterCallback(const InputFileFilterParameter::SetterCallbackType& value)
-{
-  m_SetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-InputFileFilterParameter::SetterCallbackType InputFileFilterParameter::getSetterCallback() const
-{
-  return m_SetterCallback;
-}
-
-// -----------------------------------------------------------------------------
-void InputFileFilterParameter::setGetterCallback(const InputFileFilterParameter::GetterCallbackType& value)
-{
-  m_GetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-InputFileFilterParameter::GetterCallbackType InputFileFilterParameter::getGetterCallback() const
-{
-  return m_GetterCallback;
-}
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index 761874f432..df0d564e29 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -39,7 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_INPUT_FILE_FP This macro is a short-form way of instantiating an instance of
@@ -60,7 +60,7 @@
  * @brief The InputFileFilterParameter class is used by filters to instantiate an InputFileWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, an InputFileWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
+class SIMPLib_EXPORT InputFileFilterParameter : public AbstractIOFilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
@@ -76,6 +76,7 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer();
 
   static Pointer New();
@@ -84,14 +85,12 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    * @brief Returns the name of the class for InputFileFilterParameter
    */
   QString getNameOfClass() const override;
+
   /**
    * @brief Returns the name of the class for InputFileFilterParameter
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(QString)>;
-  using GetterCallbackType = std::function<QString(void)>;
-
   /**
    * @brief New This function instantiates an instance of the InputFileFilterParameter. Although this function is available to be used,
    * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_FILE_FP(...) macro at the top of this file.
@@ -102,11 +101,11 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
    * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
+   * that this FilterParameter subclass represents.
    * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @param fileExtension The possible file extensions that this InputFileWidget accepts.
-  * @param fileType The possible file types that this InputFileWidget accepts.
+   * that this FilterParameter subclass represents.
+   * @param fileExtension The possible file extensions that this InputFileWidget accepts.
+   * @param fileType The possible file types that this InputFileWidget accepts.
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
@@ -119,6 +118,7 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    * @brief Setter property for FileExtension
    */
   void setFileExtension(const QString& value);
+
   /**
    * @brief Getter property for FileExtension
    * @return Value of FileExtension
@@ -129,6 +129,7 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    * @brief Setter property for FileType
    */
   void setFileType(const QString& value);
+
   /**
    * @brief Getter property for FileType
    * @return Value of FileType
@@ -142,48 +143,6 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
    */
   QString getWidgetType() const override;
 
-  /**
-   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-   * @param json The QJsonObject that the filter parameter reads from.
-   */
-  void readJson(const QJsonObject& json) override;
-
-  /**
-   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-   * @param json The QJsonObject that the filter parameter writes to.
-   */
-  void writeJson(QJsonObject& json) override;
-
-  /**
-   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * from the filter parameter.
-   */
-  /**
-   * @brief Setter property for SetterCallback
-   */
-  void setSetterCallback(const InputFileFilterParameter::SetterCallbackType& value);
-  /**
-   * @brief Getter property for SetterCallback
-   * @return Value of SetterCallback
-   */
-  InputFileFilterParameter::SetterCallbackType getSetterCallback() const;
-
-  /**
-   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * @return The GetterCallback
-   */
-  /**
-   * @brief Setter property for GetterCallback
-   */
-  void setGetterCallback(const InputFileFilterParameter::GetterCallbackType& value);
-  /**
-   * @brief Getter property for GetterCallback
-   * @return Value of GetterCallback
-   */
-  InputFileFilterParameter::GetterCallbackType getGetterCallback() const;
-
 protected:
   /**
    * @brief InputFileFilterParameter The default constructor.  It is protected because this
@@ -200,6 +159,4 @@ class SIMPLib_EXPORT InputFileFilterParameter : public FilterParameter
 private:
   QString m_FileExtension = {};
   QString m_FileType = {};
-  InputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
-  InputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index ef465ab832..f3e99f0362 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -49,16 +49,13 @@ InputPathFilterParameter::~InputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 InputPathFilterParameter::Pointer InputPathFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                   const QString& fileType, int groupIndex)
+                                                                   const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   InputPathFilterParameter::Pointer ptr = InputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
   ptr->setDefaultValue(defaultValue);
   ptr->setCategory(category);
-  ptr->setFileExtension(fileExtension);
-  ptr->setFileType(fileType);
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
   ptr->setGetterCallback(getterCallback);
@@ -74,33 +71,6 @@ QString InputPathFilterParameter::getWidgetType() const
   return QString("InputPathWidget");
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::readJson(const QJsonObject& json)
-{
-  QJsonValue jsonValue = json[getPropertyName()];
-  if(jsonValue.isUndefined())
-  {
-    jsonValue = json[getLegacyPropertyName()];
-  }
-  if(!jsonValue.isUndefined() && m_SetterCallback)
-  {
-    m_SetterCallback(jsonValue.toString(""));
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::writeJson(QJsonObject& json)
-{
-  if(m_GetterCallback)
-  {
-    json[getPropertyName()] = m_GetterCallback();
-  }
-}
-
 // -----------------------------------------------------------------------------
 InputPathFilterParameter::Pointer InputPathFilterParameter::NullPointer()
 {
@@ -125,51 +95,3 @@ QString InputPathFilterParameter::ClassName()
 {
   return QString("InputPathFilterParameter");
 }
-
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::setFileExtension(const QString& value)
-{
-  m_FileExtension = value;
-}
-
-// -----------------------------------------------------------------------------
-QString InputPathFilterParameter::getFileExtension() const
-{
-  return m_FileExtension;
-}
-
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::setFileType(const QString& value)
-{
-  m_FileType = value;
-}
-
-// -----------------------------------------------------------------------------
-QString InputPathFilterParameter::getFileType() const
-{
-  return m_FileType;
-}
-
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::setSetterCallback(const InputPathFilterParameter::SetterCallbackType& value)
-{
-  m_SetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-InputPathFilterParameter::SetterCallbackType InputPathFilterParameter::getSetterCallback() const
-{
-  return m_SetterCallback;
-}
-
-// -----------------------------------------------------------------------------
-void InputPathFilterParameter::setGetterCallback(const InputPathFilterParameter::GetterCallbackType& value)
-{
-  m_GetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-InputPathFilterParameter::GetterCallbackType InputPathFilterParameter::getGetterCallback() const
-{
-  return m_GetterCallback;
-}
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index 0f5d2aafd5..6431573b4b 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -39,7 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_INPUT_PATH_FP This macro is a short-form way of instantiating an instance of
@@ -60,7 +60,7 @@
  * @brief The InputPathFilterParameter class is used by filters to instantiate an InputPathWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, an InputPathWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
+class SIMPLib_EXPORT InputPathFilterParameter : public AbstractIOFilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
@@ -76,6 +76,7 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer();
 
   static Pointer New();
@@ -84,14 +85,12 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
    * @brief Returns the name of the class for InputPathFilterParameter
    */
   QString getNameOfClass() const override;
+
   /**
    * @brief Returns the name of the class for InputPathFilterParameter
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(QString)>;
-  using GetterCallbackType = std::function<QString(void)>;
-
   /**
    * @brief New This function instantiates an instance of the InputPathFilterParameter. Although this function is available to be used,
    * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_INPUT_PATH_FP(...) macro at the top of this file.
@@ -102,39 +101,19 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
    * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
+   * that this FilterParameter subclass represents.
    * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @param fileExtension The possible file extensions that this InputPathWidget accepts.
-  * @param fileType The possible file types that this InputPathWidget accepts.
+   * that this FilterParameter subclass represents.
+   * @param fileExtension The possible file extensions that this InputPathWidget accepts.
+   * @param fileType The possible file types that this InputPathWidget accepts.
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~InputPathFilterParameter() override;
 
-  /**
-   * @brief Setter property for FileExtension
-   */
-  void setFileExtension(const QString& value);
-  /**
-   * @brief Getter property for FileExtension
-   * @return Value of FileExtension
-   */
-  QString getFileExtension() const;
-
-  /**
-   * @brief Setter property for FileType
-   */
-  void setFileType(const QString& value);
-  /**
-   * @brief Getter property for FileType
-   * @return Value of FileType
-   */
-  QString getFileType() const;
-
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
@@ -142,48 +121,6 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
    */
   QString getWidgetType() const override;
 
-  /**
-   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-   * @param json The QJsonObject that the filter parameter reads from.
-   */
-  void readJson(const QJsonObject& json) override;
-
-  /**
-   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-   * @param json The QJsonObject that the filter parameter writes to.
-   */
-  void writeJson(QJsonObject& json) override;
-
-  /**
-   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * from the filter parameter.
-   */
-  /**
-   * @brief Setter property for SetterCallback
-   */
-  void setSetterCallback(const InputPathFilterParameter::SetterCallbackType& value);
-  /**
-   * @brief Getter property for SetterCallback
-   * @return Value of SetterCallback
-   */
-  InputPathFilterParameter::SetterCallbackType getSetterCallback() const;
-
-  /**
-   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * @return The GetterCallback
-   */
-  /**
-   * @brief Setter property for GetterCallback
-   */
-  void setGetterCallback(const InputPathFilterParameter::GetterCallbackType& value);
-  /**
-   * @brief Getter property for GetterCallback
-   * @return Value of GetterCallback
-   */
-  InputPathFilterParameter::GetterCallbackType getGetterCallback() const;
-
 protected:
   /**
    * @brief InputPathFilterParameter The default constructor.  It is protected because this
@@ -196,10 +133,4 @@ class SIMPLib_EXPORT InputPathFilterParameter : public FilterParameter
   InputPathFilterParameter(InputPathFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   InputPathFilterParameter& operator=(const InputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   InputPathFilterParameter& operator=(InputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-private:
-  QString m_FileExtension = {};
-  QString m_FileType = {};
-  InputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
-  InputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index dceea91045..8daea2311c 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -74,33 +74,6 @@ QString OutputFileFilterParameter::getWidgetType() const
   return QString("OutputFileWidget");
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void OutputFileFilterParameter::readJson(const QJsonObject& json)
-{
-  QJsonValue jsonValue = json[getPropertyName()];
-  if(jsonValue.isUndefined())
-  {
-    jsonValue = json[getLegacyPropertyName()];
-  }
-  if(!jsonValue.isUndefined() && m_SetterCallback)
-  {
-    m_SetterCallback(jsonValue.toString(""));
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void OutputFileFilterParameter::writeJson(QJsonObject& json)
-{
-  if(m_GetterCallback)
-  {
-    json[getPropertyName()] = m_GetterCallback();
-  }
-}
-
 // -----------------------------------------------------------------------------
 OutputFileFilterParameter::Pointer OutputFileFilterParameter::NullPointer()
 {
@@ -149,27 +122,3 @@ QString OutputFileFilterParameter::getFileType() const
 {
   return m_FileType;
 }
-
-// -----------------------------------------------------------------------------
-void OutputFileFilterParameter::setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value)
-{
-  m_SetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-OutputFileFilterParameter::SetterCallbackType OutputFileFilterParameter::getSetterCallback() const
-{
-  return m_SetterCallback;
-}
-
-// -----------------------------------------------------------------------------
-void OutputFileFilterParameter::setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value)
-{
-  m_GetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-OutputFileFilterParameter::GetterCallbackType OutputFileFilterParameter::getGetterCallback() const
-{
-  return m_GetterCallback;
-}
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index 608749921c..bd6ce7938f 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -39,7 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_OUTPUT_FILE_FP This macro is a short-form way of instantiating an instance of
@@ -60,7 +60,7 @@
  * @brief The OutputFileFilterParameter class is used by filters to instantiate an OutputFileWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, a OutputFileWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
+class SIMPLib_EXPORT OutputFileFilterParameter : public AbstractIOFilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
@@ -76,6 +76,7 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer();
 
   static Pointer New();
@@ -84,32 +85,30 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
    * @brief Returns the name of the class for OutputFileFilterParameter
    */
   QString getNameOfClass() const override;
+
   /**
    * @brief Returns the name of the class for OutputFileFilterParameter
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(QString)>;
-  using GetterCallbackType = std::function<QString(void)>;
-
   /**
- * @brief New This function instantiates an instance of the OutputFileFilterParameter. Although this function is available to be used,
- * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_FILE_FP(...) macro at the top of this file.
-
- * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
- * @param propertyName The internal property name for this filter parameter.
- * @param defaultValue The value that this filter parameter will be initialized to by default.
- * @param category The category for the filter parameter in the DREAM.3D user interface.  There
- * are three categories: Parameter, Required Arrays, and Created Arrays.
- * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-* that this FilterParameter subclass represents.
- * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-* that this FilterParameter subclass represents.
-* @param fileExtension The possible file extensions that this OutputFileWidget accepts.
-* @param fileType The possible file types that this OutputFileWidget accepts.
- * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
- * @return
- */
+   * @brief New This function instantiates an instance of the OutputFileFilterParameter. Although this function is available to be used,
+   * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_FILE_FP(...) macro at the top of this file.
+
+   * @param humanLabel The name that the users of DREAM.3D see for this filter parameter
+   * @param propertyName The internal property name for this filter parameter.
+   * @param defaultValue The value that this filter parameter will be initialized to by default.
+   * @param category The category for the filter parameter in the DREAM.3D user interface.  There
+   * are three categories: Parameter, Required Arrays, and Created Arrays.
+   * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
+   * that this FilterParameter subclass represents.
+   * @param fileExtension The possible file extensions that this OutputFileWidget accepts.
+   * @param fileType The possible file types that this OutputFileWidget accepts.
+   * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
+   * @return
+   */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
                         const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
 
@@ -119,6 +118,7 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
    * @brief Setter property for FileExtension
    */
   void setFileExtension(const QString& value);
+
   /**
    * @brief Getter property for FileExtension
    * @return Value of FileExtension
@@ -129,6 +129,7 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
    * @brief Setter property for FileType
    */
   void setFileType(const QString& value);
+
   /**
    * @brief Getter property for FileType
    * @return Value of FileType
@@ -142,48 +143,6 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
    */
   QString getWidgetType() const override;
 
-  /**
-   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-   * @param json The QJsonObject that the filter parameter reads from.
-   */
-  void readJson(const QJsonObject& json) override;
-
-  /**
-   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-   * @param json The QJsonObject that the filter parameter writes to.
-   */
-  void writeJson(QJsonObject& json) override;
-
-  /**
-   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * from the filter parameter.
-   */
-  /**
-   * @brief Setter property for SetterCallback
-   */
-  void setSetterCallback(const OutputFileFilterParameter::SetterCallbackType& value);
-  /**
-   * @brief Getter property for SetterCallback
-   * @return Value of SetterCallback
-   */
-  OutputFileFilterParameter::SetterCallbackType getSetterCallback() const;
-
-  /**
-   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * @return The GetterCallback
-   */
-  /**
-   * @brief Setter property for GetterCallback
-   */
-  void setGetterCallback(const OutputFileFilterParameter::GetterCallbackType& value);
-  /**
-   * @brief Getter property for GetterCallback
-   * @return Value of GetterCallback
-   */
-  OutputFileFilterParameter::GetterCallbackType getGetterCallback() const;
-
 protected:
   /**
    * @brief OutputFileFilterParameter The default constructor.  It is protected because this
@@ -200,6 +159,4 @@ class SIMPLib_EXPORT OutputFileFilterParameter : public FilterParameter
 private:
   QString m_FileExtension = {};
   QString m_FileType = {};
-  OutputFileFilterParameter::SetterCallbackType m_SetterCallback = {};
-  OutputFileFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index 65fbca716f..e4a1c8fcf8 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -49,16 +49,13 @@ OutputPathFilterParameter::~OutputPathFilterParameter() = default;
 //
 // -----------------------------------------------------------------------------
 OutputPathFilterParameter::Pointer OutputPathFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category,
-                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, const QString& fileExtension,
-                                                                     const QString& fileType, int groupIndex)
+                                                                     const SetterCallbackType& setterCallback, const GetterCallbackType& getterCallback, int groupIndex)
 {
   OutputPathFilterParameter::Pointer ptr = OutputPathFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
   ptr->setPropertyName(propertyName);
   ptr->setDefaultValue(defaultValue);
   ptr->setCategory(category);
-  ptr->setFileExtension(fileExtension);
-  ptr->setFileType(fileType);
   ptr->setGroupIndex(groupIndex);
   ptr->setSetterCallback(setterCallback);
   ptr->setGetterCallback(getterCallback);
@@ -74,33 +71,6 @@ QString OutputPathFilterParameter::getWidgetType() const
   return QString("OutputPathWidget");
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::readJson(const QJsonObject& json)
-{
-  QJsonValue jsonValue = json[getPropertyName()];
-  if(jsonValue.isUndefined())
-  {
-    jsonValue = json[getLegacyPropertyName()];
-  }
-  if(!jsonValue.isUndefined() && m_SetterCallback)
-  {
-    m_SetterCallback(jsonValue.toString(""));
-  }
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::writeJson(QJsonObject& json)
-{
-  if(m_GetterCallback)
-  {
-    json[getPropertyName()] = m_GetterCallback();
-  }
-}
-
 // -----------------------------------------------------------------------------
 OutputPathFilterParameter::Pointer OutputPathFilterParameter::NullPointer()
 {
@@ -125,51 +95,3 @@ QString OutputPathFilterParameter::ClassName()
 {
   return QString("OutputPathFilterParameter");
 }
-
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::setFileExtension(const QString& value)
-{
-  m_FileExtension = value;
-}
-
-// -----------------------------------------------------------------------------
-QString OutputPathFilterParameter::getFileExtension() const
-{
-  return m_FileExtension;
-}
-
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::setFileType(const QString& value)
-{
-  m_FileType = value;
-}
-
-// -----------------------------------------------------------------------------
-QString OutputPathFilterParameter::getFileType() const
-{
-  return m_FileType;
-}
-
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::setSetterCallback(const OutputPathFilterParameter::SetterCallbackType& value)
-{
-  m_SetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-OutputPathFilterParameter::SetterCallbackType OutputPathFilterParameter::getSetterCallback() const
-{
-  return m_SetterCallback;
-}
-
-// -----------------------------------------------------------------------------
-void OutputPathFilterParameter::setGetterCallback(const OutputPathFilterParameter::GetterCallbackType& value)
-{
-  m_GetterCallback = value;
-}
-
-// -----------------------------------------------------------------------------
-OutputPathFilterParameter::GetterCallbackType OutputPathFilterParameter::getGetterCallback() const
-{
-  return m_GetterCallback;
-}
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index 7c7a342f6c..853a6d8674 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -39,7 +39,7 @@
 
 #include <QtCore/QJsonObject>
 
-#include "SIMPLib/FilterParameters/FilterParameter.h"
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
 
 /**
  * @brief SIMPL_NEW_OUTPUT_PATH_FP This macro is a short-form way of instantiating an instance of
@@ -60,7 +60,7 @@
  * @brief The OutputPathFilterParameter class is used by filters to instantiate an OutputPathWidget.  By instantiating an instance of
  * this class in a filter's setupFilterParameters() method, a OutputPathWidget will appear in the filter's "filter input" section in the DREAM3D GUI.
  */
-class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
+class SIMPLib_EXPORT OutputPathFilterParameter : public AbstractIOFilterParameter
 {
   // Start Python bindings declarations
   // clang-format off
@@ -76,6 +76,7 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   using ConstPointer = std::shared_ptr<const Self>;
   using WeakPointer = std::weak_ptr<Self>;
   using ConstWeakPointer = std::weak_ptr<const Self>;
+
   static Pointer NullPointer();
 
   static Pointer New();
@@ -84,14 +85,12 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
    * @brief Returns the name of the class for OutputPathFilterParameter
    */
   QString getNameOfClass() const override;
+
   /**
    * @brief Returns the name of the class for OutputPathFilterParameter
    */
   static QString ClassName();
 
-  using SetterCallbackType = std::function<void(QString)>;
-  using GetterCallbackType = std::function<QString(void)>;
-
   /**
    * @brief New This function instantiates an instance of the OutputPathFilterParameter. Although this function is available to be used,
    * the preferable way to instantiate an instance of this class is to use the SIMPL_NEW_OUTPUT_PATH_FP(...) macro at the top of this file.
@@ -102,39 +101,19 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
    * @param category The category for the filter parameter in the DREAM.3D user interface.  There
    * are three categories: Parameter, Required Arrays, and Created Arrays.
    * @param setterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-  * that this FilterParameter subclass represents.
+   * that this FilterParameter subclass represents.
    * @param getterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-  * that this FilterParameter subclass represents.
-  * @param fileExtension The possible file extensions that this OutputPathWidget accepts.
-  * @param fileType The possible file types that this OutputPathWidget accepts.
+   * that this FilterParameter subclass represents.
+   * @param fileExtension The possible file extensions that this OutputPathWidget accepts.
+   * @param fileType The possible file types that this OutputPathWidget accepts.
    * @param groupIndex Integer that specifies the group that this filter parameter will be placed in.
    * @return
    */
   static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, const SetterCallbackType& setterCallback,
-                        const GetterCallbackType& getterCallback, const QString& fileExtension = QString(""), const QString& fileType = QString(""), int groupIndex = -1);
+                        const GetterCallbackType& getterCallback, int groupIndex = -1);
 
   ~OutputPathFilterParameter() override;
 
-  /**
-   * @brief Setter property for FileExtension
-   */
-  void setFileExtension(const QString& value);
-  /**
-   * @brief Getter property for FileExtension
-   * @return Value of FileExtension
-   */
-  QString getFileExtension() const;
-
-  /**
-   * @brief Setter property for FileType
-   */
-  void setFileType(const QString& value);
-  /**
-   * @brief Getter property for FileType
-   * @return Value of FileType
-   */
-  QString getFileType() const;
-
   /**
    * @brief getWidgetType Returns the type of widget that displays and controls
    * this FilterParameter subclass
@@ -142,48 +121,6 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
    */
   QString getWidgetType() const override;
 
-  /**
-   * @brief readJson Reads this filter parameter's corresponding property out of a QJsonObject.
-   * @param json The QJsonObject that the filter parameter reads from.
-   */
-  void readJson(const QJsonObject& json) override;
-
-  /**
-   * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
-   * @param json The QJsonObject that the filter parameter writes to.
-   */
-  void writeJson(QJsonObject& json) override;
-
-  /**
-   * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * from the filter parameter.
-   */
-  /**
-   * @brief Setter property for SetterCallback
-   */
-  void setSetterCallback(const OutputPathFilterParameter::SetterCallbackType& value);
-  /**
-   * @brief Getter property for SetterCallback
-   * @return Value of SetterCallback
-   */
-  OutputPathFilterParameter::SetterCallbackType getSetterCallback() const;
-
-  /**
-   * @param GetterCallback The method in the AbstractFilter subclass that <i>gets</i> the value of the property
-   * that this FilterParameter subclass represents.
-   * @return The GetterCallback
-   */
-  /**
-   * @brief Setter property for GetterCallback
-   */
-  void setGetterCallback(const OutputPathFilterParameter::GetterCallbackType& value);
-  /**
-   * @brief Getter property for GetterCallback
-   * @return Value of GetterCallback
-   */
-  OutputPathFilterParameter::GetterCallbackType getGetterCallback() const;
-
 protected:
   /**
    * @brief OutputPathFilterParameter The default constructor.  It is protected because this
@@ -196,10 +133,4 @@ class SIMPLib_EXPORT OutputPathFilterParameter : public FilterParameter
   OutputPathFilterParameter(OutputPathFilterParameter&&) = delete;                 // Move Constructor Not Implemented
   OutputPathFilterParameter& operator=(const OutputPathFilterParameter&) = delete; // Copy Assignment Not Implemented
   OutputPathFilterParameter& operator=(OutputPathFilterParameter&&) = delete;      // Move Assignment Not Implemented
-
-private:
-  QString m_FileExtension = {};
-  QString m_FileType = {};
-  OutputPathFilterParameter::SetterCallbackType m_SetterCallback = {};
-  OutputPathFilterParameter::GetterCallbackType m_GetterCallback = {};
 };
diff --git a/Source/SIMPLib/FilterParameters/SourceList.cmake b/Source/SIMPLib/FilterParameters/SourceList.cmake
index e2f6b795ef..2c3b84ab4a 100755
--- a/Source/SIMPLib/FilterParameters/SourceList.cmake
+++ b/Source/SIMPLib/FilterParameters/SourceList.cmake
@@ -87,6 +87,7 @@ set(SIMPLib_${SUBDIR_NAME}_HDRS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float4thOrderPolynomial.h
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float2ndOrderPolynomial.h
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractIOFilterParameter.h
 )
 
 set(SIMPLib_${SUBDIR_NAME}_SRCS
@@ -162,6 +163,7 @@ set(SIMPLib_${SUBDIR_NAME}_SRCS
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/MultiInputFileFilterParameter.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float4thOrderPolynomial.cpp
   ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/Float2ndOrderPolynomial.cpp
+  ${SIMPLib_SOURCE_DIR}/${SUBDIR_NAME}/AbstractIOFilterParameter.cpp
 )
 
 cmp_IDE_SOURCE_PROPERTIES( "${SUBDIR_NAME}" "${SIMPLib_${SUBDIR_NAME}_HDRS};${SIMPLib_${SUBDIR_NAME}_Moc_HDRS}" "${SIMPLib_${SUBDIR_NAME}_SRCS}" "${PROJECT_INSTALL_HEADERS}")
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 4e2586e7d5..553e662d6f 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -254,7 +254,7 @@ void GenericExample::setupFilterParameters()
     /*   For an input file use this code*/
     parameters.push_back(SIMPL_NEW_INPUT_FILE_FP("Input File", InputFile, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 1));
     /*   For an input path use this code*/
-    parameters.push_back(SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Category::Parameter, GenericExample, "*.txt", "", 2));
+    parameters.push_back(SIMPL_NEW_INPUT_PATH_FP("Input Path", InputPath, FilterParameter::Category::Parameter, GenericExample, 2));
   }
 
   //------------------
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index f0c35cccc1..0710265503 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -43,7 +43,7 @@
 
 #include <QtWidgets/QMenu>
 
-#include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
+#include "SIMPLib/Utilities/FilterCompatibility.hpp"
 #include "SIMPLib/Utilities/SIMPLDataPathValidator.h"
 
 #include "SVWidgetsLib/Core/SVWidgetsLibConstants.h"
@@ -59,24 +59,24 @@
 AbstractIOFileWidget::AbstractIOFileWidget(FilterParameter* parameter, AbstractFilter* filter, QWidget* parent)
 : FilterParameterWidget(parameter, filter, parent)
 {
+  m_FilterParameter = SIMPL_FILTER_PARAMETER_COMPATIBILITY_CHECK(filter, parameter, AbstractIOFileWidget, AbstractIOFilterParameter);
+
   setupUi(this);
   setupGui();
-  if(filter != nullptr)
+
+  QString currentPath = m_FilterParameter->getGetterCallback()();
+  if(!currentPath.isEmpty())
+  {
+    currentPath = QDir::toNativeSeparators(currentPath);
+    // Store the last used directory into the private instance variable
+    QFileInfo fi(currentPath);
+    m_LineEdit->setText(fi.filePath());
+    setValidFilePath(m_LineEdit->text());
+  }
+  else
   {
-    QString currentPath = filter->property(PROPERTY_NAME_AS_CHAR).toString();
-    if(!currentPath.isEmpty())
-    {
-      currentPath = QDir::toNativeSeparators(currentPath);
-      // Store the last used directory into the private instance variable
-      QFileInfo fi(currentPath);
-      m_LineEdit->setText(fi.filePath());
-      setValidFilePath(m_LineEdit->text());
-    }
-    else
-    {
-      m_LineEdit->setText(QDir::homePath());
-      setValidFilePath(m_LineEdit->text());
-    }
+    m_LineEdit->setText(QDir::homePath());
+    setValidFilePath(m_LineEdit->text());
   }
 }
 
@@ -141,7 +141,7 @@ void AbstractIOFileWidget::setupGui()
   {
     label->setText(getFilterParameter()->getHumanLabel());
 
-    QString currentPath = getFilter()->property(PROPERTY_NAME_AS_CHAR).toString();
+    QString currentPath = m_FilterParameter->getGetterCallback()();
     m_LineEdit->setText(currentPath);
     setValidFilePath(m_LineEdit->text());
     on_m_LineEdit_fileDropped(currentPath);
@@ -308,8 +308,12 @@ void AbstractIOFileWidget::filterNeedsInputParameters(AbstractFilter* filter)
   SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
   text = validator->convertToAbsolutePath(text);
 
-  bool ok = filter->setProperty(PROPERTY_NAME_AS_CHAR, text);
-  if(!ok)
+  auto setter = m_FilterParameter->getSetterCallback();
+  if(setter)
+  {
+    setter(text);
+  }
+  else
   {
     getFilter()->notifyMissingProperty(getFilterParameter());
   }
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index 800ca2dba6..b5a4a4faf3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -37,8 +37,7 @@
 
 #include <QtWidgets/QWidget>
 
-
-#include "SIMPLib/FilterParameters/OutputFileFilterParameter.h"
+#include "SIMPLib/FilterParameters/AbstractIOFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"
 
 #include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
@@ -110,6 +109,7 @@ public Q_SLOTS:
   QAction* m_ShowFileAction = nullptr;
   QString m_CurrentText = "";
   QPixmap m_Icon = QPixmap(QLatin1String(":/SIMPL/icons/images/caret-bottom.png"));
+  AbstractIOFilterParameter* m_FilterParameter = nullptr;
 
 public:
   AbstractIOFileWidget(const AbstractIOFileWidget&) = delete;            // Copy Constructor Not Implemented
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 39f29bdcc7..8e049ddb73 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -95,17 +95,12 @@ void InputPathWidget::selectInputPath()
   {
     currentPath = getValue();
   }
-  QString Ftype = m_FilterParameter->getFileType();
-  QString ext = m_FilterParameter->getFileExtension();
-  QString s = Ftype + QString(" Files (") + ext + QString(");;All Files(*.*)");
-  QString defaultName = currentPath;
-  QString file = QFileDialog::getExistingDirectory(this, tr("Select Input Folder"), defaultName, QFileDialog::ShowDirsOnly);
+  QString file = QFileDialog::getExistingDirectory(this, tr("Select Input Folder"), currentPath, QFileDialog::ShowDirsOnly);
 
   if(file.isEmpty())
   {
     return;
   }
-  // bool ok = false;
   file = QDir::toNativeSeparators(file);
   // Store the last used directory into the private instance variable
   QFileInfo fi(file);
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
index 0e1753d4de..435fd1916b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
@@ -38,7 +38,7 @@
 #include <QtCore/QString>
 #include <QtWidgets/QWidget>
 
-#include "SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h"
+#include "SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h"
 #include "SVWidgetsLib/SVWidgetsLib.h"
 
 namespace Ui
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index 4ef24b85e2..ed2c25f09a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -91,17 +91,12 @@ void OutputPathWidget::selectOutputPath()
   {
     currentPath = getValue();
   }
-  QString Ftype = m_FilterParameter->getFileType();
-  QString ext = m_FilterParameter->getFileExtension();
-  QString s = Ftype + QString(" Files (") + ext + QString(");;All Files(*.*)");
-  QString defaultName = currentPath;
-  QString file = QFileDialog::getExistingDirectory(this, tr("Select Output Folder"), defaultName, QFileDialog::ShowDirsOnly);
+  QString file = QFileDialog::getExistingDirectory(this, tr("Select Output Folder"), currentPath, QFileDialog::ShowDirsOnly);
 
   if(file.isEmpty())
   {
     return;
   }
-  //  bool ok = false;
   file = QDir::toNativeSeparators(file);
   // Store the last used directory into the private instance variable
   QFileInfo fi(file);
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index 7c507a6a7e..f04695cf70 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -80,52 +80,6 @@ enum TabIndices
   HELP_TAB
 };
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-QFileInfo getFilterParameterPath(AbstractFilter* filter, FilterParameter* parameter, QString& fType, QString& ext, int& err)
-{
-  QString currentPath = "";
-  fType.clear();
-  ext.clear();
-  if(nullptr != dynamic_cast<DataContainerReaderFilterParameter*>(parameter))
-  {
-    DataContainerReaderFilterParameter* rParam = dynamic_cast<DataContainerReaderFilterParameter*>(parameter);
-    currentPath = filter->property(rParam->getInputFileProperty().toLatin1().constData()).toString();
-    fType.append(rParam->getFileType());
-    ext.append(rParam->getFileExtension());
-  }
-  else if(nullptr != dynamic_cast<InputFileFilterParameter*>(parameter))
-  {
-    InputFileFilterParameter* rParam = dynamic_cast<InputFileFilterParameter*>(parameter);
-    currentPath = filter->property(rParam->getPropertyName().toLatin1().constData()).toString();
-    fType.append(rParam->getFileType());
-    ext.append(rParam->getFileExtension());
-  }
-  else if(nullptr != dynamic_cast<InputPathFilterParameter*>(parameter))
-  {
-    InputPathFilterParameter* rParam = dynamic_cast<InputPathFilterParameter*>(parameter);
-    currentPath = filter->property(rParam->getPropertyName().toLatin1().constData()).toString();
-    fType.append(rParam->getFileType());
-    ext.append(rParam->getFileExtension());
-  }
-  else
-  {
-    err = -1;
-  }
-
-  QFileInfo fi;
-  if(!currentPath.isEmpty())
-  {
-    SIMPLDataPathValidator* validator = SIMPLDataPathValidator::Instance();
-    currentPath = validator->convertToAbsolutePath(currentPath);
-
-    fi.setFile(currentPath);
-  }
-
-  return fi;
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
@@ -292,13 +246,6 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
   {
     FilterParameter* parameter = (*iter).get();
 
-    //    // Check to make sure that this is in fact a file system filter parameter
-    //    if(nullptr != dynamic_cast<InputFileFilterParameter*>(parameter) || nullptr != dynamic_cast<InputPathFilterParameter*>(parameter) ||
-    //       nullptr != dynamic_cast<DataContainerReaderFilterParameter*>(parameter))
-    //    {
-    //      validateFileSystemFilterParameter(parameter, filter);
-    //    }
-
     QWidget* filterParameterWidget = fwm->createWidget(parameter, filter, this);
     m_PropertyToWidget.insert(parameter->getPropertyName(), filterParameterWidget); // Update our Map of Filter Parameter Properties to the Widget
     // Alert to DataArrayPath requirements
@@ -418,85 +365,6 @@ void FilterInputWidget::layoutWidgets(AbstractFilter* filter)
   }
 }
 
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-void FilterInputWidget::validateFileSystemFilterParameter(FilterParameter* parameter, AbstractFilter* filter)
-{
-  QString fType;
-  QString ext;
-  int errCode = 0;
-  QFileInfo fi = getFilterParameterPath(filter, parameter, fType, ext, errCode);
-
-  if(errCode < 0)
-  {
-    // Throw an error, because we have the wrong filter parameter type
-  }
-
-  QString currentPath = fi.absoluteFilePath();
-
-  if(!currentPath.isEmpty() && !fi.exists())
-  {
-
-    QString s = fType + QString(" Files (*") + ext + QString(");;All Files (*.*)");
-    QString defaultName = m_OpenDialogLastFilePath;
-
-    if(nullptr != dynamic_cast<InputFileFilterParameter*>(parameter))
-    {
-      InputFileFilterParameter* fsParam = dynamic_cast<InputFileFilterParameter*>(parameter);
-
-      QString title = QObject::tr("%2::%1 Select File...").arg(fsParam->getHumanLabel()).arg(filter->getHumanLabel());
-
-      QString file = QFileDialog::getOpenFileName(this, title, defaultName, s);
-      if(file.isEmpty())
-      {
-        file = currentPath;
-      }
-      file = QDir::toNativeSeparators(file);
-      // Store the last used directory into the private instance variable
-      QFileInfo fi(file);
-      m_OpenDialogLastFilePath = fi.filePath();
-      filter->setProperty(fsParam->getPropertyName().toLatin1().constData(), file);
-    }
-
-    else if(nullptr != dynamic_cast<InputPathFilterParameter*>(parameter))
-    {
-      InputPathFilterParameter* fsParam = dynamic_cast<InputPathFilterParameter*>(parameter);
-
-      QString title = QObject::tr("%2::%1 Select Folder...").arg(fsParam->getHumanLabel()).arg(filter->getHumanLabel());
-
-      QString file = QFileDialog::getExistingDirectory(this, title, defaultName, QFileDialog::ShowDirsOnly);
-      file = QDir::toNativeSeparators(file);
-      if(file.isEmpty())
-      {
-        file = currentPath;
-      }
-      // Store the last used directory into the private instance variable
-      QFileInfo fi(file);
-      m_OpenDialogLastFilePath = fi.filePath();
-      filter->setProperty(fsParam->getPropertyName().toLatin1().constData(), file);
-    }
-
-    else if(nullptr != dynamic_cast<DataContainerReaderFilterParameter*>(parameter))
-    {
-      DataContainerReaderFilterParameter* fsParam = dynamic_cast<DataContainerReaderFilterParameter*>(parameter);
-
-      QString title = QObject::tr("%2::%1 Select File...").arg(fsParam->getHumanLabel()).arg(filter->getHumanLabel());
-
-      QString file = QFileDialog::getOpenFileName(this, title, defaultName, s);
-      if(file.isEmpty())
-      {
-        file = currentPath;
-      }
-      file = QDir::toNativeSeparators(file);
-      // Store the last used directory into the private instance variable
-      QFileInfo fi(file);
-      m_OpenDialogLastFilePath = fi.filePath();
-      filter->setProperty(fsParam->getInputFileProperty().toLatin1().constData(), file);
-    }
-  }
-}
-
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
index 263180d5ec..b6f115c81a 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -121,12 +121,6 @@ private Q_SLOTS:
    */
   void layoutWidgets(AbstractFilter* filter);
 
-  /**
-   * @brief validateFileSystemFilterParameter
-   * @param option
-   */
-  void validateFileSystemFilterParameter(FilterParameter* parameter, AbstractFilter* filter);
-
   /**
    * @brief linkConditionalWidgets
    * @param filterParameters

From 1cc2af96718bafab9d5c422c4a63cf8b79d7c245 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Mon, 19 Apr 2021 19:11:39 -0400
Subject: [PATCH 373/397] Changed writeJson to be const

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h     | 2 +-
 .../FilterParameters/AttributeMatrixCreationFilterParameter.cpp | 2 +-
 .../FilterParameters/AttributeMatrixCreationFilterParameter.h   | 2 +-
 .../AttributeMatrixSelectionFilterParameter.cpp                 | 2 +-
 .../FilterParameters/AttributeMatrixSelectionFilterParameter.h  | 2 +-
 Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp    | 2 +-
 Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h      | 2 +-
 Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp      | 2 +-
 Source/SIMPLib/FilterParameters/BooleanFilterParameter.h        | 2 +-
 Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h     | 2 +-
 Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp       | 2 +-
 Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h         | 2 +-
 .../ComparisonSelectionAdvancedFilterParameter.cpp              | 2 +-
 .../ComparisonSelectionAdvancedFilterParameter.h                | 2 +-
 .../FilterParameters/ComparisonSelectionFilterParameter.cpp     | 2 +-
 .../FilterParameters/ComparisonSelectionFilterParameter.h       | 2 +-
 .../FilterParameters/ConstrainedDoubleFilterParameter.cpp       | 2 +-
 .../SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h | 2 +-
 .../SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp  | 2 +-
 Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h | 2 +-
 .../FilterParameters/DataArrayCreationFilterParameter.cpp       | 2 +-
 .../SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h | 2 +-
 .../FilterParameters/DataArraySelectionFilterParameter.cpp      | 2 +-
 .../FilterParameters/DataArraySelectionFilterParameter.h        | 2 +-
 .../FilterParameters/DataContainerArrayProxyFilterParameter.cpp | 2 +-
 .../FilterParameters/DataContainerArrayProxyFilterParameter.h   | 2 +-
 .../FilterParameters/DataContainerCreationFilterParameter.cpp   | 2 +-
 .../FilterParameters/DataContainerCreationFilterParameter.h     | 2 +-
 .../DataContainerGridSelectionFilterParameter.cpp               | 2 +-
 .../DataContainerGridSelectionFilterParameter.h                 | 2 +-
 .../FilterParameters/DataContainerReaderFilterParameter.cpp     | 2 +-
 .../FilterParameters/DataContainerReaderFilterParameter.h       | 2 +-
 .../FilterParameters/DataContainerSelectionFilterParameter.cpp  | 2 +-
 .../FilterParameters/DataContainerSelectionFilterParameter.h    | 2 +-
 Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp       | 2 +-
 Source/SIMPLib/FilterParameters/DoubleFilterParameter.h         | 2 +-
 .../SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h  | 2 +-
 Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp | 2 +-
 Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h   | 2 +-
 Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp | 2 +-
 Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h   | 2 +-
 Source/SIMPLib/FilterParameters/FilterParameter.cpp             | 2 +-
 Source/SIMPLib/FilterParameters/FilterParameter.h               | 2 +-
 Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp        | 2 +-
 Source/SIMPLib/FilterParameters/FloatFilterParameter.h          | 2 +-
 Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp    | 2 +-
 Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h      | 2 +-
 Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp    | 2 +-
 Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h      | 2 +-
 .../FilterParameters/FourthOrderPolynomialFilterParameter.cpp   | 2 +-
 .../FilterParameters/FourthOrderPolynomialFilterParameter.h     | 2 +-
 .../FilterParameters/GenerateColorTableFilterParameter.cpp      | 2 +-
 .../FilterParameters/GenerateColorTableFilterParameter.h        | 2 +-
 .../FilterParameters/ImportHDF5DatasetFilterParameter.cpp       | 2 +-
 .../SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h | 2 +-
 Source/SIMPLib/FilterParameters/IntFilterParameter.cpp          | 2 +-
 Source/SIMPLib/FilterParameters/IntFilterParameter.h            | 2 +-
 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp      | 2 +-
 Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h        | 2 +-
 Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp      | 2 +-
 Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h        | 2 +-
 .../SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h  | 2 +-
 .../SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h  | 2 +-
 .../LinkedDataContainerSelectionFilterParameter.cpp             | 2 +-
 .../LinkedDataContainerSelectionFilterParameter.h               | 2 +-
 .../FilterParameters/LinkedPathCreationFilterParameter.cpp      | 2 +-
 .../FilterParameters/LinkedPathCreationFilterParameter.h        | 2 +-
 .../FilterParameters/MontageSelectionFilterParameter.cpp        | 2 +-
 .../SIMPLib/FilterParameters/MontageSelectionFilterParameter.h  | 2 +-
 .../MontageStructureSelectionFilterParameter.cpp                | 2 +-
 .../FilterParameters/MontageStructureSelectionFilterParameter.h | 2 +-
 .../MultiAttributeMatrixSelectionFilterParameter.cpp            | 2 +-
 .../MultiAttributeMatrixSelectionFilterParameter.h              | 2 +-
 .../FilterParameters/MultiDataArraySelectionFilterParameter.cpp | 2 +-
 .../FilterParameters/MultiDataArraySelectionFilterParameter.h   | 2 +-
 .../MultiDataContainerSelectionFilterParameter.cpp              | 2 +-
 .../MultiDataContainerSelectionFilterParameter.h                | 2 +-
 .../SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp  | 2 +-
 Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h | 2 +-
 Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp  | 2 +-
 Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h    | 2 +-
 Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp    | 2 +-
 Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h      | 2 +-
 .../FilterParameters/PhaseTypeSelectionFilterParameter.cpp      | 2 +-
 .../FilterParameters/PhaseTypeSelectionFilterParameter.h        | 2 +-
 .../FilterParameters/PreflightUpdatedValueFilterParameter.cpp   | 2 +-
 .../FilterParameters/PreflightUpdatedValueFilterParameter.h     | 2 +-
 Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp        | 2 +-
 Source/SIMPLib/FilterParameters/RangeFilterParameter.h          | 2 +-
 Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp   | 2 +-
 Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h     | 2 +-
 .../FilterParameters/SecondOrderPolynomialFilterParameter.cpp   | 2 +-
 .../FilterParameters/SecondOrderPolynomialFilterParameter.h     | 2 +-
 .../FilterParameters/ShapeTypeSelectionFilterParameter.cpp      | 2 +-
 .../FilterParameters/ShapeTypeSelectionFilterParameter.h        | 2 +-
 Source/SIMPLib/FilterParameters/StringFilterParameter.cpp       | 2 +-
 Source/SIMPLib/FilterParameters/StringFilterParameter.h         | 2 +-
 .../FilterParameters/ThirdOrderPolynomialFilterParameter.cpp    | 2 +-
 .../FilterParameters/ThirdOrderPolynomialFilterParameter.h      | 2 +-
 Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp       | 2 +-
 Source/SIMPLib/FilterParameters/UInt64FilterParameter.h         | 2 +-
 Source/SIMPLib/Filtering/AbstractComparison.h                   | 2 +-
 Source/SIMPLib/Filtering/ComparisonSet.cpp                      | 2 +-
 Source/SIMPLib/Filtering/ComparisonSet.h                        | 2 +-
 Source/SIMPLib/Filtering/ComparisonValue.cpp                    | 2 +-
 Source/SIMPLib/Filtering/ComparisonValue.h                      | 2 +-
 111 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
index 2a821d5f28..e42b62c09f 100644
--- a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
@@ -52,7 +52,7 @@ void AbstractIOFilterParameter::readJson(const QJsonObject& json)
 }
 
 // -----------------------------------------------------------------------------
-void AbstractIOFilterParameter::writeJson(QJsonObject& json)
+void AbstractIOFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
index ecf7f0685d..b41669c7e4 100644
--- a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
@@ -61,7 +61,7 @@ class SIMPLib_EXPORT AbstractIOFilterParameter : public FilterParameter
    * @brief writeJson
    * @return
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Sets setter
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 974651d255..29244dfe14 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -98,7 +98,7 @@ void AttributeMatrixCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrixCreationFilterParameter::writeJson(QJsonObject& json)
+void AttributeMatrixCreationFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 4fe020b3ac..9830d10379 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -146,7 +146,7 @@ class SIMPLib_EXPORT AttributeMatrixCreationFilterParameter : public FilterParam
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index 4f1c2f1cad..aaa716240b 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -153,7 +153,7 @@ void AttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
+void AttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index be56d29e03..e1aa860e9f 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -160,7 +160,7 @@ class SIMPLib_EXPORT AttributeMatrixSelectionFilterParameter : public FilterPara
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Returns the RequirementType for the filter parameter
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 1d1b64d4a8..00b0a9dad3 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -95,7 +95,7 @@ void AxisAngleFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void AxisAngleFilterParameter::writeJson(QJsonObject& json)
+void AxisAngleFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index 9f74baca46..d5676b8003 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -131,7 +131,7 @@ class SIMPLib_EXPORT AxisAngleFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index 08e886a0ce..ea36d58973 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -91,7 +91,7 @@ void BooleanFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void BooleanFilterParameter::writeJson(QJsonObject& json)
+void BooleanFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 84acad21bd..1f709827ea 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT BooleanFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index dd389bc081..36841c6941 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -94,7 +94,7 @@ void CalculatorFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void CalculatorFilterParameter::writeJson(QJsonObject& json)
+void CalculatorFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 1e72a6e1af..703449c0c9 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT CalculatorFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index cfa60b877a..70ca42b63e 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -96,7 +96,7 @@ void ChoiceFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ChoiceFilterParameter::writeJson(QJsonObject& json)
+void ChoiceFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index 45ab213095..dcfe0ce471 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -153,7 +153,7 @@ class SIMPLib_EXPORT ChoiceFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index 20cb12987f..b9a7b8794d 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -107,7 +107,7 @@ void ComparisonSelectionAdvancedFilterParameter::readJson(const QJsonObject& jso
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSelectionAdvancedFilterParameter::writeJson(QJsonObject& json)
+void ComparisonSelectionAdvancedFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index d1235e553f..0c9be8da23 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -176,7 +176,7 @@ class SIMPLib_EXPORT ComparisonSelectionAdvancedFilterParameter : public FilterP
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index bf8f9fab69..7397d8f872 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -113,7 +113,7 @@ void ComparisonSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSelectionFilterParameter::writeJson(QJsonObject& json)
+void ComparisonSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index 35e2d2690b..daa9792dad 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -175,7 +175,7 @@ class SIMPLib_EXPORT ComparisonSelectionFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index e0721cc85d..dc7e7274c1 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -90,7 +90,7 @@ void ConstrainedDoubleFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedDoubleFilterParameter::writeJson(QJsonObject& json)
+void ConstrainedDoubleFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index d91f150edf..3a6d46ab56 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -132,7 +132,7 @@ class SIMPLib_EXPORT ConstrainedDoubleFilterParameter : public ConstrainedFilter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index 9351b8e0c7..0c8c652bf4 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -89,7 +89,7 @@ void ConstrainedIntFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ConstrainedIntFilterParameter::writeJson(QJsonObject& json)
+void ConstrainedIntFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index 1c2ad27a0f..1ad227fafd 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT ConstrainedIntFilterParameter : public ConstrainedFilterPar
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index 4443ed946d..d4e5ac8c8a 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -152,7 +152,7 @@ void DataArrayCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArrayCreationFilterParameter::writeJson(QJsonObject& json)
+void DataArrayCreationFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index 3600e1f654..d54e227553 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -162,7 +162,7 @@ class SIMPLib_EXPORT DataArrayCreationFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param DefaultGeometryTypes Default geometry types required for Data Container selections
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index d7942f7d35..10bccb7b3b 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -210,7 +210,7 @@ void DataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataArraySelectionFilterParameter::writeJson(QJsonObject& json)
+void DataArraySelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index b62fef5fd3..d9bf71d976 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -179,7 +179,7 @@ class SIMPLib_EXPORT DataArraySelectionFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Returns the RequirementType for the filter parameter
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 12f9c62701..981da4d7de 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -103,7 +103,7 @@ void DataContainerArrayProxyFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerArrayProxyFilterParameter::writeJson(QJsonObject& json)
+void DataContainerArrayProxyFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index d249cd031b..dfc3dab843 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -154,7 +154,7 @@ class SIMPLib_EXPORT DataContainerArrayProxyFilterParameter : public FilterParam
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 43512c6bb8..277c75869f 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -106,7 +106,7 @@ void DataContainerCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerCreationFilterParameter::writeJson(QJsonObject& json)
+void DataContainerCreationFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index ef052015a9..86b3b0b4ce 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -131,7 +131,7 @@ class SIMPLib_EXPORT DataContainerCreationFilterParameter : public FilterParamet
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
index 132b8c091c..2be00df10a 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -103,7 +103,7 @@ void DataContainerGridSelectionFilterParameter::readJson(const QJsonObject& json
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerGridSelectionFilterParameter::writeJson(QJsonObject& json)
+void DataContainerGridSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
index 89b7693c5e..c428eff104 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -137,7 +137,7 @@ class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterPa
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Getter property for DefaultGeometryTypes
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index 61ad76a290..a294617e01 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -101,7 +101,7 @@ void DataContainerReaderFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 // THIS IS A SPECIAL CASE AND IS NOT STANDARD.  DO NOT COPY THIS CODE.
 // -----------------------------------------------------------------------------
-void DataContainerReaderFilterParameter::writeJson(QJsonObject& json)
+void DataContainerReaderFilterParameter::writeJson(QJsonObject& json) const
 {
   DataContainerArrayProxy proxy = m_Filter->getInputFileDataContainerArrayProxy();
   QJsonObject obj;
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index 9ba03fa2b4..639974cdfb 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -158,7 +158,7 @@ class SIMPLib_EXPORT DataContainerReaderFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
 protected:
   /**
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index a1fd0ca1ac..d8f3b384fd 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -107,7 +107,7 @@ void DataContainerSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
+void DataContainerSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 638e9d19b2..4899f2feea 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -143,7 +143,7 @@ class SIMPLib_EXPORT DataContainerSelectionFilterParameter : public FilterParame
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Returns the RequirementType for the filter parameter
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 9a0f3c4eae..783e6701e3 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -91,7 +91,7 @@ void DoubleFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DoubleFilterParameter::writeJson(QJsonObject& json)
+void DoubleFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index e9d47adee4..7fea951e9b 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT DoubleFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 69507f1255..665766a6f9 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -91,7 +91,7 @@ void DynamicChoiceFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DynamicChoiceFilterParameter::writeJson(QJsonObject& json)
+void DynamicChoiceFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index 5e53801da6..a8286a19f8 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -151,7 +151,7 @@ class SIMPLib_EXPORT DynamicChoiceFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index bcf20b29dd..320b761ce5 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -117,7 +117,7 @@ void DynamicTableFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void DynamicTableFilterParameter::writeJson(QJsonObject& json)
+void DynamicTableFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 1d4822890b..4d77c48dd0 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -166,7 +166,7 @@ class SIMPLib_EXPORT DynamicTableFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index 46ff528186..fa1b96807f 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -98,7 +98,7 @@ void FileListInfoFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FileListInfoFilterParameter::writeJson(QJsonObject& json)
+void FileListInfoFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 67704d3c9b..79f919ab38 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT FileListInfoFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 5bf8ff44c6..2cc8a2f083 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -68,7 +68,7 @@ void FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FilterParameter::writeJson(QJsonObject& json)
+void FilterParameter::writeJson(QJsonObject& json) const
 {
   Q_UNUSED(json)
 }
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index 8c15dc5e57..edd11fa7d5 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -187,7 +187,7 @@ class SIMPLib_EXPORT FilterParameter
    * @brief writeJson
    * @return
    */
-  virtual void writeJson(QJsonObject& json);
+  virtual void writeJson(QJsonObject& json) const;
 
   /**
    * @brief Handle DataArrayPath changes if necessary
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
index e30f17a6f8..9a7af51931 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.cpp
@@ -88,7 +88,7 @@ void FloatFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatFilterParameter::writeJson(QJsonObject& json)
+void FloatFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index 7525d320ba..b3254f589f 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -132,7 +132,7 @@ class SIMPLib_EXPORT FloatFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 3e48f6b68d..0ab9fa7b63 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -98,7 +98,7 @@ void FloatVec2FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec2FilterParameter::writeJson(QJsonObject& obj)
+void FloatVec2FilterParameter::writeJson(QJsonObject& obj) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index e6bb953184..f21c2e1c4b 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT FloatVec2FilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 04eae6fc8f..96f9a8c11d 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -101,7 +101,7 @@ void FloatVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FloatVec3FilterParameter::writeJson(QJsonObject& obj)
+void FloatVec3FilterParameter::writeJson(QJsonObject& obj) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 7a488edc2e..8935335e77 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -136,7 +136,7 @@ class SIMPLib_EXPORT FloatVec3FilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index ad7ecff7f9..a5127b05a9 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -97,7 +97,7 @@ void FourthOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void FourthOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
+void FourthOrderPolynomialFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 709350e530..12db00eded 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT FourthOrderPolynomialFilterParameter : public FilterParamet
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
index f98ea15033..850eba533f 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
@@ -85,7 +85,7 @@ void GenerateColorTableFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 // THIS IS A SPECIAL CASE AND IS NOT STANDARD.  DO NOT COPY THIS CODE.
 // -----------------------------------------------------------------------------
-void GenerateColorTableFilterParameter::writeJson(QJsonObject& json)
+void GenerateColorTableFilterParameter::writeJson(QJsonObject& json) const
 {
   QString presetName = m_Filter->getSelectedPresetName();
   QJsonArray presetControlPoints = m_Filter->getSelectedPresetControlPoints();
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index 8831a60512..94f547e3ba 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -118,7 +118,7 @@ class SIMPLib_EXPORT GenerateColorTableFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
 protected:
   /**
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
index 4ec9ed52d8..a70fb79606 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
@@ -101,7 +101,7 @@ void ImportHDF5DatasetFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 // THIS IS A SPECIAL CASE AND IS NOT STANDARD.  DO NOT COPY THIS CODE.
 // -----------------------------------------------------------------------------
-void ImportHDF5DatasetFilterParameter::writeJson(QJsonObject& json)
+void ImportHDF5DatasetFilterParameter::writeJson(QJsonObject& json) const
 {
   json["HDF5FilePath"] = m_Filter->getHDF5FilePath();
 
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index 49d9ba6e65..a3b0311d1e 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -99,7 +99,7 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
 protected:
   ImportHDF5DatasetFilterParameter();
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index f656950f6b..ef9e841916 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -91,7 +91,7 @@ void IntFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntFilterParameter::writeJson(QJsonObject& json)
+void IntFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 9f92885b66..4cf22a7eaa 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT IntFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
index e7dedcf300..bebba314da 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -98,7 +98,7 @@ void IntVec2FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec2FilterParameter::writeJson(QJsonObject& obj)
+void IntVec2FilterParameter::writeJson(QJsonObject& obj) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index 17a1580427..cdd81602b1 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT IntVec2FilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index c05c393b0c..f621dfc2f7 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -101,7 +101,7 @@ void IntVec3FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void IntVec3FilterParameter::writeJson(QJsonObject& obj)
+void IntVec3FilterParameter::writeJson(QJsonObject& obj) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index 7224784bff..64fa0911d1 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -132,7 +132,7 @@ class SIMPLib_EXPORT IntVec3FilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 4ac0a2fe3c..5c0035af8b 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -92,7 +92,7 @@ void LinkedBooleanFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void LinkedBooleanFilterParameter::writeJson(QJsonObject& json)
+void LinkedBooleanFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index 78c14ffe0c..0f506de3b5 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -141,7 +141,7 @@ class SIMPLib_EXPORT LinkedBooleanFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 662d6dbeac..44dacfa4ba 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -90,7 +90,7 @@ void LinkedChoicesFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void LinkedChoicesFilterParameter::writeJson(QJsonObject& json)
+void LinkedChoicesFilterParameter::writeJson(QJsonObject& json) const
 {
   if(getGetterCallback())
   {
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index 2b2f3c34f5..529a38cc23 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -126,7 +126,7 @@ class SIMPLib_EXPORT LinkedChoicesFilterParameter : public ChoiceFilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
 protected:
   /**
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index e681cc0565..726214e91b 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -108,7 +108,7 @@ void LinkedDataContainerSelectionFilterParameter::readJson(const QJsonObject& js
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void LinkedDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
+void LinkedDataContainerSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index e8c9638550..f29f02c958 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -157,7 +157,7 @@ class SIMPLib_EXPORT LinkedDataContainerSelectionFilterParameter : public Filter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 18d5ab4bd5..736d266ea0 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -152,7 +152,7 @@ void LinkedPathCreationFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void LinkedPathCreationFilterParameter::writeJson(QJsonObject& json)
+void LinkedPathCreationFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 40272ac126..18a3a40350 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -340,7 +340,7 @@ class SIMPLib_EXPORT LinkedPathCreationFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index afbf05728c..2ca946577e 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -87,7 +87,7 @@ void MontageSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MontageSelectionFilterParameter::writeJson(QJsonObject& json)
+void MontageSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index f036cada07..3ff1bc70d8 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT MontageSelectionFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
index c225a37692..ec692f901d 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -92,7 +92,7 @@ void MontageStructureSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MontageStructureSelectionFilterParameter::writeJson(QJsonObject& json)
+void MontageStructureSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
index 2602e16673..737ba26d2a 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
@@ -128,7 +128,7 @@ class SIMPLib_EXPORT MontageStructureSelectionFilterParameter : public FilterPar
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index 4fdb81ae59..cba608f592 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -191,7 +191,7 @@ void MultiAttributeMatrixSelectionFilterParameter::readJson(const QJsonObject& j
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiAttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json)
+void MultiAttributeMatrixSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index bfc1e4f2f3..5a013b083d 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -176,7 +176,7 @@ class SIMPLib_EXPORT MultiAttributeMatrixSelectionFilterParameter : public Filte
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Setter property for DefaultGeometryTypes
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index c652f8ab70..e0cf1bcfa9 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -190,7 +190,7 @@ void MultiDataArraySelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiDataArraySelectionFilterParameter::writeJson(QJsonObject& json)
+void MultiDataArraySelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index db4bee1169..9c6bfcaf9d 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -176,7 +176,7 @@ class SIMPLib_EXPORT MultiDataArraySelectionFilterParameter : public FilterParam
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Setter property for DefaultGeometryTypes
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 85972c393f..754ac062d4 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -188,7 +188,7 @@ void MultiDataContainerSelectionFilterParameter::readJson(const QJsonObject& jso
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json)
+void MultiDataContainerSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 8bc94b6610..684615202d 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -177,7 +177,7 @@ class SIMPLib_EXPORT MultiDataContainerSelectionFilterParameter : public FilterP
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Setter property for DefaultGeometryTypes
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
index b298be40c4..8bcb38abb7 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
@@ -100,7 +100,7 @@ void MultiInputFileFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void MultiInputFileFilterParameter::writeJson(QJsonObject& json)
+void MultiInputFileFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
index 20b078ff60..4521825900 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
@@ -157,7 +157,7 @@ class SIMPLib_EXPORT MultiInputFileFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index 14ebdfba9c..dd1283aa00 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -92,7 +92,7 @@ void NumericTypeFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void NumericTypeFilterParameter::writeJson(QJsonObject& json)
+void NumericTypeFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index 74e9ccb9f3..67dc663e60 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -134,7 +134,7 @@ class SIMPLib_EXPORT NumericTypeFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
index b3844af0fc..f1c8acd250 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.cpp
@@ -90,7 +90,7 @@ void ParagraphFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ParagraphFilterParameter::writeJson(QJsonObject& json)
+void ParagraphFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
index 57847e135a..4f57f5a725 100644
--- a/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ParagraphFilterParameter.h
@@ -128,7 +128,7 @@ class SIMPLib_EXPORT ParagraphFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index 2721347f31..f73fc382c5 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -106,7 +106,7 @@ void PhaseTypeSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void PhaseTypeSelectionFilterParameter::writeJson(QJsonObject& json)
+void PhaseTypeSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index e0d5cda84b..0082fca0f4 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -185,7 +185,7 @@ class SIMPLib_EXPORT PhaseTypeSelectionFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Setter property for DefaultGeometryTypes
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index a219527f80..0d8e14f189 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -80,7 +80,7 @@ void PreflightUpdatedValueFilterParameter::readJson(const QJsonObject& json)
 }
 
 // -----------------------------------------------------------------------------
-void PreflightUpdatedValueFilterParameter::writeJson(QJsonObject& json)
+void PreflightUpdatedValueFilterParameter::writeJson(QJsonObject& json) const
 {
   // We don't want to write this value. It serves no purpose saving the value
   std::ignore = json;
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index e0e6ed8472..26fbc3cb9f 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -140,7 +140,7 @@ class SIMPLib_EXPORT PreflightUpdatedValueFilterParameter : public FilterParamet
    * @brief writeJson
    * @return
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
 protected:
   /**
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 8c89b8afc8..7db8126150 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -97,7 +97,7 @@ void RangeFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void RangeFilterParameter::writeJson(QJsonObject& json)
+void RangeFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index f9f090f38f..2f1278c1f2 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -133,7 +133,7 @@ class SIMPLib_EXPORT RangeFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Setter property for DefaultPair
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index e1801127c6..f1db805396 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -92,7 +92,7 @@ void ScalarTypeFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ScalarTypeFilterParameter::writeJson(QJsonObject& json)
+void ScalarTypeFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index 0cbb024943..96ce7923a0 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -134,7 +134,7 @@ class SIMPLib_EXPORT ScalarTypeFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 6d11fda256..6144426d7b 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -97,7 +97,7 @@ void SecondOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void SecondOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
+void SecondOrderPolynomialFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index c4f615cce4..96bb044cb0 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -131,7 +131,7 @@ class SIMPLib_EXPORT SecondOrderPolynomialFilterParameter : public FilterParamet
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index a40f1797e0..6787de3b3c 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -103,7 +103,7 @@ void ShapeTypeSelectionFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ShapeTypeSelectionFilterParameter::writeJson(QJsonObject& json)
+void ShapeTypeSelectionFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index 76c0668653..54ee0ce44a 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -154,7 +154,7 @@ class SIMPLib_EXPORT ShapeTypeSelectionFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index 0bebad25a7..805ee8dce0 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -91,7 +91,7 @@ void StringFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void StringFilterParameter::writeJson(QJsonObject& json)
+void StringFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 5a70c349e6..192aff94c7 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -130,7 +130,7 @@ class SIMPLib_EXPORT StringFilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index e25a09d4fe..bcc3673fa3 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -97,7 +97,7 @@ void ThirdOrderPolynomialFilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ThirdOrderPolynomialFilterParameter::writeJson(QJsonObject& json)
+void ThirdOrderPolynomialFilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index bccbc2a038..3394feefa8 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -131,7 +131,7 @@ class SIMPLib_EXPORT ThirdOrderPolynomialFilterParameter : public FilterParamete
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 714390b0ed..3e0bd795f3 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -91,7 +91,7 @@ void UInt64FilterParameter::readJson(const QJsonObject& json)
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void UInt64FilterParameter::writeJson(QJsonObject& json)
+void UInt64FilterParameter::writeJson(QJsonObject& json) const
 {
   if(m_GetterCallback)
   {
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index d1e80ace2d..8be61c3669 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -128,7 +128,7 @@ class SIMPLib_EXPORT UInt64FilterParameter : public FilterParameter
    * @brief writeJson Writes this filter parameter's corresponding property to a QJsonObject.
    * @param json The QJsonObject that the filter parameter writes to.
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @param SetterCallback The method in the AbstractFilter subclass that <i>sets</i> the value of the property
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index 3a5c8aaa09..fc82935ec7 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -97,7 +97,7 @@ class SIMPLib_EXPORT AbstractComparison
    * @brief Write comparison to JSon
    * @param json
    */
-  virtual void writeJson(QJsonObject& json) = 0;
+  virtual void writeJson(QJsonObject& json) const = 0;
   /**
    * @brief Read comparison from JSon
    * @param json
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.cpp b/Source/SIMPLib/Filtering/ComparisonSet.cpp
index 7ba48986a1..375390e919 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonSet.cpp
@@ -58,7 +58,7 @@ ComparisonSet::~ComparisonSet()
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonSet::writeJson(QJsonObject& json)
+void ComparisonSet::writeJson(QJsonObject& json) const
 {
   json["Union Operator"] = m_unionOperator;
   json["Invert Comparison"] = m_invertComparison;
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 2cef417327..7d204862e8 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -87,7 +87,7 @@ class SIMPLib_EXPORT ComparisonSet : public AbstractComparison
    * @brief Write ComparisonSet to JSon
    * @param json
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
   /**
    * @brief Read ComparisonSet from JSon
    * @param json
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.cpp b/Source/SIMPLib/Filtering/ComparisonValue.cpp
index 8c12dbcf52..33b38ef207 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonValue.cpp
@@ -55,7 +55,7 @@ ComparisonValue::~ComparisonValue() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-void ComparisonValue::writeJson(QJsonObject& json)
+void ComparisonValue::writeJson(QJsonObject& json) const
 {
   json["Union Operator"] = m_unionOperator;
   json["Attribute Array Name"] = m_attributeArrayName;
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 9e06adb4a6..1eaa8eb67b 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -85,7 +85,7 @@ class SIMPLib_EXPORT ComparisonValue : public AbstractComparison
    * @brief Writes the ComparisonValue to JSon
    * @param json
    */
-  void writeJson(QJsonObject& json) override;
+  void writeJson(QJsonObject& json) const override;
 
   /**
    * @brief Reads the ComparisonValue from JSon

From b139ea67488724e65581c7e5ccb6bf8896fb470b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 20 Apr 2021 13:38:52 -0400
Subject: [PATCH 374/397] Changed typecaster string for QString to "str"

* QString is automatically cast to Python str so using "str" in the
signature is more friendly for Python users

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/Pybind11CustomTypeCasts.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index c007fe7e3d..e106153419 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -35,7 +35,7 @@ struct type_caster<QString>
    * function signatures and declares a local variable
    * 'value' of type QString
    */
-  PYBIND11_TYPE_CASTER(QString, _("QString"));
+  PYBIND11_TYPE_CASTER(QString, _("str"));
 
   /**
    *  @brief Conversion part 1 (Python->C++): convert a PyObject into a QString

From 79e918df31922c6d2f5db3e158b72504d623513b Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 20 Apr 2021 14:11:20 -0400
Subject: [PATCH 375/397] Moved std::vector Python bindings to the top for
 proper docstrings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                             |  1 +
 Wrapping/Python/Binding/pySIMPLBody.cpp    | 24 ----------------------
 Wrapping/Python/Binding/pySIMPLBodyTop.cpp | 23 +++++++++++++++++++++
 3 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 Wrapping/Python/Binding/pySIMPLBodyTop.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96adb22e0c..b0c03286c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -556,6 +556,7 @@ if(SIMPL_WRAP_PYTHON)
     SOURCE_DIR "${SIMPLProj_SOURCE_DIR}/Source"
     HEADER_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLHeader.cpp"
     BODY_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBody.cpp"
+    BODY_TOP_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBodyTop.cpp"
     PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     LINK_LIBRARIES SIMPLib
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index c031270f3f..8fd3817163 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -74,30 +74,6 @@ py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoL
   return datasetImportInfoList;
 }));
 
-py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8", "std::vector<int8_t> binding");
-py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8", "std::vector<uint8_t> binding");
-
-py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16", "std::vector<int16_t> binding");
-py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16", "std::vector<uint16_t> binding");
-
-py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32", "std::vector<int32_t> binding");
-py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32", "std::vector<uint32_t> binding");
-
-py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64", "std::vector<int64_t> binding");
-py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64", "std::vector<uint64_t> binding");
-
-py::bind_vector<std::vector<float>>(mod, "VectorFloat", "std::vector<float> binding");
-py::bind_vector<std::vector<double>>(mod, "VectorDouble", "std::vector<double> binding");
-
-if(py::detail::get_type_info(typeid(std::vector<size_t>)))
-{
-  mod.attr("VectorSizeT") = mod.attr("VectorUInt64");
-}
-else
-{
-  py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT", "std::vector<size_t> binding");
-}
-
 py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
     .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
     .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
diff --git a/Wrapping/Python/Binding/pySIMPLBodyTop.cpp b/Wrapping/Python/Binding/pySIMPLBodyTop.cpp
new file mode 100644
index 0000000000..5b2c7022cb
--- /dev/null
+++ b/Wrapping/Python/Binding/pySIMPLBodyTop.cpp
@@ -0,0 +1,23 @@
+py::bind_vector<std::vector<int8_t>>(mod, "VectorInt8", "std::vector<int8_t> binding");
+py::bind_vector<std::vector<uint8_t>>(mod, "VectorUInt8", "std::vector<uint8_t> binding");
+
+py::bind_vector<std::vector<int16_t>>(mod, "VectorInt16", "std::vector<int16_t> binding");
+py::bind_vector<std::vector<uint16_t>>(mod, "VectorUInt16", "std::vector<uint16_t> binding");
+
+py::bind_vector<std::vector<int32_t>>(mod, "VectorInt32", "std::vector<int32_t> binding");
+py::bind_vector<std::vector<uint32_t>>(mod, "VectorUInt32", "std::vector<uint32_t> binding");
+
+py::bind_vector<std::vector<int64_t>>(mod, "VectorInt64", "std::vector<int64_t> binding");
+py::bind_vector<std::vector<uint64_t>>(mod, "VectorUInt64", "std::vector<uint64_t> binding");
+
+py::bind_vector<std::vector<float>>(mod, "VectorFloat", "std::vector<float> binding");
+py::bind_vector<std::vector<double>>(mod, "VectorDouble", "std::vector<double> binding");
+
+if(py::detail::get_type_info(typeid(std::vector<size_t>)))
+{
+  mod.attr("VectorSizeT") = mod.attr("VectorUInt64");
+}
+else
+{
+  py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT", "std::vector<size_t> binding");
+}

From 7168548235624c1130bff735003df39c875536c0 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 21 Apr 2021 16:04:57 -0400
Subject: [PATCH 376/397] Added log messages for Python filter search paths

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/PipelineRunner/PipelineRunner.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index 28a7b01d6a..b0b80198d0 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -138,9 +138,14 @@ int main(int argc, char* argv[])
   {
     PythonLoader::addToPythonPath(PythonLoader::defaultSIMPLPythonLibPath());
     std::cout << "Loading Python filters:\n";
+    auto paths = PythonLoader::defaultPythonFilterPaths();
+    for(const auto& path : paths)
+    {
+      std::cout << "Searching \"" << path << "\"\n";
+    }
     auto pythonErrorCallback = [](const std::string& message, const std::string& filePath) { std::cout << message << "\nSkipping file: \"" << filePath << "\"\n"; };
     auto pythonLoadedCallback = [](const std::string& className, const std::string& filePath) { std::cout << "Loaded \"" << className << "\" from \"" << filePath << "\"\n"; };
-    size_t numLoaded = PythonLoader::loadPythonFilters(*fm, PythonLoader::defaultPythonFilterPaths(), pythonErrorCallback, pythonLoadedCallback);
+    size_t numLoaded = PythonLoader::loadPythonFilters(*fm, paths, pythonErrorCallback, pythonLoadedCallback);
     std::cout << "Loaded " << numLoaded << " filters\n";
   }
 #endif

From 18920c0850ecb68f6bf2967c3e92e210f5e433f2 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 27 Apr 2021 17:28:41 -0400
Subject: [PATCH 377/397] Update ghcFileSystem find_package() NAMES for updated
 ghfFileSystem version 1.4

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0c03286c6..cf9915b1c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -435,7 +435,7 @@ if(NOT DEFINED SIMPL_USE_GHC_FILESYSTEM)
 endif()
 
 if(SIMPL_USE_GHC_FILESYSTEM)
-  find_package(ghcFilesystem REQUIRED)
+  find_package(ghcFilesystem REQUIRED NAMES ghc_filesystem ghcFilesystem)
 endif()
 
 # -----------------------------------------------------------------------

From 4a0ab8dcb778af6570f3460107425a9f85264793 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 5 May 2021 13:45:20 -0400
Subject: [PATCH 378/397] Fixed PYB11_METHOD args that led to bad docstrings
 being generated

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Source/SIMPLib/Common/EnsembleInfo.h               | 6 +++---
 Source/SIMPLib/DataContainers/DataContainerArray.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index effa5447d7..5246d45378 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -55,9 +55,9 @@ class SIMPLib_EXPORT EnsembleInfo : public QObject
   // Start Python bindings declarations
   PYB11_BEGIN_BINDINGS(EnsembleInfo)
   PYB11_CREATION()
-  PYB11_METHOD(void addValues ARGS const,CrystalStructure const,PhaseType::Type const,QString)
-  PYB11_METHOD(void getValues ARGS size_t CrystalStructure& PhaseType::Type& QString&)
-  PYB11_METHOD(void remove ARGS size_t)
+  PYB11_METHOD(void addValues)
+  PYB11_METHOD(void getValues)
+  PYB11_METHOD(void remove)
   PYB11_METHOD(void clear)
   PYB11_END_BINDINGS()
   // End Python bindings declarations
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 9f29c8b950..1ee2ce38ac 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -89,7 +89,7 @@ class SIMPLib_EXPORT DataContainerArray : public QObject, public IDataStructureC
   PYB11_METHOD(bool renameDataContainer OVERLOAD const.DataArrayPath.&,OldPath const.DataArrayPath.&,NewPath )
   PYB11_METHOD(void clearDataContainers)
   PYB11_METHOD(int getNumDataContainers)
-  PYB11_METHOD(void duplicateDataContainer ARGS OldName, NewName)
+  PYB11_METHOD(void duplicateDataContainer ARGS OldName NewName)
   PYB11_METHOD(AttributeMatrix::Pointer getAttributeMatrix ARGS DataArrayPath)
   PYB11_METHOD(bool doesAttributeMatrixExist ARGS DataArrayPath)
   PYB11_METHOD(bool doesAttributeArrayExist ARGS DataArrayPath)

From a60857cf8728e563cd3ab5ecb58d92652c419c49 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 5 May 2021 15:50:04 -0400
Subject: [PATCH 379/397] Changed Python binding generation to forward declare
 classes

* Declaring all bound classes before adding methods allows the
right name to be used in docstrings

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Binding/generate_python_bindings.py       | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index c31e46afd3..f48ca3d13d 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -91,7 +91,22 @@ def __init__(self):
   def __repr__(self):
     return self.name
 
-  def generate_bindings(self) -> str:
+  def generate_forward_declaration(self) -> str:
+    template_param = self.name
+    instance = f'instance{self.name}'
+    if self.superclass:
+      template_param += f', {self.superclass}'
+    if self.uses_shared_pointer:
+      template_param += f', std::shared_ptr<{self.name}>'
+    code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
+
+    for enum in self.enums:
+      enum_instance = f'instance{self.name}{enum.name}'
+      code += f'py::enum_<{self.name}::{enum.name}> {enum_instance}({instance}, \"{enum.name}\");\n'
+
+    return code
+
+  def generate_bindings(self, foward_declared: bool=False) -> str:
     template_param = self.name
     if self.superclass:
       template_param += f', {self.superclass}'
@@ -100,17 +115,24 @@ def generate_bindings(self) -> str:
 
     needs_var: bool = self.constructors or self.has_static_new or self.static_creation_methods or self.properties or self.methods or self.fields
 
-    if self.enums or self.is_custom:
-      instance = f'instance{self.name}'
-      code = f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
+    instance = f'instance{self.name}'
+    code = ''
+
+    if not foward_declared:
+      if self.enums or self.is_custom:
+        
+        code += f'py::class_<{template_param}> {instance}(mod, \"{self.name}\");\n'
 
+        if needs_var:
+          code += f'{instance}\n'
+      else:
+        code = f'py::class_<{template_param}>(mod, \"{self.name}\")'
+        if not needs_var:
+          code += ';'
+        code += '\n'
+    else:
       if needs_var:
         code += f'{instance}\n'
-    else:
-      code = f'py::class_<{template_param}>(mod, \"{self.name}\")'
-      if not needs_var:
-        code += ';'
-      code += '\n'
 
     for constructor in self.constructors:
       args = ', '.join(constructor.args)
@@ -167,7 +189,11 @@ def generate_bindings(self) -> str:
       code += '\n'
 
     for enum in self.enums:
-      code += f'py::enum_<{self.name}::{enum.name}>(instance{self.name}, \"{enum.name}\")\n'
+      enum_instance = f'instance{self.name}{enum.name}'
+      if not foward_declared:
+        code += f'py::enum_<{self.name}::{enum.name}>({instance}, \"{enum.name}\")\n'
+      else:
+        code += f'{enum_instance}\n'
       for value in enum.values:
         code += f'  .value(\"{value}\", {self.name}::{enum.name}::{value})\n'
       code += ';\n\n'
@@ -554,7 +580,11 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
       test_file.write(f'def simplUnitTest():\n')
 
     for py_class in module_classes:
-      code = py_class.generate_bindings()
+      code = py_class.generate_forward_declaration()
+      module_file.write(code)
+
+    for py_class in module_classes:
+      code = py_class.generate_bindings(foward_declared=True)
       module_file.write(code)
       if py_class.is_filter:
         python_code = py_class.generate_python_interface('simpl')
@@ -649,7 +679,11 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
       test_file.write(f'def {module_name}UnitTest():\n')
 
     for py_class in module_classes:
-      code = py_class.generate_bindings()
+      code = py_class.generate_forward_declaration()
+      module_file.write(code)
+
+    for py_class in module_classes:
+      code = py_class.generate_bindings(foward_declared=True)
       module_file.write(code)
       if py_class.is_filter:
         python_code = py_class.generate_python_interface(module_name)

From 9d172b301b52f8d36ad2aaf33ab2265c08981fe4 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 21 May 2021 14:45:44 -0400
Subject: [PATCH 380/397] When moving the data arrays, actually move the array.

The data arrays that were set for things such as the vertex shared list were not
being removed from the source Attribute Matrix when the user selected to have the
data MOVED instead of COPIED.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 51c3f6fa5b..6d79246efc 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -48,7 +48,6 @@
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
-#include "SIMPLib/FilterParameters/StringFilterParameter.h"
 #include "SIMPLib/Geometry/EdgeGeom.h"
 #include "SIMPLib/Geometry/HexahedralGeom.h"
 #include "SIMPLib/Geometry/ImageGeom.h"
@@ -266,17 +265,17 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 1);
 
-    m_XBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getXBoundsArrayPath(), cDims);
+    m_XBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getXBoundsArrayPath(), cDims);
     if(m_XBoundsPtr.lock())
     {
       m_XBounds = m_XBoundsPtr.lock()->getPointer(0);
     }
-    m_YBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getYBoundsArrayPath(), cDims);
+    m_YBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getYBoundsArrayPath(), cDims);
     if(m_YBoundsPtr.lock())
     {
       m_YBounds = m_YBoundsPtr.lock()->getPointer(0);
     }
-    m_ZBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getZBoundsArrayPath(), cDims);
+    m_ZBoundsPtr = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getZBoundsArrayPath(), cDims);
     if(m_ZBoundsPtr.lock())
     {
       m_ZBounds = m_ZBoundsPtr.lock()->getPointer(0);
@@ -314,8 +313,6 @@ void CreateGeometry::dataCheck()
       DataContainer::Pointer dc = dca->getDataContainer(getXBoundsArrayPath());
       AttributeMatrix::Pointer am = dc->getAttributeMatrix(getXBoundsArrayPath());
 
-      auto nameList = am->getAttributeArrayNames();
-
       FloatArrayType::Pointer farray = std::dynamic_pointer_cast<FloatArrayType>(am->removeAttributeArray(getXBoundsArrayPath().getDataArrayName()));
       rectgrid->setXBounds(farray);
 
@@ -338,7 +335,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath0(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath0(), cDims);
 
     if(getErrorCode() < 0)
     {
@@ -352,8 +349,14 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      vertex = VertexGeom::CreateGeometry(verts, SIMPL::Geometry::VertexGeometry);
-      getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath0())->removeAttributeArray(getSharedVertexListArrayPath0().getDataArrayName());
+      AttributeMatrix::Pointer am = getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath0());
+      if(nullptr != verts.get() )
+      {
+        // Remove from the Attribute Matrix FIRST
+        IDataArray::Pointer vertsToRemove = am->removeAttributeArray(getSharedVertexListArrayPath0().getDataArrayName());
+        // Assign the Verts to the newly create VertexGeom
+        vertex = VertexGeom::CreateGeometry(verts, SIMPL::Geometry::VertexGeometry);
+      }
     }
     dc->setGeometry(vertex);
 
@@ -367,7 +370,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath1(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath1(), cDims);
     cDims[0] = 2;
     m_EdgesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedEdgeList>(this, getSharedEdgeListArrayPath(), cDims);
     if(m_EdgesPtr.lock())
@@ -388,9 +391,9 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      edge = EdgeGeom::CreateGeometry(m_EdgesPtr.lock(), verts, SIMPL::Geometry::EdgeGeometry);
       getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath1())->removeAttributeArray(getSharedVertexListArrayPath1().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getSharedEdgeListArrayPath())->removeAttributeArray(getSharedEdgeListArrayPath().getDataArrayName());
+      edge = EdgeGeom::CreateGeometry(m_EdgesPtr.lock(), verts, SIMPL::Geometry::EdgeGeometry);
     }
     dc->setGeometry(edge);
 
@@ -408,7 +411,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath2(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath2(), cDims);
     m_TrisPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTriList>(this, getSharedTriListArrayPath(), cDims);
     if(m_TrisPtr.lock())
     {
@@ -428,9 +431,9 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      triangle = TriangleGeom::CreateGeometry(m_TrisPtr.lock(), verts, SIMPL::Geometry::TriangleGeometry);
       getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath2())->removeAttributeArray(getSharedVertexListArrayPath2().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getSharedTriListArrayPath())->removeAttributeArray(getSharedTriListArrayPath().getDataArrayName());
+      triangle = TriangleGeom::CreateGeometry(m_TrisPtr.lock(), verts, SIMPL::Geometry::TriangleGeometry);
     }
     dc->setGeometry(triangle);
 
@@ -448,7 +451,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath3(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath3(), cDims);
     cDims[0] = 4;
     m_QuadsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedQuadList>(this, getSharedQuadListArrayPath(), cDims);
     if(m_QuadsPtr.lock())
@@ -469,9 +472,9 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      quadrilateral = QuadGeom::CreateGeometry(m_QuadsPtr.lock(), verts, SIMPL::Geometry::QuadGeometry);
       getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath3())->removeAttributeArray(getSharedVertexListArrayPath3().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getSharedQuadListArrayPath())->removeAttributeArray(getSharedQuadListArrayPath().getDataArrayName());
+      quadrilateral = QuadGeom::CreateGeometry(m_QuadsPtr.lock(), verts, SIMPL::Geometry::QuadGeometry);
     }
     dc->setGeometry(quadrilateral);
 
@@ -489,7 +492,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath4(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath4(), cDims);
     cDims[0] = 4;
     m_TetsPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedTetList>(this, getSharedTetListArrayPath(), cDims);
     if(m_TetsPtr.lock())
@@ -510,9 +513,9 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      tetrahedral = TetrahedralGeom::CreateGeometry(m_TetsPtr.lock(), verts, SIMPL::Geometry::TetrahedralGeometry);
       getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath4())->removeAttributeArray(getSharedVertexListArrayPath4().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getSharedTetListArrayPath())->removeAttributeArray(getSharedTetListArrayPath().getDataArrayName());
+      tetrahedral = TetrahedralGeom::CreateGeometry(m_TetsPtr.lock(), verts, SIMPL::Geometry::TetrahedralGeometry);
     }
 
     dc->setGeometry(tetrahedral);
@@ -531,7 +534,7 @@ void CreateGeometry::dataCheck()
   {
     std::vector<size_t> cDims(1, 3);
 
-    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<DataArray<float>>(this, getSharedVertexListArrayPath5(), cDims);
+    FloatArrayType::Pointer verts = getDataContainerArray()->getPrereqArrayFromPath<FloatArrayType>(this, getSharedVertexListArrayPath5(), cDims);
     cDims[0] = 8;
     m_HexesPtr = getDataContainerArray()->getPrereqArrayFromPath<SharedHexList>(this, getSharedHexListArrayPath(), cDims);
     if(m_HexesPtr.lock())
@@ -552,9 +555,9 @@ void CreateGeometry::dataCheck()
     }
     else
     {
-      hexahedral = HexahedralGeom::CreateGeometry(m_HexesPtr.lock(), verts, SIMPL::Geometry::HexahedralGeometry);
       getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath5())->removeAttributeArray(getSharedVertexListArrayPath5().getDataArrayName());
       getDataContainerArray()->getAttributeMatrix(getSharedHexListArrayPath())->removeAttributeArray(getSharedHexListArrayPath().getDataArrayName());
+      hexahedral = HexahedralGeom::CreateGeometry(m_HexesPtr.lock(), verts, SIMPL::Geometry::HexahedralGeometry);
     }
 
     dc->setGeometry(hexahedral);

From 261b04706ceb7827231aba8da6b381ee06412029 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 21 May 2021 14:47:32 -0400
Subject: [PATCH 381/397] Check for illegal or troublesome characters when
 importing CSV file.

Check for &, :, / or \ as those characters can cause issues down the road when written
to disk.
Minor include cleanup via removing headers that are not needed.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp          | 3 ---
 Source/SIMPLib/CoreFilters/ReadASCIIData.cpp                | 6 ++++++
 Source/SIMPLib/CoreFilters/ReadASCIIData.h                  | 3 ++-
 .../FilterParameterWidgets/ReadASCIIDataWidget.cpp          | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index 069ff4e5e1..e2089a07ad 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -34,7 +34,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ImportAsciDataArray.h"
 
-#include <fstream>
 #include <locale>
 
 #include <QtCore/QDateTime>
@@ -50,11 +49,9 @@
 #include "SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h"
 #include "SIMPLib/FilterParameters/InputFileFilterParameter.h"
 #include "SIMPLib/FilterParameters/IntFilterParameter.h"
-#include "SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h"
 #include "SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h"
 #include "SIMPLib/FilterParameters/NumericTypeFilterParameter.h"
 #include "SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h"
-#include "SIMPLib/FilterParameters/SeparatorFilterParameter.h"
 
 enum createdPathID : RenameDataPath::DataID_t
 {
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
index 783e38a364..984023e135 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.cpp
@@ -299,6 +299,12 @@ void ReadASCIIData::dataCheck()
           setErrorCondition(DUPLICATE_NAMES, ss);
           return;
         }
+        if(headerName.contains("&") || headerName.contains(":") || headerName.contains("/") || headerName.contains("\\") )
+        {
+          QString ss = "The header name \"" + headerName + "\" contains a character that will cause problems. Do Not use '&',':', '/' or '\\' in the header names.";
+          setErrorCondition(ILLEGAL_NAMES, ss);
+          return;
+        }
       }
     }
   }
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index b2cf6282a2..0a4b369921 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -108,7 +108,8 @@ class SIMPLib_EXPORT ReadASCIIData : public AbstractFilter
     INCONSISTENT_COLS = -103,
     CONVERSION_FAILURE = -104,
     DUPLICATE_NAMES = -105,
-    INVALID_ARRAY_TYPE = -106
+    INVALID_ARRAY_TYPE = -106,
+    ILLEGAL_NAMES = -107
   };
 
   /**
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index 49ee679bb6..a0fb1784f5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -43,7 +43,6 @@
 
 #include "SIMPLib/CoreFilters/ReadASCIIData.h"
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
-#include "SIMPLib/CoreFilters/util/AbstractDataParser.hpp"
 #include "SIMPLib/DataContainers/DataContainerArray.h"
 #include "SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h"
 #include "SIMPLib/Filtering/AbstractFilter.h"

From 56f35a7e0d6bfcb2229567cf731995161cfc80b5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Fri, 21 May 2021 15:03:47 -0400
Subject: [PATCH 382/397] NeighborLists are not written to XDMF Files as they
 serve no purpose.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 .../CoreFilters/ImportAsciDataArray.cpp       |  1 +
 Source/SIMPLib/DataArrays/NeighborList.cpp    | 76 -------------------
 Source/SIMPLib/DataArrays/NeighborList.hpp    |  6 +-
 3 files changed, 4 insertions(+), 79 deletions(-)

diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index e2089a07ad..c97f808658 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -34,6 +34,7 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "ImportAsciDataArray.h"
 
+#include <fstream>
 #include <locale>
 
 #include <QtCore/QDateTime>
diff --git a/Source/SIMPLib/DataArrays/NeighborList.cpp b/Source/SIMPLib/DataArrays/NeighborList.cpp
index 55035fe648..8f56ef6e81 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.cpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.cpp
@@ -179,10 +179,6 @@ IDataArray::Pointer NeighborList<T>::createNewArray(size_t numElements, const st
   return NeighborList<T>::CreateArray(numElements, dims, name, allocate);
 }
 
-/**
- * @brief isAllocated
- * @return
- */
 // -----------------------------------------------------------------------------
 template <typename T>
 bool NeighborList<T>::isAllocated() const
@@ -190,10 +186,6 @@ bool NeighborList<T>::isAllocated() const
   return true;
 }
 
-/**
- * @brief Gives this array a human readable name
- * @param name The name of this array
- */
 // -----------------------------------------------------------------------------
 template <typename T>
 void NeighborList<T>::setInitValue(T initValue)
@@ -201,20 +193,12 @@ void NeighborList<T>::setInitValue(T initValue)
   m_InitValue = initValue;
 }
 
-/**
- * @brief Sets all the values to value.
- */
 // -----------------------------------------------------------------------------
 template <typename T>
 void NeighborList<T>::initializeWithValue(T initValue, size_t offset)
 {
 }
 
-/**
- * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
- * can be a primitive like char, float, int or the name of a class.
- * @return
- */
 // -----------------------------------------------------------------------------
 template <typename T>
 void NeighborList<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
@@ -222,66 +206,6 @@ void NeighborList<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision)
   T value = 0x00;
   xdmfTypeName = "UNKNOWN";
   precision = 0;
-  if(typeid(value) == typeid(int8_t))
-  {
-    xdmfTypeName = "Char";
-    precision = 1;
-  }
-  if(typeid(value) == typeid(uint8_t))
-  {
-    xdmfTypeName = "UChar";
-    precision = 1;
-  }
-
-  if(typeid(value) == typeid(int16_t))
-  {
-    xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
-    precision = 0;
-  }
-  if(typeid(value) == typeid(uint16_t))
-  {
-    xdmfTypeName = "16 BIT NOT SUPPORTED BY XDMF";
-    precision = 0;
-  }
-
-  if(typeid(value) == typeid(int32_t))
-  {
-    xdmfTypeName = "Int";
-    precision = 4;
-  }
-  if(typeid(value) == typeid(uint32_t))
-  {
-    xdmfTypeName = "UInt";
-    precision = 4;
-  }
-
-  if(typeid(value) == typeid(int64_t))
-  {
-    xdmfTypeName = "Int";
-    precision = 8;
-  }
-  if(typeid(value) == typeid(uint64_t))
-  {
-    xdmfTypeName = "UInt";
-    precision = 8;
-  }
-
-  if(typeid(value) == typeid(float))
-  {
-    xdmfTypeName = "Float";
-    precision = 4;
-  }
-  if(typeid(value) == typeid(double))
-  {
-    xdmfTypeName = "Float";
-    precision = 8;
-  }
-
-  if(typeid(value) == typeid(bool))
-  {
-    xdmfTypeName = "uchar";
-    precision = 1;
-  }
 }
 
 // -----------------------------------------------------------------------------
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index cede348fa8..50c65e53eb 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -177,10 +177,10 @@ class NeighborList : public IDataArray
    * @brief Sets all the values to value.
    */
   virtual void initializeWithValue(T initValue, size_t offset = 0);
+
   /**
-   * @brief getTypeName Returns a string representation of the type of data that is stored by this class. This
-   * can be a primitive like char, float, int or the name of a class.
-   * @return
+   * @brief getXdmfTypeAndSize Returns the XDMF Type Name and precision.
+   * @return Returns UNKNOWN and 0 Since NeighborLists are not written to XDMF
    */
   void getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const override;
 

From 7e46d03674b7a9c10dcf08ea14dab458cfaf83cd Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Mon, 24 May 2021 09:50:40 -0400
Subject: [PATCH 383/397] Remove unused variable from neighborlist

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SIMPLib/DataArrays/NeighborList.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Source/SIMPLib/DataArrays/NeighborList.cpp b/Source/SIMPLib/DataArrays/NeighborList.cpp
index 8f56ef6e81..d8ee27fa24 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.cpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.cpp
@@ -203,7 +203,6 @@ void NeighborList<T>::initializeWithValue(T initValue, size_t offset)
 template <typename T>
 void NeighborList<T>::getXdmfTypeAndSize(QString& xdmfTypeName, int& precision) const
 {
-  T value = 0x00;
   xdmfTypeName = "UNKNOWN";
   precision = 0;
 }

From 375653013742cfe9aed603fc9a6bab6d9c96be31 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Wed, 2 Jun 2021 12:42:48 -0400
Subject: [PATCH 384/397] Added simpl_helpers to dream3d conda package

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                               |   5 +-
 Wrapping/Python/SIMPL/simpl_helpers_conda.py | 644 +++++++++++++++++++
 2 files changed, 648 insertions(+), 1 deletion(-)
 create mode 100644 Wrapping/Python/SIMPL/simpl_helpers_conda.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf9915b1c5..49b68f1fd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -562,7 +562,10 @@ if(SIMPL_WRAP_PYTHON)
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
   )
 
-  if(NOT DREAM3D_ANACONDA)
+  if(DREAM3D_ANACONDA)
+    configure_file(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers_conda.py ${DREAM3D_PYTHON_PACKAGE_DIR}/simpl_helpers.py)
+    file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import simpl_helpers\n")
+  else()
     add_custom_target(CopyPythonSupport ALL
       COMMAND ${CMAKE_COMMAND} -E copy
         ${SIMPLProj_SOURCE_DIR}/Wrapping/Python/SIMPL/simpl_helpers.py
diff --git a/Wrapping/Python/SIMPL/simpl_helpers_conda.py b/Wrapping/Python/SIMPL/simpl_helpers_conda.py
new file mode 100644
index 0000000000..daae1fa8fd
--- /dev/null
+++ b/Wrapping/Python/SIMPL/simpl_helpers_conda.py
@@ -0,0 +1,644 @@
+from dream3d import simpl
+from dream3d import simplpy as d3d
+
+import numpy as np
+
+from enum import IntEnum
+
+def ReadDREAM3DFile(data_container_array, input_file):
+    '''
+    Executes the filter DataContainerReader and returns the error. This will read the entire
+    file into memory.
+
+    :param DataContainerArray data_container_array: The DataContainerArray that the filter will use.
+    :param QString input_file: Sets the InputFile value.
+    :return: ErrorCode produced by the filter
+    :rtype: int
+    '''
+    
+    # Create a DataContainerReader and read the DataStructure into a proxy
+    data_container_reader = simpl.DataContainerReader.New()
+    dcaProxy = data_container_reader.readDataContainerArrayStructure(input_file)
+
+    # Now that we have our DataContainerProxy, read the file
+    data_container_reader = simpl.DataContainerReader.New()
+    data_container_reader.setDataContainerArray(data_container_array)
+    data_container_reader.InputFile = input_file
+    data_container_reader.OverwriteExistingDataContainers = True
+    data_container_reader.InputFileDataContainerArrayProxy = dcaProxy
+    data_container_reader.execute()
+    executeError = data_container_reader.ErrorCode
+    return executeError
+
+def CreateDataContainerArray():
+    '''
+    Creates a Top level Data Container Array object. Everything will get packed in this
+    '''
+    dca = simpl.DataContainerArray.New()
+    return dca
+
+def CreateDataContainer(name):
+    '''
+    Creates a DataContainer object
+
+    Keyword arguments:
+    name -- The name of the DataContainer    
+    '''
+    dc = simpl.DataContainer(name)
+    return dc
+
+def CreateAttributeMatrix(dims, name, type):
+    '''
+    Creates an AttriuteMatrix of the given type
+
+    Keyword arguments:
+    dims -- the dimensions of the AttributeMatrix
+    name -- The name of the AttributeMatrix
+    type -- the type of the AttributeMatrix
+    '''
+    am = simpl.AttributeMatrix.New(dims, name, type)
+    return am
+
+def WriteDREAM3DFile(path, dca, verbose=False):
+    '''
+    Writes a dream3d file and returns the error code
+
+    Keyword arguments:
+    path -- The output path of the file.
+    dca -- The DataContainerArray to write
+    '''
+    # Lets write out the whole Heirarchy to a .dream3d file
+    if verbose:
+        print('Creating DREAM3D Writer filter....')
+    writer = simpl.DataContainerWriter.New()
+    writer.OutputFile = (path)
+    if verbose:
+        print('Writing to file:', path)
+    writer.setDataContainerArray(dca)
+    writer.execute()
+    if(writer.ErrorCode != 0):
+        print('Error %d writing DREAM.3D File to path %s' % writer.ErrorCode, path)
+    return writer.ErrorCode
+
+def CreateDataArray(name, shape, cDims, type):
+    '''
+    Creates a data array with the attributes listed. The array will be a numpy array in 'C' ordering.
+
+    Keyword arguments:
+    name -- The name of the DataArray
+    shape -- The dimensions of the DataArray. Note that the array will be flattened into a contiguous array
+    cDims -- The component dimensions, i.e., the number of components at each tuple.
+    type -- The numpy type of array to create: 8,16,32,64 signed/unsiged and 32/64 floats are supported
+    '''
+    # Create a numpy array of ones to hold our data
+    ashape = np.append([np.prod(shape)], cDims)
+    # Create a numpy array to hold our data
+    num_array = np.ndarray(ashape, dtype=type, order='C')
+    # Get the numpy array as contiguous
+    z = np.asarray(num_array)
+    if not z.flags.contiguous:
+        z = np.ascontiguousarray(z)
+    z.fill(0)
+    assert z.flags.contiguous, 'Only contiguous arrays are supported.'
+    assert not np.issubdtype(z.dtype, np.complex128), \
+            'Complex numpy arrays cannot be converted to vtk arrays.'\
+            'Use real() or imag() to get a component of the array before'\
+            ' passing it to vtk.'
+    
+    # Declare the number of components for the array
+    if type == np.int8:
+        array = simpl.Int8Array(z, name, False)
+    elif type == np.uint8:
+        array = simpl.UInt8Array(z, name, False)
+    elif type == np.int16:
+        array = simpl.Int16Array(z, name, False)
+    elif type == np.uint16:
+        array = simpl.UInt16Array(z, name, False)
+    elif type == np.int32:
+        array = simpl.Int32Array(z, name, False)
+    elif type == np.uint32:
+        array = simpl.UInt32Array(z, name, False)
+    elif type == np.int64:
+        array = simpl.Int64Array(z, name, False)
+    elif type == np.uint64:
+        array = simpl.UInt64Array(z, name, False)
+    elif type == np.float32:
+        array = simpl.FloatArray(z, name, False)
+    elif type == np.double:
+        array = simpl.DoubleArray(z, name, False)     
+    
+    # we need to return the 'z' numpy array so it does not go out of scope.
+    return (z, array)
+
+def CreateDataContainerProxy(dca, data_array_paths):
+    '''
+    Create a DataContainerProxy
+    \ndca: Data Container Array
+    \ndata_array_paths: list of DataArrayPaths (or list/tuple equivalent) to be 'checked'
+    '''
+    dcap = simpl.DataContainerArrayProxy()
+    checked = 2 # The flag for 'checking' an item
+    for data_array_path in data_array_paths:
+        data_container_name = ''
+        attr_matrix_name = ''
+        data_array_name = ''
+        if isinstance(data_array_path, (list, tuple)):
+            data_container_name = data_array_path[0]
+            attr_matrix_name = data_array_path[1]
+            data_array_name = data_array_path[2]
+        if isinstance(data_array_path, simpl.DataArrayPath):
+            data_container_name = data_array_path.DataContainerName
+            attr_matrix_name = data_array_path.AttributeMatrixName
+            data_array_name = data_array_path.DataArrayName
+        if data_container_name == '':
+            continue
+        elif attr_matrix_name == '':
+            dcap.getDataContainerProxy(data_container_name).Flag =checked
+        elif data_array_name == '':
+            dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name).Flag =checked
+        else:
+            dcap.getDataContainerProxy(data_container_name).getAttributeMatrixProxy(attr_matrix_name) \
+            .getDataArrayProxy(data_array_name).Flag =checked
+    return dcap
+
+def CreateGeometry(data_container_array, array_handling, geometry_type, data_container_name, treat_warnings_as_errors, dimensions = simpl.IntVec3([0,0,0]),
+origin = simpl.FloatVec3([0,0,0]), spacing = simpl.FloatVec3([0,0,0]), cell_attribute_matrix_name='', x_bounds_array_path = simpl.DataArrayPath('', '', ''),
+y_bounds_array_path = simpl.DataArrayPath('', '', ''), z_bounds_array_path = simpl.DataArrayPath('', '', ''), 
+shared_vertex_list_array_path = simpl.DataArrayPath('', '', ''), vertex_attribute_matrix_name = '', shared_edge_list_array_path = simpl.DataArrayPath('', '', ''),
+edge_attribute_matrix_name = '', shared_tri_list_array_path = simpl.DataArrayPath('', '', ''), face_attribute_matrix_name='',
+shared_quad_list_array_path = simpl.DataArrayPath('', '', ''), shared_tet_list_array_path = simpl.DataArrayPath('', '', '')):
+    '''
+    Create Geometry
+
+    Required inputs: 
+    * Data Container Array
+    * Array Handling
+    * Geometry Type [simpl.IGeometry.Type.*  (where * is Image, RectGrid, Vertex, Edge, Triangle, Quad, Tetrahedral)]
+    * Data Container Name
+    * Treat Warnings As Errors
+
+    Options by Geometry Type
+    * Image
+        * Dimensions
+        * Origin
+        * Resolution
+        * Cell Attribute Matrix Name
+    * Rectilinear grid
+        * X Bounds
+        * Y Bounds
+        * Z Bounds
+        * Cell Attribute Matrix Name
+    * Vertex
+        * Vertex List
+        * Vertex Attribute Matrix Name
+    * Edge
+        * Shared Vertex List
+        * Edge List
+        * Vertex Attribute Matrix Name
+        * Edge Attribute Matrix Name
+    * Triangle
+        * Shared Vertex List
+        * Triangle List
+        * Vertex Attribute Matrix Name
+        * Face Attribute Matrix Name
+    * Quadrilateral
+        * Shared Vertex List
+        * Quadrilateral List
+        * Vertex Attribute Matrix Name
+        * Face Attribute Matrix Name
+    * Tetrahedral
+        * Shared Vertex List
+        * Tetrahedral List
+        * Vertex Attribute Matrix Name
+        * Cell Attribute Matrix Name
+
+    '''
+
+    # For all geometry types
+    create_geometry = simpl.CreateGeometry.New()
+    create_geometry.setDataContainerArray(data_container_array)
+    create_geometry.DataContainerName = simpl.DataArrayPath(data_container_name, '', '')
+    create_geometry.GeometryType = geometry_type
+    create_geometry.TreatWarningsAsErrors = treat_warnings_as_errors
+
+    # Array Handling
+    if not type(array_handling) == ArrayHandling and is_number(array_handling):
+        create_geometry.ArrayHandling = array_handling
+    elif array_handling == ArrayHandling.CopyArrays or 'copy' in array_handling.toLowerCase():
+        create_geometry.ArrayHandling = 0
+    elif  array_handling == ArrayHandling.MoveArrays or 'move' in array_handling.toLowerCase():
+        create_geometry.ArrayHandling = 1        
+
+	# Set required parameters based on Geometry Type
+    if geometry_type == simpl.IGeometry.Type.Image:     
+        create_geometry.Dimensions = dimensions
+        create_geometry.Origin = origin
+        create_geometry.Spacing= spacing
+        create_geometry.ImageCellAttributeMatrixName = cell_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.RectGrid:
+        create_geometry.XBoundsArrayPath = x_bounds_array_path
+        create_geometry.YBoundsArrayPath = y_bounds_array_path
+        create_geometry.ZBoundsArrayPath = z_bounds_array_path
+        create_geometry.RectGridCellAttributeMatrixName = cell_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.Vertex:
+        create_geometry.SharedVertexListArrayPath0 = shared_vertex_list_array_path
+        create_geometry.VertexAttributeMatrixName0 = vertex_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.Edge:
+        create_geometry.SharedVertexListArrayPath1 = shared_vertex_list_array_path
+        create_geometry.VertexAttributeMatrixName1 = vertex_attribute_matrix_name
+        create_geometry.SharedEdgeListArrayPath = shared_edge_list_array_path
+        create_geometry.EdgeAttributeMatrixName = edge_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.Triangle:
+        create_geometry.SharedVertexListArrayPath2 = shared_vertex_list_array_path
+        create_geometry.VertexAttributeMatrixName2 = vertex_attribute_matrix_name
+        create_geometry.SharedTriListArrayPath = shared_tri_list_array_path
+        create_geometry.FaceAttributeMatrixName0 = face_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.Quad:
+        create_geometry.SharedVertexListArrayPath3 = shared_vertex_list_array_path
+        create_geometry.VertexAttributeMatrixName3 = vertex_attribute_matrix_name
+        create_geometry.SharedQuadListArrayPath = shared_quad_list_array_path
+        create_geometry.FaceAttributeMatrixName1 = face_attribute_matrix_name
+    elif geometry_type == simpl.IGeometry.Type.Tetrahedral:
+        create_geometry.SharedVertexListArrayPath4 = shared_vertex_list_array_path
+        create_geometry.VertexAttributeMatrixName4 = vertex_attribute_matrix_name
+        create_geometry.SharedTetListArrayPath = shared_tet_list_array_path
+        create_geometry.TetCellAttributeMatrixName = cell_attribute_matrix_name
+
+    # Execute the filter and return the error condition
+    create_geometry.execute()
+    executeError = create_geometry.ErrorCode
+    return executeError
+
+def CreateAsciiWizardData(input_file_path, begin_index, number_of_lines, delimiters, consecutive_delimiters,
+automatic_AM, selected_path, headers, attribute_matrix_type, tuple_dimensions, data_types):
+    '''
+    Creates an ASCII Wizard Data object for use in the ReadASCIIData filter
+    \ninput_file_path: a string containing the path to the input file
+    \nbegin_index: an integer for the line number to start reading in the file
+    \nnumber_of_lines: an integer of the number of lines to read
+    \ndelimiters: a list of characters to parse file with (ie. [',', ':'])
+    \nconsecutive_delimiters: a boolean for whether to treat consecutive delimiters as one
+    \nautomatic_AM: a boolean for whether to create a new attribute matrix
+    \nselected_path: a DataArrayPath object for the input data
+    \nheaders: a list of strings containing header names (ie. ['x', 'y', 'z'])
+    \nattribute_matrix_type: either an AttributeMatrix.Type object or the integer equivalent
+    \ntuple_dimensions: a list of integers for the dimensions of each tuple
+    \ndata_types: a list of strings for the data types (ie. ['float', 'float', 'float'])
+    '''
+    wizardData = {
+    'inputFilePath': input_file_path,
+    'beginIndex': begin_index,
+    'numberOfLines': number_of_lines,
+    'delimiters': delimiters,    
+    'consecutiveDelimiters': consecutive_delimiters,
+    'automaticAM': automatic_AM,
+    'selectedPath': selected_path,
+    'headers': headers,
+    'attrMatType': attribute_matrix_type,
+    'tupleDimensions': tuple_dimensions,
+    'dataTypes': data_types
+    }
+    return wizardData
+
+def CreateDynamicTableData(data, columnheaders = [], rowheaders = []):
+    '''
+    Creates a DynamicTableData object for use in creation of attribute matrices
+    \ndata: a list of lists of integer values for the tuple dimensions of the attribute matrix
+    \ncolumnheaders: a list of the column headers for the data (optional)
+    \nrowheaders: a list of the row headers for the data (optional)
+    '''
+    if not columnheaders:
+        cols = len(data[0])
+        for i in range(cols):
+            columnheaders.append(str(i))
+    if not rowheaders:
+        rows = len(data)
+        for j in range(rows):
+            rowheaders.append(str(j))
+    
+    tabledata = list()
+    if isinstance(data, simpl.VectorDouble):
+        dtd = simpl.DynamicTableData(data, columnheaders, rowheaders)
+        return dtd
+    # Convert list of lists into list of VectorDoubles
+    else:
+        for row in data:
+            newRow = simpl.VectorDouble()
+            for col in row:
+                newRow.append(col)
+            tabledata.append(newRow)
+        dtd = simpl.DynamicTableData(tabledata, columnheaders, rowheaders)        
+        return dtd
+
+def RemoveArray(dca, path):
+    '''
+    Removes the array given by 'path'
+    \ndca: Data Container Array containing the array to be removed
+    \npath: Either a DataArrayPath object or a list of 3 strings (data container, attribute matrix name, array name)
+    \nReturns a boolean variable of True if successful, False otherwise
+    '''
+    # Validate path object and get names of path elements
+    datacontainername = ''
+    attrmatrixname = ''
+    dataarrayname = ''
+    if isinstance(path, simpl.DataArrayPath):
+        datacontainername = path.DataContainerName
+        attrmatrixname = path.AttributeMatrixName
+        dataarrayname = path.DataArrayName
+    elif isinstance(path, tuple) or isinstance(path, list):
+        if len(path) != 3:
+            return False
+        datacontainername = path[0]
+        attrmatrixname = path[1]
+        dataarrayname = path[2]
+    else:
+        print('Invalid path object')
+        return False
+    
+    # Construct Data Container Array Proxy
+    dcap = simpl.DataContainerArrayProxy()
+    if datacontainername == '':
+        return False
+    elif attrmatrixname == '' and dataarrayname == '':
+        dcap.getDataContainerProxy(datacontainername).Flag =2
+    elif dataarrayname == '':
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).Flag =2
+    else:
+        dcap.getDataContainerProxy(datacontainername).Flag =0
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).Flag =0
+        dcap.getDataContainerProxy(datacontainername).getAttributeMatrixProxy(attrmatrixname).getDataArrayProxy(dataarrayname).Flag =2
+
+    err = d3d.remove_arrays(dca, dcap)
+    if err < 0:
+        print('Error condition for Remove Arrays: %d' % err)
+        return False
+    else:      
+        return True
+
+def RemoveArrays(dca, paths):
+    '''
+    Remove the list of data array paths
+    \ndca: Data Container Array containing the arrays to be removed
+    \npaths: List of either DataArrayPath objects or of lists of 3 strings (data container, attribute matrix name, array name)
+    \nReturns a boolean variable of True if successful, False otherwise
+    '''
+    success = True
+
+    for path in paths:
+        if not RemoveArray(dca, path):
+            success = False
+    
+    return success
+
+def MultiThresholdObjects(dca, destination_array_name, selected_thresholds):
+    '''
+    Create and run a Multi Threshold Objects filter
+    \ndca: Data Container Array containing the arrays
+    \ndestination_array_name: The name of the destination array for storing the results
+    \nselected_thresholds: A list of tuples containing the Data Container Name, Attribute Matrix Name, Data Array Name,  a Comparison Operator, and a Comparison Value
+    \n The comparison operator choices are ['<', '>', '=', '!='] (or their index in this list)
+    \n The comparison value is an double floating point number to compare the values with. 
+    '''
+    comparison_operators = ['<', '>', '=', '!=']
+    if len(selected_thresholds) == 0:
+        print('Insufficient data passed')
+        return
+    thresholds = simpl.ComparisonInputs()
+    for selected_threshold in selected_thresholds:
+        if len(selected_threshold) < 5:
+            print('Selected threshold has insufficient data')
+            continue
+        datacontainername = selected_threshold[0]
+        attrmatrixname = selected_threshold[1]
+        dataarrayname = selected_threshold[2]
+        comparison_operator = selected_threshold[3]
+        if not is_number(comparison_operator):
+            comparison_operator = comparison_operators.index(selected_threshold[3])
+            if comparison_operator < 0:
+                print('Invalid comparison operator passed in selected threshold')
+                continue
+        elif comparison_operator < 0 or comparison_operator > (len(comparison_operators) - 1):
+            print('Invalid comparison operator passed in selected threshold')
+            continue
+        comparison_value = selected_threshold[4]
+        if not is_number(comparison_value):
+            print('Non-numerical value passed for comparison value')
+        thresholds.addInput(datacontainername, attrmatrixname, dataarrayname, comparison_operator, comparison_value)
+    
+    err = d3d.multi_threshold_objects(dca, destination_array_name, thresholds)
+    return err
+
+def MultiThresholdObjects2(dca, source_path, destination_array_name, selected_thresholds):
+    '''
+    Create and run a Multi Threshold Objects filter
+    \ndca: Data Container Array containing the arrays
+    \nsource_path: Data Array Path or tuple/list of 3 strings representing a Data Array Path
+    \ndestination_array_name: The name of the destination array for storing the results
+    \nselected_thresholds: A list of Comparison Sets that has a DataContainerName, AttributeMatrixName, and a Union Operator (AND, OR)
+    \nA list of tuples containing the AttributeArrayName, a CompOperator, and a CompValue
+    \nThe comparison operator choices are ['<', '>', '=', '!='] (or their index in this list)
+    \nThe comparison value is an double floating point number to compare the values with. 
+    \nNOTE: Comparison Sets can contain Comparison Sets or Values but Comparison Values cannot contain either
+    \n Place the UnionOperator in front of the Comparison Values in a a Comparison Set
+    \n Comparison Sets should be lists in [] form and Comparison Values should be tuples in () form
+    \nExample:
+    \n['AND', (CV1), (CV2), ['OR', (CV3, (CV4)]] ==> CV1 && CV2 && (CV3 OR CV4)
+    '''
+    thresholds = simpl.ComparisonInputsAdvanced()
+    topLevelComparisonSet = simpl.ComparisonSet()
+    for selected_threshold in selected_thresholds:
+        if selected_threshold == 'AND':
+            topLevelComparisonSet.UnionOperator = 0
+        elif selected_threshold == 'OR':
+            topLevelComparisonSet.UnionOperator = 1
+        if isinstance(selected_threshold, tuple):
+            comparisonValue = simpl.ComparisonValue()
+            comparisonValue.AttributeArrayName = selected_threshold[0]
+            comparisonValue.CompOperator = selected_threshold[1]
+            comparisonValue.CompValue = selected_threshold[2]
+            topLevelComparisonSet.addComparison(comparisonValue)
+        if isinstance(selected_threshold, list):
+            comparisonSet = BuildSelectedThresholds(selected_threshold)
+            topLevelComparisonSet.addComparison(comparisonSet)
+    thresholds.addInput(topLevelComparisonSet)
+    if isinstance(source_path, (tuple, list)):
+        thresholds.DataContainerName = source_path[0]
+        thresholds.AttributeMatrixName = source_path[1]
+    elif isinstance(source_path, simpl.DataArrayPath):
+        thresholds.DataContainerName = source_path.DataContainerName
+        thresholds.AttributeMatrixName = source_path.AttributeMatrixName
+    else:
+        print('Invalid source path')
+        return -1        
+    
+    err = d3d.multi_threshold_objects2(dca, destination_array_name, thresholds)
+    if err < 0:
+        print('MultiThresholdObjects ErrorCode: %d' % err)
+    return err
+
+def BuildSelectedThresholds(selected_threshold):
+    '''
+    Recursive function to build a Comparison Set
+    \nselected_threshold: A nested Comparison Set to be built
+    '''
+    # AND = 0 / OR = 1
+    newComparisonSet = simpl.ComparisonSet()
+    if selected_threshold[0] == 'AND':
+        newComparisonSet.UnionOperator = 0
+    elif selected_threshold[0] == 'OR':
+        newComparisonSet.UnionOperator = 1
+    for element in selected_threshold:
+        if isinstance(element, tuple):
+            comparisonValue = simpl.ComparisonValue()
+            comparisonValue.AttributeArrayName = element[0]
+            comparisonValue.CompOperator = element[1]
+            comparisonValue.CompValue = element[2]
+            newComparisonSet.addComparison(comparisonValue)
+        if isinstance(element, list):
+            comparisonSet = BuildSelectedThresholds(element)
+            newComparisonSet.addComparison(comparisonSet) 
+    return newComparisonSet
+
+def MoveData(dca, what_to_move, source_path, destination_path):
+    '''
+    Move the data from source to destination
+    \ndca: Data Container Array containing project data
+    \nwhat_to_move: Either 'Attribute Matrix' or 'Data Array' (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
+    \nsource_path: The full Data Array Path to the object being moved (or a list/tuple of strings)
+    \ndestination: The full Data Array Path where the object is moved to (or a list/tuple of strings)
+    '''
+    what_to_move_number = 0
+    if not isinstance(what_to_move, (simpl.AttributeMatrix, simpl.IDataArray)):
+        if what_to_move == 'Data Array' or what_to_move == 'Attribute Array' or what_to_move == WhatToMove.AttributeArray:
+            what_to_move_number = 1
+        elif what_to_move != 'Attribute Matrix' and what_to_move != WhatToMove.AttributeMatrix:
+            print('Invalid type for \'what to move\'')
+            return -1
+    if not isinstance(source_path, (simpl.DataArrayPath, list, tuple)):
+        print('Invalid source path')
+        return -1
+    if not isinstance(destination_path, (simpl.DataArrayPath, list, tuple)):
+        print('Invalid destination path')
+        return -1
+    
+    destination_datacontainername = ''
+    if isinstance(destination_path, simpl.DataArrayPath):
+        destination_datacontainername = destination_path.DataContainerName
+    else:
+        destination_datacontainername = destination_path[0]
+    destination_attrmatrixname = ''
+    if isinstance(destination_path, simpl.DataArrayPath):
+        destination_attrmatrixname = destination_path.AttributeMatrixName
+    else:
+        destination_attrmatrixname = destination_path[1]
+    destination_dataarrayname = ''
+    if isinstance(destination_path, simpl.DataArrayPath):
+        destination_dataarrayname = destination_path.DataArrayName
+    else:
+        destination_dataarrayname = destination_path[2]
+    
+    source_datacontainername = ''
+    if isinstance(source_path, simpl.DataArrayPath):
+        source_datacontainername = source_path.DataContainerName
+    else:
+        source_datacontainername = source_path[0]
+    source_attrmatrixname = ''
+    if isinstance(source_path, simpl.DataArrayPath):
+        source_attrmatrixname = source_path.AttributeMatrixName
+    else:
+        source_attrmatrixname = source_path[1]
+    source_dataarrayname = ''
+    if isinstance(source_path, simpl.DataArrayPath):
+        source_dataarrayname = source_path.DataArrayName
+    else:
+        source_dataarrayname = source_path[2]
+
+    err = d3d.move_data(dca, what_to_move_number, destination_datacontainername, simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, ''),
+    simpl.DataArrayPath(destination_datacontainername, destination_attrmatrixname, ''), simpl.DataArrayPath(source_datacontainername, source_attrmatrixname, source_dataarrayname))
+    if err < 0:
+        print('MoveData ErrorCode %d: ' % err)
+    return err
+
+def MoveMultiData(dca, what_to_move, source_paths, destination_path):
+    '''
+    Moves multiple data arrays or attribute matrices to the destination path
+    \ndca: Data Container Array with the data in it
+    \nwhat_to_move: Either 'Attribute Matrix' or 'Data Array' (or the actual type such as simpl.AttributeMatrix or simpl.IDataArray)
+    \nsource_paths: A list of full Data Array Paths to the objects being moved (or a list of list/tuple of strings)
+    \ndestination: The full Data Array Path where the object is moved to (or a list/tuple of strings)
+    '''
+    if len(source_paths) < 1:
+        print('Invalid or insufficient source paths')
+        return -1
+    err = 0
+    for source_path in source_paths:
+        err = MoveData(dca, what_to_move, source_path, destination_path)
+    return err
+
+def is_number(s):
+    try:
+        float(s)
+        return True
+    except ValueError:
+        pass
+ 
+    try:
+        import unicodedata
+        unicodedata.numeric(s)
+        return True
+    except (TypeError, ValueError):
+        pass
+ 
+    return False
+
+# Custom enumerations for Python
+
+class ArrayHandling(IntEnum):
+    CopyArrays = 0
+    MoveArrays = 1
+
+class FeatureGeneration(IntEnum):
+    GenerateFeatures = 0
+    AlreadyHaveFeatures = 1
+
+class SaveShapeDescArrays(IntEnum):
+    DoNotSave = 0
+    SaveToNewAttrMatrix = 1
+    AppendToExistingAttrMatrix = 2
+
+class Delimiter(IntEnum):
+    COMMA = 0
+    SEMICOLON = 1
+    COLON = 2
+    TAB = 3
+
+class Hemisphere(IntEnum):
+    Northern = 0
+    Southern = 1
+
+class WhatToMove(IntEnum):
+    AttributeMatrix = 0
+    AttributeArray = 1
+
+class AngleRepresentation(IntEnum):
+    Radians = 0
+    Degrees = 1
+    Invalid = 2
+
+class BadDataOperation(IntEnum):
+    Dilate = 0
+    Erode = 1
+
+class ReferenceOrientation(IntEnum):
+    AverageOrientation = 0
+    OrientationAtFeatureCentroid = 1
+
+class DistributionFitType(IntEnum):
+    Beta = 0
+    Lognormal = 1
+    Power = 2
+
+class ObjectToCopy(IntEnum):
+    DataContainer = 0
+    AttributeMatrix = 1
+    AttributeArray = 2

From 86b74a150c111f34e461b72c48eb35d1b6f736f5 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Wed, 7 Jul 2021 11:39:51 -0400
Subject: [PATCH 385/397] Fix unexpected null pointer warning filter drag leave
 event.

What we found out today: You can call a member function of a null pointer as long
 as the function never dereferences 'this'. Now we know.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Source/SVWidgetsLib/Widgets/PipelineItem.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
index 42d19a2f76..8e05c865e4 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineItem.cpp
@@ -52,7 +52,10 @@ PipelineItem::PipelineItem(const QVector<QVariant>& data, PipelineItem* parent)
 PipelineItem::~PipelineItem()
 {
   qDeleteAll(m_ChildItems);
-  m_FilterInputWidget->deleteLater();
+  if(nullptr != m_FilterInputWidget)
+  {
+    m_FilterInputWidget->deleteLater();
+  }
 }
 
 // -----------------------------------------------------------------------------

From 653ce8ae85d92c7fe396bb973c27d65232e57a33 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 13 Jul 2021 12:45:53 -0400
Subject: [PATCH 386/397] Started document that has ideas of python examples
 that could be written.

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Examples/Examples.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Wrapping/Python/Examples/Examples.md

diff --git a/Wrapping/Python/Examples/Examples.md b/Wrapping/Python/Examples/Examples.md
new file mode 100644
index 0000000000..e5aa59d33c
--- /dev/null
+++ b/Wrapping/Python/Examples/Examples.md
@@ -0,0 +1,20 @@
+# SIMPL Python Example Ideas #
+
+## Python Wrapping Ideas ##
+
+Geometry:
+
++ Create a geomtery inside of DREAM3D (could mesh a synthetic, or from a reconstruction) and access the mesh data (Vertices and Triangles) along with the associated data from the python side.
+
++ Import a mesh on the python side and then pack that mesh into the DREAM.3D data structures. Bonus points to also associate cell or vertex data with the mesh
+
+Data:
+
++ Create an regular grid geometry with data on the python side of things, pack into a DREAM.3D data structure, run a DREAM.3D filter on the data, return to Python and further manipulate the data
+
+
+## Embedded Python ##
+
++ Create a python based filter that reads in Data and creates the proper Data Structure.
++ Create a python based filter that performs an advanced data analsysis or processing using python packages from conda-forge?
++ Create a filter that creates a triangle mesh using SciKits marching cubes algorithm

From 357f3a6f177401eb7b85bd6b11625f40dfee439a Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Tue, 20 Jul 2021 08:50:10 -0400
Subject: [PATCH 387/397] Adding more example python ideas

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Examples/Examples.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Wrapping/Python/Examples/Examples.md b/Wrapping/Python/Examples/Examples.md
index e5aa59d33c..0dc8861374 100644
--- a/Wrapping/Python/Examples/Examples.md
+++ b/Wrapping/Python/Examples/Examples.md
@@ -12,9 +12,10 @@ Data:
 
 + Create an regular grid geometry with data on the python side of things, pack into a DREAM.3D data structure, run a DREAM.3D filter on the data, return to Python and further manipulate the data
 
++ Show how to put generic data into the SIMPL Data Structure and then write that to a .dream3d file
 
 ## Embedded Python ##
 
-+ Create a python based filter that reads in Data and creates the proper Data Structure.
++ Create a python based filter that reads in (IMPORT) Data and creates the proper Data Structure.
 + Create a python based filter that performs an advanced data analsysis or processing using python packages from conda-forge?
 + Create a filter that creates a triangle mesh using SciKits marching cubes algorithm

From 0296ffb2313dc1add5c2b69d9f72a9c5c9b89a32 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 5 Aug 2021 07:59:07 -0400
Subject: [PATCH 388/397] Adding example python codes that show creating
 Geometries from scratch

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Wrapping/Python/Examples/use_case_01.py       | 98 +++++++++++++++++++
 Wrapping/Python/Examples/use_case_02.py       | 84 ++++++++++++++++
 .../Python/Testing/Create_Vertex_Geometry.py  |  4 +-
 3 files changed, 184 insertions(+), 2 deletions(-)
 create mode 100644 Wrapping/Python/Examples/use_case_01.py
 create mode 100644 Wrapping/Python/Examples/use_case_02.py

diff --git a/Wrapping/Python/Examples/use_case_01.py b/Wrapping/Python/Examples/use_case_01.py
new file mode 100644
index 0000000000..7adc0032df
--- /dev/null
+++ b/Wrapping/Python/Examples/use_case_01.py
@@ -0,0 +1,98 @@
+import argparse
+
+# Import SIMPL wrapping
+import dream3d.simpl as simpl
+import dream3d.simplpy as simplpy
+import dream3d.simpl_helpers as simpl_helpers
+
+# Import the OrientationAnalysis Filters
+import dream3d.orientationanalysispy as orientationanalysispy
+
+import numpy as np
+import matplotlib.pyplot as plt
+import math
+
+
+def read_ang_data(file_path: str):
+    # Create Data Container Array. Every Filter must be assigned a DataContainerArray. It is the root of the 
+    # Data Structure heirarchy.
+    dca = simpl.DataContainerArray()
+
+    # Execute the ReadAngData() filter from DREAM.3D. Note that the filter is executed immediately when
+    # the python code is executed.
+    err = orientationanalysispy.read_ang_data(data_container_array=dca,
+                                            data_container_name='EBSD Scan', 
+                                            cell_ensemble_attribute_matrix_name='Phase Data', 
+                                            cell_attribute_matrix_name='Scan Data',
+                                            input_file=file_path)
+    # Check for any errors that were encountered during the execution. Act on those errors if needed. The
+    # default code will just assert and quit() the python interpretor is there was an error. This probably is
+    # not very user friendly.
+    assert err == 0, f'ReadAngData ErrorCondition: {err}'
+
+    # Rotate Sample Reference Frame
+    # Most is self explanatory except the rotation_representation_choice where 0=Axis-Angle and 1=Rotation Matrix
+    err = simplpy.rotate_sample_ref_frame(data_container_array=dca, 
+                                        cell_attribute_matrix_path=simpl.DataArrayPath('EBSD Scan', 'Scan Data', ''),
+                                        rotation_axis=simpl.FloatVec3([0.0, 1.0, 0.0]), 
+                                        rotation_angle=180.0, 
+                                        slice_by_slice=False, 
+                                        rotation_table=simpl_helpers.CreateDynamicTableData([[0.0 for x in range(3)] for y in range(3)]), 
+                                        rotation_representation_choice=0)
+    assert err == 0, f'RotateSampleRefFrame ErrorCondition: {err}'
+
+    # Rotate Euler Reference Frame
+    err = orientationanalysispy.rotate_euler_ref_frame(data_container_array=dca, 
+                                            rotation_axis=simpl.FloatVec3([0.0, 0.0, 1.0]), 
+                                            rotation_angle=90.0,
+                                            cell_euler_angles_array_path=simpl.DataArrayPath('EBSD Scan', 'Scan Data', 'EulerAngles'))
+    assert err == 0, f'RotateEulerRefFrame ErrorCondition: {err}'
+
+    # Write to DREAM3D file
+    err = simpl_helpers.WriteDREAM3DFile('Small_IN100_Slice_1.dream3d', dca)
+    assert err == 0, f'WriteDREAM3DFile ErrorCondition: {err}'
+    
+    # Retrieve the Confidence Index Data Array from the results using the [] notation
+    dc = dca['EBSD Scan']
+
+    # Gets all the names of the Attribute Matrixes using python list comprehension
+    am_names = [am.Name for am in dc]
+    
+    # Grab a specific Attribute Matrix that holds the Scan Data, which is the data on each cell
+    attr_mat = dc['Scan Data']
+
+    # We need to get the dimenions of the scan from the ImageGeometry object that is stored in the Data Container
+    # Note that the dimenions that come back from DREAM3D are in the order X, Y, Z which is OPPOSITE in how the data
+    # is stored in DREAM.3D. The data is actually stored as Z, Y, X (Slowest to Fastest.). This will matter in a few
+    # lines of code.
+    image_geom = dc.Geometry
+    scan_dims = image_geom.getDimensions()
+
+    # Retrieve the Confidence Index Attribute Array which is a type of "DataArray" object
+    ci = attr_mat['Confidence Index']
+
+    # Convert the Data Array in-place to an numpy array and reshape to the proper dimensions
+    # SIMPL DataArray objects just hold a flat array of Tuples. Tuples can have a dimensional aspect to them.
+    np_ci = np.asarray(ci).reshape([scan_dims[1], scan_dims[0]])
+
+    # Create a Plot that shows the Confidence Index and the histogram of the confidence Index
+    fig, ax = plt.subplots(1, 2, figsize=(15,10))
+    ax[0].set_title('Small IN100 Confidence Index')
+    ax[0].set_xlabel('X')
+    ax[0].set_ylabel('Y')
+    ax[0].imshow(np_ci, cmap='inferno', vmin=0.0, vmax=1.0)
+    ax[1].set_title('Confidence Index Histogram')
+    ax[1].set_xlabel('Value')
+    ax[1].set_ylabel('Occurrences')
+    ax[1].hist(np_ci.ravel(), bins=100, range=(0, 1))
+
+    plt.show()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--input_file')
+    args = parser.parse_args()
+
+    read_ang_data(file_path=args.input_file)
+    
\ No newline at end of file
diff --git a/Wrapping/Python/Examples/use_case_02.py b/Wrapping/Python/Examples/use_case_02.py
new file mode 100644
index 0000000000..6bf0050cef
--- /dev/null
+++ b/Wrapping/Python/Examples/use_case_02.py
@@ -0,0 +1,84 @@
+import argparse
+import csv
+import math
+
+import numpy as np
+from numpy.lib import recfunctions as rfn
+
+# Import SIMPL wrapping
+import dream3d.simpl as simpl
+import dream3d.simplpy as simplpy
+import dream3d.simpl_helpers as simpl_helpers
+
+
+
+
+def import_csv_xyz_vertices_2(file_path: str):
+    """
+    This version of the sample code uses slightly different CSV python APIs the difference being the use of
+    the numpy.loadtxt() function.
+
+    """
+    verts_np = np.loadtxt(file_path, dtype={'names': ('x', 'y', 'z'), 'formats': ('f4', 'f4', 'f4')}, usecols=(0, 1, 2), delimiter=',', skiprows=1)
+    verts_flat = rfn.structured_to_unstructured(verts_np, dtype=np.float32, copy=False, casting='safe')
+    
+    # Create a simpl.DataArray object to hold the vertices by reference
+    verts = simpl.FloatArray(verts_flat, "Vertices", False)
+    # Create a VertexGeometry and set the vertices into the geometry
+    vertGeom = simpl.VertexGeom()
+    vertGeom.setVertices(verts)
+    # Create the DataContainerArray
+    dca = simpl.DataContainerArray()
+    # Create the DataContainer with the Geometry attached
+    dc = simpl.DataContainer('Vertex Geometry')
+    dc.setGeometry(vertGeom)
+    # Add the data container to the DataContainerArray
+    dca.addOrReplaceDataContainer(dc)
+    # Write the Vertex Geometry out to a .dream3d file.
+    err = simpl_helpers.WriteDREAM3DFile('vert_geom_2.dream3d', dca, True)
+
+
+def import_csv_xyz_vertices_1(file_path: str):
+    """
+    This version of the sample code uses slightly different CSV python APIs the difference being the use of
+    the numpy.genfromtxt() function.
+
+    The downside of this approach is that the code will read the entire CSV file into memory into a string variable
+    first before passing that string variable to the numpy.genfromtxt() function.
+
+    This function may have issues if there are more columns in the input file.
+    """
+    # Read the entire file into a string variable and then have numpy parse the columns out into independent arrays
+
+    with open(file_path, 'r') as file:
+        data = file.read()
+    x,y,z = np.genfromtxt(data.splitlines(), dtype="f4,f4,f4", delimiter=',', encoding=None, skip_header=1, unpack=True) 
+    
+    # Combine the arrays into a single array where each Tuple of the array is XYZ,XYZ,XYZ
+    np_verts = np.stack((x,y,z), axis=-1)
+    shape = np_verts.shape
+
+    # Create a simpl.DataArray object to hold the vertices by reference
+    verts = simpl.FloatArray(np_verts, "Vertices", False)
+    # Create a VertexGeometry and set the vertices into the geometry
+    vertGeom = simpl.VertexGeom()
+    vertGeom.setVertices(verts)
+    # Create the DataContainerArray
+    dca = simpl.DataContainerArray()
+    # Create the DataContainer with the Geometry attached
+    dc = simpl.DataContainer('Vertex Geometry')
+    dc.setGeometry(vertGeom)
+    # Add the data container to the DataContainerArray
+    dca.addOrReplaceDataContainer(dc)
+    # Write the Vertex Geometry out to a .dream3d file.
+    err = simpl_helpers.WriteDREAM3DFile('vert_geom_1.dream3d', dca, True)
+
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--input_file')
+    args = parser.parse_args()
+
+    import_csv_xyz_vertices_1(file_path=args.input_file)
+    import_csv_xyz_vertices_2(file_path=args.input_file)
diff --git a/Wrapping/Python/Testing/Create_Vertex_Geometry.py b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
index e5eec49eb8..aedc5cc3dc 100644
--- a/Wrapping/Python/Testing/Create_Vertex_Geometry.py
+++ b/Wrapping/Python/Testing/Create_Vertex_Geometry.py
@@ -53,8 +53,8 @@ def CreateVertexGeometryTest():
   shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices')
   vertex_attribute_matrix_name = 'VertexData'
   err = sh.CreateGeometry(dca, 0, simpl.IGeometry.Type.Vertex, 'DataContainer', False, 
-  shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
-  vertex_attribute_matrix_name = 'VertexData')
+                          shared_vertex_list_array_path = simpl.DataArrayPath('DataContainer', 'Bounds', 'Vertices'),
+                          vertex_attribute_matrix_name = 'VertexData')
   assert err == 0, f'Create Geometry -  ErrorCondition: {err}'
 
   err = d3d.data_container_writer(dca, sd.GetTestTempDirectory() + '/CreateVertexGeometry.dream3d', True, False)

From ea01af12017546252c6747fe3d1ff6247396f690 Mon Sep 17 00:00:00 2001
From: Michael Jackson <mike.jackson@bluequartz.net>
Date: Thu, 5 Aug 2021 14:50:23 -0400
Subject: [PATCH 389/397] OCD got the best of me. Had to fix the spelling
 mistake in the license text

Signed-off-by: Michael Jackson <mike.jackson@bluequartz.net>
---
 Resources/DocConfigFiles/CMake/Macros.cmake   |   2 +-
 .../SIMPL/SIMPL_Code_License_Template.txt     |   2 +-
 Resources/UnitTestSupport.hpp                 |   2 +-
 Source/PipelineRunner/PipelineRunner.cpp      |   2 +-
 Source/RESTClient/RESTClientDLLExport.h       |   2 +-
 Source/SIMPLib/Common/AppVersion.cpp          |   2 +-
 Source/SIMPLib/Common/AppVersion.h            |   2 +-
 Source/SIMPLib/Common/Constants.h             |   2 +-
 .../Common/CreatedArrayHelpIndexEntry.cpp     |   2 +-
 .../Common/CreatedArrayHelpIndexEntry.h       |   2 +-
 Source/SIMPLib/Common/EnsembleInfo.cpp        |   2 +-
 Source/SIMPLib/Common/EnsembleInfo.h          |   2 +-
 Source/SIMPLib/Common/IObserver.cpp           |   2 +-
 Source/SIMPLib/Common/IObserver.h             |   2 +-
 Source/SIMPLib/Common/Observable.cpp          |   2 +-
 Source/SIMPLib/Common/Observable.h            |   2 +-
 Source/SIMPLib/Common/Observer.cpp            |   2 +-
 Source/SIMPLib/Common/Observer.h              |   2 +-
 Source/SIMPLib/Common/PhaseType.cpp           |   2 +-
 Source/SIMPLib/Common/PhaseType.h             |   2 +-
 Source/SIMPLib/Common/SIMPLRange.cpp          |   2 +-
 Source/SIMPLib/Common/SIMPLRange.h            |   2 +-
 Source/SIMPLib/Common/SIMPLRange2D.cpp        |   2 +-
 Source/SIMPLib/Common/SIMPLRange2D.h          |   2 +-
 Source/SIMPLib/Common/SIMPLRange3D.cpp        |   2 +-
 Source/SIMPLib/Common/SIMPLRange3D.h          |   2 +-
 Source/SIMPLib/Common/SIMPLibDLLExport.h      |   2 +-
 Source/SIMPLib/Common/SIMPLibSetGetMacros.h   |   6 +-
 Source/SIMPLib/Common/ScopedFileMonitor.hpp   |   2 +-
 Source/SIMPLib/Common/ShapeType.cpp           |   2 +-
 Source/SIMPLib/Common/ShapeType.h             |   2 +-
 Source/SIMPLib/Common/TemplateHelpers.h       |   2 +-
 .../CoreFilters/ApplyImageTransforms.cpp      |   2 +-
 .../CoreFilters/ApplyImageTransforms.h        |   2 +-
 .../SIMPLib/CoreFilters/ArrayCalculator.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/ArrayCalculator.h  |   2 +-
 Source/SIMPLib/CoreFilters/Breakpoint.cpp     |   2 +-
 Source/SIMPLib/CoreFilters/Breakpoint.h       |   2 +-
 .../CoreFilters/CombineAttributeArrays.cpp    |   2 +-
 .../CoreFilters/CombineAttributeArrays.h      |   2 +-
 .../CoreFilters/CombineAttributeMatrices.cpp  |   2 +-
 .../CoreFilters/CombineAttributeMatrices.h    |   2 +-
 .../CoreFilters/ConditionalSetValue.cpp       |   2 +-
 .../SIMPLib/CoreFilters/ConditionalSetValue.h |   2 +-
 .../CoreFilters/ConvertColorToGrayScale.cpp   |   2 +-
 .../CoreFilters/ConvertColorToGrayScale.h     |   2 +-
 Source/SIMPLib/CoreFilters/ConvertData.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/ConvertData.h      |   2 +-
 .../CopyFeatureArrayToElementArray.cpp        |   2 +-
 .../CopyFeatureArrayToElementArray.h          |   2 +-
 Source/SIMPLib/CoreFilters/CopyObject.cpp     |   2 +-
 Source/SIMPLib/CoreFilters/CopyObject.h       |   2 +-
 .../CoreFilters/CreateAttributeMatrix.cpp     |   2 +-
 .../CoreFilters/CreateAttributeMatrix.h       |   2 +-
 .../SIMPLib/CoreFilters/CreateDataArray.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/CreateDataArray.h  |   2 +-
 .../CoreFilters/CreateDataContainer.cpp       |   2 +-
 .../SIMPLib/CoreFilters/CreateDataContainer.h |   2 +-
 .../CreateFeatureArrayFromElementArray.cpp    |   2 +-
 .../CreateFeatureArrayFromElementArray.h      |   2 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.cpp |   4 +-
 Source/SIMPLib/CoreFilters/CreateGeometry.h   |   2 +-
 .../SIMPLib/CoreFilters/CreateGridMontage.cpp |   2 +-
 .../SIMPLib/CoreFilters/CreateGridMontage.h   |   2 +-
 .../CoreFilters/CreateImageGeometry.cpp       |   2 +-
 .../SIMPLib/CoreFilters/CreateImageGeometry.h |   2 +-
 .../SIMPLib/CoreFilters/CreateStringArray.cpp |   2 +-
 .../SIMPLib/CoreFilters/CreateStringArray.h   |   2 +-
 .../CoreFilters/CropVertexGeometry.cpp        |   2 +-
 .../SIMPLib/CoreFilters/CropVertexGeometry.h  |   2 +-
 .../CoreFilters/DataContainerReader.cpp       |   2 +-
 .../SIMPLib/CoreFilters/DataContainerReader.h |   2 +-
 .../CoreFilters/DataContainerWriter.cpp       |   2 +-
 .../SIMPLib/CoreFilters/DataContainerWriter.h |   2 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/EmptyFilter.h      |   2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.cpp |   2 +-
 Source/SIMPLib/CoreFilters/ExecuteProcess.h   |   2 +-
 .../ExtractAttributeArraysFromGeometry.cpp    |   2 +-
 .../ExtractAttributeArraysFromGeometry.h      |   2 +-
 .../CoreFilters/ExtractComponentAsArray.cpp   |   2 +-
 .../CoreFilters/ExtractComponentAsArray.h     |   2 +-
 .../CoreFilters/ExtractVertexGeometry.cpp     |   2 +-
 .../CoreFilters/ExtractVertexGeometry.h       |   2 +-
 .../CoreFilters/FeatureCountDecision.cpp      |   2 +-
 .../CoreFilters/FeatureCountDecision.h        |   2 +-
 .../CoreFilters/FeatureDataCSVWriter.cpp      |   2 +-
 .../CoreFilters/FeatureDataCSVWriter.h        |   2 +-
 Source/SIMPLib/CoreFilters/FileReader.cpp     |   2 +-
 Source/SIMPLib/CoreFilters/FileReader.h       |   2 +-
 Source/SIMPLib/CoreFilters/FileWriter.cpp     |   2 +-
 Source/SIMPLib/CoreFilters/FileWriter.h       |   2 +-
 .../SIMPLib/CoreFilters/FindDerivatives.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/FindDerivatives.h  |   2 +-
 .../CoreFilters/GenerateVertexCoordinates.cpp |   2 +-
 .../CoreFilters/GenerateVertexCoordinates.h   |   2 +-
 .../CoreFilters/ImportAsciDataArray.cpp       |   2 +-
 .../SIMPLib/CoreFilters/ImportAsciDataArray.h |   2 +-
 Source/SIMPLib/CoreFilters/InitializeData.cpp |   2 +-
 Source/SIMPLib/CoreFilters/InitializeData.h   |   2 +-
 .../LinkFeatureMapToElementArray.cpp          |   2 +-
 .../LinkFeatureMapToElementArray.h            |   2 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.cpp |   2 +-
 .../SIMPLib/CoreFilters/MaskCountDecision.h   |   2 +-
 Source/SIMPLib/CoreFilters/MassCreateData.cpp |   2 +-
 Source/SIMPLib/CoreFilters/MassCreateData.h   |   2 +-
 Source/SIMPLib/CoreFilters/MoveData.cpp       |   2 +-
 Source/SIMPLib/CoreFilters/MoveData.h         |   2 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/MoveMultiData.h    |   2 +-
 .../CoreFilters/MultiThresholdObjects.cpp     |   2 +-
 .../CoreFilters/MultiThresholdObjects.h       |   2 +-
 .../CoreFilters/MultiThresholdObjects2.cpp    |   2 +-
 .../CoreFilters/MultiThresholdObjects2.h      |   2 +-
 .../SIMPLib/CoreFilters/RawBinaryReader.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/RawBinaryReader.h  |   2 +-
 Source/SIMPLib/CoreFilters/ReadASCIIData.h    |   2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/RemoveArrays.h     |   2 +-
 .../CoreFilters/RemoveComponentFromArray.cpp  |   2 +-
 .../CoreFilters/RemoveComponentFromArray.h    |   2 +-
 .../CoreFilters/RenameAttributeArray.cpp      |   2 +-
 .../CoreFilters/RenameAttributeArray.h        |   2 +-
 .../CoreFilters/RenameAttributeMatrix.cpp     |   2 +-
 .../CoreFilters/RenameAttributeMatrix.h       |   2 +-
 .../CoreFilters/RenameDataContainer.cpp       |   2 +-
 .../SIMPLib/CoreFilters/RenameDataContainer.h |   2 +-
 .../CoreFilters/ReplaceValueInArray.cpp       |   2 +-
 .../SIMPLib/CoreFilters/ReplaceValueInArray.h |   2 +-
 .../CoreFilters/RequiredZThickness.cpp        |   2 +-
 .../SIMPLib/CoreFilters/RequiredZThickness.h  |   2 +-
 .../CoreFilters/RotateSampleRefFrame.cpp      |   2 +-
 .../CoreFilters/RotateSampleRefFrame.h        |   2 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.cpp    |   2 +-
 Source/SIMPLib/CoreFilters/ScaleVolume.h      |   2 +-
 .../SetOriginResolutionImageGeom.cpp          |   2 +-
 .../SetOriginResolutionImageGeom.h            |   2 +-
 .../CoreFilters/SplitAttributeArray.cpp       |   2 +-
 .../SIMPLib/CoreFilters/SplitAttributeArray.h |   2 +-
 .../Testing/Cxx/ArrayCalculatorTest.cpp       |   2 +-
 .../Cxx/CombineAttributeArraysTest.cpp        |   2 +-
 .../Cxx/CombineAttributeMatricesTest.cpp      |   2 +-
 .../Testing/Cxx/ConditionalSetValueTest.cpp   |   2 +-
 .../Cxx/ConvertColorToGrayScaleTest.cpp       |   2 +-
 .../Testing/Cxx/ConvertDataTest.cpp           |   2 +-
 .../CopyFeatureArrayToElementArrayTest.cpp    |   2 +-
 .../Testing/Cxx/CopyObjectTest.cpp            |   2 +-
 .../Testing/Cxx/CreateAttributeMatrixTest.cpp |   2 +-
 .../Testing/Cxx/CreateDataArrayTest.cpp       |   2 +-
 .../Testing/Cxx/CreateDataContainerTest.cpp   |   2 +-
 ...CreateFeatureArrayFromElementArrayTest.cpp |   2 +-
 .../Testing/Cxx/CreateGeometryTest.cpp        |   2 +-
 .../Testing/Cxx/CreateImageGeometryTest.cpp   |   2 +-
 .../Testing/Cxx/CreateStringArrayTest.cpp     |   2 +-
 .../Testing/Cxx/CropVertexGeometryTest.cpp    |   2 +-
 .../Testing/Cxx/DataContainerTest.cpp         |   2 +-
 .../Testing/Cxx/ErrorMessageTest.cpp          |   2 +-
 .../Testing/Cxx/ExecuteProcessTest.cpp        |   2 +-
 .../Testing/Cxx/ExportDataTest.cpp            |   2 +-
 ...ExtractAttributeArraysFromGeometryTest.cpp |   2 +-
 .../Cxx/ExtractComponentAsArrayTest.cpp       |   2 +-
 .../Testing/Cxx/FeatureDataCSVWriterTest.cpp  |   2 +-
 .../Testing/Cxx/FindDerivativesFilterTest.cpp |   2 +-
 .../Testing/Cxx/GenerateColorTableTest.cpp    |   2 +-
 .../CoreFilters/Testing/Cxx/MoveDataTest.cpp  |   2 +-
 .../Testing/Cxx/MoveMultiDataTest.cpp         |   2 +-
 .../Cxx/MultiThresholdObjects2Test.cpp        |   2 +-
 .../Testing/Cxx/MultiThresholdObjectsTest.cpp |   2 +-
 .../Testing/Cxx/PipelinePauseTest.cpp         |   2 +-
 .../Testing/Cxx/RawBinaryReaderTest.cpp       |   2 +-
 .../Testing/Cxx/ReadASCIIDataTest.cpp         |   2 +-
 .../Testing/Cxx/RemoveArraysTest.cpp          |   2 +-
 .../Cxx/RemoveComponentFromArrayTest.cpp      |   2 +-
 .../Testing/Cxx/RenameAttributeArrayTest.cpp  |   2 +-
 .../Testing/Cxx/RenameAttributeMatrixTest.cpp |   2 +-
 .../Testing/Cxx/RenameDataContainerTest.cpp   |   2 +-
 .../Testing/Cxx/RenameTimingTest.cpp          |   2 +-
 .../Testing/Cxx/ReplaceValueTest.cpp          |   2 +-
 .../Testing/Cxx/RequiredZThicknessTest.cpp    |   2 +-
 .../Testing/Cxx/RotateSampleRefFrameTest.cpp  |   2 +-
 .../Testing/Cxx/ScaleVolumeTest.cpp           |   2 +-
 .../Cxx/SetOriginResolutionImageGeomTest.cpp  |   2 +-
 .../Testing/Cxx/SplitAttributeArrayTest.cpp   |   2 +-
 .../Cxx/Unused/RecursivePipelineTest.cpp      |   2 +-
 .../Testing/Cxx/WriteASCIIDataTest.cpp        |   2 +-
 .../Testing/Cxx/WriteTriangleGeometryTest.cpp |   2 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.cpp |   2 +-
 Source/SIMPLib/CoreFilters/WriteASCIIData.h   |   2 +-
 .../CoreFilters/WriteTriangleGeometry.cpp     |   2 +-
 .../CoreFilters/WriteTriangleGeometry.h       |   2 +-
 .../SIMPLib/CoreFilters/util/ABSOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/ABSOperator.h |   2 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/ACosOperator.h   |   2 +-
 .../CoreFilters/util/ASCIIWizardData.hpp      |   2 +-
 .../SIMPLib/CoreFilters/util/ASinOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/ASinOperator.h   |   2 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/ATanOperator.h   |   2 +-
 .../CoreFilters/util/AdditionOperator.cpp     |   2 +-
 .../CoreFilters/util/AdditionOperator.h       |   2 +-
 .../CoreFilters/util/BinaryOperator.cpp       |   2 +-
 .../SIMPLib/CoreFilters/util/BinaryOperator.h |   2 +-
 .../CoreFilters/util/CalculatorArray.hpp      |   2 +-
 .../CoreFilters/util/CalculatorItem.cpp       |   2 +-
 .../SIMPLib/CoreFilters/util/CalculatorItem.h |   2 +-
 .../CoreFilters/util/CalculatorOperator.cpp   |   2 +-
 .../CoreFilters/util/CalculatorOperator.h     |   2 +-
 .../CoreFilters/util/CalculatorSeparator.cpp  |   2 +-
 .../CoreFilters/util/CalculatorSeparator.h    |   2 +-
 .../SIMPLib/CoreFilters/util/CeilOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/CeilOperator.h   |   2 +-
 .../CoreFilters/util/CommaSeparator.cpp       |   2 +-
 .../SIMPLib/CoreFilters/util/CommaSeparator.h |   2 +-
 .../SIMPLib/CoreFilters/util/CosOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/CosOperator.h |   2 +-
 .../CoreFilters/util/DivisionOperator.cpp     |   2 +-
 .../CoreFilters/util/DivisionOperator.h       |   2 +-
 .../SIMPLib/CoreFilters/util/ExpOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/ExpOperator.h |   2 +-
 .../CoreFilters/util/FloorOperator.cpp        |   2 +-
 .../SIMPLib/CoreFilters/util/FloorOperator.h  |   2 +-
 .../CoreFilters/util/ICalculatorArray.cpp     |   2 +-
 .../CoreFilters/util/ICalculatorArray.h       |   2 +-
 .../CoreFilters/util/LeftParenthesisItem.cpp  |   2 +-
 .../CoreFilters/util/LeftParenthesisItem.h    |   2 +-
 .../SIMPLib/CoreFilters/util/LnOperator.cpp   |   2 +-
 Source/SIMPLib/CoreFilters/util/LnOperator.h  |   2 +-
 .../CoreFilters/util/Log10Operator.cpp        |   2 +-
 .../SIMPLib/CoreFilters/util/Log10Operator.h  |   2 +-
 .../SIMPLib/CoreFilters/util/LogOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/LogOperator.h |   2 +-
 .../util/MultiplicationOperator.cpp           |   2 +-
 .../CoreFilters/util/MultiplicationOperator.h |   2 +-
 .../CoreFilters/util/NegativeOperator.cpp     |   2 +-
 .../CoreFilters/util/NegativeOperator.h       |   2 +-
 .../SIMPLib/CoreFilters/util/PowOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/PowOperator.h |   2 +-
 .../CoreFilters/util/RightParenthesisItem.cpp |   2 +-
 .../CoreFilters/util/RightParenthesisItem.h   |   2 +-
 .../SIMPLib/CoreFilters/util/RootOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/RootOperator.h   |   2 +-
 .../SIMPLib/CoreFilters/util/SinOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/SinOperator.h |   2 +-
 .../SIMPLib/CoreFilters/util/SqrtOperator.cpp |   2 +-
 .../SIMPLib/CoreFilters/util/SqrtOperator.h   |   2 +-
 .../CoreFilters/util/SubtractionOperator.cpp  |   2 +-
 .../CoreFilters/util/SubtractionOperator.h    |   2 +-
 .../SIMPLib/CoreFilters/util/TanOperator.cpp  |   2 +-
 Source/SIMPLib/CoreFilters/util/TanOperator.h |   2 +-
 .../CoreFilters/util/UnaryOperator.cpp        |   2 +-
 .../SIMPLib/CoreFilters/util/UnaryOperator.h  |   2 +-
 Source/SIMPLib/DataArrays/DataArray.cpp       |   2 +-
 Source/SIMPLib/DataArrays/DataArray.hpp       |   2 +-
 .../SIMPLib/DataArrays/DynamicListArray.hpp   |   2 +-
 .../SIMPLib/DataArrays/IDataArrayFilter.cpp   |   2 +-
 Source/SIMPLib/DataArrays/IDataArrayFilter.h  |   2 +-
 Source/SIMPLib/DataArrays/NeighborList.hpp    |   2 +-
 Source/SIMPLib/DataArrays/StatsDataArray.cpp  |   2 +-
 Source/SIMPLib/DataArrays/StatsDataArray.h    |   2 +-
 Source/SIMPLib/DataArrays/StringDataArray.cpp |   2 +-
 Source/SIMPLib/DataArrays/StringDataArray.h   |   2 +-
 Source/SIMPLib/DataArrays/StructArray.hpp     |   2 +-
 .../DataArrays/Testing/Cxx/DataArrayTest.cpp  |   2 +-
 .../Testing/Cxx/StringDataArrayTest.cpp       |   2 +-
 .../Testing/Cxx/StructArrayTest.cpp           |   2 +-
 .../DataContainers/AttributeMatrix.cpp        |   2 +-
 .../SIMPLib/DataContainers/AttributeMatrix.h  |   2 +-
 .../DataContainers/AttributeMatrixProxy.h     |   2 +-
 .../SIMPLib/DataContainers/DataArrayPath.cpp  |   2 +-
 Source/SIMPLib/DataContainers/DataArrayPath.h |   2 +-
 .../SIMPLib/DataContainers/DataArrayProxy.h   |   2 +-
 .../SIMPLib/DataContainers/DataContainer.cpp  |   2 +-
 Source/SIMPLib/DataContainers/DataContainer.h |   2 +-
 .../DataContainers/DataContainerArray.cpp     |   2 +-
 .../DataContainers/DataContainerArray.h       |   2 +-
 .../DataContainerArrayProxy.cpp               |   2 +-
 .../DataContainers/DataContainerArrayProxy.h  |   2 +-
 .../DataContainers/DataContainerBundle.cpp    |   2 +-
 .../DataContainers/DataContainerBundle.h      |   2 +-
 .../DataContainers/DataContainerProxy.cpp     |   2 +-
 .../DataContainers/DataContainerProxy.h       |   2 +-
 .../DataContainers/DataStructureUtilities.cpp |   2 +-
 .../DataContainers/DataStructureUtilities.h   |   2 +-
 Source/SIMPLib/DataContainers/DsnIterators.h  |   2 +-
 .../DataContainers/IDataContainerBundle.cpp   |   2 +-
 .../DataContainers/IDataContainerBundle.h     |   2 +-
 .../IDataStructureContainerNode.hpp           |   2 +-
 .../DataContainers/IDataStructureNode.cpp     |   2 +-
 .../DataContainers/IDataStructureNode.h       |   2 +-
 .../SIMPLib/DataContainers/RenameDataPath.cpp |   2 +-
 .../SIMPLib/DataContainers/RenameDataPath.h   |   2 +-
 .../SIMPLib/DataContainers/SourceList.cmake   |   2 +-
 .../Testing/Cxx/DataContainerBundleTest.cpp   |   2 +-
 .../AbstractFilterParametersReader.cpp        |   2 +-
 .../AbstractFilterParametersReader.h          |   2 +-
 .../AbstractFilterParametersWriter.cpp        |   2 +-
 .../AbstractFilterParametersWriter.h          |   2 +-
 .../AbstractIOFilterParameter.cpp             |   2 +-
 .../AbstractIOFilterParameter.h               |   2 +-
 ...AttributeMatrixCreationFilterParameter.cpp |   2 +-
 .../AttributeMatrixCreationFilterParameter.h  |   2 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   2 +-
 .../AttributeMatrixSelectionFilterParameter.h |   2 +-
 .../AxisAngleFilterParameter.cpp              |   2 +-
 .../AxisAngleFilterParameter.h                |   2 +-
 .../FilterParameters/AxisAngleInput.cpp       |   2 +-
 .../BooleanFilterParameter.cpp                |   2 +-
 .../FilterParameters/BooleanFilterParameter.h |   2 +-
 .../CalculatorFilterParameter.cpp             |   2 +-
 .../CalculatorFilterParameter.h               |   2 +-
 .../ChoiceFilterParameter.cpp                 |   2 +-
 .../FilterParameters/ChoiceFilterParameter.h  |   2 +-
 ...arisonSelectionAdvancedFilterParameter.cpp |   2 +-
 ...mparisonSelectionAdvancedFilterParameter.h |   2 +-
 .../ComparisonSelectionFilterParameter.cpp    |   2 +-
 .../ComparisonSelectionFilterParameter.h      |   2 +-
 .../ConstrainedDoubleFilterParameter.cpp      |   2 +-
 .../ConstrainedDoubleFilterParameter.h        |   2 +-
 .../ConstrainedFilterParameter.h              |   2 +-
 .../ConstrainedIntFilterParameter.cpp         |   2 +-
 .../ConstrainedIntFilterParameter.h           |   2 +-
 .../DataArrayCreationFilterParameter.cpp      |   2 +-
 .../DataArrayCreationFilterParameter.h        |   2 +-
 .../DataArraySelectionFilterParameter.cpp     |   2 +-
 .../DataArraySelectionFilterParameter.h       |   2 +-
 ...DataContainerArrayProxyFilterParameter.cpp |   2 +-
 .../DataContainerArrayProxyFilterParameter.h  |   2 +-
 .../DataContainerCreationFilterParameter.cpp  |   2 +-
 .../DataContainerCreationFilterParameter.h    |   2 +-
 ...aContainerGridSelectionFilterParameter.cpp |   2 +-
 ...ataContainerGridSelectionFilterParameter.h |   3 +-
 .../DataContainerReaderFilterParameter.cpp    |   2 +-
 .../DataContainerReaderFilterParameter.h      |   2 +-
 .../DataContainerSelectionFilterParameter.cpp |   2 +-
 .../DataContainerSelectionFilterParameter.h   |   2 +-
 .../DoubleFilterParameter.cpp                 |   2 +-
 .../FilterParameters/DoubleFilterParameter.h  |   2 +-
 .../DynamicChoiceFilterParameter.cpp          |   2 +-
 .../DynamicChoiceFilterParameter.h            |   2 +-
 .../FilterParameters/DynamicTableData.cpp     |   2 +-
 .../FilterParameters/DynamicTableData.h       |   2 +-
 .../DynamicTableFilterParameter.cpp           |   2 +-
 .../DynamicTableFilterParameter.h             |   2 +-
 .../FileListInfoFilterParameter.cpp           |   2 +-
 .../FileListInfoFilterParameter.h             |   2 +-
 .../FilterParameters/FilterParameter.cpp      |   2 +-
 .../FilterParameters/FilterParameter.h        |   2 +-
 .../Float2ndOrderPolynomial.cpp               |   2 +-
 .../Float2ndOrderPolynomial.h                 |   2 +-
 .../FilterParameters/FloatFilterParameter.h   |   2 +-
 .../FloatVec2FilterParameter.cpp              |   2 +-
 .../FloatVec2FilterParameter.h                |   2 +-
 .../FloatVec3FilterParameter.cpp              |   2 +-
 .../FloatVec3FilterParameter.h                |   2 +-
 .../FourthOrderPolynomialFilterParameter.cpp  |   2 +-
 .../FourthOrderPolynomialFilterParameter.h    |   2 +-
 .../GenerateColorTableFilterParameter.cpp     |   2 +-
 .../GenerateColorTableFilterParameter.h       |   2 +-
 .../H5FilterParametersConstants.h             |   2 +-
 .../H5FilterParametersReader.cpp              |   2 +-
 .../H5FilterParametersReader.h                |   2 +-
 .../H5FilterParametersWriter.cpp              |   2 +-
 .../H5FilterParametersWriter.h                |   2 +-
 .../InputFileFilterParameter.cpp              |   2 +-
 .../InputFileFilterParameter.h                |   2 +-
 .../InputPathFilterParameter.cpp              |   2 +-
 .../InputPathFilterParameter.h                |   2 +-
 .../FilterParameters/IntFilterParameter.cpp   |   2 +-
 .../FilterParameters/IntFilterParameter.h     |   2 +-
 .../IntVec2FilterParameter.cpp                |   2 +-
 .../FilterParameters/IntVec2FilterParameter.h |   4 +-
 .../IntVec3FilterParameter.cpp                |   2 +-
 .../FilterParameters/IntVec3FilterParameter.h |   4 +-
 .../JsonFilterParametersReader.cpp            |   2 +-
 .../JsonFilterParametersReader.h              |   2 +-
 .../JsonFilterParametersWriter.cpp            |   2 +-
 .../JsonFilterParametersWriter.h              |   2 +-
 .../LinkedBooleanFilterParameter.cpp          |   2 +-
 .../LinkedBooleanFilterParameter.h            |   2 +-
 .../LinkedChoicesFilterParameter.cpp          |   2 +-
 .../LinkedChoicesFilterParameter.h            |   2 +-
 ...dDataContainerSelectionFilterParameter.cpp |   2 +-
 ...kedDataContainerSelectionFilterParameter.h |   2 +-
 .../LinkedPathCreationFilterParameter.cpp     |   2 +-
 .../LinkedPathCreationFilterParameter.h       |   2 +-
 .../MontageSelectionFilterParameter.cpp       |   2 +-
 .../MontageSelectionFilterParameter.h         |   2 +-
 ...ntageStructureSelectionFilterParameter.cpp |   2 +-
 ...MontageStructureSelectionFilterParameter.h |   2 +-
 ...ttributeMatrixSelectionFilterParameter.cpp |   2 +-
 ...iAttributeMatrixSelectionFilterParameter.h |   2 +-
 ...MultiDataArraySelectionFilterParameter.cpp |   2 +-
 .../MultiDataArraySelectionFilterParameter.h  |   2 +-
 ...iDataContainerSelectionFilterParameter.cpp |   2 +-
 ...ltiDataContainerSelectionFilterParameter.h |   2 +-
 .../MultiInputFileFilterParameter.cpp         |   2 +-
 .../MultiInputFileFilterParameter.h           |   2 +-
 .../NumericTypeFilterParameter.cpp            |   2 +-
 .../NumericTypeFilterParameter.h              |   2 +-
 .../OutputFileFilterParameter.cpp             |   2 +-
 .../OutputFileFilterParameter.h               |   2 +-
 .../OutputPathFilterParameter.cpp             |   2 +-
 .../OutputPathFilterParameter.h               |   2 +-
 .../PhaseTypeSelectionFilterParameter.cpp     |   2 +-
 .../PhaseTypeSelectionFilterParameter.h       |   2 +-
 .../PreflightUpdatedValueFilterParameter.cpp  |   2 +-
 .../PreflightUpdatedValueFilterParameter.h    |   2 +-
 .../FilterParameters/RangeFilterParameter.cpp |   2 +-
 .../FilterParameters/RangeFilterParameter.h   |   2 +-
 .../ReadASCIIDataFilterParameter.cpp          |   2 +-
 .../ReadASCIIDataFilterParameter.h            |   2 +-
 .../ScalarTypeFilterParameter.cpp             |   2 +-
 .../ScalarTypeFilterParameter.h               |   2 +-
 .../SecondOrderPolynomialFilterParameter.cpp  |   2 +-
 .../SecondOrderPolynomialFilterParameter.h    |   2 +-
 .../SeparatorFilterParameter.cpp              |   2 +-
 .../SeparatorFilterParameter.h                |   2 +-
 .../ShapeTypeSelectionFilterParameter.cpp     |   2 +-
 .../ShapeTypeSelectionFilterParameter.h       |   2 +-
 .../StringFilterParameter.cpp                 |   2 +-
 .../FilterParameters/StringFilterParameter.h  |   2 +-
 .../Testing/Cxx/FilterParametersRWTest.cpp    |   2 +-
 .../ThirdOrderPolynomialFilterParameter.cpp   |   2 +-
 .../ThirdOrderPolynomialFilterParameter.h     |   2 +-
 .../UInt64FilterParameter.cpp                 |   2 +-
 .../FilterParameters/UInt64FilterParameter.h  |   2 +-
 .../UnknownFilterParameter.cpp                |   2 +-
 .../FilterParameters/UnknownFilterParameter.h |   2 +-
 .../SIMPLib/Filtering/AbstractComparison.cpp  |   2 +-
 Source/SIMPLib/Filtering/AbstractComparison.h |   2 +-
 .../Filtering/AbstractDecisionFilter.cpp      |   2 +-
 .../Filtering/AbstractDecisionFilter.h        |   2 +-
 Source/SIMPLib/Filtering/AbstractFilter.cpp   |   2 +-
 Source/SIMPLib/Filtering/AbstractFilter.h     |   2 +-
 Source/SIMPLib/Filtering/ComparisonInputs.cpp |   2 +-
 Source/SIMPLib/Filtering/ComparisonInputs.h   |   2 +-
 .../Filtering/ComparisonInputsAdvanced.cpp    |   2 +-
 .../Filtering/ComparisonInputsAdvanced.h      |   2 +-
 Source/SIMPLib/Filtering/ComparisonSet.cpp    |   2 +-
 Source/SIMPLib/Filtering/ComparisonSet.h      |   2 +-
 Source/SIMPLib/Filtering/ComparisonValue.cpp  |   2 +-
 Source/SIMPLib/Filtering/ComparisonValue.h    |   2 +-
 Source/SIMPLib/Filtering/FilterFactory.hpp    |   2 +-
 Source/SIMPLib/Filtering/FilterManager.cpp    |   2 +-
 Source/SIMPLib/Filtering/FilterManager.h      |   2 +-
 Source/SIMPLib/Filtering/FilterPipeline.cpp   |   2 +-
 Source/SIMPLib/Filtering/FilterPipeline.h     |   2 +-
 Source/SIMPLib/Filtering/IFilterFactory.hpp   |   2 +-
 .../Filtering/QMetaObjectUtilities.cpp        |   2 +-
 .../SIMPLib/Filtering/QMetaObjectUtilities.h  |   2 +-
 .../Testing/Cxx/FilterPipelineTest.cpp        |   2 +-
 .../Filtering/ThresholdFilterHelper.cpp       |   2 +-
 .../SIMPLib/Filtering/ThresholdFilterHelper.h |   2 +-
 .../Geometry/CompositeTransformContainer.cpp  |   2 +-
 .../Geometry/CompositeTransformContainer.h    |   2 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.cpp |   2 +-
 Source/SIMPLib/Geometry/DerivativeHelpers.h   |   2 +-
 Source/SIMPLib/Geometry/EdgeGeom.cpp          |   2 +-
 Source/SIMPLib/Geometry/EdgeGeom.h            |   2 +-
 Source/SIMPLib/Geometry/IGeometry.cpp         |   2 +-
 Source/SIMPLib/Geometry/IGeometry.h           |   2 +-
 Source/SIMPLib/Geometry/IGeometry2D.cpp       |   2 +-
 Source/SIMPLib/Geometry/IGeometry2D.h         |   2 +-
 Source/SIMPLib/Geometry/IGeometry3D.cpp       |   2 +-
 Source/SIMPLib/Geometry/IGeometry3D.h         |   2 +-
 Source/SIMPLib/Geometry/IGeometryGrid.cpp     |   2 +-
 Source/SIMPLib/Geometry/IGeometryGrid.h       |   2 +-
 .../SIMPLib/Geometry/ITransformContainer.cpp  |   2 +-
 Source/SIMPLib/Geometry/ITransformContainer.h |   2 +-
 Source/SIMPLib/Geometry/ImageGeom.cpp         |   2 +-
 Source/SIMPLib/Geometry/ImageGeom.h           |   2 +-
 Source/SIMPLib/Geometry/QuadGeom.cpp          |   2 +-
 Source/SIMPLib/Geometry/QuadGeom.h            |   2 +-
 Source/SIMPLib/Geometry/RectGridGeom.cpp      |   2 +-
 Source/SIMPLib/Geometry/RectGridGeom.h        |   2 +-
 .../Geometry/ShapeOps/CubeOctohedronOps.cpp   |   2 +-
 .../Geometry/ShapeOps/CubeOctohedronOps.h     |   2 +-
 .../Geometry/ShapeOps/CylinderAOps.cpp        |   2 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderAOps.h  |   2 +-
 .../Geometry/ShapeOps/CylinderBOps.cpp        |   2 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderBOps.h  |   2 +-
 .../Geometry/ShapeOps/CylinderCOps.cpp        |   2 +-
 .../SIMPLib/Geometry/ShapeOps/CylinderCOps.h  |   2 +-
 .../Geometry/ShapeOps/EllipsoidOps.cpp        |   2 +-
 .../SIMPLib/Geometry/ShapeOps/EllipsoidOps.h  |   2 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp |   2 +-
 Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h   |   2 +-
 .../Geometry/ShapeOps/SuperEllipsoidOps.cpp   |   2 +-
 .../Geometry/ShapeOps/SuperEllipsoidOps.h     |   2 +-
 Source/SIMPLib/Geometry/SharedEdgeOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedQuadOps.cpp     |   2 +-
 Source/SIMPLib/Geometry/SharedTetOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedTriOps.cpp      |   2 +-
 Source/SIMPLib/Geometry/SharedVertexOps.cpp   |   2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.cpp   |   2 +-
 Source/SIMPLib/Geometry/TetrahedralGeom.h     |   2 +-
 .../SIMPLib/Geometry/TransformContainer.cpp   |   2 +-
 Source/SIMPLib/Geometry/TransformContainer.h  |   2 +-
 Source/SIMPLib/Geometry/TriangleGeom.cpp      |   2 +-
 Source/SIMPLib/Geometry/TriangleGeom.h        |   2 +-
 Source/SIMPLib/Geometry/VertexGeom.cpp        |   2 +-
 Source/SIMPLib/Geometry/VertexGeom.h          |   2 +-
 .../HDF5/H5BoundaryStatsDataDelegate.cpp      |   2 +-
 .../HDF5/H5BoundaryStatsDataDelegate.h        |   2 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.cpp     |   2 +-
 Source/SIMPLib/HDF5/H5DataArrayReader.h       |   2 +-
 Source/SIMPLib/HDF5/H5DataArrayWriter.hpp     |   2 +-
 Source/SIMPLib/HDF5/H5Macros.h                |   2 +-
 .../HDF5/H5MatrixStatsDataDelegate.cpp        |   2 +-
 .../SIMPLib/HDF5/H5MatrixStatsDataDelegate.h  |   2 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.cpp   |   2 +-
 .../HDF5/H5PrecipitateStatsDataDelegate.h     |   2 +-
 .../HDF5/H5PrimaryStatsDataDelegate.cpp       |   2 +-
 .../SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h |   2 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp   |   2 +-
 Source/SIMPLib/HDF5/H5StatsDataDelegate.h     |   2 +-
 .../H5TransformationStatsDataDelegate.cpp     |   2 +-
 .../HDF5/H5TransformationStatsDataDelegate.h  |   2 +-
 ...am3DITransformContainerToTransformTest.cpp |   2 +-
 .../itkDream3DTransformContainerTestHelper.h  |   2 +-
 ...eam3DTransformContainerToTransformTest.cpp |   2 +-
 ...nsformToDream3DITransformContainerTest.cpp |   2 +-
 ...ansformToDream3DTransformContainerTest.cpp |   2 +-
 ...itkDream3DITransformContainerToTransform.h |   2 +-
 ...kDream3DITransformContainerToTransform.hxx | 109 +++++++-----------
 .../itkDream3DTransformContainerToTransform.h |   2 +-
 ...tkDream3DTransformContainerToTransform.hxx | 102 +++++++---------
 .../ITK/itkFijiConfigurationFileReader.hpp    |   2 +-
 Source/SIMPLib/ITK/itkProgressObserver.hpp    |   2 +-
 ...itkTransformToDream3DITransformContainer.h |   2 +-
 ...kTransformToDream3DITransformContainer.hxx |  99 +++++++---------
 .../itkTransformToDream3DTransformContainer.h |   2 +-
 ...tkTransformToDream3DTransformContainer.hxx |  96 +++++++--------
 Source/SIMPLib/Math/GeometryMath.cpp          |   2 +-
 Source/SIMPLib/Math/GeometryMath.h            |   2 +-
 Source/SIMPLib/Math/MatrixMath.cpp            |   2 +-
 Source/SIMPLib/Math/MatrixMath.h              |   2 +-
 .../Math/RadialDistributionFunction.cpp       |   2 +-
 .../SIMPLib/Math/RadialDistributionFunction.h |   2 +-
 Source/SIMPLib/Math/RdfData.cpp               |   2 +-
 Source/SIMPLib/Math/RdfData.h                 |   2 +-
 Source/SIMPLib/Math/SIMPLibMath.cpp           |   2 +-
 Source/SIMPLib/Math/SIMPLibMath.h             |   2 +-
 Source/SIMPLib/Math/SIMPLibRandom.cpp         |   2 +-
 Source/SIMPLib/Math/SIMPLibRandom.h           |   2 +-
 .../Math/Testing/Cxx/QuaternionMathTest.cpp   |   2 +-
 Source/SIMPLib/Montages/DataContainerGrid.cpp |   2 +-
 Source/SIMPLib/Montages/DataContainerGrid.h   |   2 +-
 Source/SIMPLib/Montages/SourceList.cmake      |   2 +-
 Source/SIMPLib/Plugin/ISIMPLibPlugin.h        |   2 +-
 Source/SIMPLib/Plugin/PluginManager.cpp       |   2 +-
 Source/SIMPLib/Plugin/PluginManager.h         |   2 +-
 Source/SIMPLib/Plugin/PluginProxy.cpp         |   2 +-
 Source/SIMPLib/Plugin/PluginProxy.h           |   2 +-
 Source/SIMPLib/Plugin/SIMPLibPlugin.cpp       |   2 +-
 Source/SIMPLib/Plugin/SIMPLibPlugin.h         |   2 +-
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp |   2 +-
 Source/SIMPLib/Plugin/SIMPLibPluginLoader.h   |   2 +-
 Source/SIMPLib/Plugin/SourceList.cmake        |   2 +-
 Source/SIMPLib/REST/SIMPLDirectoryListing.cpp |   2 +-
 Source/SIMPLib/REST/SIMPLDirectoryListing.h   |   2 +-
 .../SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp |   2 +-
 .../SIMPLib/StatsData/BoundaryStatsData.cpp   |   2 +-
 Source/SIMPLib/StatsData/BoundaryStatsData.h  |   2 +-
 Source/SIMPLib/StatsData/MatrixStatsData.cpp  |   2 +-
 Source/SIMPLib/StatsData/MatrixStatsData.h    |   2 +-
 .../StatsData/PrecipitateStatsData.cpp        |   2 +-
 .../SIMPLib/StatsData/PrecipitateStatsData.h  |   2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.cpp |   2 +-
 Source/SIMPLib/StatsData/PrimaryStatsData.h   |   2 +-
 Source/SIMPLib/StatsData/SourceList.cmake     |   2 +-
 Source/SIMPLib/StatsData/StatsData.cpp        |   2 +-
 Source/SIMPLib/StatsData/StatsData.h          |   2 +-
 .../Testing/Cxx/StatsDataJsonRWTest.cpp       |   2 +-
 .../StatsData/TransformationStatsData.cpp     |   2 +-
 .../StatsData/TransformationStatsData.h       |   2 +-
 .../TestFilters/ArraySelectionExample.h       |   2 +-
 .../TestFilters/DynamicTableExample.cpp       |   2 +-
 .../SIMPLib/TestFilters/DynamicTableExample.h |   2 +-
 Source/SIMPLib/TestFilters/GenericExample.cpp |   2 +-
 Source/SIMPLib/TestFilters/GenericExample.h   |   2 +-
 .../SIMPLib/TestFilters/MakeDataContainer.cpp |   2 +-
 .../SIMPLib/TestFilters/MakeDataContainer.h   |   2 +-
 .../SIMPLib/TestFilters/ThresholdExample.cpp  |   2 +-
 Source/SIMPLib/TestFilters/ThresholdExample.h |   2 +-
 Source/SIMPLib/Utilities/ColorTable.cpp       |   2 +-
 Source/SIMPLib/Utilities/ColorTable.h         |   2 +-
 Source/SIMPLib/Utilities/ColorUtilities.cpp   |   2 +-
 Source/SIMPLib/Utilities/ColorUtilities.h     |   2 +-
 .../SIMPLib/Utilities/FilePathGenerator.cpp   |   2 +-
 Source/SIMPLib/Utilities/FilePathGenerator.h  |   2 +-
 .../SIMPLib/Utilities/GenericDataParser.hpp   |   2 +-
 Source/SIMPLib/Utilities/MontageSelection.cpp |   2 +-
 Source/SIMPLib/Utilities/MontageSelection.h   |   2 +-
 .../Utilities/ParallelData2DAlgorithm.cpp     |   2 +-
 .../Utilities/ParallelData2DAlgorithm.h       |   2 +-
 .../Utilities/ParallelData3DAlgorithm.cpp     |   2 +-
 .../Utilities/ParallelData3DAlgorithm.h       |   2 +-
 .../Utilities/ParallelDataAlgorithm.cpp       |   2 +-
 .../SIMPLib/Utilities/ParallelDataAlgorithm.h |   2 +-
 .../Utilities/ParallelTaskAlgorithm.cpp       |   2 +-
 .../SIMPLib/Utilities/ParallelTaskAlgorithm.h |   2 +-
 Source/SIMPLib/Utilities/QtConverter.hpp      |   2 +-
 .../Testing/Cxx/FloatSummationTest.cpp        |   2 +-
 .../Testing/Cxx/StringOperationsTest.cpp      |   2 +-
 Source/SIMPLib/Utilities/TimeUtilities.h      |   2 +-
 Source/SIMPLib/VTKUtils/SourceList.cmake      |   2 +-
 Source/SIMPLib/VTKUtils/VTKWriterMacros.h     |   2 +-
 .../SVWidgetsLib/Core/FilterWidgetManager.cpp |   2 +-
 .../SVWidgetsLib/Core/FilterWidgetManager.h   |   2 +-
 .../Core/IFilterWidgetFactory.cpp             |   2 +-
 .../SVWidgetsLib/Core/IFilterWidgetFactory.h  |   2 +-
 .../Core/PipelineFilterWidgetFactory.hpp      |   2 +-
 .../SVWidgetsLib/Core/SVWidgetsLibConstants.h |   2 +-
 .../SVWidgetsLib/Core/SVWidgetsLibDLLExport.h |   2 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp  |   2 +-
 Source/SVWidgetsLib/Dialogs/AboutPlugins.h    |   2 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.cpp  |   2 +-
 Source/SVWidgetsLib/Dialogs/ColorPresets.h    |   2 +-
 .../Dialogs/ColorPresetsDialog.cpp            |   2 +-
 .../SVWidgetsLib/Dialogs/ColorPresetsDialog.h |   2 +-
 .../Dialogs/ColorPresetsDialogTableModel.cpp  |   2 +-
 .../Dialogs/ColorPresetsDialogTableModel.h    |   2 +-
 .../Dialogs/FavoritesChangedDialog.cpp        |   2 +-
 .../Dialogs/FavoritesChangedDialog.h          |   2 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.cpp |   2 +-
 Source/SVWidgetsLib/Dialogs/PluginDetails.h   |   2 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp   |   2 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheck.h     |   2 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckData.cpp  |   2 +-
 Source/SVWidgetsLib/Dialogs/UpdateCheckData.h |   2 +-
 .../Dialogs/UpdateCheckDialog.cpp             |   2 +-
 .../SVWidgetsLib/Dialogs/UpdateCheckDialog.h  |   2 +-
 .../AbstractIOFileWidget.cpp                  |   2 +-
 .../AbstractIOFileWidget.h                    |   2 +-
 .../AttributeMatrixCreationWidget.cpp         |   2 +-
 .../AttributeMatrixCreationWidget.h           |   2 +-
 .../AttributeMatrixSelectionWidget.cpp        |   2 +-
 .../AttributeMatrixSelectionWidget.h          |   2 +-
 .../AxisAngleWidget.cpp                       |   2 +-
 .../FilterParameterWidgets/AxisAngleWidget.h  |   2 +-
 .../FilterParameterWidgets/BooleanWidget.cpp  |   2 +-
 .../FilterParameterWidgets/BooleanWidget.h    |   2 +-
 .../CalculatorWidget.cpp                      |   2 +-
 .../FilterParameterWidgets/CalculatorWidget.h |   2 +-
 .../FilterParameterWidgets/ChoiceWidget.cpp   |   2 +-
 .../FilterParameterWidgets/ChoiceWidget.h     |   2 +-
 .../ComparisonContainerWidget.cpp             |   2 +-
 .../ComparisonContainerWidget.h               |   2 +-
 .../ComparisonSelectionAdvancedWidget.cpp     |   2 +-
 .../ComparisonSelectionAdvancedWidget.h       |   2 +-
 .../ComparisonSelectionItemDelegate.cpp       |   2 +-
 .../ComparisonSelectionItemDelegate.h         |   2 +-
 .../ComparisonSelectionTableModel.cpp         |   2 +-
 .../ComparisonSelectionTableModel.h           |   2 +-
 .../ComparisonSelectionWidget.cpp             |   2 +-
 .../ComparisonSelectionWidget.h               |   2 +-
 .../ComparisonSetWidget.h                     |   2 +-
 .../ComparisonValueWidget.h                   |   2 +-
 .../ConstrainedDoubleWidget.cpp               |   2 +-
 .../ConstrainedDoubleWidget.h                 |   2 +-
 .../ConstrainedIntWidget.cpp                  |   2 +-
 .../ConstrainedIntWidget.h                    |   2 +-
 .../FilterParameterWidgets/CustomWidget.cpp   |   2 +-
 .../FilterParameterWidgets/CustomWidget.h     |   2 +-
 .../DataArrayCreationWidget.cpp               |   2 +-
 .../DataArrayCreationWidget.h                 |   2 +-
 .../DataArrayInformationDisplayWidget.cpp     |   2 +-
 .../DataArrayInformationDisplayWidget.h       |   2 +-
 .../DataArraySelectionWidget.cpp              |   2 +-
 .../DataArraySelectionWidget.h                |   2 +-
 .../DataContainerArrayProxyWidget.cpp         |   2 +-
 .../DataContainerArrayProxyWidget.h           |   2 +-
 .../DataContainerCreationWidget.cpp           |   2 +-
 .../DataContainerCreationWidget.h             |   2 +-
 .../DataContainerGridModel.cpp                |   2 +-
 .../DataContainerGridModel.h                  |   2 +-
 .../DataContainerGridSelectionWidget.cpp      |   2 +-
 .../DataContainerGridSelectionWidget.h        |   2 +-
 .../DataContainerReaderWidget.cpp             |   2 +-
 .../DataContainerReaderWidget.h               |   2 +-
 .../DataContainerSelectionWidget.cpp          |   2 +-
 .../DataContainerSelectionWidget.h            |   2 +-
 .../FilterParameterWidgets/DoubleWidget.cpp   |   2 +-
 .../FilterParameterWidgets/DoubleWidget.h     |   2 +-
 .../DynamicChoiceWidget.cpp                   |   2 +-
 .../DynamicChoiceWidget.h                     |   2 +-
 .../DynamicTableItemDelegate.cpp              |   2 +-
 .../DynamicTableItemDelegate.h                |   2 +-
 .../DynamicTableWidget.cpp                    |   2 +-
 .../DynamicTableWidget.h                      |   2 +-
 .../FileListInfoWidget.cpp                    |   2 +-
 .../FileListInfoWidget.h                      |   2 +-
 .../FilterParameterWidget.cpp                 |   2 +-
 .../FilterParameterWidget.h                   |   2 +-
 .../FilterParameterWidgetsDialogs.cpp         |   2 +-
 .../FilterParameterWidgetsDialogs.h           |   2 +-
 .../FloatVec2Widget.cpp                       |   2 +-
 .../FilterParameterWidgets/FloatVec2Widget.h  |   2 +-
 .../FloatVec3Widget.cpp                       |   2 +-
 .../FilterParameterWidgets/FloatVec3Widget.h  |   2 +-
 .../FilterParameterWidgets/FloatWidget.cpp    |   2 +-
 .../FilterParameterWidgets/FloatWidget.h      |   2 +-
 .../FourthOrderPolynomialWidget.cpp           |   2 +-
 .../FourthOrderPolynomialWidget.h             |   2 +-
 .../GenerateColorTableWidget.cpp              |   2 +-
 .../GenerateColorTableWidget.h                |   2 +-
 .../IComparisonWidget.cpp                     |   2 +-
 .../IComparisonWidget.h                       |   2 +-
 .../InputFileWidget.cpp                       |   2 +-
 .../FilterParameterWidgets/InputFileWidget.h  |   2 +-
 .../InputPathWidget.cpp                       |   2 +-
 .../FilterParameterWidgets/InputPathWidget.h  |   2 +-
 .../FilterParameterWidgets/IntVec2Widget.cpp  |   2 +-
 .../FilterParameterWidgets/IntVec2Widget.h    |   2 +-
 .../FilterParameterWidgets/IntVec3Widget.cpp  |   2 +-
 .../FilterParameterWidgets/IntVec3Widget.h    |   2 +-
 .../FilterParameterWidgets/IntWidget.cpp      |   2 +-
 .../FilterParameterWidgets/IntWidget.h        |   2 +-
 .../LinkedBooleanWidget.cpp                   |   2 +-
 .../LinkedBooleanWidget.h                     |   2 +-
 .../LinkedDataContainerSelectionWidget.cpp    |   2 +-
 .../LinkedDataContainerSelectionWidget.h      |   2 +-
 .../LinkedPathCreationWidget.cpp              |   2 +-
 .../LinkedPathCreationWidget.h                |   2 +-
 .../MontageSelectionWidget.cpp                |   2 +-
 .../MontageSelectionWidget.h                  |   2 +-
 .../MontageStructureSelectionWidget.cpp       |   2 +-
 .../MontageStructureSelectionWidget.h         |   2 +-
 .../MultiAttributeMatrixSelectionWidget.cpp   |   2 +-
 .../MultiAttributeMatrixSelectionWidget.h     |   3 +-
 .../MultiDataArraySelectionWidget.cpp         |   2 +-
 .../MultiDataArraySelectionWidget.h           |   2 +-
 .../MultiDataContainerSelectionWidget.cpp     |   2 +-
 .../MultiDataContainerSelectionWidget.h       |   2 +-
 .../MultiInputFileWidget.cpp                  |   2 +-
 .../MultiInputFileWidget.h                    |   2 +-
 .../NumericTypeWidget.cpp                     |   2 +-
 .../NumericTypeWidget.h                       |   2 +-
 .../OutputFileWidget.cpp                      |   2 +-
 .../FilterParameterWidgets/OutputFileWidget.h |   2 +-
 .../OutputPathWidget.cpp                      |   2 +-
 .../FilterParameterWidgets/OutputPathWidget.h |   2 +-
 .../PhaseTypeSelectionWidget.cpp              |   2 +-
 .../PhaseTypeSelectionWidget.h                |   2 +-
 .../PreflightUpdatedValueWidget.cpp           |   2 +-
 .../PreflightUpdatedValueWidget.h             |   2 +-
 .../FilterParameterWidgets/RangeWidget.cpp    |   2 +-
 .../FilterParameterWidgets/RangeWidget.h      |   2 +-
 .../ReadASCIIDataWidget.cpp                   |   2 +-
 .../ReadASCIIDataWidget.h                     |   2 +-
 .../ScalarTypeWidget.cpp                      |   2 +-
 .../FilterParameterWidgets/ScalarTypeWidget.h |   2 +-
 .../SecondOrderPolynomialWidget.cpp           |   2 +-
 .../SecondOrderPolynomialWidget.h             |   2 +-
 .../SeparatorWidget.cpp                       |   2 +-
 .../FilterParameterWidgets/SeparatorWidget.h  |   2 +-
 .../ShapeTypeSelectionWidget.cpp              |   2 +-
 .../ShapeTypeSelectionWidget.h                |   2 +-
 .../FilterParameterWidgets/StringWidget.cpp   |   2 +-
 .../FilterParameterWidgets/StringWidget.h     |   2 +-
 .../ThirdOrderPolynomialWidget.cpp            |   2 +-
 .../ThirdOrderPolynomialWidget.h              |   2 +-
 .../FilterParameterWidgets/UInt64Widget.cpp   |   2 +-
 .../FilterParameterWidgets/UInt64Widget.h     |   2 +-
 .../FilterParameterWidgets/UnknownWidget.cpp  |   2 +-
 .../FilterParameterWidgets/UnknownWidget.h    |   2 +-
 .../QtSApplicationAboutBoxDialog.cpp          |   2 +-
 .../QtSupport/QtSApplicationAboutBoxDialog.h  |   4 +-
 .../QtSupport/QtSApplicationFileInfo.cpp      |   2 +-
 .../QtSupport/QtSApplicationFileInfo.h        |   2 +-
 .../QtSupport/QtSBookmarkMissingDialog.cpp    |   2 +-
 .../QtSupport/QtSBookmarkMissingDialog.h      |   2 +-
 .../QtSupport/QtSCheckboxDialog.cpp           |   2 +-
 .../QtSupport/QtSCheckboxDialog.h             |   2 +-
 .../QtSupport/QtSColorComboPicker.cpp         |   2 +-
 .../QtSupport/QtSColorComboPicker.h           |   2 +-
 .../QtSupport/QtSDistributionTypeWidget.cpp   |   2 +-
 .../QtSupport/QtSDistributionTypeWidget.h     |   2 +-
 .../QtSupport/QtSDroppableScrollArea.cpp      |   2 +-
 .../QtSupport/QtSDroppableScrollArea.h        |   2 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp |   2 +-
 .../SVWidgetsLib/QtSupport/QtSFSDropLabel.h   |   2 +-
 .../QtSupport/QtSFSDropLineEdit.cpp           |   2 +-
 .../QtSupport/QtSFSDropLineEdit.h             |   2 +-
 .../QtSupport/QtSFileCompleter.cpp            |   2 +-
 .../SVWidgetsLib/QtSupport/QtSFileCompleter.h |   2 +-
 .../QtSupport/QtSFileDragMessageBox.cpp       |   2 +-
 .../QtSupport/QtSFileDragMessageBox.h         |   2 +-
 .../QtSupport/QtSGraphicsView.cpp             |   2 +-
 .../SVWidgetsLib/QtSupport/QtSGraphicsView.h  |   2 +-
 .../QtSupport/QtSHelpUrlGenerator.cpp         |   2 +-
 .../QtSupport/QtSHelpUrlGenerator.h           |   2 +-
 .../SVWidgetsLib/QtSupport/QtSHoverButton.cpp |   2 +-
 .../SVWidgetsLib/QtSupport/QtSHoverButton.h   |   2 +-
 .../QtSupport/QtSImageGraphicsDelegate.cpp    |   2 +-
 .../QtSupport/QtSImageGraphicsDelegate.h      |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSMacros.h     |   2 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.cpp |   2 +-
 .../SVWidgetsLib/QtSupport/QtSPluginFrame.h   |   2 +-
 .../QtSupport/QtSRecentFileList.cpp           |   2 +-
 .../QtSupport/QtSRecentFileList.h             |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSSettings.cpp |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSSettings.h   |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSSplitter.h   |   2 +-
 .../QtSupport/QtSSplitterHandle.cpp           |   2 +-
 .../QtSupport/QtSSplitterHandle.h             |   2 +-
 .../SVWidgetsLib/QtSupport/QtSStringEdit.cpp  |   2 +-
 Source/SVWidgetsLib/QtSupport/QtSStringEdit.h |   2 +-
 Source/SVWidgetsLib/Widgets/BookmarksItem.cpp |   2 +-
 Source/SVWidgetsLib/Widgets/BookmarksItem.h   |   2 +-
 .../Widgets/BookmarksItemDelegate.cpp         |   2 +-
 .../Widgets/BookmarksItemDelegate.h           |   2 +-
 .../SVWidgetsLib/Widgets/BookmarksModel.cpp   |   2 +-
 Source/SVWidgetsLib/Widgets/BookmarksModel.h  |   2 +-
 .../Widgets/BookmarksToolboxWidget.cpp        |   2 +-
 .../Widgets/BookmarksToolboxWidget.h          |   2 +-
 .../Widgets/BookmarksTreeView.cpp             |   2 +-
 .../SVWidgetsLib/Widgets/BookmarksTreeView.h  |   2 +-
 .../Widgets/DREAM3DListWidget.cpp             |   2 +-
 .../SVWidgetsLib/Widgets/DREAM3DListWidget.h  |   2 +-
 .../Widgets/DataArrayPathDisplay.cpp          |   2 +-
 .../Widgets/DataArrayPathDisplay.h            |   2 +-
 .../Widgets/DataArrayPathSelectionWidget.cpp  |   2 +-
 .../Widgets/DataArrayPathSelectionWidget.h    |   2 +-
 .../Widgets/DataContainerArrayWidget.cpp      |   2 +-
 .../Widgets/DataContainerGridView.cpp         |   2 +-
 .../Widgets/DataContainerGridView.h           |   2 +-
 Source/SVWidgetsLib/Widgets/DataPathLabel.cpp |   2 +-
 Source/SVWidgetsLib/Widgets/DataPathLabel.h   |   2 +-
 .../Widgets/DataStructureItem.cpp             |   2 +-
 .../SVWidgetsLib/Widgets/DataStructureItem.h  |   2 +-
 .../Widgets/DataStructureItemDelegate.cpp     |   2 +-
 .../Widgets/DataStructureItemDelegate.h       |   2 +-
 .../Widgets/DataStructureModel.cpp            |   2 +-
 .../SVWidgetsLib/Widgets/DataStructureModel.h |   2 +-
 .../Widgets/DataStructureProxyModel.cpp       |   2 +-
 .../Widgets/DataStructureProxyModel.h         |   2 +-
 .../Widgets/DataStructureTreeView.cpp         |   2 +-
 .../Widgets/DataStructureTreeView.h           |   2 +-
 .../Widgets/DataStructureWidget.cpp           |   2 +-
 .../Widgets/DataStructureWidget.h             |   2 +-
 .../Widgets/FilterInputWidget.cpp             |   2 +-
 .../SVWidgetsLib/Widgets/FilterInputWidget.h  |   2 +-
 .../Widgets/FilterLibraryToolboxWidget.cpp    |   2 +-
 .../Widgets/FilterLibraryToolboxWidget.h      |   2 +-
 .../Widgets/FilterLibraryTreeWidget.cpp       |   2 +-
 .../Widgets/FilterLibraryTreeWidget.h         |   2 +-
 .../SVWidgetsLib/Widgets/FilterListItem.cpp   |   2 +-
 Source/SVWidgetsLib/Widgets/FilterListItem.h  |   2 +-
 .../SVWidgetsLib/Widgets/FilterListModel.cpp  |   2 +-
 Source/SVWidgetsLib/Widgets/FilterListModel.h |   2 +-
 .../Widgets/FilterListToolboxWidget.cpp       |   2 +-
 .../Widgets/FilterListToolboxWidget.h         |   2 +-
 .../SVWidgetsLib/Widgets/FilterListView.cpp   |   2 +-
 Source/SVWidgetsLib/Widgets/FilterListView.h  |   2 +-
 .../SVWidgetsLib/Widgets/FilterListWidget.cpp |   2 +-
 .../SVWidgetsLib/Widgets/FilterListWidget.h   |   2 +-
 .../ImportASCIIDataWizard/ASCIIDataItem.cpp   |   2 +-
 .../ImportASCIIDataWizard/ASCIIDataItem.h     |   2 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.cpp  |   2 +-
 .../ImportASCIIDataWizard/ASCIIDataModel.h    |   2 +-
 .../AbstractWizardPage.cpp                    |   2 +-
 .../AbstractWizardPage.h                      |   2 +-
 .../ImportASCIIDataWizard/DataFormatPage.cpp  |  10 +-
 .../ImportASCIIDataWizard/DataFormatPage.h    |   2 +-
 .../ImportASCIIDataWizard/DelimitedPage.cpp   |   2 +-
 .../ImportASCIIDataWizard/DelimitedPage.h     |   2 +-
 .../EditHeadersDialog.cpp                     |   2 +-
 .../ImportASCIIDataWizard/EditHeadersDialog.h |   2 +-
 .../ImportASCIIDataWizard.cpp                 |   2 +-
 .../ImportASCIIDataWizard.h                   |   2 +-
 .../LineCounterObject.cpp                     |   2 +-
 .../ImportASCIIDataWizard/LineCounterObject.h |   2 +-
 .../TupleSelectionPage.cpp                    |   2 +-
 .../TupleSelectionPage.h                      |   2 +-
 .../TupleTableItemDelegate.cpp                |   2 +-
 .../TupleTableItemDelegate.h                  |   2 +-
 .../TupleTableWidget.cpp                      |   2 +-
 .../ImportASCIIDataWizard/TupleTableWidget.h  |   2 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.cpp  |   2 +-
 Source/SVWidgetsLib/Widgets/IssuesWidget.h    |   2 +-
 .../Widgets/IssuesWidgetMessageHandler.cpp    |   2 +-
 .../Widgets/IssuesWidgetMessageHandler.h      |   2 +-
 Source/SVWidgetsLib/Widgets/PipelineView.cpp  |   2 +-
 Source/SVWidgetsLib/Widgets/PipelineView.h    |   2 +-
 .../Widgets/SVOverlayWidgetButton.cpp         |   2 +-
 .../Widgets/SVOverlayWidgetButton.h           |   2 +-
 .../SVWidgetsLib/Widgets/SVPipelineView.cpp   |   2 +-
 Source/SVWidgetsLib/Widgets/SVPipelineView.h  |   2 +-
 Source/SVWidgetsLib/Widgets/SVStyle.cpp       |   2 +-
 Source/SVWidgetsLib/Widgets/SVStyle.h         |   2 +-
 .../Widgets/StandardOutputWidget.cpp          |   2 +-
 .../Widgets/StandardOutputWidget.h            |   2 +-
 .../SVWidgetsLib/Widgets/StatusBarWidget.cpp  |   2 +-
 Source/SVWidgetsLib/Widgets/StatusBarWidget.h |   2 +-
 .../Widgets/util/AddFilterCommand.cpp         |   2 +-
 .../Widgets/util/AddFilterCommand.h           |   2 +-
 .../Widgets/util/MoveFilterCommand.cpp        |   2 +-
 .../Widgets/util/MoveFilterCommand.h          |   2 +-
 .../Widgets/util/RemoveFilterCommand.cpp      |   2 +-
 .../Widgets/util/RemoveFilterCommand.h        |   2 +-
 904 files changed, 1072 insertions(+), 1156 deletions(-)

diff --git a/Resources/DocConfigFiles/CMake/Macros.cmake b/Resources/DocConfigFiles/CMake/Macros.cmake
index 4912900654..7cb7a5c7e3 100644
--- a/Resources/DocConfigFiles/CMake/Macros.cmake
+++ b/Resources/DocConfigFiles/CMake/Macros.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Resources/SIMPL/SIMPL_Code_License_Template.txt b/Resources/SIMPL/SIMPL_Code_License_Template.txt
index 1c45b3963b..89f3df89e8 100644
--- a/Resources/SIMPL/SIMPL_Code_License_Template.txt
+++ b/Resources/SIMPL/SIMPL_Code_License_Template.txt
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Resources/UnitTestSupport.hpp b/Resources/UnitTestSupport.hpp
index 14ea267382..ba006e33aa 100644
--- a/Resources/UnitTestSupport.hpp
+++ b/Resources/UnitTestSupport.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/PipelineRunner/PipelineRunner.cpp b/Source/PipelineRunner/PipelineRunner.cpp
index b0b80198d0..40fc11590b 100644
--- a/Source/PipelineRunner/PipelineRunner.cpp
+++ b/Source/PipelineRunner/PipelineRunner.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/RESTClient/RESTClientDLLExport.h b/Source/RESTClient/RESTClientDLLExport.h
index fbdbb1f8fd..95a0a3221c 100644
--- a/Source/RESTClient/RESTClientDLLExport.h
+++ b/Source/RESTClient/RESTClientDLLExport.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/AppVersion.cpp b/Source/SIMPLib/Common/AppVersion.cpp
index d309ed4867..c3c4c8e42b 100644
--- a/Source/SIMPLib/Common/AppVersion.cpp
+++ b/Source/SIMPLib/Common/AppVersion.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/AppVersion.h b/Source/SIMPLib/Common/AppVersion.h
index 3ce4892f08..e4f26c0d0e 100644
--- a/Source/SIMPLib/Common/AppVersion.h
+++ b/Source/SIMPLib/Common/AppVersion.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/Constants.h b/Source/SIMPLib/Common/Constants.h
index 9fe7bc6cc7..bfa0385586 100644
--- a/Source/SIMPLib/Common/Constants.h
+++ b/Source/SIMPLib/Common/Constants.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
index cd32ef2e41..df0292e471 100644
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
index 3ddf9dbbfc..50634ab6fc 100644
--- a/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
+++ b/Source/SIMPLib/Common/CreatedArrayHelpIndexEntry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/EnsembleInfo.cpp b/Source/SIMPLib/Common/EnsembleInfo.cpp
index 47f8e7983a..e4b56235cb 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.cpp
+++ b/Source/SIMPLib/Common/EnsembleInfo.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/EnsembleInfo.h b/Source/SIMPLib/Common/EnsembleInfo.h
index 5246d45378..7d2947f8b6 100644
--- a/Source/SIMPLib/Common/EnsembleInfo.h
+++ b/Source/SIMPLib/Common/EnsembleInfo.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/IObserver.cpp b/Source/SIMPLib/Common/IObserver.cpp
index c96a36d0d3..e26aead15c 100644
--- a/Source/SIMPLib/Common/IObserver.cpp
+++ b/Source/SIMPLib/Common/IObserver.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/IObserver.h b/Source/SIMPLib/Common/IObserver.h
index ada017b6fd..51df7217be 100644
--- a/Source/SIMPLib/Common/IObserver.h
+++ b/Source/SIMPLib/Common/IObserver.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/Observable.cpp b/Source/SIMPLib/Common/Observable.cpp
index 89156c06b2..8e41bfa48b 100644
--- a/Source/SIMPLib/Common/Observable.cpp
+++ b/Source/SIMPLib/Common/Observable.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/Observable.h b/Source/SIMPLib/Common/Observable.h
index b3e89cba69..dfe82154c7 100644
--- a/Source/SIMPLib/Common/Observable.h
+++ b/Source/SIMPLib/Common/Observable.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/Observer.cpp b/Source/SIMPLib/Common/Observer.cpp
index 276e0fd479..63f97557d6 100644
--- a/Source/SIMPLib/Common/Observer.cpp
+++ b/Source/SIMPLib/Common/Observer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/Observer.h b/Source/SIMPLib/Common/Observer.h
index 0f202c6b76..bb76c0aae7 100644
--- a/Source/SIMPLib/Common/Observer.h
+++ b/Source/SIMPLib/Common/Observer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/PhaseType.cpp b/Source/SIMPLib/Common/PhaseType.cpp
index 9b961a84fe..750b608971 100644
--- a/Source/SIMPLib/Common/PhaseType.cpp
+++ b/Source/SIMPLib/Common/PhaseType.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/PhaseType.h b/Source/SIMPLib/Common/PhaseType.h
index 9ca2c15ec6..1a54b2b28a 100644
--- a/Source/SIMPLib/Common/PhaseType.h
+++ b/Source/SIMPLib/Common/PhaseType.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/SIMPLRange.cpp b/Source/SIMPLib/Common/SIMPLRange.cpp
index 711c824eef..cafbbe457c 100644
--- a/Source/SIMPLib/Common/SIMPLRange.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLRange.h b/Source/SIMPLib/Common/SIMPLRange.h
index d44edd3d05..a55e8115ad 100644
--- a/Source/SIMPLib/Common/SIMPLRange.h
+++ b/Source/SIMPLib/Common/SIMPLRange.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.cpp b/Source/SIMPLib/Common/SIMPLRange2D.cpp
index 003a36bd59..3bc64a64c2 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange2D.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLRange2D.h b/Source/SIMPLib/Common/SIMPLRange2D.h
index d831249ef9..d1a31a7186 100644
--- a/Source/SIMPLib/Common/SIMPLRange2D.h
+++ b/Source/SIMPLib/Common/SIMPLRange2D.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.cpp b/Source/SIMPLib/Common/SIMPLRange3D.cpp
index c709c161f8..21778201c2 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.cpp
+++ b/Source/SIMPLib/Common/SIMPLRange3D.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLRange3D.h b/Source/SIMPLib/Common/SIMPLRange3D.h
index 666313a6d7..f504fd08fe 100644
--- a/Source/SIMPLib/Common/SIMPLRange3D.h
+++ b/Source/SIMPLib/Common/SIMPLRange3D.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Common/SIMPLibDLLExport.h b/Source/SIMPLib/Common/SIMPLibDLLExport.h
index 3ee6ed2ad0..ab5bf6700d 100644
--- a/Source/SIMPLib/Common/SIMPLibDLLExport.h
+++ b/Source/SIMPLib/Common/SIMPLibDLLExport.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
index f184f04638..66a7e666be 100644
--- a/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
+++ b/Source/SIMPLib/Common/SIMPLibSetGetMacros.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -257,7 +257,7 @@ public:
   void set##prpty(const type& value)                                                                                                                                                                   \
   {                                                                                                                                                                                                    \
     this->m_##prpty = value;                                                                                                                                                                           \
-    Q_EMIT parametersChanged();                                                                                                                                                                          \
+    Q_EMIT parametersChanged();                                                                                                                                                                        \
   }
 
 #define SIMPL_SET_PROPERTY_DECL(type, prpty) void set##prpty(type value);
@@ -401,7 +401,7 @@ public:
 // -----------------------------------------------------------------------------
 #define SIMPL_CONTAINER_TYPE(thisClass, container)                                                                                                                                                     \
   typedef(container)<thisClass> ContainerT;                                                                                                                                                            \
-  typedef std::shared_ptr<(container) < (thisClass)>> ContainerPType;
+  typedef std::shared_ptr<(container) < (thisClass)> > ContainerPType;
 
 /**
  * @brief Creates a "setter" method to set the property.
diff --git a/Source/SIMPLib/Common/ScopedFileMonitor.hpp b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
index 561e72564c..4e67aa209c 100644
--- a/Source/SIMPLib/Common/ScopedFileMonitor.hpp
+++ b/Source/SIMPLib/Common/ScopedFileMonitor.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/ShapeType.cpp b/Source/SIMPLib/Common/ShapeType.cpp
index 5bea65e843..82a8539501 100644
--- a/Source/SIMPLib/Common/ShapeType.cpp
+++ b/Source/SIMPLib/Common/ShapeType.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/ShapeType.h b/Source/SIMPLib/Common/ShapeType.h
index e6e4db987a..bba70d65d0 100644
--- a/Source/SIMPLib/Common/ShapeType.h
+++ b/Source/SIMPLib/Common/ShapeType.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Common/TemplateHelpers.h b/Source/SIMPLib/Common/TemplateHelpers.h
index bdc523b944..226ee90444 100644
--- a/Source/SIMPLib/Common/TemplateHelpers.h
+++ b/Source/SIMPLib/Common/TemplateHelpers.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
index cbb058f52b..23b21b8fae 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
index 65392184ae..3f5b5fa5f1 100644
--- a/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
+++ b/Source/SIMPLib/CoreFilters/ApplyImageTransforms.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
index b874096fe7..a229db58cd 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ArrayCalculator.h b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
index 94498dcc3a..248dafae4c 100644
--- a/Source/SIMPLib/CoreFilters/ArrayCalculator.h
+++ b/Source/SIMPLib/CoreFilters/ArrayCalculator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.cpp b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
index 1e063a68db..31577469f8 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.cpp
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Breakpoint.h b/Source/SIMPLib/CoreFilters/Breakpoint.h
index 0a0fe33f2f..af7943246a 100644
--- a/Source/SIMPLib/CoreFilters/Breakpoint.h
+++ b/Source/SIMPLib/CoreFilters/Breakpoint.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
index a66fe3b942..d549df3163 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
index b49de8b9e5..2f7660fa18 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeArrays.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
index dcdbf354e2..4478a81c66 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
index 199f9a1c1b..8535c622ab 100644
--- a/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
+++ b/Source/SIMPLib/CoreFilters/CombineAttributeMatrices.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
index 3b22c92733..5ffe747d45 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
index ef31bdee2a..998cf52f02 100644
--- a/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
+++ b/Source/SIMPLib/CoreFilters/ConditionalSetValue.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
index 7f81d1b46e..627cc4dc5a 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.cpp
@@ -29,7 +29,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
index 2082c48993..4af764b45d 100644
--- a/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
+++ b/Source/SIMPLib/CoreFilters/ConvertColorToGrayScale.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.cpp b/Source/SIMPLib/CoreFilters/ConvertData.cpp
index 28f474f9a4..eb6697a957 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.cpp
+++ b/Source/SIMPLib/CoreFilters/ConvertData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ConvertData.h b/Source/SIMPLib/CoreFilters/ConvertData.h
index 7af92ecd91..711445de79 100644
--- a/Source/SIMPLib/CoreFilters/ConvertData.h
+++ b/Source/SIMPLib/CoreFilters/ConvertData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
index a6e0577aab..296907edb9 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
index 9ff8eef22d..75979c8e6b 100644
--- a/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CopyFeatureArrayToElementArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.cpp b/Source/SIMPLib/CoreFilters/CopyObject.cpp
index 92204fa181..c5142f2eb6 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.cpp
+++ b/Source/SIMPLib/CoreFilters/CopyObject.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CopyObject.h b/Source/SIMPLib/CoreFilters/CopyObject.h
index 5dc48c3cfd..df83ecd637 100644
--- a/Source/SIMPLib/CoreFilters/CopyObject.h
+++ b/Source/SIMPLib/CoreFilters/CopyObject.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
index 71a98171cc..e58b11fa14 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
index 7ba36a2961..13f5f283e2 100644
--- a/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/CreateAttributeMatrix.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
index 31ecfc6f51..7f782daf86 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateDataArray.h b/Source/SIMPLib/CoreFilters/CreateDataArray.h
index dac5e4118c..9f38fee12a 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
index 1d14f64421..a5b7d10cb1 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateDataContainer.h b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
index bf4e914d51..7817e2ed3b 100644
--- a/Source/SIMPLib/CoreFilters/CreateDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/CreateDataContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
index 5eae0b0680..df83bd27e3 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
index 148dac05d0..089b04acb3 100644
--- a/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateFeatureArrayFromElementArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
index 6d79246efc..98518bc3fc 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -350,7 +350,7 @@ void CreateGeometry::dataCheck()
     else
     {
       AttributeMatrix::Pointer am = getDataContainerArray()->getAttributeMatrix(getSharedVertexListArrayPath0());
-      if(nullptr != verts.get() )
+      if(nullptr != verts.get())
       {
         // Remove from the Attribute Matrix FIRST
         IDataArray::Pointer vertsToRemove = am->removeAttributeArray(getSharedVertexListArrayPath0().getDataArrayName());
diff --git a/Source/SIMPLib/CoreFilters/CreateGeometry.h b/Source/SIMPLib/CoreFilters/CreateGeometry.h
index d92657c3ee..64dd3d38f3 100644
--- a/Source/SIMPLib/CoreFilters/CreateGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
index 77b106a9e7..251de94b8e 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/CoreFilters/CreateGridMontage.h b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
index 48d2cd6e93..2a00fbd70d 100644
--- a/Source/SIMPLib/CoreFilters/CreateGridMontage.h
+++ b/Source/SIMPLib/CoreFilters/CreateGridMontage.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
index dd35edb315..90faaf4bf2 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
index b95eb1fd74..fced371d53 100644
--- a/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CreateImageGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
index 72ed0f470b..b2c070e384 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CreateStringArray.h b/Source/SIMPLib/CoreFilters/CreateStringArray.h
index d33622a642..1bf81f18e7 100644
--- a/Source/SIMPLib/CoreFilters/CreateStringArray.h
+++ b/Source/SIMPLib/CoreFilters/CreateStringArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
index 01e569580c..efcf08a15f 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
index 302eb96460..4ab8d9e375 100644
--- a/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/CropVertexGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
index e91ed35959..aa89455eb9 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/DataContainerReader.h b/Source/SIMPLib/CoreFilters/DataContainerReader.h
index 1d0ead564f..8dec280523 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerReader.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
index 63cb4c9580..6061136697 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/DataContainerWriter.h b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
index 19bfa58703..d2720a1e38 100644
--- a/Source/SIMPLib/CoreFilters/DataContainerWriter.h
+++ b/Source/SIMPLib/CoreFilters/DataContainerWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
index 2c9d2e3cb0..8f880b8423 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/EmptyFilter.h b/Source/SIMPLib/CoreFilters/EmptyFilter.h
index 90bc408e5c..836dc86a2f 100644
--- a/Source/SIMPLib/CoreFilters/EmptyFilter.h
+++ b/Source/SIMPLib/CoreFilters/EmptyFilter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
index 05202551d6..053e80adab 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExecuteProcess.h b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
index ab063c5f7b..66b8dad86a 100644
--- a/Source/SIMPLib/CoreFilters/ExecuteProcess.h
+++ b/Source/SIMPLib/CoreFilters/ExecuteProcess.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
index 91b8cf0290..36026ffbe9 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
index b5acbffa8c..877f9e4db4 100644
--- a/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractAttributeArraysFromGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
index 4f0cdd959d..e8fd742773 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
index 977f64f89e..71fba57037 100644
--- a/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
+++ b/Source/SIMPLib/CoreFilters/ExtractComponentAsArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
index 132d7f894e..5f538250ad 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
index a30dea24b2..9cb24cceae 100644
--- a/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
+++ b/Source/SIMPLib/CoreFilters/ExtractVertexGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
index 83c19286cd..24973f1b0e 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
index 9c200b2113..2bf32e52ee 100644
--- a/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/FeatureCountDecision.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
index 548e45098c..0295236fbb 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
index 933e9cdb38..0c34641f08 100644
--- a/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
+++ b/Source/SIMPLib/CoreFilters/FeatureDataCSVWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FileReader.cpp b/Source/SIMPLib/CoreFilters/FileReader.cpp
index ab9b130a71..75364965c2 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.cpp
+++ b/Source/SIMPLib/CoreFilters/FileReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FileReader.h b/Source/SIMPLib/CoreFilters/FileReader.h
index 0640790e96..acb9bb154a 100644
--- a/Source/SIMPLib/CoreFilters/FileReader.h
+++ b/Source/SIMPLib/CoreFilters/FileReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.cpp b/Source/SIMPLib/CoreFilters/FileWriter.cpp
index 8809d86422..d6156f7da9 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.cpp
+++ b/Source/SIMPLib/CoreFilters/FileWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FileWriter.h b/Source/SIMPLib/CoreFilters/FileWriter.h
index 8d974388e6..fdf63ce790 100644
--- a/Source/SIMPLib/CoreFilters/FileWriter.h
+++ b/Source/SIMPLib/CoreFilters/FileWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
index 976fde87d5..891440267a 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/FindDerivatives.h b/Source/SIMPLib/CoreFilters/FindDerivatives.h
index 7baad4e94a..d2c0a422f7 100644
--- a/Source/SIMPLib/CoreFilters/FindDerivatives.h
+++ b/Source/SIMPLib/CoreFilters/FindDerivatives.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
index e9ef9ad3fc..2504007a57 100644
--- a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
+++ b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
index b362ded103..a5019e4ad6 100644
--- a/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
+++ b/Source/SIMPLib/CoreFilters/GenerateVertexCoordinates.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
index c97f808658..f8b0618053 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
index 978b99209b..53c83fe3d1 100644
--- a/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
+++ b/Source/SIMPLib/CoreFilters/ImportAsciDataArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.cpp b/Source/SIMPLib/CoreFilters/InitializeData.cpp
index 823fd428ba..4883077d47 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.cpp
+++ b/Source/SIMPLib/CoreFilters/InitializeData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/InitializeData.h b/Source/SIMPLib/CoreFilters/InitializeData.h
index 4f873fc802..8fbde84e94 100644
--- a/Source/SIMPLib/CoreFilters/InitializeData.h
+++ b/Source/SIMPLib/CoreFilters/InitializeData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
index f449e47e18..d4548176bf 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
index e7f30fa2e7..f6286bc352 100644
--- a/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
+++ b/Source/SIMPLib/CoreFilters/LinkFeatureMapToElementArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
index f7fa384ffe..128ac4e84a 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MaskCountDecision.h b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
index 0a11512013..086802afad 100644
--- a/Source/SIMPLib/CoreFilters/MaskCountDecision.h
+++ b/Source/SIMPLib/CoreFilters/MaskCountDecision.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.cpp b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
index 0364129c20..8235ddbaaa 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.cpp
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MassCreateData.h b/Source/SIMPLib/CoreFilters/MassCreateData.h
index 230118eceb..4b8788142e 100644
--- a/Source/SIMPLib/CoreFilters/MassCreateData.h
+++ b/Source/SIMPLib/CoreFilters/MassCreateData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MoveData.cpp b/Source/SIMPLib/CoreFilters/MoveData.cpp
index 82e7d2593e..078f5ae788 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MoveData.h b/Source/SIMPLib/CoreFilters/MoveData.h
index 01f4b88ba3..525bffba94 100644
--- a/Source/SIMPLib/CoreFilters/MoveData.h
+++ b/Source/SIMPLib/CoreFilters/MoveData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
index c43f864c20..bf88905dd1 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MoveMultiData.h b/Source/SIMPLib/CoreFilters/MoveMultiData.h
index ada37c548c..ce25f0edb1 100644
--- a/Source/SIMPLib/CoreFilters/MoveMultiData.h
+++ b/Source/SIMPLib/CoreFilters/MoveMultiData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
index 38a1e0a5e9..4bb3ed7c2a 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
index 1748d615c9..bf4dede8c2 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
index e52e711e65..276af37e9f 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
index 30e3f2be5c..a72e760af9 100644
--- a/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
+++ b/Source/SIMPLib/CoreFilters/MultiThresholdObjects2.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
index e0ec0021a8..e206cbbbd8 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RawBinaryReader.h b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
index 69604d4a55..6c7f97888a 100644
--- a/Source/SIMPLib/CoreFilters/RawBinaryReader.h
+++ b/Source/SIMPLib/CoreFilters/RawBinaryReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ReadASCIIData.h b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
index 0a4b369921..4b32931544 100644
--- a/Source/SIMPLib/CoreFilters/ReadASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/ReadASCIIData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
index 110c97c91f..dd1335de87 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RemoveArrays.h b/Source/SIMPLib/CoreFilters/RemoveArrays.h
index b158e052ff..c746751a37 100644
--- a/Source/SIMPLib/CoreFilters/RemoveArrays.h
+++ b/Source/SIMPLib/CoreFilters/RemoveArrays.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
index 8cf0509198..81f0a4d283 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
index 0b3a8bab03..b7dddb48f9 100644
--- a/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
+++ b/Source/SIMPLib/CoreFilters/RemoveComponentFromArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
index 0c649b4a6a..fa5d85bbfb 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
index f72bb9c26d..da565260c0 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
index f45f93f886..0c7316ce63 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
index c5da680bcb..8f1400e5ac 100644
--- a/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
+++ b/Source/SIMPLib/CoreFilters/RenameAttributeMatrix.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
index 6198b14774..69216f8aba 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RenameDataContainer.h b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
index 597e32d764..b05e8161fe 100644
--- a/Source/SIMPLib/CoreFilters/RenameDataContainer.h
+++ b/Source/SIMPLib/CoreFilters/RenameDataContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
index 02166f7ccd..72f4a707a1 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
index 57fe22c460..5d002c63a7 100644
--- a/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
+++ b/Source/SIMPLib/CoreFilters/ReplaceValueInArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
index 00711eb14c..c44d6d13e5 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RequiredZThickness.h b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
index 8d0d7d5672..4edb4acbfc 100644
--- a/Source/SIMPLib/CoreFilters/RequiredZThickness.h
+++ b/Source/SIMPLib/CoreFilters/RequiredZThickness.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
index 3cbe47c0c5..cf7c513132 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Air Force Prime Contract FA8650-15-D-5231
diff --git a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
index c4dfe4bf84..0e2a3c3250 100644
--- a/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
+++ b/Source/SIMPLib/CoreFilters/RotateSampleRefFrame.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Air Force Prime Contract FA8650-15-D-5231
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
index 1ac32db3b9..95332877dc 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/ScaleVolume.h b/Source/SIMPLib/CoreFilters/ScaleVolume.h
index 21b06ed5a9..4274c145c8 100644
--- a/Source/SIMPLib/CoreFilters/ScaleVolume.h
+++ b/Source/SIMPLib/CoreFilters/ScaleVolume.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
index 91bfad4df2..513afe73b8 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
index a7ae637fd0..dce43cf11e 100644
--- a/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
+++ b/Source/SIMPLib/CoreFilters/SetOriginResolutionImageGeom.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
index 0081e115b7..ea99e40968 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
index b5d4b9d3ed..70bdfe9210 100644
--- a/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
+++ b/Source/SIMPLib/CoreFilters/SplitAttributeArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
index 763bdfc178..36ede74d2d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ArrayCalculatorTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
index 5e06910ba2..1f5c442fb1 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeArraysTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
index 0a43c2e920..d857f9691a 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CombineAttributeMatricesTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
index 740406158a..be571a7657 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConditionalSetValueTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
index d3367408f2..bd04fdbe10 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertColorToGrayScaleTest.cpp
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
index a10a20e656..ce1b0f7545 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ConvertDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
index dc6510086c..24275df5e6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyFeatureArrayToElementArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
index beb78882f9..40849af2a2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CopyObjectTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
index 9c0d1df15e..61ec354888 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateAttributeMatrixTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
index 33bb9dfaf7..55d7848135 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
index 65eb69fcaa..75792ad163 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateDataContainerTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
index 15ecdaff19..18643ecf52 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateFeatureArrayFromElementArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
index c6a6fa7897..f911821505 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateGeometryTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
index 9f20dfb145..bf49e0c74b 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateImageGeometryTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
index b1e54e47a5..d4cc387657 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CreateStringArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
index 55b7b98dc2..0e1c649641 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/CropVertexGeometryTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
index c0dba33c3e..b31b2df19e 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/DataContainerTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
index e86ec4f7e9..809cf45d61 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ErrorMessageTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
index c74b423068..1c1292da98 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExecuteProcessTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
index d5c6e85e7f..7870e7511d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExportDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
index bb0c509124..070a9a1252 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractAttributeArraysFromGeometryTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
index b0bc5dc354..789bf0282c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ExtractComponentAsArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
index 4087f8df02..21d5148f73 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FeatureDataCSVWriterTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
index f15794523e..68d7118efa 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/FindDerivativesFilterTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
index 72d2745407..c9ebc2a2c2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/GenerateColorTableTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
index c5e47163c7..0acda84cbd 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
index f20328faba..c0213257cf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MoveMultiDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
index ac1d1d6967..393be364df 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjects2Test.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
index 5e9a6a50df..d9e86453fa 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/MultiThresholdObjectsTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
index b44c6071ad..48a8c5d2c2 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/PipelinePauseTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
index d9996a0763..08197f685d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RawBinaryReaderTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
index 726eecbd1e..203bdc1c95 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReadASCIIDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
index c93a51b51d..b5a8ca15f4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveArraysTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
index b53c94f6d4..fe2456e9f6 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RemoveComponentFromArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
index e120d0f152..015690ef1d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
index 6bf635152d..34d4f541af 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameAttributeMatrixTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
index 86ebf7eabb..f44175c29c 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameDataContainerTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
index fbfb03b3dd..526d58c3bf 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RenameTimingTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
index c1ac89444b..9b2c85da30 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ReplaceValueTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
index e3d2280185..8fe94c3fc4 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RequiredZThicknessTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
index 4d815c902c..729fe7fd21 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/RotateSampleRefFrameTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
index a2d6d68b94..2849d3249d 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/ScaleVolumeTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
index d819dfc6f0..e623e93058 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SetOriginResolutionImageGeomTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
index 47606ae276..f82ceefe20 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/SplitAttributeArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
index e30b2273fe..9ef7982e82 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/Unused/RecursivePipelineTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
index 6d7419eb74..17dad6f164 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteASCIIDataTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
index 8d81d7b502..8ec9e509cc 100644
--- a/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
+++ b/Source/SIMPLib/CoreFilters/Testing/Cxx/WriteTriangleGeometryTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
index 9546e31c75..b26c183478 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/WriteASCIIData.h b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
index b0bb7406ee..099779ebb3 100644
--- a/Source/SIMPLib/CoreFilters/WriteASCIIData.h
+++ b/Source/SIMPLib/CoreFilters/WriteASCIIData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
index e5a7e8d5af..ae778a8890 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
index 8e45e79237..a61d6ddd21 100644
--- a/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
+++ b/Source/SIMPLib/CoreFilters/WriteTriangleGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp b/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
index 72b2fb171b..c46fa9215f 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ABSOperator.h b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
index 2c716e5d42..8a33c59d5b 100644
--- a/Source/SIMPLib/CoreFilters/util/ABSOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ABSOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
index 9f2f35b5b4..5da8d32a34 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ACosOperator.h b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
index 9f0332291f..1bd204c7b0 100644
--- a/Source/SIMPLib/CoreFilters/util/ACosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ACosOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
index a4cab7beb4..ebdf3c60b1 100644
--- a/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
+++ b/Source/SIMPLib/CoreFilters/util/ASCIIWizardData.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp b/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
index 6a70ce0257..9d014c1de6 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ASinOperator.h b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
index 6f6f4ee5c5..c1d0f637cb 100644
--- a/Source/SIMPLib/CoreFilters/util/ASinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ASinOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
index d9e9e67a04..3a50c752da 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ATanOperator.h b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
index 8746f3fc91..3326f1664c 100644
--- a/Source/SIMPLib/CoreFilters/util/ATanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ATanOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
index 6d43876892..c8347cc207 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
index 485f8d52ff..c40199a7d9 100644
--- a/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/AdditionOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
index 05acc0a731..30b6fa73be 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
index 195b085891..ea73c84fba 100644
--- a/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/BinaryOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
index 720717637f..c0cba7938a 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorArray.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
index 27bedd1729..81a8bf3cc5 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
index 0cd6c5f73d..9c0745d7a4 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
index 48c534b330..aabddb7087 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
index 9ecedd4f61..71bb20d486 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
index 469e35f46e..f955aaa10c 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
index e9b8632596..cd944d3642 100644
--- a/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CalculatorSeparator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp b/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
index a9775f7393..641033b4c6 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CeilOperator.h b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
index a89279e6f3..ee92608ca4 100644
--- a/Source/SIMPLib/CoreFilters/util/CeilOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CeilOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
index f4c3f1f56d..1e2817bb27 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
index e2a61d68d3..010a52726e 100644
--- a/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
+++ b/Source/SIMPLib/CoreFilters/util/CommaSeparator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
index 8f61904bb2..8aaf5063b5 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/CosOperator.h b/Source/SIMPLib/CoreFilters/util/CosOperator.h
index 313d85fd8b..cfbbad63ac 100644
--- a/Source/SIMPLib/CoreFilters/util/CosOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/CosOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
index b007d7919f..24eba8690e 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
index b4e5eb6494..21d5d28daa 100644
--- a/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/DivisionOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp b/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
index 0849da3490..1b1c6c0bac 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ExpOperator.h b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
index 47573248af..1bcaade7d8 100644
--- a/Source/SIMPLib/CoreFilters/util/ExpOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/ExpOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
index ce8287d642..d90d73d439 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/FloorOperator.h b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
index 15c90568ac..56c320baa5 100644
--- a/Source/SIMPLib/CoreFilters/util/FloorOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/FloorOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
index 9169a261e2..76253b2113 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
index 98bff9cc23..f2f1480f11 100644
--- a/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
+++ b/Source/SIMPLib/CoreFilters/util/ICalculatorArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
index 52b2164e7d..f29f32bdb8 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
index 33c4e53c83..b151f46c58 100644
--- a/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/LeftParenthesisItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.cpp b/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
index 1fe5aeb1a2..c5b91e2dc1 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LnOperator.h b/Source/SIMPLib/CoreFilters/util/LnOperator.h
index 389efb82c7..288b75936e 100644
--- a/Source/SIMPLib/CoreFilters/util/LnOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LnOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp b/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
index b04a03dc06..2585b7392c 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/Log10Operator.h b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
index df27f84a7f..6cd7ed00a9 100644
--- a/Source/SIMPLib/CoreFilters/util/Log10Operator.h
+++ b/Source/SIMPLib/CoreFilters/util/Log10Operator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
index eca6ffb09f..52c3d7afe7 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/LogOperator.h b/Source/SIMPLib/CoreFilters/util/LogOperator.h
index 6893013c71..678835e060 100644
--- a/Source/SIMPLib/CoreFilters/util/LogOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/LogOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
index 83f2258cd5..6fbe70c7a6 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
index 2e1f779ab4..455fab3a5e 100644
--- a/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/MultiplicationOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
index 04f0edef5d..99fc71cc7a 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
index c296221f8a..ef49a69522 100644
--- a/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/NegativeOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
index 976a652d84..1c99f870a2 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/PowOperator.h b/Source/SIMPLib/CoreFilters/util/PowOperator.h
index 0d3f5ddee9..c2885472cb 100644
--- a/Source/SIMPLib/CoreFilters/util/PowOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/PowOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
index 4c2edc704e..a9b0195441 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
index 6f62a71756..303e9e49cf 100644
--- a/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
+++ b/Source/SIMPLib/CoreFilters/util/RightParenthesisItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
index b202b58219..9c1b84dd0c 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/RootOperator.h b/Source/SIMPLib/CoreFilters/util/RootOperator.h
index cee53f0544..7c28a75016 100644
--- a/Source/SIMPLib/CoreFilters/util/RootOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/RootOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
index 131cf40ec0..dba5da2264 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SinOperator.h b/Source/SIMPLib/CoreFilters/util/SinOperator.h
index 56cdebfb29..76e71351d4 100644
--- a/Source/SIMPLib/CoreFilters/util/SinOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SinOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp b/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
index 0ac4548b1a..7e129ca36f 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
index dcfdf652f5..5da78a1a1b 100644
--- a/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SqrtOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
index 88f19d6aed..b7890510c8 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
index 22219d866e..a2b6c49084 100644
--- a/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/SubtractionOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
index 2473ad1d69..cccae1bacf 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/TanOperator.h b/Source/SIMPLib/CoreFilters/util/TanOperator.h
index 65ebf59500..a5004d08f2 100644
--- a/Source/SIMPLib/CoreFilters/util/TanOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/TanOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
index a19db1493a..4455cce5d5 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
index 56264e5b7a..a10dec4d7e 100644
--- a/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
+++ b/Source/SIMPLib/CoreFilters/util/UnaryOperator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/DataArray.cpp b/Source/SIMPLib/DataArrays/DataArray.cpp
index d1ed3e017e..03223b7ece 100644
--- a/Source/SIMPLib/DataArrays/DataArray.cpp
+++ b/Source/SIMPLib/DataArrays/DataArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/DataArray.hpp b/Source/SIMPLib/DataArrays/DataArray.hpp
index 7173fb4e0e..7ab6088665 100644
--- a/Source/SIMPLib/DataArrays/DataArray.hpp
+++ b/Source/SIMPLib/DataArrays/DataArray.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/DynamicListArray.hpp b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
index 1c4e84e159..99c1addb3b 100644
--- a/Source/SIMPLib/DataArrays/DynamicListArray.hpp
+++ b/Source/SIMPLib/DataArrays/DynamicListArray.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp b/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
index 0eeeabf77e..5cf5dcba9d 100644
--- a/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
+++ b/Source/SIMPLib/DataArrays/IDataArrayFilter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/IDataArrayFilter.h b/Source/SIMPLib/DataArrays/IDataArrayFilter.h
index f43570804e..57a783e6fc 100644
--- a/Source/SIMPLib/DataArrays/IDataArrayFilter.h
+++ b/Source/SIMPLib/DataArrays/IDataArrayFilter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/NeighborList.hpp b/Source/SIMPLib/DataArrays/NeighborList.hpp
index 50c65e53eb..e8b8faece3 100644
--- a/Source/SIMPLib/DataArrays/NeighborList.hpp
+++ b/Source/SIMPLib/DataArrays/NeighborList.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.cpp b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
index d3ea8a44c2..759971a656 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/StatsDataArray.h b/Source/SIMPLib/DataArrays/StatsDataArray.h
index 130dcb0405..30d668b167 100644
--- a/Source/SIMPLib/DataArrays/StatsDataArray.h
+++ b/Source/SIMPLib/DataArrays/StatsDataArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.cpp b/Source/SIMPLib/DataArrays/StringDataArray.cpp
index bd362164d8..f00627a5d0 100644
--- a/Source/SIMPLib/DataArrays/StringDataArray.cpp
+++ b/Source/SIMPLib/DataArrays/StringDataArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/StringDataArray.h b/Source/SIMPLib/DataArrays/StringDataArray.h
index 29d2e3b2db..eed287e660 100755
--- a/Source/SIMPLib/DataArrays/StringDataArray.h
+++ b/Source/SIMPLib/DataArrays/StringDataArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/StructArray.hpp b/Source/SIMPLib/DataArrays/StructArray.hpp
index 2090d77c71..a40624fd50 100644
--- a/Source/SIMPLib/DataArrays/StructArray.hpp
+++ b/Source/SIMPLib/DataArrays/StructArray.hpp
@@ -31,7 +31,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
index 165e1069f3..43ed0bad87 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/DataArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
index 42484374d4..6cb3303c5b 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StringDataArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
index 82a405c48e..edc55dd353 100644
--- a/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
+++ b/Source/SIMPLib/DataArrays/Testing/Cxx/StructArrayTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
index 7775d695a6..21e8f69c16 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrix.h b/Source/SIMPLib/DataContainers/AttributeMatrix.h
index 9782efa907..1958170818 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrix.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrix.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
index a2f37343d3..9c32d6d3d2 100644
--- a/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
+++ b/Source/SIMPLib/DataContainers/AttributeMatrixProxy.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.cpp b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
index c9e4a9536f..cd5801be2d 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.cpp
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataArrayPath.h b/Source/SIMPLib/DataContainers/DataArrayPath.h
index 4aac9209d0..196369bf1c 100644
--- a/Source/SIMPLib/DataContainers/DataArrayPath.h
+++ b/Source/SIMPLib/DataContainers/DataArrayPath.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataArrayProxy.h b/Source/SIMPLib/DataContainers/DataArrayProxy.h
index 43be1b2a14..5bb03f8ae7 100644
--- a/Source/SIMPLib/DataContainers/DataArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataArrayProxy.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainer.cpp b/Source/SIMPLib/DataContainers/DataContainer.cpp
index 2bfa766977..3153303b7e 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainer.h b/Source/SIMPLib/DataContainers/DataContainer.h
index 3db186e44a..f81f39c4ae 100644
--- a/Source/SIMPLib/DataContainers/DataContainer.h
+++ b/Source/SIMPLib/DataContainers/DataContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.cpp b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
index 5da8febd35..7cbc3b63ad 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerArray.h b/Source/SIMPLib/DataContainers/DataContainerArray.h
index 1ee2ce38ac..d0f878fa3f 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArray.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArray.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
index 567f7d903f..bdc601a223 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
index 6d2d76159b..dd01800f62 100644
--- a/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerArrayProxy.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
index ba41c598f7..408f6c57a1 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerBundle.h b/Source/SIMPLib/DataContainers/DataContainerBundle.h
index 69165f7e4b..26bcd9648b 100644
--- a/Source/SIMPLib/DataContainers/DataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/DataContainerBundle.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
index d075f6c66a..345335d256 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataContainerProxy.h b/Source/SIMPLib/DataContainers/DataContainerProxy.h
index e4b4077ae3..d8de0729c0 100644
--- a/Source/SIMPLib/DataContainers/DataContainerProxy.h
+++ b/Source/SIMPLib/DataContainers/DataContainerProxy.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
index cc747f51a5..e95051c1b7 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5261
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/DataStructureUtilities.h b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
index 6ba83b87b3..b3778b1198 100644
--- a/Source/SIMPLib/DataContainers/DataStructureUtilities.h
+++ b/Source/SIMPLib/DataContainers/DataStructureUtilities.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5261
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/DsnIterators.h b/Source/SIMPLib/DataContainers/DsnIterators.h
index 16e9836e41..8394174fe5 100644
--- a/Source/SIMPLib/DataContainers/DsnIterators.h
+++ b/Source/SIMPLib/DataContainers/DsnIterators.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
index e8d9ef5863..37c5909c97 100644
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/IDataContainerBundle.h b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
index 47b189a3fc..41954e7274 100644
--- a/Source/SIMPLib/DataContainers/IDataContainerBundle.h
+++ b/Source/SIMPLib/DataContainers/IDataContainerBundle.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
index 5b08c86a0c..ea3d2bc6ee 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureContainerNode.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
index c1cf7886ed..0eab51262e 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/IDataStructureNode.h b/Source/SIMPLib/DataContainers/IDataStructureNode.h
index 22356a87c4..a25b7d1706 100644
--- a/Source/SIMPLib/DataContainers/IDataStructureNode.h
+++ b/Source/SIMPLib/DataContainers/IDataStructureNode.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.cpp b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
index 2476fae455..f60b5e3153 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.cpp
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/RenameDataPath.h b/Source/SIMPLib/DataContainers/RenameDataPath.h
index a87cb8e94d..6a31f60b50 100644
--- a/Source/SIMPLib/DataContainers/RenameDataPath.h
+++ b/Source/SIMPLib/DataContainers/RenameDataPath.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/DataContainers/SourceList.cmake b/Source/SIMPLib/DataContainers/SourceList.cmake
index 8275df4b7f..695709073a 100755
--- a/Source/SIMPLib/DataContainers/SourceList.cmake
+++ b/Source/SIMPLib/DataContainers/SourceList.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
index eda143e4bb..ec91981bc3 100644
--- a/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
+++ b/Source/SIMPLib/DataContainers/Testing/Cxx/DataContainerBundleTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
index 7346aa7d83..dd2f451494 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
index 5962de7d18..035edaef6d 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
index 22e3f7a364..4a39f0b373 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
index e5478c9a22..aca57df93c 100644
--- a/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractFilterParametersWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
index e42b62c09f..ed1252f0a5 100644
--- a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
index b41669c7e4..2a88cc4ce0 100644
--- a/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AbstractIOFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
index 29244dfe14..6426b9edea 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
index 9830d10379..98472bf378 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixCreationFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
index aaa716240b..34628b9b19 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
index e1aa860e9f..8cd1e02120 100644
--- a/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AttributeMatrixSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
index 00b0a9dad3..5630f29f86 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
index d5676b8003..56bd712986 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/AxisAngleFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp b/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
index d76aec43eb..f9a69e98ea 100644
--- a/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
+++ b/Source/SIMPLib/FilterParameters/AxisAngleInput.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "AxisAngleInput.h"
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
index ea36d58973..7daa5dd5b0 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
index 1f709827ea..d03e523b74 100644
--- a/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/BooleanFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
index 36841c6941..0f73f204cb 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
index 703449c0c9..07b3ad502f 100644
--- a/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/CalculatorFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
index 70ca42b63e..9027132878 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
index dcfe0ce471..dc8f0b22f5 100644
--- a/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ChoiceFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
index b9a7b8794d..dd5a44f0ac 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
index 0c9be8da23..6a5488e34e 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionAdvancedFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
index 7397d8f872..da5426ae58 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
index daa9792dad..c3a4325ce8 100644
--- a/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ComparisonSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
index dc7e7274c1..1f35ea4b9f 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
index 3a6d46ab56..0b3cb683f8 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedDoubleFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
index d36738ee90..a5faee86fc 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
index 0c8c652bf4..66d572f93a 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
index 1ad227fafd..569f595328 100644
--- a/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ConstrainedIntFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
index d4e5ac8c8a..74a3ef29cc 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
index d54e227553..746ad6da1d 100644
--- a/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArrayCreationFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
index 10bccb7b3b..4089565413 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
index d9bf71d976..24dcd8d8b1 100644
--- a/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataArraySelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
index 981da4d7de..5d023a823d 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
index dfc3dab843..21a979ba87 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerArrayProxyFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
index 277c75869f..1a9775c2be 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
index 86b3b0b4ce..60006b6737 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerCreationFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
index 2be00df10a..a5b5621fa1 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
index c428eff104..e8ab37e4c6 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerGridSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -94,7 +94,6 @@ class SIMPLib_EXPORT DataContainerGridSelectionFilterParameter : public FilterPa
   using SetterCallbackType = std::function<void(DataContainerGrid)>;
   using GetterCallbackType = std::function<DataContainerGrid(void)>;
 
-
   /**
    * @brief New This function instantiates an instance of the DataContainerGridSelectionFilterParameter.  Specifying a RequirementType will
    * automatically grey out Data Containers/Attribute Matrices in the user interface that do not conform to the specified RequirementType.
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
index a294617e01..de213b43c2 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
index 639974cdfb..fe6bbe86b4 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerReaderFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
index d8f3b384fd..4891c1b82a 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
index 4899f2feea..84509b40a5 100644
--- a/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DataContainerSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
index 783e6701e3..0d04e707bd 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
index 7fea951e9b..31207dc36d 100644
--- a/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DoubleFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
index 665766a6f9..ef4e0ba3d1 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
index a8286a19f8..c7665d509b 100644
--- a/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicChoiceFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
index 1a16492b64..e3ce862da3 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableData.h b/Source/SIMPLib/FilterParameters/DynamicTableData.h
index d85ef56491..56539d68c8 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableData.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableData.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
index 320b761ce5..b4c8d81bf4 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
index 4d77c48dd0..265c1f93a1 100644
--- a/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/DynamicTableFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
index fa1b96807f..8ae1a6298e 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
index 79f919ab38..34e10b2c71 100644
--- a/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FileListInfoFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
index 2cc8a2f083..ae612316bd 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FilterParameter.h b/Source/SIMPLib/FilterParameters/FilterParameter.h
index edd11fa7d5..53a91b57e3 100644
--- a/Source/SIMPLib/FilterParameters/FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
index 5e7ba6c0b9..a43cf080a9 100644
--- a/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
+++ b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #include "Float2ndOrderPolynomial.h"
diff --git a/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
index 767d005f97..1f56d2155e 100644
--- a/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
+++ b/Source/SIMPLib/FilterParameters/Float2ndOrderPolynomial.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 #pragma once
diff --git a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
index b3254f589f..b33409eeed 100644
--- a/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
index 0ab9fa7b63..9a3c9e703b 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
index f21c2e1c4b..6b406e5d6e 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec2FilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
index 96f9a8c11d..7f042b68d0 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
index 8935335e77..b17eb1380b 100644
--- a/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FloatVec3FilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
index a5127b05a9..1319a4afde 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
index 12db00eded..8a13f66890 100644
--- a/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/FourthOrderPolynomialFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
index 850eba533f..f5a25c7182 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
index 94f547e3ba..ce2062d959 100644
--- a/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/GenerateColorTableFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h b/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
index 1f8e9c8733..8a39ffe710 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersConstants.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
index 785f9fb43a..1248939e99 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
index 3a6aba533f..249f63ac71 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
index 7182153d96..ad80a7c811 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
index b679572490..aea1f5893a 100644
--- a/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/H5FilterParametersWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
index faf62359b6..0ce0643d78 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
index df0d564e29..91e2515b6a 100644
--- a/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputFileFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
index f3e99f0362..8d603d34af 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
index 6431573b4b..2c50423ff7 100644
--- a/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/InputPathFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
index ef9e841916..99f86851d1 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/IntFilterParameter.h b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
index 4cf22a7eaa..90debd54c9 100644
--- a/Source/SIMPLib/FilterParameters/IntFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
index bebba314da..2c62bffe95 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
index cdd81602b1..e7bb386b79 100644
--- a/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec2FilterParameter.h
@@ -26,15 +26,15 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
index f621dfc2f7..acee821e5d 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
index 64fa0911d1..af450dfa48 100644
--- a/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/IntVec3FilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -35,8 +35,8 @@
 
 #pragma once
 
-#include <memory>
 #include <functional>
+#include <memory>
 
 #include <QtCore/QJsonObject>
 
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
index 58cf67fe5d..dc2bfcf6f7 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
index b2a8bd7a28..38ca4a43c8 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
index 396e2a9825..88876b6be0 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
index f76cb6b967..11534bbd7a 100644
--- a/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
+++ b/Source/SIMPLib/FilterParameters/JsonFilterParametersWriter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
index 5c0035af8b..af66ffa7b7 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
index 0f506de3b5..a1e7ae62e8 100644
--- a/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedBooleanFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
index 44dacfa4ba..d25216c293 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
index 529a38cc23..c7c404175d 100644
--- a/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedChoicesFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
index 726214e91b..09ed7863a1 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
index f29f02c958..bc104705ee 100644
--- a/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedDataContainerSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
index 736d266ea0..dda3596239 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
index 18a3a40350..8075ea7384 100644
--- a/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/LinkedPathCreationFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
index 2ca946577e..d0c4944b6b 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *    United States Prime Contract Navy N00173-07-C-2068
  *
diff --git a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
index 3ff1bc70d8..c1b2db6d7c 100644
--- a/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *    United States Prime Contract Navy N00173-07-C-2068
  *
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
index ec692f901d..ee80afa65a 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
index 737ba26d2a..7ecd9eb3ed 100644
--- a/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MontageStructureSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
index cba608f592..dc140ea6f2 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
index 5a013b083d..b4952424e2 100644
--- a/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiAttributeMatrixSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
index e0cf1bcfa9..beca4681a3 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
index 9c6bfcaf9d..fadd27bb58 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataArraySelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
index 754ac062d4..6a4cf5ed56 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
index 684615202d..4bbfbd9f60 100644
--- a/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiDataContainerSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
index 8bcb38abb7..ccf55315fb 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
index 4521825900..e0e9bc05db 100644
--- a/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/MultiInputFileFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
index dd1283aa00..2682d1dc11 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
index 67dc663e60..246cda03c9 100644
--- a/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/NumericTypeFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
index 8daea2311c..7af5244869 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
index bd6ce7938f..7d878be4ac 100644
--- a/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputFileFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
index e4a1c8fcf8..56aa16c6b5 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
index 853a6d8674..6c14d6131f 100644
--- a/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/OutputPathFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
index f73fc382c5..f6bb644861 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
index 0082fca0f4..62e1e4d9c3 100644
--- a/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PhaseTypeSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
index 0d8e14f189..d8b641065e 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
index 26fbc3cb9f..ba0a20359e 100644
--- a/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/PreflightUpdatedValueFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
index 7db8126150..24b34a2c41 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
index 2f1278c1f2..b87ab03de8 100644
--- a/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/RangeFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index 612958dcef..6a14321ac0 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index 7d573917d2..bf8753c1db 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
index f1db805396..f4780e4c6e 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
index 96ce7923a0..3d9ab7b457 100644
--- a/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ScalarTypeFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
index 6144426d7b..22a94fbc57 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
index 96bb044cb0..01a9bf5d55 100644
--- a/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SecondOrderPolynomialFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
index fab2ef16a2..77fa6ce2ae 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
index 0bba1beb1f..deb24a6d64 100644
--- a/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/SeparatorFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
index 6787de3b3c..04f6c16c2f 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
index 54ee0ce44a..8cb8dd605b 100644
--- a/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ShapeTypeSelectionFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
index 805ee8dce0..bc38040084 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/StringFilterParameter.h b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
index 192aff94c7..f1d55461f0 100644
--- a/Source/SIMPLib/FilterParameters/StringFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/StringFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
index dfc83bb914..d0f229c7dd 100644
--- a/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
+++ b/Source/SIMPLib/FilterParameters/Testing/Cxx/FilterParametersRWTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
index bcc3673fa3..2016f1829c 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
index 3394feefa8..8377834042 100644
--- a/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ThirdOrderPolynomialFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
index 3e0bd795f3..4a7eece35e 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
index 8be61c3669..e45d9d4718 100644
--- a/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UInt64FilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
index ec097beb07..48f137a7cf 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
index 91c6942f46..c0f1a64988 100644
--- a/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/UnknownFilterParameter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.cpp b/Source/SIMPLib/Filtering/AbstractComparison.cpp
index 57957fffc0..d9a0a13a7e 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.cpp
+++ b/Source/SIMPLib/Filtering/AbstractComparison.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractComparison.h b/Source/SIMPLib/Filtering/AbstractComparison.h
index fc82935ec7..1018483065 100644
--- a/Source/SIMPLib/Filtering/AbstractComparison.h
+++ b/Source/SIMPLib/Filtering/AbstractComparison.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
index eca65ffdb2..50b564b80e 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
index 8f9bc3578a..ac49226528 100644
--- a/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractDecisionFilter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.cpp b/Source/SIMPLib/Filtering/AbstractFilter.cpp
index 2691bbfe0f..9b7029c4f9 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.cpp
+++ b/Source/SIMPLib/Filtering/AbstractFilter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/AbstractFilter.h b/Source/SIMPLib/Filtering/AbstractFilter.h
index 20f70ebebd..287be06c80 100644
--- a/Source/SIMPLib/Filtering/AbstractFilter.h
+++ b/Source/SIMPLib/Filtering/AbstractFilter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.cpp b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
index e356658788..ceb7ac8b84 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonInputs.h b/Source/SIMPLib/Filtering/ComparisonInputs.h
index d5016be9e8..e60262d180 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputs.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputs.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
index 731d7830f7..ff8029ce48 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
index da8260758e..53704ae9fc 100644
--- a/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
+++ b/Source/SIMPLib/Filtering/ComparisonInputsAdvanced.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.cpp b/Source/SIMPLib/Filtering/ComparisonSet.cpp
index 375390e919..7b36a64c1a 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonSet.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonSet.h b/Source/SIMPLib/Filtering/ComparisonSet.h
index 7d204862e8..31901496ff 100644
--- a/Source/SIMPLib/Filtering/ComparisonSet.h
+++ b/Source/SIMPLib/Filtering/ComparisonSet.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.cpp b/Source/SIMPLib/Filtering/ComparisonValue.cpp
index 33b38ef207..089c6b6e2f 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.cpp
+++ b/Source/SIMPLib/Filtering/ComparisonValue.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ComparisonValue.h b/Source/SIMPLib/Filtering/ComparisonValue.h
index 1eaa8eb67b..6fd502fd6d 100644
--- a/Source/SIMPLib/Filtering/ComparisonValue.h
+++ b/Source/SIMPLib/Filtering/ComparisonValue.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/FilterFactory.hpp b/Source/SIMPLib/Filtering/FilterFactory.hpp
index 4a6da96373..143d67b4d4 100644
--- a/Source/SIMPLib/Filtering/FilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/FilterFactory.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/FilterManager.cpp b/Source/SIMPLib/Filtering/FilterManager.cpp
index b9c161d688..3ead63dccf 100644
--- a/Source/SIMPLib/Filtering/FilterManager.cpp
+++ b/Source/SIMPLib/Filtering/FilterManager.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/FilterManager.h b/Source/SIMPLib/Filtering/FilterManager.h
index 1befa60efa..f3e0a75e44 100644
--- a/Source/SIMPLib/Filtering/FilterManager.h
+++ b/Source/SIMPLib/Filtering/FilterManager.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.cpp b/Source/SIMPLib/Filtering/FilterPipeline.cpp
index bf119e312b..16e7f12d66 100644
--- a/Source/SIMPLib/Filtering/FilterPipeline.cpp
+++ b/Source/SIMPLib/Filtering/FilterPipeline.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/FilterPipeline.h b/Source/SIMPLib/Filtering/FilterPipeline.h
index a8d1171ffc..b2c88c7fb4 100755
--- a/Source/SIMPLib/Filtering/FilterPipeline.h
+++ b/Source/SIMPLib/Filtering/FilterPipeline.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/IFilterFactory.hpp b/Source/SIMPLib/Filtering/IFilterFactory.hpp
index 39aa174f22..91cd505923 100644
--- a/Source/SIMPLib/Filtering/IFilterFactory.hpp
+++ b/Source/SIMPLib/Filtering/IFilterFactory.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
index 8614d0c589..bbc86ac82b 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
index 8629205f0a..e377224e2e 100644
--- a/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
+++ b/Source/SIMPLib/Filtering/QMetaObjectUtilities.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
index c68e6714b4..9c97e1b66c 100644
--- a/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
+++ b/Source/SIMPLib/Filtering/Testing/Cxx/FilterPipelineTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
index 445ee0ed5e..6bbdd542e2 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
index 488cfedf85..d17fa03463 100644
--- a/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
+++ b/Source/SIMPLib/Filtering/ThresholdFilterHelper.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
index fc40a65c0b..382c988679 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/CompositeTransformContainer.h b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
index 981821c527..fb7acce27a 100644
--- a/Source/SIMPLib/Geometry/CompositeTransformContainer.h
+++ b/Source/SIMPLib/Geometry/CompositeTransformContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
index 51d28944b7..c58fd1458a 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/DerivativeHelpers.h b/Source/SIMPLib/Geometry/DerivativeHelpers.h
index c26c72b383..c7fdc6d4ef 100644
--- a/Source/SIMPLib/Geometry/DerivativeHelpers.h
+++ b/Source/SIMPLib/Geometry/DerivativeHelpers.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.cpp b/Source/SIMPLib/Geometry/EdgeGeom.cpp
index 68d8e5f886..66576bc9d6 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.cpp
+++ b/Source/SIMPLib/Geometry/EdgeGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/EdgeGeom.h b/Source/SIMPLib/Geometry/EdgeGeom.h
index 5449036299..975b6404e9 100644
--- a/Source/SIMPLib/Geometry/EdgeGeom.h
+++ b/Source/SIMPLib/Geometry/EdgeGeom.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry.cpp b/Source/SIMPLib/Geometry/IGeometry.cpp
index 66b79eba70..66b53dd384 100644
--- a/Source/SIMPLib/Geometry/IGeometry.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry.h b/Source/SIMPLib/Geometry/IGeometry.h
index 6948e5d8e7..9cddac4704 100644
--- a/Source/SIMPLib/Geometry/IGeometry.h
+++ b/Source/SIMPLib/Geometry/IGeometry.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.cpp b/Source/SIMPLib/Geometry/IGeometry2D.cpp
index aaccbbc771..aafb9afffd 100644
--- a/Source/SIMPLib/Geometry/IGeometry2D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry2D.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry2D.h b/Source/SIMPLib/Geometry/IGeometry2D.h
index fe0ceca270..da96a43e76 100644
--- a/Source/SIMPLib/Geometry/IGeometry2D.h
+++ b/Source/SIMPLib/Geometry/IGeometry2D.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.cpp b/Source/SIMPLib/Geometry/IGeometry3D.cpp
index 7839942e4e..e65a077c8c 100644
--- a/Source/SIMPLib/Geometry/IGeometry3D.cpp
+++ b/Source/SIMPLib/Geometry/IGeometry3D.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometry3D.h b/Source/SIMPLib/Geometry/IGeometry3D.h
index ae743cd397..cd7996b91f 100644
--- a/Source/SIMPLib/Geometry/IGeometry3D.h
+++ b/Source/SIMPLib/Geometry/IGeometry3D.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.cpp b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
index 115c5150b5..749c791a87 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.cpp
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/IGeometryGrid.h b/Source/SIMPLib/Geometry/IGeometryGrid.h
index 7dd34768cd..3a962da49a 100644
--- a/Source/SIMPLib/Geometry/IGeometryGrid.h
+++ b/Source/SIMPLib/Geometry/IGeometryGrid.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.cpp b/Source/SIMPLib/Geometry/ITransformContainer.cpp
index 0e5c0b1f96..f6b73cc071 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/ITransformContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/ITransformContainer.h b/Source/SIMPLib/Geometry/ITransformContainer.h
index d5e876767f..46551a3928 100644
--- a/Source/SIMPLib/Geometry/ITransformContainer.h
+++ b/Source/SIMPLib/Geometry/ITransformContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/ImageGeom.cpp b/Source/SIMPLib/Geometry/ImageGeom.cpp
index 6e41cd35f6..706d37da4c 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.cpp
+++ b/Source/SIMPLib/Geometry/ImageGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ImageGeom.h b/Source/SIMPLib/Geometry/ImageGeom.h
index 315749adcb..02d39fb983 100644
--- a/Source/SIMPLib/Geometry/ImageGeom.h
+++ b/Source/SIMPLib/Geometry/ImageGeom.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/QuadGeom.cpp b/Source/SIMPLib/Geometry/QuadGeom.cpp
index e08d3b63e2..0a9fb544dd 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.cpp
+++ b/Source/SIMPLib/Geometry/QuadGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/QuadGeom.h b/Source/SIMPLib/Geometry/QuadGeom.h
index 916e864b08..cbae8ede70 100644
--- a/Source/SIMPLib/Geometry/QuadGeom.h
+++ b/Source/SIMPLib/Geometry/QuadGeom.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.cpp b/Source/SIMPLib/Geometry/RectGridGeom.cpp
index 31be001f15..dbd5dc8723 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.cpp
+++ b/Source/SIMPLib/Geometry/RectGridGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/RectGridGeom.h b/Source/SIMPLib/Geometry/RectGridGeom.h
index 98a5a1830b..2b4e5d54b2 100644
--- a/Source/SIMPLib/Geometry/RectGridGeom.h
+++ b/Source/SIMPLib/Geometry/RectGridGeom.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
index 78e2462fd6..22bcc99f6d 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
index 2b744d0bc0..b7a6327fe6 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CubeOctohedronOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
index 6bf45b58c0..7c16375a45 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
index 7176234d06..f84cc78ea9 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderAOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
index 7a19c353d6..eeadd56be0 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
index d1cf1186fc..653ccdd3a2 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderBOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
index 687ded5a51..1361af231e 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
index 5ce11608d8..ab2ee35980 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/CylinderCOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
index 8840dc0436..20daf63c09 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
index fb3e174309..97e7c2f486 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/EllipsoidOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
index 1b1e01b0ea..f596954fe2 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
index f4c890aa2b..7971c0ad23 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/ShapeOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
index 49b8dd423a..30c41fe871 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
index 11622b2236..a65ff6e51c 100644
--- a/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
+++ b/Source/SIMPLib/Geometry/ShapeOps/SuperEllipsoidOps.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
index ea21af75ab..015968d94f 100644
--- a/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedEdgeOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/SharedQuadOps.cpp b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
index cd71cbdb42..dcfbd7d4ab 100644
--- a/Source/SIMPLib/Geometry/SharedQuadOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedQuadOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/SharedTetOps.cpp b/Source/SIMPLib/Geometry/SharedTetOps.cpp
index 9ede869530..90bc948b7d 100644
--- a/Source/SIMPLib/Geometry/SharedTetOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTetOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/SharedTriOps.cpp b/Source/SIMPLib/Geometry/SharedTriOps.cpp
index b60acb6589..c9977055a6 100644
--- a/Source/SIMPLib/Geometry/SharedTriOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedTriOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/SharedVertexOps.cpp b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
index 15057eff8c..40fc1e27e1 100644
--- a/Source/SIMPLib/Geometry/SharedVertexOps.cpp
+++ b/Source/SIMPLib/Geometry/SharedVertexOps.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
index e2bb2b184c..7bc0670e36 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/TetrahedralGeom.h b/Source/SIMPLib/Geometry/TetrahedralGeom.h
index 205b296682..e4a2296110 100644
--- a/Source/SIMPLib/Geometry/TetrahedralGeom.h
+++ b/Source/SIMPLib/Geometry/TetrahedralGeom.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/TransformContainer.cpp b/Source/SIMPLib/Geometry/TransformContainer.cpp
index 45047fe820..9befe01353 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.cpp
+++ b/Source/SIMPLib/Geometry/TransformContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/TransformContainer.h b/Source/SIMPLib/Geometry/TransformContainer.h
index af8e233760..fff1ca2aac 100644
--- a/Source/SIMPLib/Geometry/TransformContainer.h
+++ b/Source/SIMPLib/Geometry/TransformContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.cpp b/Source/SIMPLib/Geometry/TriangleGeom.cpp
index 63919ea6ef..24d51a1580 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.cpp
+++ b/Source/SIMPLib/Geometry/TriangleGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/TriangleGeom.h b/Source/SIMPLib/Geometry/TriangleGeom.h
index 5225eb7aff..d7d777b066 100644
--- a/Source/SIMPLib/Geometry/TriangleGeom.h
+++ b/Source/SIMPLib/Geometry/TriangleGeom.h
@@ -25,7 +25,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/VertexGeom.cpp b/Source/SIMPLib/Geometry/VertexGeom.cpp
index 07266725db..40f3e2daad 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.cpp
+++ b/Source/SIMPLib/Geometry/VertexGeom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Geometry/VertexGeom.h b/Source/SIMPLib/Geometry/VertexGeom.h
index cd426c3d46..b71bca750f 100644
--- a/Source/SIMPLib/Geometry/VertexGeom.h
+++ b/Source/SIMPLib/Geometry/VertexGeom.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
index 034724172b..424f922324 100644
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
index eb955747f4..9c9f18ba26 100644
--- a/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5BoundaryStatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
index 4f2a9598de..3652b1a7e2 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5DataArrayReader.h b/Source/SIMPLib/HDF5/H5DataArrayReader.h
index e1b33cd449..1fd6be8543 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayReader.h
+++ b/Source/SIMPLib/HDF5/H5DataArrayReader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
index ac6f0fd814..09d6e16f5d 100644
--- a/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
+++ b/Source/SIMPLib/HDF5/H5DataArrayWriter.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5Macros.h b/Source/SIMPLib/HDF5/H5Macros.h
index 407e00b1ee..1f53426363 100644
--- a/Source/SIMPLib/HDF5/H5Macros.h
+++ b/Source/SIMPLib/HDF5/H5Macros.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
index 40c2ed0b28..72ead00dc0 100644
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
index 3d9c1b1e50..a5fa5492a4 100644
--- a/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5MatrixStatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
index 66fc7a312e..9761d10f3a 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
index 05de4f3429..490b643a93 100644
--- a/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrecipitateStatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
index 5f339ba093..ea5e77fca0 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
index 5cd5591bc9..72dbd0af33 100644
--- a/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5PrimaryStatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
index 201e83367a..76f8655032 100644
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
index de59a5fc8c..f1342ccff5 100644
--- a/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5StatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
index 533518c38f..7b119d275b 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
index 98268a92a9..2b3b98b525 100644
--- a/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
+++ b/Source/SIMPLib/HDF5/H5TransformationStatsDataDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
index 29541baaa9..a264f36ad3 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DITransformContainerToTransformTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
index 614b259ce5..4fe8368c65 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerTestHelper.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
index ddea6134f5..926ef368e4 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkDream3DTransformContainerToTransformTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
index 91c0204942..48241b640c 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DITransformContainerTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
index 178ac810c4..67dfd8fac6 100644
--- a/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
+++ b/Source/SIMPLib/ITK/Testing/Cxx/itkTransformToDream3DTransformContainerTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
index 652fc1e545..e39ebc46e5 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
index 191ddb8a4a..46da48b5f5 100644
--- a/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DITransformContainerToTransform.hxx
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -45,8 +45,7 @@ namespace itk
 {
 
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::Dream3DITransformContainerToTransform()
+Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::Dream3DITransformContainerToTransform()
 {
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
@@ -56,15 +55,11 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   m_ITransformContainer = ::ITransformContainer::NullPointer();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::~Dream3DITransformContainerToTransform() = default;
+Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::~Dream3DITransformContainerToTransform() = default;
 
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::SetInput(const ITransformContainer::Pointer & transformContainer)
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::SetInput(const ITransformContainer::Pointer& transformContainer)
 {
   if(transformContainer != m_ITransformContainer)
   {
@@ -73,21 +68,15 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   }
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-ProcessObject::DataObjectPointer
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+ProcessObject::DataObjectPointer Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   typename DecoratorType::Pointer output = DecoratorType::New();
   return output.GetPointer();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::VerifyPreconditions() ITKv5_CONST
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_ITransformContainer)
   {
@@ -96,11 +85,8 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   Superclass::VerifyPreconditions();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::CreateTransform(ITKTransformPointer& ptr, const std::string& ClassName)
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::CreateTransform(ITKTransformPointer& ptr, const std::string& ClassName)
 {
   // The logic of this function is shamelessly copied from itkTransformIOBase.hxx in ITK.
 
@@ -131,11 +117,8 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   ptr->UnRegister();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::TransformGenerateData(ITKTransformPointer& itktransform, ::TransformContainer* transformContainer)
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::TransformGenerateData(ITKTransformPointer& itktransform, ::TransformContainer* transformContainer)
 {
   CreateTransform(itktransform, transformContainer->getTransformTypeAsString().c_str());
   auto dream3DParameters = transformContainer->getParameters();
@@ -172,11 +155,8 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   itktransform->SetFixedParameters(itkFixedParameters);
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::GenerateData(ITKTransformPointer& itktransform, const ITransformContainer::Pointer& mTransformContainer)
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::GenerateData(ITKTransformPointer& itktransform, const ITransformContainer::Pointer& mTransformContainer)
 {
   ::TransformContainer* transformContainer = dynamic_cast<::TransformContainer*>(mTransformContainer.get());
   if(transformContainer)
@@ -219,11 +199,8 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   }
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::GenerateData()
+void Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::GenerateData()
 {
   auto* outputPtr = this->GetOutput();
   ITKTransformPointer itktransform;
@@ -231,13 +208,11 @@ Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions
   outputPtr->Set(itktransform);
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
 typename Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::DecoratorType*
-Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>
-::GetOutput()
+Dream3DITransformContainerToTransform<TParametersValueType, CompositeNDimensions>::GetOutput()
 {
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
+} // namespace itk
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
index 94ff88775a..80fa3ccb41 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
index 69f8e0185e..d188043fd3 100644
--- a/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
+++ b/Source/SIMPLib/ITK/itkDream3DTransformContainerToTransform.hxx
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -40,8 +40,7 @@ namespace itk
 {
 
 template <typename ITKTransformType>
-Dream3DTransformContainerToTransform<ITKTransformType>
-::Dream3DTransformContainerToTransform()
+Dream3DTransformContainerToTransform<ITKTransformType>::Dream3DTransformContainerToTransform()
 {
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
@@ -51,15 +50,11 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   m_TransformContainer = ::TransformContainer::NullPointer();
 }
 
-
 template <typename ITKTransformType>
-Dream3DTransformContainerToTransform<ITKTransformType>
-::~Dream3DTransformContainerToTransform() = default;
+Dream3DTransformContainerToTransform<ITKTransformType>::~Dream3DTransformContainerToTransform() = default;
 
 template <typename ITKTransformType>
-void
-Dream3DTransformContainerToTransform<ITKTransformType>
-::SetInput(::TransformContainer::Pointer transformContainer)
+void Dream3DTransformContainerToTransform<ITKTransformType>::SetInput(::TransformContainer::Pointer transformContainer)
 {
   if(transformContainer != m_TransformContainer)
   {
@@ -68,11 +63,8 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   }
 }
 
-
 template <typename ITKTransformType>
-ProcessObject::DataObjectPointer
-Dream3DTransformContainerToTransform<ITKTransformType>
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+ProcessObject::DataObjectPointer Dream3DTransformContainerToTransform<ITKTransformType>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   typename DecoratorType::Pointer output = DecoratorType::New();
   typename ITKTransformType::Pointer transform = ITKTransformType::New();
@@ -80,11 +72,8 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   return output.GetPointer();
 }
 
-
 template <typename ITKTransformType>
-void
-Dream3DTransformContainerToTransform<ITKTransformType>
-::VerifyPreconditions() ITKv5_CONST
+void Dream3DTransformContainerToTransform<ITKTransformType>::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_TransformContainer)
   {
@@ -94,7 +83,7 @@ Dream3DTransformContainerToTransform<ITKTransformType>
 #if defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 5
   typename ITKTransformType::ConstPointer transform = outputPtr->Get();
 #elif defined(ITK_VERSION_MAJOR) && ITK_VERSION_MAJOR == 4
- typename ITKTransformType::Pointer transform = outputPtr->Get();
+  typename ITKTransformType::Pointer transform = outputPtr->Get();
 #endif
 
   // Verifies that the number of Parameters and Fixed Parameters in the transform
@@ -115,11 +104,8 @@ Dream3DTransformContainerToTransform<ITKTransformType>
   Superclass::VerifyPreconditions();
 }
 
-
 template <typename ITKTransformType>
-void
-Dream3DTransformContainerToTransform<ITKTransformType>
-::GenerateData()
+void Dream3DTransformContainerToTransform<ITKTransformType>::GenerateData()
 {
   DecoratorType* outputPtr = this->GetOutput();
   typename ITKTransformType::Pointer transform = outputPtr->Get();
@@ -143,21 +129,15 @@ Dream3DTransformContainerToTransform<ITKTransformType>
 }
 
 template <typename ITKTransformType>
-typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType*
-Dream3DTransformContainerToTransform<ITKTransformType>
-::GetOutput()
+typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType* Dream3DTransformContainerToTransform<ITKTransformType>::GetOutput()
 {
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-
 template <typename ITKTransformType>
-const typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType*
-Dream3DTransformContainerToTransform<ITKTransformType>
-::GetOutput() const
+const typename Dream3DTransformContainerToTransform<ITKTransformType>::DecoratorType* Dream3DTransformContainerToTransform<ITKTransformType>::GetOutput() const
 {
   return itkDynamicCastInDebugMode<const DecoratorType*>(this->GetPrimaryOutput());
 }
 
-
-} // end of itk namespace
+} // namespace itk
diff --git a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
index 2c937e7bac..e9f4939ec0 100644
--- a/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
+++ b/Source/SIMPLib/ITK/itkFijiConfigurationFileReader.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/ITK/itkProgressObserver.hpp b/Source/SIMPLib/ITK/itkProgressObserver.hpp
index 49da1a935b..01235c5abf 100644
--- a/Source/SIMPLib/ITK/itkProgressObserver.hpp
+++ b/Source/SIMPLib/ITK/itkProgressObserver.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
index bf88155441..741bc68538 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
index 172a58f10b..ec15bfb53f 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DITransformContainer.hxx
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -41,8 +41,7 @@ namespace itk
 {
 
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::TransformToDream3DITransformContainer()
+TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::TransformToDream3DITransformContainer()
 {
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
@@ -52,16 +51,11 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
   m_Transform = nullptr;
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::~TransformToDream3DITransformContainer() = default;
-
+TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::~TransformToDream3DITransformContainer() = default;
 
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::SetInput(const ITKTransformType * transform)
+void TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::SetInput(const ITKTransformType* transform)
 {
   if(!(transform == m_Transform.GetPointer()))
   {
@@ -70,21 +64,15 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
   }
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-ProcessObject::DataObjectPointer
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+ProcessObject::DataObjectPointer TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   typename DecoratorType::Pointer output = DecoratorType::New();
   return output.GetPointer();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::VerifyPreconditions() ITKv5_CONST
+void TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_Transform)
   {
@@ -93,11 +81,8 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
   Superclass::VerifyPreconditions();
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::GenerateData(::ITransformContainer::Pointer& iTransformContainer, const ITKTransformType * transform)
+void TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::GenerateData(::ITransformContainer::Pointer& iTransformContainer, const ITKTransformType* transform)
 {
   using CompositeType = itk::CompositeTransform<TParametersValueType, CompositeNDimensions>;
   typename CompositeType::ConstPointer itkCompositeTransform = dynamic_cast<const CompositeType*>(transform);
@@ -137,10 +122,8 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
   }
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
-void
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::GenerateData()
+void TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::GenerateData()
 {
   DecoratorType* outputPtr = this->GetOutput();
   typename ::ITransformContainer::Pointer iTransformContainer;
@@ -148,13 +131,11 @@ TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions
   outputPtr->Set(iTransformContainer);
 }
 
-
 template <typename TParametersValueType, unsigned int CompositeNDimensions>
 typename TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::DecoratorType*
-TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>
-::GetOutput()
+TransformToDream3DITransformContainer<TParametersValueType, CompositeNDimensions>::GetOutput()
 {
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
+} // namespace itk
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
index fcc6603af5..be1519b0e3 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
index 1b3c40f3d8..76aef79147 100644
--- a/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
+++ b/Source/SIMPLib/ITK/itkTransformToDream3DTransformContainer.hxx
@@ -1,35 +1,35 @@
 /* ============================================================================
-* Copyright (c) 2009-2018 BlueQuartz Software, LLC
-*
-* 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
-* 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 COPYRIGHT HOLDER 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.
-*
-* The code contained herein was partially funded by the followig contracts:
-*    United States Air Force Prime Contract FA8650-15-D-5231
-*
-* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+ * Copyright (c) 2009-2018 BlueQuartz Software, LLC
+ *
+ * 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 the name of BlueQuartz Software, the US Air Force, nor the names of its
+ * 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 COPYRIGHT HOLDER 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.
+ *
+ * The code contained herein was partially funded by the following contracts:
+ *    United States Air Force Prime Contract FA8650-15-D-5231
+ *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #pragma once
 
@@ -39,8 +39,7 @@ namespace itk
 {
 
 template <typename ITKTransformType>
-TransformToDream3DTransformContainer<ITKTransformType>
-::TransformToDream3DTransformContainer()
+TransformToDream3DTransformContainer<ITKTransformType>::TransformToDream3DTransformContainer()
 {
   // Create the output. We use static_cast<> here because we know the default
   // output must be of type DecoratorType
@@ -49,16 +48,11 @@ TransformToDream3DTransformContainer<ITKTransformType>
   this->ProcessObject::SetNthOutput(0, output.GetPointer());
 }
 
-
 template <typename ITKTransformType>
-TransformToDream3DTransformContainer<ITKTransformType>
-::~TransformToDream3DTransformContainer() = default;
-
+TransformToDream3DTransformContainer<ITKTransformType>::~TransformToDream3DTransformContainer() = default;
 
 template <typename ITKTransformType>
-void
-TransformToDream3DTransformContainer<ITKTransformType>
-::SetInput(const ITKTransformType * transform)
+void TransformToDream3DTransformContainer<ITKTransformType>::SetInput(const ITKTransformType* transform)
 {
   if(!(transform == m_Transform.GetPointer()))
   {
@@ -67,11 +61,8 @@ TransformToDream3DTransformContainer<ITKTransformType>
   }
 }
 
-
 template <typename ITKTransformType>
-ProcessObject::DataObjectPointer
-TransformToDream3DTransformContainer<ITKTransformType>
-::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
+ProcessObject::DataObjectPointer TransformToDream3DTransformContainer<ITKTransformType>::MakeOutput(ProcessObject::DataObjectPointerArraySizeType)
 {
   typename DecoratorType::Pointer output = DecoratorType::New();
   ::TransformContainer::Pointer transformContainer = ::TransformContainer::New();
@@ -79,11 +70,8 @@ TransformToDream3DTransformContainer<ITKTransformType>
   return output.GetPointer();
 }
 
-
 template <typename ITKTransformType>
-void
-TransformToDream3DTransformContainer<ITKTransformType>
-::VerifyPreconditions() ITKv5_CONST
+void TransformToDream3DTransformContainer<ITKTransformType>::VerifyPreconditions() ITKv5_CONST
 {
   if(!m_Transform)
   {
@@ -92,11 +80,8 @@ TransformToDream3DTransformContainer<ITKTransformType>
   Superclass::VerifyPreconditions();
 }
 
-
 template <typename ITKTransformType>
-void
-TransformToDream3DTransformContainer<ITKTransformType>
-::GenerateData()
+void TransformToDream3DTransformContainer<ITKTransformType>::GenerateData()
 {
   DecoratorType* outputPtr = this->GetOutput();
   typename ::TransformContainer::Pointer transformContainer = outputPtr->Get();
@@ -121,13 +106,10 @@ TransformToDream3DTransformContainer<ITKTransformType>
   transformContainer->setTransformTypeAsString(m_Transform->GetTransformTypeAsString());
 }
 
-
 template <typename ITKTransformType>
-typename TransformToDream3DTransformContainer<ITKTransformType>::DecoratorType*
-TransformToDream3DTransformContainer<ITKTransformType>
-::GetOutput()
+typename TransformToDream3DTransformContainer<ITKTransformType>::DecoratorType* TransformToDream3DTransformContainer<ITKTransformType>::GetOutput()
 {
   return itkDynamicCastInDebugMode<DecoratorType*>(this->GetPrimaryOutput());
 }
 
-} // end of itk namespace
+} // namespace itk
diff --git a/Source/SIMPLib/Math/GeometryMath.cpp b/Source/SIMPLib/Math/GeometryMath.cpp
index 9f1d328412..e8863f949d 100644
--- a/Source/SIMPLib/Math/GeometryMath.cpp
+++ b/Source/SIMPLib/Math/GeometryMath.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/GeometryMath.h b/Source/SIMPLib/Math/GeometryMath.h
index 4ba936278f..6a755761bf 100644
--- a/Source/SIMPLib/Math/GeometryMath.h
+++ b/Source/SIMPLib/Math/GeometryMath.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/MatrixMath.cpp b/Source/SIMPLib/Math/MatrixMath.cpp
index e272c65ea1..878469f69c 100644
--- a/Source/SIMPLib/Math/MatrixMath.cpp
+++ b/Source/SIMPLib/Math/MatrixMath.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/MatrixMath.h b/Source/SIMPLib/Math/MatrixMath.h
index 37ce356423..ec77e2cd73 100755
--- a/Source/SIMPLib/Math/MatrixMath.h
+++ b/Source/SIMPLib/Math/MatrixMath.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.cpp b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
index bbbef4fdce..0b50346a4e 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.cpp
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/RadialDistributionFunction.h b/Source/SIMPLib/Math/RadialDistributionFunction.h
index ce80cde6ca..1444714473 100644
--- a/Source/SIMPLib/Math/RadialDistributionFunction.h
+++ b/Source/SIMPLib/Math/RadialDistributionFunction.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/RdfData.cpp b/Source/SIMPLib/Math/RdfData.cpp
index 7d6a8e331b..cf9aea0aac 100644
--- a/Source/SIMPLib/Math/RdfData.cpp
+++ b/Source/SIMPLib/Math/RdfData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/RdfData.h b/Source/SIMPLib/Math/RdfData.h
index 18fd03d1d6..17ce805264 100644
--- a/Source/SIMPLib/Math/RdfData.h
+++ b/Source/SIMPLib/Math/RdfData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/SIMPLibMath.cpp b/Source/SIMPLib/Math/SIMPLibMath.cpp
index a0c501ad80..c23b5cb57a 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.cpp
+++ b/Source/SIMPLib/Math/SIMPLibMath.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/SIMPLibMath.h b/Source/SIMPLib/Math/SIMPLibMath.h
index 851dcf43c0..050fcfc412 100644
--- a/Source/SIMPLib/Math/SIMPLibMath.h
+++ b/Source/SIMPLib/Math/SIMPLibMath.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.cpp b/Source/SIMPLib/Math/SIMPLibRandom.cpp
index 9699f20608..fb92713510 100644
--- a/Source/SIMPLib/Math/SIMPLibRandom.cpp
+++ b/Source/SIMPLib/Math/SIMPLibRandom.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/SIMPLibRandom.h b/Source/SIMPLib/Math/SIMPLibRandom.h
index 8a781d6696..8b18fccac3 100644
--- a/Source/SIMPLib/Math/SIMPLibRandom.h
+++ b/Source/SIMPLib/Math/SIMPLibRandom.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
index 3b9967e352..37198d8b38 100644
--- a/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
+++ b/Source/SIMPLib/Math/Testing/Cxx/QuaternionMathTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.cpp b/Source/SIMPLib/Montages/DataContainerGrid.cpp
index f06e07080c..c58bdbe99d 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.cpp
+++ b/Source/SIMPLib/Montages/DataContainerGrid.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/Montages/DataContainerGrid.h b/Source/SIMPLib/Montages/DataContainerGrid.h
index d0c2f0ea78..7d2369463c 100644
--- a/Source/SIMPLib/Montages/DataContainerGrid.h
+++ b/Source/SIMPLib/Montages/DataContainerGrid.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SIMPLib/Montages/SourceList.cmake b/Source/SIMPLib/Montages/SourceList.cmake
index 819fecfed9..14e4421b9c 100644
--- a/Source/SIMPLib/Montages/SourceList.cmake
+++ b/Source/SIMPLib/Montages/SourceList.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
index b93f033ee4..e462341587 100644
--- a/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/ISIMPLibPlugin.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/PluginManager.cpp b/Source/SIMPLib/Plugin/PluginManager.cpp
index b15ed2a5ba..d60c9efee9 100644
--- a/Source/SIMPLib/Plugin/PluginManager.cpp
+++ b/Source/SIMPLib/Plugin/PluginManager.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/PluginManager.h b/Source/SIMPLib/Plugin/PluginManager.h
index e215987180..f3e6ef8577 100644
--- a/Source/SIMPLib/Plugin/PluginManager.h
+++ b/Source/SIMPLib/Plugin/PluginManager.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/PluginProxy.cpp b/Source/SIMPLib/Plugin/PluginProxy.cpp
index 81e5c5f91e..da7255a551 100644
--- a/Source/SIMPLib/Plugin/PluginProxy.cpp
+++ b/Source/SIMPLib/Plugin/PluginProxy.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/PluginProxy.h b/Source/SIMPLib/Plugin/PluginProxy.h
index 8c389f0715..50c4cbf9f6 100644
--- a/Source/SIMPLib/Plugin/PluginProxy.h
+++ b/Source/SIMPLib/Plugin/PluginProxy.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/SIMPLibPlugin.cpp b/Source/SIMPLib/Plugin/SIMPLibPlugin.cpp
index 23c0adc6a0..656cf7c2ff 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPlugin.cpp
+++ b/Source/SIMPLib/Plugin/SIMPLibPlugin.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/SIMPLibPlugin.h b/Source/SIMPLib/Plugin/SIMPLibPlugin.h
index 1cee63569c..8b4a739a5f 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPlugin.h
+++ b/Source/SIMPLib/Plugin/SIMPLibPlugin.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
index cef4baa518..dbd0747130 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
index 72008bb0fb..f4b91f63b1 100644
--- a/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
+++ b/Source/SIMPLib/Plugin/SIMPLibPluginLoader.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Plugin/SourceList.cmake b/Source/SIMPLib/Plugin/SourceList.cmake
index 78c1292353..dbcd28aca2 100755
--- a/Source/SIMPLib/Plugin/SourceList.cmake
+++ b/Source/SIMPLib/Plugin/SourceList.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
index 559256832f..0e1061460a 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/REST/SIMPLDirectoryListing.h b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
index c97593ee45..eec88a72b2 100644
--- a/Source/SIMPLib/REST/SIMPLDirectoryListing.h
+++ b/Source/SIMPLib/REST/SIMPLDirectoryListing.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
index 6089d0d58a..e3a2e5e6e1 100644
--- a/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
+++ b/Source/SIMPLib/REST/Testing/Cxx/RESTUnitTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
index d800eb40b0..f1247332bf 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/BoundaryStatsData.h b/Source/SIMPLib/StatsData/BoundaryStatsData.h
index a2450c5047..0d0b2ab48c 100644
--- a/Source/SIMPLib/StatsData/BoundaryStatsData.h
+++ b/Source/SIMPLib/StatsData/BoundaryStatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.cpp b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
index bea2b4554b..4eea1c8c26 100644
--- a/Source/SIMPLib/StatsData/MatrixStatsData.cpp
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/MatrixStatsData.h b/Source/SIMPLib/StatsData/MatrixStatsData.h
index 81c515f163..2f73bdabcc 100644
--- a/Source/SIMPLib/StatsData/MatrixStatsData.h
+++ b/Source/SIMPLib/StatsData/MatrixStatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
index ee41d5125a..5ca23a1e22 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
index a9b2eaac2f..714cc0aeb4 100644
--- a/Source/SIMPLib/StatsData/PrecipitateStatsData.h
+++ b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
index 55f804699e..366401972d 100644
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
index 49e05573d2..615a58622f 100755
--- a/Source/SIMPLib/StatsData/PrimaryStatsData.h
+++ b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/SourceList.cmake b/Source/SIMPLib/StatsData/SourceList.cmake
index 115ca8e81b..aa2c87d86a 100755
--- a/Source/SIMPLib/StatsData/SourceList.cmake
+++ b/Source/SIMPLib/StatsData/SourceList.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
index 6bac04f2ef..3af5654bae 100644
--- a/Source/SIMPLib/StatsData/StatsData.cpp
+++ b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/StatsData.h b/Source/SIMPLib/StatsData/StatsData.h
index a3769f9770..67d72e1929 100644
--- a/Source/SIMPLib/StatsData/StatsData.h
+++ b/Source/SIMPLib/StatsData/StatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
index cbc9c79747..41f8592bd8 100644
--- a/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
+++ b/Source/SIMPLib/StatsData/Testing/Cxx/StatsDataJsonRWTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.cpp b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
index a624c59128..1bdae6cf71 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.cpp
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/StatsData/TransformationStatsData.h b/Source/SIMPLib/StatsData/TransformationStatsData.h
index 01fe5a2efd..18c571b419 100644
--- a/Source/SIMPLib/StatsData/TransformationStatsData.h
+++ b/Source/SIMPLib/StatsData/TransformationStatsData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/ArraySelectionExample.h b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
index c2e8c83059..b85f66a24b 100644
--- a/Source/SIMPLib/TestFilters/ArraySelectionExample.h
+++ b/Source/SIMPLib/TestFilters/ArraySelectionExample.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
index bbbc461161..696c5ecba4 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/DynamicTableExample.h b/Source/SIMPLib/TestFilters/DynamicTableExample.h
index 57f3396688..f15a28d604 100644
--- a/Source/SIMPLib/TestFilters/DynamicTableExample.h
+++ b/Source/SIMPLib/TestFilters/DynamicTableExample.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/GenericExample.cpp b/Source/SIMPLib/TestFilters/GenericExample.cpp
index 553e662d6f..4b2b139818 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.cpp
+++ b/Source/SIMPLib/TestFilters/GenericExample.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/GenericExample.h b/Source/SIMPLib/TestFilters/GenericExample.h
index fd2423a07e..badb6f02ad 100644
--- a/Source/SIMPLib/TestFilters/GenericExample.h
+++ b/Source/SIMPLib/TestFilters/GenericExample.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
index 97553c76c5..9b720b544f 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/MakeDataContainer.h b/Source/SIMPLib/TestFilters/MakeDataContainer.h
index f02e99b1c5..335839ee07 100644
--- a/Source/SIMPLib/TestFilters/MakeDataContainer.h
+++ b/Source/SIMPLib/TestFilters/MakeDataContainer.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.cpp b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
index ace7436402..7a03bcbceb 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.cpp
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/TestFilters/ThresholdExample.h b/Source/SIMPLib/TestFilters/ThresholdExample.h
index 5d4045f3e5..7ed7ca0e6a 100644
--- a/Source/SIMPLib/TestFilters/ThresholdExample.h
+++ b/Source/SIMPLib/TestFilters/ThresholdExample.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/ColorTable.cpp b/Source/SIMPLib/Utilities/ColorTable.cpp
index bb445ddb1b..5eb2d60760 100644
--- a/Source/SIMPLib/Utilities/ColorTable.cpp
+++ b/Source/SIMPLib/Utilities/ColorTable.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/ColorTable.h b/Source/SIMPLib/Utilities/ColorTable.h
index 5f1f73b32d..5b259ab9bf 100644
--- a/Source/SIMPLib/Utilities/ColorTable.h
+++ b/Source/SIMPLib/Utilities/ColorTable.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/ColorUtilities.cpp b/Source/SIMPLib/Utilities/ColorUtilities.cpp
index 5bbf29d799..9a67077952 100644
--- a/Source/SIMPLib/Utilities/ColorUtilities.cpp
+++ b/Source/SIMPLib/Utilities/ColorUtilities.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/ColorUtilities.h b/Source/SIMPLib/Utilities/ColorUtilities.h
index 97871a95f5..a4b0ec2dd7 100644
--- a/Source/SIMPLib/Utilities/ColorUtilities.h
+++ b/Source/SIMPLib/Utilities/ColorUtilities.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.cpp b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
index b54849df40..19aaf6cdfe 100644
--- a/Source/SIMPLib/Utilities/FilePathGenerator.cpp
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/FilePathGenerator.h b/Source/SIMPLib/Utilities/FilePathGenerator.h
index 71357310ea..7cd591b876 100644
--- a/Source/SIMPLib/Utilities/FilePathGenerator.h
+++ b/Source/SIMPLib/Utilities/FilePathGenerator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/GenericDataParser.hpp b/Source/SIMPLib/Utilities/GenericDataParser.hpp
index 1d08dc0941..92d8326593 100644
--- a/Source/SIMPLib/Utilities/GenericDataParser.hpp
+++ b/Source/SIMPLib/Utilities/GenericDataParser.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/MontageSelection.cpp b/Source/SIMPLib/Utilities/MontageSelection.cpp
index fddf2ac849..1b5b822c27 100644
--- a/Source/SIMPLib/Utilities/MontageSelection.cpp
+++ b/Source/SIMPLib/Utilities/MontageSelection.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *    United States Prime Contract Navy N00173-07-C-2068
  *
diff --git a/Source/SIMPLib/Utilities/MontageSelection.h b/Source/SIMPLib/Utilities/MontageSelection.h
index 5dde0cd87e..343f40b9db 100644
--- a/Source/SIMPLib/Utilities/MontageSelection.h
+++ b/Source/SIMPLib/Utilities/MontageSelection.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *    United States Prime Contract Navy N00173-07-C-2068
  *
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
index f2b9b37d0b..906a0397c9 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.cpp
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
index 734d248030..3d75c20adb 100644
--- a/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData2DAlgorithm.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
index 9f8033792c..b1ff837b83 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.cpp
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
index 87b22c638a..ff27523bf7 100644
--- a/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelData3DAlgorithm.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
index 44b011ac4f..dc0728b31a 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.cpp
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
index 980b05ea3a..7b6a1b3573 100644
--- a/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelDataAlgorithm.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
index ce227594aa..978ef04805 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.cpp
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
index a6f9f52683..8e67f89221 100644
--- a/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
+++ b/Source/SIMPLib/Utilities/ParallelTaskAlgorithm.h
@@ -27,7 +27,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/QtConverter.hpp b/Source/SIMPLib/Utilities/QtConverter.hpp
index e39223d7b6..162b2c1b92 100644
--- a/Source/SIMPLib/Utilities/QtConverter.hpp
+++ b/Source/SIMPLib/Utilities/QtConverter.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
index b60807242f..04152dc031 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/FloatSummationTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
index db0a76e7f3..7232295a7b 100644
--- a/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
+++ b/Source/SIMPLib/Utilities/Testing/Cxx/StringOperationsTest.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/Utilities/TimeUtilities.h b/Source/SIMPLib/Utilities/TimeUtilities.h
index b825ace89e..d3bfa738ff 100644
--- a/Source/SIMPLib/Utilities/TimeUtilities.h
+++ b/Source/SIMPLib/Utilities/TimeUtilities.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/VTKUtils/SourceList.cmake b/Source/SIMPLib/VTKUtils/SourceList.cmake
index 8429503e8a..0c79d2eabb 100755
--- a/Source/SIMPLib/VTKUtils/SourceList.cmake
+++ b/Source/SIMPLib/VTKUtils/SourceList.cmake
@@ -26,7 +26,7 @@
 # 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.
 #
-# The code contained herein was partially funded by the followig contracts:
+# The code contained herein was partially funded by the following contracts:
 #    United States Air Force Prime Contract FA8650-07-D-5800
 #    United States Air Force Prime Contract FA8650-10-D-5210
 #    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
index 4da087bbe5..c7fc25f34b 100644
--- a/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
+++ b/Source/SIMPLib/VTKUtils/VTKWriterMacros.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
index 3807b48a50..e78c92c153 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/FilterWidgetManager.h b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
index 780963b274..adf3614057 100644
--- a/Source/SVWidgetsLib/Core/FilterWidgetManager.h
+++ b/Source/SVWidgetsLib/Core/FilterWidgetManager.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
index 950d28c0d1..64b9553979 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
index c9e41e1afa..4dd6ef887d 100644
--- a/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
+++ b/Source/SVWidgetsLib/Core/IFilterWidgetFactory.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
index baa8db9c46..7f58651b73 100644
--- a/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
+++ b/Source/SVWidgetsLib/Core/PipelineFilterWidgetFactory.hpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h b/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
index aa41b34eaa..6ca19a1b6b 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibConstants.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
index f3a2ab085b..9f6eb9af3a 100644
--- a/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
+++ b/Source/SVWidgetsLib/Core/SVWidgetsLibDLLExport.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
index 683f798857..bb3d83c269 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
index 5b92e34888..46a5ab8c6b 100644
--- a/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
+++ b/Source/SVWidgetsLib/Dialogs/AboutPlugins.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
index 7603ece75e..43c584a05f 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresets.h b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
index d63ffcb174..3fcef220d2 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresets.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresets.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
index 449da70c91..84f48b74f7 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
index eb2fb8c528..76d9927ad7 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
index 2cd3a7a043..8b381026d5 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
index 24735c4118..5f178d04d5 100644
--- a/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
+++ b/Source/SVWidgetsLib/Dialogs/ColorPresetsDialogTableModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
index 8bf2469fb2..4055417e3c 100644
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
index 1fd7e73901..2aa26dd341 100644
--- a/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/FavoritesChangedDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
index 8adae1d623..b850b6915c 100644
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/PluginDetails.h b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
index a007e6bff7..7305335ee1 100644
--- a/Source/SVWidgetsLib/Dialogs/PluginDetails.h
+++ b/Source/SVWidgetsLib/Dialogs/PluginDetails.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
index b76e31ef7e..59cec88475 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
index 8cb329618d..5df8505947 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheck.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
index b58fbfc5df..6d1c8b51e0 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
index c640097ca5..141c276ab8 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckData.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
index 487e06fbe5..fc7c6920d6 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
index 8203acaa4e..6bb204750e 100644
--- a/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
+++ b/Source/SVWidgetsLib/Dialogs/UpdateCheckDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
index 0710265503..d408e6c158 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
index b5a4a4faf3..a948c71f8a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AbstractIOFileWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
index a6681aacf0..2809831f41 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
index f5bdedf5b6..fd879ea811 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixCreationWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
index 02b701590b..b690fed4bd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
index 06f77d0dd8..1ae1cd99f2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AttributeMatrixSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
index a27f466dfb..ef2078e135 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
index 83fa99886f..c3a0a9ae12 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/AxisAngleWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
index ec45213a8a..a96a9088a1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
index f4af832482..8124f2bc3c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/BooleanWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
index 29b74e7c0d..adfb72b02b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
index f0d3dd55af..ca09a8919a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CalculatorWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
index 5d660a5090..f719a69e11 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
index c8f3812093..44855c5b02 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ChoiceWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
index 0d026ca609..a4a279585b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
index 8f7b8e08cf..2e2a5cb11a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonContainerWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
index dee232a6cd..999f70bc5c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
index 5c42e9a399..3dfe7033b7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionAdvancedWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
index 1c48180dcd..6d943d9b55 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
index 70eea3f3ef..858be587a7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionItemDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
index 94e56df2d4..2e49ac1dd0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
index 69f5ee8b61..a3c81d6e26 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionTableModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
index b114b41cde..d7c9310dc5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
index 8abb993575..9413b8127a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
index 2dbf0dcde6..52a029983d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonSetWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
index 865df0f8f3..5c002939b5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ComparisonValueWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
index 7f6f27b001..bcd35d5858 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
index 5fd75bf99e..a659614130 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedDoubleWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
index 628e77ab4a..30047de567 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
index c990f15a73..0a7486ddb1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ConstrainedIntWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
index 52aa5789e2..2c4e19ef7c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
index 580b3d8466..4138b9adb0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/CustomWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
index bc0d3c5012..b648331001 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
index ff23032a9d..27fca12f0d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayCreationWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
index 572c0b9b6d..17338d2bf1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
index 777348f5a7..d11bee6649 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArrayInformationDisplayWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
index 8784b25413..822a6138bd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
index 301f04e0cc..fd7b21a6ef 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataArraySelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
index f7f6f43d04..893e4c192a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
index 4bfdd09302..0eb1376c57 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerArrayProxyWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
index 6617ee4dbf..e3f503edf8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
index bc595262b2..0fd75177ee 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerCreationWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
index 51b288bc2b..8c255be7be 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
index 7580566cc6..86e74dbd48 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
index bb0432d0e6..ea5a990d58 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
index 67c463220c..0ebce325eb 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerGridSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
index e68c08c753..56685b9786 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
index ed2cd0347d..49ddaf509a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerReaderWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
index 2ec2b67a59..05e102f0c3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
index 18f94d10b1..f251fc0f6a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DataContainerSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
index 03abf7f1e1..3f5a7e5a72 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
index 1777dbceda..60cd3ee820 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DoubleWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
index e5bafeb9fb..2875245911 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
index 908e5f15ab..02b598abbd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicChoiceWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
index 9ff79d3381..014c173820 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
index 30dadbabe4..36cf42da2a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableItemDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
index 8136d3592d..b9cf44633f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
index e13ac35185..445bc5db9e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/DynamicTableWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
index c02ec89ff9..9073375a8c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
index 0821e83534..21e4b93756 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FileListInfoWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
index 636e30028c..c5556aacf3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
index 2d230307f3..1b90ae893d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
index a2e09f4efa..10d91ba5f0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
index a320904962..3b03ce4597 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FilterParameterWidgetsDialogs.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
index 18c30c9eec..52dfd6755d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
index a33c8c3d3b..606eacd576 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec2Widget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
index 2313d94a61..7cfa89080a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
index 62d4ad4109..6376441102 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatVec3Widget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
index de40ad1379..95950eaa06 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
index 1a87f089c6..1360b54cd3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FloatWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
index b4b9d321ac..d82c363db1 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
index b43c73aa00..3757f01514 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/FourthOrderPolynomialWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
index 0168a860dc..abf75c1927 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
index 30d8842a4c..8662aa6765 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/GenerateColorTableWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
index 232a68e96f..e945cea732 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
index c4f8a8366d..da73a655f8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IComparisonWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
index 1694562ed2..0f1f3421e8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
index 68a4450712..8fc8c5bcc2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputFileWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
index 8e049ddb73..6b7d3b9fa3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
index e929265309..d47d772fb3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/InputPathWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
index 0d04622cfa..a537338255 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
index e95a32acfc..23722e962a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec2Widget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
index dac2039aba..cdc38d7d0d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
index bf065403a1..4f4cf37a53 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntVec3Widget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
index 0a22ecb659..d98c7f45d0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
index b28d775188..0431b4391d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/IntWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
index 8701f06ea0..3045fe3b4b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
index d72bef6297..4f3e889771 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedBooleanWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
index 3e6e817fb0..4a8bfce77c 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
index 86cc395998..8bb149cf68 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedDataContainerSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
index 27baaabb26..d7b92e5a14 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
index 020bd2ca03..72430abb30 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/LinkedPathCreationWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
index cb9c204b02..d49bc2e283 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
index 161fefbdd1..00278f4d7f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
index 2c560f0966..56705553cc 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
index 9f3baca9ac..1744c47b90 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MontageStructureSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
index 5f4413eaf9..26d76a02b3 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
index 9472b2cab8..4c6855742b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiAttributeMatrixSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -37,7 +37,6 @@
 #include <QtCore/QObject>
 #include <QtWidgets/QWidget>
 
-
 #include "SIMPLib/SIMPLib.h"
 #include "SIMPLib/DataContainers/DataArrayPath.h"
 #include "SIMPLib/DataContainers/DataContainerArrayProxy.h"
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
index 6d1fd8d417..365479113a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
index 0158f231df..20bce1fe97 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataArraySelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
index d14b9e0f60..a4b3d44de8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
index 778437c86d..a550140640 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiDataContainerSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
index c91ebff50e..004a335291 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
index 435fd1916b..a0636b8c06 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/MultiInputFileWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
index 7ed336f7cd..78407690e8 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
index b9c8a37848..2757ff2f5f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/NumericTypeWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
index e47c7553e1..c81edcb09b 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
index fb9801359b..3dccd6ca59 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputFileWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
index ed2c25f09a..c14436a58f 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
index f3ed6da241..5c92f712da 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/OutputPathWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
index e6e52a9b63..3c41ac06d2 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
index 3e33054c05..6e925b0364 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PhaseTypeSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
index 6600460cbb..b7e878629a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
index 8b61613483..888b53696e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/PreflightUpdatedValueWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
index 8136952be4..81af096115 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
index cab12fb7c9..a7937b181d 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/RangeWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
index a0fb1784f5..310bdfcbac 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
index 9d3f74fb28..2a40ecf0ff 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ReadASCIIDataWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
index b114edfe45..a9d8c517b0 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
index dcec4edeff..24e666ede7 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ScalarTypeWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
index 876adc0e4e..3fd9716eed 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
index fb2938cac2..ffb468de2e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SecondOrderPolynomialWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
index 4c203bf722..dc815af002 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
index dd28dbb0e3..093e77dd03 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/SeparatorWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
index ad9b47b00a..e8206a72c5 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
index 9570f5f98d..d6f88b0c49 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ShapeTypeSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
index bdda68a571..413d6ef7fa 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
index 4e2d156b29..e44d733797 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/StringWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
index 8937cf9699..b346d6d694 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
index 6124c453e5..ebbd928ea9 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/ThirdOrderPolynomialWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
index 344057a355..c8f15c2347 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
index 7cd0932eeb..278c5352dd 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UInt64Widget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
index 70f592c78d..8d4d6f700e 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
index fd477088bb..a4e4f8fe3a 100644
--- a/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
+++ b/Source/SVWidgetsLib/FilterParameterWidgets/UnknownWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
index 216263da97..76f8d91c78 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
index 30518bbe85..723d1640b4 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationAboutBoxDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -75,7 +75,7 @@ class SVWidgetsLib_EXPORT QtSApplicationAboutBoxDialog : public QDialog, private
 
 protected Q_SLOTS:
   void on_licenseCombo_currentIndexChanged(int index);
-  
+
   void on_okButton_clicked();
 
 protected:
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
index 1a16cccf2f..55690e3eb9 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
index 5c7c30cdf2..f88838e995 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSApplicationFileInfo.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
index 4adac1745b..8becb832e6 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
index b7719a62e8..63735515b9 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSBookmarkMissingDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
index a4569a4e2f..3ea172af8c 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
index 01038a5702..f5724328a8 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSCheckboxDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
index 491d0c6805..4f816dd681 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
index 257111b642..40828a6772 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSColorComboPicker.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
index 3efff4a1f7..0c25b2f0bd 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
index 8fee11ab68..eb6ca843c2 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDistributionTypeWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
index 337665394b..dd29ec22dc 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
index 5a91fdb052..968f913180 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSDroppableScrollArea.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
index fbdb159908..ba934ce956 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
index 62954c43d5..c61728d651 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLabel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
index 125c4fabc8..f76038e608 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
index 617bddff76..2a780a150a 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFSDropLineEdit.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
index da9c02132c..d5fd6861e8 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
index a54994c68f..4d860334d8 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileCompleter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
index 6cf07065ed..5869a7d676 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
index 9a8ea4039e..2737dc8d95 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSFileDragMessageBox.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
index c032f34a32..eaa599fa1e 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
index 1b3a87e90f..a948eb5bd5 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSGraphicsView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
index 5b80264d17..b5dd9de4b6 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
index ab12e7d00f..05957dc312 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHelpUrlGenerator.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
index 3aca3f8688..c9d887529b 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
index a97a3a679c..d66cb55454 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSHoverButton.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
index 0312c7e986..4abb816a82 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
index 52b58a4aa1..289a8f1995 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSImageGraphicsDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSMacros.h b/Source/SVWidgetsLib/QtSupport/QtSMacros.h
index 3b5903f198..30704b26ea 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSMacros.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSMacros.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
index df69c9ad9e..f9979b8d7a 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
index e866a173bd..8a69004cbd 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSPluginFrame.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
index 5f60dc6d62..93b1415194 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
index 0ccb7bdcf9..c7da21ed69 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSRecentFileList.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
index b734d7b0b0..497cec52e7 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSettings.h b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
index 78547618ac..9a39cae6cd 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSettings.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSettings.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
index 431ac7e8b9..6357b9372f 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitter.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitter.h b/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
index 29c3464f57..a97baf4069 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitter.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
index 89b33f4f02..2e81e38aea 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
index c5892fd10e..c61e1b3d25 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSSplitterHandle.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
index 0d2697cec0..09e786deb5 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
index eacba6b128..35895d3d18 100644
--- a/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
+++ b/Source/SVWidgetsLib/QtSupport/QtSStringEdit.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
index ad56ab8909..06f1a1fb08 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItem.h b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
index 0de050ad8b..1006655f2a 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItem.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
index edadfe481a..726d494f55 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
index 87e4e29629..b2f1582961 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksItemDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
index cda9b58ff8..332c8da5c6 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksModel.h b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
index b2e1845628..ba1c5b9d17 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksModel.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
index f5f3b4fa11..90a6225402 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
index 4bb20f0699..9c9e749b12 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksToolboxWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
index 57ccadc191..8d7c1ba086 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
index c838c39e0b..7f4dbcbced 100644
--- a/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/BookmarksTreeView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
index cc70560015..153c70fada 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
index fc2725c3c7..c26af245b7 100644
--- a/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DREAM3DListWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
index 85045bbd48..fa54dc0839 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
index 9c07ede6db..55bf872097 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathDisplay.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
index bc0a84bfd4..8312eddf4a 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
index 3af06880ed..18102557d6 100644
--- a/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataArrayPathSelectionWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
index 96ccc90e77..d65e1bb774 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerArrayWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp b/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
index f1d24da7a2..a529bb92e8 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataContainerGridView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/Widgets/DataContainerGridView.h b/Source/SVWidgetsLib/Widgets/DataContainerGridView.h
index f9eeef4449..e2a7a6c15c 100644
--- a/Source/SVWidgetsLib/Widgets/DataContainerGridView.h
+++ b/Source/SVWidgetsLib/Widgets/DataContainerGridView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
index 5ac13310d7..e0e8fe44a3 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataPathLabel.h b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
index 7019c318ab..bc3361b1f5 100644
--- a/Source/SVWidgetsLib/Widgets/DataPathLabel.h
+++ b/Source/SVWidgetsLib/Widgets/DataPathLabel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
index cdcee52f00..e032202caf 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItem.h b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
index ad3d89a1d6..1b4fafc2eb 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItem.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
index c8eae6335f..e9dbd9397b 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
index 7026c7c9ac..af04b20552 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureItemDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
index 945ef98289..72c3155c9f 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureModel.h b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
index 7d9a06de07..e801e70a19 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
index 1040ed3eda..61326d6753 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h
index 6ffd29b8f4..aeb5e17ef3 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureProxyModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5280
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
index 1736bc8677..64e4074833 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Air Force Prime Contract FA8650-15-D-5280
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
index b1516a0eec..8046018121 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureTreeView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Air Force Prime Contract FA8650-15-D-5280
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
index b578ce22bc..21bb44352e 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Air Force Prime Contract FA8650-15-D-5280
diff --git a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
index e20f7d4dab..c615a066d5 100644
--- a/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
+++ b/Source/SVWidgetsLib/Widgets/DataStructureWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
index f04695cf70..2682840979 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
index b6f115c81a..6556b6364f 100644
--- a/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterInputWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
index 769de31184..7fc333c1d8 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
index 5e9057921c..c4f30d177d 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryToolboxWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
index f77c5bc535..8f095e2b1b 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
index cbaf4628ac..9d439169fb 100644
--- a/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterLibraryTreeWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
index 19c9aec9db..31a26a1337 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListItem.h b/Source/SVWidgetsLib/Widgets/FilterListItem.h
index 3f2d24ee32..e61cb8a88e 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListItem.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
index 043a7d27ac..b012f04e60 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListModel.h b/Source/SVWidgetsLib/Widgets/FilterListModel.h
index 9ed5b71a86..62509986d1 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListModel.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
index cb855dec96..b67752fd62 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
index 80b225dd9c..0eb096ecb0 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListToolboxWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.cpp b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
index d4adf422dd..cc822aa66a 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListView.h b/Source/SVWidgetsLib/Widgets/FilterListView.h
index 2627559df5..5d3207f0ae 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListView.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
index 98a5cfad31..6be54cc3d5 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/FilterListWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/FilterListWidget.h b/Source/SVWidgetsLib/Widgets/FilterListWidget.h
index 8959168476..6d05de9d61 100644
--- a/Source/SVWidgetsLib/Widgets/FilterListWidget.h
+++ b/Source/SVWidgetsLib/Widgets/FilterListWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
index 4b7a0cc290..97259ed883 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
index 3c8472eff7..9ae6abd7c5 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataItem.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
index a93482afc4..87a6c2fa8b 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
index 7de3bb394a..76d63ccc1d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ASCIIDataModel.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
index c597ff6222..3e1124db9c 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
index 29d05a2429..af38eee17a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/AbstractWizardPage.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
index cb81c84f01..64f6e0ffc3 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
@@ -453,10 +453,10 @@ void DataFormatPage::createAMSelectionMenu()
   // Get the DataContainerArray object
   // Loop over the data containers until we find the proper data container
   DataContainerArray::Container containers = dca->getDataContainers();
-  std::vector<QString> daTypes;           // = m_FilterParameter->getDefaultAttributeArrayTypes();
-  QVector<std::vector<size_t>> cDims;     // = m_FilterParameter->getDefaultComponentDimensions();
-  AttributeMatrix::Types amTypes;         // = m_FilterParameter->getDefaultAttributeMatrixTypes();
-  IGeometry::Types geomTypes;             // = m_FilterParameter->getDefaultGeometryTypes();
+  std::vector<QString> daTypes;       // = m_FilterParameter->getDefaultAttributeArrayTypes();
+  QVector<std::vector<size_t>> cDims; // = m_FilterParameter->getDefaultComponentDimensions();
+  AttributeMatrix::Types amTypes;     // = m_FilterParameter->getDefaultAttributeMatrixTypes();
+  IGeometry::Types geomTypes;         // = m_FilterParameter->getDefaultGeometryTypes();
 
   for(DataContainer::Pointer dc : containers)
   {
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
index 4a8b46132c..9a35660a1f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DataFormatPage.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
index bd8767c8ed..49e20065a7 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
index 24a7d90608..d7cd7b457d 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/DelimitedPage.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
index c9e77f6c5d..a76c5a271a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
index bb4810a3bf..61e4be6575 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/EditHeadersDialog.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
index bb7f46e22e..32fbbcb64f 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
index c26821405e..e205ab6deb 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/ImportASCIIDataWizard.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
index 8f0eda8a7b..beaea99904 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
index f181954e78..ded9bd45e4 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/LineCounterObject.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
index 3332feb2d8..8edfa00bff 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
index af0c59d6a3..502ce6d5ad 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleSelectionPage.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
index 2c6b8692bf..e4d0fa8d42 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
index b783bb2b3d..7e29d7fdb6 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableItemDelegate.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
index 3af9a5952f..3bb0f5937a 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
index fbf136ef1e..acf97b4f49 100644
--- a/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
+++ b/Source/SVWidgetsLib/Widgets/ImportASCIIDataWizard/TupleTableWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
index 3bd8f86621..f104c8900f 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidget.h b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
index 6c5e7a187f..04aef867d7 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidget.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
index 07d614d11c..16195b0ba9 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
index 85efafd2a5..7183e3337c 100644
--- a/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
+++ b/Source/SVWidgetsLib/Widgets/IssuesWidgetMessageHandler.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.cpp b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
index f3fb2000d4..bcecc10a2c 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/PipelineView.h b/Source/SVWidgetsLib/Widgets/PipelineView.h
index 9e1885f743..0e9d7be377 100644
--- a/Source/SVWidgetsLib/Widgets/PipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/PipelineView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
index de2d0ef404..e41e316120 100644
--- a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.h b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.h
index c9995d1904..0d916f21ee 100644
--- a/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.h
+++ b/Source/SVWidgetsLib/Widgets/SVOverlayWidgetButton.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-15-D-5231
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
index 20d0a19d95..e6888ad841 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/SVPipelineView.h b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
index e7d792d5d9..92c991f362 100644
--- a/Source/SVWidgetsLib/Widgets/SVPipelineView.h
+++ b/Source/SVWidgetsLib/Widgets/SVPipelineView.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.cpp b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
index 707a4b1106..30eddb4101 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.cpp
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/SVStyle.h b/Source/SVWidgetsLib/Widgets/SVStyle.h
index 4ede0a769a..094b366e52 100644
--- a/Source/SVWidgetsLib/Widgets/SVStyle.h
+++ b/Source/SVWidgetsLib/Widgets/SVStyle.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
index 9f2b27ac3f..3cae46ac53 100644
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
index fc578659de..0fd9b9f0d3 100644
--- a/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StandardOutputWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
index 6c1fbc0193..a6c897440a 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
index acbe05e182..a724e9e23e 100644
--- a/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
+++ b/Source/SVWidgetsLib/Widgets/StatusBarWidget.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
index c1aeb86806..3c2d8249ac 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
index 22fb4665ef..2968e8e5cd 100644
--- a/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/AddFilterCommand.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
index 779371b464..312fbee254 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
index b0361e0d0c..2d290114dd 100644
--- a/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/MoveFilterCommand.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
index c6c6c7b5bd..f88ecf21e1 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.cpp
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068
diff --git a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
index b62e296165..0191f12de3 100644
--- a/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
+++ b/Source/SVWidgetsLib/Widgets/util/RemoveFilterCommand.h
@@ -26,7 +26,7 @@
  * 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.
  *
- * The code contained herein was partially funded by the followig contracts:
+ * The code contained herein was partially funded by the following contracts:
  *    United States Air Force Prime Contract FA8650-07-D-5800
  *    United States Air Force Prime Contract FA8650-10-D-5210
  *    United States Prime Contract Navy N00173-07-C-2068

From 8b9287cb8b6ce5af04cc95ab8647ef1cb8c94353 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 10 Aug 2021 15:14:27 -0400
Subject: [PATCH 390/397] Added more python __repr__ functions for data
 structure items

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 Wrapping/Python/Binding/pySupport.h | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/Wrapping/Python/Binding/pySupport.h b/Wrapping/Python/Binding/pySupport.h
index 8c5a9924b4..1357bbd5ea 100644
--- a/Wrapping/Python/Binding/pySupport.h
+++ b/Wrapping/Python/Binding/pySupport.h
@@ -124,7 +124,7 @@ void registerDataArray(pybind11::module& mod, const char* name)
           "npview", [](DataArrayType& dataArray) { return py::array_t<T, py::array::c_style>(dataArray.size(), dataArray.data(), py::cast(dataArray)); }, py::return_value_policy::reference_internal)
       .def("__repr__", [](const DataArrayType& a) {
         std::stringstream ss;
-        ss << "<'" << a.getFullNameOfClass().toStdString() << "  NAME=" << a.getName().toStdString() << ": TUPLES: " << a.getNumberOfTuples() << "  COMPONENTS: [";
+        ss << "<" << a.getFullNameOfClass().toStdString() << " NAME=\"" << a.getName().toStdString() << "\" TUPLES=" << a.getNumberOfTuples() << " COMPONENTS=(";
         std::vector<size_t> comps = a.getComponentDimensions();
         bool first = true;
         for(const auto& c : comps)
@@ -136,7 +136,7 @@ void registerDataArray(pybind11::module& mod, const char* name)
           ss << c;
           first = false;
         }
-        ss << "]'>";
+        ss << ")>";
         return ss.str();
       });
 }
@@ -212,6 +212,8 @@ void registerDataContainerArray(pybind11::class_<DataContainerArray, std::shared
   namespace py = pybind11;
   using namespace py::literals;
 
+  instance.def("__repr__", [](const DataContainerArray& dca) { return QString("<DataContainerArray DCs=%1>").arg(QString::number(dca.getNumDataContainers())); });
+
   instance.def("__getitem__", [](const DataContainerArray& dca, const QString& name) {
     if(!dca.doesDataContainerExist(name))
     {
@@ -284,6 +286,8 @@ void registerDataContainer(pybind11::class_<DataContainer, std::shared_ptr<DataC
   namespace py = pybind11;
   using namespace py::literals;
 
+  instance.def("__repr__", [](const DataContainer& dc) { return QString("<DataContainer NAME=\"%1\" AMs=%2>").arg(dc.getName(), QString::number(dc.getNumAttributeMatrices())); });
+
   instance.def("__getitem__", [](const DataContainer& dc, const QString& name) {
     if(!dc.doesAttributeMatrixExist(name))
     {
@@ -322,6 +326,17 @@ void registerAttributeMatrix(pybind11::class_<AttributeMatrix, std::shared_ptr<A
   namespace py = pybind11;
   using namespace py::literals;
 
+  instance.def("__repr__", [](const AttributeMatrix& am) {
+    QString dimString = "(";
+    auto dims = am.getTupleDimensions();
+    for(size_t i = 0; i < dims.size() - 1; i++)
+    {
+      dimString.append(QString("%1, ").arg(QString::number(dims[i])));
+    }
+    dimString.append(QString("%1)").arg(QString::number(dims.back())));
+    return QString("<AttributeMatrix NAME=\"%1\" DIMS=%2 TYPE=%3 DAs=%4>").arg(am.getName(), dimString, AttributeMatrix::TypeToString(am.getType()), QString::number(am.getNumAttributeArrays()));
+  });
+
   instance.def("__contains__", py::overload_cast<const QString&>(&AttributeMatrix::doesAttributeArrayExist, py::const_));
 
   instance.def("__len__", &AttributeMatrix::size);

From 83a09803de3f1c69cec704a41670f64b90a30826 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 10 Aug 2021 15:15:14 -0400
Subject: [PATCH 391/397] Changed Create functions to use specific types
 instead of QVariant

* Improves python docstrings
* More type safe for C++ side

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../FilterParameters/ImportHDF5DatasetFilterParameter.cpp     | 4 ++--
 .../FilterParameters/ImportHDF5DatasetFilterParameter.h       | 2 +-
 .../SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp | 2 +-
 .../SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
index a70fb79606..85c8286404 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.cpp
@@ -50,8 +50,8 @@ ImportHDF5DatasetFilterParameter::~ImportHDF5DatasetFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue,
-                                                                                   const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter, int groupIndex)
+ImportHDF5DatasetFilterParameter::Pointer ImportHDF5DatasetFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& filePathDefaultValue,
+                                                                                   const QString& datasetDefaultValue, Category category, ImportHDF5Dataset* filter, int groupIndex)
 {
   ImportHDF5DatasetFilterParameter::Pointer ptr = ImportHDF5DatasetFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
index a3b0311d1e..ca31e98295 100644
--- a/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ImportHDF5DatasetFilterParameter.h
@@ -67,7 +67,7 @@ class SIMPLib_EXPORT ImportHDF5DatasetFilterParameter : public FilterParameter
    */
   static QString ClassName();
 
-  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVariant& filePathDefaultValue, const QVariant& datasetDefaultValue, Category category, ImportHDF5Dataset* filter,
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& filePathDefaultValue, const QString& datasetDefaultValue, Category category, ImportHDF5Dataset* filter,
                         int groupIndex = -1);
 
   ~ImportHDF5DatasetFilterParameter() override;
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
index 6a14321ac0..818a70f352 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.cpp
@@ -51,7 +51,7 @@ ReadASCIIDataFilterParameter::~ReadASCIIDataFilterParameter() = default;
 // -----------------------------------------------------------------------------
 //
 // -----------------------------------------------------------------------------
-ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex)
+ReadASCIIDataFilterParameter::Pointer ReadASCIIDataFilterParameter::Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex)
 {
   ReadASCIIDataFilterParameter::Pointer ptr = ReadASCIIDataFilterParameter::New();
   ptr->setHumanLabel(humanLabel);
diff --git a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
index bf8753c1db..f3818a6521 100644
--- a/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
+++ b/Source/SIMPLib/FilterParameters/ReadASCIIDataFilterParameter.h
@@ -79,7 +79,7 @@ class SIMPLib_EXPORT ReadASCIIDataFilterParameter : public FilterParameter
    * @param groupIndex
    * @return
    */
-  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QVariant& defaultValue, Category category, int groupIndex = -1);
+  static Pointer Create(const QString& humanLabel, const QString& propertyName, const QString& defaultValue, Category category, int groupIndex = -1);
 
   ~ReadASCIIDataFilterParameter() override;
 

From 788d9557e6fd24b615148a6bf7a7a272de34e677 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 10 Aug 2021 15:20:13 -0400
Subject: [PATCH 392/397] Fixed pybind11 custom type casters

* Casting functions would create a python object and then
immediately destroy it upon return. Future accesses would then
cause a crash
* Improved some of the generated docstrings for typecasters
* Changed assert to static_assert for QChar size
* Added several new type casters to cover previously
unconvertable types
* Fixed some type conversion issues for unbound sub types

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 .../Python/Binding/Pybind11CustomTypeCasts.h  | 465 ++++++------------
 1 file changed, 159 insertions(+), 306 deletions(-)

diff --git a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
index e106153419..a7f92e395d 100644
--- a/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
+++ b/Wrapping/Python/Binding/Pybind11CustomTypeCasts.h
@@ -16,6 +16,7 @@ namespace py = pybind11;
 #include "SIMPLib/CoreFilters/util/ASCIIWizardData.hpp"
 #include "SIMPLib/DataContainers/DataContainerProxy.h"
 #include "SIMPLib/FilterParameters/RangeFilterParameter.h"
+#include "SIMPLib/Filtering/AbstractComparison.h"
 
 using DataContainersMap = QMap<QString, DataContainerProxy>;
 using AttributeMatricesMap = QMap<QString, AttributeMatrixProxy>;
@@ -87,7 +88,7 @@ struct type_caster<QString>
   static handle cast(const QString& src, return_value_policy /* policy */, handle /* parent */)
   {
 #if PY_VERSION_HEX >= 0x03030000 // Python 3.3
-    assert(sizeof(QChar) == 2);
+    static_assert(sizeof(QChar) == 2);
     return PyUnicode_FromKindAndData(PyUnicode_2BYTE_KIND, src.constData(), src.length());
 #else
     QByteArray a = src.toUtf8();
@@ -96,60 +97,6 @@ struct type_caster<QString>
   }
 };
 
-#if 0
-/* Create a TypeCaster for auto python tuple <--> QPair conversion */
-template <>
-struct type_caster<FPRangePair>
-{
-public:
-  /**
-   * This macro establishes the name 'FPRangePair' in
-   * function signatures and declares a local variable
-   * 'value' of type FPRangePair
-   */
-  PYBIND11_TYPE_CASTER(FPRangePair, _("FPRangePair"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a tuple into a FPRangePair
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::tuple>(src))
-    {
-      py::tuple valuePair = py::cast<py::tuple>(src);
-      value = FPRangePair();
-      value.first = py::cast<double>(valuePair[0]);
-      value.second = py::cast<double>(valuePair[1]);
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert  FPRangePair instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const FPRangePair& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    return py::tuple((src.first, src.second));
-  }
-};
-#endif
-
 /* Create a TypeCaster for auto python dict <--> ASCIIWizardData conversion */
 template <>
 struct type_caster<ASCIIWizardData>
@@ -175,44 +122,44 @@ struct type_caster<ASCIIWizardData>
     {
       return false;
     }
-    if(py::isinstance<py::dict>(src))
+    if(!py::isinstance<py::dict>(src))
     {
-      py::dict awdDict = py::cast<py::dict>(src);
-      value = ASCIIWizardData();
-      value.inputFilePath = py::cast<QString>(awdDict["inputFilePath"]);
-      value.beginIndex = py::cast<int>(awdDict["beginIndex"]);
-      value.numberOfLines = py::cast<int>(awdDict["numberOfLines"]);
-      QList<char> delimiters;
-      for(auto object : awdDict["delimiters"])
-      {
-        delimiters.push_back(py::cast<char>(object));
-      }
-      value.delimiters = delimiters;
-      value.consecutiveDelimiters = py::cast<bool>(awdDict["consecutiveDelimiters"]);
-      value.automaticAM = py::cast<bool>(awdDict["automaticAM"]);
-      value.selectedPath = py::cast<DataArrayPath>(awdDict["selectedPath"]);
-      QStringList dataHeaders;
-      for(auto header : awdDict["headers"])
-      {
-        dataHeaders.push_back(py::cast<QString>(header));
-      }
-      value.dataHeaders = dataHeaders;
-      value.attrMatType = py::cast<int>(awdDict["attrMatType"]);
-      std::vector<size_t> tupleDims;
-      for(auto tupleDim : awdDict["tupleDimensions"])
-      {
-        tupleDims.push_back(py::cast<size_t>(tupleDim));
-      }
-      value.tupleDims = tupleDims;
-      QStringList dataTypes;
-      for(auto dataType : awdDict["dataTypes"])
-      {
-        dataTypes.push_back(py::cast<QString>(dataType));
-      }
-      value.dataTypes = dataTypes;
-      return true;
+      return false;
     }
-    return false;
+    py::dict awdDict = py::cast<py::dict>(src);
+    value = ASCIIWizardData();
+    value.inputFilePath = py::cast<QString>(awdDict["inputFilePath"]);
+    value.beginIndex = py::cast<int>(awdDict["beginIndex"]);
+    value.numberOfLines = py::cast<int>(awdDict["numberOfLines"]);
+    QList<char> delimiters;
+    for(auto object : awdDict["delimiters"])
+    {
+      delimiters.push_back(py::cast<char>(object));
+    }
+    value.delimiters = delimiters;
+    value.consecutiveDelimiters = py::cast<bool>(awdDict["consecutiveDelimiters"]);
+    value.automaticAM = py::cast<bool>(awdDict["automaticAM"]);
+    value.selectedPath = py::cast<DataArrayPath>(awdDict["selectedPath"]);
+    QStringList dataHeaders;
+    for(auto header : awdDict["headers"])
+    {
+      dataHeaders.push_back(py::cast<QString>(header));
+    }
+    value.dataHeaders = dataHeaders;
+    value.attrMatType = py::cast<int>(awdDict["attrMatType"]);
+    std::vector<size_t> tupleDims;
+    for(auto tupleDim : awdDict["tupleDimensions"])
+    {
+      tupleDims.push_back(py::cast<size_t>(tupleDim));
+    }
+    value.tupleDims = tupleDims;
+    QStringList dataTypes;
+    for(auto dataType : awdDict["dataTypes"])
+    {
+      dataTypes.push_back(py::cast<QString>(dataType));
+    }
+    value.dataTypes = dataTypes;
+    return true;
   }
 
   /**
@@ -231,7 +178,12 @@ struct type_caster<ASCIIWizardData>
     awdDict["inputFilePath"] = src.inputFilePath;
     awdDict["beginIndex"] = src.beginIndex;
     awdDict["numberOfLines"] = src.numberOfLines;
-    awdDict["delimiters"] = src.delimiters;
+    py::list pyList;
+    for(char value : src.delimiters)
+    {
+      pyList.append(value);
+    }
+    awdDict["delimiters"] = pyList;
     awdDict["consecutiveDelimiters"] = src.consecutiveDelimiters;
     awdDict["automaticAM"] = src.automaticAM;
     awdDict["selectedPath"] = src.selectedPath;
@@ -239,65 +191,7 @@ struct type_caster<ASCIIWizardData>
     awdDict["attrMatType"] = src.attrMatType;
     awdDict["tupleDimensions"] = src.tupleDims;
     awdDict["dataTypes"] = src.dataTypes;
-    return std::move(awdDict);
-  }
-};
-
-/* Create a TypeCaster for auto python list <--> QVector<DataArrayPath> conversion */
-template <>
-struct type_caster<QVector<DataArrayPath>>
-{
-public:
-  /**
-   * This macro establishes the name 'QVector<DataArrayPath>' in
-   * function signatures and declares a local variable
-   * 'value' of type QVector<DataArrayPath>
-   */
-  PYBIND11_TYPE_CASTER(QVector<DataArrayPath>, _("QVector<DataArrayPath>"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<DataArrayPath>
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      value = QVector<DataArrayPath>();
-      for(auto dataArrayPath : src)
-      {
-        value.push_back(py::cast<DataArrayPath>(dataArrayPath));
-      }
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<DataArrayPath> instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const QVector<DataArrayPath>& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list dataArrayPaths;
-    for(auto dataArrayPath : src)
-    {
-      dataArrayPaths.append(dataArrayPath);
-    }
-    return std::move(dataArrayPaths);
+    return awdDict.release();
   }
 };
 
@@ -311,10 +205,10 @@ struct type_caster<DataContainersMap>
    * function signatures and declares a local variable
    * 'value' of type QMap<QString, V>
    */
-  PYBIND11_TYPE_CASTER(DataContainersMap, _("DataContainersMap"));
+  PYBIND11_TYPE_CASTER(DataContainersMap, _("Dict[str,DataContainerProxy]"));
 
   /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
+   *  @brief Conversion part 1 (Python->C++): convert a list into a QMap<QString, V>
    * instance or return false upon failure. The second argument
    * indicates whether implicit conversions should be applied.
    * @param src
@@ -326,17 +220,17 @@ struct type_caster<DataContainersMap>
     {
       return false;
     }
-    if(py::isinstance<py::dict>(src))
+    if(!py::isinstance<py::dict>(src))
     {
-      std::map<QString, DataContainerProxy> mapDict = py::cast<std::map<QString, DataContainerProxy>>(src);
-      value = QMap<QString, DataContainerProxy>();
-      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
-      {
-        value.insert(it->first, it->second);
-      }
-      return true;
+      return false;
     }
-    return false;
+    std::map<QString, DataContainerProxy> mapDict = py::cast<std::map<QString, DataContainerProxy>>(src);
+    value = QMap<QString, DataContainerProxy>();
+    for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
+    {
+      value.insert(it->first, it->second);
+    }
+    return true;
   }
 
   /**
@@ -358,7 +252,7 @@ struct type_caster<DataContainersMap>
       QString key(it->first);
       qmapDict[py::str(key.toStdString())] = py::cast(it->second);
     }
-    return std::move(qmapDict);
+    return qmapDict.release();
   }
 };
 
@@ -372,10 +266,10 @@ struct type_caster<AttributeMatricesMap>
    * function signatures and declares a local variable
    * 'value' of type QMap<QString, V>
    */
-  PYBIND11_TYPE_CASTER(AttributeMatricesMap, _("AttributeMatricesMap"));
+  PYBIND11_TYPE_CASTER(AttributeMatricesMap, _("Dict[str,AttributeMatrixProxy]"));
 
   /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QMap<QString, V>
+   *  @brief Conversion part 1 (Python->C++): convert a list into a QMap<QString, V>
    * instance or return false upon failure. The second argument
    * indicates whether implicit conversions should be applied.
    * @param src
@@ -387,17 +281,17 @@ struct type_caster<AttributeMatricesMap>
     {
       return false;
     }
-    if(py::isinstance<py::dict>(src))
+    if(!py::isinstance<py::dict>(src))
     {
-      std::map<QString, AttributeMatrixProxy> mapDict = py::cast<std::map<QString, AttributeMatrixProxy>>(src);
-      value = QMap<QString, AttributeMatrixProxy>();
-      for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
-      {
-        value.insert(it->first, it->second);
-      }
-      return true;
+      return false;
+    }
+    std::map<QString, AttributeMatrixProxy> mapDict = py::cast<std::map<QString, AttributeMatrixProxy>>(src);
+    value = QMap<QString, AttributeMatrixProxy>();
+    for(auto it = mapDict.begin(); it != mapDict.end(); ++it)
+    {
+      value.insert(it->first, it->second);
     }
-    return false;
+    return true;
   }
 
   /**
@@ -419,24 +313,34 @@ struct type_caster<AttributeMatricesMap>
       QString key(it->first);
       qmapDict[py::str(key.toStdString())] = py::cast(it->second);
     }
-    return std::move(qmapDict);
+    return qmapDict.release();
   }
 };
 
-/* Create a TypeCaster for auto python list <--> QVector<ShapeType::Type> conversion */
 template <>
-struct type_caster<QVector<ShapeType::Type>>
+struct type_caster<QVector<ShapeType::Type>> : public list_caster<QVector<ShapeType::Type>, ShapeType::Type>
+{
+};
+
+template <>
+struct type_caster<QVector<PhaseType::Type>> : public list_caster<QVector<PhaseType::Type>, PhaseType::Type>
+{
+};
+
+/* Create a TypeCaster for auto python list <--> VectorOfFloatArray conversion */
+template <>
+struct type_caster<VectorOfFloatArray>
 {
 public:
   /**
-   * This macro establishes the name 'QVector<ShapeType::Type>' in
+   * This macro establishes the name 'VectorOfFloatArray' in
    * function signatures and declares a local variable
-   * 'value' of type QVector<ShapeType::Type>
+   * 'value' of type VectorOfFloatArray
    */
-  PYBIND11_TYPE_CASTER(QVector<ShapeType::Type>, _("QVector<ShapeType::Type>"));
+  PYBIND11_TYPE_CASTER(VectorOfFloatArray, _("List[FloatArray]"));
 
   /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<ShapeType::Type>
+   *  @brief Conversion part 1 (Python->C++): convert a list into a VectorOfFloatArray
    * instance or return false upon failure. The second argument
    * indicates whether implicit conversions should be applied.
    * @param src
@@ -448,20 +352,51 @@ struct type_caster<QVector<ShapeType::Type>>
     {
       return false;
     }
-    if(py::isinstance<py::list>(src))
+    if(!py::isinstance<py::list>(src))
+    {
+      return false;
+    }
+    /* Try converting into a Python integer value */
+    VectorOfFloatArray floatArrays;
+    for(auto floatArray : src)
     {
-      value = QVector<ShapeType::Type>();
-      for(auto shapeType : src)
+      if(py::isinstance<py::list>(floatArray) || py::isinstance<py::tuple>(floatArray))
+      {
+        FloatArrayType::Pointer floatArrayPtr;
+        std::vector<float> floatArrayVector;
+        size_t index = 0;
+        QString name;
+        for(auto item : floatArray)
+        {
+          if(index == 0)
+          {
+            name = py::cast<QString>(item);
+          }
+          else
+          {
+            floatArrayVector.push_back(py::cast<float>(item));
+          }
+          index++;
+        }
+        floatArrayPtr = FloatArrayType::FromStdVector(floatArrayVector, name);
+        floatArrays.push_back(floatArrayPtr);
+      }
+      else if(py::isinstance<FloatArrayType>(floatArray))
+      {
+        floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
+      }
+      else
       {
-        value.push_back(py::cast<ShapeType::Type>(shapeType));
+        py::print("object must be list, tuple, or FloatArray");
       }
-      return true;
     }
-    return false;
+
+    value = floatArrays;
+    return true;
   }
 
   /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<ShapeType::Type> instance into
+   * @brief Conversion part 2 (C++ -> Python): convert VectorOfFloatArray instance into
    * a Python object. The second and third arguments are used to
    * indicate the return value policy and parent object (for
    * ``return_value_policy::reference_internal``) and are generally
@@ -470,31 +405,38 @@ struct type_caster<QVector<ShapeType::Type>>
    * @param src
    * @return
    */
-  static handle cast(const QVector<ShapeType::Type>& src, return_value_policy /* policy */, handle /* parent */)
+  static handle cast(const VectorOfFloatArray& src, return_value_policy /* policy */, handle /* parent */)
   {
-    py::list shapeTypes;
-    for(auto shapeType : src)
+    py::list floatArrays;
+    for(FloatArrayType::Pointer floatArray : src)
     {
-      shapeTypes.append(shapeType);
+      py::list floatArrayList;
+      floatArrayList.append(floatArray->getName());
+      for(float value : *floatArray)
+      {
+        floatArrayList.append(value);
+      }
+
+      floatArrays.append(floatArray);
     }
-    return std::move(shapeTypes);
+    return floatArrays.release();
   }
 };
 
-/* Create a TypeCaster for auto python list <--> QVector<PhaseType::Type> conversion */
+/* Create a TypeCaster for auto python list <--> QVector<AbstractComparison::Pointer> conversion */
 template <>
-struct type_caster<QVector<PhaseType::Type>>
+struct type_caster<QVector<AbstractComparison::Pointer>>
 {
 public:
   /**
-   * This macro establishes the name 'QVector<PhaseType::Type>' in
+   * This macro establishes the name 'QVector<AbstractComparison::Pointer>' in
    * function signatures and declares a local variable
-   * 'value' of type QVector<PhaseType::Type>
+   * 'value' of type QVector<AbstractComparison::Pointer>
    */
-  PYBIND11_TYPE_CASTER(QVector<PhaseType::Type>, _("QVector<PhaseType::Type>"));
+  PYBIND11_TYPE_CASTER(QVector<AbstractComparison::Pointer>, _("List[AbstractComparison]"));
 
   /**
-   *  @brief Conversion part 1 (Python->C++): convert a lsit into a QVector<PhaseType::Type>
+   *  @brief Conversion part 1 (Python->C++): convert a list into a QVector<AbstractComparison::Pointer>
    * instance or return false upon failure. The second argument
    * indicates whether implicit conversions should be applied.
    * @param src
@@ -506,23 +448,21 @@ struct type_caster<QVector<PhaseType::Type>>
     {
       return false;
     }
-    if(py::isinstance<py::list>(src))
+    if(!py::isinstance<py::list>(src))
     {
-      value = QVector<PhaseType::Type>();
-      for(auto phaseType : src)
-      {
-        value.push_back(py::cast<PhaseType::Type>(phaseType));
-      }
-      return true;
+      return false;
     }
-    else
+    value = QVector<AbstractComparison::Pointer>();
+    auto pyList = reinterpret_borrow<py::list>(src);
+    for(auto item : pyList)
     {
-      return false;
+      value.push_back(py::cast<AbstractComparison::Pointer>(item));
     }
+    return true;
   }
 
   /**
-   * @brief Conversion part 2 (C++ -> Python): convert QVector<PhaseType::Type> instance into
+   * @brief Conversion part 2 (C++ -> Python): convert QVector<AbstractComparison::Pointer> instance into
    * a Python object. The second and third arguments are used to
    * indicate the return value policy and parent object (for
    * ``return_value_policy::reference_internal``) and are generally
@@ -531,112 +471,25 @@ struct type_caster<QVector<PhaseType::Type>>
    * @param src
    * @return
    */
-  static handle cast(const QVector<PhaseType::Type>& src, return_value_policy /* policy */, handle /* parent */)
+  static handle cast(const QVector<AbstractComparison::Pointer>& src, return_value_policy /* policy */, handle /* parent */)
   {
-    py::list phaseTypes;
-    for(PhaseType::Type phaseType : src)
+    py::list pyList;
+    for(AbstractComparison::Pointer item : src)
     {
-      phaseTypes.append(phaseType);
+      pyList.append(item);
     }
-    return std::move(phaseTypes);
+    return pyList.release();
   }
 };
 
-/* Create a TypeCaster for auto python list <--> VectorOfFloatArray conversion */
 template <>
-struct type_caster<VectorOfFloatArray>
+struct type_caster<QStringList> : public list_caster<QStringList, QString>
 {
-public:
-  /**
-   * This macro establishes the name 'VectorOfFloatArray' in
-   * function signatures and declares a local variable
-   * 'value' of type VectorOfFloatArray
-   */
-  PYBIND11_TYPE_CASTER(VectorOfFloatArray, _("VectorOfFloatArray"));
-
-  /**
-   *  @brief Conversion part 1 (Python->C++): convert a list into a VectorOfFloatArray
-   * instance or return false upon failure. The second argument
-   * indicates whether implicit conversions should be applied.
-   * @param src
-   * @return boolean
-   */
-  bool load(handle src, bool b)
-  {
-    if(!src)
-    {
-      return false;
-    }
-    if(py::isinstance<py::list>(src))
-    {
-      /* Try converting into a Python integer value */
-      VectorOfFloatArray floatArrays;
-      for(auto floatArray : src)
-      {
-        if(py::isinstance<py::list>(floatArray) || py::isinstance<py::tuple>(floatArray))
-        {
-          FloatArrayType::Pointer floatArrayPtr;
-          std::vector<float> floatArrayVector;
-          size_t index = 0;
-          QString name;
-          for(auto item : floatArray)
-          {
-            if(index == 0)
-            {
-              name = py::cast<QString>(item);
-            }
-            else
-            {
-              floatArrayVector.push_back(py::cast<float>(item));
-            }
-            index++;
-          }
-          floatArrayPtr = FloatArrayType::FromStdVector(floatArrayVector, name);
-          floatArrays.push_back(floatArrayPtr);
-        }
-        else if(py::isinstance<FloatArrayType>(floatArray))
-        {
-          floatArrays.push_back(py::cast<FloatArrayType::Pointer>(floatArray));
-        }
-        else
-        {
-          py::print("object must be list, tuple, or FloatArray");
-        }
-      }
-
-      value = floatArrays;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @brief Conversion part 2 (C++ -> Python): convert VectorOfFloatArray instance into
-   * a Python object. The second and third arguments are used to
-   * indicate the return value policy and parent object (for
-   * ``return_value_policy::reference_internal``) and are generally
-   * ignored by implicit casters.
-   *
-   * @param src
-   * @return
-   */
-  static handle cast(const VectorOfFloatArray& src, return_value_policy /* policy */, handle /* parent */)
-  {
-    py::list floatArrays;
-    for(FloatArrayType::Pointer floatArray : src)
-    {
-      py::list floatArrayList;
-      floatArrayList.append(floatArray->getName());
-      for(float value : *floatArray)
-      {
-        floatArrayList.append(value);
-      }
-
-      floatArrays.append(floatArray);
-    }
-    return std::move(floatArrays);
-  }
 };
 
+template <>
+struct type_caster<QVector<DataArrayPath>> : public list_caster<QVector<DataArrayPath>, DataArrayPath>
+{
+};
 } // namespace detail
 } // namespace pybind11

From 4e509ff0248236458152f27f124fbbd7702c0f56 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 10 Aug 2021 15:34:28 -0400
Subject: [PATCH 393/397] Added new code location in generated python binding

* Allows for split declaration/definition before the macro based
bindings
* Added several more bound types

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                |  1 +
 .../Python/Binding/CreatePybind11Module.cmake |  6 +-
 .../Binding/generate_python_bindings.py       | 19 +++-
 Wrapping/Python/Binding/pySIMPLBody.cpp       | 88 +++++++------------
 Wrapping/Python/Binding/pySIMPLBodyTop.cpp    | 15 ++++
 Wrapping/Python/Binding/pySIMPLPostTypes.cpp  | 81 +++++++++++++++++
 6 files changed, 147 insertions(+), 63 deletions(-)
 create mode 100644 Wrapping/Python/Binding/pySIMPLPostTypes.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49b68f1fd1..98b3e0bfd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,6 +557,7 @@ if(SIMPL_WRAP_PYTHON)
     HEADER_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLHeader.cpp"
     BODY_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBody.cpp"
     BODY_TOP_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLBodyTop.cpp"
+    POST_TYPES_PATH "${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/pySIMPLPostTypes.cpp"
     PYTHON_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}$<${_isMultiConfig}:/$<CONFIG>>"
     LINK_LIBRARIES SIMPLib
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 3c6b9414fe..2b3805be96 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -71,7 +71,7 @@ endfunction()
 #-------------------------------------------------------------------------------
 function(CreatePybind11Module)
   set(options PLUGIN)
-  set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH BODY_TOP_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
+  set(oneValueArgs MODULE_NAME OUTPUT_DIR FILE_LIST_PATH SOURCE_DIR HEADER_PATH BODY_PATH BODY_TOP_PATH POST_TYPES_PATH INCLUDE_DIR PYTHON_OUTPUT_DIR)
   set(multiValueArgs LINK_LIBRARIES INCLUDE_DIRS)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -119,6 +119,7 @@ function(CreatePybind11Module)
       "--header_path=${ARGS_HEADER_PATH}"
       "--body_path=${ARGS_BODY_PATH}"
       "--body_top_path=${ARGS_BODY_TOP_PATH}"
+      "--post_types_path=${ARGS_POST_TYPES_PATH}"
       "--plugin_name=${ARGS_MODULE_NAME}"
       "${NO_TESTS_ARG}"
       "${RELATIVE_IMPORTS_ARGS}"
@@ -194,7 +195,7 @@ endfunction()
 #-------------------------------------------------------------------------------
 function(CreatePybind11Plugin)
   set(options)
-  set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH BODY_TOP_PATH)
+  set(oneValueArgs PLUGIN_NAME PLUGIN_TARGET HEADER_PATH BODY_PATH BODY_TOP_PATH POST_TYPES_PATH)
   set(multiValueArgs)
   cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
@@ -209,6 +210,7 @@ function(CreatePybind11Plugin)
     HEADER_PATH ${ARGS_HEADER_PATH}
     BODY_PATH ${ARGS_BODY_PATH}
     BODY_TOP_PATH ${ARGS_BODY_TOP_PATH}
+    POST_TYPES_PATH ${ARGS_POST_TYPES_PATH}
     LINK_LIBRARIES ${ARGS_PLUGIN_TARGET}
     INCLUDE_DIRS ${SIMPLProj_SOURCE_DIR}/Wrapping/Python
     PLUGIN
diff --git a/Wrapping/Python/Binding/generate_python_bindings.py b/Wrapping/Python/Binding/generate_python_bindings.py
index f48ca3d13d..7173633426 100644
--- a/Wrapping/Python/Binding/generate_python_bindings.py
+++ b/Wrapping/Python/Binding/generate_python_bindings.py
@@ -538,7 +538,7 @@ def replace_file_if_different(temp_file: str, target_file: str) -> None:
   else:
     os.rename(temp_file, target_file)
 
-def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str, body_top_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
+def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, files: List[str], source_dir: str, python_output_dir: str, plugin_name: str, body_top_path: str = '', post_types_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
   module_target_file_path = f'{output_dir}/py_simpl.cpp'
   module_temp_file_path = f'{module_target_file_path}.temp'
   with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/simplpy.py', 'w') as python_file, ExitStack() as exit_stack:
@@ -583,6 +583,11 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
       code = py_class.generate_forward_declaration()
       module_file.write(code)
 
+    if post_types_path:
+      with open(post_types_path, 'r') as post_types_file:
+        custom_post_types_code = post_types_file.read()
+        module_file.write(f'{custom_post_types_code}\n')
+
     for py_class in module_classes:
       code = py_class.generate_bindings(foward_declared=True)
       module_file.write(code)
@@ -607,7 +612,7 @@ def generate_simpl_bindings(output_dir: str, header_path: str, body_path: str, f
     module_file.write('}\n')
   replace_file_if_different(module_temp_file_path, module_target_file_path)
 
-def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, plugin_name: str, header_path: str = '', body_path: str = '', body_top_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
+def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str], include_dir: Optional[str], python_output_dir: str, plugin_name: str, header_path: str = '', body_path: str = '', body_top_path: str = '', post_types_path: str = '', no_tests: bool = False, relative_imports: bool = False) -> None:
   module_target_file_path = f'{output_dir}/py_{module_name}.cpp'
   module_temp_file_path = f'{module_target_file_path}.temp'
   with open(module_temp_file_path, 'w') as module_file, open(f'{python_output_dir}/{module_name}py.py', 'w') as python_file, ExitStack() as exit_stack:
@@ -682,6 +687,11 @@ def generate_plugin_bindings(output_dir: str, module_name: str, files: List[str]
       code = py_class.generate_forward_declaration()
       module_file.write(code)
 
+    if post_types_path:
+      with open(post_types_path, 'r') as post_types_file:
+        custom_post_types_code = post_types_file.read()
+        module_file.write(f'{custom_post_types_code}\n')
+
     for py_class in module_classes:
       code = py_class.generate_bindings(foward_declared=True)
       module_file.write(code)
@@ -748,6 +758,7 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
   parser.add_argument('--header_path')
   parser.add_argument('--body_path')
   parser.add_argument('--body_top_path')
+  parser.add_argument('--post_types_path')
   parser.add_argument('--include_dir')
   parser.add_argument('--plugin_name')
   parser.add_argument('--plugin', action='store_true')
@@ -760,11 +771,11 @@ def read_simpl_file_list(file_list_path: str, source_dir: str) -> List[str]:
     if args.module_name is None:
       parser.error('--plugin requires --module_name')
     files = read_plugin_file_list(args.file_list_path, args.source_dir)
-    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.plugin_name, args.header_path, args.body_path, args.body_top_path, args.no_tests, args.relative_imports)
+    generate_plugin_bindings(args.output_dir, args.module_name, files, args.include_dir, args.python_output_dir, args.plugin_name, args.header_path, args.body_path, args.body_top_path, args.post_types_path, args.no_tests, args.relative_imports)
   else:
     if args.header_path is None:
       parser.error('requires --header_path')
     if args.body_path is None:
       parser.error('requires --body_path')
     files = read_simpl_file_list(args.file_list_path, args.source_dir)
-    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name, args.body_top_path, args.no_tests, args.relative_imports)
+    generate_simpl_bindings(args.output_dir, args.header_path, args.body_path, files, args.source_dir, args.python_output_dir, args.plugin_name, args.body_top_path, args.post_types_path, args.no_tests, args.relative_imports)
diff --git a/Wrapping/Python/Binding/pySIMPLBody.cpp b/Wrapping/Python/Binding/pySIMPLBody.cpp
index 8fd3817163..e600d3da5f 100644
--- a/Wrapping/Python/Binding/pySIMPLBody.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBody.cpp
@@ -1,38 +1,4 @@
-registerDataArray<int8_t>(mod, "Int8Array");
-registerDataArray<uint8_t>(mod, "UInt8Array");
-
-registerDataArray<int16_t>(mod, "Int16Array");
-registerDataArray<uint16_t>(mod, "UInt16Array");
-
-registerDataArray<int32_t>(mod, "Int32Array");
-registerDataArray<uint32_t>(mod, "UInt32Array");
-
-registerDataArray<int64_t>(mod, "Int64Array");
-registerDataArray<uint64_t>(mod, "UInt64Array");
-
-registerDataArray<float>(mod, "FloatArray");
-registerDataArray<double>(mod, "DoubleArray");
-
-registerDataArray<bool>(mod, "BoolArray");
-
-registerSIMPLArray<float, 2>(mod, "FloatVec2");
-registerSIMPLArray<int32_t, 2>(mod, "IntVec2");
-registerSIMPLArray<size_t, 2>(mod, "SizeVec2");
-
-registerSIMPLArray<float, 3>(mod, "FloatVec3");
-registerSIMPLArray<int32_t, 3>(mod, "IntVec3");
-registerSIMPLArray<size_t, 3>(mod, "SizeVec3");
-
-registerSIMPLArray<float, 4>(mod, "FloatVec4");
-registerSIMPLArray<int32_t, 4>(mod, "IntVec4");
-registerSIMPLArray<size_t, 4>(mod, "SizeVec4");
-
-registerSIMPLArray<float, 6>(mod, "FloatVec6");
-registerSIMPLArray<int32_t, 6>(mod, "IntVec6");
-
-py::implicitly_convertible<QString, DataArrayPath>();
-
-py::class_<QSet<QString>>(mod, "StringSet").def(py::init<>([](py::set stringSet) {
+instanceQSetQString.def(py::init<>([](py::set stringSet) {
   QSet<QString> newQStringSet = QSet<QString>();
   for(auto newString : stringSet)
   {
@@ -41,7 +7,7 @@ py::class_<QSet<QString>>(mod, "StringSet").def(py::init<>([](py::set stringSet)
   return newQStringSet;
 }));
 
-py::class_<QDateTime>(mod, "DateTime").def(py::init<>([](int year, int month, int day, int seconds) {
+instanceQDateTime.def(py::init<>([](int year, int month, int day, int seconds) {
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
   QDateTime dateTime(QDate(year, month, day));
 #else
@@ -51,7 +17,7 @@ py::class_<QDateTime>(mod, "DateTime").def(py::init<>([](int year, int month, in
   return dateTime;
 }));
 
-py::class_<QJsonArray>(mod, "JsonArray").def(py::init<>([](py::list values) {
+instanceQJsonArray.def(py::init<>([](py::list values) {
   QJsonArray qJsonArray;
   for(auto value : values)
   {
@@ -61,7 +27,7 @@ py::class_<QJsonArray>(mod, "JsonArray").def(py::init<>([](py::list values) {
   return qJsonArray;
 }));
 
-py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoList").def(py::init<>([](py::list values) {
+instanceQListImportHDF5DatasetDatasetImportInfo.def(py::init<>([](py::list values) {
   QList<ImportHDF5Dataset::DatasetImportInfo> datasetImportInfoList;
   for(auto value : values)
   {
@@ -74,7 +40,7 @@ py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>>(mod, "DatasetImportInfoL
   return datasetImportInfoList;
 }));
 
-py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
+instanceSIMPLComparisonEnumeration
     .value("LessThan", SIMPL::Comparison::Enumeration::Operator_LessThan)
     .value("GreaterThan", SIMPL::Comparison::Enumeration::Operator_GreaterThan)
     .value("Equal", SIMPL::Comparison::Enumeration::Operator_Equal)
@@ -82,14 +48,14 @@ py::enum_<SIMPL::Comparison::Enumeration>(mod, "ComparisonOperators")
     .value("Unknown", SIMPL::Comparison::Enumeration::Operator_Unknown)
     .export_values();
 
-py::enum_<SIMPL::DelimiterTypes::Type>(mod, "DelimiterTypes")
+instanceSIMPLDelimiterTypeType
     .value("Comma", SIMPL::DelimiterTypes::Type::Comma)
     .value("Semicolon", SIMPL::DelimiterTypes::Type::Semicolon)
     .value("Colon", SIMPL::DelimiterTypes::Type::Colon)
     .value("Tab", SIMPL::DelimiterTypes::Type::Tab)
     .value("Space", SIMPL::DelimiterTypes::Type::Space);
 
-py::enum_<PhaseType::Type>(mod, "PhaseType")
+instancePhaseTypeType
     .value("Primary", PhaseType::Type::Primary)
     .value("Precipitate", PhaseType::Type::Precipitate)
     .value("Transformation", PhaseType::Type::Transformation)
@@ -98,7 +64,7 @@ py::enum_<PhaseType::Type>(mod, "PhaseType")
     .value("Unknown", PhaseType::Type::Unknown)
     .value("Any", PhaseType::Type::Any);
 
-py::enum_<ShapeType::Type>(mod, "ShapeType")
+instanceShapeTypeType
     .value("Ellipsoid", ShapeType::Type::Ellipsoid)
     .value("SuperEllipsoid", ShapeType::Type::SuperEllipsoid)
     .value("CubeOctahedron", ShapeType::Type::CubeOctahedron)
@@ -109,7 +75,7 @@ py::enum_<ShapeType::Type>(mod, "ShapeType")
     .value("Unknown", ShapeType::Type::Unknown)
     .value("Any", ShapeType::Type::Any);
 
-py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
+instanceEnsembleInfoCrystalStructure
     .value("Hexagonal_High", EnsembleInfo::CrystalStructure::Hexagonal_High)
     .value("Cubic_High", EnsembleInfo::CrystalStructure::Cubic_High)
     .value("Hexagonal_Low", EnsembleInfo::CrystalStructure::Hexagonal_Low)
@@ -123,7 +89,7 @@ py::enum_<EnsembleInfo::CrystalStructure>(mod, "CrystalStructure")
     .value("Trigonal_High", EnsembleInfo::CrystalStructure::Trigonal_High)
     .value("UnknownCrystalStructure", EnsembleInfo::CrystalStructure::UnknownCrystalStructure);
 
-py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
+instanceSIMPLScalarTypesType
     .value("Int8", SIMPL::ScalarTypes::Type::Int8)
     .value("UInt8", SIMPL::ScalarTypes::Type::UInt8)
     .value("Int16", SIMPL::ScalarTypes::Type::Int16)
@@ -136,14 +102,14 @@ py::enum_<SIMPL::ScalarTypes::Type>(mod, "ScalarTypes")
     .value("Double", SIMPL::ScalarTypes::Type::Double)
     .value("Bool", SIMPL::ScalarTypes::Type::Bool);
 
-py::enum_<CreateDataArray::InitializationChoices>(mod, "InitializationType")
+instanceCreateDataArrayInitializationChoices
     .value("Manual", CreateDataArray::InitializationChoices::Manual)
     .value("RandomWithRange", CreateDataArray::InitializationChoices::RandomWithRange)
     .export_values();
 
-py::enum_<ArrayCalculator::AngleUnits>(mod, "AngleUnits").value("Radians", ArrayCalculator::AngleUnits::Radians).value("Degrees", ArrayCalculator::AngleUnits::Degrees).export_values();
+instanceArrayCalculatorAngleUnits.value("Radians", ArrayCalculator::AngleUnits::Radians).value("Degrees", ArrayCalculator::AngleUnits::Degrees).export_values();
 
-py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
+instanceSIMPLNumericTypesType
     .value("Int8", SIMPL::NumericTypes::Type::Int8)
     .value("UInt8", SIMPL::NumericTypes::Type::UInt8)
     .value("Int16", SIMPL::NumericTypes::Type::Int16)
@@ -158,31 +124,37 @@ py::enum_<SIMPL::NumericTypes::Type>(mod, "NumericTypes")
     .value("SizeT", SIMPL::NumericTypes::Type::SizeT)
     .value("UnknownNumType", SIMPL::NumericTypes::Type::UnknownNumType);
 
-py::enum_<SIMPL::InfoStringFormat>(mod, "InfoStringFormat").value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat).value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat).export_values();
+instanceQtCheckState
+    .value("Unchecked", Qt::CheckState::Unchecked)
+    .value("PartiallyChecked", Qt::CheckState::PartiallyChecked)
+    .value("Checked", Qt::CheckState::Checked)
+    .export_values();
+
+instanceSIMPLInfoStringFormat.value("HtmlFormat", SIMPL::InfoStringFormat::HtmlFormat).value("UnknownFormat", SIMPL::InfoStringFormat::UnknownFormat).export_values();
 
 instanceAbstractFilter.def("connectObserver",
                            [](AbstractFilter& filter, Observer& observer) { QObject::connect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });
 instanceAbstractFilter.def("disconnectObserver",
                            [](AbstractFilter& filter, Observer& observer) { QObject::disconnect(&filter, &AbstractFilter::messageGenerated, &observer, &Observer::processPipelineMessage); });
 
-py::class_<AttributeMatrixCreationFilterParameter::RequirementType>(instanceAttributeMatrixCreationFilterParameter, "RequirementType")
+instanceAttributeMatrixCreationFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&>())
     .def_readwrite("dcGeometryTypes", &AttributeMatrixCreationFilterParameter::RequirementType::dcGeometryTypes);
 
-py::class_<AttributeMatrixSelectionFilterParameter::RequirementType>(instanceAttributeMatrixSelectionFilterParameter, "RequirementType")
+instanceAttributeMatrixSelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&>())
     .def_readwrite("dcGeometryTypes", &AttributeMatrixSelectionFilterParameter::RequirementType::dcGeometryTypes)
     .def_readwrite("amTypes", &AttributeMatrixSelectionFilterParameter::RequirementType::amTypes);
 
-py::class_<DataArrayCreationFilterParameter::RequirementType>(instanceDataArrayCreationFilterParameter, "RequirementType")
+instanceDataArrayCreationFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&>())
     .def_readwrite("dcGeometryTypes", &DataArrayCreationFilterParameter::RequirementType::dcGeometryTypes)
     .def_readwrite("amTypes", &DataArrayCreationFilterParameter::RequirementType::amTypes);
 
-py::class_<DataArraySelectionFilterParameter::RequirementType>(instanceDataArraySelectionFilterParameter, "RequirementType")
+instanceDataArraySelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
     .def_readwrite("dcGeometryTypes", &DataArraySelectionFilterParameter::RequirementType::dcGeometryTypes)
@@ -190,17 +162,17 @@ py::class_<DataArraySelectionFilterParameter::RequirementType>(instanceDataArray
     .def_readwrite("daTypes", &DataArraySelectionFilterParameter::RequirementType::daTypes)
     .def_readwrite("componentDimensions", &DataArraySelectionFilterParameter::RequirementType::componentDimensions);
 
-py::class_<DataContainerSelectionFilterParameter::RequirementType>(instanceDataContainerSelectionFilterParameter, "RequirementType")
+instanceDataContainerSelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&>())
     .def_readwrite("dcGeometryTypes", &DataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes);
 
-py::class_<LinkedDataContainerSelectionFilterParameter::RequirementType>(instanceLinkedDataContainerSelectionFilterParameter, "RequirementType")
+instanceLinkedDataContainerSelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&>())
     .def_readwrite("dcGeometryTypes", &LinkedDataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes);
 
-py::class_<MultiAttributeMatrixSelectionFilterParameter::RequirementType>(instanceMultiAttributeMatrixSelectionFilterParameter, "RequirementType")
+instanceMultiAttributeMatrixSelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
     .def_readwrite("dcGeometryTypes", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::dcGeometryTypes)
@@ -208,7 +180,7 @@ py::class_<MultiAttributeMatrixSelectionFilterParameter::RequirementType>(instan
     .def_readwrite("daTypes", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::daTypes)
     .def_readwrite("componentDimensions", &MultiAttributeMatrixSelectionFilterParameter::RequirementType::componentDimensions);
 
-py::class_<MultiDataArraySelectionFilterParameter::RequirementType>(instanceMultiDataArraySelectionFilterParameter, "RequirementType")
+instanceMultiDataArraySelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
     .def_readwrite("dcGeometryTypes", &MultiDataArraySelectionFilterParameter::RequirementType::dcGeometryTypes)
@@ -216,7 +188,7 @@ py::class_<MultiDataArraySelectionFilterParameter::RequirementType>(instanceMult
     .def_readwrite("daTypes", &MultiDataArraySelectionFilterParameter::RequirementType::daTypes)
     .def_readwrite("componentDimensions", &MultiDataArraySelectionFilterParameter::RequirementType::componentDimensions);
 
-py::class_<MultiDataContainerSelectionFilterParameter::RequirementType>(instanceMultiDataContainerSelectionFilterParameter, "RequirementType")
+instanceMultiDataContainerSelectionFilterParameterRequirementType
     .def(py::init<>())
     .def(py::init<const IGeometry::Types&, const AttributeMatrix::Types&, const std::vector<QString>&, const std::vector<std::vector<size_t>>&>())
     .def_readwrite("dcGeometryTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::dcGeometryTypes)
@@ -224,6 +196,8 @@ py::class_<MultiDataContainerSelectionFilterParameter::RequirementType>(instance
     .def_readwrite("daTypes", &MultiDataContainerSelectionFilterParameter::RequirementType::daTypes)
     .def_readwrite("componentDimensions", &MultiDataContainerSelectionFilterParameter::RequirementType::componentDimensions);
 
+instanceDataContainerGrid.def(py::init<SizeVec3Type>()).def(py::init<SizeVec3Type, const std::vector<QString>&>());
+
 registerDataContainerArray(instanceDataContainerArray);
 registerDataContainer(instanceDataContainer);
 registerAttributeMatrix(instanceAttributeMatrix);
diff --git a/Wrapping/Python/Binding/pySIMPLBodyTop.cpp b/Wrapping/Python/Binding/pySIMPLBodyTop.cpp
index 5b2c7022cb..774aa0188f 100644
--- a/Wrapping/Python/Binding/pySIMPLBodyTop.cpp
+++ b/Wrapping/Python/Binding/pySIMPLBodyTop.cpp
@@ -21,3 +21,18 @@ else
 {
   py::bind_vector<std::vector<size_t>>(mod, "VectorSizeT", "std::vector<size_t> binding");
 }
+
+py::class_<Float3rdOrderPoly_t> instanceFloat3rdOrderPoly(mod, "Float3rdOrderPoly");
+
+instanceFloat3rdOrderPoly.def(py::init<float, float, float, float, float, float, float, float, float, float>());
+
+py::enum_<RenameErrorCodes> instanceRenameErrorCodes(mod, "RenameErrorCodes");
+
+instanceRenameErrorCodes
+.value("OLD_DOES_NOT_EXIST", RenameErrorCodes::OLD_DOES_NOT_EXIST)
+.value("SUCCESS", RenameErrorCodes::SUCCESS)
+.value("NEW_EXISTS", RenameErrorCodes::NEW_EXISTS)
+.value("SAME_PATH", RenameErrorCodes::SAME_PATH)
+.export_values();
+
+py::class_<DataContainerGrid> instanceDataContainerGrid(mod, "DataContainerGrid");
diff --git a/Wrapping/Python/Binding/pySIMPLPostTypes.cpp b/Wrapping/Python/Binding/pySIMPLPostTypes.cpp
new file mode 100644
index 0000000000..7b2f305fa7
--- /dev/null
+++ b/Wrapping/Python/Binding/pySIMPLPostTypes.cpp
@@ -0,0 +1,81 @@
+registerSIMPLArray<float, 2>(mod, "FloatVec2");
+registerSIMPLArray<int32_t, 2>(mod, "IntVec2");
+registerSIMPLArray<size_t, 2>(mod, "SizeVec2");
+
+registerSIMPLArray<float, 3>(mod, "FloatVec3");
+registerSIMPLArray<int32_t, 3>(mod, "IntVec3");
+registerSIMPLArray<size_t, 3>(mod, "SizeVec3");
+
+registerSIMPLArray<float, 4>(mod, "FloatVec4");
+registerSIMPLArray<int32_t, 4>(mod, "IntVec4");
+registerSIMPLArray<size_t, 4>(mod, "SizeVec4");
+
+registerSIMPLArray<float, 6>(mod, "FloatVec6");
+registerSIMPLArray<int32_t, 6>(mod, "IntVec6");
+
+registerDataArray<int8_t>(mod, "Int8Array");
+registerDataArray<uint8_t>(mod, "UInt8Array");
+
+registerDataArray<int16_t>(mod, "Int16Array");
+registerDataArray<uint16_t>(mod, "UInt16Array");
+
+registerDataArray<int32_t>(mod, "Int32Array");
+registerDataArray<uint32_t>(mod, "UInt32Array");
+
+registerDataArray<int64_t>(mod, "Int64Array");
+registerDataArray<uint64_t>(mod, "UInt64Array");
+
+registerDataArray<float>(mod, "FloatArray");
+registerDataArray<double>(mod, "DoubleArray");
+
+registerDataArray<bool>(mod, "BoolArray");
+
+py::implicitly_convertible<QString, DataArrayPath>();
+
+py::class_<QSet<QString>> instanceQSetQString(mod, "StringSet");
+
+py::class_<QDateTime> instanceQDateTime(mod, "DateTime");
+
+py::class_<QJsonArray> instanceQJsonArray(mod, "JsonArray");
+
+py::class_<QList<ImportHDF5Dataset::DatasetImportInfo>> instanceQListImportHDF5DatasetDatasetImportInfo(mod, "DatasetImportInfoList");
+
+py::enum_<SIMPL::Comparison::Enumeration> instanceSIMPLComparisonEnumeration(mod, "ComparisonOperators");
+
+py::enum_<SIMPL::DelimiterTypes::Type> instanceSIMPLDelimiterTypeType(mod, "DelimiterTypes");
+
+py::enum_<PhaseType::Type> instancePhaseTypeType(mod, "PhaseType");
+
+py::enum_<ShapeType::Type> instanceShapeTypeType(mod, "ShapeType");
+
+py::enum_<EnsembleInfo::CrystalStructure> instanceEnsembleInfoCrystalStructure(mod, "CrystalStructure");
+
+py::enum_<SIMPL::ScalarTypes::Type> instanceSIMPLScalarTypesType(mod, "ScalarTypes");
+
+py::enum_<CreateDataArray::InitializationChoices> instanceCreateDataArrayInitializationChoices(mod, "InitializationType");
+
+py::enum_<ArrayCalculator::AngleUnits> instanceArrayCalculatorAngleUnits(mod, "AngleUnits");
+
+py::enum_<SIMPL::NumericTypes::Type> instanceSIMPLNumericTypesType(mod, "NumericTypes");
+
+py::enum_<SIMPL::InfoStringFormat> instanceSIMPLInfoStringFormat(mod, "InfoStringFormat");
+
+py::class_<AttributeMatrixCreationFilterParameter::RequirementType> instanceAttributeMatrixCreationFilterParameterRequirementType(instanceAttributeMatrixCreationFilterParameter, "RequirementType");
+
+py::class_<AttributeMatrixSelectionFilterParameter::RequirementType> instanceAttributeMatrixSelectionFilterParameterRequirementType(instanceAttributeMatrixSelectionFilterParameter, "RequirementType");
+
+py::class_<DataArrayCreationFilterParameter::RequirementType> instanceDataArrayCreationFilterParameterRequirementType(instanceDataArrayCreationFilterParameter, "RequirementType");
+
+py::class_<DataArraySelectionFilterParameter::RequirementType> instanceDataArraySelectionFilterParameterRequirementType(instanceDataArraySelectionFilterParameter, "RequirementType");
+
+py::class_<DataContainerSelectionFilterParameter::RequirementType> instanceDataContainerSelectionFilterParameterRequirementType(instanceDataContainerSelectionFilterParameter, "RequirementType");
+
+py::class_<LinkedDataContainerSelectionFilterParameter::RequirementType> instanceLinkedDataContainerSelectionFilterParameterRequirementType(instanceLinkedDataContainerSelectionFilterParameter, "RequirementType");
+
+py::class_<MultiAttributeMatrixSelectionFilterParameter::RequirementType> instanceMultiAttributeMatrixSelectionFilterParameterRequirementType(instanceMultiAttributeMatrixSelectionFilterParameter, "RequirementType");
+
+py::class_<MultiDataArraySelectionFilterParameter::RequirementType> instanceMultiDataArraySelectionFilterParameterRequirementType(instanceMultiDataArraySelectionFilterParameter, "RequirementType");
+
+py::class_<MultiDataContainerSelectionFilterParameter::RequirementType> instanceMultiDataContainerSelectionFilterParameterRequirementType(instanceMultiDataContainerSelectionFilterParameter, "RequirementType");
+
+py::enum_<Qt::CheckState> instanceQtCheckState(mod, "QtCheckState");

From 416f767630970e2ba2ce34f865278d9c1f4c7e37 Mon Sep 17 00:00:00 2001
From: Jared Duffey <jared.duffey@bluequartz.net>
Date: Tue, 10 Aug 2021 15:36:50 -0400
Subject: [PATCH 394/397] Added option to generate python stub files (.pyi)

* Uses mypy stubgen

Signed-off-by: Jared Duffey <jared.duffey@bluequartz.net>
---
 CMakeLists.txt                                     |  6 ++++++
 Wrapping/Python/Binding/CreatePybind11Module.cmake | 14 ++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98b3e0bfd5..b3c32c17ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -523,6 +523,12 @@ if(SIMPL_WRAP_PYTHON)
     mark_as_advanced(SIMPL_CONDA_EXECUTABLE)
   endif()
 
+  option(SIMPL_GENERATE_PYI "Generate .pyi files for python bindings" OFF)
+
+  if(SIMPL_GENERATE_PYI)
+    find_program(MYPY_STUBGEN_EXE stubgen REQUIRED)
+  endif()
+
   include(${SIMPLProj_SOURCE_DIR}/Wrapping/Python/Binding/CreatePybind11Module.cmake)
 
   get_target_property(SIMPL_PY_SOURCES SIMPLib SOURCES)
diff --git a/Wrapping/Python/Binding/CreatePybind11Module.cmake b/Wrapping/Python/Binding/CreatePybind11Module.cmake
index 2b3805be96..e7d23cdcc4 100644
--- a/Wrapping/Python/Binding/CreatePybind11Module.cmake
+++ b/Wrapping/Python/Binding/CreatePybind11Module.cmake
@@ -183,6 +183,20 @@ function(CreatePybind11Module)
     file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import ${MODULE_NAME_lower}\n")
     file(APPEND ${DREAM3D_INIT_PY_FILE} "from . import ${MODULE_NAME_lower}py\n")
     add_dependencies(CopyPythonPackage ${MODULE_NAME_lower})
+    add_dependencies(CreateDREAM3DStubs ${MODULE_NAME_lower})
+  endif()
+
+  if(SIMPL_GENERATE_PYI)
+    set(CREATE_STUB_FILE_TARGET ${MODULE_NAME_lower}CreateStubFile)
+    set(STUB_FILE ${ARGS_OUTPUT_DIR}/${MODULE_NAME_lower}.pyi)
+    add_custom_target(${CREATE_STUB_FILE_TARGET} ALL
+      COMMAND ${MYPY_STUBGEN_EXE} -m ${MODULE_NAME_lower} -o ${ARGS_PYTHON_OUTPUT_DIR}
+      COMMENT "${ARGS_MODULE_NAME}: Generating .pyi files"
+      BYPRODUCTS ${STUB_FILE}
+      WORKING_DIRECTORY $<TARGET_FILE_DIR:${MODULE_NAME_lower}>
+    )
+    set_property(TARGET ${CREATE_STUB_FILE_TARGET} PROPERTY FOLDER "Python/Stub")
+    add_dependencies(${CREATE_STUB_FILE_TARGET} ${MODULE_NAME_lower})
   endif()
 endfunction()
 

From 7d49c802641ea9547420ee1bede4649e7da952ba Mon Sep 17 00:00:00 2001
From: mhitzem <88333018+mhitzem@users.noreply.github.com>
Date: Wed, 11 Aug 2021 11:39:53 -0400
Subject: [PATCH 395/397] Update use_case_02.py

---
 Wrapping/Python/Examples/use_case_02.py | 40 ++++++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/Wrapping/Python/Examples/use_case_02.py b/Wrapping/Python/Examples/use_case_02.py
index 6bf0050cef..2ed1bc36b5 100644
--- a/Wrapping/Python/Examples/use_case_02.py
+++ b/Wrapping/Python/Examples/use_case_02.py
@@ -11,7 +11,16 @@
 import dream3d.simpl_helpers as simpl_helpers
 
 
-
+#Generates a csv file with floats 0-37988 and ints 1-37989
+def make_random_data():
+    with open('new_data.csv', 'w') as f:
+        writer = csv.writer(f, lineterminator='\n',)
+        writer.writerow(["Float", "Int"])
+        i = 0
+        while i < 37989:
+            row = [i, i+1]
+            writer.writerow(row)
+            i = i+1
 
 def import_csv_xyz_vertices_2(file_path: str):
     """
@@ -36,6 +45,35 @@ def import_csv_xyz_vertices_2(file_path: str):
     dca.addOrReplaceDataContainer(dc)
     # Write the Vertex Geometry out to a .dream3d file.
     err = simpl_helpers.WriteDREAM3DFile('vert_geom_2.dream3d', dca, True)
+    
+    # Create Cell AttributeMatrix
+    tupleDims = simpl.VectorSizeT([1, 37989])
+    am = simpl_helpers.CreateAttributeMatrix(tupleDims, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
+
+    # Create Data Arrays
+    #Loads in csv file and gets data for each type
+    uints = np.genfromtxt('new_data.csv', dtype=np.uint32, skip_header=1, usecols=1, delimiter=',')
+    f32s = np.genfromtxt('new_data.csv', dtype=np.float32, usecols=0, skip_header=1, delimiter=',')
+
+    #Creates arrays from data with shape of (# of vertices x 1)
+    uintarr = np.ndarray(shape=(37989, 1), dtype=np.uint32, buffer=uints)
+    floatarr = np.ndarray(shape=(37989, 1), dtype=np.float32, buffer=f32s)
+
+    #     Number of tuples must match the number of vertices
+    #     Create 2 Data Arrays: UInt32 and Float32
+    #     Populate data ararys with some random data
+    #       or
+    #     for bonus points read the data from another text file
+    #Makes simpl arrays using numpy arrays
+    uint32arr = simpl.UInt32Array(uintarr, 'UInt32 Arr', True)
+    f32arr = simpl.FloatArray(floatarr, 'Float32 Arr', True)
+    
+    # Add Data Arrays to AttributeMatrix
+    am.addOrReplaceAttributeArray(uint32arr)
+    am.addOrReplaceAttributeArray(f32arr)
+
+    # Add AttributeMatirx to DataContainer
+    dc.addOrReplaceAttributeMatrix(am)
 
 
 def import_csv_xyz_vertices_1(file_path: str):

From d77b76448265bbf12de101d1f6c56b2a5968ed93 Mon Sep 17 00:00:00 2001
From: mhitzem <88333018+mhitzem@users.noreply.github.com>
Date: Thu, 12 Aug 2021 11:26:50 -0400
Subject: [PATCH 396/397] Update use_case_02.py

---
 Wrapping/Python/Examples/use_case_02.py | 46 +++++++++++++++----------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/Wrapping/Python/Examples/use_case_02.py b/Wrapping/Python/Examples/use_case_02.py
index 2ed1bc36b5..54df19ab9c 100644
--- a/Wrapping/Python/Examples/use_case_02.py
+++ b/Wrapping/Python/Examples/use_case_02.py
@@ -11,23 +11,24 @@
 import dream3d.simpl_helpers as simpl_helpers
 
 
-#Generates a csv file with floats 0-37988 and ints 1-37989
-def make_random_data():
-    with open('new_data.csv', 'w') as f:
+#Generates a csv file with floats 0-(numVerts-1) and ints 1-numVerts
+def make_random_data(num_elements, file_path: str):
+    with open(file_path, 'w') as f:
         writer = csv.writer(f, lineterminator='\n',)
         writer.writerow(["Float", "Int"])
         i = 0
-        while i < 37989:
+        while i < num_elements:
             row = [i, i+1]
             writer.writerow(row)
             i = i+1
 
-def import_csv_xyz_vertices_2(file_path: str):
+def import_csv_xyz_vertices_2(args):
     """
     This version of the sample code uses slightly different CSV python APIs the difference being the use of
     the numpy.loadtxt() function.
-
     """
+    file_path = args.input_file
+    file_path: str
     verts_np = np.loadtxt(file_path, dtype={'names': ('x', 'y', 'z'), 'formats': ('f4', 'f4', 'f4')}, usecols=(0, 1, 2), delimiter=',', skiprows=1)
     verts_flat = rfn.structured_to_unstructured(verts_np, dtype=np.float32, copy=False, casting='safe')
     
@@ -43,31 +44,36 @@ def import_csv_xyz_vertices_2(file_path: str):
     dc.setGeometry(vertGeom)
     # Add the data container to the DataContainerArray
     dca.addOrReplaceDataContainer(dc)
-    # Write the Vertex Geometry out to a .dream3d file.
-    err = simpl_helpers.WriteDREAM3DFile('vert_geom_2.dream3d', dca, True)
     
+    file_path=args.output_file
+    file_path: str
+    numVerts = len(verts_np)
+
+    #Creates csv with same amount of elements as vertices from input file
+    make_random_data(numVerts, file_path=args.output_file)
+
     # Create Cell AttributeMatrix
-    tupleDims = simpl.VectorSizeT([1, 37989])
-    am = simpl_helpers.CreateAttributeMatrix(tupleDims, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Cell)
+    tupleDims = simpl.VectorSizeT([1, numVerts])
+    am = simpl_helpers.CreateAttributeMatrix(tupleDims, 'CellAttributeMatrix', simpl.AttributeMatrix.Type.Vertex)
 
     # Create Data Arrays
     #Loads in csv file and gets data for each type
-    uints = np.genfromtxt('new_data.csv', dtype=np.uint32, skip_header=1, usecols=1, delimiter=',')
-    f32s = np.genfromtxt('new_data.csv', dtype=np.float32, usecols=0, skip_header=1, delimiter=',')
+    uints = np.genfromtxt(file_path, dtype=np.uint32, skip_header=1, usecols=1, delimiter=',')
+    f32s = np.genfromtxt(file_path, dtype=np.float32, usecols=0, skip_header=1, delimiter=',')
 
     #Creates arrays from data with shape of (# of vertices x 1)
-    uintarr = np.ndarray(shape=(37989, 1), dtype=np.uint32, buffer=uints)
-    floatarr = np.ndarray(shape=(37989, 1), dtype=np.float32, buffer=f32s)
+    uintarr = np.ndarray(shape=(numVerts, 1), dtype=np.uint32, buffer=uints)
+    floatarr = np.ndarray(shape=(numVerts, 1), dtype=np.float32, buffer=f32s)
+
+    #Makes simpl arrays using numpy arrays
+    uint32arr = simpl.UInt32Array(uintarr, 'UInt32 Arr', True)
+    f32arr = simpl.FloatArray(floatarr, 'Float32 Arr', True)
 
     #     Number of tuples must match the number of vertices
     #     Create 2 Data Arrays: UInt32 and Float32
     #     Populate data ararys with some random data
     #       or
     #     for bonus points read the data from another text file
-    #Makes simpl arrays using numpy arrays
-    uint32arr = simpl.UInt32Array(uintarr, 'UInt32 Arr', True)
-    f32arr = simpl.FloatArray(floatarr, 'Float32 Arr', True)
-    
     # Add Data Arrays to AttributeMatrix
     am.addOrReplaceAttributeArray(uint32arr)
     am.addOrReplaceAttributeArray(f32arr)
@@ -75,6 +81,7 @@ def import_csv_xyz_vertices_2(file_path: str):
     # Add AttributeMatirx to DataContainer
     dc.addOrReplaceAttributeMatrix(am)
 
+    err = simpl_helpers.WriteDREAM3DFile('vert_geom_2.dream3d', dca, True)
 
 def import_csv_xyz_vertices_1(file_path: str):
     """
@@ -116,7 +123,8 @@ def import_csv_xyz_vertices_1(file_path: str):
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--input_file')
+    parser.add_argument('--output_file')
     args = parser.parse_args()
 
     import_csv_xyz_vertices_1(file_path=args.input_file)
-    import_csv_xyz_vertices_2(file_path=args.input_file)
+    import_csv_xyz_vertices_2(args)

From 90039d43bd0166a1d27b93fc3e43077d29a2a066 Mon Sep 17 00:00:00 2001
From: mhitzem <88333018+mhitzem@users.noreply.github.com>
Date: Mon, 16 Aug 2021 10:44:40 -0400
Subject: [PATCH 397/397] Update use_case_02.py

---
 Wrapping/Python/Examples/use_case_02.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Wrapping/Python/Examples/use_case_02.py b/Wrapping/Python/Examples/use_case_02.py
index 54df19ab9c..3a074f93ca 100644
--- a/Wrapping/Python/Examples/use_case_02.py
+++ b/Wrapping/Python/Examples/use_case_02.py
@@ -13,7 +13,7 @@
 
 #Generates a csv file with floats 0-(numVerts-1) and ints 1-numVerts
 def make_random_data(num_elements, file_path: str):
-    with open(file_path, 'w') as f:
+     with open(file_path + 'new_data.csv', 'w') as f:
         writer = csv.writer(f, lineterminator='\n',)
         writer.writerow(["Float", "Int"])
         i = 0
@@ -45,12 +45,12 @@ def import_csv_xyz_vertices_2(args):
     # Add the data container to the DataContainerArray
     dca.addOrReplaceDataContainer(dc)
     
-    file_path=args.output_file
+    file_path=args.output_dir
     file_path: str
     numVerts = len(verts_np)
 
     #Creates csv with same amount of elements as vertices from input file
-    make_random_data(numVerts, file_path=args.output_file)
+    make_random_data(numVerts, file_path=args.output_dir)
 
     # Create Cell AttributeMatrix
     tupleDims = simpl.VectorSizeT([1, numVerts])
@@ -58,8 +58,8 @@ def import_csv_xyz_vertices_2(args):
 
     # Create Data Arrays
     #Loads in csv file and gets data for each type
-    uints = np.genfromtxt(file_path, dtype=np.uint32, skip_header=1, usecols=1, delimiter=',')
-    f32s = np.genfromtxt(file_path, dtype=np.float32, usecols=0, skip_header=1, delimiter=',')
+    uints = np.genfromtxt(file_path + 'new_data.csv', dtype=np.uint32, skip_header=1, usecols=1, delimiter=',')
+    f32s = np.genfromtxt(file_path + 'new_data.csv', dtype=np.float32, usecols=0, skip_header=1, delimiter=',')
 
     #Creates arrays from data with shape of (# of vertices x 1)
     uintarr = np.ndarray(shape=(numVerts, 1), dtype=np.uint32, buffer=uints)
@@ -81,7 +81,7 @@ def import_csv_xyz_vertices_2(args):
     # Add AttributeMatirx to DataContainer
     dc.addOrReplaceAttributeMatrix(am)
 
-    err = simpl_helpers.WriteDREAM3DFile('vert_geom_2.dream3d', dca, True)
+    err = simpl_helpers.WriteDREAM3DFile(file_path + 'vert_geom_2.dream3d', dca, True)
 
 def import_csv_xyz_vertices_1(file_path: str):
     """
@@ -123,7 +123,7 @@ def import_csv_xyz_vertices_1(file_path: str):
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--input_file')
-    parser.add_argument('--output_file')
+    parser.add_argument('--output_dir')
     args = parser.parse_args()
 
     import_csv_xyz_vertices_1(file_path=args.input_file)